diff --git a/.gitignore b/.gitignore
index e5fc5e48e..5d859a219 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,16 +14,17 @@ Win32_LIB_ASM_Release
 *.dgb
 *.debug
 *.debug.txt
-/bin/VC10/
-/objs/VC10/
 *.user
 *.db
 *.opendb
 /.vs
 /debian
 /assets/debian
-compile.sh
-*.gz
-.vscode/
-out
-build
+/make
+/bin
+/build
+/build/*
+/CMakeUserPresets.json
+/out
+/objs/VC10
+*.kate-swp
diff --git a/AppImage_build.sh b/AppImage_build.sh
new file mode 100755
index 000000000..2822d00d3
--- /dev/null
+++ b/AppImage_build.sh
@@ -0,0 +1,346 @@
+#!/bin/bash
+set -e # Enable auto-exit for debugging :))
+
+# Make Linux AppImage program data
+# https://docs.appimage.org/reference/appdir.html
+
+# PWD: {repo_root}/build
+# See deployer.sh for usage
+
+# Terminal stuff
+RESET="$(tput sgr0)" #"\e[0m" # Resets terminal colors
+
+# Colors for various information types
+FAILURE="$(tput setaf 1)" #"\e[91m"
+SUCCESS="$(tput setaf 2)" #"\e[92m"
+NOTICE="$(tput setaf 3)" #"\e[93m"
+VERBOSE="$(tput setaf 4)" #"\e[94m"
+
+verbosity=0 # By default don't print anything unless it's *ultra* important.
+quiet=0 # Also don't print anything if they supplied the quiet argument
+
+# URL from which to download appimagetool if there isn't one available in your $PATH
+# at time of writing only aarch64, armhf, i686, and x86_64 versions are available via this method
+# in those cases, and honestly even outside of those cases, it's better to just put a working one in your $PATH yourself..
+url="https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$(uname -m).AppImage"
+
+# A whitelist of libraries to include into SRB2's AppImage if SRB2 is dynamically linked.
+# please don't add a newline at the end of this or i will cry :(
+libraryWhitelist="
+libbacktrace
+libnsl
+libSDL2
+libSDL2_mixer
+libgme
+libopenmpt
+libpng
+libfluidsynth
+libpulse
+libmodplug
+libvorbisfile
+libopusfile
+libFLAC
+libmad
+libmpg123
+libvorbis
+libpulsecommon
+libsndfile
+libsndio
+libogg
+libvorbisenc
+libjson
+libreadline
+libwrap
+libtinfo
+libtirpc
+libpng16"
+
+# these kinda look like macros don't they
+function print { (( "$quiet" == 0 )) && echo "$@" || :; } # echo if not quiet
+function coloredText { printf "$1"; print "${@:2}"; printf "$RESET"; } # use print to inherit quiet
+function success { coloredText "$SUCCESS" "$@"; } # use coloredText to inherit quiet
+function important { coloredText "$NOTICE" "$@"; } # use coloredText to inherit quiet
+function verboseOnly { (( "$verbosity" >= $1 )) && (coloredText "$VERBOSE" "${@:2}") || :; } # use coloredText to inherit quiet
+
+# Parses an argument with a single dash
+function parseSingleDashArg() {
+	while read -n 1 char; do
+		if [[ "$char" == '-' || "$char" == '' ]]; then
+			:
+		elif [[ "$char" == 'h' ]]; then
+			helppassed=1
+		elif [[ "$char" == 'q' ]]; then
+			quiet=1
+		elif [[ "$char" == 'v' ]]; then
+			verbosity="$((verbosity + 1))"
+		elif [[ "$char" == 'd' ]]; then
+			dry=1
+		elif [[ "$char" == 's' ]]; then
+			small=1
+		else
+			echo "$0: invalid option -- '$1'"
+			echo "Try '$0 --help' for more information."
+			return 1
+		fi
+	done <<<"$1"
+}
+
+# Simple help argument checker.
+currentarg=1; # Which argument is --help...
+
+# For $arg in the argument array...
+for arg in "$@"; do
+	# Is it a help argument?
+	if [[ "$arg" == "--help" ]]; then
+		helppassed=1; # Help is passed, set $helppassed!
+		set -- "${@:1:$currentarg-1}" "${@:$currentarg+1}" # Remove argument from list
+	elif [[ "$arg" == "--quiet" ]]; then
+		quiet=1
+		set -- "${@:1:$currentarg-1}" "${@:$currentarg+1}"
+	elif [[ "$arg" == "--verbose" ]]; then
+		verbosity="$((verbosity + 1))" # Increase verbosity!
+		set -- "${@:1:$currentarg-1}" "${@:$currentarg+1}"
+	elif [[ "$arg" == "--dry" ]]; then
+		dry=1; # Show parameters instead of using them.
+		set -- "${@:1:$currentarg-1}" "${@:$currentarg+1}"
+	elif [[ "$arg" == "--small" ]]; then
+		small=1; # Don't copy assets to save on bandwidth.
+		set -- "${@:1:$currentarg-1}" "${@:$currentarg+1}"
+	elif [[ ! "$arg" == *'--'* && "$arg" == *'-'* ]]; then
+		parseSingleDashArg "$arg"
+
+		if [[ "$?" == 0 ]]; then
+			set -- "${@:1:$currentarg-1}" "${@:$currentarg+1}" # Remove argument from list
+		fi
+	elif [[ $arg == *'--'* ]]; then
+		print "$0: invalid option -- '$1'"
+		print "Try '$0 --help' for more information."
+		return 1
+	else
+		currentarg="$((currentarg+1))" # Increment current argument number otherwise...
+	fi
+done
+
+important "SRB2Kart AppImage Packager v1.0 modified for kart by NepDisk."
+important "Orignal for SRB2 my mazmazz and Golden."
+
+# Get root directory from the full path of this script.
+__ROOT_DIR="$3"
+
+if [[ -z "$3" ]]; then
+	# finds out where this script is and goes to that directory and goes up one for the root
+
+	scriptdir="$(dirname "${BASH_SOURCE[0]}")"
+	scriptbase="$(basename "${BASH_SOURCE[0]}")"
+
+	__ROOT_DIR="$(cd "$scriptdir" && pwd -P)"
+fi
+
+# If it starts with '.', put the current working directory behind it so things work.
+if [[ "$__ROOT_DIR" == '.' || "$__ROOT_DIR" == '..' ]]; then
+	__ROOT_DIR="$PWD/$__ROOT_DIR"
+fi
+
+# Set up defaults
+__PROGRAM_NAME="${PROGRAM_NAME:-"SRB2Kart Saturn"}"
+__PROGRAM_DESCRIPTION="${PROGRAM_DESCRIPTION:-"Modded version of SRB2kart with more features."}"
+__PROGRAM_FILENAME="${PROGRAM_FILENAME:-"lsdl2srb2kart"}"
+__PROGRAM_ASSETS="${PROGRAM_ASSETS:-"$__ROOT_DIR/assets/installer"}"
+
+__BUILD_DIR="${1:-"$__ROOT_DIR/bin"}"
+__OUTPUT_FILENAME="${2:-"$__PROGRAM_FILENAME.AppImage"}"
+
+__APPIMAGETOOL="${4:-"appimagetool"}"
+
+if (! command -v "$__APPIMAGETOOL" &> /dev/null); then
+	__APPIMAGETOOL=
+fi
+
+# Stuff that prints and exits.
+
+# Prints setup text using method given by arguments.
+# Example: printSetup "print" # print "Setup for AppImage...
+function printSetup {
+	$@ "Setup for AppImage in BUILD_DIR: '$__BUILD_DIR'..."
+	$@ "With the OUTPUT_FILENAME: '$__OUTPUT_FILENAME'"
+	$@ "And SRB2 Repository Root ROOT_DIR: '$__ROOT_DIR'"
+	$@ "Using APPIMAGETOOL: '$([ -z "$__APPIMAGETOOL" ] && echo '(download)' || echo $__APPIMAGETOOL)'"
+	$@ ""
+	$@ "This should be run from a Makefile or from the directory of the build. If it is not, then change to that directory or specify that directory as an argument."
+	$@ "If ROOT_DIR isn't SRB2's repository root, specify that as an argument too."
+	$@ "Make must have built the program before you run this script."
+	$@ ""
+	$@ "Make sure these Environment Variables are correct."
+	$@ "If not, then enter: export PROGRAM_VARIABLE=value"
+	$@ "PROGRAM_NAME: $__PROGRAM_NAME"
+	$@ "PROGRAM_DESCRIPTION: $__PROGRAM_DESCRIPTION"
+	$@ "PROGRAM_FILENAME: $__PROGRAM_FILENAME"
+	$@ "PROGRAM_ASSETS: $__PROGRAM_ASSETS"
+}
+
+if [[ "$helppassed" ]]; then
+	print "Usage: $(basename "$0") [OPTION]... [BUILD_DIR] [OUTPUT_NAME] [ROOT_DIR] [APPIMAGETOOL]"
+	print "Packages a SRB2 binary into an AppImage."
+	print "OPTIONs may be included anywhere within the arguments."
+	print ""
+	print "Arguments:"
+	print "    -h, --help              display this help and exit."
+	print "    -q, --quiet             don't display any text."
+	print "    -v, --verbose           make commands more verbose, will always print."
+	print "    -s, --small             don't copy SRB2 assets to save on bandwidth."
+	print "                            parameters regardless of --dry."
+	print "    -d, --dry               print parameters and exit."
+	print ""
+	if (( "$verbosity" > 0 )) || [[ "$dry" ]]; then
+		printSetup "print"
+	else
+		print "This should be run from a Makefile or from the directory of the build."
+		print "Make must have built the program before you run this script."
+	fi
+	exit;
+fi
+
+if (( "$verbosity" > 0 )) || [[ "$dry" ]]; then
+	printSetup "verboseOnly" "0"
+	verboseOnly 0 ""
+
+	if [[ "$dry" ]]; then
+		set -n # Enable debug mode and verbose for dry run.
+	fi
+fi
+
+# End stuff that prints and exits.
+
+if (( "$verbosity" >= 4 )); then
+	set -v # Really verbose? Print *everything*!
+fi
+
+# Define AppDir structure
+mkdir -p "$__BUILD_DIR/AppDir/usr/bin"
+mkdir -p "$__BUILD_DIR/AppDir/lib"
+mkdir -p "$__BUILD_DIR/AppDir/usr/share/applications"
+mkdir -p "$__BUILD_DIR/AppDir/usr/share/icons/hicolor/256x256/apps"
+
+# Copy program data
+if [[ ! $small ]]; then
+	verboseOnly 1 "Packaging program assets..."
+	cp -r "$__PROGRAM_ASSETS"/* "$__BUILD_DIR/AppDir/usr/bin/"
+	cp -r "$__BUILD_DIR/$__PROGRAM_FILENAME" "$__BUILD_DIR/AppDir/usr/bin"
+else
+	verboseOnly 1 "Skipping program asset packing, --small or -s passed..."
+fi
+
+verboseOnly 1 "Packaging SRB2..."
+verboseOnly 1 "Assuming executable name $__PROGRAM_FILENAME"
+cp -r "$__BUILD_DIR/$__PROGRAM_FILENAME" "$__BUILD_DIR/AppDir/usr/bin"
+
+# Copy required dependencies, but only if the program is dynamically linked.
+verboseOnly 1 "Testing if this build is dynamically linked..."
+
+set +e # Disable auto-exit for ldd.
+
+srb2Libraries="$(ldd "$__BUILD_DIR/$__PROGRAM_FILENAME")"
+exitcode="$?"
+
+set -e # Enable it again!
+
+if (( $exitcode == 0 )); then
+	verboseOnly 1 "This build *is* dynamically linked! Packaging dependencies."
+
+	# read the dynamic libraries of srb2, trim off beginning whitespace, and get the third field seperated by spaces
+	# this gives us a newline-seperated list of libraries with their full paths.
+	srb2Libraries="$(echo "$srb2Libraries" | cut -f 2 | cut -d ' ' -f 3)"
+
+	# remove any extraneous newlines around the string
+	libraryWhitelist="$(echo $libraryWhitelist | head -c -1 | tr ' ' '\n')"
+
+	# replace e.g. 'abc' with '(/abc\b)', and replace newlines with '|'.
+	# this converts it into a grep regular expression to check for any whitelisted library names.
+	libraryWhitelist="$(printf "%s" "$libraryWhitelist" | sed 's|.*|(/\0\\b)|' | tr '\n' '|')"
+
+	# grab only the entries that match the regex
+	__LDD_LIST="$(printf "%s" "$srb2Libraries" | grep -E "$libraryWhitelist")"
+
+	# use echo to convert the newline-seperated list into an argument list
+	__LDD_LIST="$(echo $__LDD_LIST)"
+
+	# read into an array because i can't be bothered iterating the lines of a string today
+	# there's so many other things in this file that'd need to be adjusted to be POSIX-compliant anyway
+	IFS=' ' read -r -a paths <<< "$__LDD_LIST"
+
+	for path in "${paths[@]}"; do
+	    if [ -f "$path" ]; then
+	        verboseOnly 2 "Packaging dependency $(basename "$path")..."
+	        cp "$path" $__BUILD_DIR/AppDir/lib/
+	    else
+	        verboseOnly 2 "Dependency $(basename "$path") not found"
+	    fi
+	done
+else
+	verboseOnly 1 "This SRB2 build is statically linked, skipping dependency packing."
+fi
+
+cd "$__BUILD_DIR/AppDir"
+
+# Copy icons
+verboseOnly 1 "Packaging resources..."
+cp "$__ROOT_DIR/srb2.png" "./usr/share/icons/hicolor/256x256/apps/$__PROGRAM_FILENAME.png"
+ln -sf "./usr/share/icons/hicolor/256x256/apps/$__PROGRAM_FILENAME.png" "./.DirIcon"
+ln -sf "./usr/share/icons/hicolor/256x256/apps/$__PROGRAM_FILENAME.png" "./$__PROGRAM_FILENAME.png"
+
+# Make desktop descriptor
+cat > "./usr/share/applications/$__PROGRAM_FILENAME.desktop" <<EOF
+[Desktop Entry]
+Type=Application
+Name=$__PROGRAM_NAME
+Comment=$__PROGRAM_DESCRIPTION
+Icon=$__PROGRAM_FILENAME
+Exec=AppRun %F
+Categories=Game;
+EOF
+
+ln -sf "./usr/share/applications/$__PROGRAM_FILENAME.desktop" "./$__PROGRAM_FILENAME.desktop"
+
+# Make entry point
+echo -e '#!'"$(dirname "$SHELL")/sh" > ./AppRun
+echo -e 'HERE="$(dirname "$(readlink -f "${0}")")"' >> ./AppRun
+echo -e 'SRB2WADDIR=$HERE/usr/bin LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HERE/lib exec $HERE/usr/bin/'"$__PROGRAM_FILENAME"' "$@"' >> ./AppRun
+chmod +x ./AppRun
+
+cd .. # now in $__BUILD_DIR
+
+# Package AppImage
+if [ -z "$__APPIMAGETOOL" ]; then
+	verboseOnly 1 "No valid appimagetool path given or detected, downloading appimagetool..."
+
+	# Print notice for internet connection.
+	important "If the command hangs here, check your internet connection, or download appimagetool and add it to your \$PATH and try compiling again."
+
+	(( "$verbosity" >= 3 )) && wget "$url" || wget -q "$url"
+
+	APPIMAGETOOL="./$(basename "$url")"
+	chmod a+x "$APPIMAGETOOL"
+else
+	verboseOnly 1 "appimagetool path given or detected, no download required."
+	APPIMAGETOOL="$__APPIMAGETOOL"
+fi
+
+verboseOnly 1 "Packing AppImage $__OUTPUT_FILENAME"
+
+if (( verbosity >= 3 )); then
+	"$APPIMAGETOOL" ./AppDir "$__OUTPUT_FILENAME"
+elif (( verbosity >= 2 )); then
+	"$APPIMAGETOOL" ./AppDir "$__OUTPUT_FILENAME" >/dev/null
+else
+	"$APPIMAGETOOL" ./AppDir "$__OUTPUT_FILENAME" >/dev/null 2>&1
+fi
+
+success "AppImage ready!"
+verboseOnly 1 "Cleaning up files..."
+rm -r ./AppDir
+
+if [ -z "$__APPIMAGETOOL" ]; then
+	rm "$APPIMAGETOOL"
+fi
+
+cd "$__ROOT_DIR" # snap back to reality
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ceaf65f04..b7d280190 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+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
diff --git a/LUASTUFF.md b/LUASTUFF.md
index e72ae4c2a..83ec76545 100644
--- a/LUASTUFF.md
+++ b/LUASTUFF.md
@@ -28,6 +28,10 @@ exist.
 Returns the values of the given HUD item's `xoffset`/`yoffset` cvars.
 Available for any HUD item with offset cvars.
 
+## patch = v.cachePatchRotated(name, rollangle)
+Like v.cachePatch, it caches a new patch with the corresponding name. Unlike v.cachePatch, however,
+a rollangle can be supplied to the function so that it returns a rotated patch instead.
+
 ## x, y, flags = v.getDrawInfo(item)
 
 Returns the X, Y and flags where the given HUD item will be drawn for the current displayplayer.
@@ -130,8 +134,72 @@ if rawget(_G, "S_StopSoundByNum") ~= nil then
     ... -- Can use it
 end
 ```
-
 ## addHook("ServerJoin", function())
 
 ServerJoin hook called when client joins server (starting a listen server also calls it for host).
 Generally it was made to make loading custom config files less hacky, but can be used for anything else too.
+
+## player.viewrollangle field
+
+Returns player's current view roll angle for the Screen Tilting feature, useful for HUD elements.
+
+## G_SetPlayerGamepadIndicatorColor(player, skincolor)
+
+Set a custom color for Supported Gamepads with RGB LED functionality.
+To be used with Displayplayers.
+Only takes Skincolors.
+Best to be used in a Loop to ensure the color wont get overwritten by the game.
+
+## G_PlayerDeviceRumble(player, low_strength, high_strength, -optional- duration)
+
+Add Gamepad Rumble support for things.
+To be used with Displayplayers.
+Duration is in milliseconds and is optional to set, default value is 84ms.
+
+## P_CheckSightFast(mo1, mo2)
+
+Exactly same as P_CheckSight but uses cheaper algorithm, useful for things like nametags. Doesn't work exactly
+like P_CheckSight so don't use it for anything gameplay-related.
+
+## musicdef_t
+
+Userdata structure representing a musicdef. Fields:
+
+`musicdef.name` - song identifier ("kmap01" for example).
+
+`musicdef.usage`, `musicdef.source` - fields from vanilla MUSICDEFS lump.
+
+`musicdef.filename` - unused for now.
+
+`musicdef.title`, `musicdef.alttitle`, `musicdef.authors` - fields from MUSCINFO lump.
+
+`#musicdef` - returns integer id for musicdef (which can be used as index in `musicdefs`).
+
+All fields are read-only.
+
+## S_FindMusicCredit(name)
+
+Returns musicdef corresponding to music with given identifier. For example, `S_FindMusicCredit("kmap01")` will return
+musicdef for green hills music.
+
+## musicdefs
+
+Global table for all musicdefs, similar to mobjinfo, states, etc. Can take either integer indices,
+from `0` to `#musicdefs-1`, or string indices (which is equal to calling `S_FindMusicCredit`).
+
+## addHook("MusicCredit", function(musicdef))
+
+Hook is called whenever `S_ShowMusicCredit` (either from game or mod) is called. Takes musicdef as only argument, returning true
+will overwrite vanilla behavior (not show music credit), can be used to implement custom music credit pop-ups.
+
+# Other changes
+
+## P_PlayRinglossSound(source, damager)
+
+Add optional `damager` argument (should be `mobj_t`), which causes hurt sound also play for damager
+if `karthitemdialog` option is enabled
+
+## K_PlayHitEmSound(mobj, victim)
+
+Add optional `victim` argument (should be a player's `mobj_t`), which causes "hit em" sound to be
+delayed and played for victim too if `karthitemdialog` option is enabled
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..0a17f3214
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+ifdef SILENT
+MAKEFLAGS+=--no-print-directory
+endif
+
+all :
+
+% ::
+	@$(MAKE) -C src $(MAKECMDGOALS)
\ No newline at end of file
diff --git a/README.md b/README.md
index d5a3d2b41..1c0ee936d 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ Crashlogs now contain alot more informations. and even more if your build has de
 Also allows 64bit Windows builds to produce Crashlogs!
 
 ## MISC
-- Bird's Camara Tilting feature is no longer turned on by default
+- Bird's Camera Tilting feature is no longer turned on by default
 - Bird's warning on the title screen has been removed
 
 ## Bugs
diff --git a/SRB2.cbp b/SRB2.cbp
index b4cf543db..e5be4f5e0 100644
--- a/SRB2.cbp
+++ b/SRB2.cbp
@@ -1726,11 +1726,6 @@ HW3SOUND for 3D hardware sound  support
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="src/r_draw.h" />
-		<Unit filename="src/r_draw16.c">
-			<Option compilerVar="CC" />
-			<Option compile="0" />
-			<Option link="0" />
-		</Unit>
 		<Unit filename="src/r_draw8.c">
 			<Option compilerVar="CC" />
 			<Option compile="0" />
diff --git a/Srb2.dev b/Srb2.dev
index 8bd36cf49..204021263 100644
--- a/Srb2.dev
+++ b/Srb2.dev
@@ -773,16 +773,6 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit79]
-FileName=src\r_draw16.c
-Folder=R_Rend
-Compile=0
-CompileCpp=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
 [Unit80]
 FileName=src\r_draw8.c
 Folder=R_Rend
diff --git a/bin/FreeBSD/Debug/.gitignore b/bin/FreeBSD/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/bin/FreeBSD/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/bin/FreeBSD/Release/.gitignore b/bin/FreeBSD/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/bin/FreeBSD/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/bin/Linux/Debug/.gitignore b/bin/Linux/Debug/.gitignore
deleted file mode 100644
index 56dee6f95..000000000
--- a/bin/Linux/Debug/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lsdlsrb2
diff --git a/bin/Linux/Release/.gitignore b/bin/Linux/Release/.gitignore
deleted file mode 100644
index 5b5c54a54..000000000
--- a/bin/Linux/Release/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/lsdlsrb2
-/pnd
-/*.mo
diff --git a/bin/Linux64/Debug/.gitignore b/bin/Linux64/Debug/.gitignore
deleted file mode 100644
index 56dee6f95..000000000
--- a/bin/Linux64/Debug/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lsdlsrb2
diff --git a/bin/Linux64/Release/.gitignore b/bin/Linux64/Release/.gitignore
deleted file mode 100644
index c63fd53bc..000000000
--- a/bin/Linux64/Release/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/lsdl2srb2kart
diff --git a/bin/Mingw/Debug/.gitignore b/bin/Mingw/Debug/.gitignore
deleted file mode 100644
index 3458ff764..000000000
--- a/bin/Mingw/Debug/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.exe
-*.mo
-r_opengl.dll
-*.bat
diff --git a/bin/Mingw/Release/.gitignore b/bin/Mingw/Release/.gitignore
deleted file mode 100644
index 3458ff764..000000000
--- a/bin/Mingw/Release/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.exe
-*.mo
-r_opengl.dll
-*.bat
diff --git a/bin/Mingw64/Debug/.gitignore b/bin/Mingw64/Debug/.gitignore
deleted file mode 100644
index e431dca5d..000000000
--- a/bin/Mingw64/Debug/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/srb2sdl.exe
-/srb2win.exe
-/r_opengl.dll
diff --git a/bin/Mingw64/Release/.gitignore b/bin/Mingw64/Release/.gitignore
deleted file mode 100644
index b2443f38d..000000000
--- a/bin/Mingw64/Release/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.exe
-*.mo
-r_opengl.dll
-*.bat
\ No newline at end of file
diff --git a/bin/SDL/Debug/.gitignore b/bin/SDL/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/bin/SDL/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/bin/SDL/Release/.gitignore b/bin/SDL/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/bin/SDL/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/bin/dummy/.gitignore b/bin/dummy/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/bin/dummy/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/comptime.bat b/comptime.bat
index 0c7ea06d6..399c5e527 100644
--- a/comptime.bat
+++ b/comptime.bat
@@ -1,32 +1,32 @@
-@echo off
-set BRA=Unknown
-set REV=illegal
-
-copy nul: /b +%1\comptime.c tmp.$$$ > nul
-move tmp.$$$ %1\comptime.c > nul
-
-if exist .git goto gitrev
-if exist ..\.git goto gitrev
-if exist .svn goto svnrev
-goto filwri
-
-:gitrev
-set GIT=%2
-if "%GIT%"=="" set GIT=git
-for /f "usebackq" %%s in (`%GIT% rev-parse --abbrev-ref HEAD`) do @set BRA=%%s
-for /f "usebackq" %%s in (`%GIT% rev-parse HEAD`) do @set REV=%%s
-set REV=%REV:~0,8%
-goto filwri
-
-:svnrev
-set BRA=Subversion
-for /f "usebackq" %%s in (`svnversion .`) do @set REV=%%s
-set REV=r%REV%
-goto filwri
-
-:filwri
-echo // Do not edit!  This file was autogenerated > %1\comptime.h
-echo // by the %0 batch file >> %1\comptime.h
-echo // >> %1\comptime.h
-echo const char* compbranch = "%BRA%"; >> %1\comptime.h
-echo const char* comprevision = "%REV%"; >> %1\comptime.h
+@echo off
+set BRA=Unknown
+set REV=illegal
+
+copy nul: /b +%1\comptime.c tmp.$$$ > nul
+move tmp.$$$ %1\comptime.c > nul
+
+if exist .git goto gitrev
+if exist ..\.git goto gitrev
+if exist .svn goto svnrev
+goto filwri
+
+:gitrev
+set GIT=%2
+if "%GIT%"=="" set GIT=git
+for /f "usebackq" %%s in (`%GIT% rev-parse --abbrev-ref HEAD`) do @set BRA=%%s
+for /f "usebackq" %%s in (`%GIT% rev-parse HEAD`) do @set REV=%%s
+set REV=%REV:~0,8%
+goto filwri
+
+:svnrev
+set BRA=Subversion
+for /f "usebackq" %%s in (`svnversion .`) do @set REV=%%s
+set REV=r%REV%
+goto filwri
+
+:filwri
+echo // Do not edit!  This file was autogenerated > %1\comptime.h
+echo // by the %0 batch file >> %1\comptime.h
+echo // >> %1\comptime.h
+echo const char* compbranch = "%BRA%"; >> %1\comptime.h
+echo const char* comprevision = "%REV%"; >> %1\comptime.h
diff --git a/comptime.sh b/comptime.sh
index 18fd6c34f..82dfa0060 100755
--- a/comptime.sh
+++ b/comptime.sh
@@ -17,7 +17,7 @@ EOF
 
 versiongit() {
 	gitbranch="$(git rev-parse --abbrev-ref HEAD)"
-	gitversion="$(git rev-parse HEAD | cut -c -8)"
+	gitversion="$(git show --pretty=format:'%h %s' -s HEAD | sed 's/"/\\"/g')"
 	version "$gitbranch" "$gitversion";
 	exit 0
 }
diff --git a/libs/gettext/bin32/autopoint b/libs/gettext/bin32/autopoint
deleted file mode 100755
index 0d3f47f84..000000000
--- a/libs/gettext/bin32/autopoint
+++ /dev/null
@@ -1,717 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2002-2010 Free Software Foundation, Inc.
-#
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This file is meant for authors, maintainers, co-maintainers or installers
-# of packages which are internationalized with the help of GNU gettext.  For
-# further information how to use it consult the GNU gettext manual.
-
-progname=$0
-package=gettext-tools
-version=0.18.1
-
-# Set variables
-# - gettext_dir     directory where the sources are stored.
-prefix="/usr/local/i686-w64-mingw32/stow/gettext-0.18.1.1"
-datarootdir="${prefix}/share"
-gettext_dir="${datarootdir}/gettext"
-
-# func_tmpdir
-# creates a temporary directory.
-# Sets variable
-# - tmp             pathname of freshly created temporary directory
-func_tmpdir ()
-{
-  # Use the environment variable TMPDIR, falling back to /tmp. This allows
-  # users to specify a different temporary directory, for example, if their
-  # /tmp is filled up or too small.
-  : ${TMPDIR=/tmp}
-  {
-    # Use the mktemp program if available. If not available, hide the error
-    # message.
-    tmp=`(umask 077 && mktemp -d "$TMPDIR/gtXXXXXX") 2>/dev/null` &&
-    test -n "$tmp" && test -d "$tmp"
-  } ||
-  {
-    # Use a simple mkdir command. It is guaranteed to fail if the directory
-    # already exists.  $RANDOM is bash specific and expands to empty in shells
-    # other than bash, ksh and zsh.  Its use does not increase security;
-    # rather, it minimizes the probability of failure in a very cluttered /tmp
-    # directory.
-    tmp=$TMPDIR/gt$$-$RANDOM
-    (umask 077 && mkdir "$tmp")
-  } ||
-  {
-    echo "$0: cannot create a temporary directory in $TMPDIR" >&2
-    { (exit 1); exit 1; }
-  }
-}
-
-# Support for relocatability.
-func_find_curr_installdir ()
-{
-  # Determine curr_installdir, even taking into account symlinks.
-  curr_executable="$0"
-  case "$curr_executable" in
-    */* | *\\*) ;;
-    *) # Need to look in the PATH.
-      if test "${PATH_SEPARATOR+set}" != set; then
-        func_tmpdir
-        { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
-        chmod +x "$tmp"/conf.sh
-        if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
-          PATH_SEPARATOR=';'
-        else
-          PATH_SEPARATOR=:
-        fi
-        rm -rf "$tmp"
-      fi
-      save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
-      for dir in $PATH; do
-        IFS="$save_IFS"
-        test -z "$dir" && dir=.
-        for exec_ext in ''; do
-          if test -f "$dir/$curr_executable$exec_ext"; then
-            curr_executable="$dir/$curr_executable$exec_ext"
-            break 2
-          fi
-        done
-      done
-      IFS="$save_IFS"
-      ;;
-  esac
-  # Make absolute.
-  case "$curr_executable" in
-    /* | ?:/* | ?:\\*) ;;
-    *) curr_executable=`pwd`/"$curr_executable" ;;
-  esac
-  # Resolve symlinks.
-  sed_dirname='s,/[^/]*$,,'
-  sed_linkdest='s,^.* -> \(.*\),\1,p'
-  while : ; do
-    lsline=`LC_ALL=C ls -l "$curr_executable"`
-    case "$lsline" in
-      *" -> "*)
-        linkdest=`echo "$lsline" | sed -n -e "$sed_linkdest"`
-        case "$linkdest" in
-          /* | ?:/* | ?:\\*) curr_executable="$linkdest" ;;
-          *) curr_executable=`echo "$curr_executable" | sed -e "$sed_dirname"`/"$linkdest" ;;
-        esac ;;
-      *) break ;;
-    esac
-  done
-  curr_installdir=`echo "$curr_executable" | sed -e 's,/[^/]*$,,'`
-  # Canonicalize.
-  curr_installdir=`cd "$curr_installdir" && pwd`
-}
-func_find_prefixes ()
-{
-  # Compute the original/current installation prefixes by stripping the
-  # trailing directories off the original/current installation directories.
-  orig_installprefix="$orig_installdir"
-  curr_installprefix="$curr_installdir"
-  while true; do
-    orig_last=`echo "$orig_installprefix" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    curr_last=`echo "$curr_installprefix" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    if test -z "$orig_last" || test -z "$curr_last"; then
-      break
-    fi
-    if test "$orig_last" != "$curr_last"; then
-      break
-    fi
-    orig_installprefix=`echo "$orig_installprefix" | sed -e 's,/[^/]*$,,'`
-    curr_installprefix=`echo "$curr_installprefix" | sed -e 's,/[^/]*$,,'`
-  done
-}
-if test "no" = yes; then
-  exec_prefix="${prefix}"
-  bindir="${exec_prefix}/bin"
-  orig_installdir="$bindir" # see Makefile.am's *_SCRIPTS variables
-  func_find_curr_installdir # determine curr_installdir
-  func_find_prefixes
-  # Relocate the directory variables that we use.
-  gettext_dir=`echo "$gettext_dir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
-fi
-
-# func_usage
-# outputs to stdout the --help usage message.
-func_usage ()
-{
-  echo "\
-Usage: autopoint [OPTION]...
-
-Copies standard gettext infrastructure files into a source package.
-
-Options:
-      --help           print this help and exit
-      --version        print version information and exit
-  -f, --force          force overwriting of files that already exist
-  -n, --dry-run        print modifications but don't perform them"
-#  echo "\
-#  -V version           copy the infrastructure of the specified gettext version
-#                         (dangerous)"
-  echo "
-Report bugs to <bug-gnu-gettext@gnu.org>."
-}
-
-# func_version
-# outputs to stdout the --version message.
-func_version ()
-{
-  echo "$progname (GNU $package) $version"
-  echo "Uses a versions archive in git format."
-  echo "Copyright (C) 2002-2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law."
-  echo "Written by" "Bruno Haible"
-}
-
-# func_fatal_error message
-# outputs to stderr a fatal error message, and terminates the program.
-func_fatal_error ()
-{
-  echo "autopoint: *** $1" 1>&2
-  echo "autopoint: *** Stop." 1>&2
-  exit 1
-}
-
-# Command-line option processing.
-# Removes the OPTIONS from the arguments. Sets the variables:
-# - force           yes if --force was given, empty otherwise
-# - ver             gettext version if -V was given, empty otherwise
-# - doit            false if --dry-run was given, : otherwise
-{
-  force=
-  ver=
-  doit=:
-
-  while test $# -gt 0; do
-    case "$1" in
-      -n | --dry-run | --dry-ru | --dry-r | --dry- | --dry | --dr | --d )
-        shift
-        doit=false ;;
-      -f | --force | --forc | --for | --fo | --f )
-        shift
-        force=yes ;;
-      --help | --hel | --he | --h )
-        func_usage; exit 0 ;;
-#      -V ) # Some people put a space between -V and the version number.
-#        shift
-#        if test $# = 0; then
-#          func_usage 1>&2
-#          exit 1
-#        fi
-#        ver=$1;
-#        shift ;;
-#      -V*) # Some people omit the space between -V and the version number.
-#        ver=`echo "X$1" | sed -e 's/^X-V//'`
-#        shift ;;
-      --version | --versio | --versi | --vers | --ver | --ve | --v )
-        func_version
-        exit 0 ;;
-      -- ) # Stop option prcessing
-        shift; break ;;
-      -* )
-        echo "autopoint: unknown option $1" 1>&2
-        echo "Try 'autopoint --help' for more information." 1>&2
-        exit 1 ;;
-      * )
-        break ;;
-    esac
-  done
-}
-
-# Command-line argument processing.
-# Analyzes the remaining arguments.
-{
-  if test $# -gt 0; then
-    func_usage 1>&2
-    exit 1
-  fi
-}
-
-srcdir=`pwd`
-# The current directory is now $srcdir.
-
-# Check integrity of package: A configure.in/ac must be present. Sets variable
-# - configure_in    name of configure.in/ac file.
-if test -f configure.in; then
-  configure_in=configure.in
-else
-  if test -f configure.ac; then
-    configure_in=configure.ac
-  else
-    # KDE specific convention: configure.in.in
-    if test -f configure.in.in; then
-      configure_in=configure.in.in
-    else
-      func_fatal_error "Missing configure.in or configure.ac, please cd to your package first."
-    fi
-  fi
-fi
-
-# Check whether the -V option and the version number in configure.in match.
-# At least one of the two must be given. If both are given, they must agree.
-sed_extract_AM_GNU_GETTEXT_VERSION_argument='s/^AM_GNU_GETTEXT_VERSION(\([^()]*\)).*$/\1/'
-sed_remove_outer_brackets='s/^\[\(.*\)\]$/\1/'
-xver=`cat "$configure_in" | grep '^AM_GNU_GETTEXT_VERSION(' | sed -n -e "$sed_extract_AM_GNU_GETTEXT_VERSION_argument"p | sed -e "$sed_remove_outer_brackets" | sed -e 1q`
-if test -z "$xver" && test -f intl/VERSION; then
-  xver=`cat intl/VERSION | LC_ALL=C sed -n -e 's/^.*gettext-\([-+_.0-9A-Za-z]*\).*$/\1/p'`
-fi
-if test -n "$xver"; then
-  if test -n "$ver"; then
-    if test "X$ver" != "X$xver"; then
-      func_fatal_error "Version mismatch: specified -V $ver but the package uses gettext version $xver"
-    fi
-  else
-    ver="$xver"
-  fi
-else
-  if test -z "$ver"; then
-    func_fatal_error "Missing version: please specify in $configure_in through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using"
-  fi
-fi
-
-# Check whether the version number is supported.
-case "$ver" in
-  0.10.35 | 0.10.36 | 0.10.37 | 0.10.38 | 0.10.39 | 0.10.40 | \
-  0.11 | 0.11.1 | 0.11.2 | 0.11.3 | 0.11.4 | 0.11.5 | \
-  0.12 | 0.12.1 | \
-  0.13 | 0.13.1 | \
-  0.14 | 0.14.1 | 0.14.2 | 0.14.3 | 0.14.4 | 0.14.5 | 0.14.6 | \
-  0.15 | \
-  0.16 | 0.16.1 | \
-  0.17 | \
-  0.18 | 0.18.1 )
-    ;;
-  *)
-    func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in
-               file requires the infrastructure from gettext-$ver but this version
-               is older. Please upgrade to gettext-$ver or newer."
-    ;;
-esac
-
-# Check in which directory config.rpath, mkinstalldirs etc. belong.
-auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-if test -n "$auxdir"; then
-  auxdir="$auxdir/"
-fi
-
-# Check in which directory the *.m4 macros belong.
-m4dir=m4
-if test -f Makefile.am; then
-  # A package using automake.
-  # Extract the macro directory name from Makefile.am.
-  aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
-  m4dir_is_next=
-  for arg in $aclocal_amflags; do
-    if test -n "$m4dir_is_next"; then
-      m4dir="$arg"
-      break
-    else
-      if test "X$arg" = "X-I"; then
-        m4dir_is_next=yes
-      else
-        m4dir_is_next=
-      fi
-    fi
-  done
-fi
-
-# Check whether to omit the intl/ directory.
-omitintl=`cat "$configure_in" | grep '^AM_GNU_GETTEXT' | sed -n -e 's/^AM_GNU_GETTEXT(\([^(),]*\).*$/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-omitintl=`if test 'external' = "$omitintl"; then echo yes; fi`
-
-# Check in which directory or directories the po/* infrastructure belongs.
-sed_extract_config_files='s,#.*$,,
-s,^dnl .*$,,
-s, dnl .*$,,
-/AC_CONFIG_FILES(/ {
-  ta
-  :a
-    s/)/)/
-    tb
-    s/\\$//
-    N
-    ba
-  :b
-  s,^.*AC_CONFIG_FILES([[ ]*\([^]"$`\\)]*\).*$,\1,p
-}'
-configfiles=`cat "$configure_in" | sed -n -e "$sed_extract_config_files"`
-# PO directories have a Makefile.in generated from Makefile.in.in.
-# Treat a directory as a PO directory if and only if it has a
-# POTFILES.in file. This allows packages to have multiple PO
-# directories under different names or in different locations.
-sed_remove_Makefile_in='s,/Makefile\.in$,,'
-podirs=`for f in $configfiles; do case "$f" in */Makefile.in) echo $f;; esac; done | sed -e "$sed_remove_Makefile_in"`
-if test -z "$podirs"; then
-  # If we cannot get the list of PO directories from configure.ac, assume the
-  # common default.
-  podirs="po"
-fi
-
-# Set up a temporary checkout directory.
-# Set variables
-# - work_dir        directory containing the temporary checkout
-work_dir=tmpwrk$$
-mkdir "$work_dir" || {
-  if test -d "$work_dir"; then
-    func_fatal_error "directory $work_dir already exists"
-  else
-    func_fatal_error "cannot create directory $work_dir"
-  fi
-}
-
-# We support three archive formats.
-#
-# Format | Size (KiB) for gettext-0.17 | Extra tools needed |
-# -------+-----------------------------+--------------------+
-#  dir   |            3000             |         --         |
-#  cvs   |             356             |         cvs        |
-#  git   |             484             |         git        |
-# -------+-----------------------------+--------------------+
-
-case "git" in
-  dir)
-    # The archive of different versions is very large, but using it does not
-    # require special tools.
-    gzip -d -c < "$gettext_dir/archive.dir.tar.gz" | (cd "$work_dir" && tar xf - "gettext-$ver")
-    if test `find "$work_dir" -type f -print | wc -l` = 0; then
-      rm -rf "$work_dir"
-      func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
-    fi
-    mv "$work_dir/gettext-$ver" "$work_dir/archive"
-    ;;
-
-  cvs)
-    # We distributed the many different versions of the files in a CVS
-    # repository. This guaranteed a good compression rate:
-    #
-    #   Including version    size in KB of
-    #                       "du autopoint-files/archive"
-    #      0.10.35                  240
-    #      0.10.36                  428
-    #      0.10.37                  436
-    #      0.10.38                  488
-    #      0.10.39                  500
-    #      0.10.40                  528
-    #      0.11                     720
-    #      0.11.1                   740
-    #      0.11.2                   748
-    #      0.11.3                   804
-    #      0.11.4                   864
-    #      0.11.5                   880
-    #      0.12                    1032
-    #      0.12.1                  1032
-    #      0.13                    1220
-    #      0.13.1                  1236
-    #      0.14                    1296
-    #      0.14.1                  1300
-    #      0.14.2                  1420
-    #      0.14.3                  1428
-    #      0.14.4                  1464
-    #      0.14.5                  1508
-    #      0.14.6                  1580
-    #      0.15                    1760
-    #      0.16                    1808
-    #      0.16.1                  1812
-    #      0.17                    2128
-    #      0.18                    2656
-    #
-    # The requirement that the user must have the CVS program available is not
-    # a severe restrictions, because most of the people who use autopoint are
-    # users of CVS.
-    #
-    # But the CVS format is now deprecated, because "cvs init" does not work in
-    # all circumstances
-    # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-05/msg00003.html>)
-    # and we are not allowed to distribute the cvs infrastructure files
-    # ourselves
-    # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-06/msg00011.html>).
-    #
-    # Check availability of the CVS program.
-    (cvs -v) >/dev/null 2>/dev/null || func_fatal_error "cvs program not found"
-
-    # Set up a temporary CVS repository.
-    # We need the temporary CVS repository because any checkout needs write
-    # access to the CVSROOT/history file, so it cannot be under $gettext_dir.
-    # We need the temporary checkout directory because when --force was not
-    # given, we need to compare the existing files with the checked out ones.
-    # Set variables
-    # - cvs_dir         directory containing the temporary repository
-    cvs_dir=tmpcvs$$
-    # Use an umask of 077, to avoid attacks that work by overwriting files in
-    # the "$CVSROOT"/CVSROOT directory.
-    (umask 077 && mkdir "$cvs_dir") || {
-      if test -d "$cvs_dir"; then
-        func_fatal_error "directory $cvs_dir already exists"
-      else
-        func_fatal_error "cannot create directory $cvs_dir"
-      fi
-    }
-    CVSROOT="$srcdir/$cvs_dir"
-    unset CVS_CLIENT_LOG
-    unset CVS_CLIENT_PORT
-    unset CVS_IGNORE_REMOTE_ROOT
-    unset CVS_LOCAL_BRANCH_NUM
-    unset CVS_NOBASES
-    unset CVS_PASSFILE
-    unset CVS_PASSWORD
-    unset CVS_PROXY_PORT
-    unset CVS_RCMD_PORT
-    unset CVS_RSH
-    unset CVS_SERVER
-    unset CVS_SERVER_SLEEP
-    CVS_SIGN_COMMITS=
-    export CVS_SIGN_COMMITS
-    unset CVS_SSH
-    unset CVS_VERIFY_CHECKOUTS
-    unset CVS_VERIFY_TEMPLATE
-    unset CVSIGNORE
-    unset CVSREAD
-    unset CVSREADONLYFS
-    unset CVSUMASK
-    unset CVSWRAPPERS
-
-    # Need to pass -d "$CVSROOT", because there may be a CVS directory in the
-    # current directory.
-    cvs -d "$CVSROOT" init
-    gzip -d -c < "$gettext_dir/archive.cvs.tar.gz" | (cd "$cvs_dir" && tar xf -)
-
-    cd "$work_dir"
-    cvsver=gettext-`echo "$ver" | sed -e 's/\./_/g'`
-    (cvs -d "$CVSROOT" checkout -r"$cvsver" archive > /dev/null) 2>&1 | grep -v '^cvs checkout: Updating'
-    find archive -name CVS -type d -print | xargs rm -rf
-    cd ..
-    rm -rf "$cvs_dir"
-    # Check that really all CVS directories are gone, otherwise we would overwrite
-    # the contents of the user's CVS directories.
-    if test `find $work_dir/archive -name CVS -type d -print | wc -l` != 0; then
-      rm -rf "$work_dir"
-      func_fatal_error "failed to remove all CVS subdirectories"
-    fi
-    if test `find $work_dir/archive -type f -print | wc -l` = 0; then
-      rm -rf "$work_dir"
-      func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
-    fi
-    ;;
-
-  git)
-    # Check availability of the git program.
-    (git --version) >/dev/null 2>/dev/null || func_fatal_error "git program not found"
-    mkdir "$work_dir/archive"
-    gzip -d -c < "$gettext_dir/archive.git.tar.gz" | (cd "$work_dir/archive" && tar xf -)
-    (cd "$work_dir/archive" && git checkout -q "gettext-$ver") || {
-      rm -rf "$work_dir"
-      func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
-    }
-    (cd "$work_dir/archive" && rm -rf .git .gitignore)
-    ;;
-esac
-
-# func_destfile file
-# determines the destination file, relative to the package's top level
-# directory, for a given file name, relative to archive.
-# Sets variables
-# - destfile        relative destination file name, or
-#                   empty if the file shall be omitted
-# - sharedowner     yes if the file is not only owned by GNU gettext but may
-#                   be installed by automake or other tools, otherwise empty
-# - allpodirs       yes if the file is to be installed in every dir in $podirs
-func_destfile ()
-{
-  # There are five categories of files:
-  # ABOUT_NLS -> top level directory
-  # config.rpath mkinstalldirs -> $auxdir
-  # m4/* -> $m4dir/
-  # intl/* -> intl/
-  # po/* -> 
-  sharedowner=
-  allpodirs=
-  case `echo "$1" | sed -e 's,[^/]*$,,'` in
-    "" )
-      case "$1" in
-        config.rpath ) destfile="$auxdir$1" ;;
-        mkinstalldirs ) destfile="$auxdir$1" sharedowner=yes ;;
-        * ) destfile="$1" ;;
-      esac
-      ;;
-    m4/ ) destfile=`echo "$1" | sed -e "s,^m4/,$m4dir/,"` ;;
-    intl/ ) if test -n "$omitintl"; then destfile=""; else destfile="$1"; fi ;;
-    po/ ) destfile=`echo "$1" | sed -e "s,^po/,,"` allpodirs=yes ;;
-    * ) destfile="$1" ;;
-  esac
-}
-
-# func_compare existingfile gettextfile
-# compares the existing file and the file from gettext, and decides whether the
-# existing file should be overwritten with the file from gettext. Returns 0 if
-# it should be overwritten, or 1 if it should be skipped.
-sed_extract_serial='s/^#.* serial \([^ ]*\).*/\1/p
-1q'
-func_compare ()
-{
-  if cmp -s "$1" "$2"; then
-    false
-  else
-    case "$2" in
-      *.m4)
-        # For interoperability with gnulib. gnulib often has newer versions of
-        # the *.m4 files than the latest gettext release. Don't overwrite a
-        # newer version from gnulib with an older version from the gettext
-        # release. The version can be retrieved from the first line, which
-        # looks like this:   # file.m4 serial NN ...
-        existing_serial=`sed -n -e "$sed_extract_serial" < "$1"`
-        gettext_serial=`sed -n -e "$sed_extract_serial" < "$2"`
-        if test -n "$existing_serial" && test -n "$gettext_serial" \
-           && test "$existing_serial" -ge "$gettext_serial" 2> /dev/null; then
-          false
-        else
-          true
-        fi
-        ;;
-      *)
-        true
-        ;;
-    esac
-  fi
-}
-
-# If some files have been locally modified and we have not been requested
-# to overwrite them, then bail out. This is better than leaving a source
-# package around where half of the files are locally modified and half are
-# original - too great risk of version mismatch.
-if test -z "$force"; then
-  mismatch=
-  func_tmpdir
-  mismatchfile="$tmp"/autopoint.diff
-  for file in `find "$work_dir/archive" -type f -print | sed -e "s,^$work_dir/archive/,," | LC_ALL=C sort`; do
-    func_destfile "$file"
-    if test -n "$destfile"; then
-      func_compare_to_destfile ()
-      {
-        finaldestfile="$1"
-        if test -f "$finaldestfile"; then
-          if func_compare "$finaldestfile" "$work_dir/archive/$file"; then
-            if test -n "$sharedowner"; then
-              echo "autopoint: warning: File $finaldestfile has been locally modified." 1>&2
-            else
-              echo "autopoint: File $finaldestfile has been locally modified." 1>&2
-              mismatch=yes
-              diff -c "$work_dir/archive/$file" "$finaldestfile" | sed -e "1s,$work_dir/archive/,," >> "$mismatchfile"
-            fi
-          fi
-        fi
-      }
-      if test -n "$allpodirs"; then
-        for dir in $podirs; do
-          func_compare_to_destfile "$dir/$destfile"
-        done
-      else
-        func_compare_to_destfile "$destfile"
-      fi
-    fi
-  done
-  if test -n "$mismatch"; then
-    rm -rf "$work_dir"
-    func_fatal_error "Some files have been locally modified. Not overwriting them because --force has not been specified. For your convenience, you find the local modifications in the file '$mismatchfile'."
-  fi
-  rm -rf "$tmp"
-fi
-
-# func_mkdir_for to
-# ensures the directory that would the given file exists.
-# 'to' is a relative pathname, relative to the current directory.
-func_mkdir_for ()
-{
-  base=`echo "$1" | sed -e 's,/[^/]*$,,'`
-  if test "X$base" != "X$1" && test -n "$base"; then
-    func_mkdir_for "$base"
-    # Recompute base. It was clobbered by the recursive call.
-    base=`echo "$1" | sed -e 's,/[^/]*$,,'`
-    test -d "$base" || { echo "Creating directory $base"; mkdir "$base"; }
-  fi
-}
-
-# func_copy from to
-# copies a file.
-# 'from' is a relative pathname, relative to the current directory.
-# 'to' is a relative pathname, relative to the current directory.
-func_copy ()
-{
-  if $doit; then
-    func_mkdir_for "$2"
-    rm -f "$2"
-    echo "Copying file $2"
-    cp "$1" "$2"
-  else
-    echo "Copy file $2"
-  fi
-}
-
-# func_backup to
-# makes a backup of a file that is about to be overwritten or replaced.
-# 'to' is a relative pathname, relative to the current directory.
-func_backup ()
-{
-  if $doit; then
-    if test -f "$1"; then
-      rm -f "$1~"
-      cp -p "$1" "$1~"
-    fi
-  fi
-}
-
-# Now copy the files.
-for file in `find "$work_dir/archive" -type f -print | sed -e "s,^$work_dir/archive/,," | LC_ALL=C sort`; do
-  func_destfile "$file"
-  if test -n "$destfile"; then
-    func_copy_to_destfile ()
-    {
-      finaldestfile="$1"
-      mustcopy=
-      if test -f "$finaldestfile"; then
-        if func_compare "$finaldestfile" "$work_dir/archive/$file"; then
-          if test -n "$force"; then
-            # Overwrite locally modified file.
-            mustcopy=yes
-          fi
-          # If --force is not specified, don't overwrite locally modified files
-          # for which GNU gettext is a shared owner.
-        fi
-      else
-        mustcopy=yes
-      fi
-      if test -n "$mustcopy"; then
-        func_backup "$finaldestfile"
-        func_copy "$work_dir/archive/$file" "$finaldestfile"
-      fi
-    }
-    if test -n "$allpodirs"; then
-      for dir in $podirs; do
-        func_copy_to_destfile "$dir/$destfile"
-      done
-    else
-      func_copy_to_destfile "$destfile"
-    fi
-  fi
-done
-
-# That's it.
-rm -rf "$work_dir"
-exit 0
diff --git a/libs/gettext/bin32/envsubst.exe b/libs/gettext/bin32/envsubst.exe
deleted file mode 100644
index 3c326aa0d..000000000
Binary files a/libs/gettext/bin32/envsubst.exe and /dev/null differ
diff --git a/libs/gettext/bin32/gettext.exe b/libs/gettext/bin32/gettext.exe
deleted file mode 100644
index eb1048ebc..000000000
Binary files a/libs/gettext/bin32/gettext.exe and /dev/null differ
diff --git a/libs/gettext/bin32/gettext.sh b/libs/gettext/bin32/gettext.sh
deleted file mode 100755
index 2369ab501..000000000
--- a/libs/gettext/bin32/gettext.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, 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.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-# USA.
-#
-
-# Find a way to echo strings without interpreting backslash.
-if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-  echo='echo'
-else
-  if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-    echo='printf %s\n'
-  else
-    echo_func () {
-      cat <<EOT
-$*
-EOT
-    }
-    echo='echo_func'
-  fi
-fi
-
-# This script is primarily a shell function library. In order for
-# ". gettext.sh" to find it, we install it in $PREFIX/bin (that is usually
-# contained in $PATH), rather than in some other location such as
-# $PREFIX/share/sh-scripts or $PREFIX/share/gettext. In order to not violate
-# the Filesystem Hierarchy Standard when doing so, this script is executable.
-# Therefore it needs to support the standard --help and --version.
-if test -z "$ZSH_VERSION"; then
-  # zsh is not POSIX compliant: By default, while ". gettext.sh" is executed,
-  # it sets $0 to "gettext.sh", defeating the purpose of this test. But
-  # fortunately we know that when running under zsh, this script is always
-  # being sourced, not executed, because hardly anyone is crazy enough to
-  # install zsh as /bin/sh.
-  case "$0" in
-    gettext.sh | */gettext.sh | *\\gettext.sh)
-      progname=$0
-      package=gettext-runtime
-      version=0.18.1
-      # func_usage
-      # outputs to stdout the --help usage message.
-      func_usage ()
-      {
-        echo "GNU gettext shell script function library version $version"
-        echo "Usage: . gettext.sh"
-      }
-      # func_version
-      # outputs to stdout the --version message.
-      func_version ()
-      {
-        echo "$progname (GNU $package) $version"
-        echo "Copyright (C) 2003-2007 Free Software Foundation, Inc.
-License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law."
-        echo "Written by" "Bruno Haible"
-      }
-      if test $# = 1; then
-        case "$1" in
-          --help | --hel | --he | --h )
-            func_usage; exit 0 ;;
-          --version | --versio | --versi | --vers | --ver | --ve | --v )
-            func_version; exit 0 ;;
-        esac
-      fi
-      func_usage 1>&2
-      exit 1
-      ;;
-  esac
-fi
-
-# eval_gettext MSGID
-# looks up the translation of MSGID and substitutes shell variables in the
-# result.
-eval_gettext () {
-  gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1")
-}
-
-# eval_ngettext MSGID MSGID-PLURAL COUNT
-# looks up the translation of MSGID / MSGID-PLURAL for COUNT and substitutes
-# shell variables in the result.
-eval_ngettext () {
-  ngettext "$1" "$2" "$3" | (export PATH `envsubst --variables "$1 $2"`; envsubst "$1 $2")
-}
-
-# Note: This use of envsubst is much safer than using the shell built-in 'eval'
-# would be.
-# 1) The security problem with Chinese translations that happen to use a
-#    character such as \xe0\x60 is avoided.
-# 2) The security problem with malevolent translators who put in command lists
-#    like "$(...)" or "`...`" is avoided.
-# 3) The translations can only refer to shell variables that are already
-#    mentioned in MSGID or MSGID-PLURAL.
-#
-# Note: "export PATH" above is a dummy; this is for the case when
-# `envsubst --variables ...` returns nothing.
-#
-# Note: In eval_ngettext above, "$1 $2" means a string whose variables set is
-# the union of the variables set of "$1" and "$2".
-#
-# Note: The minimal use of backquote above ensures that trailing newlines are
-# not dropped, not from the gettext invocation and not from the value of any
-# shell variable.
-#
-# Note: Field splitting on the `envsubst --variables ...` result is desired,
-# since envsubst outputs the variables, separated by newlines. Pathname
-# wildcard expansion or tilde expansion has no effect here, since the words
-# output by "envsubst --variables ..." consist solely of alphanumeric
-# characters and underscore.
diff --git a/libs/gettext/bin32/gettextize b/libs/gettext/bin32/gettextize
deleted file mode 100755
index 27a23b732..000000000
--- a/libs/gettext/bin32/gettextize
+++ /dev/null
@@ -1,1281 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
-#
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This file is meant for authors or maintainers which want to
-# internationalize their package with the help of GNU gettext.  For
-# further information how to use it consult the GNU gettext manual.
-
-progname=$0
-package=gettext-tools
-version=0.18.1
-
-# Set variables
-# - gettext_dir     directory where the sources are stored.
-prefix="/usr/local/i686-w64-mingw32/stow/gettext-0.18.1.1"
-datarootdir="${prefix}/share"
-gettext_dir="${datarootdir}/gettext"
-
-# func_tmpdir
-# creates a temporary directory.
-# Sets variable
-# - tmp             pathname of freshly created temporary directory
-func_tmpdir ()
-{
-  # Use the environment variable TMPDIR, falling back to /tmp. This allows
-  # users to specify a different temporary directory, for example, if their
-  # /tmp is filled up or too small.
-  : ${TMPDIR=/tmp}
-  {
-    # Use the mktemp program if available. If not available, hide the error
-    # message.
-    tmp=`(umask 077 && mktemp -d "$TMPDIR/gtXXXXXX") 2>/dev/null` &&
-    test -n "$tmp" && test -d "$tmp"
-  } ||
-  {
-    # Use a simple mkdir command. It is guaranteed to fail if the directory
-    # already exists.  $RANDOM is bash specific and expands to empty in shells
-    # other than bash, ksh and zsh.  Its use does not increase security;
-    # rather, it minimizes the probability of failure in a very cluttered /tmp
-    # directory.
-    tmp=$TMPDIR/gt$$-$RANDOM
-    (umask 077 && mkdir "$tmp")
-  } ||
-  {
-    echo "$0: cannot create a temporary directory in $TMPDIR" >&2
-    { (exit 1); exit 1; }
-  }
-}
-
-# Support for relocatability.
-func_find_curr_installdir ()
-{
-  # Determine curr_installdir, even taking into account symlinks.
-  curr_executable="$0"
-  case "$curr_executable" in
-    */* | *\\*) ;;
-    *) # Need to look in the PATH.
-      if test "${PATH_SEPARATOR+set}" != set; then
-        func_tmpdir
-        { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
-        chmod +x "$tmp"/conf.sh
-        if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
-          PATH_SEPARATOR=';'
-        else
-          PATH_SEPARATOR=:
-        fi
-        rm -rf "$tmp"
-      fi
-      save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
-      for dir in $PATH; do
-        IFS="$save_IFS"
-        test -z "$dir" && dir=.
-        for exec_ext in ''; do
-          if test -f "$dir/$curr_executable$exec_ext"; then
-            curr_executable="$dir/$curr_executable$exec_ext"
-            break 2
-          fi
-        done
-      done
-      IFS="$save_IFS"
-      ;;
-  esac
-  # Make absolute.
-  case "$curr_executable" in
-    /* | ?:/* | ?:\\*) ;;
-    *) curr_executable=`pwd`/"$curr_executable" ;;
-  esac
-  # Resolve symlinks.
-  sed_dirname='s,/[^/]*$,,'
-  sed_linkdest='s,^.* -> \(.*\),\1,p'
-  while : ; do
-    lsline=`LC_ALL=C ls -l "$curr_executable"`
-    case "$lsline" in
-      *" -> "*)
-        linkdest=`echo "$lsline" | sed -n -e "$sed_linkdest"`
-        case "$linkdest" in
-          /* | ?:/* | ?:\\*) curr_executable="$linkdest" ;;
-          *) curr_executable=`echo "$curr_executable" | sed -e "$sed_dirname"`/"$linkdest" ;;
-        esac ;;
-      *) break ;;
-    esac
-  done
-  curr_installdir=`echo "$curr_executable" | sed -e 's,/[^/]*$,,'`
-  # Canonicalize.
-  curr_installdir=`cd "$curr_installdir" && pwd`
-}
-func_find_prefixes ()
-{
-  # Compute the original/current installation prefixes by stripping the
-  # trailing directories off the original/current installation directories.
-  orig_installprefix="$orig_installdir"
-  curr_installprefix="$curr_installdir"
-  while true; do
-    orig_last=`echo "$orig_installprefix" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    curr_last=`echo "$curr_installprefix" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    if test -z "$orig_last" || test -z "$curr_last"; then
-      break
-    fi
-    if test "$orig_last" != "$curr_last"; then
-      break
-    fi
-    orig_installprefix=`echo "$orig_installprefix" | sed -e 's,/[^/]*$,,'`
-    curr_installprefix=`echo "$curr_installprefix" | sed -e 's,/[^/]*$,,'`
-  done
-}
-if test "no" = yes; then
-  exec_prefix="${prefix}"
-  bindir="${exec_prefix}/bin"
-  orig_installdir="$bindir" # see Makefile.am's *_SCRIPTS variables
-  func_find_curr_installdir # determine curr_installdir
-  func_find_prefixes
-  # Relocate the directory variables that we use.
-  gettext_dir=`echo "$gettext_dir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
-fi
-
-# func_usage
-# outputs to stdout the --help usage message.
-func_usage ()
-{
-  echo "\
-Usage: gettextize [OPTION]... [package-dir]
-
-Prepares a source package to use gettext.
-
-Options:
-      --help           print this help and exit
-      --version        print version information and exit
-  -f, --force          force writing of new files even if old exist
-      --intl           install libintl in a subdirectory (deprecated)
-      --po-dir=DIR     specify directory with PO files
-      --no-changelog   don't update or create ChangeLog files
-      --symlink        make symbolic links instead of copying files
-  -n, --dry-run        print modifications but don't perform them
-
-Report bugs to <bug-gnu-gettext@gnu.org>."
-}
-
-# func_version
-# outputs to stdout the --version message.
-func_version ()
-{
-  echo "$progname (GNU $package) $version"
-  echo "Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law."
-  echo "Written by" "Ulrich Drepper"
-}
-
-# func_fatal_error message
-# outputs to stderr a fatal error message, and terminates the program.
-func_fatal_error ()
-{
-  echo "gettextize: *** $1" 1>&2
-  echo "gettextize: *** Stop." 1>&2
-  exit 1
-}
-
-# Nuisances.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Command-line option processing.
-# Removes the OPTIONS from the arguments. Sets the variables:
-# - force           1 if --force was given, 0 otherwise
-# - intldir         yes if --intl was given, empty otherwise
-# - podirs          list of directories specified with --po-dir
-# - try_ln_s        : if --symlink was given, false otherwise
-# - do_changelog    false if --no-changelog was given, : otherwise
-# - doit            false if --dry-run was given, : otherwise
-{
-  force=0
-  intldir=
-  podirs=
-  try_ln_s=false
-  do_changelog=:
-  doit=:
-
-  while test $# -gt 0; do
-    case "$1" in
-      -c | --copy | --cop | --co | --c ) # accepted for backward compatibility
-        shift ;;
-      -n | --dry-run | --dry-ru | --dry-r | --dry- | --dry | --dr | --d )
-        shift
-        doit=false ;;
-      -f | --force | --forc | --for | --fo | --f )
-        shift
-        force=1 ;;
-      --help | --hel | --he | --h )
-        func_usage; exit 0 ;;
-      --intl | --int | --in | --i )
-        shift
-        intldir=yes ;;
-      --po-dir | --po-di | --po-d | --po- | --po | --p )
-        shift 
-        if test $# = 0; then
-          func_fatal_error "missing argument for --po-dir"
-        fi
-        case "$1" in
-          -*) func_fatal_error "missing argument for --po-dir" ;;
-        esac
-        podirs="$podirs $1"
-        shift ;;
-      --po-dir=* )
-        arg=`echo "X$1" | sed -e 's/^X--po-dir=//'`
-        podirs="$podirs $arg"
-        shift ;;
-      --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch | --no-c )
-        shift
-        do_changelog=false ;;
-      --symlink | --symlin | --symli | --syml | --sym | --sy | --s )
-        shift
-        try_ln_s=: ;;
-      --version | --versio | --versi | --vers | --ver | --ve | --v )
-        func_version
-        exit 0 ;;
-      -- ) # Stop option prcessing
-        shift; break ;;
-      -* )
-        echo "gettextize: unknown option $1" 1>&2
-        echo "Try 'gettextize --help' for more information." 1>&2
-        exit 1 ;;
-      * )
-        break ;;
-    esac
-  done
-  # podirs defaults to "po".
-  test -n "$podirs" || podirs="po"
-}
-
-# Warn about deprecated options.
-if test -n "$intldir"; then
-  echo "gettextize: warning: the option '--intl' is deprecated and will be removed" 1>&2
-fi
-
-# Command-line argument processing.
-# Analyzes the remaining arguments.
-# Sets the variables
-# - origdir         to the original directory,
-# - srcdir          to the package directory, and cd-s into it.
-{
-  if test $# -gt 1; then
-    func_usage 1>&2
-    exit 1
-  fi
-  origdir=`pwd`
-  if test $# -eq 1; then
-    srcdir=$1
-    if cd "$srcdir"; then
-      srcdir=`pwd`
-    else
-      func_fatal_error "Cannot change directory to '$srcdir'."
-    fi
-  else
-    srcdir=$origdir
-  fi
-}
-
-# The current directory is now $srcdir.
-
-# Check integrity of package: A configure.in/ac must be present. Sets variable
-# - configure_in    name of configure.in/ac file.
-test -f configure.in || test -f configure.ac ||
-  func_fatal_error "Missing configure.in or configure.ac, please cd to your package first."
-configure_in=NONE
-if test -f configure.in; then
-  configure_in=configure.in
-else
-  if test -f configure.ac; then
-    configure_in=configure.ac
-  fi
-fi
-
-# Check whether the --force option is needed but has not been specified.
-if test $force -eq 0; then
-  if test -d intl; then
-    func_fatal_error "intl/ subdirectory exists: use option -f if you really want to delete it."
-  fi
-  for podir in $podirs; do
-    if test -f "$podir/Makefile.in.in"; then
-      func_fatal_error "$podir/Makefile.in.in exists: use option -f if you really want to delete it."
-    fi
-  done
-  if test -f ABOUT-NLS; then
-    func_fatal_error "ABOUT-NLS exists: use option -f if you really want to delete it."
-  fi
-fi
-
-# Check in which directory config.rpath etc. belong.
-auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-if test -n "$auxdir"; then
-  auxdir="$auxdir/"
-fi
-
-# For simplicity we change to the gettext source directory.
-cd "$gettext_dir" ||
-  func_fatal_error "gettext source directory '${gettext_dir}' doesn't exist"
-
-# Variables which keep track what has been modified.
-added_directories=
-removed_directory=
-added_extradist=
-added_acoutput=
-removed_acoutput=" intl/intlh.inst"
-
-# Variable:
-# - please          accumulates instructions for the user.
-please=
-
-# Variable:
-# - date            current date, for use in ChangeLog entries.
-date=`date +%Y-%m-%d`
-
-# func_copy from to
-# copies a file.
-# 'from' is a relative pathname, relative to the current directory.
-# 'to' is a relative pathname, relative to $srcdir.
-func_copy ()
-{
-  if $doit; then
-    rm -f "$srcdir/$2"
-    echo "Copying file $2"
-    cp "$1" "$srcdir/$2"
-  else
-    echo "Copy file $2"
-  fi
-}
-
-# func_linkorcopy from absfrom to
-# links or copies a file.
-# 'from' is a relative pathname, relative to the current directory.
-# 'absfrom' is the corresponding absolute pathname.
-# 'to' is a relative pathname, relative to $srcdir.
-func_linkorcopy ()
-{
-  if $doit; then
-    rm -f "$srcdir/$3"
-    ($try_ln_s && ln -s "$2" "$srcdir/$3" && echo "Symlinking file $3") 2>/dev/null ||
-    { echo "Copying file $3"; cp "$1" "$srcdir/$3"; }
-  else
-    if $try_ln_s; then
-      echo "Symlink file $3"
-    else
-      echo "Copy file $3"
-    fi
-  fi
-}
-
-# func_backup to
-# makes a backup of a file that is about to be overwritten or replaced.
-# 'to' is a relative pathname, relative to $srcdir.
-func_backup ()
-{
-  if $doit; then
-    if test -f "$srcdir/$1"; then
-      rm -f "$srcdir/$1~"
-      cp -p "$srcdir/$1" "$srcdir/$1~"
-    fi
-  fi
-}
-
-# func_remove to
-# removes a file.
-# 'to' is a relative pathname, relative to $srcdir.
-func_remove ()
-{
-  if $doit; then
-    echo "Removing $1"
-    rm -f "$srcdir/$1"
-  else
-    echo "Remove $1"
-  fi
-}
-
-# func_ChangeLog_init
-# func_ChangeLog_add_entry line
-# func_ChangeLog_finish
-# manage the ChangeLog file, relative to $srcdir.
-func_ChangeLog_init ()
-{
-  modified_ChangeLog=
-}
-func_ChangeLog_add_entry ()
-{
-  if $doit; then
-    if test -z "$modified_ChangeLog"; then
-      echo "$date  gettextize  <bug-gnu-gettext@gnu.org>" > "$srcdir/ChangeLog.tmp"
-      echo >> "$srcdir/ChangeLog.tmp"
-      modified_ChangeLog=yes
-    fi
-    echo "$1" >> "$srcdir/ChangeLog.tmp"
-  else
-    modified_ChangeLog=yes
-  fi
-}
-func_ChangeLog_finish ()
-{
-  if test -n "$modified_ChangeLog"; then
-    if $doit; then
-      echo >> "$srcdir/ChangeLog.tmp"
-      if test -f "$srcdir/ChangeLog"; then
-        echo "Adding an entry to ChangeLog (backup is in ChangeLog~)"
-        cat "$srcdir/ChangeLog" >> "$srcdir/ChangeLog.tmp"
-        rm -f "$srcdir/ChangeLog~"
-        cp -p "$srcdir/ChangeLog" "$srcdir/ChangeLog~"
-      else
-        echo "Creating ChangeLog"
-      fi
-      cp "$srcdir/ChangeLog.tmp" "$srcdir/ChangeLog"
-      rm -f "$srcdir/ChangeLog.tmp"
-    else
-      if test -f "$srcdir/ChangeLog"; then
-        echo "Add an entry to ChangeLog"
-      else
-        echo "Create ChangeLog"
-      fi
-    fi
-  fi
-}
-
-# func_poChangeLog_init
-# func_poChangeLog_add_entry line
-# func_poChangeLog_finish
-# manage the $podir/ChangeLog file, relative to $srcdir.
-func_poChangeLog_init ()
-{
-  modified_poChangeLog=
-}
-func_poChangeLog_add_entry ()
-{
-  if $doit; then
-    if test -z "$modified_poChangeLog"; then
-      echo "$date  gettextize  <bug-gnu-gettext@gnu.org>" > "$srcdir/$podir/ChangeLog.tmp"
-      echo >> "$srcdir/$podir/ChangeLog.tmp"
-      modified_poChangeLog=yes
-    fi
-    echo "$1" >> "$srcdir/$podir/ChangeLog.tmp"
-  else
-    modified_poChangeLog=yes
-  fi
-}
-func_poChangeLog_finish ()
-{
-  if test -n "$modified_poChangeLog"; then
-    if $doit; then
-      echo >> "$srcdir/$podir/ChangeLog.tmp"
-      if test -f "$srcdir/$podir/ChangeLog"; then
-        echo "Adding an entry to $podir/ChangeLog (backup is in $podir/ChangeLog~)"
-        cat "$srcdir/$podir/ChangeLog" >> "$srcdir/$podir/ChangeLog.tmp"
-        rm -f "$srcdir/$podir/ChangeLog~"
-        cp -p "$srcdir/$podir/ChangeLog" "$srcdir/$podir/ChangeLog~"
-      else
-        echo "Creating $podir/ChangeLog"
-      fi
-      cp "$srcdir/$podir/ChangeLog.tmp" "$srcdir/$podir/ChangeLog"
-      rm -f "$srcdir/$podir/ChangeLog.tmp"
-    else
-      if test -f "$srcdir/$podir/ChangeLog"; then
-        echo "Add an entry to $podir/ChangeLog"
-      else
-        echo "Create $podir/ChangeLog"
-      fi
-    fi
-  fi
-}
-
-# func_m4ChangeLog_init
-# func_m4ChangeLog_add_entry line
-# func_m4ChangeLog_finish
-# manage the $m4dir/ChangeLog file, relative to $srcdir.
-func_m4ChangeLog_init ()
-{
-  if test -n "$using_m4ChangeLog"; then
-    modified_m4ChangeLog=
-    created_m4ChangeLog=
-  fi
-}
-func_m4ChangeLog_add_entry ()
-{
-  if test -n "$using_m4ChangeLog"; then
-    if $doit; then
-      if test -z "$modified_m4ChangeLog"; then
-        echo "$date  gettextize  <bug-gnu-gettext@gnu.org>" > "$srcdir/$m4dir/ChangeLog.tmp"
-        echo >> "$srcdir/$m4dir/ChangeLog.tmp"
-        modified_m4ChangeLog=yes
-      fi
-      echo "$1" >> "$srcdir/$m4dir/ChangeLog.tmp"
-    else
-      modified_m4ChangeLog=yes
-    fi
-  else
-    line="$1"
-    line=`echo "$line" | sed -e "s%^	\\* %	* $m4dir/%"`
-    func_ChangeLog_add_entry "$line"
-  fi
-}
-func_m4ChangeLog_finish ()
-{
-  if test -n "$using_m4ChangeLog"; then
-    if test -n "$modified_m4ChangeLog"; then
-      if $doit; then
-        echo >> "$srcdir/$m4dir/ChangeLog.tmp"
-        if test -f "$srcdir/$m4dir/ChangeLog"; then
-          echo "Adding an entry to $m4dir/ChangeLog (backup is in $m4dir/ChangeLog~)"
-          cat "$srcdir/$m4dir/ChangeLog" >> "$srcdir/$m4dir/ChangeLog.tmp"
-          rm -f "$srcdir/$m4dir/ChangeLog~"
-          cp -p "$srcdir/$m4dir/ChangeLog" "$srcdir/$m4dir/ChangeLog~"
-        else
-          echo "Creating $m4dir/ChangeLog"
-          created_m4ChangeLog=yes
-        fi
-        cp "$srcdir/$m4dir/ChangeLog.tmp" "$srcdir/$m4dir/ChangeLog"
-        rm -f "$srcdir/$m4dir/ChangeLog.tmp"
-      else
-        if test -f "$srcdir/$m4dir/ChangeLog"; then
-          echo "Add an entry to $m4dir/ChangeLog"
-        else
-          echo "Create $m4dir/ChangeLog"
-          created_m4ChangeLog=yes
-        fi
-      fi
-    fi
-  fi
-}
-using_m4ChangeLog=yes
-
-if test ! -f "$srcdir/intl/Makefile.in" && test -n "$intldir"; then
-  added_acoutput="$added_acoutput intl/Makefile"
-fi
-if test -f "$srcdir/intl/Makefile.in" && test -z "$intldir"; then
-  removed_acoutput="$removed_acoutput intl/Makefile"
-fi
-if test -d "$srcdir/intl"; then
-  # Remove everything inside intl except for RCS and CVS subdirs and invisible
-  # files.
-  if $doit; then
-    echo "Wiping out intl/ subdirectory"
-    (cd "$srcdir/intl" &&
-     for f in *; do
-       if test CVS != "$f" && test RCS != "$f"; then
-         rm -rf "$f"
-       fi
-     done)
-  else
-    echo "Wipe out intl/ subdirectory"
-  fi
-  if test -z "$intldir"; then
-    removed_directory=intl
-  fi
-else
-  if test -n "$intldir"; then
-    if $doit; then
-      echo "Creating intl/ subdirectory"
-      mkdir "$srcdir/intl" || func_fatal_error "failed to create intl/ subdirectory"
-    else
-      echo "Create intl/ subdirectory"
-    fi
-    added_directories="$added_directories intl"
-  fi
-fi
-
-$do_changelog && func_ChangeLog_init
-
-for podir in $podirs; do
-  test -d "$srcdir/$podir" || {
-    if $doit; then
-      echo "Creating $podir/ subdirectory"
-      mkdir "$srcdir/$podir" || func_fatal_error "failed to create $podir/ subdirectory"
-    else
-      echo "Create $podir/ subdirectory"
-    fi
-    added_directories="$added_directories $podir"
-  }
-done
-
-# Create the directory for config.rpath, if needed.
-# This is for consistency with autoreconf and automake.
-# Note that $auxdir is either empty or ends in a slash.
-test -d "$srcdir/$auxdir" || {
-  if $doit; then
-    echo "Creating $auxdir subdirectory"
-    mkdir "$srcdir/$auxdir" || func_fatal_error "failed to create $auxdir subdirectory"
-  else
-    echo "Create $auxdir subdirectory"
-  fi
-}
-
-# Now copy all files.  Take care for the destination directories.
-for file in *; do
-  case $file in
-    ABOUT-NLS)
-      func_linkorcopy $file "$gettext_dir/$file" $file
-      ;;
-    config.rpath)
-      if test -f "$srcdir/$auxdir$file"; then
-        :
-      else
-        added_extradist="$added_extradist $auxdir$file"
-      fi
-      func_linkorcopy $file "$gettext_dir/$file" "$auxdir$file"
-      ;;
-  esac
-done
-
-# Copy files to intl/ subdirectory.
-if test -n "$intldir"; then
-  cd intl
-  for file in *; do
-    if test $file != COPYING.LIB-2.0 && test $file != COPYING.LIB-2.1; then
-      if test $file != plural.c; then
-        func_linkorcopy $file "$gettext_dir/intl/$file" intl/$file
-      else
-        # plural.c is a generated file; it must be copied and touched.
-        func_copy $file intl/$file
-        if $doit; then
-          (sleep 2; touch "$srcdir/intl/$file") &
-        fi
-      fi
-    fi
-  done
-  cd ..
-else
-  echo "Not copying intl/ directory."
-  # Tell the user what to put into configure.ac, if it is not already there.
-  if grep '^AM_GNU_GETTEXT([[]\?external[]]\?[ 	]*[,)]' "$srcdir/$configure_in" > /dev/null; then
-    :
-  else
-    please="$please
-Please use AM_GNU_GETTEXT([external]) in order to cause autoconfiguration
-to look for an external libintl.
-"
-  fi
-fi
-
-# Copy files to po/ subdirectory.
-cd po
-for podir in $podirs; do
-  $do_changelog && func_poChangeLog_init
-  for file in Makefile.in.in; do
-    same=no
-    if test -f "$srcdir/$podir/$file"; then
-      if cmp -s $file "$srcdir/$podir/$file"; then
-        same=yes
-      fi
-    else
-      added_acoutput="$added_acoutput $podir/Makefile.in"
-    fi
-    if $do_changelog && test $same = no; then
-      if test -f "$srcdir/$podir/$file"; then
-        func_poChangeLog_add_entry "	* $file: Upgrade to gettext-${version}."
-      else
-        func_poChangeLog_add_entry "	* $file: New file, from gettext-${version}."
-      fi
-    fi
-    func_backup "$podir/$file"
-    func_linkorcopy $file "$gettext_dir/po/$file" "$podir/$file"
-  done
-  for file in *; do
-    case $file in
-      Makefile.in.in)
-        # Already handled above.
-        ;;
-      Makevars.template)
-        func_linkorcopy Makevars.template "$gettext_dir/po/Makevars.template" "$podir/Makevars.template"
-        if test -f "$srcdir/po/Makevars"; then
-          LC_ALL=C sed -n -e 's/[ 	]*\([A-Za-z0-9_]*\)[ 	]*=.*/\1/p' < "$srcdir/$podir/Makevars" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp1"
-          LC_ALL=C sed -n -e 's/[ 	]*\([A-Za-z0-9_]*\)[ 	]*=.*/\1/p' < "$srcdir/$podir/Makevars.template" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp2"
-          missingvars=`LC_ALL=C comm -13 "$srcdir/$podir/Makevars.tmp1" "$srcdir/$podir/Makevars.tmp2"`
-          rm -f "$srcdir/$podir/Makevars.tmp1" "$srcdir/$podir/Makevars.tmp2"
-          if test -n "$missingvars"; then
-            please="$please
-Please update $podir/Makevars so that it defines all the variables mentioned
-in $podir/Makevars.template.
-You can then remove $podir/Makevars.template.
-"
-          fi
-        else
-          please="$please
-Please create $podir/Makevars from the template in $podir/Makevars.template.
-You can then remove $podir/Makevars.template.
-"
-        fi
-        ;;
-      *)
-        same=no
-        if test -f "$srcdir/$podir/$file"; then
-          if cmp -s $file "$srcdir/$podir/$file"; then
-            same=yes
-          fi
-        fi
-        if $do_changelog && test $same = no; then
-          if test -f "$srcdir/$podir/$file"; then
-            func_poChangeLog_add_entry "	* $file: Upgrade to gettext-${version}."
-          else
-            func_poChangeLog_add_entry "	* $file: New file, from gettext-${version}."
-          fi
-        fi
-        func_backup "$podir/$file"
-        func_linkorcopy $file "$gettext_dir/po/$file" "$podir/$file"
-        ;;
-    esac
-  done
-  if test -f "$srcdir/$podir/cat-id-tbl.c"; then
-    func_remove "$podir/cat-id-tbl.c"
-    $do_changelog && func_poChangeLog_add_entry "	* cat-id-tbl.c: Remove file."
-  fi
-  if test -f "$srcdir/$podir/stamp-cat-id"; then
-    func_remove "$podir/stamp-cat-id"
-    $do_changelog && func_poChangeLog_add_entry "	* stamp-cat-id: Remove file."
-  fi
-  if test ! -f "$srcdir/$podir/POTFILES.in"; then
-    if $doit; then
-      echo "Creating initial $podir/POTFILES.in"
-      echo '# List of source files which contain translatable strings.' > "$srcdir/$podir/POTFILES.in"
-    else
-      echo "Create initial $podir/POTFILES.in"
-    fi
-    $do_changelog && func_poChangeLog_add_entry "	* POTFILES.in: New file."
-    please="$please
-Please fill $podir/POTFILES.in as described in the documentation.
-"
-  fi
-  $do_changelog && func_poChangeLog_finish
-done
-
-# Determine whether we can assume automake 1.9 or newer.
-have_automake19=
-if (aclocal --version) >/dev/null 2>/dev/null; then
-  aclocal_version=`aclocal --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'`
-  case $aclocal_version in
-    1.9* | 1.[1-9][0-9]* | [2-9]*) have_automake19=yes ;;
-  esac
-fi
-
-m4filelist='gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4
- po.m4 progtest.m4'
-# With aclocal versions < 1.9 we need all m4 files, otherwise "aclocal -I m4"
-# might give an error. (aclocal < 1.9 didn't know which macros are really
-# needed, it looked which macros are potentially needed.)
-min_automake_version=1.9
-if test -n "$intldir" || test -z "$have_automake19"; then
-  # Add intldir.m4, intl.m4 and its dependencies.
-  m4filelist=$m4filelist' codeset.m4 fcntl-o.m4 glibc2.m4 glibc21.m4 intdiv0.m4
-   intl.m4 intldir.m4 intlmacosx.m4 intmax.m4 inttypes_h.m4 inttypes-pri.m4
-   lcmessage.m4 lock.m4 longlong.m4 printf-posix.m4 size_max.m4 stdint_h.m4
-   threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4'
-  min_automake_version=1.8
-fi
-
-# All sorts of bugs could occur if the configure file was remade with the wrong
-# version of gettext.m4 et al. (because then the configure and the po/Makefile.in.in
-# don't fit together). It is therefore important that the package carries the
-# right versions of gettext.m4 et al. with it.
-if test -f "$srcdir/Makefile.am"; then
-  # A package using automake.
-
-  # Determine whether it's using automake 1.8 or newer.
-  have_automake18=
-  if (aclocal --version) >/dev/null 2>/dev/null; then
-    aclocal_version=`aclocal --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'`
-    case $aclocal_version in
-      1.[8-9]* | 1.[1-9][0-9]* | [2-9]*) have_automake18=yes ;;
-    esac
-  fi
-
-  # Extract the macro directory name from Makefile.am.
-  aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' "$srcdir/Makefile.am" | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
-  m4dir=m4
-  m4dir_defaulted=yes
-  m4dir_is_next=
-  for arg in $aclocal_amflags; do
-    if test -n "$m4dir_is_next"; then
-      # Ignore absolute directory pathnames, like /usr/local/share/aclocal.
-      case "$arg" in
-        /*) ;;
-        *)
-          m4dir="$arg"
-          m4dir_defaulted=
-          break
-          ;;
-      esac
-      m4dir_is_next=
-    else
-      if test "X$arg" = "X-I"; then
-        m4dir_is_next=yes
-      else
-        m4dir_is_next=
-      fi
-    fi
-  done
-
-  # Decide whether to use $m4dir/ChangeLog, or to use ChangeLog instead.
-  if test -d "$srcdir/$m4dir" && test -f "$srcdir/ChangeLog" && test ! -f "$srcdir/$m4dir/ChangeLog"; then
-    # The programmer has no $m4dir/ChangeLog so far. Don't introduce one.
-    using_m4ChangeLog=
-  fi
-
-  # Update the *.m4 files and the corresponding Makefile.am.
-  $do_changelog && func_m4ChangeLog_init
-  added_m4dir=
-  added_m4files=
-  if test -d "$srcdir/$m4dir"; then
-    :
-  else
-    if $doit; then
-      echo "Creating directory $m4dir"
-      mkdir "$srcdir/$m4dir"
-    else
-      echo "Create directory $m4dir"
-    fi
-    added_m4dir=yes
-  fi
-  for file in $m4filelist; do
-    same=no
-    if test -f "$srcdir/$m4dir/$file"; then
-      if cmp -s "${datarootdir}/aclocal/$file" "$srcdir/$m4dir/$file"; then
-        same=yes
-      fi
-    else
-      added_m4files="$added_m4files $file"
-    fi
-    if $do_changelog && test $same = no; then
-      if test -f "$srcdir/$m4dir/$file"; then
-        func_m4ChangeLog_add_entry "	* $file: Upgrade to gettext-${version}."
-      else
-        func_m4ChangeLog_add_entry "	* $file: New file, from gettext-${version}."
-      fi
-    fi
-    func_backup "$m4dir/$file"
-    func_linkorcopy "${datarootdir}/aclocal/$file" "${datarootdir}/aclocal/$file" "$m4dir/$file"
-  done
-  missing_m4Makefileam=
-  if test -n "$added_m4files"; then
-    if test -f "$srcdir/$m4dir/Makefile.am"; then
-      if $doit; then
-        echo "Updating EXTRA_DIST in $m4dir/Makefile.am (backup is in $m4dir/Makefile.am~)"
-        func_backup "$m4dir/Makefile.am"
-        rm -f "$srcdir/$m4dir/Makefile.am"
-        if grep '^EXTRA_DIST[ 	]*=' "$srcdir/$m4dir/Makefile.am~" > /dev/null; then
-          sed -e "s%^\(EXTRA_DIST[ 	]*=\) \\?%\\1$added_m4files %" < "$srcdir/$m4dir/Makefile.am~" > "$srcdir/$m4dir/Makefile.am"
-          $do_changelog && func_m4ChangeLog_add_entry "	* Makefile.am (EXTRA_DIST): Add the new files."
-        else
-          (cat "$srcdir/$m4dir/Makefile.am~"; echo; echo "EXTRA_DIST =$added_m4files") > "$srcdir/$m4dir/Makefile.am"
-          $do_changelog && func_m4ChangeLog_add_entry "	* Makefile.am (EXTRA_DIST): New variable."
-        fi
-      else
-        echo "Update EXTRA_DIST in $m4dir/Makefile.am"
-        $do_changelog && func_m4ChangeLog_add_entry "	* Makefile.am (EXTRA_DIST)."
-      fi
-    else
-      # $m4dir/Makefile.am is not needed any more when aclocal 1.8 or newer
-      # is used.
-      if test -z "$have_automake18"; then
-        if $doit; then
-          echo "Creating $m4dir/Makefile.am"
-          echo "EXTRA_DIST =$added_m4files" > "$srcdir/$m4dir/Makefile.am"
-        else
-          echo "Create $m4dir/Makefile.am"
-        fi
-        $do_changelog && func_m4ChangeLog_add_entry "	* Makefile.am: New file."
-        added_acoutput="$added_acoutput $m4dir/Makefile"
-      else
-        missing_m4Makefileam=yes
-      fi
-    fi
-  fi
-  if test -n "$added_m4dir" && test -z "$missing_m4Makefileam"; then
-    added_directories="$added_directories $m4dir"
-  fi
-  $do_changelog && func_m4ChangeLog_finish
-  # automake will arrange for $m4dir/ChangeLog to be distributed if a
-  # $m4dir/Makefile.am exists. If not, we need to add it to Makefile.am's
-  # EXTRA_DIST explicitly.
-  if test -n "$created_m4ChangeLog" && test -n "$missing_m4Makefileam"; then
-    added_extradist="$added_extradist $m4dir/ChangeLog"
-  fi
-
-  # Update the top-level Makefile.am.
-  modified_Makefile_am=
-  # func_modify_Makefile_am changelog_comment
-  # assumes a modified copy of $srcdir/Makefile.am in $srcdir/Makefile.am.tmp
-  # and replaces the original Makefile.am file with the modified one if
-  # the two files differ. Then it removes the modified copy.
-  func_modify_Makefile_am ()
-  {
-    if cmp -s "$srcdir/Makefile.am" "$srcdir/Makefile.am.tmp"; then
-      :
-    else
-      if test -z "$modified_Makefile_am"; then
-        if $doit; then
-          echo "Updating Makefile.am (backup is in Makefile.am~)"
-          func_backup Makefile.am
-        else
-          echo "Update Makefile.am"
-        fi
-      fi
-      if $doit; then
-        rm -f "$srcdir/Makefile.am"
-        cp "$srcdir/Makefile.am.tmp" "$srcdir/Makefile.am"
-      fi
-      if $do_changelog; then
-        if test -z "$modified_Makefile_am"; then
-          func_ChangeLog_add_entry "	* Makefile.am $1"
-        else
-          func_ChangeLog_add_entry "	$1"
-        fi
-      fi
-      modified_Makefile_am=yes
-    fi
-    rm -f "$srcdir/Makefile.am.tmp"
-  }
-
-  if test -n "$added_directories"; then
-    if grep '^SUBDIRS[ 	]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(SUBDIRS[ 	]*=\) \\?%\\1$added_directories %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-      added_directories_pretty=`echo $added_directories | sed -e 's/ /, /g'`
-      func_modify_Makefile_am "(SUBDIRS): Add $added_directories_pretty."
-    else
-      (cat "$srcdir/Makefile.am"; echo; echo "SUBDIRS =$added_directories") > "$srcdir/Makefile.am.tmp"
-      func_modify_Makefile_am "(SUBDIRS): New variable."
-    fi
-  fi
-  if test -n "$removed_directory"; then
-    sed -e '/^SUBDIRS[ 	]*=/ {
-        :a
-        s%\([ 	]\)'"$removed_directory"'[ 	]%\1%
-        s%[ 	]'"$removed_directory"'$%%
-        tb
-        :b
-        s%\\$%\\%
-        tc
-        bd
-        :c
-        n
-        ba
-      :d
-    }' < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-    func_modify_Makefile_am "(SUBDIRS): Remove $removed_directory."
-  fi
-  if test -n "$added_directories"; then
-    if grep '^DIST_SUBDIRS[ 	]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(DIST_SUBDIRS[ 	]*=\) \\?%\\1$added_directories %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-      added_directories_pretty=`echo $added_directories | sed -e 's/ /, /g'`
-      func_modify_Makefile_am "(DIST_SUBDIRS): Add $added_directories_pretty."
-    fi
-  fi
-  if test -n "$removed_directory"; then
-    sed -e '/^DIST_SUBDIRS[ 	]*=/ {
-        :a
-        s%\([ 	]\)'"$removed_directory"'[ 	]%\1%
-        s%[ 	]'"$removed_directory"'$%%
-        tb
-        :b
-        s%\\$%\\%
-        tc
-        bd
-        :c
-        n
-        ba
-      :d
-    }' < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-    func_modify_Makefile_am "(DIST_SUBDIRS): Remove $removed_directory."
-  fi
-  if test -n "$m4dir_defaulted"; then
-    if grep '^ACLOCAL_AMFLAGS[ 	]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(ACLOCAL_AMFLAGS[ 	]*=\) \\?%\\1 -I $m4dir %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-      func_modify_Makefile_am "(ACLOCAL_AMFLAGS): Add -I $m4dir."
-    else
-      (cat "$srcdir/Makefile.am"; echo; echo "ACLOCAL_AMFLAGS = -I $m4dir") > "$srcdir/Makefile.am.tmp"
-      func_modify_Makefile_am "(ACLOCAL_AMFLAGS): New variable."
-    fi
-    # Also update Makefile.in and, if existent, Makefile. Otherwise they
-    # would take into account the new flags only after a few rounds of
-    # "./configure", "make", "touch configure.in", "make distclean".
-    if $doit; then
-      for file in Makefile.in Makefile; do
-        if test -f "$srcdir/$file"; then
-          func_backup $file
-          rm -f "$srcdir/$file"
-          sed -e "s%(ACLOCAL)%(ACLOCAL) -I $m4dir%" < "$srcdir/$file~" > "$srcdir/$file"
-        fi
-      done
-    fi
-  fi
-  if test -n "$added_extradist"; then
-    if grep '^EXTRA_DIST[ 	]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(EXTRA_DIST[ 	]*=\)%\\1$added_extradist %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-      added_extradist_pretty=`echo $added_extradist | sed -e 's/ /, /g'`
-      func_modify_Makefile_am "(EXTRA_DIST): Add $added_extradist_pretty."
-    else
-      (cat "$srcdir/Makefile.am"; echo; echo "EXTRA_DIST =$added_extradist") > "$srcdir/Makefile.am.tmp"
-      func_modify_Makefile_am "(EXTRA_DIST): New variable."
-    fi
-  fi
-  # Extract the aclocal options name from Makefile.am.
-  aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' "$srcdir/Makefile.am" | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
-  aclocal_options=
-  m4dir_is_next=
-  for arg in $aclocal_amflags; do
-    if test -n "$m4dir_is_next"; then
-      aclocal_options="$aclocal_options -I $arg"
-      m4dir_is_next=
-    else
-      if test "X$arg" = "X-I"; then
-        m4dir_is_next=yes
-      else
-        m4dir_is_next=
-      fi
-    fi
-  done
-  please="$please
-Please run 'aclocal$aclocal_options' to regenerate the aclocal.m4 file.
-You need aclocal from GNU automake $min_automake_version (or newer) to do this.
-Then run 'autoconf' to regenerate the configure file.
-"
-
-  # Also create $m4dir/Makefile.in from $m4dir/Makefile.am, because automake
-  # doesn't do it by itself.
-  if $doit; then
-    case "$added_acoutput" in
-      *" $m4dir/Makefile")
-        (cd "$srcdir" && automake "$m4dir/Makefile") 2>/dev/null ||
-        please="$please
-Please run 'automake $m4dir/Makefile' to create $m4dir/Makefile.in
-"
-        ;;
-    esac
-  fi
-else
-  please="$please
-Please add the files
-$m4filelist
-from the ${datarootdir}/aclocal directory to your aclocal.m4 file.
-"
-fi
-
-modified_configure_in=
-# func_modify_configure_in changelog_comment
-# assumes a modified copy of $srcdir/$configure_in in $srcdir/$configure_in.tmp
-# and replaces the original configure.in/ac file with the modified one if
-# the two files differ. Then it removes the modified copy.
-func_modify_configure_in ()
-{
-  if cmp -s "$srcdir/$configure_in" "$srcdir/$configure_in.tmp"; then
-    :
-  else
-    if test -z "$modified_configure_in"; then
-      if $doit; then
-        echo "Updating $configure_in (backup is in $configure_in~)"
-        func_backup $configure_in
-      else
-        echo "Update $configure_in"
-      fi
-    fi
-    if $doit; then
-      rm -f "$srcdir/$configure_in"
-      cp "$srcdir/$configure_in.tmp" "$srcdir/$configure_in"
-    fi
-    if $do_changelog; then
-      if test -z "$modified_configure_in"; then
-        func_ChangeLog_add_entry "	* $configure_in $1"
-      else
-        func_ChangeLog_add_entry "	$1"
-      fi
-    fi
-    modified_configure_in=yes
-  fi
-  rm -f "$srcdir/$configure_in.tmp"
-}
-
-if test -n "$added_acoutput"; then
-  if grep '^AC_CONFIG_FILES(' "$srcdir/$configure_in" > /dev/null; then
-    sedprog='
-ta
-b
-:a
-n
-ba'
-    sed -e "s%^\\(AC_CONFIG_FILES([^])\\,]*\\)%\\1$added_acoutput%$sedprog" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-    added_acoutput_pretty=`echo $added_acoutput | sed -e 's/ /, /g'`
-    func_modify_configure_in "(AC_CONFIG_FILES): Add $added_acoutput_pretty."
-  else
-    if grep '^AC_OUTPUT(' "$srcdir/$configure_in" > /dev/null; then
-      sed -e "s%^\\(AC_OUTPUT([^])\\,]*\\)%\\1$added_acoutput%" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-      added_acoutput_pretty=`echo $added_acoutput | sed -e 's/ /, /g'`
-      func_modify_configure_in "(AC_OUTPUT): Add $added_acoutput_pretty."
-    else
-      please="$please
-Please add$added_acoutput to the AC_OUTPUT or AC_CONFIG_FILES invocation in the $configure_in file.
-"
-    fi
-  fi
-fi
-if test -n "$removed_acoutput"; then
-  for file in $removed_acoutput; do
-    tag=
-    sedprog='{
-      s%\([[ 	]\)'"$file"'[ 	]%\1%
-      s%\([[ 	]\)'"$file"'\([]),]\)%\1\2%
-      s%[[ 	]'"$file"'$%%
-        :a
-        tb
-        :b
-        s%\\$%\\%
-        tc
-        bd
-        :c
-        n
-        s%\([ 	]\)'"$file"'[ 	]%\1%
-        s%\([ 	]\)'"$file"'\([]),]\)%\1\2%
-        s%[ 	]'"$file"'$%%
-        ba
-      :d
-    }'
-    sed -e '/^AC_CONFIG_FILES(/'"$sedprog" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-    if cmp -s "$srcdir/$configure_in" "$srcdir/$configure_in.tmp"; then
-      sed -e '/^AC_OUTPUT(/'"$sedprog" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-      if cmp -s "$srcdir/$configure_in" "$srcdir/$configure_in.tmp"; then
-        :
-      else
-        tag=AC_OUTPUT
-      fi
-    else
-      tag=AC_CONFIG_FILES
-    fi
-    if test -n "$tag"; then
-      func_modify_configure_in "($tag): Remove $file."
-    else
-      rm -f "$srcdir/$configure_in.tmp"
-      if test "$file" != intl/intlh.inst; then
-        please="$please
-Please remove $file from the AC_OUTPUT or AC_CONFIG_FILES invocation
-in the $configure_in file.
-"
-      fi
-    fi
-  done
-fi
-sed -e 's%sed -e "/POTFILES =/r po/POTFILES" po/Makefile\.in > po/Makefile *;* *%%' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile."
-sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-func_modify_configure_in "(AC_LINK_FILES): Remove invocation."
-sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $version."
-$do_changelog && func_ChangeLog_finish
-
-# Recommend replacement for deprecated Makefile variables.
-use_libtool=`cat "$srcdir/$configure_in" | grep '^A[CM]_PROG_LIBTOOL'`
-for file in `(cd "$srcdir"; find . -name Makefile.am -print; find . -name Makefile.in -print) | sed -e 's,^\./,,'`; do
-  if test -f "$srcdir/$file"; then
-    if test `echo "$file" | sed -e 's,^.*/,,'` = Makefile.in && grep automake "$srcdir/$file" >/dev/null 2>&1; then
-      continue;
-    fi
-    # INTLLIBS is deprecated because it doesn't distinguish the two
-    # cases: with libtool, without libtool.
-    if grep '@''INTLLIBS''@' "$srcdir/$file" >/dev/null 2>&1; then
-      if test -n "$use_libtool"; then
-        please="$please
-Please change $file to use @""LTLIBINTL""@ or @""LIBINTL""@ instead of
-@""INTLLIBS""@. Which one, depends whether it is used with libtool or not.
-@""INTLLIBS""@ will go away.
-"
-      else
-        please="$please
-Please change $file to use @""LIBINTL""@ instead of @""INTLLIBS""@.
-@""INTLLIBS""@ will go away.
-"
-      fi
-    fi
-    # DATADIRNAME is deprecated because we install only .gmo files nowadays,
-    # which can be stored in the platform independent $prefix/share hierarchy.
-    if grep '@''DATADIRNAME''@' "$srcdir/$file" >/dev/null 2>&1; then
-      please="$please
-Please change $file to use the constant string \"share\" instead of
-@""DATADIRNAME""@. @""DATADIRNAME""@ will go away.
-"
-    fi
-    # INSTOBJEXT is deprecated because we install only .gmo files nowadays,
-    # no catgets .cat catalogs.
-    if grep '@''INSTOBJEXT''@' "$srcdir/$file" >/dev/null 2>&1; then
-      please="$please
-Please change $file to use the constant string \".mo\" instead of
-@""INSTOBJEXT""@. @""INSTOBJEXT""@ will go away.
-"
-    fi
-    # GENCAT is deprecated because we install no catgets catalogs anymore.
-    if grep '@''GENCAT''@' "$srcdir/$file" >/dev/null 2>&1; then
-      please="$please
-Please change $file to use the constant string \"gencat\" instead of
-@""GENCAT""@. @""GENCAT""@ will go away. Maybe you don't even need it any more?
-"
-    fi
-    # POSUB is deprecated because it causes "./configure --disable-nls", "make",
-    # "make dist" to create a buggy tarfile.
-    if grep '@''POSUB''@' "$srcdir/$file" >/dev/null 2>&1; then
-      please="$please
-Please change $file to use the constant string \"po\" instead of
-@""POSUB""@. @""POSUB""@ will go away.
-"
-    fi
-  fi
-done
-
-# Recommend replacement for deprecated configure variables.
-if grep '\$nls_cv_header_' "$srcdir/$configure_in" >/dev/null 2>&1; then
-  please="$please
-Please stop using \$nls_cv_header_intl or \$nls_cv_header_libgt in the
-$configure_in file. Both will go away. Use <libintl.h> or \"gettext.h\" instead.
-"
-fi
-
-# Recommend fetching config.guess and config.sub.
-if test -f "$srcdir/$auxdir"config.guess && test -f "$srcdir/$auxdir"config.sub; then
-  :
-else
-  please="$please
-You will also need config.guess and config.sub, which you can get from the CVS
-of the 'config' project at http://savannah.gnu.org/. The commands to fetch them
-are
-\$ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess'
-\$ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub'
-"
-fi
-
-if $doit; then
-  echo "$please"
-  echo "You might also want to copy the convenience header file gettext.h"
-  echo "from the $gettext_dir directory into your package."
-  echo "It is a wrapper around <libintl.h> that implements the configure --disable-nls"
-  echo "option."
-  echo
-  count=`echo "$please" | grep '^$' | wc -l`
-  count=`echo "$count" | sed -e 's/[ 	]//g'`
-  case "$count" in
-    1) count="paragraph";;
-    2) count="two paragraphs";;
-    3) count="three paragraphs";;
-    4) count="four paragraphs";;
-    5) count="five paragraphs";;
-    *) count="$count paragraphs";;
-  esac
-  echo "Press Return to acknowledge the previous $count."
-  # Read from /dev/tty, not stdin, so that gettextize cannot be abused by
-  # non-interactive tools.
-  read dummy < /dev/tty
-fi
-
-exit 0
diff --git a/libs/gettext/bin32/libasprintf-0.dll b/libs/gettext/bin32/libasprintf-0.dll
deleted file mode 100644
index dcd8f8593..000000000
Binary files a/libs/gettext/bin32/libasprintf-0.dll and /dev/null differ
diff --git a/libs/gettext/bin32/libgcc_s_sjlj-1.dll b/libs/gettext/bin32/libgcc_s_sjlj-1.dll
deleted file mode 100644
index b7c5910fd..000000000
Binary files a/libs/gettext/bin32/libgcc_s_sjlj-1.dll and /dev/null differ
diff --git a/libs/gettext/bin32/libgettextlib-0-18-1.dll b/libs/gettext/bin32/libgettextlib-0-18-1.dll
deleted file mode 100644
index b1bfb9462..000000000
Binary files a/libs/gettext/bin32/libgettextlib-0-18-1.dll and /dev/null differ
diff --git a/libs/gettext/bin32/libgettextpo-0.dll b/libs/gettext/bin32/libgettextpo-0.dll
deleted file mode 100644
index cea1c97be..000000000
Binary files a/libs/gettext/bin32/libgettextpo-0.dll and /dev/null differ
diff --git a/libs/gettext/bin32/libgettextsrc-0-18-1.dll b/libs/gettext/bin32/libgettextsrc-0-18-1.dll
deleted file mode 100644
index 95f904658..000000000
Binary files a/libs/gettext/bin32/libgettextsrc-0-18-1.dll and /dev/null differ
diff --git a/libs/gettext/bin32/libintl-8.dll b/libs/gettext/bin32/libintl-8.dll
deleted file mode 100644
index 9f10b6c55..000000000
Binary files a/libs/gettext/bin32/libintl-8.dll and /dev/null differ
diff --git a/libs/gettext/bin32/msgattrib.exe b/libs/gettext/bin32/msgattrib.exe
deleted file mode 100644
index 4f64eda79..000000000
Binary files a/libs/gettext/bin32/msgattrib.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgcat.exe b/libs/gettext/bin32/msgcat.exe
deleted file mode 100644
index b41e9141f..000000000
Binary files a/libs/gettext/bin32/msgcat.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgcmp.exe b/libs/gettext/bin32/msgcmp.exe
deleted file mode 100644
index 7743c9ed6..000000000
Binary files a/libs/gettext/bin32/msgcmp.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgcomm.exe b/libs/gettext/bin32/msgcomm.exe
deleted file mode 100644
index de4c6699f..000000000
Binary files a/libs/gettext/bin32/msgcomm.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgconv.exe b/libs/gettext/bin32/msgconv.exe
deleted file mode 100644
index 7be1c362f..000000000
Binary files a/libs/gettext/bin32/msgconv.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgen.exe b/libs/gettext/bin32/msgen.exe
deleted file mode 100644
index ee42349bf..000000000
Binary files a/libs/gettext/bin32/msgen.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgexec.exe b/libs/gettext/bin32/msgexec.exe
deleted file mode 100644
index 99e56dc02..000000000
Binary files a/libs/gettext/bin32/msgexec.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgfilter.exe b/libs/gettext/bin32/msgfilter.exe
deleted file mode 100644
index b99f25d57..000000000
Binary files a/libs/gettext/bin32/msgfilter.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgfmt.exe b/libs/gettext/bin32/msgfmt.exe
deleted file mode 100644
index 1badcca98..000000000
Binary files a/libs/gettext/bin32/msgfmt.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msggrep.exe b/libs/gettext/bin32/msggrep.exe
deleted file mode 100644
index 2f27989b4..000000000
Binary files a/libs/gettext/bin32/msggrep.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msginit.exe b/libs/gettext/bin32/msginit.exe
deleted file mode 100644
index 2f8fbef5e..000000000
Binary files a/libs/gettext/bin32/msginit.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgmerge.exe b/libs/gettext/bin32/msgmerge.exe
deleted file mode 100644
index 09dcad0c5..000000000
Binary files a/libs/gettext/bin32/msgmerge.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msgunfmt.exe b/libs/gettext/bin32/msgunfmt.exe
deleted file mode 100644
index eada3edfd..000000000
Binary files a/libs/gettext/bin32/msgunfmt.exe and /dev/null differ
diff --git a/libs/gettext/bin32/msguniq.exe b/libs/gettext/bin32/msguniq.exe
deleted file mode 100644
index 6cb12abfb..000000000
Binary files a/libs/gettext/bin32/msguniq.exe and /dev/null differ
diff --git a/libs/gettext/bin32/ngettext.exe b/libs/gettext/bin32/ngettext.exe
deleted file mode 100644
index c1faea08e..000000000
Binary files a/libs/gettext/bin32/ngettext.exe and /dev/null differ
diff --git a/libs/gettext/bin32/recode-sr-latin.exe b/libs/gettext/bin32/recode-sr-latin.exe
deleted file mode 100644
index 366202d0b..000000000
Binary files a/libs/gettext/bin32/recode-sr-latin.exe and /dev/null differ
diff --git a/libs/gettext/bin32/xgettext.exe b/libs/gettext/bin32/xgettext.exe
deleted file mode 100644
index 4c3e02b7d..000000000
Binary files a/libs/gettext/bin32/xgettext.exe and /dev/null differ
diff --git a/libs/gettext/bin64/autopoint b/libs/gettext/bin64/autopoint
deleted file mode 100755
index 73d909638..000000000
--- a/libs/gettext/bin64/autopoint
+++ /dev/null
@@ -1,717 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2002-2010 Free Software Foundation, Inc.
-#
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This file is meant for authors, maintainers, co-maintainers or installers
-# of packages which are internationalized with the help of GNU gettext.  For
-# further information how to use it consult the GNU gettext manual.
-
-progname=$0
-package=gettext-tools
-version=0.18.1
-
-# Set variables
-# - gettext_dir     directory where the sources are stored.
-prefix="/usr/local/x86_64-w64-mingw32/stow/gettext-0.18.1.1"
-datarootdir="${prefix}/share"
-gettext_dir="${datarootdir}/gettext"
-
-# func_tmpdir
-# creates a temporary directory.
-# Sets variable
-# - tmp             pathname of freshly created temporary directory
-func_tmpdir ()
-{
-  # Use the environment variable TMPDIR, falling back to /tmp. This allows
-  # users to specify a different temporary directory, for example, if their
-  # /tmp is filled up or too small.
-  : ${TMPDIR=/tmp}
-  {
-    # Use the mktemp program if available. If not available, hide the error
-    # message.
-    tmp=`(umask 077 && mktemp -d "$TMPDIR/gtXXXXXX") 2>/dev/null` &&
-    test -n "$tmp" && test -d "$tmp"
-  } ||
-  {
-    # Use a simple mkdir command. It is guaranteed to fail if the directory
-    # already exists.  $RANDOM is bash specific and expands to empty in shells
-    # other than bash, ksh and zsh.  Its use does not increase security;
-    # rather, it minimizes the probability of failure in a very cluttered /tmp
-    # directory.
-    tmp=$TMPDIR/gt$$-$RANDOM
-    (umask 077 && mkdir "$tmp")
-  } ||
-  {
-    echo "$0: cannot create a temporary directory in $TMPDIR" >&2
-    { (exit 1); exit 1; }
-  }
-}
-
-# Support for relocatability.
-func_find_curr_installdir ()
-{
-  # Determine curr_installdir, even taking into account symlinks.
-  curr_executable="$0"
-  case "$curr_executable" in
-    */* | *\\*) ;;
-    *) # Need to look in the PATH.
-      if test "${PATH_SEPARATOR+set}" != set; then
-        func_tmpdir
-        { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
-        chmod +x "$tmp"/conf.sh
-        if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
-          PATH_SEPARATOR=';'
-        else
-          PATH_SEPARATOR=:
-        fi
-        rm -rf "$tmp"
-      fi
-      save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
-      for dir in $PATH; do
-        IFS="$save_IFS"
-        test -z "$dir" && dir=.
-        for exec_ext in ''; do
-          if test -f "$dir/$curr_executable$exec_ext"; then
-            curr_executable="$dir/$curr_executable$exec_ext"
-            break 2
-          fi
-        done
-      done
-      IFS="$save_IFS"
-      ;;
-  esac
-  # Make absolute.
-  case "$curr_executable" in
-    /* | ?:/* | ?:\\*) ;;
-    *) curr_executable=`pwd`/"$curr_executable" ;;
-  esac
-  # Resolve symlinks.
-  sed_dirname='s,/[^/]*$,,'
-  sed_linkdest='s,^.* -> \(.*\),\1,p'
-  while : ; do
-    lsline=`LC_ALL=C ls -l "$curr_executable"`
-    case "$lsline" in
-      *" -> "*)
-        linkdest=`echo "$lsline" | sed -n -e "$sed_linkdest"`
-        case "$linkdest" in
-          /* | ?:/* | ?:\\*) curr_executable="$linkdest" ;;
-          *) curr_executable=`echo "$curr_executable" | sed -e "$sed_dirname"`/"$linkdest" ;;
-        esac ;;
-      *) break ;;
-    esac
-  done
-  curr_installdir=`echo "$curr_executable" | sed -e 's,/[^/]*$,,'`
-  # Canonicalize.
-  curr_installdir=`cd "$curr_installdir" && pwd`
-}
-func_find_prefixes ()
-{
-  # Compute the original/current installation prefixes by stripping the
-  # trailing directories off the original/current installation directories.
-  orig_installprefix="$orig_installdir"
-  curr_installprefix="$curr_installdir"
-  while true; do
-    orig_last=`echo "$orig_installprefix" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    curr_last=`echo "$curr_installprefix" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    if test -z "$orig_last" || test -z "$curr_last"; then
-      break
-    fi
-    if test "$orig_last" != "$curr_last"; then
-      break
-    fi
-    orig_installprefix=`echo "$orig_installprefix" | sed -e 's,/[^/]*$,,'`
-    curr_installprefix=`echo "$curr_installprefix" | sed -e 's,/[^/]*$,,'`
-  done
-}
-if test "no" = yes; then
-  exec_prefix="${prefix}"
-  bindir="${exec_prefix}/bin"
-  orig_installdir="$bindir" # see Makefile.am's *_SCRIPTS variables
-  func_find_curr_installdir # determine curr_installdir
-  func_find_prefixes
-  # Relocate the directory variables that we use.
-  gettext_dir=`echo "$gettext_dir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
-fi
-
-# func_usage
-# outputs to stdout the --help usage message.
-func_usage ()
-{
-  echo "\
-Usage: autopoint [OPTION]...
-
-Copies standard gettext infrastructure files into a source package.
-
-Options:
-      --help           print this help and exit
-      --version        print version information and exit
-  -f, --force          force overwriting of files that already exist
-  -n, --dry-run        print modifications but don't perform them"
-#  echo "\
-#  -V version           copy the infrastructure of the specified gettext version
-#                         (dangerous)"
-  echo "
-Report bugs to <bug-gnu-gettext@gnu.org>."
-}
-
-# func_version
-# outputs to stdout the --version message.
-func_version ()
-{
-  echo "$progname (GNU $package) $version"
-  echo "Uses a versions archive in git format."
-  echo "Copyright (C) 2002-2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law."
-  echo "Written by" "Bruno Haible"
-}
-
-# func_fatal_error message
-# outputs to stderr a fatal error message, and terminates the program.
-func_fatal_error ()
-{
-  echo "autopoint: *** $1" 1>&2
-  echo "autopoint: *** Stop." 1>&2
-  exit 1
-}
-
-# Command-line option processing.
-# Removes the OPTIONS from the arguments. Sets the variables:
-# - force           yes if --force was given, empty otherwise
-# - ver             gettext version if -V was given, empty otherwise
-# - doit            false if --dry-run was given, : otherwise
-{
-  force=
-  ver=
-  doit=:
-
-  while test $# -gt 0; do
-    case "$1" in
-      -n | --dry-run | --dry-ru | --dry-r | --dry- | --dry | --dr | --d )
-        shift
-        doit=false ;;
-      -f | --force | --forc | --for | --fo | --f )
-        shift
-        force=yes ;;
-      --help | --hel | --he | --h )
-        func_usage; exit 0 ;;
-#      -V ) # Some people put a space between -V and the version number.
-#        shift
-#        if test $# = 0; then
-#          func_usage 1>&2
-#          exit 1
-#        fi
-#        ver=$1;
-#        shift ;;
-#      -V*) # Some people omit the space between -V and the version number.
-#        ver=`echo "X$1" | sed -e 's/^X-V//'`
-#        shift ;;
-      --version | --versio | --versi | --vers | --ver | --ve | --v )
-        func_version
-        exit 0 ;;
-      -- ) # Stop option prcessing
-        shift; break ;;
-      -* )
-        echo "autopoint: unknown option $1" 1>&2
-        echo "Try 'autopoint --help' for more information." 1>&2
-        exit 1 ;;
-      * )
-        break ;;
-    esac
-  done
-}
-
-# Command-line argument processing.
-# Analyzes the remaining arguments.
-{
-  if test $# -gt 0; then
-    func_usage 1>&2
-    exit 1
-  fi
-}
-
-srcdir=`pwd`
-# The current directory is now $srcdir.
-
-# Check integrity of package: A configure.in/ac must be present. Sets variable
-# - configure_in    name of configure.in/ac file.
-if test -f configure.in; then
-  configure_in=configure.in
-else
-  if test -f configure.ac; then
-    configure_in=configure.ac
-  else
-    # KDE specific convention: configure.in.in
-    if test -f configure.in.in; then
-      configure_in=configure.in.in
-    else
-      func_fatal_error "Missing configure.in or configure.ac, please cd to your package first."
-    fi
-  fi
-fi
-
-# Check whether the -V option and the version number in configure.in match.
-# At least one of the two must be given. If both are given, they must agree.
-sed_extract_AM_GNU_GETTEXT_VERSION_argument='s/^AM_GNU_GETTEXT_VERSION(\([^()]*\)).*$/\1/'
-sed_remove_outer_brackets='s/^\[\(.*\)\]$/\1/'
-xver=`cat "$configure_in" | grep '^AM_GNU_GETTEXT_VERSION(' | sed -n -e "$sed_extract_AM_GNU_GETTEXT_VERSION_argument"p | sed -e "$sed_remove_outer_brackets" | sed -e 1q`
-if test -z "$xver" && test -f intl/VERSION; then
-  xver=`cat intl/VERSION | LC_ALL=C sed -n -e 's/^.*gettext-\([-+_.0-9A-Za-z]*\).*$/\1/p'`
-fi
-if test -n "$xver"; then
-  if test -n "$ver"; then
-    if test "X$ver" != "X$xver"; then
-      func_fatal_error "Version mismatch: specified -V $ver but the package uses gettext version $xver"
-    fi
-  else
-    ver="$xver"
-  fi
-else
-  if test -z "$ver"; then
-    func_fatal_error "Missing version: please specify in $configure_in through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using"
-  fi
-fi
-
-# Check whether the version number is supported.
-case "$ver" in
-  0.10.35 | 0.10.36 | 0.10.37 | 0.10.38 | 0.10.39 | 0.10.40 | \
-  0.11 | 0.11.1 | 0.11.2 | 0.11.3 | 0.11.4 | 0.11.5 | \
-  0.12 | 0.12.1 | \
-  0.13 | 0.13.1 | \
-  0.14 | 0.14.1 | 0.14.2 | 0.14.3 | 0.14.4 | 0.14.5 | 0.14.6 | \
-  0.15 | \
-  0.16 | 0.16.1 | \
-  0.17 | \
-  0.18 | 0.18.1 )
-    ;;
-  *)
-    func_fatal_error "The AM_GNU_GETTEXT_VERSION declaration in your $configure_in
-               file requires the infrastructure from gettext-$ver but this version
-               is older. Please upgrade to gettext-$ver or newer."
-    ;;
-esac
-
-# Check in which directory config.rpath, mkinstalldirs etc. belong.
-auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-if test -n "$auxdir"; then
-  auxdir="$auxdir/"
-fi
-
-# Check in which directory the *.m4 macros belong.
-m4dir=m4
-if test -f Makefile.am; then
-  # A package using automake.
-  # Extract the macro directory name from Makefile.am.
-  aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
-  m4dir_is_next=
-  for arg in $aclocal_amflags; do
-    if test -n "$m4dir_is_next"; then
-      m4dir="$arg"
-      break
-    else
-      if test "X$arg" = "X-I"; then
-        m4dir_is_next=yes
-      else
-        m4dir_is_next=
-      fi
-    fi
-  done
-fi
-
-# Check whether to omit the intl/ directory.
-omitintl=`cat "$configure_in" | grep '^AM_GNU_GETTEXT' | sed -n -e 's/^AM_GNU_GETTEXT(\([^(),]*\).*$/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-omitintl=`if test 'external' = "$omitintl"; then echo yes; fi`
-
-# Check in which directory or directories the po/* infrastructure belongs.
-sed_extract_config_files='s,#.*$,,
-s,^dnl .*$,,
-s, dnl .*$,,
-/AC_CONFIG_FILES(/ {
-  ta
-  :a
-    s/)/)/
-    tb
-    s/\\$//
-    N
-    ba
-  :b
-  s,^.*AC_CONFIG_FILES([[ ]*\([^]"$`\\)]*\).*$,\1,p
-}'
-configfiles=`cat "$configure_in" | sed -n -e "$sed_extract_config_files"`
-# PO directories have a Makefile.in generated from Makefile.in.in.
-# Treat a directory as a PO directory if and only if it has a
-# POTFILES.in file. This allows packages to have multiple PO
-# directories under different names or in different locations.
-sed_remove_Makefile_in='s,/Makefile\.in$,,'
-podirs=`for f in $configfiles; do case "$f" in */Makefile.in) echo $f;; esac; done | sed -e "$sed_remove_Makefile_in"`
-if test -z "$podirs"; then
-  # If we cannot get the list of PO directories from configure.ac, assume the
-  # common default.
-  podirs="po"
-fi
-
-# Set up a temporary checkout directory.
-# Set variables
-# - work_dir        directory containing the temporary checkout
-work_dir=tmpwrk$$
-mkdir "$work_dir" || {
-  if test -d "$work_dir"; then
-    func_fatal_error "directory $work_dir already exists"
-  else
-    func_fatal_error "cannot create directory $work_dir"
-  fi
-}
-
-# We support three archive formats.
-#
-# Format | Size (KiB) for gettext-0.17 | Extra tools needed |
-# -------+-----------------------------+--------------------+
-#  dir   |            3000             |         --         |
-#  cvs   |             356             |         cvs        |
-#  git   |             484             |         git        |
-# -------+-----------------------------+--------------------+
-
-case "git" in
-  dir)
-    # The archive of different versions is very large, but using it does not
-    # require special tools.
-    gzip -d -c < "$gettext_dir/archive.dir.tar.gz" | (cd "$work_dir" && tar xf - "gettext-$ver")
-    if test `find "$work_dir" -type f -print | wc -l` = 0; then
-      rm -rf "$work_dir"
-      func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
-    fi
-    mv "$work_dir/gettext-$ver" "$work_dir/archive"
-    ;;
-
-  cvs)
-    # We distributed the many different versions of the files in a CVS
-    # repository. This guaranteed a good compression rate:
-    #
-    #   Including version    size in KB of
-    #                       "du autopoint-files/archive"
-    #      0.10.35                  240
-    #      0.10.36                  428
-    #      0.10.37                  436
-    #      0.10.38                  488
-    #      0.10.39                  500
-    #      0.10.40                  528
-    #      0.11                     720
-    #      0.11.1                   740
-    #      0.11.2                   748
-    #      0.11.3                   804
-    #      0.11.4                   864
-    #      0.11.5                   880
-    #      0.12                    1032
-    #      0.12.1                  1032
-    #      0.13                    1220
-    #      0.13.1                  1236
-    #      0.14                    1296
-    #      0.14.1                  1300
-    #      0.14.2                  1420
-    #      0.14.3                  1428
-    #      0.14.4                  1464
-    #      0.14.5                  1508
-    #      0.14.6                  1580
-    #      0.15                    1760
-    #      0.16                    1808
-    #      0.16.1                  1812
-    #      0.17                    2128
-    #      0.18                    2656
-    #
-    # The requirement that the user must have the CVS program available is not
-    # a severe restrictions, because most of the people who use autopoint are
-    # users of CVS.
-    #
-    # But the CVS format is now deprecated, because "cvs init" does not work in
-    # all circumstances
-    # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-05/msg00003.html>)
-    # and we are not allowed to distribute the cvs infrastructure files
-    # ourselves
-    # (see <http://lists.gnu.org/archive/html/bug-cvs/2010-06/msg00011.html>).
-    #
-    # Check availability of the CVS program.
-    (cvs -v) >/dev/null 2>/dev/null || func_fatal_error "cvs program not found"
-
-    # Set up a temporary CVS repository.
-    # We need the temporary CVS repository because any checkout needs write
-    # access to the CVSROOT/history file, so it cannot be under $gettext_dir.
-    # We need the temporary checkout directory because when --force was not
-    # given, we need to compare the existing files with the checked out ones.
-    # Set variables
-    # - cvs_dir         directory containing the temporary repository
-    cvs_dir=tmpcvs$$
-    # Use an umask of 077, to avoid attacks that work by overwriting files in
-    # the "$CVSROOT"/CVSROOT directory.
-    (umask 077 && mkdir "$cvs_dir") || {
-      if test -d "$cvs_dir"; then
-        func_fatal_error "directory $cvs_dir already exists"
-      else
-        func_fatal_error "cannot create directory $cvs_dir"
-      fi
-    }
-    CVSROOT="$srcdir/$cvs_dir"
-    unset CVS_CLIENT_LOG
-    unset CVS_CLIENT_PORT
-    unset CVS_IGNORE_REMOTE_ROOT
-    unset CVS_LOCAL_BRANCH_NUM
-    unset CVS_NOBASES
-    unset CVS_PASSFILE
-    unset CVS_PASSWORD
-    unset CVS_PROXY_PORT
-    unset CVS_RCMD_PORT
-    unset CVS_RSH
-    unset CVS_SERVER
-    unset CVS_SERVER_SLEEP
-    CVS_SIGN_COMMITS=
-    export CVS_SIGN_COMMITS
-    unset CVS_SSH
-    unset CVS_VERIFY_CHECKOUTS
-    unset CVS_VERIFY_TEMPLATE
-    unset CVSIGNORE
-    unset CVSREAD
-    unset CVSREADONLYFS
-    unset CVSUMASK
-    unset CVSWRAPPERS
-
-    # Need to pass -d "$CVSROOT", because there may be a CVS directory in the
-    # current directory.
-    cvs -d "$CVSROOT" init
-    gzip -d -c < "$gettext_dir/archive.cvs.tar.gz" | (cd "$cvs_dir" && tar xf -)
-
-    cd "$work_dir"
-    cvsver=gettext-`echo "$ver" | sed -e 's/\./_/g'`
-    (cvs -d "$CVSROOT" checkout -r"$cvsver" archive > /dev/null) 2>&1 | grep -v '^cvs checkout: Updating'
-    find archive -name CVS -type d -print | xargs rm -rf
-    cd ..
-    rm -rf "$cvs_dir"
-    # Check that really all CVS directories are gone, otherwise we would overwrite
-    # the contents of the user's CVS directories.
-    if test `find $work_dir/archive -name CVS -type d -print | wc -l` != 0; then
-      rm -rf "$work_dir"
-      func_fatal_error "failed to remove all CVS subdirectories"
-    fi
-    if test `find $work_dir/archive -type f -print | wc -l` = 0; then
-      rm -rf "$work_dir"
-      func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
-    fi
-    ;;
-
-  git)
-    # Check availability of the git program.
-    (git --version) >/dev/null 2>/dev/null || func_fatal_error "git program not found"
-    mkdir "$work_dir/archive"
-    gzip -d -c < "$gettext_dir/archive.git.tar.gz" | (cd "$work_dir/archive" && tar xf -)
-    (cd "$work_dir/archive" && git checkout -q "gettext-$ver") || {
-      rm -rf "$work_dir"
-      func_fatal_error "infrastructure files for version $ver not found; this is autopoint from GNU $package $version"
-    }
-    (cd "$work_dir/archive" && rm -rf .git .gitignore)
-    ;;
-esac
-
-# func_destfile file
-# determines the destination file, relative to the package's top level
-# directory, for a given file name, relative to archive.
-# Sets variables
-# - destfile        relative destination file name, or
-#                   empty if the file shall be omitted
-# - sharedowner     yes if the file is not only owned by GNU gettext but may
-#                   be installed by automake or other tools, otherwise empty
-# - allpodirs       yes if the file is to be installed in every dir in $podirs
-func_destfile ()
-{
-  # There are five categories of files:
-  # ABOUT_NLS -> top level directory
-  # config.rpath mkinstalldirs -> $auxdir
-  # m4/* -> $m4dir/
-  # intl/* -> intl/
-  # po/* -> 
-  sharedowner=
-  allpodirs=
-  case `echo "$1" | sed -e 's,[^/]*$,,'` in
-    "" )
-      case "$1" in
-        config.rpath ) destfile="$auxdir$1" ;;
-        mkinstalldirs ) destfile="$auxdir$1" sharedowner=yes ;;
-        * ) destfile="$1" ;;
-      esac
-      ;;
-    m4/ ) destfile=`echo "$1" | sed -e "s,^m4/,$m4dir/,"` ;;
-    intl/ ) if test -n "$omitintl"; then destfile=""; else destfile="$1"; fi ;;
-    po/ ) destfile=`echo "$1" | sed -e "s,^po/,,"` allpodirs=yes ;;
-    * ) destfile="$1" ;;
-  esac
-}
-
-# func_compare existingfile gettextfile
-# compares the existing file and the file from gettext, and decides whether the
-# existing file should be overwritten with the file from gettext. Returns 0 if
-# it should be overwritten, or 1 if it should be skipped.
-sed_extract_serial='s/^#.* serial \([^ ]*\).*/\1/p
-1q'
-func_compare ()
-{
-  if cmp -s "$1" "$2"; then
-    false
-  else
-    case "$2" in
-      *.m4)
-        # For interoperability with gnulib. gnulib often has newer versions of
-        # the *.m4 files than the latest gettext release. Don't overwrite a
-        # newer version from gnulib with an older version from the gettext
-        # release. The version can be retrieved from the first line, which
-        # looks like this:   # file.m4 serial NN ...
-        existing_serial=`sed -n -e "$sed_extract_serial" < "$1"`
-        gettext_serial=`sed -n -e "$sed_extract_serial" < "$2"`
-        if test -n "$existing_serial" && test -n "$gettext_serial" \
-           && test "$existing_serial" -ge "$gettext_serial" 2> /dev/null; then
-          false
-        else
-          true
-        fi
-        ;;
-      *)
-        true
-        ;;
-    esac
-  fi
-}
-
-# If some files have been locally modified and we have not been requested
-# to overwrite them, then bail out. This is better than leaving a source
-# package around where half of the files are locally modified and half are
-# original - too great risk of version mismatch.
-if test -z "$force"; then
-  mismatch=
-  func_tmpdir
-  mismatchfile="$tmp"/autopoint.diff
-  for file in `find "$work_dir/archive" -type f -print | sed -e "s,^$work_dir/archive/,," | LC_ALL=C sort`; do
-    func_destfile "$file"
-    if test -n "$destfile"; then
-      func_compare_to_destfile ()
-      {
-        finaldestfile="$1"
-        if test -f "$finaldestfile"; then
-          if func_compare "$finaldestfile" "$work_dir/archive/$file"; then
-            if test -n "$sharedowner"; then
-              echo "autopoint: warning: File $finaldestfile has been locally modified." 1>&2
-            else
-              echo "autopoint: File $finaldestfile has been locally modified." 1>&2
-              mismatch=yes
-              diff -c "$work_dir/archive/$file" "$finaldestfile" | sed -e "1s,$work_dir/archive/,," >> "$mismatchfile"
-            fi
-          fi
-        fi
-      }
-      if test -n "$allpodirs"; then
-        for dir in $podirs; do
-          func_compare_to_destfile "$dir/$destfile"
-        done
-      else
-        func_compare_to_destfile "$destfile"
-      fi
-    fi
-  done
-  if test -n "$mismatch"; then
-    rm -rf "$work_dir"
-    func_fatal_error "Some files have been locally modified. Not overwriting them because --force has not been specified. For your convenience, you find the local modifications in the file '$mismatchfile'."
-  fi
-  rm -rf "$tmp"
-fi
-
-# func_mkdir_for to
-# ensures the directory that would the given file exists.
-# 'to' is a relative pathname, relative to the current directory.
-func_mkdir_for ()
-{
-  base=`echo "$1" | sed -e 's,/[^/]*$,,'`
-  if test "X$base" != "X$1" && test -n "$base"; then
-    func_mkdir_for "$base"
-    # Recompute base. It was clobbered by the recursive call.
-    base=`echo "$1" | sed -e 's,/[^/]*$,,'`
-    test -d "$base" || { echo "Creating directory $base"; mkdir "$base"; }
-  fi
-}
-
-# func_copy from to
-# copies a file.
-# 'from' is a relative pathname, relative to the current directory.
-# 'to' is a relative pathname, relative to the current directory.
-func_copy ()
-{
-  if $doit; then
-    func_mkdir_for "$2"
-    rm -f "$2"
-    echo "Copying file $2"
-    cp "$1" "$2"
-  else
-    echo "Copy file $2"
-  fi
-}
-
-# func_backup to
-# makes a backup of a file that is about to be overwritten or replaced.
-# 'to' is a relative pathname, relative to the current directory.
-func_backup ()
-{
-  if $doit; then
-    if test -f "$1"; then
-      rm -f "$1~"
-      cp -p "$1" "$1~"
-    fi
-  fi
-}
-
-# Now copy the files.
-for file in `find "$work_dir/archive" -type f -print | sed -e "s,^$work_dir/archive/,," | LC_ALL=C sort`; do
-  func_destfile "$file"
-  if test -n "$destfile"; then
-    func_copy_to_destfile ()
-    {
-      finaldestfile="$1"
-      mustcopy=
-      if test -f "$finaldestfile"; then
-        if func_compare "$finaldestfile" "$work_dir/archive/$file"; then
-          if test -n "$force"; then
-            # Overwrite locally modified file.
-            mustcopy=yes
-          fi
-          # If --force is not specified, don't overwrite locally modified files
-          # for which GNU gettext is a shared owner.
-        fi
-      else
-        mustcopy=yes
-      fi
-      if test -n "$mustcopy"; then
-        func_backup "$finaldestfile"
-        func_copy "$work_dir/archive/$file" "$finaldestfile"
-      fi
-    }
-    if test -n "$allpodirs"; then
-      for dir in $podirs; do
-        func_copy_to_destfile "$dir/$destfile"
-      done
-    else
-      func_copy_to_destfile "$destfile"
-    fi
-  fi
-done
-
-# That's it.
-rm -rf "$work_dir"
-exit 0
diff --git a/libs/gettext/bin64/envsubst.exe b/libs/gettext/bin64/envsubst.exe
deleted file mode 100644
index 8e09a3397..000000000
Binary files a/libs/gettext/bin64/envsubst.exe and /dev/null differ
diff --git a/libs/gettext/bin64/gettext.exe b/libs/gettext/bin64/gettext.exe
deleted file mode 100644
index c9f48a0eb..000000000
Binary files a/libs/gettext/bin64/gettext.exe and /dev/null differ
diff --git a/libs/gettext/bin64/gettext.sh b/libs/gettext/bin64/gettext.sh
deleted file mode 100755
index 2369ab501..000000000
--- a/libs/gettext/bin64/gettext.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Library General Public License as published
-# by the Free Software Foundation; either version 2, 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.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-# USA.
-#
-
-# Find a way to echo strings without interpreting backslash.
-if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-  echo='echo'
-else
-  if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-    echo='printf %s\n'
-  else
-    echo_func () {
-      cat <<EOT
-$*
-EOT
-    }
-    echo='echo_func'
-  fi
-fi
-
-# This script is primarily a shell function library. In order for
-# ". gettext.sh" to find it, we install it in $PREFIX/bin (that is usually
-# contained in $PATH), rather than in some other location such as
-# $PREFIX/share/sh-scripts or $PREFIX/share/gettext. In order to not violate
-# the Filesystem Hierarchy Standard when doing so, this script is executable.
-# Therefore it needs to support the standard --help and --version.
-if test -z "$ZSH_VERSION"; then
-  # zsh is not POSIX compliant: By default, while ". gettext.sh" is executed,
-  # it sets $0 to "gettext.sh", defeating the purpose of this test. But
-  # fortunately we know that when running under zsh, this script is always
-  # being sourced, not executed, because hardly anyone is crazy enough to
-  # install zsh as /bin/sh.
-  case "$0" in
-    gettext.sh | */gettext.sh | *\\gettext.sh)
-      progname=$0
-      package=gettext-runtime
-      version=0.18.1
-      # func_usage
-      # outputs to stdout the --help usage message.
-      func_usage ()
-      {
-        echo "GNU gettext shell script function library version $version"
-        echo "Usage: . gettext.sh"
-      }
-      # func_version
-      # outputs to stdout the --version message.
-      func_version ()
-      {
-        echo "$progname (GNU $package) $version"
-        echo "Copyright (C) 2003-2007 Free Software Foundation, Inc.
-License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law."
-        echo "Written by" "Bruno Haible"
-      }
-      if test $# = 1; then
-        case "$1" in
-          --help | --hel | --he | --h )
-            func_usage; exit 0 ;;
-          --version | --versio | --versi | --vers | --ver | --ve | --v )
-            func_version; exit 0 ;;
-        esac
-      fi
-      func_usage 1>&2
-      exit 1
-      ;;
-  esac
-fi
-
-# eval_gettext MSGID
-# looks up the translation of MSGID and substitutes shell variables in the
-# result.
-eval_gettext () {
-  gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1")
-}
-
-# eval_ngettext MSGID MSGID-PLURAL COUNT
-# looks up the translation of MSGID / MSGID-PLURAL for COUNT and substitutes
-# shell variables in the result.
-eval_ngettext () {
-  ngettext "$1" "$2" "$3" | (export PATH `envsubst --variables "$1 $2"`; envsubst "$1 $2")
-}
-
-# Note: This use of envsubst is much safer than using the shell built-in 'eval'
-# would be.
-# 1) The security problem with Chinese translations that happen to use a
-#    character such as \xe0\x60 is avoided.
-# 2) The security problem with malevolent translators who put in command lists
-#    like "$(...)" or "`...`" is avoided.
-# 3) The translations can only refer to shell variables that are already
-#    mentioned in MSGID or MSGID-PLURAL.
-#
-# Note: "export PATH" above is a dummy; this is for the case when
-# `envsubst --variables ...` returns nothing.
-#
-# Note: In eval_ngettext above, "$1 $2" means a string whose variables set is
-# the union of the variables set of "$1" and "$2".
-#
-# Note: The minimal use of backquote above ensures that trailing newlines are
-# not dropped, not from the gettext invocation and not from the value of any
-# shell variable.
-#
-# Note: Field splitting on the `envsubst --variables ...` result is desired,
-# since envsubst outputs the variables, separated by newlines. Pathname
-# wildcard expansion or tilde expansion has no effect here, since the words
-# output by "envsubst --variables ..." consist solely of alphanumeric
-# characters and underscore.
diff --git a/libs/gettext/bin64/gettextize b/libs/gettext/bin64/gettextize
deleted file mode 100755
index 8261a1cb7..000000000
--- a/libs/gettext/bin64/gettextize
+++ /dev/null
@@ -1,1281 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
-#
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# This file is meant for authors or maintainers which want to
-# internationalize their package with the help of GNU gettext.  For
-# further information how to use it consult the GNU gettext manual.
-
-progname=$0
-package=gettext-tools
-version=0.18.1
-
-# Set variables
-# - gettext_dir     directory where the sources are stored.
-prefix="/usr/local/x86_64-w64-mingw32/stow/gettext-0.18.1.1"
-datarootdir="${prefix}/share"
-gettext_dir="${datarootdir}/gettext"
-
-# func_tmpdir
-# creates a temporary directory.
-# Sets variable
-# - tmp             pathname of freshly created temporary directory
-func_tmpdir ()
-{
-  # Use the environment variable TMPDIR, falling back to /tmp. This allows
-  # users to specify a different temporary directory, for example, if their
-  # /tmp is filled up or too small.
-  : ${TMPDIR=/tmp}
-  {
-    # Use the mktemp program if available. If not available, hide the error
-    # message.
-    tmp=`(umask 077 && mktemp -d "$TMPDIR/gtXXXXXX") 2>/dev/null` &&
-    test -n "$tmp" && test -d "$tmp"
-  } ||
-  {
-    # Use a simple mkdir command. It is guaranteed to fail if the directory
-    # already exists.  $RANDOM is bash specific and expands to empty in shells
-    # other than bash, ksh and zsh.  Its use does not increase security;
-    # rather, it minimizes the probability of failure in a very cluttered /tmp
-    # directory.
-    tmp=$TMPDIR/gt$$-$RANDOM
-    (umask 077 && mkdir "$tmp")
-  } ||
-  {
-    echo "$0: cannot create a temporary directory in $TMPDIR" >&2
-    { (exit 1); exit 1; }
-  }
-}
-
-# Support for relocatability.
-func_find_curr_installdir ()
-{
-  # Determine curr_installdir, even taking into account symlinks.
-  curr_executable="$0"
-  case "$curr_executable" in
-    */* | *\\*) ;;
-    *) # Need to look in the PATH.
-      if test "${PATH_SEPARATOR+set}" != set; then
-        func_tmpdir
-        { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
-        chmod +x "$tmp"/conf.sh
-        if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
-          PATH_SEPARATOR=';'
-        else
-          PATH_SEPARATOR=:
-        fi
-        rm -rf "$tmp"
-      fi
-      save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
-      for dir in $PATH; do
-        IFS="$save_IFS"
-        test -z "$dir" && dir=.
-        for exec_ext in ''; do
-          if test -f "$dir/$curr_executable$exec_ext"; then
-            curr_executable="$dir/$curr_executable$exec_ext"
-            break 2
-          fi
-        done
-      done
-      IFS="$save_IFS"
-      ;;
-  esac
-  # Make absolute.
-  case "$curr_executable" in
-    /* | ?:/* | ?:\\*) ;;
-    *) curr_executable=`pwd`/"$curr_executable" ;;
-  esac
-  # Resolve symlinks.
-  sed_dirname='s,/[^/]*$,,'
-  sed_linkdest='s,^.* -> \(.*\),\1,p'
-  while : ; do
-    lsline=`LC_ALL=C ls -l "$curr_executable"`
-    case "$lsline" in
-      *" -> "*)
-        linkdest=`echo "$lsline" | sed -n -e "$sed_linkdest"`
-        case "$linkdest" in
-          /* | ?:/* | ?:\\*) curr_executable="$linkdest" ;;
-          *) curr_executable=`echo "$curr_executable" | sed -e "$sed_dirname"`/"$linkdest" ;;
-        esac ;;
-      *) break ;;
-    esac
-  done
-  curr_installdir=`echo "$curr_executable" | sed -e 's,/[^/]*$,,'`
-  # Canonicalize.
-  curr_installdir=`cd "$curr_installdir" && pwd`
-}
-func_find_prefixes ()
-{
-  # Compute the original/current installation prefixes by stripping the
-  # trailing directories off the original/current installation directories.
-  orig_installprefix="$orig_installdir"
-  curr_installprefix="$curr_installdir"
-  while true; do
-    orig_last=`echo "$orig_installprefix" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    curr_last=`echo "$curr_installprefix" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    if test -z "$orig_last" || test -z "$curr_last"; then
-      break
-    fi
-    if test "$orig_last" != "$curr_last"; then
-      break
-    fi
-    orig_installprefix=`echo "$orig_installprefix" | sed -e 's,/[^/]*$,,'`
-    curr_installprefix=`echo "$curr_installprefix" | sed -e 's,/[^/]*$,,'`
-  done
-}
-if test "no" = yes; then
-  exec_prefix="${prefix}"
-  bindir="${exec_prefix}/bin"
-  orig_installdir="$bindir" # see Makefile.am's *_SCRIPTS variables
-  func_find_curr_installdir # determine curr_installdir
-  func_find_prefixes
-  # Relocate the directory variables that we use.
-  gettext_dir=`echo "$gettext_dir/" | sed -e "s%^${orig_installprefix}/%${curr_installprefix}/%" | sed -e 's,/$,,'`
-fi
-
-# func_usage
-# outputs to stdout the --help usage message.
-func_usage ()
-{
-  echo "\
-Usage: gettextize [OPTION]... [package-dir]
-
-Prepares a source package to use gettext.
-
-Options:
-      --help           print this help and exit
-      --version        print version information and exit
-  -f, --force          force writing of new files even if old exist
-      --intl           install libintl in a subdirectory (deprecated)
-      --po-dir=DIR     specify directory with PO files
-      --no-changelog   don't update or create ChangeLog files
-      --symlink        make symbolic links instead of copying files
-  -n, --dry-run        print modifications but don't perform them
-
-Report bugs to <bug-gnu-gettext@gnu.org>."
-}
-
-# func_version
-# outputs to stdout the --version message.
-func_version ()
-{
-  echo "$progname (GNU $package) $version"
-  echo "Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law."
-  echo "Written by" "Ulrich Drepper"
-}
-
-# func_fatal_error message
-# outputs to stderr a fatal error message, and terminates the program.
-func_fatal_error ()
-{
-  echo "gettextize: *** $1" 1>&2
-  echo "gettextize: *** Stop." 1>&2
-  exit 1
-}
-
-# Nuisances.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Command-line option processing.
-# Removes the OPTIONS from the arguments. Sets the variables:
-# - force           1 if --force was given, 0 otherwise
-# - intldir         yes if --intl was given, empty otherwise
-# - podirs          list of directories specified with --po-dir
-# - try_ln_s        : if --symlink was given, false otherwise
-# - do_changelog    false if --no-changelog was given, : otherwise
-# - doit            false if --dry-run was given, : otherwise
-{
-  force=0
-  intldir=
-  podirs=
-  try_ln_s=false
-  do_changelog=:
-  doit=:
-
-  while test $# -gt 0; do
-    case "$1" in
-      -c | --copy | --cop | --co | --c ) # accepted for backward compatibility
-        shift ;;
-      -n | --dry-run | --dry-ru | --dry-r | --dry- | --dry | --dr | --d )
-        shift
-        doit=false ;;
-      -f | --force | --forc | --for | --fo | --f )
-        shift
-        force=1 ;;
-      --help | --hel | --he | --h )
-        func_usage; exit 0 ;;
-      --intl | --int | --in | --i )
-        shift
-        intldir=yes ;;
-      --po-dir | --po-di | --po-d | --po- | --po | --p )
-        shift 
-        if test $# = 0; then
-          func_fatal_error "missing argument for --po-dir"
-        fi
-        case "$1" in
-          -*) func_fatal_error "missing argument for --po-dir" ;;
-        esac
-        podirs="$podirs $1"
-        shift ;;
-      --po-dir=* )
-        arg=`echo "X$1" | sed -e 's/^X--po-dir=//'`
-        podirs="$podirs $arg"
-        shift ;;
-      --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch | --no-c )
-        shift
-        do_changelog=false ;;
-      --symlink | --symlin | --symli | --syml | --sym | --sy | --s )
-        shift
-        try_ln_s=: ;;
-      --version | --versio | --versi | --vers | --ver | --ve | --v )
-        func_version
-        exit 0 ;;
-      -- ) # Stop option prcessing
-        shift; break ;;
-      -* )
-        echo "gettextize: unknown option $1" 1>&2
-        echo "Try 'gettextize --help' for more information." 1>&2
-        exit 1 ;;
-      * )
-        break ;;
-    esac
-  done
-  # podirs defaults to "po".
-  test -n "$podirs" || podirs="po"
-}
-
-# Warn about deprecated options.
-if test -n "$intldir"; then
-  echo "gettextize: warning: the option '--intl' is deprecated and will be removed" 1>&2
-fi
-
-# Command-line argument processing.
-# Analyzes the remaining arguments.
-# Sets the variables
-# - origdir         to the original directory,
-# - srcdir          to the package directory, and cd-s into it.
-{
-  if test $# -gt 1; then
-    func_usage 1>&2
-    exit 1
-  fi
-  origdir=`pwd`
-  if test $# -eq 1; then
-    srcdir=$1
-    if cd "$srcdir"; then
-      srcdir=`pwd`
-    else
-      func_fatal_error "Cannot change directory to '$srcdir'."
-    fi
-  else
-    srcdir=$origdir
-  fi
-}
-
-# The current directory is now $srcdir.
-
-# Check integrity of package: A configure.in/ac must be present. Sets variable
-# - configure_in    name of configure.in/ac file.
-test -f configure.in || test -f configure.ac ||
-  func_fatal_error "Missing configure.in or configure.ac, please cd to your package first."
-configure_in=NONE
-if test -f configure.in; then
-  configure_in=configure.in
-else
-  if test -f configure.ac; then
-    configure_in=configure.ac
-  fi
-fi
-
-# Check whether the --force option is needed but has not been specified.
-if test $force -eq 0; then
-  if test -d intl; then
-    func_fatal_error "intl/ subdirectory exists: use option -f if you really want to delete it."
-  fi
-  for podir in $podirs; do
-    if test -f "$podir/Makefile.in.in"; then
-      func_fatal_error "$podir/Makefile.in.in exists: use option -f if you really want to delete it."
-    fi
-  done
-  if test -f ABOUT-NLS; then
-    func_fatal_error "ABOUT-NLS exists: use option -f if you really want to delete it."
-  fi
-fi
-
-# Check in which directory config.rpath etc. belong.
-auxdir=`cat "$configure_in" | grep '^AC_CONFIG_AUX_DIR' | sed -n -e 's/AC_CONFIG_AUX_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
-if test -n "$auxdir"; then
-  auxdir="$auxdir/"
-fi
-
-# For simplicity we change to the gettext source directory.
-cd "$gettext_dir" ||
-  func_fatal_error "gettext source directory '${gettext_dir}' doesn't exist"
-
-# Variables which keep track what has been modified.
-added_directories=
-removed_directory=
-added_extradist=
-added_acoutput=
-removed_acoutput=" intl/intlh.inst"
-
-# Variable:
-# - please          accumulates instructions for the user.
-please=
-
-# Variable:
-# - date            current date, for use in ChangeLog entries.
-date=`date +%Y-%m-%d`
-
-# func_copy from to
-# copies a file.
-# 'from' is a relative pathname, relative to the current directory.
-# 'to' is a relative pathname, relative to $srcdir.
-func_copy ()
-{
-  if $doit; then
-    rm -f "$srcdir/$2"
-    echo "Copying file $2"
-    cp "$1" "$srcdir/$2"
-  else
-    echo "Copy file $2"
-  fi
-}
-
-# func_linkorcopy from absfrom to
-# links or copies a file.
-# 'from' is a relative pathname, relative to the current directory.
-# 'absfrom' is the corresponding absolute pathname.
-# 'to' is a relative pathname, relative to $srcdir.
-func_linkorcopy ()
-{
-  if $doit; then
-    rm -f "$srcdir/$3"
-    ($try_ln_s && ln -s "$2" "$srcdir/$3" && echo "Symlinking file $3") 2>/dev/null ||
-    { echo "Copying file $3"; cp "$1" "$srcdir/$3"; }
-  else
-    if $try_ln_s; then
-      echo "Symlink file $3"
-    else
-      echo "Copy file $3"
-    fi
-  fi
-}
-
-# func_backup to
-# makes a backup of a file that is about to be overwritten or replaced.
-# 'to' is a relative pathname, relative to $srcdir.
-func_backup ()
-{
-  if $doit; then
-    if test -f "$srcdir/$1"; then
-      rm -f "$srcdir/$1~"
-      cp -p "$srcdir/$1" "$srcdir/$1~"
-    fi
-  fi
-}
-
-# func_remove to
-# removes a file.
-# 'to' is a relative pathname, relative to $srcdir.
-func_remove ()
-{
-  if $doit; then
-    echo "Removing $1"
-    rm -f "$srcdir/$1"
-  else
-    echo "Remove $1"
-  fi
-}
-
-# func_ChangeLog_init
-# func_ChangeLog_add_entry line
-# func_ChangeLog_finish
-# manage the ChangeLog file, relative to $srcdir.
-func_ChangeLog_init ()
-{
-  modified_ChangeLog=
-}
-func_ChangeLog_add_entry ()
-{
-  if $doit; then
-    if test -z "$modified_ChangeLog"; then
-      echo "$date  gettextize  <bug-gnu-gettext@gnu.org>" > "$srcdir/ChangeLog.tmp"
-      echo >> "$srcdir/ChangeLog.tmp"
-      modified_ChangeLog=yes
-    fi
-    echo "$1" >> "$srcdir/ChangeLog.tmp"
-  else
-    modified_ChangeLog=yes
-  fi
-}
-func_ChangeLog_finish ()
-{
-  if test -n "$modified_ChangeLog"; then
-    if $doit; then
-      echo >> "$srcdir/ChangeLog.tmp"
-      if test -f "$srcdir/ChangeLog"; then
-        echo "Adding an entry to ChangeLog (backup is in ChangeLog~)"
-        cat "$srcdir/ChangeLog" >> "$srcdir/ChangeLog.tmp"
-        rm -f "$srcdir/ChangeLog~"
-        cp -p "$srcdir/ChangeLog" "$srcdir/ChangeLog~"
-      else
-        echo "Creating ChangeLog"
-      fi
-      cp "$srcdir/ChangeLog.tmp" "$srcdir/ChangeLog"
-      rm -f "$srcdir/ChangeLog.tmp"
-    else
-      if test -f "$srcdir/ChangeLog"; then
-        echo "Add an entry to ChangeLog"
-      else
-        echo "Create ChangeLog"
-      fi
-    fi
-  fi
-}
-
-# func_poChangeLog_init
-# func_poChangeLog_add_entry line
-# func_poChangeLog_finish
-# manage the $podir/ChangeLog file, relative to $srcdir.
-func_poChangeLog_init ()
-{
-  modified_poChangeLog=
-}
-func_poChangeLog_add_entry ()
-{
-  if $doit; then
-    if test -z "$modified_poChangeLog"; then
-      echo "$date  gettextize  <bug-gnu-gettext@gnu.org>" > "$srcdir/$podir/ChangeLog.tmp"
-      echo >> "$srcdir/$podir/ChangeLog.tmp"
-      modified_poChangeLog=yes
-    fi
-    echo "$1" >> "$srcdir/$podir/ChangeLog.tmp"
-  else
-    modified_poChangeLog=yes
-  fi
-}
-func_poChangeLog_finish ()
-{
-  if test -n "$modified_poChangeLog"; then
-    if $doit; then
-      echo >> "$srcdir/$podir/ChangeLog.tmp"
-      if test -f "$srcdir/$podir/ChangeLog"; then
-        echo "Adding an entry to $podir/ChangeLog (backup is in $podir/ChangeLog~)"
-        cat "$srcdir/$podir/ChangeLog" >> "$srcdir/$podir/ChangeLog.tmp"
-        rm -f "$srcdir/$podir/ChangeLog~"
-        cp -p "$srcdir/$podir/ChangeLog" "$srcdir/$podir/ChangeLog~"
-      else
-        echo "Creating $podir/ChangeLog"
-      fi
-      cp "$srcdir/$podir/ChangeLog.tmp" "$srcdir/$podir/ChangeLog"
-      rm -f "$srcdir/$podir/ChangeLog.tmp"
-    else
-      if test -f "$srcdir/$podir/ChangeLog"; then
-        echo "Add an entry to $podir/ChangeLog"
-      else
-        echo "Create $podir/ChangeLog"
-      fi
-    fi
-  fi
-}
-
-# func_m4ChangeLog_init
-# func_m4ChangeLog_add_entry line
-# func_m4ChangeLog_finish
-# manage the $m4dir/ChangeLog file, relative to $srcdir.
-func_m4ChangeLog_init ()
-{
-  if test -n "$using_m4ChangeLog"; then
-    modified_m4ChangeLog=
-    created_m4ChangeLog=
-  fi
-}
-func_m4ChangeLog_add_entry ()
-{
-  if test -n "$using_m4ChangeLog"; then
-    if $doit; then
-      if test -z "$modified_m4ChangeLog"; then
-        echo "$date  gettextize  <bug-gnu-gettext@gnu.org>" > "$srcdir/$m4dir/ChangeLog.tmp"
-        echo >> "$srcdir/$m4dir/ChangeLog.tmp"
-        modified_m4ChangeLog=yes
-      fi
-      echo "$1" >> "$srcdir/$m4dir/ChangeLog.tmp"
-    else
-      modified_m4ChangeLog=yes
-    fi
-  else
-    line="$1"
-    line=`echo "$line" | sed -e "s%^	\\* %	* $m4dir/%"`
-    func_ChangeLog_add_entry "$line"
-  fi
-}
-func_m4ChangeLog_finish ()
-{
-  if test -n "$using_m4ChangeLog"; then
-    if test -n "$modified_m4ChangeLog"; then
-      if $doit; then
-        echo >> "$srcdir/$m4dir/ChangeLog.tmp"
-        if test -f "$srcdir/$m4dir/ChangeLog"; then
-          echo "Adding an entry to $m4dir/ChangeLog (backup is in $m4dir/ChangeLog~)"
-          cat "$srcdir/$m4dir/ChangeLog" >> "$srcdir/$m4dir/ChangeLog.tmp"
-          rm -f "$srcdir/$m4dir/ChangeLog~"
-          cp -p "$srcdir/$m4dir/ChangeLog" "$srcdir/$m4dir/ChangeLog~"
-        else
-          echo "Creating $m4dir/ChangeLog"
-          created_m4ChangeLog=yes
-        fi
-        cp "$srcdir/$m4dir/ChangeLog.tmp" "$srcdir/$m4dir/ChangeLog"
-        rm -f "$srcdir/$m4dir/ChangeLog.tmp"
-      else
-        if test -f "$srcdir/$m4dir/ChangeLog"; then
-          echo "Add an entry to $m4dir/ChangeLog"
-        else
-          echo "Create $m4dir/ChangeLog"
-          created_m4ChangeLog=yes
-        fi
-      fi
-    fi
-  fi
-}
-using_m4ChangeLog=yes
-
-if test ! -f "$srcdir/intl/Makefile.in" && test -n "$intldir"; then
-  added_acoutput="$added_acoutput intl/Makefile"
-fi
-if test -f "$srcdir/intl/Makefile.in" && test -z "$intldir"; then
-  removed_acoutput="$removed_acoutput intl/Makefile"
-fi
-if test -d "$srcdir/intl"; then
-  # Remove everything inside intl except for RCS and CVS subdirs and invisible
-  # files.
-  if $doit; then
-    echo "Wiping out intl/ subdirectory"
-    (cd "$srcdir/intl" &&
-     for f in *; do
-       if test CVS != "$f" && test RCS != "$f"; then
-         rm -rf "$f"
-       fi
-     done)
-  else
-    echo "Wipe out intl/ subdirectory"
-  fi
-  if test -z "$intldir"; then
-    removed_directory=intl
-  fi
-else
-  if test -n "$intldir"; then
-    if $doit; then
-      echo "Creating intl/ subdirectory"
-      mkdir "$srcdir/intl" || func_fatal_error "failed to create intl/ subdirectory"
-    else
-      echo "Create intl/ subdirectory"
-    fi
-    added_directories="$added_directories intl"
-  fi
-fi
-
-$do_changelog && func_ChangeLog_init
-
-for podir in $podirs; do
-  test -d "$srcdir/$podir" || {
-    if $doit; then
-      echo "Creating $podir/ subdirectory"
-      mkdir "$srcdir/$podir" || func_fatal_error "failed to create $podir/ subdirectory"
-    else
-      echo "Create $podir/ subdirectory"
-    fi
-    added_directories="$added_directories $podir"
-  }
-done
-
-# Create the directory for config.rpath, if needed.
-# This is for consistency with autoreconf and automake.
-# Note that $auxdir is either empty or ends in a slash.
-test -d "$srcdir/$auxdir" || {
-  if $doit; then
-    echo "Creating $auxdir subdirectory"
-    mkdir "$srcdir/$auxdir" || func_fatal_error "failed to create $auxdir subdirectory"
-  else
-    echo "Create $auxdir subdirectory"
-  fi
-}
-
-# Now copy all files.  Take care for the destination directories.
-for file in *; do
-  case $file in
-    ABOUT-NLS)
-      func_linkorcopy $file "$gettext_dir/$file" $file
-      ;;
-    config.rpath)
-      if test -f "$srcdir/$auxdir$file"; then
-        :
-      else
-        added_extradist="$added_extradist $auxdir$file"
-      fi
-      func_linkorcopy $file "$gettext_dir/$file" "$auxdir$file"
-      ;;
-  esac
-done
-
-# Copy files to intl/ subdirectory.
-if test -n "$intldir"; then
-  cd intl
-  for file in *; do
-    if test $file != COPYING.LIB-2.0 && test $file != COPYING.LIB-2.1; then
-      if test $file != plural.c; then
-        func_linkorcopy $file "$gettext_dir/intl/$file" intl/$file
-      else
-        # plural.c is a generated file; it must be copied and touched.
-        func_copy $file intl/$file
-        if $doit; then
-          (sleep 2; touch "$srcdir/intl/$file") &
-        fi
-      fi
-    fi
-  done
-  cd ..
-else
-  echo "Not copying intl/ directory."
-  # Tell the user what to put into configure.ac, if it is not already there.
-  if grep '^AM_GNU_GETTEXT([[]\?external[]]\?[ 	]*[,)]' "$srcdir/$configure_in" > /dev/null; then
-    :
-  else
-    please="$please
-Please use AM_GNU_GETTEXT([external]) in order to cause autoconfiguration
-to look for an external libintl.
-"
-  fi
-fi
-
-# Copy files to po/ subdirectory.
-cd po
-for podir in $podirs; do
-  $do_changelog && func_poChangeLog_init
-  for file in Makefile.in.in; do
-    same=no
-    if test -f "$srcdir/$podir/$file"; then
-      if cmp -s $file "$srcdir/$podir/$file"; then
-        same=yes
-      fi
-    else
-      added_acoutput="$added_acoutput $podir/Makefile.in"
-    fi
-    if $do_changelog && test $same = no; then
-      if test -f "$srcdir/$podir/$file"; then
-        func_poChangeLog_add_entry "	* $file: Upgrade to gettext-${version}."
-      else
-        func_poChangeLog_add_entry "	* $file: New file, from gettext-${version}."
-      fi
-    fi
-    func_backup "$podir/$file"
-    func_linkorcopy $file "$gettext_dir/po/$file" "$podir/$file"
-  done
-  for file in *; do
-    case $file in
-      Makefile.in.in)
-        # Already handled above.
-        ;;
-      Makevars.template)
-        func_linkorcopy Makevars.template "$gettext_dir/po/Makevars.template" "$podir/Makevars.template"
-        if test -f "$srcdir/po/Makevars"; then
-          LC_ALL=C sed -n -e 's/[ 	]*\([A-Za-z0-9_]*\)[ 	]*=.*/\1/p' < "$srcdir/$podir/Makevars" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp1"
-          LC_ALL=C sed -n -e 's/[ 	]*\([A-Za-z0-9_]*\)[ 	]*=.*/\1/p' < "$srcdir/$podir/Makevars.template" | LC_ALL=C sort > "$srcdir/$podir/Makevars.tmp2"
-          missingvars=`LC_ALL=C comm -13 "$srcdir/$podir/Makevars.tmp1" "$srcdir/$podir/Makevars.tmp2"`
-          rm -f "$srcdir/$podir/Makevars.tmp1" "$srcdir/$podir/Makevars.tmp2"
-          if test -n "$missingvars"; then
-            please="$please
-Please update $podir/Makevars so that it defines all the variables mentioned
-in $podir/Makevars.template.
-You can then remove $podir/Makevars.template.
-"
-          fi
-        else
-          please="$please
-Please create $podir/Makevars from the template in $podir/Makevars.template.
-You can then remove $podir/Makevars.template.
-"
-        fi
-        ;;
-      *)
-        same=no
-        if test -f "$srcdir/$podir/$file"; then
-          if cmp -s $file "$srcdir/$podir/$file"; then
-            same=yes
-          fi
-        fi
-        if $do_changelog && test $same = no; then
-          if test -f "$srcdir/$podir/$file"; then
-            func_poChangeLog_add_entry "	* $file: Upgrade to gettext-${version}."
-          else
-            func_poChangeLog_add_entry "	* $file: New file, from gettext-${version}."
-          fi
-        fi
-        func_backup "$podir/$file"
-        func_linkorcopy $file "$gettext_dir/po/$file" "$podir/$file"
-        ;;
-    esac
-  done
-  if test -f "$srcdir/$podir/cat-id-tbl.c"; then
-    func_remove "$podir/cat-id-tbl.c"
-    $do_changelog && func_poChangeLog_add_entry "	* cat-id-tbl.c: Remove file."
-  fi
-  if test -f "$srcdir/$podir/stamp-cat-id"; then
-    func_remove "$podir/stamp-cat-id"
-    $do_changelog && func_poChangeLog_add_entry "	* stamp-cat-id: Remove file."
-  fi
-  if test ! -f "$srcdir/$podir/POTFILES.in"; then
-    if $doit; then
-      echo "Creating initial $podir/POTFILES.in"
-      echo '# List of source files which contain translatable strings.' > "$srcdir/$podir/POTFILES.in"
-    else
-      echo "Create initial $podir/POTFILES.in"
-    fi
-    $do_changelog && func_poChangeLog_add_entry "	* POTFILES.in: New file."
-    please="$please
-Please fill $podir/POTFILES.in as described in the documentation.
-"
-  fi
-  $do_changelog && func_poChangeLog_finish
-done
-
-# Determine whether we can assume automake 1.9 or newer.
-have_automake19=
-if (aclocal --version) >/dev/null 2>/dev/null; then
-  aclocal_version=`aclocal --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'`
-  case $aclocal_version in
-    1.9* | 1.[1-9][0-9]* | [2-9]*) have_automake19=yes ;;
-  esac
-fi
-
-m4filelist='gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4
- po.m4 progtest.m4'
-# With aclocal versions < 1.9 we need all m4 files, otherwise "aclocal -I m4"
-# might give an error. (aclocal < 1.9 didn't know which macros are really
-# needed, it looked which macros are potentially needed.)
-min_automake_version=1.9
-if test -n "$intldir" || test -z "$have_automake19"; then
-  # Add intldir.m4, intl.m4 and its dependencies.
-  m4filelist=$m4filelist' codeset.m4 fcntl-o.m4 glibc2.m4 glibc21.m4 intdiv0.m4
-   intl.m4 intldir.m4 intlmacosx.m4 intmax.m4 inttypes_h.m4 inttypes-pri.m4
-   lcmessage.m4 lock.m4 longlong.m4 printf-posix.m4 size_max.m4 stdint_h.m4
-   threadlib.m4 uintmax_t.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4'
-  min_automake_version=1.8
-fi
-
-# All sorts of bugs could occur if the configure file was remade with the wrong
-# version of gettext.m4 et al. (because then the configure and the po/Makefile.in.in
-# don't fit together). It is therefore important that the package carries the
-# right versions of gettext.m4 et al. with it.
-if test -f "$srcdir/Makefile.am"; then
-  # A package using automake.
-
-  # Determine whether it's using automake 1.8 or newer.
-  have_automake18=
-  if (aclocal --version) >/dev/null 2>/dev/null; then
-    aclocal_version=`aclocal --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'`
-    case $aclocal_version in
-      1.[8-9]* | 1.[1-9][0-9]* | [2-9]*) have_automake18=yes ;;
-    esac
-  fi
-
-  # Extract the macro directory name from Makefile.am.
-  aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' "$srcdir/Makefile.am" | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
-  m4dir=m4
-  m4dir_defaulted=yes
-  m4dir_is_next=
-  for arg in $aclocal_amflags; do
-    if test -n "$m4dir_is_next"; then
-      # Ignore absolute directory pathnames, like /usr/local/share/aclocal.
-      case "$arg" in
-        /*) ;;
-        *)
-          m4dir="$arg"
-          m4dir_defaulted=
-          break
-          ;;
-      esac
-      m4dir_is_next=
-    else
-      if test "X$arg" = "X-I"; then
-        m4dir_is_next=yes
-      else
-        m4dir_is_next=
-      fi
-    fi
-  done
-
-  # Decide whether to use $m4dir/ChangeLog, or to use ChangeLog instead.
-  if test -d "$srcdir/$m4dir" && test -f "$srcdir/ChangeLog" && test ! -f "$srcdir/$m4dir/ChangeLog"; then
-    # The programmer has no $m4dir/ChangeLog so far. Don't introduce one.
-    using_m4ChangeLog=
-  fi
-
-  # Update the *.m4 files and the corresponding Makefile.am.
-  $do_changelog && func_m4ChangeLog_init
-  added_m4dir=
-  added_m4files=
-  if test -d "$srcdir/$m4dir"; then
-    :
-  else
-    if $doit; then
-      echo "Creating directory $m4dir"
-      mkdir "$srcdir/$m4dir"
-    else
-      echo "Create directory $m4dir"
-    fi
-    added_m4dir=yes
-  fi
-  for file in $m4filelist; do
-    same=no
-    if test -f "$srcdir/$m4dir/$file"; then
-      if cmp -s "${datarootdir}/aclocal/$file" "$srcdir/$m4dir/$file"; then
-        same=yes
-      fi
-    else
-      added_m4files="$added_m4files $file"
-    fi
-    if $do_changelog && test $same = no; then
-      if test -f "$srcdir/$m4dir/$file"; then
-        func_m4ChangeLog_add_entry "	* $file: Upgrade to gettext-${version}."
-      else
-        func_m4ChangeLog_add_entry "	* $file: New file, from gettext-${version}."
-      fi
-    fi
-    func_backup "$m4dir/$file"
-    func_linkorcopy "${datarootdir}/aclocal/$file" "${datarootdir}/aclocal/$file" "$m4dir/$file"
-  done
-  missing_m4Makefileam=
-  if test -n "$added_m4files"; then
-    if test -f "$srcdir/$m4dir/Makefile.am"; then
-      if $doit; then
-        echo "Updating EXTRA_DIST in $m4dir/Makefile.am (backup is in $m4dir/Makefile.am~)"
-        func_backup "$m4dir/Makefile.am"
-        rm -f "$srcdir/$m4dir/Makefile.am"
-        if grep '^EXTRA_DIST[ 	]*=' "$srcdir/$m4dir/Makefile.am~" > /dev/null; then
-          sed -e "s%^\(EXTRA_DIST[ 	]*=\) \\?%\\1$added_m4files %" < "$srcdir/$m4dir/Makefile.am~" > "$srcdir/$m4dir/Makefile.am"
-          $do_changelog && func_m4ChangeLog_add_entry "	* Makefile.am (EXTRA_DIST): Add the new files."
-        else
-          (cat "$srcdir/$m4dir/Makefile.am~"; echo; echo "EXTRA_DIST =$added_m4files") > "$srcdir/$m4dir/Makefile.am"
-          $do_changelog && func_m4ChangeLog_add_entry "	* Makefile.am (EXTRA_DIST): New variable."
-        fi
-      else
-        echo "Update EXTRA_DIST in $m4dir/Makefile.am"
-        $do_changelog && func_m4ChangeLog_add_entry "	* Makefile.am (EXTRA_DIST)."
-      fi
-    else
-      # $m4dir/Makefile.am is not needed any more when aclocal 1.8 or newer
-      # is used.
-      if test -z "$have_automake18"; then
-        if $doit; then
-          echo "Creating $m4dir/Makefile.am"
-          echo "EXTRA_DIST =$added_m4files" > "$srcdir/$m4dir/Makefile.am"
-        else
-          echo "Create $m4dir/Makefile.am"
-        fi
-        $do_changelog && func_m4ChangeLog_add_entry "	* Makefile.am: New file."
-        added_acoutput="$added_acoutput $m4dir/Makefile"
-      else
-        missing_m4Makefileam=yes
-      fi
-    fi
-  fi
-  if test -n "$added_m4dir" && test -z "$missing_m4Makefileam"; then
-    added_directories="$added_directories $m4dir"
-  fi
-  $do_changelog && func_m4ChangeLog_finish
-  # automake will arrange for $m4dir/ChangeLog to be distributed if a
-  # $m4dir/Makefile.am exists. If not, we need to add it to Makefile.am's
-  # EXTRA_DIST explicitly.
-  if test -n "$created_m4ChangeLog" && test -n "$missing_m4Makefileam"; then
-    added_extradist="$added_extradist $m4dir/ChangeLog"
-  fi
-
-  # Update the top-level Makefile.am.
-  modified_Makefile_am=
-  # func_modify_Makefile_am changelog_comment
-  # assumes a modified copy of $srcdir/Makefile.am in $srcdir/Makefile.am.tmp
-  # and replaces the original Makefile.am file with the modified one if
-  # the two files differ. Then it removes the modified copy.
-  func_modify_Makefile_am ()
-  {
-    if cmp -s "$srcdir/Makefile.am" "$srcdir/Makefile.am.tmp"; then
-      :
-    else
-      if test -z "$modified_Makefile_am"; then
-        if $doit; then
-          echo "Updating Makefile.am (backup is in Makefile.am~)"
-          func_backup Makefile.am
-        else
-          echo "Update Makefile.am"
-        fi
-      fi
-      if $doit; then
-        rm -f "$srcdir/Makefile.am"
-        cp "$srcdir/Makefile.am.tmp" "$srcdir/Makefile.am"
-      fi
-      if $do_changelog; then
-        if test -z "$modified_Makefile_am"; then
-          func_ChangeLog_add_entry "	* Makefile.am $1"
-        else
-          func_ChangeLog_add_entry "	$1"
-        fi
-      fi
-      modified_Makefile_am=yes
-    fi
-    rm -f "$srcdir/Makefile.am.tmp"
-  }
-
-  if test -n "$added_directories"; then
-    if grep '^SUBDIRS[ 	]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(SUBDIRS[ 	]*=\) \\?%\\1$added_directories %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-      added_directories_pretty=`echo $added_directories | sed -e 's/ /, /g'`
-      func_modify_Makefile_am "(SUBDIRS): Add $added_directories_pretty."
-    else
-      (cat "$srcdir/Makefile.am"; echo; echo "SUBDIRS =$added_directories") > "$srcdir/Makefile.am.tmp"
-      func_modify_Makefile_am "(SUBDIRS): New variable."
-    fi
-  fi
-  if test -n "$removed_directory"; then
-    sed -e '/^SUBDIRS[ 	]*=/ {
-        :a
-        s%\([ 	]\)'"$removed_directory"'[ 	]%\1%
-        s%[ 	]'"$removed_directory"'$%%
-        tb
-        :b
-        s%\\$%\\%
-        tc
-        bd
-        :c
-        n
-        ba
-      :d
-    }' < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-    func_modify_Makefile_am "(SUBDIRS): Remove $removed_directory."
-  fi
-  if test -n "$added_directories"; then
-    if grep '^DIST_SUBDIRS[ 	]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(DIST_SUBDIRS[ 	]*=\) \\?%\\1$added_directories %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-      added_directories_pretty=`echo $added_directories | sed -e 's/ /, /g'`
-      func_modify_Makefile_am "(DIST_SUBDIRS): Add $added_directories_pretty."
-    fi
-  fi
-  if test -n "$removed_directory"; then
-    sed -e '/^DIST_SUBDIRS[ 	]*=/ {
-        :a
-        s%\([ 	]\)'"$removed_directory"'[ 	]%\1%
-        s%[ 	]'"$removed_directory"'$%%
-        tb
-        :b
-        s%\\$%\\%
-        tc
-        bd
-        :c
-        n
-        ba
-      :d
-    }' < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-    func_modify_Makefile_am "(DIST_SUBDIRS): Remove $removed_directory."
-  fi
-  if test -n "$m4dir_defaulted"; then
-    if grep '^ACLOCAL_AMFLAGS[ 	]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(ACLOCAL_AMFLAGS[ 	]*=\) \\?%\\1 -I $m4dir %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-      func_modify_Makefile_am "(ACLOCAL_AMFLAGS): Add -I $m4dir."
-    else
-      (cat "$srcdir/Makefile.am"; echo; echo "ACLOCAL_AMFLAGS = -I $m4dir") > "$srcdir/Makefile.am.tmp"
-      func_modify_Makefile_am "(ACLOCAL_AMFLAGS): New variable."
-    fi
-    # Also update Makefile.in and, if existent, Makefile. Otherwise they
-    # would take into account the new flags only after a few rounds of
-    # "./configure", "make", "touch configure.in", "make distclean".
-    if $doit; then
-      for file in Makefile.in Makefile; do
-        if test -f "$srcdir/$file"; then
-          func_backup $file
-          rm -f "$srcdir/$file"
-          sed -e "s%(ACLOCAL)%(ACLOCAL) -I $m4dir%" < "$srcdir/$file~" > "$srcdir/$file"
-        fi
-      done
-    fi
-  fi
-  if test -n "$added_extradist"; then
-    if grep '^EXTRA_DIST[ 	]*=' "$srcdir/Makefile.am" > /dev/null; then
-      sed -e "s%^\(EXTRA_DIST[ 	]*=\)%\\1$added_extradist %" < "$srcdir/Makefile.am" > "$srcdir/Makefile.am.tmp"
-      added_extradist_pretty=`echo $added_extradist | sed -e 's/ /, /g'`
-      func_modify_Makefile_am "(EXTRA_DIST): Add $added_extradist_pretty."
-    else
-      (cat "$srcdir/Makefile.am"; echo; echo "EXTRA_DIST =$added_extradist") > "$srcdir/Makefile.am.tmp"
-      func_modify_Makefile_am "(EXTRA_DIST): New variable."
-    fi
-  fi
-  # Extract the aclocal options name from Makefile.am.
-  aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ 	]*=' "$srcdir/Makefile.am" | sed -e 's/^ACLOCAL_AMFLAGS[ 	]*=\(.*\)$/\1/'`
-  aclocal_options=
-  m4dir_is_next=
-  for arg in $aclocal_amflags; do
-    if test -n "$m4dir_is_next"; then
-      aclocal_options="$aclocal_options -I $arg"
-      m4dir_is_next=
-    else
-      if test "X$arg" = "X-I"; then
-        m4dir_is_next=yes
-      else
-        m4dir_is_next=
-      fi
-    fi
-  done
-  please="$please
-Please run 'aclocal$aclocal_options' to regenerate the aclocal.m4 file.
-You need aclocal from GNU automake $min_automake_version (or newer) to do this.
-Then run 'autoconf' to regenerate the configure file.
-"
-
-  # Also create $m4dir/Makefile.in from $m4dir/Makefile.am, because automake
-  # doesn't do it by itself.
-  if $doit; then
-    case "$added_acoutput" in
-      *" $m4dir/Makefile")
-        (cd "$srcdir" && automake "$m4dir/Makefile") 2>/dev/null ||
-        please="$please
-Please run 'automake $m4dir/Makefile' to create $m4dir/Makefile.in
-"
-        ;;
-    esac
-  fi
-else
-  please="$please
-Please add the files
-$m4filelist
-from the ${datarootdir}/aclocal directory to your aclocal.m4 file.
-"
-fi
-
-modified_configure_in=
-# func_modify_configure_in changelog_comment
-# assumes a modified copy of $srcdir/$configure_in in $srcdir/$configure_in.tmp
-# and replaces the original configure.in/ac file with the modified one if
-# the two files differ. Then it removes the modified copy.
-func_modify_configure_in ()
-{
-  if cmp -s "$srcdir/$configure_in" "$srcdir/$configure_in.tmp"; then
-    :
-  else
-    if test -z "$modified_configure_in"; then
-      if $doit; then
-        echo "Updating $configure_in (backup is in $configure_in~)"
-        func_backup $configure_in
-      else
-        echo "Update $configure_in"
-      fi
-    fi
-    if $doit; then
-      rm -f "$srcdir/$configure_in"
-      cp "$srcdir/$configure_in.tmp" "$srcdir/$configure_in"
-    fi
-    if $do_changelog; then
-      if test -z "$modified_configure_in"; then
-        func_ChangeLog_add_entry "	* $configure_in $1"
-      else
-        func_ChangeLog_add_entry "	$1"
-      fi
-    fi
-    modified_configure_in=yes
-  fi
-  rm -f "$srcdir/$configure_in.tmp"
-}
-
-if test -n "$added_acoutput"; then
-  if grep '^AC_CONFIG_FILES(' "$srcdir/$configure_in" > /dev/null; then
-    sedprog='
-ta
-b
-:a
-n
-ba'
-    sed -e "s%^\\(AC_CONFIG_FILES([^])\\,]*\\)%\\1$added_acoutput%$sedprog" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-    added_acoutput_pretty=`echo $added_acoutput | sed -e 's/ /, /g'`
-    func_modify_configure_in "(AC_CONFIG_FILES): Add $added_acoutput_pretty."
-  else
-    if grep '^AC_OUTPUT(' "$srcdir/$configure_in" > /dev/null; then
-      sed -e "s%^\\(AC_OUTPUT([^])\\,]*\\)%\\1$added_acoutput%" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-      added_acoutput_pretty=`echo $added_acoutput | sed -e 's/ /, /g'`
-      func_modify_configure_in "(AC_OUTPUT): Add $added_acoutput_pretty."
-    else
-      please="$please
-Please add$added_acoutput to the AC_OUTPUT or AC_CONFIG_FILES invocation in the $configure_in file.
-"
-    fi
-  fi
-fi
-if test -n "$removed_acoutput"; then
-  for file in $removed_acoutput; do
-    tag=
-    sedprog='{
-      s%\([[ 	]\)'"$file"'[ 	]%\1%
-      s%\([[ 	]\)'"$file"'\([]),]\)%\1\2%
-      s%[[ 	]'"$file"'$%%
-        :a
-        tb
-        :b
-        s%\\$%\\%
-        tc
-        bd
-        :c
-        n
-        s%\([ 	]\)'"$file"'[ 	]%\1%
-        s%\([ 	]\)'"$file"'\([]),]\)%\1\2%
-        s%[ 	]'"$file"'$%%
-        ba
-      :d
-    }'
-    sed -e '/^AC_CONFIG_FILES(/'"$sedprog" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-    if cmp -s "$srcdir/$configure_in" "$srcdir/$configure_in.tmp"; then
-      sed -e '/^AC_OUTPUT(/'"$sedprog" < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-      if cmp -s "$srcdir/$configure_in" "$srcdir/$configure_in.tmp"; then
-        :
-      else
-        tag=AC_OUTPUT
-      fi
-    else
-      tag=AC_CONFIG_FILES
-    fi
-    if test -n "$tag"; then
-      func_modify_configure_in "($tag): Remove $file."
-    else
-      rm -f "$srcdir/$configure_in.tmp"
-      if test "$file" != intl/intlh.inst; then
-        please="$please
-Please remove $file from the AC_OUTPUT or AC_CONFIG_FILES invocation
-in the $configure_in file.
-"
-      fi
-    fi
-  done
-fi
-sed -e 's%sed -e "/POTFILES =/r po/POTFILES" po/Makefile\.in > po/Makefile *;* *%%' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-func_modify_configure_in "(AC_OUTPUT): Remove command that created po/Makefile."
-sed -e '/^\(dnl \|\)AC_LINK_FILES(\$nls_cv_header_libgt, \$nls_cv_header_intl)$/d' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-func_modify_configure_in "(AC_LINK_FILES): Remove invocation."
-sed -e 's/^AM_GNU_GETTEXT_VERSION([^()]*)/AM_GNU_GETTEXT_VERSION(['"$version"'])/' < "$srcdir/$configure_in" > "$srcdir/$configure_in.tmp"
-func_modify_configure_in "(AM_GNU_GETTEXT_VERSION): Bump to $version."
-$do_changelog && func_ChangeLog_finish
-
-# Recommend replacement for deprecated Makefile variables.
-use_libtool=`cat "$srcdir/$configure_in" | grep '^A[CM]_PROG_LIBTOOL'`
-for file in `(cd "$srcdir"; find . -name Makefile.am -print; find . -name Makefile.in -print) | sed -e 's,^\./,,'`; do
-  if test -f "$srcdir/$file"; then
-    if test `echo "$file" | sed -e 's,^.*/,,'` = Makefile.in && grep automake "$srcdir/$file" >/dev/null 2>&1; then
-      continue;
-    fi
-    # INTLLIBS is deprecated because it doesn't distinguish the two
-    # cases: with libtool, without libtool.
-    if grep '@''INTLLIBS''@' "$srcdir/$file" >/dev/null 2>&1; then
-      if test -n "$use_libtool"; then
-        please="$please
-Please change $file to use @""LTLIBINTL""@ or @""LIBINTL""@ instead of
-@""INTLLIBS""@. Which one, depends whether it is used with libtool or not.
-@""INTLLIBS""@ will go away.
-"
-      else
-        please="$please
-Please change $file to use @""LIBINTL""@ instead of @""INTLLIBS""@.
-@""INTLLIBS""@ will go away.
-"
-      fi
-    fi
-    # DATADIRNAME is deprecated because we install only .gmo files nowadays,
-    # which can be stored in the platform independent $prefix/share hierarchy.
-    if grep '@''DATADIRNAME''@' "$srcdir/$file" >/dev/null 2>&1; then
-      please="$please
-Please change $file to use the constant string \"share\" instead of
-@""DATADIRNAME""@. @""DATADIRNAME""@ will go away.
-"
-    fi
-    # INSTOBJEXT is deprecated because we install only .gmo files nowadays,
-    # no catgets .cat catalogs.
-    if grep '@''INSTOBJEXT''@' "$srcdir/$file" >/dev/null 2>&1; then
-      please="$please
-Please change $file to use the constant string \".mo\" instead of
-@""INSTOBJEXT""@. @""INSTOBJEXT""@ will go away.
-"
-    fi
-    # GENCAT is deprecated because we install no catgets catalogs anymore.
-    if grep '@''GENCAT''@' "$srcdir/$file" >/dev/null 2>&1; then
-      please="$please
-Please change $file to use the constant string \"gencat\" instead of
-@""GENCAT""@. @""GENCAT""@ will go away. Maybe you don't even need it any more?
-"
-    fi
-    # POSUB is deprecated because it causes "./configure --disable-nls", "make",
-    # "make dist" to create a buggy tarfile.
-    if grep '@''POSUB''@' "$srcdir/$file" >/dev/null 2>&1; then
-      please="$please
-Please change $file to use the constant string \"po\" instead of
-@""POSUB""@. @""POSUB""@ will go away.
-"
-    fi
-  fi
-done
-
-# Recommend replacement for deprecated configure variables.
-if grep '\$nls_cv_header_' "$srcdir/$configure_in" >/dev/null 2>&1; then
-  please="$please
-Please stop using \$nls_cv_header_intl or \$nls_cv_header_libgt in the
-$configure_in file. Both will go away. Use <libintl.h> or \"gettext.h\" instead.
-"
-fi
-
-# Recommend fetching config.guess and config.sub.
-if test -f "$srcdir/$auxdir"config.guess && test -f "$srcdir/$auxdir"config.sub; then
-  :
-else
-  please="$please
-You will also need config.guess and config.sub, which you can get from the CVS
-of the 'config' project at http://savannah.gnu.org/. The commands to fetch them
-are
-\$ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess'
-\$ wget 'http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub'
-"
-fi
-
-if $doit; then
-  echo "$please"
-  echo "You might also want to copy the convenience header file gettext.h"
-  echo "from the $gettext_dir directory into your package."
-  echo "It is a wrapper around <libintl.h> that implements the configure --disable-nls"
-  echo "option."
-  echo
-  count=`echo "$please" | grep '^$' | wc -l`
-  count=`echo "$count" | sed -e 's/[ 	]//g'`
-  case "$count" in
-    1) count="paragraph";;
-    2) count="two paragraphs";;
-    3) count="three paragraphs";;
-    4) count="four paragraphs";;
-    5) count="five paragraphs";;
-    *) count="$count paragraphs";;
-  esac
-  echo "Press Return to acknowledge the previous $count."
-  # Read from /dev/tty, not stdin, so that gettextize cannot be abused by
-  # non-interactive tools.
-  read dummy < /dev/tty
-fi
-
-exit 0
diff --git a/libs/gettext/bin64/msgattrib.exe b/libs/gettext/bin64/msgattrib.exe
deleted file mode 100644
index cc904e272..000000000
Binary files a/libs/gettext/bin64/msgattrib.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgcat.exe b/libs/gettext/bin64/msgcat.exe
deleted file mode 100644
index 3af8a496d..000000000
Binary files a/libs/gettext/bin64/msgcat.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgcmp.exe b/libs/gettext/bin64/msgcmp.exe
deleted file mode 100644
index 27e6c6f62..000000000
Binary files a/libs/gettext/bin64/msgcmp.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgcomm.exe b/libs/gettext/bin64/msgcomm.exe
deleted file mode 100644
index 5d39de446..000000000
Binary files a/libs/gettext/bin64/msgcomm.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgconv.exe b/libs/gettext/bin64/msgconv.exe
deleted file mode 100644
index d454ac15f..000000000
Binary files a/libs/gettext/bin64/msgconv.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgen.exe b/libs/gettext/bin64/msgen.exe
deleted file mode 100644
index bd9438b36..000000000
Binary files a/libs/gettext/bin64/msgen.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgexec.exe b/libs/gettext/bin64/msgexec.exe
deleted file mode 100644
index dd988641e..000000000
Binary files a/libs/gettext/bin64/msgexec.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgfilter.exe b/libs/gettext/bin64/msgfilter.exe
deleted file mode 100644
index 1c07caf3c..000000000
Binary files a/libs/gettext/bin64/msgfilter.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgfmt.exe b/libs/gettext/bin64/msgfmt.exe
deleted file mode 100644
index 1907713a5..000000000
Binary files a/libs/gettext/bin64/msgfmt.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msggrep.exe b/libs/gettext/bin64/msggrep.exe
deleted file mode 100644
index 4cc3cbf0f..000000000
Binary files a/libs/gettext/bin64/msggrep.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msginit.exe b/libs/gettext/bin64/msginit.exe
deleted file mode 100644
index 67ac3e2d3..000000000
Binary files a/libs/gettext/bin64/msginit.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgmerge.exe b/libs/gettext/bin64/msgmerge.exe
deleted file mode 100644
index 1104a71f9..000000000
Binary files a/libs/gettext/bin64/msgmerge.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msgunfmt.exe b/libs/gettext/bin64/msgunfmt.exe
deleted file mode 100644
index a0b6f5c3f..000000000
Binary files a/libs/gettext/bin64/msgunfmt.exe and /dev/null differ
diff --git a/libs/gettext/bin64/msguniq.exe b/libs/gettext/bin64/msguniq.exe
deleted file mode 100644
index 875d1362d..000000000
Binary files a/libs/gettext/bin64/msguniq.exe and /dev/null differ
diff --git a/libs/gettext/bin64/ngettext.exe b/libs/gettext/bin64/ngettext.exe
deleted file mode 100644
index 674204be3..000000000
Binary files a/libs/gettext/bin64/ngettext.exe and /dev/null differ
diff --git a/libs/gettext/bin64/recode-sr-latin.exe b/libs/gettext/bin64/recode-sr-latin.exe
deleted file mode 100644
index bdc3f8bbd..000000000
Binary files a/libs/gettext/bin64/recode-sr-latin.exe and /dev/null differ
diff --git a/libs/gettext/bin64/xgettext.exe b/libs/gettext/bin64/xgettext.exe
deleted file mode 100644
index f43f64239..000000000
Binary files a/libs/gettext/bin64/xgettext.exe and /dev/null differ
diff --git a/libs/gettext/gettext-0.18.1.1-tml.patch b/libs/gettext/gettext-0.18.1.1-tml.patch
deleted file mode 100644
index 55e295fe0..000000000
--- a/libs/gettext/gettext-0.18.1.1-tml.patch
+++ /dev/null
@@ -1,177 +0,0 @@
---- gettext-runtime/intl/printf.c
-+++ gettext-runtime/intl/printf.c
-@@ -69,7 +69,7 @@
- #define STATIC static
- 
- /* This needs to be consistent with libgnuintl.h.in.  */
--#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
-+#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__
- /* Don't break __attribute__((format(printf,M,N))).
-    This redefinition is only possible because the libc in NetBSD, Cygwin,
-    mingw does not have a function __printf__.  */
---- gettext-runtime/intl/libgnuintl.h.in
-+++ gettext-runtime/intl/libgnuintl.h.in
-@@ -330,7 +330,7 @@
- 
- #if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
- #undef printf
--#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
-+#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__
- /* Don't break __attribute__((format(printf,M,N))).
-    This redefinition is only possible because the libc in NetBSD, Cygwin,
-    mingw does not have a function __printf__.
----- gettext-tools/gnulib-lib/clean-temp.c
-+++ gettext-tools/gnulib-lib/clean-temp.c
-@@ -66,9 +66,11 @@
- # endif
- #endif
- 
-+#ifndef _WIN64
- #ifndef uintptr_t
- # define uintptr_t unsigned long
- #endif
-+#endif
- 
- #if !GNULIB_FCNTL_SAFER
- /* The results of open() in this file are not used with fchdir,
---- gettext-tools/gnulib-lib/fstrcmp.c
-+++ gettext-tools/gnulib-lib/fstrcmp.c
-@@ -55,9 +55,11 @@
- #include "minmax.h"
- #include "xalloc.h"
- 
-+#ifndef _WIN64
- #ifndef uintptr_t
- # define uintptr_t unsigned long
- #endif
-+#endif
- 
- 
- #define ELEMENT char
---- gettext-tools/gnulib-lib/gl_array_list.c
-+++ gettext-tools/gnulib-lib/gl_array_list.c
-@@ -55,9 +55,11 @@
- /* Checked size_t computations.  */
- #include "xsize.h"
- 
-+#ifndef _WIN64
- #ifndef uintptr_t
- # define uintptr_t unsigned long
- #endif
-+#endif
- 
- /* -------------------------- gl_list_t Data Type -------------------------- */
- 
---- gettext-tools/gnulib-lib/gl_linkedhash_list.c
-+++ gettext-tools/gnulib-lib/gl_linkedhash_list.c
-@@ -55,9 +55,11 @@
- 
- #include "xsize.h"
- 
-+#ifndef _WIN64
- #ifndef uintptr_t
- # define uintptr_t unsigned long
- #endif
-+#endif
- 
- #define WITH_HASHTABLE 1
- 
---- gettext-tools/gnulib-lib/stdio.in.h
-+++ gettext-tools/gnulib-lib/stdio.in.h
-@@ -642,10 +642,6 @@
- # if (@GNULIB_PRINTF_POSIX@ && @REPLACE_PRINTF@) \
-      || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && @GNULIB_STDIO_H_SIGPIPE@)
- #  if defined __GNUC__
--#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--/* Don't break __attribute__((format(printf,M,N))).  */
--#    define printf __printf__
--#   endif
- _GL_FUNCDECL_RPL_1 (__printf__, int,
-                     (const char *format, ...)
-                     __asm__ (@ASM_SYMBOL_PREFIX@
---- gettext-tools/gnulib-lib/tempname.c
-+++ gettext-tools/gnulib-lib/tempname.c
-@@ -54,6 +54,10 @@
- #include <stdint.h>
- #include <unistd.h>
- 
-+#ifdef _WIN32
-+# include <direct.h>
-+#endif
-+
- #include <sys/stat.h>
- 
- #if _LIBC
-@@ -73,6 +73,10 @@
- # define __xstat64(version, file, buf) stat (file, buf)
- #endif
- 
-+#ifdef _WIN32
-+# define mkdir(path,mode) _mkdir(path)
-+#endif
-+
- #if ! (HAVE___SECURE_GETENV || _LIBC)
- # define __secure_getenv getenv
- #endif
---- gettext-tools/src/write-java.c
-+++ gettext-tools/src/write-java.c
-@@ -30,6 +30,10 @@
- #include <stdio.h>
- #include <string.h>
- 
-+#ifdef _WIN32
-+# include <direct.h>
-+#endif
-+
- #include <sys/stat.h>
- #if !defined S_ISDIR && defined S_IFDIR
- # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
-@@ -53,6 +53,10 @@
- # define S_IXUSR 00100
- #endif
- 
-+#ifdef _WIN32
-+# define mkdir(path,mode) _mkdir(path)
-+#endif
-+
- #include "c-ctype.h"
- #include "error.h"
- #include "xerror.h"
---- gettext-tools/src/write-csharp.c
-+++ gettext-tools/src/write-csharp.c
-@@ -29,6 +29,10 @@
- #include <stdio.h>
- #include <string.h>
- 
-+#ifdef _WIN32
-+# include <direct.h>
-+#endif
-+
- #include <sys/stat.h>
- #if !defined S_ISDIR && defined S_IFDIR
- # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
-@@ -70,6 +70,10 @@
- # define S_IXOTH (S_IXUSR >> 6)
- #endif
- 
-+#ifdef _WIN32
-+# define mkdir(path,mode) _mkdir(path)
-+#endif
-+
- #include "c-ctype.h"
- #include "relocatable.h"
- #include "error.h"
---- gettext-tools/woe32dll/export.h
-+++ gettext-tools/woe32dll/export.h
-@@ -90,7 +90,11 @@
-    --export-all-symbols is used.  */
- 
-  /* IMP(x) is a symbol that contains the address of x.  */
-+#ifdef _WIN64
-+#define IMP(x) __imp_##x
-+#else
- #define IMP(x) _imp__##x
-+#endif
- 
-  /* Ensure that the variable x is exported from the library, and that a
-     pseudo-variable IMP(x) is available.  */
diff --git a/libs/gettext/include32/autosprintf.h b/libs/gettext/include32/autosprintf.h
deleted file mode 100644
index f447391b0..000000000
--- a/libs/gettext/include32/autosprintf.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Class autosprintf - formatted output to an ostream.
-   Copyright (C) 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-#ifndef _AUTOSPRINTF_H
-#define _AUTOSPRINTF_H
-
-#ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
-#  define __attribute__(Spec) /* empty */
-# endif
-/* The __-protected variants of `format' and `printf' attributes
-   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
-# endif
-#endif
-
-#include <string>
-#include <iostream>
-
-namespace gnu
-{
-  /* A temporary object, usually allocated on the stack, representing
-     the result of an asprintf() call.  */
-  class autosprintf
-  {
-  public:
-    /* Constructor: takes a format string and the printf arguments.  */
-    autosprintf (const char *format, ...)
-                __attribute__ ((__format__ (__printf__, 2, 3)));
-    /* Copy constructor.  */
-    autosprintf (const autosprintf& src);
-    /* Destructor: frees the temporarily allocated string.  */
-    ~autosprintf ();
-    /* Conversion to string.  */
-    operator char * () const;
-    operator std::string () const;
-    /* Output to an ostream.  */
-    friend inline std::ostream& operator<< (std::ostream& stream, const autosprintf& tmp)
-    {
-      stream << (tmp.str ? tmp.str : "(error in autosprintf)");
-      return stream;
-    }
-  private:
-    char *str;
-  };
-}
-
-#endif /* _AUTOSPRINTF_H */
diff --git a/libs/gettext/include32/gettext-po.h b/libs/gettext/include32/gettext-po.h
deleted file mode 100644
index 091ad86fa..000000000
--- a/libs/gettext/include32/gettext-po.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/* Public API for GNU gettext PO files - contained in libgettextpo.
-   Copyright (C) 2003-2008, 2010 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-   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 3 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.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GETTEXT_PO_H
-#define _GETTEXT_PO_H 1
-
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* =========================== Meta Information ============================ */
-
-/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBGETTEXTPO_VERSION 0x001201
-extern __declspec (dllimport) int libgettextpo_version;
-
-/* ================================= Types ================================= */
-
-/* A po_file_t represents the contents of a PO file.  */
-typedef struct po_file *po_file_t;
-
-/* A po_message_iterator_t represents an iterator through a domain of a
-   PO file.  */
-typedef struct po_message_iterator *po_message_iterator_t;
-
-/* A po_message_t represents a message in a PO file.  */
-typedef struct po_message *po_message_t;
-
-/* A po_filepos_t represents a string's position within a source file.  */
-typedef struct po_filepos *po_filepos_t;
-
-/* A po_error_handler handles error situations.  */
-struct po_error_handler
-{
-  /* Signal an error.  The error message is built from FORMAT and the following
-     arguments.  ERRNUM, if nonzero, is an errno value.
-     Must increment the error_message_count variable declared in error.h.
-     Must not return if STATUS is nonzero.  */
-  void (*error) (int status, int errnum,
-                 const char *format, ...)
-#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
-  __attribute__ ((__format__ (__printf__, 3, 4)))
-#endif
-  ;
-
-  /* Signal an error.  The error message is built from FORMAT and the following
-     arguments.  The error location is at FILENAME line LINENO. ERRNUM, if
-     nonzero, is an errno value.
-     Must increment the error_message_count variable declared in error.h.
-     Must not return if STATUS is nonzero.  */
-  void (*error_at_line) (int status, int errnum,
-                         const char *filename, unsigned int lineno,
-                         const char *format, ...)
-#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
-  __attribute__ ((__format__ (__printf__, 5, 6)))
-#endif
-  ;
-
-  /* Signal a multiline warning.  The PREFIX applies to all lines of the
-     MESSAGE.  Free the PREFIX and MESSAGE when done.  */
-  void (*multiline_warning) (char *prefix, char *message);
-
-  /* Signal a multiline error.  The PREFIX applies to all lines of the
-     MESSAGE.  Free the PREFIX and MESSAGE when done.
-     Must increment the error_message_count variable declared in error.h if
-     PREFIX is non-NULL.  */
-  void (*multiline_error) (char *prefix, char *message);
-};
-typedef const struct po_error_handler *po_error_handler_t;
-
-/* A po_xerror_handler handles warnings, error and fatal error situations.  */
-#define PO_SEVERITY_WARNING     0 /* just a warning, tell the user */
-#define PO_SEVERITY_ERROR       1 /* an error, the operation cannot complete */
-#define PO_SEVERITY_FATAL_ERROR 2 /* an error, the operation must be aborted */
-struct po_xerror_handler
-{
-  /* Signal a problem of the given severity.
-     MESSAGE and/or FILENAME + LINENO indicate where the problem occurred.
-     If FILENAME is NULL, FILENAME and LINENO and COLUMN should be ignored.
-     If LINENO is (size_t)(-1), LINENO and COLUMN should be ignored.
-     If COLUMN is (size_t)(-1), it should be ignored.
-     MESSAGE_TEXT is the problem description (if MULTILINE_P is true,
-     multiple lines of text, each terminated with a newline, otherwise
-     usually a single line).
-     Must not return if SEVERITY is PO_SEVERITY_FATAL_ERROR.  */
-  void (*xerror) (int severity,
-                  po_message_t message,
-                  const char *filename, size_t lineno, size_t column,
-                  int multiline_p, const char *message_text);
-  /* Signal a problem that refers to two messages.
-     Similar to two calls to xerror.
-     If possible, a "..." can be appended to MESSAGE_TEXT1 and prepended to
-     MESSAGE_TEXT2.  */
-  void (*xerror2) (int severity,
-                   po_message_t message1,
-                   const char *filename1, size_t lineno1, size_t column1,
-                   int multiline_p1, const char *message_text1,
-                   po_message_t message2,
-                   const char *filename2, size_t lineno2, size_t column2,
-                   int multiline_p2, const char *message_text2);
-};
-typedef const struct po_xerror_handler *po_xerror_handler_t;
-
-/* Memory allocation:
-   The memory allocations performed by these functions use xmalloc(),
-   therefore will cause a program exit if memory is exhausted.
-   The memory allocated by po_file_read, and implicitly returned through
-   the po_message_* functions, lasts until freed with po_file_free.  */
-
-
-/* ============================= po_file_t API ============================= */
-
-/* Create an empty PO file representation in memory.  */
-extern po_file_t po_file_create (void);
-
-/* Read a PO file into memory.
-   Return its contents.  Upon failure, return NULL and set errno.  */
-#define po_file_read po_file_read_v3
-extern po_file_t po_file_read (const char *filename,
-                               po_xerror_handler_t handler);
-
-/* Write an in-memory PO file to a file.
-   Upon failure, return NULL and set errno.  */
-#define po_file_write po_file_write_v2
-extern po_file_t po_file_write (po_file_t file, const char *filename,
-                                po_xerror_handler_t handler);
-
-/* Free a PO file from memory.  */
-extern void po_file_free (po_file_t file);
-
-/* Return the names of the domains covered by a PO file in memory.  */
-extern const char * const * po_file_domains (po_file_t file);
-
-
-/* =========================== Header entry API ============================ */
-
-/* Return the header entry of a domain of a PO file in memory.
-   The domain NULL denotes the default domain.
-   Return NULL if there is no header entry.  */
-extern const char * po_file_domain_header (po_file_t file, const char *domain);
-
-/* Return the value of a field in a header entry.
-   The return value is either a freshly allocated string, to be freed by the
-   caller, or NULL.  */
-extern char * po_header_field (const char *header, const char *field);
-
-/* Return the header entry with a given field set to a given value.  The field
-   is added if necessary.
-   The return value is a freshly allocated string.  */
-extern char * po_header_set_field (const char *header, const char *field, const char *value);
-
-
-/* ======================= po_message_iterator_t API ======================= */
-
-/* Create an iterator for traversing a domain of a PO file in memory.
-   The domain NULL denotes the default domain.  */
-extern po_message_iterator_t po_message_iterator (po_file_t file, const char *domain);
-
-/* Free an iterator.  */
-extern void po_message_iterator_free (po_message_iterator_t iterator);
-
-/* Return the next message, and advance the iterator.
-   Return NULL at the end of the message list.  */
-extern po_message_t po_next_message (po_message_iterator_t iterator);
-
-/* Insert a message in a PO file in memory, in the domain and at the position
-   indicated by the iterator.  The iterator thereby advances past the freshly
-   inserted message.  */
-extern void po_message_insert (po_message_iterator_t iterator, po_message_t message);
-
-
-/* =========================== po_message_t API ============================ */
-
-/* Return a freshly constructed message.
-   To finish initializing the message, you must set the msgid and msgstr.  */
-extern po_message_t po_message_create (void);
-
-/* Return the context of a message, or NULL for a message not restricted to a
-   context.  */
-extern const char * po_message_msgctxt (po_message_t message);
-
-/* Change the context of a message. NULL means a message not restricted to a
-   context.  */
-extern void po_message_set_msgctxt (po_message_t message, const char *msgctxt);
-
-/* Return the msgid (untranslated English string) of a message.  */
-extern const char * po_message_msgid (po_message_t message);
-
-/* Change the msgid (untranslated English string) of a message.  */
-extern void po_message_set_msgid (po_message_t message, const char *msgid);
-
-/* Return the msgid_plural (untranslated English plural string) of a message,
-   or NULL for a message without plural.  */
-extern const char * po_message_msgid_plural (po_message_t message);
-
-/* Change the msgid_plural (untranslated English plural string) of a message.
-   NULL means a message without plural.  */
-extern void po_message_set_msgid_plural (po_message_t message, const char *msgid_plural);
-
-/* Return the msgstr (translation) of a message.
-   Return the empty string for an untranslated message.  */
-extern const char * po_message_msgstr (po_message_t message);
-
-/* Change the msgstr (translation) of a message.
-   Use an empty string to denote an untranslated message.  */
-extern void po_message_set_msgstr (po_message_t message, const char *msgstr);
-
-/* Return the msgstr[index] for a message with plural handling, or
-   NULL when the index is out of range or for a message without plural.  */
-extern const char * po_message_msgstr_plural (po_message_t message, int index);
-
-/* Change the msgstr[index] for a message with plural handling.
-   Use a NULL value at the end to reduce the number of plural forms.  */
-extern void po_message_set_msgstr_plural (po_message_t message, int index, const char *msgstr);
-
-/* Return the comments for a message.  */
-extern const char * po_message_comments (po_message_t message);
-
-/* Change the comments for a message.
-   comments should be a multiline string, ending in a newline, or empty.  */
-extern void po_message_set_comments (po_message_t message, const char *comments);
-
-/* Return the extracted comments for a message.  */
-extern const char * po_message_extracted_comments (po_message_t message);
-
-/* Change the extracted comments for a message.
-   comments should be a multiline string, ending in a newline, or empty.  */
-extern void po_message_set_extracted_comments (po_message_t message, const char *comments);
-
-/* Return the i-th file position for a message, or NULL if i is out of
-   range.  */
-extern po_filepos_t po_message_filepos (po_message_t message, int i);
-
-/* Remove the i-th file position from a message.
-   The indices of all following file positions for the message are decremented
-   by one.  */
-extern void po_message_remove_filepos (po_message_t message, int i);
-
-/* Add a file position to a message, if it is not already present for the
-   message.
-   file is the file name.
-   start_line is the line number where the string starts, or (size_t)(-1) if no
-   line number is available.  */
-extern void po_message_add_filepos (po_message_t message, const char *file, size_t start_line);
-
-/* Return the previous context of a message, or NULL for none.  */
-extern const char * po_message_prev_msgctxt (po_message_t message);
-
-/* Change the previous context of a message.  NULL is allowed.  */
-extern void po_message_set_prev_msgctxt (po_message_t message, const char *prev_msgctxt);
-
-/* Return the previous msgid (untranslated English string) of a message, or
-   NULL for none.  */
-extern const char * po_message_prev_msgid (po_message_t message);
-
-/* Change the previous msgid (untranslated English string) of a message.
-   NULL is allowed.  */
-extern void po_message_set_prev_msgid (po_message_t message, const char *prev_msgid);
-
-/* Return the previous msgid_plural (untranslated English plural string) of a
-   message, or NULL for none.  */
-extern const char * po_message_prev_msgid_plural (po_message_t message);
-
-/* Change the previous msgid_plural (untranslated English plural string) of a
-   message.  NULL is allowed.  */
-extern void po_message_set_prev_msgid_plural (po_message_t message, const char *prev_msgid_plural);
-
-/* Return true if the message is marked obsolete.  */
-extern int po_message_is_obsolete (po_message_t message);
-
-/* Change the obsolete mark of a message.  */
-extern void po_message_set_obsolete (po_message_t message, int obsolete);
-
-/* Return true if the message is marked fuzzy.  */
-extern int po_message_is_fuzzy (po_message_t message);
-
-/* Change the fuzzy mark of a message.  */
-extern void po_message_set_fuzzy (po_message_t message, int fuzzy);
-
-/* Return true if the message is marked as being a format string of the given
-   type (e.g. "c-format").  */
-extern int po_message_is_format (po_message_t message, const char *format_type);
-
-/* Change the format string mark for a given type of a message.  */
-extern void po_message_set_format (po_message_t message, const char *format_type, /*bool*/int value);
-
-/* If a numeric range of a message is set, return true and store the minimum
-   and maximum value in *MINP and *MAXP.  */
-extern int po_message_is_range (po_message_t message, int *minp, int *maxp);
-
-/* Change the numeric range of a message.  MIN and MAX must be non-negative,
-   with MIN < MAX.  Use MIN = MAX = -1 to remove the numeric range of a
-   message.  */
-extern void po_message_set_range (po_message_t message, int min, int max);
-
-
-/* =========================== po_filepos_t API ============================ */
-
-/* Return the file name.  */
-extern const char * po_filepos_file (po_filepos_t filepos);
-
-/* Return the line number where the string starts, or (size_t)(-1) if no line
-   number is available.  */
-extern size_t po_filepos_start_line (po_filepos_t filepos);
-
-
-/* ============================ Format type API ============================= */
-
-/* Return a NULL terminated array of the supported format types.  */
-extern const char * const * po_format_list (void);
-
-/* Return the pretty name associated with a format type.
-   For example, for "csharp-format", return "C#".
-   Return NULL if the argument is not a supported format type.  */
-extern const char * po_format_pretty_name (const char *format_type);
-
-
-/* ============================= Checking API ============================== */
-
-/* Test whether an entire file PO file is valid, like msgfmt does it.
-   If it is invalid, pass the reasons to the handler.  */
-extern void po_file_check_all (po_file_t file, po_xerror_handler_t handler);
-
-/* Test a single message, to be inserted in a PO file in memory, like msgfmt
-   does it.  If it is invalid, pass the reasons to the handler.  The iterator
-   is not modified by this call; it only specifies the file and the domain.  */
-extern void po_message_check_all (po_message_t message, po_message_iterator_t iterator, po_xerror_handler_t handler);
-
-/* Test whether the message translation is a valid format string if the message
-   is marked as being a format string.  If it is invalid, pass the reasons to
-   the handler.  */
-#define po_message_check_format po_message_check_format_v2
-extern void po_message_check_format (po_message_t message, po_xerror_handler_t handler);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GETTEXT_PO_H */
diff --git a/libs/gettext/include32/libintl.h b/libs/gettext/include32/libintl.h
deleted file mode 100644
index a8e2d414b..000000000
--- a/libs/gettext/include32/libintl.h
+++ /dev/null
@@ -1,464 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H 1
-
-#include <locale.h>
-#if (defined __APPLE__ && defined __MACH__) && 0
-# include <xlocale.h>
-#endif
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
-   then includes <libintl.h> (i.e. this file!) and then only defines
-   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
-   in this case.  */
-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Provide information about the supported file formats.  Returns the
-   maximum minor revision number supported for a given major revision.  */
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 || (major) == 1 ? 1 : -1)
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001201
-extern int libintl_version;
-
-
-/* We redirect the functions to those prefixed with "libintl_".  This is
-   necessary, because some systems define gettext/textdomain/... in the C
-   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
-   If we used the unprefixed names, there would be cases where the
-   definition in the C library would override the one in the libintl.so
-   shared library.  Recall that on ELF systems, the symbols are looked
-   up in the following order:
-     1. in the executable,
-     2. in the shared libraries specified on the link command line, in order,
-     3. in the dependencies of the shared libraries specified on the link
-        command line,
-     4. in the dlopen()ed shared libraries, in the order in which they were
-        dlopen()ed.
-   The definition in the C library would override the one in libintl.so if
-   either
-     * -lc is given on the link command line and -lintl isn't, or
-     * -lc is given on the link command line before -lintl, or
-     * libintl.so is a dependency of a dlopen()ed shared library but not
-       linked to the executable at link time.
-   Since Solaris gettext() behaves differently than GNU gettext(), this
-   would be unacceptable.
-
-   The redirection happens by default through macros in C, so that &gettext
-   is independent of the compilation unit, but through inline functions in
-   C++, in order not to interfere with the name mangling of class fields or
-   class methods called 'gettext'.  */
-
-/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
-   If he doesn't, we choose the method.  A third possible method is
-   _INTL_REDIRECT_ASM, supported only by GCC.  */
-#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
-#  define _INTL_REDIRECT_ASM
-# else
-#  ifdef __cplusplus
-#   define _INTL_REDIRECT_INLINE
-#  else
-#   define _INTL_REDIRECT_MACROS
-#  endif
-# endif
-#endif
-/* Auxiliary macros.  */
-#ifdef _INTL_REDIRECT_ASM
-# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
-# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
-# define _INTL_STRINGIFY(prefix) #prefix
-#else
-# define _INTL_ASM(cname)
-#endif
-
-/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
-   its n-th argument literally.  This enables GCC to warn for example about
-   printf (gettext ("foo %y")).  */
-#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
-# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
-#else
-# define _INTL_MAY_RETURN_STRING_ARG(n)
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_gettext (const char *__msgid)
-       _INTL_MAY_RETURN_STRING_ARG (1);
-static inline char *gettext (const char *__msgid)
-{
-  return libintl_gettext (__msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define gettext libintl_gettext
-#endif
-extern char *gettext (const char *__msgid)
-       _INTL_ASM (libintl_gettext)
-       _INTL_MAY_RETURN_STRING_ARG (1);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *dgettext (const char *__domainname, const char *__msgid)
-{
-  return libintl_dgettext (__domainname, __msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dgettext libintl_dgettext
-#endif
-extern char *dgettext (const char *__domainname, const char *__msgid)
-       _INTL_ASM (libintl_dgettext)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
-                                int __category)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *dcgettext (const char *__domainname, const char *__msgid,
-                               int __category)
-{
-  return libintl_dcgettext (__domainname, __msgid, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcgettext libintl_dcgettext
-#endif
-extern char *dcgettext (const char *__domainname, const char *__msgid,
-                        int __category)
-       _INTL_ASM (libintl_dcgettext)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
-                               unsigned long int __n)
-       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *ngettext (const char *__msgid1, const char *__msgid2,
-                              unsigned long int __n)
-{
-  return libintl_ngettext (__msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define ngettext libintl_ngettext
-#endif
-extern char *ngettext (const char *__msgid1, const char *__msgid2,
-                       unsigned long int __n)
-       _INTL_ASM (libintl_ngettext)
-       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
-                                const char *__msgid2, unsigned long int __n)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-static inline char *dngettext (const char *__domainname, const char *__msgid1,
-                               const char *__msgid2, unsigned long int __n)
-{
-  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dngettext libintl_dngettext
-#endif
-extern char *dngettext (const char *__domainname,
-                        const char *__msgid1, const char *__msgid2,
-                        unsigned long int __n)
-       _INTL_ASM (libintl_dngettext)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-#endif
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcngettext (const char *__domainname,
-                                 const char *__msgid1, const char *__msgid2,
-                                 unsigned long int __n, int __category)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-static inline char *dcngettext (const char *__domainname,
-                                const char *__msgid1, const char *__msgid2,
-                                unsigned long int __n, int __category)
-{
-  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcngettext libintl_dcngettext
-#endif
-extern char *dcngettext (const char *__domainname,
-                         const char *__msgid1, const char *__msgid2,
-                         unsigned long int __n, int __category)
-       _INTL_ASM (libintl_dcngettext)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-#endif
-
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_textdomain (const char *__domainname);
-static inline char *textdomain (const char *__domainname)
-{
-  return libintl_textdomain (__domainname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define textdomain libintl_textdomain
-#endif
-extern char *textdomain (const char *__domainname)
-       _INTL_ASM (libintl_textdomain);
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bindtextdomain (const char *__domainname,
-                                     const char *__dirname);
-static inline char *bindtextdomain (const char *__domainname,
-                                    const char *__dirname)
-{
-  return libintl_bindtextdomain (__domainname, __dirname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bindtextdomain libintl_bindtextdomain
-#endif
-extern char *bindtextdomain (const char *__domainname, const char *__dirname)
-       _INTL_ASM (libintl_bindtextdomain);
-#endif
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bind_textdomain_codeset (const char *__domainname,
-                                              const char *__codeset);
-static inline char *bind_textdomain_codeset (const char *__domainname,
-                                             const char *__codeset)
-{
-  return libintl_bind_textdomain_codeset (__domainname, __codeset);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bind_textdomain_codeset libintl_bind_textdomain_codeset
-#endif
-extern char *bind_textdomain_codeset (const char *__domainname,
-                                      const char *__codeset)
-       _INTL_ASM (libintl_bind_textdomain_codeset);
-#endif
-
-
-
-/* Support for format strings with positions in *printf(), following the
-   POSIX/XSI specification.
-   Note: These replacements for the *printf() functions are visible only
-   in source files that #include <libintl.h> or #include "gettext.h".
-   Packages that use *printf() in source files that don't refer to _()
-   or gettext() but for which the format string could be the return value
-   of _() or gettext() need to add this #include.  Oh well.  */
-
-#if !0
-
-#include <stdio.h>
-#include <stddef.h>
-
-/* Get va_list.  */
-#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-
-#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef fprintf
-#define fprintf libintl_fprintf
-extern int fprintf (FILE *, const char *, ...);
-#endif
-#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vfprintf
-#define vfprintf libintl_vfprintf
-extern int vfprintf (FILE *, const char *, va_list);
-#endif
-
-#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef printf
-#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
-/* Don't break __attribute__((format(printf,M,N))).
-   This redefinition is only possible because the libc in NetBSD, Cygwin,
-   mingw does not have a function __printf__.
-   Alternatively, we could have done this redirection only when compiling with
-   __GNUC__, together with a symbol redirection:
-       extern int printf (const char *, ...)
-              __asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
-   But doing it now would introduce a binary incompatibility with already
-   distributed versions of libintl on these systems.  */
-# define libintl_printf __printf__
-#endif
-#define printf libintl_printf
-extern int printf (const char *, ...);
-#endif
-#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vprintf
-#define vprintf libintl_vprintf
-extern int vprintf (const char *, va_list);
-#endif
-
-#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef sprintf
-#define sprintf libintl_sprintf
-extern int sprintf (char *, const char *, ...);
-#endif
-#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vsprintf
-#define vsprintf libintl_vsprintf
-extern int vsprintf (char *, const char *, va_list);
-#endif
-
-#if 1
-
-#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef snprintf
-#define snprintf libintl_snprintf
-extern int snprintf (char *, size_t, const char *, ...);
-#endif
-#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vsnprintf
-#define vsnprintf libintl_vsnprintf
-extern int vsnprintf (char *, size_t, const char *, va_list);
-#endif
-
-#endif
-
-#if 0
-
-#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef asprintf
-#define asprintf libintl_asprintf
-extern int asprintf (char **, const char *, ...);
-#endif
-#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vasprintf
-#define vasprintf libintl_vasprintf
-extern int vasprintf (char **, const char *, va_list);
-#endif
-
-#endif
-
-#if 0
-
-#undef fwprintf
-#define fwprintf libintl_fwprintf
-extern int fwprintf (FILE *, const wchar_t *, ...);
-#undef vfwprintf
-#define vfwprintf libintl_vfwprintf
-extern int vfwprintf (FILE *, const wchar_t *, va_list);
-
-#undef wprintf
-#define wprintf libintl_wprintf
-extern int wprintf (const wchar_t *, ...);
-#undef vwprintf
-#define vwprintf libintl_vwprintf
-extern int vwprintf (const wchar_t *, va_list);
-
-#undef swprintf
-#define swprintf libintl_swprintf
-extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
-#undef vswprintf
-#define vswprintf libintl_vswprintf
-extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
-
-#endif
-
-#endif
-
-
-/* Support for the locale chosen by the user.  */
-#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
-
-#undef setlocale
-#define setlocale libintl_setlocale
-extern char *setlocale (int, const char *);
-
-#if 0
-
-#undef newlocale
-#define newlocale libintl_newlocale
-extern locale_t newlocale (int, const char *, locale_t);
-
-#endif
-
-#endif
-
-
-/* Support for relocatable packages.  */
-
-/* Sets the original and the current installation prefix of the package.
-   Relocation simply replaces a pathname starting with the original prefix
-   by the corresponding pathname with the current prefix instead.  Both
-   prefixes should be directory names without trailing slash (i.e. use ""
-   instead of "/").  */
-#define libintl_set_relocation_prefix libintl_set_relocation_prefix
-extern void
-       libintl_set_relocation_prefix (const char *orig_prefix,
-                                      const char *curr_prefix);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/libs/gettext/include64/autosprintf.h b/libs/gettext/include64/autosprintf.h
deleted file mode 100644
index f447391b0..000000000
--- a/libs/gettext/include64/autosprintf.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Class autosprintf - formatted output to an ostream.
-   Copyright (C) 2002 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-#ifndef _AUTOSPRINTF_H
-#define _AUTOSPRINTF_H
-
-#ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
-#  define __attribute__(Spec) /* empty */
-# endif
-/* The __-protected variants of `format' and `printf' attributes
-   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
-# endif
-#endif
-
-#include <string>
-#include <iostream>
-
-namespace gnu
-{
-  /* A temporary object, usually allocated on the stack, representing
-     the result of an asprintf() call.  */
-  class autosprintf
-  {
-  public:
-    /* Constructor: takes a format string and the printf arguments.  */
-    autosprintf (const char *format, ...)
-                __attribute__ ((__format__ (__printf__, 2, 3)));
-    /* Copy constructor.  */
-    autosprintf (const autosprintf& src);
-    /* Destructor: frees the temporarily allocated string.  */
-    ~autosprintf ();
-    /* Conversion to string.  */
-    operator char * () const;
-    operator std::string () const;
-    /* Output to an ostream.  */
-    friend inline std::ostream& operator<< (std::ostream& stream, const autosprintf& tmp)
-    {
-      stream << (tmp.str ? tmp.str : "(error in autosprintf)");
-      return stream;
-    }
-  private:
-    char *str;
-  };
-}
-
-#endif /* _AUTOSPRINTF_H */
diff --git a/libs/gettext/include64/gettext-po.h b/libs/gettext/include64/gettext-po.h
deleted file mode 100644
index 24fd8e90e..000000000
--- a/libs/gettext/include64/gettext-po.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/* Public API for GNU gettext PO files - contained in libgettextpo.
-   Copyright (C) 2003-2008, 2010 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
-
-   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 3 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.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef _GETTEXT_PO_H
-#define _GETTEXT_PO_H 1
-
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* =========================== Meta Information ============================ */
-
-/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBGETTEXTPO_VERSION 0x001201
-extern int libgettextpo_version;
-
-/* ================================= Types ================================= */
-
-/* A po_file_t represents the contents of a PO file.  */
-typedef struct po_file *po_file_t;
-
-/* A po_message_iterator_t represents an iterator through a domain of a
-   PO file.  */
-typedef struct po_message_iterator *po_message_iterator_t;
-
-/* A po_message_t represents a message in a PO file.  */
-typedef struct po_message *po_message_t;
-
-/* A po_filepos_t represents a string's position within a source file.  */
-typedef struct po_filepos *po_filepos_t;
-
-/* A po_error_handler handles error situations.  */
-struct po_error_handler
-{
-  /* Signal an error.  The error message is built from FORMAT and the following
-     arguments.  ERRNUM, if nonzero, is an errno value.
-     Must increment the error_message_count variable declared in error.h.
-     Must not return if STATUS is nonzero.  */
-  void (*error) (int status, int errnum,
-                 const char *format, ...)
-#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
-  __attribute__ ((__format__ (__printf__, 3, 4)))
-#endif
-  ;
-
-  /* Signal an error.  The error message is built from FORMAT and the following
-     arguments.  The error location is at FILENAME line LINENO. ERRNUM, if
-     nonzero, is an errno value.
-     Must increment the error_message_count variable declared in error.h.
-     Must not return if STATUS is nonzero.  */
-  void (*error_at_line) (int status, int errnum,
-                         const char *filename, unsigned int lineno,
-                         const char *format, ...)
-#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ > 3) && !__STRICT_ANSI__
-  __attribute__ ((__format__ (__printf__, 5, 6)))
-#endif
-  ;
-
-  /* Signal a multiline warning.  The PREFIX applies to all lines of the
-     MESSAGE.  Free the PREFIX and MESSAGE when done.  */
-  void (*multiline_warning) (char *prefix, char *message);
-
-  /* Signal a multiline error.  The PREFIX applies to all lines of the
-     MESSAGE.  Free the PREFIX and MESSAGE when done.
-     Must increment the error_message_count variable declared in error.h if
-     PREFIX is non-NULL.  */
-  void (*multiline_error) (char *prefix, char *message);
-};
-typedef const struct po_error_handler *po_error_handler_t;
-
-/* A po_xerror_handler handles warnings, error and fatal error situations.  */
-#define PO_SEVERITY_WARNING     0 /* just a warning, tell the user */
-#define PO_SEVERITY_ERROR       1 /* an error, the operation cannot complete */
-#define PO_SEVERITY_FATAL_ERROR 2 /* an error, the operation must be aborted */
-struct po_xerror_handler
-{
-  /* Signal a problem of the given severity.
-     MESSAGE and/or FILENAME + LINENO indicate where the problem occurred.
-     If FILENAME is NULL, FILENAME and LINENO and COLUMN should be ignored.
-     If LINENO is (size_t)(-1), LINENO and COLUMN should be ignored.
-     If COLUMN is (size_t)(-1), it should be ignored.
-     MESSAGE_TEXT is the problem description (if MULTILINE_P is true,
-     multiple lines of text, each terminated with a newline, otherwise
-     usually a single line).
-     Must not return if SEVERITY is PO_SEVERITY_FATAL_ERROR.  */
-  void (*xerror) (int severity,
-                  po_message_t message,
-                  const char *filename, size_t lineno, size_t column,
-                  int multiline_p, const char *message_text);
-  /* Signal a problem that refers to two messages.
-     Similar to two calls to xerror.
-     If possible, a "..." can be appended to MESSAGE_TEXT1 and prepended to
-     MESSAGE_TEXT2.  */
-  void (*xerror2) (int severity,
-                   po_message_t message1,
-                   const char *filename1, size_t lineno1, size_t column1,
-                   int multiline_p1, const char *message_text1,
-                   po_message_t message2,
-                   const char *filename2, size_t lineno2, size_t column2,
-                   int multiline_p2, const char *message_text2);
-};
-typedef const struct po_xerror_handler *po_xerror_handler_t;
-
-/* Memory allocation:
-   The memory allocations performed by these functions use xmalloc(),
-   therefore will cause a program exit if memory is exhausted.
-   The memory allocated by po_file_read, and implicitly returned through
-   the po_message_* functions, lasts until freed with po_file_free.  */
-
-
-/* ============================= po_file_t API ============================= */
-
-/* Create an empty PO file representation in memory.  */
-extern po_file_t po_file_create (void);
-
-/* Read a PO file into memory.
-   Return its contents.  Upon failure, return NULL and set errno.  */
-#define po_file_read po_file_read_v3
-extern po_file_t po_file_read (const char *filename,
-                               po_xerror_handler_t handler);
-
-/* Write an in-memory PO file to a file.
-   Upon failure, return NULL and set errno.  */
-#define po_file_write po_file_write_v2
-extern po_file_t po_file_write (po_file_t file, const char *filename,
-                                po_xerror_handler_t handler);
-
-/* Free a PO file from memory.  */
-extern void po_file_free (po_file_t file);
-
-/* Return the names of the domains covered by a PO file in memory.  */
-extern const char * const * po_file_domains (po_file_t file);
-
-
-/* =========================== Header entry API ============================ */
-
-/* Return the header entry of a domain of a PO file in memory.
-   The domain NULL denotes the default domain.
-   Return NULL if there is no header entry.  */
-extern const char * po_file_domain_header (po_file_t file, const char *domain);
-
-/* Return the value of a field in a header entry.
-   The return value is either a freshly allocated string, to be freed by the
-   caller, or NULL.  */
-extern char * po_header_field (const char *header, const char *field);
-
-/* Return the header entry with a given field set to a given value.  The field
-   is added if necessary.
-   The return value is a freshly allocated string.  */
-extern char * po_header_set_field (const char *header, const char *field, const char *value);
-
-
-/* ======================= po_message_iterator_t API ======================= */
-
-/* Create an iterator for traversing a domain of a PO file in memory.
-   The domain NULL denotes the default domain.  */
-extern po_message_iterator_t po_message_iterator (po_file_t file, const char *domain);
-
-/* Free an iterator.  */
-extern void po_message_iterator_free (po_message_iterator_t iterator);
-
-/* Return the next message, and advance the iterator.
-   Return NULL at the end of the message list.  */
-extern po_message_t po_next_message (po_message_iterator_t iterator);
-
-/* Insert a message in a PO file in memory, in the domain and at the position
-   indicated by the iterator.  The iterator thereby advances past the freshly
-   inserted message.  */
-extern void po_message_insert (po_message_iterator_t iterator, po_message_t message);
-
-
-/* =========================== po_message_t API ============================ */
-
-/* Return a freshly constructed message.
-   To finish initializing the message, you must set the msgid and msgstr.  */
-extern po_message_t po_message_create (void);
-
-/* Return the context of a message, or NULL for a message not restricted to a
-   context.  */
-extern const char * po_message_msgctxt (po_message_t message);
-
-/* Change the context of a message. NULL means a message not restricted to a
-   context.  */
-extern void po_message_set_msgctxt (po_message_t message, const char *msgctxt);
-
-/* Return the msgid (untranslated English string) of a message.  */
-extern const char * po_message_msgid (po_message_t message);
-
-/* Change the msgid (untranslated English string) of a message.  */
-extern void po_message_set_msgid (po_message_t message, const char *msgid);
-
-/* Return the msgid_plural (untranslated English plural string) of a message,
-   or NULL for a message without plural.  */
-extern const char * po_message_msgid_plural (po_message_t message);
-
-/* Change the msgid_plural (untranslated English plural string) of a message.
-   NULL means a message without plural.  */
-extern void po_message_set_msgid_plural (po_message_t message, const char *msgid_plural);
-
-/* Return the msgstr (translation) of a message.
-   Return the empty string for an untranslated message.  */
-extern const char * po_message_msgstr (po_message_t message);
-
-/* Change the msgstr (translation) of a message.
-   Use an empty string to denote an untranslated message.  */
-extern void po_message_set_msgstr (po_message_t message, const char *msgstr);
-
-/* Return the msgstr[index] for a message with plural handling, or
-   NULL when the index is out of range or for a message without plural.  */
-extern const char * po_message_msgstr_plural (po_message_t message, int index);
-
-/* Change the msgstr[index] for a message with plural handling.
-   Use a NULL value at the end to reduce the number of plural forms.  */
-extern void po_message_set_msgstr_plural (po_message_t message, int index, const char *msgstr);
-
-/* Return the comments for a message.  */
-extern const char * po_message_comments (po_message_t message);
-
-/* Change the comments for a message.
-   comments should be a multiline string, ending in a newline, or empty.  */
-extern void po_message_set_comments (po_message_t message, const char *comments);
-
-/* Return the extracted comments for a message.  */
-extern const char * po_message_extracted_comments (po_message_t message);
-
-/* Change the extracted comments for a message.
-   comments should be a multiline string, ending in a newline, or empty.  */
-extern void po_message_set_extracted_comments (po_message_t message, const char *comments);
-
-/* Return the i-th file position for a message, or NULL if i is out of
-   range.  */
-extern po_filepos_t po_message_filepos (po_message_t message, int i);
-
-/* Remove the i-th file position from a message.
-   The indices of all following file positions for the message are decremented
-   by one.  */
-extern void po_message_remove_filepos (po_message_t message, int i);
-
-/* Add a file position to a message, if it is not already present for the
-   message.
-   file is the file name.
-   start_line is the line number where the string starts, or (size_t)(-1) if no
-   line number is available.  */
-extern void po_message_add_filepos (po_message_t message, const char *file, size_t start_line);
-
-/* Return the previous context of a message, or NULL for none.  */
-extern const char * po_message_prev_msgctxt (po_message_t message);
-
-/* Change the previous context of a message.  NULL is allowed.  */
-extern void po_message_set_prev_msgctxt (po_message_t message, const char *prev_msgctxt);
-
-/* Return the previous msgid (untranslated English string) of a message, or
-   NULL for none.  */
-extern const char * po_message_prev_msgid (po_message_t message);
-
-/* Change the previous msgid (untranslated English string) of a message.
-   NULL is allowed.  */
-extern void po_message_set_prev_msgid (po_message_t message, const char *prev_msgid);
-
-/* Return the previous msgid_plural (untranslated English plural string) of a
-   message, or NULL for none.  */
-extern const char * po_message_prev_msgid_plural (po_message_t message);
-
-/* Change the previous msgid_plural (untranslated English plural string) of a
-   message.  NULL is allowed.  */
-extern void po_message_set_prev_msgid_plural (po_message_t message, const char *prev_msgid_plural);
-
-/* Return true if the message is marked obsolete.  */
-extern int po_message_is_obsolete (po_message_t message);
-
-/* Change the obsolete mark of a message.  */
-extern void po_message_set_obsolete (po_message_t message, int obsolete);
-
-/* Return true if the message is marked fuzzy.  */
-extern int po_message_is_fuzzy (po_message_t message);
-
-/* Change the fuzzy mark of a message.  */
-extern void po_message_set_fuzzy (po_message_t message, int fuzzy);
-
-/* Return true if the message is marked as being a format string of the given
-   type (e.g. "c-format").  */
-extern int po_message_is_format (po_message_t message, const char *format_type);
-
-/* Change the format string mark for a given type of a message.  */
-extern void po_message_set_format (po_message_t message, const char *format_type, /*bool*/int value);
-
-/* If a numeric range of a message is set, return true and store the minimum
-   and maximum value in *MINP and *MAXP.  */
-extern int po_message_is_range (po_message_t message, int *minp, int *maxp);
-
-/* Change the numeric range of a message.  MIN and MAX must be non-negative,
-   with MIN < MAX.  Use MIN = MAX = -1 to remove the numeric range of a
-   message.  */
-extern void po_message_set_range (po_message_t message, int min, int max);
-
-
-/* =========================== po_filepos_t API ============================ */
-
-/* Return the file name.  */
-extern const char * po_filepos_file (po_filepos_t filepos);
-
-/* Return the line number where the string starts, or (size_t)(-1) if no line
-   number is available.  */
-extern size_t po_filepos_start_line (po_filepos_t filepos);
-
-
-/* ============================ Format type API ============================= */
-
-/* Return a NULL terminated array of the supported format types.  */
-extern const char * const * po_format_list (void);
-
-/* Return the pretty name associated with a format type.
-   For example, for "csharp-format", return "C#".
-   Return NULL if the argument is not a supported format type.  */
-extern const char * po_format_pretty_name (const char *format_type);
-
-
-/* ============================= Checking API ============================== */
-
-/* Test whether an entire file PO file is valid, like msgfmt does it.
-   If it is invalid, pass the reasons to the handler.  */
-extern void po_file_check_all (po_file_t file, po_xerror_handler_t handler);
-
-/* Test a single message, to be inserted in a PO file in memory, like msgfmt
-   does it.  If it is invalid, pass the reasons to the handler.  The iterator
-   is not modified by this call; it only specifies the file and the domain.  */
-extern void po_message_check_all (po_message_t message, po_message_iterator_t iterator, po_xerror_handler_t handler);
-
-/* Test whether the message translation is a valid format string if the message
-   is marked as being a format string.  If it is invalid, pass the reasons to
-   the handler.  */
-#define po_message_check_format po_message_check_format_v2
-extern void po_message_check_format (po_message_t message, po_xerror_handler_t handler);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GETTEXT_PO_H */
diff --git a/libs/gettext/include64/libintl.h b/libs/gettext/include64/libintl.h
deleted file mode 100644
index a8e2d414b..000000000
--- a/libs/gettext/include64/libintl.h
+++ /dev/null
@@ -1,464 +0,0 @@
-/* Message catalogs for internationalization.
-   Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, 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
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H 1
-
-#include <locale.h>
-#if (defined __APPLE__ && defined __MACH__) && 0
-# include <xlocale.h>
-#endif
-
-/* The LC_MESSAGES locale category is the category used by the functions
-   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-   On systems that don't define it, use an arbitrary value instead.
-   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
-   then includes <libintl.h> (i.e. this file!) and then only defines
-   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
-   in this case.  */
-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-   implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Provide information about the supported file formats.  Returns the
-   maximum minor revision number supported for a given major revision.  */
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 || (major) == 1 ? 1 : -1)
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-   precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001201
-extern int libintl_version;
-
-
-/* We redirect the functions to those prefixed with "libintl_".  This is
-   necessary, because some systems define gettext/textdomain/... in the C
-   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
-   If we used the unprefixed names, there would be cases where the
-   definition in the C library would override the one in the libintl.so
-   shared library.  Recall that on ELF systems, the symbols are looked
-   up in the following order:
-     1. in the executable,
-     2. in the shared libraries specified on the link command line, in order,
-     3. in the dependencies of the shared libraries specified on the link
-        command line,
-     4. in the dlopen()ed shared libraries, in the order in which they were
-        dlopen()ed.
-   The definition in the C library would override the one in libintl.so if
-   either
-     * -lc is given on the link command line and -lintl isn't, or
-     * -lc is given on the link command line before -lintl, or
-     * libintl.so is a dependency of a dlopen()ed shared library but not
-       linked to the executable at link time.
-   Since Solaris gettext() behaves differently than GNU gettext(), this
-   would be unacceptable.
-
-   The redirection happens by default through macros in C, so that &gettext
-   is independent of the compilation unit, but through inline functions in
-   C++, in order not to interfere with the name mangling of class fields or
-   class methods called 'gettext'.  */
-
-/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
-   If he doesn't, we choose the method.  A third possible method is
-   _INTL_REDIRECT_ASM, supported only by GCC.  */
-#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
-#  define _INTL_REDIRECT_ASM
-# else
-#  ifdef __cplusplus
-#   define _INTL_REDIRECT_INLINE
-#  else
-#   define _INTL_REDIRECT_MACROS
-#  endif
-# endif
-#endif
-/* Auxiliary macros.  */
-#ifdef _INTL_REDIRECT_ASM
-# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
-# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
-# define _INTL_STRINGIFY(prefix) #prefix
-#else
-# define _INTL_ASM(cname)
-#endif
-
-/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
-   its n-th argument literally.  This enables GCC to warn for example about
-   printf (gettext ("foo %y")).  */
-#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
-# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
-#else
-# define _INTL_MAY_RETURN_STRING_ARG(n)
-#endif
-
-/* Look up MSGID in the current default message catalog for the current
-   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-   text).  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_gettext (const char *__msgid)
-       _INTL_MAY_RETURN_STRING_ARG (1);
-static inline char *gettext (const char *__msgid)
-{
-  return libintl_gettext (__msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define gettext libintl_gettext
-#endif
-extern char *gettext (const char *__msgid)
-       _INTL_ASM (libintl_gettext)
-       _INTL_MAY_RETURN_STRING_ARG (1);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current
-   LC_MESSAGES locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *dgettext (const char *__domainname, const char *__msgid)
-{
-  return libintl_dgettext (__domainname, __msgid);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dgettext libintl_dgettext
-#endif
-extern char *dgettext (const char *__domainname, const char *__msgid)
-       _INTL_ASM (libintl_dgettext)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-   locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
-                                int __category)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *dcgettext (const char *__domainname, const char *__msgid,
-                               int __category)
-{
-  return libintl_dcgettext (__domainname, __msgid, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcgettext libintl_dcgettext
-#endif
-extern char *dcgettext (const char *__domainname, const char *__msgid,
-                        int __category)
-       _INTL_ASM (libintl_dcgettext)
-       _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-
-/* Similar to `gettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
-                               unsigned long int __n)
-       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-static inline char *ngettext (const char *__msgid1, const char *__msgid2,
-                              unsigned long int __n)
-{
-  return libintl_ngettext (__msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define ngettext libintl_ngettext
-#endif
-extern char *ngettext (const char *__msgid1, const char *__msgid2,
-                       unsigned long int __n)
-       _INTL_ASM (libintl_ngettext)
-       _INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
-#endif
-
-/* Similar to `dgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
-                                const char *__msgid2, unsigned long int __n)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-static inline char *dngettext (const char *__domainname, const char *__msgid1,
-                               const char *__msgid2, unsigned long int __n)
-{
-  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dngettext libintl_dngettext
-#endif
-extern char *dngettext (const char *__domainname,
-                        const char *__msgid1, const char *__msgid2,
-                        unsigned long int __n)
-       _INTL_ASM (libintl_dngettext)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-#endif
-
-/* Similar to `dcgettext' but select the plural form corresponding to the
-   number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_dcngettext (const char *__domainname,
-                                 const char *__msgid1, const char *__msgid2,
-                                 unsigned long int __n, int __category)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-static inline char *dcngettext (const char *__domainname,
-                                const char *__msgid1, const char *__msgid2,
-                                unsigned long int __n, int __category)
-{
-  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcngettext libintl_dcngettext
-#endif
-extern char *dcngettext (const char *__domainname,
-                         const char *__msgid1, const char *__msgid2,
-                         unsigned long int __n, int __category)
-       _INTL_ASM (libintl_dcngettext)
-       _INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
-#endif
-
-
-
-/* Set the current default message catalog to DOMAINNAME.
-   If DOMAINNAME is null, return the current default.
-   If DOMAINNAME is "", reset to the default of "messages".  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_textdomain (const char *__domainname);
-static inline char *textdomain (const char *__domainname)
-{
-  return libintl_textdomain (__domainname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define textdomain libintl_textdomain
-#endif
-extern char *textdomain (const char *__domainname)
-       _INTL_ASM (libintl_textdomain);
-#endif
-
-/* Specify that the DOMAINNAME message catalog will be found
-   in DIRNAME rather than in the system locale data base.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bindtextdomain (const char *__domainname,
-                                     const char *__dirname);
-static inline char *bindtextdomain (const char *__domainname,
-                                    const char *__dirname)
-{
-  return libintl_bindtextdomain (__domainname, __dirname);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bindtextdomain libintl_bindtextdomain
-#endif
-extern char *bindtextdomain (const char *__domainname, const char *__dirname)
-       _INTL_ASM (libintl_bindtextdomain);
-#endif
-
-/* Specify the character encoding in which the messages from the
-   DOMAINNAME message catalog will be returned.  */
-#ifdef _INTL_REDIRECT_INLINE
-extern char *libintl_bind_textdomain_codeset (const char *__domainname,
-                                              const char *__codeset);
-static inline char *bind_textdomain_codeset (const char *__domainname,
-                                             const char *__codeset)
-{
-  return libintl_bind_textdomain_codeset (__domainname, __codeset);
-}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bind_textdomain_codeset libintl_bind_textdomain_codeset
-#endif
-extern char *bind_textdomain_codeset (const char *__domainname,
-                                      const char *__codeset)
-       _INTL_ASM (libintl_bind_textdomain_codeset);
-#endif
-
-
-
-/* Support for format strings with positions in *printf(), following the
-   POSIX/XSI specification.
-   Note: These replacements for the *printf() functions are visible only
-   in source files that #include <libintl.h> or #include "gettext.h".
-   Packages that use *printf() in source files that don't refer to _()
-   or gettext() but for which the format string could be the return value
-   of _() or gettext() need to add this #include.  Oh well.  */
-
-#if !0
-
-#include <stdio.h>
-#include <stddef.h>
-
-/* Get va_list.  */
-#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-
-#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef fprintf
-#define fprintf libintl_fprintf
-extern int fprintf (FILE *, const char *, ...);
-#endif
-#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vfprintf
-#define vfprintf libintl_vfprintf
-extern int vfprintf (FILE *, const char *, va_list);
-#endif
-
-#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef printf
-#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
-/* Don't break __attribute__((format(printf,M,N))).
-   This redefinition is only possible because the libc in NetBSD, Cygwin,
-   mingw does not have a function __printf__.
-   Alternatively, we could have done this redirection only when compiling with
-   __GNUC__, together with a symbol redirection:
-       extern int printf (const char *, ...)
-              __asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
-   But doing it now would introduce a binary incompatibility with already
-   distributed versions of libintl on these systems.  */
-# define libintl_printf __printf__
-#endif
-#define printf libintl_printf
-extern int printf (const char *, ...);
-#endif
-#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vprintf
-#define vprintf libintl_vprintf
-extern int vprintf (const char *, va_list);
-#endif
-
-#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef sprintf
-#define sprintf libintl_sprintf
-extern int sprintf (char *, const char *, ...);
-#endif
-#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vsprintf
-#define vsprintf libintl_vsprintf
-extern int vsprintf (char *, const char *, va_list);
-#endif
-
-#if 1
-
-#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef snprintf
-#define snprintf libintl_snprintf
-extern int snprintf (char *, size_t, const char *, ...);
-#endif
-#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vsnprintf
-#define vsnprintf libintl_vsnprintf
-extern int vsnprintf (char *, size_t, const char *, va_list);
-#endif
-
-#endif
-
-#if 0
-
-#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef asprintf
-#define asprintf libintl_asprintf
-extern int asprintf (char **, const char *, ...);
-#endif
-#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
-#undef vasprintf
-#define vasprintf libintl_vasprintf
-extern int vasprintf (char **, const char *, va_list);
-#endif
-
-#endif
-
-#if 0
-
-#undef fwprintf
-#define fwprintf libintl_fwprintf
-extern int fwprintf (FILE *, const wchar_t *, ...);
-#undef vfwprintf
-#define vfwprintf libintl_vfwprintf
-extern int vfwprintf (FILE *, const wchar_t *, va_list);
-
-#undef wprintf
-#define wprintf libintl_wprintf
-extern int wprintf (const wchar_t *, ...);
-#undef vwprintf
-#define vwprintf libintl_vwprintf
-extern int vwprintf (const wchar_t *, va_list);
-
-#undef swprintf
-#define swprintf libintl_swprintf
-extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
-#undef vswprintf
-#define vswprintf libintl_vswprintf
-extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
-
-#endif
-
-#endif
-
-
-/* Support for the locale chosen by the user.  */
-#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
-
-#undef setlocale
-#define setlocale libintl_setlocale
-extern char *setlocale (int, const char *);
-
-#if 0
-
-#undef newlocale
-#define newlocale libintl_newlocale
-extern locale_t newlocale (int, const char *, locale_t);
-
-#endif
-
-#endif
-
-
-/* Support for relocatable packages.  */
-
-/* Sets the original and the current installation prefix of the package.
-   Relocation simply replaces a pathname starting with the original prefix
-   by the corresponding pathname with the current prefix instead.  Both
-   prefixes should be directory names without trailing slash (i.e. use ""
-   instead of "/").  */
-#define libintl_set_relocation_prefix libintl_set_relocation_prefix
-extern void
-       libintl_set_relocation_prefix (const char *orig_prefix,
-                                      const char *curr_prefix);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
diff --git a/libs/gettext/lib32/gettext/hostname.exe b/libs/gettext/lib32/gettext/hostname.exe
deleted file mode 100644
index ec691522b..000000000
Binary files a/libs/gettext/lib32/gettext/hostname.exe and /dev/null differ
diff --git a/libs/gettext/lib32/gettext/project-id b/libs/gettext/lib32/gettext/project-id
deleted file mode 100755
index 496f466c9..000000000
--- a/libs/gettext/lib32/gettext/project-id
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-# Prints a package's identification PACKAGE VERSION or PACKAGE.
-#
-# Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
-#
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-want_version="$1"
-
-# NLS nuisances: Letter ranges are different in the Estonian locale.
-LC_ALL=C
-
-while true; do
-  if test -f configure; then
-    package=`(grep '^PACKAGE_NAME=' configure; grep '^ *PACKAGE=' configure) | grep -v '=[ 	]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`
-    case "$package" in
-      *[\"\$\`\{\}]*)
-        # Some packages (gcal) retrieve the package name dynamically.
-        package=
-        ;;
-    esac
-    if test -n "$package"; then
-      is_gnu=`LC_ALL=C grep "GNU $package" * 2>/dev/null | grep -v '^libtool:'`
-      if test -n "$is_gnu"; then
-        package="GNU $package"
-      fi
-      if test -n "$want_version"; then
-        version=`(grep '^PACKAGE_VERSION=' configure; grep '^ *VERSION=' configure) | grep -v '=[ 	]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`
-        case "$version" in
-          *[\"\$\`\{\}]*)
-            # Some packages (gcal, gcc, clisp) retrieve the version dynamically.
-            version=
-            ;;
-        esac
-        if test -n "$version"; then
-          echo "$package $version"
-        else
-          echo "$package"
-        fi
-      else
-        echo "$package"
-      fi
-      exit 0
-    fi
-  fi
-  dir=`basename \`pwd\``
-  case "$dir" in
-    i18n)
-      # This directory name, used in GNU make, is not the top level directory.
-      ;;
-    *[A-Za-z]*[0-9]*)
-      package=`echo "$dir" | sed -e 's/^\([^0-9]*\)[0-9].*$/\1/' -e 's/[-_]$//'`
-      if test -n "$want_version"; then
-        version=`echo "$dir" | sed -e 's/^[^0-9]*\([0-9].*\)$/\1/'`
-        echo "$package $version"
-      else
-        echo "$package"
-      fi
-      exit 0
-      ;;
-  esac
-  # Go to parent directory
-  last=`/bin/pwd`
-  cd ..
-  curr=`/bin/pwd`
-  if test "$last" = "$curr"; then
-    # Oops, didn't find the package name.
-    if test -n "$want_version"; then
-      echo "PACKAGE VERSION"
-    else
-      echo "PACKAGE"
-    fi
-    exit 0
-  fi
-done
diff --git a/libs/gettext/lib32/gettext/urlget.exe b/libs/gettext/lib32/gettext/urlget.exe
deleted file mode 100644
index 8f4234b54..000000000
Binary files a/libs/gettext/lib32/gettext/urlget.exe and /dev/null differ
diff --git a/libs/gettext/lib32/gettext/user-email b/libs/gettext/lib32/gettext/user-email
deleted file mode 100755
index ebcee4d11..000000000
--- a/libs/gettext/lib32/gettext/user-email
+++ /dev/null
@@ -1,436 +0,0 @@
-#!/bin/sh
-# Prints the user's email address, with confirmation from the user.
-#
-# Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
-#
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Prerequisites for using ${exec_prefix}/lib and ${datarootdir}/locale.
-prefix="/usr/local/i686-w64-mingw32/stow/gettext-0.18.1.1"
-exec_prefix="${prefix}"
-datarootdir="${prefix}/share"
-datadir="${datarootdir}"
-# Set variables libdir, localedir.
-libdir="${exec_prefix}/lib"
-localedir="${datarootdir}/locale"
-
-# Support for relocatability.
-if test "no" = yes; then
-  orig_installdir="$libdir"/gettext # see Makefile.am's install rule
-  # Determine curr_installdir without caring for symlinked callers.
-  curr_installdir=`echo "$0" | sed -e 's,/[^/]*$,,'`
-  curr_installdir=`cd "$curr_installdir" && pwd`
-  # Compute the original/current installation prefixes by stripping the
-  # trailing directories off the original/current installation directories.
-  while true; do
-    orig_last=`echo "$orig_installdir" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    curr_last=`echo "$curr_installdir" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    if test -z "$orig_last" || test -z "$curr_last"; then
-      break
-    fi
-    if test "$orig_last" != "$curr_last"; then
-      break
-    fi
-    orig_installdir=`echo "$orig_installdir" | sed -e 's,/[^/]*$,,'`
-    curr_installdir=`echo "$curr_installdir" | sed -e 's,/[^/]*$,,'`
-  done
-  # Now relocate the directory variables that we use.
-  libdir=`echo "$libdir/" | sed -e "s%^${orig_installdir}/%${curr_installdir}/%" | sed -e 's,/$,,'`
-  localedir=`echo "$localedir/" | sed -e "s%^${orig_installdir}/%${curr_installdir}/%" | sed -e 's,/$,,'`
-fi
-
-# Internationalization.
-. gettext.sh
-TEXTDOMAIN=gettext-tools
-export TEXTDOMAIN
-TEXTDOMAINDIR="$localedir"
-export TEXTDOMAINDIR
-
-# Redirect fileno 3 to interactive I/O.
-exec 3>/dev/tty
-
-# Output a prompt.
-if test $# != 0; then
-  echo "$1" 1>&3
-fi
-
-# Find the user name on the local machine.
-user=`id -u -n 2>/dev/null`
-if test -z "$user"; then
-  user="$USER"
-  if test -z "$user"; then
-    user="$LOGNAME"
-    if test -z "$user"; then
-      user=unknown
-    fi
-  fi
-fi
-
-# Find the hostname.
-# hostname on some systems (SVR3.2, old Linux) returns a bogus exit status,
-# so uname gets run too, so we keep only the first line of output.
-#host=`(hostname || uname -n) 2>/dev/null | sed 1q`
-host=`"$libdir"/gettext/hostname --short 2>/dev/null | sed 1q`
-
-# Find the hostname.
-hostfqdn=`"$libdir"/gettext/hostname --fqdn 2>/dev/null | sed 1q`
-
-# Find a list of email addresses from various mailer configuration files.
-# All mailers use configuration files under $HOME. We handle them in a
-# last-modified - first-priority order.
-cd $HOME
-files=""
-
-# ----------------------- BEGIN MAILER SPECIFIC CODE -----------------------
-
-# Mozilla Thunderbird addresses
-files="$files .thunderbird/*/prefs.js"
-
-# Mozilla addresses
-files="$files .mozilla/*/prefs.js"
-
-# Netscape 4 addresses
-files="$files .netscape/liprefs.js .netscape/preferences.js"
-
-# Netscape 3 addresses
-files="$files .netscape/preferences"
-
-# Emacs/XEmacs rmail, Emacs/XEmacs gnus, XEmacs vm addresses
-# XEmacs mew addresses
-files="$files .emacs .emacs.el"
-
-# KDE2 addresses
-files="$files .kde2/share/config/emaildefaults"
-
-# KDE kmail addresses
-files="$files .kde2/share/config/kmailrc"
-
-# GNOME evolution 2 addresses
-files="$files .gconf/apps/evolution/mail/%gconf.xml"
-
-# GNOME evolution 1 addresses
-files="$files evolution/config.xmldb"
-
-# GNOME balsa addresses
-files="$files .gnome/balsa"
-
-# StarOffice and OpenOffice addresses
-sed_dos2unix='s/\r$//'
-sed_soffice51='s,StarOffice 5\.1=\(.*\)$,\1/sofficerc,p'
-sed_soffice52='s,StarOffice 5\.2=\(.*\)$,\1/user/sofficerc,p'
-sed_ooffice='s,^OpenOffice[^=]*=\(.*\)$,\1/user/config/registry/instance/org/openoffice/UserProfile.xml,p'
-files="$files Office51/sofficerc Office52/user/sofficerc "`sed -n -e "$sed_dos2unix" -e "$sed_soffice51" -e "$sed_soffice52" -e "$sed_ooffice" .sversionrc 2>/dev/null | sed -e 's,^file://*,/,'`
-
-# mutt addresses
-files="$files .muttrc"
-
-# pine addresses
-files="$files .pinerc"
-
-# xfmail addresses
-files="$files .xfmail/.xfmailrc"
-
-# tkrat addresses
-files="$files .ratatosk/ratatoskrc"
-
-# ----------------------- END MAILER SPECIFIC CODE -----------------------
-
-# Expand wildcards and remove nonexistent files from the list.
-nfiles=""
-for file in $files; do
-  if test -r "$file" && test ! -d "$file"; then
-    nfiles="$nfiles $file"
-  fi
-done
-files="$nfiles"
-
-addresses=""
-
-if test -n "$files"; then
-
-  for file in `ls -t $files`; do
-
-    case "$file" in
-
-# ----------------------- BEGIN MAILER SPECIFIC CODE -----------------------
-
-      # Mozilla and Mozilla Thunderbird addresses
-      .mozilla/*/prefs.js | .thunderbird/*/prefs.js)
-        addresses="$addresses "`grep -h '^user_pref("mail\.identity\..*\.useremail", ".*");$' $file 2>/dev/null | sed -e 's/^user_pref("mail\.identity\..*\.useremail", "\(.*\)");$/\1/'`
-        ;;
-
-      # Netscape 4 addresses
-      .netscape/liprefs.js | .netscape/preferences.js)
-        addresses="$addresses "`grep -h '^user_pref("mail\.identity\.useremail", ".*");$' $file 2>/dev/null | sed -e 's/^user_pref("mail\.identity\.useremail", "\(.*\)");$/\1/'`
-        ;;
-
-      # Netscape 3 addresses
-      .netscape/preferences)
-        addresses="$addresses "`grep -h '^EMAIL_ADDRESS:' $file 2>/dev/null | sed -e 's/^EMAIL_ADDRESS:[ 	]*//'`
-        ;;
-
-      .emacs | .emacs.el)
-        # Emacs/XEmacs rmail, Emacs/XEmacs gnus, XEmacs vm addresses
-        addresses="$addresses "`grep -h '[ (]user-mail-address "[^"]*"' $file 2>/dev/null | sed -e 's/^.*[ (]user-mail-address "\([^"]*\)".*$/\1/'`
-        # XEmacs mew addresses
-        domains=`grep -h '[ (]mew-mail-domain "[^"]*"' $file 2>/dev/null | sed -e 's/^.*[ (]mew-mail-domain "\([^"]*\)".*$/\1/'`
-        if test -n "$domains"; then
-          for domain in $domains; do
-            addresses="$addresses ${user}@$domain"
-          done
-        fi
-        ;;
-
-      # KDE2 addresses
-      .kde2/share/config/emaildefaults)
-        addresses="$addresses "`grep -h '^EmailAddress=' $file 2>/dev/null | sed -e 's/^EmailAddress=//'`
-        ;;
-
-      # KDE kmail addresses
-      .kde2/share/config/kmailrc)
-        addresses="$addresses "`grep -h '^Email Address=' $file 2>/dev/null | sed -e 's/^Email Address=//'`
-        ;;
-
-      # GNOME evolution 2 addresses
-      .gconf/apps/evolution/mail/%gconf.xml)
-        sedexpr0='s,^.*&lt;addr-spec&gt;\(.*\)&lt;/addr-spec&gt;.*$,\1,p'
-        addresses="$addresses "`sed -n -e "$sedexpr0" < $file`
-        ;;
-
-      # GNOME evolution 1 addresses
-      evolution/config.xmldb)
-        sedexpr0='s/^.*<entry name="identity_address_[0-9]*" type="string" value="\([^"]*\)".*$/\1/p'
-        sedexpr1='s/\(..\)/\\x\1/g'
-        sedexpr2='s,$,\\n,'
-        addresses="$addresses "`sed -n -e "$sedexpr0" < $file | while read hexstring; do printf \`echo "$hexstring" | sed -e "$sedexpr1" -e "$sedexpr2"\`; done`
-        ;;
-
-      # GNOME balsa addresses
-      .gnome/balsa)
-        addresses="$addresses "`grep -h '^Address=' $file 2>/dev/null | sed -e 's/^Address=//'`
-        ;;
-
-      # OpenOffice addresses
-      */UserProfile.xml)
-        addresses="$addresses "`sed -n -e 's,^.*<mail cfg:type="string">\(.*\)</mail>.*$,\1,p' $file 2>/dev/null`
-        ;;
-
-      # StarOffice addresses
-      # Not a typo. They really write "Adress" with a single d.
-      # German orthography...
-      */sofficerc)
-        addresses="$addresses "`grep -h '^User-Adress=' $file 2>/dev/null | sed -e 's/#[^#]*$//' -e 's/^.*#//'`
-        ;;
-
-      # mutt addresses
-      .muttrc)
-        mutt_addresses=`grep -h '^set from="[^"]*"[ 	]*$' $file 2>/dev/null | sed -e 's/^set from="\([^"]*\)"[ 	]*$/\1/'`
-        if test -n "$mutt_addresses"; then
-          addresses="$addresses $mutt_addresses"
-        else
-          # mutt uses $EMAIL as fallback.
-          if test -n "$EMAIL"; then
-            addresses="$addresses $EMAIL"
-          fi
-        fi
-        ;;
-
-      # pine addresses
-      .pinerc)
-        domains=`grep -h '^user-domain=' $file 2>/dev/null | sed -e 's/^user-domain=//'`
-        if test -n "$domains"; then
-          for domain in $domains; do
-            addresses="$addresses ${user}@$domain"
-          done
-        else
-          # The use-only-domain-name option is only used if the user-domain option is not present.
-          domains=`grep -h '^use-only-domain-name=' $file 2>/dev/null | sed -e 's/^use-only-domain-name=//'`
-          if test "Yes" = "$domains"; then
-            addresses="$addresses ${user}@"`echo "$hostfqdn" | sed -e 's/^[^.]*\.//'`
-          fi
-        fi
-        ;;
-
-      # xfmail addresses
-      .xfmail/.xfmailrc)
-        addresses="$addresses "`grep -h '^from=.*<.*>' $file 2>/dev/null | sed -e 's/^.*<\([^<>]*\)>.*$/\1/'`
-        ;;
-
-      # tkrat addresses
-      .ratatosk/ratatoskrc)
-        domains=`grep -h '^set option(masquerade_as) ' $file 2>/dev/null | sed -e 's/^set option(masquerade_as) //'`
-        if test -n "$domains"; then
-          for domain in $domains; do
-            addresses="$addresses ${user}@$domain"
-          done
-        else
-          # The domain option is used only if the masquerade_as option is not present.
-          domains=`grep -h '^set option(domain) ' $file 2>/dev/null | sed -e 's/^set option(domain) //'`
-          if test -n "$domains"; then
-            for domain in $domains; do
-              addresses="$addresses ${user}@${host}.$domain"
-            done
-          fi
-        fi
-        ;;
-
-# ----------------------- END MAILER SPECIFIC CODE -----------------------
-
-    esac
-
-  done
-
-fi
-
-# Some Debian systems have a file /etc/mailname.
-if test -r /etc/mailname; then
-  hostmailname=`cat /etc/mailname`
-  if test -n "$hostmailname"; then
-    addresses="$addresses ${user}@$hostmailname"
-  fi
-fi
-
-# SuSE Linux >= 8.0 systems have a file /etc/sysconfig/mail.
-if test -r /etc/sysconfig/mail; then
-  hostmailname=`. /etc/sysconfig/mail && echo "$FROM_HEADER"`
-  if test -n "$hostmailname"; then
-    addresses="$addresses ${user}@$hostmailname"
-  fi
-fi
-
-# elm has no user-defined addresses.
-# mailx has no user-defined addresses.
-# mh has no user-defined addresses.
-# They use the system default.
-addresses="$addresses ${user}@$hostfqdn"
-
-# Normalize addresses: remove addresses without @, lowercase the part after @,
-# and remove duplicates.
-lowercase_sed='{
-h
-s/^[^@]*@\(.*\)$/\1/
-y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-x
-s/^\([^@]*\)@.*/\1@/
-G
-s/\
-//
-p
-}'
-naddresses=""
-for addr in $addresses; do
-  case "$addr" in
-    "<"*">") addr=`echo "$addr" | sed -e 's/^<//' -e 's/>$//'` ;;
-  esac
-  case "$addr" in
-    *@*)
-      addr=`echo "$addr" | sed -n -e "$lowercase_sed"`
-      case " $naddresses " in
-        *" $addr "*) ;;
-        *) naddresses="$naddresses $addr" ;;
-      esac
-      ;;
-  esac
-done
-addresses="$naddresses"
-
-# Now it's time to ask the user.
-case "$addresses" in
-  " "*" "*)
-    # At least two addresses.
-    lines=""
-    i=0
-    for addr in $addresses; do
-      i=`expr $i + 1`
-      lines="${lines}${i} ${addr}
-"
-    done
-    while true; do
-      { gettext "Which is your email address?"; echo; } 1>&3
-      echo "$lines" 1>&3
-      { gettext "Please choose the number, or enter your email address."; echo; } 1>&3
-      read answer < /dev/tty
-      case "$answer" in
-        *@*) ;;
-        [0-9]*)
-          i=0
-          for addr in $addresses; do
-            i=`expr $i + 1`
-            if test "$i" = "$answer"; then
-              break 2
-            fi
-          done
-          ;;
-      esac
-      case "$answer" in
-        "<"*">") answer=`echo "$answer" | sed -e 's/^<//' -e 's/>$//'` ;;
-      esac
-      case "$answer" in
-        *" "*) { gettext "Invalid email address: invalid character."; echo; echo; } 1>&3 ; continue ;;
-        *@*.*) ;;
-        *@*) { gettext "Invalid email address: need a fully qualified host name or domain name."; echo; echo; } 1>&3 ; continue ;;
-        *) { gettext "Invalid email address: missing @"; echo; echo; } 1>&3 ; continue ;;
-      esac
-      addr=`echo "$answer" | sed -n -e "$lowercase_sed"`
-      break
-    done
-    ;;
-  " "*)
-    # One address.
-    while true; do
-      { gettext "Is the following your email address?"; echo; } 1>&3
-      echo " $addresses" 1>&3
-      { gettext "Please confirm by pressing Return, or enter your email address."; echo; } 1>&3
-      read answer < /dev/tty
-      if test -z "$answer"; then
-        addr=`echo "$addresses" | sed -e 's/^ //'`
-        break
-      fi
-      case "$answer" in
-        "<"*">") answer=`echo "$answer" | sed -e 's/^<//' -e 's/>$//'` ;;
-      esac
-      case "$answer" in
-        *" "*) { gettext "Invalid email address: invalid character."; echo; echo; } 1>&3 ; continue ;;
-        *@*.*) ;;
-        *@*) { gettext "Invalid email address: need a fully qualified host name or domain name."; echo; echo; } 1>&3 ; continue ;;
-        *) { gettext "Invalid email address: missing @"; echo; echo; } 1>&3 ; continue ;;
-      esac
-      addr=`echo "$answer" | sed -n -e "$lowercase_sed"`
-      break
-    done
-    ;;
-  "")
-    # No address.
-    { gettext "Couldn't find out about your email address."; echo; } 1>&3
-    while true; do
-      { gettext "Please enter your email address."; echo; } 1>&3
-      read answer < /dev/tty
-      case "$answer" in
-        "<"*">") answer=`echo "$answer" | sed -e 's/^<//' -e 's/>$//'` ;;
-      esac
-      case "$answer" in
-        *" "*) { gettext "Invalid email address: invalid character."; echo; echo; } 1>&3 ; continue ;;
-        *@*.*) ;;
-        *@*) { gettext "Invalid email address: need a fully qualified host name or domain name."; echo; echo; } 1>&3 ; continue ;;
-        *) { gettext "Invalid email address: missing @"; echo; echo; } 1>&3 ; continue ;;
-      esac
-      addr=`echo "$answer" | sed -n -e "$lowercase_sed"`
-      break
-    done
-    ;;
-  *) echo "internal error" 1>&3 ; exit 1 ;;
-esac
-
-# Print to standard output.
-echo "$addr"
diff --git a/libs/gettext/lib32/libasprintf.dll.a b/libs/gettext/lib32/libasprintf.dll.a
deleted file mode 100644
index d83727061..000000000
Binary files a/libs/gettext/lib32/libasprintf.dll.a and /dev/null differ
diff --git a/libs/gettext/lib32/libgettextlib.dll.a b/libs/gettext/lib32/libgettextlib.dll.a
deleted file mode 100644
index 5b1c93d8a..000000000
Binary files a/libs/gettext/lib32/libgettextlib.dll.a and /dev/null differ
diff --git a/libs/gettext/lib32/libgettextpo.dll.a b/libs/gettext/lib32/libgettextpo.dll.a
deleted file mode 100644
index b4e858aab..000000000
Binary files a/libs/gettext/lib32/libgettextpo.dll.a and /dev/null differ
diff --git a/libs/gettext/lib32/libgettextsrc.dll.a b/libs/gettext/lib32/libgettextsrc.dll.a
deleted file mode 100644
index 83425c51f..000000000
Binary files a/libs/gettext/lib32/libgettextsrc.dll.a and /dev/null differ
diff --git a/libs/gettext/lib32/libintl.dll.a b/libs/gettext/lib32/libintl.dll.a
deleted file mode 100644
index 9e595475f..000000000
Binary files a/libs/gettext/lib32/libintl.dll.a and /dev/null differ
diff --git a/libs/gettext/lib64/gettext/hostname.exe b/libs/gettext/lib64/gettext/hostname.exe
deleted file mode 100644
index afc31abd8..000000000
Binary files a/libs/gettext/lib64/gettext/hostname.exe and /dev/null differ
diff --git a/libs/gettext/lib64/gettext/project-id b/libs/gettext/lib64/gettext/project-id
deleted file mode 100755
index 496f466c9..000000000
--- a/libs/gettext/lib64/gettext/project-id
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-# Prints a package's identification PACKAGE VERSION or PACKAGE.
-#
-# Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
-#
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-want_version="$1"
-
-# NLS nuisances: Letter ranges are different in the Estonian locale.
-LC_ALL=C
-
-while true; do
-  if test -f configure; then
-    package=`(grep '^PACKAGE_NAME=' configure; grep '^ *PACKAGE=' configure) | grep -v '=[ 	]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`
-    case "$package" in
-      *[\"\$\`\{\}]*)
-        # Some packages (gcal) retrieve the package name dynamically.
-        package=
-        ;;
-    esac
-    if test -n "$package"; then
-      is_gnu=`LC_ALL=C grep "GNU $package" * 2>/dev/null | grep -v '^libtool:'`
-      if test -n "$is_gnu"; then
-        package="GNU $package"
-      fi
-      if test -n "$want_version"; then
-        version=`(grep '^PACKAGE_VERSION=' configure; grep '^ *VERSION=' configure) | grep -v '=[ 	]*$' | sed -e '1q' | sed -e 's/^[^=]*=//' | sed -e "s/^'//" -e "s/'$//"`
-        case "$version" in
-          *[\"\$\`\{\}]*)
-            # Some packages (gcal, gcc, clisp) retrieve the version dynamically.
-            version=
-            ;;
-        esac
-        if test -n "$version"; then
-          echo "$package $version"
-        else
-          echo "$package"
-        fi
-      else
-        echo "$package"
-      fi
-      exit 0
-    fi
-  fi
-  dir=`basename \`pwd\``
-  case "$dir" in
-    i18n)
-      # This directory name, used in GNU make, is not the top level directory.
-      ;;
-    *[A-Za-z]*[0-9]*)
-      package=`echo "$dir" | sed -e 's/^\([^0-9]*\)[0-9].*$/\1/' -e 's/[-_]$//'`
-      if test -n "$want_version"; then
-        version=`echo "$dir" | sed -e 's/^[^0-9]*\([0-9].*\)$/\1/'`
-        echo "$package $version"
-      else
-        echo "$package"
-      fi
-      exit 0
-      ;;
-  esac
-  # Go to parent directory
-  last=`/bin/pwd`
-  cd ..
-  curr=`/bin/pwd`
-  if test "$last" = "$curr"; then
-    # Oops, didn't find the package name.
-    if test -n "$want_version"; then
-      echo "PACKAGE VERSION"
-    else
-      echo "PACKAGE"
-    fi
-    exit 0
-  fi
-done
diff --git a/libs/gettext/lib64/gettext/urlget.exe b/libs/gettext/lib64/gettext/urlget.exe
deleted file mode 100644
index 8f1d6b405..000000000
Binary files a/libs/gettext/lib64/gettext/urlget.exe and /dev/null differ
diff --git a/libs/gettext/lib64/gettext/user-email b/libs/gettext/lib64/gettext/user-email
deleted file mode 100755
index 7d2d679bc..000000000
--- a/libs/gettext/lib64/gettext/user-email
+++ /dev/null
@@ -1,436 +0,0 @@
-#!/bin/sh
-# Prints the user's email address, with confirmation from the user.
-#
-# Copyright (C) 2001-2003, 2005 Free Software Foundation, Inc.
-#
-# 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 3 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Prerequisites for using ${exec_prefix}/lib and ${datarootdir}/locale.
-prefix="/usr/local/x86_64-w64-mingw32/stow/gettext-0.18.1.1"
-exec_prefix="${prefix}"
-datarootdir="${prefix}/share"
-datadir="${datarootdir}"
-# Set variables libdir, localedir.
-libdir="${exec_prefix}/lib"
-localedir="${datarootdir}/locale"
-
-# Support for relocatability.
-if test "no" = yes; then
-  orig_installdir="$libdir"/gettext # see Makefile.am's install rule
-  # Determine curr_installdir without caring for symlinked callers.
-  curr_installdir=`echo "$0" | sed -e 's,/[^/]*$,,'`
-  curr_installdir=`cd "$curr_installdir" && pwd`
-  # Compute the original/current installation prefixes by stripping the
-  # trailing directories off the original/current installation directories.
-  while true; do
-    orig_last=`echo "$orig_installdir" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    curr_last=`echo "$curr_installdir" | sed -n -e 's,^.*/\([^/]*\)$,\1,p'`
-    if test -z "$orig_last" || test -z "$curr_last"; then
-      break
-    fi
-    if test "$orig_last" != "$curr_last"; then
-      break
-    fi
-    orig_installdir=`echo "$orig_installdir" | sed -e 's,/[^/]*$,,'`
-    curr_installdir=`echo "$curr_installdir" | sed -e 's,/[^/]*$,,'`
-  done
-  # Now relocate the directory variables that we use.
-  libdir=`echo "$libdir/" | sed -e "s%^${orig_installdir}/%${curr_installdir}/%" | sed -e 's,/$,,'`
-  localedir=`echo "$localedir/" | sed -e "s%^${orig_installdir}/%${curr_installdir}/%" | sed -e 's,/$,,'`
-fi
-
-# Internationalization.
-. gettext.sh
-TEXTDOMAIN=gettext-tools
-export TEXTDOMAIN
-TEXTDOMAINDIR="$localedir"
-export TEXTDOMAINDIR
-
-# Redirect fileno 3 to interactive I/O.
-exec 3>/dev/tty
-
-# Output a prompt.
-if test $# != 0; then
-  echo "$1" 1>&3
-fi
-
-# Find the user name on the local machine.
-user=`id -u -n 2>/dev/null`
-if test -z "$user"; then
-  user="$USER"
-  if test -z "$user"; then
-    user="$LOGNAME"
-    if test -z "$user"; then
-      user=unknown
-    fi
-  fi
-fi
-
-# Find the hostname.
-# hostname on some systems (SVR3.2, old Linux) returns a bogus exit status,
-# so uname gets run too, so we keep only the first line of output.
-#host=`(hostname || uname -n) 2>/dev/null | sed 1q`
-host=`"$libdir"/gettext/hostname --short 2>/dev/null | sed 1q`
-
-# Find the hostname.
-hostfqdn=`"$libdir"/gettext/hostname --fqdn 2>/dev/null | sed 1q`
-
-# Find a list of email addresses from various mailer configuration files.
-# All mailers use configuration files under $HOME. We handle them in a
-# last-modified - first-priority order.
-cd $HOME
-files=""
-
-# ----------------------- BEGIN MAILER SPECIFIC CODE -----------------------
-
-# Mozilla Thunderbird addresses
-files="$files .thunderbird/*/prefs.js"
-
-# Mozilla addresses
-files="$files .mozilla/*/prefs.js"
-
-# Netscape 4 addresses
-files="$files .netscape/liprefs.js .netscape/preferences.js"
-
-# Netscape 3 addresses
-files="$files .netscape/preferences"
-
-# Emacs/XEmacs rmail, Emacs/XEmacs gnus, XEmacs vm addresses
-# XEmacs mew addresses
-files="$files .emacs .emacs.el"
-
-# KDE2 addresses
-files="$files .kde2/share/config/emaildefaults"
-
-# KDE kmail addresses
-files="$files .kde2/share/config/kmailrc"
-
-# GNOME evolution 2 addresses
-files="$files .gconf/apps/evolution/mail/%gconf.xml"
-
-# GNOME evolution 1 addresses
-files="$files evolution/config.xmldb"
-
-# GNOME balsa addresses
-files="$files .gnome/balsa"
-
-# StarOffice and OpenOffice addresses
-sed_dos2unix='s/\r$//'
-sed_soffice51='s,StarOffice 5\.1=\(.*\)$,\1/sofficerc,p'
-sed_soffice52='s,StarOffice 5\.2=\(.*\)$,\1/user/sofficerc,p'
-sed_ooffice='s,^OpenOffice[^=]*=\(.*\)$,\1/user/config/registry/instance/org/openoffice/UserProfile.xml,p'
-files="$files Office51/sofficerc Office52/user/sofficerc "`sed -n -e "$sed_dos2unix" -e "$sed_soffice51" -e "$sed_soffice52" -e "$sed_ooffice" .sversionrc 2>/dev/null | sed -e 's,^file://*,/,'`
-
-# mutt addresses
-files="$files .muttrc"
-
-# pine addresses
-files="$files .pinerc"
-
-# xfmail addresses
-files="$files .xfmail/.xfmailrc"
-
-# tkrat addresses
-files="$files .ratatosk/ratatoskrc"
-
-# ----------------------- END MAILER SPECIFIC CODE -----------------------
-
-# Expand wildcards and remove nonexistent files from the list.
-nfiles=""
-for file in $files; do
-  if test -r "$file" && test ! -d "$file"; then
-    nfiles="$nfiles $file"
-  fi
-done
-files="$nfiles"
-
-addresses=""
-
-if test -n "$files"; then
-
-  for file in `ls -t $files`; do
-
-    case "$file" in
-
-# ----------------------- BEGIN MAILER SPECIFIC CODE -----------------------
-
-      # Mozilla and Mozilla Thunderbird addresses
-      .mozilla/*/prefs.js | .thunderbird/*/prefs.js)
-        addresses="$addresses "`grep -h '^user_pref("mail\.identity\..*\.useremail", ".*");$' $file 2>/dev/null | sed -e 's/^user_pref("mail\.identity\..*\.useremail", "\(.*\)");$/\1/'`
-        ;;
-
-      # Netscape 4 addresses
-      .netscape/liprefs.js | .netscape/preferences.js)
-        addresses="$addresses "`grep -h '^user_pref("mail\.identity\.useremail", ".*");$' $file 2>/dev/null | sed -e 's/^user_pref("mail\.identity\.useremail", "\(.*\)");$/\1/'`
-        ;;
-
-      # Netscape 3 addresses
-      .netscape/preferences)
-        addresses="$addresses "`grep -h '^EMAIL_ADDRESS:' $file 2>/dev/null | sed -e 's/^EMAIL_ADDRESS:[ 	]*//'`
-        ;;
-
-      .emacs | .emacs.el)
-        # Emacs/XEmacs rmail, Emacs/XEmacs gnus, XEmacs vm addresses
-        addresses="$addresses "`grep -h '[ (]user-mail-address "[^"]*"' $file 2>/dev/null | sed -e 's/^.*[ (]user-mail-address "\([^"]*\)".*$/\1/'`
-        # XEmacs mew addresses
-        domains=`grep -h '[ (]mew-mail-domain "[^"]*"' $file 2>/dev/null | sed -e 's/^.*[ (]mew-mail-domain "\([^"]*\)".*$/\1/'`
-        if test -n "$domains"; then
-          for domain in $domains; do
-            addresses="$addresses ${user}@$domain"
-          done
-        fi
-        ;;
-
-      # KDE2 addresses
-      .kde2/share/config/emaildefaults)
-        addresses="$addresses "`grep -h '^EmailAddress=' $file 2>/dev/null | sed -e 's/^EmailAddress=//'`
-        ;;
-
-      # KDE kmail addresses
-      .kde2/share/config/kmailrc)
-        addresses="$addresses "`grep -h '^Email Address=' $file 2>/dev/null | sed -e 's/^Email Address=//'`
-        ;;
-
-      # GNOME evolution 2 addresses
-      .gconf/apps/evolution/mail/%gconf.xml)
-        sedexpr0='s,^.*&lt;addr-spec&gt;\(.*\)&lt;/addr-spec&gt;.*$,\1,p'
-        addresses="$addresses "`sed -n -e "$sedexpr0" < $file`
-        ;;
-
-      # GNOME evolution 1 addresses
-      evolution/config.xmldb)
-        sedexpr0='s/^.*<entry name="identity_address_[0-9]*" type="string" value="\([^"]*\)".*$/\1/p'
-        sedexpr1='s/\(..\)/\\x\1/g'
-        sedexpr2='s,$,\\n,'
-        addresses="$addresses "`sed -n -e "$sedexpr0" < $file | while read hexstring; do printf \`echo "$hexstring" | sed -e "$sedexpr1" -e "$sedexpr2"\`; done`
-        ;;
-
-      # GNOME balsa addresses
-      .gnome/balsa)
-        addresses="$addresses "`grep -h '^Address=' $file 2>/dev/null | sed -e 's/^Address=//'`
-        ;;
-
-      # OpenOffice addresses
-      */UserProfile.xml)
-        addresses="$addresses "`sed -n -e 's,^.*<mail cfg:type="string">\(.*\)</mail>.*$,\1,p' $file 2>/dev/null`
-        ;;
-
-      # StarOffice addresses
-      # Not a typo. They really write "Adress" with a single d.
-      # German orthography...
-      */sofficerc)
-        addresses="$addresses "`grep -h '^User-Adress=' $file 2>/dev/null | sed -e 's/#[^#]*$//' -e 's/^.*#//'`
-        ;;
-
-      # mutt addresses
-      .muttrc)
-        mutt_addresses=`grep -h '^set from="[^"]*"[ 	]*$' $file 2>/dev/null | sed -e 's/^set from="\([^"]*\)"[ 	]*$/\1/'`
-        if test -n "$mutt_addresses"; then
-          addresses="$addresses $mutt_addresses"
-        else
-          # mutt uses $EMAIL as fallback.
-          if test -n "$EMAIL"; then
-            addresses="$addresses $EMAIL"
-          fi
-        fi
-        ;;
-
-      # pine addresses
-      .pinerc)
-        domains=`grep -h '^user-domain=' $file 2>/dev/null | sed -e 's/^user-domain=//'`
-        if test -n "$domains"; then
-          for domain in $domains; do
-            addresses="$addresses ${user}@$domain"
-          done
-        else
-          # The use-only-domain-name option is only used if the user-domain option is not present.
-          domains=`grep -h '^use-only-domain-name=' $file 2>/dev/null | sed -e 's/^use-only-domain-name=//'`
-          if test "Yes" = "$domains"; then
-            addresses="$addresses ${user}@"`echo "$hostfqdn" | sed -e 's/^[^.]*\.//'`
-          fi
-        fi
-        ;;
-
-      # xfmail addresses
-      .xfmail/.xfmailrc)
-        addresses="$addresses "`grep -h '^from=.*<.*>' $file 2>/dev/null | sed -e 's/^.*<\([^<>]*\)>.*$/\1/'`
-        ;;
-
-      # tkrat addresses
-      .ratatosk/ratatoskrc)
-        domains=`grep -h '^set option(masquerade_as) ' $file 2>/dev/null | sed -e 's/^set option(masquerade_as) //'`
-        if test -n "$domains"; then
-          for domain in $domains; do
-            addresses="$addresses ${user}@$domain"
-          done
-        else
-          # The domain option is used only if the masquerade_as option is not present.
-          domains=`grep -h '^set option(domain) ' $file 2>/dev/null | sed -e 's/^set option(domain) //'`
-          if test -n "$domains"; then
-            for domain in $domains; do
-              addresses="$addresses ${user}@${host}.$domain"
-            done
-          fi
-        fi
-        ;;
-
-# ----------------------- END MAILER SPECIFIC CODE -----------------------
-
-    esac
-
-  done
-
-fi
-
-# Some Debian systems have a file /etc/mailname.
-if test -r /etc/mailname; then
-  hostmailname=`cat /etc/mailname`
-  if test -n "$hostmailname"; then
-    addresses="$addresses ${user}@$hostmailname"
-  fi
-fi
-
-# SuSE Linux >= 8.0 systems have a file /etc/sysconfig/mail.
-if test -r /etc/sysconfig/mail; then
-  hostmailname=`. /etc/sysconfig/mail && echo "$FROM_HEADER"`
-  if test -n "$hostmailname"; then
-    addresses="$addresses ${user}@$hostmailname"
-  fi
-fi
-
-# elm has no user-defined addresses.
-# mailx has no user-defined addresses.
-# mh has no user-defined addresses.
-# They use the system default.
-addresses="$addresses ${user}@$hostfqdn"
-
-# Normalize addresses: remove addresses without @, lowercase the part after @,
-# and remove duplicates.
-lowercase_sed='{
-h
-s/^[^@]*@\(.*\)$/\1/
-y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-x
-s/^\([^@]*\)@.*/\1@/
-G
-s/\
-//
-p
-}'
-naddresses=""
-for addr in $addresses; do
-  case "$addr" in
-    "<"*">") addr=`echo "$addr" | sed -e 's/^<//' -e 's/>$//'` ;;
-  esac
-  case "$addr" in
-    *@*)
-      addr=`echo "$addr" | sed -n -e "$lowercase_sed"`
-      case " $naddresses " in
-        *" $addr "*) ;;
-        *) naddresses="$naddresses $addr" ;;
-      esac
-      ;;
-  esac
-done
-addresses="$naddresses"
-
-# Now it's time to ask the user.
-case "$addresses" in
-  " "*" "*)
-    # At least two addresses.
-    lines=""
-    i=0
-    for addr in $addresses; do
-      i=`expr $i + 1`
-      lines="${lines}${i} ${addr}
-"
-    done
-    while true; do
-      { gettext "Which is your email address?"; echo; } 1>&3
-      echo "$lines" 1>&3
-      { gettext "Please choose the number, or enter your email address."; echo; } 1>&3
-      read answer < /dev/tty
-      case "$answer" in
-        *@*) ;;
-        [0-9]*)
-          i=0
-          for addr in $addresses; do
-            i=`expr $i + 1`
-            if test "$i" = "$answer"; then
-              break 2
-            fi
-          done
-          ;;
-      esac
-      case "$answer" in
-        "<"*">") answer=`echo "$answer" | sed -e 's/^<//' -e 's/>$//'` ;;
-      esac
-      case "$answer" in
-        *" "*) { gettext "Invalid email address: invalid character."; echo; echo; } 1>&3 ; continue ;;
-        *@*.*) ;;
-        *@*) { gettext "Invalid email address: need a fully qualified host name or domain name."; echo; echo; } 1>&3 ; continue ;;
-        *) { gettext "Invalid email address: missing @"; echo; echo; } 1>&3 ; continue ;;
-      esac
-      addr=`echo "$answer" | sed -n -e "$lowercase_sed"`
-      break
-    done
-    ;;
-  " "*)
-    # One address.
-    while true; do
-      { gettext "Is the following your email address?"; echo; } 1>&3
-      echo " $addresses" 1>&3
-      { gettext "Please confirm by pressing Return, or enter your email address."; echo; } 1>&3
-      read answer < /dev/tty
-      if test -z "$answer"; then
-        addr=`echo "$addresses" | sed -e 's/^ //'`
-        break
-      fi
-      case "$answer" in
-        "<"*">") answer=`echo "$answer" | sed -e 's/^<//' -e 's/>$//'` ;;
-      esac
-      case "$answer" in
-        *" "*) { gettext "Invalid email address: invalid character."; echo; echo; } 1>&3 ; continue ;;
-        *@*.*) ;;
-        *@*) { gettext "Invalid email address: need a fully qualified host name or domain name."; echo; echo; } 1>&3 ; continue ;;
-        *) { gettext "Invalid email address: missing @"; echo; echo; } 1>&3 ; continue ;;
-      esac
-      addr=`echo "$answer" | sed -n -e "$lowercase_sed"`
-      break
-    done
-    ;;
-  "")
-    # No address.
-    { gettext "Couldn't find out about your email address."; echo; } 1>&3
-    while true; do
-      { gettext "Please enter your email address."; echo; } 1>&3
-      read answer < /dev/tty
-      case "$answer" in
-        "<"*">") answer=`echo "$answer" | sed -e 's/^<//' -e 's/>$//'` ;;
-      esac
-      case "$answer" in
-        *" "*) { gettext "Invalid email address: invalid character."; echo; echo; } 1>&3 ; continue ;;
-        *@*.*) ;;
-        *@*) { gettext "Invalid email address: need a fully qualified host name or domain name."; echo; echo; } 1>&3 ; continue ;;
-        *) { gettext "Invalid email address: missing @"; echo; echo; } 1>&3 ; continue ;;
-      esac
-      addr=`echo "$answer" | sed -n -e "$lowercase_sed"`
-      break
-    done
-    ;;
-  *) echo "internal error" 1>&3 ; exit 1 ;;
-esac
-
-# Print to standard output.
-echo "$addr"
diff --git a/libs/gettext/lib64/libasprintf.a b/libs/gettext/lib64/libasprintf.a
deleted file mode 100644
index 7988c40bf..000000000
Binary files a/libs/gettext/lib64/libasprintf.a and /dev/null differ
diff --git a/libs/gettext/lib64/libgettextpo.a b/libs/gettext/lib64/libgettextpo.a
deleted file mode 100644
index bf824d464..000000000
Binary files a/libs/gettext/lib64/libgettextpo.a and /dev/null differ
diff --git a/libs/gettext/lib64/libintl.a b/libs/gettext/lib64/libintl.a
deleted file mode 100644
index 42794ae61..000000000
Binary files a/libs/gettext/lib64/libintl.a and /dev/null differ
diff --git a/libs/libbacktrace/include/backtrace.h b/libs/libbacktrace/include/backtrace.h
index 69cea4ca1..cfbc1c57d 100644
--- a/libs/libbacktrace/include/backtrace.h
+++ b/libs/libbacktrace/include/backtrace.h
@@ -1,5 +1,9 @@
 /* backtrace.h -- Public header file for stack backtrace library.
+<<<<<<< HEAD
    Copyright (C) 2012-2021 Free Software Foundation, Inc.
+=======
+   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+>>>>>>> Saturn-Next
    Written by Ian Lance Taylor, Google.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/objs/.gitignore b/objs/.gitignore
deleted file mode 100644
index 35ecd6def..000000000
--- a/objs/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-#All folders
-SRB2.res
-depend.dep
-depend.ped
-*.o
-#VC9 folder only
-/VC9/Win32
-/VC9/x64
diff --git a/objs/FreeBSD/SDL/Debug/.gitignore b/objs/FreeBSD/SDL/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/FreeBSD/SDL/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/FreeBSD/SDL/Release/.gitignore b/objs/FreeBSD/SDL/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/FreeBSD/SDL/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Linux/SDL/Debug/.gitignore b/objs/Linux/SDL/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Linux/SDL/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Linux/SDL/Release/.gitignore b/objs/Linux/SDL/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Linux/SDL/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Linux64/SDL/Debug/.gitignore b/objs/Linux64/SDL/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Linux64/SDL/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Linux64/SDL/Release/.gitignore b/objs/Linux64/SDL/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Linux64/SDL/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/MasterClient/.gitignore b/objs/MasterClient/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/MasterClient/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/MasterServer/.gitignore b/objs/MasterServer/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/MasterServer/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Mingw/Debug/.gitignore b/objs/Mingw/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Mingw/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Mingw/Release/.gitignore b/objs/Mingw/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Mingw/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Mingw/SDL/Debug/.gitignore b/objs/Mingw/SDL/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Mingw/SDL/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Mingw/SDL/Release/.gitignore b/objs/Mingw/SDL/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Mingw/SDL/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Mingw64/Debug/.gitignore b/objs/Mingw64/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Mingw64/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Mingw64/Release/.gitignore b/objs/Mingw64/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Mingw64/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Mingw64/SDL/Debug/.gitignore b/objs/Mingw64/SDL/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Mingw64/SDL/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/Mingw64/SDL/Release/.gitignore b/objs/Mingw64/SDL/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/Mingw64/SDL/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/SDL/Release/.gitignore b/objs/SDL/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/SDL/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/cygwin/Debug/.gitignore b/objs/cygwin/Debug/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/cygwin/Debug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/cygwin/Release/.gitignore b/objs/cygwin/Release/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/cygwin/Release/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/objs/dummy/.gitignore b/objs/dummy/.gitignore
deleted file mode 100644
index 42c6dc2c6..000000000
--- a/objs/dummy/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
diff --git a/src/.gitignore b/src/.gitignore
index da5a1fff2..156f6f65f 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,2 +1,3 @@
 /cscope.out
-/srb2wii
+*.json
+*.idx
diff --git a/src/Android.mk b/src/Android.mk
index 035d48887..1d0603e6f 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -28,6 +28,7 @@ LOCAL_SRC_FILES :=      am_map.c \
                         m_cheat.c \
                         m_fixed.c \
                         m_menu.c \
+						m_textinput.c \
                         m_misc.c \
                         m_queue.c \
                         m_random.c \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 258ff882c..008a4c6d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # SRB2 Core
 
 # Core sources
@@ -549,3 +550,578 @@ add_subdirectory(sdl)
 if(NOT ${SRB2_SDL2_AVAILABLE} AND NOT ${SRB2_WIN32_AVAILABLE})
 	message(FATAL_ERROR "There are no targets available to build an SRB2Kart executable. :(")
 endif()
+=======
+# SRB2 Core
+
+# Core sources
+set(SRB2_CORE_SOURCES
+	am_map.c
+	b_bot.c
+	command.c
+	comptime.c
+	console.c
+	d_clisrv.c
+	d_main.c
+	d_net.c
+	d_netcmd.c
+	d_netfil.c
+	d_protocol.c
+	dehacked.c
+	f_finale.c
+	f_wipe.c
+	filesrch.c
+	g_game.c
+	g_input.c
+	hu_stuff.c
+	i_tcp.c
+	info.c
+	lzf.c
+	m_aatree.c
+	m_anigif.c
+	m_argv.c
+	m_bbox.c
+	m_cheat.c
+	m_cond.c
+	m_fixed.c
+	m_menu.c
+	m_textinput.c
+	m_misc.c
+	m_perfstats.c
+	m_queue.c
+	m_random.c
+	md5.c
+	mserv.c
+	http-mserv.c
+	qs22j.c
+	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.c
+)
+
+set(SRB2_CORE_HEADERS
+	am_map.h
+	b_bot.h
+	byteptr.h
+	command.h
+	console.h
+	d_clisrv.h
+	d_event.h
+	d_main.h
+	d_net.h
+	d_netcmd.h
+	d_netfil.h
+	d_player.h
+	d_protocol.h
+	d_think.h
+	d_ticcmd.h
+	dehacked.h
+	doomdata.h
+	doomdef.h
+	doomstat.h
+	doomtype.h
+	endian.h
+	f_finale.h
+	fastcmp.h
+	filesrch.h
+	g_game.h
+	g_input.h
+	g_state.h
+	hu_stuff.h
+	i_joy.h
+	i_net.h
+	i_sound.h
+	i_system.h
+	i_tcp.h
+	i_time.h
+	i_video.h
+	info.h
+	keys.h
+	lzf.h
+	m_aatree.h
+	m_anigif.h
+	m_argv.h
+	m_bbox.h
+	m_cheat.h
+	m_cond.h
+	m_dllist.h
+	m_fixed.h
+	m_menu.h
+	m_textinput.h
+	m_misc.h
+	m_queue.h
+	m_perfstats.h
+	m_random.h
+	m_swap.h
+	md5.h
+	mserv.h
+	qs22j.h
+	s_sound.h
+	screen.h
+	sounds.h
+	st_stuff.h
+	tables.h
+	v_video.h
+	w_wad.h
+	y_inter.h
+	z_zone.h
+
+	config.h.in
+)
+
+set(SRB2_CORE_RENDER_SOURCES
+	r_bsp.c
+	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_sky.c
+	r_splats.c
+	r_things.c
+	r_portal.c
+
+	r_bsp.h
+	r_data.h
+	r_defs.h
+	r_draw.h
+	r_fps.h
+	r_local.h
+	r_main.h
+	r_patch.h
+	r_patchrotation.h
+	r_plane.h
+	r_segs.h
+	r_sky.h
+	r_splats.h
+	r_state.h
+	r_things.h
+	r_portal.h
+)
+
+set(SRB2_CORE_GAME_SOURCES
+	p_ceilng.c
+	p_enemy.c
+	p_floor.c
+	p_inter.c
+	p_lights.c
+	p_map.c
+	p_maputl.c
+	p_mobj.c
+	p_polyobj.c
+	p_saveg.c
+	p_setup.c
+	p_sight.c
+	p_slopes.c
+	p_spec.c
+	p_telept.c
+	p_tick.c
+	p_user.c
+	k_director.c
+	k_kart.c
+	k_stats.c
+	i_time.c
+
+	p_local.h
+	p_maputl.h
+	p_mobj.h
+	p_polyobj.h
+	p_pspr.h
+	p_saveg.h
+	p_setup.h
+	p_slopes.h
+	p_spec.h
+	p_tick.h
+	k_director.h
+	k_kart.h
+	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)
+prepend_sources(SRB2_CORE_GAME_SOURCES)
+
+set(SRB2_CORE_HEADERS ${SRB2_CORE_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+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})
+
+### Configuration
+set(SRB2_CONFIG_HAVE_BLUA ON CACHE BOOL
+	"Enable Lua interpreter support")
+set(SRB2_CONFIG_HAVE_PNG ON CACHE BOOL
+	"Enable PNG support. Depends on zlib, so will be disabled if you don't enable that too.")
+set(SRB2_CONFIG_HAVE_ZLIB ON CACHE BOOL
+	"Enable zlib support.")
+set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL
+	"Enable GME support.")
+set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL
+	"Enable OpenMPT support.")
+set(SRB2_CONFIG_HAVE_DISCORDRPC OFF CACHE BOOL
+	"Enable Discord rich presence support.")
+set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL
+	"Enable curl support, used for downloading files via HTTP.")
+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.")
+
+if(${SRB2_CONFIG_DEDICATED})
+	set(SRB2_CONFIG_HAVE_GME NO)
+	set(SRB2_CONFIG_HAVE_OPENMPT NO)
+	set(SRB2_CONFIG_HWRENDER NO)
+endif()
+
+### use internal libraries?
+if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only
+	set(SRB2_CONFIG_USE_INTERNAL_LIBRARIES OFF CACHE BOOL
+	"Use SRB2Kart's internal copies of required dependencies (SDL2, PNG, zlib, GME, OpenMPT).")
+endif()
+
+if(${SRB2_CONFIG_HAVE_BLUA})
+	add_definitions(-DHAVE_BLUA)
+	set(SRB2_LUA_SOURCES
+		lua_baselib.c
+		lua_blockmaplib.c
+		lua_consolelib.c
+		lua_hooklib.c
+		lua_hudlib.c
+		lua_hudlib_drawlist.c
+		lua_infolib.c
+		lua_maplib.c
+		lua_mathlib.c
+		lua_mobjlib.c
+		lua_playerlib.c
+		lua_script.c
+		lua_skinlib.c
+		lua_thinkerlib.c
+		lua_udatalib.c
+		lua_glib.c
+	)
+	set(SRB2_LUA_HEADERS
+		lua_hook.h
+		lua_hud.h
+		lua_hudlib_drawlist.h
+		lua_libs.h
+		lua_script.h
+		lua_udatalib.h
+		lua_glib.h
+	)
+
+	prepend_sources(SRB2_LUA_SOURCES)
+	prepend_sources(SRB2_LUA_HEADERS)
+
+	source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS})
+
+	set(SRB2_BLUA_SOURCES
+		blua/lapi.c
+		blua/lauxlib.c
+		blua/lbaselib.c
+		blua/ldblib.c
+		blua/lcode.c
+		blua/ldebug.c
+		blua/ldo.c
+		blua/ldump.c
+		blua/lfunc.c
+		blua/lgc.c
+		blua/linit.c
+		blua/liolib.c
+		blua/llex.c
+		blua/lmem.c
+		blua/lobject.c
+		blua/lopcodes.c
+		blua/lparser.c
+		blua/lstate.c
+		blua/lstring.c
+		blua/lstrlib.c
+		blua/ltable.c
+		blua/ltablib.c
+		blua/ltm.c
+		blua/lundump.c
+		blua/lvm.c
+		blua/lzio.c
+	)
+	set(SRB2_BLUA_HEADERS
+		blua/lapi.h
+		blua/lauxlib.h
+		blua/lcode.h
+		blua/ldebug.h
+		blua/ldo.h
+		blua/lfunc.h
+		blua/lgc.h
+		blua/llex.h
+		blua/llimits.h
+		blua/lmem.h
+		blua/lobject.h
+		blua/lopcodes.h
+		blua/lparser.h
+		blua/lstate.h
+		blua/lstring.h
+		blua/ltable.h
+		blua/ltm.h
+		blua/lua.h
+		blua/luaconf.h
+		blua/lualib.h
+		blua/lundump.h
+		blua/lvm.h
+		blua/lzio.h
+	)
+
+	prepend_sources(SRB2_BLUA_SOURCES)
+	prepend_sources(SRB2_BLUA_HEADERS)
+
+	source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS})
+endif()
+
+if(${SRB2_CONFIG_HAVE_GME})
+	if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
+		set(GME_FOUND ON)
+		set(GME_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/gme/include)
+		if(${SRB2_SYSTEM_BITS} EQUAL 64)
+			set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win64 -lgme")
+		else() # 32-bit
+			set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win32 -lgme")
+		endif()
+	else()
+		find_package(GME)
+	endif()
+	if(${GME_FOUND})
+		set(SRB2_HAVE_GME ON)
+		add_definitions(-DHAVE_LIBGME)
+	else()
+		message(WARNING "You have specified that GME is available but it was not found.")
+	endif()
+endif()
+
+if(${SRB2_CONFIG_HAVE_DISCORDRPC})
+	if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
+		set(DISCORDRPC_FOUND ON)
+		if(${SRB2_SYSTEM_BITS} EQUAL 64)
+			set(DISCORDRPC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/discord-rpc/win64-dynamic/include)
+			set(DISCORDRPC_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/discord-rpc/win64-dynamic/lib -ldiscord-rpc")
+		else() # 32-bit
+			set(DISCORDRPC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/discord-rpc/win32-dynamic/include)
+			set(DISCORDRPC_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/discord-rpc/win32-dynamic/lib -ldiscord-rpc")
+		endif()
+	else()
+		find_package(DiscordRPC)
+	endif()
+	if(${DISCORDRPC_FOUND})
+		set(SRB2_HAVE_DISCORDRPC ON)
+		add_definitions(-DHAVE_DISCORDRPC)
+		add_definitions(-DUSE_STUN)
+		set(SRB2_DISCORDRPC_SOURCES discord.c stun.c)
+		set(SRB2_DISCORDRPC_HEADERS discord.h stun.h)
+		prepend_sources(SRB2_DISCORDRPC_SOURCES)
+		prepend_sources(SRB2_DISCORDRPC_HEADERS)
+		source_group("Discord Rich Presence" FILES ${SRB2_DISCORDRPC_SOURCES} ${SRB2_DISCORDRPC_HEADERS})
+	else()
+		message(WARNING "You have specified that Discord Rich Presence is available but it was not found.")
+	endif()
+endif()
+
+if(${SRB2_CONFIG_HAVE_OPENMPT})
+	if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
+		set(OPENMPT_FOUND ON)
+		set(OPENMPT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/inc)
+        if(${SRB2_SYSTEM_BITS} EQUAL 64)
+			set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86_64/mingw -lopenmpt")
+		else() # 32-bit
+			set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86/mingw -lopenmpt")
+		endif()
+	else()
+		find_package(OPENMPT)
+	endif()
+	if(${OPENMPT_FOUND})
+		set(SRB2_HAVE_OPENMPT ON)
+		add_definitions(-DHAVE_OPENMPT)
+	else()
+		message(WARNING "You have specified that OpenMPT is available but it was not found.")
+	endif()
+endif()
+
+if(${SRB2_CONFIG_HAVE_ZLIB})
+	if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
+		set(ZLIB_FOUND ON)
+		set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/zlib)
+		if(${SRB2_SYSTEM_BITS} EQUAL 64)
+			set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz64")
+		else() # 32-bit
+			set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz32")
+		endif()
+	else()
+		find_package(ZLIB)
+	endif()
+	if(${ZLIB_FOUND})
+		set(SRB2_HAVE_ZLIB ON)
+		add_definitions(-DHAVE_ZLIB)
+	else()
+		message(WARNING "You have specified that ZLIB is available but it was not found. SRB2Kart may not compile correctly.")
+	endif()
+endif()
+
+if(${SRB2_CONFIG_HAVE_PNG} AND ${SRB2_CONFIG_HAVE_ZLIB})
+	if (${ZLIB_FOUND})
+		if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
+			set(PNG_FOUND ON)
+			set(PNG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libpng-src)
+			if(${SRB2_SYSTEM_BITS} EQUAL 64)
+				set(PNG_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libpng-src/projects -lpng64")
+			else() # 32-bit
+				set(PNG_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libpng-src/projects -lpng32")
+			endif()
+		else()
+			find_package(PNG)
+		endif()
+		if(${PNG_FOUND})
+			set(SRB2_HAVE_PNG ON)
+			add_definitions(-DHAVE_PNG)
+			add_definitions(-D_LARGEFILE64_SOURCE)
+			set(SRB2_PNG_SOURCES apng.c)
+			set(SRB2_PNG_HEADERS apng.h)
+			prepend_sources(SRB2_PNG_SOURCES)
+			prepend_sources(SRB2_PNG_HEADERS)
+			source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS}
+				${SRB2_PNG_SOURCES} ${SRB2_PNG_HEADERS})
+		else()
+			message(WARNING "You have specified that PNG is available but it was not found. SRB2Kart may not compile correctly.")
+		endif()
+	endif()
+endif()
+
+if(${SRB2_CONFIG_HAVE_CURL})
+	if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
+		set(CURL_FOUND ON)
+		set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl/include)
+		if(${SRB2_SYSTEM_BITS} EQUAL 64)
+			set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl")
+		else() # 32-bit
+			set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl")
+		endif()
+	else()
+		find_package(CURL)
+	endif()
+	if(${CURL_FOUND})
+		set(SRB2_HAVE_CURL ON)
+		add_definitions(-DHAVE_CURL)
+	else()
+		message(WARNING "You have specified that CURL is available but it was not found. SRB2Kart may not compile correctly.")
+	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_clip.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_portal.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md3load.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_model.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/u_list.c
+	)
+
+	set (SRB2_HWRENDER_HEADERS
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.h
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.h
+		${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
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_portal.h
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.h
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.h
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md3load.h
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_model.h
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/u_list.h
+	)
+
+	set(SRB2_R_OPENGL_SOURCES
+		${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.c
+	)
+
+	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})
+	find_package(OpenGL)
+	if(${OPENGL_FOUND})
+		add_definitions(-DHWRENDER)
+		add_definitions(-DSTATIC_OPENGL)
+	else()
+		message(WARNING "You have specified static opengl but opengl was not found. Not setting HWRENDER.")
+	endif()
+endif()
+
+if(${SRB2_CONFIG_HWRENDER})
+	if(${SRB2_CONFIG_USE_FBO_OGL})
+		set(SRB2_USE_FBO_OGL ON)
+		add_definitions(-DUSE_FBO_OGL)
+	endif()
+endif()
+
+# Targets
+
+# Compatibility flag with later versions of GCC
+# We should really fix our code to not need this
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -mno-ms-bitfields)
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value)
+endif()
+
+add_definitions(-DCMAKECONFIG)
+
+#add_library(SRB2Core STATIC
+#	${SRB2_CORE_SOURCES}
+#	${SRB2_CORE_HEADERS}
+#	${SRB2_CORE_RENDER_SOURCES}
+#	${SRB2_CORE_GAME_SOURCES}
+#	${SRB2_LUA_SOURCES}
+#	${SRB2_LUA_HEADERS}
+#	${SRB2_BLUA_SOURCES}
+#	${SRB2_BLUA_HEADERS}
+#)
+
+if(${SRB2_CONFIG_DEDICATED})
+	add_subdirectory(dedicated)
+else()
+	add_subdirectory(sdl)
+endif()
+
+if(NOT ${SRB2_SDL2_AVAILABLE} AND NOT ${SRB2_WIN32_AVAILABLE})
+	message(FATAL_ERROR "There are no targets available to build an SRB2Kart executable. :(")
+endif()
+>>>>>>> Saturn-Next
diff --git a/src/Makefile b/src/Makefile
index 0d63b2585..8d1c697de 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,138 +1,145 @@
-
-#     GNU Make makefile for SRB2
-#############################################################################
-# Copyright (C) 1998-2000 by DooM Legacy Team.
-# Copyright (C) 2003-2018 by Sonic Team Junior.
+# GNU Makefile for SRB2
+# the poly3 Makefile adapted over and over...
+#
+# Copyright 1998-2000 DooM Legacy Team.
+# Copyright 2020-2023 James R.
+# Copyright 2003-2023 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.
 #
-#     -DLINUX     -> use for the GNU/Linux specific
-#     -DHAVE_SDL  -> use for the SDL interface
+# Special targets:
 #
-# Sets:
-#     Compile the Mingw version with 'make MINGW=1'
-#     Compile the SDL/Mingw version with 'make MINGW=1 SDL=1'
-#     Compile the SDL/Linux version with 'make LINUX=1'
-#     Compile the SDL/Solaris version with 'make SOLARIS=1'
-#     Compile the SDL/FreeBSD version with 'gmake FREEBSD=1'
-#     Compile the SDL/Cygwin version with 'make CYGWIN32=1'
-#     Compile the SDL/other version try with 'make SDL=1'
+# clean - remove executables and objects for this build
+# cleandep - remove dependency files for this build
+# distclean - remove entire executable, object and
+#             dependency file directory structure.
+# dump - disassemble executable
+# info - print settings
 #
-# 'Targets':
-#     clean
-#       Remove all object files
-#     cleandep
-#       Remove depend.dep
-#     dll
-#       compile primary HW render DLL/SO
-#     all_dll
-#       compile all HW render and 3D sound DLLs for the set
-#     opengl_dll
-#       Pure Mingw only, compile OpenGL HW render DLL
-#     minigl_dll
-#       Pure Mingw only, compile MiniGL HW render DLL
-#     ds3d_dll
-#       Pure Mingw only, compile DirectX DirectSound HW sound DLL
-#     fmod_dll
-#       Pure Mingw only, compile FMOD HW sound DLL
-#     openal_dll
-#       Pure Mingw only, compile OpenAL HW sound DLL
-#     fmod_so
-#       Non-Mingw, compile FMOD HW sound SO
-#     openal_so
-#       Non-Mingw, compile OpenAL HW sound SO
+# This Makefile can automatically detect the host system
+# as well as the compiler version. If system or compiler
+# version cannot be detected, you may need to set a flag
+# manually.
 #
 #
-# Addon:
-#     To Cross-Compile, CC=gcc-version make * PREFIX=<dir>
-#     Compile with GCC 2.97 version, add 'GCC29=1'
-#     Compile with GCC 4.0x version, add 'GCC40=1'
-#     Compile with GCC 4.1x version, add 'GCC41=1'
-#     Compile with GCC 4.2x version, add 'GCC42=1'
-#     Compile with GCC 4.3x version, add 'GCC43=1'
-#     Compile with GCC 4.4x version, add 'GCC44=1'
-#     Compile with GCC 4.5x version, add 'GCC45=1'
-#     Compile with GCC 4.6x version, add 'GCC46=1'
-#     Compile a profile version, add 'PROFILEMODE=1'
-#     Compile a debug version, add 'DEBUGMODE=1'
-#     Compile with less warnings, add 'RELAXWARNINGS=1'
-#     Generate compiler errors for most compiler warnings, add 'ERRORMODE=1'
-#     Compile without 3D hardware support, add 'NOHW=1'
-#     Compile with GDBstubs, add 'RDB=1'
-#     Compile without PNG, add 'NOPNG=1'
-#     Compile without zlib, add 'NOZLIB=1'
+# Platform/system flags:
 #
-# Addon for SDL:
-#     To Cross-Compile, add 'SDL_CONFIG=/usr/*/bin/sdl-config'
-#     Compile without SDL_Mixer, add 'NOMIXER=1'
-#     Compile without BSD API, add 'NONET=1'
-#     Compile without IPX/SPX, add 'NOIPX=1'
-#     Compile Mingw/SDL with S_DS3S, add 'DS3D=1'
-#     Compile without libopenmpt, add 'NOOPENMPT=1'
-#     Compile with S_FMOD3D, add 'FMOD=1' (WIP)
-#     Compile with S_OPENAL, add 'OPENAL=1' (WIP)
-#     To link with the whole SDL_Image lib to load Icons, add 'SDL_IMAGE=1' but it isn't not realy needed
-#     To link with SDLMain to hide console or make on a console-less binary, add 'SDLMAIN=1'
+# LINUX=1, LINUX64=1
+# MINGW=1, MINGW64=1 - Windows (MinGW toolchain)
+# UNIX=1 - Generic Unix like system
+# FREEBSD=1
+# SDL=1 - Use SDL backend. SDL is the only implemented backend though.
+#         If disabled, a dummy backend will be used.
 #
-#############################################################################
+# A list of supported GCC versions can be found in
+# Makefile.d/detect.mk -- search 'gcc_versions'.
+#
+# Feature flags:
+#
+# Safe to use online
+# ------------------
+# NOHW=1 - Disable OpenGL renderer.
+# NOSCREENFBO=1 - Disable screen FBO for downsampling in OpenGL.
+# NOSATURNPAK=1 - Disable handling the special Saturn packet and resynch system
+# NOSATURNJOIN=1 - Disable the seperate Saturn allowjoin toggle
+# ZDEBUG=1 - Enable more detailed memory debugging
+# HAVE_MINIUPNPC=1 - Enable automated port forwarding.
+#                    Already enabled by default for 32-bit
+#                    Windows.
+# NOCURL=1 - Disable libcurl--HTTP capability.
+# NOGME=1 - Disable game music emu, retro VGM support.
+# NOOPENMPT=1 - Disable module (tracker) music support.
+# NOMIXER=1 - Disable SDL Mixer (audio playback).
+# NOTHREADS=1 - Disable multithreading.
+#
+# Netplay incompatible
+# --------------------
+# NOMD5=1 - Disable MD5 checksum (validation tool).
+# NOPOSTPROCESSING=1 - ?
+# MOBJCONSISTANCY=1 - ??
+# PACKETDROP=1 - ??
+# NOEXECINFO=1 - Disable stack trace dump support
+# DEBUGMODE=1 - Enable various debugging capabilities.
+#               Also disables optimizations.
+#
+# Development flags:
+#
+# VALGRIND=1 - Enable Valgrind memory debugging support.
+# PROFILEMODE=1 - Enable performance profiling (gprof).
+# USEASAN=1 - Enable building with Address Sanitizer.
+# NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
+#
+# General flags for building:
+#
+# STATIC=1 - Use static linking.
+# DISTCC=1
+# CCACHE=1
+# UPX= - UPX command to use for compressing final
+#        executable.
+# WINDOWSHELL=1 - Use Windows commands.
+# PREFIX= - Prefix to many commands, for cross compiling.
+# STABS=1 - ?
+# ECHO=1 - Print out each command in the build process.
+# NOECHOFILENAMES=1 - Don't print out each that is being
+#                     worked on.
+# SILENT=1 - Print absolutely nothing except errors.
+# RELAXWARNINGS=1 - Use less compiler warnings/errors.
+# ERRORMODE=1 - Treat most compiler warnings as errors.
+# NOCASTALIGNWARN=1 - ?
+# NOLDWARNING=1 - ?
+# NOSDLMAIN=1 - ?
+# SDLMAIN=1 - ?
+# USELTO=1 - Enable building with LTO.
+#
+# Library configuration flags:
+# Everything here is an override.
+#
+# PNG_PKGCONFIG= - libpng-config command.
+# PNG_CFLAGS=, PNG_LDFLAGS=
+#
+# CURLCONFIG= - curl-config command.
+# CURL_CFLAGS=, CURL_LDFLAGS=
+#
+# VALGRIND_PKGCONFIG= - pkg-config package name.
+# VALGRIND_CFLAGS=, VALGRIND_LDFLAGS=
+#
+# LIBGME_PKGCONFIG=, LIBGME_CFLAGS=, LIBGME_LDFLAGS=
 
-ALL_SYSTEMS=\
-	PANDORA\
-	LINUX64\
-	MINGW64\
-	HAIKU\
-	DUMMY\
-	MINGW\
-	UNIX\
-	LINUX\
-	SOLARIS\
-	FREEBSD\
-	MACOSX\
-	SDL\
+# LIBOPENMPT_PKGCONFIG=
+# LIBOPENMPT_CFLAGS=, LIBOPENMPT_LDFLAGS=
+#
+# ZLIB_PKGCONFIG=, ZLIB_CFLAGS=, ZLIB_LDFLAGS=
+#
+# SDL_PKGCONFIG=
+# SDL_CONFIG= - sdl-config command.
+# SDL_CFLAGS=, SDL_LDFLAGS=
 
-# check for user specified system
-ifeq (,$(filter $(ALL_SYSTEMS),$(.VARIABLES)))
-ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
+clean_targets=cleandep clean distclean info
 
- $(info Detected a Windows system, compiling for 32-bit MinGW SDL2...)
+.PHONY : $(clean_targets) all
 
+<<<<<<< HEAD
  # go for a 32-bit sdl mingw exe by default
  MINGW=1
  SDL=1
  WINDOWSHELL=1
  HAVE_DISCORDRPC=0
  NOUPX=1
+=======
+goals:=$(or $(MAKECMDGOALS),all)
+cleanonly:=$(filter $(clean_targets),$(goals))
+destructive:=$(filter-out info,$(cleanonly))
+>>>>>>> Saturn-Next
 
-else # if you on the *nix
-
- NOUPX=1
-
- system:=$(shell uname -s)
-
- ifeq ($(system),Linux)
- new_system=LINUX
- else
-
- $(error \
-	 Could not automatically detect your system,\
-	 try specifying a system manually)
-
- endif
-
- ifeq ($(shell getconf LONG_BIT),64)
- system+=64-bit
- new_system:=$(new_system)64
- endif
-
- $(info Detected $(system) ($(new_system))...)
- $(new_system)=1
-
-endif
+ifndef cleanonly
+include Makefile.d/old.mk
 endif
 
+include Makefile.d/util.mk
 
+<<<<<<< HEAD
 # SRB2 data files
 D_DIR?=../bin/Resources
 D_FILES=$(D_DIR)/srb2.srb \
@@ -308,126 +315,119 @@ ifdef PNG_PKGCONFIG
 PNG_CFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --cflags)
 PNG_LDFLAGS?=$(shell $(PKG_CONFIG) $(PNG_PKGCONFIG) --libs)
 else
+=======
+>>>>>>> Saturn-Next
 ifdef PREFIX
-PNG_CONFIG?=$(PREFIX)-libpng-config
+CC:=$(PREFIX)-gcc
+CXX:=$(PREFIX)-g++
+endif
+
+OBJDUMP_OPTS?=--wide --source --line-numbers
+
+OBJCOPY?=$(call Prefix,objcopy)
+OBJDUMP?=$(call Prefix,objdump)
+WINDRES?=$(call Prefix,windres)
+
+GZIP?=gzip
+GZIP_OPTS?=-9 -f -n
+ifdef WINDOWSHELL
+GZIP_OPTS+=--rsyncable
+endif
+
+UPX_OPTS?=--best --preserve-build-id
+ifndef ECHO
+UPX_OPTS+=-qq
+endif
+
+include Makefile.d/detect.mk
+
+# make would try to remove the implicitly made directories
+.PRECIOUS : %/ comptime.c
+
+sources:=
+makedir:=../make
+
+# -DCOMPVERSION: flag to use comptime.h
+opts:=-DCOMPVERSION -g
+libs:=
+
+# This is a list of variables names, of which if defined,
+# also defines the name as a macro to the compiler.
+passthru_opts:=
+
+include Makefile.d/platform.mk
+include Makefile.d/features.mk
+include Makefile.d/versions.mk
+
+ifdef DEBUGMODE
+makedir:=$(makedir)/debug
+endif
+
+depdir:=$(makedir)/deps
+objdir:=$(makedir)/objs
+
+# very sophisticated dependency
+sources+=\
+	$(call List,Sourcefile)\
+	$(call List,core/Sourcefile)
+
+sources+=\
+	$(call List,blua/Sourcefile)
+
+depends:=$(basename $(filter %.c %.cpp %.s,$(sources)))
+objects:=$(basename $(filter %.c %.cpp %.s %.nas,$(sources)))
+
+depends:=$(depends:%=$(depdir)/%.d)
+
+# comptime.o added directly to objects instead of thru
+# sources because comptime.c includes comptime.h, but
+# comptime.h may not exist yet. It's a headache so this is
+# easier.
+objects:=$(objects:=.o) comptime.o
+
+# windows resource file
+rc_file:=$(basename $(filter %.rc,$(sources)))
+ifdef rc_file
+objects+=$(rc_file:=.res)
+endif
+
+objects:=$(addprefix $(objdir)/,$(objects))
+
+ifdef DEBUGMODE
+bin:=../bin/debug
 else
-PNG_CONFIG?=libpng-config
+bin:=../bin
 endif
 
-ifdef PNG_STATIC
-PNG_CFLAGS?=$(shell $(PNG_CONFIG) --static --cflags)
-PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --static --ldflags)
-else
-PNG_CFLAGS?=$(shell $(PNG_CONFIG) --cflags)
-PNG_LDFLAGS?=$(shell $(PNG_CONFIG) --ldflags)
-endif
-endif
+# default EXENAME (usually set by platform)
+EXENAME?=srb2kart
+DBGNAME?=$(EXENAME).debug
 
-ifdef LINUX
-PNG_CFLAGS+=-D_LARGEFILE64_SOURCE
-endif
+exe:=$(bin)/$(EXENAME)
+dbg:=$(bin)/$(DBGNAME)
 
-LIBS+=$(PNG_LDFLAGS)
-CFLAGS+=$(PNG_CFLAGS)
+build_done==== Build is done, look for \
+           $(<F) at $(abspath $(<D)) ===
 
-OBJS+=$(OBJDIR)/apng.o
-endif
+all : $(exe)
+	$(call Echo,$(build_done))
 
-ifdef HAVE_LIBGME
-OPTS+=-DHAVE_LIBGME
-
-LIBGME_PKGCONFIG?=libgme
-LIBGME_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --cflags)
-LIBGME_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --libs)
-
-LIBS+=$(LIBGME_LDFLAGS)
-CFLAGS+=$(LIBGME_CFLAGS)
-endif
-
-ifdef HAVE_OPENMPT
-OPTS+=-DHAVE_OPENMPT
-
-LIBOPENMPT_PKGCONFIG?=libopenmpt
-LIBOPENMPT_CFLAGS?=$(shell $(PKG_CONFIG) $(LIBOPENMPT_PKGCONFIG) --cflags)
-LIBOPENMPT_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBOPENMPT_PKGCONFIG) --libs)
-
-LIBS+=$(LIBOPENMPT_LDFLAGS)
-CFLAGS+=$(LIBOPENMPT_CFLAGS)
-endif
-
-ifndef NOZLIB
-OPTS+=-DHAVE_ZLIB
-ZLIB_PKGCONFIG?=zlib
-ZLIB_CFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --cflags)
-ZLIB_LDFLAGS?=$(shell $(PKG_CONFIG) $(ZLIB_PKGCONFIG) --libs)
-
-LIBS+=$(ZLIB_LDFLAGS)
-CFLAGS+=$(ZLIB_CFLAGS)
-else
-NOPNG=1
-endif
-
-ifndef NOCURL
-OPTS+=-DHAVE_CURL
-CURLCONFIG?=curl-config
-CURL_CFLAGS?=$(shell $(CURLCONFIG) --cflags)
-CURL_LDFLAGS?=$(shell $(CURLCONFIG) --libs)
-
-LIBS+=$(CURL_LDFLAGS)
-CFLAGS+=$(CURL_CFLAGS)
+ifndef VALGRIND
+dump : $(dbg).txt
 endif
 
 ifdef STATIC
-LIBS:=-static $(LIBS)
+libs+=-static
 endif
 
-ifndef NOHW
-ifdef USE_FBO_OGL
-OPTS+=-DUSE_FBO_OGL
-endif
-endif
-
-ifdef HAVE_MINIUPNPC
-ifdef NONET
-HAVE_MINIUPNPC=''
-else
-LIBS+=-lminiupnpc
-ifdef MINGW
-LIBS+=-lws2_32 -liphlpapi
-endif
-CFLAGS+=-DHAVE_MINIUPNPC
-endif
-endif
-
-ifdef HAVE_DISCORDRPC
-LIBS+=-ldiscord-rpc
-CFLAGS+=-DHAVE_DISCORDRPC -DUSE_STUN
-OBJS+=$(OBJDIR)/discord.o $(OBJDIR)/stun.o
-endif
-
-	include blua/Makefile.cfg
-
-ifdef NOMD5
-	OPTS+=-DNOMD5
-else
-	OBJS:=$(OBJDIR)/md5.o $(OBJS)
-endif
-
-ifdef NOPOSTPROCESSING
-	OPTS+=-DNOPOSTPROCESSING
-endif
-
-	OPTS:=-fno-exceptions $(OPTS)
-
-ifdef MOBJCONSISTANCY
-	OPTS+=-DMOBJCONSISTANCY
-endif
-
-ifdef PACKETDROP
-	OPTS+=-DPACKETDROP
+# build with profiling information
+ifdef PROFILEMODE
+opts+=-pg
+libs+=-pg
 endif
 
 ifdef DEBUGMODE
+<<<<<<< HEAD
 
 	# build with debugging information
 	WINDRESFLAGS = -D_DEBUG
@@ -571,267 +571,196 @@ ifdef PANDORA
 all:	pre-build $(BIN)/$(PNDNAME)
 endif
 
+=======
+debug_opts=-D_DEBUG
+else # build a normal optimized version
+debug_opts=-DNDEBUG
+opts+=-O3
+ifdef USELTO
+# compile with LTO
+>>>>>>> Saturn-Next
 ifdef MINGW
-ifndef SDL
-all:	 pre-build $(BIN)/$(EXENAME) dll
+opts+=-flto=auto -g
+libs+=-flto=auto -g
+else
+opts+=-flto=auto
+libs+=-flto=auto
+endif
 endif
 endif
 
-ifdef SDL
-all:	 pre-build $(BIN)/$(EXENAME)
+ifdef USEASAN
+# compile with asan
+ifdef MINGW
+opts+=-fsanitize=address -g
+libs+=-fsanitize=address -g
+else
+opts+=-fsanitize=address
+libs+=-fsanitize=address
+endif
+opts+=-fsanitize=address
+libs+=-fsanitize=address
 endif
 
-ifdef DUMMY
-all:	$(BIN)/$(EXENAME)
+# debug_opts also get passed to windres
+opts+=$(debug_opts)
+
+opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))
+
+CXXFLAGS+=-std=c++17 # force c17 for c++ since most vpss run older ubuntu versions with old compilers
+
+opts+=$(WFLAGS) $(CFLAGS)
+cxxopts:=$(opts) $(CXXFLAGS)
+opts+=$(CWFLAGS) # warning flags that shouldnt be passed to c++ compiler
+
+libs+=$(LDFLAGS) -lstdc++ -lpthread
+asflags:=$(ASFLAGS) -x assembler-with-cpp
+
+cc=$(CC)
+cxx=$(CXX)
+
+ifdef DISTCC
+cc=distcc $(CC)
+cxx=distcc $(CXX)
 endif
 
-cleandep:
-	$(REMOVE) $(OBJDIR)/depend.dep
-	$(REMOVE) comptime.h
+ifdef CCACHE
+cc=ccache $(CC)
+cxx=ccache $(CXX)
+endif
 
-pre-build:
+ifndef SILENT
+# makefile will 'restart' when it finishes including the
+# dependencies.
+ifndef MAKE_RESTARTS
+ifndef destructive
+$(shell $(CC) -v)
+#$(shell $(CXX) -v)
+define flags =
+
+SHELL ..... $(SHELL)
+
+CC ........ $(cc)
+
+CXX ....... $(cxx)
+
+CFLAGS .... $(opts)
+
+CXXFLAGS .. $(cxxopts)
+
+LDFLAGS ... $(libs)
+
+endef
+$(info $(flags))
+endif
+# don't generate dependency files if only cleaning
+ifndef cleanonly
+$(info Checking dependency files...)
+include $(depends)
+endif
+endif
+endif
+
+LD:=$(CC)
+cc:=$(cc) $(opts)
+cxx:=$(cxx) $(cxxopts)
+ifdef UPX
+upx=$(UPX) $(UPX_OPTS)
+endif
+windres=$(WINDRES) $(WINDRESFLAGS)\
+	$(debug_opts) --include-dir=win32 -O coff
+
+%/ :
+	$(.)$(mkdir) $(call Windows_path,$@)
+
+# this is needed so the target can be referenced in the
+# prerequisites
+.SECONDEXPANSION :
+
+# 'UPX' is also recognized in the environment by upx
+unexport UPX
+
+# executable stripped of debugging symbols
+$(exe) : $(dbg) | $$(@D)/
+	$(.)$(OBJCOPY) --strip-debug $< $@
+	$(.)-$(OBJCOPY) --add-gnu-debuglink=$< $@
+ifdef UPX
+	$(call Echo,Compressing final executable...)
+	$(.)-$(upx) $@
+endif
+
+# original executable with debugging symbols
+$(dbg) : $(objects) | $$(@D)/
+	$(call Echo,Linking $(@F)...)
+	$(.)$(LD) -o $@ $^ $(libs)
+
+# disassembly of executable
+$(dbg).txt : $(dbg)
+	$(call Echo,Dumping debugging info...)
+	$(.)$(OBJDUMP) $(OBJDUMP_OPTS) $< > $@
+	$(.)$(GZIP) $(GZIP_OPTS) $@
+
+# '::' means run unconditionally
+# this really updates comptime.h
+comptime.c ::
 ifdef WINDOWSHELL
 	-$(.)..\comptime.bat .
 else
 	-$(.)../comptime.sh .
 endif
 
-clean:
-	$(REMOVE) *~ *.flc
-	$(REMOVE) $(OBJDIR)/*.o
+# I wish I could make dependencies out of rc files :(
+$(objdir)/win32/Srb2win.res : \
+	win32/afxres.h win32/resource.h
 
-ifdef MINGW
-	$(REMOVE) $(OBJDIR)/*.res
-endif
-
-ifdef CYGWIN32
-	$(REMOVE) $(OBJDIR)/*.res
-endif
-
-
-# executable
-
-$(BIN)/$(EXENAME): $(POS) $(OBJS)
-	-$(MKDIR) $(BIN)
-	@echo Linking $(EXENAME)...
-	$(LD) $(LDFLAGS) $(OBJS) -o $(BIN)/$(EXENAME) $(LIBS)
-ifndef VALGRIND
-ifndef NOOBJDUMP
-	@echo Dumping debugging info
-	$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(EXENAME) > $(BIN)/$(DBGNAME).txt
-	-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
+# dependency recipe template
+# 1: source file suffix
+# 2: extra flags to gcc
+define _recipe =
+$(depdir)/%.d : %.$(1) | $$$$(@D)/
 ifndef WINDOWSHELL
-	-$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
+ifdef Echo_name
+	@printf '%-20.20s\r' $$<
 endif
 endif
+	$(.)$(2) -MM -MF $$@ -MT $(objdir)/$$*.o $(3) $$<
+endef
 
-# mac os x lsdlsrb2 does not like objcopy
-ifndef MACOSX
-	$(OBJCOPY) $(BIN)/$(EXENAME) $(BIN)/$(DBGNAME)
-	$(OBJCOPY) --strip-debug $(BIN)/$(EXENAME)
-	-$(OBJCOPY) --add-gnu-debuglink=$(BIN)/$(DBGNAME) $(BIN)/$(EXENAME)
-endif
-ifndef NOUPX
-	-$(UPX) $(UPX_OPTS) $(BIN)/$(EXENAME)
-endif
-endif
-	@echo Build is done, please look for $(EXENAME) in $(BIN), \(checking for post steps\)
+$(eval $(call _recipe,c,$(cc)))
+$(eval $(call _recipe,cpp,$(cxx)))
+$(eval $(call _recipe,s,$(cc),$(asflags)))
 
-reobjdump:
-	@echo Redumping debugging info
-	$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(DBGNAME) > $(BIN)/$(DBGNAME).txt
-	-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
-ifndef WINDOWSHELL
-	-$(GZIP) $(GZIP_OPT2) $(BIN)/$(DBGNAME).txt
-endif
+# compiling recipe template
+# 1: target file suffix
+# 2: source file suffix
+# 3: compile command
+define _recipe =
+$(objdir)/%.$(1) : %.$(2) | $$$$(@D)/
+	$(call Echo_name,$$<)
+	$(.)$(3)
+endef
 
-$(OBJDIR):
-	-$(MKDIR) $(OBJDIR)
+$(eval $(call _recipe,o,c,$(cc) -c -o $$@ $$<))
+$(eval $(call _recipe,o,cpp,$(cxx) -c -o $$@ $$<))
+$(eval $(call _recipe,o,s,$(cc) $(asflags) -c -o $$@ $$<))
+$(eval $(call _recipe,res,rc,$(windres) -i $$< -o $$@))
 
-ifndef SDL
-ifdef NOHW
-dll :
+_rm=$(.)$(rmrf) $(call Windows_path,$(1))
+
+cleandep :
+	$(call _rm,$(depends) comptime.h)
+
+clean :
+	$(call _rm,$(exe) $(dbg) $(dbg).txt $(objects))
+
+distclean :
+	$(call _rm,../bin ../objs ../dep ../make comptime.h)
+
+info:
+ifdef WINDOWSHELL
+	@REM
 else
-dll : opengl_dll
-endif
-ifdef MINGW
-all_dll: opengl_dll ds3d_dll fmod_dll openal_dll
-
-opengl_dll: $(BIN)/r_opengl.dll
-$(BIN)/r_opengl.dll: $(OBJDIR)/ogl_win.o $(OBJDIR)/r_opengl.o
-	-$(MKDIR) $(BIN)
-	@echo Linking R_OpenGL.dll...
-	$(CC) --shared  $^ -o $@ -g -Wl,--add-stdcall-alias -lgdi32 -static-libgcc
-ifndef NOUPX
-	-$(UPX) $(UPX_OPTS) $@
+	@:
 endif
 
-ds3d_dll: $(BIN)/s_ds3d.dll
-$(BIN)/s_ds3d.dll: $(OBJDIR)/s_ds3d.o
-	@echo Linking S_DS3d.dll...
-	$(CC) --shared  $^ -o $@ -g -Wl,--add-stdcall-alias -ldsound -luuid
-
-fmod_dll: $(BIN)/s_fmod.dll
-$(BIN)/s_fmod.dll: $(OBJDIR)/s_fmod.o
-	-$(MKDIR) $(BIN)
-	@echo Linking S_FMOD.dll...
-	$(CC) --shared  $^ -o $@ -g -Wl,--add-stdcall-alias -lfmod
-
-openal_dll: $(BIN)/s_openal.dll
-$(BIN)/s_openal.dll: $(OBJDIR)/s_openal.o
-	-$(MKDIR) $(BIN)
-	@echo Linking S_OpenAL.dll...
-	$(CC) --shared  $^ -o $@ -g -Wl,--add-stdcall-alias -lopenal32
-else
-all_dll: fmod_so openal_so
-
-fmod_so: $(BIN)/s_fmod.so
-$(BIN)/s_fmod.so: $(OBJDIR)/s_fmod.o
-	-$(MKDIR) $(BIN)
-	@echo Linking S_FMOD.so...
-	$(CC) --shared $^ -o $@ -g --nostartfiles -lm -lfmod
-
-openal_so: $(BIN)/s_openal.so
-$(BIN)/s_openal.so: $(OBJDIR)/s_openal.o
-	-$(MKDIR) $(BIN)
-	@echo Linking S_OpenAL.so...
-	$(CC) --shared $^ -o $@ -g --nostartfiles -lm -lopenal
-endif
-
-else
-ifdef SDL
-ifdef MINGW
-$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
- doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
- command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \
- hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
- hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
- am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
- p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-else
-$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
- doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
- command.h hardware/hw_data.h hardware/hw_defs.h hardware/hw_md2.h \
- hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
- hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
- am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
- p_mobj.h doomdata.h d_ticcmd.h r_defs.h hardware/hw_dll.h
-	$(CC) $(CFLAGS) $(WFLAGS) -I/usr/X11R6/include -c $< -o $@
-endif
-endif
-
-endif
-
-#dependecy made by gcc itself !
-$(OBJS):
-ifndef DUMMY
--include $(OBJDIR)/depend.dep
-endif
-
-$(OBJDIR)/depend.dep:
-	@echo "Creating dependency file, depend.dep"
-	@echo > comptime.h
-	-$(MKDIR) $(OBJDIR)
-	$(CC) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
-	$(CC) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
-ifndef NOHW
-	$(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
-endif
-
-	$(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
-
-	@sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
-	$(REMOVE) $(OBJDIR)/depend.ped
-	@echo "Created dependency file, depend.dep"
-
-ifdef VALGRIND
-$(OBJDIR)/z_zone.o: z_zone.c
-	$(CC) $(CFLAGS) $(WFLAGS) -DHAVE_VALGRIND $(VALGRIND_CFLAGS) -c $< -o $@
-endif
-
-$(OBJDIR)/comptime.o: comptime.c pre-build
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(BIN)/%.mo: locale/%.po
-	-$(MKDIR) $(BIN)
-	$(MSGFMT) -f -o $@ $<
-
-$(OBJDIR)/%.o: %.c
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: $(INTERFACE)/%.c
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-ifdef MACOSX
-$(OBJDIR)/%.o: sdl/macosx/%.c
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-endif
-
-$(OBJDIR)/%.o: hardware/%.c
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: blua/%.c
-	$(CC) $(CFLAGS) $(LUA_CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/%.o: %.s
-	$(CC) $(OPTS) -x assembler-with-cpp -c $< -o $@
-
-$(OBJDIR)/SRB2.res: win32/Srb2win.rc win32/afxres.h win32/resource.h
-	$(WINDRES) -i $< -O rc $(WINDRESFLAGS) --include-dir=win32 -o $@ -O coff
-
-ifdef SDL
-
-ifdef MINGW
-$(OBJDIR)/win_dbg.o: win32/win_dbg.c
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-endif
-
-ifdef STATICHS
-$(OBJDIR)/s_openal.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/s_fmod.o: hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-ifdef MINGW
-$(OBJDIR)/s_ds3d.o: hardware/s_ds3d/s_ds3d.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-endif
-else
-
-$(OBJDIR)/s_fmod.o: hardware/s_fmod/s_fmod.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
-	$(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_fmod.o -DHW3SOUND -DUNIXCOMMON -shared -nostartfiles -c hardware/s_fmod/s_fmod.c
-
-$(OBJDIR)/s_openal.o: hardware/s_openal/s_openal.c hardware/hw3dsdrv.h \
- hardware/hw_dll.h
-	$(CC) $(ARCHOPTS) -Os -o $(OBJDIR)/s_openal.o -DHW3SOUND -DUNIXCOMMON -shared -nostartfiles -c hardware/s_openal/s_openal.c
-endif
-
-ifdef FILTERS
-$(OBJDIR)/%.o: $(INTERFACE)/filter/%.c
-	@echo $< needs deps
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/filters.o: $(INTERFACE)/filter/filters.c $(INTERFACE)/filter/filters.c \
- $(INTERFACE)/filter/filters.h
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/hq2x.o: $(INTERFACE)/filter/hq2x.c $(INTERFACE)/filter/hq2x.c \
- $(INTERFACE)/filter/filters.h
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-
-$(OBJDIR)/lq2x.o: $(INTERFACE)/filter/lq2x.c $(INTERFACE)/filter/lq2x.c \
- $(INTERFACE)/filter/filters.h $(INTERFACE)/filter/interp.h \
- $(INTERFACE)/filter/hq2x.h $(INTERFACE)/filter/lq2x.h
-	$(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
-endif
-endif
-
-#############################################################
-#
-#############################################################
+#$(warning The handwritten GNU Makefile for SRB2 is deprecated, and may be removed in the future. Please consider switching to CMake.)
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
deleted file mode 100644
index 77779f7d5..000000000
--- a/src/Makefile.cfg
+++ /dev/null
@@ -1,582 +0,0 @@
-# vim: ft=make
-#
-# Makefile.cfg for SRB2
-#
-
-#
-# GNU compiler & tools' flags
-# and other things
-#
-
-# See the following variable don't start with 'GCC'. This is
-# to avoid a false positive with the version detection...
-
-SUPPORTED_GCC_VERSIONS:=\
-	141 14\
-	132 131 130 13\
-	123 122 121 120 12\
-	114 113 112 111 110 11\
-	105 104 103 102 101 100 10\
-	95 94 93 92 91 90\
-	85 84 83 82 81 80\
-	75 74 73 72 71 70\
-	64 63 62 61 60\
-	55 54 53 52 51 50\
-	49 48 47 46 45 44 43 42 41 40
-
-LATEST_GCC_VERSION=14.1
-
-# gcc or g++
-ifdef PREFIX
-	CC:=$(PREFIX)-gcc
-	CXX:=$(PREFIX)-g++
-	OBJCOPY?=$(PREFIX)-objcopy
-	OBJDUMP?=$(PREFIX)-objdump
-	STRIP?=$(PREFIX)-strip
-	WINDRES?=$(PREFIX)-windres
-else
-	OBJCOPY?=objcopy
-	OBJDUMP?=objdump
-	STRIP?=strip
-	WINDRES?=windres
-endif
-
-# because Apple screws with us on this
-# need to get bintools from homebrew
-ifdef MACOSX
-	CC=clang
-	CXX=clang
-	OBJCOPY=gobjcopy
-	OBJDUMP=gobjdump
-endif
-
-# Automatically set version flag, but not if one was manually set
-ifeq   (,$(filter GCC%,$(.VARIABLES)))
- version:=$(shell $(CC) --version)
- # check if this is in fact GCC
- ifneq (,$(or $(findstring gcc,$(version)),$(findstring GCC,$(version))))
-  shellversion:=$(shell $(CC) -dumpversion)
-
-  # Try to remove "-win32"
-  version:=$(subst -win32,.0,$(shellversion))
-
-  # Turn version into words of major, minor
-  v:=$(subst ., ,$(version))
-  # concat. major minor
-  v:=$(word 1,$(v))$(word 2,$(v))
-
-  # If this version is not in the list, default to the latest supported
-  ifeq (,$(filter $(v),$(SUPPORTED_GCC_VERSIONS)))
-   $(info\
-		Your compiler version, GCC $(version), is not supported by the Makefile.\
-		The Makefile will assume GCC $(LATEST_GCC_VERSION).)
-   GCC$(subst .,,$(LATEST_GCC_VERSION))=1
-  else
-   $(info Detected GCC $(version) (GCC$(v)))
-   GCC$(v)=1
-  endif
- endif
-endif
-
-ifdef GCC141
-GCC141=1
-endif
-
-ifdef GCC14
-GCC14=1
-endif
-
-ifdef GCC132
-GCC131=1
-endif
-
-ifdef GCC131
-GCC130=1
-endif
-
-ifdef GCC13
-GCC130=1
-endif
-
-ifdef GCC130
-GCC123=1
-endif
-
-ifdef GCC123
-GCC122=1
-endif
-
-ifdef GCC122
-GCC121=1
-endif
-
-ifdef GCC121
-GCC120=1
-endif
-
-ifdef GCC12
-GCC120=1
-endif
-
-ifdef GCC120
-GCC114=1
-endif
-
-ifdef GCC114
-GCC113=1
-endif
-
-ifdef GCC113
-GCC112=1
-endif
-
-ifdef GCC112
-GCC111=1
-endif
-
-ifdef GCC111
-GCC110=1
-endif
-
-ifdef GCC11
-GCC110=1
-endif
-
-ifdef GCC110
-GCC105=1
-endif
-
-ifdef GCC105
-GCC104=1
-endif
-
-ifdef GCC104
-GCC103=1
-endif
-
-ifdef GCC103
-GCC102=1
-endif
-
-ifdef GCC102
-GCC101=1
-endif
-
-ifdef GCC101
-GCC100=1
-endif
-
-ifdef GCC10
-GCC100=1
-endif
-
-ifdef GCC100
-GCC93=1
-endif
-
-ifdef GCC95
-GCC94=1
-endif
-
-ifdef GCC94
-GCC93=1
-endif
-
-ifdef GCC93
-GCC92=1
-endif
-
-ifdef GCC92
-GCC91=1
-endif
-
-ifdef GCC91
-GCC90=1
-endif
-
-ifdef GCC90
-GCC85=1
-endif
-
-ifdef GCC85
-GCC84=1
-endif
-
-ifdef GCC84
-GCC83=1
-endif
-
-ifdef GCC83
-GCC82=1
-endif
-
-ifdef GCC82
-GCC81=1
-endif
-
-ifdef GCC81
-GCC80=1
-endif
-
-ifdef GCC80
-GCC75=1
-endif
-
-ifdef GCC75
-GCC74=1
-endif
-
-ifdef GCC74
-GCC73=1
-endif
-
-ifdef GCC73
-GCC72=1
-endif
-
-ifdef GCC72
-GCC71=1
-endif
-
-ifdef GCC71
-GCC70=1
-endif
-
-ifdef GCC70
-GCC64=1
-endif
-
-ifdef GCC64
-GCC63=1
-endif
-
-ifdef GCC63
-GCC62=1
-endif
-
-ifdef GCC62
-GCC61=1
-endif
-
-ifdef GCC61
-GCC60=1
-endif
-
-ifdef GCC60
-GCC55=1
-endif
-
-ifdef GCC55
-GCC54=1
-endif
-
-ifdef GCC54
-GCC53=1
-endif
-
-ifdef GCC53
-GCC52=1
-endif
-
-ifdef GCC52
-GCC51=1
-endif
-
-ifdef GCC51
-GCC50=1
-endif
-
-ifdef GCC50
-GCC49=1
-endif
-
-ifdef GCC49
-GCC48=1
-endif
-
-ifdef GCC48
-GCC47=1
-endif
-
-ifdef GCC47
-GCC46=1
-endif
-
-ifdef GCC46
-GCC45=1
-endif
-
-ifdef GCC45
-GCC44=1
-endif
-
-ifdef GCC44
-GCC43=1
-endif
-
-ifdef GCC43
-GCC42=1
-endif
-
-ifdef GCC42
-GCC41=1
-endif
-
-ifdef GCC41
-GCC40=1
-VCHELP=1
-endif
-
-ifdef GCC295
-GCC29=1
-endif
-
-OLDWFLAGS:=$(WFLAGS)
-# -W -Wno-unused
-WFLAGS=-Wall
-ifndef GCC295
-#WFLAGS+=-Wno-packed
-endif
-ifndef RELAXWARNINGS
- WFLAGS+=-W
-#WFLAGS+=-Wno-sign-compare
-ifndef GCC295
- WFLAGS+=-Wno-div-by-zero
-endif
-#WFLAGS+=-Wsystem-headers
-WFLAGS+=-Wfloat-equal
-#WFLAGS+=-Wtraditional
-ifdef VCHELP
- #WFLAGS+=-Wdeclaration-after-statement
- WFLAGS+=-Wno-error=declaration-after-statement
-endif
- WFLAGS+=-Wundef
-ifndef GCC295
- WFLAGS+=-Wendif-labels
-endif
-ifdef GCC41
- WFLAGS+=-Wshadow
-endif
-#WFLAGS+=-Wlarger-than-%len%
- WFLAGS+=-Wpointer-arith -Wbad-function-cast
-ifdef GCC45
-#WFLAGS+=-Wc++-compat
-endif
- WFLAGS+=-Wcast-qual
-ifndef NOCASTALIGNWARN
- WFLAGS+=-Wcast-align
-endif
- WFLAGS+=-Wwrite-strings
-ifndef ERRORMODE
-#WFLAGS+=-Wconversion
-ifdef GCC43
- #WFLAGS+=-Wno-sign-conversion
-endif
-endif
- WFLAGS+=-Wsign-compare
-ifdef GCC45
- WFLAGS+=-Wlogical-op
-endif
- WFLAGS+=-Waggregate-return
-ifdef HAIKU
-ifdef GCC41
- #WFLAGS+=-Wno-attributes
-endif
-endif
-#WFLAGS+=-Wstrict-prototypes
-ifdef GCC40
- WFLAGS+=-Wold-style-definition
-endif
- WFLAGS+=-Wmissing-prototypes -Wmissing-declarations
-ifdef GCC40
- WFLAGS+=-Wmissing-field-initializers
-endif
- WFLAGS+=-Wmissing-noreturn
-#WFLAGS+=-Wmissing-format-attribute
-#WFLAGS+=-Wno-multichar
-#WFLAGS+=-Wno-deprecated-declarations
-#WFLAGS+=-Wpacked
-#WFLAGS+=-Wpadded
-#WFLAGS+=-Wredundant-decls
- WFLAGS+=-Wnested-externs
-#WFLAGS+=-Wunreachable-code
- WFLAGS+=-Winline
-ifdef GCC43
- WFLAGS+=-funit-at-a-time
- WFLAGS+=-Wlogical-op
-endif
-ifndef GCC295
- WFLAGS+=-Wdisabled-optimization
-endif
-endif
-WFLAGS+=-Wformat-y2k
-ifdef GCC71
-WFLAGS+=-Wno-error=format-overflow=2
-endif
-WFLAGS+=-Wformat-security
-ifndef GCC29
-#WFLAGS+=-Winit-self
-endif
-ifdef GCC46
-WFLAGS+=-Wno-suggest-attribute=noreturn
-endif
-
-ifdef NOLDWARNING
-LDFLAGS+=-Wl,--as-needed
-endif
-
-ifdef ERRORMODE
-WFLAGS+=-Werror
-endif
-
-WFLAGS+=$(OLDWFLAGS)
-
-ifdef GCC43
- #WFLAGS+=-Wno-error=clobbered
-endif
-ifdef GCC44
- WFLAGS+=-Wno-error=array-bounds
-endif
-ifdef GCC45
-opts+=-fwrapv
-endif
-ifdef GCC46
- WFLAGS+=-Wno-error=suggest-attribute=noreturn
-endif
-ifdef GCC54
- WFLAGS+=-Wno-logical-op -Wno-error=logical-op
-endif
-ifdef GCC61
- WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
-endif
-ifdef GCC71
- WFLAGS+=-Wno-error=implicit-fallthrough
- WFLAGS+=-Wno-implicit-fallthrough
- WFLAGS+=-Wno-format-truncation
-endif
-ifdef GCC81
- WFLAGS+=-Wno-error=format-overflow
- WFLAGS+=-Wno-error=stringop-truncation
- WFLAGS+=-Wno-error=stringop-overflow
- WFLAGS+=-Wno-format-overflow
- WFLAGS+=-Wno-stringop-truncation
- WFLAGS+=-Wno-stringop-overflow
- WFLAGS+=-Wno-error=multistatement-macros
-endif
-
-
-#indicate platform and what interface use with
-ifndef LINUX
-ifndef FREEBSD
-ifndef CYGWIN32
-ifndef MINGW
-ifndef MINGW64
-ifndef SDL
-ifndef DUMMY
-$(error No interface or platform flag defined)
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-
-#determine the interface directory (where you put all i_*.c)
-i_net_o=$(OBJDIR)/i_net.o
-i_system_o=$(OBJDIR)/i_system.o
-i_sound_o=$(OBJDIR)/i_sound.o
-i_main_o=$(OBJDIR)/i_main.o
-#set OBJDIR and BIN's starting place
-OBJDIR=../objs
-BIN=../bin
-REMOVE?=rm -f
-CP?=cp
-MKDIR?=mkdir -p
-MKISOFS?=mkisofs
-DD?=dd
-GZIP?=gzip
-GZIP_OPTS?=-9 -f -n
-GZIP_OPT2=$(GZIP_OPTS) --rsyncable
-UPX?=upx
-UPX_OPTS?=--best --preserve-build-id
-ifndef ECHO
-UPX_OPTS+=-q
-endif
-
-#Interface Setup
-ifdef DUMMY
-	INTERFACE=dummy
-	OBJDIR:=$(OBJDIR)/dummy
-	BIN:=$(BIN)/dummy
-else
-ifdef LINUX
-	SDL=1
-ifdef LINUX64
-	OBJDIR:=$(OBJDIR)/Linux64
-	BIN:=$(BIN)/Linux64
-else
-	OBJDIR:=$(OBJDIR)/Linux
-	BIN:=$(BIN)/Linux
-endif
-else
-ifdef FREEBSD
-	INTERFACE=sdl
-	SDL=1
-
-	OBJDIR:=$(OBJDIR)/FreeBSD
-	BIN:=$(BIN)/FreeBSD
-else
-ifdef SOLARIS
-	INTERFACE=sdl
-	SDL=1
-
-	OBJDIR:=$(OBJDIR)/Solaris
-	BIN:=$(BIN)/Solaris
-else
-ifdef CYGWIN32
-	INTERFACE=sdl
-	SDL=1
-
-	OBJDIR:=$(OBJDIR)/cygwin
-	BIN:=$(BIN)/Cygwin
-else
-ifdef MINGW64
-	INTERFACE=win32
-	OBJDIR:=$(OBJDIR)/Mingw64
-	BIN:=$(BIN)/Mingw64
-else
-ifdef MINGW
-	INTERFACE=win32
-	OBJDIR:=$(OBJDIR)/Mingw
-	BIN:=$(BIN)/Mingw
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-
-ifdef ARCHNAME
-	OBJDIR:=$(OBJDIR)/$(ARCHNAME)
-	BIN:=$(BIN)/$(ARCHNAME)
-endif
-
-OBJDUMP_OPTS?=--wide --source --line-numbers
-LD=$(CC)
-
-ifdef SDL
-	INTERFACE=sdl
-	OBJDIR:=$(OBJDIR)/SDL
-endif
-
-ifndef DUMMY
-ifdef DEBUGMODE
-	OBJDIR:=$(OBJDIR)/Debug
-	BIN:=$(BIN)/Debug
-else
-	OBJDIR:=$(OBJDIR)/Release
-	BIN:=$(BIN)/Release
-endif
-endif
diff --git a/src/Makefile.d/dedicated.mk b/src/Makefile.d/dedicated.mk
new file mode 100644
index 000000000..a421b465d
--- /dev/null
+++ b/src/Makefile.d/dedicated.mk
@@ -0,0 +1,19 @@
+makedir:=$(makedir)/Dedicated
+
+sources+=$(call List,dedicated/Sourcefile)
+
+opts+=-DDEDICATED
+
+ifdef MINGW
+libs+=-mconsole
+endif
+
+ifndef NOTHREADS
+opts+=-DHAVE_THREADS
+sources+=dedicated/i_threads.c
+endif
+
+NOOPENMPT=1
+NOGME=1
+NOHW=1
+NOUPNP=1
diff --git a/src/Makefile.d/detect.mk b/src/Makefile.d/detect.mk
new file mode 100644
index 000000000..dd31d2f3e
--- /dev/null
+++ b/src/Makefile.d/detect.mk
@@ -0,0 +1,124 @@
+#
+# Detect the host system and compiler version.
+#
+
+# Previously featured:\
+	PANDORA\
+	DUMMY\
+	DJGPPDOS\
+	SOLARIS\
+	MACOSX\
+
+all_systems:=\
+	LINUX64\
+	MINGW64\
+	MINGW\
+	UNIX\
+	LINUX\
+	FREEBSD\
+	HAIKU\
+
+# check for user specified system
+ifeq (,$(filter $(all_systems),$(.VARIABLES)))
+ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
+
+ ifeq ($(shell uname -s | grep -o MINGW64),MINGW64) # 64-bit MinGW
+  _m=Detected a Windows system,\
+	compiling for 64-bit MinGW SDL...)
+ $(call Print,$(_m))
+  MINGW64=1
+ else # 32-bit MinGW
+  _m=Detected a Windows system,\
+	compiling for 32-bit MinGW SDL...)
+ $(call Print,$(_m))
+  MINGW=1
+ endif
+
+ NOOBJDUMP=1
+else # if you on the *nix
+
+system:=$(shell uname -s)
+
+ifeq ($(system),Linux)
+new_system:=LINUX
+else ifeq ($(system),Haiku)
+new_system:=HAIKU
+else
+
+$(error \
+	Could not automatically detect your system,\
+	try specifying a system manually)
+
+endif
+
+ifeq ($(shell getconf LONG_BIT),64)
+system+=64-bit
+new_system:=$(new_system)64
+endif
+
+$(call Print,Detected $(system) ($(new_system))...)
+$(new_system):=1
+
+endif
+endif
+
+# This must have high to low order.
+gcc_versions:=\
+	151 150 15\
+	142 141 140 14\
+	132 131 130 13\
+	123 122 121 120 12\
+	114 113 112 111 110 11\
+	105 104 103 102 101 100 10\
+	95 94 93 92 91 90\
+	85 84 83 82 81 80\
+	75 74 73 72 71 70\
+	64 63 62 61 60\
+	55 54 53 52 51 50\
+	49 48 47 46 45 44 43 42 41 40
+
+latest_gcc_version:=15.1.1
+
+# Automatically set version flag, but not if one was
+# manually set. And don't bother if this is a clean only
+# run.
+ifeq (,$(call Wildvar,GCC% destructive))
+
+# can't use $(CC) --version here since that uses argv[0] to display the name
+# also gcc outputs the information to stderr, so I had to do 2>&1
+# this program really doesn't like identifying itself
+shellversion:=$(shell $(CC) -v 2>&1)
+# Try to remove "-win32"
+version:=$(subst -win32,.0,$(shellversion))
+
+# check if this is in fact GCC
+ifneq (,$(findstring gcc version,$(version)))
+
+# in stark contrast to the name, gcc will give me a nicely formatted version number for free
+shellversion:=$(shell $(CC) -dumpfullversion)
+
+# Try to remove "-win32"
+version:=$(subst -win32,.0,$(shellversion))
+
+# Turn version into words of major, minor
+v:=$(subst ., ,$(version))
+# concat. major minor
+v:=$(word 1,$(v))$(word 2,$(v))
+
+# If this version is not in the list,
+# default to the latest supported
+ifeq (,$(filter $(v),$(gcc_versions)))
+define line =
+Your compiler version, GCC $(version), \
+is not supported by the Makefile.
+The Makefile will assume GCC $(latest_gcc_version).
+endef
+$(call Print,$(line))
+GCC$(subst .,,$(latest_gcc_version)):=1
+else
+$(call Print,Detected GCC $(version) (GCC$(v)))
+GCC$(v):=1
+endif
+
+endif
+endif
diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk
new file mode 100644
index 000000000..cf6a728db
--- /dev/null
+++ b/src/Makefile.d/features.mk
@@ -0,0 +1,105 @@
+#
+# Makefile for feature flags.
+#
+
+passthru_opts+=\
+	NOHW NOMD5 NOPOSTPROCESSING\
+	MOBJCONSISTANCY PACKETDROP ZDEBUG\
+	HAVE_MINIUPNPC\
+	HAVE_DISCORDRPC DEVELOP
+
+# build with debugging information
+ifdef DEBUGMODE
+PACKETDROP=1
+opts+=-DPARANOIA -DRANGECHECK
+endif
+
+ifndef NOHW
+opts+=-DHWRENDER
+
+ifndef NOSCREENFBO
+opts+=-DUSE_FBO_OGL
+endif
+
+sources+=$(call List,hardware/Sourcefile)
+endif
+
+ifndef NOMD5
+sources+=md5.c
+endif
+
+ifndef NONET
+ifndef NOSATURNJOIN
+opts+=-DDOSATURNJOIN
+endif
+ifndef NOSATURNPAK
+opts+=-DDOSATURNPAK
+endif
+endif
+
+ifndef NOZLIB
+ifndef NOPNG
+ifdef PNG_PKGCONFIG
+$(eval $(call Use_pkg_config,PNG_PKGCONFIG))
+else
+PNG_CONFIG?=$(call Prefix,libpng-config)
+$(eval $(call Configure,PNG,$(PNG_CONFIG) \
+	$(if $(PNG_STATIC),--static),,--ldflags))
+endif
+ifdef LINUX
+opts+=-D_LARGEFILE64_SOURCE
+endif
+opts+=-DHAVE_PNG
+sources+=apng.c
+endif
+endif
+
+ifndef NOCURL
+CURLCONFIG?=curl-config
+$(eval $(call Configure,CURL,$(CURLCONFIG)))
+opts+=-DHAVE_CURL
+endif
+
+ifdef HAVE_MINIUPNPC
+MINIUPNPC_PKGCONFIG?=miniupnpc
+$(eval $(call Use_pkg_config,MINIUPNPC))
+HAVE_MINIUPNPC=1
+opts+=-DHAVE_MINIUPNPC
+endif
+
+ifndef NOLIBBACKTRACE
+$(eval $(call Propogate_flags,LIBBACKTRACE))
+libs+=-lbacktrace
+opts+=-DHAVE_LIBBACKTRACE
+endif
+
+#windoze hack
+ifdef MINGW
+ifndef NODISCORDRPC
+HAVE_DISCORDRPC=1
+endif
+endif
+
+ifdef HAVE_DISCORDRPC
+$(eval $(call Propogate_flags,DISCORDRPC))
+libs+=-ldiscord-rpc
+opts+=-DUSE_STUN
+sources+=discord.c stun.c
+endif
+
+# (Valgrind is a memory debugger.)
+ifdef VALGRIND
+VALGRIND_PKGCONFIG?=valgrind
+VALGRIND_LDFLAGS=
+$(eval $(call Use_pkg_config,VALGRIND))
+ZDEBUG=1
+opts+=-DHAVE_VALGRIND
+endif
+
+default_packages:=\
+	LIBGME/libgme/LIBGME\
+	OPENMPT/libopenmpt/LIBOPENMPT\
+	ZLIB/zlib\
+
+$(foreach p,$(default_packages),\
+	$(eval $(call Check_pkg_config,$(p))))
diff --git a/src/Makefile.d/haiku.mk b/src/Makefile.d/haiku.mk
new file mode 100644
index 000000000..6742ec75b
--- /dev/null
+++ b/src/Makefile.d/haiku.mk
@@ -0,0 +1,71 @@
+#
+# Makefile options for Haiku
+#
+
+opts+=-DUNIXCOMMON -DLUA_USE_POSIX
+
+ifndef DEDICATED
+ifndef DUMMY
+SDL?=1
+DEDICATED?=0
+endif
+endif
+
+NOEXECINFO=1
+
+ifeq (${SDL},1)
+EXENAME?=srb2haiku
+else ifeq (${DEDICATED},1)
+EXENAME?=srb2haikud
+endif
+
+ifndef NONET
+libs+=-lnetwork
+endif
+
+define _set =
+$(1)_CFLAGS?=$($(1)_opts)
+$(1)_LDFLAGS?=$($(1)_libs)
+endef
+
+lib:=../libs/gme
+LIBGME_opts:=-I$(lib)/include
+LIBGME_libs:=-l:libgme.so.0
+$(eval $(call _set,LIBGME))
+
+lib:=../libs/libopenmpt
+LIBOPENMPT_opts:=-I$(lib)/inc
+LIBOPENMPT_libs:=-l:libopenmpt.so.0
+$(eval $(call _set,LIBOPENMPT))
+
+ifdef SDL
+lib:=../libs/SDL2_mixer
+mixer_opts:=-I$(lib)/include
+mixer_libs:=-l:libSDL2_mixer-2.0.so.0
+
+lib:=../libs/SDL2
+SDL_opts:=-I$(lib)/include $(mixer_opts)
+SDL_libs:=$(mixer_libs) -l:libSDL2-2.0.so.0
+$(eval $(call _set,SDL))
+endif
+
+lib:=../libs/zlib
+ZLIB_opts:=-I$(lib)
+ZLIB_libs:=-l:libz.so.1
+$(eval $(call _set,ZLIB))
+
+ifndef PNG_CONFIG
+PNG_opts:=
+PNG_libs:=-l:libpng16.so.16
+$(eval $(call _set,PNG))
+endif
+
+lib:=../libs/curl
+CURL_opts:=-I$(lib)/include
+CURL_libs:=-l:libcurl.so.4
+$(eval $(call _set,CURL))
+
+lib:=../libs/miniupnpc
+MINIUPNPC_opts:=-I$(lib)/include
+MINIUPNPC_libs:=-l:libminiupnpc.so.17
+$(eval $(call _set,MINIUPNPC))
diff --git a/src/Makefile.d/nix.mk b/src/Makefile.d/nix.mk
new file mode 100644
index 000000000..7135f258b
--- /dev/null
+++ b/src/Makefile.d/nix.mk
@@ -0,0 +1,47 @@
+#
+# Makefile options for unices (linux, bsd...)
+#
+
+
+opts+=-DUNIXCOMMON -DLUA_USE_POSIX
+# Use -rdynamic so a backtrace log shows function names
+# instead of addresses
+libs+=-lm -rdynamic
+
+ifndef NOHW
+opts+=-I/usr/X11R6/include
+libs+=-L/usr/X11R6/lib
+endif
+
+ifndef DEDICATED
+SDL?=1
+DEDICATED?=0
+endif
+
+ifeq (${SDL},1)
+EXENAME?=lsdl2srb2kart
+endif
+
+ifeq (${DEDICATED},1)
+EXENAME?=lsrb2kartd
+endif
+
+# In common usage.
+ifdef LINUX
+libs+=-lrt
+passthru_opts+=NOTERMIOS
+endif
+
+# Tested by Steel, as of release 2.2.8.
+ifdef FREEBSD
+opts+=-I/usr/X11R6/include -DLINUX -DFREEBSD
+libs+=-L/usr/X11R6/lib -lkvm -lexecinfo
+endif
+
+# FIXME: UNTESTED
+#ifdef SOLARIS
+#NOIPX=1
+#opts+=-I/usr/local/include -I/opt/sfw/include \
+#		-DSOLARIS -DINADDR_NONE=INADDR_ANY -DBSD_COMP
+#libs+=-L/opt/sfw/lib -lsocket -lnsl
+#endif
diff --git a/src/Makefile.d/old.mk b/src/Makefile.d/old.mk
new file mode 100644
index 000000000..ec9b6d776
--- /dev/null
+++ b/src/Makefile.d/old.mk
@@ -0,0 +1,16 @@
+#
+# Warn about old build directories and offer to purge.
+#
+
+_old:=$(wildcard $(addprefix ../bin/,FreeBSD Linux \
+		Linux64 Mingw Mingw64 SDL dummy) ../objs ../dep)
+
+ifdef _old
+$(foreach v,$(_old),$(info $(abspath $(v))))
+$(info )
+$(info These directories are no longer\
+       required and should be removed.)
+$(info You may remove them manually or\
+       by using 'make distclean')
+$(error )
+endif
diff --git a/src/Makefile.d/platform.mk b/src/Makefile.d/platform.mk
new file mode 100644
index 000000000..d5423a397
--- /dev/null
+++ b/src/Makefile.d/platform.mk
@@ -0,0 +1,76 @@
+#
+# Platform specific options.
+#
+
+PKG_CONFIG?=pkg-config
+
+ifdef WINDOWSHELL
+rmrf=-2>NUL DEL /S /Q
+mkdir=-2>NUL MD
+cat=TYPE
+else
+rmrf=rm -rf
+mkdir=mkdir -p
+cat=cat
+endif
+
+ifdef LINUX64
+LINUX=1
+endif
+
+ifdef MINGW64
+MINGW=1
+endif
+
+ifdef LINUX
+UNIX=1
+ifdef LINUX64
+NONX86=1
+# LINUX64 does not imply X86_64=1;
+# could mean ARM64 or Itanium
+platform=linux/64
+else
+platform=linux
+endif
+else ifdef FREEBSD
+UNIX=1
+platform=freebsd
+else ifdef HAIKU
+# Give Haiku its own configuration, since it
+# isn't actually UNIX.
+include Makefile.d/haiku.mk
+else ifdef SOLARIS # FIXME: UNTESTED
+UNIX=1
+platform=solaris
+else ifdef CYGWIN32 # FIXME: UNTESTED
+platform=cygwin
+else ifdef MINGW
+ifdef MINGW64
+NONX86=1
+NOASM=1
+# MINGW64 should not necessarily imply X86_64=1,
+# but we make that assumption elsewhere
+# Once that changes, remove this
+X86_64=1
+platform=mingw/64
+else
+platform=mingw
+endif
+include Makefile.d/win32.mk
+endif
+
+ifdef platform
+makedir:=$(makedir)/$(platform)
+endif
+
+ifdef UNIX
+include Makefile.d/nix.mk
+endif
+
+ifeq ($(SDL), 1)
+include Makefile.d/sdl.mk
+else ifeq ($(DEDICATED), 1)
+include Makefile.d/dedicated.mk
+else
+include Makefile.d/dummy.mk
+endif
diff --git a/src/Makefile.d/sdl.mk b/src/Makefile.d/sdl.mk
new file mode 100644
index 000000000..c704a83eb
--- /dev/null
+++ b/src/Makefile.d/sdl.mk
@@ -0,0 +1,71 @@
+#
+# Makefile options for SDL2 backend.
+#
+
+#
+# SDL...., *looks at Alam*, THIS IS A MESS!
+#
+# ...a little bird flexes its muscles...
+#
+
+makedir:=$(makedir)/SDL
+
+opts+=-DDIRECTFULLSCREEN -DHAVE_SDL
+sources+=$(call List,sdl/Sourcefile)
+
+NOUPNP=1
+
+# FIXME: UNTESTED
+#ifdef PANDORA
+#include sdl/SRB2Pandora/Makefile.cfg
+#endif #ifdef PANDORA
+
+# FIXME: UNTESTED
+#ifdef CYGWIN32
+#include sdl/MakeCYG.cfg
+#endif #ifdef CYGWIN32
+
+ifndef NOHW
+sources+=sdl/ogl_sdl.c
+endif
+
+ifdef NOMIXER
+sources+=sdl/sdl_sound.c
+else
+opts+=-DHAVE_MIXER
+sources+=sdl/mixer_sound.c
+
+  ifndef HAIKU # Haiku has a special import path
+    libs+=-lSDL2_mixer
+  endif
+endif
+
+ifndef NOTHREADS
+opts+=-DHAVE_THREADS
+sources+=sdl/i_threads.c
+endif
+
+ifdef SDL_PKGCONFIG
+$(eval $(call Use_pkg_config,SDL))
+else
+SDL_CONFIG?=$(call Prefix,sdl2-config)
+SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags)
+SDL_LDFLAGS?=$(shell $(SDL_CONFIG) \
+		$(if $(STATIC),--static-libs,--libs))
+$(eval $(call Propogate_flags,SDL))
+endif
+
+ifdef MINGW
+ifndef NOSDLMAIN
+SDLMAIN=1
+endif
+endif
+
+ifdef SDLMAIN
+opts+=-DSDLMAIN
+else
+ifdef MINGW
+opts+=-Umain
+libs+=-mconsole
+endif
+endif
diff --git a/src/Makefile.d/util.mk b/src/Makefile.d/util.mk
new file mode 100644
index 000000000..bda68df13
--- /dev/null
+++ b/src/Makefile.d/util.mk
@@ -0,0 +1,93 @@
+#
+# Utility macros for the rest of the Makefiles.
+#
+
+Ifnot=$(if $(1),$(3),$(2))
+Ifndef=$(call Ifnot,$($(1)),$(2),$(3))
+
+# Match and expand a list of variables by pattern.
+Wildvar=$(foreach v,$(filter $(1),$(.VARIABLES)),$($(v)))
+
+# Read a list of words from file and prepend each with the
+# directory of the file.
+_cat=$(shell $(cat) $(call Windows_path,$(1)))
+List=$(addprefix $(dir $(1)),$(call _cat,$(1)))
+
+# Convert path separators to backslash on Windows.
+Windows_path=$(if $(WINDOWSHELL),$(subst /,\,$(1)),$(1))
+
+define Propogate_flags =
+opts+=$$($(1)_CFLAGS)
+libs+=$$($(1)_LDFLAGS)
+endef
+
+# Set library's _CFLAGS and _LDFLAGS from some command.
+# Automatically propogates the flags too.
+# 1: variable prefix (e.g. CURL)
+# 2: start of command (e.g. curl-config)
+# --- optional ----
+# 3: CFLAGS command arguments, default '--cflags'
+# 4: LDFLAGS command arguments, default '--libs'
+# 5: common command arguments at the end of command
+define Configure =
+$(1)_CFLAGS?=$$(shell $(2) $(or $(3),--cflags) $(5))
+$(1)_LDFLAGS?=$$(shell $(2) $(or $(4),--libs) $(5))
+$(call Propogate_flags,$(1))
+endef
+
+# Configure library with pkg-config. The package name is
+# taken from a _PKGCONFIG variable.
+# 1: variable prefix
+#
+#     LIBGME_PKGCONFIG=libgme
+#     $(eval $(call Use_pkg_config,LIBGME))
+define Use_pkg_config =
+$(call Configure,$(1),$(PKG_CONFIG),,,$($(1)_PKGCONFIG))
+endef
+
+# Check disabling flag and configure package in one step
+# according to delimited argument.
+# (There is only one argument, but it split by slash.)
+# 1/: short form library name (uppercase). This is
+#     prefixed with 'NO' and 'HAVE_'. E.g. NOGME, HAVE_GME
+# /2: package name (e.g. libgme)
+# /3: variable prefix
+#
+# The following example would check if NOGME is not
+# defined before attempting to define LIBGME_CFLAGS and
+# LIBGME_LDFLAGS as with Use_pkg_config.
+#
+#     $(eval $(call Check_pkg_config,GME/libgme/LIBGME))
+define Check_pkg_config =
+_p:=$(subst /, ,$(1))
+_v1:=$$(word 1,$$(_p))
+_v2:=$$(or $$(word 3,$$(_p)),$$(_v1))
+ifndef NO$$(_v1)
+$$(_v2)_PKGCONFIG?=$$(word 2,$$(_p))
+$$(eval $$(call Use_pkg_config,$$(_v2)))
+opts+=-DHAVE_$$(_v1)
+endif
+endef
+
+#     $(call Prefix,gcc)
+Prefix=$(if $(PREFIX),$(PREFIX)-)$(1)
+
+Echo=
+Echo_name=
+Print=
+
+ifndef SILENT
+Echo=@echo $(1)
+ifndef ECHO
+ifndef NOECHOFILENAMES
+Echo_name=$(call Echo,-- $(1) ...)
+endif
+endif
+ifndef MAKE_RESTARTS
+ifndef destructive
+Print=$(info $(1))
+endif
+endif
+endif
+
+.=$(call Ifndef,ECHO,@)
diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk
new file mode 100644
index 000000000..8485b0b16
--- /dev/null
+++ b/src/Makefile.d/versions.mk
@@ -0,0 +1,179 @@
+#
+# Flags to put a sock in GCC!
+#
+
+# See the versions list in detect.mk
+# This will define all version flags going backward.
+# Yes, it's magic.
+define _predecessor =
+ifdef GCC$(firstword $(1))
+GCC$(lastword $(1)):=1
+endif
+endef
+_n:=$(words $(gcc_versions))
+$(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\
+	$(addprefix =,$(wordlist 2,$(_n),$(gcc_versions)))),\
+	$(and $(findstring =,$(v)),\
+	$(eval $(call _predecessor,$(subst =, ,$(v))))))
+
+# aggregate returns seem to happen alot in c++ so just supress em lel
+CXXFLAGS+= -Wno-aggregate-return
+
+# -W -Wno-unused
+WFLAGS:=-Wall -Wno-trigraphs
+ifndef GCC295
+#WFLAGS+=-Wno-packed
+endif
+ifndef RELAXWARNINGS
+ WFLAGS+=-W
+#WFLAGS+=-Wno-sign-compare
+ifndef GCC295
+ WFLAGS+=-Wno-div-by-zero
+endif
+#WFLAGS+=-Wsystem-headers
+WFLAGS+=-Wfloat-equal
+#WFLAGS+=-Wtraditional
+ WFLAGS+=-Wundef
+ifndef GCC295
+ WFLAGS+=-Wendif-labels
+endif
+ifdef GCC41
+ WFLAGS+=-Wshadow
+endif
+#WFLAGS+=-Wlarger-than-%len%
+ WFLAGS+=-Wpointer-arith
+ CWFLAGS+=-Wbad-function-cast
+ifdef GCC45
+#WFLAGS+=-Wc++-compat
+endif
+ WFLAGS+=-Wcast-qual
+ifndef NOCASTALIGNWARN
+ WFLAGS+=-Wcast-align
+endif
+ WFLAGS+=-Wwrite-strings
+ifndef ERRORMODE
+#WFLAGS+=-Wconversion
+ifdef GCC43
+ #WFLAGS+=-Wno-sign-conversion
+endif
+endif
+ WFLAGS+=-Wsign-compare
+ifdef GCC91
+ WFLAGS+=-Wno-error=address-of-packed-member
+endif
+ifdef GCC45
+ WFLAGS+=-Wlogical-op
+endif
+ WFLAGS+=-Waggregate-return
+ifdef HAIKU
+ifdef GCC41
+ #WFLAGS+=-Wno-attributes
+endif
+endif
+#WFLAGS+=-Wstrict-prototypes
+ifdef GCC40
+ CWFLAGS+=-Wold-style-definition
+endif
+ WFLAGS+=-Wmissing-declarations
+ CWFLAGS+=-Wmissing-prototypes
+ifdef GCC40
+ WFLAGS+=-Wmissing-field-initializers
+endif
+ WFLAGS+=-Wmissing-noreturn
+#WFLAGS+=-Wmissing-format-attribute
+#WFLAGS+=-Wno-multichar
+#WFLAGS+=-Wno-deprecated-declarations
+#WFLAGS+=-Wpacked
+#WFLAGS+=-Wpadded
+#WFLAGS+=-Wredundant-decls
+ CWFLAGS+=-Wnested-externs
+#WFLAGS+=-Wunreachable-code
+ WFLAGS+=-Winline
+ifdef DEBUGMODE
+ WFLAGS+=-Wno-error=inline
+endif
+ifdef GCC43
+ WFLAGS+=-funit-at-a-time
+ WFLAGS+=-Wlogical-op
+endif
+ifndef GCC295
+ WFLAGS+=-Wdisabled-optimization
+endif
+endif
+WFLAGS+=-Wformat-y2k
+ifdef GCC71
+WFLAGS+=-Wno-error=format-overflow=2
+endif
+WFLAGS+=-Wformat-security
+ifndef GCC29
+#WFLAGS+=-Winit-self
+endif
+ifdef GCC46
+WFLAGS+=-Wno-suggest-attribute=noreturn
+endif
+
+ifdef NOLDWARNING
+LDFLAGS+=-Wl,--as-needed
+endif
+
+ifdef ERRORMODE
+WFLAGS+=-Werror
+endif
+
+ifdef GCC43
+ #WFLAGS+=-Wno-error=clobbered
+endif
+ifdef GCC44
+#WFLAGS+=-Wno-error=array-bounds
+endif
+ifdef GCC46
+ WFLAGS+=-Wno-error=suggest-attribute=noreturn
+endif
+ifdef GCC54
+ WFLAGS+=-Wno-logical-op -Wno-error=logical-op
+endif
+ifdef GCC61
+ WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
+endif
+ifdef GCC71
+ WFLAGS+=-Wimplicit-fallthrough=4
+endif
+ifdef GCC81
+ WFLAGS+=-Wno-error=format-overflow
+ WFLAGS+=-Wno-format-overflow
+ WFLAGS+=-Wno-error=multistatement-macros
+endif
+
+ifdef NONX86
+  ifdef X86_64 # yeah that SEEMS contradictory
+  opts+=-march=nocona
+  endif
+else
+  ifndef GCC29
+  opts+=-msse3 -mfpmath=sse
+  else
+  opts+=-mpentium
+  endif
+endif
+
+ifdef DEBUGMODE
+ifdef GCC48
+opts+=-Og
+else
+opts+=-O0
+endif
+endif
+
+ifdef VALGRIND
+ifdef GCC46
+WFLAGS+=-Wno-error=unused-but-set-variable
+WFLAGS+=-Wno-unused-but-set-variable
+endif
+endif
+
+# Lua
+ifdef GCC43
+ifndef GCC44
+WFLAGS+=-Wno-logical-op
+endif
+endif
diff --git a/src/Makefile.d/win32.mk b/src/Makefile.d/win32.mk
new file mode 100644
index 000000000..fa411416e
--- /dev/null
+++ b/src/Makefile.d/win32.mk
@@ -0,0 +1,124 @@
+#
+# Mingw, if you don't know, that's Win32/Win64
+#
+
+ifndef MINGW64
+EXENAME?=srb2kart-saturn_32bit.exe
+else
+EXENAME?=srb2kart-saturn_64bit.exe
+endif
+
+# disable dynamicbase if under msys2
+ifdef MSYSTEM
+libs+=-Wl,--disable-dynamicbase
+endif
+
+sources+=win32/Srb2win.rc
+opts+=-DSTDC_HEADERS
+libs+=-ladvapi32 -lkernel32 -lmsvcrt -luser32
+
+ifndef DEDICATED
+ifndef DUMMY
+SDL?=1
+endif
+endif
+
+ifndef NOHW
+opts+=-DUSE_WGL_SWAP
+endif
+
+ifdef MINGW64
+libs+=-lws2_32
+else
+#ifndef HAVE_IPV6
+#libs+=-lwsock32
+#else
+libs+=-lws2_32
+#endif
+endif
+
+ifndef MINGW64
+libs+=-Wl,--large-address-aware
+NOLIBBACKTRACE=1
+endif
+
+ifndef MINGW64
+32=32
+x86=x86
+i686=i686
+else
+32=64
+x86=x86_64
+i686=x86_64
+endif
+
+mingw:=$(i686)-w64-mingw32
+
+define _set =
+$(1)_CFLAGS?=$($(1)_opts)
+$(1)_LDFLAGS?=$($(1)_libs)
+endef
+
+lib:=../libs/gme
+LIBGME_opts:=-I$(lib)/include
+LIBGME_libs:=-L$(lib)/win$(32) -lgme
+$(eval $(call _set,LIBGME))
+
+lib:=../libs/libopenmpt
+LIBOPENMPT_opts:=-I$(lib)/inc
+LIBOPENMPT_libs:=-L$(lib)/lib/$(x86) -lopenmpt
+$(eval $(call _set,LIBOPENMPT))
+
+lib:=../libs/SDL2_mixer/$(mingw)
+
+ifdef SDL
+mixer_opts:=-I$(lib)/include/SDL2
+mixer_libs:=-L$(lib)/lib
+
+lib:=../libs/SDL2/$(mingw)
+SDL_opts:=-I$(lib)/include/SDL2\
+	$(mixer_opts) -Dmain=SDL_main
+SDL_libs:=-L$(lib)/lib $(mixer_libs)\
+	-lmingw32 -lSDL2main -lSDL2 -mwindows
+$(eval $(call _set,SDL))
+endif
+
+ifdef MINGW64
+lib:=../libs/libbacktrace
+LIBBACKTRACE_opts:=-I$(lib)/include
+LIBBACKTRACE_libs:=-L$(lib)/lib/x86_64 -lbacktrace
+$(eval $(call _set,LIBBACKTRACE))
+else
+lib:=../libs/drmingw
+opts+=-I$(lib)/include
+libs+=-L$(lib)/lib/win32 -lmgwhelp -lexchndl
+endif
+
+lib:=../libs/zlib
+ZLIB_opts:=-I$(lib)
+ZLIB_libs:=-L$(lib)/win32 -l:libz$(32).a
+$(eval $(call _set,ZLIB))
+
+ifndef PNG_CONFIG
+lib:=../libs/libpng-src
+PNG_opts:=-I$(lib)
+PNG_libs:=-L$(lib)/projects -lpng$(32)
+$(eval $(call _set,PNG))
+endif
+
+lib:=../libs/curl
+CURL_opts:=-I$(lib)/include
+CURL_libs:=-L$(lib)/lib$(32) -lcurl
+$(eval $(call _set,CURL))
+
+ifndef MINGW64 # miniupnc is broken with MINGW64
+lib:=../libs/miniupnpc
+MINIUPNPC_opts:=-I$(lib)/include -DMINIUPNP_STATICLIB
+MINIUPNPC_libs:=-L$(lib)/mingw$(32) -lminiupnpc -lws2_32 -liphlpapi
+$(eval $(call _set,MINIUPNPC))
+endif
+
+lib:=../libs/discord-rpc/win$(32)-dynamic
+DISCORDRPC_opts+=-I$(lib)/include
+DISCORDRPC_libs+=-L$(lib)/lib -ldiscord-rpc
+$(eval $(call _set,DISCORDRPC))
diff --git a/src/Sourcefile b/src/Sourcefile
new file mode 100644
index 000000000..a2e9ee736
--- /dev/null
+++ b/src/Sourcefile
@@ -0,0 +1,100 @@
+am_map.c
+b_bot.c
+command.c
+console.c
+d_clisrv.c
+d_main.c
+d_net.c
+d_netcmd.c
+d_netfil.c
+d_protocol.c
+dehacked.c
+f_finale.c
+f_wipe.c
+filesrch.c
+g_game.c
+g_demo.c
+g_input.c
+hu_stuff.c
+i_tcp.c
+i_time.c
+info.c
+lzf.c
+m_aatree.c
+m_anigif.c
+m_argv.c
+m_bbox.c
+m_cheat.c
+m_cond.c
+m_fixed.c
+m_menu.c
+m_textinput.c
+m_emotes.cpp
+m_misc.c
+m_perfstats.c
+m_queue.c
+m_random.c
+mserv.c
+http-mserv.c
+qs22j.c
+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.c
+r_bsp.c
+r_data.c
+r_draw.c
+r_fps.c
+r_main.cpp
+r_patch.c
+r_patchrotation.c
+r_plane.cpp
+r_segs.cpp
+r_skins.c
+r_sky.c
+r_splats.c
+r_things.cpp
+r_portal.c
+p_ceilng.c
+p_enemy.c
+p_floor.c
+p_inter.c
+p_lights.c
+p_map.c
+p_maputl.c
+p_mobj.c
+p_polyobj.c
+p_saveg.c
+p_setup.c
+p_sight.c
+p_slopes.c
+p_spec.c
+p_telept.c
+p_tick.c
+p_user.c
+k_director.c
+k_kart.c
+k_hud.c
+k_stats.c
+lua_baselib.c
+lua_blockmaplib.c
+lua_consolelib.c
+lua_hooklib.c
+lua_hudlib.c
+lua_hudlib_drawlist.c
+lua_infolib.c
+lua_maplib.c
+lua_mathlib.c
+lua_mobjlib.c
+lua_playerlib.c
+lua_script.c
+lua_skinlib.c
+lua_thinkerlib.c
+lua_udatalib.c
+lua_glib.c
diff --git a/src/am_map.c b/src/am_map.c
index d94ec7262..f05f2def1 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -1,8 +1,10 @@
-// SONIC ROBO BLAST 2
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
 // Copyright (C) 1993-1996 by id Software, Inc.
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2018 by Sonic Team Junior.
+// Copyright (C) 2024 by Vivian "toastergrl" Grannell.
+// Copyright (C) 2024 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.
@@ -33,36 +35,31 @@ static const UINT8 GRAYSRANGE  = 16;
 static const UINT8 BROWNS      = (3*16);
 static const UINT8 YELLOWS     = (7*16);
 static const UINT8 GREENS      = (10*16);
+//static const UINT8 CYANS     = (13*16);
+static const UINT8 BLUES       = (14*16);
 static const UINT8 DBLACK      = 31;
 static const UINT8 DWHITE      = 0;
 
-static const UINT8 NOCLIMBREDS        = 248;
-static const UINT8 NOCLIMBREDRANGE    = 8;
-static const UINT8 NOCLIMBGRAYS       = 204;
-static const UINT8 NOCLIMBBROWNS      = (2*16);
-static const UINT8 NOCLIMBYELLOWS     = (11*16);
-
 // Automap colors
 #define BACKGROUND            DBLACK
 #define WALLCOLORS            (REDS + REDRANGE/2)
 #define WALLRANGE             (REDRANGE/2)
-#define NOCLIMBWALLCOLORS     (NOCLIMBREDS + NOCLIMBREDRANGE/2)
-#define NOCLIMBWALLRANGE      (NOCLIMBREDRANGE/2)
 #define THOKWALLCOLORS        REDS
 #define THOKWALLRANGE         REDRANGE
-#define NOCLIMBTHOKWALLCOLORS NOCLIMBREDS
-#define NOCLIMBTHOKWALLRANGE  NOCLIMBREDRANGE
-#define TSWALLCOLORS          GRAYS
-#define TSWALLRANGE           GRAYSRANGE
-#define NOCLIMBTSWALLCOLORS   NOCLIMBGRAYS
+#define TSWALLCOLORS          DWHITE
+#define TSFINISHLINE          (GREENS + 2)
+#define TSFOFINFO             (BLUES + 4)
 #define FDWALLCOLORS          BROWNS
-#define NOCLIMBFDWALLCOLORS   NOCLIMBBROWNS
 #define CDWALLCOLORS          YELLOWS
-#define NOCLIMBCDWALLCOLORS   NOCLIMBYELLOWS
 #define THINGCOLORS           GREENS
 #define GRIDCOLORS            (GRAYS + GRAYSRANGE/2)
 #define XHAIRCOLORS           GRAYS
 
+// Automap passes
+#define PASS_SOLID 			1
+#define PASS_INTANGIBLE		2
+#define PASS_FOF			4
+
 // controls
 #define AM_PANUPKEY     KEY_UPARROW
 #define AM_PANDOWNKEY   KEY_DOWNARROW
@@ -110,11 +107,6 @@ typedef struct
 	mpoint_t a, b;
 } mline_t;
 
-typedef struct
-{
-	fixed_t slp, islp;
-} islope_t;
-
 //
 // The vector graphics for the automap.
 // A line drawing of the player pointing right,
@@ -136,16 +128,14 @@ static const mline_t player_arrow[] = {
 #undef R
 #define NUMPLYRLINES (sizeof (player_arrow)/sizeof (mline_t))
 
-#if 0
 #define R (FRACUNIT)
-static mline_t triangle_guy[] = {
-	{ { (fixed_t)-.867f*R, (fixed_t)-.5f*R }, { (fixed_t) .867f*R, (fixed_t)-.5f*R } },
-	{ { (fixed_t) .867f*R, (fixed_t)-.5f*R }, { (fixed_t)       0, (fixed_t)     R } },
-	{ { (fixed_t)       0, (fixed_t)     R }, { (fixed_t)-.867f*R, (fixed_t)-.5f*R } }
+static const mline_t cross_mark[] =
+{
+	{ { -R, 0 }, { R, 0} },
+	{ { 0, -R }, { 0, R } },
 };
 #undef R
-#define NUMTRIANGLEGUYLINES (sizeof (triangle_guy)/sizeof (mline_t))
-#endif
+#define NUMCROSSMARKLINES (sizeof(cross_mark)/sizeof(mline_t))
 
 #define R (FRACUNIT)
 static const mline_t thintriangle_guy[] = {
@@ -162,10 +152,14 @@ static boolean draw_grid = false;
 boolean automapactive = false;
 boolean am_recalc = false; //added : 05-02-98 : true when screen size changes
 static boolean am_stopped = true;
+static boolean am_minigen = false;
+
+static UINT8 *am_buf = NULL;
 
 static INT32 f_x, f_y;	// location of window on screen (always zero for both)
 static INT32 f_w, f_h;	// size of window on screen (always the screen width and height respectively)
 
+static boolean m_keydown[4]; // which window panning keys are being pressed down?
 static mpoint_t m_paninc; // how far the window pans each tic (map coords)
 static fixed_t mtof_zoommul; // how far the window zooms in each tic (map coords)
 static fixed_t ftom_zoommul; // how far the window zooms in each tic (fb coords)
@@ -203,14 +197,15 @@ static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
 // used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
 static fixed_t scale_ftom;
 
-static player_t *plr; // the player represented by an arrow
+static player_t *plr = NULL; // the player represented by an arrow
 
-static INT32 followplayer = true; // specifies whether to follow the player around
+static boolean followplayer = true; // specifies whether to follow the player around
 
 // function for drawing lines, depends on rendermode
 typedef void (*AMDRAWFLINEFUNC) (const fline_t *fl, INT32 color);
 static AMDRAWFLINEFUNC AM_drawFline;
 
+static void AM_drawPixel(INT32 xx, INT32 yy, INT32 cc);
 static void AM_drawFline_soft(const fline_t *fl, INT32 color);
 
 static void AM_activateNewScale(void)
@@ -242,7 +237,7 @@ static inline void AM_restoreScaleAndLoc(void)
 		m_x = old_m_x;
 		m_y = old_m_y;
 	}
-	else
+	else if (plr && plr->mo)
 	{
 		m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2;
 		m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2;
@@ -260,28 +255,15 @@ static inline void AM_restoreScaleAndLoc(void)
   */
 static void AM_findMinMaxBoundaries(void)
 {
-	size_t i;
-	fixed_t a;
-	fixed_t b;
+	fixed_t a, b;
 
-	min_x = min_y = +INT32_MAX;
-	max_x = max_y = -INT32_MAX;
+	min_x = minimapinfo.min_x << MAPBITS;
+	max_x = minimapinfo.max_x << MAPBITS;
+	min_y = minimapinfo.min_y << MAPBITS;
+	max_y = minimapinfo.max_y << MAPBITS;
 
-	for (i = 0; i < numvertexes; i++)
-	{
-		if (vertexes[i].x < min_x)
-			min_x = vertexes[i].x;
-		else if (vertexes[i].x > max_x)
-			max_x = vertexes[i].x;
-
-		if (vertexes[i].y < min_y)
-			min_y = vertexes[i].y;
-		else if (vertexes[i].y > max_y)
-			max_y = vertexes[i].y;
-	}
-
-	max_w = (max_x >>= FRACTOMAPBITS) - (min_x >>= FRACTOMAPBITS);
-	max_h = (max_y >>= FRACTOMAPBITS) - (min_y >>= FRACTOMAPBITS);
+	max_w = minimapinfo.map_w << MAPBITS;
+	max_h = minimapinfo.map_h << MAPBITS;
 
 	a = FixedDiv(f_w<<FRACBITS, max_w);
 	b = FixedDiv(f_h<<FRACBITS, max_h);
@@ -336,11 +318,13 @@ static void AM_initVariables(void)
 				break;
 
 	plr = &players[pnum];
-	if (plr != NULL && plr->mo != NULL)
+
+	if (plr && plr->mo)
 	{
 		m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2;
 		m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2;
 	}
+
 	AM_changeWindowLoc();
 
 	// for saving & restoring
@@ -350,22 +334,23 @@ static void AM_initVariables(void)
 	old_m_h = m_h;
 }
 
+//
+// Called when the screen size changes.
+//
+static void AM_FrameBufferInit(void)
+{
+	f_x = f_y = 0;
+	f_w = vid.width;
+	f_h = vid.height;
+	am_buf = vid.screens[0];
+}
+
 //
 // should be called at the start of every level
 // right now, i figure it out myself
 //
 static void AM_LevelInit(void)
 {
-	f_x = f_y = 0;
-	f_w = vid.width;
-	f_h = vid.height;
-
-	AM_drawFline = AM_drawFline_soft;
-#ifdef HWRENDER
-	if (rendermode == render_opengl)
-		AM_drawFline = HWR_drawAMline;
-#endif
-
 	AM_findMinMaxBoundaries();
 	scale_mtof = FixedDiv(min_scale_mtof*10, 7*FRACUNIT);
 	if (scale_mtof > max_scale_mtof)
@@ -387,7 +372,7 @@ void AM_Stop(void)
   *
   * \sa AM_Stop
   */
-static inline void AM_Start(void)
+void AM_Start(void)
 {
 	static INT32 lastlevel = -1;
 
@@ -396,8 +381,12 @@ static inline void AM_Start(void)
 	am_stopped = false;
 	if (lastlevel != gamemap || am_recalc) // screen size changed
 	{
-		AM_LevelInit();
-		lastlevel = gamemap;
+		AM_FrameBufferInit();
+		if (lastlevel != gamemap)
+		{
+			AM_LevelInit();
+			lastlevel = gamemap;
+		}
 		am_recalc = false;
 	}
 	AM_initVariables();
@@ -423,6 +412,28 @@ static void AM_maxOutWindowScale(void)
 	AM_activateNewScale();
 }
 
+//
+// set window panning
+//
+static void AM_setWindowPanning(void)
+{
+	// up and down
+	if (m_keydown[2]) // pan up
+		m_paninc.y = FTOM(F_PANINC);
+	else if (m_keydown[3]) // pan down
+		m_paninc.y = -FTOM(F_PANINC);
+	else
+		m_paninc.y = 0;
+
+	// left and right
+	if (m_keydown[0]) // pan right
+		m_paninc.x = FTOM(F_PANINC);
+	else if (m_keydown[1]) // pan left
+		m_paninc.x = -FTOM(F_PANINC);
+	else
+		m_paninc.x = 0;
+}
+
 /** Responds to user inputs in automap mode.
   *
   * \param ev Event to possibly respond to.
@@ -455,35 +466,49 @@ boolean AM_Responder(event_t *ev)
 			{
 				case AM_PANRIGHTKEY: // pan right
 					if (!followplayer)
-						m_paninc.x = FTOM(F_PANINC);
+					{
+						m_keydown[0] = true;
+						AM_setWindowPanning();
+					}
 					else
 						rc = false;
 					break;
 				case AM_PANLEFTKEY: // pan left
 					if (!followplayer)
-						m_paninc.x = -FTOM(F_PANINC);
+					{
+						m_keydown[1] = true;
+						AM_setWindowPanning();
+					}
 					else
 						rc = false;
 					break;
 				case AM_PANUPKEY: // pan up
 					if (!followplayer)
-						m_paninc.y = FTOM(F_PANINC);
+					{
+						m_keydown[2] = true;
+						AM_setWindowPanning();
+					}
 					else
 						rc = false;
 					break;
 				case AM_PANDOWNKEY: // pan down
 					if (!followplayer)
-						m_paninc.y = -FTOM(F_PANINC);
+					{
+						m_keydown[3] = true;
+						AM_setWindowPanning();
+					}
 					else
 						rc = false;
 					break;
 				case AM_ZOOMOUTKEY: // zoom out
 					mtof_zoommul = M_ZOOMOUT;
 					ftom_zoommul = M_ZOOMIN;
+					AM_setWindowPanning();
 					break;
 				case AM_ZOOMINKEY: // zoom in
 					mtof_zoommul = M_ZOOMIN;
 					ftom_zoommul = M_ZOOMOUT;
+					AM_setWindowPanning();
 					break;
 				case AM_TOGGLEKEY:
 					AM_Stop();
@@ -497,6 +522,7 @@ boolean AM_Responder(event_t *ev)
 					}
 					else
 						AM_restoreScaleAndLoc();
+					AM_setWindowPanning();
 					break;
 				case AM_FOLLOWKEY:
 					followplayer = !followplayer;
@@ -516,14 +542,32 @@ boolean AM_Responder(event_t *ev)
 			switch (ev->data1)
 			{
 				case AM_PANRIGHTKEY:
+					if (!followplayer)
+					{
+						m_keydown[0] = false;
+						AM_setWindowPanning();
+					}
+					break;
 				case AM_PANLEFTKEY:
 					if (!followplayer)
-						m_paninc.x = 0;
+					{
+						m_keydown[1] = false;
+						AM_setWindowPanning();
+					}
 					break;
 				case AM_PANUPKEY:
+					if (!followplayer)
+					{
+						m_keydown[2] = false;
+						AM_setWindowPanning();
+					}
+					break;
 				case AM_PANDOWNKEY:
 					if (!followplayer)
-						m_paninc.y = 0;
+					{
+						m_keydown[3] = false;
+						AM_setWindowPanning();
+					}
 					break;
 				case AM_ZOOMOUTKEY:
 				case AM_ZOOMINKEY:
@@ -555,6 +599,9 @@ static inline void AM_changeWindowScale(void)
 
 static inline void AM_doFollowPlayer(void)
 {
+	if (!plr || !plr->mo)
+		return;
+
 	if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
 	{
 		m_x = FTOM(MTOF(plr->mo->x >> FRACTOMAPBITS)) - m_w/2;
@@ -724,6 +771,16 @@ static boolean AM_clipMline(const mline_t *ml, fline_t *fl)
 }
 #undef DOOUTCODE
 
+//
+// Draws a pixel.
+//
+static void AM_drawPixel(INT32 xx, INT32 yy, INT32 cc)
+{
+	if (xx < 0 || yy < 0 || xx >= f_w || yy >= f_h)
+		return; // off the screen
+	am_buf[(yy*f_w) + xx] = cc;
+}
+
 //
 // Classic Bresenham w/ whatever optimizations needed for speed
 //
@@ -745,8 +802,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
 	}
 #endif
 
-	#define PUTDOT(xx,yy,cc) V_DrawFill(xx,yy,1,1,cc|V_NOSCALESTART);
-
 	dx = fl->b.x - fl->a.x;
 	ax = 2 * (dx < 0 ? -dx : dx);
 	sx = dx < 0 ? -1 : 1;
@@ -763,7 +818,7 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
 		d = ay - ax/2;
 		for (;;)
 		{
-			PUTDOT(x, y, color)
+			AM_drawPixel(x, y, color);
 			if (x == fl->b.x)
 				return;
 			if (d >= 0)
@@ -780,7 +835,7 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
 		d = ax - ay/2;
 		for (;;)
 		{
-			PUTDOT(x, y, color)
+			AM_drawPixel(x, y, color);
 			if (y == fl->b.y)
 				return;
 			if (d >= 0)
@@ -792,8 +847,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
 			d += ax;
 		}
 	}
-
-	#undef PUTDOT
 }
 
 //
@@ -815,17 +868,18 @@ static void AM_drawGrid(INT32 color)
 	fixed_t x, y;
 	fixed_t start, end;
 	mline_t ml;
+	fixed_t gridsize = (MAPBLOCKUNITS<<MAPBITS);
 
 	// Figure out start of vertical gridlines
 	start = m_x;
-	if ((start - bmaporgx) % (MAPBLOCKUNITS<<FRACBITS))
-		start += (MAPBLOCKUNITS<<FRACBITS) - ((start - bmaporgx) % (MAPBLOCKUNITS<<FRACBITS));
+	if ((start - (bmaporgx>>FRACTOMAPBITS)) % gridsize)
+		start += gridsize - ((start - (bmaporgx>>FRACTOMAPBITS)) % gridsize);
 	end = m_x + m_w;
 
 	// draw vertical gridlines
 	ml.a.y = m_y;
 	ml.b.y = m_y + m_h;
-	for (x = start; x < end; x += (MAPBLOCKUNITS<<FRACBITS))
+	for (x = start; x < end; x += gridsize)
 	{
 		ml.a.x = x;
 		ml.b.x = x;
@@ -834,14 +888,14 @@ static void AM_drawGrid(INT32 color)
 
 	// Figure out start of horizontal gridlines
 	start = m_y;
-	if ((start - bmaporgy) % (MAPBLOCKUNITS<<FRACBITS))
-		start += (MAPBLOCKUNITS<<FRACBITS) - ((start - bmaporgy) % (MAPBLOCKUNITS<<FRACBITS));
+	if ((start - (bmaporgy>>FRACTOMAPBITS)) % gridsize)
+		start += gridsize - ((start - (bmaporgy>>FRACTOMAPBITS)) % gridsize);
 	end = m_y + m_h;
 
 	// draw horizontal gridlines
 	ml.a.x = m_x;
 	ml.b.x = m_x + m_w;
-	for (y = start; y < end; y += (MAPBLOCKUNITS<<FRACBITS))
+	for (y = start; y < end; y += gridsize)
 	{
 		ml.a.y = y;
 		ml.b.y = y;
@@ -849,14 +903,118 @@ static void AM_drawGrid(INT32 color)
 	}
 }
 
+static INT32 GetDamage(INT32 special)
+{
+	switch (special)
+	{
+		case 1: // Damage (Generic)
+			return 1;
+		case 6: // Death Pit (Camera Tilt)
+			return 6;
+		case 7: // Death Pit (No Camera Tilt)
+			return 7;
+		case 8: // Instant Kill
+			return 8;
+		default:
+			return 0;
+	}
+}
+
+static INT32 GetOffroad(INT32 special)
+{
+	switch (special)
+	{
+		case 2: // Offroad (Weak)
+			return 2;
+		case 3: // Offroad
+			return 3;
+		case 4: // Offroad (Strong)
+			return 4;
+		default:
+			return 0;
+	}
+}
+
+#define SLOPEPARAMS(slope, end1, end2, normalheight) \
+	end1 = (P_GetZAt(slope, lines[i].v1->x, lines[i].v1->y, ((normalheight + FRACUNIT/2) >> FRACBITS)) + FRACUNIT/2) >> FRACBITS; \
+	end2 = (P_GetZAt(slope, lines[i].v2->x, lines[i].v2->y, ((normalheight + FRACUNIT/2) >> FRACBITS)) + FRACUNIT/2) >> FRACBITS;
+
+static ffloor_t *AM_CompareFOFs(size_t i, ffloor_t *rover, ffloor_t *secondarystore)
+{
+	ffloor_t *secondaryrover = NULL;
+
+	for (; rover; rover = rover->next)
+	{
+		fixed_t rovt1, rovt2;
+		fixed_t rovb1, rovb2;
+
+		if (!(rover->flags & FF_EXISTS))
+			continue;
+		if (!(rover->flags & FF_BLOCKPLAYER))
+			continue;
+
+		SLOPEPARAMS(*rover->t_slope, rovt1, rovt2, *rover->topheight)
+		SLOPEPARAMS(*rover->b_slope, rovb1, rovb2, *rover->bottomheight)
+
+		for (secondaryrover = secondarystore; secondaryrover; secondaryrover = secondaryrover->next)
+		{
+			fixed_t sect1, sect2;
+			fixed_t secb1, secb2;
+
+			if (!(secondaryrover->flags & FF_EXISTS))
+				continue;
+			if (!(secondaryrover->flags & FF_BLOCKPLAYER))
+				continue;
+			if (secondaryrover->secnum == rover->secnum)
+				break;
+
+			SLOPEPARAMS(*secondaryrover->t_slope, sect1, sect2, *secondaryrover->topheight)
+			SLOPEPARAMS(*secondaryrover->b_slope, secb1, secb2, *secondaryrover->bottomheight)
+
+			if (rovt1 != sect1)
+				continue;
+			if (rovt2 != sect2)
+				continue;
+			if (rovb1 != secb1)
+				continue;
+			if (rovb2 != secb2)
+				continue;
+
+			// this is fucking horrible
+			INT32 damage1, damage2;
+			INT32 offroad1, offroad2;
+			INT32 special1, special2;
+			special1 = GETSECSPECIAL(sectors[rover->secnum].special, 1);
+			special2 = GETSECSPECIAL(sectors[secondaryrover->secnum].special, 1);
+
+			damage1 = GetDamage(special1);
+			damage2 = GetDamage(special2);
+			offroad1 = GetOffroad(special1);
+			offroad2 = GetOffroad(special2);
+
+			if (damage1 != damage2
+			//|| sectors[rover->secnum].friction != sectors[secondaryrover->secnum].friction
+			|| offroad1 != offroad2)
+				continue;
+
+			break;
+		}
+
+		if (secondaryrover == NULL)
+			break;
+	}
+	return rover;
+}
+
 //
 // Determines visible lines, draws them.
 // This is LineDef based, not LineSeg based.
 //
-static inline void AM_drawWalls(void)
+static void AM_drawWalls(UINT8 pass)
 {
 	size_t i;
 	static mline_t l;
+	const fixed_t maxstep = FixedMul(MAXSTEPMOVE, mapobjectscale)>>FRACBITS;
 	fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
 	fixed_t backf1 = 0, backf2 = 0, backc1 = 0, backc2 = 0; // back floor ceiling ends
 
@@ -866,74 +1024,142 @@ static inline void AM_drawWalls(void)
 		l.a.y = lines[i].v1->y >> FRACTOMAPBITS;
 		l.b.x = lines[i].v2->x >> FRACTOMAPBITS;
 		l.b.y = lines[i].v2->y >> FRACTOMAPBITS;
-#define SLOPEPARAMS(slope, end1, end2, normalheight) \
-		if (slope) { \
-			end1 = P_GetZAt(slope, lines[i].v1->x, lines[i].v1->y); \
-			end2 = P_GetZAt(slope, lines[i].v2->x, lines[i].v2->y); \
-		} else \
-			end1 = end2 = normalheight;
 
 		SLOPEPARAMS(lines[i].frontsector->f_slope, frontf1, frontf2, lines[i].frontsector->floorheight)
 		SLOPEPARAMS(lines[i].frontsector->c_slope, frontc1, frontc2, lines[i].frontsector->ceilingheight)
-		if (lines[i].backsector) {
-			SLOPEPARAMS(lines[i].backsector->f_slope, backf1,  backf2,  lines[i].backsector->floorheight)
-			SLOPEPARAMS(lines[i].backsector->c_slope, backc1,  backc2,  lines[i].backsector->ceilingheight)
-		}
-#undef SLOPEPARAMS
 
 		if (!lines[i].backsector) // 1-sided
 		{
-			if (lines[i].flags & ML_NOCLIMB)
-				AM_drawMline(&l, NOCLIMBWALLCOLORS);
-			else
+			if (!(pass & PASS_SOLID))
+				;
+			else if (frontf1 != frontc1 || frontf2 != frontc2 || lines[i].frontsector->f_slope)
+			{
+				AM_drawMline(&l, TSWALLCOLORS);
+			}
+			else if (!am_minigen)
+			{
 				AM_drawMline(&l, WALLCOLORS);
+			}
+			continue;
 		}
-		else if ((backf1 == backc1 && backf2 == backc2) // Back is thok barrier
+
+		SLOPEPARAMS(lines[i].backsector->f_slope, backf1,  backf2,  lines[i].backsector->floorheight)
+		SLOPEPARAMS(lines[i].backsector->c_slope, backc1,  backc2,  lines[i].backsector->ceilingheight)
+
+		if ((backf1 == backc1 && backf2 == backc2) // Back is thok barrier
 				 || (frontf1 == frontc1 && frontf2 == frontc2)) // Front is thok barrier
 		{
 			if (backf1 == backc1 && backf2 == backc2
 				&& frontf1 == frontc1 && frontf2 == frontc2) // BOTH are thok barriers
 			{
-				if (lines[i].flags & ML_NOCLIMB)
-					AM_drawMline(&l, NOCLIMBTSWALLCOLORS);
-				else
-					AM_drawMline(&l, TSWALLCOLORS);
+				if (!am_minigen && (pass & PASS_INTANGIBLE))
+				{
+					AM_drawMline(&l, GRIDCOLORS);
+				}
 			}
-			else
+			else if (pass & PASS_SOLID)
 			{
-				if (lines[i].flags & ML_NOCLIMB)
-					AM_drawMline(&l, NOCLIMBTHOKWALLCOLORS);
-				else
-					AM_drawMline(&l, THOKWALLCOLORS);
+				AM_drawMline(&l, TSWALLCOLORS);
 			}
 		}
 		else
 		{
-			if (lines[i].flags & ML_NOCLIMB) {
-				if (backf1 != frontf1 || backf2 != frontf2) {
-					AM_drawMline(&l, NOCLIMBFDWALLCOLORS); // floor level change
-				}
-				else if (backc1 != frontc1 || backc2 != frontc2) {
-					AM_drawMline(&l, NOCLIMBCDWALLCOLORS); // ceiling level change
+			if (lines[i].flags & ML_IMPASSIBLE) // (ML_IMPASSABLE|ML_BLOCKPLAYERS)
+			{
+				if (pass & PASS_SOLID)
+					AM_drawMline(&l, TSWALLCOLORS); // Completely solid course boundary
+			}
+			else if ((lines[i].flags & ML_EFFECT4) // ML_MIDSOLID
+				&& sides[lines->sidenum[0]].midtexture)
+			{
+				if (pass & PASS_SOLID)
+					AM_drawMline(&l, TSWALLCOLORS); // solid midtexture, likely a course boundary
+			}
+			if ((backf1 != frontf1 && abs(backf1 - frontf1) > maxstep)
+				|| (backf2 != frontf2 && abs(backf2 - frontf2) > maxstep))
+			{
+				if (pass & PASS_SOLID)
+					AM_drawMline(&l, TSWALLCOLORS); // floor-wall, likely a course boundary
+			}
+			else if (GETSECSPECIAL(lines[i].frontsector->special, 4) == 10 || GETSECSPECIAL(lines[i].backsector->special, 4) == 10)
+			{
+				if (pass & PASS_SOLID)
+					AM_drawMline(&l, TSFINISHLINE); // finish line
+			}
+			else if (backf1 != frontf1 || backf2 != frontf2)
+			{
+				if (pass & PASS_INTANGIBLE)
+					AM_drawMline(&l, FDWALLCOLORS); // floorlevel change
+			}
+			else if (backc1 != frontc1 || backc2 != frontc2)
+			{
+				if (!(pass & PASS_INTANGIBLE))
+					;
+				else if (abs(backc1 - frontc1) < maxstep
+					|| abs(backc2 - frontc2) < maxstep)
+				{
+					AM_drawMline(&l, CDWALLCOLORS); // ceilinglevel change
 				}
 				else
-					AM_drawMline(&l, NOCLIMBTSWALLCOLORS);
+				{
+					AM_drawMline(&l, GRIDCOLORS); // ceiling-wall, not likely to be a course boundary but flagged up just in case
+				}
 			}
 			else
 			{
-				if (backf1 != frontf1 || backf2 != frontf2) {
-					AM_drawMline(&l, FDWALLCOLORS); // floor level change
+				ffloor_t *rover = NULL;
+
+				if (lines[i].frontsector->ffloors || lines[i].backsector->ffloors)
+				{
+					if (lines[i].backsector->ffloors == NULL)
+					{
+						// Check frontside for one solid
+						for (rover = lines[i].frontsector->ffloors; rover; rover = rover->next)
+						{
+							if (!(rover->flags & FF_EXISTS))
+								continue;
+							if (!(rover->flags & FF_BLOCKPLAYER))
+								continue;
+							break;
+						}
+					}
+					else if (lines[i].frontsector->ffloors == NULL)
+					{
+						// Check backside for one solid
+						for (rover = lines[i].backsector->ffloors; rover; rover = rover->next)
+						{
+							if (!(rover->flags & FF_EXISTS))
+								continue;
+							if (!(rover->flags & FF_BLOCKPLAYER))
+								continue;
+							break;
+						}
+					}
+					else
+					{
+						// Check to see if any secnums exist in one but not the other.
+						rover = AM_CompareFOFs(i, lines[i].frontsector->ffloors, lines[i].backsector->ffloors);
+						if (rover == NULL)
+							rover = AM_CompareFOFs(i, lines[i].backsector->ffloors, lines[i].frontsector->ffloors);
+					}
 				}
-				else if (backc1 != frontc1 || backc2 != frontc2) {
-					AM_drawMline(&l, CDWALLCOLORS); // ceiling level change
+				if (rover != NULL)
+				{
+					if (pass & PASS_FOF)
+						AM_drawMline(&l, TSFOFINFO); // a FOF is here but we don't know how to distinguish them yet
+				}
+				else if (!am_minigen)
+				{
+					if (pass & PASS_INTANGIBLE)
+						AM_drawMline(&l, GRIDCOLORS); // likely low-relevance line
 				}
-				else
-					AM_drawMline(&l, TSWALLCOLORS);
 			}
 		}
 	}
 }
 
+#undef SLOPEPARAMS
+
 //
 // Rotation in 2D.
 // Used to rotate player arrow line character.
@@ -1004,18 +1230,11 @@ static inline void AM_drawPlayers(void)
 	player_t *p;
 	INT32 color = GREENS;
 
-	if (!multiplayer)
-	{
-		AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, plr->mo->angle, DWHITE, plr->mo->x, plr->mo->y);
-		return;
-	}
-
-	// multiplayer (how??)
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i] || players[i].spectator)
 			continue;
-		
+
 		if (!players[i].mo)
 			continue;
 
@@ -1023,7 +1242,7 @@ static inline void AM_drawPlayers(void)
 		if (p->skincolor > 0)
 			color = R_GetTranslationColormap(TC_DEFAULT, p->skincolor, GTC_CACHE)[GREENS + 8];
 
-		AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 0, p->mo->angle, color, p->mo->x, p->mo->y);
+		AM_drawLineCharacter(player_arrow, NUMPLYRLINES, 16<<FRACBITS, p->mo->angle, color, p->mo->x, p->mo->y);
 	}
 }
 
@@ -1037,19 +1256,65 @@ static inline void AM_drawThings(UINT8 colors)
 		t = sectors[i].thinglist;
 		while (t)
 		{
-			AM_drawLineCharacter(thintriangle_guy, NUMTHINTRIANGLEGUYLINES, 16<<FRACBITS, t->angle, colors, t->x, t->y);
+			if (!t->player)
+				AM_drawLineCharacter(thintriangle_guy, NUMTHINTRIANGLEGUYLINES, 16<<FRACBITS, t->angle, colors, t->x, t->y);
 			t = t->snext;
 		}
 	}
 }
 
-/** Draws the crosshair, actually just a dot in software mode.
+static inline void AM_drawSpecialThingsOnly(UINT8 colors)
+{
+	size_t i;
+
+	for (i = 0; i < numsectors; i++)
+	{
+		mobj_t *t = NULL;
+
+		// this is fucking horrible
+		const INT32 special = GETSECSPECIAL(sectors[i].special, 1);
+
+		if (GetDamage(special) != 0
+		//|| sectors[i].friction < ORIG_FRICTION
+		|| GetOffroad(special) != 0)
+			continue;
+
+		t = sectors[i].thinglist;
+		while (t)
+		{
+			if (t->type == MT_RANDOMITEM
+			|| t->type == MT_STARPOST
+			|| (t->flags & MF_SPRING))
+				AM_drawLineCharacter(thintriangle_guy, NUMTHINTRIANGLEGUYLINES, 16<<FRACBITS, t->angle, colors, t->x, t->y);
+			t = t->snext;
+		}
+	}
+}
+
+/** Draws the crosshair.
   *
   * \param color Color for the crosshair.
   */
 static inline void AM_drawCrosshair(UINT8 color)
 {
-	V_DrawFill(f_w/2 + f_x, f_h/2 + f_y, 1, 1, color|V_NOSCALESTART);
+	const fixed_t scale = 4<<FRACBITS;
+	size_t i;
+	fline_t fl;
+
+	for (i = 0; i < NUMCROSSMARKLINES; i++)
+	{
+		fl.a.x = FixedMul(cross_mark[i].a.x, scale) >> FRACBITS;
+		fl.a.y = FixedMul(cross_mark[i].a.y, scale) >> FRACBITS;
+		fl.b.x = FixedMul(cross_mark[i].b.x, scale) >> FRACBITS;
+		fl.b.y = FixedMul(cross_mark[i].b.y, scale) >> FRACBITS;
+
+		fl.a.x += f_x + (f_w / 2);
+		fl.a.y += f_y + (f_h / 2);
+		fl.b.x += f_x + (f_w / 2);
+		fl.b.y += f_y + (f_h / 2);
+
+		AM_drawFline(&fl, color);
+	}
 }
 
 /** Draws the automap.
@@ -1059,11 +1324,81 @@ void AM_Drawer(void)
 	if (!automapactive)
 		return;
 
+	AM_drawFline = AM_drawFline_soft;
+#ifdef HWRENDER
+	if (rendermode == render_opengl)
+		AM_drawFline = HWR_drawAMline;
+#endif
+
 	AM_clearFB(BACKGROUND);
 	if (draw_grid) AM_drawGrid(GRIDCOLORS);
-	AM_drawWalls();
-	AM_drawPlayers();
+	AM_drawWalls(PASS_FOF|PASS_INTANGIBLE|PASS_SOLID);
 	AM_drawThings(THINGCOLORS);
+	AM_drawPlayers();
 
-	AM_drawCrosshair(XHAIRCOLORS);
+	if (!followplayer) AM_drawCrosshair(XHAIRCOLORS);
+}
+
+minigen_t *AM_MinimapGenerate(INT32 mul)
+{
+	static minigen_t ret = {0};
+
+	if (automapactive)
+		return NULL;
+
+	am_minigen = true;
+
+	AM_drawFline = AM_drawFline_soft; // yes, even in GL
+
+	//AM_FrameBufferInit();
+	f_x = f_y = 0;
+	ret.w = f_w = minimapinfo.minimap_w * mul;
+	ret.h = f_h = minimapinfo.minimap_h * mul;
+	am_buf = ret.buf = NULL;
+
+	//AM_LevelInit();
+	AM_findMinMaxBoundaries();
+	scale_mtof = min_scale_mtof - (min_scale_mtof/20);
+	scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
+
+	//AM_initVariables();
+	f_oldloc.x = INT32_MAX;
+
+	m_paninc.x = m_paninc.y = 0;
+	ftom_zoommul = FRACUNIT;
+	mtof_zoommul = FRACUNIT;
+
+	m_w = FTOM(f_w);
+	m_h = FTOM(f_h);
+
+	//AM_changeWindowLoc();
+	m_x = min_x - FixedMul(m_w, FRACUNIT/40);
+	m_y = min_y - FixedMul(m_h, FRACUNIT/40);
+	m_x2 = m_x + m_w;
+	m_y2 = m_y + m_h;
+
+	// for saving & restoring
+	old_m_x = m_x;
+	old_m_y = m_y;
+	old_m_w = m_w;
+	old_m_h = m_h;
+
+	am_buf = ret.buf = malloc((f_w*f_h));
+
+	if (ret.buf == NULL)
+		return NULL;
+
+	//AM_clearFB(BACKGROUND);
+	memset(am_buf, 0xff, (f_w*f_h));
+	AM_drawSpecialThingsOnly(BACKGROUND);
+	AM_drawWalls(PASS_FOF);
+	AM_drawWalls(PASS_INTANGIBLE);
+	AM_drawWalls(PASS_SOLID);
+
+	am_buf = NULL;
+	am_recalc = true;
+
+	am_minigen = false;
+
+	return &ret;
 }
diff --git a/src/am_map.h b/src/am_map.h
index 4e8c782a9..112ba345f 100644
--- a/src/am_map.h
+++ b/src/am_map.h
@@ -1,8 +1,10 @@
-// SONIC ROBO BLAST 2
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
 // Copyright (C) 1993-1996 by id Software, Inc.
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2018 by Sonic Team Junior.
+// Copyright (C) 2024 by Vivian "toastergrl" Grannell.
+// Copyright (C) 2024 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.
@@ -26,11 +28,6 @@ typedef struct
 	fpoint_t a, b;
 } fline_t;
 
-// Used by ST StatusBar stuff.
-#define AM_MSGHEADER (('a'<<24)+('m'<<16))
-#define AM_MSGENTERED (AM_MSGHEADER | ('e'<<8))
-#define AM_MSGEXITED (AM_MSGHEADER | ('x'<<8))
-
 extern boolean am_recalc; // true if screen size changes
 extern boolean automapactive; // In AutoMap mode?
 
@@ -43,7 +40,19 @@ void AM_Ticker(void);
 // Called by main loop, instead of view drawer if automap is active.
 void AM_Drawer(void);
 
+// Enables the automap.
+void AM_Start(void);
+
 // Called to force the automap to quit if the level is completed while it is up.
 void AM_Stop(void);
 
+typedef struct
+{
+	INT32 w, h;
+	UINT8 *buf;
+} minigen_t;
+
+// Minimap generation
+minigen_t *AM_MinimapGenerate(INT32 mul);
+
 #endif
diff --git a/src/android/i_system.c b/src/android/i_system.c
index 3eddf6e20..4a598a452 100644
--- a/src/android/i_system.c
+++ b/src/android/i_system.c
@@ -184,8 +184,6 @@ void I_OutputMsg(const char *fmt, ...)
 
 void I_StartupMouse(void){}
 
-void I_StartupMouse2(void){}
-
 void I_StartupKeyboard(void){}
 
 INT32 I_GetKey(void)
@@ -242,8 +240,6 @@ void I_GetJoystickEvents(void){}
 
 void I_GetJoystick2Events(void){}
 
-void I_GetMouseEvents(void){}
-
 char *I_GetEnv(const char *name)
 {
   LOGW("I_GetEnv() called?!");
diff --git a/src/android/i_video.c b/src/android/i_video.c
index 8b4bee314..4db66afe0 100644
--- a/src/android/i_video.c
+++ b/src/android/i_video.c
@@ -46,7 +46,6 @@ INT32 VID_SetMode(INT32 modenum)
   vid.modenum = 0;
   vid.width = 320;
   vid.height = 240;
-  vid.bpp = 1;
   vid.buffer = android_surface;
   return 0;
 }
diff --git a/src/b_bot.c b/src/b_bot.c
index edaf477ad..8100fc414 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -36,7 +36,7 @@ static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cm
 		return;
 
 	// Lua can handle it!
-	if (LUAh_BotAI(sonic, tails, cmd))
+	if (LUA_HookBotAI(sonic, tails, cmd))
 		return;
 
 	if (tails->player->pflags & (PF_MACESPIN|PF_ITEMHANG))
@@ -118,11 +118,8 @@ void B_BuildTiccmd(player_t *player, ticcmd_t *cmd)
 		return;
 	}
 
-	// Bot AI isn't programmed in analog.
-	//CV_SetValue(&cv_analog2, false);
-
 	// Let Lua scripts build ticcmds
-	if (LUAh_BotTiccmd(player, cmd))
+	if (LUA_HookTiccmd(player, cmd, HOOK(BotTiccmd)))
 		return;
 
 	// We don't have any main character AI, sorry. D:
diff --git a/src/blua/Makefile.cfg b/src/blua/Makefile.cfg
deleted file mode 100644
index f3d38fb70..000000000
--- a/src/blua/Makefile.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-ifdef UNIXCOMMON
-LUA_CFLAGS+=-DLUA_USE_POSIX
-endif
-ifdef LINUX
-LUA_CFLAGS+=-DLUA_USE_POSIX
-endif
-ifdef GCC43
-ifndef GCC44
-WFLAGS+=-Wno-logical-op
-endif
-endif
-
-OBJS:=$(OBJS) \
-	$(OBJDIR)/lapi.o \
-	$(OBJDIR)/lbaselib.o \
-	$(OBJDIR)/ldo.o \
-	$(OBJDIR)/ldblib.o \
-	$(OBJDIR)/lfunc.o \
-	$(OBJDIR)/linit.o \
-	$(OBJDIR)/liolib.o \
-	$(OBJDIR)/llex.o \
-	$(OBJDIR)/lmem.o \
-	$(OBJDIR)/lobject.o \
-	$(OBJDIR)/lstate.o \
-	$(OBJDIR)/lstrlib.o \
-	$(OBJDIR)/ltablib.o \
-	$(OBJDIR)/lundump.o \
-	$(OBJDIR)/lzio.o \
-	$(OBJDIR)/lauxlib.o \
-	$(OBJDIR)/lcode.o \
-	$(OBJDIR)/ldebug.o \
-	$(OBJDIR)/ldump.o \
-	$(OBJDIR)/lgc.o \
-	$(OBJDIR)/lopcodes.o \
-	$(OBJDIR)/lparser.o \
-	$(OBJDIR)/lstring.o \
-	$(OBJDIR)/ltable.o \
-	$(OBJDIR)/ltm.o \
-	$(OBJDIR)/lvm.o \
-	$(OBJDIR)/lua_script.o \
-	$(OBJDIR)/lua_baselib.o \
-	$(OBJDIR)/lua_blockmaplib.o \
-	$(OBJDIR)/lua_mathlib.o \
-	$(OBJDIR)/lua_hooklib.o \
-	$(OBJDIR)/lua_consolelib.o \
-	$(OBJDIR)/lua_infolib.o \
-	$(OBJDIR)/lua_mobjlib.o \
-	$(OBJDIR)/lua_playerlib.o \
-	$(OBJDIR)/lua_skinlib.o \
-	$(OBJDIR)/lua_thinkerlib.o \
-	$(OBJDIR)/lua_maplib.o \
-	$(OBJDIR)/lua_hudlib.o \
-	$(OBJDIR)/lua_hudlib_drawlist.o \
-	$(OBJDIR)/lua_udatalib.o \
-	$(OBJDIR)/lua_glib.o
diff --git a/src/blua/Sourcefile b/src/blua/Sourcefile
new file mode 100644
index 000000000..da89f45a4
--- /dev/null
+++ b/src/blua/Sourcefile
@@ -0,0 +1,26 @@
+lapi.c
+lauxlib.c
+lbaselib.c
+ldblib.c
+lcode.c
+ldebug.c
+ldo.c
+ldump.c
+lfunc.c
+lgc.c
+linit.c
+liolib.c
+llex.c
+lmem.c
+lobject.c
+lopcodes.c
+lparser.c
+lstate.c
+lstring.c
+lstrlib.c
+ltable.c
+ltablib.c
+ltm.c
+lundump.c
+lvm.c
+lzio.c
diff --git a/src/blua/lauxlib.c b/src/blua/lauxlib.c
index aad72ca41..e898e38d6 100644
--- a/src/blua/lauxlib.c
+++ b/src/blua/lauxlib.c
@@ -133,26 +133,26 @@ LUALIB_API void *luaL_checkudata (lua_State *L, int ud, const char *tname) {
 
 
 LUALIB_API void luaL_checkstack (lua_State *L, int space, const char *mes) {
-  if (!lua_checkstack(L, space))
+  if (l_unlikely(!lua_checkstack(L, space)))
     luaL_error(L, "stack overflow (%s)", mes);
 }
 
 
 LUALIB_API void luaL_checktype (lua_State *L, int narg, int t) {
-  if (lua_type(L, narg) != t)
+  if (l_unlikely(lua_type(L, narg) != t))
     tag_error(L, narg, t);
 }
 
 
 LUALIB_API void luaL_checkany (lua_State *L, int narg) {
-  if (lua_type(L, narg) == LUA_TNONE)
+  if (l_unlikely(lua_type(L, narg) == LUA_TNONE))
     luaL_argerror(L, narg, "value expected");
 }
 
 
 LUALIB_API const char *luaL_checklstring (lua_State *L, int narg, size_t *len) {
   const char *s = lua_tolstring(L, narg, len);
-  if (!s) tag_error(L, narg, LUA_TSTRING);
+  if (l_unlikely(!s)) tag_error(L, narg, LUA_TSTRING);
   return s;
 }
 
@@ -170,7 +170,7 @@ LUALIB_API const char *luaL_optlstring (lua_State *L, int narg,
 
 LUALIB_API lua_Number luaL_checknumber (lua_State *L, int narg) {
   lua_Number d = lua_tonumber(L, narg);
-  if (d == 0 && !lua_isnumber(L, narg))  /* avoid extra test when d is not 0 */
+  if (l_unlikely(d == 0 && !lua_isnumber(L, narg)))  /* avoid extra test when d is not 0 */
     tag_error(L, narg, LUA_TNUMBER);
   return d;
 }
diff --git a/src/blua/lauxlib.h b/src/blua/lauxlib.h
index 87c41ba61..befdae303 100644
--- a/src/blua/lauxlib.h
+++ b/src/blua/lauxlib.h
@@ -36,6 +36,26 @@ LUALIB_API void (luaL_setn) (lua_State *L, int t, int n);
 /* extra error code for `luaL_load' */
 #define LUA_ERRFILE     (LUA_ERRERR+1)
 
+/* Compiler-specific attributes and other macros */
+
+#ifdef __GNUC__ // __attribute__ ((X))
+
+	#if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && defined (__MINGW32__) // MinGW, >= GCC 4.1
+		#if 0 //defined  (__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO > 0
+			#define FUNCREPORT  __attribute__ ((format(gnu_printf, 2, 3)))
+		#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) // >= GCC 4.4
+			#define FUNCREPORT  __attribute__ ((format(ms_printf, 2, 3)))
+		#else
+			#define FUNCREPORT  __attribute__ ((format(printf, 2, 3)))
+		#endif
+	#else
+		#define FUNCREPORT  __attribute__ ((format(printf, 2, 3)))
+	#endif
+#endif
+
+#ifndef FUNCREPORT
+#define FUNCREPORT
+#endif
 
 typedef struct luaL_Reg {
   const char *name;
@@ -70,7 +90,7 @@ LUALIB_API int   (luaL_newmetatable) (lua_State *L, const char *tname);
 LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
 
 LUALIB_API void (luaL_where) (lua_State *L, int lvl);
-LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
+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[]);
@@ -102,7 +122,7 @@ LUALIB_API const char *(luaL_findtable) (lua_State *L, int idx,
 */
 
 #define luaL_argcheck(L, cond,numarg,extramsg)	\
-		((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
+		((void)(l_likely(cond) || luaL_argerror(L, (numarg), (extramsg))))
 #define luaL_checkstring(L,n)	(luaL_checklstring(L, (n), NULL))
 #define luaL_optstring(L,n,d)	(luaL_optlstring(L, (n), (d), NULL))
 #define luaL_checkint(L,n)	((int)luaL_checkinteger(L, (n)))
diff --git a/src/blua/lbaselib.c b/src/blua/lbaselib.c
index 3c919cb64..8d2272d03 100644
--- a/src/blua/lbaselib.c
+++ b/src/blua/lbaselib.c
@@ -106,7 +106,7 @@ static int luaB_setmetatable (lua_State *L) {
   luaL_checktype(L, 1, LUA_TTABLE);
   luaL_argcheck(L, t == LUA_TNIL || t == LUA_TTABLE, 2,
                     "nil or table expected");
-  if (luaL_getmetafield(L, 1, "__metatable"))
+  if (l_unlikely(luaL_getmetafield(L, 1, "__metatable")))
     luaL_error(L, "cannot change a protected metatable");
   lua_settop(L, 2);
   lua_setmetatable(L, 1);
@@ -120,10 +120,10 @@ static void getfunc (lua_State *L, int opt) {
     lua_Debug ar;
     int level = opt ? luaL_optint(L, 1, 1) : luaL_checkint(L, 1);
     luaL_argcheck(L, level >= 0, 1, "level must be non-negative");
-    if (lua_getstack(L, level, &ar) == 0)
+    if (l_unlikely(lua_getstack(L, level, &ar) == 0))
       luaL_argerror(L, 1, "invalid level");
     lua_getinfo(L, "f", &ar);
-    if (lua_isnil(L, -1))
+    if (l_unlikely(lua_isnil(L, -1)))
       luaL_error(L, "no function environment for tail call at level %d",
                     level);
   }
@@ -151,7 +151,7 @@ static int luaB_setfenv (lua_State *L) {
     lua_setfenv(L, -2);
     return 0;
   }
-  else if (lua_iscfunction(L, -2) || lua_setfenv(L, -2) == 0)
+  else if (l_unlikely(lua_iscfunction(L, -2) || lua_setfenv(L, -2) == 0))
     luaL_error(L,
           LUA_QL("setfenv") " cannot change environment of given object");
   return 1;
@@ -265,7 +265,7 @@ static int luaB_ipairs (lua_State *L) {
 
 static int luaB_assert (lua_State *L) {
   luaL_checkany(L, 1);
-  if (!lua_toboolean(L, 1))
+  if (l_unlikely(!lua_toboolean(L, 1)))
     return luaL_error(L, "%s", luaL_optstring(L, 2, "assertion failed!"));
   return lua_gettop(L);
 }
@@ -278,7 +278,7 @@ static int luaB_unpack (lua_State *L) {
   e = luaL_opt(L, luaL_checkint, 3, luaL_getn(L, 1));
   if (i > e) return 0;  /* empty range */
   n = e - i + 1;  /* number of elements */
-  if (n <= 0 || !lua_checkstack(L, n))  /* n <= 0 means arith. overflow */
+  if (l_unlikely(n <= 0 || !lua_checkstack(L, n)))  /* n <= 0 means arith. overflow */
     return luaL_error(L, "too many results to unpack");
   lua_rawgeti(L, 1, i);  /* push arg[i] (avoiding overflow problems) */
   while (i++ < e)  /* push arg[i + 1...e] */
@@ -445,9 +445,9 @@ static int luaB_costatus (lua_State *L) {
 
 static int auxresume (lua_State *L, lua_State *co, int narg) {
   int status = costatus(L, co);
-  if (!lua_checkstack(co, narg))
+  if (l_unlikely(!lua_checkstack(co, narg)))
     luaL_error(L, "too many arguments to resume");
-  if (status != CO_SUS) {
+  if (l_unlikely(status != CO_SUS)) {
     lua_pushfstring(L, "cannot resume %s coroutine", statnames[status]);
     return -1;  /* error flag */
   }
@@ -456,7 +456,7 @@ static int auxresume (lua_State *L, lua_State *co, int narg) {
   status = lua_resume(co, narg);
   if (status == 0 || status == LUA_YIELD) {
     int nres = lua_gettop(co);
-    if (!lua_checkstack(L, nres + 1))
+    if (l_unlikely(!lua_checkstack(L, nres + 1)))
       luaL_error(L, "too many results to resume");
     lua_xmove(co, L, nres);  /* move yielded values */
     return nres;
diff --git a/src/blua/ldblib.c b/src/blua/ldblib.c
index 2eacef929..28f7c42bf 100644
--- a/src/blua/ldblib.c
+++ b/src/blua/ldblib.c
@@ -73,7 +73,7 @@ static int db_getinfo (lua_State *L) {
   }
   else
     return luaL_argerror(L, arg+1, "function or level expected");
-  if (!lua_getinfo(L1, options, &ar))
+  if (l_unlikely(!lua_getinfo(L1, options, &ar)))
     return luaL_argerror(L, arg+2, "invalid option");
   lua_createtable(L, 0, 2);
   if (strchr(options, 'S')) {
@@ -104,7 +104,7 @@ static int db_getlocal (lua_State *L) {
   lua_State *L1 = getthread(L, &arg);
   lua_Debug ar;
   const char *name;
-  if (!lua_getstack(L1, luaL_checkint(L, arg+1), &ar))  /* out of range? */
+  if (l_unlikely(!lua_getstack(L1, luaL_checkint(L, arg+1), &ar)))  /* out of range? */
     return luaL_argerror(L, arg+1, "level out of range");
   name = lua_getlocal(L1, &ar, luaL_checkint(L, arg+2));
   if (name) {
diff --git a/src/blua/ldo.c b/src/blua/ldo.c
index 7470a79b7..ad8a32694 100644
--- a/src/blua/ldo.c
+++ b/src/blua/ldo.c
@@ -172,7 +172,7 @@ void luaD_reallocCI (lua_State *L, int newsize) {
 
 
 void luaD_growstack (lua_State *L, int n) {
-  if (n <= L->stacksize)  /* double size is enough? */
+  if (l_likely(n <= L->stacksize))  /* double size is enough? */
     luaD_reallocstack(L, 2*L->stacksize);
   else
     luaD_reallocstack(L, L->stacksize + n);
@@ -180,11 +180,11 @@ void luaD_growstack (lua_State *L, int n) {
 
 
 static CallInfo *growCI (lua_State *L) {
-  if (L->size_ci > LUAI_MAXCALLS)  /* overflow while handling overflow? */
+  if (l_unlikely(L->size_ci > LUAI_MAXCALLS))  /* overflow while handling overflow? */
     luaD_throw(L, LUA_ERRERR);
   else {
     luaD_reallocCI(L, 2*L->size_ci);
-    if (L->size_ci > LUAI_MAXCALLS)
+    if (l_unlikely(L->size_ci > LUAI_MAXCALLS))
       luaG_runerror(L, "stack overflow");
   }
   return ++L->ci;
@@ -257,7 +257,7 @@ static StkId tryfuncTM (lua_State *L, StkId func) {
   const TValue *tm = luaT_gettmbyobj(L, func, TM_CALL);
   StkId p;
   ptrdiff_t funcr = savestack(L, func);
-  if (!ttisfunction(tm))
+  if (l_unlikely(!ttisfunction(tm)))
     luaG_typeerror(L, func, "call");
   /* Open a hole inside the stack at `func' */
   for (p = L->top; p > func; p--) setobjs2s(L, p, p-1);
@@ -356,7 +356,7 @@ int luaD_poscall (lua_State *L, StkId firstResult) {
   StkId res;
   int wanted, i;
   CallInfo *ci;
-  if (L->hookmask & LUA_MASKRET)
+  if (l_unlikely(L->hookmask) & LUA_MASKRET)
     firstResult = callrethooks(L, firstResult);
   ci = L->ci--;
   res = ci->func;  /* res == final position of 1st result */
@@ -380,7 +380,7 @@ int luaD_poscall (lua_State *L, StkId firstResult) {
 ** function position.
 */
 void luaD_call (lua_State *L, StkId func, int nResults) {
-  if (++L->nCcalls >= LUAI_MAXCCALLS) {
+  if (l_unlikely(++L->nCcalls >= LUAI_MAXCCALLS)) {
     if (L->nCcalls == LUAI_MAXCCALLS)
       luaG_runerror(L, "C stack overflow");
     else if (L->nCcalls >= (LUAI_MAXCCALLS + (LUAI_MAXCCALLS>>3)))
@@ -430,15 +430,15 @@ static int resume_error (lua_State *L, const char *msg) {
 LUA_API int lua_resume (lua_State *L, int nargs) {
   int status;
   lua_lock(L);
-  if (L->status != LUA_YIELD && (L->status != 0 || L->ci != L->base_ci))
+  if (l_unlikely(L->status != LUA_YIELD && (L->status != 0 || L->ci != L->base_ci)))
       return resume_error(L, "cannot resume non-suspended coroutine");
-  if (L->nCcalls >= LUAI_MAXCCALLS)
+  if (l_unlikely(L->nCcalls >= LUAI_MAXCCALLS))
     return resume_error(L, "C stack overflow");
   luai_userstateresume(L, nargs);
   lua_assert(L->errfunc == 0);
   L->baseCcalls = ++L->nCcalls;
   status = luaD_rawrunprotected(L, resume, L->top - nargs);
-  if (status != 0) {  /* error? */
+  if (l_unlikely(status != 0)) {  /* error? */
     L->status = cast_byte(status);  /* mark thread as `dead' */
     luaD_seterrorobj(L, status, L->top);
     L->ci->top = L->top;
@@ -456,7 +456,7 @@ LUA_API int lua_resume (lua_State *L, int nargs) {
 LUA_API int lua_yield (lua_State *L, int nresults) {
   luai_userstateyield(L, nresults);
   lua_lock(L);
-  if (L->nCcalls > L->baseCcalls)
+  if (l_unlikely(L->nCcalls > L->baseCcalls))
     luaG_runerror(L, "attempt to yield across metamethod/C-call boundary");
   L->base = L->top - nresults;  /* protect stack slots below */
   L->status = LUA_YIELD;
@@ -474,7 +474,7 @@ int luaD_pcall (lua_State *L, Pfunc func, void *u,
   ptrdiff_t old_errfunc = L->errfunc;
   L->errfunc = ef;
   status = luaD_rawrunprotected(L, func, u);
-  if (status != 0) {  /* an error occurred? */
+  if (l_unlikely(status != 0)) {  /* an error occurred? */
     StkId oldtop = restorestack(L, old_top);
     luaF_close(L, oldtop);  /* close eventual pending closures */
     luaD_seterrorobj(L, status, oldtop);
@@ -511,8 +511,8 @@ static void f_parser (lua_State *L, void *ud) {
   tf = ((c == LUA_SIGNATURE[0]) ? luaU_undump : luaY_parser)(L, p->z,
                                                              &p->buff, p->name);
 #else
-  if (c == LUA_SIGNATURE[0])
-		luaG_runerror(L, "invalid format, cannot load bytecode scripts");
+  if (l_unlikely(c == LUA_SIGNATURE[0]))
+      luaG_runerror(L, "invalid format, cannot load bytecode scripts");
   tf = luaY_parser(L, p->z, &p->buff, p->name);
 #endif
   cl = luaF_newLclosure(L, tf->nups, hvalue(gt(L)));
diff --git a/src/blua/ldo.h b/src/blua/ldo.h
index 29364965f..baaa1301c 100644
--- a/src/blua/ldo.h
+++ b/src/blua/ldo.h
@@ -14,7 +14,7 @@
 
 
 #define luaD_checkstack(L,n)	\
-  if ((char *)L->stack_last - (char *)L->top <= (n)*(int)sizeof(TValue)) \
+  if (l_unlikely((char *)L->stack_last - (char *)L->top <= (n)*(int)sizeof(TValue))) \
     luaD_growstack(L, n); \
   else condhardstacktests(luaD_reallocstack(L, L->stacksize - EXTRA_STACK - 1));
 
diff --git a/src/blua/liolib.c b/src/blua/liolib.c
index 2d69f45cd..40e3e4582 100644
--- a/src/blua/liolib.c
+++ b/src/blua/liolib.c
@@ -84,7 +84,7 @@ static int io_type (lua_State *L) {
 
 static FILE *tofile (lua_State *L) {
   FILE **f = tofilep(L);
-  if (*f == NULL)
+  if (l_unlikely(*f == NULL))
     luaL_error(L, "attempt to use a closed file");
   return *f;
 }
@@ -184,8 +184,8 @@ static int io_open (lua_State *L) {
 			break;
 		}
 	}
-	if (strstr(filename, "..") || strchr(filename, ':') || StartsWith(filename, "\\")
-		|| StartsWith(filename, "/") || !pass)
+	if (l_unlikely(strstr(filename, "..") || strchr(filename, ':') || StartsWith(filename, "\\")
+		|| StartsWith(filename, "/") || !pass))
 	{
 		luaL_error(L,"access denied to %s", filename);
 		return pushresult(L,0,filename);
@@ -202,7 +202,7 @@ static int io_open (lua_State *L) {
 	{
 		*splitter = 0;
 		I_mkdir(destFilename, 0755);
-		*splitter = '/'; 
+		*splitter = '/';
 		splitter++;
 
         forward = strchr(splitter, '/');
@@ -226,7 +226,7 @@ static FILE *getiofile (lua_State *L, int findex) {
   FILE *f;
   lua_rawgeti(L, LUA_ENVIRONINDEX, findex);
   f = *(FILE **)lua_touserdata(L, -1);
-  if (f == NULL)
+  if (l_unlikely(f == NULL))
     luaL_error(L, "standard %s file is closed", fnames[findex - 1]);
   return f;
 }
@@ -238,7 +238,7 @@ static int g_iofile (lua_State *L, int f, const char *mode) {
     if (filename) {
       FILE **pf = newfile(L);
       *pf = fopen(filename, mode);
-      if (*pf == NULL)
+      if (l_unlikely(*pf == NULL))
         fileerror(L, 1, filename);
     }
     else {
@@ -290,7 +290,7 @@ static int io_lines (lua_State *L) {
     const char *filename = luaL_checkstring(L, 1);
     FILE **pf = newfile(L);
     *pf = fopen(filename, "r");
-    if (*pf == NULL)
+    if (l_unlikely(*pf == NULL))
       fileerror(L, 1, filename);
     aux_lines(L, lua_gettop(L), 1);
     return 1;
@@ -307,7 +307,7 @@ static int io_lines (lua_State *L) {
 
 static int read_number (lua_State *L, FILE *f) {
   lua_Number d;
-  if (fscanf(f, LUA_NUMBER_SCAN, &d) == 1) {
+  if (l_likely(fscanf(f, LUA_NUMBER_SCAN, &d) == 1)) {
     lua_pushnumber(L, d);
     return 1;
   }
@@ -454,7 +454,7 @@ static int g_write (lua_State *L, FILE *f, int arg) {
     else {
       size_t l;
       const char *s = luaL_checklstring(L, arg, &l);
-	  if (ftell(f) + l > FILELIMIT)
+	  if (l_unlikely(ftell(f) + l > FILELIMIT))
 	  {
 		luaL_error(L,"write limit bypassed in file. Changes have been discarded.");
 		break;
@@ -483,7 +483,7 @@ static int f_seek (lua_State *L) {
   int op = luaL_checkoption(L, 2, "cur", modenames);
   long offset = luaL_optlong(L, 3, 0);
   op = fseek(f, offset, mode[op]);
-  if (op)
+  if (l_unlikely(op))
     return pushresult(L, 0, NULL);  /* error */
   else {
     lua_pushinteger(L, ftell(f));
diff --git a/src/blua/lmem.c b/src/blua/lmem.c
index 1b9bed658..a49d3dce1 100644
--- a/src/blua/lmem.c
+++ b/src/blua/lmem.c
@@ -48,7 +48,7 @@ void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
   void *newblock;
   int newsize;
   if (*size >= limit/2) {  /* cannot double it? */
-    if (*size >= limit)  /* cannot grow even a little? */
+    if (l_unlikely(*size >= limit))  /* cannot grow even a little? */
       luaG_runerror(L, errormsg);
     newsize = limit;  /* still have at least one free place */
   }
@@ -77,7 +77,7 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
   global_State *g = G(L);
   lua_assert((osize == 0) == (block == NULL));
   block = (*g->frealloc)(g->ud, block, osize, nsize);
-  if (block == NULL && nsize > 0)
+  if (l_unlikely(block == NULL && nsize > 0))
     luaD_throw(L, LUA_ERRMEM);
   lua_assert((nsize == 0) == (block == NULL));
   g->totalbytes = (g->totalbytes - osize) + nsize;
diff --git a/src/blua/lparser.c b/src/blua/lparser.c
index 3f392ae7b..871c9730d 100644
--- a/src/blua/lparser.c
+++ b/src/blua/lparser.c
@@ -103,7 +103,7 @@ static void checknext (LexState *ls, int c) {
 
 
 static void check_match (LexState *ls, int what, int who, int where) {
-  if (!testnext(ls, what)) {
+  if (l_unlikely(!testnext(ls, what))) {
     if (where == ls->linenumber)
       error_expected(ls, what);
     else {
@@ -275,7 +275,7 @@ static void adjust_assign (LexState *ls, int nvars, int nexps, expdesc *e) {
 
 
 static void enterlevel (LexState *ls) {
-  if (++ls->L->nCcalls > LUAI_MAXCCALLS)
+  if (l_unlikely(++ls->L->nCcalls > LUAI_MAXCCALLS))
 	luaX_lexerror(ls, "chunk has too many syntax levels", 0);
 }
 
@@ -643,7 +643,7 @@ static void funcargs (LexState *ls, expdesc *f) {
   int line = ls->linenumber;
   switch (ls->t.token) {
     case '(': {  /* funcargs -> `(' [ explist1 ] `)' */
-      if (line != ls->lastline)
+      if (l_unlikely(line != ls->lastline))
         luaX_syntaxerror(ls,"ambiguous syntax (function call x new statement)");
       luaX_next(ls);
       if (ls->t.token == ')')  /* arg list is empty? */
@@ -712,7 +712,7 @@ static void prefixexp (LexState *ls, expdesc *v) {
     case '$': {
       lua_Number i = ls->t.seminfo.r;
       if (i == 0) i = ls->fs->nrhs;
-      if (i <= 0 || i > ls->fs->nlhs)
+      if (l_unlikely(i <= 0 || i > ls->fs->nlhs))
         luaX_syntaxerror(ls, "pseudo-variable out of range or not in assignment");
       else {
         expdesc_list *lhs = ls->fs->lhs;
@@ -1105,7 +1105,7 @@ static void breakstat (LexState *ls, lua_Number n) {
     upval |= bl->upval;
     bl = bl->previous;
   }
-  if (!bl)
+  if (l_unlikely(!bl))
     luaX_syntaxerror(ls, "no loop to break");
   if (upval)
     luaK_codeABC(fs, OP_CLOSE, bl->nactvar, 0, 0);
@@ -1124,7 +1124,7 @@ static void continuestat (LexState *ls) {
     //upval |= bl->upval;     // AK: ADDITION (would this fix forbody probs?)
     bl = bl->previous;
   }
-  if (!bl)
+  if (l_unlikely(!bl))
     luaX_syntaxerror(ls, "no loop to continue");
 
   //if (upval)    //AK: experimental
diff --git a/src/blua/lstring.c b/src/blua/lstring.c
index afc851d0c..0bcc30877 100644
--- a/src/blua/lstring.c
+++ b/src/blua/lstring.c
@@ -83,7 +83,7 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
        o != NULL;
        o = o->gch.next) {
     TString *ts = rawgco2ts(o);
-    if (ts->tsv.len == l && (memcmp(str, getstr(ts), l) == 0)) {
+    if (l_unlikely(ts->tsv.len == l && (memcmp(str, getstr(ts), l) == 0))) {
       /* string may be dead */
       if (isdead(G(L), o)) changewhite(o);
       return ts;
@@ -95,7 +95,7 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
 
 Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
   Udata *u;
-  if (s > MAX_SIZET - sizeof(Udata))
+  if (l_unlikely(s > MAX_SIZET - sizeof(Udata)))
     luaM_toobig(L);
   u = cast(Udata *, luaM_malloc(L, s + sizeof(Udata)));
   u->uv.marked = luaC_white(G(L));  /* is not finalized */
diff --git a/src/blua/lstrlib.c b/src/blua/lstrlib.c
index 297504e95..e2fd23604 100644
--- a/src/blua/lstrlib.c
+++ b/src/blua/lstrlib.c
@@ -113,7 +113,7 @@ static int str_byte (lua_State *L) {
   if ((size_t)pose > l) pose = l;
   if (posi > pose) return 0;  /* empty interval; return no values */
   n = (int)(pose -  posi + 1);
-  if (posi + n <= pose)  /* overflow? */
+  if (l_unlikely(posi + n <= pose))  /* overflow? */
     luaL_error(L, "string slice too long");
   luaL_checkstack(L, n, "string slice too long");
   for (i=0; i<n; i++)
@@ -187,7 +187,7 @@ typedef struct MatchState {
 
 static int check_capture (MatchState *ms, int l) {
   l -= '1';
-  if (l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED)
+  if (l_unlikely(l < 0 || l >= ms->level || ms->capture[l].len == CAP_UNFINISHED))
     return luaL_error(ms->L, "invalid capture index");
   return l;
 }
@@ -204,14 +204,14 @@ static int capture_to_close (MatchState *ms) {
 static const char *classend (MatchState *ms, const char *p) {
   switch (*p++) {
     case L_ESC: {
-      if (*p == '\0')
+      if (l_unlikely(*p == '\0'))
         luaL_error(ms->L, "malformed pattern (ends with " LUA_QL("%%") ")");
       return p+1;
     }
     case '[': {
       if (*p == '^') p++;
       do {  /* look for a `]' */
-        if (*p == '\0')
+        if (l_unlikely(*p == '\0'))
           luaL_error(ms->L, "malformed pattern (missing " LUA_QL("]") ")");
         if (*(p++) == L_ESC && *p != '\0')
           p++;  /* skip escapes (e.g. `%]') */
@@ -282,7 +282,7 @@ static const char *match (MatchState *ms, const char *s, const char *p);
 
 static const char *matchbalance (MatchState *ms, const char *s,
                                    const char *p) {
-  if (*p == 0 || *(p+1) == 0)
+  if (l_unlikely(*p == 0 || *(p+1) == 0))
     luaL_error(ms->L, "unbalanced pattern");
   if (*s != *p) return NULL;
   else {
@@ -332,7 +332,8 @@ static const char *start_capture (MatchState *ms, const char *s,
                                     const char *p, int what) {
   const char *res;
   int level = ms->level;
-  if (level >= LUA_MAXCAPTURES) luaL_error(ms->L, "too many captures");
+  if (l_unlikely(level >= LUA_MAXCAPTURES))
+    luaL_error(ms->L, "too many captures");
   ms->capture[level].init = s;
   ms->capture[level].len = what;
   ms->level = level+1;
@@ -386,7 +387,7 @@ static const char *match (MatchState *ms, const char *s, const char *p) {
         case 'f': {  /* frontier? */
           const char *ep; char previous;
           p += 2;
-          if (*p != '[')
+          if (l_unlikely(*p != '['))
             luaL_error(ms->L, "missing " LUA_QL("[") " after "
                                LUA_QL("%%f") " in pattern");
           ep = classend(ms, p);  /* points to what is next */
@@ -468,14 +469,15 @@ static const char *lmemfind (const char *s1, size_t l1,
 static void push_onecapture (MatchState *ms, int i, const char *s,
                                                     const char *e) {
   if (i >= ms->level) {
-    if (i == 0)  /* ms->level == 0, too */
+    if (l_likely(i == 0))  /* ms->level == 0, too */
       lua_pushlstring(ms->L, s, e - s);  /* add whole match */
     else
       luaL_error(ms->L, "invalid capture index");
   }
   else {
     ptrdiff_t l = ms->capture[i].len;
-    if (l == CAP_UNFINISHED) luaL_error(ms->L, "unfinished capture");
+    if (l_unlikely(l == CAP_UNFINISHED))
+      luaL_error(ms->L, "unfinished capture");
     if (l == CAP_POSITION)
       lua_pushinteger(ms->L, ms->capture[i].init - ms->src_init + 1);
     else
@@ -637,7 +639,7 @@ static void add_value (MatchState *ms, luaL_Buffer *b, const char *s,
     lua_pop(L, 1);
     lua_pushlstring(L, s, e - s);  /* keep original text */
   }
-  else if (!lua_isstring(L, -1))
+  else if (l_unlikely(!lua_isstring(L, -1)))
     luaL_error(L, "invalid replacement value (a %s)", luaL_typename(L, -1));
   luaL_addvalue(b);  /* add result to accumulator */
 }
@@ -727,7 +729,7 @@ static void addquoted (lua_State *L, luaL_Buffer *b, int arg) {
 static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
   const char *p = strfrmt;
   while (*p != '\0' && strchr(FLAGS, *p) != NULL) p++;  /* skip flags */
-  if ((size_t)(p - strfrmt) >= sizeof(FLAGS))
+  if (l_unlikely((size_t)(p - strfrmt) >= sizeof(FLAGS)))
     luaL_error(L, "invalid format (repeated flags)");
   if (isdigit(uchar(*p))) p++;  /* skip width */
   if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
@@ -736,7 +738,7 @@ static const char *scanformat (lua_State *L, const char *strfrmt, char *form) {
     if (isdigit(uchar(*p))) p++;  /* skip precision */
     if (isdigit(uchar(*p))) p++;  /* (2 digits at most) */
   }
-  if (isdigit(uchar(*p)))
+  if (l_unlikely(isdigit(uchar(*p))))
     luaL_error(L, "invalid format (width or precision too long)");
   *(form++) = '%';
   strncpy(form, strfrmt, p - strfrmt + 1);
diff --git a/src/blua/ltable.c b/src/blua/ltable.c
index 0ddd9ef4f..b21bc4bfa 100644
--- a/src/blua/ltable.c
+++ b/src/blua/ltable.c
@@ -278,7 +278,7 @@ static void setnodevector (lua_State *L, Table *t, int size) {
   else {
     int i;
     lsize = ceillog2(size);
-    if (lsize > MAXBITS)
+    if (l_unlikely(lsize > MAXBITS))
       luaG_runerror(L, "table overflow");
     size = twoto(lsize);
     t->node = luaM_newvector(L, size, Node);
@@ -498,8 +498,9 @@ TValue *luaH_set (lua_State *L, Table *t, const TValue *key) {
   if (p != luaO_nilobject)
     return cast(TValue *, p);
   else {
-    if (ttisnil(key)) luaG_runerror(L, "table index is nil");
-    else if (ttisnumber(key) && luai_numisnan(nvalue(key)))
+    if (l_unlikely(ttisnil(key)))
+      luaG_runerror(L, "table index is nil");
+    else if (l_unlikely(ttisnumber(key) && luai_numisnan(nvalue(key))))
       luaG_runerror(L, "table index is NaN");
     return newkey(L, t, key);
   }
diff --git a/src/blua/ltablib.c b/src/blua/ltablib.c
index 2dd157155..5f4ead74a 100644
--- a/src/blua/ltablib.c
+++ b/src/blua/ltablib.c
@@ -134,7 +134,7 @@ static int tremove (lua_State *L) {
 
 static void addfield (lua_State *L, luaL_Buffer *b, int i) {
   lua_rawgeti(L, 1, i);
-  if (!lua_isstring(L, -1))
+  if (l_unlikely(!lua_isstring(L, -1)))
     luaL_error(L, "invalid value (%s) at index %d in table for "
                   LUA_QL("concat"), luaL_typename(L, -1), i);
   luaL_addvalue(b);
@@ -224,12 +224,14 @@ static void auxsort (lua_State *L, int l, int u) {
     for (;;) {  /* invariant: a[l..i] <= P <= a[j..u] */
       /* repeat ++i until a[i] >= P */
       while (lua_rawgeti(L, 1, ++i), sort_comp(L, -1, -2)) {
-        if (i>u) luaL_error(L, "invalid order function for sorting");
+        if (l_unlikely(i>u))
+          luaL_error(L, "invalid order function for sorting");
         lua_pop(L, 1);  /* remove a[i] */
       }
       /* repeat --j until a[j] <= P */
       while (lua_rawgeti(L, 1, --j), sort_comp(L, -3, -1)) {
-        if (j<l) luaL_error(L, "invalid order function for sorting");
+        if (l_unlikely(j<l))
+          luaL_error(L, "invalid order function for sorting");
         lua_pop(L, 1);  /* remove a[j] */
       }
       if (j<i) {
diff --git a/src/blua/luaconf.h b/src/blua/luaconf.h
index 9e2948f41..2e5424ae4 100644
--- a/src/blua/luaconf.h
+++ b/src/blua/luaconf.h
@@ -773,6 +773,23 @@ union luai_Cast { double l_d; long l_l; };
 
 /* =================================================================== */
 
+/*
+ * * macros to improve jump prediction, used mostly for error handling
+ ** and debug facilities.
+ */
+#if !defined(l_likely)
+
+#include <stdio.h>
+#if defined(__GNUC__)
+#define l_likely(x)	(__builtin_expect(((x) != 0), 1))
+#define l_unlikely(x)	(__builtin_expect(((x) != 0), 0))
+#else
+#define l_likely(x)	(x)
+#define l_unlikely(x)	(x)
+#endif
+
+#endif
+
 /*
 ** Local configuration. You can use this space to add your redefinitions
 ** without modifying the main part of the file.
diff --git a/src/blua/lvm.c b/src/blua/lvm.c
index c6269966c..02d2265c1 100644
--- a/src/blua/lvm.c
+++ b/src/blua/lvm.c
@@ -119,7 +119,7 @@ void luaV_gettable (lua_State *L, TValue *t, TValue *key, StkId val) {
       }
       /* else will try the tag method */
     }
-    else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX)))
+    else if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX))))
       luaG_typeerror(L, t, "index");
     if (ttisfunction(tm)) {
       callTMres(L, val, tm, t, key);
@@ -147,7 +147,7 @@ void luaV_settable (lua_State *L, TValue *t, TValue *key, StkId val) {
       }
       /* else will try the tag method */
     }
-    else if (ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX)))
+    else if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))))
       luaG_typeerror(L, t, "index");
     if (ttisfunction(tm)) {
       callTM(L, tm, t, key, val);
@@ -293,7 +293,8 @@ void luaV_concat (lua_State *L, int total, int last) {
       /* collect total length */
       for (n = 1; n < total && tostring(L, top-n-1); n++) {
         size_t l = tsvalue(top-n-1)->len;
-        if (l >= MAX_SIZET - tl) luaG_runerror(L, "string length overflow");
+        if (l_unlikely(l >= MAX_SIZET - tl))
+          luaG_runerror(L, "string length overflow");
         tl += l;
       }
       buffer = luaZ_openspace(L, &G(L)->buff, tl);
@@ -322,8 +323,8 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
       case TM_ADD: setnvalue(ra, luai_numadd(nb, nc)); break;
       case TM_SUB: setnvalue(ra, luai_numsub(nb, nc)); break;
       case TM_MUL: setnvalue(ra, luai_nummul(nb, nc)); break;
-      case TM_DIV: if (nc == 0) { luaG_runerror(L, "divide by zero error"); } else setnvalue(ra, luai_numdiv(nb, nc)); break;
-      case TM_MOD: if (nc == 0) { luaG_runerror(L, "modulo by zero error"); } else setnvalue(ra, luai_nummod(nb, nc)); break;
+      case TM_DIV: if (l_unlikely(nc == 0)) { luaG_runerror(L, "divide by zero error"); } else setnvalue(ra, luai_numdiv(nb, nc)); break;
+      case TM_MOD: if (l_unlikely(nc == 0)) { luaG_runerror(L, "modulo by zero error"); } else setnvalue(ra, luai_nummod(nb, nc)); break;
       case TM_POW: setnvalue(ra, luai_numpow(nb, nc)); break;
       case TM_UNM: setnvalue(ra, luai_numunm(nb)); break;
       case TM_AND: setnvalue(ra, luai_numand(nb, nc)); break;
@@ -491,7 +492,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
         TValue *rc = RKC(i);
         if (ttisnumber(rb) && ttisnumber(rc)) {
           lua_Number nb = nvalue(rb), nc = nvalue(rc);
-          if (nc == 0) {
+          if (l_unlikely(nc == 0)) {
             luaG_runerror(L, "divide by zero error");
           }
           else
@@ -506,7 +507,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
         TValue *rc = RKC(i);
         if (ttisnumber(rb) && ttisnumber(rc)) {
           lua_Number nb = nvalue(rb), nc = nvalue(rc);
-          if (nc == 0) {
+          if (l_unlikely(nc == 0)) {
             luaG_runerror(L, "modulo by zero error");
           }
           else
@@ -580,7 +581,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
           }
           default: {  /* try metamethod */
             Protect(
-              if (!call_binTM(L, rb, luaO_nilobject, ra, TM_LEN))
+              if (l_unlikely(!call_binTM(L, rb, luaO_nilobject, ra, TM_LEN)))
                 luaG_typeerror(L, rb, "get length of");
             )
           }
@@ -724,11 +725,11 @@ void luaV_execute (lua_State *L, int nexeccalls) {
         const TValue *plimit = ra+1;
         const TValue *pstep = ra+2;
         L->savedpc = pc;  /* next steps may throw errors */
-        if (!tonumber(init, ra))
+        if (l_unlikely(!tonumber(init, ra)))
           luaG_runerror(L, LUA_QL("for") " initial value must be a number");
-        else if (!tonumber(plimit, ra+1))
+        else if (l_unlikely(!tonumber(plimit, ra+1)))
           luaG_runerror(L, LUA_QL("for") " limit must be a number");
-        else if (!tonumber(pstep, ra+2))
+        else if (l_unlikely(!tonumber(pstep, ra+2)))
           luaG_runerror(L, LUA_QL("for") " step must be a number");
         if (ra && pstep)
           setnvalue(ra, luai_numsub(nvalue(ra), nvalue(pstep)));
diff --git a/src/byteptr.h b/src/byteptr.h
index 0b3935e63..205884acc 100644
--- a/src/byteptr.h
+++ b/src/byteptr.h
@@ -1,7 +1,7 @@
 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2018 by Sonic Team Junior.
+// Copyright (C) 1999-2024 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -11,23 +11,45 @@
 /// \brief Macros to read/write from/to a UINT8 *,
 ///        used for packet creation and such
 
+#ifndef __BYTEPTR_H__
+#define __BYTEPTR_H__
+
+#if defined (__alpha__) || defined (__arm__) || defined (__mips__) || defined (__ia64__) || defined (__clang__)
+#define DEALIGNED
+#endif
+
 #include "endian.h"
 
 #ifndef SRB2_BIG_ENDIAN
 //
 // Little-endian machines
 //
+#ifdef DEALIGNED
 #define WRITEUINT8(p,b)     do {   UINT8 *p_tmp = (void *)p; const   UINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; p = (void *)p_tmp; } while (0)
 #define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (void *)p; const   SINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; p = (void *)p_tmp; } while (0)
 #define WRITEINT16(p,b)     do {   INT16 *p_tmp = (void *)p; const   INT16 tv = (  INT16)(b); memcpy(p, &tv, sizeof(  INT16)); p_tmp++; p = (void *)p_tmp; } while (0)
+#define WRITEINT16_2(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) // dumb hack for mumble
 #define WRITEUINT16(p,b)    do {  UINT16 *p_tmp = (void *)p; const  UINT16 tv = ( UINT16)(b); memcpy(p, &tv, sizeof( UINT16)); p_tmp++; p = (void *)p_tmp; } while (0)
 #define WRITEINT32(p,b)     do {   INT32 *p_tmp = (void *)p; const   INT32 tv = (  INT32)(b); memcpy(p, &tv, sizeof(  INT32)); p_tmp++; p = (void *)p_tmp; } while (0)
 #define WRITEUINT32(p,b)    do {  UINT32 *p_tmp = (void *)p; const  UINT32 tv = ( UINT32)(b); memcpy(p, &tv, sizeof( UINT32)); p_tmp++; p = (void *)p_tmp; } while (0)
 #define WRITECHAR(p,b)      do {    char *p_tmp = (void *)p; const    char tv = (   char)(b); memcpy(p, &tv, sizeof(   char)); p_tmp++; p = (void *)p_tmp; } while (0)
 #define WRITEFIXED(p,b)     do { fixed_t *p_tmp = (void *)p; const fixed_t tv = (fixed_t)(b); memcpy(p, &tv, sizeof(fixed_t)); p_tmp++; p = (void *)p_tmp; } while (0)
 #define WRITEANGLE(p,b)     do { angle_t *p_tmp = (void *)p; const angle_t tv = (angle_t)(b); memcpy(p, &tv, sizeof(angle_t)); p_tmp++; p = (void *)p_tmp; } while (0)
+#else
+#define WRITEUINT8(p,b)     do {   UINT8 *p_tmp = (  UINT8 *)p; *p_tmp = (  UINT8)(b); p_tmp++; p = (void *)p_tmp; } while (0)
+#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (  SINT8 *)p; *p_tmp = (  SINT8)(b); p_tmp++; p = (void *)p_tmp; } while (0)
+#define WRITEINT16(p,b)     do {   INT16 *p_tmp = (  INT16 *)p; *p_tmp = (  INT16)(b); p_tmp++; p = (void *)p_tmp; } while (0)
+#define WRITEINT16_2(p,b)     do {   INT16 *p_tmp = (  INT16 *)p; *p_tmp = (  INT16)(b); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0) // dumb hack for mumble
+#define WRITEUINT16(p,b)    do {  UINT16 *p_tmp = ( UINT16 *)p; *p_tmp = ( UINT16)(b); p_tmp++; p = (void *)p_tmp; } while (0)
+#define WRITEINT32(p,b)     do {   INT32 *p_tmp = (  INT32 *)p; *p_tmp = (  INT32)(b); p_tmp++; p = (void *)p_tmp; } while (0)
+#define WRITEUINT32(p,b)    do {  UINT32 *p_tmp = ( UINT32 *)p; *p_tmp = ( UINT32)(b); p_tmp++; p = (void *)p_tmp; } while (0)
+#define WRITECHAR(p,b)      do {    char *p_tmp = (   char *)p; *p_tmp = (   char)(b); p_tmp++; p = (void *)p_tmp; } while (0)
+#define WRITEFIXED(p,b)     do { fixed_t *p_tmp = (fixed_t *)p; *p_tmp = (fixed_t)(b); p_tmp++; p = (void *)p_tmp; } while (0)
+#define WRITEANGLE(p,b)     do { angle_t *p_tmp = (angle_t *)p; *p_tmp = (angle_t)(b); p_tmp++; p = (void *)p_tmp; } while (0)
+#endif
 
 #ifdef __GNUC__
+#ifdef DEALIGNED
 #define READUINT8(p)        ({   UINT8 *p_tmp = (void *)p;   UINT8 b; memcpy(&b, p, sizeof(  UINT8)); p_tmp++; p = (void *)p_tmp; b; })
 #define READSINT8(p)        ({   SINT8 *p_tmp = (void *)p;   SINT8 b; memcpy(&b, p, sizeof(  SINT8)); p_tmp++; p = (void *)p_tmp; b; })
 #define READINT16(p)        ({   INT16 *p_tmp = (void *)p;   INT16 b; memcpy(&b, p, sizeof(  INT16)); p_tmp++; p = (void *)p_tmp; b; })
@@ -38,6 +60,17 @@
 #define READFIXED(p)        ({ fixed_t *p_tmp = (void *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; p = (void *)p_tmp; b; })
 #define READANGLE(p)        ({ angle_t *p_tmp = (void *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; p = (void *)p_tmp; b; })
 #else
+#define READUINT8(p)        ({   UINT8 *p_tmp = (  UINT8 *)p;   UINT8 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
+#define READSINT8(p)        ({   SINT8 *p_tmp = (  SINT8 *)p;   SINT8 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
+#define READINT16(p)        ({   INT16 *p_tmp = (  INT16 *)p;   INT16 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
+#define READUINT16(p)       ({  UINT16 *p_tmp = ( UINT16 *)p;  UINT16 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
+#define READINT32(p)        ({   INT32 *p_tmp = (  INT32 *)p;   INT32 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
+#define READUINT32(p)       ({  UINT32 *p_tmp = ( UINT32 *)p;  UINT32 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
+#define READCHAR(p)         ({    char *p_tmp = (   char *)p;    char b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
+#define READFIXED(p)        ({ fixed_t *p_tmp = (fixed_t *)p; fixed_t b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
+#define READANGLE(p)        ({ angle_t *p_tmp = (angle_t *)p; angle_t b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
+#endif
+#else
 #define READUINT8(p)        *((  UINT8 *)p)++
 #define READSINT8(p)        *((  SINT8 *)p)++
 #define READINT16(p)        *((  INT16 *)p)++
@@ -120,7 +153,9 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
 #define READANGLE(p)        ({ angle_t *p_tmp = (angle_t *)p; angle_t b =  readulong(p); p_tmp++; p = (void *)p_tmp; b; })
 #endif //SRB2_BIG_ENDIAN
 
-#define WRITESTRINGN(p, s, n) ({                            \
+#undef DEALIGNED
+
+#define WRITESTRINGN(p, s, n) do {                          \
 	size_t tmp_i;                                           \
                                                             \
 	for (tmp_i = 0; tmp_i < n && s[tmp_i] != '\0'; tmp_i++) \
@@ -128,70 +163,72 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
                                                             \
 	if (tmp_i < n)                                          \
 		WRITECHAR(p, '\0');                                 \
-})
+} while (0)
 
-#define WRITESTRINGL(p, s, n) ({                                \
+#define WRITESTRINGL(p, s, n) do {                              \
 	size_t tmp_i;                                               \
                                                                 \
 	for (tmp_i = 0; tmp_i < n - 1 && s[tmp_i] != '\0'; tmp_i++) \
 		WRITECHAR(p, s[tmp_i]);                                 \
                                                                 \
 	WRITECHAR(p, '\0');                                         \
-})
+} while (0)
 
-#define WRITESTRING(p, s) ({                   \
+#define WRITESTRING(p, s) do {                 \
 	size_t tmp_i;                              \
                                                \
 	for (tmp_i = 0; s[tmp_i] != '\0'; tmp_i++) \
 		WRITECHAR(p, s[tmp_i]);                \
                                                \
 	WRITECHAR(p, '\0');                        \
-})
+} while (0)
 
-#define WRITEMEM(p, s, n) ({ \
-	memcpy(p, s, n);         \
-	p += n;                  \
-})
+#define WRITEMEM(p, s, n) do { \
+	memcpy(p, s, n);           \
+	p += n;                    \
+} while (0)
 
 #define SKIPSTRING(p) while (READCHAR(p) != '\0')
 
-#define SKIPSTRINGN(p, n) ({                 \
+#define SKIPSTRINGN(p, n) do {               \
 	size_t tmp_i = 0;                        \
                                              \
 	while (tmp_i < n && READCHAR(p) != '\0') \
 		tmp_i++;                             \
-})
+} while (0)
 
 #define SKIPSTRINGL(p, n) SKIPSTRINGN(p, n)
 
-#define READSTRINGN(p, s, n) ({                           \
+#define READSTRINGN(p, s, n) do {                         \
 	size_t tmp_i = 0;                                     \
                                                           \
 	while (tmp_i < n && (s[tmp_i] = READCHAR(p)) != '\0') \
 		tmp_i++;                                          \
                                                           \
 	s[tmp_i] = '\0';                                      \
-})
+} while (0)
 
-#define READSTRINGL(p, s, n) ({                               \
+#define READSTRINGL(p, s, n) do {                             \
 	size_t tmp_i = 0;                                         \
                                                               \
 	while (tmp_i < n - 1 && (s[tmp_i] = READCHAR(p)) != '\0') \
 		tmp_i++;                                              \
                                                               \
 	s[tmp_i] = '\0';                                          \
-})
+} while (0)
 
-#define READSTRING(p, s) ({                  \
+#define READSTRING(p, s) do {                \
 	size_t tmp_i = 0;                        \
                                              \
 	while ((s[tmp_i] = READCHAR(p)) != '\0') \
 		tmp_i++;                             \
                                              \
 	s[tmp_i] = '\0';                         \
-})
+} while (0)
 
-#define READMEM(p, s, n) ({ \
-	memcpy(s, p, n);        \
-	p += n;                 \
-})
+#define READMEM(p, s, n) do { \
+	memcpy(s, p, n);          \
+	p += n;                   \
+} while (0)
+
+#endif // __BYTEPTR_H__
diff --git a/src/command.c b/src/command.c
index b7e1e01de..3881246c1 100644
--- a/src/command.c
+++ b/src/command.c
@@ -240,7 +240,6 @@ void COM_ImmedExecute(const char *ptext)
 
 	while (i < strlen(ptext))
 	{
-
 		quotes = 0;
 		for (j = 0; i < strlen(ptext); i++,j++)
 		{
@@ -628,7 +627,7 @@ static void COM_ExecuteString(char *ptext)
 
 	// check cvars
 	// Hurdler: added at Ebola's request ;)
-	// (don't flood the console in software mode with bad gr_xxx command)
+	// (don't flood the console in software mode with bad gl_xxx command)
 	if (!CV_Command() && con_destlines)
 		CONS_Printf(M_GetText("Unknown command '%s'\n"), COM_Argv(0));
 }
@@ -817,12 +816,17 @@ static void COM_Help_f(void)
 		cvar = CV_FindVar(help);
 		if (cvar)
 		{
+			boolean floatmode = false;
+			const char *cvalue = NULL;
 			CONS_Printf("\x82""Variable %s:\n", cvar->name);
 			CONS_Printf(M_GetText("  flags: "));
 			if (cvar->flags & CV_SAVE)
 				CONS_Printf("AUTOSAVE ");
 			if (cvar->flags & CV_FLOAT)
+			{
 				CONS_Printf("FLOAT ");
+				floatmode = true;
+			}
 			if (cvar->flags & CV_NETVAR)
 				CONS_Printf("NETVAR ");
 			if (cvar->flags & CV_CALL)
@@ -832,30 +836,43 @@ static void COM_Help_f(void)
 			CONS_Printf("\n");
 			if (cvar->PossibleValue)
 			{
-				if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX"))
 				{
-					CONS_Printf("  range from %d to %d\n", cvar->PossibleValue[0].value,
-						cvar->PossibleValue[1].value);
-					i = 2;
-				}
+					if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX"))
+					{	
+						if (floatmode)
+						{
+							float fu = FIXED_TO_FLOAT(cvar->PossibleValue[0].value);
+							float ck = FIXED_TO_FLOAT(cvar->PossibleValue[1].value);
+							CONS_Printf("  range from %ld%s to %ld%s\n",
+									(long)fu, M_Ftrim(fu),
+									(long)ck, M_Ftrim(ck));
+						}
+						else
+							CONS_Printf("  range from %d to %d\n", cvar->PossibleValue[0].value,
+								cvar->PossibleValue[1].value);
+						i = 2;
+					}
 
-				{
-					const char *cvalue = NULL;
 					//CONS_Printf(M_GetText("  possible value : %s\n"), cvar->name);
 					while (cvar->PossibleValue[i].strvalue)
 					{
-						CONS_Printf("  %-2d : %s\n", cvar->PossibleValue[i].value,
-							cvar->PossibleValue[i].strvalue);
+						if (floatmode)
+							CONS_Printf("  %-2f : %s\n", FIXED_TO_FLOAT(cvar->PossibleValue[i].value),
+								cvar->PossibleValue[i].strvalue);
+						else
+							CONS_Printf("  %-2d : %s\n", cvar->PossibleValue[i].value,
+								cvar->PossibleValue[i].strvalue);
 						if (cvar->PossibleValue[i].value == cvar->value)
 							cvalue = cvar->PossibleValue[i].strvalue;
 						i++;
 					}
-					if (cvalue)
-						CONS_Printf(" Current value: %s\n", cvalue);
-					else
-						CONS_Printf(" Current value: %d\n", cvar->value);
 				}
 			}
+
+			if (cvalue)
+				CONS_Printf(" Current value: %s\n", cvalue);
+			else if (cvar->string)
+				CONS_Printf(" Current value: %s\n", cvar->string);
 			else
 				CONS_Printf(" Current value: %d\n", cvar->value);
 		}
@@ -1026,7 +1043,10 @@ static void COM_Add_f(void)
 	}
 
 	if (( cvar->flags & CV_FLOAT ))
-		CV_Set(cvar, va("%f", FIXED_TO_FLOAT (cvar->value) + atof(COM_Argv(2))));
+	{
+		float n =FIXED_TO_FLOAT (cvar->value) + atof(COM_Argv(2));
+		CV_Set(cvar, va("%ld%s", (long)n, M_Ftrim(n)));
+	}
 	else
 		CV_AddValue(cvar, atoi(COM_Argv(2)));
 }
@@ -1493,11 +1513,7 @@ static void Got_NetVar(UINT8 **p, INT32 playernum)
 
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -1988,7 +2004,7 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
 	return true;
 }
 
-// Block the Xbox DInput default axes and reset to the current defaults 
+// 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"))
@@ -2045,15 +2061,6 @@ static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr)
 
 	if (GETMAJOREXECVERSION(cv_execversion.value) < 2) // 2 = 1.0.2
 	{
-#if 0
-		// We don't have changed saved cvars yet
-		if (!stricmp(v->name, "alwaysmlook")
-			|| !stricmp(v->name, "alwaysmlook2")
-			|| !stricmp(v->name, "mousemove")
-			|| !stricmp(v->name, "mousemove2"))
-			return false;
-#endif
-
 		// axis defaults were changed to be friendly to 360 controllers
 		// if ALL axis settings are defaults, then change them to new values
 		if (!CV_FilterJoyAxisVars(v, valstr))
diff --git a/src/command.h b/src/command.h
index 2276a0ae2..6d1944f9a 100644
--- a/src/command.h
+++ b/src/command.h
@@ -13,6 +13,10 @@
 #ifndef __COMMAND_H__
 #define __COMMAND_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 #include "doomdef.h"
 
@@ -189,4 +193,8 @@ UINT8 CV_CheatsEnabled(void);
 // Returns cvar by name. Exposed here for Lua.
 consvar_t *CV_FindVar(const char *name);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // __COMMAND_H__
diff --git a/src/console.c b/src/console.c
index 90212469e..bb86d444b 100644
--- a/src/console.c
+++ b/src/console.c
@@ -32,6 +32,7 @@
 #include "i_threads.h"
 #include "d_main.h"
 #include "m_menu.h"
+#include "m_textinput.h"
 #include "filesrch.h"
 
 #ifdef HWRENDER
@@ -43,8 +44,12 @@
 #ifdef HAVE_THREADS
 I_mutex con_mutex;
 
-#  define Lock_state()    I_lock_mutex(&con_mutex)
-#  define Unlock_state() I_unlock_mutex(con_mutex)
+// g_in_exiting_signal_handler is an evil hack
+// to avoid infinite SIGABRT recursion in the signal handler
+// due to poisoned locks or mach-o kernel not supporting locks in signals
+// or something like that. idk
+#  define Lock_state()    if (!g_in_exiting_signal_handler) { I_lock_mutex(&con_mutex); }
+#  define Unlock_state()  if (!g_in_exiting_signal_handler) { I_unlock_mutex(con_mutex); }
 #else/*HAVE_THREADS*/
 #  define Lock_state()
 #  define Unlock_state()
@@ -93,9 +98,7 @@ static char inputlines[32][CON_MAXPROMPTCHARS]; // hold last 32 prompt lines
 
 static INT32 inputline;    // current input line number
 static INT32 inputhist;    // line number of history input line to restore
-static size_t input_cur; // position of cursor in line
-static size_t input_sel; // position of selection marker (I.E.: anything between this and input_cur is "selected")
-static size_t input_len; // length of current line, used to bound cursor and such
+static textinput_t input;
 // notice: input does NOT include the "$" at the start of the line. - 11/3/16
 
 // protos.
@@ -272,29 +275,28 @@ void CON_SetupBackColormap(void)
 
 	switch (cons_backcolor.value)
 	{
-		case 0:		palindex = 15; 	break; 	// White
-		case 1:		palindex = 31;	break; 	// Gray
-		case 2:		palindex = 47;	break;	// Sepia
-		case 3:		palindex = 63;	break; 	// Brown
-		case 4:		palindex = 150; shift = 7; 	break; 	// Pink
-		case 5:		palindex = 127; shift = 7;	break; 	// Raspberry
-		case 6:		palindex = 143;	break; 	// Red
-		case 7:		palindex = 86;	shift = 7;	break;	// Creamsicle
-		case 8:		palindex = 95;	break; 	// Orange
-		case 9:		palindex = 119; shift = 7;	break; 	// Gold
-		case 10:	palindex = 111;	break; 	// Yellow
-		case 11:	palindex = 191; shift = 7; 	break; 	// Emerald
-		case 12:	palindex = 175;	break; 	// Green
-		case 13:	palindex = 219;	break; 	// Cyan
-		case 14:	palindex = 207; shift = 7;	break; 	// Steel
-		case 15:	palindex = 230;	shift = 7; 	break; 	// Periwinkle
-		case 16:	palindex = 239;	break; 	// Blue
-		case 17:	palindex = 199; shift = 7; 	break; 	// Purple
-		case 18:	palindex = 255; shift = 7; 	break; 	// Lavender
+		case 0:		palindex =  15;             break;  // White
+		case 1:		palindex =  31;             break;  // Gray
+		case 2:		palindex =  47;             break;  // Sepia
+		case 3:		palindex =  63;             break;  // Brown
+		case 4:		palindex = 150; shift = 7;  break;  // Pink
+		case 5:		palindex = 127; shift = 7;  break;  // Raspberry
+		case 6:		palindex = 143;             break;  // Red
+		case 7:		palindex =  86; shift = 7;  break;  // Creamsicle
+		case 8:		palindex =  95;             break;  // Orange
+		case 9:		palindex = 119; shift = 7;  break;  // Gold
+		case 10:	palindex = 111;             break;  // Yellow
+		case 11:	palindex = 191; shift = 7;  break;  // Emerald
+		case 12:	palindex = 175;             break;  // Green
+		case 13:	palindex = 219;             break;  // Cyan
+		case 14:	palindex = 207; shift = 7;  break;  // Steel
+		case 15:	palindex = 230; shift = 7;  break;  // Periwinkle
+		case 16:	palindex = 239;             break;  // Blue
+		case 17:	palindex = 199; shift = 7;  break;  // Purple
+		case 18:	palindex = 255; shift = 7;  break;  // Lavender
 		// Default green
 		default:	palindex = 175; break;
-
-}
+	}
 
 	// setup background colormap
 	for (i = 0, j = 0; i < 768; i += 3, j++)
@@ -454,7 +456,8 @@ static void CON_InputInit(void)
 	// prepare the first prompt line
 	memset(inputlines, 0, sizeof (inputlines));
 	inputline = 0;
-	input_cur = input_sel = input_len = 0;
+
+	M_TextInputInit(&input, inputlines[inputline], CON_MAXPROMPTCHARS);
 
 	Unlock_state();
 }
@@ -604,7 +607,7 @@ static void CON_MoveConsole(void)
 	}
 
 	// Not instant - Increment fracmovement fractionally
-	fracmovement += FixedMul(cons_speed.value*vid.fdupy, renderdeltatics);
+	fracmovement += FixedMul(cons_speed.value*vid.fdupy, (cv_uncappedhud.value ? renderdeltatics : FRACUNIT));
 
 	if (con_curlines < con_destlines) // Move the console downwards
 	{
@@ -617,11 +620,11 @@ static void CON_MoveConsole(void)
 		con_curlines -= FixedInt(fracmovement);
 		if (con_curlines < con_destlines)
 			con_curlines = con_destlines;
-		
+
 		if (con_destlines == 0) // If the console is being closed, not just moved up...
 			con_tick = 0; // ...don't show the blinking cursor
 	}
-	
+
 	fracmovement %= FRACUNIT; // Reset fracmovement's integer value, but keep the fraction
 
 	Unlock_state();
@@ -631,7 +634,7 @@ INT32 CON_ShiftChar(INT32 ch)
 {
 	if (I_UseNativeKeyboard())
 		return ch;
-	
+
 	if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
 	{
 		if (cv_keyboardlayout.value == 3)
@@ -798,113 +801,6 @@ void CON_Ticker(void)
 	Unlock_state();
 }
 
-//
-// ----
-//
-// Shortcuts for adding and deleting characters, strings, and sections
-// Necessary due to moving cursor
-//
-
-static void CON_InputClear(void)
-{
-	Lock_state();
-
-	memset(inputlines[inputline], 0, CON_MAXPROMPTCHARS);
-	input_cur = input_sel = input_len = 0;
-
-	Unlock_state();
-}
-
-static void CON_InputSetString(const char *c)
-{
-	Lock_state();
-
-	memset(inputlines[inputline], 0, CON_MAXPROMPTCHARS);
-	strcpy(inputlines[inputline], c);
-	input_cur = input_sel = input_len = strlen(c);
-
-	Unlock_state();
-}
-
-static void CON_InputAddString(const char *c)
-{
-	size_t csize = strlen(c);
-
-	Lock_state();
-
-	if (input_len + csize > CON_MAXPROMPTCHARS-1)
-	{
-		Unlock_state();
-		return;
-	}
-	if (input_cur != input_len)
-		memmove(&inputlines[inputline][input_cur+csize], &inputlines[inputline][input_cur], input_len-input_cur);
-	memcpy(&inputlines[inputline][input_cur], c, csize);
-	input_len += csize;
-	input_sel = (input_cur += csize);
-
-	Unlock_state();
-}
-
-static void CON_InputDelSelection(void)
-{
-	size_t start, end, len;
-
-	Lock_state();
-
-	if (input_cur > input_sel)
-	{
-		start = input_sel;
-		end = input_cur;
-	}
-	else
-	{
-		start = input_cur;
-		end = input_sel;
-	}
-	len = (end - start);
-
-	if (end != input_len)
-		memmove(&inputlines[inputline][start], &inputlines[inputline][end], input_len-end);
-	memset(&inputlines[inputline][input_len - len], 0, len);
-
-	input_len -= len;
-	input_sel = input_cur = start;
-
-	Unlock_state();
-}
-
-static void CON_InputAddChar(char c)
-{
-	if (input_len >= CON_MAXPROMPTCHARS-1)
-		return;
-
-	Lock_state();
-
-	if (input_cur != input_len)
-		memmove(&inputlines[inputline][input_cur+1], &inputlines[inputline][input_cur], input_len-input_cur);
-	inputlines[inputline][input_cur++] = c;
-	inputlines[inputline][++input_len] = 0;
-	input_sel = input_cur;
-
-	Unlock_state();
-}
-
-static void CON_InputDelChar(void)
-{
-	if (!input_cur)
-		return;
-
-	Lock_state();
-
-	if (input_cur != input_len)
-		memmove(&inputlines[inputline][input_cur-1], &inputlines[inputline][input_cur], input_len-input_cur);
-	inputlines[inputline][--input_len] = 0;
-	input_sel = --input_cur;
-
-	Unlock_state();
-}
-
 //
 // ----
 //
@@ -930,7 +826,7 @@ boolean CON_Responder(event_t *ev)
 	// let go keyup events, don't eat them
 	if (ev->type != ev_keydown && ev->type != ev_console)
 	{
-		if (ev->data1 == gamecontrol[gc_console][0] || ev->data1 == gamecontrol[gc_console][1])
+		if (ev->data1 == gamecontrol[0][gc_console][0] || ev->data1 == gamecontrol[0][gc_console][1])
 			consdown = false;
 		return false;
 	}
@@ -948,7 +844,7 @@ boolean CON_Responder(event_t *ev)
 			INT32 i;
 			for (i = 0; i < num_gamecontrols; i++)
 			{
-				if (gamecontrol[i][0] == ev->data1 || gamecontrol[i][1] == ev->data1)
+				if (gamecontrol[0][i][0] == ev->data1 || gamecontrol[0][i][1] == ev->data1)
 					break;
 			}
 
@@ -956,7 +852,7 @@ boolean CON_Responder(event_t *ev)
 				return false;
 		}
 
-		if (key == gamecontrol[gc_console][0] || key == gamecontrol[gc_console][1])
+		if (key == gamecontrol[0][gc_console][0] || key == gamecontrol[0][gc_console][1])
 		{
 			if (consdown) // ignore repeat
 				return true;
@@ -985,6 +881,10 @@ boolean CON_Responder(event_t *ev)
 		}
 	}
 
+	Lock_state();
+	M_TextInputHandle(&input, key);
+	Unlock_state();
+
 	// Always eat ctrl/shift/alt if console open, so the menu doesn't get ideas
 	if (key == KEY_LSHIFT || key == KEY_RSHIFT
 	 || key == KEY_LCTRL || key == KEY_RCTRL
@@ -997,12 +897,11 @@ boolean CON_Responder(event_t *ev)
 		// show all cvars/commands that match what we have inputted
 		if (key == KEY_TAB)
 		{
-
 			if (!completion[0])
 			{
-				if (!input_len || input_len >= 40 || strchr(inputlines[inputline], ' '))
+				if (!input.length || input.length >= 40 || strchr(input.buffer, ' '))
 					return true;
-				strcpy(completion, inputlines[inputline]);
+				strcpy(completion, input.buffer);
 				comskips = varskips = 0;
 			}
 
@@ -1023,42 +922,9 @@ boolean CON_Responder(event_t *ev)
 			return true;
 		}
 
-		if (key == 'x' || key == 'X')
-		{
-			if (input_sel > input_cur)
-				I_ClipboardCopy(&inputlines[inputline][input_cur], input_sel-input_cur);
-			else
-				I_ClipboardCopy(&inputlines[inputline][input_sel], input_cur-input_sel);
-			CON_InputDelSelection();
+		// Those are already handled in M_TextInputHandle, but they do extra logic... Maybe textinput_t should have some sort of callbacks?
+		if (key == 'x' || key == 'X' || key == 'v' || key == 'V')
 			completion[0] = 0;
-			return true;
-		}
-		else if (key == 'c' || key == 'C')
-		{
-			if (input_sel > input_cur)
-				I_ClipboardCopy(&inputlines[inputline][input_cur], input_sel-input_cur);
-			else
-				I_ClipboardCopy(&inputlines[inputline][input_sel], input_cur-input_sel);
-			return true;
-		}
-		else if (key == 'v' || key == 'V')
-		{
-			const char *paste = I_ClipboardPaste();
-			if (input_sel != input_cur)
-				CON_InputDelSelection();
-			if (paste != NULL)
-				CON_InputAddString(paste);
-			completion[0] = 0;
-			return true;
-		}
-
-		// Select all
-		if (key == 'a' || key == 'A')
-		{
-			input_sel = 0;
-			input_cur = input_len;
-			return true;
-		}
 
 		// ...why shouldn't it eat the key? if it doesn't, it just means you
 		// can control Sonic from the console, which is silly
@@ -1073,9 +939,9 @@ boolean CON_Responder(event_t *ev)
 		// remember typing for several completions (a-la-4dos)
 		if (!completion[0])
 		{
-			if (!input_len || input_len >= 40 || strchr(inputlines[inputline], ' '))
+			if (!input.length || input.length >= 40 || strchr(input.buffer, ' '))
 				return true;
-			strcpy(completion, inputlines[inputline]);
+			strcpy(completion, input.buffer);
 			comskips = varskips = 0;
 		}
 		else
@@ -1106,7 +972,11 @@ boolean CON_Responder(event_t *ev)
 			cmd = CV_CompleteVar(completion, varskips);
 
 		if (cmd)
-			CON_InputSetString(va("%s ", cmd));
+		{
+			Lock_state();
+			M_TextInputSetString(&input, va("%s ", cmd));
+			Unlock_state();
+		}
 		else
 		{
 			if (comskips > 0)
@@ -1132,37 +1002,6 @@ boolean CON_Responder(event_t *ev)
 		return true;
 	}
 
-	if (key == KEY_LEFTARROW)
-	{
-		if (input_cur != 0)
-			--input_cur;
-		if (!shiftdown)
-			input_sel = input_cur;
-		return true;
-	}
-	else if (key == KEY_RIGHTARROW)
-	{
-		if (input_cur < input_len)
-			++input_cur;
-		if (!shiftdown)
-			input_sel = input_cur;
-		return true;
-	}
-	else if (key == KEY_HOME)
-	{
-		input_cur = 0;
-		if (!shiftdown)
-			input_sel = input_cur;
-		return true;
-	}
-	else if (key == KEY_END)
-	{
-		input_cur = input_len;
-		if (!shiftdown)
-			input_sel = input_cur;
-		return true;
-	}
-
 	// At this point we're messing with input
 	// Clear completion
 	completion[0] = 0;
@@ -1170,45 +1009,29 @@ boolean CON_Responder(event_t *ev)
 	// command enter
 	if (key == KEY_ENTER)
 	{
-		if (!input_len)
+		if (!input.length)
 			return true;
 
 		// push the command
-		COM_BufAddText(inputlines[inputline]);
+		COM_BufAddText(input.buffer);
 		COM_BufAddText("\n");
 
 		CONS_Printf("\x86""%c""\x80""%s\n", CON_PROMPTCHAR, inputlines[inputline]);
 
+		Lock_state();
+
 		// Only add command to history if it differs from previous one
-		if (strcmp(inputlines[inputline], inputlines[(inputline-1) & 31]))
+		if (strcmp(input.buffer, inputlines[(inputline-1) & 31]))
+		{
 			inputline = (inputline+1) & 31;
+			M_TextInputInit(&input, inputlines[inputline], CON_MAXPROMPTCHARS);
+		}
 
 		inputhist = inputline;
-		CON_InputClear();
+		M_TextInputClear(&input);
 
-		return true;
-	}
+		Unlock_state();
 
-	// backspace and delete command prompt
-	if (input_sel != input_cur)
-	{
-		if (key == KEY_BACKSPACE || key == KEY_DEL)
-		{
-			CON_InputDelSelection();
-			return true;
-		}
-	}
-	else if (key == KEY_BACKSPACE)
-	{
-		CON_InputDelChar();
-		return true;
-	}
-	else if (key == KEY_DEL)
-	{
-		if (input_cur == input_len)
-			return true;
-		++input_cur;
-		CON_InputDelChar();
 		return true;
 	}
 
@@ -1225,7 +1048,9 @@ boolean CON_Responder(event_t *ev)
 		if (inputhist == inputline)
 			inputhist = (inputline + 1) & 31;
 
-		CON_InputSetString(inputlines[inputhist]);
+		Lock_state();
+		M_TextInputSetString(&input, inputlines[inputhist]);
+		Unlock_state();
 		return true;
 	}
 
@@ -1239,41 +1064,16 @@ boolean CON_Responder(event_t *ev)
 		while (inputhist != inputline && !inputlines[inputhist][0]);
 
 		// back to currentline
+		Lock_state();
 		if (inputhist == inputline)
-			CON_InputClear();
+			M_TextInputClear(&input);
 		else
-			CON_InputSetString(inputlines[inputhist]);
+			M_TextInputSetString(&input, inputlines[inputhist]);
+		Unlock_state();
+
 		return true;
 	}
 
-	// allow people to use keypad in console (good for typing IP addresses) - Calum
-	if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL)
-	{
-		char keypad_translation[] = {'7','8','9','-',
-		                             '4','5','6','+',
-		                             '1','2','3',
-		                             '0','.'};
-
-		key = keypad_translation[key - KEY_KEYPAD7];
-	}
-	else if (key == KEY_KPADSLASH)
-		key = '/';
-
-	// same capslock code as hu_stuff.c's HU_responder. Check there for details.
-	key = CON_ShiftChar(key);
-
-	// enter a char into the command prompt
-	if (key < 32 || key > 127)
-		return true;
-
-	// add key to cmd line here
-	if (key >= 'A' && key <= 'Z' && !(shiftdown ^ capslock)) //this is only really necessary for dedicated servers
-		key = key + 'a' - 'A';
-
-	if (input_sel != input_cur)
-		CON_InputDelSelection();
-	CON_InputAddChar(key);
-
 	return true;
 }
 
@@ -1435,7 +1235,7 @@ void CONS_Printf(const char *fmt, ...)
 		txt = malloc(8192);
 
 	va_start(argptr, fmt);
-	vsprintf(txt, fmt, argptr);
+	vsnprintf(txt, 8192, fmt, argptr);
 	va_end(argptr);
 
 	// echo console prints to log file
@@ -1443,7 +1243,7 @@ void CONS_Printf(const char *fmt, ...)
 
 	if (con_started)
 		CON_Print(txt);
-	
+
 	CON_LogMessage(txt);
 
 	Lock_state();
@@ -1521,19 +1321,17 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...)
 //
 void CONS_Error(const char *msg)
 {
-#ifdef RPC_NO_WINDOWS_H
-	if (!graphics_started)
-	{
-		MessageBoxA(vid.WndParent, msg, "SRB2Kart Warning", MB_OK);
-		return;
-	}
-#endif
 	CONS_Printf("\x82%s", msg); // write error msg in different colour
 	CONS_Printf(M_GetText("Press ENTER to continue\n"));
 
 	// dirty quick hack, but for the good cause
 	while (I_GetKey() != KEY_ENTER)
+	{
+		// Sleep so we don't take too much of cpu usage
+		I_Sleep(1.f/TICRATE*1000);
+
 		I_OsPolling();
+	}
 }
 
 //======================================================================
@@ -1555,16 +1353,16 @@ static void CON_DrawInput(void)
 
 	clen = con_width-13;
 
-	if (input_len <= clen)
+	if (input.length <= clen)
 	{
 		c = 0;
-		clen = input_len;
+		clen = input.length;
 	}
 	else // input line scrolls left if it gets too long
 	{
 		clen -= 2; // There will always be some extra truncation -- but where is what we'll find out
 
-		if (input_cur <= clen/2)
+		if (input.cursor <= clen/2)
 		{
 			// Close enough to right edge to show all
 			c = 0;
@@ -1575,15 +1373,15 @@ static void CON_DrawInput(void)
 		{
 			// Cursor in the middle (or right side) of input
 			// Move over for the ellipsis
-			c = input_cur - (clen/2) + 2;
+			c = input.cursor - (clen/2) + 2;
 			x += charwidth*2;
 			lellip = 1;
 
-			if (c + clen >= input_len)
+			if (c + clen >= input.length)
 			{
 				// Cursor in the right side of input
 				// We were too far over, so move back
-				c = input_len - clen;
+				c = input.length - clen;
 			}
 			else
 			{
@@ -1597,7 +1395,7 @@ static void CON_DrawInput(void)
 	if (lellip)
 	{
 		x -= charwidth*3;
-		if (input_sel < c)
+		if (input.select < c)
 			V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 107 | V_NOSCALESTART);
 		for (i = 0; i < 3; ++i, x += charwidth)
 			V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
@@ -1607,7 +1405,7 @@ static void CON_DrawInput(void)
 
 	for (cend = c + clen; c < cend; ++c, x += charwidth)
 	{
-		if ((input_sel > c && input_cur <= c) || (input_sel <= c && input_cur > c))
+		if ((input.select > c && input.cursor <= c) || (input.select <= c && input.cursor > c))
 		{
 			V_DrawFill(x, y, charwidth, (10 * con_scalefactor), 107 | V_NOSCALESTART);
 			V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_YELLOWMAP | V_NOSCALESTART, !cv_allcaps.value);
@@ -1615,14 +1413,14 @@ static void CON_DrawInput(void)
 		else
 			V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 
-		if (c == input_cur && con_tick >= 4)
+		if (c == input.cursor && con_tick >= 4)
 			V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 	}
-	if (cend == input_cur && con_tick >= 4)
+	if (cend == input.cursor && con_tick >= 4)
 		V_DrawCharacter(x, y + (con_scalefactor*2), '_' | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 	if (rellip)
 	{
-		if (input_sel > cend)
+		if (input.select > cend)
 			V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 107 | V_NOSCALESTART);
 		for (i = 0; i < 3; ++i, x += charwidth)
 			V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
@@ -1665,12 +1463,15 @@ static void CON_DrawHudlines(void)
 			{
 				charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
 				p++;
+				c++;
 			}
+			if (c >= con_width)
+				break;
 			if (*p < HU_FONTSTART)
 				;//charwidth = 4 * con_scalefactor;
 			else
 			{
-				//charwidth = SHORT(hu_font['A'-HU_FONTSTART]->width) * con_scalefactor;
+				//charwidth = hu_font['A'-HU_FONTSTART]->width * con_scalefactor;
 				V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 			}
 		}
@@ -1705,7 +1506,7 @@ static void CON_DrawConsole(void)
 	// draw console background
 	if (cons_backpic.value || con_forcepic)
 	{
-		patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_CACHE);
+		patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY);
 
 		// Jimita: CON_DrawBackpic just called V_DrawScaledPatch
 		V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, con_backpic, NULL);
@@ -1745,7 +1546,10 @@ static void CON_DrawConsole(void)
 			{
 				charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
 				p++;
+				c++;
 			}
+			if (c >= con_width)
+				break;
 			V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 		}
 	}
@@ -1770,11 +1574,11 @@ void CON_Drawer(void)
 	if (con_recalc)
 	{
 		CON_RecalcSize();
-		
+
 		if (con_curlines <= 0)
 			CON_ClearHUD();
 	}
-	
+
 	// console movement
 	if (con_curlines != con_destlines)
 		CON_MoveConsole();
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
new file mode 100644
index 000000000..db8bc5a15
--- /dev/null
+++ b/src/core/CMakeLists.txt
@@ -0,0 +1 @@
+target_sourcefile(cpp)
diff --git a/src/core/Sourcefile b/src/core/Sourcefile
new file mode 100644
index 000000000..e8701d507
--- /dev/null
+++ b/src/core/Sourcefile
@@ -0,0 +1,2 @@
+memory.cpp
+thread_pool.cpp
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
new file mode 100644
index 000000000..e75cf91f7
--- /dev/null
+++ b/src/core/memory.cpp
@@ -0,0 +1,71 @@
+// BLANKART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+
+#include "memory.h"
+
+#include <array>
+#include <new>
+
+#include "../z_zone.h"
+
+namespace
+{
+
+class LinearMemory
+{
+	size_t size_;
+	size_t height_;
+	void* memory_;
+
+public:
+	constexpr explicit LinearMemory(size_t size) noexcept;
+
+	void* allocate(size_t size);
+	void reset() noexcept;
+};
+
+constexpr LinearMemory::LinearMemory(size_t size) noexcept : size_(size), height_{0}, memory_{nullptr} {}
+
+void* LinearMemory::allocate(size_t size)
+{
+	size_t aligned_size = (size + 15) & ~15;
+	if (height_ + aligned_size > size_)
+	{
+		throw std::bad_alloc();
+	}
+
+	if (memory_ == nullptr)
+	{
+		memory_ = Z_Malloc(size_, PU_STATIC, nullptr);
+	}
+
+	void* ptr = (void*)((uintptr_t)(memory_) + height_);
+	height_ += aligned_size;
+	return ptr;
+}
+
+void LinearMemory::reset() noexcept
+{
+	height_ = 0;
+}
+
+} // namespace
+
+static LinearMemory g_frame_memory {4 * 1024 * 1024};
+
+void* Z_Frame_Alloc(size_t size)
+{
+	return g_frame_memory.allocate(size);
+}
+
+void Z_Frame_Reset()
+{
+	g_frame_memory.reset();
+}
diff --git a/src/core/memory.h b/src/core/memory.h
new file mode 100644
index 000000000..ba49e3d51
--- /dev/null
+++ b/src/core/memory.h
@@ -0,0 +1,32 @@
+// BLANKART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+
+#ifndef __SRB2_CORE_MEMORY_H__
+#define __SRB2_CORE_MEMORY_H__
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cpluspplus
+
+/// @brief Allocate a block of memory with a lifespan of the current main-thread frame.
+/// This function is NOT thread-safe, but the allocated memory may be used across threads.
+/// @return a pointer to a block of memory aligned with libc malloc alignment, or null if allocation fails
+void* Z_Frame_Alloc(size_t size);
+
+/// @brief Resets per-frame memory. Not thread safe.
+void Z_Frame_Reset(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
+
+#endif // __SRB2_CORE_MEMORY_H__
diff --git a/src/core/spmc_queue.hpp b/src/core/spmc_queue.hpp
new file mode 100644
index 000000000..d85e1300d
--- /dev/null
+++ b/src/core/spmc_queue.hpp
@@ -0,0 +1,192 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+// This class is derived from Conor Williams' implementation of a concurrent deque
+// https://github.com/ConorWilliams/ConcurrentDeque
+// Copyright (C) 2021 Conor Williams
+
+// The original version was for C++23. This one has been shrunk slightly and adapted to our conventions.
+
+#ifndef __SRB2_CORE_SPMC_QUEUE_HPP__
+#define __SRB2_CORE_SPMC_QUEUE_HPP__
+
+#include <array>
+#include <atomic>
+#include <cstddef>
+#include <memory>
+#include <optional>
+
+//#include <tracy/tracy/Tracy.hpp>
+
+#include "../cxxutil.hpp"
+
+namespace srb2
+{
+
+template <typename T>
+class SpMcQueue
+{
+	struct RingBuff {
+	public:
+		explicit RingBuff(int64_t cap) : _cap{cap}, _mask{cap - 1}
+		{
+			SRB2_ASSERT(cap && (!(cap & (cap - 1))) && "Capacity must be buf power of 2!");
+			_buff = std::unique_ptr<T[]>(new T[_cap]);
+		}
+
+		std::int64_t capacity() const noexcept { return _cap; }
+
+		// Store (copy) at modulo index
+		void store(int64_t i, T&& x) noexcept
+		{
+			_buff[i & _mask] = std::move(x);
+		}
+
+		// Load (copy) at modulo index
+		T load(int64_t i) const noexcept
+		{
+			return _buff[i & _mask];
+		}
+
+		// Allocates and returns a new ring buffer, copies elements in range [b, t) into the new buffer.
+		RingBuff* resize(std::int64_t b, std::int64_t t) const
+		{
+			//ZoneScoped;
+			RingBuff* ptr = new RingBuff{2 * _cap};
+			for (std::int64_t i = t; i != b; ++i) {
+				ptr->store(i, load(i));
+			}
+			return ptr;
+		}
+
+	private:
+		int64_t _cap;   // Capacity of the buffer
+		int64_t _mask;  // Bit mask to perform modulo capacity operations
+
+		std::unique_ptr<T[]> _buff;
+	};
+
+	alignas(64) std::atomic<int64_t> bottom_;
+	alignas(64) std::atomic<int64_t> top_;
+	alignas(64) std::atomic<RingBuff*> buffer_;
+
+	std::vector<std::unique_ptr<RingBuff>> garbage_;
+
+public:
+	SpMcQueue(size_t capacity) : bottom_(0), top_(0), buffer_(new RingBuff(capacity))
+	{
+		garbage_.reserve(32);
+	}
+	~SpMcQueue() noexcept
+	{
+		delete buffer_.load(std::memory_order_relaxed);
+	};
+
+	size_t size() const noexcept
+	{
+		int64_t bottom = bottom_.load(std::memory_order_relaxed);
+		int64_t top = top_.load(std::memory_order_relaxed);
+		return static_cast<size_t>(bottom >= top ? bottom - top : 0);
+	}
+
+	bool empty() const noexcept
+	{
+		return size() == 0;
+	}
+
+	void push(T&& v) noexcept
+	{
+		int64_t bottom = bottom_.load(std::memory_order_relaxed);
+		int64_t top = top_.load(std::memory_order_acquire);
+		RingBuff* buf = buffer_.load(std::memory_order_relaxed);
+
+		if (buf->capacity() < (bottom - top) + 1)
+		{
+			// Queue is full, build a new one
+			RingBuff* newbuf = buf->resize(bottom, top);
+			garbage_.emplace_back(buf);
+			buffer_.store(newbuf, std::memory_order_relaxed);
+			buf = newbuf;
+		}
+
+		// Construct new object, this does not have to be atomic as no one can steal this item until after we
+		// store the new value of bottom, ordering is maintained by surrounding atomics.
+		buf->store(bottom, std::move(v));
+
+		std::atomic_thread_fence(std::memory_order_release);
+		bottom_.store(bottom + 1, std::memory_order_relaxed);
+	}
+
+	std::optional<T> pop() noexcept
+	{
+		int64_t bottom = bottom_.load(std::memory_order_relaxed) - 1;
+		RingBuff* buf = buffer_.load(std::memory_order_relaxed);
+
+		bottom_.store(bottom, std::memory_order_relaxed);  // Stealers can no longer steal
+
+		std::atomic_thread_fence(std::memory_order_seq_cst);
+		int64_t top = top_.load(std::memory_order_relaxed);
+
+		if (top <= bottom)
+		{
+			// Non-empty deque
+			if (top == bottom)
+			{
+				// The last item could get stolen, by a stealer that loaded bottom before our write above
+				if (!top_.compare_exchange_strong(top, top + 1, std::memory_order_seq_cst, std::memory_order_relaxed))
+				{
+					// Failed race, thief got the last item.
+					bottom_.store(bottom + 1, std::memory_order_relaxed);
+					return std::nullopt;
+				}
+				bottom_.store(bottom + 1, std::memory_order_relaxed);
+			}
+
+			// Can delay load until after acquiring slot as only this thread can push(), this load is not
+			// required to be atomic as we are the exclusive writer.
+			return buf->load(bottom);
+
+		}
+		else
+		{
+			bottom_.store(bottom + 1, std::memory_order_relaxed);
+			return std::nullopt;
+		}
+	}
+
+	std::optional<T> steal() noexcept
+	{
+		int64_t top = top_.load(std::memory_order_acquire);
+		std::atomic_thread_fence(std::memory_order_seq_cst);
+		int64_t bottom = bottom_.load(std::memory_order_acquire);
+
+		if (top < bottom)
+		{
+			// Must load *before* acquiring the slot as slot may be overwritten immediately after acquiring.
+			// This load is NOT required to be atomic even-though it may race with an overrite as we only
+			// return the value if we win the race below garanteeing we had no race during our read. If we
+			// loose the race then 'x' could be corrupt due to read-during-write race but as T is trivially
+			// destructible this does not matter.
+			T x = buffer_.load(std::memory_order_consume)->load(top);
+
+			if (!top_.compare_exchange_strong(top, top + 1, std::memory_order_seq_cst, std::memory_order_relaxed))
+			{
+				return std::nullopt;
+			}
+
+			return x;
+
+		}
+		else
+		{
+			return std::nullopt;
+		}
+	}
+};
+
+} // namespace srb2
+
+#endif // __SRB2_CORE_SPMC_QUEUE_HPP__
diff --git a/src/core/static_vec.hpp b/src/core/static_vec.hpp
new file mode 100644
index 000000000..a5a529564
--- /dev/null
+++ b/src/core/static_vec.hpp
@@ -0,0 +1,255 @@
+// BLANKART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+
+#ifndef __SRB2_CORE_STATIC_VEC_HPP__
+#define __SRB2_CORE_STATIC_VEC_HPP__
+
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <initializer_list>
+#include <iterator>
+#include <stdexcept>
+#include <type_traits>
+
+#include "../cxxutil.hpp"
+
+namespace srb2
+{
+
+template <typename T, size_t Limit>
+class StaticVec;
+
+template <typename T, size_t Limit>
+class StaticVec
+{
+	std::array<T, Limit> arr_ {{}};
+	size_t size_ = 0;
+
+public:
+	using value_type = T;
+
+	constexpr StaticVec() {}
+
+	StaticVec(const StaticVec& rhs)
+	{
+		for (size_t i = size_; i > 0; i--)
+		{
+			arr_[i] = T();
+		}
+		size_ = rhs.size();
+		for (size_t i = 0; i < size_; i++)
+		{
+			arr_[i] = rhs.arr_[i];
+		}
+	}
+
+	StaticVec(StaticVec&& rhs) noexcept(std::is_nothrow_move_assignable_v<T>)
+	{
+		for (size_t i = size_; i > 0; i--)
+		{
+			arr_[i] = T();
+		}
+		size_ = rhs.size();
+		for (size_t i = 0; i < size_; i++)
+		{
+			arr_[i] = std::move(rhs.arr_[i]);
+		}
+		while (rhs.size() > 0)
+		{
+			rhs.pop_back();
+		}
+	}
+
+	constexpr StaticVec(std::initializer_list<T> list) noexcept(std::is_nothrow_move_assignable_v<T>)
+	{
+		size_ = list.size();
+		size_t i = 0;
+		for (auto itr = list.begin(); itr != list.end(); itr++)
+		{
+			arr_[i] = *itr;
+			i++;
+		}
+	}
+
+	~StaticVec() = default;
+
+	StaticVec& operator=(const StaticVec& rhs)
+	{
+		for (size_t i = size_; i > 0; i--)
+		{
+			arr_[i] = T();
+		}
+		size_ = rhs.size();
+		for (size_t i = 0; i < size_; i++)
+		{
+			arr_[i] = rhs.arr_[i];
+		}
+		return *this;
+	}
+
+	StaticVec& operator=(StaticVec&& rhs) noexcept(std::is_nothrow_move_constructible_v<T>)
+	{
+		for (size_t i = size_; i > 0; i--)
+		{
+			arr_[i] = T();
+		}
+		size_ = rhs.size();
+		for (size_t i = 0; i < size_; i++)
+		{
+			arr_[i] = std::move(rhs.arr_[i]);
+		}
+		while (rhs.size() > 0)
+		{
+			rhs.pop_back();
+		}
+		return *this;
+	}
+
+	void push_back(const T& value) { arr_[size_++] = value; }
+
+	void pop_back() { arr_[--size_] = T(); }
+
+	void resize(size_t size, T value = T())
+	{
+		if (size >= Limit)
+		{
+			throw std::length_error("new size >= Capacity");
+		}
+
+		if (size == size_)
+		{
+			return;
+		}
+		else if (size < size_)
+		{
+			while (size_ > size)
+			{
+				pop_back();
+			}
+		}
+		else
+		{
+			while (size_ < size)
+			{
+				push_back(value);
+			}
+		}
+	}
+
+	void clear()
+	{
+		arr_ = {{}};
+		size_ = 0;
+	}
+
+	using iterator = typename std::array<T, Limit>::iterator;
+	using const_iterator = typename std::array<T, Limit>::const_iterator;
+
+	constexpr iterator begin() noexcept { return arr_.begin(); }
+
+	constexpr const_iterator begin() const noexcept { return arr_.cbegin(); }
+
+	constexpr const_iterator cbegin() const noexcept { return arr_.cbegin(); }
+
+	constexpr iterator end() noexcept { return std::next(arr_.begin(), size_); }
+
+	constexpr const_iterator end() const noexcept { return cend(); }
+
+	constexpr const_iterator cend() const noexcept { return std::next(arr_.cbegin(), size_); }
+
+	constexpr std::reverse_iterator<iterator> rbegin() noexcept { return std::reverse_iterator(this->end()); }
+
+	constexpr std::reverse_iterator<const_iterator> crbegin() const noexcept { return std::reverse_iterator(this->cend()); }
+
+	constexpr std::reverse_iterator<iterator> rend() noexcept { return std::reverse_iterator(this->begin()); }
+
+	constexpr std::reverse_iterator<const_iterator> crend() const noexcept { return std::reverse_iterator(this->cbegin()); }
+
+	constexpr bool empty() const noexcept { return size_ == 0; }
+
+	constexpr size_t size() const noexcept { return size_; }
+
+	constexpr size_t capacity() const noexcept { return Limit; }
+
+	constexpr size_t max_size() const noexcept { return Limit; }
+
+	constexpr T& operator[](size_t index) noexcept { return arr_[index]; }
+
+	T& at(size_t index)
+	{
+		if (index >= size_)
+		{
+			throw std::out_of_range("index >= size");
+		}
+		return this[index];
+	}
+
+	constexpr const T& operator[](size_t index) const noexcept { return arr_[index]; }
+
+	const T& at(size_t index) const
+	{
+		if (index >= size_)
+		{
+			throw std::out_of_range("index >= size");
+		}
+		return this[index];
+	}
+
+	T& front() { return *arr_[0]; }
+
+	T& back() { return *arr_[size_ - 1]; }
+};
+
+} // namespace srb2
+
+template <typename T, size_t L1, size_t L2>
+bool operator==(const srb2::StaticVec<T, L1>& lhs, const srb2::StaticVec<T, L2>& rhs)
+{
+	const size_t size = lhs.size();
+	if (size != rhs.size())
+	{
+		return false;
+	}
+	for (size_t i = 0; i < lhs; i++)
+	{
+		if (rhs[i] != lhs[i])
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+template <typename T, size_t L1, size_t L2>
+bool operator!=(const srb2::StaticVec<T, L1>& lhs, const srb2::StaticVec<T, L2>& rhs)
+{
+	return !(lhs == rhs);
+}
+
+template <typename T, size_t Limit>
+struct std::hash<srb2::StaticVec<T, Limit>>
+{
+	size_t operator()(const srb2::StaticVec<T, Limit>& input) const
+	{
+		constexpr size_t prime = sizeof(size_t) == 8 ? 0x00000100000001B3 : 0x01000193;
+		constexpr size_t basis = sizeof(size_t) == 8 ? 0xcbf29ce484222325 : 0x811c9dc5;
+
+		size_t ret = basis;
+		for (auto itr = input.begin(); itr != input.end(); itr++)
+		{
+			ret = (ret * prime) ^ std::hash<T>(*itr);
+		}
+		return ret;
+	}
+};
+
+#endif // __SRB2_CORE_STATIC_VEC_HPP__
diff --git a/src/core/thread_pool.cpp b/src/core/thread_pool.cpp
new file mode 100644
index 000000000..11aa6f1bb
--- /dev/null
+++ b/src/core/thread_pool.cpp
@@ -0,0 +1,346 @@
+// BLANKART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+
+#include "thread_pool.h"
+
+#include <algorithm>
+#include <condition_variable>
+#include <exception>
+#include <mutex>
+#include <string>
+#include <system_error>
+
+//#include <fmt/format.h>
+//#include <tracy/tracy/Tracy.hpp>
+
+#include "../cxxutil.hpp"
+#include "../m_argv.h"
+
+using namespace srb2;
+
+static void do_work(ThreadPool::Task& work)
+{
+	try
+	{
+		//ZoneScoped;
+		(work.thunk)(work.raw.data());
+	}
+	catch (...)
+	{
+		// can't do anything
+	}
+
+	(work.deleter)(work.raw.data());
+	if (work.pseudosema)
+	{
+		work.pseudosema->fetch_sub(1, std::memory_order_relaxed);
+	}
+}
+
+static void pool_executor(
+	//int thread_index,
+	std::shared_ptr<std::atomic<bool>> pool_alive,
+	std::shared_ptr<std::mutex> worker_ready_mutex,
+	std::shared_ptr<std::condition_variable> worker_ready_condvar,
+	std::shared_ptr<ThreadPool::Queue> my_wq,
+	std::vector<std::shared_ptr<ThreadPool::Queue>> other_wqs
+)
+{
+	{
+		//std::string thread_name = fmt::format("Thread Pool Thread {}", thread_index);
+		//tracy::SetThreadName(thread_name.c_str());
+	}
+
+	int spins = 0;
+	while (true)
+	{
+		std::optional<ThreadPool::Task> work = my_wq->steal();
+		bool did_work = false;
+		if (work)
+		{
+			do_work(*work);
+
+			did_work = true;
+			spins = 0;
+		}
+		else
+		{
+			for (auto& q : other_wqs)
+			{
+				work = q->steal();
+				if (work)
+				{
+					do_work(*work);
+
+					did_work = true;
+					spins = 0;
+
+					// We only want to steal one work item at a time, to prioritize our own queue
+					break;
+				}
+			}
+		}
+
+		if (!did_work)
+		{
+			// Spin a few loops to avoid yielding, then wait for the ready lock
+			spins += 1;
+			if (spins > 100)
+			{
+				std::unique_lock<std::mutex> ready_lock {*worker_ready_mutex};
+				while (my_wq->empty() && pool_alive->load())
+				{
+					worker_ready_condvar->wait(ready_lock);
+				}
+
+				if (!pool_alive->load())
+				{
+					break;
+				}
+			}
+		}
+	}
+}
+
+ThreadPool::ThreadPool()
+{
+	immediate_mode_ = true;
+}
+
+ThreadPool::ThreadPool(size_t threads)
+{
+	next_queue_index_ = 0;
+	pool_alive_ = std::make_shared<std::atomic<bool>>(true);
+
+	for (size_t i = 0; i < threads; i++)
+	{
+		std::shared_ptr<Queue> wsq = std::make_shared<Queue>(2048);
+		work_queues_.push_back(wsq);
+
+		std::shared_ptr<std::mutex> mutex = std::make_shared<std::mutex>();
+		worker_ready_mutexes_.push_back(std::move(mutex));
+		std::shared_ptr<std::condition_variable> condvar = std::make_shared<std::condition_variable>();
+		worker_ready_condvars_.push_back(std::move(condvar));
+	}
+
+	for (size_t i = 0; i < threads; i++)
+	{
+		std::shared_ptr<Queue> my_queue = work_queues_[i];
+		std::vector<std::shared_ptr<Queue>> other_queues;
+		for (size_t j = 0; j < threads; j++)
+		{
+			// Order the other queues starting from the next adjacent worker
+			// i.e. if this is worker 2 of 8, then other queues is 3, 4, 5, 6, 7, 0, 1
+			// This tries to balance out work stealing behavior
+
+			size_t other_index = j + i;
+			if (other_index >= threads)
+			{
+				other_index -= threads;
+			}
+
+			if (other_index != i)
+			{
+				other_queues.push_back(work_queues_[other_index]);
+			}
+		}
+
+		std::thread thread;
+		try
+		{
+			thread = std::thread
+			{
+				pool_executor,
+				//i,
+				pool_alive_,
+				worker_ready_mutexes_[i],
+				worker_ready_condvars_[i],
+				my_queue,
+				other_queues
+			};
+		}
+		catch (const std::system_error& error)
+		{
+			// Safe shutdown and rethrow
+			pool_alive_->store(false);
+			for (auto& t : threads_)
+			{
+				t.join();
+			}
+			throw error;
+		}
+
+		threads_.push_back(std::move(thread));
+	}
+}
+
+ThreadPool::ThreadPool(ThreadPool&&) = default;
+ThreadPool::~ThreadPool() = default;
+
+ThreadPool& ThreadPool::operator=(ThreadPool&&) = default;
+
+void ThreadPool::begin_sema()
+{
+	sema_begun_ = true;
+}
+
+ThreadPool::Sema ThreadPool::end_sema()
+{
+	Sema ret = Sema(std::move(cur_sema_));
+	cur_sema_ = nullptr;
+	sema_begun_ = false;
+	return ret;
+}
+
+void ThreadPool::notify()
+{
+	for (size_t i = 0; i < work_queues_.size(); i++)
+	{
+		auto& q = work_queues_[i];
+		size_t count = q->size();
+		if (count > 0)
+		{
+			worker_ready_condvars_[i]->notify_one();
+		}
+	}
+}
+
+void ThreadPool::notify_sema(const ThreadPool::Sema& sema)
+{
+	if (!sema.pseudosema_)
+	{
+		return;
+	}
+	notify();
+}
+
+void ThreadPool::wait_idle()
+{
+	if (immediate_mode_)
+	{
+		return;
+	}
+
+	//ZoneScoped;
+
+	for (size_t i = 0; i < work_queues_.size(); i++)
+	{
+		auto& q = work_queues_[i];
+
+		std::optional<Task> work;
+		while ((work = q->pop()).has_value())
+		{
+			do_work(*work);
+		}
+	}
+}
+
+void ThreadPool::wait_sema(const Sema& sema)
+{
+	if (!sema.pseudosema_)
+	{
+		return;
+	}
+
+	//ZoneScoped;
+
+	while (sema.pseudosema_->load(std::memory_order_seq_cst) > 0)
+	{
+		// spin to win
+		for (size_t i = 0; i < work_queues_.size(); i++)
+		{
+			auto& q = work_queues_[i];
+
+			std::optional<Task> work;
+			if ((work = q->pop()).has_value())
+			{
+				do_work(*work);
+				break;
+			}
+		}
+	}
+
+	if (sema.pseudosema_->load(std::memory_order_seq_cst) != 0)
+	{
+		throw std::exception();
+	}
+}
+
+void ThreadPool::shutdown()
+{
+	if (immediate_mode_)
+	{
+		return;
+	}
+
+	wait_idle();
+
+	pool_alive_->store(false);
+
+	for (auto& condvar : worker_ready_condvars_)
+	{
+		condvar->notify_all();
+	}
+	for (auto& t : threads_)
+	{
+		t.join();
+	}
+}
+
+std::unique_ptr<ThreadPool> srb2::g_main_threadpool;
+
+void I_ThreadPoolInit(void)
+{
+	SRB2_ASSERT(g_main_threadpool == nullptr);
+	size_t thread_count = std::min(static_cast<unsigned int>(9), std::thread::hardware_concurrency());
+	if (thread_count > 1)
+	{
+		// The main thread will act as a worker when waiting for pool idle
+		// Make one less worker thread to avoid unnecessary context switching
+		thread_count -= 1;
+	}
+
+	if (M_CheckParm("-singlethreaded"))
+	{
+		g_main_threadpool = std::make_unique<ThreadPool>();
+	}
+	else
+	{
+		g_main_threadpool = std::make_unique<ThreadPool>(thread_count);
+	}
+}
+
+void I_ThreadPoolShutdown(void)
+{
+	if (!g_main_threadpool)
+	{
+		return;
+	}
+
+	g_main_threadpool->shutdown();
+	g_main_threadpool = nullptr;
+}
+
+void I_ThreadPoolSubmit(srb2cthunk_t thunk, void* data)
+{
+	SRB2_ASSERT(g_main_threadpool != nullptr);
+
+	g_main_threadpool->schedule([=]() {
+		(thunk)(data);
+	});
+	g_main_threadpool->notify();
+}
+
+void I_ThreadPoolWaitIdle(void)
+{
+	SRB2_ASSERT(g_main_threadpool != nullptr);
+
+	g_main_threadpool->wait_idle();
+}
diff --git a/src/core/thread_pool.h b/src/core/thread_pool.h
new file mode 100644
index 000000000..75961614e
--- /dev/null
+++ b/src/core/thread_pool.h
@@ -0,0 +1,163 @@
+// BLANKART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2024 by Ronald "Eidolon" Kinard
+// Copyright (C) 2024 by Kart Krew
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+
+#ifndef __SRB2_CORE_THREAD_POOL_H__
+#define __SRB2_CORE_THREAD_POOL_H__
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+
+#include <condition_variable>
+#include <cstddef>
+#include <functional>
+#include <memory>
+#include <mutex>
+#include <thread>
+#include <utility>
+#include <vector>
+
+#include "spmc_queue.hpp"
+
+namespace srb2
+{
+
+class ThreadPool
+{
+public:
+	struct Task
+	{
+		void (*thunk)(void*);
+		void (*deleter)(void*);
+		std::shared_ptr<std::atomic<uint32_t>> pseudosema;
+		std::array<std::byte, 512 - sizeof(void(*)(void*)) * 2 - sizeof(std::shared_ptr<std::atomic<uint32_t>>)> raw;
+	};
+
+	using Queue = SpMcQueue<Task>;
+
+	class Sema
+	{
+		std::shared_ptr<std::atomic<uint32_t>> pseudosema_;
+
+		explicit Sema(std::shared_ptr<std::atomic<uint32_t>> sema) : pseudosema_(sema) {}
+
+		friend class ThreadPool;
+	public:
+		Sema() = default;
+	};
+
+private:
+	std::shared_ptr<std::atomic<bool>> pool_alive_;
+	std::vector<std::shared_ptr<std::mutex>> worker_ready_mutexes_;
+	std::vector<std::shared_ptr<std::condition_variable>> worker_ready_condvars_;
+	std::vector<std::shared_ptr<Queue>> work_queues_;
+	std::vector<std::thread> threads_;
+	size_t next_queue_index_ = 0;
+	std::shared_ptr<std::atomic<uint32_t>> cur_sema_;
+
+	bool immediate_mode_ = false;
+	bool sema_begun_ = false;
+
+public:
+	ThreadPool();
+	explicit ThreadPool(size_t threads);
+	ThreadPool(const ThreadPool&) = delete;
+	ThreadPool(ThreadPool&&);
+	~ThreadPool();
+
+	ThreadPool& operator=(const ThreadPool&) = delete;
+	ThreadPool& operator=(ThreadPool&&);
+
+	void begin_sema();
+	ThreadPool::Sema end_sema();
+
+	/// Enqueue but don't notify
+	template <typename T> void schedule(T&& thunk);
+	/// Notify threads after several schedules
+	void notify();
+	void notify_sema(const Sema& sema);
+	void wait_idle();
+	void wait_sema(const Sema& sema);
+	void shutdown();
+};
+
+extern std::unique_ptr<ThreadPool> g_main_threadpool;
+
+template <typename F>
+void callable_caller(F* f)
+{
+	(*f)();
+}
+
+template <typename F>
+void callable_destroyer(F* f)
+{
+	f->~F();
+}
+
+template <typename T>
+void ThreadPool::schedule(T&& thunk)
+{
+	static_assert(sizeof(T) <= sizeof(std::declval<Task>().raw));
+
+	if (immediate_mode_)
+	{
+		(thunk)();
+		return;
+	}
+
+	if (sema_begun_)
+	{
+		if (cur_sema_ == nullptr)
+		{
+			cur_sema_ = std::make_shared<std::atomic<uint32_t>>(0);
+		}
+		cur_sema_->fetch_add(1, std::memory_order_relaxed);
+	}
+
+	size_t qi = next_queue_index_;
+
+	{
+		std::shared_ptr<Queue> q = work_queues_[qi];
+		Task task;
+		task.thunk = reinterpret_cast<void(*)(void*)>(callable_caller<T>);
+		task.deleter = reinterpret_cast<void(*)(void*)>(callable_destroyer<T>);
+		task.pseudosema = cur_sema_;
+		new (reinterpret_cast<T*>(task.raw.data())) T(std::move(thunk));
+
+		q->push(std::move(task));
+	}
+	// worker_ready_condvars_[qi]->notify_one();
+
+	next_queue_index_ += 1;
+	if (next_queue_index_ >= threads_.size())
+	{
+		next_queue_index_ = 0;
+	}
+}
+
+} // namespace srb2
+
+extern "C" {
+
+#endif // __cplusplus
+
+typedef void (*srb2cthunk_t)(void*);
+
+void I_ThreadPoolInit(void);
+void I_ThreadPoolShutdown(void);
+void I_ThreadPoolSubmit(srb2cthunk_t thunk, void* data);
+void I_ThreadPoolWaitIdle(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // __SRB2_CORE_THREAD_POOL_H__
diff --git a/src/cxxutil.hpp b/src/cxxutil.hpp
new file mode 100644
index 000000000..545d38dfd
--- /dev/null
+++ b/src/cxxutil.hpp
@@ -0,0 +1,152 @@
+#ifndef __SRB2_CXXUTIL_HPP__
+#define __SRB2_CXXUTIL_HPP__
+
+#include <cstdlib>
+#include <type_traits>
+#include <utility>
+
+#include "doomdef.h"
+
+namespace srb2 {
+
+template <class F>
+class Finally {
+public:
+	explicit Finally(const F& f) noexcept : f_(f) {}
+	explicit Finally(F&& f) noexcept : f_(f) {}
+
+	Finally(Finally&& from) noexcept : f_(std::move(from.f_)), call_(std::exchange(from.call_, false)) {}
+
+	Finally(const Finally& from) = delete;
+	void operator=(const Finally& from) = delete;
+	void operator=(Finally&& from) = delete;
+
+	~Finally() noexcept {
+		if (call_)
+			f_();
+	}
+
+private:
+	F f_;
+	bool call_ = true;
+};
+
+template <class F>
+Finally<std::decay_t<F>> finally(F&& f) noexcept {
+	return Finally {std::forward<F>(f)};
+}
+
+struct SourceLocation {
+	const char* file_name;
+	unsigned int line_number;
+};
+
+#define SRB2_SOURCE_LOCATION                                                                                           \
+	srb2::SourceLocation { __FILE__, __LINE__ }
+
+#ifndef SRB2_ASSERT_HANDLER
+#define SRB2_ASSERT_HANDLER srb2::IErrorAssertHandler
+#endif
+
+#if !defined(NDEBUG) || defined(PARANOIA)
+// An assertion level of 2 will activate all invocations of the SRB2_ASSERT macro
+#define SRB2_ASSERTION_LEVEL 2
+#else
+// The minimum assertion level is 1
+#define SRB2_ASSERTION_LEVEL 1
+#endif
+
+/// Assert a precondition expression in debug builds.
+#define SRB2_ASSERT(expr) srb2::do_assert<2, SRB2_ASSERT_HANDLER>([&] { return (expr); }, SRB2_SOURCE_LOCATION, #expr)
+
+class IErrorAssertHandler {
+public:
+	static void handle(const SourceLocation& source_location, const char* expression) {
+		I_Error("Assertion failed at %s:%u: %s != true",
+				source_location.file_name,
+				source_location.line_number,
+				expression);
+	}
+};
+
+class NoOpAssertHandler {
+public:
+	static void handle(const SourceLocation& source_location, const char* expression) {(void)source_location; (void)expression;}
+};
+
+/// @brief Assert a precondition expression, aborting the application if it fails.
+/// @tparam Expr
+/// @tparam Level the level of this assertion; if it is less than or equal to SRB2_ASSERTION_LEVEL, this overload will
+/// activate.
+/// @param expr a callable which returns a bool
+/// @param source_location a struct containing the source location of the assertion, e.g. SRB2_SOURCE_LOCATION
+/// @param expression the expression evaluated in the expression callable
+/// @param message an optional message to display for the assertion
+template <unsigned int Level, class Handler, class Expr>
+std::enable_if_t<(Level <= SRB2_ASSERTION_LEVEL), void>
+do_assert(const Expr& expr, const SourceLocation& source_location, const char* expression = "") noexcept {
+	static_assert(Level > 0, "level of an assertion must not be 0");
+	if (!expr()) {
+		Handler::handle(source_location, expression);
+		std::abort();
+	}
+}
+
+template <unsigned int Level, class, class Expr>
+std::enable_if_t<(Level > SRB2_ASSERTION_LEVEL), void>
+do_assert(const Expr&, const SourceLocation&, const char* = "") noexcept {
+}
+
+template <typename T>
+class NotNull final {
+	T ptr_;
+
+public:
+	static_assert(std::is_convertible_v<decltype(std::declval<T>() != nullptr), bool>,
+				  "T is not comparable with nullptr_t");
+
+	/// @brief Move-construct from the pointer value U, asserting that it is not null. Allows construction of a
+	/// NotNull<T> from any compatible pointer U, for example with polymorphic classes.
+	template <typename U, typename = std::enable_if_t<std::is_convertible_v<U, T>>>
+	constexpr NotNull(U&& rhs) : ptr_(std::forward<U>(rhs)) {
+		SRB2_ASSERT(ptr_ != nullptr);
+	}
+
+	/// @brief Wrap the pointer type T, asserting that the pointer is not null.
+	template <typename = std::enable_if_t<!std::is_same_v<std::nullptr_t, T>>>
+	constexpr NotNull(T rhs) : ptr_(std::move(rhs)) {
+		SRB2_ASSERT(ptr_ != nullptr);
+	}
+
+	/// @brief Copy construction from NotNull of convertible type U. Only if the incoming pointer is NotNull already.
+	template <typename U, typename = std::enable_if_t<std::is_convertible_v<U, T>>>
+	constexpr NotNull(const NotNull<U>& rhs) : NotNull(rhs.get()) {
+		// Value is guaranteed to be not null by construction; no assertion necessary
+	}
+
+	NotNull(const NotNull& rhs) = default;
+	NotNull& operator=(const NotNull& rhs) = default;
+
+	/// @brief Get the stored pointer.
+	constexpr T get() const { return ptr_; }
+
+	/// @brief Convert to T (the pointer type).
+	constexpr operator T() const { return get(); }
+
+	/// @brief Arrow-dereference to *T (the actual value pointed to).
+	constexpr decltype(auto) operator->() const { return get(); }
+
+	/// @brief Dereference to *T (the actual value pointed to).
+	constexpr decltype(auto) operator*() const { return *get(); }
+
+	// It is not allowed to construct NotNull<T> with nullptr regardless of T.
+	NotNull(std::nullptr_t) = delete;
+	NotNull& operator=(std::nullptr_t) = delete;
+};
+
+template <class T>
+NotNull(T) -> NotNull<T>;
+
+} // namespace srb2
+
+#endif // __SRB2_CXXUTIL_HPP__
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index f148a078e..c32443fb1 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -50,6 +50,7 @@
 #include "s_sound.h" // sfx_syfail
 #include "m_perfstats.h"
 #include "d_main.h"
+#include "r_fps.h"
 
 #ifdef CLIENT_LOADINGSCREEN
 // cl loading screen
@@ -86,20 +87,52 @@ boolean serverrunning = false;
 INT32 serverplayer = 0;
 char motd[254], server_context[8]; // Message of the Day, Unique Context (even without Mumble support)
 
+plrinfo playerinfo[MAXPLAYERS];
+SINT8 joinnode = 0; // used for CL_VIEWSERVER
+
+boolean player_muted[MAXPLAYERS] = {0};
+
 // Server specific vars
 UINT8 playernode[MAXPLAYERS];
 
+
 // Minimum timeout for sending the savegame
 // The actual timeout will be longer depending on the savegame length
 tic_t jointimeout = (3*TICRATE);
 static boolean sendingsavegame[MAXNETNODES]; // Are we sending the savegame?
-static boolean resendingsavegame[MAXNETNODES]; // Are we resending the savegame?
+#ifdef SATURNPAK
+static tic_t resendingsavegame[MAXNETNODES]; // Are we resending the savegame?
 static tic_t savegameresendcooldown[MAXNETNODES]; // How long before we can resend again?
+#endif
 static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the server before getting a timeout?
 
 UINT16 pingmeasurecount = 1;
 UINT32 realpingtable[MAXPLAYERS]; //the base table of ping where an average will be sent to everyone.
 UINT32 playerpingtable[MAXPLAYERS]; //table of player latency values.
+
+#define GENTLEMANSMOOTHING (TICRATE)
+static tic_t reference_lag;
+static UINT8 spike_time;
+tic_t lowest_lag;
+tic_t simulated_lag;
+boolean server_lagless;
+
+static void Lagless_OnChange(void)
+{
+	/* don't back out of dishonesty, or go lagless after playing honestly */
+	if (!cv_gentlemens.value && gamestate == GS_LEVEL)
+		server_lagless = true;
+
+	/*if (!cv_gentlemens.value)
+		HU_AddChatText(M_GetText("\x82*Gentlemans Delay has been disabled for Serverplayer."), false);
+	else
+		HU_AddChatText(M_GetText("\x82*Gentlemans Delay will be enabled for Serverplayer."), false);*/
+}
+
+static CV_PossibleValue_t mindelay_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL}};
+consvar_t cv_mindelay = {"mindelay", "0", CV_SAVE, mindelay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gentlemens = {"gentlemensdelay", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Lagless_OnChange, 0, NULL, NULL, 0, 0, NULL}; // this should be a netvar Zzz...
+
 SINT8 nodetoplayer[MAXNETNODES];
 SINT8 nodetoplayer2[MAXNETNODES]; // say the numplayer for this node if any (splitscreen)
 SINT8 nodetoplayer3[MAXNETNODES]; // say the numplayer for this node if any (splitscreen == 2)
@@ -115,7 +148,7 @@ static tic_t firstticstosend; // min of the nettics
 static tic_t tictoclear = 0; // optimize d_clearticcmd
 static tic_t maketic;
 
-static INT16 consistancy[TICQUEUE];
+static INT16 consistancy[BACKUPTICS];
 
 // Resynching shit!
 static UINT32 resynch_score[MAXNETNODES]; // "score" for kicking -- if this gets too high then cfail kick
@@ -124,34 +157,38 @@ static UINT32 resynch_status[MAXNETNODES]; // 0 bit means synched for that playe
 static UINT8 resynch_sent[MAXNETNODES][MAXPLAYERS]; // what synch packets have we attempted to send to the player
 static UINT8 resynch_inprogress[MAXNETNODES];
 static UINT8 resynch_local_inprogress = false; // WE are desynched and getting packets to fix it.
-static UINT8 player_joining = false;
 UINT8 hu_resynching = 0;
-UINT8 hu_redownloadinggamestate = 0;
 
-static boolean can_receive_gamestate[MAXNETNODES];
+#ifdef SATURNPAK
+UINT8 hu_redownloadinggamestate = 0;
+static UINT8 gamestate_resend_counter[MAXNETNODES];
+#endif
 
 static UINT8 gamestate_resend_counter[MAXNETNODES];
 
 // kart, true when a player is connecting or disconnecting so that the gameplay has stopped in its tracks
-UINT8 hu_stopped = 0;
+boolean hu_stopped = false;
 
 // Client specific
-static ticcmd_t localcmds;
-static ticcmd_t localcmds2;
-static ticcmd_t localcmds3;
-static ticcmd_t localcmds4;
+static ticcmd_t localcmds[MAXSPLITSCREENPLAYERS][MAXGENTLEMENDELAY];
 static boolean cl_packetmissed;
 // here it is for the secondary local player (splitscreen)
 static UINT8 mynode; // my address pointofview server
+
+#ifdef SATURNPAK
 static boolean cl_redownloadinggamestate = false;
-
 boolean is_client_saturn[MAXNETNODES];
+<<<<<<< HEAD
 #define ISSATURN 69
+=======
+#endif
+>>>>>>> Saturn-Next
 
-static UINT8 localtextcmd[MAXTEXTCMD];
-static UINT8 localtextcmd2[MAXTEXTCMD]; // splitscreen
-static UINT8 localtextcmd3[MAXTEXTCMD]; // splitscreen == 2
-static UINT8 localtextcmd4[MAXTEXTCMD]; // splitscreen == 3
+#ifdef SATURNJOIN
+#define ISSATURN 69
+#endif
+
+static UINT8 localtextcmd[MAXSPLITSCREENPLAYERS][MAXTEXTCMD];
 static tic_t neededtic;
 SINT8 servernode = 0; // the number of the server node
 char connectedservername[MAXSERVERNAME+1];
@@ -181,9 +218,19 @@ typedef struct textcmdtic_s
 	struct textcmdtic_s *next;
 } textcmdtic_t;
 
-ticcmd_t netcmds[TICQUEUE][MAXPLAYERS];
-static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL};
+typedef struct textcmdbuf_s textcmdbuf_t;
 
+struct textcmdbuf_s
+{
+	textcmdbuf_t *next;
+	UINT8 cmd[MAXTEXTCMD];
+};
+
+static textcmdbuf_t *textcmdbuf[MAXSPLITSCREENPLAYERS] = {NULL};
+
+static ticcmd_t playercmds[MAXPLAYERS];
+ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
+static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL};
 
 consvar_t cv_showjoinaddress = {"showjoinaddress", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
@@ -196,6 +243,26 @@ consvar_t cv_httpsource = {"http_source", "", CV_SAVE, NULL, NULL, 0, NULL, NULL
 
 consvar_t cv_kicktime = {"kicktime", "10", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+static boolean UseLocalDelay(void)
+{
+	if (dedicated || (server && server_lagless && !cv_mindelay.value) || modeattacking == ATTACKING_RECORD)
+		return false;
+
+	return (cv_mindelay.value || (server && !server_lagless));
+}
+
+#ifdef SATURNPAK
+static inline boolean UseSaturnSynch(INT32 node)
+{
+	return (is_client_saturn[node] && cv_gamestateattempts.value);
+}
+
+static inline boolean UseVanillaSynch(INT32 node)
+{
+	return (!UseSaturnSynch(node) && cv_resynchattempts.value);
+}
+#endif
+
 static inline void *G_DcpyTiccmd(void* dest, const ticcmd_t* src, const size_t n)
 {
 	const size_t d = n / sizeof(ticcmd_t);
@@ -235,7 +302,7 @@ UINT16 software_MAXPACKETLENGTH;
   * \return The full tic value
   *
   */
-tic_t ExpandTics(INT32 low, tic_t basetic)
+static inline tic_t ExpandTics(INT32 low, tic_t basetic)
 {
 	INT32 delta;
 
@@ -266,77 +333,64 @@ void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum))
 	listnetxcmd[id] = cmd_f;
 }
 
-void SendNetXCmd(netxcmd_t id, const void *param, size_t nparam)
+static void WriteNetXCmd(UINT8 *cmd, netxcmd_t id, const void *param, size_t nparam)
 {
-	if (localtextcmd[0]+2+nparam > MAXTEXTCMD)
+	cmd[0]++;
+	cmd[cmd[0]] = (UINT8)id;
+	if (param && nparam)
 	{
+		M_Memcpy(&cmd[cmd[0]+1], param, nparam);
+		cmd[0] = (UINT8)(cmd[0] + (UINT8)nparam);
+	}
+}
+
+void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_t nparam)
+{
+	if (localtextcmd[playerid][0]+2+nparam > MAXTEXTCMD)
+	{
+		textcmdbuf_t *buf = textcmdbuf[playerid];
+
+		if (2+nparam > MAXTEXTCMD)
+		{
+			CONS_Alert(CONS_ERROR, M_GetText("packet too large to fit NetXCmd, cannot add netcmd %d! (size: %s, max: %d)\n"), id, sizeu1(2+nparam), MAXTEXTCMD);
+			return;
+		}
+
 		// for future reference: if (cv_debug) != debug disabled.
-		CONS_Alert(CONS_ERROR, M_GetText("NetXCmd buffer full, cannot add netcmd %d! (size: %d, needed: %s)\n"), id, localtextcmd[0], sizeu1(nparam));
+		CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %d... (size: %d, needed: %s)\n"), id, localtextcmd[playerid][0], sizeu1(nparam));
+		if (buf == NULL)
+		{
+			textcmdbuf[playerid] = Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL);
+			textcmdbuf[playerid]->cmd[0] = 0;
+			textcmdbuf[playerid]->next = NULL;
+			WriteNetXCmd(textcmdbuf[playerid]->cmd, id, param, nparam);
+			return;
+		}
+
+		while (buf->next != NULL)
+			buf = buf->next;
+
+		if (buf->cmd[0]+2+nparam > MAXTEXTCMD)
+		{
+			buf->next = Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL);
+			buf->next->cmd[0] = 0;
+			buf->next->next = NULL;
+			WriteNetXCmd(buf->next->cmd, id, param, nparam);
+		}
+		else
+		{
+			WriteNetXCmd(buf->cmd, id, param, nparam);
+		}
 		return;
 	}
-	localtextcmd[0]++;
-	localtextcmd[localtextcmd[0]] = (UINT8)id;
-	if (param && nparam)
-	{
-		M_Memcpy(&localtextcmd[localtextcmd[0]+1], param, nparam);
-		localtextcmd[0] = (UINT8)(localtextcmd[0] + (UINT8)nparam);
-	}
+	WriteNetXCmd(localtextcmd[playerid], id, param, nparam);
 }
 
-// splitscreen player
-void SendNetXCmd2(netxcmd_t id, const void *param, size_t nparam)
-{
-	if (localtextcmd2[0]+2+nparam > MAXTEXTCMD)
-	{
-		I_Error("No more place in the buffer for netcmd %d\n",id);
-		return;
-	}
-	localtextcmd2[0]++;
-	localtextcmd2[localtextcmd2[0]] = (UINT8)id;
-	if (param && nparam)
-	{
-		M_Memcpy(&localtextcmd2[localtextcmd2[0]+1], param, nparam);
-		localtextcmd2[0] = (UINT8)(localtextcmd2[0] + (UINT8)nparam);
-	}
-}
-
-void SendNetXCmd3(netxcmd_t id, const void *param, size_t nparam)
-{
-	if (localtextcmd3[0]+2+nparam > MAXTEXTCMD)
-	{
-		I_Error("No more place in the buffer for netcmd %d\n",id);
-		return;
-	}
-	localtextcmd3[0]++;
-	localtextcmd3[localtextcmd3[0]] = (UINT8)id;
-	if (param && nparam)
-	{
-		M_Memcpy(&localtextcmd3[localtextcmd3[0]+1], param, nparam);
-		localtextcmd3[0] = (UINT8)(localtextcmd3[0] + (UINT8)nparam);
-	}
-}
-
-void SendNetXCmd4(netxcmd_t id, const void *param, size_t nparam)
-{
-	if (localtextcmd4[0]+2+nparam > MAXTEXTCMD)
-	{
-		I_Error("No more place in the buffer for netcmd %d\n",id);
-		return;
-	}
-	localtextcmd4[0]++;
-	localtextcmd4[localtextcmd4[0]] = (UINT8)id;
-	if (param && nparam)
-	{
-		M_Memcpy(&localtextcmd4[localtextcmd4[0]+1], param, nparam);
-		localtextcmd4[0] = (UINT8)(localtextcmd4[0] + (UINT8)nparam);
-	}
-}
-
-UINT8 GetFreeXCmdSize(void)
+/*UINT8 GetFreeXCmdSize(UINT8 playerid)
 {
 	// -1 for the size and another -1 for the ID.
-	return (UINT8)(localtextcmd[0] - 2);
-}
+	return (UINT8)(localtextcmd[playerid][0] - 2);
+}*/
 
 // Frees all textcmd memory for the specified tic
 static void D_FreeTextcmd(tic_t tic)
@@ -463,11 +517,7 @@ static void ExtraDataTicker(void)
 					{
 						if (server)
 						{
-							UINT8 buf[3];
-
-							buf[0] = (UINT8)i;
-							buf[1] = KICK_MSG_CON_FAIL;
-							SendNetXCmd(XD_KICK, &buf, 2);
+							SendKick(i, KICK_MSG_CON_FAIL);
 							DEBFILE(va("player %d kicked [gametic=%u] reason as follows:\n", i, gametic));
 						}
 						CONS_Alert(CONS_WARNING, M_GetText("Got unknown net command [%s]=%d (max %d)\n"), sizeu1(curpos - bufferstart), *curpos, bufferstart[0]);
@@ -491,19 +541,22 @@ static void D_Clearticcmd(tic_t tic)
 	D_FreeTextcmd(tic);
 
 	for (i = 0; i < MAXPLAYERS; i++)
-		netcmds[tic%TICQUEUE][i].angleturn = 0;
+		netcmds[tic%BACKUPTICS][i].angleturn = 0;
 
-	DEBFILE(va("clear tic %5u (%2u)\n", tic, tic%TICQUEUE));
+	DEBFILE(va("clear tic %5u (%2u)\n", tic, tic%BACKUPTICS));
 }
 
 void D_ResetTiccmds(void)
 {
-	INT32 i;
+	INT32 i, j;
 
-	memset(&localcmds, 0, sizeof(ticcmd_t));
-	memset(&localcmds2, 0, sizeof(ticcmd_t));
-	memset(&localcmds3, 0, sizeof(ticcmd_t));
-	memset(&localcmds4, 0, sizeof(ticcmd_t));
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		for (j = 0; j < MAXGENTLEMENDELAY; j++)
+		{
+			memset(&localcmds[i][j], 0, sizeof(ticcmd_t));
+		}
+	}
 
 	// Reset the net command list
 	for (i = 0; i < TEXTCMD_HASH_SIZE; i++)
@@ -511,62 +564,20 @@ void D_ResetTiccmds(void)
 			D_Clearticcmd(textcmds[i]->tic);
 }
 
+void SendKick(UINT8 playernum, UINT8 msg)
+{
+	UINT8 buf[2];
+
+	buf[0] = playernum;
+	buf[1] = msg;
+	SendNetXCmd(XD_KICK, &buf, 2);
+}
+
 // -----------------------------------------------------------------
 // end of extra data function
 // -----------------------------------------------------------------
 
-// -----------------------------------------------------------------
-// extra data function for lmps
-// -----------------------------------------------------------------
-
-// if extradatabit is set, after the ziped tic you find this:
-//
-//   type   |  description
-// ---------+--------------
-//   byte   | size of the extradata
-//   byte   | the extradata (xd) bits: see XD_...
-//            with this byte you know what parameter folow
-// if (xd & XDNAMEANDCOLOR)
-//   byte   | color
-//   char[MAXPLAYERNAME] | name of the player
-// endif
-// if (xd & XD_WEAPON_PREF)
-//   byte   | original weapon switch: boolean, true if use the old
-//          | weapon switch methode
-//   char[NUMWEAPONS] | the weapon switch priority
-//   byte   | autoaim: true if use the old autoaim system
-// endif
-/*boolean AddLmpExtradata(UINT8 **demo_point, INT32 playernum)
-{
-	UINT8 *textcmd = D_GetExistingTextcmd(gametic, playernum);
-
-	if (!textcmd)
-		return false;
-
-	M_Memcpy(*demo_point, textcmd, textcmd[0]+1);
-	*demo_point += textcmd[0]+1;
-	return true;
-}
-
-void ReadLmpExtraData(UINT8 **demo_pointer, INT32 playernum)
-{
-	UINT8 nextra;
-	UINT8 *textcmd;
-
-	if (!demo_pointer)
-		return;
-
-	textcmd = D_GetTextcmd(gametic, playernum);
-	nextra = **demo_pointer;
-	M_Memcpy(textcmd, *demo_pointer, nextra + 1);
-	// increment demo pointer
-	*demo_pointer += nextra + 1;
-}*/
-
-// -----------------------------------------------------------------
-// end extra data function for lmps
-// -----------------------------------------------------------------
-
+// can we get rid of this finally lmao
 // -----------------------------------------------------------------
 // resynch player data
 // -----------------------------------------------------------------
@@ -1019,6 +1030,7 @@ static void SV_RequireResynch(INT32 node)
 
 	// Initial setup
 	memset(resynch_sent[node], 0, MAXPLAYERS);
+
 	for (i = 0; i < MAXPLAYERS; ++i)
 	{
 		if (!playeringame[i]) // Player not in game so just drop it from required synch
@@ -1041,6 +1053,8 @@ static void SV_SendResynch(INT32 node)
 		return;
 	}
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	// resynched?
 	if (!resynch_status[node])
 	{
@@ -1084,16 +1098,14 @@ static void SV_SendResynch(INT32 node)
 
 	if (resynch_score[node] > (unsigned)cv_resynchattempts.value*250)
 	{
-		UINT8 buf[2];
-		buf[0] = (UINT8)nodetoplayer[node];
-		buf[1] = KICK_MSG_CON_FAIL;
-		SendNetXCmd(XD_KICK, &buf, 2);
+		SendKick(nodetoplayer[node], KICK_MSG_CON_FAIL);
 		resynch_score[node] = 0;
 	}
 }
 
 static void CL_AcknowledgeResynch(resynch_pak *rsp)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	resynch_read_player(rsp);
 
 	netbuffer->packettype = PT_RESYNCHGET;
@@ -1103,6 +1115,9 @@ static void CL_AcknowledgeResynch(resynch_pak *rsp)
 
 static void SV_AcknowledgeResynchAck(INT32 node, UINT8 rsg)
 {
+	if (client)
+		return;
+
 	if (rsg >= MAXPLAYERS)
 		resynch_score[node] += 16384; // lol.
 	else
@@ -1138,6 +1153,7 @@ typedef enum
 #endif
 	CL_CONNECTED,
 	CL_ABORTED,
+	CL_VIEWSERVER,
 	CL_ASKFULLFILELIST,
 	CL_CONFIRMCONNECT,
 #ifdef HAVE_CURL
@@ -1150,11 +1166,6 @@ typedef enum
 static void GetPackets(void);
 
 static cl_mode_t cl_mode = CL_SEARCHING;
-
-#ifdef HAVE_CURL
-char http_source[MAX_MIRROR_LENGTH+1];
-#endif
-
 static UINT16 cl_lastcheckedfilecount = 0;	// used for full file list
 
 // Player name send/load
@@ -1203,9 +1214,10 @@ static inline void CL_DrawConnectionStatus(void)
 	INT32 ccstime = I_GetTime();
 
 	// Draw background fade
-	V_DrawFadeScreen(0xFF00, 16);
+	if (!menuactive) // menu already draws its own fade
+		V_DrawFadeScreen(0xFF00, 16); // force default
 
-	if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_LOADFILES && cl_mode != CL_CHECKFILES
+	if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_LOADFILES && cl_mode != CL_CHECKFILES && cl_mode != CL_VIEWSERVER
 #ifdef HAVE_CURL
 	&& cl_mode != CL_DOWNLOADHTTPFILES
 #endif
@@ -1218,7 +1230,7 @@ static inline void CL_DrawConnectionStatus(void)
 
 		//Draw bottom box
 		M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
-		V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP, "Press ESC to abort");
+		V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP|MENUCAPS, "Press ESC to abort");
 
 		for (i = 0; i < 16; ++i)
 			V_DrawFill((BASEVIDWIDTH/2-128) + (i * 16), BASEVIDHEIGHT-24, 16, 8, palstart + ((animtime - i) & 15));
@@ -1227,12 +1239,24 @@ static inline void CL_DrawConnectionStatus(void)
 		{
 #ifdef JOININGAME
 			case CL_DOWNLOADSAVEGAME:
-				if (lastfilenum != -1)
+				if (filedownload.current != -1)
 				{
+					UINT32 currentsize = fileneeded[filedownload.current].currentsize;
+					UINT32 totalsize = fileneeded[filedownload.current].totalsize;
+					INT32 dldlength;
+
 					cltext = M_GetText("Downloading game state...");
 					Net_GetNetStat();
+
+					dldlength = (INT32)((currentsize/(double)totalsize) * 256);
+					if (dldlength > 256)
+						dldlength = 256;
+					V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 111);
+					V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 96);
+
 					V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
-						va(" %4uK",fileneeded[lastfilenum].currentsize>>10));
+						va(" %4uK/%4uK",currentsize>>10,totalsize>>10));
+
 					V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
 						va("%3.1fK/s ", ((double)getbps)/1024));
 				}
@@ -1265,7 +1289,7 @@ static inline void CL_DrawConnectionStatus(void)
 				cltext = M_GetText("Connecting to server...");
 				break;
 		}
-		V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP, cltext);
+		V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS, cltext);
 	}
 	else
 	{
@@ -1275,7 +1299,7 @@ static inline void CL_DrawConnectionStatus(void)
 			INT32 checkednum = 0;
 			INT32 i;
 
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP, "Press ESC to abort");
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP|MENUCAPS, "Press ESC to abort");
 
 			//ima just count files here
 			for (i = 0; i < fileneedednum; i++)
@@ -1283,12 +1307,12 @@ static inline void CL_DrawConnectionStatus(void)
 					checkednum++;
 
 			// Loading progress
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP, "Checking server addons...");
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS, "Checking server addons...");
 			totalfileslength = (INT32)((checkednum/(double)(fileneedednum)) * 256);
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
 				va(" %2u/%2u Files",checkednum,fileneedednum));
 		}
 		else if (cl_mode == CL_LOADFILES)
@@ -1297,7 +1321,7 @@ static inline void CL_DrawConnectionStatus(void)
 			INT32 loadcompletednum = 0;
 			INT32 i;
 
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP, "Press ESC to abort");
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP|MENUCAPS, "Press ESC to abort");
 
 			//ima just count files here
 			for (i = 0; i < fileneedednum; i++)
@@ -1305,26 +1329,98 @@ static inline void CL_DrawConnectionStatus(void)
 					loadcompletednum++;
 
 			// Loading progress
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP, "Loading server addons...");
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS, "Loading server addons...");
 			totalfileslength = (INT32)((loadcompletednum/(double)(fileneedednum)) * 256);
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
 				va(" %2u/%2u Files",loadcompletednum,fileneedednum));
 		}
-		else if (lastfilenum != -1)
+		else if (cl_mode == CL_VIEWSERVER)
+		{
+			V_DrawFill(8, 16, BASEVIDWIDTH - 16, 54, 239);
+
+			V_DrawThinString(12 + 80, 18, V_ALLOWLOWERCASE, va("%s", serverlist[joinnode].info.servername));
+
+			const char *map = va("%sP", serverlist[joinnode].info.mapname);
+			patch_t *current_map = W_LumpExists(map) ? W_CachePatchName(map, PU_CACHE) : W_CachePatchName("BLANKLVL", PU_CACHE);
+			V_DrawSmallScaledPatch(10, 18, 0, current_map);
+
+			V_DrawThinString(12 + 80, 38, V_ALLOWLOWERCASE, va("%s", serverlist[joinnode].info.maptitle));
+			V_DrawThinString(12 + 80, 48, V_ALLOWLOWERCASE, va("%s", Gametype_Names[serverlist[joinnode].info.gametype]));
+
+			if (fileneedednum > 0)
+			{
+				V_DrawThinString(12 + 80, 58, V_ALLOWLOWERCASE|V_ORANGEMAP, va("%i Addons", fileneedednum));
+			}
+			else
+			{
+				V_DrawThinString(12 + 80, 58, V_ALLOWLOWERCASE|V_YELLOWMAP, "Vanilla");
+			}
+
+			if (serverlist[joinnode].info.cheatsenabled)
+			{
+				V_DrawRightAlignedThinString(BASEVIDWIDTH - 12, 58, V_ALLOWLOWERCASE|V_GREENMAP, "Cheats");
+			}
+
+			V_DrawFill(8, 72, BASEVIDWIDTH - 16, 112, 239);
+
+			V_DrawString(12, 74, V_ALLOWLOWERCASE|V_YELLOWMAP, "Players");
+			V_DrawRightAlignedString(BASEVIDWIDTH - 12, 74, V_ALLOWLOWERCASE|V_YELLOWMAP, va("%i / %i", serverlist[joinnode].info.numberofplayer, serverlist[joinnode].info.maxplayer));
+
+			INT32 i;
+			INT32 count = 0;
+			INT32 x = 14;
+			INT32 y = 84;
+			INT32 statuscolor = 1;
+			char player_name[MAXPLAYERNAME+1];
+			if (serverlist[joinnode].info.numberofplayer > 0)
+			{
+				for (i = 0; i < MAXPLAYERS; i++)
+				{
+					if (playerinfo[i].node < 255)
+					{
+						strncpy(player_name, playerinfo[i].name, MAXPLAYERNAME);
+						V_DrawThinString(x + 10, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE, player_name);
+
+						if (playerinfo[i].team == 0) { statuscolor = 184; } // playing
+						if (playerinfo[i].data & 0x20) { statuscolor = 86; } // tag IT
+						if (playerinfo[i].team == 1) { statuscolor = 128; } // ctf red team
+						if (playerinfo[i].team == 2) { statuscolor = 232; } // ctf blue team
+						if (playerinfo[i].team == 255) { statuscolor = 16; } // spectator or non-team
+
+						V_DrawFill(x, y, 7, 7, 31);
+						V_DrawFill(x, y, 6, 6, statuscolor);
+
+						y += 9;
+						count++;
+						if ((count == 11) || (count == 22))
+						{
+							x += 104;
+							y = 84;
+						}
+					}
+				}
+			}
+
+			// Buttons
+			V_DrawFill(8, BASEVIDHEIGHT - 14, BASEVIDWIDTH - 16, 12, 239);
+			V_DrawThinString(16, BASEVIDHEIGHT - 12, V_ALLOWLOWERCASE, va("[%sESC%s] = Abort", "\x82", "\x80"));
+			V_DrawRightAlignedThinString(BASEVIDWIDTH - 12, BASEVIDHEIGHT - 12, V_ALLOWLOWERCASE, va("[%sENTER%s] = Join", "\x82", "\x80"));
+		}
+		else if (filedownload.current != -1)
 		{
 			INT32 dldlength;
 			INT32 totalfileslength;
 			UINT32 totaldldsize;
 			static char tempname[28];
-			fileneeded_t *file = &fileneeded[lastfilenum];
+			fileneeded_t *file = &fileneeded[filedownload.current];
 			char *filename = file->filename;
 
 			// Draw the bottom box.
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-58-8, 32, 1);
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-14, V_YELLOWMAP, "Press ESC to abort");
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-14, V_YELLOWMAP|MENUCAPS, "Press ESC to abort");
 
 			Net_GetNetStat();
 			dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256);
@@ -1349,41 +1445,41 @@ static inline void CL_DrawConnectionStatus(void)
 				strncpy(tempname, filename, sizeof(tempname)-1);
 			}
 #ifdef HAVE_CURL
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-30, 0,
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-30, MENUCAPS,
 				va(M_GetText("%s downloading"), ((cl_mode == CL_DOWNLOADHTTPFILES) ? "\x82""HTTP" : "\x85""Direct")));
 #else
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-30, 0,
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-30, MENUCAPS,
 								 va(M_GetText("%s downloading"),("\x85""Direct")));
 #endif
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-22, V_YELLOWMAP,
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-58-22, V_YELLOWMAP|MENUCAPS,
 				va(M_GetText("\"%s\""), tempname));
-			V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, V_20TRANS|V_MONOSPACE,
-				va(" %4uK/%4uK",fileneeded[lastfilenum].currentsize>>10,file->totalsize>>10));
-			V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-58, V_20TRANS|V_MONOSPACE,
+			V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, V_20TRANS|V_MONOSPACE|MENUCAPS,
+				va(" %4uK/%4uK",file->currentsize>>10,file->totalsize>>10));
+			V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-58, V_20TRANS|V_MONOSPACE|MENUCAPS,
 				va("%3.1fK/s ", ((double)getbps)/1024));
 
 			// Download progress
 
-			if (fileneeded[lastfilenum].currentsize != fileneeded[lastfilenum].totalsize)
-				totaldldsize = downloadcompletedsize+fileneeded[lastfilenum].currentsize; //Add in single file progress download if applicable
+			if (file->currentsize != file->totalsize)
+				totaldldsize = filedownload.completedsize+file->currentsize; //Add in single file progress download if applicable
 			else
-				totaldldsize = downloadcompletedsize;
+				totaldldsize = filedownload.completedsize;
 
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-14, V_YELLOWMAP, "Overall Download Progress");
-			totalfileslength = (INT32)((totaldldsize/(double)totalfilesrequestedsize) * 256);
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-14, V_YELLOWMAP|MENUCAPS, "Overall Download Progress");
+			totalfileslength = (INT32)((totaldldsize/(double)filedownload.totalsize) * 256);
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175);
 			V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
 
-			if (totalfilesrequestedsize>>20 >= 10) //display in MB if over 10MB
-				V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
-					va(" %4uM/%4uM",totaldldsize>>20,totalfilesrequestedsize>>20));
+			if (filedownload.totalsize>>20 >= 10) //display in MB if over 10MB
+				V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
+					va(" %4uM/%4uM",totaldldsize>>20,filedownload.totalsize>>20));
 			else
-				V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
-					va(" %4uK/%4uK",totaldldsize>>10,totalfilesrequestedsize>>10));
+				V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
+					va(" %4uK/%4uK",totaldldsize>>10,filedownload.totalsize>>10));
 
-			V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
-					va("%2u/%2u Files ",downloadcompletednum,totalfilesrequestednum));
+			V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
+					va("%2u/%2u Files ", filedownload.completednum, filedownload.totalnum));
 		}
 		else
 		{
@@ -1393,12 +1489,12 @@ static inline void CL_DrawConnectionStatus(void)
 
 			//Draw bottom box
 			M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP, "Press ESC to abort");
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-24, V_YELLOWMAP|MENUCAPS, "Press ESC to abort");
 
 			for (i = 0; i < 16; ++i)
 				V_DrawFill((BASEVIDWIDTH/2-128) + (i * 16), BASEVIDHEIGHT-24, 16, 8, palstart + ((animtime - i) & 15));
 
-			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP,
+			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS,
 				M_GetText("Waiting to download files..."));
 		}
 	}
@@ -1407,6 +1503,7 @@ static inline void CL_DrawConnectionStatus(void)
 
 static boolean CL_AskFileList(INT32 firstfile)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_TELLFILESNEEDED;
 	netbuffer->u.filesneedednum = firstfile;
 
@@ -1426,6 +1523,9 @@ static boolean CL_AskFileList(INT32 firstfile)
 static boolean CL_SendJoin(void)
 {
 	UINT8 localplayers = 1;
+
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	if (netgame)
 		CONS_Printf(M_GetText("Sending join request...\n"));
 	netbuffer->packettype = PT_CLIENTJOIN;
@@ -1442,75 +1542,17 @@ static boolean CL_SendJoin(void)
 	netbuffer->u.clientcfg.subversion = SUBVERSION;
 	strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION,
 			sizeof netbuffer->u.clientcfg.application);
+<<<<<<< HEAD
 	netbuffer->u.clientcfg.issaturn = ISSATURN;
+=======
+#ifdef SATURNJOIN
+	netbuffer->u.clientcfg.issaturn = ISSATURN;
+#endif
+>>>>>>> Saturn-Next
 
 	return HSendPacket(servernode, false, 0, sizeof (clientconfig_pak));
 }
 
-static void
-CopyCaretColors (char *p, const char *s, int n)
-{
-	char *t;
-	int   m;
-	int   c;
-	if (!n)
-		return;
-	while (( t = strchr(s, '^') ))
-	{
-		m = ( t - s );
-
-		if (m >= n)
-		{
-			memcpy(p, s, n);
-			return;
-		}
-		else
-			memcpy(p, s, m);
-
-		p += m;
-		n -= m;
-		s += m;
-
-		if (!n)
-			return;
-
-		if (s[1])
-		{
-			c = toupper(s[1]);
-			if (isdigit(c))
-				c = 0x80 + ( c - '0' );
-			else if (c >= 'A' && c <= 'F')
-				c = 0x80 + ( c - 'A' );
-			else
-				c = 0;
-
-			if (c)
-			{
-				*p++ = c;
-				n--;
-
-				if (!n)
-					return;
-			}
-			else
-			{
-				if (n < 2)
-					break;
-
-				memcpy(p, s, 2);
-
-				p += 2;
-				n -= 2;
-			}
-
-			s += 2;
-		}
-		else
-			break;
-	}
-	strncpy(p, s, n);
-}
-
 static void SV_SendServerInfo(INT32 node, tic_t servertime)
 {
 	UINT8 *p;
@@ -1520,6 +1562,8 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 		? gametype
 		: cv_kartgametypepreference.value;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	netbuffer->packettype = PT_SERVERINFO;
 	netbuffer->u.serverinfo._255 = 255;
 	netbuffer->u.serverinfo.packetversion = PACKETVERSION;
@@ -1627,17 +1671,13 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
 static void SV_SendPlayerInfo(INT32 node)
 {
 	UINT8 i;
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	netbuffer->packettype = PT_PLAYERINFO;
 
 	for (i = 0; i < MSCOMPAT_MAXPLAYERS; i++)
 	{
-		if (i >= MAXPLAYERS)
-		{
-			netbuffer->u.playerinfo[i].node = 255;
-			continue;
-		}
-
-		if (playeringame[i] == UINT8_MAX || !playeringame[i])
+		if ((i >= MAXPLAYERS) || !playeringame[i])
 		{
 			netbuffer->u.playerinfo[i].node = 255; // This slot is empty.
 			continue;
@@ -1704,6 +1744,8 @@ static boolean SV_SendServerConfig(INT32 node)
 	UINT8 *p, *op;
 	boolean waspacketsent;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	netbuffer->packettype = PT_SERVERCFG;
 
 	netbuffer->u.servercfg.version = VERSION;
@@ -1717,26 +1759,20 @@ static boolean SV_SendServerConfig(INT32 node)
 	netbuffer->u.servercfg.gametype = (UINT8)gametype;
 	netbuffer->u.servercfg.modifiedgame = (UINT8)modifiedgame;
 
+	// we fill these structs with FFs so that any players not in game get sent as 0xFFFF
+	// which is nice and easy for us to detect
+	memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins));
+	memset(netbuffer->u.servercfg.playercolor, 0xFF, sizeof(netbuffer->u.servercfg.playercolor));
 
-	if (!can_receive_gamestate[node])
+	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		// we fill these structs with FFs so that any players not in game get sent as 0xFFFF
-		// which is nice and easy for us to detect
-		memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins));
-		memset(netbuffer->u.servercfg.playercolor, 0xFF, sizeof(netbuffer->u.servercfg.playercolor));
+		netbuffer->u.servercfg.adminplayers[i] = (SINT8)adminplayers[i];
 
-		memset(netbuffer->u.servercfg.adminplayers, -1, sizeof(netbuffer->u.servercfg.adminplayers));
+		if (!playeringame[i])
+			continue;
 
-		for (i = 0; i < MAXPLAYERS; i++)
-		{
-			netbuffer->u.servercfg.adminplayers[i] = (SINT8)adminplayers[i];
-
-			if (!playeringame[i])
-				continue;
-
-			netbuffer->u.servercfg.playerskins[i] = (UINT8)players[i].skin;
-			netbuffer->u.servercfg.playercolor[i] = (UINT8)players[i].skincolor;
-		}
+		netbuffer->u.servercfg.playerskins[i] = (UINT8)players[i].skin;
+		netbuffer->u.servercfg.playercolor[i] = (UINT8)players[i].skincolor;
 	}
 
 	netbuffer->u.servercfg.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
@@ -1745,31 +1781,22 @@ static boolean SV_SendServerConfig(INT32 node)
 
 	memcpy(netbuffer->u.servercfg.server_context, server_context, 8);
 
-	if (!can_receive_gamestate[node])
-	{
-		op = p = netbuffer->u.servercfg.varlengthinputs;
+	op = p = netbuffer->u.servercfg.varlengthinputs;
 
-		CV_SavePlayerNames(&p);
-		CV_SaveNetVars(&p, false);
-	}
-	{
-		size_t len;
+	CV_SavePlayerNames(&p);
+	CV_SaveNetVars(&p, false);
 
-		if (can_receive_gamestate[node])
-			len = sizeof (serverconfig_pak);
-		else
-			len = sizeof (serverconfig_pak) + (size_t)(p - op);
+	const size_t len = sizeof (serverconfig_pak) + (size_t)(p - op);
 
 #ifdef DEBUGFILE
-		if (debugfile)
-		{
-			fprintf(debugfile, "ServerConfig Packet about to be sent, size of packet:%s to node:%d\n",
-				sizeu1(len), node);
-		}
+	if (debugfile)
+	{
+		fprintf(debugfile, "ServerConfig Packet about to be sent, size of packet:%s to node:%d\n",
+			sizeu1(len), node);
+	}
 #endif
 
-		waspacketsent = HSendPacket(node, true, 0, len);
-	}
+	waspacketsent = HSendPacket(node, true, 0, len);
 
 #ifdef DEBUGFILE
 	if (debugfile)
@@ -1791,37 +1818,49 @@ static boolean SV_SendServerConfig(INT32 node)
 #ifdef JOININGAME
 #define SAVEGAMESIZE (768*1024)
 
+#ifdef SATURNPAK
+static boolean SV_ResendingSavegameToAnyone(void)
+{
+	INT32 i;
+
+	for (i = 0; i < MAXNETNODES; i++)
+		if (nodeingame[i] && resendingsavegame[i])
+			return true;
+	return false;
+}
+#endif
+
 static void SV_SendSaveGame(INT32 node, boolean resending)
 {
 	size_t length, compressedlen;
-	UINT8 *savebuffer;
+	savebuffer_t save;
 	UINT8 *compressedsave;
 	UINT8 *buffertosend;
 
 	// first save it in a malloced buffer
-	savebuffer = (UINT8 *)malloc(SAVEGAMESIZE);
-	if (!savebuffer)
+	save.buffer = (UINT8 *)malloc(SAVEGAMESIZE);
+	if (!save.buffer)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("No more free memory for savegame\n"));
 		return;
 	}
 
 	// Leave room for the uncompressed length.
-	save_p = savebuffer + sizeof(UINT32);
+	save.p = save.buffer + sizeof(UINT32);
 
-	P_SaveNetGame(resending);
+	P_SaveNetGame(&save, resending);
 
-	length = save_p - savebuffer;
+	length = save.p - save.buffer;
 	if (length > SAVEGAMESIZE)
 	{
-		free(savebuffer);
-		save_p = NULL;
+		free(save.buffer);
+		save.p = NULL;
 		I_Error("Savegame buffer overrun");
 	}
 
 	// Allocate space for compressed save: one byte fewer than for the
 	// uncompressed data to ensure that the compression is worthwhile.
-	compressedsave = malloc(length - 1);
+	compressedsave = Z_Malloc(length - 1, PU_STATIC, NULL);
 	if (!compressedsave)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("No more free memory for savegame\n"));
@@ -1829,11 +1868,11 @@ static void SV_SendSaveGame(INT32 node, boolean resending)
 	}
 
 	// Attempt to compress it.
-	if((compressedlen = lzf_compress(savebuffer + sizeof(UINT32), length - sizeof(UINT32), compressedsave + sizeof(UINT32), length - sizeof(UINT32) - 1)))
+	if ((compressedlen = lzf_compress(save.buffer + sizeof(UINT32), length - sizeof(UINT32), compressedsave + sizeof(UINT32), length - sizeof(UINT32) - 1)))
 	{
 		// Compressing succeeded; send compressed data
 
-		free(savebuffer);
+		free(save.buffer);
 
 		// State that we're compressed.
 		buffertosend = compressedsave;
@@ -1843,16 +1882,15 @@ static void SV_SendSaveGame(INT32 node, boolean resending)
 	else
 	{
 		// Compression failed to make it smaller; send original
-
-		free(compressedsave);
+		Z_Free(compressedsave);
 
 		// State that we're not compressed
-		buffertosend = savebuffer;
-		WRITEUINT32(savebuffer, 0);
+		buffertosend = save.buffer;
+		WRITEUINT32(save.buffer, 0);
 	}
 
-	SV_SendRam(node, buffertosend, length, SF_RAM, 0);
-	save_p = NULL;
+	SV_SendRam(node, buffertosend, length, SF_Z_RAM, 0);
+	save.p = NULL;
 
 	// Remember when we started sending the savegame so we can handle timeouts
 	sendingsavegame[node] = true;
@@ -1866,7 +1904,7 @@ static consvar_t cv_dumpconsistency = {"dumpconsistency", "Off", CV_NETVAR, CV_O
 static void SV_SavedGame(void)
 {
 	size_t length;
-	UINT8 *savebuffer;
+	savebuffer_t save;
 	char tmpsave[264];
 
 	if (!cv_dumpconsistency.value)
@@ -1875,45 +1913,44 @@ static void SV_SavedGame(void)
 	sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
 
 	// first save it in a malloced buffer
-	save_p = savebuffer = (UINT8 *)malloc(SAVEGAMESIZE);
-	if (!save_p)
+	save.p = save.buffer = (UINT8 *)malloc(SAVEGAMESIZE);
+	if (!save.p)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("No more free memory for savegame\n"));
 		return;
 	}
 
-	P_SaveNetGame();
+	P_SaveNetGame(&save);
 
-	length = save_p - savebuffer;
+	length = save.p - save.buffer;
 	if (length > SAVEGAMESIZE)
 	{
-		free(savebuffer);
-		save_p = NULL;
+		free(save.buffer);
+		save.p = NULL;
 		I_Error("Savegame buffer overrun");
 	}
 
 	// then save it!
-	if (!FIL_WriteFile(tmpsave, savebuffer, length))
+	if (!FIL_WriteFile(tmpsave, save.buffer, length))
 		CONS_Printf(M_GetText("Didn't save %s for netgame"), tmpsave);
 
-	free(savebuffer);
-	save_p = NULL;
+	free(save.buffer);
+	save.p = NULL;
 }
 
 #undef  TMPSAVENAME
 #endif
 #define TMPSAVENAME "$$$.sav"
 
-
 static void CL_LoadReceivedSavegame(boolean reloading)
 {
-	UINT8 *savebuffer = NULL;
+	savebuffer_t save;
 	size_t length, decompressedlen;
 	char tmpsave[264];
 
 	sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
 
-	length = FIL_ReadFile(tmpsave, &savebuffer);
+	length = FIL_ReadFile(tmpsave, &save.buffer);
 
 	CONS_Printf(M_GetText("Loading savegame length %s\n"), sizeu1(length));
 	if (!length)
@@ -1922,16 +1959,17 @@ static void CL_LoadReceivedSavegame(boolean reloading)
 		return;
 	}
 
-	save_p = savebuffer;
+	save.p = save.buffer;
 
 	// Decompress saved game if necessary.
-	decompressedlen = READUINT32(save_p);
-	if(decompressedlen > 0)
+	decompressedlen = READUINT32(save.p);
+
+	if (decompressedlen > 0)
 	{
 		UINT8 *decompressedbuffer = Z_Malloc(decompressedlen, PU_STATIC, NULL);
-		lzf_decompress(save_p, length - sizeof(UINT32), decompressedbuffer, decompressedlen);
-		Z_Free(savebuffer);
-		save_p = savebuffer = decompressedbuffer;
+		lzf_decompress(save.p, length - sizeof(UINT32), decompressedbuffer, decompressedlen);
+		Z_Free(save.buffer);
+		save.p = save.buffer = decompressedbuffer;
 	}
 
 	paused = false;
@@ -1940,36 +1978,46 @@ static void CL_LoadReceivedSavegame(boolean reloading)
 	automapactive = false;
 
 	// load a base level
-	if (P_LoadNetGame(reloading))
+	if (P_LoadNetGame(&save, reloading))
 	{
-		CON_LogMessage(va(M_GetText("Map is now \"%s"), G_BuildMapName(gamemap)));
-		if (strlen(mapheaderinfo[gamemap-1]->lvlttl) > 0)
+		if (!reloading)
 		{
-			CON_LogMessage(va(": %s", mapheaderinfo[gamemap-1]->lvlttl));
-			if (strlen(mapheaderinfo[gamemap-1]->zonttl) > 0)
-				CON_LogMessage(va(" %s", mapheaderinfo[gamemap-1]->zonttl));
-			else if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
-				CON_LogMessage(M_GetText(" Zone"));
-			if (strlen(mapheaderinfo[gamemap-1]->actnum) > 0)
-				CON_LogMessage(va(" %s", mapheaderinfo[gamemap-1]->actnum));
+			CON_LogMessage(va(M_GetText("Map is now \"%s"), G_BuildMapName(gamemap)));
+			if (strlen(mapheaderinfo[gamemap-1]->lvlttl) > 0)
+			{
+				CON_LogMessage(va(": %s", mapheaderinfo[gamemap-1]->lvlttl));
+				if (strlen(mapheaderinfo[gamemap-1]->zonttl) > 0)
+					CON_LogMessage(va(" %s", mapheaderinfo[gamemap-1]->zonttl));
+				else if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
+					CON_LogMessage(M_GetText(" Zone"));
+				if (strlen(mapheaderinfo[gamemap-1]->actnum) > 0)
+					CON_LogMessage(va(" %s", mapheaderinfo[gamemap-1]->actnum));
+			}
+			CON_LogMessage("\"\n");
 		}
-		CON_LogMessage("\"\n");
 	}
 
 	// done
-	Z_Free(savebuffer);
-	save_p = NULL;
+	Z_Free(save.buffer);
+	save.p = NULL;
 	if (unlink(tmpsave) == -1)
 		CONS_Alert(CONS_ERROR, M_GetText("Can't delete %s\n"), tmpsave);
-	consistancy[gametic%TICQUEUE] = Consistancy();
+	consistancy[gametic%BACKUPTICS] = Consistancy();
 	CON_ToggleOff();
 
+#ifdef SATURNPAK
 	// Tell the server we have received and reloaded the gamestate
 	// so they know they can resume the game
-	netbuffer->packettype = PT_RECEIVEDGAMESTATE;
-	HSendPacket(servernode, true, 0, 0);
+	if (reloading)
+	{
+		doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+		netbuffer->packettype = PT_RECEIVEDGAMESTATE;
+		HSendPacket(servernode, true, 0, 0);
+	}
+#endif
 }
 
+#ifdef SATURNPAK
 static void CL_ReloadReceivedSavegame(void)
 {
 	INT32 i;
@@ -1982,29 +2030,40 @@ static void CL_ReloadReceivedSavegame(void)
 
 	CL_LoadReceivedSavegame(true);
 
-	if (neededtic < gametic)
-		neededtic = gametic;
+	neededtic = max(neededtic, gametic);
 	maketic = neededtic;
 
-	camera->subsector = R_PointInSubsector(camera->x, camera->y);
+	// we dont have P_ForceLocalAngle so were setting it manually here
+	for (i = 0; i <= splitscreen; i++)
+	{
+		localangle[i] = (angle_t)(players[displayplayers[i]].cmd.angleturn << 16);
+	}
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		camera[i].subsector = R_PointInSubsectorFast(camera[i].x, camera[i].y);
+	}
 
 	cl_redownloadinggamestate = false;
 
 	CONS_Printf(M_GetText("Game state reloaded\n"));
 }
 #endif
+#endif
 
 #ifndef NONET
 static void SendAskInfo(INT32 node)
 {
 	tic_t asktime;
-	#ifdef HOLEPUNCH
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+#ifdef HOLEPUNCH
 	if (node != 0 && node != BROADCASTADDR &&
 			cv_rendezvousserver.string[0])
 	{
 		I_NetRequestHolePunch(node);
 	}
-	#endif
+#endif
 
 	asktime = I_GetTime();
 
@@ -2125,7 +2184,7 @@ void CL_QueryServerList (msg_server_t *server_list)
 		{
 			INT32 node = I_NetMakeNodewPort(server_list[i].ip, server_list[i].port);
 			if (node == -1)
-				break; // no more node free
+				continue; // no more node free, or resolution failure
 			SendAskInfo(node);
 			resendserverlistnode[node] = true;
 			// Leave this node open. It'll be closed if the
@@ -2168,39 +2227,45 @@ void CL_TimeoutServerList(void)
 }
 #endif // ifndef NONET
 
+static void CL_ConfirmConnect(void)
+{
+	if (filedownload.totalnum > 0)
+	{
+#ifdef HAVE_CURL
+		if (filedownload.http_source[0] == '\0' || filedownload.http_failed)
+#endif
+		{
+			if (CL_SendRequestFile())
+			{
+				cl_mode = CL_DOWNLOADFILES;
+			}
+			else
+			{
+				cl_mode = CL_LEGACYREQUESTFAILED;
+			}
+		}
+#ifdef HAVE_CURL
+		else
+			cl_mode = CL_PREPAREHTTPFILES;
+#endif
+	}
+	else
+		cl_mode = CL_LOADFILES;
+
+}
+
 static void M_ConfirmConnect(event_t *ev)
 {
 #ifndef NONET
 	if (ev->type == ev_keydown)
 	{
-		if (ev->data1 == ' ' || ev->data1 == 'y' || ev->data1 == KEY_ENTER || ev->data1 == gamecontrol[gc_accelerate][0] || ev->data1 == gamecontrol[gc_accelerate][1])
+		if (ev->data1 == ' ' || ev->data1 == 'y' || ev->data1 == KEY_ENTER || ev->data1 == gamecontrol[0][gc_accelerate][0] || ev->data1 == gamecontrol[0][gc_accelerate][1])
 		{
-			if (totalfilesrequestednum > 0)
-			{
-#ifdef HAVE_CURL
-				if (http_source[0] == '\0' || curl_failedwebdownload)
-#endif
-				{
-					if (CL_SendRequestFile())
-					{
-						cl_mode = CL_DOWNLOADFILES;
-					}
-					else
-					{
-						cl_mode = CL_LEGACYREQUESTFAILED;
-					}
-				}
-#ifdef HAVE_CURL
-				else
-					cl_mode = CL_PREPAREHTTPFILES;
-#endif
-			}
-			else
-				cl_mode = CL_LOADFILES;
+			CL_ConfirmConnect();
 
 			M_ClearMenus(true);
 		}
-		else if (ev->data1 == 'n' || ev->data1 == KEY_ESCAPE|| ev->data1 == gamecontrol[gc_brake][0] || ev->data1 == gamecontrol[gc_brake][1])
+		else if (ev->data1 == 'n' || ev->data1 == KEY_ESCAPE|| ev->data1 == gamecontrol[0][gc_brake][0] || ev->data1 == gamecontrol[0][gc_brake][1])
 		{
 			cl_mode = CL_ABORTED;
 			M_ClearMenus(true);
@@ -2211,7 +2276,7 @@ static void M_ConfirmConnect(event_t *ev)
 #endif
 }
 
-static void AbortConnection(void)
+void CL_AbortConnection(void)
 {
 #ifdef HAVE_CURL
 	CURLAbortFile();
@@ -2224,20 +2289,20 @@ static void AbortConnection(void)
 	cl_mode = CL_ABORTED;
 }
 
-
 static boolean CL_FinishedFileList(void)
 {
 	INT32 i;
 	char *downloadsize = NULL;
 	//CONS_Printf(M_GetText("Checking files...\n"));
 	i = CL_CheckFiles();
+
 	if (i == 4) // still checking ...
 	{
 		return true;
 	}
 	else if (i == 3) // too many files
 	{
-		AbortConnection();
+		CL_AbortConnection();
 		M_StartMessage(M_GetText(
 			"You have too many WAD files loaded\n"
 			"to add ones the server is using.\n"
@@ -2248,7 +2313,7 @@ static boolean CL_FinishedFileList(void)
 	}
 	else if (i == 2) // cannot join for some reason
 	{
-		AbortConnection();
+		CL_AbortConnection();
 		M_StartMessage(M_GetText(
 			"You have the wrong addons loaded.\n\n"
 			"To play on this server, restart\n"
@@ -2280,12 +2345,12 @@ static boolean CL_FinishedFileList(void)
 		// must download something
 		// can we, though?
 #ifdef HAVE_CURL
-		if (http_source[0] == '\0' || curl_failedwebdownload)
+		if (filedownload.http_source[0] == '\0' || filedownload.http_failed)
 #endif
 		{
 			if (!CL_CheckDownloadable()) // nope!
 			{
-				AbortConnection();
+				CL_AbortConnection();
 				M_StartMessage(M_GetText(
 					"An error occured when trying to\n"
 					"download missing addons.\n"
@@ -2300,50 +2365,57 @@ static boolean CL_FinishedFileList(void)
 		}
 
 #ifdef HAVE_CURL
-		if (!curl_failedwebdownload)
+		if (!filedownload.http_failed)
 #endif
 		{
 #ifndef NONET
-			downloadcompletednum = 0;
-			downloadcompletedsize = 0;
-			totalfilesrequestednum = 0;
-			totalfilesrequestedsize = 0;
+			filedownload.completednum = 0;
+			filedownload.completedsize = 0;
+
+			filedownload.totalnum = 0;
+			filedownload.totalsize = 0;
 #endif
 
 			for (i = 0; i < fileneedednum; i++)
 				if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
 				{
 #ifndef NONET
-					totalfilesrequestednum++;
-					totalfilesrequestedsize += fileneeded[i].totalsize;
+					filedownload.totalnum++;
+					filedownload.totalsize += fileneeded[i].totalsize;
 #endif
 				}
 
 #ifndef NONET
-			if (totalfilesrequestedsize>>20 >= 10)
-				downloadsize = Z_StrDup(va("%uM",totalfilesrequestedsize>>20));
+			if (filedownload.totalsize>>20 >= 10)
+				downloadsize = Z_StrDup(va("%uM",filedownload.totalsize>>20));
 			else
-				downloadsize = Z_StrDup(va("%uK",totalfilesrequestedsize>>10));
+				downloadsize = Z_StrDup(va("%uK",filedownload.totalsize>>10));
 #endif
 
-			if (serverisfull)
-				M_StartMessage(va(M_GetText(
-					"This server is full!\n"
-					"Download of %s additional content is required to join.\n"
-					"\n"
-					"You may download, load server addons, and wait for a slot.\n"
-					"\n"
-					"Press ACCEL to continue or BRAKE to cancel.\n\n"
-				), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
+			if (cv_showdownloadprompt.value)
+			{
+				if (serverisfull)
+					M_StartMessage(va(M_GetText(
+						"This server is full!\n"
+						"Download of %s additional content is required to join.\n"
+						"\n"
+						"You may download, load server addons, and wait for a slot.\n"
+						"\n"
+						"Press ACCEL to continue or BRAKE to cancel.\n\n"
+					), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
+				else
+					M_StartMessage(va(M_GetText(
+						"Download of %s additional content is required to join.\n"
+						"\n"
+						"Press ACCEL to continue or BRAKE to cancel.\n\n"
+					), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
+
+				cl_mode = CL_CONFIRMCONNECT;
+			}
 			else
-				M_StartMessage(va(M_GetText(
-					"Download of %s additional content is required to join.\n"
-					"\n"
-					"Press ACCEL to continue or BRAKE to cancel.\n\n"
-				), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
+				CL_ConfirmConnect();
 
 			Z_Free(downloadsize);
-			cl_mode = CL_CONFIRMCONNECT;
 		}
 #ifdef HAVE_CURL
 		else
@@ -2391,6 +2463,7 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
 			if (i < 0)
 				return true;
 		}
+		joinnode = i;
 
 		// Quit here rather than downloading files and being refused later.
 		if (serverlist[i].info.numberofplayer >= serverlist[i].info.maxplayer)
@@ -2402,9 +2475,9 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
 		{
 #ifdef HAVE_CURL
 			if (serverlist[i].info.httpsource[0])
-				strncpy(http_source, serverlist[i].info.httpsource, MAX_MIRROR_LENGTH);
+				strncpy(filedownload.http_source, serverlist[i].info.httpsource, MAX_MIRROR_LENGTH);
 			else
-				http_source[0] = '\0';
+				filedownload.http_source[0] = '\0';
 #else
 			if (serverlist[i].info.httpsource[0])
 				CONS_Printf("We received a http url from the server, however it will not be used as this build lacks curl support (%s)\n", serverlist[i].info.httpsource);
@@ -2417,7 +2490,7 @@ static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
 				return true;
 			}
 
-			cl_mode = CL_CHECKFILES;
+			cl_mode = (cv_serverinfoscreen.value) ? CL_VIEWSERVER : CL_CHECKFILES;
 		}
 		else
 		{
@@ -2471,7 +2544,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 
 		case CL_ASKFULLFILELIST:
 			if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved
-				cl_mode = CL_CHECKFILES;
+				cl_mode = (cv_serverinfoscreen.value) ? CL_VIEWSERVER : CL_CHECKFILES;
 			else if (fileneedednum != cl_lastcheckedfilecount || I_GetTime() >= *asksent)
 			{
 				if (CL_AskFileList(fileneedednum))
@@ -2487,12 +2560,12 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 			break;
 #ifdef HAVE_CURL
 		case CL_PREPAREHTTPFILES:
-			if (http_source[0])
+			if (filedownload.http_source[0])
 			{
 				for (i = 0; i < fileneedednum; i++)
 					if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
 					{
-						curl_transfers++;
+						filedownload.remaining++;
 					}
 
 				cl_mode = CL_DOWNLOADHTTPFILES;
@@ -2504,8 +2577,8 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 			for (i = 0; i < fileneedednum; i++)
 				if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
 				{
-					if (!curl_running)
-						CURLPrepareFile(http_source, i);
+					if (!filedownload.http_running)
+						CURLPrepareFile(filedownload.http_source, i);
 					waitmore = true;
 					break;
 				}
@@ -2513,14 +2586,14 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 			if (waitmore)
 				break; // exit the case
 
-			if (curl_failedwebdownload && !curl_transfers)
+			if (filedownload.http_failed && !filedownload.remaining)
 			{
 				CONS_Printf("One or more files failed to download, falling back to internal downloader\n");
 				cl_mode = CL_CHECKFILES;
 				break;
 			}
 
-			if (!curl_transfers)
+			if (!filedownload.remaining)
 				cl_mode = CL_LOADFILES;
 
 			break;
@@ -2543,7 +2616,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 			{
 				CONS_Printf(M_GetText("Legacy downloader request packet failed.\n"));
 				CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
-				AbortConnection();
+				CL_AbortConnection();
 				M_StartMessage(M_GetText(
 					"The direct download encountered an error.\n"
 					"See the logfile for more info.\n"
@@ -2570,7 +2643,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 			{
 				CONS_Printf("%d minute wait time exceeded.\n", cv_connectawaittime.value);
 				CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
-				AbortConnection();
+				CL_AbortConnection();
 				M_StartMessage(va(
 					"%d minute wait time exceeded.\n"
 					"You may retry connection.\n"
@@ -2629,7 +2702,6 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 	// Call it only once by tic
 	if (*oldtic != I_GetTime())
 	{
-
 		INT32 key;
 
 		I_OsPolling();
@@ -2638,11 +2710,20 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 			D_ProcessEvents(); //needed for menu system to receive inputs
 
 		key = I_GetKey();
+
+		if (cl_mode == CL_VIEWSERVER)
+		{
+			if (key == KEY_ENTER || key == KEY_JOY1)
+				cl_mode = CL_CHECKFILES;
+			else if (key == KEY_ESCAPE || key == KEY_JOY1+1)
+				cl_mode = CL_ABORTED;
+		}
+
 		// Only ESC and non-keyboard keys abort connection
 		if (!modeattacking && (key == KEY_ESCAPE || key == KEY_JOY1+1 || cl_mode == CL_ABORTED))
 		{
 			CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
-			AbortConnection();
+			CL_AbortConnection();
 
 			return false;
 		}
@@ -2697,12 +2778,12 @@ static void CL_ConnectToServer(void)
 	sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
 #endif
 
-	cl_mode = CL_SEARCHING;
-
 #ifdef CLIENT_LOADINGSCREEN
-	lastfilenum = -1;
+	filedownload.current = -1;
 #endif
 
+	cl_mode = CL_SEARCHING;
+
 #ifdef JOININGAME
 	// Don't get a corrupt savegame error because tmpsave already exists
 	if (FIL_FileExists(tmpsave) && unlink(tmpsave) == -1)
@@ -3083,11 +3164,14 @@ static void Command_connect(void)
 		return;
 	}
 
-	if (Playing() || demo.title)
+	if (Playing() || demo.title || demo.playback)
 	{
-		M_ClearMenus(true);
-		if (demo.title)
+		if (demo.title || demo.playback)
+		{
 			G_CheckDemoStatus();
+			if (multiplayer && !demo.title) // dumb hack: G_CheckDemoStatus doesent call G_StopDemo for multiplayer demos
+				G_StopDemo();
+		}
 
 		if (netgame)
 		{
@@ -3097,6 +3181,8 @@ static void Command_connect(void)
 
 		D_StartTitle();
 	}
+	else
+		M_ClearMenus(true); // close the menus
 
 	// modified game check: no longer handled
 	// we don't request a restart unless the filelist differs
@@ -3145,6 +3231,8 @@ static void Command_connect(void)
 			CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
 	}
 
+	CV_Set(&cv_lastserver, I_GetNodeAddress(servernode));
+
 	if (splitscreen != cv_splitplayers.value-1)
 	{
 		splitscreen = cv_splitplayers.value-1;
@@ -3183,7 +3271,8 @@ void CL_ClearPlayer(INT32 playernum)
 			P_RemoveMobj(players[playernum].mo->tracer);
 		P_RemoveMobj(players[playernum].mo);
 	}
-	memset(&players[playernum], 0, sizeof (player_t));
+
+	memset(&players[playernum], 0, sizeof(player_t));
 }
 
 //
@@ -3200,7 +3289,7 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason)
 
 	demo_extradata[playernum] |= DXD_PLAYSTATE;
 
-	if (server && !demo.playback)
+	if (server && !demo.playback && playernode[playernum] != UINT8_MAX)
 	{
 		INT32 node = playernode[playernum];
 		//playerpernode[node] = 0; // It'd be better to remove them all at once, but ghosting happened, so continue to let CL_RemovePlayer do it one-by-one
@@ -3209,9 +3298,7 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason)
 		{
 			SV_InitResynchVars(node); // If a resynch was in progress, well, it no longer needs to be.
 
-			nodeingame[node] = false;
-			is_client_saturn[node] = false;
-			can_receive_gamestate[node] = false;
+			nodeingame[node] = false;  // do we even need this?
 			Net_CloseConnection(node);
 			ResetNode(node);
 		}
@@ -3223,37 +3310,10 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason)
 	if (gametype == GT_CTF)
 		P_PlayerFlagBurst(&players[playernum], false); // Don't take the flag with you!
 
-	// If in a special stage, redistribute the player's rings across
-	// the remaining players.
-	if (G_IsSpecialStage(gamemap))
-	{
-		INT32 i, count, increment, rings;
+	LUA_HookPlayerQuit(&players[playernum], reason); // Lua hook for player quitting
 
-		for (i = 0, count = 0; i < MAXPLAYERS; i++)
-		{
-			if (playeringame[i])
-				count++;
-		}
-
-		count--;
-		rings = players[playernum].health - 1;
-		increment = rings/count;
-
-		for (i = 0; i < MAXPLAYERS; i++)
-		{
-			if (playeringame[i] && i != playernum)
-			{
-				if (rings < increment)
-					P_GivePlayerRings(&players[i], rings);
-				else
-					P_GivePlayerRings(&players[i], increment);
-
-				rings -= increment;
-			}
-		}
-	}
-
-	LUAh_PlayerQuit(&players[playernum], reason); // Lua hook for player quitting
+	if (playernum == displayplayers[0] && !demo.playback)
+		displayplayers[0] = consoleplayer; // don't look through someone's view who isn't there
 
 	// Reset player data
 	CL_ClearPlayer(playernum);
@@ -3261,7 +3321,7 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason)
 	// remove avatar of player
 	playeringame[playernum] = false;
 	playernode[playernum] = UINT8_MAX;
-	while (!playeringame[doomcom->numslots-1] && doomcom->numslots > 1)
+	while ((doomcom->numslots > 1) && !playeringame[doomcom->numslots-1])
 		doomcom->numslots--;
 
 	// Reset the name
@@ -3274,9 +3334,6 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason)
 		RemoveAdminPlayer(playernum); // don't stay admin after you're gone
 	}
 
-	if (playernum == displayplayers[0] && !demo.playback)
-		displayplayers[0] = consoleplayer; // don't look through someone's view who isn't there
-
 	LUA_InvalidatePlayer(&players[playernum]);
 
 	if (G_BattleGametype()) // SRB2Kart
@@ -3317,7 +3374,6 @@ void CL_Reset(void)
 	if (servernode > 0 && servernode < MAXNETNODES)
 	{
 		nodeingame[(UINT8)servernode] = false;
-		is_client_saturn[(UINT8)servernode] = false;
 		Net_CloseConnection(servernode);
 	}
 	D_CloseConnection(); // netgame = false
@@ -3335,19 +3391,22 @@ void CL_Reset(void)
 	memset(packetstat, 0, sizeof(packetstat));
 
 #ifndef NONET
-	totalfilesrequestednum = 0;
-	totalfilesrequestedsize = 0;
+	filedownload.totalnum = 0;
+	filedownload.totalsize = 0;
 #endif
 	firstconnectattempttime = 0;
 	serverisfull = false;
 	connectiontimeout = (tic_t)cv_nettimeout.value; //reset this temporary hack
 
 #ifdef HAVE_CURL
-	curl_failedwebdownload = false;
-	curl_transfers = 0;
-	curl_running = false;
-	http_source[0] = '\0';
+	filedownload.remaining = 0;
+	filedownload.http_failed = false;
+	filedownload.http_running = false;
+	filedownload.http_source[0] = '\0';
 #endif
+	G_ResetAllDeviceRumbles();
+
+	memset(player_muted, 0, sizeof(player_muted));
 
 	// D_StartTitle should get done now, but the calling function will handle it
 }
@@ -3369,31 +3428,12 @@ static void Command_GetPlayerNum(void)
 
 SINT8 nametonum(const char *name)
 {
-	INT32 playernum, i;
+	INT32 playernum = D_LookupPlayer(name);
 
-	if (!strcmp(name, "0"))
-		return 0;
+	if (playernum == -1)
+		CONS_Printf(M_GetText("There is no player named \"%s\"\n"), name);
 
-	playernum = (SINT8)atoi(name);
-
-	if (playernum < 0 || playernum >= MAXPLAYERS)
-		return -1;
-
-	if (playernum)
-	{
-		if (playeringame[playernum])
-			return (SINT8)playernum;
-		else
-			return -1;
-	}
-
-	for (i = 0; i < MAXPLAYERS; i++)
-		if (playeringame[i] && !stricmp(player_names[i], name))
-			return (SINT8)i;
-
-	CONS_Printf(M_GetText("There is no player named \"%s\"\n"), name);
-
-	return -1;
+	return playernum;
 }
 
 /** Lists all players and their player numbers.
@@ -3661,16 +3701,13 @@ static void Command_Kick(void)
 		if (pn == -1 || pn == 0)
 			return;
 
-		if (server)
+		// Special case if we are trying to kick a player who is downloading the game state:
+		// trigger a timeout instead of kicking them, because a kick would only
+		// take effect after they have finished downloading
+		if (server && playernode[pn] != UINT8_MAX && sendingsavegame[playernode[pn]])
 		{
-			// Special case if we are trying to kick a player who is downloading the game state:
-			// trigger a timeout instead of kicking them, because a kick would only
-			// take effect after they have finished downloading
-			if (sendingsavegame[playernode[pn]])
-			{
-				Net_ConnectionTimeout(playernode[pn]);
-				return;
-			}
+			Net_ConnectionTimeout(playernode[pn]);
+			return;
 		}
 
 		WRITESINT8(p, pn);
@@ -3726,7 +3763,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
 
 	// Is playernum authorized to make this kick?
 	if (playernum != serverplayer && !IsPlayerAdmin(playernum)
-		/*&& !(playerpernode[playernode[playernum]] == 2
+		/*&& !(playernode[playernum] != UINT8_MAX && playerpernode[playernode[playernum]] == 2
 		//&& nodetoplayer2[playernode[playernum]] == pnum)*/)
 	{
 		// We received a kick command from someone who isn't the
@@ -3897,7 +3934,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
 #ifdef DUMPCONSISTENCY
 		if (msg == KICK_MSG_CON_FAIL) SV_SavedGame();
 #endif
-		AbortConnection();
+		CL_AbortConnection();
 
 		if (msg == KICK_MSG_CON_FAIL)
 			M_StartMessage(M_GetText("Server closed connection\n(Synch failure)\nPress ESC\n"), NULL, MM_NOTHING);
@@ -4013,6 +4050,7 @@ static void Command_list_http_logins (void)
 }
 #endif/*HAVE_CURL*/
 
+#ifdef SATURNPAK
 static void Command_ResendGamestate(void)
 {
 	SINT8 playernum;
@@ -4032,14 +4070,18 @@ static void Command_ResendGamestate(void)
 	if (playernum == -1 || playernum == 0)
 		return;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	// Send a PT_WILLRESENDGAMESTATE packet to the client so they know what's going on
 	netbuffer->packettype = PT_WILLRESENDGAMESTATE;
+
 	if (!HSendPacket(playernode[playernum], true, 0, 0))
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("A problem occured, please try again.\n"));
 		return;
 	}
 }
+#endif
 
 static CV_PossibleValue_t netticbuffer_cons_t[] = {{0, "MIN"}, {3, "MAX"}, {0, NULL}};
 consvar_t cv_netticbuffer = {"netticbuffer", "1", CV_SAVE, netticbuffer_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -4050,7 +4092,13 @@ consvar_t cv_joinrefusemessage = {"joinrefusemessage", "The server is not accept
 
 consvar_t cv_allownewplayer = {"allowjoin", "On", CV_SAVE|CV_CALL, CV_OnOff, Joinable_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
+<<<<<<< HEAD
 consvar_t cv_allownewsaturnplayer = {"allowsaturnjoin", "On", CV_SAVE|CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+=======
+#ifdef SATURNJOIN
+consvar_t cv_allownewsaturnplayer = {"allowsaturnjoin", "On", CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+#endif
+>>>>>>> Saturn-Next
 
 #ifdef VANILLAJOINNEXTROUND
 consvar_t cv_joinnextround = {"joinnextround", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; /// \todo not done
@@ -4066,11 +4114,20 @@ consvar_t cv_discordinvites = {"discordinvites", "Everyone", CV_SAVE|CV_CALL, di
 static CV_PossibleValue_t resynchattempts_cons_t[] = {{0, "MIN"}, {20, "MAX"}, {0, NULL}};
 consvar_t cv_resynchattempts = {"resynchattempts", "2", CV_SAVE, resynchattempts_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+<<<<<<< HEAD
+=======
+#ifdef SATURNPAK
+>>>>>>> Saturn-Next
 static CV_PossibleValue_t gamestateattempts_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL}};
 consvar_t cv_gamestateattempts = {"gamestateresendattempts", "10", CV_SAVE, gamestateattempts_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t resynchcooldown_cons_t[] = {{0, "MIN"}, {20, "MAX"}, {0, NULL}};
 consvar_t cv_resynchcooldown = {"gamestatecooldown", "5", CV_SAVE, resynchcooldown_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL	};
+<<<<<<< HEAD
+=======
+#endif
+
+>>>>>>> Saturn-Next
 consvar_t cv_blamecfail = {"blamecfail", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL	};
 
 // max file size to send to a player (in kilobytes)
@@ -4085,6 +4142,8 @@ consvar_t cv_downloadspeed = {"downloadspeed", "300", CV_SAVE, downloadspeed_con
 static CV_PossibleValue_t connectawaittime_cons_t[] = {{1, "MIN"}, {60, "MAX"}, {0, "Inf"}, {0, NULL}};
 consvar_t cv_connectawaittime = {"connectawaittime", "5", CV_SAVE, connectawaittime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_serverinfoscreen = {"serverinfoscreen", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 static void Got_AddPlayer(UINT8 **p, INT32 playernum);
 static void Got_RemovePlayer(UINT8 **p, INT32 playernum);
 
@@ -4097,11 +4156,18 @@ static void Joinable_OnChange(void)
 	if (!server)
 		return;
 
+<<<<<<< HEAD
 	// disabling joins should also disable saturn joins unless its called with CV_StealthSet and vice versa to make life a bit easier
 	if (!cv_allownewplayer.value)
 		CV_Set(&cv_allownewsaturnplayer, "Off");
 	else if (cv_allownewplayer.value)
 		CV_Set(&cv_allownewsaturnplayer, "On");
+=======
+#ifdef SATURNJOIN
+	// disabling joins should also disable saturn joins unless its called with CV_StealthSet and vice versa to make life a bit easier
+	CV_SetValue(&cv_allownewsaturnplayer, cv_allownewplayer.value);
+#endif
+>>>>>>> Saturn-Next
 
 	maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
 
@@ -4128,7 +4194,9 @@ void D_ClientServerInit(void)
 	COM_AddCommand("reloadbans", Command_ReloadBan);
 	COM_AddCommand("connect", Command_connect);
 	COM_AddCommand("nodes", Command_Nodes);
+#ifdef SATURNPAK
 	COM_AddCommand("resendgamestate", Command_ResendGamestate);
+#endif
 	COM_AddCommand("listplayers", Command_Listplayers);
 	COM_AddCommand("packetstat", Command_Packetstat);
 #ifdef HAVE_CURL
@@ -4167,26 +4235,30 @@ void D_ClientServerInit(void)
 static void ResetNode(INT32 node)
 {
 	nodeingame[node] = false;
-
 	nodewaiting[node] = 0;
-	nettics[node] = gametic;
-	supposedtics[node] = gametic;
 
-	is_client_saturn[node] = false;
 	nodetoplayer[node] = -1;
 	nodetoplayer2[node] = -1;
 	nodetoplayer3[node] = -1;
 	nodetoplayer4[node] = -1;
+	playerpernode[node] = 0;
+
 	nettics[node] = gametic;
 	supposedtics[node] = gametic;
-	nodewaiting[node] = 0;
-	playerpernode[node] = 0;
+
 	sendingsavegame[node] = false;
-	resendingsavegame[node] = false;
-	can_receive_gamestate[node] = false;
-	savegameresendcooldown[node] = 0;
+
 	bannednode[node].banid = SIZE_MAX;
 	bannednode[node].timeleft = NO_BAN_TIME;
+
+	// SATURN
+#ifdef SATURNPAK
+	is_client_saturn[node] = false;
+	resendingsavegame[node] = 0;
+	savegameresendcooldown[node] = 0;
+	gamestate_resend_counter[node] = 0;
+#endif
+	//
 }
 
 void SV_ResetServer(void)
@@ -4212,17 +4284,25 @@ void SV_ResetServer(void)
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		LUA_InvalidatePlayer(&players[i]);
-		playeringame[i] = false;
-		playernode[i] = UINT8_MAX;
 		sprintf(player_names[i], "Player %d", i + 1);
-		adminplayers[i] = -1; // Populate the entire adminplayers array with -1.
 	}
 
-	memset(player_name_changes, 0, sizeof player_name_changes);
+	memset(player_name_changes, 0, sizeof(player_name_changes));
+
+	memset(playeringame, false, sizeof(playeringame));
+	memset(playernode, UINT8_MAX, sizeof(playernode));
+
+	pingmeasurecount = 1;
+	memset(realpingtable, 0, sizeof(realpingtable));
+	memset(playerpingtable, 0, sizeof(playerpingtable));
+
+	ClearAdminPlayers();
 
 	mynode = 0;
 	cl_packetmissed = false;
+#ifdef SATURNPAK
 	cl_redownloadinggamestate = false;
+#endif
 
 	if (dedicated)
 	{
@@ -4266,6 +4346,8 @@ static inline void SV_GenContext(void)
 //
 void D_QuitNetGame(void)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	if (!netgame || !netbuffer)
 		return;
 
@@ -4295,6 +4377,9 @@ void D_QuitNetGame(void)
 		HSendPacket(servernode, true, 0, 0);
 	}
 
+#ifdef SEENAMES
+	seenplayer = NULL;
+#endif
 	D_CloseConnection();
 	ClearAdminPlayers();
 
@@ -4334,11 +4419,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal add player command received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -4399,12 +4480,18 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
 	if (server && multiplayer && motd[0] != '\0')
 		COM_BufAddText(va("sayto %d %s\n", newplayernum, motd));
 
+<<<<<<< HEAD
 	D_AddAutoloadFiles();
 
 	LUAh_PlayerJoin(newplayernum);
+=======
+	D_AddPostloadFiles();
+
+	LUA_HookInt(newplayernum, HOOK(PlayerJoin));
+>>>>>>> Saturn-Next
 
 	if (newplayernum == consoleplayer)
-		LUAh_ServerJoin();
+		LUA_HookVoid(HOOK(ServerJoin));
 
 #ifdef HAVE_DISCORDRPC
 	DRPC_UpdatePresence();
@@ -4422,11 +4509,7 @@ static void Got_RemovePlayer(UINT8 **p, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal remove player command received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -4437,7 +4520,6 @@ static void Got_RemovePlayer(UINT8 **p, INT32 playernum)
 	if (pnum == serverplayer)
 	{
 		CONS_Alert(CONS_WARNING, "Attempt to remove server player\n");
-
 		return;
 	}
 
@@ -4487,7 +4569,9 @@ static boolean SV_AddWaitingPlayers(void)
 			buf[0] = (UINT8)node;
 			buf[1] = newplayernum;
 			if (playerpernode[node] < 1)
+			{
 				nodetoplayer[node] = newplayernum;
+			}
 			else if (playerpernode[node] < 2)
 			{
 				nodetoplayer2[node] = newplayernum;
@@ -4516,11 +4600,14 @@ static boolean SV_AddWaitingPlayers(void)
 	return newplayer;
 }
 
+#ifdef SATURNPAK
 static inline void SendSaturnInfo(INT32 node)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_ISSATURN;
 	HSendPacket(node, true, 0, 0);
 }
+#endif
 
 void CL_AddSplitscreenPlayer(void)
 {
@@ -4530,14 +4617,10 @@ void CL_AddSplitscreenPlayer(void)
 
 void CL_RemoveSplitscreenPlayer(UINT8 p)
 {
-	UINT8 buf[2];
-
 	if (cl_mode != CL_CONNECTED)
 		return;
 
-	buf[0] = p;
-	buf[1] = KICK_MSG_PLAYER_QUIT;
-	SendNetXCmd(XD_KICK, &buf, 2);
+	SendKick(p, KICK_MSG_PLAYER_QUIT);
 }
 
 // is there a game running
@@ -4583,12 +4666,10 @@ void SV_StopServer(void)
 		Y_EndVote();
 	gamestate = wipegamestate = GS_NULL;
 
-	localtextcmd[0] = 0;
-	localtextcmd2[0] = 0;
-	localtextcmd3[0] = 0;
-	localtextcmd4[0] = 0;
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+		localtextcmd[i][0] = 0;
 
-	for (i = firstticstosend; i < firstticstosend + TICQUEUE; i++)
+	for (i = firstticstosend; i < firstticstosend + BACKUPTICS; i++)
 		D_Clearticcmd(i);
 
 	consoleplayer = 0;
@@ -4615,6 +4696,8 @@ void SV_StartSinglePlayerServer(void)
 
 static void SV_SendRefuse(INT32 node, const char *reason)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	strcpy(netbuffer->u.serverrefuse.reason, reason);
 
 	netbuffer->packettype = PT_SERVERREFUSE;
@@ -4645,6 +4728,8 @@ static size_t TotalTextCmdPerTic(tic_t tic)
   */
 static void HandleConnect(SINT8 node)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	// Sal: Dedicated mode is INCREDIBLY hacked together.
 	// If a server filled out, then it'd overwrite the host and turn everyone into weird husks.....
 	// It's too much effort to legimately fix right now. Just prevent it from reaching that state.
@@ -4707,7 +4792,15 @@ static void HandleConnect(SINT8 node)
 	{
 		SV_SendRefuse(node, va(M_GetText("Different SRB2Kart versions cannot\nplay a netgame!\n(server version %d.%d)"), VERSION, SUBVERSION));
 	}
+<<<<<<< HEAD
 	else if ((!cv_allownewplayer.value && node && netbuffer->u.clientcfg.issaturn != ISSATURN) || (!cv_allownewsaturnplayer.value && node && netbuffer->u.clientcfg.issaturn == ISSATURN))
+=======
+#ifdef SATURNJOIN
+	else if ((!cv_allownewplayer.value && node && netbuffer->u.clientcfg.issaturn != ISSATURN) || (!cv_allownewsaturnplayer.value && node && netbuffer->u.clientcfg.issaturn == ISSATURN))
+#else
+	else if (!cv_allownewplayer.value && node)
+#endif
+>>>>>>> Saturn-Next
 	{
 		SV_SendRefuse(node, M_GetText(cv_joinrefusemessage.string));
 	}
@@ -4746,7 +4839,7 @@ static void HandleConnect(SINT8 node)
 
 			/// \note Wait what???
 			///       What if the gamestate takes more than one second to get downloaded?
-			///       Or if a lagspike happdsfens?
+			///       Or if a lagspike happens?
 			// you get a free second before desynch checks. use it wisely.
 			SV_InitResynchVars(node);
 
@@ -4763,6 +4856,7 @@ static void HandleConnect(SINT8 node)
 				/// \todo fix this !!!
 				return; // restart the while
 			}
+			SV_SendServerInfo(node, 0); // Dunno if 0 time is good idea
 			//if (gamestate != GS_LEVEL) // GS_INTERMISSION, etc?
 			//	SV_SendPlayerConfigs(node); // send bare minimum player info
 			G_SetGamestate(backupstate);
@@ -4779,7 +4873,6 @@ static void HandleConnect(SINT8 node)
 				DEBFILE("send savegame\n");
 			}
 			SV_AddWaitingPlayers();
-			player_joining = true;
 		}
 #else
 #ifndef NONET
@@ -4818,6 +4911,17 @@ static void HandleTimeout(SINT8 node)
 	M_StartMessage(M_GetText("Server Timeout\n\nPress Esc\n"), NULL, MM_NOTHING);
 }
 
+// Helper function for packets that should only be sent by the server
+// If it is NOT from the server, bail out and close the connection!
+static boolean ServerOnly(SINT8 node)
+{
+	if (node == servernode)
+		return false;
+
+	Net_CloseConnection(node);
+	return true;
+}
+
 #ifndef NONET
 /** Called when a PT_SERVERINFO packet is received
   *
@@ -4828,6 +4932,8 @@ static void HandleTimeout(SINT8 node)
 static void HandleServerInfo(SINT8 node)
 {
 	char servername[MAXSERVERNAME];
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	// compute ping in ms
 	const tic_t ticnow = I_GetTime();
 	const tic_t ticthen = (tic_t)LONG(netbuffer->u.serverinfo.time);
@@ -4841,10 +4947,241 @@ static void HandleServerInfo(SINT8 node)
 	netbuffer->u.serverinfo.gametype = (UINT8)((netbuffer->u.serverinfo.gametype == VANILLA_GT_MATCH) ? GT_MATCH : GT_RACE);
 
 	SL_InsertServer(&netbuffer->u.serverinfo, node);
+
+	if (client && cl_mode > CL_SEARCHING && node == servernode)
+		memcpy(connectedservername, netbuffer->u.serverinfo.servername, MAXSERVERNAME);
 }
+
+static void HandlePlayerInfo(void)
+{
+	INT32 i;
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	for (i = 0; i < MAXPLAYERS; i++)
+		playerinfo[i] = netbuffer->u.playerinfo[i];
+}
+
+static void PT_TellFilesNeeded(SINT8 node)
+{
+	if (server && serverrunning)
+	{
+		doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+		UINT8 *p;
+		INT32 firstfile = netbuffer->u.filesneedednum;
+
+		netbuffer->packettype = PT_MOREFILESNEEDED;
+		netbuffer->u.filesneededcfg.first = firstfile;
+		netbuffer->u.filesneededcfg.more = 0;
+
+		p = PutFileNeeded(firstfile);
+
+		HSendPacket(node, false, 0, p - ((UINT8 *)&netbuffer->u));
+	}
+	else // Shouldn't get this if you aren't the server...?
+		Net_CloseConnection(node);
+}
+
+static void PT_MoreFilesNeeded(SINT8 node)
+{
+	if (server && serverrunning)
+	{ // But wait I thought I'm the server?
+		Net_CloseConnection(node);
+		return;
+	}
+
+	if (ServerOnly(node))
+		return;
+
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	if (cl_mode == CL_ASKFULLFILELIST && netbuffer->u.filesneededcfg.first == fileneedednum)
+	{
+		D_ParseFileneeded(netbuffer->u.filesneededcfg.num, netbuffer->u.filesneededcfg.files, netbuffer->u.filesneededcfg.first);
+		if (!netbuffer->u.filesneededcfg.more)
+			cl_lastcheckedfilecount = UINT16_MAX; // Got the whole file list
+	}
+}
+
+static void PT_AskInfo(SINT8 node)
+{
+	if (server && serverrunning)
+	{
+		doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+		SV_SendServerInfo(node, (tic_t)LONG(netbuffer->u.askinfo.time));
+		SV_SendPlayerInfo(node); // Send extra info
+	}
+
+	Net_CloseConnection(node);
+}
+
+// Negative response of client join request
+static void PT_ServerRefuse(SINT8 node)
+{
+	if (server && serverrunning)
+	{ // But wait I thought I'm the server?
+		Net_CloseConnection(node);
+		return;
+	}
+
+	if (ServerOnly(node))
+		return;
+
+	if (cl_mode != CL_WAITJOINRESPONSE)
+		return;
+
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	// Save the reason so it can be displayed after quitting the netgame
+	char *reason = strdup(netbuffer->u.serverrefuse.reason);
+	if (!reason)
+		I_Error("Out of memory!\n");
+
+	if (strstr(reason, "Maximum players reached"))
+	{
+		serverisfull = true;
+		//Special timeout for when refusing due to player cap. The client will wait 3 seconds between join requests when waiting for a slot, so we need this to be much longer
+		//We set it back to the value of cv_nettimeout.value in CL_Reset
+		connectiontimeout = NEWTICRATE*7;
+		cl_mode = CL_ASKJOIN;
+		free(reason);
+		return;
+	}
+
+	D_QuitNetGame();
+	CL_Reset();
+	D_StartTitle();
+
+	if (reason[1] == '|')
+	{
+		M_StartMessage(va("You have been %sfrom the server\n\nReason:\n%s",
+							(reason[0] == 'B') ? "banned\n" : "temporarily\nkicked ",
+							reason+2), NULL, MM_NOTHING);
+	}
+	else
+	{
+		M_StartMessage(va(M_GetText("Server refuses connection\n\nReason:\n%s"),
+							reason), NULL, MM_NOTHING);
+	}
+
+	free(reason);
+
+	// Will be reset by caller. Signals refusal.
+	cl_mode = CL_ABORTED;
+}
+
+// Positive response of client join request
+static void PT_ServerCFG(SINT8 node)
+{
+	INT32 j;
+	UINT8 *scp;
+
+	if (server && serverrunning && node != servernode)
+	{ // but wait I thought I'm the server?
+		Net_CloseConnection(node);
+		return;
+	}
+
+	if (ServerOnly(node))
+		return;
+
+	/// \note how would this happen? and is it doing the right thing if it does?
+	if (!(cl_mode == CL_WAITJOINRESPONSE || cl_mode == CL_ASKJOIN))
+		return;
+
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	if (client)
+	{
+		maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
+		if ((gametype = netbuffer->u.servercfg.gametype) >= NUMGAMETYPES)
+			I_Error("Bad gametype in cliserv!");
+		modifiedgame = netbuffer->u.servercfg.modifiedgame;
+		for (j = 0; j < MAXPLAYERS; j++)
+			adminplayers[j] = netbuffer->u.servercfg.adminplayers[j];
+		memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
+	}
+
+#ifdef HAVE_DISCORDRPC
+	discordInfo.maxPlayers = netbuffer->u.servercfg.maxplayer;
+	discordInfo.joinsAllowed = netbuffer->u.servercfg.allownewplayer;
+	discordInfo.everyoneCanInvite = netbuffer->u.servercfg.discordinvites;
 #endif
 
+	nodeingame[(UINT8)servernode] = true;
+	serverplayer = netbuffer->u.servercfg.serverplayer;
+	doomcom->numslots = SHORT(netbuffer->u.servercfg.totalslotnum);
+	mynode = netbuffer->u.servercfg.clientnode;
+	if (serverplayer >= 0)
+		playernode[(UINT8)serverplayer] = servernode;
 
+	if (netgame)
+#ifdef JOININGAME
+		CONS_Printf(M_GetText("Join accepted, waiting for complete game state...\n"));
+#else
+		CONS_Printf(M_GetText("Join accepted, waiting for next level change...\n"));
+#endif
+	DEBFILE(va("Server accept join gametic=%u mynode=%d\n", gametic, mynode));
+
+#ifdef SATURNPAK
+	SendSaturnInfo(node);
+#endif
+
+	memset(playeringame, 0, sizeof(playeringame));
+
+	for (j = 0; j < MAXPLAYERS; j++)
+	{
+		if (netbuffer->u.servercfg.playerskins[j] == 0xFF
+			&& netbuffer->u.servercfg.playercolor[j] == 0xFF)
+			continue; // not in game
+
+		playeringame[j] = true;
+		SetPlayerSkinByNum(j, (INT32)netbuffer->u.servercfg.playerskins[j]);
+		players[j].skincolor = netbuffer->u.servercfg.playercolor[j];
+	}
+
+	scp = netbuffer->u.servercfg.varlengthinputs;
+	CV_LoadPlayerNames(&scp);
+	CV_LoadNetVars(&scp);
+#ifdef JOININGAME
+	/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
+	///       Shouldn't them be downloaded even at intermission time?
+	///       Also, according to HandleConnect, the server will send the savegame even during intermission...
+	/// Sryder 2018-07-05: If we don't want to send the player config another way we need to send the gamestate
+	///                    At almost any gamestate there could be joiners... So just always send gamestate?
+	cl_mode = ((server) ? CL_CONNECTED : CL_DOWNLOADSAVEGAME);
+#else
+	cl_mode = CL_CONNECTED;
+#endif
+}
+
+static void PT_FileFragmentFromAwayNode(SINT8 node)
+{
+	if (server)
+	{ // But wait I thought I'm the server?
+		Net_CloseConnection(node);
+		return;
+	}
+
+	if (ServerOnly(node))
+		return;
+
+	Got_Filetxpak();
+}
+
+static void PT_RequestFile(SINT8 node)
+{
+	if (server)
+	{
+		if (!cv_downloading.value || !Got_RequestFilePak(node))
+			Net_CloseConnection(node); // close connection if one of the requested files could not be sent, or you disabled downloading anyway
+	}
+	else
+		Net_CloseConnection(node); // nope
+}
+
+#endif
+
+#ifdef SATURNPAK
 static void PT_WillResendGamestate(void)
 {
 	char tmpsave[264];
@@ -4852,9 +5189,12 @@ static void PT_WillResendGamestate(void)
 	if (server || cl_redownloadinggamestate)
 		return;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	// Send back a PT_CANRECEIVEGAMESTATE packet to the server
 	// so they know they can start sending the game state
 	netbuffer->packettype = PT_CANRECEIVEGAMESTATE;
+
 	if (!HSendPacket(servernode, true, 0, 0))
 		return;
 
@@ -4867,7 +5207,6 @@ static void PT_WillResendGamestate(void)
 		I_Error("Can't delete %s\n", tmpsave);
 
 	CL_PrepareDownloadSaveGame(tmpsave);
-
 	cl_redownloadinggamestate = true;
 }
 
@@ -4879,8 +5218,9 @@ static void PT_CanReceiveGamestate(SINT8 node)
 	CONS_Printf(M_GetText("Resending game state to %s...\n"), player_names[nodetoplayer[node]]);
 
 	SV_SendSaveGame(node, true); // Resend a complete game state
-	resendingsavegame[node] = true;
+	resendingsavegame[node] = 1;
 }
+#endif
 
 /** Handles a packet received from a node that isn't in game
   *
@@ -4892,244 +5232,48 @@ static void PT_CanReceiveGamestate(SINT8 node)
   */
 static void HandlePacketFromAwayNode(SINT8 node)
 {
-	if (node != servernode)
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	if (UNLIKELY(node != servernode))
 		DEBFILE(va("Received packet from unknown host %d\n", node));
 
-// macro for packets that should only be sent by the server
-// if it is NOT from the server, bail out and close the connection!
-#define SERVERONLY \
-			if (node != servernode) \
-			{ \
-				Net_CloseConnection(node); \
-				break; \
-			}
 	switch (netbuffer->packettype)
 	{
 		case PT_ASKINFOVIAMS:
-#if 0
-			if (server && serverrunning)
-			{
-				INT32 clientnode;
-				if (ms_RoomId < 0) // ignore if we're not actually on the MS right now
-				{
-					Net_CloseConnection(node); // and yes, close connection
-					return;
-				}
-				clientnode = I_NetMakeNode(netbuffer->u.msaskinfo.clientaddr);
-				if (clientnode != -1)
-				{
-					SV_SendServerInfo(clientnode, (tic_t)LONG(netbuffer->u.msaskinfo.time));
-					SV_SendPlayerInfo(clientnode); // Send extra info
-					Net_CloseConnection(clientnode);
-					// Don't close connection to MS...
-				}
-				else
-					Net_CloseConnection(node); // ...unless the IP address is not valid
-			}
-			else
-				Net_CloseConnection(node); // you're not supposed to get it, so ignore it
-#else
 			Net_CloseConnection(node);
-#endif
 			break;
-
 		case PT_TELLFILESNEEDED:
-			if (server && serverrunning)
-			{
-				UINT8 *p;
-				INT32 firstfile = netbuffer->u.filesneedednum;
-
-				netbuffer->packettype = PT_MOREFILESNEEDED;
-				netbuffer->u.filesneededcfg.first = firstfile;
-				netbuffer->u.filesneededcfg.more = 0;
-
-				p = PutFileNeeded(firstfile);
-
-				HSendPacket(node, false, 0, p - ((UINT8 *)&netbuffer->u));
-			}
-			else // Shouldn't get this if you aren't the server...?
-				Net_CloseConnection(node);
+			PT_TellFilesNeeded(node);
 			break;
-
 		case PT_MOREFILESNEEDED:
-			if (server && serverrunning)
-			{ // But wait I thought I'm the server?
-				Net_CloseConnection(node);
-				break;
-			}
-			SERVERONLY
-			if (cl_mode == CL_ASKFULLFILELIST && netbuffer->u.filesneededcfg.first == fileneedednum)
-			{
-				D_ParseFileneeded(netbuffer->u.filesneededcfg.num, netbuffer->u.filesneededcfg.files, netbuffer->u.filesneededcfg.first);
-				if (!netbuffer->u.filesneededcfg.more)
-					cl_lastcheckedfilecount = UINT16_MAX; // Got the whole file list
-			}
+			PT_MoreFilesNeeded(node);
 			break;
-
 		case PT_ASKINFO:
-			if (server && serverrunning)
-			{
-				SV_SendServerInfo(node, (tic_t)LONG(netbuffer->u.askinfo.time));
-				SV_SendPlayerInfo(node); // Send extra info
-			}
-			Net_CloseConnection(node);
+			PT_AskInfo(node);
 			break;
-
 		case PT_SERVERREFUSE: // Negative response of client join request
-			if (server && serverrunning)
-			{ // But wait I thought I'm the server?
-				Net_CloseConnection(node);
-				break;
-			}
-			SERVERONLY
-			if (cl_mode == CL_WAITJOINRESPONSE)
-			{
-				// Save the reason so it can be displayed after quitting the netgame
-				char *reason = strdup(netbuffer->u.serverrefuse.reason);
-				if (!reason)
-					I_Error("Out of memory!\n");
-
-				if (strstr(reason, "Maximum players reached"))
-				{
-					serverisfull = true;
-					//Special timeout for when refusing due to player cap. The client will wait 3 seconds between join requests when waiting for a slot, so we need this to be much longer
-					//We set it back to the value of cv_nettimeout.value in CL_Reset
-					connectiontimeout = NEWTICRATE*7;
-					cl_mode = CL_ASKJOIN;
-					free(reason);
-					break;
-				}
-
-				D_QuitNetGame();
-				CL_Reset();
-				D_StartTitle();
-
-				if (reason[1] == '|')
-				{
-					M_StartMessage(va("You have been %sfrom the server\n\nReason:\n%s",
-						(reason[0] == 'B') ? "banned\n" : "temporarily\nkicked ",
-						reason+2), NULL, MM_NOTHING);
-				}
-				else
-				{
-					M_StartMessage(va(M_GetText("Server refuses connection\n\nReason:\n%s"),
-						reason), NULL, MM_NOTHING);
-				}
-
-				free(reason);
-
-				// Will be reset by caller. Signals refusal.
-				cl_mode = CL_ABORTED;
-			}
+			PT_ServerRefuse(node);
 			break;
-
 		case PT_SERVERCFG: // Positive response of client join request
-		{
-			INT32 j;
-			UINT8 *scp;
-
-			if (server && serverrunning && node != servernode)
-			{ // but wait I thought I'm the server?
-				Net_CloseConnection(node);
-				break;
-			}
-			SERVERONLY
-			/// \note how would this happen? and is it doing the right thing if it does?
-			if (!(cl_mode == CL_WAITJOINRESPONSE || cl_mode == CL_ASKJOIN))
-				break;
-
-			if (client)
-			{
-				maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
-				if ((gametype = netbuffer->u.servercfg.gametype) >= NUMGAMETYPES)
-					I_Error("Bad gametype in cliserv!");
-				modifiedgame = netbuffer->u.servercfg.modifiedgame;
-				for (j = 0; j < MAXPLAYERS; j++)
-					adminplayers[j] = netbuffer->u.servercfg.adminplayers[j];
-				memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
-			}
-
-#ifdef HAVE_DISCORDRPC
-			discordInfo.maxPlayers = netbuffer->u.servercfg.maxplayer;
-			discordInfo.joinsAllowed = netbuffer->u.servercfg.allownewplayer;
-			discordInfo.everyoneCanInvite = netbuffer->u.servercfg.discordinvites;
-#endif
-
-			nodeingame[(UINT8)servernode] = true;
-			serverplayer = netbuffer->u.servercfg.serverplayer;
-			doomcom->numslots = SHORT(netbuffer->u.servercfg.totalslotnum);
-			mynode = netbuffer->u.servercfg.clientnode;
-			if (serverplayer >= 0)
-				playernode[(UINT8)serverplayer] = servernode;
-
-			if (netgame)
-#ifdef JOININGAME
-				CONS_Printf(M_GetText("Join accepted, waiting for complete game state...\n"));
-#else
-				CONS_Printf(M_GetText("Join accepted, waiting for next level change...\n"));
-#endif
-			DEBFILE(va("Server accept join gametic=%u mynode=%d\n", gametic, mynode));
-
-			SendSaturnInfo(node);
-
-			memset(playeringame, 0, sizeof(playeringame));
-			for (j = 0; j < MAXPLAYERS; j++)
-			{
-				if (netbuffer->u.servercfg.playerskins[j] == 0xFF
-				 && netbuffer->u.servercfg.playercolor[j] == 0xFF)
-					continue; // not in game
-
-				playeringame[j] = true;
-				SetPlayerSkinByNum(j, (INT32)netbuffer->u.servercfg.playerskins[j]);
-				players[j].skincolor = netbuffer->u.servercfg.playercolor[j];
-			}
-
-			scp = netbuffer->u.servercfg.varlengthinputs;
-			CV_LoadPlayerNames(&scp);
-			CV_LoadNetVars(&scp);
-#ifdef JOININGAME
-			/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
-			///       Shouldn't them be downloaded even at intermission time?
-			///       Also, according to HandleConnect, the server will send the savegame even during intermission...
-			/// Sryder 2018-07-05: If we don't want to send the player config another way we need to send the gamestate
-			///                    At almost any gamestate there could be joiners... So just always send gamestate?
-			cl_mode = ((server) ? CL_CONNECTED : CL_DOWNLOADSAVEGAME);
-#else
-			cl_mode = CL_CONNECTED;
-#endif
+			PT_ServerCFG(node);
 			break;
-		}
-
 		// Handled in d_netfil.c
 		case PT_FILEFRAGMENT:
-			if (server)
-			{ // But wait I thought I'm the server?
-				Net_CloseConnection(node);
-				break;
-			}
-			SERVERONLY
-			Got_Filetxpak();
+			PT_FileFragmentFromAwayNode(node);
 			break;
-
 		case PT_REQUESTFILE:
-			if (server)
-			{
-				if (!cv_downloading.value || !Got_RequestFilePak(node))
-					Net_CloseConnection(node); // close connection if one of the requested files could not be sent, or you disabled downloading anyway
-			}
-			else
-				Net_CloseConnection(node); // nope
+			PT_RequestFile(node);
 			break;
-
 		case PT_NODETIMEOUT:
 		case PT_CLIENTQUIT:
 			if (server)
 				Net_CloseConnection(node);
 			break;
-
 		case PT_CLIENTCMD:
 			break; // This is not an "unknown packet"
-
+		case PT_PLAYERINFO:
+			HandlePlayerInfo();
+			break;
 		case PT_SERVERTICS:
 			// Do not remove my own server (we have just get a out of order packet)
 			if (node == servernode)
@@ -5137,12 +5281,10 @@ static void HandlePacketFromAwayNode(SINT8 node)
 			/* FALLTHRU */
 
 		default:
-			DEBFILE(va("unknown packet received (%d) from unknown host\n",netbuffer->packettype));
+			DEBFILE(va("unknown packet received (%d) from unknown host\n", netbuffer->packettype));
 			Net_CloseConnection(node);
 			break; // Ignore it
-
 	}
-#undef SERVERONLY
 }
 
 /** Checks ticcmd for "speed hacks"
@@ -5154,23 +5296,495 @@ static void HandlePacketFromAwayNode(SINT8 node)
   */
 static boolean CheckForSpeedHacks(UINT8 p, tic_t faketic)
 {
+<<<<<<< HEAD
 	if (netcmds[faketic%TICQUEUE][p].forwardmove > MAXPLMOVE || netcmds[faketic%TICQUEUE][p].forwardmove < -MAXPLMOVE
 		|| netcmds[faketic%TICQUEUE][p].sidemove > MAXPLMOVE || netcmds[faketic%TICQUEUE][p].sidemove < -MAXPLMOVE
 		|| netcmds[faketic%TICQUEUE][p].driftturn > KART_FULLTURN || netcmds[faketic%TICQUEUE][p].driftturn < -KART_FULLTURN)
+=======
+	if (netcmds[maketic%BACKUPTICS][p].forwardmove > MAXPLMOVE || netcmds[maketic%BACKUPTICS][p].forwardmove < -MAXPLMOVE
+		|| netcmds[maketic%BACKUPTICS][p].sidemove > MAXPLMOVE || netcmds[maketic%BACKUPTICS][p].sidemove < -MAXPLMOVE
+		|| netcmds[maketic%BACKUPTICS][p].driftturn > KART_FULLTURN || netcmds[maketic%BACKUPTICS][p].driftturn < -KART_FULLTURN)
+>>>>>>> Saturn-Next
 	{
-		char buf[2];
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal movement value received from node %d\n"), playernode[p]);
-		//D_Clearticcmd(k);
-
-		buf[0] = (char)p;
-		buf[1] = KICK_MSG_CON_FAIL;
-		SendNetXCmd(XD_KICK, &buf, 2);
+		SendKick(p, KICK_MSG_CON_FAIL);
 		return true;
 	}
 
 	return false;
 }
 
+static void PT_ClientCmd(INT32 netconsole, SINT8 node)
+{
+	tic_t realend, realstart;
+
+	if (client)
+		return;
+
+	// Ignore tics from those not synched
+	if (resynch_inprogress[node])
+		return;
+
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	// To save bytes, only the low byte of tic numbers are sent
+	// Use ExpandTics to figure out what the rest of the bytes are
+	realstart = ExpandTics(netbuffer->u.clientpak.client_tic, nettics[node]);
+	realend = ExpandTics(netbuffer->u.clientpak.resendfrom, nettics[node]);
+
+	if (netbuffer->packettype == PT_CLIENTMIS || netbuffer->packettype == PT_CLIENT2MIS
+		|| netbuffer->packettype == PT_CLIENT3MIS || netbuffer->packettype == PT_CLIENT4MIS
+		|| netbuffer->packettype == PT_NODEKEEPALIVEMIS
+		|| supposedtics[node] < realend)
+	{
+		supposedtics[node] = realend;
+	}
+
+	// Discard out of order packet
+	if (nettics[node] > realend)
+	{
+		DEBFILE(va("out of order ticcmd discarded nettics = %u\n", nettics[node]));
+		return;
+	}
+
+	// Update the nettics
+	nettics[node] = realend;
+
+	// This should probably still timeout though, as the node should always have a player 1 number
+	if (netconsole == -1)
+		return;
+
+	// If a client sends a ticcmd it should mean they are done receiving the savegame
+	sendingsavegame[node] = false;
+
+	// As long as clients send valid ticcmds, the server can keep running, so reset the timeout
+	/// \todo Use a separate cvar for that kind of timeout?
+	freezetimeout[node] = I_GetTime() + connectiontimeout;
+
+	// Don't do anything for packets of type NODEKEEPALIVE?
+	// Sryder 2018/07/01: Update the freezetimeout still!
+	if (netbuffer->packettype == PT_NODEKEEPALIVE
+		|| netbuffer->packettype == PT_NODEKEEPALIVEMIS)
+		return;
+
+	// store it in an internal buffer so the last packet takes precedence, which minimizes input lag
+	G_MoveTiccmd(&playercmds[netconsole], &netbuffer->u.clientpak.cmd, 1);
+
+	// Check ticcmd for "speed hacks"
+	if (CheckForSpeedHacks((UINT8)netconsole))
+		return;
+
+	// Splitscreen cmd
+	if (((netbuffer->packettype == PT_CLIENT2CMD || netbuffer->packettype == PT_CLIENT2MIS)
+		|| (netbuffer->packettype == PT_CLIENT3CMD || netbuffer->packettype == PT_CLIENT3MIS)
+		|| (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS))
+		&& (nodetoplayer2[node] >= 0))
+	{
+		G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer2[node]], &netbuffer->u.client2pak.cmd2, 1);
+
+		if (CheckForSpeedHacks((UINT8)nodetoplayer2[node]))
+			return;
+	}
+
+	if (((netbuffer->packettype == PT_CLIENT3CMD || netbuffer->packettype == PT_CLIENT3MIS)
+		|| (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS))
+		&& (nodetoplayer3[node] >= 0))
+	{
+		G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer3[node]], &netbuffer->u.client3pak.cmd3, 1);
+
+		if (CheckForSpeedHacks((UINT8)nodetoplayer3[node]))
+			return;
+	}
+
+	if ((netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS)
+		&& (nodetoplayer4[node] >= 0))
+	{
+		G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer4[node]], &netbuffer->u.client4pak.cmd4, 1);
+
+		if (CheckForSpeedHacks((UINT8)nodetoplayer4[node]))
+			return;
+	}
+
+	// A delay before we check resynching
+	// Used on join or just after a synch fail
+	if (resynch_delay[node])
+	{
+		--resynch_delay[node];
+		return;
+	}
+
+#ifdef SATURNPAK
+	// this decreases by one point at twice the cooldown time (ex cooldown of 2 seconds means, this counter decreases by one every 4 seconds), pretty much there to prevent a resynch loop
+	if ((gamestate_resend_counter[node] != 0) && (I_GetTime() % ((max(cv_resynchcooldown.value, 1) * TICRATE) *2) == 0))
+	{
+		gamestate_resend_counter[node]--;
+		DEBFILE(va("gamestate counter %d for node %d\n", gamestate_resend_counter[node], netconsole));
+	}
+
+	// Check player consistancy during the level
+	if (gamestate == GS_LEVEL
+		&& (realstart <= gametic && realstart + BACKUPTICS - 1 > gametic)
+		&& consistancy[realstart%BACKUPTICS] != SHORT(netbuffer->u.clientpak.consistancy)
+		&& (!UseSaturnSynch(node) || (!resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime() && !SV_ResendingSavegameToAnyone())))
+	{
+		resendingsavegame[node] = 0; // reset this before just in case
+
+		// Check if a client is saturn before sending ANYTHING!
+		// this way we only send stuff to clients we know can use the gamestate resend
+		// and dont have to wait for a response from clients that never would send a response back
+		if (UseSaturnSynch(node))
+		{
+			// Tell the client we are about to resend them the gamestate
+			netbuffer->packettype = PT_WILLRESENDGAMESTATE;
+			HSendPacket(node, true, 0, 0);
+			resendingsavegame[node] = 1;
+		}
+		else if (UseVanillaSynch(node))
+		{
+			SV_RequireResynch(node);
+		}
+
+		if ((UseVanillaSynch(node) && (resynch_score[node] <= (unsigned)cv_resynchattempts.value*250)) || (UseSaturnSynch(node) && (gamestate_resend_counter[node] < cv_gamestateattempts.value)))
+		{
+			if (is_client_saturn[node] && resendingsavegame[node])
+			{
+				gamestate_resend_counter[node]++;
+				DEBFILE(va("gamestate counter %d for node %d\n", gamestate_resend_counter[node], netconsole));
+			}
+
+			if (cv_blamecfail.value)
+			{
+				CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"),
+					netconsole+1, player_names[netconsole],
+					consistancy[realstart%BACKUPTICS],
+					SHORT(netbuffer->u.clientpak.consistancy));
+			}
+
+			DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n",
+				netconsole, realstart, consistancy[realstart%BACKUPTICS],
+				SHORT(netbuffer->u.clientpak.consistancy)));
+			return;
+		}
+		else
+		{
+			SendKick(netconsole, KICK_MSG_CON_FAIL);
+			DEBFILE(va("player %d kicked (synch failure) [%u] %d!=%d\n",
+				netconsole, realstart, consistancy[realstart%BACKUPTICS],
+				SHORT(netbuffer->u.clientpak.consistancy)));
+			return;
+		}
+	}
+	else if (resynch_score[node])
+		--resynch_score[node];
+#else
+	// Check player consistancy during the level
+	if (realstart <= gametic && realstart > gametic - BACKUPTICS+1 && gamestate == GS_LEVEL
+		&& consistancy[realstart%BACKUPTICS] != SHORT(netbuffer->u.clientpak.consistancy))
+	{
+		SV_RequireResynch(node);
+
+		if (cv_resynchattempts.value && resynch_score[node] <= (unsigned)cv_resynchattempts.value*250)
+		{
+			if (cv_blamecfail.value)
+				CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"),
+					netconsole+1, player_names[netconsole],
+					consistancy[realstart%BACKUPTICS],
+					SHORT(netbuffer->u.clientpak.consistancy));
+			DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n",
+				netconsole, realstart, consistancy[realstart%BACKUPTICS],
+				SHORT(netbuffer->u.clientpak.consistancy)));
+			return;
+		}
+		else
+		{
+			SendKick(netconsole, KICK_MSG_CON_FAIL);
+			DEBFILE(va("player %d kicked (synch failure) [%u] %d!=%d\n",
+				netconsole, realstart, consistancy[realstart%BACKUPTICS],
+				SHORT(netbuffer->u.clientpak.consistancy)));
+			return;
+		}
+	}
+	else if (resynch_score[node])
+		--resynch_score[node];
+#endif
+}
+
+static void PT_BasicKeepAlive(INT32 netconsole, SINT8 node)
+{
+	if (client)
+		return;
+
+	// This should probably still timeout though, as the node should always have a player 1 number
+	if (netconsole == -1)
+		return;
+
+	// If a client sends this it should mean they are done receiving the savegame
+	sendingsavegame[node] = false;
+
+	// As long as clients send keep alives, the server can keep running, so reset the timeout
+	/// \todo Use a separate cvar for that kind of timeout?
+	freezetimeout[node] = I_GetTime() + connectiontimeout;
+}
+
+static void PT_TextCmd(INT32 netconsole, SINT8 node)
+{
+	if (client)
+		return;
+
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	switch (netbuffer->packettype)
+	{
+		case PT_TEXTCMD2: // splitscreen special
+			netconsole = nodetoplayer2[node];
+			break;
+		case PT_TEXTCMD3:
+			netconsole = nodetoplayer3[node];
+			break;
+		case PT_TEXTCMD4:
+			netconsole = nodetoplayer4[node];
+			break;
+		default:
+			break;
+	}
+
+	if (netconsole < 0 || netconsole >= MAXPLAYERS)
+		Net_UnAcknowledgePacket(node);
+	else
+	{
+		size_t j;
+		tic_t tic = maketic;
+		UINT8 *textcmd;
+
+		// ignore if the textcmd has a reported size of zero
+		// this shouldn't be sent at all
+		if (!netbuffer->u.textcmd[0])
+		{
+			DEBFILE(va("GetPacket: Textcmd with size 0 detected! (node %u, player %d)\n",
+					   node, netconsole));
+			Net_UnAcknowledgePacket(node);
+			return;
+		}
+
+		// ignore if the textcmd size var is actually larger than it should be
+		// BASEPACKETSIZE + 1 (for size) + textcmd[0] should == datalength
+		if (netbuffer->u.textcmd[0] > (size_t)doomcom->datalength-BASEPACKETSIZE-1)
+		{
+			DEBFILE(va("GetPacket: Bad Textcmd packet size! (expected %d, actual %s, node %u, player %d)\n",
+					   netbuffer->u.textcmd[0], sizeu1((size_t)doomcom->datalength-BASEPACKETSIZE-1),
+					   node, netconsole));
+			Net_UnAcknowledgePacket(node);
+			return;
+		}
+
+		// check if tic that we are making isn't too large else we cannot send it :(
+		// doomcom->numslots+1 "+1" since doomcom->numslots can change within this time and sent time
+		j = (software_MAXPACKETLENGTH - (netbuffer->u.textcmd[0]+2+BASESERVERTICSSIZE + (doomcom->numslots+1)*sizeof(ticcmd_t)));
+
+		// search a tic that have enougth space in the ticcmd
+		while ((textcmd = D_GetExistingTextcmd(tic, netconsole)),
+			(TotalTextCmdPerTic(tic) > j || netbuffer->u.textcmd[0] + (textcmd ? textcmd[0] : 0) > MAXTEXTCMD)
+			&& tic < firstticstosend + BACKUPTICS)
+		{
+			tic++;
+		}
+
+		if (tic >= firstticstosend + BACKUPTICS)
+		{
+			DEBFILE(va("GetPacket: Textcmd too long (max %s, used %s, mak %d, "
+			"tosend %u, node %u, player %d)\n", sizeu1(j), sizeu2(TotalTextCmdPerTic(maketic)),
+					   maketic, firstticstosend, node, netconsole));
+			Net_UnAcknowledgePacket(node);
+			return;
+		}
+
+		// Make sure we have a buffer
+		if (!textcmd)
+			textcmd = D_GetTextcmd(tic, netconsole);
+
+		DEBFILE(va("textcmd put in tic %u at position %d (player %d) ftts %u mk %u\n",
+				   tic, textcmd[0]+1, netconsole, firstticstosend, maketic));
+
+		M_Memcpy(&textcmd[textcmd[0]+1], netbuffer->u.textcmd+1, netbuffer->u.textcmd[0]);
+		textcmd[0] += (UINT8)netbuffer->u.textcmd[0];
+	}
+}
+
+static void PT_ClientQuit(INT32 netconsole, SINT8 node)
+{
+
+	if (client)
+		return;
+
+	// nodeingame will be put false in the execution of kick command
+	// this allow to send some packets to the quitting client to have their ack back
+	nodewaiting[node] = 0;
+	if (netconsole != -1 && playeringame[netconsole])
+	{
+		doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+		SendKick(netconsole, (netbuffer->packettype == PT_NODETIMEOUT) ? KICK_MSG_TIMEOUT : KICK_MSG_PLAYER_QUIT);
+	}
+	Net_CloseConnection(node);
+	nodeingame[node] = false;
+}
+
+static boolean FromServer(SINT8 node, const char *str)
+{
+	// Only accept PT_RESYNCHEND from the server.
+	if (node != servernode)
+	{
+		CONS_Alert(CONS_WARNING, "%s received from non-host %d\n", str, node);
+
+		if (server)
+		{
+			SendKick(node, KICK_MSG_CON_FAIL);
+		}
+
+		return false;
+	}
+
+	return true;
+}
+
+static void PT_Resynched(SINT8 node)
+{
+	// Only accept PT_RESYNCHEND from the server.
+	if (!FromServer(node, "PT_RESYNCHEND"))
+		return;
+
+	resynch_local_inprogress = false;
+
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	P_SetRandSeed(netbuffer->u.resynchend.randomseed);
+
+	if (gametype == GT_CTF)
+		resynch_read_ctf(&netbuffer->u.resynchend);
+	resynch_read_others(&netbuffer->u.resynchend);
+}
+
+static void PT_ServerTics(SINT8 node)
+{
+	tic_t realend, realstart;
+	UINT8 *pak, *txtpak = NULL, numtxtpak;
+
+	// Only accept PT_SERVERTICS from the server.
+	if (!FromServer(node, "PT_SERVERTICS"))
+		return;
+
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	realstart = ExpandTics(netbuffer->u.serverpak.starttic, maketic);
+	realend = realstart + netbuffer->u.serverpak.numtics;
+
+	if (!txtpak)
+		txtpak = (UINT8 *)&netbuffer->u.serverpak.cmds[netbuffer->u.serverpak.numslots
+		* netbuffer->u.serverpak.numtics];
+
+	if (realend > gametic + CLIENTBACKUPTICS)
+		realend = gametic + CLIENTBACKUPTICS;
+	cl_packetmissed = realstart > neededtic;
+
+	if (realstart <= neededtic && realend > neededtic)
+	{
+		tic_t i, j;
+		pak = (UINT8 *)&netbuffer->u.serverpak.cmds;
+
+		for (i = realstart; i < realend; i++)
+		{
+			// clear first
+			D_Clearticcmd(i);
+
+			// copy the tics
+			pak = G_ScpyTiccmd(netcmds[i%BACKUPTICS], pak,
+							   netbuffer->u.serverpak.numslots*sizeof (ticcmd_t));
+
+			// copy the textcmds
+			numtxtpak = *txtpak++;
+
+			for (j = 0; j < numtxtpak; j++)
+			{
+				INT32 playernum = *txtpak++; // playernum
+				const size_t txtsize = txtpak[0]+1;
+
+				if (playernum < 0 || playernum >= MAXPLAYERS)
+				{
+					CONS_Alert(CONS_WARNING, "Got bogus NetXCmd packet targetting player %d\n", playernum);
+					return;
+				}
+
+				if (i >= gametic) // Don't copy old net commands
+					M_Memcpy(D_GetTextcmd(i, playernum), txtpak, txtsize);
+				txtpak += txtsize;
+			}
+		}
+
+		neededtic = realend;
+	}
+	else
+	{
+		DEBFILE(va("frame not in bound: %u (bounds are from %u to %u)\n", neededtic, realstart, realend));
+		/*if (realend < neededtic - 2 * TICRATE || neededtic + 2 * TICRATE < realstart)
+		 *	I_Error("Received an out of order PT_SERVERTICS packet!\n"
+		 *			"Got tics %d-%d, needed tic %d\n\n"
+		 *			"Please report this crash on the Master Board,\n"
+		 *			"IRC or Discord so it can be fixed.\n", (INT32)realstart, (INT32)realend, (INT32)neededtic);*/
+	}
+}
+
+static void PT_Resynching(SINT8 node)
+{
+	// Only accept PT_RESYNCHING from the server.
+	if (!FromServer(node, "PT_RESYNCHING"))
+		return;
+
+	resynch_local_inprogress = true;
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+	CL_AcknowledgeResynch(&netbuffer->u.resynchpak);
+}
+
+static void PT_Ping(SINT8 node)
+{
+	UINT8 i;
+
+	// Only accept PT_PING from the server.
+	if (!FromServer(node, "PT_PING"))
+		return;
+
+	if (!client)
+		return;
+
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
+	// Update client ping table from the server.
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		if (!playeringame[i])
+			continue;
+
+		playerpingtable[i] = (tic_t)netbuffer->u.pingtable[i];
+	}
+
+	servermaxping = (tic_t)netbuffer->u.pingtable[MAXPLAYERS];
+}
+
+static void PT_FileFragmentFromPlayer(SINT8 node)
+{
+	// Only accept PT_FILEFRAGMENT from the server.
+	if (!FromServer(node, "PT_FILEFRAGMENT"))
+		return;
+
+	if (client)
+		Got_Filetxpak();
+}
+
+static void PT_ReceivedGamestate(SINT8 node)
+{
+	sendingsavegame[node] = false;
+	resendingsavegame[node] = 0;
+	savegameresendcooldown[node] = I_GetTime() + cv_resynchcooldown.value * TICRATE; // I_GetTime() + 5 * TICRATE;
+}
+
 /** Handles a packet received from a node that is in game
   *
   * \param node The packet sender
@@ -5182,15 +5796,14 @@ static boolean CheckForSpeedHacks(UINT8 p, tic_t faketic)
 static void HandlePacketFromPlayer(SINT8 node)
 {
 	INT32 netconsole;
-	tic_t realend, realstart;
-	UINT8 *pak, *txtpak, numtxtpak;
 
-	txtpak = NULL;
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	if (dedicated && node == 0)
 		netconsole = 0;
 	else
 		netconsole = nodetoplayer[node];
+
 #ifdef PARANOIA
 	if (netconsole >= MAXPLAYERS)
 		I_Error("bad table nodetoplayer: node %d player %d", doomcom->remotenode, netconsole);
@@ -5200,8 +5813,6 @@ static void HandlePacketFromPlayer(SINT8 node)
 	{
 // -------------------------------------------- SERVER RECEIVE ----------
 		case PT_RESYNCHGET:
-			if (client)
-				break;
 			SV_AcknowledgeResynchAck(node, netbuffer->u.resynchgot);
 			break;
 		case PT_CLIENTCMD:
@@ -5214,6 +5825,7 @@ static void HandlePacketFromPlayer(SINT8 node)
 		case PT_CLIENT4MIS:
 		case PT_NODEKEEPALIVE:
 		case PT_NODEKEEPALIVEMIS:
+<<<<<<< HEAD
 			if (client)
 				break;
 
@@ -5369,326 +5981,65 @@ static void HandlePacketFromPlayer(SINT8 node)
 			}
 			else if (resynch_score[node])
 				--resynch_score[node];
+=======
+			PT_ClientCmd(netconsole, node);
+>>>>>>> Saturn-Next
 			break;
 		case PT_BASICKEEPALIVE:
-			if (client)
-				break;
-
-			// This should probably still timeout though, as the node should always have a player 1 number
-			if (netconsole == -1)
-				break;
-
-			// If a client sends this it should mean they are done receiving the savegame
-			sendingsavegame[node] = false;
-
-			// As long as clients send keep alives, the server can keep running, so reset the timeout
-			/// \todo Use a separate cvar for that kind of timeout?
-			freezetimeout[node] = I_GetTime() + connectiontimeout;
+			PT_BasicKeepAlive(netconsole, node);
 			break;
 		case PT_TEXTCMD:
 		case PT_TEXTCMD2:
 		case PT_TEXTCMD3:
 		case PT_TEXTCMD4:
-			if (netbuffer->packettype == PT_TEXTCMD2) // splitscreen special
-				netconsole = nodetoplayer2[node];
-			else if (netbuffer->packettype == PT_TEXTCMD3)
-				netconsole = nodetoplayer3[node];
-			else if (netbuffer->packettype == PT_TEXTCMD4)
-				netconsole = nodetoplayer4[node];
-
-			if (client)
-				break;
-
-			if (netconsole < 0 || netconsole >= MAXPLAYERS)
-				Net_UnAcknowledgePacket(node);
-			else
-			{
-				size_t j;
-				tic_t tic = maketic;
-				UINT8 *textcmd;
-
-				// ignore if the textcmd has a reported size of zero
-				// this shouldn't be sent at all
-				if (!netbuffer->u.textcmd[0])
-				{
-					DEBFILE(va("GetPacket: Textcmd with size 0 detected! (node %u, player %d)\n",
-						node, netconsole));
-					Net_UnAcknowledgePacket(node);
-					break;
-				}
-
-				// ignore if the textcmd size var is actually larger than it should be
-				// BASEPACKETSIZE + 1 (for size) + textcmd[0] should == datalength
-				if (netbuffer->u.textcmd[0] > (size_t)doomcom->datalength-BASEPACKETSIZE-1)
-				{
-					DEBFILE(va("GetPacket: Bad Textcmd packet size! (expected %d, actual %s, node %u, player %d)\n",
-					netbuffer->u.textcmd[0], sizeu1((size_t)doomcom->datalength-BASEPACKETSIZE-1),
-						node, netconsole));
-					Net_UnAcknowledgePacket(node);
-					break;
-				}
-
-				// check if tic that we are making isn't too large else we cannot send it :(
-				// doomcom->numslots+1 "+1" since doomcom->numslots can change within this time and sent time
-				j = software_MAXPACKETLENGTH
-					- (netbuffer->u.textcmd[0]+2+BASESERVERTICSSIZE
-					+ (doomcom->numslots+1)*sizeof(ticcmd_t));
-
-				// search a tic that have enougth space in the ticcmd
-				while ((textcmd = D_GetExistingTextcmd(tic, netconsole)),
-					(TotalTextCmdPerTic(tic) > j || netbuffer->u.textcmd[0] + (textcmd ? textcmd[0] : 0) > MAXTEXTCMD)
-					&& tic < firstticstosend + TICQUEUE)
-					tic++;
-
-				if (tic >= firstticstosend + TICQUEUE)
-				{
-					DEBFILE(va("GetPacket: Textcmd too long (max %s, used %s, mak %d, "
-						"tosend %u, node %u, player %d)\n", sizeu1(j), sizeu2(TotalTextCmdPerTic(maketic)),
-						maketic, firstticstosend, node, netconsole));
-					Net_UnAcknowledgePacket(node);
-					break;
-				}
-
-				// Make sure we have a buffer
-				if (!textcmd) textcmd = D_GetTextcmd(tic, netconsole);
-
-				DEBFILE(va("textcmd put in tic %u at position %d (player %d) ftts %u mk %u\n",
-					tic, textcmd[0]+1, netconsole, firstticstosend, maketic));
-
-				M_Memcpy(&textcmd[textcmd[0]+1], netbuffer->u.textcmd+1, netbuffer->u.textcmd[0]);
-				textcmd[0] += (UINT8)netbuffer->u.textcmd[0];
-			}
+			PT_TextCmd(netconsole, node);
 			break;
 		case PT_NODETIMEOUT:
 		case PT_CLIENTQUIT:
-			if (client)
-				break;
-
-			// nodeingame will be put false in the execution of kick command
-			// this allow to send some packets to the quitting client to have their ack back
-			nodewaiting[node] = 0;
-			if (netconsole != -1 && playeringame[netconsole])
-			{
-				UINT8 buf[2];
-				buf[0] = (UINT8)netconsole;
-				if (netbuffer->packettype == PT_NODETIMEOUT)
-					buf[1] = KICK_MSG_TIMEOUT;
-				else
-					buf[1] = KICK_MSG_PLAYER_QUIT;
-				SendNetXCmd(XD_KICK, &buf, 2);
-				//nodetoplayer[node] = -1;
-
-				/*if (nodetoplayer2[node] != -1 && nodetoplayer2[node] >= 0
-					&& playeringame[(UINT8)nodetoplayer2[node]])
-				{
-					buf[0] = nodetoplayer2[node];
-					SendNetXCmd(XD_KICK, &buf, 2);
-					nodetoplayer2[node] = -1;
-				}
-
-				if (nodetoplayer3[node] != -1 && nodetoplayer3[node] >= 0
-					&& playeringame[(UINT8)nodetoplayer3[node]])
-				{
-					buf[0] = nodetoplayer3[node];
-					SendNetXCmd(XD_KICK, &buf, 2);
-					nodetoplayer3[node] = -1;
-				}
-
-				if (nodetoplayer4[node] != -1 && nodetoplayer4[node] >= 0
-					&& playeringame[(UINT8)nodetoplayer4[node]])
-				{
-					buf[0] = nodetoplayer4[node];
-					SendNetXCmd(XD_KICK, &buf, 2);
-					nodetoplayer4[node] = -1;
-				}*/
-			}
-			Net_CloseConnection(node);
-			nodeingame[node] = false;
-			is_client_saturn[node] = false;
-			can_receive_gamestate[node] = false;
+			PT_ClientQuit(netconsole, node);
 			break;
 // -------------------------------------------- CLIENT RECEIVE ----------
 		case PT_RESYNCHEND:
-			// Only accept PT_RESYNCHEND from the server.
-			if (node != servernode)
-			{
-				CONS_Alert(CONS_WARNING, M_GetText("%s received from non-host %d\n"), "PT_RESYNCHEND", node);
-
-				if (server)
-				{
-					UINT8 buf[2];
-					buf[0] = (UINT8)node;
-					buf[1] = KICK_MSG_CON_FAIL;
-					SendNetXCmd(XD_KICK, &buf, 2);
-				}
-
-				break;
-			}
-			resynch_local_inprogress = false;
-
-			P_SetRandSeed(netbuffer->u.resynchend.randomseed);
-
-			if (gametype == GT_CTF)
-				resynch_read_ctf(&netbuffer->u.resynchend);
-			resynch_read_others(&netbuffer->u.resynchend);
-
+			PT_Resynched(node);
 			break;
 		case PT_SERVERTICS:
-			// Only accept PT_SERVERTICS from the server.
-			if (node != servernode)
-			{
-				CONS_Alert(CONS_WARNING, M_GetText("%s received from non-host %d\n"), "PT_SERVERTICS", node);
-
-				if (server)
-				{
-					UINT8 buf[2];
-					buf[0] = (UINT8)node;
-					buf[1] = KICK_MSG_CON_FAIL;
-					SendNetXCmd(XD_KICK, &buf, 2);
-				}
-
-				break;
-			}
-
-			realstart = ExpandTics(netbuffer->u.serverpak.starttic, maketic);
-			realend = realstart + netbuffer->u.serverpak.numtics;
-
-			if (!txtpak)
-				txtpak = (UINT8 *)&netbuffer->u.serverpak.cmds[netbuffer->u.serverpak.numslots
-					* netbuffer->u.serverpak.numtics];
-
-			if (realend > gametic + BACKUPTICS)
-				realend = gametic + BACKUPTICS;
-			cl_packetmissed = realstart > neededtic;
-
-			if (realstart <= neededtic && realend > neededtic)
-			{
-				tic_t i, j;
-				pak = (UINT8 *)&netbuffer->u.serverpak.cmds;
-
-				for (i = realstart; i < realend; i++)
-				{
-					// clear first
-					D_Clearticcmd(i);
-
-					// copy the tics
-					pak = G_ScpyTiccmd(netcmds[i%TICQUEUE], pak,
-						netbuffer->u.serverpak.numslots*sizeof (ticcmd_t));
-
-					// copy the textcmds
-					numtxtpak = *txtpak++;
-					for (j = 0; j < numtxtpak; j++)
-					{
-						INT32 k = *txtpak++; // playernum
-						const size_t txtsize = txtpak[0]+1;
-
-						if (i >= gametic) // Don't copy old net commands
-							M_Memcpy(D_GetTextcmd(i, k), txtpak, txtsize);
-						txtpak += txtsize;
-					}
-				}
-
-				neededtic = realend;
-			}
-			else
-			{
-				DEBFILE(va("frame not in bound: %u (bounds are from %u to %u)\n", neededtic, realstart, realend));
-				/*if (realend < neededtic - 2 * TICRATE || neededtic + 2 * TICRATE < realstart)
-					I_Error("Received an out of order PT_SERVERTICS packet!\n"
-							"Got tics %d-%d, needed tic %d\n\n"
-							"Please report this crash on the Master Board,\n"
-							"IRC or Discord so it can be fixed.\n", (INT32)realstart, (INT32)realend, (INT32)neededtic);*/
-			}
+			PT_ServerTics(node);
 			break;
 		case PT_RESYNCHING:
-			// Only accept PT_RESYNCHING from the server.
-			if (node != servernode)
-			{
-				CONS_Alert(CONS_WARNING, M_GetText("%s received from non-host %d\n"), "PT_RESYNCHING", node);
-
-				if (server)
-				{
-					char buf[2];
-					buf[0] = (char)node;
-					buf[1] = KICK_MSG_CON_FAIL;
-					SendNetXCmd(XD_KICK, &buf, 2);
-				}
-
-				break;
-			}
-			resynch_local_inprogress = true;
-			CL_AcknowledgeResynch(&netbuffer->u.resynchpak);
+			PT_Resynching(node);
 			break;
 		case PT_PING:
-			// Only accept PT_PING from the server.
-			if (node != servernode)
-			{
-				CONS_Alert(CONS_WARNING, M_GetText("%s received from non-host %d\n"), "PT_PING", node);
-
-				if (server)
-				{
-					char buf[2];
-					buf[0] = (char)node;
-					buf[1] = KICK_MSG_CON_FAIL;
-					SendNetXCmd(XD_KICK, &buf, 2);
-				}
-
-				break;
-			}
-
-			//Update client ping table from the server.
-			if (client)
-			{
-				UINT8 i;
-				for (i = 0; i < MAXPLAYERS; i++)
-					if (playeringame[i])
-						playerpingtable[i] = (tic_t)netbuffer->u.pingtable[i];
-
-				servermaxping = (tic_t)netbuffer->u.pingtable[MAXPLAYERS];
-			}
-
+			PT_Ping(node);
 			break;
 		case PT_SERVERCFG:
 			break;
 		case PT_FILEFRAGMENT:
-			// Only accept PT_FILEFRAGMENT from the server.
-			if (node != servernode)
-			{
-				CONS_Alert(CONS_WARNING, M_GetText("%s received from non-host %d\n"), "PT_FILEFRAGMENT", node);
-
-				if (server)
-				{
-					UINT8 buf[2];
-					buf[0] = (UINT8)node;
-					buf[1] = KICK_MSG_CON_FAIL;
-					SendNetXCmd(XD_KICK, &buf, 2);
-				}
-
-				break;
-			}
-			if (client)
-				Got_Filetxpak();
-			break;
-		case PT_ISSATURN:
-			//CONS_Printf("hi im on saturn\n");
-			is_client_saturn[node] = true;
+			PT_FileFragmentFromPlayer(node);
 			break;
+#ifdef SATURNPAK
 		case PT_CANRECEIVEGAMESTATE:
-			can_receive_gamestate[node] = true;
 			PT_CanReceiveGamestate(node);
 			break;
 		case PT_RECEIVEDGAMESTATE:
+<<<<<<< HEAD
 			sendingsavegame[node] = false;
 			resendingsavegame[node] = false;
 			savegameresendcooldown[node] = I_GetTime() + cv_resynchcooldown.value * TICRATE; // I_GetTime() + 5 * TICRATE;
+=======
+			PT_ReceivedGamestate(node);
+>>>>>>> Saturn-Next
 			break;
 		case PT_WILLRESENDGAMESTATE:
 			PT_WillResendGamestate();
 			break;
+		case PT_ISSATURN:
+			DEBFILE(va("hi im on saturn! node = %d\n", node));
+			is_client_saturn[node] = true;
+			break;
+#endif
 		default:
-			DEBFILE(va("UNKNOWN PACKET TYPE RECEIVED %d from host %d\n",
-				netbuffer->packettype, node));
-	} // end switch
+			DEBFILE(va("UNKNOWN PACKET TYPE RECEIVED %d from host %d\n", netbuffer->packettype, node));
+	}
 }
 
 /**	Handles all received packets, if any
@@ -5700,18 +6051,21 @@ static void GetPackets(void)
 {
 	SINT8 node; // The packet sender
 
-
-	player_joining = false;
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	while (HGetPacket())
 	{
 		node = (SINT8)doomcom->remotenode;
 
-		if (netbuffer->packettype == PT_CLIENTJOIN && server && !levelloading)
+		if (netbuffer->packettype == PT_CLIENTJOIN && server)
 		{
-			HandleConnect(node);
+			if (!levelloading) // Otherwise just ignore
+			{
+				HandleConnect(node);
+			}
 			continue;
 		}
+
 		if (node == servernode && client && cl_mode != CL_SEARCHING)
 		{
 			if (netbuffer->packettype == PT_SERVERSHUTDOWN)
@@ -5734,8 +6088,8 @@ static void GetPackets(void)
 		}
 #endif
 
-		if (netbuffer->packettype == PT_PLAYERINFO)
-			continue; // We do nothing with PLAYERINFO, that's for the MS browser.
+		/*if (netbuffer->packettype == PT_PLAYERINFO)
+			 continue; // We do nothing with PLAYERINFO, that's for the MS browser. Not quite true anymore :p*/
 
 		// We also count unknown packets, hence "<="
 		if (netbuffer->packettype <= NUMPACKETTYPE)
@@ -5788,6 +6142,11 @@ static INT16 Consistancy(void)
 		ret += P_GetRandSeed();
 
 #ifdef MOBJCONSISTANCY
+	if (!thinkercap.next)
+	{
+		DEBFILE(va("Consistancy = %u\n", ret));
+		return ret;
+	}
 	if (gamestate == GS_LEVEL)
 	{
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
@@ -5795,9 +6154,6 @@ static INT16 Consistancy(void)
 			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
 				continue;
 
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-				continue;
-
 			mo = (mobj_t *)th;
 
 			if (mo->flags & (MF_SPECIAL | MF_SOLID | MF_PUSHABLE | MF_BOSS | MF_MISSILE | MF_SPRING | MF_MONITOR | MF_FIRE | MF_ENEMY | MF_PAIN | MF_STICKY))
@@ -5912,8 +6268,8 @@ static INT16 Consistancy(void)
 // used during wipes to tell the server that a node is still connected
 static void CL_SendClientKeepAlive(void)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_BASICKEEPALIVE;
-
 	HSendPacket(servernode, false, 0, 0);
 }
 
@@ -5921,6 +6277,8 @@ static void SV_SendServerKeepAlive(void)
 {
 	INT32 n;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	for (n = 1; n < MAXNETNODES; n++)
 	{
 		if (nodeingame[n])
@@ -5937,6 +6295,8 @@ static void CL_SendClientCmd(void)
 	size_t packetsize = 0;
 	boolean mis = false;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	netbuffer->packettype = PT_CLIENTCMD;
 
 	if (cl_packetmissed)
@@ -5957,27 +6317,78 @@ static void CL_SendClientCmd(void)
 	}
 	else if (gamestate != GS_NULL)
 	{
+		UINT8 lagDelay = 0;
+
+		if (UseLocalDelay() && (lowest_lag > 0))
+		{
+			// Gentlemens' ping.
+			lagDelay = min(lowest_lag, MAXGENTLEMENDELAY);
+
+			// Is our connection worse than our current gentleman point?
+			// Make sure it stays that way for a bit before increasing delay levels.
+			if (lagDelay > reference_lag)
+			{
+				spike_time++;
+				if (spike_time >= GENTLEMANSMOOTHING)
+				{
+					// Okay, this is genuinely the new baseline delay.
+					reference_lag = lagDelay;
+					spike_time = 0;
+				}
+				else
+				{
+					// Just a temporary fluctuation, ignore it.
+					lagDelay = reference_lag;
+				}
+			}
+			else
+			{
+				reference_lag = lagDelay; // Adjust quickly if the connection improves.
+				spike_time = 0;
+			}
+
+			/*
+			if (server) // Clients have to wait for the gamestate to make it back. Servers don't!
+				lagDelay *= 2; // Simulate the HELLFUCK NIGHTMARE of a complete round trip.
+			*/
+
+			// [deep breath in]
+			// Plausible, elegant explanation that is WRONG AND SUPER HARMFUL.
+			// Clients with stable connections were adding their mindelay to network delay,
+			// even when their mindelay was as high or higher than network delay—which made
+			// client delay APPEAR slower than host mindelay, by the exact value that made
+			// "lmao just double it" make sense at the time.
+			//
+			// While this fix made client connections match server mindelay in our most common
+			// test environment, it also masked an issue that seriously affected online handling
+			// responsiveness, completely ruining our opportunity to further investigate it!
+			//
+			// See UpdatePingTable.
+			// I am taking this shitty code to my grave as an example of "never trust your brain".
+			// -Tyron 2024-05-15
+		}
+
 		packetsize = sizeof (clientcmd_pak);
-		G_MoveTiccmd(&netbuffer->u.clientpak.cmd, &localcmds, 1);
-		netbuffer->u.clientpak.consistancy = SHORT(consistancy[gametic%TICQUEUE]);
+		G_MoveTiccmd(&netbuffer->u.clientpak.cmd, &localcmds[0][lagDelay], 1);
+		netbuffer->u.clientpak.consistancy = SHORT(consistancy[gametic % BACKUPTICS]);
 
 		if (splitscreen || botingame) // Send a special packet with 2 cmd for splitscreen
 		{
 			netbuffer->packettype = (mis ? PT_CLIENT2MIS : PT_CLIENT2CMD);
 			packetsize = sizeof (client2cmd_pak);
-			G_MoveTiccmd(&netbuffer->u.client2pak.cmd2, &localcmds2, 1);
+			G_MoveTiccmd(&netbuffer->u.client2pak.cmd2, &localcmds[1][lagDelay], 1);
 
 			if (splitscreen > 1)
 			{
 				netbuffer->packettype = (mis ? PT_CLIENT3MIS : PT_CLIENT3CMD);
 				packetsize = sizeof (client3cmd_pak);
-				G_MoveTiccmd(&netbuffer->u.client3pak.cmd3, &localcmds3, 1);
+				G_MoveTiccmd(&netbuffer->u.client3pak.cmd3, &localcmds[2][lagDelay], 1);
 
 				if (splitscreen > 2)
 				{
 					netbuffer->packettype = (mis ? PT_CLIENT4MIS : PT_CLIENT4CMD);
 					packetsize = sizeof (client4cmd_pak);
-					G_MoveTiccmd(&netbuffer->u.client4pak.cmd4, &localcmds4, 1);
+					G_MoveTiccmd(&netbuffer->u.client4pak.cmd4, &localcmds[3][lagDelay], 1);
 				}
 			}
 		}
@@ -5987,44 +6398,44 @@ static void CL_SendClientCmd(void)
 
 	if (cl_mode == CL_CONNECTED || dedicated)
 	{
+		UINT8 i;
 		// Send extra data if needed
-		if (localtextcmd[0])
+		for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 		{
-			netbuffer->packettype = PT_TEXTCMD;
-			M_Memcpy(netbuffer->u.textcmd,localtextcmd, localtextcmd[0]+1);
-			// All extra data have been sent
-			if (HSendPacket(servernode, true, 0, localtextcmd[0]+1)) // Send can fail...
-				localtextcmd[0] = 0;
-		}
+			if (localtextcmd[i][0])
+			{
+				switch (i)
+				{
+					case 3:
+						netbuffer->packettype = PT_TEXTCMD4;
+						break;
+					case 2:
+						netbuffer->packettype = PT_TEXTCMD3;
+						break;
+					case 1:
+						netbuffer->packettype = PT_TEXTCMD2;
+						break;
+					default:
+						netbuffer->packettype = PT_TEXTCMD;
+						break;
+				}
 
-		// Send extra data if needed for player 2 (splitscreen == 1)
-		if (localtextcmd2[0])
-		{
-			netbuffer->packettype = PT_TEXTCMD2;
-			M_Memcpy(netbuffer->u.textcmd, localtextcmd2, localtextcmd2[0]+1);
-			// All extra data have been sent
-			if (HSendPacket(servernode, true, 0, localtextcmd2[0]+1)) // Send can fail...
-				localtextcmd2[0] = 0;
-		}
+				M_Memcpy(netbuffer->u.textcmd, localtextcmd[i], localtextcmd[i][0]+1);
 
-		// Send extra data if needed for player 3 (splitscreen == 2)
-		if (localtextcmd3[0])
-		{
-			netbuffer->packettype = PT_TEXTCMD3;
-			M_Memcpy(netbuffer->u.textcmd, localtextcmd3, localtextcmd3[0]+1);
-			// All extra data have been sent
-			if (HSendPacket(servernode, true, 0, localtextcmd3[0]+1)) // Send can fail...
-				localtextcmd3[0] = 0;
-		}
+				// All extra data have been sent
+				if (HSendPacket(servernode, true, 0, localtextcmd[i][0]+1)) // Send can fail...
+				{
+					localtextcmd[i][0] = 0;
 
-		// Send extra data if needed for player 4 (splitscreen == 3)
-		if (localtextcmd4[0])
-		{
-			netbuffer->packettype = PT_TEXTCMD4;
-			M_Memcpy(netbuffer->u.textcmd, localtextcmd4, localtextcmd4[0]+1);
-			// All extra data have been sent
-			if (HSendPacket(servernode, true, 0, localtextcmd4[0]+1)) // Send can fail...
-				localtextcmd4[0] = 0;
+					if (textcmdbuf[i] != NULL)
+					{
+						textcmdbuf_t *buf = textcmdbuf[i];
+						M_Memcpy(localtextcmd[i], textcmdbuf[i]->cmd, textcmdbuf[i]->cmd[0]+1);
+						textcmdbuf[i] = textcmdbuf[i]->next;
+						Z_Free(buf);
+					}
+				}
+			}
 		}
 	}
 }
@@ -6040,110 +6451,115 @@ static void SV_SendTics(void)
 	UINT8 *bufpos;
 	UINT8 *ntextcmd;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	// send to all client but not to me
 	// for each node create a packet with x tics and send it
 	// x is computed using supposedtics[n], max packet size and maketic
 	for (n = 1; n < MAXNETNODES; n++)
-		if (nodeingame[n])
+	{
+		if (!nodeingame[n])
+			continue;
+
+		// assert supposedtics[n]>=nettics[n]
+		realfirsttic = max(supposedtics[n], firstticstosend);
+		lasttictosend = min(maketic, nettics[n] + CLIENTBACKUPTICS);
+
+		if (realfirsttic >= lasttictosend)
 		{
-			// assert supposedtics[n]>=nettics[n]
-			realfirsttic = supposedtics[n];
-			lasttictosend = maketic;
-
-			if (lasttictosend - nettics[n] >= BACKUPTICS)
-				lasttictosend = nettics[n] + BACKUPTICS-1;
-
-			if (realfirsttic >= lasttictosend)
-			{
-				// well we have sent all tics we will so use extrabandwidth
-				// to resent packet that are supposed lost (this is necessary since lost
-				// packet detection work when we have received packet with firsttic > neededtic
-				// (getpacket servertics case)
-				DEBFILE(va("Nothing to send node %u mak=%u sup=%u net=%u \n",
-					n, lasttictosend, supposedtics[n], nettics[n]));
-				realfirsttic = nettics[n];
-				if (realfirsttic >= lasttictosend || (I_GetTime() + n)&3)
-					// all tic are ok
-					continue;
-				DEBFILE(va("Sent %d anyway\n", realfirsttic));
-			}
-			if (realfirsttic < firstticstosend)
-				realfirsttic = firstticstosend;
-
-			// compute the length of the packet and cut it if too large
-			packsize = BASESERVERTICSSIZE;
-			for (i = realfirsttic; i < lasttictosend; i++)
-			{
-				packsize += sizeof (ticcmd_t) * doomcom->numslots;
-				packsize += TotalTextCmdPerTic(i);
-
-				if (packsize > software_MAXPACKETLENGTH)
-				{
-					DEBFILE(va("packet too large (%s) at tic %d (should be from %d to %d)\n",
-						sizeu1(packsize), i, realfirsttic, lasttictosend));
-					lasttictosend = i;
-
-					// too bad: too much player have send extradata and there is too
-					//          much data in one tic.
-					// To avoid it put the data on the next tic. (see getpacket
-					// textcmd case) but when numplayer changes the computation can be different
-					if (lasttictosend == realfirsttic)
-					{
-						if (packsize > MAXPACKETLENGTH)
-							I_Error("Too many players: can't send %s data for %d players to node %d\n"
-							        "Well sorry nobody is perfect....\n",
-							        sizeu1(packsize), doomcom->numslots, n);
-						else
-						{
-							lasttictosend++; // send it anyway!
-							DEBFILE("sending it anyway\n");
-						}
-					}
-					break;
-				}
-			}
-
-			// Send the tics
-			netbuffer->packettype = PT_SERVERTICS;
-			netbuffer->u.serverpak.starttic = (UINT8)realfirsttic;
-			netbuffer->u.serverpak.numtics = (UINT8)(lasttictosend - realfirsttic);
-			netbuffer->u.serverpak.numslots = (UINT8)SHORT(doomcom->numslots);
-			bufpos = (UINT8 *)&netbuffer->u.serverpak.cmds;
-
-			for (i = realfirsttic; i < lasttictosend; i++)
-			{
-				bufpos = G_DcpyTiccmd(bufpos, netcmds[i%TICQUEUE], doomcom->numslots * sizeof (ticcmd_t));
-			}
-
-			// add textcmds
-			for (i = realfirsttic; i < lasttictosend; i++)
-			{
-				ntextcmd = bufpos++;
-				*ntextcmd = 0;
-				for (j = 0; j < MAXPLAYERS; j++)
-				{
-					UINT8 *textcmd = D_GetExistingTextcmd(i, j);
-					INT32 size = textcmd ? textcmd[0] : 0;
-
-					if ((!j || playeringame[j]) && size)
-					{
-						(*ntextcmd)++;
-						WRITEUINT8(bufpos, j);
-						M_Memcpy(bufpos, textcmd, size + 1);
-						bufpos += size + 1;
-					}
-				}
-			}
-			packsize = bufpos - (UINT8 *)&(netbuffer->u);
-
-			HSendPacket(n, false, 0, packsize);
-			// when tic are too large, only one tic is sent so don't go backward!
-			if (lasttictosend-doomcom->extratics > realfirsttic)
-				supposedtics[n] = lasttictosend-doomcom->extratics;
-			else
-				supposedtics[n] = lasttictosend;
-			if (supposedtics[n] < nettics[n]) supposedtics[n] = nettics[n];
+			// well we have sent all tics we will so use extrabandwidth
+			// to resent packet that are supposed lost (this is necessary since lost
+			// packet detection work when we have received packet with firsttic > neededtic
+			// (getpacket servertics case)
+			DEBFILE(va("Nothing to send node %u mak=%u sup=%u net=%u \n",
+					   n, lasttictosend, supposedtics[n], nettics[n]));
+			realfirsttic = nettics[n];
+			if (realfirsttic >= lasttictosend || (I_GetTime() + n)&3)
+				// all tic are ok
+				continue;
+			DEBFILE(va("Sent %d anyway\n", realfirsttic));
 		}
+		realfirsttic = max(realfirsttic, firstticstosend);
+
+		// compute the length of the packet and cut it if too large
+		packsize = BASESERVERTICSSIZE;
+
+		for (i = realfirsttic; i < lasttictosend; i++)
+		{
+			packsize += sizeof (ticcmd_t) * doomcom->numslots;
+			packsize += TotalTextCmdPerTic(i);
+
+			if (packsize > software_MAXPACKETLENGTH)
+			{
+				DEBFILE(va("packet too large (%s) at tic %d (should be from %d to %d)\n",
+					sizeu1(packsize), i, realfirsttic, lasttictosend));
+				lasttictosend = i;
+
+				// too bad: too much player have send extradata and there is too
+				//          much data in one tic.
+				// To avoid it put the data on the next tic. (see getpacket
+				// textcmd case) but when numplayer changes the computation can be different
+				if (lasttictosend == realfirsttic)
+				{
+					if (packsize > MAXPACKETLENGTH)
+						I_Error("Too many players: can't send %s data for %d players to node %d\n"
+								"Well sorry nobody is perfect....\n",
+								sizeu1(packsize), doomcom->numslots, n);
+					else
+					{
+						lasttictosend++; // send it anyway!
+						DEBFILE("sending it anyway\n");
+					}
+				}
+
+				break;
+			}
+		}
+
+		// Send the tics
+		netbuffer->packettype = PT_SERVERTICS;
+		netbuffer->u.serverpak.starttic = (UINT8)realfirsttic;
+		netbuffer->u.serverpak.numtics = (UINT8)(lasttictosend - realfirsttic);
+		netbuffer->u.serverpak.numslots = (UINT8)SHORT(doomcom->numslots);
+		bufpos = (UINT8 *)&netbuffer->u.serverpak.cmds;
+
+		for (i = realfirsttic; i < lasttictosend; i++)
+		{
+			bufpos = G_DcpyTiccmd(bufpos, netcmds[i%BACKUPTICS], doomcom->numslots * sizeof (ticcmd_t));
+		}
+
+		// add textcmds
+		for (i = realfirsttic; i < lasttictosend; i++)
+		{
+			ntextcmd = bufpos++;
+			*ntextcmd = 0;
+
+			for (j = 0; j < MAXPLAYERS; j++)
+			{
+				UINT8 *textcmd = D_GetExistingTextcmd(i, j);
+				INT32 size = textcmd ? textcmd[0] : 0;
+
+				if ((!j || playeringame[j]) && size)
+				{
+					(*ntextcmd)++;
+					WRITEUINT8(bufpos, j);
+					M_Memcpy(bufpos, textcmd, size + 1);
+					bufpos += size + 1;
+				}
+			}
+		}
+
+		packsize = bufpos - (UINT8 *)&(netbuffer->u);
+		HSendPacket(n, false, 0, packsize);
+
+		// when tic are too large, only one tic is sent so don't go backward!
+		if (lasttictosend-doomcom->extratics > realfirsttic)
+			supposedtics[n] = lasttictosend-doomcom->extratics;
+		else
+			supposedtics[n] = lasttictosend;
+
+		supposedtics[n] = max(supposedtics[n], nettics[n]);
+	}
 	// node 0 is me!
 	supposedtics[0] = maketic;
 }
@@ -6151,27 +6567,38 @@ static void SV_SendTics(void)
 //
 // TryRunTics
 //
-static void Local_Maketic(INT32 realtics)
+static inline void CreateNewLocalCMD(UINT8 p, INT32 realtics)
 {
-	I_OsPolling(); // I_Getevent
-	D_ProcessEvents(); // menu responder, cons responder,
-	                   // game responder calls HU_Responder, AM_Responder, F_Responder,
-	                   // and G_MapEventsToControls
-	if (!dedicated) rendergametic = gametic;
-	// translate inputs (keyboard/mouse/joystick) into game controls
-	G_BuildTiccmd(&localcmds, realtics, 1);
-	if (splitscreen || botingame)
+	INT32 i;
+
+	if (UseLocalDelay())
 	{
-		G_BuildTiccmd(&localcmds2, realtics, 2);
-		if (splitscreen > 1)
+		for (i = MAXGENTLEMENDELAY-1; i > 0; i--)
 		{
-			G_BuildTiccmd(&localcmds3, realtics, 3);
-			if (splitscreen > 2)
-				G_BuildTiccmd(&localcmds4, realtics, 4);
+			G_MoveTiccmd(&localcmds[p][i], &localcmds[p][i-1], 1);
 		}
 	}
 
-	localcmds.angleturn |= TICCMD_RECEIVED;
+	G_BuildTiccmd(&localcmds[p][0], realtics, p+1);
+	localcmds[p][0].angleturn |= TICCMD_RECEIVED;
+}
+
+static void Local_Maketic(INT32 realtics)
+{
+	INT32 i;
+
+	I_OsPolling();     // I_Getevent
+	D_ProcessEvents(); // menu responder, cons responder,
+	                   // game responder calls HU_Responder, AM_Responder, F_Responder,
+	                   // and G_MapEventsToControls
+	if (!dedicated)
+		rendergametic = gametic;
+
+	// translate inputs (keyboard/mouse/joystick) into game controls
+	for (i = 0; i <= splitscreen; i++)
+	{
+		CreateNewLocalCMD(i, realtics);
+	}
 }
 
 void SV_SpawnPlayer(INT32 playernum, INT32 x, INT32 y, angle_t angle)
@@ -6188,16 +6615,16 @@ void SV_SpawnPlayer(INT32 playernum, INT32 x, INT32 y, angle_t angle)
 
 	for (tic = server ? maketic : (neededtic - 1); tic >= gametic; tic--)
 	{
-		if (numadjust++ == TICQUEUE)
+		if (numadjust++ == BACKUPTICS)
 		{
 			DEBFILE(va("SV_SpawnPlayer: All netcmds for player %d adjusted!\n", playernum));
 			// We already adjusted them all, waste of time doing the same thing over and over
 			// This shouldn't happen normally though, either gametic was 0 (which is handled now anyway)
-			// or maketic >= gametic + TICQUEUE
+			// or maketic >= gametic + BACKUPTICS
 			// -- Monster Iestyn 16/01/18
 			break;
 		}
-		netcmds[tic%TICQUEUE][playernum].angleturn = (INT16)((angle>>16) | TICCMD_RECEIVED);
+		netcmds[tic%BACKUPTICS][playernum].angleturn = (INT16)((angle>>16) | TICCMD_RECEIVED);
 
 		if (!tic) // failsafe for gametic == 0 -- Monster Iestyn 16/01/18
 			break;
@@ -6207,41 +6634,39 @@ void SV_SpawnPlayer(INT32 playernum, INT32 x, INT32 y, angle_t angle)
 // create missed tic
 static void SV_Maketic(void)
 {
-	INT32 j;
-
-	for (j = 0; j < MAXNETNODES; j++)
-		if (playerpernode[j])
-		{
-			INT32 player = nodetoplayer[j];
-			if ((netcmds[maketic%TICQUEUE][player].angleturn & TICCMD_RECEIVED) == 0)
-			{ // we didn't receive this tic
-				INT32 i;
-
-				DEBFILE(va("MISS tic%4d for node %d\n", maketic, j));
-#if defined(PARANOIA) && 0
-				CONS_Debug(DBG_NETPLAY, "Client Misstic %d\n", maketic);
-#endif
-				// copy the old tic
-				for (i = 0; i < playerpernode[j]; i++)
-				{
-					if (i == 0) player = nodetoplayer[j];
-					else if (i == 1) player = nodetoplayer2[j];
-					else if (i == 2) player = nodetoplayer3[j];
-					else if (i == 3) player = nodetoplayer4[j];
-					netcmds[maketic%TICQUEUE][player] = netcmds[(maketic-1)%TICQUEUE][player];
-					netcmds[maketic%TICQUEUE][player].angleturn &= ~TICCMD_RECEIVED;
-				}
-			}
-		}
-
-	// all tic are now proceed make the next
+	G_MoveTiccmd(netcmds[maketic % BACKUPTICS], playercmds, MAXPLAYERS);
 	maketic++;
 }
 
+#ifdef SATURNPAK
+static void SV_UpdateResendGamestateTimeout(void)
+{
+	for (INT32 i = 0; i < MAXNETNODES; ++i)
+	{
+		if (!resendingsavegame[i])
+			continue;
+
+		resendingsavegame[i]++;
+
+		// Resending savegame took too long
+		if (resendingsavegame[i] > (tic_t)TICRATE*cv_pingtimeout.value)
+		{
+			resendingsavegame[i] = 0;
+			SendKick(i, KICK_MSG_CON_FAIL);
+		}
+	}
+}
+#endif
+
 boolean TryRunTics(tic_t realtics)
 {
 	boolean ticking;
 
+#ifdef SATURNPAK
+	if (server)
+		SV_UpdateResendGamestateTimeout();
+#endif
+
 	// the machine has lagged but it is not so bad
 	if (realtics > TICRATE/7) // FIXME: consistency failure!!
 	{
@@ -6265,7 +6690,7 @@ boolean TryRunTics(tic_t realtics)
 
 	if (demo.playback)
 	{
-		neededtic = gametic + realtics * (gamestate == GS_LEVEL ? cv_playbackspeed.value : 1);
+		neededtic = gametic + realtics;
 		// start a game after a demo
 		maketic += realtics;
 		firstticstosend = maketic;
@@ -6285,21 +6710,12 @@ boolean TryRunTics(tic_t realtics)
 	}
 #endif
 
-	if (neededtic > gametic)
-	{
-		hu_stopped = false;
-	}
-
-	if (player_joining)
-	{
-		hu_stopped = true;
-		return false;
-	}
-
 	ticking = neededtic > gametic;
 
 	if (ticking)
 	{
+		hu_stopped = false;
+
 		// run the count * tics
 		while (neededtic > gametic)
 		{
@@ -6313,7 +6729,7 @@ boolean TryRunTics(tic_t realtics)
 			G_Ticker((gametic % NEWTICRATERATIO) == 0);
 			ExtraDataTicker();
 			gametic++;
-			consistancy[gametic%TICQUEUE] = Consistancy();
+			consistancy[gametic%BACKUPTICS] = Consistancy();
 
 			if (update_stats)
 			{
@@ -6346,7 +6762,7 @@ boolean TryRunTics(tic_t realtics)
 
 static INT32 pingtimeout[MAXPLAYERS];
 
-#define PINGKICK_TICQUEUE 2
+#define PINGKICK_BACKUPTICS 2
 #define PINGKICK_LIMIT 1
 
 static inline void PingUpdate(void)
@@ -6354,12 +6770,15 @@ static inline void PingUpdate(void)
 	INT32 i;
 	UINT8 pingkick[MAXPLAYERS];
 	UINT8 nonlaggers = 0;
+
 	memset(pingkick, 0, sizeof(pingkick));
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	netbuffer->packettype = PT_PING;
 
 	//check for ping limit breakage.
-	//if (cv_maxping.value) -- always check for TICQUEUE overrun
+	//if (cv_maxping.value) -- always check for BACKUPTICS overrun
 	{
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
@@ -6369,10 +6788,10 @@ static inline void PingUpdate(void)
 				continue;
 			}
 
-			if ((maketic + 5) >= nettics[playernode[i]] + (TICQUEUE-(2*TICRATE)))
+			if ((maketic + 5) >= nettics[playernode[i]] + (BACKUPTICS-(2*TICRATE)))
 			{
-				// Anyone who's gobbled most of the TICQUEUE and is likely to halt the server the next few times this runs has to die *right now*. (See also NetUpdate)
-				pingkick[i] = PINGKICK_TICQUEUE;
+				// Anyone who's gobbled most of the BACKUPTICS and is likely to halt the server the next few times this runs has to die *right now*. (See also NetUpdate)
+				pingkick[i] = PINGKICK_BACKUPTICS;
 			}
 			else if ((cv_maxping.value)
 				&& (realpingtable[i] / pingmeasurecount > (unsigned)cv_maxping.value))
@@ -6390,18 +6809,15 @@ static inline void PingUpdate(void)
 				if (pingtimeout[i] > 0)
 					pingtimeout[i]--;
 			}
-
 		}
 
 		//kick lagging players... unless everyone but the server's ping sucks.
 		//in that case, it is probably the server's fault.
-		// Always kick TICQUEUE-overrunners, too.
+		// Always kick BACKUPTICS-overrunners, too.
 		{
-			UINT8 minimumkicklevel = (nonlaggers > 0) ? PINGKICK_LIMIT : PINGKICK_TICQUEUE;
+			UINT8 minimumkicklevel = (nonlaggers > 0) ? PINGKICK_LIMIT : PINGKICK_BACKUPTICS;
 			for (i = 0; i < MAXPLAYERS; i++)
 			{
-				char buf[2];
-
 				if (!playeringame[i] || pingkick[i] < minimumkicklevel)
 					continue;
 
@@ -6413,10 +6829,7 @@ static inline void PingUpdate(void)
 				}
 
 				pingtimeout[i] = 0;
-
-				buf[0] = (char)i;
-				buf[1] = KICK_MSG_PING_HIGH;
-				SendNetXCmd(XD_KICK, &buf, 2);
+				SendKick(i, KICK_MSG_PING_HIGH);
 			}
 		}
 	}
@@ -6451,17 +6864,73 @@ static tic_t gametime = 0;
 
 static void UpdatePingTable(void)
 {
+	tic_t fastest;
+	tic_t lag;
+
 	INT32 i;
+
 	if (server)
 	{
-		if (netgame && !(gametime % 35))	// update once per second.
+		//if (Playing() && !(gametime % 8)) // Value chosen based on _my vibes man_ << dont do this for v8 atleast, this is placeboeing ppl to hell and back
+		if (Playing() && !(gametime % 35))	// update once per second.
 			PingUpdate();
+
+		fastest = 0;
+
 		// update node latency values so we can take an average later.
 		for (i = 0; i < MAXPLAYERS; i++)
-			if (playeringame[i])
+		{
+			if (playeringame[i] && playernode[i] > 0 && playernode[i] != UINT8_MAX)
+			{
 				realpingtable[i] += GetLag(playernode[i]);
+
+				if (UseLocalDelay() && !server_lagless && !players[i].spectator)
+				{
+					lag = playerpingtable[i];
+					if (! fastest || lag < fastest)
+						fastest = lag;
+				}
+			}
+		}
+
+		if (UseLocalDelay())
+		{
+			if (server_lagless)
+				lowest_lag = 0;
+			else
+				lowest_lag = fastest;
+
+			// Don't gentleman below your mindelay
+			if (lowest_lag < (tic_t)cv_mindelay.value)
+				lowest_lag = (tic_t)cv_mindelay.value;
+
+			simulated_lag = lowest_lag;
+		}
+		else
+			lowest_lag = simulated_lag = 0;
+
 		pingmeasurecount++;
 	}
+	else // We're a client, handle mindelay on the way out.
+	{
+		if (UseLocalDelay())
+		{
+			// Previously (neededtic - gametic) - WRONG VALUE!
+			// Pretty sure that's measuring jitter, not RTT.
+			// Stable connections would be punished by adding their mindelay to network delay!
+			tic_t mydelay = playerpingtable[consoleplayer];
+
+			if (mydelay < (tic_t)cv_mindelay.value)
+			{
+				lowest_lag = ((tic_t)cv_mindelay.value - mydelay);
+				simulated_lag = (tic_t)cv_mindelay.value;
+			}
+			else
+				lowest_lag = simulated_lag = 0;
+		}
+		else
+			lowest_lag = simulated_lag = 0;
+	}
 }
 
 #ifdef HOLEPUNCH
@@ -6514,14 +6983,13 @@ void NetKeepAlive(void)
 #ifdef MASTERSERVER
 	MasterClient_Ticker();
 #endif
-	
-	#ifdef HOLEPUNCH
+
+#ifdef HOLEPUNCH
 	if (netgame && serverrunning)
 	{
 		RenewHolePunch();
 	}
-	#endif
-
+#endif
 
 	if (client)
 	{
@@ -6626,7 +7094,7 @@ void NetUpdate(void)
 		CL_SendClientCmd(); // send it
 
 	GetPackets(); // get packet from client or from server
-	
+
 	// client send the command after a receive of the server
 	// the server send before because in single player is beter
 
@@ -6634,28 +7102,27 @@ void NetUpdate(void)
 	MasterClient_Ticker(); // Acking the Master Server
 #endif
 
-	#ifdef HOLEPUNCH
+#ifdef HOLEPUNCH
 	if (netgame && serverrunning)
 	{
 		RenewHolePunch();
 	}
-	#endif
+#endif
 
 	if (client)
 	{
+#ifdef SATURNPAK
+		// If the client just finished redownloading the game state, load it
+		if (cl_redownloadinggamestate && fileneeded[0].status == FS_FOUND)
+			CL_ReloadReceivedSavegame();
+#endif
 		if (!resynch_local_inprogress)
 			CL_SendClientCmd(); // Send tic cmd
+
 		hu_resynching = resynch_local_inprogress;
-
-		if (cl_redownloadinggamestate)
-		{
-			// If the client just finished redownloading the game state, load it
-			if (cl_redownloadinggamestate && fileneeded[0].status == FS_FOUND)
-				CL_ReloadReceivedSavegame();
-
-			CL_SendClientCmd(); // Send tic cmd
-		}
+#ifdef SATURNPAK
 		hu_redownloadinggamestate = cl_redownloadinggamestate;
+#endif
 	}
 	else
 	{
@@ -6664,15 +7131,22 @@ void NetUpdate(void)
 			INT32 counts;
 
 			hu_resynching = false;
+#ifdef SATURNPAK
 			hu_redownloadinggamestate = false;
+#endif
+			// Don't erase tics not acknowledged
+			counts = realtics;
 
 			firstticstosend = gametic;
 			for (i = 0; i < MAXNETNODES; i++)
-				if (nodeingame[i] && nettics[i] < firstticstosend)
+			{
+				if (!nodeingame[i])
+					continue;
+				if (nettics[i] < firstticstosend)
 					firstticstosend = nettics[i];
-
-			// Don't erase tics not acknowledged
-			counts = realtics;
+				if (maketic + counts >= nettics[i] + (BACKUPTICS - TICRATE))
+					Net_ConnectionTimeout(i);
+			}
 
 			for (i = 0; i < MAXNETNODES; ++i)
 				if (resynch_inprogress[i])
@@ -6685,14 +7159,14 @@ void NetUpdate(void)
 			if (counts != -666)
 			{
 				// See also PingUpdate
-				if (maketic + counts >= firstticstosend + TICQUEUE)
-					counts = firstticstosend+TICQUEUE-maketic-1;
+				if (maketic + counts >= firstticstosend + BACKUPTICS)
+					counts = firstticstosend+BACKUPTICS-maketic-1;
 
 				for (i = 0; i < counts; i++)
 					SV_Maketic(); // Create missed tics and increment maketic
 
 				for (; tictoclear < firstticstosend; tictoclear++) // Clear only when acknowledged
-					D_Clearticcmd(tictoclear);                    // Clear the maketic the new tic
+					D_Clearticcmd(tictoclear);                     // Clear the maketic the new tic
 
 				SV_SendTics();
 
@@ -6702,8 +7176,10 @@ void NetUpdate(void)
 				hu_resynching = true;
 		}
 	}
+
 	Net_AckTicker();
 	HandleNodeTimeouts();
+
 	if (nowtime > resptime)
 	{
 		resptime = nowtime;
@@ -6756,6 +7232,7 @@ void CL_ClearRewinds(void)
 
 rewind_t *CL_SaveRewindPoint(size_t demopos)
 {
+	savebuffer_t save;
 	rewind_t *rewind;
 
 	if (rewindhead && rewindhead->leveltime + REWIND_POINT_INTERVAL > leveltime)
@@ -6765,8 +7242,9 @@ rewind_t *CL_SaveRewindPoint(size_t demopos)
 	if (!rewind)
 		return NULL;
 
-	save_p = rewind->savebuffer;
-	P_SaveNetGame(true);
+	save.buffer = save.p = rewind->savebuffer;
+
+	P_SaveNetGame(&save, false);
 	rewind->leveltime = leveltime;
 	rewind->next = rewindhead;
 	rewind->demopos = demopos;
@@ -6777,6 +7255,7 @@ rewind_t *CL_SaveRewindPoint(size_t demopos)
 
 rewind_t *CL_RewindToTime(tic_t time)
 {
+	savebuffer_t save;
 	rewind_t *rewind;
 
 	while (rewindhead && rewindhead->leveltime > time)
@@ -6789,8 +7268,9 @@ rewind_t *CL_RewindToTime(tic_t time)
 	if (!rewindhead)
 		return NULL;
 
-	save_p = rewindhead->savebuffer;
-	P_LoadNetGame(true);
+	save.buffer = save.p = rewindhead->savebuffer;
+
+	P_LoadNetGame(&save, false);
 	wipegamestate = gamestate; // No fading back in!
 	timeinmap = leveltime;
 
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 535485672..3ce20855e 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -13,6 +13,10 @@
 #ifndef __D_CLISRV__
 #define __D_CLISRV__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "d_ticcmd.h"
 #include "d_net.h"
 #include "d_netcmd.h"
@@ -38,9 +42,18 @@ applications may follow different packet versions.
 #define VANILLA_GT_MATCH 3
 
 // Networking and tick handling related.
-#define BACKUPTICS 32
-#define TICQUEUE 512 // more than enough for most timeouts....
+#define BACKUPTICS 512 // more than enough for most timeouts....
+#define CLIENTBACKUPTICS 32
 #define MAXTEXTCMD 256
+
+// No. of tics your controls can be delayed by.
+
+// TODO: Instead of storing a ton of extra cmds for gentlemens' delay,
+// keep them in a linked-list, with timestamps to discard everything that's older than already sent.
+// That will support any amount of lag, and be less wasteful for clients who don't use it.
+// This just works as a quick implementation.
+#define MAXGENTLEMENDELAY TICRATE
+
 //
 // Packet structure
 //
@@ -99,11 +112,14 @@ typedef enum
 
 	PT_PING,          // Packet sent to tell clients the other client's latency to server.
 
-	PT_ISSATURN,
+#ifdef SATURNPAK
 	PT_WILLRESENDGAMESTATE, // Hey Client, I am about to resend you the gamestate!
 	PT_CANRECEIVEGAMESTATE, // Okay Server, I'm ready to receive it, you can go ahead.
 	PT_RECEIVEDGAMESTATE,   // Thank you Server, I am ready to play again!
 
+	PT_ISSATURN, 			// Saturn specific identifier packet
+#endif
+
 	NUMPACKETTYPE
 } packettype_t;
 
@@ -369,7 +385,13 @@ typedef struct
 	UINT8 subversion; // Contains build version
 	UINT8 localplayers;	// number of splitscreen players
 	UINT8 mode;
+<<<<<<< HEAD
 	UINT8 issaturn;
+=======
+#ifdef SATURNJOIN
+	UINT8 issaturn;
+#endif
+>>>>>>> Saturn-Next
 } ATTRPACK clientconfig_pak;
 
 #define SV_SPEEDMASK 0x03		// used to send kartspeed
@@ -379,6 +401,7 @@ typedef struct
 #define MAXSERVERNAME 32
 #define MAXFILENEEDED 915
 #define MAX_MIRROR_LENGTH 256
+
 // This packet is too large
 typedef struct
 {
@@ -514,7 +537,6 @@ extern UINT32 serverlistultimatecount;
 extern INT32 mapchangepending;
 
 // Points inside doomcom
-extern doomdata_t *netbuffer;
 extern consvar_t cv_stunserver;
 extern consvar_t cv_httpsource;
 extern consvar_t cv_kicktime;
@@ -562,6 +584,9 @@ extern boolean acceptnewnode;
 extern SINT8 servernode;
 extern char connectedservername[MAXSERVERNAME+1];
 
+extern plrinfo playerinfo[MAXPLAYERS];
+extern SINT8 joinnode;
+
 void Command_Ping_f(void);
 extern tic_t connectiontimeout;
 extern tic_t jointimeout;
@@ -570,26 +595,44 @@ extern UINT32 realpingtable[MAXPLAYERS];
 extern UINT32 playerpingtable[MAXPLAYERS];
 extern tic_t servermaxping;
 
+extern boolean server_lagless;
+extern tic_t simulated_lag;
+extern tic_t lowest_lag;
+extern consvar_t cv_mindelay, cv_gentlemens;
+
 extern consvar_t
 #ifdef VANILLAJOINNEXTROUND
 	cv_joinnextround,
 #endif
+<<<<<<< HEAD
 	cv_netticbuffer, cv_allownewplayer, cv_allownewsaturnplayer, cv_joinrefusemessage, cv_maxplayers, cv_resynchattempts, cv_resynchcooldown, cv_gamestateattempts, cv_blamecfail, cv_maxsend, cv_noticedownload, cv_downloadspeed;
+=======
+	cv_netticbuffer, cv_allownewplayer,
+#ifdef SATURNJOIN
+	cv_allownewsaturnplayer,
+#endif
+	cv_joinrefusemessage, cv_maxplayers, cv_resynchattempts,
+#ifdef SATURNPAK
+	cv_resynchcooldown, cv_gamestateattempts,
+#endif
+	cv_blamecfail, cv_maxsend, cv_noticedownload, cv_downloadspeed;
+>>>>>>> Saturn-Next
 
 extern consvar_t cv_connectawaittime;
 
 extern consvar_t cv_discordinvites;
 
+extern consvar_t cv_serverinfoscreen;
+
 // Used in d_net, the only dependence
-tic_t ExpandTics(INT32 low, tic_t basetic);
+//tic_t ExpandTics(INT32 low, tic_t basetic);
 void D_ClientServerInit(void);
 
 // Initialise the other field
 void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum));
-void SendNetXCmd(netxcmd_t id, const void *param, size_t nparam);
-void SendNetXCmd2(netxcmd_t id, const void *param, size_t nparam); // splitsreen player
-void SendNetXCmd3(netxcmd_t id, const void *param, size_t nparam); // splitsreen3 player
-void SendNetXCmd4(netxcmd_t id, const void *param, size_t nparam); // splitsreen4 player
+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);
 
 // Create any new ticcmds and broadcast to other players.
 void NetKeepAlive(void);
@@ -608,6 +651,9 @@ 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);
+
 // Is there a game running
 boolean Playing(void);
 
@@ -632,15 +678,20 @@ SINT8 nametonum(const char *name);
 extern char motd[254], server_context[8];
 extern UINT8 playernode[MAXPLAYERS];
 
+extern boolean player_muted[MAXPLAYERS];
+
 INT32 D_NumPlayers(void);
+
 void D_ResetTiccmds(void);
 
 tic_t GetLag(INT32 node);
-UINT8 GetFreeXCmdSize(void);
+//UINT8 GetFreeXCmdSize(UINT8 playerid);
 
 extern UINT8 hu_resynching;
+#ifdef SATURNPAK
 extern UINT8 hu_redownloadinggamestate;
-extern UINT8 hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
+#endif
+extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
 
 typedef struct rewind_s {
 	UINT8 savebuffer[(768*1024)];
@@ -656,4 +707,9 @@ typedef struct rewind_s {
 void CL_ClearRewinds(void);
 rewind_t *CL_SaveRewindPoint(size_t demopos);
 rewind_t *CL_RewindToTime(tic_t time);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/d_event.h b/src/d_event.h
index 8cbf8560d..b76e5c6a4 100644
--- a/src/d_event.h
+++ b/src/d_event.h
@@ -25,7 +25,6 @@ typedef enum
 	ev_console,
 	ev_mouse,
 	ev_joystick,
-	ev_mouse2,
 	ev_joystick2,
 	ev_joystick3,
 	ev_joystick4,
diff --git a/src/d_main.c b/src/d_main.c
index fb81a7d39..3a2ac9ebc 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -15,6 +15,7 @@
 ///        plus functions to parse command line parameters, configure game
 ///        parameters, and call the startup functions.
 
+#include "d_netcmd.h"
 #if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -37,7 +38,9 @@
 #include "d_net.h"
 #include "f_finale.h"
 #include "g_game.h"
+#include "g_input.h"
 #include "hu_stuff.h"
+#include "m_emotes.h"
 #include "i_sound.h"
 #include "i_system.h"
 #include "i_time.h"
@@ -71,6 +74,9 @@
 #include "m_perfstats.h"
 #include "m_random.h"
 #include "k_kart.h"
+#include "k_hud.h"
+
+#include "core/memory.h"
 
 #include "lua_script.h"
 
@@ -84,10 +90,6 @@
 #include "hardware/hw_main.h" // 3D View Rendering
 #endif
 
-#ifdef HW3SOUND
-#include "hardware/hw3sound.h"
-#endif
-
 #ifdef HAVE_DISCORDRPC
 #include "discord.h"
 #endif
@@ -99,7 +101,6 @@ UINT8 window_notinfocus = false;
 // DEMO LOOP
 //
 //static INT32 demosequence;
-static const char *pagename = "MAP1PIC";
 static char *startupwadfiles[MAX_WADFILES];
 static char *startuppwads[MAX_WADFILES];
 
@@ -116,7 +117,6 @@ boolean devparm = false; // started game with -devparm
 boolean singletics = false; // timedemo
 boolean lastdraw = false;
 
-postimg_t postimgtype[MAXSPLITSCREENPLAYERS];
 INT32 postimgparam[MAXSPLITSCREENPLAYERS];
 
 // These variables are only true if
@@ -138,6 +138,7 @@ char srb2home[256] = ".";
 char srb2path[256] = ".";
 boolean usehome = true;
 const char *pandf = "%s" PATHSEP "%s";
+static char addonsdir[MAX_WADPATH];
 
 //
 // EVENT HANDLING
@@ -151,6 +152,10 @@ INT32 eventhead, eventtail;
 
 boolean dedicated = false;
 
+boolean loaded_config = false; // true once config.cfg loaded AND executed
+
+static void D_CleanFile(char **filearray);
+
 //
 // D_PostEvent
 // Called by the I/O functions when input is detected
@@ -168,6 +173,83 @@ UINT8 ctrldown = 0; // 0x1 left, 0x2 right
 UINT8 altdown = 0; // 0x1 left, 0x2 right
 boolean capslock = 0;	// gee i wonder what this does.
 
+static void D_PadMenuScrollInput(UINT8 input)
+{
+	event_t dpadev;
+	memset(&dpadev, 0, sizeof(event_t));
+	dpadev.type = ev_keydown;
+
+	switch (input)
+	{
+		case DPAD_UP:
+			dpadev.data1 = KEY_UPARROW;
+			break;
+		case DPAD_DOWN:
+			dpadev.data1 = KEY_DOWNARROW;
+			break;
+		case DPAD_LEFT:
+			dpadev.data1 = KEY_LEFTARROW;
+			break;
+		case DPAD_RIGHT:
+			dpadev.data1 = KEY_RIGHTARROW;
+			break;
+	}
+
+	D_PostEvent(&dpadev); // put into eventlist
+}
+
+#define SCROLLDELAY 19
+
+// Check if any dpad button is held
+// and pass it to the eventlist
+static void D_GamePadMenuScrollTicker(void)
+{
+	UINT8 i;
+	static UINT8 menuInputDelayTimer = 0;
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (dpadscrollstate[i])
+		{
+			if (menuInputDelayTimer < SCROLLDELAY)
+				menuInputDelayTimer++;
+			else if (menuInputDelayTimer == SCROLLDELAY)
+				D_PadMenuScrollInput(i);
+
+			return;
+		}
+	}
+
+	menuInputDelayTimer = 0;
+}
+#undef SCROLLDELAY
+
+static void D_DeviceLEDTick(void)
+{
+	UINT8 i;
+	static UINT16 color[MAXSPLITSCREENPLAYERS] = {0};
+	static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {0};
+
+	if (numcontrollers == 0)
+	{
+		return;
+	}
+
+	for (i = 0; i <= splitscreen; i++)
+	{
+		if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
+			continue;
+
+		color[i] = G_GetSkinColor(i);
+
+		if (curcolor[i] == color[i]) // dont update if same colour
+			continue;
+
+		G_SetPlayerGamepadIndicatorColor(i, color[i]);
+		curcolor[i] = color[i];
+	}
+}
+
 //
 // D_ProcessEvents
 // Send all the events of the given timestamp down the responder chain
@@ -175,7 +257,6 @@ boolean capslock = 0;	// gee i wonder what this does.
 void D_ProcessEvents(void)
 {
 	event_t *ev;
-
 	boolean eaten;
 
 	for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
@@ -214,8 +295,10 @@ void D_ProcessEvents(void)
 
 		// Demo input:
 		if (demo.playback)
+		{
 			if (M_DemoResponder(ev))
 				continue;	// demo ate the event
+		}
 
 		// console input
 #ifdef HAVE_THREADS
@@ -240,6 +323,110 @@ void D_ProcessEvents(void)
 // draw current display, possibly wiping it from the previous
 //
 
+static void D_Renderview(void)
+{
+	UINT8 i;
+
+	if (automapactive)
+		return;
+
+	R_ApplyLevelInterpolators(rendertimefrac);
+
+	if (rendermode == render_soft)
+	{
+		// if this is display player 1
+		if (cv_homremoval.value)
+		{
+			if (cv_homremoval.value == 1)
+			{
+				// Clear the software screen buffer to remove HOM
+				memset(vid.screens[0], 31, vid.width * vid.height);
+			}
+			else if (cv_homremoval.value == 2)
+			{
+				//'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
+				memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height);
+			}
+		}
+	}
+
+	// Draw over the fourth screen so you don't have to stare at a HOM :V
+	if (splitscreen == 2)
+	{
+		// V_DrawPatchFill, but for the fourth screen only
+		patch_t *pat = W_CachePatchName("SRB2BACK", PU_CACHE);
+		INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
+		INT32 x, y, pw = SHORT(pat->width) * dupz, ph = SHORT(pat->height) * dupz;
+
+		for (x = vid.width>>1; x < vid.width; x += pw)
+		{
+			for (y = vid.height>>1; y < vid.height; y += ph)
+				V_DrawScaledPatch(x, y, V_NOSCALESTART, pat);
+		}
+	}
+
+	for (i = 0; i <= splitscreen; i++)
+	{
+		const boolean issplitscreen = (i > 0);
+
+		if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
+		{
+			viewssnum = i;
+
+			if (!issplitscreen) // Initialize for P1
+			{
+				viewwindowy = viewwindowx = 0;
+				objectsdrawn = 0;
+			}
+
+#ifdef HWRENDER
+			if (rendermode == render_opengl)
+			{
+				HWR_RenderPlayerView();
+				R_RestoreLevelInterpolators();
+				continue;
+			}
+#endif
+			if (issplitscreen) // Splitscreen-specific
+			{
+				switch (i)
+				{
+					case 1:
+						if (splitscreen > 1)
+						{
+							viewwindowx = viewwidth;
+							viewwindowy = 0;
+						}
+						else
+						{
+							viewwindowx = 0;
+							viewwindowy = viewheight;
+						}
+						break;
+					case 2:
+						viewwindowx = 0;
+						viewwindowy = viewheight;
+						break;
+					case 3:
+						viewwindowx = viewwidth;
+						viewwindowy = viewheight;
+					default:
+						break;
+				}
+			}
+
+			R_RenderPlayerView(&players[displayplayers[i]]);
+		}
+
+		if (!issplitscreen)
+			R_ApplyViewMorph();
+
+		V_DoPostProcessor(i, postimgparam[i]);
+	}
+
+	R_RestoreLevelInterpolators();
+}
+
 // wipegamestate can be set to -1 to force a wipe on the next draw
 // added comment : there is a wipe eatch change of the gamestate
 gamestate_t wipegamestate = GS_LEVEL;
@@ -250,7 +437,6 @@ static boolean D_Display(void)
 	boolean forcerefresh = false;
 	static boolean wipe = false;
 	INT32 wipedefindex = 0;
-	UINT8 i;
 
 	if (!dedicated)
 	{
@@ -266,7 +452,11 @@ static boolean D_Display(void)
 
 		if (rendermode == render_soft && !splitscreen)
 		{
+<<<<<<< HEAD
 			R_InterpolateViewRollAngle(rendertimefrac);
+=======
+			R_InterpolateViewRollAngle(rendertimefrac_unpaused);
+>>>>>>> Saturn-Next
 			R_CheckViewMorph();
 		}
 
@@ -284,10 +474,12 @@ static boolean D_Display(void)
 
 	// save the current screen if about to wipe
 	wipe = (gamestate != wipegamestate);
+
 	if (wipe)
 	{
 		// set for all later
 		wipedefindex = gamestate; // wipe_xxx_toblack
+
 		if (gamestate == GS_TITLESCREEN && wipegamestate != GS_INTRO)
 			wipedefindex = wipe_timeattack_toblack;
 		else if (gamestate == GS_INTERMISSION)
@@ -300,26 +492,28 @@ static boolean D_Display(void)
 
 		if (!dedicated)
 		{
-			// Fade to black first
-			if (gamestate != GS_LEVEL // fades to black on its own timing, always
-			 && wipedefs[wipedefindex] != UINT8_MAX)
+			if (gamestate != GS_LEVEL)
 			{
-				F_WipeStartScreen();
-				V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
-				F_WipeEndScreen();
-				F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
-				ranwipe = true;
-			}
+				// Fade to black first
+				if (wipedefs[wipedefindex] != UINT8_MAX) // fades to black on its own timing, always
+				{
+					F_WipeStartScreen();
+					V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
+					F_WipeEndScreen();
+					F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
+					ranwipe = true;
+				}
 
-			if (gamestate != GS_LEVEL && rendermode != render_none)
-			{
-				V_SetPaletteLump("PLAYPAL"); // Reset the palette
-				R_ReInitColormaps(0, LUMPERROR);
+				if (rendermode != render_none)
+				{
+					V_SetPaletteLump("PLAYPAL"); // Reset the palette
+					R_ReInitColormaps(0, LUMPERROR);
+				}
 			}
 
 			F_WipeStartScreen();
 		}
-		else //dedicated servers
+		else // dedicated servers
 		{
 			F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
 			ranwipe = true;
@@ -327,7 +521,7 @@ static boolean D_Display(void)
 		}
 	}
 
-	if (dedicated) //bail out after wipe logic
+	if (dedicated) // bail out after wipe logic
 		return false;
 
 	// do buffered drawing
@@ -352,9 +546,6 @@ static boolean D_Display(void)
 			HU_Drawer();
 			break;
 
-		case GS_TIMEATTACK:
-			break;
-
 		case GS_INTRO:
 			F_IntroDrawer();
 			if (wipegamestate == (gamestate_t)-1)
@@ -394,6 +585,7 @@ static boolean D_Display(void)
 			F_TitleScreenDrawer();
 			if (wipe)
 				wipedefindex = wipe_titlescreen_toblack;
+			HU_DrawSongCredits();
 			break;
 
 		case GS_WAITINGPLAYERS:
@@ -405,6 +597,7 @@ static boolean D_Display(void)
 				HU_Erase();
 				HU_Drawer();
 			}
+		case GS_TIMEATTACK:
 		case GS_DEDICATEDSERVER:
 		case GS_NULL:
 			break;
@@ -413,9 +606,10 @@ static boolean D_Display(void)
 	if (gamestate == GS_LEVEL)
 	{
 		// draw the view directly
-		if (cv_renderview.value && !automapactive)
+		if (cv_renderview.value)
 		{
 			PS_START_TIMING(ps_rendercalltime);
+<<<<<<< HEAD
 
 			R_ApplyLevelInterpolators(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT);
 
@@ -499,6 +693,9 @@ static boolean D_Display(void)
 
 			R_RestoreLevelInterpolators();
 
+=======
+			D_Renderview();
+>>>>>>> Saturn-Next
 			PS_STOP_TIMING(ps_rendercalltime);
 		}
 
@@ -506,9 +703,9 @@ static boolean D_Display(void)
 		{
 			if (rendermode == render_soft)
 			{
-				VID_BlitLinearScreen(screens[0], screens[1], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes);
-				usebuffer = true;
+				VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.rowbytes);
 			}
+
 			lastdraw = false;
 		}
 
@@ -531,21 +728,16 @@ static boolean D_Display(void)
 	// draw pause pic
 	if (paused && cv_showhud.value && !demo.playback)
 	{
-		INT32 py;
-		patch_t *patch;
-		if (automapactive)
-			py = 4;
-		else
-			py = viewwindowy + 4;
-		patch = W_CachePatchName("M_PAUSE", PU_CACHE);
-		V_DrawScaledPatch(viewwindowx + (BASEVIDWIDTH - SHORT(patch->width))/2, py, V_SNAPTOTOP, patch);
+		INT32 py = (automapactive) ? 4 : (viewwindowy + 4);
+		patch_t *patch = W_CachePatchName("M_PAUSE", PU_PATCH);
+		V_DrawScaledPatch(viewwindowx + (BASEVIDWIDTH - patch->width)/2, py, V_SNAPTOTOP, patch);
 	}
 
-	if (demo.rewinding)
+	if (rendermode == render_soft && demo.rewinding)
 		V_DrawFadeScreen(TC_RAINBOW, (leveltime & 0x20) ? SKINCOLOR_PASTEL : SKINCOLOR_MOONSLAM);
 
 	// vid size change is now finished if it was on...
-	vid.recalc = 0;
+	vid.recalc = false;
 
 #ifdef HAVE_THREADS
 	I_lock_mutex(&m_menu_mutex);
@@ -575,6 +767,8 @@ static boolean D_Display(void)
 		}
 	}
 
+	NetUpdate(); // send out any new accumulation
+
 	// It's safe to end the game now.
 	if (G_GetExitGameFlag())
 	{
@@ -627,7 +821,6 @@ static boolean D_Display(void)
 // =========================================================================
 
 tic_t rendergametic;
-static int menuInputDelayTimer = 0;
 
 void D_SRB2Loop(void)
 {
@@ -666,7 +859,7 @@ void D_SRB2Loop(void)
 	COM_ImmedExecute("cls;version");
 
 	if (rendermode == render_soft)
-		V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, (patch_t *)W_CacheLumpNum(W_GetNumForName("KARTKREW"), PU_CACHE), NULL);
+		V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, W_CachePatchNum(W_GetNumForName("KARTKREW"), PU_PATCH_LOWPRIORITY), NULL);
 	I_FinishUpdate(); // page flip or blit buffer
 
 	for (;;)
@@ -676,11 +869,19 @@ void D_SRB2Loop(void)
 		precise_t enterprecise = I_GetPreciseTime();
 		precise_t finishprecise = enterprecise;
 
+<<<<<<< HEAD
 		{
 			// Casting the return value of a function is bad practice (apparently)
 			double budget = round((1.0 / R_GetFramerateCap()) * I_GetPrecisePrecision());
 			capbudget = (precise_t) budget;
 		}
+=======
+		Z_Frame_Reset();
+
+		// Casting the return value of a function is bad practice (apparently)
+		double budget = ((R_GetFramerateCap() == 0) ? 0.0 : round((1.0 / R_GetFramerateCap()) * I_GetPrecisePrecision()));
+		capbudget = (precise_t)budget;
+>>>>>>> Saturn-Next
 
 		boolean ranwipe = false;
 
@@ -709,13 +910,9 @@ void D_SRB2Loop(void)
 				debugload--;
 #endif
 
-		interp = R_UsingFrameInterpolation() && !dedicated;
+		interp = (R_UsingFrameInterpolation() && !dedicated);
 		doDisplay = false;
 
-#ifdef HW3SOUND
-		HW3S_BeginFrameUpdate();
-#endif
-
 		renderisnewtic = (realtics > 0 || singletics);
 
 		refreshdirmenu = 0; // not sure where to put this, here as good as any?
@@ -730,7 +927,7 @@ void D_SRB2Loop(void)
 			// process tics (but maybe not if realtic == 0)
 			TryRunTics(realtics);
 
-			if (lastdraw || singletics || gametic > rendergametic)
+			if (lastdraw || singletics || (gametic > rendergametic))
 			{
 				rendergametic = gametic;
 				rendertimeout = entertic + TICRATE/17;
@@ -740,11 +937,19 @@ void D_SRB2Loop(void)
 			else if (rendertimeout < entertic) // in case the server hang or netsplit
 			{
 				// Lagless camera! Yay!
+<<<<<<< HEAD
 				if (gamestate == GS_LEVEL && netgame)
 				{
 					// Evaluate the chase cam once for every local realtic
 					// This might actually be better suited inside G_Ticker or TryRunTics
 					for (tic_t chasecamtics = 0; chasecamtics < realtics; chasecamtics++)
+=======
+				if (cv_laglesscam.value && gamestate == GS_LEVEL && netgame)
+				{
+					// Evaluate the chase cam once for every local realtic
+					// This might actually be better suited inside G_Ticker or TryRunTics
+					for (tic_t chasecamtics = 0; (chasecamtics < realtics); chasecamtics++)
+>>>>>>> Saturn-Next
 					{
 						P_RunChaseCameras();
 					}
@@ -753,13 +958,30 @@ void D_SRB2Loop(void)
 
 				doDisplay = true;
 			}
+
+			if (!dedicated)
+			{
+				if (menuactive)
+				{
+					D_GamePadMenuScrollTicker();
+				}
+
+				D_DeviceLEDTick();
+			}
 		}
 
 		if (interp)
 		{
-			renderdeltatics = FLOAT_TO_FIXED(deltatics);
+			renderdeltatics = FloatToFixed(deltatics);
 
-			if (!(paused || P_AutoPause()) && deltatics < 1.0 && !hu_stopped)
+			// I looked at the possibility of putting in a float drawer for
+			// perfstats and it's very complicated, so we'll just do this instead...
+			ps_interp_frac.value.p = (precise_t)((FIXED_TO_FLOAT(g_time.timefrac)) * 1000.0f);
+			ps_interp_lag.value.p = (precise_t)((deltasecs) * 1000.0f);
+
+			const boolean lagging = ((deltatics >= 1.0) || hu_stopped);
+
+			if (!(paused || P_AutoPause()) && !lagging)
 			{
 				rendertimefrac = g_time.timefrac;
 			}
@@ -767,16 +989,41 @@ void D_SRB2Loop(void)
 			{
 				rendertimefrac = FRACUNIT;
 			}
+
+			if (!lagging)
+			{
+				rendertimefrac_unpaused = g_time.timefrac;
+			}
+			else
+			{
+				rendertimefrac_unpaused = FRACUNIT;
+			}
 		}
 		else
 		{
 			renderdeltatics = realtics * FRACUNIT;
 			rendertimefrac = FRACUNIT;
+			rendertimefrac_unpaused = FRACUNIT;
 		}
 
-		if ((interp || doDisplay) && !frameskip)
+		if (interp || doDisplay)
 		{
-			ranwipe = D_Display();
+			if (!frameskip)
+			{
+				ranwipe = D_Display();
+			}
+			else if (!dedicated)
+			{
+				// always update console and hud
+				// otherwise it may take minutes to open it
+				CON_Drawer();
+
+				if (gamestate == GS_LEVEL)
+				{
+					ST_Drawer();
+					HU_Drawer();
+				}
+			}
 		}
 
 		// Only take screenshots after drawing.
@@ -788,60 +1035,20 @@ void D_SRB2Loop(void)
 		// consoleplayer -> displayplayers (hear sounds from viewpoint)
 		S_UpdateSounds(); // move positional sounds
 
-#ifdef HW3SOUND
-		HW3S_EndFrameUpdate();
-#endif
-
-		LUA_Step();
+		//LUA_Step();
 
 #ifdef HAVE_DISCORDRPC
-		if (! dedicated)
+		if (!dedicated && renderisnewtic)
 		{
 			Discord_RunCallbacks();
 		}
 #endif
 
-		// this is absolutely awful and i hate it lmao
-		if (menuactive && (DPADUPSCROLL || DPADDOWNSCROLL || DPADLEFTSCROLL || DPADRIGHTSCROLL))
-		{
-			event_t myev;
-			myev.type = ev_keydown;
-
-			if (renderisnewtic)
-			{
-				menuInputDelayTimer++;
-
-				if (menuInputDelayTimer >= 19) // TICRATE * ( (k+2) (1 - [wz + h + j - q]^2 - [(gk + 2g + k + 1)(h + j) + h - z]^2 - [16(k + 1)^3(k + 2)(n + 1)^2 + 1 - f^2]^2 calculated by my butt
-				{
-					if (DPADUPSCROLL)
-					{
-						myev.data1 = KEY_UPARROW;
-						M_Responder(&myev);
-					}
-					else if (DPADDOWNSCROLL)
-					{
-						myev.data1 = KEY_DOWNARROW;
-						M_Responder(&myev);
-					}
-					else if (DPADLEFTSCROLL)
-					{
-						myev.data1 = KEY_LEFTARROW;
-						M_Responder(&myev);
-					}
-					else if (DPADRIGHTSCROLL)
-					{
-						myev.data1 = KEY_RIGHTARROW;
-						M_Responder(&myev);
-					}
-				}
-			}
-		}
-		else
-			menuInputDelayTimer = 0;
-
 		// Fully completed frame made.
 		finishprecise = I_GetPreciseTime();
 
+		// Use the time before sleep for frameskip calculations:
+		// post-sleep time is literally being intentionally wasted
 		deltasecs = (double)((INT64)(finishprecise - enterprecise)) / I_GetPrecisePrecision();
 		deltatics = deltasecs * NEWTICRATE;
 
@@ -853,7 +1060,7 @@ void D_SRB2Loop(void)
 		//
 		// Wipes run an inner loop and artificially increase
 		// the measured time.
-		if (!ranwipe && frameskip < 3 && deltatics > 1.0)
+		if (!ranwipe && (frameskip < 3) && (deltatics > 1.0))
 		{
 			frameskip++;
 		}
@@ -869,13 +1076,15 @@ void D_SRB2Loop(void)
 			// in the case of "match refresh rate" + vsync, don't sleep at all
 			const boolean vsync_with_match_refresh = cv_vidwait.value && cv_fpscap.value == 0;
 
-			if (elapsed > 0 && (INT64)capbudget > elapsed && !vsync_with_match_refresh)
+			if ((elapsed > 0) && ((INT64)capbudget > elapsed) && !vsync_with_match_refresh)
 			{
-				I_SleepDuration(capbudget - (finishprecise - enterprecise));
+				I_SleepDuration(capbudget - elapsed);
 			}
 		}
 		// Capture the time once more to get the real delta time.
 		finishprecise = I_GetPreciseTime();
+		deltasecs = (double)((INT64)(finishprecise - enterprecise)) / I_GetPrecisePrecision();
+		deltatics = deltasecs * NEWTICRATE;
 	}
 }
 
@@ -889,6 +1098,7 @@ void D_SRB2Loop(void)
 void D_StartTitle(void)
 {
 	INT32 i;
+
 	if (netgame)
 	{
 		if (gametype == GT_RACE) // SRB2kart
@@ -910,6 +1120,8 @@ void D_StartTitle(void)
 		return;
 	}
 
+	M_ClearMenus(true);
+
 	// okay, stop now
 	// (otherwise the game still thinks we're playing!)
 	SV_StopServer();
@@ -938,11 +1150,10 @@ void D_StartTitle(void)
 	//demosequence = -1;
 	gametype = GT_RACE; // SRB2kart
 	paused = false;
-	F_StartTitleScreen();
 
-	// Reset the palette -- SRB2Kart: actually never mind let's do this in the middle of every fade
-	/*if (rendermode != render_none)
-		V_SetPaletteLump("PLAYPAL");*/
+	S_ResetKeepAndSpecialMus(); // just in case
+
+	F_StartTitleScreen();
 }
 
 //
@@ -1023,18 +1234,21 @@ static void D_AutoloadFile(const char *file, char **filearray)
 		COM_BufAddText(va("exec %s\n", newfile));
 }
 
-static char *strremove(char *str, const char *sub) {
-    char *p, *q, *r;
-    if (*sub && (q = r = strstr(str, sub)) != NULL) {
-        size_t len = strlen(sub);
-        while ((r = strstr(p = r + len, sub)) != NULL) {
-            while (p < r)
-                *q++ = *p++;
-        }
-        while ((*q++ = *p++) != '\0')
-            continue;
-    }
-    return str;
+static char *strremove(char *str, const char *sub)
+{
+	char *p, *q, *r;
+	if (*sub && (q = r = strstr(str, sub)) != NULL)
+	{
+		size_t len = strlen(sub);
+		while ((r = strstr(p = r + len, sub)) != NULL)
+		{
+			while (p < r)
+				*q++ = *p++;
+		}
+		while ((*q++ = *p++) != '\0')
+			continue;
+	}
+	return str;
 }
 
 // FIND THEM
@@ -1044,8 +1258,7 @@ static void D_FindAddonsToAutoload(void)
 	const char *autoloadpath;
 	boolean postload;
 
-	INT32 i, len;
-	boolean hasprefix = false;
+	INT32 i;
 	char wadsToAutoload[256] = "";
 
 	// does it exist tho
@@ -1054,7 +1267,10 @@ static void D_FindAddonsToAutoload(void)
 
 	// If the file is found, run our shit
 	if (!autoloadconfigfile) // nope outta here
+	{
+		wasautoloaded = postautoloaded = true; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
 		return;
+	}
 
 	while (fgets(wadsToAutoload, sizeof wadsToAutoload, autoloadconfigfile) != NULL)
 	{
@@ -1064,7 +1280,8 @@ static void D_FindAddonsToAutoload(void)
 			|| (wadsToAutoload[0] == '#'))
 			continue;
 		// this marks it so that it loads after loading server addons
-		else if (fastncmp(wadsToAutoload, "postload ", 9)) {
+		else if (fastncmp(wadsToAutoload, "postload ", 9))
+		{
 			strremove(wadsToAutoload, "postload ");
 			postload = true;
 		}
@@ -1076,34 +1293,10 @@ static void D_FindAddonsToAutoload(void)
 				wadsToAutoload[i] = '\0';
 		}
 
-		len = strlen(wadsToAutoload);
-		hasprefix = false;
-
-		for (i = 0; i < len; ++i)
+		if (!postload && W_CheckPostLoadList(wadsToAutoload))
 		{
-			if (wadsToAutoload[i] == '_')
-			{
-				hasprefix = true;
-				break;
-			}
-		}
-
-		// Lets just hope no one adds bonuschars in autoload
-		if (hasprefix)
-		{
-			// We searching for c in prefix, which stands for "character" and doesn't work well with
-			// autoload atm, only fine for postload
-			for (i = 0; i < len; ++i)
-			{
-				if (wadsToAutoload[i] == '_') break; // Prefix end
-
-				if (wadsToAutoload[i] == 'c' || wadsToAutoload[i] == 'C')
-				{
-					CONS_Alert(CONS_WARNING, "forcing postload for %s as local skin\n", wadsToAutoload);
-					postload = true;
-					break; // Found it
-				}
-			}
+			CONS_Printf("forcing postload for file %s\n", wadsToAutoload);
+			postload = true;
 		}
 
 		// LOAD IT
@@ -1121,6 +1314,7 @@ static void D_FindAddonsToAutoload(void)
 	fclose(autoloadconfigfile);
 }
 
+<<<<<<< HEAD
 void D_AddAutoloadFiles(void)
 {
 	if (wasautoloaded && postautoloaded)
@@ -1148,6 +1342,35 @@ void D_AddAutoloadFiles(void)
 }
 
 void D_CleanFile(char **filearray)
+=======
+static void D_AddAutoloadFiles(void)
+{
+	if (wasautoloaded)
+		return;
+
+	CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
+	if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
+		CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
+	D_CleanFile(autoloadwadfiles);
+
+	wasautoloaded = true;
+}
+
+void D_AddPostloadFiles(void)
+{
+	if (postautoloaded || !netgame)
+		return;
+
+	CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
+	if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
+		CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
+	D_CleanFile(autoloadwadfilespost);
+
+	postautoloaded = true;
+}
+
+static void D_CleanFile(char **filearray)
+>>>>>>> Saturn-Next
 {
 	size_t pnumwadfiles;
 	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
@@ -1163,44 +1386,49 @@ void D_CleanFile(char **filearray)
 
 static boolean AddIWAD(void)
 {
-	char * path = va(pandf,srb2path,"srb2.srb");
+	char * path = va(pandf, srb2path, "srb2.srb");
 
 	if (FIL_ReadFileOK(path))
 	{
 		D_AddFile(path, startupwadfiles);
 		return true;
 	}
-	else
-	{
-		return false;
-	}
+
+	return false;
 }
 
 // extra graphic patches for saturn specific thingies
-boolean found_extra_kart;
-boolean found_extra2_kart;
-boolean found_extra3_kart;
+boolean found_extra_kart  = false;
+boolean found_extra2_kart = false;
+boolean found_extra3_kart = false;
 
-boolean xtra_speedo; // extra speedometer check
-boolean xtra_speedo_clr; // extra speedometer colour check
-boolean xtra_speedo3; // 80x 11 extra speedometer check
-boolean xtra_speedo_clr3; // 80x 11 extra speedometer colour check
-boolean achi_speedo; // achiiro speedometer check
-boolean achi_speedo_clr; // extra speedometer colour check
-boolean clr_hud; // colour hud check
-boolean big_lap; // bigger lap counter
-boolean big_lap_color; // bigger lap counter but colour
-boolean kartzspeedo; // kartZ speedo
-boolean statdp; // stat display for extended player setup
-boolean nametaggfx; // Nametag stuffs
-boolean driftgaugegfx;
+boolean xtra_speedo       = false; // extra speedometer check
+boolean xtra_speedo_clr   = false; // extra speedometer colour check
+boolean xtra_speedo3      = false; // 80x 11 extra speedometer check
+boolean xtra_speedo_clr3  = false; // 80x 11 extra speedometer colour check
+boolean achi_speedo       = false; // achiiro speedometer check
+boolean achi_speedo_clr   = false; // extra speedometer colour check
+boolean dial_speedo       = false; // dial speedometer check
+boolean dial_speedo_clr   = false; // dial speedometer colour check
+boolean kartz_speedo      = false; // kartZ speedo
+boolean kartz_speedo_smol = false; // kartZ speedo but smol
+
+boolean clr_hud           = false; // colour hud check
+boolean driftgaugegfx_clr = false; // driftgauge colour check
+boolean big_lap           = false; // bigger lap counter
+boolean big_lap_color     = false; // bigger lap counter but colour
+boolean statdp            = false; // stat display for extended player setup
+boolean nametaggfx        = false; // Nametag stuffs
+boolean driftgaugegfx     = false; // Driftgauge stuffs
+boolean multiitem_icon    = false; // Extra icons for Sneakers, Banana and Jawz
+boolean joystickicon      = false; // Extra icons for the joystick input display
+boolean minidoticon       = false; // Dot graphic for minimap player angle display
+boolean minilighticon     = false; // mkwii-style minimap headlight
+//
 
 static void IdentifyVersion(void)
 {
 	const char *srb2waddir = NULL;
-	found_extra_kart = false;
-	found_extra2_kart = false;
-	found_extra3_kart = false;
 
 #if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
 	// change to the directory where 'srb2.srb' is found
@@ -1210,11 +1438,11 @@ static void IdentifyVersion(void)
 	// get the current directory (possible problem on NT with "." as current dir)
 	if (srb2waddir)
 	{
-		strlcpy(srb2path,srb2waddir,sizeof (srb2path));
+		strlcpy(srb2path, srb2waddir, sizeof(srb2path));
 	}
 	else
 	{
-		if (getcwd(srb2path, 256) != NULL)
+		if (getcwd(srb2path, sizeof(srb2path)))
 			srb2waddir = srb2path;
 		else
 		{
@@ -1223,7 +1451,7 @@ static void IdentifyVersion(void)
 	}
 
 	// Load the IWAD
-	if (! AddIWAD())
+	if (!AddIWAD())
 	{
 		I_Error("SRB2.SRB not found! Expected in %s\n", srb2waddir);
 	}
@@ -1248,18 +1476,25 @@ static void IdentifyVersion(void)
 	D_AddFile(va(pandf,srb2waddir,"patch.kart"), startupwadfiles);
 #endif
 	// completely optional
-	if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra.kart"))) {
+	if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra.kart")))
+	{
 		D_AddFile(va(pandf,srb2waddir,"extra.kart"), startupwadfiles);
 		found_extra_kart = true;
 	}
 
 	// completely optional 2: Back with a vengence
-	if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra2.kart"))) {
+	if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra2.kart")))
+	{
 		D_AddFile(va(pandf,srb2waddir,"extra2.kart"), startupwadfiles);
 		found_extra2_kart = true;
 	}
 
+<<<<<<< HEAD
 	if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra3.kart"))) {
+=======
+	if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra3.kart")))
+	{
+>>>>>>> Saturn-Next
 		D_AddFile(va(pandf,srb2waddir,"extra3.kart"), startupwadfiles);
 		found_extra3_kart = true;
 	}
@@ -1307,6 +1542,197 @@ static inline void D_MakeTitleString(char *s)
 	strcpy(s, temp);
 }
 
+static void D_CheckSaturnExtraFiles(void)
+{
+	// Possible value that changes depending on whether required files for speedometer are found or not
+	CV_PossibleValue_t speedo_cons_temp[NUMSPEEDOSTUFF] = {{1, "Default"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}};
+	CV_PossibleValue_t driftgaugestyle_cons_temp[NUMDGAUGESTUFF] = {{1, "Default"}, {2, "Small"}, {3, "Big Numbers"}, {4, "Numbers Only"}, {0, NULL}, {0, NULL}};
+	CV_PossibleValue_t inputdisplay_cons_temp[NUMINPUTDISPLAYSTUFF] = {{0, "Off"}, {1, "Wheel"}, {2, "Stick"}, {0, NULL}, {0, NULL}};
+	CV_PossibleValue_t minimapdot_cons_temp[NUMMINIMAPDOTSTUFF] = {{0, "Off"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}};
+
+	unsigned last_speedo_i = 0;
+	unsigned last_driftgauge_i = 3;
+	unsigned last_inputdisplay_i = 2;
+	unsigned last_minimapdot_i = 0;
+#define PUSHCONS(cons, i, id, name) { ++i; cons[i].value = id; cons[i].strvalue = name; }
+
+	// found the funny, add it in!
+	if (found_extra_kart)
+	{
+		mainwads++;
+
+		// now check for extra speedometer stuff
+		if (W_CheckMultipleLumps("SP_SMSTC", "K_TRNULL", "SP_MKMH", "SP_MMPH", "SP_MFRAC", "SP_MPERC", NULL))
+		{
+			xtra_speedo = true;
+			PUSHCONS(speedo_cons_temp, last_speedo_i, 2, "Small");
+		}
+
+		// now check for achii speedometer stuff
+		if (W_CheckMultipleLumps("SP_AMSTC", "K_TRNULL", "SP_AKMH", "SP_AMPH", "SP_AFRAC", "SP_APERC", NULL))
+		{
+			achi_speedo = true;
+			PUSHCONS(speedo_cons_temp, last_speedo_i, 3, "Achii");
+		}
+
+		// now check for dial speedometer stuff
+		if (W_CheckMultipleLumps("K_DSPBS1", "K_DSPBS2", "K_DSDIAL",
+			"K_TRNULL", "SP_DKMH", "SP_DMPH", "SP_DFRAC", "SP_DPERC",
+			"K_DSPNM0", "K_DSPNM1", "K_DSPNM2", "K_DSPNM3", "K_DSPNM4",
+			"K_DSPNM5", "K_DSPNM6", "K_DSPNM7", "K_DSPNM8", "K_DSPNM9",
+			"RANKFIN", NULL))
+		{
+			dial_speedo = true;
+			PUSHCONS(speedo_cons_temp, last_speedo_i, 4, "Dial");
+		}
+
+		// check for bigger lap count
+		if (W_CheckMultipleLumps("K_STLAPB", "K_STLA2B", NULL))
+		{
+			big_lap = true;
+		}
+
+		// kartzspeedo
+		if (W_CheckMultipleLumps("K_KZSP1", "K_KZSP2", "K_KZSP3", "K_KZSP4", "K_KZSP5",
+			"K_KZSP6", "K_KZSP7", "K_KZSP8", "K_KZSP9", "K_KZSP10", "K_KZSP11", "K_KZSP12",
+			"K_KZSP13", "K_KZSP14", "K_KZSP15", "K_KZSP16", "K_KZSP17", "K_KZSP18", "K_KZSP19",
+			"K_KZSP20", "K_KZSP21", "K_KZSP22", "K_KZSP23", "K_KZSP24", "K_KZSP25", NULL))
+		{
+			kartz_speedo = true;
+			PUSHCONS(speedo_cons_temp, last_speedo_i, 5, "P-Meter");
+		}
+
+		if (W_CheckMultipleLumps("K_KZSS1", "K_KZSS2", "K_KZSS3", "K_KZSS4", "K_KZSS5",
+			"K_KZSS6", "K_KZSS7", "K_KZSS8", "K_KZSS9", "K_KZSS10", "K_KZSS11", "K_KZSS12",
+			"K_KZSS13", "K_KZSS14", "K_KZSS15", "K_KZSS16", "K_KZSS17", "K_KZSS18", "K_KZSS19",
+			"K_KZSS20", "K_KZSS21", "K_KZSS22", "K_KZSS23", "K_KZSS24", "K_KZSS25", NULL))
+		{
+			kartz_speedo_smol = true;
+			PUSHCONS(speedo_cons_temp, last_speedo_i, 6, "P-Meter Small");
+		}
+
+		// stat display for extended player setup
+		if (W_CheckMultipleLumps("K_STATNB", "K_STATN1", "K_STATN2",
+			"K_STATN3", "K_STATN4", "K_STATN5", "K_STATN6", NULL))
+		{
+			statdp = true;
+		}
+
+		// Nametag stuffs
+		if (W_CheckMultipleLumps("NTLINE", "NTLINEV", "NTSP", "NTWH", NULL))
+		{
+			nametaggfx = true;
+		}
+
+		// driftgauge
+		if (W_CheckMultipleLumps("K_DGAU","K_DGSU", NULL))
+		{
+			driftgaugegfx = true;
+		}
+
+		// extra item icons
+		if (W_CheckMultipleLumps("K_ITSHO2", "K_ITSHO3", "K_ITBAN2", "K_ITBAN3", "K_ITBAN4", "K_ITJAW2", NULL))
+		{
+			multiitem_icon = true;
+		}
+
+		// extra round joystick inputdisplay sprites
+		if (W_CheckMultipleLumps("JOYBCK", "JOYKNB", "JOYSHD", NULL))
+		{
+			joystickicon = true;
+			PUSHCONS(inputdisplay_cons_temp, last_inputdisplay_i, 3, "StickGFX");
+		}
+
+		if (W_LumpExists("MMAPDOT"))
+		{
+			minidoticon = true;
+			PUSHCONS(minimapdot_cons_temp, last_minimapdot_i, 1, "Dot");
+		}
+
+		if (W_LumpExists("MMAPHDLT"))
+		{
+			minilighticon = true;
+			PUSHCONS(minimapdot_cons_temp, last_minimapdot_i, 2, "Headlight");
+		}
+	}
+
+	// now check for colour hud stuff
+	if (found_extra2_kart)
+	{
+		mainwads++;
+
+		// kart vanilla hud patches but colourizable
+		if (W_CheckMultipleLumps("K_SCTIME", "K_SCTIMW", "K_SCLAPS", "K_SCLAPW","K_SCBALN", "K_SCBALW",
+			"K_SCKARM", "K_SCTOUT", "K_ISMULC", "K_ITMULC", "K_ITBC", "K_ITBCD", "K_ISBC", "K_ISBCD", NULL))
+		{
+			clr_hud = true;
+		}
+
+		// extra speedo but colour
+		if (W_LumpExists("SC_SMSTC"))
+		{
+			xtra_speedo_clr = true;
+		}
+
+		// achii speedo but colour
+		if (W_CheckMultipleLumps("SC_AMSTC", "K_TRNULL", "SC_AKMH", "SC_AMPH", "SC_AFRAC", "SC_APERC", NULL))
+		{
+			achi_speedo_clr = true;
+		}
+
+		// dial speedo but colour
+		if (W_CheckMultipleLumps("K_DSPBC1", "K_DSPBC2", "K_DSDIAL",
+			"K_TRNULL", "SC_DKMH", "SC_DMPH", "SC_DFRAC", "SC_DPERC",
+			"K_DSPNC0", "K_DSPNC1", "K_DSPNC2", "K_DSPNC3", "K_DSPNC4",
+			"K_DSPNC5", "K_DSPNC6", "K_DSPNC7", "K_DSPNC8", "K_DSPNC9",
+			"RANKFIN", NULL))
+		{
+			dial_speedo_clr = true;
+		}
+
+		// driftgauge but colour
+		if (W_CheckMultipleLumps("K_DCAU","K_DCSU", NULL))
+		{
+			driftgaugegfx_clr = true;
+		}
+
+		// check for bigger lap count but color** its color bitch
+		if (W_CheckMultipleLumps("K_SCLAPB", "K_SCLA2B", NULL))
+		{
+			big_lap_color = true;
+		}
+	}
+
+	// can be used for custom hud stuff
+	// currently used for the v1 beta hud
+	if (found_extra3_kart)
+	{
+		mainwads++;
+
+		// 80x11 speedometer crap
+		if (W_LumpExists("SP_SM3TC"))
+		{
+			xtra_speedo3 = true;
+			PUSHCONS(speedo_cons_temp, last_speedo_i, 7, "Extra");
+			PUSHCONS(driftgaugestyle_cons_temp, last_driftgauge_i, 5, "Extra");
+		}
+
+		// 80x11 speedometer crap but colour
+		if (W_LumpExists("SC_SM3TC"))
+		{
+			xtra_speedo_clr3 = true;
+		}
+	}
+
+#undef PUSHCONS
+	memcpy(speedo_cons_t, speedo_cons_temp, sizeof(speedo_cons_t));
+	memcpy(driftgaugestyle_cons_t, driftgaugestyle_cons_temp, sizeof(driftgaugestyle_cons_t));
+	memcpy(inputdisplay_cons_t, inputdisplay_cons_temp, sizeof(inputdisplay_cons_t));
+	memcpy(minimapdot_cons_t, minimapdot_cons_temp, sizeof(minimapdot_cons_t));
+}
+
+#include <locale.h>
+
 //
 // D_SRB2Main
 //
@@ -1342,11 +1768,6 @@ void D_SRB2Main(void)
 		I_OutputMsg("setvbuf didnt work\n");
 #endif
 
-#ifdef GETTEXT
-	// initialise locale code
-	M_StartupLocale();
-#endif
-
 	// get parameters from a response file (eg: srb2 @parms.txt)
 	M_FindResponseFile();
 
@@ -1370,7 +1791,9 @@ void D_SRB2Main(void)
 #endif
 
 	// for dedicated server
+#if !defined (DEDICATED)
 	dedicated = M_CheckParm("-dedicated") != 0;
+#endif
 
 	strcpy(title, "SRB2Kart");
 	strcpy(srb2, "SRB2Kart");
@@ -1419,8 +1842,6 @@ void D_SRB2Main(void)
 
 			// can't use sprintf since there is %u in savegamename
 			strcatbf(savegamename, srb2home, PATHSEP);
-
-			I_mkdir(srb2home, 0700);
 #else
 			snprintf(srb2home, sizeof srb2home, "%s", userhome);
 			snprintf(downloaddir, sizeof downloaddir, "%s", userhome);
@@ -1457,6 +1878,10 @@ void D_SRB2Main(void)
 		}
 	}
 
+	// Create addons dir
+	snprintf(addonsdir, sizeof addonsdir, "%s%s%s", srb2home, PATHSEP, "addons");
+	I_mkdir(addonsdir, 0755);
+
 	D_SetupProtocol();
 
 	// seed M_Random because it is necessary; seed P_Random for scripts that
@@ -1506,6 +1931,7 @@ void D_SRB2Main(void)
 
 	CONS_Printf("I_InitializeTime()...\n");
 	I_InitializeTime();
+	setlocale(LC_TIME, "");
 
 	// Make backups of some SOCcable tables.
 	P_BackupTables();
@@ -1557,11 +1983,9 @@ void D_SRB2Main(void)
 
 #endif //ifndef DEVELOP
 
-	// Possible value that changes depending on whether required files for speedometer are found or not
-	CV_PossibleValue_t speedo_cons_temp[NUMSPEEDOSTUFF] = {{1, "Default"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}};
-	unsigned last_speedo_i = 0;
-#define PUSHSPEEDO(id, name) { ++last_speedo_i; speedo_cons_temp[last_speedo_i].value = id; speedo_cons_temp[last_speedo_i].strvalue = name; }
+	D_CheckSaturnExtraFiles(); // check all the saturn stuff :3
 
+<<<<<<< HEAD
 	if (found_extra_kart || found_extra2_kart || found_extra3_kart) // found the funny, add it in!
 	{
 		// HAYA: These are seperated for a reason lmao
@@ -1643,6 +2067,11 @@ void D_SRB2Main(void)
 
 #undef PUSHSPEEDO
 	memcpy(speedo_cons_t, speedo_cons_temp, sizeof(speedo_cons_t));
+=======
+	// Do it before P_InitMapData because PNG patch
+	// conversion sometimes needs the palette
+	V_ReloadPalette();
+>>>>>>> Saturn-Next
 
 	//
 	// search for maps
@@ -1654,7 +2083,7 @@ void D_SRB2Main(void)
 		{
 			name = lumpinfo->name;
 
-			if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers
+			if (memcmp(name, "MAP", 3) == 0) // Ignore the headers
 			{
 				INT16 num;
 				if (name[5] != '\0')
@@ -1684,7 +2113,7 @@ void D_SRB2Main(void)
 		{
 			name = lumpinfo->name;
 
-			if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers
+			if (memcmp(name, "MAP", 3) == 0) // Ignore the headers
 			{
 				INT16 num;
 				if (name[5] != '\0')
@@ -1753,6 +2182,10 @@ void D_SRB2Main(void)
 
 	savedata.lives = 0; // flag this as not-used
 
+	// make sure I_Quit() will write back the correct config
+	// (do not write back the config if it crash before)
+	loaded_config = true; // so palettechange doesent get called 500 times at startup lol
+
 	//------------------------------------------------ COMMAND LINE PARAMS
 
 	// this must be done after loading gamedata,
@@ -1832,11 +2265,17 @@ void D_SRB2Main(void)
 	}
 
 	S_InitMusicDefs();
-	S_InitMTDefs();
+
+	M_InitEmotes();
 
 	CONS_Printf("ST_Init(): Init status bar.\n");
 	ST_Init();
 
+<<<<<<< HEAD
+=======
+	D_AddAutoloadFiles();
+
+>>>>>>> Saturn-Next
 	// Set up splitscreen players before joining!
 	if (!dedicated && (M_CheckParm("-splitscreen") && M_IsNextParm()))
 	{
@@ -2038,7 +2477,6 @@ void D_SRB2Main(void)
 
 	if (dedicated && server)
 	{
-		pagename = "TITLESKY";
 		levelstarttic = gametic;
 		G_SetGamestate(GS_LEVEL);
 		if (!P_SetupLevel(false, false))
@@ -2046,7 +2484,7 @@ void D_SRB2Main(void)
 	}
 
 #ifdef HAVE_DISCORDRPC
-	if (! dedicated)
+	if (!dedicated)
 	{
 		DRPC_Init();
 	}
diff --git a/src/d_main.h b/src/d_main.h
index d4d3e6e95..206e4c2ad 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -14,42 +14,64 @@
 #ifndef __D_MAIN__
 #define __D_MAIN__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "d_event.h"
 #include "w_wad.h"   // for MAX_WADFILES
 
-// make sure not to write back the config until it's been correctly loaded
 extern tic_t rendergametic;
 
+// make sure not to write back the config until it's been correctly loaded
+extern boolean loaded_config;
+
 extern char srb2home[256]; //Alam: My Home
 extern boolean usehome; //Alam: which path?
 extern const char *pandf; //Alam: how to path?
 extern char srb2path[256]; //Alam: SRB2's Home
 
+// extra graphic patches for saturn specific thingies
 extern boolean found_extra_kart; // for use in k_kart.c
 extern boolean found_extra2_kart; // for use in k_kart.c
 extern boolean found_extra3_kart; // for use in k_kart.c
 
-extern boolean xtra_speedo; // extra speedometer check
-extern boolean xtra_speedo_clr; // extra speedometer colour check
-extern boolean xtra_speedo3; // 80x11 extra speedometer check
-extern boolean xtra_speedo_clr3; // 80x11 extra speedometer colour check
-extern boolean achi_speedo; // achiiro speedometer check
-extern boolean achi_speedo_clr; // extra speedometer colour check
-extern boolean clr_hud; // colour hud check
-extern boolean big_lap; // bigger lap counter
-extern boolean big_lap_color; // bigger lap counter but colour
-extern boolean kartzspeedo; // kartZ speedo
-extern boolean statdp; // stat display for extended player setup
-extern boolean nametaggfx; // Nametag stuffs
-extern boolean driftgaugegfx;
+extern boolean xtra_speedo;       // extra speedometer check
+extern boolean xtra_speedo_clr;   // extra speedometer colour check
+extern boolean xtra_speedo3;      // 80x11 extra speedometer check
+extern boolean xtra_speedo_clr3;  // 80x11 extra speedometer colour check
+extern boolean achi_speedo;       // achiiro speedometer check
+extern boolean achi_speedo_clr;   // extra speedometer colour check
+extern boolean dial_speedo;       // dial speedometer check
+extern boolean dial_speedo_clr;   // dial speedometer colour check
+extern boolean kartz_speedo;      // kartZ speedo
+extern boolean kartz_speedo_smol; // kartZ speedo but smol
 
+<<<<<<< HEAD
 void D_AddAutoloadFiles(void);
+=======
+extern boolean clr_hud;           // colour hud check
+extern boolean driftgaugegfx_clr; // driftgauge colour check
+extern boolean big_lap;           // bigger lap counter
+extern boolean big_lap_color;     // bigger lap counter but colour
+extern boolean statdp;            // stat display for extended player setup
+extern boolean nametaggfx;        // Nametag stuffs
+extern boolean driftgaugegfx;     // Driftgauge stuffs
+extern boolean multiitem_icon;    // Extra icons for Sneakers, Banana and Jawz
+extern boolean joystickicon;      // Extra icons for the joystick input display
+extern boolean minidoticon;       // Dot icon for minimap player angle display
+extern boolean minilighticon;     // mkwii-style minimap headlight
+//
+>>>>>>> Saturn-Next
 
+// autoload stuff
 extern boolean autoloading;
 extern boolean autoloaded;
 extern boolean postautoloaded;
 extern boolean wasautoloaded;
 
+void D_AddPostloadFiles(void);
+
 extern char *autoloadwadfilespost[MAX_WADFILES];
 extern char *autoloadwadfiles[MAX_WADFILES];
 
@@ -68,8 +90,6 @@ void D_PostEvent(const event_t *ev);
 
 void D_ProcessEvents(void);
 
-void D_CleanFile(char **filearray);
-
 const char *D_Home(void);
 
 //
@@ -77,4 +97,8 @@ const char *D_Home(void);
 //
 void D_StartTitle(void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif //__D_MAIN__
diff --git a/src/d_net.c b/src/d_net.c
index 312e90caa..3a75a29a4 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -48,12 +48,6 @@ tic_t connectiontimeout = (10*TICRATE);
 
 /// \brief network packet
 doomcom_t *doomcom = NULL;
-/// \brief network packet data, points inside doomcom
-doomdata_t *netbuffer = NULL;
-/// \brief hole punching packet, also points inside doomcom
-#ifdef HOLEPUNCH
-holepunch_t *holepunchpacket = NULL;
-#endif
 
 #ifdef DEBUGFILE
 FILE *debugfile = NULL; // put some net info in a file during the game
@@ -69,8 +63,6 @@ INT16 hardware_MAXPACKETLENGTH;
 
 boolean (*I_NetGet)(void) = NULL;
 void (*I_NetSend)(void) = NULL;
-boolean (*I_NetCanSend)(void) = NULL;
-boolean (*I_NetCanGet)(void) = NULL;
 void (*I_NetCloseSocket)(void) = NULL;
 void (*I_NetFreeNodenum)(INT32 nodenum) = NULL;
 SINT8 (*I_NetMakeNodewPort)(const char *address, const char* port) = NULL;
@@ -111,20 +103,24 @@ boolean Net_GetNetStat(void)
 {
 	const tic_t t = I_GetTime();
 	static INT64 oldsendbyte = 0;
+
 	if (statstarttic+STATLENGTH <= t)
 	{
 		const tic_t df = t-statstarttic;
 		const INT64 newsendbyte = sendbytes - oldsendbyte;
 		sendbps = (INT32)(newsendbyte*TICRATE)/df;
 		getbps = (getbytes*TICRATE)/df;
+
 		if (sendackpacket)
 			lostpercent = 100.0f*(float)retransmit/(float)sendackpacket;
 		else
 			lostpercent = 0.0f;
+
 		if (getackpacket)
 			duppercent = 100.0f*(float)duppacket/(float)getackpacket;
 		else
 			duppercent = 0.0f;
+
 		if (ticruned)
 			gamelostpercent = 100.0f*(float)ticmiss/(float)ticruned;
 		else
@@ -207,13 +203,9 @@ static node_t nodes[MAXNETNODES];
 //         0 if a = n (mod 256)
 //        >0 if a > b (mod 256)
 // mnemonic: to use it compare to 0: cmpack(a,b)<0 is "a < b" ...
-FUNCMATH static INT32 cmpack(UINT8 a, UINT8 b)
+FUNCMATH static inline INT32 cmpack(UINT8 a, UINT8 b)
 {
-	register INT32 d = a - b;
-
-	if (d >= 127 || d < -128)
-		return -d;
-	return d;
+	return (SINT8)(a - b);
 }
 
 /** Sets freeack to a free acknum and copies the netbuffer in the ackpak table
@@ -222,11 +214,13 @@ FUNCMATH static INT32 cmpack(UINT8 a, UINT8 b)
   * \param lowtimer ???
   * \return True if a free acknum was found
   */
-static boolean GetFreeAcknum(UINT8 *freeack, boolean lowtimer)
+static boolean GetFreeAcknum(UINT8 *freeack)
 {
 	node_t *node = &nodes[doomcom->remotenode];
 	INT32 i, numfreeslot = 0;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	if (cmpack((UINT8)((node->remotefirstack + MAXACKTOSEND) % 256), node->nextacknum) < 0)
 	{
 		DEBFILE(va("too fast %d %d\n",node->remotefirstack,node->nextacknum));
@@ -234,6 +228,7 @@ static boolean GetFreeAcknum(UINT8 *freeack, boolean lowtimer)
 	}
 
 	for (i = 0; i < MAXACKPACKETS; i++)
+	{
 		if (!ackpak[i].acknum)
 		{
 			// For low priority packets, make sure to let freeslots so urgent packets can be sent
@@ -251,17 +246,8 @@ static boolean GetFreeAcknum(UINT8 *freeack, boolean lowtimer)
 				node->nextacknum++;
 			ackpak[i].destinationnode = (UINT8)(node - nodes);
 			ackpak[i].length = doomcom->datalength;
-			if (lowtimer)
-			{
-				// Lowtime means can't be sent now so try it as soon as possible
-				ackpak[i].senttime = 0;
-				ackpak[i].resentnum = 1;
-			}
-			else
-			{
-				ackpak[i].senttime = I_GetTime();
-				ackpak[i].resentnum = 0;
-			}
+			ackpak[i].senttime = I_GetTime();
+			ackpak[i].resentnum = 0;
 			M_Memcpy(ackpak[i].pak.raw, netbuffer, ackpak[i].length);
 
 			*freeack = ackpak[i].acknum;
@@ -270,46 +256,17 @@ static boolean GetFreeAcknum(UINT8 *freeack, boolean lowtimer)
 
 			return true;
 		}
+	}
+
 #ifdef PARANOIA
 	CONS_Debug(DBG_NETPLAY, "No more free ackpacket\n");
 #endif
 	if (netbuffer->packettype < PT_CANFAIL)
 		I_Error("Connection lost\n");
+
 	return false;
 }
 
-/** Counts how many acks are free
-  *
-  * \param urgent True if the type of the packet meant to
-  *               use an ack is lower than PT_CANFAIL
-  *               If for some reason you don't want use it
-  *               for any packet type in particular,
-  *               just set to false
-  * \return The number of free acks
-  *
-  */
-INT32 Net_GetFreeAcks(boolean urgent)
-{
-	INT32 i, numfreeslot = 0;
-	INT32 n = 0; // Number of free acks found
-
-	for (i = 0; i < MAXACKPACKETS; i++)
-		if (!ackpak[i].acknum)
-		{
-			// For low priority packets, make sure to let freeslots so urgent packets can be sent
-			if (!urgent)
-			{
-				numfreeslot++;
-				if (numfreeslot <= URGENTFREESLOTNUM)
-					continue;
-			}
-
-			n++;
-		}
-
-	return n;
-}
-
 // Get a ack to send in the queue of this node
 static UINT8 GetAcktosend(INT32 node)
 {
@@ -322,6 +279,7 @@ static void RemoveAck(INT32 i)
 	INT32 node = ackpak[i].destinationnode;
 	DEBFILE(va("Remove ack %d\n",ackpak[i].acknum));
 	ackpak[i].acknum = 0;
+
 	if (nodes[node].flags & NF_CLOSE)
 		Net_CloseConnection(node);
 }
@@ -332,18 +290,22 @@ static boolean Processackpak(void)
 	INT32 i;
 	boolean goodpacket = true;
 	node_t *node = &nodes[doomcom->remotenode];
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	// Received an ack return, so remove the ack in the list
 	if (netbuffer->ackreturn && cmpack(node->remotefirstack, netbuffer->ackreturn) < 0)
 	{
 		node->remotefirstack = netbuffer->ackreturn;
+
 		// Search the ackbuffer and free it
 		for (i = 0; i < MAXACKPACKETS; i++)
-			if (ackpak[i].acknum && ackpak[i].destinationnode == node - nodes
+		{
+			if (ackpak[i].acknum && ackpak[i].destinationnode == doomcom->remotenode
 				&& cmpack(ackpak[i].acknum, netbuffer->ackreturn) <= 0)
 			{
 				RemoveAck(i);
 			}
+		}
 	}
 
 	// Received a packet with ack, queue it to send the ack back
@@ -351,6 +313,7 @@ static boolean Processackpak(void)
 	{
 		UINT8 ack = netbuffer->ack;
 		getackpacket++;
+
 		if (cmpack(ack, node->firstacktosend) <= 0)
 		{
 			DEBFILE(va("Discard(1) ack %d (duplicated)\n", ack));
@@ -361,6 +324,7 @@ static boolean Processackpak(void)
 		{
 			// Check if it is not already in the queue
 			for (i = node->acktosend_tail; i != node->acktosend_head; i = (i+1) % MAXACKTOSEND)
+			{
 				if (node->acktosend[i] == ack)
 				{
 					DEBFILE(va("Discard(2) ack %d (duplicated)\n", ack));
@@ -368,11 +332,14 @@ static boolean Processackpak(void)
 					goodpacket = false; // Discard packet (duplicate)
 					break;
 				}
+			}
+
 			if (goodpacket)
 			{
 				// Is a good packet so increment the acknowledge number,
 				// Then search for a "hole" in the queue
 				UINT8 nextfirstack = (UINT8)(node->firstacktosend + 1);
+
 				if (!nextfirstack)
 					nextfirstack = 1;
 
@@ -385,9 +352,11 @@ static boolean Processackpak(void)
 					if (!nextfirstack)
 						nextfirstack = 1;
 					hm1 = (UINT8)((node->acktosend_head-1+MAXACKTOSEND) % MAXACKTOSEND);
+
 					while (change)
 					{
 						change = false;
+
 						for (i = node->acktosend_tail; i != node->acktosend_head;
 							i = (i+1) % MAXACKTOSEND)
 						{
@@ -400,6 +369,7 @@ static boolean Processackpak(void)
 										nextfirstack = 1;
 									change = true;
 								}
+
 								if (i == node->acktosend_tail)
 								{
 									node->acktosend[node->acktosend_tail] = 0;
@@ -421,6 +391,7 @@ static boolean Processackpak(void)
 					// Will be incremented when the nextfirstack comes (code above)
 					UINT8 newhead = (UINT8)((node->acktosend_head+1) % MAXACKTOSEND);
 					DEBFILE(va("out of order packet (%d expected)\n", nextfirstack));
+
 					if (newhead != node->acktosend_tail)
 					{
 						node->acktosend[node->acktosend_head] = ack;
@@ -445,6 +416,7 @@ void Net_SendAcks(INT32 node)
 #ifdef NONET
 	(void)node;
 #else
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_NOTHING;
 	M_Memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
 	HSendPacket(node, false, 0, MAXACKTOSEND);
@@ -456,9 +428,14 @@ static void GotAcks(void)
 {
 	INT32 i, j;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	for (j = 0; j < MAXACKTOSEND; j++)
+	{
 		if (netbuffer->u.textcmd[j])
+		{
 			for (i = 0; i < MAXACKPACKETS; i++)
+			{
 				if (ackpak[i].acknum && ackpak[i].destinationnode == doomcom->remotenode)
 				{
 					if (ackpak[i].acknum == netbuffer->u.textcmd[j])
@@ -473,6 +450,9 @@ static void GotAcks(void)
 							ackpak[i].senttime--; // hurry up
 						}
 				}
+			}
+		}
+	}
 }
 #endif
 
@@ -503,10 +483,13 @@ void Net_AckTicker(void)
 #ifndef NONET
 	INT32 i;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	for (i = 0; i < MAXACKPACKETS; i++)
 	{
 		const INT32 nodei = ackpak[i].destinationnode;
 		node_t *node = &nodes[nodei];
+
 		if (ackpak[i].acknum && ackpak[i].senttime + NODETIMEOUT < I_GetTime())
 		{
 			if (ackpak[i].resentnum > 10 && (node->flags & NF_CLOSE))
@@ -557,10 +540,13 @@ void Net_UnAcknowledgePacket(INT32 node)
 #ifdef NONET
 	(void)node;
 #else
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	INT32 hm1 = (nodes[node].acktosend_head-1+MAXACKTOSEND) % MAXACKTOSEND;
 	DEBFILE(va("UnAcknowledge node %d\n", node));
+
 	if (!node)
 		return;
+
 	if (nodes[node].acktosend[hm1] == netbuffer->ack)
 	{
 		nodes[node].acktosend[hm1] = 0;
@@ -584,6 +570,7 @@ void Net_UnAcknowledgePacket(INT32 node)
 			if (!nodes[node].firstacktosend)
 				nodes[node].firstacktosend = UINT8_MAX;
 		}
+
 		nodes[node].firstacktosend++;
 		if (!nodes[node].firstacktosend)
 			nodes[node].firstacktosend = 1;
@@ -602,8 +589,10 @@ static boolean Net_AllAcksReceived(void)
 	INT32 i;
 
 	for (i = 0; i < MAXACKPACKETS; i++)
+	{
 		if (ackpak[i].acknum)
 			return false;
+	}
 
 	return true;
 }
@@ -623,6 +612,7 @@ void Net_WaitAllAckReceived(UINT32 timeout)
 	timeout = tictac + timeout*NEWTICRATE;
 
 	HGetPacket();
+
 	while (timeout > I_GetTime() && !Net_AllAcksReceived())
 	{
 		while (tictac == I_GetTime())
@@ -630,6 +620,7 @@ void Net_WaitAllAckReceived(UINT32 timeout)
 			I_Sleep(cv_sleep.value);
 			I_UpdateTime(cv_timescale.value);
 		}
+
 		tictac = I_GetTime();
 		HGetPacket();
 		Net_AckTicker();
@@ -640,6 +631,7 @@ 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;
 	node->nextacknum = 1;
 	node->remotefirstack = 0;
@@ -669,13 +661,14 @@ void Net_AbortPacketType(UINT8 packettype)
 #ifdef NONET
 	(void)packettype;
 #else
-	INT32 i;
-	for (i = 0; i < MAXACKPACKETS; i++)
+	for (INT32 i = 0; i < MAXACKPACKETS; i++)
+	{
 		if (ackpak[i].acknum && (ackpak[i].pak.data.packettype == packettype
 			|| packettype == UINT8_MAX))
 		{
 			ackpak[i].acknum = 0;
 		}
+	}
 #endif
 }
 
@@ -720,6 +713,7 @@ void Net_CloseConnection(INT32 node)
 
 	// check if we are waiting for an ack from this node
 	for (i = 0; i < MAXACKPACKETS; i++)
+	{
 		if (ackpak[i].acknum && ackpak[i].destinationnode == node)
 		{
 			if (!forceclose)
@@ -727,6 +721,7 @@ void Net_CloseConnection(INT32 node)
 			else
 				ackpak[i].acknum = 0;
 		}
+	}
 
 	InitNode(&nodes[node]);
 	SV_AbortSendFiles(node);
@@ -740,12 +735,12 @@ void Net_CloseConnection(INT32 node)
 //
 static UINT32 NetbufferChecksum(void)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	UINT32 c = 0x1234567;
 	const INT32 l = doomcom->datalength - 4;
 	const UINT8 *buf = (UINT8 *)netbuffer + 4;
-	INT32 i;
 
-	for (i = 0; i < l; i++, buf++)
+	for (INT32 i = 0; i < l; i++, buf++)
 		c += (*buf) * (i+1);
 
 	return LONG(c);
@@ -760,6 +755,7 @@ static void fprintfstring(char *s, size_t len)
 	size_t i;
 
 	for (i = 0; i < len; i++)
+	{
 		if (s[i] < 32)
 		{
 			if (!mode)
@@ -779,6 +775,8 @@ static void fprintfstring(char *s, size_t len)
 			}
 			fprintf(debugfile, "%c", s[i]);
 		}
+	}
+
 	if (mode)
 		fprintf(debugfile, "]");
 }
@@ -832,13 +830,16 @@ const char *packettypename[NUMPACKETTYPE] =
 	"TELLFILESNEEDED",
 	"MOREFILESNEEDED",
 
-	"PING",
-
-	"ISSATURN",
+	"PING"
+#ifdef SATURNPAK
+	,
 
 	"WILLRESENDGAMESTATE",
 	"CANRECEIVEGAMESTATE",
-	"RECEIVEDGAMESTATE"
+	"RECEIVEDGAMESTATE",
+
+	"ISSATURN" // special packet to identify saturn clients
+#endif
 };
 
 const char *Net_GetPacketName(UINT8 packettype)
@@ -851,6 +852,8 @@ const char *Net_GetPacketName(UINT8 packettype)
 
 static void DebugPrintpacket(const char *header)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	fprintf(debugfile, "%-12s (node %d,ack %d,ackret %d,size %d) type(%d) : %s\n",
 		header, doomcom->remotenode, netbuffer->ack, netbuffer->ackreturn, doomcom->datalength,
 		netbuffer->packettype, Net_GetPacketName(netbuffer->packettype));
@@ -1020,6 +1023,7 @@ void Command_Droprate(void)
 #ifndef NONET
 static boolean ShouldDropPacket(void)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	return (packetdropquantity[netbuffer->packettype])
 		|| (packetdroprate != 0 && rand() < (((double)RAND_MAX) * (packetdroprate / 100.f))) || packetdroprate == 100;
 }
@@ -1031,7 +1035,9 @@ static boolean ShouldDropPacket(void)
 //
 boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlength)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	doomcom->datalength = (INT16)(packetlength + BASEPACKETSIZE);
+
 	if (node == 0) // Packet is to go back to us
 	{
 		if ((rebound_head+1) % MAXREBOUND == rebound_tail)
@@ -1067,6 +1073,7 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 	// do this before GetFreeAcknum because this function backups
 	// the current packet
 	doomcom->remotenode = (INT16)node;
+
 	if (doomcom->datalength <= 0)
 	{
 		DEBFILE("HSendPacket: nothing to send\n");
@@ -1081,17 +1088,10 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 		netbuffer->ackreturn = GetAcktosend(node);
 	else
 		netbuffer->ackreturn = 0;
+
 	if (reliable)
 	{
-		if (I_NetCanSend && !I_NetCanSend())
-		{
-			if (netbuffer->packettype < PT_CANFAIL)
-				GetFreeAcknum(&netbuffer->ack, true);
-
-			DEBFILE("HSendPacket: Out of bandwidth\n");
-			return false;
-		}
-		else if (!GetFreeAcknum(&netbuffer->ack, false))
+		if (!GetFreeAcknum(&netbuffer->ack))
 			return false;
 	}
 	else
@@ -1136,7 +1136,7 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 //
 boolean HGetPacket(void)
 {
-	//boolean nodejustjoined;
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	// Get a packet from self
 	if (rebound_tail != rebound_head)
@@ -1163,7 +1163,6 @@ boolean HGetPacket(void)
 
 	while(true)
 	{
-		//nodejustjoined = I_NetGet();
 		I_NetGet();
 
 		if (doomcom->remotenode == -1) // No packet received
@@ -1192,21 +1191,6 @@ boolean HGetPacket(void)
 			DebugPrintpacket("GET");
 #endif
 
-		/*// If a new node sends an unexpected packet, just ignore it
-		if (nodejustjoined && server
-			&& !(netbuffer->packettype == PT_ASKINFO
-				|| netbuffer->packettype == PT_SERVERINFO
-				|| netbuffer->packettype == PT_PLAYERINFO
-				|| netbuffer->packettype == PT_REQUESTFILE
-				|| netbuffer->packettype == PT_ASKINFOVIAMS
-				|| netbuffer->packettype == PT_CLIENTJOIN))
-		{
-			DEBFILE(va("New node sent an unexpected %s packet\n", packettypename[netbuffer->packettype]));
-			//CONS_Alert(CONS_NOTICE, "New node sent an unexpected %s packet\n", packettypename[netbuffer->packettype]);
-			Net_CloseConnection(doomcom->remotenode | FORCECLOSE);
-			continue;
-		}*/
-
 		// Proceed the ack and ackreturn field
 		if (!Processackpak())
 			continue; // discarded (duplicated)
@@ -1240,26 +1224,33 @@ static void Internal_FreeNodenum(INT32 nodenum)
 	(void)nodenum;
 }
 
+static char *I_NetSplitAddress(char *host, char **port)
+{
+	boolean v4 = (host[0] != '[');
+
+	host = strtok(host, v4 ? ":" : "[]");
+
+	if (port)
+		*port = strtok(NULL, ":");
+
+	return host;
+}
+
 SINT8 I_NetMakeNode(const char *hostname)
 {
 	SINT8 newnode = -1;
+
 	if (I_NetMakeNodewPort)
 	{
 		char *localhostname = strdup(hostname);
-		char  *t = localhostname;
-		const char *port;
+		char *port;
 		if (!localhostname)
 			return newnode;
+
 		// retrieve portnum from address!
-		strtok(localhostname, ":");
-		port = strtok(NULL, ":");
+		hostname = I_NetSplitAddress(localhostname, &port);
 
-		// remove the port in the hostname as we've it already
-		while ((*t != ':') && (*t != '\0'))
-			t++;
-		*t = '\0';
-
-		newnode = I_NetMakeNodewPort(localhostname, port);
+		newnode = I_NetMakeNodewPort(hostname, port);
 		free(localhostname);
 	}
 	return newnode;
@@ -1269,7 +1260,10 @@ void D_SetDoomcom(void)
 {
 	if (doomcom) return;
 	doomcom = Z_Calloc(sizeof (doomcom_t), PU_STATIC, NULL);
+	doomcom->id = DOOMCOM_ID;
 	doomcom->numslots = doomcom->numnodes = 1;
+	doomcom->gametype = 0;
+	doomcom->consoleplayer = 0;
 	doomcom->extratics = 0;
 }
 
@@ -1288,12 +1282,12 @@ boolean D_CheckNetGame(void)
 
 	I_NetGet = Internal_Get;
 	I_NetSend = Internal_Send;
-	I_NetCanSend = NULL;
 	I_NetCloseSocket = NULL;
 	I_NetFreeNodenum = Internal_FreeNodenum;
 	I_NetMakeNodewPort = NULL;
 
 	hardware_MAXPACKETLENGTH = MAXPACKETLENGTH;
+
 	// I_InitNetwork sets doomcom and netgame
 	// check and initialize the network driver
 	multiplayer = false;
@@ -1313,6 +1307,7 @@ boolean D_CheckNetGame(void)
 	server = true; // WTF? server always true???
 		// no! The deault mode is server. Client is set elsewhere
 		// when the client executes connect command.
+	doomcom->ticdup = 1;
 
 	if (M_CheckParm("-extratic"))
 	{
@@ -1342,19 +1337,16 @@ boolean D_CheckNetGame(void)
 	if (netgame)
 		multiplayer = true;
 
+	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);
 
-	netbuffer = (doomdata_t *)(void *)&doomcom->data;
-	#ifdef HOLEPUNCH
-	holepunchpacket = (holepunch_t *)(void *)&doomcom->data;
-	#endif
-
 #ifdef DEBUGFILE
 	if (M_CheckParm("-debugfile"))
 	{
 		char filename[21];
-		INT32 k = consoleplayer - 1;
+		INT32 k = doomcom->consoleplayer - 1;
 		if (M_IsNextParm())
 			k = atoi(M_GetNextParm()) - 1;
 		while (!debugfile && k < MAXPLAYERS)
@@ -1410,6 +1402,7 @@ void Command_Ping_f(void)
 	INT32 i;
 
 	pingc = 0;
+
 	for (i = 1; i < MAXPLAYERS; ++i)
 	{
 		if (playeringame[i])
@@ -1442,13 +1435,13 @@ void Command_Ping_f(void)
 		}
 	}
 
-	     if (f_width < 10)  f_width = 1;
+	if 		(f_width < 10)  f_width = 1;
 	else if (f_width < 100) f_width = 2;
-	else                    f_width = 3;
+	else					f_width = 3;
 
-	     if (ms_width < 10)  ms_width = 1;
+	if 		(ms_width < 10)  ms_width = 1;
 	else if (ms_width < 100) ms_width = 2;
-	else                     ms_width = 3;
+	else					 ms_width = 3;
 
 	qsort(pingv, pingc, sizeof (struct pingcell), &pingcellcmp);
 
@@ -1487,7 +1480,6 @@ void D_CloseConnection(void)
 
 		I_NetGet = Internal_Get;
 		I_NetSend = Internal_Send;
-		I_NetCanSend = NULL;
 		I_NetCloseSocket = NULL;
 		I_NetFreeNodenum = Internal_FreeNodenum;
 		I_NetMakeNodewPort = NULL;
diff --git a/src/d_net.h b/src/d_net.h
index 471881847..caeb3c83f 100644
--- a/src/d_net.h
+++ b/src/d_net.h
@@ -18,6 +18,10 @@
 #ifndef __D_NET__
 #define __D_NET__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Max computers in a game
 // 127 is probably as high as this can go, because
 // SINT8 is used for nodes sometimes >:(
@@ -43,14 +47,10 @@ extern SINT8 nodetoplayer4[MAXNETNODES]; // Say the numplayer for this node if a
 extern UINT8 playerpernode[MAXNETNODES]; // Used specially for splitscreen
 extern boolean nodeingame[MAXNETNODES]; // Set false as nodes leave game
 
-extern boolean serverrunning;
-
-INT32 Net_GetFreeAcks(boolean urgent);
 void Net_AckTicker(void);
 
 // If reliable return true if packet sent, 0 else
-boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum,
-	size_t packetlength);
+boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlength);
 boolean HGetPacket(void);
 void D_SetDoomcom(void);
 #ifndef NONET
@@ -67,4 +67,8 @@ void Net_SendAcks(INT32 node);
 void Net_WaitAllAckReceived(UINT32 timeout);
 const char *Net_GetPacketName(UINT8 packettype);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index dcd9be046..6ce0e5d4a 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -16,10 +16,12 @@
 
 #include "console.h"
 #include "command.h"
+#include "dehacked.h"
 #include "i_time.h"
 #include "i_system.h"
 #include "g_game.h"
 #include "hu_stuff.h"
+#include "m_emotes.h"
 #include "g_input.h"
 #include "m_menu.h"
 #include "r_local.h"
@@ -38,6 +40,7 @@
 #include "d_main.h"
 #include "m_random.h"
 #include "f_finale.h"
+#include "v_video.h"
 #include "filesrch.h"
 #include "mserv.h"
 #include "md5.h"
@@ -141,6 +144,8 @@ static void Command_Addfile(void);
 static void Command_Addskins(void);
 static void Command_GLocalSkin(void);
 static void Command_ListWADS_f(void);
+static void Command_ListDoomednums_f(void);
+static void Command_ListUnusedSprites_f(void);
 static void Command_RunSOC(void);
 static void Command_Pause(void);
 static void Command_Respawn(void);
@@ -200,38 +205,15 @@ static void Command_Archivetest_f(void);
 //                           CLIENT VARIABLES
 // =========================================================================
 
-void SendWeaponPref(void);
-void SendWeaponPref2(void);
-void SendWeaponPref3(void);
-void SendWeaponPref4(void);
-
 static CV_PossibleValue_t usemouse_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Force"}, {0, NULL}};
-#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
-static CV_PossibleValue_t mouse2port_cons_t[] = {{0, "/dev/gpmdata"}, {1, "/dev/ttyS0"},
-	{2, "/dev/ttyS1"}, {3, "/dev/ttyS2"}, {4, "/dev/ttyS3"}, {0, NULL}};
-#else
-static CV_PossibleValue_t mouse2port_cons_t[] = {{1, "COM1"}, {2, "COM2"}, {3, "COM3"}, {4, "COM4"},
-	{0, NULL}};
-#endif
-
-#ifdef LJOYSTICK
-static CV_PossibleValue_t joyport_cons_t[] = {{1, "/dev/js0"}, {2, "/dev/js1"}, {3, "/dev/js2"},
-	{4, "/dev/js3"}, {0, NULL}};
-#else
-// accept whatever value - it is in fact the joystick device number
-#define usejoystick_cons_t NULL
-#endif
 
 static CV_PossibleValue_t autobalance_cons_t[] = {{0, "MIN"}, {4, "MAX"}, {0, NULL}};
 static CV_PossibleValue_t teamscramble_cons_t[] = {{0, "Off"}, {1, "Random"}, {2, "Points"}, {0, NULL}};
 
 static CV_PossibleValue_t startingliveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {0, NULL}};
 static CV_PossibleValue_t sleeping_cons_t[] = {{0, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}};
-static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Teleports"},
-	{3, "None"}, {0, NULL}};
-
-static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Non-Random"},
-	{3, "None"}, {0, NULL}};
+static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Teleports"}, {3, "None"}, {0, NULL}};
+static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Non-Random"}, {3, "None"}, {0, NULL}};
 
 //static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}};
 static CV_PossibleValue_t match_scoring_cons_t[] = {{0, "Normal"}, {1, "Classic"}, {0, NULL}};
@@ -294,59 +276,55 @@ consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0,
 
 INT32 cv_debug;
 
-consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_usemouse2 = {"use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2, 0, NULL, NULL, 0, 0, NULL};
+static void UseMouse_OnChange(void);
+consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, UseMouse_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+static void UseMouse_OnChange(void)
+{
+	GameFocus_menu_Onchange();
+	I_StartupMouse();
+}
+
 //WTF
 consvar_t cv_mouseturn = {"mouseturn", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-#if defined(HAVE_SDL) || defined(_WINDOWS) //joystick 1 and 2
-consvar_t cv_usejoystick = {"use_joystick", "1", CV_SAVE|CV_CALL, usejoystick_cons_t,
-	I_InitJoystick, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_usejoystick2 = {"use_joystick2", "2", CV_SAVE|CV_CALL, usejoystick_cons_t,
-	I_InitJoystick2, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_usejoystick3 = {"use_joystick3", "3", CV_SAVE|CV_CALL, usejoystick_cons_t,
-	I_InitJoystick3, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_usejoystick4 = {"use_joystick4", "4", CV_SAVE|CV_CALL, usejoystick_cons_t,
-	I_InitJoystick4, 0, NULL, NULL, 0, 0, NULL};
-#endif
+// Lagless camera! Yay!
+consvar_t cv_laglesscam = {"lagless_camera", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-#if (defined (LJOYSTICK) || defined (HAVE_SDL))
-#ifdef LJOYSTICK
-consvar_t cv_joyport = {"joyport", "/dev/js0", CV_SAVE, joyport_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_joyport2 = {"joyport2", "/dev/js0", CV_SAVE, joyport_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: for later
-#endif
-consvar_t cv_joyscale = {"joyscale", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_joyscale2 = {"joyscale2", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale2, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_joyscale3 = {"joyscale3", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale3, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_joyscale4 = {"joyscale4", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale4, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_verticallook[MAXSPLITSCREENPLAYERS] = {
+	{"verticallook",  "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"verticallook2", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"verticallook3", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"verticallook4", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_usejoystick[MAXSPLITSCREENPLAYERS] = {
+	{"use_joystick",  "1", CV_SAVE|CV_CALL, NULL, I_InitJoystick1, 0, NULL, NULL, 0, 0, NULL},
+	{"use_joystick2", "2", CV_SAVE|CV_CALL, NULL, I_InitJoystick2, 0, NULL, NULL, 0, 0, NULL},
+	{"use_joystick3", "3", CV_SAVE|CV_CALL, NULL, I_InitJoystick3, 0, NULL, NULL, 0, 0, NULL},
+	{"use_joystick4", "4", CV_SAVE|CV_CALL, NULL, I_InitJoystick4, 0, NULL, NULL, 0, 0, NULL}
+};
+
+#if defined (HAVE_SDL)
+consvar_t cv_joyscale[MAXSPLITSCREENPLAYERS] = {
+	{"joyscale",  "1", CV_SAVE|CV_CALL, NULL, I_JoyScale, 0, NULL, NULL, 0, 0, NULL},
+	{"joyscale2", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale2, 0, NULL, NULL, 0, 0, NULL},
+	{"joyscale3", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale3, 0, NULL, NULL, 0, 0, NULL},
+	{"joyscale4", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale4, 0, NULL, NULL, 0, 0, NULL}
+};
 #else
-consvar_t cv_joyscale = {"joyscale", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: Dummy for save
-consvar_t cv_joyscale2 = {"joyscale2", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: Dummy for save
-#endif
-#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
-consvar_t cv_mouse2port = {"mouse2port", "/dev/gpmdata", CV_SAVE, mouse2port_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mouse2opt = {"mouse2opt", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-#else
-consvar_t cv_mouse2port = {"mouse2port", "COM2", CV_SAVE, mouse2port_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_joyscale[MAXSPLITSCREENPLAYERS] = { //Alam: Dummy for save
+	{"joyscale",  "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyscale2", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyscale3", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyscale4", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
 #endif
 
 consvar_t cv_matchboxes = {"matchboxes", "Normal", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, matchboxes_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_specialrings = {"specialrings", "On", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_powerstones = {"powerstones", "On", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-/*consvar_t cv_recycler =      {"tv_recycler",      "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_teleporters =   {"tv_teleporter",    "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_superring =     {"tv_superring",     "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_supersneakers = {"tv_supersneaker",  "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_invincibility = {"tv_invincibility", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_jumpshield =    {"tv_jumpshield",    "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_watershield =   {"tv_watershield",   "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ringshield =    {"tv_ringshield",    "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_forceshield =   {"tv_forceshield",   "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_bombshield =    {"tv_bombshield",    "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_1up =           {"tv_1up",           "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_eggmanbox =     {"tv_eggman",        "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};*/
-
 // SRB2kart
 consvar_t cv_sneaker = 				{"sneaker", 			"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_rocketsneaker = 		{"rocketsneaker", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -394,19 +372,20 @@ static CV_PossibleValue_t kartspeedometer_cons_t[] = {{0, "Off"}, {1, "Kilometer
 consvar_t cv_kartspeedometer = {"kartdisplayspeed", "Off", CV_SAVE, kartspeedometer_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // use tics in display
 static CV_PossibleValue_t kartvoices_cons_t[] = {{0, "Never"}, {1, "Tasteful"}, {2, "Meme"}, {0, NULL}};
 consvar_t cv_kartvoices = {"kartvoices", "Tasteful", CV_SAVE, kartvoices_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_karthitemdialog = {"karthitemdialog", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_karteliminatelast = {"karteliminatelast", "Yes", CV_NETVAR|CV_CHEAT|CV_CALL|CV_NOSHOWHELP, CV_YesNo, KartEliminateLast_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_karteliminatelast = {"karteliminatelast", "Yes", CV_NETVAR|CV_CHEAT|CV_CALL, CV_YesNo, KartEliminateLast_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t kartdebugitem_cons_t[] = {{-1, "MIN"}, {NUMKARTITEMS-1, "MAX"}, {0, NULL}};
-consvar_t cv_kartdebugitem = {"kartdebugitem", "0", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, kartdebugitem_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartdebugitem = {"kartdebugitem", "0", CV_NETVAR|CV_CHEAT, kartdebugitem_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 static CV_PossibleValue_t kartdebugamount_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, NULL}};
-consvar_t cv_kartdebugamount = {"kartdebugamount", "1", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, kartdebugamount_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_kartdebugshrink = {"kartdebugshrink", "Off", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_kartdebugdistribution = {"kartdebugdistribution", "Off", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_kartdebughuddrop = {"kartdebughuddrop", "Off", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartdebugamount = {"kartdebugamount", "1", CV_NETVAR|CV_CHEAT, kartdebugamount_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartdebugshrink = {"kartdebugshrink", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartdebugdistribution = {"kartdebugdistribution", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartdebughuddrop = {"kartdebughuddrop", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_kartdebugcheckpoint = {"kartdebugcheckpoint", "Off", CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_kartdebugnodes = {"kartdebugnodes", "Off", CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartdebugcheckpoint = {"kartdebugcheckpoint", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_kartdebugnodes = {"kartdebugnodes", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_kartdebugcolorize = {"kartdebugcolorize", "Off", CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t votetime_cons_t[] = {{1, "MIN"}, {3600, "MAX"}, {0, NULL}};
@@ -461,7 +440,6 @@ consvar_t cv_killingdead = {"killingdead", "Off", CV_NETVAR|CV_NOSHOWHELP, CV_On
 consvar_t cv_netstat = {"netstat", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // show bandwidth statistics
 static CV_PossibleValue_t nettimeout_cons_t[] = {{TICRATE/7, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}};
 consvar_t cv_nettimeout = {"nettimeout", "210", CV_CALL|CV_SAVE, nettimeout_cons_t, NetTimeout_OnChange, 0, NULL, NULL, 0, 0, NULL};
-//static CV_PossibleValue_t jointimeout_cons_t[] = {{5*TICRATE, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}};
 consvar_t cv_jointimeout = {"jointimeout", "210", CV_CALL|CV_SAVE, nettimeout_cons_t, JoinTimeout_OnChange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_maxping = {"maxdelay", "20", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 
@@ -481,14 +459,10 @@ consvar_t cv_pingstyle = {"pingstyle", "New", CV_SAVE, cv_pingstyle_cons_t, 0, 0
 
 consvar_t cv_luaimmersion = {"luaimmersion", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_minihead = {"smallminimapplayers", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_showminimapnames = {"showminimapnames", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_showlapemblem = {"showlapemblem", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 consvar_t cv_showviewpointtext = {"showviewpointtext", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_showdownloadprompt = {"showdownloadprompt", "On", CV_SAVE, CV_OnOff, 0, 0, NULL, NULL, 0, 0, NULL};
+
 // Intermission time Tails 04-19-2002
 static CV_PossibleValue_t inttime_cons_t[] = {{0, "MIN"}, {3600, "MAX"}, {0, NULL}};
 consvar_t cv_inttime = {"inttime", "20", CV_NETVAR, inttime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -505,45 +479,6 @@ consvar_t cv_mute = {"mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange,
 
 consvar_t cv_sleep = {"cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL, -1, NULL, NULL, 0, 0, NULL};
 
-static CV_PossibleValue_t nametagtrans_cons_t[] = {
-	{0, "Never"}, {1, "Far only"}, {2, "Dynamic"}, {3, "Always"}, {4, "HUD Trans."}, {0, NULL}};
-/*static CV_PossibleValue_t nametagscaling_cons_t[] = {
-	{0, "MIN"},  {320, "MAX"}, {0, NULL}};*/
-static CV_PossibleValue_t nametagdistance_cons_t[] = {
-	{0, "MIN"},  {640, "MAX"}, {0, NULL}};
-static CV_PossibleValue_t nametagmaxplayer_cons_t[] = {
-    {1, "MIN"}, {MAXPLAYERS, "MAX"}, {0, NULL}};
-static CV_PossibleValue_t nametagsize_cons_t[] = {
-	{0, "Off"}, {1, "Small"}, {2, "Minimal"}, {0, NULL}};
-static CV_PossibleValue_t nametagrestat_cons_t[] = {
-	{0, "Off"}, {1, "Restat"}, {2, "Always"}, {0, NULL}};
-
-consvar_t cv_nametag = {"kartnametag", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_nametagtrans = {"kartnametagtransparency", "Dynamic", CV_SAVE, nametagtrans_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_nametagfacerank = {"kartnametagfacerank", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_nametagrestat = {"kartnametagrestat", "Restat", CV_SAVE, nametagrestat_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_nametagdist = {"kartnametagdist", "320", CV_SAVE, nametagdistance_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_nametagmaxplayers = {"kartnametagmaxplayers", "3", CV_SAVE, nametagmaxplayer_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_nametagmaxlenght = {"kartnametagmaxlenght", "12", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
-//consvar_t cv_nametagscaling = {"nametagscaling", "160", CV_SAVE, nametagscaling_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_showownnametag = {"kartnametagshowown", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_smallnametags = {"kartnametagsmall", "Off", CV_SAVE, nametagsize_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_nametaghop = {"kartnametaghop", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_nametagscore = {"kartnametagscore", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_shownametagfinish = {"kartshownametagfinished", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_shownametagspectator = {"kartshownametagspectator", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-static CV_PossibleValue_t driftgaugeoffset_cons_t[] = {
-	{-FRACUNIT*128, "MIN"}, {FRACUNIT*128, "MAX"}, {0, NULL}};
-
-static CV_PossibleValue_t driftgaugestyle_cons_t[] = {
-	{1, "Default"}, {2, "Small"}, {3, "Big Numbers"}, {4, "Numbers Only"}, {0, NULL}};
-
-consvar_t cv_driftgauge = {"kartdriftgauge", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftgaugeofs = {"kartdriftgaugeoffset", "-20", CV_FLOAT|CV_SAVE, driftgaugeoffset_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftgaugetrans = {"kartdriftgaugetransparency", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftgaugestyle = {"kartdriftgaugestyle", "1", CV_SAVE, driftgaugestyle_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 static CV_PossibleValue_t skinselectspin_cons_t[] = {
 	{0, "Off"}, {1, "Slow"}, {2, "2"}, {3, "3"}, {4, "4"}, {5, "5"}, {6, "6"}, {7, "7"}, {8, "8"}, {9, "9"}, {10, "Fast"}, {SKINSELECTSPIN_PAIN, "Pain"}, {0, NULL}};
 consvar_t cv_skinselectspin = {"skinselectspin", "5", CV_SAVE, skinselectspin_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -561,8 +496,16 @@ static CV_PossibleValue_t ps_descriptor_cons_t[] = {
 	{1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}};
 consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+<<<<<<< HEAD
 consvar_t cv_director = {"director", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_kartdebugdirector = {"debugdirector", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+=======
+// only there to better keep track of it globally
+consvar_t cv_director = {"director", "Off", CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_kartdebugdirector = {"debugdirector", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showdirectorhud = {"showdirectorhud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+>>>>>>> Saturn-Next
 
 consvar_t cv_showtrackaddon = {"showtrackaddon", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
@@ -580,7 +523,8 @@ static CV_PossibleValue_t skinselectgridsort_t[] ={
 };
 consvar_t cv_skinselectgridsort ={ "skinselectgridsort", "Real name", CV_SAVE|CV_CALL|CV_NOINIT, skinselectgridsort_t, sortSkinGrid, 0, NULL, NULL, 0, 0, NULL };
 
-consvar_t cv_betainterscreen = {"betaintermissionscreen", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t betainterscreen_t[] = {{0, "Off"}, {1, "On"}, {2, "NoBG"}, {0, NULL}};
+consvar_t cv_betainterscreen = {"betaintermissionscreen", "Off", CV_SAVE, betainterscreen_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 INT16 gametype = GT_RACE; // SRB2kart
 boolean forceresetplayers = false;
@@ -693,8 +637,9 @@ void D_RegisterServerCommands(void)
 	COM_AddCommand("addfilelocal", Command_Addfilelocal);
 	COM_AddCommand("addfile", Command_Addfile);
 	COM_AddCommand("addskins", Command_Addskins);
-	COM_AddCommand("localskin", Command_GLocalSkin);
 	COM_AddCommand("listwad", Command_ListWADS_f);
+	COM_AddCommand("listmapthings", Command_ListDoomednums_f);
+	COM_AddCommand("listunusedsprites", Command_ListUnusedSprites_f);
 
 	COM_AddCommand("runsoc", Command_RunSOC);
 	COM_AddCommand("pause", Command_Pause);
@@ -756,7 +701,7 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_competitionboxes);
 	CV_RegisterVar(&cv_matchboxes);
 
-	K_RegisterKartStuff(); // SRB2kart
+	K_RegisterServerKartStuff(); // SRB2kart
 
 	CV_RegisterVar(&cv_ringslinger);
 
@@ -780,10 +725,22 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_killingdead);
 
 	// d_clisrv
+#ifndef NONET
+#ifdef SATURNJOIN
+	CV_RegisterVar(&cv_allownewsaturnplayer); // need to register it before cv_maxplayers && cv_allownewplayer
+#endif
+#endif
 	CV_RegisterVar(&cv_maxplayers);
 	CV_RegisterVar(&cv_resynchattempts);
+<<<<<<< HEAD
 	CV_RegisterVar(&cv_gamestateattempts);
 	CV_RegisterVar(&cv_resynchcooldown);
+=======
+#ifdef SATURNPAK
+	CV_RegisterVar(&cv_gamestateattempts);
+	CV_RegisterVar(&cv_resynchcooldown);
+#endif
+>>>>>>> Saturn-Next
 	CV_RegisterVar(&cv_maxsend);
 	CV_RegisterVar(&cv_noticedownload);
 	CV_RegisterVar(&cv_downloadspeed);
@@ -791,7 +748,11 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_httpsource);
 #ifndef NONET
 	CV_RegisterVar(&cv_allownewplayer);
+<<<<<<< HEAD
 	CV_RegisterVar(&cv_allownewsaturnplayer);
+=======
+
+>>>>>>> Saturn-Next
 	CV_RegisterVar(&cv_joinrefusemessage);
 	CV_RegisterVar(&cv_chatlogsize);
 #ifdef VANILLAJOINNEXTROUND
@@ -829,9 +790,7 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_recordmultiplayerdemos);
 	CV_RegisterVar(&cv_netdemosyncquality);
 	CV_RegisterVar(&cv_maxdemosize);
-	CV_RegisterVar(&cv_keyboardlayout);
-	
-	CV_RegisterVar(&cv_betainterscreen);
+	CV_RegisterVar(&cv_demochangemap);
 }
 
 // =========================================================================
@@ -888,10 +847,17 @@ void D_RegisterClientCommands(void)
 	COM_AddCommand("screenshot", M_ScreenShot);
 	COM_AddCommand("startmovie", Command_StartMovie_f);
 	COM_AddCommand("stopmovie", Command_StopMovie_f);
+	COM_AddCommand("minigen", M_MinimapGenerate);
+
+	COM_AddCommand("localskin", Command_GLocalSkin);
+
+	K_RegisterClientKartStuff(); // SRB2kart
 
 	CV_RegisterVar(&cv_screenshot_option);
 	CV_RegisterVar(&cv_screenshot_folder);
 	CV_RegisterVar(&cv_moviemode);
+	CV_RegisterVar(&cv_movie_option);
+	CV_RegisterVar(&cv_movie_folder);
 	// PNG variables
 	CV_RegisterVar(&cv_zlib_level);
 	CV_RegisterVar(&cv_zlib_memory);
@@ -937,9 +903,14 @@ void D_RegisterClientCommands(void)
 #ifdef SEENAMES
 	CV_RegisterVar(&cv_seenames);
 #endif
+
 	CV_RegisterVar(&cv_rollingdemos);
+
 	CV_RegisterVar(&cv_netstat);
 	CV_RegisterVar(&cv_netticbuffer);
+	CV_RegisterVar(&cv_mindelay);
+	CV_RegisterVar(&cv_gentlemens);
+	CV_RegisterVar(&cv_serverinfoscreen);
 
 #ifdef NETGAME_DEVMODE
 	CV_RegisterVar(&cv_fishcake);
@@ -954,6 +925,10 @@ void D_RegisterClientCommands(void)
 
 	CV_RegisterVar(&cv_cechotoggle);
 
+	CV_RegisterVar(&cv_keyboardlayout);
+
+	CV_RegisterVar(&cv_emotes);
+
 	// time attack ghost options are also saved to config
 	CV_RegisterVar(&cv_ghost_besttime);
 	CV_RegisterVar(&cv_ghost_bestlap);
@@ -963,10 +938,12 @@ void D_RegisterClientCommands(void)
 
 	COM_AddCommand("displayplayer", Command_Displayplayer_f);
 
-	CV_RegisterVar(&cv_audbuffersize); 
+	CV_RegisterVar(&cv_audbuffersize);
+
+	CV_RegisterVar(&cv_palette);
+	CV_RegisterVar(&cv_palettenum);
 
 	// m_menu.c
-	//CV_RegisterVar(&cv_compactscoreboard);
 	CV_RegisterVar(&cv_chatheight);
 	CV_RegisterVar(&cv_chatwidth);
 	CV_RegisterVar(&cv_chattime);
@@ -975,15 +952,20 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_chatnotifications);
 	CV_RegisterVar(&cv_chatbacktint);
 	CV_RegisterVar(&cv_songcredits);
-	CV_RegisterVar(&cv_showfreeplay);	
+	CV_RegisterVar(&cv_showfreeplay);
 	CV_RegisterVar(&cv_skinselectspin);
 	CV_RegisterVar(&cv_showallmaps);
-	
+
 	CV_RegisterVar(&cv_growmusic);
 	CV_RegisterVar(&cv_supermusic);
 
 	CV_RegisterVar(&cv_showtrackaddon);
 	CV_RegisterVar(&cv_showviewpointtext);
+	CV_RegisterVar(&cv_showdownloadprompt);
+
+	CV_RegisterVar(&cv_director);
+	CV_RegisterVar(&cv_kartdebugdirector);
+	CV_RegisterVar(&cv_showdirectorhud);
 
 	CV_RegisterVar(&cv_director);
 	CV_RegisterVar(&cv_kartdebugdirector);
@@ -993,71 +975,10 @@ void D_RegisterClientCommands(void)
 
 	CV_RegisterVar(&cv_showlocalskinmenus);
 
-	//CV_RegisterVar(&cv_crosshair);
-	//CV_RegisterVar(&cv_crosshair2);
-	//CV_RegisterVar(&cv_crosshair3);
-	//CV_RegisterVar(&cv_crosshair4);
-	//CV_RegisterVar(&cv_alwaysfreelook);
-	//CV_RegisterVar(&cv_alwaysfreelook2);
-	//CV_RegisterVar(&cv_chasefreelook);
-	//CV_RegisterVar(&cv_chasefreelook2);
+	CV_RegisterVar(&cv_replaysearchrate);
 	CV_RegisterVar(&cv_showfocuslost);
 	CV_RegisterVar(&cv_pauseifunfocused);
 
-	// g_input.c
-	CV_RegisterVar(&cv_turnaxis);
-	CV_RegisterVar(&cv_turnaxis2);
-	CV_RegisterVar(&cv_turnaxis3);
-	CV_RegisterVar(&cv_turnaxis4);
-	CV_RegisterVar(&cv_moveaxis);
-	CV_RegisterVar(&cv_moveaxis2);
-	CV_RegisterVar(&cv_moveaxis3);
-	CV_RegisterVar(&cv_moveaxis4);
-	CV_RegisterVar(&cv_brakeaxis);
-	CV_RegisterVar(&cv_brakeaxis2);
-	CV_RegisterVar(&cv_brakeaxis3);
-	CV_RegisterVar(&cv_brakeaxis4);
-	CV_RegisterVar(&cv_aimaxis);
-	CV_RegisterVar(&cv_aimaxis2);
-	CV_RegisterVar(&cv_aimaxis3);
-	CV_RegisterVar(&cv_aimaxis4);
-	CV_RegisterVar(&cv_lookaxis);
-	CV_RegisterVar(&cv_lookaxis2);
-	CV_RegisterVar(&cv_lookaxis3);
-	CV_RegisterVar(&cv_lookaxis4);
-	CV_RegisterVar(&cv_fireaxis);
-	CV_RegisterVar(&cv_fireaxis2);
-	CV_RegisterVar(&cv_fireaxis3);
-	CV_RegisterVar(&cv_fireaxis4);
-	CV_RegisterVar(&cv_driftaxis);
-	CV_RegisterVar(&cv_driftaxis2);
-	CV_RegisterVar(&cv_driftaxis3);
-	CV_RegisterVar(&cv_driftaxis4);
-	CV_RegisterVar(&cv_lookbackaxis);
-	CV_RegisterVar(&cv_lookbackaxis2);
-	CV_RegisterVar(&cv_lookbackaxis3);
-	CV_RegisterVar(&cv_lookbackaxis4);
-	CV_RegisterVar(&cv_custom1axis);
-	CV_RegisterVar(&cv_custom1axis2);
-	CV_RegisterVar(&cv_custom1axis3);
-	CV_RegisterVar(&cv_custom1axis4);
-	CV_RegisterVar(&cv_custom2axis);
-	CV_RegisterVar(&cv_custom2axis2);
-	CV_RegisterVar(&cv_custom2axis3);
-	CV_RegisterVar(&cv_custom2axis4);
-	CV_RegisterVar(&cv_custom3axis);
-	CV_RegisterVar(&cv_custom3axis2);
-	CV_RegisterVar(&cv_custom3axis3);
-	CV_RegisterVar(&cv_custom3axis4);
-	CV_RegisterVar(&cv_xdeadzone);
-	CV_RegisterVar(&cv_ydeadzone);
-	CV_RegisterVar(&cv_xdeadzone2);
-	CV_RegisterVar(&cv_ydeadzone2);
-	CV_RegisterVar(&cv_xdeadzone3);
-	CV_RegisterVar(&cv_ydeadzone3);
-	CV_RegisterVar(&cv_xdeadzone4);
-	CV_RegisterVar(&cv_ydeadzone4);
-
 	// filesrch.c
 	CV_RegisterVar(&cv_addons_option);
 	CV_RegisterVar(&cv_addons_folder);
@@ -1066,48 +987,38 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_addons_search_type);
 	CV_RegisterVar(&cv_addons_search_case);
 
-	// WARNING: the order is important when initialising mouse2
-	// we need the mouse2port
-	CV_RegisterVar(&cv_mouse2port);
-#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
-	CV_RegisterVar(&cv_mouse2opt);
-#endif
+	// g_input.c
 	CV_RegisterVar(&cv_controlperkey);
 	CV_RegisterVar(&cv_turnsmooth);
 
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		CV_RegisterVar(&cv_turnaxis[i]);
+		CV_RegisterVar(&cv_moveaxis[i]);
+		CV_RegisterVar(&cv_camturnaxis[i]);
+		CV_RegisterVar(&cv_camstrafeaxis[i]);
+		CV_RegisterVar(&cv_brakeaxis[i]);
+		CV_RegisterVar(&cv_aimaxis[i]);
+		CV_RegisterVar(&cv_lookaxis[i]);
+		CV_RegisterVar(&cv_fireaxis[i]);
+		CV_RegisterVar(&cv_driftaxis[i]);
+		CV_RegisterVar(&cv_lookbackaxis[i]);
+		CV_RegisterVar(&cv_custom1axis[i]);
+		CV_RegisterVar(&cv_custom2axis[i]);
+		CV_RegisterVar(&cv_custom3axis[i]);
+		CV_RegisterVar(&cv_xdeadzone[i]);
+		CV_RegisterVar(&cv_ydeadzone[i]);
+
+		CV_RegisterVar(&cv_usejoystick[i]);
+		CV_RegisterVar(&cv_joyscale[i]);
+		CV_RegisterVar(&cv_rumble[i]);
+		CV_RegisterVar(&cv_gamepadled[i]);
+	}
+
 	CV_RegisterVar(&cv_usemouse);
-	CV_RegisterVar(&cv_usemouse2);
 	CV_RegisterVar(&cv_invertmouse);
-	CV_RegisterVar(&cv_invertmouse2);
 	CV_RegisterVar(&cv_mousesens);
-	CV_RegisterVar(&cv_mousesens2);
 	CV_RegisterVar(&cv_mouseysens);
-	CV_RegisterVar(&cv_mouseysens2);
-	//CV_RegisterVar(&cv_mousemove);
-	//CV_RegisterVar(&cv_mousemove2);
-
-	CV_RegisterVar(&cv_usejoystick);
-	CV_RegisterVar(&cv_usejoystick2);
-	CV_RegisterVar(&cv_usejoystick3);
-	CV_RegisterVar(&cv_usejoystick4);
-#ifdef LJOYSTICK
-	CV_RegisterVar(&cv_joyport);
-	CV_RegisterVar(&cv_joyport2);
-#endif
-	CV_RegisterVar(&cv_joyscale);
-	CV_RegisterVar(&cv_joyscale2);
-	CV_RegisterVar(&cv_joyscale3);
-	CV_RegisterVar(&cv_joyscale4);
-
-	// Analog Control
-	/*CV_RegisterVar(&cv_analog);
-	CV_RegisterVar(&cv_analog2);
-	CV_RegisterVar(&cv_analog3);
-	CV_RegisterVar(&cv_analog4);
-	CV_RegisterVar(&cv_useranalog);
-	CV_RegisterVar(&cv_useranalog2);
-	CV_RegisterVar(&cv_useranalog3);
-	CV_RegisterVar(&cv_useranalog4);*/
 
 	// s_sound.c
 	CV_RegisterVar(&cv_soundvolume);
@@ -1116,7 +1027,7 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_midimusicvolume);
 #endif
 	CV_RegisterVar(&cv_numChannels);
-	
+
 #ifdef HAVE_OPENMPT
 	CV_RegisterVar(&cv_modfilter);
 	CV_RegisterVar(&cv_stereosep);
@@ -1131,11 +1042,14 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_renderview);
 	CV_RegisterVar(&cv_vhseffect);
 	CV_RegisterVar(&cv_shittyscreen);
-	CV_RegisterVar(&cv_scr_depth);
 	CV_RegisterVar(&cv_scr_width);
 	CV_RegisterVar(&cv_scr_height);
 
+	CV_RegisterVar(&cv_parallelsoftware);
+	CV_RegisterVar(&cv_paralleldrawmasked);
+
 	CV_RegisterVar(&cv_soundtest);
+<<<<<<< HEAD
 
 	CV_RegisterVar(&cv_nametag);
 	CV_RegisterVar(&cv_nametagtrans);
@@ -1156,6 +1070,8 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_driftgaugeofs);
 	CV_RegisterVar(&cv_driftgaugetrans);
 	CV_RegisterVar(&cv_driftgaugestyle);
+=======
+>>>>>>> Saturn-Next
 
 	CV_RegisterVar(&cv_perfstats);
 	CV_RegisterVar(&cv_ps_thinkframe_page);
@@ -1167,32 +1083,36 @@ void D_RegisterClientCommands(void)
 
 	CV_RegisterVar(&cv_showmusicfilename);
 
+	CV_RegisterVar(&cv_betainterscreen);
+
+	CV_RegisterVar(&cv_laglesscam);
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		CV_RegisterVar(&cv_verticallook[i]);
+	}
+
+	CV_RegisterVar(&cv_resyncdemo);
+	CV_RegisterVar(&cv_demodateformat);
+
+	CV_RegisterVar(&cv_showspecstuff);
+
 	// ingame object placing
 	COM_AddCommand("objectplace", Command_ObjectPlace_f);
 	COM_AddCommand("writethings", Command_Writethings_f);
 	CV_RegisterVar(&cv_speed);
 	CV_RegisterVar(&cv_opflags);
 	CV_RegisterVar(&cv_mapthingnum);
-	//CV_RegisterVar(&cv_grid);
-	//CV_RegisterVar(&cv_snapto);
 
 	// add cheat commands
 	COM_AddCommand("noclip", Command_CheatNoClip_f);
 	COM_AddCommand("god", Command_CheatGod_f);
 	COM_AddCommand("notarget", Command_CheatNoTarget_f);
-	/*COM_AddCommand("getallemeralds", Command_Getallemeralds_f);
-	COM_AddCommand("resetemeralds", Command_Resetemeralds_f);
-	COM_AddCommand("setrings", Command_Setrings_f);
-	COM_AddCommand("setlives", Command_Setlives_f);
-	COM_AddCommand("setcontinues", Command_Setcontinues_f);*/
 	COM_AddCommand("devmode", Command_Devmode_f);
 	COM_AddCommand("savecheckpoint", Command_Savecheckpoint_f);
 	COM_AddCommand("scale", Command_Scale_f);
 	COM_AddCommand("gravflip", Command_Gravflip_f);
 	COM_AddCommand("hurtme", Command_Hurtme_f);
-	/*COM_AddCommand("jumptoaxis", Command_JumpToAxis_f);
-	COM_AddCommand("charability", Command_Charability_f);
-	COM_AddCommand("charspeed", Command_Charspeed_f);*/
 	COM_AddCommand("teleport", Command_Teleport_f);
 	COM_AddCommand("rteleport", Command_RTeleport_f);
 	COM_AddCommand("skynum", Command_Skynum_f);
@@ -1210,8 +1130,6 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_discordasks);
 #endif
 
-	CV_RegisterVar(&cv_showspecstuff);
-
 	COM_AddCommand("listskins", Command_ListSkins);
 	COM_AddCommand("skinsearch", Command_SkinSearch);
 }
@@ -1224,19 +1142,69 @@ void D_RegisterClientCommands(void)
  */
 static void Skin_FindRealNameSkin(consvar_t *cvar)
 {
-	// Not the best way to implements this but it will do.
+	INT32 matches[MAXSKINS] = {0}; // Skin numbers of matching skins
+	INT32 matches_pos[MAXSKINS] = {0}; // Index of matching substring
+	INT32 nummatches = 0;
 
-	int i;
+	INT32 i;
 	const char *value = cvar->string;
+
 	for (i = 0; i < numskins; i++)
 	{
-		if (strncmp(value, skins[i].realname, sizeof skins[i].realname) == 0)
-		{
-			// Change the cvar to be the value of the name.
-			CV_StealthSet(cvar, skins[i].name);
+		// Perfect match with some skin name, no need to find matching realname
+		if (strncasecmp(value, skins[i].name, sizeof skins[i].name) == 0)
 			return;
+
+		const char *match = strcasestr(skins[i].realname, value);
+		if (match != NULL)
+		{
+			matches[nummatches] = i;
+			matches_pos[nummatches] = match - skins[i].realname;
+			++nummatches;
 		}
 	}
+
+	if (nummatches == 1)
+	{
+		// Change the cvar to be the value of the name.
+		CV_StealthSet(cvar, skins[matches[0]].name);
+	}
+	else if (nummatches > 1)
+	{
+		size_t query_length = strlen(value);
+
+		char start[SKINNAMESIZE+1] = {0}; // Start of name, printed with normal color
+		char match[SKINNAMESIZE+1] = {0}; // Matching part of name, highlighted in red
+		const char *end = NULL; // End of the name, printed with normal color. Can be just a pointer into realname part
+
+		CONS_Printf("\x86Multiple matches found:\n");
+
+		for (i = 0; i < nummatches; ++i)
+		{
+			const char *realname = skins[matches[i]].realname;
+
+			if (matches_pos[i] == 0)
+				start[0] = 0;
+			else
+			{
+				memcpy(start, realname, matches_pos[i]);
+				start[matches_pos[i]] = 0;
+			}
+
+			memcpy(match, realname+matches_pos[i], query_length);
+			match[matches_pos[i] + query_length] = 0;
+
+			end = realname + matches_pos[i] + query_length;
+
+			CONS_Printf("%s\x85%s\x80%s (%s)\n", start, match, end, skins[matches[i]].name);
+		}
+
+		CONS_Printf("\x86Try be more specific\n");
+	}
+	else
+	{
+		CONS_Printf("\x86Skin not found\n");
+	}
 }
 
 
@@ -1470,13 +1438,10 @@ static void SetPlayerName(INT32 playernum, char *newname)
 	else
 	{
 		CONS_Printf(M_GetText("Player %d sent a bad name change\n"), playernum+1);
+
 		if (server && netgame)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 	}
 }
@@ -1610,25 +1575,9 @@ static void SendNameAndColor(void)
 		}
 		else if ((foundskin = R_SkinAvailable(cv_skin.string)) != -1)
 		{
-			//boolean notsame;
-
 			cv_skin.value = foundskin;
-
-			//notsame = (cv_skin.value != players[consoleplayer].skin);
-
 			SetPlayerSkin(consoleplayer, cv_skin.string);
 			CV_StealthSet(&cv_skin, skins[cv_skin.value].name);
-
-			// SRB2Kart
-			/*if (notsame)
-			{
-				CV_StealthSetValue(&cv_playercolor, skins[cv_skin.value].prefcolor);
-
-				players[consoleplayer].skincolor = (cv_playercolor.value&0x3F) % MAXSKINCOLORS;
-
-				if (players[consoleplayer].mo)
-					players[consoleplayer].mo->color = (UINT8)players[consoleplayer].skincolor;
-			}*/
 		}
 		else
 		{
@@ -1663,15 +1612,16 @@ static void SendNameAndColor(void)
 	cv_skin.value = R_SkinAvailable(cv_skin.string);
 	if (cv_skin.value < 0)
 	{
-		CV_StealthSet(&cv_skin, DEFAULTSKIN);
-		cv_skin.value = 0;
+		INT32 skinnum = players[consoleplayer].skin;
+		CV_StealthSet(&cv_skin, skins[skinnum].name);
+		cv_skin.value = skinnum;
 	}
 
 	// Finally write out the complete packet and send it off.
 	WRITESTRINGN(p, cv_playername.zstring, MAXPLAYERNAME);
 	WRITEUINT8(p, (UINT8)cv_playercolor.value);
 	WRITEUINT8(p, (UINT8)cv_skin.value);
-	SendNetXCmd(XD_NAMEANDCOLOR, buf, p - buf);
+	SendNetXCmdForPlayer(0, XD_NAMEANDCOLOR, buf, p - buf);
 }
 
 // splitscreen
@@ -1741,24 +1691,8 @@ static void SendNameAndColor2(void)
 
 		if ((foundskin = R_SkinAvailable(cv_skin2.string)) != -1)
 		{
-			//boolean notsame;
-
 			cv_skin2.value = foundskin;
-
-			//notsame = (cv_skin2.value != players[secondplaya].skin);
-
 			SetPlayerSkin(secondplaya, cv_skin2.string);
-
-			// SRB2Kart
-			/*if (notsame)
-			{
-				CV_StealthSetValue(&cv_playercolor2, skins[players[secondplaya].skin].prefcolor);
-
-				players[secondplaya].skincolor = (cv_playercolor2.value&0x3F) % MAXSKINCOLORS;
-
-				if (players[secondplaya].mo)
-					players[secondplaya].mo->color = players[secondplaya].skincolor;
-			}*/
 		}
 		else
 		{
@@ -1792,15 +1726,16 @@ static void SendNameAndColor2(void)
 	cv_skin2.value = R_SkinAvailable(cv_skin2.string);
 	if (cv_skin2.value < 0)
 	{
-		CV_StealthSet(&cv_skin2, DEFAULTSKIN);
-		cv_skin2.value = 0;
+		INT32 skinnum = players[displayplayers[1]].skin;
+		CV_StealthSet(&cv_skin2, skins[skinnum].name);
+		cv_skin2.value = skinnum;
 	}
 
 	// Finally write out the complete packet and send it off.
 	WRITESTRINGN(p, cv_playername2.zstring, MAXPLAYERNAME);
 	WRITEUINT8(p, (UINT8)cv_playercolor2.value);
 	WRITEUINT8(p, (UINT8)cv_skin2.value);
-	SendNetXCmd2(XD_NAMEANDCOLOR, buf, p - buf);
+	SendNetXCmdForPlayer(1, XD_NAMEANDCOLOR, buf, p - buf);
 }
 
 static void SendNameAndColor3(void)
@@ -1861,24 +1796,8 @@ static void SendNameAndColor3(void)
 
 		if ((foundskin = R_SkinAvailable(cv_skin3.string)) != -1)
 		{
-			//boolean notsame;
-
 			cv_skin3.value = foundskin;
-
-			//notsame = (cv_skin3.value != players[thirdplaya].skin);
-
 			SetPlayerSkin(thirdplaya, cv_skin3.string);
-
-			// SRB2Kart
-			/*if (notsame)
-			{
-				CV_StealthSetValue(&cv_playercolor3, skins[players[thirdplaya].skin].prefcolor);
-
-				players[thirdplaya].skincolor = (cv_playercolor3.value&0x3F) % MAXSKINCOLORS;
-
-				if (players[thirdplaya].mo)
-					players[thirdplaya].mo->color = players[thirdplaya].skincolor;
-			}*/
 		}
 		else
 		{
@@ -1912,15 +1831,16 @@ static void SendNameAndColor3(void)
 	cv_skin3.value = R_SkinAvailable(cv_skin3.string);
 	if (cv_skin3.value < 0)
 	{
-		CV_StealthSet(&cv_skin3, DEFAULTSKIN);
-		cv_skin3.value = 0;
+		INT32 skinnum = players[displayplayers[2]].skin;
+		CV_StealthSet(&cv_skin3, skins[skinnum].name);
+		cv_skin3.value = skinnum;
 	}
 
 	// Finally write out the complete packet and send it off.
 	WRITESTRINGN(p, cv_playername3.zstring, MAXPLAYERNAME);
 	WRITEUINT8(p, (UINT8)cv_playercolor3.value);
 	WRITEUINT8(p, (UINT8)cv_skin3.value);
-	SendNetXCmd3(XD_NAMEANDCOLOR, buf, p - buf);
+	SendNetXCmdForPlayer(2, XD_NAMEANDCOLOR, buf, p - buf);
 }
 
 static void SendNameAndColor4(void)
@@ -1989,24 +1909,8 @@ static void SendNameAndColor4(void)
 
 		if ((foundskin = R_SkinAvailable(cv_skin4.string)) != -1)
 		{
-			//boolean notsame;
-
 			cv_skin4.value = foundskin;
-
-			//notsame = (cv_skin4.value != players[fourthplaya].skin);
-
 			SetPlayerSkin(fourthplaya, cv_skin4.string);
-
-			// SRB2Kart
-			/*if (notsame)
-			{
-				CV_StealthSetValue(&cv_playercolor4, skins[players[fourthplaya].skin].prefcolor);
-
-				players[fourthplaya].skincolor = (cv_playercolor4.value&0x3F) % MAXSKINCOLORS;
-
-				if (players[fourthplaya].mo)
-					players[fourthplaya].mo->color = players[fourthplaya].skincolor;
-			}*/
 		}
 		else
 		{
@@ -2040,15 +1944,16 @@ static void SendNameAndColor4(void)
 	cv_skin4.value = R_SkinAvailable(cv_skin4.string);
 	if (cv_skin4.value < 0)
 	{
-		CV_StealthSet(&cv_skin4, DEFAULTSKIN);
-		cv_skin4.value = 0;
+		INT32 skinnum = players[displayplayers[3]].skin;
+		CV_StealthSet(&cv_skin4, skins[skinnum].name);
+		cv_skin4.value = skinnum;
 	}
 
 	// Finally write out the complete packet and send it off.
 	WRITESTRINGN(p, cv_playername4.zstring, MAXPLAYERNAME);
 	WRITEUINT8(p, (UINT8)cv_playercolor4.value);
 	WRITEUINT8(p, (UINT8)cv_skin4.value);
-	SendNetXCmd4(XD_NAMEANDCOLOR, buf, p - buf);
+	SendNetXCmdForPlayer(3, XD_NAMEANDCOLOR, buf, p - buf);
 }
 
 static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
@@ -2114,12 +2019,8 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
 
 		if (kick)
 		{
-			UINT8 buf[2];
 			CONS_Alert(CONS_WARNING, M_GetText("Illegal color change received from %s (team: %d), color: %d)\n"), player_names[playernum], p->ctfteam, p->skincolor);
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 			return;
 		}
 	}
@@ -2153,11 +2054,9 @@ void SendWeaponPref(void)
 	UINT8 buf[1];
 
 	buf[0] = 0;
-	if (cv_flipcam.value)
+	if (cv_flipcam[0].value)
 		buf[0] |= 1;
-	if (cv_analog.value)
-		buf[0] |= 2;
-	SendNetXCmd(XD_WEAPONPREF, buf, 1);
+	SendNetXCmdForPlayer(0, XD_WEAPONPREF, buf, 1);
 }
 
 void SendWeaponPref2(void)
@@ -2165,11 +2064,9 @@ void SendWeaponPref2(void)
 	UINT8 buf[1];
 
 	buf[0] = 0;
-	if (cv_flipcam2.value)
+	if (cv_flipcam[1].value)
 		buf[0] |= 1;
-	if (cv_analog2.value)
-		buf[0] |= 2;
-	SendNetXCmd2(XD_WEAPONPREF, buf, 1);
+	SendNetXCmdForPlayer(1, XD_WEAPONPREF, buf, 1);
 }
 
 void SendWeaponPref3(void)
@@ -2177,11 +2074,9 @@ void SendWeaponPref3(void)
 	UINT8 buf[1];
 
 	buf[0] = 0;
-	if (cv_flipcam3.value)
+	if (cv_flipcam[2].value)
 		buf[0] |= 1;
-	if (cv_analog3.value)
-		buf[0] |= 2;
-	SendNetXCmd3(XD_WEAPONPREF, buf, 1);
+	SendNetXCmdForPlayer(2, XD_WEAPONPREF, buf, 1);
 }
 
 void SendWeaponPref4(void)
@@ -2189,11 +2084,9 @@ void SendWeaponPref4(void)
 	UINT8 buf[1];
 
 	buf[0] = 0;
-	if (cv_flipcam4.value)
+	if (cv_flipcam[3].value)
 		buf[0] |= 1;
-	if (cv_analog4.value)
-		buf[0] |= 2;
-	SendNetXCmd4(XD_WEAPONPREF, buf, 1);
+	SendNetXCmdForPlayer(3, XD_WEAPONPREF, buf, 1);
 }
 
 static void Got_WeaponPref(UINT8 **cp,INT32 playernum)
@@ -2216,6 +2109,7 @@ void D_SendPlayerConfig(void)
 		SendNameAndColor3();
 	if (splitscreen > 2)
 		SendNameAndColor4();
+
 	SendWeaponPref();
 	if (splitscreen)
 		SendWeaponPref2();
@@ -2232,14 +2126,14 @@ static void Command_ResetCamera_f(void)
 }
 
 /* Consider replacing nametonum with this */
-static INT32 LookupPlayer(const char *s)
+INT32 D_LookupPlayer(const char *s)
 {
 	INT32 playernum;
 
 	if (*s == '0')/* clever way to bypass atoi */
 		return 0;
 
-	if (( playernum = atoi(s) ))
+	if ((playernum = atoi(s)))
 	{
 		playernum = max(min(playernum, MAXPLAYERS-1), 0);/* not out of range */
 		return playernum;
@@ -2248,8 +2142,7 @@ static INT32 LookupPlayer(const char *s)
 	for (playernum = 0; playernum < MAXPLAYERS; ++playernum)
 	{
 		/* Match name case-insensitively: fully, or partially the start. */
-		if (playeringame[playernum])
-			if (strnicmp(player_names[playernum], s, strlen(s)) == 0)
+		if (playeringame[playernum] && (strnicmp(player_names[playernum], s, strlen(s)) == 0))
 		{
 			return playernum;
 		}
@@ -2260,14 +2153,18 @@ static INT32 LookupPlayer(const char *s)
 static INT32 FindPlayerByPlace(INT32 place)
 {
 	INT32 playernum;
+
 	for (playernum = 0; playernum < MAXPLAYERS; ++playernum)
-		if (playeringame[playernum])
 	{
+		if (!playeringame[playernum])
+			continue;
+
 		if (players[playernum].kartstuff[k_position] == place)
 		{
 			return playernum;
 		}
 	}
+
 	return -1;
 }
 
@@ -2320,12 +2217,11 @@ static void Command_View_f(void)
 
 	if (viewnum > 1 && !( multiplayer && demo.playback ))
 	{
-		CONS_Alert(CONS_NOTICE,
-				"You must be viewing a multiplayer replay to use this.\n");
+		CONS_Alert(CONS_NOTICE, "You must be viewing a multiplayer replay to use this.\n");
 		return;
 	}
 
-	if (demo.freecam)
+	if (camera[viewnum-1].freecam)
 		return;
 
 	displayplayerp = &displayplayers[viewnum-1];
@@ -2333,13 +2229,16 @@ static void Command_View_f(void)
 	if (COM_Argc() > 1)/* switch to player */
 	{
 		playerparam = COM_Argv(1);
+
 		if (playerparam[0] == '#')/* search by placement */
 		{
 			placenum = atoi(&playerparam[1]);
 			playernum = FindPlayerByPlace(placenum);
+
 			if (playernum == -1 || !G_CouldView(playernum))
 			{
 				GetViewablePlayerPlaceRange(&firstplace, &lastplace);
+
 				if (playernum == -1)
 				{
 					CONS_Alert(CONS_WARNING, "There is no player in that place! ");
@@ -2351,13 +2250,14 @@ static void Command_View_f(void)
 							"The first player that you can view is \x82#%d\x80; ",
 							firstplace);
 				}
+
 				CONS_Printf("Last place is \x82#%d\x80.\n", lastplace);
 				return;
 			}
 		}
 		else
 		{
-			if (( playernum = LookupPlayer(COM_Argv(1)) ) == -1)
+			if (( playernum = D_LookupPlayer(COM_Argv(1)) ) == -1)
 			{
 				CONS_Alert(CONS_WARNING, "There is no player by that name!\n");
 				return;
@@ -2399,10 +2299,9 @@ static void Command_SetViews_f(void)
 	UINT8 splits;
 	UINT8 newsplits;
 
-	if (!( demo.playback && multiplayer ))
+	if (!(demo.playback && multiplayer))
 	{
-		CONS_Alert(CONS_NOTICE,
-				"You must be viewing a multiplayer replay to use this.\n");
+		CONS_Alert(CONS_NOTICE, "You must be viewing a multiplayer replay to use this.\n");
 		return;
 	}
 
@@ -2452,6 +2351,15 @@ static void Command_Playdemo_f(void)
 		return;
 	}
 
+	if (!demo.playback && gamestate == GS_LEVEL) // special case: allow starting another demo while watching a demo
+	{
+		CONS_Printf(M_GetText("You can't play a demo while in a game.\n"));
+		return;
+	}
+
+	// turn off any open menus
+	M_ClearMenus(true);
+
 	// disconnect from server here?
 	if (demo.playback)
 		G_StopDemo();
@@ -2491,6 +2399,15 @@ static void Command_Timedemo_f(void)
 		return;
 	}
 
+	if (!demo.playback && gamestate == GS_LEVEL) // special case: allow starting another demo while watching a demo
+	{
+		CONS_Printf(M_GetText("You can't time a demo while in a game.\n"));
+		return;
+	}
+
+	// turn off any open menus
+	M_ClearMenus(true);
+
 	// disconnect from server here?
 	if (demo.playback)
 		G_StopDemo();
@@ -2525,8 +2442,6 @@ static void Command_StopMovie_f(void)
 
 INT32 mapchangepending = 0;
 
-tic_t driftsparkGrowTimer[MAXPLAYERS];
-
 /** Runs a map change.
   * The supplied data are assumed to be good. If provided by a user, they will
   * have already been checked in Command_Map_f().
@@ -2560,9 +2475,6 @@ void D_MapChange(INT32 mapnum, INT32 newgametype, boolean pencoremode, boolean r
 	CONS_Debug(DBG_GAMELOGIC, "Map change: mapnum=%d gametype=%d encoremode=%d resetplayers=%d delay=%d skipprecutscene=%d\n",
 	           mapnum, newgametype, pencoremode, resetplayers, delay, skipprecutscene);
 
-	// just gonna hack in a timer reset here...
-	memset(driftsparkGrowTimer, 0, sizeof(driftsparkGrowTimer));
-
 	if (netgame || multiplayer)
 		FLS = false;
 
@@ -2608,18 +2520,8 @@ void D_MapChange(INT32 mapnum, INT32 newgametype, boolean pencoremode, boolean r
 		// Kick bot from special stages
 		if (botskin)
 		{
-			if (G_IsSpecialStage(mapnum))
+			if (!botingame)
 			{
-				if (botingame)
-				{
-					//CL_RemoveSplitscreenPlayer();
-					botingame = false;
-					playeringame[1] = false;
-				}
-			}
-			else if (!botingame)
-			{
-				//CL_AddSplitscreenPlayer();
 				botingame = true;
 				displayplayers[1] = 1;
 				playeringame[1] = true;
@@ -2692,6 +2594,7 @@ void D_PickVote(void)
 	{
 		if (!playeringame[i] || players[i].spectator)
 			continue;
+
 		if (votes[i] != -1)
 		{
 			temppicks[numvotes] = i;
@@ -2767,11 +2670,14 @@ static tic_t last_map_cmd = 0;
 //
 static void Command_Map_f(void)
 {
-	if (I_GetTime() - last_map_cmd < 20) {
+	if (I_GetTime() - last_map_cmd < 20)
+	{
 		CONS_Alert(CONS_WARNING, "Map command is used too frequently!\n");
 		return;
 	}
 
+	M_ClearMenus(true);
+
 	last_map_cmd = I_GetTime();
 
 	size_t first_option;
@@ -2823,8 +2729,7 @@ static void Command_Map_f(void)
 	{
 		if (!multiplayer)
 		{
-			CONS_Printf(M_GetText(
-						"You can't switch gametypes in single player!\n"));
+			CONS_Printf(M_GetText("You can't switch gametypes in single player!\n"));
 			return;
 		}
 		else if (COM_Argc() < option_gametype + 2)/* no argument after? */
@@ -2914,6 +2819,14 @@ static void Command_Map_f(void)
 	// G_TOLFlag handles both multiplayer gametype and ignores it for !multiplayer
 	else
 	{
+		if (!mapheaderinfo[newmapnum-1])
+		{
+			CONS_Alert(CONS_WARNING, M_GetText("Invalid mapheaderinfo for Course %s (%s)\n"), realmapname, G_BuildMapName(newmapnum));
+			Z_Free(realmapname);
+			Z_Free(mapname);
+			return;
+		}
+
 		if (!(mapheaderinfo[newmapnum-1]->typeoflevel & G_TOLFlag(newgametype)))
 		{
 			CONS_Alert(CONS_WARNING, M_GetText("Course %s (%s) doesn't support %s mode!\n(Use -force to override)\n"), realmapname, G_BuildMapName(newmapnum),
@@ -2946,7 +2859,17 @@ static void Command_Map_f(void)
 		}
 	}
 
+	if (cv_demochangemap.value && demo.recording)
+	{
+		// spend atleast 40 seconds in one map
+		if (demo.savemode != DSM_NOTSAVING && (timeinmap > (TICRATE * 40)) && ((cv_demochangemap.value == 2 && newmapnum == gamemap) || newmapnum != gamemap))
+			G_SaveDemo();
+		else
+			G_ResetDemoRecording();
+	}
+
 	fromlevelselect = false;
+
 	D_MapChange(newmapnum, newgametype, newencoremode, newresetplayers, 0, false, false);
 
 	Z_Free(realmapname);
@@ -2975,11 +2898,7 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal map change received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -3020,9 +2939,6 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
 		CON_LogMessage(M_GetText("Speeding off to level...\n"));
 	}
 
-	if (demo.playback && !demo.timing)
-		precache = false;
-
 	if (resetplayer)
 	{
 		if (!FLS || (netgame || multiplayer))
@@ -3033,13 +2949,12 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
 		SetPlayerSkinByNum(0, cv_chooseskin.value-1);
 
 	//mapnumber = M_MapNumber(mapname[3], mapname[4]);
-	//LUAh_MapChange(mapnumber);
+	//LUA_HookInt(mapnumber, HOOK(MapChange));
 
 	demo.savemode = (cv_recordmultiplayerdemos.value == 2) ? DSM_WILLAUTOSAVE : DSM_NOTSAVING;
 	demo.savebutton = 0;
 	G_InitNew(pencoremode, mapname, resetplayer, skipprecutscene);
-	if (demo.playback && !demo.timing)
-		precache = true;
+
 	if (demo.timing)
 		G_DoneLevelLoad();
 
@@ -3098,11 +3013,7 @@ static void Got_Pause(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal pause command received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -3136,6 +3047,8 @@ static void Got_Pause(UINT8 **cp, INT32 playernum)
 		else
 			S_ResumeAudio();
 	}
+
+	G_ResetAllDeviceRumbles();
 }
 
 static void Command_ReplayMarker(void)
@@ -3145,15 +3058,30 @@ static void Command_ReplayMarker(void)
 		CONS_Printf(M_GetText("You must be in a level to use this.\n"));
 		return;
 	}
-	if (demo.savemode == DSM_WILLAUTOSAVE) {
+	if (demo.savemode == DSM_WILLAUTOSAVE)
+	{
 		demo.savemode = DSM_NOTSAVING;
 		CONS_Printf("Replay unmarked.\n");
-	} else {
-		int adjustedleveltime = leveltime - starttime;
+	}
+	else
+	{
 		demo.savemode = DSM_WILLAUTOSAVE;
+
+		int adjustedleveltime = leveltime - starttime;
+
 		if (adjustedleveltime < 0)
 			adjustedleveltime = 0;
-		snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", G_BuildMapTitle(gamemap), G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
+
+		char *title = G_BuildMapTitle(gamemap);
+
+		if (title)
+		{
+			snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
+			Z_Free(title);
+		}
+		else
+			snprintf(demo.titlename, 64, "[%i:%02d/%.5s]", G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
+
 		CONS_Printf("Replay will be saved!\n");
 	}
 }
@@ -3184,20 +3112,6 @@ static void Command_Respawn(void)
 		return;
 	}
 
-	/*if (!G_RaceGametype()) // srb2kart: not necessary, respawning makes you lose a bumper in battle, so it's not desirable to use as a way to escape a hit
-	{
-		CONS_Printf(M_GetText("You may only use this in co-op, race, and competition!\n"));
-		return;
-	}*/
-
-	// Retry is quicker.  Probably should force people to use it.
-	// nope, this is srb2kart - a complete retry is overkill
-	/*if (!(netgame || multiplayer))
-	{
-		CONS_Printf(M_GetText("You can't use this in Single Player! Use \"retry\" instead.\n"));
-		return;
-	}*/
-
 	SendNetXCmd(XD_RESPAWN, &buf, 4);
 }
 
@@ -3211,11 +3125,7 @@ static void Got_Respawn(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal respawn command received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -3225,7 +3135,7 @@ static void Got_Respawn(UINT8 **cp, INT32 playernum)
 		return;
 
 	if (players[respawnplayer].mo)
-		P_DamageMobj(players[respawnplayer].mo, NULL, NULL, 10000);
+		P_DamageMobj(players[respawnplayer].mo, NULL, NULL, DMG_INSTAKILL);
 	demo_extradata[playernum] |= DXD_RESPAWN;
 }
 
@@ -3285,11 +3195,7 @@ static void Got_Clearscores(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal clear scores command received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -3388,7 +3294,7 @@ static void Command_Teamchange_f(void)
 	}
 
 	usvalue = SHORT(NetPacket.value.l|NetPacket.value.b);
-	SendNetXCmd(XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
+	SendNetXCmdForPlayer(0, XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
 }
 
 static void Command_Teamchange2_f(void)
@@ -3479,7 +3385,7 @@ static void Command_Teamchange2_f(void)
 	}
 
 	usvalue = SHORT(NetPacket.value.l|NetPacket.value.b);
-	SendNetXCmd2(XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
+	SendNetXCmdForPlayer(1, XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
 }
 
 static void Command_Teamchange3_f(void)
@@ -3570,7 +3476,7 @@ static void Command_Teamchange3_f(void)
 	}
 
 	usvalue = SHORT(NetPacket.value.l|NetPacket.value.b);
-	SendNetXCmd3(XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
+	SendNetXCmdForPlayer(2, XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
 }
 
 static void Command_Teamchange4_f(void)
@@ -3661,7 +3567,7 @@ static void Command_Teamchange4_f(void)
 	}
 
 	usvalue = SHORT(NetPacket.value.l|NetPacket.value.b);
-	SendNetXCmd4(XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
+	SendNetXCmdForPlayer(3, XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
 }
 
 static void Command_ServerTeamChange_f(void)
@@ -3808,11 +3714,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 	}
 
@@ -3823,11 +3725,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
 			CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
 			if (server)
 			{
-				UINT8 buf[2];
-
-				buf[0] = (UINT8)playernum;
-				buf[1] = KICK_MSG_CON_FAIL;
-				SendNetXCmd(XD_KICK, &buf, 2);
+				SendKick(playernum, KICK_MSG_CON_FAIL);
 			}
 			return;
 		}
@@ -3861,11 +3759,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
 			CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
 			if (server)
 			{
-				UINT8 buf[2];
-
-				buf[0] = (UINT8)playernum;
-				buf[1] = KICK_MSG_CON_FAIL;
-				SendNetXCmd(XD_KICK, &buf, 2);
+				SendKick(playernum, KICK_MSG_CON_FAIL);
 			}
 		}
 		return;
@@ -3914,12 +3808,8 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
 
 	if (server && ((NetPacket.packet.newteam < 0 || NetPacket.packet.newteam > 3) || error))
 	{
-		UINT8 buf[2];
-
-		buf[0] = (UINT8)playernum;
-		buf[1] = KICK_MSG_CON_FAIL;
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal team change received from player %s\n"), player_names[playernum]);
-		SendNetXCmd(XD_KICK, &buf, 2);
+		SendKick(playernum, KICK_MSG_CON_FAIL);
 	}
 
 	//Safety first!
@@ -3927,19 +3817,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
 	if (!players[playernum].spectator)
 	{
 		if (players[playernum].mo)
-		{
-			//if (!players[playernum].spectator)
-				P_DamageMobj(players[playernum].mo, NULL, NULL, 10000);
-			/*else
-			{
-				if (players[playernum].mo)
-				{
-					P_RemoveMobj(players[playernum].mo);
-					players[playernum].mo = NULL;
-				}
-				players[playernum].playerstate = PST_REBORN;
-			}*/
-		}
+			P_DamageMobj(players[playernum].mo, NULL, NULL, DMG_INSTAKILL);
 		else
 			players[playernum].playerstate = PST_REBORN;
 	}
@@ -4073,10 +3951,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
 			players[playernum].mo->health = 1;
 	}
 
-	// In tag, check to see if you still have a game.
-	/*if (G_TagGametype())
-		P_CheckSurvivors();
-	else*/ if (G_BattleGametype())
+	if (G_BattleGametype())
 		K_CheckBumpers(); // SRB2Kart
 	else if (G_RaceGametype())
 		P_CheckRacers(); // also SRB2Kart
@@ -4303,11 +4178,7 @@ static void Got_Verification(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal verification received from %s (serverplayer is %s)\n"), player_names[playernum], player_names[serverplayer]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -4359,11 +4230,7 @@ static void Got_Removal(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal demotion received from %s (serverplayer is %s)\n"), player_names[playernum], player_names[serverplayer]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -4439,11 +4306,7 @@ static void Got_MotD_f(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal motd change received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 
 		Z_Free(mymotd);
@@ -4502,11 +4365,7 @@ static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal runsoc command received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -4560,7 +4419,7 @@ static void Command_Addfilelocal(void)
 	// Add any wad file, ignoring checks for if it contains complex things like
 	// lua. Great for complex but client-side customizations, like different
 	// level cards or anything like that.
-	P_AddWadFileLocal(fn);
+	P_AddWadFile(fn, true);
 }
 
 
@@ -4655,38 +4514,9 @@ static void Command_Addfile(void)
 
 /** Adds something at runtime.
   */
-static void
-Command_Addskins (void)
+static void Command_Addskins(void)
 {
-	if (COM_Argc() > 3)
-	{
-		CONS_Printf(
-				"addskins <file>: Load a skin file.\n");
-		return;
-	}
-	// no forcing?
-	/*
-	if (fasticmp(COM_Argv(2), "-force") || fasticmp(COM_Argv(2), "-f")) {
-		CONS_Alert(CONS_NOTICE, M_GetText("Adding file %s. May or may not be a skin.\n"), COM_Argv(1));
-		P_AddWadFile(COM_Argv(1), 0, true);	
-	} else {
-		if (DumbStartsWith("KC_", COM_Argv(1))) {
-			P_AddWadFile(COM_Argv(1), 0, true);
-		} else if (DumbStartsWith("KCL_", COM_Argv(1))) {
-			if (!demo.playback) {
-				CONS_Alert(CONS_ERROR, M_GetText("Cannot add file %s as it is a skin with lua. Include -force or -f to force it to load.\n"), COM_Argv(1));
-				return;
-			} else {
-	*/
-				P_AddWadFile(COM_Argv(1), true);
-	/*
-			}
-		} else {
-			CONS_Alert(CONS_ERROR, M_GetText("Cannot add file %s as it is not a skin.\n"), COM_Argv(1));
-			return;
-		}
-	}
-	*/
+	CONS_Printf("addskins has been deprecated\nuse addfilelocal instead!\n");
 }
 
 static void Command_GLocalSkin (void)
@@ -4702,7 +4532,7 @@ static void Command_GLocalSkin (void)
 
 	char* fuck; // local skin name
 
-	if (!( first_option = COM_FirstOption() ))
+	if (!(first_option = COM_FirstOption()))
 		first_option = COM_Argc();
 
 	if (first_option < 2)
@@ -4710,14 +4540,14 @@ static void Command_GLocalSkin (void)
 		/* holy fucking shit */
 		CONS_Printf("localskin <name> [-player <name>] [-display <number>] [-all]:\n");
 		CONS_Printf(M_GetText("Set a localskin via its internal name (usually printed on the console).\n\n\
-* Using \"-player\" will set a localskin to a specified player.\n\
-  Defaults to yourself.\n\
-* Using \"-display\" will set a localskin to the displayed player.\n\
-  Defaults to 0, which is the first player displayed.\n\
-  Can go up to 3 for splitscreen.\n\
-* Using \"-all\" will set a localskin to ALL players.\n\
-* \"localskin none\" removes the localskin, just like how\n\
-  \"forceskin none\" does.\n"));
+		* Using \"-player\" will set a localskin to a specified player.\n\
+		Defaults to yourself.\n\
+		* Using \"-display\" will set a localskin to the displayed player.\n\
+		Defaults to 0, which is the first player displayed.\n\
+		Can go up to 3 for splitscreen.\n\
+		* Using \"-all\" will set a localskin to ALL players.\n\
+		* \"localskin none\" removes the localskin, just like how\n\
+		\"forceskin none\" does.\n"));
 		return;
 	}
 
@@ -4748,7 +4578,7 @@ static void Command_GLocalSkin (void)
 	{
 		int i;
 
-		for (i = 0; i < MAXPLAYERS; ++i) 
+		for (i = 0; i < MAXPLAYERS; ++i)
 		{
 			if (!playeringame[i])
 				continue;
@@ -4800,10 +4630,6 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
 	boolean kick = false;
 	boolean toomany = false;
 	INT32 i,j;
-	serverinfo_pak *dummycheck = NULL;
-
-	// Shut the compiler up.
-	(void)dummycheck;
 
 	READSTRINGN(*cp, filename, 240);
 	READMEM(*cp, md5sum, 16);
@@ -4819,13 +4645,8 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
 
 	if ((playernum != serverplayer && !IsPlayerAdmin(playernum)) || kick)
 	{
-		UINT8 buf[2];
-
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal addfile command received from %s\n"), player_names[playernum]);
-
-		buf[0] = (UINT8)playernum;
-		buf[1] = KICK_MSG_CON_FAIL;
-		SendNetXCmd(XD_KICK, &buf, 2);
+		SendKick(playernum, KICK_MSG_CON_FAIL);
 		return;
 	}
 
@@ -4874,11 +4695,7 @@ static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal addfile command received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -4931,6 +4748,151 @@ static void Command_ListWADS_f(void)
 	}
 }
 
+#define MAXDOOMEDNUM 4095
+
+static void Command_ListDoomednums_f(void)
+{
+	INT16 i, j, k = 0, l = 0;
+	INT32 argc = COM_Argc();
+	INT16 table[MAXDOOMEDNUM];
+
+	switch (argc)
+	{
+		case 1:
+			l = MAXDOOMEDNUM;
+			break;
+		case 3:
+			l = atoi(COM_Argv(2));
+			if (l < 1 || l > MAXDOOMEDNUM)
+			{
+				CONS_Printf("arg 2: doomednum \x82""%d \x85out of range (1-4095)\n", k);
+				return;
+			}
+			//FALLTHRU
+		case 2:
+			k = atoi(COM_Argv(1));
+			if (k < 1 || k > MAXDOOMEDNUM)
+			{
+				CONS_Printf("arg 1: doomednum \x82""%d \x85out of range (1-4095)\n", k);
+				return;
+			}
+			if (!l)
+				l = k;
+			else if (l < k) // silently and helpfully swap.
+			{
+				j = k;
+				k = l;
+				l = j;
+			}
+			break;
+		default:
+			CONS_Printf("listmapthings: \x86too many arguments!\n");
+			return;
+	}
+
+	// see P_SpawnNonMobjMapThing
+	memset(table, 0, sizeof(table));
+	for (i = 1; i <= MAXPLAYERS; i++)
+		table[i-1] = MT_PLAYER; // playerstarts
+	table[33-1] = table[34-1] = table[35-1] = MT_PLAYER; // battle/team starts
+	table[750-1] = table[777-1] = table[778-1] = MT_UNKNOWN; // slopes
+	for (i = 600; i <= 609; i++)
+		table[i-1] = MT_RING; // placement patterns
+	table[1705-1] = table[1713-1] = MT_HOOP; // types of hoop
+
+	CONS_Printf("\x82""Checking for double defines...\n");
+	for (i = 1; i < MT_FIRSTFREESLOT+NUMMOBJFREESLOTS; i++)
+	{
+		j = mobjinfo[i].doomednum;
+		if (j < (k ? k : 1) || j > (l ? l : MAXDOOMEDNUM))
+			continue;
+		if (table[j-1])
+		{
+			CONS_Printf("	doomednum \x82""%d""\x80 is \x85""double-defined\x80 by ", j);
+			if (i < MT_FIRSTFREESLOT)
+			{
+				CONS_Printf("\x87""hardcode %s <-- MAJOR ERROR\n", MOBJTYPE_LIST[i]);
+				continue;
+			}
+			CONS_Printf("\x81""freeslot MT_""%s\n", FREE_MOBJS[i-MT_FIRSTFREESLOT]);
+			continue;
+		}
+		table[j-1] = i;
+	}
+	CONS_Printf("\x82Printing doomednum usage...\n");
+	if (!k)
+	{
+		i = 35; // skip MT_PLAYER spam
+		CONS_Printf("	doomednums \x82""1-35""\x80 are used by ""\x87""hardcode MT_PLAYER\n");
+	}
+	else
+		i = k-1;
+
+	for (; i < l; i++)
+	{
+		if (!table[i])
+		{
+			if (k)
+			{
+				CONS_Printf("	doomednum \x82""%d""\x80 is \x83""free!", i+1);
+				if (i < 99) // above the humble crawla? how dare you
+					CONS_Printf(" (Don't freeslot this low...)");
+				CONS_Printf("\n");
+			}
+			continue;
+		}
+		CONS_Printf("	doomednum \x82""%d""\x80 is used by ", i+1);
+		if (table[i] < MT_FIRSTFREESLOT)
+		{
+			CONS_Printf("\x87""hardcode %s\n", MOBJTYPE_LIST[table[i]]);
+			continue;
+		}
+		CONS_Printf("\x81""freeslot MT_""%s\n", FREE_MOBJS[table[i]-MT_FIRSTFREESLOT]);
+	}
+}
+
+#undef MAXDOOMEDNUM
+
+void Command_ListUnusedSprites_f(void)
+{
+	size_t i, j;
+
+	CONS_Printf("\x82Printing sprite non-usage...\n");
+
+	for (i = 0; i < NUMSPRITES; i++)
+	{
+		if (sprites[i].numframes)
+		{
+			// We're only showing unused sprites...
+			continue;
+		}
+
+		if (i < SPR_FIRSTFREESLOT)
+		{
+			CONS_Printf("	\x87""hardcode SPR_""%.4s\n", sprnames[i]);
+			continue;
+		}
+
+		if (used_spr[(i-SPR_FIRSTFREESLOT)/8] == 0xFF)
+		{
+			for (j = 0; j < 8; j++)
+			{
+				CONS_Printf("	\x81""freeslot SPR_""%.4s\n", sprnames[i+j]);
+			}
+
+			i += j;
+		}
+
+		if (used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8)))
+		{
+			CONS_Printf("	\x81""freeslot SPR_""%.4s\n", sprnames[i]);
+			continue;
+		}
+
+		break;
+	}
+}
+
 // =========================================================================
 //                            MISC. COMMANDS
 // =========================================================================
@@ -5220,9 +5182,6 @@ void D_GameTypeChanged(INT32 lastgametype)
 	else if (!multiplayer && !netgame)
 	{
 		gametype = GT_RACE; // SRB2kart
-		// These shouldn't matter anymore
-		//CV_Set(&cv_itemrespawntime, cv_itemrespawntime.defaultvalue);
-		//CV_SetValue(&cv_itemrespawn, 0);
 	}
 
 	// reset timelimit and pointlimit in race/coop, prevent stupid cheats
@@ -5244,19 +5203,6 @@ void D_GameTypeChanged(INT32 lastgametype)
 		}
 	}
 
-	// When swapping to a gametype that supports spectators,
-	// make everyone a spectator initially.
-	/*if (G_GametypeHasSpectators())
-	{
-		INT32 i;
-		for (i = 0; i < MAXPLAYERS; i++)
-			if (playeringame[i])
-			{
-				players[i].ctfteam = 0;
-				players[i].spectator = true;
-			}
-	}*/
-
 	// don't retain teams in other modes or between changes from ctf to team match.
 	// also, stop any and all forms of team scrambling that might otherwise take place.
 	if (G_GametypeHasTeams())
@@ -5559,11 +5505,7 @@ static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal exitlevel command received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -5581,11 +5523,7 @@ static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal vote setup received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -5646,11 +5584,7 @@ static void Got_PickVotecmd(UINT8 **cp, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal vote setup received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
@@ -5674,6 +5608,12 @@ void Command_ExitGame_f(void)
 {
 	INT32 i;
 
+	if (dedicated)
+	{
+		CONS_Printf("This command cannot be used on dedicated server\n");
+		return;
+	}
+
 	D_QuitNetGame();
 	CL_Reset();
 	CV_ClearChangedFlags();
@@ -5687,6 +5627,7 @@ void Command_ExitGame_f(void)
 	botskin = 0;
 	cv_debug = 0;
 	emeralds = 0;
+	automapactive = false;
 
 	if (dirmenu)
 		closefilemenu(true);
@@ -5701,10 +5642,6 @@ void Command_Retry_f(void)
 		CONS_Printf(M_GetText("You must be in a level to use this.\n"));
 	else if (netgame || multiplayer)
 		CONS_Printf(M_GetText("This only works in single player.\n"));
-	/*else if (!&players[consoleplayer] || players[consoleplayer].lives <= 1)
-		CONS_Printf(M_GetText("You can't retry without any lives remaining!\n"));
-	else if (G_IsSpecialStage(gamemap))
-		CONS_Printf(M_GetText("You can't retry special stages!\n"));*/
 	else
 	{
 		M_ClearMenus(true);
@@ -5737,12 +5674,8 @@ static void Fishcake_OnChange(void)
   */
 static void Command_Isgamemodified_f(void)
 {
-	if (majormods)
-		CONS_Printf("The game has been modified with major addons, so you cannot play Record Attack.\n");
-	else if (savemoddata)
-		CONS_Printf("The game has been modified with an addon with its own save data, so you can play Record Attack and earn medals.\n");
-	else if (modifiedgame)
-		CONS_Printf("The game has been modified with only minor addons. You can play Record Attack, earn medals and unlock extras.\n");
+	if (majormods || modifiedgame)
+		CONS_Printf("The game has been modified, Record Attack data will be saved to a seperate savegame.\n");
 	else
 		CONS_Printf("The game has not been modified. You can play Record Attack, earn medals and unlock extras.\n");
 }
@@ -5774,10 +5707,9 @@ static void Command_Togglemodified_f(void)
 	modifiedgame = !modifiedgame;
 }
 
-extern UINT8 *save_p;
 static void Command_Archivetest_f(void)
 {
-	UINT8 *buf;
+	savebuffer_t save;
 	UINT32 i, wrote;
 	thinker_t *th;
 	if (gamestate != GS_LEVEL)
@@ -5789,33 +5721,32 @@ static void Command_Archivetest_f(void)
 	// assign mobjnum
 	i = 1;
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
-		if (th->function.acp1 == (actionf_p1)P_MobjThinker)
-			if (th->function.acp1 != (actionf_p1)P_RemoveThinkerDelayed)
-				((mobj_t *)th)->mobjnum = i++;
+		if (th->function == (actionf_p1)P_MobjThinker)
+			((mobj_t *)th)->mobjnum = i++;
 
 	// allocate buffer
-	buf = save_p = ZZ_Alloc(1024);
+	save.buffer = save.p = ZZ_Alloc(1024);
 
 	// test archive
 	CONS_Printf("LUA_Archive...\n");
-	LUA_Archive();
-	WRITEUINT8(save_p, 0x7F);
-	wrote = (UINT32)(save_p-buf);
+	LUA_Archive(&save, true);
+	WRITEUINT8(save.p, 0x7F);
+	wrote = (UINT32)(save.p - save.buffer);
 
 	// clear Lua state, so we can really see what happens!
 	CONS_Printf("Clearing state!\n");
 	LUA_ClearExtVars();
 
 	// test unarchive
-	save_p = buf;
+	save.p = save.buffer;
 	CONS_Printf("LUA_UnArchive...\n");
-	LUA_UnArchive();
-	i = READUINT8(save_p);
-	if (i != 0x7F || wrote != (UINT32)(save_p-buf))
-		CONS_Printf("Savegame corrupted. (write %u, read %u)\n", wrote, (UINT32)(save_p-buf));
+	LUA_UnArchive(&save, true);
+	i = READUINT8(save.p);
+	if (i != 0x7F || wrote != (UINT32)(save.p - save.buffer))
+		CONS_Printf("Savegame corrupted. (write %u, read %u)\n", wrote, (UINT32)(save.p - save.buffer));
 
 	// free buffer
-	Z_Free(buf);
+	Z_Free(save.buffer);
 	CONS_Printf("Done. No crash.\n");
 }
 #endif
@@ -6034,7 +5965,7 @@ static void Command_ListSkins(void)
 }
 
 static void Command_SkinSearch(void)
-{	
+{
 	size_t i;
 	UINT16 s;
 	UINT16 ic = 0;
@@ -6044,7 +5975,7 @@ static void Command_SkinSearch(void)
 		{
 			skin_t *skininput = &skins[s];
 			if (strcasestr(skininput->realname,COM_Argv(i)))
-			{	
+			{
 				ic++;
 				CONS_Printf("%d. %s%s:\x80 %s\n", ic,HU_SkinColorToConsoleColor(skininput->prefcolor),skininput->realname,skininput->name);
 			}
@@ -6289,11 +6220,7 @@ void Got_DiscordInfo(UINT8 **p, INT32 playernum)
 		CONS_Alert(CONS_WARNING, M_GetText("Illegal Discord info command received from %s\n"), player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
 		return;
 	}
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index ad4789313..47a2b302e 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -15,8 +15,17 @@
 #ifndef __D_NETCMD__
 #define __D_NETCMD__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "command.h"
 
+void SendWeaponPref(void);
+void SendWeaponPref2(void);
+void SendWeaponPref3(void);
+void SendWeaponPref4(void);
+
 // console vars
 extern consvar_t cv_playername;
 extern consvar_t cv_playercolor;
@@ -43,25 +52,12 @@ extern consvar_t cv_seenames, cv_allowseenames;
 extern consvar_t cv_usemouse;
 //WTF
 extern consvar_t cv_mouseturn;
-extern consvar_t cv_usejoystick;
-extern consvar_t cv_usejoystick2;
-extern consvar_t cv_usejoystick3;
-extern consvar_t cv_usejoystick4;
+extern consvar_t cv_usejoystick[4]; //MAXSPLITSCREENPLAYERS
 #ifdef LJOYSTICK
 extern consvar_t cv_joyport;
 extern consvar_t cv_joyport2;
 #endif
-extern consvar_t cv_joyscale;
-extern consvar_t cv_joyscale2;
-extern consvar_t cv_joyscale3;
-extern consvar_t cv_joyscale4;
-
-// splitscreen with second mouse
-extern consvar_t cv_mouse2port;
-extern consvar_t cv_usemouse2;
-#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
-extern consvar_t cv_mouse2opt;
-#endif
+extern consvar_t cv_joyscale[4]; //MAXSPLITSCREENPLAYERS
 
 // normally in p_mobj but the .h is not read
 extern consvar_t cv_itemrespawntime;
@@ -128,6 +124,7 @@ extern consvar_t cv_kartvoterulechanges;
 extern consvar_t cv_kartgametypepreference;
 extern consvar_t cv_kartspeedometer;
 extern consvar_t cv_kartvoices;
+extern consvar_t cv_karthitemdialog;
 
 extern consvar_t cv_karteliminatelast;
 
@@ -161,10 +158,12 @@ extern consvar_t cv_pingstyle;
 //extern consvar_t cv_smallpos;
 extern consvar_t cv_showminimapnames;
 extern consvar_t cv_minihead;
+extern consvar_t cv_showminimapangle;
 
-extern consvar_t cv_showlapemblem; 
+extern consvar_t cv_showlapemblem;
 
 extern consvar_t cv_showviewpointtext;
+extern consvar_t cv_showdownloadprompt;
 extern consvar_t cv_luaimmersion;
 extern consvar_t cv_fakelocalskin;
 extern consvar_t cv_showlocalskinmenus;
@@ -183,9 +182,7 @@ extern consvar_t cv_nametagdist;
 extern consvar_t cv_showownnametag;
 extern consvar_t cv_smallnametags;
 extern consvar_t cv_nametagrestat;
-extern consvar_t cv_nametaghop;
 extern consvar_t cv_nametagscore;
-extern consvar_t cv_shownametagfinish;
 extern consvar_t cv_shownametagspectator;
 
 #define SKINSELECTSPIN_PAIN 25
@@ -201,7 +198,11 @@ extern consvar_t cv_ps_thinkframe_page;
 extern consvar_t cv_ps_samplesize;
 extern consvar_t cv_ps_descriptor;
 
+<<<<<<< HEAD
 extern consvar_t cv_director, cv_kartdebugdirector;
+=======
+extern consvar_t cv_director, cv_kartdebugdirector, cv_showdirectorhud;
+>>>>>>> Saturn-Next
 
 extern consvar_t cv_showtrackaddon;
 
@@ -209,6 +210,8 @@ extern consvar_t cv_showspecstuff;
 
 extern consvar_t cv_betainterscreen;
 
+extern consvar_t cv_laglesscam;
+
 typedef enum
 {
 	SKINMENUTYPE_SCROLL = 0,
@@ -306,8 +309,6 @@ typedef union {
 #pragma pack()
 #endif
 
-extern tic_t driftsparkGrowTimer[16];
-
 // add game commands, needs cleanup
 void D_RegisterServerCommands(void);
 void D_RegisterClientCommands(void);
@@ -326,8 +327,13 @@ void ClearAdminPlayers(void);
 void RemoveAdminPlayer(INT32 playernum);
 void ItemFinder_OnChange(void);
 void D_SetPassword(const char *pw);
+INT32 D_LookupPlayer(const char *s);
 
 // used for the player setup menu
 UINT8 CanChangeSkin(INT32 playernum);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 7bf862f90..76459caef 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -64,11 +64,11 @@ 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 defined(CURL_AT_LEAST_VERSION) && CURL_AT_LEAST_VERSION(7, 35, 0)
-int curlprogress_callbackx(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow);
-#define XFERINFOFUNCTION
+#if (LIBCURL_VERSION_MAJOR <= 7) && (LIBCURL_VERSION_MINOR < 35)
+static int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
 #else
-int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
+static int curlprogress_callbackx(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow);
+#define XFERINFOFUNCTION
 #endif
 #endif
 
@@ -111,26 +111,19 @@ static fileused_t transferFiles[UINT8_MAX + 1];
 // Receiver structure
 INT32 fileneedednum; // 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";
 
-#ifdef CLIENT_LOADINGSCREEN
-// for cl loading screen
-INT32 lastfilenum = -1;
-INT32 downloadcompletednum = 0;
-UINT32 downloadcompletedsize = 0;
-INT32 totalfilesrequestednum = 0;
-UINT32 totalfilesrequestedsize = 0;
-#endif
+file_download_t filedownload;
 
 #ifdef HAVE_CURL
 static CURL *http_handle;
 static CURLM *multi_handle;
-boolean curl_running = false;
-boolean curl_failedwebdownload = false;
-static double curl_dlnow;
-static double curl_dltotal;
+static UINT32 curl_dlnow;
+static UINT32 curl_dltotal;
 static time_t curl_starttime;
-INT32 curl_transfers = 0;
 static int curl_runninghandles = 0;
 static UINT32 curl_origfilesize;
 static UINT32 curl_origtotalfilesize;
@@ -149,6 +142,7 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
 {
 	size_t i;
 	UINT8 count = 0;
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	UINT8 *p_start = netbuffer->packettype == PT_MOREFILESNEEDED ? netbuffer->u.filesneededcfg.files : netbuffer->u.serverinfo.fileneeded;
 	UINT8 *p = p_start;
 	char wadfilename[MAX_WADPATH] = "";
@@ -221,6 +215,7 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
 	for (i = firstfile; i < fileneedednum; i++)
 	{
 		fileneeded[i].status = FS_NOTCHECKED; // We haven't even started looking for the file yet
+		fileneeded[i].justdownloaded = false;
 		filestatus = READUINT8(p); // The first byte is the file status
 		fileneeded[i].willsend = (UINT8)(filestatus >> 4);
 		fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size
@@ -232,8 +227,12 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
 
 void CL_PrepareDownloadSaveGame(const char *tmpsave)
 {
+#ifdef CLIENT_LOADINGSCREEN
+	filedownload.current = -1;
+#endif
 	fileneedednum = 1;
 	fileneeded[0].status = FS_REQUESTED;
+	fileneeded[0].justdownloaded = false;
 	fileneeded[0].totalsize = UINT32_MAX;
 	fileneeded[0].file = NULL;
 	memset(fileneeded[0].md5sum, 0, 16);
@@ -325,6 +324,7 @@ boolean CL_SendRequestFile(void)
 #ifdef MORELEGACYDOWNLOADER
 	boolean firstloop = true;
 #endif
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 #ifdef PARANOIA
 	if (M_CheckParm("-nodownload"))
@@ -453,9 +453,11 @@ tryagain:
 // returns false if a requested file was not found or cannot be sent
 boolean Got_RequestFilePak(INT32 node)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	char wad[MAX_WADPATH+1];
 	UINT8 *p = netbuffer->u.textcmd;
 	UINT8 id;
+
 	while (p < netbuffer->u.textcmd + MAXTEXTCMD) // Don't allow hacked client to overflow
 	{
 		id = READUINT8(p);
@@ -548,13 +550,13 @@ INT32 CL_CheckFiles(void)
 	{
 		if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD || fileneeded[i].status == FS_FALLBACK)
 			downloadrequired = true;
-		
+
 		if (fileneeded[i].status != FS_OPEN)
 			filestoload++;
 
 		if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
 			continue;
-		
+
 		CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
 
 		// Check in already loaded files
@@ -658,13 +660,10 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 		q = &((*q)->next);
 
 	// Allocate a file request and append it to the file list
-	p = *q = (filetx_t *)malloc(sizeof (filetx_t));
+	p = *q = (filetx_t *)calloc(1, sizeof(filetx_t)); // Initialise with zeros
 	if (!p)
 		I_Error("SV_SendFile: No more memory\n");
 
-	// Initialise with zeros
-	memset(p, 0, sizeof (filetx_t));
-
 	// Allocate the file name
 	p->id.filename = (char *)malloc(MAX_WADPATH);
 	if (!p->id.filename)
@@ -743,13 +742,10 @@ void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod, UI
 		q = &((*q)->next);
 
 	// Allocate a file request and append it to the file list
-	p = *q = (filetx_t *)malloc(sizeof (filetx_t));
+	p = *q = (filetx_t *)calloc(1, sizeof(filetx_t)); // Initialise with zeros
 	if (!p)
 		I_Error("SV_SendRam: No more memory\n");
 
-	// Initialise with zeros
-	memset(p, 0, sizeof (filetx_t));
-
 	p->ram = freemethod; // Remember how to free the memory block for when we're done sending it
 	p->id.ram = data;
 	p->size = (UINT32)size;
@@ -825,6 +821,7 @@ void SV_FileSendTicker(void)
 	size_t size;
 	filetx_t *f;
 	INT32 packetsent, ram, i, j;
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	if (!filestosend) // No file to send
 		return;
@@ -833,6 +830,7 @@ void SV_FileSendTicker(void)
 
 	netbuffer->packettype = PT_FILEFRAGMENT;
 
+	// (((sendbytes-nowsentbyte)*TICRATE)/(I_GetTime()-starttime)<(UINT32)net_bandwidth)
 	while (packetsent-- && filestosend != 0)
 	{
 		for (i = currentnode, j = 0; j < MAXNETNODES;
@@ -863,8 +861,12 @@ void SV_FileSendTicker(void)
 
 					if (!transferFiles[f->fileid].file)
 					{
-						I_Error("Can't open file %s: %s",
+						CONS_Alert(CONS_ERROR, "Can't open file %s: %s\n",
 							f->id.filename, strerror(errno));
+
+						SV_EndFileSend(i);
+						HSendPacket(i, true, 0, PT_SERVERREFUSE);
+						break;
 					}
 				}
 
@@ -948,6 +950,7 @@ void SV_FileSendTicker(void)
 
 void Got_Filetxpak(void)
 {
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	INT32 filenum = netbuffer->u.filetxpak.fileid;
 	fileneeded_t *file = &fileneeded[filenum];
 	char *filename = file->filename;
@@ -969,7 +972,7 @@ void Got_Filetxpak(void)
 
 	if (filenum >= fileneedednum)
 	{
-		DEBFILE(va("fileframent not needed %d>%d\n", filenum, fileneedednum));
+		DEBFILE(va("filefragment not needed %d>%d\n", filenum, fileneedednum));
 		//I_Error("Received an unneeded file fragment (file id received: %d, file id needed: %d)\n", filenum, fileneedednum);
 		return;
 	}
@@ -990,6 +993,7 @@ void Got_Filetxpak(void)
 	{
 		UINT32 pos = LONG(netbuffer->u.filetxpak.position);
 		UINT16 size = SHORT(netbuffer->u.filetxpak.size);
+
 		// Use a special trick to know when the file is complete (not always used)
 		// WARNING: file fragments can arrive out of order so don't stop yet!
 		if (pos & 0x80000000)
@@ -1009,15 +1013,16 @@ void Got_Filetxpak(void)
 			fclose(file->file);
 			file->file = NULL;
 			file->status = FS_FOUND;
+			file->justdownloaded = true;
 			CONS_Printf(M_GetText("Downloading %s...(done)\n"),
 				filename);
 #ifndef NONET
-			downloadcompletednum++;
-			downloadcompletedsize += file->totalsize;
+			filedownload.completednum++;
+			filedownload.completedsize += file->totalsize;
 #endif
 		}
 	}
-	else
+	else if (!file->justdownloaded)
 	{
 		const char *s;
 		switch(file->status)
@@ -1040,6 +1045,7 @@ void Got_Filetxpak(void)
 		}
 		I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
 	}
+
 	// Send ack back quickly
 	if (++filetime == 3)
 	{
@@ -1048,7 +1054,7 @@ void Got_Filetxpak(void)
 	}
 
 #ifdef CLIENT_LOADINGSCREEN
-	lastfilenum = filenum;
+	filedownload.current = filenum;
 #endif
 }
 
@@ -1185,6 +1191,18 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 		badmd5 = true;
 	// if not found at all, just move on without doing anything
 
+	if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
+	{
+		// next, check any custom directory if specified
+		homecheck = filesearch(filename, cv_addons_folder.string, wantedmd5sum, completepath, 10);
+
+		if (homecheck == FS_FOUND) // we found the file, so return that we have :)
+			return FS_FOUND;
+		else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5
+			badmd5 = true;
+		// if not found at all, just move on without doing anything
+	}
+
 	// finally check "." directory
 	homecheck = filesearch(filename, ".", wantedmd5sum, completepath, 10);
 
@@ -1197,31 +1215,57 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 #ifdef HAVE_CURL
 size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream)
 {
-    size_t written;
-    written = fwrite(ptr, size, nmemb, stream);
-    return written;
+   return fwrite(ptr, size, nmemb, stream);
 }
 
 #ifdef XFERINFOFUNCTION
-int curlprogress_callbackx(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
+static int curlprogress_callbackx(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
 {
+	time_t curtime;
+
 	(void)clientp;
 	(void)ultotal;
 	(void)ulnow; // Function prototype requires these but we won't use, so just discard
-	curl_dlnow = dlnow;
-	curl_dltotal = dltotal;
-	getbytes = curl_dlnow / (time(NULL) - curl_starttime); // To-do: Make this more accurate???
+
+	curtime = time(NULL);
+
+	curl_dlnow = (UINT32)dlnow;
+	curl_dltotal = (UINT32)dltotal;
+
+	if (curtime > curl_starttime)
+	{
+		getbytes = ((double)dlnow) / (curtime - curl_starttime); // To-do: Make this more accurate???
+	}
+	else
+	{
+		getbytes = 0;
+	}
+
 	return 0;
 }
 #else
-int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
+static int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
 {
+	time_t curtime;
+
 	(void)clientp;
 	(void)ultotal;
 	(void)ulnow; // Function prototype requires these but we won't use, so just discard
-	curl_dlnow = dlnow;
-	curl_dltotal = dltotal;
-	getbytes = curl_dlnow / (time(NULL) - curl_starttime); // To-do: Make this more accurate???
+
+	curtime = time(NULL);
+
+	curl_dlnow = (UINT32)dlnow;
+	curl_dltotal = (UINT32)dltotal;
+
+	if (curtime > curl_starttime)
+	{
+		getbytes = ((double)dlnow) / (curtime - curl_starttime); // To-do: Make this more accurate???
+	}
+	else
+	{
+		getbytes = 0;
+	}
+
 	return 0;
 }
 #endif
@@ -1257,10 +1301,10 @@ void CURLPrepareFile(const char* url, int dfilenum)
 		curl_easy_setopt(http_handle, CURLOPT_URL, va("%s/%s", url, curl_realname));
 
 		// Only allow HTTP and HTTPS
-#if defined(CURL_AT_LEAST_VERSION) && CURL_AT_LEAST_VERSION(7, 85, 0)
-		curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS_STR, "http,https");
-#else
+#if (LIBCURL_VERSION_MAJOR <= 7) && (LIBCURL_VERSION_MINOR < 85)
 		curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
+#else
+		curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS_STR, "http,https");
 #endif
 
 		curl_easy_setopt(http_handle, CURLOPT_USERAGENT, va("SRB2Kart/v%d.%d", VERSION, SUBVERSION)); // Set user agent as some servers won't accept invalid user agents.
@@ -1282,6 +1326,21 @@ void CURLPrepareFile(const char* url, int dfilenum)
 
 		strcatbf(curl_curfile->filename, downloaddir, "/");
 		curl_curfile->file = fopen(curl_curfile->filename, "wb");
+
+		if (!curl_curfile->file)
+		{
+			CONS_Alert(CONS_ERROR, "Couldnt open %s for writing!\nAborting file download.\nCheck if you have write access to your download folder!\n", curl_curfile->filename);
+			CL_AbortConnection();
+			M_StartMessage(M_GetText(
+				"An error occured when trying to\n"
+				"download missing addons.\n"
+				"See the console or log file\n"
+				"for additional details.\n\n"
+				"Press ESC\n"
+			), NULL, MM_NOTHING);
+			return;
+		}
+
 		curl_easy_setopt(http_handle, CURLOPT_WRITEDATA, curl_curfile->file);
 		curl_easy_setopt(http_handle, CURLOPT_WRITEFUNCTION, curlwrite_data);
 		curl_easy_setopt(http_handle, CURLOPT_NOPROGRESS, 0L);
@@ -1292,26 +1351,38 @@ void CURLPrepareFile(const char* url, int dfilenum)
 #endif
 
 		curl_curfile->status = FS_DOWNLOADING;
-		lastfilenum = dfilenum;
 		curl_multi_add_handle(multi_handle, http_handle);
 
 		curl_multi_perform(multi_handle, &curl_runninghandles);
 		curl_starttime = time(NULL);
 
-		curl_running = true;
+		filedownload.current = dfilenum;
+		filedownload.http_running = true;
+
 #ifdef HAVE_THREADS
 		I_spawn_thread("http-download", (I_thread_fn)CURLGetFile, NULL);
 #endif
 	}
+	else
+		filedownload.http_running = false;
 }
 
 void CURLAbortFile(void)
 {
-	curl_running = false;
+	filedownload.http_running = false;
+
+#ifdef HAVE_THREADS
+	// lock and unlock to wait for the download thread to exit
+	I_lock_mutex(&downloadmutex);
+	I_unlock_mutex(downloadmutex);
+#endif
 }
 
 void CURLGetFile(void)
 {
+#ifdef HAVE_THREADS
+	I_lock_mutex(&downloadmutex);
+#endif
 	CURLMcode mc; /* return code used by curl_multi_wait() */
 	CURLcode easyres; /* Return from easy interface */
 	CURLMsg *m; /* for picking up messages with the transfer status */
@@ -1319,10 +1390,8 @@ void CURLGetFile(void)
 	int msgs_left; /* how many messages are left */
 	const char *easy_handle_error;
 	boolean running = true;
-	long response_code = 0;
-	static char *filename;
 
-	while (running && curl_running)
+	while (running && filedownload.http_running)
     {
     	if (curl_runninghandles)
 		{
@@ -1336,6 +1405,7 @@ void CURLGetFile(void)
 				CONS_Alert(CONS_WARNING, "curl_multi_wait() failed, code %d.\n", mc);
 				continue;
 			}
+
 			curl_curfile->currentsize = curl_dlnow;
 			curl_curfile->totalsize = curl_dltotal;
 		}
@@ -1349,11 +1419,13 @@ void CURLGetFile(void)
 				e = m->easy_handle;
 				easyres = m->data.result;
 
-				filename = Z_StrDup(curl_realname);
+				char *filename = Z_StrDup(curl_realname);
 				nameonly(filename);
 
 				if (easyres != CURLE_OK)
 				{
+					long response_code = 0;
+
 					if (easyres == CURLE_HTTP_RETURNED_ERROR)
 						curl_easy_getinfo(e, CURLINFO_RESPONSE_CODE, &response_code);
 
@@ -1361,7 +1433,7 @@ void CURLGetFile(void)
 					curl_curfile->status = FS_FALLBACK;
 					curl_curfile->currentsize = curl_origfilesize;
 					curl_curfile->totalsize = curl_origtotalfilesize;
-					curl_failedwebdownload = true;
+					filedownload.http_failed = true;
 					fclose(curl_curfile->file);
 					remove(curl_curfile->filename);
 					CONS_Printf(M_GetText("Failed to download %s (%s)\n"), filename, easy_handle_error);
@@ -1374,36 +1446,40 @@ void CURLGetFile(void)
 					{
 						CONS_Alert(CONS_ERROR, M_GetText("HTTP Download of %s finished but is corrupt or has been modified\n"), filename);
 						curl_curfile->status = FS_FALLBACK;
-						curl_failedwebdownload = true;
+						filedownload.http_failed = true;
 					}
 					else
 					{
 						CONS_Printf(M_GetText("Finished HTTP download of %s\n"), filename);
-						downloadcompletednum++;
-						downloadcompletedsize += curl_curfile->totalsize;
+						filedownload.completednum++;
+						filedownload.completedsize += curl_curfile->totalsize;
 						curl_curfile->status = FS_FOUND;
 					}
 				}
 
 				Z_Free(filename);
 				curl_curfile->file = NULL;
-				curl_transfers--;
+				filedownload.remaining--;
 				curl_multi_remove_handle(multi_handle, e);
 				curl_easy_cleanup(e);
 
-				if (!curl_transfers)
+				if (!filedownload.remaining)
 					break;
 			}
 		}
 	}
 
-    if (!curl_transfers || !curl_running)
+    if (!filedownload.remaining || !filedownload.http_running)
     {
 		curl_multi_cleanup(multi_handle);
 		curl_global_cleanup();
 		multi_handle = NULL;
     }
-	curl_running = false;
+
+	filedownload.http_running = false;
+#ifdef HAVE_THREADS
+	I_unlock_mutex(downloadmutex);
+#endif
 }
 
 HTTP_login *
diff --git a/src/d_netfil.h b/src/d_netfil.h
index bd54b7661..b84c83391 100644
--- a/src/d_netfil.h
+++ b/src/d_netfil.h
@@ -13,6 +13,11 @@
 #ifndef __D_NETFIL__
 #define __D_NETFIL__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "d_clisrv.h"
 #include "w_wad.h"
 
 typedef enum
@@ -45,24 +50,35 @@ typedef struct
 	UINT32 currentsize;
 	UINT32 totalsize;
 	filestatus_t status; // The value returned by recsearch
+	boolean justdownloaded; // To prevent late fragments from causing an I_Error
 } fileneeded_t;
 
 extern INT32 fileneedednum;
 extern fileneeded_t fileneeded[MAX_WADFILES];
 extern char downloaddir[512];
 
+typedef struct
+{
 #ifdef CLIENT_LOADINGSCREEN
-extern INT32 lastfilenum;
-extern INT32 downloadcompletednum;
-extern UINT32 downloadcompletedsize;
-extern INT32 totalfilesrequestednum;
-extern UINT32 totalfilesrequestedsize;
+	INT32 current;
+	INT32 completednum;
+	UINT32 completedsize;
+	INT32 totalnum;
+	UINT32 totalsize;
 #endif
 
 #ifdef HAVE_CURL
-extern boolean curl_failedwebdownload;
-extern boolean curl_running;
-extern INT32 curl_transfers;
+	INT32 remaining;
+	boolean http_failed;
+	boolean http_running;
+
+	char http_source[MAX_MIRROR_LENGTH+1];
+#endif
+} file_download_t;
+
+extern file_download_t filedownload;
+
+#ifdef HAVE_CURL
 
 typedef struct HTTP_login HTTP_login;
 
@@ -113,4 +129,8 @@ 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
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // __D_NETFIL__
diff --git a/src/d_player.h b/src/d_player.h
index 183991606..2e0beea69 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -347,6 +347,25 @@ typedef enum
 	RW_RAIL    = 32
 } ringweapons_t;
 
+// enum for saved lap times
+typedef enum
+{
+	LAP_CUR,
+	LAP_BEST,
+	LAP_LAST,
+	LAP__MAX
+} laptime_e;
+
+// yes i made a whole struct for this :chonkbuncle:
+typedef struct squishdance_s
+{
+	tic_t   countdown; // hold "custom 3" for 2 seconds to engange le dance
+	tic_t   time;
+	fixed_t work;
+	fixed_t ang;
+	fixed_t bounce;    // hehe squishy
+} squishdance_t;
+
 // ========================================================================
 //                          PLAYER STRUCTURE
 // ========================================================================
@@ -393,9 +412,8 @@ typedef struct player_s
 	INT32 kartstuff[NUMKARTSTUFF];
 	angle_t frameangle; // for the player add the ability to have the sprite only face other angles
 	angle_t old_frameangle, old_frameangle2;
-	
+
 	// SRB2Kart CEP: Sliptide rolling
-	INT32 sliptidemem;
 	angle_t sliproll;
 
 	INT16 lturn_max[MAXPREDICTTICS]; // What's the expected turn value for full-left for a number of frames back (to account for netgame latency)?
@@ -465,6 +483,7 @@ typedef struct player_s
 	INT16 numboxes; // Number of item boxes obtained for Race Mode
 	INT16 totalring; // Total number of rings obtained for Race Mode
 	tic_t realtime; // integer replacement for leveltime
+	tic_t laptime[LAP__MAX];
 	UINT8 laps; // Number of laps (optional)
 
 	////////////////////
@@ -537,10 +556,25 @@ typedef struct player_s
 	tic_t grieftime;
 	UINT8 griefstrikes;
 
+<<<<<<< HEAD
 	UINT8 splitscreenindex;
 #ifdef HWRENDER
 	fixed_t fovadd; // adjust FOV for hw rendering
 #endif
+=======
+	tic_t hitemtimer;
+	UINT8 hitemvictim;
+
+	UINT8 splitscreenindex;
+
+	tic_t driftsparkGrowTimer;
+
+	fixed_t spinoutrot; // When a player spins out, this value increments modulus 360.
+
+	squishdance_t squishdance;
+
+	fixed_t fovadd; // adjust FOV for hw rendering
+>>>>>>> Saturn-Next
 } player_t;
 
 #endif
diff --git a/src/d_think.h b/src/d_think.h
index b907c17fd..1ef2577dc 100644
--- a/src/d_think.h
+++ b/src/d_think.h
@@ -17,6 +17,8 @@
 #ifndef __D_THINK__
 #define __D_THINK__
 
+#include "doomdef.h"
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -26,18 +28,11 @@
 // To compile this as "ANSI C with classes" we will need to handle the various
 //  action functions cleanly.
 //
-typedef void (*actionf_v)();
 typedef void (*actionf_p1)(void *);
 
-typedef union
-{
-	actionf_v acv;
-	actionf_p1 acp1;
-} actionf_t;
-
 // Historically, "think_t" is yet another function pointer to a routine
 // to handle an actor.
-typedef actionf_t think_t;
+typedef actionf_p1 think_t;
 
 // Doubly linked list of actors.
 typedef struct thinker_s
@@ -49,6 +44,11 @@ typedef struct thinker_s
 	// killough 11/98: count of how many other objects reference
 	// this one using pointers. Used for garbage collection.
 	INT32 references;
+	boolean cachable;
+#ifdef PARANOIA
+	INT32 debug_mobjtype;
+	tic_t debug_time;
+#endif
 } thinker_t;
 
 #endif
diff --git a/src/dedicated/CMakeLists.txt b/src/dedicated/CMakeLists.txt
new file mode 100644
index 000000000..36f670251
--- /dev/null
+++ b/src/dedicated/CMakeLists.txt
@@ -0,0 +1,108 @@
+# Declare dedicated interface sources
+
+target_sourcefile(c)
+
+target_sources(SRB2SDL2 PRIVATE)
+
+if(${CMAKE_SYSTEM} MATCHES Windows)
+	target_sources(SRB2SDL2 PRIVATE
+		../win32/win_dbg.c
+		../win32/Srb2win.rc)
+endif()
+
+if(${CMAKE_SYSTEM} MATCHES Windows)
+	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy)
+elseif(${CMAKE_SYSTEM} MATCHES Linux)
+	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2dlegacy)
+else()
+	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy)
+endif()
+
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+	find_library(CORE_LIB CoreFoundation)
+	target_link_libraries(SRB2SDL2 PRIVATE
+		${CORE_LIB}
+		${PNG_LIBRARIES}
+		${ZLIB_LIBRARIES}
+	)
+	set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
+else()
+	target_link_libraries(SRB2SDL2 PRIVATE
+		${PNG_LIBRARIES}
+		${ZLIB_LIBRARIES}
+	)
+
+	if(${CMAKE_SYSTEM} MATCHES Linux)
+		target_link_libraries(SRB2SDL2 PRIVATE
+			m
+			rt
+		)
+	endif()
+endif()
+
+#target_link_libraries(SRB2SDL2 PRIVATE SRB2Core)
+
+set_target_properties(SRB2SDL2 PROPERTIES VERSION ${SRB2_VERSION})
+
+if(${CMAKE_SYSTEM} MATCHES Windows)
+	target_link_libraries(SRB2SDL2 PRIVATE
+		ws2_32
+	)
+	target_compile_options(SRB2SDL2 PRIVATE
+		-U_WINDOWS
+	)
+endif()
+
+target_include_directories(SRB2SDL2 PRIVATE
+	${PNG_INCLUDE_DIRS}
+	${ZLIB_INCLUDE_DIRS}
+)
+
+target_compile_definitions(SRB2SDL2 PRIVATE
+	-DDEDICATED
+)
+
+## 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
+		BUNDLE DESTINATION .
+	)
+else()
+	install(TARGETS SRB2SDL2 SRB2SDL2
+		RUNTIME DESTINATION .
+	)
+endif()
+
+# Mac bundle fixup
+# HACK: THIS IS IMPORTANT! See the escaped \${CMAKE_INSTALL_PREFIX}? This
+# makes it so that var is evaluated LATER during cpack, not right now!
+# This fixes the quirk where the bundled libraries don't land in the final package
+# https://cmake.org/pipermail/cmake/2011-March/043532.html
+#
+# HOWEVER: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY} is NOT escaped, because that var
+# is only available to us at this step. Read the link: ${CMAKE_INSTALL_PREFIX} at
+# this current step points to the CMAKE build folder, NOT the folder that CPACK uses.
+# Therefore, it makes sense to escape that var, but not the other.
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+	install(CODE "
+		include(BundleUtilities)
+		fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${CPACK_PACKAGE_DESCRIPTION_SUMMARY}.app\"
+			\"\"
+			/Library/Frameworks
+		)"
+	)
+endif()
+
+set(SRB2_SDL2_AVAILABLE YES PARENT_SCOPE)
diff --git a/src/dedicated/Sourcefile b/src/dedicated/Sourcefile
new file mode 100644
index 000000000..176e60a96
--- /dev/null
+++ b/src/dedicated/Sourcefile
@@ -0,0 +1,7 @@
+i_system.c
+i_main.c
+i_video.c
+i_sound.c
+i_threads.c
+dosstr.c
+endtxt.c
diff --git a/src/dedicated/dosstr.c b/src/dedicated/dosstr.c
new file mode 100644
index 000000000..f9bbee9b4
--- /dev/null
+++ b/src/dedicated/dosstr.c
@@ -0,0 +1,38 @@
+// Emacs style mode select   -*- C++ -*-
+//-----------------------------------------------------------------------------
+//
+// This file is in the public domain.
+// (Re)written by Graue in 2006.
+//
+//-----------------------------------------------------------------------------
+/// \file
+/// \brief String uppercasing/lowercasing functions for non-DOS non-Win32
+///        systems
+
+#include "../doomtype.h"
+
+#ifndef HAVE_DOSSTR_FUNCS
+
+#include <ctype.h>
+
+int strupr(char *n)
+{
+	while (*n != '\0')
+	{
+		*n = toupper(*n);
+		n++;
+	}
+	return 1;
+}
+
+int strlwr(char *n)
+{
+	while (*n != '\0')
+	{
+		*n = tolower(*n);
+		n++;
+	}
+	return 1;
+}
+
+#endif
diff --git a/src/dedicated/endtxt.c b/src/dedicated/endtxt.c
new file mode 100644
index 000000000..1e72ca9a8
--- /dev/null
+++ b/src/dedicated/endtxt.c
@@ -0,0 +1,234 @@
+/*
+ * Function to write the SRB2 end message text
+ *
+ * Copyright (C) 1998 by Udo Munk <udo@umserver.umnet.de>
+ *
+ * This code is provided AS IS and there are no guarantees, none.
+ * Feel free to share and modify.
+ */
+//-----------------------------------------------------------------------------
+/// \file
+/// \brief Support to show ENDOOM text
+///
+/// Loads the lump ENDOOM, set up the console to print
+/// out the colors and text
+
+#include <stdio.h>
+#include <stdlib.h>
+
+// need this 19990118 by Kin
+#include "../doomdef.h"
+#include "../w_wad.h"
+#include "../z_zone.h"
+#include "endtxt.h"
+/**	\brief	The ShowEndTxt function
+
+
+  Prints out the ENDOOM the way DOOM.EXE/DOOM2.EXE did for Win32 or Linux/GNU
+
+	\return	void
+
+
+*/
+
+void ShowEndTxt(void)
+{
+	INT32 i;
+	UINT16 j, att = 0;
+	INT32 nlflag = 1;
+#ifdef _WIN32
+	HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE);
+	DWORD mode, bytesWritten;
+	CONSOLE_SCREEN_BUFFER_INFO backupcon;
+	COORD resizewin = {80,-1};
+	CHAR let = 0;
+#endif
+	UINT16 *ptext;
+	void *data;
+	lumpnum_t endoomnum = W_GetNumForName("ENDOOM");
+	//char *col;
+
+	/* if the xterm has more then 80 columns we need to add nl's */
+	/* doesn't work, COLUMNS is not in the environment at this time ???
+	col = I_getenv("COLUMNS");
+	if (col) {
+		if (atoi(col) > 80)
+			nlflag++;
+	}
+	*/
+
+	/* get the lump with the text */
+	data = ptext = W_CacheLumpNum(endoomnum, PU_CACHE);
+
+#ifdef _WIN32
+	if (co == INVALID_HANDLE_VALUE || GetFileType(co) != FILE_TYPE_CHAR || !GetConsoleMode(co, &mode)) // test if it a good handle
+	{
+		Z_Free(data);
+		return;
+	}
+
+	backupcon.wAttributes = FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE; // Just in case
+	GetConsoleScreenBufferInfo(co, &backupcon); //Store old state
+	resizewin.Y = backupcon.dwSize.Y;
+	if (backupcon.dwSize.X < resizewin.X)
+		SetConsoleScreenBufferSize(co, resizewin);
+
+	for (i=1; i<=80*25; i++) // print 80x25 text and deal with the attributes too
+	{
+		j = (UINT16)(*ptext >> 8); // attribute first
+		let = (char)(*ptext & 0xff); // text second
+		if (j != att) // attribute changed?
+		{
+			att = j; // save current attribute
+			SetConsoleTextAttribute(co, j); //set fg and bg color for buffer
+		}
+
+		WriteConsoleA(co, &let,  1, &bytesWritten, NULL); // now the text
+
+		if (nlflag && !(i % 80) && backupcon.dwSize.X > resizewin.X) // do we need a nl?
+		{
+			att = backupcon.wAttributes;
+			SetConsoleTextAttribute(co, att); // all attributes off
+			WriteConsoleA(co, "\n",  1, &bytesWritten, NULL); // newline to console
+		}
+		ptext++;
+	}
+	SetConsoleTextAttribute(co, backupcon.wAttributes); // all attributes off
+#else
+	/* print 80x25 text and deal with the attributes too */
+	for (i=1; i<=80*25; i++) {
+		/* attribute first */
+		/* attribute changed? */
+		if ((j = *ptext >> 8) != att) {
+			/* save current attribute */
+			att = j;
+			/* set new attribute, forground color first */
+			printf("\033[");
+			switch (j & 0x0f) {
+			case 0:		/* black */
+				printf("30");
+				break;
+			case 1:		/* blue */
+				printf("34");
+				break;
+			case 2:		/* green */
+				printf("32");
+				break;
+			case 3:		/* cyan */
+				printf("36");
+				break;
+			case 4:		/* red */
+				printf("31");
+				break;
+			case 5:		/* magenta */
+				printf("35");
+				break;
+			case 6:		/* brown */
+				printf("33");
+				break;
+			case 7:		/* bright grey */
+				printf("37");
+				break;
+			case 8:		/* dark grey */
+				printf("1;30");
+				break;
+			case 9:		/* bright blue */
+				printf("1;34");
+				break;
+			case 10:	/* bright green */
+				printf("1;32");
+				break;
+			case 11:	/* bright cyan */
+				printf("1;36");
+				break;
+			case 12:	/* bright red */
+				printf("1;31");
+				break;
+			case 13:	/* bright magenta */
+				printf("1;35");
+				break;
+			case 14:	/* yellow */
+				printf("1;33");
+				break;
+			case 15:	/* white */
+				printf("1;37");
+				break;
+			}
+			printf("m");
+			/* now background color */
+			printf("\033[");
+			switch ((j >> 4) & 0x0f) {
+			case 0:		/* black */
+				printf("40");
+				break;
+			case 1:		/* blue */
+				printf("44");
+				break;
+			case 2:		/* green */
+				printf("42");
+				break;
+			case 3:		/* cyan */
+				printf("46");
+				break;
+			case 4:		/* red */
+				printf("41");
+				break;
+			case 5:		/* magenta */
+				printf("45");
+				break;
+			case 6:		/* brown */
+				printf("43");
+				break;
+			case 7:		/* bright grey */
+				printf("47");
+				break;
+			case 8:		/* dark grey */
+				printf("1;40");
+				break;
+			case 9:		/* bright blue */
+				printf("1;44");
+				break;
+			case 10:	/* bright green */
+				printf("1;42");
+				break;
+			case 11:	/* bright cyan */
+				printf("1;46");
+				break;
+			case 12:	/* bright red */
+				printf("1;41");
+				break;
+			case 13:	/* bright magenta */
+				printf("1;45");
+				break;
+			case 14:	/* yellow */
+				printf("1;43");
+				break;
+			case 15:	/* white */
+				printf("1;47");
+				break;
+			}
+			printf("m");
+		}
+
+		/* now the text */
+		printf("%c",*ptext++ & 0xff);
+
+		/* do we need a nl? */
+		if (nlflag)
+		{
+			if (!(i % 80))
+			{
+				printf("\033[0m");
+				att = 0;
+				printf("\n");
+			}
+		}
+	}
+	/* all attributes off */
+	printf("\033[0m");
+#endif
+	if (nlflag)
+		printf("\n");
+
+	Z_Free(data);
+}
diff --git a/tools/libwad/src/wad_static.h b/src/dedicated/endtxt.h
similarity index 58%
rename from tools/libwad/src/wad_static.h
rename to src/dedicated/endtxt.h
index 04d367bbd..41f8e51ad 100644
--- a/tools/libwad/src/wad_static.h
+++ b/src/dedicated/endtxt.h
@@ -1,8 +1,7 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// libwad: Doom WAD format interface library.
-// Copyright (C) 2011 by Callum Dickinson.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -14,21 +13,12 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 //-----------------------------------------------------------------------------
-/// \file wad_static.h
-/// \brief Static header for internal libwad operations.
+/// \file
+/// \brief Support to show ENDOOM text
 
-#ifndef __WAD_STATIC_H__
-#define __WAD_STATIC_H__
+#ifndef __ENDTXT__
+#define __ENDTXT__
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include "../include/wad.h"
+void ShowEndTxt (void);
 
-void WAD_ErrorSet(const char *text);
-
-inline void WAD_FreeMemory(FILE *file, wadheader_t *header, void *lumpdir, lump_t *lumps, wad_t *wad);
-
-#endif // __WAD_STATIC_H__
+#endif
diff --git a/src/dedicated/i_main.c b/src/dedicated/i_main.c
new file mode 100644
index 000000000..911e356d0
--- /dev/null
+++ b/src/dedicated/i_main.c
@@ -0,0 +1,238 @@
+// Emacs style mode select   -*- C++ -*-
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//-----------------------------------------------------------------------------
+/// \file
+/// \brief Main program, simply calls D_SRB2Main and D_SRB2Loop, the high level loop.
+
+#include "../doomdef.h"
+#include "../m_argv.h"
+#include "../d_main.h"
+#include "../m_misc.h" /* path shit */
+#include "../i_system.h"
+#include "../d_clisrv.h"
+
+#if defined (__GNUC__) || defined (__unix__)
+#include <unistd.h>
+#endif
+
+#ifdef __unix__
+#include <errno.h>
+#endif
+
+#include "time.h" // For log timestamps
+
+#ifdef HAVE_TTF
+#include "i_ttf.h"
+#endif
+
+#ifdef HAVE_LIBBACKTRACE
+#include <backtrace.h>
+
+struct backtrace_state *bt_state = NULL;
+#endif
+
+#ifdef LOGMESSAGES
+FILE *logstream = NULL;
+char  logfilename[1024];
+#endif
+
+#ifndef DOXYGEN
+#ifndef O_TEXT
+#define O_TEXT 0
+#endif
+
+#ifndef O_SEQUENTIAL
+#define O_SEQUENTIAL 0
+#endif
+#endif
+
+#ifdef _WIN32
+#ifndef _AMD64_
+#include "exchndl.h"
+#define DRMINGW
+#endif
+#endif
+
+#if defined (_WIN32)
+#include "../win32/win_dbg.h"
+typedef BOOL (WINAPI *p_IsDebuggerPresent)(VOID);
+#endif
+
+#ifdef _WIN32
+static void
+ChDirToExe (void)
+{
+	CHAR path[MAX_PATH];
+	if (GetModuleFileNameA(NULL, path, MAX_PATH) > 0)
+	{
+		strrchr(path, '\\')[0] = '\0';
+		SetCurrentDirectoryA(path);
+	}
+}
+#endif
+
+/**	\brief	The main function
+
+	\param	argc	number of arg
+	\param	*argv	string table
+
+	\return	int
+*/
+#if defined (__GNUC__) && (__GNUC__ >= 4)
+#pragma GCC diagnostic ignored "-Wmissing-noreturn"
+#endif
+
+#ifdef LOGMESSAGES
+static void InitLogging(void)
+{
+	const char *logdir = NULL;
+	time_t my_time;
+	struct tm * timeinfo;
+	const char *format;
+	const char *reldir;
+	int left;
+	boolean fileabs;
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+	const char *link;
+#endif
+
+	logdir = D_Home();
+
+	my_time = time(NULL);
+	timeinfo = localtime(&my_time);
+
+	if (M_CheckParm("-logfile") && M_IsNextParm())
+	{
+		format = M_GetNextParm();
+		fileabs = M_IsPathAbsolute(format);
+	}
+	else
+	{
+		format = "log-%Y-%m-%d_%H-%M-%S.txt";
+		fileabs = false;
+	}
+
+	if (fileabs)
+	{
+		strftime(logfilename, sizeof logfilename, format, timeinfo);
+	}
+	else
+	{
+		if (M_CheckParm("-logdir") && M_IsNextParm())
+			reldir = M_GetNextParm();
+		else
+			reldir = "logs";
+
+		if (M_IsPathAbsolute(reldir))
+		{
+			left = snprintf(logfilename, sizeof logfilename,
+					"%s"PATHSEP, reldir);
+		}
+		else
+#ifdef DEFAULTDIR
+		if (logdir)
+		{
+			left = snprintf(logfilename, sizeof logfilename,
+					"%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir);
+		}
+		else
+#endif/*DEFAULTDIR*/
+		{
+			left = snprintf(logfilename, sizeof logfilename,
+					"."PATHSEP"%s"PATHSEP, reldir);
+		}
+
+		strftime(&logfilename[left], sizeof logfilename - left,
+				format, timeinfo);
+	}
+
+	M_MkdirEachUntil(logfilename,
+			M_PathParts(logdir) - 1,
+			M_PathParts(logfilename) - 1, 0755);
+
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+	logstream = fopen(logfilename, "w");
+#ifdef DEFAULTDIR
+	if (logdir)
+		link = va("%s/"DEFAULTDIR"/latest-log.txt", logdir);
+	else
+#endif/*DEFAULTDIR*/
+		link = "latest-log.txt";
+	unlink(link);
+	if (symlink(logfilename, link) == -1)
+	{
+		I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno));
+	}
+#else/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/
+	logstream = fopen("latest-log.txt", "wt+");
+#endif/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/
+}
+#endif
+
+int main(int argc, char **argv)
+{
+	myargc = argc;
+	myargv = argv; /// \todo pull out path to exe from this string
+
+	dedicated = true;
+
+#ifdef HAVE_LIBBACKTRACE
+	bt_state = backtrace_create_state(
+		argv[0],
+#ifdef HAVE_THREADS
+		1,
+#else
+		0,
+#endif
+		NULL,
+		NULL
+	);
+#endif
+
+#ifdef _WIN32
+	ChDirToExe();
+#endif
+
+#ifdef LOGMESSAGES
+	if (!M_CheckParm("-nolog"))
+		InitLogging();
+#endif/*LOGMESSAGES*/
+
+	//I_OutputMsg("I_StartupSystem() ...\n");
+	I_StartupSystem();
+#if defined (_WIN32)
+	{
+#ifdef DRMINGW
+		ExcHndlInit();
+#endif
+	}
+#endif
+
+	// startup SRB2
+	CONS_Printf("Setting up SRB2Kart...\n");
+	D_SRB2Main();
+	CONS_Printf("Entering main game loop...\n");
+	// never return
+	D_SRB2Loop();
+
+#ifdef BUGTRAP
+	// This is safe even if BT didn't start.
+	ShutdownBugTrap();
+#endif
+
+	// return to OS
+	return 0;
+}
diff --git a/src/dedicated/i_sound.c b/src/dedicated/i_sound.c
new file mode 100644
index 000000000..de43aab85
--- /dev/null
+++ b/src/dedicated/i_sound.c
@@ -0,0 +1,339 @@
+// Emacs style mode select   -*- C++ -*-
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) 1993-1996 by id Software, Inc.
+//
+// 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.
+//
+// The source 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 SDL interface for sound
+
+#include <math.h>
+#include "../doomdef.h"
+#include "../i_sound.h"
+#include "../s_sound.h"
+
+/**	\brief Sound subsystem runing and waiting
+*/
+UINT8 sound_started = false;
+
+/**	\brief	The I_GetSfx function
+
+	\param	sfx	sfx to setup
+
+	\return	data for sfx
+*/
+void *I_GetSfx(sfxinfo_t *sfx)
+{
+	(void)sfx;
+	return NULL;
+}
+
+/**	\brief	The I_FreeSfx function
+
+	\param	sfx	sfx to be freed up
+
+	\return	void
+*/
+void I_FreeSfx(sfxinfo_t *sfx)
+{
+	(void)sfx;
+}
+
+/**	\brief Init at program start...
+*/
+void I_StartupSound(void){}
+
+/**	\brief ... shut down and relase at program termination.
+*/
+void I_ShutdownSound(void){}
+
+/// ------------------------
+///  SFX I/O
+/// ------------------------
+
+/**	\brief	Starts a sound in a particular sound channel.
+	\param	id	sfxid
+	\param	vol	volume for sound
+	\param	sep	left-right balancle
+	\param	pitch	not used
+	\param	priority	not used
+
+	\return	sfx handle
+*/
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
+{
+	(void)id;
+	(void)vol;
+	(void)sep;
+	(void)pitch;
+	(void)priority;
+	(void)channel;
+	return 0;
+}
+
+/**	\brief	Stops a sound channel.
+
+	\param	handle	stop sfx handle
+
+	\return	void
+*/
+void I_StopSound(INT32 handle)
+{
+	(void)handle;
+}
+
+/**	\brief Some digital sound drivers need this.
+*/
+void I_UpdateSound(void){}
+
+/**	\brief	Called by S_*() functions to see if a channel is still playing.
+
+	\param	handle	sfx handle
+
+	\return	0 if no longer playing, 1 if playing.
+*/
+boolean I_SoundIsPlaying(INT32 handle)
+{
+	(void)handle;
+	return false;
+}
+
+/**	\brief	Updates the sfx handle
+
+	\param	handle	sfx handle
+	\param	vol	volume
+	\param	sep	separation
+	\param	pitch	ptich
+
+	\return	void
+*/
+void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch)
+{
+	(void)handle;
+	(void)vol;
+	(void)sep;
+	(void)pitch;
+}
+
+/**	\brief	The I_SetSfxVolume function
+
+	\param	volume	volume to set at
+
+	\return	void
+*/
+void I_SetSfxVolume(UINT8 volume)
+{
+	(void)volume;
+}
+
+/// ------------------------
+//  MUSIC SYSTEM
+/// ------------------------
+
+/** \brief Init the music systems
+*/
+void I_InitMusic(void){}
+
+/** \brief Shutdown the music systems
+*/
+void I_ShutdownMusic(void){}
+
+/// ------------------------
+//  MUSIC PROPERTIES
+/// ------------------------
+
+musictype_t I_SongType(void)
+{
+	return MU_NONE;
+}
+
+boolean I_SongPlaying(void)
+{
+	return false;
+}
+
+boolean I_SongPaused(void)
+{
+	return false;
+}
+
+/// ------------------------
+//  MUSIC EFFECTS
+/// ------------------------
+
+boolean I_SetSongSpeed(float speed)
+{
+	(void)speed;
+	return false;
+}
+
+/// ------------------------
+//  MUSIC SEEKING
+/// ------------------------
+
+UINT32 I_GetSongLength(void)
+{
+	return 0;
+}
+
+boolean I_SetSongLoopPoint(UINT32 looppoint)
+{
+	(void)looppoint;
+	return false;
+}
+
+UINT32 I_GetSongLoopPoint(void)
+{
+	return 0;
+}
+
+boolean I_SetSongPosition(UINT32 position)
+{
+	(void)position;
+	return false;
+}
+
+UINT32 I_GetSongPosition(void)
+{
+	return 0;
+}
+
+/// ------------------------
+//  MUSIC PLAYBACK
+/// ------------------------
+
+/**	\brief	Registers a song handle to song data.
+
+	\param	data	pointer to song data
+	\param	len	len of data
+
+	\return	song handle
+
+	\todo Remove this
+*/
+boolean I_LoadSong(char *data, size_t len)
+{
+	(void)data;
+	(void)len;
+	return false;
+}
+
+/**	\brief	See ::I_LoadSong, then think backwards
+
+	\param	handle	song handle
+
+	\sa I_LoadSong
+	\todo remove midi handle
+*/
+void I_UnloadSong(void){}
+
+/**	\brief	Called by anything that wishes to start music
+
+	\param	handle	Song handle
+	\param	looping	looping it if true
+
+	\return	if true, it's playing the song
+
+	\todo pass music name, not handle
+*/
+boolean I_PlaySong(boolean looping)
+{
+	(void)looping;
+	return false;
+}
+
+/**	\brief	Stops a song over 3 seconds
+
+	\param	handle	Song handle
+	\return	void
+
+	/todo drop handle
+*/
+void I_StopSong(void){}
+
+/**	\brief	PAUSE game handling.
+
+	\param	handle	song handle
+
+	\return	void
+*/
+void I_PauseSong(void){}
+
+/**	\brief	RESUME game handling
+
+	\param	handle	song handle
+
+	\return	void
+*/
+void I_ResumeSong(void){}
+
+/**	\brief	The I_SetMusicVolume function
+
+	\param	volume	volume to set at
+
+	\return	void
+*/
+void I_SetMusicVolume(UINT8 volume)
+{
+	(void)volume;
+}
+
+boolean I_SetSongTrack(INT32 track)
+{
+	(void)track;
+	return false;
+}
+
+/// ------------------------
+/// MUSIC FADING
+/// ------------------------
+
+void I_SetInternalMusicVolume(UINT8 volume)
+{
+	(void)volume;
+}
+
+void I_StopFadingSong(void){}
+
+boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void))
+{
+	(void)target_volume;
+	(void)source_volume;
+	(void)ms;
+	(void)callback;
+	return false;
+}
+
+boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void))
+{
+	(void)target_volume;
+	(void)ms;
+	(void)callback;
+	return false;
+}
+
+boolean I_FadeOutStopSong(UINT32 ms)
+{
+	(void)ms;
+	return false;
+}
+
+boolean I_FadeInPlaySong(UINT32 ms, boolean looping)
+{
+	(void)ms;
+	(void)looping;
+	return false;
+}
+
+void I_UpdateSongLagThreshold(void)
+{
+}
diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c
new file mode 100644
index 000000000..6ab748f86
--- /dev/null
+++ b/src/dedicated/i_system.c
@@ -0,0 +1,2223 @@
+// Emacs style mode select   -*- C++ -*-
+//
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Portions Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 2014-2018 by Sonic Team Junior.
+//
+// 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.
+//
+// Changes by Graue <graue@oceanbase.org> are in the public domain.
+//
+//-----------------------------------------------------------------------------
+/// \file
+/// \brief SRB2 system stuff for dedicated
+
+#ifdef CMAKECONFIG
+#include "config.h"
+#else
+#include "../config.h.in"
+#endif
+
+#include <signal.h>
+
+// A little more than the minimum sleep duration on Windows.
+// May be incorrect for other platforms, but we don't currently have a way to
+// query the scheduler granularity. SDL will do what's needed to make this as
+// low as possible though.
+#define MIN_SLEEP_DURATION_MS 2.1
+
+#ifdef _WIN32
+#define RPC_NO_WINDOWS_H
+#include <windows.h>
+#include "../doomtype.h"
+typedef BOOL (WINAPI *p_GetDiskFreeSpaceExA)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER);
+typedef BOOL (WINAPI *p_IsProcessorFeaturePresent) (DWORD);
+typedef DWORD (WINAPI *p_timeGetTime) (void);
+typedef UINT (WINAPI *p_timeEndPeriod) (UINT);
+typedef HANDLE (WINAPI *p_OpenFileMappingA) (DWORD, BOOL, LPCSTR);
+typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef __GNUC__
+#include <unistd.h>
+#elif defined (_MSC_VER)
+#include <direct.h>
+#endif
+#if defined (__unix__) || defined (UNIXCOMMON)
+#include <fcntl.h>
+#endif
+
+#include <stdio.h>
+#ifdef _WIN32
+#include <conio.h>
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4214 4244)
+#endif
+
+#if defined (__unix__) || defined(__APPLE__) || (defined (UNIXCOMMON) && !defined (__HAIKU__))
+#include <time.h>
+#if defined (__linux__)
+#include <sys/vfs.h>
+#else
+#include <sys/param.h>
+#include <sys/mount.h>
+/*For meminfo*/
+#include <sys/types.h>
+#ifdef FREEBSD
+#include <kvm.h>
+#endif
+#include <nlist.h>
+#include <sys/sysctl.h>
+#endif
+#endif
+
+#if defined (__linux__) || (defined (UNIXCOMMON) && !defined (__HAIKU__))
+#ifndef NOTERMIOS
+#include <termios.h>
+#include <sys/ioctl.h> // ioctl
+#define HAVE_TERMIOS
+#endif
+#endif
+
+#if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__))
+#include <poll.h>
+#include <errno.h>
+#include <sys/wait.h>
+#define NEWSIGNALHANDLER
+#endif
+
+#ifndef NOMUMBLE
+#ifdef __linux__ // need -lrt
+#include <sys/mman.h>
+#ifdef MAP_FAILED
+#define HAVE_SHM
+#endif
+#include <wchar.h>
+#endif
+
+#ifdef _WIN32
+#define HAVE_MUMBLE
+#define WINMUMBLE
+#elif defined (HAVE_SHM)
+#define HAVE_MUMBLE
+#endif
+#endif // NOMUMBLE
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+#ifdef __APPLE__
+#include "macosx/mac_resources.h"
+#endif
+
+#ifndef errno
+#include <errno.h>
+#endif
+
+#include <time.h>
+
+// Locations for searching the srb2.srb
+#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"
+#endif
+
+/**	\brief WAD file to look for
+*/
+#define WADKEYWORD1 "srb2.srb"
+#define WADKEYWORD2 "srb2.wad"
+/**	\brief holds wad path
+*/
+static char returnWadPath[256];
+
+#include "../doomdef.h"
+#include "../m_misc.h"
+#include "../i_video.h"
+#include "../i_sound.h"
+#include "../i_system.h"
+#include "../screen.h" //vid.WndParent
+#include "../d_net.h"
+#include "../g_game.h"
+#include "../filesrch.h"
+#include "../z_zone.h" // Z_Free
+#include "endtxt.h"
+
+#include "../i_joy.h"
+
+#include "../m_argv.h"
+
+#ifdef MAC_ALERT
+#include "macosx/mac_alert.h"
+#endif
+
+#include "../d_main.h"
+
+#if !defined(NOMUMBLE) && defined(HAVE_MUMBLE)
+// Mumble context string
+#include "../d_clisrv.h"
+#include "../byteptr.h"
+#endif
+
+#ifdef HAVE_LIBBACKTRACE
+#include <backtrace.h>
+// TODO - move this to some header file instead
+extern struct backtrace_state *bt_state;
+
+typedef struct bt_crash_reason_s {
+	enum {
+		BTCRASH_SIGNAL,
+		BTCRASH_ERRORMSG,
+	} type;
+
+	union {
+		INT32 signal;
+		const char *errormsg;
+	} value;
+} bt_crash_reason_t;
+
+#define BT_CRASH_REASON_SIGNAL(num) (bt_crash_reason_t){ .type = BTCRASH_SIGNAL, .value = { .signal = num } }
+#define BT_CRASH_REASON_ERRORMSG(msg) (bt_crash_reason_t){ .type = BTCRASH_ERRORMSG, .value = { .errormsg = msg } }
+
+static void printsignal(FILE *fp, INT32 num)
+{
+	switch (num)
+		{
+		case SIGILL:
+			fprintf(fp, "SIGILL - illegal instruction - invalid function image");
+			break;
+		case SIGFPE:
+			fprintf(fp, "SIGFPE - mathematical exception");
+			break;
+		case SIGSEGV:
+			fprintf(fp, "SIGSEGV - segment violation");
+			break;
+		case SIGABRT:
+			fprintf(fp, "SIGABRT - abnormal termination triggered by abort call");
+			break;
+		default:
+			fprintf(fp, "Signal number %d", num);
+		}
+}
+
+typedef struct bt_out_buf_s {
+	boolean error;
+	char *pos;
+	size_t size;
+} bt_out_buf_t;
+
+static void bt_syminfo_cb(void *data, uintptr_t pc, const char *symname, uintptr_t symval, uintptr_t symsize)
+{
+	(void)symval;
+	(void)symsize;
+
+	bt_out_buf_t *buf = (bt_out_buf_t*)data;
+
+	if (!symname)
+		symname = "???";
+
+	int n = snprintf(buf->pos, buf->size, "%p %s\n", (void*)pc, symname);
+
+	if (n <= 0)
+	{
+		buf->size = 0;
+		return;
+	}
+
+	buf->pos += n;
+	buf->size -= n;
+}
+
+static int bt_simple_cb(void *data, uintptr_t pc)
+{
+	bt_out_buf_t *buf = (bt_out_buf_t*)data;
+
+	backtrace_syminfo(bt_state, pc, bt_syminfo_cb, NULL, data);
+
+	if (!buf->size) return 1;
+
+	return 0;
+}
+
+static int bt_full_cb(void *data, uintptr_t pc, const char *filename, int lineno, const char *function)
+{
+	bt_out_buf_t *buf = (bt_out_buf_t*)data;
+
+	if (!filename) filename = "???";
+	if (!function) function = "???";
+
+	int n = snprintf(buf->pos, buf->size, "%p %s\n\t%s:%d\n", (void*)pc, function, filename, lineno);
+
+	if (n <= 0) return 1;
+
+	buf->pos += n;
+	buf->size -= n;
+
+	if (!buf->size) return 1;
+
+	return 0;
+}
+
+static void bt_error_cb(void *data, const char *msg, int errnum)
+{
+	(void)msg; // We don't need this
+
+	bt_out_buf_t *buf = (bt_out_buf_t*)data;
+
+	// No debug info
+	if (errnum == -1)
+		buf->error = true;
+}
+
+static void write_backtrace(bt_crash_reason_t reason)
+{
+	FILE *out = fopen(va("%s" PATHSEP "%s", srb2home, "srb2kart-crash-log.txt"), "a");
+
+	time_t rawtime;
+	struct tm *timeinfo;
+
+	const size_t BUFSIZE = 8192;
+	char backtrace[BUFSIZE];
+
+	bt_out_buf_t buf;
+	buf.error = false;
+	buf.pos = backtrace;
+	buf.size = BUFSIZE;
+
+
+	if (!out)
+	{
+		fprintf(stderr, "\nWARNING: Couldn't open crash log for writing! Make sure your permissions are correct. Please save the below report!\n");
+		out = stderr;
+	}
+
+	// Get the current time as a string.
+	time(&rawtime);
+	timeinfo = localtime(&rawtime);
+
+	fprintf(out, "------------------------\n\n");
+
+	fprintf(out, "Program name: %s %s\n", SRB2APPLICATION, VERSIONSTRING);
+
+	if (compdate && comptime && comprevision && compbranch)
+		fprintf(out, "Compiled: %s %s, commit %s, branch %s\n", compdate, comptime, comprevision, compbranch);
+
+	if (gamestate == GS_LEVEL)
+	{
+		char *title = G_BuildMapTitle(gamemap);
+
+		if (title)
+		{
+			fprintf(out, "Game map: %s (%s)\n", title, G_BuildMapName(gamemap));
+			Z_Free(title);
+		}
+		else
+			fprintf(out, "Game map: %s\n", G_BuildMapName(gamemap));
+	}
+
+	fprintf(out, "Time of crash: %s\n", asctime(timeinfo));
+
+	fprintf(out, "Caused by: ");
+
+	switch (reason.type)
+	{
+		case BTCRASH_SIGNAL:
+			printsignal(out, reason.value.signal);
+		break;
+
+		case BTCRASH_ERRORMSG:
+			fprintf(out, "%s", reason.value.errormsg);
+		break;
+	}
+
+	fprintf(out, "\nBacktrace:\n");
+
+	// Try to get full backtrace, it will print files and line numbers
+	backtrace_full(bt_state, 2, bt_full_cb, bt_error_cb, (void*)&buf);
+
+	if (buf.error)
+	{
+		// Fall back to simple backtrace, only prints function names
+		backtrace_simple(bt_state, 2, bt_simple_cb, NULL, (void*)&buf);
+	}
+
+	fputs(backtrace, out);
+
+	if (out != stderr)
+	{
+		fclose(out);
+		fprintf(stderr, "Crash report created, find srb2kart-crash-log.txt in your SRB2Kart directory\n");
+	}
+}
+
+#endif
+
+boolean consolevent = false;
+boolean framebuffer = false;
+
+boolean g_in_exiting_signal_handler = false;
+
+UINT8 keyboard_started = false;
+
+static void I_ReportSignal(int num, int coredumped)
+{
+	//static char msg[] = "oh no! back to reality!\r\n";
+	const char *      sigmsg;
+	char msg[256];
+
+	switch (num)
+	{
+//	case SIGINT:
+//		sigmsg = "SIGINT - interrupted";
+//		break;
+	case SIGILL:
+		sigmsg = "SIGILL - illegal instruction - invalid function image";
+		break;
+	case SIGFPE:
+		sigmsg = "SIGFPE - mathematical exception";
+		break;
+	case SIGSEGV:
+		sigmsg = "SIGSEGV - segment violation";
+		break;
+//	case SIGTERM:
+//		sigmsg = "SIGTERM - Software termination signal from kill";
+//		break;
+//	case SIGBREAK:
+//		sigmsg = "SIGBREAK - Ctrl-Break sequence";
+//		break;
+	case SIGABRT:
+		sigmsg = "SIGABRT - abnormal termination triggered by abort call";
+		break;
+	default:
+		sprintf(msg,"signal number %d", num);
+		if (coredumped)
+			sigmsg = 0;
+		else
+			sigmsg = msg;
+	}
+
+	if (coredumped)
+	{
+		if (sigmsg)
+			sprintf(msg, "%s (core dumped)", sigmsg);
+		else
+			strcat(msg, " (core dumped)");
+	}
+	else
+	{
+		sprintf(msg, "%s", sigmsg);
+	}
+
+#ifdef HAVE_LIBBACKTRACE
+	strncat(msg, "\n\nCrash report has been saved into srb2kart-crash-log.txt", 255);
+#elif defined(_WIN32) && !defined(__MINGW64__)
+	strncat(msg, "\n\nCrash report has been saved into srb2kart.rpt", 255);
+#endif
+
+	I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
+}
+
+#ifndef NEWSIGNALHANDLER
+FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
+{
+	g_in_exiting_signal_handler = true;
+
+	D_QuitNetGame(); // Fix server freezes
+
+#ifdef HAVE_LIBBACKTRACE
+	write_backtrace(BT_CRASH_REASON_SIGNAL(num));
+#endif
+
+	if (demo.recording)
+		G_SaveDemo();
+
+	I_ReportSignal(num, 0);
+	I_ShutdownSystem();
+	signal(num, SIG_DFL);               //default signal action
+	raise(num);
+	I_Quit();
+}
+#endif
+
+FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
+{
+	signal(num, SIG_DFL); //default signal action
+	raise(num);
+	I_Quit();
+}
+
+#ifdef HAVE_TERMIOS
+// TERMIOS console code from Quake3: thank you!
+boolean stdin_active = true;
+
+typedef struct
+{
+	size_t cursor;
+	char buffer[256];
+} feild_t;
+
+feild_t tty_con;
+
+// lock to prevent clearing partial lines, since not everything
+// printed ends on a newline.
+static boolean ttycon_ateol = true;
+// some key codes that the terminal may be using
+// TTimo NOTE: I'm not sure how relevant this is
+static INT32 tty_erase;
+static INT32 tty_eof;
+
+static struct termios tty_tc;
+
+// =============================================================
+// tty console routines
+// NOTE: if the user is editing a line when something gets printed to the early console then it won't look good
+//   so we provide tty_Clear and tty_Show to be called before and after a stdout or stderr output
+// =============================================================
+
+// flush stdin, I suspect some terminals are sending a LOT of garbage
+// FIXME TTimo relevant?
+#if 0
+static inline void tty_FlushIn(void)
+{
+	char key;
+	while (read(STDIN_FILENO, &key, 1)!=-1);
+}
+#endif
+
+// do a backspace
+// TTimo NOTE: it seems on some terminals just sending '\b' is not enough
+//   so for now, in any case we send "\b \b" .. yeah well ..
+//   (there may be a way to find out if '\b' alone would work though)
+// Hanicef NOTE: using \b this way is unreliable because of terminal state,
+//   it's better to use \r to reset the cursor to the beginning of the
+//   line and clear from there.
+static void tty_Back(void)
+{
+	write(STDOUT_FILENO, "\r", 1);
+	if (tty_con.cursor>0)
+	{
+		write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor);
+	}
+	write(STDOUT_FILENO, " \b", 2);
+}
+
+static void tty_Clear(void)
+{
+	size_t i;
+	write(STDOUT_FILENO, "\r", 1);
+	if (tty_con.cursor>0)
+	{
+		for (i=0; i<tty_con.cursor; i++)
+		{
+			write(STDOUT_FILENO, " ", 1);
+		}
+		write(STDOUT_FILENO, "\r", 1);
+	}
+}
+
+// never exit without calling this, or your terminal will be left in a pretty bad state
+static void I_ShutdownConsole(void)
+{
+	if (consolevent)
+	{
+		I_OutputMsg("Shutdown tty console\n");
+		consolevent = false;
+		tcsetattr (STDIN_FILENO, TCSADRAIN, &tty_tc);
+	}
+}
+
+static void I_StartupConsole(void)
+{
+	struct termios tc;
+
+	// TTimo
+	// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=390 (404)
+	// then SIGTTIN or SIGTOU is emitted, if not catched, turns into a SIGSTP
+	signal(SIGTTIN, SIG_IGN);
+	signal(SIGTTOU, SIG_IGN);
+
+	consolevent = !M_CheckParm("-noconsole");
+	framebuffer = M_CheckParm("-framebuffer");
+
+	if (framebuffer)
+		consolevent = false;
+
+	if (!consolevent) return;
+
+	if (isatty(STDIN_FILENO)!=1)
+	{
+		I_OutputMsg("stdin is not a tty, tty console mode failed\n");
+		consolevent = false;
+		return;
+	}
+	memset(&tty_con, 0x00, sizeof(tty_con));
+	tcgetattr (0, &tty_tc);
+	tty_erase = tty_tc.c_cc[VERASE];
+	tty_eof = tty_tc.c_cc[VEOF];
+	tc = tty_tc;
+	/*
+	 ECHO: don't echo input characters
+	 ICANON: enable canonical mode.  This  enables  the  special
+	  characters  EOF,  EOL,  EOL2, ERASE, KILL, REPRINT,
+	  STATUS, and WERASE, and buffers by lines.
+	 ISIG: when any of the characters  INTR,  QUIT,  SUSP,  or
+	  DSUSP are received, generate the corresponding signal
+	*/
+	tc.c_lflag &= ~(ECHO | ICANON);
+	/*
+	 ISTRIP strip off bit 8
+	 INPCK enable input parity checking
+	 */
+	tc.c_iflag &= ~(ISTRIP | INPCK);
+	tc.c_cc[VMIN] = 0; //1?
+	tc.c_cc[VTIME] = 0;
+	tcsetattr (0, TCSADRAIN, &tc);
+}
+
+void I_GetConsoleEvents(void)
+{
+	// we use this when sending back commands
+	event_t ev = {0,0,0,0};
+	char key = 0;
+	struct pollfd pfd =
+	{
+		.fd = STDIN_FILENO,
+		.events = POLLIN,
+		.revents = 0,
+	};
+
+	if (!consolevent)
+		return;
+
+	for (;;)
+	{
+		if (poll(&pfd, 1, 0) < 1 || !(pfd.revents & POLLIN))
+			return;
+
+		ev.type = ev_console;
+		ev.data1 = 0;
+		if (read(STDIN_FILENO, &key, 1) == -1 || !key)
+			return;
+
+		// we have something
+		// backspace?
+		// NOTE TTimo testing a lot of values .. seems it's the only way to get it to work everywhere
+		if ((key == tty_erase) || (key == 127) || (key == 8))
+		{
+			if (tty_con.cursor > 0)
+			{
+				tty_con.cursor--;
+				tty_con.buffer[tty_con.cursor] = '\0';
+				tty_Back();
+			}
+			ev.data1 = KEY_BACKSPACE;
+		}
+		else if (key < ' ') // check if this is a control char
+		{
+			if (key == '\n')
+			{
+				tty_Clear();
+				tty_con.cursor = 0;
+				ev.data1 = KEY_ENTER;
+			}
+			else if (key == 0x4) // ^D, aka EOF
+			{
+				// shut down, most unix programs behave this way
+				I_Quit();
+			}
+			else continue;
+		}
+		else if (tty_con.cursor < sizeof(tty_con.buffer))
+		{
+			// push regular character
+			ev.data1 = tty_con.buffer[tty_con.cursor] = key;
+			tty_con.cursor++;
+			// print the current line (this is differential)
+			write(STDOUT_FILENO, &key, 1);
+		}
+		if (ev.data1) D_PostEvent(&ev);
+	}
+}
+
+#elif defined (_WIN32)
+static BOOL I_ReadyConsole(HANDLE ci)
+{
+	DWORD gotinput;
+	if (ci == INVALID_HANDLE_VALUE) return FALSE;
+	if (WaitForSingleObject(ci,0) != WAIT_OBJECT_0) return FALSE;
+	if (GetFileType(ci) != FILE_TYPE_CHAR) return FALSE;
+	if (!GetConsoleMode(ci, &gotinput)) return FALSE;
+	return (GetNumberOfConsoleInputEvents(ci, &gotinput) && gotinput);
+}
+
+static boolean entering_con_command = false;
+
+static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co)
+{
+	event_t event;
+	CONSOLE_SCREEN_BUFFER_INFO CSBI;
+	DWORD t;
+
+	memset(&event,0x00,sizeof (event));
+
+	if (evt.bKeyDown)
+	{
+		event.type = ev_console;
+		entering_con_command = true;
+		switch (evt.wVirtualKeyCode)
+		{
+			case VK_ESCAPE:
+			case VK_TAB:
+				event.data1 = KEY_NULL;
+				break;
+			case VK_RETURN:
+				entering_con_command = false;
+				// Fall through.
+			default:
+				//event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char
+				event.data1 = evt.uChar.AsciiChar;
+		}
+		if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t))
+		{
+			if (event.data1 && event.data1 != KEY_LSHIFT && event.data1 != KEY_RSHIFT)
+			{
+#ifdef _UNICODE
+				WriteConsole(co, &evt.uChar.UnicodeChar, 1, &t, NULL);
+#else
+				WriteConsole(co, &evt.uChar.AsciiChar, 1 , &t, NULL);
+#endif
+			}
+			if (evt.wVirtualKeyCode == VK_BACK
+				&& GetConsoleScreenBufferInfo(co,&CSBI))
+			{
+				WriteConsoleOutputCharacterA(co, " ",1, CSBI.dwCursorPosition, &t);
+			}
+		}
+	}
+	if (event.data1) D_PostEvent(&event);
+}
+
+void I_GetConsoleEvents(void)
+{
+	HANDLE ci = GetStdHandle(STD_INPUT_HANDLE);
+	HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE);
+	INPUT_RECORD input;
+	DWORD t;
+
+	while (I_ReadyConsole(ci) && ReadConsoleInput(ci, &input, 1, &t) && t)
+	{
+		switch (input.EventType)
+		{
+			case KEY_EVENT:
+				Impl_HandleKeyboardConsoleEvent(input.Event.KeyEvent, co);
+				break;
+			case MOUSE_EVENT:
+			case WINDOW_BUFFER_SIZE_EVENT:
+			case MENU_EVENT:
+			case FOCUS_EVENT:
+				break;
+		}
+	}
+}
+
+static void I_StartupConsole(void)
+{
+	HANDLE ci, co;
+	const INT32 ded = M_CheckParm("-dedicated");
+	BOOL gotConsole = FALSE;
+	if (M_CheckParm("-console") || ded)
+		gotConsole = AllocConsole();
+#ifdef _DEBUG
+	else if (M_CheckParm("-noconsole") && !ded)
+#else
+	else if (!M_CheckParm("-console") && !ded)
+#endif
+	{
+		FreeConsole();
+		gotConsole = FALSE;
+	}
+
+	if (gotConsole)
+	{
+		SetConsoleTitleA("SRB2Kart Console");
+		consolevent = true;
+	}
+
+	//Let get the real console HANDLE, because Mingw's Bash is bad!
+	ci = CreateFile(TEXT("CONIN$") ,               GENERIC_READ, FILE_SHARE_READ,  NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	co = CreateFile(TEXT("CONOUT$"), GENERIC_WRITE|GENERIC_READ, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	if (ci != INVALID_HANDLE_VALUE)
+	{
+		const DWORD CM = ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT;
+		SetStdHandle(STD_INPUT_HANDLE, ci);
+		if (GetFileType(ci) == FILE_TYPE_CHAR)
+			SetConsoleMode(ci, CM); //default mode but no ENABLE_MOUSE_INPUT
+	}
+	if (co != INVALID_HANDLE_VALUE)
+	{
+		SetStdHandle(STD_OUTPUT_HANDLE, co);
+		SetStdHandle(STD_ERROR_HANDLE, co);
+	}
+}
+static inline void I_ShutdownConsole(void){}
+#else
+void I_GetConsoleEvents(void){}
+static inline void I_StartupConsole(void)
+{
+#ifdef _DEBUG
+	consolevent = !M_CheckParm("-noconsole");
+#else
+	consolevent = M_CheckParm("-console");
+#endif
+
+	framebuffer = M_CheckParm("-framebuffer");
+
+	if (framebuffer)
+		consolevent = false;
+}
+static inline void I_ShutdownConsole(void){}
+#endif
+
+//
+// StartupKeyboard
+//
+static void I_RegisterSignals (void)
+{
+#ifdef SIGINT
+	signal(SIGINT , quit_handler);
+#endif
+#ifdef SIGBREAK
+	signal(SIGBREAK , quit_handler);
+#endif
+#ifdef SIGTERM
+	signal(SIGTERM , quit_handler);
+#endif
+
+	// If these defines don't exist,
+	// then compilation would have failed above us...
+#ifndef NEWSIGNALHANDLER
+	signal(SIGILL , signal_handler);
+	signal(SIGSEGV , signal_handler);
+	signal(SIGABRT , signal_handler);
+	signal(SIGFPE , signal_handler);
+#endif
+}
+
+#ifdef NEWSIGNALHANDLER
+static void signal_handler_child(INT32 num)
+{
+#ifdef HAVE_LIBBACKTRACE
+	write_backtrace(BT_CRASH_REASON_SIGNAL(num));
+#endif
+
+	if (demo.recording)
+		G_SaveDemo();
+
+	signal(num, SIG_DFL);               //default signal action
+	raise(num);
+}
+
+static void I_RegisterChildSignals(void)
+{
+	// If these defines don't exist,
+	// then compilation would have failed above us...
+	signal(SIGILL , signal_handler_child);
+	signal(SIGSEGV , signal_handler_child);
+	signal(SIGABRT , signal_handler_child);
+	signal(SIGFPE , signal_handler_child);
+}
+#endif
+
+//
+//I_OutputMsg
+//
+void I_OutputMsg(const char *fmt, ...)
+{
+	size_t len;
+	char *txt;
+	va_list  argptr;
+
+	va_start(argptr,fmt);
+	len = vsnprintf(NULL, 0, fmt, argptr);
+	va_end(argptr);
+	if (len == 0)
+		return;
+
+	txt = malloc(len+1);
+	va_start(argptr,fmt);
+	vsprintf(txt, fmt, argptr);
+	va_end(argptr);
+
+#ifdef HAVE_TTF
+	if (TTF_WasInit()) I_TTFDrawText(currentfont, solid, DEFAULTFONTFGR, DEFAULTFONTFGG, DEFAULTFONTFGB,  DEFAULTFONTFGA,
+	DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt);
+#endif
+
+#if defined (_WIN32) && defined (_MSC_VER)
+	OutputDebugStringA(txt);
+#endif
+
+	len = strlen(txt);
+
+#ifdef LOGMESSAGES
+	if (logstream)
+	{
+		size_t d = fwrite(txt, len, 1, logstream);
+		fflush(logstream);
+		(void)d;
+	}
+#endif
+
+#if defined (_WIN32)
+#ifdef DEBUGFILE
+	if (debugfile != stderr)
+#endif
+	{
+		HANDLE co = GetStdHandle(STD_OUTPUT_HANDLE);
+		DWORD bytesWritten;
+
+		if (co == INVALID_HANDLE_VALUE)
+		{
+			free(txt);
+			return;
+		}
+
+		if (GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &bytesWritten))
+		{
+			static COORD coordNextWrite = {0,0};
+			LPVOID oldLines = NULL;
+			INT oldLength;
+			CONSOLE_SCREEN_BUFFER_INFO csbi;
+
+			// Save the lines that we're going to obliterate.
+			GetConsoleScreenBufferInfo(co, &csbi);
+			oldLength = csbi.dwSize.X * (csbi.dwCursorPosition.Y - coordNextWrite.Y) + csbi.dwCursorPosition.X - coordNextWrite.X;
+
+			if (oldLength > 0)
+			{
+				LPVOID blank = malloc(oldLength);
+				if (!blank)
+				{
+					free(txt);
+					return;
+				}
+				memset(blank, ' ', oldLength); // Blank out.
+				oldLines = malloc(oldLength*sizeof(TCHAR));
+				if (!oldLines)
+				{
+					free(txt);
+					free(blank);
+					return;
+				}
+
+				ReadConsoleOutputCharacter(co, oldLines, oldLength, coordNextWrite, &bytesWritten);
+
+				// Move to where we what to print - which is where we would've been,
+				// had console input not been in the way,
+				SetConsoleCursorPosition(co, coordNextWrite);
+
+				WriteConsoleA(co, blank, oldLength, &bytesWritten, NULL);
+				free(blank);
+
+				// And back to where we want to print again.
+				SetConsoleCursorPosition(co, coordNextWrite);
+			}
+
+			// Actually write the string now!
+			WriteConsoleA(co, txt, (DWORD)len, &bytesWritten, NULL);
+
+			// Next time, output where we left off.
+			GetConsoleScreenBufferInfo(co, &csbi);
+			coordNextWrite = csbi.dwCursorPosition;
+
+			// Restore what was overwritten.
+			if (oldLines && entering_con_command)
+				WriteConsole(co, oldLines, oldLength, &bytesWritten, NULL);
+			if (oldLines) free(oldLines);
+		}
+		else // Redirected to a file.
+			WriteFile(co, txt, (DWORD)len, &bytesWritten, NULL);
+	}
+#else
+#ifdef HAVE_TERMIOS
+	if (consolevent && ttycon_ateol)
+	{
+		tty_Clear();
+		ttycon_ateol = false;
+	}
+#endif
+
+	if (!framebuffer)
+		fprintf(stderr, "%s", txt);
+#ifdef HAVE_TERMIOS
+	if (consolevent && txt[len-1] == '\n')
+	{
+		write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor);
+		ttycon_ateol = true;
+	}
+#endif
+
+	// 2004-03-03 AJR Since not all messages end in newline, some were getting displayed late.
+	if (!framebuffer)
+		fflush(stderr);
+
+#endif
+	free(txt);
+}
+
+//
+// I_GetKey
+//
+INT32 I_GetKey (void)
+{
+	// Warning: I_GetKey empties the event queue till next keypress
+	event_t *ev;
+	INT32 rc = 0;
+
+	// return the first keypress from the event queue
+	for (; eventtail != eventhead; eventtail = (eventtail+1)&(MAXEVENTS-1))
+	{
+		ev = &events[eventtail];
+		if (ev->type == ev_keydown || ev->type == ev_console)
+		{
+			rc = ev->data1;
+			continue;
+		}
+	}
+
+	return rc;
+}
+
+//
+// I_JoyScale
+//
+void I_JoyScale(void)
+{
+}
+
+void I_JoyScale2(void)
+{
+}
+
+void I_JoyScale3(void)
+{
+}
+
+void I_JoyScale4(void)
+{
+}
+
+/**	\brief	Shuts down joystick 1
+
+
+	\return void
+
+
+*/
+void I_ShutdownJoystick(void)
+{
+}
+
+void I_GetJoystickEvents(UINT8 index)
+{
+	(void)index;
+}
+
+//
+// I_InitJoystick
+//
+void I_InitJoystick(UINT8 index)
+{
+	(void)index;
+}
+
+void I_InitJoystick1(void)
+{
+}
+
+void I_InitJoystick2(void)
+{
+}
+
+void I_InitJoystick3(void)
+{
+}
+
+void I_InitJoystick4(void)
+{
+}
+
+INT32 I_NumJoys(void)
+{
+	return 0;
+}
+
+const char *I_GetJoyName(INT32 joyindex)
+{
+	(void)joyindex;
+	return NULL;
+}
+
+void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
+{
+	(void)playernum;
+	(void)low_strength;
+	(void)high_strength;
+	(void)duration;
+}
+
+void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 blue)
+{
+	(void)playernum;
+	(void)red;
+	(void)green;
+	(void)blue;
+}
+
+#ifndef NOMUMBLE
+#ifdef HAVE_MUMBLE
+// Best Mumble positional audio settings:
+// Minimum distance 3.0 m
+// Bloom 175%
+// Maximum distance 80.0 m
+// Minimum volume 50%
+#define DEG2RAD (0.017453292519943295769236907684883l) // TAU/360 or PI/180
+#define MUMBLEUNIT (64.0f) // FRACUNITS in a Meter
+
+static struct {
+#ifdef WINMUMBLE
+	UINT32 uiVersion;
+	DWORD uiTick;
+#else
+	UINT32 uiVersion;
+	UINT32 uiTick;
+#endif
+	float fAvatarPosition[3];
+	float fAvatarFront[3];
+	float fAvatarTop[3]; // defaults to Y-is-up (only used for leaning)
+	wchar_t name[256]; // game name
+	float fCameraPosition[3];
+	float fCameraFront[3];
+	float fCameraTop[3]; // defaults to Y-is-up (only used for leaning)
+	wchar_t identity[256]; // player id
+#ifdef WINMUMBLE
+	UINT32 context_len;
+#else
+	UINT32 context_len;
+#endif
+	unsigned char context[256]; // server/team
+	wchar_t description[2048]; // game description
+} *mumble = NULL;
+#endif // HAVE_MUMBLE
+
+static void I_SetupMumble(void)
+{
+#ifdef WINMUMBLE
+	HANDLE hMap = OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, L"MumbleLink");
+	if (!hMap)
+		return;
+
+	mumble = MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(*mumble));
+	if (!mumble)
+		CloseHandle(hMap);
+#elif defined (HAVE_SHM)
+	int shmfd;
+	char memname[256];
+
+	snprintf(memname, 256, "/MumbleLink.%d", getuid());
+	shmfd = shm_open(memname, O_RDWR, S_IRUSR | S_IWUSR);
+
+	if(shmfd < 0)
+		return;
+
+	mumble = mmap(NULL, sizeof(*mumble), PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, 0);
+	if (mumble == MAP_FAILED)
+		mumble = NULL;
+#endif
+}
+
+void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
+{
+#ifdef HAVE_MUMBLE
+	double angle;
+	fixed_t anglef;
+
+	if (!mumble)
+		return;
+
+	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.
+		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] = mumble->fCameraPosition[1] = mumble->fCameraPosition[2] = 0.0f;
+		mumble->fCameraFront[0] = 1.0f;
+		mumble->fCameraFront[1] = mumble->fCameraFront[2] = 0.0f;
+		return;
+	}
+
+	{
+		UINT8 *p = mumble->context;
+		WRITEMEM(p, server_context, 8);
+		WRITEINT16(p, gamemap);
+		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;
+
+		anglef = AngleFixed(mobj->angle);
+		angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
+		mumble->fAvatarFront[0] = (float)cos(angle);
+		mumble->fAvatarFront[1] = 0.0f;
+		mumble->fAvatarFront[2] = (float)sin(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;
+
+	anglef = AngleFixed(listener.angle);
+	angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
+	mumble->fCameraFront[0] = (float)cos(angle);
+	mumble->fCameraFront[1] = 0.0f;
+	mumble->fCameraFront[2] = (float)sin(angle);
+#else
+	(void)mobj;
+	(void)listener;
+#endif // HAVE_MUMBLE
+}
+#undef WINMUMBLE
+#endif // NOMUMBLE
+
+
+/**	\brief empty ticcmd for player 1
+*/
+static ticcmd_t emptycmd;
+
+ticcmd_t *I_BaseTiccmd(void)
+{
+	return &emptycmd;
+}
+
+/**	\brief empty ticcmd for player 2
+*/
+static ticcmd_t emptycmd2;
+
+ticcmd_t *I_BaseTiccmd2(void)
+{
+	return &emptycmd2;
+}
+
+/**	\brief empty ticcmd for player 3
+ */
+static ticcmd_t emptycmd3;
+
+ticcmd_t *I_BaseTiccmd3(void)
+{
+	return &emptycmd3;
+}
+
+/**	\brief empty ticcmd for player 4
+ */
+static ticcmd_t emptycmd4;
+
+ticcmd_t *I_BaseTiccmd4(void)
+{
+	return &emptycmd4;
+}
+
+//
+// I_GetTime
+// returns time in 1/TICRATE second tics
+//
+
+precise_t I_GetPreciseTime(void)
+{
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+	struct timespec ts;
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	return (precise_t)ts.tv_sec * 1000000000 + ts.tv_nsec;
+#elif defined (_WIN32)
+	LARGE_INTEGER counter;
+	QueryPerformanceCounter(&counter);
+	return (precise_t)counter.QuadPart;
+#else
+	return 0;
+#endif
+}
+
+UINT64 I_GetPrecisePrecision(void)
+{
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+	return 1000000000;
+#elif defined (_WIN32)
+	LARGE_INTEGER frequency;
+	QueryPerformanceFrequency(&frequency);
+	return (UINT64)frequency.QuadPart;
+#else
+	return 1000000;
+#endif
+}
+
+void I_StartupTimer(void){}
+
+void I_Sleep(UINT32 ms)
+{
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+	struct timespec ts = {
+		.tv_sec = ms / 1000,
+		.tv_nsec = ms % 1000 * 1000000,
+	};
+	int status;
+	do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
+	while (status == EINTR);
+#elif defined (_WIN32)
+	Sleep(ms);
+#else
+	(void)ms;
+#warning No sleep function for this system!
+#endif
+}
+
+void I_SleepDuration(precise_t duration)
+{
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__)
+	UINT64 precision = I_GetPrecisePrecision();
+	struct timespec ts = {
+		.tv_sec = duration / precision,
+		.tv_nsec = duration * 1000000000 / precision % 1000000000,
+	};
+	int status;
+	do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
+	while (status == EINTR);
+#elif defined (MIN_SLEEP_DURATION_MS)
+	UINT64 precision = I_GetPrecisePrecision();
+	INT32 sleepvalue = cv_sleep.value;
+	UINT64 delaygranularity;
+	precise_t cur;
+	precise_t dest;
+
+	{
+		double gran = round(((double)(precision / 1000) * sleepvalue * MIN_SLEEP_DURATION_MS));
+		delaygranularity = (UINT64)gran;
+	}
+
+	cur = I_GetPreciseTime();
+	dest = cur + duration;
+
+	// the reason this is not dest > cur is because the precise counter may wrap
+	// two's complement arithmetic is our friend here, though!
+	// e.g. cur 0xFFFFFFFFFFFFFFFE = -2, dest 0x0000000000000001 = 1
+	// 0x0000000000000001 - 0xFFFFFFFFFFFFFFFE = 3
+	while ((INT64)(dest - cur) > 0)
+	{
+		// If our cv_sleep value exceeds the remaining sleep duration, use the
+		// hard sleep function.
+		if (sleepvalue > 0 && (dest - cur) > delaygranularity)
+		{
+			I_Sleep(sleepvalue);
+		}
+
+		// Otherwise, this is a spinloop.
+
+		cur = I_GetPreciseTime();
+	}
+#endif
+}
+
+#ifdef NEWSIGNALHANDLER
+FUNCNORETURN static ATTRNORETURN void newsignalhandler_Warn(const char *pr)
+{
+	char text[128];
+
+	snprintf(text, sizeof text,
+			"Error while setting up signal reporting: %s: %s",
+			pr,
+			strerror(errno)
+	);
+
+	I_OutputMsg("%s\n", text);
+
+	I_ShutdownConsole();
+	exit(-1);
+}
+
+static void I_Fork(void)
+{
+	int child;
+	int status;
+	int signum;
+	int c;
+
+	child = fork();
+
+	switch (child)
+	{
+		case -1:
+			newsignalhandler_Warn("fork()");
+			break;
+		case 0:
+			I_RegisterChildSignals();
+			break;
+		default:
+			if (logstream)
+				fclose(logstream);/* the child has this */
+
+			c = wait(&status);
+
+#ifdef LOGMESSAGES
+			/* By the way, exit closes files. */
+			logstream = fopen(logfilename, "at");
+#else
+			logstream = 0;
+#endif
+
+			if (c == -1)
+			{
+				kill(child, SIGKILL);
+				newsignalhandler_Warn("wait()");
+			}
+			else
+			{
+				if (WIFSIGNALED (status))
+				{
+					signum = WTERMSIG (status);
+#ifdef WCOREDUMP
+					I_ReportSignal(signum, WCOREDUMP (status));
+#else
+					I_ReportSignal(signum, 0);
+#endif
+					status = 128 + signum;
+				}
+				else if (WIFEXITED (status))
+				{
+					status = WEXITSTATUS (status);
+				}
+
+				I_ShutdownConsole();
+				exit(status);
+			}
+	}
+}
+#endif/*NEWSIGNALHANDLER*/
+
+INT32 I_StartupSystem(void)
+{
+	I_StartupConsole();
+#ifdef NEWSIGNALHANDLER
+	// This is useful when debugging. It lets GDB attach to
+	// the correct process easily.
+	if (!M_CheckParm("-nofork"))
+		I_Fork();
+#endif
+#ifdef HAVE_THREADS
+	I_start_threads();
+	I_AddExitFunc(I_stop_threads);
+#endif
+	I_RegisterSignals();
+#ifndef NOMUMBLE
+	I_SetupMumble();
+#endif
+	return 0;
+}
+
+//
+// I_Quit
+//
+void I_Quit(void)
+{
+	static boolean quiting = false;
+
+	/* prevent recursive I_Quit() */
+	if (quiting) goto death;
+	quiting = false;
+	I_ShutdownConsole();
+	M_SaveConfig(NULL); //save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
+	G_SaveGameData(false); // Tails 12-08-2002
+	//added:16-02-98: when recording a demo, should exit using 'q' key,
+	//        but sometimes we forget and use 'F10'.. so save here too.
+
+	if (demo.recording)
+		G_CheckDemoStatus();
+	if (metalrecording)
+		G_StopMetalRecording();
+
+	D_QuitNetGame();
+	I_ShutdownMusic();
+	I_ShutdownSound();
+	// use this for 1.28 19990220 by Kin
+	I_ShutdownGraphics();
+	I_ShutdownSystem();
+	/* if option -noendtxt is set, don't print the text */
+	if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM") != LUMPERROR)
+	{
+		printf("\r");
+		ShowEndTxt();
+	}
+	if (myargmalloc)
+		free(myargv); // Deallocate allocated memory
+death:
+	W_Shutdown();
+	exit(0);
+}
+
+void I_WaitVBL(INT32 count)
+{
+	count = 1;
+	I_Sleep(count);
+}
+
+void I_BeginRead(void)
+{
+}
+
+void I_EndRead(void)
+{
+}
+
+//
+// I_Error
+//
+/**	\brief phuck recursive errors
+*/
+static INT32 errorcount = 0;
+
+/**	\brief recursive error detecting
+*/
+static boolean shutdowning = false;
+
+void I_Error(const char *error, ...)
+{
+	va_list argptr;
+	char buffer[8192];
+
+	// recursive error detecting
+	if (shutdowning)
+	{
+		errorcount++;
+		// try to shutdown each subsystem separately
+		if (errorcount == 1)
+			I_ShutdownMusic();
+		if (errorcount == 2)
+			I_ShutdownSound();
+		if (errorcount == 3)
+			I_ShutdownGraphics();
+		if (errorcount == 4)
+			I_ShutdownSystem();
+		if (errorcount == 5)
+		{
+			M_SaveConfig(NULL);
+			G_SaveGameData(false);
+		}
+		if (errorcount > 20)
+		{
+			va_start(argptr, error);
+			vsprintf(buffer, error, argptr);
+			va_end(argptr);
+
+			I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
+
+			W_Shutdown();
+			exit(-1); // recursive errors detected
+		}
+	}
+
+	shutdowning = true;
+
+	// Display error message in the console before we start shutting it down
+	va_start(argptr, error);
+	vsprintf(buffer, error, argptr);
+	va_end(argptr);
+	I_OutputMsg("\nI_Error(): %s\n", buffer);
+
+#ifdef HAVE_LIBBACKTRACE
+	write_backtrace(BT_CRASH_REASON_ERRORMSG(buffer));
+#endif
+	// ---
+
+	I_ShutdownConsole();
+
+	M_SaveConfig(NULL); // save game config, cvars..
+#ifndef NONET
+	D_SaveBan(); // save the ban list
+#endif
+	G_SaveGameData(false); // Tails 12-08-2002
+
+	// Shutdown. Here might be other errors.
+	if (demo.recording)
+		G_CheckDemoStatus();
+	if (metalrecording)
+		G_StopMetalRecording();
+
+	D_QuitNetGame();
+	I_ShutdownMusic();
+	I_ShutdownSound();
+	// use this for 1.28 19990220 by Kin
+	I_ShutdownGraphics();
+	I_ShutdownSystem();
+
+	W_Shutdown();
+
+#if defined (PARANOIA) && defined (__CYGWIN__)
+	*(INT32 *)2 = 4; //Alam: Debug!
+#endif
+
+	exit(-1);
+}
+
+/**	\brief quit function table
+*/
+static quitfuncptr quit_funcs[MAX_QUIT_FUNCS]; /* initialized to all bits 0 */
+
+//
+//  Adds a function to the list that need to be called by I_SystemShutdown().
+//
+void I_AddExitFunc(void (*func)())
+{
+	INT32 c;
+
+	for (c = 0; c < MAX_QUIT_FUNCS; c++)
+	{
+		if (!quit_funcs[c])
+		{
+			quit_funcs[c] = func;
+			break;
+		}
+	}
+}
+
+
+//
+//  Removes a function from the list that need to be called by
+//   I_SystemShutdown().
+//
+void I_RemoveExitFunc(void (*func)())
+{
+	INT32 c;
+
+	for (c = 0; c < MAX_QUIT_FUNCS; c++)
+	{
+		if (quit_funcs[c] == func)
+		{
+			while (c < MAX_QUIT_FUNCS-1)
+			{
+				quit_funcs[c] = quit_funcs[c+1];
+				c++;
+			}
+			quit_funcs[MAX_QUIT_FUNCS-1] = NULL;
+			break;
+		}
+	}
+}
+
+#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
+static void Shittycopyerror(const char *name)
+{
+	I_OutputMsg(
+			"Error copying log file: %s: %s\n",
+			name,
+			strerror(errno)
+	);
+}
+
+static void Shittylogcopy(void)
+{
+	char buf[8192];
+	FILE *fp;
+	size_t r;
+	if (fseek(logstream, 0, SEEK_SET) == -1)
+	{
+		Shittycopyerror("fseek");
+	}
+	else if (( fp = fopen(logfilename, "wt") ))
+	{
+		while (( r = fread(buf, 1, sizeof buf, logstream) ))
+		{
+			if (fwrite(buf, 1, r, fp) < r)
+			{
+				Shittycopyerror("fwrite");
+				break;
+			}
+		}
+		if (ferror(logstream))
+		{
+			Shittycopyerror("fread");
+		}
+		fclose(fp);
+	}
+	else
+	{
+		Shittycopyerror(logfilename);
+	}
+}
+#endif/*!(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))*/
+
+//
+//  Closes down everything. This includes restoring the initial
+//  palette and video mode, and removing whatever mouse, keyboard, and
+//  timer routines have been installed.
+//
+//  NOTE: Shutdown user funcs are effectively called in reverse order.
+//
+void I_ShutdownSystem(void)
+{
+	INT32 c;
+
+#ifndef NEWSIGNALHANDLER
+	I_ShutdownConsole();
+#endif
+
+	for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
+		if (quit_funcs[c])
+			(*quit_funcs[c])();
+#ifdef LOGMESSAGES
+	if (logstream)
+	{
+		I_OutputMsg("I_ShutdownSystem(): end of logstream.\n");
+#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
+		Shittylogcopy();
+#endif
+		fclose(logstream);
+		logstream = NULL;
+	}
+#endif
+}
+
+void I_GetDiskFreeSpace(INT64 *freespace)
+{
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (SOLARIS) || defined (__HAIKU__)
+	*freespace = INT32_MAX;
+	return;
+#else // Both Linux and BSD have this, apparently.
+	struct statfs stfs;
+	if (statfs(".", &stfs) == -1)
+	{
+		*freespace = INT32_MAX;
+		return;
+	}
+	*freespace = stfs.f_bavail * stfs.f_bsize;
+#endif
+#elif defined (_WIN32)
+	static p_GetDiskFreeSpaceExA pfnGetDiskFreeSpaceEx = NULL;
+	static boolean testwin95 = false;
+	ULARGE_INTEGER usedbytes, lfreespace;
+
+	if (!testwin95)
+	{
+		pfnGetDiskFreeSpaceEx = (p_GetDiskFreeSpaceExA)(LPVOID)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetDiskFreeSpaceExA");
+		testwin95 = true;
+	}
+	if (pfnGetDiskFreeSpaceEx)
+	{
+		if (pfnGetDiskFreeSpaceEx(NULL, &lfreespace, &usedbytes, NULL))
+			*freespace = lfreespace.QuadPart;
+		else
+			*freespace = INT32_MAX;
+	}
+	else
+	{
+		DWORD SectorsPerCluster, BytesPerSector, NumberOfFreeClusters, TotalNumberOfClusters;
+		GetDiskFreeSpace(NULL, &SectorsPerCluster, &BytesPerSector,
+						 &NumberOfFreeClusters, &TotalNumberOfClusters);
+		*freespace = BytesPerSector*SectorsPerCluster*NumberOfFreeClusters;
+	}
+#else // Dummy for platform independent; 1GB should be enough
+	*freespace = 1024*1024*1024;
+#endif
+}
+
+char *I_GetUserName(void)
+{
+	static char username[MAXPLAYERNAME+1];
+	char *p;
+#ifdef _WIN32
+	DWORD i = MAXPLAYERNAME;
+
+	if (!GetUserNameA(username, &i))
+#endif
+	{
+		p = I_GetEnv("USER");
+		if (!p)
+		{
+			p = I_GetEnv("user");
+			if (!p)
+			{
+				p = I_GetEnv("USERNAME");
+				if (!p)
+				{
+					p = I_GetEnv("username");
+					if (!p)
+					{
+						return NULL;
+					}
+				}
+			}
+		}
+		strncpy(username, p, MAXPLAYERNAME);
+	}
+
+
+	if (strcmp(username, "") != 0)
+		return username;
+	return NULL; // dummy for platform independent version
+}
+
+INT32 I_mkdir(const char *dirname, INT32 unixright)
+{
+//[segabor]
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) || defined (__CYGWIN__) || defined (__OS2__)
+	return mkdir(dirname, unixright);
+#elif defined (_WIN32)
+	UNREFERENCED_PARAMETER(unixright); /// \todo should implement ntright under nt...
+	return CreateDirectoryA(dirname, NULL);
+#else
+	(void)dirname;
+	(void)unixright;
+	return false;
+#endif
+}
+
+char *I_GetEnv(const char *name)
+{
+	return getenv(name);
+}
+
+INT32 I_PutEnv(char *variable)
+{
+	return putenv(variable);
+}
+
+INT32 I_ClipboardCopy(const char *data, size_t size)
+{
+	(void)data;
+	(void)size;
+	return -1;
+}
+
+const char *I_ClipboardPaste(void)
+{
+	return NULL;
+}
+
+/**	\brief	The isWadPathOk function
+
+	\param	path	string path to check
+
+	\return if true, wad file found
+
+
+*/
+static boolean isWadPathOk(const char *path)
+{
+	char *wad3path = malloc(256);
+
+	if (!wad3path)
+		return false;
+
+	sprintf(wad3path, pandf, path, WADKEYWORD1);
+
+	if (FIL_ReadFileOK(wad3path))
+	{
+		free(wad3path);
+		return true;
+	}
+
+	sprintf(wad3path, pandf, path, WADKEYWORD2);
+
+	if (FIL_ReadFileOK(wad3path))
+	{
+		free(wad3path);
+		return true;
+	}
+
+	free(wad3path);
+	return false;
+}
+
+static void pathonly(char *s)
+{
+	size_t j;
+
+	for (j = strlen(s); j != (size_t)-1; j--)
+		if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
+		{
+			if (s[j] == ':') s[j+1] = 0;
+			else s[j] = 0;
+			return;
+		}
+}
+
+/**	\brief	search for srb2.srb in the given path
+
+	\param	searchDir	starting path
+
+	\return	WAD path if not NULL
+
+
+*/
+static const char *searchWad(const char *searchDir)
+{
+	static char tempsw[256] = "";
+	filestatus_t fstemp;
+
+	strcpy(tempsw, WADKEYWORD1);
+	fstemp = filesearch(tempsw,searchDir,NULL,true,20);
+	if (fstemp == FS_FOUND)
+	{
+		pathonly(tempsw);
+		return tempsw;
+	}
+
+	strcpy(tempsw, WADKEYWORD2);
+	fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
+	if (fstemp == FS_FOUND)
+	{
+		pathonly(tempsw);
+		return tempsw;
+	}
+	return NULL;
+}
+
+/**	\brief go through all possible paths and look for srb2.srb
+
+  \return path to srb2.srb if any
+*/
+static const char *locateWad(void)
+{
+	const char *envstr;
+	const char *WadPath;
+
+	I_OutputMsg("SRB2WADDIR");
+	// does SRB2WADDIR exist?
+	if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr))
+		return envstr;
+
+#ifndef NOCWD
+	I_OutputMsg(",.");
+	// examine current dir
+	strcpy(returnWadPath, ".");
+	if (isWadPathOk(returnWadPath))
+		return NULL;
+#endif
+
+
+#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;
+	}
+#endif
+#endif
+
+#ifdef __APPLE__
+	OSX_GetResourcesPath(returnWadPath);
+	I_OutputMsg(",%s", returnWadPath);
+	if (isWadPathOk(returnWadPath))
+	{
+		return 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)
+	{
+		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;
+	}
+#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
+	// if nothing was found
+	return NULL;
+}
+
+const char *I_LocateWad(void)
+{
+	const char *waddir;
+
+	I_OutputMsg("Looking for WADs in: ");
+	waddir = locateWad();
+	I_OutputMsg("\n");
+
+	if (waddir)
+	{
+		// change to the directory where we found srb2.srb
+#if defined (_WIN32)
+		SetCurrentDirectoryA(waddir);
+#else
+		if (chdir(waddir) == -1)
+			I_OutputMsg("Couldn't change working directory\n");
+#endif
+	}
+	return waddir;
+}
+
+#ifdef __linux__
+#define MEMINFO_FILE "/proc/meminfo"
+#define MEMTOTAL "MemTotal:"
+#define MEMAVAILABLE "MemAvailable:"
+#define MEMFREE "MemFree:"
+#define CACHED "Cached:"
+#define BUFFERS "Buffers:"
+#define SHMEM "Shmem:"
+
+/* Parse the contents of /proc/meminfo (in buf), return value of "name"
+ * (example: MemTotal) */
+static long get_entry(const char* name, const char* buf)
+{
+	long val;
+	char* hit = strstr(buf, name);
+	if (hit == NULL) {
+		return -1;
+	}
+
+	errno = 0;
+	val = strtol(hit + strlen(name), NULL, 10);
+	if (errno != 0) {
+		CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
+		return -1;
+	}
+	return val;
+}
+#endif
+
+size_t I_GetFreeMem(size_t *total)
+{
+#ifdef FREEBSD
+	u_int v_free_count, v_page_size, v_page_count;
+	size_t size = sizeof(v_free_count);
+	sysctlbyname("vm.stats.vm.v_free_count", &v_free_count, &size, NULL, 0);
+	size = sizeof(v_page_size);
+	sysctlbyname("vm.stats.vm.v_page_size", &v_page_size, &size, NULL, 0);
+	size = sizeof(v_page_count);
+	sysctlbyname("vm.stats.vm.v_page_count", &v_page_count, &size, NULL, 0);
+
+	if (total)
+		*total = v_page_count * v_page_size;
+	return v_free_count * v_page_size;
+#elif defined (SOLARIS)
+	/* Just guess */
+	if (total)
+		*total = 32 << 20;
+	return 32 << 20;
+#elif defined (_WIN32)
+	MEMORYSTATUS info;
+
+	info.dwLength = sizeof (MEMORYSTATUS);
+	GlobalMemoryStatus( &info );
+	if (total)
+		*total = (size_t)info.dwTotalPhys;
+	return (size_t)info.dwAvailPhys;
+#elif defined (__OS2__)
+	UINT32 pr_arena;
+
+	if (total)
+		DosQuerySysInfo( QSV_TOTPHYSMEM, QSV_TOTPHYSMEM,
+							(PVOID) total, sizeof (UINT32));
+	DosQuerySysInfo( QSV_MAXPRMEM, QSV_MAXPRMEM,
+				(PVOID) &pr_arena, sizeof (UINT32));
+
+	return pr_arena;
+#elif defined (__linux__)
+	/* Linux */
+	char buf[1024];
+	char *memTag;
+	size_t freeKBytes;
+	size_t totalKBytes;
+	INT32 n;
+	INT32 meminfo_fd = -1;
+	long Cached;
+	long MemFree;
+	long Buffers;
+	long Shmem;
+	long MemAvailable = -1;
+
+	meminfo_fd = open(MEMINFO_FILE, O_RDONLY);
+	n = read(meminfo_fd, buf, 1023);
+	close(meminfo_fd);
+
+	if (n < 0)
+	{
+		// Error
+		if (total)
+			*total = 0L;
+		return 0;
+	}
+
+	buf[n] = '\0';
+	if ((memTag = strstr(buf, MEMTOTAL)) == NULL)
+	{
+		// Error
+		if (total)
+			*total = 0L;
+		return 0;
+	}
+
+	memTag += sizeof (MEMTOTAL);
+	totalKBytes = (size_t)atoi(memTag);
+
+	if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL)
+	{
+		Cached = get_entry(CACHED, buf);
+		MemFree = get_entry(MEMFREE, buf);
+		Buffers = get_entry(BUFFERS, buf);
+		Shmem = get_entry(SHMEM, buf);
+		MemAvailable = Cached + MemFree + Buffers - Shmem;
+
+		if (MemAvailable == -1)
+		{
+			// Error
+			if (total)
+				*total = 0L;
+			return 0;
+		}
+		freeKBytes = MemAvailable;
+	}
+	else
+	{
+		memTag += sizeof (MEMAVAILABLE);
+		freeKBytes = atoi(memTag);
+	}
+
+	if (total)
+		*total = totalKBytes << 10;
+	return freeKBytes << 10;
+#else
+	// Guess 48 MB.
+	if (total)
+		*total = 48<<20;
+	return 48<<20;
+#endif
+}
+
+// note CPUAFFINITY code used to reside here
+void I_RegisterSysCommands(void) {}
+
+boolean I_InitNetwork(void)
+{
+	// this must exist, but this is actually handled in i_tcp.c
+	return false;
+}
diff --git a/src/dedicated/i_threads.c b/src/dedicated/i_threads.c
new file mode 100644
index 000000000..f981fa961
--- /dev/null
+++ b/src/dedicated/i_threads.c
@@ -0,0 +1,364 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020-2023 by James R.
+//
+// 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_threads.c
+/// \brief Multithreading abstraction
+
+#if defined (__unix__) || (!defined(__APPLE__) && defined (UNIXCOMMON))
+
+#include <pthread.h>
+
+#include "../i_threads.h"
+#include "../doomdef.h"
+
+typedef struct thread_s thread_t;
+
+struct thread_s
+{
+	thread_t *next;
+	void *userdata;
+	I_thread_fn func;
+	pthread_t thread;
+};
+
+// we use a linked list to avoid moving memory blocks when allocating new threads.
+static thread_t *thread_list;
+static pthread_mutex_t thread_lock = PTHREAD_MUTEX_INITIALIZER;
+
+static void *HandleThread(void *data)
+{
+	thread_t *thread = data;
+	thread->func(thread->userdata);
+
+	pthread_mutex_lock(&thread_lock);
+	thread->func = NULL;
+	pthread_mutex_unlock(&thread_lock);
+	return NULL;
+}
+
+void
+I_spawn_thread (
+	const char  * name,
+	I_thread_fn   entry,
+	void        * userdata
+)
+{
+	thread_t *thread;
+	(void)name;
+
+	pthread_mutex_lock(&thread_lock);
+	thread = thread_list;
+	while (thread != NULL)
+	{
+		if (thread->func == NULL)
+		{
+			// join with the exited thread to release it's resources.
+			pthread_join(thread->thread, NULL);
+			break;
+		}
+		thread = thread->next;
+	}
+	if (thread == NULL)
+	{
+		thread = malloc(sizeof(thread_t));
+		thread->next = thread_list;
+		thread_list = thread;
+	}
+
+	thread->func = entry;
+	thread->userdata = userdata;
+	pthread_create(&thread->thread, NULL, HandleThread, thread);
+	pthread_mutex_unlock(&thread_lock);
+}
+
+int I_thread_is_stopped(void)
+{
+	thread_t *thread;
+	pthread_mutex_lock(&thread_lock);
+	thread = thread_list;
+	while (thread != NULL)
+	{
+		if (thread->func != NULL)
+		{
+			pthread_mutex_unlock(&thread_lock);
+			return false;
+		}
+		thread = thread->next;
+	}
+	pthread_mutex_unlock(&thread_lock);
+	return true;
+}
+
+void I_start_threads(void)
+{
+}
+
+void I_stop_threads(void)
+{
+	thread_t *thread = thread_list;
+	while (thread != NULL)
+	{
+		// join with all threads here, since finished threads haven't been awaited yet.
+		pthread_join(thread->thread, NULL);
+		thread = thread->next;
+	}
+}
+
+void I_lock_mutex(I_mutex *anchor)
+{
+	pthread_mutex_lock(&thread_lock);
+	if (*anchor == NULL)
+	{
+		pthread_mutexattr_t attr;
+		pthread_mutexattr_init(&attr);
+
+		// SRB2 relies on lock recursion, so we need a mutex configured for that.
+		pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+		*anchor = malloc(sizeof(pthread_mutex_t));
+		pthread_mutex_init(*anchor, &attr);
+		pthread_mutexattr_destroy(&attr);
+	}
+	pthread_mutex_unlock(&thread_lock);
+	pthread_mutex_lock(*anchor);
+}
+
+void I_unlock_mutex(I_mutex id)
+{
+	pthread_mutex_unlock(id);
+}
+
+void I_hold_cond(I_cond *cond_anchor, I_mutex mutex_id)
+{
+	I_Assert(mutex_id != NULL);
+	pthread_mutex_lock(&thread_lock);
+	if (*cond_anchor == NULL)
+	{
+		*cond_anchor = malloc(sizeof(pthread_cond_t));
+		pthread_cond_init(*cond_anchor, NULL);
+	}
+	pthread_mutex_unlock(&thread_lock);
+	pthread_cond_wait(*cond_anchor, mutex_id);
+}
+
+void I_wake_one_cond(I_cond *anchor)
+{
+	pthread_mutex_lock(&thread_lock);
+	if (*anchor == NULL)
+	{
+		*anchor = malloc(sizeof(pthread_cond_t));
+		pthread_cond_init(*anchor, NULL);
+	}
+	pthread_mutex_unlock(&thread_lock);
+	pthread_cond_signal(*anchor);
+}
+
+void I_wake_all_cond(I_cond *anchor)
+{
+	pthread_mutex_lock(&thread_lock);
+	if (*anchor == NULL)
+	{
+		*anchor = malloc(sizeof(pthread_cond_t));
+		pthread_cond_init(*anchor, NULL);
+	}
+	pthread_mutex_unlock(&thread_lock);
+	pthread_cond_broadcast(*anchor);
+}
+#elif defined (_WIN32)
+#include <windows.h>
+
+#include "../i_threads.h"
+#include "../doomdef.h"
+#include "../doomtype.h"
+
+typedef struct thread_s thread_t;
+
+struct thread_s
+{
+	thread_t *next;
+	void *userdata;
+	I_thread_fn func;
+	HANDLE thread;
+	DWORD thread_id;
+};
+
+// we use a linked list to avoid moving memory blocks when allocating new threads.
+static thread_t *thread_list;
+static CRITICAL_SECTION thread_lock;
+
+static DWORD __stdcall HandleThread(void *data)
+{
+	thread_t *thread = data;
+	thread->func(thread->userdata);
+
+	EnterCriticalSection(&thread_lock);
+	thread->func = NULL;
+	LeaveCriticalSection(&thread_lock);
+	return 0;
+}
+
+void I_spawn_thread(const char *name, I_thread_fn entry, void *userdata)
+{
+	thread_t *thread;
+	(void)name;
+	EnterCriticalSection(&thread_lock);
+	thread = thread_list;
+	while (thread != NULL)
+	{
+		if (thread->func == NULL)
+		{
+			CloseHandle(thread->thread);
+			break;
+		}
+		thread = thread->next;
+	}
+	if (thread == NULL)
+	{
+		thread = malloc(sizeof(thread_t));
+		thread->next = thread_list;
+		thread_list = thread;
+	}
+
+	thread->func = entry;
+	thread->userdata = userdata;
+	thread->thread = CreateThread(NULL, 0, HandleThread, thread, 0, &thread->thread_id);
+	LeaveCriticalSection(&thread_lock);
+}
+
+int I_thread_is_stopped(void)
+{
+	thread_t *thread;
+	EnterCriticalSection(&thread_lock);
+	thread = thread_list;
+	while (thread != NULL)
+	{
+		if (thread->func != NULL)
+		{
+			LeaveCriticalSection(&thread_lock);
+			return false;
+		}
+		thread = thread->next;
+	}
+	LeaveCriticalSection(&thread_lock);
+	return true;
+}
+
+void I_start_threads(void)
+{
+	InitializeCriticalSection(&thread_lock);
+}
+
+void I_stop_threads(void)
+{
+	thread_t *thread = thread_list;
+	while (thread != NULL)
+	{
+		WaitForSingleObject(thread->thread, INFINITE);
+		CloseHandle(thread->thread);
+		thread = thread->next;
+	}
+	DeleteCriticalSection(&thread_lock);
+}
+
+void I_lock_mutex(I_mutex *anchor)
+{
+	EnterCriticalSection(&thread_lock);
+	if (*anchor == NULL)
+	{
+		*anchor = malloc(sizeof(CRITICAL_SECTION));
+		InitializeCriticalSection(*anchor);
+	}
+	LeaveCriticalSection(&thread_lock);
+	EnterCriticalSection(*anchor);
+}
+
+void I_unlock_mutex(I_mutex id)
+{
+	LeaveCriticalSection(id);
+}
+
+void I_hold_cond(I_cond *cond_anchor, I_mutex mutex_id)
+{
+	I_Assert(mutex_id != NULL);
+	EnterCriticalSection(&thread_lock);
+	if (*cond_anchor == NULL)
+	{
+		*cond_anchor = malloc(sizeof(CONDITION_VARIABLE));
+		InitializeConditionVariable(*cond_anchor);
+	}
+	LeaveCriticalSection(&thread_lock);
+	SleepConditionVariableCS(*cond_anchor, mutex_id, INFINITE);
+}
+
+void I_wake_one_cond(I_cond *anchor)
+{
+	EnterCriticalSection(&thread_lock);
+	if (*anchor == NULL)
+	{
+		*anchor = malloc(sizeof(CONDITION_VARIABLE));
+		InitializeConditionVariable(*anchor);
+	}
+	LeaveCriticalSection(&thread_lock);
+	WakeConditionVariable(*anchor);
+}
+
+void I_wake_all_cond(I_cond *anchor)
+{
+	EnterCriticalSection(&thread_lock);
+	if (*anchor == NULL)
+	{
+		*anchor = malloc(sizeof(CONDITION_VARIABLE));
+		InitializeConditionVariable(*anchor);
+	}
+	LeaveCriticalSection(&thread_lock);
+	WakeAllConditionVariable(*anchor);
+}
+#else
+void I_spawn_thread(const char *name, I_thread_fn entry, void *userdata)
+{
+	(void)name;
+	entry(userdata);
+}
+
+int I_thread_is_stopped(void)
+{
+}
+
+void I_start_threads(void)
+{
+}
+
+void I_stop_threads(void)
+{
+}
+
+void I_lock_mutex(I_mutex *anchor)
+{
+	(void)anchor;
+}
+
+void I_unlock_mutex(I_mutex id)
+{
+	(void)id;
+}
+
+void I_hold_cond(I_cond *cond_anchor, I_mutex mutex_id)
+{
+	(void)cond_anchor;
+	(void)mutex_id;
+}
+
+void I_wake_one_cond(I_cond *anchor)
+{
+	(void)anchor;
+}
+
+void I_wake_all_cond(I_cond *anchor)
+{
+	(void)anchor;
+}
+#endif
diff --git a/src/dedicated/i_video.c b/src/dedicated/i_video.c
new file mode 100644
index 000000000..8f8781e9e
--- /dev/null
+++ b/src/dedicated/i_video.c
@@ -0,0 +1,159 @@
+// Emacs style mode select   -*- C++ -*-
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+//
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Portions Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 2014-2018 by Sonic Team Junior.
+//
+// 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 SRB2 graphics stuff for dedicated
+
+#include "../doomdef.h"
+#include "../i_system.h"
+#include "../i_video.h"
+#include "../console.h"
+#include "../command.h"
+#include "../i_system.h"
+#include "../screen.h"
+
+rendermode_t rendermode = render_none;
+
+boolean highcolor = false;
+
+// synchronize page flipping with screen refresh
+consvar_t cv_vidwait = {"vid_wait", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {3, "AZERTY"}, {0, NULL}};
+consvar_t cv_keyboardlayout = {"keyboardlayout", "Default US", CV_SAVE, keyboardlayout_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+INT32 numcontrollers = 0;
+
+UINT8 graphics_started = 0; // Is used in console.c and screen.c
+
+// To disable fullscreen at startup; is set in VID_PrepareModeList
+boolean     allow_fullscreen = false;
+UINT16      realwidth = BASEVIDWIDTH;
+UINT16      realheight = BASEVIDHEIGHT;
+
+extern boolean consolevent;
+
+void I_GetConsoleEvents(void);
+
+void I_GetEvent(void)
+{
+}
+
+void I_StartupMouse(void)
+{
+}
+
+//
+// I_OsPolling
+//
+void I_OsPolling(void)
+{
+	if (consolevent)
+		I_GetConsoleEvents();
+}
+
+//
+// I_UpdateNoBlit
+//
+void I_UpdateNoBlit(void)
+{
+}
+
+//
+// I_FinishUpdate
+//
+void I_FinishUpdate(void)
+{
+}
+
+//
+// I_UpdateNoVsync
+//
+void I_UpdateNoVsync(void)
+{
+}
+
+//
+// I_ReadScreen
+//
+void I_ReadScreen(UINT8 *scr)
+{
+	(void)scr;
+}
+
+//
+// I_SetPalette
+//
+void I_SetPalette(RGBA_t *palette)
+{
+	(void)palette;
+}
+
+// return number of fullscreen + X11 modes
+INT32 VID_NumModes(void)
+{
+	return 0;
+}
+
+const char *VID_GetModeName(INT32 modenum)
+{
+	(void)modenum;
+	return NULL;
+}
+
+INT32 VID_GetModeForSize(INT32 w, INT32 h)
+{
+	(void)w;
+	(void)h;
+	return -1;
+}
+
+void VID_PrepareModeList(void)
+{
+}
+
+INT32 VID_SetMode(INT32 modeNum)
+{
+	(void)modeNum;
+	return true;
+}
+
+void I_StartupGraphics(void)
+{
+}
+
+void I_ShutdownGraphics(void)
+{
+}
+
+UINT32 I_GetRefreshRate(void)
+{
+	return 0;
+}
+
+boolean I_UseNativeKeyboard(void)
+{
+	return false;
+}
+
+void I_SetBorderlessWindow(void) 
+{
+
+}
diff --git a/src/dehacked.c b/src/dehacked.c
index 094e3d641..ff03e3694 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -14,7 +14,6 @@
 #include "d_main.h" // for srb2home
 #include "g_game.h"
 #include "sounds.h"
-#include "info.h"
 #include "d_think.h"
 #include "m_argv.h"
 #include "z_zone.h"
@@ -29,16 +28,16 @@
 #include "p_local.h" // for var1 and var2, and some constants
 #include "p_setup.h"
 #include "r_data.h"
-#include "r_patch.h"
+#include "r_fps.h"
 #include "r_sky.h"
 #include "r_draw.h" // translation colormap consts (for lua)
 #include "fastcmp.h"
-#include "lua_script.h"
-#include "lua_glib.h"
-#include "lua_hook.h"
+
 #include "d_clisrv.h"
 #include "v_video.h" // video flags (for lua)
 
+#include "lua_glib.h"
+#include "lua_hook.h"
 #include "lua_script.h"
 #include "lua_libs.h"
 
@@ -48,13 +47,14 @@
 
 // Free slot names
 // The crazy word-reading stuff uses these.
-static char *FREE_STATES[NUMSTATEFREESLOTS];
-static char *FREE_MOBJS[NUMMOBJFREESLOTS];
-static 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);\
-memset(FREE_MOBJS,0,sizeof(char *) * NUMMOBJFREESLOTS);\
-memset(used_spr,0,sizeof(UINT8) * ((NUMSPRITEFREESLOTS / 8) + 1));\
+	memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
+	memset(FREE_MOBJS,0,sizeof(char *) * NUMMOBJFREESLOTS);\
+	memset(used_spr,0,sizeof(UINT8) * ((NUMSPRITEFREESLOTS / 8) + 1));\
 }
 
 // Crazy word-reading stuff
@@ -291,8 +291,6 @@ static void readPlayer(MYFILE *f, INT32 num)
 	INT32 i;
 	boolean slotfound = false;
 
-	DEH_WriteUndoline("PLAYERTEXT", description[num].notes, UNDO_ENDTEXT);
-
 	do
 	{
 		if (myfgets(s, MAXLINELEN, f))
@@ -362,7 +360,6 @@ static void readPlayer(MYFILE *f, INT32 num)
 			{
 				if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
 					goto done;
-				DEH_WriteUndoline(word, &description[num].picname[0], UNDO_NONE);
 				PlayerMenu[num].status = IT_CALL;
 				strncpy(description[num].picname, word2, 8);
 			}
@@ -386,7 +383,6 @@ static void readPlayer(MYFILE *f, INT32 num)
 				*/
 				if (i != IT_DISABLED && !slotfound && (slotfound = findFreeSlot(&num)) == false)
 					goto done;
-				DEH_WriteUndoline(word, va("%d", PlayerMenu[num].status), UNDO_NONE);
 				PlayerMenu[num].status = (INT16)i;
 			}
 			else if (fastcmp(word, "SKINNAME"))
@@ -394,7 +390,6 @@ static void readPlayer(MYFILE *f, INT32 num)
 				// Send to free slot.
 				if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
 					goto done;
-				DEH_WriteUndoline(word, description[num].skinname, UNDO_NONE);
 				PlayerMenu[num].status = IT_CALL;
 
 				strlcpy(description[num].skinname, word2, sizeof description[num].skinname);
@@ -557,122 +552,98 @@ static void readthing(MYFILE *f, INT32 num)
 
 			if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].doomednum), UNDO_NONE);
 				mobjinfo[num].doomednum = (INT32)atoi(word2);
 			}
 			else if (fastcmp(word, "SPAWNSTATE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].spawnstate), UNDO_NONE);
 				mobjinfo[num].spawnstate = get_number(word2);
 			}
 			else if (fastcmp(word, "SPAWNHEALTH"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].spawnhealth), UNDO_NONE);
 				mobjinfo[num].spawnhealth = (INT32)get_number(word2);
 			}
 			else if (fastcmp(word, "SEESTATE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].seestate), UNDO_NONE);
 				mobjinfo[num].seestate = get_number(word2);
 			}
 			else if (fastcmp(word, "SEESOUND"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].seesound), UNDO_NONE);
 				mobjinfo[num].seesound = get_number(word2);
 			}
 			else if (fastcmp(word, "REACTIONTIME"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].reactiontime), UNDO_NONE);
 				mobjinfo[num].reactiontime = (INT32)get_number(word2);
 			}
 			else if (fastcmp(word, "ATTACKSOUND"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].attacksound), UNDO_NONE);
 				mobjinfo[num].attacksound = get_number(word2);
 			}
 			else if (fastcmp(word, "PAINSTATE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].painstate), UNDO_NONE);
 				mobjinfo[num].painstate = get_number(word2);
 			}
 			else if (fastcmp(word, "PAINCHANCE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].painchance), UNDO_NONE);
 				mobjinfo[num].painchance = (INT32)get_number(word2);
 			}
 			else if (fastcmp(word, "PAINSOUND"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].painsound), UNDO_NONE);
 				mobjinfo[num].painsound = get_number(word2);
 			}
 			else if (fastcmp(word, "MELEESTATE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].meleestate), UNDO_NONE);
 				mobjinfo[num].meleestate = get_number(word2);
 			}
 			else if (fastcmp(word, "MISSILESTATE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].missilestate), UNDO_NONE);
 				mobjinfo[num].missilestate = get_number(word2);
 			}
 			else if (fastcmp(word, "DEATHSTATE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].deathstate), UNDO_NONE);
 				mobjinfo[num].deathstate = get_number(word2);
 			}
 			else if (fastcmp(word, "DEATHSOUND"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].deathsound), UNDO_NONE);
 				mobjinfo[num].deathsound = get_number(word2);
 			}
 			else if (fastcmp(word, "XDEATHSTATE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].xdeathstate), UNDO_NONE);
 				mobjinfo[num].xdeathstate = get_number(word2);
 			}
 			else if (fastcmp(word, "SPEED"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].speed), UNDO_NONE);
 				mobjinfo[num].speed = get_number(word2);
 			}
 			else if (fastcmp(word, "RADIUS"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].radius), UNDO_NONE);
 				mobjinfo[num].radius = get_number(word2);
 			}
 			else if (fastcmp(word, "HEIGHT"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].height), UNDO_NONE);
 				mobjinfo[num].height = get_number(word2);
 			}
 			else if (fastcmp(word, "DISPOFFSET"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].dispoffset), UNDO_NONE);
 				mobjinfo[num].dispoffset = get_number(word2);
 			}
 			else if (fastcmp(word, "MASS"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].mass), UNDO_NONE);
 				mobjinfo[num].mass = (INT32)get_number(word2);
 			}
 			else if (fastcmp(word, "DAMAGE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].damage), UNDO_NONE);
 				mobjinfo[num].damage = (INT32)get_number(word2);
 			}
 			else if (fastcmp(word, "ACTIVESOUND"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].activesound), UNDO_NONE);
 				mobjinfo[num].activesound = get_number(word2);
 			}
 			else if (fastcmp(word, "FLAGS"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].flags), UNDO_NONE);
 				mobjinfo[num].flags = (INT32)get_number(word2);
 			}
 			else if (fastcmp(word, "RAISESTATE"))
 			{
-				DEH_WriteUndoline(word, va("%d", mobjinfo[num].raisestate), UNDO_NONE);
 				mobjinfo[num].raisestate = get_number(word2);
 			}
 			else
@@ -719,6 +690,20 @@ static const struct {
 	{NULL, 0}
 };
 
+static mapheader_lighting_t *usemaplighting(INT32 mapnum, const char *word)
+{
+	if (fastncmp(word, "ENCORE", 6))
+	{
+		mapheaderinfo[mapnum]->use_encore_lighting = true;
+
+		return &mapheaderinfo[mapnum]->lighting_encore;
+	}
+	else
+	{
+		return &mapheaderinfo[mapnum]->lighting;
+	}
+}
+
 static void readlevelheader(MYFILE *f, INT32 num, INT32 wadnum)
 {
 	char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
@@ -1012,6 +997,35 @@ static void readlevelheader(MYFILE *f, INT32 num, INT32 wadnum)
 			}*/
 			else if (fastcmp(word, "MOBJSCALE"))
 				mapheaderinfo[num-1]->mobj_scale = get_number(word2);
+			else if (fastcmp(word, "LIGHTCONTRAST") || fastcmp(word, "ENCORELIGHTCONTRAST"))
+			{
+				mapheader_lighting_t *lighting = usemaplighting(num-1, word);
+				lighting->light_contrast = (UINT8)i;
+				lighting->use_custom_light = true;
+			}
+			else if (fastcmp(word, "SPRITEBACKLIGHT") || fastcmp(word, "ENCORESPRITEBACKLIGHT"))
+			{
+				mapheader_lighting_t *lighting = usemaplighting(num-1, word);
+				lighting->sprite_backlight = (SINT8)i;
+				lighting->use_custom_light = true;
+			}
+			else if (fastcmp(word, "LIGHTANGLE") || fastcmp(word, "ENCORELIGHTANGLE"))
+			{
+				mapheader_lighting_t *lighting = usemaplighting(num-1, word);
+
+				if (fastcmp(word2, "EVEN"))
+				{
+					lighting->use_light_angle = false;
+					lighting->light_angle = 0;
+				}
+				else
+				{
+					lighting->use_light_angle = true;
+					lighting->light_angle = FixedAngle(FloatToFixed(atof(word2)));
+				}
+
+				lighting->use_custom_light = true;
+			}
 
 			// Individual triggers for level flags, for ease of use (and 2.0 compatibility)
 			else if (fastcmp(word, "SCRIPTISFILE"))
@@ -1110,8 +1124,6 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
 	UINT16 usi;
 	UINT8 picid;
 
-	DEH_WriteUndoline("SCENETEXT", cutscenes[num]->scene[scenenum].text, UNDO_ENDTEXT);
-
 	do
 	{
 		if (myfgets(s, MAXLINELEN, f))
@@ -1188,7 +1200,6 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
 
 			if (fastcmp(word, "NUMBEROFPICS"))
 			{
-				DEH_WriteUndoline(word, va("%d", cutscenes[num]->scene[scenenum].numpics), UNDO_NONE);
 				cutscenes[num]->scene[scenenum].numpics = (UINT8)i;
 			}
 			else if (fastncmp(word, "PIC", 3))
@@ -1203,27 +1214,22 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
 
 				if (fastcmp(word+4, "NAME"))
 				{
-					DEH_WriteUndoline(word, cutscenes[num]->scene[scenenum].picname[picid], UNDO_NONE);
 					strncpy(cutscenes[num]->scene[scenenum].picname[picid], word2, 8);
 				}
 				else if (fastcmp(word+4, "HIRES"))
 				{
-					DEH_WriteUndoline(word, va("%d", cutscenes[num]->scene[scenenum].pichires[picid]), UNDO_NONE);
 					cutscenes[num]->scene[scenenum].pichires[picid] = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
 				}
 				else if (fastcmp(word+4, "DURATION"))
 				{
-					DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].picduration[picid]), UNDO_NONE);
 					cutscenes[num]->scene[scenenum].picduration[picid] = usi;
 				}
 				else if (fastcmp(word+4, "XCOORD"))
 				{
-					DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].xcoord[picid]), UNDO_NONE);
 					cutscenes[num]->scene[scenenum].xcoord[picid] = usi;
 				}
 				else if (fastcmp(word+4, "YCOORD"))
 				{
-					DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].ycoord[picid]), UNDO_NONE);
 					cutscenes[num]->scene[scenenum].ycoord[picid] = usi;
 				}
 				else
@@ -1231,14 +1237,12 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
 			}
 			else if (fastcmp(word, "MUSIC"))
 			{
-				DEH_WriteUndoline(word, cutscenes[num]->scene[scenenum].musswitch, UNDO_NONE);
 				strncpy(cutscenes[num]->scene[scenenum].musswitch, word2, 7);
 				cutscenes[num]->scene[scenenum].musswitch[6] = 0;
 			}
 #ifdef MUSICSLOT_COMPATIBILITY
 			else if (fastcmp(word, "MUSICSLOT"))
 			{
-				DEH_WriteUndoline(word, cutscenes[num]->scene[scenenum].musswitch, UNDO_NONE);
 				i = get_mus(word2, true);
 				if (i && i <= 1035)
 					snprintf(cutscenes[num]->scene[scenenum].musswitch, 7, "%sM", G_BuildMapName(i));
@@ -1251,42 +1255,34 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
 #endif
 			else if (fastcmp(word, "MUSICTRACK"))
 			{
-				DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].musswitchflags), UNDO_NONE);
 				cutscenes[num]->scene[scenenum].musswitchflags = ((UINT16)i) & MUSIC_TRACKMASK;
 			}
 			else if (fastcmp(word, "MUSICPOS"))
 			{
-				DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].musswitchposition), UNDO_NONE);
 				cutscenes[num]->scene[scenenum].musswitchposition = (UINT32)get_number(word2);
 			}
 			else if (fastcmp(word, "MUSICLOOP"))
 			{
-				DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].musicloop), UNDO_NONE);
 				cutscenes[num]->scene[scenenum].musicloop = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
 			}
 			else if (fastcmp(word, "TEXTXPOS"))
 			{
-				DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].textxpos), UNDO_NONE);
 				cutscenes[num]->scene[scenenum].textxpos = usi;
 			}
 			else if (fastcmp(word, "TEXTYPOS"))
 			{
-				DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].textypos), UNDO_NONE);
 				cutscenes[num]->scene[scenenum].textypos = usi;
 			}
 			else if (fastcmp(word, "FADEINID"))
 			{
-				DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].fadenum), UNDO_NONE);
 				cutscenes[num]->scene[scenenum].fadeinid = (UINT8)i;
 			}
 			else if (fastcmp(word, "FADEOUTID"))
 			{
-				DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].fadenum), UNDO_NONE);
 				cutscenes[num]->scene[scenenum].fadeoutid = (UINT8)i;
 			}
 			else if (fastcmp(word, "FADECOLOR"))
 			{
-				DEH_WriteUndoline(word, va("%u", cutscenes[num]->scene[scenenum].fadenum), UNDO_NONE);
 				cutscenes[num]->scene[scenenum].fadecolor = (UINT8)i;
 			}
 			else
@@ -1346,8 +1342,6 @@ static void readcutscene(MYFILE *f, INT32 num)
 				if (1 <= value && value <= 128)
 				{
 					readcutscenescene(f, num, value - 1);
-					DEH_WriteUndoline(word, word2, UNDO_SPACE|UNDO_CUTLINE);
-					DEH_WriteUndoline("NUMSCENES", va("%d", oldnumscenes), UNDO_SPACE);
 				}
 				else
 					deh_warning("Scene number %d out of range (1 - 128)", value);
@@ -1403,12 +1397,10 @@ static void readhuditem(MYFILE *f, INT32 num)
 
 			if (fastcmp(word, "X"))
 			{
-				DEH_WriteUndoline(word, va("%d", hudinfo[num].x), UNDO_NONE);
 				hudinfo[num].x = i;
 			}
 			else if (fastcmp(word, "Y"))
 			{
-				DEH_WriteUndoline(word, va("%d", hudinfo[num].y), UNDO_NONE);
 				hudinfo[num].y = i;
 			}
 			else
@@ -1424,214 +1416,211 @@ static void readhuditem(MYFILE *f, INT32 num)
 // DO NOT FORGET TO SYNC THIS LIST WITH THE ACTIONNUM ENUM IN INFO.H
 actionpointer_t actionpointers[] =
 {
-	{{A_Explode},              "A_EXPLODE"},
-	{{A_Pain},                 "A_PAIN"},
-	{{A_Fall},                 "A_FALL"},
-	{{A_MonitorPop},           "A_MONITORPOP"},
-	{{A_Look},                 "A_LOOK"},
-	{{A_Chase},                "A_CHASE"},
-	{{A_FaceStabChase},        "A_FACESTABCHASE"},
-	{{A_FaceTarget},           "A_FACETARGET"},
-	{{A_FaceTracer},           "A_FACETRACER"},
-	{{A_Scream},               "A_SCREAM"},
-	{{A_BossDeath},            "A_BOSSDEATH"},
-	{{A_CustomPower},          "A_CUSTOMPOWER"},
-	{{A_GiveWeapon},           "A_GIVEWEAPON"},
-	{{A_RingShield},           "A_RINGSHIELD"},
-	{{A_RingBox},              "A_RINGBOX"},
-	{{A_Invincibility},        "A_INVINCIBILITY"},
-	{{A_SuperSneakers},        "A_SUPERSNEAKERS"},
-	{{A_BunnyHop},             "A_BUNNYHOP"},
-	{{A_BubbleSpawn},          "A_BUBBLESPAWN"},
-	{{A_FanBubbleSpawn},       "A_FANBUBBLESPAWN"},
-	{{A_BubbleRise},           "A_BUBBLERISE"},
-	{{A_BubbleCheck},          "A_BUBBLECHECK"},
-	{{A_AwardScore},           "A_AWARDSCORE"},
-	{{A_ExtraLife},            "A_EXTRALIFE"},
-	{{A_BombShield},           "A_BOMBSHIELD"},
-	{{A_JumpShield},           "A_JUMPSHIELD"},
-	{{A_WaterShield},          "A_WATERSHIELD"},
-	{{A_ForceShield},          "A_FORCESHIELD"},
-	{{A_PityShield},           "A_PITYSHIELD"},
-	{{A_GravityBox},           "A_GRAVITYBOX"},
-	{{A_ScoreRise},            "A_SCORERISE"},
-	{{A_ParticleSpawn},        "A_PARTICLESPAWN"},
-	{{A_AttractChase},         "A_ATTRACTCHASE"},
-	{{A_DropMine},             "A_DROPMINE"},
-	{{A_FishJump},             "A_FISHJUMP"},
-	{{A_ThrownRing},           "A_THROWNRING"},
-	{{A_GrenadeRing},          "A_GRENADERING"}, // SRB2kart
-	{{A_SetSolidSteam},        "A_SETSOLIDSTEAM"},
-	{{A_UnsetSolidSteam},      "A_UNSETSOLIDSTEAM"},
-	{{A_SignPlayer},           "A_SIGNPLAYER"},
-	{{A_OverlayThink},         "A_OVERLAYTHINK"},
-	{{A_JetChase},             "A_JETCHASE"},
-	{{A_JetbThink},            "A_JETBTHINK"},
-	{{A_JetgThink},            "A_JETGTHINK"},
-	{{A_JetgShoot},            "A_JETGSHOOT"},
-	{{A_ShootBullet},          "A_SHOOTBULLET"},
-	{{A_MinusDigging},         "A_MINUSDIGGING"},
-	{{A_MinusPopup},           "A_MINUSPOPUP"},
-	{{A_MinusCheck},           "A_MINUSCHECK"},
-	{{A_ChickenCheck},         "A_CHICKENCHECK"},
-	{{A_MouseThink},           "A_MOUSETHINK"},
-	{{A_DetonChase},           "A_DETONCHASE"},
-	{{A_CapeChase},            "A_CAPECHASE"},
-	{{A_RotateSpikeBall},      "A_ROTATESPIKEBALL"},
-	{{A_SlingAppear},          "A_SLINGAPPEAR"},
-	{{A_MaceRotate},           "A_MACEROTATE"},
-	{{A_UnidusBall},           "A_UNIDUSBALL"},
-	{{A_RockSpawn},            "A_ROCKSPAWN"},
-	{{A_SetFuse},              "A_SETFUSE"},
-	{{A_CrawlaCommanderThink}, "A_CRAWLACOMMANDERTHINK"},
-	{{A_SmokeTrailer},         "A_SMOKETRAILER"},
-	{{A_RingExplode},          "A_RINGEXPLODE"},
-	{{A_OldRingExplode},       "A_OLDRINGEXPLODE"},
-	{{A_MixUp},                "A_MIXUP"},
-	{{A_RecyclePowers},        "A_RECYCLEPOWERS"},
-	{{A_Boss1Chase},           "A_BOSS1CHASE"},
-	{{A_FocusTarget},          "A_FOCUSTARGET"},
-	{{A_Boss2Chase},           "A_BOSS2CHASE"},
-	{{A_Boss2Pogo},            "A_BOSS2POGO"},
-	{{A_BossZoom},             "A_BOSSZOOM"},
-	{{A_BossScream},           "A_BOSSSCREAM"},
-	{{A_Boss2TakeDamage},      "A_BOSS2TAKEDAMAGE"},
-	{{A_Boss7Chase},           "A_BOSS7CHASE"},
-	{{A_GoopSplat},            "A_GOOPSPLAT"},
-	{{A_Boss2PogoSFX},         "A_BOSS2POGOSFX"},
-	{{A_Boss2PogoTarget},      "A_BOSS2POGOTARGET"},
-	{{A_BossJetFume},          "A_BOSSJETFUME"},
-	{{A_EggmanBox},            "A_EGGMANBOX"},
-	{{A_TurretFire},           "A_TURRETFIRE"},
-	{{A_SuperTurretFire},      "A_SUPERTURRETFIRE"},
-	{{A_TurretStop},           "A_TURRETSTOP"},
-	{{A_JetJawRoam},           "A_JETJAWROAM"},
-	{{A_JetJawChomp},          "A_JETJAWCHOMP"},
-	{{A_PointyThink},          "A_POINTYTHINK"},
-	{{A_CheckBuddy},           "A_CHECKBUDDY"},
-	{{A_HoodThink},            "A_HOODTHINK"},
-	{{A_ArrowCheck},           "A_ARROWCHECK"},
-	{{A_SnailerThink},         "A_SNAILERTHINK"},
-	{{A_SharpChase},           "A_SHARPCHASE"},
-	{{A_SharpSpin},            "A_SHARPSPIN"},
-	{{A_VultureVtol},          "A_VULTUREVTOL"},
-	{{A_VultureCheck},         "A_VULTURECHECK"},
-	{{A_SkimChase},            "A_SKIMCHASE"},
-	{{A_1upThinker},           "A_1UPTHINKER"},
-	{{A_SkullAttack},          "A_SKULLATTACK"},
-	{{A_LobShot},              "A_LOBSHOT"},
-	{{A_FireShot},             "A_FIRESHOT"},
-	{{A_SuperFireShot},        "A_SUPERFIRESHOT"},
-	{{A_BossFireShot},         "A_BOSSFIRESHOT"},
-	{{A_Boss7FireMissiles},    "A_BOSS7FIREMISSILES"},
-	{{A_Boss1Laser},           "A_BOSS1LASER"},
-	{{A_Boss4Reverse},         "A_BOSS4REVERSE"},
-	{{A_Boss4SpeedUp},         "A_BOSS4SPEEDUP"},
-	{{A_Boss4Raise},           "A_BOSS4RAISE"},
-	{{A_SparkFollow},          "A_SPARKFOLLOW"},
-	{{A_BuzzFly},              "A_BUZZFLY"},
-	{{A_GuardChase},           "A_GUARDCHASE"},
-	{{A_EggShield},            "A_EGGSHIELD"},
-	{{A_SetReactionTime},      "A_SETREACTIONTIME"},
-	{{A_Boss1Spikeballs},      "A_BOSS1SPIKEBALLS"},
-	{{A_Boss3TakeDamage},      "A_BOSS3TAKEDAMAGE"},
-	{{A_Boss3Path},            "A_BOSS3PATH"},
-	{{A_LinedefExecute},       "A_LINEDEFEXECUTE"},
-	{{A_PlaySeeSound},         "A_PLAYSEESOUND"},
-	{{A_PlayAttackSound},      "A_PLAYATTACKSOUND"},
-	{{A_PlayActiveSound},      "A_PLAYACTIVESOUND"},
-	{{A_SpawnObjectAbsolute},  "A_SPAWNOBJECTABSOLUTE"},
-	{{A_SpawnObjectRelative},  "A_SPAWNOBJECTRELATIVE"},
-	{{A_ChangeAngleRelative},  "A_CHANGEANGLERELATIVE"},
-	{{A_ChangeAngleAbsolute},  "A_CHANGEANGLEABSOLUTE"},
-	{{A_RollAngle},            "A_ROLLANGLE"},
-	{{A_ChangeRollAngleRelative},"A_CHANGEROLLANGLERELATIVE"},
-	{{A_ChangeRollAngleAbsolute},"A_CHANGEROLLANGLEABSOLUTE"},
-	{{A_PlaySound},            "A_PLAYSOUND"},
-	{{A_FindTarget},           "A_FINDTARGET"},
-	{{A_FindTracer},           "A_FINDTRACER"},
-	{{A_SetTics},              "A_SETTICS"},
-	{{A_SetRandomTics},        "A_SETRANDOMTICS"},
-	{{A_ChangeColorRelative},  "A_CHANGECOLORRELATIVE"},
-	{{A_ChangeColorAbsolute},  "A_CHANGECOLORABSOLUTE"},
-	{{A_MoveRelative},         "A_MOVERELATIVE"},
-	{{A_MoveAbsolute},         "A_MOVEABSOLUTE"},
-	{{A_Thrust},               "A_THRUST"},
-	{{A_ZThrust},              "A_ZTHRUST"},
-	{{A_SetTargetsTarget},     "A_SETTARGETSTARGET"},
-	{{A_SetObjectFlags},       "A_SETOBJECTFLAGS"},
-	{{A_SetObjectFlags2},      "A_SETOBJECTFLAGS2"},
-	{{A_RandomState},          "A_RANDOMSTATE"},
-	{{A_RandomStateRange},     "A_RANDOMSTATERANGE"},
-	{{A_DualAction},           "A_DUALACTION"},
-	{{A_RemoteAction},         "A_REMOTEACTION"},
-	{{A_ToggleFlameJet},       "A_TOGGLEFLAMEJET"},
-	{{A_ItemPop},              "A_ITEMPOP"},       // SRB2kart
-	{{A_JawzChase},            "A_JAWZCHASE"}, // SRB2kart
-	{{A_JawzExplode},          "A_JAWZEXPLODE"}, // SRB2kart
-	{{A_SPBChase},             "A_SPBCHASE"}, // SRB2kart
-	{{A_MineExplode},          "A_MINEEXPLODE"}, // SRB2kart
-	{{A_BallhogExplode},       "A_BALLHOGEXPLODE"}, // SRB2kart
-	{{A_LightningFollowPlayer},"A_LIGHTNINGFOLLOWPLAYER"}, //SRB2kart
-	{{A_FZBoomFlash},          "A_FZBOOMFLASH"}, //SRB2kart
-	{{A_FZBoomSmoke},          "A_FZBOOMSMOKE"}, //SRB2kart
-	{{A_RandomShadowFrame},	   "A_RANDOMSHADOWFRAME"}, //SRB2kart
-	{{A_RoamingShadowThinker}, "A_ROAMINGSHADOWTHINKER"}, //SRB2kart
-	{{A_MayonakaArrow}, 	   "A_MAYONAKAARROW"}, //SRB2kart
-	{{A_ReaperThinker}, 	   "A_REAPERTHINKER"}, //SRB2kart
-	{{A_MementosTPParticles},  "A_MEMENTOSTPPARTICLES"}, //SRB2kart
-	{{A_FlameParticle},        "A_FLAMEPARTICLE"}, // SRB2kart
-	{{A_OrbitNights},          "A_ORBITNIGHTS"},
-	{{A_GhostMe},              "A_GHOSTME"},
-	{{A_SetObjectState},       "A_SETOBJECTSTATE"},
-	{{A_SetObjectTypeState},   "A_SETOBJECTTYPESTATE"},
-	{{A_KnockBack},            "A_KNOCKBACK"},
-	{{A_PushAway},             "A_PUSHAWAY"},
-	{{A_RingDrain},            "A_RINGDRAIN"},
-	{{A_SplitShot},            "A_SPLITSHOT"},
-	{{A_MissileSplit},         "A_MISSILESPLIT"},
-	{{A_MultiShot},            "A_MULTISHOT"},
-	{{A_InstaLoop},            "A_INSTALOOP"},
-	{{A_Custom3DRotate},       "A_CUSTOM3DROTATE"},
-	{{A_SearchForPlayers},     "A_SEARCHFORPLAYERS"},
-	{{A_CheckRandom},          "A_CHECKRANDOM"},
-	{{A_CheckTargetRings},     "A_CHECKTARGETRINGS"},
-	{{A_CheckRings},           "A_CHECKRINGS"},
-	{{A_CheckTotalRings},      "A_CHECKTOTALRINGS"},
-	{{A_CheckHealth},          "A_CHECKHEALTH"},
-	{{A_CheckRange},           "A_CHECKRANGE"},
-	{{A_CheckHeight},          "A_CHECKHEIGHT"},
-	{{A_CheckTrueRange},       "A_CHECKTRUERANGE"},
-	{{A_CheckThingCount},      "A_CHECKTHINGCOUNT"},
-	{{A_CheckAmbush},          "A_CHECKAMBUSH"},
-	{{A_CheckCustomValue},     "A_CHECKCUSTOMVALUE"},
-	{{A_CheckCusValMemo},      "A_CHECKCUSVALMEMO"},
-	{{A_SetCustomValue},       "A_SETCUSTOMVALUE"},
-	{{A_UseCusValMemo},        "A_USECUSVALMEMO"},
-	{{A_RelayCustomValue},     "A_RELAYCUSTOMVALUE"},
-	{{A_CusValAction},         "A_CUSVALACTION"},
-	{{A_ForceStop},            "A_FORCESTOP"},
-	{{A_ForceWin},             "A_FORCEWIN"},
-	{{A_SpikeRetract},         "A_SPIKERETRACT"},
-	{{A_InfoState},            "A_INFOSTATE"},
-	{{A_Repeat},               "A_REPEAT"},
-	{{A_SetScale},             "A_SETSCALE"},
-	{{A_RemoteDamage},         "A_REMOTEDAMAGE"},
-	{{A_HomingChase},          "A_HOMINGCHASE"},
-	{{A_TrapShot},             "A_TRAPSHOT"},
-	{{A_VileTarget},           "A_VILETARGET"},
-	{{A_VileAttack},           "A_VILEATTACK"},
-	{{A_VileFire},             "A_VILEFIRE"},
-	{{A_BrakChase},            "A_BRAKCHASE"},
-	{{A_BrakFireShot},         "A_BRAKFIRESHOT"},
-	{{A_BrakLobShot},          "A_BRAKLOBSHOT"},
-	{{A_NapalmScatter},        "A_NAPALMSCATTER"},
-	{{A_SpawnFreshCopy},       "A_SPAWNFRESHCOPY"},
+	{A_Explode,              "A_EXPLODE"},
+	{A_Pain,                 "A_PAIN"},
+	{A_Fall,                 "A_FALL"},
+	{A_MonitorPop,           "A_MONITORPOP"},
+	{A_Look,                 "A_LOOK"},
+	{A_Chase,                "A_CHASE"},
+	{A_FaceStabChase,        "A_FACESTABCHASE"},
+	{A_FaceTarget,           "A_FACETARGET"},
+	{A_FaceTracer,           "A_FACETRACER"},
+	{A_Scream,               "A_SCREAM"},
+	{A_BossDeath,            "A_BOSSDEATH"},
+	{A_CustomPower,          "A_CUSTOMPOWER"},
+	{A_GiveWeapon,           "A_GIVEWEAPON"},
+	{A_RingShield,           "A_RINGSHIELD"},
+	{A_RingBox,              "A_RINGBOX"},
+	{A_Invincibility,        "A_INVINCIBILITY"},
+	{A_SuperSneakers,        "A_SUPERSNEAKERS"},
+	{A_BunnyHop,             "A_BUNNYHOP"},
+	{A_BubbleSpawn,          "A_BUBBLESPAWN"},
+	{A_FanBubbleSpawn,       "A_FANBUBBLESPAWN"},
+	{A_BubbleRise,           "A_BUBBLERISE"},
+	{A_BubbleCheck,          "A_BUBBLECHECK"},
+	{A_AwardScore,           "A_AWARDSCORE"},
+	{A_ExtraLife,            "A_EXTRALIFE"},
+	{A_BombShield,           "A_BOMBSHIELD"},
+	{A_JumpShield,           "A_JUMPSHIELD"},
+	{A_WaterShield,          "A_WATERSHIELD"},
+	{A_ForceShield,          "A_FORCESHIELD"},
+	{A_PityShield,           "A_PITYSHIELD"},
+	{A_GravityBox,           "A_GRAVITYBOX"},
+	{A_ScoreRise,            "A_SCORERISE"},
+	{A_ParticleSpawn,        "A_PARTICLESPAWN"},
+	{A_AttractChase,         "A_ATTRACTCHASE"},
+	{A_DropMine,             "A_DROPMINE"},
+	{A_FishJump,             "A_FISHJUMP"},
+	{A_ThrownRing,           "A_THROWNRING"},
+	{A_GrenadeRing,          "A_GRENADERING"}, // SRB2kart
+	{A_SetSolidSteam,        "A_SETSOLIDSTEAM"},
+	{A_UnsetSolidSteam,      "A_UNSETSOLIDSTEAM"},
+	{A_SignPlayer,           "A_SIGNPLAYER"},
+	{A_OverlayThink,         "A_OVERLAYTHINK"},
+	{A_JetChase,             "A_JETCHASE"},
+	{A_JetbThink,            "A_JETBTHINK"},
+	{A_JetgThink,            "A_JETGTHINK"},
+	{A_JetgShoot,            "A_JETGSHOOT"},
+	{A_ShootBullet,          "A_SHOOTBULLET"},
+	{A_MinusDigging,         "A_MINUSDIGGING"},
+	{A_MinusPopup,           "A_MINUSPOPUP"},
+	{A_MinusCheck,           "A_MINUSCHECK"},
+	{A_ChickenCheck,         "A_CHICKENCHECK"},
+	{A_MouseThink,           "A_MOUSETHINK"},
+	{A_DetonChase,           "A_DETONCHASE"},
+	{A_CapeChase,            "A_CAPECHASE"},
+	{A_RotateSpikeBall,      "A_ROTATESPIKEBALL"},
+	{A_SlingAppear,          "A_SLINGAPPEAR"},
+	{A_MaceRotate,           "A_MACEROTATE"},
+	{A_UnidusBall,           "A_UNIDUSBALL"},
+	{A_RockSpawn,            "A_ROCKSPAWN"},
+	{A_SetFuse,              "A_SETFUSE"},
+	{A_CrawlaCommanderThink, "A_CRAWLACOMMANDERTHINK"},
+	{A_SmokeTrailer,         "A_SMOKETRAILER"},
+	{A_RingExplode,          "A_RINGEXPLODE"},
+	{A_OldRingExplode,       "A_OLDRINGEXPLODE"},
+	{A_MixUp,                "A_MIXUP"},
+	{A_RecyclePowers,        "A_RECYCLEPOWERS"},
+	{A_Boss1Chase,           "A_BOSS1CHASE"},
+	{A_FocusTarget,          "A_FOCUSTARGET"},
+	{A_Boss2Chase,           "A_BOSS2CHASE"},
+	{A_Boss2Pogo,            "A_BOSS2POGO"},
+	{A_BossZoom,             "A_BOSSZOOM"},
+	{A_BossScream,           "A_BOSSSCREAM"},
+	{A_Boss2TakeDamage,      "A_BOSS2TAKEDAMAGE"},
+	{A_Boss7Chase,           "A_BOSS7CHASE"},
+	{A_GoopSplat,            "A_GOOPSPLAT"},
+	{A_Boss2PogoSFX,         "A_BOSS2POGOSFX"},
+	{A_Boss2PogoTarget,      "A_BOSS2POGOTARGET"},
+	{A_BossJetFume,          "A_BOSSJETFUME"},
+	{A_EggmanBox,            "A_EGGMANBOX"},
+	{A_TurretFire,           "A_TURRETFIRE"},
+	{A_SuperTurretFire,      "A_SUPERTURRETFIRE"},
+	{A_TurretStop,           "A_TURRETSTOP"},
+	{A_JetJawRoam,           "A_JETJAWROAM"},
+	{A_JetJawChomp,          "A_JETJAWCHOMP"},
+	{A_PointyThink,          "A_POINTYTHINK"},
+	{A_CheckBuddy,           "A_CHECKBUDDY"},
+	{A_HoodThink,            "A_HOODTHINK"},
+	{A_ArrowCheck,           "A_ARROWCHECK"},
+	{A_SnailerThink,         "A_SNAILERTHINK"},
+	{A_SharpChase,           "A_SHARPCHASE"},
+	{A_SharpSpin,            "A_SHARPSPIN"},
+	{A_VultureVtol,          "A_VULTUREVTOL"},
+	{A_VultureCheck,         "A_VULTURECHECK"},
+	{A_SkimChase,            "A_SKIMCHASE"},
+	{A_1upThinker,           "A_1UPTHINKER"},
+	{A_SkullAttack,          "A_SKULLATTACK"},
+	{A_LobShot,              "A_LOBSHOT"},
+	{A_FireShot,             "A_FIRESHOT"},
+	{A_SuperFireShot,        "A_SUPERFIRESHOT"},
+	{A_BossFireShot,         "A_BOSSFIRESHOT"},
+	{A_Boss7FireMissiles,    "A_BOSS7FIREMISSILES"},
+	{A_Boss1Laser,           "A_BOSS1LASER"},
+	{A_Boss4Reverse,         "A_BOSS4REVERSE"},
+	{A_Boss4SpeedUp,         "A_BOSS4SPEEDUP"},
+	{A_Boss4Raise,           "A_BOSS4RAISE"},
+	{A_SparkFollow,          "A_SPARKFOLLOW"},
+	{A_BuzzFly,              "A_BUZZFLY"},
+	{A_GuardChase,           "A_GUARDCHASE"},
+	{A_EggShield,            "A_EGGSHIELD"},
+	{A_SetReactionTime,      "A_SETREACTIONTIME"},
+	{A_Boss1Spikeballs,      "A_BOSS1SPIKEBALLS"},
+	{A_Boss3TakeDamage,      "A_BOSS3TAKEDAMAGE"},
+	{A_Boss3Path,            "A_BOSS3PATH"},
+	{A_LinedefExecute,       "A_LINEDEFEXECUTE"},
+	{A_PlaySeeSound,         "A_PLAYSEESOUND"},
+	{A_PlayAttackSound,      "A_PLAYATTACKSOUND"},
+	{A_PlayActiveSound,      "A_PLAYACTIVESOUND"},
+	{A_SpawnObjectAbsolute,  "A_SPAWNOBJECTABSOLUTE"},
+	{A_SpawnObjectRelative,  "A_SPAWNOBJECTRELATIVE"},
+	{A_ChangeAngleRelative,  "A_CHANGEANGLERELATIVE"},
+	{A_ChangeAngleAbsolute,  "A_CHANGEANGLEABSOLUTE"},
+	{A_PlaySound,            "A_PLAYSOUND"},
+	{A_FindTarget,           "A_FINDTARGET"},
+	{A_FindTracer,           "A_FINDTRACER"},
+	{A_SetTics,              "A_SETTICS"},
+	{A_SetRandomTics,        "A_SETRANDOMTICS"},
+	{A_ChangeColorRelative,  "A_CHANGECOLORRELATIVE"},
+	{A_ChangeColorAbsolute,  "A_CHANGECOLORABSOLUTE"},
+	{A_MoveRelative,         "A_MOVERELATIVE"},
+	{A_MoveAbsolute,         "A_MOVEABSOLUTE"},
+	{A_Thrust,               "A_THRUST"},
+	{A_ZThrust,              "A_ZTHRUST"},
+	{A_SetTargetsTarget,     "A_SETTARGETSTARGET"},
+	{A_SetObjectFlags,       "A_SETOBJECTFLAGS"},
+	{A_SetObjectFlags2,      "A_SETOBJECTFLAGS2"},
+	{A_RandomState,          "A_RANDOMSTATE"},
+	{A_RandomStateRange,     "A_RANDOMSTATERANGE"},
+	{A_DualAction,           "A_DUALACTION"},
+	{A_RemoteAction,         "A_REMOTEACTION"},
+	{A_ToggleFlameJet,       "A_TOGGLEFLAMEJET"},
+	{A_ItemPop,              "A_ITEMPOP"},       // SRB2kart
+	{A_JawzChase,            "A_JAWZCHASE"}, // SRB2kart
+	{A_JawzExplode,          "A_JAWZEXPLODE"}, // SRB2kart
+	{A_SPBChase,             "A_SPBCHASE"}, // SRB2kart
+	{A_MineExplode,          "A_MINEEXPLODE"}, // SRB2kart
+	{A_BallhogExplode,       "A_BALLHOGEXPLODE"}, // SRB2kart
+	{A_LightningFollowPlayer,"A_LIGHTNINGFOLLOWPLAYER"}, //SRB2kart
+	{A_FZBoomFlash,          "A_FZBOOMFLASH"}, //SRB2kart
+	{A_FZBoomSmoke,          "A_FZBOOMSMOKE"}, //SRB2kart
+	{A_RandomShadowFrame,    "A_RANDOMSHADOWFRAME"}, //SRB2kart
+	{A_RoamingShadowThinker, "A_ROAMINGSHADOWTHINKER"}, //SRB2kart
+	{A_MayonakaArrow,        "A_MAYONAKAARROW"}, //SRB2kart
+	{A_ReaperThinker,        "A_REAPERTHINKER"}, //SRB2kart
+	{A_MementosTPParticles,  "A_MEMENTOSTPPARTICLES"}, //SRB2kart
+	{A_FlameParticle,        "A_FLAMEPARTICLE"}, // SRB2kart
+	{A_OrbitNights,          "A_ORBITNIGHTS"},
+	{A_GhostMe,              "A_GHOSTME"},
+	{A_SetObjectState,       "A_SETOBJECTSTATE"},
+	{A_SetObjectTypeState,   "A_SETOBJECTTYPESTATE"},
+	{A_KnockBack,            "A_KNOCKBACK"},
+	{A_PushAway,             "A_PUSHAWAY"},
+	{A_RingDrain,            "A_RINGDRAIN"},
+	{A_SplitShot,            "A_SPLITSHOT"},
+	{A_MissileSplit,         "A_MISSILESPLIT"},
+	{A_MultiShot,            "A_MULTISHOT"},
+	{A_InstaLoop,            "A_INSTALOOP"},
+	{A_Custom3DRotate,       "A_CUSTOM3DROTATE"},
+	{A_SearchForPlayers,     "A_SEARCHFORPLAYERS"},
+	{A_CheckRandom,          "A_CHECKRANDOM"},
+	{A_CheckTargetRings,     "A_CHECKTARGETRINGS"},
+	{A_CheckRings,           "A_CHECKRINGS"},
+	{A_CheckTotalRings,      "A_CHECKTOTALRINGS"},
+	{A_CheckHealth,          "A_CHECKHEALTH"},
+	{A_CheckRange,           "A_CHECKRANGE"},
+	{A_CheckHeight,          "A_CHECKHEIGHT"},
+	{A_CheckTrueRange,       "A_CHECKTRUERANGE"},
+	{A_CheckThingCount,      "A_CHECKTHINGCOUNT"},
+	{A_CheckAmbush,          "A_CHECKAMBUSH"},
+	{A_CheckCustomValue,     "A_CHECKCUSTOMVALUE"},
+	{A_CheckCusValMemo,      "A_CHECKCUSVALMEMO"},
+	{A_SetCustomValue,       "A_SETCUSTOMVALUE"},
+	{A_UseCusValMemo,        "A_USECUSVALMEMO"},
+	{A_RelayCustomValue,     "A_RELAYCUSTOMVALUE"},
+	{A_CusValAction,         "A_CUSVALACTION"},
+	{A_ForceStop,            "A_FORCESTOP"},
+	{A_ForceWin,             "A_FORCEWIN"},
+	{A_SpikeRetract,         "A_SPIKERETRACT"},
+	{A_InfoState,            "A_INFOSTATE"},
+	{A_Repeat,               "A_REPEAT"},
+	{A_SetScale,             "A_SETSCALE"},
+	{A_RemoteDamage,         "A_REMOTEDAMAGE"},
+	{A_HomingChase,          "A_HOMINGCHASE"},
+	{A_TrapShot,             "A_TRAPSHOT"},
+	{A_VileTarget,           "A_VILETARGET"},
+	{A_VileAttack,           "A_VILEATTACK"},
+	{A_VileFire,             "A_VILEFIRE"},
+	{A_BrakChase,            "A_BRAKCHASE"},
+	{A_BrakFireShot,         "A_BRAKFIRESHOT"},
+	{A_BrakLobShot,          "A_BRAKLOBSHOT"},
+	{A_NapalmScatter,        "A_NAPALMSCATTER"},
+	{A_SpawnFreshCopy,       "A_SPAWNFRESHCOPY"},
 
-	{{NULL},                   "NONE"},
+	{NULL,                   "NONE"},
 
 	// This NULL entry must be the last in the list
-	{{NULL},                   NULL},
+	{NULL,                   NULL},
 };
 
 static void readframe(MYFILE *f, INT32 num)
@@ -1670,32 +1659,26 @@ static void readframe(MYFILE *f, INT32 num)
 
 			if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME"))
 			{
-				DEH_WriteUndoline(word1, va("%u", states[num].sprite), UNDO_NONE);
 				states[num].sprite = get_sprite(word2);
 			}
 			else if (fastcmp(word1, "SPRITESUBNUMBER") || fastcmp(word1, "SPRITEFRAME"))
 			{
-				DEH_WriteUndoline(word1, va("%d", states[num].frame), UNDO_NONE);
 				states[num].frame = (INT32)get_number(word2); // So the FF_ flags get calculated
 			}
 			else if (fastcmp(word1, "DURATION"))
 			{
-				DEH_WriteUndoline(word1, va("%u", states[num].tics), UNDO_NONE);
 				states[num].tics = (INT32)get_number(word2); // So TICRATE can be used
 			}
 			else if (fastcmp(word1, "NEXT"))
 			{
-				DEH_WriteUndoline(word1, va("%d", states[num].nextstate), UNDO_NONE);
 				states[num].nextstate = get_state(word2);
 			}
 			else if (fastcmp(word1, "VAR1"))
 			{
-				DEH_WriteUndoline(word1, va("%d", states[num].var1), UNDO_NONE);
 				states[num].var1 = (INT32)get_number(word2);
 			}
 			else if (fastcmp(word1, "VAR2"))
 			{
-				DEH_WriteUndoline(word1, va("%d", states[num].var2), UNDO_NONE);
 				states[num].var2 = (INT32)get_number(word2);
 			}
 			else if (fastcmp(word1, "ACTION"))
@@ -1719,9 +1702,8 @@ static void readframe(MYFILE *f, INT32 num)
 
 				for (z = 0; actionpointers[z].name; z++)
 				{
-					if (actionpointers[z].action.acv == states[num].action.acv)
+					if (actionpointers[z].action == states[num].action)
 					{
-						DEH_WriteUndoline(word1, actionpointers[z].name, UNDO_NONE);
 						break;
 					}
 				}
@@ -1729,17 +1711,17 @@ static void readframe(MYFILE *f, INT32 num)
 				z = 0;
 				found = LUA_SetLuaAction(&states[num], actiontocompare);
 				if (!found)
-				while (actionpointers[z].name)
 				{
-					if (fastcmp(actiontocompare, actionpointers[z].name))
+					while (actionpointers[z].name)
 					{
-						states[num].action = actionpointers[z].action;
-						states[num].action.acv = actionpointers[z].action.acv; // assign
-						states[num].action.acp1 = actionpointers[z].action.acp1;
-						found = true;
-						break;
+						if (fastcmp(actiontocompare, actionpointers[z].name))
+						{
+							states[num].action = actionpointers[z].action;
+							found = true;
+							break;
+						}
+						z++;
 					}
-					z++;
 				}
 
 				if (!found)
@@ -1781,17 +1763,14 @@ static void readsound(MYFILE *f, INT32 num, const char *savesfxnames[])
 
 			if (fastcmp(word, "SINGULAR"))
 			{
-				DEH_WriteUndoline(word, va("%d", S_sfx[num].singularity), UNDO_NONE);
 				S_sfx[num].singularity = value;
 			}
 			else if (fastcmp(word, "PRIORITY"))
 			{
-				DEH_WriteUndoline(word, va("%d", S_sfx[num].priority), UNDO_NONE);
 				S_sfx[num].priority = value;
 			}
 			else if (fastcmp(word, "FLAGS"))
 			{
-				DEH_WriteUndoline(word, va("%d", S_sfx[num].pitch), UNDO_NONE);
 				S_sfx[num].pitch = value;
 			}
 			else
@@ -1820,7 +1799,7 @@ static void readsound(MYFILE *f, INT32 num, const char *savesfxnames[])
  * \sa readmaincfg()
  * \author Graue <graue@oceanbase.org>
  */
-static boolean GoodDataFileName(const char *s)
+/*static boolean GoodDataFileName(const char *s)
 {
 	const char *p;
 	const char *tail = ".dat";
@@ -1840,7 +1819,7 @@ static boolean GoodDataFileName(const char *s)
 	if (fasticmp(s, "online.dat")) return false; // SRB2Kart online replay folder
 
 	return true;
-}
+}*/
 
 static void reademblemdata(MYFILE *f, INT32 num)
 {
@@ -1851,16 +1830,6 @@ static void reademblemdata(MYFILE *f, INT32 num)
 	INT32 value;
 
 	// Reset all data initially
-	DEH_WriteUndoline("TYPE", va("%d", emblemlocations[num-1].type), UNDO_NONE);
-	DEH_WriteUndoline("X", va("%d", emblemlocations[num-1].x), UNDO_NONE);
-	DEH_WriteUndoline("Y", va("%d", emblemlocations[num-1].y), UNDO_NONE);
-	DEH_WriteUndoline("Z", va("%d", emblemlocations[num-1].z), UNDO_NONE);
-	DEH_WriteUndoline("MAPNUM", va("%d", emblemlocations[num-1].level), UNDO_NONE);
-	DEH_WriteUndoline("VAR", va("%d", emblemlocations[num-1].var), UNDO_NONE);
-	DEH_WriteUndoline("SPRITE", va("%d", emblemlocations[num-1].sprite), UNDO_NONE);
-	DEH_WriteUndoline("COLOR", va("%d", emblemlocations[num-1].color), UNDO_NONE);
-	DEH_WriteUndoline("HINT", extraemblems[num-1].hint, UNDO_NONE);
-
 	memset(&emblemlocations[num-1], 0, sizeof(emblem_t));
 
 	do
@@ -1988,12 +1957,6 @@ static void readextraemblemdata(MYFILE *f, INT32 num)
 	INT32 value;
 
 	// Reset all data initially
-	DEH_WriteUndoline("NAME", extraemblems[num-1].name, UNDO_NONE);
-	DEH_WriteUndoline("OBJECTIVE", extraemblems[num-1].description, UNDO_NONE);
-	DEH_WriteUndoline("CONDITIONSET", va("%d", extraemblems[num-1].conditionset), UNDO_NONE);
-	DEH_WriteUndoline("SPRITE", va("%d", extraemblems[num-1].sprite), UNDO_NONE);
-	DEH_WriteUndoline("COLOR", va("%d", extraemblems[num-1].color), UNDO_NONE);
-
 	memset(&extraemblems[num-1], 0, sizeof(extraemblem_t));
 
 	do
@@ -2072,15 +2035,6 @@ static void readunlockable(MYFILE *f, INT32 num)
 	INT32 i;
 
 	// Same deal with unlockables, clear all first
-	DEH_WriteUndoline("NAME", unlockables[num].name, UNDO_NONE);
-	DEH_WriteUndoline("OBJECTIVE", unlockables[num].objective, UNDO_NONE);
-	DEH_WriteUndoline("HEIGHT", va("%d", unlockables[num].height), UNDO_NONE);
-	DEH_WriteUndoline("CONDITIONSET", va("%d", unlockables[num].conditionset), UNDO_NONE);
-	DEH_WriteUndoline("TYPE", va("%d", unlockables[num].type), UNDO_NONE);
-	DEH_WriteUndoline("NOCECHO", va("%d", unlockables[num].nocecho), UNDO_NONE);
-	DEH_WriteUndoline("NOCHECKLIST", va("%d", unlockables[num].nochecklist), UNDO_NONE);
-	DEH_WriteUndoline("VAR", va("%d", unlockables[num].variable), UNDO_NONE);
-
 	memset(&unlockables[num], 0, sizeof(unlockable_t));
 
 	do
@@ -2459,13 +2413,11 @@ static void readpatch(MYFILE *f, const char *name, UINT16 wad)
 			// X position of the patch in the texture.
 			if (fastcmp(word, "X"))
 			{
-				//DEH_WriteUndoline(word, va("%d", patch->originx), UNDO_NONE);
 				patch.originx = (INT16)value;
 			}
 			// Y position of the patch in the texture.
 			else if (fastcmp(word, "Y"))
 			{
-				//DEH_WriteUndoline(word, va("%d", patch->originy), UNDO_NONE);
 				patch.originy = (INT16)value;
 			}
 			else
@@ -2534,7 +2486,6 @@ static void readmaincfg(MYFILE *f)
 				else
 					value = get_number(word2);
 
-				DEH_WriteUndoline(word, va("%d", spstage_start), UNDO_NONE);
 				spstage_start = (INT16)value;
 			}
 			else if (fastcmp(word, "SSTAGE_START"))
@@ -2548,79 +2499,64 @@ static void readmaincfg(MYFILE *f)
 				else
 					value = get_number(word2);
 
-				DEH_WriteUndoline(word, va("%d", sstage_start), UNDO_NONE);
 				sstage_start = (INT16)value;
 				sstage_end = (INT16)(sstage_start+6); // 7 special stages total
 			}
 			else if (fastcmp(word, "USENIGHTSSS"))
 			{
-				DEH_WriteUndoline(word, va("%d", useNightsSS), UNDO_NONE);
 				useNightsSS = (value || word2[0] == 'T' || word2[0] == 'Y');
 			}
 			else if (fastcmp(word, "REDTEAM"))
 			{
-				DEH_WriteUndoline(word, va("%d", skincolor_redteam), UNDO_NONE);
 				skincolor_redteam = (UINT8)get_number(word2);
 			}
 			else if (fastcmp(word, "BLUETEAM"))
 			{
-				DEH_WriteUndoline(word, va("%d", skincolor_blueteam), UNDO_NONE);
 				skincolor_blueteam = (UINT8)get_number(word2);
 			}
 			else if (fastcmp(word, "REDRING"))
 			{
-				DEH_WriteUndoline(word, va("%d", skincolor_redring), UNDO_NONE);
 				skincolor_redring = (UINT8)get_number(word2);
 			}
 			else if (fastcmp(word, "BLUERING"))
 			{
-				DEH_WriteUndoline(word, va("%d", skincolor_bluering), UNDO_NONE);
 				skincolor_bluering = (UINT8)get_number(word2);
 			}
 			else if (fastcmp(word, "INVULNTICS"))
 			{
-				DEH_WriteUndoline(word, va("%u", invulntics), UNDO_NONE);
 				invulntics = (UINT16)get_number(word2);
 			}
 			else if (fastcmp(word, "SNEAKERTICS"))
 			{
-				DEH_WriteUndoline(word, va("%u", sneakertics), UNDO_NONE);
 				sneakertics = (UINT16)get_number(word2);
 			}
 			else if (fastcmp(word, "FLASHINGTICS"))
 			{
-				DEH_WriteUndoline(word, va("%u", flashingtics), UNDO_NONE);
 				flashingtics = (UINT16)get_number(word2);
 			}
 			else if (fastcmp(word, "TAILSFLYTICS"))
 			{
-				DEH_WriteUndoline(word, va("%u", tailsflytics), UNDO_NONE);
 				tailsflytics = (UINT16)get_number(word2);
 			}
 			else if (fastcmp(word, "UNDERWATERTICS"))
 			{
-				DEH_WriteUndoline(word, va("%u", underwatertics), UNDO_NONE);
 				underwatertics = (UINT16)get_number(word2);
 			}
 			else if (fastcmp(word, "SPACETIMETICS"))
 			{
-				DEH_WriteUndoline(word, va("%u", spacetimetics), UNDO_NONE);
 				spacetimetics = (UINT16)get_number(word2);
 			}
 			else if (fastcmp(word, "EXTRALIFETICS"))
 			{
-				DEH_WriteUndoline(word, va("%u", extralifetics), UNDO_NONE);
 				extralifetics = (UINT16)get_number(word2);
 			}
 			else if (fastcmp(word, "GAMEOVERTICS"))
 			{
-				DEH_WriteUndoline(word, va("%u", gameovertics), UNDO_NONE);
 				gameovertics = get_number(word2);
 			}
 
 			else if (fastcmp(word, "INTROTOPLAY"))
 			{
-				DEH_WriteUndoline(word, va("%d", introtoplay), UNDO_NONE);
 				introtoplay = (UINT8)get_number(word2);
 				// range check, you morons.
 				if (introtoplay > 128)
@@ -2628,17 +2564,14 @@ static void readmaincfg(MYFILE *f)
 			}
 			else if (fastcmp(word, "LOOPTITLE"))
 			{
-				DEH_WriteUndoline(word, va("%d", looptitle), UNDO_NONE);
 				looptitle = (value || word2[0] == 'T' || word2[0] == 'Y');
 			}
 			else if (fastcmp(word, "TITLESCROLLSPEED"))
 			{
-				DEH_WriteUndoline(word, va("%d", titlescrollspeed), UNDO_NONE);
 				titlescrollspeed = get_number(word2);
 			}
 			else if (fastcmp(word, "CREDITSCUTSCENE"))
 			{
-				DEH_WriteUndoline(word, va("%d", creditscutscene), UNDO_NONE);
 				creditscutscene = (UINT8)get_number(word2);
 				// range check, you morons.
 				if (creditscutscene > 128)
@@ -2646,33 +2579,28 @@ static void readmaincfg(MYFILE *f)
 			}
 			else if (fastcmp(word, "NUMDEMOS"))
 			{
-				DEH_WriteUndoline(word, va("%d", numDemos), UNDO_NONE);
 				numDemos = (UINT8)get_number(word2);
 			}
 			else if (fastcmp(word, "DEMODELAYTIME"))
 			{
-				DEH_WriteUndoline(word, va("%d", demoDelayTime), UNDO_NONE);
 				demoDelayTime = get_number(word2);
 			}
 			else if (fastcmp(word, "DEMOIDLETIME"))
 			{
-				DEH_WriteUndoline(word, va("%d", demoIdleTime), UNDO_NONE);
 				demoIdleTime = get_number(word2);
 			}
 			else if (fastcmp(word, "USE1UPSOUND"))
 			{
-				DEH_WriteUndoline(word, va("%u", use1upSound), UNDO_NONE);
 				use1upSound = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
 			}
 			else if (fastcmp(word, "MAXXTRALIFE"))
 			{
-				DEH_WriteUndoline(word, va("%u", maxXtraLife), UNDO_NONE);
 				maxXtraLife = (UINT8)get_number(word2);
 			}
-
 			else if (fastcmp(word, "GAMEDATA"))
 			{
-				size_t filenamelen;
+				// just ignore it but dont throw a warning
+				/*size_t filenamelen;
 
 				// Check the data filename so that mods
 				// can't write arbitrary files.
@@ -2680,7 +2608,6 @@ static void readmaincfg(MYFILE *f)
 					I_Error("Maincfg: bad data file name '%s'\n", word2);
 
 				G_SaveGameData(false);
-				DEH_WriteUndoline(word, gamedatafilename, UNDO_NONE);
 				strlcpy(gamedatafilename, word2, sizeof (gamedatafilename));
 				strlwr(gamedatafilename);
 				savemoddata = true;
@@ -2697,16 +2624,14 @@ static void readmaincfg(MYFILE *f)
 				// can't use sprintf since there is %u in savegamename
 				strcatbf(savegamename, srb2home, PATHSEP);
 
-				refreshdirmenu |= REFRESHDIR_GAMEDATA;
+				refreshdirmenu |= REFRESHDIR_GAMEDATA;*/
 			}
 			else if (fastcmp(word, "RESETDATA"))
 			{
-				DEH_WriteUndoline(word, "0", UNDO_TODO); /// \todo
 				P_ResetData(value);
 			}
 			else if (fastcmp(word, "CUSTOMVERSION"))
 			{
-				DEH_WriteUndoline(word, customversionstring, UNDO_NONE);
 				strlcpy(customversionstring, word2, sizeof (customversionstring));
 			}
 			else
@@ -2966,13 +2891,11 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 			{
 				G_SetGameModified(multiplayer, true);
 				readmaincfg(f);
-				DEH_WriteUndoline(word, "", UNDO_HEADER);
 				continue;
 			}
 			else if (fastcmp(word, "WIPES"))
 			{
 				readwipes(f);
-				DEH_WriteUndoline(word, "", UNDO_HEADER);
 				// This is not a major mod.
 				continue;
 			}
@@ -2993,7 +2916,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 					deh_warning("Character %d out of range (0 - 31)", i);
 					ignorelines(f);
 				}
-				DEH_WriteUndoline(word, word2, UNDO_HEADER);
 				// This is not a major mod.
 				continue;
 			}
@@ -3007,7 +2929,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 				{
 					// Read patch from spec file.
 					readpatch(f, word2, wad);
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
 					// This is not a major mod.
 				}
 				else if (fastcmp(word, "THING") || fastcmp(word, "MOBJ") || fastcmp(word, "OBJECT"))
@@ -3025,13 +2946,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("Thing %d out of range (0 - %d)", i, NUMMOBJTYPES-1);
 						ignorelines(f);
 					}
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
 				}
-/*				else if (fastcmp(word, "ANIMTEX"))
-				{
-					readAnimTex(f, i);
-					// This is not a major mod.
-				}*/
 				else if (fastcmp(word, "LEVEL"))
 				{
 					// Support using the actual map name,
@@ -3052,7 +2967,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("Level number %d out of range (1 - %d)", i, NUMMAPS);
 						ignorelines(f);
 					}
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
 				}
 				else if (fastcmp(word, "CUTSCENE"))
 				{
@@ -3063,8 +2977,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("Cutscene number %d out of range (1 - 128)", i);
 						ignorelines(f);
 					}
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
-					//G_SetGameModified(multiplayer, true); -- might have to reconsider in a future update
 				}
 				else if (fastcmp(word, "FRAME") || fastcmp(word, "STATE"))
 				{
@@ -3081,7 +2993,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("Frame %d out of range (0 - %d)", i, NUMSTATES-1);
 						ignorelines(f);
 					}
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
 				}
 				else if (fastcmp(word, "SOUND"))
 				{
@@ -3094,7 +3005,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("Sound %d out of range (0 - %d)", i, NUMSFX-1);
 						ignorelines(f);
 					}
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
 					// This is not a major mod.
 				}
 				else if (fastcmp(word, "HUDITEM"))
@@ -3108,7 +3018,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("HUD item number %d out of range (0 - %d)", i, NUMHUDITEMS-1);
 						ignorelines(f);
 					}
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
 					// This is not a major mod.
 				}
 				else if (fastcmp(word, "EMBLEM"))
@@ -3129,7 +3038,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("Emblem number %d out of range (1 - %d)", i, MAXEMBLEMS);
 						ignorelines(f);
 					}
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
 				}
 				else if (fastcmp(word, "EXTRAEMBLEM"))
 				{
@@ -3149,7 +3057,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("Extra emblem number %d out of range (1 - %d)", i, MAXEXTRAEMBLEMS);
 						ignorelines(f);
 					}
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
 				}
 				else if (fastcmp(word, "UNLOCKABLE"))
 				{
@@ -3165,7 +3072,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("Unlockable number %d out of range (1 - %d)", i, MAXUNLOCKABLES);
 						ignorelines(f);
 					}
-					DEH_WriteUndoline(word, word2, UNDO_HEADER);
 				}
 				else if (fastcmp(word, "CONDITIONSET"))
 				{
@@ -3181,15 +3087,12 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 						deh_warning("Condition set number %d out of range (1 - %d)", i, MAXCONDITIONSETS);
 						ignorelines(f);
 					}
-					// no undo support for this insanity yet
-					//DEH_WriteUndoline(word, word2, UNDO_HEADER);
 				}
 				else if (fastcmp(word, "SRB2KART"))
 				{
 					INT32 ver = searchvalue(strtok(NULL, "\n"));
 					if (ver != PATCHVERSION)
 						deh_warning("Patch is for SRB2Kart version %d,\nonly version %d is supported", ver, PATCHVERSION);
-					//DEH_WriteUndoline(word, va("%d", ver), UNDO_NONE);
 				}
 				else if (fastcmp(word, "SRB2"))
 				{
@@ -3268,7 +3171,6 @@ void DEH_LoadDehackedLumpPwad(UINT16 wad, UINT16 lump)
 	f.curpos = f.data;
 	f.data[f.size] = 0;
 	DEH_LoadDehackedFile(&f, wad);
-	DEH_WriteUndoline(va("# uload for wad: %u, lump: %u", wad, lump), NULL, UNDO_DONE);
 	Z_Free(f.data);
 }
 
@@ -3288,7 +3190,7 @@ void DEH_LoadDehackedLump(lumpnum_t lumpnum)
 // RegEx to generate this from info.h: ^\tS_([^,]+), --> \t"S_\1",
 // I am leaving the prefixes solely for clarity to programmers,
 // because sadly no one remembers this place while searching for full state names.
-static const char *const STATE_LIST[] = { // array length left dynamic for sanity testing later.
+const char *const STATE_LIST[] = { // array length left dynamic for sanity testing later.
 	"S_NULL",
 	"S_UNKNOWN",
 	"S_INVISIBLE", // state for invisible sprite
@@ -6502,7 +6404,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 // RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
 // I am leaving the prefixes solely for clarity to programmers,
 // because sadly no one remembers this place while searching for full state names.
-static const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for sanity testing later.
+const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for sanity testing later.
 	"MT_NULL",
 	"MT_UNKNOWN",
 
@@ -7293,7 +7195,7 @@ static const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for s
 #endif
 };
 
-static const char *const MOBJFLAG_LIST[] = {
+const char *const MOBJFLAG_LIST[] = {
 	"SPECIAL",
 	"SOLID",
 	"SHOOTABLE",
@@ -7329,7 +7231,7 @@ static const char *const MOBJFLAG_LIST[] = {
 };
 
 // \tMF2_(\S+).*// (.+) --> \t"\1", // \2
-static const char *const MOBJFLAG2_LIST[] = {
+const char *const MOBJFLAG2_LIST[] = {
 	"AXIS",			// It's a NiGHTS axis! (For faster checking)
 	"TWOD",			// Moves like it's in a 2D level
 	"DONTRESPAWN",	// Don't respawn this object!
@@ -7362,7 +7264,7 @@ static const char *const MOBJFLAG2_LIST[] = {
 	NULL
 };
 
-static const char *const MOBJEFLAG_LIST[] = {
+const char *const MOBJEFLAG_LIST[] = {
 	"ONGROUND", // The mobj stands on solid floor (not on another mobj or in air)
 	"JUSTHITFLOOR", // The mobj just hit the floor while falling, this is cleared on next frame
 	"TOUCHWATER", // The mobj stands in a sector with water, and touches the surface
@@ -7380,14 +7282,14 @@ static const char *const MOBJEFLAG_LIST[] = {
 	NULL
 };
 
-static const char *const MAPTHINGFLAG_LIST[4] = {
+const char *const MAPTHINGFLAG_LIST[4] = {
 	NULL,
 	"OBJECTFLIP", // Reverse gravity flag for objects.
 	"OBJECTSPECIAL", // Special flag used with certain objects.
 	"AMBUSH" // Deaf monsters/do not react to sound.
 };
 
-static const char *const PLAYERFLAG_LIST[] = {
+const char *const PLAYERFLAG_LIST[] = {
 	// Flip camera angle with gravity flip prefrence.
 	"FLIPCAM",
 
@@ -7459,7 +7361,7 @@ static const char *const PLAYERFLAG_LIST[] = {
 };
 
 // Linedef flags
-static const char *const ML_LIST[16] = {
+const char *const ML_LIST[16] = {
 	"IMPASSIBLE",
 	"BLOCKMONSTERS",
 	"TWOSIDED",
@@ -7480,7 +7382,7 @@ static const char *const ML_LIST[16] = {
 
 // This DOES differ from r_draw's Color_Names, unfortunately.
 // Also includes Super colors
-static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
+const char *COLOR_ENUMS[] = { // Rejigged for Kart.
 	"NONE",			// SKINCOLOR_NONE
 	"WHITE",		// SKINCOLOR_WHITE
 	"SILVER",		// SKINCOLOR_SILVER
@@ -7648,7 +7550,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
 	"CSUPER5"		// SKINCOLOR_CSUPER5,
 };
 
-static const char *const POWERS_LIST[] = {
+const char *const POWERS_LIST[] = {
 	"INVULNERABILITY",
 	"SNEAKERS",
 	"FLASHING",
@@ -7683,7 +7585,7 @@ static const char *const POWERS_LIST[] = {
 	"INGOOP" // In goop
 };
 
-static const char *const KARTSTUFF_LIST[] = {
+const char *const KARTSTUFF_LIST[] = {
 	"POSITION",
 	"OLDPOSITION",
 	"POSITIONDELAY",
@@ -7770,7 +7672,7 @@ static const char *const KARTSTUFF_LIST[] = {
 	"GROWCANCEL"
 };
 
-static const char *const HUDITEMS_LIST[] = {
+const char *const HUDITEMS_LIST[] = {
 	"LIVESNAME",
 	"LIVESPIC",
 	"LIVESNUM",
@@ -7859,7 +7761,18 @@ struct {
 	{"FF_HORIZONTALFLIP",FF_HORIZONTALFLIP},
 	{"FF_PAPERSPRITE",FF_PAPERSPRITE},
 	{"FF_ANIMATE",FF_ANIMATE},
+	// brightness
+	{"FF_BRIGHTMASK",FF_BRIGHTMASK},
 	{"FF_FULLBRIGHT",FF_FULLBRIGHT},
+	{"FF_SEMIBRIGHT",FF_SEMIBRIGHT},
+	{"FF_FULLDARK",FF_FULLDARK},
+	// blending
+	{"FF_BLENDMASK",FF_BLENDMASK},
+	{"FF_BLENDSHIFT",FF_BRIGHTMASK},
+	{"FF_ADD",FF_ADD},
+	{"FF_SUBTRACT",FF_SUBTRACT},
+	{"FF_REVERSESUBTRACT",FF_REVERSESUBTRACT},
+	{"FF_MODULATE",FF_MODULATE},
 	{"FF_TRANSMASK",FF_TRANSMASK},
 	{"FF_TRANSSHIFT",FF_TRANSSHIFT},
 	// new preshifted translucency (used in source)
@@ -7895,6 +7808,15 @@ struct {
 	{"tr_trans90",tr_trans90},
 	{"NUMTRANSMAPS",NUMTRANSMAPS},
 
+	// Alpha styles (blend modes)
+	{"AST_COPY",AST_COPY},
+	{"AST_TRANSLUCENT",AST_TRANSLUCENT},
+	{"AST_ADD",AST_ADD},
+	{"AST_SUBTRACT",AST_SUBTRACT},
+	{"AST_REVERSESUBTRACT",AST_REVERSESUBTRACT},
+	{"AST_MODULATE",AST_MODULATE},
+	{"AST_OVERLAY",AST_OVERLAY},
+
 	// Type of levels
 	{"TOL_SP",TOL_SP},
 	{"TOL_COOP",TOL_COOP},
@@ -8259,6 +8181,14 @@ struct {
 	{"V_CHARCOLORSHIFT",V_CHARCOLORSHIFT},
 	{"V_ALPHASHIFT",V_ALPHASHIFT},
 
+	// Blending
+	{"V_BLENDSHIFT",V_BLENDSHIFT},
+	{"V_BLENDMASK",V_BLENDMASK},
+	{"B_ADD",B_ADD},
+	{"B_SUBTRACT",B_SUBTRACT},
+	{"B_REVERSESUBTRACT",B_REVERSESUBTRACT},
+	{"B_MODULATE",B_MODULATE},
+
 	//Kick Reasons
 	{"KR_KICK",KR_KICK},
 	{"KR_PINGLIMIT",KR_PINGLIMIT},
@@ -8594,13 +8524,13 @@ static inline int lib_freeslot(lua_State *L)
 // Arguments: mobj_t actor, int var1, int var2
 static inline int lib_action(lua_State *L)
 {
-	actionf_t *action = lua_touserdata(L,lua_upvalueindex(1));
+	actionf_p1 *action = lua_touserdata(L,lua_upvalueindex(1));
 	mobj_t *actor = *((mobj_t **)luaL_checkudata(L,1,META_MOBJ));
 	var1 = (INT32)luaL_optinteger(L,2,0);
 	var2 = (INT32)luaL_optinteger(L,3,0);
 	if (!actor)
 		return LUA_ErrInvalid(L, "mobj_t");
-	action->acp1(actor);
+	(*action)(actor);
 	return 0;
 }
 
@@ -8683,6 +8613,16 @@ static int lua_enumlib_mariomode_get(lua_State *L)
 	return 1;
 }
 
+static int lua_enumlib_replayfreecam_get(lua_State *L)
+{
+	if (dedicated) // huh?
+		lua_pushboolean(L, false);
+	else
+		lua_pushboolean(L, camera[R_GetViewNumber()].freecam);
+
+	return 1;
+}
+
 static int lua_enumlib_twodlevel_get(lua_State *L)
 {
 	lua_pushboolean(L, twodlevel);
@@ -9287,9 +9227,6 @@ int LUA_EnumLib(lua_State *L)
 	PUSHGETTER(globalweather, u8);
 	PUSHGETTER(levelskynum, i32);
 	PUSHGETTER(globallevelskynum, i32);
-	PUSHGETTER((*mapmusname), str);
-	PUSHGETTER(mapmusflags, u16);
-	PUSHGETTER(mapmusposition, u32);
 	PUSHGETTER(gravity, fxp);
 	PUSHGETTER(gamespeed, u8);
 	PUSHGETTER(encoremode, bool);
@@ -9304,6 +9241,21 @@ int LUA_EnumLib(lua_State *L)
 	PUSHGETTER(racecountdown, u32);
 	PUSHGETTER(exitcountdown, u32);
 
+	lua_pushcfunction(L, lua_glib_new_getter);
+	lua_pushliteral(L, "mapmusflags");
+	lua_glib_push_u16_getter(L, &mapmusic.flags);
+	lua_call(L, 2, 0);
+
+	lua_pushcfunction(L, lua_glib_new_getter);
+	lua_pushliteral(L, "mapmusposition");
+	lua_glib_push_u32_getter(L, &mapmusic.position);
+	lua_call(L, 2, 0);
+
+	lua_pushcfunction(L, lua_glib_new_getter);
+	lua_pushliteral(L, "mapmusname");
+	lua_glib_push_str_getter(L, mapmusic.name);
+	lua_call(L, 2, 0);
+
 	lua_pushcfunction(L, lua_glib_new_getter);
 	lua_pushliteral(L, "mariomode");
 	lua_pushcfunction(L, lua_enumlib_mariomode_get);
@@ -9354,6 +9306,11 @@ int LUA_EnumLib(lua_State *L)
 	lua_glib_push_bool_getter(L, &demo.playback);
 	lua_call(L, 2, 0);
 
+	lua_pushcfunction(L, lua_glib_new_getter);
+	lua_pushliteral(L, "replayfreecam");
+	lua_pushcfunction(L, lua_enumlib_replayfreecam_get);
+	lua_call(L, 2, 0);
+
 	if (!mathlib)
 	{
 		lua_pushcfunction(L, lua_glib_new_getter);
@@ -9387,13 +9344,15 @@ int LUA_SOCLib(lua_State *L)
 
 const char *LUA_GetActionName(void *action)
 {
-	actionf_t *act = (actionf_t *)action;
+	actionf_p1 *act = (actionf_p1 *)action;
 	size_t z;
+
 	for (z = 0; actionpointers[z].name; z++)
 	{
-		if (actionpointers[z].action.acv == act->acv)
+		if (actionpointers[z].action == *act)
 			return actionpointers[z].name;
 	}
+
 	return NULL;
 }
 
@@ -9406,8 +9365,6 @@ void LUA_SetActionByName(void *state, const char *actiontocompare)
 		if (fasticmp(actiontocompare, actionpointers[z].name))
 		{
 			st->action = actionpointers[z].action;
-			st->action.acv = actionpointers[z].action.acv; // assign
-			st->action.acp1 = actionpointers[z].action.acp1;
 			return;
 		}
 	}
diff --git a/src/dehacked.h b/src/dehacked.h
index 33621a3ac..eb22c5f6a 100644
--- a/src/dehacked.h
+++ b/src/dehacked.h
@@ -14,20 +14,26 @@
 #define __DEHACKED_H__
 
 #include "m_fixed.h" // for get_number
+#include "info.h"
 
-typedef enum
-{
-	UNDO_NONE    = 0x00,
-	UNDO_NEWLINE = 0x01,
-	UNDO_SPACE   = 0x02,
-	UNDO_CUTLINE = 0x04,
-	UNDO_HEADER  = 0x07,
-	UNDO_ENDTEXT = 0x08,
-	UNDO_TODO = 0,
-	UNDO_DONE = 0,
-} undotype_f;
+// Free slot names
+// The crazy word-reading stuff uses these.
+extern char *FREE_STATES[NUMSTATEFREESLOTS];
+extern char *FREE_MOBJS[NUMMOBJFREESLOTS];
+extern 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 DEH_WriteUndoline(a,b,c)
+extern const char *const STATE_LIST[];
+extern const char *const MOBJTYPE_LIST[];
+extern const char *const MOBJFLAG_LIST[];
+extern const char *const MOBJFLAG2_LIST[]; // \tMF2_(\S+).*// (.+) --> \t"\1", // \2
+extern const char *const MOBJEFLAG_LIST[];
+extern const char *const MAPTHINGFLAG_LIST[4];
+extern const char *const PLAYERFLAG_LIST[];
+extern const char *const ML_LIST[]; // Linedef flags
+extern const char *COLOR_ENUMS[];
+extern const char *const POWERS_LIST[];
+extern const char *const KARTSTUFF_LIST[];
+extern const char *const HUDITEMS_LIST[];
 
 void DEH_LoadDehackedLump(lumpnum_t lumpnum);
 void DEH_LoadDehackedLumpPwad(UINT16 wad, UINT16 lump);
diff --git a/src/discord.c b/src/discord.c
index cd7dafa8f..207a249a6 100644
--- a/src/discord.c
+++ b/src/discord.c
@@ -388,7 +388,7 @@ static void DRPC_GotServerIP(UINT32 address)
 --------------------------------------------------*/
 static const char *DRPC_GetServerIP(void)
 {
-	const char *address; 
+	const char *address;
 
 	// If you're connected
 	if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL)
@@ -489,7 +489,7 @@ void DRPC_UpdatePresence(void)
 		{
 #endif
 			discordPresence.state = "Private";
-#ifdef MASTERSERVER			
+#ifdef MASTERSERVER
 		}
 #endif
 
@@ -571,9 +571,15 @@ void DRPC_UpdatePresence(void)
 		{
 			// Map name on tool tip
 			char *title = G_BuildMapTitle(gamemap);
-			snprintf(mapname, 48, "Map: %s", title);
+			if (title)
+			{
+				snprintf(mapname, 48, "Map: %s", title);
+				Z_Free(title);
+			}
+			else
+				snprintf(mapname, 48, "Map: UNKNOWN");
+
 			discordPresence.largeImageText = mapname;
-			Z_Free(title);
 		}
 
 		if (gamestate == GS_LEVEL && Playing())
diff --git a/src/doomdef.h b/src/doomdef.h
index 1c9a055d3..0cf5c5d0c 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -21,7 +21,6 @@
 #define SOUND_DUMMY   0
 #define SOUND_SDL     1
 #define SOUND_MIXER   2
-#define SOUND_FMOD    3
 
 #ifndef SOUND
 #ifdef HAVE_SDL
@@ -29,9 +28,6 @@
 // Use Mixer interface?
 #ifdef HAVE_MIXER
     #define SOUND SOUND_MIXER
-    #ifdef HW3SOUND
-    #undef HW3SOUND
-    #endif
 #endif
 
 // Use generic SDL interface.
@@ -40,18 +36,8 @@
 #endif
 
 #else // No SDL.
-
-// Use FMOD?
-#ifdef HAVE_FMOD
-    #define SOUND SOUND_FMOD
-    #ifdef HW3SOUND
-    #undef HW3SOUND
-    #endif
-#else
-    // No more interfaces. :(
-    #define SOUND SOUND_DUMMY
-#endif
-
+// No more interfaces. :(
+#define SOUND SOUND_DUMMY
 #endif
 #endif
 
@@ -72,6 +58,9 @@
 // warning C4152: nonstandard extension, function/data pointer conversion in expression
 // warning C4213: nonstandard extension used : cast on l-value
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include "doomtype.h"
 
@@ -81,11 +70,10 @@
 #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>
-
-#ifdef GETTEXT
-#include <libintl.h>
-#include <locale.h>
 #endif
 
 #include <sys/types.h>
@@ -127,8 +115,13 @@ extern char  logfilename[1024];
 #else
 #define VERSION    1 // Game version
 #define SUBVERSION 6 // more precise version number
+<<<<<<< HEAD
 #define VERSIONSTRING "Saturn v6 lugdev Zzz..."
 #define VERSIONSTRINGW L"Saturn v6 lugdev Zzz..."
+=======
+#define VERSIONSTRING "Saturn v8.3"
+#define VERSIONSTRINGW L"Saturn v8.3"
+>>>>>>> Saturn-Next
 // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
 // And change CMakeLists.txt (not src/, but in root), for CMake users!
 // AND appveyor.yml, for the build bots!
@@ -461,15 +454,14 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...) FUNCDEBUG;
 extern char savegamename[256];
 
 // m_misc.h
-#ifdef GETTEXT
-#define M_GetText(String) gettext(String)
-void M_StartupLocale(void);
-#else
-// If no translations are to be used, make a stub
-// M_GetText function that just returns the string.
+//TODO: delet this
 #define M_GetText(x) (x)
-#endif
-void *M_Memcpy(void* dest, const void* src, size_t n);
+
+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);
@@ -517,15 +509,33 @@ extern boolean capslock;
 // i_system.c, replace getchar() once the keyboard has been appropriated
 INT32 I_GetKey(void);
 
+/* http://www.cse.yorku.ca/~oz/hash.html */
+static inline
+UINT32 quickncasehash (const char *p, size_t n)
+{
+	size_t i = 0;
+	UINT32 x = 5381;
+
+	while (i < n && p[i])
+	{
+		x = (x * 33) ^ tolower(p[i]);
+		i++;
+	}
+
+	return x;
+}
+
+#ifndef __cplusplus
 #ifndef min // Double-Check with WATTCP-32's cdefs.h
 #define min(x, y) (((x) < (y)) ? (x) : (y))
 #endif
 #ifndef max // Double-Check with WATTCP-32's cdefs.h
 #define max(x, y) (((x) > (y)) ? (x) : (y))
 #endif
+#endif
 
 #ifndef CLAMP
-#define CLAMP(x, min_val, max_val) ((x) < (min_val) ? (min_val) : ((x) > (max_val) ? (max_val) : (x)))
+#define CLAMP(x, y, z) ((x) < (y) ? (y) : ((x) > (z) ? (z) : (x)))
 #endif
 
 #ifndef M_PIl
@@ -541,6 +551,27 @@ INT32 I_GetKey(void);
 #define DBL_EPSILON 2.2204460492503131e-16l
 #endif
 
+#if defined(__GNUC__) || defined(__clang__)
+#ifndef LIKELY
+#define LIKELY(x)   __builtin_expect(!!(x), 1)
+#endif
+
+#ifndef UNLIKELY
+#define UNLIKELY(x) __builtin_expect(!!(x), 0)
+#endif
+#else
+#define LIKELY(x)       (x)
+#define UNLIKELY(x)     (x)
+#endif
+
+#ifdef __cplusplus
+#if defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER)
+	#define restrict __restrict
+#else
+	#define restrict
+#endif
+#endif
+
 // An assert-type mechanism.
 #ifdef PARANOIA
 #define I_Assert(e) ((e) ? (void)0 : I_Error("assert failed: %s, file %s, line %d", #e, __FILE__, __LINE__))
@@ -563,6 +594,23 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 // None of these that are disabled in the normal build are guaranteed to work perfectly
 // Compile them at your own risk!
 
+#ifndef NONET
+//-- SATURN __
+/// Detect if a client is on Saturn in the clientconfig.
+/// To seperately allow them to join or block joining from vanilla clients.
+#ifdef DOSATURNJOIN
+#define SATURNJOIN
+#endif
+
+/// Server detection for if a connecting client is on Saturn.
+/// This also enables gamestate resynching between Saturn servers and clients
+/// Like SRB2 and RR does
+#ifdef DOSATURNPAK
+#define SATURNPAK
+#endif
+//-- <(￣︶￣)> __
+#endif
+
 /// Undefine to use the new method of Gamma correction see colour cube in v_video.c
 #define BACKWARDSCOMPATCORRECTION
 
@@ -621,4 +669,8 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 #undef UPDATE_ALERT
 #endif
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // __DOOMDEF__
diff --git a/src/doomstat.h b/src/doomstat.h
index 35ae67d1b..5daed8b01 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -30,16 +30,26 @@
 // =============================
 
 // Selected by user.
-extern INT16 gamemap;
-extern char mapmusname[7];
-extern UINT16 mapmusflags;
-extern UINT32 mapmusposition;
-extern UINT32 mapmusresume;
+
+typedef struct
+{
+	char       name[7];  // Music name, up to 6-character name
+	void       *data;    // Music lump
+	UINT16     flags;    // Track and reset bit
+	boolean    looping;  // Is this music looping?
+	UINT32     position; // Position to jump to
+	UINT32     resume;   // Saved Position when music was stopped
+	UINT32     fadeinms; // Fade in time in ms (used for queue)
+} music_t;
+
+extern music_t mapmusic;
+
 #define MUSIC_TRACKMASK   0x0FFF // ----************
 #define MUSIC_RELOADRESET 0x8000 // *---------------
 #define MUSIC_FORCERESET  0x4000 // -*--------------
 // Use other bits if necessary.
 
+extern INT16 gamemap;
 extern INT16 maptol;
 extern UINT8 globalweather;
 extern INT32 curWeather;
@@ -112,11 +122,10 @@ extern UINT8 window_notinfocus; // are we in focus? (backend independant -- hand
 extern boolean nodrawers;
 extern boolean noblit;
 extern boolean lastdraw;
-extern postimg_t postimgtype[MAXSPLITSCREENPLAYERS];
 extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
 
 extern INT32 viewwindowx, viewwindowy;
-extern INT32 viewwidth, scaledviewwidth;
+extern INT32 viewwidth;
 
 extern boolean gamedataloaded;
 
@@ -192,7 +201,7 @@ extern struct quake
 	// camera offsets and duration
 	fixed_t x,y,z;
 	angle_t roll;
-	UINT16 time;
+	tic_t time;
 
 	// location, radius, and intensity...
 	mappoint_t *epicenter;
@@ -213,6 +222,15 @@ typedef struct
 	char value[256]; // 255 usable characters. If this seriously isn't enough then wtf.
 } customoption_t;
 
+typedef struct
+{
+	boolean use_custom_light;
+	UINT8 light_contrast;				///< Range of wall lighting. 0 is no lighting.
+	SINT8 sprite_backlight;				///< Subtract from wall lighting for sprites only.
+	boolean use_light_angle;			///< When false, wall lighting is evenly distributed. When true, wall lighting is directional.
+	angle_t light_angle;				///< Angle of directional wall lighting.
+} mapheader_lighting_t;
+
 /** Map header information.
   */
 typedef struct
@@ -226,7 +244,7 @@ typedef struct
 	INT16 nextlevel;       ///< Map number of next level, or 1100-1102 to end.
 	char musname[7];       ///< Music track to play. "" for no music.
 	UINT16 mustrack;       ///< Subsong to play. Only really relevant for music modules and specific formats supported by GME. 0 to ignore.
-	UINT32 muspos;    ///< Music position to jump to.
+	UINT32 muspos;         ///< Music position to jump to.
 	char forcecharacter[17];  ///< (SKINNAMESIZE+1) Skin to switch to or "" to disable.
 	UINT8 weather;         ///< 0 = sunny day, 1 = storm, 2 = snow, 3 = rain, 4 = blank, 5 = thunder w/o rain, 6 = rain w/o lightning, 7 = heat wave.
 	INT16 skynum;          ///< Sky number to use.
@@ -258,7 +276,11 @@ typedef struct
 
 	// SRB2kart
 	//boolean automap;    ///< Displays a level's white map outline in modified games
-	fixed_t mobj_scale; ///< Replacement for TOL_ERZ3
+	fixed_t mobj_scale;   ///< Replacement for TOL_ERZ3
+
+	mapheader_lighting_t lighting;			///< Wall and sprite lighting
+	mapheader_lighting_t lighting_encore;	///< Alternative lighting for Encore mode
+	boolean use_encore_lighting;			///< Whether to use separate Encore lighting
 
 	// Music stuff.
 	UINT32 musinterfadeout;  ///< Fade out level music on intermission screen in milliseconds
@@ -339,9 +361,6 @@ enum GameType // SRB2Kart
 // String names for gametypes
 extern const char *Gametype_Names[NUMGAMETYPES];
 
-extern tic_t totalplaytime;
-extern UINT32 matchesplayed;
-
 extern UINT8 stagefailed;
 
 // Emeralds stored as bits to throw savegame hackers off.
@@ -427,19 +446,19 @@ extern UINT16 spacetimetics;
 extern UINT16 extralifetics;
 
 // SRB2kart
-extern tic_t introtime;
-extern tic_t starttime;
-extern tic_t raceexittime;
-extern tic_t battleexittime;
-extern INT32 hyudorotime;
-extern INT32 stealtime;
-extern INT32 sneakertime;
-extern INT32 itemtime;
-extern INT32 comebacktime;
-extern INT32 bumptime;
-extern INT32 wipeoutslowtime;
-extern INT32 wantedreduce;
-extern INT32 wantedfrequency;
+extern const tic_t introtime;
+extern const tic_t starttime;
+extern const tic_t raceexittime;
+extern const tic_t battleexittime;
+extern const INT32 hyudorotime;
+extern const INT32 stealtime;
+extern const INT32 sneakertime;
+extern const INT32 itemtime;
+extern const INT32 comebacktime;
+extern const INT32 bumptime;
+extern const INT32 wipeoutslowtime;
+extern const INT32 wantedreduce;
+extern const INT32 wantedfrequency;
 
 extern UINT8 introtoplay;
 extern UINT8 creditscutscene;
@@ -455,6 +474,14 @@ extern tic_t racecountdown, exitcountdown;
 extern fixed_t gravity;
 extern fixed_t mapobjectscale;
 
+extern struct maplighting
+{
+	UINT8 contrast;
+	SINT8 backlight;
+	boolean directional;
+	angle_t angle;
+} maplighting;
+
 //for CTF balancing
 extern INT16 autobalance;
 extern INT16 teamscramble;
@@ -483,7 +510,6 @@ extern boolean startedInFreePlay;
 
 extern boolean legitimateexit;
 extern boolean comebackshowninfo;
-extern tic_t curlap, bestlap;
 
 extern INT16 votelevels[4][2];
 extern SINT8 votes[MAXPLAYERS];
@@ -542,9 +568,6 @@ extern FILE *debugfile;
 extern INT32 debugload;
 #endif
 
-// if true, load all graphics at level load
-extern boolean precache;
-
 // wipegamestate can be set to -1
 //  to force a wipe on the next draw
 extern gamestate_t wipegamestate;
@@ -564,7 +587,7 @@ extern consvar_t cv_downloading; // allow clients to downloading WADs.
 extern consvar_t cv_nettimeout; // SRB2Kart: Advanced server options menu
 extern consvar_t cv_jointimeout;
 extern consvar_t cv_maxping;
-extern ticcmd_t netcmds[TICQUEUE][MAXPLAYERS];
+extern ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
 extern INT32 serverplayer;
 extern INT32 adminplayers[MAXPLAYERS];
 
diff --git a/src/doomtype.h b/src/doomtype.h
index 1dcf47ea7..ac41a4413 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -17,6 +17,10 @@
 #ifndef __DOOMTYPE__
 #define __DOOMTYPE__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined (_WIN32)
 //#define WIN32_LEAN_AND_MEAN
 #define RPC_NO_WINDOWS_H
@@ -100,8 +104,10 @@ typedef long ssize_t;
 	#define strnicmp(x,y,n) strncasecmp(x,y,n)
 #endif
 
+#ifndef __cplusplus
 char *strcasestr(const char *in, const char *what);
 #define stristr strcasestr
+#endif
 
 #if defined (macintosh) //|| defined (__APPLE__) //skip all boolean/Boolean crap
 	#define true 1
@@ -156,22 +162,19 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
 
 /* Boolean type definition */
 
-// \note __BYTEBOOL__ used to be set above if "macintosh" was defined,
-// if macintosh's version of boolean type isn't needed anymore, then isn't this macro pointless now?
-#ifndef __BYTEBOOL__
-	#define __BYTEBOOL__
-
-	//faB: clean that up !!
-	#if defined( _MSC_VER)  && (_MSC_VER >= 1800) // MSVC 2013 and forward
-		#include "stdbool.h"
-	#elif defined (_WIN32)
-		#define false   FALSE           // use windows types
-		#define true    TRUE
-		#define boolean BOOL
-	#else
-		typedef enum {false, true} boolean;
-	#endif
-#endif // __BYTEBOOL__
+#ifndef _WIN32
+#include <stdbool.h>
+// dont use stdbools _BOOL type
+// its smaller (1 byte) than the old interger bool (4 bytes)
+// which results in packed struct sizes being mismatched between vanilla and this
+// however we gotta still include stdbool cause since c23 true and false are keywords
+// which we cant use as enumeration constants
+typedef int32_t boolean;
+#else
+#define false FALSE
+#define true TRUE
+#define boolean BOOL
+#endif
 
 /* 7.18.2.1  Limits of exact-width integer types */
 #ifndef INT8_MIN
@@ -342,17 +345,6 @@ union FColorRGBA
 } ATTRPACK;
 typedef union FColorRGBA RGBA_t;
 
-typedef enum
-{
-	postimg_none,
-	postimg_water,
-	postimg_motion,
-	postimg_flip,
-	postimg_heat,
-	postimg_mirror,
-	postimg_mirrorflip
-} postimg_t;
-
 typedef UINT32 lumpnum_t; // 16 : 16 unsigned long (wad num: lump num)
 #define LUMPERROR UINT32_MAX
 
@@ -367,6 +359,37 @@ typedef UINT32 tic_t;
 #define UINT2RGBA(a) (UINT32)((a&0xff)<<24)|((a&0xff00)<<8)|((a&0xff0000)>>8)|(((UINT32)a&0xff000000)>>24)
 #endif
 
+#define TOSTR(x) #x
+
+typedef UINT8 bitarray_t;
+
+#define BIT_ARRAY_SIZE(n) (((n) + 7) >> 3)
+
+static inline int
+in_bit_array (const bitarray_t * const array, const int value)
+{
+	return (array[value >> 3] & (1<<(value & 7)));
+}
+
+static inline void
+set_bit_array (bitarray_t * const array, const int value)
+{
+	array[value >> 3] |= (1<<(value & 7));
+}
+
+static inline void
+unset_bit_array (bitarray_t * const array, const int value)
+{
+	array[value >> 3] &= ~(1<<(value & 7));
+}
+
+#define intsign(n) \
+	((n) < 0 ? -1 : (n) > 0 ? 1 : 0)
+
 typedef UINT64 precise_t;
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif //__DOOMTYPE__
diff --git a/src/dummy/i_main.c b/src/dummy/i_main.c
deleted file mode 100644
index 0abf53b17..000000000
--- a/src/dummy/i_main.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../doomdef.h"
-#include "../d_main.h"
-#include "../m_argv.h"
-
-int main(int argc, char **argv)
-{
-	myargc = argc;
-	myargv = argv; /// \todo pull out path to exe from this string
-
-	// startup SRB2
-	CONS_Printf("Setting up SRB2...\n");
-	D_SRB2Main();
-	CONS_Printf("Entering main game loop...\n");
-	// never return
-	D_SRB2Loop();
-
-	// return to OS
-#ifndef __GNUC__
-	return 0;
-#endif
-}
diff --git a/src/dummy/i_net.c b/src/dummy/i_net.c
deleted file mode 100644
index f6e642022..000000000
--- a/src/dummy/i_net.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "../i_net.h"
-
-boolean I_InitNetwork(void)
-{
-	return false;
-}
diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c
deleted file mode 100644
index ff01bdff0..000000000
--- a/src/dummy/i_sound.c
+++ /dev/null
@@ -1,217 +0,0 @@
-#include "../i_sound.h"
-
-UINT8 sound_started = 0;
-
-void *I_GetSfx(sfxinfo_t *sfx)
-{
-	(void)sfx;
-	return NULL;
-}
-
-void I_FreeSfx(sfxinfo_t *sfx)
-{
-	(void)sfx;
-}
-
-void I_StartupSound(void){}
-
-void I_ShutdownSound(void){}
-
-void I_UpdateSound(void){};
-
-//
-//  SFX I/O
-//
-
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
-{
-	(void)id;
-	(void)vol;
-	(void)sep;
-	(void)pitch;
-	(void)priority;
-	(void)channel;
-	return -1;
-}
-
-void I_StopSound(INT32 handle)
-{
-	(void)handle;
-}
-
-boolean I_SoundIsPlaying(INT32 handle)
-{
-	(void)handle;
-	return false;
-}
-
-void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch)
-{
-	(void)handle;
-	(void)vol;
-	(void)sep;
-	(void)pitch;
-}
-
-void I_SetSfxVolume(UINT8 volume)
-{
-	(void)volume;
-}
-
-/// ------------------------
-//  MUSIC SYSTEM
-/// ------------------------
-
-void I_InitMusic(void){}
-
-void I_ShutdownMusic(void){}
-
-/// ------------------------
-//  MUSIC PROPERTIES
-/// ------------------------
-
-musictype_t I_SongType(void)
-{
-	return MU_NONE;
-}
-
-boolean I_SongPlaying(void)
-{
-	return false;
-}
-
-boolean I_SongPaused(void)
-{
-	return false;
-}
-
-/// ------------------------
-//  MUSIC EFFECTS
-/// ------------------------
-
-boolean I_SetSongSpeed(float speed)
-{
-	(void)speed;
-	return false;
-}
-
-/// ------------------------
-//  MUSIC SEEKING
-/// ------------------------
-
-UINT32 I_GetSongLength(void)
-{
-	return 0;
-}
-
-boolean I_SetSongLoopPoint(UINT32 looppoint)
-{
-        (void)looppoint;
-        return false;
-}
-
-UINT32 I_GetSongLoopPoint(void)
-{
-	return 0;
-}
-
-boolean I_SetSongPosition(UINT32 position)
-{
-    (void)position;
-    return false;
-}
-
-UINT32 I_GetSongPosition(void)
-{
-    return 0;
-}
-
-/// ------------------------
-//  MUSIC PLAYBACK
-/// ------------------------
-
-boolean I_LoadSong(char *data, size_t len)
-{
-	(void)data;
-	(void)len;
-	return -1;
-}
-
-void I_UnloadSong(void)
-{
-	(void)handle;
-}
-
-boolean I_PlaySong(boolean looping)
-{
-	(void)handle;
-	(void)looping;
-	return false;
-}
-
-void I_StopSong(void)
-{
-	(void)handle;
-}
-
-void I_PauseSong(void)
-{
-	(void)handle;
-}
-
-void I_ResumeSong(void)
-{
-	(void)handle;
-}
-
-void I_SetMusicVolume(UINT8 volume)
-{
-	(void)volume;
-}
-
-boolean I_SetSongTrack(INT32 track)
-{
-	(void)track;
-	return false;
-}
-
-/// ------------------------
-//  MUSIC FADING
-/// ------------------------
-
-void I_SetInternalMusicVolume(UINT8 volume)
-{
-	(void)volume;
-}
-
-void I_StopFadingSong(void)
-{
-}
-
-boolean I_FadeSongFromVolume(UINT8 target_volume, UINT8 source_volume, UINT32 ms, void (*callback)(void));
-{
-	(void)target_volume;
-	(void)source_volume;
-	(void)ms;
-	return false;
-}
-
-boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void));
-{
-	(void)target_volume;
-	(void)ms;
-	return false;
-}
-
-boolean I_FadeOutStopSong(UINT32 ms)
-{
-	(void)ms;
-	return false;
-}
-
-boolean I_FadeInPlaySong(UINT32 ms, boolean looping)
-{
-        (void)ms;
-        (void)looping;
-        return false;
-}
diff --git a/src/dummy/i_video.c b/src/dummy/i_video.c
deleted file mode 100644
index 93ba6b751..000000000
--- a/src/dummy/i_video.c
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "../doomdef.h"
-#include "../command.h"
-#include "../i_video.h"
-
-rendermode_t rendermode = render_none;
-
-boolean highcolor = false;
-
-boolean allow_fullscreen = false;
-
-consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-void I_StartupGraphics(void){}
-
-void I_ShutdownGraphics(void){}
-
-void I_SetPalette(RGBA_t *palette)
-{
-	(void)palette;
-}
-
-INT32 VID_NumModes(void)
-{
-	return 0;
-}
-
-INT32 VID_GetModeForSize(INT32 w, INT32 h)
-{
-	(void)w;
-	(void)h;
-	return 0;
-}
-
-void VID_PrepareModeList(void){}
-
-INT32 VID_SetMode(INT32 modenum)
-{
-	(void)modenum;
-	return 0;
-}
-
-const char *VID_GetModeName(INT32 modenum)
-{
-	(void)modenum;
-	return NULL;
-}
-
-void I_UpdateNoBlit(void){}
-
-void I_FinishUpdate(void){}
-
-void I_UpdateNoVsync(void) {}
-
-void I_WaitVBL(INT32 count)
-{
-	(void)count;
-}
-
-void I_ReadScreen(UINT8 *scr)
-{
-	(void)scr;
-}
-
-void I_BeginRead(void){}
-
-void I_EndRead(void){}
-
diff --git a/src/f_finale.c b/src/f_finale.c
index 7f86303c0..6d062af11 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -149,7 +149,7 @@ static UINT8 F_WriteText(void)
 static void F_NewCutscene(const char *basetext)
 {
 	cutscene_basetext = basetext;
-	memset(cutscene_disptext,0,sizeof(cutscene_disptext));
+	memset(cutscene_disptext, 0, sizeof(cutscene_disptext));
 	cutscene_writeptr = cutscene_baseptr = 0;
 	cutscene_textspeed = 9;
 	cutscene_textcount = TICRATE/2;
@@ -164,14 +164,14 @@ static void F_SkyScroll(INT32 scrollspeed)
 	patch_t *pat, *pat2;
 	INT32 anim2 = 0;
 
-	pat = W_CachePatchName("TITLEBG1", PU_CACHE);
-	pat2 = W_CachePatchName("TITLEBG2", PU_CACHE);
+	pat = W_CachePatchName("TITLEBG1", PU_PATCH_LOWPRIORITY);
+	pat2 = W_CachePatchName("TITLEBG2", PU_PATCH_LOWPRIORITY);
 
 	w = (vid.width / vid.dupx)<<FRACBITS;
 
 	// The scroll offset MUST be clamped before shifting by FRACBITS, or else it'll overflow in about 3 minutes
-	animtimer = ((((finalecount * scrollspeed) % (SHORT(pat->width)*16))<<FRACBITS) + (R_GetHudUncap() * scrollspeed))/16;
-	anim2 = (SHORT(pat2->width)<<FRACBITS) - ((((finalecount * scrollspeed) % (SHORT(pat2->width)*16))<<FRACBITS) + (R_GetHudUncap() * scrollspeed))/16;
+	animtimer = ((((finalecount * scrollspeed) % (pat->width*16))<<FRACBITS) + (R_GetMenuUncap() * scrollspeed))/16;
+	anim2 = (pat2->width<<FRACBITS) - ((((finalecount * scrollspeed) % (pat2->width*16))<<FRACBITS) + (R_GetMenuUncap() * scrollspeed))/16;
 
 	// SRB2Kart: F_DrawPatchCol is over-engineered; recoded to be less shitty and error-prone
 	if (rendermode != render_none)
@@ -183,15 +183,15 @@ static void F_SkyScroll(INT32 scrollspeed)
 		while (x < w)
 		{
 			V_DrawFixedPatch(x, y, FRACUNIT, V_SNAPTOTOP|V_SNAPTOLEFT, pat, NULL);
-			x += SHORT(pat->width)<<FRACBITS;
+			x += pat->width<<FRACBITS;
 		}
 
 		x = -anim2;
-		y = (BASEVIDHEIGHT - SHORT(pat2->height))<<FRACBITS;
+		y = (BASEVIDHEIGHT - pat2->height)<<FRACBITS;
 		while (x < w)
 		{
 			V_DrawFixedPatch(x, y, FRACUNIT, V_SNAPTOBOTTOM|V_SNAPTOLEFT, pat2, NULL);
-			x += SHORT(pat2->width)<<FRACBITS;
+			x += pat2->width<<FRACBITS;
 		}
 	}
 
@@ -263,7 +263,7 @@ void F_IntroDrawer(void)
 	// DRAW A FULL PIC INSTEAD OF FLAT!
 	if (intro_scenenum == 0)
 	{
-		background = W_CachePatchName("KARTKREW", PU_CACHE);
+		background = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY);
 		highres = true;
 	}
 
@@ -531,11 +531,21 @@ static const char *credits[] = {
 	"\"Xyzzy\"",
 	"\"Chearii\"",
 	" ",
-	"\"Sunflower\" aka \"AnimeSonic\"",
-	"\"Yuz\" aka \"Yuzler\"",
+	"\"Sunflower\"",
+	"\"Yuz\"",
 	"\"Democrab\"",
-	"\"Expand\" aka \"Maver\"",
+	"\"EXpand\"",
 	"\"Nexit\"",
+	"\"Spee\"",
+	"\"Jin\"",
+	"\"riomccloud\"",
+	"\"chromaticpipe\"",
+	"\"PAS\"",
+	"\"$HOME\"",
+	"\"Achii\"",
+	"\"Anonimus\"",
+	"\"scizor300\"",
+	"\"Lugent\"",
 	"",
 	"\1Special Thanks",
 	"SEGA",
@@ -623,10 +633,10 @@ void F_CreditDrawer(void)
 	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
 
 	// Draw background
-	V_DrawSciencePatch(0, 0 - FixedMul(32<<FRACBITS, FixedDiv(credbgtimer%TICRATE, TICRATE)), V_SNAPTOTOP, W_CachePatchName("CREDTILE", PU_CACHE), FRACUNIT);
+	V_DrawSciencePatch(0, 0 - FixedMul(32<<FRACBITS, FixedDiv(credbgtimer%TICRATE, TICRATE)), V_SNAPTOTOP, W_CachePatchName("CREDTILE", PU_PATCH_LOWPRIORITY), FRACUNIT);
 
-	V_DrawSciencePatch(0, 0 - FixedMul(40<<FRACBITS, FixedDiv(credbgtimer%(TICRATE/2), (TICRATE/2))), V_SNAPTOTOP, W_CachePatchName("CREDZIGZ", PU_CACHE), FRACUNIT);
-	V_DrawSciencePatch(320<<FRACBITS, 0 - FixedMul(40<<FRACBITS, FixedDiv(credbgtimer%(TICRATE/2), (TICRATE/2))), V_SNAPTOTOP|V_FLIP, W_CachePatchName("CREDZIGZ", PU_CACHE), FRACUNIT);
+	V_DrawSciencePatch(0, 0 - FixedMul(40<<FRACBITS, FixedDiv(credbgtimer%(TICRATE/2), (TICRATE/2))), V_SNAPTOTOP, W_CachePatchName("CREDZIGZ", PU_PATCH_LOWPRIORITY), FRACUNIT);
+	V_DrawSciencePatch(320<<FRACBITS, 0 - FixedMul(40<<FRACBITS, FixedDiv(credbgtimer%(TICRATE/2), (TICRATE/2))), V_SNAPTOTOP|V_FLIP, W_CachePatchName("CREDZIGZ", PU_PATCH_LOWPRIORITY), FRACUNIT);
 
 	// Draw pictures
 	for (i = 0; credits_pics[i].patch; i++)
@@ -640,7 +650,7 @@ void F_CreditDrawer(void)
 			sc = FRACUNIT; // quick hack so I don't have to add another field to credits_pics
 		}
 
-		V_DrawFixedPatch(credits_pics[i].x<<FRACBITS, (credits_pics[i].y<<FRACBITS) - 4*(animtimer<<FRACBITS)/5, sc, 0, W_CachePatchName(credits_pics[i].patch, PU_CACHE), colormap);
+		V_DrawFixedPatch(credits_pics[i].x<<FRACBITS, (credits_pics[i].y<<FRACBITS) - 4*(animtimer<<FRACBITS)/5, sc, 0, W_CachePatchName(credits_pics[i].patch, PU_PATCH), colormap);
 	}
 
 	// Dim the background
@@ -839,9 +849,9 @@ void F_GameEvaluationDrawer(void)
 
 		patchname[4] = 'A'+(char)i;
 		if (emeralds & (1<<i))
-			V_DrawScaledPatch(x, y, 0, W_CachePatchName(patchname, PU_CACHE));
+			V_DrawScaledPatch(x, y, 0, W_CachePatchName(patchname, PU_PATCH_LOWPRIORITY));
 		else
-			V_DrawTranslucentPatch(x, y, TRANSLEVEL, W_CachePatchName(patchname, PU_CACHE));
+			V_DrawTranslucentPatch(x, y, TRANSLEVEL, W_CachePatchName(patchname, PU_PATCH_LOWPRIORITY));
 
 		eemeralds_cur += INTERVAL;
 	}
@@ -857,9 +867,6 @@ void F_GameEvaluationDrawer(void)
 			if (ALL7EMERALDS(emeralds))
 				++timesBeatenWithEmeralds;
 
-			/*if (ultimatemode)
-				++timesBeatenUltimate;*/
-
 			if (M_UpdateUnlockablesAndExtraEmblems(false))
 				S_StartSound(NULL, sfx_ncitem);
 
@@ -870,10 +877,10 @@ void F_GameEvaluationDrawer(void)
 	if (finalecount >= 5*TICRATE)
 	{
 		if (drawemblem)
-			V_DrawScaledPatch(120, 192, 0, W_CachePatchName("NWNGA0", PU_CACHE));
+			V_DrawScaledPatch(120, 192, 0, W_CachePatchName("NWNGA0", PU_PATCH_LOWPRIORITY));
 
 		if (drawchaosemblem)
-			V_DrawScaledPatch(200, 192, 0, W_CachePatchName("NWNGA0", PU_CACHE));
+			V_DrawScaledPatch(200, 192, 0, W_CachePatchName("NWNGA0", PU_PATCH_LOWPRIORITY));
 
 		V_DrawString(8, 16, V_YELLOWMAP, "Unlocked:");
 
@@ -968,10 +975,10 @@ void F_StartTitleScreen(void)
 	demoDelayLeft = demoDelayTime;
 	demoIdleLeft = demoIdleTime;
 
-	ttbanner = W_CachePatchName("TTKBANNR", PU_LEVEL);
-	ttkart = W_CachePatchName("TTKART", PU_LEVEL);
-	ttcheckers = W_CachePatchName("TTCHECK", PU_LEVEL);
-	ttkflash = W_CachePatchName("TTKFLASH", PU_LEVEL);
+	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);
 }
 
 // (no longer) De-Demo'd Title Screen
@@ -996,7 +1003,7 @@ void F_TitleScreenDrawer(void)
 		if (finalecount >= 20)
 			V_DrawSmallScaledPatch(84, 87, 0, ttkart);
 		else if (finalecount >= 10)
-			V_DrawSciencePatch((84<<FRACBITS) - 18*(((20 - finalecount)<<FRACBITS) - R_GetHudUncap()), 87<<FRACBITS, 0, ttkart, FRACUNIT/2);
+			V_DrawSciencePatch((84<<FRACBITS) - 18*(((20 - finalecount)<<FRACBITS) - R_GetMenuUncap()), 87<<FRACBITS, 0, ttkart, FRACUNIT/2);
 	}
 	else if (finalecount < 52)
 	{
@@ -1006,14 +1013,14 @@ void F_TitleScreenDrawer(void)
 	else
 	{
 		INT32 transval = 0;
-		
+
 		if (finalecount <= (50+(9<<1)))
 			transval = (finalecount - 50)>>1;
 
 		F_SkyScroll(titlescrollspeed);
 
-		V_DrawSciencePatch(0, -40*FixedDiv(((finalecount % 70)<<FRACBITS) + R_GetHudUncap(), 70<<FRACBITS), V_SNAPTOTOP|V_SNAPTOLEFT, ttcheckers, FRACUNIT);
-		V_DrawSciencePatch(280<<FRACBITS, -(40<<FRACBITS) + 40*FixedDiv(((finalecount % 70)<<FRACBITS) + R_GetHudUncap(), 70<<FRACBITS), V_SNAPTOTOP|V_SNAPTORIGHT, ttcheckers, FRACUNIT);
+		V_DrawSciencePatch(0, -40*FixedDiv(((finalecount % 70)<<FRACBITS) + R_GetMenuUncap(), 70<<FRACBITS), V_SNAPTOTOP|V_SNAPTOLEFT, ttcheckers, FRACUNIT);
+		V_DrawSciencePatch(280<<FRACBITS, -(40<<FRACBITS) + 40*FixedDiv(((finalecount % 70)<<FRACBITS) + R_GetMenuUncap(), 70<<FRACBITS), V_SNAPTOTOP|V_SNAPTORIGHT, ttcheckers, FRACUNIT);
 
 		if (transval)
 			V_DrawFadeScreen(120, 10 - transval);
@@ -1053,8 +1060,8 @@ void F_TitleScreenTicker(boolean run)
 		return;
 
 	// are demos disabled?
-	if (!cv_rollingdemos.value)
-		return;
+	if (!cv_rollingdemos.value || modifiedgame) // occasionally mappacks supply invalid replays which means the game crashes almost always when you idle on the titlescreen too long
+		return;									// we check for all addons since added luas/socs and stuff like that makes them desynch like crazy so why would you even watch them?
 
 	// Wait for a while (for the music to finish, preferably)
 	// before starting demos
@@ -1186,7 +1193,7 @@ void F_StartWaitingPlayers(void)
 	for (i = 0; i < 2; i++)
 	{
 		sprframe = &skins[randskin].spritedef.spriteframes[(6+(i*3)) & FF_FRAMEMASK];
-		driver[i] = W_CachePatchNum(sprframe->lumppat[1], PU_LEVEL);
+		driver[i] = W_CachePatchNum(sprframe->lumppat[1], PU_CACHE);
 	}
 }
 
@@ -1255,15 +1262,15 @@ void F_ContinueDrawer(void)
 		ncontinues = 20;
 
 	if (imcontinuing)
-		contsonic = W_CachePatchName("CONT2", PU_CACHE);
+		contsonic = W_CachePatchName("CONT2", PU_PATCH_LOWPRIORITY);
 	else
-		contsonic = W_CachePatchName("CONT1", PU_CACHE);
+		contsonic = W_CachePatchName("CONT1", PU_PATCH_LOWPRIORITY);
 
 	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
 	V_DrawCenteredString(BASEVIDWIDTH/2, 100, 0, "CONTINUE?");
 
 	// Draw a Sonic!
-	V_DrawScaledPatch((BASEVIDWIDTH - SHORT(contsonic->width))/2, 32, 0, contsonic);
+	V_DrawScaledPatch((BASEVIDWIDTH - contsonic->width)/2, 32, 0, contsonic);
 
 	// Draw the continue markers! Show continues minus one.
 	x -= ncontinues * 6;
@@ -1482,10 +1489,10 @@ void F_CutsceneDrawer(void)
 	{
 		if (cutscenes[cutnum]->scene[scenenum].pichires[picnum])
 			V_DrawSmallScaledPatch(picxpos, picypos, 0,
-				W_CachePatchName(cutscenes[cutnum]->scene[scenenum].picname[picnum], PU_CACHE));
+				W_CachePatchName(cutscenes[cutnum]->scene[scenenum].picname[picnum], PU_PATCH_LOWPRIORITY));
 		else
 			V_DrawScaledPatch(picxpos,picypos, 0,
-				W_CachePatchName(cutscenes[cutnum]->scene[scenenum].picname[picnum], PU_CACHE));
+				W_CachePatchName(cutscenes[cutnum]->scene[scenenum].picname[picnum], PU_PATCH_LOWPRIORITY));
 	}
 
 	if (dofadenow && rendermode != render_none)
diff --git a/src/f_wipe.c b/src/f_wipe.c
index da5b9dac1..cbb411b8b 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -273,7 +273,7 @@ static void F_DoWipe(fademask_t *fademask)
 			else
 			{
 				// pointer to transtable that this mask would use
-				transtbl = transtables + ((9 - *mask)<<FF_TRANSSHIFT);
+				transtbl = R_GetTranslucencyTable((9 - *mask) + 1);
 
 				// DRAWING LOOP
 				while (draw_linestogo--)
@@ -313,7 +313,7 @@ void F_WipeStartScreen(void)
 		return;
 	}
 #endif
-	wipe_scr_start = screens[3];
+	wipe_scr_start = vid.screens[3];
 	I_ReadScreen(wipe_scr_start);
 #endif
 }
@@ -330,7 +330,7 @@ void F_WipeEndScreen(void)
 		return;
 	}
 #endif
-	wipe_scr_end = screens[4];
+	wipe_scr_end = vid.screens[4];
 	I_ReadScreen(wipe_scr_end);
 	V_DrawBlock(0, 0, 0, vid.width, vid.height, wipe_scr_start);
 #endif
@@ -353,7 +353,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
 
 	// Init the wipe
 	WipeInAction = true;
-	wipe_scr = screens[0];
+	wipe_scr = vid.screens[0];
 
 	// lastwipetic should either be 0 or the tic we last wiped
 	// on for fade-to-black
diff --git a/src/filesrch.c b/src/filesrch.c
index 3a3a576ce..060e57d21 100644
--- a/src/filesrch.c
+++ b/src/filesrch.c
@@ -327,7 +327,8 @@ char menupath[1024];
 size_t menupathindex[menudepth];
 size_t menudepthleft = menudepth;
 
-char menusearch[MAXSTRINGLENGTH+1];
+char menusearchbuf[MAXSTRINGLENGTH+1];
+textinput_t menusearch;
 
 char **dirmenu, **coredirmenu; // core only local for this file
 size_t sizedirmenu, sizecoredirmenu; // ditto
@@ -364,8 +365,8 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 	char searchpath[1024];
 	size_t *searchpathindex;
 
-	dirhandle = (DIR**) malloc(maxsearchdepth * sizeof (DIR*));
-	searchpathindex = (size_t *) malloc(maxsearchdepth * sizeof (size_t));
+	dirhandle = (DIR**) malloc(maxsearchdepth * sizeof(DIR*));
+	searchpathindex = (size_t *) malloc(maxsearchdepth * sizeof(size_t));
 
 	strcpy(searchpath,startpath);
 	searchpathindex[--depthleft] = strlen(searchpath) + 1;
@@ -409,14 +410,14 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 		}
 
 		// okay, now we actually want searchpath to incorporate d_name
-		strcpy(&searchpath[searchpathindex[depthleft]],dent->d_name);
+		strcpy(&searchpath[searchpathindex[depthleft]], dent->d_name);
 
 #if defined(__linux__) || defined(__FreeBSD__)
-		if (dent->d_type == DT_UNKNOWN && lstat(searchpath,&fsstat) == 0)
+		if (dent->d_type == DT_UNKNOWN && lstat(searchpath, &fsstat) == 0)
 		{
 			if (S_ISDIR(fsstat.st_mode))
 				dent->d_type = DT_DIR;
-            else if (S_ISLNK(fsstat.st_mode))
+			else if (S_ISLNK(fsstat.st_mode))
 				dent->d_type = DT_LNK;
 		}
 
@@ -438,11 +439,12 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 		{
 			searchpathindex[--depthleft] = strlen(searchpath) + 1;
 			dirhandle[depthleft] = opendir(searchpath);
+
 			if (!dirhandle[depthleft])
 			{
-					// can't open it... maybe no read-permissions
-					// go back to previous dir
-					depthleft++;
+				// can't open it... maybe no read-permissions
+				// go back to previous dir
+				depthleft++;
 			}
 
 			searchpath[searchpathindex[depthleft]-1] = PATHSEP[0];
@@ -454,9 +456,9 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 			{
 				case FS_FOUND:
 					if (completepath)
-						strcpy(filename,searchpath);
+						strcpy(filename, searchpath);
 					else
-						strcpy(filename,dent->d_name);
+						strcpy(filename, dent->d_name);
 					retval = FS_FOUND;
 					found = 1;
 					break;
@@ -497,7 +499,7 @@ static boolean filemenucmp(char *haystack, char *needle)
 		strupr(localhaystack);
 	if (cv_addons_search_type.value)
 		return (strstr(localhaystack, needle) != 0);
-	return (!strncmp(localhaystack, needle, menusearch[0]));
+	return (!strncmp(localhaystack, needle, menusearch.length));
 }
 
 void closefilemenu(boolean validsize)
@@ -563,7 +565,7 @@ void searchfilemenu(char *tempname)
 
 	first = (((UINT8)(coredirmenu[0][DIR_TYPE]) == EXT_UP) ? 1 : 0); // skip UP...
 
-	if (!menusearch[0])
+	if (!menusearch.length)
 	{
 		if (dirmenu)
 			Z_Free(dirmenu);
@@ -590,7 +592,7 @@ void searchfilemenu(char *tempname)
 		return;
 	}
 
-	strcpy(localmenusearch, menusearch+1);
+	strcpy(localmenusearch, menusearch.buffer);
 	if (!cv_addons_search_case.value)
 		strupr(localmenusearch);
 
@@ -652,7 +654,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 			tempname = Z_StrDup(dirmenu[dir_on[menudepthleft]]+DIR_STRING); // don't need to I_Error if can't make - not important, just QoL
 	}
 	else
-		menusearch[0] = menusearch[1] = 0; // clear search
+		M_TextInputInit(&menusearch, menusearchbuf, MAXSTRINGLENGTH+1);
 
 	if (!(dirhandle = opendir(menupath))) // get directory
 	{
@@ -660,6 +662,10 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 		return false;
 	}
 
+	if (dirmenu != coredirmenu)
+		Z_Free(dirmenu);
+	dirmenu = NULL;
+
 	for (; sizecoredirmenu > 0; sizecoredirmenu--) // clear out existing items
 	{
 		Z_Free(coredirmenu[sizecoredirmenu-1]);
@@ -796,7 +802,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 					}
 					else if (ext == EXT_TXT)
 					{
-						if (!strcmp(dent->d_name, "log.txt") || !strcmp(dent->d_name, "errorlog.txt"))
+						if (!strncmp(dent->d_name, "log-", 4) || !strcmp(dent->d_name, "errorlog.txt"))
 							ext |= EXT_LOADED;
 					}
 
diff --git a/src/filesrch.h b/src/filesrch.h
index dd0fb404a..075895cb0 100644
--- a/src/filesrch.h
+++ b/src/filesrch.h
@@ -4,9 +4,14 @@
 #ifndef __FILESRCH_H__
 #define __FILESRCH_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomdef.h"
 #include "d_netfil.h"
 #include "m_menu.h" // MAXSTRINGLENGTH
+#include "m_textinput.h"
 
 extern consvar_t cv_addons_option, cv_addons_folder, cv_addons_md5, cv_addons_showall, cv_addons_search_case, cv_addons_search_type;
 
@@ -34,7 +39,8 @@ extern char menupath[1024];
 extern size_t menupathindex[menudepth];
 extern size_t menudepthleft;
 
-extern char menusearch[MAXSTRINGLENGTH+1];
+extern char menusearchbuf[MAXSTRINGLENGTH+1];
+extern textinput_t menusearch;
 
 extern char **dirmenu;
 extern size_t sizedirmenu;
@@ -94,4 +100,8 @@ void closefilemenu(boolean validsize);
 void searchfilemenu(char *tempname);
 boolean preparefilemenu(boolean samedepth, boolean replayhut);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // __FILESRCH_H__
diff --git a/src/g_demo.c b/src/g_demo.c
new file mode 100644
index 000000000..33957fb67
--- /dev/null
+++ b/src/g_demo.c
@@ -0,0 +1,4070 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 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  g_demo.c
+/// \brief Demo recording and playback
+
+#include "doomdef.h"
+#include "console.h"
+#include "d_main.h"
+#include "d_clisrv.h"
+#include "d_player.h"
+#include "f_finale.h"
+#include "filesrch.h" // for refreshdirmenu
+#include "p_setup.h"
+#include "p_saveg.h"
+#include "i_time.h"
+#include "i_system.h"
+#include "am_map.h"
+#include "m_random.h"
+#include "p_local.h"
+#include "r_draw.h"
+#include "r_main.h"
+#include "s_sound.h"
+#include "g_game.h"
+#include "m_cheat.h"
+#include "m_misc.h"
+#include "m_menu.h"
+#include "m_argv.h"
+#include "hu_stuff.h"
+#include "st_stuff.h"
+#include "z_zone.h"
+#include "i_video.h"
+#include "byteptr.h"
+#include "i_joy.h"
+#include "r_local.h"
+#include "r_things.h"
+#include "y_inter.h"
+#include "v_video.h"
+#include "dehacked.h" // get_number (for ghost thok)
+#include "lua_script.h"	// LUA_ArchiveDemo and LUA_UnArchiveDemo
+#include "lua_hook.h"
+#include "lua_libs.h"	// gL (Lua state)
+#include "b_bot.h"
+#include "m_cond.h" // condition sets
+#include "md5.h" // demo checksums
+#include "k_director.h" // SRB2kart
+#include "k_kart.h" // SRB2kart
+#include "k_stats.h" // SRB2kart
+#include "r_fps.h" // frame interpolation/uncapped
+
+#ifdef HAVE_DISCORDRPC
+#include "discord.h"
+#endif
+
+// for replay dates
+#include <time.h>
+#include <locale.h>
+
+// menu demo things
+UINT8  numDemos      = 0; //3; -- i'm FED UP of losing my skincolour to a broken demo. change this back when we make new ones
+UINT32 demoDelayTime = 15*TICRATE;
+UINT32 demoIdleTime  = 3*TICRATE;
+
+boolean nodrawers; // for comparative timing purposes
+boolean noblit; // for comparative timing purposes
+static tic_t demostarttime; // for comparative timing purposes
+
+//@TODO put these all in a struct for namespacing purposes?
+static char demoname[128];
+savebuffer_t demobuf;
+static UINT8 *demotime_p, *demoinfo_p;
+static UINT8 *demoend;
+static UINT8 demoflags;
+static boolean demosynced = true; // console warning message
+
+struct demovars_s demo;
+
+boolean metalrecording; // recording as metal sonic
+mobj_t *metalplayback;
+static UINT8 *metalbuffer = NULL;
+static UINT8 *metal_p;
+static UINT16 metalversion;
+
+consvar_t cv_resyncdemo = {"resyncdemo", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+// extra data stuff (events registered this frame while recording)
+static struct {
+	UINT8 flags; // EZT flags
+
+	// EZT_COLOR
+	UINT8 color, lastcolor;
+
+	// EZT_SCALE
+	fixed_t scale, lastscale;
+
+	// EZT_KART
+	INT32 kartitem, kartamount, kartbumpers;
+
+	UINT8 desyncframes; // Don't try to resync unless we've been off for two frames, to monkeypatch a few trouble spots
+
+	// EZT_HIT
+	UINT16 hits;
+	mobj_t **hitlist;
+} ghostext[MAXPLAYERS];
+
+// Your naming conventions are stupid and useless.
+// There is no conflict here.
+demoghost *ghosts = NULL;
+
+static CV_PossibleValue_t recordmultiplayerdemos_cons_t[] = {{0, "Disabled"}, {1, "Manual Save"}, {2, "Auto Save"}, {0, NULL}};
+consvar_t cv_recordmultiplayerdemos = {"netdemo_record", "Manual Save", CV_SAVE, recordmultiplayerdemos_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t netdemosyncquality_cons_t[] = {{1, "MIN"}, {35, "MAX"}, {0, NULL}};
+consvar_t cv_netdemosyncquality = {"netdemo_syncquality", "1", CV_SAVE, netdemosyncquality_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+// Units are MiB.
+static CV_PossibleValue_t maxdemosize_cons_t[] = {{10, "MIN"}, {100, "MAX"}, {0, NULL}};
+consvar_t cv_maxdemosize = {"maxdemosize", "10", CV_SAVE, maxdemosize_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t demochangemap_cons_t[] = {{0, "Disabled"}, {1, "Diff Map"}, {2, "Always"}, {0, NULL}};
+consvar_t cv_demochangemap = {"netdemo_savemapchange", "Disabled", CV_SAVE, demochangemap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t demodateformat_cons_t[] = {{0, "Automatic"}, {1, "EU"}, {2, "US"}, {0, NULL}};
+consvar_t cv_demodateformat = {"netdemo_dateformat", "Automatic", CV_SAVE, demodateformat_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+#define DEMOVERSION 0x0002
+#define DEMOHEADER  "\xF0" "KartReplay" "\x0F"
+
+#define DF_GHOST        0x01 // This demo contains ghost data too!
+#define DF_RECORDATTACK 0x02 // This demo is from record attack and contains its final completion time!
+#define DF_NIGHTSATTACK 0x04 // This demo is from NiGHTS attack and contains its time left, score, and mares!
+#define DF_ATTACKMASK   0x06 // This demo is from ??? attack and contains ???
+
+#define DF_LUAVARS		0x20 // this demo contains extra lua vars; this is mostly used for backwards compability
+
+#define DF_ATTACKSHIFT  1
+#define DF_ENCORE       0x40
+#define DF_MULTIPLAYER  0x80 // This demo was recorded in multiplayer mode!
+
+#ifdef DEMO_COMPAT_100
+#define DF_FILELIST     0x08 // This demo contains an extra files list
+#define DF_GAMETYPEMASK 0x30
+#define DF_GAMESHIFT    4
+#endif
+
+#define DEMO_SPECTATOR 0x40
+
+// For demos
+#define ZT_FWD     0x01
+#define ZT_SIDE    0x02
+#define ZT_ANGLE   0x04
+#define ZT_BUTTONS 0x08
+#define ZT_AIMING  0x10
+#define ZT_DRIFT   0x20
+#define ZT_LATENCY 0x40
+#define DEMOMARKER 0x80 // demoend
+
+UINT8 demo_extradata[MAXPLAYERS];
+UINT8 demo_writerng; // 0=no, 1=yes, 2=yes but on a timeout
+static ticcmd_t oldcmd[MAXPLAYERS];
+
+#define DW_END        0xFF // End of extradata block
+#define DW_RNG        0xFE // Check RNG seed!
+
+#define DW_EXTRASTUFF 0xFE // Numbers below this are reserved for writing player slot data
+
+// Below consts are only used for demo extrainfo sections
+#define DW_STANDING 0x00
+
+// For Metal Sonic and time attack ghosts
+#define GZT_XYZ    0x01
+#define GZT_MOMXY  0x02
+#define GZT_MOMZ   0x04
+#define GZT_ANGLE  0x08
+// Not used for Metal Sonic
+#define GZT_SPRITE 0x10 // Animation frame
+#define GZT_EXTRA  0x20
+#define GZT_NIGHTS 0x40 // NiGHTS Mode stuff!
+
+// GZT_EXTRA flags
+#define EZT_THOK   0x01 // Spawned a thok object
+#define EZT_SPIN   0x02 // Because one type of thok object apparently wasn't enough
+#define EZT_REV    0x03 // And two types wasn't enough either yet
+#define EZT_THOKMASK 0x03
+#define EZT_COLOR  0x04 // Changed color (Super transformation, Mario fireflowers/invulnerability, etc.)
+#define EZT_FLIP   0x08 // Reversed gravity
+#define EZT_SCALE  0x10 // Changed size
+#define EZT_HIT    0x20 // Damaged a mobj
+#define EZT_SPRITE 0x40 // Changed sprite set completely out of PLAY (NiGHTS, SOCs, whatever)
+#define EZT_KART   0x80 // SRB2Kart: Changed current held item/quantity and bumpers for battle
+
+static mobj_t oldmetal, oldghost[MAXPLAYERS];
+
+static void G_ResetDemoPlayback(char *pdemoname);
+
+void G_SaveMetal(UINT8 **buffer)
+{
+	I_Assert(buffer != NULL && *buffer != NULL);
+
+	WRITEUINT32(*buffer, metal_p - metalbuffer);
+}
+
+void G_LoadMetal(UINT8 **buffer)
+{
+	I_Assert(buffer != NULL && *buffer != NULL);
+
+	G_DoPlayMetal();
+	metal_p = metalbuffer + READUINT32(*buffer);
+}
+
+ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
+{
+	return M_Memcpy(dest, src, n*sizeof(*src));
+}
+
+ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
+{
+	size_t i;
+	for (i = 0; i < n; i++)
+	{
+		dest[i].forwardmove = src[i].forwardmove;
+		dest[i].sidemove = src[i].sidemove;
+		dest[i].angleturn = SHORT(src[i].angleturn);
+		dest[i].aiming = (INT16)SHORT(src[i].aiming);
+		dest[i].buttons = (UINT16)SHORT(src[i].buttons);
+		dest[i].driftturn = (INT16)SHORT(src[i].driftturn);
+		dest[i].latency = (INT16)SHORT(src[i].latency);
+	}
+	return dest;
+}
+
+// Finds a skin with the closest stats if the expected skin doesn't exist.
+static INT32 GetSkinNumClosestToStats(UINT8 kartspeed, UINT8 kartweight)
+{
+	INT32 i, closest_skin = 0;
+	UINT8 closest_stats = UINT8_MAX, stat_diff;
+
+	for (i = 0; i < numskins; i++)
+	{
+		stat_diff = abs(skins[i].kartspeed - kartspeed) + abs(skins[i].kartweight - kartweight);
+		if (stat_diff < closest_stats)
+		{
+			closest_stats = stat_diff;
+			closest_skin = i;
+		}
+	}
+
+	return closest_skin;
+}
+
+static void FindClosestSkinForStats(UINT32 p, UINT8 kartspeed, UINT8 kartweight)
+{
+	INT32 closest_skin = GetSkinNumClosestToStats(kartspeed, kartweight);
+
+	//CONS_Printf("Using %s instead...\n", skins[closest_skin].name);
+	SetPlayerSkinByNum(p, closest_skin);
+}
+
+void G_ReadDemoExtraData(void)
+{
+	INT32 p, extradata, i;
+	char name[17];
+
+	if (leveltime > starttime)
+	{
+		rewind_t *rewind = CL_SaveRewindPoint(demobuf.p - demobuf.buffer);
+		if (rewind)
+		{
+			memcpy(rewind->oldcmd, oldcmd, sizeof (oldcmd));
+			memcpy(rewind->oldghost, oldghost, sizeof (oldghost));
+		}
+	}
+
+	memset(name, '\0', 17);
+
+	p = READUINT8(demobuf.p);
+
+	while (p < DW_EXTRASTUFF)
+	{
+		extradata = READUINT8(demobuf.p);
+
+		if (extradata & DXD_RESPAWN)
+		{
+			if (players[p].mo)
+				P_DamageMobj(players[p].mo, NULL, NULL, DMG_INSTAKILL); // Is this how this should work..?
+		}
+		if (extradata & DXD_SKIN)
+		{
+			UINT8 kartspeed, kartweight;
+
+			// Skin
+			M_Memcpy(name, demobuf.p, 16);
+			demobuf.p += 16;
+			SetPlayerSkin(p, name);
+
+			kartspeed = READUINT8(demobuf.p);
+			kartweight = READUINT8(demobuf.p);
+
+			if (stricmp(skins[players[p].skin].name, name) != 0)
+				FindClosestSkinForStats(p, kartspeed, kartweight);
+
+			players[p].kartspeed = kartspeed;
+			players[p].kartweight = kartweight;
+		}
+		if (extradata & DXD_COLOR)
+		{
+			// Color
+			M_Memcpy(name, demobuf.p, 16);
+			demobuf.p += 16;
+			for (i = 0; i < MAXSKINCOLORS; i++)
+				if (!stricmp(KartColor_Names[i], name))				// SRB2kart
+				{
+					players[p].skincolor = i;
+					if (players[p].mo)
+						players[p].mo->color = i;
+					break;
+				}
+		}
+		if (extradata & DXD_NAME)
+		{
+			// Name
+			M_Memcpy(player_names[p],demobuf.p,16);
+			demobuf.p += 16;
+		}
+		if (extradata & DXD_PLAYSTATE)
+		{
+			extradata = READUINT8(demobuf.p);
+
+			switch (extradata) {
+			case DXD_PST_PLAYING:
+				players[p].pflags |= PF_WANTSTOJOIN; // fuck you
+				break;
+
+			case DXD_PST_SPECTATING:
+				players[p].pflags &= ~PF_WANTSTOJOIN; // double-fuck you
+				if (!playeringame[p])
+				{
+					CL_ClearPlayer(p);
+					playeringame[p] = true;
+					G_AddPlayer(p);
+					players[p].spectator = true;
+
+					// There's likely an off-by-one error in timing recording or playback of joins. This hacks around it so I don't have to find out where that is. \o/
+					if (oldcmd[p].forwardmove)
+						P_RandomByte();
+				}
+				else
+				{
+					players[p].spectator = true;
+					if (players[p].mo)
+						P_DamageMobj(players[p].mo, NULL, NULL, DMG_INSTAKILL);
+					else
+						players[p].playerstate = PST_REBORN;
+				}
+				break;
+
+			case DXD_PST_LEFT:
+				CL_RemovePlayer(p, 0);
+				break;
+			}
+
+			G_ResetViews();
+
+			// maybe these are necessary?
+			if (G_BattleGametype())
+				K_CheckBumpers(); // SRB2Kart
+			else if (G_RaceGametype())
+				P_CheckRacers(); // also SRB2Kart
+		}
+
+
+		p = READUINT8(demobuf.p);
+	}
+
+	while (p != DW_END)
+	{
+		UINT32 rng;
+		UINT32 checkrng;
+
+		switch (p)
+		{
+		case DW_RNG:
+			rng = READUINT32(demobuf.p);
+			checkrng = P_GetRandSeed();
+			if (checkrng != rng)
+			{
+				if (demosynced)
+				{
+					CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced (RNG)!\n"));
+					CONS_Printf("expected rng %d got %d\n", rng, checkrng);
+				}
+				demosynced = false;
+
+				P_SetRandSeed(rng);
+			}
+		}
+
+		p = READUINT8(demobuf.p);
+	}
+
+	if (!(demoflags & DF_GHOST) && *demobuf.p == DEMOMARKER)
+	{
+		// end of demo data stream
+		G_CheckDemoStatus();
+		return;
+	}
+}
+
+void G_WriteDemoExtraData(void)
+{
+	INT32 i;
+	char name[17];
+
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		if (demo_extradata[i])
+		{
+			WRITEUINT8(demobuf.p, i);
+			WRITEUINT8(demobuf.p, demo_extradata[i]);
+
+			//if (demo_extradata[i] & DXD_RESPAWN) has no extra data
+			if (demo_extradata[i] & DXD_SKIN)
+			{
+				// Skin
+				memset(name, 0, 16);
+				strncpy(name, skins[players[i].skin].name, 16);
+				M_Memcpy(demobuf.p,name,16);
+				demobuf.p += 16;
+
+				WRITEUINT8(demobuf.p, skins[players[i].skin].kartspeed);
+				WRITEUINT8(demobuf.p, skins[players[i].skin].kartweight);
+			}
+			if (demo_extradata[i] & DXD_COLOR)
+			{
+				// Color
+				memset(name, 0, 16);
+				strncpy(name, KartColor_Names[players[i].skincolor], 16);
+				M_Memcpy(demobuf.p,name,16);
+				demobuf.p += 16;
+			}
+			if (demo_extradata[i] & DXD_NAME)
+			{
+				// Name
+				memset(name, 0, 16);
+				memcpy(name, player_names[i], 15); // Keeping 1 null byte for safety, sorry players with name containing more than 15 characters
+				M_Memcpy(demobuf.p,name,16);
+				demobuf.p += 16;
+			}
+			if (demo_extradata[i] & DXD_PLAYSTATE)
+			{
+				demo_writerng = 1;
+				if (!playeringame[i])
+					WRITEUINT8(demobuf.p, DXD_PST_LEFT);
+				else if (
+					players[i].spectator &&
+					!(players[i].pflags & PF_WANTSTOJOIN) // <= fuck you specifically
+				)
+					WRITEUINT8(demobuf.p, DXD_PST_SPECTATING);
+				else
+					WRITEUINT8(demobuf.p, DXD_PST_PLAYING);
+			}
+		}
+
+		demo_extradata[i] = 0;
+	}
+
+	// May not be necessary, but might as well play it safe...
+	if ((leveltime & 255) == 128)
+		demo_writerng = 1;
+
+	{
+		static UINT8 timeout = 0;
+
+		if (timeout) timeout--;
+
+		if (demo_writerng == 1 || (demo_writerng == 2 && timeout == 0))
+		{
+			demo_writerng = 0;
+			timeout = 16;
+			WRITEUINT8(demobuf.p, DW_RNG);
+			WRITEUINT32(demobuf.p, P_GetRandSeed());
+		}
+	}
+
+	WRITEUINT8(demobuf.p, DW_END);
+}
+
+void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
+{
+	UINT8 ziptic;
+
+	if (!demobuf.p || !demo.deferstart)
+		return;
+	ziptic = READUINT8(demobuf.p);
+
+	if (ziptic & ZT_FWD)
+		oldcmd[playernum].forwardmove = READSINT8(demobuf.p);
+	if (ziptic & ZT_SIDE)
+		oldcmd[playernum].sidemove = READSINT8(demobuf.p);
+	if (ziptic & ZT_ANGLE)
+		oldcmd[playernum].angleturn = READINT16(demobuf.p);
+	if (ziptic & ZT_BUTTONS)
+		oldcmd[playernum].buttons = READUINT16(demobuf.p);
+	if (ziptic & ZT_AIMING)
+		oldcmd[playernum].aiming = READINT16(demobuf.p);
+	if (ziptic & ZT_DRIFT)
+		oldcmd[playernum].driftturn = READINT16(demobuf.p);
+	if (ziptic & ZT_LATENCY)
+		oldcmd[playernum].latency = READUINT8(demobuf.p);
+
+	G_CopyTiccmd(cmd, &oldcmd[playernum], 1);
+
+	// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
+	if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
+		|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
+		|| (players[displayplayers[0]].kartstuff[k_respawn]) // Respawning
+		|| (players[displayplayers[0]].spectator || objectplacing)) // Not a physical player
+		&& !(players[displayplayers[0]].kartstuff[k_spinouttimer] && players[displayplayers[0]].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
+		localangle[0] += (cmd->angleturn<<16);
+
+	if (!(demoflags & DF_GHOST) && *demobuf.p == DEMOMARKER)
+	{
+		// end of demo data stream
+		G_CheckDemoStatus();
+		return;
+	}
+}
+
+void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
+{
+	char ziptic = 0;
+	UINT8 *ziptic_p;
+
+	if (!demobuf.p)
+		return;
+
+	ziptic_p = demobuf.p++; // the ziptic, written at the end of this function
+
+	if (cmd->forwardmove != oldcmd[playernum].forwardmove)
+	{
+		WRITEUINT8(demobuf.p,cmd->forwardmove);
+		oldcmd[playernum].forwardmove = cmd->forwardmove;
+		ziptic |= ZT_FWD;
+	}
+
+	if (cmd->sidemove != oldcmd[playernum].sidemove)
+	{
+		WRITEUINT8(demobuf.p,cmd->sidemove);
+		oldcmd[playernum].sidemove = cmd->sidemove;
+		ziptic |= ZT_SIDE;
+	}
+
+	if (cmd->angleturn != oldcmd[playernum].angleturn)
+	{
+		WRITEINT16(demobuf.p,cmd->angleturn);
+		oldcmd[playernum].angleturn = cmd->angleturn;
+		ziptic |= ZT_ANGLE;
+	}
+
+	if (cmd->buttons != oldcmd[playernum].buttons)
+	{
+		WRITEUINT16(demobuf.p,cmd->buttons);
+		oldcmd[playernum].buttons = cmd->buttons;
+		ziptic |= ZT_BUTTONS;
+	}
+
+	if (cmd->aiming != oldcmd[playernum].aiming)
+	{
+		WRITEINT16(demobuf.p,cmd->aiming);
+		oldcmd[playernum].aiming = cmd->aiming;
+		ziptic |= ZT_AIMING;
+	}
+
+	if (cmd->driftturn != oldcmd[playernum].driftturn)
+	{
+		WRITEINT16(demobuf.p,cmd->driftturn);
+		oldcmd[playernum].driftturn = cmd->driftturn;
+		ziptic |= ZT_DRIFT;
+	}
+
+	if (cmd->latency != oldcmd[playernum].latency)
+	{
+		WRITEUINT8(demobuf.p,cmd->latency);
+		oldcmd[playernum].latency = cmd->latency;
+		ziptic |= ZT_LATENCY;
+	}
+
+	*ziptic_p = ziptic;
+
+	// attention here for the ticcmd size!
+	// latest demos with mouse aiming byte in ticcmd
+	if (!(demoflags & DF_GHOST) && ziptic_p > demoend - 9)
+	{
+		G_CheckDemoStatus(); // no more space
+		return;
+	}
+}
+
+void G_GhostAddThok(INT32 playernum)
+{
+	if (!demo.recording || !(demoflags & DF_GHOST))
+		return;
+
+	ghostext[playernum].flags = (ghostext[playernum].flags & ~EZT_THOKMASK) | EZT_THOK;
+}
+
+void G_GhostAddSpin(INT32 playernum)
+{
+	if (!demo.recording || !(demoflags & DF_GHOST))
+		return;
+
+	ghostext[playernum].flags = (ghostext[playernum].flags & ~EZT_THOKMASK) | EZT_SPIN;
+}
+
+void G_GhostAddRev(INT32 playernum)
+{
+	if (!demo.recording || !(demoflags & DF_GHOST))
+		return;
+
+	ghostext[playernum].flags = (ghostext[playernum].flags & ~EZT_THOKMASK) | EZT_REV;
+}
+
+void G_GhostAddFlip(INT32 playernum)
+{
+	if (!demo.recording || !(demoflags & DF_GHOST))
+		return;
+
+	ghostext[playernum].flags |= EZT_FLIP;
+}
+
+void G_GhostAddColor(INT32 playernum, ghostcolor_t color)
+{
+	if (!demo.recording || !(demoflags & DF_GHOST))
+		return;
+
+	if (ghostext[playernum].lastcolor == (UINT8)color)
+	{
+		ghostext[playernum].flags &= ~EZT_COLOR;
+		return;
+	}
+
+	ghostext[playernum].flags |= EZT_COLOR;
+	ghostext[playernum].color = (UINT8)color;
+}
+
+void G_GhostAddScale(INT32 playernum, fixed_t scale)
+{
+	if (!demo.recording || !(demoflags & DF_GHOST))
+		return;
+
+	if (ghostext[playernum].lastscale == scale)
+	{
+		ghostext[playernum].flags &= ~EZT_SCALE;
+		return;
+	}
+
+	ghostext[playernum].flags |= EZT_SCALE;
+	ghostext[playernum].scale = scale;
+}
+
+void G_GhostAddHit(INT32 playernum, mobj_t *victim)
+{
+	if (!demo.recording || !(demoflags & DF_GHOST))
+		return;
+
+	ghostext[playernum].flags |= EZT_HIT;
+	ghostext[playernum].hits++;
+	ghostext[playernum].hitlist = Z_Realloc(ghostext[playernum].hitlist, ghostext[playernum].hits * sizeof(mobj_t *), PU_LEVEL, &ghostext[playernum].hitlist);
+	P_SetTarget(ghostext[playernum].hitlist + (ghostext[playernum].hits-1), victim);
+}
+
+void G_WriteAllGhostTics(void)
+{
+	if (!demobuf.p)
+		return;
+
+	UINT8 *save_demo_p = demobuf.p;
+#define CHECKSPACE(num) if (demobuf.p+(num) > demoend) { demobuf.p = save_demo_p; G_CheckDemoStatus(); return; }
+
+	boolean toobig = false;
+	INT32 i, counter = leveltime;
+
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		if (!playeringame[i] || players[i].spectator)
+			continue;
+
+		if (P_MobjWasRemoved(players[i].mo))
+			continue;
+
+		counter++;
+
+		if (multiplayer && ((counter % cv_netdemosyncquality.value) != 0)) // Only write 1 in this many ghost datas per tic to cut down on multiplayer replay size.
+			continue;
+
+		if (((ghostext[i].flags && (ghostext[i].flags & EZT_HIT)) || ghostext[i].hits)
+			&& !ghostext[i].hitlist) // hitlist might be freed during resynch, beware PU_LEVEL!
+		{
+			ghostext[i].hits = 0;
+			continue;
+		}
+
+		CHECKSPACE(1);
+
+		WRITEUINT8(demobuf.p, i);
+		G_WriteGhostTic(players[i].mo, i);
+
+		// attention here for the ticcmd size!
+		// latest demos with mouse aiming byte in ticcmd
+		if (demobuf.p >= demoend - (13 + 9 + 9))
+		{
+			toobig = true;
+			break;
+		}
+	}
+
+	CHECKSPACE(1);
+	WRITEUINT8(demobuf.p, 0xFF);
+
+	if (toobig)
+	{
+		G_CheckDemoStatus(); // no more space
+		return;
+	}
+
+#undef CHECKSPACE
+}
+
+void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
+{
+	char ziptic = 0;
+	UINT8 *ziptic_p;
+	UINT32 i;
+	UINT8 sprite;
+	UINT8 frame;
+
+	if (!demobuf.p)
+		return;
+
+	UINT8 *save_demo_p = demobuf.p;
+#define CHECKSPACE(num) if (demobuf.p+(num) > demoend) { demobuf.p = save_demo_p; G_CheckDemoStatus(); return; }
+
+	if (!(demoflags & DF_GHOST))
+		return; // No ghost data to write.
+
+	if (ghost->player && ghost->player->pflags & PF_NIGHTSMODE && ghost->tracer)
+	{
+		// We're talking about the NiGHTS thing, not the normal platforming thing!
+		ziptic |= GZT_NIGHTS;
+		ghost = ghost->tracer;
+	}
+
+	ziptic_p = demobuf.p++; // the ziptic, written at the end of this function
+
+#define MAXMOM (0x7FFF<<8)
+
+	// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
+	if (abs(ghost->x-oldghost[playernum].x) > MAXMOM
+	|| abs(ghost->y-oldghost[playernum].y) > MAXMOM
+	|| abs(ghost->z-oldghost[playernum].z) > MAXMOM
+	|| ((UINT8)(leveltime & 255) > 0 && (UINT8)(leveltime & 255) <= (UINT8)cv_netdemosyncquality.value)) // Hack to enable slightly nicer resyncing
+	{
+		oldghost[playernum].x = ghost->x;
+		oldghost[playernum].y = ghost->y;
+		oldghost[playernum].z = ghost->z;
+		ziptic |= GZT_XYZ;
+
+		CHECKSPACE(sizeof(fixed_t)*3);
+		WRITEFIXED(demobuf.p, oldghost[playernum].x);
+		WRITEFIXED(demobuf.p, oldghost[playernum].y);
+		WRITEFIXED(demobuf.p, oldghost[playernum].z);
+	}
+	else
+	{
+		// For moving normally:
+		// Store one full byte of movement, plus one byte of fractional movement.
+		INT16 momx = (INT16)((ghost->x-oldghost[playernum].x + (1<<4))>>8);
+		INT16 momy = (INT16)((ghost->y-oldghost[playernum].y + (1<<4))>>8);
+
+		if (momx != oldghost[playernum].momx
+		|| momy != oldghost[playernum].momy)
+		{
+			oldghost[playernum].momx = momx;
+			oldghost[playernum].momy = momy;
+			ziptic |= GZT_MOMXY;
+
+			CHECKSPACE(4);
+
+			WRITEINT16(demobuf.p, momx);
+			WRITEINT16(demobuf.p, momy);
+		}
+
+		momx = (INT16)((ghost->z-oldghost[playernum].z + (1<<4))>>8);
+
+		if (momx != oldghost[playernum].momz)
+		{
+			oldghost[playernum].momz = momx;
+			ziptic |= GZT_MOMZ;
+
+			CHECKSPACE(2);
+
+			WRITEINT16(demobuf.p, momx);
+		}
+
+		// This SHOULD set oldghost.x/y/z to match ghost->x/y/z
+		// but it keeps the fractional loss of one byte,
+		// so it will hopefully be made up for in future tics.
+		oldghost[playernum].x += oldghost[playernum].momx<<8;
+		oldghost[playernum].y += oldghost[playernum].momy<<8;
+		oldghost[playernum].z += oldghost[playernum].momz<<8;
+	}
+
+#undef MAXMOM
+
+	// Only store the 8 most relevant bits of angle
+	// because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
+	// and it does not affect this mode of movement at all anyway.
+	if (ghost->angle>>24 != oldghost[playernum].angle)
+	{
+		oldghost[playernum].angle = ghost->angle>>24;
+		ziptic |= GZT_ANGLE;
+
+		CHECKSPACE(1);
+
+		WRITEUINT8(demobuf.p, oldghost[playernum].angle);
+	}
+
+	// Store the sprite frame.
+	frame = ghost->frame & 0xFF;
+	if (frame != oldghost[playernum].frame)
+	{
+		oldghost[playernum].frame = frame;
+		ziptic |= GZT_SPRITE;
+
+		CHECKSPACE(1);
+
+		WRITEUINT8(demobuf.p, oldghost[playernum].frame);
+	}
+
+	// Check for sprite set changes
+	sprite = ghost->sprite;
+	if (sprite != oldghost[playernum].sprite)
+	{
+		oldghost[playernum].sprite = sprite;
+		ghostext[playernum].flags |= EZT_SPRITE;
+	}
+
+	if (ghost->player)
+	{
+		if (
+			ghostext[playernum].kartitem != ghost->player->kartstuff[k_itemtype] ||
+			ghostext[playernum].kartamount != ghost->player->kartstuff[k_itemamount] ||
+			ghostext[playernum].kartbumpers != ghost->player->kartstuff[k_bumper]
+		)
+		{
+			ghostext[playernum].flags |= EZT_KART;
+			ghostext[playernum].kartitem = ghost->player->kartstuff[k_itemtype];
+			ghostext[playernum].kartamount = ghost->player->kartstuff[k_itemamount];
+			ghostext[playernum].kartbumpers = ghost->player->kartstuff[k_bumper];
+
+		}
+	}
+
+	if (ghostext[playernum].color == ghostext[playernum].lastcolor)
+		ghostext[playernum].flags &= ~EZT_COLOR;
+
+	if (ghostext[playernum].scale == ghostext[playernum].lastscale)
+		ghostext[playernum].flags &= ~EZT_SCALE;
+
+	if (ghostext[playernum].flags)
+	{
+		ziptic |= GZT_EXTRA;
+		WRITEUINT8(demobuf.p, ghostext[playernum].flags);
+
+		if (ghostext[playernum].flags & EZT_COLOR)
+		{
+			CHECKSPACE(1);
+			WRITEUINT8(demobuf.p, ghostext[playernum].color);
+			ghostext[playernum].lastcolor = ghostext[playernum].color;
+		}
+
+		if (ghostext[playernum].flags & EZT_SCALE)
+		{
+			CHECKSPACE(sizeof(fixed_t));
+			WRITEFIXED(demobuf.p, ghostext[playernum].scale);
+			ghostext[playernum].lastscale = ghostext[playernum].scale;
+		}
+
+		if (ghostext[playernum].flags & EZT_HIT)
+		{
+			CHECKSPACE(2);
+			WRITEUINT16(demobuf.p, ghostext[playernum].hits);
+
+			for (i = 0; i < ghostext[playernum].hits; i++)
+			{
+				mobj_t *mo = ghostext[playernum].hitlist[i];
+
+				CHECKSPACE(4+4+2+sizeof(fixed_t)*3+sizeof(angle_t));
+
+				WRITEUINT32(demobuf.p, UINT32_MAX); // reserved for some method of determining exactly which mobj this is. (mobjnum doesn't work here.)
+				WRITEUINT32(demobuf.p, mo->type);
+				WRITEUINT16(demobuf.p, (UINT16)mo->health);
+				WRITEFIXED(demobuf.p, mo->x);
+				WRITEFIXED(demobuf.p, mo->y);
+				WRITEFIXED(demobuf.p, mo->z);
+				WRITEANGLE(demobuf.p, mo->angle);
+				P_SetTarget(ghostext[playernum].hitlist+i, NULL);
+			}
+
+			ghostext[playernum].hits = 0;
+		}
+
+		if (ghostext[playernum].flags & EZT_SPRITE)
+		{
+			CHECKSPACE(1);
+			WRITEUINT8(demobuf.p, sprite);
+		}
+
+		if (ghostext[playernum].flags & EZT_KART)
+		{
+			CHECKSPACE(12);
+			WRITEINT32(demobuf.p, ghostext[playernum].kartitem);
+			WRITEINT32(demobuf.p, ghostext[playernum].kartamount);
+			WRITEINT32(demobuf.p, ghostext[playernum].kartbumpers);
+		}
+
+		ghostext[playernum].flags = 0;
+	}
+
+	*ziptic_p = ziptic;
+#undef CHECKSPACE
+}
+
+void G_ConsAllGhostTics(void)
+{
+	UINT8 p;
+
+	if (!demobuf.p || !demo.deferstart)
+		return;
+
+	p = READUINT8(demobuf.p);
+
+	while (p != 0xFF)
+	{
+		G_ConsGhostTic(p);
+		p = READUINT8(demobuf.p);
+	}
+
+	if (*demobuf.p == DEMOMARKER)
+	{
+		// end of demo data stream
+		G_CheckDemoStatus();
+		return;
+	}
+}
+
+// Uses ghost data to do consistency checks on your position.
+// This fixes desynchronising demos when fighting eggman.
+void G_ConsGhostTic(INT32 playernum)
+{
+	UINT8 ziptic;
+	fixed_t px,py,pz,gx,gy,gz;
+	mobj_t *testmo;
+	fixed_t syncleeway;
+	boolean nightsfail = false;
+
+	if (!(demoflags & DF_GHOST))
+		return; // No ghost data to use.
+
+	testmo = players[playernum].mo;
+
+	// Grab ghost data.
+	ziptic = READUINT8(demobuf.p);
+
+	if (ziptic & GZT_XYZ)
+	{
+		oldghost[playernum].x = READFIXED(demobuf.p);
+		oldghost[playernum].y = READFIXED(demobuf.p);
+		oldghost[playernum].z = READFIXED(demobuf.p);
+		syncleeway = 0;
+	}
+	else
+	{
+		if (ziptic & GZT_MOMXY)
+		{
+			oldghost[playernum].momx = READINT16(demobuf.p)<<8;
+			oldghost[playernum].momy = READINT16(demobuf.p)<<8;
+		}
+
+		if (ziptic & GZT_MOMZ)
+			oldghost[playernum].momz = READINT16(demobuf.p)<<8;
+
+		oldghost[playernum].x += oldghost[playernum].momx;
+		oldghost[playernum].y += oldghost[playernum].momy;
+		oldghost[playernum].z += oldghost[playernum].momz;
+		syncleeway = FRACUNIT;
+	}
+
+	if (ziptic & GZT_ANGLE)
+		demobuf.p++;
+
+	if (ziptic & GZT_SPRITE)
+		demobuf.p++;
+
+	if (ziptic & GZT_NIGHTS)
+	{
+		if (!testmo || !testmo->player || !(testmo->player->pflags & PF_NIGHTSMODE) || !testmo->tracer)
+			nightsfail = true;
+		else
+			testmo = testmo->tracer;
+	}
+
+	if (ziptic & GZT_EXTRA)
+	{ // But wait, there's more!
+		ziptic = READUINT8(demobuf.p);
+		if (ziptic & EZT_COLOR)
+			demobuf.p++;
+
+		if (ziptic & EZT_SCALE)
+			demobuf.p += sizeof(fixed_t);
+
+		if (ziptic & EZT_HIT)
+		{ // Resync mob damage.
+			UINT16 i, count = READUINT16(demobuf.p);
+			thinker_t *th;
+			mobj_t *mobj;
+
+			UINT32 type;
+			UINT16 health;
+			fixed_t x;
+			fixed_t y;
+			fixed_t z;
+
+			for (i = 0; i < count; i++)
+			{
+				demobuf.p += 4; // reserved.
+				type = READUINT32(demobuf.p);
+				health = READUINT16(demobuf.p);
+				x = READFIXED(demobuf.p);
+				y = READFIXED(demobuf.p);
+				z = READFIXED(demobuf.p);
+				demobuf.p += sizeof(angle_t); // angle, unnecessary for cons.
+
+				mobj = NULL;
+				for (th = thinkercap.next; th != &thinkercap; th = th->next)
+				{
+					if (th->function != (actionf_p1)P_MobjThinker)
+						continue;
+					mobj = (mobj_t *)th;
+					if (mobj->type == (mobjtype_t)type && mobj->x == x && mobj->y == y && mobj->z == z)
+						break;
+					mobj = NULL; // wasn't this one, keep searching.
+				}
+
+				if (mobj && mobj->health != health) // Wasn't damaged?! This is desync! Fix it!
+				{
+					if (demosynced)
+					{
+						CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced (health)!\n"));
+						CONS_Printf("expected health %d got %d\n", health, mobj->health);
+					}
+
+					demosynced = false;
+					P_DamageMobj(mobj, players[0].mo, players[0].mo, 1);
+				}
+			}
+		}
+
+		if (ziptic & EZT_SPRITE)
+			demobuf.p++;
+
+		if (ziptic & EZT_KART)
+		{
+			ghostext[playernum].kartitem = READINT32(demobuf.p);
+			ghostext[playernum].kartamount = READINT32(demobuf.p);
+			ghostext[playernum].kartbumpers = READINT32(demobuf.p);
+		}
+	}
+
+	if (testmo)
+	{
+		// Re-synchronise
+		px = testmo->x;
+		py = testmo->y;
+		pz = testmo->z;
+		gx = oldghost[playernum].x;
+		gy = oldghost[playernum].y;
+		gz = oldghost[playernum].z;
+
+		if (nightsfail || abs(px-gx) > syncleeway || abs(py-gy) > syncleeway || abs(pz-gz) > syncleeway)
+		{
+			ghostext[playernum].desyncframes++;
+
+			if (ghostext[playernum].desyncframes >= 2)
+			{
+				if (demosynced)
+					CONS_Alert(CONS_WARNING, "Demo playback has desynced (player %s)!\n", player_names[playernum]);
+				demosynced = false;
+
+				if (cv_resyncdemo.value)
+				{
+					P_UnsetThingPosition(testmo);
+					testmo->x = oldghost[playernum].x;
+					testmo->y = oldghost[playernum].y;
+					P_SetThingPosition(testmo);
+					testmo->z = oldghost[playernum].z;
+				}
+
+				if (abs(testmo->z - testmo->floorz) < 4*FRACUNIT)
+					testmo->z = testmo->floorz; // Sync players to the ground when they're likely supposed to be there...
+
+				ghostext[playernum].desyncframes = 2;
+			}
+		}
+		else
+			ghostext[playernum].desyncframes = 0;
+
+		if (
+#ifdef DEMO_COMPAT_100
+			demo.version != 0x0001 &&
+#endif
+			(
+				players[playernum].kartstuff[k_itemtype] != ghostext[playernum].kartitem ||
+				players[playernum].kartstuff[k_itemamount] != ghostext[playernum].kartamount ||
+				players[playernum].kartstuff[k_bumper] != ghostext[playernum].kartbumpers
+			)
+		)
+		{
+			if (demosynced)
+			{
+				CONS_Alert(CONS_WARNING, "Demo playback has desynced (item/bumpers)!(player %s)!\n", player_names[playernum]);
+				CONS_Printf("expected item type %d got %d\n", ghostext[playernum].kartitem, players[playernum].kartstuff[k_itemtype]);
+				CONS_Printf("expected item amount %d got %d\n", ghostext[playernum].kartamount, players[playernum].kartstuff[k_itemamount]);
+			}
+			demosynced = false;
+
+			players[playernum].kartstuff[k_itemtype] = ghostext[playernum].kartitem;
+			players[playernum].kartstuff[k_itemamount] = ghostext[playernum].kartamount;
+			players[playernum].kartstuff[k_bumper] = ghostext[playernum].kartbumpers;
+		}
+	}
+
+	if (*demobuf.p == DEMOMARKER)
+	{
+		// end of demo data stream
+		G_CheckDemoStatus();
+		return;
+	}
+}
+
+void G_GhostTicker(void)
+{
+	demoghost *g,*p;
+
+	for (g = ghosts, p = NULL; g; g = g->next)
+	{
+		// Skip normal demo data.
+		UINT8 ziptic = READUINT8(g->p);
+
+#ifdef DEMO_COMPAT_100
+		if (g->version != 0x0001)
+		{
+#endif
+		while (ziptic != DW_END) // Get rid of extradata stuff
+		{
+			if (ziptic == 0) // Only support player 0 info for now
+			{
+				ziptic = READUINT8(g->p);
+				if (ziptic & DXD_SKIN)
+					g->p += 18; // We _could_ read this info, but it shouldn't change anything in record attack...
+				if (ziptic & DXD_COLOR)
+					g->p += 16; // Same tbh
+				if (ziptic & DXD_NAME)
+					g->p += 16; // yea
+				if (ziptic & DXD_PLAYSTATE && READUINT8(g->p) != DXD_PST_PLAYING)
+					I_Error("Ghost is not a record attack ghost"); //@TODO lmao don't blow up like this
+			}
+			else if (ziptic == DW_RNG)
+				g->p += 4; // RNG seed
+			else
+				I_Error("Ghost is not a record attack ghost"); //@TODO lmao don't blow up like this
+
+			ziptic = READUINT8(g->p);
+		}
+
+		ziptic = READUINT8(g->p); // Back to actual ziptic stuff
+#ifdef DEMO_COMPAT_100
+		}
+#endif
+
+		if (ziptic & ZT_FWD)
+			g->p++;
+		if (ziptic & ZT_SIDE)
+			g->p++;
+		if (ziptic & ZT_ANGLE)
+			g->p += 2;
+		if (ziptic & ZT_BUTTONS)
+			g->p += 2;
+		if (ziptic & ZT_AIMING)
+			g->p += 2;
+		if (ziptic & ZT_DRIFT)
+			g->p += 2;
+		if (ziptic & ZT_LATENCY)
+			g->p += 1;
+
+		// Grab ghost data.
+		ziptic = READUINT8(g->p);
+
+#ifdef DEMO_COMPAT_100
+		if (g->version != 0x0001)
+		{
+#endif
+		if (ziptic == 0xFF)
+			goto skippedghosttic; // Didn't write ghost info this frame
+		else if (ziptic != 0)
+			I_Error("Ghost is not a record attack ghost"); //@TODO lmao don't blow up like this
+		ziptic = READUINT8(g->p);
+#ifdef DEMO_COMPAT_100
+		}
+#endif
+		if (ziptic & GZT_XYZ)
+		{
+			g->oldmo.x = READFIXED(g->p);
+			g->oldmo.y = READFIXED(g->p);
+			g->oldmo.z = READFIXED(g->p);
+		}
+		else
+		{
+			if (ziptic & GZT_MOMXY)
+			{
+				g->oldmo.momx = READINT16(g->p)<<8;
+				g->oldmo.momy = READINT16(g->p)<<8;
+			}
+			if (ziptic & GZT_MOMZ)
+				g->oldmo.momz = READINT16(g->p)<<8;
+			g->oldmo.x += g->oldmo.momx;
+			g->oldmo.y += g->oldmo.momy;
+			g->oldmo.z += g->oldmo.momz;
+		}
+		if (ziptic & GZT_ANGLE)
+			g->oldmo.angle = READUINT8(g->p)<<24;
+		if (ziptic & GZT_SPRITE)
+			g->oldmo.frame = READUINT8(g->p);
+
+		// Update ghost
+		P_UnsetThingPosition(g->mo);
+		g->mo->x = g->oldmo.x;
+		g->mo->y = g->oldmo.y;
+		g->mo->z = g->oldmo.z;
+		P_SetThingPosition(g->mo);
+		g->mo->angle = g->oldmo.angle;
+		g->mo->frame = g->oldmo.frame | tr_trans30<<FF_TRANSSHIFT;
+
+		if (ziptic & GZT_EXTRA)
+		{ // But wait, there's more!
+			ziptic = READUINT8(g->p);
+			if (ziptic & EZT_COLOR)
+			{
+				g->color = READUINT8(g->p);
+				switch(g->color)
+				{
+				default:
+				case GHC_NORMAL: // Go back to skin color
+					g->mo->color = g->oldmo.color;
+					break;
+				// Handled below
+				case GHC_SUPER:
+				case GHC_INVINCIBLE:
+					break;
+				case GHC_FIREFLOWER: // Fireflower
+					g->mo->color = SKINCOLOR_WHITE;
+					break;
+				}
+			}
+			if (ziptic & EZT_FLIP)
+				g->mo->eflags ^= MFE_VERTICALFLIP;
+			if (ziptic & EZT_SCALE)
+			{
+				g->mo->destscale = READFIXED(g->p);
+				if (g->mo->destscale != g->mo->scale)
+					P_SetScale(g->mo, g->mo->destscale);
+			}
+			if (ziptic & EZT_THOKMASK)
+			{ // Let's only spawn ONE of these per frame, thanks.
+				mobj_t *mobj;
+				INT32 type = -1;
+				if (g->mo->skin)
+				{
+					switch (ziptic & EZT_THOKMASK)
+					{
+					case EZT_THOK:
+						type = (UINT32)mobjinfo[MT_PLAYER].painchance;
+						break;
+					case EZT_SPIN:
+						type = (UINT32)mobjinfo[MT_PLAYER].damage;
+						break;
+					case EZT_REV:
+						type = (UINT32)mobjinfo[MT_PLAYER].raisestate;
+						break;
+					}
+				}
+				if (type != -1)
+				{
+					if (type == MT_GHOST)
+					{
+						mobj = P_SpawnGhostMobj(g->mo); // does a large portion of the work for us
+						mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|tr_trans60<<FF_TRANSSHIFT; // P_SpawnGhostMobj sets trans50, we want trans60
+					}
+					else
+					{
+						mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK);
+						mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
+						mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<<FF_TRANSSHIFT;
+						mobj->tics = -1; // nope.
+						mobj->color = g->mo->color;
+						if (g->mo->eflags & MFE_VERTICALFLIP)
+						{
+							mobj->flags2 |= MF2_OBJECTFLIP;
+							mobj->eflags |= MFE_VERTICALFLIP;
+						}
+						P_SetScale(mobj, g->mo->scale);
+						mobj->destscale = g->mo->scale;
+					}
+					mobj->floorz = mobj->z;
+					mobj->ceilingz = mobj->z+mobj->height;
+					P_UnsetThingPosition(mobj);
+					mobj->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
+					P_SetThingPosition(mobj);
+					mobj->fuse = 8;
+					P_SetTarget(&mobj->target, g->mo);
+				}
+			}
+			if (ziptic & EZT_HIT)
+			{ // Spawn hit poofs for killing things!
+				UINT16 i, count = READUINT16(g->p), health;
+				//UINT32 type;
+				fixed_t x,y,z;
+				angle_t angle;
+				mobj_t *poof;
+				for (i = 0; i < count; i++)
+				{
+					g->p += 4; // reserved
+					g->p += 4; // backwards compat., type used to be here
+					health = READUINT16(g->p);
+					x = READFIXED(g->p);
+					y = READFIXED(g->p);
+					z = READFIXED(g->p);
+					angle = READANGLE(g->p);
+					if (health != 0 || i >= 4) // only spawn for the first 4 hits per frame, to prevent ghosts from splode-spamming too bad.
+						continue;
+					poof = P_SpawnMobj(x, y, z, MT_GHOST);
+					poof->angle = angle;
+					poof->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
+					poof->health = 0;
+					P_SetMobjStateNF(poof, S_XPLD1);
+				}
+			}
+			if (ziptic & EZT_SPRITE)
+				g->mo->sprite = READUINT8(g->p);
+			if (ziptic & EZT_KART)
+				g->p += 12; // kartitem, kartamount, kartbumpers
+		}
+
+#ifdef DEMO_COMPAT_100
+		if (g->version != 0x0001)
+		{
+#endif
+		if (READUINT8(g->p) != 0xFF) // Make sure there isn't other ghost data here.
+			I_Error("Ghost is not a record attack ghost"); //@TODO lmao don't blow up like this
+#ifdef DEMO_COMPAT_100
+		}
+#endif
+
+skippedghosttic:
+		// Tick ghost colors (Super and Mario Invincibility flashing)
+		switch(g->color)
+		{
+		case GHC_SUPER: // Super Sonic (P_DoSuperStuff)
+			g->mo->color = SKINCOLOR_SUPER1;
+			g->mo->color += abs( ( (signed)( (unsigned)leveltime >> 1 ) % 9) - 4);
+			break;
+		case GHC_INVINCIBLE: // Mario invincibility (P_CheckInvincibilityTimer)
+			g->mo->color = (UINT8)(leveltime % MAXSKINCOLORS);
+			break;
+		default:
+			break;
+		}
+
+		// Demo ends after ghost data.
+		if (*g->p == DEMOMARKER)
+		{
+			g->mo->momx = g->mo->momy = g->mo->momz = 0;
+			if (p)
+				p->next = g->next;
+			else
+				ghosts = g->next;
+			Z_Free(g);
+			continue;
+		}
+		p = g;
+	}
+}
+
+// Demo rewinding functions
+typedef struct rewindinfo_s {
+	tic_t leveltime;
+
+	struct {
+		boolean ingame;
+		player_t player;
+		mobj_t mobj;
+	} playerinfo[MAXPLAYERS];
+
+	struct rewindinfo_s *prev;
+} rewindinfo_t;
+
+static tic_t currentrewindnum;
+static rewindinfo_t *rewindhead = NULL; // Reverse chronological order
+
+void G_InitDemoRewind(void)
+{
+	CL_ClearRewinds();
+
+	while (rewindhead)
+	{
+		rewindinfo_t *p = rewindhead->prev;
+		Z_Free(rewindhead);
+		rewindhead = p;
+	}
+
+	currentrewindnum = 0;
+}
+
+void G_StoreRewindInfo(void)
+{
+	static UINT8 timetolog = 8;
+	rewindinfo_t *info;
+	size_t i;
+
+	if (timetolog-- > 0)
+		return;
+	timetolog = 8;
+
+	info = Z_Calloc(sizeof(rewindinfo_t), PU_STATIC, NULL);
+
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		if (!playeringame[i] || players[i].spectator)
+		{
+			info->playerinfo[i].ingame = false;
+			continue;
+		}
+
+		info->playerinfo[i].ingame = true;
+		memcpy(&info->playerinfo[i].player, &players[i], sizeof(player_t));
+		if (players[i].mo)
+			memcpy(&info->playerinfo[i].mobj, players[i].mo, sizeof(mobj_t));
+	}
+
+	info->leveltime = leveltime;
+	info->prev = rewindhead;
+	rewindhead = info;
+}
+
+void G_PreviewRewind(tic_t previewtime)
+{
+	SINT8 i;
+	size_t j;
+	fixed_t tweenvalue = 0;
+	rewindinfo_t *info = rewindhead, *next_info = rewindhead;
+
+	if (!info)
+		return;
+
+	while (info->leveltime > previewtime && info->prev)
+	{
+		next_info = info;
+		info = info->prev;
+	}
+	if (info != next_info)
+		tweenvalue = FixedDiv(previewtime - info->leveltime, next_info->leveltime - info->leveltime);
+
+
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		if (!playeringame[i] || players[i].spectator)
+		{
+			if (info->playerinfo[i].player.mo)
+			{
+				//@TODO spawn temp object to act as a player display
+			}
+
+			continue;
+		}
+
+		if (!info->playerinfo[i].ingame || !info->playerinfo[i].player.mo)
+		{
+			if (players[i].mo)
+				players[i].mo->flags2 |= MF2_DONTDRAW;
+
+			continue;
+		}
+
+		if (!players[i].mo)
+			continue; //@TODO spawn temp object to act as a player display
+
+		players[i].mo->flags2 &= ~MF2_DONTDRAW;
+
+		P_UnsetThingPosition(players[i].mo);
+#define TWEEN(pr) info->playerinfo[i].mobj.pr + FixedMul((INT32) (next_info->playerinfo[i].mobj.pr - info->playerinfo[i].mobj.pr), tweenvalue)
+		players[i].mo->x = TWEEN(x);
+		players[i].mo->y = TWEEN(y);
+		players[i].mo->z = TWEEN(z);
+		players[i].mo->angle = TWEEN(angle);
+#undef TWEEN
+		P_SetThingPosition(players[i].mo);
+
+		players[i].frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue);
+
+		players[i].mo->sprite = info->playerinfo[i].mobj.sprite;
+		players[i].mo->frame = info->playerinfo[i].mobj.frame;
+
+		players[i].realtime = info->playerinfo[i].player.realtime;
+		for (j = 0; j < NUMKARTSTUFF; j++)
+			players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
+	}
+
+	for (i = splitscreen; i >= 0; i--)
+		P_ResetCamera(&players[displayplayers[i]], &camera[i]);
+}
+
+void G_ConfirmRewind(tic_t rewindtime)
+{
+	SINT8 i;
+	tic_t j;
+	boolean oldmenuactive = menuactive, oldsounddisabled = sound_disabled;
+
+	INT32 olddp1 = displayplayers[0], olddp2 = displayplayers[1], olddp3 = displayplayers[2], olddp4 = displayplayers[3];
+	UINT8 oldss = splitscreen;
+
+	menuactive = false; // Prevent loops
+
+	CV_StealthSetValue(&cv_renderview, 0);
+
+	if (rewindtime <= starttime)
+	{
+		demo.rewinding = false;
+		G_DoPlayDemo(NULL); // Restart the current demo
+	}
+	else
+	{
+		rewind_t *rewind;
+		sound_disabled = true; // Prevent sound spam
+		demo.rewinding = true;
+
+		rewind = CL_RewindToTime(rewindtime);
+
+		if (rewind)
+		{
+			demobuf.p = demobuf.buffer + rewind->demopos;
+			memcpy(oldcmd, rewind->oldcmd, sizeof (oldcmd));
+			memcpy(oldghost, rewind->oldghost, sizeof (oldghost));
+			paused = false;
+		}
+		else
+		{
+			demo.rewinding = true;
+			G_DoPlayDemo(NULL); // Restart the current demo
+		}
+	}
+
+	for (j = 0; j < rewindtime && leveltime < rewindtime; j++)
+	{
+		G_Ticker((j % NEWTICRATERATIO) == 0);
+	}
+
+	demo.rewinding = false;
+	menuactive = oldmenuactive; // Bring the menu back up
+	sound_disabled = oldsounddisabled; // Re-enable SFX
+
+	wipegamestate = gamestate; // No fading back in!
+
+	COM_BufInsertText("renderview on\n");
+
+	splitscreen = oldss;
+	displayplayers[0] = olddp1;
+	displayplayers[1] = olddp2;
+	displayplayers[2] = olddp3;
+	displayplayers[3] = olddp4;
+	R_ExecuteSetViewSize();
+	G_ResetViews();
+
+	for (i = splitscreen; i >= 0; i--)
+		P_ResetCamera(&players[displayplayers[i]], &camera[i]);
+}
+
+void G_ReadMetalTic(mobj_t *metal)
+{
+	UINT8 ziptic;
+	UINT16 speed;
+	UINT8 statetype;
+
+	if (!metal_p)
+		return;
+	ziptic = READUINT8(metal_p);
+
+	// Read changes from the tic
+	if (ziptic & GZT_XYZ)
+	{
+		oldmetal.x = READFIXED(metal_p);
+		oldmetal.y = READFIXED(metal_p);
+		oldmetal.z = READFIXED(metal_p);
+		P_MoveOrigin(metal, oldmetal.x, oldmetal.y, oldmetal.z);
+		oldmetal.x = metal->x;
+		oldmetal.y = metal->y;
+		oldmetal.z = metal->z;
+	}
+	else
+	{
+		if (ziptic & GZT_MOMXY)
+		{
+			oldmetal.momx = READINT16(metal_p)<<8;
+			oldmetal.momy = READINT16(metal_p)<<8;
+		}
+		if (ziptic & GZT_MOMZ)
+			oldmetal.momz = READINT16(metal_p)<<8;
+		oldmetal.x += oldmetal.momx;
+		oldmetal.y += oldmetal.momy;
+		oldmetal.z += oldmetal.momz;
+	}
+	if (ziptic & GZT_ANGLE)
+		oldmetal.angle = READUINT8(metal_p)<<24;
+	if (ziptic & GZT_SPRITE)
+		metal_p++; // Currently unused. (Metal Sonic figures out what he's doing his own damn self.)
+
+	// Set movement, position, and angle
+	// oldmetal contains where you're supposed to be.
+	metal->momx = oldmetal.momx;
+	metal->momy = oldmetal.momy;
+	metal->momz = oldmetal.momz;
+	P_UnsetThingPosition(metal);
+	metal->x = oldmetal.x;
+	metal->y = oldmetal.y;
+	metal->z = oldmetal.z;
+	P_SetThingPosition(metal);
+	metal->angle = oldmetal.angle;
+
+	if (ziptic & GZT_EXTRA)
+	{ // But wait, there's more!
+		ziptic = READUINT8(metal_p);
+		if (ziptic & EZT_FLIP)
+			metal->eflags ^= MFE_VERTICALFLIP;
+		if (ziptic & EZT_SCALE)
+		{
+			metal->destscale = READFIXED(metal_p);
+			if (metal->destscale != metal->scale)
+				P_SetScale(metal, metal->destscale);
+		}
+	}
+
+	// Calculates player's speed based on distance-of-a-line formula
+	speed = FixedDiv(P_AproxDistance(oldmetal.momx, oldmetal.momy), metal->scale)>>FRACBITS;
+
+	// Use speed to decide an appropriate state
+	if (speed > 20) // default skin runspeed
+		statetype = 2;
+	else if (speed > 1) // stopspeed
+		statetype = 1;
+	else
+		statetype = 0;
+
+	// Set state
+	if (statetype != metal->threshold)
+	{
+		switch (statetype)
+		{
+		case 2: // run
+			P_SetMobjState(metal,metal->info->meleestate);
+			break;
+		case 1: // walk
+			P_SetMobjState(metal,metal->info->seestate);
+			break;
+		default: // stand
+			P_SetMobjState(metal,metal->info->spawnstate);
+			break;
+		}
+		metal->threshold = statetype;
+	}
+
+	// TODO: Modify state durations based on movement speed, similar to players?
+
+	if (*metal_p == DEMOMARKER)
+	{
+		// end of demo data stream
+		G_StopMetalDemo();
+		return;
+	}
+}
+
+void G_WriteMetalTic(mobj_t *metal)
+{
+	UINT8 ziptic = 0;
+	UINT8 *ziptic_p;
+
+	if (!demobuf.p) // demobuf.p will be NULL until the race start linedef executor is triggered!
+		return;
+
+	ziptic_p = demobuf.p++; // the ziptic, written at the end of this function
+
+	#define MAXMOM (0xFFFF<<8)
+
+	// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
+	if (abs(metal->x-oldmetal.x) > MAXMOM
+	|| abs(metal->y-oldmetal.y) > MAXMOM
+	|| abs(metal->z-oldmetal.z) > MAXMOM)
+	{
+		oldmetal.x = metal->x;
+		oldmetal.y = metal->y;
+		oldmetal.z = metal->z;
+		WRITEFIXED(demobuf.p,oldmetal.x);
+		WRITEFIXED(demobuf.p,oldmetal.y);
+		WRITEFIXED(demobuf.p,oldmetal.z);
+		ziptic |= GZT_XYZ;
+	}
+	else
+	{
+		// For moving normally:
+		// Store one full byte of movement, plus one byte of fractional movement.
+		INT16 momx = (INT16)((metal->x-oldmetal.x)>>8);
+		INT16 momy = (INT16)((metal->y-oldmetal.y)>>8);
+		if (momx != oldmetal.momx
+		|| momy != oldmetal.momy)
+		{
+			oldmetal.momx = momx;
+			oldmetal.momy = momy;
+			WRITEINT16(demobuf.p,momx);
+			WRITEINT16(demobuf.p,momy);
+			ziptic |= GZT_MOMXY;
+		}
+		momx = (INT16)((metal->z-oldmetal.z)>>8);
+		if (momx != oldmetal.momz)
+		{
+			oldmetal.momz = momx;
+			WRITEINT16(demobuf.p,momx);
+			ziptic |= GZT_MOMZ;
+		}
+
+		// This SHOULD set oldmetal.x/y/z to match metal->x/y/z
+		// but it keeps the fractional loss of one byte,
+		// so it will hopefully be made up for in future tics.
+		oldmetal.x += oldmetal.momx<<8;
+		oldmetal.y += oldmetal.momy<<8;
+		oldmetal.z += oldmetal.momz<<8;
+	}
+
+	#undef MAXMOM
+
+	// Only store the 8 most relevant bits of angle
+	// because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
+	// and it does not affect movement at all anyway.
+	if (metal->angle>>24 != oldmetal.angle)
+	{
+		oldmetal.angle = metal->angle>>24;
+		WRITEUINT8(demobuf.p,oldmetal.angle);
+		ziptic |= GZT_ANGLE;
+	}
+
+	// Metal Sonic does not need our state changes.
+	// ... currently.
+
+	{
+		UINT8 *exttic_p = NULL;
+		UINT8 exttic = 0;
+		if ((metal->eflags & MFE_VERTICALFLIP) != (oldmetal.eflags & MFE_VERTICALFLIP))
+		{
+			if (!exttic_p)
+				exttic_p = demobuf.p++;
+			exttic |= EZT_FLIP;
+			oldmetal.eflags ^= MFE_VERTICALFLIP;
+		}
+		if (metal->scale != oldmetal.scale)
+		{
+			if (!exttic_p)
+				exttic_p = demobuf.p++;
+			exttic |= EZT_SCALE;
+			WRITEFIXED(demobuf.p,metal->scale);
+			oldmetal.scale = metal->scale;
+		}
+		if (exttic_p)
+		{
+			*exttic_p = exttic;
+			ziptic |= GZT_EXTRA;
+		}
+	}
+
+	*ziptic_p = ziptic;
+
+	// attention here for the ticcmd size!
+	// latest demos with mouse aiming byte in ticcmd
+	if (demobuf.p >= demoend - 32)
+	{
+		G_StopMetalRecording(); // no more space
+		return;
+	}
+}
+
+//
+// G_RecordDemo
+//
+void G_RecordDemo(const char *name)
+{
+	INT32 maxsize;
+
+	demobuf.p = NULL;
+	G_ResetDemoRecording();
+	demoend = NULL;
+
+	if (cv_recordmultiplayerdemos.value)
+	{
+		CONS_Printf("Recording demo %s.lmp\n", name);
+
+		strcpy(demoname, name);
+		strcat(demoname, ".lmp");
+
+		maxsize = cv_maxdemosize.value*1024*1024;
+
+		demobuf.buffer = Z_Malloc(maxsize + 100*1024, PU_STATIC, NULL);
+		demoend = demobuf.buffer + maxsize;
+
+		if (demobuf.buffer)
+			demo.recording = true;
+		else
+			CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n");
+	}
+}
+
+void G_RecordMetal(void)
+{
+	INT32 maxsize;
+	maxsize = cv_maxdemosize.value*1024*1024;
+	if (demobuf.buffer)
+		Z_Free(demobuf.buffer);
+	demobuf.p = NULL;
+	metalrecording = false;
+	demobuf.buffer = Z_Malloc(maxsize + 100*1024, PU_STATIC, NULL);
+	demoend = demobuf.buffer + maxsize;
+
+	if (demobuf.buffer)
+		metalrecording = true;
+	else
+		CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n");
+}
+
+void G_BeginRecording(void)
+{
+	UINT8 i, p;
+	char name[17];
+	player_t *player = &players[consoleplayer];
+
+	char *filename;
+	UINT8 totalfiles;
+	UINT8 *m;
+
+	if (!cv_recordmultiplayerdemos.value)
+	{
+		G_ResetDemoRecording();
+		return;
+	}
+
+	if (demobuf.buffer == NULL)
+	{
+		CONS_Alert(CONS_ERROR, "No demo buffer allocated\n");
+		G_ResetDemoRecording();
+		return;
+	}
+
+	if (demobuf.p)
+	{
+		G_ResetDemoRecording();
+		return;
+	}
+
+	memset(name,0,sizeof(name));
+
+	demobuf.p = demobuf.buffer;
+	demoflags = DF_GHOST|(multiplayer ? DF_MULTIPLAYER : (modeattacking<<DF_ATTACKSHIFT));
+
+	if (encoremode)
+		demoflags |= DF_ENCORE;
+
+	if (!modeattacking && gL)	// Ghosts don't read luavars, and you shouldn't ever need to save Lua in replays, you doof!
+								// SERIOUSLY THOUGH WHY WOULD YOU LOAD HOSTMOD AND RECORD A GHOST WITH IT !????
+		demoflags |= DF_LUAVARS;
+
+	// Setup header.
+	M_Memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
+	WRITEUINT8(demobuf.p,VERSION);
+	WRITEUINT8(demobuf.p,SUBVERSION);
+	WRITEUINT16(demobuf.p,DEMOVERSION);
+
+	// Full replay title
+	demobuf.p += 64;
+	{
+		char demotitlename[65];
+		char *title = G_BuildMapTitle(gamemap);
+
+		// Print to a separate temp buffer instead of demo.titlename, so we can use it in M_TextInputSetString
+		if (title)
+		{
+			snprintf(demotitlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername);
+			Z_Free(title);
+		}
+		else
+			snprintf(demotitlename, 64, "%s", modeattacking ? "Time Attack" : connectedservername);
+
+		// Init just in case it isn't initialized already
+		M_TextInputInit(&demo.titlenameinput, demo.titlename, sizeof(demo.titlename));
+
+		// This will indirectly assign to demo.titlename too
+		M_TextInputSetString(&demo.titlenameinput, demotitlename);
+	}
+
+	// demo checksum
+	demobuf.p += 16;
+
+	// game data
+	M_Memcpy(demobuf.p, "PLAY", 4); demobuf.p += 4;
+	WRITEINT16(demobuf.p,gamemap);
+	M_Memcpy(demobuf.p, mapmd5, 16); demobuf.p += 16;
+
+	WRITEUINT8(demobuf.p, demoflags);
+	WRITEUINT8(demobuf.p, gametype & 0xFF);
+
+	// file list
+	m = demobuf.p;/* file count */
+	demobuf.p += 1;
+
+	totalfiles = 0;
+	for (i = mainwads; ++i < numwadfiles; )
+		if (wadfiles[i]->important)
+	{
+		nameonly(( filename = va("%s", wadfiles[i]->filename) ));
+		WRITESTRINGL(demobuf.p, filename, MAX_WADPATH);
+		WRITEMEM(demobuf.p, wadfiles[i]->md5sum, 16);
+
+		totalfiles++;
+	}
+
+	WRITEUINT8(m, totalfiles);
+
+	switch ((demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
+	{
+	case ATTACKING_NONE: // 0
+		break;
+	case ATTACKING_RECORD: // 1
+		demotime_p = demobuf.p;
+		WRITEUINT32(demobuf.p,UINT32_MAX); // time
+		WRITEUINT32(demobuf.p,UINT32_MAX); // lap
+		break;
+	default: // 3
+		break;
+	}
+
+	WRITEUINT32(demobuf.p, P_GetInitSeed());
+
+	// Reserved for extrainfo location from start of file
+	demoinfo_p = demobuf.p;
+	WRITEUINT32(demobuf.p, 0);
+
+	// Save netvars
+	CV_SaveNetVars(&demobuf.p, true);
+
+	// Now store some info for each in-game player
+	for (p = 0; p < MAXPLAYERS; p++)
+	{
+		if (!playeringame[p])
+			continue;
+
+		player = &players[p];
+
+		WRITEUINT8(demobuf.p, p | (player->spectator ? DEMO_SPECTATOR : 0));
+
+		// Name
+		memset(name, 0, 16);
+		memcpy(name, player_names[p], 15);
+		M_Memcpy(demobuf.p,name,16);
+		demobuf.p += 16;
+
+		// Skin
+		memset(name, 0, 16);
+		strncpy(name, skins[player->skin].name, 16);
+		M_Memcpy(demobuf.p,name,16);
+		demobuf.p += 16;
+
+		// Color
+		memset(name, 0, 16);
+		strncpy(name, KartColor_Names[player->skincolor], 16);
+		M_Memcpy(demobuf.p,name,16);
+		demobuf.p += 16;
+
+		// Score, since Kart uses this to determine where you start on the map
+		WRITEUINT32(demobuf.p, player->score);
+
+		// Kart speed and weight
+		WRITEUINT8(demobuf.p, skins[player->skin].kartspeed);
+		WRITEUINT8(demobuf.p, skins[player->skin].kartweight);
+	}
+
+	WRITEUINT8(demobuf.p, 0xFF); // Denote the end of the player listing
+
+	// player lua vars, always saved even if empty... Unless it's record attack.
+	if (demoflags & DF_LUAVARS)
+		LUA_Archive(&demobuf, false);
+
+	memset(&oldcmd,0,sizeof(oldcmd));
+	memset(&oldghost,0,sizeof(oldghost));
+	memset(&ghostext,0,sizeof(ghostext));
+
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		ghostext[i].lastcolor = ghostext[i].color = GHC_NORMAL;
+		ghostext[i].lastscale = ghostext[i].scale = FRACUNIT;
+
+		if (players[i].mo)
+		{
+			oldghost[i].x = players[i].mo->x;
+			oldghost[i].y = players[i].mo->y;
+			oldghost[i].z = players[i].mo->z;
+			oldghost[i].angle = players[i].mo->angle;
+
+			// preticker started us gravity flipped
+			if (players[i].mo->eflags & MFE_VERTICALFLIP)
+				ghostext[i].flags |= EZT_FLIP;
+		}
+	}
+}
+
+void G_BeginMetal(void)
+{
+	mobj_t *mo = players[consoleplayer].mo;
+
+	if (demobuf.buffer == NULL)
+	{
+		CONS_Alert(CONS_ERROR, "No metal demo buffer allocated\n");
+		metalrecording = false;
+		return;
+	}
+
+	if (demobuf.p)
+	{
+		Z_Free(demobuf.buffer);
+		demobuf.buffer = NULL;
+		metalrecording = false;
+		return;
+	}
+
+	demobuf.p = demobuf.buffer;
+
+	// Write header.
+	M_Memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
+	WRITEUINT8(demobuf.p,VERSION);
+	WRITEUINT8(demobuf.p,SUBVERSION);
+	WRITEUINT16(demobuf.p,DEMOVERSION);
+
+	// demo checksum
+	demobuf.p += 16;
+
+	M_Memcpy(demobuf.p, "METL", 4); demobuf.p += 4;
+
+	// Set up our memory.
+	memset(&oldmetal,0,sizeof(oldmetal));
+	oldmetal.x = mo->x;
+	oldmetal.y = mo->y;
+	oldmetal.z = mo->z;
+	oldmetal.angle = mo->angle;
+}
+
+void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT32 val)
+{
+	char temp[17];
+
+	if (!demobuf.p)
+		return;
+
+	if (demoinfo_p && *(UINT32 *)demoinfo_p == 0 && demobuf.buffer != NULL)
+	{
+		WRITEUINT8(demobuf.p, DEMOMARKER); // add the demo end marker
+		*(UINT32 *)demoinfo_p = demobuf.p - demobuf.buffer;
+	}
+
+	WRITEUINT8(demobuf.p, DW_STANDING);
+	WRITEUINT8(demobuf.p, ranking);
+
+	// Name
+	memset(temp, 0, 16);
+	strncpy(temp, name, 16);
+	M_Memcpy(demobuf.p,temp,16);
+	demobuf.p += 16;
+
+	// Skin
+	memset(temp, 0, 16);
+	strncpy(temp, skins[skinnum].name, 16);
+	M_Memcpy(demobuf.p,temp,16);
+	demobuf.p += 16;
+
+	// Color
+	memset(temp, 0, 16);
+	strncpy(temp, KartColor_Names[color], 16);
+	M_Memcpy(demobuf.p,temp,16);
+	demobuf.p += 16;
+
+	// Score/time/whatever
+	WRITEUINT32(demobuf.p, val);
+}
+
+void G_SetDemoTime(UINT32 ptime, UINT32 plap)
+{
+	if (!demo.recording || !demotime_p)
+		return;
+	if (demoflags & DF_RECORDATTACK)
+	{
+		WRITEUINT32(demotime_p, ptime);
+		WRITEUINT32(demotime_p, plap);
+		demotime_p = NULL;
+	}
+}
+
+static void G_LoadDemoExtraFiles(UINT8 **pp)
+{
+	UINT8 totalfiles;
+	char filename[MAX_WADPATH];
+	UINT8 md5sum[16];
+	filestatus_t ncs = FS_NOTFOUND;
+	boolean toomany = false;
+	boolean alreadyloaded;
+	UINT8 i, j;
+
+	totalfiles = READUINT8((*pp));
+	for (i = 0; i < totalfiles; ++i)
+	{
+		if (toomany)
+			SKIPSTRING((*pp));
+		else
+		{
+			strlcpy(filename, (char *)(*pp), sizeof filename);
+			SKIPSTRING((*pp));
+		}
+		READMEM((*pp), md5sum, 16);
+
+		if (!toomany)
+		{
+			alreadyloaded = false;
+
+			for (j = 0; j < numwadfiles; ++j)
+			{
+				if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
+				{
+					alreadyloaded = true;
+					break;
+				}
+			}
+
+			if (alreadyloaded)
+				continue;
+
+			if (numwadfiles >= MAX_WADFILES)
+				toomany = true;
+			else
+				ncs = findfile(filename, md5sum, false);
+
+			if (toomany)
+			{
+				CONS_Alert(CONS_WARNING, M_GetText("Too many files loaded to add anymore for demo playback\n"));
+				if (!CON_Ready())
+					M_StartMessage(M_GetText("There are too many files loaded to add this demo's addons.\n\nDemo playback may desync.\n\nPress ESC\n"), NULL, MM_NOTHING);
+			}
+			else if (ncs != FS_FOUND)
+			{
+				if (ncs == FS_NOTFOUND)
+					CONS_Alert(CONS_NOTICE, M_GetText("You do not have a copy of %s\n"), filename);
+				else if (ncs == FS_MD5SUMBAD)
+					CONS_Alert(CONS_NOTICE, M_GetText("Checksum mismatch on %s\n"), filename);
+				else
+					CONS_Alert(CONS_NOTICE, M_GetText("Unknown error finding file %s\n"), filename);
+
+				if (!CON_Ready())
+					M_StartMessage(M_GetText("There were errors trying to add this demo's addons. Check the console for more information.\n\nDemo playback may desync.\n\nPress ESC\n"), NULL, MM_NOTHING);
+			}
+			else
+			{
+				P_PartialAddWadFile(filename, false);
+			}
+		}
+	}
+
+	if (P_PartialAddGetStage() >= 0)
+		P_MultiSetupWadFiles(true); // in case any partial adds were done
+}
+
+static void G_SkipDemoExtraFiles(UINT8 **pp)
+{
+	UINT8 totalfiles;
+	UINT8 i;
+
+	totalfiles = READUINT8((*pp));
+	for (i = 0; i < totalfiles; ++i)
+	{
+		SKIPSTRING((*pp));// file name
+		(*pp) += 16;// md5
+	}
+}
+
+// G_CheckDemoExtraFiles: checks if our loaded WAD list matches the demo's.
+// Enabling quick prevents filesystem checks to see if needed files are available to load.
+static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick)
+{
+	UINT8 totalfiles, filesloaded, nmusfilecount;
+	char filename[MAX_WADPATH];
+	UINT8 md5sum[16];
+	boolean toomany = false;
+	boolean alreadyloaded;
+	UINT8 i, j;
+	UINT8 error = 0;
+
+	totalfiles = READUINT8((*pp));
+	filesloaded = 0;
+	for (i = 0; i < totalfiles; ++i)
+	{
+		if (toomany)
+			SKIPSTRING((*pp));
+		else
+		{
+			strlcpy(filename, (char *)(*pp), sizeof filename);
+			SKIPSTRING((*pp));
+		}
+		READMEM((*pp), md5sum, 16);
+
+		if (!toomany)
+		{
+			alreadyloaded = false;
+			nmusfilecount = 0;
+
+			for (j = 0; j < numwadfiles; ++j)
+			{
+				if (wadfiles[j]->important && j > mainwads)
+					nmusfilecount++;
+				else
+					continue;
+
+				if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
+				{
+					alreadyloaded = true;
+
+					if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER)
+						error |= DFILE_ERROR_OUTOFORDER;
+
+					break;
+				}
+			}
+
+			if (alreadyloaded)
+			{
+				filesloaded++;
+				continue;
+			}
+
+			if (numwadfiles >= MAX_WADFILES)
+				error = DFILE_ERROR_CANNOTLOAD;
+			else if (!quick && findfile(filename, md5sum, false) != FS_FOUND)
+				error = DFILE_ERROR_CANNOTLOAD;
+			else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER)
+				error |= DFILE_ERROR_NOTLOADED;
+		} else
+			error = DFILE_ERROR_CANNOTLOAD;
+	}
+
+	// Get final file count
+	nmusfilecount = 0;
+
+	for (j = 0; j < numwadfiles; ++j)
+		if (wadfiles[j]->important && j > mainwads)
+			nmusfilecount++;
+
+	if (!error && filesloaded < nmusfilecount)
+		error = DFILE_ERROR_EXTRAFILES;
+
+	return error;
+}
+
+// Returns bitfield:
+// 1 == new demo has lower time
+// 2 == new demo has higher score
+// 4 == new demo has higher rings
+UINT8 G_CmpDemoTime(char *oldname, char *newname)
+{
+	UINT8 *buffer,*p;
+	UINT8 flags;
+	UINT32 oldtime, newtime, oldlap, newlap;
+	UINT16 oldversion;
+	size_t bufsize ATTRUNUSED;
+	UINT8 c;
+	UINT16 s ATTRUNUSED;
+	UINT8 aflags = 0;
+
+	// load the new file
+	FIL_DefaultExtension(newname, ".lmp");
+	bufsize = FIL_ReadFile(newname, &buffer);
+	I_Assert(bufsize != 0);
+	p = buffer;
+
+	// read demo header
+	I_Assert(!memcmp(p, DEMOHEADER, 12));
+	p += 12; // DEMOHEADER
+	c = READUINT8(p); // VERSION
+	I_Assert(c == VERSION);
+	c = READUINT8(p); // SUBVERSION
+	I_Assert(c == SUBVERSION);
+	s = READUINT16(p);
+	I_Assert(s == DEMOVERSION);
+	p += 64; // full demo title
+	p += 16; // demo checksum
+	I_Assert(!memcmp(p, "PLAY", 4));
+	p += 4; // PLAY
+	p += 2; // gamemap
+	p += 16; // map md5
+	flags = READUINT8(p); // demoflags
+	p++; // gametype
+	G_SkipDemoExtraFiles(&p);
+
+	aflags = flags & (DF_RECORDATTACK|DF_NIGHTSATTACK);
+	I_Assert(aflags);
+	if (flags & DF_RECORDATTACK)
+	{
+		newtime = READUINT32(p);
+		newlap = READUINT32(p);
+	}
+	else // appease compiler
+		return 0;
+
+	Z_Free(buffer);
+
+	// load old file
+	FIL_DefaultExtension(oldname, ".lmp");
+	if (!FIL_ReadFile(oldname, &buffer))
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), oldname);
+		return UINT8_MAX;
+	}
+	p = buffer;
+
+	// read demo header
+	if (memcmp(p, DEMOHEADER, 12))
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
+		Z_Free(buffer);
+		return UINT8_MAX;
+	} p += 12; // DEMOHEADER
+	p++; // VERSION
+	p++; // SUBVERSION
+	oldversion = READUINT16(p);
+	switch(oldversion) // demoversion
+	{
+	case DEMOVERSION: // latest always supported
+		p += 64; // full demo title
+		break;
+#ifdef DEMO_COMPAT_100
+	case 0x0001:
+		// Old replays gotta go :]
+		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' outdated version. It will be overwritten. Nyeheheh.\n"), oldname);
+		Z_Free(buffer);
+		return UINT8_MAX;
+#endif
+	// too old, cannot support.
+	default:
+		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
+		Z_Free(buffer);
+		return UINT8_MAX;
+	}
+	p += 16; // demo checksum
+	if (memcmp(p, "PLAY", 4))
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
+		Z_Free(buffer);
+		return UINT8_MAX;
+	} p += 4; // "PLAY"
+	p += 2; // gamemap
+	p += 16; // mapmd5
+	flags = READUINT8(p);
+	p++; // gametype
+	G_SkipDemoExtraFiles(&p);
+	if (!(flags & aflags))
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' not from same game mode. It will be overwritten.\n"), oldname);
+		Z_Free(buffer);
+		return UINT8_MAX;
+	}
+	if (flags & DF_RECORDATTACK)
+	{
+		oldtime = READUINT32(p);
+		oldlap = READUINT32(p);
+	}
+	else // appease compiler
+		return UINT8_MAX;
+
+	Z_Free(buffer);
+
+	c = 0;
+	if (newtime < oldtime
+	|| (newtime == oldtime && (newlap < oldlap)))
+		c |= 1; // Better time
+	if (newlap < oldlap
+	|| (newlap == oldlap && newtime < oldtime))
+		c |= 1<<1; // Better lap time
+	return c;
+}
+
+void G_LoadDemoInfo(menudemo_t *pdemo)
+{
+	UINT8 *infobuffer, *info_p, *extrainfo_p;
+	UINT8 version, subversion, pdemoflags;
+	UINT16 pdemoversion, count;
+
+	if (!FIL_ReadFile(pdemo->filepath, &infobuffer))
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath);
+		pdemo->type = MD_INVALID;
+		sprintf(pdemo->title, "INVALID REPLAY");
+
+		return;
+	}
+
+	info_p = infobuffer;
+
+	if (memcmp(info_p, DEMOHEADER, 12))
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
+		pdemo->type = MD_INVALID;
+		sprintf(pdemo->title, "INVALID REPLAY");
+		Z_Free(infobuffer);
+		return;
+	}
+
+	pdemo->type = MD_LOADED;
+
+	info_p += 12; // DEMOHEADER
+
+	version = READUINT8(info_p);
+	subversion = READUINT8(info_p);
+	pdemoversion = READUINT16(info_p);
+
+	memset(pdemo->version, 0, sizeof(pdemo->version));
+	snprintf(pdemo->version, sizeof(pdemo->version), "v%d.%d", version, subversion);
+
+	switch(pdemoversion)
+	{
+	case DEMOVERSION: // latest always supported
+		// demo title
+		M_Memcpy(pdemo->title, info_p, 64);
+		info_p += 64;
+
+		break;
+#ifdef DEMO_COMPAT_100
+	case 0x0001:
+		pdemo->type = MD_OUTDATED;
+		sprintf(pdemo->title, "Legacy Replay");
+		break;
+#endif
+	// too old, cannot support.
+	default:
+		CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath);
+		pdemo->type = MD_INVALID;
+		sprintf(pdemo->title, "INVALID REPLAY");
+		Z_Free(infobuffer);
+		return;
+	}
+
+	if (version != VERSION || subversion != SUBVERSION)
+		pdemo->type = MD_OUTDATED;
+
+	info_p += 16; // demo checksum
+	if (memcmp(info_p, "PLAY", 4))
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemo->filepath);
+		pdemo->type = MD_INVALID;
+		sprintf(pdemo->title, "INVALID REPLAY");
+		Z_Free(infobuffer);
+		return;
+	}
+	info_p += 4; // "PLAY"
+	pdemo->map = READINT16(info_p);
+	info_p += 16; // mapmd5
+
+	pdemoflags = READUINT8(info_p);
+
+	// temp?
+	if (!(pdemoflags & DF_MULTIPLAYER))
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("%s is not a multiplayer replay and can't be listed on this menu fully yet.\n"), pdemo->filepath);
+		Z_Free(infobuffer);
+		return;
+	}
+#ifdef DEMO_COMPAT_100
+	else if (pdemoversion == 0x0001)
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("%s is a legacy multiplayer replay and cannot be played.\n"), pdemo->filepath);
+		pdemo->type = MD_INVALID;
+		sprintf(pdemo->title, "INVALID REPLAY");
+		Z_Free(infobuffer);
+		return;
+	}
+#endif
+
+	pdemo->gametype = READUINT8(info_p);
+
+	pdemo->addonstatus = G_CheckDemoExtraFiles(&info_p, true);
+	info_p += 4; // RNG seed
+
+	extrainfo_p = infobuffer + READUINT32(info_p);
+
+	// Pared down version of CV_LoadNetVars to find the kart speed
+	pdemo->kartspeed = 1; // Default to normal speed
+	count = READUINT16(info_p);
+	while (count--)
+	{
+		UINT16 netid;
+		char *svalue;
+
+		netid = READUINT16(info_p);
+		svalue = (char *)info_p;
+		SKIPSTRING(info_p);
+		info_p++; // stealth
+
+		if (netid == cv_kartspeed.netid)
+		{
+			UINT8 j;
+			for (j = 0; kartspeed_cons_t[j].strvalue; j++)
+				if (!stricmp(kartspeed_cons_t[j].strvalue, svalue))
+					pdemo->kartspeed = kartspeed_cons_t[j].value;
+		}
+		else if (netid == cv_basenumlaps.netid && pdemo->gametype == GT_RACE)
+			pdemo->numlaps = atoi(svalue);
+	}
+
+	if (pdemoflags & DF_ENCORE)
+		pdemo->kartspeed |= DF_ENCORE;
+
+	// Read standings!
+	count = 0;
+
+	while (READUINT8(extrainfo_p) == DW_STANDING) // Assume standings are always first in the extrainfo
+	{
+		INT32 i;
+		char temp[16];
+
+		pdemo->standings[count].ranking = READUINT8(extrainfo_p);
+
+		// Name
+		M_Memcpy(pdemo->standings[count].name, extrainfo_p, 16);
+		extrainfo_p += 16;
+
+		// Skin
+		M_Memcpy(temp,extrainfo_p,16);
+		extrainfo_p += 16;
+		pdemo->standings[count].skin = UINT8_MAX;
+		for (i = 0; i < numskins; i++)
+			if (stricmp(skins[i].name, temp) == 0)
+			{
+				pdemo->standings[count].skin = i;
+				break;
+			}
+
+		// Color
+		M_Memcpy(temp,extrainfo_p,16);
+		extrainfo_p += 16;
+		for (i = 0; i < MAXSKINCOLORS; i++)
+			if (!stricmp(KartColor_Names[i],temp))				// SRB2kart
+			{
+				pdemo->standings[count].color = i;
+				break;
+			}
+
+		// Score/time/whatever
+		pdemo->standings[count].timeorscore = READUINT32(extrainfo_p);
+
+		count++;
+
+		if (count >= MAXPLAYERS)
+			break; //@TODO still cycle through the rest of these if extra demo data is ever used
+	}
+
+	// I think that's everything we need?
+	Z_Free(infobuffer);
+}
+
+#if defined (_WIN32)
+// return the file creation time
+// useful for demos that were renamed
+static long G_GetCreationTime(char *filepath)
+{
+	struct stat fileinfo;
+
+	if (stat(filepath, &fileinfo) == 0)
+		return fileinfo.st_ctime;
+
+	return 0;
+}
+#endif
+
+static char *G_GetDemoDate(menudemo_t *pdemo)
+{
+	char *datetime;
+	datetime = malloc(sizeof(pdemo->date)); // mallocma balls
+
+	// no mallocma balls... :c
+	if (!datetime)
+	{
+		return NULL;
+	}
+
+	time_t file_time = 0;
+
+	// get le filepath
+	char *filename;
+	filename = strdup(pdemo->filepath);
+
+#if defined (_WIN32)
+	if (!filename)
+	{
+		// if we cant get a filename try just getting the file create time
+		file_time = G_GetCreationTime(pdemo->filepath);
+		goto skipfilenametime;
+	}
+#else
+	if (!filename)
+	{
+		free(datetime);
+		return NULL;
+	}
+#endif
+
+	// get the actual filename Zzz...
+	nameonly(filename);
+
+	// convert it to long Zzz....
+	file_time = strtol(filename, NULL, 10);
+	free(filename); // dont need this anymore a
+
+#if defined (_WIN32)
+skipfilenametime:
+#endif
+
+	// then throw it into localtime to get an actual human readable format lmao
+	struct tm *tm_buf = NULL;
+	tm_buf = localtime(&file_time);
+
+	// cant believe we ended up in 1970
+	if (tm_buf == NULL || tm_buf->tm_year <= 110)
+	{
+#if defined (_WIN32)
+		// uh ohh, we got an invalid time
+		// try one more time getting the creation time
+		file_time = G_GetCreationTime(pdemo->filepath);
+		tm_buf = localtime(&file_time);
+
+		if (tm_buf == NULL || tm_buf->tm_year <= 110)
+		{
+			free(datetime);
+			return NULL;
+		}
+
+		goto gotcreationtime;
+#else
+		free(datetime);
+		return NULL;
+#endif
+	}
+
+#if defined (_WIN32)
+gotcreationtime:
+#endif
+
+	const char *format;
+
+	// US ppl are special (:
+	if (cv_demodateformat.value == 2)
+		format = "%m.%d.%Y";
+	else if (cv_demodateformat.value == 1)
+		format = "%d.%m.%Y";
+	else
+		format = strstr(setlocale(LC_TIME, NULL), "en_US") ? "%m.%d.%Y" : "%d.%m.%Y";
+
+	strftime(datetime, sizeof(pdemo->date), format, tm_buf);
+
+	return datetime;
+}
+
+void G_LoadDemoTitle(menudemo_t *pdemo)
+{
+	UINT8 infobuffer[96], *info_p;
+	UINT16 pdemoversion;
+	size_t count;
+
+	FILE *handle = fopen(pdemo->filepath, "rb");
+
+	if (!handle)
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath);
+		sprintf(pdemo->title, "INVALID REPLAY");
+		return;
+	}
+
+	count = fread(infobuffer, 1, 96, handle);
+	fclose(handle);
+	info_p = infobuffer;
+
+	// First check isn't too accurate technically, but well, valid replays should be larger than that anyway
+	if (count < 96 || memcmp(info_p, DEMOHEADER, 12))
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
+		sprintf(pdemo->title, "INVALID REPLAY");
+		return;
+	}
+
+	info_p += 12; // DEMOHEADER
+
+	READUINT8(info_p);
+	READUINT8(info_p);
+	pdemoversion = READUINT16(info_p);
+
+	memset(pdemo->date, 0, sizeof(pdemo->date));
+
+	switch(pdemoversion)
+	{
+	case DEMOVERSION: // latest always supported
+		// demo title
+		M_Memcpy(pdemo->title, info_p, 64);
+
+		// demo date
+		char *demodate;
+		demodate = G_GetDemoDate(pdemo);
+		if (demodate)
+			strncpy(pdemo->date, demodate, sizeof(pdemo->date));
+		free(demodate);
+		break;
+#ifdef DEMO_COMPAT_100
+	case 0x0001:
+		sprintf(pdemo->title, "Legacy Replay");
+		break;
+#endif
+	// too old, cannot support.
+	default:
+		CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath);
+		sprintf(pdemo->title, "INVALID REPLAY");
+	}
+}
+
+//
+// G_PlayDemo
+//
+void G_DeferedPlayDemo(const char *name)
+{
+	COM_BufAddText("playdemo \"");
+	COM_BufAddText(name);
+	COM_BufAddText("\" -addfiles\n");
+}
+
+//
+// Start a demo from a .LMP file or from a wad resource
+//
+#define SKIPERRORS
+void G_DoPlayDemo(char *defdemoname)
+{
+	UINT8 i, p;
+	lumpnum_t l;
+	char skin[17],color[17],*n,*pdemoname;
+	UINT8 version,subversion;
+	UINT32 randseed;
+	char msg[1024];
+#if defined(SKIPERRORS) && !defined(DEVELOP)
+	boolean skiperrors = false;
+#endif
+	boolean spectator;
+	UINT8 slots[MAXPLAYERS], kartspeed[MAXPLAYERS], kartweight[MAXPLAYERS], numslots = 0;
+
+	G_InitDemoRewind();
+
+	skin[16] = '\0';
+	color[16] = '\0';
+
+	// No demo name means we're restarting the current demo
+	if (defdemoname == NULL)
+	{
+		demobuf.p = demobuf.buffer;
+		pdemoname = ZZ_Alloc(1); // Easier than adding checks for this everywhere it's freed
+	}
+	else
+	{
+		n = defdemoname+strlen(defdemoname);
+		while (*n != '/' && *n != '\\' && n != defdemoname)
+			n--;
+		if (n != defdemoname)
+			n++;
+		pdemoname = ZZ_Alloc(strlen(n)+1);
+		strcpy(pdemoname,n);
+
+		M_SetPlaybackMenuPointer();
+
+		// Internal if no extension, external if one exists
+		if (FIL_CheckExtension(defdemoname))
+		{
+			//FIL_DefaultExtension(defdemoname, ".lmp");
+			if (!FIL_ReadFile(defdemoname, &demobuf.buffer))
+			{
+				snprintf(msg, 1024, M_GetText("Failed to read file '%s'.\n"), defdemoname);
+				CONS_Alert(CONS_ERROR, "%s", msg);
+				gameaction = ga_nothing;
+				M_StartMessage(msg, NULL, MM_NOTHING);
+				return;
+			}
+			demobuf.p = demobuf.buffer;
+		}
+		// load demo resource from WAD
+		else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
+		{
+			snprintf(msg, 1024, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
+			CONS_Alert(CONS_ERROR, "%s", msg);
+			gameaction = ga_nothing;
+			M_StartMessage(msg, NULL, MM_NOTHING);
+			return;
+		}
+		else // it's an internal demo
+		{
+			demobuf.buffer = demobuf.p = W_CacheLumpNum(l, PU_STATIC);
+#if defined(SKIPERRORS) && !defined(DEVELOP)
+			skiperrors = true; // SRB2Kart: Don't print warnings for staff ghosts, since they'll inevitably happen when we make bugfixes/changes...
+#endif
+		}
+	}
+
+	// read demo header
+	gameaction = ga_nothing;
+	demo.playback = true;
+	if (memcmp(demobuf.p, DEMOHEADER, 12))
+	{
+		snprintf(msg, 1024, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname);
+		CONS_Alert(CONS_ERROR, "%s", msg);
+		M_StartMessage(msg, NULL, MM_NOTHING);
+		G_ResetDemoPlayback(pdemoname);
+		return;
+	}
+	demobuf.p += 12; // DEMOHEADER
+
+	version = READUINT8(demobuf.p);
+	subversion = READUINT8(demobuf.p);
+	demo.version = READUINT16(demobuf.p);
+	switch(demo.version)
+	{
+	case DEMOVERSION: // latest always supported
+		// demo title
+		M_Memcpy(demo.titlename, demobuf.p, 64);
+		demobuf.p += 64;
+
+		break;
+#ifdef DEMO_COMPAT_100
+	case 0x0001:
+		break;
+#endif
+	// too old, cannot support.
+	default:
+		snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
+		CONS_Alert(CONS_ERROR, "%s", msg);
+		M_StartMessage(msg, NULL, MM_NOTHING);
+		G_ResetDemoPlayback(pdemoname);
+		return;
+	}
+	demobuf.p += 16; // demo checksum
+	if (memcmp(demobuf.p, "PLAY", 4))
+	{
+		snprintf(msg, 1024, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
+		CONS_Alert(CONS_ERROR, "%s", msg);
+		M_StartMessage(msg, NULL, MM_NOTHING);
+		G_ResetDemoPlayback(pdemoname);
+		return;
+	}
+	demobuf.p += 4; // "PLAY"
+	gamemap = READINT16(demobuf.p);
+	demobuf.p += 16; // mapmd5
+
+	demoflags = READUINT8(demobuf.p);
+#ifdef DEMO_COMPAT_100
+	if (demo.version == 0x0001)
+	{
+		if (demoflags & DF_MULTIPLAYER)
+		{
+			snprintf(msg, 1024, M_GetText("%s is an alpha multiplayer replay and cannot be played.\n"), pdemoname);
+			CONS_Alert(CONS_ERROR, "%s", msg);
+			M_StartMessage(msg, NULL, MM_NOTHING);
+			G_ResetDemoPlayback(pdemoname);
+			return;
+		}
+	}
+	else
+	{
+#endif
+	gametype = READUINT8(demobuf.p);
+
+	if (demo.title) // Titledemos should always play and ought to always be compatible with whatever wadlist is running.
+		G_SkipDemoExtraFiles(&demobuf.p);
+	else if (demo.loadfiles)
+		G_LoadDemoExtraFiles(&demobuf.p);
+	else if (demo.ignorefiles)
+		G_SkipDemoExtraFiles(&demobuf.p);
+	else
+	{
+		UINT8 error = G_CheckDemoExtraFiles(&demobuf.p, false);
+
+		if (error)
+		{
+			switch (error)
+			{
+			case DFILE_ERROR_NOTLOADED:
+				snprintf(msg, 1024,
+					M_GetText("Required files for this demo are not loaded.\n\nUse\n\"playdemo %s -addfiles\"\nto load them and play the demo.\n"),
+				pdemoname);
+				break;
+
+			case DFILE_ERROR_OUTOFORDER:
+				snprintf(msg, 1024,
+					M_GetText("Required files for this demo are loaded out of order.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n"),
+				pdemoname);
+				break;
+
+			case DFILE_ERROR_INCOMPLETEOUTOFORDER:
+				snprintf(msg, 1024,
+					M_GetText("Required files for this demo are not loaded, and some are out of order.\n\nUse\n\"playdemo %s -addfiles\"\nto load needed files and play the demo.\n"),
+				pdemoname);
+				break;
+
+			case DFILE_ERROR_CANNOTLOAD:
+				snprintf(msg, 1024,
+					M_GetText("Required files for this demo cannot be loaded.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n"),
+				pdemoname);
+				break;
+
+			case DFILE_ERROR_EXTRAFILES:
+				snprintf(msg, 1024,
+					M_GetText("You have additional files loaded beyond the demo's file list.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n"),
+				pdemoname);
+				break;
+			}
+
+			CONS_Alert(CONS_ERROR, "%s", msg);
+			if (!CON_Ready()) // In the console they'll just see the notice there! No point pulling them out.
+				M_StartMessage(msg, NULL, MM_NOTHING);
+			G_ResetDemoPlayback(pdemoname);
+			return;
+		}
+	}
+#ifdef DEMO_COMPAT_100
+	}
+#endif
+
+	modeattacking = (demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT;
+	multiplayer = !!(demoflags & DF_MULTIPLAYER);
+	CON_ToggleOff();
+
+	hu_demotime = UINT32_MAX;
+	hu_demolap = UINT32_MAX;
+
+	switch (modeattacking)
+	{
+	case ATTACKING_NONE: // 0
+		break;
+	case ATTACKING_RECORD: // 1
+		hu_demotime  = READUINT32(demobuf.p);
+		hu_demolap  = READUINT32(demobuf.p);
+		break;
+	default: // 3
+		modeattacking = ATTACKING_NONE;
+		break;
+	}
+
+	// Random seed
+	randseed = READUINT32(demobuf.p);
+#ifdef DEMO_COMPAT_100
+	if (demo.version != 0x0001)
+#endif
+	demobuf.p += 4; // Extrainfo location
+
+#ifdef DEMO_COMPAT_100
+	if (demo.version == 0x0001)
+	{
+		// Player name
+		M_Memcpy(player_names[0],demobuf.p,16);
+		demobuf.p += 16;
+
+		// Skin
+		M_Memcpy(skin,demobuf.p,16);
+		demobuf.p += 16;
+
+		// Color
+		M_Memcpy(color,demobuf.p,16);
+		demobuf.p += 16;
+
+		demobuf.p += 5; // Backwards compat - some stats
+		// SRB2kart
+		kartspeed[0] = READUINT8(demobuf.p);
+		kartweight[0] = READUINT8(demobuf.p);
+		//
+		demobuf.p += 9; // Backwards compat - more stats
+
+		// Skin not loaded?
+		if (!SetPlayerSkin(0, skin))
+		{
+			snprintf(msg, 1024, M_GetText("%s features a character that is not currently loaded.\n"), pdemoname);
+			CONS_Alert(CONS_ERROR, "%s", msg);
+			M_StartMessage(msg, NULL, MM_NOTHING);
+			G_ResetDemoPlayback(pdemoname);
+			return;
+		}
+
+		// ...*map* not loaded?
+		if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK))
+		{
+			snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
+			CONS_Alert(CONS_ERROR, "%s", msg);
+			M_StartMessage(msg, NULL, MM_NOTHING);
+			G_ResetDemoPlayback(pdemoname);
+			return;
+		}
+
+		// Set color
+		for (i = 0; i < MAXSKINCOLORS; i++)
+			if (!stricmp(KartColor_Names[i],color))				// SRB2kart
+			{
+				players[0].skincolor = i;
+				break;
+			}
+
+		// net var data
+		CV_LoadNetVars(&demobuf.p);
+
+		// Sigh ... it's an empty demo.
+		if (*demobuf.p == DEMOMARKER)
+		{
+			snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
+			CONS_Alert(CONS_ERROR, "%s", msg);
+			M_StartMessage(msg, NULL, MM_NOTHING);
+			G_ResetDemoPlayback(pdemoname);
+			return;
+		}
+
+		Z_Free(pdemoname);
+
+		memset(&oldcmd,0,sizeof(oldcmd));
+		memset(&oldghost,0,sizeof(oldghost));
+		memset(&ghostext,0,sizeof(ghostext));
+
+		CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
+
+		// console warning messages
+#if defined(SKIPERRORS) && !defined(DEVELOP)
+		demosynced = (!skiperrors);
+#else
+		demosynced = true;
+#endif
+
+		// didn't start recording right away.
+		demo.deferstart = false;
+
+		consoleplayer = 0;
+		memset(displayplayers, 0, sizeof(displayplayers));
+		memset(playeringame, 0, sizeof(playeringame));
+		playeringame[0] = true;
+
+		goto post_compat;
+	}
+#endif
+
+	// net var data
+	CV_LoadNetVars(&demobuf.p);
+
+	// Sigh ... it's an empty demo.
+	if (*demobuf.p == DEMOMARKER)
+	{
+		snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
+		CONS_Alert(CONS_ERROR, "%s", msg);
+		M_StartMessage(msg, NULL, MM_NOTHING);
+		G_ResetDemoPlayback(pdemoname);
+		return;
+	}
+
+	Z_Free(pdemoname);
+
+	memset(&oldcmd,0,sizeof(oldcmd));
+	memset(&oldghost,0,sizeof(oldghost));
+	memset(&ghostext,0,sizeof(ghostext));
+
+#if defined(SKIPERRORS) && !defined(DEVELOP)
+	if ((VERSION != version || SUBVERSION != subversion) && !skiperrors)
+#else
+	if (VERSION != version || SUBVERSION != subversion)
+#endif
+		CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
+
+	// console warning messages
+#if defined(SKIPERRORS) && !defined(DEVELOP)
+	demosynced = (!skiperrors);
+#else
+	demosynced = true;
+#endif
+
+	// didn't start recording right away.
+	demo.deferstart = false;
+
+	//LUA_HookInt(gamemap, HOOK(MapChange));
+
+	consoleplayer = 0;
+	memset(playeringame, 0, sizeof(playeringame));
+	memset(displayplayers, 0, sizeof(displayplayers));
+	memset(camera, 0, sizeof(camera)); // reset freecam
+
+	// Load players that were in-game when the map started
+	p = READUINT8(demobuf.p);
+
+	while (p != 0xFF)
+	{
+		spectator = false;
+		if (p & DEMO_SPECTATOR)
+		{
+			spectator = true;
+			p &= ~DEMO_SPECTATOR;
+
+			if (modeattacking)
+			{
+				snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with spectators, and is thus invalid.\n"), pdemoname);
+				CONS_Alert(CONS_ERROR, "%s", msg);
+				M_StartMessage(msg, NULL, MM_NOTHING);
+				G_ResetDemoPlayback(pdemoname);
+				return;
+			}
+		}
+		slots[numslots] = p; numslots++;
+
+		if (modeattacking && numslots > 1)
+		{
+			snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with multiple players, and is thus invalid.\n"), pdemoname);
+			CONS_Alert(CONS_ERROR, "%s", msg);
+			M_StartMessage(msg, NULL, MM_NOTHING);
+			G_ResetDemoPlayback(pdemoname);
+			return;
+		}
+
+		if (!playeringame[displayplayers[0]] || players[displayplayers[0]].spectator)
+			displayplayers[0] = consoleplayer = serverplayer = p;
+
+		playeringame[p] = true;
+		players[p].spectator = spectator;
+
+		// Name
+		M_Memcpy(player_names[p],demobuf.p,16);
+		demobuf.p += 16;
+
+		// Skin
+		M_Memcpy(skin,demobuf.p,16);
+		demobuf.p += 16;
+		SetPlayerSkin(p, skin);
+
+		// Color
+		M_Memcpy(color,demobuf.p,16);
+		demobuf.p += 16;
+		for (i = 0; i < MAXSKINCOLORS; i++)
+			if (!stricmp(KartColor_Names[i],color))				// SRB2kart
+			{
+				players[p].skincolor = i;
+				break;
+			}
+
+		// Score, since Kart uses this to determine where you start on the map
+		players[p].score = READUINT32(demobuf.p);
+
+		// Kart stats, temporarily
+		kartspeed[p] = READUINT8(demobuf.p);
+		kartweight[p] = READUINT8(demobuf.p);
+
+		if (stricmp(skins[players[p].skin].name, skin) != 0)
+			FindClosestSkinForStats(p, kartspeed[p], kartweight[p]);
+
+		// Look for the next player
+		p = READUINT8(demobuf.p);
+	}
+
+	// end of player read (the 0xFF marker)
+	// so this is where we are to read our lua variables (if possible!)
+	if (demoflags & DF_LUAVARS)	// again, used for compability, lua shit will be saved to replays regardless of if it's even been loaded
+	{
+		if (!gL)	// No Lua state! ...I guess we'll just start one...
+			LUA_ClearState();
+
+		// No modeattacking check, DF_LUAVARS won't be present here.
+		LUA_UnArchive(&demobuf, false);
+	}
+
+	splitscreen = 0;
+
+	if (demo.title)
+	{
+		splitscreen = M_RandomKey(6)-1;
+		splitscreen = min(min(3, numslots-1), splitscreen); // Bias toward 1p and 4p views
+
+		for (p = 0; p <= splitscreen; p++)
+			G_ResetView(p+1, slots[M_RandomKey(numslots)], false);
+	}
+
+	R_ExecuteSetViewSize();
+
+#ifdef DEMO_COMPAT_100
+post_compat:
+#endif
+
+	P_SetRandSeed(randseed);
+	G_InitNew(demoflags & DF_ENCORE, G_BuildMapName(gamemap), true, true); // Doesn't matter whether you reset or not here, given changes to resetplayer.
+
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		if (players[i].mo)
+		{
+			players[i].mo->color = players[i].skincolor;
+			oldghost[i].x = players[i].mo->x;
+			oldghost[i].y = players[i].mo->y;
+			oldghost[i].z = players[i].mo->z;
+		}
+
+		// Set saved attribute values
+		// No cheat checking here, because even if they ARE wrong...
+		// it would only break the replay if we clipped them.
+		players[i].kartspeed = kartspeed[i];
+		players[i].kartweight = kartweight[i];
+	}
+
+	if (cv_director.value)
+		CV_SetValue(&cv_director, 0);
+
+	demo.deferstart = true;
+}
+#undef SKIPERRORS
+
+void G_AddGhost(char *defdemoname)
+{
+	INT32 i;
+	lumpnum_t l;
+	char name[17],skin[17],color[17],*n,*pdemoname,md5[16];
+	demoghost *gh;
+	UINT8 flags;
+	UINT8 *buffer,*p;
+	mapthing_t *mthing;
+	UINT16 count, ghostversion;
+	skin_t *ghskin = &skins[0];
+	UINT8 kartspeed = UINT8_MAX, kartweight = UINT8_MAX;
+
+	name[16] = '\0';
+	skin[16] = '\0';
+	color[16] = '\0';
+
+	n = defdemoname+strlen(defdemoname);
+	while (*n != '/' && *n != '\\' && n != defdemoname)
+		n--;
+	if (n != defdemoname)
+		n++;
+	pdemoname = ZZ_Alloc(strlen(n)+1);
+	strcpy(pdemoname,n);
+
+	// Internal if no extension, external if one exists
+	if (FIL_CheckExtension(defdemoname))
+	{
+		//FIL_DefaultExtension(defdemoname, ".lmp");
+		if (!FIL_ReadFileTag(defdemoname, &buffer, PU_LEVEL))
+		{
+			CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), defdemoname);
+			Z_Free(pdemoname);
+			return;
+		}
+		p = buffer;
+	}
+	// load demo resource from WAD
+	else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
+		Z_Free(pdemoname);
+		return;
+	}
+	else // it's an internal demo
+		buffer = p = W_CacheLumpNum(l, PU_LEVEL);
+
+	// read demo header
+	if (memcmp(p, DEMOHEADER, 12))
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Not a SRB2Kart replay.\n"), pdemoname);
+		Z_Free(pdemoname);
+		Z_Free(buffer);
+		return;
+	}
+
+	p += 12; // DEMOHEADER
+	p++; // VERSION
+	p++; // SUBVERSION
+
+	ghostversion = READUINT16(p);
+	switch(ghostversion)
+	{
+	case DEMOVERSION: // latest always supported
+		p += 64; // title
+		break;
+#ifdef DEMO_COMPAT_100
+	case 0x0001:
+		break;
+#endif
+	// too old, cannot support.
+	default:
+		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo version incompatible.\n"), pdemoname);
+		Z_Free(pdemoname);
+		Z_Free(buffer);
+		return;
+	}
+
+	M_Memcpy(md5, p, 16); p += 16; // demo checksum
+	for (gh = ghosts; gh; gh = gh->next)
+		if (!memcmp(md5, gh->checksum, 16)) // another ghost in the game already has this checksum?
+		{ // Don't add another one, then!
+			CONS_Debug(DBG_SETUP, "Rejecting duplicate ghost %s (MD5 was matched)\n", pdemoname);
+			Z_Free(pdemoname);
+			Z_Free(buffer);
+			return;
+		}
+
+	if (memcmp(p, "PLAY", 4))
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo format unacceptable.\n"), pdemoname);
+		Z_Free(pdemoname);
+		Z_Free(buffer);
+		return;
+	}
+
+	p += 4; // "PLAY"
+	p += 2; // gamemap
+	p += 16; // mapmd5 (possibly check for consistency?)
+
+	flags = READUINT8(p);
+
+	if (!(flags & DF_GHOST))
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: No ghost data in this demo.\n"), pdemoname);
+		Z_Free(pdemoname);
+		Z_Free(buffer);
+		return;
+	}
+
+#ifdef DEMO_COMPAT_100
+	if (ghostversion != 0x0001)
+#endif
+		p++; // gametype
+
+#ifdef DEMO_COMPAT_100
+	if (ghostversion != 0x0001)
+#endif
+		G_SkipDemoExtraFiles(&p); // Don't wanna modify the file list for ghosts.
+	switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
+	{
+	case ATTACKING_NONE: // 0
+		break;
+	case ATTACKING_RECORD: // 1
+		p += 8; // demo time, lap
+		break;
+	default: // 3
+		break;
+	}
+
+	p += 4; // random seed
+
+#ifdef DEMO_COMPAT_100
+	if (ghostversion == 0x0001)
+	{
+		// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
+		M_Memcpy(name, p,16);
+		p += 16;
+
+		// Skin
+		M_Memcpy(skin, p,16);
+		p += 16;
+
+		// Color
+		M_Memcpy(color, p,16);
+		p += 16;
+
+		// Ghosts do not have a player structure to put this in.
+		p++; // charability
+		p++; // charability2
+		p++; // actionspd
+		p++; // mindash
+		p++; // maxdash
+		// SRB2kart
+		p++; // kartspeed
+		p++; // kartweight
+		//
+		p++; // normalspeed
+		p++; // runspeed
+		p++; // thrustfactor
+		p++; // accelstart
+		p++; // acceleration
+		p += 4; // jumpfactor
+	}
+	else
+#endif
+	p += 4; // Extra data location reference
+
+	// net var data
+	count = READUINT16(p);
+	while (count--)
+	{
+		p += 2;
+		SKIPSTRING(p);
+		p++;
+	}
+
+	if (*p == DEMOMARKER)
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Replay is empty.\n"), pdemoname);
+		Z_Free(pdemoname);
+		Z_Free(buffer);
+		return;
+	}
+
+#ifdef DEMO_COMPAT_100
+	if (ghostversion != 0x0001)
+	{
+#endif
+	if (READUINT8(p) != 0)
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Invalid player slot.\n"), pdemoname);
+		Z_Free(pdemoname);
+		Z_Free(buffer);
+		return;
+	}
+
+	// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
+	M_Memcpy(name, p, 16);
+	p += 16;
+
+	// Skin
+	M_Memcpy(skin, p, 16);
+	p += 16;
+
+	// Color
+	M_Memcpy(color, p, 16);
+	p += 16;
+
+	p += 4; // score
+
+	kartspeed = READUINT8(p);
+	kartweight = READUINT8(p);
+
+	if (READUINT8(p) != 0xFF)
+	{
+		CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Invalid player slot.\n"), pdemoname);
+		Z_Free(pdemoname);
+		Z_Free(buffer);
+		return;
+	}
+#ifdef DEMO_COMPAT_100
+	}
+#endif
+
+	for (i = 0; i < numskins; i++)
+		if (!stricmp(skins[i].name,skin))
+		{
+			ghskin = &skins[i];
+			break;
+		}
+
+	if (i == numskins)
+	{
+		if (kartspeed != UINT8_MAX && kartweight != UINT8_MAX)
+			ghskin = &skins[GetSkinNumClosestToStats(kartspeed, kartweight)];
+
+		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Invalid character. Falling back to %s.\n"), pdemoname, ghskin->name);
+	}
+
+	gh = Z_Calloc(sizeof(demoghost), PU_LEVEL, NULL);
+	gh->next = ghosts;
+	gh->buffer = buffer;
+	M_Memcpy(gh->checksum, md5, 16);
+	gh->p = p;
+
+	ghosts = gh;
+
+	gh->version = ghostversion;
+	mthing = playerstarts[0];
+	I_Assert(mthing);
+	{ // A bit more complex than P_SpawnPlayer because ghosts aren't solid and won't just push themselves out of the ceiling.
+		fixed_t z,f,c;
+		gh->mo = P_SpawnMobj(mthing->x << FRACBITS, mthing->y << FRACBITS, 0, MT_GHOST);
+		gh->mo->angle = FixedAngle(mthing->angle*FRACUNIT);
+		f = gh->mo->floorz;
+		c = gh->mo->ceilingz - mobjinfo[MT_PLAYER].height;
+		if (!!(mthing->options & MTF_AMBUSH) ^ !!(mthing->options & MTF_OBJECTFLIP))
+		{
+			z = c;
+			if (mthing->options >> ZSHIFT)
+				z -= ((mthing->options >> ZSHIFT) << FRACBITS);
+			if (z < f)
+				z = f;
+		}
+		else
+		{
+			z = f;
+			if (mthing->options >> ZSHIFT)
+				z += ((mthing->options >> ZSHIFT) << FRACBITS);
+			if (z > c)
+				z = c;
+		}
+		gh->mo->z = z;
+	}
+	gh->mo->state = states+S_KART_STND1; // SRB2kart - was S_PLAY_STND
+	gh->mo->sprite = gh->mo->state->sprite;
+	gh->mo->frame = (gh->mo->state->frame & FF_FRAMEMASK) | tr_trans20<<FF_TRANSSHIFT;
+	gh->mo->tics = -1;
+
+	gh->oldmo.x = gh->mo->x;
+	gh->oldmo.y = gh->mo->y;
+	gh->oldmo.z = gh->mo->z;
+
+	// Set skin
+	gh->mo->skin = gh->oldmo.skin = ghskin;
+
+	// Set color
+	gh->mo->color = ((skin_t*)gh->mo->skin)->prefcolor;
+	for (i = 0; i < MAXSKINCOLORS; i++)
+		if (!stricmp(KartColor_Names[i],color))				// SRB2kart
+		{
+			gh->mo->color = (UINT8)i;
+			break;
+		}
+	gh->oldmo.color = gh->mo->color;
+
+	CONS_Printf(M_GetText("Added ghost %s from %s\n"), name, pdemoname);
+	Z_Free(pdemoname);
+}
+
+// A simplified version of G_AddGhost...
+void G_UpdateStaffGhostName(lumpnum_t l)
+{
+	UINT8 *buffer,*p;
+	UINT16 ghostversion;
+	UINT8 flags;
+
+	buffer = p = W_CacheLumpNum(l, PU_CACHE);
+
+	// read demo header
+	if (memcmp(p, DEMOHEADER, 12))
+	{
+		goto fail;
+	}
+
+	p += 12; // DEMOHEADER
+	p++; // VERSION
+	p++; // SUBVERSION
+
+	ghostversion = READUINT16(p);
+	switch(ghostversion)
+	{
+	case DEMOVERSION: // latest always supported
+		p += 64; // full demo title
+		break;
+
+#ifdef DEMO_COMPAT_100
+	case 0x0001:
+		break;
+#endif
+
+	// too old, cannot support.
+	default:
+		goto fail;
+	}
+
+	p += 16; // demo checksum
+
+	if (memcmp(p, "PLAY", 4))
+	{
+		goto fail;
+	}
+
+	p += 4; // "PLAY"
+	p += 2; // gamemap
+	p += 16; // mapmd5 (possibly check for consistency?)
+
+	flags = READUINT8(p);
+	if (!(flags & DF_GHOST))
+	{
+		goto fail; // we don't NEED to do it here, but whatever
+	}
+
+#ifdef DEMO_COMPAT_100
+	if (ghostversion != 0x0001)
+#endif
+	p++; // Gametype
+
+#ifdef DEMO_COMPAT_100
+	if (ghostversion != 0x0001)
+#endif
+	G_SkipDemoExtraFiles(&p);
+
+	switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
+	{
+	case ATTACKING_NONE: // 0
+		break;
+	case ATTACKING_RECORD: // 1
+		p += 8; // demo time, lap
+		break;
+	default: // 3
+		break;
+	}
+
+	p += 4; // random seed
+
+
+#ifdef DEMO_COMPAT_100
+	if (ghostversion == 0x0001)
+	{
+		// Player name
+		M_Memcpy(dummystaffname, p,16);
+		dummystaffname[16] = '\0';
+		goto fail; // Not really a failure but whatever
+	}
+#endif
+
+	p += 4; // Extrainfo location marker
+
+	// Ehhhh don't need ghostversion here (?) so I'll reuse the var here
+	ghostversion = READUINT16(p);
+	while (ghostversion--)
+	{
+		p += 2;
+		SKIPSTRING(p);
+		p++; // stealth
+	}
+
+	// Assert first player is in and then read name
+	if (READUINT8(p) != 0)
+		goto fail;
+	M_Memcpy(dummystaffname, p,16);
+	dummystaffname[16] = '\0';
+
+	// Ok, no longer any reason to care, bye
+fail:
+	Z_Free(buffer);
+	return;
+}
+
+//
+// G_TimeDemo
+// NOTE: name is a full filename for external demos
+//
+static INT32 restorecv_vidwait;
+
+void G_TimeDemo(const char *name)
+{
+	nodrawers = M_CheckParm("-nodraw");
+	noblit = M_CheckParm("-noblit");
+	restorecv_vidwait = cv_vidwait.value;
+	if (cv_vidwait.value)
+		CV_Set(&cv_vidwait, "0");
+	demo.timing = true;
+	singletics = true;
+	framecount = 0;
+	demostarttime = I_GetTime();
+	G_DeferedPlayDemo(name);
+}
+
+void G_DoPlayMetal(void)
+{
+	lumpnum_t l;
+	mobj_t *mo = NULL;
+	thinker_t *th;
+
+	// it's an internal demo
+	if ((l = W_CheckNumForName(va("%sMS",G_BuildMapName(gamemap)))) == LUMPERROR)
+	{
+		CONS_Alert(CONS_WARNING, M_GetText("No bot recording for this map.\n"));
+		return;
+	}
+	else
+		metalbuffer = metal_p = W_CacheLumpNum(l, PU_STATIC);
+
+	// find metal sonic
+	for (th = thinkercap.next; th != &thinkercap; th = th->next)
+	{
+		if (th->function != (actionf_p1)P_MobjThinker)
+			continue;
+
+		mo = (mobj_t *)th;
+		if (mo->type == MT_METALSONIC_RACE)
+			break;
+	}
+	if (!mo)
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("Failed to find bot entity.\n"));
+		Z_Free(metalbuffer);
+		return;
+	}
+
+	// read demo header
+    metal_p += 12; // DEMOHEADER
+	metal_p++; // VERSION
+	metal_p++; // SUBVERSION
+	metalversion = READUINT16(metal_p);
+	switch(metalversion)
+	{
+	case DEMOVERSION: // latest always supported
+		break;
+#ifdef DEMO_COMPAT_100
+	case 0x0001:
+		I_Error("You need to implement demo compat here, doofus! %s:%d", __FILE__, __LINE__);
+#endif
+	// too old, cannot support.
+	default:
+		CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, format version incompatible.\n"));
+		Z_Free(metalbuffer);
+		return;
+	}
+	metal_p += 16; // demo checksum
+	if (memcmp(metal_p, "METL", 4))
+	{
+		CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, wasn't recorded in Metal format.\n"));
+		Z_Free(metalbuffer);
+		return;
+	} metal_p += 4; // "METL"
+
+	// read initial tic
+	memset(&oldmetal,0,sizeof(oldmetal));
+	oldmetal.x = mo->x;
+	oldmetal.y = mo->y;
+	oldmetal.z = mo->z;
+	oldmetal.angle = mo->angle;
+	metalplayback = mo;
+}
+
+void G_DoneLevelLoad(void)
+{
+	CONS_Printf(M_GetText("Loaded level in %f sec\n"), (double)(I_GetTime() - demostarttime) / TICRATE);
+	framecount = 0;
+	demostarttime = I_GetTime();
+}
+
+/*
+===================
+=
+= G_CheckDemoStatus
+=
+= Called after a death or level completion to allow demos to be cleaned up
+= Returns true if a new demo loop action will take place
+===================
+*/
+
+// Stops metal sonic's demo. Separate from other functions because metal + replays can coexist
+void G_StopMetalDemo(void)
+{
+	// Metal Sonic finishing doesn't end the game, dammit.
+	Z_Free(metalbuffer);
+	metalbuffer = NULL;
+	metalplayback = NULL;
+	metal_p = NULL;
+}
+
+// Stops metal sonic recording.
+ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void)
+{
+	boolean saved = false;
+	if (demobuf.p && demobuf.buffer != NULL)
+	{
+		UINT8 *p = demobuf.buffer+16; // checksum position
+#ifdef NOMD5
+		UINT8 i;
+		WRITEUINT8(demobuf.p, DEMOMARKER); // add the demo end marker
+		for (i = 0; i < 16; i++, p++)
+			*p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
+#else
+		WRITEUINT8(demobuf.p, DEMOMARKER); // add the demo end marker
+		md5_buffer((char *)p+16, demobuf.p - (p+16), (void *)p); // make a checksum of everything after the checksum in the file.
+#endif
+		saved = FIL_WriteFile(va("%sMS.LMP", G_BuildMapName(gamemap)), demobuf.buffer, demobuf.p - demobuf.buffer); // finally output the file.
+	}
+	Z_Free(demobuf.buffer);
+	demobuf.buffer = NULL;
+	metalrecording = false;
+	if (saved)
+		I_Error("Saved to %sMS.LMP", G_BuildMapName(gamemap));
+	I_Error("Failed to save demo!");
+}
+
+// reset engine variable set for the demos
+// called from stopdemo command, map command, and g_checkdemoStatus.
+void G_StopDemo(void)
+{
+	Z_Free(demobuf.buffer);
+	demobuf.buffer = NULL;
+	demo.playback = false;
+	if (demo.title)
+		modeattacking = ATTACKING_NONE;
+	demo.title = false;
+	demo.timing = false;
+	singletics = false;
+
+	UINT8 i;
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
+	{
+		camera[i].freecam = false;
+		camera[i].localangle = 0;
+		camera[i].localaiming = 0;
+	}
+
+	CV_SetValue(&cv_playbackspeed, 1);
+	demo.rewinding = false;
+	CL_ClearRewinds();
+
+	if (gamestate == GS_LEVEL && rendermode != render_none)
+	{
+		V_SetPaletteLump("PLAYPAL"); // Reset the palette
+		R_ReInitColormaps(0, LUMPERROR);
+	}
+	if (gamestate == GS_INTERMISSION)
+		Y_EndIntermission(); // cleanup
+	if (gamestate == GS_VOTING)
+		Y_EndVote();
+
+	M_ClearMenus(true);
+
+	G_SetGamestate(GS_NULL);
+	wipegamestate = GS_NULL;
+	SV_StopServer();
+	SV_ResetServer();
+}
+
+// Stops timing a demo.
+static void G_StopTimingDemo(void)
+{
+	INT32 demotime;
+	double f1, f2;
+	demotime = I_GetTime() - demostarttime;
+	if (!demotime)
+		return;
+	G_StopDemo();
+	demo.timing = false;
+	f1 = (double)demotime;
+	f2 = (double)framecount*TICRATE;
+
+	CONS_Printf(M_GetText("timed %u gametics in %d realtics - %u frames\n%f seconds, %f avg fps\n"),
+				leveltime, demotime, (UINT32)framecount, f1/TICRATE, f2/f1);
+
+	if (restorecv_vidwait != cv_vidwait.value)
+		CV_SetValue(&cv_vidwait, restorecv_vidwait);
+
+	D_StartTitle();
+}
+
+
+boolean G_CheckDemoStatus(void)
+{
+	while (ghosts)
+	{
+		demoghost *next = ghosts->next;
+		Z_Free(ghosts);
+		ghosts = next;
+	}
+	ghosts = NULL;
+
+	// DO NOT end metal sonic demos here
+
+	if (demo.timing)
+	{
+		G_StopTimingDemo();
+		return true;
+	}
+
+	if (demo.playback)
+	{
+		if (demo.quitafterplaying)
+			I_Quit();
+
+		if (multiplayer && !demo.title)
+		{
+			G_ExitLevel();
+		}
+		else if (modeattacking && !demo.title) // nooo dont crash our titledemos
+		{
+			G_StopDemo();
+			M_EndModeAttackRun();
+		}
+		else
+		{
+			G_StopDemo();
+			D_StartTitle();
+		}
+
+		return true;
+	}
+
+	if (!demo.recording)
+		return false;
+
+	if (modeattacking || demo.savemode != DSM_NOTSAVING)
+	{
+		G_SaveDemo();
+		return true;
+	}
+
+	G_ResetDemoRecording();
+
+	return false;
+}
+
+void G_ResetDemoRecording(void)
+{
+	if (demobuf.buffer)
+		Z_Free(demobuf.buffer);
+	demobuf.buffer = NULL;
+	demo.recording = false;
+}
+
+static void G_ResetDemoPlayback(char *pdemoname)
+{
+	if (pdemoname)
+		Z_Free(pdemoname);
+	if (demobuf.buffer)
+		Z_Free(demobuf.buffer);
+	demobuf.buffer = NULL;
+	demo.playback = false;
+	if (demo.title)
+		modeattacking = ATTACKING_NONE;
+	demo.title = false;
+}
+
+void G_SaveDemo(void)
+{
+	if (!demobuf.p)
+	{
+		CONS_Alert(CONS_ERROR, "Failed to save Demo. No Demo pointer exists!\n");
+		// reset the demo buffer
+		G_ResetDemoRecording();
+		return;
+	}
+
+	if (demobuf.buffer == NULL)
+	{
+		CONS_Alert(CONS_ERROR, "Failed to save Demo. No Demo buffer allocated!\n");
+		// reset the demo buffer
+		G_ResetDemoRecording();
+		return;
+	}
+
+	UINT8 *p = demobuf.buffer+16; // after version
+	UINT32 length;
+
+	// Ensure extrainfo pointer is always available, even if no info is present.
+	if (demoinfo_p && *(UINT32 *)demoinfo_p == 0)
+	{
+		WRITEUINT8(demobuf.p, DEMOMARKER); // add the demo end marker
+		*(UINT32 *)demoinfo_p = demobuf.p - demobuf.buffer;
+	}
+	WRITEUINT8(demobuf.p, DW_END); // Mark end of demo extra data.
+
+	M_Memcpy(p, demo.titlename, 64); // Write demo title here
+	p += 64;
+
+	if (multiplayer)
+	{
+		// Change the demo's name to be a slug of the title
+		char demo_slug[128];
+		char *writepoint;
+		size_t i, strindex = 0;
+		boolean dash = true;
+
+		for (i = 0; demo.titlename[i] && i < 127; i++)
+		{
+			if ((demo.titlename[i] >= 'a' && demo.titlename[i] <= 'z') ||
+				(demo.titlename[i] >= '0' && demo.titlename[i] <= '9'))
+			{
+				demo_slug[strindex] = demo.titlename[i];
+				strindex++;
+				dash = false;
+			}
+			else if (demo.titlename[i] >= 'A' && demo.titlename[i] <= 'Z')
+			{
+				demo_slug[strindex] = demo.titlename[i] + 'a' - 'A';
+				strindex++;
+				dash = false;
+			}
+			else if (!dash)
+			{
+				demo_slug[strindex] = '-';
+				strindex++;
+				dash = true;
+			}
+		}
+
+		demo_slug[strindex] = 0;
+		if (dash) demo_slug[strindex-1] = 0;
+
+		writepoint = strstr(demoname, "-") + 1;
+		demo_slug[128 - (writepoint - demoname) - 4] = 0;
+		sprintf(writepoint, "%s.lmp", demo_slug);
+	}
+
+	length = *(UINT32 *)demoinfo_p;
+	WRITEUINT32(demoinfo_p, length);
+#ifdef NOMD5
+	for (UINT8 k = 0; k < 16; k++, p++)
+		*p = M_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
+#else
+	// Make a checksum of everything after the checksum in the file up to the end of the standard data. Extrainfo is freely modifiable.
+	md5_buffer((char *)p+16, (demobuf.buffer + length) - (p+16), p);
+#endif
+
+
+	if (FIL_WriteFile(va(pandf, srb2home, demoname), demobuf.buffer, demobuf.p - demobuf.buffer)) // finally output the file.
+		demo.savemode = DSM_SAVED;
+
+	G_ResetDemoRecording();
+
+	if (modeattacking != ATTACKING_RECORD)
+	{
+		if (demo.savemode == DSM_SAVED)
+			CONS_Printf(M_GetText("Demo %s recorded\n"), demoname);
+		else
+			CONS_Alert(CONS_WARNING, M_GetText("Demo %s not saved\n"), demoname);
+	}
+}
+
+boolean G_DemoTitleResponder(event_t *ev)
+{
+	INT32 ch;
+
+	if (ev->type != ev_keydown)
+		return false;
+
+	ch = (INT32)ev->data1;
+
+	// Only ESC and non-keyboard keys abort connection
+	if (ch == KEY_ESCAPE)
+	{
+		demo.savemode = (cv_recordmultiplayerdemos.value == 2) ? DSM_WILLAUTOSAVE : DSM_NOTSAVING;
+		return true;
+	}
+
+	if (ch == KEY_ENTER || ch >= KEY_MOUSE1)
+	{
+		demo.savemode = DSM_WILLSAVE;
+		return true;
+	}
+
+	M_TextInputHandle(&demo.titlenameinput, ch);
+
+	return true;
+}
diff --git a/src/g_demo.h b/src/g_demo.h
new file mode 100644
index 000000000..de1495e91
--- /dev/null
+++ b/src/g_demo.h
@@ -0,0 +1,191 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 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  g_demo.h
+/// \brief Demo recording and playback
+
+#ifndef __G_DEMO__
+#define __G_DEMO__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "doomdef.h"
+#include "doomstat.h"
+#include "d_event.h"
+#include "p_saveg.h"
+#include "m_textinput.h"
+
+extern savebuffer_t demobuf;
+
+// demoplaying back and demo recording
+extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality, cv_maxdemosize, cv_demochangemap;
+extern consvar_t cv_demodateformat;
+extern consvar_t cv_resyncdemo;
+
+// Publicly-accessible demo vars
+struct demovars_s {
+	char titlename[65];
+	textinput_t titlenameinput;
+	boolean recording, playback, timing;
+	UINT16 version; // Current file format of the demo being played
+	boolean title; // Title Screen demo can be cancelled by any key
+	boolean rewinding; // Rewind in progress
+
+	boolean loadfiles, ignorefiles; // Demo file loading options
+	boolean fromtitle; // SRB2Kart: Don't stop the music
+	boolean inreplayhut; // Go back to replayhut after demos
+	boolean quitafterplaying; // quit after playing a demo from cmdline
+	boolean deferstart; // don't start playing demo right away
+
+	tic_t savebutton; // Used to determine when the local player can choose to save the replay while the race is still going
+	enum {
+		DSM_NOTSAVING,
+		DSM_WILLAUTOSAVE,
+		DSM_TITLEENTRY,
+		DSM_WILLSAVE,
+		DSM_SAVED
+	} savemode;
+};
+
+extern struct demovars_s demo;
+
+typedef enum {
+	MD_NOTLOADED,
+	MD_LOADED,
+	MD_SUBDIR,
+	MD_OUTDATED,
+	MD_INVALID
+} menudemotype_e;
+
+typedef struct menudemo_s {
+	char filepath[256];
+	menudemotype_e type;
+
+	char title[65]; // Null-terminated for string prints
+	char date[11]; // date when replay was recorded
+	char version[12]; // combined version and subversion
+	UINT16 map;
+	UINT8 addonstatus; // What do we need to do addon-wise to play this demo?
+	UINT8 gametype;
+	UINT8 kartspeed; // Add OR DF_ENCORE for encore mode, idk
+	UINT8 numlaps;
+
+	struct {
+		UINT8 ranking;
+		char name[17];
+		UINT8 skin, color;
+		UINT32 timeorscore;
+	} standings[MAXPLAYERS];
+} menudemo_t;
+
+extern mobj_t *metalplayback;
+
+// Only called by startup code.
+void G_RecordDemo(const char *name);
+void G_RecordMetal(void);
+void G_BeginRecording(void);
+void G_BeginMetal(void);
+
+// Only called by shutdown code.
+void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT32 val);
+void G_SetDemoTime(UINT32 ptime, UINT32 plap);
+UINT8 G_CmpDemoTime(char *oldname, char *newname);
+
+void G_LoadDemoInfo(menudemo_t *pdemo);
+void G_LoadDemoTitle(menudemo_t *pdemo); // For use in replay search feature
+void G_DeferedPlayDemo(const char *demo);
+
+typedef enum
+{
+	GHC_NORMAL = 0,
+	GHC_SUPER,
+	GHC_FIREFLOWER,
+	GHC_INVINCIBLE
+} ghostcolor_t;
+
+extern UINT8 demo_extradata[MAXPLAYERS];
+extern UINT8 demo_writerng;
+#define DXD_RESPAWN 0x01 // "respawn" command in console
+#define DXD_SKIN 0x02 // skin changed
+#define DXD_NAME 0x04 // name changed
+#define DXD_COLOR 0x08 // color changed
+#define DXD_PLAYSTATE 0x10 // state changed between playing, spectating, or not in-game
+
+#define DXD_PST_PLAYING 0x01
+#define DXD_PST_SPECTATING 0x02
+#define DXD_PST_LEFT 0x03
+
+// Record/playback tics
+void G_ReadDemoExtraData(void);
+void G_WriteDemoExtraData(void);
+void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum);
+void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum);
+void G_GhostAddThok(INT32 playernum);
+void G_GhostAddSpin(INT32 playernum);
+void G_GhostAddRev(INT32 playernum);
+void G_GhostAddColor(INT32 playernum, ghostcolor_t color);
+void G_GhostAddFlip(INT32 playernum);
+void G_GhostAddScale(INT32 playernum, fixed_t scale);
+void G_GhostAddHit(INT32 playernum, mobj_t *victim);
+void G_WriteAllGhostTics(void);
+void G_WriteGhostTic(mobj_t *ghost, INT32 playernum);
+void G_ConsAllGhostTics(void);
+void G_ConsGhostTic(INT32 playernum);
+void G_GhostTicker(void);
+
+void G_InitDemoRewind(void);
+void G_StoreRewindInfo(void);
+void G_PreviewRewind(tic_t previewtime);
+void G_ConfirmRewind(tic_t rewindtime);
+
+void G_ReadMetalTic(mobj_t *metal);
+void G_WriteMetalTic(mobj_t *metal);
+void G_SaveMetal(UINT8 **buffer);
+void G_LoadMetal(UINT8 **buffer);
+
+// Your naming conventions are stupid and useless.
+// There is no conflict here.
+typedef struct demoghost {
+	UINT8 checksum[16];
+	UINT8 *buffer, *p, color;
+	UINT16 version;
+	mobj_t oldmo, *mo;
+	struct demoghost *next;
+} demoghost;
+extern demoghost *ghosts;
+
+// G_CheckDemoExtraFiles: checks if our loaded WAD list matches the demo's.
+#define DFILE_ERROR_NOTLOADED            0x01 // Files are not loaded, but can be without a restart.
+#define DFILE_ERROR_OUTOFORDER           0x02 // Files are loaded, but out of order.
+#define DFILE_ERROR_INCOMPLETEOUTOFORDER 0x03 // Some files are loaded out of order, but others are not.
+#define DFILE_ERROR_CANNOTLOAD           0x04 // Files are missing and cannot be loaded.
+#define DFILE_ERROR_EXTRAFILES           0x05 // Extra files outside of the replay's file list are loaded.
+
+void G_ResetDemoRecording(void);
+void G_DoPlayDemo(char *defdemoname);
+void G_TimeDemo(const char *name);
+void G_AddGhost(char *defdemoname);
+void G_UpdateStaffGhostName(lumpnum_t l);
+void G_DoPlayMetal(void);
+void G_DoneLevelLoad(void);
+void G_StopMetalDemo(void);
+ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void);
+void G_StopDemo(void);
+boolean G_CheckDemoStatus(void);
+void G_SaveDemo(void);
+boolean G_DemoTitleResponder(event_t *ev);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // __G_DEMO__
diff --git a/src/g_game.c b/src/g_game.c
index 88decbd40..ab9412f67 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -52,6 +52,7 @@
 #include "md5.h" // demo checksums
 #include "k_director.h" // SRB2kart
 #include "k_kart.h" // SRB2kart
+#include "k_stats.h" // SRB2kart
 #include "r_fps.h" // frame interpolation/uncapped
 
 #ifdef HAVE_DISCORDRPC
@@ -66,10 +67,7 @@ boolean botingame;
 UINT8 botskin;
 UINT8 botcolor;
 
-JoyType_t Joystick;
-JoyType_t Joystick2;
-JoyType_t Joystick3;
-JoyType_t Joystick4;
+JoyType_t Joystick[MAXSPLITSCREENPLAYERS];
 
 // 1024 bytes is plenty for a savegame
 #define SAVEGAMESIZE (1024)
@@ -85,10 +83,7 @@ static void G_DoContinued(void);
 static void G_DoWorldDone(void);
 static void G_DoStartVote(void);
 
-char   mapmusname[7]; // Music name
-UINT16 mapmusflags; // Track and reset bit
-UINT32 mapmusposition; // Position to jump to
-UINT32 mapmusresume;
+music_t mapmusic;
 
 INT16 gamemap = 1;
 INT16 maptol;
@@ -107,15 +102,6 @@ UINT8 modeattacking = ATTACKING_NONE;
 boolean imcontinuing = false;
 boolean runemeraldmanager = false;
 
-// menu demo things
-UINT8  numDemos      = 0; //3; -- i'm FED UP of losing my skincolour to a broken demo. change this back when we make new ones
-UINT32 demoDelayTime = 15*TICRATE;
-UINT32 demoIdleTime  = 3*TICRATE;
-
-boolean nodrawers; // for comparative timing purposes
-boolean noblit; // for comparative timing purposes
-static tic_t demostarttime; // for comparative timing purposes
-
 boolean netgame; // only true if packets are broadcast
 boolean multiplayer;
 boolean playeringame[MAXPLAYERS];
@@ -123,7 +109,7 @@ boolean addedtogame;
 player_t players[MAXPLAYERS];
 
 INT32 consoleplayer; // player taking events and displaying
-INT32 displayplayers[MAXSPLITSCREENPLAYERS]; // view being displayed
+INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {0}; // view being displayed
 
 tic_t gametic;
 tic_t levelstarttic; // gametic at level start
@@ -176,8 +162,6 @@ INT32 tokenbits; // Used for setting token bits
 // Old Special Stage
 INT32 sstimer; // Time allotted in the special stage
 
-tic_t totalplaytime;
-UINT32 matchesplayed; // SRB2Kart
 boolean gamedataloaded = false;
 
 // Time attack data for levels
@@ -212,19 +196,19 @@ UINT16 spacetimetics = 11*TICRATE + (TICRATE/2);
 UINT16 extralifetics = 4*TICRATE;
 
 // SRB2kart
-tic_t introtime = 108+5; // plus 5 for white fade
-tic_t starttime = 6*TICRATE + (3*TICRATE/4);
-tic_t raceexittime = 5*TICRATE + (2*TICRATE/3);
-tic_t battleexittime = 8*TICRATE;
-INT32 hyudorotime = 7*TICRATE;
-INT32 stealtime = TICRATE/2;
-INT32 sneakertime = TICRATE + (TICRATE/3);
-INT32 itemtime = 8*TICRATE;
-INT32 comebacktime = 10*TICRATE;
-INT32 bumptime = 6;
-INT32 wipeoutslowtime = 20;
-INT32 wantedreduce = 5*TICRATE;
-INT32 wantedfrequency = 10*TICRATE;
+const tic_t introtime = 108+5; // plus 5 for white fade
+const tic_t starttime = 6*TICRATE + (3*TICRATE/4);
+const tic_t raceexittime = 5*TICRATE + (2*TICRATE/3);
+const tic_t battleexittime = 8*TICRATE;
+const INT32 hyudorotime = 7*TICRATE;
+const INT32 stealtime = TICRATE/2;
+const INT32 sneakertime = TICRATE + (TICRATE/3);
+const INT32 itemtime = 8*TICRATE;
+const INT32 comebacktime = 10*TICRATE;
+const INT32 bumptime = 6;
+const INT32 wipeoutslowtime = 20;
+const INT32 wantedreduce = 5*TICRATE;
+const INT32 wantedfrequency = 10*TICRATE;
 
 INT32 gameovertics = 15*TICRATE;
 
@@ -244,6 +228,8 @@ tic_t racecountdown, exitcountdown; // for racing
 fixed_t gravity;
 fixed_t mapobjectscale;
 
+struct maplighting maplighting;
+
 INT16 autobalance; //for CTF team balance
 INT16 teamscramble; //for CTF team scramble
 INT16 scrambleplayers[MAXPLAYERS]; //for CTF team scramble
@@ -280,8 +266,6 @@ boolean startedInFreePlay; // Map was started in free play
 // Client-sided, unsynched variables (NEVER use in anything that needs to be synced with other players)
 boolean legitimateexit; // Did this client actually finish the match?
 boolean comebackshowninfo; // Have you already seen the "ATTACK OR PROTECT" message?
-tic_t curlap; // Current lap time
-tic_t bestlap; // Best lap time
 static INT16 randmapbuffer[NUMMAPS+1]; // Buffer for maps RandMap is allowed to roll
 
 tic_t hidetime;
@@ -291,96 +275,14 @@ UINT32 timesBeaten;
 UINT32 timesBeatenWithEmeralds;
 //UINT32 timesBeatenUltimate;
 
-//@TODO put these all in a struct for namespacing purposes?
-static char demoname[128];
-static UINT8 *demobuffer = NULL;
-static UINT8 *demotime_p, *demoinfo_p;
-UINT8 *demo_p;
-static UINT8 *demoend;
-static UINT8 demoflags;
-static boolean demosynced = true; // console warning message
-
-struct demovars_s demo;
-
-boolean metalrecording; // recording as metal sonic
-mobj_t *metalplayback;
-static UINT8 *metalbuffer = NULL;
-static UINT8 *metal_p;
-static UINT16 metalversion;
-
-// extra data stuff (events registered this frame while recording)
-static struct {
-	UINT8 flags; // EZT flags
-
-	// EZT_COLOR
-	UINT8 color, lastcolor;
-
-	// EZT_SCALE
-	fixed_t scale, lastscale;
-
-	// EZT_KART
-	INT32 kartitem, kartamount, kartbumpers;
-
-	UINT8 desyncframes; // Don't try to resync unless we've been off for two frames, to monkeypatch a few trouble spots
-
-	// EZT_HIT
-	UINT16 hits;
-	mobj_t **hitlist;
-} ghostext[MAXPLAYERS];
-
-// Your naming conventions are stupid and useless.
-// There is no conflict here.
-demoghost *ghosts = NULL;
-
-boolean precache = true; // if true, load all graphics at start
-
 INT16 prevmap, nextmap;
 
-static CV_PossibleValue_t recordmultiplayerdemos_cons_t[] = {{0, "Disabled"}, {1, "Manual Save"}, {2, "Auto Save"}, {0, NULL}};
-consvar_t cv_recordmultiplayerdemos = {"netdemo_record", "Manual Save", CV_SAVE, recordmultiplayerdemos_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-static CV_PossibleValue_t netdemosyncquality_cons_t[] = {{1, "MIN"}, {35, "MAX"}, {0, NULL}};
-consvar_t cv_netdemosyncquality = {"netdemo_syncquality", "1", CV_SAVE, netdemosyncquality_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-// Units are MiB.
-static CV_PossibleValue_t maxdemosize_cons_t[] = {{10, "MIN"}, {100, "MAX"}, {0, NULL}};
-consvar_t cv_maxdemosize = {"maxdemosize", "10", CV_SAVE, maxdemosize_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-static UINT8 *savebuffer;
-
 // Analog Control
-static void UserAnalog_OnChange(void);
-static void UserAnalog2_OnChange(void);
-static void UserAnalog3_OnChange(void);
-static void UserAnalog4_OnChange(void);
-static void Analog_OnChange(void);
-static void Analog2_OnChange(void);
-static void Analog3_OnChange(void);
-static void Analog4_OnChange(void);
 void SendWeaponPref(void);
 void SendWeaponPref2(void);
 void SendWeaponPref3(void);
 void SendWeaponPref4(void);
 
-//static CV_PossibleValue_t crosshair_cons_t[] = {{0, "Off"}, {1, "Cross"}, {2, "Angle"}, {3, "Point"}, {0, NULL}};
-static CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"},
-{1, "Left X"}, {2, "Left Y"}, {-1, "Left X-"}, {-2, "Left Y-"},
-#if JOYAXISSET > 1
-{3, "Right X"}, {4, "Right Y"}, {-3, "Right X-"}, {-4, "Right Y-"},
-#endif
-#if JOYAXISSET > 2
-{5, "L Trigger"}, {6, "R Trigger"}, {-5, "L Trigger-"}, {-6, "R Trigger-"},
-#endif
-#if JOYAXISSET > 3
-{7, "U-Axis"}, {8, "V-Axis"}, {-7, "U-Axis-"}, {-8, "V-Axis-"},
-#endif
- {0, NULL}};
-#if JOYAXISSET > 4
-"More Axis Sets"
-#endif
-
-static CV_PossibleValue_t deadzone_cons_t[] = {{FRACUNIT/16, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
-
 // don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler.
 
 // chat timer thingy
@@ -412,7 +314,8 @@ consvar_t cv_consolechat = {"chatmode", "Window", CV_SAVE, consolechat_cons_t, N
 consvar_t cv_pauseifunfocused = {"pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 // Display song credits
-consvar_t cv_songcredits = {"songcredits", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t songcredits_cons_t[] = {{0, "Off"}, {1, "Default"}, {2, "Box"}, {0, NULL}};
+consvar_t cv_songcredits = {"songcredits", "Default", CV_SAVE, songcredits_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 // Show "FREE PLAY" when you're alone. :(
 consvar_t cv_showfreeplay = { "showfreeplay", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -422,108 +325,136 @@ static CV_PossibleValue_t powermusic_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "SFX
 consvar_t cv_growmusic  = {"growmusic",  "On", CV_SAVE, powermusic_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_supermusic = {"supermusic", "On", CV_SAVE, powermusic_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-/*consvar_t cv_crosshair = {"crosshair", "Off", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_crosshair2 = {"crosshair2", "Off", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_crosshair3 = {"crosshair3", "Off", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_crosshair4 = {"crosshair4", "Off", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};*/
 consvar_t cv_invertmouse = {"invertmouse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_invertmouse2 = {"invertmouse2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-/*consvar_t cv_alwaysfreelook = {"alwaysmlook", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_alwaysfreelook2 = {"alwaysmlook2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasefreelook = {"chasemlook", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasefreelook2 = {"chasemlook2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mousemove = {"mousemove", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mousemove2 = {"mousemove2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};*/
-consvar_t cv_analog = {"analog", "Off", CV_CALL, CV_OnOff, Analog_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_analog2 = {"analog2", "Off", CV_CALL, CV_OnOff, Analog2_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_analog3 = {"analog3", "Off", CV_CALL, CV_OnOff, Analog3_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_analog4 = {"analog4", "Off", CV_CALL, CV_OnOff, Analog4_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_useranalog = {"useranalog", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_useranalog2 = {"useranalog2", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog2_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_useranalog3 = {"useranalog3", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog3_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_useranalog4 = {"useranalog4", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog4_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_turnaxis = {"joyaxis_turn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_moveaxis = {"joyaxis_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_brakeaxis = {"joyaxis_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_aimaxis = {"joyaxis_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookaxis = {"joyaxis_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_fireaxis = {"joyaxis_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftaxis = {"joyaxis_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookbackaxis = {"joyaxis_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom1axis = {"joyaxis_custom1", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom2axis = {"joyaxis_custom2", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom3axis = {"joyaxis_custom3", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_xdeadzone = {"joy_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ydeadzone = {"joy_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"},
+{1, "Left X"}, {2, "Left Y"}, {-1, "Left X-"}, {-2, "Left Y-"},
+#if JOYAXISSET > 1
+{3, "Right X"}, {4, "Right Y"}, {-3, "Right X-"}, {-4, "Right Y-"},
+#endif
+#if JOYAXISSET > 2
+{5, "L Trigger"}, {6, "R Trigger"}, {-5, "L Trigger-"}, {-6, "R Trigger-"},
+#endif
+#if JOYAXISSET > 3
+{7, "U-Axis"}, {8, "V-Axis"}, {-7, "U-Axis-"}, {-8, "V-Axis-"},
+#endif
+ {0, NULL}};
+#if JOYAXISSET > 4
+"More Axis Sets"
+#endif
 
-consvar_t cv_turnaxis2 = {"joyaxis2_turn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_moveaxis2 = {"joyaxis2_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_brakeaxis2 = {"joyaxis2_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_aimaxis2 = {"joyaxis2_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookaxis2 = {"joyaxis2_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_fireaxis2 = {"joyaxis2_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftaxis2 = {"joyaxis2_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookbackaxis2 = {"joyaxis2_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom1axis2 = {"joyaxis2_custom1", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom2axis2 = {"joyaxis2_custom2", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom3axis2 = {"joyaxis2_custom3", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_xdeadzone2 = {"joy2_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ydeadzone2 = {"joy2_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t deadzone_cons_t[] = {{FRACUNIT/16, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
 
-consvar_t cv_turnaxis3 = {"joyaxis3_turn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_moveaxis3 = {"joyaxis3_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_brakeaxis3 = {"joyaxis3_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_aimaxis3 = {"joyaxis3_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookaxis3 = {"joyaxis3_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_fireaxis3 = {"joyaxis3_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftaxis3 = {"joyaxis3_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookbackaxis3 = {"joyaxis3_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom1axis3 = {"joyaxis3_custom1", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom2axis3 = {"joyaxis3_custom2", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom3axis3 = {"joyaxis3_custom3", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_xdeadzone3 = {"joy3_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ydeadzone3 = {"joy3_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_turnaxis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_turn",  "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_turn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_turn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_turn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
 
-consvar_t cv_turnaxis4 = {"joyaxis4_turn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_moveaxis4 = {"joyaxis4_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_brakeaxis4 = {"joyaxis4_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_aimaxis4 = {"joyaxis4_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookaxis4 = {"joyaxis4_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_fireaxis4 = {"joyaxis4_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_driftaxis4 = {"joyaxis4_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookbackaxis4 = {"joyaxis4_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom1axis4 = {"joyaxis4_custom1", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom2axis4 = {"joyaxis4_custom2", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_custom3axis4 = {"joyaxis4_custom3", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_xdeadzone4 = {"joy4_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ydeadzone4 = {"joy4_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_moveaxis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_move",  "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_camstrafeaxis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_camstrafe",  "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_camstrafe", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_camstrafe", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_camstrafe", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_camturnaxis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_camturn",  "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_camturn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_camturn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_camturn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_brakeaxis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_brake",  "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_brake", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_aimaxis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_aim",  "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_aim", "Left Y", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_lookaxis[MAXSPLITSCREENPLAYERS] = {
+	 {"joyaxis_look",  "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	 {"joyaxis2_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	 {"joyaxis3_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	 {"joyaxis4_look", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_fireaxis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_fire",  "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_fire", "L Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_driftaxis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_drift",  "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_drift", "R Trigger", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_lookbackaxis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_lookback",  "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_lookback", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_custom1axis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_custom1",  "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_custom1", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_custom1", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_custom1", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_custom2axis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_custom2",  "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_custom2", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_custom2", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_custom2", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_custom3axis[MAXSPLITSCREENPLAYERS] = {
+	{"joyaxis_custom3",  "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis2_custom3", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis3_custom3", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joyaxis4_custom3", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_xdeadzone[MAXSPLITSCREENPLAYERS] = {
+	{"joy_xdeadzone",  "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joy2_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joy3_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joy4_xdeadzone", "0.3", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_ydeadzone[MAXSPLITSCREENPLAYERS] = {
+	{"joy_ydeadzone",  "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joy2_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joy3_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"joy4_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
 
 static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}};
 consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-static CV_PossibleValue_t stretchfactor_t[] = {
-	{0, "Off"}, {FRACUNIT/8, "0.125"}, {FRACUNIT/4, "0.250"}, 
-	{3*FRACUNIT/8, "0.375"}, {FRACUNIT/2, "0.500"}, {5*FRACUNIT/8, "0.625"}, 
-	{3*FRACUNIT/4, "0.750"}, {7*FRACUNIT/8, "0.875"}, {FRACUNIT, "Max"}, {0, NULL}};
-consvar_t cv_gravstretch = {"gravstretch", "0", CV_SAVE, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-static CV_PossibleValue_t slamsound_t[] = {{0, "Off"}, {1, "On"}, {0, NULL}};
-consvar_t cv_slamsound = {"slamsound", "1", CV_SAVE, slamsound_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-static CV_PossibleValue_t sloperolldist_cons_t[] = {
-	/*{256, "256"},*/	{512, "512"},	{768, "768"},
-	{1024, "1024"},	{1536, "1536"},	{2048, "2048"},
-	{3072, "3072"},	{4096, "4096"},	{6144, "6144"},
-	{8192, "8192"},	{0, "Infinite"},	{0, NULL}};
-consvar_t cv_sloperolldist = {"sloperolldist", "Infinite", CV_SAVE, sloperolldist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static CV_PossibleValue_t sloperoll_cons_t[] = {{0, "Off"}, {1, "Players"}, {2, "Everything"}, {0, NULL}};
-consvar_t cv_spriteroll = {"spriteroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL, sloperoll_cons_t, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_sparkroll = {"sparkroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t cechotoggle_t[] = {{0, "Off"}, {1, "On"}, {2, "Console"}, {0, NULL}};
+consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 #if MAXPLAYERS > 16
 #error "please update player_name table using the new value for MAXPLAYERS"
@@ -588,15 +519,6 @@ void G_ClearRecords(void)
 	}
 }
 
-// For easy retrieval of records
-/*UINT32 G_GetBestScore(INT16 map)
-{
-	if (!mainrecords[map-1])
-		return 0;
-
-	return mainrecords[map-1]->score;
-}*/
-
 tic_t G_GetBestTime(INT16 map)
 {
 	if (!mainrecords[map-1] || mainrecords[map-1]->time <= 0)
@@ -605,6 +527,47 @@ tic_t G_GetBestTime(INT16 map)
 	return mainrecords[map-1]->time;
 }
 
+// kinda hacky way to do this, but this sets the game to use a seperate savefile if you have addons loaded
+static void G_SetSaveGameModified(void)
+{
+	size_t filenamelen;
+
+	if (savemoddata)
+		return;
+
+	// save vanilla data just to be sure
+	G_SaveGameData(true);
+
+	savemoddata = true;
+
+	strlcpy(gamedatafilename, "modkartdata.dat", sizeof (gamedatafilename));
+	strlwr(gamedatafilename);
+
+	// Also save a time attack folder
+	filenamelen = strlen(gamedatafilename)-4;  // Strip off the extension
+	filenamelen = min(filenamelen, sizeof (timeattackfolder));
+	memcpy(timeattackfolder, gamedatafilename, filenamelen);
+	timeattackfolder[min(filenamelen, sizeof (timeattackfolder) - 1)] = '\0';
+
+	strcpy(savegamename, timeattackfolder);
+	strlcat(savegamename, "%u.ssg", sizeof(savegamename));
+	// can't use sprintf since there is %u in savegamename
+	strcatbf(savegamename, srb2home, PATHSEP);
+
+	G_LoadGameData();
+
+	// unlock EVERYTHING.
+	for (UINT8 i = 0; i < MAXUNLOCKABLES; i++)
+	{
+		if (!unlockables[i].conditionset)
+			continue;
+		if (!unlockables[i].unlocked)
+		{
+			unlockables[i].unlocked = true;
+		}
+	}
+}
+
 // for consistency among messages: this modifies the game and removes savemoddata.
 void G_SetGameModified(boolean silent, boolean major)
 {
@@ -619,8 +582,11 @@ void G_SetGameModified(boolean silent, boolean major)
 	//savemoddata = false; -- there is literally no reason to do this anymore.
 	majormods = true;
 
+	// should this only be done when you load a "major" gameplay modifieng addon?
+	G_SetSaveGameModified();
+
 	if (!silent)
-		CONS_Alert(CONS_NOTICE, M_GetText("Game must be restarted to play Record Attack.\n"));
+		CONS_Alert(CONS_NOTICE, M_GetText("Record Attack data will be saved to a seperate save file.\n"));
 
 	// If in record attack recording, cancel it.
 	if (modeattacking)
@@ -686,9 +652,7 @@ const char *G_BuildMapName(INT32 map)
   */
 INT16 G_ClipAimingPitch(INT32 *aiming)
 {
-	INT32 limitangle;
-
-	limitangle = ANGLE_90 - 1;
+	static const INT32 limitangle = ANGLE_90 - 1;
 
 	if (*aiming > limitangle)
 		*aiming = limitangle;
@@ -700,10 +664,8 @@ INT16 G_ClipAimingPitch(INT32 *aiming)
 
 INT16 G_SoftwareClipAimingPitch(INT32 *aiming)
 {
-	INT32 limitangle;
-
 	// note: the current software mode implementation doesn't have true perspective
-	limitangle = ANGLE_90 - ANG10; // Some viewing fun, but not too far down...
+	static const INT32 limitangle = ANGLE_90 - ANG10; // Some viewing fun, but not too far down...
 
 	if (*aiming > limitangle)
 		*aiming = limitangle;
@@ -713,47 +675,55 @@ INT16 G_SoftwareClipAimingPitch(INT32 *aiming)
 	return (INT16)((*aiming)>>16);
 }
 
-static INT32 Joy1Axis(axis_input_e axissel)
+INT32 JoyAxis(axis_input_e axissel, UINT8 player)
 {
 	INT32 retaxis;
 	INT32 axisval;
 	boolean flp = false;
 
+	UINT8 pnum = player-1;
+
 	//find what axis to get
 	switch (axissel)
 	{
 		case AXISTURN:
-			axisval = cv_turnaxis.value;
+			axisval = cv_turnaxis[pnum].value;
 			break;
 		case AXISMOVE:
-			axisval = cv_moveaxis.value;
+			axisval = cv_moveaxis[pnum].value;
+			break;
+		case AXISCAMTURN:
+			axisval = cv_camturnaxis[pnum].value;
+			break;
+		case AXISCAMSTRAFE:
+			axisval = cv_camstrafeaxis[pnum].value;
 			break;
 		case AXISBRAKE:
-			axisval = cv_brakeaxis.value;
+			axisval = cv_brakeaxis[pnum].value;
 			break;
 		case AXISAIM:
-			axisval = cv_aimaxis.value;
+			axisval = cv_aimaxis[pnum].value;
 			break;
 		case AXISLOOK:
-			axisval = cv_lookaxis.value;
+			axisval = cv_lookaxis[pnum].value;
 			break;
 		case AXISFIRE:
-			axisval = cv_fireaxis.value;
+			axisval = cv_fireaxis[pnum].value;
 			break;
 		case AXISDRIFT:
-			axisval = cv_driftaxis.value;
+			axisval = cv_driftaxis[pnum].value;
 			break;
 		case AXISLOOKBACK:
-			axisval = cv_lookbackaxis.value;
+			axisval = cv_lookbackaxis[pnum].value;
 			break;
 		case AXISCUSTOM1:
-			axisval = cv_custom1axis.value;
+			axisval = cv_custom1axis[pnum].value;
 			break;
 		case AXISCUSTOM2:
-			axisval = cv_custom2axis.value;
+			axisval = cv_custom2axis[pnum].value;
 			break;
 		case AXISCUSTOM3:
-			axisval = cv_custom3axis.value;
+			axisval = cv_custom3axis[pnum].value;
 			break;
 		default:
 			return 0;
@@ -764,333 +734,55 @@ static INT32 Joy1Axis(axis_input_e axissel)
 		axisval = -axisval;
 		flp = true;
 	}
+
 	if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None
 		return 0;
 
-	if (axisval%2)
+	if (axisval % 2)
 	{
 		axisval /= 2;
-		retaxis = joyxmove[axisval];
+		retaxis = joyxmove[pnum][axisval];
 
 		if (retaxis < (-JOYAXISRANGE))
 			retaxis = -JOYAXISRANGE;
 		if (retaxis > (+JOYAXISRANGE))
 			retaxis = +JOYAXISRANGE;
-		if (!Joystick.bGamepadStyle && axissel < AXISDEAD)
+		if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
 		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone.value) >> FRACBITS;
+			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[pnum].value) >> FRACBITS;
 			if (abs(retaxis) <= jdeadzone)
 				return 0;
 		}
-		if (flp) retaxis = -retaxis; //flip it around
+
+		if (flp)
+			retaxis = -retaxis; // flip it around
+
 		return retaxis;
 	}
 	else
 	{
 		axisval--;
 		axisval /= 2;
-		retaxis = joyymove[axisval];
+		retaxis = joyymove[pnum][axisval];
 
 		if (retaxis < (-JOYAXISRANGE))
 			retaxis = -JOYAXISRANGE;
 		if (retaxis > (+JOYAXISRANGE))
 			retaxis = +JOYAXISRANGE;
-		if (!Joystick.bGamepadStyle && axissel < AXISDEAD)
+		if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
 		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone.value) >> FRACBITS;
+			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[pnum].value) >> FRACBITS;
 			if (abs(retaxis) <= jdeadzone)
 				return 0;
 		}
-		if (flp) retaxis = -retaxis; //flip it around
+
+		if (flp)
+			retaxis = -retaxis; // flip it around
+
 		return retaxis;
 	}
 }
 
-static INT32 Joy2Axis(axis_input_e axissel)
-{
-	INT32 retaxis;
-	INT32 axisval;
-	boolean flp = false;
-
-	//find what axis to get
-	switch (axissel)
-	{
-		case AXISTURN:
-			axisval = cv_turnaxis2.value;
-			break;
-		case AXISMOVE:
-			axisval = cv_moveaxis2.value;
-			break;
-		case AXISBRAKE:
-			axisval = cv_brakeaxis2.value;
-			break;
-		case AXISAIM:
-			axisval = cv_aimaxis2.value;
-			break;
-		case AXISLOOK:
-			axisval = cv_lookaxis2.value;
-			break;
-		case AXISFIRE:
-			axisval = cv_fireaxis2.value;
-			break;
-		case AXISDRIFT:
-			axisval = cv_driftaxis2.value;
-			break;
-		case AXISLOOKBACK:
-			axisval = cv_lookbackaxis2.value;
-			break;
-		case AXISCUSTOM1:
-			axisval = cv_custom1axis2.value;
-			break;
-		case AXISCUSTOM2:
-			axisval = cv_custom2axis2.value;
-			break;
-		case AXISCUSTOM3:
-			axisval = cv_custom3axis2.value;
-			break;
-		default:
-			return 0;
-	}
-
-	if (axisval < 0) //odd -axises
-	{
-		axisval = -axisval;
-		flp = true;
-	}
-	if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None
-		return 0;
-
-	if (axisval%2)
-	{
-		axisval /= 2;
-		retaxis = joy2xmove[axisval];
-
-		if (retaxis < (-JOYAXISRANGE))
-			retaxis = -JOYAXISRANGE;
-		if (retaxis > (+JOYAXISRANGE))
-			retaxis = +JOYAXISRANGE;
-		if (!Joystick2.bGamepadStyle && axissel < AXISDEAD)
-		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone2.value) >> FRACBITS;
-			if (-jdeadzone < retaxis && retaxis < jdeadzone)
-				return 0;
-		}
-		if (flp) retaxis = -retaxis; //flip it around
-		return retaxis;
-
-	}
-	else
-	{
-		axisval--;
-		axisval /= 2;
-		retaxis = joy2ymove[axisval];
-
-		if (retaxis < (-JOYAXISRANGE))
-			retaxis = -JOYAXISRANGE;
-		if (retaxis > (+JOYAXISRANGE))
-			retaxis = +JOYAXISRANGE;
-		if (!Joystick2.bGamepadStyle && axissel < AXISDEAD)
-		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone2.value) >> FRACBITS;
-			if (-jdeadzone < retaxis && retaxis < jdeadzone)
-				return 0;
-		}
-		if (flp) retaxis = -retaxis; //flip it around
-		return retaxis;
-
-	}
-}
-
-static INT32 Joy3Axis(axis_input_e axissel)
-{
-	INT32 retaxis;
-	INT32 axisval;
-	boolean flp = false;
-
-	//find what axis to get
-	switch (axissel)
-	{
-		case AXISTURN:
-			axisval = cv_turnaxis3.value;
-			break;
-		case AXISMOVE:
-			axisval = cv_moveaxis3.value;
-			break;
-		case AXISBRAKE:
-			axisval = cv_brakeaxis3.value;
-			break;
-		case AXISAIM:
-			axisval = cv_aimaxis3.value;
-			break;
-		case AXISLOOK:
-			axisval = cv_lookaxis3.value;
-			break;
-		case AXISFIRE:
-			axisval = cv_fireaxis3.value;
-			break;
-		case AXISDRIFT:
-			axisval = cv_driftaxis3.value;
-			break;
-		case AXISLOOKBACK:
-			axisval = cv_lookbackaxis3.value;
-			break;
-		case AXISCUSTOM1:
-			axisval = cv_custom1axis3.value;
-			break;
-		case AXISCUSTOM2:
-			axisval = cv_custom2axis3.value;
-			break;
-		case AXISCUSTOM3:
-			axisval = cv_custom3axis3.value;
-			break;
-		default:
-			return 0;
-	}
-
-	if (axisval < 0) //odd -axises
-	{
-		axisval = -axisval;
-		flp = true;
-	}
-	if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None
-		return 0;
-
-	if (axisval%2)
-	{
-		axisval /= 2;
-		retaxis = joy3xmove[axisval];
-
-		if (retaxis < (-JOYAXISRANGE))
-			retaxis = -JOYAXISRANGE;
-		if (retaxis > (+JOYAXISRANGE))
-			retaxis = +JOYAXISRANGE;
-		if (!Joystick3.bGamepadStyle && axissel < AXISDEAD)
-		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone3.value) >> FRACBITS;
-			if (-jdeadzone < retaxis && retaxis < jdeadzone)
-				return 0;
-		}
-		if (flp) retaxis = -retaxis; //flip it around
-		return retaxis;
-		
-	}
-	else
-	{
-		axisval--;
-		axisval /= 2;
-		retaxis = joy3ymove[axisval];
-
-		if (retaxis < (-JOYAXISRANGE))
-			retaxis = -JOYAXISRANGE;
-		if (retaxis > (+JOYAXISRANGE))
-			retaxis = +JOYAXISRANGE;
-		if (!Joystick3.bGamepadStyle && axissel < AXISDEAD)
-		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone3.value) >> FRACBITS;
-			if (-jdeadzone < retaxis && retaxis < jdeadzone)
-				return 0;
-		}
-		if (flp) retaxis = -retaxis; //flip it around
-		return retaxis;
-		
-	}
-}
-
-static INT32 Joy4Axis(axis_input_e axissel)
-{
-	INT32 retaxis;
-	INT32 axisval;
-	boolean flp = false;
-
-	//find what axis to get
-	switch (axissel)
-	{
-		case AXISTURN:
-			axisval = cv_turnaxis4.value;
-			break;
-		case AXISMOVE:
-			axisval = cv_moveaxis4.value;
-			break;
-		case AXISBRAKE:
-			axisval = cv_brakeaxis4.value;
-			break;
-		case AXISAIM:
-			axisval = cv_aimaxis4.value;
-			break;
-		case AXISLOOK:
-			axisval = cv_lookaxis4.value;
-			break;
-		case AXISFIRE:
-			axisval = cv_fireaxis4.value;
-			break;
-		case AXISDRIFT:
-			axisval = cv_driftaxis4.value;
-			break;
-		case AXISLOOKBACK:
-			axisval = cv_lookbackaxis4.value;
-			break;
-		case AXISCUSTOM1:
-			axisval = cv_custom1axis4.value;
-			break;
-		case AXISCUSTOM2:
-			axisval = cv_custom2axis4.value;
-			break;
-		case AXISCUSTOM3:
-			axisval = cv_custom3axis4.value;
-			break;
-		default:
-			return 0;
-	}
-
-	if (axisval < 0) //odd -axises
-	{
-		axisval = -axisval;
-		flp = true;
-	}
-	if (axisval > JOYAXISSET*2 || axisval == 0) //not there in array or None
-		return 0;
-
-	if (axisval%2)
-	{
-		axisval /= 2;
-		retaxis = joy4xmove[axisval];
-
-		if (retaxis < (-JOYAXISRANGE))
-			retaxis = -JOYAXISRANGE;
-		if (retaxis > (+JOYAXISRANGE))
-			retaxis = +JOYAXISRANGE;
-		if (!Joystick4.bGamepadStyle && axissel < AXISDEAD)
-		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone4.value) >> FRACBITS;
-			if (-jdeadzone < retaxis && retaxis < jdeadzone)
-				return 0;
-		}
-		if (flp) retaxis = -retaxis; //flip it around
-		return retaxis;
-		
-	}
-	else
-	{
-		axisval--;
-		axisval /= 2;
-		retaxis = joy4ymove[axisval];
-
-		if (retaxis < (-JOYAXISRANGE))
-			retaxis = -JOYAXISRANGE;
-		if (retaxis > (+JOYAXISRANGE))
-			retaxis = +JOYAXISRANGE;
-		if (!Joystick4.bGamepadStyle && axissel < AXISDEAD)
-		{
-			const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone4.value) >> FRACBITS;
-			if (-jdeadzone < retaxis && retaxis < jdeadzone)
-				return 0;
-		}
-		if (flp) retaxis = -retaxis; //flip it around
-		return retaxis;
-		
-	}
-}
-
 boolean InputDown(INT32 gc, UINT8 p)
 {
 	switch (p)
@@ -1106,18 +798,66 @@ boolean InputDown(INT32 gc, UINT8 p)
 	}
 }
 
-INT32 JoyAxis(axis_input_e axissel, UINT8 p)
+INT32 localaiming[MAXSPLITSCREENPLAYERS];
+angle_t localangle[MAXSPLITSCREENPLAYERS];
+boolean camspin[MAXSPLITSCREENPLAYERS];
+
+static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
+static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
+static fixed_t angleturn[3] = {KART_FULLTURN/2, KART_FULLTURN, KART_FULLTURN/4}; // + slow turn
+
+//
+// G_BuildLocalTiccmd
+// extremely basic cut down ticcmd builder
+// for spectator and freecam
+// this does not make the player move at all but keeps important things working
+//
+static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
 {
-	switch (p)
+	boolean moveinput = false;
+	INT32 axis = 0;
+	const boolean usejoystick = (cv_usejoystick[(ssplayer-1)].value);
+
+	// check for inputs and return button commands
+	// for stuff like joining with item button, saltyhop, honking, etc.
+#define CHECKINPUT(button, AXIS, buttflag) \
+	axis = JoyAxis(AXIS, ssplayer);        \
+	if (InputDown(button, ssplayer) || (usejoystick && axis > 0)) cmd->buttons |= buttflag;
+
+	CHECKINPUT(gc_fire, AXISFIRE, BT_ATTACK);
+	CHECKINPUT(gc_drift, AXISDRIFT, BT_DRIFT);
+	CHECKINPUT(gc_custom1, AXISCUSTOM1, BT_CUSTOM1);
+	CHECKINPUT(gc_custom2, AXISCUSTOM2, BT_CUSTOM2);
+	CHECKINPUT(gc_custom3, AXISCUSTOM3, BT_CUSTOM3);
+
+	// we dont need the rest of this if were in freecam state
+	if (freecam)
 	{
-		case 2:
-			return Joy2Axis(axissel);
-		case 3:
-			return Joy3Axis(axissel);
-		case 4:
-			return Joy4Axis(axissel);
-		default:
-			return Joy1Axis(axissel);
+		return;
+	}
+
+	CHECKINPUT(gc_accelerate, AXISMOVE, BT_ACCELERATE);
+	CHECKINPUT(gc_brake, AXISBRAKE, BT_BRAKE);
+
+#undef CHECKINPUT
+
+	moveinput = (InputDown(gc_turnleft, ssplayer) || InputDown(gc_turnright, ssplayer)
+	|| InputDown(gc_aimforward, ssplayer) || InputDown(gc_aimbackward, ssplayer) ||
+	(usejoystick && JoyAxis(AXISAIM, ssplayer) != 0) || (usejoystick && JoyAxis(AXISTURN, ssplayer) != 0));
+
+	axis = JoyAxis(AXISLOOKBACK, ssplayer);
+	camspin[ssplayer-1] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
+
+	// Reset to our spec player if we watch someone else.
+	if ((moveinput || cmd->buttons)
+		&& displayplayers[0] != consoleplayer && ssplayer == 1)
+	{
+		if (cv_director.value)
+			CV_SetValue(&cv_director, 0);
+
+		displayplayers[0] = consoleplayer;
+		R_ResetViewInterpolation(0);
+		camera[0].reset_aiming = true;
 	}
 }
 
@@ -1127,47 +867,34 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 p)
 // or reads it from the demo buffer.
 // If recording a demo, write it out
 //
-// set secondaryplayer true to build player 2's ticcmd in splitscreen mode
-//
-INT32 localaiming[MAXSPLITSCREENPLAYERS];
-angle_t localangle[MAXSPLITSCREENPLAYERS];
-boolean camspin[MAXSPLITSCREENPLAYERS];
-
-static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
-static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
-static fixed_t angleturn[3] = {KART_FULLTURN/2, KART_FULLTURN, KART_FULLTURN/4}; // + slow turn
-
 void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 {
-	INT32 laim, th, tspeed, forward, side, axis; //i
-	const INT32 speed = 1;
+	INT32 laim, th, tspeed, forward, side, axis;
+
 	// these ones used for multiple conditions
-	boolean turnleft, turnright, mouseaiming, analogjoystickmove, gamepadjoystickmove;
-	boolean invertmouse, lookaxis, usejoystick, kbl, rd;
-	player_t *player;
-	camera_t *thiscam;
+	boolean turnleft, turnright;
+	boolean usejoystick, rd;
 	angle_t lang;
 
 	static INT32 turnheld[MAXSPLITSCREENPLAYERS]; // for accelerative turning
-	static boolean keyboard_look[MAXSPLITSCREENPLAYERS]; // true if lookup/down using keyboard
 	static boolean resetdown[MAXSPLITSCREENPLAYERS]; // don't cam reset every frame
 
-	if (demo.playback) return;
+	if (demo.playback)
+		return;
 
-	if (ssplayer == 1)
-		player = &players[consoleplayer];
-	else
-		player = &players[displayplayers[ssplayer-1]];
+	const UINT8 forplayer = (ssplayer-1);
+	player_t *player = ((ssplayer == 1) ? &players[consoleplayer] : &players[displayplayers[forplayer]]);
 
-	if (ssplayer == 2)
-		thiscam = (player->bot == 2 ? &camera[0] : &camera[ssplayer-1]);
-	else
-		thiscam = &camera[ssplayer-1];
-	lang = localangle[ssplayer-1];
-	laim = localaiming[ssplayer-1];
-	th = turnheld[ssplayer-1];
-	kbl = keyboard_look[ssplayer-1];
-	rd = resetdown[ssplayer-1];
+	camera_t *thiscam = &camera[forplayer];
+	const boolean freecam = camera[forplayer].freecam;
+
+	const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
+	const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;
+
+	lang = localangle[forplayer];
+	laim = localaiming[forplayer];
+	th = turnheld[forplayer];
+	rd = resetdown[forplayer];
 
 	switch (ssplayer)
 	{
@@ -1189,44 +916,24 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	// why build a ticcmd if we're paused?
 	// Or, for that matter, if we're being reborn.
 	// Kart, don't build a ticcmd if someone is resynching or the server is stopped too so we don't fly off course in bad conditions
-	if (paused || P_AutoPause() || (gamestate == GS_LEVEL && player->playerstate == PST_REBORN) || hu_resynching || hu_redownloadinggamestate)
+	if (paused || P_AutoPause() || (gamestate == GS_LEVEL && player->playerstate == PST_REBORN) || hu_resynching)
 	{
 		cmd->angleturn = (INT16)(lang >> 16);
 		cmd->aiming = G_ClipAimingPitch(&laim);
 		return;
 	}
 
-	switch (ssplayer)
+	// dumbass thing so we can use a few buttons but dont accidentally drive away
+	if (player->spectator || freecam)
 	{
-		case 2:
-			mouseaiming = player->spectator; //(PLAYER2INPUTDOWN(gc_mouseaiming)) ^ cv_alwaysfreelook2.value;
-			invertmouse = cv_invertmouse2.value;
-			lookaxis = cv_lookaxis2.value;
-			analogjoystickmove = cv_usejoystick2.value && !Joystick2.bGamepadStyle;
-			gamepadjoystickmove = cv_usejoystick2.value && Joystick2.bGamepadStyle;
-			break;
-		case 3:
-			mouseaiming = false;
-			invertmouse = false;
-			lookaxis = cv_lookaxis3.value;
-			analogjoystickmove = cv_usejoystick3.value && !Joystick3.bGamepadStyle;
-			gamepadjoystickmove = cv_usejoystick3.value && Joystick3.bGamepadStyle;
-			break;
-		case 4:
-			mouseaiming = false;
-			invertmouse = false;
-			lookaxis = cv_lookaxis4.value;
-			analogjoystickmove = cv_usejoystick4.value && !Joystick4.bGamepadStyle;
-			gamepadjoystickmove = cv_usejoystick4.value && Joystick4.bGamepadStyle;
-			break;
-		case 1:
-		default:
-			mouseaiming = player->spectator; //(PLAYER1INPUTDOWN(gc_mouseaiming)) ^ cv_alwaysfreelook.value;
-			invertmouse = cv_invertmouse.value;
-			lookaxis = cv_lookaxis.value;
-			analogjoystickmove = cv_usejoystick.value && !Joystick.bGamepadStyle;
-			gamepadjoystickmove = cv_usejoystick.value && Joystick.bGamepadStyle;
-			break;
+		cmd->angleturn = (INT16)(lang >> 16);
+		G_BuildLocalTiccmd(cmd, ssplayer, freecam);
+
+		// let lua override everything
+		if (gamestate == GS_LEVEL)
+			LUA_HookTiccmd(player, cmd, HOOK(PlayerCmd));
+
+		return;
 	}
 
 	usejoystick = (analogjoystickmove || gamepadjoystickmove);
@@ -1260,7 +967,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	if (th < SLOWTURNTICS)
 		tspeed = cv_turnsmooth.value == 2 ? 2 : 0; // slow turn
 	else
-		tspeed = speed;
+		tspeed = 1;
 
 	cmd->driftturn = 0;
 
@@ -1286,14 +993,14 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 		side += ((axis * sidemove[0]) >> 10);
 	}
 
-	if (player->spectator || cv_mouseturn.value)
+	if (cv_mouseturn.value)
 	{
-	//THIS WORKS WTF????????
+		//THIS WORKS WTF????????
 		cmd->angleturn = (INT16)(cmd->angleturn - ((mousex*(encoremode ? -1 : 1)*8)));
 		cmd->driftturn = (INT16)(cmd->driftturn - ((mousex*(encoremode ? -1 : 1)*8)));
 	}
 
-	if (player->spectator || objectplacing) // SRB2Kart: spectators need special controls
+	if (objectplacing) // SRB2Kart: spectators need special controls // not anymore huehuehue
 	{
 		axis = JoyAxis(AXISMOVE, ssplayer);
 		if (InputDown(gc_accelerate, ssplayer) || (usejoystick && axis > 0))
@@ -1375,54 +1082,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 	else
 		rd = false;
 
-	// spectator aiming shit, ahhhh...
-	{
-		INT32 player_invert = invertmouse ? -1 : 1;
-		INT32 screen_invert =
-			(player->mo && (player->mo->eflags & MFE_VERTICALFLIP)
-			 && (!thiscam->chase || player->pflags & PF_FLIPCAM)) //because chasecam's not inverted
-			 ? -1 : 1; // set to -1 or 1 to multiply
-
-		// mouse look stuff (mouse look is not the same as mouse aim)
-		if (mouseaiming && player->spectator)
-		{
-			kbl = false;
-
-			// looking up/down
-			laim += (mlooky<<19)*player_invert*screen_invert;
-		}
-
-		axis = JoyAxis(AXISLOOK, ssplayer);
-		if (analogjoystickmove && axis != 0 && lookaxis && player->spectator)
-			laim += (axis<<16) * screen_invert;
-
-		// spring back if not using keyboard neither mouselookin'
-		if (!kbl && !lookaxis && !mouseaiming)
-			laim = 0;
-
-		if (player->spectator)
-		{
-			if (InputDown(gc_lookup, ssplayer) || (gamepadjoystickmove && axis < 0))
-			{
-				laim += KB_LOOKSPEED * screen_invert;
-				kbl = true;
-			}
-			else if (InputDown(gc_lookdown, ssplayer) || (gamepadjoystickmove && axis > 0))
-			{
-				laim -= KB_LOOKSPEED * screen_invert;
-				kbl = true;
-			}
-		}
-
-		if (InputDown(gc_centerview, ssplayer)) // No need to put a spectator limit on this one though :V
-			laim = 0;
-
-		// accept no mlook for network games
-		if (!cv_allowmlook.value)
-			laim = 0;
-
-		cmd->aiming = G_ClipAimingPitch(&laim);
-	}
+	cmd->aiming = G_ClipAimingPitch(&laim);
 
 	mousex = mousey = mlooky = 0;
 
@@ -1472,13 +1132,12 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 
 	if (!hu_stopped)
 	{
-		localangle[ssplayer-1] = lang;
-		localaiming[ssplayer-1] = laim;
-		keyboard_look[ssplayer-1] = kbl;
-		turnheld[ssplayer-1] = th;
-		resetdown[ssplayer-1] = rd;
+		localangle[forplayer] = lang;
+		localaiming[forplayer] = laim;
+		turnheld[forplayer] = th;
+		resetdown[forplayer] = rd;
 		axis = JoyAxis(AXISLOOKBACK, ssplayer);
-		camspin[ssplayer-1] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
+		camspin[forplayer] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
 	}
 
 	/* 	Lua: Allow this hook to overwrite ticcmd.
@@ -1492,131 +1151,28 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 			-Making a Mario Kart 8 Deluxe tier baby mode that steers you away from walls and whatnot. You know what, do what you want!
 	*/
 	if (gamestate == GS_LEVEL)
-		LUAh_PlayerCmd(player, cmd);
+		LUA_HookTiccmd(player, cmd, HOOK(PlayerCmd));
 
 	//Reset away view if a command is given.
-	if ((cmd->forwardmove || cmd->sidemove || cmd->buttons)
-		&& displayplayers[0] != consoleplayer && ssplayer == 1)
+	if (displayplayers[0] != consoleplayer && ssplayer == 1
+	&& (cmd->forwardmove || cmd->sidemove || cmd->buttons))
+	{
 		displayplayers[0] = consoleplayer;
-
-}
-
-// User has designated that they want
-// analog ON, so tell the game to stop
-// fudging with it.
-static void UserAnalog_OnChange(void)
-{
-	/*if (cv_useranalog.value)
-		CV_SetValue(&cv_analog, 1);
-	else
-		CV_SetValue(&cv_analog, 0);*/
-}
-
-static void UserAnalog2_OnChange(void)
-{
-	if (botingame)
-		return;
-	/*if (cv_useranalog2.value)
-		CV_SetValue(&cv_analog2, 1);
-	else
-		CV_SetValue(&cv_analog2, 0);*/
-}
-
-static void UserAnalog3_OnChange(void)
-{
-	if (botingame)
-		return;
-	/*if (cv_useranalog3.value)
-		CV_SetValue(&cv_analog3, 1);
-	else
-		CV_SetValue(&cv_analog3, 0);*/
-}
-
-static void UserAnalog4_OnChange(void)
-{
-	if (botingame)
-		return;
-	/*if (cv_useranalog4.value)
-		CV_SetValue(&cv_analog4, 1);
-	else
-		CV_SetValue(&cv_analog4, 0);*/
-}
-
-static void Analog_OnChange(void)
-{
-	if (!cv_cam_dist.string)
-		return;
-
-	// cameras are not initialized at this point
-
-	/*
-	if (!cv_chasecam.value && cv_analog.value) {
-		CV_SetValue(&cv_analog, 0);
-		return;
+		G_FixCamera(1);
 	}
-	*/
-
-	SendWeaponPref();
-}
-
-static void Analog2_OnChange(void)
-{
-	if (!(splitscreen || botingame) || !cv_cam2_dist.string)
-		return;
-
-	// cameras are not initialized at this point
-
-	/*
-	if (!cv_chasecam2.value && cv_analog2.value) {
-		CV_SetValue(&cv_analog2, 0);
-		return;
-	}
-	*/
-
-	SendWeaponPref2();
-}
-
-static void Analog3_OnChange(void)
-{
-	if (splitscreen < 2 || !cv_cam3_dist.string)
-		return;
-
-	// cameras are not initialized at this point
-
-	/*
-	if (!cv_chasecam3.value && cv_analog3.value) {
-		CV_SetValue(&cv_analog3, 0);
-		return;
-	}
-	*/
-
-	SendWeaponPref3();
-}
-
-static void Analog4_OnChange(void)
-{
-	if (splitscreen < 3 || !cv_cam4_dist.string)
-		return;
-
-	// cameras are not initialized at this point
-
-	/*
-	if (!cv_chasecam4.value && cv_analog4.value) {
-		CV_SetValue(&cv_analog4, 0);
-		return;
-	}
-	*/
-
-	SendWeaponPref4();
 }
 
 //
 // G_DoLoadLevel
 //
-void G_DoLoadLevel(boolean resetplayer)
+static void G_DoLoadLevel(boolean resetplayer)
 {
 	INT32 i;
 
+	// Saturn Music Feature stuffs
+	S_ResetKeepAndSpecialMus();
+	S_KeepMusic();
+
 	// Make sure objectplace is OFF when you first start the level!
 	OP_ResetObjectplace();
 
@@ -1662,8 +1218,6 @@ void G_DoLoadLevel(boolean resetplayer)
 	Z_CheckHeap(-2);
 #endif
 
-	memset(localaiming, 0, sizeof(localaiming));
-
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (camera[i].chase)
@@ -1671,111 +1225,49 @@ void G_DoLoadLevel(boolean resetplayer)
 	}
 
 	// clear cmd building stuff
-	memset(gamekeydown, 0, sizeof (gamekeydown));
-	for (i = 0;i < JOYAXISSET; i++)
-	{
-		joyxmove[i] = joyymove[i] = 0;
-		joy2xmove[i] = joy2ymove[i] = 0;
-		joy3xmove[i] = joy3ymove[i] = 0;
-		joy4xmove[i] = joy4ymove[i] = 0;
-	}
+	memset(gamekeydown, 0, sizeof(gamekeydown));
+	memset(joyxmove, 0, sizeof(joyxmove));
+	memset(joyymove, 0, sizeof(joyymove));
 	mousex = mousey = 0;
-	mouse2x = mouse2y = 0;
 
 	// clear hud messages remains (usually from game startup)
 	CON_ClearHUD();
+
+	server_lagless = !cv_gentlemens.value;
+
+	G_ResetAllDeviceRumbles();
 }
 
 static INT32 pausedelay = 0;
-static INT32 camtoggledelay, camtoggledelay2, camtoggledelay3, camtoggledelay4 = 0;
-static INT32 spectatedelay, spectatedelay2, spectatedelay3, spectatedelay4 = 0;
+static INT32 camtoggledelay[MAXSPLITSCREENPLAYERS] = {0,0,0,0};
+static INT32 spectatedelay[MAXSPLITSCREENPLAYERS] = {0,0,0,0};
 
-//
-// G_Responder
-// Get info needed to make ticcmd_ts for the players.
-//
-boolean G_Responder(event_t *ev)
+static void G_ToggleSpectate(INT32 player)
 {
-	// any other key pops up menu if in demos
-	if (gameaction == ga_nothing && !demo.quitafterplaying &&
-		((demo.playback && !modeattacking && !demo.title && !multiplayer) || gamestate == GS_TITLESCREEN))
+	switch (player)
 	{
-		if (ev->type == ev_keydown && ev->data1 != 301)
-		{
-			M_StartControlPanel();
-			return true;
-		}
-		return false;
-	}
-	else if (demo.playback && demo.title)
-	{
-		// Title demo uses intro responder
-		if (F_IntroResponder(ev))
-		{
-			// stop the title demo
-			G_CheckDemoStatus();
-			return true;
-		}
-		return false;
+		case 0:
+			COM_ImmedExecute("changeteam spectator");
+			break;
+		case 1:
+			COM_ImmedExecute("changeteam2 spectator");
+			break;
+		case 2:
+			COM_ImmedExecute("changeteam3 spectator");
+			break;
+		case 3:
+			COM_ImmedExecute("changeteam4 spectator");
+			break;
 	}
+}
 
-	if (gamestate == GS_LEVEL)
-	{
-		if (HU_Responder(ev))
-			return true; // chat ate the event
-		if (AM_Responder(ev))
-			return true; // automap ate it
-		// map the event (key/mouse/joy) to a gamecontrol
-	}
-	// Intro
-	else if (gamestate == GS_INTRO)
-	{
-		if (F_IntroResponder(ev))
-		{
-			D_StartTitle();
-			return true;
-		}
-	}
-	else if (gamestate == GS_CUTSCENE)
-	{
-		if (HU_Responder(ev))
-			return true; // chat ate the event
-
-		if (F_CutsceneResponder(ev))
-		{
-			D_StartTitle();
-			return true;
-		}
-	}
-
-	else if (gamestate == GS_CREDITS)
-	{
-		if (HU_Responder(ev))
-			return true; // chat ate the event
-
-		if (F_CreditResponder(ev))
-		{
-			F_StartGameEvaluation();
-			return true;
-		}
-	}
-
-	else if (gamestate == GS_CONTINUING)
-	{
-		if (F_ContinueResponder(ev))
-			return true;
-	}
-	// Demo End
-	else if (gamestate == GS_GAMEEND || gamestate == GS_EVALUATION || gamestate == GS_CREDITS)
-		return true;
-
-	else if (gamestate == GS_INTERMISSION || gamestate == GS_VOTING || gamestate == GS_WAITINGPLAYERS)
-		if (HU_Responder(ev))
-			return true; // chat ate the event
-
+static boolean G_LevelResponder(event_t *ev)
+{
 	// allow spy mode changes even during the demo
-	if (gamestate == GS_LEVEL && ev->type == ev_keydown
-		&& (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
+	if (ev->type == ev_keydown
+		&& (ev->data1 == KEY_F12
+		|| ev->data1 == gamecontrol[0][gc_viewpoint][0]
+		|| ev->data1 == gamecontrol[0][gc_viewpoint][1]))
 	{
 		if (!demo.playback && (splitscreen || !netgame))
 			displayplayers[0] = consoleplayer;
@@ -1791,31 +1283,21 @@ boolean G_Responder(event_t *ev)
 		}
 	}
 
-	if (gamestate == GS_LEVEL && ev->type == ev_keydown && multiplayer && demo.playback && !demo.freecam)
+	if (ev->type == ev_keydown && multiplayer && demo.playback)
 	{
-		if (ev->data1 == gamecontrolbis[gc_viewpoint][0] || ev->data1 == gamecontrolbis[gc_viewpoint][1])
+		for (INT32 i = 1; i <= splitscreen; i++)
 		{
-			G_AdjustView(2, 1, true);
-
-			return true;
-		}
-		else if (ev->data1 == gamecontrol3[gc_viewpoint][0] || ev->data1 == gamecontrol3[gc_viewpoint][1])
-		{
-			G_AdjustView(3, 1, true);
-
-			return true;
-		}
-		else if (ev->data1 == gamecontrol4[gc_viewpoint][0] || ev->data1 == gamecontrol4[gc_viewpoint][1])
-		{
-			G_AdjustView(4, 1, true);
-
-			return true;
+			if (ev->data1 == gamecontrol[i][gc_viewpoint][0]
+				|| ev->data1 == gamecontrol[i][gc_viewpoint][1])
+			{
+				G_AdjustView(i+1, 1, true);
+				return true;
+			}
 		}
 
 		// Allow pausing
-		if (
-			ev->data1 == gamecontrol[gc_pause][0]
-			|| ev->data1 == gamecontrol[gc_pause][1]
+		if (ev->data1 == gamecontrol[0][gc_pause][0]
+			|| ev->data1 == gamecontrol[0][gc_pause][1]
 			|| ev->data1 == KEY_PAUSE
 		)
 		{
@@ -1839,19 +1321,107 @@ boolean G_Responder(event_t *ev)
 		if (ev->data1 == 32)
 		{
 			M_StartControlPanel();
-
 			return true;
 		}
 	}
 
+	return false;
+}
+
+//
+// G_Responder
+// Get info needed to make ticcmd_ts for the players.
+//
+boolean G_Responder(event_t *ev)
+{
+	if (demo.playback && demo.title)
+	{
+		// Title demo uses intro responder
+		if (F_IntroResponder(ev))
+		{
+			// stop the title demo
+			G_CheckDemoStatus();
+			return true;
+		}
+
+		return false;
+	}
+	else if (gameaction == ga_nothing
+		&& !demo.quitafterplaying
+		&& ((demo.playback && !modeattacking && !multiplayer) || gamestate == GS_TITLESCREEN))
+	{
+		// any other key pops up menu if in demos
+		if (ev->type == ev_keydown && ev->data1 != 301)
+		{
+			M_StartControlPanel();
+			return true;
+		}
+
+		return false;
+	}
+
+	if (Playing())
+	{
+		// If you're playing, chat is real.
+		// Neatly sidesteps a class of bugs where whenever we add a
+		// new gamestate accessible in netplay, chat was console-only.
+		if (HU_Responder(ev))
+		{
+			return true; // chat ate the event
+		}
+	}
+
+	switch (gamestate)
+	{
+		case GS_LEVEL:
+			if (AM_Responder(ev))
+				return true; // automap ate it
+			// map the event (key/mouse/joy) to a gamecontrol
+			if (G_LevelResponder(ev))
+				return true;
+			break;
+		case GS_INTRO:
+			if (F_IntroResponder(ev))
+			{
+				D_StartTitle();
+				return true;
+			}
+			break;
+		case GS_CUTSCENE:
+			if (F_CutsceneResponder(ev))
+			{
+				D_StartTitle();
+				return true;
+			}
+			break;
+		case GS_CREDITS:
+			if (F_CreditResponder(ev))
+			{
+				F_StartGameEvaluation();
+				return true;
+			}
+			break;
+		case GS_CONTINUING:
+			if (F_ContinueResponder(ev))
+				return true;
+			break;
+		case GS_GAMEEND:
+		case GS_EVALUATION:
+			return true; // Demo End
+			break;
+		default:
+			break;
+	}
+
 	// update keys current state
-	G_MapEventsToControls(ev);
+	if (!menuactive)
+		G_MapEventsToControls(ev);
 
 	switch (ev->type)
 	{
 		case ev_keydown:
-			if (ev->data1 == gamecontrol[gc_pause][0]
-				|| ev->data1 == gamecontrol[gc_pause][1]
+			if (ev->data1 == gamecontrol[0][gc_pause][0]
+				|| ev->data1 == gamecontrol[0][gc_pause][1]
 				|| ev->data1 == KEY_PAUSE)
 			{
 				if (!pausedelay)
@@ -1866,76 +1436,41 @@ boolean G_Responder(event_t *ev)
 				else
 					pausedelay = NEWTICRATE/7;
 			}
-			if (ev->data1 == gamecontrol[gc_camtoggle][0]
-				|| ev->data1 == gamecontrol[gc_camtoggle][1])
+
+			// no splitscreen support for director here
+			if (ev->data1 == gamecontrol[0][gc_director][0]
+				|| ev->data1 == gamecontrol[0][gc_director][1])
 			{
-				if (!camtoggledelay)
-				{
-					camtoggledelay = NEWTICRATE / 7;
-					CV_SetValue(&cv_chasecam, cv_chasecam.value ? 0 : 1);
-				}
+				K_ToggleDirector();
 			}
-			if (ev->data1 == gamecontrolbis[gc_camtoggle][0]
-				|| ev->data1 == gamecontrolbis[gc_camtoggle][1])
+
+			// absolutely horrid
+			for (INT32 i = 0; i <= splitscreen; i++)
 			{
-				if (!camtoggledelay2)
+				if (ev->data1 == gamecontrol[i][gc_camtoggle][0]
+					|| ev->data1 == gamecontrol[i][gc_camtoggle][1])
 				{
-					camtoggledelay2 = NEWTICRATE / 7;
-					CV_SetValue(&cv_chasecam2, cv_chasecam2.value ? 0 : 1);
+					if (!camtoggledelay[i])
+					{
+						camtoggledelay[i] = NEWTICRATE / 7;
+						CV_SetValue(&cv_chasecam[i], (cv_chasecam[i].value ^ 1));
+					}
 				}
-			}
-			if (ev->data1 == gamecontrol3[gc_camtoggle][0]
-				|| ev->data1 == gamecontrol3[gc_camtoggle][1])
-			{
-				if (!camtoggledelay3)
+
+				if (ev->data1 == gamecontrol[i][gc_spectate][0]
+					|| ev->data1 == gamecontrol[i][gc_spectate][1])
 				{
-					camtoggledelay3 = NEWTICRATE / 7;
-					CV_SetValue(&cv_chasecam3, cv_chasecam3.value ? 0 : 1);
+					if (!spectatedelay[i])
+					{
+						spectatedelay[i] = NEWTICRATE / 7;
+						G_ToggleSpectate(i);
+					}
 				}
-			}
-			if (ev->data1 == gamecontrol4[gc_camtoggle][0]
-				|| ev->data1 == gamecontrol4[gc_camtoggle][1])
-			{
-				if (!camtoggledelay4)
+
+				if (ev->data1 == gamecontrol[i][gc_freecam][0]
+					|| ev->data1 == gamecontrol[i][gc_freecam][1])
 				{
-					camtoggledelay4 = NEWTICRATE / 7;
-					CV_SetValue(&cv_chasecam4, cv_chasecam4.value ? 0 : 1);
-				}
-			}
-			if (ev->data1 == gamecontrol[gc_spectate][0]
-				|| ev->data1 == gamecontrol[gc_spectate][1])
-			{
-				if (!spectatedelay)
-				{
-					spectatedelay = NEWTICRATE / 7;
-					COM_ImmedExecute("changeteam spectator");
-				}
-			}
-			if (ev->data1 == gamecontrolbis[gc_spectate][0]
-				|| ev->data1 == gamecontrolbis[gc_spectate][1])
-			{
-				if (!spectatedelay2)
-				{
-					spectatedelay2 = NEWTICRATE / 7;
-					COM_ImmedExecute("changeteam2 spectator");
-				}
-			}
-			if (ev->data1 == gamecontrol3[gc_spectate][0]
-				|| ev->data1 == gamecontrol3[gc_spectate][1])
-			{
-				if (!spectatedelay3)
-				{
-					spectatedelay3 = NEWTICRATE / 7;
-					COM_ImmedExecute("changeteam3 spectator");
-				}
-			}
-			if (ev->data1 == gamecontrol4[gc_spectate][0]
-				|| ev->data1 == gamecontrol4[gc_spectate][1])
-			{
-				if (!spectatedelay4)
-				{
-					spectatedelay4 = NEWTICRATE / 7;
-					COM_ImmedExecute("changeteam4 spectator");
+					P_ToggleDemoCamera(i);
 				}
 			}
 			if (ev->data1 == gamecontrol[gc_director][0]
@@ -1948,22 +1483,16 @@ boolean G_Responder(event_t *ev)
 
 		case ev_keyup:
 			return false; // always let key up events filter down
-
 		case ev_mouse:
 			return true; // eat events
-
 		case ev_joystick:
 			return true; // eat events
-
 		case ev_joystick2:
 			return true; // eat events
-
 		case ev_joystick3:
 			return true; // eat events
-
 		case ev_joystick4:
 			return true; // eat events
-
 		default:
 			break;
 	}
@@ -1991,9 +1520,7 @@ boolean G_CouldView(INT32 playernum)
 		return false;
 
 	// SRB2Kart: Only go through players who are actually playing
-	if (player->exiting)
-		return false;
-	if (( player->pflags & PF_TIMEOVER ))
+	if (player->exiting || (player->pflags & PF_TIMEOVER))
 		return false;
 
 	// I don't know if we want this actually, but I'll humor the suggestion anyway
@@ -2029,6 +1556,7 @@ boolean G_CanView(INT32 playernum, UINT8 viewnum, boolean onlyactive)
 		if ((*displayplayerp) == playernum)
 			return false;
 	}
+
 	for (viewd = viewnum + 1; viewd <= splits; ++viewd)
 	{
 		displayplayerp = (&displayplayers[viewd-1]);
@@ -2048,16 +1576,19 @@ INT32 G_FindView(INT32 startview, UINT8 viewnum, boolean onlyactive, boolean rev
 {
 	INT32 i, dir = reverse ? -1 : 1;
 	startview = min(max(startview, 0), MAXPLAYERS);
+
 	for (i = startview; i < MAXPLAYERS && i >= 0; i += dir)
 	{
 		if (G_CanView(i, viewnum, onlyactive))
 			return i;
 	}
+
 	for (i = (reverse ? MAXPLAYERS-1 : 0); i != startview; i += dir)
 	{
 		if (G_CanView(i, viewnum, onlyactive))
 			return i;
 	}
+
 	return -1;
 }
 
@@ -2073,6 +1604,27 @@ INT32 G_CountPlayersPotentiallyViewable(boolean active)
 	return total;
 }
 
+//
+// G_FixCamera
+// Reset camera position, angle and interpolation on a view
+// after changing state.
+//
+void G_FixCamera(UINT8 view)
+{
+	player_t *player = &players[displayplayers[view - 1]];
+
+	// The order of displayplayers can change, which would
+	// invalidate localangle.
+	if (!P_MobjWasRemoved(player->mo))
+		localangle[view - 1] = player->mo->angle;
+
+	P_ResetCamera(player, &camera[view - 1]);
+
+	// Make sure the viewport doesn't interpolate at all into
+	// its new position -- just snap instantly into place.
+	R_ResetViewInterpolation(view);
+}
+
 //
 // G_ResetView
 // Correct a viewpoint to playernum or the next available, wraps forward.
@@ -2084,8 +1636,9 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive)
 	UINT8 splits;
 	UINT8 viewd;
 
-	INT32    *displayplayerp;
-	camera_t *camerap;
+	INT32 playernumd;
+
+	INT32 *displayplayerp;
 
 	INT32 olddisplayplayer;
 	INT32 playersviewable;
@@ -2101,56 +1654,37 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive)
 
 		if (viewnum > playersviewable)
 			viewnum = playersviewable;
-		splitscreen = viewnum-1;
 
-		/* Prepare extra views for G_FindView to pass. */
-		for (viewd = splits+1; viewd < viewnum; ++viewd)
-		{
-			displayplayerp = (&displayplayers[viewd-1]);
-			(*displayplayerp) = INT32_MAX;
-		}
+		splitscreen = viewnum-1;
 
 		R_ExecuteSetViewSize();
 	}
 
-	displayplayerp = (&displayplayers[viewnum-1]);
-	olddisplayplayer = (*displayplayerp);
-
-	/* Check if anyone is available to view. */
-	if ((playernum = G_FindView(playernum, viewnum, onlyactive, playernum < olddisplayplayer)) == -1)
-		return;
-
-	/* Focus our target view first so that we don't take its player. */
-	(*displayplayerp) = playernum;
-	if ((*displayplayerp) != olddisplayplayer)
+	for (viewd = min(splits+1, viewnum); viewd <= viewnum; ++viewd)
 	{
-		camerap = &camera[viewnum-1];
-		P_ResetCamera(&players[(*displayplayerp)], camerap);
+		playernumd = (viewd == viewnum) ? playernum : displayplayers[viewd-1];
+		displayplayerp = (&displayplayers[viewd-1]);
+		olddisplayplayer = (*displayplayerp);
 
-		// Make sure the viewport doesn't interpolate at all into
-		// its new position -- just snap instantly into place.
-		R_ResetViewInterpolation(viewnum);
-	}
+		/* Check if anyone is available to view. */
+		if ((playernumd = G_FindView(playernumd, viewd, onlyactive, playernumd < olddisplayplayer)) == -1)
+			continue;
 
-	if (viewnum > splits)
-	{
-		for (viewd = splits+1; viewd < viewnum; ++viewd)
+		/* Focus our target view first so that we don't take its player. */
+		(*displayplayerp) = playernumd;
+
+		/* If a viewpoint changes, reset the camera to clear uninitialized memory. */
+		if (viewnum > splits)
 		{
-			displayplayerp = (&displayplayers[viewd-1]);
-			camerap = &camera[viewd];
-
-			(*displayplayerp) = G_FindView(0, viewd, onlyactive, false);
-
-			P_ResetCamera(&players[(*displayplayerp)], camerap);
-
-
-			// Make sure the viewport doesn't interpolate at all into
-			// its new position -- just snap instantly into place.
-			R_ResetViewInterpolation(viewd);
+			G_FixCamera(viewd);
+		}
+		else if ((*displayplayerp) != olddisplayplayer)
+		{
+			G_FixCamera(viewnum);
 		}
 	}
 
-	if (viewnum == 1 && demo.playback)
+	if (demo.playback && viewnum == 1)
 		consoleplayer = displayplayers[0];
 }
 
@@ -2164,6 +1698,10 @@ void G_AdjustView(UINT8 viewnum, INT32 offset, boolean onlyactive)
 	INT32 *displayplayerp, oldview;
 	displayplayerp = &displayplayers[viewnum-1];
 	oldview = (*displayplayerp);
+
+	// turn off the freecam
+	camera[viewnum-1].freecam = false;
+
 	G_ResetView(viewnum, ( (*displayplayerp) + offset ), onlyactive);
 
 	// If no other view could be found, go back to what we had.
@@ -2221,6 +1759,7 @@ void G_Ticker(boolean run)
 	// also the -1 is to ensure that the thinker runs in the loop below.
 
 	P_MapStart();
+
 	// do player reborns if needed
 	if (gamestate == GS_LEVEL)
 	{
@@ -2228,13 +1767,6 @@ void G_Ticker(boolean run)
 		if (!(netgame || multiplayer) && G_GetRetryFlag())
 		{
 			G_ClearRetryFlag();
-
-			// Costs a life to retry ... unless the player in question is dead already.
-			/*if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE)
-				players[consoleplayer].lives -= 1;
-
-			G_DoReborn(consoleplayer);*/
-
 			D_MapChange(gamemap, gametype, cv_kartencore.value, true, 1, false, false);
 		}
 
@@ -2242,22 +1774,25 @@ void G_Ticker(boolean run)
 			if (playeringame[i] && players[i].playerstate == PST_REBORN)
 				G_DoReborn(i);
 	}
+
 	P_MapEnd();
 
 	// do things to change the game state
 	while (gameaction != ga_nothing)
+	{
 		switch (gameaction)
 		{
-			case ga_completed: G_DoCompleted(); break;
+			case ga_completed: G_DoCompleted();     break;
 			case ga_startcont: G_DoStartContinue(); break;
-			case ga_continued: G_DoContinued(); break;
-			case ga_worlddone: G_DoWorldDone(); break;
-			case ga_startvote: G_DoStartVote(); break;
+			case ga_continued: G_DoContinued();     break;
+			case ga_worlddone: G_DoWorldDone();     break;
+			case ga_startvote: G_DoStartVote();     break;
 			case ga_nothing: break;
 			default: I_Error("gameaction = %d\n", gameaction);
 		}
+	}
 
-	buf = gametic % TICQUEUE;
+	buf = gametic % BACKUPTICS;
 
 	if (!demo.playback)
 	{
@@ -2353,6 +1888,7 @@ void G_Ticker(boolean run)
 
 		case GS_TITLESCREEN:
 			F_TitleScreenTicker(run);
+			HU_TickSongCredits();
 			break;
 		case GS_WAITINGPLAYERS:
 			if (netgame)
@@ -2377,23 +1913,14 @@ void G_Ticker(boolean run)
 		if (pausedelay)
 			pausedelay--;
 
-		if (camtoggledelay)
-			camtoggledelay--;
-		if (camtoggledelay2)
-			camtoggledelay2--;
-		if (camtoggledelay3)
-			camtoggledelay3--;
-		if (camtoggledelay4)
-			camtoggledelay4--;
+		for (UINT8 j = 0; j < MAXSPLITSCREENPLAYERS;j++)
+		{
+			if (camtoggledelay[j])
+				camtoggledelay[j]--;
 
-		if (spectatedelay)
-			spectatedelay--;
-		if (spectatedelay2)
-			spectatedelay2--;
-		if (spectatedelay3)
-			spectatedelay3--;
-		if (spectatedelay4)
-			spectatedelay4--;
+			if (spectatedelay[j])
+				spectatedelay[j]--;
+		}
 
 		if (gametic % NAMECHANGERATE == 0)
 		{
@@ -2435,7 +1962,7 @@ static inline void G_PlayerFinishLevel(INT32 player)
 	{
 		if (legitimateexit && !demo.playback && !mapreset) // (yes you're allowed to unlock stuff this way when the game is modified)
 		{
-			matchesplayed++;
+			kartstats.matchesplayed++;
 			if (M_UpdateUnlockablesAndExtraEmblems(true))
 				S_StartSound(NULL, sfx_ncitem);
 			G_SaveGameData(true);
@@ -2502,6 +2029,10 @@ void G_PlayerReborn(INT32 player)
 	boolean fade;
 	boolean playing;
 
+	tic_t laptime[LAP__MAX];
+
+	INT32 i;
+
 	score = players[player].score;
 	marescore = players[player].marescore;
 	lives = players[player].lives;
@@ -2563,6 +2094,11 @@ void G_PlayerReborn(INT32 player)
 		starpostnum = 0;
 		respawnflip = 0;
 		starpostangle = 0;
+
+		for (i = 0; i < LAP__MAX; i++)
+		{
+			laptime[i] = 0;
+		}
 	}
 	else
 	{
@@ -2591,6 +2127,11 @@ void G_PlayerReborn(INT32 player)
 		bumper = players[player].kartstuff[k_bumper];
 		comebackpoints = players[player].kartstuff[k_comebackpoints];
 		wanted = players[player].kartstuff[k_wanted];
+
+		for (i = 0; i < LAP__MAX; i++)
+		{
+			laptime[i] = players[player].laptime[i];
+		}
 	}
 
 	spectatorreentry = players[player].spectatorreentry;
@@ -2634,6 +2175,11 @@ void G_PlayerReborn(INT32 player)
 	p->laps = laps;
 	p->totalring = totalring;
 
+	for (i = 0; i < LAP__MAX; i++)
+	{
+		p->laptime[i] = laptime[i];
+	}
+
 	p->mare = mare;
 	if (bot)
 		p->bot = 1; // reset to AI-controlled
@@ -2671,20 +2217,15 @@ void G_PlayerReborn(INT32 player)
 
 	if (p-players == consoleplayer)
 	{
-		if (mapmusflags & MUSIC_RELOADRESET)
+		if (mapmusic.flags & MUSIC_RELOADRESET)
 		{
-			strncpy(mapmusname, mapheaderinfo[gamemap-1]->musname, 7);
-			mapmusname[6] = 0;
-			mapmusflags = (mapheaderinfo[gamemap-1]->mustrack & MUSIC_TRACKMASK);
-			mapmusposition = mapheaderinfo[gamemap-1]->muspos;
-			mapmusresume = 0;
+			S_HandleReloadResetMusic();
 			songcredit = true;
 		}
 	}
 
 	/* I'm putting this here because lol */
-
-	fade = (cv_fading.value && cv_birdmusic.value && P_IsLocalPlayer(p));
+	fade = (cv_birdmusic.value && cv_fading.value && P_IsLocalPlayer(p));
 
 	if (fade)
 	{
@@ -2694,7 +2235,7 @@ void G_PlayerReborn(INT32 player)
 		Fade it in with the same call to avoid
 		max volume for a few milliseconds (?).
 		*/
-		if (! playing)
+		if (!playing)
 			S_SetRestoreMusicFadeInCvar(&cv_respawnfademusicback);
 	}
 
@@ -2782,7 +2323,7 @@ void G_SpawnPlayer(INT32 playernum, boolean starpost)
 	if (starpost) //Don't even bother with looking for a place to spawn.
 	{
 		P_MovePlayerToStarpost(playernum);
-		LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :)
+		LUA_HookPlayer(&players[playernum], HOOK(PlayerSpawn)); // Lua hook for player spawning :)
 		return;
 	}
 
@@ -2838,7 +2379,7 @@ void G_SpawnPlayer(INT32 playernum, boolean starpost)
 	}
 	P_MovePlayerToSpawn(playernum, spawnpoint);
 
-	LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :)
+	LUA_HookPlayer(&players[playernum], HOOK(PlayerSpawn)); // Lua hook for player spawning :)
 }
 
 mapthing_t *G_FindCTFStart(INT32 playernum)
@@ -2965,10 +2506,10 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
 				{
 					if (!playeringame[j] || players[j].spectator)
 						continue;
-					if (j == playernum)
-						continue;
-					if (j == i)
+
+					if ((j == playernum) || (j == i))
 						continue;
+
 					if (players[j].score == players[i].score)
 						num++;
 				}
@@ -3026,10 +2567,7 @@ void G_ChangePlayerReferences(mobj_t *oldmo, mobj_t *newmo)
 	// scan all thinkers
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -3066,10 +2604,10 @@ void G_DoReborn(INT32 playernum)
 			oldmo = player->mo;
 			// Don't leave your carcass stuck 10-billion feet in the ground!
 			P_RemoveMobj(player->mo);
-			P_SetTarget(&player->mo, NULL);
 		}
 
 		B_RespawnBot(playernum);
+
 		if (oldmo)
 			G_ChangePlayerReferences(oldmo, players[playernum].mo);
 	}
@@ -3089,12 +2627,15 @@ void G_DoReborn(INT32 playernum)
 			oldmo = player->mo;
 			// Don't leave your carcass stuck 10-billion feet in the ground!
 			P_RemoveMobj(player->mo);
-			P_SetTarget(&player->mo, NULL);
 		}
 
 		G_SpawnPlayer(playernum, starpost);
+
 		if (oldmo)
 			G_ChangePlayerReferences(oldmo, players[playernum].mo);
+
+		if (!demo.playback && playernum == consoleplayer)
+			kartstats.respawns++;
 	}
 }
 
@@ -3110,6 +2651,8 @@ void G_AddPlayer(INT32 playernum)
 
 void G_ExitLevel(void)
 {
+	G_ResetAllDeviceRumbles();
+
 	if (gamestate == GS_LEVEL)
 	{
 		gameaction = ga_completed;
@@ -3138,13 +2681,6 @@ const char *Gametype_Names[NUMGAMETYPES] =
 {
 	"Race", // GT_RACE
 	"Battle" // GT_MATCH
-
-	/*"Co-op", // GT_COOP
-	"Competition", // GT_COMPETITION
-	"Team Match", // GT_TEAMMATCH
-	"Tag", // GT_TAG
-	"Hide and Seek", // GT_HIDEANDSEEK
-	"CTF" // GT_CTF*/
 };
 
 //
@@ -3163,67 +2699,6 @@ INT32 G_GetGametypeByName(const char *gametypestr)
 	return -1; // unknown gametype
 }
 
-//
-// G_IsSpecialStage
-//
-// Returns TRUE if
-// the given map is a special stage.
-//
-boolean G_IsSpecialStage(INT32 mapnum)
-{
-	(void)mapnum;
-	return false;
-}
-
-//
-// G_GametypeUsesLives
-//
-// Returns true if the current gametype uses
-// the lives system.  False otherwise.
-//
-boolean G_GametypeUsesLives(void)
-{
-	// SRB2kart NEEDS no lives
-	return false;
-}
-
-//
-// G_GametypeHasTeams
-//
-// Returns true if the current gametype uses
-// Red/Blue teams.  False otherwise.
-//
-boolean G_GametypeHasTeams(void)
-{
-	return (gametype == GT_TEAMMATCH || gametype == GT_CTF);
-}
-
-//
-// G_GametypeHasSpectators
-//
-// Returns true if the current gametype supports
-// spectators.  False otherwise.
-//
-boolean G_GametypeHasSpectators(void)
-{
-	// SRB2Kart: We don't have any exceptions to not being able to spectate yet. Maybe when SP & bots roll around.
-#if 0
-	return (gametype != GT_COOP && gametype != GT_COMPETITION && gametype != GT_RACE);
-#else
-	return (netgame || (multiplayer && demo.playback)); //true
-#endif
-}
-
-//
-// G_BattleGametype
-//
-// Returns true in Battle gamemodes, previously was G_RingSlingerGametype.
-//
-boolean G_BattleGametype(void)
-{
-	return (gametype == GT_MATCH);
-}
-
 //
 // G_SometimesGetDifferentGametype
 //
@@ -3255,6 +2730,7 @@ UINT8 G_SometimesGetDifferentGametype(UINT8 prefgametype)
 			default:
 				break;
 		}
+
 		if (encoreactual != (boolean)cv_kartencore.value)
 			encoremodifier = 0x80;
 	}
@@ -3288,6 +2764,7 @@ UINT8 G_SometimesGetDifferentGametype(UINT8 prefgametype)
 			return (GT_RACE|0x80);
 		return (GT_RACE);
 	}
+
 	// This might appear wrong HERE, but the game will display the Encore possibility on the second voting choice instead.
 	return (GT_MATCH|encoremodifier);
 }
@@ -3310,27 +2787,6 @@ UINT8 G_GetGametypeColor(INT16 gt)
 	return 247; // FALLBACK
 }
 
-//
-// G_RaceGametype
-//
-// Returns true in Race gamemodes, previously was G_PlatformGametype.
-//
-boolean G_RaceGametype(void)
-{
-	return (gametype == GT_RACE);
-}
-
-//
-// G_TagGametype
-//
-// For Jazz's Tag/HnS modes that have a lot of special cases...
-// SRB2Kart: do we actually want to add Kart tag later? :V
-//
-boolean G_TagGametype(void)
-{
-	return (gametype == GT_TAG || gametype == GT_HIDEANDSEEK);
-}
-
 /** Get the typeoflevel flag needed to indicate support of a gametype.
   * In single-player, this always returns TOL_SP.
   * \param gametype The gametype for which support is desired.
@@ -3394,7 +2850,8 @@ INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean ignorebuffer, UINT8 maph
 	if (extbuffer != NULL)
 	{
 		bufx = 0;
-		while (extbuffer[bufx]) {
+		while (extbuffer[bufx])
+		{
 			extbufsize++; bufx++;
 		}
 	}
@@ -3523,7 +2980,6 @@ void G_AddMapToBuffer(INT16 map)
 static void G_DoCompleted(void)
 {
 	INT32 i, j = 0;
-	boolean gottoken = false;
 
 	tokenlist = 0; // Reset the list
 
@@ -3534,6 +2990,8 @@ static void G_DoCompleted(void)
 	if (metalrecording)
 		G_StopMetalRecording();
 
+	K_StatRound();
+
 	for (i = 0; i < MAXPLAYERS; i++)
 		if (playeringame[i])
 		{
@@ -3570,15 +3028,13 @@ static void G_DoCompleted(void)
 		nextmap = (INT16)(mapheaderinfo[gamemap-1]->nextlevel-1);
 
 	// Remember last map for when you come out of the special stage.
-	if (!G_IsSpecialStage(gamemap))
-		lastmap = nextmap;
+	lastmap = nextmap;
 
 	// If nextmap is actually going to get used, make sure it points to
 	// a map of the proper gametype -- skip levels that don't support
 	// the current gametype. (Helps avoid playing boss levels in Race,
 	// for instance).
-	if (!token && !G_IsSpecialStage(gamemap) && !modeattacking
-		&& (nextmap >= 0 && nextmap < NUMMAPS))
+	if (!token && !modeattacking && (nextmap >= 0 && nextmap < NUMMAPS))
 	{
 		register INT16 cm = nextmap;
 		INT16 tolflag = G_TOLFlag(gametype);
@@ -3589,6 +3045,7 @@ static void G_DoCompleted(void)
 		while (!mapheaderinfo[cm] || !(mapheaderinfo[cm]->typeoflevel & tolflag))
 		{
 			visitedmap[cm/8] |= (1<<(cm&7));
+
 			if (!mapheaderinfo[cm])
 				cm = -1; // guarantee error execution
 			else
@@ -3598,10 +3055,11 @@ static void G_DoCompleted(void)
 			{
 				cm = nextmap; //Start the loop again so that the error checking below is executed.
 
-				//Make sure the map actually exists before you try to go to it!
+				// Make sure the map actually exists before you try to go to it!
 				if ((W_CheckNumForName(G_BuildMapName(cm + 1)) == LUMPERROR))
 				{
 					//CONS_Alert(CONS_ERROR, M_GetText("Next map given (MAP %d) doesn't exist! Reverting to MAP01.\n"), cm+1);
+					CON_LogMessage(va(M_GetText("Next map given (MAP %d) doesn't exist! Reverting to MAP01.\n"), cm+1));
 					cm = 0;
 					break;
 				}
@@ -3613,6 +3071,7 @@ static void G_DoCompleted(void)
 				// without finding one supporting the current gametype.
 				// Thus, print a warning, and just use this map anyways.
 				//CONS_Alert(CONS_WARNING, M_GetText("Can't find a compatible map after map %d; using map %d anyway\n"), prevmap+1, cm+1);
+				CON_LogMessage(va(M_GetText("Can't find a compatible map after map %d; using map %d anyway\n"), prevmap+1, cm+1));
 				break;
 			}
 		}
@@ -3629,12 +3088,11 @@ static void G_DoCompleted(void)
 	if (gametype == GT_COOP && token)
 	{
 		token--;
-		gottoken = true;
 
 		if (!(emeralds & EMERALD1))
 			nextmap = (INT16)(sstage_start - 1); // Special Stage 1
 		else if (!(emeralds & EMERALD2))
-			nextmap = (INT16)(sstage_start); // Special Stage 2
+			nextmap = (INT16)(sstage_start);     // Special Stage 2
 		else if (!(emeralds & EMERALD3))
 			nextmap = (INT16)(sstage_start + 1); // Special Stage 3
 		else if (!(emeralds & EMERALD4))
@@ -3645,13 +3103,8 @@ static void G_DoCompleted(void)
 			nextmap = (INT16)(sstage_start + 4); // Special Stage 6
 		else if (!(emeralds & EMERALD7))
 			nextmap = (INT16)(sstage_start + 5); // Special Stage 7
-		else
-			gottoken = false;
 	}
 
-	if (G_IsSpecialStage(gamemap) && !gottoken)
-		nextmap = lastmap; // Exiting from a special stage? Go back to the game. Tails 08-11-2001
-
 	automapactive = false;
 
 	if (gametype != GT_COOP)
@@ -3662,7 +3115,6 @@ static void G_DoCompleted(void)
 			nextmap = G_RandMap(G_TOLFlag(gametype), prevmap, false, 0, false, NULL);
 	}
 
-
 	// We are committed to this map now.
 	// We may as well allocate its header if it doesn't exist
 	// (That is, if it's a real map)
@@ -3683,7 +3135,6 @@ demointermission:
 void G_AfterIntermission(void)
 {
 	HU_ClearCEcho();
-	//G_NextLevel();
 
 	if (demo.playback)
 	{
@@ -3698,6 +3149,8 @@ void G_AfterIntermission(void)
 	}
 	else if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
 		G_SaveDemo();
+	else if (demo.recording)
+		G_ResetDemoRecording();
 
 	if (modeattacking) // End the run.
 	{
@@ -3845,6 +3298,8 @@ void G_EndGame(void)
 {
 	if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
 		G_SaveDemo();
+	else if (demo.recording)
+		G_ResetDemoRecording();
 
 	// Only do evaluation and credits in coop games.
 	if (gametype == GT_COOP)
@@ -3889,6 +3344,7 @@ void G_LoadGameData(void)
 	INT32 i, j;
 	UINT8 modded = false;
 	UINT8 rtemp;
+	savebuffer_t save;
 
 	//For records
 	tic_t rectime;
@@ -3898,8 +3354,7 @@ void G_LoadGameData(void)
 	// to new gamedata
 	G_ClearRecords(); // main and nights records
 	M_ClearSecrets(); // emblems, unlocks, maps visited, etc
-	totalplaytime = 0; // total play time (separate from all)
-	matchesplayed = 0; // SRB2Kart: matches played & finished
+	K_EraseStats(); // stats
 
 	if (M_CheckParm("-nodata"))
 		return; // Don't load.
@@ -3910,28 +3365,28 @@ void G_LoadGameData(void)
 	if (M_CheckParm("-resetdata"))
 		return; // Don't load (essentially, reset).
 
-	length = FIL_ReadFile(va(pandf, srb2home, gamedatafilename), &savebuffer);
+	length = FIL_ReadFile(va(pandf, srb2home, gamedatafilename), &save.buffer);
 	if (!length) // Aw, no game data. Their loss!
 		return;
 
-	save_p = savebuffer;
+	save.p = save.buffer;
 
 	// Version check
-	if (READUINT32(save_p) != 0xFCAFE211)
+	if (READUINT32(save.p) != 0xFCAFE211)
 	{
 		const char *gdfolder = "the SRB2Kart folder";
 		if (strcmp(srb2home,"."))
 			gdfolder = srb2home;
 
-		Z_Free(savebuffer);
-		save_p = NULL;
+		Z_Free(save.buffer);
+		save.p = NULL;
 		I_Error("Game data is from another version of SRB2.\nDelete %s(maybe in %s) and try again.", gamedatafilename, gdfolder);
 	}
 
-	totalplaytime = READUINT32(save_p);
-	matchesplayed = READUINT32(save_p);
+	// well no clue but dont think it would like reading garbage from vanilla files
+	K_ReadStats(&save, !savemoddata);
 
-	modded = READUINT8(save_p);
+	modded = READUINT8(save.p);
 
 	// Aha! Someone's been screwing with the save file!
 	if ((modded && !savemoddata))
@@ -3941,48 +3396,47 @@ void G_LoadGameData(void)
 
 	// TODO put another cipher on these things? meh, I don't care...
 	for (i = 0; i < NUMMAPS; i++)
-		if ((mapvisited[i] = READUINT8(save_p)) > MV_MAX)
+		if ((mapvisited[i] = READUINT8(save.p)) > MV_MAX)
 			goto datacorrupt;
 
 	// To save space, use one bit per collected/achieved/unlocked flag
 	for (i = 0; i < MAXEMBLEMS;)
 	{
-		rtemp = READUINT8(save_p);
+		rtemp = READUINT8(save.p);
 		for (j = 0; j < 8 && j+i < MAXEMBLEMS; ++j)
 			emblemlocations[j+i].collected = ((rtemp >> j) & 1);
 		i += j;
 	}
 	for (i = 0; i < MAXEXTRAEMBLEMS;)
 	{
-		rtemp = READUINT8(save_p);
+		rtemp = READUINT8(save.p);
 		for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j)
 			extraemblems[j+i].collected = ((rtemp >> j) & 1);
 		i += j;
 	}
 	for (i = 0; i < MAXUNLOCKABLES;)
 	{
-		rtemp = READUINT8(save_p);
+		rtemp = READUINT8(save.p);
 		for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j)
 			unlockables[j+i].unlocked = ((rtemp >> j) & 1);
 		i += j;
 	}
 	for (i = 0; i < MAXCONDITIONSETS;)
 	{
-		rtemp = READUINT8(save_p);
+		rtemp = READUINT8(save.p);
 		for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j)
 			conditionSets[j+i].achieved = ((rtemp >> j) & 1);
 		i += j;
 	}
 
-	timesBeaten = READUINT32(save_p);
-	timesBeatenWithEmeralds = READUINT32(save_p);
-	//timesBeatenUltimate = READUINT32(save_p);
+	timesBeaten = READUINT32(save.p);
+	timesBeatenWithEmeralds = READUINT32(save.p);
 
 	// Main records
 	for (i = 0; i < NUMMAPS; ++i)
 	{
-		rectime = (tic_t)READUINT32(save_p);
-		reclap  = (tic_t)READUINT32(save_p);
+		rectime = (tic_t)READUINT32(save.p);
+		reclap  = (tic_t)READUINT32(save.p);
 
 		if (rectime || reclap)
 		{
@@ -3993,8 +3447,8 @@ void G_LoadGameData(void)
 	}
 
 	// done
-	Z_Free(savebuffer);
-	save_p = NULL;
+	Z_Free(save.buffer);
+	save.p = NULL;
 
 	// Silent update unlockables in case they're out of sync with conditions
 	M_SilentUpdateUnlockablesAndEmblems();
@@ -4008,8 +3462,8 @@ void G_LoadGameData(void)
 		if (strcmp(srb2home,"."))
 			gdfolder = srb2home;
 
-		Z_Free(savebuffer);
-		save_p = NULL;
+		Z_Free(save.buffer);
+		save.p = NULL;
 
 		I_Error("Corrupt game data file.\nDelete %s(maybe in %s) and try again.", gamedatafilename, gdfolder);
 	}
@@ -4022,38 +3476,48 @@ void G_SaveGameData(boolean force)
 	size_t length;
 	INT32 i, j;
 	UINT8 btemp;
-
-	//INT32 curmare;
+	savebuffer_t save;
+	(void)force;
+	char backupfile[MAX_WADPATH+4];
 
 	if (!gamedataloaded)
 		return; // If never loaded (-nodata), don't save
 
-	save_p = savebuffer = (UINT8 *)malloc(GAMEDATASIZE);
-	if (!save_p)
+	save.p = save.buffer = (UINT8 *)malloc(GAMEDATASIZE);
+	if (!save.p)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
 		return;
 	}
 
-	if (majormods && !force)
+	// Create backup of the save data
+	snprintf(backupfile, sizeof(backupfile), "%s.bak", gamedatafilename);
+	backupfile[sizeof(backupfile) - 1] = '\0';
+
+	FILE *gamedata = fopen(gamedatafilename, "r");
+
+	if (gamedata != NULL)
 	{
-		free(savebuffer);
-		save_p = savebuffer = NULL;
-		return;
+		fclose(gamedata);
+
+		if (!FIL_CopyFile(gamedatafilename, backupfile))
+		{
+			CONS_Alert(CONS_WARNING,"Failed to create a backup of save data. Will not attempt to write to save data\n");
+			return;
+		}
 	}
 
 	// Version test
-	WRITEUINT32(save_p, 0xFCAFE211);
+	WRITEUINT32(save.p, 0xFCAFE211);
 
-	WRITEUINT32(save_p, totalplaytime);
-	WRITEUINT32(save_p, matchesplayed);
+	K_WriteStats(&save, !savemoddata);
 
 	btemp = (UINT8)(savemoddata); // what used to be here was profoundly dunderheaded
-	WRITEUINT8(save_p, btemp);
+	WRITEUINT8(save.p, btemp);
 
 	// TODO put another cipher on these things? meh, I don't care...
 	for (i = 0; i < NUMMAPS; i++)
-		WRITEUINT8(save_p, mapvisited[i]);
+		WRITEUINT8(save.p, mapvisited[i]);
 
 	// To save space, use one bit per collected/achieved/unlocked flag
 	for (i = 0; i < MAXEMBLEMS;)
@@ -4061,7 +3525,7 @@ void G_SaveGameData(boolean force)
 		btemp = 0;
 		for (j = 0; j < 8 && j+i < MAXEMBLEMS; ++j)
 			btemp |= (emblemlocations[j+i].collected << j);
-		WRITEUINT8(save_p, btemp);
+		WRITEUINT8(save.p, btemp);
 		i += j;
 	}
 	for (i = 0; i < MAXEXTRAEMBLEMS;)
@@ -4069,7 +3533,7 @@ void G_SaveGameData(boolean force)
 		btemp = 0;
 		for (j = 0; j < 8 && j+i < MAXEXTRAEMBLEMS; ++j)
 			btemp |= (extraemblems[j+i].collected << j);
-		WRITEUINT8(save_p, btemp);
+		WRITEUINT8(save.p, btemp);
 		i += j;
 	}
 	for (i = 0; i < MAXUNLOCKABLES;)
@@ -4077,7 +3541,7 @@ void G_SaveGameData(boolean force)
 		btemp = 0;
 		for (j = 0; j < 8 && j+i < MAXUNLOCKABLES; ++j)
 			btemp |= (unlockables[j+i].unlocked << j);
-		WRITEUINT8(save_p, btemp);
+		WRITEUINT8(save.p, btemp);
 		i += j;
 	}
 	for (i = 0; i < MAXCONDITIONSETS;)
@@ -4085,33 +3549,33 @@ void G_SaveGameData(boolean force)
 		btemp = 0;
 		for (j = 0; j < 8 && j+i < MAXCONDITIONSETS; ++j)
 			btemp |= (conditionSets[j+i].achieved << j);
-		WRITEUINT8(save_p, btemp);
+		WRITEUINT8(save.p, btemp);
 		i += j;
 	}
 
-	WRITEUINT32(save_p, timesBeaten);
-	WRITEUINT32(save_p, timesBeatenWithEmeralds);
+	WRITEUINT32(save.p, timesBeaten);
+	WRITEUINT32(save.p, timesBeatenWithEmeralds);
 
 	// Main records
 	for (i = 0; i < NUMMAPS; i++)
 	{
 		if (mainrecords[i])
 		{
-			WRITEUINT32(save_p, mainrecords[i]->time);
-			WRITEUINT32(save_p, mainrecords[i]->lap);
+			WRITEUINT32(save.p, mainrecords[i]->time);
+			WRITEUINT32(save.p, mainrecords[i]->lap);
 		}
 		else
 		{
-			WRITEUINT32(save_p, 0);
-			WRITEUINT32(save_p, 0);
+			WRITEUINT32(save.p, 0);
+			WRITEUINT32(save.p, 0);
 		}
 	}
 
-	length = save_p - savebuffer;
+	length = save.p - save.buffer;
 
-	FIL_WriteFile(va(pandf, srb2home, gamedatafilename), savebuffer, length);
-	free(savebuffer);
-	save_p = savebuffer = NULL;
+	FIL_WriteFile(va(pandf, srb2home, gamedatafilename), save.buffer, length);
+	free(save.buffer);
+	save.p = save.buffer = NULL;
 }
 
 #define VERSIONSIZE 16
@@ -4127,22 +3591,23 @@ static void M_ForceLoadGameResponse(INT32 ch)
 	if (ch != 'y' && ch != KEY_ENTER)
 	{
 		//refused
-		Z_Free(savebuffer);
-		save_p = savebuffer = NULL;
+		Z_Free(save.buffer);
+		save.p = save.buffer = NULL;
 		startonmapnum = 0;
 		M_SetupNextMenu(&SP_LoadDef);
 		return;
 	}
 
 	// pick up where we left off.
-	save_p += VERSIONSIZE;
+	save.p += VERSIONSIZE;
+
 	if (!P_LoadGame(startonmapnum))
 	{
 		M_ClearMenus(true); // so ESC backs out to title
 		M_StartMessage(M_GetText("Savegame file corrupted\n\nPress ESC\n"), NULL, MM_NOTHING);
 		Command_ExitGame_f();
-		Z_Free(savebuffer);
-		save_p = savebuffer = NULL;
+		Z_Free(save.buffer);
+		save.p = save.buffer = NULL;
 		startonmapnum = 0;
 
 		// no cheating!
@@ -4151,8 +3616,8 @@ static void M_ForceLoadGameResponse(INT32 ch)
 	}
 
 	// done
-	Z_Free(savebuffer);
-	save_p = savebuffer = NULL;
+	Z_Free(save.buffer);
+	save.p = save.buffer = NULL;
 	startonmapnum = 0;
 
 	//set cursaveslot to -1 so nothing gets saved.
@@ -4180,6 +3645,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 	size_t length;
 	char vcheck[VERSIONSIZE];
 	char savename[255];
+	savebuffer_t save;
 
 	// memset savedata to all 0, fixes calling perfectly valid saves corrupt because of bots
 	memset(&savedata, 0, sizeof(savedata));
@@ -4191,18 +3657,18 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 
 	sprintf(savename, savegamename, slot);
 
-	length = FIL_ReadFile(savename, &savebuffer);
+	length = FIL_ReadFile(savename, &save.buffer);
 	if (!length)
 	{
 		CONS_Printf(M_GetText("Couldn't read file %s\n"), savename);
 		return;
 	}
 
-	save_p = savebuffer;
+	save.p = save.buffer;
 
 	memset(vcheck, 0, sizeof (vcheck));
 	sprintf(vcheck, "version %d", VERSION);
-	if (strcmp((const char *)save_p, (const char *)vcheck))
+	if (strcmp((const char *)save.p, (const char *)vcheck))
 	{
 #ifdef SAVEGAME_OTHERVERSIONS
 		M_StartMessage(M_GetText("Save game from different version.\nYou can load this savegame, but\nsaving afterwards will be disabled.\n\nDo you want to continue anyway?\n\n(Press 'Y' to confirm)\n"),
@@ -4212,30 +3678,27 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 		M_ClearMenus(true); // so ESC backs out to title
 		M_StartMessage(M_GetText("Save game from different version\n\nPress ESC\n"), NULL, MM_NOTHING);
 		Command_ExitGame_f();
-		Z_Free(savebuffer);
-		save_p = savebuffer = NULL;
+		Z_Free(save.buffer);
+		save.p = save.buffer = NULL;
 
 		// no cheating!
 		memset(&savedata, 0, sizeof(savedata));
 #endif
 		return; // bad version
 	}
-	save_p += VERSIONSIZE;
+	save.p += VERSIONSIZE;
 
 	if (demo.playback) // reset game engine
 		G_StopDemo();
 
-//	paused = false;
-//	automapactive = false;
-
 	// dearchive all the modifications
-	if (!P_LoadGame(mapoverride))
+	if (!P_LoadGame(&save, mapoverride))
 	{
 		M_ClearMenus(true); // so ESC backs out to title
 		M_StartMessage(M_GetText("Savegame file corrupted\n\nPress ESC\n"), NULL, MM_NOTHING);
 		Command_ExitGame_f();
-		Z_Free(savebuffer);
-		save_p = savebuffer = NULL;
+		Z_Free(save.buffer);
+		save.p = save.buffer = NULL;
 
 		// no cheating!
 		memset(&savedata, 0, sizeof(savedata));
@@ -4243,17 +3706,14 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
 	}
 
 	// done
-	Z_Free(savebuffer);
-	save_p = savebuffer = NULL;
+	Z_Free(save.buffer);
+	save.p = save.buffer = NULL;
 
-//	gameaction = ga_nothing;
-//	G_SetGamestate(GS_LEVEL);
 	displayplayers[0] = consoleplayer;
 	multiplayer = false;
 	splitscreen = 0;
 	SplitScreen_OnChange(); // not needed?
 
-//	G_DeferedInitNew(sk_medium, G_BuildMapName(1), 0, 0, 1);
 	if (setsizeneeded)
 		R_ExecuteSetViewSize();
 
@@ -4270,6 +3730,7 @@ void G_SaveGame(UINT32 savegameslot)
 	boolean saved;
 	char savename[256] = "";
 	const char *backup;
+	savebuffer_t save;
 
 	sprintf(savename, savegamename, savegameslot);
 	backup = va("%s",savename);
@@ -4283,8 +3744,8 @@ void G_SaveGame(UINT32 savegameslot)
 		char name[VERSIONSIZE];
 		size_t length;
 
-		save_p = savebuffer = (UINT8 *)malloc(SAVEGAMESIZE);
-		if (!save_p)
+		save.p = save.buffer = (UINT8 *)malloc(SAVEGAMESIZE);
+		if (!save.p)
 		{
 			CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
 			return;
@@ -4292,14 +3753,14 @@ void G_SaveGame(UINT32 savegameslot)
 
 		memset(name, 0, sizeof (name));
 		sprintf(name, "version %d", VERSION);
-		WRITEMEM(save_p, name, VERSIONSIZE);
+		WRITEMEM(save.p, name, VERSIONSIZE);
 
-		P_SaveGame();
+		P_SaveGame(&save);
 
-		length = save_p - savebuffer;
-		saved = FIL_WriteFile(backup, savebuffer, length);
-		free(savebuffer);
-		save_p = savebuffer = NULL;
+		length = save.p - save.buffer;
+		saved = FIL_WriteFile(backup, save.buffer, length);
+		free(save.buffer);
+		save.p = save.buffer = NULL;
 	}
 
 	gameaction = ga_nothing;
@@ -4423,7 +3884,7 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
 		unlocktriggers = 0;
 
 		// clear itemfinder, just in case
-		if (!dedicated)	// except in dedicated servers, where it is not registered and can actually I_Error debug builds
+		if (!dedicated) // except in dedicated servers, where it is not registered and can actually I_Error debug builds
 			CV_StealthSetValue(&cv_itemfinder, 0);
 	}
 
@@ -4441,14 +3902,14 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
 
 	// gamemap changed; we assume that its map header is always valid,
 	// so make it so
-	if(!mapheaderinfo[gamemap-1])
+	if (!mapheaderinfo[gamemap-1])
 		P_AllocMapHeader(gamemap-1);
 
 	maptol = mapheaderinfo[gamemap-1]->typeoflevel;
 	globalweather = mapheaderinfo[gamemap-1]->weather;
 
 	// Don't carry over custom music change to another map.
-	mapmusflags |= MUSIC_RELOADRESET;
+	mapmusic.flags |= MUSIC_RELOADRESET;
 
 	automapactive = false;
 	imcontinuing = false;
@@ -4457,7 +3918,7 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
 		F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer);
 	else
 	{
-		LUAh_MapChange(gamemap);
+		LUA_HookInt(gamemap, HOOK(MapChange));
 		G_DoLoadLevel(resetplayer);
 	}
 
@@ -4475,7 +3936,6 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
 	}
 }
 
-
 char *G_BuildMapTitle(INT32 mapnum)
 {
 	char *title = NULL;
@@ -4619,8 +4079,7 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep,
 					break;
 			}
 		}
-		else
-		if (apromapnum == 0 || wanttable)
+		else if (apromapnum == 0 || wanttable)
 		{
 			/* LEVEL 1--match keywords verbatim */
 			if (( aprop = strcasestr(realmapname, mapname) ))
@@ -4706,11 +4165,13 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
 	INT32 newmapnum = -1;
 	size_t mapnamelen = strlen(mapname);
 	char *p;
-	
+
 	if (mapnamelen == 1)
 	{
 		if (mapname[0] == '*') // current map
 			return gamemap;
+		else if (mapname[0] == '?' && mapheaderinfo[gamemap-1])
+			return G_RandMap(G_TOLFlag(gametype), gamemap-1, false, 0, false, NULL)+1;
 		else if (mapname[0] == '+' && mapheaderinfo[gamemap-1]) // next map
 		{
 			newmapnum = mapheaderinfo[gamemap-1]->nextlevel;
@@ -4766,3688 +4227,6 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
 	return newmapnum;
 }
 
-//
-// DEMO RECORDING
-//
-
-#define DEMOVERSION 0x0002
-#define DEMOHEADER  "\xF0" "KartReplay" "\x0F"
-
-#define DF_GHOST        0x01 // This demo contains ghost data too!
-#define DF_RECORDATTACK 0x02 // This demo is from record attack and contains its final completion time!
-#define DF_NIGHTSATTACK 0x04 // This demo is from NiGHTS attack and contains its time left, score, and mares!
-#define DF_ATTACKMASK   0x06 // This demo is from ??? attack and contains ???
-
-#define DF_LUAVARS		0x20 // this demo contains extra lua vars; this is mostly used for backwards compability
-
-#define DF_ATTACKSHIFT  1
-#define DF_ENCORE       0x40
-#define DF_MULTIPLAYER  0x80 // This demo was recorded in multiplayer mode!
-
-#ifdef DEMO_COMPAT_100
-#define DF_FILELIST     0x08 // This demo contains an extra files list
-#define DF_GAMETYPEMASK 0x30
-#define DF_GAMESHIFT    4
-#endif
-
-#define DEMO_SPECTATOR 0x40
-
-// For demos
-#define ZT_FWD     0x01
-#define ZT_SIDE    0x02
-#define ZT_ANGLE   0x04
-#define ZT_BUTTONS 0x08
-#define ZT_AIMING  0x10
-#define ZT_DRIFT   0x20
-#define ZT_LATENCY 0x40
-#define DEMOMARKER 0x80 // demoend
-
-UINT8 demo_extradata[MAXPLAYERS];
-UINT8 demo_writerng; // 0=no, 1=yes, 2=yes but on a timeout
-static ticcmd_t oldcmd[MAXPLAYERS];
-
-#define DW_END        0xFF // End of extradata block
-#define DW_RNG        0xFE // Check RNG seed!
-
-#define DW_EXTRASTUFF 0xFE // Numbers below this are reserved for writing player slot data
-
-// Below consts are only used for demo extrainfo sections
-#define DW_STANDING 0x00
-
-// For Metal Sonic and time attack ghosts
-#define GZT_XYZ    0x01
-#define GZT_MOMXY  0x02
-#define GZT_MOMZ   0x04
-#define GZT_ANGLE  0x08
-// Not used for Metal Sonic
-#define GZT_SPRITE 0x10 // Animation frame
-#define GZT_EXTRA  0x20
-#define GZT_NIGHTS 0x40 // NiGHTS Mode stuff!
-
-// GZT_EXTRA flags
-#define EZT_THOK   0x01 // Spawned a thok object
-#define EZT_SPIN   0x02 // Because one type of thok object apparently wasn't enough
-#define EZT_REV    0x03 // And two types wasn't enough either yet
-#define EZT_THOKMASK 0x03
-#define EZT_COLOR  0x04 // Changed color (Super transformation, Mario fireflowers/invulnerability, etc.)
-#define EZT_FLIP   0x08 // Reversed gravity
-#define EZT_SCALE  0x10 // Changed size
-#define EZT_HIT    0x20 // Damaged a mobj
-#define EZT_SPRITE 0x40 // Changed sprite set completely out of PLAY (NiGHTS, SOCs, whatever)
-#define EZT_KART   0x80 // SRB2Kart: Changed current held item/quantity and bumpers for battle
-
-static mobj_t oldmetal, oldghost[MAXPLAYERS];
-
-void G_SaveMetal(UINT8 **buffer)
-{
-	I_Assert(buffer != NULL && *buffer != NULL);
-
-	WRITEUINT32(*buffer, metal_p - metalbuffer);
-}
-
-void G_LoadMetal(UINT8 **buffer)
-{
-	I_Assert(buffer != NULL && *buffer != NULL);
-
-	G_DoPlayMetal();
-	metal_p = metalbuffer + READUINT32(*buffer);
-}
-
-ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
-{
-	return M_Memcpy(dest, src, n*sizeof(*src));
-}
-
-ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
-{
-	size_t i;
-	for (i = 0; i < n; i++)
-	{
-		dest[i].forwardmove = src[i].forwardmove;
-		dest[i].sidemove = src[i].sidemove;
-		dest[i].angleturn = SHORT(src[i].angleturn);
-		dest[i].aiming = (INT16)SHORT(src[i].aiming);
-		dest[i].buttons = (UINT16)SHORT(src[i].buttons);
-		dest[i].driftturn = (INT16)SHORT(src[i].driftturn);
-		dest[i].latency = (INT16)SHORT(src[i].latency);
-	}
-	return dest;
-}
-
-// Finds a skin with the closest stats if the expected skin doesn't exist.
-static INT32 GetSkinNumClosestToStats(UINT8 kartspeed, UINT8 kartweight)
-{
-	INT32 i, closest_skin = 0;
-	UINT8 closest_stats = UINT8_MAX, stat_diff;
-
-	for (i = 0; i < numskins; i++)
-	{
-		stat_diff = abs(skins[i].kartspeed - kartspeed) + abs(skins[i].kartweight - kartweight);
-		if (stat_diff < closest_stats)
-		{
-			closest_stats = stat_diff;
-			closest_skin = i;
-		}
-	}
-
-	return closest_skin;
-}
-
-static void FindClosestSkinForStats(UINT32 p, UINT8 kartspeed, UINT8 kartweight)
-{
-	INT32 closest_skin = GetSkinNumClosestToStats(kartspeed, kartweight);
-
-	//CONS_Printf("Using %s instead...\n", skins[closest_skin].name);
-	SetPlayerSkinByNum(p, closest_skin);
-}
-
-void G_ReadDemoExtraData(void)
-{
-	INT32 p, extradata, i;
-	char name[17];
-
-	if (leveltime > starttime)
-	{
-		rewind_t *rewind = CL_SaveRewindPoint(demo_p - demobuffer);
-		if (rewind)
-		{
-			memcpy(rewind->oldcmd, oldcmd, sizeof (oldcmd));
-			memcpy(rewind->oldghost, oldghost, sizeof (oldghost));
-		}
-	}
-
-	memset(name, '\0', 17);
-
-	p = READUINT8(demo_p);
-
-	while (p < DW_EXTRASTUFF)
-	{
-		extradata = READUINT8(demo_p);
-
-		if (extradata & DXD_RESPAWN)
-		{
-			if (players[p].mo)
-				P_DamageMobj(players[p].mo, NULL, NULL, 10000); // Is this how this should work..?
-		}
-		if (extradata & DXD_SKIN)
-		{
-			UINT8 kartspeed, kartweight;
-
-			// Skin
-			M_Memcpy(name, demo_p, 16);
-			demo_p += 16;
-			SetPlayerSkin(p, name);
-
-			kartspeed = READUINT8(demo_p);
-			kartweight = READUINT8(demo_p);
-
-			if (stricmp(skins[players[p].skin].name, name) != 0)
-				FindClosestSkinForStats(p, kartspeed, kartweight);
-
-			players[p].kartspeed = kartspeed;
-			players[p].kartweight = kartweight;
-		}
-		if (extradata & DXD_COLOR)
-		{
-			// Color
-			M_Memcpy(name, demo_p, 16);
-			demo_p += 16;
-			for (i = 0; i < MAXSKINCOLORS; i++)
-				if (!stricmp(KartColor_Names[i], name))				// SRB2kart
-				{
-					players[p].skincolor = i;
-					if (players[p].mo)
-						players[p].mo->color = i;
-					break;
-				}
-		}
-		if (extradata & DXD_NAME)
-		{
-			// Name
-			M_Memcpy(player_names[p],demo_p,16);
-			demo_p += 16;
-		}
-		if (extradata & DXD_PLAYSTATE)
-		{
-			extradata = READUINT8(demo_p);
-
-			switch (extradata) {
-			case DXD_PST_PLAYING:
-				players[p].pflags |= PF_WANTSTOJOIN; // fuck you
-				break;
-
-			case DXD_PST_SPECTATING:
-				players[p].pflags &= ~PF_WANTSTOJOIN; // double-fuck you
-				if (!playeringame[p])
-				{
-					CL_ClearPlayer(p);
-					playeringame[p] = true;
-					G_AddPlayer(p);
-					players[p].spectator = true;
-
-					// There's likely an off-by-one error in timing recording or playback of joins. This hacks around it so I don't have to find out where that is. \o/
-					if (oldcmd[p].forwardmove)
-						P_RandomByte();
-				}
-				else
-				{
-					players[p].spectator = true;
-					if (players[p].mo)
-						P_DamageMobj(players[p].mo, NULL, NULL, 10000);
-					else
-						players[p].playerstate = PST_REBORN;
-				}
-				break;
-
-			case DXD_PST_LEFT:
-				CL_RemovePlayer(p, 0);
-				break;
-			}
-
-			G_ResetViews();
-
-			// maybe these are necessary?
-			if (G_BattleGametype())
-				K_CheckBumpers(); // SRB2Kart
-			else if (G_RaceGametype())
-				P_CheckRacers(); // also SRB2Kart
-		}
-
-
-		p = READUINT8(demo_p);
-	}
-
-	while (p != DW_END)
-	{
-		UINT32 rng;
-
-		switch (p)
-		{
-		case DW_RNG:
-			rng = READUINT32(demo_p);
-			if (P_GetRandSeed() != rng)
-			{
-				P_SetRandSeed(rng);
-
-				if (demosynced)
-					CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
-				demosynced = false;
-			}
-		}
-
-		p = READUINT8(demo_p);
-	}
-
-	if (!(demoflags & DF_GHOST) && *demo_p == DEMOMARKER)
-	{
-		// end of demo data stream
-		G_CheckDemoStatus();
-		return;
-	}
-}
-
-void G_WriteDemoExtraData(void)
-{
-	INT32 i;
-	char name[17];
-
-	for (i = 0; i < MAXPLAYERS; i++)
-	{
-		if (demo_extradata[i])
-		{
-			WRITEUINT8(demo_p, i);
-			WRITEUINT8(demo_p, demo_extradata[i]);
-
-			//if (demo_extradata[i] & DXD_RESPAWN) has no extra data
-			if (demo_extradata[i] & DXD_SKIN)
-			{
-				// Skin
-				memset(name, 0, 16);
-				strncpy(name, skins[players[i].skin].name, 16);
-				M_Memcpy(demo_p,name,16);
-				demo_p += 16;
-
-				WRITEUINT8(demo_p, skins[players[i].skin].kartspeed);
-				WRITEUINT8(demo_p, skins[players[i].skin].kartweight);
-			}
-			if (demo_extradata[i] & DXD_COLOR)
-			{
-				// Color
-				memset(name, 0, 16);
-				strncpy(name, KartColor_Names[players[i].skincolor], 16);
-				M_Memcpy(demo_p,name,16);
-				demo_p += 16;
-			}
-			if (demo_extradata[i] & DXD_NAME)
-			{
-				// Name
-				memset(name, 0, 16);
-				memcpy(name, player_names[i], 15); // Keeping 1 null byte for safety, sorry players with name containing more than 15 characters
-				M_Memcpy(demo_p,name,16);
-				demo_p += 16;
-			}
-			if (demo_extradata[i] & DXD_PLAYSTATE)
-			{
-				demo_writerng = 1;
-				if (!playeringame[i])
-					WRITEUINT8(demo_p, DXD_PST_LEFT);
-				else if (
-					players[i].spectator &&
-					!(players[i].pflags & PF_WANTSTOJOIN) // <= fuck you specifically
-				)
-					WRITEUINT8(demo_p, DXD_PST_SPECTATING);
-				else
-					WRITEUINT8(demo_p, DXD_PST_PLAYING);
-			}
-		}
-
-		demo_extradata[i] = 0;
-	}
-
-	// May not be necessary, but might as well play it safe...
-	if ((leveltime & 255) == 128)
-		demo_writerng = 1;
-
-	{
-		static UINT8 timeout = 0;
-
-		if (timeout) timeout--;
-
-		if (demo_writerng == 1 || (demo_writerng == 2 && timeout == 0))
-		{
-			demo_writerng = 0;
-			timeout = 16;
-			WRITEUINT8(demo_p, DW_RNG);
-			WRITEUINT32(demo_p, P_GetRandSeed());
-		}
-	}
-
-	WRITEUINT8(demo_p, DW_END);
-}
-
-void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
-{
-	UINT8 ziptic;
-
-	if (!demo_p || !demo.deferstart)
-		return;
-	ziptic = READUINT8(demo_p);
-
-	if (ziptic & ZT_FWD)
-		oldcmd[playernum].forwardmove = READSINT8(demo_p);
-	if (ziptic & ZT_SIDE)
-		oldcmd[playernum].sidemove = READSINT8(demo_p);
-	if (ziptic & ZT_ANGLE)
-		oldcmd[playernum].angleturn = READINT16(demo_p);
-	if (ziptic & ZT_BUTTONS)
-		oldcmd[playernum].buttons = READUINT16(demo_p);
-	if (ziptic & ZT_AIMING)
-		oldcmd[playernum].aiming = READINT16(demo_p);
-	if (ziptic & ZT_DRIFT)
-		oldcmd[playernum].driftturn = READINT16(demo_p);
-	if (ziptic & ZT_LATENCY)
-		oldcmd[playernum].latency = READUINT8(demo_p);
-
-	G_CopyTiccmd(cmd, &oldcmd[playernum], 1);
-
-	// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
-	if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
-		|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
-		|| (players[displayplayers[0]].kartstuff[k_respawn]) // Respawning
-		|| (players[displayplayers[0]].spectator || objectplacing)) // Not a physical player
-		&& !(players[displayplayers[0]].kartstuff[k_spinouttimer] && players[displayplayers[0]].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
-		localangle[0] += (cmd->angleturn<<16);
-
-	if (!(demoflags & DF_GHOST) && *demo_p == DEMOMARKER)
-	{
-		// end of demo data stream
-		G_CheckDemoStatus();
-		return;
-	}
-}
-
-void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
-{
-	char ziptic = 0;
-	UINT8 *ziptic_p;
-
-	if (!demo_p)
-		return;
-	ziptic_p = demo_p++; // the ziptic, written at the end of this function
-
-	if (cmd->forwardmove != oldcmd[playernum].forwardmove)
-	{
-		WRITEUINT8(demo_p,cmd->forwardmove);
-		oldcmd[playernum].forwardmove = cmd->forwardmove;
-		ziptic |= ZT_FWD;
-	}
-
-	if (cmd->sidemove != oldcmd[playernum].sidemove)
-	{
-		WRITEUINT8(demo_p,cmd->sidemove);
-		oldcmd[playernum].sidemove = cmd->sidemove;
-		ziptic |= ZT_SIDE;
-	}
-
-	if (cmd->angleturn != oldcmd[playernum].angleturn)
-	{
-		WRITEINT16(demo_p,cmd->angleturn);
-		oldcmd[playernum].angleturn = cmd->angleturn;
-		ziptic |= ZT_ANGLE;
-	}
-
-	if (cmd->buttons != oldcmd[playernum].buttons)
-	{
-		WRITEUINT16(demo_p,cmd->buttons);
-		oldcmd[playernum].buttons = cmd->buttons;
-		ziptic |= ZT_BUTTONS;
-	}
-
-	if (cmd->aiming != oldcmd[playernum].aiming)
-	{
-		WRITEINT16(demo_p,cmd->aiming);
-		oldcmd[playernum].aiming = cmd->aiming;
-		ziptic |= ZT_AIMING;
-	}
-
-	if (cmd->driftturn != oldcmd[playernum].driftturn)
-	{
-		WRITEINT16(demo_p,cmd->driftturn);
-		oldcmd[playernum].driftturn = cmd->driftturn;
-		ziptic |= ZT_DRIFT;
-	}
-
-	if (cmd->latency != oldcmd[playernum].latency)
-	{
-		WRITEUINT8(demo_p,cmd->latency);
-		oldcmd[playernum].latency = cmd->latency;
-		ziptic |= ZT_LATENCY;
-	}
-
-	*ziptic_p = ziptic;
-
-	// attention here for the ticcmd size!
-	// latest demos with mouse aiming byte in ticcmd
-	if (!(demoflags & DF_GHOST) && ziptic_p > demoend - 9)
-	{
-		G_CheckDemoStatus(); // no more space
-		return;
-	}
-}
-
-void G_GhostAddThok(INT32 playernum)
-{
-	if (!demo.recording || !(demoflags & DF_GHOST))
-		return;
-	ghostext[playernum].flags = (ghostext[playernum].flags & ~EZT_THOKMASK) | EZT_THOK;
-}
-
-void G_GhostAddSpin(INT32 playernum)
-{
-	if (!demo.recording || !(demoflags & DF_GHOST))
-		return;
-	ghostext[playernum].flags = (ghostext[playernum].flags & ~EZT_THOKMASK) | EZT_SPIN;
-}
-
-void G_GhostAddRev(INT32 playernum)
-{
-	if (!demo.recording || !(demoflags & DF_GHOST))
-		return;
-	ghostext[playernum].flags = (ghostext[playernum].flags & ~EZT_THOKMASK) | EZT_REV;
-}
-
-void G_GhostAddFlip(INT32 playernum)
-{
-	if (!demo.recording || !(demoflags & DF_GHOST))
-		return;
-	ghostext[playernum].flags |= EZT_FLIP;
-}
-
-void G_GhostAddColor(INT32 playernum, ghostcolor_t color)
-{
-	if (!demo.recording || !(demoflags & DF_GHOST))
-		return;
-	if (ghostext[playernum].lastcolor == (UINT8)color)
-	{
-		ghostext[playernum].flags &= ~EZT_COLOR;
-		return;
-	}
-	ghostext[playernum].flags |= EZT_COLOR;
-	ghostext[playernum].color = (UINT8)color;
-}
-
-void G_GhostAddScale(INT32 playernum, fixed_t scale)
-{
-	if (!demo.recording || !(demoflags & DF_GHOST))
-		return;
-	if (ghostext[playernum].lastscale == scale)
-	{
-		ghostext[playernum].flags &= ~EZT_SCALE;
-		return;
-	}
-	ghostext[playernum].flags |= EZT_SCALE;
-	ghostext[playernum].scale = scale;
-}
-
-void G_GhostAddHit(INT32 playernum, mobj_t *victim)
-{
-	if (!demo.recording || !(demoflags & DF_GHOST))
-		return;
-	ghostext[playernum].flags |= EZT_HIT;
-	ghostext[playernum].hits++;
-	ghostext[playernum].hitlist = Z_Realloc(ghostext[playernum].hitlist, ghostext[playernum].hits * sizeof(mobj_t *), PU_LEVEL, NULL);
-	ghostext[playernum].hitlist[ghostext[playernum].hits-1] = victim;
-}
-
-void G_WriteAllGhostTics(void)
-{
-	UINT8 *save_demo_p = demo_p;
-#define CHECKSPACE(num) if (demo_p+(num) > demoend) { demo_p = save_demo_p; G_CheckDemoStatus(); return; }
-
-	INT32 i, counter = leveltime;
-	for (i = 0; i < MAXPLAYERS; i++)
-	{
-		if (!playeringame[i] || players[i].spectator)
-			continue;
-
-		if (!players[i].mo)
-			continue;
-
-		counter++;
-
-		if (counter % cv_netdemosyncquality.value != 0) // Only write 1 in this many ghost datas per tic to cut down on multiplayer replay size.
-			continue;
-
-		CHECKSPACE(1);
-
-		WRITEUINT8(demo_p, i);
-		G_WriteGhostTic(players[i].mo, i);
-	}
-
-	CHECKSPACE(1);
-	WRITEUINT8(demo_p, 0xFF);
-
-#undef CHECKSPACE
-}
-
-void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
-{
-	char ziptic = 0;
-	UINT8 *ziptic_p;
-	UINT32 i;
-	UINT8 sprite;
-	UINT8 frame;
-
-	UINT8 *save_demo_p = demo_p;
-#define CHECKSPACE(num) if (demo_p+(num) > demoend) { demo_p = save_demo_p; G_CheckDemoStatus(); return; }
-
-	if (!demo_p)
-		return;
-	if (!(demoflags & DF_GHOST))
-		return; // No ghost data to write.
-
-	if (ghost->player && ghost->player->pflags & PF_NIGHTSMODE && ghost->tracer)
-	{
-		// We're talking about the NiGHTS thing, not the normal platforming thing!
-		ziptic |= GZT_NIGHTS;
-		ghost = ghost->tracer;
-	}
-
-	ziptic_p = demo_p++; // the ziptic, written at the end of this function
-
-#define MAXMOM (0x7FFF<<8)
-
-	// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
-	if (abs(ghost->x-oldghost[playernum].x) > MAXMOM
-	|| abs(ghost->y-oldghost[playernum].y) > MAXMOM
-	|| abs(ghost->z-oldghost[playernum].z) > MAXMOM
-	|| ((UINT8)(leveltime & 255) > 0 && (UINT8)(leveltime & 255) <= (UINT8)cv_netdemosyncquality.value)) // Hack to enable slightly nicer resyncing
-	{
-		oldghost[playernum].x = ghost->x;
-		oldghost[playernum].y = ghost->y;
-		oldghost[playernum].z = ghost->z;
-		ziptic |= GZT_XYZ;
-
-		CHECKSPACE(sizeof(fixed_t)*3);
-		WRITEFIXED(demo_p,oldghost[playernum].x);
-		WRITEFIXED(demo_p,oldghost[playernum].y);
-		WRITEFIXED(demo_p,oldghost[playernum].z);
-	}
-	else
-	{
-		// For moving normally:
-		// Store one full byte of movement, plus one byte of fractional movement.
-		INT16 momx = (INT16)((ghost->x-oldghost[playernum].x + (1<<4))>>8);
-		INT16 momy = (INT16)((ghost->y-oldghost[playernum].y + (1<<4))>>8);
-		if (momx != oldghost[playernum].momx
-		|| momy != oldghost[playernum].momy)
-		{
-			oldghost[playernum].momx = momx;
-			oldghost[playernum].momy = momy;
-			ziptic |= GZT_MOMXY;
-
-			CHECKSPACE(4);
-
-			WRITEINT16(demo_p,momx);
-			WRITEINT16(demo_p,momy);
-		}
-		momx = (INT16)((ghost->z-oldghost[playernum].z + (1<<4))>>8);
-		if (momx != oldghost[playernum].momz)
-		{
-			oldghost[playernum].momz = momx;
-			ziptic |= GZT_MOMZ;
-
-			CHECKSPACE(2);
-
-			WRITEINT16(demo_p,momx);
-		}
-
-		// This SHOULD set oldghost.x/y/z to match ghost->x/y/z
-		// but it keeps the fractional loss of one byte,
-		// so it will hopefully be made up for in future tics.
-		oldghost[playernum].x += oldghost[playernum].momx<<8;
-		oldghost[playernum].y += oldghost[playernum].momy<<8;
-		oldghost[playernum].z += oldghost[playernum].momz<<8;
-	}
-
-#undef MAXMOM
-
-	// Only store the 8 most relevant bits of angle
-	// because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
-	// and it does not affect this mode of movement at all anyway.
-	if (ghost->angle>>24 != oldghost[playernum].angle)
-	{
-		oldghost[playernum].angle = ghost->angle>>24;
-		ziptic |= GZT_ANGLE;
-
-		CHECKSPACE(1);
-
-		WRITEUINT8(demo_p,oldghost[playernum].angle);
-	}
-
-	// Store the sprite frame.
-	frame = ghost->frame & 0xFF;
-	if (frame != oldghost[playernum].frame)
-	{
-		oldghost[playernum].frame = frame;
-		ziptic |= GZT_SPRITE;
-
-		CHECKSPACE(1);
-
-		WRITEUINT8(demo_p,oldghost[playernum].frame);
-	}
-
-	// Check for sprite set changes
-	sprite = ghost->sprite;
-	if (sprite != oldghost[playernum].sprite)
-	{
-		oldghost[playernum].sprite = sprite;
-		ghostext[playernum].flags |= EZT_SPRITE;
-	}
-
-	if (ghost->player)
-	{
-		if (
-			ghostext[playernum].kartitem != ghost->player->kartstuff[k_itemtype] ||
-			ghostext[playernum].kartamount != ghost->player->kartstuff[k_itemamount] ||
-			ghostext[playernum].kartbumpers != ghost->player->kartstuff[k_bumper]
-		)
-		{
-			ghostext[playernum].flags |= EZT_KART;
-			ghostext[playernum].kartitem = ghost->player->kartstuff[k_itemtype];
-			ghostext[playernum].kartamount = ghost->player->kartstuff[k_itemamount];
-			ghostext[playernum].kartbumpers = ghost->player->kartstuff[k_bumper];
-
-		}
-	}
-
-	if (ghostext[playernum].color == ghostext[playernum].lastcolor)
-		ghostext[playernum].flags &= ~EZT_COLOR;
-	if (ghostext[playernum].scale == ghostext[playernum].lastscale)
-		ghostext[playernum].flags &= ~EZT_SCALE;
-
-	if (ghostext[playernum].flags)
-	{
-		ziptic |= GZT_EXTRA;
-		WRITEUINT8(demo_p,ghostext[playernum].flags);
-
-		if (ghostext[playernum].flags & EZT_COLOR)
-		{
-			CHECKSPACE(1);
-			WRITEUINT8(demo_p,ghostext[playernum].color);
-			ghostext[playernum].lastcolor = ghostext[playernum].color;
-		}
-		if (ghostext[playernum].flags & EZT_SCALE)
-		{
-			CHECKSPACE(sizeof(fixed_t));
-			WRITEFIXED(demo_p,ghostext[playernum].scale);
-			ghostext[playernum].lastscale = ghostext[playernum].scale;
-		}
-		if (ghostext[playernum].flags & EZT_HIT)
-		{
-			CHECKSPACE(2);
-			WRITEUINT16(demo_p,ghostext[playernum].hits);
-			for (i = 0; i < ghostext[playernum].hits; i++)
-			{
-				mobj_t *mo = ghostext[playernum].hitlist[i];
-
-				CHECKSPACE(4+4+2+sizeof(fixed_t)*3+sizeof(angle_t));
-
-				WRITEUINT32(demo_p,UINT32_MAX); // reserved for some method of determining exactly which mobj this is. (mobjnum doesn't work here.)
-				WRITEUINT32(demo_p,mo->type);
-				WRITEUINT16(demo_p,(UINT16)mo->health);
-				WRITEFIXED(demo_p,mo->x);
-				WRITEFIXED(demo_p,mo->y);
-				WRITEFIXED(demo_p,mo->z);
-				WRITEANGLE(demo_p,mo->angle);
-			}
-			Z_Free(ghostext[playernum].hitlist);
-			ghostext[playernum].hits = 0;
-			ghostext[playernum].hitlist = NULL;
-		}
-		if (ghostext[playernum].flags & EZT_SPRITE)
-		{
-			CHECKSPACE(1);
-			WRITEUINT8(demo_p,sprite);
-		}
-		if (ghostext[playernum].flags & EZT_KART)
-		{
-			CHECKSPACE(12);
-
-			WRITEINT32(demo_p, ghostext[playernum].kartitem);
-			WRITEINT32(demo_p, ghostext[playernum].kartamount);
-			WRITEINT32(demo_p, ghostext[playernum].kartbumpers);
-		}
-		ghostext[playernum].flags = 0;
-	}
-
-	*ziptic_p = ziptic;
-
-	// attention here for the ticcmd size!
-	// latest demos with mouse aiming byte in ticcmd
-	if (demo_p >= demoend - (13 + 9))
-	{
-		G_CheckDemoStatus(); // no more space
-		return;
-	}
-#undef CHECKSPACE
-}
-
-void G_ConsAllGhostTics(void)
-{
-	UINT8 p = READUINT8(demo_p);
-
-	while (p != 0xFF)
-	{
-		G_ConsGhostTic(p);
-		p = READUINT8(demo_p);
-	}
-
-	if (*demo_p == DEMOMARKER)
-	{
-		// end of demo data stream
-		G_CheckDemoStatus();
-		return;
-	}
-}
-
-// Uses ghost data to do consistency checks on your position.
-// This fixes desynchronising demos when fighting eggman.
-void G_ConsGhostTic(INT32 playernum)
-{
-	UINT8 ziptic;
-	fixed_t px,py,pz,gx,gy,gz;
-	mobj_t *testmo;
-	fixed_t syncleeway;
-	boolean nightsfail = false;
-
-	if (!demo_p || !demo.deferstart)
-		return;
-	if (!(demoflags & DF_GHOST))
-		return; // No ghost data to use.
-
-	testmo = players[playernum].mo;
-
-	// Grab ghost data.
-	ziptic = READUINT8(demo_p);
-	if (ziptic & GZT_XYZ)
-	{
-		oldghost[playernum].x = READFIXED(demo_p);
-		oldghost[playernum].y = READFIXED(demo_p);
-		oldghost[playernum].z = READFIXED(demo_p);
-		syncleeway = 0;
-	}
-	else
-	{
-		if (ziptic & GZT_MOMXY)
-		{
-			oldghost[playernum].momx = READINT16(demo_p)<<8;
-			oldghost[playernum].momy = READINT16(demo_p)<<8;
-		}
-		if (ziptic & GZT_MOMZ)
-			oldghost[playernum].momz = READINT16(demo_p)<<8;
-		oldghost[playernum].x += oldghost[playernum].momx;
-		oldghost[playernum].y += oldghost[playernum].momy;
-		oldghost[playernum].z += oldghost[playernum].momz;
-		syncleeway = FRACUNIT;
-	}
-	if (ziptic & GZT_ANGLE)
-		demo_p++;
-	if (ziptic & GZT_SPRITE)
-		demo_p++;
-	if(ziptic & GZT_NIGHTS) {
-		if (!testmo || !testmo->player || !(testmo->player->pflags & PF_NIGHTSMODE) || !testmo->tracer)
-			nightsfail = true;
-		else
-			testmo = testmo->tracer;
-	}
-
-	if (ziptic & GZT_EXTRA)
-	{ // But wait, there's more!
-		ziptic = READUINT8(demo_p);
-		if (ziptic & EZT_COLOR)
-			demo_p++;
-		if (ziptic & EZT_SCALE)
-			demo_p += sizeof(fixed_t);
-		if (ziptic & EZT_HIT)
-		{ // Resync mob damage.
-			UINT16 i, count = READUINT16(demo_p);
-			thinker_t *th;
-			mobj_t *mobj;
-
-			UINT32 type;
-			UINT16 health;
-			fixed_t x;
-			fixed_t y;
-			fixed_t z;
-
-			for (i = 0; i < count; i++)
-			{
-				demo_p += 4; // reserved.
-				type = READUINT32(demo_p);
-				health = READUINT16(demo_p);
-				x = READFIXED(demo_p);
-				y = READFIXED(demo_p);
-				z = READFIXED(demo_p);
-				demo_p += sizeof(angle_t); // angle, unnecessary for cons.
-
-				mobj = NULL;
-				for (th = thinkercap.next; th != &thinkercap; th = th->next)
-				{
-					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-						continue;
-					if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-						continue;
-					mobj = (mobj_t *)th;
-					if (mobj->type == (mobjtype_t)type && mobj->x == x && mobj->y == y && mobj->z == z)
-						break;
-				}
-				if ((th != &thinkercap && th->function.acp1 != (actionf_p1)P_MobjThinker) && mobj->health != health) // Wasn't damaged?! This is desync! Fix it!
-				{
-					if (demosynced)
-						CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
-					demosynced = false;
-					P_DamageMobj(mobj, players[0].mo, players[0].mo, 1);
-				}
-			}
-		}
-		if (ziptic & EZT_SPRITE)
-			demo_p++;
-		if (ziptic & EZT_KART)
-		{
-			ghostext[playernum].kartitem = READINT32(demo_p);
-			ghostext[playernum].kartamount = READINT32(demo_p);
-			ghostext[playernum].kartbumpers = READINT32(demo_p);
-		}
-	}
-
-	if (testmo)
-	{
-		// Re-synchronise
-		px = testmo->x;
-		py = testmo->y;
-		pz = testmo->z;
-		gx = oldghost[playernum].x;
-		gy = oldghost[playernum].y;
-		gz = oldghost[playernum].z;
-
-		if (nightsfail || abs(px-gx) > syncleeway || abs(py-gy) > syncleeway || abs(pz-gz) > syncleeway)
-		{
-			ghostext[playernum].desyncframes++;
-
-			if (ghostext[playernum].desyncframes >= 2)
-			{
-				if (demosynced)
-					CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
-				demosynced = false;
-
-				P_UnsetThingPosition(testmo);
-				testmo->x = oldghost[playernum].x;
-				testmo->y = oldghost[playernum].y;
-				P_SetThingPosition(testmo);
-				testmo->z = oldghost[playernum].z;
-
-				if (abs(testmo->z - testmo->floorz) < 4*FRACUNIT)
-					testmo->z = testmo->floorz; // Sync players to the ground when they're likely supposed to be there...
-
-				ghostext[playernum].desyncframes = 2;
-			}
-		}
-		else
-			ghostext[playernum].desyncframes = 0;
-
-		if (
-#ifdef DEMO_COMPAT_100
-			demo.version != 0x0001 &&
-#endif
-			(
-				players[playernum].kartstuff[k_itemtype] != ghostext[playernum].kartitem ||
-				players[playernum].kartstuff[k_itemamount] != ghostext[playernum].kartamount ||
-				players[playernum].kartstuff[k_bumper] != ghostext[playernum].kartbumpers
-			)
-		)
-		{
-			if (demosynced)
-				CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced!\n"));
-			demosynced = false;
-
-			players[playernum].kartstuff[k_itemtype] = ghostext[playernum].kartitem;
-			players[playernum].kartstuff[k_itemamount] = ghostext[playernum].kartamount;
-			players[playernum].kartstuff[k_bumper] = ghostext[playernum].kartbumpers;
-		}
-	}
-
-	if (*demo_p == DEMOMARKER)
-	{
-		// end of demo data stream
-		G_CheckDemoStatus();
-		return;
-	}
-}
-
-void G_GhostTicker(void)
-{
-	demoghost *g,*p;
-	for(g = ghosts, p = NULL; g; g = g->next)
-	{
-		// Skip normal demo data.
-		UINT8 ziptic = READUINT8(g->p);
-
-#ifdef DEMO_COMPAT_100
-		if (g->version != 0x0001)
-		{
-#endif
-		while (ziptic != DW_END) // Get rid of extradata stuff
-		{
-			if (ziptic == 0) // Only support player 0 info for now
-			{
-				ziptic = READUINT8(g->p);
-				if (ziptic & DXD_SKIN)
-					g->p += 18; // We _could_ read this info, but it shouldn't change anything in record attack...
-				if (ziptic & DXD_COLOR)
-					g->p += 16; // Same tbh
-				if (ziptic & DXD_NAME)
-					g->p += 16; // yea
-				if (ziptic & DXD_PLAYSTATE && READUINT8(g->p) != DXD_PST_PLAYING)
-					I_Error("Ghost is not a record attack ghost"); //@TODO lmao don't blow up like this
-			}
-			else if (ziptic == DW_RNG)
-				g->p += 4; // RNG seed
-			else
-				I_Error("Ghost is not a record attack ghost"); //@TODO lmao don't blow up like this
-
-			ziptic = READUINT8(g->p);
-		}
-
-		ziptic = READUINT8(g->p); // Back to actual ziptic stuff
-#ifdef DEMO_COMPAT_100
-		}
-#endif
-
-		if (ziptic & ZT_FWD)
-			g->p++;
-		if (ziptic & ZT_SIDE)
-			g->p++;
-		if (ziptic & ZT_ANGLE)
-			g->p += 2;
-		if (ziptic & ZT_BUTTONS)
-			g->p += 2;
-		if (ziptic & ZT_AIMING)
-			g->p += 2;
-		if (ziptic & ZT_DRIFT)
-			g->p += 2;
-		if (ziptic & ZT_LATENCY)
-			g->p += 1;
-
-		// Grab ghost data.
-		ziptic = READUINT8(g->p);
-
-#ifdef DEMO_COMPAT_100
-		if (g->version != 0x0001)
-		{
-#endif
-		if (ziptic == 0xFF)
-			goto skippedghosttic; // Didn't write ghost info this frame
-		else if (ziptic != 0)
-			I_Error("Ghost is not a record attack ghost"); //@TODO lmao don't blow up like this
-		ziptic = READUINT8(g->p);
-#ifdef DEMO_COMPAT_100
-		}
-#endif
-		if (ziptic & GZT_XYZ)
-		{
-			g->oldmo.x = READFIXED(g->p);
-			g->oldmo.y = READFIXED(g->p);
-			g->oldmo.z = READFIXED(g->p);
-		}
-		else
-		{
-			if (ziptic & GZT_MOMXY)
-			{
-				g->oldmo.momx = READINT16(g->p)<<8;
-				g->oldmo.momy = READINT16(g->p)<<8;
-			}
-			if (ziptic & GZT_MOMZ)
-				g->oldmo.momz = READINT16(g->p)<<8;
-			g->oldmo.x += g->oldmo.momx;
-			g->oldmo.y += g->oldmo.momy;
-			g->oldmo.z += g->oldmo.momz;
-		}
-		if (ziptic & GZT_ANGLE)
-			g->oldmo.angle = READUINT8(g->p)<<24;
-		if (ziptic & GZT_SPRITE)
-			g->oldmo.frame = READUINT8(g->p);
-
-		// Update ghost
-		P_UnsetThingPosition(g->mo);
-		g->mo->x = g->oldmo.x;
-		g->mo->y = g->oldmo.y;
-		g->mo->z = g->oldmo.z;
-		P_SetThingPosition(g->mo);
-		g->mo->angle = g->oldmo.angle;
-		g->mo->frame = g->oldmo.frame | tr_trans30<<FF_TRANSSHIFT;
-
-		if (ziptic & GZT_EXTRA)
-		{ // But wait, there's more!
-			ziptic = READUINT8(g->p);
-			if (ziptic & EZT_COLOR)
-			{
-				g->color = READUINT8(g->p);
-				switch(g->color)
-				{
-				default:
-				case GHC_NORMAL: // Go back to skin color
-					g->mo->color = g->oldmo.color;
-					break;
-				// Handled below
-				case GHC_SUPER:
-				case GHC_INVINCIBLE:
-					break;
-				case GHC_FIREFLOWER: // Fireflower
-					g->mo->color = SKINCOLOR_WHITE;
-					break;
-				}
-			}
-			if (ziptic & EZT_FLIP)
-				g->mo->eflags ^= MFE_VERTICALFLIP;
-			if (ziptic & EZT_SCALE)
-			{
-				g->mo->destscale = READFIXED(g->p);
-				if (g->mo->destscale != g->mo->scale)
-					P_SetScale(g->mo, g->mo->destscale);
-			}
-			if (ziptic & EZT_THOKMASK)
-			{ // Let's only spawn ONE of these per frame, thanks.
-				mobj_t *mobj;
-				INT32 type = -1;
-				if (g->mo->skin)
-				{
-					switch (ziptic & EZT_THOKMASK)
-					{
-					case EZT_THOK:
-						type = (UINT32)mobjinfo[MT_PLAYER].painchance;
-						break;
-					case EZT_SPIN:
-						type = (UINT32)mobjinfo[MT_PLAYER].damage;
-						break;
-					case EZT_REV:
-						type = (UINT32)mobjinfo[MT_PLAYER].raisestate;
-						break;
-					}
-				}
-				if (type == MT_GHOST)
-				{
-					mobj = P_SpawnGhostMobj(g->mo); // does a large portion of the work for us
-					mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|tr_trans60<<FF_TRANSSHIFT; // P_SpawnGhostMobj sets trans50, we want trans60
-				}
-				else
-				{
-					mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK);
-					mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
-					mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<<FF_TRANSSHIFT;
-					mobj->tics = -1; // nope.
-					mobj->color = g->mo->color;
-					if (g->mo->eflags & MFE_VERTICALFLIP)
-					{
-						mobj->flags2 |= MF2_OBJECTFLIP;
-						mobj->eflags |= MFE_VERTICALFLIP;
-					}
-					P_SetScale(mobj, g->mo->scale);
-					mobj->destscale = g->mo->scale;
-				}
-				mobj->floorz = mobj->z;
-				mobj->ceilingz = mobj->z+mobj->height;
-				P_UnsetThingPosition(mobj);
-				mobj->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
-				P_SetThingPosition(mobj);
-				mobj->fuse = 8;
-				P_SetTarget(&mobj->target, g->mo);
-			}
-			if (ziptic & EZT_HIT)
-			{ // Spawn hit poofs for killing things!
-				UINT16 i, count = READUINT16(g->p), health;
-				//UINT32 type;
-				fixed_t x,y,z;
-				angle_t angle;
-				mobj_t *poof;
-				for (i = 0; i < count; i++)
-				{
-					g->p += 4; // reserved
-					g->p += 4; // backwards compat., type used to be here
-					health = READUINT16(g->p);
-					x = READFIXED(g->p);
-					y = READFIXED(g->p);
-					z = READFIXED(g->p);
-					angle = READANGLE(g->p);
-					if (health != 0 || i >= 4) // only spawn for the first 4 hits per frame, to prevent ghosts from splode-spamming too bad.
-						continue;
-					poof = P_SpawnMobj(x, y, z, MT_GHOST);
-					poof->angle = angle;
-					poof->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY; // make an ATTEMPT to curb crazy SOCs fucking stuff up...
-					poof->health = 0;
-					P_SetMobjStateNF(poof, S_XPLD1);
-				}
-			}
-			if (ziptic & EZT_SPRITE)
-				g->mo->sprite = READUINT8(g->p);
-			if (ziptic & EZT_KART)
-				g->p += 12; // kartitem, kartamount, kartbumpers
-		}
-
-#ifdef DEMO_COMPAT_100
-		if (g->version != 0x0001)
-		{
-#endif
-		if (READUINT8(g->p) != 0xFF) // Make sure there isn't other ghost data here.
-			I_Error("Ghost is not a record attack ghost"); //@TODO lmao don't blow up like this
-#ifdef DEMO_COMPAT_100
-		}
-#endif
-
-skippedghosttic:
-		// Tick ghost colors (Super and Mario Invincibility flashing)
-		switch(g->color)
-		{
-		case GHC_SUPER: // Super Sonic (P_DoSuperStuff)
-			g->mo->color = SKINCOLOR_SUPER1;
-			g->mo->color += abs( ( (signed)( (unsigned)leveltime >> 1 ) % 9) - 4);
-			break;
-		case GHC_INVINCIBLE: // Mario invincibility (P_CheckInvincibilityTimer)
-			g->mo->color = (UINT8)(leveltime % MAXSKINCOLORS);
-			break;
-		default:
-			break;
-		}
-
-		// Demo ends after ghost data.
-		if (*g->p == DEMOMARKER)
-		{
-			g->mo->momx = g->mo->momy = g->mo->momz = 0;
-			if (p)
-				p->next = g->next;
-			else
-				ghosts = g->next;
-			Z_Free(g);
-			continue;
-		}
-		p = g;
-	}
-}
-
-// Demo rewinding functions
-typedef struct rewindinfo_s {
-	tic_t leveltime;
-
-	struct {
-		boolean ingame;
-		player_t player;
-		mobj_t mobj;
-	} playerinfo[MAXPLAYERS];
-
-	struct rewindinfo_s *prev;
-} rewindinfo_t;
-
-static tic_t currentrewindnum;
-static rewindinfo_t *rewindhead = NULL; // Reverse chronological order
-
-void G_InitDemoRewind(void)
-{
-	CL_ClearRewinds();
-
-	while (rewindhead)
-	{
-		rewindinfo_t *p = rewindhead->prev;
-		Z_Free(rewindhead);
-		rewindhead = p;
-	}
-
-	currentrewindnum = 0;
-}
-
-void G_StoreRewindInfo(void)
-{
-	static UINT8 timetolog = 8;
-	rewindinfo_t *info;
-	size_t i;
-
-	if (timetolog-- > 0)
-		return;
-	timetolog = 8;
-
-	info = Z_Calloc(sizeof(rewindinfo_t), PU_STATIC, NULL);
-
-	for (i = 0; i < MAXPLAYERS; i++)
-	{
-		if (!playeringame[i] || players[i].spectator)
-		{
-			info->playerinfo[i].ingame = false;
-			continue;
-		}
-
-		info->playerinfo[i].ingame = true;
-		memcpy(&info->playerinfo[i].player, &players[i], sizeof(player_t));
-		if (players[i].mo)
-			memcpy(&info->playerinfo[i].mobj, players[i].mo, sizeof(mobj_t));
-	}
-
-	info->leveltime = leveltime;
-	info->prev = rewindhead;
-	rewindhead = info;
-}
-
-void G_PreviewRewind(tic_t previewtime)
-{
-	SINT8 i;
-	size_t j;
-	fixed_t tweenvalue = 0;
-	rewindinfo_t *info = rewindhead, *next_info = rewindhead;
-
-	if (!info)
-		return;
-
-	while (info->leveltime > previewtime && info->prev)
-	{
-		next_info = info;
-		info = info->prev;
-	}
-	if (info != next_info)
-		tweenvalue = FixedDiv(previewtime - info->leveltime, next_info->leveltime - info->leveltime);
-
-
-	for (i = 0; i < MAXPLAYERS; i++)
-	{
-		if (!playeringame[i] || players[i].spectator)
-		{
-			if (info->playerinfo[i].player.mo)
-			{
-				//@TODO spawn temp object to act as a player display
-			}
-
-			continue;
-		}
-
-		if (!info->playerinfo[i].ingame || !info->playerinfo[i].player.mo)
-		{
-			if (players[i].mo)
-				players[i].mo->flags2 |= MF2_DONTDRAW;
-
-			continue;
-		}
-
-		if (!players[i].mo)
-			continue; //@TODO spawn temp object to act as a player display
-
-		players[i].mo->flags2 &= ~MF2_DONTDRAW;
-
-		P_UnsetThingPosition(players[i].mo);
-#define TWEEN(pr) info->playerinfo[i].mobj.pr + FixedMul((INT32) (next_info->playerinfo[i].mobj.pr - info->playerinfo[i].mobj.pr), tweenvalue)
-		players[i].mo->x = TWEEN(x);
-		players[i].mo->y = TWEEN(y);
-		players[i].mo->z = TWEEN(z);
-		players[i].mo->angle = TWEEN(angle);
-#undef TWEEN
-		P_SetThingPosition(players[i].mo);
-
-		players[i].frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue);
-
-		players[i].mo->sprite = info->playerinfo[i].mobj.sprite;
-		players[i].mo->frame = info->playerinfo[i].mobj.frame;
-
-		players[i].realtime = info->playerinfo[i].player.realtime;
-		for (j = 0; j < NUMKARTSTUFF; j++)
-			players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
-	}
-
-	for (i = splitscreen; i >= 0; i--)
-		P_ResetCamera(&players[displayplayers[i]], &camera[i]);
-}
-
-void G_ConfirmRewind(tic_t rewindtime)
-{
-	SINT8 i;
-	tic_t j;
-	boolean oldmenuactive = menuactive, oldsounddisabled = sound_disabled;
-
-	INT32 olddp1 = displayplayers[0], olddp2 = displayplayers[1], olddp3 = displayplayers[2], olddp4 = displayplayers[3];
-	UINT8 oldss = splitscreen;
-
-	menuactive = false; // Prevent loops
-
-	CV_StealthSetValue(&cv_renderview, 0);
-
-	if (rewindtime <= starttime)
-	{
-		demo.rewinding = false;
-		G_DoPlayDemo(NULL); // Restart the current demo
-	}
-	else
-	{
-		rewind_t *rewind;
-		sound_disabled = true; // Prevent sound spam
-		demo.rewinding = true;
-
-		rewind = CL_RewindToTime(rewindtime);
-
-		if (rewind)
-		{
-			demo_p = demobuffer + rewind->demopos;
-			memcpy(oldcmd, rewind->oldcmd, sizeof (oldcmd));
-			memcpy(oldghost, rewind->oldghost, sizeof (oldghost));
-			paused = false;
-		}
-		else
-		{
-			demo.rewinding = true;
-			G_DoPlayDemo(NULL); // Restart the current demo
-		}
-	}
-
-	for (j = 0; j < rewindtime && leveltime < rewindtime; j++)
-	{
-		G_Ticker((j % NEWTICRATERATIO) == 0);
-	}
-
-	demo.rewinding = false;
-	menuactive = oldmenuactive; // Bring the menu back up
-	sound_disabled = oldsounddisabled; // Re-enable SFX
-
-	wipegamestate = gamestate; // No fading back in!
-
-	COM_BufInsertText("renderview on\n");
-
-	if (demo.freecam)
-		return;	// don't touch from there
-
-	splitscreen = oldss;
-	displayplayers[0] = olddp1;
-	displayplayers[1] = olddp2;
-	displayplayers[2] = olddp3;
-	displayplayers[3] = olddp4;
-	R_ExecuteSetViewSize();
-	G_ResetViews();
-
-	for (i = splitscreen; i >= 0; i--)
-		P_ResetCamera(&players[displayplayers[i]], &camera[i]);
-}
-
-void G_ReadMetalTic(mobj_t *metal)
-{
-	UINT8 ziptic;
-	UINT16 speed;
-	UINT8 statetype;
-
-	if (!metal_p)
-		return;
-	ziptic = READUINT8(metal_p);
-
-	// Read changes from the tic
-	if (ziptic & GZT_XYZ)
-	{
-		oldmetal.x = READFIXED(metal_p);
-		oldmetal.y = READFIXED(metal_p);
-		oldmetal.z = READFIXED(metal_p);
-		P_MoveOrigin(metal, oldmetal.x, oldmetal.y, oldmetal.z);
-		oldmetal.x = metal->x;
-		oldmetal.y = metal->y;
-		oldmetal.z = metal->z;
-	}
-	else
-	{
-		if (ziptic & GZT_MOMXY)
-		{
-			oldmetal.momx = READINT16(metal_p)<<8;
-			oldmetal.momy = READINT16(metal_p)<<8;
-		}
-		if (ziptic & GZT_MOMZ)
-			oldmetal.momz = READINT16(metal_p)<<8;
-		oldmetal.x += oldmetal.momx;
-		oldmetal.y += oldmetal.momy;
-		oldmetal.z += oldmetal.momz;
-	}
-	if (ziptic & GZT_ANGLE)
-		oldmetal.angle = READUINT8(metal_p)<<24;
-	if (ziptic & GZT_SPRITE)
-		metal_p++; // Currently unused. (Metal Sonic figures out what he's doing his own damn self.)
-
-	// Set movement, position, and angle
-	// oldmetal contains where you're supposed to be.
-	metal->momx = oldmetal.momx;
-	metal->momy = oldmetal.momy;
-	metal->momz = oldmetal.momz;
-	P_UnsetThingPosition(metal);
-	metal->x = oldmetal.x;
-	metal->y = oldmetal.y;
-	metal->z = oldmetal.z;
-	P_SetThingPosition(metal);
-	metal->angle = oldmetal.angle;
-
-	if (ziptic & GZT_EXTRA)
-	{ // But wait, there's more!
-		ziptic = READUINT8(metal_p);
-		if (ziptic & EZT_FLIP)
-			metal->eflags ^= MFE_VERTICALFLIP;
-		if (ziptic & EZT_SCALE)
-		{
-			metal->destscale = READFIXED(metal_p);
-			if (metal->destscale != metal->scale)
-				P_SetScale(metal, metal->destscale);
-		}
-	}
-
-	// Calculates player's speed based on distance-of-a-line formula
-	speed = FixedDiv(P_AproxDistance(oldmetal.momx, oldmetal.momy), metal->scale)>>FRACBITS;
-
-	// Use speed to decide an appropriate state
-	if (speed > 20) // default skin runspeed
-		statetype = 2;
-	else if (speed > 1) // stopspeed
-		statetype = 1;
-	else
-		statetype = 0;
-
-	// Set state
-	if (statetype != metal->threshold)
-	{
-		switch (statetype)
-		{
-		case 2: // run
-			P_SetMobjState(metal,metal->info->meleestate);
-			break;
-		case 1: // walk
-			P_SetMobjState(metal,metal->info->seestate);
-			break;
-		default: // stand
-			P_SetMobjState(metal,metal->info->spawnstate);
-			break;
-		}
-		metal->threshold = statetype;
-	}
-
-	// TODO: Modify state durations based on movement speed, similar to players?
-
-	if (*metal_p == DEMOMARKER)
-	{
-		// end of demo data stream
-		G_StopMetalDemo();
-		return;
-	}
-}
-
-void G_WriteMetalTic(mobj_t *metal)
-{
-	UINT8 ziptic = 0;
-	UINT8 *ziptic_p;
-
-	if (!demo_p) // demo_p will be NULL until the race start linedef executor is triggered!
-		return;
-
-	ziptic_p = demo_p++; // the ziptic, written at the end of this function
-
-	#define MAXMOM (0xFFFF<<8)
-
-	// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
-	if (abs(metal->x-oldmetal.x) > MAXMOM
-	|| abs(metal->y-oldmetal.y) > MAXMOM
-	|| abs(metal->z-oldmetal.z) > MAXMOM)
-	{
-		oldmetal.x = metal->x;
-		oldmetal.y = metal->y;
-		oldmetal.z = metal->z;
-		WRITEFIXED(demo_p,oldmetal.x);
-		WRITEFIXED(demo_p,oldmetal.y);
-		WRITEFIXED(demo_p,oldmetal.z);
-		ziptic |= GZT_XYZ;
-	}
-	else
-	{
-		// For moving normally:
-		// Store one full byte of movement, plus one byte of fractional movement.
-		INT16 momx = (INT16)((metal->x-oldmetal.x)>>8);
-		INT16 momy = (INT16)((metal->y-oldmetal.y)>>8);
-		if (momx != oldmetal.momx
-		|| momy != oldmetal.momy)
-		{
-			oldmetal.momx = momx;
-			oldmetal.momy = momy;
-			WRITEINT16(demo_p,momx);
-			WRITEINT16(demo_p,momy);
-			ziptic |= GZT_MOMXY;
-		}
-		momx = (INT16)((metal->z-oldmetal.z)>>8);
-		if (momx != oldmetal.momz)
-		{
-			oldmetal.momz = momx;
-			WRITEINT16(demo_p,momx);
-			ziptic |= GZT_MOMZ;
-		}
-
-		// This SHOULD set oldmetal.x/y/z to match metal->x/y/z
-		// but it keeps the fractional loss of one byte,
-		// so it will hopefully be made up for in future tics.
-		oldmetal.x += oldmetal.momx<<8;
-		oldmetal.y += oldmetal.momy<<8;
-		oldmetal.z += oldmetal.momz<<8;
-	}
-
-	#undef MAXMOM
-
-	// Only store the 8 most relevant bits of angle
-	// because exact values aren't too easy to discern to begin with when only 8 angles have different sprites
-	// and it does not affect movement at all anyway.
-	if (metal->angle>>24 != oldmetal.angle)
-	{
-		oldmetal.angle = metal->angle>>24;
-		WRITEUINT8(demo_p,oldmetal.angle);
-		ziptic |= GZT_ANGLE;
-	}
-
-	// Metal Sonic does not need our state changes.
-	// ... currently.
-
-	{
-		UINT8 *exttic_p = NULL;
-		UINT8 exttic = 0;
-		if ((metal->eflags & MFE_VERTICALFLIP) != (oldmetal.eflags & MFE_VERTICALFLIP))
-		{
-			if (!exttic_p)
-				exttic_p = demo_p++;
-			exttic |= EZT_FLIP;
-			oldmetal.eflags ^= MFE_VERTICALFLIP;
-		}
-		if (metal->scale != oldmetal.scale)
-		{
-			if (!exttic_p)
-				exttic_p = demo_p++;
-			exttic |= EZT_SCALE;
-			WRITEFIXED(demo_p,metal->scale);
-			oldmetal.scale = metal->scale;
-		}
-		if (exttic_p)
-		{
-			*exttic_p = exttic;
-			ziptic |= GZT_EXTRA;
-		}
-	}
-
-	*ziptic_p = ziptic;
-
-	// attention here for the ticcmd size!
-	// latest demos with mouse aiming byte in ticcmd
-	if (demo_p >= demoend - 32)
-	{
-		G_StopMetalRecording(); // no more space
-		return;
-	}
-}
-
-//
-// G_RecordDemo
-//
-void G_RecordDemo(const char *name)
-{
-	INT32 maxsize;
-
-	demo_p = NULL;
-	demo.recording = false;
-	if (demobuffer)
-		free(demobuffer);
-	demobuffer = NULL;
-	demoend = NULL;
-
-	if (cv_recordmultiplayerdemos.value)
-	{
-		CONS_Printf("Recording demo %s.lmp\n", name);
-
-		strcpy(demoname, name);
-		strcat(demoname, ".lmp");
-
-		maxsize = cv_maxdemosize.value*1024*1024;
-
-		demobuffer = malloc(maxsize);
-		demoend = demobuffer + maxsize;
-
-		if (demobuffer)
-			demo.recording = true;
-		else
-			CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n");
-	}
-}
-
-void G_RecordMetal(void)
-{
-	INT32 maxsize;
-	maxsize = cv_maxdemosize.value*1024*1024;
-	if (demobuffer)
-		free(demobuffer);
-	demo_p = NULL;
-	metalrecording = false;
-	demobuffer = malloc(maxsize);
-	demoend = demobuffer + maxsize;
-
-	if (demobuffer)
-		metalrecording = true;
-	else
-		CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n");
-}
-
-void G_BeginRecording(void)
-{
-	UINT8 i, p;
-	char name[17];
-	player_t *player = &players[consoleplayer];
-
-	char *filename;
-	UINT8 totalfiles;
-	UINT8 *m;
-
-	if (demo_p)
-		return;
-	memset(name,0,sizeof(name));
-
-	demo_p = demobuffer;
-	demoflags = DF_GHOST|(multiplayer ? DF_MULTIPLAYER : (modeattacking<<DF_ATTACKSHIFT));
-
-	if (encoremode)
-		demoflags |= DF_ENCORE;
-
-	if (!modeattacking && gL)	// Ghosts don't read luavars, and you shouldn't ever need to save Lua in replays, you doof!
-						// SERIOUSLY THOUGH WHY WOULD YOU LOAD HOSTMOD AND RECORD A GHOST WITH IT !????
-		demoflags |= DF_LUAVARS;
-
-	// Setup header.
-	M_Memcpy(demo_p, DEMOHEADER, 12); demo_p += 12;
-	WRITEUINT8(demo_p,VERSION);
-	WRITEUINT8(demo_p,SUBVERSION);
-	WRITEUINT16(demo_p,DEMOVERSION);
-
-	// Full replay title
-	demo_p += 64;
-	{
-		char *title = G_BuildMapTitle(gamemap);
-		snprintf(demo.titlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername);
-		Z_Free(title);
-	}
-
-	// demo checksum
-	demo_p += 16;
-
-	// game data
-	M_Memcpy(demo_p, "PLAY", 4); demo_p += 4;
-	WRITEINT16(demo_p,gamemap);
-	M_Memcpy(demo_p, mapmd5, 16); demo_p += 16;
-
-	WRITEUINT8(demo_p, demoflags);
-	WRITEUINT8(demo_p, gametype & 0xFF);
-
-	// file list
-	m = demo_p;/* file count */
-	demo_p += 1;
-
-	totalfiles = 0;
-	for (i = mainwads; ++i < numwadfiles; )
-		if (wadfiles[i]->important)
-	{
-		nameonly(( filename = va("%s", wadfiles[i]->filename) ));
-		WRITESTRINGL(demo_p, filename, MAX_WADPATH);
-		WRITEMEM(demo_p, wadfiles[i]->md5sum, 16);
-
-		totalfiles++;
-	}
-
-	WRITEUINT8(m, totalfiles);
-
-	switch ((demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
-	{
-	case ATTACKING_NONE: // 0
-		break;
-	case ATTACKING_RECORD: // 1
-		demotime_p = demo_p;
-		WRITEUINT32(demo_p,UINT32_MAX); // time
-		WRITEUINT32(demo_p,UINT32_MAX); // lap
-		break;
-	default: // 3
-		break;
-	}
-
-	WRITEUINT32(demo_p,P_GetInitSeed());
-
-	// Reserved for extrainfo location from start of file
-	demoinfo_p = demo_p;
-	WRITEUINT32(demo_p, 0);
-
-	// Save netvars
-	CV_SaveNetVars(&demo_p, true);
-
-	// Now store some info for each in-game player
-	for (p = 0; p < MAXPLAYERS; p++) {
-		if (playeringame[p]) {
-			player = &players[p];
-
-			WRITEUINT8(demo_p, p | (player->spectator ? DEMO_SPECTATOR : 0));
-
-			// Name
-			memset(name, 0, 16);
-			memcpy(name, player_names[p], 15);
-			M_Memcpy(demo_p,name,16);
-			demo_p += 16;
-
-			// Skin
-			memset(name, 0, 16);
-			strncpy(name, skins[player->skin].name, 16);
-			M_Memcpy(demo_p,name,16);
-			demo_p += 16;
-
-			// Color
-			memset(name, 0, 16);
-			strncpy(name, KartColor_Names[player->skincolor], 16);
-			M_Memcpy(demo_p,name,16);
-			demo_p += 16;
-
-			// Score, since Kart uses this to determine where you start on the map
-			WRITEUINT32(demo_p, player->score);
-
-			// Kart speed and weight
-			WRITEUINT8(demo_p, skins[player->skin].kartspeed);
-			WRITEUINT8(demo_p, skins[player->skin].kartweight);
-
-		}
-	}
-
-	WRITEUINT8(demo_p, 0xFF); // Denote the end of the player listing
-
-	// player lua vars, always saved even if empty... Unless it's record attack.
-	if (demoflags & DF_LUAVARS)
-		LUA_ArchiveDemo();
-
-	memset(&oldcmd,0,sizeof(oldcmd));
-	memset(&oldghost,0,sizeof(oldghost));
-	memset(&ghostext,0,sizeof(ghostext));
-
-	for (i = 0; i < MAXPLAYERS; i++)
-	{
-		ghostext[i].lastcolor = ghostext[i].color = GHC_NORMAL;
-		ghostext[i].lastscale = ghostext[i].scale = FRACUNIT;
-
-		if (players[i].mo)
-		{
-			oldghost[i].x = players[i].mo->x;
-			oldghost[i].y = players[i].mo->y;
-			oldghost[i].z = players[i].mo->z;
-			oldghost[i].angle = players[i].mo->angle;
-
-			// preticker started us gravity flipped
-			if (players[i].mo->eflags & MFE_VERTICALFLIP)
-				ghostext[i].flags |= EZT_FLIP;
-		}
-	}
-}
-
-void G_BeginMetal(void)
-{
-	mobj_t *mo = players[consoleplayer].mo;
-
-	if (demo_p)
-		return;
-
-	demo_p = demobuffer;
-
-	// Write header.
-	M_Memcpy(demo_p, DEMOHEADER, 12); demo_p += 12;
-	WRITEUINT8(demo_p,VERSION);
-	WRITEUINT8(demo_p,SUBVERSION);
-	WRITEUINT16(demo_p,DEMOVERSION);
-
-	// demo checksum
-	demo_p += 16;
-
-	M_Memcpy(demo_p, "METL", 4); demo_p += 4;
-
-	// Set up our memory.
-	memset(&oldmetal,0,sizeof(oldmetal));
-	oldmetal.x = mo->x;
-	oldmetal.y = mo->y;
-	oldmetal.z = mo->z;
-	oldmetal.angle = mo->angle;
-}
-
-void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT32 val)
-{
-	char temp[17];
-
-	if (demoinfo_p && *(UINT32 *)demoinfo_p == 0)
-	{
-		WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
-		*(UINT32 *)demoinfo_p = demo_p - demobuffer;
-	}
-
-	WRITEUINT8(demo_p, DW_STANDING);
-	WRITEUINT8(demo_p, ranking);
-
-	// Name
-	memset(temp, 0, 16);
-	strncpy(temp, name, 16);
-	M_Memcpy(demo_p,temp,16);
-	demo_p += 16;
-
-	// Skin
-	memset(temp, 0, 16);
-	strncpy(temp, skins[skinnum].name, 16);
-	M_Memcpy(demo_p,temp,16);
-	demo_p += 16;
-
-	// Color
-	memset(temp, 0, 16);
-	strncpy(temp, KartColor_Names[color], 16);
-	M_Memcpy(demo_p,temp,16);
-	demo_p += 16;
-
-	// Score/time/whatever
-	WRITEUINT32(demo_p, val);
-}
-
-void G_SetDemoTime(UINT32 ptime, UINT32 plap)
-{
-	if (!demo.recording || !demotime_p)
-		return;
-	if (demoflags & DF_RECORDATTACK)
-	{
-		WRITEUINT32(demotime_p, ptime);
-		WRITEUINT32(demotime_p, plap);
-		demotime_p = NULL;
-	}
-}
-
-static void G_LoadDemoExtraFiles(UINT8 **pp)
-{
-	UINT8 totalfiles;
-	char filename[MAX_WADPATH];
-	UINT8 md5sum[16];
-	filestatus_t ncs = FS_NOTFOUND;
-	boolean toomany = false;
-	boolean alreadyloaded;
-	UINT8 i, j;
-
-	totalfiles = READUINT8((*pp));
-	for (i = 0; i < totalfiles; ++i)
-	{
-		if (toomany)
-			SKIPSTRING((*pp));
-		else
-		{
-			strlcpy(filename, (char *)(*pp), sizeof filename);
-			SKIPSTRING((*pp));
-		}
-		READMEM((*pp), md5sum, 16);
-
-		if (!toomany)
-		{
-			alreadyloaded = false;
-
-			for (j = 0; j < numwadfiles; ++j)
-			{
-				if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
-				{
-					alreadyloaded = true;
-					break;
-				}
-			}
-
-			if (alreadyloaded)
-				continue;
-
-			if (numwadfiles >= MAX_WADFILES)
-				toomany = true;
-			else
-				ncs = findfile(filename, md5sum, false);
-
-			if (toomany)
-			{
-				CONS_Alert(CONS_WARNING, M_GetText("Too many files loaded to add anymore for demo playback\n"));
-				if (!CON_Ready())
-					M_StartMessage(M_GetText("There are too many files loaded to add this demo's addons.\n\nDemo playback may desync.\n\nPress ESC\n"), NULL, MM_NOTHING);
-			}
-			else if (ncs != FS_FOUND)
-			{
-				if (ncs == FS_NOTFOUND)
-					CONS_Alert(CONS_NOTICE, M_GetText("You do not have a copy of %s\n"), filename);
-				else if (ncs == FS_MD5SUMBAD)
-					CONS_Alert(CONS_NOTICE, M_GetText("Checksum mismatch on %s\n"), filename);
-				else
-					CONS_Alert(CONS_NOTICE, M_GetText("Unknown error finding file %s\n"), filename);
-
-				if (!CON_Ready())
-					M_StartMessage(M_GetText("There were errors trying to add this demo's addons. Check the console for more information.\n\nDemo playback may desync.\n\nPress ESC\n"), NULL, MM_NOTHING);
-			}
-			else
-			{
-				P_PartialAddWadFile(filename, false);
-			}
-		}
-	}
-
-	if (P_PartialAddGetStage() >= 0)
-		P_MultiSetupWadFiles(true); // in case any partial adds were done
-}
-
-static void G_SkipDemoExtraFiles(UINT8 **pp)
-{
-	UINT8 totalfiles;
-	UINT8 i;
-
-	totalfiles = READUINT8((*pp));
-	for (i = 0; i < totalfiles; ++i)
-	{
-		SKIPSTRING((*pp));// file name
-		(*pp) += 16;// md5
-	}
-}
-
-// G_CheckDemoExtraFiles: checks if our loaded WAD list matches the demo's.
-// Enabling quick prevents filesystem checks to see if needed files are available to load.
-static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick)
-{
-	UINT8 totalfiles, filesloaded, nmusfilecount;
-	char filename[MAX_WADPATH];
-	UINT8 md5sum[16];
-	boolean toomany = false;
-	boolean alreadyloaded;
-	UINT8 i, j;
-	UINT8 error = 0;
-
-	totalfiles = READUINT8((*pp));
-	filesloaded = 0;
-	for (i = 0; i < totalfiles; ++i)
-	{
-		if (toomany)
-			SKIPSTRING((*pp));
-		else
-		{
-			strlcpy(filename, (char *)(*pp), sizeof filename);
-			SKIPSTRING((*pp));
-		}
-		READMEM((*pp), md5sum, 16);
-
-		if (!toomany)
-		{
-			alreadyloaded = false;
-			nmusfilecount = 0;
-
-			for (j = 0; j < numwadfiles; ++j)
-			{
-				if (wadfiles[j]->important && j > mainwads)
-					nmusfilecount++;
-				else
-					continue;
-
-				if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
-				{
-					alreadyloaded = true;
-
-					if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER)
-						error |= DFILE_ERROR_OUTOFORDER;
-
-					break;
-				}
-			}
-
-			if (alreadyloaded)
-			{
-				filesloaded++;
-				continue;
-			}
-
-			if (numwadfiles >= MAX_WADFILES)
-				error = DFILE_ERROR_CANNOTLOAD;
-			else if (!quick && findfile(filename, md5sum, false) != FS_FOUND)
-				error = DFILE_ERROR_CANNOTLOAD;
-			else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER)
-				error |= DFILE_ERROR_NOTLOADED;
-		} else
-			error = DFILE_ERROR_CANNOTLOAD;
-	}
-
-	// Get final file count
-	nmusfilecount = 0;
-
-	for (j = 0; j < numwadfiles; ++j)
-		if (wadfiles[j]->important && j > mainwads)
-			nmusfilecount++;
-
-	if (!error && filesloaded < nmusfilecount)
-		error = DFILE_ERROR_EXTRAFILES;
-
-	return error;
-}
-
-// Returns bitfield:
-// 1 == new demo has lower time
-// 2 == new demo has higher score
-// 4 == new demo has higher rings
-UINT8 G_CmpDemoTime(char *oldname, char *newname)
-{
-	UINT8 *buffer,*p;
-	UINT8 flags;
-	UINT32 oldtime, newtime, oldlap, newlap;
-	UINT16 oldversion;
-	size_t bufsize ATTRUNUSED;
-	UINT8 c;
-	UINT16 s ATTRUNUSED;
-	UINT8 aflags = 0;
-
-	// load the new file
-	FIL_DefaultExtension(newname, ".lmp");
-	bufsize = FIL_ReadFile(newname, &buffer);
-	I_Assert(bufsize != 0);
-	p = buffer;
-
-	// read demo header
-	I_Assert(!memcmp(p, DEMOHEADER, 12));
-	p += 12; // DEMOHEADER
-	c = READUINT8(p); // VERSION
-	I_Assert(c == VERSION);
-	c = READUINT8(p); // SUBVERSION
-	I_Assert(c == SUBVERSION);
-	s = READUINT16(p);
-	I_Assert(s == DEMOVERSION);
-	p += 64; // full demo title
-	p += 16; // demo checksum
-	I_Assert(!memcmp(p, "PLAY", 4));
-	p += 4; // PLAY
-	p += 2; // gamemap
-	p += 16; // map md5
-	flags = READUINT8(p); // demoflags
-	p++; // gametype
-	G_SkipDemoExtraFiles(&p);
-
-	aflags = flags & (DF_RECORDATTACK|DF_NIGHTSATTACK);
-	I_Assert(aflags);
-	if (flags & DF_RECORDATTACK)
-	{
-		newtime = READUINT32(p);
-		newlap = READUINT32(p);
-	}
-	else // appease compiler
-		return 0;
-
-	Z_Free(buffer);
-
-	// load old file
-	FIL_DefaultExtension(oldname, ".lmp");
-	if (!FIL_ReadFile(oldname, &buffer))
-	{
-		CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), oldname);
-		return UINT8_MAX;
-	}
-	p = buffer;
-
-	// read demo header
-	if (memcmp(p, DEMOHEADER, 12))
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
-		Z_Free(buffer);
-		return UINT8_MAX;
-	} p += 12; // DEMOHEADER
-	p++; // VERSION
-	p++; // SUBVERSION
-	oldversion = READUINT16(p);
-	switch(oldversion) // demoversion
-	{
-	case DEMOVERSION: // latest always supported
-		p += 64; // full demo title
-		break;
-#ifdef DEMO_COMPAT_100
-	case 0x0001:
-		// Old replays gotta go :]
-		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' outdated version. It will be overwritten. Nyeheheh.\n"), oldname);
-		Z_Free(buffer);
-		return UINT8_MAX;
-#endif
-	// too old, cannot support.
-	default:
-		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
-		Z_Free(buffer);
-		return UINT8_MAX;
-	}
-	p += 16; // demo checksum
-	if (memcmp(p, "PLAY", 4))
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' invalid format. It will be overwritten.\n"), oldname);
-		Z_Free(buffer);
-		return UINT8_MAX;
-	} p += 4; // "PLAY"
-	p += 2; // gamemap
-	p += 16; // mapmd5
-	flags = READUINT8(p);
-	p++; // gametype
-	G_SkipDemoExtraFiles(&p);
-	if (!(flags & aflags))
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("File '%s' not from same game mode. It will be overwritten.\n"), oldname);
-		Z_Free(buffer);
-		return UINT8_MAX;
-	}
-	if (flags & DF_RECORDATTACK)
-	{
-		oldtime = READUINT32(p);
-		oldlap = READUINT32(p);
-	}
-	else // appease compiler
-		return UINT8_MAX;
-
-	Z_Free(buffer);
-
-	c = 0;
-	if (newtime < oldtime
-	|| (newtime == oldtime && (newlap < oldlap)))
-		c |= 1; // Better time
-	if (newlap < oldlap
-	|| (newlap == oldlap && newtime < oldtime))
-		c |= 1<<1; // Better lap time
-	return c;
-}
-
-void G_LoadDemoInfo(menudemo_t *pdemo)
-{
-	UINT8 *infobuffer, *info_p, *extrainfo_p;
-	UINT8 version, subversion, pdemoflags;
-	UINT16 pdemoversion, count;
-
-	if (!FIL_ReadFile(pdemo->filepath, &infobuffer))
-	{
-		CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath);
-		pdemo->type = MD_INVALID;
-		sprintf(pdemo->title, "INVALID REPLAY");
-
-		return;
-	}
-
-	info_p = infobuffer;
-
-	if (memcmp(info_p, DEMOHEADER, 12))
-	{
-		CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
-		pdemo->type = MD_INVALID;
-		sprintf(pdemo->title, "INVALID REPLAY");
-		Z_Free(infobuffer);
-		return;
-	}
-
-	pdemo->type = MD_LOADED;
-
-	info_p += 12; // DEMOHEADER
-
-	version = READUINT8(info_p);
-	subversion = READUINT8(info_p);
-	pdemoversion = READUINT16(info_p);
-
-	switch(pdemoversion)
-	{
-	case DEMOVERSION: // latest always supported
-		// demo title
-		M_Memcpy(pdemo->title, info_p, 64);
-		info_p += 64;
-
-		break;
-#ifdef DEMO_COMPAT_100
-	case 0x0001:
-		pdemo->type = MD_OUTDATED;
-		sprintf(pdemo->title, "Legacy Replay");
-		break;
-#endif
-	// too old, cannot support.
-	default:
-		CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath);
-		pdemo->type = MD_INVALID;
-		sprintf(pdemo->title, "INVALID REPLAY");
-		Z_Free(infobuffer);
-		return;
-	}
-
-	if (version != VERSION || subversion != SUBVERSION)
-		pdemo->type = MD_OUTDATED;
-
-	info_p += 16; // demo checksum
-	if (memcmp(info_p, "PLAY", 4))
-	{
-		CONS_Alert(CONS_ERROR, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemo->filepath);
-		pdemo->type = MD_INVALID;
-		sprintf(pdemo->title, "INVALID REPLAY");
-		Z_Free(infobuffer);
-		return;
-	}
-	info_p += 4; // "PLAY"
-	pdemo->map = READINT16(info_p);
-	info_p += 16; // mapmd5
-
-	pdemoflags = READUINT8(info_p);
-
-	// temp?
-	if (!(pdemoflags & DF_MULTIPLAYER))
-	{
-		CONS_Alert(CONS_ERROR, M_GetText("%s is not a multiplayer replay and can't be listed on this menu fully yet.\n"), pdemo->filepath);
-		Z_Free(infobuffer);
-		return;
-	}
-#ifdef DEMO_COMPAT_100
-	else if (pdemoversion == 0x0001)
-	{
-		CONS_Alert(CONS_ERROR, M_GetText("%s is a legacy multiplayer replay and cannot be played.\n"), pdemo->filepath);
-		pdemo->type = MD_INVALID;
-		sprintf(pdemo->title, "INVALID REPLAY");
-		Z_Free(infobuffer);
-		return;
-	}
-#endif
-
-	pdemo->gametype = READUINT8(info_p);
-
-	pdemo->addonstatus = G_CheckDemoExtraFiles(&info_p, true);
-	info_p += 4; // RNG seed
-
-	extrainfo_p = infobuffer + READUINT32(info_p);
-
-	// Pared down version of CV_LoadNetVars to find the kart speed
-	pdemo->kartspeed = 1; // Default to normal speed
-	count = READUINT16(info_p);
-	while (count--)
-	{
-		UINT16 netid;
-		char *svalue;
-
-		netid = READUINT16(info_p);
-		svalue = (char *)info_p;
-		SKIPSTRING(info_p);
-		info_p++; // stealth
-
-		if (netid == cv_kartspeed.netid)
-		{
-			UINT8 j;
-			for (j = 0; kartspeed_cons_t[j].strvalue; j++)
-				if (!stricmp(kartspeed_cons_t[j].strvalue, svalue))
-					pdemo->kartspeed = kartspeed_cons_t[j].value;
-		}
-		else if (netid == cv_basenumlaps.netid && pdemo->gametype == GT_RACE)
-			pdemo->numlaps = atoi(svalue);
-	}
-
-	if (pdemoflags & DF_ENCORE)
-		pdemo->kartspeed |= DF_ENCORE;
-
-	// Read standings!
-	count = 0;
-
-	while (READUINT8(extrainfo_p) == DW_STANDING) // Assume standings are always first in the extrainfo
-	{
-		INT32 i;
-		char temp[16];
-
-		pdemo->standings[count].ranking = READUINT8(extrainfo_p);
-
-		// Name
-		M_Memcpy(pdemo->standings[count].name, extrainfo_p, 16);
-		extrainfo_p += 16;
-
-		// Skin
-		M_Memcpy(temp,extrainfo_p,16);
-		extrainfo_p += 16;
-		pdemo->standings[count].skin = UINT8_MAX;
-		for (i = 0; i < numskins; i++)
-			if (stricmp(skins[i].name, temp) == 0)
-			{
-				pdemo->standings[count].skin = i;
-				break;
-			}
-
-		// Color
-		M_Memcpy(temp,extrainfo_p,16);
-		extrainfo_p += 16;
-		for (i = 0; i < MAXSKINCOLORS; i++)
-			if (!stricmp(KartColor_Names[i],temp))				// SRB2kart
-			{
-				pdemo->standings[count].color = i;
-				break;
-			}
-
-		// Score/time/whatever
-		pdemo->standings[count].timeorscore = READUINT32(extrainfo_p);
-
-		count++;
-
-		if (count >= MAXPLAYERS)
-			break; //@TODO still cycle through the rest of these if extra demo data is ever used
-	}
-
-	// I think that's everything we need?
-	Z_Free(infobuffer);
-}
-
-//
-// G_PlayDemo
-//
-void G_DeferedPlayDemo(const char *name)
-{
-	COM_BufAddText("playdemo \"");
-	COM_BufAddText(name);
-	COM_BufAddText("\" -addfiles\n");
-}
-
-//
-// Start a demo from a .LMP file or from a wad resource
-//
-#define SKIPERRORS
-void G_DoPlayDemo(char *defdemoname)
-{
-	UINT8 i, p;
-	lumpnum_t l;
-	char skin[17],color[17],*n,*pdemoname;
-	UINT8 version,subversion;
-	UINT32 randseed;
-	char msg[1024];
-#if defined(SKIPERRORS) && !defined(DEVELOP)
-	boolean skiperrors = false;
-#endif
-	boolean spectator;
-	UINT8 slots[MAXPLAYERS], kartspeed[MAXPLAYERS], kartweight[MAXPLAYERS], numslots = 0;
-
-	G_InitDemoRewind();
-
-	skin[16] = '\0';
-	color[16] = '\0';
-
-	// No demo name means we're restarting the current demo
-	if (defdemoname == NULL)
-	{
-		demo_p = demobuffer;
-		pdemoname = ZZ_Alloc(1); // Easier than adding checks for this everywhere it's freed
-	}
-	else
-	{
-		n = defdemoname+strlen(defdemoname);
-		while (*n != '/' && *n != '\\' && n != defdemoname)
-			n--;
-		if (n != defdemoname)
-			n++;
-		pdemoname = ZZ_Alloc(strlen(n)+1);
-		strcpy(pdemoname,n);
-
-		M_SetPlaybackMenuPointer();
-
-		// Internal if no extension, external if one exists
-		if (FIL_CheckExtension(defdemoname))
-		{
-			//FIL_DefaultExtension(defdemoname, ".lmp");
-			if (!FIL_ReadFile(defdemoname, &demobuffer))
-			{
-				snprintf(msg, 1024, M_GetText("Failed to read file '%s'.\n"), defdemoname);
-				CONS_Alert(CONS_ERROR, "%s", msg);
-				gameaction = ga_nothing;
-				M_StartMessage(msg, NULL, MM_NOTHING);
-				return;
-			}
-			demo_p = demobuffer;
-		}
-		// load demo resource from WAD
-		else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
-		{
-			snprintf(msg, 1024, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
-			CONS_Alert(CONS_ERROR, "%s", msg);
-			gameaction = ga_nothing;
-			M_StartMessage(msg, NULL, MM_NOTHING);
-			return;
-		}
-		else // it's an internal demo
-		{
-			demobuffer = demo_p = W_CacheLumpNum(l, PU_STATIC);
-#if defined(SKIPERRORS) && !defined(DEVELOP)
-			skiperrors = true; // SRB2Kart: Don't print warnings for staff ghosts, since they'll inevitably happen when we make bugfixes/changes...
-#endif
-		}
-	}
-
-	// read demo header
-	gameaction = ga_nothing;
-	demo.playback = true;
-	if (memcmp(demo_p, DEMOHEADER, 12))
-	{
-		snprintf(msg, 1024, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname);
-		CONS_Alert(CONS_ERROR, "%s", msg);
-		M_StartMessage(msg, NULL, MM_NOTHING);
-		Z_Free(pdemoname);
-		Z_Free(demobuffer);
-		demobuffer = NULL;
-		demo.playback = false;
-		demo.title = false;
-		return;
-	}
-	demo_p += 12; // DEMOHEADER
-
-	version = READUINT8(demo_p);
-	subversion = READUINT8(demo_p);
-	demo.version = READUINT16(demo_p);
-	switch(demo.version)
-	{
-	case DEMOVERSION: // latest always supported
-		// demo title
-		M_Memcpy(demo.titlename, demo_p, 64);
-		demo_p += 64;
-
-		break;
-#ifdef DEMO_COMPAT_100
-	case 0x0001:
-		break;
-#endif
-	// too old, cannot support.
-	default:
-		snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
-		CONS_Alert(CONS_ERROR, "%s", msg);
-		M_StartMessage(msg, NULL, MM_NOTHING);
-		Z_Free(pdemoname);
-		Z_Free(demobuffer);
-		demobuffer = NULL;
-		demo.playback = false;
-		demo.title = false;
-		return;
-	}
-	demo_p += 16; // demo checksum
-	if (memcmp(demo_p, "PLAY", 4))
-	{
-		snprintf(msg, 1024, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
-		CONS_Alert(CONS_ERROR, "%s", msg);
-		M_StartMessage(msg, NULL, MM_NOTHING);
-		Z_Free(pdemoname);
-		Z_Free(demobuffer);
-		demobuffer = NULL;
-		demo.playback = false;
-		demo.title = false;
-		return;
-	}
-	demo_p += 4; // "PLAY"
-	gamemap = READINT16(demo_p);
-	demo_p += 16; // mapmd5
-
-	demoflags = READUINT8(demo_p);
-#ifdef DEMO_COMPAT_100
-	if (demo.version == 0x0001)
-	{
-		if (demoflags & DF_MULTIPLAYER)
-		{
-			snprintf(msg, 1024, M_GetText("%s is an alpha multiplayer replay and cannot be played.\n"), pdemoname);
-			CONS_Alert(CONS_ERROR, "%s", msg);
-			M_StartMessage(msg, NULL, MM_NOTHING);
-			Z_Free(pdemoname);
-			Z_Free(demobuffer);
-			demobuffer = NULL;
-			demo.playback = false;
-			demo.title = false;
-			return;
-		}
-	}
-	else
-	{
-#endif
-	gametype = READUINT8(demo_p);
-
-	if (demo.title) // Titledemos should always play and ought to always be compatible with whatever wadlist is running.
-		G_SkipDemoExtraFiles(&demo_p);
-	else if (demo.loadfiles)
-		G_LoadDemoExtraFiles(&demo_p);
-	else if (demo.ignorefiles)
-		G_SkipDemoExtraFiles(&demo_p);
-	else
-	{
-		UINT8 error = G_CheckDemoExtraFiles(&demo_p, false);
-
-		if (error)
-		{
-			switch (error)
-			{
-			case DFILE_ERROR_NOTLOADED:
-				snprintf(msg, 1024,
-					M_GetText("Required files for this demo are not loaded.\n\nUse\n\"playdemo %s -addfiles\"\nto load them and play the demo.\n"),
-				pdemoname);
-				break;
-
-			case DFILE_ERROR_OUTOFORDER:
-				snprintf(msg, 1024,
-					M_GetText("Required files for this demo are loaded out of order.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n"),
-				pdemoname);
-				break;
-
-			case DFILE_ERROR_INCOMPLETEOUTOFORDER:
-				snprintf(msg, 1024,
-					M_GetText("Required files for this demo are not loaded, and some are out of order.\n\nUse\n\"playdemo %s -addfiles\"\nto load needed files and play the demo.\n"),
-				pdemoname);
-				break;
-
-			case DFILE_ERROR_CANNOTLOAD:
-				snprintf(msg, 1024,
-					M_GetText("Required files for this demo cannot be loaded.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n"),
-				pdemoname);
-				break;
-
-			case DFILE_ERROR_EXTRAFILES:
-				snprintf(msg, 1024,
-					M_GetText("You have additional files loaded beyond the demo's file list.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n"),
-				pdemoname);
-				break;
-			}
-
-			CONS_Alert(CONS_ERROR, "%s", msg);
-			if (!CON_Ready()) // In the console they'll just see the notice there! No point pulling them out.
-				M_StartMessage(msg, NULL, MM_NOTHING);
-			Z_Free(pdemoname);
-			Z_Free(demobuffer);
-			demobuffer = NULL;
-			demo.playback = false;
-			demo.title = false;
-			return;
-		}
-	}
-#ifdef DEMO_COMPAT_100
-	}
-#endif
-
-	modeattacking = (demoflags & DF_ATTACKMASK)>>DF_ATTACKSHIFT;
-	multiplayer = !!(demoflags & DF_MULTIPLAYER);
-	CON_ToggleOff();
-
-	hu_demotime = UINT32_MAX;
-	hu_demolap = UINT32_MAX;
-
-	switch (modeattacking)
-	{
-	case ATTACKING_NONE: // 0
-		break;
-	case ATTACKING_RECORD: // 1
-		hu_demotime  = READUINT32(demo_p);
-		hu_demolap  = READUINT32(demo_p);
-		break;
-	default: // 3
-		modeattacking = ATTACKING_NONE;
-		break;
-	}
-
-	// Random seed
-	randseed = READUINT32(demo_p);
-#ifdef DEMO_COMPAT_100
-	if (demo.version != 0x0001)
-#endif
-	demo_p += 4; // Extrainfo location
-
-#ifdef DEMO_COMPAT_100
-	if (demo.version == 0x0001)
-	{
-		// Player name
-		M_Memcpy(player_names[0],demo_p,16);
-		demo_p += 16;
-
-		// Skin
-		M_Memcpy(skin,demo_p,16);
-		demo_p += 16;
-
-		// Color
-		M_Memcpy(color,demo_p,16);
-		demo_p += 16;
-
-		demo_p += 5; // Backwards compat - some stats
-		// SRB2kart
-		kartspeed[0] = READUINT8(demo_p);
-		kartweight[0] = READUINT8(demo_p);
-		//
-		demo_p += 9; // Backwards compat - more stats
-
-		// Skin not loaded?
-		if (!SetPlayerSkin(0, skin))
-		{
-			snprintf(msg, 1024, M_GetText("%s features a character that is not currently loaded.\n"), pdemoname);
-			CONS_Alert(CONS_ERROR, "%s", msg);
-			M_StartMessage(msg, NULL, MM_NOTHING);
-			Z_Free(pdemoname);
-			Z_Free(demobuffer);
-			demobuffer = NULL;
-			demo.playback = false;
-			demo.title = false;
-			return;
-		}
-
-		// ...*map* not loaded?
-		if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK))
-		{
-			snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
-			CONS_Alert(CONS_ERROR, "%s", msg);
-			M_StartMessage(msg, NULL, MM_NOTHING);
-			Z_Free(pdemoname);
-			Z_Free(demobuffer);
-			demobuffer = NULL;
-			demo.playback = false;
-			demo.title = false;
-			return;
-		}
-
-		// Set color
-		for (i = 0; i < MAXSKINCOLORS; i++)
-			if (!stricmp(KartColor_Names[i],color))				// SRB2kart
-			{
-				players[0].skincolor = i;
-				break;
-			}
-
-		// net var data
-		CV_LoadNetVars(&demo_p);
-
-		// Sigh ... it's an empty demo.
-		if (*demo_p == DEMOMARKER)
-		{
-			snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
-			CONS_Alert(CONS_ERROR, "%s", msg);
-			M_StartMessage(msg, NULL, MM_NOTHING);
-			Z_Free(pdemoname);
-			Z_Free(demobuffer);
-			demobuffer = NULL;
-			demo.playback = false;
-			demo.title = false;
-			return;
-		}
-
-		Z_Free(pdemoname);
-
-		memset(&oldcmd,0,sizeof(oldcmd));
-		memset(&oldghost,0,sizeof(oldghost));
-		memset(&ghostext,0,sizeof(ghostext));
-
-		CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
-
-		// console warning messages
-#if defined(SKIPERRORS) && !defined(DEVELOP)
-		demosynced = (!skiperrors);
-#else
-		demosynced = true;
-#endif
-
-		// didn't start recording right away.
-		demo.deferstart = false;
-
-		consoleplayer = 0;
-		memset(displayplayers, 0, sizeof(displayplayers));
-		memset(playeringame, 0, sizeof(playeringame));
-		playeringame[0] = true;
-
-		goto post_compat;
-	}
-#endif
-
-	// net var data
-	CV_LoadNetVars(&demo_p);
-
-	// Sigh ... it's an empty demo.
-	if (*demo_p == DEMOMARKER)
-	{
-		snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
-		CONS_Alert(CONS_ERROR, "%s", msg);
-		M_StartMessage(msg, NULL, MM_NOTHING);
-		Z_Free(pdemoname);
-		Z_Free(demobuffer);
-		demobuffer = NULL;
-		demo.playback = false;
-		demo.title = false;
-		return;
-	}
-
-	Z_Free(pdemoname);
-
-	memset(&oldcmd,0,sizeof(oldcmd));
-	memset(&oldghost,0,sizeof(oldghost));
-	memset(&ghostext,0,sizeof(ghostext));
-
-#if defined(SKIPERRORS) && !defined(DEVELOP)
-	if ((VERSION != version || SUBVERSION != subversion) && !skiperrors)
-#else
-	if (VERSION != version || SUBVERSION != subversion)
-#endif
-		CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
-
-	// console warning messages
-#if defined(SKIPERRORS) && !defined(DEVELOP)
-	demosynced = (!skiperrors);
-#else
-	demosynced = true;
-#endif
-
-	// didn't start recording right away.
-	demo.deferstart = false;
-
-	//LUAh_MapChange(gamemap);
-
-	displayplayers[0] = consoleplayer = 0;
-	memset(playeringame,0,sizeof(playeringame));
-
-	// Load players that were in-game when the map started
-	p = READUINT8(demo_p);
-
-	for (i = 1; i < MAXSPLITSCREENPLAYERS; i++)
-		displayplayers[i] = INT32_MAX;
-
-	while (p != 0xFF)
-	{
-		spectator = false;
-		if (p & DEMO_SPECTATOR)
-		{
-			spectator = true;
-			p &= ~DEMO_SPECTATOR;
-
-			if (modeattacking)
-			{
-				snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with spectators, and is thus invalid.\n"), pdemoname);
-				CONS_Alert(CONS_ERROR, "%s", msg);
-				M_StartMessage(msg, NULL, MM_NOTHING);
-				Z_Free(pdemoname);
-				Z_Free(demobuffer);
-				demobuffer = NULL;
-				demo.playback = false;
-				demo.title = false;
-				return;
-			}
-		}
-		slots[numslots] = p; numslots++;
-
-		if (modeattacking && numslots > 1)
-		{
-			snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with multiple players, and is thus invalid.\n"), pdemoname);
-			CONS_Alert(CONS_ERROR, "%s", msg);
-			M_StartMessage(msg, NULL, MM_NOTHING);
-			Z_Free(pdemoname);
-			Z_Free(demobuffer);
-			demobuffer = NULL;
-			demo.playback = false;
-			demo.title = false;
-			return;
-		}
-
-		if (!playeringame[displayplayers[0]] || players[displayplayers[0]].spectator)
-			displayplayers[0] = consoleplayer = serverplayer = p;
-
-		playeringame[p] = true;
-		players[p].spectator = spectator;
-
-		// Name
-		M_Memcpy(player_names[p],demo_p,16);
-		demo_p += 16;
-
-		// Skin
-		M_Memcpy(skin,demo_p,16);
-		demo_p += 16;
-		SetPlayerSkin(p, skin);
-
-		// Color
-		M_Memcpy(color,demo_p,16);
-		demo_p += 16;
-		for (i = 0; i < MAXSKINCOLORS; i++)
-			if (!stricmp(KartColor_Names[i],color))				// SRB2kart
-			{
-				players[p].skincolor = i;
-				break;
-			}
-
-		// Score, since Kart uses this to determine where you start on the map
-		players[p].score = READUINT32(demo_p);
-
-		// Kart stats, temporarily
-		kartspeed[p] = READUINT8(demo_p);
-		kartweight[p] = READUINT8(demo_p);
-
-		if (stricmp(skins[players[p].skin].name, skin) != 0)
-			FindClosestSkinForStats(p, kartspeed[p], kartweight[p]);
-
-		// Look for the next player
-		p = READUINT8(demo_p);
-	}
-
-// end of player read (the 0xFF marker)
-// so this is where we are to read our lua variables (if possible!)
-	if (demoflags & DF_LUAVARS)	// again, used for compability, lua shit will be saved to replays regardless of if it's even been loaded
-	{
-		if (!gL)	// No Lua state! ...I guess we'll just start one...
-			LUA_ClearState();
-
-		// No modeattacking check, DF_LUAVARS won't be present here.
-		LUA_UnArchiveDemo();
-	}
-
-	splitscreen = 0;
-
-	if (demo.title)
-	{
-		splitscreen = M_RandomKey(6)-1;
-		splitscreen = min(min(3, numslots-1), splitscreen); // Bias toward 1p and 4p views
-
-		for (p = 0; p <= splitscreen; p++)
-			G_ResetView(p+1, slots[M_RandomKey(numslots)], false);
-	}
-
-	R_ExecuteSetViewSize();
-
-#ifdef DEMO_COMPAT_100
-post_compat:
-#endif
-
-	P_SetRandSeed(randseed);
-	G_InitNew(demoflags & DF_ENCORE, G_BuildMapName(gamemap), true, true); // Doesn't matter whether you reset or not here, given changes to resetplayer.
-
-	for (i = 0; i < MAXPLAYERS; i++)
-	{
-		if (players[i].mo)
-		{
-			players[i].mo->color = players[i].skincolor;
-			oldghost[i].x = players[i].mo->x;
-			oldghost[i].y = players[i].mo->y;
-			oldghost[i].z = players[i].mo->z;
-		}
-
-		// Set saved attribute values
-		// No cheat checking here, because even if they ARE wrong...
-		// it would only break the replay if we clipped them.
-		players[i].kartspeed = kartspeed[i];
-		players[i].kartweight = kartweight[i];
-	}
-
-	demo.deferstart = true;
-}
-#undef SKIPERRORS
-
-void G_AddGhost(char *defdemoname)
-{
-	INT32 i;
-	lumpnum_t l;
-	char name[17],skin[17],color[17],*n,*pdemoname,md5[16];
-	demoghost *gh;
-	UINT8 flags;
-	UINT8 *buffer,*p;
-	mapthing_t *mthing;
-	UINT16 count, ghostversion;
-	skin_t *ghskin = &skins[0];
-	UINT8 kartspeed = UINT8_MAX, kartweight = UINT8_MAX;
-
-	name[16] = '\0';
-	skin[16] = '\0';
-	color[16] = '\0';
-
-	n = defdemoname+strlen(defdemoname);
-	while (*n != '/' && *n != '\\' && n != defdemoname)
-		n--;
-	if (n != defdemoname)
-		n++;
-	pdemoname = ZZ_Alloc(strlen(n)+1);
-	strcpy(pdemoname,n);
-
-	// Internal if no extension, external if one exists
-	if (FIL_CheckExtension(defdemoname))
-	{
-		//FIL_DefaultExtension(defdemoname, ".lmp");
-		if (!FIL_ReadFileTag(defdemoname, &buffer, PU_LEVEL))
-		{
-			CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), defdemoname);
-			Z_Free(pdemoname);
-			return;
-		}
-		p = buffer;
-	}
-	// load demo resource from WAD
-	else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
-	{
-		CONS_Alert(CONS_ERROR, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
-		Z_Free(pdemoname);
-		return;
-	}
-	else // it's an internal demo
-		buffer = p = W_CacheLumpNum(l, PU_LEVEL);
-
-	// read demo header
-	if (memcmp(p, DEMOHEADER, 12))
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Not a SRB2Kart replay.\n"), pdemoname);
-		Z_Free(pdemoname);
-		Z_Free(buffer);
-		return;
-	}
-
-	p += 12; // DEMOHEADER
-	p++; // VERSION
-	p++; // SUBVERSION
-
-	ghostversion = READUINT16(p);
-	switch(ghostversion)
-	{
-	case DEMOVERSION: // latest always supported
-		p += 64; // title
-		break;
-#ifdef DEMO_COMPAT_100
-	case 0x0001:
-		break;
-#endif
-	// too old, cannot support.
-	default:
-		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo version incompatible.\n"), pdemoname);
-		Z_Free(pdemoname);
-		Z_Free(buffer);
-		return;
-	}
-
-	M_Memcpy(md5, p, 16); p += 16; // demo checksum
-	for (gh = ghosts; gh; gh = gh->next)
-		if (!memcmp(md5, gh->checksum, 16)) // another ghost in the game already has this checksum?
-		{ // Don't add another one, then!
-			CONS_Debug(DBG_SETUP, "Rejecting duplicate ghost %s (MD5 was matched)\n", pdemoname);
-			Z_Free(pdemoname);
-			Z_Free(buffer);
-			return;
-		}
-
-	if (memcmp(p, "PLAY", 4))
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Demo format unacceptable.\n"), pdemoname);
-		Z_Free(pdemoname);
-		Z_Free(buffer);
-		return;
-	}
-
-	p += 4; // "PLAY"
-	p += 2; // gamemap
-	p += 16; // mapmd5 (possibly check for consistency?)
-
-	flags = READUINT8(p);
-
-	if (!(flags & DF_GHOST))
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: No ghost data in this demo.\n"), pdemoname);
-		Z_Free(pdemoname);
-		Z_Free(buffer);
-		return;
-	}
-
-#ifdef DEMO_COMPAT_100
-	if (ghostversion != 0x0001)
-#endif
-		p++; // gametype
-
-#ifdef DEMO_COMPAT_100
-	if (ghostversion != 0x0001)
-#endif
-		G_SkipDemoExtraFiles(&p); // Don't wanna modify the file list for ghosts.
-	switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
-	{
-	case ATTACKING_NONE: // 0
-		break;
-	case ATTACKING_RECORD: // 1
-		p += 8; // demo time, lap
-		break;
-	/*case ATTACKING_NIGHTS: // 2
-		p += 8; // demo time left, score
-		break;*/
-	default: // 3
-		break;
-	}
-
-	p += 4; // random seed
-
-#ifdef DEMO_COMPAT_100
-	if (ghostversion == 0x0001)
-	{
-		// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
-		M_Memcpy(name, p,16);
-		p += 16;
-
-		// Skin
-		M_Memcpy(skin, p,16);
-		p += 16;
-
-		// Color
-		M_Memcpy(color, p,16);
-		p += 16;
-
-		// Ghosts do not have a player structure to put this in.
-		p++; // charability
-		p++; // charability2
-		p++; // actionspd
-		p++; // mindash
-		p++; // maxdash
-		// SRB2kart
-		p++; // kartspeed
-		p++; // kartweight
-		//
-		p++; // normalspeed
-		p++; // runspeed
-		p++; // thrustfactor
-		p++; // accelstart
-		p++; // acceleration
-		p += 4; // jumpfactor
-	}
-	else
-#endif
-	p += 4; // Extra data location reference
-
-	// net var data
-	count = READUINT16(p);
-	while (count--)
-	{
-		p += 2;
-		SKIPSTRING(p);
-		p++;
-	}
-
-	if (*p == DEMOMARKER)
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Replay is empty.\n"), pdemoname);
-		Z_Free(pdemoname);
-		Z_Free(buffer);
-		return;
-	}
-
-#ifdef DEMO_COMPAT_100
-	if (ghostversion != 0x0001)
-	{
-#endif
-	if (READUINT8(p) != 0)
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Invalid player slot.\n"), pdemoname);
-		Z_Free(pdemoname);
-		Z_Free(buffer);
-		return;
-	}
-
-	// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
-	M_Memcpy(name, p, 16);
-	p += 16;
-
-	// Skin
-	M_Memcpy(skin, p, 16);
-	p += 16;
-
-	// Color
-	M_Memcpy(color, p, 16);
-	p += 16;
-
-	p += 4; // score
-
-	kartspeed = READUINT8(p);
-	kartweight = READUINT8(p);
-
-	if (READUINT8(p) != 0xFF)
-	{
-		CONS_Alert(CONS_NOTICE, M_GetText("Failed to add ghost %s: Invalid player slot.\n"), pdemoname);
-		Z_Free(pdemoname);
-		Z_Free(buffer);
-		return;
-	}
-#ifdef DEMO_COMPAT_100
-	}
-#endif
-
-	for (i = 0; i < numskins; i++)
-		if (!stricmp(skins[i].name,skin))
-		{
-			ghskin = &skins[i];
-			break;
-		}
-
-	if (i == numskins)
-	{
-		if (kartspeed != UINT8_MAX && kartweight != UINT8_MAX)
-			ghskin = &skins[GetSkinNumClosestToStats(kartspeed, kartweight)];
-
-		CONS_Alert(CONS_NOTICE, M_GetText("Ghost %s: Invalid character. Falling back to %s.\n"), pdemoname, ghskin->name);
-	}
-
-	gh = Z_Calloc(sizeof(demoghost), PU_LEVEL, NULL);
-	gh->next = ghosts;
-	gh->buffer = buffer;
-	M_Memcpy(gh->checksum, md5, 16);
-	gh->p = p;
-
-	ghosts = gh;
-
-	gh->version = ghostversion;
-	mthing = playerstarts[0];
-	I_Assert(mthing);
-	{ // A bit more complex than P_SpawnPlayer because ghosts aren't solid and won't just push themselves out of the ceiling.
-		fixed_t z,f,c;
-		gh->mo = P_SpawnMobj(mthing->x << FRACBITS, mthing->y << FRACBITS, 0, MT_GHOST);
-		gh->mo->angle = FixedAngle(mthing->angle*FRACUNIT);
-		f = gh->mo->floorz;
-		c = gh->mo->ceilingz - mobjinfo[MT_PLAYER].height;
-		if (!!(mthing->options & MTF_AMBUSH) ^ !!(mthing->options & MTF_OBJECTFLIP))
-		{
-			z = c;
-			if (mthing->options >> ZSHIFT)
-				z -= ((mthing->options >> ZSHIFT) << FRACBITS);
-			if (z < f)
-				z = f;
-		}
-		else
-		{
-			z = f;
-			if (mthing->options >> ZSHIFT)
-				z += ((mthing->options >> ZSHIFT) << FRACBITS);
-			if (z > c)
-				z = c;
-		}
-		gh->mo->z = z;
-	}
-	gh->mo->state = states+S_KART_STND1; // SRB2kart - was S_PLAY_STND
-	gh->mo->sprite = gh->mo->state->sprite;
-	gh->mo->frame = (gh->mo->state->frame & FF_FRAMEMASK) | tr_trans20<<FF_TRANSSHIFT;
-	gh->mo->tics = -1;
-
-	gh->oldmo.x = gh->mo->x;
-	gh->oldmo.y = gh->mo->y;
-	gh->oldmo.z = gh->mo->z;
-
-	// Set skin
-	gh->mo->skin = gh->oldmo.skin = ghskin;
-
-	// Set color
-	gh->mo->color = ((skin_t*)gh->mo->skin)->prefcolor;
-	for (i = 0; i < MAXSKINCOLORS; i++)
-		if (!stricmp(KartColor_Names[i],color))				// SRB2kart
-		{
-			gh->mo->color = (UINT8)i;
-			break;
-		}
-	gh->oldmo.color = gh->mo->color;
-
-	CONS_Printf(M_GetText("Added ghost %s from %s\n"), name, pdemoname);
-	Z_Free(pdemoname);
-}
-
-// A simplified version of G_AddGhost...
-void G_UpdateStaffGhostName(lumpnum_t l)
-{
-	UINT8 *buffer,*p;
-	UINT16 ghostversion;
-	UINT8 flags;
-
-	buffer = p = W_CacheLumpNum(l, PU_CACHE);
-
-	// read demo header
-	if (memcmp(p, DEMOHEADER, 12))
-	{
-		goto fail;
-	}
-
-	p += 12; // DEMOHEADER
-	p++; // VERSION
-	p++; // SUBVERSION
-
-	ghostversion = READUINT16(p);
-	switch(ghostversion)
-	{
-	case DEMOVERSION: // latest always supported
-		p += 64; // full demo title
-		break;
-
-#ifdef DEMO_COMPAT_100
-	case 0x0001:
-		break;
-#endif
-
-	// too old, cannot support.
-	default:
-		goto fail;
-	}
-
-	p += 16; // demo checksum
-
-	if (memcmp(p, "PLAY", 4))
-	{
-		goto fail;
-	}
-
-	p += 4; // "PLAY"
-	p += 2; // gamemap
-	p += 16; // mapmd5 (possibly check for consistency?)
-
-	flags = READUINT8(p);
-	if (!(flags & DF_GHOST))
-	{
-		goto fail; // we don't NEED to do it here, but whatever
-	}
-
-#ifdef DEMO_COMPAT_100
-	if (ghostversion != 0x0001)
-#endif
-	p++; // Gametype
-
-#ifdef DEMO_COMPAT_100
-	if (ghostversion != 0x0001)
-#endif
-	G_SkipDemoExtraFiles(&p);
-
-	switch ((flags & DF_ATTACKMASK)>>DF_ATTACKSHIFT)
-	{
-	case ATTACKING_NONE: // 0
-		break;
-	case ATTACKING_RECORD: // 1
-		p += 8; // demo time, lap
-		break;
-	default: // 3
-		break;
-	}
-
-	p += 4; // random seed
-
-
-#ifdef DEMO_COMPAT_100
-	if (ghostversion == 0x0001)
-	{
-		// Player name
-		M_Memcpy(dummystaffname, p,16);
-		dummystaffname[16] = '\0';
-		goto fail; // Not really a failure but whatever
-	}
-#endif
-
-	p += 4; // Extrainfo location marker
-
-	// Ehhhh don't need ghostversion here (?) so I'll reuse the var here
-	ghostversion = READUINT16(p);
-	while (ghostversion--)
-	{
-		p += 2;
-		SKIPSTRING(p);
-		p++; // stealth
-	}
-
-	// Assert first player is in and then read name
-	if (READUINT8(p) != 0)
-		goto fail;
-	M_Memcpy(dummystaffname, p,16);
-	dummystaffname[16] = '\0';
-
-	// Ok, no longer any reason to care, bye
-fail:
-	Z_Free(buffer);
-	return;
-}
-
-//
-// G_TimeDemo
-// NOTE: name is a full filename for external demos
-//
-static INT32 restorecv_vidwait;
-
-void G_TimeDemo(const char *name)
-{
-	nodrawers = M_CheckParm("-nodraw");
-	noblit = M_CheckParm("-noblit");
-	restorecv_vidwait = cv_vidwait.value;
-	if (cv_vidwait.value)
-		CV_Set(&cv_vidwait, "0");
-	demo.timing = true;
-	singletics = true;
-	framecount = 0;
-	demostarttime = I_GetTime();
-	G_DeferedPlayDemo(name);
-}
-
-void G_DoPlayMetal(void)
-{
-	lumpnum_t l;
-	mobj_t *mo = NULL;
-	thinker_t *th;
-
-	// it's an internal demo
-	if ((l = W_CheckNumForName(va("%sMS",G_BuildMapName(gamemap)))) == LUMPERROR)
-	{
-		CONS_Alert(CONS_WARNING, M_GetText("No bot recording for this map.\n"));
-		return;
-	}
-	else
-		metalbuffer = metal_p = W_CacheLumpNum(l, PU_STATIC);
-
-	// find metal sonic
-	for (th = thinkercap.next; th != &thinkercap; th = th->next)
-	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
-
-		mo = (mobj_t *)th;
-		if (mo->type == MT_METALSONIC_RACE)
-			break;
-	}
-	if (th == &thinkercap && th->function.acp1 == (actionf_p1)P_MobjThinker)
-	{
-		CONS_Alert(CONS_ERROR, M_GetText("Failed to find bot entity.\n"));
-		Z_Free(metalbuffer);
-		return;
-	}
-
-	// read demo header
-    metal_p += 12; // DEMOHEADER
-	metal_p++; // VERSION
-	metal_p++; // SUBVERSION
-	metalversion = READUINT16(metal_p);
-	switch(metalversion)
-	{
-	case DEMOVERSION: // latest always supported
-		break;
-#ifdef DEMO_COMPAT_100
-	case 0x0001:
-		I_Error("You need to implement demo compat here, doofus! %s:%d", __FILE__, __LINE__);
-#endif
-	// too old, cannot support.
-	default:
-		CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, format version incompatible.\n"));
-		Z_Free(metalbuffer);
-		return;
-	}
-	metal_p += 16; // demo checksum
-	if (memcmp(metal_p, "METL", 4))
-	{
-		CONS_Alert(CONS_WARNING, M_GetText("Failed to load bot recording for this map, wasn't recorded in Metal format.\n"));
-		Z_Free(metalbuffer);
-		return;
-	} metal_p += 4; // "METL"
-
-	// read initial tic
-	memset(&oldmetal,0,sizeof(oldmetal));
-	oldmetal.x = mo->x;
-	oldmetal.y = mo->y;
-	oldmetal.z = mo->z;
-	oldmetal.angle = mo->angle;
-	metalplayback = mo;
-}
-
-void G_DoneLevelLoad(void)
-{
-	CONS_Printf(M_GetText("Loaded level in %f sec\n"), (double)(I_GetTime() - demostarttime) / TICRATE);
-	framecount = 0;
-	demostarttime = I_GetTime();
-}
-
-/*
-===================
-=
-= G_CheckDemoStatus
-=
-= Called after a death or level completion to allow demos to be cleaned up
-= Returns true if a new demo loop action will take place
-===================
-*/
-
-// Stops metal sonic's demo. Separate from other functions because metal + replays can coexist
-void G_StopMetalDemo(void)
-{
-
-	// Metal Sonic finishing doesn't end the game, dammit.
-	Z_Free(metalbuffer);
-	metalbuffer = NULL;
-	metalplayback = NULL;
-	metal_p = NULL;
-}
-
-// Stops metal sonic recording.
-ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void)
-{
-	boolean saved = false;
-	if (demo_p)
-	{
-		UINT8 *p = demobuffer+16; // checksum position
-#ifdef NOMD5
-		UINT8 i;
-		WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
-		for (i = 0; i < 16; i++, p++)
-			*p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
-#else
-		WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
-		md5_buffer((char *)p+16, demo_p - (p+16), (void *)p); // make a checksum of everything after the checksum in the file.
-#endif
-		saved = FIL_WriteFile(va("%sMS.LMP", G_BuildMapName(gamemap)), demobuffer, demo_p - demobuffer); // finally output the file.
-	}
-	free(demobuffer);
-	demobuffer = NULL;
-	metalrecording = false;
-	if (saved)
-		I_Error("Saved to %sMS.LMP", G_BuildMapName(gamemap));
-	I_Error("Failed to save demo!");
-}
-
-// reset engine variable set for the demos
-// called from stopdemo command, map command, and g_checkdemoStatus.
-void G_StopDemo(void)
-{
-	Z_Free(demobuffer);
-	demobuffer = NULL;
-	demo.playback = false;
-	if (demo.title)
-		modeattacking = false;
-	demo.title = false;
-	demo.timing = false;
-	singletics = false;
-
-	demo.freecam = false;
-	// reset democam shit too:
-	democam.cam = NULL;
-	democam.soundmobj = NULL;
-	democam.localangle = 0;
-	democam.localaiming = 0;
-	democam.turnheld = false;
-	democam.keyboardlook = false;
-
-	CV_SetValue(&cv_playbackspeed, 1);
-	demo.rewinding = false;
-	CL_ClearRewinds();
-
-	if (gamestate == GS_LEVEL && rendermode != render_none)
-	{
-		V_SetPaletteLump("PLAYPAL"); // Reset the palette
-		R_ReInitColormaps(0, LUMPERROR);
-	}
-	if (gamestate == GS_INTERMISSION)
-		Y_EndIntermission(); // cleanup
-	if (gamestate == GS_VOTING)
-		Y_EndVote();
-
-	G_SetGamestate(GS_NULL);
-	wipegamestate = GS_NULL;
-	SV_StopServer();
-	SV_ResetServer();
-}
-
-boolean G_CheckDemoStatus(void)
-{
-	while (ghosts)
-	{
-		demoghost *next = ghosts->next;
-		Z_Free(ghosts);
-		ghosts = next;
-	}
-	ghosts = NULL;
-
-	// DO NOT end metal sonic demos here
-
-	if (demo.timing)
-	{
-		INT32 demotime;
-		double f1, f2;
-		demotime = I_GetTime() - demostarttime;
-		if (!demotime)
-			return true;
-		G_StopDemo();
-		demo.timing = false;
-		f1 = (double)demotime;
-		f2 = (double)framecount*TICRATE;
-		CONS_Printf(M_GetText("timed %u gametics in %d realtics\n%f seconds, %f avg fps\n"), leveltime,demotime,f1/TICRATE,f2/f1);
-		if (restorecv_vidwait != cv_vidwait.value)
-			CV_SetValue(&cv_vidwait, restorecv_vidwait);
-		D_StartTitle();
-		return true;
-	}
-
-	if (demo.playback)
-	{
-		if (demo.quitafterplaying)
-			I_Quit();
-
-		if (multiplayer && !demo.title)
-			G_ExitLevel();
-		else
-		{
-			G_StopDemo();
-
-			if (modeattacking)
-				M_EndModeAttackRun();
-			else
-				D_StartTitle();
-		}
-
-		return true;
-	}
-
-	if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
-	{
-		G_SaveDemo();
-		return true;
-	}
-	demo.recording = false;
-
-	return false;
-}
-
-void G_SaveDemo(void)
-{
-	UINT8 *p = demobuffer+16; // after version
-	UINT32 length;
-#ifdef NOMD5
-	UINT8 i;
-#endif
-
-	// Ensure extrainfo pointer is always available, even if no info is present.
-	if (demoinfo_p && *(UINT32 *)demoinfo_p == 0)
-	{
-		WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
-		*(UINT32 *)demoinfo_p = demo_p - demobuffer;
-	}
-	WRITEUINT8(demo_p, DW_END); // Mark end of demo extra data.
-
-	M_Memcpy(p, demo.titlename, 64); // Write demo title here
-	p += 64;
-
-	if (multiplayer)
-	{
-		// Change the demo's name to be a slug of the title
-		char demo_slug[128];
-		char *writepoint;
-		size_t i, strindex = 0;
-		boolean dash = true;
-
-		for (i = 0; i < 127 && demo.titlename[i]; i++)
-		{
-			if ((demo.titlename[i] >= 'a' && demo.titlename[i] <= 'z') ||
-				(demo.titlename[i] >= '0' && demo.titlename[i] <= '9'))
-			{
-				demo_slug[strindex] = demo.titlename[i];
-				strindex++;
-				dash = false;
-			}
-			else if (demo.titlename[i] >= 'A' && demo.titlename[i] <= 'Z')
-			{
-				demo_slug[strindex] = demo.titlename[i] + 'a' - 'A';
-				strindex++;
-				dash = false;
-			}
-			else if (!dash)
-			{
-				demo_slug[strindex] = '-';
-				strindex++;
-				dash = true;
-			}
-		}
-
-		demo_slug[strindex] = 0;
-		if (dash) demo_slug[strindex-1] = 0;
-
-		writepoint = strstr(demoname, "-") + 1;
-		demo_slug[128 - (writepoint - demoname) - 4] = 0;
-		sprintf(writepoint, "%s.lmp", demo_slug);
-	}
-
-	length = *(UINT32 *)demoinfo_p;
-	WRITEUINT32(demoinfo_p, length);
-#ifdef NOMD5
-	for (i = 0; i < 16; i++, p++)
-		*p = M_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
-#else
-	// Make a checksum of everything after the checksum in the file up to the end of the standard data. Extrainfo is freely modifiable.
-	md5_buffer((char *)p+16, (demobuffer + length) - (p+16), p);
-#endif
-
-
-	if (FIL_WriteFile(va(pandf, srb2home, demoname), demobuffer, demo_p - demobuffer)) // finally output the file.
-		demo.savemode = DSM_SAVED;
-	free(demobuffer);
-	demobuffer = NULL;
-	demo.recording = false;
-
-	if (modeattacking != ATTACKING_RECORD)
-	{
-		if (demo.savemode == DSM_SAVED)
-			CONS_Printf(M_GetText("Demo %s recorded\n"), demoname);
-		else
-			CONS_Alert(CONS_WARNING, M_GetText("Demo %s not saved\n"), demoname);
-	}
-}
-
-boolean G_DemoTitleResponder(event_t *ev)
-{
-	size_t len;
-	INT32 ch;
-
-	if (ev->type != ev_keydown)
-		return false;
-
-	ch = (INT32)ev->data1;
-
-	// Only ESC and non-keyboard keys abort connection
-	if (ch == KEY_ESCAPE)
-	{
-		demo.savemode = (cv_recordmultiplayerdemos.value == 2) ? DSM_WILLAUTOSAVE : DSM_NOTSAVING;
-		return true;
-	}
-
-	if (ch == KEY_ENTER || ch >= KEY_MOUSE1)
-	{
-		demo.savemode = DSM_WILLSAVE;
-		return true;
-	}
-
-	if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART])
-	  || ch == ' ') // Allow spaces, of course
-	{
-		len = strlen(demo.titlename);
-		if (len < 64)
-		{
-			demo.titlename[len+1] = 0;
-			demo.titlename[len] = cv_keyboardlayout.value == 3 ? CON_ShitAndAltGrChar(ch) : CON_ShiftChar(ch);
-		}
-	}
-	else if (ch == KEY_BACKSPACE)
-	{
-		if (shiftdown)
-			memset(demo.titlename, 0, sizeof(demo.titlename));
-		else
-		{
-			len = strlen(demo.titlename);
-
-			if (len > 0)
-				demo.titlename[len-1] = 0;
-		}
-	}
-
-	return true;
-}
-
 //
 // G_SetGamestate
 //
@@ -8456,6 +4235,11 @@ boolean G_DemoTitleResponder(event_t *ev)
 void G_SetGamestate(gamestate_t newstate)
 {
 	gamestate = newstate;
+
+	//HACK: reset musiccredits whenever we change gamestate
+	// since we allow them to run everywhere now
+	S_ResetMusicCredit();
+
 #ifdef HAVE_DISCORDRPC
 	DRPC_UpdatePresence();
 #endif
@@ -8499,33 +4283,3 @@ boolean G_GetRetryFlag(void)
 {
 	return retrying;
 }
-
-// Time utility functions
-INT32 G_TicsToHours(tic_t tics)
-{
-	return tics/(3600*TICRATE);
-}
-
-INT32 G_TicsToMinutes(tic_t tics, boolean full)
-{
-	if (full)
-		return tics/(60*TICRATE);
-	else
-		return tics/(60*TICRATE)%60;
-}
-
-INT32 G_TicsToSeconds(tic_t tics)
-{
-	return (tics/TICRATE)%60;
-}
-
-INT32 G_TicsToCentiseconds(tic_t tics)
-{
-	return (INT32)((tics%TICRATE) * (100.00f/TICRATE));
-}
-
-INT32 G_TicsToMilliseconds(tic_t tics)
-{
-	return (INT32)((tics%TICRATE) * (1000.00f/TICRATE));
-}
-
diff --git a/src/g_game.h b/src/g_game.h
index bfc158583..9d8b74144 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -14,9 +14,16 @@
 #ifndef __G_GAME__
 #define __G_GAME__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomdef.h"
 #include "doomstat.h"
 #include "d_event.h"
+#include "g_demo.h"
+#include "p_saveg.h"
+#include "m_textinput.h"
 
 extern char gamedatafilename[64];
 extern char timeattackfolder[64];
@@ -32,74 +39,6 @@ extern INT32 player_name_changes[MAXPLAYERS];
 extern player_t players[MAXPLAYERS];
 extern boolean playeringame[MAXPLAYERS];
 
-extern UINT8 *demo_p;
-
-// ======================================
-// DEMO playback/recording related stuff.
-// ======================================
-
-// demoplaying back and demo recording
-extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality, cv_maxdemosize;
-
-// Publicly-accessible demo vars
-struct demovars_s {
-	char titlename[65];
-	boolean recording, playback, timing;
-	UINT16 version; // Current file format of the demo being played
-	boolean title; // Title Screen demo can be cancelled by any key
-	boolean rewinding; // Rewind in progress
-
-	boolean loadfiles, ignorefiles; // Demo file loading options
-	boolean fromtitle; // SRB2Kart: Don't stop the music
-	boolean inreplayhut; // Go back to replayhut after demos
-	boolean quitafterplaying; // quit after playing a demo from cmdline
-	boolean deferstart; // don't start playing demo right away
-
-	tic_t savebutton; // Used to determine when the local player can choose to save the replay while the race is still going
-	enum {
-		DSM_NOTSAVING,
-		DSM_WILLAUTOSAVE,
-		DSM_TITLEENTRY,
-		DSM_WILLSAVE,
-		DSM_SAVED
-	} savemode;
-
-	boolean freecam;
-
-};
-
-extern struct demovars_s demo;
-
-typedef enum {
-	MD_NOTLOADED,
-	MD_LOADED,
-	MD_SUBDIR,
-	MD_OUTDATED,
-	MD_INVALID
-} menudemotype_e;
-
-typedef struct menudemo_s {
-	char filepath[256];
-	menudemotype_e type;
-
-	char title[65]; // Null-terminated for string prints
-	UINT16 map;
-	UINT8 addonstatus; // What do we need to do addon-wise to play this demo?
-	UINT8 gametype;
-	UINT8 kartspeed; // Add OR DF_ENCORE for encore mode, idk
-	UINT8 numlaps;
-
-	struct {
-		UINT8 ranking;
-		char name[17];
-		UINT8 skin, color;
-		UINT32 timeorscore;
-	} standings[MAXPLAYERS];
-} menudemo_t;
-
-
-extern mobj_t *metalplayback;
-
 // gametic at level start
 extern tic_t levelstarttic;
 
@@ -115,15 +54,24 @@ extern consvar_t cv_songcredits;
 extern consvar_t cv_showfreeplay;
 extern consvar_t cv_growmusic, cv_supermusic;
 extern consvar_t cv_pauseifunfocused;
-//extern consvar_t cv_crosshair, cv_crosshair2, cv_crosshair3, cv_crosshair4;
-extern consvar_t cv_invertmouse/*, cv_alwaysfreelook, cv_chasefreelook, cv_mousemove*/;
-extern consvar_t cv_invertmouse2/*, cv_alwaysfreelook2, cv_chasefreelook2, cv_mousemove2*/;
-extern consvar_t cv_useranalog, cv_useranalog2, cv_useranalog3, cv_useranalog4;
-extern consvar_t cv_analog, cv_analog2, cv_analog3, cv_analog4;
-extern consvar_t cv_turnaxis,cv_moveaxis,cv_brakeaxis,cv_aimaxis,cv_lookaxis,cv_fireaxis,cv_driftaxis,cv_lookbackaxis,cv_custom1axis,cv_custom2axis,cv_custom3axis,cv_xdeadzone,cv_ydeadzone;
-extern consvar_t cv_turnaxis2,cv_moveaxis2,cv_brakeaxis2,cv_aimaxis2,cv_lookaxis2,cv_fireaxis2,cv_driftaxis2,cv_lookbackaxis2,cv_custom1axis2,cv_custom2axis2,cv_custom3axis2,cv_xdeadzone2,cv_ydeadzone2;
-extern consvar_t cv_turnaxis3,cv_moveaxis3,cv_brakeaxis3,cv_aimaxis3,cv_lookaxis3,cv_fireaxis3,cv_driftaxis3,cv_lookbackaxis3,cv_custom1axis3,cv_custom2axis3,cv_custom3axis3,cv_xdeadzone3,cv_ydeadzone3;
-extern consvar_t cv_turnaxis4,cv_moveaxis4,cv_brakeaxis4,cv_aimaxis4,cv_lookaxis4,cv_fireaxis4,cv_driftaxis4,cv_lookbackaxis4,cv_custom1axis4,cv_custom2axis4,cv_custom3axis4,cv_xdeadzone4,cv_ydeadzone4;
+extern consvar_t cv_invertmouse;
+
+extern consvar_t cv_turnaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_moveaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_camturnaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_camstrafeaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_brakeaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_aimaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_lookaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_lookbackaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_fireaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_driftaxis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_custom1axis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_custom2axis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_custom3axis[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_xdeadzone[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_ydeadzone[MAXSPLITSCREENPLAYERS];
+
 extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_guest, cv_ghost_staff;
 
 // Hud offsets
@@ -137,38 +85,47 @@ extern consvar_t cv_##name##_yoffset;
 DECL_HUD_OFFSET_X(name)\
 DECL_HUD_OFFSET_Y(name)
 
-DECL_HUD_OFFSET(item); // Item box
-DECL_HUD_OFFSET(time); // Time
-DECL_HUD_OFFSET(laps); // Number of laps
-DECL_HUD_OFFSET(dnft); // Countdown (did not finish timer)
-DECL_HUD_OFFSET(speed); // Speedometer
-DECL_HUD_OFFSET(posi); // Position in race
-DECL_HUD_OFFSET(face); // Mini rankings
-DECL_HUD_OFFSET(stcd); // Starting countdown
+DECL_HUD_OFFSET(item);   // Item box
+DECL_HUD_OFFSET(time);   // Time
+DECL_HUD_OFFSET(laps);   // Number of laps
+DECL_HUD_OFFSET(dnft);   // Countdown (did not finish timer)
+DECL_HUD_OFFSET(speed);  // Speedometer
+DECL_HUD_OFFSET(posi);   // Position in race
+DECL_HUD_OFFSET(wheel);  // RA Wheel
+DECL_HUD_OFFSET(face);   // Mini rankings
+DECL_HUD_OFFSET(stcd);   // Starting countdown
 DECL_HUD_OFFSET_Y(chek); // Check gfx
-DECL_HUD_OFFSET(mini); // Minimap
-DECL_HUD_OFFSET(want); // Wanted
-DECL_HUD_OFFSET(stat); // Stats
+DECL_HUD_OFFSET(mini);   // Minimap
+DECL_HUD_OFFSET(want);   // Wanted
+DECL_HUD_OFFSET(stat);   // Stats
 
 #undef DECL_HUD_OFFSET
 #undef DECL_HUD_OFFSET_X
 #undef DECL_HUD_OFFSET_Y
 
 extern consvar_t cv_showinput;
+extern consvar_t cv_posanim;
+extern consvar_t cv_smallposnum;
 extern consvar_t cv_newspeedometer;
 
 extern consvar_t cv_saltyhop;
+extern consvar_t cv_saltyheight;
 extern consvar_t cv_saltyhopsfx;
 extern consvar_t cv_saltysquish;
+extern consvar_t cv_saltyroll;
 
 extern consvar_t cv_driftsparkpulse;
 extern consvar_t cv_gravstretch;
 extern consvar_t cv_sloperoll;
-extern consvar_t cv_spriteroll;
 extern consvar_t cv_sliptideroll;
 extern consvar_t cv_slamsound;
 extern consvar_t cv_sloperolldist;
 extern consvar_t cv_sparkroll;
+extern consvar_t cv_spinoutroll;
+
+extern consvar_t cv_squishdance, cv_squishdancespeed;
+
+extern consvar_t cv_playerblendeffects;
 
 extern consvar_t cv_cechotoggle;
 
@@ -181,6 +138,8 @@ typedef enum
 	AXISNONE = 0,
 	AXISTURN,
 	AXISMOVE,
+	AXISCAMTURN,
+	AXISCAMSTRAFE,
 	AXISBRAKE,
 	AXISAIM,
 	AXISLOOK,
@@ -262,10 +221,6 @@ void G_SpawnPlayer(INT32 playernum, boolean starpost);
 // A normal game starts at map 1, but a warp test can start elsewhere
 void G_DeferedInitNew(boolean pencoremode, const char *mapname, INT32 pickedchar,
 	UINT8 ssplayers, boolean FLS);
-void G_DoLoadLevel(boolean resetplayer);
-
-void G_LoadDemoInfo(menudemo_t *pdemo);
-void G_DeferedPlayDemo(const char *demo);
 
 // Can be called by the startup code or M_Responder, calls P_SetupLevel.
 void G_LoadGame(UINT32 slot, INT16 mapoverride);
@@ -274,106 +229,24 @@ void G_SaveGameData(boolean force);
 
 void G_SaveGame(UINT32 slot);
 
-// Only called by startup code.
-void G_RecordDemo(const char *name);
-void G_RecordMetal(void);
-void G_BeginRecording(void);
-void G_BeginMetal(void);
+#define G_GametypeHasTeams() (G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF))
+#define G_BattleGametype() (G_IsGameType(GT_MATCH))
+#define G_RaceGametype() (G_IsGameType(GT_RACE))
+#define G_TagGametype() (G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK))
 
-// Only called by shutdown code.
-void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT32 val);
-void G_SetDemoTime(UINT32 ptime, UINT32 plap);
-UINT8 G_CmpDemoTime(char *oldname, char *newname);
-
-typedef enum
+FUNCINLINE static ATTRINLINE boolean G_IsGameType(int type)
 {
-	GHC_NORMAL = 0,
-	GHC_SUPER,
-	GHC_FIREFLOWER,
-	GHC_INVINCIBLE
-} ghostcolor_t;
+	return (gametype == type);
+}
 
-extern UINT8 demo_extradata[MAXPLAYERS];
-extern UINT8 demo_writerng;
-#define DXD_RESPAWN 0x01 // "respawn" command in console
-#define DXD_SKIN 0x02 // skin changed
-#define DXD_NAME 0x04 // name changed
-#define DXD_COLOR 0x08 // color changed
-#define DXD_PLAYSTATE 0x10 // state changed between playing, spectating, or not in-game
-
-#define DXD_PST_PLAYING 0x01
-#define DXD_PST_SPECTATING 0x02
-#define DXD_PST_LEFT 0x03
-
-// Record/playback tics
-void G_ReadDemoExtraData(void);
-void G_WriteDemoExtraData(void);
-void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum);
-void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum);
-void G_GhostAddThok(INT32 playernum);
-void G_GhostAddSpin(INT32 playernum);
-void G_GhostAddRev(INT32 playernum);
-void G_GhostAddColor(INT32 playernum, ghostcolor_t color);
-void G_GhostAddFlip(INT32 playernum);
-void G_GhostAddScale(INT32 playernum, fixed_t scale);
-void G_GhostAddHit(INT32 playernum, mobj_t *victim);
-void G_WriteAllGhostTics(void);
-void G_WriteGhostTic(mobj_t *ghost, INT32 playernum);
-void G_ConsAllGhostTics(void);
-void G_ConsGhostTic(INT32 playernum);
-void G_GhostTicker(void);
-
-void G_InitDemoRewind(void);
-void G_StoreRewindInfo(void);
-void G_PreviewRewind(tic_t previewtime);
-void G_ConfirmRewind(tic_t rewindtime);
-
-void G_ReadMetalTic(mobj_t *metal);
-void G_WriteMetalTic(mobj_t *metal);
-void G_SaveMetal(UINT8 **buffer);
-void G_LoadMetal(UINT8 **buffer);
-
-// Your naming conventions are stupid and useless.
-// There is no conflict here.
-typedef struct demoghost {
-	UINT8 checksum[16];
-	UINT8 *buffer, *p, color;
-	UINT16 version;
-	mobj_t oldmo, *mo;
-	struct demoghost *next;
-} demoghost;
-extern demoghost *ghosts;
-
-// G_CheckDemoExtraFiles: checks if our loaded WAD list matches the demo's.
-#define DFILE_ERROR_NOTLOADED            0x01 // Files are not loaded, but can be without a restart.
-#define DFILE_ERROR_OUTOFORDER           0x02 // Files are loaded, but out of order.
-#define DFILE_ERROR_INCOMPLETEOUTOFORDER 0x03 // Some files are loaded out of order, but others are not.
-#define DFILE_ERROR_CANNOTLOAD           0x04 // Files are missing and cannot be loaded.
-#define DFILE_ERROR_EXTRAFILES           0x05 // Extra files outside of the replay's file list are loaded.
-
-void G_DoPlayDemo(char *defdemoname);
-void G_TimeDemo(const char *name);
-void G_AddGhost(char *defdemoname);
-void G_UpdateStaffGhostName(lumpnum_t l);
-void G_DoPlayMetal(void);
-void G_DoneLevelLoad(void);
-void G_StopMetalDemo(void);
-ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void);
-void G_StopDemo(void);
-boolean G_CheckDemoStatus(void);
-void G_SaveDemo(void);
-boolean G_DemoTitleResponder(event_t *ev);
+FUNCINLINE static ATTRINLINE boolean G_GametypeHasSpectators(void)
+{
+	return (netgame || (multiplayer && demo.playback));
+}
 
 INT32 G_GetGametypeByName(const char *gametypestr);
-boolean G_IsSpecialStage(INT32 mapnum);
-boolean G_GametypeUsesLives(void);
-boolean G_GametypeHasTeams(void);
-boolean G_GametypeHasSpectators(void);
-boolean G_BattleGametype(void);
 UINT8 G_SometimesGetDifferentGametype(UINT8 prefgametype);
 UINT8 G_GetGametypeColor(INT16 gt);
-boolean G_RaceGametype(void);
-boolean G_TagGametype(void);
 void G_ExitLevel(void);
 void G_NextLevel(void);
 void G_Continue(void);
@@ -403,7 +276,6 @@ void G_SetRetryFlag(void);
 void G_ClearRetryFlag(void);
 boolean G_GetRetryFlag(void);
 
-
 void G_LoadGameData(void);
 void G_LoadGameSettings(void);
 
@@ -414,25 +286,36 @@ void G_SetGamestate(gamestate_t newstate);
 
 // Gamedata record shit
 void G_AllocMainRecordData(INT16 i);
-//void G_AllocNightsRecordData(INT16 i);
 void G_ClearRecords(void);
 
-//UINT32 G_GetBestScore(INT16 map);
 tic_t G_GetBestTime(INT16 map);
-//tic_t G_GetBestLap(INT16 map);
-//UINT16 G_GetBestRings(INT16 map);
-//UINT32 G_GetBestNightsScore(INT16 map, UINT8 mare);
-//tic_t G_GetBestNightsTime(INT16 map, UINT8 mare);
-//UINT8 G_GetBestNightsGrade(INT16 map, UINT8 mare);
 
-//void G_AddTempNightsRecords(UINT32 pscore, tic_t ptime, UINT8 mare);
-//void G_SetNightsRecords(void);
+// Time utility functions
 
-FUNCMATH INT32 G_TicsToHours(tic_t tics);
-FUNCMATH INT32 G_TicsToMinutes(tic_t tics, boolean full);
-FUNCMATH INT32 G_TicsToSeconds(tic_t tics);
-FUNCMATH INT32 G_TicsToCentiseconds(tic_t tics);
-FUNCMATH INT32 G_TicsToMilliseconds(tic_t tics);
+FUNCINLINE static ATTRINLINE FUNCMATH INT32 G_TicsToHours(tic_t tics)
+{
+	return tics/(3600*TICRATE);
+}
+
+FUNCINLINE static ATTRINLINE FUNCMATH INT32 G_TicsToMinutes(tic_t tics, boolean full)
+{
+	return full ? (tics/(60*TICRATE)) : (tics/(60*TICRATE)%60);
+}
+
+FUNCINLINE static ATTRINLINE FUNCMATH INT32 G_TicsToSeconds(tic_t tics)
+{
+	return (tics/TICRATE)%60;
+}
+
+FUNCINLINE static ATTRINLINE FUNCMATH INT32 G_TicsToCentiseconds(tic_t tics)
+{
+	return (INT32)((tics%TICRATE) * (100.00f/TICRATE));
+}
+
+FUNCINLINE static ATTRINLINE FUNCMATH INT32 G_TicsToMilliseconds(tic_t tics)
+{
+	return (INT32)((tics%TICRATE) * (1000.00f/TICRATE));
+}
 
 // Don't split up TOL handling
 INT16 G_TOLFlag(INT32 pgametype);
@@ -440,4 +323,10 @@ INT16 G_TOLFlag(INT32 pgametype);
 INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean ignorebuffer, UINT8 maphell, boolean callagainsoon, INT16 *extbuffer);
 void G_AddMapToBuffer(INT16 map);
 
+void G_FixCamera(UINT8 view);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/g_input.c b/src/g_input.c
index 536ea0c83..18c75e02d 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -14,11 +14,19 @@
 #include "doomdef.h"
 #include "doomstat.h"
 #include "g_input.h"
+#include "g_game.h"
 #include "keys.h"
 #include "hu_stuff.h" // need HUFONT start & end
 #include "d_net.h"
 #include "console.h"
 
+#include "m_menu.h"
+
+#include "i_system.h"
+#include "i_video.h"
+#include "r_draw.h"
+#include "v_video.h"
+
 #define MAXMOUSESENSITIVITY 100 // sensitivity steps
 
 static CV_PossibleValue_t mousesens_cons_t[] = {{1, "MIN"}, {MAXMOUSESENSITIVITY, "MAX"}, {0, NULL}};
@@ -27,29 +35,92 @@ static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "
 
 // 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_mousesens2 = {"mousesens2", "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_mouseysens2 = {"mouseysens2", "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};
 
+static void G_ResetPlayerDeviceRumble(INT32 player);
+static void rumble_off_handle(void);
+static void rumble_off_handle2(void);
+static void rumble_off_handle3(void);
+static void rumble_off_handle4(void);
+
+static void G_ResetPlayerGamepadIndicatorColor(INT32 player);
+static void led_off_handle(void);
+static void led_off_handle2(void);
+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},
+	{"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 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},
+	{"gamepadled2", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle2, 0, NULL, NULL, 0, 0, NULL},
+	{"gamepadled3", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle3, 0, NULL, NULL, 0, 0, NULL},
+	{"gamepadled4", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle4, 0, NULL, NULL, 0, 0, NULL}
+};
+
+static void rumble_off_handle(void)
+{
+	if (!cv_rumble[0].value)
+		G_ResetPlayerDeviceRumble(0);
+}
+
+static void rumble_off_handle2(void)
+{
+	if (!cv_rumble[1].value)
+		G_ResetPlayerDeviceRumble(1);
+}
+
+static void rumble_off_handle3(void)
+{
+	if (!cv_rumble[2].value)
+		G_ResetPlayerDeviceRumble(2);
+}
+
+static void rumble_off_handle4(void)
+{
+	if (!cv_rumble[3].value)
+		G_ResetPlayerDeviceRumble(3);
+}
+
+static void led_off_handle(void)
+{
+	G_ResetPlayerGamepadIndicatorColor(0);
+}
+
+static void led_off_handle2(void)
+{
+	G_ResetPlayerGamepadIndicatorColor(1);
+}
+
+static void led_off_handle3(void)
+{
+	G_ResetPlayerGamepadIndicatorColor(2);
+}
+
+static void led_off_handle4(void)
+{
+	G_ResetPlayerGamepadIndicatorColor(3);
+}
+
 INT32 mousex, mousey;
 INT32 mlooky; // like mousey but with a custom sensitivity for mlook
 
-INT32 mouse2x, mouse2y, mlook2y;
-
 // joystick values are repeated
-INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET],
-joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET];
+INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
 
 // current state of the keys: true if pushed
 UINT8 gamekeydown[NUMINPUTS];
 
 // two key codes (or virtual key) per game control
-INT32 gamecontrol[num_gamecontrols][2];
-INT32 gamecontrolbis[num_gamecontrols][2]; // secondary splitscreen player
-INT32 gamecontrol3[num_gamecontrols][2]; // tertiary splitscreen player
-INT32 gamecontrol4[num_gamecontrols][2]; // quarternary splitscreen player
+INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2];
 
 typedef struct
 {
@@ -59,7 +130,6 @@ typedef struct
 } dclick_t;
 static dclick_t mousedclicks[MOUSEBUTTONS];
 static dclick_t joydclicks[JOYBUTTONS + JOYHATS*4];
-static dclick_t mouse2dclicks[MOUSEBUTTONS];
 static dclick_t joy2dclicks[JOYBUTTONS + JOYHATS*4];
 static dclick_t joy3dclicks[JOYBUTTONS + JOYHATS*4];
 static dclick_t joy4dclicks[JOYBUTTONS + JOYHATS*4];
@@ -116,40 +186,32 @@ void G_MapEventsToControls(event_t *ev)
 			i = ev->data1;
 			if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on)
 				break;
-			if (ev->data2 != INT32_MAX) joyxmove[i] = ev->data2;
-			if (ev->data3 != INT32_MAX) joyymove[i] = ev->data3;
+			if (ev->data2 != INT32_MAX) joyxmove[0][i] = ev->data2;
+			if (ev->data3 != INT32_MAX) joyymove[0][i] = ev->data3;
 			break;
 
 		case ev_joystick2: // buttons are virtual keys
 			i = ev->data1;
 			if (i >= JOYAXISSET || menuactive)
 				break;
-			if (ev->data2 != INT32_MAX) joy2xmove[i] = ev->data2;
-			if (ev->data3 != INT32_MAX) joy2ymove[i] = ev->data3;
+			if (ev->data2 != INT32_MAX) joyxmove[1][i] = ev->data2;
+			if (ev->data3 != INT32_MAX) joyymove[1][i] = ev->data3;
 			break;
 
 		case ev_joystick3:
 			i = ev->data1;
 			if (i >= JOYAXISSET)
 				break;
-			if (ev->data2 != INT32_MAX) joy3xmove[i] = ev->data2;
-			if (ev->data3 != INT32_MAX) joy3ymove[i] = ev->data3;
+			if (ev->data2 != INT32_MAX) joyxmove[2][i] = ev->data2;
+			if (ev->data3 != INT32_MAX) joyymove[2][i] = ev->data3;
 			break;
 
 		case ev_joystick4:
 			i = ev->data1;
 			if (i >= JOYAXISSET)
 				break;
-			if (ev->data2 != INT32_MAX) joy4xmove[i] = ev->data2;
-			if (ev->data3 != INT32_MAX) joy4ymove[i] = ev->data3;
-			break;
-
-		case ev_mouse2: // buttons are virtual keys
-			if (menuactive || CON_Ready() || chat_on)
-				break;
-			mouse2x = (INT32)(ev->data2*((cv_mousesens2.value*cv_mousesens2.value)/110.0f + 0.1f));
-			mouse2y = (INT32)(ev->data3*((cv_mousesens2.value*cv_mousesens2.value)/110.0f + 0.1f));
-			mlook2y = (INT32)(ev->data3*((cv_mouseysens2.value*cv_mousesens2.value)/110.0f + 0.1f));
+			if (ev->data2 != INT32_MAX) joyxmove[3][i] = ev->data2;
+			if (ev->data3 != INT32_MAX) joyymove[3][i] = ev->data3;
 			break;
 
 		default:
@@ -169,12 +231,6 @@ void G_MapEventsToControls(event_t *ev)
 		gamekeydown[KEY_DBLJOY1+i] = flag;
 	}
 
-	for (i = 0; i < MOUSEBUTTONS; i++)
-	{
-		flag = G_CheckDoubleClick(gamekeydown[KEY_2MOUSE1+i], &mouse2dclicks[i]);
-		gamekeydown[KEY_DBL2MOUSE1+i] = flag;
-	}
-
 	for (i = 0; i < JOYBUTTONS + JOYHATS*4; i++)
 	{
 		flag = G_CheckDoubleClick(gamekeydown[KEY_2JOY1+i], &joy2dclicks[i]);
@@ -194,6 +250,17 @@ void G_MapEventsToControls(event_t *ev)
 	}
 }
 
+void G_ResetControls(void)
+{
+	memset(gamekeydown, 0, NUMINPUTS);
+
+	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));
+}
+
 //
 // General double-click detection routine for any kind of input.
 //
@@ -312,18 +379,8 @@ static keyname_t keynames[] =
 	{KEY_MOUSE1+5,"MOUSE6"},
 	{KEY_MOUSE1+6,"MOUSE7"},
 	{KEY_MOUSE1+7,"MOUSE8"},
-	{KEY_2MOUSE1+0,"SEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2
-	{KEY_2MOUSE1+1,"SEC_MOUSE1"},
-	{KEY_2MOUSE1+2,"SEC_MOUSE3"},
-	{KEY_2MOUSE1+3,"SEC_MOUSE4"},
-	{KEY_2MOUSE1+4,"SEC_MOUSE5"},
-	{KEY_2MOUSE1+5,"SEC_MOUSE6"},
-	{KEY_2MOUSE1+6,"SEC_MOUSE7"},
-	{KEY_2MOUSE1+7,"SEC_MOUSE8"},
 	{KEY_MOUSEWHEELUP, "Wheel 1 UP"},
 	{KEY_MOUSEWHEELDOWN, "Wheel 1 Down"},
-	{KEY_2MOUSEWHEELUP, "Wheel 2 UP"},
-	{KEY_2MOUSEWHEELDOWN, "Wheel 2 Down"},
 
 	{KEY_JOY1+0, "JOY1"},
 	{KEY_JOY1+1, "JOY2"},
@@ -334,7 +391,7 @@ static keyname_t keynames[] =
 	{KEY_JOY1+6, "JOY7"},
 	{KEY_JOY1+7, "JOY8"},
 	{KEY_JOY1+8, "JOY9"},
-	
+
 #if !defined (NOMOREJOYBTN_1S)
 	// we use up to 32 buttons in DirectInput
 	{KEY_JOY1+9, "JOY10"},
@@ -387,14 +444,6 @@ static keyname_t keynames[] =
 	{KEY_DBLMOUSE1+5, "DBLMOUSE6"},
 	{KEY_DBLMOUSE1+6, "DBLMOUSE7"},
 	{KEY_DBLMOUSE1+7, "DBLMOUSE8"},
-	{KEY_DBL2MOUSE1+0, "DBLSEC_MOUSE2"}, // BP: sorry my mouse handler swap button 1 and 2
-	{KEY_DBL2MOUSE1+1, "DBLSEC_MOUSE1"},
-	{KEY_DBL2MOUSE1+2, "DBLSEC_MOUSE3"},
-	{KEY_DBL2MOUSE1+3, "DBLSEC_MOUSE4"},
-	{KEY_DBL2MOUSE1+4, "DBLSEC_MOUSE5"},
-	{KEY_DBL2MOUSE1+5, "DBLSEC_MOUSE6"},
-	{KEY_DBL2MOUSE1+6, "DBLSEC_MOUSE7"},
-	{KEY_DBL2MOUSE1+7, "DBLSEC_MOUSE8"},
 
 	{KEY_DBLJOY1+0, "DBLJOY1"},
 	{KEY_DBLJOY1+1, "DBLJOY2"},
@@ -779,7 +828,6 @@ static keyname_t keynames[] =
 	{KEY_DBL4HAT1+13, "DBLFOR_HATDOWN4"},
 	{KEY_DBL4HAT1+14, "DBLFOR_HATLEFT4"},
 	{KEY_DBL4HAT1+15, "DBLFOR_HATRIGHT4"},
-
 };
 
 static const char *gamecontrolname[num_gamecontrols] =
@@ -813,10 +861,111 @@ static const char *gamecontrolname[num_gamecontrols] =
 	"custom2",
 	"custom3",
 	"director",
+<<<<<<< HEAD
+=======
+	"freecam",
+	"camfloat",
+	"camsink",
+	"strafeleft",
+	"straferight",
+>>>>>>> Saturn-Next
 };
 
 #define NUMKEYNAMES (sizeof (keynames)/sizeof (keyname_t))
 
+#include "k_kart.h"
+
+UINT16 G_GetSkinColor(INT32 playernum)
+{
+	if (gamestate == GS_LEVEL)
+	{
+		player_t *player = &players[displayplayers[playernum]];
+
+		if (player)
+		{
+			// make rgb rainbow vomit when invul or flash blue when grow
+			if ((cv_gamepadled[playernum].value == 2) && player->mo && player->mo->color)
+				return player->mo->color;
+
+			// take actual player skincolour when ingame
+			if (player->skincolor)
+				return player->skincolor;
+		}
+	}
+
+	// otherwise just fallback to whatever the cvar is
+	switch (playernum)
+	{
+		case 0:
+			return cv_playercolor.value;
+		case 1:
+			return cv_playercolor2.value;
+		case 2:
+			return cv_playercolor3.value;
+		case 3:
+			return cv_playercolor4.value;
+		default:
+			return 0;
+	}
+
+	return 0;
+}
+
+void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT16 color)
+{
+	UINT16 skincolor;
+	byteColor_t byte_color;
+
+	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
+
+	if (cv_gamepadled[playernum].value == 0)
+	{
+		return;
+	}
+
+	skincolor = color ? color : G_GetSkinColor(playernum);
+	byte_color = V_GetColor(colortranslations[skincolor][8]).s;
+
+	I_SetGamepadIndicatorColor(playernum, byte_color.red, byte_color.green, byte_color.blue);
+}
+
+static void G_ResetPlayerGamepadIndicatorColor(INT32 playernum)
+{
+	if (cv_gamepadled[playernum].value == 0)
+	{
+		I_SetGamepadIndicatorColor(playernum, 0, 0, 255);
+	}
+	else
+		G_SetPlayerGamepadIndicatorColor(playernum, 0);
+}
+
+static void G_ResetPlayerDeviceRumble(INT32 playernum)
+{
+	I_GamepadRumble(playernum, 0, 0, 0);
+}
+
+void G_ResetAllDeviceRumbles(void)
+{
+	int i;
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		I_GamepadRumble(i, 0, 0, 0);
+	}
+}
+
+void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
+{
+	I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
+
+	if (cv_rumble[playernum].value == 0)
+	{
+		return;
+	}
+
+	I_GamepadRumble(playernum, low_strength, high_strength, duration);
+}
+
 //
 // Detach any keys associated to the given game control
 // - pass the pointer to the gamecontrol table for the player being edited
@@ -828,13 +977,14 @@ void G_ClearControlKeys(INT32 (*setupcontrols)[2], INT32 control)
 
 void G_ClearAllControlKeys(void)
 {
-	INT32 i;
-	for (i = 0; i < num_gamecontrols; i++)
+	INT32 i, k;
+
+	for (k = 0; k < MAXSPLITSCREENPLAYERS; k++)
 	{
-		G_ClearControlKeys(gamecontrol, i);
-		G_ClearControlKeys(gamecontrolbis, i);
-		G_ClearControlKeys(gamecontrol3, i);
-		G_ClearControlKeys(gamecontrol4, i);
+		for (i = 0; i < num_gamecontrols; i++)
+		{
+			G_ClearControlKeys(gamecontrol[k], i);
+		}
 	}
 }
 
@@ -892,158 +1042,131 @@ void G_Controldefault(UINT8 player)
 	if (player == 0 || player == 1)
 	{
 		// Main controls
-		gamecontrol[gc_aimforward ][0] = KEY_UPARROW;
-		gamecontrol[gc_aimbackward][0] = KEY_DOWNARROW;
-		gamecontrol[gc_turnleft   ][0] = KEY_LEFTARROW;
-		gamecontrol[gc_turnright  ][0] = KEY_RIGHTARROW;
-		gamecontrol[gc_accelerate ][0] = 'a';
-		gamecontrol[gc_drift      ][0] = 's';
-		gamecontrol[gc_brake      ][0] = 'd';
-		gamecontrol[gc_fire       ][0] = KEY_SPACE;
-		gamecontrol[gc_lookback   ][0] = KEY_LSHIFT;
+		gamecontrol[0][gc_aimforward ][0] = KEY_UPARROW;
+		gamecontrol[0][gc_aimbackward][0] = KEY_DOWNARROW;
+		gamecontrol[0][gc_turnleft   ][0] = KEY_LEFTARROW;
+		gamecontrol[0][gc_turnright  ][0] = KEY_RIGHTARROW;
+		gamecontrol[0][gc_accelerate ][0] = 'a';
+		gamecontrol[0][gc_drift      ][0] = 's';
+		gamecontrol[0][gc_brake      ][0] = 'd';
+		gamecontrol[0][gc_fire       ][0] = KEY_SPACE;
+		gamecontrol[0][gc_lookback   ][0] = KEY_LSHIFT;
 
-		gamecontrol[gc_accelerate ][1] = KEY_JOY1+0; // A
-		gamecontrol[gc_lookback   ][1] = KEY_JOY1+2; // X
-		gamecontrol[gc_brake      ][1] = KEY_JOY1+1; // B
-		gamecontrol[gc_fire       ][1] = KEY_JOY1+9; // LB
-		gamecontrol[gc_drift      ][1] = KEY_JOY1+10; // RB
+		gamecontrol[0][gc_accelerate ][1] = KEY_JOY1+0; // A
+		gamecontrol[0][gc_lookback   ][1] = KEY_JOY1+2; // X
+		gamecontrol[0][gc_brake      ][1] = KEY_JOY1+1; // B
+		gamecontrol[0][gc_fire       ][1] = KEY_JOY1+9; // LB
+		gamecontrol[0][gc_drift      ][1] = KEY_JOY1+10; // RB
 
 		// Extra controls
-		gamecontrol[gc_pause      ][0] = KEY_PAUSE;
-		gamecontrol[gc_console    ][0] = KEY_CONSOLE;
-		gamecontrol[gc_screenshot ][0] = KEY_F8;
-		gamecontrol[gc_recordgif  ][0] = KEY_F9;
-		gamecontrol[gc_viewpoint  ][0] = KEY_F12;
-		gamecontrol[gc_talkkey    ][0] = 't';
+		gamecontrol[0][gc_pause      ][0] = KEY_PAUSE;
+		gamecontrol[0][gc_console    ][0] = KEY_CONSOLE;
+		gamecontrol[0][gc_screenshot ][0] = KEY_F8;
+		gamecontrol[0][gc_recordgif  ][0] = KEY_F9;
+		gamecontrol[0][gc_viewpoint  ][0] = KEY_F12;
+		gamecontrol[0][gc_talkkey    ][0] = 't';
 		//gamecontrol[gc_teamkey    ][0] = 'y';
-		gamecontrol[gc_scores     ][0] = KEY_TAB;
-		gamecontrol[gc_spectate   ][0] = '\'';
-		gamecontrol[gc_lookup     ][0] = KEY_PGUP;
-		gamecontrol[gc_lookdown   ][0] = KEY_PGDN;
-		gamecontrol[gc_centerview ][0] = KEY_END;
-		gamecontrol[gc_camreset   ][0] = KEY_HOME;
-		gamecontrol[gc_camtoggle  ][0] = KEY_BACKSPACE;
+		gamecontrol[0][gc_scores     ][0] = KEY_TAB;
+		gamecontrol[0][gc_spectate   ][0] = '\'';
+		gamecontrol[0][gc_lookup     ][0] = KEY_PGUP;
+		gamecontrol[0][gc_lookdown   ][0] = KEY_PGDN;
+		gamecontrol[0][gc_centerview ][0] = KEY_END;
+		gamecontrol[0][gc_camreset   ][0] = KEY_HOME;
+		gamecontrol[0][gc_camtoggle  ][0] = KEY_BACKSPACE;
 
-		gamecontrol[gc_viewpoint  ][1] = KEY_JOY1+3; // Y
-		gamecontrol[gc_pause      ][1] = KEY_JOY1+4; // Back
-		gamecontrol[gc_systemmenu ][0] = KEY_JOY1+6; // Start
-		//gamecontrol[gc_camtoggle  ][1] = KEY_HAT1+0; // D-Pad Up
-		//gamecontrol[gc_screenshot ][1] = KEY_HAT1+1; // D-Pad Down // absolutely fucking NOT
-		gamecontrol[gc_talkkey    ][1] = KEY_HAT1+1; // D-Pad Down
-		gamecontrol[gc_scores     ][1] = KEY_HAT1+0; // D-Pad Up
+		gamecontrol[0][gc_viewpoint  ][1] = KEY_JOY1+3; // Y
+		gamecontrol[0][gc_pause      ][1] = KEY_JOY1+4; // Back
+		gamecontrol[0][gc_systemmenu ][0] = KEY_JOY1+6; // Start
+		//gamecontrol[0][gc_camtoggle  ][1] = KEY_HAT1+0; // D-Pad Up
+		//gamecontrol[0][gc_screenshot ][1] = KEY_HAT1+1; // D-Pad Down // absolutely fucking NOT
+		gamecontrol[0][gc_talkkey    ][1] = KEY_HAT1+1; // D-Pad Down
+		gamecontrol[0][gc_scores     ][1] = KEY_HAT1+0; // D-Pad Up
 	}
 
 	if (player == 0 || player == 2)
 	{
 		// Player 2 controls
-		gamecontrolbis[gc_accelerate ][0] = KEY_2JOY1+0; // A
-		gamecontrolbis[gc_lookback   ][0] = KEY_2JOY1+2; // X
-		gamecontrolbis[gc_brake      ][0] = KEY_2JOY1+1; // B
-		gamecontrolbis[gc_fire       ][0] = KEY_2JOY1+9; // LB
-		gamecontrolbis[gc_drift      ][0] = KEY_2JOY1+10; // RB
+		gamecontrol[1][gc_accelerate ][0] = KEY_2JOY1+0; // A
+		gamecontrol[1][gc_lookback   ][0] = KEY_2JOY1+2; // X
+		gamecontrol[1][gc_brake      ][0] = KEY_2JOY1+1; // B
+		gamecontrol[1][gc_fire       ][0] = KEY_2JOY1+9; // LB
+		gamecontrol[1][gc_drift      ][0] = KEY_2JOY1+10; // RB
 	}
 
 	if (player == 0 || player == 3)
 	{
 		// Player 3 controls
-		gamecontrol3[gc_accelerate ][0] = KEY_3JOY1+0; // A
-		gamecontrol3[gc_lookback   ][0] = KEY_3JOY1+2; // X
-		gamecontrol3[gc_brake      ][0] = KEY_3JOY1+1; // B
-		gamecontrol3[gc_fire       ][0] = KEY_3JOY1+9; // LB
-		gamecontrol3[gc_drift      ][0] = KEY_3JOY1+10; // RB
+		gamecontrol[2][gc_accelerate ][0] = KEY_3JOY1+0; // A
+		gamecontrol[2][gc_lookback   ][0] = KEY_3JOY1+2; // X
+		gamecontrol[2][gc_brake      ][0] = KEY_3JOY1+1; // B
+		gamecontrol[2][gc_fire       ][0] = KEY_3JOY1+9; // LB
+		gamecontrol[2][gc_drift      ][0] = KEY_3JOY1+10; // RB
 	}
 
 	if (player == 0 || player == 4)
 	{
 		// Player 4 controls
-		gamecontrol4[gc_accelerate ][0] = KEY_4JOY1+0; // A
-		gamecontrol4[gc_lookback   ][0] = KEY_4JOY1+2; // X
-		gamecontrol4[gc_brake      ][0] = KEY_4JOY1+1; // B
-		gamecontrol4[gc_fire       ][0] = KEY_4JOY1+9; // LB
-		gamecontrol4[gc_drift      ][0] = KEY_4JOY1+10; // RB
+		gamecontrol[3][gc_accelerate ][0] = KEY_4JOY1+0; // A
+		gamecontrol[3][gc_lookback   ][0] = KEY_4JOY1+2; // X
+		gamecontrol[3][gc_brake      ][0] = KEY_4JOY1+1; // B
+		gamecontrol[3][gc_fire       ][0] = KEY_4JOY1+9; // LB
+		gamecontrol[3][gc_drift      ][0] = KEY_4JOY1+10; // RB
 	}
 }
 
 void G_SaveKeySetting(FILE *f)
 {
-	INT32 i;
+	INT32 i, k;
 
-	for (i = 1; i < num_gamecontrols; i++)
+	static const char *controltext[MAXSPLITSCREENPLAYERS] = {
+		"setcontrol",
+		"setcontrol2",
+		"setcontrol3",
+		"setcontrol4"
+	};
+
+	for (k = 0; k < MAXSPLITSCREENPLAYERS; k++)
 	{
-		fprintf(f, "setcontrol \"%s\" \"%s\"", gamecontrolname[i],
-			G_KeynumToString(gamecontrol[i][0]));
+		for (i = 1; i < num_gamecontrols; i++)
+		{
+			fprintf(f, "%s \"%s\" \"%s\"", controltext[k], gamecontrolname[i],
+					G_KeynumToString(gamecontrol[k][i][0]));
 
-		if (gamecontrol[i][1])
-			fprintf(f, " \"%s\"\n", G_KeynumToString(gamecontrol[i][1]));
-		else
-			fprintf(f, "\n");
-	}
-
-	for (i = 1; i < num_gamecontrols; i++)
-	{
-		fprintf(f, "setcontrol2 \"%s\" \"%s\"", gamecontrolname[i],
-			G_KeynumToString(gamecontrolbis[i][0]));
-
-		if (gamecontrolbis[i][1])
-			fprintf(f, " \"%s\"\n", G_KeynumToString(gamecontrolbis[i][1]));
-		else
-			fprintf(f, "\n");
-	}
-
-	for (i = 1; i < num_gamecontrols; i++)
-	{
-		fprintf(f, "setcontrol3 \"%s\" \"%s\"", gamecontrolname[i],
-			G_KeynumToString(gamecontrol3[i][0]));
-
-		if (gamecontrol3[i][1])
-			fprintf(f, " \"%s\"\n", G_KeynumToString(gamecontrol3[i][1]));
-		else
-			fprintf(f, "\n");
-	}
-
-	for (i = 1; i < num_gamecontrols; i++)
-	{
-		fprintf(f, "setcontrol4 \"%s\" \"%s\"", gamecontrolname[i],
-			G_KeynumToString(gamecontrol4[i][0]));
-
-		if (gamecontrol4[i][1])
-			fprintf(f, " \"%s\"\n", G_KeynumToString(gamecontrol4[i][1]));
-		else
-			fprintf(f, "\n");
+			if (gamecontrol[k][i][1])
+				fprintf(f, " \"%s\"\n", G_KeynumToString(gamecontrol[k][i][1]));
+			else
+				fprintf(f, "\n");
+		}
 	}
 }
 
 INT32 G_CheckDoubleUsage(INT32 keynum, boolean modify)
 {
 	INT32 result = gc_null;
+
 	if (cv_controlperkey.value == 1)
 	{
-		INT32 i, j;
-		for (i = 0; i < num_gamecontrols; i++)
+		INT32 i, j, k;
+
+		for (k = 0; k < MAXSPLITSCREENPLAYERS; k++)
 		{
-			for (j = 0; j < 2; j++)
+			for (i = 0; i < num_gamecontrols; i++)
 			{
-				if (gamecontrol[i][j] == keynum) {
-					result = i;
-					if (modify) gamecontrol[i][j] = KEY_NULL;
+				for (j = 0; j < 2; j++)
+				{
+					if (gamecontrol[k][i][j] == keynum)
+					{
+						result = i;
+						if (modify) gamecontrol[k][i][j] = KEY_NULL;
+					}
+
+					if (result && !modify)
+						return result;
 				}
-				if (gamecontrolbis[i][j] == keynum) {
-					result = i;
-					if (modify) gamecontrolbis[i][j] = KEY_NULL;
-				}
-				if (gamecontrol3[i][j] == keynum) {
-					result = i;
-					if (modify) gamecontrol3[i][j] = KEY_NULL;
-				}
-				if (gamecontrol4[i][j] == keynum) {
-					result = i;
-					if (modify) gamecontrol4[i][j] = KEY_NULL;
-				}
-				if (result && !modify)
-					return result;
 			}
 		}
 	}
+
 	return result;
 }
 
@@ -1197,11 +1320,11 @@ static void setcontrol(INT32 (*gc)[2])
 	INT32 player;
 	boolean nestedoverride = false;
 
-	if ((void*)gc == (void*)&gamecontrol4)
+	if ((void*)gc == (void*)&gamecontrol[3])
 		player = 3;
-	else if ((void*)gc == (void*)&gamecontrol3)
+	else if ((void*)gc == (void*)&gamecontrol[2])
 		player = 2;
-	else if ((void*)gc == (void*)&gamecontrolbis)
+	else if ((void*)gc == (void*)&gamecontrol[1])
 		player = 1;
 	else
 		player = 0;
@@ -1264,7 +1387,7 @@ void Command_Setcontrol_f(void)
 		return;
 	}
 
-	setcontrol(gamecontrol);
+	setcontrol(gamecontrol[0]);
 }
 
 void Command_Setcontrol2_f(void)
@@ -1279,7 +1402,7 @@ void Command_Setcontrol2_f(void)
 		return;
 	}
 
-	setcontrol(gamecontrolbis);
+	setcontrol(gamecontrol[1]);
 }
 
 void Command_Setcontrol3_f(void)
@@ -1294,7 +1417,7 @@ void Command_Setcontrol3_f(void)
 		return;
 	}
 
-	setcontrol(gamecontrol3);
+	setcontrol(gamecontrol[2]);
 }
 
 void Command_Setcontrol4_f(void)
@@ -1309,5 +1432,5 @@ void Command_Setcontrol4_f(void)
 		return;
 	}
 
-	setcontrol(gamecontrol4);
+	setcontrol(gamecontrol[3]);
 }
diff --git a/src/g_input.h b/src/g_input.h
index 635e1f64b..2cdfa427e 100644
--- a/src/g_input.h
+++ b/src/g_input.h
@@ -15,6 +15,7 @@
 #define __G_INPUT__
 
 #include "d_event.h"
+#include "doomstat.h"
 #include "keys.h"
 #include "command.h"
 
@@ -65,7 +66,7 @@ typedef enum
 	KEY_2MOUSEWHEELUP = KEY_MOUSEWHEELDOWN + 1,
 	KEY_2MOUSEWHEELDOWN = KEY_2MOUSEWHEELUP + 1,
 
-	NUMINPUTS = KEY_2MOUSEWHEELDOWN + 1,
+	NUMINPUTS = KEY_2MOUSEWHEELDOWN + 1, // FIXME: all the mouse 2 stuff should be removed, but it screws up mappings somehow
 } key_input_e;
 
 typedef enum
@@ -99,39 +100,50 @@ typedef enum
 	gc_custom2, // Lua scriptable
 	gc_custom3, // Lua scriptable
 	gc_director,
+<<<<<<< HEAD
+=======
+	gc_freecam, // Toggle for freecam while ingame
+	gc_camfloat, // alternative button for raising cam
+	gc_camsink, // alternative button for sinking
+	gc_strafeleft,
+	gc_straferight,
+>>>>>>> Saturn-Next
 	num_gamecontrols
 } gamecontrols_e;
 
 // mouse values are used once
 extern consvar_t cv_mousesens, cv_mouseysens;
-extern consvar_t cv_mousesens2, cv_mouseysens2;
 extern consvar_t cv_controlperkey, cv_turnsmooth;
+extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
 
 extern INT32 mousex, mousey;
 extern INT32 mlooky; //mousey with mlookSensitivity
-extern INT32 mouse2x, mouse2y, mlook2y;
 
-extern INT32 joyxmove[JOYAXISSET], joyymove[JOYAXISSET], joy2xmove[JOYAXISSET], joy2ymove[JOYAXISSET],
-	joy3xmove[JOYAXISSET], joy3ymove[JOYAXISSET], joy4xmove[JOYAXISSET], joy4ymove[JOYAXISSET];
+extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
 
 // current state of the keys: true if pushed
 extern UINT8 gamekeydown[NUMINPUTS];
 
 // two key codes (or virtual key) per game control
-extern INT32 gamecontrol[num_gamecontrols][2];
-extern INT32 gamecontrolbis[num_gamecontrols][2]; // secondary splitscreen player
-extern INT32 gamecontrol3[num_gamecontrols][2];
-extern INT32 gamecontrol4[num_gamecontrols][2];
-#define PLAYER1INPUTDOWN(gc) (gamekeydown[gamecontrol[gc][0]] || gamekeydown[gamecontrol[gc][1]])
-#define PLAYER2INPUTDOWN(gc) (gamekeydown[gamecontrolbis[gc][0]] || gamekeydown[gamecontrolbis[gc][1]])
-#define PLAYER3INPUTDOWN(gc) (gamekeydown[gamecontrol3[gc][0]] || gamekeydown[gamecontrol3[gc][1]])
-#define PLAYER4INPUTDOWN(gc) (gamekeydown[gamecontrol4[gc][0]] || gamekeydown[gamecontrol4[gc][1]])
+extern INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2];
+
+#define PLAYER1INPUTDOWN(gc) (gamekeydown[gamecontrol[0][gc][0]] || gamekeydown[gamecontrol[0][gc][1]])
+#define PLAYER2INPUTDOWN(gc) (gamekeydown[gamecontrol[1][gc][0]] || gamekeydown[gamecontrol[1][gc][1]])
+#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
 
+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);
+
 // remaps the input event to a game control.
 void G_MapEventsToControls(event_t *ev);
+void G_ResetControls(void);
 
 // returns the name of a key
 const char *G_KeynumToString(INT32 keynum);
diff --git a/src/hardware/Sourcefile b/src/hardware/Sourcefile
new file mode 100644
index 000000000..e66482c3d
--- /dev/null
+++ b/src/hardware/Sourcefile
@@ -0,0 +1,14 @@
+hw_bsp.c
+hw_draw.c
+hw_main.cpp
+hw_clip.c
+hw_md2.c
+hw_cache.c
+hw_md2load.c
+hw_md3load.c
+hw_model.c
+hw_portal.c
+hw_batching.c
+hw_shaders.c
+u_list.c
+r_opengl/r_opengl.c
diff --git a/src/hardware/hw3dsdrv.h b/src/hardware/hw3dsdrv.h
deleted file mode 100644
index 8811d4546..000000000
--- a/src/hardware/hw3dsdrv.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2001 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-/// \file
-/// \brief 3D sound import/export prototypes for low-level hardware interface
-
-#ifndef __HW_3DS_DRV_H__
-#define __HW_3DS_DRV_H__
-
-// Use standart hardware API
-#include "hw_dll.h"
-#include "hws_data.h"
-
-#if defined (HAVE_SDL) || !defined (HWD)
-EXPORT void HWRAPI(Shutdown) (void);
-#endif
-
-// Use standart Init and Shutdown functions
-
-EXPORT INT32    HWRAPI (Startup) (I_Error_t FatalErrorFunction, snddev_t *snd_dev);
-EXPORT u_int  HWRAPI (AddSfx) (sfx_data_t *sfx);
-EXPORT INT32    HWRAPI (AddSource) (source3D_data_t *src, u_int sfxhandle);
-EXPORT INT32    HWRAPI (StartSource) (INT32 handle);
-EXPORT void   HWRAPI (StopSource) (INT32 handle);
-EXPORT INT32    HWRAPI (GetHW3DSVersion) (void);
-EXPORT void   HWRAPI (BeginFrameUpdate) (void);
-EXPORT void   HWRAPI (EndFrameUpdate) (void);
-EXPORT INT32    HWRAPI (IsPlaying) (INT32 handle);
-EXPORT void   HWRAPI (UpdateListener) (listener_data_t *data, INT32 num);
-EXPORT void   HWRAPI (UpdateSourceParms) (INT32 handle, INT32 vol, INT32 sep);
-EXPORT void   HWRAPI (SetGlobalSfxVolume) (INT32 volume);
-EXPORT INT32    HWRAPI (SetCone) (INT32 handle, cone_def_t *cone_def);
-EXPORT void   HWRAPI (Update3DSource) (INT32 handle, source3D_pos_t *data);
-EXPORT INT32    HWRAPI (ReloadSource) (INT32 handle, u_int sfxhandle);
-EXPORT void   HWRAPI (KillSource) (INT32 handle);
-EXPORT void   HWRAPI (KillSfx) (u_int sfxhandle);
-EXPORT void   HWRAPI (GetHW3DSTitle) (char *buf, size_t size);
-
-
-#if !defined (_CREATE_DLL_)
-
-struct hardware3ds_s
-{
-	Startup             pfnStartup;
-	AddSfx              pfnAddSfx;
-	AddSource           pfnAddSource;
-	StartSource         pfnStartSource;
-	StopSource          pfnStopSource;
-	GetHW3DSVersion     pfnGetHW3DSVersion;
-	BeginFrameUpdate    pfnBeginFrameUpdate;
-	EndFrameUpdate      pfnEndFrameUpdate;
-	IsPlaying           pfnIsPlaying;
-	UpdateListener      pfnUpdateListener;
-	UpdateSourceParms   pfnUpdateSourceParms;
-	SetGlobalSfxVolume  pfnSetGlobalSfxVolume;
-	SetCone             pfnSetCone;
-	Update3DSource      pfnUpdate3DSource;
-	ReloadSource        pfnReloadSource;
-	KillSource          pfnKillSource;
-	KillSfx             pfnKillSfx;
-	Shutdown            pfnShutdown;
-	GetHW3DSTitle       pfnGetHW3DSTitle;
-};
-
-extern struct hardware3ds_s hw3ds_driver;
-
-#define HW3DS hw3ds_driver
-
-
-#endif  // _CREATE_DLL_
-
-#endif // __HW_3DS_DRV_H__
diff --git a/src/hardware/hw3sound.c b/src/hardware/hw3sound.c
deleted file mode 100644
index 2594a5df9..000000000
--- a/src/hardware/hw3sound.c
+++ /dev/null
@@ -1,996 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2001 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//-----------------------------------------------------------------------------
-/// \file
-/// \brief Hardware 3D sound general code
-
-#include "../doomdef.h"
-
-#ifdef HW3SOUND
-
-#include "../i_sound.h"
-#include "../s_sound.h"
-#include "../w_wad.h"
-#include "../z_zone.h"
-#include "../g_game.h"
-#include "../tables.h"
-#include "../sounds.h"
-#include "../r_main.h"
-#include "../r_things.h"
-#include "../m_random.h"
-#include "../p_local.h"
-#include "hw3dsdrv.h"
-#include "hw3sound.h"
-
-#define ANGLE2DEG(x) (((double)(x)) / ((double)ANGLE_45/45))
-#define NORM_PITCH 128
-#define NORM_PRIORITY 64
-#define NORM_SEP 128
-#if 1
-#define TPS(x) (x)
-#else //Alam_GBC: MPS, not MPF!
-#define TPS(x) ((float)(x)/(float)TICRATE)
-#endif
-
-struct hardware3ds_s hw3ds_driver;
-
-
-typedef struct source_s
-{
-	sfxinfo_t       *sfxinfo;
-	const void      *origin;
-	INT32           handle;     // Internal source handle
-	channel_type_t  type;       // Sound type (attack, scream, etc)
-} source_t;
-
-
-typedef struct ambient_sdata_s
-{
-	source3D_data_t left;
-	source3D_data_t right;
-} ambient_sdata_t;
-
-
-typedef struct ambient_source_s
-{
-	source_t    left;
-	source_t    right;
-} ambient_source_t;
-
-// Static sources
-// This sources always creates
-static source_t p_attack_source;        // Player attack source
-static source_t p_attack_source2;        // Player2 attack source
-static source_t p_scream_source;        // Player scream source
-static source_t p_scream_source2;        // Player2 scream source
-
-
-static ambient_source_t ambient_source; // Ambinet sound sources
-
-//  abuse???
-//static source3D_data_t  p_attack_sdata; // ?? Now just holds precalculated player attack source data
-//static source3D_data_t  p_default_sdata;// ?? ---- // ---- // ---- // ---- player scream source data
-
-static ambient_sdata_t  ambient_sdata;  // Precalculated datas of an ambient sound sources
-
-// Stack of dynamic sources
-static source_t      *sources       = NULL;     // Much like original channels
-static INT32           num_sources    = 0;
-
-// Current mode of 3D sound system
-// Default is original (stereo) mode
-INT32                  hws_mode       = HWS_DEFAULT_MODE;
-
-//=============================================================================
-void HW3S_SetSourcesNum(void)
-{
-	INT32 i;
-
-	// Allocating the internal channels for mixing
-	// (the maximum number of sounds rendered
-	// simultaneously) within zone memory.
-	if (sources)
-		HW3S_StopSounds();
-	Z_Free(sources);
-
-	if (cv_numChannels.value <= STATIC_SOURCES_NUM)
-		I_Error("HW3S_SetSourcesNum: Number of sound sources cannot be less than %d\n", STATIC_SOURCES_NUM + 1);
-
-	num_sources = cv_numChannels.value - STATIC_SOURCES_NUM;
-
-	sources = (source_t *) Z_Malloc(num_sources * sizeof (*sources), PU_STATIC, 0);
-
-	// Free all channels for use
-	for (i = 0; i < num_sources; i++)
-	{
-		sources[i].sfxinfo = NULL;
-		sources[i].type = CT_NORMAL;
-		sources[i].handle = -1;
-	}
-}
-
-
-//=============================================================================
-static void HW3S_KillSource(INT32 snum)
-{
-	source_t *  s = &sources[snum];
-
-	if (s->sfxinfo)
-	{
-		HW3DS.pfnStopSource(s->handle);
-		HW3DS.pfnKillSource(s->handle);
-		s->handle = -1;
-		s->sfxinfo->usefulness--;
-		s->origin = NULL;
-		s->sfxinfo = NULL;
-	}
-}
-
-
-//=============================================================================
-/*
-static void HW3S_StopSource(INT32 snum)
-{
-	source_t * s = &sources[snum];
-
-	if (s->sfxinfo)
-	{
-		// stop the sound playing
-		HW3DS.pfnStopSource(s->handle);
-	}
-}
-*/
-
-
-//=============================================================================
-void HW3S_StopSound(void *origin)
-{
-	INT32 snum;
-
-	for (snum = 0; snum < num_sources; snum++)
-	{
-		if (sources[snum].sfxinfo && sources[snum].origin == origin)
-		{
-			HW3S_KillSource(snum);
-			break;
-		}
-	}
-}
-
-void HW3S_StopSoundByID(void *origin, sfxenum_t sfx_id)
-{
-	INT32 snum;
-
-	for (snum = 0; snum < num_sources; snum++)
-	{
-		if (sources[snum].sfxinfo == &S_sfx[sfx_id] && sources[snum].origin == origin)
-		{
-			HW3S_KillSource(snum);
-			break;
-		}
-	}
-}
-
-void HW3S_StopSoundByNum(sfxenum_t sfxnum)
-{
-	INT32 snum;
-
-	for (snum = 0; snum < num_sources; snum++)
-	{
-		if (sources[snum].sfxinfo == &S_sfx[sfxnum])
-		{
-			HW3S_KillSource(snum);
-			break;
-		}
-	}
-}
-
-//=============================================================================
-void HW3S_StopSounds(void)
-{
-	INT32 snum;
-
-	// kill all playing sounds at start of level
-	//  (trust me - a good idea)
-	for (snum = 0; snum < num_sources; snum++)
-		if (sources[snum].sfxinfo)
-			HW3S_KillSource(snum);
-
-	// Also stop all static sources
-	HW3DS.pfnStopSource(p_attack_source.handle);
-	HW3DS.pfnStopSource(p_attack_source2.handle);
-	HW3DS.pfnStopSource(p_scream_source.handle);
-	HW3DS.pfnStopSource(p_scream_source2.handle);
-	HW3DS.pfnStopSource(ambient_source.left.handle);
-	HW3DS.pfnStopSource(ambient_source.right.handle);
-}
-
-
-//=============================================================================
-static INT32 HW3S_GetSource(const void *origin, sfxinfo_t *sfxinfo, boolean splitsound)
-{
-	//
-	//   If none available, return -1.  Otherwise source #.
-	//   source number to use
-
-	INT32         snum;
-	source_t *  src;
-	INT32 sep = NORM_SEP, pitch = NORM_PITCH, volume = 255;
-
-	(void)splitsound;
-
-	// Find an open source
-	for (snum = 0, src = sources; snum < num_sources; src++, snum++)
-	{
-		if (!src->sfxinfo)
-			break;
-
-#if 0
-		if (origin && src->origin ==  origin)
-		{
-			HW3S_KillSource(snum);
-			break;
-		}
-#endif
-	}
-
-#if 0
-	// Check to see if it is audible
-	if (origin && origin != listenmobj)
-	{
-		INT32 rc;
-		rc = S_AdjustSoundParams(listenmobj, origin, &volume, &sep, &pitch, sfxinfo);
-		if (!rc)
-			return -1;
-	}
-#else
-	(void)origin;
-	(void)pitch;
-	(void)volume;
-	(void)sep;
-#endif
-
-	// None available
-	if (snum == num_sources)
-	{
-		// Look for lower priority
-		for (snum = 0, src = sources; snum < num_sources; src++, snum++)
-			if (src->sfxinfo->priority <= sfxinfo->priority)
-				break;
-
-		if (snum == num_sources)
-		{
-			// No lower priority. Sorry, Charlie.
-			return -1;
-		}
-		else
-		{
-			// Otherwise, kick out lower priority
-			HW3S_KillSource(snum);
-		}
-	}
-	return snum;
-}
-
-
-//=============================================================================
-static void HW3S_FillSourceParameters
-                              (const mobj_t     *origin,
-                               source3D_data_t  *data,
-                               channel_type_t   c_type)
-{
-	fixed_t x = 0, y = 0, z = 0;
-
-	data->max_distance = MAX_DISTANCE;
-	data->min_distance = MIN_DISTANCE;
-
-	if (origin && origin != players[displayplayers[0]].mo)
-	{
-		data->head_relative = false;
-
-		data->pos.momx = TPS(FIXED_TO_FLOAT(origin->momx));
-		data->pos.momy = TPS(FIXED_TO_FLOAT(origin->momy));
-		data->pos.momz = TPS(FIXED_TO_FLOAT(origin->momz));
-
-		x = origin->x;
-		y = origin->y;
-		z = origin->z;
-
-		if (c_type == CT_ATTACK)
-		{
-			const angle_t an = origin->angle >> ANGLETOFINESHIFT;
-			x += FixedMul(16*FRACUNIT, FINECOSINE(an));
-			y += FixedMul(16*FRACUNIT, FINESINE(an));
-			z += origin->height >> 1;
-		}
-
-		else if (c_type == CT_SCREAM)
-			z += origin->height - (5 * FRACUNIT);
-	}
-	else
-	{
-		data->head_relative = true;
-
-		data->pos.momx = 0.0f;
-		data->pos.momy = 0.0f;
-		data->pos.momz = 0.0f;
-	}
-	data->pos.x = FIXED_TO_FLOAT(x);
-	data->pos.y = FIXED_TO_FLOAT(y);
-	data->pos.z = FIXED_TO_FLOAT(z);
-}
-
-#define HEADER_SIZE 8
-//==============================================================
-/*
-static void make_outphase_sfx(void *dest, void *src, INT32 size)
-{
-	SINT8    *s = (SINT8 *)src + HEADER_SIZE, *d = (SINT8 *)dest + HEADER_SIZE;
-
-	M_Memcpy(dest, src, HEADER_SIZE);
-	size -= HEADER_SIZE;
-
-	while (size--)
-		*d++ = -(*s++);
-}
-*/
-
-//INT32 HW3S_Start3DSound(const void *origin, source3D_data_t *source_parm, cone_def_t *cone_parm, channel_type_t channel, INT32 sfx_id, INT32 vol, INT32 pitch);
-//=============================================================================
-INT32 HW3S_I_StartSound(const void *origin_p, source3D_data_t *source_parm, channel_type_t c_type, sfxenum_t sfx_id, INT32 volume, INT32 pitch, INT32 sep)
-{
-	sfxinfo_t       *sfx;
-	const mobj_t    *origin = (const mobj_t *)origin_p;
-	source3D_data_t source3d_data;
-	INT32             s_num = 0;
-	source_t        *source = NULL;
-	mobj_t *listenmobj = players[displayplayers[0]].mo; // TODO: Kart 4P does not support sounds properly here
-	mobj_t *listenmobj2 = NULL;
-
-	if (splitscreen) listenmobj2 = players[displayplayers[1]].mo;
-
-	if (sound_disabled)
-		return -1;
-
-	sfx = &S_sfx[sfx_id];
-
-	if (sfx->skinsound!=-1 && origin && origin->skin)
-	{
-		// it redirect player sound to the sound in the skin table
-		sfx_id = ((skin_t *)origin->skin)->soundsid[sfx->skinsound];
-		sfx    = &S_sfx[sfx_id];
-	}
-
-	if (!sfx->data)
-		sfx->data = HW3S_GetSfx(sfx);
-
-	// judgecutor 08-16-2002
-	// Sound pitching for both Doom and Heretic
-#if 0
-	if (cv_rndsoundpitch.value)
-	{
-		/*if (gamemode != heretic)
-		{
-			if (sfx_id >= sfx_sawup && sfx_id <= sfx_sawhit)
-				pitch += 8 - (M_RandomByte()&15);
-			else if (sfx_id != sfx_itemup && sfx_id != sfx_tink)
-				pitch += 16 - (M_RandomByte()&31);
-		}
-		else*/
-			pitch = 128 + (M_RandomByte() & 7) - (M_RandomByte() & 7);
-	}
-#endif
-
-	if (pitch < 0)
-		pitch = NORMAL_PITCH;
-
-	if (pitch > 255)
-		pitch = 255;
-
-	if (sep < 0)
-		sep = 128;
-
-	if (splitscreen && listenmobj2) // Copy the sound for the split player
-	{
-		if (c_type != CT_NORMAL && origin && (origin == listenmobj2))
-		{
-			if (c_type == CT_ATTACK)
-			{
-				if (origin == listenmobj2)
-					source = &p_attack_source;
-				else
-					source = &p_attack_source2;
-			}
-			else
-			{
-				if (origin == listenmobj2)
-					source = &p_scream_source;
-				else
-					source = &p_scream_source2;
-			}
-
-			if (source->sfxinfo != sfx)
-			{
-				HW3DS.pfnStopSource(source->handle);
-				source->handle = HW3DS.pfnReloadSource(source->handle, sfx->volume);
-				//I_OutputMsg("PlayerSound data reloaded\n");
-			}
-		}
-		else if (c_type == CT_AMBIENT)
-		{
-	//        sfx_data_t  outphased_sfx;
-
-			if (ambient_source.left.sfxinfo != sfx)
-			{
-				HW3DS.pfnStopSource(ambient_source.left.handle);
-				HW3DS.pfnStopSource(ambient_source.right.handle);
-
-				// judgecutor:
-				// Outphased sfx's temporarily not used!!!
-	/*
-					outphased_sfx.data = Z_Malloc(sfx_data.length, PU_STATIC, 0);
-					make_outphase_sfx(outphased_sfx.data, sfx_data.data, sfx_data.length);
-					outphased_sfx.length = sfx_data.length;
-					outphased_sfx.id = sfx_data.id;
-	*/
-				ambient_source.left.handle = HW3DS.pfnReloadSource(ambient_source.left.handle, (u_int)sfx->length);
-				//ambient_source.right.handle = HW3DS.pfnReloadSource(ambient_source.right.handle, &outphased_sfx);
-				ambient_source.right.handle = HW3DS.pfnReloadSource(ambient_source.right.handle, (u_int)sfx->length);
-				ambient_source.left.sfxinfo = ambient_source.right.sfxinfo = sfx;
-				//Z_Free(outphased_sfx.data);
-			}
-
-			HW3DS.pfnUpdateSourceParms(ambient_source.left.handle, volume, -1);
-			HW3DS.pfnUpdateSourceParms(ambient_source.right.handle, volume, -1);
-
-			if (sfx->usefulness++ < 0)
-				sfx->usefulness = -1;
-
-			// Ambient sound is special case
-			HW3DS.pfnStartSource(ambient_source.left.handle);
-			HW3DS.pfnStartSource(ambient_source.right.handle);
-		}
-		else
-		{
-			s_num = HW3S_GetSource(origin, sfx, true);
-
-			if (s_num  < 0)
-			{
-				//I_OutputMsg("No free source, aborting\n");
-				return -1;
-			}
-
-			source = &sources[s_num];
-
-			if (origin && c_type == CT_NORMAL)
-			{
-				if (!source_parm)
-				{
-					source_parm = &source3d_data;
-					source3d_data.permanent = 0;
-					HW3S_FillSourceParameters(origin, source_parm, c_type);
-				}
-
-				source->handle = HW3DS.pfnAddSource(source_parm, (u_int)sfx->length);
-			}
-			else
-				source->handle = HW3DS.pfnAddSource(NULL, (u_int)sfx->length);
-		}
-
-		// increase the usefulness
-		if (sfx->usefulness++ < 0)
-			sfx->usefulness = -1;
-
-		source->sfxinfo = sfx;
-		source->origin = origin;
-		HW3DS.pfnStartSource(source->handle);
-	}
-
-	if (c_type != CT_NORMAL && origin && (origin == listenmobj))
-	{
-		if (c_type == CT_ATTACK)
-		{
-			if (origin == listenmobj)
-				source = &p_attack_source;
-			else
-				source = &p_attack_source2;
-		}
-		else
-		{
-			if (origin == listenmobj)
-				source = &p_scream_source;
-			else
-				source = &p_scream_source2;
-		}
-
-		if (source->sfxinfo != sfx)
-		{
-			HW3DS.pfnStopSource(source->handle);
-			source->handle = HW3DS.pfnReloadSource(source->handle, sfx->volume);
-			//I_OutputMsg("PlayerSound data reloaded\n");
-		}
-	}
-	else if (c_type == CT_AMBIENT)
-	{
-//        sfx_data_t  outphased_sfx;
-
-		if (ambient_source.left.sfxinfo != sfx)
-		{
-			HW3DS.pfnStopSource(ambient_source.left.handle);
-			HW3DS.pfnStopSource(ambient_source.right.handle);
-
-			// judgecutor:
-			// Outphased sfx's temporarily not used!!!
-/*
-				outphased_sfx.data = Z_Malloc(sfx_data.length, PU_STATIC, 0);
-				make_outphase_sfx(outphased_sfx.data, sfx_data.data, sfx_data.length);
-				outphased_sfx.length = sfx_data.length;
-				outphased_sfx.id = sfx_data.id;
-*/
-			ambient_source.left.handle = HW3DS.pfnReloadSource(ambient_source.left.handle, (u_int)sfx->length);
-			//ambient_source.right.handle = HW3DS.pfnReloadSource(ambient_source.right.handle, &outphased_sfx);
-			ambient_source.right.handle = HW3DS.pfnReloadSource(ambient_source.right.handle, (u_int)sfx->length);
-			ambient_source.left.sfxinfo = ambient_source.right.sfxinfo = sfx;
-			//Z_Free(outphased_sfx.data);
-		}
-
-		HW3DS.pfnUpdateSourceParms(ambient_source.left.handle, volume, -1);
-		HW3DS.pfnUpdateSourceParms(ambient_source.right.handle, volume, -1);
-
-		if (sfx->usefulness++ < 0)
-			sfx->usefulness = -1;
-
-		// Ambient sound is special case
-		HW3DS.pfnStartSource(ambient_source.left.handle);
-		HW3DS.pfnStartSource(ambient_source.right.handle);
-		return -1;
-	}
-	else
-	{
-		s_num = HW3S_GetSource(origin, sfx, false);
-
-		if (s_num  < 0)
-		{
-			//I_OutputMsg("No free source, aborting\n");
-			return -1;
-		}
-
-		source = &sources[s_num];
-
-		if (origin && c_type == CT_NORMAL)
-		{
-			if (!source_parm)
-			{
-				source_parm = &source3d_data;
-				source3d_data.permanent = 0;
-				HW3S_FillSourceParameters(origin, source_parm, c_type);
-			}
-
-			source->handle = HW3DS.pfnAddSource(source_parm, (u_int)sfx->length);
-		}
-		else
-			source->handle = HW3DS.pfnAddSource(NULL, (u_int)sfx->length);
-
-	}
-
-	// increase the usefulness
-	if (sfx->usefulness++ < 0)
-		sfx->usefulness = -1;
-
-	source->sfxinfo = sfx;
-	source->origin = origin;
-	HW3DS.pfnStartSource(source->handle);
-	return s_num;
-
-}
-
-
-// Start normal sound
-//=============================================================================
-void HW3S_StartSound(const void *origin, sfxenum_t sfx_id)
-{
-	HW3S_I_StartSound(origin, NULL, CT_NORMAL, sfx_id, 255, NORMAL_PITCH, NORMAL_SEP);
-}
-
-
-//=============================================================================
-void S_StartAttackSound(const void *origin, sfxenum_t sfx_id)
-{
-	if (hws_mode != HWS_DEFAULT_MODE)
-		HW3S_I_StartSound(origin, NULL, CT_ATTACK, sfx_id, 255, NORMAL_PITCH, NORMAL_SEP);
-	else
-		S_StartSound(origin, sfx_id);
-}
-
-void S_StartScreamSound(const void *origin, sfxenum_t sfx_id)
-{
-	if (hws_mode != HWS_DEFAULT_MODE)
-		HW3S_I_StartSound(origin, NULL, CT_SCREAM, sfx_id, 255, NORMAL_PITCH, NORMAL_SEP);
-	else
-		S_StartSound(origin, sfx_id);
-}
-
-#if 0 /// NOTE: not used
-void S_StartAmbientSound(sfxenum_t sfx_id, INT32 volume)
-{
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		volume += 30;
-		if (volume > 255)
-			volume = 255;
-
-		HW3S_I_StartSound(NULL, NULL, CT_AMBIENT, sfx_id, volume, NORMAL_PITCH, NORMAL_SEP);
-	}
-	else
-		S_StartSoundAtVolume(NULL, sfx_id, volume);
-}
-#endif
-
-FUNCMATH static inline float AmbientPos(angle_t an)
-{
-	const fixed_t fm = FixedMul(FLOAT_TO_FIXED(MIN_DISTANCE), FINESINE(an>>ANGLETOFINESHIFT));
-	return FIXED_TO_FLOAT(fm);
-}
-
-
-//=============================================================================
-INT32 HW3S_Init(I_Error_t FatalErrorFunction, snddev_t *snd_dev)
-{
-	INT32                succ;
-	source3D_data_t    source_data;
-
-	if (HW3DS.pfnStartup(FatalErrorFunction, snd_dev))
-	{
-		// Attack source
-		source_data.head_relative = 1;
-		source_data.pos.x = 0.0f;
-		source_data.pos.y = 16.0f;
-		source_data.pos.z = -FIXED_TO_FLOAT(mobjinfo[MT_PLAYER].height >> 1);
-		source_data.pos.momx = 0.0f;
-		source_data.pos.momy = 0.0f;
-		source_data.pos.momz = 0.0f;
-		source_data.min_distance = MIN_DISTANCE;
-		source_data.max_distance = MAX_DISTANCE;
-		source_data.permanent = 1;
-
-		p_attack_source.sfxinfo = NULL;
-
-		M_Memcpy(&p_attack_source2, &p_attack_source, sizeof (source_t));
-
-		p_attack_source.handle = HW3DS.pfnAddSource(&source_data, sfx_None);
-		p_attack_source2.handle = HW3DS.pfnAddSource(&source_data, sfx_None);
-
-		// Scream source
-		source_data.pos.y = 0;
-		source_data.pos.z = 0;
-
-		p_scream_source.sfxinfo = NULL;
-
-		M_Memcpy(&p_scream_source2, &p_scream_source, sizeof (source_t));
-
-		p_scream_source.handle = HW3DS.pfnAddSource(&source_data, sfx_None);
-		p_scream_source2.handle = HW3DS.pfnAddSource(&source_data, sfx_None);
-
-		//FIXED_TO_FLOAT(mobjinfo[MT_PLAYER].height - (5 * FRACUNIT));
-
-		// Ambient sources (left and right) at 210 and 330 degree
-		// relative to listener
-		memset(&ambient_sdata, 0, sizeof (ambient_sdata));
-
-		ambient_sdata.left.head_relative = 1;
-		ambient_sdata.left.pos.x = ambient_sdata.left.pos.y = AmbientPos(ANG210);
-		ambient_sdata.left.max_distance = MAX_DISTANCE;
-		ambient_sdata.left.min_distance = MIN_DISTANCE;
-
-		ambient_sdata.left.permanent = 1;
-
-		M_Memcpy(&ambient_sdata.right, &ambient_sdata.left, sizeof (source3D_data_t));
-
-		ambient_sdata.right.pos.x = -ambient_sdata.left.pos.x;
-		ambient_source.left.handle = HW3DS.pfnAddSource(&ambient_sdata.left, sfx_None);
-		ambient_source.right.handle = HW3DS.pfnAddSource(&ambient_sdata.right, sfx_None);
-
-		succ = p_attack_source.handle > -1 && p_scream_source.handle > -1 &&
-			p_attack_source2.handle > -1 && p_scream_source2.handle > -1 &&
-			ambient_source.left.handle > -1 && ambient_source.right.handle > -1;
-
-		//I_OutputMsg("Player handles: attack %d, default %d\n", p_attack_source.handle, p_scream_source.handle);
-		return succ;
-	}
-	return 0;
-}
-
-
-
-
-//=============================================================================
-INT32 HW3S_GetVersion(void)
-{
-	return HW3DS.pfnGetHW3DSVersion();
-}
-
-
-//=============================================================================
-void HW3S_BeginFrameUpdate(void)
-{
-	if (hws_mode != HWS_DEFAULT_MODE)
-		HW3DS.pfnBeginFrameUpdate();
-}
-
-
-//=============================================================================
-void HW3S_EndFrameUpdate(void)
-{
-	if (hws_mode != HWS_DEFAULT_MODE)
-		HW3DS.pfnEndFrameUpdate();
-}
-
-
-
-//=============================================================================
-INT32 HW3S_SoundIsPlaying(INT32 handle)
-{
-	return HW3DS.pfnIsPlaying(handle);
-}
-
-INT32 HW3S_OriginPlaying(void *origin)
-{
-	INT32         snum;
-
-	if (!origin)
-		return 0;
-	for (snum = 0; snum < num_sources; snum++)
-		if (sources[snum].origin == origin)
-			return 1;
-	return 0;
-}
-
-INT32 HW3S_IdPlaying(sfxenum_t id)
-{
-	INT32         snum;
-	for (snum = 0; snum < num_sources; snum++)
-		if ((size_t)(sources[snum].sfxinfo - S_sfx) == (size_t)id)
-			return 1;
-	return 0;
-}
-
-INT32 HW3S_SoundPlaying(void *origin, sfxenum_t id)
-{
-	INT32         snum;
-
-	if (!origin)
-		return 0;
-
-	for (snum = 0; snum < num_sources; snum++)
-	{
-		if (sources[snum].origin == origin
-		 && (size_t)(sources[snum].sfxinfo - S_sfx) == (size_t)id)
-			return 1;
-	}
-	return 0;
-}
-
-//=============================================================================
-static void HW3S_UpdateListener(mobj_t *listener)
-{
-	listener_data_t data;
-
-	if (!listener || !listener->player)
-		return;
-
-	if (camera.chase)
-	{
-		data.x = FIXED_TO_FLOAT(camera.x);
-		data.y = FIXED_TO_FLOAT(camera.y);
-		data.z = FIXED_TO_FLOAT(camera.z + camera.height - (5 * FRACUNIT));
-
-		data.f_angle = ANGLE2DEG(camera.angle);
-		data.h_angle = ANGLE2DEG(camera.aiming);
-
-		data.momx = TPS(FIXED_TO_FLOAT(camera.momx));
-		data.momy = TPS(FIXED_TO_FLOAT(camera.momy));
-		data.momz = TPS(FIXED_TO_FLOAT(camera.momz));
-	}
-	else
-	{
-		data.x = FIXED_TO_FLOAT(listener->x);
-		data.y = FIXED_TO_FLOAT(listener->y);
-		data.z = FIXED_TO_FLOAT(listener->z + listener->height - (5 * FRACUNIT));
-
-		data.f_angle = ANGLE2DEG(listener->angle);
-		data.h_angle = ANGLE2DEG(listener->player->aiming);
-
-		data.momx = TPS(FIXED_TO_FLOAT(listener->momx));
-		data.momy = TPS(FIXED_TO_FLOAT(listener->momy));
-		data.momz = TPS(FIXED_TO_FLOAT(listener->momz));
-	}
-	HW3DS.pfnUpdateListener(&data, 1);
-}
-
-static void HW3S_UpdateListener2(mobj_t *listener)
-{
-	listener_data_t data;
-
-	if (!listener || !listener->player)
-	{
-		HW3DS.pfnUpdateListener(NULL, 2);
-		return;
-	}
-
-	if (camera2.chase)
-	{
-		data.x = FIXED_TO_FLOAT(camera2.x);
-		data.y = FIXED_TO_FLOAT(camera2.y);
-		data.z = FIXED_TO_FLOAT(camera2.z + camera2.height - (5 * FRACUNIT));
-
-		data.f_angle = ANGLE2DEG(camera2.angle);
-		data.h_angle = ANGLE2DEG(camera2.aiming);
-
-		data.momx = TPS(FIXED_TO_FLOAT(camera2.momx));
-		data.momy = TPS(FIXED_TO_FLOAT(camera2.momy));
-		data.momz = TPS(FIXED_TO_FLOAT(camera2.momz));
-	}
-	else
-	{
-		data.x = FIXED_TO_FLOAT(listener->x);
-		data.y = FIXED_TO_FLOAT(listener->y);
-		data.z = FIXED_TO_FLOAT(listener->z + listener->height - (5 * FRACUNIT));
-
-		data.f_angle = ANGLE2DEG(listener->angle);
-		data.h_angle = ANGLE2DEG(listener->player->aiming);
-
-		data.momx = TPS(FIXED_TO_FLOAT(listener->momx));
-		data.momy = TPS(FIXED_TO_FLOAT(listener->momy));
-		data.momz = TPS(FIXED_TO_FLOAT(listener->momz));
-	}
-
-	HW3DS.pfnUpdateListener(&data, 2);
-}
-
-void HW3S_SetSfxVolume(INT32 volume)
-{
-	HW3DS.pfnSetGlobalSfxVolume(volume);
-}
-
-
-static void HW3S_Update3DSource(source_t *src)
-{
-	source3D_data_t data;
-	data.permanent = 0;
-	HW3S_FillSourceParameters(src->origin, &data, src->type);
-	HW3DS.pfnUpdate3DSource(src->handle, &data.pos);
-
-}
-
-void HW3S_UpdateSources(void)
-{
-	mobj_t *listener = players[displayplayers[0]].mo;
-	mobj_t *listener2 = NULL;
-	source_t    *src;
-	INT32 audible, snum, volume, sep, pitch;
-
-	if (splitscreen) listener2 = players[displayplayers[1]].mo;
-
-	HW3S_UpdateListener2(listener2);
-	HW3S_UpdateListener(listener);
-
-	for (snum = 0, src = sources; snum < num_sources; src++, snum++)
-	{
-		if (src->sfxinfo)
-		{
-#if 0
-			if (HW3DS.pfnIsPlaying(src->handle))
-			{
-				if (src->origin)
-				{
-					// initialize parameters
-					volume = 255; // 8 bits internal volume precision
-					pitch = NORM_PITCH;
-					sep = NORM_SEP;
-
-					// check non-local sounds for distance clipping
-					//  or modify their params
-					if (src->origin && listener != src->origin && !(listener2 && src->origin == listener2))
-					{
-						INT32 audible2;
-						INT32 volume2 = volume, sep2 = sep, pitch2 = pitch;
-						audible = S_AdjustSoundParams(listener, src->origin, &volume, &sep, &pitch,
-							src->sfxinfo);
-
-						if (listener2)
-						{
-							audible2 = S_AdjustSoundParams(listener2,
-								src->origin, &volume2, &sep2, &pitch2, src->sfxinfo);
-							if (audible2 && (!audible || (audible && volume2 > volume)))
-							{
-								audible = true;
-								volume = volume2;
-								sep = sep2;
-								pitch = pitch2;
-							}
-						}
-
-						if (audible)
-							HW3S_Update3DSource(src); // Update positional sources
-						else
-							HW3S_KillSource(snum); //Kill it!
-					}
-				}
-			}
-			else
-			{
-				// Source allocated but stopped. Kill.
-				HW3S_KillSource(snum);
-			}
-#else
-			if (src->origin && listener != src->origin && !(listener2 && src->origin == listener2))
-				HW3S_Update3DSource(src); // Update positional sources
-			(void)pitch;
-			(void)sep;
-			(void)volume;
-			(void)audible;
-#endif
-		}
-	}
-}
-
-void HW3S_Shutdown(void)
-{
-	HW3DS.pfnShutdown();
-}
-
-void *HW3S_GetSfx(sfxinfo_t *sfx)
-{
-	sfx_data_t      sfx_data;
-
-	if (sfx->lumpnum == LUMPERROR)
-		sfx->lumpnum = S_GetSfxLumpNum (sfx);
-
-	sfx_data.length = W_LumpLength(sfx->lumpnum);
-	sfx_data.data = Z_Malloc(sfx_data.length, PU_SOUND, &sfx->data);
-	W_ReadLump(sfx->lumpnum, sfx_data.data);
-	sfx_data.priority = sfx->priority;
-
-	sfx->length = HW3DS.pfnAddSfx(&sfx_data);
-
-	Z_ChangeTag(sfx->data, PU_CACHE);
-
-	return sfx_data.data;
-}
-
-void HW3S_FreeSfx(sfxinfo_t *sfx)
-{
-	INT32 snum;
-
-	for (snum = 0; snum < num_sources; snum++)
-	{
-		if (sources[snum].sfxinfo == sfx)
-		{
-			HW3S_KillSource(snum);
-			break;
-		}
-	}
-
-	if (sfx->length > 0)
-		HW3DS.pfnKillSfx((u_int)sfx->length);
-	sfx->length = 0;
-
-	sfx->lumpnum = LUMPERROR;
-
-	Z_Free(sfx->data);
-	sfx->data = NULL;
-}
-
-#endif
diff --git a/src/hardware/hw3sound.h b/src/hardware/hw3sound.h
deleted file mode 100644
index a8a475b69..000000000
--- a/src/hardware/hw3sound.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2001 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-/// \file
-/// \brief High-level functions of hardware 3D sound
-
-#ifndef __HW3_SOUND_H__
-#define __HW3_SOUND_H__
-
-#ifdef HW3SOUND
-#include "hws_data.h"
-//#include "../s_sound.h"
-//#include "../p_mobj.h"
-
-// Default sound mode (original stereo mode)
-enum
-{
-	HWS_DEFAULT_MODE = 0,
-	HWS_DS3D,
-	HWS_OTHER,
-	HWS_FMOD3D,
-	HWS_OPENAL,
-};
-
-typedef enum
-{
-	CT_NORMAL = 0,
-	CT_ATTACK,
-	CT_SCREAM,
-	CT_AMBIENT,
-} channel_type_t;
-
-extern INT32  hws_mode;           // Current sound mode
-
-#if defined (HW3DS) || defined (DOXYGEN)
-INT32 HW3S_Init(I_Error_t FatalErrorFunction, snddev_t *snd_dev);
-#endif
-void HW3S_Shutdown(void);
-INT32 HW3S_GetVersion(void);
-
-// Common case - start 3D or 2D source
-void HW3S_StartSound(const void *origin, sfxenum_t sfx_id);
-
-// Special cases of 3D sources
-void S_StartAmbientSound(sfxenum_t sfx_id, INT32 volume);
-void S_StartAttackSound(const void *origin, sfxenum_t sfx_id);
-void S_StartScreamSound(const void *origin, sfxenum_t sfx_id);
-
-// Starts 3D sound with specified parameters
-// origin      - for object movement tracking. NULL are possible value (no movement tracking)
-// source_parm - 3D source parameters (position etc.)
-// cone_parm   - 3D source cone parameters. NULL are possible value (default cone will be used)
-// channel     -
-// sfx_id      - sfx id
-// vol         - sound volume
-// pitch       - sound pitching value
-// Returns:    - sound id
-INT32 HW3S_I_StartSound(const void *origin, source3D_data_t *source_parm, channel_type_t channel, sfxenum_t sfx_id, INT32 vol, INT32 pitch, INT32 sep);
-void HW3S_StopSoundByID(void *origin, sfxenum_t sfx_id);
-void HW3S_StopSoundByNum(sfxenum_t sfxnum);
-void HW3S_StopSound(void *origin);
-void HW3S_StopSounds(void);
-
-void HW3S_BeginFrameUpdate(void);
-void HW3S_EndFrameUpdate(void);
-
-void HW3S_UpdateSources(void);
-
-void HW3S_SetSfxVolume(INT32 volume);
-
-// Utility functions
-INT32  HW3S_SoundIsPlaying(INT32 handle);
-void HW3S_SetSourcesNum(void);
-
-INT32  HW3S_OriginPlaying(void *origin);
-INT32  HW3S_IdPlaying(sfxenum_t id);
-INT32  HW3S_SoundPlaying(void *origin, sfxenum_t id);
-
-void *HW3S_GetSfx(sfxinfo_t *sfx);
-void HW3S_FreeSfx(sfxinfo_t *sfx);
-
-#else // HW3SOUND
-
-//#define S_StartAmbientSound(i,v) S_StartSoundAtVolume(NULL, i, v)
-#define S_StartAttackSound S_StartSound
-#define S_StartScreamSound S_StartSound
-
-#endif // HW3SOUND
-
-INT32 S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source,
-	INT32 *vol, INT32 *sep, INT32 *pitch, sfxinfo_t *sfxinfo);
-
-#endif // __HW3_SOUND_H__
diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c
index 80bc7ad94..3b5c5426e 100644
--- a/src/hardware/hw_batching.c
+++ b/src/hardware/hw_batching.c
@@ -25,59 +25,60 @@ GLMipmap_t *current_texture = NULL;
 
 boolean currently_batching = false;
 
-FOutVector* finalVertexArray = NULL;// contains subset of sorted vertices and texture coordinates to be sent to gpu
+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
 //     NOTE have this alloced as 3x finalVertexArray size
 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
-int polygonArraySize = 0;
-PolygonArrayEntry **polygonArraySorted = NULL;// contains sorted pointers to polygonArray
+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;
 
-FOutVector* unsortedVertexArray = NULL;// contains unsorted vertices and texture coordinates from DrawPolygon
-int unsortedVertexArraySize = 0;
+FOutVector* unsortedVertexArray  = NULL; // contains unsorted vertices and texture coordinates from DrawPolygon
+int unsortedVertexArraySize      = 0;
 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.
 void HWR_StartBatching(void)
 {
-    if (currently_batching)
+	if (currently_batching)
 	{
-        I_Error("Repeat call to HWR_StartBatching without HWR_RenderBatches");
+		I_Error("Repeat call to HWR_StartBatching without HWR_RenderBatches");
 	}
 
-    // init arrays if that has not been done yet
+	// init arrays if that has not been done yet
 	if (!finalVertexArray)
 	{
-		finalVertexArray = malloc(finalVertexArrayAllocSize * sizeof(FOutVector));
+		finalVertexArray      = malloc(finalVertexArrayAllocSize * sizeof(FOutVector));
 		finalVertexIndexArray = malloc(finalVertexArrayAllocSize * 3 * sizeof(UINT32));
-		polygonArray = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry));
-		polygonArraySorted = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry *));
-		unsortedVertexArray = malloc(unsortedVertexArrayAllocSize * sizeof(FOutVector));
+		polygonArray          = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry));
+		polygonArraySorted    = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry *));
+		unsortedVertexArray   = malloc(unsortedVertexArrayAllocSize * sizeof(FOutVector));
 	}
 
-    currently_batching = true;
+	currently_batching = true;
 }
 
-// This replaces the direct calls to pfnSetTexture in cases where batching is available.
+// This replaces the direct calls to GL_SetTexture in cases where batching is available.
 // The texture selection is saved for the next HWR_ProcessPolygon call.
 // Doing this was easier than getting a texture pointer to HWR_ProcessPolygon.
 void HWR_SetCurrentTexture(GLMipmap_t *texture)
 {
-    if (currently_batching)
-    {
-        current_texture = texture;
-    }
-    else
-    {
-        HWD.pfnSetTexture(texture);
-    }
+	if (currently_batching)
+	{
+		current_texture = texture;
+	}
+	else
+	{
+		GL_SetTexture(texture);
+	}
 }
 
 // If batching is enabled, this function collects the polygon data and the chosen texture
@@ -85,33 +86,27 @@ void HWR_SetCurrentTexture(GLMipmap_t *texture)
 // render the polygon immediately.
 void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, int shader_target, boolean horizonSpecial)
 {
-    if (currently_batching)
+	if (currently_batching)
 	{
 		if (!pSurf)
-			I_Error("Got a null FSurfaceInfo in batching");// nulls should not come in the stuff that batching currently applies to
+		{
+			I_Error("Got a null FSurfaceInfo in batching"); // nulls should not come in the stuff that batching currently applies to
+		}
+
 		if (polygonArraySize == polygonArrayAllocSize)
 		{
-			PolygonArrayEntry* new_array;
-			// ran out of space, make new array double the size
+			// ran out of space, double the array size
 			polygonArrayAllocSize *= 2;
-			new_array = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry));
-			memcpy(new_array, polygonArray, polygonArraySize * sizeof(PolygonArrayEntry));
-			free(polygonArray);
-			polygonArray = new_array;
+			polygonArray = realloc(polygonArray, polygonArrayAllocSize * sizeof(PolygonArrayEntry));
 			// also need to redo the index array, dont need to copy it though
-			free(polygonArraySorted);
-			polygonArraySorted = malloc(polygonArrayAllocSize * sizeof(PolygonArrayEntry *));
+			polygonArraySorted = realloc(polygonArraySorted, polygonArrayAllocSize * sizeof(PolygonArrayEntry*));
 		}
 
 		while (unsortedVertexArraySize + (int)iNumPts > unsortedVertexArrayAllocSize)
 		{
-			FOutVector* new_array;
 			// need more space for vertices in unsortedVertexArray
 			unsortedVertexArrayAllocSize *= 2;
-			new_array = malloc(unsortedVertexArrayAllocSize * sizeof(FOutVector));
-			memcpy(new_array, unsortedVertexArray, unsortedVertexArraySize * sizeof(FOutVector));
-			free(unsortedVertexArray);
-			unsortedVertexArray = new_array;
+			unsortedVertexArray = realloc(unsortedVertexArray, unsortedVertexArrayAllocSize * sizeof(FOutVector));
 		}
 
 		// add the polygon data to the arrays
@@ -121,7 +116,7 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt
 		polygonArray[polygonArraySize].numVerts = iNumPts;
 		polygonArray[polygonArraySize].polyFlags = PolyFlags;
 		polygonArray[polygonArraySize].texture = current_texture;
-		polygonArray[polygonArraySize].shader = (shader_target != -1) ? HWR_GetShaderFromTarget(shader_target) : shader_target;
+		polygonArray[polygonArraySize].shader = (shader_target != SHADER_NONE) ? HWR_GetShaderFromTarget(shader_target) : shader_target;
 		polygonArray[polygonArraySize].horizonSpecial = horizonSpecial;
 		polygonArraySize++;
 
@@ -130,38 +125,30 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt
 	}
 	else
 	{
-		HWD.pfnSetShader((shader_target != SHADER_NONE) ? HWR_GetShaderFromTarget(shader_target) : shader_target);
-		HWD.pfnDrawPolygon(pSurf, pOutVerts, iNumPts, PolyFlags);
+		GL_SetShader((shader_target != SHADER_NONE) ? HWR_GetShaderFromTarget(shader_target) : shader_target);
+		GL_DrawPolygon(pSurf, pOutVerts, iNumPts, PolyFlags);
 	}
 }
 
 static int comparePolygons(const void *p1, const void *p2)
 {
-	PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
-	PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
 	int diff;
 	INT64 diff64;
-	UINT32 downloaded1 = 0;
-	UINT32 downloaded2 = 0;
+	const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
+	const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
 
-	int shader1 = poly1->shader;
-	int shader2 = poly2->shader;
-	// make skywalls and horizon lines first in order
-	if (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial)
-		shader1 = -1;
-	if (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial)
-		shader2 = -1;
-	diff = shader1 - shader2;
-	if (diff != 0) return diff;
+	const int shader1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? -1 : poly1->shader;
+	const int shader2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? -1 : poly2->shader;
 
 	// skywalls and horizon lines must retain their order for horizon lines to work
 	if (shader1 == -1 && shader2 == -1)
 		return poly1 - poly2;
 
-	if (poly1->texture)
-		downloaded1 = poly1->texture->downloaded; // there should be a opengl texture name here, usable for comparisons
-	if (poly2->texture)
-		downloaded2 = poly2->texture->downloaded;
+	diff = shader1 - shader2;
+	if (diff != 0) return diff;
+
+	UINT32 downloaded1 = poly1->texture ? poly1->texture->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
+	UINT32 downloaded2 = poly2->texture ? poly2->texture->downloaded : 0;
 	diff64 = downloaded1 - downloaded2;
 	if (diff64 != 0) return diff64;
 
@@ -180,31 +167,27 @@ static int comparePolygons(const void *p1, const void *p2)
 	diff = poly1->surf.LightInfo.fade_start - poly2->surf.LightInfo.fade_start;
 	if (diff != 0) return diff;
 	diff = poly1->surf.LightInfo.fade_end - poly2->surf.LightInfo.fade_end;
-	return diff;
+	if (diff != 0) return diff;
+
+	return poly1->surf.LightInfo.directional - poly2->surf.LightInfo.directional;
 }
 
 static int comparePolygonsNoShaders(const void *p1, const void *p2)
 {
-	PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
-	PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
 	int diff;
 	INT64 diff64;
+	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;
 
-	GLMipmap_t *texture1 = poly1->texture;
-	GLMipmap_t *texture2 = poly2->texture;
-	UINT32 downloaded1 = 0;
-	UINT32 downloaded2 = 0;
-	if (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial)
-		texture1 = NULL;
-	if (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial)
-		texture2 = NULL;
-	if (texture1)
-		downloaded1 = texture1->downloaded; // there should be a opengl texture name here, usable for comparisons
-	if (texture2)
-		downloaded2 = texture2->downloaded;
 	// skywalls and horizon lines must retain their order for horizon lines to work
 	if (!texture1 && !texture2)
 		return poly1 - poly2;
+
+	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;
 
@@ -221,30 +204,33 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
 // the rendering backend to draw them.
 void HWR_RenderBatches(void)
 {
-    int finalVertexWritePos = 0;// position in finalVertexArray
-	int finalIndexWritePos = 0;// position in finalVertexIndexArray
-
-	int polygonReadPos = 0;// position in polygonArraySorted
+	int finalVertexWritePos = 0; // position in finalVertexArray
+	int finalIndexWritePos  = 0; // position in finalVertexIndexArray
+	int polygonReadPos      = 0; // position in polygonArraySorted
 
 	int currentShader;
 	int nextShader = 0;
-	GLMipmap_t *currentTexture;
-	GLMipmap_t *nextTexture = NULL;
-	FBITFIELD currentPolyFlags = 0;
-	FBITFIELD nextPolyFlags = 0;
+	GLMipmap_t  *currentTexture = NULL;
+	GLMipmap_t  *nextTexture = NULL;
+	FBITFIELD    currentPolyFlags = 0;
+	FBITFIELD    nextPolyFlags = 0;
 	FSurfaceInfo currentSurfaceInfo;
 	FSurfaceInfo nextSurfaceInfo;
 
 	int i;
 
-    if (!currently_batching)
+	if (!currently_batching)
+	{
 		I_Error("HWR_RenderBatches called without starting batching");
+	}
 
-	nextSurfaceInfo.LightInfo.fade_end = 0;
-	nextSurfaceInfo.LightInfo.fade_start = 0;
+	nextSurfaceInfo.LightInfo.fade_end    = 0;
+	nextSurfaceInfo.LightInfo.fade_start  = 0;
 	nextSurfaceInfo.LightInfo.light_level = 0;
+	nextSurfaceInfo.LightInfo.directional = false;
 
 	currently_batching = false;// no longer collecting batches
+
 	if (!polygonArraySize)
 	{
 		ps_hw_numpolys.value.i = ps_hw_numcalls.value.i = ps_hw_numshaders.value.i
@@ -252,11 +238,13 @@ void HWR_RenderBatches(void)
 			= ps_hw_numcolors.value.i = 0;
 		return;// nothing to draw
 	}
+
 	// init stats vars
 	ps_hw_numpolys.value.i = polygonArraySize;
 	ps_hw_numcalls.value.i = ps_hw_numverts.value.i = 0;
 	ps_hw_numshaders.value.i = ps_hw_numtextures.value.i
-		= ps_hw_numpolyflags.value.i = ps_hw_numcolors.value.i = 1;
+	= ps_hw_numpolyflags.value.i = ps_hw_numcolors.value.i = 1;
+
 	// init polygonArraySorted
 	for (i = 0; i < polygonArraySize; i++)
 	{
@@ -265,11 +253,9 @@ void HWR_RenderBatches(void)
 
 	// sort polygons
 	PS_START_TIMING(ps_hw_batchsorttime);
-	if (cv_grshaders.value && gr_shadersavailable)
-		qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), comparePolygons);
-	else
-		qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), comparePolygonsNoShaders);
+	qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), (HWR_UseShader() ? comparePolygons : comparePolygonsNoShaders));
 	PS_STOP_TIMING(ps_hw_batchsorttime);
+
 	// sort order
 	// 1. shader
 	// 2. texture
@@ -279,26 +265,26 @@ void HWR_RenderBatches(void)
 
 	PS_START_TIMING(ps_hw_batchdrawtime);
 
-	currentShader = polygonArraySorted[0]->shader;
-	currentTexture = polygonArraySorted[0]->texture;
-	currentPolyFlags = polygonArraySorted[0]->polyFlags;
+	currentShader      = polygonArraySorted[0]->shader;
+	currentTexture     = polygonArraySorted[0]->texture;
+	currentPolyFlags   = polygonArraySorted[0]->polyFlags;
 	currentSurfaceInfo = polygonArraySorted[0]->surf;
 	// For now, will sort and track the colors. Vertex attributes could be used instead of uniforms
 	// and a color array could replace the color calls.
 
 	// set state for first batch
 
-	if (cv_grshaders.value && gr_shadersavailable)
+	if (HWR_UseShader())
 	{
-		HWD.pfnSetShader(currentShader);
+		GL_SetShader(currentShader);
 	}
 
 	if (currentPolyFlags & PF_NoTexture)
 		currentTexture = NULL;
-    else
-	    HWD.pfnSetTexture(currentTexture);
+	else
+		GL_SetTexture(currentTexture);
 
-	while (1)// note: remember handling notexture polyflag as having texture number 0 (also in comparePolygons)
+	while (1) // note: remember handling notexture polyflag as having texture number 0 (also in comparePolygons)
 	{
 		int firstIndex;
 		int lastIndex;
@@ -313,42 +299,37 @@ void HWR_RenderBatches(void)
 		// steps:
 		// write vertices
 		// check for changes or end, otherwise go back to writing
-			// changes will affect the next vars and the change bools
-			// end could set flag for stopping
+		// changes will affect the next vars and the change bools
+		// end could set flag for stopping
 		// execute draw call
 		// could check ending flag here
 		// change states according to next vars and change bools, updating the current vars and reseting the bools
 		// reset write pos
 		// repeat loop
 
-		PolygonArrayEntry *entry = polygonArraySorted[polygonReadPos++];
-		int numVerts = entry->numVerts;
+		const PolygonArrayEntry *entry = polygonArraySorted[polygonReadPos++];
+		const int numVerts = entry->numVerts;
+
 		// before writing, check if there is enough room
 		// using 'while' instead of 'if' here makes sure that there will *always* be enough room.
 		// probably never will this loop run more than once though
 		while (finalVertexWritePos + numVerts > finalVertexArrayAllocSize)
 		{
-			FOutVector* new_array;
-			unsigned int* new_index_array;
 			finalVertexArrayAllocSize *= 2;
-			new_array = malloc(finalVertexArrayAllocSize * sizeof(FOutVector));
-			memcpy(new_array, finalVertexArray, finalVertexWritePos * sizeof(FOutVector));
-			free(finalVertexArray);
-			finalVertexArray = new_array;
+			finalVertexArray = realloc(finalVertexArray, finalVertexArrayAllocSize * sizeof(FOutVector));
 			// also increase size of index array, 3x of vertex array since
 			// going from fans to triangles increases vertex count to 3x
-			new_index_array = malloc(finalVertexArrayAllocSize * 3 * sizeof(UINT32));
-			memcpy(new_index_array, finalVertexIndexArray, finalIndexWritePos * sizeof(UINT32));
-			free(finalVertexIndexArray);
-			finalVertexIndexArray = new_index_array;
+			finalVertexIndexArray = realloc(finalVertexIndexArray, finalVertexArrayAllocSize * 3 * sizeof(UINT32));
 		}
+
 		// write the vertices of the polygon
-		memcpy(&finalVertexArray[finalVertexWritePos], &unsortedVertexArray[entry->vertsIndex],
-			numVerts * sizeof(FOutVector));
+		memcpy(&finalVertexArray[finalVertexWritePos], &unsortedVertexArray[entry->vertsIndex], numVerts * sizeof(FOutVector));
+
 		// write the indexes, pointing to the fan vertexes but in triangles format
 		firstIndex = finalVertexWritePos;
 		lastIndex = finalVertexWritePos + numVerts;
 		finalVertexWritePos += 2;
+
 		while (finalVertexWritePos < lastIndex)
 		{
 			finalVertexIndexArray[finalIndexWritePos++] = firstIndex;
@@ -363,36 +344,42 @@ void HWR_RenderBatches(void)
 		else
 		{
 			// check if a state change is required, set the change bools and next vars
-			PolygonArrayEntry *nextEntry = polygonArraySorted[polygonReadPos];
-			nextShader = nextEntry->shader;
-			nextTexture = nextEntry->texture;
-			nextPolyFlags = nextEntry->polyFlags;
+			const PolygonArrayEntry *nextEntry = polygonArraySorted[polygonReadPos];
+			nextShader      = nextEntry->shader;
+			nextTexture     = nextEntry->texture;
+			nextPolyFlags   = nextEntry->polyFlags;
 			nextSurfaceInfo = nextEntry->surf;
+
 			if (nextPolyFlags & PF_NoTexture)
 				nextTexture = 0;
-			if (currentShader != nextShader && cv_grshaders.value && gr_shadersavailable)
+
+			if (currentShader != nextShader && HWR_UseShader())
 			{
 				changeState = true;
 				changeShader = true;
 			}
+
 			if (currentTexture != nextTexture)
 			{
 				changeState = true;
 				changeTexture = true;
 			}
+
 			if (currentPolyFlags != nextPolyFlags)
 			{
 				changeState = true;
 				changePolyFlags = true;
 			}
-			if (cv_grshaders.value && gr_shadersavailable)
+
+			if (HWR_UseShader())
 			{
 				if (currentSurfaceInfo.PolyColor.rgba != nextSurfaceInfo.PolyColor.rgba ||
 					currentSurfaceInfo.TintColor.rgba != nextSurfaceInfo.TintColor.rgba ||
 					currentSurfaceInfo.FadeColor.rgba != nextSurfaceInfo.FadeColor.rgba ||
 					currentSurfaceInfo.LightInfo.light_level != nextSurfaceInfo.LightInfo.light_level ||
-					currentSurfaceInfo.LightInfo.fade_start != nextSurfaceInfo.LightInfo.fade_start ||
-					currentSurfaceInfo.LightInfo.fade_end != nextSurfaceInfo.LightInfo.fade_end)
+					currentSurfaceInfo.LightInfo.fade_start  != nextSurfaceInfo.LightInfo.fade_start  ||
+					currentSurfaceInfo.LightInfo.fade_end    != nextSurfaceInfo.LightInfo.fade_end    ||
+					currentSurfaceInfo.LightInfo.directional != nextSurfaceInfo.LightInfo.directional)
 				{
 					changeState = true;
 					changeSurfaceInfo = true;
@@ -411,53 +398,62 @@ void HWR_RenderBatches(void)
 		if (changeState || stopFlag)
 		{
 			// execute draw call
-            HWD.pfnDrawIndexedTriangles(&currentSurfaceInfo, finalVertexArray, finalIndexWritePos, currentPolyFlags, finalVertexIndexArray);
+			GL_DrawIndexedTriangles(&currentSurfaceInfo, finalVertexArray, finalIndexWritePos, currentPolyFlags, finalVertexIndexArray);
 			// update stats
 			ps_hw_numcalls.value.i++;
 			ps_hw_numverts.value.i += finalIndexWritePos;
 			// reset write positions
 			finalVertexWritePos = 0;
-			finalIndexWritePos = 0;
+			finalIndexWritePos  = 0;
 		}
-		else continue;
+		else
+			continue;
 
 		// if we're here then either its time to stop or time to change state
-		if (stopFlag) break;
+		if (stopFlag)
+			break;
 
 		// change state according to change bools and next vars, update current vars and reset bools
-		if (changeShader)
+		if (changeState)
 		{
-			HWD.pfnSetShader(nextShader);
-			currentShader = nextShader;
-			changeShader = false;
+			if (changeShader)
+			{
+				GL_SetShader(nextShader);
+				currentShader = nextShader;
+				changeShader = false;
 
-			ps_hw_numshaders.value.i++;
-		}
-		if (changeTexture)
-		{
-			// texture should be already ready for use from calls to SetTexture during batch collection
-		    HWD.pfnSetTexture(nextTexture);
-			currentTexture = nextTexture;
-			changeTexture = false;
+				ps_hw_numshaders.value.i++;
+			}
 
-			ps_hw_numtextures.value.i++;
-		}
-		if (changePolyFlags)
-		{
-			currentPolyFlags = nextPolyFlags;
-			changePolyFlags = false;
+			if (changeTexture)
+			{
+				// texture should be already ready for use from calls to GL_SetTexture during batch collection
+				GL_SetTexture(nextTexture);
+				currentTexture = nextTexture;
+				changeTexture = false;
 
-			ps_hw_numpolyflags.value.i++;
-		}
-		if (changeSurfaceInfo)
-		{
-			currentSurfaceInfo = nextSurfaceInfo;
-			changeSurfaceInfo = false;
+				ps_hw_numtextures.value.i++;
+			}
 
-			ps_hw_numcolors.value.i++;
+			if (changePolyFlags)
+			{
+				currentPolyFlags = nextPolyFlags;
+				changePolyFlags = false;
+
+				ps_hw_numpolyflags.value.i++;
+			}
+
+			if (changeSurfaceInfo)
+			{
+				currentSurfaceInfo = nextSurfaceInfo;
+				changeSurfaceInfo = false;
+
+				ps_hw_numcolors.value.i++;
+			}
 		}
 		// and that should be it?
 	}
+
 	// reset the arrays (set sizes to 0)
 	polygonArraySize = 0;
 	unsortedVertexArraySize = 0;
@@ -465,5 +461,4 @@ void HWR_RenderBatches(void)
 	PS_STOP_TIMING(ps_hw_batchdrawtime);
 }
 
-
 #endif // HWRENDER
diff --git a/src/hardware/hw_batching.h b/src/hardware/hw_batching.h
index 7c108a4bd..1f263d1df 100644
--- a/src/hardware/hw_batching.h
+++ b/src/hardware/hw_batching.h
@@ -13,11 +13,15 @@
 #ifndef __HWR_BATCHING_H__
 #define __HWR_BATCHING_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "hw_defs.h"
 #include "hw_data.h"
-#include "hw_drv.h"
+#include "hw_gl.h"
 
-typedef struct 
+typedef struct
 {
 	FSurfaceInfo surf;// surf also has its own polyflags for some reason, but it seems unused
 	unsigned int vertsIndex;// location of verts in unsortedVertexArray
@@ -34,4 +38,8 @@ void HWR_SetCurrentTexture(GLMipmap_t *texture);
 void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, int shader, boolean horizonSpecial);
 void HWR_RenderBatches(void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index a5f76df06..89aa25751 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -46,16 +46,22 @@ typedef struct
 
 // when loading the map, this is set to true if portals are found.
 // if no portals are found, the portal scanning phase can be skipped while rendering, saving a bit of time.
-boolean gr_maphasportals = false;
+boolean gl_maphasportals = false;
+
+// Determine on mapload if current map has any Horizonlines present
+// so we can avoid rather hot checks in HWR_Subsector
+boolean gl_maphashorizonlines = false;
 
 // ==========================================================================
 //                                    FLOOR & CEILING CONVEX POLYS GENERATION
 // ==========================================================================
 
 //debug counters
+#ifdef DEBUG_HWBSP
 static INT32 nobackpoly = 0;
 static INT32 skipcut = 0;
 static INT32 totalsubsecpolys = 0;
+#endif
 
 // --------------------------------------------------------------------------
 // Polygon fast alloc / free
@@ -96,8 +102,8 @@ static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
 	double frac;
 	double num;
 	double den;
-	double v1x,v1y,v1dx,v1dy;
-	double v2x,v2y,v2dx,v2dy;
+	double v1x, v1y, v1dx, v1dy;
+	double v2x, v2y, v2dx, v2dy;
 
 	// a segment of a polygon
 	v1x  = v1->x;
@@ -112,6 +118,7 @@ static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
 	v2dy = bsp->dy;
 
 	den = v2dy*v1dx - v2dx*v1dy;
+
 	if (fabsf((float)den) < 1.0E-36f) // avoid checking exactly for 0.0
 		return NULL;       // parallel
 
@@ -119,6 +126,7 @@ static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
 	// (do not accept hit with the extensions)
 	num = (v2x - v1x)*v2dy + (v1y - v2y)*v2dx;
 	frac = num / den;
+
 	if (frac < 0.0l || frac > 1.0l)
 		return NULL;
 
@@ -128,7 +136,6 @@ static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
 	frac = num / den;
 	bspfrac = (float)frac;
 
-
 	// find the interception point along the partition line
 	pt.x = (float)(v2x + v2dx*frac);
 	pt.y = (float)(v2y + v2dy*frac);
@@ -136,37 +143,18 @@ static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
 	return &pt;
 }
 
+#define DIVLINE_VERTEX_DIFF 0.45f
+
 // if two vertice coords have a x and/or y difference
 // of less or equal than 1 FRACUNIT, they are considered the same
 // point. Note: hardcoded value, 1.0f could be anything else.
 static boolean SameVertice (polyvertex_t *p1, polyvertex_t *p2)
 {
-#if 0
-	float diff;
-	diff = p2->x - p1->x;
-	if (diff < -1.5f || diff > 1.5f)
+	if (fabsf( p2->x - p1->x ) > DIVLINE_VERTEX_DIFF)
 		return false;
-	diff = p2->y - p1->y;
-	if (diff < -1.5f || diff > 1.5f)
+	if (fabsf( p2->y - p1->y ) > DIVLINE_VERTEX_DIFF)
 		return false;
-#elif 0
-	if (p1->x != p2->x)
-		return false;
-	if (p1->y != p2->y)
-		return false;
-#elif 0
-	if (fabsf( p2->x - p1->x ) > 1.0E-36f )
-		return false;
-	if (fabsf( p2->y - p1->y ) > 1.0E-36f )
-		return false;
-#else
-#define  DIVLINE_VERTEX_DIFF   0.45f
-	float ep = DIVLINE_VERTEX_DIFF;
-	if (fabsf( p2->x - p1->x ) > ep )
-		return false;
-	if (fabsf( p2->y - p1->y ) > ep )
-		return false;
-#endif
+
 	// p1 and p2 are considered the same vertex
 	return true;
 }
@@ -182,22 +170,23 @@ static void SplitPoly (fdivline_t *bsp,         //splitting parametric line
                        poly_t **frontpoly,      //return one poly here
                        poly_t **backpoly)       //return the other here
 {
-	INT32      i,j;
+	INT32 i, j;
 	polyvertex_t *pv;
 
-	INT32          ps = -1,pe = -1;
-	INT32          nptfront,nptback;
+	INT32 ps = -1, pe = -1;
+	INT32  nptfront, nptback;
 	polyvertex_t vs = {0,0,0};
 	polyvertex_t ve = {0,0,0};
 	polyvertex_t lastpv = {0,0,0};
-	float        fracs = 0.0f,frace = 0.0f; //used to tell which poly is on
-	                                        // the front side of the bsp partition line
-	INT32         psonline = 0, peonline = 0;
+	float fracs = 0.0f, frace = 0.0f;        //used to tell which poly is on
+	                                         // the front side of the bsp partition line
+	INT32 psonline = 0, peonline = 0;
 
 	for (i = 0; i < poly->numpts; i++)
 	{
 		j = i + 1;
-		if (j == poly->numpts) j = 0;
+		if (j == poly->numpts)
+			j = 0;
 
 		// start & end points
 		pv = fracdivline(bsp, &poly->pts[i], &poly->pts[j]);
@@ -283,7 +272,8 @@ static void SplitPoly (fdivline_t *bsp,         //splitting parametric line
 		*backpoly = NULL;
 		return;
 	}
-	if (pe <= ps)
+
+	if (UNLIKELY(pe <= ps))
 		I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe);
 
 	// number of points on each side, _not_ counting those
@@ -295,6 +285,7 @@ static void SplitPoly (fdivline_t *bsp,         //splitting parametric line
 		*backpoly = HWR_AllocPoly(2 + nptback);
 	else
 		*backpoly = NULL;
+
 	if (nptfront > 0)
 		*frontpoly = HWR_AllocPoly(2 + nptfront);
 	else
@@ -307,10 +298,12 @@ static void SplitPoly (fdivline_t *bsp,         //splitting parametric line
 		*pv++ = vs;
 		*pv++ = ve;
 		i = pe;
+
 		do
 		{
 			if (++i == poly->numpts)
 				i = 0;
+
 			*pv++ = poly->pts[i];
 		} while (i != ps && --nptfront);
 	}
@@ -322,10 +315,12 @@ static void SplitPoly (fdivline_t *bsp,         //splitting parametric line
 		*pv++ = ve;
 		*pv++ = vs;
 		i = ps;
+
 		do
 		{
 			if (++i == poly->numpts)
 				i = 0;
+
 			*pv++ = poly->pts[i];
 		} while (i != pe && --nptback);
 	}
@@ -352,35 +347,48 @@ static void SplitPoly (fdivline_t *bsp,         //splitting parametric line
 static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
 {
 	INT32 i, j;
-
 	polyvertex_t *pv;
-
 	INT32 nump = 0, ps, pe;
 	polyvertex_t vs = {0, 0, 0}, ve = {0, 0, 0},
-		p1 = {0, 0, 0}, p2 = {0, 0, 0};
+				 p1 = {0, 0, 0}, p2 = {0, 0, 0};
 	float fracs = 0.0f;
-
 	fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
-
 	poly_t *temppoly;
 
 	// for each seg of the subsector
 	for (; count--; lseg++)
 	{
-		//x,y,dx,dy (like a divline)
-		line_t *line = lseg->linedef;
-		
+		// x, y, dx, dy (like a divline)
+		const line_t *line = lseg->linedef;
+
 		// portal check
-		if (!gr_maphasportals && line->special == 40 && lseg->side == 0)
+		if (UNLIKELY(!gl_maphasportals && line->special == PORTALSPECIAL && lseg->side == 0))
 		{
 			// Find the other side!
-			INT32 line2 = P_FindSpecialLineFromTag(40, line->tag, -1);
+			INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, -1);
+
 			if (line == &lines[line2])
-				line2 = P_FindSpecialLineFromTag(40, line->tag, line2);
+				line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2);
+
 			if (line2 >= 0) // found it!
-				gr_maphasportals = 1;
+				gl_maphasportals = 1;
 		}
-		
+
+		if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
+			gl_maphashorizonlines = true;
+
+		if (line->sidenum[1] != 0xffff)
+		{
+			if (sides[line->sidenum[0]].sector == sides[line->sidenum[1]].sector)
+			{
+				// Segs that are self-ref linedef do not cutout the subsector.
+#ifdef DEBUG_HWBSP
+				CONS_Debug(DBG_RENDER, "CutOutSubsecPoly: self ref line %i\n", line - lines);
+#endif
+				continue;
+			}
+		}
+
 		p1.x = FIXED_TO_FLOAT(lseg->side ? line->v2->x : line->v1->x);
 		p1.y = FIXED_TO_FLOAT(lseg->side ? line->v2->y : line->v1->y);
 		p2.x = FIXED_TO_FLOAT(lseg->side ? line->v1->x : line->v2->x);
@@ -394,6 +402,7 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
 		// see if it cuts the convex poly
 		ps = -1;
 		pe = -1;
+
 		for (i = 0; i < poly->numpts; i++)
 		{
 			j = i + 1;
@@ -436,6 +445,7 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
 					ve = vs;
 					vs = *pv;
 				}
+
 				//found 2nd point
 				break;
 			}
@@ -449,25 +459,32 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
 			{
 				// generate FRONT poly
 				temppoly = HWR_AllocPoly(nump);
+
 				pv = temppoly->pts;
 				*pv++ = vs;
 				*pv++ = ve;
+
 				do
 				{
 					if (++ps == poly->numpts)
 						ps = 0;
 					*pv++ = poly->pts[ps];
 				} while (ps != pe);
+
 				HWR_FreePoly(poly);
 				poly = temppoly;
 			}
-			//hmmm... maybe we should NOT accept this, but this happens
+#ifdef DEBUG_HWBSP
+			// hmmm... maybe we should NOT accept this, but this happens
 			// only when the cut is not needed it seems (when the cut
 			// line is aligned to one of the borders of the poly, and
 			// only some times..)
 			else
+			{
 				skipcut++;
-			//    I_Error("CutOutPoly: only one point for split line (%d %d) %d", ps, pe, debugpos);
+				I_Error("CutOutPoly: only one point for split line (%d %d) %d", ps, pe, debugpos);
+			}
+#endif
 		}
 	}
 	return poly;
@@ -490,8 +507,10 @@ static inline void HWR_SubsecPoly(INT32 num, poly_t *poly)
 
 	if (poly)
 	{
-		poly = CutOutSubsecPoly (lseg,count,poly);
+		poly = CutOutSubsecPoly(lseg,count,poly);
+#ifdef DEBUG_HWBSP
 		totalsubsecpolys++;
+#endif
 		//extra data for this subsector
 		extrasubsectors[num].planepoly = poly;
 	}
@@ -501,8 +520,8 @@ static inline void HWR_SubsecPoly(INT32 num, poly_t *poly)
 // search for the segs source of this divline
 static inline void SearchDivline(node_t *bsp, fdivline_t *divline)
 {
-	divline->x = FIXED_TO_FLOAT(bsp->x);
-	divline->y = FIXED_TO_FLOAT(bsp->y);
+	divline->x  = FIXED_TO_FLOAT(bsp->x);
+	divline->y  = FIXED_TO_FLOAT(bsp->y);
 	divline->dx = FIXED_TO_FLOAT(bsp->dx);
 	divline->dy = FIXED_TO_FLOAT(bsp->dy);
 }
@@ -523,7 +542,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_CACHE)); // SRB2 background, ehhh too bright.
+	//V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_PATCH)); // 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);
@@ -560,10 +579,12 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 			if (poly && poly->numpts > 2)
 			{
 				CONS_Debug(DBG_RENDER, "Adding a new subsector\n");
-				if (addsubsector == numsubsectors + NEWSUBSECTORS)
+
+				if (UNLIKELY(addsubsector == numsubsectors + NEWSUBSECTORS))
 					I_Error("WalkBSPNode: not enough addsubsectors\n");
-				else if (addsubsector > 0x7fff)
+				else if (UNLIKELY(addsubsector > 0x7fff))
 					I_Error("WalkBSPNode: addsubsector > 0x7fff\n");
+
 				*leafnode = (UINT16)((UINT16)addsubsector | NF_SUBSECTOR);
 				extrasubsectors[addsubsector].planepoly = poly;
 				addsubsector++;
@@ -585,6 +606,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 			}
 #endif
 		}
+
 		M_ClearBox(bbox);
 		poly = extrasubsectors[bspnum & ~NF_SUBSECTOR].planepoly;
 
@@ -599,12 +621,14 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
 	SplitPoly(&fdivline, poly, &frontpoly, &backpoly);
 	poly = NULL;
 
+#ifdef DEBUG_HWBSP
 	//debug
 	if (!backpoly)
 		nobackpoly++;
+#endif
 
 	// Recursively divide front space.
-	if (frontpoly)
+	if (LIKELY(frontpoly))
 	{
 		WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
 
@@ -639,53 +663,79 @@ void HWR_FreeExtraSubsectors(void)
 #define MAXDIST 1.5f
 // BP: can't move vertex: DON'T change polygon geometry! (convex)
 //#define MOVEVERTEX
-static boolean PointInSeg(polyvertex_t *a,polyvertex_t *v1,polyvertex_t *v2)
+
+// Is vertex va  within the seg v1, v2
+static boolean PointInSeg(polyvertex_t *va,polyvertex_t *v1,polyvertex_t *v2)
 {
-	register float ax,ay,bx,by,cx,cy,d,norm;
-	register polyvertex_t *p;
+	register float ax, ay, bx, by, cx, cy, d, norm;
 
-	// check bbox of the seg first
-	if (v1->x > v2->x)
+	// check bbox of the seg first (without altering v1, v2)
+	if (v2->x > v1->x)
 	{
-		p = v1;
-		v1 = v2;
-		v2 = p;
+		// check if x within seg box  v1..v2
+		if ((va->x + MAXDIST) < v1->x) return false;
+		if ((va->x - MAXDIST) > v2->x) return false;
+	}
+	else
+	{
+		// check if x within seg box  v2..v1
+		if ((va->x + MAXDIST) < v2->x) return false;
+		if ((va->x - MAXDIST) > v1->x) return false;
 	}
 
-	if (a->x < v1->x-MAXDIST || a->x > v2->x+MAXDIST)
-		return false;
-
-	if (v1->y > v2->y)
+	if (v2->y > v1->y)
 	{
-		p = v1;
-		v1 = v2;
-		v2 = p;
+		// check if x within seg box  v1..v2
+		if ((va->y + MAXDIST) < v1->y) return false;
+		if ((va->y - MAXDIST) > v2->y) return false;
+	}
+	else
+	{
+		// check if x within seg box  v2..v1
+		if ((va->y + MAXDIST) < v2->y) return false;
+		if ((va->y - MAXDIST) > v1->y) return false;
 	}
-	if (a->y < v1->y-MAXDIST || a->y > v2->y+MAXDIST)
-		return false;
 
-	// v1 = origine
-	ax= v2->x-v1->x;
-	ay= v2->y-v1->y;
-	norm = hypotf(ax, ay);
+	// v1 = origin
+	ax = v2->x-v1->x;
+	ay = v2->y-v1->y;
+	norm = hypotf(ax, ay); // length of seg
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wfloat-equal"
 	if (norm != 0) // yes, this can be exactly 0
 #pragma GCC diagnostic pop
 	{
 		ax /= norm;
-		ay /= norm;
+		ay /= norm; // unit vector along seg, v1->v2
 	}
-	bx = a->x-v1->x;
-	by = a->y-v1->y;
-	//d = a.b
-	d =ax*bx+ay*by;
+
+	bx = va->x - v1->x;
+	by = va->y - v1->y;  // vector v1->va
+
+	// d = (a DOT b),  (product of lengths * cosine( angle ))
+	d = ax*bx+ay*by;
+
 	// bound of the seg
 	if (d < 0 || d > norm)
+	{
+		// Also excludes some va within MAXDIST of v1 or v2
 		return false;
-	//c = d.1a-b
+	}
+
+	// Cross product.
+	if (((by * ax) - (bx * ay)) <= 0)
+	{
+		// The vertex is to the rightside of the seg, so adding
+		// it to the polygon would worsen the crack.
+		return false;
+	}
+
+	// measure the error in vector bx,by as difference squared sum
+	//c= (d * unit_vector_seg) - b
 	cx = ax*d-bx;
 	cy = ay*d-by;
+
 #ifdef MOVEVERTEX
 	if (cx*cx+cy*cy <= MAXDIST*MAXDIST)
 	{
@@ -706,7 +756,7 @@ static INT32 numsplitpoly;
 static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly)
 {
 	poly_t  *q;
-	INT32     j,k;
+	INT32 j,k;
 
 	if (bspnum & NF_SUBSECTOR)
 	{
@@ -714,47 +764,55 @@ static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly)
 		{
 			bspnum &= ~NF_SUBSECTOR;
 			q = extrasubsectors[bspnum].planepoly;
+
 			if (poly == q || !q)
 				return;
-			for (j = 0; j < q->numpts; j++)
+
+			const INT32 numpts = q->numpts;
+
+			for (j = 0; j < numpts; j++)
 			{
 				k = j+1;
-				if (k == q->numpts) k = 0;
+				if (k == numpts)
+					k = 0;
+
 				if (!SameVertice(p, &q->pts[j])
 					&& !SameVertice(p, &q->pts[k])
-					&& PointInSeg(p, &q->pts[j],
-						&q->pts[k]))
+					&& PointInSeg(p, &q->pts[j], &q->pts[k]))
 				{
-					poly_t *newpoly = HWR_AllocPoly(q->numpts+1);
+					poly_t *newpoly = HWR_AllocPoly(numpts+1);
 					INT32 n;
 
 					for (n = 0; n <= j; n++)
 						newpoly->pts[n] = q->pts[n];
+
 					newpoly->pts[k] = *p;
+
 					for (n = k+1; n < newpoly->numpts; n++)
 						newpoly->pts[n] = q->pts[n-1];
+
 					numsplitpoly++;
-					extrasubsectors[bspnum].planepoly =
-						newpoly;
+					extrasubsectors[bspnum].planepoly = newpoly;
 					HWR_FreePoly(q);
 					return;
 				}
 			}
 		}
+
 		return;
 	}
 
 	if ((FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXBOTTOM])-MAXDIST <= p->y) &&
-	    (FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXTOP   ])+MAXDIST >= p->y) &&
-	    (FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXLEFT  ])-MAXDIST <= p->x) &&
-	    (FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXRIGHT ])+MAXDIST >= p->x))
-		SearchSegInBSP(nodes[bspnum].children[0],p,poly);
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXTOP   ])+MAXDIST >= p->y) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXLEFT  ])-MAXDIST <= p->x) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXRIGHT ])+MAXDIST >= p->x))
+		SearchSegInBSP(nodes[bspnum].children[0], p, poly);
 
 	if ((FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXBOTTOM])-MAXDIST <= p->y) &&
-	    (FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXTOP   ])+MAXDIST >= p->y) &&
-	    (FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXLEFT  ])-MAXDIST <= p->x) &&
-	    (FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXRIGHT ])+MAXDIST >= p->x))
-		SearchSegInBSP(nodes[bspnum].children[1],p,poly);
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXTOP   ])+MAXDIST >= p->y) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXLEFT  ])-MAXDIST <= p->x) &&
+		(FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXRIGHT ])+MAXDIST >= p->x))
+		SearchSegInBSP(nodes[bspnum].children[1], p, poly);
 }
 
 // search for T-intersection problem
@@ -768,7 +826,7 @@ static INT32 SolveTProblem(void)
 	INT32 i;
 	size_t l;
 
-	if (cv_grsolvetjoin.value == 0)
+	if (cv_glsolvetjoin.value == 0)
 		return 0;
 
 	CONS_Debug(DBG_RENDER, "Solving T-joins. This may take a while. Please wait...\n");
@@ -778,13 +836,18 @@ static INT32 SolveTProblem(void)
 	for (l = 0; l < addsubsector; l++)
 	{
 		p = extrasubsectors[l].planepoly;
+
 		if (!p)
 			continue;
 
 		for (i = 0; i < p->numpts; i++)
 			SearchSegInBSP((INT32)numnodes-1, &p->pts[i], p);
 	}
-	//CONS_Debug(DBG_RENDER, "numsplitpoly %d\n", numsplitpoly);
+
+#ifdef DEBUG_HWBSP
+	CONS_Debug(DBG_RENDER, "numsplitpoly %d\n", numsplitpoly);
+#endif
+
 	return numsplitpoly;
 }
 
@@ -824,29 +887,31 @@ static void AdjustSegs(void)
 			if (lseg->polyseg)
 				continue;
 
-			if (p) {
-				for (j = 0; j < p->numpts; j++)
+			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)
 				{
-					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;
-					}
+					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 (p && nearv1 <= NEARDIST*NEARDIST)
+
+			if (nearv1 <= NEARDIST*NEARDIST)
 				// share vertice with segs
 				lseg->pv1 = &(p->pts[v1found]);
 			else
@@ -861,7 +926,8 @@ static void AdjustSegs(void)
 				pv->y = FIXED_TO_FLOAT(lseg->v1->y);
 				lseg->pv1 = pv;
 			}
-			if (p && nearv2 <= NEARDIST*NEARDIST)
+
+			if (nearv2 <= NEARDIST*NEARDIST)
 				lseg->pv2 = &(p->pts[v2found]);
 			else
 			{
@@ -874,11 +940,15 @@ static void AdjustSegs(void)
 			// recompute length
 			{
 				float x,y;
-				x = ((polyvertex_t *)lseg->pv2)->x - ((polyvertex_t *)lseg->pv1)->x
-					+ FIXED_TO_FLOAT(FRACUNIT/2);
-				y = ((polyvertex_t *)lseg->pv2)->y - ((polyvertex_t *)lseg->pv1)->y
-					+ FIXED_TO_FLOAT(FRACUNIT/2);
-				lseg->flength = (float)hypot(x, y);
+
+				const polyvertex_t *pv1 = (polyvertex_t *)lseg->pv1;
+				const polyvertex_t *pv2 = (polyvertex_t *)lseg->pv2;
+
+				x = pv2->x - pv1->x + 0.5f;
+				y = pv2->y - pv1->y + 0.5f;
+
+				lseg->flength = hypotf(x, y);
+
 				// BP: debug see this kind of segs
 				//if (nearv2 > NEARDIST*NEARDIST || nearv1 > NEARDIST*NEARDIST)
 				//    lseg->length = 1;
@@ -904,29 +974,29 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 	I_FinishUpdate(); // page flip or blit buffer
 #endif
 
-	// reset the portal flag
-	gr_maphasportals = 0;
+	// reset the portal and horizonline flag
+	gl_maphasportals = gl_maphashorizonlines = 0;
 
 	// find min/max boundaries of map
-	//CONS_Debug(DBG_RENDER, "Looking for boundaries of map...\n");
+#ifdef DEBUG_HWBSP
+	CONS_Debug(DBG_RENDER, "Looking for boundaries of map...\n");
+#endif
 	M_ClearBox(rootbbox);
 	for (i = 0;i < numvertexes; i++)
 		M_AddToBox(rootbbox, vertexes[i].x, vertexes[i].y);
 
-	//CONS_Debug(DBG_RENDER, "Generating subsector polygons... %d subsectors\n", numsubsectors);
+#ifdef DEBUG_HWBSP
+	CONS_Debug(DBG_RENDER, "Generating subsector polygons... %d subsectors\n", numsubsectors);
+#endif
 
 	HWR_FreeExtraSubsectors();
+
 	// allocate extra data for each subsector present in map
 	totsubsectors = numsubsectors + NEWSUBSECTORS;
 	extrasubsectors = calloc(totsubsectors, sizeof (*extrasubsectors));
-	if (extrasubsectors == NULL)
+	if (UNLIKELY(extrasubsectors == NULL))
 		I_Error("couldn't malloc extrasubsectors totsubsectors %s\n", sizeu1(totsubsectors));
 
-	// allocate table for back to front drawing of subsectors
-	/*gr_drawsubsectors = (INT16 *)malloc(sizeof (*gr_drawsubsectors) * totsubsectors);
-	if (!gr_drawsubsectors)
-		I_Error("couldn't malloc gr_drawsubsectors\n");*/
-
 	// number of the first new subsector that might be added
 	addsubsector = numsubsectors;
 
@@ -950,17 +1020,21 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
 	WalkBSPNode(bspnum, rootp, NULL,rootbbox);
 
 	i = SolveTProblem();
-	//CONS_Debug(DBG_RENDER, "%d point divides a polygon line\n",i);
+#ifdef DEBUG_HWBSP
+	CONS_Debug(DBG_RENDER, "%d point divides a polygon line\n",i);
+#endif
 	AdjustSegs();
 
+#ifdef DEBUG_HWBSP
 	//debug debug..
-	//if (nobackpoly)
-	//    CONS_Debug(DBG_RENDER, "no back polygon %u times\n",nobackpoly);
+	if (nobackpoly)
+	    CONS_Debug(DBG_RENDER, "no back polygon %u times\n",nobackpoly);
 	//"(should happen only with the deep water trick)"
-	//if (skipcut)
-	//    CONS_Debug(DBG_RENDER, "%u cuts were skipped because of only one point\n",skipcut);
+	if (skipcut)
+	    CONS_Debug(DBG_RENDER, "%u cuts were skipped because of only one point\n",skipcut);
 
-	//CONS_Debug(DBG_RENDER, "done: %u total subsector convex polygons\n", totalsubsecpolys);
+	CONS_Debug(DBG_RENDER, "done: %u total subsector convex polygons\n", totalsubsecpolys);
+#endif
 }
 
 #endif //HWRENDER
diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c
index 98034970d..79859686f 100644
--- a/src/hardware/hw_cache.c
+++ b/src/hardware/hw_cache.c
@@ -14,9 +14,10 @@
 #include "../doomdef.h"
 
 #ifdef HWRENDER
+
 #include "hw_main.h"
 #include "hw_glob.h"
-#include "hw_drv.h"
+#include "hw_gl.h"
 #include "hw_batching.h"
 
 #include "../doomstat.h"    //gamemode
@@ -27,37 +28,38 @@
 #include "../v_video.h"
 #include "../r_draw.h"
 #include "../r_main.h"
-#include "../r_patch.h"    // patch rotation
+#include "../r_patch.h"
+#include "../p_setup.h" // levelflats
+#include "../p_spec.h" // anim_t
+#include "../r_sky.h"
 
 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.
 
-// Returns a pointer to the palette which should be used for caching textures.
-RGBA_t *HWR_GetTexturePalette(void)
-{
-	return HWR_ShouldUsePaletteRendering() ? mapPalette : pLocalPalette;
-}
-
 static INT32 format2bpp(GLTextureFormat_t format)
 {
-	if (format == GL_TEXFMT_RGBA)
-		return 4;
-	else if (format == GL_TEXFMT_ALPHA_INTENSITY_88 || format == GL_TEXFMT_AP_88)
-		return 2;
-	else
-		return 1;
+	switch (format)
+	{
+		case GL_TEXFMT_RGBA:
+			return 4;
+		case GL_TEXFMT_ALPHA_INTENSITY_88:
+		case GL_TEXFMT_AP_88:
+			return 2;
+		default:
+			return 1;
+	}
 }
 
 // This code was originally placed directly in HWR_DrawPatchInCache.
 // It is now split from it for my sanity! (and the sanity of others)
 // -- Monster Iestyn (13/02/19)
 static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipmap_t *mipmap,
-								INT32 pblockheight, INT32 blockmodulo,
-								fixed_t yfracstep, fixed_t scale_y,
-								texpatch_t *originPatch, INT32 patchheight,
-								INT32 bpp, RGBA_t *palette)
+								  INT32 pblockheight, INT32 blockmodulo,
+								  fixed_t yfracstep, fixed_t scale_y,
+								  texpatch_t *originPatch, INT32 patchheight,
+								  INT32 bpp, RGBA_t *palette)
 {
 	fixed_t yfrac, position, count;
 	UINT8 *dest;
@@ -94,10 +96,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
 			position = 0;
 		}
 
-		position = ((position * scale_y) + (FRACUNIT/2)) >> FRACBITS;
-
-		if (position < 0)
-			position = 0;
+		position = max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
 
 		if (position + count >= pblockheight)
 			count = pblockheight - position;
@@ -108,22 +107,23 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
 			count--;
 
 			texel = source[yfrac>>FRACBITS];
-			alpha = 0xff;
+			alpha = 0xFF;
 
-			//Hurdler: not perfect, but better than holes
-			if (texel == HWR_PATCHES_CHROMAKEY_COLORINDEX && (mipmap->flags & TF_CHROMAKEYED))
+			// Make pixel transparent if chroma keyed
+			if ((mipmap->flags & TF_CHROMAKEYED) && (texel == HWR_PATCHES_CHROMAKEY_COLORINDEX))
 				alpha = 0x00;
 
 			//Hurdler: 25/04/2000: now support colormap in hardware mode
 			if (mipmap->colormap)
-				texel = mipmap->colormap[texel];
+				texel = mipmap->colormap->data[texel];
 
 			// hope compiler will get this switch out of the loops (dreams...)
 			// gcc do it ! but vcc not ! (why don't use cygwin gcc for win32 ?)
 			// Alam: SRB2 uses Mingw, HUGS
 			switch (bpp)
 			{
-				case 2 : texelu16 = (UINT16)((alpha<<8) | texel);
+				case 2 : // uhhhhhhhh..........
+						 texelu16 = (UINT16)((alpha<<8) | texel);
 						 memcpy(dest, &texelu16, sizeof(UINT16));
 						 break;
 				case 3 : colortemp = palette[texel];
@@ -141,6 +141,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
 			dest += blockmodulo;
 			yfrac += yfracstep;
 		}
+
 		patchcol = (const column_t *)((const UINT8 *)patchcol + patchcol->length + 4);
 	}
 }
@@ -166,7 +167,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
 
 	if (pwidth <= 0 || pheight <= 0)
 		return;
-	
+
 	palette = HWR_GetTexturePalette();
 
 	ncols = pwidth;
@@ -182,12 +183,13 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
 	if (bpp < 1 || bpp > 4)
 		I_Error("HWR_DrawPatchInCache: no drawer defined for this bpp (%d)\n",bpp);
 
+	// NOTE: should this actually be pblockwidth*bpp?
 	blockmodulo = pblockwidth*bpp;
 
 	// Draw each column to the block cache
 	for (; ncols--; block += bpp, xfrac += xfracstep)
 	{
-		patchcol = (const column_t *)((const UINT8 *)realpatch + LONG(realpatch->columnofs[xfrac>>FRACBITS]));
+		patchcol = (const column_t *)((const UINT8 *)realpatch->columns + (realpatch->columnofs[xfrac>>FRACBITS]));
 
 		HWR_DrawColumnInCache(patchcol, block, mipmap,
 								pblockheight, blockmodulo,
@@ -201,7 +203,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
 static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
 	INT32 pblockwidth, INT32 pblockheight,
 	texture_t *texture, texpatch_t *patch,
-	const patch_t *realpatch)
+	const softwarepatch_t *realpatch)
 {
 	INT32 x, x1, x2;
 	INT32 col, ncols;
@@ -216,8 +218,6 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
 
 	if (texture->width <= 0 || texture->height <= 0)
 		return;
-	
-	palette = HWR_GetTexturePalette();
 
 	x1 = patch->originx;
 	width = SHORT(realpatch->width);
@@ -230,6 +230,8 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
 	if (patch->originy > texture->height || (patch->originy + height) < 0)
 		return; // patch not located within texture's y bounds, ignore
 
+	palette = HWR_GetTexturePalette();
+
 	// patch is actually inside the texture!
 	// now check if texture is partly off-screen and adjust accordingly
 
@@ -260,6 +262,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
 	if (bpp < 1 || bpp > 4)
 		I_Error("HWR_DrawTexturePatchInCache: no drawer defined for this bpp (%d)\n",bpp);
 
+	// NOTE: should this actually be pblockwidth*bpp?
 	blockmodulo = pblockwidth*bpp;
 
 	// Draw each column to the block cache
@@ -275,15 +278,15 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
 	}
 }
 
-static UINT8 *MakeBlock(GLMipmap_t *grMipmap)
+static UINT8 *MakeBlock(GLMipmap_t *glMipmap)
 {
 	UINT8 *block;
 	INT32 bpp, i;
 	UINT16 bu16 = ((0x00 <<8) | HWR_PATCHES_CHROMAKEY_COLORINDEX);
-	INT32 blocksize = (grMipmap->width * grMipmap->height);
+	INT32 blocksize = (glMipmap->width * glMipmap->height);
 
-	bpp =  format2bpp(grMipmap->format);
-	block = Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(grMipmap->data));
+	bpp =  format2bpp(glMipmap->format);
+	block = Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data));
 
 	switch (bpp)
 	{
@@ -303,70 +306,70 @@ static UINT8 *MakeBlock(GLMipmap_t *grMipmap)
 // Create a composite texture from patches, adapt the texture size to a power of 2
 // height and width for the hardware texture cache.
 //
-static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *grtex, boolean noencore)
+static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noencore)
 {
 	UINT8 *block;
 	texture_t *texture;
 	texpatch_t *patch;
-	patch_t *realpatch;
+	softwarepatch_t *realpatch;
+	UINT8 *pdata;
 	INT32 blockwidth, blockheight, blocksize;
 
-	INT32 i;
-	boolean skyspecial = false; //poor hack for Legacy large skies..
-	
+	UINT8 *colormap = colormaps;
+
+	INT32 i, idx;
+	boolean skyspecial = false; // poor hack for Legacy large skies..
+
 	RGBA_t *palette;
-	palette = HWR_GetTexturePalette();
 
 	texture = textures[texnum];
 
+	gltex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
+	gltex->mipmap.format = textureformat;
+
 	// hack the Legacy skies..
-	if (texture->name[0] == 'S' &&
-	    texture->name[1] == 'K' &&
-	    texture->name[2] == 'Y' &&
-	    (texture->name[4] == 0 ||
-	     texture->name[5] == 0)
-	   )
+	if (UNLIKELY(strncmp(texture->name, "SKY", 3) == 0 &&
+		(texture->name[4] == 0 || texture->name[5] == 0)))
 	{
 		skyspecial = true;
-		grtex->mipmap.flags = TF_WRAPXY; // don't use the chromakey for sky
+		gltex->mipmap.flags &= ~TF_CHROMAKEYED; // don't use the chromakey for sky
+		gltex->mipmap.format = GL_TEXFMT_RGBA; // that skyspecial code below assumes this format ...
 	}
-	else
-		grtex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
 
-	grtex->mipmap.width = (UINT16)texture->width;
-	grtex->mipmap.height = (UINT16)texture->height;
-
-	if (skyspecial)
-		grtex->mipmap.format = GL_TEXFMT_RGBA; // that skyspecial code below assumes this format ...
-	else
-		grtex->mipmap.format = textureformat;
-
-	grtex->mipmap.colormap = colormaps;
+	gltex->mipmap.width = (UINT16)(texture->width);
+	gltex->mipmap.height = (UINT16)(texture->height);
 
 #ifdef GLENCORE
 	if (encoremap && !noencore)
-		grtex->mipmap.colormap += COLORMAP_REMAPOFFSET;
+		colormap += COLORMAP_REMAPOFFSET;
 #endif
-	
+
+	gltex->mipmap.colormap = Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL);
+	gltex->mipmap.colormap->source = colormap;
+	M_Memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
+
 	blockwidth = texture->width;
 	blockheight = texture->height;
 	blocksize = (blockwidth * blockheight);
-	block = MakeBlock(&grtex->mipmap);
+	block = MakeBlock(&gltex->mipmap);
 
-	if (skyspecial) //Hurdler: not efficient, but better than holes in the sky (and it's done only at level loading)
+	if (UNLIKELY(skyspecial)) // Hurdler: not efficient, but better than holes in the sky (and it's done only at level loading)
 	{
 		INT32 j;
 		RGBA_t col;
 
+		palette = HWR_GetTexturePalette();
+
 		col = palette[HWR_CHROMAKEY_EQUIVALENTCOLORINDEX];
-		for (j = 0; j < blockheight; j++)
+
+		for (idx = 0, j = 0; j < blockheight; j++)
 		{
-			for (i = 0; i < blockwidth; i++)
+			for (i = 0; i < blockwidth; i++, idx++)
 			{
-				block[4*(j*blockwidth+i)+0] = col.s.red;
-				block[4*(j*blockwidth+i)+1] = col.s.green;
-				block[4*(j*blockwidth+i)+2] = col.s.blue;
-				block[4*(j*blockwidth+i)+3] = 0xff;
+				block[4*idx+0] = col.s.red;
+				block[4*idx+1] = col.s.green;
+				block[4*idx+2] = col.s.blue;
+				block[4*idx+3] = 0xff;
 			}
 		}
 	}
@@ -374,96 +377,117 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *grtex, boolean noe
 	// Composite the columns together.
 	for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
 	{
-		realpatch = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_CACHE);
-		HWR_DrawTexturePatchInCache(&grtex->mipmap,
-		                     blockwidth, blockheight,
-		                     texture, patch,
-		                     realpatch);
-		Z_Unlock(realpatch);
+		pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
+		realpatch = (softwarepatch_t *)pdata;
+
+		HWR_DrawTexturePatchInCache(&gltex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
 	}
 
 	//Hurdler: not efficient at all but I don't remember exactly how HWR_DrawPatchInCache works :(
-	if (format2bpp(grtex->mipmap.format)==4)
+	if (format2bpp(gltex->mipmap.format) == 4)
 	{
 		for (i = 3; i < blocksize*4; i += 4) // blocksize*4 because blocksize doesn't include the bpp
 		{
 			if (block[i] != 0)
 				continue;
 
-			grtex->mipmap.flags |= TF_TRANSPARENT;
+			gltex->mipmap.flags |= TF_TRANSPARENT;
 			break;
 		}
 	}
 
-	grtex->scaleX = 1.0f/(texture->width*FRACUNIT);
-	grtex->scaleY = 1.0f/(texture->height*FRACUNIT);
+	gltex->scaleX = 1.0f/(texture->width*FRACUNIT);
+	gltex->scaleY = 1.0f/(texture->height*FRACUNIT);
 }
 
-// patch may be NULL if grMipmap has been initialised already and makebitmap is false
-void HWR_MakePatch (patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipmap, boolean makebitmap)
+// patch may be NULL if glMipmap has been initialised already and makebitmap is false
+void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipmap, boolean makebitmap)
 {
-	// don't do it twice (like a cache)
-	if (grMipmap->width == 0)
+	if (glMipmap->width == 0)
 	{
-		// save the original patch header so that the GLPatch can be casted
-		// into a standard patch_t struct and the existing code can get the
-		// orginal patch dimensions and offsets.
-		grPatch->width = SHORT(patch->width);
-		grPatch->height = SHORT(patch->height);
-		grPatch->leftoffset = SHORT(patch->leftoffset);
-		grPatch->topoffset = SHORT(patch->topoffset);
-
-		//grMipmap->width = (UINT16)SHORT(patch->width);
-		//grMipmap->height = (UINT16)SHORT(patch->height);
-		grMipmap->width = grMipmap->height = 1;
-		while (grMipmap->width < grPatch->width) grMipmap->width <<= 1;
-		while (grMipmap->height < grPatch->height) grMipmap->height <<= 1;
+		glMipmap->width = glMipmap->height = 1;
+		while (glMipmap->width < patch->width) glMipmap->width <<= 1;
+		while (glMipmap->height < patch->height) glMipmap->height <<= 1;
 
 		// no wrap around, no chroma key
-		grMipmap->flags = 0;
+		glMipmap->flags = 0;
+
 		// setup the texture info
-		grMipmap->format = patchformat;
-		
-		//grPatch->max_s = grPatch->max_t = 1.0f;
-		grPatch->max_s = (float)grPatch->width / (float)grMipmap->width;
-		grPatch->max_t = (float)grPatch->height / (float)grMipmap->height;
+		glMipmap->format = patchformat;
+
+		glPatch->max_s = (float)patch->width / (float)glMipmap->width;
+		glPatch->max_t = (float)patch->height / (float)glMipmap->height;
 	}
 
-	Z_Free(grMipmap->data);
-	grMipmap->data = NULL;
+	Z_Free(glMipmap->data);
+	glMipmap->data = NULL;
 
 	if (makebitmap)
 	{
-		MakeBlock(grMipmap);
-		HWR_DrawPatchInCache(grMipmap,
-			grMipmap->width, grMipmap->height,
-			grPatch->width, grPatch->height,
+		MakeBlock(glMipmap);
+
+		HWR_DrawPatchInCache(glMipmap,
+			glMipmap->width, glMipmap->height,
+			patch->width, patch->height,
 			patch);
 	}
-
-	//grPatch->max_s = grPatch->max_t = 1.0f;
 }
 
 // =================================================
 //             CACHING HANDLING
 // =================================================
 
-static size_t gr_numtextures;
-static GLMapTexture_t *gr_textures; // For all textures
+static size_t gl_numtextures = 0; // Texture count
+static GLMapTexture_t *gl_textures; // For all textures
 
-void HWR_InitTextureCache(void)
+void HWR_FreeTextureData(patch_t *patch)
 {
-	gr_numtextures = 0;
-	gr_textures = NULL;
+	GLPatch_t *glPatch;
+
+	if (!patch || !patch->hardware)
+		return;
+
+	glPatch = patch->hardware;
+
+	if (vid.glstate == VID_GL_LIBRARY_LOADED)
+		GL_DeleteTexture(glPatch->mipmap);
+	if (glPatch->mipmap->data)
+		Z_Free(glPatch->mipmap->data);
 }
 
-// Callback function for HWR_FreeTextureCache.
-static void FreeMipmapColormap(INT32 patchnum, void *patch)
+void HWR_FreeTexture(patch_t *patch)
 {
-	GLPatch_t* const pat = patch;
-	(void)patchnum; //unused
+	if (!patch)
+		return;
+
+	if (patch->hardware)
+	{
+		GLPatch_t *glPatch = patch->hardware;
+
+		HWR_FreeTextureColormaps(patch);
+
+		if (glPatch->mipmap)
+		{
+			HWR_FreeTextureData(patch);
+			Z_Free(glPatch->mipmap);
+		}
+
+		Z_Free(patch->hardware);
+	}
+
+	patch->hardware = NULL;
+}
+
+// Called by HWR_FreePatchCache.
+void HWR_FreeTextureColormaps(patch_t *patch)
+{
+	GLPatch_t *pat;
 
 	// The patch must be valid, obviously
+	if (!patch)
+		return;
+
+	pat = patch->hardware;
 	if (!pat)
 		return;
 
@@ -485,66 +509,362 @@ static void FreeMipmapColormap(INT32 patchnum, void *patch)
 
 		// Set the first colormap to the one that comes after it.
 		next = pat->mipmap->nextcolormap;
-		if (!next)
-			break;
-
 		pat->mipmap->nextcolormap = next->nextcolormap;
 
 		// Free image data from memory.
 		if (next->data)
 			Z_Free(next->data);
+		if (next->colormap)
+			Z_Free(next->colormap);
 		next->data = NULL;
-		HWD.pfnDeleteTexture(next);
+		next->colormap = NULL;
+		GL_DeleteTexture(next);
 
 		// Free the old colormap mipmap from memory.
 		free(next);
 	}
 }
 
-void HWR_FreeMipmapCache(void)
+static boolean FreeTextureCallback(void *mem)
 {
-	INT32 i;
-	// free references to the textures
-	HWD.pfnClearMipMapCache();
-
-	// free all hardware-converted graphics cached in the heap
-	// our gool is only the textures since user of the texture is the texture cache
-	Z_FreeTags(PU_HWRCACHE, PU_HWRCACHE);
-	Z_FreeTags(PU_HWRCACHE_UNLOCKED, PU_HWRCACHE_UNLOCKED);
-
-	// Alam: free the Z_Blocks before freeing it's users
-
-	// free all patch colormaps after each level: must be done after ClearMipMapCache!
-	for (i = 0; i < numwadfiles; i++)
-		M_AATreeIterate(wadfiles[i]->hwrcache, FreeMipmapColormap);
+	patch_t *patch = (patch_t *)mem;
+	HWR_FreeTexture(patch);
+	return false;
 }
 
-void HWR_FreeTextureCache(void)
+static boolean FreeColormapsCallback(void *mem)
+{
+	patch_t *patch = (patch_t *)mem;
+	HWR_FreeTextureColormaps(patch);
+	return false;
+}
+
+static void HWR_FreePatchCache(boolean freeall)
+{
+	boolean (*callback)(void *mem) = FreeTextureCallback;
+
+	if (!freeall)
+		callback = FreeColormapsCallback;
+
+	//Z_IterateTags(PU_PATCH, PU_PATCH_ROTATED, callback);
+	Z_IterateTags(PU_PATCH, PU_PATCH, callback);
+	Z_IterateTags(PU_SPRITE, PU_HUDGFX, callback);
+}
+
+// free all textures after each level
+void HWR_ClearAllTextures(void)
 {
 	// free references to the textures
-	HWR_FreeMipmapCache();
+	GL_ClearMipMapCache();
+	HWR_FreePatchCache(true);
+}
+
+void HWR_FreeColormapCache(void)
+{
+	HWR_FreePatchCache(false);
+}
+
+void HWR_InitMapTextures(void)
+{
+	gl_textures = NULL;
+}
+
+static void FreeMapTexture(GLMapTexture_t *tex)
+{
+	GL_DeleteTexture(&tex->mipmap);
+	if (tex->mipmap.data)
+		Z_Free(tex->mipmap.data);
+	tex->mipmap.data = NULL;
+}
+
+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
+	{
+		FreeMapTexture(&gl_textures[i]);
+	}
 
 	// now the heap don't have any 'user' pointing to our
 	// texturecache info, we can free it
-	if (gr_textures)
-		free(gr_textures);
-	gr_textures = NULL;
-	gr_numtextures = 0;
+	if (gl_textures)
+		free(gl_textures);
+	gl_textures = NULL;
+	gl_numtextures = 0;
 }
 
-void HWR_LoadTextures(size_t pnumtextures)
+static void HWR_PrecacheLevelFlats(void)
 {
-	// we must free it since numtextures changed
-	HWR_FreeTextureCache();
+	levelflat_t levelflat;
+	lumpnum_t lump;
+	size_t i, j;
+	INT32 k;
 
-	gr_numtextures = pnumtextures;
+	// special case for encore
 #ifdef GLENCORE
-	gr_textures = calloc(pnumtextures, sizeof (*gr_textures)*2); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore)
-#else
-	gr_textures = calloc(pnumtextures, sizeof (*gr_textures));
+	if (encoremode)
+	{
+		// go through all sectors to determine if it should be remapped for encore
+		for (i = 0; i < numsectors; i++)
+		{
+			sector_t *sec = &sectors[i];
+
+			// sector checked already?
+			if (sec->validcount == validcount)
+				continue;
+
+			sec->validcount = validcount;
+
+			// gotta check sector floor and ceiling
+			for (j = 0; j < 2; j++)
+			{
+				const boolean ceiling = (j == 0);
+				INT32 pic = ceiling ? sec->ceilingpic : sec->floorpic;
+
+				levelflat = levelflats[pic];
+
+				lump = levelflat.lumpnum;
+				HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
+
+				if (levelflat.speed) // it is an animated flat
+				{
+					for (k = 1; k < levelflat.numpics; k++)
+					{
+						lump = levelflat.baselumpnum + k;
+						HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
+					}
+				}
+			}
+		}
+	}
+	else
 #endif
-	if (gr_textures == NULL)
-		I_Error("HWR_LoadTextures: ran out of memory for OpenGL textures. Sad!");
+	{
+		// on non encore we have it simple
+		// just load every flat in the level
+		for (i = 0; i < numlevelflats; i++)
+		{
+			levelflat = levelflats[i];
+			lump = levelflat.lumpnum;
+
+			HWR_GetFlat(lump, false);
+
+			if (levelflat.speed) // it is an animated flat
+			{
+				for (k = 1; k < levelflat.numpics; k++)
+				{
+					lump = levelflat.baselumpnum + k;
+					HWR_GetFlat(lump, false);
+				}
+			}
+		}
+	}
+}
+
+static void HWR_PrecacheLevelTextures(void)
+{
+	char *texturepresent;
+	anim_t *anim;
+	size_t i, j;
+	INT32 h;
+
+	texturepresent = calloc(numtextures, sizeof (*texturepresent));
+	if (texturepresent == NULL) I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
+
+	for (i = 0; i < numlines; i++)
+	{
+		line_t *line = &lines[i];
+#ifdef GLENCORE
+		const int noencoremap = ((line->flags & ML_TFERLINE) ? 2 : 1);
+#else
+		const int noencoremap = 1;
+#endif
+
+		// line checked already?
+		if (line->validcount == validcount)
+			continue;
+
+		line->validcount = validcount;
+
+		// two sides
+		for (j = 0; j < 2; j++)
+		{
+			side_t *side = &sides[line->sidenum[j]];
+
+			// Single-side linedef
+			if (line->sidenum[j] == 0xffff)
+				continue;
+
+			if (side->toptexture >= 0 && side->toptexture < numtextures)
+			{
+				texturepresent[side->toptexture] = 1|noencoremap;
+			}
+			if (side->midtexture >= 0 && side->midtexture < numtextures)
+			{
+				texturepresent[side->midtexture] = 1|noencoremap;
+			}
+			if (side->bottomtexture >= 0 && side->bottomtexture < numtextures)
+			{
+				texturepresent[side->bottomtexture] = 1|noencoremap;
+			}
+		}
+	}
+
+	// check for animated textures
+	for (anim = anims; anim < lastanim; anim++)
+	{
+		if (!anim->istexture)
+			continue;
+
+		const char texpresent = texturepresent[anim->basepic];
+
+		if (!texpresent)
+			continue;
+
+		if (texpresent & 1)
+		{
+			for (h = 1; h < anim->numpics; h++)
+			{
+				HWR_GetTexture(anim->basepic+h, false);
+			}
+		}
+#ifdef GLENCORE
+		if (texpresent & 2)
+		{
+			for (h = 1; h < anim->numpics; h++)
+			{
+				HWR_GetTexture(anim->basepic+h, true);
+			}
+		}
+#endif
+	}
+
+	// Sky texture is always present.
+	// Note that F_SKY1 is the name used to indicate a sky floor/ceiling as a flat,
+	// while the sky texture is stored like a wall texture, with a skynum dependent name.
+	texturepresent[skytexture] = 1;
+
+	for (i = 0; i < (unsigned)numtextures; i++)
+	{
+		const char texpresent = texturepresent[i];
+
+		if (!texpresent)
+			continue;
+
+		if (texpresent & 1)
+		{
+			HWR_GetTexture(i, false);
+		}
+#ifdef GLENCORE
+		if (texpresent & 2)
+		{
+			HWR_GetTexture(i, true);
+		}
+#endif
+	}
+	free(texturepresent);
+}
+
+static void HWR_PrecacheLevelSprites(void)
+{
+	patch_t *spritepatch;
+	char *spritepresent;
+	size_t i, j, k;
+	lumpnum_t lump;
+
+	thinker_t *th;
+	mobj_t *mo;
+	spriteframe_t *sf;
+
+	spritepresent = calloc(numsprites, sizeof (*spritepresent));
+	if (spritepresent == NULL) I_Error("%s: Out of memory looking up sprites", "HWR_PrecacheLevel");
+
+	for (th = thinkercap.next; th != &thinkercap; th = th->next)
+	{
+		if (th->function != (actionf_p1)P_MobjThinker)
+			continue;
+
+		mo = (mobj_t *)th;
+
+		// ogl is weird
+		// for some reason it does not want to preload sprites with colormaps
+		// so just save us the work
+		if (mo->color || mo->colorized)
+			continue;
+
+		spritepresent[mo->sprite] = 1;
+	}
+
+	for (i = 0; i < numsprites; i++)
+	{
+		if (!spritepresent[i])
+			continue;
+
+		for (j = 0; j < sprites[i].numframes; j++)
+		{
+			sf = &sprites[i].spriteframes[j];
+
+#define cacheang(a) {\
+				lump = sf->lumppat[a];\
+				spritepatch = (patch_t *)W_CachePatchNum(lump, PU_SPRITE);\
+				if (spritepatch != NULL)\
+					HWR_GetPatch(spritepatch);\
+			}
+			// see R_InitSprites for more about lumppat,lumpid
+			switch (sf->rotate)
+			{
+				case SRF_SINGLE:
+					cacheang(0);
+					break;
+				case SRF_2D:
+					cacheang(2);
+					cacheang(6);
+					break;
+				default:
+					k = 8;
+					while (k--)
+						cacheang(k);
+					break;
+			}
+#undef cacheang
+		}
+	}
+	free(spritepresent);
+}
+
+void HWR_PrecacheLevel(void)
+{
+	if (rendermode != render_opengl)
+		return;
+
+	// Precache flats.
+	HWR_PrecacheLevelFlats();
+
+	// Precache textures.
+	HWR_PrecacheLevelTextures();
+
+	// Precache sprites.
+	HWR_PrecacheLevelSprites();
+}
+
+void HWR_LoadMapTextures(size_t pnumtextures)
+{
+	// we must free it since numtextures may have changed
+	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
+	if (gl_textures == NULL)
+		I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
 }
 
 // --------------------------------------------------------------------------
@@ -552,9 +872,9 @@ void HWR_LoadTextures(size_t pnumtextures)
 // --------------------------------------------------------------------------
 GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
 {
-	GLMapTexture_t *grtex;
+	GLMapTexture_t *gltex;
 
-	if (tex < 0 || tex >= (signed)gr_numtextures)
+	if (tex < 0 || tex >= (signed)gl_numtextures)
 	{
 #ifdef PARANOIA
 		I_Error("HWR_GetTexture: Invalid texture ID %d", tex);
@@ -562,27 +882,31 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
 		tex = 0;
 #endif
 	}
+
+	// Every texture in memory, stored in the
+	// hardware renderer's bit depth format. Wow!
 #ifdef GLENCORE
-	grtex = &gr_textures[tex*2 + (encoremap && !noencore ? 0 : 1)];
+	gltex = &gl_textures[tex*2 + (encoremap && !noencore ? 0 : 1)];
 #else
-	grtex = &gr_textures[tex];
+	gltex = &gl_textures[tex];
 #endif
-	if (!grtex->mipmap.data && !grtex->mipmap.downloaded)
-		HWR_GenerateTexture(tex, grtex, noencore);
 
-	// If hardware does not have the texture, then call pfnSetTexture to upload it
-	if (!grtex->mipmap.downloaded)
-		HWD.pfnSetTexture(&grtex->mipmap);
+	// Generate texture if missing from the cache
+	if (!gltex->mipmap.data && !gltex->mipmap.downloaded)
+		HWR_GenerateTexture(tex, gltex, noencore);
 
-	HWR_SetCurrentTexture(&grtex->mipmap);
+	// If hardware does not have the texture, then call GL_SetTexture to upload it
+	if (!gltex->mipmap.downloaded)
+		GL_SetTexture(&gltex->mipmap);
+	HWR_SetCurrentTexture(&gltex->mipmap);
 
 	// The system-memory data can be purged now.
-	Z_ChangeTag(grtex->mipmap.data, PU_HWRCACHE_UNLOCKED);
+	Z_ChangeTag(gltex->mipmap.data, PU_HWRCACHE_UNLOCKED);
 
-	return grtex;
+	return gltex;
 }
 
-static void HWR_CacheFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum)
+static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
 {
 #ifdef GLENCORE
 	UINT8 *flat;
@@ -591,8 +915,8 @@ static void HWR_CacheFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum)
 	size_t size, pflatsize;
 
 	// setup the texture info
-	grMipmap->format = GL_TEXFMT_P_8;
-	grMipmap->flags = TF_WRAPXY|TF_CHROMAKEYED;
+	glMipmap->format = GL_TEXFMT_P_8;
+	glMipmap->flags = TF_WRAPXY|TF_CHROMAKEYED;
 
 	size = W_LumpLength(flatlumpnum);
 
@@ -620,21 +944,21 @@ static void HWR_CacheFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum)
 			pflatsize = 64;
 			break;
 	}
-	grMipmap->width  = (UINT16)pflatsize;
-	grMipmap->height = (UINT16)pflatsize;
+
+	glMipmap->width  = (UINT16)pflatsize;
+	glMipmap->height = (UINT16)pflatsize;
 
 	// the flat raw data needn't be converted with palettized textures
-	W_ReadLump(flatlumpnum, Z_Malloc(W_LumpLength(flatlumpnum),
-		PU_HWRCACHE, &grMipmap->data));
+	W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &glMipmap->data));
 
 #ifdef GLENCORE
-	flat = grMipmap->data;
+	flat = glMipmap->data;
 	for (steppy = 0; steppy < size; steppy++)
 	{
 		if (flat[steppy] == HWR_PATCHES_CHROMAKEY_COLORINDEX)
 			continue;
 
-		flat[steppy] = grMipmap->colormap[flat[steppy]];
+		flat[steppy] = glMipmap->colormap->source[flat[steppy]];
 	}
 #endif
 }
@@ -642,161 +966,169 @@ static void HWR_CacheFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum)
 // Download a Doom 'flat' to the hardware cache and make it ready for use
 void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
 {
-	GLMipmap_t *grmip;
-	
+	GLMipmap_t *glMipmap;
+	patch_t *patch;
+	UINT8 *colormap = colormaps;
+
 	if (flatlumpnum == LUMPERROR)
 		return;
 
-	grmip = HWR_GetCachedGLPatch(flatlumpnum)->mipmap;
-
-	grmip->colormap = colormaps;
+	patch = HWR_GetCachedGLPatch(flatlumpnum);
+	glMipmap = ((GLPatch_t *)Patch_AllocateHardwarePatch(patch))->mipmap;
 
+	if (!glMipmap->colormap)
+	{
 #ifdef GLENCORE
-	if (!noencoremap && encoremap)
-		grmip->colormap += COLORMAP_REMAPOFFSET;
+		if (!noencoremap && encoremap)
+			colormap += COLORMAP_REMAPOFFSET;
 #endif
-
-	if (!grmip->downloaded && !grmip->data)
-		HWR_CacheFlat(grmip, flatlumpnum);
-
-	// If hardware does not have the texture, then call pfnSetTexture to upload it
-	if (!grmip->downloaded)
-		HWD.pfnSetTexture(grmip);
-	HWR_SetCurrentTexture(grmip);
-
-	// The system-memory data can be purged now.
-	Z_ChangeTag(grmip->data, PU_HWRCACHE_UNLOCKED);
-}
-
-//
-// HWR_LoadMappedPatch(): replace the skin color of the sprite in cache
-//                          : load it first in doom cache if not already
-//
-static void HWR_LoadMappedPatch(GLMipmap_t *grmip, GLPatch_t *gpatch)
-{
-	if (!grmip->downloaded && !grmip->data)
-	{
-		patch_t *patch = gpatch->rawpatch;
-		if (!patch)
-			patch = W_CacheLumpNumPwad(gpatch->wadnum, gpatch->lumpnum, PU_STATIC);
-		HWR_MakePatch(patch, gpatch, grmip, true);
-
-		// You can't free rawpatch for some reason?
-		// (Obviously I can't, sprite rotation needs that...)
-
-		if (!gpatch->rawpatch)
-			Z_Free(patch);
+		glMipmap->colormap = Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
+		glMipmap->colormap->source = colormap;
+		M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 	}
 
-	// If hardware does not have the texture, then call pfnSetTexture to upload it
-	if (!grmip->downloaded)
-		HWD.pfnSetTexture(grmip);
-	HWR_SetCurrentTexture(grmip);
+	if (!glMipmap->downloaded && !glMipmap->data)
+		HWR_CacheFlat(glMipmap, flatlumpnum);
+
+	// If hardware does not have the texture, then call GL_SetTexture to upload it
+	if (!glMipmap->downloaded)
+		GL_SetTexture(glMipmap);
+	HWR_SetCurrentTexture(glMipmap);
 
 	// The system-memory data can be purged now.
-	Z_ChangeTag(grmip->data, PU_HWRCACHE_UNLOCKED);
+	Z_ChangeTag(glMipmap->data, PU_HWRCACHE_UNLOCKED);
+}
+
+// --------------------+
+// HWR_LoadPatchMipmap : Generates a patch into a mipmap, usually the mipmap inside the patch itself
+// --------------------+
+static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
+{
+	GLPatch_t *glPatch = patch->hardware;
+
+	if (!glMipmap->downloaded && !glMipmap->data)
+		HWR_MakePatch(patch, glPatch, glMipmap, true);
+
+	// If hardware does not have the texture, then call GL_SetTexture to upload it
+	if (!glMipmap->downloaded)
+		GL_SetTexture(glMipmap);
+	HWR_SetCurrentTexture(glMipmap);
+
+	// The system-memory data can be purged now.
+	Z_ChangeTag(glMipmap->data, PU_HWRCACHE_UNLOCKED);
+}
+
+// ----------------------+
+// HWR_UpdatePatchMipmap : Updates a mipmap.
+// ----------------------+
+static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
+{
+	GLPatch_t *grPatch = patch->hardware;
+	HWR_MakePatch(patch, grPatch, 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
+	if (!glMipmap->downloaded)
+		GL_SetTexture(glMipmap);
+	else
+		GL_UpdateTexture(glMipmap);
+	HWR_SetCurrentTexture(glMipmap);
+
+	// The system-memory data can be purged now.
+	Z_ChangeTag(glMipmap->data, PU_HWRCACHE_UNLOCKED);
 }
 
 // -----------------+
-// HWR_GetPatch     : Download a patch to the hardware cache and make it ready for use
+// HWR_GetPatch     : Downloads a patch to the hardware cache and make it ready for use
 // -----------------+
-void HWR_GetPatch(GLPatch_t *gpatch)
+void HWR_GetPatch(patch_t *patch)
 {
-	// is it in hardware cache
-	if (!gpatch->mipmap->downloaded && !gpatch->mipmap->data)
-	{
-		// load the software patch, PU_STATIC or the Z_Malloc for hardware patch will
-		// flush the software patch before the conversion! oh yeah I suffered
-		patch_t *ptr = gpatch->rawpatch;
-		if (!ptr)
-			ptr = W_CacheLumpNumPwad(gpatch->wadnum, gpatch->lumpnum, PU_STATIC);
-		HWR_MakePatch(ptr, gpatch, gpatch->mipmap, true);
-
-		// this is inefficient.. but the hardware patch in heap is purgeable so it should
-		// not fragment memory, and besides the REAL cache here is the hardware memory
-		if (!gpatch->rawpatch)
-			Z_Free(ptr);
-	}
-
-	// If hardware does not have the texture, then call pfnSetTexture to upload it
-	if (!gpatch->mipmap->downloaded)
-		HWD.pfnSetTexture(gpatch->mipmap);
-	HWR_SetCurrentTexture(gpatch->mipmap);
-
-	// The system-memory patch data can be purged now.
-	Z_ChangeTag(gpatch->mipmap->data, PU_HWRCACHE_UNLOCKED);
+	if (!patch->hardware)
+		Patch_CreateGL(patch);
+	HWR_LoadPatchMipmap(patch, ((GLPatch_t *)patch->hardware)->mipmap);
 }
 
-
 // -------------------+
 // HWR_GetMappedPatch : Same as HWR_GetPatch for sprite color
 // -------------------+
-void HWR_GetMappedPatch(GLPatch_t *gpatch, const UINT8 *colormap)
+void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
 {
-	GLMipmap_t *grmip, *newmip;
+	GLPatch_t *glPatch;
+	GLMipmap_t *glMipmap, *newMipmap;
+
+	if (!patch->hardware)
+		Patch_CreateGL(patch);
+	glPatch = patch->hardware;
 
 	// Blatant hack for encore colormapping aside...
 	if (colormap == colormaps || colormap == NULL || colormap == (const UINT8*)(COLORMAP_REMAPOFFSET))
 	{
-		// Load the default (green) color in doom cache (temporary?) AND hardware cache
-		HWR_GetPatch(gpatch);
+		// Load the default (green) color in hardware cache
+		HWR_GetPatch(patch);
 		return;
 	}
 
-	// search for the mimmap
+	// search for the mipmap
 	// skip the first (no colormap translated)
-	for (grmip = gpatch->mipmap; grmip->nextcolormap; )
+	for (glMipmap = glPatch->mipmap; LIKELY(glMipmap->nextcolormap);)
 	{
-		grmip = grmip->nextcolormap;
+		glMipmap = glMipmap->nextcolormap;
 
-		if (grmip->colormap != colormap)
-			continue;
+		if (UNLIKELY(glMipmap->colormap && glMipmap->colormap->source == colormap))
+		{
+			if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
+			{
+				M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+				HWR_UpdatePatchMipmap(patch, glMipmap);
+			}
+			else
+				HWR_LoadPatchMipmap(patch, glMipmap);
 
-		HWR_LoadMappedPatch(grmip, gpatch);
-		return;
+			return;
+		}
 	}
 	// not found, create it!
 	// If we are here, the sprite with the current colormap is not already in hardware memory
 
 	//BP: WARNING: don't free it manually without clearing the cache of harware renderer
 	//              (it have a liste of mipmap)
-	//    this malloc is cleared in HWR_FreeTextureCache
+	//    this malloc is cleared in HWR_FreeColormapCache
 	//    (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
-	newmip = calloc(1, sizeof (*newmip));
-	if (newmip == NULL)
+	newMipmap = calloc(1, sizeof (*newMipmap));
+	if (newMipmap == NULL)
 		I_Error("%s: Out of memory", "HWR_GetMappedPatch");
-	grmip->nextcolormap = newmip;
+	glMipmap->nextcolormap = newMipmap;
 
-	newmip->colormap = colormap;
-	HWR_LoadMappedPatch(newmip, gpatch);
+	newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
+	newMipmap->colormap->source = colormap;
+	M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+
+	HWR_LoadPatchMipmap(patch, newMipmap);
 }
 
-void HWR_UnlockCachedPatch(GLPatch_t *gpatch)
+void HWR_UnlockCachedPatch(GLPatch_t *glPatch)
 {
-	if (!gpatch)
+	if (!glPatch)
 		return;
 
-	Z_ChangeTag(gpatch->mipmap->data, PU_HWRCACHE_UNLOCKED);
+	Z_ChangeTag(glPatch->mipmap->data, PU_HWRCACHE_UNLOCKED);
 }
 
-GLPatch_t *HWR_GetCachedGLPatchPwad(UINT16 wadnum, UINT16 lumpnum)
+patch_t *HWR_GetCachedGLPatchPwad(UINT16 wadnum, UINT16 lumpnum)
 {
-	aatree_t *hwrcache = wadfiles[wadnum]->hwrcache;
-	GLPatch_t *grpatch;
+	lumpcache_t *lumpcache = wadfiles[wadnum]->patchcache;
 
-	if (!(grpatch = M_AATreeGet(hwrcache, lumpnum)))
+	if (!lumpcache[lumpnum])
 	{
-		grpatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, NULL);
-		grpatch->wadnum = wadnum;
-		grpatch->lumpnum = lumpnum;
-		grpatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, NULL);
-		M_AATreeSet(hwrcache, lumpnum, grpatch);
+		void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
+		Patch_Create(NULL, 0, ptr);
+		Patch_AllocateHardwarePatch(ptr);
 	}
 
-	return grpatch;
+	return (patch_t *)(lumpcache[lumpnum]);
 }
 
-GLPatch_t *HWR_GetCachedGLPatch(lumpnum_t lumpnum)
+patch_t *HWR_GetCachedGLPatch(lumpnum_t lumpnum)
 {
 	return HWR_GetCachedGLPatchPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum));
 }
@@ -817,14 +1149,15 @@ static void HWR_DrawFadeMaskInCache(GLMipmap_t *mipmap, INT32 pblockwidth, INT32
 	W_ReadLump(fademasklumpnum, Z_Malloc(W_LumpLength(fademasklumpnum),
 		PU_HWRCACHE, &flat));
 
-	stepy = ((INT32)SHORT(fmheight)<<FRACBITS)/pblockheight;
-	stepx = ((INT32)SHORT(fmwidth)<<FRACBITS)/pblockwidth;
+	stepy = ((INT32)fmheight<<FRACBITS)/pblockheight;
+	stepx = ((INT32)fmwidth<<FRACBITS)/pblockwidth;
 	posy = 0;
+
 	for (j = 0; j < pblockheight; j++)
 	{
 		posx = 0;
 		dest = &block[j*(mipmap->width)]; // 1bpp
-		src = &flat[(posy>>FRACBITS)*SHORT(fmwidth)];
+		src = &flat[(posy>>FRACBITS)*fmwidth];
 		for (i = 0; i < pblockwidth;i++)
 		{
 			// fademask bpp is always 1, and is used just for alpha
@@ -841,14 +1174,14 @@ static void HWR_DrawFadeMaskInCache(GLMipmap_t *mipmap, INT32 pblockwidth, INT32
 	Z_Free(flat);
 }
 
-static void HWR_CacheFadeMask(GLMipmap_t *grMipmap, lumpnum_t fademasklumpnum)
+static void HWR_CacheFadeMask(GLMipmap_t *glMipmap, lumpnum_t fademasklumpnum)
 {
 	size_t size;
 	UINT16 fmheight = 0, fmwidth = 0;
 
 	// setup the texture info
-	grMipmap->format = GL_TEXFMT_ALPHA_8; // put the correct alpha levels straight in so I don't need to convert it later
-	grMipmap->flags = 0;
+	glMipmap->format = GL_TEXFMT_ALPHA_8; // put the correct alpha levels straight in so I don't need to convert it later
+	glMipmap->flags = 0;
 
 	size = W_LumpLength(fademasklumpnum);
 
@@ -877,28 +1210,30 @@ static void HWR_CacheFadeMask(GLMipmap_t *grMipmap, lumpnum_t fademasklumpnum)
 	}
 
 	// Thankfully, this will still work for this scenario
-	grMipmap->width  = fmwidth;
-	grMipmap->height = fmheight;
+	glMipmap->width  = fmwidth;
+	glMipmap->height = fmheight;
 
-	MakeBlock(grMipmap);
+	MakeBlock(glMipmap);
 
-	HWR_DrawFadeMaskInCache(grMipmap, fmwidth, fmheight, fademasklumpnum, fmwidth, fmheight);
+	HWR_DrawFadeMaskInCache(glMipmap, fmwidth, fmheight, fademasklumpnum, fmwidth, fmheight);
 	// I DO need to convert this because it isn't power of 2 and we need the alpha
 }
 
 void HWR_GetFadeMask(lumpnum_t fademasklumpnum)
 {
-	GLMipmap_t *grmip;
+	GLMipmap_t *glMipmap;
+	patch_t *patch;
 
-	grmip = HWR_GetCachedGLPatch(fademasklumpnum)->mipmap;
+	patch = HWR_GetCachedGLPatch(fademasklumpnum);
+	glMipmap = ((GLPatch_t *)Patch_AllocateHardwarePatch(patch))->mipmap;
 
-	if (!grmip->downloaded && !grmip->data)
-		HWR_CacheFadeMask(grmip, fademasklumpnum);
+	if (!glMipmap->downloaded && !glMipmap->data)
+		HWR_CacheFadeMask(glMipmap, fademasklumpnum);
 
-	HWD.pfnSetTexture(grmip);
+	GL_SetTexture(glMipmap);
 
 	// The system-memory data can be purged now.
-	Z_ChangeTag(grmip->data, PU_HWRCACHE_UNLOCKED);
+	Z_ChangeTag(glMipmap->data, PU_HWRCACHE_UNLOCKED);
 }
 
 // =================================================
@@ -910,15 +1245,15 @@ void HWR_SetPalette(RGBA_t *palette)
 	if (HWR_ShouldUsePaletteRendering())
 	{
 		// set the palette for palette postprocessing
-		if (cv_grpalettedepth.value == 16)
+		if (cv_glpalettedepth.value == 16)
 		{
 			// crush to 16-bit rgb565, like software currently does in the standard configuration
 			// Note: Software's screenshots have the 24-bit palette, but the screen gets
 			// the 16-bit version! For making comparison screenshots either use an external screenshot
 			// tool or set the palette depth to 24 bits.
 			RGBA_t crushed_palette[256];
-			int i;
-			for (i = 0; i < 256; i++)
+
+			for (int i = 0; i < 256; i++)
 			{
 				float fred = (float)(palette[i].s.red >> 3);
 				float fgreen = (float)(palette[i].s.green >> 2);
@@ -928,21 +1263,21 @@ void HWR_SetPalette(RGBA_t *palette)
 				crushed_palette[i].s.blue = (UINT8)(fblue / 31.0f * 255.0f);
 				crushed_palette[i].s.alpha = 255;
 			}
-			HWD.pfnSetScreenPalette(crushed_palette);
+			GL_SetScreenPalette(crushed_palette);
 		}
 		else
 		{
-			HWD.pfnSetScreenPalette(palette);
+			GL_SetScreenPalette(palette);
 		}
 
 		// this part is responsible for keeping track of the palette OUTSIDE of a level.
-		if ((!(gamestate == GS_LEVEL)) || (gamestate == GS_TITLESCREEN))
+		if (gamestate != GS_LEVEL || gamestate == GS_TITLESCREEN)
 			HWR_SetMapPalette();
 	}
 	else
 	{
 		// set the palette for the textures
-		HWD.pfnSetTexturePalette(palette);
+		GL_SetPalette(palette);
 		// reset mapPalette so next call to HWR_SetMapPalette will update everything correctly
 		memset(mapPalette, 0, sizeof(mapPalette));
 		// hardware driver will flush there own cache if cache is non paletized
@@ -975,7 +1310,7 @@ static void HWR_SetPaletteLookup(RGBA_t *palette)
 		}
 	}
 #undef STEP_SIZE
-	HWD.pfnSetPaletteLookup(lut);
+	GL_SetPaletteLookup(lut);
 	Z_Free(lut);
 }
 
@@ -988,11 +1323,9 @@ void HWR_SetMapPalette(void)
 	RGBA_t *palette;
 	int i;
 
-	if ((!(gamestate == GS_LEVEL)) || (gamestate == GS_TITLESCREEN))
+	if (gamestate != GS_LEVEL || gamestate == GS_TITLESCREEN)
 	{
-		// outside of a level, pMasterPalette should have PLAYPAL ready for us
-		//palette = pMasterPalette; // we dont have this in kart so just use pLocalPalette as before
-
+		// outside of a level, pLocalPalette should have PLAYPAL ready for us
 		palette = pLocalPalette;
 	}
 	else
@@ -1002,8 +1335,10 @@ void HWR_SetMapPalette(void)
 		lumpnum_t lumpnum = W_GetNumForName(GetPalette());
 		size_t palsize = W_LumpLength(lumpnum);
 		UINT8 *RGB_data;
+
 		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);
 		// we got the RGB palette now, but we need it in RGBA format.
 		for (i = 0; i < 256; i++)
@@ -1023,7 +1358,7 @@ void HWR_SetMapPalette(void)
 		// in palette rendering mode, this means that all rgba textures now have wrong colors
 		// and the lookup table is outdated
 		HWR_SetPaletteLookup(mapPalette);
-		HWD.pfnSetTexturePalette(mapPalette);
+		GL_SetPalette(mapPalette);
 
 		if (patchformat == GL_TEXFMT_RGBA || textureformat == GL_TEXFMT_RGBA)
 		{
@@ -1046,16 +1381,16 @@ UINT32 HWR_CreateLightTable(UINT8 *lighttable)
 	for (i = 0; i < 256 * 32; i++)
 		hw_lighttable[i] = palette[lighttable[i]];
 
-	id = HWD.pfnCreateLightTable(hw_lighttable);
+	id = GL_CreateLightTable(hw_lighttable);
 	Z_Free(hw_lighttable);
 	return id;
 }
 
-
 // get hwr lighttable id for colormap, create it if it doesn't already exist
 UINT32 HWR_GetLightTableID(extracolormap_t *colormap)
 {
 	boolean default_colormap = false;
+
 	if (!colormap)
 	{
 		colormap = &extra_colormaps[num_extra_colormaps]; // a place to store the hw lighttable id
@@ -1072,6 +1407,7 @@ UINT32 HWR_GetLightTableID(extracolormap_t *colormap)
 			colormap_pointer = colormaps; // don't actually use the data from the "default colormap"
 		else
 			colormap_pointer = colormap->colormap;
+
 		colormap->gl_lighttable_id = HWR_CreateLightTable(colormap_pointer);
 	}
 
@@ -1083,7 +1419,7 @@ UINT32 HWR_GetLightTableID(extracolormap_t *colormap)
 void HWR_ClearLightTables(void)
 {
 	if (vid.glstate == VID_GL_LIBRARY_LOADED)
-		HWD.pfnClearLightTables();
+		GL_ClearLightTables();
 }
 
 #endif //HWRENDER
diff --git a/src/hardware/hw_clip.c b/src/hardware/hw_clip.c
index 2c6e1d52e..2fd60ef49 100644
--- a/src/hardware/hw_clip.c
+++ b/src/hardware/hw_clip.c
@@ -121,7 +121,7 @@ static clipnode_t * gld_clipnode_NewRange(angle_t start, angle_t end)
 
 boolean gld_clipper_SafeCheckRange(angle_t startAngle, angle_t endAngle)
 {
-	if(startAngle > endAngle)
+	if (startAngle > endAngle)
 	{
 		return (gld_clipper_IsRangeVisible(startAngle, ANGLE_MAX) || gld_clipper_IsRangeVisible(0, endAngle));
 	}
@@ -314,8 +314,6 @@ void gld_clipper_Clear(void)
 	cliphead = NULL;
 }
 
-#define RMUL (1.6f/1.333333f)
-
 angle_t gld_FrustumAngle(angle_t tiltangle)
 {
 	double clipfov;
@@ -333,11 +331,15 @@ 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 / projMatrix[0]) * 360 / M_PI;
+	clipfov = atan(1 / projMatrix[0]) * 360.0f / M_PIl;
 	floatangle = 2.0f + (45.0f + (tilt / 1.9f)) * clipfov / 90.0f;
 	if (floatangle >= 180.0)
 		return 0xffffffff;
+<<<<<<< HEAD
 	a1 = (angle_t)(ANG1 * (int)floatangle);
+=======
+	a1 = (angle_t)xs_CRoundToInt(ANG1 * floatangle);
+>>>>>>> Saturn-Next
 	return a1;
 }
 
@@ -458,4 +460,4 @@ boolean gld_SphereInFrustum(float x, float y, float z, float radius)
 	}
 	return true;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/hardware/hw_clip.h b/src/hardware/hw_clip.h
index dfaa87f81..4299fbaea 100644
--- a/src/hardware/hw_clip.h
+++ b/src/hardware/hw_clip.h
@@ -7,6 +7,10 @@
  *
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // OpenGL BSP clipping
 #include "../doomdef.h"
 #include "../tables.h"
@@ -22,3 +26,7 @@ angle_t gld_FrustumAngle(angle_t tiltangle);
 void gld_FrustumSetup(void);
 boolean gld_SphereInFrustum(float x, float y, float z, float radius);
 #endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/hardware/hw_data.h b/src/hardware/hw_data.h
index b149493c5..a1586cb90 100644
--- a/src/hardware/hw_data.h
+++ b/src/hardware/hw_data.h
@@ -23,62 +23,63 @@
 
 typedef enum GLTextureFormat_e
 {
-	GL_TEXFMT_P_8                 = 0x01, /* 8-bit palette */
-	GL_TEXFMT_AP_88               = 0x02, /* 8-bit alpha, 8-bit palette */
+	GL_TEXFMT_P_8					= 0x01, /* 8-bit palette */
+	GL_TEXFMT_AP_88					= 0x02, /* 8-bit alpha, 8-bit palette */
 
-	GL_TEXFMT_RGBA                = 0x10, /* 32 bit RGBA! */
+	GL_TEXFMT_RGBA					= 0x10, /* 32 bit RGBA! */
 
-	GL_TEXFMT_ALPHA_8             = 0x20, /* (0..0xFF) alpha     */
-	GL_TEXFMT_INTENSITY_8         = 0x21, /* (0..0xFF) intensity */
-	GL_TEXFMT_ALPHA_INTENSITY_88  = 0x22,
+	GL_TEXFMT_ALPHA_8				= 0x20, /* (0..0xFF) alpha     */
+	GL_TEXFMT_INTENSITY_8			= 0x21, /* (0..0xFF) intensity */
+	GL_TEXFMT_ALPHA_INTENSITY_88	= 0x22,
 } GLTextureFormat_t;
 
-// data holds the address of the graphics data cached in heap memory
-//                NULL if the texture is not in Doom heap cache.
+// Colormap structure for mipmaps.
+struct GLColormap_s
+{
+	const UINT8 *source;
+	UINT8 data[256];
+};
+typedef struct GLColormap_s GLColormap_t;
+
+// Texture information (misleadingly named "mipmap" all over the code.)
+// The *data pointer holds the address of the graphics data cached in heap memory.
+// NULL if the texture is not in SRB2's heap cache.
 struct GLMipmap_s
 {
-	GLTextureFormat_t 		format;
-	void              		*data;
+	// for UpdateTexture
+	GLTextureFormat_t		format;
+	void					*data;
 
-	UINT32          		flags;
-	UINT16 					width, height;
-	UINT32 					downloaded;		// tex_downloaded
+	UINT32					flags;
+	UINT16					width, height;
+	UINT32					downloaded; // The GPU has this texture.
 
+<<<<<<< HEAD
 	struct	GLMipmap_s 		*nextcolormap;
 	const 	UINT8 			*colormap;
+=======
+	struct	GLMipmap_s		*nextcolormap;
+	struct GLColormap_s		*colormap;
+>>>>>>> Saturn-Next
 };
 typedef struct GLMipmap_s GLMipmap_t;
 
 //
-// Doom texture info, as cached for hardware rendering
+// Level textures, as cached for hardware rendering.
 //
 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;
 
-// a cached patch as converted to hardware format, holding the original patch_t
-// header so that the existing code can retrieve ->width, ->height as usual
-// This is returned by W_CachePatchNum()/W_CachePatchName(), when rendermode
-// is 'render_opengl'. Else it returns the normal patch_t data.
+// Patch information for the hardware renderer.
 struct GLPatch_s
 {
-	// the 4 first fields come right away from the original patch_t
-	INT16				width;
-	INT16				height;
-	INT16				leftoffset;     // pixels to the left of origin
-	INT16				topoffset;      // pixels below the origin
-	//
-	float				max_s,max_t;
-	UINT16				wadnum;      // the software patch lump num for when the hardware patch
-	UINT16              lumpnum;     // was flushed, and we need to re-create it
-	void                *rawpatch;   // :^)
 	GLMipmap_t			*mipmap;
-
-	boolean				notfound; // if the texture file was not found, mark it here (used in model texture loading)
+	float				max_s,max_t;
 };
 typedef struct GLPatch_s GLPatch_t;
 
diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h
index 7d2d17532..1da42770a 100644
--- a/src/hardware/hw_defs.h
+++ b/src/hardware/hw_defs.h
@@ -121,44 +121,33 @@ typedef struct
 	poly_t *planepoly;  // the generated convex polygon
 } extrasubsector_t;
 
-//here lies gr_vissprite
-
-// Kart features
-#define USE_FTRANSFORM_ANGLEZ
-#define USE_FTRANSFORM_MIRROR
-
 // Vanilla features
 //#define USE_MODEL_NEXTFRAME
 
 typedef struct
 {
 	FLOAT       x,y,z;           // position
-#ifdef USE_FTRANSFORM_ANGLEZ
-	FLOAT       anglex,angley,anglez;   // aimingangle / viewangle
-	FLOAT       anglex2,anglez2;        // secondaries
-#else
-	FLOAT       anglex,angley;   // aimingangle / viewangle
-	FLOAT       anglex2;         // secondaries
-#endif
-	FLOAT       scalex,scaley,scalez;
-	FLOAT       spritexscale,spriteyscale;
-	FLOAT       fovxangle, fovyangle;
+	FLOAT       anglex, angley, anglez;   // aimingangle / viewangle
+	FLOAT       scalex, scaley, scalez;
+	FLOAT       fovangle;
 	UINT8       splitscreen;
-	boolean     flip;            // screenflip
 	boolean     roll;
-	boolean     rollmodel;
-	SINT8       rollflip;
 	FLOAT       rollangle;
-	UINT8       rotaxis;
 	FLOAT       centerx, centery;
-#ifdef USE_FTRANSFORM_MIRROR
-	boolean     mirror;          // SRB2Kart: Encore Mode
-	boolean     mirrorflip;      // Encore Mode with Flipcam
-#endif
+	FLOAT       rollx, rollz;
+	UINT8       fliptype;
 	boolean     shearing;        // 14042019
-	angle_t     viewaiming;      // 17052019
+	float       viewaiming;      // 17052019
 } FTransform;
 
+enum
+{
+	TRANSFORM_NONE   = 0,
+	TRANSFORM_FLIP   = 1 << 0,                             // screenflip
+	TRANSFORM_MIRROR = 1 << 1,                             // SRB2Kart: Encore Mode
+	TRANSFORM_MIRRORFLIP = TRANSFORM_FLIP|TRANSFORM_MIRROR // SRB2Kart: Encore Mode with Flipcam
+};
+
 // Transformed vector, as passed to HWR API
 typedef struct
 {
@@ -166,6 +155,41 @@ typedef struct
 	FLOAT       s,t;
 } FOutVector;
 
+typedef struct vbo_vertex_s
+{
+	float x, y, z;
+	float u, v;
+	unsigned char r, g, b, a;
+} gl_skyvertex_t;
+
+typedef enum gl_skyloopmode_e
+{
+	HWD_SKYLOOP_FAN,
+	HWD_SKYLOOP_STRIP
+} gl_skyloopmode_t;
+
+typedef struct
+{
+	gl_skyloopmode_t mode;
+	int vertexcount;
+	int vertexindex;
+	boolean use_texture;
+} gl_skyloopdef_t;
+
+typedef struct
+{
+	unsigned int vbo;
+	int rows, columns;
+	int loopcount;
+
+	int detail, vertex_count;
+	int texture, width, height;
+	boolean rebuild; // VBO needs to be rebuilt
+
+	gl_skyloopdef_t *loops;
+	gl_skyvertex_t *data;
+} gl_sky_t;
+
 // Shader targets used to render specific types of geometry.
 // A shader target is resolved to an actual shader with HWR_GetShaderFromTarget.
 // The shader returned may be a base shader or a custom shader.
@@ -173,7 +197,6 @@ enum
 {
 	SHADER_NONE = -1,
 	SHADER_FLOOR = 0,
-	SHADER_SHADOW,
 	SHADER_WALL,
 	SHADER_SPRITE,
 	SHADER_MODEL,
@@ -204,7 +227,6 @@ enum hwdshaderstage
 
 typedef enum hwdshaderstage hwdshaderstage_t;
 
-
 // ==========================================================================
 //                                                               RENDER MODES
 // ==========================================================================
@@ -215,22 +237,22 @@ enum EPolyFlags
 {
 	// the first 5 are mutually exclusive
 
-	PF_Masked           = 0x00000001,   // Poly is alpha scaled and 0 alpha pels are discarded (holes in texture)
+	PF_Masked           = 0x00000001,   // Poly is alpha scaled and 0 alpha pixels are discarded (holes in texture)
 	PF_Translucent      = 0x00000002,   // Poly is transparent, alpha = level of transparency
-	PF_Additive         = 0x00000004,   // Poly is added to the frame buffer
-	PF_Environment      = 0x00000008,   // Poly should be drawn environment mapped.
-	                                    // Hurdler: used for text drawing
-	PF_Substractive     = 0x00000010,   // for splat
-	PF_NoAlphaTest      = 0x00000020,   // hiden param
-	PF_Fog              = 0x00000040,   // Fog blocks
-	PF_Blending         = (PF_Environment|PF_Additive|PF_Translucent|PF_Masked|PF_Substractive|PF_Fog)&~PF_NoAlphaTest,
+	PF_Environment      = 0x00000004,   // Poly should be drawn environment mapped. (Hurdler: used for text drawing)
+	PF_Additive         = 0x00000008,   // Source blending factor is additive.
+	PF_Subtractive      = 0x00000010,   // Subtractive color blending
+	PF_ReverseSubtract  = 0x00000020,   // Reverse subtract, used in wall splats (decals)
+	PF_Multiplicative   = 0x00000040,   // Multiplicative color blending
+	PF_Fog              = 0x20000000,   // Fog blocks
+	PF_NoAlphaTest      = 0x40000000,   // Disables alpha testing
+	PF_Blending         = (PF_Masked|PF_Translucent|PF_Environment|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Fog) & ~PF_NoAlphaTest,
 
 	// other flag bits
-
-	PF_Occlude          = 0x00000100,   // Update the depth buffer
-	PF_NoDepthTest      = 0x00000200,   // Disable the depth test mode
-	PF_Invisible        = 0x00000400,   // Disable write to color buffer
-	PF_Decal            = 0x00000800,   // Enable polygon offset
+	PF_Occlude          = 0x00000100,   // Updates the depth buffer
+	PF_NoDepthTest      = 0x00000200,   // Disables the depth test mode
+	PF_Invisible        = 0x00000400,   // Disables write to color buffer
+	PF_Decal            = 0x00000800,   // Enables polygon offset
 	PF_Modulated        = 0x00001000,   // Modulation (multiply output with constant RGBA)
 	                                    // When set, pass the color constant into the FSurfaceInfo -> FlatColor
 	PF_NoTexture        = 0x00002000,   // Disable texture
@@ -239,7 +261,8 @@ enum EPolyFlags
 	PF_RemoveYWrap      = 0x00010000,   // Force clamp texture on Y
 	PF_ForceWrapX       = 0x00020000,   // Force repeat texture on X
 	PF_ForceWrapY       = 0x00040000,   // Forces repeat texture on Y
-	PF_Ripple           = 0x00100000    // Water ripple effect. The current backend doesn't use it for anything.
+	PF_Ripple           = 0x00100000,   // Water ripple effect. The current backend doesn't use it for anything.
+	PF_Skydecal         = 0x20000000    // Enables smaller polygon offset, to be used for skywalls only
 	//                    0x20000000
 	//                    0x40000000
 	//                    0x80000000
@@ -272,6 +295,7 @@ struct FLightInfo
 	FUINT			light_level;
 	FUINT			fade_start;
 	FUINT			fade_end;
+	boolean			directional;
 };
 typedef struct FLightInfo FLightInfo;
 
@@ -289,14 +313,13 @@ typedef struct FSurfaceInfo FSurfaceInfo;
 
 enum hwdsetspecialstate
 {
-#ifdef USE_FBO_OGL
-	HWD_SET_FRAMEBUFFER,
-#endif
 	HWD_SET_SHADERS,
 
 	HWD_SET_TEXTUREFILTERMODE,
 	HWD_SET_TEXTUREANISOTROPICMODE,
-	
+
+	HWD_SET_WIREFRAME,
+
 	HWD_SET_MSAA,
 
 	HWD_SET_SCREEN_TEXTURES,
@@ -304,6 +327,8 @@ enum hwdsetspecialstate
 	HWD_SET_PORTAL_MODE,// new portal thing
 	HWD_SET_STENCIL_LEVEL,
 
+	HWD_SET_TEXTURE_FORMAT,
+
 	HWD_NUMSTATE
 };
 typedef enum hwdsetspecialstate hwdspecialstate_t;
@@ -313,6 +338,11 @@ typedef enum hwdsetspecialstate hwdspecialstate_t;
 enum hwdshaderinfo
 {
 	HWD_SHADERINFO_LEVELTIME = 1,
+	HWD_SHADERINFO_LIGHT_X,
+	HWD_SHADERINFO_LIGHT_Y,
+	HWD_SHADERINFO_LIGHT_Z,
+	HWD_SHADERINFO_LIGHT_CONTRAST,
+	HWD_SHADERINFO_LIGHT_BACKLIGHT,
 };
 
 typedef enum hwdshaderinfo hwdshaderinfo_t;
@@ -346,6 +376,7 @@ enum hwdscreentexture
 	HWD_SCREENTEXTURE_WIPE_END,   // destination image for the wipe/fade effect
 	HWD_SCREENTEXTURE_GENERIC1,   // underwater/heat effect, intermission background
 	HWD_SCREENTEXTURE_GENERIC2,   // palette-based colormap fade, final screen texture
+	HWD_SCREENTEXTURE_VHS,
 	NUMSCREENTEXTURES,            // (generic3 is unused if palette rendering is disabled)
 };
 typedef enum hwdscreentexture hwdscreentexture_t;
diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index ee0fd0b85..1b082c3a6 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -18,9 +18,10 @@
 #include "../doomdef.h"
 
 #ifdef HWRENDER
+
 #include "hw_main.h"
 #include "hw_glob.h"
-#include "hw_drv.h"
+#include "hw_gl.h"
 
 #include "../m_misc.h" //FIL_WriteFile()
 #include "../r_draw.h" //viewborderlump
@@ -61,16 +62,20 @@ static UINT8 softwaretranstogl[11]    = {  0, 25, 51, 76,102,127,153,178,204,229
 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 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(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option)
+void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option)
 {
 	FOutVector v[4];
 	FBITFIELD flags;
+	GLPatch_t *hwrPatch;
 
 //  3--2
 //  | /|
@@ -83,6 +88,7 @@ void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option)
 
 	// make patch ready in hardware cache
 	HWR_GetPatch(gpatch);
+	hwrPatch = ((GLPatch_t *)gpatch->hardware);
 
 	switch (option & V_SCALEPATCHMASK)
 	{
@@ -90,29 +96,29 @@ void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option)
 		pdupx = pdupy = 2.0f;
 		break;
 	case V_SMALLSCALEPATCH:
-		pdupx = 2.0f * FIXED_TO_FLOAT(vid.fsmalldupx);
-		pdupy = 2.0f * FIXED_TO_FLOAT(vid.fsmalldupy);
+		pdupx = 2.0f * FIXED_TO_FLOAT(vid.smalldupx*FRACUNIT);
+		pdupy = 2.0f * FIXED_TO_FLOAT(vid.smalldupy*FRACUNIT);
 		break;
 	case V_MEDSCALEPATCH:
-		pdupx = 2.0f * FIXED_TO_FLOAT(vid.fmeddupx);
-		pdupy = 2.0f * FIXED_TO_FLOAT(vid.fmeddupy);
+		pdupx = 2.0f * FIXED_TO_FLOAT(vid.meddupx*FRACUNIT);
+		pdupy = 2.0f * FIXED_TO_FLOAT(vid.meddupx*FRACUNIT);
 		break;
 	}
 
 	if (option & V_NOSCALESTART)
 		sdupx = sdupy = 2.0f;
 
-	v[0].x = v[3].x = (x*sdupx-SHORT(gpatch->leftoffset)*pdupx)/vid.width - 1;
-	v[2].x = v[1].x = (x*sdupx+(SHORT(gpatch->width)-SHORT(gpatch->leftoffset))*pdupx)/vid.width - 1;
-	v[0].y = v[1].y = 1-(y*sdupy-SHORT(gpatch->topoffset)*pdupy)/vid.height;
-	v[2].y = v[3].y = 1-(y*sdupy+(SHORT(gpatch->height)-SHORT(gpatch->topoffset))*pdupy)/vid.height;
+	v[0].x = v[3].x = (x*sdupx-gpatch->leftoffset*pdupx)/vid.width - 1;
+	v[2].x = v[1].x = (x*sdupx+(gpatch->width - gpatch->leftoffset)*pdupx)/vid.width - 1;
+	v[0].y = v[1].y = 1-(y*sdupy-gpatch->topoffset*pdupy)/vid.height;
+	v[2].y = v[3].y = 1-(y*sdupy+(gpatch->height - gpatch->topoffset)*pdupy)/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 = gpatch->max_s;
+	v[2].s = v[1].s = hwrPatch->max_s;
 	v[0].t = v[1].t = 0.0f;
-	v[2].t = v[3].t = gpatch->max_t;
+	v[2].t = v[3].t = hwrPatch->max_t;
 
 	flags = PF_Translucent|PF_NoDepthTest;
 
@@ -122,16 +128,18 @@ void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option)
 		flags |= PF_ForceWrapY;
 
 	// clip it since it is used for bunny scroll in doom I
-	HWD.pfnDrawPolygon(NULL, v, 4, flags);
+	GL_DrawPolygon(NULL, v, 4, flags);
 }
 
-void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap)
+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];
 	FBITFIELD flags;
 	float cx = FIXED_TO_FLOAT(x);
 	float cy = FIXED_TO_FLOAT(y);
 	UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
+	UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT);
+	GLPatch_t *hwrPatch;
 
 //  3--2
 //  | /|
@@ -142,12 +150,17 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
 	if (alphalevel >= 10 && alphalevel < 13)
 		return;
 
+	const float fvw = (float)vid.width;
+	const float fvh = (float)vid.height;
+
 	// make patch ready in hardware cache
 	if (!colormap)
 		HWR_GetPatch(gpatch);
 	else
 		HWR_GetMappedPatch(gpatch, colormap);
 
+	hwrPatch = ((GLPatch_t *)gpatch->hardware);
+
 	dupx = (float)vid.dupx;
 	dupy = (float)vid.dupy;
 
@@ -178,13 +191,13 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
 
 		// left offset
 		if (option & V_FLIP)
-			offsetx = (float)(SHORT(gpatch->width) - SHORT(gpatch->leftoffset)) * fscalew;
+			offsetx = (float)(gpatch->width - gpatch->leftoffset) * fscalew;
 		else
-			offsetx = (float)SHORT(gpatch->leftoffset) * fscalew;
+			offsetx = (float)(gpatch->leftoffset) * fscalew;
 
 		// top offset
 		// TODO: make some kind of vertical version of V_FLIP, maybe by deprecating V_OFFSET in future?!?
-		offsety = (float)SHORT(gpatch->topoffset) * fscaleh;
+		offsety = (float)(gpatch->topoffset) * fscaleh;
 
 		if ((option & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy for crosshairs
 		{
@@ -212,56 +225,46 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
 			// if it's meant to cover the whole screen, black out the rest
 			// cx and cy are possibly *slightly* off from float maths
 			// This is done before here compared to software because we directly alter cx and cy to centre
-			if (cx >= -0.1f && cx <= 0.1f && SHORT(gpatch->width) == BASEVIDWIDTH && cy >= -0.1f && cy <= 0.1f && SHORT(gpatch->height) == BASEVIDHEIGHT)
+			if (cx >= -0.1f && cx <= 0.1f && gpatch->width == BASEVIDWIDTH && cy >= -0.1f && cy <= 0.1f && gpatch->height == BASEVIDHEIGHT)
 			{
-				// Need to temporarily cache the real patch to get the colour of the top left pixel
-				patch_t *realpatch = W_CacheLumpNumPwad(gpatch->wadnum, gpatch->lumpnum, PU_STATIC);
-				const column_t *column = (const column_t *)((const UINT8 *)(realpatch) + LONG((realpatch)->columnofs[0]));
+				const column_t *column = (const column_t *)((const UINT8 *)(gpatch->columns) + (gpatch->columnofs[0]));
+
 				if (!column->topdelta)
 				{
 					const UINT8 *source = (const UINT8 *)(column) + 3;
 					HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
 				}
-				Z_Free(realpatch);
 			}
 			// centre screen
-			if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
+			if (fabsf(fvw - FLOATBASEVIDWIDTH * dupx) > 1.0E-36f)
 			{
 				if (option & V_SNAPTORIGHT)
-					cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+					cx += (fvw - (FLOATBASEVIDWIDTH * dupx));
 				else if (!(option & V_SNAPTOLEFT))
-					cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/2;
+					cx += (fvw - (FLOATBASEVIDWIDTH * dupx))/2.0f;
 			}
-			if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f)
+			if (fabsf(fvh - FLOATBASEVIDHEIGHT * dupy) > 1.0E-36f)
 			{
 				if ((option & (V_SPLITSCREEN|V_SNAPTOTOP)) == (V_SPLITSCREEN|V_SNAPTOTOP))
-					cy += ((float)vid.height/2 - ((float)BASEVIDHEIGHT/2 * dupy));
+					cy += (fvh/2.0f - (FLOATBASEVIDHEIGHT/2.0f * dupy));
 				else if (option & V_SNAPTOBOTTOM)
-					cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+					cy += (fvh - (FLOATBASEVIDHEIGHT * dupy));
 				else if (!(option & V_SNAPTOTOP))
-					cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/2;
+					cy += (fvh - (FLOATBASEVIDHEIGHT * dupy))/2.0f;
 			}
 		}
 	}
 
-	if (pscale != FRACUNIT)
-	{
-		fwidth = (float)SHORT(gpatch->width) * fscalew * dupx;
-		fheight = (float)SHORT(gpatch->height) * fscaleh * dupy;
-	}
-	else
-	{
-		fwidth = (float)SHORT(gpatch->width) * dupx;
-		fheight = (float)SHORT(gpatch->height) * dupy;
-	}
+	fwidth = (float)(gpatch->width) * fscalew * dupx;
+	fheight = (float)(gpatch->height) * fscaleh * dupy;
 
 	// positions of the cx, cy, are between 0 and vid.width/vid.height now, we need them to be between -1 and 1
-	cx = -1 + (cx / (vid.width/2));
-	cy = 1 - (cy / (vid.height/2));
+	cx = -1.0f + (cx / (fvw / 2.0f));
+	cy = 1.0f - (cy / (fvh / 2.0f));
 
 	// fwidth and fheight are similar
-	fwidth /= vid.width / 2;
-	fheight /= vid.height / 2;
+	fwidth /= fvw / 2.0f;
+	fheight /= fvh / 2.0f;
 
 	// set the polygon vertices to the right positions
 	v[0].x = v[3].x = cx;
@@ -274,48 +277,57 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
 
 	if (option & V_FLIP)
 	{
-		v[0].s = v[3].s = gpatch->max_s;
+		v[0].s = v[3].s = hwrPatch->max_s;
 		v[2].s = v[1].s = 0.0f;
 	}
 	else
 	{
 		v[0].s = v[3].s = 0.0f;
-		v[2].s = v[1].s = gpatch->max_s;
+		v[2].s = v[1].s = hwrPatch->max_s;
 	}
 
 	v[0].t = v[1].t = 0.0f;
-	v[2].t = v[3].t = gpatch->max_t;
+	v[2].t = v[3].t = hwrPatch->max_t;
 
-	flags = PF_Translucent|PF_NoDepthTest;
+	// clip it since it is used for bunny scroll in doom I
+	if (blendmode)
+		flags = HWR_GetBlendModeFlag(blendmode+1)|PF_NoDepthTest;
+	else
+		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
 	if (alphalevel)
 	{
 		FSurfaceInfo Surf;
 		Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
-		if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[hudtrans];
-		else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[hudtrans];
-		else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[hudtrans];
-		else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel];
+
+		switch (alphalevel)
+		{
+			case 13: Surf.PolyColor.s.alpha = softwaretranstogl_lo[hudtrans];   break;
+			case 14: Surf.PolyColor.s.alpha = softwaretranstogl[hudtrans];      break;
+			case 15: Surf.PolyColor.s.alpha = softwaretranstogl_hi[hudtrans];   break;
+			default: Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; break;
+		}
+
 		flags |= PF_Modulated;
-		HWD.pfnDrawPolygon(&Surf, v, 4, flags);
+		GL_DrawPolygon(&Surf, v, 4, flags);
 	}
 	else
-		HWD.pfnDrawPolygon(NULL, v, 4, flags);
+		GL_DrawPolygon(NULL, v, 4, flags);
 }
 
-void HWR_DrawCroppedPatch(GLPatch_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_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)
 {
 	FOutVector v[4];
 	FBITFIELD flags;
 	float cx = FIXED_TO_FLOAT(x);
 	float cy = FIXED_TO_FLOAT(y);
 	UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
+	GLPatch_t *hwrPatch;
 
 //  3--2
 //  | /|
@@ -326,8 +338,12 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
 	if (alphalevel >= 10 && alphalevel < 13)
 		return;
 
+	const float fvw = (float)vid.width;
+	const float fvh = (float)vid.height;
+
 	// make patch ready in hardware cache
 	HWR_GetPatch(gpatch);
+	hwrPatch = ((GLPatch_t *)gpatch->hardware);
 
 	dupx = (float)vid.dupx;
 	dupy = (float)vid.dupy;
@@ -350,8 +366,8 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
 	dupx = dupy = (dupx < dupy ? dupx : dupy);
 	fscale = FIXED_TO_FLOAT(pscale);
 
-	cy -= (float)SHORT(gpatch->topoffset) * fscale;
-	cx -= (float)SHORT(gpatch->leftoffset) * fscale;
+	cy -= (float)(gpatch->topoffset) * fscale;
+	cx -= (float)(gpatch->leftoffset) * fscale;
 
 	if (!(option & V_NOSCALESTART))
 	{
@@ -363,34 +379,32 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
 			// if it's meant to cover the whole screen, black out the rest
 			// cx and cy are possibly *slightly* off from float maths
 			// This is done before here compared to software because we directly alter cx and cy to centre
-			if (cx >= -0.1f && cx <= 0.1f && SHORT(gpatch->width) == BASEVIDWIDTH && cy >= -0.1f && cy <= 0.1f && SHORT(gpatch->height) == BASEVIDHEIGHT)
+			if (cx >= -0.1f && cx <= 0.1f && gpatch->width == BASEVIDWIDTH && cy >= -0.1f && cy <= 0.1f && gpatch->height == BASEVIDHEIGHT)
 			{
-				// Need to temporarily cache the real patch to get the colour of the top left pixel
-				patch_t *realpatch = W_CacheLumpNumPwad(gpatch->wadnum, gpatch->lumpnum, PU_STATIC);
-				const column_t *column = (const column_t *)((const UINT8 *)(realpatch) + LONG((realpatch)->columnofs[0]));
+				const column_t *column = (const column_t *)((const UINT8 *)(gpatch->columns) + (gpatch->columnofs[0]));
+
 				if (!column->topdelta)
 				{
 					const UINT8 *source = (const UINT8 *)(column) + 3;
 					HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
 				}
-				Z_Free(realpatch);
 			}
 			// centre screen
-			if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
+			if (fabsf(fvw - FLOATBASEVIDWIDTH * dupx) > 1.0E-36f)
 			{
 				if (option & V_SNAPTORIGHT)
-					cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+					cx += (fvw - (FLOATBASEVIDWIDTH * dupx));
 				else if (!(option & V_SNAPTOLEFT))
-					cx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx))/2;
+					cx += (fvw - (FLOATBASEVIDWIDTH * dupx))/2.0f;
 			}
-			if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f)
+			if (fabsf(fvh - FLOATBASEVIDHEIGHT * dupy) > 1.0E-36f)
 			{
 				if ((option & (V_SPLITSCREEN|V_SNAPTOTOP)) == (V_SPLITSCREEN|V_SNAPTOTOP))
-					cy += ((float)vid.height/2 - ((float)BASEVIDHEIGHT/2 * dupy));
+					cy += (fvh/2.0f - (FLOATBASEVIDHEIGHT/2.0f * dupy));
 				else if (option & V_SNAPTOBOTTOM)
-					cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+					cy += (fvh - (FLOATBASEVIDHEIGHT * dupy));
 				else if (!(option & V_SNAPTOTOP))
-					cy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy))/2;
+					cy += (fvh - (FLOATBASEVIDHEIGHT * dupy))/2.0f;
 			}
 		}
 	}
@@ -404,11 +418,11 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
 	if (fheight > h - sy)
 		fheight = h - sy;
 
-	if (fwidth > SHORT(gpatch->width))
-		fwidth = SHORT(gpatch->width);
+	if (fwidth > gpatch->width)
+		fwidth = gpatch->width;
 
-	if (fheight > SHORT(gpatch->height))
-		fheight = SHORT(gpatch->height);
+	if (fheight > gpatch->height)
+		fheight = gpatch->height;
 
 	if (pscale != FRACUNIT)
 	{
@@ -422,12 +436,12 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
 	}
 
 	// positions of the cx, cy, are between 0 and vid.width/vid.height now, we need them to be between -1 and 1
-	cx = -1 + (cx / (vid.width/2));
-	cy = 1 - (cy / (vid.height/2));
+	cx = -1.0f + (cx / (fvw / 2.0f));
+	cy = 1.0f - (cy / (fvh / 2.0f));
 
 	// fwidth and fheight are similar
-	fwidth /= vid.width / 2;
-	fheight /= vid.height / 2;
+	fwidth /= fvw / 2.0f;
+	fheight /= fvh / 2.0f;
 
 	// set the polygon vertices to the right positions
 	v[0].x = v[3].x = cx;
@@ -438,10 +452,10 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
 
 	v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
 
-	v[0].s = v[3].s = ((sx)/(float)SHORT(gpatch->width) )*gpatch->max_s;
-	v[2].s = v[1].s = ((w )/(float)SHORT(gpatch->width) )*gpatch->max_s;
-	v[0].t = v[1].t = ((sy)/(float)SHORT(gpatch->height))*gpatch->max_t;
-	v[2].t = v[3].t = ((h )/(float)SHORT(gpatch->height))*gpatch->max_t;
+	v[0].s = v[3].s = ((sx)/(float)(gpatch->width) )*hwrPatch->max_s;
+	v[2].s = v[1].s = ((w )/(float)(gpatch->width) )*hwrPatch->max_s;
+	v[0].t = v[1].t = ((sy)/(float)(gpatch->height))*hwrPatch->max_t;
+	v[2].t = v[3].t = ((h )/(float)(gpatch->height))*hwrPatch->max_t;
 
 	flags = PF_Translucent|PF_NoDepthTest;
 
@@ -455,15 +469,20 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
 	{
 		FSurfaceInfo Surf;
 		Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
-		if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[cv_translucenthud.value];
-		else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[cv_translucenthud.value];
-		else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[cv_translucenthud.value];
-		else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel];
+
+		switch (alphalevel)
+		{
+			case 13: Surf.PolyColor.s.alpha = softwaretranstogl_lo[cv_translucenthud.value]; break;
+			case 14: Surf.PolyColor.s.alpha = softwaretranstogl[cv_translucenthud.value];    break;
+			case 15: Surf.PolyColor.s.alpha = softwaretranstogl_hi[cv_translucenthud.value]; break;
+			default: Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel];              break;
+		}
+
 		flags |= PF_Modulated;
-		HWD.pfnDrawPolygon(&Surf, v, 4, flags);
+		GL_DrawPolygon(&Surf, v, 4, flags);
 	}
 	else
-		HWD.pfnDrawPolygon(NULL, v, 4, flags);
+		GL_DrawPolygon(NULL, v, 4, flags);
 }
 
 // ==========================================================================
@@ -474,7 +493,7 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
 // --------------------------------------------------------------------------
 // Fills a box of pixels using a flat texture as a pattern
 // --------------------------------------------------------------------------
-void HWR_DrawFlatFill (INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum)
+void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum)
 {
 	FOutVector  v[4];
 	double dflatsize;
@@ -539,7 +558,7 @@ void HWR_DrawFlatFill (INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum
 	// BTW, I see we put 0 for PFs, and If I'm right, that
 	// means we take the previous PFs as default
 	// how can we be sure they are ok?
-	HWD.pfnDrawPolygon(NULL, v, 4, PF_NoDepthTest); //PF_Translucent);
+	GL_DrawPolygon(NULL, v, 4, PF_NoDepthTest); //PF_Translucent);
 }
 
 
@@ -552,33 +571,33 @@ void HWR_DrawFlatFill (INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum
 //  0--1
 void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 {
-    FOutVector  v[4];
-    FSurfaceInfo Surf;
+	FOutVector  v[4];
+	FSurfaceInfo Surf;
 	FBITFIELD poly_flags = PF_NoTexture|PF_Modulated|PF_NoDepthTest;
 
-    v[0].x = v[3].x = -1.0f;
-    v[2].x = v[1].x =  1.0f;
-    v[0].y = v[1].y = -1.0f;
-    v[2].y = v[3].y =  1.0f;
-    v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
+	v[0].x = v[3].x = -1.0f;
+	v[2].x = v[1].x =  1.0f;
+	v[0].y = v[1].y = -1.0f;
+	v[2].y = v[3].y =  1.0f;
+	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 = 1.0f;
-    v[0].t = v[1].t = 1.0f;
-    v[2].t = v[3].t = 0.0f;
+	v[0].s = v[3].s = 0.0f;
+	v[2].s = v[1].s = 1.0f;
+	v[0].t = v[1].t = 1.0f;
+	v[2].t = v[3].t = 0.0f;
 
-    if (color & 0xFF00) // Do COLORMAP fade.
-    {
-		if (HWR_ShouldUsePaletteRendering() && cv_grscreentextures.value)
+	if (color & 0xFF00) // Do COLORMAP fade.
+	{
+		if (HWR_ShouldUsePaletteRendering() && cv_glscreentextures.value)
 		{
 			const hwdscreentexture_t scr_tex = HWD_SCREENTEXTURE_GENERIC2;
 
 			Surf.LightTableId = HWR_GetLightTableID(NULL);
 			Surf.LightInfo.light_level = strength;
-			HWD.pfnMakeScreenTexture(scr_tex);
-			HWD.pfnSetShader(HWR_GetShaderFromTarget(SHADER_UI_COLORMAP_FADE));
-			HWD.pfnDrawScreenTexture(scr_tex, &Surf, PF_ColorMapped|PF_NoDepthTest);
-			HWD.pfnUnSetShader();
+			GL_MakeScreenTexture(scr_tex);
+			GL_SetShader(HWR_GetShaderFromTarget(SHADER_UI_COLORMAP_FADE));
+			GL_DrawScreenTexture(scr_tex, &Surf, PF_ColorMapped|PF_NoDepthTest);
+			GL_UnSetShader();
 
 			return;
 		}
@@ -588,21 +607,21 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
 			Surf.PolyColor.s.alpha = (strength*8);
 			poly_flags |= PF_Translucent;
 		}
-    }
-    else // Do TRANSMAP** fade.
-    {
-		RGBA_t *palette = HWR_GetTexturePalette();
+	}
+	else // Do TRANSMAP** fade.
+	{
+		const RGBA_t *palette = HWR_GetTexturePalette();
 		Surf.PolyColor.rgba = palette[color&0xFF].rgba;
-		
-        if (HWR_ShouldUsePaletteRendering())
+
+		if (HWR_ShouldUsePaletteRendering())
 			Surf.PolyColor.s.alpha = softwaretranstogl[strength];
 		else
 			Surf.PolyColor.s.alpha = (UINT8)(strength*25.5f);
-		
-		poly_flags |= PF_Translucent;
-    }
 
-    HWD.pfnDrawPolygon(&Surf, v, 4, poly_flags);
+		poly_flags |= PF_Translucent;
+	}
+
+	GL_DrawPolygon(&Surf, v, 4, poly_flags);
 }
 
 // Draw the console background with translucency support
@@ -629,7 +648,7 @@ void HWR_DrawConsoleBack(UINT32 color, INT32 height)
 	Surf.PolyColor.rgba = UINT2RGBA(color);
 	Surf.PolyColor.s.alpha = 0x80;
 
-	HWD.pfnDrawPolygon(&Surf, v, 4, PF_NoTexture|PF_Modulated|PF_Translucent|PF_NoDepthTest);
+	GL_DrawPolygon(&Surf, v, 4, PF_NoTexture|PF_Modulated|PF_Translucent|PF_NoDepthTest);
 }
 
 
@@ -650,19 +669,19 @@ void HWR_DrawViewBorder(INT32 clearlines)
 	INT32 top, side;
 	INT32 baseviewwidth, baseviewheight;
 	INT32 basewindowx, basewindowy;
-	GLPatch_t *patch;
+	patch_t *patch;
 
-//    if (gr_viewwidth == vid.width)
+//    if (gl_viewwidth == vid.width)
 //        return;
 
 	if (!clearlines)
 		clearlines = BASEVIDHEIGHT; // refresh all
 
 	// calc view size based on original game resolution
-	baseviewwidth =  FixedInt(FixedDiv(FLOAT_TO_FIXED(gr_viewwidth), vid.fdupx)); //(cv_viewsize.value * BASEVIDWIDTH/10)&~7;
-	baseviewheight = FixedInt(FixedDiv(FLOAT_TO_FIXED(gr_viewheight), vid.fdupy));
-	top = FixedInt(FixedDiv(FLOAT_TO_FIXED(gr_baseviewwindowy), vid.fdupy));
-	side = FixedInt(FixedDiv(FLOAT_TO_FIXED(gr_baseviewwindowx), vid.fdupx));
+	baseviewwidth =  FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwidth), vid.fdupx)); //(cv_viewsize.value * BASEVIDWIDTH/10)&~7;
+	baseviewheight = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewheight), vid.fdupy));
+	top = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowy), vid.fdupy));
+	side = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowx), vid.fdupx));
 
 	// top
 	HWR_DrawFlatFill(0, 0,
@@ -699,7 +718,7 @@ void HWR_DrawViewBorder(INT32 clearlines)
 	// top edge
 	if (clearlines > basewindowy - 8)
 	{
-		patch = W_CachePatchNum(viewborderlump[BRDR_T], PU_CACHE);
+		patch = W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH);
 		for (x = 0; x < baseviewwidth; x += 8)
 			HWR_DrawPatch(patch, basewindowx + x, basewindowy - 8,
 				0);
@@ -708,7 +727,7 @@ void HWR_DrawViewBorder(INT32 clearlines)
 	// bottom edge
 	if (clearlines > basewindowy + baseviewheight)
 	{
-		patch = W_CachePatchNum(viewborderlump[BRDR_B], PU_CACHE);
+		patch = W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH);
 		for (x = 0; x < baseviewwidth; x += 8)
 			HWR_DrawPatch(patch, basewindowx + x,
 				basewindowy + baseviewheight, 0);
@@ -717,7 +736,7 @@ void HWR_DrawViewBorder(INT32 clearlines)
 	// left edge
 	if (clearlines > basewindowy)
 	{
-		patch = W_CachePatchNum(viewborderlump[BRDR_L], PU_CACHE);
+		patch = W_CachePatchNum(viewborderlump[BRDR_L], PU_PATCH);
 		for (y = 0; y < baseviewheight && basewindowy + y < clearlines;
 			y += 8)
 		{
@@ -729,7 +748,7 @@ void HWR_DrawViewBorder(INT32 clearlines)
 	// right edge
 	if (clearlines > basewindowy)
 	{
-		patch = W_CachePatchNum(viewborderlump[BRDR_R], PU_CACHE);
+		patch = W_CachePatchNum(viewborderlump[BRDR_R], PU_PATCH);
 		for (y = 0; y < baseviewheight && basewindowy+y < clearlines;
 			y += 8)
 		{
@@ -741,22 +760,22 @@ void HWR_DrawViewBorder(INT32 clearlines)
 	// Draw beveled corners.
 	if (clearlines > basewindowy - 8)
 		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_TL],
-				PU_CACHE),
+				PU_PATCH),
 			basewindowx - 8, basewindowy - 8, 0);
 
 	if (clearlines > basewindowy - 8)
 		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_TR],
-				PU_CACHE),
+				PU_PATCH),
 			basewindowx + baseviewwidth, basewindowy - 8, 0);
 
 	if (clearlines > basewindowy+baseviewheight)
 		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_BL],
-				PU_CACHE),
+				PU_PATCH),
 			basewindowx - 8, basewindowy + baseviewheight, 0);
 
 	if (clearlines > basewindowy + baseviewheight)
 		HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_BR],
-				PU_CACHE),
+				PU_PATCH),
 			basewindowx + baseviewwidth,
 			basewindowy + baseviewheight, 0);
 }
@@ -775,17 +794,17 @@ void HWR_drawAMline(const fline_t *fl, INT32 color)
 {
 	F2DCoord v1, v2;
 	RGBA_t color_rgba;
-	RGBA_t *palette = HWR_GetTexturePalette();
-	
+	const RGBA_t *palette = HWR_GetTexturePalette();
+
 	color_rgba = palette[color&0xFF];
-	
+
 	v1.x = ((float)fl->a.x-(vid.width/2.0f))*(2.0f/vid.width);
 	v1.y = ((float)fl->a.y-(vid.height/2.0f))*(2.0f/vid.height);
 
 	v2.x = ((float)fl->b.x-(vid.width/2.0f))*(2.0f/vid.width);
 	v2.y = ((float)fl->b.y-(vid.height/2.0f))*(2.0f/vid.height);
 
-	HWD.pfnDraw2DLine(&v1, &v2, color_rgba);
+	GL_Draw2DLine(&v1, &v2, color_rgba);
 }
 
 // -----------------+
@@ -796,7 +815,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 	FOutVector v[4];
 	FSurfaceInfo Surf;
 	float fx, fy, fw, fh, fwait = 0;
-	RGBA_t *palette = HWR_GetTexturePalette();
+	RGBA_t *palette;
 
 	if (wh < 0)
 		return; // consistency w/ software
@@ -810,6 +829,9 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 	fy = (float)y;
 	fw = fh = (float)wh;
 
+	const float fvw = (float)vid.width;
+	const float fvh = (float)vid.height;
+
 	if (!(color & V_NOSCALESTART))
 	{
 		float dupx = (float)vid.dupx, dupy = (float)vid.dupy;
@@ -819,30 +841,32 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 		fw *= dupx;
 		fh *= dupy;
 
-		if (fabsf((float)vid.width - ((float)BASEVIDWIDTH * dupx)) > 1.0E-36f)
+		if (fabsf(fvw - (FLOATBASEVIDWIDTH * dupx)) > 1.0E-36f)
 		{
 			if (color & V_SNAPTORIGHT)
-				fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+				fx += (fvw - (FLOATBASEVIDWIDTH * dupx));
 			else if (!(color & V_SNAPTOLEFT))
-				fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 2;
+				fx += (fvw - (FLOATBASEVIDWIDTH * dupx)) / 2.0f;
 		}
-		if (fabsf((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) > 1.0E-36f)
+		if (fabsf(fvh - (FLOATBASEVIDHEIGHT * dupy)) > 1.0E-36f)
 		{
 			// same thing here
 			if (color & V_SNAPTOBOTTOM)
-				fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+				fy += (fvh - (FLOATBASEVIDHEIGHT * dupy));
 			else if (!(color & V_SNAPTOTOP))
-				fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 2;
+				fy += (fvh - (FLOATBASEVIDHEIGHT * dupy)) / 2.0f;
 		}
 	}
 
 	if (fx >= vid.width || fy >= vid.height)
 		return;
+
 	if (fx < 0)
 	{
 		fw += fx;
 		fx = 0;
 	}
+
 	if (fy < 0)
 	{
 		fh += fy;
@@ -851,18 +875,20 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 
 	if (fw <= 0 || fh <= 0)
 		return;
+
 	if (fx + fw > vid.width)
 	{
-		fwait = fw - ((float)vid.width - fx);
-		fw = (float)vid.width - fx;
+		fwait = fw - (fvw- fx);
+		fw = fvw - fx;
 	}
-	if (fy + fh > vid.height)
-		fh = (float)vid.height - fy;
 
-	fx = -1 + fx / (vid.width / 2);
-	fy = 1 - fy / (vid.height / 2);
-	fw = fw / (vid.width / 2);
-	fh = fh / (vid.height / 2);
+	if (fy + fh > vid.height)
+		fh = fvh - fy;
+
+	fx = -1.0f + fx / (fvw / 2.0f);
+	fy = 1.0f - fy / (fvh / 2.0f);
+	fw = fw / (fvw / 2.0f);
+	fh = fh / (fvh / 2.0f);
 
 	v[0].x = v[3].x = fx;
 	v[2].x = v[1].x = fx + fw;
@@ -877,9 +903,11 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
 	v[0].t = v[1].t = 0.0f;
 	v[2].t = v[3].t = 1.0f;
 
+	palette = HWR_GetTexturePalette();
+
 	Surf.PolyColor = palette[color&0xFF];
 
-	HWD.pfnDrawPolygon(&Surf, v, 4,
+	GL_DrawPolygon(&Surf, v, 4,
 		PF_Modulated|PF_NoTexture|PF_NoDepthTest);
 }
 
@@ -891,7 +919,6 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 	FOutVector v[4];
 	FSurfaceInfo Surf;
 	float fx, fy, fw, fh;
-	RGBA_t *palette = HWR_GetTexturePalette();
 
 	if (w < 0 || h < 0)
 		return; // consistency w/ software
@@ -906,19 +933,23 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 	fw = (float)w;
 	fh = (float)h;
 
+	const float fvw = (float)vid.width;
+	const float fvh = (float)vid.height;
+
 	if (!(options & V_NOSCALESTART))
 	{
 		float dupx = (float)vid.dupx, dupy = (float)vid.dupy;
 
 		if (x == 0 && y == 0 && w == BASEVIDWIDTH && h == BASEVIDHEIGHT)
 		{
+			RGBA_t *palette = HWR_GetTexturePalette();
 			RGBA_t rgbaColour = palette[color&0xFF];
 			FRGBAFloat clearColour;
 			clearColour.red = (float)rgbaColour.s.red / 255;
 			clearColour.green = (float)rgbaColour.s.green / 255;
 			clearColour.blue = (float)rgbaColour.s.blue / 255;
 			clearColour.alpha = 1;
-			HWD.pfnClearBuffer(true, false, false, &clearColour);
+			GL_ClearBuffer(true, false, false, &clearColour);
 			return;
 		}
 
@@ -927,35 +958,38 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 		fw *= dupx;
 		fh *= dupy;
 
-		if (fabsf((float)vid.width - ((float)BASEVIDWIDTH * dupx)) > 1.0E-36f)
+		if (fabsf(fvw - (FLOATBASEVIDWIDTH * dupx)) > 1.0E-36f)
 		{
 			if (options & V_SNAPTORIGHT)
-				fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+				fx += (fvw - (FLOATBASEVIDWIDTH * dupx));
 			else if (!(options & V_SNAPTOLEFT))
-				fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 2;
+				fx += (fvw - (FLOATBASEVIDWIDTH * dupx)) / 2;
 		}
-		if (fabsf((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) > 1.0E-36f)
+		if (fabsf(fvh - (FLOATBASEVIDHEIGHT * dupy)) > 1.0E-36f)
 		{
 			// same thing here
 			if (options & V_SNAPTOBOTTOM)
-				fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+				fy += (fvh - (FLOATBASEVIDHEIGHT * dupy));
 			else if (!(options & V_SNAPTOTOP))
-				fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 2;
+				fy += (fvh - (FLOATBASEVIDHEIGHT * dupy)) / 2;
 		}
+
 		if (options & V_SPLITSCREEN)
-			fy += ((float)BASEVIDHEIGHT * dupy)/2;
+			fy += (FLOATBASEVIDHEIGHT * dupy)/2;
 		if (options & V_HORZSCREEN)
-			fx += ((float)BASEVIDWIDTH * dupx)/2;
+			fx += (FLOATBASEVIDWIDTH * dupx)/2;
 
 	}
 
 	if (fx >= vid.width || fy >= vid.height)
 		return;
+
 	if (fx < 0)
 	{
 		fw += fx;
 		fx = 0;
 	}
+
 	if (fy < 0)
 	{
 		fh += fy;
@@ -964,15 +998,17 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 
 	if (fw <= 0 || fh <= 0)
 		return;
-	if (fx + fw > vid.width)
-		fw = (float)vid.width - fx;
-	if (fy + fh > vid.height)
-		fh = (float)vid.height - fy;
 
-	fx = -1 + fx / (vid.width / 2);
-	fy = 1 - fy / (vid.height / 2);
-	fw = fw / (vid.width / 2);
-	fh = fh / (vid.height / 2);
+	if (fx + fw > vid.width)
+		fw = fvw - fx;
+
+	if (fy + fh > vid.height)
+		fh = fvh - fy;
+
+	fx = -1.0f + fx / (fvw / 2.0f);
+	fy = 1.0f - fy / (fvh / 2.0f);
+	fw = fw / (fvw / 2.0f);
+	fh = fh / (fvh / 2.0f);
 
 	v[0].x = v[3].x = fx;
 	v[2].x = v[1].x = fx + fw;
@@ -989,7 +1025,7 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
 	Surf.PolyColor.rgba = UINT2RGBA(color);
 	Surf.PolyColor.s.alpha = 0x80;
 
-	HWD.pfnDrawPolygon(&Surf, v, 4, PF_NoTexture|PF_Modulated|PF_Translucent|PF_NoDepthTest);
+	GL_DrawPolygon(&Surf, v, 4, PF_NoTexture|PF_Modulated|PF_Translucent|PF_NoDepthTest);
 }
 
 // -----------------+
@@ -1001,12 +1037,13 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 	FOutVector v[4];
 	FSurfaceInfo Surf;
 	float fx, fy, fw, fh;
-	UINT8 alphalevel = ((color & V_ALPHAMASK) >> V_ALPHASHIFT);
-	RGBA_t *palette = HWR_GetTexturePalette();
 
 	if (w < 0 || h < 0)
 		return; // consistency w/ software
 
+	const UINT8 alphalevel = ((color & V_ALPHAMASK) >> V_ALPHASHIFT);
+	const RGBA_t *palette = HWR_GetTexturePalette();
+
 //  3--2
 //  | /|
 //  |/ |
@@ -1017,6 +1054,9 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 	fw = (float)w;
 	fh = (float)h;
 
+	const float fvw = (float)vid.width;
+	const float fvh = (float)vid.height;
+
 	if (!(color & V_NOSCALESTART))
 	{
 		float dupx = (float)vid.dupx, dupy = (float)vid.dupy;
@@ -1029,7 +1069,7 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 			clearColour.green = (float)rgbaColour.s.green / 255;
 			clearColour.blue = (float)rgbaColour.s.blue / 255;
 			clearColour.alpha = 1;
-			HWD.pfnClearBuffer(true, false, false, &clearColour);
+			GL_ClearBuffer(true, false, false, &clearColour);
 			return;
 		}
 
@@ -1038,26 +1078,25 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 		fw *= dupx;
 		fh *= dupy;
 
-		if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
+		if (fabsf(fvw - FLOATBASEVIDWIDTH * dupx) > 1.0E-36f)
 		{
 			if (color & V_SNAPTORIGHT)
-				fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx));
+				fx += (fvw - (FLOATBASEVIDWIDTH * dupx));
 			else if (!(color & V_SNAPTOLEFT))
-				fx += ((float)vid.width - ((float)BASEVIDWIDTH * dupx)) / 2;
+				fx += (fvw - (FLOATBASEVIDWIDTH * dupx)) / 2;
 		}
-		if (fabsf((float)vid.height - (float)BASEVIDHEIGHT * dupy) > 1.0E-36f)
+		if (fabsf(fvh - FLOATBASEVIDHEIGHT * dupy) > 1.0E-36f)
 		{
 			// same thing here
 			if (color & V_SNAPTOBOTTOM)
-				fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy));
+				fy += (fvh - (FLOATBASEVIDHEIGHT * dupy));
 			else if (!(color & V_SNAPTOTOP))
-				fy += ((float)vid.height - ((float)BASEVIDHEIGHT * dupy)) / 2;
+				fy += (fvh - (FLOATBASEVIDHEIGHT * dupy)) / 2;
 		}
 		if (color & V_SPLITSCREEN)
-			fy += ((float)BASEVIDHEIGHT * dupy)/2;
+			fy += (FLOATBASEVIDHEIGHT * dupy)/2;
 		if (color & V_HORZSCREEN)
-			fx += ((float)BASEVIDWIDTH * dupx)/2;
-
+			fx += (FLOATBASEVIDWIDTH * dupx)/2;
 	}
 
 	if (fx >= vid.width || fy >= vid.height)
@@ -1076,14 +1115,14 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 	if (fw <= 0 || fh <= 0)
 		return;
 	if (fx + fw > vid.width)
-		fw = (float)vid.width - fx;
+		fw = fvw - fx;
 	if (fy + fh > vid.height)
-		fh = (float)vid.height - fy;
+		fh = fvh - fy;
 
-	fx = -1 + fx / (vid.width / 2);
-	fy = 1 - fy / (vid.height / 2);
-	fw = fw / (vid.width / 2);
-	fh = fh / (vid.height / 2);
+	fx = -1.0f + fx / (fvw / 2.0f);
+	fy = 1.0f - fy / (fvh / 2.0f);
+	fw = fw / (fvw / 2.0f);
+	fh = fh / (fvh / 2.0f);
 
 	v[0].x = v[3].x = fx;
 	v[2].x = v[1].x = fx + fw;
@@ -1101,13 +1140,16 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 
 	if (alphalevel)
 	{
-		if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[hudtrans];
-		else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[hudtrans];
-		else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[hudtrans];
-		else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel];
+		switch (alphalevel)
+		{
+			case 13: Surf.PolyColor.s.alpha = softwaretranstogl_lo[hudtrans];   break;
+			case 14: Surf.PolyColor.s.alpha = softwaretranstogl[hudtrans];      break;
+			case 15: Surf.PolyColor.s.alpha = softwaretranstogl_hi[hudtrans];   break;
+			default: Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; break;
+		}
 	}
 
-	HWD.pfnDrawPolygon(&Surf, v, 4, PF_NoTexture|PF_Modulated|PF_Translucent|PF_NoDepthTest);
+	GL_DrawPolygon(&Surf, v, 4, PF_NoTexture|PF_Modulated|PF_Translucent|PF_NoDepthTest);
 }
 
 #ifdef HAVE_PNG
@@ -1126,7 +1168,7 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
 #define _FILE_OFFSET_BITS 0
 #endif
 
- #include "png.h"
+#include "png.h"
  #ifdef PNG_WRITE_SUPPORTED
   #define USE_PNG // PNG is only used if write is supported (see ../m_misc.c)
  #endif
@@ -1191,7 +1233,7 @@ UINT8 *HWR_GetScreenshot(void)
 		return NULL;
 
 	// returns 24bit 888 RGB
-	HWD.pfnReadScreenTexture(HWD_SCREENTEXTURE_GENERIC2, (void *)buf);
+	GL_ReadScreenTexture(HWD_SCREENTEXTURE_GENERIC2, (void *)buf);
 	return buf;
 }
 
@@ -1207,7 +1249,7 @@ boolean HWR_Screenshot(const char *pathname)
 	}
 
 	// returns 24bit 888 RGB
-	HWD.pfnReadScreenTexture(HWD_SCREENTEXTURE_GENERIC2, (void *)buf);
+	GL_ReadScreenTexture(HWD_SCREENTEXTURE_GENERIC2, (void *)buf);
 
 #ifdef USE_PNG
 	ret = M_SavePNG(pathname, buf, vid.width, vid.height, NULL);
diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h
deleted file mode 100644
index 8376ab405..000000000
--- a/src/hardware/hw_drv.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// SONIC ROBO BLAST 2
-//-----------------------------------------------------------------------------
-// Copyright (C) 1993-1996 by id Software, Inc.
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2019 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
-/// \brief imports/exports for the GPU hardware low-level interface API
-
-#ifndef __HWR_DRV_H__
-#define __HWR_DRV_H__
-
-// this must be here 19991024 by Kin
-#include "../screen.h"
-#include "hw_data.h"
-#include "hw_defs.h"
-#include "hw_md2.h"
-
-#include "hw_dll.h"
-#include "../doomdef.h"
-
-// ==========================================================================
-//                                                       STANDARD DLL EXPORTS
-// ==========================================================================
-
-EXPORT boolean HWRAPI(Init) (void);
-EXPORT void HWRAPI(SetupGLInfo) (void);
-EXPORT void HWRAPI(SetTexturePalette) (RGBA_t *ppal);
-EXPORT void HWRAPI(FinishUpdate) (INT32 waitvbl);
-EXPORT void HWRAPI(Draw2DLine) (F2DCoord *v1, F2DCoord *v2, RGBA_t Color);
-EXPORT void HWRAPI(DrawPolygon) (FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags);
-EXPORT void HWRAPI(DrawIndexedTriangles) (FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray);
-EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags);
-EXPORT void HWRAPI(ClearBuffer) (FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat *ClearColor);
-EXPORT void HWRAPI(SetTexture) (GLMipmap_t *TexInfo);
-EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *TexInfo);
-EXPORT void HWRAPI(DeleteTexture) (GLMipmap_t *TexInfo);
-EXPORT void HWRAPI(ReadScreenTexture) (int tex, UINT16 *dst_data);
-EXPORT void HWRAPI(GClipRect) (INT32 minx, INT32 miny, INT32 maxx, INT32 maxy, float nearclip, float farclip);
-EXPORT void HWRAPI(ClearMipMapCache) (void);
-
-//Hurdler: added for backward compatibility
-EXPORT void HWRAPI(SetSpecialState) (hwdspecialstate_t IdState, INT32 Value);
-
-//Hurdler: added for new development
-
-EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface);
-
-EXPORT void HWRAPI(CreateModelVBOs) (model_t *model);
-EXPORT void HWRAPI(SetTransform) (FTransform *stransform);
-EXPORT INT32 HWRAPI(GetTextureUsed) (void);
-
-EXPORT void HWRAPI(RenderSkyDome) (INT32 tex, INT32 texture_width, INT32 texture_height, FTransform transform);
-
-EXPORT void HWRAPI(FlushScreenTextures) (void);
-EXPORT void HWRAPI(DoScreenWipe) (int wipeStart, int wipeEnd);
-EXPORT void HWRAPI(DrawScreenTexture) (int tex, FSurfaceInfo *surf, FBITFIELD polyflags);
-EXPORT void HWRAPI(MakeScreenTexture) (int tex);
-EXPORT void HWRAPI(DrawScreenFinalTexture) (int tex, INT32 width, INT32 height);
-
-EXPORT void HWRAPI(RenderVhsEffect) (fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
-
-#define SCREENVERTS 10
-EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2]);
-
-// jimita
-EXPORT boolean HWRAPI(InitShaders) (void);
-EXPORT void HWRAPI(LoadShader) (int slot, char *code, hwdshaderstage_t stage);
-EXPORT boolean HWRAPI(CompileShader) (int slot);
-EXPORT void HWRAPI(SetShader) (int slot);
-EXPORT void HWRAPI(UnSetShader) (void);
-
-EXPORT void HWRAPI(SetShaderInfo) (hwdshaderinfo_t info, INT32 value);
-
-EXPORT void HWRAPI(SetPaletteLookup)(UINT8 *lut);
-EXPORT UINT32 HWRAPI(CreateLightTable)(RGBA_t *hw_lighttable);
-EXPORT void HWRAPI(ClearLightTables)(void);
-EXPORT void HWRAPI(SetScreenPalette)(RGBA_t *palette);
-
-// ==========================================================================
-//                                      HWR DRIVER OBJECT, FOR CLIENT PROGRAM
-// ==========================================================================
-
-#if !defined (_CREATE_DLL_)
-
-struct hwdriver_s
-{
-	Init                	pfnInit;
-	SetupGLInfo             pfnSetupGLInfo;
-	SetTexturePalette   pfnSetTexturePalette;
-	FinishUpdate        	pfnFinishUpdate;
-	Draw2DLine          	pfnDraw2DLine;
-	DrawPolygon         	pfnDrawPolygon;
-	DrawIndexedTriangles    pfnDrawIndexedTriangles;
-	SetBlend            	pfnSetBlend;
-	ClearBuffer         	pfnClearBuffer;
-	SetTexture          	pfnSetTexture;
-	UpdateTexture       	pfnUpdateTexture;
-	DeleteTexture       	pfnDeleteTexture;
-	ReadScreenTexture   	pfnReadScreenTexture;
-	GClipRect           	pfnGClipRect;
-	ClearMipMapCache    	pfnClearMipMapCache;
-	SetSpecialState     	pfnSetSpecialState;
-	DrawModel           	pfnDrawModel;
-	CreateModelVBOs     	pfnCreateModelVBOs;
-	SetTransform        	pfnSetTransform;
-	GetTextureUsed      	pfnGetTextureUsed;
-	PostImgRedraw       	pfnPostImgRedraw;
-	FlushScreenTextures 	pfnFlushScreenTextures;
-	DoScreenWipe        	pfnDoScreenWipe;
-	DrawScreenTexture   	pfnDrawScreenTexture;
-	MakeScreenTexture   	pfnMakeScreenTexture;
-	RenderVhsEffect     	pfnRenderVhsEffect;
-	DrawScreenFinalTexture  pfnDrawScreenFinalTexture;
-
-	RenderSkyDome 			pfnRenderSkyDome;
-
-	InitShaders         	pfnInitShaders;
-	LoadShader          	pfnLoadShader;
-	CompileShader       	pfnCompileShader;
-	SetShader 				pfnSetShader;
-	UnSetShader 			pfnUnSetShader;
-
-	SetShaderInfo       	pfnSetShaderInfo;
-
-	SetPaletteLookup    pfnSetPaletteLookup;
-	CreateLightTable    pfnCreateLightTable;
-	ClearLightTables    pfnClearLightTables;
-	SetScreenPalette    pfnSetScreenPalette;
-};
-
-extern struct hwdriver_s hwdriver;
-
-#define HWD hwdriver
-
-#endif //not defined _CREATE_DLL_
-
-#endif //__HWR_DRV_H__
diff --git a/src/hardware/hw_gl.h b/src/hardware/hw_gl.h
new file mode 100644
index 000000000..8780fc57b
--- /dev/null
+++ b/src/hardware/hw_gl.h
@@ -0,0 +1,87 @@
+// SONIC ROBO BLAST 2 Kart
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020 by Jaime "Lactozilla" Passos.
+// Copyright (C) 2020 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 hw_gl.h
+/// \brief OpenGL low-level interface API
+
+#ifndef __HWR_GL_H__
+#define __HWR_GL_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "../screen.h"
+
+#include "hw_data.h"
+#include "hw_defs.h"
+#include "hw_md2.h"
+
+#define SCREENVERTS 10
+
+boolean GL_Init(void);
+void SetupGLInfo(void);
+
+void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value);
+void GL_SetTransform(FTransform *stransform);
+void GL_SetBlend(FBITFIELD PolyFlags);
+void GL_SetPalette(RGBA_t *palette);
+void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat * ClearColor);
+
+void GL_DrawPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags);
+void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray);
+void GL_Draw2DLine(F2DCoord *v1, F2DCoord *v2, RGBA_t Color);
+
+void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface);
+#define GL_DrawModel(model, frameIndex, duration, tics, nextFrameIndex, pos, hscale, vscale, flipped, hflipped, Surface) GL_DrawModelEx(model, frameIndex, duration, tics, nextFrameIndex, pos, hscale, vscale, flipped, hflipped, Surface)
+
+void GL_RenderSkyDome(gl_sky_t *sky);
+
+void GL_UpdateTexture(GLMipmap_t *pTexInfo);
+void GL_SetTexture(GLMipmap_t *pTexInfo);
+void GL_DeleteTexture(GLMipmap_t *pTexInfo);
+
+void GL_Flush(void);
+#define GL_ClearMipMapCache GL_Flush
+
+INT32 GL_GetTextureUsed(void);
+
+void GL_CreateModelVBOs(model_t *model);
+
+void GL_ReadScreenTexture(int tex, UINT16 *dst_data);
+void GL_GClipRect(INT32 minx, INT32 miny, INT32 maxx, INT32 maxy, float nearclip, float farclip);
+
+void GL_MakeScreenTexture(int tex);
+void GL_FlushScreenTextures(void);
+
+void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags);
+void GL_DoScreenWipe(int wipeStart, int wipeEnd);
+void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
+void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader);
+
+void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]);
+
+boolean GL_InitShaders(void);
+void GL_LoadShader(int slot, char *code, hwdshaderstage_t stage);
+boolean GL_CompileShader(int slot);
+void GL_SetShader(int slot);
+void GL_UnSetShader(void);
+
+void GL_SetShaderInfo(hwdshaderinfo_t info, INT32 value);
+
+void GL_SetPaletteLookup(UINT8 *lut);
+UINT32 GL_CreateLightTable(RGBA_t *hw_lighttable);
+void GL_ClearLightTables(void);
+void GL_SetScreenPalette(RGBA_t *palette);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // __HWR_GL_H__
diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h
index 542a99b33..04d388e81 100644
--- a/src/hardware/hw_glob.h
+++ b/src/hardware/hw_glob.h
@@ -14,6 +14,10 @@
 #ifndef _HWR_GLOB_H_
 #define _HWR_GLOB_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "hw_defs.h"
 #include "../m_misc.h"
 #include "../r_defs.h"
@@ -23,17 +27,16 @@
 
 // needed for sprite rendering
 // equivalent of the software renderer's vissprites
-typedef struct gr_vissprite_s
+typedef struct gl_vissprite_s
 {
 	float x1, x2;
 	float z1, z2;
 	float gz, gzt;
-	float tz, ty;
+	float tz;
 	float scale;
 	float spritexscale, spriteyscale;
 	float spritexoffset, spriteyoffset;
-	UINT32 renderflags;
-	GLPatch_t *gpatch;
+	patch_t *gpatch;
 	boolean flip;
 	UINT8 translucency;       //alpha level 0-255
 	mobj_t *mobj;
@@ -42,7 +45,9 @@ typedef struct gr_vissprite_s
    //Hurdler: 25/04/2000: now support colormap in hardware mode
 	UINT8 *colormap;
 	INT32 dispoffset; // copy of info->dispoffset, affects ordering but not drawing
-} gr_vissprite_t;
+} gl_vissprite_t;
+
+void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32 *lightlevel, boolean model);
 
 // --------
 // hw_bsp.c
@@ -50,31 +55,45 @@ typedef struct gr_vissprite_s
 extern extrasubsector_t *extrasubsectors;
 extern size_t addsubsector;
 
+void HWR_FreeExtraSubsectors(void);
+
 // --------
 // hw_cache.c
 // --------
-void HWR_InitTextureCache(void);
-void HWR_FreeTextureCache(void);
-void HWR_FreeMipmapCache(void);
-void HWR_FreeExtraSubsectors(void);
 
+extern RGBA_t mapPalette[256];
+
+void HWR_InitMapTextures(void);
+void HWR_LoadMapTextures(size_t pnumtextures);
+void HWR_FreeMapTextures(void);
+
+patch_t *HWR_GetCachedGLPatchPwad(UINT16 wad, UINT16 lump);
+patch_t *HWR_GetCachedGLPatch(lumpnum_t lumpnum);
+
+void HWR_GetPatch(patch_t *gpatch);
+void HWR_GetMappedPatch(patch_t *gpatch, const UINT8 *colormap);
+void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipmap, boolean makebitmap);
+void HWR_GetFadeMask(lumpnum_t fademasklumpnum);
+
+void HWR_PrecacheLevel(void);
+
+GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore);
 void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap);
 // ^ some flats must NOT be remapped to encore, since we remap them as we cache them for ease, adding a toggle here seems wise.
 
-GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore);
-void HWR_GetPatch(GLPatch_t *gpatch);
-void HWR_GetMappedPatch(GLPatch_t *gpatch, const UINT8 *colormap);
-void HWR_MakePatch(patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipmap, boolean makebitmap);
+void HWR_FreeTexture(patch_t *patch);
+void HWR_FreeTextureData(patch_t *patch);
+void HWR_FreeTextureColormaps(patch_t *patch);
+void HWR_ClearAllTextures(void);
+void HWR_FreeColormapCache(void);
 void HWR_UnlockCachedPatch(GLPatch_t *gpatch);
-void HWR_SetPalette(RGBA_t *palette);
 
+void HWR_SetPalette(RGBA_t *palette);
 void HWR_SetMapPalette(void);
 UINT32 HWR_CreateLightTable(UINT8 *lighttable);
 UINT32 HWR_GetLightTableID(extracolormap_t *colormap);
 void HWR_ClearLightTables(void);
-GLPatch_t *HWR_GetCachedGLPatchPwad(UINT16 wad, UINT16 lump);
-GLPatch_t *HWR_GetCachedGLPatch(lumpnum_t lumpnum);
-void HWR_GetFadeMask(lumpnum_t fademasklumpnum);
+
 
 // --------
 // hw_draw.c
@@ -82,14 +101,6 @@ void HWR_GetFadeMask(lumpnum_t fademasklumpnum);
 extern INT32 patchformat;
 extern INT32 textureformat;
 
-// --------
-// hw_main.c  // originally hw_drawnodes.c from HWPortal branch
-// --------
-void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 texnum, boolean noencore, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
-void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap);
-void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight,
-                             INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap);
-
 // --------
 // hw_shaders.c
 // --------
@@ -104,4 +115,8 @@ const char *HWR_GetShaderName(INT32 shader);
 
 extern customshaderxlat_t shaderxlat[];
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif //_HW_GLOB_
diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp
new file mode 100644
index 000000000..62c6c97ed
--- /dev/null
+++ b/src/hardware/hw_main.cpp
@@ -0,0 +1,6122 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2019 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
+/// \brief hardware renderer, using the standard HardWareRender driver DLL for SRB2
+
+#ifdef HWRENDER
+
+#include <algorithm>
+
+#include "../doomstat.h"
+#include "../doomdef.h"
+
+#include "hw_main.h"
+#include "hw_glob.h"
+#include "hw_gl.h"
+#include "hw_batching.h"
+#include "hw_md2.h"
+#include "hw_clip.h"
+#include "hw_portal.h"
+
+#include "r_opengl/r_opengl.h"
+
+#include "../d_clisrv.h"
+#include "../g_game.h"
+#include "../m_argv.h"		// parm functions for msaa
+#include "../m_cheat.h"
+#include "../m_menu.h"		// ogl menu updating
+
+#include "../r_bsp.h"		// R_NoEncore
+#include "../r_data.h"
+#include "../r_fps.h"
+#include "../r_local.h"
+#include "../r_main.h"		// cv_fov
+#include "../r_portal.h"
+#ifdef WALLSPLATS
+#include "../r_splats.h"
+#endif
+#include "../r_state.h"
+
+#include "../i_system.h"
+#include "../i_video.h"
+#include "../p_local.h"
+#include "../p_setup.h"
+#include "../p_slopes.h"
+#include "../st_stuff.h"
+#include "../v_video.h"
+#include "../w_wad.h"
+#include "../z_zone.h"
+
+#ifdef ROTSPRITE
+#include "../r_patchrotation.h"		// a mystery as to what this is for
+#endif
+
+#include "../qs22j.h" 		// fast qsort
+
+// ==========================================================================
+// Globals
+// ==========================================================================
+
+#define ABS(x) ((x) < 0 ? -(x) : (x))
+#define SOFTLIGHT(llevel) HWR_ShouldUsePaletteRendering() ? ((llevel) >> LIGHTSEGSHIFT) << LIGHTSEGSHIFT : (llevel)
+
+// false if shaders have not been initialized yet, or if shaders are not available
+boolean gl_shadersavailable = false;
+
+// Whether the internal state is set to palette rendering or not.
+static boolean gl_palette_rendering_state = false;
+
+boolean gl_drawing_stencil = false;
+
+static INT32 current_bsp_culling_distance = 0;
+
+// base values set at SetViewSize
+float gl_baseviewwindowy, gl_baseviewwindowx;
+static float gl_viewwindowy, gl_viewwindowx; // top left corner of view window
+float gl_viewwidth, gl_viewheight; // viewport clipping boundaries (screen coords)
+
+FTransform atransform;
+
+// Float variants of viewx, viewy, viewz, etc.
+static float gl_viewx, gl_viewy, gl_viewz;
+float gl_viewsin, gl_viewcos;
+static float gl_viewludsin, gl_viewludcos;
+static angle_t gl_aimingangle;
+
+seg_t *gl_curline;
+side_t *gl_sidedef;
+line_t *gl_linedef;
+sector_t *gl_frontsector;
+sector_t *gl_backsector;
+
+// values for the far clipping plane
+static constexpr float clipping_distances[] = {1024.0f, 2048.0f, 4096.0f, 6144.0f, 8192.0f, 12288.0f, 16384.0f};
+// values for bsp culling
+// slightly higher than the far clipping plane to compensate for impreciseness
+static constexpr INT32 bsp_culling_distances[] = {(1024+512)*FRACUNIT, (2048+512)*FRACUNIT, (4096+512)*FRACUNIT,
+	(6144+512)*FRACUNIT, (8192+512)*FRACUNIT, (12288+512)*FRACUNIT, (16384+512)*FRACUNIT};
+
+// Performance stats
+ps_metric_t ps_hw_nodesorttime = {};
+ps_metric_t ps_hw_nodedrawtime = {};
+ps_metric_t ps_hw_spritesorttime = {};
+ps_metric_t ps_hw_spritedrawtime = {};
+
+// Performance stats for batching
+ps_metric_t ps_hw_numpolys = {};
+ps_metric_t ps_hw_numverts = {};
+ps_metric_t ps_hw_numcalls = {};
+ps_metric_t ps_hw_numshaders = {};
+ps_metric_t ps_hw_numtextures = {};
+ps_metric_t ps_hw_numpolyflags = {};
+ps_metric_t ps_hw_numcolors = {};
+ps_metric_t ps_hw_batchsorttime = {};
+ps_metric_t ps_hw_batchdrawtime = {};
+
+static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, boolean noencore, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor, FBITFIELD polyflags);
+static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
+
+static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap);
+static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 texnum, boolean noencore, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap);
+static void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap);
+
+namespace
+{
+	enum class AddSpritesType
+	{
+		kNoLimitDist,
+		kLimitDist,
+	};
+
+	template<AddSpritesType> static void HWR_AddSprites(sector_t *);
+}
+
+static void HWR_ProjectSprite(mobj_t *thing);
+static void HWR_AddPrecipitationSprites(void);
+static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing);
+
+static void HWR_SetTransformAiming(FTransform *trans);
+static void HWR_RollTransform(FTransform *tr, angle_t roll);
+
+static void HWR_DoPostProcessor(player_t *player);
+
+static void HWR_SetShaderState(void);
+static void HWR_TogglePaletteRendering(void);
+
+// ==========================================================================
+// Commands and console variables
+// ==========================================================================
+static void HWR_RegisterCommands(void);
+static void COM_HWR_glinfo(void);
+
+//
+// Onchanges
+//
+
+static void CV_screentextures_OnChange(void);
+#ifdef USE_FBO_OGL
+static void CV_glframebuffer_OnChange(void);
+#endif
+static void CV_glshaders_OnChange(void);
+static void CV_gllightdithering_OnChange(void);
+static void CV_filtermode_OnChange(void);
+static void CV_anisotropic_OnChange(void);
+static void CV_gltextureformat_OnChange(void);
+static void CV_glpaletterendering_OnChange(void);
+static void CV_glpalettedepth_OnChange(void);
+
+//
+// CV_PossibleValue_t
+//
+
+static CV_PossibleValue_t glscreentextures_cons_t[] = {{0, "Off"}, {1, "Wipes Only"}, {2, "All"}, {0, NULL}};
+static CV_PossibleValue_t glfakecontrast_cons_t[] = {{0, "Off"}, {1, "Standard"}, {2, "Smooth"}, {0, NULL}};
+static CV_PossibleValue_t glshaders_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Ignore custom shaders"}, {0, NULL}};
+
+static CV_PossibleValue_t glfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSAMPLED, "Nearest"},
+	{HWD_SET_TEXTUREFILTER_BILINEAR, "Bilinear"}, {HWD_SET_TEXTUREFILTER_TRILINEAR, "Trilinear"},
+	{HWD_SET_TEXTUREFILTER_MIXED1, "Linear_Nearest"}, {HWD_SET_TEXTUREFILTER_MIXED2, "Nearest_Linear"},
+	{HWD_SET_TEXTUREFILTER_MIXED3, "Nearest_Mipmap"}, {0, NULL}};
+CV_PossibleValue_t glanisotropicmode_cons_t[] = {{1, "MIN"}, {16, "MAX"}, {0, NULL}};
+
+static CV_PossibleValue_t glrenderdistance_cons_t[] = {
+	{0, "Max"}, {1, "1024"}, {2, "2048"}, {3, "4096"}, {4, "6144"}, {5, "8192"},
+	{6, "12288"}, {7, "16384"}, {0, NULL}};
+
+static CV_PossibleValue_t gltexdepth_cons_t[] = {{16, "16 bits"}, {32, "32 bits"}, {0, NULL}};
+
+static CV_PossibleValue_t glpalettedepth_cons_t[] = {{16, "16 bits"}, {24, "24 bits"}, {0, NULL}};
+
+//
+// console variables
+//
+
+// The current screen texture implementation is inefficient and disabling it can result in significant
+// performance gains on lower end hardware. The game is still quite playable without this functionality.
+// Features that break when disabling this:
+//  - water and heat wave effects
+//  - intermission background
+//  - full screen scaling (use native resolution or windowed mode to avoid this)
+consvar_t cv_glscreentextures = {"gr_screentextures", "All", CV_CALL|CV_SAVE, glscreentextures_cons_t, CV_screentextures_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+#ifdef USE_FBO_OGL
+consvar_t cv_glframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, CV_glframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL};
+#endif
+
+consvar_t cv_glmdls = {"gr_mdls", "Off", CV_SAVE|CV_CALL, CV_OnOff, M_UpdateOGLMenu, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glfallbackplayermodel = {"gr_fallbackplayermodel", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glspritebillboarding = {"gr_spritebillboarding", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glshearing = {"gr_shearing", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glfakecontrast = {"gr_fakecontrast", "Standard", CV_SAVE, glfakecontrast_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glslopecontrast = {"gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glshaders = {"gr_shaders", "On", CV_CALL|CV_SAVE, glshaders_cons_t, CV_glshaders_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_gllightdither = {"gr_lightdithering", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_gllightdithering_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glfiltermode = {"gr_filtermode", "Nearest", CV_CALL|CV_SAVE, glfiltermode_cons_t, CV_filtermode_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glanisotropicmode = {"gr_anisotropicmode", "1", CV_CALL|CV_SAVE, glanisotropicmode_cons_t, CV_anisotropic_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glwireframe = {"gr_wireframe", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glrenderdistance = {"gr_renderdistance", "Max", CV_SAVE, glrenderdistance_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glhorizonlines = {"gr_horizonlines", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glportals = {"gr_portals", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_glpaletterendering = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_glpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glpalettedepth = {"gr_palettedepth", "16 bits", CV_SAVE|CV_CALL, glpalettedepth_cons_t, CV_glpalettedepth_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glflashpal = {"gr_flashpal", "On", CV_CALL|CV_SAVE, CV_OnOff, CV_glpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_gltexturedepth = {"gr_texturedepth", "32 bits", CV_CALL|CV_SAVE, gltexdepth_cons_t, CV_gltextureformat_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+#define ONLY_IF_GL_LOADED if (vid.glstate != VID_GL_LIBRARY_LOADED) return;
+
+static void CV_screentextures_OnChange(void)
+{
+	ONLY_IF_GL_LOADED
+	if (cv_glscreentextures.value != 2)
+	{
+		if (cv_glpaletterendering.value != 0)
+			CV_SetValue(&cv_glpaletterendering, 0);
+
+#ifdef USE_FBO_OGL
+		if (cv_glframebuffer.value != 0)
+			CV_SetValue(&cv_glframebuffer, 0);
+#endif
+	}
+	GL_SetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_glscreentextures.value);
+	M_UpdateOGLMenu();
+}
+
+#ifdef USE_FBO_OGL
+static void CV_glframebuffer_OnChange(void)
+{
+	ONLY_IF_GL_LOADED
+	if ((cv_glframebuffer.value != 0 && cv_glscreentextures.value != 2) || (!supportFBO && cv_glframebuffer.value != 0)) // screen FBO needs screen textures
+		CV_SetValue(&cv_glframebuffer, 0);
+
+	I_DownSample();
+	RefreshOGLSDLSurface();
+	M_UpdateOGLMenu();
+}
+#endif
+
+static void CV_glshaders_OnChange(void)
+{
+	ONLY_IF_GL_LOADED
+	HWR_SetShaderState();
+	if (cv_glpaletterendering.value)
+	{
+		// can't do palette rendering without shaders, so update the state if needed
+		HWR_TogglePaletteRendering();
+	}
+	M_UpdateOGLMenu();
+}
+
+static void CV_gllightdithering_OnChange(void)
+{
+	ONLY_IF_GL_LOADED
+	if (gl_shadersavailable)
+	{
+		HWR_CompileShaders();
+	}
+}
+
+static void CV_gltextureformat_OnChange(void)
+{
+	ONLY_IF_GL_LOADED
+	GL_SetSpecialState(HWD_SET_TEXTURE_FORMAT, cv_gltexturedepth.value);
+}
+
+static void CV_filtermode_OnChange(void)
+{
+	ONLY_IF_GL_LOADED
+	GL_SetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_glfiltermode.value);
+}
+
+static void CV_anisotropic_OnChange(void)
+{
+	ONLY_IF_GL_LOADED
+	GL_SetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_glanisotropicmode.value);
+}
+
+static void CV_glpaletterendering_OnChange(void)
+{
+	ONLY_IF_GL_LOADED
+	if (cv_glpaletterendering.value != 0 && cv_glscreentextures.value != 2) // can't do palette rendering without screen textures
+		CV_SetValue(&cv_glpaletterendering, 0);
+
+	if (gl_shadersavailable)
+	{
+		HWR_CompileShaders();
+		HWR_TogglePaletteRendering();
+	}
+	M_UpdateOGLMenu();
+}
+
+static void CV_glpalettedepth_OnChange(void)
+{
+	ONLY_IF_GL_LOADED
+	if (HWR_ShouldUsePaletteRendering())
+		HWR_SetPalette(pLocalPalette);
+}
+
+// ==========================================================================
+// Lighting
+// ==========================================================================
+
+static void HWR_SetShaderState(void)
+{
+	GL_SetSpecialState(HWD_SET_SHADERS, HWR_UseShader() ? 1 : 0);
+}
+
+static boolean HWR_IsWireframeMode(void)
+{
+	return (cv_glwireframe.value /*&& cv_debug*/);
+}
+
+static boolean HWR_OverrideObjectLightLevel(mobj_t *thing, INT32 *lightlevel)
+{
+	if (R_ThingIsFullBright(thing))
+		*lightlevel = 255;
+	else if (R_ThingIsFullDark(thing))
+		*lightlevel = 0;
+	else if (thing->frame & FF_ABSOLUTELIGHTLEVEL)
+		*lightlevel = R_ThingLightLevel(thing);
+	else
+		return false;
+
+	return true;
+}
+
+void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32 *lightlevel, boolean model)
+{
+	const boolean semibright = R_ThingIsSemiBright(spr->mobj);
+
+	*lightlevel += R_ThingLightLevel(spr->mobj);
+
+	if (maplighting.directional == true && P_SectorUsesDirectionalLighting(sector))
+	{
+		if (model == false) // this is implemented by shader
+		{
+			fixed_t extralight = R_GetSpriteDirectionalLighting(R_PointToAngle(spr->mobj->x, spr->mobj->y));
+
+			// Less change in contrast in dark sectors
+			extralight = FixedMul(extralight, CLAMP(*lightlevel, 0, 255) * FRACUNIT / 255);
+
+			// simple OGL approximation
+			fixed_t tr = R_QuickCamDist(spr->mobj->x, spr->mobj->y) << FRACBITS;
+			fixed_t xscale = FixedDiv((vid.width / 2) << FRACBITS, tr);
+
+			// Less change in contrast at further distances, to counteract DOOM diminished light
+			fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT));
+			extralight = FixedMul(extralight, std::min(n, FRACUNIT));
+
+			// Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance
+			*lightlevel += FixedFloor((extralight * 2) + (FRACUNIT / 2)) / FRACUNIT;
+		}
+
+		// Semibright objects will be made slightly brighter to compensate contrast
+		if (semibright)
+		{
+			*lightlevel += 16;
+		}
+	}
+
+	if (semibright)
+	{
+		*lightlevel = 128 + (*lightlevel >> 1);
+	}
+}
+
+void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *colormap, const boolean directional)
+{
+	RGBA_t poly_color, tint_color, fade_color;
+
+	poly_color.rgba = 0xFFFFFFFF;
+	tint_color.rgba = (colormap != NULL) ? (UINT32)colormap->rgba : GL_DEFAULTMIX;
+	fade_color.rgba = (colormap != NULL) ? (UINT32)colormap->fadergba : GL_DEFAULTFOG;
+
+	// Clamp the light level, since it can sometimes go out of the 0-255 range from animations
+	light_level = CLAMP(SOFTLIGHT(light_level), cv_secbright.value, 255);
+
+	// Crappy backup coloring if you can't do shaders
+	if (!HWR_UseShader())
+	{
+		// be careful, this may get negative for high lightlevel values.
+		float tint_alpha, fade_alpha;
+		float red, green, blue;
+
+		red   = (float)poly_color.s.red;
+		green = (float)poly_color.s.green;
+		blue  = (float)poly_color.s.blue;
+
+		// 48 is just an arbritrary value that looked relatively okay.
+		tint_alpha = (float)(sqrt(tint_color.s.alpha) * 48) / 255.0f;
+
+		// 8 is roughly the brightness of the "close" color in Software, and 16 the brightness of the "far" color.
+		// 8 is too bright for dark levels, and 16 is too dark for bright levels.
+		// 12 is the compromise value. It doesn't look especially good anywhere, but it's the most balanced.
+		// (Also, as far as I can tell, fade_color's alpha is actually not used in Software, so we only use light level.)
+		fade_alpha = (float)(sqrt(255-light_level) * 12) / 255.0f;
+
+		// Clamp the alpha values
+		tint_alpha = CLAMP(tint_alpha, 0.0f, 1.0f);
+		fade_alpha = CLAMP(fade_alpha, 0.0f, 1.0f);
+
+		red   = (tint_color.s.red * tint_alpha)   + (red * (1.0f - tint_alpha));
+		green = (tint_color.s.green * tint_alpha) + (green * (1.0f - tint_alpha));
+		blue  = (tint_color.s.blue * tint_alpha)  + (blue * (1.0f - tint_alpha));
+
+		red   = (fade_color.s.red * fade_alpha)   + (red * (1.0f - fade_alpha));
+		green = (fade_color.s.green * fade_alpha) + (green * (1.0f - fade_alpha));
+		blue  = (fade_color.s.blue * fade_alpha)  + (blue * (1.0f - fade_alpha));
+
+		poly_color.s.red   = (UINT8)red;
+		poly_color.s.green = (UINT8)green;
+		poly_color.s.blue  = (UINT8)blue;
+	}
+
+	// in palette rendering mode, this is not needed since it properly takes the changes to the palette itself
+	if (!HWR_ShouldUsePaletteRendering())
+	{
+		V_CubeApply(&tint_color.s.red, &tint_color.s.green, &tint_color.s.blue);
+		V_CubeApply(&fade_color.s.red, &fade_color.s.green, &fade_color.s.blue);
+	}
+	Surface->PolyColor.rgba = poly_color.rgba;
+	Surface->TintColor.rgba = tint_color.rgba;
+	Surface->FadeColor.rgba = fade_color.rgba;
+	Surface->LightInfo.light_level = light_level;
+	Surface->LightInfo.fade_start = (colormap != NULL) ? colormap->fadestart : 0;
+	Surface->LightInfo.fade_end = (colormap != NULL) ? colormap->fadeend : 31;
+	Surface->LightInfo.directional = (maplighting.directional == true && directional == true);
+	Surface->LightTableId = HWR_ShouldUsePaletteRendering() ? HWR_GetLightTableID(colormap) : 0;
+}
+
+static UINT8 HWR_FogBlockAlpha(INT32 light, extracolormap_t *colormap) // Let's see if this can work
+{
+	RGBA_t realcolor, surfcolor;
+	INT32 alpha;
+
+	realcolor.rgba = (colormap != NULL) ? colormap->rgba : GL_DEFAULTMIX;
+
+	if (HWR_UseShader())
+	{
+		surfcolor.s.alpha = (255 - light);
+	}
+	else
+	{
+		// Don't go out of bounds
+		light = CLAMP(light - (255 - light), 0, 255);
+
+		alpha = (realcolor.s.alpha*255)/25;
+
+		// at 255 brightness, alpha is between 0 and 127, at 0 brightness alpha will always be 255
+		surfcolor.s.alpha = (alpha*light) / (2*256) + 255-light;
+	}
+
+	return surfcolor.s.alpha;
+}
+
+static FUINT HWR_CalcWallLight(FUINT lightnum, seg_t *seg, extracolormap_t *colormap)
+{
+	INT16 finallight = lightnum;
+
+	if (cv_glfakecontrast.value == 0 || (HWR_ShouldUsePaletteRendering() && colormap))
+		return (FUINT)finallight;
+
+	if (seg != NULL && P_ApplyLightOffsetFine(lightnum, seg->frontsector))
+	{
+		INT16 offset = (cv_glfakecontrast.value == 2) ? seg->hwLightOffset : ((INT16)seg->lightOffset * 8);
+
+		finallight += offset;
+		finallight = CLAMP(finallight, 0 , 255);
+	}
+
+	return (FUINT)finallight;
+}
+
+static FUINT HWR_CalcSlopeLight(FUINT lightnum, pslope_t *slope, const sector_t *sector, const boolean fof)
+{
+	INT16 finallight = lightnum;
+
+	if (cv_glfakecontrast.value == 0 || cv_glslopecontrast.value == 0)
+		return (FUINT)finallight;
+
+	if (slope != NULL && sector != NULL && P_ApplyLightOffsetFine(lightnum, sector))
+	{
+		INT16 offset = (cv_glfakecontrast.value == 2) ? slope->hwLightOffset : ((INT16)slope->lightOffset * 8);
+
+		finallight += (fof ? -offset : offset);
+		finallight = CLAMP(finallight, 0 , 255);
+	}
+
+	return (FUINT)finallight;
+}
+
+// ==========================================================================
+// Floor and ceiling generation from subsectors
+// ==========================================================================
+
+// HWR_RenderPlane
+// Render a floor or ceiling convex polygon
+static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
+{
+	FSurfaceInfo Surf;
+	FOutVector *v3d;
+	polyvertex_t *pv;
+	pslope_t *slope = NULL;
+	INT32 shader = SHADER_NONE;
+
+	size_t nrPlaneVerts;
+	INT32 i;
+
+	float height; // constant y for all points on the convex flat polygon
+	float flatxref, flatyref = 0.0f;
+	float fflatsize = 64.0f;
+	INT32 flatflag = 63;
+	size_t len;
+
+	float tempxsow, tempytow;
+	float scrollx = 0.0f, scrolly = 0.0f, anglef = 0.0f;
+	angle_t angle = 0;
+
+	static FOutVector *planeVerts = NULL;
+	static UINT16 numAllocedPlaneVerts = 0;
+
+	poly_t *planepoly = xsub->planepoly;
+
+	// no convex poly were generated for this subsector
+	if (!planepoly)
+		return;
+
+	nrPlaneVerts = planepoly->numpts;
+
+	if (nrPlaneVerts < 3)   //not even a triangle ?
+		return;
+
+	// Get the slope pointer to simplify future code
+	if (FOFsector)
+	{
+		if (FOFsector->f_slope && !isceiling)
+			slope = FOFsector->f_slope;
+		else if (FOFsector->c_slope && isceiling)
+			slope = FOFsector->c_slope;
+	}
+	else
+	{
+		if (gl_frontsector->f_slope && !isceiling)
+			slope = gl_frontsector->f_slope;
+		else if (gl_frontsector->c_slope && isceiling)
+			slope = gl_frontsector->c_slope;
+	}
+
+	// Set fixedheight to the slope's height from our viewpoint, if we have a slope
+	if (slope)
+		fixedheight = P_GetSlopeZAt(slope, viewx, viewy);
+
+	height = FixedToFloat(fixedheight);
+
+	// Allocate plane-vertex buffer if we need to
+	if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts)
+	{
+		numAllocedPlaneVerts = (UINT16)nrPlaneVerts;
+		Z_Free(planeVerts);
+		Z_Malloc(numAllocedPlaneVerts * sizeof (FOutVector), PU_LEVEL, &planeVerts);
+	}
+
+	len = W_LumpLength(lumpnum);
+
+	switch (len)
+	{
+		case 4194304: // 2048x2048 lump
+			fflatsize = 2048.0f;
+			flatflag = 2047;
+			break;
+		case 1048576: // 1024x1024 lump
+			fflatsize = 1024.0f;
+			flatflag = 1023;
+			break;
+		case 262144:// 512x512 lump
+			fflatsize = 512.0f;
+			flatflag = 511;
+			break;
+		case 65536: // 256x256 lump
+			fflatsize = 256.0f;
+			flatflag = 255;
+			break;
+		case 16384: // 128x128 lump
+			fflatsize = 128.0f;
+			flatflag = 127;
+			break;
+		case 1024: // 32x32 lump
+			fflatsize = 32.0f;
+			flatflag = 31;
+			break;
+		default: // 64x64 lump
+			fflatsize = 64.0f;
+			flatflag = 63;
+			break;
+	}
+
+	pv = planepoly->pts;
+
+	// reference point for flat texture coord for each vertex around the polygon
+	flatxref = (float)(((fixed_t)pv->x & (~flatflag)) / fflatsize);
+	flatyref = (float)(((fixed_t)pv->y & (~flatflag)) / fflatsize);
+
+	if (FOFsector != NULL)
+	{
+		if (!isceiling) // it's a floor
+		{
+			scrollx = FixedToFloat(FOFsector->floor_xoffs)/fflatsize;
+			scrolly = FixedToFloat(FOFsector->floor_yoffs)/fflatsize;
+			angle = FOFsector->floorpic_angle;
+		}
+		else // it's a ceiling
+		{
+			scrollx = FixedToFloat(FOFsector->ceiling_xoffs)/fflatsize;
+			scrolly = FixedToFloat(FOFsector->ceiling_yoffs)/fflatsize;
+			angle = FOFsector->ceilingpic_angle;
+		}
+	}
+	else if (gl_frontsector)
+	{
+		if (!isceiling) // it's a floor
+		{
+			scrollx = FixedToFloat(gl_frontsector->floor_xoffs)/fflatsize;
+			scrolly = FixedToFloat(gl_frontsector->floor_yoffs)/fflatsize;
+			angle = gl_frontsector->floorpic_angle;
+		}
+		else // it's a ceiling
+		{
+			scrollx = FixedToFloat(gl_frontsector->ceiling_xoffs)/fflatsize;
+			scrolly = FixedToFloat(gl_frontsector->ceiling_yoffs)/fflatsize;
+			angle = gl_frontsector->ceilingpic_angle;
+		}
+	}
+
+	if (angle) // Only needs to be done if there's an altered angle
+	{
+		tempxsow = flatxref;
+		tempytow = flatyref;
+		anglef = ANG2RAD(InvAngle(angle));
+		flatxref = (tempxsow * cos(anglef)) - (tempytow * sin(anglef));
+		flatyref = (tempxsow * sin(anglef)) + (tempytow * cos(anglef));
+	}
+
+#define SETUP3DVERT(vert, vx, vy) {\
+		/* Hurdler: add scrolling texture on floor/ceiling */\
+		vert->s = (float)(((vx) / fflatsize) - flatxref + scrollx);\
+		vert->t = (float)(flatyref - ((vy) / fflatsize) + scrolly);\
+\
+		/* Need to rotate before translate */\
+		if (angle) /* Only needs to be done if there's an altered angle */\
+		{\
+			tempxsow = vert->s;\
+			tempytow = vert->t;\
+			vert->s = (tempxsow * cos(anglef)) - (tempytow * sin(anglef));\
+			vert->t = (tempxsow * sin(anglef)) + (tempytow * cos(anglef));\
+		}\
+\
+		vert->x = (vx);\
+		vert->y = height;\
+		vert->z = (vy);\
+\
+		if (slope)\
+		{\
+			fixedheight = P_GetSlopeZAt(slope, FloatToFixed((vx)), FloatToFixed((vy)));\
+			vert->y = FixedToFloat(fixedheight);\
+		}\
+}
+	for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++,v3d++,pv++)
+		SETUP3DVERT(v3d, pv->x, pv->y);
+
+	if (slope)
+		lightlevel = HWR_CalcSlopeLight(lightlevel, slope, gl_frontsector, (FOFsector != NULL));
+
+	HWR_Lighting(&Surf, lightlevel, planecolormap, P_SectorUsesDirectionalLighting(gl_frontsector));
+
+	if (PolyFlags & (PF_Translucent|PF_Fog|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
+	{
+		Surf.PolyColor.s.alpha = (UINT8)alpha;
+		PolyFlags |= PF_Modulated;
+	}
+	else
+		PolyFlags |= PF_Masked|PF_Modulated;
+
+	if (HWR_UseShader())
+	{
+		if (PolyFlags & PF_Fog)
+			shader = SHADER_FOG;
+		else if (cv_ripplewater.value && (PolyFlags & PF_Ripple))
+			shader = SHADER_WATER;
+		else
+			shader = SHADER_FLOOR;
+
+		PolyFlags |= PF_ColorMapped;
+	}
+
+	HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, PolyFlags, shader, false);
+
+	if (gl_maphashorizonlines && subsector && cv_glhorizonlines.value)
+	{
+		// Horizon lines
+		FOutVector horizonpts[6];
+		float dist, vx, vy;
+		float x1, y1, xd, yd;
+		UINT8 numplanes, j;
+		vertex_t v; // For determining the closest distance from the line to the camera, to split render planes for minimum distortion;
+
+		static constexpr float renderdist    = 27000.0f; // How far out to properly render the plane
+		static constexpr float farrenderdist = 32768.0f; // From here, raise plane to horizon level to fill in the line with some texture distortion
+
+		const seg_t *line = &segs[subsector->firstline];
+
+		for (i = 0; i < subsector->numlines; i++, line++)
+		{
+			// this check sucks and is a hotspot lel
+			if (LIKELY(line->linedef->special != HORIZONSPECIAL))
+				continue;
+
+			if (R_PointOnSegSide(viewx, viewy, line) != 0)
+				continue;
+
+			P_ClosestPointOnLine(viewx, viewy, line->linedef, &v);
+			dist = FixedToFloat(R_PointToDist(v.x, v.y));
+
+			if (line->pv1)
+			{
+				x1 = ((polyvertex_t *)line->pv1)->x;
+				y1 = ((polyvertex_t *)line->pv1)->y;
+			}
+			else
+			{
+				x1 = y1 = FixedToFloat(line->v1->x);
+			}
+
+			if (line->pv2)
+			{
+				xd = ((polyvertex_t *)line->pv2)->x - x1;
+				yd = ((polyvertex_t *)line->pv2)->y - y1;
+			}
+			else
+			{
+				xd = FixedToFloat(line->v2->x) - x1;
+				yd = FixedToFloat(line->v2->y) - y1;
+			}
+
+			// Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion
+			dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f;
+
+			if (dist > 100.0f)
+				numplanes = 100;
+			else
+				numplanes = (UINT8)dist + 1;
+
+			for (j = 0; j < numplanes; j++)
+			{
+				// Left side
+				vx = x1 + xd * j / numplanes;
+				vy = y1 + yd * j / numplanes;
+				SETUP3DVERT((&horizonpts[1]), vx, vy);
+
+				dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
+				vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
+				vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
+				SETUP3DVERT((&horizonpts[0]), vx, vy);
+
+				// Right side
+				vx = x1 + xd * (j+1) / numplanes;
+				vy = y1 + yd * (j+1) / numplanes;
+				SETUP3DVERT((&horizonpts[2]), vx, vy);
+
+				dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
+				vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
+				vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
+				SETUP3DVERT((&horizonpts[3]), vx, vy);
+
+				// Horizon fills
+				vx = (horizonpts[0].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
+				vy = (horizonpts[0].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
+				SETUP3DVERT((&horizonpts[5]), vx, vy);
+				horizonpts[5].y = gl_viewz;
+
+				vx = (horizonpts[3].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
+				vy = (horizonpts[3].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
+				SETUP3DVERT((&horizonpts[4]), vx, vy);
+				horizonpts[4].y = gl_viewz;
+
+				// Draw
+				HWR_ProcessPolygon(&Surf, horizonpts, 6, PolyFlags, shader, true);
+			}
+		}
+	}
+}
+
+#ifdef WALLSPLATS
+static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
+{
+	FOutVector wallVerts[4];
+	wallsplat_t *splat;
+	patch_t *gpatch;
+	fixed_t i;
+	// seg bbox
+	fixed_t segbbox[4];
+
+	INT32 shader = SHADER_NONE;
+
+	M_ClearBox(segbbox);
+	M_AddToBox(segbbox,
+		FloatToFixed(((polyvertex_t *)gl_curline->pv1)->x),
+		FloatToFixed(((polyvertex_t *)gl_curline->pv1)->y));
+	M_AddToBox(segbbox,
+		FloatToFixed(((polyvertex_t *)gl_curline->pv2)->x),
+		FloatToFixed(((polyvertex_t *)gl_curline->pv2)->y));
+
+	splat = (wallsplat_t *)gl_curline->linedef->splats;
+	for (; splat; splat = splat->next)
+	{
+		//BP: don't draw splat extern to this seg
+		//    this is quick fix best is explain in logboris.txt at 12-4-2000
+		if (!M_PointInBox(segbbox,splat->v1.x,splat->v1.y) && !M_PointInBox(segbbox,splat->v2.x,splat->v2.y))
+			continue;
+
+		gpatch = W_CachePatchNum(splat->patch, PU_SPRITE);
+		HWR_GetPatch(gpatch);
+
+		wallVerts[0].x = wallVerts[3].x = FixedToFloat(splat->v1.x);
+		wallVerts[0].z = wallVerts[3].z = FixedToFloat(splat->v1.y);
+		wallVerts[2].x = wallVerts[1].x = FixedToFloat(splat->v2.x);
+		wallVerts[2].z = wallVerts[1].z = FixedToFloat(splat->v2.y);
+
+		i = splat->top;
+		if (splat->yoffset)
+			i += *splat->yoffset;
+
+		wallVerts[2].y = wallVerts[3].y = FixedToFloat(i)+(gpatch->height>>1);
+		wallVerts[0].y = wallVerts[1].y = FixedToFloat(i)-(gpatch->height>>1);
+
+		wallVerts[3].s = wallVerts[3].t = wallVerts[2].s = wallVerts[0].t = 0.0f;
+		wallVerts[1].s = wallVerts[1].t = wallVerts[2].t = wallVerts[0].s = 1.0f;
+
+		switch (splat->flags & SPLATDRAWMODE_MASK)
+		{
+			case SPLATDRAWMODE_OPAQUE :
+				pSurf.PolyColor.s.alpha = 0xff;
+				i = PF_Translucent;
+				break;
+			case SPLATDRAWMODE_TRANS :
+				pSurf.PolyColor.s.alpha = 128;
+				i = PF_Translucent;
+				break;
+			case SPLATDRAWMODE_SHADE :
+				pSurf.PolyColor.s.alpha = 0xff;
+				i = PF_Substractive;
+				break;
+		}
+
+		if (HWR_UseShader())
+			shader = SHADER_WALL;
+
+		HWR_ProcessPolygon(&pSurf, wallVerts, 4, i|PF_Modulated|PF_Decal, shader, false);
+	}
+}
+#endif
+
+FBITFIELD HWR_GetBlendModeFlag(INT32 style)
+{
+	switch (style)
+	{
+		case AST_TRANSLUCENT:
+			return PF_Translucent;
+		case AST_ADD:
+			return PF_Additive;
+		case AST_SUBTRACT:
+			return PF_Subtractive;
+		case AST_REVERSESUBTRACT:
+			return PF_ReverseSubtract;
+		case AST_MODULATE:
+			return PF_Multiplicative;
+		default:
+			return PF_Masked;
+	}
+}
+
+UINT8 HWR_GetTranstableAlpha(INT32 transtablenum)
+{
+	switch (transtablenum)
+	{
+		case 0          : return 0xff;
+		case tr_trans10 : return 0xe6;
+		case tr_trans20 : return 0xcc;
+		case tr_trans30 : return 0xb3;
+		case tr_trans40 : return 0x99;
+		case tr_trans50 : return 0x80;
+		case tr_trans60 : return 0x66;
+		case tr_trans70 : return 0x4c;
+		case tr_trans80 : return 0x33;
+		case tr_trans90 : return 0x19;
+	}
+
+	return 0xff;
+}
+
+FBITFIELD HWR_SurfaceBlend(INT32 style, INT32 transtablenum, FSurfaceInfo *pSurf)
+{
+	if (!transtablenum || style <= AST_COPY || style >= AST_OVERLAY)
+	{
+		pSurf->PolyColor.s.alpha = 0xff;
+		return PF_Masked;
+	}
+
+	pSurf->PolyColor.s.alpha = HWR_GetTranstableAlpha(transtablenum);
+	return HWR_GetBlendModeFlag(style);
+}
+
+FBITFIELD HWR_TranstableToAlpha(INT32 transtablenum, FSurfaceInfo *pSurf)
+{
+	if (!transtablenum)
+	{
+		pSurf->PolyColor.s.alpha = 0x00;
+		return PF_Masked;
+	}
+
+	pSurf->PolyColor.s.alpha = HWR_GetTranstableAlpha(transtablenum);
+	return PF_Translucent;
+}
+
+// ==========================================================================
+// Wall generation from subsector segs
+// ==========================================================================
+
+//
+// HWR_ProjectWall
+//
+static void HWR_ProjectWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blendmode, INT32 lightlevel, extracolormap_t *wallcolormap)
+{
+	INT32 shader = SHADER_NONE;
+
+	HWR_Lighting(pSurf, lightlevel, wallcolormap, P_SectorUsesDirectionalLighting(gl_frontsector));
+
+	if (HWR_UseShader())
+	{
+		shader = SHADER_WALL;
+		blendmode |= PF_ColorMapped;
+	}
+
+	// don't draw to color buffer when drawing to stencil
+	if (gl_drawing_stencil)
+	{
+		blendmode |= PF_Invisible|PF_NoAlphaTest; // TODO not sure if any others than PF_Invisible are needed??
+		blendmode &= ~PF_Masked;
+	}
+
+	HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode|PF_Modulated|PF_Occlude, shader, false);
+
+#ifdef WALLSPLATS
+	if (gl_curline->linedef->splats && cv_splats.value)
+		HWR_DrawSegsSplats(pSurf);
+#endif
+}
+
+//
+// HWR_SplitWall
+//
+// SoM: split up and light walls according to the lightlist.
+// This may also include leaving out parts of the wall that can't be seen
+static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, boolean noencore, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor, FBITFIELD polyflags)
+{
+	float realtop, realbot, top, bot;
+	float pegt, pegb, pegmul;
+	float height = 0.0f, bheight = 0.0f;
+
+	float endrealtop, endrealbot, endtop, endbot;
+	float endpegt, endpegb, endpegmul;
+	float endheight = 0.0f, endbheight = 0.0f;
+
+	float diff;
+
+	fixed_t v1x = FloatToFixed(wallVerts[0].x);
+	fixed_t v1y = FloatToFixed(wallVerts[0].z);
+	fixed_t v2x = FloatToFixed(wallVerts[1].x);
+	fixed_t v2y = FloatToFixed(wallVerts[1].z);
+
+	const UINT8 alpha = Surf->PolyColor.s.alpha;
+	FUINT lightnum = HWR_CalcWallLight(sector->lightlevel, gl_curline, NULL);
+	extracolormap_t *colormap = NULL;
+
+	realtop = top = wallVerts[3].y;
+	realbot = bot = wallVerts[0].y;
+	diff = top - bot;
+
+	pegt = wallVerts[3].t;
+	pegb = wallVerts[0].t;
+
+	// Lactozilla: If both heights of a side lay on the same position, then this wall is a triangle.
+	// To avoid division by zero, which would result in a NaN, we check if the vertical difference
+	// between the two vertices is not zero.
+	if (std::fpclassify(diff) == FP_ZERO)
+		pegmul = 0.0;
+	else
+		pegmul = (pegb - pegt) / diff;
+
+	endrealtop = endtop = wallVerts[2].y;
+	endrealbot = endbot = wallVerts[1].y;
+	diff = endtop - endbot;
+
+	endpegt = wallVerts[2].t;
+	endpegb = wallVerts[1].t;
+
+	if (std::fpclassify(diff) == FP_ZERO)
+		endpegmul = 0.0;
+	else
+		endpegmul = (endpegb - endpegt) / diff;
+
+	for (INT32 i = 0; i < sector->numlights; i++)
+	{
+		if ((endtop < endrealbot) && (top < realbot))
+			return;
+
+		const lightlist_t *list = sector->lightlist;
+
+		if (!(list[i].flags & FF_NOSHADE))
+		{
+			if (pfloor && (pfloor->flags & FF_FOG))
+			{
+				lightnum = pfloor->master->frontsector->lightlevel;
+				colormap = pfloor->master->frontsector->extra_colormap;
+			}
+			else
+			{
+				lightnum = *list[i].lightlevel;
+				colormap = list[i].extra_colormap;
+			}
+
+			lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
+		}
+
+		boolean solid = false;
+
+		if ((sector->lightlist[i].flags & FF_CUTSOLIDS) && !(cutflag & FF_EXTRA))
+			solid = true;
+		else if ((sector->lightlist[i].flags & FF_CUTEXTRA) && (cutflag & FF_EXTRA))
+		{
+			if (sector->lightlist[i].flags & FF_EXTRA)
+			{
+				if ((sector->lightlist[i].flags & (FF_FOG|FF_SWIMMABLE)) == (cutflag & (FF_FOG|FF_SWIMMABLE))) // Only merge with your own types
+					solid = true;
+			}
+			else
+				solid = true;
+		}
+		else
+			solid = false;
+
+		height    = FixedToFloat(P_GetLightZAt(&list[i], v1x, v1y));
+		endheight = FixedToFloat(P_GetLightZAt(&list[i], v2x, v2y));
+
+		if (solid)
+		{
+			bheight    = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v1x, v1y));
+			endbheight = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v2x, v2y));
+		}
+
+		if (endheight >= endtop && height >= top)
+		{
+			if (solid && top > bheight)
+				top = bheight;
+
+			if (solid && endtop > endbheight)
+				endtop = endbheight;
+		}
+
+		if (i + 1 < sector->numlights)
+		{
+			bheight = FixedToFloat(P_GetLightZAt(&list[i+1], v1x, v1y));
+			endbheight = FixedToFloat(P_GetLightZAt(&list[i+1], v2x, v2y));
+		}
+		else
+		{
+			bheight = realbot;
+			endbheight = endrealbot;
+		}
+
+		if ((endbheight >= endtop) || (bheight >= top))
+			continue;
+
+		// Found a break
+		// The heights are clamped to ensure the polygon doesn't cross itself.
+		bot    = CLAMP(bheight, realbot, top);
+		endbot = CLAMP(endbheight, endrealbot, endtop);
+
+		Surf->PolyColor.s.alpha = alpha;
+
+		wallVerts[3].t = pegt + ((realtop - top) * pegmul);
+		wallVerts[2].t = endpegt + ((endrealtop - endtop) * endpegmul);
+		wallVerts[0].t = pegt + ((realtop - bot) * pegmul);
+		wallVerts[1].t = endpegt + ((endrealtop - endbot) * endpegmul);
+
+		// set top/bottom coords
+		wallVerts[3].y = top;
+		wallVerts[2].y = endtop;
+		wallVerts[0].y = bot;
+		wallVerts[1].y = endbot;
+
+		if (cutflag & FF_FOG)
+			HWR_AddTransparentWall(wallVerts, Surf, texnum, noencore, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap);
+		else if (polyflags & (PF_Translucent|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
+			HWR_AddTransparentWall(wallVerts, Surf, texnum, noencore, polyflags, false, lightnum, colormap);
+		else
+			HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap);
+
+		top = bot;
+		endtop = endbot;
+	}
+
+	bot = realbot;
+	endbot = endrealbot;
+
+	if ((endtop <= endrealbot) && (top <= realbot))
+		return;
+
+	Surf->PolyColor.s.alpha = alpha;
+
+	wallVerts[3].t = pegt + ((realtop - top) * pegmul);
+	wallVerts[2].t = endpegt + ((endrealtop - endtop) * endpegmul);
+	wallVerts[0].t = pegt + ((realtop - bot) * pegmul);
+	wallVerts[1].t = endpegt + ((endrealtop - endbot) * endpegmul);
+
+	// set top/bottom coords
+	wallVerts[3].y = top;
+	wallVerts[2].y = endtop;
+	wallVerts[0].y = bot;
+	wallVerts[1].y = endbot;
+
+	if (cutflag & FF_FOG)
+		HWR_AddTransparentWall(wallVerts, Surf, texnum, noencore, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap);
+	else if (polyflags & (PF_Translucent|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
+		HWR_AddTransparentWall(wallVerts, Surf, texnum, noencore, polyflags, false, lightnum, colormap);
+	else
+		HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap);
+}
+
+// skywall list system for fixing portal issues by postponing skywall rendering (and using stencil buffer for them)
+// ideally this will be a temporary implementation.
+// a better and more efficient way to do this would be to sort skywalls to the end of the draw call list inside RenderBatches.
+// Additionally, to remove the need to draw the sky twice, drawing a plane at the far clip boundary to the stencil buffer after other
+// rendering will also allow stencil sky rendering to fill in any untouched pixels too.
+
+FOutVector* skyWallVertexArray = NULL;
+int skyWallVertexArraySize = 0;
+int skyWallVertexArrayAllocSize = 65536;// what a mouthful
+
+boolean gl_collect_skywalls = false;
+
+static void HWR_SkyWallList_Clear(void)
+{
+	skyWallVertexArraySize = 0;
+}
+
+static void HWR_SkyWallList_Add(FOutVector *wallVerts)
+{
+	if (!skyWallVertexArray)
+	{
+		// array has not been allocated yet. allocate it now
+		skyWallVertexArray = static_cast<FOutVector*>(Z_Malloc(sizeof(FOutVector) * 4 * skyWallVertexArrayAllocSize, PU_STATIC, NULL));
+	}
+
+	if (skyWallVertexArraySize == skyWallVertexArrayAllocSize)
+	{
+		// allocated array got full, allocate more space
+		skyWallVertexArrayAllocSize *= 2;
+		skyWallVertexArray = static_cast<FOutVector*>(Z_Realloc(skyWallVertexArray, sizeof(FOutVector) * 4 * skyWallVertexArrayAllocSize, PU_STATIC, NULL));
+	}
+
+	memcpy(skyWallVertexArray + skyWallVertexArraySize * 4, wallVerts, sizeof(FOutVector) * 4);
+	skyWallVertexArraySize++;
+}
+
+static void HWR_DrawSkyWallList(void)
+{
+	int i;
+	FSurfaceInfo surf;
+
+	surf.PolyColor.rgba = 0xFFFFFFFF;
+
+	HWR_SetCurrentTexture(NULL);
+	GL_UnSetShader();
+	for (i = 0; i < skyWallVertexArraySize; i++)
+	{
+		GL_DrawPolygon(&surf, skyWallVertexArray + i * 4, 4, PF_Occlude|PF_Invisible|PF_NoTexture|PF_Skydecal);
+	}
+}
+
+// HWR_DrawSkyWalls
+// Draw walls into the depth buffer so that anything behind is culled properly
+static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf)
+{
+	//HWR_SetCurrentTexture(NULL);
+	// no texture
+	wallVerts[3].t = wallVerts[2].t = 0;
+	wallVerts[0].t = wallVerts[1].t = 0;
+	wallVerts[0].s = wallVerts[3].s = 0;
+	wallVerts[2].s = wallVerts[1].s = 0;
+
+	if (UNLIKELY(gl_collect_skywalls))
+	{
+		HWR_SkyWallList_Add(wallVerts);
+	}
+	else
+	{
+		HWR_SetCurrentTexture(NULL);
+		HWR_ProjectWall(wallVerts, Surf, PF_Invisible|PF_NoTexture|PF_Skydecal, 255, NULL);
+	}
+	// PF_Invisible so it's not drawn into the colour buffer
+	// PF_NoTexture for no texture
+	// PF_Occlude is set in HWR_ProjectWall to draw into the depth buffer
+}
+
+// Returns true if the midtexture is visible, and false if... it isn't...
+static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
+{
+	FUINT blendmode = PF_Masked;
+
+	pSurf->PolyColor.s.alpha = 0xFF;
+
+	if (LIKELY(!gl_curline->polyseg))
+	{
+		// set alpha for transparent walls
+		switch (gl_linedef->special)
+		{
+			// Translucent linedef types
+			case 102:
+			case 121 ... 125:
+			case 141 ... 145:
+			case 174:
+			case 175:
+			case 192:
+			case 195:
+			case 221:
+			case 253:
+			case 256:
+				if (gl_linedef->blendmode)
+					blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
+				else
+					blendmode = PF_Translucent;
+				break;
+			default:
+				if (gl_linedef->blendmode)
+				{
+					if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
+						blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
+					else
+						blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode);
+				}
+				else if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
+					blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
+				else
+					blendmode = PF_Masked;
+				break;
+		}
+	}
+	else if (gl_curline->polyseg->translucency > 0)
+	{
+		// Polyobject translucency is shared between all of its lines
+		if (gl_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn
+		{
+			pSurf->PolyColor.s.alpha = 0x00; // This shouldn't draw anything regardless of blendmode
+			return false;
+		}
+		else
+			blendmode = HWR_TranstableToAlpha(gl_curline->polyseg->translucency, pSurf);
+	}
+
+	if (blendmode != PF_Masked && pSurf->PolyColor.s.alpha == 0x00)
+		return false;
+
+	pSurf->PolyFlags = blendmode;
+
+	return true;
+}
+
+//
+// HWR_ProcessSeg
+// A portion or all of a wall segment will be drawn, from startfrac to endfrac,
+//  where 0 is the start of the segment, 1 the end of the segment
+// Anything between means the wall segment has been clipped with solidsegs,
+//  reducing wall overdraw to a minimum
+//
+void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
+{
+	FOutVector wallVerts[4];
+	v2d_t vs, ve; // start, end vertices of 2d line (view from above)
+
+	fixed_t worldtop, worldbottom;
+	fixed_t worldhigh = 0, worldlow = 0;
+	fixed_t worldtopslope, worldbottomslope;
+	fixed_t worldhighslope = 0, worldlowslope = 0;
+	fixed_t v1x, v1y, v2x, v2y;
+
+	fixed_t h, l; // 3D sides and 2s middle textures
+	fixed_t hS, lS;
+
+	gl_sidedef = gl_curline->sidedef;
+	gl_linedef = gl_curline->linedef;
+
+	const boolean noencore = (gl_linedef->flags & ML_TFERLINE);
+
+	if (LIKELY(gl_curline->pv1))
+	{
+		vs.x = ((polyvertex_t *)gl_curline->pv1)->x;
+		vs.y = ((polyvertex_t *)gl_curline->pv1)->y;
+		v1x = FloatToFixed(vs.x);
+		v1y = FloatToFixed(vs.y);
+	}
+	else
+	{
+		vs.x = FixedToFloat(gl_curline->v1->x);
+		vs.y = FixedToFloat(gl_curline->v1->y);
+		v1x = gl_curline->v1->x;
+		v1y = gl_curline->v1->y;
+	}
+
+	if (LIKELY(gl_curline->pv2))
+	{
+		ve.x = ((polyvertex_t *)gl_curline->pv2)->x;
+		ve.y = ((polyvertex_t *)gl_curline->pv2)->y;
+		v2x = FloatToFixed(ve.x);
+		v2y = FloatToFixed(ve.y);
+	}
+	else
+	{
+		ve.x = FixedToFloat(gl_curline->v2->x);
+		ve.y = FixedToFloat(gl_curline->v2->y);
+		v2x = gl_curline->v2->x;
+		v2y = gl_curline->v2->y;
+	}
+
+#define SLOPEPARAMS(slope, end1, end2, normalheight) \
+	end1 = P_GetZAt(slope, v1x, v1y, normalheight);  \
+	end2 = P_GetZAt(slope, v2x, v2y, normalheight);
+
+	SLOPEPARAMS(gl_frontsector->c_slope, worldtop,    worldtopslope,    gl_frontsector->ceilingheight)
+	SLOPEPARAMS(gl_frontsector->f_slope, worldbottom, worldbottomslope, gl_frontsector->floorheight)
+
+	// remember vertices ordering
+	//  3--2
+	//  | /|
+	//  |/ |
+	//  0--1
+	// make a wall polygon (with 2 triangles), using the floor/ceiling heights,
+	// and the 2d map coords of start/end vertices
+	wallVerts[0].x = wallVerts[3].x = vs.x;
+	wallVerts[0].z = wallVerts[3].z = vs.y;
+	wallVerts[2].x = wallVerts[1].x = ve.x;
+	wallVerts[2].z = wallVerts[1].z = ve.y;
+
+	// x offset the texture
+	const fixed_t texturehpeg = gl_sidedef->textureoffset + gl_curline->offset;
+	const float cliplow  = (float)texturehpeg;
+	const float cliphigh = (float)(texturehpeg + (gl_curline->flength*FRACUNIT));
+
+	FUINT lightnum = gl_frontsector->lightlevel;
+	extracolormap_t *colormap = gl_frontsector->extra_colormap;
+	lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
+
+	FSurfaceInfo Surf;
+
+	if (gl_frontsector)
+		Surf.PolyColor.s.alpha = 255;
+
+	const INT32 gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture);
+	GLMapTexture_t *glTex = NULL;
+
+	// two sided line
+	if (gl_backsector)
+	{
+		INT32 gl_toptexture = 0, gl_bottomtexture = 0;
+
+		fixed_t texturevpeg;
+
+		SLOPEPARAMS(gl_backsector->c_slope, worldhigh, worldhighslope, gl_backsector->ceilingheight)
+		SLOPEPARAMS(gl_backsector->f_slope, worldlow,  worldlowslope,  gl_backsector->floorheight)
+
+		// Sky culling
+		if (!gl_curline->polyseg) // Don't do it for polyobjects
+		{
+			// Sky Ceilings
+			wallVerts[3].y = wallVerts[2].y = FixedToFloat(INT32_MAX);
+
+			auto draw_sky_walls = [&](int vert1, int vert2, fixed_t world, fixed_t worldslope)
+			{
+				wallVerts[vert1].y = FixedToFloat(world);
+				wallVerts[vert2].y = FixedToFloat(worldslope);
+				HWR_DrawSkyWall(wallVerts, &Surf);
+			};
+
+			if (gl_frontsector->ceilingpic == skyflatnum)
+			{
+				if (gl_backsector->ceilingpic == skyflatnum)
+				{
+					// Both front and back sectors are sky, needs skywall from the frontsector's ceiling, but only if the
+					// backsector is lower
+					if ((worldhigh <= worldtop && worldhighslope <= worldtopslope) // Assuming ESLOPE is always on with my changes
+						&& (worldhigh != worldtop || worldhighslope != worldtopslope))
+					// Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
+					{
+						draw_sky_walls(0, 1, worldhigh, worldhighslope);
+					}
+				}
+				else
+				{
+					// Only the frontsector is sky, just draw a skywall from the front ceiling
+					draw_sky_walls(0, 1, worldtop, worldtopslope);
+				}
+			}
+			else if (gl_backsector->ceilingpic == skyflatnum)
+			{
+				// Only the backsector is sky, just draw a skywall from the front ceiling
+				draw_sky_walls(0, 1, worldtop, worldtopslope);
+			}
+
+			// Sky Floors
+			wallVerts[0].y = wallVerts[1].y = FixedToFloat(INT32_MIN);
+
+			if (gl_frontsector->floorpic == skyflatnum)
+			{
+				if (gl_backsector->floorpic == skyflatnum)
+				{
+					// Both front and back sectors are sky, needs skywall from the backsector's floor, but only if the
+					// it's higher, also needs to check for bottomtexture as the floors don't usually move down
+					// when both sides are sky floors
+					if ((worldlow >= worldbottom && worldlowslope >= worldbottomslope)
+					&& (worldlow != worldbottom || worldlowslope != worldbottomslope)
+					// Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
+					&& !(gl_sidedef->bottomtexture))
+					{
+						draw_sky_walls(3, 2, worldlow, worldlowslope);
+					}
+				}
+				else
+				{
+					// Only the backsector has sky, just draw a skywall from the back floor
+					draw_sky_walls(3, 2, worldbottom, worldbottomslope);
+				}
+			}
+			else if ((gl_backsector->floorpic == skyflatnum) && !(gl_sidedef->bottomtexture))
+			{
+				// Only the backsector has sky, just draw a skywall from the back floor if there's no bottomtexture
+				draw_sky_walls(3, 2, worldlow, worldlowslope);
+			}
+		}
+
+		// hack to allow height changes in outdoor areas
+		// This is what gets rid of the upper textures if there should be sky
+		if (gl_frontsector->ceilingpic == skyflatnum
+			&& gl_backsector->ceilingpic  == skyflatnum)
+		{
+			worldtop = worldhigh;
+			worldtopslope = worldhighslope;
+		}
+
+		gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
+
+		// check TOP TEXTURE
+		if (gl_toptexture && (worldhighslope < worldtopslope || worldhigh < worldtop))
+		{
+			// PEGGING
+			if (gl_linedef->flags & ML_DONTPEGTOP)
+				texturevpeg = 0;
+			else if (gl_linedef->flags & ML_EFFECT1)
+				texturevpeg = worldhigh + textureheight[gl_toptexture] - worldtop;
+			else
+				texturevpeg = gl_backsector->ceilingheight + textureheight[gl_toptexture] - gl_frontsector->ceilingheight;
+
+			texturevpeg += gl_sidedef->rowoffset;
+
+			// This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway
+			texturevpeg %= textureheight[gl_toptexture];
+
+			glTex = HWR_GetTexture(gl_toptexture, noencore);
+
+			wallVerts[3].t = wallVerts[2].t = texturevpeg * glTex->scaleY;
+			wallVerts[0].t = wallVerts[1].t = (texturevpeg + gl_frontsector->ceilingheight - gl_backsector->ceilingheight) * glTex->scaleY;
+			wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX;
+			wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX;
+
+			// Adjust t value for sloped walls
+			if (!(gl_linedef->flags & ML_EFFECT1))
+			{
+				// Unskewed
+				wallVerts[3].t -= (worldtop - gl_frontsector->ceilingheight) * glTex->scaleY;
+				wallVerts[2].t -= (worldtopslope - gl_frontsector->ceilingheight) * glTex->scaleY;
+				wallVerts[0].t -= (worldhigh - gl_backsector->ceilingheight) * glTex->scaleY;
+				wallVerts[1].t -= (worldhighslope - gl_backsector->ceilingheight) * glTex->scaleY;
+			}
+			else if (gl_linedef->flags & ML_DONTPEGTOP)
+			{
+				// Skewed by top
+				wallVerts[0].t = (texturevpeg + worldtop - worldhigh) * glTex->scaleY;
+				wallVerts[1].t = (texturevpeg + worldtopslope - worldhighslope) * glTex->scaleY;
+			}
+			else
+			{
+				// Skewed by bottom
+				wallVerts[0].t = wallVerts[1].t = (texturevpeg + worldtop - worldhigh) * glTex->scaleY;
+				wallVerts[3].t = wallVerts[0].t - (worldtop - worldhigh) * glTex->scaleY;
+				wallVerts[2].t = wallVerts[1].t - (worldtopslope - worldhighslope) * glTex->scaleY;
+			}
+
+			// set top/bottom coords
+			wallVerts[3].y = FixedToFloat(worldtop);
+			wallVerts[0].y = FixedToFloat(worldhigh);
+			wallVerts[2].y = FixedToFloat(worldtopslope);
+			wallVerts[1].y = FixedToFloat(worldhighslope);
+
+			if (!gl_drawing_stencil && gl_frontsector->numlights)
+				HWR_SplitWall(gl_frontsector, wallVerts, gl_toptexture, noencore, &Surf, FF_CUTLEVEL, NULL, 0);
+			else if (!gl_drawing_stencil && glTex->mipmap.flags & TF_TRANSPARENT)
+				HWR_AddTransparentWall(wallVerts, &Surf, gl_toptexture, noencore, PF_Environment, false, lightnum, colormap);
+			else
+				HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
+		}
+
+		gl_bottomtexture = R_GetTextureNum(gl_sidedef->bottomtexture);
+
+		// check BOTTOM TEXTURE
+		if (gl_bottomtexture && (worldlowslope > worldbottomslope || worldlow > worldbottom))
+		{
+			// PEGGING
+			if (!(gl_linedef->flags & ML_DONTPEGBOTTOM))
+				texturevpeg = 0;
+			else if (gl_linedef->flags & ML_EFFECT1)
+				texturevpeg = worldbottom - worldlow;
+			else
+				texturevpeg = gl_frontsector->floorheight - gl_backsector->floorheight;
+
+			texturevpeg += gl_sidedef->rowoffset;
+
+			// This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway
+			texturevpeg %= textureheight[gl_bottomtexture];
+
+			glTex = HWR_GetTexture(gl_bottomtexture, noencore);
+
+			wallVerts[3].t = wallVerts[2].t = texturevpeg * glTex->scaleY;
+			wallVerts[0].t = wallVerts[1].t = (texturevpeg + gl_backsector->floorheight - gl_frontsector->floorheight) * glTex->scaleY;
+			wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX;
+			wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX;
+
+			// Adjust t value for sloped walls
+			if (!(gl_linedef->flags & ML_EFFECT1))
+			{
+				// Unskewed
+				wallVerts[0].t -= (worldbottom - gl_frontsector->floorheight) * glTex->scaleY;
+				wallVerts[1].t -= (worldbottomslope - gl_frontsector->floorheight) * glTex->scaleY;
+				wallVerts[3].t -= (worldlow - gl_backsector->floorheight) * glTex->scaleY;
+				wallVerts[2].t -= (worldlowslope - gl_backsector->floorheight) * glTex->scaleY;
+			}
+			else if (gl_linedef->flags & ML_DONTPEGBOTTOM)
+			{
+				// Skewed by bottom
+				wallVerts[0].t = wallVerts[1].t = (texturevpeg + worldlow - worldbottom) * glTex->scaleY;
+				wallVerts[2].t = wallVerts[1].t - (worldlowslope - worldbottomslope) * glTex->scaleY;
+			}
+			else
+			{
+				// Skewed by top
+				wallVerts[0].t = (texturevpeg + worldlow - worldbottom) * glTex->scaleY;
+				wallVerts[1].t = (texturevpeg + worldlowslope - worldbottomslope) * glTex->scaleY;
+			}
+
+			// set top/bottom coords
+			wallVerts[3].y = FixedToFloat(worldlow);
+			wallVerts[0].y = FixedToFloat(worldbottom);
+			wallVerts[2].y = FixedToFloat(worldlowslope);
+			wallVerts[1].y = FixedToFloat(worldbottomslope);
+
+			if (!gl_drawing_stencil && gl_frontsector->numlights)
+				HWR_SplitWall(gl_frontsector, wallVerts, gl_bottomtexture, noencore, &Surf, FF_CUTLEVEL, NULL, 0);
+			else if (!gl_drawing_stencil && glTex->mipmap.flags & TF_TRANSPARENT)
+				HWR_AddTransparentWall(wallVerts, &Surf, gl_bottomtexture, noencore, PF_Environment, false, lightnum, colormap);
+			else
+				HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
+		}
+
+		if ((gl_midtexture && HWR_BlendMidtextureSurface(&Surf)) || gl_portal_state == GLPORTAL_STENCIL || gl_portal_state == GLPORTAL_DEPTH || gl_drawing_stencil)
+		{
+			sector_t *front, *back;
+			INT32 repeats;
+
+			if (gl_linedef->frontsector->heightsec != -1)
+				front = &sectors[gl_linedef->frontsector->heightsec];
+			else
+				front = gl_linedef->frontsector;
+
+			if (gl_linedef->backsector->heightsec != -1)
+				back = &sectors[gl_linedef->backsector->heightsec];
+			else
+				back = gl_linedef->backsector;
+
+			if (gl_sidedef->repeatcnt)
+				repeats = 1 + gl_sidedef->repeatcnt;
+			else if (gl_linedef->flags & ML_EFFECT5 || gl_portal_state == GLPORTAL_STENCIL || gl_portal_state == GLPORTAL_DEPTH)
+			{
+				fixed_t high, low;
+
+				if (front->ceilingheight > back->ceilingheight)
+					high = back->ceilingheight;
+				else
+					high = front->ceilingheight;
+
+				if (front->floorheight > back->floorheight)
+					low = front->floorheight;
+				else
+					low = back->floorheight;
+
+				repeats = (high - low) / textureheight[gl_midtexture];
+				if ((high - low) % textureheight[gl_midtexture])
+					repeats++; // tile an extra time to fill the gap -- Monster Iestyn
+			}
+			else
+				repeats = 1;
+
+			// SoM: a little note: This code re-arranging will
+			// fix the bug in Nimrod map02. popentop and popenbottom
+			// record the limits the texture can be displayed in.
+			// polytop and polybottom, are the ideal (i.e. unclipped)
+			// heights of the polygon, and h & l, are the final (clipped)
+			// poly coords.
+			fixed_t popentop, popenbottom, polytop, polybottom, lowcut, highcut;
+			fixed_t popentopslope, popenbottomslope, polytopslope, polybottomslope, lowcutslope, highcutslope;
+
+			// NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to,
+			// you must use the linedef's backsector to be correct
+			// From CB
+			if (gl_curline->polyseg)
+			{
+				popentop = popentopslope = back->ceilingheight;
+				popenbottom = popenbottomslope = back->floorheight;
+			}
+			else
+            {
+				popentop         = std::min(worldtop, worldhigh);
+				popenbottom      = std::max(worldbottom, worldlow);
+				popentopslope    = std::min(worldtopslope, worldhighslope);
+				popenbottomslope = std::max(worldbottomslope, worldlowslope);
+			}
+
+			// Find the wall's coordinates
+			const fixed_t midtexheight = textureheight[gl_midtexture] * repeats;
+
+			if (gl_linedef->flags & ML_EFFECT2)
+			{
+				if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3)) // Peg it to the floor
+				{
+					polybottom = std::max(front->floorheight, back->floorheight) + gl_sidedef->rowoffset;
+					polytop    = polybottom + midtexheight;
+				}
+				else // Peg it to the ceiling
+				{
+					polytop    = std::min(front->ceilingheight, back->ceilingheight) + gl_sidedef->rowoffset;
+					polybottom = polytop - midtexheight;
+				}
+
+				// The right side's coordinates are the the same as the left side
+				polytopslope = polytop;
+				polybottomslope = polybottom;
+			}
+			else if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3)) // Skew the texture, but peg it to the floor
+			{
+				polybottom = popenbottom + gl_sidedef->rowoffset;
+				polytop = polybottom + midtexheight;
+				polybottomslope = popenbottomslope + gl_sidedef->rowoffset;
+				polytopslope = polybottomslope + midtexheight;
+			}
+			else // Skew it according to the ceiling's slope
+			{
+				polytop         = popentop + gl_sidedef->rowoffset;
+				polybottom      = polytop - midtexheight;
+				polytopslope    = popentopslope + gl_sidedef->rowoffset;
+				polybottomslope = polytopslope - midtexheight;
+			}
+
+			// CB
+			// NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to,
+			// you must use the linedef's backsector to be correct
+			if (gl_curline->polyseg)
+			{
+				lowcut       = polybottom;
+				highcut      = polytop;
+				lowcutslope  = polybottomslope;
+				highcutslope = polytopslope;
+			}
+			else
+			{
+				// The cut-off values of a linedef can always be constant, since every line has an absoulute front and or back sector
+				lowcut       = popenbottom;
+				highcut      = popentop;
+				lowcutslope  = popenbottomslope;
+				highcutslope = popentopslope;
+			}
+
+			h  = std::min(highcut, polytop);
+			l  = std::max(polybottom, lowcut);
+			hS = std::min(highcutslope, polytopslope);
+			lS = std::max(polybottomslope, lowcutslope);
+
+			// PEGGING
+			fixed_t texturevpegslope;
+
+			if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3))
+			{
+				texturevpeg = midtexheight - h + polybottom;
+				texturevpegslope = midtexheight - hS + polybottomslope;
+			}
+			else
+			{
+				texturevpeg = polytop - h;
+				texturevpegslope = polytopslope - hS;
+			}
+
+			glTex = HWR_GetTexture(gl_midtexture, noencore);
+
+			// Left side
+			wallVerts[3].t = texturevpeg * glTex->scaleY;
+			wallVerts[0].t = (h - l + texturevpeg) * glTex->scaleY;
+			wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX;
+
+			// Right side
+			wallVerts[2].t = texturevpegslope * glTex->scaleY;
+			wallVerts[1].t = (hS - lS + texturevpegslope) * glTex->scaleY;
+			wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX;
+
+			// set top/bottom coords
+			// Take the texture peg into account, rather than changing the offsets past
+			// where the polygon might not be.
+			wallVerts[3].y = FixedToFloat(h);
+			wallVerts[0].y = FixedToFloat(l);
+			wallVerts[2].y = FixedToFloat(hS);
+			wallVerts[1].y = FixedToFloat(lS);
+
+			// TODO: Actually use the surface's flags so that I don't have to do this
+			FUINT blendmode = Surf.PolyFlags;
+
+			// Render midtextures on two-sided lines with a z-buffer offset.
+			// This will cause the midtexture appear on top, if a FOF overlaps with it.
+			blendmode |= PF_Decal;
+
+			if (!gl_drawing_stencil && gl_frontsector->numlights)
+				HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, noencore, &Surf, (!(blendmode & PF_Masked)) ? FF_TRANSLUCENT : FF_CUTLEVEL, NULL, blendmode);
+			else if (!gl_drawing_stencil && !(blendmode & PF_Masked))
+				HWR_AddTransparentWall(wallVerts, &Surf, gl_midtexture, noencore, blendmode, false, lightnum, colormap);
+			else
+				HWR_ProjectWall(wallVerts, &Surf, blendmode, lightnum, colormap);
+		}
+	}
+	else
+	{
+		// Single sided line... Deal only with the middletexture (if one exists)
+		if (gl_midtexture && gl_linedef->special != HORIZONSPECIAL) // Ignore horizon line for OGL
+		{
+			glTex = HWR_GetTexture(gl_midtexture, noencore);
+
+			fixed_t     texturevpeg;
+
+			// PEGGING
+			if ((gl_linedef->flags & (ML_DONTPEGBOTTOM|ML_EFFECT2)) == (ML_DONTPEGBOTTOM|ML_EFFECT2))
+				texturevpeg = gl_frontsector->floorheight + textureheight[gl_sidedef->midtexture] - gl_frontsector->ceilingheight + gl_sidedef->rowoffset;
+			else if (gl_linedef->flags & ML_DONTPEGBOTTOM)
+				texturevpeg = worldbottom + textureheight[gl_sidedef->midtexture] - worldtop + gl_sidedef->rowoffset;
+			else
+				texturevpeg = gl_sidedef->rowoffset; // top of texture at top
+
+			wallVerts[3].t = wallVerts[2].t = texturevpeg * glTex->scaleY;
+			wallVerts[0].t = wallVerts[1].t = (texturevpeg + gl_frontsector->ceilingheight - gl_frontsector->floorheight) * glTex->scaleY;
+			wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX;
+			wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX;
+
+			// Texture correction for slopes
+			if (gl_linedef->flags & ML_EFFECT2)
+			{
+				wallVerts[3].t += (gl_frontsector->ceilingheight - worldtop) * glTex->scaleY;
+				wallVerts[2].t += (gl_frontsector->ceilingheight - worldtopslope) * glTex->scaleY;
+				wallVerts[0].t += (gl_frontsector->floorheight - worldbottom) * glTex->scaleY;
+				wallVerts[1].t += (gl_frontsector->floorheight - worldbottomslope) * glTex->scaleY;
+			}
+			else if (gl_linedef->flags & ML_DONTPEGBOTTOM)
+			{
+				wallVerts[3].t = wallVerts[0].t + (worldbottom-worldtop) * glTex->scaleY;
+				wallVerts[2].t = wallVerts[1].t + (worldbottomslope-worldtopslope) * glTex->scaleY;
+			}
+			else
+			{
+				wallVerts[0].t = wallVerts[3].t - (worldbottom-worldtop) * glTex->scaleY;
+				wallVerts[1].t = wallVerts[2].t - (worldbottomslope-worldtopslope) * glTex->scaleY;
+			}
+
+			//Set textures properly on single sided walls that are sloped
+			wallVerts[3].y = FixedToFloat(worldtop);
+			wallVerts[0].y = FixedToFloat(worldbottom);
+			wallVerts[2].y = FixedToFloat(worldtopslope);
+			wallVerts[1].y = FixedToFloat(worldbottomslope);
+
+			if (gl_frontsector->numlights)
+			{
+				HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, noencore, &Surf, FF_CUTLEVEL, NULL, 0);
+			}
+			else  // I don't think that solid walls can use translucent linedef types...
+			{
+				if (glTex->mipmap.flags & TF_TRANSPARENT)
+					HWR_AddTransparentWall(wallVerts, &Surf, gl_midtexture, noencore, PF_Environment, false, lightnum, colormap);
+				else
+					HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
+			}
+		}
+		else
+		{
+			//Set textures properly on single sided walls that are sloped
+			wallVerts[3].y = FixedToFloat(worldtop);
+			wallVerts[0].y = FixedToFloat(worldbottom);
+			wallVerts[2].y = FixedToFloat(worldtopslope);
+			wallVerts[1].y = FixedToFloat(worldbottomslope);
+
+			// When there's no midtexture, draw a skywall to prevent rendering behind it
+			HWR_DrawSkyWall(wallVerts, &Surf);
+		}
+
+		if (!gl_curline->polyseg)
+		{
+			if (gl_frontsector->ceilingpic == skyflatnum) // It's a single-sided line with sky for its sector
+			{
+				wallVerts[2].y = wallVerts[3].y = FixedToFloat(INT32_MAX); // draw to top of map space
+				wallVerts[0].y = FixedToFloat(worldtop);
+				wallVerts[1].y = FixedToFloat(worldtopslope);
+
+				HWR_DrawSkyWall(wallVerts, &Surf);
+			}
+			if (gl_frontsector->floorpic == skyflatnum)
+			{
+				wallVerts[3].y = FixedToFloat(worldbottom);
+				wallVerts[2].y = FixedToFloat(worldbottomslope);
+				wallVerts[0].y = wallVerts[1].y = FixedToFloat(INT32_MIN); // draw to bottom of map space
+
+				HWR_DrawSkyWall(wallVerts, &Surf);
+			}
+		}
+	}
+
+	//Hurdler: 3d-floors test
+	if (!gl_drawing_stencil && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors))
+	{
+		ffloor_t * rover;
+		fixed_t    highcut = 0, lowcut = 0;
+		fixed_t lowcutslope = 0, highcutslope = 0;
+
+		// Used for height comparisons and etc across FOFs and slopes
+		fixed_t high1, highslope1, low1, lowslope1;
+
+		INT32 texnum;
+		line_t * newline = NULL; // Multi-Property FOF
+
+		lowcut       = std::max(worldbottom, worldlow);
+		highcut      = std::min(worldtop, worldhigh);
+		lowcutslope  = std::max(worldbottomslope, worldlowslope);
+		highcutslope = std::min(worldtopslope, worldhighslope);
+
+		if (gl_backsector->ffloors)
+		{
+			for (rover = gl_backsector->ffloors; rover; rover = rover->next)
+			{
+				const ffloortype_e roverflags = rover->flags;
+
+				if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || (roverflags & FF_INVERTSIDES))
+					continue;
+
+				SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
+				SLOPEPARAMS(*rover->b_slope, low1,  lowslope1,  *rover->bottomheight)
+
+				if ((high1 < lowcut || highslope1 < lowcutslope) || (low1 > highcut || lowslope1 > highcutslope))
+					continue;
+
+				texnum = R_GetTextureNum(sides[rover->master->sidenum[0]].midtexture);
+
+				if (rover->master->flags & ML_TFERLINE)
+				{
+					size_t linenum = std::min((size_t)(gl_curline->linedef-gl_backsector->lines[0]), rover->master->frontsector->linecount);
+					newline = rover->master->frontsector->lines[0] + linenum;
+					texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
+				}
+
+				h  = P_GetFFloorTopZAt   (rover, v1x, v1y);
+				hS = P_GetFFloorTopZAt   (rover, v2x, v2y);
+				l  = P_GetFFloorBottomZAt(rover, v1x, v1y);
+				lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
+
+				// Adjust the heights so the FOF does not overlap with top and bottom textures.
+				if (h >= highcut && hS >= highcutslope)
+				{
+					h = highcut;
+					hS = highcutslope;
+				}
+				if (l <= lowcut && lS <= lowcutslope)
+				{
+					l = lowcut;
+					lS = lowcutslope;
+				}
+
+				//Hurdler: HW code starts here
+				//FIXME: check if peging is correct
+				// set top/bottom coords
+
+				wallVerts[3].y = FixedToFloat(h);
+				wallVerts[2].y = FixedToFloat(hS);
+				wallVerts[0].y = FixedToFloat(l);
+				wallVerts[1].y = FixedToFloat(lS);
+
+				if (roverflags & FF_FOG)
+				{
+					wallVerts[3].t = wallVerts[2].t = 0;
+					wallVerts[0].t = wallVerts[1].t = 0;
+					wallVerts[0].s = wallVerts[3].s = 0;
+					wallVerts[2].s = wallVerts[1].s = 0;
+				}
+				else
+				{
+					fixed_t texturevpeg;
+					boolean attachtobottom = false;
+					boolean slopeskew = false; // skew FOF walls with slopes?
+
+					// Wow, how was this missing from OpenGL for so long?
+					// ...Oh well, anyway, Lower Unpegged now changes pegging of FOFs like in software
+					// -- Monster Iestyn 26/06/18
+					if (newline)
+					{
+						texturevpeg = sides[newline->sidenum[0]].rowoffset;
+						attachtobottom = !!(newline->flags & ML_DONTPEGBOTTOM);
+						slopeskew = !!(newline->flags & ML_DONTPEGTOP);
+					}
+					else
+					{
+						texturevpeg = sides[rover->master->sidenum[0]].rowoffset;
+						attachtobottom = !!(gl_linedef->flags & ML_DONTPEGBOTTOM);
+						slopeskew = !!(rover->master->flags & ML_DONTPEGTOP);
+					}
+
+					glTex = HWR_GetTexture(texnum, noencore);
+
+					if (!slopeskew) // no skewing
+					{
+						if (attachtobottom)
+							texturevpeg -= *rover->topheight - *rover->bottomheight;
+						wallVerts[3].t = (*rover->topheight - h + texturevpeg) * glTex->scaleY;
+						wallVerts[2].t = (*rover->topheight - hS + texturevpeg) * glTex->scaleY;
+						wallVerts[0].t = (*rover->topheight - l + texturevpeg) * glTex->scaleY;
+						wallVerts[1].t = (*rover->topheight - lS + texturevpeg) * glTex->scaleY;
+					}
+					else
+					{
+						if (!attachtobottom) // skew by top
+						{
+							wallVerts[3].t = wallVerts[2].t = texturevpeg * glTex->scaleY;
+							wallVerts[0].t = (h - l + texturevpeg) * glTex->scaleY;
+							wallVerts[1].t = (hS - lS + texturevpeg) * glTex->scaleY;
+						}
+						else // skew by bottom
+						{
+							wallVerts[0].t = wallVerts[1].t = texturevpeg * glTex->scaleY;
+							wallVerts[3].t = wallVerts[0].t - (h - l) * glTex->scaleY;
+							wallVerts[2].t = wallVerts[1].t - (hS - lS) * glTex->scaleY;
+						}
+					}
+
+					wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX;
+					wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX;
+				}
+
+				FBITFIELD blendmode;
+
+				if (roverflags & FF_FOG)
+				{
+					blendmode = PF_Fog|PF_NoTexture;
+
+					lightnum = rover->master->frontsector->lightlevel;
+					colormap = rover->master->frontsector->extra_colormap;
+
+					Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(lightnum, colormap);
+
+					lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
+
+					if (gl_frontsector->numlights)
+						HWR_SplitWall(gl_frontsector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode);
+					else
+						HWR_AddTransparentWall(wallVerts, &Surf, 0, false, blendmode, true, lightnum, colormap);
+				}
+				else
+				{
+					blendmode = PF_Masked;
+
+					if ((roverflags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
+					{
+						blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent);
+						Surf.PolyColor.s.alpha = CLAMP(rover->alpha, 0, 255);
+					}
+
+					if (gl_frontsector->numlights)
+						HWR_SplitWall(gl_frontsector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode);
+					else
+					{
+						if (blendmode != PF_Masked)
+							HWR_AddTransparentWall(wallVerts, &Surf, texnum, noencore, blendmode, false, lightnum, colormap);
+						else
+							HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
+					}
+				}
+			}
+		}
+
+		if (gl_frontsector->ffloors) // Putting this seperate should allow 2 FOF sectors to be connected without too many errors? I think?
+		{
+			for (rover = gl_frontsector->ffloors; rover; rover = rover->next)
+			{
+				const ffloortype_e roverflags = rover->flags;
+
+				if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || !(roverflags & FF_ALLSIDES))
+					continue;
+
+				SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
+				SLOPEPARAMS(*rover->b_slope, low1,  lowslope1,  *rover->bottomheight)
+
+				if ((high1 < lowcut || highslope1 < lowcutslope) || (low1 > highcut || lowslope1 > highcutslope))
+					continue;
+
+				texnum = R_GetTextureNum(sides[rover->master->sidenum[0]].midtexture);
+
+				if (rover->master->flags & ML_TFERLINE)
+				{
+					size_t linenum = std::min((size_t)(gl_curline->linedef-gl_backsector->lines[0]), rover->master->frontsector->linecount);
+					newline = rover->master->frontsector->lines[0] + linenum;
+					texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
+				}
+
+				h  = P_GetFFloorTopZAt   (rover, v1x, v1y);
+				hS = P_GetFFloorTopZAt   (rover, v2x, v2y);
+				l  = P_GetFFloorBottomZAt(rover, v1x, v1y);
+				lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
+
+				// Adjust the heights so the FOF does not overlap with top and bottom textures.
+				if (h >= highcut && hS >= highcutslope)
+				{
+					h = highcut;
+					hS = highcutslope;
+				}
+				if (l <= lowcut && lS <= lowcutslope)
+				{
+					l = lowcut;
+					lS = lowcutslope;
+				}
+
+				//Hurdler: HW code starts here
+				//FIXME: check if peging is correct
+				// set top/bottom coords
+
+				wallVerts[3].y = FixedToFloat(h);
+				wallVerts[2].y = FixedToFloat(hS);
+				wallVerts[0].y = FixedToFloat(l);
+				wallVerts[1].y = FixedToFloat(lS);
+
+				if (roverflags & FF_FOG)
+				{
+					wallVerts[3].t = wallVerts[2].t = 0;
+					wallVerts[0].t = wallVerts[1].t = 0;
+					wallVerts[0].s = wallVerts[3].s = 0;
+					wallVerts[2].s = wallVerts[1].s = 0;
+				}
+				else
+				{
+					glTex = HWR_GetTexture(texnum, noencore);
+
+					if (newline)
+					{
+						wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset) * glTex->scaleY;
+						wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[newline->sidenum[0]].rowoffset)) * glTex->scaleY;
+					}
+					else
+					{
+						wallVerts[3].t = wallVerts[2].t = (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset) * glTex->scaleY;
+						wallVerts[0].t = wallVerts[1].t = (h - l + (*rover->topheight - h + sides[rover->master->sidenum[0]].rowoffset)) * glTex->scaleY;
+					}
+
+					wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX;
+					wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX;
+				}
+
+				FBITFIELD blendmode;
+
+				if (roverflags & FF_FOG)
+				{
+					blendmode = PF_Fog|PF_NoTexture;
+
+					lightnum = rover->master->frontsector->lightlevel;
+					colormap = rover->master->frontsector->extra_colormap;
+
+					Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(lightnum, colormap);
+
+					lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
+
+					if (gl_backsector->numlights)
+						HWR_SplitWall(gl_backsector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode);
+					else
+						HWR_AddTransparentWall(wallVerts, &Surf, 0, false, blendmode, true, lightnum, colormap);
+				}
+				else
+				{
+					blendmode = PF_Masked;
+
+					if ((roverflags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
+					{
+						blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent);
+						Surf.PolyColor.s.alpha = CLAMP(rover->alpha, 0, 255);
+					}
+
+					if (gl_backsector->numlights)
+						HWR_SplitWall(gl_backsector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode);
+					else
+					{
+						if (blendmode != PF_Masked)
+							HWR_AddTransparentWall(wallVerts, &Surf, texnum, noencore, blendmode, false, lightnum, colormap);
+						else
+							HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
+					}
+				}
+			}
+		}
+	}
+#undef SLOPEPARAMS
+//Hurdler: end of 3d-floors test
+}
+
+static inline boolean HWR_UsePortals(void)
+{
+	return cv_glportals.value && gl_maphasportals;
+}
+
+// From PrBoom:
+//
+// e6y: Check whether the player can look beyond this line, returns true if we can't
+//
+
+boolean checkforemptylines = true;
+// Don't modify anything here, just check
+// Kalaron: Modified for sloped linedefs
+
+static boolean CheckClip(sector_t * afrontsector, sector_t * abacksector)
+{
+	fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
+	fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
+
+	// GZDoom method of sloped line clipping
+
+	if (afrontsector->f_slope || afrontsector->c_slope || abacksector->f_slope || abacksector->c_slope)
+	{
+		fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
+
+		if (LIKELY(gl_curline->pv1))
+		{
+			v1x = FloatToFixed(((polyvertex_t *)gl_curline->pv1)->x);
+			v1y = FloatToFixed(((polyvertex_t *)gl_curline->pv1)->y);
+		}
+		else
+		{
+			v1x = gl_curline->v1->x;
+			v1y = gl_curline->v1->y;
+		}
+
+		if (LIKELY(gl_curline->pv2))
+		{
+			v2x = FloatToFixed(((polyvertex_t *)gl_curline->pv2)->x);
+			v2y = FloatToFixed(((polyvertex_t *)gl_curline->pv2)->y);
+		}
+		else
+		{
+			v2x = gl_curline->v2->x;
+			v2y = gl_curline->v2->y;
+		}
+
+#define SLOPEPARAMS(slope, end1, end2, normalheight) \
+		end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
+		end2 = P_GetZAt(slope, v2x, v2y, normalheight);
+
+		SLOPEPARAMS(afrontsector->f_slope, frontf1, frontf2, afrontsector->floorheight)
+		SLOPEPARAMS(afrontsector->c_slope, frontc1, frontc2, afrontsector->ceilingheight)
+		SLOPEPARAMS( abacksector->f_slope, backf1,  backf2,  abacksector->floorheight)
+		SLOPEPARAMS( abacksector->c_slope, backc1,  backc2,  abacksector->ceilingheight)
+#undef SLOPEPARAMS
+	}
+	else
+	{
+		frontf1 = frontf2 = afrontsector->floorheight;
+		frontc1 = frontc2 = afrontsector->ceilingheight;
+		backf1 = backf2 = abacksector->floorheight;
+		backc1 = backc2 = abacksector->ceilingheight;
+	}
+
+	// using this check with portals causes weird culling issues on ante-station
+	if (LIKELY(!portalclipline) &&
+	(afrontsector == viewsector || abacksector == viewsector))
+	{
+		fixed_t viewf1, viewf2, viewc1, viewc2;
+		if (afrontsector == viewsector)
+		{
+			viewf1 = frontf1;
+			viewf2 = frontf2;
+			viewc1 = frontc1;
+			viewc2 = frontc2;
+		}
+		else
+		{
+			viewf1 = backf1;
+			viewf2 = backf2;
+			viewc1 = backc1;
+			viewc2 = backc2;
+		}
+
+		// check if camera is outside the bounds of the floor and the ceiling (noclipping)
+		// either above the ceiling or below the floor
+		if ((viewz > viewc1 && viewz > viewc2) || (viewz < viewf1 && viewz < viewf2))
+			return false;
+	}
+
+	// now check for closed sectors!
+
+	// here we're talking about a CEILING lower than a floor. ...yeah we don't even need to bother.
+	if (backc1 <= frontf1 && backc2 <= frontf2)
+	{
+		checkforemptylines = false;
+		return (!portalclipline); // during portal rendering view position may cause undesired culling and the above code has some wrong side effects
+	}
+
+	// here we're talking about floors higher than ceilings, don't even bother either.
+	if (backf1 >= frontc1 && backf2 >= frontc2)
+	{
+		checkforemptylines = false;
+		return true;
+	}
+
+	// Lat: Ok, here's what we need to do, we want to draw thok barriers. Let's define what a thok barrier is;
+	// -Must have ceilheight <= floorheight
+	// -ceilpic must be skyflatnum
+	// -an adjacant sector needs to have a ceilingheight or a floor height different than the one we have, otherwise, it's just a huge ass wall, we shouldn't render past it.
+	// -said adjacant sector cannot also be a thok barrier, because that's also dumb and we could render far more than we need to as a result :V
+
+	if (backc1 <= backf1 && backc2 <= backf2)
+	{
+		checkforemptylines = false;
+
+		// before we do anything, if both sectors are thok barriers, GET ME OUT OF HERE!
+		if (frontc1 <= backc1 && frontc2 <= backc2)
+			return true;	// STOP RENDERING.
+
+		// draw floors at the top of thok barriers:
+		if (backc1 < frontc1 || backc2 < frontc2)
+			return false;
+
+		if (backf1 > frontf1 || backf2 > frontf2)
+			return false;
+
+		return true;
+	}
+
+	// Window.
+	// We know it's a window when the above isn't true and the back and front sectors don't match
+	if (backc1 != frontc1 || backc2 != frontc2
+	 || backf1 != frontf1 || backf2 != frontf2)
+	{
+		checkforemptylines = false;
+		return false;
+	}
+
+	// In this case we just need to check whether there is actually a need to render any lines, so checkforempty lines
+	// stays true
+	return false;
+}
+
+// HWR_AddLine
+// Clips the given segment and adds any visible pieces to the line list.
+namespace
+{
+	enum class AddLineType
+	{
+		kPortal,
+		kNormal,
+	};
+
+template <AddLineType Type>
+static inline void DoAddLine(seg_t* line, angle_t angle1, angle_t angle2)
+{
+	// SoM: Backsector needs to be run through R_FakeFlat
+	static sector_t tempsec;
+
+	auto do_addline = [&](bool dontdraw) {
+		if (!line->backsector)
+		{
+			gld_clipper_SafeAddClipRange(angle2, angle1);
+		}
+		else
+		{
+			gl_backsector = R_FakeFlat(gl_backsector, &tempsec, NULL, NULL, true);
+
+			if (CheckClip(gl_frontsector, gl_backsector))
+			{
+				gld_clipper_SafeAddClipRange(angle2, angle1);
+				checkforemptylines = false;
+			}
+
+			// Reject empty lines used for triggers and special events.
+			// Identical floor and ceiling on both sides,
+			//  identical light levels on both sides,
+			//  and no middle texture.
+			if (checkforemptylines && R_IsEmptyLine(line, gl_frontsector, gl_backsector))
+				return;
+		}
+
+		if constexpr (Type == AddLineType::kPortal)
+		{
+			if (gl_portal_state != GLPORTAL_SEARCH && !dontdraw)// no need to do this during the portal check
+				HWR_ProcessSeg(); // Doesn't need arguments because they're defined globally :D
+		}
+		else if constexpr (Type == AddLineType::kNormal)
+		{
+			HWR_ProcessSeg(); // Doesn't need arguments because they're defined globally :D
+		}
+	};
+
+	if constexpr (Type == AddLineType::kPortal)
+	{
+		boolean dont_draw = false;
+
+		// do extra checks on the seg when rendering portals:
+		// don't render segs that are behind the portal destination line
+		if (portalclipline &&
+			!HWR_PortalCheckPointSide(line->v1->x, line->v1->y) &&
+			!HWR_PortalCheckPointSide(line->v2->x, line->v2->y))
+		{
+			return;
+		}
+
+		if (gl_portal_state == GLPORTAL_STENCIL || gl_portal_state == GLPORTAL_DEPTH)
+			goto doaddline;
+
+		if (line->linedef->special == PORTALSPECIAL)
+		{
+			if (line->side == 0)
+			{
+				// Find the other side!
+				INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, -1);
+
+				if (line->linedef == &lines[line2])
+					line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, line2);
+
+				if (line2 >= 0) // found it!
+				{
+					if (gl_portal_state == GLPORTAL_SEARCH)
+						HWR_Portal_Add2Lines(line->linedef-lines, line2, line);
+					else if (gl_portal_state == GLPORTAL_INSIDE)
+						dont_draw = true;
+				}
+			}
+			else
+				return;// dont do anything with the other side i guess?
+		}
+
+	doaddline:
+		do_addline(dont_draw); // no need to do this during the portal check
+	}
+	else if constexpr (Type == AddLineType::kNormal)
+	{
+		do_addline(false);
+	}
+}
+
+static void HWR_AddLine(seg_t *line)
+{
+	angle_t angle1, angle2;
+
+	fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
+
+	if (line->polyseg && !(line->polyseg->flags & POF_RENDERSIDES))
+		return;
+
+	gl_curline = line;
+
+	if (LIKELY(gl_curline->pv1))
+	{
+		v1x = FloatToFixed(((polyvertex_t *)gl_curline->pv1)->x);
+		v1y = FloatToFixed(((polyvertex_t *)gl_curline->pv1)->y);
+	}
+	else
+	{
+		v1x = gl_curline->v1->x;
+		v1y = gl_curline->v1->y;
+	}
+
+	if (LIKELY(gl_curline->pv2))
+	{
+		v2x = FloatToFixed(((polyvertex_t *)gl_curline->pv2)->x);
+		v2y = FloatToFixed(((polyvertex_t *)gl_curline->pv2)->y);
+	}
+	else
+	{
+		v2x = gl_curline->v2->x;
+		v2y = gl_curline->v2->y;
+	}
+
+	// OPTIMIZE: quickly reject orthogonal back sides.
+	angle1 = R_PointToAngle64(v1x, v1y);
+	angle2 = R_PointToAngle64(v2x, v2y);
+
+	 // PrBoom: Back side, i.e. backface culling - read: endAngle >= startAngle!
+	if (angle2 - angle1 < ANGLE_180)
+		return;
+
+	// PrBoom: use REAL clipping math YAYYYYYYY!!!
+	if (!gld_clipper_SafeCheckRange(angle2, angle1))
+		return;
+
+	checkforemptylines = true;
+
+	gl_backsector = line->backsector;
+
+	if (UNLIKELY(HWR_UsePortals()))
+		DoAddLine<AddLineType::kPortal>(line, angle1, angle2);
+	else
+		DoAddLine<AddLineType::kNormal>(line, angle1, angle2);
+}
+};
+
+// HWR_CheckBBox
+// Checks BSP node/subtree bounding box.
+// Returns true
+// if some part of the bbox might be visible.
+//
+// modified to use local variables
+
+static boolean HWR_CheckBBox(const fixed_t *bspcoord)
+{
+	fixed_t px1, py1, px2, py2;
+	angle_t angle1, angle2;
+
+	// Find the corners of the box
+	// that define the edges from current viewpoint.
+	const INT32 boxpos = (viewx <= bspcoord[BOXLEFT] ? 0 : viewx < bspcoord[BOXRIGHT] ? 1 : 2) +
+	(viewy >= bspcoord[BOXTOP] ? 0 : viewy > bspcoord[BOXBOTTOM] ? 4 : 8);
+
+	if (boxpos == 5)
+		return true;
+
+	px1 = bspcoord[checkcoord[boxpos][0]];
+	py1 = bspcoord[checkcoord[boxpos][1]];
+	px2 = bspcoord[checkcoord[boxpos][2]];
+	py2 = bspcoord[checkcoord[boxpos][3]];
+
+	if (current_bsp_culling_distance)
+	{
+		//fixed_t midx = (px1 >> 1) + (px2 >> 1);
+		//fixed_t midy = (py1 >> 1) + (py2 >> 1);
+		//fixed_t mindist = min(min(R_PointToDist(px1, py1), R_PointToDist(px2, py2)), R_PointToDist(midx, midy));
+
+		//fixed_t mindist = ClosestPointOnLineDistance(px1, py1, px2, py2);
+
+		//fixed_t mindist1 = ClosestPointOnLineDistance(bspcoord[BOXLEFT], bspcoord[BOXTOP], bspcoord[BOXRIGHT], bspcoord[BOXTOP]); // top line
+		//fixed_t mindist2 = ClosestPointOnLineDistance(bspcoord[BOXLEFT], bspcoord[BOXTOP], bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]); // left line
+		//fixed_t mindist3 = ClosestPointOnLineDistance(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM], bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]); // bottom line
+		//fixed_t mindist4 = ClosestPointOnLineDistance(bspcoord[BOXRIGHT], bspcoord[BOXTOP], bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]); // right line
+		// this one seems too lax.. maybe closestpointonlinedistance is glitchy and returns points that are not on the line segment?
+		// could try building an if-else structure that determines what point or line is closest
+		// 1  | 2  | 3
+		//--------------
+		// 4  |node| 5
+		//--------------
+		// 6  | 7  | 8
+		// y
+		// ^
+		// |
+		// -----> x
+		// inside node: always inside draw distance. the above boxpos thing might have returned true already?
+		// 1. check top left corner     2. check top line     3. check top right corner
+		// 4. check left line                                 5. check right line
+		// 6. check bottom left corner  7. check bottom line  8. check bottom right corner
+		// one if statement will split the space in two for one coordinate
+		// for example:
+		// x < BOXLEFT   || BOXLEFT ||   !(x < BOXLEFT)   <-- (same as x >= BOXLEFT)
+		fixed_t mindist;// = min(min(mindist1, mindist2), min(mindist3, mindist4));
+
+		// new thing
+		// calculate distance to axis aligned bounding box.
+		if (viewx < bspcoord[BOXLEFT]) // 1,4,6
+		{
+			if (viewy > bspcoord[BOXTOP]) // 1
+				mindist = R_QuickCamDist(bspcoord[BOXLEFT], bspcoord[BOXTOP]) << FRACBITS;
+			else if (viewy < bspcoord[BOXBOTTOM]) // 6
+				mindist = R_QuickCamDist(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]) << FRACBITS;
+			else // 4
+				mindist = bspcoord[BOXLEFT] - viewx;
+		}
+		else if (viewx > bspcoord[BOXRIGHT]) // 3,5,8
+		{
+			if (viewy > bspcoord[BOXTOP]) // 3
+				mindist = R_QuickCamDist(bspcoord[BOXRIGHT], bspcoord[BOXTOP]) << FRACBITS;
+			else if (viewy < bspcoord[BOXBOTTOM]) // 8
+				mindist = R_QuickCamDist(bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]) << FRACBITS;
+			else // 5
+				mindist = viewx - bspcoord[BOXRIGHT];
+		}
+		else // 2,node,7
+		{
+			if (viewy > bspcoord[BOXTOP]) // 2
+				mindist = viewy - bspcoord[BOXTOP];
+			else if (viewy < bspcoord[BOXBOTTOM]) // 7
+				mindist = bspcoord[BOXBOTTOM] - viewy;
+			else // node
+				mindist = 0;
+		}
+		if (mindist > current_bsp_culling_distance) return false;
+	}
+
+	angle1 = R_PointToAngle64(px1, py1);
+	angle2 = R_PointToAngle64(px2, py2);
+
+	return gld_clipper_SafeCheckRange(angle2, angle1);
+}
+
+
+//
+// HWR_AddPolyObjectSegs
+//
+// haleyjd 02/19/06
+// Adds all segs in all polyobjects in the given subsector.
+// Modified for hardware rendering.
+//
+static inline void HWR_AddPolyObjectSegs(void)
+{
+	size_t i, j;
+
+	// Sort through all the polyobjects
+	for (i = 0; i < numpolys; ++i)
+	{
+		// Render the polyobject's lines
+		for (j = 0; j < po_ptrs[i]->segCount; ++j)
+		{
+			HWR_AddLine(po_ptrs[i]->segs[j]);
+		}
+	}
+}
+
+static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, FBITFIELD blendmode, UINT8 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
+{
+	float           height; //constant y for all points on the convex flat polygon
+	FOutVector      *v3d;
+	INT32           i;
+	float           flatxref,flatyref;
+	float           fflatsize;
+	INT32           flatflag;
+	size_t          len;
+	float           scrollx = 0.0f, scrolly = 0.0f;
+	angle_t         angle = 0;
+	FSurfaceInfo    Surf;
+	fixed_t         tempxsow, tempytow;
+	size_t          nrPlaneVerts;
+
+	static FOutVector *planeVerts = NULL;
+	static UINT16 numAllocedPlaneVerts = 0;
+
+	INT32 shader = SHADER_NONE;
+
+	nrPlaneVerts = polysector->numVertices;
+
+	if (nrPlaneVerts < 3)   //not even a triangle ?
+		return;
+
+	if (nrPlaneVerts > INT16_MAX) // FIXME: exceeds plVerts size
+	{
+		CONS_Debug(DBG_RENDER, "polygon size of %s exceeds max value of %d vertices\n", sizeu1(nrPlaneVerts), UINT16_MAX);
+		return;
+	}
+
+	// Allocate plane-vertex buffer if we need to
+	if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts)
+	{
+		numAllocedPlaneVerts = (UINT16)nrPlaneVerts;
+		Z_Free(planeVerts);
+		Z_Malloc(numAllocedPlaneVerts * sizeof (FOutVector), PU_LEVEL, &planeVerts);
+	}
+
+	height = FixedToFloat(fixedheight);
+
+	len = W_LumpLength(lumpnum);
+
+	switch (len)
+	{
+		case 4194304: // 2048x2048 lump
+			fflatsize = 2048.0f;
+			flatflag = 2047;
+			break;
+		case 1048576: // 1024x1024 lump
+			fflatsize = 1024.0f;
+			flatflag = 1023;
+			break;
+		case 262144:// 512x512 lump
+			fflatsize = 512.0f;
+			flatflag = 511;
+			break;
+		case 65536: // 256x256 lump
+			fflatsize = 256.0f;
+			flatflag = 255;
+			break;
+		case 16384: // 128x128 lump
+			fflatsize = 128.0f;
+			flatflag = 127;
+			break;
+		case 1024: // 32x32 lump
+			fflatsize = 32.0f;
+			flatflag = 31;
+			break;
+		default: // 64x64 lump
+			fflatsize = 64.0f;
+			flatflag = 63;
+			break;
+	}
+
+	// reference point for flat texture coord for each vertex around the polygon
+	flatxref = FixedToFloat(polysector->origVerts[0].x);
+	flatyref = FixedToFloat(polysector->origVerts[0].y);
+
+	flatxref = (float)(((fixed_t)flatxref & (~flatflag)) / fflatsize);
+	flatyref = (float)(((fixed_t)flatyref & (~flatflag)) / fflatsize);
+
+	// transform
+	v3d = planeVerts;
+
+	if (FOFsector != NULL)
+	{
+		if (!isceiling) // it's a floor
+		{
+			scrollx = FixedToFloat(FOFsector->floor_xoffs)/fflatsize;
+			scrolly = FixedToFloat(FOFsector->floor_yoffs)/fflatsize;
+			angle = FOFsector->floorpic_angle>>ANGLETOFINESHIFT;
+		}
+		else // it's a ceiling
+		{
+			scrollx = FixedToFloat(FOFsector->ceiling_xoffs)/fflatsize;
+			scrolly = FixedToFloat(FOFsector->ceiling_yoffs)/fflatsize;
+			angle = FOFsector->ceilingpic_angle>>ANGLETOFINESHIFT;
+		}
+	}
+	else if (gl_frontsector)
+	{
+		if (!isceiling) // it's a floor
+		{
+			scrollx = FixedToFloat(gl_frontsector->floor_xoffs)/fflatsize;
+			scrolly = FixedToFloat(gl_frontsector->floor_yoffs)/fflatsize;
+			angle = gl_frontsector->floorpic_angle>>ANGLETOFINESHIFT;
+		}
+		else // it's a ceiling
+		{
+			scrollx = FixedToFloat(gl_frontsector->ceiling_xoffs)/fflatsize;
+			scrolly = FixedToFloat(gl_frontsector->ceiling_yoffs)/fflatsize;
+			angle = gl_frontsector->ceilingpic_angle>>ANGLETOFINESHIFT;
+		}
+	}
+
+	if (angle) // Only needs to be done if there's an altered angle
+	{
+		// This needs to be done so that it scrolls in a different direction after rotation like software
+		tempxsow = FloatToFixed(scrollx);
+		tempytow = FloatToFixed(scrolly);
+		scrollx = (FixedToFloat(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));
+		scrolly = (FixedToFloat(FixedMul(tempxsow, FINESINE(angle)) + FixedMul(tempytow, FINECOSINE(angle))));
+
+		// This needs to be done so everything aligns after rotation
+		// It would be done so that rotation is done, THEN the translation, but I couldn't get it to rotate AND scroll like software does
+		tempxsow = FloatToFixed(flatxref);
+		tempytow = FloatToFixed(flatyref);
+		flatxref = (FixedToFloat(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));
+		flatyref = (FixedToFloat(FixedMul(tempxsow, FINESINE(angle)) + FixedMul(tempytow, FINECOSINE(angle))));
+	}
+
+	for (i = 0; i < (INT32)nrPlaneVerts; i++,v3d++)
+	{
+		// Hurdler: add scrolling texture on floor/ceiling
+		v3d->s = (float)((FixedToFloat(polysector->origVerts[i].x) / fflatsize) - flatxref + scrollx); // Go from the polysector's original vertex locations
+		v3d->t = (float)(flatyref - (FixedToFloat(polysector->origVerts[i].y) / fflatsize) + scrolly); // Means the flat is offset based on the original vertex locations
+
+		// Need to rotate before translate
+		if (angle) // Only needs to be done if there's an altered angle
+		{
+			tempxsow = FloatToFixed(v3d->s);
+			tempytow = FloatToFixed(v3d->t);
+			v3d->s = (FixedToFloat(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));
+			v3d->t = (FixedToFloat(-FixedMul(tempxsow, FINESINE(angle)) - FixedMul(tempytow, FINECOSINE(angle))));
+		}
+
+		v3d->x = FixedToFloat(polysector->vertices[i]->x);
+		v3d->y = height;
+		v3d->z = FixedToFloat(polysector->vertices[i]->y);
+	}
+
+	HWR_Lighting(&Surf, lightlevel, planecolormap, P_SectorUsesDirectionalLighting((FOFsector != NULL) ? FOFsector : gl_frontsector));
+
+	if (blendmode & PF_Translucent)
+	{
+		Surf.PolyColor.s.alpha = (UINT8)alpha;
+		blendmode |= PF_Modulated|PF_Occlude;
+	}
+	else
+		blendmode |= PF_Masked|PF_Modulated;
+
+	if (HWR_UseShader())
+	{
+		shader = SHADER_FLOOR;
+		blendmode |= PF_ColorMapped;
+	}
+
+	HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, blendmode, shader, false);
+}
+
+static void HWR_AddPolyObjectPlanes(void)
+{
+	size_t i;
+	sector_t *polyobjsector;
+	INT32 light = 0;
+
+	// Polyobject Planes need their own function for drawing because they don't have extrasubsectors by themselves
+	// It should be okay because polyobjects should always be convex anyway
+
+	for (i  = 0; i < numpolys; i++)
+	{
+		polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector
+
+		if (!(po_ptrs[i]->flags & POF_RENDERPLANES)) // Only render planes when you should
+			continue;
+
+		if (po_ptrs[i]->translucency >= NUMTRANSMAPS)
+			continue;
+
+		if (polyobjsector->floorheight <= gl_frontsector->ceilingheight
+			&& polyobjsector->floorheight >= gl_frontsector->floorheight
+			&& (viewz < polyobjsector->floorheight))
+		{
+			light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true);
+			if (po_ptrs[i]->translucency > 0)
+			{
+				FSurfaceInfo Surf;
+				FBITFIELD blendmode;
+				memset(&Surf, 0x00, sizeof(Surf));
+				blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
+				HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight,
+												(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
+			}
+			else
+			{
+				HWR_GetFlat(levelflats[polyobjsector->floorpic].lumpnum, R_NoEncore(polyobjsector, false));
+				HWR_RenderPolyObjectPlane(po_ptrs[i], false, polyobjsector->floorheight, PF_Occlude,
+											(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->floorpic].lumpnum,
+											polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
+			}
+		}
+
+		if (polyobjsector->ceilingheight >= gl_frontsector->floorheight
+			&& polyobjsector->ceilingheight <= gl_frontsector->ceilingheight
+			&& (viewz > polyobjsector->ceilingheight))
+		{
+			light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true);
+			if (po_ptrs[i]->translucency > 0)
+			{
+				FSurfaceInfo Surf;
+				FBITFIELD blendmode;
+				memset(&Surf, 0x00, sizeof(Surf));
+				blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
+				HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight,
+												(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
+			}
+			else
+			{
+				HWR_GetFlat(levelflats[polyobjsector->ceilingpic].lumpnum, R_NoEncore(polyobjsector, true));
+				HWR_RenderPolyObjectPlane(po_ptrs[i], true, polyobjsector->ceilingheight, PF_Occlude,
+										(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->ceilingpic].lumpnum,
+										polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
+			}
+		}
+	}
+}
+
+//
+// HWR_DoCulling
+// Hardware version of R_DoCulling
+// (see r_main.c)
+static boolean HWR_DoCulling(line_t *cullheight, line_t *viewcullheight, float vz, float bottomh, float toph)
+{
+	float cullplane;
+
+	if (!cullheight)
+		return false;
+
+	cullplane = FixedToFloat(cullheight->frontsector->floorheight);
+
+	if (cullheight->flags & ML_NOCLIMB) // Group culling
+	{
+		if (!viewcullheight)
+			return false;
+
+		// Make sure this is part of the same group
+		if (viewcullheight->frontsector == cullheight->frontsector)
+		{
+			// OK, we can cull
+			if (vz > cullplane && toph < cullplane) // Cull if below plane
+				return true;
+
+			if (bottomh > cullplane && vz <= cullplane) // Cull if above plane
+				return true;
+		}
+	}
+	else // Quick culling
+	{
+		if (vz > cullplane && toph < cullplane) // Cull if below plane
+			return true;
+
+		if (bottomh > cullplane && vz <= cullplane) // Cull if above plane
+			return true;
+	}
+
+	return false;
+}
+
+static FBITFIELD HWR_RippleBlend(sector_t *sector, ffloor_t *rover, boolean ceiling)
+{
+	(void)sector;
+	(void)ceiling;
+	return /*R_IsRipplePlane(sector, rover, ceiling)*/ (rover->flags & FF_RIPPLE) ? PF_Ripple : 0;
+}
+
+// -----------------+
+// HWR_Subsector    : Determine floor/ceiling planes.
+//                  : Add sprites of things in sector.
+//                  : Draw one or more line segments.
+// -----------------+
+static void HWR_Subsector(size_t num)
+{
+	INT16 count;
+	seg_t *line;
+	subsector_t *sub;
+	static sector_t tempsec; //SoM: 4/7/2000
+	INT32 floorlightlevel;
+	INT32 ceilinglightlevel;
+	INT32 locFloorHeight, locCeilingHeight;
+	INT32 cullFloorHeight, cullCeilingHeight;
+	INT32 light = 0;
+	extracolormap_t *floorcolormap;
+	extracolormap_t *ceilingcolormap;
+	ffloor_t *rover;
+
+#ifdef PARANOIA //no risk while developing, enough debugging nights!
+	if (num >= addsubsector)
+		I_Error("HWR_Subsector: ss %s with numss = %s, addss = %s\n",
+			sizeu1(num), sizeu2(numsubsectors), sizeu3(addsubsector));
+#endif
+
+	if (num < numsubsectors)
+	{
+		// subsector
+		sub = &subsectors[num];
+		// sector
+		gl_frontsector = sub->sector;
+		// how many linedefs
+		count = sub->numlines;
+		// first line seg
+		line = &segs[sub->firstline];
+	}
+	else
+	{
+		// there are no segs but only planes
+		sub = &subsectors[0];
+		gl_frontsector = sub->sector;
+		count = 0;
+		line = NULL;
+	}
+
+	//SoM: 4/7/2000: Test to make Boom water work in Hardware mode.
+	gl_frontsector = R_FakeFlat(gl_frontsector, &tempsec, &floorlightlevel,
+								&ceilinglightlevel, false);
+
+	if (UNLIKELY(gl_portal_state == GLPORTAL_SEARCH))
+	{
+		goto doaddline;
+	}
+
+	floorcolormap = ceilingcolormap = gl_frontsector->extra_colormap;
+
+	cullFloorHeight   = P_GetSectorFloorZAt  (gl_frontsector, viewx, viewy);
+	cullCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, viewx, viewy);
+	locFloorHeight    = P_GetSectorFloorZAt  (gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
+	locCeilingHeight  = P_GetSectorCeilingZAt(gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
+
+	if (gl_frontsector->ffloors)
+	{
+		boolean anyMoved = gl_frontsector->moved;
+
+		if (anyMoved == false)
+		{
+			for (rover = gl_frontsector->ffloors; rover; rover = rover->next)
+			{
+				if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES))
+					continue;
+
+				if (sub->validcount == validcount)
+					continue;
+
+				const sector_t *controlSec = &sectors[rover->secnum];
+
+				if (!controlSec->moved)
+					continue;
+
+				anyMoved = true;
+				break;
+			}
+		}
+
+		if (anyMoved == true)
+		{
+			gl_frontsector->numlights = sub->sector->numlights = 0;
+			R_Prep3DFloors(gl_frontsector);
+			sub->sector->lightlist = gl_frontsector->lightlist;
+			sub->sector->numlights = gl_frontsector->numlights;
+			sub->sector->moved = gl_frontsector->moved = false;
+		}
+
+		light = R_GetPlaneLight(gl_frontsector, locFloorHeight, false);
+		if (gl_frontsector->floorlightsec == -1)
+			floorlightlevel = *gl_frontsector->lightlist[light].lightlevel;
+		floorcolormap = gl_frontsector->lightlist[light].extra_colormap;
+
+		light = R_GetPlaneLight(gl_frontsector, locCeilingHeight, false);
+		if (gl_frontsector->ceilinglightsec == -1)
+			ceilinglightlevel = *gl_frontsector->lightlist[light].lightlevel;
+		ceilingcolormap = gl_frontsector->lightlist[light].extra_colormap;
+	}
+
+	sub->sector->extra_colormap = gl_frontsector->extra_colormap;
+
+	// render floor ?
+	// yeah, easy backface cull! :)
+	if (cullFloorHeight < viewz)
+	{
+		if (gl_frontsector->floorpic != skyflatnum)
+		{
+			if (sub->validcount != validcount)
+			{
+				HWR_GetFlat(levelflats[gl_frontsector->floorpic].lumpnum, R_NoEncore(gl_frontsector, false));
+				HWR_RenderPlane(sub, &extrasubsectors[num], false,
+					// Hack to make things continue to work around slopes.
+					locFloorHeight == cullFloorHeight ? locFloorHeight : gl_frontsector->floorheight,
+					// We now return you to your regularly scheduled rendering.
+					PF_Occlude, floorlightlevel, levelflats[gl_frontsector->floorpic].lumpnum, NULL, 255, floorcolormap);
+			}
+		}
+	}
+
+	if (cullCeilingHeight > viewz)
+	{
+		if (gl_frontsector->ceilingpic != skyflatnum)
+		{
+			if (sub->validcount != validcount)
+			{
+				HWR_GetFlat(levelflats[gl_frontsector->ceilingpic].lumpnum, R_NoEncore(gl_frontsector, true));
+				HWR_RenderPlane(sub, &extrasubsectors[num], true,
+					// Hack to make things continue to work around slopes.
+					locCeilingHeight == cullCeilingHeight ? locCeilingHeight : gl_frontsector->ceilingheight,
+					// We now return you to your regularly scheduled rendering.
+					PF_Occlude, ceilinglightlevel, levelflats[gl_frontsector->ceilingpic].lumpnum,NULL, 255, ceilingcolormap);
+			}
+		}
+	}
+
+	if (gl_frontsector->ffloors)
+	{
+		/// \todo fix light, xoffs, yoffs, extracolormap ?
+		for (rover = gl_frontsector->ffloors; rover; rover = rover->next)
+		{
+			fixed_t bottomCullHeight, topCullHeight, centerHeight;
+
+			if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES) || !(rover->flags & FF_RENDERALL))
+				continue;
+			if (sub->validcount == validcount)
+				continue;
+
+			// rendering heights for bottom and top planes
+			// yes there were functions for this stuff, no idea why it wasnt used but bleh
+			bottomCullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy);
+			topCullHeight    = P_GetFFloorTopZAt(rover, viewx, viewy);
+
+			if (gl_frontsector->cullheight)
+			{
+				if (HWR_DoCulling(gl_frontsector->cullheight, viewsector->cullheight, gl_viewz, FixedToFloat(*rover->bottomheight), FixedToFloat(*rover->topheight)))
+					continue;
+			}
+
+			// bottom plane
+			centerHeight = P_GetFFloorBottomZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
+
+			if (centerHeight <= locCeilingHeight && centerHeight >= locFloorHeight &&
+			    ((viewz < bottomCullHeight && !(rover->flags & FF_INVERTPLANES)) ||
+			     (viewz > bottomCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
+			{
+				if (rover->flags & FF_FOG)
+				{
+					UINT8 alpha;
+
+					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight));
+
+					alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
+
+					HWR_AddTransparentFloor(0,
+											&extrasubsectors[num],
+											false,
+											*rover->bottomheight,
+											*gl_frontsector->lightlist[light].lightlevel,
+											alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
+											true, rover->master->frontsector->extra_colormap);
+				}
+				else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient
+				{
+					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight));
+
+					HWR_AddTransparentFloor(levelflats[*rover->bottompic].lumpnum,
+											&extrasubsectors[num],
+											false,
+											*rover->bottomheight,
+											*gl_frontsector->lightlist[light].lightlevel,
+											CLAMP(rover->alpha, 0 ,255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent)),
+											false, gl_frontsector->lightlist[light].extra_colormap);
+				}
+				else
+				{
+					HWR_GetFlat(levelflats[*rover->bottompic].lumpnum, R_NoEncore(gl_frontsector, false));
+					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight));
+
+					HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->bottompic].lumpnum,
+									rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
+				}
+			}
+
+			// top plane
+			centerHeight = P_GetFFloorTopZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
+
+			if (centerHeight >= locFloorHeight &&
+			    centerHeight <= locCeilingHeight &&
+			    ((viewz > topCullHeight && !(rover->flags & FF_INVERTPLANES)) ||
+			     (viewz < topCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
+			{
+				if (rover->flags & FF_FOG)
+				{
+					UINT8 alpha;
+
+					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight));
+
+					alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
+
+					HWR_AddTransparentFloor(0,
+											&extrasubsectors[num],
+											true,
+											*rover->topheight,
+											*gl_frontsector->lightlist[light].lightlevel,
+											alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
+											true, rover->master->frontsector->extra_colormap);
+				}
+				else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
+				{
+					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight));
+
+					HWR_AddTransparentFloor(levelflats[*rover->toppic].lumpnum,
+											&extrasubsectors[num],
+											true,
+											*rover->topheight,
+											*gl_frontsector->lightlist[light].lightlevel,
+											CLAMP(rover->alpha, 0 ,255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent)),
+											false, gl_frontsector->lightlist[light].extra_colormap);
+				}
+				else
+				{
+					HWR_GetFlat(levelflats[*rover->toppic].lumpnum, R_NoEncore(gl_frontsector, true));
+					light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight));
+
+					HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->toppic].lumpnum,
+									rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
+				}
+			}
+		}
+	}
+
+	// Draw all the polyobjects in this subsector
+	if (sub->polyList)
+	{
+		polyobj_t *po = sub->polyList;
+
+		numpolys = 0;
+
+		// Count all the polyobjects, reset the list, and recount them
+		while (po)
+		{
+			++numpolys;
+			po = (polyobj_t *)(po->link.next);
+		}
+
+		// for performance stats
+		ps_numpolyobjects.value.i += numpolys;
+
+		// Sort polyobjects
+		R_SortPolyObjects(sub);
+
+		// Draw polyobject lines.
+		HWR_AddPolyObjectSegs();
+
+		if (sub->validcount != validcount) // This validcount situation seems to let us know that the floors have already been drawn.
+		{
+			// Draw polyobject planes
+			HWR_AddPolyObjectPlanes();
+		}
+	}
+
+doaddline:
+	// Hurdler: here interesting things are happening!
+	// we have just drawn the floor and ceiling
+	// we now draw the sprites first and then the walls
+	// hurdler: false: we only add the sprites, the walls are drawn first
+	if (line)
+	{
+		// draw sprites first, coz they are clipped to the solidsegs of
+		// subsectors more 'in front'
+		if (cv_drawdist.value || current_bsp_culling_distance)
+			HWR_AddSprites<AddSpritesType::kLimitDist>(gl_frontsector);
+		else
+			HWR_AddSprites<AddSpritesType::kNoLimitDist>(gl_frontsector);
+
+		//Hurdler: at this point validcount must be the same, but is not because
+		//         gl_frontsector doesn't point anymore to sub->sector due to
+		//         the call gl_frontsector = R_FakeFlat(...)
+		//         if it's not done, the sprite is drawn more than once,
+		//         what looks really bad with translucency or dynamic light,
+		//         without talking about the overdraw of course.
+		sub->sector->validcount = validcount;/// \todo fix that in a better way
+
+		if (UNLIKELY(numPolyObjects))
+		{
+			while (count--)
+			{
+				if (LIKELY(!line->polyseg)) // ignore segs that belong to polyobjects
+				{
+					HWR_AddLine(line);
+				}
+
+				line++;
+			}
+		}
+		else
+		{
+			while (count--)
+			{
+				HWR_AddLine(line);
+				line++;
+			}
+		}
+	}
+
+	sub->validcount = validcount;
+}
+
+//
+// Renders all subsectors below a given node,
+//  traversing subtree recursively.
+// Just call with BSP root.
+//
+
+namespace
+{
+	enum class BspType
+	{
+		kPortal,
+		kNormal,
+	};
+
+template <BspType Type>
+static void HWR_RenderBSPNode(INT32 bspnum)
+{
+	const node_t *bsp;
+	INT32 side;
+	ps_numbspcalls.value.i++;
+
+	while (!(bspnum & NF_SUBSECTOR))  // Keep going until found a subsector
+	{
+		bsp = &nodes[bspnum];
+
+		// Decide which side the view point is on.
+		side = R_PointOnSideFast(viewx, viewy, bsp);
+
+		if constexpr (Type == BspType::kPortal)
+		{
+			// Recursively divide front space (toward the viewer).
+			if (HWR_PortalCheckBBox(bsp->bbox[side]))
+				HWR_RenderBSPNode<BspType::kPortal>(bsp->children[side]);
+
+			// Possibly divide back space (away from the viewer).
+			if (!(HWR_CheckBBox(bsp->bbox[side^1]) && HWR_PortalCheckBBox(bsp->bbox[side^1])))
+				return;
+		}
+		else if constexpr (Type == BspType::kNormal)
+		{
+			// Recursively divide front space (toward the viewer).
+			HWR_RenderBSPNode<BspType::kNormal>(bsp->children[side]);
+
+			// Possibly divide back space (away from the viewer).
+			if (!(HWR_CheckBBox(bsp->bbox[side^1])))
+				return;
+		}
+
+		bspnum = bsp->children[side^1];
+	}
+
+	if constexpr (Type == BspType::kPortal)
+	{
+		// PORTAL CULLING
+		if (portalcullsector)
+		{
+			// skip all subsectors encountered before the portal
+			// destination's front sector
+			if (portalcullsector != subsectors[bspnum & ~NF_SUBSECTOR].sector)
+				return;
+			else
+				portalcullsector = NULL;
+		}
+	}
+
+	// e6y: support for extended nodes
+	HWR_Subsector(bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR);
+}
+};
+
+// ==========================================================================
+// gl_things.c
+// ==========================================================================
+
+// sprites are drawn after all wall and planes are rendered, so that
+// sprite translucency effects apply on the rendered view (instead of the background sky!!)
+
+static UINT32 gl_visspritecount;
+static gl_vissprite_t *gl_visspritechunks[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {NULL};
+
+// --------------------------------------------------------------------------
+// HWR_ClearSprites
+// Called at frame start.
+// --------------------------------------------------------------------------
+static inline void HWR_ClearSprites(void)
+{
+	gl_visspritecount = 0;
+}
+
+// --------------------------------------------------------------------------
+// HWR_NewVisSprite
+// --------------------------------------------------------------------------
+static gl_vissprite_t gl_overflowsprite;
+
+static gl_vissprite_t *HWR_GetVisSprite(UINT32 num)
+{
+	const UINT32 chunk = num >> VISSPRITECHUNKBITS;
+
+	// Allocate chunk if necessary
+	if (!gl_visspritechunks[chunk])
+		Z_Malloc(sizeof(gl_vissprite_t) * VISSPRITESPERCHUNK, PU_LEVEL, &gl_visspritechunks[chunk]);
+
+	return gl_visspritechunks[chunk] + (num & VISSPRITEINDEXMASK);
+}
+
+static gl_vissprite_t *HWR_NewVisSprite(void)
+{
+	if (gl_visspritecount == MAXVISSPRITES)
+		return &gl_overflowsprite;
+
+	return HWR_GetVisSprite(gl_visspritecount++);
+}
+
+// Finds a floor through which light does not pass.
+static fixed_t HWR_OpaqueFloorAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
+{
+	const sector_t *sec = R_PointInSubsectorFast(x, y)->sector;
+	fixed_t floorz = sec->floorheight;
+
+	if (sec->ffloors)
+	{
+		ffloor_t *rover;
+		fixed_t delta1, delta2;
+		const fixed_t thingtop = z + height;
+
+		for (rover = sec->ffloors; rover; rover = rover->next)
+		{
+			if (!(rover->flags & FF_EXISTS)
+			|| !(rover->flags & FF_RENDERPLANES)
+			|| rover->flags & FF_TRANSLUCENT
+			|| rover->flags & FF_FOG
+			|| rover->flags & FF_INVERTPLANES)
+				continue;
+
+			delta1 = z - (*rover->bottomheight + ((*rover->topheight - *rover->bottomheight)/2));
+			delta2 = thingtop - (*rover->bottomheight + ((*rover->topheight - *rover->bottomheight)/2));
+
+			if (!(*rover->topheight > floorz && abs(delta1) < abs(delta2)))
+				continue;
+
+			floorz = *rover->topheight;
+		}
+	}
+
+	return floorz;
+}
+
+static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t *hwrpatch)
+{
+	float this_scale = 1.0f;
+	FOutVector swallVerts[4];
+	FSurfaceInfo sSurf;
+	FBITFIELD blendmode = 0;
+	fixed_t floorheight, mobjfloor;
+	pslope_t *floorslope;
+	fixed_t slopez;
+	float offset = 0;
+
+	R_GetShadowZ(spr->mobj, &floorslope);
+
+	mobjfloor = HWR_OpaqueFloorAtPos(
+		spr->mobj->x, spr->mobj->y,
+		spr->mobj->z, spr->mobj->height);
+
+	if (cv_shadowoffs.value)
+	{
+		angle_t shadowdir;
+
+		// Set direction
+		if (splitscreen && R_GetViewNumber() == 1)
+			shadowdir = localangle[1] + FixedAngle(cv_cam_rotate[1].value);
+		else if (splitscreen > 1 && R_GetViewNumber() == 2)
+			shadowdir = localangle[2] + FixedAngle(cv_cam_rotate[2].value);
+		else if (splitscreen > 2 && R_GetViewNumber() == 3)
+			shadowdir = localangle[3] + FixedAngle(cv_cam_rotate[3].value);
+		else
+			shadowdir = localangle[0] + FixedAngle(cv_cam_rotate[0].value);
+
+		// Find floorheight
+		floorheight = HWR_OpaqueFloorAtPos(
+			spr->mobj->x + P_ReturnThrustX(spr->mobj, shadowdir, spr->mobj->z - mobjfloor),
+			spr->mobj->y + P_ReturnThrustY(spr->mobj, shadowdir, spr->mobj->z - mobjfloor),
+			spr->mobj->z, spr->mobj->height);
+
+		// The shadow is falling ABOVE it's mobj?
+		// Don't draw it, then!
+		if (spr->mobj->z < floorheight)
+			return;
+		else
+		{
+			fixed_t floorz;
+			floorz = HWR_OpaqueFloorAtPos(
+				spr->mobj->x + P_ReturnThrustX(spr->mobj, shadowdir, spr->mobj->z - floorheight),
+				spr->mobj->y + P_ReturnThrustY(spr->mobj, shadowdir, spr->mobj->z - floorheight),
+				spr->mobj->z, spr->mobj->height);
+			// The shadow would be falling on a wall? Don't draw it, then.
+			// Would draw midair otherwise.
+			if (floorz < floorheight)
+				return;
+		}
+
+		floorheight = FixedInt(spr->mobj->z - floorheight);
+
+		offset = floorheight;
+	}
+	else
+		floorheight = FixedInt(spr->mobj->z - mobjfloor);
+
+	// technically this_scale gets multiplied and added to sprite y/x scale, but this thing needs it for some crap so ill just throw it in here again
+	const boolean hires = (spr->mobj && spr->mobj->skin && K_GetMobjSkin(spr->mobj)->flags & SF_HIRES);
+
+	if (spr->mobj)
+		this_scale = FixedToFloat(spr->mobj->scale);
+	if (hires)
+		this_scale = this_scale * FixedToFloat(K_GetMobjSkin(spr->mobj)->highresscale);
+
+	// create the sprite billboard
+	//
+	//  3--2
+	//  | /|
+	//  |/ |
+	//  0--1
+
+	// x1/x2 were already scaled in HWR_ProjectSprite
+	// First match the normal sprite
+	swallVerts[0].x = swallVerts[3].x = spr->x1;
+	swallVerts[2].x = swallVerts[1].x = spr->x2;
+	swallVerts[0].z = swallVerts[3].z = spr->z1;
+	swallVerts[2].z = swallVerts[1].z = spr->z2;
+
+	if (spr->mobj && fabsf(this_scale - 1.0f) > 1.0E-36f)
+	{
+		// Always a pixel above the floor, perfectly flat.
+		swallVerts[0].y = swallVerts[1].y = swallVerts[2].y = swallVerts[3].y = spr->gzt - gpatch->topoffset * this_scale - (floorheight+3);
+
+		// Now transform the TOP vertices along the floor in the direction of the camera
+		swallVerts[3].x = spr->x1 + ((gpatch->height * this_scale) + offset) * gl_viewcos;
+		swallVerts[2].x = spr->x2 + ((gpatch->height * this_scale) + offset) * gl_viewcos;
+		swallVerts[3].z = spr->z1 + ((gpatch->height * this_scale) + offset) * gl_viewsin;
+		swallVerts[2].z = spr->z2 + ((gpatch->height * this_scale) + offset) * gl_viewsin;
+	}
+	else
+	{
+		// Always a pixel above the floor, perfectly flat.
+		swallVerts[0].y = swallVerts[1].y = swallVerts[2].y = swallVerts[3].y = spr->gzt - gpatch->topoffset - (floorheight+3);
+
+		// Now transform the TOP vertices along the floor in the direction of the camera
+		swallVerts[3].x = spr->x1 + (gpatch->height + offset) * gl_viewcos;
+		swallVerts[2].x = spr->x2 + (gpatch->height + offset) * gl_viewcos;
+		swallVerts[3].z = spr->z1 + (gpatch->height + offset) * gl_viewsin;
+		swallVerts[2].z = spr->z2 + (gpatch->height + offset) * gl_viewsin;
+	}
+
+	// We also need to move the bottom ones away when shadowoffs is on
+	if (cv_shadowoffs.value)
+	{
+		swallVerts[0].x = spr->x1 + offset * gl_viewcos;
+		swallVerts[1].x = spr->x2 + offset * gl_viewcos;
+		swallVerts[0].z = spr->z1 + offset * gl_viewsin;
+		swallVerts[1].z = spr->z2 + offset * gl_viewsin;
+	}
+
+	if (floorslope)
+	{
+		for (int i = 0; i < 4; i++)
+		{
+			slopez = P_GetSlopeZAt(floorslope, FloatToFixed(swallVerts[i].x), FloatToFixed(swallVerts[i].z));
+			swallVerts[i].y = FixedToFloat(slopez) + 0.05f;
+		}
+	}
+
+	if (spr->flip)
+	{
+		swallVerts[0].s = swallVerts[3].s = hwrpatch->max_s;
+		swallVerts[2].s = swallVerts[1].s = 0;
+	}
+	else
+	{
+		swallVerts[0].s = swallVerts[3].s = 0;
+		swallVerts[2].s = swallVerts[1].s = hwrpatch->max_s;
+	}
+
+	// flip the texture coords (look familiar?)
+	if (spr->vflip)
+	{
+		swallVerts[3].t = swallVerts[2].t = hwrpatch->max_t;
+		swallVerts[0].t = swallVerts[1].t = 0;
+	}
+	else
+	{
+		swallVerts[3].t = swallVerts[2].t = 0;
+		swallVerts[0].t = swallVerts[1].t = hwrpatch->max_t;
+	}
+
+	sSurf.PolyColor.s.red = 0x01;
+	sSurf.PolyColor.s.blue = 0x01;
+	sSurf.PolyColor.s.green = 0x01;
+
+	// shadow is always half as translucent as the sprite itself
+	if (UNLIKELY(!cv_translucency.value)) // use default translucency (main sprite won't have any translucency)
+		sSurf.PolyColor.s.alpha = 0x80; // default
+	else if (spr->mobj->flags2 & MF2_SHADOW)
+		sSurf.PolyColor.s.alpha = 0x20;
+	else if (spr->mobj->frame & FF_TRANSMASK)
+	{
+		HWR_TranstableToAlpha((spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &sSurf);
+		sSurf.PolyColor.s.alpha /= 2; //cut alpha in half!
+	}
+	else
+		sSurf.PolyColor.s.alpha = 0x80; // default
+
+	if (sSurf.PolyColor.s.alpha > floorheight/4)
+	{
+		sSurf.PolyColor.s.alpha = (UINT8)(sSurf.PolyColor.s.alpha - floorheight/4);
+		HWR_ProcessPolygon(&sSurf, swallVerts, 4, blendmode|PF_Translucent|PF_Modulated, SHADER_NONE, false);
+	}
+}
+
+// This is expecting a pointer to an array containing 4 wallVerts for a sprite
+static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean precip, const boolean papersprite)
+{
+	if (!cv_glspritebillboarding.value || papersprite)
+	{
+		return;
+	}
+
+	// uncapped/interpolation
+	interpmobjstate_t interp = {};
+	float basey, lowy;
+
+	// do interpolation
+	if (R_UsingFrameInterpolation() && !paused && R_CheckInterpDist(spr->mobj))
+	{
+		if (precip)
+		{
+			R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, rendertimefrac, &interp);
+		}
+		else
+		{
+			R_InterpolateMobjState(spr->mobj, rendertimefrac, &interp);
+		}
+	}
+	else
+	{
+		if (precip)
+		{
+			R_InterpolatePrecipMobjState((precipmobj_t *)spr->mobj, FRACUNIT, &interp);
+		}
+		else
+		{
+			R_InterpolateMobjState(spr->mobj, FRACUNIT, &interp);
+		}
+	}
+
+	if (!precip && P_MobjFlip(spr->mobj) == -1) // precip doesn't have eflags so they can't flip
+	{
+		basey = FixedToFloat(interp.z + spr->mobj->height);
+	}
+	else
+	{
+		basey = FixedToFloat(interp.z);
+	}
+
+	lowy = wallVerts[0].y;
+
+	// Rotate sprites to fully billboard with the camera
+	// X, Y, AND Z need to be manipulated for the polys to rotate around the
+	// origin, because of how the origin setting works I believe that should
+	// be mobj->z or mobj->z + mobj->height
+	wallVerts[2].y = wallVerts[3].y = (spr->gzt - basey) * gl_viewludsin + basey;
+	wallVerts[0].y = wallVerts[1].y = (lowy - basey) * gl_viewludsin + basey;
+
+	// translate back to be around 0 before translating back
+	wallVerts[3].x += ((spr->gzt - basey) * gl_viewludcos) * gl_viewcos;
+	wallVerts[2].x += ((spr->gzt - basey) * gl_viewludcos) * gl_viewcos;
+
+	wallVerts[0].x += ((lowy - basey) * gl_viewludcos) * gl_viewcos;
+	wallVerts[1].x += ((lowy - basey) * gl_viewludcos) * gl_viewcos;
+
+	wallVerts[3].z += ((spr->gzt - basey) * gl_viewludcos) * gl_viewsin;
+	wallVerts[2].z += ((spr->gzt - basey) * gl_viewludcos) * gl_viewsin;
+
+	wallVerts[0].z += ((lowy - basey) * gl_viewludcos) * gl_viewsin;
+	wallVerts[1].z += ((lowy - basey) * gl_viewludcos) * gl_viewsin;
+}
+
+static inline void HWR_ApplyDispoffset(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean papersprite)
+{
+	HWR_RotateSpritePolyToAim(spr, wallVerts, false, papersprite);
+
+	const float sprdist = sqrtf((spr->x1 - gl_viewx)*(spr->x1 - gl_viewx) + (spr->z1 - gl_viewy)*(spr->z1 - gl_viewy) + (spr->gzt - gl_viewz)*(spr->gzt - gl_viewz));
+	const float distfact = ((2.0f*spr->dispoffset) + 20.0f) / sprdist;
+
+	for (size_t i = 0; i < 4; i++)
+	{
+		wallVerts[i].x += (gl_viewx - wallVerts[i].x)*distfact;
+		wallVerts[i].z += (gl_viewy - wallVerts[i].z)*distfact;
+		wallVerts[i].y += (gl_viewz - wallVerts[i].y)*distfact;
+	}
+}
+
+static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
+{
+	FOutVector wallVerts[4];
+	FOutVector baseWallVerts[4]; // This is what the verts should end up as
+	patch_t *gpatch;
+	GLPatch_t *hwrpatch;
+	FSurfaceInfo Surf;
+	extracolormap_t *colormap;
+	INT32 lightlevel;
+	boolean lightset = true;
+	FBITFIELD blend = 0;
+	UINT8 alpha;
+
+	INT32 i;
+	float realtop, realbot, top, bot;
+	float towtop, towbot, towmult;
+	float bheight;
+	float realheight, heightmult;
+	const sector_t *sector = spr->mobj->subsector->sector;
+	const lightlist_t *list = sector->lightlist;
+	float endrealtop, endrealbot, endtop, endbot;
+	float endbheight;
+	float endrealheight;
+	fixed_t temp;
+	fixed_t v1x, v1y, v2x, v2y;
+	INT32 shader = SHADER_NONE;
+
+	gpatch = spr->gpatch;
+
+	// cache the patch in the graphics card memory
+	//12/12/99: Hurdler: same comment as above (for md2)
+	//Hurdler: 25/04/2000: now support colormap in hardware mode
+	HWR_GetMappedPatch(gpatch, spr->colormap);
+
+	hwrpatch = ((GLPatch_t *)gpatch->hardware);
+
+	// Draw shadow BEFORE sprite
+	if (UNLIKELY(cv_shadow.value // Shadows enabled
+		&& (spr->mobj->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow.
+		&& !(spr->mobj->flags2 & MF2_DEBRIS) // Debris have no corona or shadow.
+		&& (spr->mobj->z >= spr->mobj->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground.
+	{
+		////////////////////
+		// SHADOW SPRITE! //
+		////////////////////
+		HWR_DrawSpriteShadow(spr, gpatch, hwrpatch);
+	}
+
+	baseWallVerts[0].x = baseWallVerts[3].x = spr->x1;
+	baseWallVerts[2].x = baseWallVerts[1].x = spr->x2;
+	baseWallVerts[0].z = baseWallVerts[3].z = spr->z1;
+	baseWallVerts[1].z = baseWallVerts[2].z = spr->z2;
+
+	baseWallVerts[2].y = baseWallVerts[3].y = spr->gzt;
+	baseWallVerts[0].y = baseWallVerts[1].y = spr->gz;
+
+	v1x = FloatToFixed(spr->x1);
+	v1y = FloatToFixed(spr->z1);
+	v2x = FloatToFixed(spr->x2);
+	v2y = FloatToFixed(spr->z2);
+
+	if (spr->flip)
+	{
+		baseWallVerts[0].s = baseWallVerts[3].s = hwrpatch->max_s;
+		baseWallVerts[2].s = baseWallVerts[1].s = 0;
+	}
+	else
+	{
+		baseWallVerts[0].s = baseWallVerts[3].s = 0;
+		baseWallVerts[2].s = baseWallVerts[1].s = hwrpatch->max_s;
+	}
+
+	// flip the texture coords (look familiar?)
+	if (spr->vflip)
+	{
+		baseWallVerts[3].t = baseWallVerts[2].t = hwrpatch->max_t;
+		baseWallVerts[0].t = baseWallVerts[1].t = 0;
+	}
+	else
+	{
+		baseWallVerts[3].t = baseWallVerts[2].t = 0;
+		baseWallVerts[0].t = baseWallVerts[1].t = hwrpatch->max_t;
+	}
+
+	// push it toward the camera to mitigate floor-clipping sprites
+	HWR_ApplyDispoffset(spr, baseWallVerts, papersprite);
+
+	realtop = top = baseWallVerts[3].y;
+	realbot = bot = baseWallVerts[0].y;
+	towtop = baseWallVerts[3].t;
+	towbot = baseWallVerts[0].t;
+	towmult = (towbot - towtop) / (top - bot);
+
+	endrealtop = endtop = baseWallVerts[2].y;
+	endrealbot = endbot = baseWallVerts[1].y;
+
+	// copy the contents of baseWallVerts into the drawn wallVerts array
+	// baseWallVerts is used to know the final shape to easily get the vertex
+	// co-ordinates
+	memcpy(wallVerts, baseWallVerts, sizeof(baseWallVerts));
+
+	INT32 blendmode;
+	if (spr->mobj->frame & FF_BLENDMASK)
+		blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
+	else
+		blendmode = spr->mobj->blendmode;
+
+	if (UNLIKELY(!cv_translucency.value)) // translucency disabled
+	{
+		Surf.PolyColor.s.alpha = 0xFF;
+		blend = PF_Translucent|PF_Occlude;
+	}
+	else if (spr->mobj->flags2 & MF2_SHADOW)
+	{
+		Surf.PolyColor.s.alpha = 0x40;
+		blend = HWR_GetBlendModeFlag(blendmode);
+	}
+	else if (spr->mobj->frame & FF_TRANSMASK)
+	{
+		INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
+		blend = HWR_SurfaceBlend(blendmode, trans, &Surf);
+	}
+	else
+	{
+		// BP: i agree that is little better in environement but it don't
+		//     work properly under glide nor with fogcolor to ffffff :(
+		// Hurdler: PF_Environement would be cool, but we need to fix
+		//          the issue with the fog before
+		Surf.PolyColor.s.alpha = 0xFF;
+		blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude;
+	}
+
+	if (cv_playerfade.value && spr->mobj->player)
+		Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha);
+
+	if (HWR_UseShader())
+	{
+		shader = SHADER_SPRITE;
+		blend |= PF_ColorMapped;
+	}
+
+	alpha = Surf.PolyColor.s.alpha;
+
+	// Start with the lightlevel and colormap from the top of the sprite
+	lightlevel = *list[sector->numlights - 1].lightlevel;
+
+	colormap = list[sector->numlights - 1].extra_colormap;
+	i = 0;
+	temp = FloatToFixed(realtop);
+
+	lightset = HWR_OverrideObjectLightLevel(spr->mobj, &lightlevel);
+
+	for (i = 1; i < sector->numlights; i++)
+	{
+		const fixed_t h = P_GetLightZAt(&sector->lightlist[i], spr->mobj->x, spr->mobj->y);
+
+		if (!(h <= temp))
+			continue;
+
+		if (!lightset)
+			lightlevel = static_cast<INT32>(*list[i-1].lightlevel);
+
+		colormap = list[i-1].extra_colormap;
+		break;
+	}
+
+	if (!lightset)
+		HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false);
+
+	for (i = 0; i < sector->numlights; i++)
+	{
+		if ((endtop < endrealbot) && (top < realbot))
+			return;
+
+		// even if we aren't changing colormap or lightlevel, we still need to continue drawing down the sprite
+		if (!(list[i].flags & FF_NOSHADE) && (list[i].flags & FF_CUTSPRITES))
+		{
+			if (!lightset)
+			{
+				lightlevel = static_cast<INT32>(*list[i].lightlevel);
+				HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false);
+			}
+
+			colormap = list[i].extra_colormap;
+		}
+
+		if (i + 1 < sector->numlights)
+		{
+			temp       = P_GetLightZAt(&list[i+1], v1x, v1y);
+			bheight    = FixedToFloat(temp);
+			temp       = P_GetLightZAt(&list[i+1], v2x, v2y);
+			endbheight = FixedToFloat(temp);
+		}
+		else
+		{
+			bheight = realbot;
+			endbheight = endrealbot;
+		}
+
+		if ((endbheight >= endtop) || (bheight >= top))
+			continue;
+
+		// Found a break
+		// The heights are clamped to ensure the polygon doesn't cross itself.
+		bot    = CLAMP(bheight, realbot, top);
+		endbot = CLAMP(endbheight, endrealbot, endtop);
+
+		wallVerts[3].t = towtop + ((realtop - top) * towmult);
+		wallVerts[2].t = towtop + ((endrealtop - endtop) * towmult);
+		wallVerts[0].t = towtop + ((realtop - bot) * towmult);
+		wallVerts[1].t = towtop + ((endrealtop - endbot) * towmult);
+
+		wallVerts[3].y = top;
+		wallVerts[2].y = endtop;
+		wallVerts[0].y = bot;
+		wallVerts[1].y = endbot;
+
+		// The x and y only need to be adjusted in the case that it's not a papersprite
+		if (cv_glspritebillboarding.value && spr->mobj && !papersprite)
+		{
+			// Get the x and z of the vertices so billboarding draws correctly
+			realheight = realbot - realtop;
+			endrealheight = endrealbot - endrealtop;
+			heightmult = (realtop - top) / realheight;
+			wallVerts[3].x = baseWallVerts[3].x + (baseWallVerts[3].x - baseWallVerts[0].x) * heightmult;
+			wallVerts[3].z = baseWallVerts[3].z + (baseWallVerts[3].z - baseWallVerts[0].z) * heightmult;
+
+			heightmult = (endrealtop - endtop) / endrealheight;
+			wallVerts[2].x = baseWallVerts[2].x + (baseWallVerts[2].x - baseWallVerts[1].x) * heightmult;
+			wallVerts[2].z = baseWallVerts[2].z + (baseWallVerts[2].z - baseWallVerts[1].z) * heightmult;
+
+			heightmult = (realtop - bot) / realheight;
+			wallVerts[0].x = baseWallVerts[3].x + (baseWallVerts[3].x - baseWallVerts[0].x) * heightmult;
+			wallVerts[0].z = baseWallVerts[3].z + (baseWallVerts[3].z - baseWallVerts[0].z) * heightmult;
+
+			heightmult = (endrealtop - endbot) / endrealheight;
+			wallVerts[1].x = baseWallVerts[2].x + (baseWallVerts[2].x - baseWallVerts[1].x) * heightmult;
+			wallVerts[1].z = baseWallVerts[2].z + (baseWallVerts[2].z - baseWallVerts[1].z) * heightmult;
+		}
+
+		HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !(spr->mobj->frame & FF_FULLBRIGHT));
+
+		Surf.PolyColor.s.alpha = alpha;
+
+		HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); // sprite shader
+
+		top = bot;
+		endtop = endbot;
+	}
+
+	bot = realbot;
+	endbot = endrealbot;
+
+	if ((endtop <= endrealbot) && (top <= realbot))
+		return;
+
+	// If we're ever down here, somehow the above loop hasn't draw all the light levels of sprite
+	wallVerts[3].t = towtop + ((realtop - top) * towmult);
+	wallVerts[2].t = towtop + ((endrealtop - endtop) * towmult);
+	wallVerts[0].t = towtop + ((realtop - bot) * towmult);
+	wallVerts[1].t = towtop + ((endrealtop - endbot) * towmult);
+
+	wallVerts[3].y = top;
+	wallVerts[2].y = endtop;
+	wallVerts[0].y = bot;
+	wallVerts[1].y = endbot;
+
+	HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector));
+
+	Surf.PolyColor.s.alpha = alpha;
+
+	HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); // sprite shader
+}
+
+// -----------------+
+// HWR_DrawSprite   : Draw flat sprites
+//                  : (monsters, bonuses, weapons, lights, ...)
+// Returns          :
+// -----------------+
+static void HWR_DrawSprite(gl_vissprite_t *spr)
+{
+	FOutVector wallVerts[4];
+	patch_t *gpatch; // sprite patch converted to hardware
+	GLPatch_t *hwrpatch;
+	FSurfaceInfo Surf;
+	FBITFIELD blend = 0;
+
+	INT32 shader = SHADER_NONE;
+
+	const mobj_t *sprmo = spr->mobj;
+
+	if (UNLIKELY(!sprmo || !sprmo->subsector))
+		return;
+
+	const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE);
+	const sector_t *sector = sprmo->subsector->sector;
+
+	if (sector->numlights)
+	{
+		HWR_SplitSprite(spr, papersprite);
+		return;
+	}
+
+	// cache sprite graphics
+	//12/12/99: Hurdler:
+	//          OK, I don't change anything for MD2 support because I want to be
+	//          sure to do it the right way. So actually, we keep normal sprite
+	//          in memory and we add the md2 model if it exists for that sprite
+
+	gpatch = spr->gpatch;
+
+	// cache the patch in the graphics card memory
+	//12/12/99: Hurdler: same comment as above (for md2)
+	//Hurdler: 25/04/2000: now support colormap in hardware mode
+	HWR_GetMappedPatch(gpatch, spr->colormap);
+
+	hwrpatch = ((GLPatch_t *)gpatch->hardware);
+
+	// create the sprite billboard
+	//
+	//  3--2
+	//  | /|
+	//  |/ |
+	//  0--1
+
+	// these were already scaled in HWR_ProjectSprite
+	wallVerts[0].x = wallVerts[3].x = spr->x1;
+	wallVerts[2].x = wallVerts[1].x = spr->x2;
+	wallVerts[2].y = wallVerts[3].y = spr->gzt;
+	wallVerts[0].y = wallVerts[1].y = spr->gz;
+
+	// make a wall polygon (with 2 triangles), using the floor/ceiling heights,
+	// and the 2d map coords of start/end vertices
+	wallVerts[0].z = wallVerts[3].z = spr->z1;
+	wallVerts[1].z = wallVerts[2].z = spr->z2;
+
+	if (spr->flip)
+	{
+		wallVerts[0].s = wallVerts[3].s = hwrpatch->max_s;
+		wallVerts[2].s = wallVerts[1].s = 0;
+	}
+	else
+	{
+		wallVerts[0].s = wallVerts[3].s = 0;
+		wallVerts[2].s = wallVerts[1].s = hwrpatch->max_s;
+	}
+
+	// flip the texture coords (look familiar?)
+	if (spr->vflip)
+	{
+		wallVerts[3].t = wallVerts[2].t = hwrpatch->max_t;
+		wallVerts[0].t = wallVerts[1].t = 0;
+	}
+	else
+	{
+		wallVerts[3].t = wallVerts[2].t = 0;
+		wallVerts[0].t = wallVerts[1].t = hwrpatch->max_t;
+	}
+
+	// Draw shadow BEFORE sprite
+	if (UNLIKELY(cv_shadow.value // Shadows enabled
+		&& (sprmo->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow.
+		&& !(sprmo->flags2 & MF2_DEBRIS) // Debris have no corona or shadow.
+		&& (sprmo->z >= sprmo->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground.
+	{
+		////////////////////
+		// SHADOW SPRITE! //
+		////////////////////
+		HWR_DrawSpriteShadow(spr, gpatch, hwrpatch);
+	}
+
+	// push it toward the camera to mitigate floor-clipping sprites
+	HWR_ApplyDispoffset(spr, wallVerts, papersprite);
+
+	// This needs to be AFTER the shadows so that the regular sprites aren't drawn completely black.
+	// sprite lighting by modulating the RGB components
+	/// \todo coloured
+
+	// colormap test
+	INT32 lightlevel = 255;
+	const boolean lightset = HWR_OverrideObjectLightLevel(spr->mobj, &lightlevel);
+	extracolormap_t *colormap = sector->extra_colormap;
+	const boolean fullbright = R_ThingIsFullBright(spr->mobj);
+
+	if (!lightset)
+	{
+		lightlevel = static_cast<INT32>(sector->lightlevel);
+		HWR_ObjectLightLevelPost(spr, sector, &lightlevel, false);
+	}
+
+	HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !fullbright);
+
+	INT32 blendmode;
+	if (sprmo->frame & FF_BLENDMASK)
+		blendmode = ((sprmo->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
+	else
+		blendmode = sprmo->blendmode;
+
+	if (UNLIKELY(!cv_translucency.value)) // translucency disabled
+	{
+		Surf.PolyColor.s.alpha = 0xFF;
+		blend = PF_Translucent|PF_Occlude;
+	}
+	else if (sprmo->flags2 & MF2_SHADOW)
+	{
+		Surf.PolyColor.s.alpha = 0x40;
+		blend = HWR_GetBlendModeFlag(blendmode);
+	}
+	else if (sprmo->frame & FF_TRANSMASK)
+	{
+		INT32 trans = (sprmo->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
+		blend = HWR_SurfaceBlend(blendmode, trans, &Surf);
+	}
+	else
+	{
+		// BP: i agree that is little better in environement but it don't
+		//     work properly under glide nor with fogcolor to ffffff :(
+		// Hurdler: PF_Environement would be cool, but we need to fix
+		//          the issue with the fog before
+		Surf.PolyColor.s.alpha = 0xFF;
+		blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude;
+	}
+
+	if (cv_playerfade.value && sprmo->player)
+		Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha);
+
+	if (HWR_UseShader())
+	{
+		shader = SHADER_SPRITE;
+		blend |= PF_ColorMapped;
+	}
+
+	HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
+}
+
+// Sprite drawer for precipitation
+static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
+{
+	FBITFIELD blend = 0;
+	FOutVector wallVerts[4];
+	patch_t *gpatch; // sprite patch converted to hardware
+	GLPatch_t *hwrpatch;
+	FSurfaceInfo Surf;
+
+	INT32 shader = SHADER_NONE;
+
+	const mobj_t *sprmo = spr->mobj;
+
+	if (UNLIKELY(!sprmo || !sprmo->subsector))
+		return;
+
+	// cache sprite graphics
+	gpatch = spr->gpatch;
+
+	// cache the patch in the graphics card memory
+	//12/12/99: Hurdler: same comment as above (for md2)
+	//Hurdler: 25/04/2000: now support colormap in hardware mode
+	HWR_GetMappedPatch(gpatch, spr->colormap);
+
+	hwrpatch = ((GLPatch_t *)gpatch->hardware);
+
+	// create the sprite billboard
+	//
+	//  3--2
+	//  | /|
+	//  |/ |
+	//  0--1
+	wallVerts[0].x = wallVerts[3].x = spr->x1;
+	wallVerts[2].x = wallVerts[1].x = spr->x2;
+	wallVerts[2].y = wallVerts[3].y = spr->gzt;
+	wallVerts[0].y = wallVerts[1].y = spr->gz;
+
+	// make a wall polygon (with 2 triangles), using the floor/ceiling heights,
+	// and the 2d map coords of start/end vertices
+	wallVerts[0].z = wallVerts[3].z = spr->z1;
+	wallVerts[1].z = wallVerts[2].z = spr->z2;
+
+	HWR_RotateSpritePolyToAim(spr, wallVerts, true, false);
+
+	wallVerts[0].s = wallVerts[3].s = 0;
+	wallVerts[2].s = wallVerts[1].s = hwrpatch->max_s;
+
+	wallVerts[3].t = wallVerts[2].t = 0;
+	wallVerts[0].t = wallVerts[1].t = hwrpatch->max_t;
+
+	// colormap test
+	sector_t *sector = sprmo->subsector->sector;
+	INT32 lightlevel = 255;
+	extracolormap_t *colormap = sector->extra_colormap;
+
+	if (sector->numlights)
+	{
+		INT32 light;
+
+		light = R_GetPlaneLight(sector, sprmo->z + sprmo->height, false); // Always use the light at the top instead of whatever I was doing before
+
+		if (!(sprmo->frame & FF_FULLBRIGHT))
+			lightlevel = static_cast<INT32>(*sector->lightlist[light].lightlevel);
+
+		if (sector->lightlist[light].extra_colormap)
+			colormap = sector->lightlist[light].extra_colormap;
+	}
+	else
+	{
+		if (!(sprmo->frame & FF_FULLBRIGHT))
+			lightlevel = static_cast<INT32>(sector->lightlevel);
+
+		if (sector->extra_colormap)
+			colormap = sector->extra_colormap;
+	}
+
+	HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector));
+
+	if (sprmo->frame & FF_TRANSMASK)
+	{
+		INT32 trans = (sprmo->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
+		blend = HWR_SurfaceBlend(AST_TRANSLUCENT, trans, &Surf);
+	}
+	else
+	{
+		// BP: i agree that is little better in environement but it don't
+		//     work properly under glide nor with fogcolor to ffffff :(
+		// Hurdler: PF_Environement would be cool, but we need to fix
+		//          the issue with the fog before
+		Surf.PolyColor.s.alpha = 0xFF;
+		blend = HWR_GetBlendModeFlag(AST_TRANSLUCENT)|PF_Occlude;
+	}
+
+	if (HWR_UseShader())
+	{
+		shader = SHADER_SPRITE;
+		blend |= PF_ColorMapped;
+	}
+
+	HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
+}
+
+// --------------------------------------------------------------------------
+// Sort vissprites by distance
+// --------------------------------------------------------------------------
+
+gl_vissprite_t* gl_vsprorder[MAXVISSPRITES];
+
+// For more correct transparency the transparent sprites would need to be
+// sorted and drawn together with transparent surfaces.
+static int CompareVisSprites(const void *p1, const void *p2)
+{
+	const gl_vissprite_t* spr1 = *(gl_vissprite_t*const*)p1;
+	const gl_vissprite_t* spr2 = *(gl_vissprite_t*const*)p2;
+	int idiff;
+	float fdiff;
+
+	// make transparent sprites last
+	// "boolean to int"
+
+	// check for precip first, because then sprX->mobj is actually a precipmobj_t and does not have flags2 or tracer
+	const int transparency1 = (!spr1->precip && (spr1->mobj->flags2 & MF2_SHADOW)) || (spr1->mobj->frame & FF_TRANSMASK);
+	const int transparency2 = (!spr2->precip && (spr2->mobj->flags2 & MF2_SHADOW)) || (spr2->mobj->frame & FF_TRANSMASK);
+
+	idiff = transparency1 - transparency2;
+	if (idiff != 0) return idiff;
+
+	fdiff = spr2->tz - spr1->tz;// this order seems correct when checking with apitrace. Back to front.
+	if (fabsf(fdiff) < 1.0E-36f)
+		return spr1->dispoffset - spr2->dispoffset;// smallest dispoffset first if sprites are at (almost) same location.
+	else if (fdiff > 0)
+		return 1;
+	else
+		return -1;
+}
+
+static void HWR_SortVisSprites(void)
+{
+	UINT32 i;
+	for (i = 0; i < gl_visspritecount; i++)
+	{
+		gl_vsprorder[i] = HWR_GetVisSprite(i);
+	}
+
+	qs22j(gl_vsprorder, gl_visspritecount, sizeof(gl_vissprite_t*), CompareVisSprites);
+}
+
+// A drawnode is something that points to a 3D floor, 3D side, or masked
+// middle texture. This is used for sorting with sprites.
+typedef struct
+{
+	FOutVector    wallVerts[4];
+	FSurfaceInfo  Surf;
+	INT32         texnum;
+	boolean		  noencore;
+	FBITFIELD     blend;
+	boolean fogwall;
+	INT32 lightlevel;
+	extracolormap_t *wallcolormap; // Doing the lighting in HWR_RenderWall now for correct fog after sorting
+} wallinfo_t;
+
+typedef struct
+{
+	extrasubsector_t *xsub;
+	boolean isceiling;
+	fixed_t fixedheight;
+	INT32 lightlevel;
+	lumpnum_t lumpnum;
+	INT32 alpha;
+	sector_t *FOFSector;
+	FBITFIELD blend;
+	boolean fogplane;
+	extracolormap_t *planecolormap;
+} planeinfo_t;
+
+typedef struct
+{
+	polyobj_t *polysector;
+	boolean isceiling;
+	fixed_t fixedheight;
+	INT32 lightlevel;
+	lumpnum_t lumpnum;
+	INT32 alpha;
+	sector_t *FOFSector;
+	FBITFIELD blend;
+	extracolormap_t *planecolormap;
+} polyplaneinfo_t;
+
+typedef enum
+{
+	DRAWNODE_PLANE,
+	DRAWNODE_POLYOBJECT_PLANE,
+	DRAWNODE_WALL
+} gl_drawnode_type_t;
+
+typedef struct
+{
+	gl_drawnode_type_t type;
+	union {
+		planeinfo_t plane;
+		polyplaneinfo_t polyplane;
+		wallinfo_t wall;
+	} u;
+} gl_drawnode_t;
+
+// initial size of drawnode array
+#define DRAWNODES_INIT_SIZE 64
+gl_drawnode_t *drawnodes = NULL;
+INT32 numdrawnodes = 0;
+INT32 alloceddrawnodes = 0;
+
+static void *HWR_CreateDrawNode(gl_drawnode_type_t type)
+{
+	gl_drawnode_t *drawnode;
+
+	if (!drawnodes)
+	{
+		alloceddrawnodes = DRAWNODES_INIT_SIZE;
+		drawnodes = static_cast<gl_drawnode_t*>(Z_Malloc(alloceddrawnodes * sizeof(gl_drawnode_t), PU_LEVEL, &drawnodes));
+	}
+	else if (numdrawnodes >= alloceddrawnodes)
+	{
+		alloceddrawnodes *= 2;
+		Z_Realloc(drawnodes, alloceddrawnodes * sizeof(gl_drawnode_t), PU_LEVEL, &drawnodes);
+	}
+
+	drawnode = &drawnodes[numdrawnodes++];
+	drawnode->type = type;
+
+	// not sure if returning different pointers to a union is necessary
+	switch (type)
+	{
+		case DRAWNODE_PLANE:
+			return &drawnode->u.plane;
+		case DRAWNODE_POLYOBJECT_PLANE:
+			return &drawnode->u.polyplane;
+		case DRAWNODE_WALL:
+			return &drawnode->u.wall;
+	}
+	return NULL;
+}
+
+static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 texnum, boolean noencore, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap)
+{
+	wallinfo_t *wallinfo = static_cast<wallinfo_t*>(HWR_CreateDrawNode(DRAWNODE_WALL));
+
+	M_Memcpy(wallinfo->wallVerts, wallVerts, sizeof (wallinfo->wallVerts));
+	M_Memcpy(&wallinfo->Surf, pSurf, sizeof (FSurfaceInfo));
+	wallinfo->texnum = texnum;
+	wallinfo->noencore = noencore;
+	wallinfo->blend = blend;
+	wallinfo->fogwall = fogwall;
+	wallinfo->lightlevel = lightlevel;
+	wallinfo->wallcolormap = wallcolormap;
+}
+
+static void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap)
+{
+	planeinfo_t *planeinfo = static_cast<planeinfo_t*>(HWR_CreateDrawNode(DRAWNODE_PLANE));
+
+	planeinfo->isceiling = isceiling;
+	planeinfo->fixedheight = fixedheight;
+	planeinfo->lightlevel = (HWR_ShouldUsePaletteRendering() && (planecolormap && (planecolormap->fog & 2))) ? 255 : lightlevel;
+	planeinfo->lumpnum = lumpnum;
+	planeinfo->xsub = xsub;
+	planeinfo->alpha = alpha;
+	planeinfo->FOFSector = FOFSector;
+	planeinfo->blend = blend;
+	planeinfo->fogplane = fogplane;
+	planeinfo->planecolormap = planecolormap;
+}
+
+// Adding this for now until I can create extrasubsector info for polyobjects
+// When that happens it'll just be done through HWR_AddTransparentFloor and HWR_RenderPlane
+static void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap)
+{
+	polyplaneinfo_t *polyplaneinfo = static_cast<polyplaneinfo_t*>(HWR_CreateDrawNode(DRAWNODE_POLYOBJECT_PLANE));
+
+	polyplaneinfo->isceiling = isceiling;
+	polyplaneinfo->fixedheight = fixedheight;
+	polyplaneinfo->lightlevel = (HWR_ShouldUsePaletteRendering() && (planecolormap && (planecolormap->fog & 2))) ? 255 : lightlevel;
+	polyplaneinfo->lumpnum = lumpnum;
+	polyplaneinfo->polysector = polysector;
+	polyplaneinfo->alpha = alpha;
+	polyplaneinfo->FOFSector = FOFSector;
+	polyplaneinfo->blend = blend;
+	polyplaneinfo->planecolormap = planecolormap;
+}
+
+static int CompareDrawNodePlanes(const void *p1, const void *p2)
+{
+	const INT32 n1 = *(const INT32*)p1;
+	const INT32 n2 = *(const INT32*)p2;
+
+	return ABS(drawnodes[n2].u.plane.fixedheight - viewz) - ABS(drawnodes[n1].u.plane.fixedheight - viewz);
+}
+
+//
+// HWR_RenderDrawNodes
+// Sorts and renders the list of drawnodes for the scene being rendered.
+static void HWR_RenderDrawNodes(void)
+{
+	INT32 i = 0, run_start = 0;
+
+	// Array for storing the rendering order.
+	// A list of indices into the drawnodes array.
+	INT32 *sortindex;
+
+	if (!numdrawnodes)
+		return;
+
+	ps_numdrawnodes.value.i = numdrawnodes;
+
+	PS_START_TIMING(ps_hw_nodesorttime);
+
+	sortindex = static_cast<INT32*>(Z_Malloc(sizeof(INT32) * numdrawnodes, PU_STATIC, NULL));
+
+	// Reversed order
+	for (i = 0; i < numdrawnodes; i++)
+		sortindex[i] = numdrawnodes - i - 1;
+
+	// The order is correct apart from planes in the same subsector.
+	// So scan the list and sort out these cases.
+	// For each consecutive run of planes in the list, sort that run based on
+	// plane height and view height.
+	while (run_start < numdrawnodes-1) // numdrawnodes-1 because a 1 plane run at the end of the list does not count
+	{
+		// locate run start
+		if (drawnodes[sortindex[run_start]].type == DRAWNODE_PLANE)
+		{
+			// found it, now look for run end
+			INT32 run_end; // (inclusive)
+
+			for (i = run_start+1; i < numdrawnodes; i++)
+			{
+				if (drawnodes[sortindex[i]].type != DRAWNODE_PLANE)
+					break;
+			}
+
+			run_end = i-1;
+
+			if (run_end > run_start) // if there are multiple consecutive planes, not just one
+			{
+				// consecutive run of planes found, now sort it
+				qs22j(sortindex + run_start, run_end - run_start + 1, sizeof(INT32), CompareDrawNodePlanes);
+			}
+
+			run_start = run_end + 1; // continue looking for runs coming right after this one
+		}
+		else
+		{
+			// this wasnt the run start, try next one
+			run_start++;
+		}
+	}
+
+	PS_STOP_TIMING(ps_hw_nodesorttime);
+
+	PS_START_TIMING(ps_hw_nodedrawtime);
+
+	// Okay! Let's draw it all! Woo!
+	GL_SetTransform(&atransform);
+
+	for (i = 0; i < numdrawnodes; i++)
+	{
+		gl_drawnode_t *drawnode = &drawnodes[sortindex[i]];
+
+		switch (drawnode->type)
+		{
+			case DRAWNODE_PLANE:
+				{
+					planeinfo_t *plane = &drawnode->u.plane;
+
+					// We aren't traversing the BSP tree, so make gl_frontsector null to avoid crashes.
+					gl_frontsector = NULL;
+
+					if (!(plane->blend & PF_NoTexture))
+						HWR_GetFlat(plane->lumpnum,  R_NoEncore(plane->FOFSector, plane->isceiling));
+
+					HWR_RenderPlane(NULL, plane->xsub, plane->isceiling, plane->fixedheight, plane->blend, plane->lightlevel,
+									plane->lumpnum, plane->FOFSector, plane->alpha, plane->planecolormap);
+				}
+				break;
+			case DRAWNODE_POLYOBJECT_PLANE:
+				{
+					polyplaneinfo_t *polyplane = &drawnode->u.polyplane;
+
+					// We aren't traversing the BSP tree, so make gl_frontsector null to avoid crashes.
+					gl_frontsector = NULL;
+
+					if (!(polyplane->blend & PF_NoTexture))
+						HWR_GetFlat(polyplane->lumpnum,  R_NoEncore(polyplane->FOFSector, polyplane->isceiling));
+
+					HWR_RenderPolyObjectPlane(polyplane->polysector, polyplane->isceiling, polyplane->fixedheight, polyplane->blend, polyplane->lightlevel,
+											polyplane->lumpnum, polyplane->FOFSector, polyplane->alpha, polyplane->planecolormap);
+
+				}
+				break;
+			case DRAWNODE_WALL:
+				{
+					wallinfo_t *wall = &drawnode->u.wall;
+
+					if (!(wall->blend & PF_NoTexture))
+						HWR_GetTexture(wall->texnum, wall->noencore);
+
+					HWR_RenderWall(wall->wallVerts, &wall->Surf, wall->blend, wall->fogwall,
+								wall->lightlevel, wall->wallcolormap);
+				}
+				break;
+			default:
+				break;
+		}
+	}
+
+	PS_STOP_TIMING(ps_hw_nodedrawtime);
+
+	numdrawnodes = 0;
+
+	Z_Free(sortindex);
+}
+
+
+// --------------------------------------------------------------------------
+//  Draw all vissprites
+// --------------------------------------------------------------------------
+namespace
+{
+	enum class DrawSpritesType
+	{
+		kSprites,
+		kModels,
+	};
+
+template <DrawSpritesType Type>
+static void HWR_DrawSprites(void)
+{
+	UINT32 i;
+
+	for (i = 0; i < gl_visspritecount; i++)
+	{
+		gl_vissprite_t *spr = gl_vsprorder[i];
+
+		if (spr->precip)
+		{
+			HWR_DrawPrecipitationSprite(spr);
+			continue;
+		}
+
+		if constexpr (Type == DrawSpritesType::kModels)
+		{
+			if (spr->mobj && spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
+			{
+				md2_t *md2;
+
+				if (spr->mobj->localskin)
+				{
+					if (spr->mobj->skinlocal)
+						md2 = &md2_localplayermodels[(skin_t *)spr->mobj->localskin - localskins];
+					else
+						md2 = &md2_playermodels     [(skin_t *)spr->mobj->localskin -      skins];
+				}
+				else
+					md2 = &md2_playermodels[(skin_t *)spr->mobj->skin - skins];
+
+				// 8/1/19: Only don't display player models if no default SPR_PLAY is found.
+				if (((md2->notfound || md2->scale < 0.0f) && ((!cv_glfallbackplayermodel.value) || md2_models[SPR_PLAY].notfound || md2_models[SPR_PLAY].scale < 0.0f)) || spr->mobj->state == &states[S_PLAY_SIGN])
+					HWR_DrawSprite(spr);
+				else
+					HWR_DrawMD2(spr);
+			}
+			else
+			{
+				if (md2_models[spr->mobj->sprite].notfound || md2_models[spr->mobj->sprite].scale < 0.0f)
+					HWR_DrawSprite(spr);
+				else
+					HWR_DrawMD2(spr);
+			}
+		}
+
+		if constexpr (Type == DrawSpritesType::kSprites)
+		{
+			HWR_DrawSprite(spr);
+		}
+	}
+}
+}
+
+// --------------------------------------------------------------------------
+// HWR_AddSprites
+// During BSP traversal, this adds sprites by sector.
+// --------------------------------------------------------------------------
+
+namespace
+{
+template <AddSpritesType Type>
+static void HWR_AddSprites(sector_t *sec)
+{
+	mobj_t *thing;
+	INT32 limit_dist;
+
+	// BSP is traversed by subsector.
+	// A sector might have been split into several
+	// subsectors during BSP building.
+	// Thus we check whether its already added.
+	if (sec->validcount == validcount)
+		return;
+
+	// Well, now it will be done.
+	sec->validcount = validcount;
+
+	if constexpr (Type == AddSpritesType::kLimitDist)
+	{
+		limit_dist = cv_drawdist.value;
+
+		if (current_bsp_culling_distance)
+		{
+			// Use the smaller setting
+			if (limit_dist)
+				limit_dist = std::min(current_bsp_culling_distance/mapobjectscale, limit_dist);
+			else
+				limit_dist = current_bsp_culling_distance/mapobjectscale;
+		}
+	}
+
+	// Handle all things in sector.
+	for (thing = sec->thinglist; thing; thing = thing->snext)
+	{
+		// reduce branching in this rather tight loop
+		if constexpr (Type == AddSpritesType::kLimitDist)
+		{
+			if (!R_ThingWithinDist(thing, limit_dist))
+				continue;
+		}
+
+		if (!R_ThingVisible(thing))
+			continue;
+
+		HWR_ProjectSprite(thing);
+	}
+}
+}
+
+// --------------------------------------------------------------------------
+// HWR_AddPrecipitationSprites
+// This renders through the blockmap instead of BSP to avoid
+// iterating a huge amount of precipitation sprites in sectors
+// that are beyond drawdist.
+// --------------------------------------------------------------------------
+static void HWR_AddPrecipitationSprites(void)
+{
+	INT32 xl, xh, yl, yh, bx, by;
+	precipmobj_t *th, *next;
+
+	fixed_t drawdist;
+
+	// save a little time if theres no or invisible weather
+	if (curWeather == PRECIP_NONE || curWeather == PRECIP_BLANK || curWeather == PRECIP_STORM_NORAIN)
+	{
+		return;
+	}
+
+	drawdist = ((fixed_t)(cv_drawdist_precip.value) * (cv_mobjscaleprecip.value ? mapobjectscale : FRACUNIT));
+
+	// No to infinite precipitation draw distance.
+	if (cv_drawdist_precip.value == 0)
+	{
+		return;
+	}
+
+	if (current_bsp_culling_distance)
+		drawdist = std::min((fixed_t)current_bsp_culling_distance, drawdist);
+
+	R_GetRenderBlockMapDimensions(drawdist, &xl, &xh, &yl, &yh);
+
+	for (bx = xl; bx <= xh; bx++)
+	{
+		for (by = yl; by <= yh; by++)
+		{
+			for (th = precipblocklinks[(by * bmapwidth) + bx]; th; th = next)
+			{
+				// Store this beforehand because HWR_ProjectPrecipitationSprite may free th (see P_PrecipThinker)
+				next = th->bnext;
+
+				if (th->precipflags & PCF_INVISIBLE)
+					continue;
+
+				HWR_ProjectPrecipitationSprite(th);
+			}
+		}
+	}
+}
+
+// --------------------------------------------------------------------------
+// HWR_ProjectSprite
+//  Generates a vissprite for a thing if it might be visible.
+// --------------------------------------------------------------------------
+// BP why not use xtoviexangle/viewangletox like in bsp ?....
+static void HWR_ProjectSprite(mobj_t *thing)
+{
+	gl_vissprite_t *vis;
+	float tr_x, tr_y;
+	float tz;
+	float x1, x2;
+	float z1, z2;
+	float rightsin, rightcos;
+	float this_scale;
+	float spritexscale, spriteyscale;
+	float gz, gzt;
+	spritedef_t *sprdef;
+	spriteframe_t *sprframe;
+#ifdef ROTSPRITE
+	spriteinfo_t *sprinfo;
+#endif
+	size_t lumpoff;
+	unsigned rot;
+	UINT8 flip;
+
+	angle_t ang = 0;
+#ifdef ROTSPRITE
+	angle_t camang = 0;
+#endif
+	INT32 heightsec, phs;
+
+	fixed_t spr_width, spr_height;
+	fixed_t spr_offset, spr_topoffset;
+#ifdef ROTSPRITE
+	patch_t *rotsprite = NULL;
+	INT32 rollangle = 0;
+	angle_t pitchnroll = 0;
+	angle_t sliptiderollangle = 0;
+#endif
+
+	if (!thing || thing->subsector == NULL)
+		return;
+
+	// uncapped/interpolation
+	interpmobjstate_t interp = {};
+
+	if (R_UsingFrameInterpolation() && !paused && R_CheckInterpDist(thing))
+	{
+		R_InterpolateMobjState(thing, rendertimefrac, &interp);
+	}
+	else
+	{
+		R_InterpolateMobjState(thing, FRACUNIT, &interp);
+	}
+
+	if (interp.spritexscale < 1 || interp.spriteyscale < 1)
+		return;
+
+	INT32 blendmode;
+	if (thing->frame & FF_BLENDMASK)
+		blendmode = ((thing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
+	else
+		blendmode = thing->blendmode;
+
+	// Visibility check by the blend mode.
+	if (thing->frame & FF_TRANSMASK)
+	{
+		if (!R_BlendLevelVisible(blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT))
+			return;
+	}
+
+	const boolean papersprite = (thing->frame & FF_PAPERSPRITE);
+
+	// transform the origin point
+	tr_x = FixedToFloat(interp.x);
+	tr_y = FixedToFloat(interp.y);
+
+	// rotation around vertical axis
+	tz = ((tr_x - gl_viewx) * gl_viewcos) + ((tr_y - gl_viewy) * gl_viewsin);
+
+	// thing is behind view plane?
+	if (tz < ZCLIP_PLANE && !papersprite && (!cv_glmdls.value || md2_models[thing->sprite].notfound == true)) // Yellow: Only MD2's dont disappear
+		return;
+
+	const boolean mirrored = thing->mirrored;
+	const boolean vflip    = (thing->eflags & MFE_VERTICALFLIP);
+	const boolean hflip    = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
+
+	this_scale   = FixedToFloat(interp.scale);
+	spritexscale = FixedToFloat(interp.spritexscale);
+	spriteyscale = FixedToFloat(interp.spriteyscale);
+
+	// decide which patch to use for sprite relative to player
+#ifdef RANGECHECK
+	if ((unsigned)thing->sprite >= numsprites)
+		I_Error("HWR_ProjectSprite: invalid sprite number %i ", thing->sprite);
+#endif
+
+	rot = (thing->frame & FF_FRAMEMASK);
+
+	//Fab : 02-08-98: 'skin' override spritedef currently used for skin
+	if ((thing->skin || thing->localskin) && thing->sprite == SPR_PLAY)
+	{
+		sprdef = &K_GetMobjSkin(thing)->spritedef;
+#ifdef ROTSPRITE
+		sprinfo = &K_GetMobjSkin(thing)->sprinfo;
+#endif
+	}
+	else
+	{
+		sprdef = &sprites[thing->sprite];
+#ifdef ROTSPRITE
+		sprinfo = &spriteinfo[thing->sprite];
+#endif
+	}
+
+	if (rot >= sprdef->numframes)
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("HWR_ProjectSprite: invalid sprite frame %s/%s for %s\n"),
+			sizeu1(rot), sizeu2(sprdef->numframes), sprnames[thing->sprite]);
+		thing->sprite = states[S_UNKNOWN].sprite;
+		thing->frame = states[S_UNKNOWN].frame;
+		sprdef = &sprites[thing->sprite];
+#ifdef ROTSPRITE
+		sprinfo = &spriteinfo[thing->sprite];
+#endif
+		rot = (thing->frame & FF_FRAMEMASK);
+		thing->state->sprite = thing->sprite;
+		thing->state->frame = thing->frame;
+	}
+
+	sprframe = &sprdef->spriteframes[rot];
+
+#ifdef PARANOIA
+	if (!sprframe)
+		I_Error("sprframes NULL for sprite %d\n", thing->sprite);
+#endif
+
+#ifdef ROTSPRITE
+	// determine here if sprite should rotate for optimization
+	const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll));
+	const boolean shouldrotate   = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || sliprollrotate);
+#endif
+
+	if (sprframe->rotate != SRF_SINGLE || papersprite
+#ifdef ROTSPRITE
+		|| (shouldrotate)
+#endif
+	)
+	{
+		ang = R_PointToAngle(interp.x, interp.y);
+
+#ifdef ROTSPRITE
+		camang = ang;
+#endif
+
+		ang -= interp.angle;
+
+		if (mirrored)
+			ang = InvAngle(ang);
+	}
+
+	if (sprframe->rotate == SRF_SINGLE)
+	{
+		// use single rotation for all views
+		rot = 0;                        //Fab: for vis->patch below
+		lumpoff = sprframe->lumpid[0];     //Fab: see note above
+		flip = sprframe->flip; // Will only be 0x00 or 0xFF
+
+		if (papersprite && ang < ANGLE_180)
+			flip ^= 0xFFFF;
+	}
+	else
+	{
+		// choose a different rotation based on player view
+		if ((sprframe->rotate & SRF_RIGHT) && (ang < ANGLE_180)) // See from right
+			rot = 6; // F7 slot
+		else if ((sprframe->rotate & SRF_LEFT) && (ang >= ANGLE_180)) // See from left
+			rot = 2; // F3 slot
+		else // Normal behaviour
+			rot = (ang+ANGLE_202h)>>29;
+
+		//Fab: lumpid is the index for spritewidth,spriteoffset... tables
+		lumpoff = sprframe->lumpid[rot];
+		flip = sprframe->flip & (1<<rot);
+
+		if (papersprite && ang < ANGLE_180)
+			flip ^= (1<<rot);
+	}
+
+	if ((thing->skin || thing->localskin) && K_GetMobjSkin(thing)->flags & SF_HIRES)
+		this_scale *= FixedToFloat(K_GetMobjSkin(thing)->highresscale);
+
+	spr_width = spritecachedinfo[lumpoff].width;
+	spr_height = spritecachedinfo[lumpoff].height;
+	spr_offset = spritecachedinfo[lumpoff].offset;
+	spr_topoffset = spritecachedinfo[lumpoff].topoffset;
+
+#ifdef ROTSPRITE
+	if (shouldrotate)
+	{
+		// this is very messy, but it on-the-fly calculates rotations for all the
+		// pitch and roll variables
+		pitchnroll = R_RotationAngle(ang, camang, &interp);
+		rollangle = thing->rollangle;
+
+		if (rollangle || pitchnroll || sliprollrotate)
+		{
+			if (sliprollrotate)
+			{
+				sliptiderollangle = thing->player->sliproll * thing->player->kartstuff[k_aizdriftstrat];
+				pitchnroll += rollangle + FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle);
+			}
+			else
+				pitchnroll += rollangle;
+
+			rollangle = R_GetRollAngle(pitchnroll);
+			rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, sprinfo, rollangle);
+
+			if (rotsprite != NULL)
+			{
+				spr_width = rotsprite->width << FRACBITS;
+				spr_height = rotsprite->height << FRACBITS;
+				spr_offset = rotsprite->leftoffset << FRACBITS;
+				spr_topoffset = rotsprite->topoffset << FRACBITS;
+				spr_topoffset += FEETADJUST;
+
+				// flip -> rotate, not rotate -> flip
+				flip = 0;
+			}
+		}
+	}
+#endif
+
+	spr_offset += interp.spritexoffset;
+	spr_topoffset += interp.spriteyoffset;
+
+	if (papersprite)
+	{
+		rightsin = FixedToFloat(FINESINE(interp.angle >> ANGLETOFINESHIFT));
+		rightcos = FixedToFloat(FINECOSINE(interp.angle >> ANGLETOFINESHIFT));
+	}
+	else
+	{
+		rightsin = FixedToFloat(FINESINE((viewangle + ANGLE_90)>>ANGLETOFINESHIFT));
+		rightcos = FixedToFloat(FINECOSINE((viewangle + ANGLE_90)>>ANGLETOFINESHIFT));
+	}
+
+	spritexscale *= this_scale;
+	spriteyscale *= this_scale;
+
+	flip = !flip != !hflip;
+
+	if (flip)
+	{
+		x1 = (FixedToFloat(spr_width - spr_offset) * spritexscale);
+		x2 = (FixedToFloat(spr_offset) * spritexscale);
+	}
+	else
+	{
+		x1 = (FixedToFloat(spr_offset) * spritexscale);
+		x2 = (FixedToFloat(spr_width - spr_offset) * spritexscale);
+	}
+
+	z1 = tr_y + x1 * rightsin;
+	z2 = tr_y - x2 * rightsin;
+	x1 = tr_x + x1 * rightcos;
+	x2 = tr_x - x2 * rightcos;
+
+	if (vflip)
+	{
+		gz = FixedToFloat(interp.z + thing->height) - (FixedToFloat(spr_topoffset) * spriteyscale);
+		gzt = gz + (FixedToFloat(spr_height) * spriteyscale);
+	}
+	else
+	{
+		gzt = FixedToFloat(interp.z) + (FixedToFloat(spr_topoffset) * spriteyscale);
+		gz = gzt - (FixedToFloat(spr_height) * spriteyscale);
+	}
+
+	if (thing->subsector->sector->cullheight)
+	{
+		if (HWR_DoCulling(thing->subsector->sector->cullheight, viewsector->cullheight, gl_viewz, gz, gzt))
+			return;
+	}
+
+	heightsec = thing->subsector->sector->heightsec;
+	if (viewplayer && viewplayer->mo && viewplayer->mo->subsector)
+		phs = viewplayer->mo->subsector->sector->heightsec;
+	else
+		phs = -1;
+
+	if (heightsec != -1 && phs != -1) // only clip things which are in special sectors
+	{
+		if (gl_viewz < FixedToFloat(sectors[phs].floorheight) ?
+			FixedToFloat(interp.z) >= FixedToFloat(sectors[heightsec].floorheight) :
+			gzt < FixedToFloat(sectors[heightsec].floorheight))
+			return;
+		if (gl_viewz > FixedToFloat(sectors[phs].ceilingheight) ?
+			gzt < FixedToFloat(sectors[heightsec].ceilingheight) && gl_viewz >= FixedToFloat(sectors[heightsec].ceilingheight) :
+			FixedToFloat(interp.z) >= FixedToFloat(sectors[heightsec].ceilingheight))
+			return;
+	}
+
+	// store information in a vissprite
+	vis = HWR_NewVisSprite();
+	vis->x1 = x1;
+	vis->x2 = x2;
+	vis->z1 = z1;
+	vis->z2 = z2;
+
+	vis->tz = tz; // Keep tz for the simple sprite sorting that happens
+
+	vis->dispoffset = thing->info->dispoffset; // Monster Iestyn: 23/11/15: HARDWARE SUPPORT AT LAST
+	vis->flip = flip;
+
+	vis->scale = this_scale;
+	vis->spritexscale = spritexscale;
+	vis->spriteyscale = spriteyscale;
+	vis->spritexoffset = FixedToFloat(spr_offset);
+	vis->spriteyoffset = FixedToFloat(spr_topoffset);
+
+#ifdef ROTSPRITE
+	if (rotsprite != NULL)
+		vis->gpatch = (patch_t *)rotsprite;
+	else
+#endif
+		vis->gpatch = (patch_t *)W_CachePatchNum(sprframe->lumppat[rot], PU_SPRITE);
+
+	vis->mobj = thing;
+
+	//Hurdler: 25/04/2000: now support colormap in hardware mode
+	if (UNLIKELY((vis->mobj->flags & MF_BOSS) && (vis->mobj->flags2 & MF2_FRET) && (leveltime & 1))) // Bosses "flash"
+	{
+		if (vis->mobj->type == MT_CYBRAKDEMON)
+			vis->colormap = R_GetTranslationColormap(TC_ALLWHITE, SKINCOLOR_NONE, GTC_CACHE);
+		else if (vis->mobj->type == MT_METALSONIC_BATTLE)
+			vis->colormap = R_GetTranslationColormap(TC_METALSONIC, SKINCOLOR_NONE, GTC_CACHE);
+		else
+			vis->colormap = R_GetTranslationColormap(TC_BOSS, SKINCOLOR_NONE, GTC_CACHE);
+	}
+	else if (thing->color)
+	{
+		// New colormap stuff for skins Tails 06-07-2002
+		if (thing->colorized)
+			vis->colormap = R_GetTranslationColormap(TC_RAINBOW, static_cast<skincolors_t>(thing->color), GTC_CACHE);
+		else if (thing->skin && thing->sprite == SPR_PLAY) // This thing is a player!
+			vis->colormap = R_GetLocalTranslationColormap(static_cast<skin_t*>(thing->skin), static_cast<skin_t*>(thing->localskin), static_cast<skincolors_t>(thing->color), GTC_CACHE, thing->skinlocal);
+		else
+			vis->colormap = R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolors_t>(thing->color), GTC_CACHE);
+	}
+	else
+	{
+		vis->colormap = colormaps;
+#ifdef GLENCORE
+		if (encoremap && !(thing->flags & MF_DONTENCOREMAP))
+			vis->colormap += COLORMAP_REMAPOFFSET;
+#endif
+	}
+
+	// set top/bottom coords
+	vis->gzt = gzt;
+	vis->gz = gz;
+
+	//CONS_Debug(DBG_RENDER, "------------------\nH: sprite  : %d\nH: frame   : %x\nH: type    : %d\nH: sname   : %s\n\n",
+	//            thing->sprite, thing->frame, thing->type, sprnames[thing->sprite]);
+
+	vis->vflip = vflip;
+
+	vis->precip = false;
+}
+
+// Precipitation projector for hardware mode
+static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
+{
+	gl_vissprite_t *vis;
+	float tr_x, tr_y;
+	float tz;
+	float x1, x2;
+	float z1, z2;
+	float rightsin, rightcos;
+	float this_scale;
+	spritedef_t *sprdef;
+	spriteframe_t *sprframe;
+	size_t lumpoff;
+	unsigned rot = 0;
+	UINT8 flip;
+
+	if (!thing)
+		return;
+
+	// okay... this is a hack, but weather isn't networked, so it should be ok
+	if (!P_PrecipThinker(thing))
+	{
+		return;
+	}
+
+	// uncapped/interpolation
+	interpmobjstate_t interp = {};
+
+	// do interpolation
+	if (R_UsingFrameInterpolation() && !paused && R_CheckInterpDist((mobj_t*)thing))
+	{
+		R_InterpolatePrecipMobjState(thing, rendertimefrac, &interp);
+	}
+	else
+	{
+		R_InterpolatePrecipMobjState(thing, FRACUNIT, &interp);
+	}
+
+	// Visibility check by the blend mode.
+	if (thing->frame & FF_TRANSMASK)
+	{
+		if (!R_BlendLevelVisible(thing->blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT))
+			return;
+	}
+
+	// transform the origin point
+	tr_x = FixedToFloat(interp.x);
+	tr_y = FixedToFloat(interp.y);
+
+	// rotation around vertical axis
+	tz = ((tr_x - gl_viewx) * gl_viewcos) + ((tr_y - gl_viewy) * gl_viewsin);
+
+	// thing is behind view plane?
+	if (tz < ZCLIP_PLANE)
+		return;
+
+	// decide which patch to use for sprite relative to player
+	if ((unsigned)thing->sprite >= numsprites)
+	{
+#ifdef RANGECHECK
+		I_Error("HWR_ProjectPrecipitationSprite: invalid sprite number %i ",
+		        thing->sprite);
+#else
+		return;
+#endif
+	}
+
+	sprdef = &sprites[thing->sprite];
+
+	if ((size_t)(thing->frame&FF_FRAMEMASK) >= sprdef->numframes)
+	{
+#ifdef RANGECHECK
+		I_Error("HWR_ProjectPrecipitationSprite: invalid sprite frame %i : %i for %s",
+		        thing->sprite, thing->frame, sprnames[thing->sprite]);
+#else
+		return;
+#endif
+	}
+
+	this_scale = FixedToFloat(interp.scale);
+
+	sprframe = &sprdef->spriteframes[thing->frame & FF_FRAMEMASK];
+
+	// use single rotation for all views
+	lumpoff = sprframe->lumpid[0];
+	flip = sprframe->flip; // Will only be 0x00 or 0xFF
+
+	rightsin = FixedToFloat(FINESINE((viewangle + ANGLE_90)>>ANGLETOFINESHIFT));
+	rightcos = FixedToFloat(FINECOSINE((viewangle + ANGLE_90)>>ANGLETOFINESHIFT));
+
+	if (flip)
+	{
+		x1 = FixedToFloat(spritecachedinfo[lumpoff].width - spritecachedinfo[lumpoff].offset);
+		x2 = FixedToFloat(spritecachedinfo[lumpoff].offset);
+	}
+	else
+	{
+		x1 = FixedToFloat(spritecachedinfo[lumpoff].offset);
+		x2 = FixedToFloat(spritecachedinfo[lumpoff].width - spritecachedinfo[lumpoff].offset);
+	}
+
+	x1 *= this_scale;
+	x2 *= this_scale;
+
+	z1 = tr_y + x1 * rightsin;
+	z2 = tr_y - x2 * rightsin;
+	x1 = tr_x + x1 * rightcos;
+	x2 = tr_x - x2 * rightcos;
+
+	//
+	// store information in a vissprite
+	//
+	vis = HWR_NewVisSprite();
+	vis->x1 = x1;
+	vis->x2 = x2;
+	vis->z1 = z1;
+	vis->z2 = z2;
+	vis->tz = tz;
+	vis->dispoffset = 0; // Monster Iestyn: 23/11/15: HARDWARE SUPPORT AT LAST
+	vis->gpatch = (patch_t *)W_CachePatchNum(sprframe->lumppat[rot], PU_SPRITE);
+	vis->flip = flip;
+	vis->mobj = (mobj_t *)thing;
+
+	vis->colormap = NULL;
+
+#ifdef GLENCORE
+	//if (encoremap && !(thing->flags & MF_DONTENCOREMAP))
+		//vis->colormap += COLORMAP_REMAPOFFSET;
+#endif
+
+	// set top/bottom coords
+	vis->gzt = FixedToFloat(interp.z) + (FixedToFloat(spritecachedinfo[lumpoff].topoffset) * this_scale);
+	vis->gz = vis->gzt - (FixedToFloat(spritecachedinfo[lumpoff].height) * this_scale);
+
+	vis->precip = true;
+}
+
+
+// ==========================================================================
+// Sky dome rendering, ported from PrBoom+
+// ==========================================================================
+
+static gl_sky_t gl_sky;
+
+#define DEG2RADGL(a) ((a * M_PIl) / 180.0f)
+
+static void HWR_SkyDomeVertex(gl_sky_t *sky, gl_skyvertex_t *vbo, int r, int c, signed char yflip, float delta, boolean foglayer)
+{
+	static constexpr float scale = 10000.0f;
+	static constexpr float maxSideAngle = DEG2RADGL(60.0f);
+
+	float topAngle = DEG2RADGL(c / (float)sky->columns * 360.0f);
+	float sideAngle = (maxSideAngle * (float)(sky->rows - r) / (float)sky->rows);
+	float height = (float)(sin(sideAngle));
+	float realRadius = (scale * (float)cos(sideAngle));
+	float x = (realRadius * (float)cos(topAngle));
+	float y = (!yflip) ? scale * height : -scale * height;
+	float z = (realRadius * (float)sin(topAngle));
+	float timesRepeat = (4 * (256.0f / sky->width));
+
+	if (std::fpclassify(timesRepeat) == FP_ZERO)
+		timesRepeat = 1.0f;
+
+	if (!foglayer)
+	{
+		vbo->r = 255;
+		vbo->g = 255;
+		vbo->b = 255;
+		vbo->a = (r == 0 ? 0 : 255);
+
+		// And the texture coordinates.
+		vbo->u = (-timesRepeat * c / (float)sky->columns);
+		if (!yflip)	// Flipped Y is for the lower hemisphere.
+			vbo->v = (r / (float)sky->rows) + 0.5f;
+		else
+			vbo->v = 1.0f + ((sky->rows - r) / (float)sky->rows) + 0.5f;
+	}
+
+	if (r != 4)
+		y += 300.0f;
+
+	// And finally the vertex.
+	vbo->x = x;
+	vbo->y = y + delta;
+	vbo->z = z;
+}
+
+// Clears the sky dome.
+void HWR_ClearSkyDome(void)
+{
+	gl_sky_t *sky = &gl_sky;
+
+	if (sky->loops)
+		free(sky->loops);
+	if (sky->data)
+		free(sky->data);
+
+	sky->loops = NULL;
+	sky->data = NULL;
+
+	sky->vbo = 0;
+	sky->rows = sky->columns = 0;
+	sky->loopcount = 0;
+
+	sky->detail = 0;
+	sky->texture = -1;
+	sky->width = sky->height = 0;
+
+	sky->rebuild = true;
+}
+
+void HWR_BuildSkyDome(void)
+{
+	int c, r;
+	signed char yflip;
+	static constexpr int row_count = 4;
+	int col_count = 4;
+	float delta;
+
+	gl_sky_t *sky = &gl_sky;
+	gl_skyvertex_t *vertex_p;
+	const texture_t *texture = textures[texturetranslation[skytexture]];
+
+	sky->detail = 16;
+	col_count *= sky->detail;
+
+	if ((sky->columns != col_count) || (sky->rows != row_count))
+		HWR_ClearSkyDome();
+
+	sky->columns = col_count;
+	sky->rows = row_count;
+	sky->vertex_count = 2 * sky->rows * (sky->columns * 2 + 2) + sky->columns * 2;
+
+	if (!sky->loops)
+		sky->loops = static_cast<gl_skyloopdef_t*>(malloc((sky->rows * 2 + 2) * sizeof(sky->loops[0])));
+
+	// create vertex array
+	if (!sky->data)
+		sky->data  = static_cast<gl_skyvertex_t*>(malloc(sky->vertex_count * sizeof(sky->data[0])));
+
+	sky->texture = texturetranslation[skytexture];
+	sky->width = texture->width;
+	sky->height = texture->height;
+
+	vertex_p = &sky->data[0];
+	sky->loopcount = 0;
+
+	for (yflip = 0; yflip < 2; yflip++)
+	{
+		sky->loops[sky->loopcount].mode = HWD_SKYLOOP_FAN;
+		sky->loops[sky->loopcount].vertexindex = vertex_p - &sky->data[0];
+		sky->loops[sky->loopcount].vertexcount = col_count;
+		sky->loops[sky->loopcount].use_texture = false;
+		sky->loopcount++;
+
+		delta = 0.0f;
+
+		for (c = 0; c < col_count; c++)
+		{
+			HWR_SkyDomeVertex(sky, vertex_p, 1, c, yflip, 0.0f, true);
+			vertex_p->r = 255;
+			vertex_p->g = 255;
+			vertex_p->b = 255;
+			vertex_p->a = 255;
+			vertex_p++;
+		}
+
+		delta = (yflip ? 5.0f : -5.0f) / 128.0f;
+
+		for (r = 0; r < row_count; r++)
+		{
+			sky->loops[sky->loopcount].mode = HWD_SKYLOOP_STRIP;
+			sky->loops[sky->loopcount].vertexindex = vertex_p - &sky->data[0];
+			sky->loops[sky->loopcount].vertexcount = 2 * col_count + 2;
+			sky->loops[sky->loopcount].use_texture = true;
+			sky->loopcount++;
+
+			for (c = 0; c <= col_count; c++)
+			{
+				HWR_SkyDomeVertex(sky, vertex_p++, r + (yflip ? 1 : 0), (c ? c : 0), yflip, delta, false);
+				HWR_SkyDomeVertex(sky, vertex_p++, r + (yflip ? 0 : 1), (c ? c : 0), yflip, delta, false);
+			}
+		}
+	}
+}
+
+static boolean drewsky = false;
+
+// precompute to save a bit of division
+static constexpr float FINEDEGREE = (360.0f/(float)FINEANGLES);
+
+static void HWR_DrawSkyBackground(void)
+{
+	FTransform dometransform;
+
+	if (drewsky)
+		return;
+
+	if (HWR_IsWireframeMode())
+		return;
+
+	GL_SetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated);
+
+	memcpy(&dometransform, &atransform, sizeof(FTransform));
+
+	dometransform.x      = 0.0;
+	dometransform.y      = 0.0;
+	dometransform.z      = 0.0;
+
+	//04/01/2000: Hurdler: added for T&L
+	//                     It should replace all other gl_viewxxx when finished
+	HWR_SetTransformAiming(&dometransform);
+	dometransform.angley = (float)((viewangle-ANGLE_270)>>ANGLETOFINESHIFT)*(FINEDEGREE);
+
+	HWR_GetTexture(texturetranslation[skytexture], false);
+
+	if (gl_sky.texture != texturetranslation[skytexture])
+	{
+		HWR_ClearSkyDome();
+		HWR_BuildSkyDome();
+	}
+
+	if (HWR_UseShader())
+		GL_SetShader(HWR_GetShaderFromTarget(SHADER_SKY));
+	GL_SetTransform(&dometransform);
+	GL_RenderSkyDome(&gl_sky);
+}
+
+// -----------------+
+// HWR_ClearView : clear the viewwindow, with maximum z value. also clears stencil buffer.
+// -----------------+
+static inline void HWR_ClearView(void)
+{
+	GL_GClipRect((INT32)gl_viewwindowx,
+				(INT32)gl_viewwindowy,
+				(INT32)(gl_viewwindowx + gl_viewwidth),
+				(INT32)(gl_viewwindowy + gl_viewheight),
+						ZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
+	GL_ClearBuffer(false, true, true, NULL);
+}
+
+
+// -----------------+
+// HWR_SetViewSize  : set projection and scaling values
+// -----------------+
+void HWR_SetViewSize(void)
+{
+	// setup view size
+	gl_viewwidth = (float)vid.width;
+	gl_viewheight = (float)vid.height;
+
+	if (splitscreen)
+		gl_viewheight /= 2;
+
+	if (splitscreen > 1)
+		gl_viewwidth /= 2;
+
+	gl_baseviewwindowy = 0;
+	gl_baseviewwindowx = 0;
+
+	GL_FlushScreenTextures();
+}
+
+// Set view aiming, for the sky dome, the skybox,
+// and the normal view, all with a single function.
+static void HWR_SetTransformAiming(FTransform *trans)
+{
+	if (cv_glshearing.value)
+	{
+		fixed_t fixedaiming = AIMINGTODY(aimingangle);
+		trans->viewaiming = FixedToFloat(fixedaiming);
+		trans->shearing = true;
+		gl_aimingangle = 0;
+	}
+	else
+	{
+		trans->shearing = false;
+		gl_aimingangle = aimingangle;
+	}
+
+	trans->anglex = (float)(gl_aimingangle>>ANGLETOFINESHIFT)*(FINEDEGREE);
+}
+
+void HWR_SetTransform(float fpov)
+{
+	gl_viewx = FixedToFloat(viewx);
+	gl_viewy = FixedToFloat(viewy);
+	gl_viewz = FixedToFloat(viewz);
+	gl_viewsin = FixedToFloat(viewsin);
+	gl_viewcos = FixedToFloat(viewcos);
+
+	memset(&atransform, 0x00, sizeof(FTransform));
+
+	// Set T&L transform
+	atransform.x = gl_viewx;
+	atransform.y = gl_viewy;
+	atransform.z = gl_viewz;
+
+	atransform.scalex = 1;
+	atransform.scaley = (float)vid.width/vid.height;
+	atransform.scalez = 1;
+
+	HWR_SetTransformAiming(&atransform);
+	atransform.angley = (float)(viewangle>>ANGLETOFINESHIFT)*(FINEDEGREE);
+
+	gl_viewludsin = FixedToFloat(FINECOSINE(gl_aimingangle>>ANGLETOFINESHIFT));
+	gl_viewludcos = FixedToFloat(-FINESINE(gl_aimingangle>>ANGLETOFINESHIFT));
+
+	atransform.fovangle = fpov; // Tails
+	HWR_RollTransform(&atransform, viewroll);
+	atransform.splitscreen = splitscreen;
+
+	const UINT8 postimg = camera[R_GetViewNumber()].postimg;
+
+	if (postimg & POSTIMG_FLIP)
+	{
+		if (postimg & POSTIMG_MIRROR)
+			atransform.fliptype = TRANSFORM_MIRRORFLIP;
+		else
+			atransform.fliptype = TRANSFORM_FLIP;
+	}
+	else if (postimg & POSTIMG_MIRROR)
+		atransform.fliptype = TRANSFORM_MIRROR;
+
+	// Set transform.
+	GL_SetTransform(&atransform);
+}
+
+void HWR_ClearClipper(void)
+{
+	const angle_t a1 = gld_FrustumAngle(gl_aimingangle);
+	gld_clipper_Clear();
+	gld_clipper_SafeAddClipRange(viewangle + a1, viewangle - a1);
+#ifdef HAVE_SPHEREFRUSTRUM
+	gld_FrustumSetup();
+#endif
+}
+
+// Changes the current stencil state.
+void HWR_SetStencilState(int state, int level)
+{
+	if (level > -1)
+		GL_SetSpecialState(HWD_SET_STENCIL_LEVEL, level);
+	GL_SetSpecialState(HWD_SET_PORTAL_MODE, state);
+}
+
+// Renders the current viewpoint, though takes portal arguments for recursive portals.
+namespace
+{
+	enum class RenderViewpointType
+	{
+		kPortal,
+		kNormal,
+	};
+
+template <RenderViewpointType Type>
+void HWR_RenderViewpoint(gl_portal_t *rootportal, player_t *player, int stencil_level, boolean allow_portals)
+{
+	gl_portallist_t portallist;
+
+	const float fpov = FixedToFloat(R_GetPlayerFov(player));
+	const boolean skybox = (skyboxmo[0] && cv_skybox.value);
+
+	portallist.base = portallist.cap = NULL;
+	HWR_SetPortalState(GLPORTAL_OFF); // there may be portals and they need to be drawn as regural walls
+
+	if constexpr (Type == RenderViewpointType::kPortal)
+	{
+		if (allow_portals && stencil_level < cv_maxportals.value) // if recursion limit is not reached
+		{
+			gl_portal_t *portal;
+
+			// search for portals in current frame
+			currentportallist = &portallist;
+			HWR_SetPortalState(GLPORTAL_SEARCH);
+
+			HWR_ClearClipper();
+
+			if (rootportal)
+				HWR_PortalClipping(rootportal);
+
+			validcount++;
+
+			// no actual rendering happens
+			HWR_RenderBSPNode<BspType::kPortal>((INT32)numnodes-1);
+
+			// for each found portal:
+			// note: if necessary, could sort the portals here?
+			for (portal = portallist.base; portal; portal = portal->next)
+			{
+				HWR_RenderPortal(portal, rootportal, fpov, player, stencil_level);
+			}
+
+			HWR_SetPortalState(GLPORTAL_INSIDE); // when portal walls are encountered in following bsp traversal, nothing should be drawn
+		}
+	}
+
+	// draw normal things in current frame in current incremented stencil buffer area
+	HWR_SetStencilState(HWR_STENCIL_NORMAL, stencil_level);
+
+	HWR_SetTransform(fpov);
+
+	HWR_ClearSprites();
+	HWR_ClearClipper();
+
+	if constexpr (Type == RenderViewpointType::kPortal)
+	{
+		if (allow_portals && rootportal)
+		{
+			HWR_PortalFrame(rootportal);// for portalclipsector, it could have gone null from search
+			HWR_PortalClipping(rootportal);
+		}
+	}
+
+	if (HWR_IsWireframeMode())
+		GL_SetSpecialState(HWD_SET_WIREFRAME, 1);
+
+	ps_numbspcalls.value.i    = 0;
+	ps_numpolyobjects.value.i = 0;
+	PS_START_TIMING(ps_bsptime);
+
+	validcount++;
+
+	if (LIKELY(cv_glbatching.value))
+		HWR_StartBatching();
+
+	if constexpr (Type == RenderViewpointType::kPortal)
+	{
+		if (allow_portals && !rootportal && portallist.base && !skybox) // if portals have been drawn in the main view, then render skywalls differently
+			gl_collect_skywalls = true;
+
+		// HAYA: Save the old portal state, and turn portals off while normally rendering the BSP tree.
+		// This fixes specific effects not working, such as horizon lines.
+		SINT8 oldgl_portal_state = gl_portal_state;
+
+		if (gl_portal_state != GLPORTAL_OFF) // if we already haven't hit the recursion limit or we already ended our portal shenanigans
+			HWR_SetPortalState(GLPORTAL_INSIDE); // TURN IT OFF
+
+		// Recursively "render" the BSP tree.
+		if (allow_portals && portalclipline)
+			HWR_RenderBSPNode<BspType::kPortal>((INT32)numnodes-1);
+		else
+			HWR_RenderBSPNode<BspType::kNormal>((INT32)numnodes-1);
+
+		// woo we back
+		HWR_SetPortalState(oldgl_portal_state);
+	}
+	else if constexpr (Type == RenderViewpointType::kNormal)
+	{
+		// Recursively "render" the BSP tree.
+		HWR_RenderBSPNode<BspType::kNormal>((INT32)numnodes-1);
+	}
+
+	if (allow_portals) // looks weird, but this is only true when its not skybox rendering skipping precip in skyboxes like software does
+		HWR_AddPrecipitationSprites();
+
+	PS_STOP_TIMING(ps_bsptime);
+
+	if (LIKELY(cv_glbatching.value))
+		HWR_RenderBatches();
+
+	if constexpr (Type == RenderViewpointType::kPortal)
+	{
+		if (skyWallVertexArraySize) // if there are skywalls to draw using the alternate method
+		{
+			HWR_SetStencilState(HWR_STENCIL_SKY, -1);
+			HWR_DrawSkyWallList();
+			HWR_SkyWallList_Clear();
+			HWR_SetStencilState(HWR_STENCIL_NORMAL, 1);
+			drewsky = false;
+			HWR_DrawSkyBackground();
+			HWR_SetStencilState(HWR_STENCIL_NORMAL, 0);
+			GL_ClearBuffer(false, false, true, 0);// clear skywall markings from the stencil buffer
+			HWR_SetTransform(fpov);// restore transform
+		}
+	}
+	gl_collect_skywalls = false;
+
+	ps_numsprites.value.i = gl_visspritecount;
+	PS_START_TIMING(ps_hw_spritesorttime);
+	HWR_SortVisSprites();
+	PS_STOP_TIMING(ps_hw_spritesorttime);
+	PS_START_TIMING(ps_hw_spritedrawtime);
+	if (UNLIKELY(cv_glmdls.value))
+		HWR_DrawSprites<DrawSpritesType::kModels>();
+	else
+		HWR_DrawSprites<DrawSpritesType::kSprites>();
+	PS_STOP_TIMING(ps_hw_spritedrawtime);
+
+	ps_numdrawnodes.value.i    = 0;
+	ps_hw_nodesorttime.value.p = 0;
+	ps_hw_nodedrawtime.value.p = 0;
+	HWR_RenderDrawNodes();
+
+	if (HWR_IsWireframeMode())
+		GL_SetSpecialState(HWD_SET_WIREFRAME, 0);
+
+	HWR_FreePortalList(portallist); // always call this just in case
+}
+};
+
+extern "C" {
+	void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, player_t *player, int stencil_level, boolean allow_portals) {
+		HWR_RenderViewpoint<RenderViewpointType::kPortal>(rootportal, player, stencil_level, allow_portals);
+	}
+}
+
+// ==========================================================================
+// Render the current frame.
+// ==========================================================================
+static void HWR_RenderFrame(player_t *player, boolean skybox)
+{
+	// set window position
+	gl_viewwindowx = gl_baseviewwindowx;
+	gl_viewwindowy = gl_baseviewwindowy;
+
+	if ((splitscreen == 1 && viewssnum == 1) || (splitscreen > 1 && viewssnum > 1))
+	{
+		gl_viewwindowy += gl_viewheight;
+	}
+
+	if (splitscreen > 1 && viewssnum & 1)
+	{
+		gl_viewwindowx += gl_viewwidth;
+	}
+
+	// check for new console commands.
+	NetUpdate();
+
+	// Clear view, set viewport (glViewport), set perspective...
+	HWR_ClearView();
+
+	// Draw the sky background.
+	HWR_DrawSkyBackground();
+	if (skybox)
+		drewsky = true;
+
+	current_bsp_culling_distance = 0;
+
+	if (!skybox && cv_glrenderdistance.value)
+	{
+		GL_GClipRect((INT32)gl_viewwindowx,
+					(INT32)gl_viewwindowy,
+					(INT32)(gl_viewwindowx + gl_viewwidth),
+					(INT32)(gl_viewwindowy + gl_viewheight),
+					ZCLIP_PLANE, clipping_distances[cv_glrenderdistance.value - 1]);
+		current_bsp_culling_distance = bsp_culling_distances[cv_glrenderdistance.value - 1];
+	}
+
+	portalclipline = NULL;
+	if (UNLIKELY(HWR_UsePortals()))
+		HWR_RenderViewpoint<RenderViewpointType::kPortal>(NULL, player, 0, !skybox);
+	else
+		HWR_RenderViewpoint<RenderViewpointType::kNormal>(NULL, player, 0, !skybox);
+
+	// Unset transform and shader
+	GL_SetTransform(NULL);
+	GL_UnSetShader();
+
+	// Run post processor effects
+	if (!skybox)
+		HWR_DoPostProcessor(player);
+
+	// Check for new console commands.
+	NetUpdate();
+
+	// added by Hurdler for correct splitscreen
+	// moved here by hurdler so it works with the new near clipping plane
+	GL_GClipRect(0, 0, vid.width, vid.height, NZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
+}
+
+// ==========================================================================
+// Render the player view.
+// ==========================================================================
+
+static void HWR_RollTransform(FTransform *tr, angle_t roll)
+{
+	if (roll != 0)
+	{
+		tr->rollangle = roll / (float)ANG1;
+		tr->roll = true;
+		tr->rollx = 1.0f;
+		tr->rollz = 0.0f;
+	}
+}
+
+void HWR_RenderPlayerView(void)
+{
+	// Clear the color buffer, stops HOMs. Also seems to fix the skybox issue on Intel GPUs.
+	if (viewssnum == 0) // Only do it if it's the first screen being rendered
+	{
+		FRGBAFloat ClearColor;
+
+		ClearColor.red = 0.0f;
+		ClearColor.green = 0.0f;
+		ClearColor.blue = 0.0f;
+		ClearColor.alpha = 1.0f;
+
+		GL_ClearBuffer(true, false, false, &ClearColor);
+	}
+
+	if (HWR_UseShader())
+	{
+		if (cv_ripplewater.value)
+			GL_SetShaderInfo(HWD_SHADERINFO_LEVELTIME, (INT32)leveltime); // The water surface shader needs the leveltime.
+
+		const angle_t light_angle = maplighting.angle - viewangle + ANGLE_90; // I fucking hate OGL's coordinate system
+		GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_X, FINECOSINE(light_angle >> ANGLETOFINESHIFT));
+		GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_Y, 0);
+		GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_Z,  -FINESINE(light_angle >> ANGLETOFINESHIFT));
+
+		GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_CONTRAST, maplighting.contrast);
+		GL_SetShaderInfo(HWD_SHADERINFO_LIGHT_BACKLIGHT, maplighting.backlight);
+	}
+
+	if (viewssnum > 3)
+		return;
+
+	player_t * player = &players[displayplayers[viewssnum]];
+	const boolean skybox = (skyboxmo[0] && cv_skybox.value); // True if there's a skybox object and skyboxes are on
+
+	// Render the skybox if there is one.
+	PS_START_TIMING(ps_skyboxtime);
+	drewsky = false;
+	if (skybox)
+	{
+		R_SkyboxFrame(viewssnum);
+		HWR_RenderFrame(player, true);
+	}
+	PS_STOP_TIMING(ps_skyboxtime);
+
+	R_SetupFrame(viewssnum, false); // This can stay false because it is only used to set viewsky in r_main.c, which isn't used here
+	framecount++; // for timedemo
+	HWR_RenderFrame(player, false);
+}
+
+void HWR_LoadLevel(void)
+{
+	HWR_CreatePlanePolygons((INT32)numnodes - 1);
+
+	// Build the sky dome
+	HWR_ClearSkyDome();
+	HWR_BuildSkyDome();
+
+	if (HWR_ShouldUsePaletteRendering())
+		HWR_SetMapPalette();
+}
+
+// enable or disable palette rendering state depending on settings and availability
+// called when relevant settings change
+// shader recompilation is done in the cvar callback
+static void HWR_TogglePaletteRendering(void)
+{
+	V_ResetPaletteCVars(); // dont carry over changed palettes
+	ST_ResetPaletteStuff();
+
+	// which state should we go to?
+	if (HWR_ShouldUsePaletteRendering())
+	{
+		// are we not in that state already?
+		if (!gl_palette_rendering_state)
+		{
+			gl_palette_rendering_state = true;
+
+			// The textures will still be converted to RGBA by r_opengl.
+			// This however makes hw_cache use paletted blending for composite textures!
+			// (patchformat is not touched)
+			textureformat = GL_TEXFMT_P_8;
+
+			HWR_SetMapPalette();
+			HWR_SetPalette(pLocalPalette);
+
+			// If the r_opengl "texture palette" stays the same during this switch, these textures
+			// will not be cleared out. However they are still out of date since the
+			// composite texture blending method has changed. Therefore they need to be cleared.
+			HWR_LoadMapTextures(numtextures);
+		}
+	}
+	else
+	{
+		// are we not in that state already?
+		if (gl_palette_rendering_state)
+		{
+			gl_palette_rendering_state = false;
+			textureformat = GL_TEXFMT_RGBA;
+			HWR_SetPalette(pLocalPalette);
+			// If the r_opengl "texture palette" stays the same during this switch, these textures
+			// will not be cleared out. However they are still out of date since the
+			// composite texture blending method has changed. Therefore they need to be cleared.
+			HWR_LoadMapTextures(numtextures);
+		}
+	}
+}
+
+//added by Hurdler: console varibale that are saved
+void HWR_AddCommands(void)
+{
+	CV_RegisterVar(&cv_gltexturedepth);
+
+	CV_RegisterVar(&cv_glscreentextures);
+
+#ifdef USE_FBO_OGL
+	CV_RegisterVar(&cv_glframebuffer);
+#endif
+
+	CV_RegisterVar(&cv_glmdls);
+	CV_RegisterVar(&cv_glfallbackplayermodel);
+
+	CV_RegisterVar(&cv_glspritebillboarding);
+	CV_RegisterVar(&cv_glshearing);
+
+	CV_RegisterVar(&cv_glfakecontrast);
+	CV_RegisterVar(&cv_glslopecontrast);
+
+	CV_RegisterVar(&cv_glshaders);
+
+	CV_RegisterVar(&cv_gllightdither);
+
+	CV_RegisterVar(&cv_glfiltermode);
+	CV_RegisterVar(&cv_glanisotropicmode);
+
+	CV_RegisterVar(&cv_glsolvetjoin);
+
+	CV_RegisterVar(&cv_glbatching);
+
+	CV_RegisterVar(&cv_glwireframe);
+
+	CV_RegisterVar(&cv_glrenderdistance);
+
+	CV_RegisterVar(&cv_glhorizonlines);
+	CV_RegisterVar(&cv_glportals);
+
+	CV_RegisterVar(&cv_glpaletterendering);
+	CV_RegisterVar(&cv_glpalettedepth);
+	CV_RegisterVar(&cv_glflashpal);
+}
+
+// --------------------------------------------------------------------------
+// Setup the hardware renderer
+// --------------------------------------------------------------------------
+void HWR_Startup(void)
+{
+	static boolean startupdone = false;
+
+	// do this once
+	if (!startupdone)
+	{
+		CONS_Printf("HWR_Startup()...\n");
+		textureformat = patchformat = GL_TEXFMT_RGBA;
+
+		HWR_InitMapTextures();
+		HWR_InitMD2();
+
+		gl_shadersavailable = HWR_InitShaders();
+		HWR_SetShaderState();
+		HWR_LoadAllCustomShaders();
+
+		HWR_TogglePaletteRendering();
+
+		if (msaa)
+			GL_SetSpecialState(HWD_SET_MSAA, a2c ? 2 : 1);
+
+		HWR_RegisterCommands();
+	}
+	startupdone = true;
+}
+
+/**
+ * Register renderer commands.
+ */
+static void HWR_RegisterCommands(void)
+{
+	COM_AddCommand("gr_glinfo", COM_HWR_glinfo);
+}
+
+static void COM_HWR_glinfo(void)
+{
+	if (vid.glstate != VID_GL_LIBRARY_LOADED)
+	{
+		CONS_Printf("Currently not using the OpenGL renderer.\n");
+		return;
+	}
+
+	int list_extensions = 0;
+	size_t argc = COM_Argc();
+	const char *argv;
+	for (size_t i = 1; i < argc; i++)
+	{
+		argv = COM_Argv(i);
+
+		if (strcmp(argv, "--list-extensions") == 0 || strcmp(argv, "-l") == 0)
+		{
+			list_extensions = 1;
+		}
+		else
+		{
+			CONS_Printf("Unrecognized argument: %s\n", argv);
+			return;
+		}
+	}
+
+	CONS_Printf("\x88OpenGL %s\x80\n", gl_version);
+	CONS_Printf("Renderer: %s\n", gl_renderer);
+	CONS_Printf("Vendor: %s\n", gl_vendor);
+
+	CONS_Printf("%u GL extensions present.\n", gl_num_extensions);
+
+	if (list_extensions)
+	{
+		// We need this strtok loop because we cannot write the extensions list directly
+		// to the output buffer, because it will overflow the output buffer of CONS_Printf
+		// if the GPU is super new and supports a bajillion extensions - xyzzy
+
+		char *copy = strdup((const char*)gl_extensions);
+		char *ext = strtok(copy, " ");
+
+		if (copy == NULL)
+		{
+			CONS_Printf("Ran out of memory listing extensions?!?!");
+			return;
+		}
+
+		do
+		{
+			CONS_Printf(" - %s\n", ext);
+		} while ((ext = strtok(NULL, " ")) != NULL);
+
+		free(copy);
+	}
+	else
+	{
+		CONS_Printf("Use --list-extensions to view the list of extensions.\n");
+	}
+}
+
+// --------------------------------------------------------------------------
+// Free resources allocated by the hardware renderer
+// --------------------------------------------------------------------------
+void HWR_Shutdown(void)
+{
+	CONS_Printf("HWR_Shutdown()\n");
+	HWR_FreeExtraSubsectors();
+	HWR_FreeMapTextures();
+	GL_FlushScreenTextures();
+#ifdef USE_FBO_OGL
+	GL_Framebuffer_Disable();
+#endif
+}
+
+static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap)
+{
+	FBITFIELD blendmode = blend;
+	const UINT8 alpha = pSurf->PolyColor.s.alpha; // retain the alpha
+
+	INT32 shader = SHADER_NONE;
+
+	// Lighting is done here instead so that fog isn't drawn incorrectly on transparent walls after sorting
+	HWR_Lighting(pSurf, lightlevel, wallcolormap, P_SectorUsesDirectionalLighting(gl_frontsector));
+
+	pSurf->PolyColor.s.alpha = alpha; // put the alpha back after lighting
+
+	if (blend & PF_Environment)
+		blendmode |= PF_Occlude;	// PF_Occlude must be used for solid objects
+
+	if (HWR_UseShader())
+	{
+		if (fogwall)
+			shader = SHADER_FOG;
+		else
+			shader = SHADER_WALL;
+
+		blendmode |= PF_ColorMapped;
+	}
+
+	if (fogwall)
+		blendmode |= PF_Fog;
+
+	blendmode |= PF_Modulated;	// No PF_Occlude means overlapping (incorrect) transparency
+	HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode, shader, false);
+
+#ifdef WALLSPLATS
+	if (gl_curline->linedef->splats && cv_splats.value)
+		HWR_DrawSegsSplats(pSurf);
+#endif
+}
+
+static void HWR_DoPostProcessor(player_t *player)
+{
+	GL_UnSetShader();
+
+	// Armageddon Blast Flash!
+	// Could this even be considered postprocessor?
+	if (!HWR_PalRenderFlashpal() && player->flashcount)
+	{
+		FOutVector      v[4];
+		FSurfaceInfo Surf;
+
+		v[0].x = v[2].y = v[3].x = v[3].y = -4.0f;
+		v[0].y = v[1].x = v[1].y = v[2].x = 4.0f;
+		v[0].z = v[1].z = v[2].z = v[3].z = 4.0f; // 4.0 because of the same reason as with the sky, just after the screen is cleared so near clipping plane is 3.99
+
+		// This won't change if the flash palettes are changed unfortunately, but it works for its purpose
+		if (player->flashpal == PAL_NUKE)
+		{
+			Surf.PolyColor.s.red = 0xff;
+			Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0x7F; // The nuke palette is kind of pink-ish
+		}
+		else
+			Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
+
+		Surf.PolyColor.s.alpha = 0xc0; // match software mode
+
+		V_CubeApply(&Surf.PolyColor.s.red, &Surf.PolyColor.s.green, &Surf.PolyColor.s.blue);
+
+		GL_DrawPolygon(&Surf, v, 4, PF_Modulated|PF_Translucent|PF_NoTexture|PF_NoDepthTest);
+	}
+
+	if (cv_glscreentextures.value != 2) // screen textures are needed for the rest of the effects
+		return;
+
+	//UINT8 viewnum = R_GetViewNumber(); // see below
+	//camera_t *thiscam = &camera[viewnum];
+	const camera_t *thiscam = &camera[0];
+
+	// Not supported in splitscreen - someone want to add support?
+	const boolean screenwave = (!splitscreen && (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT));
+
+	// Capture the screen for intermission and screen waving
+	if ((lastdraw || screenwave) && gamestate != GS_INTERMISSION)
+		GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
+
+	// Drunken vision! WooOOooo~
+	if (screenwave)
+	{
+		// 10 by 10 grid. 2 coordinates (xy)
+		float v[SCREENVERTS][SCREENVERTS][2];
+		float disStart = (leveltime-1) + FixedToFloat(rendertimefrac);
+
+		UINT8 x, y;
+		INT32 WAVELENGTH;
+		INT32 AMPLITUDE;
+		INT32 FREQUENCY;
+
+		// Modifies the wave.
+		if (thiscam->postimg & POSTIMG_WATER)
+		{
+			WAVELENGTH = 5;
+			AMPLITUDE = 40;
+			FREQUENCY = 8;
+		}
+		else
+		{
+			WAVELENGTH = 10;
+			AMPLITUDE = 60;
+			FREQUENCY = 4;
+		}
+
+		for (x = 0; x < SCREENVERTS; x++)
+		{
+			for (y = 0; y < SCREENVERTS; y++)
+			{
+				// Change X position based on its Y position.
+				v[x][y][0] = (x/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f + (float)sin((disStart+(y*WAVELENGTH))/FREQUENCY)/AMPLITUDE;
+				v[x][y][1] = (y/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f;
+			}
+		}
+
+		GL_PostImgRedraw(v);
+
+		// Capture the screen again for screen waving on the intermission
+		if (gamestate != GS_INTERMISSION)
+			GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
+	}
+	// Flipping of the screen isn't done here anymore
+}
+
+void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum)
+{
+	static char lumpname[9] = "FADEmmss";
+	lumpnum_t lumpnum;
+	size_t lsize;
+
+	if (cv_glscreentextures.value == 0)
+	{
+		V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap
+		return;
+	}
+
+	if (wipenum > 99 || scrnnum > 99) // not a valid wipe number
+		return; // shouldn't end up here really, the loop should've stopped running beforehand
+
+	// puts the numbers into the lumpname
+	sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum);
+	lumpnum = W_CheckNumForName(lumpname);
+
+	if (lumpnum == LUMPERROR) // again, shouldn't be here really
+		return;
+
+	lsize = W_LumpLength(lumpnum);
+
+	if (!(lsize == 256000 || lsize == 64000 || lsize == 16000 || lsize == 4000))
+	{
+		CONS_Alert(CONS_WARNING, "Fade mask lump %s of incorrect size, ignored\n", lumpname);
+		return; // again, shouldn't get here if it is a bad size
+	}
+
+	HWR_GetFadeMask(lumpnum);
+	GL_DoScreenWipe(HWD_SCREENTEXTURE_WIPE_START, HWD_SCREENTEXTURE_WIPE_END);
+}
+
+#endif // HWRENDER
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index 57c8d6fe0..a7a059bfd 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -20,14 +20,21 @@
 #ifndef __HWR_MAIN_H__
 #define __HWR_MAIN_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "hw_gl.h"
 #include "hw_glob.h"
 #include "hw_data.h"
 #include "hw_defs.h"
+#include "hw_portal.h"
 
 #include "../am_map.h"
 #include "../d_player.h"
 #include "../r_defs.h"
 #include "../m_perfstats.h"
+#include "../v_video.h"
 
 #define GLENCORE
 
@@ -35,15 +42,32 @@
 void HWR_Startup(void);
 void HWR_Shutdown(void);
 
-extern float gr_viewwidth, gr_viewheight, gr_baseviewwindowx, gr_baseviewwindowy;
+extern float gl_viewwidth, gl_viewheight, gl_baseviewwindowx, gl_baseviewwindowy;
 
-extern float gr_basewindowcenterx, gr_basewindowcentery;
+extern float gl_basewindowcenterx, gl_basewindowcentery;
 
 extern unsigned msaa;
 extern boolean a2c;
 
 extern FTransform atransform;
-extern float gr_viewsin, gr_viewcos;
+extern float gl_viewsin, gl_viewcos;
+
+extern boolean gl_drawing_stencil;
+
+extern seg_t *gl_curline;
+extern side_t *gl_sidedef;
+extern line_t *gl_linedef;
+extern sector_t *gl_frontsector;
+extern sector_t *gl_backsector;
+
+enum
+{
+	HWR_STENCIL_NORMAL,
+	HWR_STENCIL_BEGIN,
+	HWR_STENCIL_REVERSE,
+	HWR_STENCIL_DEPTH,
+	HWR_STENCIL_SKY
+};
 
 // Performance stats
 extern ps_metric_t ps_hw_nodesorttime;
@@ -62,12 +86,12 @@ extern ps_metric_t ps_hw_numcolors;
 extern ps_metric_t ps_hw_batchsorttime;
 extern ps_metric_t ps_hw_batchdrawtime;
 
-extern boolean gr_shadersavailable;
+extern boolean gl_shadersavailable;
 
 // hw_draw.c
-void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option);
-void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap);
-void HWR_DrawCroppedPatch(GLPatch_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_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);
 void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32 options);	// Lat: separate flags from color since color needs to be an uint to work right.
 void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color);
@@ -81,44 +105,46 @@ UINT8 *HWR_GetScreenshot(void);
 boolean HWR_Screenshot(const char *lbmname);
 
 // hw_main.c
-void HWR_RenderFrame(INT32 viewnumber, player_t *player, boolean skybox);
-void HWR_RenderPlayerView(INT32 viewnumber, player_t *player);
 void HWR_SetViewSize(void);
 void HWR_AddCommands(void);
-void HWR_SetTransform(float fpov, player_t *player);
-void HWR_ClearClipper(void);
 
-boolean HWR_UseShader(void);
-boolean HWR_ShouldUsePaletteRendering(void);
-boolean HWR_PalRenderFlashpal(void);
-void HWR_TogglePaletteRendering(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_ClearSkyDome(void);
+void HWR_BuildSkyDome(void);
+
+void HWR_SetTransform(float fpov);
+void HWR_ClearClipper(void);
+void HWR_SetStencilState(int state, int level);
 
 // My original intention was to split hw_main.c
 // into files like hw_bsp.c, hw_sprites.c...
 
 // hw_main.c: Lighting and fog
-void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *colormap);
-UINT8 HWR_FogBlockAlpha(INT32 light, extracolormap_t *colormap); // Let's see if this can work
+void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *colormap, const boolean directional);
 
+UINT8 HWR_GetTranstableAlpha(INT32 transtablenum);
+FBITFIELD HWR_GetBlendModeFlag(INT32 ast);
+FBITFIELD HWR_SurfaceBlend(INT32 style, INT32 transtablenum, FSurfaceInfo *pSurf);
 FBITFIELD HWR_TranstableToAlpha(INT32 transtablenum, FSurfaceInfo *pSurf);
 
-// Get amount of memory used by gpu textures in bytes
-INT32 HWR_GetTextureUsed(void);
+// Get amount of memory used by gpu textures in bytes;
+FUNCINLINE static ATTRINLINE INT32 HWR_GetTextureUsed(void)
+{
+	return GL_GetTextureUsed();
+}
 
 // hw_main.c: Post-rendering
-void HWR_DoPostProcessor(player_t *player);
-void HWR_StartScreenWipe(void);
-void HWR_EndScreenWipe(void);
-void HWR_DrawIntermissionBG(void);
 void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum);
-void HWR_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
-void HWR_MakeScreenFinalTexture(void);
-void HWR_DrawScreenFinalTexture(INT32 width, INT32 height);
 
-// hw_main.c: Planes
-void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap);
-void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap);
+FUNCINLINE static ATTRINLINE void HWR_StartScreenWipe(void)
+{
+	GL_MakeScreenTexture(HWD_SCREENTEXTURE_WIPE_START);
+}
 
+<<<<<<< HEAD
 void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, FBITFIELD blendmode, UINT8 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap);
 void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap);
 
@@ -136,49 +162,105 @@ void HWR_AddSprites(sector_t *sec);
 void HWR_ProjectSprite(mobj_t *thing);
 void HWR_ProjectPrecipitationSprite(precipmobj_t *thing);
 void HWR_DrawSprites(void);
+=======
+FUNCINLINE static ATTRINLINE void HWR_EndScreenWipe(void)
+{
+	GL_MakeScreenTexture(HWD_SCREENTEXTURE_WIPE_END);
+}
+
+FUNCINLINE static ATTRINLINE void HWR_DrawIntermissionBG(void)
+{
+	GL_DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC1, NULL, 0);
+}
+
+FUNCINLINE static ATTRINLINE void HWR_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize)
+{
+	GL_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
+}
+
+FUNCINLINE static ATTRINLINE void HWR_MakeScreenFinalTexture(void)
+{
+	GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC2);
+}
+
+FUNCINLINE static ATTRINLINE void HWR_DrawScreenFinalTexture(INT32 width, INT32 height, boolean useshader)
+{
+	GL_DrawScreenFinalTexture(HWD_SCREENTEXTURE_GENERIC2, width, height, useshader);
+}
+
+// hw_main.c: Segs
+void HWR_ProcessSeg(void); // Sort of like GLWall::Process in GZDoom
+>>>>>>> Saturn-Next
 
 // hw_bsp.c
 void HWR_CreatePlanePolygons(INT32 bspnum);
-extern boolean gr_maphasportals;
-
-// hw_cache.c
-void HWR_LoadTextures(size_t pnumtextures);
-RGBA_t *HWR_GetTexturePalette(void);
-
-void HWR_SetShaderState(void);
+extern boolean gl_maphasportals;
+extern boolean gl_maphashorizonlines;
 
 // Console variables
-extern consvar_t cv_grshaders;
+extern CV_PossibleValue_t glanisotropicmode_cons_t[];
+
+extern consvar_t cv_gltexturedepth;
+
+extern consvar_t cv_glscreentextures;
 #ifdef USE_FBO_OGL
-extern consvar_t cv_grframebuffer;
+extern consvar_t cv_glframebuffer;
 #endif
-extern consvar_t cv_splitwallfix;
-extern consvar_t cv_grshearing;
-extern consvar_t cv_grfov;
-extern consvar_t cv_grmdls;
-extern consvar_t cv_grfog;
-extern consvar_t cv_grfogdensity;
-extern consvar_t cv_grfiltermode;
-extern consvar_t cv_granisotropicmode;
-extern consvar_t cv_grcorrecttricks;
-extern consvar_t cv_grfovchange;
-extern consvar_t cv_grsolvetjoin;
-extern consvar_t cv_grspritebillboarding;
-extern consvar_t cv_grfakecontrast;
-extern consvar_t cv_grslopecontrast;
-extern consvar_t cv_grhorizonlines;
-extern consvar_t cv_grfallbackplayermodel;
-extern consvar_t cv_grbatching;
-extern consvar_t cv_grrenderdistance;
-extern consvar_t cv_grpaletterendering;
-extern consvar_t cv_grpalettedepth;
-extern consvar_t cv_grflashpal;
-extern consvar_t cv_lightdither;
-extern consvar_t cv_grscreentextures;
-extern consvar_t cv_grportals;
-extern consvar_t cv_nostencil;
-extern consvar_t cv_secbright;
 
-extern CV_PossibleValue_t granisotropicmode_cons_t[];
+extern consvar_t cv_glmdls;
+extern consvar_t cv_glfallbackplayermodel;
+
+extern consvar_t cv_glspritebillboarding;
+extern consvar_t cv_glshearing;
+
+extern consvar_t cv_glfakecontrast;
+extern consvar_t cv_glslopecontrast;
+
+extern consvar_t cv_glshaders;
+
+extern consvar_t cv_gllightdither;
+
+extern consvar_t cv_glfiltermode;
+extern consvar_t cv_glanisotropicmode;
+
+extern consvar_t cv_glsolvetjoin;
+
+extern consvar_t cv_glbatching;
+
+extern consvar_t cv_glwireframe;
+
+extern consvar_t cv_glrenderdistance;
+
+extern consvar_t cv_glhorizonlines;
+extern consvar_t cv_glportals;
+
+extern consvar_t cv_glpaletterendering;
+extern consvar_t cv_glpalettedepth;
+extern consvar_t cv_glflashpal;
+
+FUNCINLINE static ATTRINLINE boolean HWR_UseShader(void)
+{
+	return (cv_glshaders.value && gl_shadersavailable);
+}
+
+FUNCINLINE static ATTRINLINE boolean HWR_ShouldUsePaletteRendering(void)
+{
+	return (cv_glpaletterendering.value && (pLocalPalette != NULL) && HWR_UseShader());
+}
+
+FUNCINLINE static ATTRINLINE boolean HWR_PalRenderFlashpal(void)
+{
+	return (cv_glflashpal.value && HWR_ShouldUsePaletteRendering());
+}
+
+// Returns a pointer to the palette which should be used for caching textures.
+FUNCINLINE static ATTRINLINE RGBA_t *HWR_GetTexturePalette(void)
+{
+	return HWR_ShouldUsePaletteRendering() ? mapPalette : pLocalPalette;
+}
+
+#ifdef __cplusplus
+}// extern "C"
+#endif
 
 #endif
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index c71f47185..d611c0aee 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -25,12 +25,18 @@
 #include "../doomstat.h"
 
 #ifdef HWRENDER
+<<<<<<< HEAD
 #include "hw_drv.h"
+=======
+
+#include "hw_gl.h"
+>>>>>>> Saturn-Next
 #include "hw_md2.h"
 #include "../d_main.h"
 #include "../r_bsp.h"
 #include "../r_fps.h"
 #include "../r_main.h"
+#include "../p_setup.h"
 #include "../m_misc.h"
 #include "../w_wad.h"
 #include "../z_zone.h"
@@ -43,8 +49,8 @@
 
 #include "hw_main.h"
 #include "../v_video.h"
-#ifdef HAVE_PNG
 
+#ifdef HAVE_PNG
 #ifndef _MSC_VER
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
@@ -147,7 +153,7 @@ static void PNG_warn(png_structp PNG, png_const_charp pngtext)
 	CONS_Debug(DBG_RENDER, "libpng warning at %p: %s", PNG, pngtext);
 }
 
-static GLTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_t *grpatch)
+static GLTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_t *glpatch)
 {
 	png_structp png_ptr;
 	png_infop png_info_ptr;
@@ -201,7 +207,7 @@ static GLTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
 		//CONS_Debug(DBG_RENDER, "libpng load error on %s\n", filename);
 		png_destroy_read_struct(&png_ptr, &png_info_ptr, NULL);
 		fclose(png_FILE);
-		Z_Free(grpatch->mipmap->data);
+		Z_Free(glpatch->mipmap->data);
 		return 0;
 	}
 #ifdef USE_FAR_KEYWORD
@@ -242,7 +248,7 @@ static GLTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
 
 	{
 		png_uint_32 i, pitch = png_get_rowbytes(png_ptr, png_info_ptr);
-		png_bytep PNG_image = Z_Malloc(pitch*height, PU_HWRCACHE, &grpatch->mipmap->data);
+		png_bytep PNG_image = Z_Malloc(pitch*height, PU_HWRMODELTEXTURE, &glpatch->mipmap->data);
 		png_bytepp row_pointers = png_malloc(png_ptr, height * sizeof (png_bytep));
 		for (i = 0; i < height; i++)
 			row_pointers[i] = PNG_image + i*pitch;
@@ -282,7 +288,7 @@ typedef struct
 } PcxHeader;
 
 static GLTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
-	GLPatch_t *grpatch)
+	GLPatch_t *glpatch)
 {
 	PcxHeader header;
 #define PALSIZE 768
@@ -322,7 +328,7 @@ static GLTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
 
 	pw = *w = header.xmax - header.xmin + 1;
 	ph = *h = header.ymax - header.ymin + 1;
-	image = Z_Malloc(pw*ph*4, PU_HWRCACHE, &grpatch->mipmap->data);
+	image = Z_Malloc(pw*ph*4, PU_HWRMODELTEXTURE, &glpatch->mipmap->data);
 
 	if (fread(palette, sizeof (UINT8), PALSIZE, file) != PALSIZE)
 	{
@@ -364,51 +370,56 @@ static GLTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
 // -----------------+
 static void md2_loadTexture(md2_t *model)
 {
-	GLPatch_t *grpatch;
+	patch_t *patch;
+	GLPatch_t *glPatch = NULL;
 	const char *filename = model->filename;
 
-	if (model->grpatch)
+	if (model->glpatch)
 	{
-		grpatch = model->grpatch;
-		Z_Free(grpatch->mipmap->data);
+		patch = model->glpatch;
+		glPatch = (GLPatch_t *)(patch->hardware);
+		if (glPatch)
+			Z_Free(glPatch->mipmap->data);
 	}
 	else
-	{
-		grpatch = Z_Calloc(sizeof *grpatch, PU_HWRPATCHINFO,
-		                   &(model->grpatch));
-		grpatch->mipmap = Z_Calloc(sizeof (GLMipmap_t), PU_HWRPATCHINFO, NULL);
-	}
+		model->glpatch = patch = Patch_Create(NULL, 0, NULL);
 
-	if (!grpatch->mipmap->downloaded && !grpatch->mipmap->data)
+	if (!patch->hardware)
+		Patch_AllocateHardwarePatch(patch);
+
+	if (glPatch == NULL)
+		glPatch = (GLPatch_t *)(patch->hardware);
+
+	if (!glPatch->mipmap->downloaded && !glPatch->mipmap->data)
 	{
 		int w = 0, h = 0;
 
 #ifdef HAVE_PNG
-		grpatch->mipmap->format = PNG_Load(filename, &w, &h, grpatch);
-		if (grpatch->mipmap->format == 0)
+		glPatch->mipmap->format = PNG_Load(filename, &w, &h, glPatch);
+		if (glPatch->mipmap->format == 0)
 #endif
-		grpatch->mipmap->format = PCX_Load(filename, &w, &h, grpatch);
-		if (grpatch->mipmap->format == 0)
+		glPatch->mipmap->format = PCX_Load(filename, &w, &h, glPatch);
+		if (glPatch->mipmap->format == 0)
 		{
-			grpatch->notfound = true;// mark it so its not searched for again repeatedly
+			model->notexturefile = true; // mark it so its not searched for again repeatedly
 			return;
 		}
 
-		grpatch->mipmap->downloaded = 0;
-		grpatch->mipmap->flags = 0;
+		glPatch->mipmap->downloaded = 0;
+		glPatch->mipmap->flags = 0;
+
+		patch->width = (INT16)w;
+		patch->height = (INT16)h;
+		glPatch->mipmap->width = (UINT16)w;
+		glPatch->mipmap->height = (UINT16)h;
 
-		grpatch->width = (INT16)w;
-		grpatch->height = (INT16)h;
-		grpatch->mipmap->width = (UINT16)w;
-		grpatch->mipmap->height = (UINT16)h;
-		
 		// for palette rendering, color cube is applied in post-processing instead of here
 		if (!HWR_ShouldUsePaletteRendering())
 		{
 			UINT32 size;
 			RGBA_t *image;
 			// Lactozilla: Apply colour cube
-			image = grpatch->mipmap->data;
+			image = glPatch->mipmap->data;
 			size = w*h;
 			while (size--)
 			{
@@ -417,8 +428,8 @@ static void md2_loadTexture(md2_t *model)
 			}
 		}
 	}
-	HWD.pfnSetTexture(grpatch->mipmap);
-	HWR_UnlockCachedPatch(grpatch);
+	GL_SetTexture(glPatch->mipmap);
+	HWR_UnlockCachedPatch(glPatch);
 }
 
 // -----------------+
@@ -426,49 +437,56 @@ static void md2_loadTexture(md2_t *model)
 // -----------------+
 static void md2_loadBlendTexture(md2_t *model)
 {
-	GLPatch_t *grpatch;
+	patch_t *patch;
+	GLPatch_t *glPatch = NULL;
+
 	char *filename = Z_Malloc(strlen(model->filename)+7, PU_STATIC, NULL);
+
 	strcpy(filename, model->filename);
 
 	FIL_ForceExtension(filename, "_blend.png");
 
-	if (model->blendgrpatch)
+	if (model->blendglpatch)
 	{
-		grpatch = model->blendgrpatch;
-		Z_Free(grpatch->mipmap->data);
+		patch = model->blendglpatch;
+		glPatch = (GLPatch_t *)(patch->hardware);
+		if (glPatch)
+			Z_Free(glPatch->mipmap->data);
 	}
 	else
-	{
-		grpatch = Z_Calloc(sizeof *grpatch, PU_HWRPATCHINFO,
-		                   &(model->blendgrpatch));
-		grpatch->mipmap = Z_Calloc(sizeof (GLMipmap_t), PU_HWRPATCHINFO, NULL);
-	}
+		model->blendglpatch = patch = Patch_Create(NULL, 0, NULL);
 
-	if (!grpatch->mipmap->downloaded && !grpatch->mipmap->data)
+	if (!patch->hardware)
+		Patch_AllocateHardwarePatch(patch);
+
+	if (glPatch == NULL)
+		glPatch = (GLPatch_t *)(patch->hardware);
+
+	if (!glPatch->mipmap->downloaded && !glPatch->mipmap->data)
 	{
 		int w = 0, h = 0;
 #ifdef HAVE_PNG
-		grpatch->mipmap->format = PNG_Load(filename, &w, &h, grpatch);
-		if (grpatch->mipmap->format == 0)
+		glPatch->mipmap->format = PNG_Load(filename, &w, &h, glPatch);
+		if (glPatch->mipmap->format == 0)
 #endif
-		grpatch->mipmap->format = PCX_Load(filename, &w, &h, grpatch);
-		if (grpatch->mipmap->format == 0)
+		glPatch->mipmap->format = PCX_Load(filename, &w, &h, glPatch);
+		if (glPatch->mipmap->format == 0)
 		{
-			grpatch->notfound = true;// mark it so its not searched for again repeatedly
+			model->noblendfile = true; // mark it so its not searched for again repeatedly
 			Z_Free(filename);
 			return;
 		}
 
-		grpatch->mipmap->downloaded = 0;
-		grpatch->mipmap->flags = 0;
+		glPatch->mipmap->downloaded = 0;
+		glPatch->mipmap->flags = 0;
 
-		grpatch->width = (INT16)w;
-		grpatch->height = (INT16)h;
-		grpatch->mipmap->width = (UINT16)w;
-		grpatch->mipmap->height = (UINT16)h;
+		patch->width = (INT16)w;
+		patch->height = (INT16)h;
+		glPatch->mipmap->width = (UINT16)w;
+		glPatch->mipmap->height = (UINT16)h;
 	}
-	HWD.pfnSetTexture(grpatch->mipmap); // We do need to do this so that it can be cleared and knows to recreate it when necessary
-	HWR_UnlockCachedPatch(grpatch);
+	GL_SetTexture(glPatch->mipmap); // We do need to do this so that it can be cleared and knows to recreate it when necessary
+	HWR_UnlockCachedPatch(glPatch);
 
 	Z_Free(filename);
 }
@@ -489,8 +507,10 @@ void HWR_InitMD2(void)
 	{
 		md2_playermodels[s].scale = -1.0f;
 		md2_playermodels[s].model = NULL;
-		md2_playermodels[s].grpatch = NULL;
+		md2_playermodels[s].glpatch = NULL;
 		md2_playermodels[s].skin = -1;
+		md2_playermodels[s].notexturefile = false;
+		md2_playermodels[s].noblendfile = false;
 		md2_playermodels[s].notfound = true;
 		md2_playermodels[s].error = false;
 	}
@@ -498,8 +518,10 @@ void HWR_InitMD2(void)
 	{
 		md2_localplayermodels[s].scale = -1.0f;
 		md2_localplayermodels[s].model = NULL;
-		md2_localplayermodels[s].grpatch = NULL;
+		md2_localplayermodels[s].glpatch = NULL;
 		md2_localplayermodels[s].skin = -1;
+		md2_localplayermodels[s].notexturefile = false;
+		md2_localplayermodels[s].noblendfile = false;
 		md2_localplayermodels[s].notfound = true;
 		md2_localplayermodels[s].error = false;
 	}
@@ -507,8 +529,10 @@ void HWR_InitMD2(void)
 	{
 		md2_models[i].scale = -1.0f;
 		md2_models[i].model = NULL;
-		md2_models[i].grpatch = NULL;
+		md2_models[i].glpatch = NULL;
 		md2_models[i].skin = -1;
+		md2_models[s].notexturefile = false;
+		md2_models[s].noblendfile = false;
 		md2_models[i].notfound = true;
 		md2_models[i].error = false;
 	}
@@ -529,21 +553,10 @@ void HWR_InitMD2(void)
 	}
 	while (fscanf(f, "%19s %31s %f %f", name, filename, &scale, &offset) == 4)
 	{
-		/*if (stricmp(name, "PLAY") == 0)
-		{
-			CONS_Printf("MD2 for sprite PLAY detected in mdls.dat, use a player skin instead!\n");
-			continue;
-		}*/
-		// 8/1/19: Allow PLAY to load for default MD2.
-
 		for (i = 0; i < NUMSPRITES; i++)
 		{
 			if (stricmp(name, sprnames[i]) == 0)
 			{
-				//if (stricmp(name, "PLAY") == 0)
-					//continue;
-
-				//CONS_Debug(DBG_RENDER, "  Found: %s %s %f %f\n", name, filename, scale, offset);
 				md2_models[i].scale = scale;
 				md2_models[i].offset = offset;
 				md2_models[i].notfound = false;
@@ -556,7 +569,6 @@ void HWR_InitMD2(void)
 		{
 			if (stricmp(name, skins[s].name) == 0)
 			{
-				//CONS_Printf("  Found: %s %s %f %f\n", name, filename, scale, offset);
 				md2_playermodels[s].skin = s;
 				md2_playermodels[s].scale = scale;
 				md2_playermodels[s].offset = offset;
@@ -605,7 +617,7 @@ void HWR_AddPlayerMD2(int skin, boolean local) // For MD2's that were added afte
 	// 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, ( (local) ? localskins : skins )[skin].name) == 0)
+		if (stricmp(name, K_GetSkinArray(local)[skin].name) == 0)
 		{
 			md2s[skin].skin = skin;
 			md2s[skin].scale = scale;
@@ -680,11 +692,14 @@ spritemd2found:
 #define SETBRIGHTNESS(brightness,r,g,b) \
 	brightness = (UINT8)(((1063*(UINT32)(r))/5000) + ((3576*(UINT32)(g))/5000) + ((361*(UINT32)(b))/5000))
 
-static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, GLMipmap_t *grmip, INT32 skinnum, skincolors_t color)
+static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMipmap_t *glMipmap, INT32 skinnum, skincolors_t color)
 {
+	GLPatch_t *hwrPatch = gpatch->hardware;
+	GLPatch_t *hwrBlendPatch = blendgpatch->hardware;
 	UINT16 w = gpatch->width, h = gpatch->height;
 	UINT32 size = w*h;
 	RGBA_t *image, *blendimage, *cur, blendcolor;
+	RGBA_t *palette = HWR_GetTexturePalette();
 	UINT8 translation[17]; // First the color index
 	UINT8 cutoff[17]; // Brightness cutoff before using the next color
 	UINT8 translen = 0;
@@ -692,32 +707,32 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
 	UINT8 colorbrightnesses[17];
 	UINT8 color_match_lookup[256]; // optimization attempt
 
-	blendcolor = V_GetColor(0); // initialize
+	blendcolor = palette[0]; // initialize
 	memset(translation, 0, sizeof(translation));
 	memset(cutoff, 0, sizeof(cutoff));
 
-	if (grmip->width == 0)
+	if (glMipmap->width == 0)
 	{
-		grmip->width = gpatch->width;
-		grmip->height = gpatch->height;
+		glMipmap->width = gpatch->width;
+		glMipmap->height = gpatch->height;
 
 		// no wrap around, no chroma key
-		grmip->flags = 0;
+		glMipmap->flags = 0;
 		// setup the texture info
-		grmip->format = GL_TEXFMT_RGBA;
+		glMipmap->format = GL_TEXFMT_RGBA;
 	}
 
-	if (grmip->data)
+	if (glMipmap->data)
 	{
-		Z_Free(grmip->data);
-		grmip->data = NULL;
+		Z_Free(glMipmap->data);
+		glMipmap->data = NULL;
 	}
 
-	cur = Z_Malloc(size*4, PU_HWRCACHE, &grmip->data);
+	cur = Z_Malloc(size*4, PU_HWRMODELTEXTURE, &glMipmap->data);
 	memset(cur, 0x00, size*4);
 
-	image = gpatch->mipmap->data;
-	blendimage = blendgpatch->mipmap->data;
+	image = hwrPatch->mipmap->data;
+	blendimage = hwrBlendPatch->mipmap->data;
 
 	// TC_METALSONIC includes an actual skincolor translation, on top of its flashing.
 	if (skinnum == TC_METALSONIC)
@@ -771,7 +786,7 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
 
 		for (i = 0; i < translen; i++) // moved from inside the loop to here
 		{
-			RGBA_t tempc = V_GetColor(translation[i]);
+			RGBA_t tempc = palette[translation[i]];
 			SETBRIGHTNESS(colorbrightnesses[i], tempc.s.red, tempc.s.green, tempc.s.blue); // store brightnesses for comparison
 		}
 		// generate lookup table for color brightness matching
@@ -794,10 +809,9 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
 				}
 			}
 		}
-	}
 
-	if (translen > 0)
 		colorbrightnesses[translen] = colorbrightnesses[translen-1];
+	}
 
 	while (size--)
 	{
@@ -949,11 +963,11 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
 					mul = cutoff[firsti] - brightness;
 				}
 
-				blendcolor = V_GetColor(translation[firsti]);
+				blendcolor = palette[translation[firsti]];
 
 				if (mul > 0) // If it's 0, then we only need the first color.
 				{
-					nextcolor = V_GetColor(translation[secondi]);
+					nextcolor = palette[translation[secondi]];
 
 					// Find difference between points
 					r = (INT32)(nextcolor.s.red - blendcolor.s.red);
@@ -1041,29 +1055,40 @@ skippixel:
 
 #undef SETBRIGHTNESS
 
-static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT32 skinnum, const UINT8 *colormap, skincolors_t color)
+static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 skinnum, const UINT8 *colormap, skincolors_t color)
 {
 	// mostly copied from HWR_GetMappedPatch, hence the similarities and comment
-	GLMipmap_t *grmip, *newmip;
+	GLPatch_t *glPatch = patch->hardware;
+	GLMipmap_t *glMipmap, *newMipmap;
 
-	if (colormap == colormaps || colormap == NULL)
+
+	if (blendgpatch == NULL || colormap == colormaps || colormap == NULL)
 	{
 		// Don't do any blending
-		HWD.pfnSetTexture(gpatch->mipmap);
+		GL_SetTexture(glPatch->mipmap);
 		return;
 	}
 
-	// search for the mimmap
+	// search for the Mipmap
 	// skip the first (no colormap translated)
-	for (grmip = gpatch->mipmap; grmip->nextcolormap; )
+	for (glMipmap = glPatch->mipmap; glMipmap->nextcolormap; )
 	{
-		grmip = grmip->nextcolormap;
-		if (grmip->colormap == colormap)
+		glMipmap = glMipmap->nextcolormap;
+
+		if (glMipmap->colormap && glMipmap->colormap->source == colormap)
 		{
-			if (grmip->downloaded && grmip->data)
+			if (glMipmap->downloaded && glMipmap->data)
 			{
-				HWD.pfnSetTexture(grmip); // found the colormap, set it to the correct texture
-				Z_ChangeTag(grmip->data, PU_HWRCACHE_UNLOCKED);
+				if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
+				{
+					M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+					HWR_CreateBlendedTexture(patch, blendgpatch, glMipmap, skinnum, color);
+					GL_UpdateTexture(glMipmap);
+				}
+				else
+					GL_SetTexture(glMipmap); // found the colormap, set it to the correct texture
+
+				Z_ChangeTag(glMipmap->data, PU_HWRMODELTEXTURE_UNLOCKED);
 				return;
 			}
 		}
@@ -1076,26 +1101,28 @@ static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT
 	//              (it have a liste of mipmap)
 	//    this malloc is cleared in HWR_FreeTextureCache
 	//    (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
-	newmip = calloc(1, sizeof (*newmip));
-	if (newmip == NULL)
-		I_Error("%s: Out of memory", "HWR_GetMappedPatch");
-	grmip->nextcolormap = newmip;
-	newmip->colormap = colormap;
+	newMipmap = calloc(1, sizeof (*newMipmap));
+	if (newMipmap == NULL)
+		I_Error("%s: Out of memory", "HWR_GetBlendedTexture");
+	glMipmap->nextcolormap = newMipmap;
 
-	HWR_CreateBlendedTexture(gpatch, blendgpatch, newmip, skinnum, color);
+	newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
+	newMipmap->colormap->source = colormap;
+	M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
 
-	HWD.pfnSetTexture(newmip);
-	Z_ChangeTag(newmip->data, PU_HWRCACHE_UNLOCKED);
+	HWR_CreateBlendedTexture(patch, blendgpatch, newMipmap, skinnum, color);
+
+	GL_SetTexture(newMipmap);
+	Z_ChangeTag(newMipmap->data, PU_HWRMODELTEXTURE_UNLOCKED);
 }
 
-
 // -----------------+
 // HWR_DrawMD2      : Draw MD2
 //                  :
 // Returns          :
 // -----------------+
 
-void HWR_DrawMD2(gr_vissprite_t *spr)
+void HWR_DrawMD2(gl_vissprite_t *spr)
 {
 	md2_t *md2;
 
@@ -1105,7 +1132,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 	FTransform p;
 	FSurfaceInfo Surf;
 
-	if (!cv_grmdls.value)
+	if (!cv_glmdls.value)
 		return;
 
 	if (spr->precip)
@@ -1119,7 +1146,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 	{
 		sector_t *sector = spr->mobj->subsector->sector;
 		extracolormap_t *colormap = sector->extra_colormap;
-		UINT8 lightlevel = 255;
+		INT32 lightlevel = 255;
 
 		if (sector->numlights)
 		{
@@ -1128,7 +1155,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 			light = R_GetPlaneLight(sector, spr->mobj->z + spr->mobj->height, false); // Always use the light at the top instead of whatever I was doing before
 
 			if (!(spr->mobj->frame & FF_FULLBRIGHT))
-				lightlevel = *sector->lightlist[light].lightlevel > 255 ? 255 : *sector->lightlist[light].lightlevel;
+				lightlevel = *sector->lightlist[light].lightlevel;
 
 			if (sector->lightlist[light].extra_colormap)
 				colormap = sector->lightlist[light].extra_colormap;
@@ -1136,13 +1163,15 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 		else
 		{
 			if (!(spr->mobj->frame & FF_FULLBRIGHT))
-				lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel;
+				lightlevel = sector->lightlevel;
 
 			if (sector->extra_colormap)
 				colormap = sector->extra_colormap;
 		}
 
-		HWR_Lighting(&Surf, lightlevel, colormap);
+		HWR_ObjectLightLevelPost(spr, sector, &lightlevel, true);
+
+		HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !(spr->mobj->frame & FF_FULLBRIGHT));
 	}
 	else
 	{
@@ -1151,7 +1180,8 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 
 	// Look at HWR_ProjectSprite for more
 	{
-		GLPatch_t *gpatch;
+		patch_t *gpatch, *blendgpatch;
+		GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
 		INT32 durs = spr->mobj->state->tics;
 		INT32 tics = spr->mobj->tics;
 		//mdlframe_t *next = NULL;
@@ -1160,11 +1190,9 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 		spritedef_t *sprdef;
 		spriteframe_t *sprframe;
 		spriteinfo_t *sprinfo;
-		INT32 rollfactor = 0;
-		angle_t ang;
 		interpmobjstate_t interp;
 
-		if (R_UsingFrameInterpolation() && !paused && (!cv_grmaxinterpdist.value || R_QuickCamDist(spr->mobj->x, spr->mobj->y) < cv_grmaxinterpdist.value))
+		if (R_UsingFrameInterpolation() && !paused && R_CheckInterpDist(spr->mobj))
 		{
 			R_InterpolateMobjState(spr->mobj, rendertimefrac, &interp);
 		}
@@ -1179,16 +1207,37 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 		//if (tics > durs)
 			//durs = tics;
 
-		if (spr->mobj->flags2 & MF2_SHADOW)
-			Surf.PolyColor.s.alpha = 0x40;
-		else if (spr->mobj->frame & FF_TRANSMASK)
-			HWR_TranstableToAlpha((spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf);
+		INT32 blendmode;
+		if (spr->mobj->frame & FF_BLENDMASK)
+			blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
 		else
-			Surf.PolyColor.s.alpha = 0xFF;
+			blendmode = spr->mobj->blendmode;
+
+		blendmode = min(AST_MODULATE, blendmode);
+
+		if (spr->mobj->flags2 & MF2_SHADOW)
+		{
+			Surf.PolyColor.s.alpha = 0x40;
+			Surf.PolyFlags = HWR_GetBlendModeFlag(blendmode);
+		}
+		else if (spr->mobj->frame & FF_TRANSMASK)
+		{
+			HWR_TranstableToAlpha((spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf);
+			Surf.PolyFlags = HWR_SurfaceBlend(blendmode, (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf);
+		}
+		else
+		{
+			// this hack is dumb, but the blendmodes refuse to work otherwise
+			Surf.PolyColor.s.alpha = (blendmode == AST_TRANSLUCENT) ? 0xFF : 0xFE;
+			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);
 
 		// dont forget to enabled the depth test because we can't do this like
 		// before: polygons models are not sorted
-		
+
 		/* fuck you */
 		if (spr->mobj->localskin)
 		{
@@ -1200,7 +1249,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 			else
 			{
 				md2s = md2_playermodels;
-				skinnum = (skin_t *)spr->mobj->localskin -      skins;
+				skinnum = (skin_t *)spr->mobj->localskin - skins;
 			}
 		}
 		else
@@ -1225,6 +1274,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 
 		if (md2->error)
 			return; // we already failed loading this before :(
+
 		if (!md2->model)
 		{
 			CONS_Debug(DBG_RENDER, "Loading model... (%s, %s)", sprnames[spr->mobj->sprite], md2->filename);
@@ -1234,7 +1284,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 			if (md2->model)
 			{
 				md2_printModelInfo(md2->model);
-				HWD.pfnCreateModelVBOs(md2->model);
+				GL_CreateModelVBOs(md2->model);
 			}
 			else
 			{
@@ -1243,23 +1293,41 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 				return;
 			}
 		}
-		//Hurdler: arf, I don't like that implementation at all... too much crappy
-		gpatch = md2->grpatch;
-		if (!gpatch || ((!gpatch->mipmap->format || !gpatch->mipmap->downloaded) && !gpatch->notfound))
-			md2_loadTexture(md2);
-		gpatch = md2->grpatch; // Load it again, because it isn't being loaded into gpatch after md2_loadtexture...
 
-		if ((gpatch && gpatch->mipmap->format) // don't load the blend texture if the base texture isn't available
-			&& (!md2->blendgrpatch
-			|| ((!((GLPatch_t *)md2->blendgrpatch)->mipmap->format || !((GLPatch_t *)md2->blendgrpatch)->mipmap->downloaded)
-			&& !((GLPatch_t *)md2->blendgrpatch)->notfound)))
+		//Hurdler: arf, I don't like that implementation at all... too much crappy
+		gpatch = md2->glpatch;
+		if (gpatch)
+			hwrPatch = ((GLPatch_t *)gpatch->hardware);
+
+		if (!gpatch || !hwrPatch
+		|| ((!hwrPatch->mipmap->format || !hwrPatch->mipmap->downloaded) && !md2->notexturefile))
+			md2_loadTexture(md2);
+
+		// Load it again, because it isn't being loaded into gpatch after md2_loadtexture...
+		gpatch = md2->glpatch;
+		if (gpatch)
+			hwrPatch = ((GLPatch_t *)gpatch->hardware);
+
+		// Load blend texture
+		blendgpatch = md2->blendglpatch;
+		if (blendgpatch)
+			hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
+
+		if ((gpatch && hwrPatch && hwrPatch->mipmap->format) // don't load the blend texture if the base texture isn't available
+			&& (!blendgpatch || !hwrBlendPatch
+			|| ((!hwrBlendPatch->mipmap->format || !hwrBlendPatch->mipmap->downloaded) && !md2->noblendfile)))
 			md2_loadBlendTexture(md2);
 
-		if (gpatch && gpatch->mipmap->format) // else if meant that if a texture couldn't be loaded, it would just end up using something else's texture
+		// Load it again, because it isn't being loaded into blendgpatch after md2_loadblendtexture...
+		blendgpatch = md2->blendglpatch;
+		if (blendgpatch)
+			hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
+
+		if (gpatch && hwrPatch && hwrPatch->mipmap->format) // else if meant that if a texture couldn't be loaded, it would just end up using something else's texture
 		{
 			if ((skincolors_t)spr->mobj->color != SKINCOLOR_NONE &&
-				md2->blendgrpatch && ((GLPatch_t *)md2->blendgrpatch)->mipmap->format
-				&& gpatch->width == ((GLPatch_t *)md2->blendgrpatch)->width && gpatch->height == ((GLPatch_t *)md2->blendgrpatch)->height)
+				blendgpatch && hwrBlendPatch->mipmap->format
+				&& gpatch->width == blendgpatch->width && gpatch->height == blendgpatch->height)
 			{
 				INT32 tcskinnum = TC_DEFAULT;
 				if ((spr->mobj->flags & MF_BOSS) && (spr->mobj->flags2 & MF2_FRET) && (leveltime & 1)) // Bosses "flash"
@@ -1279,24 +1347,24 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 							tcskinnum = TC_RAINBOW;
 						else
 						{
-							tcskinnum = (INT32)((skin_t*)( (spr->mobj->localskin) ? spr->mobj->localskin : spr->mobj->skin ) - ( (spr->mobj->skinlocal) ? localskins : skins ));
+							tcskinnum = (INT32)(K_GetMobjSkinNum(K_GetMobjSkin(spr->mobj), spr->mobj->skinlocal));
 						}
 					}
 					else tcskinnum = TC_DEFAULT;
 				}
-				HWR_GetBlendedTexture(gpatch, (GLPatch_t *)md2->blendgrpatch, tcskinnum, spr->colormap, (skincolors_t)spr->mobj->color);
+
+				HWR_GetBlendedTexture(gpatch, blendgpatch, tcskinnum, spr->colormap, (skincolors_t)spr->mobj->color);
 			}
 			else
 			{
 				// This is safe, since we know the texture has been downloaded
-				HWD.pfnSetTexture(gpatch->mipmap);
+				GL_SetTexture(hwrPatch->mipmap);
 			}
 		}
 		else
 		{
 			// Sprite
-			gpatch = spr->gpatch; //gpatch = W_CachePatchNum(spr->patchlumpnum, PU_CACHE);
-			HWR_GetMappedPatch(gpatch, spr->colormap);
+			HWR_GetMappedPatch(spr->gpatch, spr->colormap);
 		}
 
 		if (spr->mobj->frame & FF_ANIMATE)
@@ -1313,7 +1381,7 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 		// Interpolate the model interpolation. (lol)
 		tics -= FixedToFloat(rendertimefrac);
 
-		if (cv_grmdls.value == 1 && tics <= durs)
+		if (cv_glmdls.value == 1 && tics <= durs)
 		{
 			// frames are handled differently for states with FF_ANIMATE, so get the next frame differently for the interpolation
 			if (spr->mobj->frame & FF_ANIMATE)
@@ -1340,13 +1408,13 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 		p.x = FIXED_TO_FLOAT(interp.x);
 		p.y = FIXED_TO_FLOAT(interp.y)+md2->offset;
 
-		if (spr->mobj->eflags & MFE_VERTICALFLIP)
+		if (flip)
 			p.z = FIXED_TO_FLOAT(interp.z + spr->mobj->height);
 		else
 			p.z = FIXED_TO_FLOAT(interp.z);
 
-		if (spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
-			sprdef = &((skin_t *)( (spr->mobj->localskin) ? spr->mobj->localskin : spr->mobj->skin ))->spritedef;
+		if ((spr->mobj->skin || spr->mobj->localskin) && spr->mobj->sprite == SPR_PLAY)
+			sprdef = &K_GetMobjSkin(spr->mobj)->spritedef;
 		else
 			sprdef = &sprites[spr->mobj->sprite];
 
@@ -1363,112 +1431,59 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 			const fixed_t anglef = AngleFixed((R_PointToAngle(interp.x, interp.y))-ANGLE_180);
 			p.angley = FIXED_TO_FLOAT(anglef);
 		}
-		
-		p.rollangle = 0.0f;
-		p.rollflip = 1;
-		p.rotaxis = 0;
-		
-		p.spritexscale = FIXED_TO_FLOAT(spr->mobj->spritexscale);
-		p.spriteyscale = FIXED_TO_FLOAT(spr->mobj->spriteyscale);
-		
-		angle_t sliptideroll = 0;
 
-		if (spr->mobj->player)
-			sliptideroll = ((cv_sloperoll.value && cv_sliptideroll.value) ? spr->mobj->player->sliproll : 0);
+		const angle_t sliptideroll = ((cv_sliptideroll.value && spr->mobj->player) ? spr->mobj->player->sliproll : 0);
+		const SINT8 flipfactor = flip ? -1 : 1;
 
-		if ((spr->mobj->rollangle)||(sliptideroll && cv_sliptideroll.value))
+		if (spr->mobj->rollangle || sliptideroll)
 		{
-			angle_t rollang = 0;
-			rollfactor = ((spr->mobj->rollmodel == true) ? 1 : 0);
+			angle_t rollang = sliptideroll
+			? (spr->mobj->rollangle) + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])
+			: (spr->mobj->rollangle);
+
+			rollang *= flipfactor;
 
-			rollang = (spr->mobj->player && sliptideroll && cv_sliptideroll.value)
-            ? (spr->mobj->rollangle * rollfactor) + (sliptideroll * spr->mobj->player->sliptidemem)
-            : (spr->mobj->rollangle * rollfactor);
-			
 			fixed_t anglef = AngleFixed(rollang);
-			p.rollangle = FIXED_TO_FLOAT(anglef);
-			p.rollmodel = (spr->mobj->rollmodel);
-			p.roll = true;
 
-			// rotation pivot
-			p.centerx = FIXED_TO_FLOAT(spr->mobj->radius/2)*(p.spritexscale);
-			p.centery = FIXED_TO_FLOAT(spr->mobj->height/2)*(p.spriteyscale);
+			p.rollangle = 0.0f;
 
-			// rotation axis
-			if (sprinfo->available)
-				p.rotaxis = (UINT8)(sprinfo->pivot[(spr->mobj->frame & FF_FRAMEMASK)].rotaxis);
+			if (anglef)
+			{
+				fixed_t camAngleDiff = AngleFixed(viewangle) - FLOAT_TO_FIXED(p.angley); // dumb reconversion back, I know
 
-			// for NiGHTS specifically but should work everywhere else
-			ang = R_PointToAngle (spr->mobj->x, spr->mobj->y) - (spr->mobj->player ? spr->mobj->player->frameangle : spr->mobj->angle);
-			if ((sprframe->rotate & SRF_RIGHT) && (ang < ANGLE_180)) // See from right
-				p.rollflip = 1;
-			else if ((sprframe->rotate & SRF_LEFT) && (ang >= ANGLE_180)) // See from left
-				p.rollflip = -1;
+				p.rollangle = FIXED_TO_FLOAT(anglef);
+				p.roll = true;
+
+				// rotation pivot
+				if (sprinfo->available)
+				{
+					p.centerx = FIXED_TO_FLOAT(sprinfo->pivot[frame].x);
+					p.centery = FIXED_TO_FLOAT(sprinfo->pivot[frame].y);
+				}
+				else
+				{
+					p.centerx = FIXED_TO_FLOAT(spr->mobj->radius/2);
+					p.centery = FIXED_TO_FLOAT(spr->mobj->height/2);
+				}
+
+				// rotation axes relative to camera
+				p.rollx = FIXED_TO_FLOAT(FINECOSINE(FixedAngle(camAngleDiff) >> ANGLETOFINESHIFT));
+				p.rollz = FIXED_TO_FLOAT(FINESINE(FixedAngle(camAngleDiff) >> ANGLETOFINESHIFT));
+			}
 		}
 
-		
-		p.anglex = 0.0f;
-		p.anglex2 = 0.0f;
-#ifdef USE_FTRANSFORM_ANGLEZ
-		// Slope rotation from Kart
-		p.anglez = 0.0f;
-		p.anglez2 = 0.0f;
-
-		// use secondary angles for the slope rotation
-		if (spr->mobj->standingslope)
-		{
-			fixed_t tempz = spr->mobj->standingslope->normal.z;
-			fixed_t tempy = spr->mobj->standingslope->normal.y;
-			fixed_t tempx = spr->mobj->standingslope->normal.x;
-			fixed_t tempangle = AngleFixed(R_PointToAngle2(0, 0, FixedSqrt(FixedMul(tempy, tempy) + FixedMul(tempz, tempz)), tempx));
-			p.anglez2 = FIXED_TO_FLOAT(tempangle);
-			tempangle = -AngleFixed(R_PointToAngle2(0, 0, tempz, tempy));
-			p.anglex2 = FIXED_TO_FLOAT(tempangle);
-		}
-		else if ((spr->mobj->sloperoll || spr->mobj->slopepitch) && (!P_IsObjectOnGround(spr->mobj)) && (!paused))
-		{
-			SINT8 flipfactor = flip ? -1 : 1;
-
-			angle_t camang = R_PointToAngle(interp.x, interp.y);
-			angle_t mobjang;
-
-			if (spr->mobj->flags & (MF_NOTHINK|MF_SCENERY))
-				mobjang = spr->mobj->angle;
-			else
-				mobjang = interp.angle;
-
-			angle_t fmoang;
-			fmoang = camang - mobjang;
-
-			// slopepitch
-			p.anglex += flipfactor*FIXED_TO_FLOAT( AngleFixed(FixedMul(FINESINE((camang-fmoang) >> ANGLETOFINESHIFT), interp.slopepitch)) );
-			p.anglez -= flipfactor*FIXED_TO_FLOAT( AngleFixed(FixedMul(FINECOSINE((camang-fmoang) >> ANGLETOFINESHIFT), interp.slopepitch)) );
-
-			// sloperoll
-			p.anglex += flipfactor*FIXED_TO_FLOAT( AngleFixed(FixedMul(FINECOSINE((camang-fmoang) >> ANGLETOFINESHIFT), interp.sloperoll)) );
-			p.anglez += flipfactor*FIXED_TO_FLOAT( AngleFixed(FixedMul(FINESINE((camang-fmoang) >> ANGLETOFINESHIFT), interp.sloperoll)) );
-			p.roll = true;
-		}
+		// slope pitch and roll
+		p.anglex += flipfactor*FIXED_TO_FLOAT(AngleFixed(interp.sloperoll));
+		p.anglez -= flipfactor*FIXED_TO_FLOAT(AngleFixed(interp.slopepitch));
 
 		// pitch and roll
-		if (interp.roll || interp.pitch)
-		{
-			SINT8 flipfactor = flip ? -1 : 1;
-			p.anglex += flipfactor*FIXED_TO_FLOAT(AngleFixed(interp.roll));
-			p.anglez -= flipfactor*FIXED_TO_FLOAT(AngleFixed(interp.pitch));
-			p.roll = true;
-		}
-#endif
+		p.anglex += flipfactor*FIXED_TO_FLOAT(AngleFixed(interp.roll));
+		p.anglez -= flipfactor*FIXED_TO_FLOAT(AngleFixed(interp.pitch));
 
-		p.flip = atransform.flip;
-#ifdef USE_FTRANSFORM_MIRROR
-		p.mirror = atransform.mirror; // from Kart
-#endif
+		p.fliptype = atransform.fliptype;
 
-		HWD.pfnSetShader(SHADER_MODEL);	// model shader
+		GL_SetShader(SHADER_MODEL);	// model shader
 		{
-			SINT8 flipfactor = flip ? -1 : 1;
-			
 			float this_scale = FIXED_TO_FLOAT(interp.scale);
 
 			float xs = this_scale * FIXED_TO_FLOAT(interp.spritexscale);
@@ -1478,11 +1493,11 @@ void HWR_DrawMD2(gr_vissprite_t *spr)
 			float oy = ys * flipfactor*FIXED_TO_FLOAT(interp.spriteyoffset);
 
 			// offset perpendicular to the camera angle
-			p.x -= ox * gr_viewsin;
-			p.y += ox * gr_viewcos;
+			p.x -= ox * gl_viewsin;
+			p.y += ox * gl_viewcos;
 			p.z += oy;
 
-			HWD.pfnDrawModel(md2->model, frame, durs, tics, nextFrame, &p, md2->scale * xs, md2->scale * ys, flip, hflip, &Surf);
+			GL_DrawModel(md2->model, frame, durs, tics, nextFrame, &p, md2->scale * xs, md2->scale * ys, flip, hflip, &Surf);
 		}
 	}
 }
diff --git a/src/hardware/hw_md2.h b/src/hardware/hw_md2.h
index 7b58a6f97..014638f56 100644
--- a/src/hardware/hw_md2.h
+++ b/src/hardware/hw_md2.h
@@ -15,6 +15,10 @@
 #ifndef _HW_MD2_H_
 #define _HW_MD2_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "hw_glob.h"
 #include "hw_model.h"
 
@@ -28,8 +32,10 @@ typedef struct
 	float       scale;
 	float       offset;
 	model_t     *model;
-	void        *grpatch;
-	void        *blendgrpatch;
+	void        *glpatch;
+	boolean     notexturefile; // true if texture file was not found
+	void        *blendglpatch;
+	boolean     noblendfile; // true if blend texture file was not found
 	boolean     notfound;
 	INT32       skin;
 	boolean     error;
@@ -40,8 +46,12 @@ extern md2_t md2_playermodels[MAXSKINS];
 extern md2_t md2_localplayermodels[MAXLOCALSKINS];
 
 void HWR_InitMD2(void);
-void HWR_DrawMD2(gr_vissprite_t *spr);
+void HWR_DrawMD2(gl_vissprite_t *spr);
 void HWR_AddPlayerMD2(INT32 skin, boolean local);
 void HWR_AddSpriteMD2(size_t spritenum);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // _HW_MD2_H_
diff --git a/src/hardware/hw_portal.c b/src/hardware/hw_portal.c
new file mode 100644
index 000000000..db17d05bf
--- /dev/null
+++ b/src/hardware/hw_portal.c
@@ -0,0 +1,233 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2024 by Kart Krew.
+// Copyright (C) 2020 by Sonic Team Junior.
+// Copyright (C) 2000 by DooM Legacy Team.
+// Copyright (C) 1996 by id Software, Inc.
+//
+// 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  hw_portal.c
+/// \brief OpenGL renderer portals.
+
+// ==========================================================================
+// Visual portals (attr. Hannu Hanhi)
+// ==========================================================================
+
+#ifdef HWRENDER
+
+#include "../r_portal.h"
+
+#include "../z_zone.h"
+
+#include "hw_clip.h"
+#include "hw_gl.h"
+#include "hw_defs.h"
+#include "hw_main.h"
+#include "hw_portal.h"
+
+SINT8 gl_portal_state = GLPORTAL_OFF;
+
+gl_portallist_t *currentportallist;
+
+// clip the area outside the portal destination window
+void HWR_PortalClipping(gl_portal_t *portal)
+{
+	gld_clipper_SafeAddClipRange(portal->angle1, portal->angle2);
+}
+
+static gl_portal_t* HWR_Portal_Add (seg_t *seg)
+{
+	gl_portal_t *portal = Z_Malloc(sizeof(gl_portal_t), PU_STATIC, NULL);
+
+	// Linked list.
+	if (!currentportallist->base)
+	{
+		currentportallist->base = portal;
+		currentportallist->cap  = portal;
+	}
+	else
+	{
+		currentportallist->cap->next = portal;
+		currentportallist->cap = portal;
+	}
+	portal->next = NULL;
+
+	portal->seg = seg;
+
+	return portal;
+}
+
+void HWR_FreePortalList(gl_portallist_t freelist)
+{
+	portalcullsector = NULL;
+
+	// free memory from portal list allocated by calls to Add2Lines
+	gl_portal_t *gl_portal_temp = freelist.base;
+
+	while (gl_portal_temp)
+	{
+		gl_portal_t *nextportal = gl_portal_temp->next;
+		Z_Free(gl_portal_temp);
+		gl_portal_temp = nextportal;
+	}
+}
+
+void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg)
+{
+	gl_portal_t *portal = HWR_Portal_Add(seg);
+
+	// Offset the portal view by the linedef centers
+	line_t* start	= &lines[line1];
+	line_t* dest	= &lines[line2];
+
+	angle_t dangle = R_PointToAngle2(0, 0, dest->dx, dest->dy) - R_PointToAngle2(start->dx, start->dy, 0, 0);
+
+	fixed_t disttopoint;
+	angle_t angtopoint;
+
+	vertex_t dest_c, start_c;
+
+	// looking glass center
+	start_c.x = start->v1->x/2 + start->v2->x/2;
+	start_c.y = start->v1->y/2 + start->v2->y/2;
+
+	// other side center
+	dest_c.x = dest->v1->x/2 + dest->v2->x/2;
+	dest_c.y = dest->v1->y/2 + dest->v2->y/2;
+
+	disttopoint = R_PointToDist2(start_c.x, start_c.y, viewx, viewy);
+	angtopoint = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy);
+	angtopoint += dangle;
+
+	portal->viewx = dest_c.x + FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
+	portal->viewy = dest_c.y + FixedMul(FINESINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
+	portal->viewz = viewz + dest->frontsector->floorheight - start->frontsector->floorheight;
+	portal->viewangle = viewangle + dangle;
+
+	portal->angle1 = R_PointToAngle64(seg->v1->x, seg->v1->y) + dangle;
+	portal->angle2 = R_PointToAngle64(seg->v2->x, seg->v2->y) + dangle;
+
+	portal->clipline = line2;
+}
+
+void HWR_PortalFrame(gl_portal_t* portal)
+{
+	viewx = portal->viewx;
+	viewy = portal->viewy;
+	viewz = portal->viewz;
+
+	viewangle = portal->viewangle;
+	//viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
+	//viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
+
+	if (portal->clipline != -1)
+	{
+		portalclipline = &lines[portal->clipline];
+		portalcullsector = viewsector = portalclipline->frontsector;
+	}
+	else
+	{
+		portalclipline = NULL;
+		portalcullsector = NULL;
+		viewsector = R_PointInSubsectorFast(viewx, viewy)->sector;
+	}
+}
+
+// Renders a portal segment.
+static void HWR_RenderPortalSeg(gl_portal_t* portal, SINT8 state)
+{
+	gl_drawing_stencil = true; // do not draw outside of the stencil buffer, idiot.
+
+	// set our portal state and prepare to render the seg
+	HWR_SetPortalState(state);
+
+	gl_curline = portal->seg;
+	gl_frontsector = portal->seg->frontsector;
+	gl_backsector  = portal->seg->backsector;
+
+	HWR_ProcessSeg();
+	gl_drawing_stencil = false;
+
+	// need to work around the r_opengl PF_Invisible bug with this call
+	// similarly as in the linkdraw hack in HWR_DrawSprites
+	GL_SetBlend(PF_Translucent|PF_Occlude|PF_Masked);
+}
+
+// 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)
+{
+	// draw portal seg to stencil buffer with increment
+	HWR_SetTransform(fpov);
+	HWR_ClearClipper();
+
+	HWR_SetStencilState(HWR_STENCIL_BEGIN, stencil_level);
+	HWR_RenderPortalSeg(portal, GLPORTAL_STENCIL);
+
+	// go to portal frame lmao
+	HWR_PortalFrame(portal);
+	// call HWR_RenderViewpoint
+	HWR_RenderPortalViewpoint(portal, player, stencil_level + 1, true);
+	// return to current frame
+	if (rootportal)
+		HWR_PortalFrame(rootportal);
+	else // current frame is not a portal frame but the main view!
+	{
+		R_SetupFrame(viewssnum, false);
+		portalclipline = NULL;
+	}
+
+	// remove portal seg from stencil buffer
+	HWR_SetTransform(fpov);
+	HWR_ClearClipper();
+
+	HWR_SetStencilState(HWR_STENCIL_REVERSE, stencil_level);
+	HWR_RenderPortalSeg(portal, GLPORTAL_STENCIL);
+
+	// draw portal seg to depth buffer
+	HWR_ClearClipper();
+	HWR_SetStencilState(HWR_STENCIL_DEPTH, stencil_level);
+	HWR_RenderPortalSeg(portal, GLPORTAL_DEPTH);
+}
+
+// returns true if the point is on the correct (viewable) side of the
+// portal destination line
+boolean HWR_PortalCheckPointSide(fixed_t x, fixed_t y)
+{
+	// we are checking if the point is on the viewable side of the portal exit.
+	// being exactly on the portal exit line is not enough to pass the test.
+	// P_PointOnLineSide could behave differently from this expectation on this case,
+	// so first check if the point is precisely on the line, and then if not, check the side.
+
+	vertex_t closest_point;
+
+	P_ClosestPointOnLine(x, y, portalclipline, &closest_point);
+
+	if (closest_point.x != x || closest_point.y != y)
+	{
+		if (P_PointOnLineSide(x, y, portalclipline) != 1)
+			return true;
+	}
+	return false;
+}
+
+boolean HWR_PortalCheckBBox(const fixed_t *bspcoord)
+{
+	if (!portalclipline)
+		return true;
+
+	if (HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXTOP]) ||
+		HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]) ||
+		HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXTOP]) ||
+		HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]))
+	{
+		return true;
+	}
+
+	// we did not find any reason to pass the check, so return failure
+	return false;
+}
+
+#endif
diff --git a/src/hardware/hw_portal.h b/src/hardware/hw_portal.h
new file mode 100644
index 000000000..494110d79
--- /dev/null
+++ b/src/hardware/hw_portal.h
@@ -0,0 +1,89 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-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  hw_portal.h
+/// \brief OpenGL renderer portal struct, functions, linked list extern.
+
+#ifndef __HW_PORTAL__
+#define __HW_PORTAL__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef HWRENDER
+
+#include "../doomstat.h"
+#include "../r_data.h"
+#include "../r_bsp.h"
+
+/** Portal structure.
+ */
+enum
+{
+	GLPORTAL_OFF,
+	GLPORTAL_SEARCH,
+	GLPORTAL_STENCIL,
+	GLPORTAL_DEPTH,
+	GLPORTAL_INSIDE,
+};
+
+typedef struct gl_portal_s
+{
+	struct gl_portal_s *next;
+
+	// Viewport.
+	fixed_t viewx;
+	fixed_t viewy;
+	fixed_t viewz;
+	angle_t viewangle;
+
+	seg_t *seg; 		// seg that is used for drawing to the stencil buffer
+	INT32 clipline;		// Optional clipline for line-based portals
+
+	// angles for the left and right edges of the portal
+	// relative to the viewpoint
+	angle_t angle1;
+	angle_t angle2;
+} gl_portal_t;
+
+typedef struct gl_portallist_s
+{
+	gl_portal_t *base;
+	gl_portal_t *cap;
+} gl_portallist_t;
+
+extern SINT8 gl_portal_state;
+
+// new thing
+extern gl_portallist_t *currentportallist;
+
+static inline void HWR_SetPortalState (SINT8 state)
+{
+	gl_portal_state = state;
+}
+
+// Adds an entry to the clipper for portal rendering
+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_FreePortalList(gl_portallist_t portallist);
+
+boolean HWR_PortalCheckPointSide(fixed_t x, fixed_t y);
+boolean HWR_PortalCheckBBox(const fixed_t *bspcoord);
+
+#endif
+
+#ifdef __cplusplus
+}// extern "C"
+#endif
+#endif
diff --git a/src/hardware/hw_shaders.c b/src/hardware/hw_shaders.c
index b58ca4137..b4041fcae 100644
--- a/src/hardware/hw_shaders.c
+++ b/src/hardware/hw_shaders.c
@@ -13,7 +13,7 @@
 
 #include "hw_main.h"
 #include "hw_glob.h"
-#include "hw_drv.h"
+#include "hw_gl.h"
 #include "hw_shaders.h"
 #include "../z_zone.h"
 
@@ -25,13 +25,10 @@ static struct {
 	const char *vertex;
 	const char *fragment;
 } const gl_shadersources[] = {
-	
+
 	// Floor shader
 	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_FLOOR_FRAGMENT_SHADER},
 
-	// Shadow shader
-	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_SHADOW_FRAGMENT_SHADER},
-
 	// Wall shader
 	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER},
 
@@ -39,7 +36,7 @@ static struct {
 	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER},
 
 	// Model shader
-	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER},
+	{GLSL_MODEL_LIGHTING_VERTEX_SHADER, GLSL_WALL_FRAGMENT_SHADER},
 
 	// Water shader
 	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_WATER_FRAGMENT_SHADER},
@@ -52,7 +49,7 @@ static struct {
 
 	// Palette postprocess shader
 	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_PALETTE_POSTPROCESS_FRAGMENT_SHADER},
-	
+
 	// UI colormap fade shader
 	{GLSL_DEFAULT_VERTEX_SHADER, GLSL_UI_COLORMAP_FADE_FRAGMENT_SHADER},
 
@@ -90,7 +87,7 @@ boolean HWR_InitShaders(void)
 {
 	int i;
 
-	if (!HWD.pfnInitShaders())
+	if (!GL_InitShaders())
 		return false;
 
 	for (i = 0; i < NUMSHADERTARGETS; i++)
@@ -279,11 +276,11 @@ static char *HWR_PreprocessShader(char *original)
 
 	// Calculate length of modified shader.
 	new_len = original_len;
-	
-	if (cv_grpaletterendering.value)
+
+	if (cv_glpaletterendering.value)
 		ADD_TO_LEN(PALETTE_RENDERING_DEFINE)
 
-	if (cv_lightdither.value)
+	if (cv_gllightdither.value)
 		ADD_TO_LEN(LIGHT_DITHERING_DEFINE)
 
 #undef ADD_TO_LEN
@@ -324,10 +321,10 @@ static char *HWR_PreprocessShader(char *original)
 	}
 
 	// Write the defines.
-	if (cv_grpaletterendering.value)
+	if (cv_glpaletterendering.value)
 		WRITE_DEFINE(PALETTE_RENDERING_DEFINE)
 
-	if (cv_lightdither.value)
+	if (cv_gllightdither.value)
 		WRITE_DEFINE(LIGHT_DITHERING_DEFINE)
 
 #undef WRITE_DEFINE
@@ -369,16 +366,16 @@ static void HWR_CompileShader(int index)
 	{
 		char *preprocessed = HWR_PreprocessShader(vertex_source);
 		if (!preprocessed) return;
-		HWD.pfnLoadShader(index, preprocessed, HWD_SHADERSTAGE_VERTEX);
+		GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_VERTEX);
 	}
 	if (fragment_source)
 	{
 		char *preprocessed = HWR_PreprocessShader(fragment_source);
 		if (!preprocessed) return;
-		HWD.pfnLoadShader(index, preprocessed, HWD_SHADERSTAGE_FRAGMENT);
+		GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_FRAGMENT);
 	}
 
-	gl_shaders[index].compiled = HWD.pfnCompileShader(index);
+	gl_shaders[index].compiled = GL_CompileShader(index);
 }
 
 // compile or recompile shaders
@@ -403,17 +400,18 @@ void HWR_CompileShaders(void)
 
 int HWR_GetShaderFromTarget(int shader_target)
 {
-	int custom_shader = gl_shadertargets[shader_target].custom_shader;
-	// use custom shader if following are true
-	// - custom shader exists
-	// - custom shader has been compiled successfully
-	// - custom shaders are enabled
-	// - custom shaders are allowed by the server
-	if (custom_shader != -1 && gl_shaders[custom_shader].compiled &&
-		cv_grshaders.value == 1)
-		return custom_shader;
-	else
-		return gl_shadertargets[shader_target].base_shader;
+	if (cv_glshaders.value == 1)
+	{
+		int custom_shader = gl_shadertargets[shader_target].custom_shader;
+		// use custom shader if following are true
+		// - custom shader exists
+		// - custom shader has been compiled successfully
+		// - custom shaders are enabled
+		if (custom_shader != -1 && gl_shaders[custom_shader].compiled)
+			return custom_shader;
+	}
+
+	return gl_shadertargets[shader_target].base_shader;
 }
 
 static inline UINT16 HWR_FindShaderDefs(UINT16 wadnum)
@@ -432,7 +430,6 @@ static inline UINT16 HWR_FindShaderDefs(UINT16 wadnum)
 customshaderxlat_t shaderxlat[] =
 {
 	{"Flat", SHADER_FLOOR},
-	{"Shadow", SHADER_SHADOW},
 	{"WallTexture", SHADER_WALL},
 	{"Sprite", SHADER_SPRITE},
 	{"Model", SHADER_MODEL},
@@ -499,47 +496,52 @@ static void HWR_TryToCompileShaderWithImplicitVersion(INT32 shader_index, INT32
 	boolean vert_shader_version_exists = HWR_VersionDirectiveExists(vert_shader);
 	boolean frag_shader_version_exists = HWR_VersionDirectiveExists(frag_shader);
 
-	if(!vert_shader_version_exists) {
+	if (!vert_shader_version_exists)
 		CONS_Alert(CONS_WARNING, "HWR_LoadCustomShadersFromFile: vertex shader '%s' is missing a #version directive\n", HWR_GetShaderName(shaderxlat_id));
-	}
 
-	if(!frag_shader_version_exists) {
+	if (!frag_shader_version_exists)
 		CONS_Alert(CONS_WARNING, "HWR_LoadCustomShadersFromFile: fragment shader '%s' is missing a #version directive\n", HWR_GetShaderName(shaderxlat_id));
-	}
 
 	// try to compile as is
 	HWR_CompileShader(shader_index);
+
 	if (gl_shaders[shader_index].compiled)
 		return;
 
 	// try each version directive
-	for(UINT32 i = 0; i < sizeof(version_directives) / sizeof(version_directives[0]); ++i) {
+	for (UINT32 i = 0; i < sizeof(version_directives) / sizeof(version_directives[0]); ++i)
+	{
 		CONS_Alert(CONS_NOTICE, "HWR_TryToCompileShaderWithImplicitVersion: Trying %s\n", version_directives[i]);
 
-		if(!vert_shader_version_exists) {
+		if (!vert_shader_version_exists)
+		{
 			// first time reallocation would have to be made
 
-			if(i == 0) {
+			if (i == 0)
+			{
 				void* old = (void*)gl_shaders[shader_index].vertex;
 				vert_shader = gl_shaders[shader_index].vertex = HWR_PrependVersionDirective(vert_shader, i);
 				Z_Free(old);
-			} else {
-				HWR_ReplaceVersionInplace(vert_shader, i);
 			}
+			else
+				HWR_ReplaceVersionInplace(vert_shader, i);
 		}
 
-		if(!frag_shader_version_exists) {
-			if(i == 0) {
+		if (!frag_shader_version_exists)
+		{
+			if (i == 0)
+			{
 				void* old = (void*)gl_shaders[shader_index].fragment;
 				frag_shader = gl_shaders[shader_index].fragment = HWR_PrependVersionDirective(frag_shader, i);
 				Z_Free(old);
-			} else {
-				HWR_ReplaceVersionInplace(frag_shader, i);
 			}
+			else
+				HWR_ReplaceVersionInplace(frag_shader, i);
 		}
 
 		HWR_CompileShader(shader_index);
-		if (gl_shaders[shader_index].compiled) {
+		if (gl_shaders[shader_index].compiled)
+		{
 			CONS_Alert(CONS_NOTICE, "HWR_TryToCompileShaderWithImplicitVersion: Compiled with %s\n",
 					   version_directives[i]);
 			CONS_Alert(CONS_WARNING, "Implicit GLSL version is used. Correct behavior is not guaranteed\n");
@@ -560,7 +562,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
 	int i;
 	boolean modified_shaders[NUMSHADERTARGETS] = {0};
 
-	if (!gr_shadersavailable)
+	if (!gl_shadersavailable)
 		return;
 
 	lump = HWR_FindShaderDefs(wadnum);
@@ -704,17 +706,20 @@ skip_field:
 		{
 			int shader_index = i + NUMSHADERTARGETS; // index to gl_shaders
 			gl_shadertargets[i].custom_shader = shader_index;
+
 			// if only one stage (vertex/fragment) is defined, the other one
 			// is copied from the base shaders.
 			if (!gl_shaders[shader_index].fragment)
 				gl_shaders[shader_index].fragment = Z_StrDup(gl_shadersources[i].fragment);
+
 			if (!gl_shaders[shader_index].vertex)
 				gl_shaders[shader_index].vertex = Z_StrDup(gl_shadersources[i].vertex);
-			if(!HWR_CheckVersionDirectives(gl_shaders[shader_index].vertex, gl_shaders[shader_index].fragment)) {
+
+			if (!HWR_CheckVersionDirectives(gl_shaders[shader_index].vertex, gl_shaders[shader_index].fragment))
 				HWR_TryToCompileShaderWithImplicitVersion(shader_index, i);
-			} else {
+			else
 				HWR_CompileShader(shader_index);
-			}
+
 			if (!gl_shaders[shader_index].compiled)
 				CONS_Alert(CONS_ERROR, "HWR_LoadCustomShadersFromFile: A compilation error occured for the %s shader in file %s. See the console messages above for more information.\n", shaderxlat[i].type, wadfiles[wadnum]->filename);
 		}
diff --git a/src/hardware/hw_shaders.h b/src/hardware/hw_shaders.h
index 85adb6147..025683c0e 100644
--- a/src/hardware/hw_shaders.h
+++ b/src/hardware/hw_shaders.h
@@ -31,6 +31,31 @@
 		"gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\n" \
 	"}\0"
 
+// reinterpretation of sprite lighting for models
+// it's a combination of how it works for normal sprites & papersprites
+#define GLSL_MODEL_LIGHTING_VERTEX_SHADER \
+	"uniform float lighting;\n" \
+	"uniform vec3 light_dir;\n" \
+	"uniform float light_contrast;\n" \
+	"uniform float light_backlight;\n" \
+	"void main()\n" \
+	"{\n" \
+		"gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * gl_Vertex;\n" \
+		"float light = lighting;\n" \
+		"if (length(light_dir) > 0.000001) {\n" \
+			"mat4 m4 = gl_ProjectionMatrix * gl_ModelViewMatrix;\n" \
+			"mat3 m3 = mat3( m4[0].xyz, m4[1].xyz, m4[2].xyz );\n" \
+			"float extralight = -dot(normalize(gl_Normal * m3), normalize(light_dir));\n" \
+			"extralight *= light_contrast - light_backlight;\n" \
+			"extralight *= lighting / 255.0;\n" \
+			"light += extralight * 2.5;\n" \
+		"}\n" \
+		"light = clamp(light / 255.0, 0.0, 1.0);\n" \
+		"gl_FrontColor = vec4(light, light, light, 1.0);\n" \
+		"gl_TexCoord[0].xy = gl_MultiTexCoord0.xy;\n" \
+		"gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\n" \
+	"}\0"
+
 // ==================
 //  Fragment shaders
 // ==================
@@ -99,6 +124,7 @@
 		GLSL_DOOM_COLORMAP_NODITHER \
 		"#endif\n" \
 	"}\n"
+
 // lighting cap adjustment:
 // first num (155.0), increase to make it start to go dark sooner
 // second num (0.26), increase to make it go dark faster
@@ -171,7 +197,7 @@
 		"gl_FragColor = final_color;\n" \
 	"}\n" \
 	"#endif\0"
-	
+
 #define GLSL_SOFTWARE_FRAGMENT_SHADER_NOPAL \
 	"uniform sampler2D tex;\n" \
 	"uniform vec4 poly_color;\n" \
@@ -194,26 +220,29 @@
 
 // hand tuned adjustments for light level calculation
 #define GLSL_FLOOR_FUDGES \
-	"#version 120\n" \
 	"#define STARTMAP_FUDGE 1.06\n" \
 	"#define SCALE_FUDGE 1.15\n"
 
 #define GLSL_WALL_FUDGES \
-	"#version 120\n" \
 	"#define STARTMAP_FUDGE 1.05\n" \
 	"#define SCALE_FUDGE 2.2\n"
 
 #define GLSL_FLOOR_FRAGMENT_SHADER \
+	"#version 120\n" \
 	GLSL_FLOOR_FUDGES \
 	GLSL_SOFTWARE_FRAGMENT_SHADER
 
+// this is very backwards
+// but we wanna have the game look like vanilla does
+// oh well
 #define GLSL_WALL_FRAGMENT_SHADER \
+	"#version 120\n" \
+	"#ifdef SRB2_PALETTE_RENDERING\n" \
 	GLSL_WALL_FUDGES \
-	GLSL_SOFTWARE_FRAGMENT_SHADER
-	
-#define GLSL_SHADOW_FRAGMENT_SHADER \
+	"#else\n" \
 	GLSL_FLOOR_FUDGES \
-	GLSL_SOFTWARE_FRAGMENT_SHADER_NOPAL
+	"#endif\n" \
+	GLSL_SOFTWARE_FRAGMENT_SHADER
 
 //
 // Water surface shader
@@ -230,6 +259,7 @@
 	"vec4 texel = texture2D(tex, vec2(gl_TexCoord[0].s - sdistort, gl_TexCoord[0].t - cdistort));\n"
 
 #define GLSL_WATER_FRAGMENT_SHADER \
+	"#version 120\n" \
 	GLSL_FLOOR_FUDGES \
 	"const float freq = 0.03;\n" \
 	"const float amp = 0.025;\n" \
@@ -278,6 +308,7 @@
 // The floor fudges are used, but should the wall fudges be used instead? or something inbetween?
 // or separate values for floors and walls? (need to change more than this shader for that)
 #define GLSL_FOG_FRAGMENT_SHADER \
+	"#version 120\n" \
 	GLSL_FLOOR_FUDGES \
 	"uniform vec4 tint_color;\n" \
 	"uniform vec4 fade_color;\n" \
diff --git a/src/hardware/hws_data.h b/src/hardware/hws_data.h
deleted file mode 100644
index b890d976b..000000000
--- a/src/hardware/hws_data.h
+++ /dev/null
@@ -1,123 +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 3D sound definitions
-
-#ifndef __HWS_DATA_H__
-#define __HWS_DATA_H__
-
-#define NORMAL_SEP 128
-
-// abuse?
-#define STATIC_SOURCES_NUM      6       // Total number of static sources
-
-#define MIN_DISTANCE 160.0f
-#define MAX_DISTANCE 1200.0f
-
-typedef struct source_pos_s
-{
-	double   x;
-	double   y;
-	double   z;
-} source_pos_t;
-
-typedef struct source3D_pos_s
-{
-	float   x;
-	float   y;
-	float   z;
-	//float   angle;
-	float   momx;
-	float   momy;
-	float   momz;
-
-} source3D_pos_t;
-
-
-enum {NORMAL_PITCH = 128};
-
-/*typedef struct source2D_data_s
-{
-	INT32     volume;
-	INT32     sep;
-
-} source2D_data_t;*/
-
-
-// General 3D sound source description
-typedef struct source3D_data_s
-{
-	float           min_distance;       //
-	float           max_distance;       //
-	INT32           head_relative;      //
-	INT32           permanent;          //
-	source3D_pos_t  pos;                // source position in 3D
-
-} source3D_data_t;
-
-
-// Sound data
-typedef struct sfx_data_s
-{
-	size_t  length;
-	void    *data;
-	INT32   priority;
-	INT32   sep;                    // Only when source is 2D sound
-} sfx_data_t;
-
-
-// Sound cone (for 3D sources)
-typedef struct cone_def_s
-{
-	float   inner;
-	float   outer;
-	INT32   outer_gain;
-	/*float   f_angle;
-	float   h_angle;*/
-} cone_def_t;
-
-
-typedef struct listener_data_s
-{
-	// Listener position
-	double  x;
-	double  y;
-	double  z;
-
-	// Listener front and head orientation (degrees)
-	double  f_angle;
-	double  h_angle;
-
-	// Listener momentums
-	double  momx;
-	double  momy;
-	double  momz;
-} listener_data_t;
-
-typedef struct snddev_s
-{
-	INT32   sample_rate;
-	INT32   bps;
-	size_t  numsfxs;
-
-// Windows specific data
-#ifdef _WIN32
-	UINT32   cooplevel;
-	HWND    hWnd;
-#endif
-} snddev_t;
-
-#endif //__HWS_DATA_H__
diff --git a/src/hardware/r_opengl/ogl_win.c b/src/hardware/r_opengl/ogl_win.c
index 8ce44d788..31daa22fd 100644
--- a/src/hardware/r_opengl/ogl_win.c
+++ b/src/hardware/r_opengl/ogl_win.c
@@ -28,7 +28,6 @@
 #define RPC_NO_WINDOWS_H
 #include <windows.h>
 #include <time.h>
-#undef GETTEXT
 #include "r_opengl.h"
 
 
@@ -358,8 +357,8 @@ static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode)
 	else
 		textureformatGL = GL_RGB5_A1;
 
-	SetModelView(lvid->width, lvid->height);
-	SetStates();
+	GL_SetModelView(lvid->width, lvid->height);
+	GL_SetStates();
 	// we need to clear the depth buffer. Very important!!!
 	pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 
@@ -526,7 +525,7 @@ EXPORT void HWRAPI(Shutdown) (void)
 // -----------------+
 // FinishUpdate     : Swap front and back buffers
 // -----------------+
-EXPORT void HWRAPI(FinishUpdate) (INT32 waitvbl)
+void GL_FinishUpdate (INT32 waitvbl)
 {
 #ifdef USE_WGL_SWAP
 	static INT32 oldwaitvbl = 0;
@@ -547,23 +546,4 @@ EXPORT void HWRAPI(FinishUpdate) (INT32 waitvbl)
 
 	SwapBuffers(hDC);
 }
-
-
-// -----------------+
-// SetPalette       : Set the color lookup table for paletted textures
-//                  : in OpenGL, we store values for conversion of paletted graphics when
-//                  : they are downloaded to the 3D card.
-// -----------------+
-EXPORT void HWRAPI(SetPalette) (RGBA_t *pal)
-{
-	INT32 i;
-
-	for (i = 0; i < 256; i++)
-	{
-		myPaletteData[i].s.red   = pal[i].s.red;
-		myPaletteData[i].s.green = pal[i].s.green;
-		myPaletteData[i].s.blue  = pal[i].s.blue;
-		myPaletteData[i].s.alpha = pal[i].s.alpha;
-	}
-}
 #endif
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index a7ebc9180..6227c06d0 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -16,26 +16,29 @@
 #define RPC_NO_WINDOWS_H
 #include <windows.h>
 #endif
-#undef GETTEXT
 #ifdef __GNUC__
 #include <unistd.h>
 #endif
 
 #include <stdarg.h>
 #include <math.h>
-#include "../../r_local.h" // For rendertimefrac, used for the leveltime shader uniform
-#include "r_opengl.h"
-#include "r_vbo.h"
-#include "../hw_shaders.h"
-#include "../hw_main.h"
-#include "../hw_clip.h"
 
 // Eeeeh not sure is this right way, but it works < sry :c < sry again it had to go :c
 
-extern fixed_t fovtan; // also extremely bad, I'm just too lazy!!!
-
 #if defined (HWRENDER) && !defined (NOROPENGL)
 
+#include "r_opengl.h"
+#include "r_vbo.h"
+
+#include "../hw_batching.h"
+#include "../hw_clip.h"
+#include "../hw_main.h"
+#include "../hw_shaders.h"
+
+#include "../../f_finale.h"
+#include "../../r_local.h" // For rendertimefrac, used for the leveltime shader uniform
+#include "../../i_video.h"
+
 struct GLRGBAFloat
 {
 	GLfloat red;
@@ -95,21 +98,24 @@ 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
 
-GLint   screen_width    = 0;               // used by Draw2DLine()
-GLint   screen_height   = 0;
-GLbyte  screen_depth    = 0;
-GLint   textureformatGL = 0;
-GLint maximumAnisotropy = 0;
-static GLboolean MipMap = GL_FALSE;
-static GLint min_filter = GL_LINEAR;
-static GLint mag_filter = GL_LINEAR;
+static GLint gltexformat = GL_RGB5_A1;
+GLint   screen_width     = 0;               // used by Draw2DLine()
+GLint   screen_height    = 0;
+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;
+static GLboolean MipMap  = GL_FALSE;
+static GLint min_filter  = GL_LINEAR;
+static GLint mag_filter  = GL_LINEAR;
 static GLint anisotropic_filter = 0;
 boolean supportMipMap = false;
-static FTransform  md2_transform;
 
 const GLubyte *gl_version = NULL;
 const GLubyte *gl_renderer = NULL;
 const GLubyte *gl_extensions = NULL;
+const GLubyte *gl_vendor = NULL;
+GLuint gl_num_extensions;
 
 // Loaded OpenGL version
 int majorGL = 0, minorGL = 0;
@@ -120,12 +126,12 @@ GLfloat projMatrix[16];
 static GLint   viewport[4];
 
 #ifdef USE_FBO_OGL
-static boolean GLFramebuffer_IsFuncAvailible(void);
-
 GLuint FramebufferObject, FramebufferTexture, RenderbufferObject;
-GLboolean FrameBufferEnabled = GL_FALSE, RenderToFramebuffer = GL_FALSE;
 
 boolean supportFBO = false;
+static boolean fboinit = false;
+
+static void GL_Framebuffer_DeleteAttachments(void);
 #endif
 
 // Sryder:	NextTexAvail is broken for these because palette changes or changes to the texture filter or antialiasing
@@ -188,7 +194,7 @@ FUNCPRINTF void GL_DBG_Printf(const char *format, ...)
 
 	if (!gllogstream)
 		gllogstream = fopen("ogllog.txt", "w");
-	
+
 	va_start(arglist, format);
 	vsnprintf(str, 4096, format, arglist);
 	va_end(arglist);
@@ -343,6 +349,8 @@ typedef void (APIENTRY * PFNglDisable) (GLenum cap);
 static PFNglDisable pglDisable;
 typedef void (APIENTRY * PFNglGetFloatv) (GLenum pname, GLfloat *params);
 static PFNglGetFloatv pglGetFloatv;
+typedef void (APIENTRY * PFNglPolygonMode) (GLenum, GLenum);
+static PFNglPolygonMode pglPolygonMode;
 
 /* Depth Buffer */
 typedef void (APIENTRY * PFNglClearDepth) (GLclampd depth);
@@ -491,6 +499,10 @@ static PFNglDeleteBuffers pglDeleteBuffers;
 typedef void    (APIENTRY *PFNglColorPointer)       (GLint, GLenum, GLsizei, const GLvoid*);
 static PFNglColorPointer pglColorPointer;
 
+/* 2.0 functions */
+typedef void (APIENTRY * PFNglBlendEquation) (GLenum mode);
+static PFNglBlendEquation pglBlendEquation;
+
 /* 1.2 Parms */
 /* GL_CLAMP_TO_EDGE_EXT */
 #ifndef GL_CLAMP_TO_EDGE
@@ -538,6 +550,7 @@ boolean SetupGLfunc(void)
 	GETOPENGLFUNC(pglGetFloatv, glGetFloatv)
 	GETOPENGLFUNC(pglGetIntegerv, glGetIntegerv)
 	GETOPENGLFUNC(pglGetString, glGetString)
+	GETOPENGLFUNC(pglPolygonMode, glPolygonMode)
 
 	GETOPENGLFUNC(pglClearDepth, glClearDepth)
 	GETOPENGLFUNC(pglDepthFunc, glDepthFunc)
@@ -663,7 +676,10 @@ typedef enum
 	gluniform_lighting,
 	gluniform_fade_start,
 	gluniform_fade_end,
-	
+	gluniform_light_dir,
+	gluniform_light_contrast,
+	gluniform_light_backlight,
+
 	// palette rendering
 	gluniform_palette_tex, // 1d texture containing a palette
 	gluniform_palette_lookup_tex, // 3d texture containing the rgb->index lookup table
@@ -673,7 +689,7 @@ typedef enum
 	gluniform_leveltime,
 
 	gluniform_scr_resolution,
-	
+
 	gluniform_max,
 } gluniform_t;
 
@@ -700,90 +716,112 @@ static gl_shaderstate_t gl_shaderstate;
 
 // Shader info
 static float shader_leveltime = 0;
+static float shader_light_x = 0.0f;
+static float shader_light_y = 0.0f;
+static float shader_light_z = 0.0f;
+static INT32 shader_light_contrast = 0;
+static INT32 shader_light_backlight = 0;
 
 // Lactozilla: Shader functions
-static boolean Shader_CompileProgram(gl_shader_t *shader, GLint i);
-static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade);
+static boolean GL_Shader_CompileProgram(gl_shader_t *shader, GLint i);
+static void GL_Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade);
 
 static GLRGBAFloat shader_defaultcolor = {1.0f, 1.0f, 1.0f, 1.0f};
 
-
-void SetupGLFunc4(void)
-{
-	/* 1.2 funcs */
-	pglTexImage3D = GetGLFunc("glTexImage3D");
-	/* 1.3 funcs */
-	pglActiveTexture = GetGLFunc("glActiveTexture");
-	pglMultiTexCoord2f = GetGLFunc("glMultiTexCoord2f");
-	pglClientActiveTexture = GetGLFunc("glClientActiveTexture");
-	pglMultiTexCoord2fv = GetGLFunc("glMultiTexCoord2fv");
-	
-	/* 1.5 funcs */
-	pglGenBuffers = GetGLFunc("glGenBuffers");
-	pglBindBuffer = GetGLFunc("glBindBuffer");
-	pglBufferData = GetGLFunc("glBufferData");
-	pglDeleteBuffers = GetGLFunc("glDeleteBuffers");
-	pglColorPointer = GetGLFunc("glColorPointer");
-	
-	pglStencilFuncSeparate = GetGLFunc("glStencilFuncSeparate");
-	pglStencilOpSeparate = GetGLFunc("glStencilOpSeparate");
-
-	pglCreateShader = GetGLFunc("glCreateShader");
-	pglShaderSource = GetGLFunc("glShaderSource");
-	pglCompileShader = GetGLFunc("glCompileShader");
-	pglGetShaderiv = GetGLFunc("glGetShaderiv");
-	pglGetShaderInfoLog = GetGLFunc("glGetShaderInfoLog");
-	pglDeleteShader = GetGLFunc("glDeleteShader");
-	pglCreateProgram = GetGLFunc("glCreateProgram");
-	pglDeleteProgram = GetGLFunc("glDeleteProgram");
-	pglAttachShader = GetGLFunc("glAttachShader");
-	pglLinkProgram = GetGLFunc("glLinkProgram");
-	pglGetProgramiv = GetGLFunc("glGetProgramiv");
-	pglGetProgramInfoLog = GetGLFunc("glGetProgramInfoLog");
-	pglUseProgram = GetGLFunc("glUseProgram");
-	pglUniform1i = GetGLFunc("glUniform1i");
-	pglUniform1f = GetGLFunc("glUniform1f");
-	pglUniform2f = GetGLFunc("glUniform2f");
-	pglUniform3f = GetGLFunc("glUniform3f");
-	pglUniform4f = GetGLFunc("glUniform4f");
-	pglUniform1fv = GetGLFunc("glUniform1fv");
-	pglUniform2fv = GetGLFunc("glUniform2fv");
-	pglUniform3fv = GetGLFunc("glUniform3fv");
-	pglGetUniformLocation = GetGLFunc("glGetUniformLocation");
-
 #ifdef USE_FBO_OGL
-	if (GLFramebuffer_IsFuncAvailible())
-	{
-		pglGenFramebuffers = GetGLFunc("glGenFramebuffers");
-		pglBindFramebuffer = GetGLFunc("glBindFramebuffer");
-		pglDeleteFramebuffers = GetGLFunc("glDeleteFramebuffers");
-		pglFramebufferTexture2D = GetGLFunc("glFramebufferTexture2D");
-		pglCheckFramebufferStatus = GetGLFunc("glCheckFramebufferStatus");
-		pglGenRenderbuffers = GetGLFunc("glGenRenderbuffers");
-		pglBindRenderbuffer = GetGLFunc("glBindRenderbuffer");
-		pglDeleteRenderbuffers = GetGLFunc("glDeleteRenderbuffers");
-		pglRenderbufferStorage = GetGLFunc("glRenderbufferStorage");
-		pglFramebufferRenderbuffer = GetGLFunc("glFramebufferRenderbuffer");
-	}
-#endif
-}
-
-#ifdef USE_FBO_OGL
-static boolean GLFramebuffer_IsFuncAvailible(void)
+static boolean GLFramebuffer_CheckExt(void)
 {
 	//this stuff needs atleast OGL 3.0
 	if (majorGL < 3)
 		return false;
 
-	return((isExtAvailable("GL_ARB_framebuffer_no_attachments",gl_extensions)) && 
-	(isExtAvailable("GL_ARB_framebuffer_object",gl_extensions)) && 
-	(isExtAvailable("GL_ARB_framebuffer_sRGB",gl_extensions)));
-
-	return false;
+	// check if all needed gl extensions are available
+	return (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions)
+	&& GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions)
+	&& GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions));
 }
 #endif
 
-EXPORT boolean HWRAPI(InitShaders) (void)
+void SetupGLFunc4(void)
+{
+#define GetGLfunc(func) \
+	p##func = GetGLFunc(#func); \
+	if (!p##func) \
+	{ \
+		GL_MSG_Warning("failed to get OpenGL function: %s", #func); \
+	} \
+
+	/* 1.2 funcs */
+	GetGLfunc(glTexImage3D);
+	/* 1.3 funcs */
+	GetGLfunc(glActiveTexture);
+	GetGLfunc(glMultiTexCoord2f);
+	GetGLfunc(glClientActiveTexture);
+	GetGLfunc(glMultiTexCoord2fv);
+
+	/* 1.5 funcs */
+	GetGLfunc(glGenBuffers);
+	GetGLfunc(glBindBuffer);
+	GetGLfunc(glBufferData);
+	GetGLfunc(glDeleteBuffers);
+	GetGLfunc(glColorPointer);
+
+	/* 2.0 funcs */
+	GetGLfunc(glBlendEquation);
+
+	GetGLfunc(glStencilFuncSeparate);
+	GetGLfunc(glStencilOpSeparate);
+
+	GetGLfunc(glCreateShader);
+	GetGLfunc(glShaderSource);
+	GetGLfunc(glCompileShader);
+	GetGLfunc(glGetShaderiv);
+	GetGLfunc(glGetShaderInfoLog);
+	GetGLfunc(glDeleteShader);
+	GetGLfunc(glCreateProgram);
+	GetGLfunc(glDeleteProgram);
+	GetGLfunc(glAttachShader);
+	GetGLfunc(glLinkProgram);
+	GetGLfunc(glGetProgramiv);
+	GetGLfunc(glGetProgramInfoLog);
+	GetGLfunc(glUseProgram);
+	GetGLfunc(glUniform1i);
+	GetGLfunc(glUniform1f);
+	GetGLfunc(glUniform2f);
+	GetGLfunc(glUniform3f);
+	GetGLfunc(glUniform4f);
+	GetGLfunc(glUniform1fv);
+	GetGLfunc(glUniform2fv);
+	GetGLfunc(glUniform3fv);
+	GetGLfunc(glGetUniformLocation);
+
+#ifdef USE_FBO_OGL
+	if (GLFramebuffer_CheckExt())
+	{
+		GetGLfunc(glGenFramebuffers);
+		GetGLfunc(glBindFramebuffer);
+		GetGLfunc(glDeleteFramebuffers);
+		GetGLfunc(glFramebufferTexture2D);
+		GetGLfunc(glCheckFramebufferStatus);
+		GetGLfunc(glGenRenderbuffers);
+		GetGLfunc(glBindRenderbuffer);
+		GetGLfunc(glDeleteRenderbuffers);
+		GetGLfunc(glRenderbufferStorage);
+		GetGLfunc(glFramebufferRenderbuffer);
+
+		// check if ALL functions are availible
+		if (pglGenFramebuffers && pglBindFramebuffer &&
+		pglDeleteFramebuffers && pglFramebufferTexture2D &&
+		pglCheckFramebufferStatus && pglGenRenderbuffers &&
+		pglBindRenderbuffer && pglDeleteRenderbuffers &&
+		pglRenderbufferStorage && pglFramebufferRenderbuffer)
+		supportFBO = true;
+	}
+#endif
+#undef GetGLfunc
+}
+
+boolean GL_InitShaders(void)
 {
 	if (!pglUseProgram)
 		return false;
@@ -791,7 +829,7 @@ EXPORT boolean HWRAPI(InitShaders) (void)
 	gl_fallback_shader.vertex_shader = Z_StrDup(GLSL_FALLBACK_VERTEX_SHADER);
 	gl_fallback_shader.fragment_shader = Z_StrDup(GLSL_FALLBACK_FRAGMENT_SHADER);
 
-	if (!Shader_CompileProgram(&gl_fallback_shader, -1))
+	if (!GL_Shader_CompileProgram(&gl_fallback_shader, -1))
 	{
 		GL_MSG_Error("Failed to compile the fallback shader program!\n");
 		return false;
@@ -800,7 +838,7 @@ EXPORT boolean HWRAPI(InitShaders) (void)
 	return true;
 }
 
-EXPORT void HWRAPI(LoadShader) (int slot, char *code, hwdshaderstage_t stage)
+void GL_LoadShader(int slot, char *code, hwdshaderstage_t stage)
 {
 	gl_shader_t *shader;
 
@@ -825,12 +863,12 @@ EXPORT void HWRAPI(LoadShader) (int slot, char *code, hwdshaderstage_t stage)
 #undef LOADSHADER
 }
 
-EXPORT boolean HWRAPI(CompileShader) (int slot)
+boolean GL_CompileShader(int slot)
 {
 	if (slot < 0 || slot >= HWR_MAXSHADERS)
 		I_Error("CompileShader: Invalid slot %d", slot);
 
-	if (Shader_CompileProgram(&gl_shaders[slot], slot))
+	if (GL_Shader_CompileProgram(&gl_shaders[slot], slot))
 	{
 		return true;
 	}
@@ -846,23 +884,38 @@ EXPORT boolean HWRAPI(CompileShader) (int slot)
 // Those are given to the uniforms.
 //
 
-EXPORT void HWRAPI(SetShaderInfo) (hwdshaderinfo_t info, INT32 value)
+void GL_SetShaderInfo(hwdshaderinfo_t info, INT32 value)
 {
 	switch (info)
 	{
 		case HWD_SHADERINFO_LEVELTIME:
-			shader_leveltime = value;
+			shader_leveltime = (((float)(value-1)) + FIXED_TO_FLOAT(rendertimefrac)) / TICRATE;
+			break;
+		case HWD_SHADERINFO_LIGHT_X:
+			shader_light_x = FixedToFloat(value);
+			break;
+		case HWD_SHADERINFO_LIGHT_Y:
+			shader_light_y = FixedToFloat(value);
+			break;
+		case HWD_SHADERINFO_LIGHT_Z:
+			shader_light_z = FixedToFloat(value);
+			break;
+		case HWD_SHADERINFO_LIGHT_CONTRAST:
+			shader_light_contrast = value;
+			break;
+		case HWD_SHADERINFO_LIGHT_BACKLIGHT:
+			shader_light_backlight = value;
 			break;
 		default:
 			break;
 	}
 }
 
-EXPORT void HWRAPI(SetShader) (int slot)
+void GL_SetShader(int slot)
 {
 	if (slot == SHADER_NONE)
 	{
-		UnSetShader();
+		GL_UnSetShader();
 		return;
 	}
 	if (gl_allowshaders)
@@ -889,7 +942,7 @@ EXPORT void HWRAPI(SetShader) (int slot)
 	gl_shadersenabled = false;
 }
 
-EXPORT void HWRAPI(UnSetShader) (void)
+void GL_UnSetShader(void)
 {
 	if (gl_shadersenabled) // don't repeatedly call glUseProgram if not needed
 	{
@@ -908,19 +961,23 @@ EXPORT void HWRAPI(UnSetShader) (void)
 // -----------------+
 // SetNoTexture     : Disable texture
 // -----------------+
-static void SetNoTexture(void)
+static void GL_SetNoTexture(void)
 {
 	// Disable texture.
 	if (tex_downloaded != NOTEXTURE_NUM)
 	{
 		if (NOTEXTURE_NUM == 0)
 			pglGenTextures(1, &NOTEXTURE_NUM);
+
 		pglBindTexture(GL_TEXTURE_2D, NOTEXTURE_NUM);
 		tex_downloaded = NOTEXTURE_NUM;
 	}
 }
 
-static void GLPerspective(GLfloat fovy, GLfloat aspect)
+// -----------------+
+// Perspective    :
+// -----------------+
+static void GL_Perspective(GLfloat fovy, GLfloat aspect)
 {
 	GLfloat m[4][4] =
 	{
@@ -929,35 +986,65 @@ static void GLPerspective(GLfloat fovy, GLfloat aspect)
 		{ 0.0f, 0.0f, 1.0f,-1.0f},
 		{ 0.0f, 0.0f, 0.0f, 0.0f},
 	};
-	const GLfloat zNear = NEAR_CLIPPING_PLANE;
-	const GLfloat zFar = FAR_CLIPPING_PLANE;
-	const GLfloat radians = (GLfloat)(fovy / 2.0f * M_PIl / 180.0f);
-	const GLfloat sine = (GLfloat)sin(radians);
-	const GLfloat deltaZ = zFar - zNear;
-	GLfloat cotangent;
 
-	if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(sine) == FP_ZERO || fpclassify(aspect) == FP_ZERO)
+	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)
 	{
 		return;
 	}
-	cotangent = cosf(radians) / sine;
 
-	m[0][0] = cotangent / aspect;
-	m[1][1] = cotangent;
-	m[2][2] = -(zFar + zNear) / deltaZ;
-	m[3][2] = -2.0f * zNear * zFar / deltaZ;
+	m[0][0] = focallength / aspect;
+	m[1][1] = focallength;
+	m[2][2] = -(FAR_CLIPPING_PLANE + NEAR_CLIPPING_PLANE) / deltaZ;
+	m[3][2] = -2.0f * NEAR_CLIPPING_PLANE * FAR_CLIPPING_PLANE / deltaZ;
 
 	pglMultMatrixf(&m[0][0]);
 }
 
-
 // -----------------+
 // SetModelView     :
 // -----------------+
-void SetModelView(GLint w, GLint h)
+void GL_SetModelView(GLint w, GLint h)
 {
+	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
+	if (screen_width != w || screen_height != h)
+	{
+		GL_FlushScreenTextures();
+
+#ifdef USE_FBO_OGL
+		GL_Framebuffer_DeleteAttachments();
+#endif
+	}
+
+	screen_width = (GLint)w;
+	screen_height = (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;
+
+	while (screen_texsizeh < h)
+		screen_texsizeh <<= 1;
+
+	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!
+		CONS_Alert(CONS_WARNING, "Tried to make a screen texture for a %dx%d game resolution, but your GPU only supports up to %dx%d! Please switch to the software renderer or lower your game resolution.\n", w, h, maxtexsize, maxtexsize);
+
+		// For now, let's just pray that clamping it to the maximum supported size "works"
+		// There'll be a stretchy "border" artefact, but it's better than failing to make the screen textures
+		screen_texsizew = min(screen_texsizew, maxtexsize);
+		screen_texsizeh = min(screen_texsizeh, maxtexsize);
+	}
+
 	pglViewport(0, 0, w, h);
 
 	pglMatrixMode(GL_PROJECTION);
@@ -966,7 +1053,7 @@ void SetModelView(GLint w, GLint h)
 	pglMatrixMode(GL_MODELVIEW);
 	pglLoadIdentity();
 
-	GLPerspective(fov, ASPECT_RATIO);
+	GL_Perspective(fov, ASPECT_RATIO);
 
 	// added for new coronas' code (without depth buffer)
 	pglGetIntegerv(GL_VIEWPORT, viewport);
@@ -976,7 +1063,7 @@ void SetModelView(GLint w, GLint h)
 // -----------------+
 // SetStates        : Set permanent states
 // -----------------+
-void SetStates(void)
+void GL_SetStates(void)
 {
 	pglEnable(GL_TEXTURE_2D);      // two-dimensional texturing
 	pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
@@ -996,58 +1083,71 @@ void SetStates(void)
 
 	// this set CurrentPolyFlags to the actual configuration
 	CurrentPolyFlags = 0xffffffff;
-	SetBlend(0);
+	GL_SetBlend(0);
 
 	tex_downloaded = 0;
-	SetNoTexture();
+	GL_SetNoTexture();
 
 	pglPolygonOffset(-1.0f, -1.0f);
 
+	pglDisable(GL_FOG);
+
 	// bp : when no t&l :)
 	pglLoadIdentity();
 	pglScalef(1.0f, 1.0f, -1.0f);
 	pglGetFloatv(GL_MODELVIEW_MATRIX, modelMatrix); // added for new coronas' code (without depth buffer)
 }
+<<<<<<< HEAD
+=======
+
+// -----------------+
+// DeleteTexture    : Deletes a texture from the GPU and frees its data
+// -----------------+
+void GL_DeleteTexture(GLMipmap_t *pTexInfo)
+{
+	FTextureInfo *head = TexCacheHead;
+
+	if (!pTexInfo)
+		return;
+	else if (pTexInfo->downloaded)
+		pglDeleteTextures(1, (GLuint *)&pTexInfo->downloaded);
+
+	while (head)
+	{
+		if (head->downloaded == pTexInfo->downloaded)
+		{
+			if (head->next)
+				head->next->prev = head->prev;
+			else // no next -> tail is being deleted -> update TexCacheTail
+				TexCacheTail = head->prev;
+
+			if (head->prev)
+				head->prev->next = head->next;
+			else // no prev -> head is being deleted -> update TexCacheHead
+				TexCacheHead = head->next;
+
+			free(head);
+			break;
+		}
+
+		head = head->next;
+	}
+
+	pTexInfo->downloaded = 0;
+}
+>>>>>>> Saturn-Next
 
 #ifdef USE_FBO_OGL
-void GLFramebuffer_Generate(void)
+static void GL_Framebuffer_GenerateAttachments(void)
 {
-	if (!GLFramebuffer_IsFuncAvailible())
-		return;
-
-	// Generate the framebuffer
-	if (FramebufferObject == 0)
-		pglGenFramebuffers(1, &FramebufferObject);
-
-	if (pglCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE)
-		GLFramebuffer_GenerateAttachments();
-}
-
-void GLFramebuffer_Delete(void)
-{
-	if (!GLFramebuffer_IsFuncAvailible())
-		return;
-
-	// Unbind the framebuffer
-	pglBindFramebuffer(GL_FRAMEBUFFER, 0);
-
-	if (FramebufferObject)
-		pglDeleteFramebuffers(1, &FramebufferObject);
-
-	GLFramebuffer_DeleteAttachments();
-	FramebufferObject = 0;
-}
-
-void GLFramebuffer_GenerateAttachments(void)
-{
-	if (!GLFramebuffer_IsFuncAvailible())
+	if (!supportFBO || !UseScreenFBO())
 		return;
 
 	// Bind the framebuffer
 	pglBindFramebuffer(GL_FRAMEBUFFER, FramebufferObject);
 
 	// Generate the framebuffer texture
-	if (FramebufferTexture == 0)
+	if (!FramebufferTexture)
 	{
 		pglGenTextures(1, &FramebufferTexture);
 		pglBindTexture(GL_TEXTURE_2D, FramebufferTexture);
@@ -1061,7 +1161,7 @@ void GLFramebuffer_GenerateAttachments(void)
 	}
 
 	// Generate the renderbuffer
-	if (RenderbufferObject == 0)
+	if (!RenderbufferObject)
 	{
 		pglGenRenderbuffers(1, &RenderbufferObject);
 
@@ -1070,22 +1170,28 @@ void GLFramebuffer_GenerateAttachments(void)
 		pglFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, RenderbufferObject);
 
 		// Clear the renderbuffer
-		ClearBuffer(true, true, true, NULL);
+		GL_ClearBuffer(true, true, true, NULL);
 
 		pglBindRenderbuffer(GL_RENDERBUFFER, 0);
 	}
 
 	// Unbind the framebuffer
 	pglBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+	fboinit = true;
 }
 
-void GLFramebuffer_DeleteAttachments(void)
+static void GL_Framebuffer_DeleteAttachments(void)
 {
-	if (!GLFramebuffer_IsFuncAvailible())
+	if (!supportFBO || !fboinit)
+		return;
+
+	if (!FramebufferObject && !RenderbufferObject && !FramebufferTexture)
 		return;
 
 	// Unbind the framebuffer
 	pglBindFramebuffer(GL_FRAMEBUFFER, 0);
+	pglBindRenderbuffer(GL_RENDERBUFFER, 0);
 
 	if (FramebufferTexture)
 		pglDeleteTextures(1, &FramebufferTexture);
@@ -1095,29 +1201,72 @@ void GLFramebuffer_DeleteAttachments(void)
 
 	FramebufferTexture = 0;
 	RenderbufferObject = 0;
+	fboinit = false;
 }
 
-void GLFramebuffer_Enable(void)
+static void GL_Framebuffer_Generate(void)
 {
-	if (!GLFramebuffer_IsFuncAvailible())
+	if (!supportFBO || !UseScreenFBO())
+		return;
+
+	// Generate the framebuffer
+	if (!FramebufferObject)
+		pglGenFramebuffers(1, &FramebufferObject);
+
+	if (pglCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE)
+		GL_Framebuffer_GenerateAttachments();
+}
+
+static void GL_Framebuffer_Delete(void)
+{
+	if (!supportFBO || !fboinit)
+		return;
+
+	if (FramebufferObject)
+		pglDeleteFramebuffers(1, &FramebufferObject);
+
+	GL_Framebuffer_DeleteAttachments();
+	FramebufferObject = 0;
+}
+
+void GL_Framebuffer_Unbind(void)
+{
+	if (!supportFBO || !fboinit)
+		return;
+
+	if (!FramebufferObject && !RenderbufferObject)
+		return;
+
+	pglBindFramebuffer(GL_FRAMEBUFFER, 0);
+	pglBindRenderbuffer(GL_RENDERBUFFER, 0);
+}
+
+void GL_Framebuffer_Enable(void)
+{
+	if (!supportFBO || !UseScreenFBO())
 		return;
 
 	if (FramebufferObject == 0)
-		GLFramebuffer_Generate();
-	else if (FramebufferTexture == 0 || RenderbufferObject == 0)
-		GLFramebuffer_GenerateAttachments();
+		GL_Framebuffer_Generate();
+	else if (!FramebufferTexture || !RenderbufferObject)
+		GL_Framebuffer_GenerateAttachments();
 
 	pglBindFramebuffer(GL_FRAMEBUFFER, FramebufferObject);
 	pglBindRenderbuffer(GL_RENDERBUFFER, RenderbufferObject);
 }
 
-void GLFramebuffer_Disable(void)
+void GL_Framebuffer_Disable(void)
 {
-	if (!GLFramebuffer_IsFuncAvailible())
+	if (!supportFBO || !fboinit)
+		return;
+
+	if (!FramebufferObject && !RenderbufferObject)
 		return;
 
 	pglBindFramebuffer(GL_FRAMEBUFFER, 0);
 	pglBindRenderbuffer(GL_RENDERBUFFER, 0);
+
+	GL_Framebuffer_Delete();
 }
 #endif
 // -----------------+
@@ -1159,10 +1308,8 @@ EXPORT void HWRAPI(DeleteTexture) (GLMipmap_t *pTexInfo)
 // Flush            : flush OpenGL textures
 //                  : Clear list of downloaded mipmaps
 // -----------------+
-void Flush(void)
+void GL_Flush(void)
 {
-	//GL_DBG_Printf ("HWR_Flush()\n");
-
 	while (TexCacheHead)
 	{
 		FTextureInfo *pTexInfo = TexCacheHead;
@@ -1189,88 +1336,95 @@ void Flush(void)
 	textureBufferSize = 0;
 }
 
-
 // -----------------+
 // isExtAvailable   : Look if an OpenGL extension is available
 // Returns          : true if extension available
 // -----------------+
-INT32 isExtAvailable(const char *extension, const GLubyte *start)
+INT32 GL_isExtAvailable(const char *extension, const GLubyte *start)
 {
 	GLubyte         *where, *terminator;
 
-	if (!extension || !start) return 0;
+	if (!extension || !start)
+		return 0;
+
 	where = (GLubyte *) strchr(extension, ' ');
+
 	if (where || *extension == '\0')
 		return 0;
 
 	for (;;)
 	{
 		where = (GLubyte *) strstr((const char *) start, extension);
+
 		if (!where)
 			break;
+
 		terminator = where + strlen(extension);
+
 		if (where == start || *(where - 1) == ' ')
+		{
 			if (*terminator == ' ' || *terminator == '\0')
 				return 1;
+		}
+
 		start = terminator;
 	}
 	return 0;
 }
 
-
 // -----------------+
 // Init             : Initialise the OpenGL interface API
 // Returns          :
 // -----------------+
-EXPORT boolean HWRAPI(Init) (void)
+boolean GL_Init (void)
 {
-	return LoadGL();
+	return SetupGLfunc();
 }
 
-
 // -----------------+
 // SetupGLInfo      : Retreive and store currently loaded OpenGL version
 // -----------------+
-EXPORT void HWRAPI(SetupGLInfo) (void)
+void SetupGLInfo(void)
 {
 	const GLubyte *versionGL = pglGetString(GL_VERSION);
 	CONS_Printf("Loaded OpenGL version %s\n", (const char*)versionGL);
 	sscanf((const char*)versionGL, "%d.%d", &majorGL, &minorGL);
 }
 
-
-// -----------------+
-// ClearMipMapCache : Flush OpenGL textures from memory
-// -----------------+
-EXPORT void HWRAPI(ClearMipMapCache) (void)
-{
-	Flush();
-}
-
 // Writes screen texture tex into dst_data.
 // Pixel format is 24-bit RGB. Row order is top to bottom.
 // Dimensions are screen_width * screen_height.
-EXPORT void HWRAPI(ReadScreenTexture) (int tex, UINT16 *dst_data)
+void GL_ReadScreenTexture(int tex, UINT16 *dst_data)
 {
 	INT32 i;
 	int dst_stride = screen_width * 3; // stride between rows of image data
-	GLubyte*top = (GLvoid*)dst_data, *bottom = top + dst_stride * (screen_height - 1);
+	GLubyte *top, *bottom;
 	GLubyte *row;
+
 	row = malloc(dst_stride);
-	if (!row) return;
+
+	if (!row)
+		return;
+
+	top = (GLvoid*)dst_data;
+	bottom = top + dst_stride * (screen_height - 1);
+
 	// at the time this function is called, generic2 can be found drawn on the framebuffer
 	// if some other screen texture is needed, draw it to the framebuffer
 	// and draw generic2 back after reading the framebuffer.
 	// this hack is for some reason **much** faster than the simple solution of using glGetTexImage.
 	if (tex != HWD_SCREENTEXTURE_GENERIC2)
-		DrawScreenTexture(tex, NULL, 0);
+		GL_DrawScreenTexture(tex, NULL, 0);
+
 	pglPixelStorei(GL_PACK_ALIGNMENT, 1);
 	pglReadPixels(0, 0, screen_width, screen_height, GL_RGB, GL_UNSIGNED_BYTE, dst_data);
+
 	if (tex != HWD_SCREENTEXTURE_GENERIC2)
-		DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0);
+		GL_DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0);
+
 	// Flip image upside down.
 	// In other words, convert OpenGL's "bottom->top" row order into "top->bottom".
-	for(i = 0; i < screen_height/2; i++)
+	for (i = 0; i < screen_height/2; i++)
 	{
 		memcpy(row, top, dst_stride);
 		memcpy(top, bottom, dst_stride);
@@ -1278,13 +1432,29 @@ EXPORT void HWRAPI(ReadScreenTexture) (int tex, UINT16 *dst_data)
 		top += dst_stride;
 		bottom -= dst_stride;
 	}
+
 	free(row);
 }
 
+// -----------------+
+// SetPalette       : Changes the current texture palette
+// -----------------+
+void GL_SetPalette(RGBA_t *palette)
+{
+	INT32 i;
+
+	for (i = 0; i < 256; i++)
+	{
+		myPaletteData[i].s = palette[i].s;
+	}
+
+	GL_Flush();
+}
+
 // -----------------+
 // GClipRect        : Defines the 2D hardware clipping window
 // -----------------+
-EXPORT void HWRAPI(GClipRect) (INT32 minx, INT32 miny, INT32 maxx, INT32 maxy, float nearclip, float farclip)
+void GL_GClipRect(INT32 minx, INT32 miny, INT32 maxx, INT32 maxy, float nearclip, float farclip)
 {
 	//GL_DBG_Printf("GClipRect(%d, %d, %d, %d)\n", minx, miny, maxx, maxy);
 
@@ -1295,7 +1465,7 @@ EXPORT void HWRAPI(GClipRect) (INT32 minx, INT32 miny, INT32 maxx, INT32 maxy, f
 	//pglScissor(minx, screen_height-maxy, maxx-minx, maxy-miny);
 	pglMatrixMode(GL_PROJECTION);
 	pglLoadIdentity();
-	GLPerspective(fov, ASPECT_RATIO);
+	GL_Perspective(fov, ASPECT_RATIO);
 	pglMatrixMode(GL_MODELVIEW);
 
 	// added for new coronas' code (without depth buffer)
@@ -1307,10 +1477,7 @@ EXPORT void HWRAPI(GClipRect) (INT32 minx, INT32 miny, INT32 maxx, INT32 maxy, f
 // -----------------+
 // ClearBuffer      : Clear the color/alpha/depth buffer(s)
 // -----------------+
-EXPORT void HWRAPI(ClearBuffer) (FBOOLEAN ColorMask,
-                                    FBOOLEAN DepthMask,
-									FBOOLEAN StencilMask,
-                                    FRGBAFloat * ClearColor)
+void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat * ClearColor)
 {
 	//GL_DBG_Printf("ClearBuffer(%d)\n", alpha);
 	GLbitfield ClearMask = 0;
@@ -1318,10 +1485,8 @@ EXPORT void HWRAPI(ClearBuffer) (FBOOLEAN ColorMask,
 	if (ColorMask)
 	{
 		if (ClearColor)
-			pglClearColor(ClearColor->red,
-			              ClearColor->green,
-			              ClearColor->blue,
-			              ClearColor->alpha);
+			pglClearColor(ClearColor->red, ClearColor->green, ClearColor->blue, ClearColor->alpha);
+
 		ClearMask |= GL_COLOR_BUFFER_BIT;
 	}
 	if (DepthMask)
@@ -1332,10 +1497,11 @@ EXPORT void HWRAPI(ClearBuffer) (FBOOLEAN ColorMask,
 		ClearMask |= GL_DEPTH_BUFFER_BIT;
 	}
 
-	SetBlend(DepthMask ? PF_Occlude | CurrentPolyFlags : CurrentPolyFlags&~PF_Occlude);
+	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
+
 	pglClear(ClearMask);
 	pglEnableClientState(GL_VERTEX_ARRAY); // We always use this one
 	pglEnableClientState(GL_TEXTURE_COORD_ARRAY); // And mostly this one, too
@@ -1345,9 +1511,7 @@ EXPORT void HWRAPI(ClearBuffer) (FBOOLEAN ColorMask,
 // -----------------+
 // HWRAPI Draw2DLine: Render a 2D line
 // -----------------+
-EXPORT void HWRAPI(Draw2DLine) (F2DCoord * v1,
-                                   F2DCoord * v2,
-                                   RGBA_t Color)
+void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color)
 {
 	//GL_DBG_Printf("DrawLine(): %f %f, %f %f\n", v1->x, v1->y, v2->x, v2->y);
 	GLfloat p[12];
@@ -1380,7 +1544,11 @@ EXPORT void HWRAPI(Draw2DLine) (F2DCoord * v1,
 	pglEnableClientState(GL_TEXTURE_COORD_ARRAY);
 	pglEnable(GL_TEXTURE_2D);
 }
-
+// -----------------+
+// 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
@@ -1389,58 +1557,95 @@ static void Clamp2D(GLenum pname)
 #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 ?
-EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
+static void GL_SetBlendEquation(GLenum mode)
 {
-	FBITFIELD Xor;
-	Xor = CurrentPolyFlags^PolyFlags;
-	if (Xor & (PF_Blending|PF_RemoveYWrap|PF_ForceWrapX|PF_ForceWrapY|PF_Occlude|PF_NoTexture|PF_Modulated|PF_NoDepthTest|PF_Decal|PF_Invisible|PF_NoAlphaTest))
+	if (pglBlendEquation)
+		pglBlendEquation(mode);
+}
+
+static void GL_SetBlendMode(FBITFIELD flags)
+{
+	// Set blending function
+	switch (flags)
 	{
-		if (Xor&(PF_Blending)) // if blending mode must be changed
-		{
-			switch (PolyFlags & PF_Blending) {
-				case PF_Translucent & PF_Blending:
-					pglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // alpha = level of transparency
-					pglAlphaFunc(GL_NOTEQUAL, 0.0f);
-					break;
-				case PF_Masked & PF_Blending:
-					// Hurdler: does that mean lighting is only made by alpha src?
-					// it sounds ok, but not for polygonsmooth
-					pglBlendFunc(GL_SRC_ALPHA, GL_ZERO);                // 0 alpha = holes in texture
-					pglAlphaFunc(GL_GREATER, 0.5f);
-					break;
-				case PF_Additive & PF_Blending:
-					pglBlendFunc(GL_SRC_ALPHA, GL_ONE);                 // src * alpha + dest
-					pglAlphaFunc(GL_NOTEQUAL, 0.0f);
-					break;
-				case PF_Environment & PF_Blending:
-					pglBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-					pglAlphaFunc(GL_NOTEQUAL, 0.0f);
-					break;
-				case PF_Substractive & PF_Blending:
-					// good for shadow
-					// not really but what else ?
-					pglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
-					pglAlphaFunc(GL_NOTEQUAL, 0.0f);
-					break;
-				case PF_Fog & PF_Fog:
-					// Sryder: Fog
-					// multiplies input colour by input alpha, and destination colour by input colour, then adds them
-					pglBlendFunc(GL_SRC_ALPHA, GL_SRC_COLOR);
-					pglAlphaFunc(GL_ALWAYS, 0.0f); // Don't discard zero alpha fragments
-					break;
-				default : // must be 0, otherwise it's an error
-					// No blending
-					pglBlendFunc(GL_ONE, GL_ZERO);   // the same as no blending
-					pglAlphaFunc(GL_GREATER, 0.5f);
-					break;
-			}
-		}
+		case PF_Translucent & PF_Blending:
+			pglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // alpha = level of transparency
+			break;
+		case PF_Masked & PF_Blending:
+			// Hurdler: does that mean lighting is only made by alpha src?
+			// it sounds ok, but not for polygonsmooth
+			pglBlendFunc(GL_SRC_ALPHA, GL_ZERO);                // 0 alpha = holes in texture
+			break;
+		case PF_Additive & PF_Blending:
+		case PF_Subtractive & PF_Blending:
+		case PF_ReverseSubtract & PF_Blending:
+			pglBlendFunc(GL_SRC_ALPHA, GL_ONE); // src * alpha + dest
+			break;
+		case PF_Environment & PF_Blending:
+			pglBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+			break;
+		case PF_Multiplicative & PF_Blending:
+			pglBlendFunc(GL_DST_COLOR, GL_ZERO);
+			break;
+		case PF_Fog & PF_Fog:
+			// Sryder: Fog
+			// multiplies input colour by input alpha, and destination colour by input colour, then adds them
+			pglBlendFunc(GL_SRC_ALPHA, GL_SRC_COLOR);
+			break;
+		default: // must be 0, otherwise it's an error
+			// No blending
+			pglBlendFunc(GL_ONE, GL_ZERO);   // the same as no blending
+			break;
+	}
+
+	// Set blending equation
+	switch (flags)
+	{
+		case PF_Subtractive & PF_Blending:
+			GL_SetBlendEquation(GL_FUNC_SUBTRACT);
+			break;
+		case PF_ReverseSubtract & PF_Blending:
+			// good for shadow
+			// not really but what else ?
+			GL_SetBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
+			break;
+		default:
+			GL_SetBlendEquation(GL_FUNC_ADD);
+			break;
+	}
+
+	// Alpha test
+	switch (flags)
+	{
+		case PF_Masked & PF_Blending:
+			pglAlphaFunc(GL_GREATER, 0.5f);
+			break;
+		case PF_Translucent & PF_Blending:
+		case PF_Additive & PF_Blending:
+		case PF_Subtractive & PF_Blending:
+		case PF_ReverseSubtract & PF_Blending:
+		case PF_Environment & PF_Blending:
+		case PF_Multiplicative & PF_Blending:
+			pglAlphaFunc(GL_NOTEQUAL, 0.0f);
+			break;
+		case PF_Fog & PF_Fog:
+			pglAlphaFunc(GL_ALWAYS, 0.0f); // Don't discard zero alpha fragments
+			break;
+		default:
+			pglAlphaFunc(GL_GREATER, 0.5f);
+			break;
+	}
+}
+
+void GL_SetBlend(FBITFIELD PolyFlags)
+{
+	const FBITFIELD Xor = CurrentPolyFlags^PolyFlags;;
+
+	if (Xor & (PF_Blending|PF_RemoveYWrap|PF_ForceWrapX|PF_ForceWrapY|PF_Occlude|PF_NoTexture|PF_Modulated|PF_NoDepthTest|PF_Decal|PF_Skydecal|PF_Invisible))
+	{
+		if (Xor & PF_Blending) // if blending mode must be changed
+			GL_SetBlendMode(PolyFlags & PF_Blending);
+
 		if (Xor & PF_NoAlphaTest)
 		{
 			if (PolyFlags & PF_NoAlphaTest)
@@ -1452,11 +1657,26 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
 		if (Xor & PF_Decal)
 		{
 			if (PolyFlags & PF_Decal)
+			{
+				pglPolygonOffset(-1.0f, -1.0f);
 				pglEnable(GL_POLYGON_OFFSET_FILL);
+			}
 			else
 				pglDisable(GL_POLYGON_OFFSET_FILL);
 		}
-		if (Xor&PF_NoDepthTest)
+
+		if (Xor & PF_Skydecal)
+		{
+			if (PolyFlags & PF_Skydecal)
+			{
+				pglPolygonOffset(0.45f, 0.45f);
+				pglEnable(GL_POLYGON_OFFSET_FILL);
+			}
+			else
+				pglDisable(GL_POLYGON_OFFSET_FILL);
+		}
+
+		if (Xor & PF_NoDepthTest)
 		{
 			if (PolyFlags & PF_NoDepthTest)
 				pglDepthFunc(GL_ALWAYS); //pglDisable(GL_DEPTH_TEST);
@@ -1464,25 +1684,25 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
 				pglDepthFunc(GL_LEQUAL); //pglEnable(GL_DEPTH_TEST);
 		}
 
-		if (Xor&PF_RemoveYWrap)
+		if (Xor & PF_RemoveYWrap)
 		{
 			if (PolyFlags & PF_RemoveYWrap)
 				Clamp2D(GL_TEXTURE_WRAP_T);
 		}
 
-		if (Xor&PF_ForceWrapX)
+		if (Xor & PF_ForceWrapX)
 		{
 			if (PolyFlags & PF_ForceWrapX)
 				pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
 		}
 
-		if (Xor&PF_ForceWrapY)
+		if (Xor & PF_ForceWrapY)
 		{
 			if (PolyFlags & PF_ForceWrapY)
 				pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 		}
 
-		if (Xor&PF_Modulated)
+		if (Xor & PF_Modulated)
 		{
 #if defined (__unix__) || defined (UNIXCOMMON)
 			if (oglflags & GLF_NOTEXENV)
@@ -1492,19 +1712,22 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
 			}
 			else
 #endif
-
-			// mix texture colour with Surface->PolyColor
 			if (PolyFlags & PF_Modulated)
+			{   // mix texture colour with Surface->PolyColor
 				pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-			// colour from texture is unchanged before blending
+			}
 			else
+			{   // colour from texture is unchanged before blending
 				pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+			}
 		}
 
 		if (Xor & PF_Occlude) // depth test but (no) depth write
 		{
 			if (PolyFlags&PF_Occlude)
+			{
 				pglDepthMask(1);
+			}
 			else
 				pglDepthMask(0);
 		}
@@ -1522,14 +1745,18 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
 			}
 		}
 		if (PolyFlags & PF_NoTexture)
-			SetNoTexture();
+		{
+			GL_SetNoTexture();
+		}
 	}
 	CurrentPolyFlags = PolyFlags;
+
 }
 
-static void AllocTextureBuffer(GLMipmap_t *pTexInfo)
+static void GL_AllocTextureBuffer(GLMipmap_t *pTexInfo)
 {
 	size_t size = pTexInfo->width * pTexInfo->height;
+
 	if (size > textureBufferSize)
 	{
 		textureBuffer = realloc(textureBuffer, size * sizeof(RGBA_t));
@@ -1539,22 +1766,137 @@ static void 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)
+{
+	INT32 i;
+	boolean notLeft, notRight, notTop, notBottom;
+	RGBA_t *to = tex - 1, *from;
+
+	for (i = 0; i < w * h; i++)
+	{
+		to++;
+		if (to->rgba != 0)
+			continue;
+		from = NULL;
+
+		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)
+		{
+			*to = *from;
+			to->s.alpha = 0;
+		}
+	}
+}
+
+#undef PADDING_CHECK
+
+static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD)
+{
+	if (tex == NULL)
+	{
+		GL_MSG_Warning("GenerateMipmaps: attempted to generate mipmaps without texture data");
+		return;
+	}
+
+	RGBA_t samplePoint[4];
+	boolean padTexture;
+	INT32 pointsSampled = 0;
+	INT32 m, j, i, p;
+	UINT16 sumR, sumG, sumB, sumA;
+
+	for (m = 0; m < maxLOD; m++)
+	{
+		if (w <= 1 || h <= 1)
+			return;
+
+		padTexture = false;
+
+		for (j = 0; j < h / 2; j++)
+		{
+			for (i = 0; i < w / 2; i++)
+			{
+				samplePoint[0] = tex[w*j*2 + i*2];
+				samplePoint[1] = tex[w*j*2 + i*2+1];
+				samplePoint[2] = tex[w*(j*2+1) + i*2];
+				samplePoint[3] = tex[w*(j*2+1) + i*2+1];
+
+				pointsSampled = sumR = sumG = sumB = sumA = 0;
+
+				for (p = 0; p < 4; p++)
+				{
+					if (samplePoint[p].s.alpha == 0)
+						continue;
+					sumR += samplePoint[p].s.red;
+					sumG += samplePoint[p].s.green;
+					sumB += samplePoint[p].s.blue;
+					sumA += samplePoint[p].s.alpha;
+					pointsSampled++;
+				}
+
+				if (pointsSampled > 0)
+				{
+					tex[(w/2)*j+i].s.red   = sumR / pointsSampled;
+					tex[(w/2)*j+i].s.green = sumG / pointsSampled;
+					tex[(w/2)*j+i].s.blue  = sumB / pointsSampled;
+					tex[(w/2)*j+i].s.alpha = sumA / pointsSampled;
+				}
+				else
+				{
+					tex[(w/2)*j+i].rgba = 0;
+					padTexture = true;
+				}
+			}
+		}
+
+		w /= 2;
+		h /= 2;
+
+		if (padTexture)
+			PadRGBABitmap(tex, w, h);
+
+		pglTexSubImage2D(GL_TEXTURE_2D, m + 1, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, tex);
+	}
+}
+
 // -----------------+
 // UpdateTexture    : Updates texture data.
 // -----------------+
-EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
+void GL_UpdateTexture(GLMipmap_t *pTexInfo)
 {
 	// Upload a texture
 	GLuint num = pTexInfo->downloaded;
 	boolean update = true;
+	const boolean applyPadding = mag_filter == GL_LINEAR || min_filter == GL_LINEAR;
 
 	INT32 w = pTexInfo->width, h = pTexInfo->height;
 	INT32 i, j;
+	INT32 idx;
 
 	const GLubyte *pImgData = (const GLubyte *)pTexInfo->data;
 	const GLvoid *ptex = NULL;
 	RGBA_t *tex = NULL;
 
+<<<<<<< HEAD
+=======
+	GLint texformat = 0;
+
+>>>>>>> Saturn-Next
 	// Generate a new texture name.
 	if (!num)
 	{
@@ -1565,91 +1907,110 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
 
 	//GL_DBG_Printf("UpdateTexture %d %x\n", (INT32)num, pImgData);
 
-	if ((pTexInfo->format == GL_TEXFMT_P_8) || (pTexInfo->format == GL_TEXFMT_AP_88))
+	texformat = gltexformat;
+	const GLTextureFormat_t texinfoformat = pTexInfo->format;
+
+	switch (texinfoformat)
 	{
-		AllocTextureBuffer(pTexInfo);
-		ptex = tex = textureBuffer;
+		case GL_TEXFMT_P_8:
+		case GL_TEXFMT_AP_88:
+			GL_AllocTextureBuffer(pTexInfo);
+			ptex = tex = textureBuffer;
 
-		for (j = 0; j < h; j++)
-		{
-			for (i = 0; i < w; i++)
+			const int chromakeyed = (pTexInfo->flags & TF_CHROMAKEYED);
+
+			for (idx = 0, j = 0; j < h; j++)
 			{
-				if ((*pImgData == HWR_PATCHES_CHROMAKEY_COLORINDEX) &&
-					(pTexInfo->flags & TF_CHROMAKEYED))
+				for (i = 0; i < w; i++, idx++)
 				{
-					tex[w*j+i].s.red   = 0;
-					tex[w*j+i].s.green = 0;
-					tex[w*j+i].s.blue  = 0;
-					tex[w*j+i].s.alpha = 0;
-					pTexInfo->flags |= TF_TRANSPARENT; // there is a hole in it
-				}
-				else
-				{
-					tex[w*j+i].s.red   = myPaletteData[*pImgData].s.red;
-					tex[w*j+i].s.green = myPaletteData[*pImgData].s.green;
-					tex[w*j+i].s.blue  = myPaletteData[*pImgData].s.blue;
-					tex[w*j+i].s.alpha = myPaletteData[*pImgData].s.alpha;
-				}
+					if (chromakeyed && (*pImgData == HWR_PATCHES_CHROMAKEY_COLORINDEX))
+					{
+						tex[idx].s = (byteColor_t){0, 0, 0, 0};
+						pTexInfo->flags |= TF_TRANSPARENT; // there is a hole in it
+					}
+					else
+					{
+						tex[idx].s = myPaletteData[*pImgData].s;
+					}
 
-				pImgData++;
+					pImgData++;
 
-				if (pTexInfo->format == GL_TEXFMT_AP_88)
-				{
-					if (!(pTexInfo->flags & TF_CHROMAKEYED))
-						tex[w*j+i].s.alpha = *pImgData;
+					if (texinfoformat != GL_TEXFMT_AP_88)
+						continue;
+					if (chromakeyed)
+						continue;
+
+					tex[idx].s.alpha = *pImgData;
 					pImgData++;
 				}
 			}
-		}
-	}
-	else if (pTexInfo->format == GL_TEXFMT_RGBA)
-	{
-		// Directly upload the texture data without any kind of conversion.
-		ptex = pImgData;
-	}
-	else if (pTexInfo->format == GL_TEXFMT_ALPHA_INTENSITY_88)
-	{
-		AllocTextureBuffer(pTexInfo);
-		ptex = tex = textureBuffer;
 
-		for (j = 0; j < h; j++)
-		{
-			for (i = 0; i < w; i++)
-			{
-				tex[w*j+i].s.red   = *pImgData;
-				tex[w*j+i].s.green = *pImgData;
-				tex[w*j+i].s.blue  = *pImgData;
-				pImgData++;
-				tex[w*j+i].s.alpha = *pImgData;
-				pImgData++;
-			}
-		}
-	}
-	else if (pTexInfo->format == GL_TEXFMT_ALPHA_8) // Used for fade masks
-	{
-		AllocTextureBuffer(pTexInfo);
-		ptex = tex = textureBuffer;
+			if (applyPadding)
+				PadRGBABitmap(tex, w, h);
 
-		for (j = 0; j < h; j++)
-		{
-			for (i = 0; i < w; i++)
+			break;
+		case GL_TEXFMT_RGBA:
+			// Directly upload the texture data without any kind of conversion.
+			ptex = pImgData;
+
+			// However, it does need to be copied to a buffer for generating mipmaps and padding
+			if (MipMap || applyPadding)
 			{
-				tex[w*j+i].s.red   = 255; // 255 because the fade mask is modulated with the screen texture, so alpha affects it while the colours don't
-				tex[w*j+i].s.green = 255;
-				tex[w*j+i].s.blue  = 255;
-				tex[w*j+i].s.alpha = *pImgData;
-				pImgData++;
+				GL_AllocTextureBuffer(pTexInfo);
+				tex = textureBuffer;
+				memcpy(tex, ptex, w * h * 4);
+				ptex = tex;
+
+				if (applyPadding)
+					PadRGBABitmap(tex, w, h);
 			}
-		}
+
+			break;
+		case GL_TEXFMT_ALPHA_INTENSITY_88:
+			GL_AllocTextureBuffer(pTexInfo);
+			ptex = tex = textureBuffer;
+			texformat = GL_RGBA;
+
+			for (idx = 0, j = 0; j < h; j++)
+			{
+				for (i = 0; i < w; i++, idx++)
+				{
+					tex[idx].s.red   = *pImgData;
+					tex[idx].s.green = *pImgData;
+					tex[idx].s.blue  = *pImgData;
+					pImgData++;
+					tex[idx].s.alpha = *pImgData;
+					pImgData++;
+				}
+			}
+			break;
+		case GL_TEXFMT_ALPHA_8: // Used for fade masks
+			GL_AllocTextureBuffer(pTexInfo);
+			ptex = tex = textureBuffer;
+			texformat = GL_RGBA;
+
+			memset(&tex->s, 255, sizeof(byteColor_t)*w*h); // 255 because the fade mask is modulated with the screen texture, so alpha affects it while the colours don't
+
+			for (idx = 0, j = 0; j < h; j++)
+			{
+				for (i = 0; i < w; i++, idx++)
+				{
+					tex[idx].s.alpha = *pImgData++;
+				}
+			}
+			break;
+		default:
+			GL_MSG_Warning("UpdateTexture: bad format %d\n", texinfoformat);
+			break;
 	}
-	else
-		GL_MSG_Warning("UpdateTexture: bad format %d\n", pTexInfo->format);
 
 	pglBindTexture(GL_TEXTURE_2D, num);
 	tex_downloaded = num;
 
+	const int transparent = (pTexInfo->flags & TF_TRANSPARENT);
+
 	// disable texture filtering on any texture that has holes so there's no dumb borders or blending issues
-	if (pTexInfo->flags & TF_TRANSPARENT)
+	if (transparent)
 	{
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@@ -1660,73 +2021,26 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
 	}
 
-	if (pTexInfo->format == GL_TEXFMT_ALPHA_INTENSITY_88)
+	if (MipMap && !transparent) // No mipmaps on transparent stuff
 	{
-		//pglTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
-		if (MipMap)
-		{
-			pglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-			pglTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
+		pglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
 
-			pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0);
-			if (pTexInfo->flags & TF_TRANSPARENT)
-				pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 0); // No mippmaps on transparent stuff
-			else
-				pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4);
-			//pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_LINEAR_MIPMAP_LINEAR);
-		}
+		if (update)
+			pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
 		else
-		{
-			if (update)
-				pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
-			else
-				pglTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
-		}
-	}
-	else if (pTexInfo->format == GL_TEXFMT_ALPHA_8)
-	{
-		//pglTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
-		if (MipMap)
-		{
-			pglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-			pglTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
+			pglTexImage2D(GL_TEXTURE_2D, 0, texformat, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
 
-			pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0);
-			if (pTexInfo->flags & TF_TRANSPARENT)
-				pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 0); // No mippmaps on transparent stuff
-			else
-				pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4);
-			//pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_LINEAR_MIPMAP_LINEAR);
-		}
-		else
-		{
-			if (update)
-				pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
-			else
-				pglTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
-		}
+		// 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);
 	}
 	else
 	{
-		if (MipMap)
-		{
-			pglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
-			pglTexImage2D(GL_TEXTURE_2D, 0, textureformatGL, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
-
-			// Control the mipmap level of detail
-			pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0); // the lower the number, the higer the detail
-			if (pTexInfo->flags & TF_TRANSPARENT)
-				pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 0); // No mippmaps on transparent stuff
-			else
-				pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 5);
-		}
+		if (update)
+			pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
 		else
-		{
-			if (update)
-				pglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
-			else
-				pglTexImage2D(GL_TEXTURE_2D, 0, textureformatGL, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
-		}
+			pglTexImage2D(GL_TEXTURE_2D, 0, texformat, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
 	}
 
 	if (pTexInfo->flags & TF_WRAPX)
@@ -1743,15 +2057,14 @@ EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropic_filter);
 }
 
-
 // -----------------+
 // SetTexture       : The mipmap becomes the current texture source
 // -----------------+
-EXPORT void HWRAPI(SetTexture) (GLMipmap_t *pTexInfo)
+void GL_SetTexture(GLMipmap_t *pTexInfo)
 {
 	if (!pTexInfo)
 	{
-		SetNoTexture();
+		GL_SetNoTexture();
 		return;
 	}
 	else if (pTexInfo->downloaded)
@@ -1766,7 +2079,7 @@ EXPORT void HWRAPI(SetTexture) (GLMipmap_t *pTexInfo)
 	{
 		FTextureInfo *newTex = calloc(1, sizeof (*newTex));
 
-		UpdateTexture(pTexInfo);
+		GL_UpdateTexture(pTexInfo);
 
 		newTex->texture = pTexInfo;
 		newTex->downloaded = (UINT32)pTexInfo->downloaded;
@@ -1786,7 +2099,7 @@ EXPORT void HWRAPI(SetTexture) (GLMipmap_t *pTexInfo)
 	}
 }
 
-static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade)
+static void GL_Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade)
 {
 	gl_shader_t *shader = gl_shaderstate.current;
 
@@ -1833,14 +2146,35 @@ static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAF
 		UNIFORM_4(shader->uniforms[gluniform_tint_color], tint->red, tint->green, tint->blue, tint->alpha, pglUniform4f);
 		UNIFORM_4(shader->uniforms[gluniform_fade_color], fade->red, fade->green, fade->blue, fade->alpha, pglUniform4f);
 
+		boolean directional = false;
 		if (Surface != NULL)
 		{
 			UNIFORM_1(shader->uniforms[gluniform_lighting], (GLfloat)Surface->LightInfo.light_level, pglUniform1f);
 			UNIFORM_1(shader->uniforms[gluniform_fade_start], (GLfloat)Surface->LightInfo.fade_start, pglUniform1f);
 			UNIFORM_1(shader->uniforms[gluniform_fade_end], (GLfloat)Surface->LightInfo.fade_end, pglUniform1f);
+			directional = Surface->LightInfo.directional;
+		}
+		else
+		{
+			UNIFORM_1(shader->uniforms[gluniform_lighting], 255, pglUniform1f);
+			UNIFORM_1(shader->uniforms[gluniform_fade_start], 0, pglUniform1f);
+			UNIFORM_1(shader->uniforms[gluniform_fade_end], 31, pglUniform1f);
 		}
 
-		UNIFORM_1(shader->uniforms[gluniform_leveltime], ((float)shader_leveltime) / TICRATE, pglUniform1f);
+		if (directional)
+		{
+			UNIFORM_3(shader->uniforms[gluniform_light_dir], shader_light_x, shader_light_y, shader_light_z, pglUniform3f);
+			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);
 
@@ -1851,7 +2185,7 @@ static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAF
 	}
 }
 
-static boolean Shader_CompileProgram(gl_shader_t *shader, GLint i)
+static boolean GL_Shader_CompileProgram(gl_shader_t *shader, GLint i)
 {
 	GLuint gl_vertShader = 0;
 	GLuint gl_fragShader = 0;
@@ -1918,7 +2252,7 @@ static boolean Shader_CompileProgram(gl_shader_t *shader, GLint i)
 		pglGetShaderiv(gl_fragShader, GL_COMPILE_STATUS, &result);
 		if (result == GL_FALSE)
 		{
-            pglGetShaderInfoLog(gl_fragShader, 512, NULL, info_log);
+			pglGetShaderInfoLog(gl_fragShader, 512, NULL, info_log);
 
 			GL_MSG_Error("Error compiling fragment shader: %s\n", info_log);
 			pglDeleteShader(gl_vertShader);
@@ -1942,7 +2276,7 @@ static boolean Shader_CompileProgram(gl_shader_t *shader, GLint i)
 		pglDeleteShader(gl_vertShader);
 	if (frag_shader)
 		pglDeleteShader(gl_fragShader);
-	
+
 	// couldn't link?
 	if (result != GL_TRUE)
 	{
@@ -1956,22 +2290,25 @@ static boolean Shader_CompileProgram(gl_shader_t *shader, GLint i)
 #define GETUNI(uniform) pglGetUniformLocation(shader->program, uniform);
 
 	// lighting
-	shader->uniforms[gluniform_poly_color] = GETUNI("poly_color");
-	shader->uniforms[gluniform_tint_color] = GETUNI("tint_color");
-	shader->uniforms[gluniform_fade_color] = GETUNI("fade_color");
-	shader->uniforms[gluniform_lighting] = GETUNI("lighting");
-	shader->uniforms[gluniform_fade_start] = GETUNI("fade_start");
-	shader->uniforms[gluniform_fade_end] = GETUNI("fade_end");
+	shader->uniforms[gluniform_poly_color]            = GETUNI("poly_color");
+	shader->uniforms[gluniform_tint_color]            = GETUNI("tint_color");
+	shader->uniforms[gluniform_fade_color]            = GETUNI("fade_color");
+	shader->uniforms[gluniform_lighting]              = GETUNI("lighting");
+	shader->uniforms[gluniform_fade_start]            = GETUNI("fade_start");
+	shader->uniforms[gluniform_fade_end]              = GETUNI("fade_end");
+	shader->uniforms[gluniform_light_dir]             = GETUNI("light_dir");
+	shader->uniforms[gluniform_light_contrast]        = GETUNI("light_contrast");
+	shader->uniforms[gluniform_light_backlight]       = GETUNI("light_backlight");
 
 	// palette rendering
-	shader->uniforms[gluniform_palette_tex] = GETUNI("palette_tex");
-	shader->uniforms[gluniform_palette_lookup_tex] = GETUNI("palette_lookup_tex");
-	shader->uniforms[gluniform_lighttable_tex] = GETUNI("lighttable_tex");
+	shader->uniforms[gluniform_palette_tex]           = GETUNI("palette_tex");
+	shader->uniforms[gluniform_palette_lookup_tex]    = GETUNI("palette_lookup_tex");
+	shader->uniforms[gluniform_lighttable_tex]        = GETUNI("lighttable_tex");
 
-	shader->uniforms[gluniform_scr_resolution] = GETUNI("scr_resolution");
+	shader->uniforms[gluniform_scr_resolution]        = GETUNI("scr_resolution");
 
 	// misc.
-	shader->uniforms[gluniform_leveltime] = GETUNI("leveltime");
+	shader->uniforms[gluniform_leveltime]             = GETUNI("leveltime");
 #undef GETUNI
 
 	// set permanent uniform values
@@ -1996,13 +2333,13 @@ static boolean Shader_CompileProgram(gl_shader_t *shader, GLint i)
 // code that is common between DrawPolygon and DrawIndexedTriangles
 // DrawScreenTexture also can use this function for fancier screen texture drawing
 // the corona thing is there too, i have no idea if that stuff works with DrawIndexedTriangles and batching
-static void PreparePolygon(FSurfaceInfo *pSurf, FBITFIELD PolyFlags)
+static void GL_PreparePolygon(FSurfaceInfo *pSurf, FBITFIELD PolyFlags)
 {
 	static GLRGBAFloat poly = {0,0,0,0};
 	static GLRGBAFloat tint = {0,0,0,0};
 	static GLRGBAFloat fade = {0,0,0,0};
 
-	SetBlend(PolyFlags);    //TODO: inline (#pragma..)
+	GL_SetBlend(PolyFlags);    //TODO: inline (#pragma..)
 
 	if (pSurf)
 	{
@@ -2042,15 +2379,15 @@ static void PreparePolygon(FSurfaceInfo *pSurf, FBITFIELD PolyFlags)
 		}
 	}
 
-	Shader_SetUniforms(pSurf, &poly, &tint, &fade);
+	GL_Shader_SetUniforms(pSurf, &poly, &tint, &fade);
 }
 
 // -----------------+
 // DrawPolygon      : Render a polygon, set the texture, set render mode
 // -----------------+
-EXPORT void HWRAPI(DrawPolygon) (FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags)
+void GL_DrawPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags)
 {
-	PreparePolygon(pSurf, PolyFlags);
+	GL_PreparePolygon(pSurf, PolyFlags);
 
 	pglVertexPointer(3, GL_FLOAT, sizeof(FOutVector), &pOutVerts[0].x);
 	pglTexCoordPointer(2, GL_FLOAT, sizeof(FOutVector), &pOutVerts[0].s);
@@ -2066,9 +2403,9 @@ EXPORT void HWRAPI(DrawPolygon) (FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUI
 		Clamp2D(GL_TEXTURE_WRAP_T);
 }
 
-EXPORT void HWRAPI(DrawIndexedTriangles) (FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray)
+void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray)
 {
-	PreparePolygon(pSurf, PolyFlags);
+	GL_PreparePolygon(pSurf, PolyFlags);
 
 	pglVertexPointer(3, GL_FLOAT, sizeof(FOutVector), &pOutVerts[0].x);
 	pglTexCoordPointer(2, GL_FLOAT, sizeof(FOutVector), &pOutVerts[0].s);
@@ -2077,236 +2414,83 @@ EXPORT void HWRAPI(DrawIndexedTriangles) (FSurfaceInfo *pSurf, FOutVector *pOutV
 	// the DrawPolygon variant of this has some code about polyflags and wrapping here but havent noticed any problems from omitting it?
 }
 
-// Sky dome code, taken/backported from SRB2
-
-typedef struct vbo_vertex_s
-{
-	float x, y, z;
-	float u, v;
-	unsigned char r, g, b, a;
-} vbo_vertex_t;
-
-typedef struct
-{
-	int mode;
-	int vertexcount;
-	int vertexindex;
-	int use_texture;
-} GLSkyLoopDef;
-
-typedef struct
-{
-	unsigned int id;
-	int rows, columns;
-	int loopcount;
-	GLSkyLoopDef *loops;
-	vbo_vertex_t *data;
-} GLSkyVBO;
-
 static const boolean gl_ext_arb_vertex_buffer_object = true;
 
-#define NULL_VBO_VERTEX ((vbo_vertex_t*)NULL)
-#define sky_vbo_x (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->x : &vbo->data[0].x)
-#define sky_vbo_u (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->u : &vbo->data[0].u)
-#define sky_vbo_r (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->r : &vbo->data[0].r)
+#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)
 
-// The texture offset to be applied to the texture coordinates in SkyVertex().
-static int rows, columns;
-static signed char yflip;
-static int texw, texh;
-static boolean foglayer;
-static float delta = 0.0f;
-
-static int gl_sky_detail = 16;
-
-static INT32 lasttex = -1;
-
-#define MAP_COEFF 128.0f
-
-static void SkyVertex(vbo_vertex_t *vbo, int r, int c)
-{
-	const float radians = (float)(M_PIl / 180.0f);
-	const float scale = 10000.0f;
-	const float maxSideAngle = 60.0f;
-
-	float topAngle = (c / (float)columns * 360.0f);
-	float sideAngle = (maxSideAngle * (rows - r) / rows);
-	float height = (float)(sin(sideAngle * radians));
-	float realRadius = (float)(scale * cos(sideAngle * radians));
-	float x = (float)(realRadius * cos(topAngle * radians));
-	float y = (!yflip) ? scale * height : -scale * height;
-	float z = (float)(realRadius * sin(topAngle * radians));
-	float timesRepeat = (4 * (256.0f / texw));
-	if (fpclassify(timesRepeat) == FP_ZERO)
-		timesRepeat = 1.0f;
-
-	if (!foglayer)
-	{
-		vbo->r = 255;
-		vbo->g = 255;
-		vbo->b = 255;
-		vbo->a = (r == 0 ? 0 : 255);
-
-		// And the texture coordinates.
-		//vbo->u = (-timesRepeat * c / (float)columns);
-		vbo->u = (timesRepeat * c / (float)columns);// TEST
-		if (!yflip)	// Flipped Y is for the lower hemisphere.
-			vbo->v = (r / (float)rows) + 0.5f;
-		else
-			vbo->v = 1.0f + ((rows - r) / (float)rows) + 0.5f;
-	}
-
-	if (r != 4)
-	{
-		y += 300.0f;
-	}
-
-	// And finally the vertex.
-	vbo->x = x;
-	vbo->y = y + delta;
-	vbo->z = z;
-}
-
-static GLSkyVBO sky_vbo;
-
-static void gld_BuildSky(int row_count, int col_count)
-{
-	int c, r;
-	vbo_vertex_t *vertex_p;
-	int vertex_count = 2 * row_count * (col_count * 2 + 2) + col_count * 2;
-
-	GLSkyVBO *vbo = &sky_vbo;
-
-	if ((vbo->columns != col_count) || (vbo->rows != row_count))
-	{
-		free(vbo->loops);
-		free(vbo->data);
-		memset(vbo, 0, sizeof(&vbo));
-	}
-
-	if (!vbo->data)
-	{
-		memset(vbo, 0, sizeof(&vbo));
-		vbo->loops = malloc((row_count * 2 + 2) * sizeof(vbo->loops[0]));
-		// create vertex array
-		vbo->data = malloc(vertex_count * sizeof(vbo->data[0]));
-	}
-
-	vbo->columns = col_count;
-	vbo->rows = row_count;
-
-	vertex_p = &vbo->data[0];
-	vbo->loopcount = 0;
-
-	for (yflip = 0; yflip < 2; yflip++)
-	{
-		vbo->loops[vbo->loopcount].mode = GL_TRIANGLE_FAN;
-		vbo->loops[vbo->loopcount].vertexindex = vertex_p - &vbo->data[0];
-		vbo->loops[vbo->loopcount].vertexcount = col_count;
-		vbo->loops[vbo->loopcount].use_texture = false;
-		vbo->loopcount++;
-
-		delta = 0.0f;
-		foglayer = true;
-		for (c = 0; c < col_count; c++)
-		{
-			SkyVertex(vertex_p, 1, c);
-			vertex_p->r = 255;
-			vertex_p->g = 255;
-			vertex_p->b = 255;
-			vertex_p->a = 255;
-			vertex_p++;
-		}
-		foglayer = false;
-
-		delta = (yflip ? 5.0f : -5.0f) / MAP_COEFF;
-
-		for (r = 0; r < row_count; r++)
-		{
-			vbo->loops[vbo->loopcount].mode = GL_TRIANGLE_STRIP;
-			vbo->loops[vbo->loopcount].vertexindex = vertex_p - &vbo->data[0];
-			vbo->loops[vbo->loopcount].vertexcount = 2 * col_count + 2;
-			vbo->loops[vbo->loopcount].use_texture = true;
-			vbo->loopcount++;
-
-			for (c = 0; c <= col_count; c++)
-			{
-				SkyVertex(vertex_p++, r + (yflip ? 1 : 0), (c ? c : 0));
-				SkyVertex(vertex_p++, r + (yflip ? 0 : 1), (c ? c : 0));
-			}
-		}
-	}
-}
-
-//-----------------------------------------------------------------------------
-//
-//
-//
-//-----------------------------------------------------------------------------
-
-static void RenderDome(INT32 skytexnum)
+void GL_RenderSkyDome(gl_sky_t *sky)
 {
 	int i, j;
-	int vbosize;
-	GLSkyVBO *vbo = &sky_vbo;
 
-	rows = 4;
-	columns = 4 * gl_sky_detail;
-
-	vbosize = 2 * rows * (columns * 2 + 2) + columns * 2;
+	GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
 
 	// Build the sky dome! Yes!
-	if (lasttex != skytexnum)
+	if (sky->rebuild)
 	{
 		// delete VBO when already exists
 		if (gl_ext_arb_vertex_buffer_object)
 		{
-			if (vbo->id)
-				pglDeleteBuffers(1, &vbo->id);
+			if (sky->vbo)
+				pglDeleteBuffers(1, &sky->vbo);
 		}
 
-		lasttex = skytexnum;
-		gld_BuildSky(rows, columns);
-
 		if (gl_ext_arb_vertex_buffer_object)
 		{
 			// generate a new VBO and get the associated ID
-			pglGenBuffers(1, &vbo->id);
+			pglGenBuffers(1, &sky->vbo);
 
 			// bind VBO in order to use
-			pglBindBuffer(GL_ARRAY_BUFFER, vbo->id);
+			pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
 
 			// upload data to VBO
-			pglBufferData(GL_ARRAY_BUFFER, vbosize * sizeof(vbo->data[0]), vbo->data, GL_STATIC_DRAW);
+			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, vbo->id);
+		pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
 
 	// activate and specify pointers to arrays
-	pglVertexPointer(3, GL_FLOAT, sizeof(vbo->data[0]), sky_vbo_x);
-	pglTexCoordPointer(2, GL_FLOAT, sizeof(vbo->data[0]), sky_vbo_u);
-	pglColorPointer(4, GL_UNSIGNED_BYTE, sizeof(vbo->data[0]), sky_vbo_r);
+	pglVertexPointer(3, GL_FLOAT, sizeof(sky->data[0]), sky_vbo_x);
+	pglTexCoordPointer(2, GL_FLOAT, sizeof(sky->data[0]), sky_vbo_u);
+	pglColorPointer(4, GL_UNSIGNED_BYTE, sizeof(sky->data[0]), sky_vbo_r);
 
 	// activate color arrays
 	pglEnableClientState(GL_COLOR_ARRAY);
 
 	// set transforms
-	pglScalef(1.0f, (float)texh / 230.0f, 1.0f);
+	pglScalef(1.0f, (float)sky->height / 200.0f, 1.0f);
 	pglRotatef(270.0f, 0.0f, 1.0f, 0.0f);
 
 	for (j = 0; j < 2; j++)
 	{
-		for (i = 0; i < vbo->loopcount; i++)
+		for (i = 0; i < sky->loopcount; i++)
 		{
-			GLSkyLoopDef *loop = &vbo->loops[i];
+			gl_skyloopdef_t *loop = &sky->loops[i];
+			unsigned int mode = 0;
 
 			if (j == 0 ? loop->use_texture : !loop->use_texture)
 				continue;
 
-			pglDrawArrays(loop->mode, loop->vertexindex, loop->vertexcount);
+			switch (loop->mode)
+			{
+				case HWD_SKYLOOP_FAN:
+					mode = GL_TRIANGLE_FAN;
+					break;
+				case HWD_SKYLOOP_STRIP:
+					mode = GL_TRIANGLE_STRIP;
+					break;
+				default:
+					continue;
+			}
+
+			pglDrawArrays(mode, loop->vertexindex, loop->vertexcount);
 		}
 	}
 
@@ -2321,82 +2505,72 @@ static void RenderDome(INT32 skytexnum)
 	pglDisableClientState(GL_COLOR_ARRAY);
 }
 
-EXPORT void HWRAPI(RenderSkyDome) (INT32 tex, INT32 texture_width, INT32 texture_height, FTransform transform)
-{
-	SetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated);
-	SetTransform(&transform);
-	texw = texture_width;
-	texh = texture_height;
-	RenderDome(tex);
-	SetBlend(0);
-}
-
 // ==========================================================================
 //
 // ==========================================================================
-EXPORT void HWRAPI(SetSpecialState) (hwdspecialstate_t IdState, INT32 Value)
+void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value)
 {
 	switch (IdState)
 	{
 		case HWD_SET_SHADERS:
 			gl_allowshaders = Value;
 			break;
-#ifdef USE_FBO_OGL
-		case HWD_SET_FRAMEBUFFER:
-			FrameBufferEnabled = Value ? GL_TRUE : GL_FALSE;
-			supportFBO = GLFramebuffer_IsFuncAvailible();
-
-			if (!supportFBO)
-			{
-				FrameBufferEnabled = GL_FALSE;
-				CV_Set(&cv_grframebuffer, "Off");
-			}
-			break;
-#endif
 		case HWD_SET_TEXTUREFILTERMODE:
-			switch (Value)
 			{
-				case HWD_SET_TEXTUREFILTER_TRILINEAR:
-					min_filter = GL_LINEAR_MIPMAP_LINEAR;
-					mag_filter = GL_LINEAR;
-					MipMap = GL_TRUE;
-					break;
-				case HWD_SET_TEXTUREFILTER_BILINEAR:
-					min_filter = mag_filter = GL_LINEAR;
-					MipMap = GL_FALSE;
-					break;
-				case HWD_SET_TEXTUREFILTER_POINTSAMPLED:
-					min_filter = mag_filter = GL_NEAREST;
-					MipMap = GL_FALSE;
-					break;
-				case HWD_SET_TEXTUREFILTER_MIXED1:
-					min_filter = GL_NEAREST;
-					mag_filter = GL_LINEAR;
-					MipMap = GL_FALSE;
-					break;
-				case HWD_SET_TEXTUREFILTER_MIXED2:
-					min_filter = GL_LINEAR;
-					mag_filter = GL_NEAREST;
-					MipMap = GL_FALSE;
-					break;
-				case HWD_SET_TEXTUREFILTER_MIXED3:
-					min_filter = GL_LINEAR_MIPMAP_LINEAR;
-					mag_filter = GL_NEAREST;
-					MipMap = GL_TRUE;
-					break;
-				default:
-					mag_filter = GL_LINEAR;
-					min_filter = GL_NEAREST;
-			}
-			if (!supportMipMap)
-			{
-				MipMap = GL_FALSE;
-				min_filter = GL_LINEAR;
-			}
+				switch (Value)
+				{
+					case HWD_SET_TEXTUREFILTER_TRILINEAR:
+						min_filter = GL_LINEAR_MIPMAP_LINEAR;
+						mag_filter = GL_LINEAR;
+						MipMap     = GL_TRUE;
+						break;
+					case HWD_SET_TEXTUREFILTER_BILINEAR:
+						min_filter = mag_filter = GL_LINEAR;
+						MipMap = GL_FALSE;
+						break;
+					case HWD_SET_TEXTUREFILTER_POINTSAMPLED:
+						min_filter = mag_filter = GL_NEAREST;
+						MipMap = GL_FALSE;
+						break;
+					case HWD_SET_TEXTUREFILTER_MIXED1:
+						min_filter = GL_NEAREST;
+						mag_filter = GL_LINEAR;
+						MipMap     = GL_FALSE;
+						break;
+					case HWD_SET_TEXTUREFILTER_MIXED2:
+						min_filter = GL_LINEAR;
+						mag_filter = GL_NEAREST;
+						MipMap     = GL_FALSE;
+						break;
+					case HWD_SET_TEXTUREFILTER_MIXED3:
+						min_filter = GL_LINEAR_MIPMAP_LINEAR;
+						mag_filter = GL_NEAREST;
+						MipMap     = GL_TRUE;
+						break;
+					default:
+						min_filter = GL_NEAREST;
+						mag_filter = GL_LINEAR;
+				}
 
-			Flush(); //??? if we want to change filter mode by texture, remove this
+				if (!supportMipMap)
+				{
+					MipMap = GL_FALSE;
+					min_filter = GL_LINEAR;
+				}
+
+				GL_Flush(); //??? if we want to change filter mode by texture, remove this
+			}
 			break;
-			
+
+		case HWD_SET_WIREFRAME:
+			pglPolygonMode(GL_FRONT_AND_BACK, Value ? GL_LINE : GL_FILL);
+			break;
+
+		case HWD_SET_TEXTURE_FORMAT:
+			gltexformat = (Value == 32) ? GL_RGBA : GL_RGB5_A1;
+			GL_Flush();
+			break;
+
 		case HWD_SET_MSAA:
 			if (Value)
 			{
@@ -2407,9 +2581,9 @@ EXPORT void HWRAPI(SetSpecialState) (hwdspecialstate_t IdState, INT32 Value)
 			break;
 
 		case HWD_SET_TEXTUREANISOTROPICMODE:
-			anisotropic_filter = min(Value,maximumAnisotropy);
+			anisotropic_filter = min(Value, maximumAnisotropy);
 			if (maximumAnisotropy)
-				Flush(); //??? if we want to change filter mode by texture, remove this
+				GL_Flush(); //??? if we want to change filter mode by texture, remove this
 			break;
 
 		case HWD_SET_SCREEN_TEXTURES:
@@ -2495,7 +2669,7 @@ static size_t lerpTinyBufferSize = 0;
 
 // Static temporary buffer for doing frame interpolation
 // 'size' is the vertex size
-static void AllocLerpBuffer(size_t size)
+static void GL_AllocLerpBuffer(size_t size)
 {
 	if (lerpBufferSize >= size)
 		return;
@@ -2513,7 +2687,7 @@ static void AllocLerpBuffer(size_t size)
 
 // Static temporary buffer for doing frame interpolation
 // 'size' is the vertex size
-static void AllocLerpTinyBuffer(size_t size)
+static void GL_AllocLerpTinyBuffer(size_t size)
 {
 	if (lerpTinyBufferSize >= size)
 		return;
@@ -2537,7 +2711,7 @@ static void AllocLerpTinyBuffer(size_t size)
 #define GL_ARRAY_BUFFER 0x8892
 #endif
 
-static void CreateModelVBO(mesh_t *mesh, mdlframe_t *frame)
+static void GL_CreateModelVBO(mesh_t *mesh, mdlframe_t *frame)
 {
 	int bufferSize = sizeof(vbo64_t)*mesh->numTriangles * 3;
 	vbo64_t *buffer = (vbo64_t*)malloc(bufferSize);
@@ -2605,7 +2779,7 @@ static void CreateModelVBO(mesh_t *mesh, mdlframe_t *frame)
 	pglBindBuffer(GL_ARRAY_BUFFER, 0);
 }
 
-static void CreateModelVBOTiny(mesh_t *mesh, tinyframe_t *frame)
+static void GL_CreateModelVBOTiny(mesh_t *mesh, tinyframe_t *frame)
 {
 	int bufferSize = sizeof(vbotiny_t)*mesh->numTriangles * 3;
 	vbotiny_t *buffer = (vbotiny_t*)malloc(bufferSize);
@@ -2650,9 +2824,10 @@ static void CreateModelVBOTiny(mesh_t *mesh, tinyframe_t *frame)
 	pglBindBuffer(GL_ARRAY_BUFFER, 0);
 }
 
-EXPORT void HWRAPI(CreateModelVBOs) (model_t *model)
+void GL_CreateModelVBOs(model_t *model)
 {
 	int i;
+
 	for (i = 0; i < model->numMeshes; i++)
 	{
 		mesh_t *mesh = &model->meshes[i];
@@ -2666,7 +2841,7 @@ EXPORT void HWRAPI(CreateModelVBOs) (model_t *model)
 				if (frame->vboID)
 					pglDeleteBuffers(1, &frame->vboID);
 				frame->vboID = 0;
-				CreateModelVBO(mesh, frame);
+				GL_CreateModelVBO(mesh, frame);
 			}
 		}
 		else if (mesh->tinyframes)
@@ -2678,7 +2853,7 @@ EXPORT void HWRAPI(CreateModelVBOs) (model_t *model)
 				if (frame->vboID)
 					pglDeleteBuffers(1, &frame->vboID);
 				frame->vboID = 0;
-				CreateModelVBOTiny(mesh, frame);
+				GL_CreateModelVBOTiny(mesh, frame);
 			}
 		}
 	}
@@ -2686,7 +2861,7 @@ EXPORT void HWRAPI(CreateModelVBOs) (model_t *model)
 
 #define BUFFER_OFFSET(i) ((char*)(i))
 
-static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
+void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
 {
 	static GLRGBAFloat poly = {0,0,0,0};
 	static GLRGBAFloat tint = {0,0,0,0};
@@ -2705,7 +2880,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float
 	scalex = hscale;
 	scaley = vscale;
 	scalez = hscale;
-	
+
 	if (duration > 0.0 && tics >= 0.0) // don't interpolate if instantaneous or infinite in length
 	{
 		float newtime = (duration - tics); // + 1;
@@ -2724,13 +2899,10 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float
 	poly.blue   = byte2float[Surface->PolyColor.s.blue];
 	poly.alpha  = byte2float[Surface->PolyColor.s.alpha];
 
-	if (poly.alpha < 1)
-		SetBlend(PF_Translucent|PF_Modulated);
-	else
-		SetBlend(PF_Masked|PF_Modulated|PF_Occlude);
-
 	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];
@@ -2740,7 +2912,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float
 	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)
 	{
 		pglActiveTexture(GL_TEXTURE2);
@@ -2749,31 +2921,22 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float
 		lt_downloaded = Surface->LightTableId;
 	}
 
-	Shader_SetUniforms(Surface, &poly, &tint, &fade);
+	GL_Shader_SetUniforms(Surface, &poly, &tint, &fade);
 
 	pglEnable(GL_CULL_FACE);
 	pglEnable(GL_NORMALIZE);
 
-#ifdef USE_FTRANSFORM_MIRROR
 	// flipped is if the object is vertically flipped
 	// hflipped is if the object is horizontally flipped
 	// pos->flip is if the screen is flipped vertically
 	// pos->mirror is if the screen is flipped horizontally
 	// XOR all the flips together to figure out what culling to use!
 	{
-		boolean reversecull = (flipped ^ hflipped ^ pos->flip ^ pos->mirror);
-		if (reversecull)
+		if ((flipped ^ hflipped ^ !!(pos->fliptype & TRANSFORM_FLIP) ^ !!(pos->fliptype & TRANSFORM_MIRROR)))
 			pglCullFace(GL_FRONT);
 		else
 			pglCullFace(GL_BACK);
 	}
-#else
-	// pos->flip is if the screen is flipped too
-	if (flipped ^ hflipped ^ pos->flip) // If one or three of these are active, but not two, invert the model's culling
-		pglCullFace(GL_FRONT);
-	else
-		pglCullFace(GL_BACK);
-#endif
 
 	pglPushMatrix(); // should be the same as glLoadIdentity
 	pglTranslatef(pos->x, pos->z, pos->y);
@@ -2781,30 +2944,15 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float
 		scaley = -scaley;
 	if (hflipped)
 		scalez = -scalez;
-#ifdef USE_FTRANSFORM_ANGLEZ
-	pglRotatef(pos->anglez2, 0.0f, 0.0f, -1.0f); // rotate by slope from Kart
-#endif
-	pglRotatef(pos->anglex2, -1.0f, 0.0f, 0.0f);
-	pglRotatef(pos->angley, 0.0f, -1.0f, 0.0f);
-	
+
+	pglRotatef(pos->anglez, 0.0f,  0.0f, -1.0f);
+	pglRotatef(pos->anglex, 1.0f,  0.0f,  0.0f);
+	pglRotatef(pos->angley, 0.0f, -1.0f,  0.0f);
+
 	if (pos->roll)
 	{
-		float roll = (1.0f * pos->rollflip);
 		pglTranslatef(pos->centerx, pos->centery, 0);
-
-		// rotate model for pitch and roll
-		pglRotatef(pos->anglex, 1.0f, 0.0f, 0.0f);
-#ifdef USE_FTRANSFORM_ANGLEZ
-		pglRotatef(pos->anglez, 0.0f, 0.0f, -1.0f);
-#endif
-
-		if (pos->rotaxis == 2) // Z
-			pglRotatef(pos->rollangle, 0.0f, 0.0f, roll);
-		else if (pos->rotaxis == 1) // Y
-			pglRotatef(pos->rollangle, 0.0f, roll, 0.0f);
-		else // X
-			pglRotatef(pos->rollangle, roll, 0.0f, 0.0f);
-			
+		pglRotatef(pos->rollangle, pos->rollx, 0.0f, pos->rollz);
 		pglTranslatef(-pos->centerx, -pos->centery, 0);
 	}
 
@@ -2845,7 +2993,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float
 				int j = 0;
 
 				// Dangit, I soooo want to do this in a GLSL shader...
-				AllocLerpTinyBuffer(mesh->numVertices * sizeof(short) * 3);
+				GL_AllocLerpTinyBuffer(mesh->numVertices * sizeof(short) * 3);
 				vertPtr = vertTinyBuffer;
 				normPtr = normTinyBuffer;
 
@@ -2888,7 +3036,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float
 				int j = 0;
 
 				// Dangit, I soooo want to do this in a GLSL shader...
-				AllocLerpBuffer(mesh->numVertices * sizeof(float) * 3);
+				GL_AllocLerpBuffer(mesh->numVertices * sizeof(float) * 3);
 				vertPtr = vertBuffer;
 				normPtr = normBuffer;
 
@@ -2914,18 +3062,10 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, float duration, float
 	pglDisable(GL_NORMALIZE);
 }
 
-// -----------------+
-// HWRAPI DrawModel : Draw a model
-// -----------------+
-EXPORT void HWRAPI(DrawModel) (model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
-{
-	DrawModelEx(model, frameIndex, duration, tics, nextFrameIndex, pos, hscale, vscale, flipped, hflipped, Surface);
-}
-
 // -----------------+
 // SetTransform     :
 // -----------------+
-EXPORT void HWRAPI(SetTransform) (FTransform *stransform)
+void GL_SetTransform(FTransform *stransform)
 {
 	static boolean special_splitscreen;
 	GLdouble used_fov;
@@ -2935,23 +3075,24 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform)
 
 	if (stransform)
 	{
-		used_fov = stransform->fovxangle;
+		used_fov = stransform->fovangle;
 		shearing = stransform->shearing;
-		// keep a trace of the transformation for md2
-		memcpy(&md2_transform, stransform, sizeof (md2_transform));
 
-#ifdef USE_FTRANSFORM_MIRROR
-		// mirroring from Kart
-		if (stransform->mirror)
-			pglScalef(-stransform->scalex, stransform->scaley, -stransform->scalez);
-		else if (stransform->mirrorflip)
-			pglScalef(-stransform->scalex, -stransform->scaley, -stransform->scalez);
-		else
-#endif
-		if (stransform->flip)
-			pglScalef(stransform->scalex, -stransform->scaley, -stransform->scalez);
-		else
-			pglScalef(stransform->scalex, stransform->scaley, -stransform->scalez);
+		switch (stransform->fliptype)
+		{
+			case TRANSFORM_MIRROR:
+				pglScalef(-stransform->scalex, stransform->scaley, -stransform->scalez);
+				break;
+			case TRANSFORM_MIRRORFLIP:
+				pglScalef(-stransform->scalex, -stransform->scaley, -stransform->scalez);
+				break;
+			case TRANSFORM_FLIP:
+				pglScalef(stransform->scalex, -stransform->scaley, -stransform->scalez);
+				break;
+			default: // TRANSFORM_NONE
+				pglScalef(stransform->scalex, stransform->scaley, -stransform->scalez);
+				break;
+		}
 
 		if (stransform->roll)
 			pglRotatef(stransform->rollangle, 0.0f, 0.0f, 1.0f);
@@ -2976,19 +3117,21 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform)
 	// https://zdoom.org/wiki/Y-shearing
 	if (shearing)
 	{
-		float dy = FIXED_TO_FLOAT(AIMINGTODY((stransform->viewaiming)) * 2)* ((float)vid.width / vid.height) / ((float)BASEVIDWIDTH / BASEVIDHEIGHT); //screen_width/BASEVIDWIDTH;
-		if (stransform->flip || stransform->mirrorflip)
+		float dy = stransform->viewaiming * 2;
+
+		if (stransform->fliptype == TRANSFORM_FLIP || stransform->fliptype == TRANSFORM_MIRRORFLIP)
 			dy *= -1.0f;
+
 		pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f);
 	}
 
 	if (special_splitscreen)
 	{
-		used_fov = (float)(atan(tan(used_fov*M_PI/360)*0.8)*360/M_PI);
-		GLPerspective((GLfloat)used_fov, 2*ASPECT_RATIO);
+		used_fov = (float)(atan(tan(used_fov * M_PIl / 360) * 0.8) * 360 / M_PIl);
+		GL_Perspective((GLfloat)used_fov, 2*ASPECT_RATIO);
 	}
 	else
-		GLPerspective((GLfloat)used_fov, ASPECT_RATIO);
+		GL_Perspective((GLfloat)used_fov, ASPECT_RATIO);
 
 	pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix); // added for new coronas' code (without depth buffer)
 	pglMatrixMode(GL_MODELVIEW);
@@ -2996,7 +3139,7 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform)
 	pglGetFloatv(GL_MODELVIEW_MATRIX, modelMatrix); // added for new coronas' code (without depth buffer)
 }
 
-EXPORT INT32  HWRAPI(GetTextureUsed) (void)
+INT32 GL_GetTextureUsed(void)
 {
 	FTextureInfo *tmp = TexCacheHead;
 	INT32 res = 0;
@@ -3017,38 +3160,34 @@ EXPORT INT32  HWRAPI(GetTextureUsed) (void)
 		res += tmp->height*tmp->width*bpp;
 		tmp = tmp->next;
 	}
-	
+
 	return res;
 }
 
-EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2])
+void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2])
 {
 	INT32 x, y;
 	float float_x, float_y, float_nextx, float_nexty;
 	float xfix, yfix;
-	INT32 texsize = 512;
 
 	const float blackBack[16] =
 	{
 		-16.0f, -16.0f, 6.0f,
-		-16.0f, 16.0f, 6.0f,
-		16.0f, 16.0f, 6.0f,
-		16.0f, -16.0f, 6.0f
+		-16.0f,  16.0f, 6.0f,
+		 16.0f,  16.0f, 6.0f,
+		 16.0f, -16.0f, 6.0f
 	};
-	
-	if (gl_enable_screen_textures != 2) 
+
+	if (gl_enable_screen_textures != 2)
 		return;
 
-	// look for power of two that is large enough for the screen
-	while (texsize < screen_width || texsize < screen_height)
-		texsize <<= 1;
-
 	// X/Y stretch fix for all resolutions(!)
-	xfix = (float)(texsize)/((float)((screen_width)/(float)(SCREENVERTS-1)));
-	yfix = (float)(texsize)/((float)((screen_height)/(float)(SCREENVERTS-1)));
+	xfix = (float)(screen_texsizew)/((float)((screen_width)/(float)(SCREENVERTS-1)));
+	yfix = (float)(screen_texsizeh)/((float)((screen_height)/(float)(SCREENVERTS-1)));
 
 	pglDisable(GL_DEPTH_TEST);
 	pglDisable(GL_BLEND);
+	pglDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	// Draw a black square behind the screen texture,
 	// so nothing shows through the edges
@@ -3056,11 +3195,11 @@ EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2])
 
 	pglVertexPointer(3, GL_FLOAT, 0, blackBack);
 	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-
 	pglEnableClientState(GL_TEXTURE_COORD_ARRAY);
-	for(x=0;x<SCREENVERTS-1;x++)
+
+	for (x = 0; x < (SCREENVERTS-1); x ++)
 	{
-		for(y=0;y<SCREENVERTS-1;y++)
+		for (y = 0; y < (SCREENVERTS-1); y++)
 		{
 			float stCoords[8];
 			float vertCoords[12];
@@ -3109,38 +3248,30 @@ EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2])
 
 // Sryder:	This needs to be called whenever the screen changes resolution in order to reset the screen textures to use
 //			a new size
-EXPORT void HWRAPI(FlushScreenTextures) (void)
+void GL_FlushScreenTextures(void)
 {
-	int i;
 	pglDeleteTextures(NUMSCREENTEXTURES, screenTextures);
-	for (i = 0; i < NUMSCREENTEXTURES; i++)
-		screenTextures[i] = 0;
+	memset(screenTextures, 0, sizeof(screenTextures));
 }
 
-EXPORT void HWRAPI(DrawScreenTexture)(int tex, FSurfaceInfo *surf, FBITFIELD polyflags)
+void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags)
 {
+	float fix[8];
 	float xfix, yfix;
-	INT32 texsize = 512;
 
 	const float screenVerts[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
+		-1.0f,  1.0f, 1.0f,
+		 1.0f,  1.0f, 1.0f,
+		 1.0f, -1.0f, 1.0f
 	};
 
-	float fix[8];
-	
-	if (gl_enable_screen_textures != 2) 
+	if (gl_enable_screen_textures != 2)
 		return;
 
-	// look for power of two that is large enough for the screen
-	while (texsize < screen_width || texsize < screen_height)
-		texsize <<= 1;
-
-	xfix = 1/((float)(texsize)/((float)((screen_width))));
-	yfix = 1/((float)(texsize)/((float)((screen_height))));
+	xfix = 1/((float)(screen_texsizew)/((float)((screen_width))));
+	yfix = 1/((float)(screen_texsizeh)/((float)((screen_height))));
 
 	// const float screenVerts[12]
 
@@ -3157,8 +3288,8 @@ EXPORT void HWRAPI(DrawScreenTexture)(int tex, FSurfaceInfo *surf, FBITFIELD pol
 	pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 
 	pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
-	
-	PreparePolygon(surf, surf ? polyflags : (PF_NoDepthTest));
+
+	GL_PreparePolygon(surf, surf ? polyflags : (PF_NoDepthTest));
 	if (!surf)
 		pglColor4ubv(white);
 
@@ -3171,9 +3302,8 @@ EXPORT void HWRAPI(DrawScreenTexture)(int tex, FSurfaceInfo *surf, FBITFIELD pol
 
 
 // Do screen fades!
-EXPORT void HWRAPI(DoScreenWipe)(int wipeStart, int wipeEnd)
+void GL_DoScreenWipe(int wipeStart, int wipeEnd)
 {
-	INT32 texsize = 512;
 	float xfix, yfix;
 
 	INT32 fademaskdownloaded = tex_downloaded; // the fade mask that has been set
@@ -3181,9 +3311,9 @@ EXPORT void HWRAPI(DoScreenWipe)(int wipeStart, int wipeEnd)
 	const float screenVerts[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
+		-1.0f,  1.0f, 1.0f,
+		 1.0f,  1.0f, 1.0f,
+		 1.0f, -1.0f, 1.0f
 	};
 
 	float fix[8];
@@ -3196,15 +3326,11 @@ EXPORT void HWRAPI(DoScreenWipe)(int wipeStart, int wipeEnd)
 		1.0f, 1.0f
 	};
 
-	if (!gl_enable_screen_textures) 
+	if (!gl_enable_screen_textures)
 		return;
 
-	// look for power of two that is large enough for the screen
-	while (texsize < screen_width || texsize < screen_height)
-		texsize <<= 1;
-
-	xfix = 1/((float)(texsize)/((float)((screen_width))));
-	yfix = 1/((float)(texsize)/((float)((screen_height))));
+	xfix = 1/((float)(screen_texsizew)/((float)((screen_width))));
+	yfix = 1/((float)(screen_texsizeh)/((float)((screen_height))));
 
 	// const float screenVerts[12]
 
@@ -3220,7 +3346,7 @@ EXPORT void HWRAPI(DoScreenWipe)(int wipeStart, int wipeEnd)
 
 	pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 
-	SetBlend(PF_Modulated|PF_NoDepthTest);
+	GL_SetBlend(PF_Modulated|PF_NoDepthTest);
 	pglEnable(GL_TEXTURE_2D);
 
 	// Draw the original screen
@@ -3230,7 +3356,7 @@ EXPORT void HWRAPI(DoScreenWipe)(int wipeStart, int wipeEnd)
 	pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
 	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
-	SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
+	GL_SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
 
 	// Draw the end screen that fades in
 	pglActiveTexture(GL_TEXTURE0);
@@ -3244,8 +3370,6 @@ EXPORT void HWRAPI(DoScreenWipe)(int wipeStart, int wipeEnd)
 
 	pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
-	// const float defaultST[8]
-
 	pglClientActiveTexture(GL_TEXTURE0);
 	pglTexCoordPointer(2, GL_FLOAT, 0, fix);
 	pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
@@ -3262,9 +3386,9 @@ EXPORT void HWRAPI(DoScreenWipe)(int wipeStart, int wipeEnd)
 	tex_downloaded = screenTextures[wipeEnd];
 }
 
-EXPORT void HWRAPI(RenderVhsEffect) (fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize)
+void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize)
 {
-	INT32 texsize = 512;
+	int tex = HWD_SCREENTEXTURE_VHS;
 	float xfix, yfix;
 	float fix[8];
 	GLubyte color[4] = {255, 255, 255, 255};
@@ -3273,25 +3397,21 @@ EXPORT void HWRAPI(RenderVhsEffect) (fixed_t upbary, fixed_t downbary, UINT8 upd
 	float screenVerts[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
+		-1.0f,  1.0f, 1.0f,
+		 1.0f,  1.0f, 1.0f,
+		 1.0f, -1.0f, 1.0f
 	};
 
-	if (gl_enable_screen_textures != 2) 
+	if (gl_enable_screen_textures != 2)
 		return;
 
-	// look for power of two that is large enough for the screen
-	while (texsize < screen_width || texsize < screen_height)
-		texsize <<= 1;
-
-	xfix = 1/((float)(texsize)/((float)((screen_width))));
-	yfix = 1/((float)(texsize)/((float)((screen_height))));
+	xfix = 1/((float)(screen_texsizew)/((float)((screen_width))));
+	yfix = 1/((float)(screen_texsizeh)/((float)((screen_height))));
 
 	// Slight fuzziness
-	MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
-	SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
-	//pglBindTexture(GL_TEXTURE_2D, screentexture);
+	GL_MakeScreenTexture(tex);
+	GL_SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
+	pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
 
 	for (i = 0; i < 1; i += 2.f/vid.height)
 	{
@@ -3313,8 +3433,9 @@ EXPORT void HWRAPI(RenderVhsEffect) (fixed_t upbary, fixed_t downbary, UINT8 upd
 	}
 
 	// Upward bar
-	MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
-	//pglBindTexture(GL_TEXTURE_2D, screentexture);
+	GL_MakeScreenTexture(tex);
+	pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
+
 	color[0] = color[1] = color[2] = 190;
 	color[3] = 250;
 	pglColor4ubv(color);
@@ -3341,8 +3462,8 @@ EXPORT void HWRAPI(RenderVhsEffect) (fixed_t upbary, fixed_t downbary, UINT8 upd
 	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
 
 	// Downward bar
-	MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
-	//pglBindTexture(GL_TEXTURE_2D, screentexture);
+	GL_MakeScreenTexture(tex);
+	pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
 
 	fix[0] = 0.0f;
 	fix[6] = xfix;
@@ -3367,21 +3488,17 @@ EXPORT void HWRAPI(RenderVhsEffect) (fixed_t upbary, fixed_t downbary, UINT8 upd
 }
 
 // Create a texture from the screen.
-EXPORT void HWRAPI(MakeScreenTexture) (int tex)
+void GL_MakeScreenTexture(int tex)
 {
-	INT32 texsize = 512;
 	boolean firstTime = (screenTextures[tex] == 0);
-	
+
 	if (!gl_enable_screen_textures)
 		return;
 
-	// look for power of two that is large enough for the screen
-	while (texsize < screen_width || texsize < screen_height)
-		texsize <<= 1;
-
 	// Create screen texture
 	if (firstTime)
 		pglGenTextures(1, &screenTextures[tex]);
+
 	pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
 
 	if (firstTime)
@@ -3390,37 +3507,33 @@ EXPORT void HWRAPI(MakeScreenTexture) (int tex)
 		pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 		Clamp2D(GL_TEXTURE_WRAP_S);
 		Clamp2D(GL_TEXTURE_WRAP_T);
-		pglCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, texsize, texsize, 0);
+		pglCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, screen_texsizew, screen_texsizeh, 0);
 	}
 	else
-		pglCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, texsize, texsize);
+		pglCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, screen_texsizew, screen_texsizeh);
 
 	tex_downloaded = screenTextures[tex];
 }
 
-EXPORT void HWRAPI(DrawScreenFinalTexture)(int tex, INT32 width, INT32 height)
+void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader)
 {
 	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;
-	INT32 texsize = 512;
 
 	float off[12];
 	float fix[8];
-	
+
 	if (gl_enable_screen_textures != 2)
 		return;
 
-	// look for power of two that is large enough for the screen
-	while (texsize < screen_width || texsize < screen_height)
-		texsize <<= 1;
-
-	xfix = 1/((float)(texsize)/((float)((screen_width))));
-	yfix = 1/((float)(texsize)/((float)((screen_height))));
+	xfix = 1/((float)(screen_texsizew)/((float)((screen_width))));
+	yfix = 1/((float)(screen_texsizeh)/((float)((screen_height))));
 
 	origaspect = (float)screen_width / screen_height;
 	newaspect = (float)width / height;
+
 	if (origaspect < newaspect)
 	{
 		xoff = origaspect / newaspect;
@@ -3460,12 +3573,12 @@ EXPORT void HWRAPI(DrawScreenFinalTexture)(int tex, INT32 width, INT32 height)
 
 	clearColour.red = clearColour.green = clearColour.blue = 0;
 	clearColour.alpha = 1;
-	ClearBuffer(true, false, false, &clearColour);
-	SetBlend(PF_NoDepthTest);
+	GL_ClearBuffer(true, false, false, &clearColour);
+	GL_SetBlend(PF_NoDepthTest);
 
 	pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
-	
-	if (HWR_ShouldUsePaletteRendering())
+
+	if (useshader)
 		pglUseProgram(gl_shaders[SHADER_PALETTE_POSTPROCESS].program); // palette postprocess shader
 
 	pglColor4ubv(white);
@@ -3474,14 +3587,14 @@ EXPORT void HWRAPI(DrawScreenFinalTexture)(int tex, INT32 width, INT32 height)
 	pglVertexPointer(3, GL_FLOAT, 0, off);
 
 	pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
-	
-	if (HWR_ShouldUsePaletteRendering())
+
+	if (useshader)
 		pglUseProgram(0);
 
 	tex_downloaded = screenTextures[tex];
 }
 
-EXPORT void HWRAPI(SetPaletteLookup)(UINT8 *lut)
+void GL_SetPaletteLookup(UINT8 *lut)
 {
 	GLenum internalFormat;
 	if (gl_version[0] == '1' || gl_version[0] == '2')
@@ -3496,7 +3609,7 @@ EXPORT void HWRAPI(SetPaletteLookup)(UINT8 *lut)
 	{
 		internalFormat = GL_R8;
 	}
-	
+
 	if (!paletteLookupTex)
 		pglGenTextures(1, &paletteLookupTex);
 	pglActiveTexture(GL_TEXTURE1);
@@ -3508,7 +3621,7 @@ EXPORT void HWRAPI(SetPaletteLookup)(UINT8 *lut)
 	pglActiveTexture(GL_TEXTURE0);
 }
 
-EXPORT UINT32 HWRAPI(CreateLightTable)(RGBA_t *hw_lighttable)
+UINT32 GL_CreateLightTable(RGBA_t *hw_lighttable)
 {
 	LTListItem *item = malloc(sizeof(LTListItem));
 	if (!LightTablesTail)
@@ -3534,7 +3647,7 @@ EXPORT UINT32 HWRAPI(CreateLightTable)(RGBA_t *hw_lighttable)
 }
 
 // Delete light table textures, ids given before become invalid and must not be used.
-EXPORT void HWRAPI(ClearLightTables)(void)
+void GL_ClearLightTables(void)
 {
 	while (LightTablesHead)
 	{
@@ -3545,19 +3658,21 @@ EXPORT void HWRAPI(ClearLightTables)(void)
 	}
 
 	LightTablesTail = NULL;
-	
+
 	// we no longer have a bound light table (if we had one), we just deleted it!
 	lt_downloaded = 0;
 }
 
 // This palette is used for the palette rendering postprocessing step.
-EXPORT void HWRAPI(SetScreenPalette)(RGBA_t *palette)
+void GL_SetScreenPalette(RGBA_t *palette)
 {
 	if (memcmp(screenPalette, palette, sizeof(screenPalette)))
 	{
 		memcpy(screenPalette, palette, sizeof(screenPalette));
+
 		if (!screenPaletteTex)
 			pglGenTextures(1, &screenPaletteTex);
+
 		pglActiveTexture(GL_TEXTURE2);
 		pglBindTexture(GL_TEXTURE_1D, screenPaletteTex);
 		pglTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
diff --git a/src/hardware/r_opengl/r_opengl.h b/src/hardware/r_opengl/r_opengl.h
index 255969d5a..e0d7e13ac 100644
--- a/src/hardware/r_opengl/r_opengl.h
+++ b/src/hardware/r_opengl/r_opengl.h
@@ -20,6 +20,10 @@
 #ifndef _R_OPENGL_H_
 #define _R_OPENGL_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef HAVE_SDL
 #define _MATH_DEFINES_DEFINED
 
@@ -43,8 +47,9 @@
 #endif
 
 #define  _CREATE_DLL_  // necessary for Unix AND Windows
+
 #include "../../doomdef.h"
-#include "../hw_drv.h"
+#include "../hw_gl.h"
 #include "../../z_zone.h"
 
 // ==========================================================================
@@ -65,14 +70,15 @@ extern FILE             *gllogstream;
 //                                                                     PROTOS
 // ==========================================================================
 
-boolean LoadGL(void);
+FUNCPRINTF void GL_DBG_Printf(const char *format, ...);
+
 void *GetGLFunc(const char *proc);
 boolean SetupGLfunc(void);
 void SetupGLFunc4(void);
-void Flush(void);
-INT32 isExtAvailable(const char *extension, const GLubyte *start);
-void SetModelView(GLint w, GLint h);
-void SetStates(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);
 
 #ifndef GL_EXT_texture_filter_anisotropic
 #define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
@@ -98,21 +104,12 @@ typedef void (APIENTRY * PFNglGetIntegerv) (GLenum pname, GLint *params);
 extern PFNglGetIntegerv pglGetIntegerv;
 typedef const GLubyte* (APIENTRY  * PFNglGetString) (GLenum name);
 extern PFNglGetString pglGetString;
-#if 0
-typedef void (APIENTRY * PFNglEnableClientState) (GLenum cap); // redefined in r_opengl.c
-static PFNglEnableClientState pglEnableClientState;
-#endif
 #endif
 
 #ifdef USE_FBO_OGL
-void GLFramebuffer_Generate(void);
-void GLFramebuffer_Delete(void);
-
-void GLFramebuffer_GenerateAttachments(void);
-void GLFramebuffer_DeleteAttachments(void);
-
-void GLFramebuffer_Enable(void);
-void GLFramebuffer_Disable(void);
+void GL_Framebuffer_Unbind(void);
+void GL_Framebuffer_Enable(void);
+void GL_Framebuffer_Disable(void);
 
 extern GLuint FramebufferObject, FramebufferTexture, RenderbufferObject;
 extern GLboolean FrameBufferEnabled, RenderToFramebuffer;
@@ -126,6 +123,8 @@ extern boolean supportFBO;
 extern const GLubyte	*gl_version;
 extern const GLubyte	*gl_renderer;
 extern const GLubyte	*gl_extensions;
+extern const GLubyte    *gl_vendor;
+extern GLuint     gl_num_extensions;
 
 extern int 				majorGL, minorGL;
 
@@ -139,7 +138,6 @@ extern boolean 			supportMipMap;
 /**	\brief OpenGL flags for video driver
 */
 extern INT32            oglflags;
-extern GLint            textureformatGL;
 
 extern GLfloat projMatrix[16];
 
@@ -149,4 +147,8 @@ typedef enum
 	GLF_NOTEXENV   = 0x02,
 } oglflags_t;
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/hardware/s_ds3d/s_ds3d.c b/src/hardware/s_ds3d/s_ds3d.c
deleted file mode 100644
index 5299c1795..000000000
--- a/src/hardware/s_ds3d/s_ds3d.c
+++ /dev/null
@@ -1,1237 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2001 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//-----------------------------------------------------------------------------
-/// \file
-/// \brief General driver for 3D sound system
-///
-///	Implementend via DirectSound3D API
-
-#define INITGUID
-//#define WIN32_LEAN_AND_MEAN
-#define RPC_NO_WINDOWS_H
-#include <windows.h>
-#include <cguid.h>
-#define DIRECTSOUND_VERSION  0x0700       /* version 7.0 */
-
-#ifdef __MINGW32__
-#define NONAMELESSUNION
-#endif
-#include <dsound.h>
-
-#if (defined (DIRECTSOUND_VERSION) && (DIRECTSOUND_VERSION >= 0x0700))
-#define DX7 //Enable DX7 or up  only code
-#undef DUMMYUNIONNAMEN
-#endif
-
-#ifdef __MINGW32__
-//#undef DX7
-#endif
-
-#define  _CREATE_DLL_
-#include "../hw3dsdrv.h"
-#include "../../m_fixed.h"
-#include "../../doomdef.h"
-//#define VERSIONSTRING "v1.08"
-
-#undef DEBUG_TO_FILE
-#define DEBUG_TO_FILE
-
-#if defined ( HAVE_SDL ) && !defined ( LOGMESSAGES )
-#undef DEBUG_TO_FILE
-#endif
-
-
-// Internal sound stack
-typedef struct stack_snd_s
-{
-	// Sound data
-	LPDIRECTSOUNDBUFFER     dsbuffer;
-
-	// 3D data of 3D source
-	LPDIRECTSOUND3DBUFFER   dsbuffer3D;     // 3D data
-
-	// Current parameters of 3D source
-	// Valid only when source is 3D source
-	// (dsbuffer3D is not NULL)
-	DS3DBUFFER              parameters;
-
-	// Currently unused
-	INT32                     sfx_id;
-
-	// Currently unused
-	INT32                     LRU;
-
-	// Flag of static source
-	// Driver does not manage intrenally such sources
-	INT32                     permanent;
-
-} stack_t;
-
-// Just for now...
-#define SOUND_ALLOCATE_DELTA    16       // Amount of sources per stack incrementation
-#define MAX_LRU                 16       // Maximum iterations to keep source in stack
-
-static stack_t  *_stack;                 // Sound stack
-static INT32      allocated_sounds;        // Size of stack
-
-static INT32      srate;                   // Default sample rate
-
-
-// output all debugging messages to this file
-#if defined (DEBUG_TO_FILE)
-#include <stdio.h>
-FILE *logstream = NULL;
-#endif
-
-static LPDIRECTSOUND            DSnd            = NULL;  // Main DirectSound object
-static LPDIRECTSOUNDBUFFER      PrimaryBuffer   = NULL;  //
-static LPDIRECTSOUND3DLISTENER  Listener        = NULL;  //
-
-static DS3DLISTENER             listener_parms;          // Listener papameters
-
-#ifdef DX7
-static BOOL                     virtualization;          // TRUE if HRTF virtualization enabled
-#endif
-
-static DWORD                    update_mode;             // Current update mode of listener
-//static DWORD                    max_3d_buffers;
-
-static I_Error_t I_ErrorDS3D = NULL;
-
-//static stack_snd_t sound_stack[MAX_SOUNDS];
-
-// Safe buffer release
-#define RELEASE_BUFFER(buf)     {if (buf) { IDirectSoundBuffer_Release(buf); (buf) = NULL; }}
-#define RELEASE_3DBUFFER(buf)   {if (buf) { IDirectSound3DBuffer_Release(buf); (buf) = NULL; }}
-
-// Default flags for buffers
-#define _2DSOURCE_FLAGS (DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_STICKYFOCUS | DSBCAPS_STATIC | DSBCAPS_CTRLFREQUENCY)
-#define _3DSOURCE_FLAGS (DSBCAPS_CTRL3D | DSBCAPS_STATIC | DSBCAPS_MUTE3DATMAXDISTANCE | DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFREQUENCY)
-
-
-enum {IS_2DSOURCE = 0, IS_3DSOURCE = 1};
-
-#define NEW_HANDLE  -1
-
-#ifdef _WINDOWS
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, // handle to DLL module
-                    DWORD fdwReason,    // reason for calling function
-                    LPVOID lpvReserved) // reserved
-{
-	// Perform actions based on the reason for calling
-	UNREFERENCED_PARAMETER(lpvReserved);
-	switch ( fdwReason )
-	{
-		case DLL_PROCESS_ATTACH:
-			// Initialize once for each new process.
-			// Return FALSE to fail DLL load.
-#ifdef DEBUG_TO_FILE
-			logstream = fopen("s_ds3d.log", "wt");
-			if (logstream == NULL)
-				return FALSE;
-#endif
-			DisableThreadLibraryCalls(hinstDLL);
-			break;
-
-		case DLL_THREAD_ATTACH:
-			// Do thread-specific initialization.
-			break;
-
-		case DLL_THREAD_DETACH:
-			// Do thread-specific cleanup.
-			break;
-
-		case DLL_PROCESS_DETACH:
-			// Perform any necessary cleanup.
-#ifdef DEBUG_TO_FILE
-			if (logstream)
-			{
-				fclose(logstream);
-				logstream = NULL;
-			}
-#endif
-			break;
-	}
-	return TRUE;  // Successful DLL_PROCESS_ATTACH.
-}
-#endif
-
-// **************************************************************************
-//                                                                  FUNCTIONS
-// **************************************************************************
-
-/***************************************************************
- *
- * DBG_Printf
- * Output error messages to debug log if DEBUG_TO_FILE is defined,
- * else do nothing
- *
- ***************************************************************
- */
-// -----------------+
-// DBG_Printf       : Output error messages to debug log if DEBUG_TO_FILE is defined,
-//                  : else do nothing
-// Returns          :
-// -----------------+
-void DBG_Printf(const char *lpFmt, ... )
-{
-#ifdef DEBUG_TO_FILE
-	char    str[4096] = "";
-	va_list arglist;
-
-	va_start(arglist, lpFmt);
-	vsnprintf(str, 4096, lpFmt, arglist);
-	va_end(arglist);
-
-	if (logstream)
-		fwrite(str, strlen(str), 1, logstream);
-#endif
-}
-
-
-/***************************************************************
- *
- * Grow intrenal sound stack by SOUND_ALLOCATE_DELTA amount
- *
- ***************************************************************
- */
-static BOOL reallocate_stack(void)
-{
-	stack_t *new_stack;
-
-	if (_stack)
-		new_stack = realloc(_stack, sizeof (stack_t) * (allocated_sounds + SOUND_ALLOCATE_DELTA));
-	else
-		new_stack = malloc(sizeof (stack_t) * (allocated_sounds + SOUND_ALLOCATE_DELTA));
-	if (new_stack)
-	{
-		_stack = new_stack;
-		ZeroMemory(&_stack[allocated_sounds], SOUND_ALLOCATE_DELTA * sizeof (stack_t));
-		allocated_sounds += SOUND_ALLOCATE_DELTA;
-	}
-	return (new_stack != NULL);
-}
-
-
-/***************************************************************
- *
- * Destroys source in stack
- *
- ***************************************************************
- */
-static void kill_sound(stack_t *snd)
-{
-	//stack_t *snd = _stack + handle;
-
-	if (snd->dsbuffer3D)
-		RELEASE_3DBUFFER(snd->dsbuffer3D);
-
-	if (snd->dsbuffer)
-		RELEASE_BUFFER(snd->dsbuffer);
-
-	ZeroMemory(snd, sizeof (stack_t));
-}
-
-
-/***************************************************************
- *
- * Returns TRUE if source currently playing
- *
- ***************************************************************
- */
-static BOOL is_playing(stack_t *snd)
-{
-	DWORD               status;
-	LPDIRECTSOUNDBUFFER dsbuffer = snd->dsbuffer;
-
-	if (dsbuffer == NULL)
-		return 0;
-
-	IDirectSoundBuffer_GetStatus(dsbuffer, &status);
-
-	return (status & (DSBSTATUS_PLAYING | DSBSTATUS_LOOPING));
-}
-
-
-/***************************************************************
- *
- * Creates DirectSound buffer and fills with sound data
- * NULL sound data pointer are valid (empty buffer
- * will be created)
- *
- ***************************************************************
- */
-static LPDIRECTSOUNDBUFFER create_buffer (void *data, INT32 length, BOOL as3d)
-{
-	LPDIRECTSOUNDBUFFER dsbuffer;
-	HRESULT             hr;
-	WAVEFORMATEX        wfm;
-	DSBUFFERDESC        dsbdesc;
-	LPVOID              lpvAudio1; // receives address of lock start
-	DWORD               dwBytes1;  // receives number of bytes locked
-	LPVOID              lpvAudio2; // receives address of lock start
-	DWORD               dwBytes2;  // receives number of bytes locked
-
-	ZeroMemory(&wfm, sizeof (WAVEFORMATEX));
-	wfm.wFormatTag = WAVE_FORMAT_PCM;
-	wfm.nChannels = 1;
-	wfm.nSamplesPerSec = data?*((UINT16 *)data+1):srate;      //mostly 11025, but some at 22050.
-	wfm.wBitsPerSample = 8;
-	wfm.nBlockAlign = (WORD)(wfm.wBitsPerSample / 8 * wfm.nChannels);
-	wfm.nAvgBytesPerSec = wfm.nSamplesPerSec * wfm.nBlockAlign;
-
-	// Set up DSBUFFERDESC structure.
-	ZeroMemory (&dsbdesc, sizeof (DSBUFFERDESC) );
-	dsbdesc.dwSize = sizeof (DSBUFFERDESC);
-	dsbdesc.dwFlags = as3d?_3DSOURCE_FLAGS:_2DSOURCE_FLAGS;
-	dsbdesc.dwBufferBytes = length;
-	dsbdesc.lpwfxFormat = &wfm;
-
-	// DirectX 7.0 and above!
-	// Try to enable full HRTF virtualization algorithm for
-	// two-speakers or headphones
-#ifdef DX7
-	if (as3d)
-		dsbdesc.guid3DAlgorithm = (virtualization?DS3DALG_HRTF_FULL:DS3DALG_DEFAULT);
-#endif
-
-	hr = IDirectSound_CreateSoundBuffer (DSnd, &dsbdesc, &dsbuffer, NULL);
-
-	// CreateSoundBuffer might return DS_NO_VIRTUALIZATION so uses FAILED
-	// macro rather than check explictly for DS_OK value
-	if (FAILED(hr))
-	{
-		DBG_Printf("CreateSoundBuffer FAILED. Code %d\n", hr);
-		return NULL;
-	}
-
-	if (data)
-	{
-		hr = IDirectSoundBuffer_Lock(dsbuffer, 0, length, &lpvAudio1, &dwBytes1, &lpvAudio2, &dwBytes2, 0);
-
-		// If DSERR_BUFFERLOST is returned, restore and retry lock.
-		if (hr == DSERR_BUFFERLOST)
-		{
-			hr = IDirectSoundBuffer_Restore(dsbuffer);
-			if (FAILED(hr))
-				I_ErrorDS3D("Restore fail on %x, code %d\n",dsbuffer, hr);
-			hr = IDirectSoundBuffer_Lock(dsbuffer, 0, length, &lpvAudio1, &dwBytes1, &lpvAudio2, &dwBytes2, 0);
-			if (FAILED(hr))
-				I_ErrorDS3D("Lock fail(2) on %x, code %d\n",dsbuffer, hr);
-		}
-		else
-			if (FAILED(hr))
-				I_ErrorDS3D("Lock fail(1) on %x, code %d\n",dsbuffer, hr);
-
-		// copy wave data into the buffer (note: dwBytes1 should equal to dsbdesc->dwBufferBytes ...)
-		CopyMemory (lpvAudio1, (LPBYTE)data+8, dwBytes1);
-
-		if ( dwBytes2 && lpvAudio2)
-			CopyMemory(lpvAudio2, ((LPBYTE)data + 8) + dwBytes1, dwBytes2);
-
-
-		// finally, unlock the buffer
-		hr = IDirectSoundBuffer_Unlock(dsbuffer, lpvAudio1, dwBytes1, lpvAudio2, dwBytes2);
-
-		if (FAILED(hr))
-			I_ErrorDS3D("Unlock fail on %x, code %d\n",dsbuffer, hr);
-	}
-
-	return dsbuffer;
-}
-
-
-/***************************************************************
- *
- * Creates 3D source data buffer
- *
- ***************************************************************
- */
-static LPDIRECTSOUND3DBUFFER create_3dbuffer(LPDIRECTSOUNDBUFFER dsbuffer, LPDIRECTSOUND3DBUFFER source3d)
-{
-	HRESULT hr;
-
-	hr = IDirectSoundBuffer_QueryInterface(dsbuffer,
-	 &IID_IDirectSound3DBuffer, (void **)&source3d);
-
-	if (FAILED(hr))
-	{
-		DBG_Printf("Couldn't obtain 3D Buffer interface. Code %d\n", hr);
-		return NULL;
-	}
-#ifdef DX7
-	if (hr == DS_NO_VIRTUALIZATION)
-	{
-		DBG_Printf("The 3D virtualization is not supported under this OS.\n");
-			virtualization = FALSE;
-	}
-#endif
-	return source3d;
-}
-
-
-/***************************************************************
- *
- * Returns free (unused) source stack slot
- * If none available sound stack will be increased
- *
- ***************************************************************
- */
-static INT32 find_handle(INT32 new_sfx_id, INT32 new_is3d)
-{
-	INT32      free_sfx;
-	stack_t *snd;
-
-	// At first do look for sound with same sfx ID and reuse it
-	new_sfx_id = new_is3d = 0;
-	for (free_sfx = 0, snd = _stack; free_sfx < allocated_sounds; snd++, free_sfx++)
-	{
-
-		if (snd->permanent)
-			continue;
-/*
-		if (!is_playing(snd))
-		{
-			if (same_sfx == 0 && snd->sfx_id == new_sfx_id && snd->dsbuffer)
-			{
-				same_sfx = i;
-				continue;
-			}
-
-			if (snd->sfx_id && ++snd->LRU >= MAX_LRU)
-				kill_sound(snd);
-		}
-*/
-		if (snd->dsbuffer == 0)
-			break;
-			//free_sfx = i;
-	}
-
-	// No suitable resource found so increase sound stack
-	if (free_sfx == allocated_sounds)
-	{
-		DBG_Printf("No free or same sfx found so increase stack (currently %d srcs)\n", allocated_sounds);
-		free_sfx = reallocate_stack() ? free_sfx : -1;
-	}
-
-	return free_sfx;
-}
-
-
-/***************************************************************
- *
- * Recalculates volume from Doom scale to DirectSound scale
- *
- ***************************************************************
- */
-static INT32 recalc_volume(INT32 base_vol, INT32 steps)
-{
-	return (base_vol * ((DSBVOLUME_MAX-DSBVOLUME_MIN)/4)) / steps
-	       + (DSBVOLUME_MAX - ((DSBVOLUME_MAX-DSBVOLUME_MIN)/4));
-}
-
-
-/***************************************************************
- *
- * Updates sound volume of the DirectSound buffer
- *
- ***************************************************************
- */
-static void UpdateSoundVolume (LPDIRECTSOUNDBUFFER lpSnd, INT32 volume)
-{
-	/*volume = (volume * ((DSBVOLUME_MAX-DSBVOLUME_MIN)/4)) / 256 +
-	         (DSBVOLUME_MAX - ((DSBVOLUME_MAX-DSBVOLUME_MIN)/4));
-
-	IDirectSoundBuffer_SetVolume (lpSnd, volume);*/
-	IDirectSoundBuffer_SetVolume (lpSnd, recalc_volume(volume, 256));
-}
-
-
-// --------------------------------------------------------------------------
-// Update the panning for a secondary buffer, make sure it was created with
-// DSBCAPS_CTRLPAN
-// --------------------------------------------------------------------------
-#define DSBPAN_RANGE    (DSBPAN_RIGHT-(DSBPAN_LEFT))
-
-//Doom sounds pan range 0-255 (128 is centre)
-#define SEP_RANGE       256
-static void Update2DSoundPanning (LPDIRECTSOUNDBUFFER lpSnd, INT32 sep)
-{
-	HRESULT hr;
-	hr = IDirectSoundBuffer_SetPan (lpSnd, (sep * DSBPAN_RANGE)/SEP_RANGE - DSBPAN_RIGHT);
-	//if (FAILED(hr))
-	//	DEBFILE(va("SetPan FAILED for sep %d pan %d\n", sep, (sep * DSBPAN_RANGE)/SEP_RANGE - DSBPAN_RIGHT));
-}
-
-
-
-/******************************************************************************
- *
- * Initialise driver and listener
- *
- *****************************************************************************/
-EXPORT BOOL HWRAPI( Startup ) (I_Error_t FatalErrorFunction, snddev_t *snd_dev)
-{
-	HRESULT      hr;
-	DSBUFFERDESC desc;
-	WAVEFORMATEX wfm;
-	DSCAPS       dscaps;
-	DWORD        speakers;
-	DWORD        speaker_config;
-	DWORD        speaker_geometry;
-
-	I_ErrorDS3D = FatalErrorFunction;
-	DBG_Printf ("S_DS3D Init(): DirectSound3D driver for SRB2 v1.09"); // Tails
-
-	DBG_Printf("Initialising DirectSound3D...\n");
-	hr = DirectSoundCreate( NULL, &DSnd, NULL);
-	if (FAILED(hr))
-	{
-		DBG_Printf("Failed to obtain DirectSound\n");
-		return FALSE;
-	}
-
-	hr = IDirectSound_SetCooperativeLevel(DSnd, snd_dev->hWnd, snd_dev->cooplevel);
-	if (FAILED(hr))
-	{
-		DBG_Printf("Couldn't set coopertive level\n");
-		return FALSE;
-	}
-
-	dscaps.dwSize = sizeof (DSCAPS);
-
-	IDirectSound_GetCaps(DSnd, &dscaps);
-	IDirectSound_GetSpeakerConfig(DSnd, &speakers);
-
-	DBG_Printf("Sound hardware capabilities:\n");
-	DBG_Printf("   Driver is %scertified.\n", (dscaps.dwFlags & DSCAPS_CERTIFIED) == DSCAPS_CERTIFIED?"":"not ");
-	DBG_Printf("   Maximum hardware mixing buffers %d\n", dscaps.dwMaxHwMixingAllBuffers);
-	DBG_Printf("   Maximum hardware 3D buffers %d\n", dscaps.dwFreeHw3DAllBuffers);
-
-	speaker_config = DSSPEAKER_CONFIG(speakers);
-	speaker_geometry = DSSPEAKER_GEOMETRY(speakers);
-
-	DBG_Printf("Current speaker configuration: ");
-
-	switch (speaker_config)
-	{
-#ifdef DX7
-		case DSSPEAKER_5POINT1:
-			DBG_Printf("5.1 (5 speakers with subwoofer).\n");
-			break;
-#endif
-		case DSSPEAKER_HEADPHONE:
-			DBG_Printf("headphone.\n");
-			break;
-
-		case DSSPEAKER_MONO:
-			DBG_Printf("single speaker (mono).\n");
-			break;
-
-		case DSSPEAKER_QUAD:
-			DBG_Printf("quadrophonic\n");
-			break;
-
-		case DSSPEAKER_SURROUND:
-			DBG_Printf("surround.\n");
-			break;
-
-		case DSSPEAKER_STEREO:
-			DBG_Printf("stereo with %s geometry ",
-				speaker_geometry == DSSPEAKER_GEOMETRY_WIDE
-					? "wide (arc of 20 deg.)"
-					: speaker_geometry == DSSPEAKER_GEOMETRY_NARROW
-						? "narrow (arc of 10 deg.)"
-						: speaker_geometry == DSSPEAKER_GEOMETRY_MIN
-							? "min (arc of 5 deg.)"
-							: speaker_geometry == DSSPEAKER_GEOMETRY_MAX
-								? "max (arc of 180 deg.)"
-								: "unknown");
-			break;
-		default:
-			DBG_Printf("undetectable.\n");
-
-	}
-
-	update_mode = DS3D_IMMEDIATE;
-
-	// Create primary sound buffer
-	ZeroMemory(&desc, sizeof (DSBUFFERDESC));
-	desc.dwSize = sizeof (DSBUFFERDESC);
-	desc.dwFlags = DSBCAPS_CTRL3D | DSBCAPS_PRIMARYBUFFER | DSBCAPS_CTRLVOLUME;
-	desc.dwBufferBytes = 0;
-	desc.lpwfxFormat = NULL;
-
-	hr = IDirectSound_CreateSoundBuffer(DSnd, &desc, &PrimaryBuffer, NULL);
-	if (FAILED(hr))
-	{
-		DBG_Printf("CreateSoundBuffer FAILED (ErrNo %d)\n", hr);
-		return FALSE;
-	}
-
-	// Query for 3D Listener object
-	hr = IDirectSoundBuffer_QueryInterface(PrimaryBuffer,
-	 &IID_IDirectSound3DListener, (void **)&Listener);
-
-	if (FAILED(hr))
-	{
-		DBG_Printf("Couldn't obtain 3D Listener interface (ErrNo %d)\n", hr);
-		return FALSE;
-	}
-
-	// Set up initial listsner parameters
-	IDirectSound3DListener_SetDistanceFactor(Listener, 1.0f/72.0f, DS3D_IMMEDIATE);
-	IDirectSound3DListener_SetRolloffFactor(Listener, 1.6f, DS3D_IMMEDIATE);
-	//IDirectSound3DListener_SetRolloffFactor(Listener, DS3D_MAXROLLOFFFACTOR, DS3D_IMMEDIATE);
-	listener_parms.dwSize = sizeof (DS3DLISTENER);
-	IDirectSound3DListener_GetAllParameters(Listener, &listener_parms);
-
-	ZeroMemory (&wfm, sizeof (WAVEFORMATEX));
-	wfm.wFormatTag = WAVE_FORMAT_PCM;
-	wfm.nChannels = 2;
-	wfm.nSamplesPerSec = srate = snd_dev->sample_rate;
-	wfm.wBitsPerSample = (WORD)snd_dev->bps;
-	wfm.nBlockAlign = (WORD)(wfm.wBitsPerSample / 8 * wfm.nChannels);
-	wfm.nAvgBytesPerSec = wfm.nSamplesPerSec * wfm.nBlockAlign;
-
-	if (snd_dev->cooplevel >= DSSCL_PRIORITY)
-	{
-		hr = IDirectSoundBuffer_SetFormat(PrimaryBuffer, &wfm);
-		if (FAILED(hr))
-			DBG_Printf("Couldn't set primary buffer format.\n");
-
-		DBG_Printf(" Compacting onboard sound-memory...");
-		hr = IDirectSound_Compact(DSnd);
-		DBG_Printf(" %s\n", SUCCEEDED(hr) ? M_GetText("Done\n") : M_GetText("Failed\n"));
-	}
-
-#ifdef DX7
-	// Initially enables HRTF virtualization (may be changed later)
-	virtualization = TRUE;
-#endif
-
-	_stack = NULL;
-	allocated_sounds = 0;
-	IDirectSoundBuffer_Play(PrimaryBuffer, 0, 0, DSBPLAY_LOOPING);
-	return reallocate_stack();
-}
-
-
-
-/***************************************************************
- *
- * Shutdown driver
- *
- ***************************************************************
- */
-EXPORT void HWRAPI( Shutdown ) (void)
-{
-	INT32 i;
-
-	DBG_Printf ("S_DS3D Shutdown()\n");
-
-	for (i = 0; i < allocated_sounds; i++)
-	{
-		StopSource(i);
-		kill_sound(_stack + i);
-	}
-
-	if (_stack)
-		free(_stack);
-
-	if (Listener)
-	{
-		IDirectSound3DListener_Release(Listener);
-		Listener = NULL;
-	}
-
-	if (PrimaryBuffer)
-		RELEASE_BUFFER(PrimaryBuffer);
-
-	if (DSnd)
-	{
-		IDirectSound_Release(DSnd);
-		DSnd = NULL;
-	}
-
-}
-
-
-
-EXPORT INT32 HWRAPI (IsPlaying) (INT32 handle)
-{
-	if (handle < 0 || handle >= allocated_sounds)
-		return FALSE;
-
-	return is_playing(_stack + handle);
-}
-
-
-// Calculate sound pitching
-static float recalc_pitch(INT32 doom_pitch)
-{
-	return doom_pitch < NORMAL_PITCH ?
-	 (float)(doom_pitch + NORMAL_PITCH) / (NORMAL_PITCH * 2)
-	 :(float)doom_pitch / (float)NORMAL_PITCH;
-}
-
-
-static stack_t *setup_source(INT32 handle, sfx_data_t *sfx, BOOL is_3dsource)
-{
-	stack_t               *snd;
-	//INT32                  handle;
-	INT32                    data_length;
-	LPDIRECTSOUNDBUFFER    dsbuffer = NULL;
-	LPDIRECTSOUND3DBUFFER  ds3dbuffer = NULL;
-
-	if (handle == NEW_HANDLE)
-		handle = find_handle(sfx?sfx->id:0, is_3dsource);
-
-	snd = _stack + handle;
-
-	// Check for reused source
-	if (snd->dsbuffer)
-		return snd;
-
-	data_length = sfx?sfx->length - 8:DSBSIZE_MIN;
-
-	dsbuffer = create_buffer(sfx ? sfx->data : NULL, data_length, is_3dsource);
-	if (dsbuffer)
-	{
-
-		if (is_3dsource)
-		{
-			ds3dbuffer = create_3dbuffer(dsbuffer, ds3dbuffer);
-			if (!ds3dbuffer)
-			{
-				RELEASE_BUFFER(dsbuffer);
-				return NULL;
-			}
-			snd->parameters.dwSize = sizeof (DS3DBUFFER);
-			IDirectSound3DBuffer_GetAllParameters(ds3dbuffer, &snd->parameters);
-		}
-
-		// judgecutor: sound pitching
-		if (sfx)
-		{
-			DWORD freq;
-
-			freq = (DWORD)((float)(*((UINT16 *)sfx->data+1)) * recalc_pitch(sfx->pitch));
-			IDirectSoundBuffer_SetFrequency(dsbuffer, freq);
-		}
-
-		snd->dsbuffer = dsbuffer;
-		snd->dsbuffer3D = ds3dbuffer;
-		snd->LRU = 0;
-		snd->sfx_id = sfx ? sfx->id : 0;
-		if (!is_3dsource)
-			snd->permanent = 0;
-		return snd;
-	}
-	return NULL;
-
-}
-
-/******************************************************************************
- *
- * Creates 2D (stereo) source
- *
- ******************************************************************************/
-EXPORT INT32 HWRAPI ( Add2DSource ) (sfx_data_t *sfx)
-{
-	stack_t *snd;
-
-	if (!sfx)
-		return -1;
-
-	snd = setup_source(NEW_HANDLE, sfx, IS_2DSOURCE);
-	if (snd)
-	{
-		UpdateSoundVolume(snd->dsbuffer, sfx->volume);
-		Update2DSoundPanning(snd->dsbuffer, sfx->sep);
-	}
-	return snd - _stack;
-}
-
-/******************************************************************************
- *
- * Creates 3D source
- *
- ******************************************************************************/
-
-EXPORT INT32 HWRAPI ( Add3DSource ) (source3D_data_t *src, sfx_data_t *sfx)
-{
-	stack_t *snd;
-
-	snd = setup_source(NEW_HANDLE, sfx, IS_3DSOURCE);
-
-	if (snd)
-	{
-
-		/*x = src->pos.x;
-		y = src->pos.z;
-		z = src->pos.y;
-
-		IDirectSound3DBuffer_SetPosition(source, x, y, z, update_mode);
-		IDirectSound3DBuffer_SetVelocity(source, src->pos.momx, src->pos.momz, src->pos.momy, update_mode);
-		IDirectSound3DBuffer_SetMode(source, src->head_relative?DS3DMODE_HEADRELATIVE:DS3DMODE_NORMAL, update_mode);*/
-
-#ifdef DUMMYUNIONNAMEN
-		snd->parameters.vPosition.DUMMYUNIONNAMEN(9).x = src->pos.x;
-		snd->parameters.vPosition.DUMMYUNIONNAMEN(10).y = src->pos.z;
-		snd->parameters.vPosition.DUMMYUNIONNAMEN(11).z = src->pos.y;
-
-		snd->parameters.vVelocity.DUMMYUNIONNAMEN(9).x = src->pos.momx;
-		snd->parameters.vVelocity.DUMMYUNIONNAMEN(10).y = src->pos.momz;
-		snd->parameters.vVelocity.DUMMYUNIONNAMEN(11).z = src->pos.momy;
-#else
-		snd->parameters.vPosition.x = src->pos.x;
-		snd->parameters.vPosition.y = src->pos.z;
-		snd->parameters.vPosition.z = src->pos.y;
-
-		snd->parameters.vVelocity.x = src->pos.momx;
-		snd->parameters.vVelocity.y = src->pos.momz;
-		snd->parameters.vVelocity.z = src->pos.momy;
-#endif
-		snd->parameters.dwMode = src->head_relative ? DS3DMODE_HEADRELATIVE : DS3DMODE_NORMAL;
-
-		snd->parameters.flMinDistance = src->min_distance;
-		snd->parameters.flMaxDistance = src->max_distance;
-		//snd->parameters.flMaxDistance = DS3D_DEFAULTMAXDISTANCE;
-
-		snd->permanent = src->permanent;
-
-		UpdateSoundVolume(snd->dsbuffer, sfx?sfx->volume:255);
-		IDirectSound3DBuffer_SetAllParameters(snd->dsbuffer3D, &snd->parameters, DS3D_IMMEDIATE);
-		IDirectSoundBuffer_SetCurrentPosition(snd->dsbuffer, 0);
-	}
-
-	return (snd - _stack);
-}
-
-/******************************************************************************
- *
- * Destroy source and remove it from stack if it is a 2D source.
- * Otherwise put source into cache
- *
- *****************************************************************************/
-EXPORT void HWRAPI (KillSource) (INT32 handle)
-{
-
-	if (handle < 0 || handle >= allocated_sounds)
-		return;
-/*
-		if (_stack[handle].dsbuffer3D)
-	{
-		// It's a 3D source so let him chance to be reused :-)
-		_stack[handle].LRU = 1;
-	}
-	else
-	{ */
-		// No, it is a 2D source so kill him
-		kill_sound(_stack + handle);
-	//}
-}
-
-
-/******************************************************************************
- *
- * Update volume and separation (panning) of 2D source
- *
- *****************************************************************************/
-EXPORT void HWRAPI (Update2DSoundParms) (INT32 handle, INT32 vol, INT32 sep)
-{
-	LPDIRECTSOUNDBUFFER dsbuffer;
-
-	if (handle < 0 || handle >= allocated_sounds)
-		return;
-
-	if ((_stack+handle)->dsbuffer3D)
-		return;
-	dsbuffer = (_stack + handle)->dsbuffer;
-
-	UpdateSoundVolume(dsbuffer, vol);
-	Update2DSoundPanning(dsbuffer, sep);
-}
-
-
-
-// --------------------------------------------------------------------------
-// Set the global volume for sound effects
-// --------------------------------------------------------------------------
-EXPORT void HWRAPI (SetGlobalSfxVolume) (INT32 volume)
-{
-	INT32     vol;
-	HRESULT hr;
-
-	// use the last quarter of volume range
-	if (volume)
-		vol = recalc_volume(volume, 31);
-	else
-		vol = DSBVOLUME_MIN;
-
-	hr = IDirectSoundBuffer_SetVolume (PrimaryBuffer, vol);
-}
-
-EXPORT void HWRAPI ( StopSource) (INT32 handle)
-{
-	LPDIRECTSOUNDBUFFER dsbuffer;
-
-	if (handle < 0 || handle >= allocated_sounds)
-		return;
-
-	dsbuffer = (_stack + handle)->dsbuffer;
-
-	if (dsbuffer)
-	{
-		IDirectSoundBuffer_Stop(dsbuffer);
-		IDirectSoundBuffer_SetCurrentPosition(dsbuffer, 0);
-	}
-}
-
-
-EXPORT INT32 HWRAPI ( GetHW3DSVersion) (void)
-{
-	return VERSION;
-}
-
-
-EXPORT void HWRAPI (BeginFrameUpdate) (void)
-{
-	update_mode = DS3D_DEFERRED;
-}
-
-
-EXPORT void HWRAPI (EndFrameUpdate) (void)
-{
-	if (update_mode == DS3D_DEFERRED)
-		IDirectSound3DListener_CommitDeferredSettings(Listener);
-
-	update_mode = DS3D_IMMEDIATE;
-}
-
-
-/******************************************************************************
- * UpdateListener
- *
- * Set up main listener properties:
- * - position
- * - orientation
- * - velocity
- *****************************************************************************/
-EXPORT void HWRAPI (UpdateListener) (listener_data_t *data)
-{
-	D3DVECTOR pos;
-	D3DVECTOR face;
-	D3DVECTOR head;
-	D3DVECTOR velocity;
-	double      f_angle;
-	//double      h_angle, t_angle;
-	//double      f_cos, f_sin, t_sin;
-
-#ifdef DUMMYUNIONNAMEN
-	pos.DUMMYUNIONNAMEN(9).x = (D3DVALUE)data->x;
-	pos.DUMMYUNIONNAMEN(10).y = (D3DVALUE)data->z;
-	pos.DUMMYUNIONNAMEN(11).z = (D3DVALUE)data->y;
-
-	velocity.DUMMYUNIONNAMEN(9).x = (D3DVALUE)data->momx;
-	velocity.DUMMYUNIONNAMEN(10).y = (D3DVALUE)data->momz;
-	velocity.DUMMYUNIONNAMEN(11).z = (D3DVALUE)data->momy;
-#else
-	pos.x = (D3DVALUE)data->x;
-	pos.y = (D3DVALUE)data->z;
-	pos.z = (D3DVALUE)data->y;
-
-	velocity.x = (D3DVALUE)data->momx;
-	velocity.y = (D3DVALUE)data->momz;
-	velocity.z = (D3DVALUE)data->momy;
-#endif
-	f_angle = (data->f_angle) / 180 * M_PI;
-	//h_angle = data->h_angle / 180 * M_PI;
-	//h_angle = 90 / 180 * M_PI;
-
-	// Treat listener orientation angles as spherical coordinates.
-	// x = sin h * cos f
-	// y = sin h * sin f
-	// z = cos h
-
-	// Front vector
-	//t_angle = (M_PI/2 - h_angle);
-	//t_angle = M_PI/2;
-
-	//face.x = (t_sin = sin(t_angle)) * (f_cos = cos(f_angle));
-	//face.z = t_sin * (f_sin = sin(f_angle));
-	//face.y = cos(t_angle);
-#ifdef DUMMYUNIONNAMEN
-	face.DUMMYUNIONNAMEN(9).x = (D3DVALUE)cos(f_angle);
-	face.DUMMYUNIONNAMEN(11).z = (D3DVALUE)sin(f_angle);
-	face.DUMMYUNIONNAMEN(10).y = 0.0f;
-
-	head.DUMMYUNIONNAMEN(9).x = 0.0f;
-	head.DUMMYUNIONNAMEN(10).y = 1.0f;
-	head.DUMMYUNIONNAMEN(11).z = 0.0f;
-#else
-	face.x = (D3DVALUE)cos(f_angle);
-	face.z = (D3DVALUE)sin(f_angle);
-	face.y = 0.0f;
-
-	head.x = 0.0f;
-	head.y = 1.0f;
-	head.z = 0.0f;
-#endif
-	// Top vector
-	//h_angle = (-data->h_angle) / 180 * M_PI;
-
-/*
-	t_angle = -h_angle;
-
-	head.z = (t_sin = sin(t_angle)) * f_cos;
-	head.x = t_sin * f_sin;
-	head.y = cos(t_angle);
-*/
-
-	// Update at once
-	CopyMemory(&listener_parms.vPosition, &pos, sizeof (D3DVECTOR));
-	CopyMemory(&listener_parms.vOrientFront, &face, sizeof (D3DVECTOR));
-	CopyMemory(&listener_parms.vOrientTop, &head, sizeof (D3DVECTOR));
-	CopyMemory(&listener_parms.vVelocity, &velocity, sizeof (D3DVECTOR));
-	//IDirectSound3DListener_SetAllParameters(Listener, &listener_parms, DS3D_IMMEDIATE);
-	IDirectSound3DListener_SetAllParameters(Listener, &listener_parms, update_mode);
-}
-
-EXPORT void HWRAPI (UpdateListener2) (listener_data_t *data)
-{
-	D3DVECTOR pos;
-	D3DVECTOR face;
-	D3DVECTOR head;
-	D3DVECTOR velocity;
-	double      f_angle;
-	//double      h_angle, t_angle;
-	//double      f_cos, f_sin, t_sin;
-
-	if (!data) return;
-
-#ifdef DUMMYUNIONNAMEN
-	pos.DUMMYUNIONNAMEN(9).x = (D3DVALUE)data->x;
-	pos.DUMMYUNIONNAMEN(10).y = (D3DVALUE)data->z;
-	pos.DUMMYUNIONNAMEN(11).z = (D3DVALUE)data->y;
-
-	velocity.DUMMYUNIONNAMEN(9).x = (D3DVALUE)data->momx;
-	velocity.DUMMYUNIONNAMEN(10).y = (D3DVALUE)data->momz;
-	velocity.DUMMYUNIONNAMEN(11).z = (D3DVALUE)data->momy;
-#else
-	pos.x = (D3DVALUE)data->x;
-	pos.y = (D3DVALUE)data->z;
-	pos.z = (D3DVALUE)data->y;
-
-	velocity.x = (D3DVALUE)data->momx;
-	velocity.y = (D3DVALUE)data->momz;
-	velocity.z = (D3DVALUE)data->momy;
-#endif
-	f_angle = (data->f_angle) / 180 * M_PI;
-	//h_angle = data->h_angle / 180 * M_PI;
-	//h_angle = 90 / 180 * M_PI;
-
-	// Treat listener orientation angles as spherical coordinates.
-	// x = sin h * cos f
-	// y = sin h * sin f
-	// z = cos h
-
-	// Front vector
-	//t_angle = (M_PI/2 - h_angle);
-	//t_angle = M_PI/2;
-
-	//face.x = (t_sin = sin(t_angle)) * (f_cos = cos(f_angle));
-	//face.z = t_sin * (f_sin = sin(f_angle));
-	//face.y = cos(t_angle);
-#ifdef DUMMYUNIONNAMEN
-	face.DUMMYUNIONNAMEN(9).x = cos(f_angle);
-	face.DUMMYUNIONNAMEN(11).z = sin(f_angle);
-	face.DUMMYUNIONNAMEN(10).y = 0.0f;
-
-	head.DUMMYUNIONNAMEN(9).x = 0.0f;
-	head.DUMMYUNIONNAMEN(10).y = 1.0f;
-	head.DUMMYUNIONNAMEN(11).z = 0.0f;
-#else
-	face.x = (D3DVALUE)cos(f_angle);
-	face.z = (D3DVALUE)sin(f_angle);
-	face.y = 0.0f;
-
-	head.x = 0.0f;
-	head.y = 1.0f;
-	head.z = 0.0f;
-#endif
-
-	// Top vector
-	//h_angle = (-data->h_angle) / 180 * M_PI;
-
-/*
-	t_angle = -h_angle;
-
-	head.z = (t_sin = sin(t_angle)) * f_cos;
-	head.x = t_sin * f_sin;
-	head.y = cos(t_angle);
-*/
-
-	// Update at once
-	CopyMemory(&listener_parms.vPosition, &pos, sizeof (D3DVECTOR));
-	CopyMemory(&listener_parms.vOrientFront, &face, sizeof (D3DVECTOR));
-	CopyMemory(&listener_parms.vOrientTop, &head, sizeof (D3DVECTOR));
-	CopyMemory(&listener_parms.vVelocity, &velocity, sizeof (D3DVECTOR));
-	//IDirectSound3DListener_SetAllParameters(Listener, &listener_parms, DS3D_IMMEDIATE);
-	//Alam_GBC: 2 Listeners?
-	//IDirectSound3DListener_SetAllParameters(Listener, &listener_parms, update_mode);
-}
-
-EXPORT INT32 HWRAPI (SetCone) (INT32 handle, cone_def_t *cone_def)
-{
-	stack_t     *snd;
-	//DS3DBUFFER  parms;
-
-	if (handle < 0 || handle >= allocated_sounds)
-		return -1;
-
-	snd = _stack + handle;
-
-	if (snd->dsbuffer3D)
-	{
-
-		/*f_angle = cone_def->f_angle / 180 * M_PI;
-		h_angle = (90 - cone_def->h_angle) / 180 * M_PI;
-		parms.vConeOrientation.x = sin(h_angle) * cos(f_angle);
-		parms.vConeOrientation.z = sin(h_angle) * sin(f_angle);
-		parms.vConeOrientation.y = cos(h_angle);*/
-
-		snd->parameters.dwInsideConeAngle = (DWORD)cone_def->inner;
-		snd->parameters.dwOutsideConeAngle = (DWORD)cone_def->outer;
-		snd->parameters.lConeOutsideVolume = recalc_volume(cone_def->outer_gain, 256);
-
-		return IDirectSound3DBuffer_SetAllParameters(snd->dsbuffer3D, &snd->parameters, update_mode);
-	}
-
-	return -1;
-}
-
-EXPORT void HWRAPI (Update3DSource) (INT32 handle, source3D_pos_t *data)
-{
-	stack_t     *snd;
-
-	if (handle < 0 || handle >= allocated_sounds)
-		return;
-
-	snd = _stack + handle;
-	if (snd->dsbuffer3D)
-	{
-
-		/*parms.dwSize = sizeof (DS3DBUFFER);
-		IDirectSound3DBuffer_GetAllParameters(snd, &parms);*/
-
-		//angle = data->angle * 180 / M_PI;
-
-#ifdef DUMMYUNIONNAMEN
-		snd->parameters.vPosition.DUMMYUNIONNAMEN(9).x = data->x;
-		snd->parameters.vPosition.DUMMYUNIONNAMEN(10).y = data->z;
-		snd->parameters.vPosition.DUMMYUNIONNAMEN(11).z = data->y;
-#else
-		snd->parameters.vPosition.x = data->x;
-		snd->parameters.vPosition.y = data->z;
-		snd->parameters.vPosition.z = data->y;
-#endif
-
-		/*parms.vConeOrientation.x = cos(angle);
-		parms.vConeOrientation.z = sin(angle);
-		parms.vConeOrientation.y = 0;*/
-
-#ifdef DUMMYUNIONNAMEN
-		snd->parameters.vVelocity.x = data->momx;
-		snd->parameters.vVelocity.y = data->momz;
-		snd->parameters.vVelocity.z = data->momy;
-#else
-		snd->parameters.vVelocity.x = data->momx;
-		snd->parameters.vVelocity.y = data->momz;
-		snd->parameters.vVelocity.z = data->momy;
-#endif
-
-		//snd->parameters.flMinDistance = data->min_distance;
-		//snd->parameters.flMaxDistance = data->max_distance;
-		//snd->parameters.dwMode = pos->head_realtive?DS3DMODE_HEADREALTIVE:DS3DMODE_NORMAL;
-
-		IDirectSound3DBuffer_SetAllParameters(snd->dsbuffer3D, &snd->parameters, update_mode);
-	}
-}
-
-
-EXPORT INT32 HWRAPI (StartSource) (INT32 handle)
-{
-	LPDIRECTSOUNDBUFFER snd;
-
-	if (handle < 0 || handle >= allocated_sounds)
-		return -1;
-
-	snd = (_stack + handle)->dsbuffer;
-	IDirectSoundBuffer_SetCurrentPosition(snd, 0);
-	return IDirectSoundBuffer_Play(snd, 0, 0, 0);
-
-}
-
-//-------------------------------------------------------------
-// Load new sound data into source
-//-------------------------------------------------------------
-EXPORT INT32 HWRAPI (Reload3DSource) (INT32 handle, sfx_data_t *data)
-{
-	DS3DBUFFER  temp;
-	stack_t    *snd;
-	INT32         perm;
-
-	// DirectX could not load new sound data into source
-	// so recreate sound buffers
-	if (handle < 0 || handle >= allocated_sounds)
-		return -1;
-
-	snd = _stack + handle;
-	CopyMemory(&temp, &snd->parameters, sizeof (DS3DBUFFER));
-	perm = snd->permanent;
-
-	kill_sound(snd);
-
-	snd = setup_source(handle, data, IS_3DSOURCE);
-	/*snd->dsbuffer = create_buffer(data->data, data->length, true);
-	if (snd->dsbuffer == NULL)
-		return -1;
-	snd->dsbuffer3D = create_3dbuffer(snd->dsbuffer, snd->dsbuffer3D);
-	if (snd->dsbuffer3D == NULL)
-	{
-		RELEASE_BUFFER(snd->dsbuffer);
-		return -1;
-	}
-
-	snd->sfx_id = data->id;
-	snd->LRU = 0;*/
-	if (snd)
-	{
-		snd->permanent = perm;
-		IDirectSound3DBuffer_SetAllParameters(snd->dsbuffer3D, &temp, DS3D_IMMEDIATE);
-		CopyMemory(&snd->parameters, &temp, sizeof (DS3DBUFFER));
-	}
-
-	return(snd - _stack);
-}
-
-EXPORT void HWRAPI (UpdateSourceVolume) (INT32 handle, INT32 volume)
-{
-	if (handle < 0 || handle >= allocated_sounds)
-		return;
-	UpdateSoundVolume((_stack + handle)->dsbuffer, volume);
-}
diff --git a/src/hardware/s_ds3d/s_ds3d.dev b/src/hardware/s_ds3d/s_ds3d.dev
deleted file mode 100644
index 1b51b1b77..000000000
--- a/src/hardware/s_ds3d/s_ds3d.dev
+++ /dev/null
@@ -1,59 +0,0 @@
-[Project]
-FileName=s_ds3d.dev
-Name=s_ds3d
-Ver=1
-IsCpp=1
-Type=3
-Compiler=-D_M_IX86=500_@@_-Wall_@@_-D_WINDOWS_@@_-Os_@@_-fno-strict-aliasing_@@_-fomit-frame-pointer_@@_
-CppCompiler=
-Includes=
-Linker=--def ../s_mingw.def_@@_-luuid_@@_-ldsound_@@_
-Libs=
-UnitCount=1
-Folders=
-ObjFiles=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=C:\srb2demo2
-ObjectOutput=..\..\..\objs\Mingw\s_ds3d
-OverrideOutput=1
-OverrideOutputName=s_ds3d.dll
-HostApplication=
-CommandLine=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=00000000000000000111d0
-UseCustomMakefile=0
-CustomMakefile=
-
-[Unit1]
-FileName=s_ds3d.c
-Folder=
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=s_ds3d.exe
-ProductName=s_ds3d
-ProductVersion=0.1
-AutoIncBuildNr=0
-
diff --git a/src/hardware/s_ds3d/s_ds3d.dsp b/src/hardware/s_ds3d/s_ds3d.dsp
deleted file mode 100644
index a82207c97..000000000
--- a/src/hardware/s_ds3d/s_ds3d.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="s_ds3d" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=s_ds3d - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "s_ds3d.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "s_ds3d.mak" CFG="s_ds3d - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "s_ds3d - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "s_ds3d - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "s_ds3d - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\bin\VC\Release\s_ds3d"
-# PROP Intermediate_Dir "..\..\..\objs\VC\Release\s_ds3d"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "S_DS3D_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /G5 /MT /W3 /GX /Zi /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x419 /d "NDEBUG"
-# ADD RSC /l 0x40c /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 dsound.lib /nologo /dll /pdb:"..\..\..\bin\VC\Release\s_ds3d.pdb" /machine:I386 /out:"..\..\..\bin\VC\Release\s_ds3d.dll"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "s_ds3d - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\bin\VC\Debug\s_ds3d"
-# PROP Intermediate_Dir "..\..\..\objs\VC\Debug\s_ds3d"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "S_DS3D_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x419 /d "_DEBUG"
-# ADD RSC /l 0x40c /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 dsound.lib /nologo /dll /pdb:"..\..\..\bin\VC\Debug\s_ds3d.pdb" /debug /machine:I386 /out:"..\..\..\bin\VC\Debug\s_ds3d.dll" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /incremental:no /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "s_ds3d - Win32 Release"
-# Name "s_ds3d - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\s_ds3d.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/hardware/s_fmod/s_fmod.c b/src/hardware/s_fmod/s_fmod.c
deleted file mode 100644
index 5d4422bb1..000000000
--- a/src/hardware/s_fmod/s_fmod.c
+++ /dev/null
@@ -1,1201 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2001 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-/// \file
-/// \brief General driver for 3D sound system
-///
-///	Implementend via FMOD_SOUND API
-
-#ifdef _WINDOWS
-//#define WIN32_LEAN_AND_MEAN
-#define RPC_NO_WINDOWS_H
-#include <windows.h>
-#else
-#include <stdarg.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
-
-#include <stdio.h>
-FILE *logstream = NULL;
-
-#ifdef __MINGW32__
-#include <FMOD/fmod.h>
-#else
-#include <fmod.h>
-#endif
-
-#ifdef FSOUND_INIT_DONTLATENCYADJUST //Alam: why didn't I think about this before? :)
-#define FSOUND_Sample_Load(index,data,mode,length) FSOUND_Sample_Load(index,data,mode,0,length)
-#else
-#define OLDFMOD //Alam: Yea!
-#endif
-
-#ifdef __MINGW32__
-#include <FMOD/fmod_errors.h>
-#else
-#include <fmod_errors.h>	/* optional */
-#endif
-
-#define MAXCHANNEL 1024
-
-#undef DEBUG_TO_FILE
-#if defined ( HAVE_SDL ) && !defined ( LOGMESSAGES )
-#define DEBUG_TO_FILE
-#endif
-
-#ifndef MORESTUFF
-//#define MORESTUFF
-#define REL2D
-#endif
-
-#define  _CREATE_DLL_
-#include "../../doomdef.h"
-#include "../hw3dsdrv.h"
-#define INT2CHAR(p) (char *)p + 8
-
-//Doom sound sample format
-#define FSOUND_UNORMAL (FSOUND_8BITS | FSOUND_MONO | FSOUND_UNSIGNED)
-//Load Raw
-#define FSOUND_RAWLOAD (FSOUND_LOADRAW | FSOUND_LOADMEMORY)
-//Load Sample Raw from pointer
-#define FSOUND_DOOMLOAD (FSOUND_UNORMAL | FSOUND_RAWLOAD)
-//length of SFX
-#define SFXLENGTH (sfx->length-8)
-
-//SRB2 treats +X as east, +Y as north, +Z as up.
-//FSOUND treats +X as right, +Y as up, and +Z as forwards.
-//So SRB2's XZY is FSOUND's XYZ
-//And FSOUND's XZY is SRB2's XYZ
-
-static I_Error_t I_ErrorFMOD = NULL;
-
-static FSOUND_SAMPLE *blankfmsample = NULL;
-
-// Calculate sound pitching
-static float recalc_pitch(INT32 doom_pitch)
-{
-#ifdef MORESTUFF
-	return (float)1;
-#else
-	return doom_pitch < NORMAL_PITCH ?
-		(float)(doom_pitch + NORMAL_PITCH) / (NORMAL_PITCH * 2)
-			:(float)doom_pitch / (float)NORMAL_PITCH;
-#endif
-}
-
-/***************************************************************
- *
- * DBG_Printf
- * Output error messages to debug log if DEBUG_TO_FILE is defined,
- * else do nothing
- *
- **************************************************************
- */
-// -----------------+
-// DBG_Printf       : Output error messages to debug log if DEBUG_TO_FILE is defined,
-//                  : else do nothing
-// Returns          :
-// -----------------+
-FUNCPRINTF void DBG_Printf(const char *lpFmt, ...)
-{
-#ifdef DEBUG_TO_FILE
-	char str[4096] = "";
-	va_list arglist;
-
-	va_start(arglist, lpFmt);
-	vsnprintf(str, 4096, lpFmt, arglist);
-	va_end(arglist);
-
-	if (logstream)
-		fwrite(str, strlen(str), 1, logstream);
-#endif
-}
-
-// Start of head_relative system for FMOD3D
-
-typedef struct rellistener_s
-{
-	float pos[3];
-	INT32 active;
-	float vel[3];
-
-} rellistener_s_t; //Easy
-
-static rellistener_s_t rellistener[2]; //The 2 listeners
-
-typedef struct relarray_s
-{
-	INT32             handle;             // handle number
-	INT32             chan;               // real channel
-	INT32             listener;           // for which listener
-	rellistener_s_t pos;                // source position in 3D
-} relarray_s_t;
-
-static relarray_s_t relarray[STATIC_SOURCES_NUM+1]; // array of chans
-
-
-//set listener
-static void relset(INT32 which)
-{
-	INT32 i;
-
-	if (which == -2 || which == -1)
-	{
-		which = -which;
-
-		memset(&rellistener[which-1], 0, sizeof (rellistener_s_t)); //Delete me
-		for (i = 0; i <= STATIC_SOURCES_NUM; i++)
-		{
-			if (relarray[i].pos.active && relarray[i].listener == which)
-			{
-				FSOUND_SetPaused(relarray[i].chan,true);
-				relarray[i].pos.active = false;
-			}
-		}
-		return;
-	}
-	else if (which == 1 || which ==2)
-	{
-		float pos[3], vel[3]; // Temp bin
-		which -= 1; //Hello!
-
-		//Get update
-		FSOUND_3D_Listener_GetAttributes(&pos[0],&vel[0],NULL,NULL,NULL,NULL,NULL,NULL);
-		memcpy(&rellistener[which].pos[0],&pos[0],sizeof (pos));
-		memcpy(&rellistener[which].vel[0],&vel[0],sizeof (vel));
-
-		if (!rellistener[which].active)
-		for (i = 0; i <= STATIC_SOURCES_NUM; i++)
-		{
-			if (!relarray[i].pos.active && relarray[i].listener == which)
-			{
-				FSOUND_SetPaused(relarray[i].chan,false);
-				relarray[i].pos.active = true;
-			}
-		}
-
-		rellistener[which].active = which;
-	}
-	else
-	{
-		memset(&rellistener[0], 0, sizeof (rellistener_s_t));
-		memset(&rellistener[1], 0, sizeof (rellistener_s_t));
-	}
-}
-
-//setup system
-static void relsetup()
-{
-	INT32 i;
-
-	// Setup the rel array for use
-	for (i = 0; i <= STATIC_SOURCES_NUM; i++)
-	{
-		relarray[i].handle = FSOUND_FREE;
-		relarray[i].chan = FSOUND_FREE;
-		relarray[i].listener = (i == 1 || i == 3)?2:1;
-		memset(&relarray[i].pos, 0, sizeof (rellistener_s_t));
-	}
-
-	// Set up the Listener array
-	relset(0);
-}
-
-
-//checkup for stack
-static INT32 relstack(INT32 chan)
-{
-	INT32 i;
-
-	for (i = 0; i <= STATIC_SOURCES_NUM; i++)
-	{
-		if (relarray[i].pos.active && relarray[i].handle == chan)
-			return i;
-	}
-	return -1;
-}
-
-//checkup for fake rel chan
-static INT32 relcheckup(INT32 chan)
-{
-	INT32 i = relstack(chan);
-
-	if (i == -1)
-		return chan;
-	else
-		return relarray[i].chan;
-}
-
-	//Update place rel chan's vol
-static void relvol(INT32 chan)
-{
-	INT32 vol = FSOUND_GetVolume(chan);
-	INT32 error = FSOUND_GetError();
-
-	if (chan == relcheckup(chan))
-		return;
-
-	if (!vol && error)
-		DBG_Printf("FMOD(relvol, FSOUND_GetVolume, Channel # %i): %s\n",chan,FMOD_ErrorString(error));
-	else if (!FSOUND_SetVolume(relcheckup(chan), vol))
-		DBG_Printf("FMOD(relvol, FSOUND_SetVolume, Channel # %i): %s\n",chan,FMOD_ErrorString(FSOUND_GetError()));
-}
-
-//Copy rel chan
-static INT32 relcopy(INT32 handle)
-{
-	FSOUND_SAMPLE *fmsample = NULL;
-	INT32 chan = -1;
-	float pos[3];
-	float vel[3];
-
-	if (!FSOUND_3D_GetAttributes(handle,&pos[0],&vel[0]))
-		if (FSOUND_GetError() != FMOD_ERR_NONE) DBG_Printf("FMOD(relcopy, FSOUND_3D_GetAttributes, Channel # %i): %s\n",handle,FMOD_ErrorString(FSOUND_GetError()));
-
-	fmsample = FSOUND_GetCurrentSample(handle);
-
-	if (fmsample)
-	{
-#ifdef REL2D
-		if (!FSOUND_Sample_SetMode(fmsample, FSOUND_2D))
-			DBG_Printf("FMOD(relcopy, FSOUND_Sample_SetMode, handle# %i): %s\n",handle,FMOD_ErrorString(FSOUND_GetError()));
-#endif
-		chan = FSOUND_PlaySoundEx(FSOUND_FREE,fmsample,NULL,true);
-
-		if (chan == -1)
-		{
-			if (FSOUND_GetError() != FMOD_ERR_NONE) DBG_Printf("FMOD(relcopy, FSOUND_PlaySoundEx, handle# %i): %s\n",handle,FMOD_ErrorString(FSOUND_GetError()));
-			return FSOUND_FREE;
-		}
-#ifdef MORESTUFF
-		else
-			DBG_Printf("FMOD(relcopy, Main): Copy Handle#%i to channel#%i\n",handle,chan);
-#endif
-	}
-	else
-	{
-		if (FSOUND_GetError() != FMOD_ERR_NONE)
-			DBG_Printf("FMOD(relcopy, FSOUND_GetCurrentSample, handle# %i): %s\n",handle,FMOD_ErrorString(FSOUND_GetError()));
-		chan = FSOUND_PlaySoundEx(FSOUND_FREE,blankfmsample,NULL,true);
-		//return FSOUND_FREE;
-	}
-
-	if (FSOUND_GetCurrentSample(chan))
-	{
-
-		if (!FSOUND_SetCurrentPosition(chan, 0))
-			DBG_Printf("FMOD(relcopy, FSOUND_SetCurrentPosition, handle#%i, channel# %i): %s\n",handle,chan,FMOD_ErrorString(FSOUND_GetError()));
-#ifndef REL2D
-		if (!FSOUND_3D_SetAttributes(chan,pos,vel))
-			DBG_Printf("FMOD(relcopy, FSOUND_3D_SetAttributes, handle#%i, channel#%i): %s\n",handle,chan,FMOD_ErrorString(FSOUND_GetError()));
-#endif
-/*
-		if (!FSOUND_SetReserved(chan, TURE))
-			DBG_Printf("FMOD(relcopy, FSOUND_SetReserved, handle#%i, channel# %i): %s\n",handle,chan,FMOD_ErrorString(FSOUND_GetError()));
-*/
-		return chan;
-	}
-
-	return FSOUND_FREE;
-}
-
-//update the rel chans
-static void relupdate(INT32 handle)
-{
-	if (handle == FSOUND_FREE)
-	{
-		INT32 stack;
-
-		for (stack = 0; stack <= STATIC_SOURCES_NUM;stack++)
-		{
-			//if (FSOUND_GetCurrentSample(relarray[stack].handle))
-			//	relarray[stack].chan = relcopy(relarray[stack].handle);
-
-			if (relarray[stack].chan != FSOUND_FREE)
-			{
-				relarray[stack].pos.active = false;
-				relupdate(relarray[stack].chan);
-			}
-			else
-				relarray[stack].pos.active = false;
-		}
-	}
-	else if (handle == relcheckup(handle))
-		return;
-#ifndef REL2D
-	else
-	{
-		float pos[3], vel[3];
-		INT32 stack = relstack(handle);
-		INT32 chan = relcheckup(handle);
-		INT32 which = relarray[stack].listener;
-
-		pos[0] = relarray[stack].pos.pos[0] + rellistener[which].pos[0];
-		pos[1] = relarray[stack].pos.pos[1] + rellistener[which].pos[1];
-		pos[2] = relarray[stack].pos.pos[2] + rellistener[which].pos[2];
-		vel[0] = relarray[stack].pos.vel[0] + rellistener[which].vel[0];
-		vel[1] = relarray[stack].pos.vel[1] + rellistener[which].vel[1];
-		vel[2] = relarray[stack].pos.vel[2] + rellistener[which].vel[2];
-
-		if (!FSOUND_3D_SetAttributes(chan,pos,vel))
-			DBG_Printf("FMOD(relupdate, FSOUND_3D_SetAttributes, Handle #%i,Channel #%i): %s\n",handle, chan,FMOD_ErrorString(FSOUND_GetError()));
-	}
-#endif
-}
-
-	//Update place rel chan's pos
-static void relplace(INT32 chan)
-{
-	float pos[3], vel[3]; // Temp bin
-
-	if (chan == relcheckup(chan))
-		return;
-
-	if (!FSOUND_3D_GetAttributes(chan,&pos[0],&vel[0]))
-	{
-		if (FSOUND_GetError() != FMOD_ERR_NONE) DBG_Printf("FMOD(relplace, FSOUND_3D_GetAttributes, Channel # %i): %s\n",chan,FMOD_ErrorString(FSOUND_GetError()));
-	}
-	else
-	{
-		INT32 stack = relstack(chan);
-
-		if (stack == -1)
-			return;
-
-		memcpy(&relarray[stack].pos.pos,&pos,sizeof (pos));
-		memcpy(&relarray[stack].pos.vel,&vel,sizeof (vel));
-		relupdate(chan);
-	}
-}
-
-//New rel chan
-static void reladd(INT32 chan)
-{
-	if (chan != relcheckup(chan))
-		return;
-	else
-	{
-		INT32 stack = STATIC_SOURCES_NUM;
-		{
-			if (relarray[0].handle == FSOUND_FREE)
-				stack = 0;
-			else if (relarray[1].handle == FSOUND_FREE)
-				stack = 1;
-			else if (relarray[2].handle == FSOUND_FREE)
-				stack = 2;
-			else if (relarray[3].handle == FSOUND_FREE)
-				stack = 3;
-			else if (relarray[4].handle == FSOUND_FREE)
-				stack = 4;
-			else if (relarray[5].handle == FSOUND_FREE)
-				stack = 5;
-			else
-				DBG_Printf("No more room in relarray\n");
-		}
-
-		relarray[stack].handle = chan;
-		relarray[stack].chan = relcopy(chan);
-
-		if (relarray[stack].chan != FSOUND_FREE)
-		{
-			relarray[stack].pos.active = true;
-			relupdate(chan);
-		}
-		else
-			relarray[stack].pos.active = false;
-	}
-}
-
-// End of head_relative system for FMOD3D
-
-
-/******************************************************************************
- *
- * Initialise driver and listener
- *
- *****************************************************************************/
-EXPORT INT32 HWRAPI(Startup) (I_Error_t FatalErrorFunction, snddev_t *snd_dev)
-{
-	boolean inited = false;
-	INT32 i = 0;
-
-	I_ErrorFMOD = FatalErrorFunction;
-
-	if (FSOUND_GetVersion() < FMOD_VERSION)
-	{
-		DBG_Printf("Error : You are using the wrong DLL version!\nYou should be using FMOD %.02f\n", FMOD_VERSION);
-		return inited;
-	}
-	else
-		DBG_Printf("S_FMOD Init(): FMOD_SOUND driver for SRB2Kart %s\n",VERSIONSTRING);
-
-	if (!FSOUND_SetMinHardwareChannels(STATIC_SOURCES_NUM*4))
-		DBG_Printf("FMOD(Startup,FSOUND_SetMinHardwareChannels,# of Channels Min: %i): %s\n",STATIC_SOURCES_NUM*4, FMOD_ErrorString(FSOUND_GetError()));
-
-	if (!FSOUND_SetMaxHardwareChannels(0))
-		DBG_Printf("FMOD(Startup,FSOUND_SetMaxHardwareChannels,# of Channels Min: %i): %s\n",0, FMOD_ErrorString(FSOUND_GetError()));
-
-	for (i = 0; i < FSOUND_GetNumDrivers(); i++)
-	{
-		UINT32 caps = 0;
-		DBG_Printf("Driver Caps, if any\n");
-
-		if (FSOUND_GetDriverCaps(i, &caps))
-		{
-			DBG_Printf("FMOD: Driver# %d - %s\n", i+1, FSOUND_GetDriverName(i));    // print driver names
-			if (caps & FSOUND_CAPS_HARDWARE)
-				DBG_Printf("This sound hardware supports hardware accelerated 3d sound.\n");
-
-			if (caps & FSOUND_CAPS_EAX2)
-				DBG_Printf("This sound hardware supports hardware accelerated 3d sound with EAX 2 reverb.\n");
-
-			if (caps & FSOUND_CAPS_EAX3)
-				DBG_Printf("This sound hardware supports hardware accelerated 3d sound with EAX 3 reverb.\n");
-		}
-		else
-			DBG_Printf("FMOD(Startup,FSOUND_GetDriverCaps,%s): %s\n",FSOUND_GetDriverName(i), FMOD_ErrorString(FSOUND_GetError()));
-	}
-#if defined (_WIN32) || defined (_WIN64)
-	if (!FSOUND_SetHWND(snd_dev->hWnd))
-	{
-		DBG_Printf("FMOD(Startup,FSOUND_SetHWND): %s\n", FMOD_ErrorString(FSOUND_GetError()));
-		return inited;
-	}
-	else
-#endif
-	{
-		DBG_Printf("Initialising FMOD %.02f\n",FMOD_VERSION);
-		inited = FSOUND_Init(snd_dev->sample_rate,MAXCHANNEL,0);
-	}
-
-	if (!inited)
-	{
-		DBG_Printf("FMOD(Startup,Main): %s\n", FMOD_ErrorString(FSOUND_GetError()));
-	}
-	else
-	{
-#ifdef OLDFMOD
-		DBG_Printf("   Maximum hardware mixing buffers %d\n", FSOUND_GetNumHardwareChannels());
-#else
-		INT32 num2DC, num3DC, numDC;
-
-		if (FSOUND_GetNumHWChannels(&num2DC,&num3DC,&numDC))
-		{
-			DBG_Printf("   Maximum hardware 2D buffers %d\n", num2DC);
-			DBG_Printf("   Maximum hardware 3D buffers %d\n", num3DC);
-			DBG_Printf("   Maximum hardware mixing buffers %d\n", numDC);
-		}
-		else
-			DBG_Printf("FMOD(Startup,FSOUND_GetNumHWChannels): %s\n", FMOD_ErrorString(FSOUND_GetError()));
-#endif
-
-		DBG_Printf("FMOD is up and running at %i KHZ\n",FSOUND_GetOutputRate());
-		DBG_Printf("Sound hardware capabilities:\n");
-
-		if (FSOUND_GetDriverName(FSOUND_GetDriver()))
-			DBG_Printf("   Driver is %s\n",FSOUND_GetDriverName(FSOUND_GetDriver()));
-		else
-			DBG_Printf("FMOD(Startup,FSOUND_GetDriverName): %s\n", FMOD_ErrorString(FSOUND_GetError()));
-
-		FSOUND_3D_SetDistanceFactor(1.0f/72.0f);
-		FSOUND_3D_SetRolloffFactor(0);
-		FSOUND_3D_SetRolloffFactor(1.6f);
-#ifdef MORESTUFF
-		FSOUND_3D_SetDopplerFactor(0);
-#endif
-
-		switch (FSOUND_GetOutput())
-		{
-			case FSOUND_OUTPUT_NOSOUND:
-				DBG_Printf("FMOD driver: NoSound driver, all calls to this succeed but do nothing.\n");
-				break;
-			case FSOUND_OUTPUT_WINMM:
-				DBG_Printf("FMOD driver: Windows Multimedia driver.\n");
-				break;
-			case FSOUND_OUTPUT_DSOUND:
-				DBG_Printf("FMOD driver: DirectSound driver. You need this to get EAX2 or EAX3 support, or FX api support.\n");
-				break;
-			case FSOUND_OUTPUT_A3D:
-				DBG_Printf("FMOD driver: A3D driver.\n");
-				break;
-			case FSOUND_OUTPUT_OSS:
-				DBG_Printf("FMOD driver: Linux/Unix OSS (Open Sound System) driver, i.e. the kernel sound drivers.\n");
-				break;
-			case FSOUND_OUTPUT_ESD:
-				DBG_Printf("FMOD driver: Linux/Unix ESD (Enlightment Sound Daemon) driver.\n");
-				break;
-			case FSOUND_OUTPUT_ALSA:
-				DBG_Printf("FMOD driver: Linux Alsa driver.\n");
-				break;
-			case FSOUND_OUTPUT_MAC:
-				DBG_Printf("FMOD driver: Mac SoundManager driver\n");
-				break;
-			case FSOUND_OUTPUT_NOSOUND_NONREALTIME:
-				DBG_Printf("FMOD driver: This is the same as nosound, but the sound generation is driven by FSOUND_Update\n");
-				break;
-			case FSOUND_OUTPUT_ASIO:
-				DBG_Printf("FMOD driver: Low latency ASIO driver\n");
-				break;
-			default:
-				DBG_Printf("FMOD driver: Unknown Sound Driver\n");
-				break;
-		}
-
-		relsetup();
-
-		blankfmsample = FSOUND_Sample_Alloc(FSOUND_UNMANAGED,1,FSOUND_UNORMAL,11025,127,FSOUND_STEREOPAN,127);
-
-		if (!blankfmsample)
-			DBG_Printf("FMOD(Startup,FSOUND_Sample_Alloc): %s\n", FMOD_ErrorString(FSOUND_GetError()));
-		else if (!FSOUND_Sample_SetMaxPlaybacks(blankfmsample,STATIC_SOURCES_NUM*2))
-			DBG_Printf("FMOD(Startup,FSOUND_Sample_SetMaxPlaybacks): %s\n", FMOD_ErrorString(FSOUND_GetError()));
-	}
-	return inited;
-}
-
-EXPORT void HWRAPI(Shutdown) (void)
-{
-	DBG_Printf("Shuting down FMOD\n");
-	FSOUND_Sample_Free(blankfmsample);
-	DBG_Printf("Shutdown of FMOD done\n");
-	FSOUND_Close();
-}
-
-/******************************************************************************
- *
- * Creates 3D source
- *
- ******************************************************************************/
-
-EXPORT INT32 HWRAPI (Add3DSource) (source3D_data_t *src, sfx_data_t *sfx)
-{
-	FSOUND_SAMPLE *fmsample = NULL;
-	INT32 chan = -1;
-	float pos[3];
-	float vel[3];
-#ifdef MORESTUFF
-	src->min_distance = MIN_DISTANCE;
-	src->max_distance = MAX_DISTANCE;
-#endif
-
-	pos[0] = src->pos.x;
-	pos[1] = src->pos.z;
-	pos[2] = src->pos.y;
-	vel[0] = src->pos.momx;
-	vel[1] = src->pos.momz;
-	vel[2] = src->pos.momy;
-	if (sfx)
-		fmsample = FSOUND_Sample_Load(FSOUND_FREE, INT2CHAR(sfx->data), FSOUND_DOOMLOAD, SFXLENGTH);
-	else
-		fmsample = blankfmsample;
-
-	if (fmsample)
-	{
-		if (sfx && !FSOUND_Sample_SetDefaults(fmsample,
-				(INT32)((*((UINT16 *)sfx->data+1))*recalc_pitch(sfx->pitch)),
-				(sfx->volume == -1 ? 255 : sfx->volume),
-				(sfx->sep == NORMAL_SEP ? FSOUND_STEREOPAN : sfx->sep),
-				(sfx->priority)
-				)
-			)
-			DBG_Printf("FMOD(Add3DSource, FSOUND_Sample_SetDefaults, SFX's ID# %i): %s\n",  sfx?sfx->id:0,FMOD_ErrorString(FSOUND_GetError()));
-#if 0
-		if (!FSOUND_Sample_SetMinMaxDistance(fmsample, src->min_distance, src->max_distance))
-			DBG_Printf("FMOD(Add3DSource, FSOUND_Sample_SetMinMaxDistance, SFX's ID# %i): %s\n", sfx?sfx->id:0,FMOD_ErrorString(FSOUND_GetError()));
-#endif
-		chan = FSOUND_PlaySoundEx(FSOUND_FREE,fmsample,NULL,true);
-
-		if (chan == -1)
-		{
-			DBG_Printf("FMOD(Add3DSource, FSOUND_PlaySoundEx, SFX's ID# %i): %s\n",sfx?sfx->id:0,FMOD_ErrorString(FSOUND_GetError()));
-			return chan;
-		}
-		else
-		{
-			if (!sfx)
-				DBG_Printf("FMOD(Add3DSource, Main): Added blank-sound added to channel %i\n",chan);
-#ifdef MORESTUFF
-			else DBG_Printf("FMOD(Add3DSource, Main): Added sfxid# %i added to channel %i\n",sfx->id,chan);
-#endif
-		}
-	}
-	else
-	{
-		if (sfx)
-			DBG_Printf("FMOD(Add3DSource, FSOUND_Sample_Load, sfxid# %i): %s\n",sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-		else
-			DBG_Printf("FMOD(Add3DSource, FSOUND_Sample_Alloc): %s\n", FMOD_ErrorString(FSOUND_GetError()));
-
-		return chan;
-	}
-
-	if (FSOUND_GetCurrentSample(chan))
-	{
-		if (!FSOUND_SetCurrentPosition(chan, 0))
-			DBG_Printf("FMOD(Add3DSource, FSOUND_SetCurrentPosition, channel %i, sfxid# %i): %s\n", chan,sfx?sfx->id:0,FMOD_ErrorString(FSOUND_GetError()));
-
-		if (!FSOUND_3D_SetAttributes(chan,pos,vel))
-			DBG_Printf("FMOD(Add3DSource, FSOUND_3D_SetAttributes, channel %i, sfxid# %i): %s\n", chan,sfx?sfx->id:0,FMOD_ErrorString(FSOUND_GetError()));
-
-		if (!FSOUND_SetReserved(chan, (signed char)src->permanent))
-			DBG_Printf("FMOD(Add3DSource, FSOUND_SetReserved, channel %i, sfxid# %i): %s\n", chan,sfx?sfx->id:0,FMOD_ErrorString(FSOUND_GetError()));
-
-		if (src->head_relative) reladd(chan);
-	}
-
-	return chan;
-}
-
-/******************************************************************************
- *
- * Creates 2D (stereo) source
- *
- ******************************************************************************/
-EXPORT INT32 HWRAPI (Add2DSource) (sfx_data_t *sfx)
-{
-	FSOUND_SAMPLE *fmsample = NULL;
-	INT32 chan = -1;
-
-	if (!sfx)
-		return chan;
-
-	fmsample = FSOUND_Sample_Load(FSOUND_FREE, INT2CHAR(sfx->data), FSOUND_DOOMLOAD, SFXLENGTH);
-
-	if (fmsample)
-	{
-		if (!FSOUND_Sample_SetDefaults(fmsample,
-		 (INT32)((float)(*((UINT16 *)sfx->data+1)) * recalc_pitch(sfx->pitch)),
-		 sfx->volume == -1 ? 255 : sfx->volume,
-		 sfx->sep == NORMAL_SEP ? FSOUND_STEREOPAN : sfx->sep,
-		 sfx->priority))
-			DBG_Printf("FMOD(Add2DSource, FSOUND_Sample_SetDefaults, sfxid# %i): %s\n", sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-
-		if (!FSOUND_Sample_SetMode(fmsample,FSOUND_2D))
-			DBG_Printf("FMOD(Add2DSource, FSOUND_Sample_SetMode, sfxid# %i): %s\n", sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-
-		chan = FSOUND_PlaySoundEx(FSOUND_FREE,fmsample,NULL,true);
-
-		if (chan == -1)
-		{
-			DBG_Printf("FMOD(Add2DSource, FSOUND_PlaySoundEx, sfxid# %i): %s\n", sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-			return chan;
-		}
-#ifdef MORESTUFF
-		else DBG_Printf("FMOD(Add2DSource, FSOUND_PlaySoundEx): sfxid# %i is playing on channel %i\n", sfx->id,chan);
-#endif
-	}
-	else
-	{
-		DBG_Printf("FMOD(Add2DSource,FSOUND_Sample_Load, sfxid# %i): %s\n", sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-		return chan;
-	}
-
-	if (FSOUND_GetCurrentSample(chan))
-	{
-		if (!FSOUND_SetCurrentPosition(chan, 0))
-			DBG_Printf("FMOD(Add2DSource, FSOUND_SetCurrentPosition, channel %i, sfxid# %i): %s\n", chan,sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-	}
-
-	return chan;
-}
-
-EXPORT INT32 HWRAPI (StartSource) (INT32 chan)
-{
-	FSOUND_SAMPLE *fmsample;
-	if (chan < 0)
-		return -1;
-
-	fmsample = FSOUND_GetCurrentSample(chan);
-
-	if (!fmsample)
-		return -1;
-
-#ifdef MORESTUFF
-	if (FSOUND_Sample_GetMode(fmsample) & FSOUND_2D)
-	{
-		DBG_Printf("FMOD(StartSource,Main): Starting 2D channel %i?\n",chan);
-		//return -1;
-	}
-	else
-	{
-		DBG_Printf("FMOD(StartSource,Main): Starting 3D Channel %i?\n",chan);
-		//return -1;
-	}
-#endif
-
-	if (FSOUND_GetPaused(relcheckup(chan)))
-	{
-		if (!FSOUND_SetPaused(relcheckup(chan), false))
-			DBG_Printf("FMOD(StartSource,FSOUND_SetPaused, channel %i): %s\n", chan,FMOD_ErrorString(FSOUND_GetError()));
-		else if (relstack(chan) != -1)
-			relarray[relstack(chan)].pos.active = false;
-	}
-	else
-		DBG_Printf("FMOD(StartSource,FSOUND_GetPaused): Channel %i is playing already",chan);
-
-	return chan;
-}
-
-EXPORT void HWRAPI (StopSource) (INT32 chan)
-{
-	FSOUND_SAMPLE *fmsample;
-
-	if (chan < 0)
-		return;
-
-	fmsample = FSOUND_GetCurrentSample(chan);
-
-	if (!fmsample)
-		return;
-
-	if (!FSOUND_GetPaused(relcheckup(chan)))
-	{
-		if (!FSOUND_SetPaused(relcheckup(chan),true))
-		{
-			DBG_Printf("FMOD(StopSource,FSOUND_SetPaused, channel %i): %s\n", chan,FMOD_ErrorString(FSOUND_GetError()));
-		}
-		else if (relstack(chan) != -1)
-		{
-			relarray[relstack(chan)].pos.active = false;
-		}
-	}
-#ifdef MORESTUFF
-	else
-		DBG_Printf("FMOD(StopSource,FSOUND_GetPaused): Channel %i is stopped already\n",chan);
-#endif
-}
-
-EXPORT INT32 HWRAPI (GetHW3DSVersion) (void)
-{
-	return VERSION;
-}
-
-EXPORT void HWRAPI (BeginFrameUpdate) (void)
-{
-	FSOUND_Update();
-}
-
-EXPORT void HWRAPI (EndFrameUpdate) (void)
-{
-	relupdate(FSOUND_FREE);
-}
-
-EXPORT INT32 HWRAPI (IsPlaying) (INT32 chan)
-{
-	if (chan < 0)
-		return false;
-
-	if (!FSOUND_GetCurrentSample(chan))
-		return false;
-
-	return FSOUND_IsPlaying(relcheckup(chan));
-}
-
-/******************************************************************************
- * UpdateListener
- *
- * Set up main listener properties:
- * - position
- * - orientation
- * - velocity
- *****************************************************************************/
-EXPORT void HWRAPI (UpdateListener) (listener_data_t *data)
-{
-	if (data)
-	{
-		float pos[3];
-		float vel[3];
-		double f_angle = 0;
-		if (data->f_angle) f_angle = (data->f_angle) / 180 * M_PI;
-		pos[0] = (float)data->x;
-		pos[1] = (float)data->z;
-		pos[2] = (float)data->y;
-		vel[0] = (float)data->momx;
-		vel[1] = (float)data->momz;
-		vel[2] = (float)data->momy;
-
-		FSOUND_3D_Listener_SetAttributes(pos,vel,(float)cos(f_angle),0.0f,(float)sin(f_angle), 0.0f , 1.0f, 0.0f);
-		relset(1);
-	}
-	else
-	{
-		relset(-1);
-		DBG_Printf("Error: 1st listener data is missing\n");
-	}
-}
-
-EXPORT void HWRAPI (UpdateListener2) (listener_data_t *data)
-{
-	if (data)
-	{
-		float pos[3];
-		float vel[3];
-		double f_angle = 0;
-		if (data->f_angle) f_angle = (data->f_angle) / 180 * M_PI;
-		pos[0] = (float)data->x;
-		pos[1] = (float)data->z;
-		pos[2] = (float)data->y;
-		vel[0] = (float)data->momx;
-		vel[1] = (float)data->momz;
-		vel[2] = (float)data->momy;
-
-		FSOUND_3D_Listener_SetCurrent(1,2);
-		FSOUND_3D_Listener_SetAttributes(pos,vel,(float)cos(f_angle),0.0f,(float)sin(f_angle), 0.0f , 1.0f, 0.0f);
-		relset(2);
-		FSOUND_3D_Listener_SetCurrent(0,2);
-	}
-	else
-	{
-		relset(-2);
-		FSOUND_3D_Listener_SetCurrent(0,1);
-	}
-}
-
-EXPORT void HWRAPI (UpdateSourceVolume) (INT32 chan, INT32 vol)
-{
-	if (chan < 0)
-		return;
-
-	if (!FSOUND_GetCurrentSample(chan))
-		return;
-
-	if (!FSOUND_SetVolume(chan,vol))
-		DBG_Printf("FMOD(UpdateSourceVolume, FSOUND_SetVolume, channel %i to volume %i): %s\n", chan,vol,FMOD_ErrorString(FSOUND_GetError()));
-	else
-	{
-#ifdef MORESTUFF
-		DBG_Printf("FMOD(UpdateSourceVolume, Main): channel %i is set to the volume of %i", chan,vol);
-#endif
-		relvol(chan);
-	}
-}
-
-/******************************************************************************
- *
- * Update volume and separation (panning) of 2D source
- *
- *****************************************************************************/
-EXPORT void HWRAPI (Update2DSoundParms) (INT32 chan, INT32 vol, INT32 sep)
-{
-	FSOUND_SAMPLE *fmsample;
-
-	if (chan < 0)
-		return;
-
-	fmsample = FSOUND_GetCurrentSample(chan);
-
-	if (fmsample)
-	{
-		if (!FSOUND_Sample_GetMode(fmsample) & FSOUND_2D)
-		{
-			DBG_Printf("FMOD(Update2DSoundParms,Main): 2D Vol/Pan on 3D channel %i?\n",chan);
-			//return;
-		}
-	}
-	else
-		return;
-
-	if (!FSOUND_SetPaused(chan, true))
-		DBG_Printf("FMOD(Update2DSoundParms, FSOUND_SetPaused, Pause, channel %i): %s\n", chan,FMOD_ErrorString(FSOUND_GetError()));
-
-	if (!FSOUND_SetVolume(chan,vol))
-		DBG_Printf("FMOD(Update2DSoundParms, , channel %i to volume %i): %s\n", chan,vol,FMOD_ErrorString(FSOUND_GetError()));
-
-	if (!FSOUND_SetPan(chan, sep == NORMAL_SEP ? FSOUND_STEREOPAN : sep))
-		DBG_Printf("FMOD(Update2DSoundParms, FSOUND_SetPan, channel %i to sep %i): %s\n", chan,sep,FMOD_ErrorString(FSOUND_GetError()));
-
-	if (!FSOUND_SetPaused(chan, false))
-		DBG_Printf("FMOD(Update2DSoundParms, FSOUND_SetPaused, Resume, channel %i): %s\n", chan,FMOD_ErrorString(FSOUND_GetError()));
-}
-
-// --------------------------------------------------------------------------
-// Set the global volume for sound effects
-// --------------------------------------------------------------------------
-EXPORT void HWRAPI (SetGlobalSfxVolume) (INT32 vol)
-{
-	INT32 realvol = (vol<<3)+(vol>>2);
-
-	FSOUND_SetSFXMasterVolume(realvol);
-#ifdef MORESTUFF
-	DBG_Printf("FMOD(SetGlobalSfxVolume, Main, the volume is set to %i): %s\n", realvol,FMOD_ErrorString(FSOUND_GetError()));
-#endif
-}
-
-//Alam_GBC: Not Used?
-EXPORT INT32 HWRAPI (SetCone) (INT32 chan, cone_def_t *cone_def)
-{
-	FSOUND_SAMPLE *fmsample;
-
-	if (chan < 0)
-		return -1;
-
-	fmsample = FSOUND_GetCurrentSample(chan);
-
-	if (fmsample)
-	{
-		if (FSOUND_Sample_GetMode(fmsample) & FSOUND_2D)
-		{
-			DBG_Printf("FMOD(Update3DSource,Main): 3D Cone on 2D Channel %i?\n",chan);
-			return -1;
-		}
-	}
-
-	if (cone_def)
-	{
-		return -1;
-	}
-	else
-	{
-		return 1;
-	}
-
-}
-
-EXPORT void HWRAPI (Update3DSource) (INT32 chan, source3D_pos_t *sfx)
-{
-	float pos[3];
-	float vel[3];
-	FSOUND_SAMPLE *fmsample;
-
-	pos[0] = sfx->x;
-	pos[1] = sfx->z;
-	pos[2] = sfx->y;
-	vel[0] = sfx->momx;
-	vel[1] = sfx->momz;
-	vel[2] = sfx->momy;
-	if (chan < 0)
-		return;
-
-	fmsample = FSOUND_GetCurrentSample(chan);
-
-	if (!fmsample)
-		return;
-
-	if (fmsample)
-	{
-		if (FSOUND_Sample_GetMode(fmsample) & FSOUND_2D)
-		{
-			//DBG_Printf("FMOD(Update3DSource,Main): 3D Pos/Vel on 2D Channel %i?\n",chan);
-			//return;
-		}
-	}
-	else
-	{
-		return;
-	}
-
-	if (!FSOUND_3D_SetAttributes(chan,pos,vel))
-		DBG_Printf("FMOD(Update3DSource,FSOUND_3D_SetAttributes, onto channel %i): %s\n", chan,FMOD_ErrorString(FSOUND_GetError()));
-	else
-		relplace(chan);
-}
-
-//-------------------------------------------------------------
-// Load new sound data into source
-//-------------------------------------------------------------
-EXPORT INT32 HWRAPI (Reload3DSource) (INT32 handle, sfx_data_t *sfx)
-{
-	source3D_data_t src;
-	float pos[3], vel[3];
-	INT32 chan = relcheckup(handle);
-	FSOUND_SAMPLE *fmsample;
-
-	if (handle < 0 || !sfx)
-		return -1;
-
-	fmsample = FSOUND_GetCurrentSample(chan);
-
-	if (!fmsample)
-		return -1;
-
-	if (FSOUND_Sample_GetMode(fmsample) & FSOUND_2D)
-	{
-		DBG_Printf("FMOD(Reload3DSource,Main): New 3D Sound on 2D Channel %i?\n",handle);
-		return -1;
-	}
-#ifdef MORESTUFF
-	else
-		DBG_Printf("FMOD(Reload3DSource, Main, sending new sfx# %i to chan %i)\n",sfx->id,handle);
-#endif
-
-#ifdef OLDFMOD
-	src.min_distance = MIN_DISTANCE;
-	src.max_distance = MAX_DISTANCE;
-#else
-	if (!FSOUND_3D_GetMinMaxDistance(handle,&src.min_distance,&src.min_distance))
-		DBG_Printf("FMOD(Reload3DSource, FSOUND_3D_GetMinMaxDistance, channel %i, for sfxid# %i): %s\n",handle, sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-#endif
-	src.head_relative = (handle != chan);
-	src.permanent = FSOUND_GetReserved(handle);
-	if (!FSOUND_3D_GetAttributes(handle,&pos[0],&vel[0]))
-		DBG_Printf("FMOD(Reload3DSource, FSOUND_3D_GetAttributes, channel %i, for sfxid# %i): %s\n",handle,sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-
-	//if (handle == chan)
-	{
-		if (fmsample != blankfmsample) FSOUND_Sample_Free(fmsample);
-	}
-	//else
-	{
-	//	fmsample = FSOUND_GetCurrentSample(handle);
-	}
-
-	fmsample = FSOUND_Sample_Load(FSOUND_FREE, INT2CHAR(sfx->data), FSOUND_DOOMLOAD, SFXLENGTH);
-
-	if (!FSOUND_StopSound(chan))
-		DBG_Printf("FMOD(Reload3DSource,FSOUND_StopSound, of channel %i for sfxid# %i): %s\n", handle,sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-
-	if (fmsample)
-	{
-		if (!FSOUND_Sample_SetDefaults(fmsample,
-		 (INT32)((float)(*((UINT16 *)sfx->data+1)) * recalc_pitch(sfx->pitch)),
-		 sfx->volume == -1 ? 255 : sfx->volume,
-		 sfx->sep == NORMAL_SEP ? FSOUND_STEREOPAN : sfx->sep,
-		 sfx->priority))
-			DBG_Printf("FMOD(Reload3DSource, FSOUND_Sample_SetDefaults, for sfxid# %i): %s\n", sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-
-		if (!FSOUND_Sample_SetMinMaxDistance(fmsample, src.min_distance, src.max_distance))
-			DBG_Printf("FMOD(Reload3DSource, FSOUND_Sample_SetMinMaxDistance, SFX's ID# %i): %s\n", sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-
-		chan = FSOUND_PlaySoundEx(chan,fmsample,NULL,true);
-
-		if (chan == -1)
-		{
-			DBG_Printf("FMOD(Reload3DSource, FSOUND_PlaySoundEx, for sfxid# %i): %s\n", sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-			return chan;
-		}
-
-		if (FSOUND_GetCurrentSample(chan))
-		{
-			if (!FSOUND_SetCurrentPosition(chan, 0))
-				DBG_Printf("FMOD(Reload3DSource, FSOUND_SetCurrentPosition, channel %i, sfxid# %i): %s\n", chan,sfx?sfx->id:0,FMOD_ErrorString(FSOUND_GetError()));
-
-			if (!FSOUND_3D_SetAttributes(chan,pos,vel))
-				DBG_Printf("FMOD(Reload3DSource, FSOUND_3D_SetAttributes, channel %i, sfxid# %i): %s\n", chan,sfx?sfx->id:0,FMOD_ErrorString(FSOUND_GetError()));
-
-			if (!FSOUND_SetReserved(chan, (signed char)src.permanent))
-				DBG_Printf("FMOD(Reload3DSource, FSOUND_SetReserved, channel %i, sfxid# %i): %s\n", chan,sfx?sfx->id:0,FMOD_ErrorString(FSOUND_GetError()));
-
-			if (src.head_relative) relupdate(handle);
-		}
-	}
-	else
-		DBG_Printf("FMOD(Reload3DSource,FSOUND_Sample_Load, for sfxid# %i): %s\n", sfx->id,FMOD_ErrorString(FSOUND_GetError()));
-
-	return chan;
-}
-
-/******************************************************************************
- *
- * Destroy source and remove it from stack if it is a 2D source.
- * Otherwise put source into cache
- *
- *****************************************************************************/
-EXPORT void HWRAPI (KillSource) (INT32 chan)
-{
-	FSOUND_SAMPLE *fmsample;
-	INT32 relchan;
-
-	if (chan < 0)
-		return;
-
-	relchan = relcheckup(chan);
-
-	fmsample = FSOUND_GetCurrentSample(chan);
-
-	if (!fmsample)
-		return;
-
-#ifdef MORESTUFF
-	if (FSOUND_IsPlaying(relchan))
-		if (!FSOUND_SetLoopMode(relchan, FSOUND_LOOP_OFF))
-			DBG_Printf("FMOD(KillSource,FSOUND_SetLoopMode, for channel %i): %s\n", chan,FMOD_ErrorString(FSOUND_GetError())); //Alam_GBC: looping off
-	else
-#endif
-	if (!FSOUND_StopSound(relchan))
-	{
-		DBG_Printf("FMOD(KillSource,FSOUND_StopSound, for channel %i): %s\n", chan,FMOD_ErrorString(FSOUND_GetError()));
-	}
-#ifdef MORESTUFF
-	else DBG_Printf("FMOD(KillSource, Main, for channel %i)\n", chan);
-#endif
-	if (fmsample != blankfmsample) FSOUND_Sample_Free(fmsample);
-}
-
-#ifdef _WINDOWS
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, // handle to DLL module
-                    DWORD fdwReason,    // reason for calling function
-                    LPVOID lpvReserved) // reserved
-{
-	// Perform actions based on the reason for calling.
-	UNREFERENCED_PARAMETER(lpvReserved);
-	switch (fdwReason)
-	{
-		case DLL_PROCESS_ATTACH:
-			// Initialize once for each new process.
-			// Return FALSE to fail DLL load.
-#ifdef DEBUG_TO_FILE
-			logstream = fopen("s_fmod.log", "wt");
-			if (logstream == NULL)
-				return FALSE;
-#endif
-			DisableThreadLibraryCalls(hinstDLL);
-			break;
-
-		case DLL_THREAD_ATTACH:
-			// Do thread-specific initialization.
-			break;
-
-		case DLL_THREAD_DETACH:
-			// Do thread-specific cleanup.
-			break;
-
-		case DLL_PROCESS_DETACH:
-			// Perform any necessary cleanup.
-#ifdef DEBUG_TO_FILE
-			if (logstream)
-			{
-				fclose(logstream);
-				logstream = NULL;
-			}
-#endif
-			break;
-	}
-	return TRUE; // Successful DLL_PROCESS_ATTACH.
-}
-#elif !defined (HAVE_SDL)
-
-// **************************************************************************
-//                                                                  FUNCTIONS
-// **************************************************************************
-
-EXPORT void _init()
-{
-#ifdef DEBUG_TO_FILE
-	logstream = fopen("s_fmod.log","wt");
-#endif
-}
-
-EXPORT void _fini()
-{
-#ifdef DEBUG_TO_FILE
-	if (logstream)
-		fclose(logstream);
-#endif
-}
-#endif
diff --git a/src/hardware/s_fmod/s_fmod.dev b/src/hardware/s_fmod/s_fmod.dev
deleted file mode 100644
index 01e21e2b7..000000000
--- a/src/hardware/s_fmod/s_fmod.dev
+++ /dev/null
@@ -1,59 +0,0 @@
-[Project]
-FileName=s_fmod.dev
-Name=s_fmod
-Ver=1
-IsCpp=1
-Type=3
-Compiler=-D_M_IX86=500_@@_-Wall_@@_-D_WINDOWS_@@_-Os_@@_-fomit-frame-pointer_@@_
-CppCompiler=
-Includes=..\..\win32\FMOD
-Linker=--def ../s_mingw.def_@@_-lfmod_@@_
-Libs=..\..\win32\FMOD
-UnitCount=1
-Folders=
-ObjFiles=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=C:\srb2demo2
-ObjectOutput=..\..\..\objs\Mingw\s_fmod
-OverrideOutput=1
-OverrideOutputName=s_fmod.dll
-HostApplication=
-CommandLine=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=00000000000000000111d0
-UseCustomMakefile=0
-CustomMakefile=
-
-[Unit1]
-FileName=s_fmod.c
-Folder=
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=1
-Minor=0
-Release=8
-Build=42
-LanguageID=1033
-CharsetID=1252
-CompanyName=Alam Arias
-FileVersion=1.42
-FileDescription=SRB2 Sound API DLL for FMOD
-InternalName=Super FMOD!
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=s_fmod.dll
-ProductName=s_fmod
-ProductVersion=0.1
-AutoIncBuildNr=0
-
diff --git a/src/hardware/s_fmod/s_fmod.dsp b/src/hardware/s_fmod/s_fmod.dsp
deleted file mode 100644
index c9a1fb743..000000000
--- a/src/hardware/s_fmod/s_fmod.dsp
+++ /dev/null
@@ -1,97 +0,0 @@
-# Microsoft Developer Studio Project File - Name="s_fmod" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=s_fmod - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "s_fmod.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "s_fmod.mak" CFG="s_fmod - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "s_fmod - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "s_fmod - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "s_fmod - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\bin\VC\Release\s_fmod"
-# PROP Intermediate_Dir "..\..\..\objs\VC\Release\s_fmod"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "S_FMOD_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /FR /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 fmodvc.lib /nologo /dll /pdb:"..\..\..\bin\VC\Release\s_fmod.pdb" /machine:I386 /out:"..\..\..\bin\VC\Release\s_fmod.dll"
-
-!ELSEIF  "$(CFG)" == "s_fmod - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\bin\VC\Debug\s_fmod"
-# PROP Intermediate_Dir "..\..\..\objs\VC\Debug\s_fmod"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "S_FMOD_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /FR /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 fmodvc.lib /nologo /dll /pdb:"..\..\..\bin\VC\Debug\s_fmod.pdb" /debug /machine:I386 /out:"..\..\..\bin\VC\Debug\s_fmod.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "s_fmod - Win32 Release"
-# Name "s_fmod - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\s_fmod.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/hardware/s_openal/s_openal.c b/src/hardware/s_openal/s_openal.c
deleted file mode 100644
index 7f91ccf2c..000000000
--- a/src/hardware/s_openal/s_openal.c
+++ /dev/null
@@ -1,998 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2001 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//-----------------------------------------------------------------------------
-/// \file
-/// \brief  General driver for 3D sound system
-///
-///	Implementend via OpenAL API
-
-#ifdef _WINDOWS
-//#define WIN32_LEAN_AND_MEAN
-#define RPC_NO_WINDOWS_H
-#include <windows.h>
-#include <stdio.h>
-FILE* logstream = NULL;
-#else
-#include <stdarg.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#ifndef HAVE_SDL // let not make a logstream here is we are inline the HW3D in the SDL binary
-FILE* logstream = NULL;
-#endif
-#endif
-
-#ifdef __APPLE__
-#include <al.h> //Main AL
-#include <alc.h> //Helpers
-#else
-#include <AL/al.h> //Main AL
-#include <AL/alc.h> //Helpers
-#endif
-
-#define  _CREATE_DLL_
-#include "../../doomdef.h"
-#include "../hw3dsdrv.h"
-
-//#undef DEBUG_TO_FILE
-//#if defined ( HAVE_SDL ) && !defined ( LOGMESSAGES )
-#define DEBUG_TO_FILE
-//#endif
-
-// Internal sound stack
-typedef struct stack_snd_s
-{
-	ALuint ALsource;// 3D data of 3D source
-
-	ALint sfx_id;// Currently unused
-
-	ALint LRU;// Currently unused
-
-	ALboolean permanent;// Flag of static source
-} stack_snd_t;
-
-#ifndef AL_INVALID
-#define AL_INVALID (-1)
-#endif
-
-static I_Error_t    I_ErrorOpenAl    = NULL;
-static stack_snd_t *ALstack          = NULL; // Sound stack
-static ALsizei      allocated_sounds = 0;    // Size of stack
-static ALsizei      allocate_delta   = 16;
-static ALCdevice   *ALCDevice        = NULL;
-static ALCcontext  *ALContext        = NULL;
-static ALenum       ALo_Lasterror    = AL_NO_ERROR;
-static ALenum       ALCo_Lasterror   = ALC_NO_ERROR;
-
-static ALenum ALo_GetError(ALvoid)
-{
-	ALo_Lasterror = alGetError();
-	return ALo_Lasterror;
-}
-
-static ALenum ALCo_GetError(ALvoid)
-{
-	ALCo_Lasterror = alcGetError(ALCDevice);
-	return ALCo_Lasterror;
-}
-
-static ALfloat ALvol(ALint vol, ALsizei step)
-{
-	return ((ALfloat)vol)/(ALfloat)step;
-}
-
-/*
-static ALfloat Alpitch(ALint pitch)
-{
-#if 1
-	pitch = NORMAL_PITCH;
-#endif
-	return pitch < NORMAL_PITCH ?
-		(float)(pitch + NORMAL_PITCH) / (NORMAL_PITCH * 2)
-		:(float)pitch / (float)NORMAL_PITCH;
-}
-*/
-
-static const ALchar *GetALErrorString(ALenum err)
-{
-	switch (err)
-	{
-		case AL_NO_ERROR:
-			return "There no error";
-			break;
-
-		case AL_INVALID_NAME:
-			return "Invalid name";
-			break;
-
-		case AL_INVALID_ENUM:
-			return "Invalid enum";
-			break;
-
-		case AL_INVALID_VALUE:
-			return "Invalid value";
-			break;
-
-		case AL_INVALID_OPERATION:
-			return "Invalid operation";
-			break;
-
-		case AL_OUT_OF_MEMORY:
-			return "Out Of Memory";
-			break;
-
-		default:
-			return alGetString(err);
-			break;
-	}
-}
-
-static const ALchar *GetALCErrorString(ALenum err)
-{
-	switch (err)
-	{
-		case ALC_NO_ERROR:
-			return "There no error";
-			break;
-
-		case ALC_INVALID_DEVICE:
-			return "Invalid Device";
-			break;
-
-		case ALC_INVALID_CONTEXT:
-			return "Invalid Context";
-			break;
-
-		case ALC_INVALID_ENUM:
-			return "Invalid enum";
-			break;
-
-		case ALC_INVALID_VALUE:
-			return "Invalid value";
-			break;
-
-		case ALC_OUT_OF_MEMORY:
-			return "Out Of Memory";
-			break;
-
-		default:
-			return alcGetString(ALCDevice, err);
-			break;
-	}
-}
-
-/***************************************************************
- *
- * DBG_Printf
- * Output error messages to debug log if DEBUG_TO_FILE is defined,
- * else do nothing
- *
- **************************************************************
- */
-// -----------------+
-// DBG_Printf       : Output error messages to debug log if DEBUG_TO_FILE is defined,
-//                  : else do nothing
-// Returns          :
-// -----------------+
-FUNCPRINTF void DBG_Printf(const char *lpFmt, ... )
-{
-#ifdef DEBUG_TO_FILE
-	char    str[4096] = "";
-	va_list arglist;
-
-	va_start(arglist, lpFmt);
-	vsnprintf(str, 4096, lpFmt, arglist);
-	va_end(arglist);
-	if (logstream)
-		fwrite(str, strlen(str), 1 , logstream);
-#else
-	lpFmt = NULL;
-#endif
-}
-
-/***************************************************************
- *
- * Grow internal sound stack by allocate_delta amount
- *
- ***************************************************************
- */
-static ALboolean reallocate_stack(void)
-{
-	stack_snd_t *new_stack;
-	if (ALstack)
-		new_stack = realloc(ALstack, sizeof (stack_snd_t) * (allocated_sounds + allocate_delta));
-	else
-		new_stack = malloc(sizeof (stack_snd_t) * (allocate_delta));
-	if (new_stack)
-	{
-		ALsizei clean_stack;
-		ALstack = new_stack;
-		memset(&ALstack[allocated_sounds], 0, allocate_delta * sizeof (stack_snd_t));
-		for (clean_stack = allocated_sounds; clean_stack < allocated_sounds; clean_stack++)
-			ALstack[clean_stack].ALsource = (ALuint)AL_INVALID;
-		allocated_sounds += allocate_delta;
-		return AL_TRUE;
-	}
-	return AL_FALSE;
-}
-
-
-/***************************************************************
- *
- * Destroys source in stack
- *
- ***************************************************************
- */
-static ALvoid kill_sound(stack_snd_t *snd)
-{
-	if (alIsSource(snd->ALsource))
-		alDeleteSources(1,&snd->ALsource);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alDeleteSources, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-	memset(snd,0, sizeof (stack_snd_t));
-	snd->ALsource = (ALuint)AL_INVALID;
-}
-
-/***************************************************************
- *
- * Returns free (unused) source stack slot
- * If none available sound stack will be increased
- *
- ***************************************************************
- */
-static ALsizei find_handle(void)
-{
-	ALsizei free_sfx = 0;
-	stack_snd_t *snd;
-
-	for (snd = ALstack; free_sfx < allocated_sounds; snd++, free_sfx++)
-	{
-		if (snd->permanent)
-			continue;
-		if (snd->ALsource==(ALuint)AL_INVALID)
-			break;
-		if (!alIsSource(snd->ALsource))
-			break;
-		ALo_GetError();
-		if (snd->sfx_id == 0)
-			break;
-	}
-
-	// No suitable resource found so increase sound stack
-	//DBG_Printf("sfx chan %d\n", free_sfx);
-	if (free_sfx == allocated_sounds)
-	{
-		DBG_Printf("No free or same sfx found so increase stack (currently %d srcs)\n", allocated_sounds);
-		free_sfx = reallocate_stack() ? free_sfx : (ALsizei)AL_INVALID;
-	}
-	return free_sfx;
-}
-
-static ALvoid ALSetPan(ALuint sid, INT32 sep)
-{
-	ALfloat facing[3] ={0.0f, 0.0f, 0.0f}; //Alam: bad?
-	const ALfloat fsep = (ALfloat)sep;
-	const ALfloat nsep = (ALfloat)NORMAL_SEP;
-	if (sep)
-	{
-		facing[0] = (ALfloat)(fsep/nsep);
-		facing[2] = 1.0f;
-	}
-	alSourcefv(sid, AL_POSITION, facing);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alSourcefv, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-}
-
-
-/******************************************************************************
- *
- * Initialise driver and listener
- *
- *****************************************************************************/
-EXPORT INT32 HWRAPI( Startup ) (I_Error_t FatalErrorFunction, snddev_t *snd_dev)
-{
-	ALenum          model      = AL_INVERSE_DISTANCE_CLAMPED;
-	ALCboolean      inited     = ALC_FALSE;
-	ALCint          AlSetup[8] = {ALC_FREQUENCY,22050,ALC_REFRESH,35,ALC_SYNC,AL_FALSE,ALC_INVALID,ALC_INVALID};
-#if (defined (_WIN32) || defined (_WIN64)) && 0
-	const ALCubyte *ALCdriver  = alcGetString(NULL,ALC_DEFAULT_DEVICE_SPECIFIER);
-	const ALCubyte *DSdriver = "DirectSound";
-
-	if (!strcmp((const ALCbyte *)ALCdriver,"DirectSound3D")) //Alam: OpenAL's DS3D is buggy
-		ALCDevice = alcOpenDevice(DSdriver); //Open DirectSound
-	else //Alam: The OpenAl device
-		ALCDevice = alcOpenDevice(ALCdriver); //Open Default
-#else
-	ALCDevice = alcOpenDevice(alcGetString(NULL,ALC_DEFAULT_DEVICE_SPECIFIER));
-#endif
-	if (ALCo_GetError() != ALC_NO_ERROR || !ALCDevice)
-	{
-		DBG_Printf("S_OpenAl: Error %s when opening device!\n", GetALCErrorString(ALCo_Lasterror));
-		return inited;
-	}
-	else
-	{
-		DBG_Printf("Driver Name : %s\n", alcGetString(ALCDevice,ALC_DEVICE_SPECIFIER));
-		DBG_Printf("Extensions  : %s\n", alcGetString(ALCDevice,ALC_EXTENSIONS));
-		DBG_Printf("S_OpenAl: OpenAl Device %s opened\n",alcGetString(ALCDevice, ALC_DEVICE_SPECIFIER));
-	}
-
-	I_ErrorOpenAl = FatalErrorFunction;
-
-	AlSetup[1] = snd_dev->sample_rate; //ALC_FREQUENCY
-	AlSetup[1] = 44100;
-	AlSetup[3] = 35;                   //ALC_REFRESH
-
-	//Alam: The Environment?
-	ALContext = alcCreateContext(ALCDevice,AlSetup);
-	if (ALCo_GetError() != ALC_NO_ERROR || !ALContext)
-	{
-		DBG_Printf("S_OpenAl: Error %s when making the environment!\n",GetALCErrorString(ALCo_Lasterror));
-		return inited;
-	}
-	else
-	{
-		DBG_Printf("S_OpenAl: OpenAl environment made\n");
-	}
-
-	alcMakeContextCurrent(ALContext);
-	if (ALCo_GetError() != ALC_NO_ERROR)
-	{
-		DBG_Printf("S_OpenAl: Error %s when setting the environment!\n",GetALCErrorString(ALCo_Lasterror));
-		return inited;
-	}
-	else
-	{
-		DBG_Printf("S_OpenAl: OpenAl environment setted up\n");
-	}
-
-	DBG_Printf("Vendor      : %s\n", alGetString(AL_VENDOR));
-	DBG_Printf("Renderer    : %s\n", alGetString(AL_RENDERER));
-	DBG_Printf("Version     : %s\n", alGetString(AL_VERSION));
-	DBG_Printf("Extensions  : %s\n", alGetString(AL_EXTENSIONS));
-
-	alDopplerFactor(0.0f);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("S_OpenAl: Error %s when setting Doppler Factor!\n",GetALErrorString(ALo_Lasterror));
-		return inited;
-	}
-	else
-	{
-		DBG_Printf("S_OpenAl: Doppler Factor of %f setted\n", alGetDouble(AL_DOPPLER_FACTOR));
-	}
-
-	alSpeedOfSound(600.0f);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("S_OpenAl: Error %s when setting Speed of Sound!\n",GetALErrorString(ALo_Lasterror));
-		return inited;
-	}
-	else
-	{
-		DBG_Printf("S_OpenAl: Speed of Sound set to %f\n", alGetDouble(AL_SPEED_OF_SOUND));
-	}
-
-	alDistanceModel(model);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("S_OpenAl: Error %s when setting Distance Model!\n",GetALErrorString(ALo_Lasterror));
-		return inited;
-	}
-	else
-	{
-		//DBG_Printf("S_OpenAl: %s mode setted\n",alGetString(model));
-	}
-
-	inited = reallocate_stack();
-
-	return inited;
-}
-
-/******************************************************************************
- *
- * Shutdown 3D Sound
- *
- ******************************************************************************/
-EXPORT void HWRAPI( Shutdown ) ( void )
-{
-	ALsizei i;
-
-	DBG_Printf ("S_OpenAL Shutdown()\n");
-
-	for (i = 0; i < allocated_sounds; i++)
-	{
-		StopSource(i);
-		kill_sound(ALstack + i);
-	}
-
-#if defined(linux) || defined(__linux) || defined(__linux__)
-	alcMakeContextCurrent(NULL);
-	//TODO:check?
-#endif
-
-	if (ALContext)
-	{
-		alcDestroyContext(ALContext);
-		ALContext = NULL;
-	}
-
-	if (ALstack)
-	{
-		free(ALstack);
-		ALstack = NULL;
-	}
-
-	//TODO:check?
-	if (ALCDevice)
-	{
-		alcCloseDevice(ALCDevice);
-		ALCDevice = NULL;
-	}
-	//TODO:check?
-}
-
-#ifdef _MSC_VER
-#pragma warning(disable :  4200)
-#pragma pack(1)
-#endif
-
-typedef struct
-{
-	ALushort header;     // 3?
-	ALushort samplerate; // 11025+
-	ALushort samples;    // number of samples
-	ALushort dummy;     // 0
-	ALubyte  data[0];    // data;
-} ATTRPACK dssfx_t;
-
-#ifdef _MSC_VER
-#pragma pack()
-#pragma warning(default : 4200)
-#endif
-
-static ALsizei getfreq(ALvoid *sfxdata, size_t len)
-{
-	dssfx_t *dsfx = sfxdata;
-	const ALsizei freq = SHORT(dsfx->samplerate);
-
-	if (len <= 8)
-		return 0;
-	else
-		return freq;
-}
-
-static ALsizei makechan(ALuint sfxhandle, ALboolean perm)
-{
-	ALsizei chan = find_handle();
-
-	if (chan == (ALsizei)AL_INVALID) return chan;
-
-	alGenSources(1, &ALstack[chan].ALsource);
-	if (ALo_GetError() != AL_NO_ERROR || !alIsSource(ALstack[chan].ALsource))
-	{
-		DBG_Printf("S_OpenAl: Error %s when make an ALSource!\n",GetALErrorString(ALo_Lasterror));
-		ALstack[chan].ALsource = (ALuint)AL_INVALID;
-		return (ALsizei)AL_INVALID;
-	}
-
-	ALstack[chan].permanent = perm;
-
-	alSourceQueueBuffers(ALstack[chan].ALsource, 1, &sfxhandle);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("S_OpenAl: Error %s when queue up an alSource!\n",GetALErrorString(ALo_Lasterror));
-	}
-
-	return chan;
-}
-
-/******************************************************************************
- *
- * Creates ?D source
- *
- ******************************************************************************/
-EXPORT INT32 HWRAPI ( AddSource ) (source3D_data_t *src, u_int sfxhandle)
-{
-	ALsizei chan = makechan(sfxhandle, (ALboolean)(src?src->permanent:AL_FALSE));
-	ALuint sid = (ALuint)AL_INVALID;
-	if (chan == (ALsizei)AL_INVALID)
-		return AL_INVALID;
-	else
-		sid = ALstack[chan].ALsource;
-
-	if (src) //3D
-	{
-#if 0
-		alSourcef(sid, AL_REFERENCE_DISTANCE, src->min_distance);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: AL_REFERENCE_DISTANCE, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-
-		alSourcef(sid, AL_MAX_DISTANCE, src->max_distance);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: AL_MAX_DISTANCE, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-#endif
-
-		if (src->head_relative)
-			alSourcei(sid,  AL_SOURCE_RELATIVE, AL_TRUE);
-		else
-			alSourcei(sid, AL_SOURCE_RELATIVE, AL_FALSE);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: AL_SOURCE_RELATIVE, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-
-		alSource3f(sid, AL_POSITION, src->pos.x, src->pos.z, src->pos.y);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: AL_POSITION, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-		alSource3f(sid, AL_VELOCITY, src->pos.momx, src->pos.momz, src->pos.momy);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: AL_VELOCITY, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-	}
-	else //2D
-	{
-		alSourcei(sid, AL_SOURCE_RELATIVE, AL_TRUE);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: AL_SOURCE_RELATIVE, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-	}
-
-	alSourcef(sid, AL_ROLLOFF_FACTOR, 0.0f);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: AL_ROLLOFF_FACTOR, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-
-	alSourcef(sid, AL_REFERENCE_DISTANCE, 0.0f);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: AL_REFERENCE_DISTANC, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-	return chan;
-}
-
-EXPORT INT32 HWRAPI ( StartSource ) (INT32 chan)
-{
-	ALint state = AL_NONE;
-	ALuint sid = (ALuint)AL_INVALID;
-
-	if (chan <= AL_INVALID || !alIsSource(ALstack[chan].ALsource))
-		return AL_FALSE;
-	else
-		sid = ALstack[chan].ALsource;
-
-	ALo_GetError();
-
-	alSourcePlay(sid);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alSourcePlay, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-
-	alGetSourcei(sid, AL_SOURCE_STATE, &state);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alGetSourcei, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-
-	return (state == AL_PLAYING);
-}
-
-EXPORT void HWRAPI ( StopSource) (INT32 chan)
-{
-	ALuint sfxhandle = AL_NONE;
-	ALuint sid = (ALuint)AL_INVALID;
-	if (chan <= AL_INVALID || !alIsSource(ALstack[chan].ALsource))
-		return;
-	else
-		sid = ALstack[chan].ALsource;
-
-	ALo_GetError();
-
-#if 1
-	alSourceQueueBuffers(sid, 1, &sfxhandle);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alSourceQueueBuffers, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-#else
-	alSourceStop(sid);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alSourceStop, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-#endif
-}
-
-EXPORT INT32 HWRAPI ( GetHW3DSVersion) (void)
-{
-	return VERSION;
-}
-
-EXPORT void HWRAPI (BeginFrameUpdate) (void)
-{
-	alcSuspendContext(ALContext);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alcSuspendContext, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-}
-
-EXPORT void HWRAPI (EndFrameUpdate) (void)
-{
-	alcProcessContext(ALContext);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alcProcessContext, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-}
-
-EXPORT INT32 HWRAPI (IsPlaying) (INT32 chan)
-{
-	ALint state = AL_NONE;
-	ALuint sid = (ALuint)AL_INVALID;
-
-	if (chan <= AL_INVALID || !alIsSource(ALstack[chan].ALsource))
-		return AL_FALSE;
-	else
-		sid = ALstack[chan].ALsource;
-
-	ALo_GetError();
-
-	alGetSourcei(sid, AL_SOURCE_STATE, &state);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alGetSourcei, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-
-	return (state == AL_PLAYING);
-}
-
-/******************************************************************************
- * UpdateListener
- *
- * Set up main listener properties:
- * - position
- * - orientation
- * - velocity
- *****************************************************************************/
-EXPORT void HWRAPI (UpdateListener) (listener_data_t *data, INT32 num)
-{
-	if (num != 1) return;
-
-	if (data)
-	{
-		ALfloat facing[6];
-		ALdouble f_angle = 0.0;
-		if (data->f_angle) f_angle = (ALdouble)((data->f_angle) / 180.0l * M_PIl);
-		facing[0] = (ALfloat)cos(f_angle);
-		facing[1] = 0.0f;
-		facing[2] = (ALfloat)sin(f_angle);
-		facing[3] = 0.0f;
-		facing[4] = 1.0f;
-		facing[5] = 0.0f;
-
-		alListener3f(AL_POSITION,(ALfloat)-data->x,(ALfloat)data->z,(ALfloat)data->y);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: AL_POSITIO, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-
-		alListener3f(AL_VELOCITY,(ALfloat)data->momx,(ALfloat)data->momz,(ALfloat)data->momy);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: AL_VELOCITY, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-
-		alListenerfv(AL_ORIENTATION, facing);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: AL_ORIENTATION, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-	}
-	else
-	{
-		DBG_Printf("Error: 1st listener data is missing\n");
-	}
-}
-
-/******************************************************************************
- *
- * Update volume for 2D source and separation (panning) of 2D source
- *
- *****************************************************************************/
-EXPORT void HWRAPI (UpdateSourceParms) (INT32 chan, INT32 vol, INT32 sep)
-{
-	ALuint sid = AL_NONE;
-	ALint is2d = AL_FALSE;
-	if (chan > AL_INVALID && !alIsSource(ALstack[chan].ALsource))
-		return;
-	else
-		sid = ALstack[chan].ALsource;
-
-	alGetSourcei(sid, AL_SOURCE_RELATIVE, &is2d);
-
-	if (!is2d)
-		return;
-
-	if (vol != -1)
-	{
-		alSourcef(sid,AL_GAIN,ALvol(vol,256));
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: alSourcef, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-	}
-
-	if (sep != -1)
-	{
-		ALSetPan(sid,sep-NORMAL_SEP);
-		if (ALo_GetError() != AL_NO_ERROR)
-		{
-			DBG_Printf("%s: ALSetPan, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-		}
-	}
-}
-
-// --------------------------------------------------------------------------
-// Set the global volume for sound effects
-// --------------------------------------------------------------------------
-EXPORT void HWRAPI (SetGlobalSfxVolume) (INT32 vol)
-{
-	alListenerf(AL_GAIN, ALvol(vol,32));
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: AL_GAIN, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-}
-
-//Alam: Not Used?
-EXPORT INT32 HWRAPI (SetCone) (INT32 chan, cone_def_t *cone_def)
-{
-	ALuint sid = AL_NONE;
-	ALint is2d = AL_FALSE;
-	if (chan > AL_INVALID && !alIsSource(ALstack[chan].ALsource))
-		return AL_FALSE;
-	else
-		sid = ALstack[chan].ALsource;
-
-	alGetSourcei(sid, AL_SOURCE_RELATIVE, &is2d);
-
-	if(is2d || !cone_def)
-		return AL_FALSE;
-
-	alSourcef(sid,AL_CONE_INNER_ANGLE,cone_def->inner);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: AL_CONE_INNER_ANGLE, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-
-	alSourcef(sid,AL_CONE_OUTER_ANGLE,cone_def->outer);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: AL_CONE_OUTER_ANGL, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-
-	alSourcei(sid,AL_CONE_OUTER_GAIN, cone_def->outer_gain);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: AL_CONE_OUTER_GAIN, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-
-	return AL_TRUE;
-}
-
-EXPORT void HWRAPI (Update3DSource) (INT32 chan, source3D_pos_t *sfx)
-{
-	ALuint sid = AL_NONE;
-	ALint is2d = AL_FALSE;
-	if (chan > AL_INVALID && !alIsSource(ALstack[chan].ALsource))
-		return;
-	else
-		sid = ALstack[chan].ALsource;
-
-	alGetSourcei(sid, AL_SOURCE_RELATIVE, &is2d);
-
-	if (is2d)
-		return;
-
-	alSource3f(sid, AL_POSITION, sfx->x, sfx->z, sfx->y);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: AL_POSITION, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-
-	alSource3f(sid, AL_VELOCITY, sfx->momx, sfx->momz, sfx->momy);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: AL_VELOCITY, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-}
-
-//-------------------------------------------------------------
-// Load new sound data into source
-//-------------------------------------------------------------
-EXPORT INT32 HWRAPI (ReloadSource) (INT32 chan, u_int sfxhandle)
-{
-	ALuint sid;
-
-	if (chan <= AL_INVALID || !alIsSource(ALstack[chan].ALsource) || !alIsBuffer(sfxhandle))
-		return AL_INVALID;
-	else
-		sid = ALstack[chan].ALsource;
-
-	ALo_GetError();
-
-	alSourceQueueBuffers(sid, 1, &sfxhandle);
-	if (ALo_GetError() == AL_INVALID_OPERATION) //Alam: not needed?
-	{
-		alSourceStop(sid);
-		alSourcei(sid, AL_BUFFER, sfxhandle);
-		ALo_GetError();
-	}
-	if (ALo_Lasterror != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alSourcei, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-
-	return chan;
-}
-
-/******************************************************************************
- *
- * Destroy source and remove it from stack if it is a 2D source.
- * Otherwise put source into cache
- *
- *****************************************************************************/
-EXPORT void HWRAPI (KillSource) (INT32 chan)
-{
-	if (chan > AL_INVALID && (ALsizei)chan <= allocated_sounds)
-		kill_sound(ALstack + chan);
-}
-
-EXPORT u_int HWRAPI (AddSfx) (sfx_data_t *sfx)
-{
-	ALuint chan = (ALuint)AL_INVALID;
-	ALsizei freq = 11025;
-	ALubyte *data = NULL;
-	ALsizei size = 0;
-
-	if (!sfx)
-		return 0;
-	else
-	{
-		data = ((ALubyte *)sfx->data)+8;
-		size = (ALsizei)(sfx->length-8);
-	}
-
-	alGenBuffers(1, &chan);
-	if (ALo_GetError() != AL_NO_ERROR || !alIsBuffer(chan))
-	{
-		DBG_Printf("S_OpenAl: Error %s when make an ALBuffer!\n",GetALErrorString(ALo_Lasterror));
-		return (u_int)AL_INVALID;
-	}
-
-	freq = getfreq(sfx->data, sfx->length);
-
-	alBufferData(chan, AL_FORMAT_MONO8, data, size, freq);
-	if (ALo_GetError() != AL_NO_ERROR)
-	{
-		DBG_Printf("S_OpenAl: Error %s when setting up a alBuffer!\n",GetALErrorString(ALo_Lasterror));
-	}
-
-	return chan;
-}
-
-EXPORT void HWRAPI (KillSfx) (u_int sfxhandle)
-{
-	ALuint ALsfx = sfxhandle;
-	if (!alIsBuffer(ALsfx))
-		return;
-	alDeleteBuffers(1, &ALsfx);
-	if (ALo_GetError() == AL_INVALID_OPERATION)
-	{
-		// Buffer leak
-	}
-	else if (ALo_Lasterror != AL_NO_ERROR)
-	{
-		DBG_Printf("%s: alDeleteBuffers, %s", __FUNCTION__, GetALErrorString(ALo_Lasterror));
-	}
-}
-
-EXPORT void HWRAPI (GetHW3DSTitle) (char *buf, size_t size)
-{
-	strncpy(buf, "OpenAL", size);
-}
-
-
-#ifdef _WINDOWS
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, // handle to DLL module
-                    DWORD fdwReason,    // reason for calling function
-                    LPVOID lpvReserved) // reserved
-{
-	// Perform actions based on the reason for calling.
-	UNREFERENCED_PARAMETER(lpvReserved);
-	switch ( fdwReason )
-	{
-		case DLL_PROCESS_ATTACH:
-		// Initialize once for each new process.
-		// Return FALSE to fail DLL load.
-#ifdef DEBUG_TO_FILE
-			logstream = fopen("s_openal.log", "wt");
-			if (logstream == NULL)
-				return FALSE;
-#endif
-		DisableThreadLibraryCalls(hinstDLL);
-		break;
-
-		case DLL_THREAD_ATTACH:
-			// Do thread-specific initialization.
-			break;
-
-		case DLL_THREAD_DETACH:
-			// Do thread-specific cleanup.
-			break;
-
-		case DLL_PROCESS_DETACH:
-			// Perform any necessary cleanup.
-#ifdef DEBUG_TO_FILE
-			if ( logstream)
-			{
-				fclose(logstream);
-				logstream  = NULL;
-			}
-#endif
-			break;
-	}
-	return TRUE;  // Successful DLL_PROCESS_ATTACH.
-}
-#elif !defined (_WINDOWS)
-
-// **************************************************************************
-//                                                                  FUNCTIONS
-// **************************************************************************
-
-EXPORT void _init()
-{
-#ifdef DEBUG_TO_FILE
-	logstream = fopen("s_openal.log", "w+");
-#endif
-}
-
-EXPORT void _fini()
-{
-#ifdef DEBUG_TO_FILE
-	if (logstream)
-		fclose(logstream);
-	logstream = NULL;
-#endif
-}
-#endif
-
diff --git a/src/hardware/s_openal/s_openal.dev b/src/hardware/s_openal/s_openal.dev
deleted file mode 100644
index c8fb9e62b..000000000
--- a/src/hardware/s_openal/s_openal.dev
+++ /dev/null
@@ -1,59 +0,0 @@
-[Project]
-FileName=s_openal.dev
-Name=s_openal
-Ver=1
-IsCpp=1
-Type=3
-Compiler=-D_M_IX86=500_@@_-Wall_@@_-fexceptions_@@_-D_WINDOWS_@@_
-CppCompiler=
-Includes=
-Linker=--def ../s_mingw.def_@@_-lopenal32_@@_
-Libs=
-UnitCount=1
-Folders=
-ObjFiles=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Icon=
-ExeOutput=..\..\..\bin
-ObjectOutput=..\..\..\objs\Mingw\s_opengl
-OverrideOutput=0
-OverrideOutputName=s_openal.dll
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000010001001001001
-
-[Unit1]
-FileName=s_openal.c
-Folder=
-Compile=1
-CompileCpp=0
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=0.1
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=s_openal.dll
-ProductName=s_openal
-ProductVersion=0.1
-AutoIncBuildNr=0
-
diff --git a/src/hardware/s_openal/s_openal.dsp b/src/hardware/s_openal/s_openal.dsp
deleted file mode 100644
index ac7fbaa84..000000000
--- a/src/hardware/s_openal/s_openal.dsp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="s_openal" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=s_openal - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "s_openal.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "s_openal.mak" CFG="s_openal - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "s_openal - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "s_openal - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "s_openal - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\bin\VC\Release\s_openal"
-# PROP Intermediate_Dir "..\..\..\objs\VC\Release\s_openal"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "S_OPENAL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-# SUBTRACT MTL /mktyplib203
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 OpenAL32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Release\s_openal.pdb" /machine:I386 /out:"C:\srb2demo2\s_openal.dll"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "s_openal - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\bin\VC\Debug\s_openal"
-# PROP Intermediate_Dir "..\..\..\objs\VC\Debug\s_openal"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "S_OPENAL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "_MBCS" /D "_USRDLL" /D "S_OPENAL_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 OpenAL32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Debug\s_openal.pdb" /debug /machine:I386 /out:"C:\srb2demo2\s_openaldebug.dll" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "s_openal - Win32 Release"
-# Name "s_openal - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\s_openal.c
-# End Source File
-# End Target
-# End Project
diff --git a/src/http-mserv.c b/src/http-mserv.c
index d1ef80ae4..b79c66946 100644
--- a/src/http-mserv.c
+++ b/src/http-mserv.c
@@ -110,13 +110,21 @@ HMS_on_read (char *s, size_t _1, size_t n, void *userdata)
 
 	buffer = userdata;
 
-	if (n >= (size_t)( buffer->end - buffer->needle ))
+	while (n >= (size_t)( buffer->end - buffer->needle ))
 	{
 		/* resize to next multiple of buffer size */
 		blocks = ( n / DEFAULT_BUFFER_SIZE + 1 );
 		buffer->end += ( blocks * DEFAULT_BUFFER_SIZE );
 
-		buffer->buffer = realloc(buffer->buffer, buffer->end);
+		void *tmp = realloc(buffer->buffer, buffer->end);
+		if (tmp == NULL)
+		{
+			// not enough memory to read it, bail
+			free(buffer->buffer);
+			buffer->buffer = NULL;
+			return 0;
+		}
+		buffer->buffer = tmp;
 	}
 
 	memcpy(&buffer->buffer[buffer->needle], s, n);
@@ -220,9 +228,13 @@ HMS_connect (const char *format, ...)
 
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-	curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 
-	curl_easy_setopt(curl, CURLOPT_TIMEOUT, cv_masterserver_timeout.value);
+#ifdef HAVE_IPV6
+	if (!M_CheckParm("-ipv6"))
+#endif
+		curl_easy_setopt(curl, CURLOPT_IPRESOLVE, (long)CURL_IPRESOLVE_V4);
+
+	curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)cv_masterserver_timeout.value);
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, buffer);
 
@@ -289,7 +301,7 @@ int
 HMS_register (void)
 {
 	struct HMS_buffer *hms;
-	int ok;
+	int okay;
 
 	char post[256];
 
@@ -316,45 +328,45 @@ HMS_register (void)
 
 	curl_easy_setopt(hms->curl, CURLOPT_POSTFIELDS, post);
 
-	ok = HMS_do(hms);
+	okay = HMS_do(hms);
 
-	if (ok)
+	if (okay)
 	{
 		hms_server_token = strdup(strtok(hms->buffer, "\n"));
 	}
 
 	HMS_end(hms);
 
-	return ok;
+	return okay;
 }
 
 int
 HMS_unlist (void)
 {
 	struct HMS_buffer *hms;
-	int ok;
+	int okay;
 
 	hms = HMS_connect("servers/%s/unlist", hms_server_token);
 
 	if (! hms)
 		return 0;
 
-	curl_easy_setopt(hms->curl, CURLOPT_POST, 1);
-	curl_easy_setopt(hms->curl, CURLOPT_POSTFIELDSIZE, 0);
+	curl_easy_setopt(hms->curl, CURLOPT_POST, (long)1);
+	curl_easy_setopt(hms->curl, CURLOPT_POSTFIELDSIZE, (long)0);
 
-	ok = HMS_do(hms);
+	okay = HMS_do(hms);
 	HMS_end(hms);
 
 	free(hms_server_token);
 
-	return ok;
+	return okay;
 }
 
 int
 HMS_update (void)
 {
 	struct HMS_buffer *hms;
-	int ok;
+	int okay;
 
 	char post[256];
 
@@ -376,10 +388,10 @@ HMS_update (void)
 
 	curl_easy_setopt(hms->curl, CURLOPT_POSTFIELDS, post);
 
-	ok = HMS_do(hms);
+	okay = HMS_do(hms);
 	HMS_end(hms);
 
-	return ok;
+	return okay;
 }
 
 void
@@ -488,7 +500,7 @@ int
 HMS_compare_mod_version (char *buffer, size_t buffer_size)
 {
 	struct HMS_buffer *hms;
-	int ok;
+	int okay;
 
 	char *version;
 	char *version_name;
@@ -498,7 +510,7 @@ HMS_compare_mod_version (char *buffer, size_t buffer_size)
 	if (! hms)
 		return 0;
 
-	ok = 0;
+	okay = 0;
 
 	if (HMS_do(hms))
 	{
@@ -510,16 +522,16 @@ HMS_compare_mod_version (char *buffer, size_t buffer_size)
 			if (atoi(version) != MODVERSION)
 			{
 				strlcpy(buffer, version_name, buffer_size);
-				ok = 1;
+				okay = 1;
 			}
 			else
-				ok = -1;
+				okay = -1;
 		}
 	}
 
 	HMS_end(hms);
 
-	return ok;
+	return okay;
 }
 
 const char *
@@ -532,7 +544,9 @@ HMS_fetch_rules (char *buffer, size_t buffer_size)
 	if (! hms)
 		return NULL;
 
-	if (HMS_do(hms))
+	boolean okay = HMS_do(hms);
+
+	if (okay)
 	{
 		char *p = strstr(hms->buffer, "\n\n");
 
@@ -550,6 +564,9 @@ HMS_fetch_rules (char *buffer, size_t buffer_size)
 
 	HMS_end(hms);
 
+	if (!okay)
+		return NULL;
+
 	return buffer;
 }
 
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 27a44f6d7..de9e26040 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -17,6 +17,7 @@
 
 #include "m_menu.h" // gametype_cons_t
 #include "m_cond.h" // emblems
+#include "m_emotes.h"
 
 #include "d_clisrv.h"
 
@@ -26,6 +27,7 @@
 #include "i_video.h"
 #include "i_system.h"
 
+#include "r_fps.h"
 #include "st_stuff.h" // ST_HEIGHT
 #include "r_local.h"
 
@@ -48,6 +50,9 @@
 
 #include "s_sound.h" // song credits
 #include "k_kart.h"
+#include "k_hud.h"
+
+#include "m_textinput.h"
 
 #ifdef HWRENDER
 #include "hardware/hw_main.h"
@@ -67,7 +72,6 @@ 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 *nightsnum[10]; // 0-9
 
 // Level title and credits fonts
 patch_t *lt_font[LT_FONTSIZE];
@@ -86,11 +90,14 @@ patch_t *frameslash;	// framerate stuff. Used in screen.c
 
 static player_t *plr;
 boolean chat_on; // entering a chat message?
-static char w_chat[HU_MAXMSGLEN + 1];
-static size_t c_input = 0; // let's try to make the chat input less shitty.
+static char w_chat_buf[HU_MAXMSGLEN + 1];
+static textinput_t w_chat;
 static boolean headsupactive = false;
 boolean hu_showscores; // draw rankings
 static char hu_tick;
+static tic_t hu_emoteanim = 0;
+#define MAXEMOTESUGGESTIONS 8
+static emote_t *emote_suggestions[MAXEMOTESUGGESTIONS] = {0};
 
 static huddrawlist_h luahuddrawlist_scores;
 
@@ -98,24 +105,8 @@ patch_t *rflagico;
 patch_t *bflagico;
 patch_t *rmatcico;
 patch_t *bmatcico;
-patch_t *tagico;
 patch_t *tallminus;
 
-//-------------------------------------------
-//              coop hud
-//-------------------------------------------
-
-patch_t *emeraldpics[7];
-patch_t *tinyemeraldpics[7];
-static patch_t *emblemicon;
-static patch_t *tokenicon;
-
-//-------------------------------------------
-//              misc vars
-//-------------------------------------------
-
-// crosshair 0 = off, 1 = cross, 2 = angle, 3 = point, see m_menu.c
-static patch_t *crosshair[HU_CROSSHAIRS]; // 3 precached crosshair graphics
 // song credits
 static patch_t *songcreditbg;
 
@@ -183,7 +174,7 @@ char french_shiftxform[] =
 	31,
 	' ','$', //shift-!
 	'3', //shift-"
-	'#', '$', '%', 
+	'#', '$', '%',
 	'1', //shift-&
 	'4', // shift-'
 	'5', // shift-(
@@ -193,7 +184,7 @@ char french_shiftxform[] =
 	'6', // shift--
 	'.', '/',
 	'0', '1', '2', '3', '4', '5',
-	'6', '7', '8', '9', 
+	'6', '7', '8', '9',
 	'/', // shitf-:
 	'.', // shift-;
 	'>', // shift-<
@@ -236,7 +227,7 @@ char french_altgrxform[] =
 	'|', //altg--
 	'.', '/',
 	'0', '1', '2', '3', '4', '5',
-	'6', '7', '8', '9', 
+	'6', '7', '8', '9',
 	':', ';', '<',
 	'}', //altgr-=
 	'>', '?', '@',
@@ -273,8 +264,6 @@ INT32 HU_FallBackFrSpecialLetter(INT32 key)
 	}
 }
 
-
-
 static char cechotext[1024];
 static tic_t cechotimer = 0;
 static tic_t cechoduration = 5*TICRATE;
@@ -325,7 +314,7 @@ void HU_LoadGraphics(void)
 	lt_font[0] = (patch_t *)W_CachePatchName("LTFNT039", PU_HUDGFX); /// \note fake start hack
 
 	// Number support
-	lt_font[9] = (patch_t *)W_CachePatchName("LTFNT048", PU_HUDGFX);
+	lt_font[9]  = (patch_t *)W_CachePatchName("LTFNT048", PU_HUDGFX);
 	lt_font[10] = (patch_t *)W_CachePatchName("LTFNT049", PU_HUDGFX);
 	lt_font[11] = (patch_t *)W_CachePatchName("LTFNT050", PU_HUDGFX);
 	lt_font[12] = (patch_t *)W_CachePatchName("LTFNT051", PU_HUDGFX);
@@ -379,8 +368,6 @@ void HU_LoadGraphics(void)
 	{
 		sprintf(buffer, "STTNUM%d", i);
 		tallnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-		sprintf(buffer, "NGTNUM%d", i);
-		nightsnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
 		sprintf(buffer, "PINGN%d", i);
 		pingnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
 		sprintf(buffer, "OPPRNK0%d", i);
@@ -390,32 +377,6 @@ void HU_LoadGraphics(void)
 	// minus for negative tallnums
 	tallminus = (patch_t *)W_CachePatchName("STTMINUS", PU_HUDGFX);
 
-	// cache the crosshairs, don't bother to know which one is being used,
-	// just cache all 3, they're so small anyway.
-	for (i = 0; i < HU_CROSSHAIRS; i++)
-	{
-		sprintf(buffer, "CROSHAI%c", '1'+i);
-		crosshair[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
-	}
-
-	emblemicon = W_CachePatchName("EMBLICON", PU_HUDGFX);
-	tokenicon = W_CachePatchName("TOKNICON", PU_HUDGFX);
-
-	emeraldpics[0] = W_CachePatchName("CHAOS1", PU_HUDGFX);
-	emeraldpics[1] = W_CachePatchName("CHAOS2", PU_HUDGFX);
-	emeraldpics[2] = W_CachePatchName("CHAOS3", PU_HUDGFX);
-	emeraldpics[3] = W_CachePatchName("CHAOS4", PU_HUDGFX);
-	emeraldpics[4] = W_CachePatchName("CHAOS5", PU_HUDGFX);
-	emeraldpics[5] = W_CachePatchName("CHAOS6", PU_HUDGFX);
-	emeraldpics[6] = W_CachePatchName("CHAOS7", PU_HUDGFX);
-	tinyemeraldpics[0] = W_CachePatchName("TEMER1", PU_HUDGFX);
-	tinyemeraldpics[1] = W_CachePatchName("TEMER2", PU_HUDGFX);
-	tinyemeraldpics[2] = W_CachePatchName("TEMER3", PU_HUDGFX);
-	tinyemeraldpics[3] = W_CachePatchName("TEMER4", PU_HUDGFX);
-	tinyemeraldpics[4] = W_CachePatchName("TEMER5", PU_HUDGFX);
-	tinyemeraldpics[5] = W_CachePatchName("TEMER6", PU_HUDGFX);
-	tinyemeraldpics[6] = W_CachePatchName("TEMER7", PU_HUDGFX);
-
 	songcreditbg = W_CachePatchName("K_SONGCR", PU_HUDGFX);
 
 	// cache ping gfx:
@@ -594,7 +555,10 @@ void HU_AddChatText(const char *text, boolean playsound)
 	if (OLDCHAT) // if we're using oldchat, print directly in console
 		CONS_Printf("%s\n", text);
 	else			// if we aren't, still save the message to log.txt
-		CON_LogMessage(va("%s\n", text));
+	{
+		CON_LogMessage(text);
+		CON_LogMessage("\n"); // Add newline. Don't use va for that, since `text` might be refering to va's buffer itself
+	}
 #else
 	(void)playsound;
 	CONS_Printf("%s\n", text);
@@ -741,7 +705,7 @@ static void Command_Sayto_f(void)
 		return;
 	}
 
-	target = nametonum(COM_Argv(1));
+	target = D_LookupPlayer(COM_Argv(1));
 	if (target == -1)
 	{
 		CONS_Alert(CONS_NOTICE, M_GetText("No player with that name!\n"));
@@ -787,7 +751,7 @@ static void Command_CSay_f(void)
 		return;
 	}
 
-	if(!server && !IsPlayerAdmin(consoleplayer))
+	if (!server && !IsPlayerAdmin(consoleplayer))
 	{
 		CONS_Alert(CONS_NOTICE, M_GetText("Only servers and admins can use csay.\n"));
 		return;
@@ -953,12 +917,9 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 			player_names[playernum]);
 		if (server)
 		{
-			UINT8 buf[2];
-
-			buf[0] = (UINT8)playernum;
-			buf[1] = KICK_MSG_CON_FAIL;
-			SendNetXCmd(XD_KICK, &buf, 2);
+			SendKick(playernum, KICK_MSG_CON_FAIL);
 		}
+
 		return;
 	}
 
@@ -973,11 +934,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 				CONS_Alert(CONS_WARNING, M_GetText("Illegal say command received from %s containing invalid characters\n"), player_names[playernum]);
 				if (server)
 				{
-					char buf[2];
-
-					buf[0] = (char)playernum;
-					buf[1] = KICK_MSG_CON_FAIL;
-					SendNetXCmd(XD_KICK, &buf, 2);
+					SendKick(playernum, KICK_MSG_CON_FAIL);
 				}
 				return;
 			}
@@ -996,9 +953,12 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 	else
 		stop_spamming[playernum] = 4; // you can hold off for 4 tics, can you?
 
+	if (player_muted[playernum])
+		spam_eatmsg = 1; // Let lua know we're skipping this message
+
 	// run the lua hook even if we were supposed to eat the msg, netgame consistency goes first.
 
-	if (LUAh_PlayerMsg(playernum, target, flags, msg, spam_eatmsg))
+	if (LUA_HookPlayerMsg(playernum, target, flags, msg, spam_eatmsg))
 		return;
 
 	if (spam_eatmsg)
@@ -1140,71 +1100,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 #endif
 }
 
-// Handles key input and string input
-//
-static inline boolean HU_keyInChatString(char *s, char ch)
-{
-	size_t l;
-
-	if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART])
-	  || ch == ' ') // Allow spaces, of course
-	{
-		l = strlen(s);
-		if (l < HU_MAXMSGLEN - 1)
-		{
-			if (c_input >= strlen(s)) // don't do anything complicated
-			{
-				s[l++] = ch;
-				s[l]=0;
-			}
-			else
-			{
-				// move everything past c_input for new characters:
-				size_t m = HU_MAXMSGLEN-1;
-				while (m>=c_input)
-				{
-					if (s[m])
-						s[m+1] = (s[m]);
-					if (m == 0) // prevent overflow
-						break;
-					m--;
-				}
-				s[c_input] = ch; // and replace this.
-			}
-			c_input++;
-			return true;
-		}
-		return false;
-	}
-	else if (ch == KEY_BACKSPACE)
-	{
-		size_t i = c_input;
-
-		if (c_input <= 0)
-			return false;
-
-		if (!s[i-1])
-			return false;
-
-		if (i >= strlen(s)-1)
-		{
-			s[strlen(s)-1] = 0;
-			c_input--;
-			return false;
-		}
-
-		for (; (i < HU_MAXMSGLEN); i++)
-		{
-			s[i-1] = s[i];
-		}
-		c_input--;
-	}
-	else if (ch != KEY_ENTER)
-		return false; // did not eat key
-
-	return true; // ate the key
-}
-
 #endif
 
 //
@@ -1215,6 +1110,7 @@ void HU_Ticker(void)
 		return;
 
 	hu_tick++;
+	hu_emoteanim++;
 	hu_tick &= 7; // currently only to blink chat input cursor
 
 	if (PLAYER1INPUTDOWN(gc_scores))
@@ -1251,10 +1147,14 @@ void HU_Ticker(void)
 	}
 
 	if (cechotimer > 0) --cechotimer;
-	
+
 	// Animate the desynch dots
-	if (hu_resynching || hu_redownloadinggamestate)
-		resynch_ticker++;	//tic tic tic tic tic	
+	if (hu_resynching
+#ifdef SATURNPAK
+		|| hu_redownloadinggamestate
+#endif
+		)
+		resynch_ticker++;	//tic tic tic tic tic
 
 	HU_TickSongCredits();
 }
@@ -1273,9 +1173,9 @@ static boolean HU_clearChatSpaces(void)
 	char c; // current character we're iterating.
 	boolean nothingbutspaces = true;
 
-	for (; i < strlen(w_chat); i++) // iterate through message and eradicate all spaces that don't belong.
+	for (; i < strlen(w_chat_buf); i++) // iterate through message and eradicate all spaces that don't belong.
 	{
-		c = w_chat[i];
+		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.
 
@@ -1287,128 +1187,139 @@ static boolean HU_clearChatSpaces(void)
 	return nothingbutspaces;
 }
 
-//
-//
-static void HU_queueChatChar(INT32 c)
+static void DoMute(const char *name)
 {
-	// send automaticly the message (no more chat char)
-	if (c == KEY_ENTER)
+	INT32 pnum = D_LookupPlayer(name);
+
+	if (pnum < 0)
 	{
-		char buf[2 + HU_MAXMSGLEN + 1];
-		char *msg = &buf[2];
-		size_t i;
-		size_t ci = 2;
-		INT32 target = 0;
+		HU_AddChatText("\x85""ERROR: \x80Player not found.", false);
+		return;
+	}
 
-		if (HU_clearChatSpaces()) // Avoids being able to send empty messages, or something.
-			return; // If this returns true, that means our message was NOTHING but spaces, so don't send it period.
+	player_muted[pnum] = !player_muted[pnum];
 
-		do {
-			c = w_chat[-2+ci++];
-			if (!c || (c >= ' ' && !(c & 0x80))) // copy printable characters and terminating '\0' only.
-				buf[ci-1]=c;
-		} while (c);
-		i = 0;
-		for (;(i<HU_MAXMSGLEN);i++)
-			w_chat[i] = 0;	// reset this.
+	HU_AddChatText(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false);
+	if (player_muted[pnum])
+		HU_AddChatText("Use same command to unmute them.", false);
+}
 
-		c_input = 0;
+static void HU_SendChatMessage(void)
+{
+	char buf[2 + HU_MAXMSGLEN + 1];
+	char *msg = &buf[2];
+	size_t ci = 2;
+	INT32 target = 0;
+	char c;
 
-		for (;(i<HU_MAXMSGLEN);i++)
-			w_chat[i] = 0; // reset this.
+	if (HU_clearChatSpaces()) // Avoids being able to send empty messages, or something.
+		return; // If this returns true, that means our message was NOTHING but spaces, so don't send it period.
 
-		c_input = 0;
+	do {
+		c = w_chat_buf[-2+ci++];
+		if (!c || (c >= ' ' && !(c & 0x80))) // copy printable characters and terminating '\0' only.
+			buf[ci-1]=c;
+	} while (c);
 
-		// last minute mute check
-		if (CHAT_MUTE)
+	M_TextInputClear(&w_chat);
+
+	// last minute mute check
+	if (CHAT_MUTE)
+	{
+		HU_AddChatText(va("%s>ERROR: The chat is muted. You can't say anything.", "\x85"), false);
+		return;
+	}
+
+	size_t len = strlen(msg);
+
+	if (len >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute
+	{
+		if (len > 6)
+			DoMute(msg+6);
+		else
+			HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false);
+
+		return;
+	}
+
+	if (len > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
+	{
+		INT32 spc = 1; // used if nodenum[1] is a space.
+		char *nodenum = (char*) malloc(3);
+		const char *newmsg;
+
+		// what we're gonna do now is check if the node exists
+		// with that logic, characters 4 and 5 are our numbers:
+
+		// teamtalk can't send PMs, just don't send it, else everyone would be able to see it, and no one wants to see your sex RP sicko.
+		if (teamtalk)
 		{
-			HU_AddChatText(va("%s>ERROR: The chat is muted. You can't say anything.", "\x85"), false);
+			HU_AddChatText(va("%sCannot send sayto in Say-Team.", "\x85"), false);
 			return;
 		}
 
-		if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
+		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')))
 		{
-			INT32 spc = 1; // used if nodenum[1] is a space.
-			char *nodenum = (char*) malloc(3);
-			const char *newmsg;
-
-			// what we're gonna do now is check if the node exists
-			// with that logic, characters 4 and 5 are our numbers:
-
-			// teamtalk can't send PMs, just don't send it, else everyone would be able to see it, and no one wants to see your sex RP sicko.
-			if (teamtalk)
-			{
-				HU_AddChatText(va("%sCannot send sayto in Say-Team.", "\x85"), false);
-				return;
-			}
-
-			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')))
-			{
-				// check if nodenum[1] is a space
-				if (nodenum[1] == ' ')
-					spc = 0;
-					// let it slide
-				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!
-			if (target < MAXPLAYERS && playeringame[target]) // player exists
-				target++; // even though playernums are from 0 to 31, target is 1 to 32, so up that by 1 to have it work!
+			// check if nodenum[1] is a space
+			if (nodenum[1] == ' ')
+				spc = 0;
+				// let it slide
 			else
 			{
-				HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same
+				HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<node> \'.", false);
+				free(nodenum);
 				return;
 			}
-
-			// we need to get rid of the /pm<node>
-			newmsg = msg+5+spc;
-			strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
 		}
-		if (ci > 3) // don't send target+flags+empty message.
+		// I'm very bad at C, I swear I am, additional checks eww!
+		if (spc != 0)
 		{
-			if (teamtalk)
-				buf[0] = -1; // target
-			else
-				buf[0] = target;
-
-			buf[1] = 0; // flags
-			SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1);
+			if (msg[5] != ' ')
+			{
+				HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<node> \'.", false);
+				free(nodenum);
+				return;
+			}
 		}
-		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!
+		if (target < MAXPLAYERS && playeringame[target]) // player exists
+			target++; // even though playernums are from 0 to 31, target is 1 to 32, so up that by 1 to have it work!
+		else
+		{
+			HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same
+			return;
+		}
+
+		// we need to get rid of the /pm<node>
+		newmsg = msg+5+spc;
+		strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
+	}
+	if (ci > 3) // don't send target+flags+empty message.
+	{
+		if (teamtalk)
+			buf[0] = -1; // target
+		else
+			buf[0] = target;
+
+		buf[1] = 0; // flags
+		SendNetXCmd(XD_SAY, buf, 2 + strlen(&buf[2]) + 1);
 	}
 }
 #endif
 
 void HU_clearChatChars(void)
 {
-	size_t i = 0;
-	for (;i<HU_MAXMSGLEN;i++)
-		w_chat[i] = 0; // reset this.
+	M_TextInputClear(&w_chat);
 	chat_on = false;
-	c_input = 0;
 }
 
 #ifndef NONET
@@ -1440,7 +1351,7 @@ boolean HU_Responder(event_t *ev)
 		INT32 i;
 		for (i = 0; i < num_gamecontrols; i++)
 		{
-			if (gamecontrol[i][0] == ev->data1 || gamecontrol[i][1] == ev->data1)
+			if (gamecontrol[0][i][0] == ev->data1 || gamecontrol[0][i][1] == ev->data1)
 				break;
 		}
 
@@ -1452,21 +1363,23 @@ boolean HU_Responder(event_t *ev)
 	if (!chat_on)
 	{
 		// enter chat mode
-		if ((ev->data1 == gamecontrol[gc_talkkey][0] || ev->data1 == gamecontrol[gc_talkkey][1])
+		if ((ev->data1 == gamecontrol[0][gc_talkkey][0] || ev->data1 == gamecontrol[0][gc_talkkey][1])
 			&& netgame && !OLD_MUTE) // check for old chat mute, still let the players open the chat incase they want to scroll otherwise.
 		{
 			chat_on = true;
-			w_chat[0] = 0;
+			w_chat_buf[0] = 0;
+			M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf);
 			teamtalk = false;
 			chat_scrollmedown = true;
 			typelines = 1;
 			return true;
 		}
-		if ((ev->data1 == gamecontrol[gc_teamkey][0] || ev->data1 == gamecontrol[gc_teamkey][1])
+		if ((ev->data1 == gamecontrol[0][gc_teamkey][0] || ev->data1 == gamecontrol[0][gc_teamkey][1])
 			&& netgame && !OLD_MUTE)
 		{
 			chat_on = true;
-			w_chat[0] = 0;
+			w_chat_buf[0] = 0;
+			M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf);
 			teamtalk = G_GametypeHasTeams();	// Don't teamtalk if we don't have teams.
 			chat_scrollmedown = true;
 			typelines = 1;
@@ -1487,74 +1400,24 @@ boolean HU_Responder(event_t *ev)
 
 		// Ignore non-keyboard keys, except when the talk key is bound
 		if (ev->data1 >= KEY_MOUSE1
-		&& (ev->data1 != gamecontrol[gc_talkkey][0]
-		&& ev->data1 != gamecontrol[gc_talkkey][1]))
+		&& (ev->data1 != gamecontrol[0][gc_talkkey][0]
+		&& ev->data1 != gamecontrol[0][gc_talkkey][1]))
 			return false;
 
-		c = cv_keyboardlayout.value == 3 ? CON_ShitAndAltGrChar(c) : CON_ShiftChar(c);
+		M_TextInputHandleEmotes(&w_chat, c, emote_suggestions, MAXEMOTESUGGESTIONS);
 
-		// pasting. pasting is cool. chat is a bit limited, though :(
-		if (((c == 'v' || c == 'V') && ctrldown) && !CHAT_MUTE)
-		{
-			const char *paste = I_ClipboardPaste();
-			size_t chatlen;
-			size_t pastelen;
-
-			// create a dummy string real quickly
-
-			if (paste == NULL)
-				return true;
-
-			chatlen = strlen(w_chat);
-			pastelen = strlen(paste);
-			if (chatlen+pastelen > HU_MAXMSGLEN)
-				return true; // we can't paste this!!
-
-			if (c_input >= strlen(w_chat)) // add it at the end of the string.
-			{
-				memcpy(&w_chat[chatlen], paste, pastelen); // copy all of that.
-				c_input += pastelen;
-				/*size_t i = 0;
-				for (;i<pastelen;i++)
-				{
-					HU_queueChatChar(paste[i]); // queue it so that it's actually sent. (this chat write thing is REALLY messy.)
-				}*/
-				return true;
-			}
-			else	// otherwise, we need to shift everything and make space, etc etc
-			{
-				size_t i = HU_MAXMSGLEN-1;
-				while (i >= c_input)
-				{
-					if (w_chat[i])
-						w_chat[i+pastelen] = w_chat[i];
-					if (i == 0) // prevent overflow
-						break;
-					i--;
-				}
-				memcpy(&w_chat[c_input], paste, pastelen); // copy all of that.
-				c_input += pastelen;
-				return true;
-			}
-		}
-
-		if (!CHAT_MUTE && HU_keyInChatString(w_chat,c))
-		{
-			HU_queueChatChar(c);
-		}
 		if (c == KEY_ENTER)
 		{
 			chat_on = false;
-			c_input = 0; // reset input cursor
 			chat_scrollmedown = true; // you hit enter, so you might wanna autoscroll to see what you just sent. :)
+			HU_SendChatMessage();
 		}
 		else if (c == KEY_ESCAPE
-			|| ((c == gamecontrol[gc_talkkey][0] || c == gamecontrol[gc_talkkey][1]
-			|| c == gamecontrol[gc_teamkey][0] || c == gamecontrol[gc_teamkey][1])
+			|| ((c == gamecontrol[0][gc_talkkey][0] || c == gamecontrol[0][gc_talkkey][1]
+			|| c == gamecontrol[0][gc_teamkey][0] || c == gamecontrol[0][gc_teamkey][1])
 			&& c >= KEY_MOUSE1)) // If it's not a keyboard key, then the chat button is used as a toggle.
 		{
 			chat_on = false;
-			c_input = 0; // reset input cursor
 		}
 		else if ((c == KEY_UPARROW || c == KEY_MOUSEWHEELUP) && chat_scroll > 0 && !OLDCHAT) // CHAT SCROLLING YAYS!
 		{
@@ -1568,10 +1431,6 @@ boolean HU_Responder(event_t *ev)
 			justscrolleddown = true;
 			chat_scrolltime = 4;
 		}
-		else if (c == KEY_LEFTARROW && c_input != 0 && !OLDCHAT) // i said go back
-			c_input--;
-		else if (c == KEY_RIGHTARROW && c_input < strlen(w_chat) && !OLDCHAT) // don't need to check for admin or w/e here since the chat won't ever contain anything if it's muted.
-			c_input++;
 		return true;
 	}
 #endif
@@ -1585,6 +1444,8 @@ boolean HU_Responder(event_t *ev)
 
 #ifndef NONET
 
+#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.
@@ -1596,6 +1457,8 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 	size_t slen;
 	char *newstring = Z_StrDup(string);
 	INT32 spacewidth = (vid.width < 640) ? 8 : 4, charwidth = (vid.width < 640) ? 8 : 4;
+	emote_t *emote = NULL;
+	int emotelen = 0;
 
 	slen = strlen(string);
 	x = 0;
@@ -1617,7 +1480,12 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 			c = toupper(c);
 		c -= HU_FONTSTART;
 
-		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
+		if ((emote = M_VerifyEmote(string+i, &emotelen)))
+		{
+			chw = EMOTEWIDTH;
+			i += emotelen-1; // Will be incremented on next loop iteration, hence -1
+		}
+		else if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 		{
 			chw = spacewidth;
 			lastusablespace = i;
@@ -1639,7 +1507,6 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 	return newstring;
 }
 
-
 // 30/7/18: chaty is now the distance at which the lowest point of the chat will be drawn if that makes any sense.
 
 INT16 chatx = 13, chaty = 169; // let's use this as our coordinates, shh
@@ -1672,6 +1539,8 @@ static void HU_drawMiniChat(void)
 		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i-1]);
 		size_t j = 0;
 		INT32 linescount = 0;
+		emote_t *emote = NULL;
+		int emotelen = 0;
 
 		while(msg[j]) // iterate through msg
 		{
@@ -1696,6 +1565,11 @@ static void HU_drawMiniChat(void)
 
 				++j;
 			}
+			else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
+			{
+				dx += EMOTEWIDTH - charwidth;
+				j += emotelen;
+			}
 			else
 			{
 				j++;
@@ -1741,6 +1615,8 @@ static void HU_drawMiniChat(void)
 		size_t j = 0;
 		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it.
 		UINT8 *colormap = NULL;
+		emote_t *emote = NULL;
+		int emotelen = 0;
 
 		while(msg[j]) // iterate through msg
 		{
@@ -1767,6 +1643,16 @@ static void HU_drawMiniChat(void)
 
 				++j;
 			}
+			else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
+			{
+				if (cv_chatbacktint.value) // on request of wolfy
+					V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+
+				HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
+				dx += EMOTEWIDTH - charwidth;
+
+				j += emotelen;
+			}
 			else
 			{
 				if (cv_chatbacktint.value) // on request of wolfy
@@ -1844,6 +1730,9 @@ static void HU_drawChatLog(INT32 offset)
 		INT32 j = 0;
 		char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it.
 		UINT8 *colormap = NULL;
+		emote_t *emote = NULL;
+		int emotelen = 0;
+
 		while(msg[j]) // iterate through msg
 		{
 			if (msg[j] < HU_FONTSTART) // don't draw
@@ -1865,6 +1754,15 @@ static void HU_drawChatLog(INT32 offset)
 
 				++j;
 			}
+			else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
+			{
+				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
+				{
+					HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+					dx += EMOTEWIDTH - charwidth;
+				}
+				j += emotelen;
+			}
 			else
 			{
 				if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
@@ -1925,8 +1823,9 @@ static void HU_DrawChat(void)
 	INT32 charwidth = 4, charheight = 6;
 	INT32 boxw = cv_chatwidth.value;
 	INT32 t = 0, c = 0, y = chaty - (typelines*charheight);
-	UINT32 i = 0, saylen = strlen(w_chat); // You learn new things everyday!
+	UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday!
 	INT32 cflag = 0;
+	size_t select_start = 0, select_end = 0;
 	const char *ntalk = "Say: ", *ttalk = "Team: ";
 	const char *talk = ntalk;
 	const char *mute = "Chat has been muted.";
@@ -1988,32 +1887,52 @@ static void HU_DrawChat(void)
 	i = 0;
 	typelines = 1;
 
-	if ((strlen(w_chat) == 0 || c_input == 0) && hu_tick < 4)
-		V_DrawChatCharacter(chatx + 2 + c, y+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
+	if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4)
+		V_DrawChatCharacter(chatx+2+c, y+1, '_'|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
 
-	while (w_chat[i])
+	if (w_chat.select != w_chat.cursor)
+	{
+		select_start = min(w_chat.select, w_chat.cursor);
+		select_end =   max(w_chat.select, w_chat.cursor);
+	}
+
+	while (w_chat_buf[i])
 	{
 		boolean skippedline = false;
-		if (c_input == (i+1))
+		emote_t *emote = NULL;
+		int emotelen = 0;
+		int drawwidth = charwidth; // if we've drawn emote, selection needs to account for that
+
+		if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
+		{
+			HU_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
+			c += EMOTEWIDTH - charwidth;
+			i += emotelen-1;
+			drawwidth = EMOTEWIDTH;
+		}
+		else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
+			V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL);
+
+		// Draw selection
+		if (i >= select_start && i < select_end)
+			V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
+
+		++i;
+
+		if (w_chat.cursor == i)
 		{
 			INT32 cursorx = (c+charwidth < boxw-charwidth) ? (chatx + 2 + c+charwidth) : (chatx+1); // we may have to go down.
 			INT32 cursory = (cursorx != chatx+1) ? (y) : (y+charheight);
 			if (hu_tick < 4)
 				V_DrawChatCharacter(cursorx, cursory+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
 
-			if (cursorx == chatx+1 && saylen == i) // a weirdo hack
+			if (cursorx == chatx+1 && saylen == i-1) // a weirdo hack
 			{
 				typelines += 1;
 				skippedline = true;
 			}
 		}
 
-		//Hurdler: isn't it better like that?
-		if (w_chat[i] < HU_FONTSTART)
-			++i;
-		else
-			V_DrawChatCharacter(chatx + c + 2, y, w_chat[i++] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL);
-
 		c += charwidth;
 		if (c > boxw-(charwidth*2) && !skippedline)
 		{
@@ -2023,11 +1942,42 @@ static void HU_DrawChat(void)
 		}
 	}
 
+	if (emote_suggestions[0])
+	{
+		// 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)
+		{
+			longest_suggestion_length = max(longest_suggestion_length, strlen(emote_suggestions[i]->name));
+		}
+
+#ifdef NETSPLITSCREEN
+		if (splitscreen)
+		{
+			suggesty -= BASEVIDHEIGHT/2;
+			if (splitscreen > 1)
+				suggesty += 16;
+		}
+		else
+#endif
+			suggesty -= (cv_kartspeedometer.value ? 16 : 0);
+
+		for (i = 0; i < MAXEMOTESUGGESTIONS && emote_suggestions[i]; ++i)
+		{
+			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);
+		}
+	}
+
 	// handle /pm list. It's messy, horrible and I don't care.
-	if (strnicmp(w_chat, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
+	if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
 	{
 		INT32 count = 0;
-		INT32 p_dispy = chaty - charheight -1;
+		INT32 p_dispy = chaty - charheight - 1;
+		size_t longest_name_length = 0;
 #ifdef NETSPLITSCREEN
 		if (splitscreen)
 		{
@@ -2039,43 +1989,49 @@ static void HU_DrawChat(void)
 #endif
 			p_dispy -= (cv_kartspeedometer.value ? 16 : 0);
 
-		i = 0;
-		for(i=0; (i<MAXPLAYERS); i++)
+		// Find longest player name, for drawing background for /pm list later
+		for (i = 0; i < MAXPLAYERS; i++)
 		{
+			if (!playeringame[i]) continue;
+
+			longest_name_length = max(longest_name_length, strlen(player_names[i]));
+		}
+
+		for(i = 0; i < MAXPLAYERS; i++)
+		{
+			if (!playeringame[i])
+				continue;
 
 			// filter: (code needs optimization pls help I'm bad with C)
-			if (w_chat[3])
+			if (w_chat_buf[3])
 			{
-				char *nodenum;
+				char nodenum[3];
 				UINT32 n;
-				// right, that's half important: (w_chat[4] may be a space since /pm0 msg is perfectly acceptable!)
-				if ( ( ((w_chat[3] != 0) && ((w_chat[3] < '0') || (w_chat[3] > '9'))) || ((w_chat[4] != 0) && (((w_chat[4] < '0') || (w_chat[4] > '9'))))) && (w_chat[4] != ' '))
+				// right, that's half important: (w_chat_buf[4] may be a space since /pm0 msg is perfectly acceptable!)
+				if (!isdigit(w_chat_buf[3]) || !(isdigit(w_chat_buf[4]) || (w_chat_buf[4] == ' ') || (w_chat_buf[4] == 0)))
 					break;
 
-
-				nodenum = (char*) malloc(3);
-				memcpy(nodenum, w_chat+3, 2);
+				memcpy(nodenum, w_chat_buf+3, 2);
 				nodenum[2] = '\0';
-				n = atoi((const char*) nodenum); // turn that into a number
-				free(nodenum);
-				// special cases:
+				n = atoi(nodenum); // turn that into a number
 
-				if ((n == 0) && !(w_chat[4] == '0'))
+				// special cases:
+				if ((n == 0) && !(w_chat_buf[4] == '0'))
 				{
 					if (!(i<10))
 						continue;
 				}
-				else if ((n == 1) && !(w_chat[3] == '0'))
+				else if ((n == 1) && !(w_chat_buf[3] == '0'))
 				{
 					if (!((i == 1) || ((i >= 10) && (i <= 19))))
 						continue;
 				}
-				else if ((n == 2) && !(w_chat[3] == '0'))
+				else if ((n == 2) && !(w_chat_buf[3] == '0'))
 				{
 					if (!((i == 2) || ((i >= 20) && (i <= 29))))
 						continue;
 				}
-				else if ((n == 3) && !(w_chat[3] == '0'))
+				else if ((n == 3) && !(w_chat_buf[3] == '0'))
 				{
 					if (!((i == 3) || ((i >= 30) && (i <= 31))))
 						continue;
@@ -2087,23 +2043,20 @@ static void HU_DrawChat(void)
 				}
 			}
 
-			if (playeringame[i])
-			{
-				char name[MAXPLAYERNAME+1];
-				strlcpy(name, player_names[i], 7); // shorten name to 7 characters.
-				V_DrawFillConsoleMap(chatx+ boxw + 2, p_dispy- (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
-				V_DrawSmallString(chatx+ boxw + 4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, name));
-				count++;
-			}
+			// fill it like the chat so the text doesn't become hard to read because of the hud.
+			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);
+
+			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i]));
+			count++;
 		}
 		if (count == 0) // no results.
 		{
-			V_DrawFillConsoleMap(chatx+boxw+2, p_dispy- (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
-			V_DrawSmallString(chatx+boxw+4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
+			V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
+			V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
 		}
 	}
 
-	HU_drawChatLog(typelines-1); // typelines is the # of lines we're typing. If there's more than 1 then the log should scroll up to give us more space.
+	HU_drawChatLog(typelines - 1); // typelines is the # of lines we're typing. If there's more than 1 then the log should scroll up to give us more space.
 }
 
 
@@ -2114,17 +2067,12 @@ static void HU_DrawChat_Old(void)
 	size_t i = 0;
 	const char *ntalk = "Say: ", *ttalk = "Say-Team: ";
 	const char *talk = ntalk;
-	INT32 charwidth = 8 * con_scalefactor; //SHORT(hu_font['A'-HU_FONTSTART]->width) * con_scalefactor;
-	INT32 charheight = 8 * con_scalefactor; //SHORT(hu_font['A'-HU_FONTSTART]->height) * con_scalefactor;
+	size_t select_start = 0, select_end = 0;
+	INT32 charwidth = 8 * con_scalefactor; //hu_font['A'-HU_FONTSTART]->width * con_scalefactor;
+	INT32 charheight = 8 * con_scalefactor; //hu_font['A'-HU_FONTSTART]->height * con_scalefactor;
 	if (teamtalk)
 	{
 		talk = ttalk;
-#if 0
-		if (players[consoleplayer].ctfteam == 1)
-			t = 0x500;  // Red
-		else if (players[consoleplayer].ctfteam == 2)
-			t = 0x400; // Blue
-#endif
 	}
 
 	while (talk[i])
@@ -2136,20 +2084,25 @@ static void HU_DrawChat_Old(void)
 		}
 		else
 		{
-			//charwidth = SHORT(hu_font[talk[i]-HU_FONTSTART]->width) * con_scalefactor;
+			//charwidth = hu_font[talk[i]-HU_FONTSTART]->width * con_scalefactor;
 			V_DrawCharacter(HU_INPUTX + c, y, talk[i++] | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
 		}
 		c += charwidth;
 	}
 
-	if ((strlen(w_chat) == 0 || c_input == 0) && hu_tick < 4)
-		V_DrawCharacter(HU_INPUTX+c, y+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
+	if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4)
+		V_DrawCharacter(HU_INPUTX+c+charwidth*w_chat.cursor, y+2*con_scalefactor, '_'|cv_constextsize.value|V_NOSCALESTART|t, !cv_allcaps.value);
+
+	if (w_chat.select != w_chat.cursor)
+	{
+		select_start = min(w_chat.select, w_chat.cursor);
+		select_end =   max(w_chat.select, w_chat.cursor);
+	}
 
 	i = 0;
-	while (w_chat[i])
+	while (w_chat_buf[i])
 	{
-
-		if (c_input == (i+1) && hu_tick < 4)
+		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);
@@ -2157,17 +2110,18 @@ static void HU_DrawChat_Old(void)
 		}
 
 		//Hurdler: isn't it better like that?
-		if (w_chat[i] < HU_FONTSTART)
+		if (w_chat_buf[i] >= HU_FONTSTART)
 		{
-			++i;
-			//charwidth = 4 * con_scalefactor;
-		}
-		else
-		{
-			//charwidth = SHORT(hu_font[w_chat[i]-HU_FONTSTART]->width) * con_scalefactor;
-			V_DrawCharacter(HU_INPUTX + c, y, w_chat[i++] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
+			//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);
 		}
 
+		// Draw selection
+		if (i >= select_start && i < select_end)
+			V_DrawFill(HU_INPUTX + c, y, charwidth, charheight, 103|V_TRANSLUCENT|cv_constextsize.value|V_NOSCALESTART|t);
+
+		++i;
+
 		c += charwidth;
 		if (c >= vid.width)
 		{
@@ -2294,7 +2248,7 @@ void HU_TickSongCredits(void)
 	}
 }
 
-void HU_DrawSongCredits(void)
+static void HU_DrawSongCreditsVanilla(void)
 {
 	char *str;
 	INT32 len;
@@ -2302,9 +2256,6 @@ void HU_DrawSongCredits(void)
 	INT32 y = (splitscreen ? (BASEVIDHEIGHT/2)-4 : 32);
 	INT32 bgt;
 
-	if (!cursongcredit.def) // No def
-		return;
-
 	str = va("\x1F"" %s", cursongcredit.def->source);
 	len = V_ThinStringWidth(str, V_ALLOWLOWERCASE|V_6WIDTHSPACE);
 	destx = (len + 7) * FRACUNIT;
@@ -2334,12 +2285,76 @@ void HU_DrawSongCredits(void)
 		V_DrawRightAlignedThinString(cursongcredit.x / FRACUNIT, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE|V_SNAPTOLEFT|(cursongcredit.trans<<V_ALPHASHIFT), str);
 }
 
+#define BOXCREDITSLIDEIN (5*TICRATE-TICRATE/2)
+#define BOXCREDITSLIDEOUT (TICRATE/2)
+#define BOXCREDITHEIGHT 8
+static void HU_DrawSongCreditsBox(void)
+{
+	char *str = cursongcredit.def->source;
+	INT32 strwidth = V_SmallStringWidth(str, V_ALLOWLOWERCASE) + 4;
+
+	// dup dup dup dup
+	INT32 dup = min(vid.dupx, vid.dupy);
+
+	// Center it
+	INT32 x = (BASEVIDWIDTH/2 - strwidth/2)*dup + ((vid.width - (BASEVIDWIDTH * vid.dupx)) / 2);
+	INT32 y = 0;
+
+	INT32 flags = V_SNAPTOTOP|V_NOSCALESTART;
+	INT32 t = cursongcredit.anim;
+	INT32 bgt;
+
+	fixed_t interpoffset = FixedMul(BOXCREDITHEIGHT*dup*FRACUNIT/(TICRATE/2), R_GetHudUncap());
+
+	if (t > BOXCREDITSLIDEIN)
+	{
+		// Sliding in
+		t = TICRATE/2 - (t - BOXCREDITSLIDEIN);
+		y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup + interpoffset)/FRACUNIT;
+	}
+	else if (t < TICRATE/2)
+	{
+		// Sliding out
+		y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup - interpoffset)/FRACUNIT;
+	}
+
+	bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2);
+
+	if (bgt < NUMTRANSMAPS)
+	{
+		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);
+	}
+}
+
+void HU_DrawSongCredits(void)
+{
+	if (!cursongcredit.def) // No def
+		return;
+
+	switch (cv_songcredits.value)
+	{
+		case 1:
+			HU_DrawSongCreditsVanilla();
+			break;
+		case 2:
+			HU_DrawSongCreditsBox();
+			break;
+		default:
+			break;
+	}
+}
+
 
 // Heads up displays drawer, call each frame
 //
 void HU_Drawer(void)
 {
-	if (cv_vhseffect.value && (paused || (demo.playback && cv_playbackspeed.value > 1)))
+	if (cv_vhseffect.value && ((paused && !camera[R_GetViewNumber()].freecam) || (demo.playback && cv_playbackspeed.value > 1)))
 		V_DrawVhsEffect(demo.rewinding);
 
 #ifndef NONET
@@ -2364,6 +2379,10 @@ void HU_Drawer(void)
 	if (cechotimer)
 		HU_DrawCEcho();
 
+	// draw song credits
+	if (cv_songcredits.value)
+		HU_DrawSongCredits();
+
 	if (!( Playing() || demo.playback )
 	 || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE
 	 || gamestate == GS_CREDITS      || gamestate == GS_EVALUATION
@@ -2382,7 +2401,7 @@ void HU_Drawer(void)
 			if (renderisnewtic)
 			{
 				LUA_HUD_ClearDrawList(luahuddrawlist_scores);
-				LUAh_ScoresHUD(luahuddrawlist_scores);
+				LUA_HUDHOOK(scores, luahuddrawlist_scores);
 			}
 
 			LUA_HUD_DrawList(luahuddrawlist_scores);
@@ -2397,28 +2416,12 @@ void HU_Drawer(void)
 	if (gamestate != GS_LEVEL)
 		return;
 
-	// draw the crosshair, not when viewing demos nor with chasecam
-	/*if (!automapactive && !demo.playback)
-	{
-		if (cv_crosshair.value && !camera[0].chase && !players[displayplayers[0]].spectator)
-			HU_DrawCrosshair();
-
-		if (cv_crosshair2.value && !camera[1].chase && !players[displayplayers[1]].spectator)
-			HU_DrawCrosshair2();
-
-		if (cv_crosshair3.value && !camera[2].chase && !players[displayplayers[2]].spectator)
-			HU_DrawCrosshair3();
-
-		if (cv_crosshair4.value && !camera[3].chase && !players[displayplayers[3]].spectator)
-			HU_DrawCrosshair4();
-	}*/
-
-	// draw song credits
-	if (cv_songcredits.value)
-		HU_DrawSongCredits();
-
 	// draw desynch text
-	if (hu_resynching || hu_redownloadinggamestate)
+	if (hu_resynching
+#ifdef SATURNPAK
+		|| hu_redownloadinggamestate
+#endif
+		)
 	{
 		char resynch_text[14];
 		UINT32 i;
@@ -2520,92 +2523,147 @@ Ping_gfx_num (int lag)
 		return 4;
 }
 
+static int
+Ping_gfx_color (UINT32 lag)
+{
+	if (lag < 2)
+		return SKINCOLOR_JAWZ;
+	else if (lag < 4)
+		return SKINCOLOR_MINT;
+	else if (lag < 7)
+		return SKINCOLOR_GOLD;
+	else if (lag < 10)
+		return SKINCOLOR_RED;
+	else if (lag < servermaxping)
+	{
+		if (hu_tick & 2)
+			return SKINCOLOR_GREEN;
+		else if (hu_tick & 4)
+			return SKINCOLOR_YELLOW;
+		else
+			return SKINCOLOR_BLUEBERRY;
+	}
+	else
+		return SKINCOLOR_WHITE; // to make the flashing work
+}
+
+static const UINT8 *
+Ping_gfx_colormap (UINT32 lag, boolean gentleman)
+{
+	const UINT8 *colormap = NULL;
+
+	if (K_UseColorHud())
+		colormap = R_GetTranslationColormap(TC_RAINBOW, Ping_gfx_color(lag), GTC_CACHE);
+
+	if (servermaxping && lag > servermaxping && hu_tick < 4)
+	{
+		// flash ping red if too high
+		colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_RASPBERRY, GTC_CACHE);
+	}
+	else if (gentleman)
+	{
+		colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_PASTEL, GTC_CACHE);
+	}
+
+	return colormap;
+}
+
+static UINT32
+Ping_conversion (UINT32 lag)
+{
+	if (cv_pingmeasurement.value)
+	{
+		lag = (INT32)(lag * (1000.00f / TICRATE));
+	}
+
+	return lag;
+}
+
 //
 // HU_drawPing
 //
 
-void HU_drawPing(INT32 x, INT32 y, UINT32 lag, INT32 flags)
+void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
 {
-	UINT8 *colormap = NULL;
 	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;
-	//INT32 dx;
 
-	gfxnum = Ping_gfx_num(lag);
-	
-	if (!cv_pingstyle.value)
+	UINT32 lag = playerpingtable[pnum];
+	const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag));
+
+	if (gentleman)
 	{
+		lag = simulated_lag;
+	}
+
+	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]);
 
-		if (servermaxping && lag > servermaxping && hu_tick < 4)
-			colormap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_RASPBERRY, GTC_CACHE); // flash ping red if too high
-
-		if (cv_pingmeasurement.value)
-			lag = (INT32)(lag * (1000.00f / TICRATE));
-
-		x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, lag, colormap);
+		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]);
+			V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
 	}
-	else if (cv_pingstyle.value) // old style ping
+	else if (cv_pingstyle.value == 1) // old style ping
 	{
-		if (cv_pingicon.value)
-		{
-			if (lag < 4)
-			{
-				numbars = 3;
-				barcolor = 184;
-			}
-			else if (lag < 7)
-			{
-				numbars = 2;	// Apparently ternaries w/ multiple statements don't look good in C so I decided against it.
-				barcolor = 103;
-			}
-			else if (lag < 10)
-			{
-				numbars = 1;
-				barcolor = 155; // need a better red
-			}
-			else // brazil
-			{
-				numbars = 0;
-				barcolor = 31;
-			}
-		}
-
-		if (cv_pingmeasurement.value)
-			lag = (INT32)(lag * (1000.00f / TICRATE));
-
 		if (vid.width >= 640)	// how sad, we're using a shit resolution.
 		{
 			if (measureid == 1)
 			{
-				//dx = x+1 - (V_SmallStringWidth(va("%dms", lag), V_ALLOWLOWERCASE|flags)/2);
-				//V_DrawSmallString(dx, y+4, V_ALLOWLOWERCASE|flags, va("%dms", lag));
-					V_DrawRightAlignedSmallString(x+12, y+13, V_ALLOWLOWERCASE|flags, va("%dms", lag));
+				V_DrawRightAlignedSmallString(x+12, y+13, V_ALLOWLOWERCASE|flags, va("%dms", Ping_conversion(lag)));
 			}
 			else if (measureid == 0)
 			{
-				//dx = x+1 - (V_SmallStringWidth(va("d%d", lag), flags)/2);
-				//V_DrawSmallString(dx, y+4, flags, va("d%d", lag));
-					V_DrawRightAlignedSmallString(x+12, y+13, flags, va("d%d", lag));
+				V_DrawRightAlignedSmallString(x+12, y+13, flags, va("d%d", Ping_conversion(lag)));
 			}
 		}
 
 		if (cv_pingicon.value)
-		{	
-			for (i=0; (i<3); i++) // Draw the ping bar
+		{
+			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)
@@ -2679,28 +2737,25 @@ static inline void HU_DrawSpectatorTicker(void)
 
 			if (cv_showspecstuff.value)
 			{
-				if (players[i].mo)
+				player_t *player;
+				player = &players[i];
+
+				if (player->mo && player->mo->color)
 				{
-					player_t *p;
-					p = &players[i];
+					const UINT8 *colormap = R_GetTranslationColormap(player->skin, player->mo->color, GTC_CACHE);
+					if (player->mo->colorized)
+						colormap = R_GetTranslationColormap(TC_RAINBOW, player->mo->color, GTC_CACHE);
 
-					if (players[i].mo->color)
-					{
-						const UINT8 *colormap;
-						if (players[i].mo->colorized)
-							colormap = R_GetTranslationColormap(TC_RAINBOW, players[i].mo->color, GTC_CACHE);
-						else
-							colormap = R_GetTranslationColormap(players[i].skin, players[i].mo->color, GTC_CACHE);
-
-						if (cv_highresportrait.value)
-							V_DrawSmallMappedPatch((templength - duptweak), height+10, V_TRANSLUCENT, R_GetSkinFaceWant(p), colormap);
-						else	
-							V_DrawMappedPatch((templength - duptweak), height+10, V_TRANSLUCENT, R_GetSkinFaceRank(p), colormap);
-					}
+					if (K_UseHighResPortraits())
+						V_DrawSmallMappedPatch((templength - duptweak), height+10, V_TRANSLUCENT, R_GetSkinFaceWant(player), colormap);
+					else
+						V_DrawMappedPatch((templength - duptweak), height+10, V_TRANSLUCENT, R_GetSkinFaceRank(player), colormap);
 				}
 
-				if (netgame && i != serverplayer)
-						HU_drawPing((templength - duptweak)+8, height-20, playerpingtable[i], V_TRANSLUCENT);
+				if ((netgame && i != serverplayer) || (cv_mindelay.value && P_IsLocalPlayer(&players[i])))
+				{
+					HU_drawPlayerPing((templength - duptweak)+8, height-20, i, V_TRANSLUCENT);
+				}
 			}
 
 			if ((length += len) >= dupadjust+8)
@@ -2709,7 +2764,6 @@ static inline void HU_DrawSpectatorTicker(void)
 	}
 }
 
-
 //
 // HU_DrawRankings
 //
@@ -2719,9 +2773,9 @@ static void HU_DrawRankings(void)
 	playersort_t tab[MAXPLAYERS];
 	INT32 i, j, scorelines, hilicol, numplayersingame = 0;
 	boolean completed[MAXPLAYERS];
-	UINT32 whiteplayer = MAXPLAYERS;
 
-	V_DrawFadeScreen(0xFF00, 16); // A little more readable, and prevents cheating the fades under other circumstances.
+	if (!automapactive)
+		V_DrawFadeScreen(0xFF00, 16); // A little more readable, and prevents cheating the fades under other circumstances.
 
 	if (cons_menuhighlight.value)
 		hilicol = cons_menuhighlight.value;
@@ -2730,17 +2784,26 @@ static void HU_DrawRankings(void)
 	else
 		hilicol = ((gametype == GT_RACE) ? V_SKYMAP : V_REDMAP);
 
-	// draw the current gametype in the lower right
-	//if (modeattacking)
-		//V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, "Record Attack");
-	//else
-		//V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, gametype_cons_t[gametype].strvalue);
-	
-	// draw the current map in the lower right if theres none just say its unknown
-	if (!G_BuildMapTitle(gamemap))
-		V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, "UNKNOWN");
+	if (!demo.playback)
+	{
+		// draw the current map in the lower right
+		char *maptitle = G_BuildMapTitle(gamemap);
+
+		if (maptitle)
+		{
+			V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, maptitle);
+			Z_Free(maptitle);
+		}
+		else
+		{
+			V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, "UNKNOWN");
+		}
+	}
 	else
-		V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, G_BuildMapTitle(gamemap));
+	{
+		// draw the current gametype in the lower right
+		V_DrawString(4, 188, hilicol|V_SNAPTOBOTTOM|V_SNAPTOLEFT, (modeattacking) ? "Record Attack" : gametype_cons_t[gametype].strvalue);
+	}
 
 	if (G_GametypeHasTeams())
 	{
@@ -2749,7 +2812,7 @@ static void HU_DrawRankings(void)
 		else
 			p = bmatcico;
 
-		V_DrawSmallScaledPatch(128 - SHORT(p->width)/4, 4, 0, p);
+		V_DrawSmallScaledPatch(128 - p->width/4, 4, 0, p);
 		V_DrawCenteredString(128, 16, 0, va("%u", bluescore));
 
 		if (gametype == GT_CTF)
@@ -2757,7 +2820,7 @@ static void HU_DrawRankings(void)
 		else
 			p = rmatcico;
 
-		V_DrawSmallScaledPatch(192 - SHORT(p->width)/4, 4, 0, p);
+		V_DrawSmallScaledPatch(192 - p->width/4, 4, 0, p);
 		V_DrawCenteredString(192, 16, 0, va("%u", redscore));
 	}
 
@@ -2790,18 +2853,6 @@ static void HU_DrawRankings(void)
 			V_DrawCenteredString(256, 16, hilicol, va("%d", cv_pointlimit.value));
 		}
 	}
-	/*else if (gametype == GT_COOP)
-	{
-		INT32 totalscore = 0;
-		for (i = 0; i < MAXPLAYERS; i++)
-		{
-			if (playeringame[i])
-				totalscore += players[i].score;
-		}
-
-		V_DrawCenteredString(256, 8, 0, "TOTAL SCORE");
-		V_DrawCenteredString(256, 16, 0, va("%u", totalscore));
-	}*/
 	else
 	{
 		if (circuitmap)
@@ -2814,11 +2865,6 @@ static void HU_DrawRankings(void)
 		V_DrawCenteredString(256, 16, hilicol, cv_kartspeed.string);
 	}
 
-	// When you play, you quickly see your score because your name is displayed in white.
-	// When playing back a demo, you quickly see who's the view.
-	if (!splitscreen)
-		whiteplayer = demo.playback ? displayplayers[0] : consoleplayer;
-
 	scorelines = 0;
 	memset(completed, 0, sizeof (completed));
 	memset(tab, 0, sizeof (playersort_t)*MAXPLAYERS);
@@ -2874,12 +2920,7 @@ static void HU_DrawRankings(void)
 #endif
 	}
 
-	/*if (G_GametypeHasTeams())
-		HU_DrawTeamTabRankings(tab, whiteplayer); //separate function for Spazzo's silly request -- gotta fix this up later
-	else if (scorelines > 10)*/
-	HU_DrawTabRankings(((scorelines > 8) ? 32 : 40), 33, tab, scorelines, whiteplayer, hilicol);
-	/*else
-		HU_DrawDualTabRankings(32, 32, tab, scorelines, whiteplayer);*/
+	HU_DrawTabRankings(((scorelines > 8) ? 32 : 40), 33, tab, scorelines, hilicol);
 
 	// draw spectators in a ticker across the bottom
 	if (netgame && G_GametypeHasSpectators())
@@ -2906,16 +2947,29 @@ void HU_SetCEchoFlags(INT32 flags)
 
 void HU_DoCEcho(const char *msg)
 {
-	if (!cv_cechotoggle.value)
-		return
-	
-	I_OutputMsg("%s\n", msg); // print to log
-
 #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';
-	cechotimer = cechoduration;
+
+	// just print it to console
+	if (cv_cechotoggle.value == 2)
+	{
+		char temp[1024];
+		strncpy(temp, cechotext, sizeof(temp));
+
+		for (char *p = temp; *p != '\0'; ++p)
+			if (*p == '\\')
+				*p = '\n';
+
+		CONS_Printf("%s\n", temp);
+
+		return;
+	}
+	else if (cv_cechotoggle.value)
+		cechotimer = cechoduration;
+
+	I_OutputMsg("%s\n", msg); // ALWAYS print to log
 }
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 66459c716..d134f319e 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -42,8 +42,6 @@
 #define CRED_FONTEND 'Z' // the last font character
 #define CRED_FONTSIZE (CRED_FONTEND - CRED_FONTSTART + 1)
 
-#define HU_CROSSHAIRS 3 // maximum of 9 - see HU_Init();
-
 extern char *shiftxform; // english translation shift table
 extern char english_shiftxform[];
 
@@ -90,18 +88,14 @@ extern patch_t *tallnum[10];
 extern patch_t *pingnum[10];
 extern patch_t *pinggfx[5];
 extern patch_t *ranknum[10];
-extern patch_t *nightsnum[10];
 extern patch_t *framecounter;
 extern patch_t *frameslash;
 extern patch_t *lt_font[LT_FONTSIZE];
 extern patch_t *cred_font[CRED_FONTSIZE];
-extern patch_t *emeraldpics[7];
-extern patch_t *tinyemeraldpics[7];
 extern patch_t *rflagico;
 extern patch_t *bflagico;
 extern patch_t *rmatcico;
 extern patch_t *bmatcico;
-extern patch_t *tagico;
 extern patch_t *tallminus;
 
 // set true whenever the tab rankings are being shown for any reason
@@ -125,10 +119,10 @@ void HU_Drawer(void);
 char HU_dequeueChatChar(void);
 void HU_Erase(void);
 void HU_clearChatChars(void);
-void HU_drawPing(INT32 x, INT32 y, UINT32 ping, INT32 flags);	// Lat': Ping drawer for scoreboard.
+void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags);	// Lat': Ping drawer for scoreboard.
 //void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer);
 //void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer);
-void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer, INT32 hilicol);
+void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol);
 void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds);
 const char *HU_SkinColorToConsoleColor(skincolors_t color);
 
diff --git a/src/i_joy.h b/src/i_joy.h
index f780d8018..20252b54d 100644
--- a/src/i_joy.h
+++ b/src/i_joy.h
@@ -13,6 +13,10 @@
 #ifndef __I_JOY_H__
 #define __I_JOY_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "g_input.h"
 
 /*!
@@ -53,6 +57,10 @@ typedef struct JoyType_s JoyType_t;
 	for palyer[sic] 1-4's joystick/gamepad
 */
 
-extern JoyType_t Joystick, Joystick2, Joystick3, Joystick4;
+extern JoyType_t Joystick[MAXSPLITSCREENPLAYERS];
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
 #endif // __I_JOY_H__
diff --git a/src/i_net.h b/src/i_net.h
index 11dbc6341..bdbad182e 100644
--- a/src/i_net.h
+++ b/src/i_net.h
@@ -14,6 +14,10 @@
 #ifndef __I_NET__
 #define __I_NET__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -41,17 +45,36 @@ extern INT16 hardware_MAXPACKETLENGTH;
 
 typedef struct
 {
+	/// Supposed to be DOOMCOM_ID
+	INT32 id;
+
+	/// SRB2 executes an INT32 to execute commands.
+	INT16 intnum;
+	/// Communication between SRB2 and the driver.
+	/// Is CMD_SEND or CMD_GET.
+	INT16 command;
 	/// Is dest for send, set by get (-1 = no packet).
 	INT16 remotenode;
+
 	/// Number of bytes in doomdata to be sent
 	INT16 datalength;
 
 	/// Info common to all nodes.
 	/// Console is always node 0.
 	INT16 numnodes;
+	/// Flag: 1 = no duplication, 2-5 = dup for slow nets.
+	INT16 ticdup;
 	/// Flag: 1 = send a backup tic in every packet.
 	INT16 extratics;
+	/// kind of game
+	INT16 gametype;
+	/// Flag: -1 = new game, 0-5 = load savegame
+	INT16 savegame;
+	/// currect map
+	INT16 map;
 
+	/// Info specific to this node.
+	INT16 consoleplayer;
 	/// Number of "slots": the highest player number in use plus one.
 	INT16 numslots;
 
@@ -59,6 +82,8 @@ typedef struct
 	char data[MAXPACKETLENGTH];
 } ATTRPACK doomcom_t;
 
+#define DOOMCOM_DATA(d) (doomdata_t *)&(d)->data
+
 #ifdef HOLEPUNCH
 typedef struct
 {
@@ -66,6 +91,8 @@ typedef struct
 	INT32 addr;
 	INT16 port;
 } ATTRPACK holepunch_t;
+
+#define HOLEPUNCH_DATA(d) (holepunch_t *)&(d)->data
 #endif
 
 #if defined(_MSC_VER)
@@ -74,26 +101,14 @@ typedef struct
 
 extern doomcom_t *doomcom;
 
-#ifdef HOLEPUNCH
-extern holepunch_t *holepunchpacket;
-#endif
-
 /**	\brief return packet in doomcom struct
 */
 extern boolean (*I_NetGet)(void);
 
-/**	\brief ask to driver if there is data waiting
-*/
-extern boolean (*I_NetCanGet)(void);
-
 /**	\brief send packet within doomcom struct
 */
 extern void (*I_NetSend)(void);
 
-/**	\brief ask to driver if all is ok to send data now
-*/
-extern boolean (*I_NetCanSend)(void);
-
 /**	\brief	close a connection
 
 	\param	nodenum	node to be closed
@@ -169,4 +184,8 @@ extern bannednode_t *bannednode;
 /// \brief Called by D_SRB2Main to be defined by extern network driver
 boolean I_InitNetwork(void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/i_sound.h b/src/i_sound.h
index d0542cfb5..aaac492c6 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -13,6 +13,10 @@
 #ifndef __I_SOUND__
 #define __I_SOUND__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomdef.h"
 #include "sounds.h"
 #include "command.h"
@@ -39,8 +43,9 @@ extern UINT8 sound_started;
 
 /**	\brief info of samplerate
 */
+#if defined(HAVE_SDL) && SOUND==SOUND_SDL
 extern consvar_t cv_samplerate;
-//extern consvar_t cv_rndsoundpitch;
+#endif
 
 /**	\brief	The I_GetSfx function
 
@@ -79,7 +84,7 @@ void I_ShutdownSound(void);
 
 	\return	sfx handle
 */
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel);
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, INT32 channel);
 
 /**	\brief	Stops a sound channel.
 
@@ -110,7 +115,7 @@ boolean I_SoundIsPlaying(INT32 handle);
 
 	\return	void
 */
-void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch);
+void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep);
 
 /**	\brief	The I_SetSfxVolume function
 
@@ -159,7 +164,6 @@ boolean I_SetSongPosition(UINT32 position);
 UINT32 I_GetSongPosition(void);
 
 void I_UpdateSongLagThreshold (void);
-void I_UpdateSongLagConditions (void);
 
 /// ------------------------
 //  MUSIC PLAYBACK
@@ -242,4 +246,8 @@ boolean I_FadeSong(UINT8 target_volume, UINT32 ms, void (*callback)(void));
 boolean I_FadeOutStopSong(UINT32 ms);
 boolean I_FadeInPlaySong(UINT32 ms, boolean looping);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/i_system.h b/src/i_system.h
index 14848367f..ec81fe33f 100644
--- a/src/i_system.h
+++ b/src/i_system.h
@@ -14,6 +14,10 @@
 #ifndef __I_SYSTEM__
 #define __I_SYSTEM__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "d_ticcmd.h"
 #include "d_event.h"
 
@@ -34,6 +38,9 @@ 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;
+
 /**	\brief	The I_GetFreeMem function
 
 	\param	total	total memory in the system
@@ -113,77 +120,6 @@ ticcmd_t *I_BaseTiccmd4(void);
 */
 void I_Quit(void) FUNCNORETURN;
 
-typedef enum
-{
-	EvilForce = -1,
-	//Constant
-	ConstantForce = 0,
-	//Ramp
-	RampForce,
-	//Periodics
-	SquareForce,
-	SineForce,
-	TriangleForce,
-	SawtoothUpForce,
-	SawtoothDownForce,
-	//MAX
-	NumberofForces,
-} FFType;
-
-typedef struct JoyFF_s
-{
-	INT32 ForceX; ///< The X of the Force's Vel
-	INT32 ForceY; ///< The Y of the Force's Vel
-	//All
-	UINT32 Duration; ///< The total duration of the effect, in microseconds
-	INT32 Gain; //< /The gain to be applied to the effect, in the range from 0 through 10,000.
-	//All, CONSTANTFORCE -10,000 to 10,000
-	INT32 Magnitude; ///< Magnitude of the effect, in the range from 0 through 10,000.
-	//RAMPFORCE
-	INT32 Start; ///< Magnitude at the start of the effect, in the range from -10,000 through 10,000.
-	INT32 End; ///< Magnitude at the end of the effect, in the range from -10,000 through 10,000.
-	//PERIODIC
-	INT32 Offset; ///< Offset of the effect.
-	UINT32 Phase; ///< Position in the cycle of the periodic effect at which playback begins, in the range from 0 through 35,999
-	UINT32 Period; ///< Period of the effect, in microseconds.
-} JoyFF_t;
-
-/**	\brief	Forcefeedback for the first joystick
-
-	\param	Type   what kind of Effect
-	\param	Effect Effect Info
-
-	\return	void
-*/
-
-void I_Tactile(FFType Type, const JoyFF_t *Effect);
-
-/**	\brief	Forcefeedback for the second joystick
-
-	\param	Type   what kind of Effect
-	\param	Effect Effect Info
-
-	\return	void
-*/
-void I_Tactile2(FFType Type, const JoyFF_t *Effect);
-
-/**	\brief	Forcefeedback for the third joystick
-
-\param	Type   what kind of Effect
-\param	Effect Effect Info
-
-\return	void
-*/
-void I_Tactile3(FFType Type, const JoyFF_t *Effect);
-
-/**	\brief	Forcefeedback for the fourth joystick
-
-\param	Type   what kind of Effect
-\param	Effect Effect Info
-
-\return	void
-*/
-void I_Tactile4(FFType Type, const JoyFF_t *Effect);
 
 /**	\brief to set up the first joystick scale
 */
@@ -203,9 +139,13 @@ void I_JoyScale4(void);
 
 // Called by D_SRB2Main.
 
+/**	\brief to startup joystick
+ */
+void I_InitJoystick(UINT8 index);
+
 /**	\brief to startup the first joystick
 */
-void I_InitJoystick(void);
+void I_InitJoystick1(void);
 
 /**	\brief to startup the second joystick
 */
@@ -223,6 +163,8 @@ void I_InitJoystick4(void);
 */
 INT32 I_NumJoys(void);
 
+extern INT32 numcontrollers;
+
 /**	\brief	The *I_GetJoyName function
 
 	\param	joyindex	which joystick
@@ -231,6 +173,9 @@ INT32 I_NumJoys(void);
 */
 const char *I_GetJoyName(INT32 joyindex);
 
+void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
+void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 blue);
+
 #ifndef NOMUMBLE
 #include "p_mobj.h" // mobj_t
 #include "s_sound.h" // listener_t
@@ -243,10 +188,6 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener);
 */
 void I_StartupMouse(void);
 
-/**	\brief Startup the second mouse
-*/
-void I_StartupMouse2(void);
-
 /**	\brief  setup timer irq and user timer routine.
 */
 void I_StartupTimer(void);
@@ -305,25 +246,9 @@ INT32 I_mkdir(const char *dirname, INT32 unixright);
 */
 const char *I_LocateWad(void);
 
-/**	\brief First Joystick's events
+/**	\brief Joystick events
 */
-void I_GetJoystickEvents(void);
-
-/**	\brief Second Joystick's events
-*/
-void I_GetJoystick2Events(void);
-
-/**	\brief Third Joystick's events
-*/
-void I_GetJoystick3Events(void);
-
-/**	\brief Fourth Joystick's events
-*/
-void I_GetJoystick4Events(void);
-
-/**	\brief Mouses events
-*/
-void I_GetMouseEvents(void);
+void I_GetJoystickEvents(UINT8 index);
 
 char *I_GetEnv(const char *name);
 
@@ -339,4 +264,8 @@ const char *I_ClipboardPaste(void);
 
 void I_RegisterSysCommands(void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/i_tcp.c b/src/i_tcp.c
index 35debdf6a..9ef4c66cf 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -24,7 +24,7 @@
 #endif // __OS2__
 
 #ifndef NO_IPV6
-#define HAVE_IPV6
+//#define HAVE_IPV6
 #endif
 
 #ifdef _WIN32
@@ -49,34 +49,28 @@
 #ifdef NONET
 #undef HAVE_MINIUPNPC
 #else
-#ifdef USE_WINSOCK1
-#include <winsock.h>
-#elif !defined (SCOUW2) && !defined (SCOUW7) && !defined (__OS2__)
-#ifndef USE_WINSOCK
-#include <arpa/inet.h>
-#endif //normal BSD API
-
-#ifndef USE_WINSOCK
-#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>
-#endif //normal BSD API
-
-#ifndef USE_WINSOCK
-#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
 
-#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
-	#include <sys/time.h>
-#endif // UNIXCOMMON
+	#include <errno.h>
+
+	#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
+		#include <sys/time.h>
+	#endif // UNIXCOMMON
 #endif // !NONET
 
 #ifdef USE_WINSOCK
@@ -123,7 +117,7 @@
 	#ifndef STATUS_INVALID_PARAMETER
 	#define STATUS_INVALID_PARAMETER 0xC000000D
 	#endif
-#endif
+#endif // USE_WINSOCK
 
 typedef union
 {
@@ -168,8 +162,6 @@ static UINT8 UPNP_support = TRUE;
 #endif
 
 #include "i_addrinfo.h"
-#define SELECTTEST
-
 #define DEFAULTPORT "5029"
 
 #if defined (USE_WINSOCK) && !defined (NONET)
@@ -184,6 +176,8 @@ typedef unsigned long SOCKET_TYPE;
 #define ERRSOCKET (-1)
 #endif
 
+#define IPV6_MULTICAST_ADDRESS "ff15::57e1:1a12"
+
 #ifdef USE_WINSOCK1
 typedef int socklen_t;
 #endif
@@ -377,9 +371,18 @@ static inline void I_UPnP_rem(const char *port, const char * servicetype)
 
 static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 {
-	static char s[64]; // 255.255.255.255:65535 or IPv6:65535
+	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)
 		addr = &sk->ip4.sin_addr;
@@ -392,11 +395,20 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 
 	if(addr == NULL)
 		sprintf(s, "No address");
-	else if(inet_ntop(sk->any.sa_family, addr, s, sizeof (s)) == NULL)
-		sprintf(s, "Unknown family type, error #%u", errno);
+	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));
+	}
 #ifdef HAVE_IPV6
-	else if(sk->any.sa_family == AF_INET6 && sk->ip6.sin6_port != 0)
-		strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
+	else if(sk->any.sa_family == AF_INET6)
+	{
+		s[0] = '[';
+		strcat(s, "]");
+
+		if (sk->ip6.sin6_port != 0)
+			strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
+	}
 #endif
 	else if(sk->any.sa_family == AF_INET  && sk->ip4.sin_port  != 0)
 		strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
@@ -488,10 +500,30 @@ static time_t SOCK_GetUnbanTime(size_t ban)
 }
 
 #ifndef NONET
+
+#ifdef HAVE_IPV6
+static boolean SOCK_cmpipv6(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
+{
+	UINT8 bitmask;
+	I_Assert(mask <= 128);
+	if (mask == 0)
+		mask = 128;
+	if (memcmp(&a->ip6.sin6_addr.s6_addr, &b->ip6.sin6_addr.s6_addr, mask / 8) != 0)
+		return false;
+	if (mask % 8 == 0)
+		return true;
+	bitmask = 255 << (mask % 8);
+	return (a->ip6.sin6_addr.s6_addr[mask / 8] & bitmask) == (b->ip6.sin6_addr.s6_addr[mask / 8] & bitmask);
+}
+#endif
+
 static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
 {
 	UINT32 bitmask = INADDR_NONE;
 
+	if (a->any.sa_family != b->any.sa_family)
+		return false;
+
 	if (mask && mask < 32)
 		bitmask = htonl((UINT32)(-1) << (32 - mask));
 
@@ -500,13 +532,14 @@ static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
 			&& (b->ip4.sin_port == 0 || (a->ip4.sin_port == b->ip4.sin_port));
 #ifdef HAVE_IPV6
 	else if (b->any.sa_family == AF_INET6)
-		return memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(b->ip6.sin6_addr))
+		return SOCK_cmpipv6(a, b, mask)
 			&& (b->ip6.sin6_port == 0 || (a->ip6.sin6_port == b->ip6.sin6_port));
 #endif
 	else
 		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.
@@ -594,6 +627,7 @@ void Command_Numnodes(void)
 #endif
 
 #ifndef NONET
+#ifdef HOLEPUNCH
 /* not one of the reserved "local" addresses */
 static boolean
 is_external_address (UINT32 p)
@@ -619,9 +653,9 @@ is_external_address (UINT32 p)
 	}
 }
 
-#ifdef HOLEPUNCH
 static boolean hole_punch(ssize_t c)
 {
+	holepunch_t *holepunchpacket = HOLEPUNCH_DATA(doomcom);
 
 	/* See ../doc/Holepunch-Protocol.txt */
 	if (cv_rendezvousserver.string[0] &&
@@ -645,7 +679,7 @@ static boolean hole_punch(ssize_t c)
 	}
 
 }
-#endif
+#endif //ifdef HOLEPUNCH
 
 // Returns true if a packet was received from a new node, false in all other cases
 static boolean SOCK_Get(void)
@@ -661,6 +695,7 @@ static boolean SOCK_Get(void)
 		fromlen = (socklen_t)sizeof(fromaddress);
 		c = recvfrom(mysockets[n], (char *)&doomcom->data, MAXPACKETLENGTH, 0,
 			(void *)&fromaddress, &fromlen);
+
 		if (c > 0)
 		{
 #ifdef USE_STUN
@@ -750,59 +785,6 @@ static boolean SOCK_Get(void)
 }
 #endif
 
-// check if we can send (do not go over the buffer)
-#ifndef NONET
-
-static fd_set masterset;
-
-#ifdef SELECTTEST
-static boolean FD_CPY(fd_set *src, fd_set *dst, SOCKET_TYPE *fd, size_t len)
-{
-	size_t i;
-	boolean testset = false;
-	FD_ZERO(dst);
-	for (i = 0; i < len;i++)
-	{
-		if(fd[i] != (SOCKET_TYPE)ERRSOCKET &&
-		   FD_ISSET(fd[i], src) && !FD_ISSET(fd[i], dst)) // no checking for dups
-		{
-			FD_SET(fd[i], dst);
-			testset = true;
-		}
-	}
-	return testset;
-}
-
-static boolean SOCK_CanSend(void)
-{
-	struct timeval timeval_for_select = {0, 0};
-	fd_set tset;
-	int wselect;
-
-	if(!FD_CPY(&masterset, &tset, mysockets, mysocketses))
-		return false;
-	wselect = select(255, NULL, &tset, NULL, &timeval_for_select);
-	if (wselect >= 1)
-		return true;
-	return false;
-}
-
-static boolean SOCK_CanGet(void)
-{
-	struct timeval timeval_for_select = {0, 0};
-	fd_set tset;
-	int rselect;
-
-	if(!FD_CPY(&masterset, &tset, mysockets, mysocketses))
-		return false;
-	rselect = select(255, &tset, NULL, NULL, &timeval_for_select);
-	if (rselect >= 1)
-		return true;
-	return false;
-}
-#endif
-#endif
-
 #ifndef NONET
 static inline ssize_t SOCK_SendToAddr(SOCKET_TYPE socket, mysockaddr_t *sockaddr)
 {
@@ -824,11 +806,16 @@ static inline ssize_t SOCK_SendToAddr(SOCKET_TYPE socket, mysockaddr_t *sockaddr
 	return sendto(socket, (char *)&doomcom->data, doomcom->datalength, 0, &sockaddr->any, d);
 }
 
+<<<<<<< HEAD
 #define ALLOWEDERROR(x) ((x) == ECONNREFUSED || (x) == EWOULDBLOCK || (x) == EHOSTUNREACH || (x) == ENETUNREACH)
+=======
+#define ALLOWEDERROR(x) ((x) == ECONNREFUSED || (x) == EWOULDBLOCK || (x) == EHOSTUNREACH || (x) == ENETUNREACH || (x) == EADDRNOTAVAIL)
+>>>>>>> Saturn-Next
 
 static void SOCK_Send(void)
 {
 	ssize_t c = ERRSOCKET;
+	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])
@@ -843,12 +830,20 @@ static void SOCK_Send(void)
 				if (myfamily[i] == broadcastaddress[j].any.sa_family)
 				{
 					c = SOCK_SendToAddr(mysockets[i], &broadcastaddress[j]);
+<<<<<<< HEAD
 					if (c == ERRSOCKET && !ALLOWEDERROR(errno))
 						break;
+=======
+					if (c == ERRSOCKET)
+					{
+						e = errno;
+						if (!ALLOWEDERROR(e))
+							break;
+					}
+>>>>>>> Saturn-Next
 				}
 			}
 		}
-		return;
 	}
 	else if (nodesocket[doomcom->remotenode] == (SOCKET_TYPE)ERRSOCKET)
 	{
@@ -857,22 +852,39 @@ static void SOCK_Send(void)
 			if (myfamily[i] == clientaddress[doomcom->remotenode].any.sa_family)
 			{
 				c = SOCK_SendToAddr(mysockets[i], &clientaddress[doomcom->remotenode]);
+<<<<<<< HEAD
 				if (c == ERRSOCKET && !ALLOWEDERROR(errno))
 					break;
+=======
+				if (c == ERRSOCKET)
+				{
+					e = errno;
+					if (!ALLOWEDERROR(e))
+						break;
+				}
+>>>>>>> Saturn-Next
 			}
 		}
-		return;
 	}
 	else
 	{
 		c = SOCK_SendToAddr(nodesocket[doomcom->remotenode], &clientaddress[doomcom->remotenode]);
+		if (c == ERRSOCKET)
+		{
+			e = errno;
+		}
 	}
 
-	if (c == ERRSOCKET)
+	if (c == ERRSOCKET && e != 0) // 0 means no socket for the address family was found
 	{
+<<<<<<< HEAD
 		int e = errno; // save error code so it can't be modified later
 		if (!ALLOWEDERROR(e))
 			I_Error("SOCK_Send, error sending to node %d (%s) #%u: %s", doomcom->remotenode,
+=======
+		if (!ALLOWEDERROR(e))
+			I_Error("SOCK_Send, error sending to node %d (%s) #%u, %s", doomcom->remotenode,
+>>>>>>> Saturn-Next
 				SOCK_GetNodeAddress(doomcom->remotenode), e, strerror(e));
 	}
 }
@@ -906,110 +918,191 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 {
 	SOCKET_TYPE s = socket(family, SOCK_DGRAM, IPPROTO_UDP);
 	int opt;
+	int rc;
+	int e = 0; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once
 	socklen_t opts;
 #ifdef FIONBIO
 	unsigned long trueval = true;
 #endif
 	mysockaddr_t straddr;
-	struct sockaddr_in sin;
-	socklen_t len = sizeof(sin);
+	socklen_t len = sizeof(straddr);
 
 	if (s == (SOCKET_TYPE)ERRSOCKET)
 		return (SOCKET_TYPE)ERRSOCKET;
+
 #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;
-		WSAIoctl(s, SIO_UDP_CONNRESET, &bfalse, sizeof(bfalse),
+		rc = WSAIoctl(s, SIO_UDP_CONNRESET, &bfalse, sizeof(bfalse),
 		         NULL, 0, &dwBytesReturned, NULL, NULL);
 #else
 		unsigned long falseval = false;
-		ioctl(s, SIO_UDP_CONNRESET, &falseval);
+		rc = ioctl(s, SIO_UDP_CONNRESET, &falseval);
 #endif
+		if (rc == -1)
+		{
+			e = errno;
+			I_OutputMsg("SIO_UDP_CONNRESET failed: #%u, %s\n", e, strerror(e));
+		}
 	}
 #endif
 
-	straddr.any = *addr;
+	memcpy(&straddr, addr, addrlen);
 	I_OutputMsg("Binding to %s\n", SOCK_AddrToStr(&straddr));
 
 	if (family == AF_INET)
 	{
-		mysockaddr_t tmpaddr;
-		tmpaddr.any = *addr ;
-		if (tmpaddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY))
+		if (straddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY))
 		{
 			opt = true;
 			opts = (socklen_t)sizeof(opt);
-			setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, opts);
+			rc = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, opts);
+			if (rc <= -1)
+			{
+				e = errno;
+				I_OutputMsg("setting SO_REUSEADDR failed: #%u, %s\n", e, strerror(e));
+			}
 		}
 		// make it broadcastable
 		opt = true;
 		opts = (socklen_t)sizeof(opt);
-		if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, (char *)&opt, opts))
+		rc = setsockopt(s, SOL_SOCKET, SO_BROADCAST, (char *)&opt, opts);
+		if (rc <= -1)
 		{
+			e = errno;
 			CONS_Alert(CONS_WARNING, M_GetText("Could not get broadcast rights\n")); // I do not care anymore
+			I_OutputMsg("setting SO_BROADCAST failed: #%u, %s\n", e, strerror(e));
 		}
 	}
 #ifdef HAVE_IPV6
 	else if (family == AF_INET6)
 	{
-		if (memcmp(addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL
+		if (memcmp(&straddr.ip6.sin6_addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL
 		{
 			opt = true;
 			opts = (socklen_t)sizeof(opt);
-			setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, opts);
+			rc = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, opts);
+			if (rc <= -1)
+			{
+				e = errno;
+				I_OutputMsg("setting SO_REUSEADDR failed: #%u, %s\n", e, strerror(e));
+			}
 		}
 #ifdef IPV6_V6ONLY
 		// make it IPv6 ony
 		opt = true;
 		opts = (socklen_t)sizeof(opt);
-		if (setsockopt(s, SOL_SOCKET, IPV6_V6ONLY, (char *)&opt, opts))
+		rc = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&opt, opts);
+		if (rc <= -1)
 		{
+			e = errno;
 			CONS_Alert(CONS_WARNING, M_GetText("Could not limit IPv6 bind\n")); // I do not care anymore
+			I_OutputMsg("setting IPV6_V6ONLY failed: #%u, %s\n", e, strerror(e));
 		}
 #endif
 	}
 #endif
 
-	if (bind(s, addr, addrlen) == ERRSOCKET)
+	rc = bind(s, addr, addrlen);
+	if (rc == ERRSOCKET)
 	{
+		e = errno;
 		close(s);
-		I_OutputMsg("Binding failed\n");
+		I_OutputMsg("Binding failed: #%u, %s\n", e, strerror(e));
 		return (SOCKET_TYPE)ERRSOCKET;
 	}
 
+#ifdef HAVE_IPV6
+	if (family == AF_INET6)
+	{
+		// we need to set all of this *after* binding to an address!
+		if (memcmp(&straddr.ip6.sin6_addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL
+		{
+			struct ipv6_mreq maddr;
+
+			inet_pton(AF_INET6, IPV6_MULTICAST_ADDRESS, &maddr.ipv6mr_multiaddr);
+			maddr.ipv6mr_interface = 0;
+			rc = setsockopt(s, IPPROTO_IPV6, IPV6_JOIN_GROUP, (const char *)&maddr, sizeof(maddr));
+			if (rc <= -1)
+			{
+				e = errno;
+				CONS_Alert(CONS_WARNING, M_GetText("Could not register multicast address\n"));
+				if (e == ENODEV)
+				{
+					close(s);
+					I_OutputMsg("Binding failed: no IPv6 device\n");
+					return (SOCKET_TYPE)ERRSOCKET;
+				}
+				I_OutputMsg("setting IPV6_JOIN_GROUP failed: #%u, %s \n", e, strerror(e));
+			}
+		}
+	}
+#endif
+
 #ifdef FIONBIO
 	// make it non blocking
-	opt = true;
-	if (ioctl(s, FIONBIO, &trueval) != 0)
+	rc = ioctl(s, FIONBIO, &trueval);
+	if (rc == -1)
 	{
+		e = errno;
 		close(s);
-		I_OutputMsg("Seting FIOBIO on failed\n");
+		I_OutputMsg("FIOBIO failed: #%u, %s\n", e, strerror(e));
 		return (SOCKET_TYPE)ERRSOCKET;
 	}
 #endif
 
+	opt = 0;
 	opts = (socklen_t)sizeof(opt);
-	getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, &opts);
+	rc = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, &opts);
+	if (rc <= -1)
+	{
+		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);
 
 	if (opt < 64<<10) // 64k
 	{
 		opt = 64<<10;
 		opts = (socklen_t)sizeof(opt);
-		setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, opts);
-		getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, &opts);
+		rc = setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, opts);
+		if (rc <= -1)
+		{
+			e = errno;
+			I_OutputMsg("setting SO_RCVBUF failed: #%u, %s\n", e, strerror(e));
+		}
+		opt = 0;
+		rc = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&opt, &opts);
+		if (rc <= -1)
+		{
+			e = errno;
+			I_OutputMsg("getting SO_RCVBUF failed: #%u, %s\n", e, strerror(e));
+		}
+
 		if (opt < 64<<10)
 			CONS_Alert(CONS_WARNING, M_GetText("Can't set buffer length to 64k, file transfer will be bad\n"));
 		else
 			CONS_Printf(M_GetText("Network system buffer set to: %dKb\n"), opt>>10);
 	}
 
-	if (getsockname(s, (struct sockaddr *)&sin, &len) == -1)
+	rc = getsockname(s, &straddr.any, &len);
+	if (rc != 0)
+	{
+		e = errno;
 		CONS_Alert(CONS_WARNING, M_GetText("Failed to get port number\n"));
+		I_OutputMsg("getsockname failed: #%u, %s\n", e, strerror(e));
+	}
 	else
-		current_port = (UINT16)ntohs(sin.sin_port);
+	{
+		if (family == AF_INET)
+			current_port = (UINT16)ntohs(straddr.ip4.sin_port);
+#ifdef HAVE_IPV6
+		else if (family == AF_INET6)
+			current_port = (UINT16)ntohs(straddr.ip6.sin6_port);
+#endif
+	}
 
 	return s;
 }
@@ -1029,7 +1122,6 @@ static boolean UDP_Socket(void)
 		mysockets[s] = ERRSOCKET;
 	for (s = 0; s < MAXNETNODES+1; s++)
 		nodesocket[s] = ERRSOCKET;
-	FD_ZERO(&masterset);
 	s = 0;
 
 	memset(&hints, 0x00, sizeof (hints));
@@ -1056,7 +1148,6 @@ static boolean UDP_Socket(void)
 					mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
 					if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
 					{
-						FD_SET(mysockets[s], &masterset);
 						myfamily[s] = hints.ai_family;
 						s++;
 					}
@@ -1077,7 +1168,6 @@ static boolean UDP_Socket(void)
 				mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
 				if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
 				{
-					FD_SET(mysockets[s], &masterset);
 					myfamily[s] = hints.ai_family;
 					s++;
 #ifdef HAVE_MINIUPNPC
@@ -1093,6 +1183,7 @@ static boolean UDP_Socket(void)
 			I_freeaddrinfo(ai);
 		}
 	}
+
 #ifdef HAVE_IPV6
 	if (b_ipv6)
 	{
@@ -1110,7 +1201,6 @@ static boolean UDP_Socket(void)
 						mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
 						if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
 						{
-							FD_SET(mysockets[s], &masterset);
 							myfamily[s] = hints.ai_family;
 							s++;
 						}
@@ -1131,7 +1221,6 @@ static boolean UDP_Socket(void)
 					mysockets[s] = UDP_Bind(runp->ai_family, runp->ai_addr, (socklen_t)runp->ai_addrlen);
 					if (mysockets[s] != (SOCKET_TYPE)ERRSOCKET)
 					{
-						FD_SET(mysockets[s], &masterset);
 						myfamily[s] = hints.ai_family;
 						s++;
 					}
@@ -1152,65 +1241,28 @@ static boolean UDP_Socket(void)
 	// ip + udp
 	packetheaderlength = 20 + 8; // for stats
 
-	hints.ai_family = AF_INET;
-	gaie = I_getaddrinfo("127.0.0.1", "0", &hints, &ai);
-	if (gaie == 0)
-	{
-		runp = ai;
-		while (runp != NULL && s < MAXNETNODES+1)
-		{
-			memcpy(&clientaddress[s], runp->ai_addr, runp->ai_addrlen);
-			s++;
-			runp = runp->ai_next;
-		}
-		I_freeaddrinfo(ai);
-	}
-	else
-	{
-		clientaddress[s].any.sa_family = AF_INET;
-		clientaddress[s].ip4.sin_port = htons(0);
-		clientaddress[s].ip4.sin_addr.s_addr = htonl(INADDR_LOOPBACK); //GetLocalAddress(); // my own ip
-		s++;
-	}
+	clientaddress[s].any.sa_family = AF_INET;
+	clientaddress[s].ip4.sin_port = htons(0);
+	clientaddress[s].ip4.sin_addr.s_addr = htonl(INADDR_LOOPBACK); //GetLocalAddress(); // my own ip
+	s++;
 
 	s = 0;
 
 	// setup broadcast adress to BROADCASTADDR entry
-	gaie = I_getaddrinfo("255.255.255.255", "0", &hints, &ai);
-	if (gaie == 0)
-	{
-		runp = ai;
-		while (runp != NULL && s < MAXNETNODES+1)
-		{
-			memcpy(&broadcastaddress[s], runp->ai_addr, runp->ai_addrlen);
-			s++;
-			runp = runp->ai_next;
-		}
-		I_freeaddrinfo(ai);
-	}
-	else
-	{
-		broadcastaddress[s].any.sa_family = AF_INET;
-		broadcastaddress[s].ip4.sin_port = htons(0);
-		broadcastaddress[s].ip4.sin_addr.s_addr = htonl(INADDR_BROADCAST);
-		s++;
-	}
+	broadcastaddress[s].any.sa_family = AF_INET;
+	broadcastaddress[s].ip4.sin_port = htons(atoi(DEFAULTPORT));
+	broadcastaddress[s].ip4.sin_addr.s_addr = htonl(INADDR_BROADCAST);
+	s++;
+
 #ifdef HAVE_IPV6
 	if (b_ipv6)
 	{
-		hints.ai_family = AF_INET6;
-		gaie = I_getaddrinfo("ff02::1", "0", &hints, &ai);
-		if (gaie == 0)
-		{
-			runp = ai;
-			while (runp != NULL && s < MAXNETNODES+1)
-			{
-				memcpy(&broadcastaddress[s], runp->ai_addr, runp->ai_addrlen);
-				s++;
-				runp = runp->ai_next;
-			}
-			I_freeaddrinfo(ai);
-		}
+		broadcastaddress[s].any.sa_family = AF_INET6;
+		broadcastaddress[s].ip6.sin6_port = htons(atoi(DEFAULTPORT));
+		broadcastaddress[s].ip6.sin6_flowinfo = 0;
+		inet_pton(AF_INET6, IPV6_MULTICAST_ADDRESS, &broadcastaddress[s].ip6.sin6_addr);
+		broadcastaddress[s].ip6.sin6_scope_id = 0;
+		s++;
 	}
 #endif
 
@@ -1298,16 +1350,15 @@ boolean I_InitTcpDriver(void)
 static void SOCK_CloseSocket(void)
 {
 	size_t i;
-	for (i=0; i < MAXNETNODES+1; i++)
+
+	for (i = 0; i < mysocketses; i++)
 	{
-		if (mysockets[i] != (SOCKET_TYPE)ERRSOCKET
-		 && FD_ISSET(mysockets[i], &masterset))
-		{
-			FD_CLR(mysockets[i], &masterset);
+		if (mysockets[i] != (SOCKET_TYPE)ERRSOCKET)
 			close(mysockets[i]);
-		}
 		mysockets[i] = ERRSOCKET;
 	}
+
+	mysocketses = 0;
 }
 #endif
 
@@ -1331,12 +1382,13 @@ static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const
 {
 	struct my_addrinfo *ai = NULL, *runp, hints;
 	int gaie;
+	size_t i;
 
 	if (!port || !port[0])
 		port = DEFAULTPORT;
 
 	memset (&hints, 0x00, sizeof (hints));
-	hints.ai_flags = 0;
+	hints.ai_flags = AI_ADDRCONFIG;
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = IPPROTO_UDP;
@@ -1355,10 +1407,19 @@ static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const
 	{
 		while (runp != NULL)
 		{
-			if (sendto(mysockets[0], NULL, 0, 0, runp->ai_addr, runp->ai_addrlen) == 0)
-				break;
+			// test ip address of server
+			for (i = 0; i < mysocketses; ++i)
+			{
+				if (runp->ai_addr->sa_family == myfamily[i])
+				{
+					break;
+				}
+			}
 
-			runp = runp->ai_next;
+			if (i >= mysocketses)
+				runp = runp->ai_next;
+			else
+				break;
 		}
 	}
 
@@ -1402,6 +1463,8 @@ static void rendezvous(int size)
 
 	tic_t tic = I_GetTime();
 
+	holepunch_t *holepunchpacket = HOLEPUNCH_DATA(doomcom);
+
 	if (tic != refreshtic)
 	{
 		if (SOCK_GetAddr(&rzv.ip4, host, (port ? port : "7777"), false))
@@ -1417,9 +1480,7 @@ static void rendezvous(int size)
 
 	if (tic == refreshtic)
 	{
-		#ifdef HOLEPUNCH
 		holepunchpacket->magic = hole_punch_magic;
-		#endif
 		sendto(mysockets[0], doomcom->data, size, 0, &rzv.any, sizeof rzv.ip4);
 	}
 
@@ -1429,6 +1490,7 @@ static void rendezvous(int size)
 static void SOCK_RequestHolePunch(INT32 node)
 {
 	mysockaddr_t * addr = &clientaddress[node];
+	holepunch_t *holepunchpacket = HOLEPUNCH_DATA(doomcom);
 
 	holepunchpacket->addr = addr->ip4.sin_addr.s_addr;
 	holepunchpacket->port = addr->ip4.sin_port;
@@ -1444,7 +1506,6 @@ static void SOCK_RegisterHolePunch(void)
 	rendezvous(4);
 }
 #endif
-
 #endif
 
 static boolean SOCK_OpenSocket(void)
@@ -1464,13 +1525,7 @@ static boolean SOCK_OpenSocket(void)
 	I_NetFreeNodenum = SOCK_FreeNodenum;
 	I_NetMakeNodewPort = SOCK_NetMakeNodewPort;
 
-#ifdef SELECTTEST
-	// seem like not work with libsocket : (
-	I_NetCanSend = SOCK_CanSend;
-	I_NetCanGet = SOCK_CanGet;
-#endif
 #ifdef HOLEPUNCH
-
 	I_NetRequestHolePunch = SOCK_RequestHolePunch;
 	I_NetRegisterHolePunch = SOCK_RegisterHolePunch;
 #endif
@@ -1496,13 +1551,7 @@ static void AddBannedIndex(void)
 			banned_size *= 2;
 		}
 
-		banned = Z_ReallocAlign(
-			(void*) banned,
-			sizeof(banned_t) * banned_size,
-			PU_STATIC,
-			NULL,
-			sizeof(banned_t) * 8
-		);
+		banned = Z_Realloc((void*) banned, sizeof(banned_t) * banned_size, PU_STATIC, NULL);
 	}
 
 	numbans++;
@@ -1711,6 +1760,8 @@ 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;
 
@@ -1738,7 +1789,6 @@ boolean I_InitTcpNetwork(void)
 		// server address only in ip
 		if (serverhostname[0])
 		{
-			CV_Set(&cv_lastserver, serverhostname);
 			COM_BufAddText("connect \"");
 			COM_BufAddText(serverhostname);
 			COM_BufAddText("\"\n");
@@ -1748,9 +1798,6 @@ boolean I_InitTcpNetwork(void)
 		}
 		else
 		{
-			// Not quite sure if we want to save that but i'll do that for now
-			CV_Set(&cv_lastserver, "any");
-
 			// so we're on a LAN
 			COM_BufAddText("connect any\n");
 
@@ -1765,7 +1812,7 @@ boolean I_InitTcpNetwork(void)
 
 		// server address only in ip
 		if (serverhostname[0])
-		{			
+		{
 			CONS_Printf("SERVERNAME: %s\n", serverhostname);
 			COM_BufAddText("connect \"");
 			COM_BufAddText(serverhostname);
diff --git a/src/i_threads.h b/src/i_threads.h
index 45a3dcc3e..17500aeca 100644
--- a/src/i_threads.h
+++ b/src/i_threads.h
@@ -14,6 +14,10 @@
 #ifndef I_THREADS_H
 #define I_THREADS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef void (*I_thread_fn)(void *userdata);
 
 typedef void * I_mutex;
@@ -35,5 +39,9 @@ void      I_hold_cond       (I_cond *, I_mutex);
 void      I_wake_one_cond   (I_cond *);
 void      I_wake_all_cond   (I_cond *);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif/*I_THREADS_H*/
 #endif/*HAVE_THREADS*/
diff --git a/src/i_time.c b/src/i_time.c
index 61a267a96..79f471a49 100644
--- a/src/i_time.c
+++ b/src/i_time.c
@@ -37,18 +37,20 @@ tic_t I_GetTime(void)
 
 void I_InitializeTime(void)
 {
-	g_time.time = 0;
-	g_time.timefrac = 0;
-
-	enterprecise = 0;
-	oldenterprecise = 0;
-	tictimer = 0.0;
-
 	CV_RegisterVar(&cv_timescale);
 
 	// I_StartupTimer is preserved for potential subsystems that need to setup
 	// timing information for I_GetPreciseTime and sleeping
 	I_StartupTimer();
+
+	g_time.time = 0;
+	g_time.timefrac = 0;
+
+	enterprecise = I_GetPreciseTime();
+	oldenterprecise = enterprecise;
+	entertic = 0;
+	oldentertics = 0;
+	tictimer = 0.0;
 }
 
 void I_UpdateTime(fixed_t timescale)
@@ -58,7 +60,7 @@ void I_UpdateTime(fixed_t timescale)
 	tic_t realtics;
 
 	// get real tics
-	ticratescaled = (double)TICRATE * FIXED_TO_FLOAT(timescale);
+	ticratescaled = (double)TICRATE * FixedToFloat(timescale);
 
 	enterprecise = I_GetPreciseTime();
 	elapsedseconds = (double)(enterprecise - oldenterprecise) / I_GetPrecisePrecision();
@@ -78,7 +80,7 @@ void I_UpdateTime(fixed_t timescale)
 	{
 		double fractional, integral;
 		fractional = modf(tictimer * ticratescaled, &integral);
-		g_time.timefrac = FLOAT_TO_FIXED(fractional);
+		g_time.timefrac = FloatToFixed(fractional);
 	}
 }
 
diff --git a/src/i_video.h b/src/i_video.h
index 708fde03c..88d295ed9 100644
--- a/src/i_video.h
+++ b/src/i_video.h
@@ -14,6 +14,10 @@
 #ifndef __I_VIDEO__
 #define __I_VIDEO__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomtype.h"
 
 #ifdef __GNUG__
@@ -139,10 +143,20 @@ UINT32 I_GetRefreshRate(void);
 
 boolean I_UseNativeKeyboard(void);
 
+boolean I_CheckNativeRes(void);
+
+void I_SetBorderlessWindow(void);
+
 #ifdef USE_FBO_OGL
+
 void RefreshOGLSDLSurface(void);
 void I_DownSample(void);
+boolean UseScreenFBO(void);
 extern boolean downsample;
 #endif
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/info.c b/src/info.c
index 0d5dbea71..c46dc191d 100644
--- a/src/info.c
+++ b/src/info.c
@@ -21,7 +21,6 @@
 #include "d_player.h"
 #include "lzf.h"
 
-// Hey, moron! If you change this table, don't forget about the sprite enum in info.h and the sprite lights in hw_light.c!
 char sprnames[NUMSPRITES + 1][5] =
 {
 	"NULL","UNKN","THOK","PLAY","POSS","SPOS","FISH","BUZZ","RBUZ","JETB",
@@ -79,3336 +78,3279 @@ state_t states[NUMSTATES] =
 	// (or tr_trans10<<FF_TRANSSHIFT if you want to make it hard on yourself)
 
 	// Keep this comment directly above S_NULL.
-	{SPR_NULL, 0,  1, {NULL}, 0, 0, S_NULL}, // S_NULL
-	{SPR_UNKN, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_UNKNOWN
-	{SPR_NULL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_INVISIBLE
+	{SPR_NULL, 0,  1, NULL, 0, 0, S_NULL}, // S_NULL
+	{SPR_UNKN, FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_UNKNOWN
+	{SPR_NULL, 0, -1, NULL, 0, 0, S_NULL}, // S_INVISIBLE
 
-	{SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 0, 0, S_NULL}, // S_SPAWNSTATE
-	{SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 1, 0, S_NULL}, // S_SEESTATE
-	{SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 2, 0, S_NULL}, // S_MELEESTATE
-	{SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 3, 0, S_NULL}, // S_MISSILESTATE
-	{SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 4, 0, S_NULL}, // S_DEATHSTATE
-	{SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 5, 0, S_NULL}, // S_XDEATHSTATE
-	{SPR_UNKN, FF_FULLBRIGHT, -1, {A_InfoState}, 6, 0, S_NULL}, // S_RAISESTATE
+	{SPR_UNKN, FF_FULLBRIGHT, -1, A_InfoState, 0, 0, S_NULL}, // S_SPAWNSTATE
+	{SPR_UNKN, FF_FULLBRIGHT, -1, A_InfoState, 1, 0, S_NULL}, // S_SEESTATE
+	{SPR_UNKN, FF_FULLBRIGHT, -1, A_InfoState, 2, 0, S_NULL}, // S_MELEESTATE
+	{SPR_UNKN, FF_FULLBRIGHT, -1, A_InfoState, 3, 0, S_NULL}, // S_MISSILESTATE
+	{SPR_UNKN, FF_FULLBRIGHT, -1, A_InfoState, 4, 0, S_NULL}, // S_DEATHSTATE
+	{SPR_UNKN, FF_FULLBRIGHT, -1, A_InfoState, 5, 0, S_NULL}, // S_XDEATHSTATE
+	{SPR_UNKN, FF_FULLBRIGHT, -1, A_InfoState, 6, 0, S_NULL}, // S_RAISESTATE
 
 	// Thok
-	{SPR_THOK, FF_TRANS50, 8, {NULL}, 0, 0, S_NULL}, // S_THOK
+	{SPR_THOK, FF_TRANS50, 8, NULL, 0, 0, S_NULL}, // S_THOK
 
 	// Player // SRB2kart
-	{SPR_PLAY,     0,   1, {NULL},   0, 0, S_KART_STND2},    // S_KART_STND1	A
-	{SPR_PLAY,     1,   1, {NULL},   0, 0, S_KART_STND1},    // S_KART_STND2	B
-	{SPR_PLAY,     2,   1, {NULL},   0, 0, S_KART_STND2_L},  // S_KART_STND1_L	C
-	{SPR_PLAY,     3,   1, {NULL},   0, 0, S_KART_STND1_L},  // S_KART_STND2_L	D
-	{SPR_PLAY,     4,   1, {NULL},   0, 0, S_KART_STND2_R},  // S_KART_STND1_R	E
-	{SPR_PLAY,     5,   1, {NULL},   0, 0, S_KART_STND1_R},  // S_KART_STND2_R	F
-	{SPR_PLAY,     9,   1, {NULL},   0, 0, S_KART_WALK2},    // S_KART_WALK1	J
-	{SPR_PLAY,     6,   1, {NULL},   0, 0, S_KART_WALK1},    // S_KART_WALK2	G
-	{SPR_PLAY,    10,   1, {NULL},   0, 0, S_KART_WALK2_L},  // S_KART_WALK1_L	K
-	{SPR_PLAY,     7,   1, {NULL},   0, 0, S_KART_WALK1_L},  // S_KART_WALK2_L	H
-	{SPR_PLAY,    11,   1, {NULL},   0, 0, S_KART_WALK2_R},  // S_KART_WALK1_R	L
-	{SPR_PLAY,     8,   1, {NULL},   0, 0, S_KART_WALK1_R},  // S_KART_WALK2_R	I
-	{SPR_PLAY,     0,   1, {NULL},   0, 0, S_KART_RUN2},     // S_KART_RUN1		A
-	{SPR_PLAY,     9,   1, {NULL},   0, 0, S_KART_RUN1},     // S_KART_RUN2		J
-	{SPR_PLAY,     2,   1, {NULL},   0, 0, S_KART_RUN2_L},   // S_KART_RUN1_L	C
-	{SPR_PLAY,    10,   1, {NULL},   0, 0, S_KART_RUN1_L},   // S_KART_RUN2_L	K
-	{SPR_PLAY,     4,   1, {NULL},   0, 0, S_KART_RUN2_R},   // S_KART_RUN1_R	E
-	{SPR_PLAY,    11,   1, {NULL},   0, 0, S_KART_RUN1_R},   // S_KART_RUN2_R	L
-	{SPR_PLAY,    12,   1, {NULL},   0, 0, S_KART_DRIFT2_L}, // S_KART_DRIFT1_L	M
-	{SPR_PLAY,    13,   1, {NULL},   0, 0, S_KART_DRIFT1_L}, // S_KART_DRIFT2_L	N
-	{SPR_PLAY,    14,   1, {NULL},   0, 0, S_KART_DRIFT2_R}, // S_KART_DRIFT1_R	O
-	{SPR_PLAY,    15,   1, {NULL},   0, 0, S_KART_DRIFT1_R}, // S_KART_DRIFT2_R	P
-	{SPR_PLAY,    16,  -1, {NULL},   0, 0, S_KART_SPIN},     // S_KART_SPIN		Q
-	{SPR_PLAY,    16, 350, {NULL},   0, 0, S_KART_STND1},    // S_KART_PAIN		Q
-	{SPR_PLAY,    17, 350, {NULL},   0, 0, S_KART_STND1},    // S_KART_SQUISH	R
-	/*
-	{SPR_PLAY,     0, 105, {NULL},   0, 0, S_PLAY_TAP1},        // S_PLAY_STND
-	{SPR_PLAY,     1,  16, {NULL},   0, 0, S_PLAY_TAP2},        // S_PLAY_TAP1
-	{SPR_PLAY,     2,  16, {NULL},   0, 0, S_PLAY_TAP1},        // S_PLAY_TAP2
-	{SPR_PLAY,     3,   4, {NULL},   0, 0, S_PLAY_RUN2},        // S_PLAY_RUN1
-	{SPR_PLAY,     4,   4, {NULL},   0, 0, S_PLAY_RUN3},        // S_PLAY_RUN2
-	{SPR_PLAY,     5,   4, {NULL},   0, 0, S_PLAY_RUN4},        // S_PLAY_RUN3
-	{SPR_PLAY,     6,   4, {NULL},   0, 0, S_PLAY_RUN5},        // S_PLAY_RUN4
-	{SPR_PLAY,     7,   4, {NULL},   0, 0, S_PLAY_RUN6},        // S_PLAY_RUN5
-	{SPR_PLAY,     8,   4, {NULL},   0, 0, S_PLAY_RUN7},        // S_PLAY_RUN6
-	{SPR_PLAY,     9,   4, {NULL},   0, 0, S_PLAY_RUN8},        // S_PLAY_RUN7
-	{SPR_PLAY,    10,   4, {NULL},   0, 0, S_PLAY_RUN1},        // S_PLAY_RUN8
-	{SPR_PLAY,    16,   2, {NULL},   0, 0, S_PLAY_SPD2},        // S_PLAY_SPD1
-	{SPR_PLAY,    17,   2, {NULL},   0, 0, S_PLAY_SPD3},        // S_PLAY_SPD2
-	{SPR_PLAY,    18,   2, {NULL},   0, 0, S_PLAY_SPD4},        // S_PLAY_SPD3
-	{SPR_PLAY,    19,   2, {NULL},   0, 0, S_PLAY_SPD1},        // S_PLAY_SPD4
-	{SPR_PLAY,    11,   1, {NULL},   0, 0, S_PLAY_ATK2},        // S_PLAY_ATK1
-	{SPR_PLAY,    12,   1, {NULL},   0, 0, S_PLAY_ATK3},        // S_PLAY_ATK2
-	{SPR_PLAY,    13,   1, {NULL},   0, 0, S_PLAY_ATK4},        // S_PLAY_ATK3
-	{SPR_PLAY,    14,   1, {NULL},   0, 0, S_PLAY_ATK1},        // S_PLAY_ATK4
-	{SPR_PLAY,    15,  -1, {NULL},   0, 0, S_PLAY_FALL1},       // S_PLAY_SPRING
-	{SPR_PLAY,    31,   2, {NULL},   0, 0, S_PLAY_FALL2},       // S_PLAY_FALL1
-	{SPR_PLAY,    32,   2, {NULL},   0, 0, S_PLAY_FALL1},       // S_PLAY_FALL2
-	{SPR_PLAY,    20,   2, {NULL},   0, 0, S_PLAY_ABL2},        // S_PLAY_ABL1
-	{SPR_PLAY,    21,   2, {NULL},   0, 0, S_PLAY_ABL1},        // S_PLAY_ABL2
-	{SPR_PLAY,    22,   6, {NULL},   0, 0, S_PLAY_SPC2},        // S_PLAY_SPC1
-	{SPR_PLAY,    23,   6, {NULL},   0, 0, S_PLAY_SPC3},        // S_PLAY_SPC2
-	{SPR_PLAY,    24,   6, {NULL},   0, 0, S_PLAY_SPC4},        // S_PLAY_SPC3
-	{SPR_PLAY,    25,   6, {NULL},   0, 0, S_PLAY_SPC1},        // S_PLAY_SPC4
-	{SPR_PLAY,    22,  -1, {NULL},   0, 0, S_NULL},             // S_PLAY_CLIMB1
-	{SPR_PLAY,    23,   5, {NULL},   0, 0, S_PLAY_CLIMB3},      // S_PLAY_CLIMB2
-	{SPR_PLAY,    24,   5, {NULL},   0, 0, S_PLAY_CLIMB4},      // S_PLAY_CLIMB3
-	{SPR_PLAY,    25,   5, {NULL},   0, 0, S_PLAY_CLIMB5},      // S_PLAY_CLIMB4
-	{SPR_PLAY,    24,   5, {NULL},   0, 0, S_PLAY_CLIMB2},      // S_PLAY_CLIMB5
-	{SPR_PLAY,    26,  14, {NULL},   0, 0, S_PLAY_RUN1},        // S_PLAY_GASP
-	{SPR_PLAY,    27, 350, {NULL},   0, 0, S_PLAY_FALL1},       // S_PLAY_PAIN
-	{SPR_PLAY,    28,  -1, {A_Fall}, 0, 0, S_NULL},             // S_PLAY_DIE
-	{SPR_PLAY,    29,  12, {NULL},   0, 0, S_PLAY_TEETER2},     // S_PLAY_TEETER1
-	{SPR_PLAY,    30,  12, {NULL},   0, 0, S_PLAY_TEETER1},     // S_PLAY_TEETER2
-	{SPR_PLAY,    33,  -1, {NULL},   0, 0, S_NULL},             // S_PLAY_CARRY
-	{SPR_PLAY,    20,  -1, {NULL},   0, 0, S_PLAY_SUPERSTAND},  // S_PLAY_SUPERSTAND
-	{SPR_PLAY,    20,   7, {NULL},   0, 0, S_PLAY_SUPERWALK2},  // S_PLAY_SUPERWALK1
-	{SPR_PLAY,    21,   7, {NULL},   0, 0, S_PLAY_SUPERWALK1},  // S_PLAY_SUPERWALK2
-	{SPR_PLAY,    22,   7, {NULL},   0, 0, S_PLAY_SUPERFLY2},   // S_PLAY_SUPERFLY1
-	{SPR_PLAY,    23,   7, {NULL},   0, 0, S_PLAY_SUPERFLY1},   // S_PLAY_SUPERFLY2
-	{SPR_PLAY,    24,  12, {NULL},   0, 0, S_PLAY_SUPERTEETER}, // S_PLAY_SUPERTEETER
-	{SPR_PLAY,    25,  -1, {NULL},   0, 0, S_PLAY_SUPERSTAND},  // S_PLAY_SUPERHIT
-	{SPR_PLAY,    36,   4, {NULL},   0, 0, S_PLAY_SUPERTRANS2}, // S_PLAY_SUPERTRANS1
-	{SPR_PLAY,    37,   4, {NULL},   0, 0, S_PLAY_SUPERTRANS3}, // S_PLAY_SUPERTRANS2
-	{SPR_PLAY, 32806,   4, {NULL},   0, 0, S_PLAY_SUPERTRANS4}, // S_PLAY_SUPERTRANS3
-	{SPR_PLAY,    39,   3, {NULL},   0, 0, S_PLAY_SUPERTRANS5}, // S_PLAY_SUPERTRANS4
-	{SPR_PLAY,    40,   3, {NULL},   0, 0, S_PLAY_SUPERTRANS6}, // S_PLAY_SUPERTRANS5
-	{SPR_PLAY,    41,   3, {NULL},   0, 0, S_PLAY_SUPERTRANS7}, // S_PLAY_SUPERTRANS6
-	{SPR_PLAY,    42,   3, {NULL},   0, 0, S_PLAY_SUPERTRANS8}, // S_PLAY_SUPERTRANS7
-	{SPR_PLAY,    43,   3, {NULL},   0, 0, S_PLAY_SUPERTRANS9}, // S_PLAY_SUPERTRANS8
-	{SPR_PLAY,    44,  16, {NULL},   0, 0, S_PLAY_RUN1},        // S_PLAY_SUPERTRANS9
-	*/
+	{SPR_PLAY,     0,   1, NULL,   0, 0, S_KART_STND2},    // S_KART_STND1	A
+	{SPR_PLAY,     1,   1, NULL,   0, 0, S_KART_STND1},    // S_KART_STND2	B
+	{SPR_PLAY,     2,   1, NULL,   0, 0, S_KART_STND2_L},  // S_KART_STND1_L	C
+	{SPR_PLAY,     3,   1, NULL,   0, 0, S_KART_STND1_L},  // S_KART_STND2_L	D
+	{SPR_PLAY,     4,   1, NULL,   0, 0, S_KART_STND2_R},  // S_KART_STND1_R	E
+	{SPR_PLAY,     5,   1, NULL,   0, 0, S_KART_STND1_R},  // S_KART_STND2_R	F
+	{SPR_PLAY,     9,   1, NULL,   0, 0, S_KART_WALK2},    // S_KART_WALK1	J
+	{SPR_PLAY,     6,   1, NULL,   0, 0, S_KART_WALK1},    // S_KART_WALK2	G
+	{SPR_PLAY,    10,   1, NULL,   0, 0, S_KART_WALK2_L},  // S_KART_WALK1_L	K
+	{SPR_PLAY,     7,   1, NULL,   0, 0, S_KART_WALK1_L},  // S_KART_WALK2_L	H
+	{SPR_PLAY,    11,   1, NULL,   0, 0, S_KART_WALK2_R},  // S_KART_WALK1_R	L
+	{SPR_PLAY,     8,   1, NULL,   0, 0, S_KART_WALK1_R},  // S_KART_WALK2_R	I
+	{SPR_PLAY,     0,   1, NULL,   0, 0, S_KART_RUN2},     // S_KART_RUN1		A
+	{SPR_PLAY,     9,   1, NULL,   0, 0, S_KART_RUN1},     // S_KART_RUN2		J
+	{SPR_PLAY,     2,   1, NULL,   0, 0, S_KART_RUN2_L},   // S_KART_RUN1_L	C
+	{SPR_PLAY,    10,   1, NULL,   0, 0, S_KART_RUN1_L},   // S_KART_RUN2_L	K
+	{SPR_PLAY,     4,   1, NULL,   0, 0, S_KART_RUN2_R},   // S_KART_RUN1_R	E
+	{SPR_PLAY,    11,   1, NULL,   0, 0, S_KART_RUN1_R},   // S_KART_RUN2_R	L
+	{SPR_PLAY,    12,   1, NULL,   0, 0, S_KART_DRIFT2_L}, // S_KART_DRIFT1_L	M
+	{SPR_PLAY,    13,   1, NULL,   0, 0, S_KART_DRIFT1_L}, // S_KART_DRIFT2_L	N
+	{SPR_PLAY,    14,   1, NULL,   0, 0, S_KART_DRIFT2_R}, // S_KART_DRIFT1_R	O
+	{SPR_PLAY,    15,   1, NULL,   0, 0, S_KART_DRIFT1_R}, // S_KART_DRIFT2_R	P
+	{SPR_PLAY,    16,  -1, NULL,   0, 0, S_KART_SPIN},     // S_KART_SPIN		Q
+	{SPR_PLAY,    16, 350, NULL,   0, 0, S_KART_STND1},    // S_KART_PAIN		Q
+	{SPR_PLAY,    17, 350, NULL,   0, 0, S_KART_STND1},    // S_KART_SQUISH	R
 
-	{SPR_NULL, 0, -1, {NULL}, 0, 0, S_OBJPLACE_DUMMY}, //S_OBJPLACE_DUMMY
+	{SPR_NULL, 0, -1, NULL, 0, 0, S_OBJPLACE_DUMMY}, //S_OBJPLACE_DUMMY
 
 	// 1-Up Box Sprites (uses player sprite)
 	// Kart: hide for now, fix for R2
-	{SPR_NULL,  0,  2, {NULL}, 0, 18, S_PLAY_BOX2},  // S_PLAY_BOX1
-	{SPR_NULL,  0,  1, {NULL}, 0, 18, S_PLAY_BOX1},  // S_PLAY_BOX2
-	{SPR_NULL,  0,  4, {NULL}, 0,  4, S_PLAY_ICON2}, // S_PLAY_ICON1
-	{SPR_NULL,  0, 12, {NULL}, 0,  4, S_PLAY_ICON3}, // S_PLAY_ICON2
-	{SPR_NULL,  0, 18, {NULL}, 0,  4, S_NULL},       // S_PLAY_ICON3
+	{SPR_NULL,  0,  2, NULL, 0, 18, S_PLAY_BOX2},  // S_PLAY_BOX1
+	{SPR_NULL,  0,  1, NULL, 0, 18, S_PLAY_BOX1},  // S_PLAY_BOX2
+	{SPR_NULL,  0,  4, NULL, 0,  4, S_PLAY_ICON2}, // S_PLAY_ICON1
+	{SPR_NULL,  0, 12, NULL, 0,  4, S_PLAY_ICON3}, // S_PLAY_ICON2
+	{SPR_NULL,  0, 18, NULL, 0,  4, S_NULL},       // S_PLAY_ICON3
 
 	// Level end sign (uses player sprite)
-	{SPR_PLAY, 18, 1, {NULL}, 0, 24, S_PLAY_SIGN},         // S_PLAY_SIGN	S
+	{SPR_PLAY, 18, 1, NULL, 0, 24, S_PLAY_SIGN},         // S_PLAY_SIGN	S
 
 	// Blue Crawla
-	{SPR_POSS, 0, 5, {A_Look}, 0, 0, S_POSS_STND},   // S_POSS_STND
-	{SPR_POSS, 0, 3, {A_Chase}, 0, 0, S_POSS_RUN2},   // S_POSS_RUN1
-	{SPR_POSS, 1, 3, {A_Chase}, 0, 0, S_POSS_RUN3},   // S_POSS_RUN2
-	{SPR_POSS, 2, 3, {A_Chase}, 0, 0, S_POSS_RUN4},   // S_POSS_RUN3
-	{SPR_POSS, 3, 3, {A_Chase}, 0, 0, S_POSS_RUN5},   // S_POSS_RUN4
-	{SPR_POSS, 4, 3, {A_Chase}, 0, 0, S_POSS_RUN6},   // S_POSS_RUN5
-	{SPR_POSS, 5, 3, {A_Chase}, 0, 0, S_POSS_RUN1},   // S_POSS_RUN6
+	{SPR_POSS, 0, 5, A_Look, 0, 0, S_POSS_STND},   // S_POSS_STND
+	{SPR_POSS, 0, 3, A_Chase, 0, 0, S_POSS_RUN2},   // S_POSS_RUN1
+	{SPR_POSS, 1, 3, A_Chase, 0, 0, S_POSS_RUN3},   // S_POSS_RUN2
+	{SPR_POSS, 2, 3, A_Chase, 0, 0, S_POSS_RUN4},   // S_POSS_RUN3
+	{SPR_POSS, 3, 3, A_Chase, 0, 0, S_POSS_RUN5},   // S_POSS_RUN4
+	{SPR_POSS, 4, 3, A_Chase, 0, 0, S_POSS_RUN6},   // S_POSS_RUN5
+	{SPR_POSS, 5, 3, A_Chase, 0, 0, S_POSS_RUN1},   // S_POSS_RUN6
 
 	// Red Crawla
-	{SPR_SPOS, 0, 5, {A_Look}, 0, 0, S_SPOS_STND},   // S_SPOS_STND
-	{SPR_SPOS, 0, 1, {A_Chase}, 0, 0, S_SPOS_RUN2},   // S_SPOS_RUN1
-	{SPR_SPOS, 1, 1, {A_Chase}, 0, 0, S_SPOS_RUN3},   // S_SPOS_RUN2
-	{SPR_SPOS, 2, 1, {A_Chase}, 0, 0, S_SPOS_RUN4},   // S_SPOS_RUN3
-	{SPR_SPOS, 3, 1, {A_Chase}, 0, 0, S_SPOS_RUN5},   // S_SPOS_RUN4
-	{SPR_SPOS, 4, 1, {A_Chase}, 0, 0, S_SPOS_RUN6},   // S_SPOS_RUN5
-	{SPR_SPOS, 5, 1, {A_Chase}, 0, 0, S_SPOS_RUN1},   // S_SPOS_RUN6
+	{SPR_SPOS, 0, 5, A_Look, 0, 0, S_SPOS_STND},   // S_SPOS_STND
+	{SPR_SPOS, 0, 1, A_Chase, 0, 0, S_SPOS_RUN2},   // S_SPOS_RUN1
+	{SPR_SPOS, 1, 1, A_Chase, 0, 0, S_SPOS_RUN3},   // S_SPOS_RUN2
+	{SPR_SPOS, 2, 1, A_Chase, 0, 0, S_SPOS_RUN4},   // S_SPOS_RUN3
+	{SPR_SPOS, 3, 1, A_Chase, 0, 0, S_SPOS_RUN5},   // S_SPOS_RUN4
+	{SPR_SPOS, 4, 1, A_Chase, 0, 0, S_SPOS_RUN6},   // S_SPOS_RUN5
+	{SPR_SPOS, 5, 1, A_Chase, 0, 0, S_SPOS_RUN1},   // S_SPOS_RUN6
 
 	// Greenflower Fish
-	{SPR_FISH, 1, 1, {NULL}, 0, 0, S_FISH2},         // S_FISH1
-	{SPR_FISH, 1, 1, {A_FishJump}, 0, 0, S_FISH1},   // S_FISH2
-	{SPR_FISH, 0, 1, {NULL}, 0, 0, S_FISH4},         // S_FISH3
-	{SPR_FISH, 0, 1, {A_FishJump}, 0, 0, S_FISH3},   // S_FISH4
+	{SPR_FISH, 1, 1, NULL, 0, 0, S_FISH2},         // S_FISH1
+	{SPR_FISH, 1, 1, A_FishJump, 0, 0, S_FISH1},   // S_FISH2
+	{SPR_FISH, 0, 1, NULL, 0, 0, S_FISH4},         // S_FISH3
+	{SPR_FISH, 0, 1, A_FishJump, 0, 0, S_FISH3},   // S_FISH4
 
 	// Gold Buzz
-	{SPR_BUZZ, 0, 2, {A_Look}, 0, 0, S_BUZZLOOK2},   // S_BUZZLOOK1
-	{SPR_BUZZ, 1, 2, {A_Look}, 0, 0, S_BUZZLOOK1},   // S_BUZZLOOK2
-	{SPR_BUZZ, 0, 2, {A_BuzzFly}, sfx_buzz4, 0, S_BUZZFLY2}, // S_BUZZFLY1
-	{SPR_BUZZ, 1, 2, {A_BuzzFly}, 0, 0, S_BUZZFLY1}, // S_BUZZFLY2
+	{SPR_BUZZ, 0, 2, A_Look, 0, 0, S_BUZZLOOK2},   // S_BUZZLOOK1
+	{SPR_BUZZ, 1, 2, A_Look, 0, 0, S_BUZZLOOK1},   // S_BUZZLOOK2
+	{SPR_BUZZ, 0, 2, A_BuzzFly, sfx_buzz4, 0, S_BUZZFLY2}, // S_BUZZFLY1
+	{SPR_BUZZ, 1, 2, A_BuzzFly, 0, 0, S_BUZZFLY1}, // S_BUZZFLY2
 
 	// Red Buzz
-	{SPR_RBUZ, 0, 2, {A_Look}, 0, 0, S_RBUZZLOOK2},   // S_RBUZZLOOK1
-	{SPR_RBUZ, 1, 2, {A_Look}, 0, 0, S_RBUZZLOOK1},   // S_RBUZZLOOK2
-	{SPR_RBUZ, 0, 2, {A_BuzzFly}, sfx_buzz4, 0, S_RBUZZFLY2}, // S_RBUZZFLY1
-	{SPR_RBUZ, 1, 2, {A_BuzzFly}, 0, 0, S_RBUZZFLY1}, // S_RBUZZFLY2
+	{SPR_RBUZ, 0, 2, A_Look, 0, 0, S_RBUZZLOOK2},   // S_RBUZZLOOK1
+	{SPR_RBUZ, 1, 2, A_Look, 0, 0, S_RBUZZLOOK1},   // S_RBUZZLOOK2
+	{SPR_RBUZ, 0, 2, A_BuzzFly, sfx_buzz4, 0, S_RBUZZFLY2}, // S_RBUZZFLY1
+	{SPR_RBUZ, 1, 2, A_BuzzFly, 0, 0, S_RBUZZFLY1}, // S_RBUZZFLY2
 
 	// AquaBuzz
-	{SPR_BBUZ, 0, 2, {NULL}, 0, 0, S_BBUZZFLY2}, // S_BBUZZFLY1
-	{SPR_BBUZ, 1, 2, {NULL}, 0, 0, S_BBUZZFLY1}, // S_BBUZZFLY2
+	{SPR_BBUZ, 0, 2, NULL, 0, 0, S_BBUZZFLY2}, // S_BBUZZFLY1
+	{SPR_BBUZ, 1, 2, NULL, 0, 0, S_BBUZZFLY1}, // S_BBUZZFLY2
 
 	// Jetty-Syn Bomber
-	{SPR_JETB, 0, 4, {A_Look}, 0, 0, S_JETBLOOK2},      // S_JETBLOOK1
-	{SPR_JETB, 1, 4, {A_Look}, 0, 0, S_JETBLOOK1},      // S_JETBLOOK2
-	{SPR_JETB, 0, 1, {A_JetbThink}, 0, 0, S_JETBZOOM2}, // S_JETBZOOM1
-	{SPR_JETB, 1, 1, {A_JetbThink}, 0, 0, S_JETBZOOM1}, // S_JETBZOOM2
+	{SPR_JETB, 0, 4, A_Look, 0, 0, S_JETBLOOK2},      // S_JETBLOOK1
+	{SPR_JETB, 1, 4, A_Look, 0, 0, S_JETBLOOK1},      // S_JETBLOOK2
+	{SPR_JETB, 0, 1, A_JetbThink, 0, 0, S_JETBZOOM2}, // S_JETBZOOM1
+	{SPR_JETB, 1, 1, A_JetbThink, 0, 0, S_JETBZOOM1}, // S_JETBZOOM2
 
 	// Jetty-Syn Gunner
-	{SPR_JETG, 0, 4, {A_Look}, 0, 0, S_JETGLOOK2},       // S_JETGLOOK1
-	{SPR_JETG, 1, 4, {A_Look}, 0, 0, S_JETGLOOK1},       // S_JETGLOOK2
-	{SPR_JETG, 0, 1, {A_JetgThink}, 0, 0, S_JETGZOOM2},  // S_JETGZOOM1
-	{SPR_JETG, 1, 1, {A_JetgThink}, 0, 0, S_JETGZOOM1},  // S_JETGZOOM2
-	{SPR_JETG, 2, 1, {A_JetgShoot}, 0, 0, S_JETGSHOOT2}, // S_JETGSHOOT1
-	{SPR_JETG, 3, 1, {NULL}, 0, 0, S_JETGZOOM1},         // S_JETGSHOOT2
+	{SPR_JETG, 0, 4, A_Look, 0, 0, S_JETGLOOK2},       // S_JETGLOOK1
+	{SPR_JETG, 1, 4, A_Look, 0, 0, S_JETGLOOK1},       // S_JETGLOOK2
+	{SPR_JETG, 0, 1, A_JetgThink, 0, 0, S_JETGZOOM2},  // S_JETGZOOM1
+	{SPR_JETG, 1, 1, A_JetgThink, 0, 0, S_JETGZOOM1},  // S_JETGZOOM2
+	{SPR_JETG, 2, 1, A_JetgShoot, 0, 0, S_JETGSHOOT2}, // S_JETGSHOOT1
+	{SPR_JETG, 3, 1, NULL, 0, 0, S_JETGZOOM1},         // S_JETGSHOOT2
 
 	// Crawla Commander
-	{SPR_CCOM, 0, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND2}, // S_CCOMMAND1
-	{SPR_CCOM, 1, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND1}, // S_CCOMMAND2
-	{SPR_CCOM, 2, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND4}, // S_CCOMMAND3
-	{SPR_CCOM, 3, 1, {A_CrawlaCommanderThink}, 0, 15*FRACUNIT, S_CCOMMAND3}, // S_CCOMMAND4
+	{SPR_CCOM, 0, 1, A_CrawlaCommanderThink, 0, 15*FRACUNIT, S_CCOMMAND2}, // S_CCOMMAND1
+	{SPR_CCOM, 1, 1, A_CrawlaCommanderThink, 0, 15*FRACUNIT, S_CCOMMAND1}, // S_CCOMMAND2
+	{SPR_CCOM, 2, 1, A_CrawlaCommanderThink, 0, 15*FRACUNIT, S_CCOMMAND4}, // S_CCOMMAND3
+	{SPR_CCOM, 3, 1, A_CrawlaCommanderThink, 0, 15*FRACUNIT, S_CCOMMAND3}, // S_CCOMMAND4
 
 	// Deton
-	{SPR_DETN, 0, 35, {A_Look}, 0, 0, S_DETON1},       // S_DETON1
-	{SPR_DETN, 0,  1, {A_DetonChase}, 0, 0, S_DETON3},  // S_DETON2
-	{SPR_DETN, 1,  1, {A_DetonChase}, 0, 0, S_DETON4},  // S_DETON3
-	{SPR_DETN, 2,  1, {A_DetonChase}, 0, 0, S_DETON5},  // S_DETON4
-	{SPR_DETN, 3,  1, {A_DetonChase}, 0, 0, S_DETON6},  // S_DETON5
-	{SPR_DETN, 4,  1, {A_DetonChase}, 0, 0, S_DETON7},  // S_DETON6
-	{SPR_DETN, 5,  1, {A_DetonChase}, 0, 0, S_DETON8},  // S_DETON7
-	{SPR_DETN, 6,  1, {A_DetonChase}, 0, 0, S_DETON9},  // S_DETON8
-	{SPR_DETN, 7,  1, {A_DetonChase}, 0, 0, S_DETON10}, // S_DETON9
-	{SPR_DETN, 6,  1, {A_DetonChase}, 0, 0, S_DETON11}, // S_DETON10
-	{SPR_DETN, 5,  1, {A_DetonChase}, 0, 0, S_DETON12}, // S_DETON11
-	{SPR_DETN, 4,  1, {A_DetonChase}, 0, 0, S_DETON13}, // S_DETON12
-	{SPR_DETN, 3,  1, {A_DetonChase}, 0, 0, S_DETON14}, // S_DETON13
-	{SPR_DETN, 2,  1, {A_DetonChase}, 0, 0, S_DETON15}, // S_DETON14
-	{SPR_DETN, 1,  1, {A_DetonChase}, 0, 0, S_DETON2},  // S_DETON15
-	{SPR_DETN, 0, -1, {NULL},         0, 0, S_DETON16}, // S_DETON16
+	{SPR_DETN, 0, 35, A_Look, 0, 0, S_DETON1},       // S_DETON1
+	{SPR_DETN, 0,  1, A_DetonChase, 0, 0, S_DETON3},  // S_DETON2
+	{SPR_DETN, 1,  1, A_DetonChase, 0, 0, S_DETON4},  // S_DETON3
+	{SPR_DETN, 2,  1, A_DetonChase, 0, 0, S_DETON5},  // S_DETON4
+	{SPR_DETN, 3,  1, A_DetonChase, 0, 0, S_DETON6},  // S_DETON5
+	{SPR_DETN, 4,  1, A_DetonChase, 0, 0, S_DETON7},  // S_DETON6
+	{SPR_DETN, 5,  1, A_DetonChase, 0, 0, S_DETON8},  // S_DETON7
+	{SPR_DETN, 6,  1, A_DetonChase, 0, 0, S_DETON9},  // S_DETON8
+	{SPR_DETN, 7,  1, A_DetonChase, 0, 0, S_DETON10}, // S_DETON9
+	{SPR_DETN, 6,  1, A_DetonChase, 0, 0, S_DETON11}, // S_DETON10
+	{SPR_DETN, 5,  1, A_DetonChase, 0, 0, S_DETON12}, // S_DETON11
+	{SPR_DETN, 4,  1, A_DetonChase, 0, 0, S_DETON13}, // S_DETON12
+	{SPR_DETN, 3,  1, A_DetonChase, 0, 0, S_DETON14}, // S_DETON13
+	{SPR_DETN, 2,  1, A_DetonChase, 0, 0, S_DETON15}, // S_DETON14
+	{SPR_DETN, 1,  1, A_DetonChase, 0, 0, S_DETON2},  // S_DETON15
+	{SPR_DETN, 0, -1, NULL,         0, 0, S_DETON16}, // S_DETON16
 
 	// Skim Mine Dropper
-	{SPR_SKIM, 0,  1, {A_SkimChase}, 0, 0, S_SKIM2},    // S_SKIM1
-	{SPR_SKIM, 0,  1, {A_SkimChase}, 0, 0, S_SKIM1},    // S_SKIM2
-	{SPR_SKIM, 0, 14,        {NULL}, 0, 0, S_SKIM4},    // S_SKIM3
-	{SPR_SKIM, 0, 14,  {A_DropMine}, 0, 0, S_SKIM1},    // S_SKIM4
+	{SPR_SKIM, 0,  1, A_SkimChase, 0, 0, S_SKIM2},    // S_SKIM1
+	{SPR_SKIM, 0,  1, A_SkimChase, 0, 0, S_SKIM1},    // S_SKIM2
+	{SPR_SKIM, 0, 14,        NULL, 0, 0, S_SKIM4},    // S_SKIM3
+	{SPR_SKIM, 0, 14,  A_DropMine, 0, 0, S_SKIM1},    // S_SKIM4
 
 	// THZ Turret
-	{SPR_TRET, FF_FULLBRIGHT, 105, {A_TurretStop}, 0, 0, S_TURRETFIRE},   // S_TURRET
-	{SPR_TRET, FF_FULLBRIGHT, 105, {A_TurretFire}, 0, 0, S_TURRET},       // S_TURRETFIRE
-	{SPR_TRET, FF_FULLBRIGHT|1, 7, {A_Pain}, 0, 0, S_TURRETSHOCK2},       // S_TURRETSHOCK1
-	{SPR_TRET, FF_FULLBRIGHT|2, 7, {NULL}, 0, 0, S_TURRETSHOCK3},         // S_TURRETSHOCK2
-	{SPR_TRET, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_TURRETSHOCK4},         // S_TURRETSHOCK3
-	{SPR_TRET, FF_FULLBRIGHT|4, 7, {NULL}, 0, 0, S_TURRETSHOCK5},         // S_TURRETSHOCK4
-	{SPR_TRET, FF_FULLBRIGHT|1, 7, {NULL}, 0, 0, S_TURRETSHOCK6},         // S_TURRETSHOCK5
-	{SPR_TRET, FF_FULLBRIGHT|2, 7, {A_Pain}, 0, 0, S_TURRETSHOCK7},       // S_TURRETSHOCK6
-	{SPR_TRET, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_TURRETSHOCK8},         // S_TURRETSHOCK7
-	{SPR_TRET, FF_FULLBRIGHT|4, 7, {NULL}, 0, 0, S_TURRETSHOCK9},         // S_TURRETSHOCK8
-	{SPR_TRET, FF_FULLBRIGHT|4, 7, {A_LinedefExecute}, 32000, 0, S_XPLD1}, // S_TURRETSHOCK9
+	{SPR_TRET, FF_FULLBRIGHT, 105, A_TurretStop, 0, 0, S_TURRETFIRE},   // S_TURRET
+	{SPR_TRET, FF_FULLBRIGHT, 105, A_TurretFire, 0, 0, S_TURRET},       // S_TURRETFIRE
+	{SPR_TRET, FF_FULLBRIGHT|1, 7, A_Pain, 0, 0, S_TURRETSHOCK2},       // S_TURRETSHOCK1
+	{SPR_TRET, FF_FULLBRIGHT|2, 7, NULL, 0, 0, S_TURRETSHOCK3},         // S_TURRETSHOCK2
+	{SPR_TRET, FF_FULLBRIGHT|3, 7, NULL, 0, 0, S_TURRETSHOCK4},         // S_TURRETSHOCK3
+	{SPR_TRET, FF_FULLBRIGHT|4, 7, NULL, 0, 0, S_TURRETSHOCK5},         // S_TURRETSHOCK4
+	{SPR_TRET, FF_FULLBRIGHT|1, 7, NULL, 0, 0, S_TURRETSHOCK6},         // S_TURRETSHOCK5
+	{SPR_TRET, FF_FULLBRIGHT|2, 7, A_Pain, 0, 0, S_TURRETSHOCK7},       // S_TURRETSHOCK6
+	{SPR_TRET, FF_FULLBRIGHT|3, 7, NULL, 0, 0, S_TURRETSHOCK8},         // S_TURRETSHOCK7
+	{SPR_TRET, FF_FULLBRIGHT|4, 7, NULL, 0, 0, S_TURRETSHOCK9},         // S_TURRETSHOCK8
+	{SPR_TRET, FF_FULLBRIGHT|4, 7, A_LinedefExecute, 32000, 0, S_XPLD1}, // S_TURRETSHOCK9
 
-	{SPR_TURR, 0, 1, {A_Look}, 1, 0, S_TURRETPOPDOWN8},          // S_TURRETLOOK
-	{SPR_TURR, 0, 0, {A_FaceTarget}, 0, 0, S_TURRETPOPUP1},  // S_TURRETSEE
-	{SPR_TURR, 1, 2, {A_Pain}, 0, 0, S_TURRETPOPUP2},  // S_TURRETPOPUP1
-	{SPR_TURR, 2, 2, {NULL}, 0, 0, S_TURRETPOPUP3},  // S_TURRETPOPUP2
-	{SPR_TURR, 3, 2, {NULL}, 0, 0, S_TURRETPOPUP4},  // S_TURRETPOPUP3
-	{SPR_TURR, 4, 2, {NULL}, 0, 0, S_TURRETPOPUP5},  // S_TURRETPOPUP4
-	{SPR_TURR, 5, 2, {NULL}, 0, 0, S_TURRETPOPUP6},  // S_TURRETPOPUP5
-	{SPR_TURR, 6, 2, {NULL}, 0, 0, S_TURRETPOPUP7},  // S_TURRETPOPUP6
-	{SPR_TURR, 7, 2, {NULL}, 0, 0, S_TURRETPOPUP8},  // S_TURRETPOPUP7
-	{SPR_TURR, 8, 14,{NULL}, 0, 0, S_TURRETSHOOT},   // S_TURRETPOPUP8
-	{SPR_TURR, 8, 14,{A_JetgShoot}, 0, 0, S_TURRETPOPDOWN1}, // S_TURRETSHOOT
-	{SPR_TURR, 7, 2, {A_Pain}, 0, 0, S_TURRETPOPDOWN2},        // S_TURRETPOPDOWN1
-	{SPR_TURR, 6, 2, {NULL}, 0, 0, S_TURRETPOPDOWN3},        // S_TURRETPOPDOWN2
-	{SPR_TURR, 5, 2, {NULL}, 0, 0, S_TURRETPOPDOWN4},        // S_TURRETPOPDOWN3
-	{SPR_TURR, 4, 2, {NULL}, 0, 0, S_TURRETPOPDOWN5},        // S_TURRETPOPDOWN4
-	{SPR_TURR, 3, 2, {NULL}, 0, 0, S_TURRETPOPDOWN6},        // S_TURRETPOPDOWN5
-	{SPR_TURR, 2, 2, {NULL}, 0, 0, S_TURRETPOPDOWN7},        // S_TURRETPOPDOWN6
-	{SPR_TURR, 1, 2, {NULL}, 0, 0, S_TURRETPOPDOWN8},        // S_TURRETPOPDOWN7
-	{SPR_TURR, 0, 69,{A_SetTics}, 0, 1, S_TURRETLOOK},       // S_TURRETPOPDOWN8
+	{SPR_TURR, 0, 1, A_Look, 1, 0, S_TURRETPOPDOWN8},          // S_TURRETLOOK
+	{SPR_TURR, 0, 0, A_FaceTarget, 0, 0, S_TURRETPOPUP1},  // S_TURRETSEE
+	{SPR_TURR, 1, 2, A_Pain, 0, 0, S_TURRETPOPUP2},  // S_TURRETPOPUP1
+	{SPR_TURR, 2, 2, NULL, 0, 0, S_TURRETPOPUP3},  // S_TURRETPOPUP2
+	{SPR_TURR, 3, 2, NULL, 0, 0, S_TURRETPOPUP4},  // S_TURRETPOPUP3
+	{SPR_TURR, 4, 2, NULL, 0, 0, S_TURRETPOPUP5},  // S_TURRETPOPUP4
+	{SPR_TURR, 5, 2, NULL, 0, 0, S_TURRETPOPUP6},  // S_TURRETPOPUP5
+	{SPR_TURR, 6, 2, NULL, 0, 0, S_TURRETPOPUP7},  // S_TURRETPOPUP6
+	{SPR_TURR, 7, 2, NULL, 0, 0, S_TURRETPOPUP8},  // S_TURRETPOPUP7
+	{SPR_TURR, 8, 14,NULL, 0, 0, S_TURRETSHOOT},   // S_TURRETPOPUP8
+	{SPR_TURR, 8, 14,A_JetgShoot, 0, 0, S_TURRETPOPDOWN1}, // S_TURRETSHOOT
+	{SPR_TURR, 7, 2, A_Pain, 0, 0, S_TURRETPOPDOWN2},        // S_TURRETPOPDOWN1
+	{SPR_TURR, 6, 2, NULL, 0, 0, S_TURRETPOPDOWN3},        // S_TURRETPOPDOWN2
+	{SPR_TURR, 5, 2, NULL, 0, 0, S_TURRETPOPDOWN4},        // S_TURRETPOPDOWN3
+	{SPR_TURR, 4, 2, NULL, 0, 0, S_TURRETPOPDOWN5},        // S_TURRETPOPDOWN4
+	{SPR_TURR, 3, 2, NULL, 0, 0, S_TURRETPOPDOWN6},        // S_TURRETPOPDOWN5
+	{SPR_TURR, 2, 2, NULL, 0, 0, S_TURRETPOPDOWN7},        // S_TURRETPOPDOWN6
+	{SPR_TURR, 1, 2, NULL, 0, 0, S_TURRETPOPDOWN8},        // S_TURRETPOPDOWN7
+	{SPR_TURR, 0, 69,A_SetTics, 0, 1, S_TURRETLOOK},       // S_TURRETPOPDOWN8
 
 	// Sharp
-	{SPR_SHRP, 0, 1, {A_Look},       0, 0, S_SHARP_ROAM1}, // S_SHARP_ROAM1,
-	{SPR_SHRP, 0, 1, {A_SharpChase}, 0, 0, S_SHARP_ROAM2}, // S_SHARP_ROAM2,
-	{SPR_SHRP, 1, 2, {A_FaceTarget}, 0, 0, S_SHARP_AIM2}, // S_SHARP_AIM1,
-	{SPR_SHRP, 2, 2, {A_FaceTarget}, 0, 0, S_SHARP_AIM3}, // S_SHARP_AIM2,
-	{SPR_SHRP, 3, 2, {A_FaceTarget}, 0, 0, S_SHARP_AIM4}, // S_SHARP_AIM3,
-	{SPR_SHRP, 4, 7, {A_FaceTarget}, 0, 0, S_SHARP_SPIN}, // S_SHARP_AIM4,
-	{SPR_SHRP, 4, 1, {A_SharpSpin},  0, 0, S_SHARP_SPIN}, // S_SHARP_SPIN,
+	{SPR_SHRP, 0, 1, A_Look,       0, 0, S_SHARP_ROAM1}, // S_SHARP_ROAM1,
+	{SPR_SHRP, 0, 1, A_SharpChase, 0, 0, S_SHARP_ROAM2}, // S_SHARP_ROAM2,
+	{SPR_SHRP, 1, 2, A_FaceTarget, 0, 0, S_SHARP_AIM2}, // S_SHARP_AIM1,
+	{SPR_SHRP, 2, 2, A_FaceTarget, 0, 0, S_SHARP_AIM3}, // S_SHARP_AIM2,
+	{SPR_SHRP, 3, 2, A_FaceTarget, 0, 0, S_SHARP_AIM4}, // S_SHARP_AIM3,
+	{SPR_SHRP, 4, 7, A_FaceTarget, 0, 0, S_SHARP_SPIN}, // S_SHARP_AIM4,
+	{SPR_SHRP, 4, 1, A_SharpSpin,  0, 0, S_SHARP_SPIN}, // S_SHARP_SPIN,
 
 	// Jet Jaw
-	{SPR_JJAW, 0, 1, {A_JetJawRoam},  0, 0, S_JETJAW_ROAM2},   // S_JETJAW_ROAM1
-	{SPR_JJAW, 0, 1, {A_JetJawRoam},  0, 0, S_JETJAW_ROAM3},   // S_JETJAW_ROAM2
-	{SPR_JJAW, 0, 1, {A_JetJawRoam},  0, 0, S_JETJAW_ROAM4},   // S_JETJAW_ROAM3
-	{SPR_JJAW, 0, 1, {A_JetJawRoam},  0, 0, S_JETJAW_ROAM5},   // S_JETJAW_ROAM4
-	{SPR_JJAW, 1, 1, {A_JetJawRoam},  0, 0, S_JETJAW_ROAM6},   // S_JETJAW_ROAM5
-	{SPR_JJAW, 1, 1, {A_JetJawRoam},  0, 0, S_JETJAW_ROAM7},   // S_JETJAW_ROAM6
-	{SPR_JJAW, 1, 1, {A_JetJawRoam},  0, 0, S_JETJAW_ROAM8},   // S_JETJAW_ROAM7
-	{SPR_JJAW, 1, 1, {A_JetJawRoam},  0, 0, S_JETJAW_ROAM1},   // S_JETJAW_ROAM8
-	{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP2},  // S_JETJAW_CHOMP1
-	{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP3},  // S_JETJAW_CHOMP2
-	{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP4},  // S_JETJAW_CHOMP3
-	{SPR_JJAW, 0, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP5},  // S_JETJAW_CHOMP4
-	{SPR_JJAW, 1, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP6},  // S_JETJAW_CHOMP5
-	{SPR_JJAW, 1, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP7},  // S_JETJAW_CHOMP6
-	{SPR_JJAW, 1, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP8},  // S_JETJAW_CHOMP7
-	{SPR_JJAW, 1, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP9},  // S_JETJAW_CHOMP8
-	{SPR_JJAW, 2, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP10}, // S_JETJAW_CHOMP9
-	{SPR_JJAW, 2, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP11}, // S_JETJAW_CHOMP10
-	{SPR_JJAW, 2, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP12}, // S_JETJAW_CHOMP11
-	{SPR_JJAW, 2, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP13}, // S_JETJAW_CHOMP12
-	{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP14}, // S_JETJAW_CHOMP13
-	{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP15}, // S_JETJAW_CHOMP14
-	{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP16}, // S_JETJAW_CHOMP15
-	{SPR_JJAW, 3, 1, {A_JetJawChomp}, 0, 0, S_JETJAW_CHOMP1},  // S_JETJAW_CHOMP16
+	{SPR_JJAW, 0, 1, A_JetJawRoam,  0, 0, S_JETJAW_ROAM2},   // S_JETJAW_ROAM1
+	{SPR_JJAW, 0, 1, A_JetJawRoam,  0, 0, S_JETJAW_ROAM3},   // S_JETJAW_ROAM2
+	{SPR_JJAW, 0, 1, A_JetJawRoam,  0, 0, S_JETJAW_ROAM4},   // S_JETJAW_ROAM3
+	{SPR_JJAW, 0, 1, A_JetJawRoam,  0, 0, S_JETJAW_ROAM5},   // S_JETJAW_ROAM4
+	{SPR_JJAW, 1, 1, A_JetJawRoam,  0, 0, S_JETJAW_ROAM6},   // S_JETJAW_ROAM5
+	{SPR_JJAW, 1, 1, A_JetJawRoam,  0, 0, S_JETJAW_ROAM7},   // S_JETJAW_ROAM6
+	{SPR_JJAW, 1, 1, A_JetJawRoam,  0, 0, S_JETJAW_ROAM8},   // S_JETJAW_ROAM7
+	{SPR_JJAW, 1, 1, A_JetJawRoam,  0, 0, S_JETJAW_ROAM1},   // S_JETJAW_ROAM8
+	{SPR_JJAW, 0, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP2},  // S_JETJAW_CHOMP1
+	{SPR_JJAW, 0, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP3},  // S_JETJAW_CHOMP2
+	{SPR_JJAW, 0, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP4},  // S_JETJAW_CHOMP3
+	{SPR_JJAW, 0, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP5},  // S_JETJAW_CHOMP4
+	{SPR_JJAW, 1, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP6},  // S_JETJAW_CHOMP5
+	{SPR_JJAW, 1, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP7},  // S_JETJAW_CHOMP6
+	{SPR_JJAW, 1, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP8},  // S_JETJAW_CHOMP7
+	{SPR_JJAW, 1, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP9},  // S_JETJAW_CHOMP8
+	{SPR_JJAW, 2, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP10}, // S_JETJAW_CHOMP9
+	{SPR_JJAW, 2, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP11}, // S_JETJAW_CHOMP10
+	{SPR_JJAW, 2, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP12}, // S_JETJAW_CHOMP11
+	{SPR_JJAW, 2, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP13}, // S_JETJAW_CHOMP12
+	{SPR_JJAW, 3, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP14}, // S_JETJAW_CHOMP13
+	{SPR_JJAW, 3, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP15}, // S_JETJAW_CHOMP14
+	{SPR_JJAW, 3, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP16}, // S_JETJAW_CHOMP15
+	{SPR_JJAW, 3, 1, A_JetJawChomp, 0, 0, S_JETJAW_CHOMP1},  // S_JETJAW_CHOMP16
 
 	// Snailer
-	{SPR_SNLR, 0, 1, {A_SnailerThink}, 0, 0, S_SNAILER1}, // S_SNAILER1
+	{SPR_SNLR, 0, 1, A_SnailerThink, 0, 0, S_SNAILER1}, // S_SNAILER1
 
 	// Vulture
-	{SPR_VLTR, 4, 35,        {A_Look},  1, 0, S_VULTURE_STND},  // S_VULTURE_STND
-	{SPR_VLTR, 4, 1,  {A_VultureVtol},  0, 0, S_VULTURE_VTOL2}, // S_VULTURE_VTOL1
-	{SPR_VLTR, 5, 1,  {A_VultureVtol},  0, 0, S_VULTURE_VTOL3}, // S_VULTURE_VTOL2
-	{SPR_VLTR, 6, 1,  {A_VultureVtol},  0, 0, S_VULTURE_VTOL4}, // S_VULTURE_VTOL3
-	{SPR_VLTR, 7, 1,  {A_VultureVtol},  0, 0, S_VULTURE_VTOL1}, // S_VULTURE_VTOL4
-	{SPR_VLTR, 0, 1,       {A_Thrust}, 30, 1, S_VULTURE_ZOOM2}, // S_VULTURE_ZOOM1
-	{SPR_VLTR, 0, 1, {A_VultureCheck},  0, 0, S_VULTURE_ZOOM3}, // S_VULTURE_ZOOM2
-	{SPR_VLTR, 1, 1, {A_VultureCheck},  0, 0, S_VULTURE_ZOOM4}, // S_VULTURE_ZOOM3
-	{SPR_VLTR, 2, 1, {A_VultureCheck},  0, 0, S_VULTURE_ZOOM5}, // S_VULTURE_ZOOM4
-	{SPR_VLTR, 3, 1, {A_VultureCheck},  0, 0, S_VULTURE_ZOOM2}, // S_VULTURE_ZOOM5
+	{SPR_VLTR, 4, 35,        A_Look,  1, 0, S_VULTURE_STND},  // S_VULTURE_STND
+	{SPR_VLTR, 4, 1,  A_VultureVtol,  0, 0, S_VULTURE_VTOL2}, // S_VULTURE_VTOL1
+	{SPR_VLTR, 5, 1,  A_VultureVtol,  0, 0, S_VULTURE_VTOL3}, // S_VULTURE_VTOL2
+	{SPR_VLTR, 6, 1,  A_VultureVtol,  0, 0, S_VULTURE_VTOL4}, // S_VULTURE_VTOL3
+	{SPR_VLTR, 7, 1,  A_VultureVtol,  0, 0, S_VULTURE_VTOL1}, // S_VULTURE_VTOL4
+	{SPR_VLTR, 0, 1,       A_Thrust, 30, 1, S_VULTURE_ZOOM2}, // S_VULTURE_ZOOM1
+	{SPR_VLTR, 0, 1, A_VultureCheck,  0, 0, S_VULTURE_ZOOM3}, // S_VULTURE_ZOOM2
+	{SPR_VLTR, 1, 1, A_VultureCheck,  0, 0, S_VULTURE_ZOOM4}, // S_VULTURE_ZOOM3
+	{SPR_VLTR, 2, 1, A_VultureCheck,  0, 0, S_VULTURE_ZOOM5}, // S_VULTURE_ZOOM4
+	{SPR_VLTR, 3, 1, A_VultureCheck,  0, 0, S_VULTURE_ZOOM2}, // S_VULTURE_ZOOM5
 
 	// Pointy
-	{SPR_PNTY, 0,  1, {A_PointyThink}, 0, 0, S_POINTY1}, // S_POINTY1
+	{SPR_PNTY, 0,  1, A_PointyThink, 0, 0, S_POINTY1}, // S_POINTY1
 
 	// Pointy Ball
-	{SPR_PNTY, 1,  1, {A_CheckBuddy}, 0, 0, S_POINTYBALL1}, // S_POINTYBALL1
+	{SPR_PNTY, 1,  1, A_CheckBuddy, 0, 0, S_POINTYBALL1}, // S_POINTYBALL1
 
 	// Robo-Hood
-	{SPR_ARCH, 0, 14,       {A_Look}, (512<<16),   0, S_ROBOHOOD_LOOK},  // S_ROBOHOOD_LOOK
-	{SPR_ARCH, 2,  1,  {A_HoodThink},         0,   0, S_ROBOHOOD_STND},  // S_ROBOHOOD_STND
-	{SPR_ARCH, 0, 35,   {A_FireShot},  MT_ARROW, -24, S_ROBOHOOD_STND},  // S_ROBOHOOD_SHOOT
-	{SPR_ARCH, 1,  1,   {A_BunnyHop},         8,   5, S_ROBOHOOD_JUMP2}, // S_ROBOHOOD_JUMP
-	{SPR_ARCH, 1,  1,  {A_HoodThink},         0,   0, S_ROBOHOOD_JUMP2}, // S_ROBOHOOD_JUMP2
-	{SPR_ARCH, 0,  1,  {A_HoodThink},         0,   0, S_ROBOHOOD_FALL},  // S_ROBOHOOD_FALL
+	{SPR_ARCH, 0, 14,       A_Look, (512<<16),   0, S_ROBOHOOD_LOOK},  // S_ROBOHOOD_LOOK
+	{SPR_ARCH, 2,  1,  A_HoodThink,         0,   0, S_ROBOHOOD_STND},  // S_ROBOHOOD_STND
+	{SPR_ARCH, 0, 35,   A_FireShot,  MT_ARROW, -24, S_ROBOHOOD_STND},  // S_ROBOHOOD_SHOOT
+	{SPR_ARCH, 1,  1,   A_BunnyHop,         8,   5, S_ROBOHOOD_JUMP2}, // S_ROBOHOOD_JUMP
+	{SPR_ARCH, 1,  1,  A_HoodThink,         0,   0, S_ROBOHOOD_JUMP2}, // S_ROBOHOOD_JUMP2
+	{SPR_ARCH, 0,  1,  A_HoodThink,         0,   0, S_ROBOHOOD_FALL},  // S_ROBOHOOD_FALL
 
 	// CastleBot FaceStabber
-	{SPR_CBFS, 0,  1,   {A_FaceStabChase},  0, 0, S_FACESTABBER_STND2},   // S_FACESTABBER_STND1
-	{SPR_CBFS, 1,  1,   {A_FaceStabChase},  0, 0, S_FACESTABBER_STND3},   // S_FACESTABBER_STND2
-	{SPR_CBFS, 2,  1,   {A_FaceStabChase},  0, 0, S_FACESTABBER_STND4},   // S_FACESTABBER_STND3
-	{SPR_CBFS, 3,  1,   {A_FaceStabChase},  0, 0, S_FACESTABBER_STND5},   // S_FACESTABBER_STND4
-	{SPR_CBFS, 4,  1,   {A_FaceStabChase},  0, 0, S_FACESTABBER_STND6},   // S_FACESTABBER_STND5
-	{SPR_CBFS, 5,  1,   {A_FaceStabChase},  0, 0, S_FACESTABBER_STND1},   // S_FACESTABBER_STND6
-	{SPR_CBFS, 6, 14, {A_PlayActiveSound},  0, 0, S_FACESTABBER_CHARGE2}, // S_FACESTABBER_CHARGE1
-	{SPR_CBFS, 6,  0, {A_PlayAttackSound},  0, 0, S_FACESTABBER_CHARGE3}, // S_FACESTABBER_CHARGE2
-	{SPR_CBFS, 6,  0,      {A_FaceTarget},  0, 0, S_FACESTABBER_CHARGE4}, // S_FACESTABBER_CHARGE3
-	{SPR_CBFS, 7, 35,          {A_Thrust}, 20, 1, S_FACESTABBER_STND1},   // S_FACESTABBER_CHARGE4
+	{SPR_CBFS, 0,  1,   A_FaceStabChase,  0, 0, S_FACESTABBER_STND2},   // S_FACESTABBER_STND1
+	{SPR_CBFS, 1,  1,   A_FaceStabChase,  0, 0, S_FACESTABBER_STND3},   // S_FACESTABBER_STND2
+	{SPR_CBFS, 2,  1,   A_FaceStabChase,  0, 0, S_FACESTABBER_STND4},   // S_FACESTABBER_STND3
+	{SPR_CBFS, 3,  1,   A_FaceStabChase,  0, 0, S_FACESTABBER_STND5},   // S_FACESTABBER_STND4
+	{SPR_CBFS, 4,  1,   A_FaceStabChase,  0, 0, S_FACESTABBER_STND6},   // S_FACESTABBER_STND5
+	{SPR_CBFS, 5,  1,   A_FaceStabChase,  0, 0, S_FACESTABBER_STND1},   // S_FACESTABBER_STND6
+	{SPR_CBFS, 6, 14, A_PlayActiveSound,  0, 0, S_FACESTABBER_CHARGE2}, // S_FACESTABBER_CHARGE1
+	{SPR_CBFS, 6,  0, A_PlayAttackSound,  0, 0, S_FACESTABBER_CHARGE3}, // S_FACESTABBER_CHARGE2
+	{SPR_CBFS, 6,  0,      A_FaceTarget,  0, 0, S_FACESTABBER_CHARGE4}, // S_FACESTABBER_CHARGE3
+	{SPR_CBFS, 7, 35,          A_Thrust, 20, 1, S_FACESTABBER_STND1},   // S_FACESTABBER_CHARGE4
 
 	// Egg Guard
-	{SPR_SPSH,  0,  1,       {A_Look}, 0, 0, S_EGGGUARD_STND},  // S_EGGGUARD_STND
-	{SPR_SPSH,  1,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK2}, // S_EGGGUARD_WALK1
-	{SPR_SPSH,  2,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK3}, // S_EGGGUARD_WALK2
-	{SPR_SPSH,  3,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK4}, // S_EGGGUARD_WALK3
-	{SPR_SPSH,  4,  3, {A_GuardChase}, 0, 0, S_EGGGUARD_WALK1}, // S_EGGGUARD_WALK4
-	{SPR_SPSH,  5,  5,         {NULL}, 0, 0, S_EGGGUARD_MAD2},  // S_EGGGUARD_MAD1
-	{SPR_SPSH,  6,  5,         {NULL}, 0, 0, S_EGGGUARD_MAD3},  // S_EGGGUARD_MAD2
-	{SPR_SPSH,  7, 15,         {NULL}, 0, 0, S_EGGGUARD_RUN1},  // S_EGGGUARD_MAD3
-	{SPR_SPSH,  8,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN2},  // S_EGGGUARD_RUN1
-	{SPR_SPSH,  9,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN3},  // S_EGGGUARD_RUN2
-	{SPR_SPSH, 10,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN4},  // S_EGGGUARD_RUN3
-	{SPR_SPSH, 11,  1, {A_GuardChase}, 0, 0, S_EGGGUARD_RUN1},  // S_EGGGUARD_RUN4
+	{SPR_SPSH,  0,  1,       A_Look, 0, 0, S_EGGGUARD_STND},  // S_EGGGUARD_STND
+	{SPR_SPSH,  1,  3, A_GuardChase, 0, 0, S_EGGGUARD_WALK2}, // S_EGGGUARD_WALK1
+	{SPR_SPSH,  2,  3, A_GuardChase, 0, 0, S_EGGGUARD_WALK3}, // S_EGGGUARD_WALK2
+	{SPR_SPSH,  3,  3, A_GuardChase, 0, 0, S_EGGGUARD_WALK4}, // S_EGGGUARD_WALK3
+	{SPR_SPSH,  4,  3, A_GuardChase, 0, 0, S_EGGGUARD_WALK1}, // S_EGGGUARD_WALK4
+	{SPR_SPSH,  5,  5,         NULL, 0, 0, S_EGGGUARD_MAD2},  // S_EGGGUARD_MAD1
+	{SPR_SPSH,  6,  5,         NULL, 0, 0, S_EGGGUARD_MAD3},  // S_EGGGUARD_MAD2
+	{SPR_SPSH,  7, 15,         NULL, 0, 0, S_EGGGUARD_RUN1},  // S_EGGGUARD_MAD3
+	{SPR_SPSH,  8,  1, A_GuardChase, 0, 0, S_EGGGUARD_RUN2},  // S_EGGGUARD_RUN1
+	{SPR_SPSH,  9,  1, A_GuardChase, 0, 0, S_EGGGUARD_RUN3},  // S_EGGGUARD_RUN2
+	{SPR_SPSH, 10,  1, A_GuardChase, 0, 0, S_EGGGUARD_RUN4},  // S_EGGGUARD_RUN3
+	{SPR_SPSH, 11,  1, A_GuardChase, 0, 0, S_EGGGUARD_RUN1},  // S_EGGGUARD_RUN4
 
 	// Egg Shield for Egg Guard
-	{SPR_ESHI, 0, 8, {A_EggShield}, 0, 0, S_EGGSHIELD}, // S_EGGSHIELD
+	{SPR_ESHI, 0, 8, A_EggShield, 0, 0, S_EGGSHIELD}, // S_EGGSHIELD
 
 	// Green Snapper
-	{SPR_GSNP, 0, 1,  {A_Look}, 0, 0, S_GSNAPPER_STND}, // S_GSNAPPER_STND
-	{SPR_GSNP, 0, 2, {A_Chase}, 0, 0, S_GSNAPPER2},     // S_GSNAPPER1
-	{SPR_GSNP, 1, 2, {A_Chase}, 0, 0, S_GSNAPPER3},     // S_GSNAPPER2
-	{SPR_GSNP, 2, 2, {A_Chase}, 0, 0, S_GSNAPPER4},     // S_GSNAPPER3
-	{SPR_GSNP, 3, 2, {A_Chase}, 0, 0, S_GSNAPPER1},     // S_GSNAPPER4
+	{SPR_GSNP, 0, 1,  A_Look, 0, 0, S_GSNAPPER_STND}, // S_GSNAPPER_STND
+	{SPR_GSNP, 0, 2, A_Chase, 0, 0, S_GSNAPPER2},     // S_GSNAPPER1
+	{SPR_GSNP, 1, 2, A_Chase, 0, 0, S_GSNAPPER3},     // S_GSNAPPER2
+	{SPR_GSNP, 2, 2, A_Chase, 0, 0, S_GSNAPPER4},     // S_GSNAPPER3
+	{SPR_GSNP, 3, 2, A_Chase, 0, 0, S_GSNAPPER1},     // S_GSNAPPER4
 
 	// Minus
-	{SPR_NULL,  0, 1, {A_Look},         0, 0, S_MINUS_STND},      // S_MINUS_STND
-	{SPR_MNUS, 16, 1, {A_MinusDigging}, 0, 0, S_MINUS_DIGGING},   // S_MINUS_DIGGING
-	{SPR_MNUS,  0, 1, {A_MinusPopup},   0, 0, S_MINUS_UPWARD1},   // S_MINUS_POPUP
-	{SPR_MNUS,  0, 1, {A_MinusCheck},   0, 0, S_MINUS_UPWARD2},   // S_MINUS_UPWARD1
-	{SPR_MNUS,  1, 1, {A_MinusCheck},   0, 0, S_MINUS_UPWARD3},   // S_MINUS_UPWARD2
-	{SPR_MNUS,  2, 1, {A_MinusCheck},   0, 0, S_MINUS_UPWARD4},   // S_MINUS_UPWARD3
-	{SPR_MNUS,  3, 1, {A_MinusCheck},   0, 0, S_MINUS_UPWARD5},   // S_MINUS_UPWARD4
-	{SPR_MNUS,  4, 1, {A_MinusCheck},   0, 0, S_MINUS_UPWARD6},   // S_MINUS_UPWARD5
-	{SPR_MNUS,  5, 1, {A_MinusCheck},   0, 0, S_MINUS_UPWARD7},   // S_MINUS_UPWARD6
-	{SPR_MNUS,  6, 1, {A_MinusCheck},   0, 0, S_MINUS_UPWARD8},   // S_MINUS_UPWARD7
-	{SPR_MNUS,  7, 1, {A_MinusCheck},   0, 0, S_MINUS_UPWARD1},   // S_MINUS_UPWARD8
-	{SPR_MNUS,  8, 1, {A_MinusCheck},   0, 0, S_MINUS_DOWNWARD2}, // S_MINUS_DOWNWARD1
-	{SPR_MNUS,  9, 1, {A_MinusCheck},   0, 0, S_MINUS_DOWNWARD3}, // S_MINUS_DOWNWARD2
-	{SPR_MNUS, 10, 1, {A_MinusCheck},   0, 0, S_MINUS_DOWNWARD4}, // S_MINUS_DOWNWARD3
-	{SPR_MNUS, 11, 1, {A_MinusCheck},   0, 0, S_MINUS_DOWNWARD5}, // S_MINUS_DOWNWARD4
-	{SPR_MNUS, 12, 1, {A_MinusCheck},   0, 0, S_MINUS_DOWNWARD6}, // S_MINUS_DOWNWARD5
-	{SPR_MNUS, 13, 1, {A_MinusCheck},   0, 0, S_MINUS_DOWNWARD7}, // S_MINUS_DOWNWARD6
-	{SPR_MNUS, 14, 1, {A_MinusCheck},   0, 0, S_MINUS_DOWNWARD8}, // S_MINUS_DOWNWARD7
-	{SPR_MNUS, 15, 1, {A_MinusCheck},   0, 0, S_MINUS_DOWNWARD1}, // S_MINUS_DOWNWARD8
+	{SPR_NULL,  0, 1, A_Look,         0, 0, S_MINUS_STND},      // S_MINUS_STND
+	{SPR_MNUS, 16, 1, A_MinusDigging, 0, 0, S_MINUS_DIGGING},   // S_MINUS_DIGGING
+	{SPR_MNUS,  0, 1, A_MinusPopup,   0, 0, S_MINUS_UPWARD1},   // S_MINUS_POPUP
+	{SPR_MNUS,  0, 1, A_MinusCheck,   0, 0, S_MINUS_UPWARD2},   // S_MINUS_UPWARD1
+	{SPR_MNUS,  1, 1, A_MinusCheck,   0, 0, S_MINUS_UPWARD3},   // S_MINUS_UPWARD2
+	{SPR_MNUS,  2, 1, A_MinusCheck,   0, 0, S_MINUS_UPWARD4},   // S_MINUS_UPWARD3
+	{SPR_MNUS,  3, 1, A_MinusCheck,   0, 0, S_MINUS_UPWARD5},   // S_MINUS_UPWARD4
+	{SPR_MNUS,  4, 1, A_MinusCheck,   0, 0, S_MINUS_UPWARD6},   // S_MINUS_UPWARD5
+	{SPR_MNUS,  5, 1, A_MinusCheck,   0, 0, S_MINUS_UPWARD7},   // S_MINUS_UPWARD6
+	{SPR_MNUS,  6, 1, A_MinusCheck,   0, 0, S_MINUS_UPWARD8},   // S_MINUS_UPWARD7
+	{SPR_MNUS,  7, 1, A_MinusCheck,   0, 0, S_MINUS_UPWARD1},   // S_MINUS_UPWARD8
+	{SPR_MNUS,  8, 1, A_MinusCheck,   0, 0, S_MINUS_DOWNWARD2}, // S_MINUS_DOWNWARD1
+	{SPR_MNUS,  9, 1, A_MinusCheck,   0, 0, S_MINUS_DOWNWARD3}, // S_MINUS_DOWNWARD2
+	{SPR_MNUS, 10, 1, A_MinusCheck,   0, 0, S_MINUS_DOWNWARD4}, // S_MINUS_DOWNWARD3
+	{SPR_MNUS, 11, 1, A_MinusCheck,   0, 0, S_MINUS_DOWNWARD5}, // S_MINUS_DOWNWARD4
+	{SPR_MNUS, 12, 1, A_MinusCheck,   0, 0, S_MINUS_DOWNWARD6}, // S_MINUS_DOWNWARD5
+	{SPR_MNUS, 13, 1, A_MinusCheck,   0, 0, S_MINUS_DOWNWARD7}, // S_MINUS_DOWNWARD6
+	{SPR_MNUS, 14, 1, A_MinusCheck,   0, 0, S_MINUS_DOWNWARD8}, // S_MINUS_DOWNWARD7
+	{SPR_MNUS, 15, 1, A_MinusCheck,   0, 0, S_MINUS_DOWNWARD1}, // S_MINUS_DOWNWARD8
 
 	// Spring Shell
-	{SPR_SSHL,  0,  4, {A_Look},  0, 0, S_SSHELL_STND},    // S_SSHELL_STND
-	{SPR_SSHL,  0,  4, {A_Chase}, 0, 0, S_SSHELL_RUN2},    // S_SSHELL_RUN1
-	{SPR_SSHL,  1,  4, {A_Chase}, 0, 0, S_SSHELL_RUN3},    // S_SSHELL_RUN2
-	{SPR_SSHL,  2,  4, {A_Chase}, 0, 0, S_SSHELL_RUN4},    // S_SSHELL_RUN3
-	{SPR_SSHL,  3,  4, {A_Chase}, 0, 0, S_SSHELL_RUN1},    // S_SSHELL_RUN4
-	{SPR_SSHL,  7,  4, {A_Pain},  0, 0, S_SSHELL_SPRING2}, // S_SSHELL_SPRING1
-	{SPR_SSHL,  6,  1, {NULL},    0, 0, S_SSHELL_SPRING3}, // S_SSHELL_SPRING2
-	{SPR_SSHL,  5,  1, {NULL},    0, 0, S_SSHELL_SPRING4}, // S_SSHELL_SPRING3
-	{SPR_SSHL,  4,  1, {NULL},    0, 0, S_SSHELL_RUN1},    // S_SSHELL_SPRING4
+	{SPR_SSHL,  0,  4, A_Look,  0, 0, S_SSHELL_STND},    // S_SSHELL_STND
+	{SPR_SSHL,  0,  4, A_Chase, 0, 0, S_SSHELL_RUN2},    // S_SSHELL_RUN1
+	{SPR_SSHL,  1,  4, A_Chase, 0, 0, S_SSHELL_RUN3},    // S_SSHELL_RUN2
+	{SPR_SSHL,  2,  4, A_Chase, 0, 0, S_SSHELL_RUN4},    // S_SSHELL_RUN3
+	{SPR_SSHL,  3,  4, A_Chase, 0, 0, S_SSHELL_RUN1},    // S_SSHELL_RUN4
+	{SPR_SSHL,  7,  4, A_Pain,  0, 0, S_SSHELL_SPRING2}, // S_SSHELL_SPRING1
+	{SPR_SSHL,  6,  1, NULL,    0, 0, S_SSHELL_SPRING3}, // S_SSHELL_SPRING2
+	{SPR_SSHL,  5,  1, NULL,    0, 0, S_SSHELL_SPRING4}, // S_SSHELL_SPRING3
+	{SPR_SSHL,  4,  1, NULL,    0, 0, S_SSHELL_RUN1},    // S_SSHELL_SPRING4
 
 	// Spring Shell (yellow)
-	{SPR_SSHL,  8,  4, {A_Look},  0, 0, S_YSHELL_STND},    // S_YSHELL_STND
-	{SPR_SSHL,  8,  4, {A_Chase}, 0, 0, S_YSHELL_RUN2},    // S_YSHELL_RUN1
-	{SPR_SSHL,  9,  4, {A_Chase}, 0, 0, S_YSHELL_RUN3},    // S_YSHELL_RUN2
-	{SPR_SSHL, 10,  4, {A_Chase}, 0, 0, S_YSHELL_RUN4},    // S_YSHELL_RUN3
-	{SPR_SSHL, 11,  4, {A_Chase}, 0, 0, S_YSHELL_RUN1},    // S_YSHELL_RUN4
-	{SPR_SSHL, 15,  4, {A_Pain},  0, 0, S_YSHELL_SPRING2}, // S_YSHELL_SPRING1
-	{SPR_SSHL, 14,  1, {NULL},    0, 0, S_YSHELL_SPRING3}, // S_YSHELL_SPRING2
-	{SPR_SSHL, 13,  1, {NULL},    0, 0, S_YSHELL_SPRING4}, // S_YSHELL_SPRING3
-	{SPR_SSHL, 12,  1, {NULL},    0, 0, S_YSHELL_RUN1},    // S_YSHELL_SPRING4
+	{SPR_SSHL,  8,  4, A_Look,  0, 0, S_YSHELL_STND},    // S_YSHELL_STND
+	{SPR_SSHL,  8,  4, A_Chase, 0, 0, S_YSHELL_RUN2},    // S_YSHELL_RUN1
+	{SPR_SSHL,  9,  4, A_Chase, 0, 0, S_YSHELL_RUN3},    // S_YSHELL_RUN2
+	{SPR_SSHL, 10,  4, A_Chase, 0, 0, S_YSHELL_RUN4},    // S_YSHELL_RUN3
+	{SPR_SSHL, 11,  4, A_Chase, 0, 0, S_YSHELL_RUN1},    // S_YSHELL_RUN4
+	{SPR_SSHL, 15,  4, A_Pain,  0, 0, S_YSHELL_SPRING2}, // S_YSHELL_SPRING1
+	{SPR_SSHL, 14,  1, NULL,    0, 0, S_YSHELL_SPRING3}, // S_YSHELL_SPRING2
+	{SPR_SSHL, 13,  1, NULL,    0, 0, S_YSHELL_SPRING4}, // S_YSHELL_SPRING3
+	{SPR_SSHL, 12,  1, NULL,    0, 0, S_YSHELL_RUN1},    // S_YSHELL_SPRING4
 
 	// Unidus
-	{SPR_UNID, 0, 4, {A_Look},       0, 0, S_UNIDUS_STND}, // S_UNIDUS_STND
-	{SPR_UNID, 0, 1, {A_Chase},      0, 0, S_UNIDUS_RUN }, // S_UNIDUS_RUN
-	{SPR_UNID, 1, 1, {A_UnidusBall}, 1, 0, S_UNIDUS_BALL}, // S_UNIDUS_BALL
+	{SPR_UNID, 0, 4, A_Look,       0, 0, S_UNIDUS_STND}, // S_UNIDUS_STND
+	{SPR_UNID, 0, 1, A_Chase,      0, 0, S_UNIDUS_RUN }, // S_UNIDUS_RUN
+	{SPR_UNID, 1, 1, A_UnidusBall, 1, 0, S_UNIDUS_BALL}, // S_UNIDUS_BALL
 
 	// Boss Explosion
-	{SPR_BOM2, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_BPLD2}, // S_BPLD1
-	{SPR_BOM2, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_BPLD3}, // S_BPLD2
-	{SPR_BOM2, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_BPLD4}, // S_BPLD3
-	{SPR_BOM2, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_BPLD5}, // S_BPLD4
-	{SPR_BOM2, FF_FULLBRIGHT|4, 5, {NULL}, 0, 0, S_BPLD6}, // S_BPLD5
-	{SPR_BOM2, FF_FULLBRIGHT|5, 5, {NULL}, 0, 0, S_BPLD7}, // S_BPLD6
-	{SPR_BOM2, FF_FULLBRIGHT|6, 5, {NULL}, 0, 0, S_NULL},  // S_BPLD7
+	{SPR_BOM2, FF_FULLBRIGHT,   5, NULL, 0, 0, S_BPLD2}, // S_BPLD1
+	{SPR_BOM2, FF_FULLBRIGHT|1, 5, NULL, 0, 0, S_BPLD3}, // S_BPLD2
+	{SPR_BOM2, FF_FULLBRIGHT|2, 5, NULL, 0, 0, S_BPLD4}, // S_BPLD3
+	{SPR_BOM2, FF_FULLBRIGHT|3, 5, NULL, 0, 0, S_BPLD5}, // S_BPLD4
+	{SPR_BOM2, FF_FULLBRIGHT|4, 5, NULL, 0, 0, S_BPLD6}, // S_BPLD5
+	{SPR_BOM2, FF_FULLBRIGHT|5, 5, NULL, 0, 0, S_BPLD7}, // S_BPLD6
+	{SPR_BOM2, FF_FULLBRIGHT|6, 5, NULL, 0, 0, S_NULL},  // S_BPLD7
 
 	// S3&K Boss Explosion
-	{SPR_BOM3, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION2}, // S_SONIC3KBOSSEXPLOSION1
-	{SPR_BOM3, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION3}, // S_SONIC3KBOSSEXPLOSION2
-	{SPR_BOM3, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION4}, // S_SONIC3KBOSSEXPLOSION3
-	{SPR_BOM3, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION5}, // S_SONIC3KBOSSEXPLOSION4
-	{SPR_BOM3, FF_FULLBRIGHT|4, 3, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION6}, // S_SONIC3KBOSSEXPLOSION5
-	{SPR_BOM3, FF_FULLBRIGHT|5, 4, {NULL}, 0, 0, S_NULL}, // S_SONIC3KBOSSEXPLOSION6
+	{SPR_BOM3, FF_FULLBRIGHT,   1, NULL, 0, 0, S_SONIC3KBOSSEXPLOSION2}, // S_SONIC3KBOSSEXPLOSION1
+	{SPR_BOM3, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_SONIC3KBOSSEXPLOSION3}, // S_SONIC3KBOSSEXPLOSION2
+	{SPR_BOM3, FF_FULLBRIGHT|2, 2, NULL, 0, 0, S_SONIC3KBOSSEXPLOSION4}, // S_SONIC3KBOSSEXPLOSION3
+	{SPR_BOM3, FF_FULLBRIGHT|3, 2, NULL, 0, 0, S_SONIC3KBOSSEXPLOSION5}, // S_SONIC3KBOSSEXPLOSION4
+	{SPR_BOM3, FF_FULLBRIGHT|4, 3, NULL, 0, 0, S_SONIC3KBOSSEXPLOSION6}, // S_SONIC3KBOSSEXPLOSION5
+	{SPR_BOM3, FF_FULLBRIGHT|5, 4, NULL, 0, 0, S_NULL}, // S_SONIC3KBOSSEXPLOSION6
 
-	{SPR_JETF, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_JETFUME2}, // S_JETFUME1
-	{SPR_NULL, 0,             1, {NULL}, 0, 0, S_JETFUME1}, // S_JETFUME2
+	{SPR_JETF, FF_FULLBRIGHT, 1, NULL, 0, 0, S_JETFUME2}, // S_JETFUME1
+	{SPR_NULL, 0,             1, NULL, 0, 0, S_JETFUME1}, // S_JETFUME2
 
 	// Boss 1
-	{SPR_EGGM,  0,   1, {A_Boss1Chase},            0, 0, S_EGGMOBILE_STND},   // S_EGGMOBILE_STND
-	{SPR_EGGM,  1,   3, {A_FaceTarget},            0, 0, S_EGGMOBILE_LATK2},  // S_EGGMOBILE_LATK1
-	{SPR_EGGM,  2,  15, {NULL},                    0, 0, S_EGGMOBILE_LATK3},  // S_EGGMOBILE_LATK2
-	{SPR_EGGM,  3,   2, {A_FaceTarget},            0, 0, S_EGGMOBILE_LATK4},  // S_EGGMOBILE_LATK3
-	{SPR_EGGM,  4,   1, {NULL},                    0, 0, S_EGGMOBILE_LATK5},  // S_EGGMOBILE_LATK4
-	{SPR_EGGM,  5,   1, {NULL},                    0, 0, S_EGGMOBILE_LATK6},  // S_EGGMOBILE_LATK5
-	{SPR_EGGM,  6,   1, {NULL},                    0, 0, S_EGGMOBILE_LATK7},  // S_EGGMOBILE_LATK6
-	{SPR_EGGM,  7,   1, {NULL},                    0, 0, S_EGGMOBILE_LATK8},  // S_EGGMOBILE_LATK7
-	{SPR_EGGM,  8,  45, {A_Boss1Laser},     MT_LASER, 0, S_EGGMOBILE_LATK9},  // S_EGGMOBILE_LATK8
-	{SPR_EGGM,  9,  10, {NULL},                    0, 0, S_EGGMOBILE_LATK10}, // S_EGGMOBILE_LATK9
-	{SPR_EGGM, 10,   2, {NULL},                    0, 0, S_EGGMOBILE_STND},   // S_EGGMOBILE_LATK10
-	{SPR_EGGM, 11,   3, {A_FaceTarget},            0, 0, S_EGGMOBILE_RATK2},  // S_EGGMOBILE_RATK1
-	{SPR_EGGM, 12,  15, {NULL},                    0, 0, S_EGGMOBILE_RATK3},  // S_EGGMOBILE_RATK2
-	{SPR_EGGM, 13,   2, {A_FaceTarget},            0, 0, S_EGGMOBILE_RATK4},  // S_EGGMOBILE_RATK3
-	{SPR_EGGM, 14,   1, {NULL},                    0, 0, S_EGGMOBILE_RATK5},  // S_EGGMOBILE_RATK4
-	{SPR_EGGM, 15,   1, {NULL},                    0, 0, S_EGGMOBILE_RATK6},  // S_EGGMOBILE_RATK5
-	{SPR_EGGM, 16,   1, {NULL},                    0, 0, S_EGGMOBILE_RATK7},  // S_EGGMOBILE_RATK6
-	{SPR_EGGM, 17,   1, {NULL},                    0, 0, S_EGGMOBILE_RATK8},  // S_EGGMOBILE_RATK7
-	{SPR_EGGM, 18,  45, {A_Boss1Laser},     MT_LASER, 1, S_EGGMOBILE_RATK9},  // S_EGGMOBILE_RATK8
-	{SPR_EGGM, 19,  10, {NULL},                    0, 0, S_EGGMOBILE_RATK10}, // S_EGGMOBILE_RATK9
-	{SPR_EGGM, 20,   2, {NULL},                    0, 0, S_EGGMOBILE_STND},   // S_EGGMOBILE_RATK10
-	{SPR_EGGM,  3,  12, {NULL},                    0, 0, S_EGGMOBILE_PANIC2}, // S_EGGMOBILE_PANIC1
-	{SPR_EGGM,  4,   4, {A_Boss1Spikeballs},       0, 4, S_EGGMOBILE_PANIC3}, // S_EGGMOBILE_PANIC2
-	{SPR_EGGM,  3,   5, {NULL},                    0, 0, S_EGGMOBILE_PANIC4}, // S_EGGMOBILE_PANIC3
-	{SPR_EGGM,  4,   4, {A_Boss1Spikeballs},       1, 4, S_EGGMOBILE_PANIC5}, // S_EGGMOBILE_PANIC4
-	{SPR_EGGM,  3,   5, {NULL},                    0, 0, S_EGGMOBILE_PANIC6}, // S_EGGMOBILE_PANIC5
-	{SPR_EGGM,  4,   4, {A_Boss1Spikeballs},       2, 4, S_EGGMOBILE_PANIC7}, // S_EGGMOBILE_PANIC6
-	{SPR_EGGM,  3,   5, {NULL},                    0, 0, S_EGGMOBILE_PANIC8}, // S_EGGMOBILE_PANIC7
-	{SPR_EGGM,  4,   4, {A_Boss1Spikeballs},       3, 4, S_EGGMOBILE_PANIC9}, // S_EGGMOBILE_PANIC8
-	{SPR_EGGM,  3,   5, {NULL},                    0, 0, S_EGGMOBILE_PANIC10},// S_EGGMOBILE_PANIC9
-	{SPR_EGGM,  0,  35, {A_SkullAttack},           0, 0, S_EGGMOBILE_STND},   // S_EGGMOBILE_PANIC10
-	{SPR_EGGM, 21,  24, {A_Pain},                  0, 0, S_EGGMOBILE_PAIN2},  // S_EGGMOBILE_PAIN
-	{SPR_EGGM, 21,  16, {A_SkullAttack},           1, 1, S_EGGMOBILE_STND},   // S_EGGMOBILE_PAIN2
-	{SPR_EGGM, 22,  8, {A_Fall},                   0, 0, S_EGGMOBILE_DIE2},   // S_EGGMOBILE_DIE1
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE3},   // S_EGGMOBILE_DIE2
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE4},   // S_EGGMOBILE_DIE3
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE5},   // S_EGGMOBILE_DIE4
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE6},   // S_EGGMOBILE_DIE5
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE7},   // S_EGGMOBILE_DIE6
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE8},   // S_EGGMOBILE_DIE7
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE9},   // S_EGGMOBILE_DIE8
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE10},  // S_EGGMOBILE_DIE9
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE11},  // S_EGGMOBILE_DIE10
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE12},  // S_EGGMOBILE_DIE11
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE13},  // S_EGGMOBILE_DIE12
-	{SPR_EGGM, 22,  8, {A_BossScream},             0, 0, S_EGGMOBILE_DIE14},  // S_EGGMOBILE_DIE13
-	{SPR_EGGM, 22,  -1, {A_BossDeath},             0, 0, S_NULL},             // S_EGGMOBILE_DIE14
-	{SPR_EGGM, 23,  5, {NULL},                     0, 0, S_EGGMOBILE_FLEE2},  // S_EGGMOBILE_FLEE1
-	{SPR_EGGM, 24,  5, {NULL},                     0, 0, S_EGGMOBILE_FLEE1},  // S_EGGMOBILE_FLEE2
-	{SPR_UNID,  1,  1, {A_UnidusBall},             2, 0, S_EGGMOBILE_BALL},   // S_EGGMOBILE_BALL
-	{SPR_NULL,  0,  1, {A_FocusTarget},            0, 0, S_EGGMOBILE_TARGET}, // S_EGGMOBILE_TARGET
+	{SPR_EGGM,  0,   1, A_Boss1Chase,            0, 0, S_EGGMOBILE_STND},   // S_EGGMOBILE_STND
+	{SPR_EGGM,  1,   3, A_FaceTarget,            0, 0, S_EGGMOBILE_LATK2},  // S_EGGMOBILE_LATK1
+	{SPR_EGGM,  2,  15, NULL,                    0, 0, S_EGGMOBILE_LATK3},  // S_EGGMOBILE_LATK2
+	{SPR_EGGM,  3,   2, A_FaceTarget,            0, 0, S_EGGMOBILE_LATK4},  // S_EGGMOBILE_LATK3
+	{SPR_EGGM,  4,   1, NULL,                    0, 0, S_EGGMOBILE_LATK5},  // S_EGGMOBILE_LATK4
+	{SPR_EGGM,  5,   1, NULL,                    0, 0, S_EGGMOBILE_LATK6},  // S_EGGMOBILE_LATK5
+	{SPR_EGGM,  6,   1, NULL,                    0, 0, S_EGGMOBILE_LATK7},  // S_EGGMOBILE_LATK6
+	{SPR_EGGM,  7,   1, NULL,                    0, 0, S_EGGMOBILE_LATK8},  // S_EGGMOBILE_LATK7
+	{SPR_EGGM,  8,  45, A_Boss1Laser,     MT_LASER, 0, S_EGGMOBILE_LATK9},  // S_EGGMOBILE_LATK8
+	{SPR_EGGM,  9,  10, NULL,                    0, 0, S_EGGMOBILE_LATK10}, // S_EGGMOBILE_LATK9
+	{SPR_EGGM, 10,   2, NULL,                    0, 0, S_EGGMOBILE_STND},   // S_EGGMOBILE_LATK10
+	{SPR_EGGM, 11,   3, A_FaceTarget,            0, 0, S_EGGMOBILE_RATK2},  // S_EGGMOBILE_RATK1
+	{SPR_EGGM, 12,  15, NULL,                    0, 0, S_EGGMOBILE_RATK3},  // S_EGGMOBILE_RATK2
+	{SPR_EGGM, 13,   2, A_FaceTarget,            0, 0, S_EGGMOBILE_RATK4},  // S_EGGMOBILE_RATK3
+	{SPR_EGGM, 14,   1, NULL,                    0, 0, S_EGGMOBILE_RATK5},  // S_EGGMOBILE_RATK4
+	{SPR_EGGM, 15,   1, NULL,                    0, 0, S_EGGMOBILE_RATK6},  // S_EGGMOBILE_RATK5
+	{SPR_EGGM, 16,   1, NULL,                    0, 0, S_EGGMOBILE_RATK7},  // S_EGGMOBILE_RATK6
+	{SPR_EGGM, 17,   1, NULL,                    0, 0, S_EGGMOBILE_RATK8},  // S_EGGMOBILE_RATK7
+	{SPR_EGGM, 18,  45, A_Boss1Laser,     MT_LASER, 1, S_EGGMOBILE_RATK9},  // S_EGGMOBILE_RATK8
+	{SPR_EGGM, 19,  10, NULL,                    0, 0, S_EGGMOBILE_RATK10}, // S_EGGMOBILE_RATK9
+	{SPR_EGGM, 20,   2, NULL,                    0, 0, S_EGGMOBILE_STND},   // S_EGGMOBILE_RATK10
+	{SPR_EGGM,  3,  12, NULL,                    0, 0, S_EGGMOBILE_PANIC2}, // S_EGGMOBILE_PANIC1
+	{SPR_EGGM,  4,   4, A_Boss1Spikeballs,       0, 4, S_EGGMOBILE_PANIC3}, // S_EGGMOBILE_PANIC2
+	{SPR_EGGM,  3,   5, NULL,                    0, 0, S_EGGMOBILE_PANIC4}, // S_EGGMOBILE_PANIC3
+	{SPR_EGGM,  4,   4, A_Boss1Spikeballs,       1, 4, S_EGGMOBILE_PANIC5}, // S_EGGMOBILE_PANIC4
+	{SPR_EGGM,  3,   5, NULL,                    0, 0, S_EGGMOBILE_PANIC6}, // S_EGGMOBILE_PANIC5
+	{SPR_EGGM,  4,   4, A_Boss1Spikeballs,       2, 4, S_EGGMOBILE_PANIC7}, // S_EGGMOBILE_PANIC6
+	{SPR_EGGM,  3,   5, NULL,                    0, 0, S_EGGMOBILE_PANIC8}, // S_EGGMOBILE_PANIC7
+	{SPR_EGGM,  4,   4, A_Boss1Spikeballs,       3, 4, S_EGGMOBILE_PANIC9}, // S_EGGMOBILE_PANIC8
+	{SPR_EGGM,  3,   5, NULL,                    0, 0, S_EGGMOBILE_PANIC10},// S_EGGMOBILE_PANIC9
+	{SPR_EGGM,  0,  35, A_SkullAttack,           0, 0, S_EGGMOBILE_STND},   // S_EGGMOBILE_PANIC10
+	{SPR_EGGM, 21,  24, A_Pain,                  0, 0, S_EGGMOBILE_PAIN2},  // S_EGGMOBILE_PAIN
+	{SPR_EGGM, 21,  16, A_SkullAttack,           1, 1, S_EGGMOBILE_STND},   // S_EGGMOBILE_PAIN2
+	{SPR_EGGM, 22,  8, A_Fall,                   0, 0, S_EGGMOBILE_DIE2},   // S_EGGMOBILE_DIE1
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE3},   // S_EGGMOBILE_DIE2
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE4},   // S_EGGMOBILE_DIE3
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE5},   // S_EGGMOBILE_DIE4
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE6},   // S_EGGMOBILE_DIE5
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE7},   // S_EGGMOBILE_DIE6
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE8},   // S_EGGMOBILE_DIE7
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE9},   // S_EGGMOBILE_DIE8
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE10},  // S_EGGMOBILE_DIE9
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE11},  // S_EGGMOBILE_DIE10
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE12},  // S_EGGMOBILE_DIE11
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE13},  // S_EGGMOBILE_DIE12
+	{SPR_EGGM, 22,  8, A_BossScream,             0, 0, S_EGGMOBILE_DIE14},  // S_EGGMOBILE_DIE13
+	{SPR_EGGM, 22,  -1, A_BossDeath,             0, 0, S_NULL},             // S_EGGMOBILE_DIE14
+	{SPR_EGGM, 23,  5, NULL,                     0, 0, S_EGGMOBILE_FLEE2},  // S_EGGMOBILE_FLEE1
+	{SPR_EGGM, 24,  5, NULL,                     0, 0, S_EGGMOBILE_FLEE1},  // S_EGGMOBILE_FLEE2
+	{SPR_UNID,  1,  1, A_UnidusBall,             2, 0, S_EGGMOBILE_BALL},   // S_EGGMOBILE_BALL
+	{SPR_NULL,  0,  1, A_FocusTarget,            0, 0, S_EGGMOBILE_TARGET}, // S_EGGMOBILE_TARGET
 
 	// Boss 2
-	{SPR_EGGN, 0, -1,              {NULL},           0,          0, S_NULL},             // S_EGGMOBILE2_STND
-	{SPR_EGGN, 1, 4,               {NULL},           0,          0, S_EGGMOBILE2_POGO2}, // S_EGGMOBILE2_POGO1
-	{SPR_EGGN, 0, 2,  {A_Boss2PogoTarget},  9*FRACUNIT, 8*FRACUNIT, S_EGGMOBILE2_POGO3}, // S_EGGMOBILE2_POGO2
-	{SPR_EGGN, 1, 2,               {NULL},           0,          0, S_EGGMOBILE2_POGO4}, // S_EGGMOBILE2_POGO3
-	{SPR_EGGN, 2, -1,              {NULL},           0,          0, S_NULL},             // S_EGGMOBILE2_POGO4
-	{SPR_EGGN, 1, 4,               {NULL},           0,          0, S_EGGMOBILE2_POGO6}, // S_EGGMOBILE2_POGO5
-	{SPR_EGGN, 0, 2,  {A_Boss2PogoTarget},  7*FRACUNIT, 8*FRACUNIT, S_EGGMOBILE2_POGO7}, // S_EGGMOBILE2_POGO6
-	{SPR_EGGN, 1, 2,               {NULL},           0,          0, S_EGGMOBILE2_POGO4}, // S_EGGMOBILE2_POGO7
-	{SPR_EGGN, 3, 24, {A_Boss2TakeDamage},  24+TICRATE,          0, S_EGGMOBILE2_STND},  // S_EGGMOBILE2_PAIN
-	{SPR_EGGN, 4, 24, {A_Boss2TakeDamage},  24+TICRATE,          0, S_EGGMOBILE2_POGO4}, // S_EGGMOBILE2_PAIN2
-	{SPR_EGGN, 5, 8,             {A_Fall},           0,          0, S_EGGMOBILE2_DIE2},  // S_EGGMOBILE2_DIE1
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE3},  // S_EGGMOBILE2_DIE2
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE4},  // S_EGGMOBILE2_DIE3
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE5},  // S_EGGMOBILE2_DIE4
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE6},  // S_EGGMOBILE2_DIE5
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE7},  // S_EGGMOBILE2_DIE6
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE8},  // S_EGGMOBILE2_DIE7
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE9},  // S_EGGMOBILE2_DIE8
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE10}, // S_EGGMOBILE2_DIE9
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE11}, // S_EGGMOBILE2_DIE10
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE12}, // S_EGGMOBILE2_DIE11
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE13}, // S_EGGMOBILE2_DIE12
-	{SPR_EGGN, 5, 8,       {A_BossScream},           0,          0, S_EGGMOBILE2_DIE14}, // S_EGGMOBILE2_DIE13
-	{SPR_EGGN, 5, -1,       {A_BossDeath},           0,          0, S_NULL},             // S_EGGMOBILE2_DIE14
-	{SPR_EGGN, 6, 5,               {NULL},           0,          0, S_EGGMOBILE2_FLEE2}, // S_EGGMOBILE2_FLEE1
-	{SPR_EGGN, 7, 5,               {NULL},           0,          0, S_EGGMOBILE2_FLEE1}, // S_EGGMOBILE2_FLEE2
+	{SPR_EGGN, 0, -1,              NULL,           0,          0, S_NULL},             // S_EGGMOBILE2_STND
+	{SPR_EGGN, 1, 4,               NULL,           0,          0, S_EGGMOBILE2_POGO2}, // S_EGGMOBILE2_POGO1
+	{SPR_EGGN, 0, 2,  A_Boss2PogoTarget,  9*FRACUNIT, 8*FRACUNIT, S_EGGMOBILE2_POGO3}, // S_EGGMOBILE2_POGO2
+	{SPR_EGGN, 1, 2,               NULL,           0,          0, S_EGGMOBILE2_POGO4}, // S_EGGMOBILE2_POGO3
+	{SPR_EGGN, 2, -1,              NULL,           0,          0, S_NULL},             // S_EGGMOBILE2_POGO4
+	{SPR_EGGN, 1, 4,               NULL,           0,          0, S_EGGMOBILE2_POGO6}, // S_EGGMOBILE2_POGO5
+	{SPR_EGGN, 0, 2,  A_Boss2PogoTarget,  7*FRACUNIT, 8*FRACUNIT, S_EGGMOBILE2_POGO7}, // S_EGGMOBILE2_POGO6
+	{SPR_EGGN, 1, 2,               NULL,           0,          0, S_EGGMOBILE2_POGO4}, // S_EGGMOBILE2_POGO7
+	{SPR_EGGN, 3, 24, A_Boss2TakeDamage,  24+TICRATE,          0, S_EGGMOBILE2_STND},  // S_EGGMOBILE2_PAIN
+	{SPR_EGGN, 4, 24, A_Boss2TakeDamage,  24+TICRATE,          0, S_EGGMOBILE2_POGO4}, // S_EGGMOBILE2_PAIN2
+	{SPR_EGGN, 5, 8,             A_Fall,           0,          0, S_EGGMOBILE2_DIE2},  // S_EGGMOBILE2_DIE1
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE3},  // S_EGGMOBILE2_DIE2
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE4},  // S_EGGMOBILE2_DIE3
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE5},  // S_EGGMOBILE2_DIE4
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE6},  // S_EGGMOBILE2_DIE5
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE7},  // S_EGGMOBILE2_DIE6
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE8},  // S_EGGMOBILE2_DIE7
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE9},  // S_EGGMOBILE2_DIE8
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE10}, // S_EGGMOBILE2_DIE9
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE11}, // S_EGGMOBILE2_DIE10
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE12}, // S_EGGMOBILE2_DIE11
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE13}, // S_EGGMOBILE2_DIE12
+	{SPR_EGGN, 5, 8,       A_BossScream,           0,          0, S_EGGMOBILE2_DIE14}, // S_EGGMOBILE2_DIE13
+	{SPR_EGGN, 5, -1,       A_BossDeath,           0,          0, S_NULL},             // S_EGGMOBILE2_DIE14
+	{SPR_EGGN, 6, 5,               NULL,           0,          0, S_EGGMOBILE2_FLEE2}, // S_EGGMOBILE2_FLEE1
+	{SPR_EGGN, 7, 5,               NULL,           0,          0, S_EGGMOBILE2_FLEE1}, // S_EGGMOBILE2_FLEE2
 
-	{SPR_TNKA, 0, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSTANK1
-	{SPR_TNKB, 0, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSTANK2
-	{SPR_SPNK, 0, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSSPIGOT
+	{SPR_TNKA, 0, 35, NULL, 0, 0, S_NULL}, // S_BOSSTANK1
+	{SPR_TNKB, 0, 35, NULL, 0, 0, S_NULL}, // S_BOSSTANK2
+	{SPR_SPNK, 0, 35, NULL, 0, 0, S_NULL}, // S_BOSSSPIGOT
 
 	// Boss 2 Goop
-	{SPR_GOOP, 0, 2, {NULL}, 0, 0, S_GOOP2}, // S_GOOP1
-	{SPR_GOOP, 1, 2, {NULL}, 0, 0, S_GOOP1}, // S_GOOP2
-	{SPR_GOOP, 2,-1, {NULL}, 0, 0, S_NULL},  // S_GOOP3
+	{SPR_GOOP, 0, 2, NULL, 0, 0, S_GOOP2}, // S_GOOP1
+	{SPR_GOOP, 1, 2, NULL, 0, 0, S_GOOP1}, // S_GOOP2
+	{SPR_GOOP, 2,-1, NULL, 0, 0, S_NULL},  // S_GOOP3
 
 	// Boss 3
-	{SPR_EGGO,  0,   1, {NULL},                    0, 0, S_EGGMOBILE3_STND},    // S_EGGMOBILE3_STND
-	{SPR_EGGO,  1,   2, {NULL},                    0, 0, S_EGGMOBILE3_ATK2},    // S_EGGMOBILE3_ATK1
-	{SPR_EGGO,  2,   2, {NULL},                    0, 0, S_EGGMOBILE3_ATK3A},   // S_EGGMOBILE3_ATK2
-	{SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 2, S_EGGMOBILE3_ATK3B},   // S_EGGMOBILE3_ATK3A
-	{SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 4, S_EGGMOBILE3_ATK3C},   // S_EGGMOBILE3_ATK3B
-	{SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 3, S_EGGMOBILE3_ATK3D},   // S_EGGMOBILE3_ATK3C
-	{SPR_EGGO,  3,   2, {A_BossFireShot}, MT_TORPEDO, 5, S_EGGMOBILE3_ATK4},    // S_EGGMOBILE3_ATK3D
-	{SPR_EGGO,  4,   2, {NULL},                    0, 0, S_EGGMOBILE3_ATK5},    // S_EGGMOBILE3_ATK4
-	{SPR_EGGO,  5,   2, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH1},  // S_EGGMOBILE3_ATK5
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH2},  // S_EGGMOBILE3_LAUGH1
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH3},  // S_EGGMOBILE3_LAUGH2
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH4},  // S_EGGMOBILE3_LAUGH3
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH5},  // S_EGGMOBILE3_LAUGH4
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH6},  // S_EGGMOBILE3_LAUGH5
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH7},  // S_EGGMOBILE3_LAUGH6
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH8},  // S_EGGMOBILE3_LAUGH7
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH9},  // S_EGGMOBILE3_LAUGH8
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH10}, // S_EGGMOBILE3_LAUGH9
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH11}, // S_EGGMOBILE3_LAUGH10
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH12}, // S_EGGMOBILE3_LAUGH11
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH13}, // S_EGGMOBILE3_LAUGH12
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH14}, // S_EGGMOBILE3_LAUGH13
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH15}, // S_EGGMOBILE3_LAUGH14
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH16}, // S_EGGMOBILE3_LAUGH15
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH17}, // S_EGGMOBILE3_LAUGH16
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH18}, // S_EGGMOBILE3_LAUGH17
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH19}, // S_EGGMOBILE3_LAUGH18
-	{SPR_EGGO,  6,   4, {NULL},                    0, 0, S_EGGMOBILE3_LAUGH20}, // S_EGGMOBILE3_LAUGH19
-	{SPR_EGGO,  7,   4, {NULL},                    0, 0, S_EGGMOBILE3_STND},    // S_EGGMOBILE3_LAUGH20
-	{SPR_EGGO,  8,   1, {A_Boss3TakeDamage},       0, 0, S_EGGMOBILE3_PAIN2},   // S_EGGMOBILE3_PAIN
-	{SPR_EGGO,  8,  23, {A_Pain},                  0, 0, S_EGGMOBILE3_STND},    // S_EGGMOBILE3_PAIN2
-	{SPR_EGGO,  9,   8, {A_Fall},                  0, 0, S_EGGMOBILE3_DIE2},    // S_EGGMOBILE3_DIE1
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE3},    // S_EGGMOBILE3_DIE2
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE4},    // S_EGGMOBILE3_DIE3
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE5},    // S_EGGMOBILE3_DIE4
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE6},    // S_EGGMOBILE3_DIE5
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE7},    // S_EGGMOBILE3_DIE6
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE8},    // S_EGGMOBILE3_DIE7
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE9},    // S_EGGMOBILE3_DIE8
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE10},   // S_EGGMOBILE3_DIE9
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE11},   // S_EGGMOBILE3_DIE10
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE12},   // S_EGGMOBILE3_DIE11
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE13},   // S_EGGMOBILE3_DIE12
-	{SPR_EGGO,  9,   8, {A_BossScream},            0, 0, S_EGGMOBILE3_DIE14},   // S_EGGMOBILE3_DIE13
-	{SPR_EGGO,  9,  -1, {A_BossDeath},             0, 0, S_NULL},               // S_EGGMOBILE3_DIE14
-	{SPR_EGGO, 10,   5, {NULL},                    0, 0, S_EGGMOBILE3_FLEE2},   // S_EGGMOBILE3_FLEE1
-	{SPR_EGGO, 11,   5, {NULL},                    0, 0, S_EGGMOBILE3_FLEE1},   // S_EGGMOBILE3_FLEE2
+	{SPR_EGGO,  0,   1, NULL,                    0, 0, S_EGGMOBILE3_STND},    // S_EGGMOBILE3_STND
+	{SPR_EGGO,  1,   2, NULL,                    0, 0, S_EGGMOBILE3_ATK2},    // S_EGGMOBILE3_ATK1
+	{SPR_EGGO,  2,   2, NULL,                    0, 0, S_EGGMOBILE3_ATK3A},   // S_EGGMOBILE3_ATK2
+	{SPR_EGGO,  3,   2, A_BossFireShot, MT_TORPEDO, 2, S_EGGMOBILE3_ATK3B},   // S_EGGMOBILE3_ATK3A
+	{SPR_EGGO,  3,   2, A_BossFireShot, MT_TORPEDO, 4, S_EGGMOBILE3_ATK3C},   // S_EGGMOBILE3_ATK3B
+	{SPR_EGGO,  3,   2, A_BossFireShot, MT_TORPEDO, 3, S_EGGMOBILE3_ATK3D},   // S_EGGMOBILE3_ATK3C
+	{SPR_EGGO,  3,   2, A_BossFireShot, MT_TORPEDO, 5, S_EGGMOBILE3_ATK4},    // S_EGGMOBILE3_ATK3D
+	{SPR_EGGO,  4,   2, NULL,                    0, 0, S_EGGMOBILE3_ATK5},    // S_EGGMOBILE3_ATK4
+	{SPR_EGGO,  5,   2, NULL,                    0, 0, S_EGGMOBILE3_LAUGH1},  // S_EGGMOBILE3_ATK5
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH2},  // S_EGGMOBILE3_LAUGH1
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH3},  // S_EGGMOBILE3_LAUGH2
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH4},  // S_EGGMOBILE3_LAUGH3
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH5},  // S_EGGMOBILE3_LAUGH4
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH6},  // S_EGGMOBILE3_LAUGH5
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH7},  // S_EGGMOBILE3_LAUGH6
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH8},  // S_EGGMOBILE3_LAUGH7
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH9},  // S_EGGMOBILE3_LAUGH8
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH10}, // S_EGGMOBILE3_LAUGH9
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH11}, // S_EGGMOBILE3_LAUGH10
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH12}, // S_EGGMOBILE3_LAUGH11
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH13}, // S_EGGMOBILE3_LAUGH12
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH14}, // S_EGGMOBILE3_LAUGH13
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH15}, // S_EGGMOBILE3_LAUGH14
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH16}, // S_EGGMOBILE3_LAUGH15
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH17}, // S_EGGMOBILE3_LAUGH16
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH18}, // S_EGGMOBILE3_LAUGH17
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH19}, // S_EGGMOBILE3_LAUGH18
+	{SPR_EGGO,  6,   4, NULL,                    0, 0, S_EGGMOBILE3_LAUGH20}, // S_EGGMOBILE3_LAUGH19
+	{SPR_EGGO,  7,   4, NULL,                    0, 0, S_EGGMOBILE3_STND},    // S_EGGMOBILE3_LAUGH20
+	{SPR_EGGO,  8,   1, A_Boss3TakeDamage,       0, 0, S_EGGMOBILE3_PAIN2},   // S_EGGMOBILE3_PAIN
+	{SPR_EGGO,  8,  23, A_Pain,                  0, 0, S_EGGMOBILE3_STND},    // S_EGGMOBILE3_PAIN2
+	{SPR_EGGO,  9,   8, A_Fall,                  0, 0, S_EGGMOBILE3_DIE2},    // S_EGGMOBILE3_DIE1
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE3},    // S_EGGMOBILE3_DIE2
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE4},    // S_EGGMOBILE3_DIE3
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE5},    // S_EGGMOBILE3_DIE4
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE6},    // S_EGGMOBILE3_DIE5
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE7},    // S_EGGMOBILE3_DIE6
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE8},    // S_EGGMOBILE3_DIE7
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE9},    // S_EGGMOBILE3_DIE8
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE10},   // S_EGGMOBILE3_DIE9
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE11},   // S_EGGMOBILE3_DIE10
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE12},   // S_EGGMOBILE3_DIE11
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE13},   // S_EGGMOBILE3_DIE12
+	{SPR_EGGO,  9,   8, A_BossScream,            0, 0, S_EGGMOBILE3_DIE14},   // S_EGGMOBILE3_DIE13
+	{SPR_EGGO,  9,  -1, A_BossDeath,             0, 0, S_NULL},               // S_EGGMOBILE3_DIE14
+	{SPR_EGGO, 10,   5, NULL,                    0, 0, S_EGGMOBILE3_FLEE2},   // S_EGGMOBILE3_FLEE1
+	{SPR_EGGO, 11,   5, NULL,                    0, 0, S_EGGMOBILE3_FLEE1},   // S_EGGMOBILE3_FLEE2
 
 	// Boss 3 Propeller
-	{SPR_PRPL, 0, 1, {NULL}, 0, 0, S_PROPELLER2}, // S_PROPELLER1
-	{SPR_PRPL, 1, 1, {NULL}, 0, 0, S_PROPELLER3}, // S_PROPELLER2
-	{SPR_PRPL, 2, 1, {NULL}, 0, 0, S_PROPELLER4}, // S_PROPELLER3
-	{SPR_PRPL, 3, 1, {NULL}, 0, 0, S_PROPELLER5}, // S_PROPELLER4
-	{SPR_PRPL, 4, 1, {NULL}, 0, 0, S_PROPELLER6}, // S_PROPELLER5
-	{SPR_PRPL, 5, 1, {NULL}, 0, 0, S_PROPELLER7}, // S_PROPELLER6
-	{SPR_PRPL, 6, 1, {NULL}, 0, 0, S_PROPELLER1}, // S_PROPELLER7
+	{SPR_PRPL, 0, 1, NULL, 0, 0, S_PROPELLER2}, // S_PROPELLER1
+	{SPR_PRPL, 1, 1, NULL, 0, 0, S_PROPELLER3}, // S_PROPELLER2
+	{SPR_PRPL, 2, 1, NULL, 0, 0, S_PROPELLER4}, // S_PROPELLER3
+	{SPR_PRPL, 3, 1, NULL, 0, 0, S_PROPELLER5}, // S_PROPELLER4
+	{SPR_PRPL, 4, 1, NULL, 0, 0, S_PROPELLER6}, // S_PROPELLER5
+	{SPR_PRPL, 5, 1, NULL, 0, 0, S_PROPELLER7}, // S_PROPELLER6
+	{SPR_PRPL, 6, 1, NULL, 0, 0, S_PROPELLER1}, // S_PROPELLER7
 
 	// Boss 3 Pinch
-	{SPR_FAKE, 0,  1, {A_BossJetFume},            1, 0, S_FAKEMOBILE},       // S_FAKEMOBILE_INIT
-	{SPR_FAKE, 0,  1, {A_Boss3Path},              0, 0, S_FAKEMOBILE},       // S_FAKEMOBILE
-	{SPR_FAKE, 0,  2, {NULL},                     0, 0, S_FAKEMOBILE_ATK2},  // S_FAKEMOBILE_ATK1
-	{SPR_FAKE, 0,  2, {NULL},                     0, 0, S_FAKEMOBILE_ATK3A}, // S_FAKEMOBILE_ATK2
-	{SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 2, S_FAKEMOBILE_ATK3B}, // S_FAKEMOBILE_ATK3A
-	{SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 4, S_FAKEMOBILE_ATK3C}, // S_FAKEMOBILE_ATK3B
-	{SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 3, S_FAKEMOBILE_ATK3D}, // S_FAKEMOBILE_ATK3C
-	{SPR_FAKE, 0,  2, {A_BossFireShot}, MT_TORPEDO2, 5, S_FAKEMOBILE_ATK4},  // S_FAKEMOBILE_ATK3D
-	{SPR_FAKE, 0,  2, {NULL},                     0, 0, S_FAKEMOBILE_ATK5},  // S_FAKEMOBILE_ATK4
-	{SPR_FAKE, 0,  2, {NULL},                     0, 0, S_FAKEMOBILE},       // S_FAKEMOBILE_ATK5
+	{SPR_FAKE, 0,  1, A_BossJetFume,            1, 0, S_FAKEMOBILE},       // S_FAKEMOBILE_INIT
+	{SPR_FAKE, 0,  1, A_Boss3Path,              0, 0, S_FAKEMOBILE},       // S_FAKEMOBILE
+	{SPR_FAKE, 0,  2, NULL,                     0, 0, S_FAKEMOBILE_ATK2},  // S_FAKEMOBILE_ATK1
+	{SPR_FAKE, 0,  2, NULL,                     0, 0, S_FAKEMOBILE_ATK3A}, // S_FAKEMOBILE_ATK2
+	{SPR_FAKE, 0,  2, A_BossFireShot, MT_TORPEDO2, 2, S_FAKEMOBILE_ATK3B}, // S_FAKEMOBILE_ATK3A
+	{SPR_FAKE, 0,  2, A_BossFireShot, MT_TORPEDO2, 4, S_FAKEMOBILE_ATK3C}, // S_FAKEMOBILE_ATK3B
+	{SPR_FAKE, 0,  2, A_BossFireShot, MT_TORPEDO2, 3, S_FAKEMOBILE_ATK3D}, // S_FAKEMOBILE_ATK3C
+	{SPR_FAKE, 0,  2, A_BossFireShot, MT_TORPEDO2, 5, S_FAKEMOBILE_ATK4},  // S_FAKEMOBILE_ATK3D
+	{SPR_FAKE, 0,  2, NULL,                     0, 0, S_FAKEMOBILE_ATK5},  // S_FAKEMOBILE_ATK4
+	{SPR_FAKE, 0,  2, NULL,                     0, 0, S_FAKEMOBILE},       // S_FAKEMOBILE_ATK5
 
 	// Boss 4
-	{SPR_EGGP, 0, -1, {NULL},           0,          0, S_NULL},              // S_EGGMOBILE4_STND
-	{SPR_EGGP, 1,  3, {NULL},           0,          0, S_EGGMOBILE4_LATK2},  // S_EGGMOBILE4_LATK1
-	{SPR_EGGP, 2, 15, {NULL},           0,          0, S_EGGMOBILE4_LATK3},  // S_EGGMOBILE4_LATK2
-	{SPR_EGGP, 3,  2, {NULL},           0,          0, S_EGGMOBILE4_LATK4},  // S_EGGMOBILE4_LATK3
-	{SPR_EGGP, 4,  4, {NULL},           0,          0, S_EGGMOBILE4_LATK5},  // S_EGGMOBILE4_LATK4
-	{SPR_EGGP, 4, 50, {A_Boss4Reverse}, sfx_mswing, 0, S_EGGMOBILE4_LATK6},  // S_EGGMOBILE4_LATK5
-	{SPR_EGGP, 5,  2, {NULL},           0,          0, S_EGGMOBILE4_STND},   // S_EGGMOBILE4_LATK6
-	{SPR_EGGP, 6,  3, {NULL},           0,          0, S_EGGMOBILE4_RATK2},  // S_EGGMOBILE4_RATK1
-	{SPR_EGGP, 7, 15, {NULL},           0,          0, S_EGGMOBILE4_RATK3},  // S_EGGMOBILE4_RATK2
-	{SPR_EGGP, 8,  2, {NULL},           0,          0, S_EGGMOBILE4_RATK4},  // S_EGGMOBILE4_RATK3
-	{SPR_EGGP, 9,  4, {NULL},           0,          0, S_EGGMOBILE4_RATK5},  // S_EGGMOBILE4_RATK4
-	{SPR_EGGP, 9,150, {A_Boss4SpeedUp}, sfx_mswing, 0, S_EGGMOBILE4_RATK6},  // S_EGGMOBILE4_RATK5
-	{SPR_EGGP,10,  2, {NULL},           0,          0, S_EGGMOBILE4_STND},   // S_EGGMOBILE4_RATK6
-	{SPR_EGGP, 0, 20, {A_Boss4Raise},   sfx_doord1, 0, S_EGGMOBILE4_RAISE2}, // S_EGGMOBILE4_RAISE1
-	{SPR_EGGP,13, 10, {NULL},           0,          0, S_EGGMOBILE4_RAISE3}, // S_EGGMOBILE4_RAISE2
-	{SPR_EGGP,14, 10, {NULL},           0,          0, S_EGGMOBILE4_RAISE4}, // S_EGGMOBILE4_RAISE3
-	{SPR_EGGP,13, 10, {NULL},           0,          0, S_EGGMOBILE4_RAISE5}, // S_EGGMOBILE4_RAISE4
-	{SPR_EGGP,14, 10, {NULL},           0,          0, S_EGGMOBILE4_RAISE6}, // S_EGGMOBILE4_RAISE5
-	{SPR_EGGP,13, 10, {NULL},           0,          0, S_EGGMOBILE4_RAISE7}, // S_EGGMOBILE4_RAISE6
-	{SPR_EGGP,14, 10, {NULL},           0,          0, S_EGGMOBILE4_RAISE8}, // S_EGGMOBILE4_RAISE7
-	{SPR_EGGP,13, 10, {NULL},           0,          0, S_EGGMOBILE4_RAISE9}, // S_EGGMOBILE4_RAISE8
-	{SPR_EGGP,14, 10, {NULL},           0,          0, S_EGGMOBILE4_RAISE10},// S_EGGMOBILE4_RAISE9
-	{SPR_EGGP,13, 10, {NULL},           0,          0, S_EGGMOBILE4_STND},   // S_EGGMOBILE4_RAISE10
-	{SPR_EGGP,11, 24, {A_Pain},         0,          0, S_EGGMOBILE4_STND},   // S_EGGMOBILE4_PAIN
-	{SPR_EGGP,12,  8, {A_Fall},         0,          0, S_EGGMOBILE4_DIE2},   // S_EGGMOBILE4_DIE1
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE3},   // S_EGGMOBILE4_DIE2
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE4},   // S_EGGMOBILE4_DIE3
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE5},   // S_EGGMOBILE4_DIE4
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE6},   // S_EGGMOBILE4_DIE5
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE7},   // S_EGGMOBILE4_DIE6
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE8},   // S_EGGMOBILE4_DIE7
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE9},   // S_EGGMOBILE4_DIE8
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE10},  // S_EGGMOBILE4_DIE9
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE11},  // S_EGGMOBILE4_DIE10
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE12},  // S_EGGMOBILE4_DIE11
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE13},  // S_EGGMOBILE4_DIE12
-	{SPR_EGGP,12,  8, {A_BossScream},   0,          0, S_EGGMOBILE4_DIE14},  // S_EGGMOBILE4_DIE13
-	{SPR_EGGP,12, -1, {A_BossDeath},    0,          0, S_NULL},              // S_EGGMOBILE4_DIE14
-	{SPR_EGGP,13,  5, {NULL},           0,          0, S_EGGMOBILE4_FLEE2},  // S_EGGMOBILE4_FLEE1
-	{SPR_EGGP,14,  5, {NULL},           0,          0, S_EGGMOBILE4_FLEE1},  // S_EGGMOBILE4_FLEE2
-	{SPR_BMCE, 0, -1, {NULL},           0,          0, S_NULL},              // S_EGGMOBILE4_MACE
+	{SPR_EGGP, 0, -1, NULL,           0,          0, S_NULL},              // S_EGGMOBILE4_STND
+	{SPR_EGGP, 1,  3, NULL,           0,          0, S_EGGMOBILE4_LATK2},  // S_EGGMOBILE4_LATK1
+	{SPR_EGGP, 2, 15, NULL,           0,          0, S_EGGMOBILE4_LATK3},  // S_EGGMOBILE4_LATK2
+	{SPR_EGGP, 3,  2, NULL,           0,          0, S_EGGMOBILE4_LATK4},  // S_EGGMOBILE4_LATK3
+	{SPR_EGGP, 4,  4, NULL,           0,          0, S_EGGMOBILE4_LATK5},  // S_EGGMOBILE4_LATK4
+	{SPR_EGGP, 4, 50, A_Boss4Reverse, sfx_mswing, 0, S_EGGMOBILE4_LATK6},  // S_EGGMOBILE4_LATK5
+	{SPR_EGGP, 5,  2, NULL,           0,          0, S_EGGMOBILE4_STND},   // S_EGGMOBILE4_LATK6
+	{SPR_EGGP, 6,  3, NULL,           0,          0, S_EGGMOBILE4_RATK2},  // S_EGGMOBILE4_RATK1
+	{SPR_EGGP, 7, 15, NULL,           0,          0, S_EGGMOBILE4_RATK3},  // S_EGGMOBILE4_RATK2
+	{SPR_EGGP, 8,  2, NULL,           0,          0, S_EGGMOBILE4_RATK4},  // S_EGGMOBILE4_RATK3
+	{SPR_EGGP, 9,  4, NULL,           0,          0, S_EGGMOBILE4_RATK5},  // S_EGGMOBILE4_RATK4
+	{SPR_EGGP, 9,150, A_Boss4SpeedUp, sfx_mswing, 0, S_EGGMOBILE4_RATK6},  // S_EGGMOBILE4_RATK5
+	{SPR_EGGP,10,  2, NULL,           0,          0, S_EGGMOBILE4_STND},   // S_EGGMOBILE4_RATK6
+	{SPR_EGGP, 0, 20, A_Boss4Raise,   sfx_doord1, 0, S_EGGMOBILE4_RAISE2}, // S_EGGMOBILE4_RAISE1
+	{SPR_EGGP,13, 10, NULL,           0,          0, S_EGGMOBILE4_RAISE3}, // S_EGGMOBILE4_RAISE2
+	{SPR_EGGP,14, 10, NULL,           0,          0, S_EGGMOBILE4_RAISE4}, // S_EGGMOBILE4_RAISE3
+	{SPR_EGGP,13, 10, NULL,           0,          0, S_EGGMOBILE4_RAISE5}, // S_EGGMOBILE4_RAISE4
+	{SPR_EGGP,14, 10, NULL,           0,          0, S_EGGMOBILE4_RAISE6}, // S_EGGMOBILE4_RAISE5
+	{SPR_EGGP,13, 10, NULL,           0,          0, S_EGGMOBILE4_RAISE7}, // S_EGGMOBILE4_RAISE6
+	{SPR_EGGP,14, 10, NULL,           0,          0, S_EGGMOBILE4_RAISE8}, // S_EGGMOBILE4_RAISE7
+	{SPR_EGGP,13, 10, NULL,           0,          0, S_EGGMOBILE4_RAISE9}, // S_EGGMOBILE4_RAISE8
+	{SPR_EGGP,14, 10, NULL,           0,          0, S_EGGMOBILE4_RAISE10},// S_EGGMOBILE4_RAISE9
+	{SPR_EGGP,13, 10, NULL,           0,          0, S_EGGMOBILE4_STND},   // S_EGGMOBILE4_RAISE10
+	{SPR_EGGP,11, 24, A_Pain,         0,          0, S_EGGMOBILE4_STND},   // S_EGGMOBILE4_PAIN
+	{SPR_EGGP,12,  8, A_Fall,         0,          0, S_EGGMOBILE4_DIE2},   // S_EGGMOBILE4_DIE1
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE3},   // S_EGGMOBILE4_DIE2
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE4},   // S_EGGMOBILE4_DIE3
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE5},   // S_EGGMOBILE4_DIE4
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE6},   // S_EGGMOBILE4_DIE5
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE7},   // S_EGGMOBILE4_DIE6
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE8},   // S_EGGMOBILE4_DIE7
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE9},   // S_EGGMOBILE4_DIE8
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE10},  // S_EGGMOBILE4_DIE9
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE11},  // S_EGGMOBILE4_DIE10
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE12},  // S_EGGMOBILE4_DIE11
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE13},  // S_EGGMOBILE4_DIE12
+	{SPR_EGGP,12,  8, A_BossScream,   0,          0, S_EGGMOBILE4_DIE14},  // S_EGGMOBILE4_DIE13
+	{SPR_EGGP,12, -1, A_BossDeath,    0,          0, S_NULL},              // S_EGGMOBILE4_DIE14
+	{SPR_EGGP,13,  5, NULL,           0,          0, S_EGGMOBILE4_FLEE2},  // S_EGGMOBILE4_FLEE1
+	{SPR_EGGP,14,  5, NULL,           0,          0, S_EGGMOBILE4_FLEE1},  // S_EGGMOBILE4_FLEE2
+	{SPR_BMCE, 0, -1, NULL,           0,          0, S_NULL},              // S_EGGMOBILE4_MACE
 
 	// Boss 4 Jet flame
-	{SPR_EFIR, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_JETFLAME2}, // S_JETFLAME1
-	{SPR_EFIR, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_JETFLAME1}, // S_JETFLAME2
+	{SPR_EFIR, FF_FULLBRIGHT, 1, NULL, 0, 0, S_JETFLAME2}, // S_JETFLAME1
+	{SPR_EFIR, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_JETFLAME1}, // S_JETFLAME2
 
-	{SPR_BRAK, 0, 1, {A_SetReactionTime}, 0, 0, S_BLACKEGG_STND2}, // S_BLACKEGG_STND
-	{SPR_BRAK, 0, 7, {A_Look}, 1, 0, S_BLACKEGG_STND2}, // S_BLACKEGG_STND2
-	{SPR_BRAK, 1, 7, {NULL}, 0, 0, S_BLACKEGG_WALK2}, // S_BLACKEGG_WALK1
-	{SPR_BRAK, 2, 7, {NULL}, 0, 0, S_BLACKEGG_WALK3}, // S_BLACKEGG_WALK2
-	{SPR_BRAK, 3, 7, {A_PlaySound}, sfx_bestep, 0, S_BLACKEGG_WALK4}, // S_BLACKEGG_WALK3
-	{SPR_BRAK, 4, 7, {NULL}, 0, 0, S_BLACKEGG_WALK5}, // S_BLACKEGG_WALK4
-	{SPR_BRAK, 5, 7, {NULL}, 0, 0, S_BLACKEGG_WALK6}, // S_BLACKEGG_WALK5
-	{SPR_BRAK, 6, 7, {A_PlaySound}, sfx_bestp2, 0, S_BLACKEGG_WALK1}, // S_BLACKEGG_WALK6
-	{SPR_BRAK, 7, 3, {NULL}, 0, 0, S_BLACKEGG_SHOOT2}, // S_BLACKEGG_SHOOT1
-	{SPR_BRAK, 24, 1, {A_PlaySound}, sfx_befire, 0, S_BLACKEGG_SHOOT1}, // S_BLACKEGG_SHOOT2
+	{SPR_BRAK, 0, 1, A_SetReactionTime, 0, 0, S_BLACKEGG_STND2}, // S_BLACKEGG_STND
+	{SPR_BRAK, 0, 7, A_Look, 1, 0, S_BLACKEGG_STND2}, // S_BLACKEGG_STND2
+	{SPR_BRAK, 1, 7, NULL, 0, 0, S_BLACKEGG_WALK2}, // S_BLACKEGG_WALK1
+	{SPR_BRAK, 2, 7, NULL, 0, 0, S_BLACKEGG_WALK3}, // S_BLACKEGG_WALK2
+	{SPR_BRAK, 3, 7, A_PlaySound, sfx_bestep, 0, S_BLACKEGG_WALK4}, // S_BLACKEGG_WALK3
+	{SPR_BRAK, 4, 7, NULL, 0, 0, S_BLACKEGG_WALK5}, // S_BLACKEGG_WALK4
+	{SPR_BRAK, 5, 7, NULL, 0, 0, S_BLACKEGG_WALK6}, // S_BLACKEGG_WALK5
+	{SPR_BRAK, 6, 7, A_PlaySound, sfx_bestp2, 0, S_BLACKEGG_WALK1}, // S_BLACKEGG_WALK6
+	{SPR_BRAK, 7, 3, NULL, 0, 0, S_BLACKEGG_SHOOT2}, // S_BLACKEGG_SHOOT1
+	{SPR_BRAK, 24, 1, A_PlaySound, sfx_befire, 0, S_BLACKEGG_SHOOT1}, // S_BLACKEGG_SHOOT2
 
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN2}, // S_BLACKEGG_PAIN1
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN3}, // S_BLACKEGG_PAIN2
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN4}, // S_BLACKEGG_PAIN3
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN5}, // S_BLACKEGG_PAIN4
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN6}, // S_BLACKEGG_PAIN5
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN7}, // S_BLACKEGG_PAIN6
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN8}, // S_BLACKEGG_PAIN7
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN9}, // S_BLACKEGG_PAIN8
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN10}, // S_BLACKEGG_PAIN9
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN11}, // S_BLACKEGG_PAIN10
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN12}, // S_BLACKEGG_PAIN11
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN13}, // S_BLACKEGG_PAIN12
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN14}, // S_BLACKEGG_PAIN13
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN15}, // S_BLACKEGG_PAIN14
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN16}, // S_BLACKEGG_PAIN15
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN17}, // S_BLACKEGG_PAIN16
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN18}, // S_BLACKEGG_PAIN17
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN19}, // S_BLACKEGG_PAIN18
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN20}, // S_BLACKEGG_PAIN19
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN21}, // S_BLACKEGG_PAIN20
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN22}, // S_BLACKEGG_PAIN21
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN23}, // S_BLACKEGG_PAIN22
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN24}, // S_BLACKEGG_PAIN23
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN25}, // S_BLACKEGG_PAIN24
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN26}, // S_BLACKEGG_PAIN25
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN27}, // S_BLACKEGG_PAIN26
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN28}, // S_BLACKEGG_PAIN27
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN29}, // S_BLACKEGG_PAIN28
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN30}, // S_BLACKEGG_PAIN29
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN31}, // S_BLACKEGG_PAIN30
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN32}, // S_BLACKEGG_PAIN31
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN33}, // S_BLACKEGG_PAIN32
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN34}, // S_BLACKEGG_PAIN33
-	{SPR_BRAK, 25, 1, {NULL}, 0, 0, S_BLACKEGG_PAIN35}, // S_BLACKEGG_PAIN34
-	{SPR_BRAK, 8, 1, {NULL}, 0, 0, S_BLACKEGG_WALK1}, // S_BLACKEGG_PAIN35
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN2}, // S_BLACKEGG_PAIN1
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN3}, // S_BLACKEGG_PAIN2
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN4}, // S_BLACKEGG_PAIN3
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN5}, // S_BLACKEGG_PAIN4
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN6}, // S_BLACKEGG_PAIN5
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN7}, // S_BLACKEGG_PAIN6
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN8}, // S_BLACKEGG_PAIN7
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN9}, // S_BLACKEGG_PAIN8
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN10}, // S_BLACKEGG_PAIN9
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN11}, // S_BLACKEGG_PAIN10
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN12}, // S_BLACKEGG_PAIN11
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN13}, // S_BLACKEGG_PAIN12
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN14}, // S_BLACKEGG_PAIN13
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN15}, // S_BLACKEGG_PAIN14
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN16}, // S_BLACKEGG_PAIN15
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN17}, // S_BLACKEGG_PAIN16
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN18}, // S_BLACKEGG_PAIN17
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN19}, // S_BLACKEGG_PAIN18
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN20}, // S_BLACKEGG_PAIN19
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN21}, // S_BLACKEGG_PAIN20
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN22}, // S_BLACKEGG_PAIN21
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN23}, // S_BLACKEGG_PAIN22
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN24}, // S_BLACKEGG_PAIN23
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN25}, // S_BLACKEGG_PAIN24
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN26}, // S_BLACKEGG_PAIN25
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN27}, // S_BLACKEGG_PAIN26
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN28}, // S_BLACKEGG_PAIN27
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN29}, // S_BLACKEGG_PAIN28
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN30}, // S_BLACKEGG_PAIN29
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN31}, // S_BLACKEGG_PAIN30
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN32}, // S_BLACKEGG_PAIN31
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN33}, // S_BLACKEGG_PAIN32
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_PAIN34}, // S_BLACKEGG_PAIN33
+	{SPR_BRAK, 25, 1, NULL, 0, 0, S_BLACKEGG_PAIN35}, // S_BLACKEGG_PAIN34
+	{SPR_BRAK, 8, 1, NULL, 0, 0, S_BLACKEGG_WALK1}, // S_BLACKEGG_PAIN35
 
-	{SPR_BRAK, 9, 20, {NULL}, 0, 0, S_BLACKEGG_HITFACE2}, // S_BLACKEGG_HITFACE1
-	{SPR_BRAK, 10, 2, {NULL}, 0, 0, S_BLACKEGG_HITFACE3}, // S_BLACKEGG_HITFACE2
-	{SPR_BRAK, 11, 2, {NULL}, 0, 0, S_BLACKEGG_HITFACE4}, // S_BLACKEGG_HITFACE3
-	{SPR_BRAK, 12,14, {NULL}, 0, 0, S_BLACKEGG_PAIN1}, // S_BLACKEGG_HITFACE4
+	{SPR_BRAK, 9, 20, NULL, 0, 0, S_BLACKEGG_HITFACE2}, // S_BLACKEGG_HITFACE1
+	{SPR_BRAK, 10, 2, NULL, 0, 0, S_BLACKEGG_HITFACE3}, // S_BLACKEGG_HITFACE2
+	{SPR_BRAK, 11, 2, NULL, 0, 0, S_BLACKEGG_HITFACE4}, // S_BLACKEGG_HITFACE3
+	{SPR_BRAK, 12,14, NULL, 0, 0, S_BLACKEGG_PAIN1}, // S_BLACKEGG_HITFACE4
 
-	{SPR_BRAK, 13, 14, {NULL}, 0, 0, S_BLACKEGG_DIE2}, // S_BLACKEGG_DIE1
-	{SPR_BRAK, 14, 7, {NULL}, 0, 0, S_BLACKEGG_DIE3}, // S_BLACKEGG_DIE2
-	{SPR_BRAK, 15, 5, {NULL}, 0, 0, S_BLACKEGG_DIE4}, // S_BLACKEGG_DIE3
-	{SPR_BRAK, 16, 3, {A_PlaySound}, sfx_bgxpld, 0, S_BLACKEGG_DIE5}, // S_BLACKEGG_DIE4
-	{SPR_BRAK, 17, -1, {NULL}, 0, 0, S_BLACKEGG_DIE5}, // S_BLACKEGG_DIE5
+	{SPR_BRAK, 13, 14, NULL, 0, 0, S_BLACKEGG_DIE2}, // S_BLACKEGG_DIE1
+	{SPR_BRAK, 14, 7, NULL, 0, 0, S_BLACKEGG_DIE3}, // S_BLACKEGG_DIE2
+	{SPR_BRAK, 15, 5, NULL, 0, 0, S_BLACKEGG_DIE4}, // S_BLACKEGG_DIE3
+	{SPR_BRAK, 16, 3, A_PlaySound, sfx_bgxpld, 0, S_BLACKEGG_DIE5}, // S_BLACKEGG_DIE4
+	{SPR_BRAK, 17, -1, NULL, 0, 0, S_BLACKEGG_DIE5}, // S_BLACKEGG_DIE5
 
-	{SPR_BRAK, 18, 14, {NULL}, 0, 0, S_BLACKEGG_MISSILE2}, // S_BLACKEGG_MISSILE1
-	{SPR_BRAK, 19, 5, {NULL}, 0, 0, S_BLACKEGG_MISSILE3}, // S_BLACKEGG_MISSILE2
-	{SPR_BRAK, 20, 35, {A_Boss7FireMissiles}, MT_BLACKEGGMAN_MISSILE, sfx_beshot, S_BLACKEGG_JUMP1}, // S_BLACKEGG_MISSILE3
+	{SPR_BRAK, 18, 14, NULL, 0, 0, S_BLACKEGG_MISSILE2}, // S_BLACKEGG_MISSILE1
+	{SPR_BRAK, 19, 5, NULL, 0, 0, S_BLACKEGG_MISSILE3}, // S_BLACKEGG_MISSILE2
+	{SPR_BRAK, 20, 35, A_Boss7FireMissiles, MT_BLACKEGGMAN_MISSILE, sfx_beshot, S_BLACKEGG_JUMP1}, // S_BLACKEGG_MISSILE3
 
-	{SPR_BRAK, 21, -1, {NULL}, 0, 0, S_BLACKEGG_STND}, // S_BLACKEGG_GOOP
+	{SPR_BRAK, 21, -1, NULL, 0, 0, S_BLACKEGG_STND}, // S_BLACKEGG_GOOP
 
-	{SPR_BRAK, 22, 14, {A_PlaySound}, sfx_belnch, 0, S_BLACKEGG_JUMP2}, // S_BLACKEGG_JUMP1
-	{SPR_BRAK, 23, -1, {NULL}, 0, 0, S_BLACKEGG_WALK1}, // S_BLACKEGG_JUMP2
+	{SPR_BRAK, 22, 14, A_PlaySound, sfx_belnch, 0, S_BLACKEGG_JUMP2}, // S_BLACKEGG_JUMP1
+	{SPR_BRAK, 23, -1, NULL, 0, 0, S_BLACKEGG_WALK1}, // S_BLACKEGG_JUMP2
 
-	{SPR_BRAK, 21, 3*TICRATE, {NULL}, 0, 0, S_BLACKEGG_DESTROYPLAT2}, // S_BLACKEGG_DESTROYPLAT1
-	{SPR_BRAK, 21, 1, {A_PlaySound}, sfx_s3k54, 0, S_BLACKEGG_DESTROYPLAT3}, // S_BLACKEGG_DESTROYPLAT2
-	{SPR_BRAK, 21, 14, {A_LinedefExecute}, 4200, 0, S_BLACKEGG_STND}, // S_BLACKEGG_DESTROYPLAT3
+	{SPR_BRAK, 21, 3*TICRATE, NULL, 0, 0, S_BLACKEGG_DESTROYPLAT2}, // S_BLACKEGG_DESTROYPLAT1
+	{SPR_BRAK, 21, 1, A_PlaySound, sfx_s3k54, 0, S_BLACKEGG_DESTROYPLAT3}, // S_BLACKEGG_DESTROYPLAT2
+	{SPR_BRAK, 21, 14, A_LinedefExecute, 4200, 0, S_BLACKEGG_STND}, // S_BLACKEGG_DESTROYPLAT3
 
-	{SPR_NULL, 0, 1, {A_CapeChase}, (160 - 20) << 16, 0, S_BLACKEGG_HELPER}, // S_BLACKEGG_HELPER
+	{SPR_NULL, 0, 1, A_CapeChase, (160 - 20) << 16, 0, S_BLACKEGG_HELPER}, // S_BLACKEGG_HELPER
 
-	{SPR_BGOO, FF_TRANS50  , 2, {NULL}, 0, 0, S_BLACKEGG_GOOP2}, // S_BLACKEGG_GOOP1
-	{SPR_BGOO, FF_TRANS50|1, 2, {NULL}, 0, 0, S_BLACKEGG_GOOP1}, // S_BLACKEGG_GOOP2
-	{SPR_BGOO, FF_TRANS50|2, 6*TICRATE, {A_GoopSplat}, 0, 0, S_BLACKEGG_GOOP4}, // S_BLACKEGG_GOOP3
-	{SPR_BGOO, FF_TRANS60|2, 4, {NULL}, 0, 0, S_BLACKEGG_GOOP5}, // S_BLACKEGG_GOOP4
-	{SPR_BGOO, FF_TRANS70|2, 4, {NULL}, 0, 0, S_BLACKEGG_GOOP6}, // S_BLACKEGG_GOOP5
-	{SPR_BGOO, FF_TRANS80|2, 4, {NULL}, 0, 0, S_BLACKEGG_GOOP7}, // S_BLACKEGG_GOOP6
-	{SPR_BGOO, FF_TRANS90|2, 4, {NULL}, 0, 0, S_NULL}, // S_BLACKEGG_GOOP7
+	{SPR_BGOO, FF_TRANS50  , 2, NULL, 0, 0, S_BLACKEGG_GOOP2}, // S_BLACKEGG_GOOP1
+	{SPR_BGOO, FF_TRANS50|1, 2, NULL, 0, 0, S_BLACKEGG_GOOP1}, // S_BLACKEGG_GOOP2
+	{SPR_BGOO, FF_TRANS50|2, 6*TICRATE, A_GoopSplat, 0, 0, S_BLACKEGG_GOOP4}, // S_BLACKEGG_GOOP3
+	{SPR_BGOO, FF_TRANS60|2, 4, NULL, 0, 0, S_BLACKEGG_GOOP5}, // S_BLACKEGG_GOOP4
+	{SPR_BGOO, FF_TRANS70|2, 4, NULL, 0, 0, S_BLACKEGG_GOOP6}, // S_BLACKEGG_GOOP5
+	{SPR_BGOO, FF_TRANS80|2, 4, NULL, 0, 0, S_BLACKEGG_GOOP7}, // S_BLACKEGG_GOOP6
+	{SPR_BGOO, FF_TRANS90|2, 4, NULL, 0, 0, S_NULL}, // S_BLACKEGG_GOOP7
 
-	{SPR_BMSL, 0, 1, {NULL}, 0, 0, S_BLACKEGG_MISSILE}, // S_BLACKEGG_MISSILE
+	{SPR_BMSL, 0, 1, NULL, 0, 0, S_BLACKEGG_MISSILE}, // S_BLACKEGG_MISSILE
 
 	// New Very-Last-Minute 2.1 Brak Eggman (Cy-Brak-demon)
-	{SPR_BRAK, 0, 10, {A_Look}, 0, 0, S_CYBRAKDEMON_IDLE}, // S_CYBRAKDEMON_IDLE
-	{SPR_BRAK, 1, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK2}, // S_CYBRAKDEMON_WALK1
-	{SPR_BRAK, 2, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK3}, // S_CYBRAKDEMON_WALK2
-	{SPR_BRAK, 3, 8, {A_BrakChase}, 3, sfx_bestep, S_CYBRAKDEMON_WALK4}, // S_CYBRAKDEMON_WALK3
-	{SPR_BRAK, 4, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK5}, // S_CYBRAKDEMON_WALK4
-	{SPR_BRAK, 5, 8, {A_BrakChase}, 3, 0, S_CYBRAKDEMON_WALK6}, // S_CYBRAKDEMON_WALK5
-	{SPR_BRAK, 6, 8, {A_BrakChase}, 3, sfx_bestp2, S_CYBRAKDEMON_WALK1}, // S_CYBRAKDEMON_WALK6
-	{SPR_BRAK, 7, 6, {A_RandomState}, S_CYBRAKDEMON_MISSILE_ATTACK1, S_CYBRAKDEMON_FLAME_ATTACK1, S_CYBRAKDEMON_MISSILE_ATTACK1}, // S_CYBRAKDEMON_CHOOSE_ATTACK1
-	{SPR_BRAK, 7, 6, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK2}, // S_CYBRAKDEMON_MISSILE_ATTACK1 // Aim
-	{SPR_BRAK, 26 + FF_FULLBRIGHT, 12, {A_BrakFireShot}, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_MISSILE_ATTACK3}, // S_CYBRAKDEMON_MISSILE_ATTACK2 // Fire
-	{SPR_BRAK, 7, 12, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK4}, // S_CYBRAKDEMON_MISSILE_ATTACK3 // Aim
-	{SPR_BRAK, 26 + FF_FULLBRIGHT, 12, {A_BrakFireShot}, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_MISSILE_ATTACK5}, // S_CYBRAKDEMON_MISSILE_ATTACK4 // Fire
-	{SPR_BRAK, 7, 12, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK6}, // S_CYBRAKDEMON_MISSILE_ATTACK5 // Aim
-	{SPR_BRAK, 26 + FF_FULLBRIGHT, 12, {A_BrakFireShot}, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_FINISH_ATTACK1}, // S_CYBRAKDEMON_MISSILE_ATTACK6 // Fire
-	{SPR_BRAK, 7, 1, {A_Repeat}, 1, S_CYBRAKDEMON_FLAME_ATTACK1, S_CYBRAKDEMON_FLAME_ATTACK2}, // S_CYBRAKDEMON_FLAME_ATTACK1 // Reset
-	{SPR_BRAK, 7, 6, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_FLAME_ATTACK3}, // S_CYBRAKDEMON_FLAME_ATTACK2 // Aim
-	{SPR_BRAK, 26 + FF_FULLBRIGHT, 2, {A_BrakFireShot}, MT_CYBRAKDEMON_FLAMESHOT, 128, S_CYBRAKDEMON_FLAME_ATTACK4}, // S_CYBRAKDEMON_FLAME_ATTACK3 // Fire
-	{SPR_BRAK, 7, 1, {A_Repeat}, 30, S_CYBRAKDEMON_FLAME_ATTACK3, S_CYBRAKDEMON_FINISH_ATTACK1}, // S_CYBRAKDEMON_FLAME_ATTACK4 // Loop
-	{SPR_BRAK, 0, 6, {A_RandomState}, S_CYBRAKDEMON_VILE_ATTACK1, S_CYBRAKDEMON_NAPALM_ATTACK1, S_CYBRAKDEMON_MISSILE_ATTACK1}, // S_CYBRAKDEMON_CHOOSE_ATTACK2
-	{SPR_BRAK, 20, 0, {A_LinedefExecute}, LE_BRAKVILEATACK, 0, S_CYBRAKDEMON_VILE_ATTACK2}, // S_CYBRAKDEMON_VILE_ATTACK1
-	{SPR_BRAK, 20, 24, {A_VileTarget}, MT_CYBRAKDEMON_TARGET_RETICULE, 1, S_CYBRAKDEMON_VILE_ATTACK3}, // S_CYBRAKDEMON_VILE_ATTACK2
-	{SPR_BRAK, 19, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK4}, // S_CYBRAKDEMON_VILE_ATTACK3
-	{SPR_BRAK, 18, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK5}, // S_CYBRAKDEMON_VILE_ATTACK4
-	{SPR_BRAK, 8, 32, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_VILE_ATTACK6}, // S_CYBRAKDEMON_VILE_ATTACK5
-	{SPR_BRAK, 20 + FF_FULLBRIGHT, 28, {A_VileAttack}, sfx_brakrx, MT_CYBRAKDEMON_VILE_EXPLOSION + (1<<16), S_CYBRAKDEMON_FINISH_ATTACK1}, // S_CYBRAKDEMON_VILE_ATTACK6
-	{SPR_BRAK, 0, 6, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_NAPALM_ATTACK2}, // S_CYBRAKDEMON_NAPALM_ATTACK1
-	{SPR_BRAK, 21 + FF_FULLBRIGHT, 8, {A_BrakLobShot}, MT_CYBRAKDEMON_NAPALM_BOMB_LARGE, 96, S_CYBRAKDEMON_NAPALM_ATTACK3}, // S_CYBRAKDEMON_NAPALM_ATTACK2
-	{SPR_BRAK, 0, 8, {A_FaceTarget}, 0, 0, S_CYBRAKDEMON_FINISH_ATTACK1}, // S_CYBRAKDEMON_NAPALM_ATTACK3
-	{SPR_BRAK, 0, 0, {A_SetObjectFlags2}, MF2_FRET, 1, S_CYBRAKDEMON_FINISH_ATTACK2}, // S_CYBRAKDEMON_FINISH_ATTACK1 // If just attacked, remove MF2_FRET w/out going back to spawnstate
-	{SPR_BRAK, 0, 0, {A_SetReactionTime}, 0, 0, S_CYBRAKDEMON_WALK1}, // S_CYBRAKDEMON_FINISH_ATTACK2 // If just attacked, remove MF2_FRET w/out going back to spawnstate
-	{SPR_BRAK, 18, 24, {A_Pain}, 0, 0, S_CYBRAKDEMON_PAIN2}, // S_CYBRAKDEMON_PAIN1
-	{SPR_BRAK, 18, 0, {A_CheckHealth}, 3, S_CYBRAKDEMON_PAIN3, S_CYBRAKDEMON_CHOOSE_ATTACK1}, // S_CYBRAKDEMON_PAIN2
-	{SPR_BRAK, 18, 0, {A_LinedefExecute}, LE_PINCHPHASE, 0, S_CYBRAKDEMON_CHOOSE_ATTACK1}, // S_CYBRAKDEMON_PAIN3
-	{SPR_BRAK, 18, 1, {A_Repeat}, 1, S_CYBRAKDEMON_DIE1, S_CYBRAKDEMON_DIE2}, // S_CYBRAKDEMON_DIE1
-	{SPR_BRAK, 18, 2, {A_BossScream}, 0, MT_SONIC3KBOSSEXPLODE, S_CYBRAKDEMON_DIE3}, // S_CYBRAKDEMON_DIE2
-	{SPR_BRAK, 18, 0, {A_Repeat}, 52, S_CYBRAKDEMON_DIE2, S_CYBRAKDEMON_DIE4}, // S_CYBRAKDEMON_DIE3
-	{SPR_BRAK, 13, 14, {A_PlaySound}, sfx_bedie2, 0, S_CYBRAKDEMON_DIE5}, // S_CYBRAKDEMON_DIE4
-	{SPR_BRAK, 14, 7, {NULL}, 0, 0, S_CYBRAKDEMON_DIE6}, // S_CYBRAKDEMON_DIE5
-	{SPR_BRAK, 15, 5, {NULL}, 0, 0, S_CYBRAKDEMON_DIE7}, // S_CYBRAKDEMON_DIE6
-	{SPR_BRAK, 16, 3, {A_PlaySound}, sfx_bgxpld, 0, S_CYBRAKDEMON_DIE8}, // S_CYBRAKDEMON_DIE7
-	{SPR_BRAK, 17, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_CYBRAKDEMON_DIE8
-	{SPR_BRAK, 0, 0, {A_SetObjectFlags}, MF_SPECIAL|MF_SHOOTABLE, 2, S_CYBRAKDEMON_IDLE}, // S_CYBRAKDEMON_DEINVINCIBLERIZE
-	{SPR_BRAK, 0, 0, {A_SetObjectFlags}, MF_SPECIAL|MF_SHOOTABLE, 1, S_CYBRAKDEMON_IDLE}, // S_CYBRAKDEMON_INVINCIBLERIZE
+	{SPR_BRAK, 0, 10, A_Look, 0, 0, S_CYBRAKDEMON_IDLE}, // S_CYBRAKDEMON_IDLE
+	{SPR_BRAK, 1, 8, A_BrakChase, 3, 0, S_CYBRAKDEMON_WALK2}, // S_CYBRAKDEMON_WALK1
+	{SPR_BRAK, 2, 8, A_BrakChase, 3, 0, S_CYBRAKDEMON_WALK3}, // S_CYBRAKDEMON_WALK2
+	{SPR_BRAK, 3, 8, A_BrakChase, 3, sfx_bestep, S_CYBRAKDEMON_WALK4}, // S_CYBRAKDEMON_WALK3
+	{SPR_BRAK, 4, 8, A_BrakChase, 3, 0, S_CYBRAKDEMON_WALK5}, // S_CYBRAKDEMON_WALK4
+	{SPR_BRAK, 5, 8, A_BrakChase, 3, 0, S_CYBRAKDEMON_WALK6}, // S_CYBRAKDEMON_WALK5
+	{SPR_BRAK, 6, 8, A_BrakChase, 3, sfx_bestp2, S_CYBRAKDEMON_WALK1}, // S_CYBRAKDEMON_WALK6
+	{SPR_BRAK, 7, 6, A_RandomState, S_CYBRAKDEMON_MISSILE_ATTACK1, S_CYBRAKDEMON_FLAME_ATTACK1, S_CYBRAKDEMON_MISSILE_ATTACK1}, // S_CYBRAKDEMON_CHOOSE_ATTACK1
+	{SPR_BRAK, 7, 6, A_FaceTarget, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK2}, // S_CYBRAKDEMON_MISSILE_ATTACK1 // Aim
+	{SPR_BRAK, 26 + FF_FULLBRIGHT, 12, A_BrakFireShot, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_MISSILE_ATTACK3}, // S_CYBRAKDEMON_MISSILE_ATTACK2 // Fire
+	{SPR_BRAK, 7, 12, A_FaceTarget, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK4}, // S_CYBRAKDEMON_MISSILE_ATTACK3 // Aim
+	{SPR_BRAK, 26 + FF_FULLBRIGHT, 12, A_BrakFireShot, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_MISSILE_ATTACK5}, // S_CYBRAKDEMON_MISSILE_ATTACK4 // Fire
+	{SPR_BRAK, 7, 12, A_FaceTarget, 0, 0, S_CYBRAKDEMON_MISSILE_ATTACK6}, // S_CYBRAKDEMON_MISSILE_ATTACK5 // Aim
+	{SPR_BRAK, 26 + FF_FULLBRIGHT, 12, A_BrakFireShot, MT_CYBRAKDEMON_MISSILE, 128, S_CYBRAKDEMON_FINISH_ATTACK1}, // S_CYBRAKDEMON_MISSILE_ATTACK6 // Fire
+	{SPR_BRAK, 7, 1, A_Repeat, 1, S_CYBRAKDEMON_FLAME_ATTACK1, S_CYBRAKDEMON_FLAME_ATTACK2}, // S_CYBRAKDEMON_FLAME_ATTACK1 // Reset
+	{SPR_BRAK, 7, 6, A_FaceTarget, 0, 0, S_CYBRAKDEMON_FLAME_ATTACK3}, // S_CYBRAKDEMON_FLAME_ATTACK2 // Aim
+	{SPR_BRAK, 26 + FF_FULLBRIGHT, 2, A_BrakFireShot, MT_CYBRAKDEMON_FLAMESHOT, 128, S_CYBRAKDEMON_FLAME_ATTACK4}, // S_CYBRAKDEMON_FLAME_ATTACK3 // Fire
+	{SPR_BRAK, 7, 1, A_Repeat, 30, S_CYBRAKDEMON_FLAME_ATTACK3, S_CYBRAKDEMON_FINISH_ATTACK1}, // S_CYBRAKDEMON_FLAME_ATTACK4 // Loop
+	{SPR_BRAK, 0, 6, A_RandomState, S_CYBRAKDEMON_VILE_ATTACK1, S_CYBRAKDEMON_NAPALM_ATTACK1, S_CYBRAKDEMON_MISSILE_ATTACK1}, // S_CYBRAKDEMON_CHOOSE_ATTACK2
+	{SPR_BRAK, 20, 0, A_LinedefExecute, LE_BRAKVILEATACK, 0, S_CYBRAKDEMON_VILE_ATTACK2}, // S_CYBRAKDEMON_VILE_ATTACK1
+	{SPR_BRAK, 20, 24, A_VileTarget, MT_CYBRAKDEMON_TARGET_RETICULE, 1, S_CYBRAKDEMON_VILE_ATTACK3}, // S_CYBRAKDEMON_VILE_ATTACK2
+	{SPR_BRAK, 19, 8, A_FaceTarget, 0, 0, S_CYBRAKDEMON_VILE_ATTACK4}, // S_CYBRAKDEMON_VILE_ATTACK3
+	{SPR_BRAK, 18, 8, A_FaceTarget, 0, 0, S_CYBRAKDEMON_VILE_ATTACK5}, // S_CYBRAKDEMON_VILE_ATTACK4
+	{SPR_BRAK, 8, 32, A_FaceTarget, 0, 0, S_CYBRAKDEMON_VILE_ATTACK6}, // S_CYBRAKDEMON_VILE_ATTACK5
+	{SPR_BRAK, 20 + FF_FULLBRIGHT, 28, A_VileAttack, sfx_brakrx, MT_CYBRAKDEMON_VILE_EXPLOSION + (1<<16), S_CYBRAKDEMON_FINISH_ATTACK1}, // S_CYBRAKDEMON_VILE_ATTACK6
+	{SPR_BRAK, 0, 6, A_FaceTarget, 0, 0, S_CYBRAKDEMON_NAPALM_ATTACK2}, // S_CYBRAKDEMON_NAPALM_ATTACK1
+	{SPR_BRAK, 21 + FF_FULLBRIGHT, 8, A_BrakLobShot, MT_CYBRAKDEMON_NAPALM_BOMB_LARGE, 96, S_CYBRAKDEMON_NAPALM_ATTACK3}, // S_CYBRAKDEMON_NAPALM_ATTACK2
+	{SPR_BRAK, 0, 8, A_FaceTarget, 0, 0, S_CYBRAKDEMON_FINISH_ATTACK1}, // S_CYBRAKDEMON_NAPALM_ATTACK3
+	{SPR_BRAK, 0, 0, A_SetObjectFlags2, MF2_FRET, 1, S_CYBRAKDEMON_FINISH_ATTACK2}, // S_CYBRAKDEMON_FINISH_ATTACK1 // If just attacked, remove MF2_FRET w/out going back to spawnstate
+	{SPR_BRAK, 0, 0, A_SetReactionTime, 0, 0, S_CYBRAKDEMON_WALK1}, // S_CYBRAKDEMON_FINISH_ATTACK2 // If just attacked, remove MF2_FRET w/out going back to spawnstate
+	{SPR_BRAK, 18, 24, A_Pain, 0, 0, S_CYBRAKDEMON_PAIN2}, // S_CYBRAKDEMON_PAIN1
+	{SPR_BRAK, 18, 0, A_CheckHealth, 3, S_CYBRAKDEMON_PAIN3, S_CYBRAKDEMON_CHOOSE_ATTACK1}, // S_CYBRAKDEMON_PAIN2
+	{SPR_BRAK, 18, 0, A_LinedefExecute, LE_PINCHPHASE, 0, S_CYBRAKDEMON_CHOOSE_ATTACK1}, // S_CYBRAKDEMON_PAIN3
+	{SPR_BRAK, 18, 1, A_Repeat, 1, S_CYBRAKDEMON_DIE1, S_CYBRAKDEMON_DIE2}, // S_CYBRAKDEMON_DIE1
+	{SPR_BRAK, 18, 2, A_BossScream, 0, MT_SONIC3KBOSSEXPLODE, S_CYBRAKDEMON_DIE3}, // S_CYBRAKDEMON_DIE2
+	{SPR_BRAK, 18, 0, A_Repeat, 52, S_CYBRAKDEMON_DIE2, S_CYBRAKDEMON_DIE4}, // S_CYBRAKDEMON_DIE3
+	{SPR_BRAK, 13, 14, A_PlaySound, sfx_bedie2, 0, S_CYBRAKDEMON_DIE5}, // S_CYBRAKDEMON_DIE4
+	{SPR_BRAK, 14, 7, NULL, 0, 0, S_CYBRAKDEMON_DIE6}, // S_CYBRAKDEMON_DIE5
+	{SPR_BRAK, 15, 5, NULL, 0, 0, S_CYBRAKDEMON_DIE7}, // S_CYBRAKDEMON_DIE6
+	{SPR_BRAK, 16, 3, A_PlaySound, sfx_bgxpld, 0, S_CYBRAKDEMON_DIE8}, // S_CYBRAKDEMON_DIE7
+	{SPR_BRAK, 17, -1, A_BossDeath, 0, 0, S_NULL}, // S_CYBRAKDEMON_DIE8
+	{SPR_BRAK, 0, 0, A_SetObjectFlags, MF_SPECIAL|MF_SHOOTABLE, 2, S_CYBRAKDEMON_IDLE}, // S_CYBRAKDEMON_DEINVINCIBLERIZE
+	{SPR_BRAK, 0, 0, A_SetObjectFlags, MF_SPECIAL|MF_SHOOTABLE, 1, S_CYBRAKDEMON_IDLE}, // S_CYBRAKDEMON_INVINCIBLERIZE
 
-	{SPR_RCKT, 0 + FF_FULLBRIGHT, 1, {A_SetObjectFlags2}, MF2_RAILRING, 2, S_CYBRAKDEMONMISSILE}, // S_CYBRAKDEMONMISSILE
-	{SPR_RCKT, 1 + FF_FULLBRIGHT, 8, {A_Explode}, 0, 0, S_CYBRAKDEMONMISSILE_EXPLODE2}, // S_CYBRAKDEMONMISSILE_EXPLODE1 //TODO: set missile mobj's "damage" to an appropriate radius
-	{SPR_RCKT, 2 + FF_FULLBRIGHT, 6, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (6<<16), 32 + (16<<16), S_CYBRAKDEMONMISSILE_EXPLODE3}, // S_CYBRAKDEMONMISSILE_EXPLODE2
-	{SPR_RCKT, 3 + FF_FULLBRIGHT, 4, {NULL}, 0, 0, S_NULL}, // S_CYBRAKDEMONMISSILE_EXPLODE3
+	{SPR_RCKT, 0 + FF_FULLBRIGHT, 1, A_SetObjectFlags2, MF2_RAILRING, 2, S_CYBRAKDEMONMISSILE}, // S_CYBRAKDEMONMISSILE
+	{SPR_RCKT, 1 + FF_FULLBRIGHT, 8, A_Explode, 0, 0, S_CYBRAKDEMONMISSILE_EXPLODE2}, // S_CYBRAKDEMONMISSILE_EXPLODE1 //TODO: set missile mobj's "damage" to an appropriate radius
+	{SPR_RCKT, 2 + FF_FULLBRIGHT, 6, A_NapalmScatter, MT_CYBRAKDEMON_NAPALM_FLAMES + (6<<16), 32 + (16<<16), S_CYBRAKDEMONMISSILE_EXPLODE3}, // S_CYBRAKDEMONMISSILE_EXPLODE2
+	{SPR_RCKT, 3 + FF_FULLBRIGHT, 4, NULL, 0, 0, S_NULL}, // S_CYBRAKDEMONMISSILE_EXPLODE3
 
-	{SPR_FLME, FF_TRANS50|FF_FULLBRIGHT  , 15, {NULL}, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY2}, // S_CYBRAKDEMONFLAMESHOT_FLY1
-	{SPR_FLME, FF_TRANS50|FF_FULLBRIGHT|1, 15, {NULL}, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY3}, // S_CYBRAKDEMONFLAMESHOT_FLY2
-	{SPR_FLME, FF_TRANS50|FF_FULLBRIGHT|2, -1, {NULL}, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY3}, // S_CYBRAKDEMONFLAMESHOT_FLY3
-	{SPR_FLME, FF_TRANS50|FF_FULLBRIGHT|2, 0, {A_SpawnObjectRelative}, 0, MT_CYBRAKDEMON_FLAMEREST, S_NULL}, // S_CYBRAKDEMONFLAMESHOT_DIE
+	{SPR_FLME, FF_TRANS50|FF_FULLBRIGHT  , 15, NULL, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY2}, // S_CYBRAKDEMONFLAMESHOT_FLY1
+	{SPR_FLME, FF_TRANS50|FF_FULLBRIGHT|1, 15, NULL, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY3}, // S_CYBRAKDEMONFLAMESHOT_FLY2
+	{SPR_FLME, FF_TRANS50|FF_FULLBRIGHT|2, -1, NULL, 0, 0, S_CYBRAKDEMONFLAMESHOT_FLY3}, // S_CYBRAKDEMONFLAMESHOT_FLY3
+	{SPR_FLME, FF_TRANS50|FF_FULLBRIGHT|2, 0, A_SpawnObjectRelative, 0, MT_CYBRAKDEMON_FLAMEREST, S_NULL}, // S_CYBRAKDEMONFLAMESHOT_DIE
 
-	{SPR_FLAM, FF_TRANS50|FF_FULLBRIGHT|3, 3, {A_SetFuse}, 10*TICRATE, 0, S_FLAME1}, // S_CYBRAKDEMONFLAMEREST
+	{SPR_FLAM, FF_TRANS50|FF_FULLBRIGHT|3, 3, A_SetFuse, 10*TICRATE, 0, S_FLAME1}, // S_CYBRAKDEMONFLAMEREST
 
-	{SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_INIT2}, // S_CYBRAKDEMONELECTRICBARRIER_INIT1
-	{SPR_ELEC, 0 + FF_FULLBRIGHT, 0, {A_RemoteAction}, -1, S_CYBRAKDEMON_INVINCIBLERIZE, S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND}, // S_CYBRAKDEMONELECTRICBARRIER_INIT2
-	{SPR_ELEC, 0 + FF_FULLBRIGHT, 0, {A_PlayActiveSound}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER1}, // S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND
-	{SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER2}, // S_CYBRAKDEMONELECTRICBARRIER1
-	{SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER3}, // S_CYBRAKDEMONELECTRICBARRIER2
-	{SPR_ELEC, 1 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER4}, // S_CYBRAKDEMONELECTRICBARRIER3
-	{SPR_ELEC, 1 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER5}, // S_CYBRAKDEMONELECTRICBARRIER4
-	{SPR_ELEC, 2 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER6}, // S_CYBRAKDEMONELECTRICBARRIER5
-	{SPR_ELEC, 2 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER7}, // S_CYBRAKDEMONELECTRICBARRIER6
-	{SPR_ELEC, 3 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER8}, // S_CYBRAKDEMONELECTRICBARRIER7
-	{SPR_ELEC, 3 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER9}, // S_CYBRAKDEMONELECTRICBARRIER8
-	{SPR_ELEC, 4 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER10}, // S_CYBRAKDEMONELECTRICBARRIER9
-	{SPR_ELEC, 4 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER11}, // S_CYBRAKDEMONELECTRICBARRIER10
-	{SPR_ELEC, 5 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER12}, // S_CYBRAKDEMONELECTRICBARRIER11
-	{SPR_ELEC, 5 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER13}, // S_CYBRAKDEMONELECTRICBARRIER12
-	{SPR_ELEC, 6 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER14}, // S_CYBRAKDEMONELECTRICBARRIER13
-	{SPR_ELEC, 6 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER15}, // S_CYBRAKDEMONELECTRICBARRIER14
-	{SPR_ELEC, 7 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER16}, // S_CYBRAKDEMONELECTRICBARRIER15
-	{SPR_ELEC, 7 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER17}, // S_CYBRAKDEMONELECTRICBARRIER16
-	{SPR_ELEC, 8 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER18}, // S_CYBRAKDEMONELECTRICBARRIER17
-	{SPR_ELEC, 8 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER19}, // S_CYBRAKDEMONELECTRICBARRIER18
-	{SPR_ELEC, 9 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER20}, // S_CYBRAKDEMONELECTRICBARRIER19
-	{SPR_ELEC, 9 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER21}, // S_CYBRAKDEMONELECTRICBARRIER20
-	{SPR_ELEC, 10 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER22}, // S_CYBRAKDEMONELECTRICBARRIER21
-	{SPR_ELEC, 10 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER23}, // S_CYBRAKDEMONELECTRICBARRIER22
-	{SPR_ELEC, 11 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER24}, // S_CYBRAKDEMONELECTRICBARRIER23
-	{SPR_ELEC, 11 + FF_FULLBRIGHT, 1, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND}, // S_CYBRAKDEMONELECTRICBARRIER24
-	{SPR_NULL, 0, 0, {A_RemoteAction}, -1, S_CYBRAKDEMON_DEINVINCIBLERIZE, S_CYBRAKDEMONELECTRICBARRIER_DIE2}, // S_CYBRAKDEMONELECTRICBARRIER_DIE1
-	{SPR_NULL, 0, 0, {A_SetObjectFlags}, MF_PUSHABLE|MF_FIRE|MF_PAIN, 1, S_CYBRAKDEMONELECTRICBARRIER_DIE3}, // S_CYBRAKDEMONELECTRICBARRIER_DIE2
-	{SPR_NULL, 0, 20*TICRATE, {A_Scream}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS}, // S_CYBRAKDEMONELECTRICBARRIER_DIE3
-	{SPR_NULL, 0, 0, {A_CheckRandom}, 10, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK,
-	{SPR_NULL, 0, 0, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS,
-	{SPR_NULL, 0, 0, {A_RandomStateRange}, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE,
-	{SPR_ELEC, 0 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1,
-	{SPR_ELEC, 1 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM2,
-	{SPR_ELEC, 2 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM3,
-	{SPR_ELEC, 3 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM4,
-	{SPR_ELEC, 4 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM5,
-	{SPR_ELEC, 5 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM6,
-	{SPR_ELEC, 6 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM7,
-	{SPR_ELEC, 7 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM8,
-	{SPR_ELEC, 8 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM9,
-	{SPR_ELEC, 9 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM10,
-	{SPR_ELEC, 10 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM11,
-	{SPR_ELEC, 11 + FF_FULLBRIGHT, 1, {A_PlaySound}, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12,
-	{SPR_NULL, 0, 1, {NULL}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL,
-	{SPR_NULL, 0, 0, {A_Repeat}, 5*TICRATE, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK, S_CYBRAKDEMONELECTRICBARRIER_REVIVE1}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP,
-	{SPR_NULL, 0, 0, {A_CapeChase}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_REVIVE2}, // S_CYBRAKDEMONELECTRICBARRIER_REVIVE1
-	{SPR_NULL, 0, 0, {A_SpawnFreshCopy}, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_REVIVE3}, // S_CYBRAKDEMONELECTRICBARRIER_REVIVE2
-	{SPR_NULL, 0, TICRATE, {A_PlaySound}, sfx_s3k79, 0, S_NULL}, // S_CYBRAKDEMONELECTRICBARRIER_REVIVE3
+	{SPR_ELEC, 0 + FF_FULLBRIGHT, 1, NULL, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_INIT2}, // S_CYBRAKDEMONELECTRICBARRIER_INIT1
+	{SPR_ELEC, 0 + FF_FULLBRIGHT, 0, A_RemoteAction, -1, S_CYBRAKDEMON_INVINCIBLERIZE, S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND}, // S_CYBRAKDEMONELECTRICBARRIER_INIT2
+	{SPR_ELEC, 0 + FF_FULLBRIGHT, 0, A_PlayActiveSound, 0, 0, S_CYBRAKDEMONELECTRICBARRIER1}, // S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND
+	{SPR_ELEC, 0 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER2}, // S_CYBRAKDEMONELECTRICBARRIER1
+	{SPR_ELEC, 0 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER3}, // S_CYBRAKDEMONELECTRICBARRIER2
+	{SPR_ELEC, 1 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER4}, // S_CYBRAKDEMONELECTRICBARRIER3
+	{SPR_ELEC, 1 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER5}, // S_CYBRAKDEMONELECTRICBARRIER4
+	{SPR_ELEC, 2 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER6}, // S_CYBRAKDEMONELECTRICBARRIER5
+	{SPR_ELEC, 2 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER7}, // S_CYBRAKDEMONELECTRICBARRIER6
+	{SPR_ELEC, 3 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER8}, // S_CYBRAKDEMONELECTRICBARRIER7
+	{SPR_ELEC, 3 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER9}, // S_CYBRAKDEMONELECTRICBARRIER8
+	{SPR_ELEC, 4 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER10}, // S_CYBRAKDEMONELECTRICBARRIER9
+	{SPR_ELEC, 4 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER11}, // S_CYBRAKDEMONELECTRICBARRIER10
+	{SPR_ELEC, 5 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER12}, // S_CYBRAKDEMONELECTRICBARRIER11
+	{SPR_ELEC, 5 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER13}, // S_CYBRAKDEMONELECTRICBARRIER12
+	{SPR_ELEC, 6 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER14}, // S_CYBRAKDEMONELECTRICBARRIER13
+	{SPR_ELEC, 6 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER15}, // S_CYBRAKDEMONELECTRICBARRIER14
+	{SPR_ELEC, 7 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER16}, // S_CYBRAKDEMONELECTRICBARRIER15
+	{SPR_ELEC, 7 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER17}, // S_CYBRAKDEMONELECTRICBARRIER16
+	{SPR_ELEC, 8 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER18}, // S_CYBRAKDEMONELECTRICBARRIER17
+	{SPR_ELEC, 8 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER19}, // S_CYBRAKDEMONELECTRICBARRIER18
+	{SPR_ELEC, 9 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER20}, // S_CYBRAKDEMONELECTRICBARRIER19
+	{SPR_ELEC, 9 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER21}, // S_CYBRAKDEMONELECTRICBARRIER20
+	{SPR_ELEC, 10 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER22}, // S_CYBRAKDEMONELECTRICBARRIER21
+	{SPR_ELEC, 10 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER23}, // S_CYBRAKDEMONELECTRICBARRIER22
+	{SPR_ELEC, 11 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER24}, // S_CYBRAKDEMONELECTRICBARRIER23
+	{SPR_ELEC, 11 + FF_FULLBRIGHT, 1, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND}, // S_CYBRAKDEMONELECTRICBARRIER24
+	{SPR_NULL, 0, 0, A_RemoteAction, -1, S_CYBRAKDEMON_DEINVINCIBLERIZE, S_CYBRAKDEMONELECTRICBARRIER_DIE2}, // S_CYBRAKDEMONELECTRICBARRIER_DIE1
+	{SPR_NULL, 0, 0, A_SetObjectFlags, MF_PUSHABLE|MF_FIRE|MF_PAIN, 1, S_CYBRAKDEMONELECTRICBARRIER_DIE3}, // S_CYBRAKDEMONELECTRICBARRIER_DIE2
+	{SPR_NULL, 0, 20*TICRATE, A_Scream, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS}, // S_CYBRAKDEMONELECTRICBARRIER_DIE3
+	{SPR_NULL, 0, 0, A_CheckRandom, 10, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK,
+	{SPR_NULL, 0, 0, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS,
+	{SPR_NULL, 0, 0, A_RandomStateRange, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE,
+	{SPR_ELEC, 0 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1,
+	{SPR_ELEC, 1 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM2,
+	{SPR_ELEC, 2 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM3,
+	{SPR_ELEC, 3 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM4,
+	{SPR_ELEC, 4 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM5,
+	{SPR_ELEC, 5 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM6,
+	{SPR_ELEC, 6 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM7,
+	{SPR_ELEC, 7 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM8,
+	{SPR_ELEC, 8 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM9,
+	{SPR_ELEC, 9 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM10,
+	{SPR_ELEC, 10 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM11,
+	{SPR_ELEC, 11 + FF_FULLBRIGHT, 1, A_PlaySound, sfx_s3k5c, 1, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12,
+	{SPR_NULL, 0, 1, NULL, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL,
+	{SPR_NULL, 0, 0, A_Repeat, 5*TICRATE, S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK, S_CYBRAKDEMONELECTRICBARRIER_REVIVE1}, // S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP,
+	{SPR_NULL, 0, 0, A_CapeChase, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_REVIVE2}, // S_CYBRAKDEMONELECTRICBARRIER_REVIVE1
+	{SPR_NULL, 0, 0, A_SpawnFreshCopy, 0, 0, S_CYBRAKDEMONELECTRICBARRIER_REVIVE3}, // S_CYBRAKDEMONELECTRICBARRIER_REVIVE2
+	{SPR_NULL, 0, TICRATE, A_PlaySound, sfx_s3k79, 0, S_NULL}, // S_CYBRAKDEMONELECTRICBARRIER_REVIVE3
 
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT  , 1, {A_VileFire}, sfx_s3k9d, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE2}, // S_CYBRAKDEMONTARGETRETICULE1
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE3}, // S_CYBRAKDEMONTARGETRETICULE2
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|1, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE4}, // S_CYBRAKDEMONTARGETRETICULE3
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE5}, // S_CYBRAKDEMONTARGETRETICULE4
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|2, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE6}, // S_CYBRAKDEMONTARGETRETICULE5
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE7}, // S_CYBRAKDEMONTARGETRETICULE6
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|3, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE8}, // S_CYBRAKDEMONTARGETRETICULE7
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE9}, // S_CYBRAKDEMONTARGETRETICULE8
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|4, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE10}, // S_CYBRAKDEMONTARGETRETICULE9
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE11}, // S_CYBRAKDEMONTARGETRETICULE10
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|5, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE12}, // S_CYBRAKDEMONTARGETRETICULE11
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE13}, // S_CYBRAKDEMONTARGETRETICULE12
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT  , 1, {A_VileFire}, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE14}, // S_CYBRAKDEMONTARGETRETICULE13
-	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, {A_Repeat}, 6, S_CYBRAKDEMONTARGETRETICULE2, S_NULL}, // S_CYBRAKDEMONTARGETRETICULE14
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT  , 1, A_VileFire, sfx_s3k9d, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE2}, // S_CYBRAKDEMONTARGETRETICULE1
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE3}, // S_CYBRAKDEMONTARGETRETICULE2
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|1, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE4}, // S_CYBRAKDEMONTARGETRETICULE3
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE5}, // S_CYBRAKDEMONTARGETRETICULE4
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|2, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE6}, // S_CYBRAKDEMONTARGETRETICULE5
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE7}, // S_CYBRAKDEMONTARGETRETICULE6
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|3, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE8}, // S_CYBRAKDEMONTARGETRETICULE7
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE9}, // S_CYBRAKDEMONTARGETRETICULE8
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|4, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE10}, // S_CYBRAKDEMONTARGETRETICULE9
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE11}, // S_CYBRAKDEMONTARGETRETICULE10
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|5, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE12}, // S_CYBRAKDEMONTARGETRETICULE11
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE13}, // S_CYBRAKDEMONTARGETRETICULE12
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT  , 1, A_VileFire, 0, MT_CYBRAKDEMON_TARGET_DOT, S_CYBRAKDEMONTARGETRETICULE14}, // S_CYBRAKDEMONTARGETRETICULE13
+	{SPR_TARG, FF_TRANS50|FF_FULLBRIGHT|6, 1, A_Repeat, 6, S_CYBRAKDEMONTARGETRETICULE2, S_NULL}, // S_CYBRAKDEMONTARGETRETICULE14
 
-	{SPR_HOOP, FF_TRANS50|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_CYBRAKDEMONTARGETDOT
+	{SPR_HOOP, FF_TRANS50|FF_FULLBRIGHT, 2, NULL, 0, 0, S_NULL}, // S_CYBRAKDEMONTARGETDOT
 
-	{SPR_NPLM, 0, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2}, //S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1,
-	{SPR_NPLM, 1, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3}, //S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2,
-	{SPR_NPLM, 2, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4}, //S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3,
-	{SPR_NPLM, 3, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1}, //S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4,
-	{SPR_NPLM, 0, 1, {A_Explode}, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2}, //S_CYBRAKDEMONNAPALMBOMBLARGE_DIE1, // Explode
-	{SPR_NPLM, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_BOMB_SMALL + (6<<16), 256 + (48<<16), S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3}, //S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2, // Outer ring
-	{SPR_NPLM, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_BOMB_SMALL + (1<<16), 32<<16, S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4}, //S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3, // Center
-	{SPR_NULL, 0, 81, {A_Scream}, 0, 0, S_NULL}, //S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4, // Sound
+	{SPR_NPLM, 0, 2, NULL, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2}, //S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1,
+	{SPR_NPLM, 1, 2, NULL, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3}, //S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2,
+	{SPR_NPLM, 2, 2, NULL, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4}, //S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3,
+	{SPR_NPLM, 3, 2, NULL, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1}, //S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4,
+	{SPR_NPLM, 0, 1, A_Explode, 0, 0, S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2}, //S_CYBRAKDEMONNAPALMBOMBLARGE_DIE1, // Explode
+	{SPR_NPLM, 0, 1, A_NapalmScatter, MT_CYBRAKDEMON_NAPALM_BOMB_SMALL + (6<<16), 256 + (48<<16), S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3}, //S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2, // Outer ring
+	{SPR_NPLM, 0, 1, A_NapalmScatter, MT_CYBRAKDEMON_NAPALM_BOMB_SMALL + (1<<16), 32<<16, S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4}, //S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3, // Center
+	{SPR_NULL, 0, 81, A_Scream, 0, 0, S_NULL}, //S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4, // Sound
 
-	{SPR_MNPL, 0, 1, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMBOMBSMALL}, //S_CYBRAKDEMONNAPALMBOMBSMALL,
-	{SPR_MNPL, 0, 1, {A_Explode}, 0, 0, S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE1, // Explode
-	{SPR_MNPL, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (12<<16), 128 + (40<<16), S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2, // Outer ring
-	{SPR_MNPL, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (8<<16), 64 + (32<<16), S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3, // Inner ring
-	{SPR_MNPL, 0, 1, {A_NapalmScatter}, MT_CYBRAKDEMON_NAPALM_FLAMES + (1<<16), 24<<16, S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4, // Center
-	{SPR_NULL, 0, 24, {A_Scream}, 0, 0, S_NULL}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5, // Sound
+	{SPR_MNPL, 0, 1, NULL, 0, 0, S_CYBRAKDEMONNAPALMBOMBSMALL}, //S_CYBRAKDEMONNAPALMBOMBSMALL,
+	{SPR_MNPL, 0, 1, A_Explode, 0, 0, S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE1, // Explode
+	{SPR_MNPL, 0, 1, A_NapalmScatter, MT_CYBRAKDEMON_NAPALM_FLAMES + (12<<16), 128 + (40<<16), S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2, // Outer ring
+	{SPR_MNPL, 0, 1, A_NapalmScatter, MT_CYBRAKDEMON_NAPALM_FLAMES + (8<<16), 64 + (32<<16), S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3, // Inner ring
+	{SPR_MNPL, 0, 1, A_NapalmScatter, MT_CYBRAKDEMON_NAPALM_FLAMES + (1<<16), 24<<16, S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4, // Center
+	{SPR_NULL, 0, 24, A_Scream, 0, 0, S_NULL}, //S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5, // Sound
 
-	{SPR_SFLM, FF_FULLBRIGHT,   2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY2}, //S_CYBRAKDEMONNAPALMFLAME_FLY1,
-	{SPR_SFLM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY3}, //S_CYBRAKDEMONNAPALMFLAME_FLY2,
-	{SPR_SFLM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY4}, //S_CYBRAKDEMONNAPALMFLAME_FLY3,
-	{SPR_SFLM, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY5}, //S_CYBRAKDEMONNAPALMFLAME_FLY4,
-	{SPR_SFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY6}, //S_CYBRAKDEMONNAPALMFLAME_FLY5,
-	{SPR_SFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY1}, //S_CYBRAKDEMONNAPALMFLAME_FLY6,
-	{SPR_SFLM, FF_FULLBRIGHT,   0, {A_SpawnObjectRelative}, 0, MT_CYBRAKDEMON_FLAMEREST, S_NULL}, //S_CYBRAKDEMONNAPALMFLAME_DIE,
+	{SPR_SFLM, FF_FULLBRIGHT,   2, NULL, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY2}, //S_CYBRAKDEMONNAPALMFLAME_FLY1,
+	{SPR_SFLM, FF_FULLBRIGHT|1, 2, NULL, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY3}, //S_CYBRAKDEMONNAPALMFLAME_FLY2,
+	{SPR_SFLM, FF_FULLBRIGHT|2, 2, NULL, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY4}, //S_CYBRAKDEMONNAPALMFLAME_FLY3,
+	{SPR_SFLM, FF_FULLBRIGHT|3, 2, NULL, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY5}, //S_CYBRAKDEMONNAPALMFLAME_FLY4,
+	{SPR_SFLM, FF_FULLBRIGHT|4, 2, NULL, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY6}, //S_CYBRAKDEMONNAPALMFLAME_FLY5,
+	{SPR_SFLM, FF_FULLBRIGHT|5, 2, NULL, 0, 0, S_CYBRAKDEMONNAPALMFLAME_FLY1}, //S_CYBRAKDEMONNAPALMFLAME_FLY6,
+	{SPR_SFLM, FF_FULLBRIGHT,   0, A_SpawnObjectRelative, 0, MT_CYBRAKDEMON_FLAMEREST, S_NULL}, //S_CYBRAKDEMONNAPALMFLAME_DIE,
 
-	{SPR_NULL, 0, 1, {A_SetFuse}, TICRATE, 0, S_CYBRAKDEMONVILEEXPLOSION2}, //S_CYBRAKDEMONVILEEXPLOSION1,
-	{SPR_NULL, 0, 0, {A_ScoreRise}, 0, 0, S_CYBRAKDEMONVILEEXPLOSION3}, //S_CYBRAKDEMONVILEEXPLOSION2,
-	{SPR_NULL, 0, 1, {A_BossScream}, 0, MT_SONIC3KBOSSEXPLODE, S_CYBRAKDEMONVILEEXPLOSION1}, //S_CYBRAKDEMONVILEEXPLOSION3,
+	{SPR_NULL, 0, 1, A_SetFuse, TICRATE, 0, S_CYBRAKDEMONVILEEXPLOSION2}, //S_CYBRAKDEMONVILEEXPLOSION1,
+	{SPR_NULL, 0, 0, A_ScoreRise, 0, 0, S_CYBRAKDEMONVILEEXPLOSION3}, //S_CYBRAKDEMONVILEEXPLOSION2,
+	{SPR_NULL, 0, 1, A_BossScream, 0, MT_SONIC3KBOSSEXPLODE, S_CYBRAKDEMONVILEEXPLOSION1}, //S_CYBRAKDEMONVILEEXPLOSION3,
 
 	// Metal Sonic
-	{SPR_METL,  0, 35, {NULL}, 0, 0, S_METALSONIC_WAIT1}, // S_METALSONIC_STAND
-	{SPR_METL,  1,  8, {NULL}, 0, 0, S_METALSONIC_WAIT2}, // S_METALSONIC_WAIT1
-	{SPR_METL,  2,  8, {NULL}, 0, 0, S_METALSONIC_WAIT1}, // S_METALSONIC_WAIT2
-	{SPR_METL,  3,  4, {NULL}, 0, 0, S_METALSONIC_WALK2}, // S_METALSONIC_WALK1
-	{SPR_METL,  4,  4, {NULL}, 0, 0, S_METALSONIC_WALK3}, // S_METALSONIC_WALK2
-	{SPR_METL,  5,  4, {NULL}, 0, 0, S_METALSONIC_WALK4}, // S_METALSONIC_WALK3
-	{SPR_METL,  6,  4, {NULL}, 0, 0, S_METALSONIC_WALK5}, // S_METALSONIC_WALK4
-	{SPR_METL,  7,  4, {NULL}, 0, 0, S_METALSONIC_WALK6}, // S_METALSONIC_WALK5
-	{SPR_METL,  6,  4, {NULL}, 0, 0, S_METALSONIC_WALK7}, // S_METALSONIC_WALK6
-	{SPR_METL,  5,  4, {NULL}, 0, 0, S_METALSONIC_WALK8}, // S_METALSONIC_WALK7
-	{SPR_METL,  4,  4, {NULL}, 0, 0, S_METALSONIC_WALK1}, // S_METALSONIC_WALK8
-	{SPR_METL,  8,  2, {NULL}, 0, 0, S_METALSONIC_RUN2},  // S_METALSONIC_RUN1
-	{SPR_METL,  9,  2, {NULL}, 0, 0, S_METALSONIC_RUN3},  // S_METALSONIC_RUN2
-	{SPR_METL, 10,  2, {NULL}, 0, 0, S_METALSONIC_RUN4},  // S_METALSONIC_RUN3
-	{SPR_METL,  9,  2, {NULL}, 0, 0, S_METALSONIC_RUN1},  // S_METALSONIC_RUN4
+	{SPR_METL,  0, 35, NULL, 0, 0, S_METALSONIC_WAIT1}, // S_METALSONIC_STAND
+	{SPR_METL,  1,  8, NULL, 0, 0, S_METALSONIC_WAIT2}, // S_METALSONIC_WAIT1
+	{SPR_METL,  2,  8, NULL, 0, 0, S_METALSONIC_WAIT1}, // S_METALSONIC_WAIT2
+	{SPR_METL,  3,  4, NULL, 0, 0, S_METALSONIC_WALK2}, // S_METALSONIC_WALK1
+	{SPR_METL,  4,  4, NULL, 0, 0, S_METALSONIC_WALK3}, // S_METALSONIC_WALK2
+	{SPR_METL,  5,  4, NULL, 0, 0, S_METALSONIC_WALK4}, // S_METALSONIC_WALK3
+	{SPR_METL,  6,  4, NULL, 0, 0, S_METALSONIC_WALK5}, // S_METALSONIC_WALK4
+	{SPR_METL,  7,  4, NULL, 0, 0, S_METALSONIC_WALK6}, // S_METALSONIC_WALK5
+	{SPR_METL,  6,  4, NULL, 0, 0, S_METALSONIC_WALK7}, // S_METALSONIC_WALK6
+	{SPR_METL,  5,  4, NULL, 0, 0, S_METALSONIC_WALK8}, // S_METALSONIC_WALK7
+	{SPR_METL,  4,  4, NULL, 0, 0, S_METALSONIC_WALK1}, // S_METALSONIC_WALK8
+	{SPR_METL,  8,  2, NULL, 0, 0, S_METALSONIC_RUN2},  // S_METALSONIC_RUN1
+	{SPR_METL,  9,  2, NULL, 0, 0, S_METALSONIC_RUN3},  // S_METALSONIC_RUN2
+	{SPR_METL, 10,  2, NULL, 0, 0, S_METALSONIC_RUN4},  // S_METALSONIC_RUN3
+	{SPR_METL,  9,  2, NULL, 0, 0, S_METALSONIC_RUN1},  // S_METALSONIC_RUN4
 
-	{SPR_METL,  4, -1, {NULL},         0, 0, S_NULL},             // S_METALSONIC_FLOAT
-	{SPR_METL, 12, -1, {NULL},         0, 0, S_METALSONIC_STUN},  // S_METALSONIC_VECTOR
-	{SPR_METL,  0, -1, {NULL},         0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_STUN
-	{SPR_METL, 13, -1, {NULL},         0, 0, S_NULL},             // S_METALSONIC_BLOCK
-	{SPR_METL, 13, 40, {NULL},         0, 0, S_METALSONIC_GATHER},// S_METALSONIC_RAISE
-	{SPR_METL, 14, -1, {NULL},         0, 0, S_NULL},             // S_METALSONIC_GATHER
-	{SPR_METL,  9, -1, {NULL},         0, 0, S_METALSONIC_BOUNCE},// S_METALSONIC_DASH
-	{SPR_METL, 14, -1, {NULL},         0, 0, S_NULL},             // S_METALSONIC_BOUNCE
-	{SPR_METL, 13, -1, {NULL},         0, 0, S_METALSONIC_GATHER},// S_METALSONIC_SHOOT
-	{SPR_METL, 11, 40, {A_Pain},       0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_PAIN
-	{SPR_METL,  0, -1, {A_BossDeath},  0, 0, S_NULL},             // S_METALSONIC_DEATH
-	{SPR_METL,  3,  4, {NULL},         0, 0, S_METALSONIC_FLEE2}, // S_METALSONIC_FLEE1
-	{SPR_METL,  4,  4, {A_BossScream}, 0, 0, S_METALSONIC_FLEE3}, // S_METALSONIC_FLEE2
-	{SPR_METL,  5,  4, {NULL},         0, 0, S_METALSONIC_FLEE4}, // S_METALSONIC_FLEE3
-	{SPR_METL,  4,  4, {NULL},         0, 0, S_METALSONIC_FLEE1}, // S_METALSONIC_FLEE4
+	{SPR_METL,  4, -1, NULL,         0, 0, S_NULL},             // S_METALSONIC_FLOAT
+	{SPR_METL, 12, -1, NULL,         0, 0, S_METALSONIC_STUN},  // S_METALSONIC_VECTOR
+	{SPR_METL,  0, -1, NULL,         0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_STUN
+	{SPR_METL, 13, -1, NULL,         0, 0, S_NULL},             // S_METALSONIC_BLOCK
+	{SPR_METL, 13, 40, NULL,         0, 0, S_METALSONIC_GATHER},// S_METALSONIC_RAISE
+	{SPR_METL, 14, -1, NULL,         0, 0, S_NULL},             // S_METALSONIC_GATHER
+	{SPR_METL,  9, -1, NULL,         0, 0, S_METALSONIC_BOUNCE},// S_METALSONIC_DASH
+	{SPR_METL, 14, -1, NULL,         0, 0, S_NULL},             // S_METALSONIC_BOUNCE
+	{SPR_METL, 13, -1, NULL,         0, 0, S_METALSONIC_GATHER},// S_METALSONIC_SHOOT
+	{SPR_METL, 11, 40, A_Pain,       0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_PAIN
+	{SPR_METL,  0, -1, A_BossDeath,  0, 0, S_NULL},             // S_METALSONIC_DEATH
+	{SPR_METL,  3,  4, NULL,         0, 0, S_METALSONIC_FLEE2}, // S_METALSONIC_FLEE1
+	{SPR_METL,  4,  4, A_BossScream, 0, 0, S_METALSONIC_FLEE3}, // S_METALSONIC_FLEE2
+	{SPR_METL,  5,  4, NULL,         0, 0, S_METALSONIC_FLEE4}, // S_METALSONIC_FLEE3
+	{SPR_METL,  4,  4, NULL,         0, 0, S_METALSONIC_FLEE1}, // S_METALSONIC_FLEE4
 
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 0, 1, {NULL}, 0, 0, S_MSSHIELD_F2},  // S_MSSHIELD_F1
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 1, 1, {NULL}, 0, 0, S_MSSHIELD_F3},  // S_MSSHIELD_F2
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 2, 1, {NULL}, 0, 0, S_MSSHIELD_F4},  // S_MSSHIELD_F3
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 3, 1, {NULL}, 0, 0, S_MSSHIELD_F5},  // S_MSSHIELD_F4
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 4, 1, {NULL}, 0, 0, S_MSSHIELD_F6},  // S_MSSHIELD_F5
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 5, 1, {NULL}, 0, 0, S_MSSHIELD_F7},  // S_MSSHIELD_F6
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 6, 1, {NULL}, 0, 0, S_MSSHIELD_F8},  // S_MSSHIELD_F7
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 7, 1, {NULL}, 0, 0, S_MSSHIELD_F9},  // S_MSSHIELD_F8
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 8, 1, {NULL}, 0, 0, S_MSSHIELD_F10}, // S_MSSHIELD_F9
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 9, 1, {NULL}, 0, 0, S_MSSHIELD_F11}, // S_MSSHIELD_F10
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30|10, 1, {NULL}, 0, 0, S_MSSHIELD_F12}, // S_MSSHIELD_F11
-	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30|11, 1, {NULL}, 0, 0, S_MSSHIELD_F1},  // S_MSSHIELD_F12
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 0, 1, NULL, 0, 0, S_MSSHIELD_F2},  // S_MSSHIELD_F1
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 1, 1, NULL, 0, 0, S_MSSHIELD_F3},  // S_MSSHIELD_F2
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 2, 1, NULL, 0, 0, S_MSSHIELD_F4},  // S_MSSHIELD_F3
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 3, 1, NULL, 0, 0, S_MSSHIELD_F5},  // S_MSSHIELD_F4
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 4, 1, NULL, 0, 0, S_MSSHIELD_F6},  // S_MSSHIELD_F5
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 5, 1, NULL, 0, 0, S_MSSHIELD_F7},  // S_MSSHIELD_F6
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 6, 1, NULL, 0, 0, S_MSSHIELD_F8},  // S_MSSHIELD_F7
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 7, 1, NULL, 0, 0, S_MSSHIELD_F9},  // S_MSSHIELD_F8
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 8, 1, NULL, 0, 0, S_MSSHIELD_F10}, // S_MSSHIELD_F9
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 9, 1, NULL, 0, 0, S_MSSHIELD_F11}, // S_MSSHIELD_F10
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30|10, 1, NULL, 0, 0, S_MSSHIELD_F12}, // S_MSSHIELD_F11
+	{SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30|11, 1, NULL, 0, 0, S_MSSHIELD_F1},  // S_MSSHIELD_F12
 
 	// Ring
-	{SPR_RING, FF_ANIMATE, -1, {NULL}, 23, 1, S_RING}, // S_RING
+	{SPR_RING, FF_ANIMATE, -1, NULL, 23, 1, S_RING}, // S_RING
 
 	// Blue Sphere Replacement for special stages
-	{SPR_BBAL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BLUEBALL
-	{SPR_BBAL, 0, 20, {NULL}, 0, 0, S_NULL}, // S_BLUEBALLSPARK
+	{SPR_BBAL, 0, -1, NULL, 0, 0, S_NULL}, // S_BLUEBALL
+	{SPR_BBAL, 0, 20, NULL, 0, 0, S_NULL}, // S_BLUEBALLSPARK
 
 	// Gravity Well sprites for Egg Rock's Special Stage
-	{SPR_GWLG, 0, 1, {NULL}, 0, 0, S_GRAVWELLGREEN2}, // S_GRAVWELLGREEN
-	{SPR_GWLG, 1, 1, {NULL}, 0, 0, S_GRAVWELLGREEN3}, // S_GRAVWELLGREEN2
-	{SPR_GWLG, 2, 1, {NULL}, 0, 0, S_GRAVWELLGREEN},  // S_GRAVWELLGREEN3
+	{SPR_GWLG, 0, 1, NULL, 0, 0, S_GRAVWELLGREEN2}, // S_GRAVWELLGREEN
+	{SPR_GWLG, 1, 1, NULL, 0, 0, S_GRAVWELLGREEN3}, // S_GRAVWELLGREEN2
+	{SPR_GWLG, 2, 1, NULL, 0, 0, S_GRAVWELLGREEN},  // S_GRAVWELLGREEN3
 
-	{SPR_GWLR, 0, 1, {NULL}, 0, 0, S_GRAVWELLRED2},   // S_GRAVWELLRED
-	{SPR_GWLR, 1, 1, {NULL}, 0, 0, S_GRAVWELLRED3},   // S_GRAVWELLRED2
-	{SPR_GWLR, 2, 1, {NULL}, 0, 0, S_GRAVWELLRED},    // S_GRAVWELLRED3
+	{SPR_GWLR, 0, 1, NULL, 0, 0, S_GRAVWELLRED2},   // S_GRAVWELLRED
+	{SPR_GWLR, 1, 1, NULL, 0, 0, S_GRAVWELLRED3},   // S_GRAVWELLRED2
+	{SPR_GWLR, 2, 1, NULL, 0, 0, S_GRAVWELLRED},    // S_GRAVWELLRED3
 
 	// Individual Team Rings (now with shield attracting action! =P)
-	{SPR_TRNG, FF_ANIMATE, -1, {NULL}, 23, 1, S_TEAMRING},  // S_TEAMRING1
+	{SPR_TRNG, FF_ANIMATE, -1, NULL, 23, 1, S_TEAMRING},  // S_TEAMRING1
 
 	// Special Stage Token
-	{SPR_EMMY, FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 6, 2, S_EMMY}, // S_EMMY
+	{SPR_EMMY, FF_ANIMATE|FF_FULLBRIGHT, -1, NULL, 6, 2, S_EMMY}, // S_EMMY
 
 	// Special Stage Token
-	{SPR_TOKE, FF_TRANS50|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_TOKEN
-	{SPR_TOKE, FF_TRANS50|FF_FULLBRIGHT,  1, {A_CapeChase}, 0, 0, S_MOVINGTOKEN}, // S_MOVINGTOKEN
+	{SPR_TOKE, FF_TRANS50|FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_TOKEN
+	{SPR_TOKE, FF_TRANS50|FF_FULLBRIGHT,  1, A_CapeChase, 0, 0, S_MOVINGTOKEN}, // S_MOVINGTOKEN
 
 	// CTF Flags
-	{SPR_RFLG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_REDFLAG
-	{SPR_BFLG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BLUEFLAG
+	{SPR_RFLG, 0, -1, NULL, 0, 0, S_NULL}, // S_REDFLAG
+	{SPR_BFLG, 0, -1, NULL, 0, 0, S_NULL}, // S_BLUEFLAG
 
 	// Emblem
-	{SPR_EMBM,  0, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM1
-	{SPR_EMBM,  1, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM2
-	{SPR_EMBM,  2, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM3
-	{SPR_EMBM,  3, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM4
-	{SPR_EMBM,  4, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM5
-	{SPR_EMBM,  5, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM6
-	{SPR_EMBM,  6, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM7
-	{SPR_EMBM,  7, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM8
-	{SPR_EMBM,  8, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM9
-	{SPR_EMBM,  9, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM10
-	{SPR_EMBM, 10, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM11
-	{SPR_EMBM, 11, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM12
-	{SPR_EMBM, 12, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM13
-	{SPR_EMBM, 13, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM14
-	{SPR_EMBM, 14, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM15
-	{SPR_EMBM, 15, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM16
-	{SPR_EMBM, 16, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM17
-	{SPR_EMBM, 17, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM18
-	{SPR_EMBM, 18, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM19
-	{SPR_EMBM, 19, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM20
-	{SPR_EMBM, 20, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM21
-	{SPR_EMBM, 21, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM22
-	{SPR_EMBM, 22, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM23
-	{SPR_EMBM, 23, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM24
-	{SPR_EMBM, 24, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM25
-	{SPR_EMBM, 25, -1, {NULL}, 0, 0, S_NULL}, // S_EMBLEM26
+	{SPR_EMBM,  0, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM1
+	{SPR_EMBM,  1, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM2
+	{SPR_EMBM,  2, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM3
+	{SPR_EMBM,  3, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM4
+	{SPR_EMBM,  4, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM5
+	{SPR_EMBM,  5, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM6
+	{SPR_EMBM,  6, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM7
+	{SPR_EMBM,  7, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM8
+	{SPR_EMBM,  8, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM9
+	{SPR_EMBM,  9, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM10
+	{SPR_EMBM, 10, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM11
+	{SPR_EMBM, 11, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM12
+	{SPR_EMBM, 12, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM13
+	{SPR_EMBM, 13, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM14
+	{SPR_EMBM, 14, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM15
+	{SPR_EMBM, 15, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM16
+	{SPR_EMBM, 16, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM17
+	{SPR_EMBM, 17, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM18
+	{SPR_EMBM, 18, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM19
+	{SPR_EMBM, 19, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM20
+	{SPR_EMBM, 20, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM21
+	{SPR_EMBM, 21, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM22
+	{SPR_EMBM, 22, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM23
+	{SPR_EMBM, 23, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM24
+	{SPR_EMBM, 24, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM25
+	{SPR_EMBM, 25, -1, NULL, 0, 0, S_NULL}, // S_EMBLEM26
 
 	// Chaos Emeralds
-	{SPR_CEMG, FF_FULLBRIGHT,   -1, {NULL}, 0, 0, S_NULL}, // S_CEMG1
-	{SPR_CEMG, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL}, // S_CEMG2
-	{SPR_CEMG, FF_FULLBRIGHT|2, -1, {NULL}, 0, 0, S_NULL}, // S_CEMG3
-	{SPR_CEMG, FF_FULLBRIGHT|3, -1, {NULL}, 0, 0, S_NULL}, // S_CEMG4
-	{SPR_CEMG, FF_FULLBRIGHT|4, -1, {NULL}, 0, 0, S_NULL}, // S_CEMG5
-	{SPR_CEMG, FF_FULLBRIGHT|5, -1, {NULL}, 0, 0, S_NULL}, // S_CEMG6
-	{SPR_CEMG, FF_FULLBRIGHT|6, -1, {NULL}, 0, 0, S_NULL}, // S_CEMG7
+	{SPR_CEMG, FF_FULLBRIGHT,   -1, NULL, 0, 0, S_NULL}, // S_CEMG1
+	{SPR_CEMG, FF_FULLBRIGHT|1, -1, NULL, 0, 0, S_NULL}, // S_CEMG2
+	{SPR_CEMG, FF_FULLBRIGHT|2, -1, NULL, 0, 0, S_NULL}, // S_CEMG3
+	{SPR_CEMG, FF_FULLBRIGHT|3, -1, NULL, 0, 0, S_NULL}, // S_CEMG4
+	{SPR_CEMG, FF_FULLBRIGHT|4, -1, NULL, 0, 0, S_NULL}, // S_CEMG5
+	{SPR_CEMG, FF_FULLBRIGHT|5, -1, NULL, 0, 0, S_NULL}, // S_CEMG6
+	{SPR_CEMG, FF_FULLBRIGHT|6, -1, NULL, 0, 0, S_NULL}, // S_CEMG7
 
 	// Emeralds (for hunt)
-	{SPR_EMER, 0, -1, {NULL}, 0, 0, S_NULL}, // S_EMER1
+	{SPR_EMER, 0, -1, NULL, 0, 0, S_NULL}, // S_EMER1
 
 	// Fan
-	{SPR_FANS, 0, 1, {A_FanBubbleSpawn}, 2048, 0, S_FAN2}, // S_FAN
-	{SPR_FANS, 1, 1, {A_FanBubbleSpawn}, 1024, 0, S_FAN3}, // S_FAN2
-	{SPR_FANS, 2, 1, {A_FanBubbleSpawn},  512, 0, S_FAN4}, // S_FAN3
-	{SPR_FANS, 3, 1, {A_FanBubbleSpawn}, 1024, 0, S_FAN5}, // S_FAN4
-	{SPR_FANS, 4, 1, {A_FanBubbleSpawn},  512, 0, S_FAN},  // S_FAN5
+	{SPR_FANS, 0, 1, A_FanBubbleSpawn, 2048, 0, S_FAN2}, // S_FAN
+	{SPR_FANS, 1, 1, A_FanBubbleSpawn, 1024, 0, S_FAN3}, // S_FAN2
+	{SPR_FANS, 2, 1, A_FanBubbleSpawn,  512, 0, S_FAN4}, // S_FAN3
+	{SPR_FANS, 3, 1, A_FanBubbleSpawn, 1024, 0, S_FAN5}, // S_FAN4
+	{SPR_FANS, 4, 1, A_FanBubbleSpawn,  512, 0, S_FAN},  // S_FAN5
 
 	// Bubble Source
-	{SPR_BUBL, 0, 8, {A_BubbleSpawn}, 2048, 0, S_BUBBLES2}, // S_BUBBLES1
-	{SPR_BUBL, 1, 8, {A_BubbleCheck}, 0, 0, S_BUBBLES1}, // S_BUBBLES2
+	{SPR_BUBL, 0, 8, A_BubbleSpawn, 2048, 0, S_BUBBLES2}, // S_BUBBLES1
+	{SPR_BUBL, 1, 8, A_BubbleCheck, 0, 0, S_BUBBLES1}, // S_BUBBLES2
 
 	// Level End Sign
-	{SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN2},         // S_SIGN1
-	{SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN3},         // S_SIGN2
-	{SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN4},         // S_SIGN3
-	{SPR_SIGN, 3, 1, {NULL}, 0, 0, S_SIGN5},         // S_SIGN4
-	{SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN6},         // S_SIGN5
-	{SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN7},         // S_SIGN6
-	{SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN8},         // S_SIGN7
-	{SPR_SIGN, 4, 1, {NULL}, 0, 0, S_SIGN9},         // S_SIGN8
-	{SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN10},        // S_SIGN9
-	{SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN11},        // S_SIGN10
-	{SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN12},        // S_SIGN11
-	{SPR_SIGN, 5, 1, {NULL}, 0, 0, S_SIGN13},        // S_SIGN12
-	{SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN14},        // S_SIGN13
-	{SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN15},        // S_SIGN14
-	{SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN16},        // S_SIGN15
-	{SPR_SIGN, 6, 1, {NULL}, 0, 0, S_SIGN17},        // S_SIGN16
-	{SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN18},        // S_SIGN17
-	{SPR_SIGN, 1, 1, {NULL}, 0, 0, S_SIGN19},        // S_SIGN18
-	{SPR_SIGN, 2, 1, {NULL}, 0, 0, S_SIGN20},        // S_SIGN19
-	{SPR_SIGN, 7, 1, {NULL}, 0, 0, S_SIGN1},         // S_SIGN20
-	{SPR_SIGN, 8, -1, {A_SignPlayer}, 0, 0, S_NULL}, // S_SIGN_END
+	{SPR_SIGN, 0, 1, NULL, 0, 0, S_SIGN2},         // S_SIGN1
+	{SPR_SIGN, 1, 1, NULL, 0, 0, S_SIGN3},         // S_SIGN2
+	{SPR_SIGN, 2, 1, NULL, 0, 0, S_SIGN4},         // S_SIGN3
+	{SPR_SIGN, 3, 1, NULL, 0, 0, S_SIGN5},         // S_SIGN4
+	{SPR_SIGN, 0, 1, NULL, 0, 0, S_SIGN6},         // S_SIGN5
+	{SPR_SIGN, 1, 1, NULL, 0, 0, S_SIGN7},         // S_SIGN6
+	{SPR_SIGN, 2, 1, NULL, 0, 0, S_SIGN8},         // S_SIGN7
+	{SPR_SIGN, 4, 1, NULL, 0, 0, S_SIGN9},         // S_SIGN8
+	{SPR_SIGN, 0, 1, NULL, 0, 0, S_SIGN10},        // S_SIGN9
+	{SPR_SIGN, 1, 1, NULL, 0, 0, S_SIGN11},        // S_SIGN10
+	{SPR_SIGN, 2, 1, NULL, 0, 0, S_SIGN12},        // S_SIGN11
+	{SPR_SIGN, 5, 1, NULL, 0, 0, S_SIGN13},        // S_SIGN12
+	{SPR_SIGN, 0, 1, NULL, 0, 0, S_SIGN14},        // S_SIGN13
+	{SPR_SIGN, 1, 1, NULL, 0, 0, S_SIGN15},        // S_SIGN14
+	{SPR_SIGN, 2, 1, NULL, 0, 0, S_SIGN16},        // S_SIGN15
+	{SPR_SIGN, 6, 1, NULL, 0, 0, S_SIGN17},        // S_SIGN16
+	{SPR_SIGN, 0, 1, NULL, 0, 0, S_SIGN18},        // S_SIGN17
+	{SPR_SIGN, 1, 1, NULL, 0, 0, S_SIGN19},        // S_SIGN18
+	{SPR_SIGN, 2, 1, NULL, 0, 0, S_SIGN20},        // S_SIGN19
+	{SPR_SIGN, 7, 1, NULL, 0, 0, S_SIGN1},         // S_SIGN20
+	{SPR_SIGN, 8, -1, A_SignPlayer, 0, 0, S_NULL}, // S_SIGN_END
 
 	// Steam Riser
-	{SPR_STEM, 0, 2, {A_SetSolidSteam}, 0, 0, S_STEAM2},   // S_STEAM1
-	{SPR_STEM, 1, 2, {A_UnsetSolidSteam}, 0, 0, S_STEAM3}, // S_STEAM2
-	{SPR_STEM, 2, 2, {NULL}, 0, 0, S_STEAM4},              // S_STEAM3
-	{SPR_STEM, 3, 2, {NULL}, 0, 0, S_STEAM5},              // S_STEAM4
-	{SPR_STEM, 4, 2, {NULL}, 0, 0, S_STEAM6},              // S_STEAM5
-	{SPR_STEM, 5, 2, {NULL}, 0, 0, S_STEAM7},              // S_STEAM6
-	{SPR_STEM, 6, 2, {NULL}, 0, 0, S_STEAM8},              // S_STEAM7
-	{SPR_STEM, 7, 18, {NULL}, 0, 0, S_STEAM1},             // S_STEAM8
+	{SPR_STEM, 0, 2, A_SetSolidSteam, 0, 0, S_STEAM2},   // S_STEAM1
+	{SPR_STEM, 1, 2, A_UnsetSolidSteam, 0, 0, S_STEAM3}, // S_STEAM2
+	{SPR_STEM, 2, 2, NULL, 0, 0, S_STEAM4},              // S_STEAM3
+	{SPR_STEM, 3, 2, NULL, 0, 0, S_STEAM5},              // S_STEAM4
+	{SPR_STEM, 4, 2, NULL, 0, 0, S_STEAM6},              // S_STEAM5
+	{SPR_STEM, 5, 2, NULL, 0, 0, S_STEAM7},              // S_STEAM6
+	{SPR_STEM, 6, 2, NULL, 0, 0, S_STEAM8},              // S_STEAM7
+	{SPR_STEM, 7, 18, NULL, 0, 0, S_STEAM1},             // S_STEAM8
 
 	// Spike Ball
-	{SPR_SPIK, 0, 1, {A_RotateSpikeBall}, 0, 0, S_SPIKEBALL2}, // S_SPIKEBALL1
-	{SPR_SPIK, 1, 1, {A_RotateSpikeBall}, 0, 0, S_SPIKEBALL3}, // S_SPIKEBALL2
-	{SPR_SPIK, 2, 1, {A_RotateSpikeBall}, 0, 0, S_SPIKEBALL4}, // S_SPIKEBALL3
-	{SPR_SPIK, 3, 1, {A_RotateSpikeBall}, 0, 0, S_SPIKEBALL5}, // S_SPIKEBALL4
-	{SPR_SPIK, 4, 1, {A_RotateSpikeBall}, 0, 0, S_SPIKEBALL6}, // S_SPIKEBALL5
-	{SPR_SPIK, 5, 1, {A_RotateSpikeBall}, 0, 0, S_SPIKEBALL7}, // S_SPIKEBALL6
-	{SPR_SPIK, 6, 1, {A_RotateSpikeBall}, 0, 0, S_SPIKEBALL8}, // S_SPIKEBALL7
-	{SPR_SPIK, 7, 1, {A_RotateSpikeBall}, 0, 0, S_SPIKEBALL1}, // S_SPIKEBALL8
+	{SPR_SPIK, 0, 1, A_RotateSpikeBall, 0, 0, S_SPIKEBALL2}, // S_SPIKEBALL1
+	{SPR_SPIK, 1, 1, A_RotateSpikeBall, 0, 0, S_SPIKEBALL3}, // S_SPIKEBALL2
+	{SPR_SPIK, 2, 1, A_RotateSpikeBall, 0, 0, S_SPIKEBALL4}, // S_SPIKEBALL3
+	{SPR_SPIK, 3, 1, A_RotateSpikeBall, 0, 0, S_SPIKEBALL5}, // S_SPIKEBALL4
+	{SPR_SPIK, 4, 1, A_RotateSpikeBall, 0, 0, S_SPIKEBALL6}, // S_SPIKEBALL5
+	{SPR_SPIK, 5, 1, A_RotateSpikeBall, 0, 0, S_SPIKEBALL7}, // S_SPIKEBALL6
+	{SPR_SPIK, 6, 1, A_RotateSpikeBall, 0, 0, S_SPIKEBALL8}, // S_SPIKEBALL7
+	{SPR_SPIK, 7, 1, A_RotateSpikeBall, 0, 0, S_SPIKEBALL1}, // S_SPIKEBALL8
 
 	// Red Shield's Spawn
-	{SPR_SFLM, FF_FULLBRIGHT,   2, {NULL}, 0, 0, S_SPINFIRE2}, // S_SPINFIRE1
-	{SPR_SFLM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_SPINFIRE3}, // S_SPINFIRE2
-	{SPR_SFLM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_SPINFIRE4}, // S_SPINFIRE3
-	{SPR_SFLM, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_SPINFIRE5}, // S_SPINFIRE4
-	{SPR_SFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_SPINFIRE6}, // S_SPINFIRE5
-	{SPR_SFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_SPINFIRE1}, // S_SPINFIRE6
+	{SPR_SFLM, FF_FULLBRIGHT,   2, NULL, 0, 0, S_SPINFIRE2}, // S_SPINFIRE1
+	{SPR_SFLM, FF_FULLBRIGHT|1, 2, NULL, 0, 0, S_SPINFIRE3}, // S_SPINFIRE2
+	{SPR_SFLM, FF_FULLBRIGHT|2, 2, NULL, 0, 0, S_SPINFIRE4}, // S_SPINFIRE3
+	{SPR_SFLM, FF_FULLBRIGHT|3, 2, NULL, 0, 0, S_SPINFIRE5}, // S_SPINFIRE4
+	{SPR_SFLM, FF_FULLBRIGHT|4, 2, NULL, 0, 0, S_SPINFIRE6}, // S_SPINFIRE5
+	{SPR_SFLM, FF_FULLBRIGHT|5, 2, NULL, 0, 0, S_SPINFIRE1}, // S_SPINFIRE6
 
 	// Floor Spike
-	{SPR_USPK, 0,-1, {A_SpikeRetract}, 1, 0, S_SPIKE2}, // S_SPIKE1 -- Fully extended
-	{SPR_USPK, 5, 2, {A_Pain},         0, 0, S_SPIKE3}, // S_SPIKE2
-	{SPR_USPK, 4, 2, {NULL},           0, 0, S_SPIKE4}, // S_SPIKE3
-	{SPR_USPK, 3,-1, {A_SpikeRetract}, 0, 0, S_SPIKE5}, // S_SPIKE4 -- Fully retracted
-	{SPR_USPK, 4, 2, {A_Pain},         0, 0, S_SPIKE6}, // S_SPIKE5
-	{SPR_USPK, 5, 2, {NULL},           0, 0, S_SPIKE1}, // S_SPIKE6
-	{SPR_USPK, 1,-1, {NULL}, 0, 0, S_NULL}, // S_SPIKED1 -- Busted spike particles
-	{SPR_USPK, 2,-1, {NULL}, 0, 0, S_NULL}, // S_SPIKED2
+	{SPR_USPK, 0,-1, A_SpikeRetract, 1, 0, S_SPIKE2}, // S_SPIKE1 -- Fully extended
+	{SPR_USPK, 5, 2, A_Pain,         0, 0, S_SPIKE3}, // S_SPIKE2
+	{SPR_USPK, 4, 2, NULL,           0, 0, S_SPIKE4}, // S_SPIKE3
+	{SPR_USPK, 3,-1, A_SpikeRetract, 0, 0, S_SPIKE5}, // S_SPIKE4 -- Fully retracted
+	{SPR_USPK, 4, 2, A_Pain,         0, 0, S_SPIKE6}, // S_SPIKE5
+	{SPR_USPK, 5, 2, NULL,           0, 0, S_SPIKE1}, // S_SPIKE6
+	{SPR_USPK, 1,-1, NULL, 0, 0, S_NULL}, // S_SPIKED1 -- Busted spike particles
+	{SPR_USPK, 2,-1, NULL, 0, 0, S_NULL}, // S_SPIKED2
 
 	// Starpost
-	{SPR_STPT, 0           , -1, {NULL},  0, 0, S_NULL},           // S_STARPOST_IDLE
-	{SPR_STPT, FF_ANIMATE  , -1, {NULL},  1, 2, S_NULL},           // S_STARPOST_FLASH
-	{SPR_STPT, FF_ANIMATE|2, 31, {NULL}, 15, 1, S_STARPOST_FLASH}, // S_STARPOST_SPIN
+	{SPR_STPT, 0           , -1, NULL,  0, 0, S_NULL},           // S_STARPOST_IDLE
+	{SPR_STPT, FF_ANIMATE  , -1, NULL,  1, 2, S_NULL},           // S_STARPOST_FLASH
+	{SPR_STPT, FF_ANIMATE|2, 31, NULL, 15, 1, S_STARPOST_FLASH}, // S_STARPOST_SPIN
 
 	// Big floating mine
-	{SPR_BMNE, 0, 5, {NULL}, 0, 0, S_BIGMINE2},    // S_BIGMINE1
-	{SPR_BMNE, 1, 5, {NULL}, 0, 0, S_BIGMINE3},    // S_BIGMINE2
-	{SPR_BMNE, 2, 5, {NULL}, 0, 0, S_BIGMINE4},    // S_BIGMINE3
-	{SPR_BMNE, 3, 5, {NULL}, 0, 0, S_BIGMINE5},    // S_BIGMINE4
-	{SPR_BMNE, 4, 5, {NULL}, 0, 0, S_BIGMINE6},    // S_BIGMINE5
-	{SPR_BMNE, 5, 5, {NULL}, 0, 0, S_BIGMINE7},    // S_BIGMINE6
-	{SPR_BMNE, 6, 5, {NULL}, 0, 0, S_BIGMINE8},    // S_BIGMINE7
-	{SPR_BMNE, 7, 5, {NULL}, 0, 0, S_BIGMINE1},    // S_BIGMINE8
+	{SPR_BMNE, 0, 5, NULL, 0, 0, S_BIGMINE2},    // S_BIGMINE1
+	{SPR_BMNE, 1, 5, NULL, 0, 0, S_BIGMINE3},    // S_BIGMINE2
+	{SPR_BMNE, 2, 5, NULL, 0, 0, S_BIGMINE4},    // S_BIGMINE3
+	{SPR_BMNE, 3, 5, NULL, 0, 0, S_BIGMINE5},    // S_BIGMINE4
+	{SPR_BMNE, 4, 5, NULL, 0, 0, S_BIGMINE6},    // S_BIGMINE5
+	{SPR_BMNE, 5, 5, NULL, 0, 0, S_BIGMINE7},    // S_BIGMINE6
+	{SPR_BMNE, 6, 5, NULL, 0, 0, S_BIGMINE8},    // S_BIGMINE7
+	{SPR_BMNE, 7, 5, NULL, 0, 0, S_BIGMINE1},    // S_BIGMINE8
 
 	// Cannon launcher
-	{SPR_NULL, 0, 1,    {A_FindTarget},     MT_PLAYER,         0, S_CANNONLAUNCHER2}, // S_CANNONLAUNCHER1
-	{SPR_NULL, 0, 1,       {A_LobShot}, MT_CANNONBALL, 4*TICRATE, S_CANNONLAUNCHER3}, // S_CANNONLAUNCHER2
-	{SPR_NULL, 0, 2, {A_SetRandomTics},     TICRATE/2, 3*TICRATE, S_CANNONLAUNCHER1}, // S_CANNONLAUNCHER3
+	{SPR_NULL, 0, 1,    A_FindTarget,     MT_PLAYER,         0, S_CANNONLAUNCHER2}, // S_CANNONLAUNCHER1
+	{SPR_NULL, 0, 1,    A_LobShot, MT_CANNONBALL, 4*TICRATE, S_CANNONLAUNCHER3}, // S_CANNONLAUNCHER2
+	{SPR_NULL, 0, 2, A_SetRandomTics,     TICRATE/2, 3*TICRATE, S_CANNONLAUNCHER1}, // S_CANNONLAUNCHER3
 
 	// Super Ring Box
-	{SPR_SRBX, 0, 2, {NULL}, 0, 0, S_SUPERRINGBOX1},         // S_SUPERRINGBOX
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_SUPERRINGBOX},          // S_SUPERRINGBOX1
-	{SPR_SRBX, 1, 4, {A_MonitorPop}, 0, 0, S_SUPERRINGBOX3}, // S_SUPERRINGBOX2
-	{SPR_YLTV, 2, 4, {NULL},         0, 0, S_SUPERRINGBOX4}, // S_SUPERRINGBOX3
-	{SPR_YLTV, 3, 4, {NULL},         0, 0, S_SUPERRINGBOX5}, // S_SUPERRINGBOX4
-	{SPR_YLTV, 4, 4, {NULL},         0, 0, S_SUPERRINGBOX6}, // S_SUPERRINGBOX5
-	{SPR_SRBX, 1, 18, {A_RingBox},   0, 0, S_NULL},          // S_SUPERRINGBOX6
+	{SPR_SRBX, 0, 2, NULL, 0, 0, S_SUPERRINGBOX1},         // S_SUPERRINGBOX
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_SUPERRINGBOX},          // S_SUPERRINGBOX1
+	{SPR_SRBX, 1, 4, A_MonitorPop, 0, 0, S_SUPERRINGBOX3}, // S_SUPERRINGBOX2
+	{SPR_YLTV, 2, 4, NULL,         0, 0, S_SUPERRINGBOX4}, // S_SUPERRINGBOX3
+	{SPR_YLTV, 3, 4, NULL,         0, 0, S_SUPERRINGBOX5}, // S_SUPERRINGBOX4
+	{SPR_YLTV, 4, 4, NULL,         0, 0, S_SUPERRINGBOX6}, // S_SUPERRINGBOX5
+	{SPR_SRBX, 1, 18, A_RingBox,   0, 0, S_NULL},          // S_SUPERRINGBOX6
 
 	// Red Team Ring Box
-	{SPR_RRBX, 0, 2, {NULL}, 0, 0, S_REDRINGBOX1},          // S_REDRINGBOX
-	{SPR_RRBX, 1, 1, {NULL}, 0, 0, S_REDRINGBOX},           // S_REDRINGBOX1
+	{SPR_RRBX, 0, 2, NULL, 0, 0, S_REDRINGBOX1},          // S_REDRINGBOX
+	{SPR_RRBX, 1, 1, NULL, 0, 0, S_REDRINGBOX},           // S_REDRINGBOX1
 
 	// Blue Team Ring Box
-	{SPR_BRBX, 0, 2, {NULL}, 0, 0, S_BLUERINGBOX1},          // S_BLUERINGBOX
-	{SPR_BRBX, 1, 1, {NULL}, 0, 0, S_BLUERINGBOX},           // S_BLUERINGBOX1
+	{SPR_BRBX, 0, 2, NULL, 0, 0, S_BLUERINGBOX1},          // S_BLUERINGBOX
+	{SPR_BRBX, 1, 1, NULL, 0, 0, S_BLUERINGBOX},           // S_BLUERINGBOX1
 
 	// Super Sneakers Box
-	{SPR_SHTV, 0, 2, {NULL}, 0, 0, S_SHTV1},             // S_SHTV
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_SHTV},              // S_SHTV1
-	{SPR_SHTV, 1, 4, {A_MonitorPop},     0, 0, S_SHTV3}, // S_SHTV2
-	{SPR_YLTV, 2, 4, {NULL},             0, 0, S_SHTV4}, // S_SHTV3
-	{SPR_YLTV, 3, 4, {NULL},             0, 0, S_SHTV5}, // S_SHTV4
-	{SPR_YLTV, 4, 4, {NULL},             0, 0, S_SHTV6}, // S_SHTV5
-	{SPR_SHTV, 1, 18, {A_SuperSneakers}, 0, 0, S_NULL},  // S_SHTV6
+	{SPR_SHTV, 0, 2, NULL, 0, 0, S_SHTV1},             // S_SHTV
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_SHTV},              // S_SHTV1
+	{SPR_SHTV, 1, 4, A_MonitorPop,     0, 0, S_SHTV3}, // S_SHTV2
+	{SPR_YLTV, 2, 4, NULL,             0, 0, S_SHTV4}, // S_SHTV3
+	{SPR_YLTV, 3, 4, NULL,             0, 0, S_SHTV5}, // S_SHTV4
+	{SPR_YLTV, 4, 4, NULL,             0, 0, S_SHTV6}, // S_SHTV5
+	{SPR_SHTV, 1, 18, A_SuperSneakers, 0, 0, S_NULL},  // S_SHTV6
 
 	// Invincibility Box
-	{SPR_PINV, 0, 2, {NULL}, 0, 0, S_PINV1},             // S_PINV
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_PINV},              // S_PINV1
-	{SPR_PINV, 1, 4, {A_MonitorPop}, 0, 0, S_PINV3},     // S_PINV2
-	{SPR_PINV, 2, 4, {NULL},             0, 0, S_PINV4}, // S_PINV3
-	{SPR_PINV, 3, 4, {NULL},             0, 0, S_PINV5}, // S_PINV4
-	{SPR_PINV, 4, 4, {NULL},             0, 0, S_PINV6}, // S_PINV5
-	{SPR_PINV, 1, 18, {A_Invincibility}, 0, 0, S_NULL},  // S_PINV6
+	{SPR_PINV, 0, 2, NULL, 0, 0, S_PINV1},             // S_PINV
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_PINV},              // S_PINV1
+	{SPR_PINV, 1, 4, A_MonitorPop, 0, 0, S_PINV3},     // S_PINV2
+	{SPR_PINV, 2, 4, NULL,             0, 0, S_PINV4}, // S_PINV3
+	{SPR_PINV, 3, 4, NULL,             0, 0, S_PINV5}, // S_PINV4
+	{SPR_PINV, 4, 4, NULL,             0, 0, S_PINV6}, // S_PINV5
+	{SPR_PINV, 1, 18, A_Invincibility, 0, 0, S_NULL},  // S_PINV6
 
 	// 1up Box
-	{SPR_PRUP, 2,  2, {A_1upThinker}, 0, 0, S_PRUP1}, // S_PRUP
-	{SPR_MTEX, 0,  1, {NULL},         0, 0, S_PRUP},  // S_PRUP1
-	{SPR_PRUP, 3,  4, {A_MonitorPop}, 0, 0, S_PRUP3}, // S_PRUP2
-	{SPR_PINV, 2,  4, {NULL},         0, 0, S_PRUP4}, // S_PRUP3
-	{SPR_PINV, 3,  4, {NULL},         0, 0, S_PRUP5}, // S_PRUP4
-	{SPR_PINV, 4,  4, {NULL},         0, 0, S_PRUP6}, // S_PRUP5
-	{SPR_PRUP, 3, 18, {A_ExtraLife},  0, 0, S_NULL},  // S_PRUP6
+	{SPR_PRUP, 2,  2, A_1upThinker, 0, 0, S_PRUP1}, // S_PRUP
+	{SPR_MTEX, 0,  1, NULL,         0, 0, S_PRUP},  // S_PRUP1
+	{SPR_PRUP, 3,  4, A_MonitorPop, 0, 0, S_PRUP3}, // S_PRUP2
+	{SPR_PINV, 2,  4, NULL,         0, 0, S_PRUP4}, // S_PRUP3
+	{SPR_PINV, 3,  4, NULL,         0, 0, S_PRUP5}, // S_PRUP4
+	{SPR_PINV, 4,  4, NULL,         0, 0, S_PRUP6}, // S_PRUP5
+	{SPR_PRUP, 3, 18, A_ExtraLife,  0, 0, S_NULL},  // S_PRUP6
 
 	// Ring Shield Box
-	{SPR_YLTV, 0, 2, {NULL}, 0, 0, S_YLTV1},           // S_YLTV
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_YLTV},            // S_YLTV1
-	{SPR_YLTV, 1, 4, {A_MonitorPop}, 0, 0, S_YLTV3},   // S_YLTV2
-	{SPR_YLTV, 2, 4, {NULL},         0, 0, S_YLTV4},   // S_YLTV3
-	{SPR_YLTV, 3, 4, {NULL},         0, 0, S_YLTV5},   // S_YLTV4
-	{SPR_YLTV, 4, 4, {NULL},         0, 0, S_YLTV6},   // S_YLTV5
-	{SPR_YLTV, 1, 18, {A_RingShield},0, 0, S_NULL},    // S_YLTV6
+	{SPR_YLTV, 0, 2, NULL, 0, 0, S_YLTV1},           // S_YLTV
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_YLTV},            // S_YLTV1
+	{SPR_YLTV, 1, 4, A_MonitorPop, 0, 0, S_YLTV3},   // S_YLTV2
+	{SPR_YLTV, 2, 4, NULL,         0, 0, S_YLTV4},   // S_YLTV3
+	{SPR_YLTV, 3, 4, NULL,         0, 0, S_YLTV5},   // S_YLTV4
+	{SPR_YLTV, 4, 4, NULL,         0, 0, S_YLTV6},   // S_YLTV5
+	{SPR_YLTV, 1, 18, A_RingShield,0, 0, S_NULL},    // S_YLTV6
 
 	// Force Shield Box
-	{SPR_BLTV, 0, 2, {NULL}, 0, 0, S_BLTV2},           // S_BLTV1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_BLTV1},           // S_BLTV2
-	{SPR_BLTV, 1, 4, {A_MonitorPop},   0, 0, S_BLTV4}, // S_BLTV3
-	{SPR_BLTV, 2, 4, {NULL},           0, 0, S_BLTV5}, // S_BLTV4
-	{SPR_BLTV, 3, 4, {NULL},           0, 0, S_BLTV6}, // S_BLTV5
-	{SPR_BLTV, 4, 4, {NULL},           0, 0, S_BLTV7}, // S_BLTV6
-	{SPR_BLTV, 1, 18, {A_ForceShield}, 0, 0, S_NULL},  // S_BLTV7
+	{SPR_BLTV, 0, 2, NULL, 0, 0, S_BLTV2},           // S_BLTV1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_BLTV1},           // S_BLTV2
+	{SPR_BLTV, 1, 4, A_MonitorPop,   0, 0, S_BLTV4}, // S_BLTV3
+	{SPR_BLTV, 2, 4, NULL,           0, 0, S_BLTV5}, // S_BLTV4
+	{SPR_BLTV, 3, 4, NULL,           0, 0, S_BLTV6}, // S_BLTV5
+	{SPR_BLTV, 4, 4, NULL,           0, 0, S_BLTV7}, // S_BLTV6
+	{SPR_BLTV, 1, 18, A_ForceShield, 0, 0, S_NULL},  // S_BLTV7
 
 	// Bomb Shield Box
-	{SPR_BKTV, 0, 2, {NULL}, 0, 0, S_BKTV2},           // S_BKTV1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_BKTV1},           // S_BKTV2
-	{SPR_BKTV, 1, 4, {A_MonitorPop},   0, 0, S_BKTV4}, // S_BKTV3
-	{SPR_BKTV, 2, 4, {NULL},           0, 0, S_BKTV5}, // S_BKTV4
-	{SPR_BKTV, 3, 4, {NULL},           0, 0, S_BKTV6}, // S_BKTV5
-	{SPR_BKTV, 4, 4, {NULL},           0, 0, S_BKTV7}, // S_BKTV6
-	{SPR_BKTV, 1, 18, {A_BombShield},  0, 0, S_NULL},  // S_BKTV7
+	{SPR_BKTV, 0, 2, NULL, 0, 0, S_BKTV2},           // S_BKTV1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_BKTV1},           // S_BKTV2
+	{SPR_BKTV, 1, 4, A_MonitorPop,   0, 0, S_BKTV4}, // S_BKTV3
+	{SPR_BKTV, 2, 4, NULL,           0, 0, S_BKTV5}, // S_BKTV4
+	{SPR_BKTV, 3, 4, NULL,           0, 0, S_BKTV6}, // S_BKTV5
+	{SPR_BKTV, 4, 4, NULL,           0, 0, S_BKTV7}, // S_BKTV6
+	{SPR_BKTV, 1, 18, A_BombShield,  0, 0, S_NULL},  // S_BKTV7
 
 	// Jump Shield Box
-	{SPR_WHTV, 0, 2, {NULL}, 0, 0, S_WHTV2},           // S_WHTV1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_WHTV1},           // S_WHTV2
-	{SPR_WHTV, 1, 4, {A_MonitorPop},   0, 0, S_WHTV4}, // S_WHTV3
-	{SPR_WHTV, 2, 4, {NULL},           0, 0, S_WHTV5}, // S_WHTV4
-	{SPR_WHTV, 3, 4, {NULL},           0, 0, S_WHTV6}, // S_WHTV5
-	{SPR_WHTV, 4, 4, {NULL},           0, 0, S_WHTV7}, // S_WHTV6
-	{SPR_WHTV, 1, 18, {A_JumpShield},  0, 0, S_NULL},  // S_WHTV7
+	{SPR_WHTV, 0, 2, NULL, 0, 0, S_WHTV2},           // S_WHTV1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_WHTV1},           // S_WHTV2
+	{SPR_WHTV, 1, 4, A_MonitorPop,   0, 0, S_WHTV4}, // S_WHTV3
+	{SPR_WHTV, 2, 4, NULL,           0, 0, S_WHTV5}, // S_WHTV4
+	{SPR_WHTV, 3, 4, NULL,           0, 0, S_WHTV6}, // S_WHTV5
+	{SPR_WHTV, 4, 4, NULL,           0, 0, S_WHTV7}, // S_WHTV6
+	{SPR_WHTV, 1, 18, A_JumpShield,  0, 0, S_NULL},  // S_WHTV7
 
 	// Elemental Shield Box
-	{SPR_ELTV, 0, 2, {NULL}, 0, 0, S_GRTV1},           // S_GRTV
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_GRTV},            // S_GRTV1
-	{SPR_ELTV, 1, 4, {A_MonitorPop},   0, 0, S_GRTV3}, // S_GRTV2
-	{SPR_ELTV, 2, 4, {NULL},           0, 0, S_GRTV4}, // S_GRTV3
-	{SPR_ELTV, 3, 4, {NULL},           0, 0, S_GRTV5}, // S_GRTV4
-	{SPR_ELTV, 4, 4, {NULL},           0, 0, S_GRTV6}, // S_GRTV5
-	{SPR_ELTV, 1, 18, {A_WaterShield}, 0, 0, S_NULL},  // S_GRTV6
+	{SPR_ELTV, 0, 2, NULL, 0, 0, S_GRTV1},           // S_GRTV
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_GRTV},            // S_GRTV1
+	{SPR_ELTV, 1, 4, A_MonitorPop,   0, 0, S_GRTV3}, // S_GRTV2
+	{SPR_ELTV, 2, 4, NULL,           0, 0, S_GRTV4}, // S_GRTV3
+	{SPR_ELTV, 3, 4, NULL,           0, 0, S_GRTV5}, // S_GRTV4
+	{SPR_ELTV, 4, 4, NULL,           0, 0, S_GRTV6}, // S_GRTV5
+	{SPR_ELTV, 1, 18, A_WaterShield, 0, 0, S_NULL},  // S_GRTV6
 
 	// Pity Shield Box
-	{SPR_GRTV, 0, 2, {NULL},           0, 0, S_PITV2}, // S_PITV1
-	{SPR_MTEX, 0, 1, {NULL},           0, 0, S_PITV1}, // S_PITV2
-	{SPR_GRTV, 1, 4, {A_MonitorPop},   0, 0, S_PITV4}, // S_PITV3
-	{SPR_GRTV, 2, 4, {NULL},           0, 0, S_PITV5}, // S_PITV4
-	{SPR_GRTV, 3, 4, {NULL},           0, 0, S_PITV6}, // S_PITV5
-	{SPR_GRTV, 4, 4, {NULL},           0, 0, S_PITV7}, // S_PITV6
-	{SPR_GRTV, 1, 18, {A_PityShield}, 0, 0, S_NULL},  // S_PITV7
+	{SPR_GRTV, 0, 2, NULL,           0, 0, S_PITV2}, // S_PITV1
+	{SPR_MTEX, 0, 1, NULL,           0, 0, S_PITV1}, // S_PITV2
+	{SPR_GRTV, 1, 4, A_MonitorPop,   0, 0, S_PITV4}, // S_PITV3
+	{SPR_GRTV, 2, 4, NULL,           0, 0, S_PITV5}, // S_PITV4
+	{SPR_GRTV, 3, 4, NULL,           0, 0, S_PITV6}, // S_PITV5
+	{SPR_GRTV, 4, 4, NULL,           0, 0, S_PITV7}, // S_PITV6
+	{SPR_GRTV, 1, 18, A_PityShield, 0, 0, S_NULL},  // S_PITV7
 
 	// Eggman Box
-	{SPR_EGGB, 0, 2, {NULL}, 0, 0, S_EGGTV2},           // S_EGGTV1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_EGGTV1},           // S_EGGTV2
-	{SPR_EGGB, 1, 4, {A_MonitorPop},   0, 0, S_EGGTV4}, // S_EGGTV3
-	{SPR_BKTV, 2, 4, {NULL},           0, 0, S_EGGTV5}, // S_EGGTV4
-	{SPR_BKTV, 3, 4, {NULL},           0, 0, S_EGGTV6}, // S_EGGTV5
-	{SPR_BKTV, 4, 4, {NULL},           0, 0, S_EGGTV7}, // S_EGGTV6
-	{SPR_EGGB, 1, 18, {A_EggmanBox},   0, 0, S_NULL},   // S_EGGTV7
+	{SPR_EGGB, 0, 2, NULL, 0, 0, S_EGGTV2},           // S_EGGTV1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_EGGTV1},           // S_EGGTV2
+	{SPR_EGGB, 1, 4, A_MonitorPop,   0, 0, S_EGGTV4}, // S_EGGTV3
+	{SPR_BKTV, 2, 4, NULL,           0, 0, S_EGGTV5}, // S_EGGTV4
+	{SPR_BKTV, 3, 4, NULL,           0, 0, S_EGGTV6}, // S_EGGTV5
+	{SPR_BKTV, 4, 4, NULL,           0, 0, S_EGGTV7}, // S_EGGTV6
+	{SPR_EGGB, 1, 18, A_EggmanBox,   0, 0, S_NULL},   // S_EGGTV7
 
 	// Teleport Box
-	{SPR_MIXU, 0, 2, {NULL}, 0, 0, S_MIXUPBOX2},         // S_MIXUPBOX1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_MIXUPBOX1},         // S_MIXUPBOX2
-	{SPR_MIXU, 1, 4, {A_MonitorPop}, 0, 0, S_MIXUPBOX4}, // S_MIXUPBOX3
-	{SPR_WHTV, 2, 4, {NULL},         0, 0, S_MIXUPBOX5}, // S_MIXUPBOX4
-	{SPR_WHTV, 3, 4, {NULL},         0, 0, S_MIXUPBOX6}, // S_MIXUPBOX5
-	{SPR_WHTV, 4, 4, {NULL},         0, 0, S_MIXUPBOX7}, // S_MIXUPBOX6
-	{SPR_MIXU, 1, 18, {A_MixUp},     0, 0, S_NULL},      // S_MIXUPBOX7
+	{SPR_MIXU, 0, 2, NULL, 0, 0, S_MIXUPBOX2},         // S_MIXUPBOX1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_MIXUPBOX1},         // S_MIXUPBOX2
+	{SPR_MIXU, 1, 4, A_MonitorPop, 0, 0, S_MIXUPBOX4}, // S_MIXUPBOX3
+	{SPR_WHTV, 2, 4, NULL,         0, 0, S_MIXUPBOX5}, // S_MIXUPBOX4
+	{SPR_WHTV, 3, 4, NULL,         0, 0, S_MIXUPBOX6}, // S_MIXUPBOX5
+	{SPR_WHTV, 4, 4, NULL,         0, 0, S_MIXUPBOX7}, // S_MIXUPBOX6
+	{SPR_MIXU, 1, 18, A_MixUp,     0, 0, S_NULL},      // S_MIXUPBOX7
 
 	// Recycler Box
-	{SPR_RECY, 0, 2, {NULL}, 0, 0, S_RECYCLETV2},             // S_RECYCLETV1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_RECYCLETV1},             // S_RECYCLETV2
-	{SPR_RECY, 1, 4, {A_MonitorPop},     0, 0, S_RECYCLETV4}, // S_RECYCLETV3
-	{SPR_GRTV, 2, 4, {NULL},             0, 0, S_RECYCLETV5}, // S_RECYCLETV4
-	{SPR_GRTV, 3, 4, {NULL},             0, 0, S_RECYCLETV6}, // S_RECYCLETV5
-	{SPR_GRTV, 4, 4, {NULL},             0, 0, S_RECYCLETV7}, // S_RECYCLETV6
-	{SPR_RECY, 1, 18, {A_RecyclePowers}, 0, 0, S_NULL},       // S_RECYCLETV7
+	{SPR_RECY, 0, 2, NULL, 0, 0, S_RECYCLETV2},             // S_RECYCLETV1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_RECYCLETV1},             // S_RECYCLETV2
+	{SPR_RECY, 1, 4, A_MonitorPop,     0, 0, S_RECYCLETV4}, // S_RECYCLETV3
+	{SPR_GRTV, 2, 4, NULL,             0, 0, S_RECYCLETV5}, // S_RECYCLETV4
+	{SPR_GRTV, 3, 4, NULL,             0, 0, S_RECYCLETV6}, // S_RECYCLETV5
+	{SPR_GRTV, 4, 4, NULL,             0, 0, S_RECYCLETV7}, // S_RECYCLETV6
+	{SPR_RECY, 1, 18, A_RecyclePowers, 0, 0, S_NULL},       // S_RECYCLETV7
 
 	// Question Box
-	{SPR_QUES, 0, 2, {NULL}, 0, 0, S_RANDOMBOX2},   // S_RANDOMBOX1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_RANDOMBOX1},   // S_RANDOMBOX2
-	{SPR_QUES, 0, 1, {A_MonitorPop}, 0, 0, S_NULL}, // S_RANDOMBOX3
+	{SPR_QUES, 0, 2, NULL, 0, 0, S_RANDOMBOX2},   // S_RANDOMBOX1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_RANDOMBOX1},   // S_RANDOMBOX2
+	{SPR_QUES, 0, 1, A_MonitorPop, 0, 0, S_NULL}, // S_RANDOMBOX3
 
 	// Gravity Boots Box
-	{SPR_GBTV, 0, 2, {NULL}, 0, 0, S_GBTV2},           // S_GBTV1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_GBTV1},           // S_GBTV2
-	{SPR_GBTV, 1, 4, {A_MonitorPop},   0, 0, S_GBTV4}, // S_GBTV3
-	{SPR_BLTV, 2, 4, {NULL},           0, 0, S_GBTV5}, // S_GBTV4
-	{SPR_BLTV, 3, 4, {NULL},           0, 0, S_GBTV6}, // S_GBTV5
-	{SPR_BLTV, 4, 4, {NULL},           0, 0, S_GBTV7}, // S_GBTV6
-	{SPR_GBTV, 1, 18, {A_GravityBox},  0, 0, S_NULL},  // S_GBTV7
+	{SPR_GBTV, 0, 2, NULL, 0, 0, S_GBTV2},           // S_GBTV1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_GBTV1},           // S_GBTV2
+	{SPR_GBTV, 1, 4, A_MonitorPop,   0, 0, S_GBTV4}, // S_GBTV3
+	{SPR_BLTV, 2, 4, NULL,           0, 0, S_GBTV5}, // S_GBTV4
+	{SPR_BLTV, 3, 4, NULL,           0, 0, S_GBTV6}, // S_GBTV5
+	{SPR_BLTV, 4, 4, NULL,           0, 0, S_GBTV7}, // S_GBTV6
+	{SPR_GBTV, 1, 18, A_GravityBox,  0, 0, S_NULL},  // S_GBTV7
 
 	// Score Box (1k)
-	{SPR_PTTV, 0, 2, {NULL}, 0, 0, S_SCORETVA2},             // S_SCORETVA1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_SCORETVA1},             // S_SCORETVA2
-	{SPR_PTTV, 1, 4, {A_MonitorPop},     0, 0, S_SCORETVA4}, // S_SCORETVA3
-	{SPR_PTTV, 2, 4, {NULL},             0, 0, S_SCORETVA5}, // S_SCORETVA4
-	{SPR_PTTV, 3, 4, {NULL},             0, 0, S_SCORETVA6}, // S_SCORETVA5
-	{SPR_PTTV, 4, 4, {NULL},             0, 0, S_SCORETVA7}, // S_SCORETVA6
-	{SPR_PTTV, 1, 18, {A_AwardScore}, 0, 0, S_NULL},         // S_SCORETVA7
+	{SPR_PTTV, 0, 2, NULL, 0, 0, S_SCORETVA2},             // S_SCORETVA1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_SCORETVA1},             // S_SCORETVA2
+	{SPR_PTTV, 1, 4, A_MonitorPop,     0, 0, S_SCORETVA4}, // S_SCORETVA3
+	{SPR_PTTV, 2, 4, NULL,             0, 0, S_SCORETVA5}, // S_SCORETVA4
+	{SPR_PTTV, 3, 4, NULL,             0, 0, S_SCORETVA6}, // S_SCORETVA5
+	{SPR_PTTV, 4, 4, NULL,             0, 0, S_SCORETVA7}, // S_SCORETVA6
+	{SPR_PTTV, 1, 18, A_AwardScore, 0, 0, S_NULL},         // S_SCORETVA7
 
 	// Score Box (10k)
-	{SPR_PTTV, 5, 2, {NULL}, 0, 0, S_SCORETVB2},             // S_SCORETVB1
-	{SPR_MTEX, 0, 1, {NULL}, 0, 0, S_SCORETVB1},             // S_SCORETVB2
-	{SPR_PTTV, 6, 4, {A_MonitorPop},     0, 0, S_SCORETVB4}, // S_SCORETVB3
-	{SPR_PTTV, 7, 4, {NULL},             0, 0, S_SCORETVB5}, // S_SCORETVB4
-	{SPR_PTTV, 8, 4, {NULL},             0, 0, S_SCORETVB6}, // S_SCORETVB5
-	{SPR_PTTV, 9, 4, {NULL},             0, 0, S_SCORETVB7}, // S_SCORETVB6
-	{SPR_PTTV, 6, 18, {A_AwardScore}, 0, 0, S_NULL},         // S_SCORETVB7
+	{SPR_PTTV, 5, 2, NULL, 0, 0, S_SCORETVB2},             // S_SCORETVB1
+	{SPR_MTEX, 0, 1, NULL, 0, 0, S_SCORETVB1},             // S_SCORETVB2
+	{SPR_PTTV, 6, 4, A_MonitorPop,     0, 0, S_SCORETVB4}, // S_SCORETVB3
+	{SPR_PTTV, 7, 4, NULL,             0, 0, S_SCORETVB5}, // S_SCORETVB4
+	{SPR_PTTV, 8, 4, NULL,             0, 0, S_SCORETVB6}, // S_SCORETVB5
+	{SPR_PTTV, 9, 4, NULL,             0, 0, S_SCORETVB7}, // S_SCORETVB6
+	{SPR_PTTV, 6, 18, A_AwardScore, 0, 0, S_NULL},         // S_SCORETVB7
 
 	// Monitor Explosion
-	{SPR_MTEX, 0, 4, {NULL}, 0, 0, S_MONITOREXPLOSION2}, // S_MONITOREXPLOSION1
-	{SPR_MTEX, 1, -1, {NULL}, 0, 0, S_NULL},             // S_MONITOREXPLOSION2
+	{SPR_MTEX, 0, 4, NULL, 0, 0, S_MONITOREXPLOSION2}, // S_MONITOREXPLOSION1
+	{SPR_MTEX, 1, -1, NULL, 0, 0, S_NULL},             // S_MONITOREXPLOSION2
 
-	{SPR_RRBX, 1, 4, {NULL}, 0, 0, S_REDMONITOREXPLOSION2}, // S_REDMONITOREXPLOSION1
-	{SPR_RRBX, 2, -1, {NULL}, 0, 0, S_NULL},             // S_REDMONITOREXPLOSION2
+	{SPR_RRBX, 1, 4, NULL, 0, 0, S_REDMONITOREXPLOSION2}, // S_REDMONITOREXPLOSION1
+	{SPR_RRBX, 2, -1, NULL, 0, 0, S_NULL},             // S_REDMONITOREXPLOSION2
 
-	{SPR_BRBX, 1, 4, {NULL}, 0, 0, S_BLUEMONITOREXPLOSION2}, // S_BLUEMONITOREXPLOSION1
-	{SPR_BRBX, 2, -1, {NULL}, 0, 0, S_NULL},             // S_BLUEMONITOREXPLOSION2
+	{SPR_BRBX, 1, 4, NULL, 0, 0, S_BLUEMONITOREXPLOSION2}, // S_BLUEMONITOREXPLOSION1
+	{SPR_BRBX, 2, -1, NULL, 0, 0, S_NULL},             // S_BLUEMONITOREXPLOSION2
 
-	{SPR_MISL, FF_FULLBRIGHT, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_ROCKET}, // S_ROCKET
+	{SPR_MISL, FF_FULLBRIGHT, 1, A_SmokeTrailer, MT_SMOKE, 0, S_ROCKET}, // S_ROCKET
 
-	{SPR_MISL, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_LASER
+	{SPR_MISL, FF_FULLBRIGHT, 2, NULL, 0, 0, S_NULL}, // S_LASER
 
-	{SPR_TORP, 0, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_TORPEDO}, // S_TORPEDO
+	{SPR_TORP, 0, 1, A_SmokeTrailer, MT_SMOKE, 0, S_TORPEDO}, // S_TORPEDO
 
-	{SPR_ENRG, FF_FULLBRIGHT|FF_TRANS30, 1, {NULL}, 0, 0, S_ENERGYBALL2}, // S_ENERGYBALL1
-	{SPR_NULL, 0, 1, {NULL}, 0, 0, S_ENERGYBALL1}, // S_ENERGYBALL2
+	{SPR_ENRG, FF_FULLBRIGHT|FF_TRANS30, 1, NULL, 0, 0, S_ENERGYBALL2}, // S_ENERGYBALL1
+	{SPR_NULL, 0, 1, NULL, 0, 0, S_ENERGYBALL1}, // S_ENERGYBALL2
 
 	// Skim Mine (also dropped by Jetty-Syn bomber)
-	{SPR_MINE, 0, -1, {NULL}, 0, 0, S_NULL},           // S_MINE1
-	{SPR_MINE, 1, 1, {A_Fall}, 0, 0, S_MINE_BOOM2},    // S_MINE_BOOM1
-	{SPR_MINE, 2, 3, {A_Scream}, 0, 0, S_MINE_BOOM3},  // S_MINE_BOOM2
-	{SPR_MINE, 3, 3, {A_Explode}, 0, 0, S_MINE_BOOM4}, // S_MINE_BOOM3
-	{SPR_MINE, 4, 3, {NULL}, 0, 0, S_NULL},            // S_MINE_BOOM4
+	{SPR_MINE, 0, -1, NULL, 0, 0, S_NULL},           // S_MINE1
+	{SPR_MINE, 1, 1, A_Fall, 0, 0, S_MINE_BOOM2},    // S_MINE_BOOM1
+	{SPR_MINE, 2, 3, A_Scream, 0, 0, S_MINE_BOOM3},  // S_MINE_BOOM2
+	{SPR_MINE, 3, 3, A_Explode, 0, 0, S_MINE_BOOM4}, // S_MINE_BOOM3
+	{SPR_MINE, 4, 3, NULL, 0, 0, S_NULL},            // S_MINE_BOOM4
 
 	// Jetty-Syn Bullet
-	{SPR_JBUL, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_JETBULLET2}, // S_JETBULLET1
-	{SPR_JBUL, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_JETBULLET1}, // S_JETBULLET2
+	{SPR_JBUL, FF_FULLBRIGHT,   1, NULL, 0, 0, S_JETBULLET2}, // S_JETBULLET1
+	{SPR_JBUL, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_JETBULLET1}, // S_JETBULLET2
 
-	{SPR_TRLS, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_TURRETLASER},          // S_TURRETLASER
-	{SPR_TRLS, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_TURRETLASEREXPLODE2},  // S_TURRETLASEREXPLODE1
-	{SPR_TRLS, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_NULL},                 // S_TURRETLASEREXPLODE2
+	{SPR_TRLS, FF_FULLBRIGHT,   1, NULL, 0, 0, S_TURRETLASER},          // S_TURRETLASER
+	{SPR_TRLS, FF_FULLBRIGHT|1, 2, NULL, 0, 0, S_TURRETLASEREXPLODE2},  // S_TURRETLASEREXPLODE1
+	{SPR_TRLS, FF_FULLBRIGHT|2, 2, NULL, 0, 0, S_NULL},                 // S_TURRETLASEREXPLODE2
 
-	{SPR_CBLL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CANNONBALL1
+	{SPR_CBLL, 0, -1, NULL, 0, 0, S_NULL}, // S_CANNONBALL1
 
-	{SPR_AROW, 0, 1, {A_ArrowCheck}, 0, 0, S_ARROW},     // S_ARROW
-	{SPR_AROW, 1, 1, {A_ArrowCheck}, 0, 0, S_ARROWUP},   // S_ARROWUP
-	{SPR_AROW, 2, 1, {A_ArrowCheck}, 0, 0, S_ARROWDOWN}, // S_ARROWDOWN
+	{SPR_AROW, 0, 1, A_ArrowCheck, 0, 0, S_ARROW},     // S_ARROW
+	{SPR_AROW, 1, 1, A_ArrowCheck, 0, 0, S_ARROWUP},   // S_ARROWUP
+	{SPR_AROW, 2, 1, A_ArrowCheck, 0, 0, S_ARROWDOWN}, // S_ARROWDOWN
 
-	{SPR_CFIR, FF_FULLBRIGHT,   2, {NULL}, 0, 0, S_DEMONFIRE2}, // S_DEMONFIRE1
-	{SPR_CFIR, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_DEMONFIRE3}, // S_DEMONFIRE2
-	{SPR_CFIR, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_DEMONFIRE4}, // S_DEMONFIRE3
-	{SPR_CFIR, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_DEMONFIRE5}, // S_DEMONFIRE4
-	{SPR_CFIR, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_DEMONFIRE6}, // S_DEMONFIRE5
-	{SPR_CFIR, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_DEMONFIRE1}, // S_DEMONFIRE6
+	{SPR_CFIR, FF_FULLBRIGHT,   2, NULL, 0, 0, S_DEMONFIRE2}, // S_DEMONFIRE1
+	{SPR_CFIR, FF_FULLBRIGHT|1, 2, NULL, 0, 0, S_DEMONFIRE3}, // S_DEMONFIRE2
+	{SPR_CFIR, FF_FULLBRIGHT|2, 2, NULL, 0, 0, S_DEMONFIRE4}, // S_DEMONFIRE3
+	{SPR_CFIR, FF_FULLBRIGHT|3, 2, NULL, 0, 0, S_DEMONFIRE5}, // S_DEMONFIRE4
+	{SPR_CFIR, FF_FULLBRIGHT|4, 2, NULL, 0, 0, S_DEMONFIRE6}, // S_DEMONFIRE5
+	{SPR_CFIR, FF_FULLBRIGHT|5, 2, NULL, 0, 0, S_DEMONFIRE1}, // S_DEMONFIRE6
 
 	// GFZ Flower
-	{SPR_FWR1, 0, 14, {NULL}, 0, 0, S_GFZFLOWERA2}, // S_GFZFLOWERA
-	{SPR_FWR1, 1, 14, {NULL}, 0, 0, S_GFZFLOWERA},  // S_GFZFLOWERA2
+	{SPR_FWR1, 0, 14, NULL, 0, 0, S_GFZFLOWERA2}, // S_GFZFLOWERA
+	{SPR_FWR1, 1, 14, NULL, 0, 0, S_GFZFLOWERA},  // S_GFZFLOWERA2
 
-	{SPR_FWR2, 0, 7, {NULL}, 0, 0, S_GFZFLOWERB2}, // S_GFZFLOWERB1
-	{SPR_FWR2, 1, 7, {NULL}, 0, 0, S_GFZFLOWERB1}, // S_GFZFLOWERB1
+	{SPR_FWR2, 0, 7, NULL, 0, 0, S_GFZFLOWERB2}, // S_GFZFLOWERB1
+	{SPR_FWR2, 1, 7, NULL, 0, 0, S_GFZFLOWERB1}, // S_GFZFLOWERB1
 
-	{SPR_FWR3, 0, -1, {NULL}, 0, 0, S_NULL},       // S_GFZFLOWERC1
+	{SPR_FWR3, 0, -1, NULL, 0, 0, S_NULL},       // S_GFZFLOWERC1
 
-	{SPR_BUS1, 0, -1, {NULL}, 0, 0, S_NULL},       // S_BERRYBUSH
-	{SPR_BUS2, 0, -1, {NULL}, 0, 0, S_NULL},       // S_BUSH
+	{SPR_BUS1, 0, -1, NULL, 0, 0, S_NULL},       // S_BERRYBUSH
+	{SPR_BUS2, 0, -1, NULL, 0, 0, S_NULL},       // S_BUSH
 
-	{SPR_THZP, 0, 4, {NULL}, 0, 0, S_THZPLANT2}, // S_THZPLANT1
-	{SPR_THZP, 1, 4, {NULL}, 0, 0, S_THZPLANT3}, // S_THZPLANT1
-	{SPR_THZP, 2, 4, {NULL}, 0, 0, S_THZPLANT4}, // S_THZPLANT1
-	{SPR_THZP, 3, 4, {NULL}, 0, 0, S_THZPLANT1}, // S_THZPLANT1
+	{SPR_THZP, 0, 4, NULL, 0, 0, S_THZPLANT2}, // S_THZPLANT1
+	{SPR_THZP, 1, 4, NULL, 0, 0, S_THZPLANT3}, // S_THZPLANT1
+	{SPR_THZP, 2, 4, NULL, 0, 0, S_THZPLANT4}, // S_THZPLANT1
+	{SPR_THZP, 3, 4, NULL, 0, 0, S_THZPLANT1}, // S_THZPLANT1
 
 	// THZ Alarm
-	{SPR_ALRM, FF_FULLBRIGHT, 35, {A_Scream}, 0, 0, S_ALARM1}, // S_ALARM1
+	{SPR_ALRM, FF_FULLBRIGHT, 35, A_Scream, 0, 0, S_ALARM1}, // S_ALARM1
 
 	// Deep Sea Gargoyle
-	{SPR_GARG, 0, -1, {NULL}, 0, 0, S_NULL},  // S_GARGOYLE
+	{SPR_GARG, 0, -1, NULL, 0, 0, S_NULL},  // S_GARGOYLE
 
 	// DSZ Seaweed
-	{SPR_SEWE, 0, -1, {NULL}, 0, 0, S_SEAWEED2}, // S_SEAWEED1
-	{SPR_SEWE, 1, 5, {NULL}, 0, 0, S_SEAWEED3}, // S_SEAWEED2
-	{SPR_SEWE, 2, 5, {NULL}, 0, 0, S_SEAWEED4}, // S_SEAWEED3
-	{SPR_SEWE, 3, 5, {NULL}, 0, 0, S_SEAWEED5}, // S_SEAWEED4
-	{SPR_SEWE, 4, 5, {NULL}, 0, 0, S_SEAWEED6}, // S_SEAWEED5
-	{SPR_SEWE, 5, 5, {NULL}, 0, 0, S_SEAWEED1}, // S_SEAWEED6
+	{SPR_SEWE, 0, -1, NULL, 0, 0, S_SEAWEED2}, // S_SEAWEED1
+	{SPR_SEWE, 1, 5, NULL, 0, 0, S_SEAWEED3}, // S_SEAWEED2
+	{SPR_SEWE, 2, 5, NULL, 0, 0, S_SEAWEED4}, // S_SEAWEED3
+	{SPR_SEWE, 3, 5, NULL, 0, 0, S_SEAWEED5}, // S_SEAWEED4
+	{SPR_SEWE, 4, 5, NULL, 0, 0, S_SEAWEED6}, // S_SEAWEED5
+	{SPR_SEWE, 5, 5, NULL, 0, 0, S_SEAWEED1}, // S_SEAWEED6
 
 	// Dripping water
-	{SPR_NULL, FF_TRANS30  , 3*TICRATE, {NULL},                  0, 0, S_DRIPA2}, // S_DRIPA1
-	{SPR_DRIP, FF_TRANS30  ,         2, {NULL},                  0, 0, S_DRIPA3}, // S_DRIPA2
-	{SPR_DRIP, FF_TRANS30|1,         2, {NULL},                  0, 0, S_DRIPA4}, // S_DRIPA3
-	{SPR_DRIP, FF_TRANS30|2,         2, {A_SpawnObjectRelative}, 0, MT_WATERDROP, S_DRIPA1}, // S_DRIPA4
-	{SPR_DRIP, FF_TRANS30|3,        -1, {NULL},                  0, 0, S_DRIPB1}, // S_DRIPB1
-	{SPR_DRIP, FF_TRANS30|4,         1, {NULL},                  0, 0, S_DRIPC2}, // S_DRIPC1
-	{SPR_DRIP, FF_TRANS30|5,         1, {NULL},                  0, 0,   S_NULL}, // S_DRIPC2
+	{SPR_NULL, FF_TRANS30  , 3*TICRATE, NULL,                  0, 0, S_DRIPA2}, // S_DRIPA1
+	{SPR_DRIP, FF_TRANS30  ,         2, NULL,                  0, 0, S_DRIPA3}, // S_DRIPA2
+	{SPR_DRIP, FF_TRANS30|1,         2, NULL,                  0, 0, S_DRIPA4}, // S_DRIPA3
+	{SPR_DRIP, FF_TRANS30|2,         2, A_SpawnObjectRelative, 0, MT_WATERDROP, S_DRIPA1}, // S_DRIPA4
+	{SPR_DRIP, FF_TRANS30|3,        -1, NULL,                  0, 0, S_DRIPB1}, // S_DRIPB1
+	{SPR_DRIP, FF_TRANS30|4,         1, NULL,                  0, 0, S_DRIPC2}, // S_DRIPC1
+	{SPR_DRIP, FF_TRANS30|5,         1, NULL,                  0, 0,   S_NULL}, // S_DRIPC2
 
 	// Coral 1
-	{SPR_CRL1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL1
+	{SPR_CRL1, 0, -1, NULL, 0, 0, S_NULL}, // S_CORAL1
 
 	// Coral 2
-	{SPR_CRL2, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL2
+	{SPR_CRL2, 0, -1, NULL, 0, 0, S_NULL}, // S_CORAL2
 
 	// Coral 3
-	{SPR_CRL3, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL3
+	{SPR_CRL3, 0, -1, NULL, 0, 0, S_NULL}, // S_CORAL3
 
 	// Blue Crystal
-	{SPR_BCRY, 32768, -1, {NULL}, 0, 0, S_NULL}, // S_BLUECRYSTAL1
+	{SPR_BCRY, 32768, -1, NULL, 0, 0, S_NULL}, // S_BLUECRYSTAL1
 
 	// CEZ Chain
-	{SPR_CHAN, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CEZCHAIN
+	{SPR_CHAN, 0, -1, NULL, 0, 0, S_NULL}, // S_CEZCHAIN
 
 	// Flame
-	{SPR_FLAM, FF_FULLBRIGHT|FF_TRANS50,   3, {NULL}, 0, 0, S_FLAME2}, // S_FLAME1
-	{SPR_FLAM, FF_FULLBRIGHT|FF_TRANS50|1, 3, {NULL}, 0, 0, S_FLAME3}, // S_FLAME2
-	{SPR_FLAM, FF_FULLBRIGHT|FF_TRANS50|2, 3, {NULL}, 0, 0, S_FLAME4}, // S_FLAME3
-	{SPR_FLAM, FF_FULLBRIGHT|FF_TRANS50|3, 3, {NULL}, 0, 0, S_FLAME1}, // S_FLAME4
+	{SPR_FLAM, FF_FULLBRIGHT|FF_TRANS50,   3, NULL, 0, 0, S_FLAME2}, // S_FLAME1
+	{SPR_FLAM, FF_FULLBRIGHT|FF_TRANS50|1, 3, NULL, 0, 0, S_FLAME3}, // S_FLAME2
+	{SPR_FLAM, FF_FULLBRIGHT|FF_TRANS50|2, 3, NULL, 0, 0, S_FLAME4}, // S_FLAME3
+	{SPR_FLAM, FF_FULLBRIGHT|FF_TRANS50|3, 3, NULL, 0, 0, S_FLAME1}, // S_FLAME4
 
 	// Eggman statue
-	{SPR_ESTA, 0, -1, {NULL}, 0, 0, S_NULL}, // S_EGGSTATUE1
+	{SPR_ESTA, 0, -1, NULL, 0, 0, S_NULL}, // S_EGGSTATUE1
 
 	// Hidden sling appears
-	{SPR_NULL, 0, -1, {NULL},          0, 0, S_SLING2}, // S_SLING1
-	{SPR_NULL, 0, -1, {A_SlingAppear}, 0, 0, S_NULL},   // S_SLING2
+	{SPR_NULL, 0, -1, NULL,          0, 0, S_SLING2}, // S_SLING1
+	{SPR_NULL, 0, -1, A_SlingAppear, 0, 0, S_NULL},   // S_SLING2
 
 	// Small Mace Chain
-	{SPR_SMCH, 0, 1, {A_MaceRotate}, 0, 0, S_SMALLMACECHAIN}, // S_SMALLMACECHAIN
+	{SPR_SMCH, 0, 1, A_MaceRotate, 0, 0, S_SMALLMACECHAIN}, // S_SMALLMACECHAIN
 
 	// Big Mace Chain
-	{SPR_BMCH, 0, 1, {A_MaceRotate}, 0, 0, S_BIGMACECHAIN}, // S_BIGMACECHAIN
+	{SPR_BMCH, 0, 1, A_MaceRotate, 0, 0, S_BIGMACECHAIN}, // S_BIGMACECHAIN
 
 	// Small Mace
-	{SPR_SMCE, 0, 1, {A_MaceRotate}, 0, 0, S_SMALLMACE}, // S_SMALLMACE
+	{SPR_SMCE, 0, 1, A_MaceRotate, 0, 0, S_SMALLMACE}, // S_SMALLMACE
 
 	// Big Mace
-	{SPR_BMCE, 0, 1, {A_MaceRotate}, 0, 0, S_BIGMACE}, // S_BIGMACE
+	{SPR_BMCE, 0, 1, A_MaceRotate, 0, 0, S_BIGMACE}, // S_BIGMACE
 
 	// CEZ Flower
-	{SPR_FWR4, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CEZFLOWER1
+	{SPR_FWR4, 0, -1, NULL, 0, 0, S_NULL}, // S_CEZFLOWER1
 
 	// Big Tumbleweed
-	{SPR_BTBL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BIGTUMBLEWEED
-	{SPR_BTBL, 0, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL2}, // S_BIGTUMBLEWEED_ROLL1
-	{SPR_BTBL, 1, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL3}, // S_BIGTUMBLEWEED_ROLL2
-	{SPR_BTBL, 2, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL4}, // S_BIGTUMBLEWEED_ROLL3
-	{SPR_BTBL, 3, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL5}, // S_BIGTUMBLEWEED_ROLL4
-	{SPR_BTBL, 4, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL6}, // S_BIGTUMBLEWEED_ROLL5
-	{SPR_BTBL, 5, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL7}, // S_BIGTUMBLEWEED_ROLL6
-	{SPR_BTBL, 6, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL8}, // S_BIGTUMBLEWEED_ROLL7
-	{SPR_BTBL, 7, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL1}, // S_BIGTUMBLEWEED_ROLL8
+	{SPR_BTBL, 0, -1, NULL, 0, 0, S_NULL}, // S_BIGTUMBLEWEED
+	{SPR_BTBL, 0, 5, NULL, 0, 0, S_BIGTUMBLEWEED_ROLL2}, // S_BIGTUMBLEWEED_ROLL1
+	{SPR_BTBL, 1, 5, NULL, 0, 0, S_BIGTUMBLEWEED_ROLL3}, // S_BIGTUMBLEWEED_ROLL2
+	{SPR_BTBL, 2, 5, NULL, 0, 0, S_BIGTUMBLEWEED_ROLL4}, // S_BIGTUMBLEWEED_ROLL3
+	{SPR_BTBL, 3, 5, NULL, 0, 0, S_BIGTUMBLEWEED_ROLL5}, // S_BIGTUMBLEWEED_ROLL4
+	{SPR_BTBL, 4, 5, NULL, 0, 0, S_BIGTUMBLEWEED_ROLL6}, // S_BIGTUMBLEWEED_ROLL5
+	{SPR_BTBL, 5, 5, NULL, 0, 0, S_BIGTUMBLEWEED_ROLL7}, // S_BIGTUMBLEWEED_ROLL6
+	{SPR_BTBL, 6, 5, NULL, 0, 0, S_BIGTUMBLEWEED_ROLL8}, // S_BIGTUMBLEWEED_ROLL7
+	{SPR_BTBL, 7, 5, NULL, 0, 0, S_BIGTUMBLEWEED_ROLL1}, // S_BIGTUMBLEWEED_ROLL8
 
 	// Little Tumbleweed
-	{SPR_STBL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LITTLETUMBLEWEED
-	{SPR_STBL, 0, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL2}, // S_LITTLETUMBLEWEED_ROLL1
-	{SPR_STBL, 1, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL3}, // S_LITTLETUMBLEWEED_ROLL2
-	{SPR_STBL, 2, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL4}, // S_LITTLETUMBLEWEED_ROLL3
-	{SPR_STBL, 3, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL5}, // S_LITTLETUMBLEWEED_ROLL4
-	{SPR_STBL, 4, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL6}, // S_LITTLETUMBLEWEED_ROLL5
-	{SPR_STBL, 5, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL7}, // S_LITTLETUMBLEWEED_ROLL6
-	{SPR_STBL, 6, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL8}, // S_LITTLETUMBLEWEED_ROLL7
-	{SPR_STBL, 7, 5, {NULL}, 0, 0, S_LITTLETUMBLEWEED_ROLL1}, // S_LITTLETUMBLEWEED_ROLL8
+	{SPR_STBL, 0, -1, NULL, 0, 0, S_NULL}, // S_LITTLETUMBLEWEED
+	{SPR_STBL, 0, 5, NULL, 0, 0, S_LITTLETUMBLEWEED_ROLL2}, // S_LITTLETUMBLEWEED_ROLL1
+	{SPR_STBL, 1, 5, NULL, 0, 0, S_LITTLETUMBLEWEED_ROLL3}, // S_LITTLETUMBLEWEED_ROLL2
+	{SPR_STBL, 2, 5, NULL, 0, 0, S_LITTLETUMBLEWEED_ROLL4}, // S_LITTLETUMBLEWEED_ROLL3
+	{SPR_STBL, 3, 5, NULL, 0, 0, S_LITTLETUMBLEWEED_ROLL5}, // S_LITTLETUMBLEWEED_ROLL4
+	{SPR_STBL, 4, 5, NULL, 0, 0, S_LITTLETUMBLEWEED_ROLL6}, // S_LITTLETUMBLEWEED_ROLL5
+	{SPR_STBL, 5, 5, NULL, 0, 0, S_LITTLETUMBLEWEED_ROLL7}, // S_LITTLETUMBLEWEED_ROLL6
+	{SPR_STBL, 6, 5, NULL, 0, 0, S_LITTLETUMBLEWEED_ROLL8}, // S_LITTLETUMBLEWEED_ROLL7
+	{SPR_STBL, 7, 5, NULL, 0, 0, S_LITTLETUMBLEWEED_ROLL1}, // S_LITTLETUMBLEWEED_ROLL8
 
 	// Cacti Sprites
-	{SPR_CACT, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI1
-	{SPR_CACT, 1, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI2
-	{SPR_CACT, 2, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI3
-	{SPR_CACT, 3, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI4
+	{SPR_CACT, 0, -1, NULL, 0, 0, S_NULL}, // S_CACTI1
+	{SPR_CACT, 1, -1, NULL, 0, 0, S_NULL}, // S_CACTI2
+	{SPR_CACT, 2, -1, NULL, 0, 0, S_NULL}, // S_CACTI3
+	{SPR_CACT, 3, -1, NULL, 0, 0, S_NULL}, // S_CACTI4
 
 	// Flame jet
-	{SPR_NULL, 0, 2*TICRATE, {NULL},             0, 0, S_FLAMEJETSTART}, // S_FLAMEJETSTND
-	{SPR_NULL, 0, 3*TICRATE, {A_ToggleFlameJet}, 0, 0,  S_FLAMEJETSTOP}, // S_FLAMEJETSTART
-	{SPR_NULL, 0,         1, {A_ToggleFlameJet}, 0, 0,  S_FLAMEJETSTND}, // S_FLAMEJETSTOP
-	{SPR_FLME, FF_FULLBRIGHT|FF_TRANS50  ,  4, {NULL}, 0, 0, S_FLAMEJETFLAME2}, // S_FLAMEJETFLAME1
-	{SPR_FLME, FF_FULLBRIGHT|FF_TRANS60|1,  5, {NULL}, 0, 0, S_FLAMEJETFLAME3}, // S_FLAMEJETFLAME2
-	{SPR_FLME, FF_FULLBRIGHT|FF_TRANS70|2, 11, {NULL}, 0, 0,           S_NULL}, // S_FLAMEJETFLAME3
+	{SPR_NULL, 0, 2*TICRATE, NULL,             0, 0, S_FLAMEJETSTART}, // S_FLAMEJETSTND
+	{SPR_NULL, 0, 3*TICRATE, A_ToggleFlameJet, 0, 0,  S_FLAMEJETSTOP}, // S_FLAMEJETSTART
+	{SPR_NULL, 0,         1, A_ToggleFlameJet, 0, 0,  S_FLAMEJETSTND}, // S_FLAMEJETSTOP
+	{SPR_FLME, FF_FULLBRIGHT|FF_TRANS50  ,  4, NULL, 0, 0, S_FLAMEJETFLAME2}, // S_FLAMEJETFLAME1
+	{SPR_FLME, FF_FULLBRIGHT|FF_TRANS60|1,  5, NULL, 0, 0, S_FLAMEJETFLAME3}, // S_FLAMEJETFLAME2
+	{SPR_FLME, FF_FULLBRIGHT|FF_TRANS70|2, 11, NULL, 0, 0,           S_NULL}, // S_FLAMEJETFLAME3
 
 	// Spinning flame jets
 	// A: Counter-clockwise
-	{SPR_NULL, 0, 1, {NULL}, 0, 0, S_FJSPINAXISA2}, // S_FJSPINAXISA1
-	{SPR_NULL, 0, 1, {A_Thrust}, 10, 1, S_FJSPINAXISA3}, // S_FJSPINAXISA2
-	{SPR_NULL, 0, 0, {A_Thrust},  0, 1, S_FJSPINAXISA4}, // S_FJSPINAXISA3
-	{SPR_NULL, 0, 0, {A_SpawnObjectRelative}, 0, MT_FJSPINHELPERA, S_FJSPINAXISA5}, // S_FJSPINAXISA4
-	{SPR_NULL, 0, 2, {A_FindTarget}, MT_FJSPINHELPERA, 0, S_FJSPINAXISA6}, // S_FJSPINAXISA5
-	{SPR_NULL, 0, 1, {A_Thrust}, -10, 1, S_FJSPINAXISA7}, // S_FJSPINAXISA6
-	{SPR_NULL, 0, 1, {A_Thrust},   0, 1, S_FJSPINAXISA8}, // S_FJSPINAXISA7
-	{SPR_NULL, 0, 0, {A_FireShot}, MT_FLAMEJETFLAMEB, -64, S_FJSPINAXISA9}, // S_FJSPINAXISA8
-	{SPR_NULL, 0, 3, {A_ChangeAngleRelative}, 6, 6, S_FJSPINAXISA8}, // S_FJSPINAXISA9
+	{SPR_NULL, 0, 1, NULL, 0, 0, S_FJSPINAXISA2}, // S_FJSPINAXISA1
+	{SPR_NULL, 0, 1, A_Thrust, 10, 1, S_FJSPINAXISA3}, // S_FJSPINAXISA2
+	{SPR_NULL, 0, 0, A_Thrust,  0, 1, S_FJSPINAXISA4}, // S_FJSPINAXISA3
+	{SPR_NULL, 0, 0, A_SpawnObjectRelative, 0, MT_FJSPINHELPERA, S_FJSPINAXISA5}, // S_FJSPINAXISA4
+	{SPR_NULL, 0, 2, A_FindTarget, MT_FJSPINHELPERA, 0, S_FJSPINAXISA6}, // S_FJSPINAXISA5
+	{SPR_NULL, 0, 1, A_Thrust, -10, 1, S_FJSPINAXISA7}, // S_FJSPINAXISA6
+	{SPR_NULL, 0, 1, A_Thrust,   0, 1, S_FJSPINAXISA8}, // S_FJSPINAXISA7
+	{SPR_NULL, 0, 0, A_FireShot, MT_FLAMEJETFLAMEB, -64, S_FJSPINAXISA9}, // S_FJSPINAXISA8
+	{SPR_NULL, 0, 3, A_ChangeAngleRelative, 6, 6, S_FJSPINAXISA8}, // S_FJSPINAXISA9
 
-	{SPR_NULL, 0, 1, {NULL}, 0, 0, S_FJSPINHELPERA2}, // S_FJSPINHELPERA1
-	{SPR_NULL, 0, 0, {A_FindTarget}, MT_FJSPINAXISA, 0, S_FJSPINHELPERA3}, // S_FJSPINHELPERA2
-	{SPR_NULL, 0, 1, {A_CapeChase}, 0, (64<<16), S_FJSPINHELPERA3}, // S_FJSPINHELPERA3
+	{SPR_NULL, 0, 1, NULL, 0, 0, S_FJSPINHELPERA2}, // S_FJSPINHELPERA1
+	{SPR_NULL, 0, 0, A_FindTarget, MT_FJSPINAXISA, 0, S_FJSPINHELPERA3}, // S_FJSPINHELPERA2
+	{SPR_NULL, 0, 1, A_CapeChase, 0, (64<<16), S_FJSPINHELPERA3}, // S_FJSPINHELPERA3
 
 	// B: Clockwise
-	{SPR_NULL, 0, 1, {NULL}, 0, 0, S_FJSPINAXISB2}, // S_FJSPINAXISB1
-	{SPR_NULL, 0, 1, {A_Thrust}, 10, 1, S_FJSPINAXISB3}, // S_FJSPINAXISB2
-	{SPR_NULL, 0, 0, {A_Thrust},  0, 1, S_FJSPINAXISB4}, // S_FJSPINAXISB3
-	{SPR_NULL, 0, 0, {A_SpawnObjectRelative}, 0, MT_FJSPINHELPERB, S_FJSPINAXISB5}, // S_FJSPINAXISB4
-	{SPR_NULL, 0, 2, {A_FindTarget}, MT_FJSPINHELPERB, 0, S_FJSPINAXISB6}, // S_FJSPINAXISB5
-	{SPR_NULL, 0, 1, {A_Thrust}, -10, 1, S_FJSPINAXISB7}, // S_FJSPINAXISB6
-	{SPR_NULL, 0, 1, {A_Thrust},   0, 1, S_FJSPINAXISB8}, // S_FJSPINAXISB7
-	{SPR_NULL, 0, 0, {A_FireShot}, MT_FLAMEJETFLAMEB, -64, S_FJSPINAXISB9}, // S_FJSPINAXISB8
-	{SPR_NULL, 0, 3, {A_ChangeAngleRelative}, -6, -6, S_FJSPINAXISB8}, // S_FJSPINAXISB9
+	{SPR_NULL, 0, 1, NULL, 0, 0, S_FJSPINAXISB2}, // S_FJSPINAXISB1
+	{SPR_NULL, 0, 1, A_Thrust, 10, 1, S_FJSPINAXISB3}, // S_FJSPINAXISB2
+	{SPR_NULL, 0, 0, A_Thrust,  0, 1, S_FJSPINAXISB4}, // S_FJSPINAXISB3
+	{SPR_NULL, 0, 0, A_SpawnObjectRelative, 0, MT_FJSPINHELPERB, S_FJSPINAXISB5}, // S_FJSPINAXISB4
+	{SPR_NULL, 0, 2, A_FindTarget, MT_FJSPINHELPERB, 0, S_FJSPINAXISB6}, // S_FJSPINAXISB5
+	{SPR_NULL, 0, 1, A_Thrust, -10, 1, S_FJSPINAXISB7}, // S_FJSPINAXISB6
+	{SPR_NULL, 0, 1, A_Thrust,   0, 1, S_FJSPINAXISB8}, // S_FJSPINAXISB7
+	{SPR_NULL, 0, 0, A_FireShot, MT_FLAMEJETFLAMEB, -64, S_FJSPINAXISB9}, // S_FJSPINAXISB8
+	{SPR_NULL, 0, 3, A_ChangeAngleRelative, -6, -6, S_FJSPINAXISB8}, // S_FJSPINAXISB9
 
-	{SPR_NULL, 0, 1, {NULL}, 0, 0, S_FJSPINHELPERB2}, // S_FJSPINHELPERB1
-	{SPR_NULL, 0, 0, {A_FindTarget}, MT_FJSPINAXISB, 0, S_FJSPINHELPERB3}, // S_FJSPINHELPERB2
-	{SPR_NULL, 0, 1, {A_CapeChase}, 0, (64<<16), S_FJSPINHELPERB3}, // S_FJSPINHELPERB3
+	{SPR_NULL, 0, 1, NULL, 0, 0, S_FJSPINHELPERB2}, // S_FJSPINHELPERB1
+	{SPR_NULL, 0, 0, A_FindTarget, MT_FJSPINAXISB, 0, S_FJSPINHELPERB3}, // S_FJSPINHELPERB2
+	{SPR_NULL, 0, 1, A_CapeChase, 0, (64<<16), S_FJSPINHELPERB3}, // S_FJSPINHELPERB3
 
 	// Blade's flame
-	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|1, 1, {A_MoveRelative}, 0, 5, S_FLAMEJETFLAMEB2}, // S_FLAMEJETFLAMEB1
-	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|2, 1, {A_MoveRelative}, 0, 7, S_FLAMEJETFLAMEB3}, // S_FLAMEJETFLAMEB2
-	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|3,24, {NULL}, 0, 0, S_FLAMEJETFLAMEB4}, // S_FLAMEJETFLAMEB3
-	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|4,24, {NULL}, 0, 0, S_FLAMEJETFLAMEB5}, // S_FLAMEJETFLAMEB4
-	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|5,24, {NULL}, 0, 0, S_FLAMEJETFLAMEB6}, // S_FLAMEJETFLAMEB5
-	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|6,12, {NULL}, 0, 0, S_NULL}, // S_FLAMEJETFLAMEB6
+	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|1, 1, A_MoveRelative, 0, 5, S_FLAMEJETFLAMEB2}, // S_FLAMEJETFLAMEB1
+	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|2, 1, A_MoveRelative, 0, 7, S_FLAMEJETFLAMEB3}, // S_FLAMEJETFLAMEB2
+	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|3,24, NULL, 0, 0, S_FLAMEJETFLAMEB4}, // S_FLAMEJETFLAMEB3
+	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|4,24, NULL, 0, 0, S_FLAMEJETFLAMEB5}, // S_FLAMEJETFLAMEB4
+	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|5,24, NULL, 0, 0, S_FLAMEJETFLAMEB6}, // S_FLAMEJETFLAMEB5
+	{SPR_DFLM, FF_FULLBRIGHT|FF_TRANS40|6,12, NULL, 0, 0, S_NULL}, // S_FLAMEJETFLAMEB6
 
 	// Trapgoyles
-	{SPR_GARG, 0, 67, {NULL},       0, 0, S_TRAPGOYLE_CHECK},  // S_TRAPGOYLE
-	{SPR_GARG, 0,  3, {NULL},       0, 0, S_TRAPGOYLE_FIRE1},  // S_TRAPGOYLE_CHECK
-	{SPR_GARG, 0,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE2},  // S_TRAPGOYLE_FIRE1
-	{SPR_GARG, 0,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE3},  // S_TRAPGOYLE_FIRE2
-	{SPR_GARG, 0,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE},  // S_TRAPGOYLE_FIRE3
+	{SPR_GARG, 0, 67, NULL,       0, 0, S_TRAPGOYLE_CHECK},  // S_TRAPGOYLE
+	{SPR_GARG, 0,  3, NULL,       0, 0, S_TRAPGOYLE_FIRE1},  // S_TRAPGOYLE_CHECK
+	{SPR_GARG, 0,  1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE2},  // S_TRAPGOYLE_FIRE1
+	{SPR_GARG, 0,  1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE3},  // S_TRAPGOYLE_FIRE2
+	{SPR_GARG, 0,  1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE},  // S_TRAPGOYLE_FIRE3
 
-	{SPR_GARG, 0, 67, {NULL},       0, 0, S_TRAPGOYLEUP_CHECK},  // S_TRAPGOYLEUP
-	{SPR_GARG, 0,  3, {NULL},       0, 0, S_TRAPGOYLEUP_FIRE1},  // S_TRAPGOYLEUP_CHECK
-	{SPR_GARG, 0,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE2},  // S_TRAPGOYLEUP_FIRE1
-	{SPR_GARG, 0,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE3},  // S_TRAPGOYLEUP_FIRE2
-	{SPR_GARG, 0,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP},  // S_TRAPGOYLEUP_FIRE3
+	{SPR_GARG, 0, 67, NULL,       0, 0, S_TRAPGOYLEUP_CHECK},  // S_TRAPGOYLEUP
+	{SPR_GARG, 0,  3, NULL,       0, 0, S_TRAPGOYLEUP_FIRE1},  // S_TRAPGOYLEUP_CHECK
+	{SPR_GARG, 0,  1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE2},  // S_TRAPGOYLEUP_FIRE1
+	{SPR_GARG, 0,  1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE3},  // S_TRAPGOYLEUP_FIRE2
+	{SPR_GARG, 0,  1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP},  // S_TRAPGOYLEUP_FIRE3
 
-	{SPR_GARG, 0, 67, {NULL},       0, 0, S_TRAPGOYLEDOWN_CHECK},  // S_TRAPGOYLEDOWN
-	{SPR_GARG, 0,  3, {NULL},       0, 0, S_TRAPGOYLEDOWN_FIRE1},  // S_TRAPGOYLEDOWN_CHECK
-	{SPR_GARG, 0,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE2},  // S_TRAPGOYLEDOWN_FIRE1
-	{SPR_GARG, 0,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE3},  // S_TRAPGOYLEDOWN_FIRE2
-	{SPR_GARG, 0,  1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN},  // S_TRAPGOYLEDOWN_FIRE3
+	{SPR_GARG, 0, 67, NULL,       0, 0, S_TRAPGOYLEDOWN_CHECK},  // S_TRAPGOYLEDOWN
+	{SPR_GARG, 0,  3, NULL,       0, 0, S_TRAPGOYLEDOWN_FIRE1},  // S_TRAPGOYLEDOWN_CHECK
+	{SPR_GARG, 0,  1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE2},  // S_TRAPGOYLEDOWN_FIRE1
+	{SPR_GARG, 0,  1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE3},  // S_TRAPGOYLEDOWN_FIRE2
+	{SPR_GARG, 0,  1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN},  // S_TRAPGOYLEDOWN_FIRE3
 
-	{SPR_GARG, 0, 135, {NULL},       0, 0, S_TRAPGOYLELONG_CHECK},  // S_TRAPGOYLELONG
-	{SPR_GARG, 0,   3, {NULL},       0, 0, S_TRAPGOYLELONG_FIRE1},  // S_TRAPGOYLELONG_CHECK
-	{SPR_GARG, 0,   1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE2},  // S_TRAPGOYLELONG_FIRE1
-	{SPR_GARG, 0,   1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE3},  // S_TRAPGOYLELONG_FIRE2
-	{SPR_GARG, 0,   1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE4},  // S_TRAPGOYLELONG_FIRE3
-	{SPR_GARG, 0,   1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE5},  // S_TRAPGOYLELONG_FIRE4
-	{SPR_GARG, 0,   1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG},  // S_TRAPGOYLELONG_FIRE5
+	{SPR_GARG, 0, 135, NULL,       0, 0, S_TRAPGOYLELONG_CHECK},  // S_TRAPGOYLELONG
+	{SPR_GARG, 0,   3, NULL,       0, 0, S_TRAPGOYLELONG_FIRE1},  // S_TRAPGOYLELONG_CHECK
+	{SPR_GARG, 0,   1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE2},  // S_TRAPGOYLELONG_FIRE1
+	{SPR_GARG, 0,   1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE3},  // S_TRAPGOYLELONG_FIRE2
+	{SPR_GARG, 0,   1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE4},  // S_TRAPGOYLELONG_FIRE3
+	{SPR_GARG, 0,   1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE5},  // S_TRAPGOYLELONG_FIRE4
+	{SPR_GARG, 0,   1, A_TrapShot, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG},  // S_TRAPGOYLELONG_FIRE5
 
 	// Target/Red Crystal
-	{SPR_RCRY,               0, -1, {NULL},                  0, 0, S_TARGET_IDLE},  // S_TARGET_IDLE
-	{SPR_RCRY, FF_FULLBRIGHT|1,  0, {A_PlaySound},           sfx_ding, 1, S_TARGET_HIT2},  // S_TARGET_HIT1
-	{SPR_RCRY, FF_FULLBRIGHT|1, 45, {A_SetObjectFlags},      MF_PUSHABLE, 2, S_TARGET_RESPAWN},  // S_TARGET_HIT2
-	{SPR_RCRY,               1,  0, {A_SpawnObjectRelative}, 0, MT_TARGET, S_NULL},  // S_TARGET_RESPAWN
-	{SPR_RCRY, FF_FULLBRIGHT|1, -1, {A_SetObjectFlags},      MF_PUSHABLE, 1, S_TARGET_ALLDONE},  // S_TARGET_ALLDONE
+	{SPR_RCRY,               0, -1, NULL,                  0, 0, S_TARGET_IDLE},  // S_TARGET_IDLE
+	{SPR_RCRY, FF_FULLBRIGHT|1,  0, A_PlaySound,           sfx_ding, 1, S_TARGET_HIT2},  // S_TARGET_HIT1
+	{SPR_RCRY, FF_FULLBRIGHT|1, 45, A_SetObjectFlags,      MF_PUSHABLE, 2, S_TARGET_RESPAWN},  // S_TARGET_HIT2
+	{SPR_RCRY,               1,  0, A_SpawnObjectRelative, 0, MT_TARGET, S_NULL},  // S_TARGET_RESPAWN
+	{SPR_RCRY, FF_FULLBRIGHT|1, -1, A_SetObjectFlags,      MF_PUSHABLE, 1, S_TARGET_ALLDONE},  // S_TARGET_ALLDONE
 
 	// Stalagmites
-	{SPR_STLG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_STG0
-	{SPR_STLG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_STG1
-	{SPR_STLG, 2, -1, {NULL}, 0, 0, S_NULL}, // S_STG2
-	{SPR_STLG, 3, -1, {NULL}, 0, 0, S_NULL}, // S_STG3
-	{SPR_STLG, 4, -1, {NULL}, 0, 0, S_NULL}, // S_STG4
-	{SPR_STLG, 5, -1, {NULL}, 0, 0, S_NULL}, // S_STG5
-	{SPR_STLG, 6, -1, {NULL}, 0, 0, S_NULL}, // S_STG6
-	{SPR_STLG, 7, -1, {NULL}, 0, 0, S_NULL}, // S_STG7
-	{SPR_STLG, 8, -1, {NULL}, 0, 0, S_NULL}, // S_STG8
-	{SPR_STLG, 9, -1, {NULL}, 0, 0, S_NULL}, // S_STG9
+	{SPR_STLG, 0, -1, NULL, 0, 0, S_NULL}, // S_STG0
+	{SPR_STLG, 1, -1, NULL, 0, 0, S_NULL}, // S_STG1
+	{SPR_STLG, 2, -1, NULL, 0, 0, S_NULL}, // S_STG2
+	{SPR_STLG, 3, -1, NULL, 0, 0, S_NULL}, // S_STG3
+	{SPR_STLG, 4, -1, NULL, 0, 0, S_NULL}, // S_STG4
+	{SPR_STLG, 5, -1, NULL, 0, 0, S_NULL}, // S_STG5
+	{SPR_STLG, 6, -1, NULL, 0, 0, S_NULL}, // S_STG6
+	{SPR_STLG, 7, -1, NULL, 0, 0, S_NULL}, // S_STG7
+	{SPR_STLG, 8, -1, NULL, 0, 0, S_NULL}, // S_STG8
+	{SPR_STLG, 9, -1, NULL, 0, 0, S_NULL}, // S_STG9
 
 	// Xmas-specific stuff
-	{SPR_XMS1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_XMASPOLE
-	{SPR_XMS2, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CANDYCANE
-	{SPR_XMS3, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SNOWMAN
-	{SPR_XMS3, 1, -1, {NULL}, 0, 0, S_NULL}, // S_SNOWMANHAT
-	{SPR_XMS4, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LAMPPOST1
-	{SPR_XMS4, 1, -1, {NULL}, 0, 0, S_NULL}, // S_LAMPPOST2
-	{SPR_XMS5, 0, -1, {NULL}, 0, 0, S_NULL}, // S_HANGSTAR
+	{SPR_XMS1, 0, -1, NULL, 0, 0, S_NULL}, // S_XMASPOLE
+	{SPR_XMS2, 0, -1, NULL, 0, 0, S_NULL}, // S_CANDYCANE
+	{SPR_XMS3, 0, -1, NULL, 0, 0, S_NULL}, // S_SNOWMAN
+	{SPR_XMS3, 1, -1, NULL, 0, 0, S_NULL}, // S_SNOWMANHAT
+	{SPR_XMS4, 0, -1, NULL, 0, 0, S_NULL}, // S_LAMPPOST1
+	{SPR_XMS4, 1, -1, NULL, 0, 0, S_NULL}, // S_LAMPPOST2
+	{SPR_XMS5, 0, -1, NULL, 0, 0, S_NULL}, // S_HANGSTAR
 
 	// Loads of Botanic Serenity bullshit
-	{SPR_BSZ1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_RED
-	{SPR_BSZ1, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_PURPLE
-	{SPR_BSZ1, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_BLUE
-	{SPR_BSZ1, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_CYAN
-	{SPR_BSZ1, 4, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_YELLOW
-	{SPR_BSZ1, 5, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_ORANGE
-	{SPR_BSZ2, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZFLOWER_RED
-	{SPR_BSZ2, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZFLOWER_PURPLE
-	{SPR_BSZ2, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BSZFLOWER_BLUE
-	{SPR_BSZ2, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BSZFLOWER_CYAN
-	{SPR_BSZ2, 4, -1, {NULL}, 0, 0, S_NULL}, // S_BSZFLOWER_YELLOW
-	{SPR_BSZ2, 5, -1, {NULL}, 0, 0, S_NULL}, // S_BSZFLOWER_ORANGE
-	{SPR_BSZ3, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_RED
-	{SPR_BSZ3, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_PURPLE
-	{SPR_BSZ3, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_BLUE
-	{SPR_BSZ3, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_CYAN
-	{SPR_BSZ3, 4, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_YELLOW
-	{SPR_BSZ3, 5, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_ORANGE
-	{SPR_BSZ4, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTULIP_RED
-	{SPR_BSZ4, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTULIP_PURPLE
-	{SPR_BSZ4, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTULIP_BLUE
-	{SPR_BSZ4, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTULIP_CYAN
-	{SPR_BSZ4, 4, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTULIP_YELLOW
-	{SPR_BSZ4, 5, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTULIP_ORANGE
-	{SPR_BSZ5, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZCLUSTER_RED
-	{SPR_BSZ5, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZCLUSTER_PURPLE
-	{SPR_BSZ5, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BSZCLUSTER_BLUE
-	{SPR_BSZ5, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BSZCLUSTER_CYAN
-	{SPR_BSZ5, 4, -1, {NULL}, 0, 0, S_NULL}, // S_BSZCLUSTER_YELLOW
-	{SPR_BSZ5, 5, -1, {NULL}, 0, 0, S_NULL}, // S_BSZCLUSTER_ORANGE
-	{SPR_BSZ6, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZBUSH_RED
-	{SPR_BSZ6, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZBUSH_PURPLE
-	{SPR_BSZ6, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BSZBUSH_BLUE
-	{SPR_BSZ6, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BSZBUSH_CYAN
-	{SPR_BSZ6, 4, -1, {NULL}, 0, 0, S_NULL}, // S_BSZBUSH_YELLOW
-	{SPR_BSZ6, 5, -1, {NULL}, 0, 0, S_NULL}, // S_BSZBUSH_ORANGE
-	{SPR_BSZ7, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZVINE_RED
-	{SPR_BSZ7, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZVINE_PURPLE
-	{SPR_BSZ7, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BSZVINE_BLUE
-	{SPR_BSZ7, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BSZVINE_CYAN
-	{SPR_BSZ7, 4, -1, {NULL}, 0, 0, S_NULL}, // S_BSZVINE_YELLOW
-	{SPR_BSZ7, 5, -1, {NULL}, 0, 0, S_NULL}, // S_BSZVINE_ORANGE
-	{SPR_BSZ8, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSHRUB
-	{SPR_BSZ8, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZCLOVER
-	{SPR_BSZ8, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BSZFISH
-	{SPR_BSZ8, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSUNFLOWER
+	{SPR_BSZ1, 0, -1, NULL, 0, 0, S_NULL}, // S_BSZTALLFLOWER_RED
+	{SPR_BSZ1, 1, -1, NULL, 0, 0, S_NULL}, // S_BSZTALLFLOWER_PURPLE
+	{SPR_BSZ1, 2, -1, NULL, 0, 0, S_NULL}, // S_BSZTALLFLOWER_BLUE
+	{SPR_BSZ1, 3, -1, NULL, 0, 0, S_NULL}, // S_BSZTALLFLOWER_CYAN
+	{SPR_BSZ1, 4, -1, NULL, 0, 0, S_NULL}, // S_BSZTALLFLOWER_YELLOW
+	{SPR_BSZ1, 5, -1, NULL, 0, 0, S_NULL}, // S_BSZTALLFLOWER_ORANGE
+	{SPR_BSZ2, 0, -1, NULL, 0, 0, S_NULL}, // S_BSZFLOWER_RED
+	{SPR_BSZ2, 1, -1, NULL, 0, 0, S_NULL}, // S_BSZFLOWER_PURPLE
+	{SPR_BSZ2, 2, -1, NULL, 0, 0, S_NULL}, // S_BSZFLOWER_BLUE
+	{SPR_BSZ2, 3, -1, NULL, 0, 0, S_NULL}, // S_BSZFLOWER_CYAN
+	{SPR_BSZ2, 4, -1, NULL, 0, 0, S_NULL}, // S_BSZFLOWER_YELLOW
+	{SPR_BSZ2, 5, -1, NULL, 0, 0, S_NULL}, // S_BSZFLOWER_ORANGE
+	{SPR_BSZ3, 0, -1, NULL, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_RED
+	{SPR_BSZ3, 1, -1, NULL, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_PURPLE
+	{SPR_BSZ3, 2, -1, NULL, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_BLUE
+	{SPR_BSZ3, 3, -1, NULL, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_CYAN
+	{SPR_BSZ3, 4, -1, NULL, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_YELLOW
+	{SPR_BSZ3, 5, -1, NULL, 0, 0, S_NULL}, // S_BSZSHORTFLOWER_ORANGE
+	{SPR_BSZ4, 0, -1, NULL, 0, 0, S_NULL}, // S_BSZTULIP_RED
+	{SPR_BSZ4, 1, -1, NULL, 0, 0, S_NULL}, // S_BSZTULIP_PURPLE
+	{SPR_BSZ4, 2, -1, NULL, 0, 0, S_NULL}, // S_BSZTULIP_BLUE
+	{SPR_BSZ4, 3, -1, NULL, 0, 0, S_NULL}, // S_BSZTULIP_CYAN
+	{SPR_BSZ4, 4, -1, NULL, 0, 0, S_NULL}, // S_BSZTULIP_YELLOW
+	{SPR_BSZ4, 5, -1, NULL, 0, 0, S_NULL}, // S_BSZTULIP_ORANGE
+	{SPR_BSZ5, 0, -1, NULL, 0, 0, S_NULL}, // S_BSZCLUSTER_RED
+	{SPR_BSZ5, 1, -1, NULL, 0, 0, S_NULL}, // S_BSZCLUSTER_PURPLE
+	{SPR_BSZ5, 2, -1, NULL, 0, 0, S_NULL}, // S_BSZCLUSTER_BLUE
+	{SPR_BSZ5, 3, -1, NULL, 0, 0, S_NULL}, // S_BSZCLUSTER_CYAN
+	{SPR_BSZ5, 4, -1, NULL, 0, 0, S_NULL}, // S_BSZCLUSTER_YELLOW
+	{SPR_BSZ5, 5, -1, NULL, 0, 0, S_NULL}, // S_BSZCLUSTER_ORANGE
+	{SPR_BSZ6, 0, -1, NULL, 0, 0, S_NULL}, // S_BSZBUSH_RED
+	{SPR_BSZ6, 1, -1, NULL, 0, 0, S_NULL}, // S_BSZBUSH_PURPLE
+	{SPR_BSZ6, 2, -1, NULL, 0, 0, S_NULL}, // S_BSZBUSH_BLUE
+	{SPR_BSZ6, 3, -1, NULL, 0, 0, S_NULL}, // S_BSZBUSH_CYAN
+	{SPR_BSZ6, 4, -1, NULL, 0, 0, S_NULL}, // S_BSZBUSH_YELLOW
+	{SPR_BSZ6, 5, -1, NULL, 0, 0, S_NULL}, // S_BSZBUSH_ORANGE
+	{SPR_BSZ7, 0, -1, NULL, 0, 0, S_NULL}, // S_BSZVINE_RED
+	{SPR_BSZ7, 1, -1, NULL, 0, 0, S_NULL}, // S_BSZVINE_PURPLE
+	{SPR_BSZ7, 2, -1, NULL, 0, 0, S_NULL}, // S_BSZVINE_BLUE
+	{SPR_BSZ7, 3, -1, NULL, 0, 0, S_NULL}, // S_BSZVINE_CYAN
+	{SPR_BSZ7, 4, -1, NULL, 0, 0, S_NULL}, // S_BSZVINE_YELLOW
+	{SPR_BSZ7, 5, -1, NULL, 0, 0, S_NULL}, // S_BSZVINE_ORANGE
+	{SPR_BSZ8, 0, -1, NULL, 0, 0, S_NULL}, // S_BSZSHRUB
+	{SPR_BSZ8, 1, -1, NULL, 0, 0, S_NULL}, // S_BSZCLOVER
+	{SPR_BSZ8, 2, -1, NULL, 0, 0, S_NULL}, // S_BSZFISH
+	{SPR_BSZ8, 3, -1, NULL, 0, 0, S_NULL}, // S_BSZSUNFLOWER
 
 	// Disco ball
-	{SPR_DBAL, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_DBALL2}, // S_DBALL1
-	{SPR_DBAL, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_DBALL3}, // S_DBALL2
-	{SPR_DBAL, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_DBALL4}, // S_DBALL3
-	{SPR_DBAL, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_DBALL5}, // S_DBALL4
-	{SPR_DBAL, FF_FULLBRIGHT|4, 5, {NULL}, 0, 0, S_DBALL6}, // S_DBALL5
-	{SPR_DBAL, FF_FULLBRIGHT|5, 5, {NULL}, 0, 0, S_DBALL1}, // S_DBALL6
+	{SPR_DBAL, FF_FULLBRIGHT,   5, NULL, 0, 0, S_DBALL2}, // S_DBALL1
+	{SPR_DBAL, FF_FULLBRIGHT|1, 5, NULL, 0, 0, S_DBALL3}, // S_DBALL2
+	{SPR_DBAL, FF_FULLBRIGHT|2, 5, NULL, 0, 0, S_DBALL4}, // S_DBALL3
+	{SPR_DBAL, FF_FULLBRIGHT|3, 5, NULL, 0, 0, S_DBALL5}, // S_DBALL4
+	{SPR_DBAL, FF_FULLBRIGHT|4, 5, NULL, 0, 0, S_DBALL6}, // S_DBALL5
+	{SPR_DBAL, FF_FULLBRIGHT|5, 5, NULL, 0, 0, S_DBALL1}, // S_DBALL6
 
-	{SPR_ESTA, 1, -1, {NULL}, 0, 0, S_NULL}, // S_EGGSTATUE2
+	{SPR_ESTA, 1, -1, NULL, 0, 0, S_NULL}, // S_EGGSTATUE2
 
 	// Shield Orb
-	{SPR_ARMA, FF_TRANS40   , 2, {NULL}, 0, 0, S_ARMA2 }, // S_ARMA1
-	{SPR_ARMA, FF_TRANS40| 1, 2, {NULL}, 0, 0, S_ARMA3 }, // S_ARMA2
-	{SPR_ARMA, FF_TRANS40| 2, 2, {NULL}, 0, 0, S_ARMA4 }, // S_ARMA3
-	{SPR_ARMA, FF_TRANS40| 3, 2, {NULL}, 0, 0, S_ARMA5 }, // S_ARMA4
-	{SPR_ARMA, FF_TRANS40| 4, 2, {NULL}, 0, 0, S_ARMA6 }, // S_ARMA5
-	{SPR_ARMA, FF_TRANS40| 5, 2, {NULL}, 0, 0, S_ARMA7 }, // S_ARMA6
-	{SPR_ARMA, FF_TRANS40| 6, 2, {NULL}, 0, 0, S_ARMA8 }, // S_ARMA7
-	{SPR_ARMA, FF_TRANS40| 7, 2, {NULL}, 0, 0, S_ARMA9 }, // S_ARMA8
-	{SPR_ARMA, FF_TRANS40| 8, 2, {NULL}, 0, 0, S_ARMA10}, // S_ARMA9
-	{SPR_ARMA, FF_TRANS40| 9, 2, {NULL}, 0, 0, S_ARMA11}, // S_ARMA10
-	{SPR_ARMA, FF_TRANS40|10, 2, {NULL}, 0, 0, S_ARMA12}, // S_ARMA11
-	{SPR_ARMA, FF_TRANS40|11, 2, {NULL}, 0, 0, S_ARMA13}, // S_ARMA12
-	{SPR_ARMA, FF_TRANS40|12, 2, {NULL}, 0, 0, S_ARMA14}, // S_ARMA13
-	{SPR_ARMA, FF_TRANS40|13, 2, {NULL}, 0, 0, S_ARMA15}, // S_ARMA14
-	{SPR_ARMA, FF_TRANS40|14, 2, {NULL}, 0, 0, S_ARMA16}, // S_ARMA15
-	{SPR_ARMA, FF_TRANS40|15, 2, {NULL}, 0, 0, S_ARMA1 }, // S_ARMA16
+	{SPR_ARMA, FF_TRANS40   , 2, NULL, 0, 0, S_ARMA2 }, // S_ARMA1
+	{SPR_ARMA, FF_TRANS40| 1, 2, NULL, 0, 0, S_ARMA3 }, // S_ARMA2
+	{SPR_ARMA, FF_TRANS40| 2, 2, NULL, 0, 0, S_ARMA4 }, // S_ARMA3
+	{SPR_ARMA, FF_TRANS40| 3, 2, NULL, 0, 0, S_ARMA5 }, // S_ARMA4
+	{SPR_ARMA, FF_TRANS40| 4, 2, NULL, 0, 0, S_ARMA6 }, // S_ARMA5
+	{SPR_ARMA, FF_TRANS40| 5, 2, NULL, 0, 0, S_ARMA7 }, // S_ARMA6
+	{SPR_ARMA, FF_TRANS40| 6, 2, NULL, 0, 0, S_ARMA8 }, // S_ARMA7
+	{SPR_ARMA, FF_TRANS40| 7, 2, NULL, 0, 0, S_ARMA9 }, // S_ARMA8
+	{SPR_ARMA, FF_TRANS40| 8, 2, NULL, 0, 0, S_ARMA10}, // S_ARMA9
+	{SPR_ARMA, FF_TRANS40| 9, 2, NULL, 0, 0, S_ARMA11}, // S_ARMA10
+	{SPR_ARMA, FF_TRANS40|10, 2, NULL, 0, 0, S_ARMA12}, // S_ARMA11
+	{SPR_ARMA, FF_TRANS40|11, 2, NULL, 0, 0, S_ARMA13}, // S_ARMA12
+	{SPR_ARMA, FF_TRANS40|12, 2, NULL, 0, 0, S_ARMA14}, // S_ARMA13
+	{SPR_ARMA, FF_TRANS40|13, 2, NULL, 0, 0, S_ARMA15}, // S_ARMA14
+	{SPR_ARMA, FF_TRANS40|14, 2, NULL, 0, 0, S_ARMA16}, // S_ARMA15
+	{SPR_ARMA, FF_TRANS40|15, 2, NULL, 0, 0, S_ARMA1 }, // S_ARMA16
 
-	{SPR_ARMF, FF_FULLBRIGHT   , 3, {NULL}, 0, 0, S_ARMF2 }, // S_ARMF1
-	{SPR_ARMF, FF_FULLBRIGHT| 1, 3, {NULL}, 0, 0, S_ARMF3 }, // S_ARMF2
-	{SPR_ARMF, FF_FULLBRIGHT| 2, 3, {NULL}, 0, 0, S_ARMF4 }, // S_ARMF3
-	{SPR_ARMF, FF_FULLBRIGHT| 3, 3, {NULL}, 0, 0, S_ARMF5 }, // S_ARMF4
-	{SPR_ARMF, FF_FULLBRIGHT| 4, 3, {NULL}, 0, 0, S_ARMF6 }, // S_ARMF5
-	{SPR_ARMF, FF_FULLBRIGHT| 5, 3, {NULL}, 0, 0, S_ARMF7 }, // S_ARMF6
-	{SPR_ARMF, FF_FULLBRIGHT| 6, 3, {NULL}, 0, 0, S_ARMF8 }, // S_ARMF7
-	{SPR_ARMF, FF_FULLBRIGHT| 7, 3, {NULL}, 0, 0, S_ARMF9 }, // S_ARMF8
-	{SPR_ARMF, FF_FULLBRIGHT| 8, 3, {NULL}, 0, 0, S_ARMF10}, // S_ARMF9
-	{SPR_ARMF, FF_FULLBRIGHT| 9, 3, {NULL}, 0, 0, S_ARMF11}, // S_ARMF10
-	{SPR_ARMF, FF_FULLBRIGHT|10, 3, {NULL}, 0, 0, S_ARMF12}, // S_ARMF11
-	{SPR_ARMF, FF_FULLBRIGHT|11, 3, {NULL}, 0, 0, S_ARMF13}, // S_ARMF12
-	{SPR_ARMF, FF_FULLBRIGHT|12, 3, {NULL}, 0, 0, S_ARMF14}, // S_ARMF13
-	{SPR_ARMF, FF_FULLBRIGHT|13, 3, {NULL}, 0, 0, S_ARMF15}, // S_ARMF14
-	{SPR_ARMF, FF_FULLBRIGHT|14, 3, {NULL}, 0, 0, S_ARMF16}, // S_ARMF15
-	{SPR_ARMF, FF_FULLBRIGHT|15, 3, {NULL}, 0, 0, S_ARMF1 }, // S_ARMF16
+	{SPR_ARMF, FF_FULLBRIGHT   , 3, NULL, 0, 0, S_ARMF2 }, // S_ARMF1
+	{SPR_ARMF, FF_FULLBRIGHT| 1, 3, NULL, 0, 0, S_ARMF3 }, // S_ARMF2
+	{SPR_ARMF, FF_FULLBRIGHT| 2, 3, NULL, 0, 0, S_ARMF4 }, // S_ARMF3
+	{SPR_ARMF, FF_FULLBRIGHT| 3, 3, NULL, 0, 0, S_ARMF5 }, // S_ARMF4
+	{SPR_ARMF, FF_FULLBRIGHT| 4, 3, NULL, 0, 0, S_ARMF6 }, // S_ARMF5
+	{SPR_ARMF, FF_FULLBRIGHT| 5, 3, NULL, 0, 0, S_ARMF7 }, // S_ARMF6
+	{SPR_ARMF, FF_FULLBRIGHT| 6, 3, NULL, 0, 0, S_ARMF8 }, // S_ARMF7
+	{SPR_ARMF, FF_FULLBRIGHT| 7, 3, NULL, 0, 0, S_ARMF9 }, // S_ARMF8
+	{SPR_ARMF, FF_FULLBRIGHT| 8, 3, NULL, 0, 0, S_ARMF10}, // S_ARMF9
+	{SPR_ARMF, FF_FULLBRIGHT| 9, 3, NULL, 0, 0, S_ARMF11}, // S_ARMF10
+	{SPR_ARMF, FF_FULLBRIGHT|10, 3, NULL, 0, 0, S_ARMF12}, // S_ARMF11
+	{SPR_ARMF, FF_FULLBRIGHT|11, 3, NULL, 0, 0, S_ARMF13}, // S_ARMF12
+	{SPR_ARMF, FF_FULLBRIGHT|12, 3, NULL, 0, 0, S_ARMF14}, // S_ARMF13
+	{SPR_ARMF, FF_FULLBRIGHT|13, 3, NULL, 0, 0, S_ARMF15}, // S_ARMF14
+	{SPR_ARMF, FF_FULLBRIGHT|14, 3, NULL, 0, 0, S_ARMF16}, // S_ARMF15
+	{SPR_ARMF, FF_FULLBRIGHT|15, 3, NULL, 0, 0, S_ARMF1 }, // S_ARMF16
 
-	{SPR_ARMB, FF_FULLBRIGHT| 0, 3, {NULL}, 1, 0, S_ARMB2 }, // S_ARMB1
-	{SPR_ARMB, FF_FULLBRIGHT| 1, 3, {NULL}, 1, 0, S_ARMB3 }, // S_ARMB2
-	{SPR_ARMB, FF_FULLBRIGHT| 2, 3, {NULL}, 1, 0, S_ARMB4 }, // S_ARMB3
-	{SPR_ARMB, FF_FULLBRIGHT| 3, 3, {NULL}, 1, 0, S_ARMB5 }, // S_ARMB4
-	{SPR_ARMB, FF_FULLBRIGHT| 4, 3, {NULL}, 1, 0, S_ARMB6 }, // S_ARMB5
-	{SPR_ARMB, FF_FULLBRIGHT| 5, 3, {NULL}, 1, 0, S_ARMB7 }, // S_ARMB6
-	{SPR_ARMB, FF_FULLBRIGHT| 6, 3, {NULL}, 1, 0, S_ARMB8 }, // S_ARMB7
-	{SPR_ARMB, FF_FULLBRIGHT| 7, 3, {NULL}, 1, 0, S_ARMB9 }, // S_ARMB8
-	{SPR_ARMB, FF_FULLBRIGHT| 8, 3, {NULL}, 1, 0, S_ARMB10}, // S_ARMB9
-	{SPR_ARMB, FF_FULLBRIGHT| 9, 3, {NULL}, 1, 0, S_ARMB11}, // S_ARMB10
-	{SPR_ARMB, FF_FULLBRIGHT|10, 3, {NULL}, 1, 0, S_ARMB12}, // S_ARMB11
-	{SPR_ARMB, FF_FULLBRIGHT|11, 3, {NULL}, 1, 0, S_ARMB13}, // S_ARMB12
-	{SPR_ARMB, FF_FULLBRIGHT|12, 3, {NULL}, 1, 0, S_ARMB14}, // S_ARMB13
-	{SPR_ARMB, FF_FULLBRIGHT|13, 3, {NULL}, 1, 0, S_ARMB15}, // S_ARMB14
-	{SPR_ARMB, FF_FULLBRIGHT|14, 3, {NULL}, 1, 0, S_ARMB16}, // S_ARMB15
-	{SPR_ARMB, FF_FULLBRIGHT|15, 3, {NULL}, 1, 0, S_ARMB1 }, // S_ARMB16
+	{SPR_ARMB, FF_FULLBRIGHT| 0, 3, NULL, 1, 0, S_ARMB2 }, // S_ARMB1
+	{SPR_ARMB, FF_FULLBRIGHT| 1, 3, NULL, 1, 0, S_ARMB3 }, // S_ARMB2
+	{SPR_ARMB, FF_FULLBRIGHT| 2, 3, NULL, 1, 0, S_ARMB4 }, // S_ARMB3
+	{SPR_ARMB, FF_FULLBRIGHT| 3, 3, NULL, 1, 0, S_ARMB5 }, // S_ARMB4
+	{SPR_ARMB, FF_FULLBRIGHT| 4, 3, NULL, 1, 0, S_ARMB6 }, // S_ARMB5
+	{SPR_ARMB, FF_FULLBRIGHT| 5, 3, NULL, 1, 0, S_ARMB7 }, // S_ARMB6
+	{SPR_ARMB, FF_FULLBRIGHT| 6, 3, NULL, 1, 0, S_ARMB8 }, // S_ARMB7
+	{SPR_ARMB, FF_FULLBRIGHT| 7, 3, NULL, 1, 0, S_ARMB9 }, // S_ARMB8
+	{SPR_ARMB, FF_FULLBRIGHT| 8, 3, NULL, 1, 0, S_ARMB10}, // S_ARMB9
+	{SPR_ARMB, FF_FULLBRIGHT| 9, 3, NULL, 1, 0, S_ARMB11}, // S_ARMB10
+	{SPR_ARMB, FF_FULLBRIGHT|10, 3, NULL, 1, 0, S_ARMB12}, // S_ARMB11
+	{SPR_ARMB, FF_FULLBRIGHT|11, 3, NULL, 1, 0, S_ARMB13}, // S_ARMB12
+	{SPR_ARMB, FF_FULLBRIGHT|12, 3, NULL, 1, 0, S_ARMB14}, // S_ARMB13
+	{SPR_ARMB, FF_FULLBRIGHT|13, 3, NULL, 1, 0, S_ARMB15}, // S_ARMB14
+	{SPR_ARMB, FF_FULLBRIGHT|14, 3, NULL, 1, 0, S_ARMB16}, // S_ARMB15
+	{SPR_ARMB, FF_FULLBRIGHT|15, 3, NULL, 1, 0, S_ARMB1 }, // S_ARMB16
 
-	{SPR_WIND, FF_TRANS70  , 2, {NULL}, 0, 0, S_WIND2}, // S_WIND1
-	{SPR_WIND, FF_TRANS70|1, 2, {NULL}, 0, 0, S_WIND3}, // S_WIND2
-	{SPR_WIND, FF_TRANS70|2, 2, {NULL}, 0, 0, S_WIND4}, // S_WIND3
-	{SPR_WIND, FF_TRANS70|3, 2, {NULL}, 0, 0, S_WIND5}, // S_WIND4
-	{SPR_WIND, FF_TRANS70|4, 2, {NULL}, 0, 0, S_WIND6}, // S_WIND5
-	{SPR_WIND, FF_TRANS70|5, 2, {NULL}, 0, 0, S_WIND7}, // S_WIND6
-	{SPR_WIND, FF_TRANS70|6, 2, {NULL}, 0, 0, S_WIND8}, // S_WIND7
-	{SPR_WIND, FF_TRANS70|7, 2, {NULL}, 0, 0, S_WIND1}, // S_WIND8
+	{SPR_WIND, FF_TRANS70  , 2, NULL, 0, 0, S_WIND2}, // S_WIND1
+	{SPR_WIND, FF_TRANS70|1, 2, NULL, 0, 0, S_WIND3}, // S_WIND2
+	{SPR_WIND, FF_TRANS70|2, 2, NULL, 0, 0, S_WIND4}, // S_WIND3
+	{SPR_WIND, FF_TRANS70|3, 2, NULL, 0, 0, S_WIND5}, // S_WIND4
+	{SPR_WIND, FF_TRANS70|4, 2, NULL, 0, 0, S_WIND6}, // S_WIND5
+	{SPR_WIND, FF_TRANS70|5, 2, NULL, 0, 0, S_WIND7}, // S_WIND6
+	{SPR_WIND, FF_TRANS70|6, 2, NULL, 0, 0, S_WIND8}, // S_WIND7
+	{SPR_WIND, FF_TRANS70|7, 2, NULL, 0, 0, S_WIND1}, // S_WIND8
 
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40   , 2, {NULL}, 0, 0, S_MAGN2 }, // S_MAGN1
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 1, 2, {NULL}, 0, 0, S_MAGN3 }, // S_MAGN2
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 2, 2, {NULL}, 0, 0, S_MAGN4 }, // S_MAGN3
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 3, 2, {NULL}, 0, 0, S_MAGN5 }, // S_MAGN4
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 4, 2, {NULL}, 0, 0, S_MAGN6 }, // S_MAGN5
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 5, 2, {NULL}, 0, 0, S_MAGN7 }, // S_MAGN6
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 6, 2, {NULL}, 0, 0, S_MAGN8 }, // S_MAGN7
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 7, 2, {NULL}, 0, 0, S_MAGN9 }, // S_MAGN8
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 8, 2, {NULL}, 0, 0, S_MAGN10}, // S_MAGN9
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 9, 2, {NULL}, 0, 0, S_MAGN11}, // S_MAGN10
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40|10, 2, {NULL}, 0, 0, S_MAGN12}, // S_MAGN11
-	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40|11, 2, {NULL}, 0, 0, S_MAGN1 }, // S_MAGN12
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40   , 2, NULL, 0, 0, S_MAGN2 }, // S_MAGN1
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 1, 2, NULL, 0, 0, S_MAGN3 }, // S_MAGN2
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 2, 2, NULL, 0, 0, S_MAGN4 }, // S_MAGN3
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 3, 2, NULL, 0, 0, S_MAGN5 }, // S_MAGN4
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 4, 2, NULL, 0, 0, S_MAGN6 }, // S_MAGN5
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 5, 2, NULL, 0, 0, S_MAGN7 }, // S_MAGN6
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 6, 2, NULL, 0, 0, S_MAGN8 }, // S_MAGN7
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 7, 2, NULL, 0, 0, S_MAGN9 }, // S_MAGN8
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 8, 2, NULL, 0, 0, S_MAGN10}, // S_MAGN9
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40| 9, 2, NULL, 0, 0, S_MAGN11}, // S_MAGN10
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40|10, 2, NULL, 0, 0, S_MAGN12}, // S_MAGN11
+	{SPR_MAGN, FF_FULLBRIGHT|FF_TRANS40|11, 2, NULL, 0, 0, S_MAGN1 }, // S_MAGN12
 
-	{SPR_FORC, FF_TRANS50  , 3, {NULL}, 0, 0, S_FORC2 }, // S_FORC1
-	{SPR_FORC, FF_TRANS50|1, 3, {NULL}, 0, 0, S_FORC3 }, // S_FORC2
-	{SPR_FORC, FF_TRANS50|2, 3, {NULL}, 0, 0, S_FORC4 }, // S_FORC3
-	{SPR_FORC, FF_TRANS50|3, 3, {NULL}, 0, 0, S_FORC5 }, // S_FORC4
-	{SPR_FORC, FF_TRANS50|4, 3, {NULL}, 0, 0, S_FORC6 }, // S_FORC5
-	{SPR_FORC, FF_TRANS50|5, 3, {NULL}, 0, 0, S_FORC7 }, // S_FORC6
-	{SPR_FORC, FF_TRANS50|6, 3, {NULL}, 0, 0, S_FORC8 }, // S_FORC7
-	{SPR_FORC, FF_TRANS50|7, 3, {NULL}, 0, 0, S_FORC9 }, // S_FORC8
-	{SPR_FORC, FF_TRANS50|8, 3, {NULL}, 0, 0, S_FORC10}, // S_FORC9
-	{SPR_FORC, FF_TRANS50|9, 3, {NULL}, 0, 0, S_FORC1 }, // S_FORC10
+	{SPR_FORC, FF_TRANS50  , 3, NULL, 0, 0, S_FORC2 }, // S_FORC1
+	{SPR_FORC, FF_TRANS50|1, 3, NULL, 0, 0, S_FORC3 }, // S_FORC2
+	{SPR_FORC, FF_TRANS50|2, 3, NULL, 0, 0, S_FORC4 }, // S_FORC3
+	{SPR_FORC, FF_TRANS50|3, 3, NULL, 0, 0, S_FORC5 }, // S_FORC4
+	{SPR_FORC, FF_TRANS50|4, 3, NULL, 0, 0, S_FORC6 }, // S_FORC5
+	{SPR_FORC, FF_TRANS50|5, 3, NULL, 0, 0, S_FORC7 }, // S_FORC6
+	{SPR_FORC, FF_TRANS50|6, 3, NULL, 0, 0, S_FORC8 }, // S_FORC7
+	{SPR_FORC, FF_TRANS50|7, 3, NULL, 0, 0, S_FORC9 }, // S_FORC8
+	{SPR_FORC, FF_TRANS50|8, 3, NULL, 0, 0, S_FORC10}, // S_FORC9
+	{SPR_FORC, FF_TRANS50|9, 3, NULL, 0, 0, S_FORC1 }, // S_FORC10
 
-	{SPR_FORC, FF_TRANS50|10, 3, {NULL}, 0, 0, S_FORC12}, // S_FORC11
-	{SPR_FORC, FF_TRANS50|11, 3, {NULL}, 0, 0, S_FORC13}, // S_FORC12
-	{SPR_FORC, FF_TRANS50|12, 3, {NULL}, 0, 0, S_FORC14}, // S_FORC13
-	{SPR_FORC, FF_TRANS50|13, 3, {NULL}, 0, 0, S_FORC15}, // S_FORC14
-	{SPR_FORC, FF_TRANS50|14, 3, {NULL}, 0, 0, S_FORC16}, // S_FORC15
-	{SPR_FORC, FF_TRANS50|15, 3, {NULL}, 0, 0, S_FORC17}, // S_FORC16
-	{SPR_FORC, FF_TRANS50|16, 3, {NULL}, 0, 0, S_FORC18}, // S_FORC17
-	{SPR_FORC, FF_TRANS50|17, 3, {NULL}, 0, 0, S_FORC19}, // S_FORC18
-	{SPR_FORC, FF_TRANS50|18, 3, {NULL}, 0, 0, S_FORC20}, // S_FORC19
-	{SPR_FORC, FF_TRANS50|19, 3, {NULL}, 0, 0, S_FORC11}, // S_FORC20
+	{SPR_FORC, FF_TRANS50|10, 3, NULL, 0, 0, S_FORC12}, // S_FORC11
+	{SPR_FORC, FF_TRANS50|11, 3, NULL, 0, 0, S_FORC13}, // S_FORC12
+	{SPR_FORC, FF_TRANS50|12, 3, NULL, 0, 0, S_FORC14}, // S_FORC13
+	{SPR_FORC, FF_TRANS50|13, 3, NULL, 0, 0, S_FORC15}, // S_FORC14
+	{SPR_FORC, FF_TRANS50|14, 3, NULL, 0, 0, S_FORC16}, // S_FORC15
+	{SPR_FORC, FF_TRANS50|15, 3, NULL, 0, 0, S_FORC17}, // S_FORC16
+	{SPR_FORC, FF_TRANS50|16, 3, NULL, 0, 0, S_FORC18}, // S_FORC17
+	{SPR_FORC, FF_TRANS50|17, 3, NULL, 0, 0, S_FORC19}, // S_FORC18
+	{SPR_FORC, FF_TRANS50|18, 3, NULL, 0, 0, S_FORC20}, // S_FORC19
+	{SPR_FORC, FF_TRANS50|19, 3, NULL, 0, 0, S_FORC11}, // S_FORC20
 
-	{SPR_ELEM, FF_TRANS50   , 4, {NULL}, 0, 0, S_ELEM2 }, // S_ELEM1
-	{SPR_ELEM, FF_TRANS50| 1, 4, {NULL}, 0, 0, S_ELEM3 }, // S_ELEM2
-	{SPR_ELEM, FF_TRANS50| 2, 4, {NULL}, 0, 0, S_ELEM4 }, // S_ELEM3
-	{SPR_ELEM, FF_TRANS50| 3, 4, {NULL}, 0, 0, S_ELEM5 }, // S_ELEM4
-	{SPR_ELEM, FF_TRANS50| 4, 4, {NULL}, 0, 0, S_ELEM6 }, // S_ELEM5
-	{SPR_ELEM, FF_TRANS50| 5, 4, {NULL}, 0, 0, S_ELEM7 }, // S_ELEM6
-	{SPR_ELEM, FF_TRANS50| 6, 4, {NULL}, 0, 0, S_ELEM8 }, // S_ELEM7
-	{SPR_ELEM, FF_TRANS50| 7, 4, {NULL}, 0, 0, S_ELEM9 }, // S_ELEM8
-	{SPR_ELEM, FF_TRANS50| 8, 4, {NULL}, 0, 0, S_ELEM10}, // S_ELEM9
-	{SPR_ELEM, FF_TRANS50| 9, 4, {NULL}, 0, 0, S_ELEM11}, // S_ELEM10
-	{SPR_ELEM, FF_TRANS50|10, 4, {NULL}, 0, 0, S_ELEM12}, // S_ELEM11
-	{SPR_ELEM, FF_TRANS50|11, 4, {NULL}, 0, 0, S_ELEM1 }, // S_ELEM12
+	{SPR_ELEM, FF_TRANS50   , 4, NULL, 0, 0, S_ELEM2 }, // S_ELEM1
+	{SPR_ELEM, FF_TRANS50| 1, 4, NULL, 0, 0, S_ELEM3 }, // S_ELEM2
+	{SPR_ELEM, FF_TRANS50| 2, 4, NULL, 0, 0, S_ELEM4 }, // S_ELEM3
+	{SPR_ELEM, FF_TRANS50| 3, 4, NULL, 0, 0, S_ELEM5 }, // S_ELEM4
+	{SPR_ELEM, FF_TRANS50| 4, 4, NULL, 0, 0, S_ELEM6 }, // S_ELEM5
+	{SPR_ELEM, FF_TRANS50| 5, 4, NULL, 0, 0, S_ELEM7 }, // S_ELEM6
+	{SPR_ELEM, FF_TRANS50| 6, 4, NULL, 0, 0, S_ELEM8 }, // S_ELEM7
+	{SPR_ELEM, FF_TRANS50| 7, 4, NULL, 0, 0, S_ELEM9 }, // S_ELEM8
+	{SPR_ELEM, FF_TRANS50| 8, 4, NULL, 0, 0, S_ELEM10}, // S_ELEM9
+	{SPR_ELEM, FF_TRANS50| 9, 4, NULL, 0, 0, S_ELEM11}, // S_ELEM10
+	{SPR_ELEM, FF_TRANS50|10, 4, NULL, 0, 0, S_ELEM12}, // S_ELEM11
+	{SPR_ELEM, FF_TRANS50|11, 4, NULL, 0, 0, S_ELEM1 }, // S_ELEM12
 
-	{SPR_ELEM, FF_FULLBRIGHT|12, 3, {NULL}, 0, 0, S_ELEMF2}, // S_ELEMF1
-	{SPR_ELEM, FF_FULLBRIGHT|13, 3, {NULL}, 0, 0, S_ELEMF3}, // S_ELEMF2
-	{SPR_ELEM, FF_FULLBRIGHT|14, 3, {NULL}, 0, 0, S_ELEMF4}, // S_ELEMF3
-	{SPR_ELEM, FF_FULLBRIGHT|15, 3, {NULL}, 0, 0, S_ELEMF5}, // S_ELEMF4
-	{SPR_ELEM, FF_FULLBRIGHT|16, 3, {NULL}, 0, 0, S_ELEMF6}, // S_ELEMF5
-	{SPR_ELEM, FF_FULLBRIGHT|17, 3, {NULL}, 0, 0, S_ELEMF7}, // S_ELEMF6
-	{SPR_ELEM, FF_FULLBRIGHT|18, 3, {NULL}, 0, 0, S_ELEMF8}, // S_ELEMF7
-	{SPR_ELEM, FF_FULLBRIGHT|19, 3, {NULL}, 0, 0, S_ELEMF1}, // S_ELEMF8
+	{SPR_ELEM, FF_FULLBRIGHT|12, 3, NULL, 0, 0, S_ELEMF2}, // S_ELEMF1
+	{SPR_ELEM, FF_FULLBRIGHT|13, 3, NULL, 0, 0, S_ELEMF3}, // S_ELEMF2
+	{SPR_ELEM, FF_FULLBRIGHT|14, 3, NULL, 0, 0, S_ELEMF4}, // S_ELEMF3
+	{SPR_ELEM, FF_FULLBRIGHT|15, 3, NULL, 0, 0, S_ELEMF5}, // S_ELEMF4
+	{SPR_ELEM, FF_FULLBRIGHT|16, 3, NULL, 0, 0, S_ELEMF6}, // S_ELEMF5
+	{SPR_ELEM, FF_FULLBRIGHT|17, 3, NULL, 0, 0, S_ELEMF7}, // S_ELEMF6
+	{SPR_ELEM, FF_FULLBRIGHT|18, 3, NULL, 0, 0, S_ELEMF8}, // S_ELEMF7
+	{SPR_ELEM, FF_FULLBRIGHT|19, 3, NULL, 0, 0, S_ELEMF1}, // S_ELEMF8
 
-	{SPR_PITY, FF_TRANS20  , 1, {NULL}, 0, 0, S_PITY2 }, // S_PITY1
-	{SPR_PITY, FF_TRANS20|1, 1, {NULL}, 0, 0, S_PITY3 }, // S_PITY2
-	{SPR_PITY, FF_TRANS20  , 1, {NULL}, 0, 0, S_PITY4 }, // S_PITY3
-	{SPR_PITY, FF_TRANS20|2, 1, {NULL}, 0, 0, S_PITY5 }, // S_PITY4
-	{SPR_PITY, FF_TRANS20  , 1, {NULL}, 0, 0, S_PITY6 }, // S_PITY5
-	{SPR_PITY, FF_TRANS20|3, 1, {NULL}, 0, 0, S_PITY7 }, // S_PITY6
-	{SPR_PITY, FF_TRANS20  , 1, {NULL}, 0, 0, S_PITY8 }, // S_PITY7
-	{SPR_PITY, FF_TRANS20|4, 1, {NULL}, 0, 0, S_PITY9 }, // S_PITY8
-	{SPR_PITY, FF_TRANS20  , 1, {NULL}, 0, 0, S_PITY10}, // S_PITY9
-	{SPR_PITY, FF_TRANS20|5, 1, {NULL}, 0, 0, S_PITY1 }, // S_PITY10
+	{SPR_PITY, FF_TRANS20  , 1, NULL, 0, 0, S_PITY2 }, // S_PITY1
+	{SPR_PITY, FF_TRANS20|1, 1, NULL, 0, 0, S_PITY3 }, // S_PITY2
+	{SPR_PITY, FF_TRANS20  , 1, NULL, 0, 0, S_PITY4 }, // S_PITY3
+	{SPR_PITY, FF_TRANS20|2, 1, NULL, 0, 0, S_PITY5 }, // S_PITY4
+	{SPR_PITY, FF_TRANS20  , 1, NULL, 0, 0, S_PITY6 }, // S_PITY5
+	{SPR_PITY, FF_TRANS20|3, 1, NULL, 0, 0, S_PITY7 }, // S_PITY6
+	{SPR_PITY, FF_TRANS20  , 1, NULL, 0, 0, S_PITY8 }, // S_PITY7
+	{SPR_PITY, FF_TRANS20|4, 1, NULL, 0, 0, S_PITY9 }, // S_PITY8
+	{SPR_PITY, FF_TRANS20  , 1, NULL, 0, 0, S_PITY10}, // S_PITY9
+	{SPR_PITY, FF_TRANS20|5, 1, NULL, 0, 0, S_PITY1 }, // S_PITY10
 
 	// Invincibility Sparkles
-	{SPR_IVSP, FF_ANIMATE, 32, {NULL}, 31, 1, S_NULL},   // S_IVSP
+	{SPR_IVSP, FF_ANIMATE, 32, NULL, 31, 1, S_NULL},   // S_IVSP
 
 	// Super Sonic Spark
-	{SPR_SSPK,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK2}, // S_SSPK1
-	{SPR_SSPK, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK3}, // S_SSPK2
-	{SPR_SSPK, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK4}, // S_SSPK3
-	{SPR_SSPK, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SSPK5}, // S_SSPK4
-	{SPR_SSPK,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL},  // S_SSPK5
+	{SPR_SSPK,   FF_FULLBRIGHT, 2, NULL, 0, 0, S_SSPK2}, // S_SSPK1
+	{SPR_SSPK, 1|FF_FULLBRIGHT, 2, NULL, 0, 0, S_SSPK3}, // S_SSPK2
+	{SPR_SSPK, 2|FF_FULLBRIGHT, 2, NULL, 0, 0, S_SSPK4}, // S_SSPK3
+	{SPR_SSPK, 1|FF_FULLBRIGHT, 2, NULL, 0, 0, S_SSPK5}, // S_SSPK4
+	{SPR_SSPK,   FF_FULLBRIGHT, 2, NULL, 0, 0, S_NULL},  // S_SSPK5
 
 	// Freed Birdie
-	{SPR_BIRD, 0, 4, {NULL}, 0, 0, S_BIRD2},    // S_BIRD1
-	{SPR_BIRD, 0, 4, {A_Chase}, 0, 0, S_BIRD3}, // S_BIRD2
-	{SPR_BIRD, 1, 4, {A_Chase}, 0, 0, S_BIRD2}, // S_BIRD3
+	{SPR_BIRD, 0, 4, NULL, 0, 0, S_BIRD2},    // S_BIRD1
+	{SPR_BIRD, 0, 4, A_Chase, 0, 0, S_BIRD3}, // S_BIRD2
+	{SPR_BIRD, 1, 4, A_Chase, 0, 0, S_BIRD2}, // S_BIRD3
 
 	// Freed Bunny
-	{SPR_BUNY, 0, 4, {NULL}, 0, 0, S_BUNNY2},       // S_BUNNY1
-	{SPR_BUNY, 0, 64, {NULL}, 0, 0, S_BUNNY3},      // S_BUNNY2
-	{SPR_BUNY, 1, 2, {A_BunnyHop}, 6, 3, S_BUNNY4}, // S_BUNNY3
-	{SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY5},    // S_BUNNY4
-	{SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY6},    // S_BUNNY5
-	{SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY7},    // S_BUNNY6
-	{SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY8},    // S_BUNNY7
-	{SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY9},    // S_BUNNY8
-	{SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY10},   // S_BUNNY9
-	{SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY2},    // S_BUNNY10
+	{SPR_BUNY, 0, 4, NULL, 0, 0, S_BUNNY2},       // S_BUNNY1
+	{SPR_BUNY, 0, 64, NULL, 0, 0, S_BUNNY3},      // S_BUNNY2
+	{SPR_BUNY, 1, 2, A_BunnyHop, 6, 3, S_BUNNY4}, // S_BUNNY3
+	{SPR_BUNY, 1, 2, A_Chase, 0, 0, S_BUNNY5},    // S_BUNNY4
+	{SPR_BUNY, 1, 2, A_Chase, 0, 0, S_BUNNY6},    // S_BUNNY5
+	{SPR_BUNY, 1, 2, A_Chase, 0, 0, S_BUNNY7},    // S_BUNNY6
+	{SPR_BUNY, 1, 2, A_Chase, 0, 0, S_BUNNY8},    // S_BUNNY7
+	{SPR_BUNY, 1, 2, A_Chase, 0, 0, S_BUNNY9},    // S_BUNNY8
+	{SPR_BUNY, 1, 2, A_Chase, 0, 0, S_BUNNY10},   // S_BUNNY9
+	{SPR_BUNY, 1, 2, A_Chase, 0, 0, S_BUNNY2},    // S_BUNNY10
 
 	// Freed Mouse
-	{SPR_MOUS, 0, 2, {A_MouseThink}, 0, 0, S_MOUSE2}, // S_MOUSE1
-	{SPR_MOUS, 1, 2, {A_MouseThink}, 0, 0, S_MOUSE1}, // S_MOUSE2
+	{SPR_MOUS, 0, 2, A_MouseThink, 0, 0, S_MOUSE2}, // S_MOUSE1
+	{SPR_MOUS, 1, 2, A_MouseThink, 0, 0, S_MOUSE1}, // S_MOUSE2
 
 	// Freed Chicken
-	{SPR_CHIC, 0, 7, {A_Chase},        3, 0, S_CHICKENHOP},  // S_CHICKEN1
-	{SPR_CHIC, 0, 1, {A_BunnyHop},     4, 2, S_CHICKENFLY1}, // S_CHICKENHOP
-	{SPR_CHIC, 1, 2, {A_ChickenCheck}, 0, 0, S_CHICKENFLY2}, // S_CHICKENFLY1
-	{SPR_CHIC, 2, 2, {NULL},           0, 0, S_CHICKENFLY1}, // S_CHICKENFLY2
+	{SPR_CHIC, 0, 7, A_Chase,        3, 0, S_CHICKENHOP},  // S_CHICKEN1
+	{SPR_CHIC, 0, 1, A_BunnyHop,     4, 2, S_CHICKENFLY1}, // S_CHICKENHOP
+	{SPR_CHIC, 1, 2, A_ChickenCheck, 0, 0, S_CHICKENFLY2}, // S_CHICKENFLY1
+	{SPR_CHIC, 2, 2, NULL,           0, 0, S_CHICKENFLY1}, // S_CHICKENFLY2
 
 	// Freed Cow
-	{SPR_COWZ, 0, 4, {A_Chase}, 3, 0, S_COW2}, // S_COW1
-	{SPR_COWZ, 1, 4, {A_Chase}, 3, 0, S_COW3}, // S_COW2
-	{SPR_COWZ, 2, 4, {A_Chase}, 3, 0, S_COW4}, // S_COW3
-	{SPR_COWZ, 3, 4, {A_Chase}, 3, 0, S_COW1}, // S_COW4
+	{SPR_COWZ, 0, 4, A_Chase, 3, 0, S_COW2}, // S_COW1
+	{SPR_COWZ, 1, 4, A_Chase, 3, 0, S_COW3}, // S_COW2
+	{SPR_COWZ, 2, 4, A_Chase, 3, 0, S_COW4}, // S_COW3
+	{SPR_COWZ, 3, 4, A_Chase, 3, 0, S_COW1}, // S_COW4
 
 	// Freed Birdie
-	{SPR_RBRD, 0, 4, {NULL}, 0, 0, S_RBIRD2},    // S_RBIRD1
-	{SPR_RBRD, 0, 4, {A_Chase}, 0, 0, S_RBIRD3}, // S_RBIRD2
-	{SPR_RBRD, 1, 4, {A_Chase}, 0, 0, S_RBIRD2}, // S_RBIRD3
+	{SPR_RBRD, 0, 4, NULL, 0, 0, S_RBIRD2},    // S_RBIRD1
+	{SPR_RBRD, 0, 4, A_Chase, 0, 0, S_RBIRD3}, // S_RBIRD2
+	{SPR_RBRD, 1, 4, A_Chase, 0, 0, S_RBIRD2}, // S_RBIRD3
 
 	// Yellow Spring
-	{SPR_SPRY, 0, -1, {NULL}, 0, 0, S_NULL},           // S_YELLOWSPRING
-	{SPR_SPRY, 4, 4, {A_Pain}, 0, 0, S_YELLOWSPRING3}, // S_YELLOWSPRING2
-	{SPR_SPRY, 3, 1, {NULL}, 0, 0, S_YELLOWSPRING4},   // S_YELLOWSPRING3
-	{SPR_SPRY, 2, 1, {NULL}, 0, 0, S_YELLOWSPRING5},   // S_YELLOWSPRING4
-	{SPR_SPRY, 1, 1, {NULL}, 0, 0, S_YELLOWSPRING},    // S_YELLOWSPRING5
+	{SPR_SPRY, 0, -1, NULL, 0, 0, S_NULL},           // S_YELLOWSPRING
+	{SPR_SPRY, 4, 4, A_Pain, 0, 0, S_YELLOWSPRING3}, // S_YELLOWSPRING2
+	{SPR_SPRY, 3, 1, NULL, 0, 0, S_YELLOWSPRING4},   // S_YELLOWSPRING3
+	{SPR_SPRY, 2, 1, NULL, 0, 0, S_YELLOWSPRING5},   // S_YELLOWSPRING4
+	{SPR_SPRY, 1, 1, NULL, 0, 0, S_YELLOWSPRING},    // S_YELLOWSPRING5
 
 	// Red Spring
-	{SPR_SPRR, 0, -1, {NULL}, 0, 0, S_NULL},        // S_REDSPRING
-	{SPR_SPRR, 4, 4, {A_Pain}, 0, 0, S_REDSPRING3}, // S_REDSPRING2
-	{SPR_SPRR, 3, 1, {NULL}, 0, 0, S_REDSPRING4},   // S_REDSPRING3
-	{SPR_SPRR, 2, 1, {NULL}, 0, 0, S_REDSPRING5},   // S_REDSPRING4
-	{SPR_SPRR, 1, 1, {NULL}, 0, 0, S_REDSPRING},    // S_REDSPRING5
+	{SPR_SPRR, 0, -1, NULL, 0, 0, S_NULL},        // S_REDSPRING
+	{SPR_SPRR, 4, 4, A_Pain, 0, 0, S_REDSPRING3}, // S_REDSPRING2
+	{SPR_SPRR, 3, 1, NULL, 0, 0, S_REDSPRING4},   // S_REDSPRING3
+	{SPR_SPRR, 2, 1, NULL, 0, 0, S_REDSPRING5},   // S_REDSPRING4
+	{SPR_SPRR, 1, 1, NULL, 0, 0, S_REDSPRING},    // S_REDSPRING5
 
 	// Blue Spring
-	{SPR_SPRB, 0, -1, {NULL}, 0, 0, S_NULL},         // S_BLUESPRING
-	{SPR_SPRB, 4, 4, {A_Pain}, 0, 0, S_BLUESPRING3}, // S_BLUESPRING2
-	{SPR_SPRB, 3, 1, {NULL}, 0, 0, S_BLUESPRING4},   // S_BLUESPRING3
-	{SPR_SPRB, 2, 1, {NULL}, 0, 0, S_BLUESPRING5},   // S_BLUESPRING4
-	{SPR_SPRB, 1, 1, {NULL}, 0, 0, S_BLUESPRING},    // S_BLUESPRING5
+	{SPR_SPRB, 0, -1, NULL, 0, 0, S_NULL},         // S_BLUESPRING
+	{SPR_SPRB, 4, 4, A_Pain, 0, 0, S_BLUESPRING3}, // S_BLUESPRING2
+	{SPR_SPRB, 3, 1, NULL, 0, 0, S_BLUESPRING4},   // S_BLUESPRING3
+	{SPR_SPRB, 2, 1, NULL, 0, 0, S_BLUESPRING5},   // S_BLUESPRING4
+	{SPR_SPRB, 1, 1, NULL, 0, 0, S_BLUESPRING},    // S_BLUESPRING5
 
 	// Yellow Diagonal Spring
-	{SPR_YSPR, 0, -1, {NULL}, 0, 0, S_NULL},    // S_YDIAG1
-	{SPR_YSPR, 1, 1, {A_Pain}, 0, 0, S_YDIAG3}, // S_YDIAG2
-	{SPR_YSPR, 2, 1, {NULL}, 0, 0, S_YDIAG4},   // S_YDIAG3
-	{SPR_YSPR, 3, 1, {NULL}, 0, 0, S_YDIAG5},   // S_YDIAG4
-	{SPR_YSPR, 4, 1, {NULL}, 0, 0, S_YDIAG6},   // S_YDIAG5
-	{SPR_YSPR, 3, 1, {NULL}, 0, 0, S_YDIAG7},   // S_YDIAG6
-	{SPR_YSPR, 2, 1, {NULL}, 0, 0, S_YDIAG8},   // S_YDIAG7
-	{SPR_YSPR, 1, 1, {NULL}, 0, 0, S_YDIAG1},   // S_YDIAG8
+	{SPR_YSPR, 0, -1, NULL, 0, 0, S_NULL},    // S_YDIAG1
+	{SPR_YSPR, 1, 1, A_Pain, 0, 0, S_YDIAG3}, // S_YDIAG2
+	{SPR_YSPR, 2, 1, NULL, 0, 0, S_YDIAG4},   // S_YDIAG3
+	{SPR_YSPR, 3, 1, NULL, 0, 0, S_YDIAG5},   // S_YDIAG4
+	{SPR_YSPR, 4, 1, NULL, 0, 0, S_YDIAG6},   // S_YDIAG5
+	{SPR_YSPR, 3, 1, NULL, 0, 0, S_YDIAG7},   // S_YDIAG6
+	{SPR_YSPR, 2, 1, NULL, 0, 0, S_YDIAG8},   // S_YDIAG7
+	{SPR_YSPR, 1, 1, NULL, 0, 0, S_YDIAG1},   // S_YDIAG8
 
 	// Red Diagonal Spring
-	{SPR_RSPR, 0, -1, {NULL}, 0, 0, S_NULL},    // S_RDIAG1
-	{SPR_RSPR, 1, 1, {A_Pain}, 0, 0, S_RDIAG3}, // S_RDIAG2
-	{SPR_RSPR, 2, 1, {NULL}, 0, 0, S_RDIAG4},   // S_RDIAG3
-	{SPR_RSPR, 3, 1, {NULL}, 0, 0, S_RDIAG5},   // S_RDIAG4
-	{SPR_RSPR, 4, 1, {NULL}, 0, 0, S_RDIAG6},   // S_RDIAG5
-	{SPR_RSPR, 3, 1, {NULL}, 0, 0, S_RDIAG7},   // S_RDIAG6
-	{SPR_RSPR, 2, 1, {NULL}, 0, 0, S_RDIAG8},   // S_RDIAG7
-	{SPR_RSPR, 1, 1, {NULL}, 0, 0, S_RDIAG1},   // S_RDIAG8
+	{SPR_RSPR, 0, -1, NULL, 0, 0, S_NULL},    // S_RDIAG1
+	{SPR_RSPR, 1, 1, A_Pain, 0, 0, S_RDIAG3}, // S_RDIAG2
+	{SPR_RSPR, 2, 1, NULL, 0, 0, S_RDIAG4},   // S_RDIAG3
+	{SPR_RSPR, 3, 1, NULL, 0, 0, S_RDIAG5},   // S_RDIAG4
+	{SPR_RSPR, 4, 1, NULL, 0, 0, S_RDIAG6},   // S_RDIAG5
+	{SPR_RSPR, 3, 1, NULL, 0, 0, S_RDIAG7},   // S_RDIAG6
+	{SPR_RSPR, 2, 1, NULL, 0, 0, S_RDIAG8},   // S_RDIAG7
+	{SPR_RSPR, 1, 1, NULL, 0, 0, S_RDIAG1},   // S_RDIAG8
 
 	// Rain
-	{SPR_RAIN, FF_TRANS50, -1, {NULL}, 0, 0, S_NULL}, // S_RAIN1
-	{SPR_RAIN, FF_TRANS50, 1, {NULL}, 0, 0, S_RAIN1}, // S_RAINRETURN
+	{SPR_RAIN, FF_TRANS50, -1, NULL, 0, 0, S_NULL}, // S_RAIN1
+	{SPR_NULL, 0, -1, NULL, 0, 0, S_NULL}, // S_RAINRETURN
 
 	// Snowflake
-	{SPR_SNO1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SNOW1
-	{SPR_SNO1, 1, -1, {NULL}, 0, 0, S_NULL}, // S_SNOW2
-	{SPR_SNO1, 2, -1, {NULL}, 0, 0, S_NULL}, // S_SNOW3
+	{SPR_SNO1, 0, -1, NULL, 0, 0, S_NULL}, // S_SNOW1
+	{SPR_SNO1, 1, -1, NULL, 0, 0, S_NULL}, // S_SNOW2
+	{SPR_SNO1, 2, -1, NULL, 0, 0, S_NULL}, // S_SNOW3
 
 	// Water Splish
-	{SPR_SPLH, FF_TRANS50  , 2, {NULL}, 0, 0, S_SPLISH2}, // S_SPLISH1
-	{SPR_SPLH, FF_TRANS50|1, 2, {NULL}, 0, 0, S_SPLISH3}, // S_SPLISH2
-	{SPR_SPLH, FF_TRANS50|2, 2, {NULL}, 0, 0, S_SPLISH4}, // S_SPLISH3
-	{SPR_SPLH, FF_TRANS50|3, 2, {NULL}, 0, 0, S_SPLISH5}, // S_SPLISH4
-	{SPR_SPLH, FF_TRANS50|4, 2, {NULL}, 0, 0, S_SPLISH6}, // S_SPLISH5
-	{SPR_SPLH, FF_TRANS50|5, 2, {NULL}, 0, 0, S_SPLISH7}, // S_SPLISH6
-	{SPR_SPLH, FF_TRANS50|6, 2, {NULL}, 0, 0, S_SPLISH8}, // S_SPLISH7
-	{SPR_SPLH, FF_TRANS50|7, 2, {NULL}, 0, 0, S_SPLISH9}, // S_SPLISH8
-	{SPR_SPLH, FF_TRANS50|8, 2, {NULL}, 0, 0, S_NULL},    // S_SPLISH9
+	{SPR_SPLH, FF_TRANS50  , 2, NULL, 0, 0, S_SPLISH2}, // S_SPLISH1
+	{SPR_SPLH, FF_TRANS50|1, 2, NULL, 0, 0, S_SPLISH3}, // S_SPLISH2
+	{SPR_SPLH, FF_TRANS50|2, 2, NULL, 0, 0, S_SPLISH4}, // S_SPLISH3
+	{SPR_SPLH, FF_TRANS50|3, 2, NULL, 0, 0, S_SPLISH5}, // S_SPLISH4
+	{SPR_SPLH, FF_TRANS50|4, 2, NULL, 0, 0, S_SPLISH6}, // S_SPLISH5
+	{SPR_SPLH, FF_TRANS50|5, 2, NULL, 0, 0, S_SPLISH7}, // S_SPLISH6
+	{SPR_SPLH, FF_TRANS50|6, 2, NULL, 0, 0, S_SPLISH8}, // S_SPLISH7
+	{SPR_SPLH, FF_TRANS50|7, 2, NULL, 0, 0, S_SPLISH9}, // S_SPLISH8
+	{SPR_SPLH, FF_TRANS50|8, 2, NULL, 0, 0, S_NULL},    // S_SPLISH9
 
 	// Water Splash
-	{SPR_SPLA, FF_TRANS50  , 3, {NULL}, 0, 0, S_SPLASH2},    // S_SPLASH1
-	{SPR_SPLA, FF_TRANS70|1, 3, {NULL}, 0, 0, S_SPLASH3},    // S_SPLASH2
-	{SPR_SPLA, FF_TRANS90|2, 3, {NULL}, 0, 0, S_RAINRETURN}, // S_SPLASH3
+	{SPR_SPLA, FF_TRANS50  , 3, NULL, 0, 0, S_SPLASH2}, // S_SPLASH1
+	{SPR_SPLA, FF_TRANS70|1, 3, NULL, 0, 0, S_SPLASH3}, // S_SPLASH2
+	{SPR_SPLA, FF_TRANS90|2, 3, NULL, 0, 0, S_NULL}, // S_SPLASH3
 
 	// Smoke
-	{SPR_SMOK, FF_TRANS50  , 4, {NULL}, 0, 0, S_SMOKE2}, // S_SMOKE1
-	{SPR_SMOK, FF_TRANS50|1, 5, {NULL}, 0, 0, S_SMOKE3}, // S_SMOKE2
-	{SPR_SMOK, FF_TRANS50|2, 6, {NULL}, 0, 0, S_SMOKE4}, // S_SMOKE3
-	{SPR_SMOK, FF_TRANS50|3, 7, {NULL}, 0, 0, S_SMOKE5}, // S_SMOKE4
-	{SPR_SMOK, FF_TRANS50|4, 8, {NULL}, 0, 0, S_NULL},   // S_SMOKE5
+	{SPR_SMOK, FF_TRANS50  , 4, NULL, 0, 0, S_SMOKE2}, // S_SMOKE1
+	{SPR_SMOK, FF_TRANS50|1, 5, NULL, 0, 0, S_SMOKE3}, // S_SMOKE2
+	{SPR_SMOK, FF_TRANS50|2, 6, NULL, 0, 0, S_SMOKE4}, // S_SMOKE3
+	{SPR_SMOK, FF_TRANS50|3, 7, NULL, 0, 0, S_SMOKE5}, // S_SMOKE4
+	{SPR_SMOK, FF_TRANS50|4, 8, NULL, 0, 0, S_NULL},   // S_SMOKE5
 
 	// Bubbles
-	{SPR_BUBP, FF_TRANS50, 1, {A_BubbleRise}, 0, 1024, S_SMALLBUBBLE1},  // S_SMALLBUBBLE
-	{SPR_BUBP, FF_TRANS50, 1, {A_BubbleRise}, 0, 1024, S_SMALLBUBBLE},   // S_SMALLBUBBLE1
-	{SPR_BUBO, FF_TRANS50, 1, {A_BubbleRise}, 0, 1024, S_MEDIUMBUBBLE1}, // S_MEDIUMBUBBLE
-	{SPR_BUBO, FF_TRANS50, 1, {A_BubbleRise}, 0, 1024, S_MEDIUMBUBBLE},  // S_MEDIUMBUBBLE1
+	{SPR_BUBP, FF_TRANS50, 1, A_BubbleRise, 0, 1024, S_SMALLBUBBLE1},  // S_SMALLBUBBLE
+	{SPR_BUBP, FF_TRANS50, 1, A_BubbleRise, 0, 1024, S_SMALLBUBBLE},   // S_SMALLBUBBLE1
+	{SPR_BUBO, FF_TRANS50, 1, A_BubbleRise, 0, 1024, S_MEDIUMBUBBLE1}, // S_MEDIUMBUBBLE
+	{SPR_BUBO, FF_TRANS50, 1, A_BubbleRise, 0, 1024, S_MEDIUMBUBBLE},  // S_MEDIUMBUBBLE1
 
 	// Extra Large Bubble (breathable)
-	{SPR_BUBN, FF_TRANS50|FF_FULLBRIGHT, 16, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE}, // S_LARGEBUBBLE
-	{SPR_BUBM, FF_TRANS50|FF_FULLBRIGHT, 16, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE}, // S_EXTRALARGEBUBBLE
+	{SPR_BUBN, FF_TRANS50|FF_FULLBRIGHT, 16, A_BubbleRise, 0, 1024, S_EXTRALARGEBUBBLE}, // S_LARGEBUBBLE
+	{SPR_BUBM, FF_TRANS50|FF_FULLBRIGHT, 16, A_BubbleRise, 0, 1024, S_EXTRALARGEBUBBLE}, // S_EXTRALARGEBUBBLE
 
 	// Extra Large Bubble goes POP!
-	{SPR_POPP, 0, 16, {NULL}, 0, 0, S_NULL}, // S_POP1
+	{SPR_POPP, 0, 16, NULL, 0, 0, S_NULL}, // S_POP1
 
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50,    2, {NULL}, 0, 0, S_FOG2},  // S_FOG1
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|1,  2, {NULL}, 0, 0, S_FOG3},  // S_FOG2
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|2,  2, {NULL}, 0, 0, S_FOG4},  // S_FOG3
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|3,  2, {NULL}, 0, 0, S_FOG5},  // S_FOG4
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|4,  2, {NULL}, 0, 0, S_FOG6},  // S_FOG5
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|5,  2, {NULL}, 0, 0, S_FOG7},  // S_FOG6
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|6,  2, {NULL}, 0, 0, S_FOG8},  // S_FOG7
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|7,  2, {NULL}, 0, 0, S_FOG9},  // S_FOG8
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|8,  2, {NULL}, 0, 0, S_FOG10}, // S_FOG9
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|9,  2, {NULL}, 0, 0, S_FOG11}, // S_FOG10
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|10, 2, {NULL}, 0, 0, S_FOG12}, // S_FOG11
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|11, 2, {NULL}, 0, 0, S_FOG13}, // S_FOG12
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|12, 2, {NULL}, 0, 0, S_FOG14}, // S_FOG13
-	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|13, 2, {NULL}, 0, 0, S_NULL},  // S_FOG14
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50,    2, NULL, 0, 0, S_FOG2},  // S_FOG1
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|1,  2, NULL, 0, 0, S_FOG3},  // S_FOG2
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|2,  2, NULL, 0, 0, S_FOG4},  // S_FOG3
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|3,  2, NULL, 0, 0, S_FOG5},  // S_FOG4
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|4,  2, NULL, 0, 0, S_FOG6},  // S_FOG5
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|5,  2, NULL, 0, 0, S_FOG7},  // S_FOG6
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|6,  2, NULL, 0, 0, S_FOG8},  // S_FOG7
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|7,  2, NULL, 0, 0, S_FOG9},  // S_FOG8
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|8,  2, NULL, 0, 0, S_FOG10}, // S_FOG9
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|9,  2, NULL, 0, 0, S_FOG11}, // S_FOG10
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|10, 2, NULL, 0, 0, S_FOG12}, // S_FOG11
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|11, 2, NULL, 0, 0, S_FOG13}, // S_FOG12
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|12, 2, NULL, 0, 0, S_FOG14}, // S_FOG13
+	{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|13, 2, NULL, 0, 0, S_NULL},  // S_FOG14
 
 	// Flower Seed
-	{SPR_SEED, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_SEED
+	{SPR_SEED, FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_SEED
 
 	// Particle sprite
-	{SPR_PRTL, FF_FULLBRIGHT|FF_TRANS70, 2*TICRATE, {NULL}, 0, 0, S_NULL}, // S_PARTICLE
-	{SPR_NULL,     0,         1, {A_ParticleSpawn}, 0, 0, S_PARTICLEGEN}, // S_PARTICLEGEN
+	{SPR_PRTL, FF_FULLBRIGHT|FF_TRANS70, 2*TICRATE, NULL, 0, 0, S_NULL}, // S_PARTICLE
+	{SPR_NULL,     0,         1, A_ParticleSpawn, 0, 0, S_PARTICLEGEN}, // S_PARTICLEGEN
 
-	{SPR_SCOR, 0, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRA  - 100
-	{SPR_SCOR, 1, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRB  - 200
-	{SPR_SCOR, 2, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRC  - 500
-	{SPR_SCOR, 3, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRD  - 1000
-	{SPR_SCOR, 4, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRE  - 10000
-	{SPR_SCOR, 5, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRF  - 400 (mario mode)
-	{SPR_SCOR, 6, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRG  - 800 (mario mode)
-	{SPR_SCOR, 7, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRH  - 2000 (mario mode)
-	{SPR_SCOR, 8, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRI  - 4000 (mario mode)
-	{SPR_SCOR, 9, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRJ  - 8000 (mario mode)
-	{SPR_SCOR, 10, 32, {A_ScoreRise}, 0, 0, S_NULL}, // S_SCRK - 1UP (mario mode)
+	{SPR_SCOR, 0, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRA  - 100
+	{SPR_SCOR, 1, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRB  - 200
+	{SPR_SCOR, 2, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRC  - 500
+	{SPR_SCOR, 3, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRD  - 1000
+	{SPR_SCOR, 4, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRE  - 10000
+	{SPR_SCOR, 5, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRF  - 400 (mario mode)
+	{SPR_SCOR, 6, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRG  - 800 (mario mode)
+	{SPR_SCOR, 7, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRH  - 2000 (mario mode)
+	{SPR_SCOR, 8, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRI  - 4000 (mario mode)
+	{SPR_SCOR, 9, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRJ  - 8000 (mario mode)
+	{SPR_SCOR, 10, 32, A_ScoreRise, 0, 0, S_NULL}, // S_SCRK - 1UP (mario mode)
 
 	// Drowning Timer Numbers
-	{SPR_DRWN, 0, 40, {NULL}, 0, 0, S_NULL}, // S_ZERO1
-	{SPR_DRWN, 1, 40, {NULL}, 0, 0, S_NULL}, // S_ONE1
-	{SPR_DRWN, 2, 40, {NULL}, 0, 0, S_NULL}, // S_TWO1
-	{SPR_DRWN, 3, 40, {NULL}, 0, 0, S_NULL}, // S_THREE1
-	{SPR_DRWN, 4, 40, {NULL}, 0, 0, S_NULL}, // S_FOUR1
-	{SPR_DRWN, 5, 40, {NULL}, 0, 0, S_NULL}, // S_FIVE1
+	{SPR_DRWN, 0, 40, NULL, 0, 0, S_NULL}, // S_ZERO1
+	{SPR_DRWN, 1, 40, NULL, 0, 0, S_NULL}, // S_ONE1
+	{SPR_DRWN, 2, 40, NULL, 0, 0, S_NULL}, // S_TWO1
+	{SPR_DRWN, 3, 40, NULL, 0, 0, S_NULL}, // S_THREE1
+	{SPR_DRWN, 4, 40, NULL, 0, 0, S_NULL}, // S_FOUR1
+	{SPR_DRWN, 5, 40, NULL, 0, 0, S_NULL}, // S_FIVE1
 
-	{SPR_TTAG, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_TTAG1
+	{SPR_TTAG, FF_FULLBRIGHT, 2, NULL, 0, 0, S_NULL}, // S_TTAG1
 
 	// CTF Sign
-	{SPR_GFLG, 0, 1, {NULL}, 0, 0, S_GOTFLAG2}, // S_GOTFLAG1
-	{SPR_GFLG, 1, 1, {NULL}, 0, 0, S_NULL},     // S_GOTFLAG2
-	{SPR_GFLG, 0, 1, {NULL}, 0, 0, S_GOTFLAG4}, // S_GOTFLAG3
-	{SPR_GFLG, 2, 1, {NULL}, 0, 0, S_NULL},     // S_GOTFLAG4
+	{SPR_GFLG, 0, 1, NULL, 0, 0, S_GOTFLAG2}, // S_GOTFLAG1
+	{SPR_GFLG, 1, 1, NULL, 0, 0, S_NULL},     // S_GOTFLAG2
+	{SPR_GFLG, 0, 1, NULL, 0, 0, S_GOTFLAG4}, // S_GOTFLAG3
+	{SPR_GFLG, 2, 1, NULL, 0, 0, S_NULL},     // S_GOTFLAG4
 
 	// Red Rings (thrown)
-	{SPR_RRNG, FF_FULLBRIGHT,   1, {A_ThrownRing}, 0, 0, S_RRNG2}, // S_RRNG1
-	{SPR_RRNG, FF_FULLBRIGHT|1, 1, {A_ThrownRing}, 0, 0, S_RRNG3}, // S_RRNG2
-	{SPR_RRNG, FF_FULLBRIGHT|2, 1, {A_ThrownRing}, 0, 0, S_RRNG4}, // S_RRNG3
-	{SPR_RRNG, FF_FULLBRIGHT|3, 1, {A_ThrownRing}, 0, 0, S_RRNG5}, // S_RRNG4
-	{SPR_RRNG, FF_FULLBRIGHT|4, 1, {A_ThrownRing}, 0, 0, S_RRNG6}, // S_RRNG5
-	{SPR_RRNG, FF_FULLBRIGHT|5, 1, {A_ThrownRing}, 0, 0, S_RRNG7}, // S_RRNG6
-	{SPR_RRNG, FF_FULLBRIGHT|6, 1, {A_ThrownRing}, 0, 0, S_RRNG1}, // S_RRNG7
+	{SPR_RRNG, FF_FULLBRIGHT,   1, A_ThrownRing, 0, 0, S_RRNG2}, // S_RRNG1
+	{SPR_RRNG, FF_FULLBRIGHT|1, 1, A_ThrownRing, 0, 0, S_RRNG3}, // S_RRNG2
+	{SPR_RRNG, FF_FULLBRIGHT|2, 1, A_ThrownRing, 0, 0, S_RRNG4}, // S_RRNG3
+	{SPR_RRNG, FF_FULLBRIGHT|3, 1, A_ThrownRing, 0, 0, S_RRNG5}, // S_RRNG4
+	{SPR_RRNG, FF_FULLBRIGHT|4, 1, A_ThrownRing, 0, 0, S_RRNG6}, // S_RRNG5
+	{SPR_RRNG, FF_FULLBRIGHT|5, 1, A_ThrownRing, 0, 0, S_RRNG7}, // S_RRNG6
+	{SPR_RRNG, FF_FULLBRIGHT|6, 1, A_ThrownRing, 0, 0, S_RRNG1}, // S_RRNG7
 
 	// Weapon Ring Ammo
-	{SPR_RNGB, FF_ANIMATE, -1, {NULL}, 34, 1, S_BOUNCERINGAMMO},    // S_BOUNCERINGAMMO
-	{SPR_RNGR, FF_ANIMATE, -1, {NULL}, 34, 1, S_RAILRINGAMMO},      // S_RAILRINGAMMO
-	{SPR_RNGI, FF_ANIMATE, -1, {NULL}, 34, 1, S_INFINITYRINGAMMO},  // S_INFINITYRINGAMMO
-	{SPR_RNGA, FF_ANIMATE, -1, {NULL}, 34, 1, S_AUTOMATICRINGAMMO}, // S_AUTOMATICRINGAMMO
-	{SPR_RNGE, FF_ANIMATE, -1, {NULL}, 34, 1, S_EXPLOSIONRINGAMMO}, // S_EXPLOSIONRINGAMMO
-	{SPR_RNGS, FF_ANIMATE, -1, {NULL}, 34, 1, S_SCATTERRINGAMMO},   // S_SCATTERRINGAMMO
-	{SPR_RNGG, FF_ANIMATE, -1, {NULL}, 34, 1, S_GRENADERINGAMMO},   // S_GRENADERINGAMMO
+	{SPR_RNGB, FF_ANIMATE, -1, NULL, 34, 1, S_BOUNCERINGAMMO},    // S_BOUNCERINGAMMO
+	{SPR_RNGR, FF_ANIMATE, -1, NULL, 34, 1, S_RAILRINGAMMO},      // S_RAILRINGAMMO
+	{SPR_RNGI, FF_ANIMATE, -1, NULL, 34, 1, S_INFINITYRINGAMMO},  // S_INFINITYRINGAMMO
+	{SPR_RNGA, FF_ANIMATE, -1, NULL, 34, 1, S_AUTOMATICRINGAMMO}, // S_AUTOMATICRINGAMMO
+	{SPR_RNGE, FF_ANIMATE, -1, NULL, 34, 1, S_EXPLOSIONRINGAMMO}, // S_EXPLOSIONRINGAMMO
+	{SPR_RNGS, FF_ANIMATE, -1, NULL, 34, 1, S_SCATTERRINGAMMO},   // S_SCATTERRINGAMMO
+	{SPR_RNGG, FF_ANIMATE, -1, NULL, 34, 1, S_GRENADERINGAMMO},   // S_GRENADERINGAMMO
 
 	// Bounce Ring Pickup
-	{SPR_PIKB, FF_ANIMATE, -1, {NULL}, 15, 1, S_BOUNCEPICKUP},  // S_BOUNCEPICKUP
+	{SPR_PIKB, FF_ANIMATE, -1, NULL, 15, 1, S_BOUNCEPICKUP},  // S_BOUNCEPICKUP
 
-	{SPR_PIKB,  0, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE2}, // S_BOUNCEPICKUPFADE1
-	{SPR_PIKB,  2, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE3}, // S_BOUNCEPICKUPFADE2
-	{SPR_PIKB,  4, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE4}, // S_BOUNCEPICKUPFADE3
-	{SPR_PIKB,  6, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE5}, // S_BOUNCEPICKUPFADE4
-	{SPR_PIKB,  8, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE6}, // S_BOUNCEPICKUPFADE5
-	{SPR_PIKB, 10, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE7}, // S_BOUNCEPICKUPFADE6
-	{SPR_PIKB, 12, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE8}, // S_BOUNCEPICKUPFADE7
-	{SPR_PIKB, 14, 1, {NULL}, 0, 0, S_BOUNCEPICKUPFADE1}, // S_BOUNCEPICKUPFADE8
+	{SPR_PIKB,  0, 1, NULL, 0, 0, S_BOUNCEPICKUPFADE2}, // S_BOUNCEPICKUPFADE1
+	{SPR_PIKB,  2, 1, NULL, 0, 0, S_BOUNCEPICKUPFADE3}, // S_BOUNCEPICKUPFADE2
+	{SPR_PIKB,  4, 1, NULL, 0, 0, S_BOUNCEPICKUPFADE4}, // S_BOUNCEPICKUPFADE3
+	{SPR_PIKB,  6, 1, NULL, 0, 0, S_BOUNCEPICKUPFADE5}, // S_BOUNCEPICKUPFADE4
+	{SPR_PIKB,  8, 1, NULL, 0, 0, S_BOUNCEPICKUPFADE6}, // S_BOUNCEPICKUPFADE5
+	{SPR_PIKB, 10, 1, NULL, 0, 0, S_BOUNCEPICKUPFADE7}, // S_BOUNCEPICKUPFADE6
+	{SPR_PIKB, 12, 1, NULL, 0, 0, S_BOUNCEPICKUPFADE8}, // S_BOUNCEPICKUPFADE7
+	{SPR_PIKB, 14, 1, NULL, 0, 0, S_BOUNCEPICKUPFADE1}, // S_BOUNCEPICKUPFADE8
 
 	// Rail Ring Pickup
-	{SPR_PIKR, FF_ANIMATE, -1, {NULL}, 15, 1, S_RAILPICKUP},  // S_RAILPICKUP
+	{SPR_PIKR, FF_ANIMATE, -1, NULL, 15, 1, S_RAILPICKUP},  // S_RAILPICKUP
 
-	{SPR_PIKR,  0, 1, {NULL}, 0, 0, S_RAILPICKUPFADE2}, // S_RAILPICKUPFADE1
-	{SPR_PIKR,  2, 1, {NULL}, 0, 0, S_RAILPICKUPFADE3}, // S_RAILPICKUPFADE2
-	{SPR_PIKR,  4, 1, {NULL}, 0, 0, S_RAILPICKUPFADE4}, // S_RAILPICKUPFADE3
-	{SPR_PIKR,  6, 1, {NULL}, 0, 0, S_RAILPICKUPFADE5}, // S_RAILPICKUPFADE4
-	{SPR_PIKR,  8, 1, {NULL}, 0, 0, S_RAILPICKUPFADE6}, // S_RAILPICKUPFADE5
-	{SPR_PIKR, 10, 1, {NULL}, 0, 0, S_RAILPICKUPFADE7}, // S_RAILPICKUPFADE6
-	{SPR_PIKR, 12, 1, {NULL}, 0, 0, S_RAILPICKUPFADE8}, // S_RAILPICKUPFADE7
-	{SPR_PIKR, 14, 1, {NULL}, 0, 0, S_RAILPICKUPFADE1}, // S_RAILPICKUPFADE8
+	{SPR_PIKR,  0, 1, NULL, 0, 0, S_RAILPICKUPFADE2}, // S_RAILPICKUPFADE1
+	{SPR_PIKR,  2, 1, NULL, 0, 0, S_RAILPICKUPFADE3}, // S_RAILPICKUPFADE2
+	{SPR_PIKR,  4, 1, NULL, 0, 0, S_RAILPICKUPFADE4}, // S_RAILPICKUPFADE3
+	{SPR_PIKR,  6, 1, NULL, 0, 0, S_RAILPICKUPFADE5}, // S_RAILPICKUPFADE4
+	{SPR_PIKR,  8, 1, NULL, 0, 0, S_RAILPICKUPFADE6}, // S_RAILPICKUPFADE5
+	{SPR_PIKR, 10, 1, NULL, 0, 0, S_RAILPICKUPFADE7}, // S_RAILPICKUPFADE6
+	{SPR_PIKR, 12, 1, NULL, 0, 0, S_RAILPICKUPFADE8}, // S_RAILPICKUPFADE7
+	{SPR_PIKR, 14, 1, NULL, 0, 0, S_RAILPICKUPFADE1}, // S_RAILPICKUPFADE8
 
 	// Auto Ring Pickup
-	{SPR_PIKA, FF_ANIMATE, -1, {NULL}, 15, 1, S_AUTOPICKUP},  // S_AUTOPICKUP
+	{SPR_PIKA, FF_ANIMATE, -1, NULL, 15, 1, S_AUTOPICKUP},  // S_AUTOPICKUP
 
-	{SPR_PIKA,  0, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE2}, // S_AUTOPICKUPFADE1
-	{SPR_PIKA,  2, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE3}, // S_AUTOPICKUPFADE2
-	{SPR_PIKA,  4, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE4}, // S_AUTOPICKUPFADE3
-	{SPR_PIKA,  6, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE5}, // S_AUTOPICKUPFADE4
-	{SPR_PIKA,  8, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE6}, // S_AUTOPICKUPFADE5
-	{SPR_PIKA, 10, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE7}, // S_AUTOPICKUPFADE6
-	{SPR_PIKA, 12, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE8}, // S_AUTOPICKUPFADE7
-	{SPR_PIKA, 14, 1, {NULL}, 0, 0, S_AUTOPICKUPFADE1}, // S_AUTOPICKUPFADE8
+	{SPR_PIKA,  0, 1, NULL, 0, 0, S_AUTOPICKUPFADE2}, // S_AUTOPICKUPFADE1
+	{SPR_PIKA,  2, 1, NULL, 0, 0, S_AUTOPICKUPFADE3}, // S_AUTOPICKUPFADE2
+	{SPR_PIKA,  4, 1, NULL, 0, 0, S_AUTOPICKUPFADE4}, // S_AUTOPICKUPFADE3
+	{SPR_PIKA,  6, 1, NULL, 0, 0, S_AUTOPICKUPFADE5}, // S_AUTOPICKUPFADE4
+	{SPR_PIKA,  8, 1, NULL, 0, 0, S_AUTOPICKUPFADE6}, // S_AUTOPICKUPFADE5
+	{SPR_PIKA, 10, 1, NULL, 0, 0, S_AUTOPICKUPFADE7}, // S_AUTOPICKUPFADE6
+	{SPR_PIKA, 12, 1, NULL, 0, 0, S_AUTOPICKUPFADE8}, // S_AUTOPICKUPFADE7
+	{SPR_PIKA, 14, 1, NULL, 0, 0, S_AUTOPICKUPFADE1}, // S_AUTOPICKUPFADE8
 
 	// Explode Ring Pickup
-	{SPR_PIKE, FF_ANIMATE, -1, {NULL}, 15, 1, S_EXPLODEPICKUP},  // S_EXPLODEPICKUP
+	{SPR_PIKE, FF_ANIMATE, -1, NULL, 15, 1, S_EXPLODEPICKUP},  // S_EXPLODEPICKUP
 
-	{SPR_PIKE,  0, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE2}, // S_EXPLODEPICKUPFADE1
-	{SPR_PIKE,  2, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE3}, // S_EXPLODEPICKUPFADE2
-	{SPR_PIKE,  4, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE4}, // S_EXPLODEPICKUPFADE3
-	{SPR_PIKE,  6, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE5}, // S_EXPLODEPICKUPFADE4
-	{SPR_PIKE,  8, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE6}, // S_EXPLODEPICKUPFADE5
-	{SPR_PIKE, 10, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE7}, // S_EXPLODEPICKUPFADE6
-	{SPR_PIKE, 12, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE8}, // S_EXPLODEPICKUPFADE7
-	{SPR_PIKE, 14, 1, {NULL}, 0, 0, S_EXPLODEPICKUPFADE1}, // S_EXPLODEPICKUPFADE8
+	{SPR_PIKE,  0, 1, NULL, 0, 0, S_EXPLODEPICKUPFADE2}, // S_EXPLODEPICKUPFADE1
+	{SPR_PIKE,  2, 1, NULL, 0, 0, S_EXPLODEPICKUPFADE3}, // S_EXPLODEPICKUPFADE2
+	{SPR_PIKE,  4, 1, NULL, 0, 0, S_EXPLODEPICKUPFADE4}, // S_EXPLODEPICKUPFADE3
+	{SPR_PIKE,  6, 1, NULL, 0, 0, S_EXPLODEPICKUPFADE5}, // S_EXPLODEPICKUPFADE4
+	{SPR_PIKE,  8, 1, NULL, 0, 0, S_EXPLODEPICKUPFADE6}, // S_EXPLODEPICKUPFADE5
+	{SPR_PIKE, 10, 1, NULL, 0, 0, S_EXPLODEPICKUPFADE7}, // S_EXPLODEPICKUPFADE6
+	{SPR_PIKE, 12, 1, NULL, 0, 0, S_EXPLODEPICKUPFADE8}, // S_EXPLODEPICKUPFADE7
+	{SPR_PIKE, 14, 1, NULL, 0, 0, S_EXPLODEPICKUPFADE1}, // S_EXPLODEPICKUPFADE8
 
 	// Scatter Ring Pickup
-	{SPR_PIKS,  FF_ANIMATE, -1, {NULL}, 15, 1, S_SCATTERPICKUP},  // S_SCATTERPICKUP
+	{SPR_PIKS,  FF_ANIMATE, -1, NULL, 15, 1, S_SCATTERPICKUP},  // S_SCATTERPICKUP
 
-	{SPR_PIKS,  0, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE2}, // S_SCATTERPICKUPFADE1
-	{SPR_PIKS,  2, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE3}, // S_SCATTERPICKUPFADE2
-	{SPR_PIKS,  4, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE4}, // S_SCATTERPICKUPFADE3
-	{SPR_PIKS,  6, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE5}, // S_SCATTERPICKUPFADE4
-	{SPR_PIKS,  8, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE6}, // S_SCATTERPICKUPFADE5
-	{SPR_PIKS, 10, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE7}, // S_SCATTERPICKUPFADE6
-	{SPR_PIKS, 12, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE8}, // S_SCATTERPICKUPFADE7
-	{SPR_PIKS, 14, 1, {NULL}, 0, 0, S_SCATTERPICKUPFADE1}, // S_SCATTERPICKUPFADE8
+	{SPR_PIKS,  0, 1, NULL, 0, 0, S_SCATTERPICKUPFADE2}, // S_SCATTERPICKUPFADE1
+	{SPR_PIKS,  2, 1, NULL, 0, 0, S_SCATTERPICKUPFADE3}, // S_SCATTERPICKUPFADE2
+	{SPR_PIKS,  4, 1, NULL, 0, 0, S_SCATTERPICKUPFADE4}, // S_SCATTERPICKUPFADE3
+	{SPR_PIKS,  6, 1, NULL, 0, 0, S_SCATTERPICKUPFADE5}, // S_SCATTERPICKUPFADE4
+	{SPR_PIKS,  8, 1, NULL, 0, 0, S_SCATTERPICKUPFADE6}, // S_SCATTERPICKUPFADE5
+	{SPR_PIKS, 10, 1, NULL, 0, 0, S_SCATTERPICKUPFADE7}, // S_SCATTERPICKUPFADE6
+	{SPR_PIKS, 12, 1, NULL, 0, 0, S_SCATTERPICKUPFADE8}, // S_SCATTERPICKUPFADE7
+	{SPR_PIKS, 14, 1, NULL, 0, 0, S_SCATTERPICKUPFADE1}, // S_SCATTERPICKUPFADE8
 
 	// Grenade Ring Pickup
-	{SPR_PIKG,  FF_ANIMATE, -1, {NULL}, 15, 1, S_GRENADEPICKUP},  // S_GRENADEPICKUP
+	{SPR_PIKG,  FF_ANIMATE, -1, NULL, 15, 1, S_GRENADEPICKUP},  // S_GRENADEPICKUP
 
-	{SPR_PIKG,  0, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE2}, // S_GRENADEPICKUPFADE1
-	{SPR_PIKG,  2, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE3}, // S_GRENADEPICKUPFADE2
-	{SPR_PIKG,  4, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE4}, // S_GRENADEPICKUPFADE3
-	{SPR_PIKG,  6, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE5}, // S_GRENADEPICKUPFADE4
-	{SPR_PIKG,  8, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE6}, // S_GRENADEPICKUPFADE5
-	{SPR_PIKG, 10, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE7}, // S_GRENADEPICKUPFADE6
-	{SPR_PIKG, 12, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE8}, // S_GRENADEPICKUPFADE7
-	{SPR_PIKG, 14, 1, {NULL}, 0, 0, S_GRENADEPICKUPFADE1}, // S_GRENADEPICKUPFADE8
+	{SPR_PIKG,  0, 1, NULL, 0, 0, S_GRENADEPICKUPFADE2}, // S_GRENADEPICKUPFADE1
+	{SPR_PIKG,  2, 1, NULL, 0, 0, S_GRENADEPICKUPFADE3}, // S_GRENADEPICKUPFADE2
+	{SPR_PIKG,  4, 1, NULL, 0, 0, S_GRENADEPICKUPFADE4}, // S_GRENADEPICKUPFADE3
+	{SPR_PIKG,  6, 1, NULL, 0, 0, S_GRENADEPICKUPFADE5}, // S_GRENADEPICKUPFADE4
+	{SPR_PIKG,  8, 1, NULL, 0, 0, S_GRENADEPICKUPFADE6}, // S_GRENADEPICKUPFADE5
+	{SPR_PIKG, 10, 1, NULL, 0, 0, S_GRENADEPICKUPFADE7}, // S_GRENADEPICKUPFADE6
+	{SPR_PIKG, 12, 1, NULL, 0, 0, S_GRENADEPICKUPFADE8}, // S_GRENADEPICKUPFADE7
+	{SPR_PIKG, 14, 1, NULL, 0, 0, S_GRENADEPICKUPFADE1}, // S_GRENADEPICKUPFADE8
 
 	// Thrown Weapon Rings
-	{SPR_RNGB, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE2}, // S_THROWNBOUNCE1
-	{SPR_RNGB, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE3}, // S_THROWNBOUNCE2
-	{SPR_RNGB, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE4}, // S_THROWNBOUNCE3
-	{SPR_RNGB, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE5}, // S_THROWNBOUNCE4
-	{SPR_RNGB, FF_FULLBRIGHT|20, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE6}, // S_THROWNBOUNCE5
-	{SPR_RNGB, FF_FULLBRIGHT|25, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE7}, // S_THROWNBOUNCE6
-	{SPR_RNGB, FF_FULLBRIGHT|30, 1, {A_ThrownRing}, 0, 0, S_THROWNBOUNCE1}, // S_THROWNBOUNCE7
+	{SPR_RNGB, FF_FULLBRIGHT   , 1, A_ThrownRing, 0, 0, S_THROWNBOUNCE2}, // S_THROWNBOUNCE1
+	{SPR_RNGB, FF_FULLBRIGHT| 5, 1, A_ThrownRing, 0, 0, S_THROWNBOUNCE3}, // S_THROWNBOUNCE2
+	{SPR_RNGB, FF_FULLBRIGHT|10, 1, A_ThrownRing, 0, 0, S_THROWNBOUNCE4}, // S_THROWNBOUNCE3
+	{SPR_RNGB, FF_FULLBRIGHT|15, 1, A_ThrownRing, 0, 0, S_THROWNBOUNCE5}, // S_THROWNBOUNCE4
+	{SPR_RNGB, FF_FULLBRIGHT|20, 1, A_ThrownRing, 0, 0, S_THROWNBOUNCE6}, // S_THROWNBOUNCE5
+	{SPR_RNGB, FF_FULLBRIGHT|25, 1, A_ThrownRing, 0, 0, S_THROWNBOUNCE7}, // S_THROWNBOUNCE6
+	{SPR_RNGB, FF_FULLBRIGHT|30, 1, A_ThrownRing, 0, 0, S_THROWNBOUNCE1}, // S_THROWNBOUNCE7
 
-	{SPR_RNGI, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY2}, // S_THROWNINFINITY1
-	{SPR_RNGI, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY3}, // S_THROWNINFINITY2
-	{SPR_RNGI, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY4}, // S_THROWNINFINITY3
-	{SPR_RNGI, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY5}, // S_THROWNINFINITY4
-	{SPR_RNGI, FF_FULLBRIGHT|20, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY6}, // S_THROWNINFINITY5
-	{SPR_RNGI, FF_FULLBRIGHT|25, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY7}, // S_THROWNINFINITY6
-	{SPR_RNGI, FF_FULLBRIGHT|30, 1, {A_ThrownRing}, 0, 0, S_THROWNINFINITY1}, // S_THROWNINFINITY7
+	{SPR_RNGI, FF_FULLBRIGHT   , 1, A_ThrownRing, 0, 0, S_THROWNINFINITY2}, // S_THROWNINFINITY1
+	{SPR_RNGI, FF_FULLBRIGHT| 5, 1, A_ThrownRing, 0, 0, S_THROWNINFINITY3}, // S_THROWNINFINITY2
+	{SPR_RNGI, FF_FULLBRIGHT|10, 1, A_ThrownRing, 0, 0, S_THROWNINFINITY4}, // S_THROWNINFINITY3
+	{SPR_RNGI, FF_FULLBRIGHT|15, 1, A_ThrownRing, 0, 0, S_THROWNINFINITY5}, // S_THROWNINFINITY4
+	{SPR_RNGI, FF_FULLBRIGHT|20, 1, A_ThrownRing, 0, 0, S_THROWNINFINITY6}, // S_THROWNINFINITY5
+	{SPR_RNGI, FF_FULLBRIGHT|25, 1, A_ThrownRing, 0, 0, S_THROWNINFINITY7}, // S_THROWNINFINITY6
+	{SPR_RNGI, FF_FULLBRIGHT|30, 1, A_ThrownRing, 0, 0, S_THROWNINFINITY1}, // S_THROWNINFINITY7
 
-	{SPR_TAUT, FF_FULLBRIGHT  , 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC2}, // S_THROWNAUTOMATIC1
-	{SPR_TAUT, FF_FULLBRIGHT|1, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC3}, // S_THROWNAUTOMATIC2
-	{SPR_TAUT, FF_FULLBRIGHT|2, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC4}, // S_THROWNAUTOMATIC3
-	{SPR_TAUT, FF_FULLBRIGHT|3, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC5}, // S_THROWNAUTOMATIC4
-	{SPR_TAUT, FF_FULLBRIGHT|4, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC6}, // S_THROWNAUTOMATIC5
-	{SPR_TAUT, FF_FULLBRIGHT|5, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC7}, // S_THROWNAUTOMATIC6
-	{SPR_TAUT, FF_FULLBRIGHT|6, 1, {A_ThrownRing}, 0, 0, S_THROWNAUTOMATIC1}, // S_THROWNAUTOMATIC7
+	{SPR_TAUT, FF_FULLBRIGHT  , 1, A_ThrownRing, 0, 0, S_THROWNAUTOMATIC2}, // S_THROWNAUTOMATIC1
+	{SPR_TAUT, FF_FULLBRIGHT|1, 1, A_ThrownRing, 0, 0, S_THROWNAUTOMATIC3}, // S_THROWNAUTOMATIC2
+	{SPR_TAUT, FF_FULLBRIGHT|2, 1, A_ThrownRing, 0, 0, S_THROWNAUTOMATIC4}, // S_THROWNAUTOMATIC3
+	{SPR_TAUT, FF_FULLBRIGHT|3, 1, A_ThrownRing, 0, 0, S_THROWNAUTOMATIC5}, // S_THROWNAUTOMATIC4
+	{SPR_TAUT, FF_FULLBRIGHT|4, 1, A_ThrownRing, 0, 0, S_THROWNAUTOMATIC6}, // S_THROWNAUTOMATIC5
+	{SPR_TAUT, FF_FULLBRIGHT|5, 1, A_ThrownRing, 0, 0, S_THROWNAUTOMATIC7}, // S_THROWNAUTOMATIC6
+	{SPR_TAUT, FF_FULLBRIGHT|6, 1, A_ThrownRing, 0, 0, S_THROWNAUTOMATIC1}, // S_THROWNAUTOMATIC7
 
-	{SPR_RNGE, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION2}, // S_THROWNEXPLOSION1
-	{SPR_RNGE, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION3}, // S_THROWNEXPLOSION2
-	{SPR_RNGE, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION4}, // S_THROWNEXPLOSION3
-	{SPR_RNGE, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION5}, // S_THROWNEXPLOSION4
-	{SPR_RNGE, FF_FULLBRIGHT|20, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION6}, // S_THROWNEXPLOSION5
-	{SPR_RNGE, FF_FULLBRIGHT|25, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION7}, // S_THROWNEXPLOSION6
-	{SPR_RNGE, FF_FULLBRIGHT|30, 1, {A_ThrownRing}, 0, 0, S_THROWNEXPLOSION1}, // S_THROWNEXPLOSION7
+	{SPR_RNGE, FF_FULLBRIGHT   , 1, A_ThrownRing, 0, 0, S_THROWNEXPLOSION2}, // S_THROWNEXPLOSION1
+	{SPR_RNGE, FF_FULLBRIGHT| 5, 1, A_ThrownRing, 0, 0, S_THROWNEXPLOSION3}, // S_THROWNEXPLOSION2
+	{SPR_RNGE, FF_FULLBRIGHT|10, 1, A_ThrownRing, 0, 0, S_THROWNEXPLOSION4}, // S_THROWNEXPLOSION3
+	{SPR_RNGE, FF_FULLBRIGHT|15, 1, A_ThrownRing, 0, 0, S_THROWNEXPLOSION5}, // S_THROWNEXPLOSION4
+	{SPR_RNGE, FF_FULLBRIGHT|20, 1, A_ThrownRing, 0, 0, S_THROWNEXPLOSION6}, // S_THROWNEXPLOSION5
+	{SPR_RNGE, FF_FULLBRIGHT|25, 1, A_ThrownRing, 0, 0, S_THROWNEXPLOSION7}, // S_THROWNEXPLOSION6
+	{SPR_RNGE, FF_FULLBRIGHT|30, 1, A_ThrownRing, 0, 0, S_THROWNEXPLOSION1}, // S_THROWNEXPLOSION7
 
-	{SPR_TGRE, FF_FULLBRIGHT   , 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE2},  // S_THROWNGRENADE1
-	{SPR_TGRE, FF_FULLBRIGHT| 1, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE3},  // S_THROWNGRENADE2
-	{SPR_TGRE, FF_FULLBRIGHT| 2, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE4},  // S_THROWNGRENADE3
-	{SPR_TGRE, FF_FULLBRIGHT| 3, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE5},  // S_THROWNGRENADE4
-	{SPR_TGRE, FF_FULLBRIGHT| 4, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE6},  // S_THROWNGRENADE5
-	{SPR_TGRE, FF_FULLBRIGHT| 5, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE7},  // S_THROWNGRENADE6
-	{SPR_TGRE, FF_FULLBRIGHT| 6, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE8},  // S_THROWNGRENADE7
-	{SPR_TGRE, FF_FULLBRIGHT| 7, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE9},  // S_THROWNGRENADE8
-	{SPR_TGRE, FF_FULLBRIGHT| 8, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE10}, // S_THROWNGRENADE9
-	{SPR_TGRE, FF_FULLBRIGHT| 9, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE11}, // S_THROWNGRENADE10
-	{SPR_TGRE, FF_FULLBRIGHT|10, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE12}, // S_THROWNGRENADE11
-	{SPR_TGRE, FF_FULLBRIGHT|11, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE13}, // S_THROWNGRENADE12
-	{SPR_TGRE, FF_FULLBRIGHT|12, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE14}, // S_THROWNGRENADE13
-	{SPR_TGRE, FF_FULLBRIGHT|13, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE15}, // S_THROWNGRENADE14
-	{SPR_TGRE, FF_FULLBRIGHT|14, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE16}, // S_THROWNGRENADE15
-	{SPR_TGRE, FF_FULLBRIGHT|15, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE17}, // S_THROWNGRENADE16
-	{SPR_TGRE, FF_FULLBRIGHT|16, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE18}, // S_THROWNGRENADE17
-	{SPR_TGRE, FF_FULLBRIGHT|17, 1, {A_ThrownRing}, 0, 0, S_THROWNGRENADE1},  // S_THROWNGRENADE18
+	{SPR_TGRE, FF_FULLBRIGHT   , 1, A_ThrownRing, 0, 0, S_THROWNGRENADE2},  // S_THROWNGRENADE1
+	{SPR_TGRE, FF_FULLBRIGHT| 1, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE3},  // S_THROWNGRENADE2
+	{SPR_TGRE, FF_FULLBRIGHT| 2, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE4},  // S_THROWNGRENADE3
+	{SPR_TGRE, FF_FULLBRIGHT| 3, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE5},  // S_THROWNGRENADE4
+	{SPR_TGRE, FF_FULLBRIGHT| 4, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE6},  // S_THROWNGRENADE5
+	{SPR_TGRE, FF_FULLBRIGHT| 5, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE7},  // S_THROWNGRENADE6
+	{SPR_TGRE, FF_FULLBRIGHT| 6, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE8},  // S_THROWNGRENADE7
+	{SPR_TGRE, FF_FULLBRIGHT| 7, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE9},  // S_THROWNGRENADE8
+	{SPR_TGRE, FF_FULLBRIGHT| 8, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE10}, // S_THROWNGRENADE9
+	{SPR_TGRE, FF_FULLBRIGHT| 9, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE11}, // S_THROWNGRENADE10
+	{SPR_TGRE, FF_FULLBRIGHT|10, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE12}, // S_THROWNGRENADE11
+	{SPR_TGRE, FF_FULLBRIGHT|11, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE13}, // S_THROWNGRENADE12
+	{SPR_TGRE, FF_FULLBRIGHT|12, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE14}, // S_THROWNGRENADE13
+	{SPR_TGRE, FF_FULLBRIGHT|13, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE15}, // S_THROWNGRENADE14
+	{SPR_TGRE, FF_FULLBRIGHT|14, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE16}, // S_THROWNGRENADE15
+	{SPR_TGRE, FF_FULLBRIGHT|15, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE17}, // S_THROWNGRENADE16
+	{SPR_TGRE, FF_FULLBRIGHT|16, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE18}, // S_THROWNGRENADE17
+	{SPR_TGRE, FF_FULLBRIGHT|17, 1, A_ThrownRing, 0, 0, S_THROWNGRENADE1},  // S_THROWNGRENADE18
 
-	{SPR_TSCR, FF_FULLBRIGHT, 1, {A_ThrownRing}, 0, 0, S_THROWNSCATTER}, // S_THROWNSCATTER
+	{SPR_TSCR, FF_FULLBRIGHT, 1, A_ThrownRing, 0, 0, S_THROWNSCATTER}, // S_THROWNSCATTER
 
-	{SPR_NULL, 0, 1, {A_RingExplode}, 0, 0, S_XPLD1}, // S_RINGEXPLODE
+	{SPR_NULL, 0, 1, A_RingExplode, 0, 0, S_XPLD1}, // S_RINGEXPLODE
 
 	// Coin
-	{SPR_COIN, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_COIN2}, // S_COIN1
-	{SPR_COIN, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_COIN3}, // S_COIN2
-	{SPR_COIN, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_COIN1}, // S_COIN3
+	{SPR_COIN, FF_FULLBRIGHT,   5, NULL, 0, 0, S_COIN2}, // S_COIN1
+	{SPR_COIN, FF_FULLBRIGHT|1, 5, NULL, 0, 0, S_COIN3}, // S_COIN2
+	{SPR_COIN, FF_FULLBRIGHT|2, 5, NULL, 0, 0, S_COIN1}, // S_COIN3
 
 	// Coin Sparkle
-	{SPR_CPRK, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_COINSPARKLE2}, // S_COINSPARKLE1
-	{SPR_CPRK, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_COINSPARKLE3}, // S_COINSPARKLE2
-	{SPR_CPRK, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_COINSPARKLE4}, // S_COINSPARKLE3
-	{SPR_CPRK, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_NULL},         // S_COINSPARKLE4
+	{SPR_CPRK, FF_FULLBRIGHT,   5, NULL, 0, 0, S_COINSPARKLE2}, // S_COINSPARKLE1
+	{SPR_CPRK, FF_FULLBRIGHT|1, 5, NULL, 0, 0, S_COINSPARKLE3}, // S_COINSPARKLE2
+	{SPR_CPRK, FF_FULLBRIGHT|2, 5, NULL, 0, 0, S_COINSPARKLE4}, // S_COINSPARKLE3
+	{SPR_CPRK, FF_FULLBRIGHT|3, 5, NULL, 0, 0, S_NULL},         // S_COINSPARKLE4
 
 	// Goomba
-	{SPR_GOOM, 0, 6, {A_Look}, 0, 0, S_GOOMBA1B}, // S_GOOMBA1
-	{SPR_GOOM, 1, 6, {A_Look}, 0, 0, S_GOOMBA1},  // S_GOOMBA1B
-	{SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA3}, // S_GOOMBA2
-	{SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA4}, // S_GOOMBA3
-	{SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA5}, // S_GOOMBA4
-	{SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA6}, // S_GOOMBA5
-	{SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA7}, // S_GOOMBA6
-	{SPR_GOOM, 0, 3, {A_Chase}, 0, 0, S_GOOMBA8}, // S_GOOMBA7
-	{SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA9}, // S_GOOMBA8
-	{SPR_GOOM, 1, 3, {A_Chase}, 0, 0, S_GOOMBA2}, // S_GOOMBA9
-	{SPR_GOOM, 2, 16, {A_Scream}, 0, 0, S_NULL},  // S_GOOMBA_DEAD
+	{SPR_GOOM, 0, 6, A_Look, 0, 0, S_GOOMBA1B}, // S_GOOMBA1
+	{SPR_GOOM, 1, 6, A_Look, 0, 0, S_GOOMBA1},  // S_GOOMBA1B
+	{SPR_GOOM, 0, 3, A_Chase, 0, 0, S_GOOMBA3}, // S_GOOMBA2
+	{SPR_GOOM, 0, 3, A_Chase, 0, 0, S_GOOMBA4}, // S_GOOMBA3
+	{SPR_GOOM, 1, 3, A_Chase, 0, 0, S_GOOMBA5}, // S_GOOMBA4
+	{SPR_GOOM, 1, 3, A_Chase, 0, 0, S_GOOMBA6}, // S_GOOMBA5
+	{SPR_GOOM, 0, 3, A_Chase, 0, 0, S_GOOMBA7}, // S_GOOMBA6
+	{SPR_GOOM, 0, 3, A_Chase, 0, 0, S_GOOMBA8}, // S_GOOMBA7
+	{SPR_GOOM, 1, 3, A_Chase, 0, 0, S_GOOMBA9}, // S_GOOMBA8
+	{SPR_GOOM, 1, 3, A_Chase, 0, 0, S_GOOMBA2}, // S_GOOMBA9
+	{SPR_GOOM, 2, 16, A_Scream, 0, 0, S_NULL},  // S_GOOMBA_DEAD
 
 	// Blue Goomba
-	{SPR_BGOM, 0, 6, {A_Look}, 0, 0, S_BLUEGOOMBA1B}, // BLUEGOOMBA1
-	{SPR_BGOM, 1, 6, {A_Look}, 0, 0, S_BLUEGOOMBA1},  // BLUEGOOMBA1B
-	{SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA3}, // S_BLUEGOOMBA2
-	{SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA4}, // S_BLUEGOOMBA3
-	{SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA5}, // S_BLUEGOOMBA4
-	{SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA6}, // S_BLUEGOOMBA5
-	{SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA7}, // S_BLUEGOOMBA6
-	{SPR_BGOM, 0, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA8}, // S_BLUEGOOMBA7
-	{SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA9}, // S_BLUEGOOMBA8
-	{SPR_BGOM, 1, 3, {A_Chase}, 0, 0, S_BLUEGOOMBA2}, // S_BLUEGOOMBA9
-	{SPR_BGOM, 2, 16, {A_Scream}, 0, 0, S_NULL},      // S_BLUEGOOMBA_DEAD
+	{SPR_BGOM, 0, 6, A_Look, 0, 0, S_BLUEGOOMBA1B}, // BLUEGOOMBA1
+	{SPR_BGOM, 1, 6, A_Look, 0, 0, S_BLUEGOOMBA1},  // BLUEGOOMBA1B
+	{SPR_BGOM, 0, 3, A_Chase, 0, 0, S_BLUEGOOMBA3}, // S_BLUEGOOMBA2
+	{SPR_BGOM, 0, 3, A_Chase, 0, 0, S_BLUEGOOMBA4}, // S_BLUEGOOMBA3
+	{SPR_BGOM, 1, 3, A_Chase, 0, 0, S_BLUEGOOMBA5}, // S_BLUEGOOMBA4
+	{SPR_BGOM, 1, 3, A_Chase, 0, 0, S_BLUEGOOMBA6}, // S_BLUEGOOMBA5
+	{SPR_BGOM, 0, 3, A_Chase, 0, 0, S_BLUEGOOMBA7}, // S_BLUEGOOMBA6
+	{SPR_BGOM, 0, 3, A_Chase, 0, 0, S_BLUEGOOMBA8}, // S_BLUEGOOMBA7
+	{SPR_BGOM, 1, 3, A_Chase, 0, 0, S_BLUEGOOMBA9}, // S_BLUEGOOMBA8
+	{SPR_BGOM, 1, 3, A_Chase, 0, 0, S_BLUEGOOMBA2}, // S_BLUEGOOMBA9
+	{SPR_BGOM, 2, 16, A_Scream, 0, 0, S_NULL},      // S_BLUEGOOMBA_DEAD
 
 	// Fire Flower
-	{SPR_FFWR, 0, 3, {NULL}, 0, 0, S_FIREFLOWER2}, // S_FIREFLOWER1
-	{SPR_FFWR, 1, 3, {NULL}, 0, 0, S_FIREFLOWER3}, // S_FIREFLOWER2
-	{SPR_FFWR, 2, 3, {NULL}, 0, 0, S_FIREFLOWER4}, // S_FIREFLOWER3
-	{SPR_FFWR, 3, 3, {NULL}, 0, 0, S_FIREFLOWER1}, // S_FIREFLOWER4
+	{SPR_FFWR, 0, 3, NULL, 0, 0, S_FIREFLOWER2}, // S_FIREFLOWER1
+	{SPR_FFWR, 1, 3, NULL, 0, 0, S_FIREFLOWER3}, // S_FIREFLOWER2
+	{SPR_FFWR, 2, 3, NULL, 0, 0, S_FIREFLOWER4}, // S_FIREFLOWER3
+	{SPR_FFWR, 3, 3, NULL, 0, 0, S_FIREFLOWER1}, // S_FIREFLOWER4
 
 	// Thrown Mario Fireball
-	{SPR_FBLL, FF_FULLBRIGHT,    3, {NULL}, 0, 0, S_FIREBALL2},    // S_FIREBALL1
-	{SPR_FBLL, FF_FULLBRIGHT|1,  3, {NULL}, 0, 0, S_FIREBALL3},    // S_FIREBALL2
-	{SPR_FBLL, FF_FULLBRIGHT|2,  3, {NULL}, 0, 0, S_FIREBALL4},    // S_FIREBALL3
-	{SPR_FBLL, FF_FULLBRIGHT|3,  3, {NULL}, 0, 0, S_FIREBALL1},    // S_FIREBALL4
-	{SPR_FBLL, FF_FULLBRIGHT|4,  3, {NULL}, 0, 0, S_FIREBALLEXP2}, // S_FIREBALLEXP1
-	{SPR_FBLL, FF_FULLBRIGHT|5,  3, {NULL}, 0, 0, S_FIREBALLEXP3}, // S_FIREBALLEXP2
-	{SPR_FBLL, FF_FULLBRIGHT|6,  3, {NULL}, 0, 0, S_NULL},         // S_FIREBALLEXP3
+	{SPR_FBLL, FF_FULLBRIGHT,    3, NULL, 0, 0, S_FIREBALL2},    // S_FIREBALL1
+	{SPR_FBLL, FF_FULLBRIGHT|1,  3, NULL, 0, 0, S_FIREBALL3},    // S_FIREBALL2
+	{SPR_FBLL, FF_FULLBRIGHT|2,  3, NULL, 0, 0, S_FIREBALL4},    // S_FIREBALL3
+	{SPR_FBLL, FF_FULLBRIGHT|3,  3, NULL, 0, 0, S_FIREBALL1},    // S_FIREBALL4
+	{SPR_FBLL, FF_FULLBRIGHT|4,  3, NULL, 0, 0, S_FIREBALLEXP2}, // S_FIREBALLEXP1
+	{SPR_FBLL, FF_FULLBRIGHT|5,  3, NULL, 0, 0, S_FIREBALLEXP3}, // S_FIREBALLEXP2
+	{SPR_FBLL, FF_FULLBRIGHT|6,  3, NULL, 0, 0, S_NULL},         // S_FIREBALLEXP3
 
 	// Turtle Shell
-	{SPR_SHLL, 0, -1, {NULL}, 0, 0, S_NULL},  // S_SHELL
-	{SPR_SHLL, 0, 2, {NULL}, 0, 0, S_SHELL2}, // S_SHELL1
-	{SPR_SHLL, 1, 2, {NULL}, 0, 0, S_SHELL3}, // S_SHELL2
-	{SPR_SHLL, 2, 2, {NULL}, 0, 0, S_SHELL4}, // S_SHELL3
-	{SPR_SHLL, 3, 2, {NULL}, 0, 0, S_SHELL1}, // S_SHELL4
+	{SPR_SHLL, 0, -1, NULL, 0, 0, S_NULL},  // S_SHELL
+	{SPR_SHLL, 0, 2, NULL, 0, 0, S_SHELL2}, // S_SHELL1
+	{SPR_SHLL, 1, 2, NULL, 0, 0, S_SHELL3}, // S_SHELL2
+	{SPR_SHLL, 2, 2, NULL, 0, 0, S_SHELL4}, // S_SHELL3
+	{SPR_SHLL, 3, 2, NULL, 0, 0, S_SHELL1}, // S_SHELL4
 
 	// Puma (Mario fireball)
-	{SPR_PUMA, FF_FULLBRIGHT,   3, {A_FishJump}, 0, 0, S_PUMA2}, // S_PUMA1
-	{SPR_PUMA, FF_FULLBRIGHT|1, 3, {A_FishJump}, 0, 0, S_PUMA3}, // S_PUMA2
-	{SPR_PUMA, FF_FULLBRIGHT|2, 3, {A_FishJump}, 0, 0, S_PUMA1}, // S_PUMA3
-	{SPR_PUMA, FF_FULLBRIGHT|3, 3, {A_FishJump}, 0, 0, S_PUMA5}, // S_PUMA4
-	{SPR_PUMA, FF_FULLBRIGHT|4, 3, {A_FishJump}, 0, 0, S_PUMA6}, // S_PUMA5
-	{SPR_PUMA, FF_FULLBRIGHT|5, 3, {A_FishJump}, 0, 0, S_PUMA4}, // S_PUMA6
+	{SPR_PUMA, FF_FULLBRIGHT,   3, A_FishJump, 0, 0, S_PUMA2}, // S_PUMA1
+	{SPR_PUMA, FF_FULLBRIGHT|1, 3, A_FishJump, 0, 0, S_PUMA3}, // S_PUMA2
+	{SPR_PUMA, FF_FULLBRIGHT|2, 3, A_FishJump, 0, 0, S_PUMA1}, // S_PUMA3
+	{SPR_PUMA, FF_FULLBRIGHT|3, 3, A_FishJump, 0, 0, S_PUMA5}, // S_PUMA4
+	{SPR_PUMA, FF_FULLBRIGHT|4, 3, A_FishJump, 0, 0, S_PUMA6}, // S_PUMA5
+	{SPR_PUMA, FF_FULLBRIGHT|5, 3, A_FishJump, 0, 0, S_PUMA4}, // S_PUMA6
 
 	// Hammer
-	{SPR_HAMM, 0, 3, {NULL}, 0, 0, S_HAMMER2}, // S_HAMMER1
-	{SPR_HAMM, 1, 3, {NULL}, 0, 0, S_HAMMER3}, // S_HAMMER2
-	{SPR_HAMM, 2, 3, {NULL}, 0, 0, S_HAMMER4}, // S_HAMMER3
-	{SPR_HAMM, 3, 3, {NULL}, 0, 0, S_HAMMER1}, // S_HAMMER4
+	{SPR_HAMM, 0, 3, NULL, 0, 0, S_HAMMER2}, // S_HAMMER1
+	{SPR_HAMM, 1, 3, NULL, 0, 0, S_HAMMER3}, // S_HAMMER2
+	{SPR_HAMM, 2, 3, NULL, 0, 0, S_HAMMER4}, // S_HAMMER3
+	{SPR_HAMM, 3, 3, NULL, 0, 0, S_HAMMER1}, // S_HAMMER4
 
 	// Koopa
-	{SPR_KOOP, 0, -1, {NULL}, 0, 0, S_NULL},   // S_KOOPA1
-	{SPR_KOOP, 1, 24, {NULL}, 0, 0, S_KOOPA1}, // S_KOOPA2
+	{SPR_KOOP, 0, -1, NULL, 0, 0, S_NULL},   // S_KOOPA1
+	{SPR_KOOP, 1, 24, NULL, 0, 0, S_KOOPA1}, // S_KOOPA2
 
-	{SPR_BFLM, 0, 3,{NULL}, 0, 0, S_KOOPAFLAME2}, // S_KOOPAFLAME1
-	{SPR_BFLM, 1, 3,{NULL}, 0, 0, S_KOOPAFLAME3}, // S_KOOPAFLAME2
-	{SPR_BFLM, 2, 3,{NULL}, 0, 0, S_KOOPAFLAME1}, // S_KOOPAFLAME3
+	{SPR_BFLM, 0, 3,NULL, 0, 0, S_KOOPAFLAME2}, // S_KOOPAFLAME1
+	{SPR_BFLM, 1, 3,NULL, 0, 0, S_KOOPAFLAME3}, // S_KOOPAFLAME2
+	{SPR_BFLM, 2, 3,NULL, 0, 0, S_KOOPAFLAME1}, // S_KOOPAFLAME3
 
 	// Axe
-	{SPR_MAXE, 0, 3, {NULL}, 0, 0, S_AXE2}, // S_AXE1
-	{SPR_MAXE, 1, 3, {NULL}, 0, 0, S_AXE3}, // S_AXE2
-	{SPR_MAXE, 2, 3, {NULL}, 0, 0, S_AXE1}, // S_AXE3
+	{SPR_MAXE, 0, 3, NULL, 0, 0, S_AXE2}, // S_AXE1
+	{SPR_MAXE, 1, 3, NULL, 0, 0, S_AXE3}, // S_AXE2
+	{SPR_MAXE, 2, 3, NULL, 0, 0, S_AXE1}, // S_AXE3
 
-	{SPR_MUS1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_MARIOBUSH1
-	{SPR_MUS2, 0, -1, {NULL}, 0, 0, S_NULL}, // S_MARIOBUSH2
-	{SPR_TOAD, 0, -1, {NULL}, 0, 0, S_NULL}, // S_TOAD
+	{SPR_MUS1, 0, -1, NULL, 0, 0, S_NULL}, // S_MARIOBUSH1
+	{SPR_MUS2, 0, -1, NULL, 0, 0, S_NULL}, // S_MARIOBUSH2
+	{SPR_TOAD, 0, -1, NULL, 0, 0, S_NULL}, // S_TOAD
 
 	// Nights Drone
-	{SPR_NDRN, 0, -1, {NULL}, 0, 0, S_NIGHTSDRONE2}, // S_NIGHTSDRONE1
-	{SPR_NDRN, 0, -1, {NULL}, 0, 0, S_NIGHTSDRONE1}, // S_NIGHTSDRONE2
+	{SPR_NDRN, 0, -1, NULL, 0, 0, S_NIGHTSDRONE2}, // S_NIGHTSDRONE1
+	{SPR_NDRN, 0, -1, NULL, 0, 0, S_NIGHTSDRONE1}, // S_NIGHTSDRONE2
 
 	// Sparkling point (RETURN TO THE GOAL, etc)
-	{SPR_IVSP, 0, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING2},   // S_NIGHTSDRONE_SPARKLING1
-	{SPR_IVSP, 2, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING3},   // S_NIGHTSDRONE_SPARKLING2
-	{SPR_IVSP, 4, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING4},   // S_NIGHTSDRONE_SPARKLING3
-	{SPR_IVSP, 6, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING5},   // S_NIGHTSDRONE_SPARKLING4
-	{SPR_IVSP, 8, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING6},  // S_NIGHTSDRONE_SPARKLING5
-	{SPR_IVSP, 10, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING7}, // S_NIGHTSDRONE_SPARKLING6
-	{SPR_IVSP, 12, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING8}, // S_NIGHTSDRONE_SPARKLING7
-	{SPR_IVSP, 14, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING9}, // S_NIGHTSDRONE_SPARKLING8
-	{SPR_IVSP, 16, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING10}, // S_NIGHTSDRONE_SPARKLING9
-	{SPR_IVSP, 18, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING11}, // S_NIGHTSDRONE_SPARKLING10
-	{SPR_IVSP, 20, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING12}, // S_NIGHTSDRONE_SPARKLING11
-	{SPR_IVSP, 22, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING13}, // S_NIGHTSDRONE_SPARKLING12
-	{SPR_IVSP, 24, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING14}, // S_NIGHTSDRONE_SPARKLING13
-	{SPR_IVSP, 26, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING15}, // S_NIGHTSDRONE_SPARKLING14
-	{SPR_IVSP, 28, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING16}, // S_NIGHTSDRONE_SPARKLING15
-	{SPR_IVSP, 30, 1, {A_GhostMe}, 0, 0, S_NIGHTSDRONE_SPARKLING1}, // S_NIGHTSDRONE_SPARKLING16
+	{SPR_IVSP, 0, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING2},   // S_NIGHTSDRONE_SPARKLING1
+	{SPR_IVSP, 2, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING3},   // S_NIGHTSDRONE_SPARKLING2
+	{SPR_IVSP, 4, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING4},   // S_NIGHTSDRONE_SPARKLING3
+	{SPR_IVSP, 6, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING5},   // S_NIGHTSDRONE_SPARKLING4
+	{SPR_IVSP, 8, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING6},  // S_NIGHTSDRONE_SPARKLING5
+	{SPR_IVSP, 10, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING7}, // S_NIGHTSDRONE_SPARKLING6
+	{SPR_IVSP, 12, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING8}, // S_NIGHTSDRONE_SPARKLING7
+	{SPR_IVSP, 14, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING9}, // S_NIGHTSDRONE_SPARKLING8
+	{SPR_IVSP, 16, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING10}, // S_NIGHTSDRONE_SPARKLING9
+	{SPR_IVSP, 18, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING11}, // S_NIGHTSDRONE_SPARKLING10
+	{SPR_IVSP, 20, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING12}, // S_NIGHTSDRONE_SPARKLING11
+	{SPR_IVSP, 22, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING13}, // S_NIGHTSDRONE_SPARKLING12
+	{SPR_IVSP, 24, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING14}, // S_NIGHTSDRONE_SPARKLING13
+	{SPR_IVSP, 26, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING15}, // S_NIGHTSDRONE_SPARKLING14
+	{SPR_IVSP, 28, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING16}, // S_NIGHTSDRONE_SPARKLING15
+	{SPR_IVSP, 30, 1, A_GhostMe, 0, 0, S_NIGHTSDRONE_SPARKLING1}, // S_NIGHTSDRONE_SPARKLING16
 
 	// NiGHTS GOAL banner (inside the sparkles!)
-	{SPR_GOAL, 0, 4, {NULL}, 0, 0, S_NIGHTSGOAL2}, // S_NIGHTSGOAL1
-	{SPR_GOAL, 1, 4, {NULL}, 0, 0, S_NIGHTSGOAL3}, // S_NIGHTSGOAL2
-	{SPR_GOAL, 2, 4, {NULL}, 0, 0, S_NIGHTSGOAL4}, // S_NIGHTSGOAL3
-	{SPR_GOAL, 3, 4, {NULL}, 0, 0, S_NIGHTSGOAL1}, // S_NIGHTSGOAL4
+	{SPR_GOAL, 0, 4, NULL, 0, 0, S_NIGHTSGOAL2}, // S_NIGHTSGOAL1
+	{SPR_GOAL, 1, 4, NULL, 0, 0, S_NIGHTSGOAL3}, // S_NIGHTSGOAL2
+	{SPR_GOAL, 2, 4, NULL, 0, 0, S_NIGHTSGOAL4}, // S_NIGHTSGOAL3
+	{SPR_GOAL, 3, 4, NULL, 0, 0, S_NIGHTSGOAL1}, // S_NIGHTSGOAL4
 
 	// Nights Player, Flying and Drilling
-	{SPR_SUPE, 0, 1, {NULL}, 0, 0, S_NIGHTSFLY1B},  // S_NIGHTSFLY1A
-	{SPR_SUPE, 1, 1, {NULL}, 0, 0, S_NIGHTSFLY1A},  // S_NIGHTSFLY1B
-	{SPR_NDRL, 0, 2, {NULL}, 0, 0, S_NIGHTSDRILL1B},  // S_NIGHTSDRILL1A
-	{SPR_NDRL, 1, 2, {NULL}, 0, 0, S_NIGHTSDRILL1C},  // S_NIGHTSDRILL1B
-	{SPR_NDRL, 2, 2, {NULL}, 0, 0, S_NIGHTSDRILL1D},  // S_NIGHTSDRILL1C
-	{SPR_NDRL, 3, 2, {NULL}, 0, 0, S_NIGHTSDRILL1A},  // S_NIGHTSDRILL1D
-	{SPR_SUPE, 2, 1, {NULL}, 0, 0, S_NIGHTSFLY2B},  // S_NIGHTSFLY2A
-	{SPR_SUPE, 3, 1, {NULL}, 0, 0, S_NIGHTSFLY2A},  // S_NIGHTSFLY2B
-	{SPR_NDRL, 4, 2, {NULL}, 0, 0, S_NIGHTSDRILL2B},  // S_NIGHTSDRILL2A
-	{SPR_NDRL, 5, 2, {NULL}, 0, 0, S_NIGHTSDRILL2C},  // S_NIGHTSDRILL2B
-	{SPR_NDRL, 6, 2, {NULL}, 0, 0, S_NIGHTSDRILL2D},  // S_NIGHTSDRILL2C
-	{SPR_NDRL, 7, 2, {NULL}, 0, 0, S_NIGHTSDRILL2A},  // S_NIGHTSDRILL2D
-	{SPR_SUPE, 4, 1, {NULL}, 0, 0, S_NIGHTSFLY3B},  // S_NIGHTSFLY3A
-	{SPR_SUPE, 5, 1, {NULL}, 0, 0, S_NIGHTSFLY3A},  // S_NIGHTSFLY3B
-	{SPR_NDRL, 8, 2, {NULL}, 0, 0, S_NIGHTSDRILL3B},  // S_NIGHTSDRILL3A
-	{SPR_NDRL, 9, 2, {NULL}, 0, 0, S_NIGHTSDRILL3C},  // S_NIGHTSDRILL3B
-	{SPR_NDRL, 10, 2, {NULL}, 0, 0, S_NIGHTSDRILL3D}, // S_NIGHTSDRILL3C
-	{SPR_NDRL, 11, 2, {NULL}, 0, 0, S_NIGHTSDRILL3A}, // S_NIGHTSDRILL3D
-	{SPR_SUPE, 6, 1, {NULL}, 0, 0, S_NIGHTSFLY4B},  // S_NIGHTSFLY4A
-	{SPR_SUPE, 7, 1, {NULL}, 0, 0, S_NIGHTSFLY4A},  // S_NIGHTSFLY4B
-	{SPR_NDRL, 12, 2, {NULL}, 0, 0, S_NIGHTSDRILL4B}, // S_NIGHTSDRILL4A
-	{SPR_NDRL, 13, 2, {NULL}, 0, 0, S_NIGHTSDRILL4C}, // S_NIGHTSDRILL4B
-	{SPR_NDRL, 14, 2, {NULL}, 0, 0, S_NIGHTSDRILL4D}, // S_NIGHTSDRILL4C
-	{SPR_NDRL, 15, 2, {NULL}, 0, 0, S_NIGHTSDRILL4A}, // S_NIGHTSDRILL4D
-	{SPR_SUPE, 8, 1, {NULL}, 0, 0, S_NIGHTSFLY5B},  // S_NIGHTSFLY5A
-	{SPR_SUPE, 9, 1, {NULL}, 0, 0, S_NIGHTSFLY5A},  // S_NIGHTSFLY5B
-	{SPR_NDRL, 16, 2, {NULL}, 0, 0, S_NIGHTSDRILL5B}, // S_NIGHTSDRILL5A
-	{SPR_NDRL, 17, 2, {NULL}, 0, 0, S_NIGHTSDRILL5C}, // S_NIGHTSDRILL5B
-	{SPR_NDRL, 18, 2, {NULL}, 0, 0, S_NIGHTSDRILL5D}, // S_NIGHTSDRILL5C
-	{SPR_NDRL, 19, 2, {NULL}, 0, 0, S_NIGHTSDRILL5A}, // S_NIGHTSDRILL5D
-	{SPR_SUPE, 10, 1, {NULL}, 0, 0, S_NIGHTSFLY6B}, // S_NIGHTSFLY6A
-	{SPR_SUPE, 11, 1, {NULL}, 0, 0, S_NIGHTSFLY6A}, // S_NIGHTSFLY6B
-	{SPR_NDRL, 20, 2, {NULL}, 0, 0, S_NIGHTSDRILL6B}, // S_NIGHTSDRILL6A
-	{SPR_NDRL, 21, 2, {NULL}, 0, 0, S_NIGHTSDRILL6C}, // S_NIGHTSDRILL6B
-	{SPR_NDRL, 22, 2, {NULL}, 0, 0, S_NIGHTSDRILL6D}, // S_NIGHTSDRILL6C
-	{SPR_NDRL, 23, 2, {NULL}, 0, 0, S_NIGHTSDRILL6A}, // S_NIGHTSDRILL6D
-	{SPR_SUPE, 12, 1, {NULL}, 0, 0, S_NIGHTSFLY7B}, // S_NIGHTSFLY7A
-	{SPR_SUPE, 13, 1, {NULL}, 0, 0, S_NIGHTSFLY7A}, // S_NIGHTSFLY7B
-	{SPR_NDRL, 24, 2, {NULL}, 0, 0, S_NIGHTSDRILL7B}, // S_NIGHTSDRILL7A
-	{SPR_NDRL, 25, 2, {NULL}, 0, 0, S_NIGHTSDRILL7C}, // S_NIGHTSDRILL7B
-	{SPR_NDRL, 26, 2, {NULL}, 0, 0, S_NIGHTSDRILL7D}, // S_NIGHTSDRILL7C
-	{SPR_NDRL, 27, 2, {NULL}, 0, 0, S_NIGHTSDRILL7A}, // S_NIGHTSDRILL7D
-	{SPR_SUPE, 14, 1, {NULL}, 0, 0, S_NIGHTSFLY8B}, // S_NIGHTSFLY8A
-	{SPR_SUPE, 15, 1, {NULL}, 0, 0, S_NIGHTSFLY8A}, // S_NIGHTSFLY8B
-	{SPR_NDRL, 28, 2, {NULL}, 0, 0, S_NIGHTSDRILL8B}, // S_NIGHTSDRILL8A
-	{SPR_NDRL, 29, 2, {NULL}, 0, 0, S_NIGHTSDRILL8C}, // S_NIGHTSDRILL8B
-	{SPR_NDRL, 30, 2, {NULL}, 0, 0, S_NIGHTSDRILL8D}, // S_NIGHTSDRILL8C
-	{SPR_NDRL, 31, 2, {NULL}, 0, 0, S_NIGHTSDRILL8A}, // S_NIGHTSDRILL8D
-	{SPR_SUPE, 16, 1, {NULL}, 0, 0, S_NIGHTSFLY9B}, // S_NIGHTSFLY9A
-	{SPR_SUPE, 17, 1, {NULL}, 0, 0, S_NIGHTSFLY9A}, // S_NIGHTSFLY9B
-	{SPR_NDRL, 32, 2, {NULL}, 0, 0, S_NIGHTSDRILL9B}, // S_NIGHTSDRILL9A
-	{SPR_NDRL, 33, 2, {NULL}, 0, 0, S_NIGHTSDRILL9C}, // S_NIGHTSDRILL9B
-	{SPR_NDRL, 34, 2, {NULL}, 0, 0, S_NIGHTSDRILL9D}, // S_NIGHTSDRILL9C
-	{SPR_NDRL, 35, 2, {NULL}, 0, 0, S_NIGHTSDRILL9A}, // S_NIGHTSDRILL9D
+	{SPR_SUPE, 0, 1, NULL, 0, 0, S_NIGHTSFLY1B},  // S_NIGHTSFLY1A
+	{SPR_SUPE, 1, 1, NULL, 0, 0, S_NIGHTSFLY1A},  // S_NIGHTSFLY1B
+	{SPR_NDRL, 0, 2, NULL, 0, 0, S_NIGHTSDRILL1B},  // S_NIGHTSDRILL1A
+	{SPR_NDRL, 1, 2, NULL, 0, 0, S_NIGHTSDRILL1C},  // S_NIGHTSDRILL1B
+	{SPR_NDRL, 2, 2, NULL, 0, 0, S_NIGHTSDRILL1D},  // S_NIGHTSDRILL1C
+	{SPR_NDRL, 3, 2, NULL, 0, 0, S_NIGHTSDRILL1A},  // S_NIGHTSDRILL1D
+	{SPR_SUPE, 2, 1, NULL, 0, 0, S_NIGHTSFLY2B},  // S_NIGHTSFLY2A
+	{SPR_SUPE, 3, 1, NULL, 0, 0, S_NIGHTSFLY2A},  // S_NIGHTSFLY2B
+	{SPR_NDRL, 4, 2, NULL, 0, 0, S_NIGHTSDRILL2B},  // S_NIGHTSDRILL2A
+	{SPR_NDRL, 5, 2, NULL, 0, 0, S_NIGHTSDRILL2C},  // S_NIGHTSDRILL2B
+	{SPR_NDRL, 6, 2, NULL, 0, 0, S_NIGHTSDRILL2D},  // S_NIGHTSDRILL2C
+	{SPR_NDRL, 7, 2, NULL, 0, 0, S_NIGHTSDRILL2A},  // S_NIGHTSDRILL2D
+	{SPR_SUPE, 4, 1, NULL, 0, 0, S_NIGHTSFLY3B},  // S_NIGHTSFLY3A
+	{SPR_SUPE, 5, 1, NULL, 0, 0, S_NIGHTSFLY3A},  // S_NIGHTSFLY3B
+	{SPR_NDRL, 8, 2, NULL, 0, 0, S_NIGHTSDRILL3B},  // S_NIGHTSDRILL3A
+	{SPR_NDRL, 9, 2, NULL, 0, 0, S_NIGHTSDRILL3C},  // S_NIGHTSDRILL3B
+	{SPR_NDRL, 10, 2, NULL, 0, 0, S_NIGHTSDRILL3D}, // S_NIGHTSDRILL3C
+	{SPR_NDRL, 11, 2, NULL, 0, 0, S_NIGHTSDRILL3A}, // S_NIGHTSDRILL3D
+	{SPR_SUPE, 6, 1, NULL, 0, 0, S_NIGHTSFLY4B},  // S_NIGHTSFLY4A
+	{SPR_SUPE, 7, 1, NULL, 0, 0, S_NIGHTSFLY4A},  // S_NIGHTSFLY4B
+	{SPR_NDRL, 12, 2, NULL, 0, 0, S_NIGHTSDRILL4B}, // S_NIGHTSDRILL4A
+	{SPR_NDRL, 13, 2, NULL, 0, 0, S_NIGHTSDRILL4C}, // S_NIGHTSDRILL4B
+	{SPR_NDRL, 14, 2, NULL, 0, 0, S_NIGHTSDRILL4D}, // S_NIGHTSDRILL4C
+	{SPR_NDRL, 15, 2, NULL, 0, 0, S_NIGHTSDRILL4A}, // S_NIGHTSDRILL4D
+	{SPR_SUPE, 8, 1, NULL, 0, 0, S_NIGHTSFLY5B},  // S_NIGHTSFLY5A
+	{SPR_SUPE, 9, 1, NULL, 0, 0, S_NIGHTSFLY5A},  // S_NIGHTSFLY5B
+	{SPR_NDRL, 16, 2, NULL, 0, 0, S_NIGHTSDRILL5B}, // S_NIGHTSDRILL5A
+	{SPR_NDRL, 17, 2, NULL, 0, 0, S_NIGHTSDRILL5C}, // S_NIGHTSDRILL5B
+	{SPR_NDRL, 18, 2, NULL, 0, 0, S_NIGHTSDRILL5D}, // S_NIGHTSDRILL5C
+	{SPR_NDRL, 19, 2, NULL, 0, 0, S_NIGHTSDRILL5A}, // S_NIGHTSDRILL5D
+	{SPR_SUPE, 10, 1, NULL, 0, 0, S_NIGHTSFLY6B}, // S_NIGHTSFLY6A
+	{SPR_SUPE, 11, 1, NULL, 0, 0, S_NIGHTSFLY6A}, // S_NIGHTSFLY6B
+	{SPR_NDRL, 20, 2, NULL, 0, 0, S_NIGHTSDRILL6B}, // S_NIGHTSDRILL6A
+	{SPR_NDRL, 21, 2, NULL, 0, 0, S_NIGHTSDRILL6C}, // S_NIGHTSDRILL6B
+	{SPR_NDRL, 22, 2, NULL, 0, 0, S_NIGHTSDRILL6D}, // S_NIGHTSDRILL6C
+	{SPR_NDRL, 23, 2, NULL, 0, 0, S_NIGHTSDRILL6A}, // S_NIGHTSDRILL6D
+	{SPR_SUPE, 12, 1, NULL, 0, 0, S_NIGHTSFLY7B}, // S_NIGHTSFLY7A
+	{SPR_SUPE, 13, 1, NULL, 0, 0, S_NIGHTSFLY7A}, // S_NIGHTSFLY7B
+	{SPR_NDRL, 24, 2, NULL, 0, 0, S_NIGHTSDRILL7B}, // S_NIGHTSDRILL7A
+	{SPR_NDRL, 25, 2, NULL, 0, 0, S_NIGHTSDRILL7C}, // S_NIGHTSDRILL7B
+	{SPR_NDRL, 26, 2, NULL, 0, 0, S_NIGHTSDRILL7D}, // S_NIGHTSDRILL7C
+	{SPR_NDRL, 27, 2, NULL, 0, 0, S_NIGHTSDRILL7A}, // S_NIGHTSDRILL7D
+	{SPR_SUPE, 14, 1, NULL, 0, 0, S_NIGHTSFLY8B}, // S_NIGHTSFLY8A
+	{SPR_SUPE, 15, 1, NULL, 0, 0, S_NIGHTSFLY8A}, // S_NIGHTSFLY8B
+	{SPR_NDRL, 28, 2, NULL, 0, 0, S_NIGHTSDRILL8B}, // S_NIGHTSDRILL8A
+	{SPR_NDRL, 29, 2, NULL, 0, 0, S_NIGHTSDRILL8C}, // S_NIGHTSDRILL8B
+	{SPR_NDRL, 30, 2, NULL, 0, 0, S_NIGHTSDRILL8D}, // S_NIGHTSDRILL8C
+	{SPR_NDRL, 31, 2, NULL, 0, 0, S_NIGHTSDRILL8A}, // S_NIGHTSDRILL8D
+	{SPR_SUPE, 16, 1, NULL, 0, 0, S_NIGHTSFLY9B}, // S_NIGHTSFLY9A
+	{SPR_SUPE, 17, 1, NULL, 0, 0, S_NIGHTSFLY9A}, // S_NIGHTSFLY9B
+	{SPR_NDRL, 32, 2, NULL, 0, 0, S_NIGHTSDRILL9B}, // S_NIGHTSDRILL9A
+	{SPR_NDRL, 33, 2, NULL, 0, 0, S_NIGHTSDRILL9C}, // S_NIGHTSDRILL9B
+	{SPR_NDRL, 34, 2, NULL, 0, 0, S_NIGHTSDRILL9D}, // S_NIGHTSDRILL9C
+	{SPR_NDRL, 35, 2, NULL, 0, 0, S_NIGHTSDRILL9A}, // S_NIGHTSDRILL9D
 
 	// Nights Player, Falling
-	{SPR_SUPZ, 0, 1, {NULL}, 0, 0, S_NIGHTSHURT2},   // S_NIGHTSHURT1
-	{SPR_SUPZ, 1, 1, {NULL}, 0, 0, S_NIGHTSHURT3},   // S_NIGHTSHURT2
-	{SPR_SUPZ, 2, 1, {NULL}, 0, 0, S_NIGHTSHURT4},   // S_NIGHTSHURT3
-	{SPR_SUPZ, 3, 1, {NULL}, 0, 0, S_NIGHTSHURT5},   // S_NIGHTSHURT4
-	{SPR_SUPZ, 4, 1, {NULL}, 0, 0, S_NIGHTSHURT6},   // S_NIGHTSHURT5
-	{SPR_SUPZ, 5, 1, {NULL}, 0, 0, S_NIGHTSHURT7},   // S_NIGHTSHURT6
-	{SPR_SUPZ, 6, 1, {NULL}, 0, 0, S_NIGHTSHURT8},   // S_NIGHTSHURT7
-	{SPR_SUPZ, 7, 1, {NULL}, 0, 0, S_NIGHTSHURT9},   // S_NIGHTSHURT8
-	{SPR_SUPZ, 8, 1, {NULL}, 0, 0, S_NIGHTSHURT10},  // S_NIGHTSHURT9
-	{SPR_SUPZ, 9, 1, {NULL}, 0, 0, S_NIGHTSHURT11},  // S_NIGHTSHURT10
-	{SPR_SUPZ, 10, 1, {NULL}, 0, 0, S_NIGHTSHURT12}, // S_NIGHTSHURT11
-	{SPR_SUPZ, 11, 1, {NULL}, 0, 0, S_NIGHTSHURT13}, // S_NIGHTSHURT12
-	{SPR_SUPZ, 12, 1, {NULL}, 0, 0, S_NIGHTSHURT14}, // S_NIGHTSHURT13
-	{SPR_SUPZ, 13, 1, {NULL}, 0, 0, S_NIGHTSHURT15}, // S_NIGHTSHURT14
-	{SPR_SUPZ, 14, 1, {NULL}, 0, 0, S_NIGHTSHURT16}, // S_NIGHTSHURT15
-	{SPR_SUPZ, 15, 1, {NULL}, 0, 0, S_NIGHTSHURT17}, // S_NIGHTSHURT16
-	{SPR_SUPZ, 0, 1, {NULL}, 0, 0, S_NIGHTSHURT18},  // S_NIGHTSHURT17
-	{SPR_SUPZ, 1, 1, {NULL}, 0, 0, S_NIGHTSHURT19},  // S_NIGHTSHURT18
-	{SPR_SUPZ, 2, 1, {NULL}, 0, 0, S_NIGHTSHURT20},  // S_NIGHTSHURT19
-	{SPR_SUPZ, 3, 1, {NULL}, 0, 0, S_NIGHTSHURT21},  // S_NIGHTSHURT20
-	{SPR_SUPZ, 4, 1, {NULL}, 0, 0, S_NIGHTSHURT22},  // S_NIGHTSHURT21
-	{SPR_SUPZ, 5, 1, {NULL}, 0, 0, S_NIGHTSHURT23},  // S_NIGHTSHURT22
-	{SPR_SUPZ, 6, 1, {NULL}, 0, 0, S_NIGHTSHURT24},  // S_NIGHTSHURT23
-	{SPR_SUPZ, 7, 1, {NULL}, 0, 0, S_NIGHTSHURT25},  // S_NIGHTSHURT24
-	{SPR_SUPZ, 8, 1, {NULL}, 0, 0, S_NIGHTSHURT26},  // S_NIGHTSHURT25
-	{SPR_SUPZ, 9, 1, {NULL}, 0, 0, S_NIGHTSHURT27},  // S_NIGHTSHURT26
-	{SPR_SUPZ, 10, 1, {NULL}, 0, 0, S_NIGHTSHURT28}, // S_NIGHTSHURT27
-	{SPR_SUPZ, 11, 1, {NULL}, 0, 0, S_NIGHTSHURT29}, // S_NIGHTSHURT28
-	{SPR_SUPZ, 12, 1, {NULL}, 0, 0, S_NIGHTSHURT30}, // S_NIGHTSHURT29
-	{SPR_SUPZ, 13, 1, {NULL}, 0, 0, S_NIGHTSHURT31}, // S_NIGHTSHURT30
-	{SPR_SUPZ, 14, 1, {NULL}, 0, 0, S_NIGHTSHURT32}, // S_NIGHTSHURT31
-	{SPR_SUPZ, 15, 1, {NULL}, 0, 0, S_NIGHTSFLY1A},  // S_NIGHTSHURT32
+	{SPR_SUPZ, 0, 1, NULL, 0, 0, S_NIGHTSHURT2},   // S_NIGHTSHURT1
+	{SPR_SUPZ, 1, 1, NULL, 0, 0, S_NIGHTSHURT3},   // S_NIGHTSHURT2
+	{SPR_SUPZ, 2, 1, NULL, 0, 0, S_NIGHTSHURT4},   // S_NIGHTSHURT3
+	{SPR_SUPZ, 3, 1, NULL, 0, 0, S_NIGHTSHURT5},   // S_NIGHTSHURT4
+	{SPR_SUPZ, 4, 1, NULL, 0, 0, S_NIGHTSHURT6},   // S_NIGHTSHURT5
+	{SPR_SUPZ, 5, 1, NULL, 0, 0, S_NIGHTSHURT7},   // S_NIGHTSHURT6
+	{SPR_SUPZ, 6, 1, NULL, 0, 0, S_NIGHTSHURT8},   // S_NIGHTSHURT7
+	{SPR_SUPZ, 7, 1, NULL, 0, 0, S_NIGHTSHURT9},   // S_NIGHTSHURT8
+	{SPR_SUPZ, 8, 1, NULL, 0, 0, S_NIGHTSHURT10},  // S_NIGHTSHURT9
+	{SPR_SUPZ, 9, 1, NULL, 0, 0, S_NIGHTSHURT11},  // S_NIGHTSHURT10
+	{SPR_SUPZ, 10, 1, NULL, 0, 0, S_NIGHTSHURT12}, // S_NIGHTSHURT11
+	{SPR_SUPZ, 11, 1, NULL, 0, 0, S_NIGHTSHURT13}, // S_NIGHTSHURT12
+	{SPR_SUPZ, 12, 1, NULL, 0, 0, S_NIGHTSHURT14}, // S_NIGHTSHURT13
+	{SPR_SUPZ, 13, 1, NULL, 0, 0, S_NIGHTSHURT15}, // S_NIGHTSHURT14
+	{SPR_SUPZ, 14, 1, NULL, 0, 0, S_NIGHTSHURT16}, // S_NIGHTSHURT15
+	{SPR_SUPZ, 15, 1, NULL, 0, 0, S_NIGHTSHURT17}, // S_NIGHTSHURT16
+	{SPR_SUPZ, 0, 1, NULL, 0, 0, S_NIGHTSHURT18},  // S_NIGHTSHURT17
+	{SPR_SUPZ, 1, 1, NULL, 0, 0, S_NIGHTSHURT19},  // S_NIGHTSHURT18
+	{SPR_SUPZ, 2, 1, NULL, 0, 0, S_NIGHTSHURT20},  // S_NIGHTSHURT19
+	{SPR_SUPZ, 3, 1, NULL, 0, 0, S_NIGHTSHURT21},  // S_NIGHTSHURT20
+	{SPR_SUPZ, 4, 1, NULL, 0, 0, S_NIGHTSHURT22},  // S_NIGHTSHURT21
+	{SPR_SUPZ, 5, 1, NULL, 0, 0, S_NIGHTSHURT23},  // S_NIGHTSHURT22
+	{SPR_SUPZ, 6, 1, NULL, 0, 0, S_NIGHTSHURT24},  // S_NIGHTSHURT23
+	{SPR_SUPZ, 7, 1, NULL, 0, 0, S_NIGHTSHURT25},  // S_NIGHTSHURT24
+	{SPR_SUPZ, 8, 1, NULL, 0, 0, S_NIGHTSHURT26},  // S_NIGHTSHURT25
+	{SPR_SUPZ, 9, 1, NULL, 0, 0, S_NIGHTSHURT27},  // S_NIGHTSHURT26
+	{SPR_SUPZ, 10, 1, NULL, 0, 0, S_NIGHTSHURT28}, // S_NIGHTSHURT27
+	{SPR_SUPZ, 11, 1, NULL, 0, 0, S_NIGHTSHURT29}, // S_NIGHTSHURT28
+	{SPR_SUPZ, 12, 1, NULL, 0, 0, S_NIGHTSHURT30}, // S_NIGHTSHURT29
+	{SPR_SUPZ, 13, 1, NULL, 0, 0, S_NIGHTSHURT31}, // S_NIGHTSHURT30
+	{SPR_SUPZ, 14, 1, NULL, 0, 0, S_NIGHTSHURT32}, // S_NIGHTSHURT31
+	{SPR_SUPZ, 15, 1, NULL, 0, 0, S_NIGHTSFLY1A},  // S_NIGHTSHURT32
 
 	// Nights Sparkle
-	{SPR_NSPK, FF_FULLBRIGHT, 140, {NULL}, 0, 0, S_NIGHTSPARKLE2},   // S_NIGHTSPARKLE1
-	{SPR_NSPK, FF_FULLBRIGHT|1, 7, {NULL}, 0, 0, S_NIGHTSPARKLE3},   // S_NIGHTSPARKLE2
-	{SPR_NSPK, FF_FULLBRIGHT|2, 7, {NULL}, 0, 0, S_NIGHTSPARKLE4},   // S_NIGHTSPARKLE3
-	{SPR_NSPK, FF_FULLBRIGHT|3, 7, {NULL}, 0, 0, S_NULL},            // S_NIGHTSPARKLE4
+	{SPR_NSPK, FF_FULLBRIGHT, 140, NULL, 0, 0, S_NIGHTSPARKLE2},   // S_NIGHTSPARKLE1
+	{SPR_NSPK, FF_FULLBRIGHT|1, 7, NULL, 0, 0, S_NIGHTSPARKLE3},   // S_NIGHTSPARKLE2
+	{SPR_NSPK, FF_FULLBRIGHT|2, 7, NULL, 0, 0, S_NIGHTSPARKLE4},   // S_NIGHTSPARKLE3
+	{SPR_NSPK, FF_FULLBRIGHT|3, 7, NULL, 0, 0, S_NULL},            // S_NIGHTSPARKLE4
 
 	// Red Sparkle
-	{SPR_NSPK, FF_FULLBRIGHT|4, 140, {NULL}, 0, 0, S_NIGHTSPARKLESUPER2}, // S_NIGHTSPARKLESUPER1
-	{SPR_NSPK, FF_FULLBRIGHT|5, 7, {NULL}, 0, 0, S_NIGHTSPARKLESUPER3},   // S_NIGHTSPARKLESUPER2
-	{SPR_NSPK, FF_FULLBRIGHT|6, 7, {NULL}, 0, 0, S_NIGHTSPARKLESUPER4},   // S_NIGHTSPARKLESUPER3
-	{SPR_NSPK, FF_FULLBRIGHT|7, 7, {NULL}, 0, 0, S_NULL},                 // S_NIGHTSPARKLESUPER4
+	{SPR_NSPK, FF_FULLBRIGHT|4, 140, NULL, 0, 0, S_NIGHTSPARKLESUPER2}, // S_NIGHTSPARKLESUPER1
+	{SPR_NSPK, FF_FULLBRIGHT|5, 7, NULL, 0, 0, S_NIGHTSPARKLESUPER3},   // S_NIGHTSPARKLESUPER2
+	{SPR_NSPK, FF_FULLBRIGHT|6, 7, NULL, 0, 0, S_NIGHTSPARKLESUPER4},   // S_NIGHTSPARKLESUPER3
+	{SPR_NSPK, FF_FULLBRIGHT|7, 7, NULL, 0, 0, S_NULL},                 // S_NIGHTSPARKLESUPER4
 
 	// Paraloop helper -- THIS IS WHAT DETERMINES THE TIMER NOW
-	{SPR_NULL, 0, 160, {NULL}, 0, 0, S_NULL}, // S_NIGHTSLOOPHELPER
+	{SPR_NULL, 0, 160, NULL, 0, 0, S_NULL}, // S_NIGHTSLOOPHELPER
 
 	// NiGHTS bumper
-	{SPR_NBMP, 0, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER1
-	{SPR_NBMP, 1, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER2
-	{SPR_NBMP, 2, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER3
-	{SPR_NBMP, 3, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER4
-	{SPR_NBMP, 4, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER5
-	{SPR_NBMP, 5, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER6
-	{SPR_NBMP, 6, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER7
-	{SPR_NBMP, 7, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER8
-	{SPR_NBMP, 8, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER9
-	{SPR_NBMP, 9, -1, {NULL}, 0, 0, S_NULL},  // S_NIGHTSBUMPER10
-	{SPR_NBMP, 10, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSBUMPER11
-	{SPR_NBMP, 11, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSBUMPER12
+	{SPR_NBMP, 0, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER1
+	{SPR_NBMP, 1, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER2
+	{SPR_NBMP, 2, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER3
+	{SPR_NBMP, 3, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER4
+	{SPR_NBMP, 4, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER5
+	{SPR_NBMP, 5, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER6
+	{SPR_NBMP, 6, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER7
+	{SPR_NBMP, 7, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER8
+	{SPR_NBMP, 8, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER9
+	{SPR_NBMP, 9, -1, NULL, 0, 0, S_NULL},  // S_NIGHTSBUMPER10
+	{SPR_NBMP, 10, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSBUMPER11
+	{SPR_NBMP, 11, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSBUMPER12
 
-	{SPR_HOOP, 0, -1, {NULL}, 0, 0, S_NULL}, // S_HOOP
-	{SPR_HOOP, 1, -1, {NULL}, 0, 0, S_NULL}, // S_HOOP_XMASA
-	{SPR_HOOP, 2, -1, {NULL}, 0, 0, S_NULL}, // S_HOOP_XMASB
+	{SPR_HOOP, 0, -1, NULL, 0, 0, S_NULL}, // S_HOOP
+	{SPR_HOOP, 1, -1, NULL, 0, 0, S_NULL}, // S_HOOP_XMASA
+	{SPR_HOOP, 2, -1, NULL, 0, 0, S_NULL}, // S_HOOP_XMASB
 
-	{SPR_NSCR, FF_FULLBRIGHT,    -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE10
-	{SPR_NSCR, FF_FULLBRIGHT|1,  -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE20
-	{SPR_NSCR, FF_FULLBRIGHT|2,  -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE30
-	{SPR_NSCR, FF_FULLBRIGHT|3,  -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE40
-	{SPR_NSCR, FF_FULLBRIGHT|4,  -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE50
-	{SPR_NSCR, FF_FULLBRIGHT|5,  -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE60
-	{SPR_NSCR, FF_FULLBRIGHT|6,  -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE70
-	{SPR_NSCR, FF_FULLBRIGHT|7,  -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE80
-	{SPR_NSCR, FF_FULLBRIGHT|8,  -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE90
-	{SPR_NSCR, FF_FULLBRIGHT|9,  -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE100
-	{SPR_NSCR, FF_FULLBRIGHT|10, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE10_2
-	{SPR_NSCR, FF_FULLBRIGHT|11, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE20_2
-	{SPR_NSCR, FF_FULLBRIGHT|12, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE30_2
-	{SPR_NSCR, FF_FULLBRIGHT|13, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE40_2
-	{SPR_NSCR, FF_FULLBRIGHT|14, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE50_2
-	{SPR_NSCR, FF_FULLBRIGHT|15, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE60_2
-	{SPR_NSCR, FF_FULLBRIGHT|16, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE70_2
-	{SPR_NSCR, FF_FULLBRIGHT|17, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE80_2
-	{SPR_NSCR, FF_FULLBRIGHT|18, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE90_2
-	{SPR_NSCR, FF_FULLBRIGHT|19, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSCORE100_2
+	{SPR_NSCR, FF_FULLBRIGHT,    -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE10
+	{SPR_NSCR, FF_FULLBRIGHT|1,  -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE20
+	{SPR_NSCR, FF_FULLBRIGHT|2,  -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE30
+	{SPR_NSCR, FF_FULLBRIGHT|3,  -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE40
+	{SPR_NSCR, FF_FULLBRIGHT|4,  -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE50
+	{SPR_NSCR, FF_FULLBRIGHT|5,  -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE60
+	{SPR_NSCR, FF_FULLBRIGHT|6,  -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE70
+	{SPR_NSCR, FF_FULLBRIGHT|7,  -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE80
+	{SPR_NSCR, FF_FULLBRIGHT|8,  -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE90
+	{SPR_NSCR, FF_FULLBRIGHT|9,  -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE100
+	{SPR_NSCR, FF_FULLBRIGHT|10, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE10_2
+	{SPR_NSCR, FF_FULLBRIGHT|11, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE20_2
+	{SPR_NSCR, FF_FULLBRIGHT|12, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE30_2
+	{SPR_NSCR, FF_FULLBRIGHT|13, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE40_2
+	{SPR_NSCR, FF_FULLBRIGHT|14, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE50_2
+	{SPR_NSCR, FF_FULLBRIGHT|15, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE60_2
+	{SPR_NSCR, FF_FULLBRIGHT|16, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE70_2
+	{SPR_NSCR, FF_FULLBRIGHT|17, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE80_2
+	{SPR_NSCR, FF_FULLBRIGHT|18, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE90_2
+	{SPR_NSCR, FF_FULLBRIGHT|19, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSCORE100_2
 
-	{SPR_NWNG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSWING
-	{SPR_NWNG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSWING_XMAS
+	{SPR_NWNG, 0, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSWING
+	{SPR_NWNG, 1, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSWING_XMAS
 
 	// NiGHTS Paraloop Powerups
-	{SPR_NULL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP1
-	{SPR_NPRU, 0, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP2
-	{SPR_NULL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP3
-	{SPR_NPRU, 1, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP4
-	{SPR_NULL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP5
-	{SPR_NPRU, 2, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP6
-	{SPR_NULL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP7
-	{SPR_NPRU, 3, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP8
-	{SPR_NULL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP9
-	{SPR_NPRU, 4, -1, {NULL}, 0, 0, S_NULL}, // S_NIGHTSPOWERUP10
+	{SPR_NULL, 0, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP1
+	{SPR_NPRU, 0, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP2
+	{SPR_NULL, 0, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP3
+	{SPR_NPRU, 1, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP4
+	{SPR_NULL, 0, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP5
+	{SPR_NPRU, 2, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP6
+	{SPR_NULL, 0, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP7
+	{SPR_NPRU, 3, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP8
+	{SPR_NULL, 0, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP9
+	{SPR_NPRU, 4, -1, NULL, 0, 0, S_NULL}, // S_NIGHTSPOWERUP10
 
-	{SPR_CAPS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_EGGCAPSULE
+	{SPR_CAPS, 0, -1, NULL, 0, 0, S_NULL}, // S_EGGCAPSULE
 
 	// Orbiting Chaos Emeralds for NiGHTS
-	{SPR_CEMG, FF_FULLBRIGHT,   1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM1}, // S_ORBITEM1
-	{SPR_CEMG, FF_FULLBRIGHT|1, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM2}, // S_ORBITEM2
-	{SPR_CEMG, FF_FULLBRIGHT|2, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM3}, // S_ORBITEM3
-	{SPR_CEMG, FF_FULLBRIGHT|3, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM4}, // S_ORBITEM4
-	{SPR_CEMG, FF_FULLBRIGHT|4, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM5}, // S_ORBITEM5
-	{SPR_CEMG, FF_FULLBRIGHT|5, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM6}, // S_ORBITEM6
-	{SPR_CEMG, FF_FULLBRIGHT|6, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM7}, // S_ORBITEM7
-	{SPR_CEMG, FF_FULLBRIGHT|7, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM8
-	{SPR_CEMG, FF_FULLBRIGHT|8, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM9
-	{SPR_CEMG, FF_FULLBRIGHT|9, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM10
-	{SPR_CEMG, FF_FULLBRIGHT|10, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM11
-	{SPR_CEMG, FF_FULLBRIGHT|11, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM12
-	{SPR_CEMG, FF_FULLBRIGHT|12, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM13
-	{SPR_CEMG, FF_FULLBRIGHT|13, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM14
-	{SPR_CEMG, FF_FULLBRIGHT|14, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM15
-	{SPR_CEMG, FF_FULLBRIGHT|15, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM16
+	{SPR_CEMG, FF_FULLBRIGHT,   1, A_OrbitNights, ANG2*2, 0, S_ORBITEM1}, // S_ORBITEM1
+	{SPR_CEMG, FF_FULLBRIGHT|1, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM2}, // S_ORBITEM2
+	{SPR_CEMG, FF_FULLBRIGHT|2, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM3}, // S_ORBITEM3
+	{SPR_CEMG, FF_FULLBRIGHT|3, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM4}, // S_ORBITEM4
+	{SPR_CEMG, FF_FULLBRIGHT|4, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM5}, // S_ORBITEM5
+	{SPR_CEMG, FF_FULLBRIGHT|5, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM6}, // S_ORBITEM6
+	{SPR_CEMG, FF_FULLBRIGHT|6, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM7}, // S_ORBITEM7
+	{SPR_CEMG, FF_FULLBRIGHT|7, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM8
+	{SPR_CEMG, FF_FULLBRIGHT|8, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM9
+	{SPR_CEMG, FF_FULLBRIGHT|9, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM10
+	{SPR_CEMG, FF_FULLBRIGHT|10, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM11
+	{SPR_CEMG, FF_FULLBRIGHT|11, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM12
+	{SPR_CEMG, FF_FULLBRIGHT|12, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM13
+	{SPR_CEMG, FF_FULLBRIGHT|13, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM14
+	{SPR_CEMG, FF_FULLBRIGHT|14, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM15
+	{SPR_CEMG, FF_FULLBRIGHT|15, 1, A_OrbitNights, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM16
 
 	// Flicky helper for NiGHTS
-	{SPR_BIRD, 0, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER2}, // S_NIGHTOPIANHELPER1
-	{SPR_BIRD, 0, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER3}, // S_NIGHTOPIANHELPER2
-	{SPR_BIRD, 0, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER4}, // S_NIGHTOPIANHELPER3
-	{SPR_BIRD, 0, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER5}, // S_NIGHTOPIANHELPER4
-	{SPR_BIRD, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER6}, // S_NIGHTOPIANHELPER5
-	{SPR_BIRD, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER7}, // S_NIGHTOPIANHELPER6
-	{SPR_BIRD, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER8}, // S_NIGHTOPIANHELPER7
-	{SPR_BIRD, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1}, // S_NIGHTOPIANHELPER8
+	{SPR_BIRD, 0, 1, A_OrbitNights, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER2}, // S_NIGHTOPIANHELPER1
+	{SPR_BIRD, 0, 1, A_OrbitNights, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER3}, // S_NIGHTOPIANHELPER2
+	{SPR_BIRD, 0, 1, A_OrbitNights, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER4}, // S_NIGHTOPIANHELPER3
+	{SPR_BIRD, 0, 1, A_OrbitNights, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER5}, // S_NIGHTOPIANHELPER4
+	{SPR_BIRD, 1, 1, A_OrbitNights, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER6}, // S_NIGHTOPIANHELPER5
+	{SPR_BIRD, 1, 1, A_OrbitNights, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER7}, // S_NIGHTOPIANHELPER6
+	{SPR_BIRD, 1, 1, A_OrbitNights, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER8}, // S_NIGHTOPIANHELPER7
+	{SPR_BIRD, 1, 1, A_OrbitNights, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1}, // S_NIGHTOPIANHELPER8
 
-	{SPR_NULL, 0, 35, {NULL}, 0, 0, S_CRUMBLE2},  // S_CRUMBLE1
-	{SPR_NULL, 0, 105, {A_Scream}, 0, 0, S_NULL}, // S_CRUMBLE2
+	{SPR_NULL, 0, 35, NULL, 0, 0, S_CRUMBLE2},  // S_CRUMBLE1
+	{SPR_NULL, 0, 105, A_Scream, 0, 0, S_NULL}, // S_CRUMBLE2
 
-	{SPR_SUPT,               0,  4, {A_Scream}, 0, 0,  S_SUPERTRANS2}, // S_SUPERTRANS1
-	{SPR_SUPT,               1,  4, {NULL}, 0, 0,  S_SUPERTRANS3}, // S_SUPERTRANS2
-	{SPR_SUPT, FF_FULLBRIGHT|2,  4, {NULL}, 0, 0,  S_SUPERTRANS4}, // S_SUPERTRANS3
-	{SPR_SUPT,               3,  3, {NULL}, 0, 0,  S_SUPERTRANS5}, // S_SUPERTRANS4
-	{SPR_SUPT,               4,  3, {NULL}, 0, 0,  S_SUPERTRANS6}, // S_SUPERTRANS5
-	{SPR_SUPT,               5,  3, {NULL}, 0, 0,  S_SUPERTRANS7}, // S_SUPERTRANS6
-	{SPR_SUPT,               6,  3, {NULL}, 0, 0,  S_SUPERTRANS8}, // S_SUPERTRANS7
-	{SPR_SUPT,               7,  3, {NULL}, 0, 0,  S_SUPERTRANS9}, // S_SUPERTRANS8
-	{SPR_SUPT,               8, 16, {NULL}, 0, 0, S_NIGHTSDRONE1}, // S_SUPERTRANS9
+	{SPR_SUPT,               0,  4, A_Scream, 0, 0,  S_SUPERTRANS2}, // S_SUPERTRANS1
+	{SPR_SUPT,               1,  4, NULL, 0, 0,  S_SUPERTRANS3}, // S_SUPERTRANS2
+	{SPR_SUPT, FF_FULLBRIGHT|2,  4, NULL, 0, 0,  S_SUPERTRANS4}, // S_SUPERTRANS3
+	{SPR_SUPT,               3,  3, NULL, 0, 0,  S_SUPERTRANS5}, // S_SUPERTRANS4
+	{SPR_SUPT,               4,  3, NULL, 0, 0,  S_SUPERTRANS6}, // S_SUPERTRANS5
+	{SPR_SUPT,               5,  3, NULL, 0, 0,  S_SUPERTRANS7}, // S_SUPERTRANS6
+	{SPR_SUPT,               6,  3, NULL, 0, 0,  S_SUPERTRANS8}, // S_SUPERTRANS7
+	{SPR_SUPT,               7,  3, NULL, 0, 0,  S_SUPERTRANS9}, // S_SUPERTRANS8
+	{SPR_SUPT,               8, 16, NULL, 0, 0, S_NIGHTSDRONE1}, // S_SUPERTRANS9
 
 	// Spark
-	{SPR_SPRK, FF_TRANS40  , 1, {NULL}, 0, 0, S_SPRK2},  // S_SPRK1
-	{SPR_SPRK, FF_TRANS50|1, 1, {NULL}, 0, 0, S_SPRK3},  // S_SPRK2
-	{SPR_SPRK, FF_TRANS50|2, 1, {NULL}, 0, 0, S_SPRK4},  // S_SPRK3
-	{SPR_SPRK, FF_TRANS50|3, 1, {NULL}, 0, 0, S_SPRK5},  // S_SPRK4
-	{SPR_SPRK, FF_TRANS60  , 1, {NULL}, 0, 0, S_SPRK6},  // S_SPRK5
-	{SPR_SPRK, FF_TRANS60|1, 1, {NULL}, 0, 0, S_SPRK7},  // S_SPRK6
-	{SPR_SPRK, FF_TRANS60|2, 1, {NULL}, 0, 0, S_SPRK8},  // S_SPRK7
-	{SPR_SPRK, FF_TRANS70|3, 1, {NULL}, 0, 0, S_SPRK9},  // S_SPRK8
-	{SPR_SPRK, FF_TRANS70  , 1, {NULL}, 0, 0, S_SPRK10}, // S_SPRK9
-	{SPR_SPRK, FF_TRANS70|1, 1, {NULL}, 0, 0, S_SPRK11}, // S_SPRK10
-	{SPR_SPRK, FF_TRANS80|2, 1, {NULL}, 0, 0, S_SPRK12}, // S_SPRK11
-	{SPR_SPRK, FF_TRANS80|3, 1, {NULL}, 0, 0, S_SPRK13}, // S_SPRK12
-	{SPR_SPRK, FF_TRANS80  , 1, {NULL}, 0, 0, S_SPRK14}, // S_SPRK13
-	{SPR_SPRK, FF_TRANS90|1, 1, {NULL}, 0, 0, S_SPRK15}, // S_SPRK14
-	{SPR_SPRK, FF_TRANS90|2, 1, {NULL}, 0, 0, S_SPRK16}, // S_SPRK15
-	{SPR_SPRK, FF_TRANS90|3, 1, {NULL}, 0, 0, S_NULL},   // S_SPRK16
+	{SPR_SPRK, FF_TRANS40  , 1, NULL, 0, 0, S_SPRK2},  // S_SPRK1
+	{SPR_SPRK, FF_TRANS50|1, 1, NULL, 0, 0, S_SPRK3},  // S_SPRK2
+	{SPR_SPRK, FF_TRANS50|2, 1, NULL, 0, 0, S_SPRK4},  // S_SPRK3
+	{SPR_SPRK, FF_TRANS50|3, 1, NULL, 0, 0, S_SPRK5},  // S_SPRK4
+	{SPR_SPRK, FF_TRANS60  , 1, NULL, 0, 0, S_SPRK6},  // S_SPRK5
+	{SPR_SPRK, FF_TRANS60|1, 1, NULL, 0, 0, S_SPRK7},  // S_SPRK6
+	{SPR_SPRK, FF_TRANS60|2, 1, NULL, 0, 0, S_SPRK8},  // S_SPRK7
+	{SPR_SPRK, FF_TRANS70|3, 1, NULL, 0, 0, S_SPRK9},  // S_SPRK8
+	{SPR_SPRK, FF_TRANS70  , 1, NULL, 0, 0, S_SPRK10}, // S_SPRK9
+	{SPR_SPRK, FF_TRANS70|1, 1, NULL, 0, 0, S_SPRK11}, // S_SPRK10
+	{SPR_SPRK, FF_TRANS80|2, 1, NULL, 0, 0, S_SPRK12}, // S_SPRK11
+	{SPR_SPRK, FF_TRANS80|3, 1, NULL, 0, 0, S_SPRK13}, // S_SPRK12
+	{SPR_SPRK, FF_TRANS80  , 1, NULL, 0, 0, S_SPRK14}, // S_SPRK13
+	{SPR_SPRK, FF_TRANS90|1, 1, NULL, 0, 0, S_SPRK15}, // S_SPRK14
+	{SPR_SPRK, FF_TRANS90|2, 1, NULL, 0, 0, S_SPRK16}, // S_SPRK15
+	{SPR_SPRK, FF_TRANS90|3, 1, NULL, 0, 0, S_NULL},   // S_SPRK16
 
 	// Robot Explosion
-	{SPR_BOM1, 0, 1, {A_Scream}, 0, 0, S_XPLD2}, // S_XPLD1
-	{SPR_BOM1, 1, 5, {NULL}, 0, 0, S_XPLD3},     // S_XPLD2
-	{SPR_BOM1, 2, 5, {NULL}, 0, 0, S_XPLD4},     // S_XPLD3
-	{SPR_BOM1, 3, 5, {NULL}, 0, 0, S_NULL},      // S_XPLD4
+	{SPR_BOM1, 0, 1, A_Scream, 0, 0, S_XPLD2}, // S_XPLD1
+	{SPR_BOM1, 1, 5, NULL, 0, 0, S_XPLD3},     // S_XPLD2
+	{SPR_BOM1, 2, 5, NULL, 0, 0, S_XPLD4},     // S_XPLD3
+	{SPR_BOM1, 3, 5, NULL, 0, 0, S_NULL},      // S_XPLD4
 
 	// Underwater Explosion
-	{SPR_BOM4, 0, 3, {A_Scream}, 0, 0, S_WPLD2}, // S_WPLD1
-	{SPR_BOM4, 1, 3, {NULL},     0, 0, S_WPLD3}, // S_WPLD2
-	{SPR_BOM4, 2, 3, {NULL},     0, 0, S_WPLD4}, // S_WPLD3
-	{SPR_BOM4, 3, 3, {NULL},     0, 0, S_WPLD5}, // S_WPLD4
-	{SPR_BOM4, 4, 3, {NULL},     0, 0, S_WPLD6}, // S_WPLD5
-	{SPR_BOM4, 5, 3, {NULL},     0, 0, S_NULL},  // S_WPLD6
+	{SPR_BOM4, 0, 3, A_Scream, 0, 0, S_WPLD2}, // S_WPLD1
+	{SPR_BOM4, 1, 3, NULL,     0, 0, S_WPLD3}, // S_WPLD2
+	{SPR_BOM4, 2, 3, NULL,     0, 0, S_WPLD4}, // S_WPLD3
+	{SPR_BOM4, 3, 3, NULL,     0, 0, S_WPLD5}, // S_WPLD4
+	{SPR_BOM4, 4, 3, NULL,     0, 0, S_WPLD6}, // S_WPLD5
+	{SPR_BOM4, 5, 3, NULL,     0, 0, S_NULL},  // S_WPLD6
 
-	{SPR_NULL, 0, 1, {A_RockSpawn}, 0, 0, S_ROCKSPAWN}, // S_ROCKSPAWN
+	{SPR_NULL, 0, 1, A_RockSpawn, 0, 0, S_ROCKSPAWN}, // S_ROCKSPAWN
 
-	{SPR_ROIA, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEA}, // S_ROCKCRUMBLEA
-	{SPR_ROIB, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEB}, // S_ROCKCRUMBLEB
-	{SPR_ROIC, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEC}, // S_ROCKCRUMBLEC
-	{SPR_ROID, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLED}, // S_ROCKCRUMBLED
-	{SPR_ROIE, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEE}, // S_ROCKCRUMBLEE
-	{SPR_ROIF, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEF}, // S_ROCKCRUMBLEF
-	{SPR_ROIG, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEG}, // S_ROCKCRUMBLEG
-	{SPR_ROIH, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEH}, // S_ROCKCRUMBLEH
-	{SPR_ROII, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEI}, // S_ROCKCRUMBLEI
-	{SPR_ROIJ, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEJ}, // S_ROCKCRUMBLEJ
-	{SPR_ROIK, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEK}, // S_ROCKCRUMBLEK
-	{SPR_ROIL, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEL}, // S_ROCKCRUMBLEL
-	{SPR_ROIM, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEM}, // S_ROCKCRUMBLEM
-	{SPR_ROIN, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEN}, // S_ROCKCRUMBLEN
-	{SPR_ROIO, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEO}, // S_ROCKCRUMBLEO
-	{SPR_ROIP, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEP}, // S_ROCKCRUMBLEP
+	{SPR_ROIA, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEA}, // S_ROCKCRUMBLEA
+	{SPR_ROIB, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEB}, // S_ROCKCRUMBLEB
+	{SPR_ROIC, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEC}, // S_ROCKCRUMBLEC
+	{SPR_ROID, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLED}, // S_ROCKCRUMBLED
+	{SPR_ROIE, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEE}, // S_ROCKCRUMBLEE
+	{SPR_ROIF, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEF}, // S_ROCKCRUMBLEF
+	{SPR_ROIG, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEG}, // S_ROCKCRUMBLEG
+	{SPR_ROIH, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEH}, // S_ROCKCRUMBLEH
+	{SPR_ROII, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEI}, // S_ROCKCRUMBLEI
+	{SPR_ROIJ, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEJ}, // S_ROCKCRUMBLEJ
+	{SPR_ROIK, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEK}, // S_ROCKCRUMBLEK
+	{SPR_ROIL, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEL}, // S_ROCKCRUMBLEL
+	{SPR_ROIM, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEM}, // S_ROCKCRUMBLEM
+	{SPR_ROIN, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEN}, // S_ROCKCRUMBLEN
+	{SPR_ROIO, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEO}, // S_ROCKCRUMBLEO
+	{SPR_ROIP, FF_ANIMATE, -1, NULL, 4, 2, S_ROCKCRUMBLEP}, // S_ROCKCRUMBLEP
 
-	{SPR_SRBA, 0, 5, {A_Look}, 0, 0, S_SRB1_CRAWLA1}, // S_SRB1_CRAWLA1
-	{SPR_SRBA, 0, 3, {A_Chase}, 0, 0, S_SRB1_CRAWLA3}, // S_SRB1_CRAWLA2
-	{SPR_SRBA, 1, 3, {A_Chase}, 0, 0, S_SRB1_CRAWLA4}, // S_SRB1_CRAWLA3
-	{SPR_SRBA, 2, 3, {A_Chase}, 0, 0, S_SRB1_CRAWLA2}, // S_SRB1_CRAWLA4
+	{SPR_SRBA, 0, 5, A_Look, 0, 0, S_SRB1_CRAWLA1}, // S_SRB1_CRAWLA1
+	{SPR_SRBA, 0, 3, A_Chase, 0, 0, S_SRB1_CRAWLA3}, // S_SRB1_CRAWLA2
+	{SPR_SRBA, 1, 3, A_Chase, 0, 0, S_SRB1_CRAWLA4}, // S_SRB1_CRAWLA3
+	{SPR_SRBA, 2, 3, A_Chase, 0, 0, S_SRB1_CRAWLA2}, // S_SRB1_CRAWLA4
 
-	{SPR_SRBB, 0, 2, {A_Look}, 0, 0, S_SRB1_BAT2}, // S_SRB1_BAT1
-	{SPR_SRBB, 1, 2, {A_Look}, 0, 0, S_SRB1_BAT1}, // S_SRB1_BAT2
-	{SPR_SRBB, 0, 2, {A_BuzzFly}, 0, 0, S_SRB1_BAT4}, // S_SRB1_BAT3
-	{SPR_SRBB, 1, 2, {A_BuzzFly}, 0, 0, S_SRB1_BAT3}, // S_SRB1_BAT4
+	{SPR_SRBB, 0, 2, A_Look, 0, 0, S_SRB1_BAT2}, // S_SRB1_BAT1
+	{SPR_SRBB, 1, 2, A_Look, 0, 0, S_SRB1_BAT1}, // S_SRB1_BAT2
+	{SPR_SRBB, 0, 2, A_BuzzFly, 0, 0, S_SRB1_BAT4}, // S_SRB1_BAT3
+	{SPR_SRBB, 1, 2, A_BuzzFly, 0, 0, S_SRB1_BAT3}, // S_SRB1_BAT4
 
-	{SPR_SRBC, 0, 2, {A_Look}, 0, 0, S_SRB1_ROBOFISH1}, // S_SRB1_ROBOFISH1
-	{SPR_SRBC, 1, 2, {A_BuzzFly}, 0, 0, S_SRB1_ROBOFISH3}, // S_SRB1_ROBOFISH2
-	{SPR_SRBC, 0, 2, {A_BuzzFly}, 0, 0, S_SRB1_ROBOFISH2}, // S_SRB1_ROBOFISH3
+	{SPR_SRBC, 0, 2, A_Look, 0, 0, S_SRB1_ROBOFISH1}, // S_SRB1_ROBOFISH1
+	{SPR_SRBC, 1, 2, A_BuzzFly, 0, 0, S_SRB1_ROBOFISH3}, // S_SRB1_ROBOFISH2
+	{SPR_SRBC, 0, 2, A_BuzzFly, 0, 0, S_SRB1_ROBOFISH2}, // S_SRB1_ROBOFISH3
 
-	{SPR_SRBD, 0, 2, {A_Look}, 0, 0, S_SRB1_VOLCANOGUY1}, // S_SRB1_VOLCANOGUY1
-	{SPR_SRBD, 0, 2, {A_BuzzFly}, 0, 0, S_SRB1_VOLCANOGUY2}, // S_SRB1_VOLCANOGUY2
+	{SPR_SRBD, 0, 2, A_Look, 0, 0, S_SRB1_VOLCANOGUY1}, // S_SRB1_VOLCANOGUY1
+	{SPR_SRBD, 0, 2, A_BuzzFly, 0, 0, S_SRB1_VOLCANOGUY2}, // S_SRB1_VOLCANOGUY2
 
-	{SPR_SRBE, 0, 2, {A_BunnyHop}, 7, 2, S_SRB1_HOPPY2}, // S_SRB1_HOPPY1
-	{SPR_SRBE, 1, 2, {A_BunnyHop}, 7, -2, S_SRB1_HOPPY1}, // S_SRB1_HOPPY2
+	{SPR_SRBE, 0, 2, A_BunnyHop, 7, 2, S_SRB1_HOPPY2}, // S_SRB1_HOPPY1
+	{SPR_SRBE, 1, 2, A_BunnyHop, 7, -2, S_SRB1_HOPPY1}, // S_SRB1_HOPPY2
 
-	{SPR_SRBE, 0, 2, {A_BunnyHop}, 4, 2, S_SRB1_HOPPYWATER2}, // S_SRB1_HOPPYWATER1
-	{SPR_SRBE, 1, 2, {A_BunnyHop}, 4, -2, S_SRB1_HOPPYWATER1}, // S_SRB1_HOPPYWATER2
+	{SPR_SRBE, 0, 2, A_BunnyHop, 4, 2, S_SRB1_HOPPYWATER2}, // S_SRB1_HOPPYWATER1
+	{SPR_SRBE, 1, 2, A_BunnyHop, 4, -2, S_SRB1_HOPPYWATER1}, // S_SRB1_HOPPYWATER2
 
-	{SPR_SRBF, 0, 2, {A_BunnyHop}, 7, 0, S_SRB1_HOPPYSKYLAB1}, // S_SRB1_HOPPYSKYLAB1
+	{SPR_SRBF, 0, 2, A_BunnyHop, 7, 0, S_SRB1_HOPPYSKYLAB1}, // S_SRB1_HOPPYSKYLAB1
 
-	{SPR_SRBG, 0, 16, {A_MoveAbsolute}, 0, 5, S_SRB1_MMZFLYING2}, // S_SRB1_MMZFLYING1
-	{SPR_SRBG, 0, 16, {A_MoveAbsolute}, 180, 5, S_SRB1_MMZFLYING3}, // S_SRB1_MMZFLYING2
-	{SPR_SRBG, 0, 1, {A_MoveAbsolute}, 0, 5, S_SRB1_MMZFLYING4}, // S_SRB1_MMZFLYING3
-	{SPR_SRBG, 0, 7, {A_MoveAbsolute}, 0, 5, S_SRB1_MMZFLYING5}, // S_SRB1_MMZFLYING4
-	{SPR_SRBG, 0, 8, {A_MoveAbsolute}, 180, 5, S_SRB1_MMZFLYING1}, // S_SRB1_MMZFLYING5
+	{SPR_SRBG, 0, 16, A_MoveAbsolute, 0, 5, S_SRB1_MMZFLYING2}, // S_SRB1_MMZFLYING1
+	{SPR_SRBG, 0, 16, A_MoveAbsolute, 180, 5, S_SRB1_MMZFLYING3}, // S_SRB1_MMZFLYING2
+	{SPR_SRBG, 0, 1, A_MoveAbsolute, 0, 5, S_SRB1_MMZFLYING4}, // S_SRB1_MMZFLYING3
+	{SPR_SRBG, 0, 7, A_MoveAbsolute, 0, 5, S_SRB1_MMZFLYING5}, // S_SRB1_MMZFLYING4
+	{SPR_SRBG, 0, 8, A_MoveAbsolute, 180, 5, S_SRB1_MMZFLYING1}, // S_SRB1_MMZFLYING5
 
-	{SPR_SRBH, 0, 16, {A_MoveAbsolute}, 180, 5, S_SRB1_UFO2}, // S_SRB1_UFO1
-	{SPR_SRBH, 0, 16, {A_MoveAbsolute}, 0, 5, S_SRB1_UFO1}, // S_SRB1_UFO2
+	{SPR_SRBH, 0, 16, A_MoveAbsolute, 180, 5, S_SRB1_UFO2}, // S_SRB1_UFO1
+	{SPR_SRBH, 0, 16, A_MoveAbsolute, 0, 5, S_SRB1_UFO1}, // S_SRB1_UFO2
 
-	{SPR_SRBI, 0, 4, {A_MoveAbsolute}, 0, 7, S_SRB1_GRAYBOT2}, // S_SRB1_GRAYBOT1
-	{SPR_SRBI, 1, 4, {A_MoveAbsolute}, 0, 7, S_SRB1_GRAYBOT3}, // S_SRB1_GRAYBOT2
-	{SPR_SRBI, 0, 4, {A_MoveAbsolute}, 0, 7, S_SRB1_GRAYBOT4}, // S_SRB1_GRAYBOT3
-	{SPR_SRBI, 1, 4, {A_MoveAbsolute}, 180, 7, S_SRB1_GRAYBOT5}, // S_SRB1_GRAYBOT4
-	{SPR_SRBI, 0, 4, {A_MoveAbsolute}, 180, 7, S_SRB1_GRAYBOT6}, // S_SRB1_GRAYBOT5
-	{SPR_SRBI, 1, 4, {A_MoveAbsolute}, 180, 7, S_SRB1_GRAYBOT1}, // S_SRB1_GRAYBOT6
+	{SPR_SRBI, 0, 4, A_MoveAbsolute, 0, 7, S_SRB1_GRAYBOT2}, // S_SRB1_GRAYBOT1
+	{SPR_SRBI, 1, 4, A_MoveAbsolute, 0, 7, S_SRB1_GRAYBOT3}, // S_SRB1_GRAYBOT2
+	{SPR_SRBI, 0, 4, A_MoveAbsolute, 0, 7, S_SRB1_GRAYBOT4}, // S_SRB1_GRAYBOT3
+	{SPR_SRBI, 1, 4, A_MoveAbsolute, 180, 7, S_SRB1_GRAYBOT5}, // S_SRB1_GRAYBOT4
+	{SPR_SRBI, 0, 4, A_MoveAbsolute, 180, 7, S_SRB1_GRAYBOT6}, // S_SRB1_GRAYBOT5
+	{SPR_SRBI, 1, 4, A_MoveAbsolute, 180, 7, S_SRB1_GRAYBOT1}, // S_SRB1_GRAYBOT6
 
-	{SPR_SRBJ, 0, 8, {A_MoveAbsolute}, 0, 5, S_SRB1_ROBOTOPOLIS2}, // S_SRB1_ROBOTOPOLIS1
-	{SPR_SRBJ, 1, 8, {A_MoveAbsolute}, 0, -5, S_SRB1_ROBOTOPOLIS1}, // S_SRB1_ROBOTOPOLIS2
+	{SPR_SRBJ, 0, 8, A_MoveAbsolute, 0, 5, S_SRB1_ROBOTOPOLIS2}, // S_SRB1_ROBOTOPOLIS1
+	{SPR_SRBJ, 1, 8, A_MoveAbsolute, 0, -5, S_SRB1_ROBOTOPOLIS1}, // S_SRB1_ROBOTOPOLIS2
 
-	{SPR_SRBK, 0, 8, {A_MoveAbsolute}, 0, 5, S_SRB1_RBZBUZZ2}, // S_SRB1_RBZBUZZ1
-	{SPR_SRBK, 1, 8, {A_MoveAbsolute}, 0, -5, S_SRB1_RBZBUZZ1}, // S_SRB1_RBZBUZZ2
+	{SPR_SRBK, 0, 8, A_MoveAbsolute, 0, 5, S_SRB1_RBZBUZZ2}, // S_SRB1_RBZBUZZ1
+	{SPR_SRBK, 1, 8, A_MoveAbsolute, 0, -5, S_SRB1_RBZBUZZ1}, // S_SRB1_RBZBUZZ2
 
-	{SPR_SRBL, 0, 35, {A_ZThrust}, 4, (1<<16)+1, S_SRB1_RBZSPIKES2}, // S_SRB1_RBZSPIKES1
-	{SPR_SRBL, 0, 35, {A_ZThrust}, -4, (1<<16)+1, S_SRB1_RBZSPIKES1}, // S_SRB1_RBZSPIKES2
+	{SPR_SRBL, 0, 35, A_ZThrust, 4, (1<<16)+1, S_SRB1_RBZSPIKES2}, // S_SRB1_RBZSPIKES1
+	{SPR_SRBL, 0, 35, A_ZThrust, -4, (1<<16)+1, S_SRB1_RBZSPIKES1}, // S_SRB1_RBZSPIKES2
 
-	{SPR_SRBM, 0, 4, {NULL}, 0, 0, S_SRB1_METALSONIC2}, // S_SRB1_METALSONIC1
-	{SPR_SRBM, 1, 4, {NULL}, 0, 0, S_SRB1_METALSONIC3}, // S_SRB1_METALSONIC2
-	{SPR_SRBM, 2, 4, {NULL}, 0, 0, S_SRB1_METALSONIC1}, // S_SRB1_METALSONIC3
+	{SPR_SRBM, 0, 4, NULL, 0, 0, S_SRB1_METALSONIC2}, // S_SRB1_METALSONIC1
+	{SPR_SRBM, 1, 4, NULL, 0, 0, S_SRB1_METALSONIC3}, // S_SRB1_METALSONIC2
+	{SPR_SRBM, 2, 4, NULL, 0, 0, S_SRB1_METALSONIC1}, // S_SRB1_METALSONIC3
 
-	{SPR_SRBN, 0, 2, {A_MoveAbsolute}, 0, 7, S_SRB1_GOLDBOT2}, // S_SRB1_GOLDBOT1
-	{SPR_SRBN, 1, 2, {A_MoveAbsolute}, 0, 7, S_SRB1_GOLDBOT3}, // S_SRB1_GOLDBOT2
-	{SPR_SRBN, 0, 2, {A_MoveAbsolute}, 0, 7, S_SRB1_GOLDBOT4}, // S_SRB1_GOLDBOT3
-	{SPR_SRBN, 1, 2, {A_MoveAbsolute}, 180, 7, S_SRB1_GOLDBOT5}, // S_SRB1_GOLDBOT4
-	{SPR_SRBN, 0, 2, {A_MoveAbsolute}, 180, 7, S_SRB1_GOLDBOT6}, // S_SRB1_GOLDBOT5
-	{SPR_SRBN, 1, 2, {A_MoveAbsolute}, 180, 7, S_SRB1_GOLDBOT1}, // S_SRB1_GOLDBOT6
+	{SPR_SRBN, 0, 2, A_MoveAbsolute, 0, 7, S_SRB1_GOLDBOT2}, // S_SRB1_GOLDBOT1
+	{SPR_SRBN, 1, 2, A_MoveAbsolute, 0, 7, S_SRB1_GOLDBOT3}, // S_SRB1_GOLDBOT2
+	{SPR_SRBN, 0, 2, A_MoveAbsolute, 0, 7, S_SRB1_GOLDBOT4}, // S_SRB1_GOLDBOT3
+	{SPR_SRBN, 1, 2, A_MoveAbsolute, 180, 7, S_SRB1_GOLDBOT5}, // S_SRB1_GOLDBOT4
+	{SPR_SRBN, 0, 2, A_MoveAbsolute, 180, 7, S_SRB1_GOLDBOT6}, // S_SRB1_GOLDBOT5
+	{SPR_SRBN, 1, 2, A_MoveAbsolute, 180, 7, S_SRB1_GOLDBOT1}, // S_SRB1_GOLDBOT6
 
-	{SPR_SRBO, 0, 2, {A_Look}, 0, 0, S_SRB1_GENREX1}, // S_SRB1_GENREX1
-	{SPR_SRBO, 0, 2, {A_BuzzFly}, 0, 0, S_SRB1_GENREX2}, // S_SRB1_GENREX2
+	{SPR_SRBO, 0, 2, A_Look, 0, 0, S_SRB1_GENREX1}, // S_SRB1_GENREX1
+	{SPR_SRBO, 0, 2, A_BuzzFly, 0, 0, S_SRB1_GENREX2}, // S_SRB1_GENREX2
 
 	// SRB2kart
-	{SPR_SPRG, 0, -1, {NULL}, 0, 0, S_NULL},         // S_GRAYSPRING
-	{SPR_SPRG, 4, 4, {A_Pain}, 0, 0, S_GRAYSPRING3}, // S_GRAYSPRING2
-	{SPR_SPRG, 3, 1, {NULL}, 0, 0, S_GRAYSPRING4},   // S_GRAYSPRING3
-	{SPR_SPRG, 2, 1, {NULL}, 0, 0, S_GRAYSPRING5},   // S_GRAYSPRING4
-	{SPR_SPRG, 1, 1, {NULL}, 0, 0, S_GRAYSPRING},    // S_GRAYSPRING5
+	{SPR_SPRG, 0, -1, NULL, 0, 0, S_NULL},         // S_GRAYSPRING
+	{SPR_SPRG, 4, 4, A_Pain, 0, 0, S_GRAYSPRING3}, // S_GRAYSPRING2
+	{SPR_SPRG, 3, 1, NULL, 0, 0, S_GRAYSPRING4},   // S_GRAYSPRING3
+	{SPR_SPRG, 2, 1, NULL, 0, 0, S_GRAYSPRING5},   // S_GRAYSPRING4
+	{SPR_SPRG, 1, 1, NULL, 0, 0, S_GRAYSPRING},    // S_GRAYSPRING5
 
-	{SPR_NULL, 0, 1, {A_Pain}, 0, 0, S_INVISIBLE}, // S_INVISSPRING
+	{SPR_NULL, 0, 1, A_Pain, 0, 0, S_INVISIBLE}, // S_INVISSPRING
 
-	{SPR_BSPR, 0, -1, {NULL}, 0, 0, S_NULL},    // S_BDIAG1
-	{SPR_BSPR, 1, 1, {A_Pain}, 0, 0, S_BDIAG3}, // S_BDIAG2
-	{SPR_BSPR, 2, 1, {NULL}, 0, 0, S_BDIAG4},   // S_BDIAG3
-	{SPR_BSPR, 3, 1, {NULL}, 0, 0, S_BDIAG5},   // S_BDIAG4
-	{SPR_BSPR, 4, 1, {NULL}, 0, 0, S_BDIAG6},   // S_BDIAG5
-	{SPR_BSPR, 3, 1, {NULL}, 0, 0, S_BDIAG7},   // S_BDIAG6
-	{SPR_BSPR, 2, 1, {NULL}, 0, 0, S_BDIAG8},   // S_BDIAG7
-	{SPR_BSPR, 1, 1, {NULL}, 0, 0, S_BDIAG1},   // S_BDIAG8
+	{SPR_BSPR, 0, -1, NULL, 0, 0, S_NULL},    // S_BDIAG1
+	{SPR_BSPR, 1, 1, A_Pain, 0, 0, S_BDIAG3}, // S_BDIAG2
+	{SPR_BSPR, 2, 1, NULL, 0, 0, S_BDIAG4},   // S_BDIAG3
+	{SPR_BSPR, 3, 1, NULL, 0, 0, S_BDIAG5},   // S_BDIAG4
+	{SPR_BSPR, 4, 1, NULL, 0, 0, S_BDIAG6},   // S_BDIAG5
+	{SPR_BSPR, 3, 1, NULL, 0, 0, S_BDIAG7},   // S_BDIAG6
+	{SPR_BSPR, 2, 1, NULL, 0, 0, S_BDIAG8},   // S_BDIAG7
+	{SPR_BSPR, 1, 1, NULL, 0, 0, S_BDIAG1},   // S_BDIAG8
 
-	{SPR_RNDM,  0|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM2},  // S_RANDOMITEM1
-	{SPR_RNDM,  1|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM3},  // S_RANDOMITEM2
-	{SPR_RNDM,  2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM4},  // S_RANDOMITEM3
-	{SPR_RNDM,  3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM5},  // S_RANDOMITEM4
-	{SPR_RNDM,  4|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM6},  // S_RANDOMITEM5
-	{SPR_RNDM,  5|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM7},  // S_RANDOMITEM6
-	{SPR_RNDM,  6|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM8},  // S_RANDOMITEM7
-	{SPR_RNDM,  7|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM9},  // S_RANDOMITEM8
-	{SPR_RNDM,  8|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM10}, // S_RANDOMITEM9
-	{SPR_RNDM,  9|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM11}, // S_RANDOMITEM10
-	{SPR_RNDM, 10|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM12}, // S_RANDOMITEM11
-	{SPR_RNDM, 11|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM13}, // S_RANDOMITEM12
-	{SPR_RNDM, 12|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM14}, // S_RANDOMITEM13
-	{SPR_RNDM, 13|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM15}, // S_RANDOMITEM14
-	{SPR_RNDM, 14|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM16}, // S_RANDOMITEM15
-	{SPR_RNDM, 15|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM17}, // S_RANDOMITEM16
-	{SPR_RNDM, 16|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM18}, // S_RANDOMITEM17
-	{SPR_RNDM, 17|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM19}, // S_RANDOMITEM18
-	{SPR_RNDM, 18|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM20}, // S_RANDOMITEM19
-	{SPR_RNDM, 19|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM21}, // S_RANDOMITEM20
-	{SPR_RNDM, 20|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM22}, // S_RANDOMITEM21
-	{SPR_RNDM, 21|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM23}, // S_RANDOMITEM22
-	{SPR_RNDM, 22|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM24}, // S_RANDOMITEM23
-	{SPR_RNDM, 23|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_RANDOMITEM1},  // S_RANDOMITEM24
-	{SPR_RNDM,  0|FF_FULLBRIGHT, 1, {A_ItemPop}, 0, 0, S_NULL},    // S_DEADRANDOMITEM
+	{SPR_RNDM,  0|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM2},  // S_RANDOMITEM1
+	{SPR_RNDM,  1|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM3},  // S_RANDOMITEM2
+	{SPR_RNDM,  2|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM4},  // S_RANDOMITEM3
+	{SPR_RNDM,  3|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM5},  // S_RANDOMITEM4
+	{SPR_RNDM,  4|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM6},  // S_RANDOMITEM5
+	{SPR_RNDM,  5|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM7},  // S_RANDOMITEM6
+	{SPR_RNDM,  6|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM8},  // S_RANDOMITEM7
+	{SPR_RNDM,  7|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM9},  // S_RANDOMITEM8
+	{SPR_RNDM,  8|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM10}, // S_RANDOMITEM9
+	{SPR_RNDM,  9|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM11}, // S_RANDOMITEM10
+	{SPR_RNDM, 10|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM12}, // S_RANDOMITEM11
+	{SPR_RNDM, 11|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM13}, // S_RANDOMITEM12
+	{SPR_RNDM, 12|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM14}, // S_RANDOMITEM13
+	{SPR_RNDM, 13|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM15}, // S_RANDOMITEM14
+	{SPR_RNDM, 14|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM16}, // S_RANDOMITEM15
+	{SPR_RNDM, 15|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM17}, // S_RANDOMITEM16
+	{SPR_RNDM, 16|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM18}, // S_RANDOMITEM17
+	{SPR_RNDM, 17|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM19}, // S_RANDOMITEM18
+	{SPR_RNDM, 18|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM20}, // S_RANDOMITEM19
+	{SPR_RNDM, 19|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM21}, // S_RANDOMITEM20
+	{SPR_RNDM, 20|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM22}, // S_RANDOMITEM21
+	{SPR_RNDM, 21|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM23}, // S_RANDOMITEM22
+	{SPR_RNDM, 22|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM24}, // S_RANDOMITEM23
+	{SPR_RNDM, 23|FF_FULLBRIGHT, 3, NULL, 0, 0, S_RANDOMITEM1},  // S_RANDOMITEM24
+	{SPR_RNDM,  0|FF_FULLBRIGHT, 1, A_ItemPop, 0, 0, S_NULL},    // S_DEADRANDOMITEM
 
-	{SPR_RPOP, FF_FULLBRIGHT,   5, {NULL}, 0, 0, S_RANDOMITEMPOP2}, // S_RANDOMITEMPOP1
-	{SPR_RPOP, FF_FULLBRIGHT|1, 5, {NULL}, 0, 0, S_RANDOMITEMPOP3}, // S_RANDOMITEMPOP2
-	{SPR_RPOP, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_RANDOMITEMPOP4}, // S_RANDOMITEMPOP3
-	{SPR_RPOP, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_NULL},           // S_RANDOMITEMPOP4
+	{SPR_RPOP, FF_FULLBRIGHT,   5, NULL, 0, 0, S_RANDOMITEMPOP2}, // S_RANDOMITEMPOP1
+	{SPR_RPOP, FF_FULLBRIGHT|1, 5, NULL, 0, 0, S_RANDOMITEMPOP3}, // S_RANDOMITEMPOP2
+	{SPR_RPOP, FF_FULLBRIGHT|2, 5, NULL, 0, 0, S_RANDOMITEMPOP4}, // S_RANDOMITEMPOP3
+	{SPR_RPOP, FF_FULLBRIGHT|3, 5, NULL, 0, 0, S_NULL},           // S_RANDOMITEMPOP4
 
 
-	{SPR_NULL, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_ITEMICON
+	{SPR_NULL, FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_ITEMICON
 
-	{SPR_SGNS, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_SIGNSPARK2}, // S_SIGNSPARK1
-	{SPR_SGNS, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_SIGNSPARK3}, // S_SIGNSPARK2
-	{SPR_SGNS, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_SIGNSPARK4}, // S_SIGNSPARK3
-	{SPR_SGNS, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_SIGNSPARK5}, // S_SIGNSPARK4
-	{SPR_SGNS, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_SIGNSPARK6}, // S_SIGNSPARK5
-	{SPR_SGNS, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_SIGNSPARK7}, // S_SIGNSPARK6
-	{SPR_SGNS, FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_SIGNSPARK8}, // S_SIGNSPARK7
-	{SPR_SGNS, FF_FULLBRIGHT|7, 1, {NULL}, 0, 0, S_SIGNSPARK9}, // S_SIGNSPARK8
-	{SPR_SGNS, FF_FULLBRIGHT|8, 1, {NULL}, 0, 0, S_SIGNSPARK10}, // S_SIGNSPARK9
-	{SPR_SGNS, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_SIGNSPARK11}, // S_SIGNSPARK10
-	{SPR_SGNS, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_NULL}, // S_SIGNSPARK11
+	{SPR_SGNS, FF_FULLBRIGHT, 1, NULL, 0, 0, S_SIGNSPARK2}, // S_SIGNSPARK1
+	{SPR_SGNS, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_SIGNSPARK3}, // S_SIGNSPARK2
+	{SPR_SGNS, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_SIGNSPARK4}, // S_SIGNSPARK3
+	{SPR_SGNS, FF_FULLBRIGHT|3, 1, NULL, 0, 0, S_SIGNSPARK5}, // S_SIGNSPARK4
+	{SPR_SGNS, FF_FULLBRIGHT|4, 1, NULL, 0, 0, S_SIGNSPARK6}, // S_SIGNSPARK5
+	{SPR_SGNS, FF_FULLBRIGHT|5, 1, NULL, 0, 0, S_SIGNSPARK7}, // S_SIGNSPARK6
+	{SPR_SGNS, FF_FULLBRIGHT|6, 1, NULL, 0, 0, S_SIGNSPARK8}, // S_SIGNSPARK7
+	{SPR_SGNS, FF_FULLBRIGHT|7, 1, NULL, 0, 0, S_SIGNSPARK9}, // S_SIGNSPARK8
+	{SPR_SGNS, FF_FULLBRIGHT|8, 1, NULL, 0, 0, S_SIGNSPARK10}, // S_SIGNSPARK9
+	{SPR_SGNS, FF_FULLBRIGHT|3, 1, NULL, 0, 0, S_SIGNSPARK11}, // S_SIGNSPARK10
+	{SPR_SGNS, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_NULL}, // S_SIGNSPARK11
 
-	{SPR_DRIF, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_DRIFTSPARK_A2}, // S_DRIFTSPARK_A1
-	{SPR_DRIF, FF_FULLBRIGHT|FF_TRANS20|1, 1, {NULL}, 0, 0, S_DRIFTSPARK_A3}, // S_DRIFTSPARK_A2
-	{SPR_DRIF, FF_FULLBRIGHT|FF_TRANS50,   1, {NULL}, 0, 0, S_NULL}, // S_DRIFTSPARK_A3
+	{SPR_DRIF, FF_FULLBRIGHT|2, 2, NULL, 0, 0, S_DRIFTSPARK_A2}, // S_DRIFTSPARK_A1
+	{SPR_DRIF, FF_FULLBRIGHT|FF_TRANS20|1, 1, NULL, 0, 0, S_DRIFTSPARK_A3}, // S_DRIFTSPARK_A2
+	{SPR_DRIF, FF_FULLBRIGHT|FF_TRANS50,   1, NULL, 0, 0, S_NULL}, // S_DRIFTSPARK_A3
 
-	{SPR_DRIF, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_DRIFTSPARK_A2}, // S_DRIFTSPARK_B1 (Loop back to A2)
+	{SPR_DRIF, FF_FULLBRIGHT|1, 2, NULL, 0, 0, S_DRIFTSPARK_A2}, // S_DRIFTSPARK_B1 (Loop back to A2)
 
-	{SPR_DRIF, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_DRIFTSPARK_C2}, // S_DRIFTSPARK_C1
-	{SPR_DRIF, FF_FULLBRIGHT|FF_TRANS20, 1, {NULL}, 0, 0, S_DRIFTSPARK_A3}, // S_DRIFTSPARK_C2 (Loop back to A3)
+	{SPR_DRIF, FF_FULLBRIGHT, 2, NULL, 0, 0, S_DRIFTSPARK_C2}, // S_DRIFTSPARK_C1
+	{SPR_DRIF, FF_FULLBRIGHT|FF_TRANS20, 1, NULL, 0, 0, S_DRIFTSPARK_A3}, // S_DRIFTSPARK_C2 (Loop back to A3)
 
-	{SPR_BDRF, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, -1, {NULL}, 5, 2, S_BRAKEDRIFT}, // S_BRAKEDRIFT
+	{SPR_BDRF, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, -1, NULL, 5, 2, S_BRAKEDRIFT}, // S_BRAKEDRIFT
 
-	{SPR_DUST, 0,  3, {NULL}, 0, 0, S_DRIFTDUST2}, // S_DRIFTDUST1
-	{SPR_DUST, 1,  3, {NULL}, 0, 0, S_DRIFTDUST3}, // S_DRIFTDUST2
-	{SPR_DUST, FF_TRANS20|2,  3, {NULL}, 0, 0, S_DRIFTDUST4}, // S_DRIFTDUST3
-	{SPR_DUST, FF_TRANS20|3,  3, {NULL}, 0, 0, S_NULL}, // S_DRIFTDUST4
+	{SPR_DUST, 0,  3, NULL, 0, 0, S_DRIFTDUST2}, // S_DRIFTDUST1
+	{SPR_DUST, 1,  3, NULL, 0, 0, S_DRIFTDUST3}, // S_DRIFTDUST2
+	{SPR_DUST, FF_TRANS20|2,  3, NULL, 0, 0, S_DRIFTDUST4}, // S_DRIFTDUST3
+	{SPR_DUST, FF_TRANS20|3,  3, NULL, 0, 0, S_NULL}, // S_DRIFTDUST4
 
-	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_FASTLINE2}, // S_FASTLINE1
-	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_FASTLINE3}, // S_FASTLINE2
-	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_FASTLINE4}, // S_FASTLINE3
-	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_FASTLINE5}, // S_FASTLINE4
-	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_NULL}, // S_FASTLINE5
+	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT,   1, NULL, 0, 0, S_FASTLINE2}, // S_FASTLINE1
+	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_FASTLINE3}, // S_FASTLINE2
+	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_FASTLINE4}, // S_FASTLINE3
+	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|3, 1, NULL, 0, 0, S_FASTLINE5}, // S_FASTLINE4
+	{SPR_FAST, FF_PAPERSPRITE|FF_FULLBRIGHT|4, 1, NULL, 0, 0, S_NULL}, // S_FASTLINE5
 
-	{SPR_DSHR, FF_PAPERSPRITE,   1, {NULL}, 0, 0, S_FASTDUST2}, // S_FASTDUST1
-	{SPR_DSHR, FF_PAPERSPRITE|1, 1, {NULL}, 0, 0, S_FASTDUST3}, // S_FASTDUST2
-	{SPR_DSHR, FF_PAPERSPRITE|2, 1, {NULL}, 0, 0, S_FASTDUST4}, // S_FASTDUST3
-	{SPR_DSHR, FF_PAPERSPRITE|3, 1, {NULL}, 0, 0, S_FASTDUST5}, // S_FASTDUST4
-	{SPR_DSHR, FF_PAPERSPRITE|4, 1, {NULL}, 0, 0, S_FASTDUST6}, // S_FASTDUST5
-	{SPR_DSHR, FF_PAPERSPRITE|5, 1, {NULL}, 0, 0, S_FASTDUST7}, // S_FASTDUST6
-	{SPR_DSHR, FF_PAPERSPRITE|6, 1, {NULL}, 0, 0, S_NULL}, // S_FASTDUST7
+	{SPR_DSHR, FF_PAPERSPRITE,   1, NULL, 0, 0, S_FASTDUST2}, // S_FASTDUST1
+	{SPR_DSHR, FF_PAPERSPRITE|1, 1, NULL, 0, 0, S_FASTDUST3}, // S_FASTDUST2
+	{SPR_DSHR, FF_PAPERSPRITE|2, 1, NULL, 0, 0, S_FASTDUST4}, // S_FASTDUST3
+	{SPR_DSHR, FF_PAPERSPRITE|3, 1, NULL, 0, 0, S_FASTDUST5}, // S_FASTDUST4
+	{SPR_DSHR, FF_PAPERSPRITE|4, 1, NULL, 0, 0, S_FASTDUST6}, // S_FASTDUST5
+	{SPR_DSHR, FF_PAPERSPRITE|5, 1, NULL, 0, 0, S_FASTDUST7}, // S_FASTDUST6
+	{SPR_DSHR, FF_PAPERSPRITE|6, 1, NULL, 0, 0, S_NULL}, // S_FASTDUST7
 
-	{SPR_BOST, FF_FULLBRIGHT|FF_ANIMATE, TICRATE, {NULL}, 6, 1, S_BOOSTSMOKESPAWNER}, // S_BOOSTFLAME
-	{SPR_NULL, 0,                      TICRATE/2, {NULL}, 0, 0, S_NULL}, // S_BOOSTSMOKESPAWNER
+	{SPR_BOST, FF_FULLBRIGHT|FF_ANIMATE, TICRATE, NULL, 6, 1, S_BOOSTSMOKESPAWNER}, // S_BOOSTFLAME
+	{SPR_NULL, 0,                      TICRATE/2, NULL, 0, 0, S_NULL}, // S_BOOSTSMOKESPAWNER
 
-	{SPR_BOSM, FF_TRANS50, 3, {NULL}, 0, 0, S_BOOSTSMOKE2}, // S_BOOSTSMOKE1
-	{SPR_BOSM, FF_TRANS50|1, 3, {NULL}, 0, 0, S_BOOSTSMOKE3}, // S_BOOSTSMOKE2
-	{SPR_BOSM, FF_TRANS50|2, 3, {NULL}, 0, 0, S_BOOSTSMOKE4}, // S_BOOSTSMOKE3
-	{SPR_BOSM, FF_TRANS50|3, 3, {NULL}, 0, 0, S_BOOSTSMOKE5}, // S_BOOSTSMOKE4
-	{SPR_BOSM, FF_TRANS50|4, 3, {NULL}, 0, 0, S_BOOSTSMOKE6}, // S_BOOSTSMOKE5
-	{SPR_BOSM, FF_TRANS50|5, 3, {NULL}, 0, 0, S_NULL}, // S_BOOSTSMOKE6
+	{SPR_BOSM, FF_TRANS50, 3, NULL, 0, 0, S_BOOSTSMOKE2}, // S_BOOSTSMOKE1
+	{SPR_BOSM, FF_TRANS50|1, 3, NULL, 0, 0, S_BOOSTSMOKE3}, // S_BOOSTSMOKE2
+	{SPR_BOSM, FF_TRANS50|2, 3, NULL, 0, 0, S_BOOSTSMOKE4}, // S_BOOSTSMOKE3
+	{SPR_BOSM, FF_TRANS50|3, 3, NULL, 0, 0, S_BOOSTSMOKE5}, // S_BOOSTSMOKE4
+	{SPR_BOSM, FF_TRANS50|4, 3, NULL, 0, 0, S_BOOSTSMOKE6}, // S_BOOSTSMOKE5
+	{SPR_BOSM, FF_TRANS50|5, 3, NULL, 0, 0, S_NULL}, // S_BOOSTSMOKE6
 
-	{SPR_NULL, 0,               10, {NULL}, 0, 0, S_KARTFIRE2}, // S_KARTFIRE1
-	{SPR_KFRE, FF_FULLBRIGHT,    2, {NULL}, 0, 0, S_KARTFIRE3}, // S_KARTFIRE2
-	{SPR_KFRE, FF_FULLBRIGHT|1,  2, {NULL}, 0, 0, S_KARTFIRE4}, // S_KARTFIRE3
-	{SPR_KFRE, FF_FULLBRIGHT|2,  2, {NULL}, 0, 0, S_KARTFIRE5}, // S_KARTFIRE4
-	{SPR_KFRE, FF_FULLBRIGHT|3,  2, {NULL}, 0, 0, S_KARTFIRE6}, // S_KARTFIRE5
-	{SPR_KFRE, FF_FULLBRIGHT|4,  2, {NULL}, 0, 0, S_KARTFIRE7}, // S_KARTFIRE6
-	{SPR_KFRE, FF_FULLBRIGHT|5,  2, {NULL}, 0, 0, S_KARTFIRE8}, // S_KARTFIRE7
-	{SPR_KFRE, FF_FULLBRIGHT|6,  2, {NULL}, 0, 0, S_NULL},      // S_KARTFIRE8
+	{SPR_NULL, 0,               10, NULL, 0, 0, S_KARTFIRE2}, // S_KARTFIRE1
+	{SPR_KFRE, FF_FULLBRIGHT,    2, NULL, 0, 0, S_KARTFIRE3}, // S_KARTFIRE2
+	{SPR_KFRE, FF_FULLBRIGHT|1,  2, NULL, 0, 0, S_KARTFIRE4}, // S_KARTFIRE3
+	{SPR_KFRE, FF_FULLBRIGHT|2,  2, NULL, 0, 0, S_KARTFIRE5}, // S_KARTFIRE4
+	{SPR_KFRE, FF_FULLBRIGHT|3,  2, NULL, 0, 0, S_KARTFIRE6}, // S_KARTFIRE5
+	{SPR_KFRE, FF_FULLBRIGHT|4,  2, NULL, 0, 0, S_KARTFIRE7}, // S_KARTFIRE6
+	{SPR_KFRE, FF_FULLBRIGHT|5,  2, NULL, 0, 0, S_KARTFIRE8}, // S_KARTFIRE7
+	{SPR_KFRE, FF_FULLBRIGHT|6,  2, NULL, 0, 0, S_NULL},      // S_KARTFIRE8
 
-	{SPR_AIDU, FF_ANIMATE|FF_PAPERSPRITE, 5*2, {NULL}, 5, 2, S_NULL}, // S_KARTAIZDRIFTSTRAT
+	{SPR_AIDU, FF_ANIMATE|FF_PAPERSPRITE, 5*2, NULL, 5, 2, S_NULL}, // S_KARTAIZDRIFTSTRAT
 
-	{SPR_KINV, FF_FULLBRIGHT,    1, {NULL}, 0, 0, S_KARTINVULN_SMALL2},	// S_KARTINVULN_SMALL1
-	{SPR_KINV, FF_FULLBRIGHT|1,  1, {NULL}, 0, 0, S_KARTINVULN_SMALL3},	// S_KARTINVULN_SMALL2
-	{SPR_KINV, FF_FULLBRIGHT|2,  1, {NULL}, 0, 0, S_KARTINVULN_SMALL4},	// S_KARTINVULN_SMALL3
-	{SPR_KINV, FF_FULLBRIGHT|3,  1, {NULL}, 0, 0, S_KARTINVULN_SMALL5},	// S_KARTINVULN_SMALL4
-	{SPR_KINV, FF_FULLBRIGHT|4,  1, {NULL}, 0, 0, S_NULL},				// S_KARTINVULN_SMALL5
+	{SPR_KINV, FF_FULLBRIGHT,    1, NULL, 0, 0, S_KARTINVULN_SMALL2},	// S_KARTINVULN_SMALL1
+	{SPR_KINV, FF_FULLBRIGHT|1,  1, NULL, 0, 0, S_KARTINVULN_SMALL3},	// S_KARTINVULN_SMALL2
+	{SPR_KINV, FF_FULLBRIGHT|2,  1, NULL, 0, 0, S_KARTINVULN_SMALL4},	// S_KARTINVULN_SMALL3
+	{SPR_KINV, FF_FULLBRIGHT|3,  1, NULL, 0, 0, S_KARTINVULN_SMALL5},	// S_KARTINVULN_SMALL4
+	{SPR_KINV, FF_FULLBRIGHT|4,  1, NULL, 0, 0, S_NULL},				// S_KARTINVULN_SMALL5
 
-	{SPR_KINV, FF_FULLBRIGHT|1,  1, {NULL}, 0, 0, S_KARTINVULN_LARGE2},	// S_KARTINVULN_LARGE1
-	{SPR_KINV, FF_FULLBRIGHT|2,  1, {NULL}, 0, 0, S_KARTINVULN_LARGE3},	// S_KARTINVULN_LARGE2
-	{SPR_KINV, FF_FULLBRIGHT|5,  1, {NULL}, 0, 0, S_KARTINVULN_LARGE4},	// S_KARTINVULN_LARGE3
-	{SPR_KINV, FF_FULLBRIGHT|6,  1, {NULL}, 0, 0, S_KARTINVULN_LARGE5},	// S_KARTINVULN_LARGE4
-	{SPR_KINV, FF_FULLBRIGHT|7,  1, {NULL}, 0, 0, S_NULL},				// S_KARTINVULN_LARGE5
+	{SPR_KINV, FF_FULLBRIGHT|1,  1, NULL, 0, 0, S_KARTINVULN_LARGE2},	// S_KARTINVULN_LARGE1
+	{SPR_KINV, FF_FULLBRIGHT|2,  1, NULL, 0, 0, S_KARTINVULN_LARGE3},	// S_KARTINVULN_LARGE2
+	{SPR_KINV, FF_FULLBRIGHT|5,  1, NULL, 0, 0, S_KARTINVULN_LARGE4},	// S_KARTINVULN_LARGE3
+	{SPR_KINV, FF_FULLBRIGHT|6,  1, NULL, 0, 0, S_KARTINVULN_LARGE5},	// S_KARTINVULN_LARGE4
+	{SPR_KINV, FF_FULLBRIGHT|7,  1, NULL, 0, 0, S_NULL},				// S_KARTINVULN_LARGE5
 
-	{SPR_KINF, FF_FULLBRIGHT|FF_TRANS90, 1, {NULL}, 0, 0, S_INVULNFLASH2},	// S_INVULNFLASH1
-	{SPR_NULL, FF_FULLBRIGHT|FF_TRANS90, 1, {NULL}, 0, 0, S_INVULNFLASH3},	// S_INVULNFLASH2
-	{SPR_KINF, FF_FULLBRIGHT|FF_TRANS90|1, 1, {NULL}, 0, 0, S_INVULNFLASH4},	// S_INVULNFLASH3
-	{SPR_NULL, FF_FULLBRIGHT|FF_TRANS90, 1, {NULL}, 0, 0, S_INVULNFLASH1},	// S_INVULNFLASH4
+	{SPR_KINF, FF_FULLBRIGHT|FF_TRANS90, 1, NULL, 0, 0, S_INVULNFLASH2},	// S_INVULNFLASH1
+	{SPR_NULL, FF_FULLBRIGHT|FF_TRANS90, 1, NULL, 0, 0, S_INVULNFLASH3},	// S_INVULNFLASH2
+	{SPR_KINF, FF_FULLBRIGHT|FF_TRANS90|1, 1, NULL, 0, 0, S_INVULNFLASH4},	// S_INVULNFLASH3
+	{SPR_NULL, FF_FULLBRIGHT|FF_TRANS90, 1, NULL, 0, 0, S_INVULNFLASH1},	// S_INVULNFLASH4
 
-	{SPR_WIPD, 0, 3, {NULL}, 0, 0, S_WIPEOUTTRAIL2}, // S_WIPEOUTTRAIL1
-	{SPR_WIPD, 1, 3, {NULL}, 0, 0, S_WIPEOUTTRAIL3}, // S_WIPEOUTTRAIL2
-	{SPR_WIPD, 2, 3, {NULL}, 0, 0, S_WIPEOUTTRAIL4}, // S_WIPEOUTTRAIL3
-	{SPR_WIPD, 3, 3, {NULL}, 0, 0, S_WIPEOUTTRAIL5}, // S_WIPEOUTTRAIL4
-	{SPR_WIPD, 4, 3, {NULL}, 0, 0, S_NULL}, // S_WIPEOUTTRAIL5
+	{SPR_WIPD, 0, 3, NULL, 0, 0, S_WIPEOUTTRAIL2}, // S_WIPEOUTTRAIL1
+	{SPR_WIPD, 1, 3, NULL, 0, 0, S_WIPEOUTTRAIL3}, // S_WIPEOUTTRAIL2
+	{SPR_WIPD, 2, 3, NULL, 0, 0, S_WIPEOUTTRAIL4}, // S_WIPEOUTTRAIL3
+	{SPR_WIPD, 3, 3, NULL, 0, 0, S_WIPEOUTTRAIL5}, // S_WIPEOUTTRAIL4
+	{SPR_WIPD, 4, 3, NULL, 0, 0, S_NULL}, // S_WIPEOUTTRAIL5
 
-	{SPR_RSHE, 0, -1, {NULL}, 0, 0, S_NULL}, // S_ROCKETSNEAKER_L
-	{SPR_RSHE, 1, -1, {NULL}, 0, 0, S_NULL}, // S_ROCKETSNEAKER_R
-	{SPR_RSHE, 2, -1, {NULL}, 0, 0, S_NULL}, // S_ROCKETSNEAKER_LVIBRATE
-	{SPR_RSHE, 3, -1, {NULL}, 0, 0, S_NULL}, // S_ROCKETSNEAKER_RVIBRATE
+	{SPR_RSHE, 0, -1, NULL, 0, 0, S_NULL}, // S_ROCKETSNEAKER_L
+	{SPR_RSHE, 1, -1, NULL, 0, 0, S_NULL}, // S_ROCKETSNEAKER_R
+	{SPR_RSHE, 2, -1, NULL, 0, 0, S_NULL}, // S_ROCKETSNEAKER_LVIBRATE
+	{SPR_RSHE, 3, -1, NULL, 0, 0, S_NULL}, // S_ROCKETSNEAKER_RVIBRATE
 
-	{SPR_FITM,    FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM2},  // S_EGGMANITEM1
-	{SPR_FITM,  1|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM3},  // S_EGGMANITEM2
-	{SPR_FITM,  2|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM4},  // S_EGGMANITEM3
-	{SPR_FITM,  3|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM5},  // S_EGGMANITEM4
-	{SPR_FITM,  4|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM6},  // S_EGGMANITEM5
-	{SPR_FITM,  5|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM7},  // S_EGGMANITEM6
-	{SPR_FITM,  6|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM8},  // S_EGGMANITEM7
-	{SPR_FITM,  7|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM9},  // S_EGGMANITEM8
-	{SPR_FITM,  8|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM10}, // S_EGGMANITEM9
-	{SPR_FITM,  9|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM11}, // S_EGGMANITEM10
-	{SPR_FITM, 10|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM12}, // S_EGGMANITEM11
-	{SPR_FITM, 11|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM13}, // S_EGGMANITEM12
-	{SPR_FITM, 12|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM14}, // S_EGGMANITEM13
-	{SPR_FITM, 13|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM15}, // S_EGGMANITEM14
-	{SPR_FITM, 14|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM16}, // S_EGGMANITEM15
-	{SPR_FITM, 15|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM17}, // S_EGGMANITEM16
-	{SPR_FITM, 16|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM18}, // S_EGGMANITEM17
-	{SPR_FITM, 17|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM19}, // S_EGGMANITEM18
-	{SPR_FITM, 18|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM20}, // S_EGGMANITEM19
-	{SPR_FITM, 19|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM21}, // S_EGGMANITEM20
-	{SPR_FITM, 20|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM22}, // S_EGGMANITEM21
-	{SPR_FITM, 21|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM23}, // S_EGGMANITEM22  // *****
-	{SPR_FITM, 22|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM24}, // S_EGGMANITEM23 // *****
-	{SPR_FITM, 23|FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_EGGMANITEM1},  // S_EGGMANITEM24 // *****
-	{SPR_FITM,    FF_FULLBRIGHT, 175, {NULL}, 0, 0, S_EGGMANITEM1},  // S_EGGMANITEM_DEAD
+	{SPR_FITM,    FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM2},  // S_EGGMANITEM1
+	{SPR_FITM,  1|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM3},  // S_EGGMANITEM2
+	{SPR_FITM,  2|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM4},  // S_EGGMANITEM3
+	{SPR_FITM,  3|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM5},  // S_EGGMANITEM4
+	{SPR_FITM,  4|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM6},  // S_EGGMANITEM5
+	{SPR_FITM,  5|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM7},  // S_EGGMANITEM6
+	{SPR_FITM,  6|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM8},  // S_EGGMANITEM7
+	{SPR_FITM,  7|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM9},  // S_EGGMANITEM8
+	{SPR_FITM,  8|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM10}, // S_EGGMANITEM9
+	{SPR_FITM,  9|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM11}, // S_EGGMANITEM10
+	{SPR_FITM, 10|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM12}, // S_EGGMANITEM11
+	{SPR_FITM, 11|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM13}, // S_EGGMANITEM12
+	{SPR_FITM, 12|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM14}, // S_EGGMANITEM13
+	{SPR_FITM, 13|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM15}, // S_EGGMANITEM14
+	{SPR_FITM, 14|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM16}, // S_EGGMANITEM15
+	{SPR_FITM, 15|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM17}, // S_EGGMANITEM16
+	{SPR_FITM, 16|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM18}, // S_EGGMANITEM17
+	{SPR_FITM, 17|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM19}, // S_EGGMANITEM18
+	{SPR_FITM, 18|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM20}, // S_EGGMANITEM19
+	{SPR_FITM, 19|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM21}, // S_EGGMANITEM20
+	{SPR_FITM, 20|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM22}, // S_EGGMANITEM21
+	{SPR_FITM, 21|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM23}, // S_EGGMANITEM22  // *****
+	{SPR_FITM, 22|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM24}, // S_EGGMANITEM23 // *****
+	{SPR_FITM, 23|FF_FULLBRIGHT,   3, NULL, 0, 0, S_EGGMANITEM1},  // S_EGGMANITEM24 // *****
+	{SPR_FITM,    FF_FULLBRIGHT, 175, NULL, 0, 0, S_EGGMANITEM1},  // S_EGGMANITEM_DEAD
 
-	{SPR_BANA, 0,  -1, {NULL}, 0, 0, S_NULL}, // S_BANANA
-	{SPR_BANA, 0, 175, {NULL}, 0, 0, S_NULL}, // S_BANANA_DEAD
+	{SPR_BANA, 0,  -1, NULL, 0, 0, S_NULL}, // S_BANANA
+	{SPR_BANA, 0, 175, NULL, 0, 0, S_NULL}, // S_BANANA_DEAD
 
-	{SPR_ORBN,  0, 1, {NULL}, 0, 0, S_ORBINAUT2},			// S_ORBINAUT1
-	{SPR_ORBN,  1, 1, {NULL}, 0, 0, S_ORBINAUT3},			// S_ORBINAUT2
-	{SPR_ORBN,  2, 1, {NULL}, 0, 0, S_ORBINAUT4},			// S_ORBINAUT3
-	{SPR_ORBN,  3, 1, {NULL}, 0, 0, S_ORBINAUT5},			// S_ORBINAUT4
-	{SPR_ORBN,  4, 1, {NULL}, 0, 0, S_ORBINAUT6},			// S_ORBINAUT5
-	{SPR_ORBN,  5, 1, {NULL}, 0, 0, S_ORBINAUT1},			// S_ORBINAUT6
-	{SPR_ORBN,  0, 175, {NULL}, 0, 0, S_NULL},			// S_ORBINAUT_DEAD
-	{SPR_ORBN,  6, 3, {NULL}, 0, 0, S_ORBINAUT_SHIELD2},	// S_ORBINAUT_SHIELD1
-	{SPR_ORBN,  7, 3, {NULL}, 0, 0, S_ORBINAUT_SHIELD3},	// S_ORBINAUT_SHIELD2
-	{SPR_ORBN,  8, 3, {NULL}, 0, 0, S_ORBINAUT_SHIELD4},	// S_ORBINAUT_SHIELD3
-	{SPR_ORBN,  9, 3, {NULL}, 0, 0, S_ORBINAUT_SHIELD5},	// S_ORBINAUT_SHIELD4
-	{SPR_ORBN, 10, 3, {NULL}, 0, 0, S_ORBINAUT_SHIELD6},	// S_ORBINAUT_SHIELD5
-	{SPR_ORBN, 11, 3, {NULL}, 0, 0, S_ORBINAUT_SHIELD1},	// S_ORBINAUT_SHIELD6
-	{SPR_ORBN,  6, 175, {NULL}, 0, 0, S_NULL},			// S_ORBINAUT_SHIELDDEAD
+	{SPR_ORBN,  0, 1, NULL, 0, 0, S_ORBINAUT2},			// S_ORBINAUT1
+	{SPR_ORBN,  1, 1, NULL, 0, 0, S_ORBINAUT3},			// S_ORBINAUT2
+	{SPR_ORBN,  2, 1, NULL, 0, 0, S_ORBINAUT4},			// S_ORBINAUT3
+	{SPR_ORBN,  3, 1, NULL, 0, 0, S_ORBINAUT5},			// S_ORBINAUT4
+	{SPR_ORBN,  4, 1, NULL, 0, 0, S_ORBINAUT6},			// S_ORBINAUT5
+	{SPR_ORBN,  5, 1, NULL, 0, 0, S_ORBINAUT1},			// S_ORBINAUT6
+	{SPR_ORBN,  0, 175, NULL, 0, 0, S_NULL},			// S_ORBINAUT_DEAD
+	{SPR_ORBN,  6, 3, NULL, 0, 0, S_ORBINAUT_SHIELD2},	// S_ORBINAUT_SHIELD1
+	{SPR_ORBN,  7, 3, NULL, 0, 0, S_ORBINAUT_SHIELD3},	// S_ORBINAUT_SHIELD2
+	{SPR_ORBN,  8, 3, NULL, 0, 0, S_ORBINAUT_SHIELD4},	// S_ORBINAUT_SHIELD3
+	{SPR_ORBN,  9, 3, NULL, 0, 0, S_ORBINAUT_SHIELD5},	// S_ORBINAUT_SHIELD4
+	{SPR_ORBN, 10, 3, NULL, 0, 0, S_ORBINAUT_SHIELD6},	// S_ORBINAUT_SHIELD5
+	{SPR_ORBN, 11, 3, NULL, 0, 0, S_ORBINAUT_SHIELD1},	// S_ORBINAUT_SHIELD6
+	{SPR_ORBN,  6, 175, NULL, 0, 0, S_NULL},			// S_ORBINAUT_SHIELDDEAD
 
-	{SPR_JAWZ, 0, 1, {A_JawzChase}, 0, 0, S_JAWZ2},	// S_JAWZ1
-	{SPR_JAWZ, 4, 1, {A_JawzChase}, 0, 0, S_JAWZ3},	// S_JAWZ2
-	{SPR_JAWZ, 1, 1, {A_JawzChase}, 0, 0, S_JAWZ4},	// S_JAWZ3
-	{SPR_JAWZ, 4, 1, {A_JawzChase}, 0, 0, S_JAWZ5},	// S_JAWZ4
-	{SPR_JAWZ, 2, 1, {A_JawzChase}, 0, 0, S_JAWZ6},	// S_JAWZ5
-	{SPR_JAWZ, 4, 1, {A_JawzChase}, 0, 0, S_JAWZ7},	// S_JAWZ6
-	{SPR_JAWZ, 3, 1, {A_JawzChase}, 0, 0, S_JAWZ8},	// S_JAWZ7
-	{SPR_JAWZ, 4, 1, {A_JawzChase}, 0, 0, S_JAWZ1},	// S_JAWZ8
+	{SPR_JAWZ, 0, 1, A_JawzChase, 0, 0, S_JAWZ2},	// S_JAWZ1
+	{SPR_JAWZ, 4, 1, A_JawzChase, 0, 0, S_JAWZ3},	// S_JAWZ2
+	{SPR_JAWZ, 1, 1, A_JawzChase, 0, 0, S_JAWZ4},	// S_JAWZ3
+	{SPR_JAWZ, 4, 1, A_JawzChase, 0, 0, S_JAWZ5},	// S_JAWZ4
+	{SPR_JAWZ, 2, 1, A_JawzChase, 0, 0, S_JAWZ6},	// S_JAWZ5
+	{SPR_JAWZ, 4, 1, A_JawzChase, 0, 0, S_JAWZ7},	// S_JAWZ6
+	{SPR_JAWZ, 3, 1, A_JawzChase, 0, 0, S_JAWZ8},	// S_JAWZ7
+	{SPR_JAWZ, 4, 1, A_JawzChase, 0, 0, S_JAWZ1},	// S_JAWZ8
 
-	{SPR_JAWZ, 0, 1, {NULL}, 0, 0, S_JAWZ_DUD2},	// S_JAWZ_DUD1
-	{SPR_JAWZ, 4, 1, {NULL}, 0, 0, S_JAWZ_DUD3},	// S_JAWZ_DUD2
-	{SPR_JAWZ, 1, 1, {NULL}, 0, 0, S_JAWZ_DUD4},	// S_JAWZ_DUD3
-	{SPR_JAWZ, 4, 1, {NULL}, 0, 0, S_JAWZ_DUD5},	// S_JAWZ_DUD4
-	{SPR_JAWZ, 2, 1, {NULL}, 0, 0, S_JAWZ_DUD6},	// S_JAWZ_DUD5
-	{SPR_JAWZ, 4, 1, {NULL}, 0, 0, S_JAWZ_DUD7},	// S_JAWZ_DUD6
-	{SPR_JAWZ, 3, 1, {NULL}, 0, 0, S_JAWZ_DUD8},	// S_JAWZ_DUD7
-	{SPR_JAWZ, 4, 1, {NULL}, 0, 0, S_JAWZ_DUD1},	// S_JAWZ_DUD8
+	{SPR_JAWZ, 0, 1, NULL, 0, 0, S_JAWZ_DUD2},	// S_JAWZ_DUD1
+	{SPR_JAWZ, 4, 1, NULL, 0, 0, S_JAWZ_DUD3},	// S_JAWZ_DUD2
+	{SPR_JAWZ, 1, 1, NULL, 0, 0, S_JAWZ_DUD4},	// S_JAWZ_DUD3
+	{SPR_JAWZ, 4, 1, NULL, 0, 0, S_JAWZ_DUD5},	// S_JAWZ_DUD4
+	{SPR_JAWZ, 2, 1, NULL, 0, 0, S_JAWZ_DUD6},	// S_JAWZ_DUD5
+	{SPR_JAWZ, 4, 1, NULL, 0, 0, S_JAWZ_DUD7},	// S_JAWZ_DUD6
+	{SPR_JAWZ, 3, 1, NULL, 0, 0, S_JAWZ_DUD8},	// S_JAWZ_DUD7
+	{SPR_JAWZ, 4, 1, NULL, 0, 0, S_JAWZ_DUD1},	// S_JAWZ_DUD8
 
-	{SPR_JAWZ, 0, 1, {NULL}, 0, 0, S_JAWZ_SHIELD2},	// S_JAWZ_SHIELD1
-	{SPR_JAWZ, 4, 1, {NULL}, 0, 0, S_JAWZ_SHIELD3},	// S_JAWZ_SHIELD2
-	{SPR_JAWZ, 1, 1, {NULL}, 0, 0, S_JAWZ_SHIELD4},	// S_JAWZ_SHIELD3
-	{SPR_JAWZ, 4, 1, {NULL}, 0, 0, S_JAWZ_SHIELD5},	// S_JAWZ_SHIELD4
-	{SPR_JAWZ, 2, 1, {NULL}, 0, 0, S_JAWZ_SHIELD6},	// S_JAWZ_SHIELD5
-	{SPR_JAWZ, 4, 1, {NULL}, 0, 0, S_JAWZ_SHIELD7},	// S_JAWZ_SHIELD6
-	{SPR_JAWZ, 3, 1, {NULL}, 0, 0, S_JAWZ_SHIELD8},	// S_JAWZ_SHIELD7
-	{SPR_JAWZ, 4, 1, {NULL}, 0, 0, S_JAWZ_SHIELD1},	// S_JAWZ_SHIELD8
+	{SPR_JAWZ, 0, 1, NULL, 0, 0, S_JAWZ_SHIELD2},	// S_JAWZ_SHIELD1
+	{SPR_JAWZ, 4, 1, NULL, 0, 0, S_JAWZ_SHIELD3},	// S_JAWZ_SHIELD2
+	{SPR_JAWZ, 1, 1, NULL, 0, 0, S_JAWZ_SHIELD4},	// S_JAWZ_SHIELD3
+	{SPR_JAWZ, 4, 1, NULL, 0, 0, S_JAWZ_SHIELD5},	// S_JAWZ_SHIELD4
+	{SPR_JAWZ, 2, 1, NULL, 0, 0, S_JAWZ_SHIELD6},	// S_JAWZ_SHIELD5
+	{SPR_JAWZ, 4, 1, NULL, 0, 0, S_JAWZ_SHIELD7},	// S_JAWZ_SHIELD6
+	{SPR_JAWZ, 3, 1, NULL, 0, 0, S_JAWZ_SHIELD8},	// S_JAWZ_SHIELD7
+	{SPR_JAWZ, 4, 1, NULL, 0, 0, S_JAWZ_SHIELD1},	// S_JAWZ_SHIELD8
 
-	{SPR_JAWZ, 5, 175, {NULL}, 0, 0, S_JAWZ_DEAD2},	// S_JAWZ_DEAD1
-	{SPR_NULL, 0, 1, {A_JawzExplode}, 0, 0, S_NULL},	// S_JAWZ_DEAD2
+	{SPR_JAWZ, 5, 175, NULL, 0, 0, S_JAWZ_DEAD2},	// S_JAWZ_DEAD1
+	{SPR_NULL, 0, 1, A_JawzExplode, 0, 0, S_NULL},	// S_JAWZ_DEAD2
 
-	{SPR_RETI, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_PLAYERRETICULE
+	{SPR_RETI, FF_FULLBRIGHT, 2, NULL, 0, 0, S_NULL}, // S_PLAYERRETICULE
 
-	{SPR_SSMN,  0, 30, {NULL}, 0, 0, S_SSMINE2},						// S_SSMINE1
-	{SPR_SSMN,  3|FF_FULLBRIGHT,  3, {NULL}, 0, 0, S_SSMINE3},			// S_SSMINE2
-	{SPR_SSMN,  2|FF_FULLBRIGHT,  3, {NULL}, 0, 0, S_SSMINE4},			// S_SSMINE3
-	{SPR_SSMN,  1|FF_FULLBRIGHT,  3, {NULL}, 0, 0, S_SSMINE1},			// S_SSMINE4
-	{SPR_SSMN,  4,  1, {NULL}, 0, 0, S_SSMINE_SHIELD2},					// S_SSMINE_SHIELD1
-	{SPR_SSMN,  5|FF_FULLBRIGHT,  1, {NULL}, 0, 0, S_SSMINE_SHIELD1},	// S_SSMINE_SHIELD2
-	{SPR_SSMN,  4,  1, {NULL}, 0, 0, S_SSMINE_AIR2},					// S_SSMINE_AIR1
-	{SPR_SSMN,  5,  1, {NULL}, 0, 0, S_SSMINE_AIR1},					// S_SSMINE_AIR2
-	{SPR_SSMN,  6,  3, {NULL}, 0, 0, S_SSMINE_DEPLOY2},					// S_SSMINE_DEPLOY1
-	{SPR_SSMN,  7,  5, {NULL}, 0, 0, S_SSMINE_DEPLOY3},					// S_SSMINE_DEPLOY2
-	{SPR_SSMN,  8,  7, {NULL}, 0, 0, S_SSMINE_DEPLOY4},					// S_SSMINE_DEPLOY3
-	{SPR_SSMN,  9,  1, {NULL}, 0, 0, S_SSMINE_DEPLOY5},					// S_SSMINE_DEPLOY4
-	{SPR_SSMN, 10,  1, {NULL}, 0, 0, S_SSMINE_DEPLOY6},					// S_SSMINE_DEPLOY5
-	{SPR_SSMN,  9,  1, {NULL}, 0, 0, S_SSMINE_DEPLOY7},					// S_SSMINE_DEPLOY6
-	{SPR_SSMN, 10,  3, {NULL}, 0, 0, S_SSMINE_DEPLOY8},					// S_SSMINE_DEPLOY7
-	{SPR_SSMN, 11,  1, {A_PlaySound}, sfx_cdfm39, 1, S_SSMINE_DEPLOY9},	// S_SSMINE_DEPLOY8
-	{SPR_SSMN, 10,  1, {NULL}, 0, 0, S_SSMINE_DEPLOY10},				// S_SSMINE_DEPLOY9
-	{SPR_SSMN, 11,  3, {NULL}, 0, 0, S_SSMINE_DEPLOY11},				// S_SSMINE_DEPLOY10
-	{SPR_SSMN, 12,  3, {NULL}, 0, 0, S_SSMINE_DEPLOY12},				// S_SSMINE_DEPLOY11
-	{SPR_SSMN, 13,  3, {NULL}, 0, 0, S_SSMINE_DEPLOY13},				// S_SSMINE_DEPLOY12
-	{SPR_SSMN, 14,  3, {NULL}, 0, 0, S_SSMINE1},						// S_SSMINE_DEPLOY13
-	{SPR_SSMN,  3,  1, {A_MineExplode}, MT_MINEEXPLOSION, 0, S_NULL},	// S_SSMINE_EXPLODE
-	{SPR_NULL,  0,  6, {NULL}, 0, 0, S_MINEEXPLOSION2},					// S_MINEEXPLOSION1
-	{SPR_NULL,  1, 22, {A_ForceStop}, 0, 0, S_NULL},					// S_MINEEXPLOSION2
+	{SPR_SSMN,  0, 30, NULL, 0, 0, S_SSMINE2},						// S_SSMINE1
+	{SPR_SSMN,  3|FF_FULLBRIGHT,  3, NULL, 0, 0, S_SSMINE3},			// S_SSMINE2
+	{SPR_SSMN,  2|FF_FULLBRIGHT,  3, NULL, 0, 0, S_SSMINE4},			// S_SSMINE3
+	{SPR_SSMN,  1|FF_FULLBRIGHT,  3, NULL, 0, 0, S_SSMINE1},			// S_SSMINE4
+	{SPR_SSMN,  4,  1, NULL, 0, 0, S_SSMINE_SHIELD2},					// S_SSMINE_SHIELD1
+	{SPR_SSMN,  5|FF_FULLBRIGHT,  1, NULL, 0, 0, S_SSMINE_SHIELD1},	// S_SSMINE_SHIELD2
+	{SPR_SSMN,  4,  1, NULL, 0, 0, S_SSMINE_AIR2},					// S_SSMINE_AIR1
+	{SPR_SSMN,  5,  1, NULL, 0, 0, S_SSMINE_AIR1},					// S_SSMINE_AIR2
+	{SPR_SSMN,  6,  3, NULL, 0, 0, S_SSMINE_DEPLOY2},					// S_SSMINE_DEPLOY1
+	{SPR_SSMN,  7,  5, NULL, 0, 0, S_SSMINE_DEPLOY3},					// S_SSMINE_DEPLOY2
+	{SPR_SSMN,  8,  7, NULL, 0, 0, S_SSMINE_DEPLOY4},					// S_SSMINE_DEPLOY3
+	{SPR_SSMN,  9,  1, NULL, 0, 0, S_SSMINE_DEPLOY5},					// S_SSMINE_DEPLOY4
+	{SPR_SSMN, 10,  1, NULL, 0, 0, S_SSMINE_DEPLOY6},					// S_SSMINE_DEPLOY5
+	{SPR_SSMN,  9,  1, NULL, 0, 0, S_SSMINE_DEPLOY7},					// S_SSMINE_DEPLOY6
+	{SPR_SSMN, 10,  3, NULL, 0, 0, S_SSMINE_DEPLOY8},					// S_SSMINE_DEPLOY7
+	{SPR_SSMN, 11,  1, A_PlaySound, sfx_cdfm39, 1, S_SSMINE_DEPLOY9},	// S_SSMINE_DEPLOY8
+	{SPR_SSMN, 10,  1, NULL, 0, 0, S_SSMINE_DEPLOY10},				// S_SSMINE_DEPLOY9
+	{SPR_SSMN, 11,  3, NULL, 0, 0, S_SSMINE_DEPLOY11},				// S_SSMINE_DEPLOY10
+	{SPR_SSMN, 12,  3, NULL, 0, 0, S_SSMINE_DEPLOY12},				// S_SSMINE_DEPLOY11
+	{SPR_SSMN, 13,  3, NULL, 0, 0, S_SSMINE_DEPLOY13},				// S_SSMINE_DEPLOY12
+	{SPR_SSMN, 14,  3, NULL, 0, 0, S_SSMINE1},						// S_SSMINE_DEPLOY13
+	{SPR_SSMN,  3,  1, A_MineExplode, MT_MINEEXPLOSION, 0, S_NULL},	// S_SSMINE_EXPLODE
+	{SPR_NULL,  0,  6, NULL, 0, 0, S_MINEEXPLOSION2},					// S_MINEEXPLOSION1
+	{SPR_NULL,  1, 22, A_ForceStop, 0, 0, S_NULL},					// S_MINEEXPLOSION2
 
-	{SPR_KRBM, FF_FULLBRIGHT,   1, {NULL}, 0, 0, S_QUICKBOOM2},		// S_QUICKBOOM1
-	{SPR_KRBM, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_QUICKBOOM3},		// S_QUICKBOOM2
-	{SPR_KRBM, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_QUICKBOOM4},		// S_QUICKBOOM3
-	{SPR_KRBM, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_QUICKBOOM5},		// S_QUICKBOOM4
-	{SPR_KRBM, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_QUICKBOOM6},		// S_QUICKBOOM5
-	{SPR_KRBM, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_QUICKBOOM7},		// S_QUICKBOOM6
-	{SPR_KRBM, FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_QUICKBOOM8},		// S_QUICKBOOM7
-	{SPR_KRBM, FF_FULLBRIGHT|7, 2, {NULL}, 0, 0, S_QUICKBOOM9},		// S_QUICKBOOM8
-	{SPR_KRBM, FF_FULLBRIGHT|8, 2, {NULL}, 0, 0, S_QUICKBOOM10},		// S_QUICKBOOM9
-	{SPR_KRBM, FF_FULLBRIGHT|9, 2, {NULL}, 0, 0, S_NULL},				// S_QUICKBOOM10
+	{SPR_KRBM, FF_FULLBRIGHT,   1, NULL, 0, 0, S_QUICKBOOM2},		// S_QUICKBOOM1
+	{SPR_KRBM, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_QUICKBOOM3},		// S_QUICKBOOM2
+	{SPR_KRBM, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_QUICKBOOM4},		// S_QUICKBOOM3
+	{SPR_KRBM, FF_FULLBRIGHT|3, 1, NULL, 0, 0, S_QUICKBOOM5},		// S_QUICKBOOM4
+	{SPR_KRBM, FF_FULLBRIGHT|4, 1, NULL, 0, 0, S_QUICKBOOM6},		// S_QUICKBOOM5
+	{SPR_KRBM, FF_FULLBRIGHT|5, 1, NULL, 0, 0, S_QUICKBOOM7},		// S_QUICKBOOM6
+	{SPR_KRBM, FF_FULLBRIGHT|6, 1, NULL, 0, 0, S_QUICKBOOM8},		// S_QUICKBOOM7
+	{SPR_KRBM, FF_FULLBRIGHT|7, 2, NULL, 0, 0, S_QUICKBOOM9},		// S_QUICKBOOM8
+	{SPR_KRBM, FF_FULLBRIGHT|8, 2, NULL, 0, 0, S_QUICKBOOM10},		// S_QUICKBOOM9
+	{SPR_KRBM, FF_FULLBRIGHT|9, 2, NULL, 0, 0, S_NULL},				// S_QUICKBOOM10
 
-	{SPR_KRBM, FF_FULLBRIGHT,   3, {NULL}, 0, 0, S_SLOWBOOM2},		// S_SLOWBOOM1
-	{SPR_KRBM, FF_FULLBRIGHT|1, 3, {NULL}, 0, 0, S_SLOWBOOM3},		// S_SLOWBOOM2
-	{SPR_KRBM, FF_FULLBRIGHT|2, 3, {NULL}, 0, 0, S_SLOWBOOM4},		// S_SLOWKBOOM3
-	{SPR_KRBM, FF_FULLBRIGHT|3, 3, {NULL}, 0, 0, S_SLOWBOOM5},		// S_SLOWBOOM4
-	{SPR_KRBM, FF_FULLBRIGHT|4, 3, {NULL}, 0, 0, S_SLOWBOOM6},		// S_SLOWBOOM5
-	{SPR_KRBM, FF_FULLBRIGHT|5, 3, {NULL}, 0, 0, S_SLOWBOOM7},		// S_SLOWBOOM6
-	{SPR_KRBM, FF_FULLBRIGHT|6, 3, {NULL}, 0, 0, S_SLOWBOOM8},		// S_SLOWBOOM7
-	{SPR_KRBM, FF_FULLBRIGHT|7, 5, {NULL}, 0, 0, S_SLOWBOOM9},		// S_SLOWBOOM8
-	{SPR_KRBM, FF_FULLBRIGHT|8, 5, {NULL}, 0, 0, S_SLOWBOOM10},		// S_SLOWBOOM9
-	{SPR_KRBM, FF_FULLBRIGHT|9, 5, {NULL}, 0, 0, S_NULL},				// S_SLOWBOOM10
+	{SPR_KRBM, FF_FULLBRIGHT,   3, NULL, 0, 0, S_SLOWBOOM2},		// S_SLOWBOOM1
+	{SPR_KRBM, FF_FULLBRIGHT|1, 3, NULL, 0, 0, S_SLOWBOOM3},		// S_SLOWBOOM2
+	{SPR_KRBM, FF_FULLBRIGHT|2, 3, NULL, 0, 0, S_SLOWBOOM4},		// S_SLOWKBOOM3
+	{SPR_KRBM, FF_FULLBRIGHT|3, 3, NULL, 0, 0, S_SLOWBOOM5},		// S_SLOWBOOM4
+	{SPR_KRBM, FF_FULLBRIGHT|4, 3, NULL, 0, 0, S_SLOWBOOM6},		// S_SLOWBOOM5
+	{SPR_KRBM, FF_FULLBRIGHT|5, 3, NULL, 0, 0, S_SLOWBOOM7},		// S_SLOWBOOM6
+	{SPR_KRBM, FF_FULLBRIGHT|6, 3, NULL, 0, 0, S_SLOWBOOM8},		// S_SLOWBOOM7
+	{SPR_KRBM, FF_FULLBRIGHT|7, 5, NULL, 0, 0, S_SLOWBOOM9},		// S_SLOWBOOM8
+	{SPR_KRBM, FF_FULLBRIGHT|8, 5, NULL, 0, 0, S_SLOWBOOM10},		// S_SLOWBOOM9
+	{SPR_KRBM, FF_FULLBRIGHT|9, 5, NULL, 0, 0, S_NULL},				// S_SLOWBOOM10
 
-	{SPR_BHOG,               0, 3, {A_PlaySound}, sfx_s1bd, 1, S_BALLHOG2},	// S_BALLHOG1
-	{SPR_BHOG, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_BALLHOG3},					// S_BALLHOG2
-	{SPR_BHOG, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_BALLHOG4},					// S_BALLHOG3
-	{SPR_BHOG, FF_FULLBRIGHT|3, 3, {NULL}, 0, 0, S_BALLHOG5}, 				// S_BALLHOG4
-	{SPR_BHOG, FF_FULLBRIGHT|4, 3, {NULL}, 0, 0, S_BALLHOG6}, 				// S_BALLHOG5
-	{SPR_BHOG,               5, 2, {NULL}, 0, 0, S_BALLHOG7}, 				// S_BALLHOG6
-	{SPR_BHOG,               6, 1, {NULL}, 0, 0, S_BALLHOG8}, 				// S_BALLHOG7
-	{SPR_BHOG,               7, 1, {NULL}, 0, 0, S_BALLHOG1}, 				// S_BALLHOG8
-	{SPR_NULL,               0, 1, {A_BallhogExplode}, 0, 0, S_NULL},			// S_BALLHOG_DEAD
-	{SPR_BHBM, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_BALLHOGBOOM2},				// S_BALLHOGBOOM1
-	{SPR_BHBM, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_BALLHOGBOOM3},				// S_BALLHOGBOOM2
-	{SPR_BHBM, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_BALLHOGBOOM4},				// S_BALLHOGBOOM3
-	{SPR_BHBM, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_BALLHOGBOOM5},				// S_BALLHOGBOOM4
-	{SPR_BHBM, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_BALLHOGBOOM6},				// S_BALLHOGBOOM5
-	{SPR_BHBM, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_BALLHOGBOOM7},				// S_BALLHOGBOOM6
-	{SPR_BHBM, FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_BALLHOGBOOM8},				// S_BALLHOGBOOM7
-	{SPR_BHBM, FF_FULLBRIGHT|7, 1, {NULL}, 0, 0, S_BALLHOGBOOM9},				// S_BALLHOGBOOM8
-	{SPR_BHBM, FF_FULLBRIGHT|8, 1, {NULL}, 0, 0, S_BALLHOGBOOM10},			// S_BALLHOGBOOM9
-	{SPR_BHBM, FF_FULLBRIGHT|9, 1, {NULL}, 0, 0, S_BALLHOGBOOM11},			// S_BALLHOGBOOM10
-	{SPR_BHBM, FF_FULLBRIGHT|10, 1, {NULL}, 0, 0, S_BALLHOGBOOM12},			// S_BALLHOGBOOM11
-	{SPR_BHBM, FF_FULLBRIGHT|11, 1, {NULL}, 0, 0, S_BALLHOGBOOM13},			// S_BALLHOGBOOM12
-	{SPR_BHBM, FF_FULLBRIGHT|12, 1, {NULL}, 0, 0, S_BALLHOGBOOM14},			// S_BALLHOGBOOM13
-	{SPR_BHBM, FF_FULLBRIGHT|13, 1, {NULL}, 0, 0, S_BALLHOGBOOM15},			// S_BALLHOGBOOM14
-	{SPR_BHBM, FF_FULLBRIGHT|14, 1, {NULL}, 0, 0, S_BALLHOGBOOM16},			// S_BALLHOGBOOM15
-	{SPR_BHBM, FF_FULLBRIGHT|15, 1, {NULL}, 0, 0, S_NULL},					// S_BALLHOGBOOM16
+	{SPR_BHOG,               0, 3, A_PlaySound, sfx_s1bd, 1, S_BALLHOG2},	// S_BALLHOG1
+	{SPR_BHOG, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_BALLHOG3},					// S_BALLHOG2
+	{SPR_BHOG, FF_FULLBRIGHT|2, 2, NULL, 0, 0, S_BALLHOG4},					// S_BALLHOG3
+	{SPR_BHOG, FF_FULLBRIGHT|3, 3, NULL, 0, 0, S_BALLHOG5}, 				// S_BALLHOG4
+	{SPR_BHOG, FF_FULLBRIGHT|4, 3, NULL, 0, 0, S_BALLHOG6}, 				// S_BALLHOG5
+	{SPR_BHOG,               5, 2, NULL, 0, 0, S_BALLHOG7}, 				// S_BALLHOG6
+	{SPR_BHOG,               6, 1, NULL, 0, 0, S_BALLHOG8}, 				// S_BALLHOG7
+	{SPR_BHOG,               7, 1, NULL, 0, 0, S_BALLHOG1}, 				// S_BALLHOG8
+	{SPR_NULL,               0, 1, A_BallhogExplode, 0, 0, S_NULL},			// S_BALLHOG_DEAD
+	{SPR_BHBM, FF_FULLBRIGHT, 1, NULL, 0, 0, S_BALLHOGBOOM2},				// S_BALLHOGBOOM1
+	{SPR_BHBM, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_BALLHOGBOOM3},				// S_BALLHOGBOOM2
+	{SPR_BHBM, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_BALLHOGBOOM4},				// S_BALLHOGBOOM3
+	{SPR_BHBM, FF_FULLBRIGHT|3, 1, NULL, 0, 0, S_BALLHOGBOOM5},				// S_BALLHOGBOOM4
+	{SPR_BHBM, FF_FULLBRIGHT|4, 1, NULL, 0, 0, S_BALLHOGBOOM6},				// S_BALLHOGBOOM5
+	{SPR_BHBM, FF_FULLBRIGHT|5, 1, NULL, 0, 0, S_BALLHOGBOOM7},				// S_BALLHOGBOOM6
+	{SPR_BHBM, FF_FULLBRIGHT|6, 1, NULL, 0, 0, S_BALLHOGBOOM8},				// S_BALLHOGBOOM7
+	{SPR_BHBM, FF_FULLBRIGHT|7, 1, NULL, 0, 0, S_BALLHOGBOOM9},				// S_BALLHOGBOOM8
+	{SPR_BHBM, FF_FULLBRIGHT|8, 1, NULL, 0, 0, S_BALLHOGBOOM10},			// S_BALLHOGBOOM9
+	{SPR_BHBM, FF_FULLBRIGHT|9, 1, NULL, 0, 0, S_BALLHOGBOOM11},			// S_BALLHOGBOOM10
+	{SPR_BHBM, FF_FULLBRIGHT|10, 1, NULL, 0, 0, S_BALLHOGBOOM12},			// S_BALLHOGBOOM11
+	{SPR_BHBM, FF_FULLBRIGHT|11, 1, NULL, 0, 0, S_BALLHOGBOOM13},			// S_BALLHOGBOOM12
+	{SPR_BHBM, FF_FULLBRIGHT|12, 1, NULL, 0, 0, S_BALLHOGBOOM14},			// S_BALLHOGBOOM13
+	{SPR_BHBM, FF_FULLBRIGHT|13, 1, NULL, 0, 0, S_BALLHOGBOOM15},			// S_BALLHOGBOOM14
+	{SPR_BHBM, FF_FULLBRIGHT|14, 1, NULL, 0, 0, S_BALLHOGBOOM16},			// S_BALLHOGBOOM15
+	{SPR_BHBM, FF_FULLBRIGHT|15, 1, NULL, 0, 0, S_NULL},					// S_BALLHOGBOOM16
 
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0,  S_SPB2}, // S_SPB1
-	{SPR_SPBM, 1, 1, {A_SPBChase}, 0, 0,  S_SPB3}, // S_SPB2
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0,  S_SPB4}, // S_SPB3
-	{SPR_SPBM, 2, 1, {A_SPBChase}, 0, 0,  S_SPB5}, // S_SPB4
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0,  S_SPB6}, // S_SPB5
-	{SPR_SPBM, 3, 1, {A_SPBChase}, 0, 0,  S_SPB7}, // S_SPB6
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0,  S_SPB8}, // S_SPB7
-	{SPR_SPBM, 4, 1, {A_SPBChase}, 0, 0,  S_SPB9}, // S_SPB8
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0, S_SPB10}, // S_SPB9
-	{SPR_SPBM, 5, 1, {A_SPBChase}, 0, 0, S_SPB11}, // S_SPB10
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0, S_SPB12}, // S_SPB11
-	{SPR_SPBM, 6, 1, {A_SPBChase}, 0, 0, S_SPB13}, // S_SPB12
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0, S_SPB14}, // S_SPB13
-	{SPR_SPBM, 7, 1, {A_SPBChase}, 0, 0, S_SPB15}, // S_SPB14
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0, S_SPB16}, // S_SPB15
-	{SPR_SPBM, 8, 1, {A_SPBChase}, 0, 0, S_SPB17}, // S_SPB16
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0, S_SPB18}, // S_SPB17
-	{SPR_SPBM, 8, 1, {A_SPBChase}, 0, 0, S_SPB19}, // S_SPB18
-	{SPR_SPBM, 0, 1, {A_SPBChase}, 0, 0, S_SPB20}, // S_SPB19
-	{SPR_SPBM, 8, 1, {A_SPBChase}, 0, 0,  S_SPB1}, // S_SPB20
-	{SPR_SPBM, 8, 175, {NULL}, 0, 0, S_NULL}, // S_SPB_DEAD
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0,  S_SPB2}, // S_SPB1
+	{SPR_SPBM, 1, 1, A_SPBChase, 0, 0,  S_SPB3}, // S_SPB2
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0,  S_SPB4}, // S_SPB3
+	{SPR_SPBM, 2, 1, A_SPBChase, 0, 0,  S_SPB5}, // S_SPB4
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0,  S_SPB6}, // S_SPB5
+	{SPR_SPBM, 3, 1, A_SPBChase, 0, 0,  S_SPB7}, // S_SPB6
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0,  S_SPB8}, // S_SPB7
+	{SPR_SPBM, 4, 1, A_SPBChase, 0, 0,  S_SPB9}, // S_SPB8
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0, S_SPB10}, // S_SPB9
+	{SPR_SPBM, 5, 1, A_SPBChase, 0, 0, S_SPB11}, // S_SPB10
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0, S_SPB12}, // S_SPB11
+	{SPR_SPBM, 6, 1, A_SPBChase, 0, 0, S_SPB13}, // S_SPB12
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0, S_SPB14}, // S_SPB13
+	{SPR_SPBM, 7, 1, A_SPBChase, 0, 0, S_SPB15}, // S_SPB14
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0, S_SPB16}, // S_SPB15
+	{SPR_SPBM, 8, 1, A_SPBChase, 0, 0, S_SPB17}, // S_SPB16
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0, S_SPB18}, // S_SPB17
+	{SPR_SPBM, 8, 1, A_SPBChase, 0, 0, S_SPB19}, // S_SPB18
+	{SPR_SPBM, 0, 1, A_SPBChase, 0, 0, S_SPB20}, // S_SPB19
+	{SPR_SPBM, 8, 1, A_SPBChase, 0, 0,  S_SPB1}, // S_SPB20
+	{SPR_SPBM, 8, 175, NULL, 0, 0, S_NULL}, // S_SPB_DEAD
 
-	{SPR_THNS, FF_FULLBRIGHT|9,  2, {NULL}, 0, 0, S_THUNDERSHIELD2},		// S_THUNDERSHIELD1
-	{SPR_THNS, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_THUNDERSHIELD3},		// S_THUNDERSHIELD2
-	{SPR_THNS, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_THUNDERSHIELD4},		// S_THUNDERSHIELD3
-	{SPR_THNS, FF_FULLBRIGHT,    2, {NULL}, 0, 0, S_THUNDERSHIELD5},		// S_THUNDERSHIELD4
-	{SPR_THNS, FF_FULLBRIGHT|1,  2, {NULL}, 0, 0, S_THUNDERSHIELD6},		// S_THUNDERSHIELD5
-	{SPR_THNS, FF_FULLBRIGHT|2,  2, {NULL}, 0, 0, S_THUNDERSHIELD7},		// S_THUNDERSHIELD6
-	{SPR_THNS, FF_FULLBRIGHT|3,  2, {NULL}, 0, 0, S_THUNDERSHIELD8},		// S_THUNDERSHIELD7
-	{SPR_THNS, FF_FULLBRIGHT|4,  2, {NULL}, 0, 0, S_THUNDERSHIELD9},		// S_THUNDERSHIELD8
-	{SPR_THNS, FF_FULLBRIGHT|5,  2, {NULL}, 0, 0, S_THUNDERSHIELD10},		// S_THUNDERSHIELD9
-	{SPR_THNS, FF_FULLBRIGHT|6,  2, {NULL}, 0, 0, S_THUNDERSHIELD11},		// S_THUNDERSHIELD10
-	{SPR_THNS, FF_FULLBRIGHT|7,  2, {NULL}, 0, 0, S_THUNDERSHIELD12},		// S_THUNDERSHIELD11
-	{SPR_THNS, FF_FULLBRIGHT|8,  2, {NULL}, 0, 0, S_THUNDERSHIELD13},		// S_THUNDERSHIELD12
-	{SPR_THNS, FF_FULLBRIGHT|9,  2, {NULL}, 0, 0, S_THUNDERSHIELD14},		// S_THUNDERSHIELD13
-	{SPR_THNS, FF_FULLBRIGHT|10, 2, {NULL}, 0, 0, S_THUNDERSHIELD15},		// S_THUNDERSHIELD14
-	{SPR_THNS, FF_FULLBRIGHT|11, 2, {NULL}, 0, 0, S_THUNDERSHIELD16},		// S_THUNDERSHIELD15
-	{SPR_THNS, FF_FULLBRIGHT|8,  2, {NULL}, 0, 0, S_THUNDERSHIELD17},		// S_THUNDERSHIELD16
-	{SPR_THNS, FF_FULLBRIGHT|7,  2, {NULL}, 0, 0, S_THUNDERSHIELD18},		// S_THUNDERSHIELD17
-	{SPR_THNS, FF_FULLBRIGHT|6,  2, {NULL}, 0, 0, S_THUNDERSHIELD19},		// S_THUNDERSHIELD18
-	{SPR_THNS, FF_FULLBRIGHT|5,  2, {NULL}, 0, 0, S_THUNDERSHIELD20},		// S_THUNDERSHIELD19
-	{SPR_THNS, FF_FULLBRIGHT|4,  2, {NULL}, 0, 0, S_THUNDERSHIELD21},		// S_THUNDERSHIELD20
-	{SPR_THNS, FF_FULLBRIGHT|3,  2, {NULL}, 0, 0, S_THUNDERSHIELD22},		// S_THUNDERSHIELD21
-	{SPR_THNS, FF_FULLBRIGHT|2,  2, {NULL}, 0, 0, S_THUNDERSHIELD23},		// S_THUNDERSHIELD22
-	{SPR_THNS, FF_FULLBRIGHT|1,  2, {NULL}, 0, 0, S_THUNDERSHIELD24},		// S_THUNDERSHIELD23
-	{SPR_THNS, FF_FULLBRIGHT|0,  2, {NULL}, 0, 0, S_THUNDERSHIELD1},		// S_THUNDERSHIELD24
+	{SPR_THNS, FF_FULLBRIGHT|9,  2, NULL, 0, 0, S_THUNDERSHIELD2},		// S_THUNDERSHIELD1
+	{SPR_THNS, FF_FULLBRIGHT|10, 2, NULL, 0, 0, S_THUNDERSHIELD3},		// S_THUNDERSHIELD2
+	{SPR_THNS, FF_FULLBRIGHT|11, 2, NULL, 0, 0, S_THUNDERSHIELD4},		// S_THUNDERSHIELD3
+	{SPR_THNS, FF_FULLBRIGHT,    2, NULL, 0, 0, S_THUNDERSHIELD5},		// S_THUNDERSHIELD4
+	{SPR_THNS, FF_FULLBRIGHT|1,  2, NULL, 0, 0, S_THUNDERSHIELD6},		// S_THUNDERSHIELD5
+	{SPR_THNS, FF_FULLBRIGHT|2,  2, NULL, 0, 0, S_THUNDERSHIELD7},		// S_THUNDERSHIELD6
+	{SPR_THNS, FF_FULLBRIGHT|3,  2, NULL, 0, 0, S_THUNDERSHIELD8},		// S_THUNDERSHIELD7
+	{SPR_THNS, FF_FULLBRIGHT|4,  2, NULL, 0, 0, S_THUNDERSHIELD9},		// S_THUNDERSHIELD8
+	{SPR_THNS, FF_FULLBRIGHT|5,  2, NULL, 0, 0, S_THUNDERSHIELD10},		// S_THUNDERSHIELD9
+	{SPR_THNS, FF_FULLBRIGHT|6,  2, NULL, 0, 0, S_THUNDERSHIELD11},		// S_THUNDERSHIELD10
+	{SPR_THNS, FF_FULLBRIGHT|7,  2, NULL, 0, 0, S_THUNDERSHIELD12},		// S_THUNDERSHIELD11
+	{SPR_THNS, FF_FULLBRIGHT|8,  2, NULL, 0, 0, S_THUNDERSHIELD13},		// S_THUNDERSHIELD12
+	{SPR_THNS, FF_FULLBRIGHT|9,  2, NULL, 0, 0, S_THUNDERSHIELD14},		// S_THUNDERSHIELD13
+	{SPR_THNS, FF_FULLBRIGHT|10, 2, NULL, 0, 0, S_THUNDERSHIELD15},		// S_THUNDERSHIELD14
+	{SPR_THNS, FF_FULLBRIGHT|11, 2, NULL, 0, 0, S_THUNDERSHIELD16},		// S_THUNDERSHIELD15
+	{SPR_THNS, FF_FULLBRIGHT|8,  2, NULL, 0, 0, S_THUNDERSHIELD17},		// S_THUNDERSHIELD16
+	{SPR_THNS, FF_FULLBRIGHT|7,  2, NULL, 0, 0, S_THUNDERSHIELD18},		// S_THUNDERSHIELD17
+	{SPR_THNS, FF_FULLBRIGHT|6,  2, NULL, 0, 0, S_THUNDERSHIELD19},		// S_THUNDERSHIELD18
+	{SPR_THNS, FF_FULLBRIGHT|5,  2, NULL, 0, 0, S_THUNDERSHIELD20},		// S_THUNDERSHIELD19
+	{SPR_THNS, FF_FULLBRIGHT|4,  2, NULL, 0, 0, S_THUNDERSHIELD21},		// S_THUNDERSHIELD20
+	{SPR_THNS, FF_FULLBRIGHT|3,  2, NULL, 0, 0, S_THUNDERSHIELD22},		// S_THUNDERSHIELD21
+	{SPR_THNS, FF_FULLBRIGHT|2,  2, NULL, 0, 0, S_THUNDERSHIELD23},		// S_THUNDERSHIELD22
+	{SPR_THNS, FF_FULLBRIGHT|1,  2, NULL, 0, 0, S_THUNDERSHIELD24},		// S_THUNDERSHIELD23
+	{SPR_THNS, FF_FULLBRIGHT|0,  2, NULL, 0, 0, S_THUNDERSHIELD1},		// S_THUNDERSHIELD24
 
-	{SPR_SINK, 0,  1, {A_SmokeTrailer}, MT_SINKTRAIL, 0, S_SINK},	// S_SINK
-	{SPR_SINK, 0|FF_TRANS80|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_SINK_SHIELD}, // S_SINK_SHIELD
-	{SPR_SITR, 0,  1, {NULL}, 0, 0, S_SINKTRAIL2},				// S_SINKTRAIL1
-	{SPR_SITR, 1,  5, {NULL}, 0, 0, S_SINKTRAIL3},				// S_SINKTRAIL2
-	{SPR_SITR, 2,  3, {NULL}, 0, 0, S_NULL},						// S_SINKTRAIL3
+	{SPR_SINK, 0,  1, A_SmokeTrailer, MT_SINKTRAIL, 0, S_SINK},	// S_SINK
+	{SPR_SINK, 0|FF_TRANS80|FF_FULLBRIGHT, -1, NULL, 0, 0, S_SINK_SHIELD}, // S_SINK_SHIELD
+	{SPR_SITR, 0,  1, NULL, 0, 0, S_SINKTRAIL2},				// S_SINKTRAIL1
+	{SPR_SITR, 1,  5, NULL, 0, 0, S_SINKTRAIL3},				// S_SINKTRAIL2
+	{SPR_SITR, 2,  3, NULL, 0, 0, S_NULL},						// S_SINKTRAIL3
 
-	{SPR_KBLN, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_BATTLEBUMPER1}, // S_BATTLEBUMPER1
-	{SPR_KBLN, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_BATTLEBUMPER2}, // S_BATTLEBUMPER2
-	{SPR_KBLN, FF_FULLBRIGHT|2, -1, {NULL}, 0, 0, S_BATTLEBUMPER3}, // S_BATTLEBUMPER3
+	{SPR_KBLN, FF_FULLBRIGHT, -1, NULL, 0, 0, S_BATTLEBUMPER1}, // S_BATTLEBUMPER1
+	{SPR_KBLN, FF_FULLBRIGHT|1, -1, NULL, 0, 0, S_BATTLEBUMPER2}, // S_BATTLEBUMPER2
+	{SPR_KBLN, FF_FULLBRIGHT|2, -1, NULL, 0, 0, S_BATTLEBUMPER3}, // S_BATTLEBUMPER3
 
-	{SPR_DEZL, FF_FULLBRIGHT|FF_PAPERSPRITE, 8, {NULL}, 0, 0, S_NULL},  // S_DEZLASER
+	{SPR_DEZL, FF_FULLBRIGHT|FF_PAPERSPRITE, 8, NULL, 0, 0, S_NULL},  // S_DEZLASER
 
-	{SPR_NULL, 0,  1, {A_RandomStateRange}, S_AUDIENCE_CHAO_CHEER1, S_AUDIENCE_CHAO_CHEER2, S_RANDOMAUDIENCE}, // S_RANDOMAUDIENCE
+	{SPR_NULL, 0,  1, A_RandomStateRange, S_AUDIENCE_CHAO_CHEER1, S_AUDIENCE_CHAO_CHEER2, S_RANDOMAUDIENCE}, // S_RANDOMAUDIENCE
 
-	{SPR_AUDI, 0,  5, {NULL},       0, 0, S_AUDIENCE_CHAO_CHEER2}, // S_AUDIENCE_CHAO_CHEER1
-	{SPR_AUDI, 1, 20, {A_BunnyHop}, 7, 0, S_AUDIENCE_CHAO_CHEER1}, // S_AUDIENCE_CHAO_CHEER2
+	{SPR_AUDI, 0,  5, NULL,       0, 0, S_AUDIENCE_CHAO_CHEER2}, // S_AUDIENCE_CHAO_CHEER1
+	{SPR_AUDI, 1, 20, A_BunnyHop, 7, 0, S_AUDIENCE_CHAO_CHEER1}, // S_AUDIENCE_CHAO_CHEER2
 
-	{SPR_AUDI, 2,  5, {NULL},       0, 0, S_AUDIENCE_CHAO_WIN2}, // S_AUDIENCE_CHAO_WIN1
-	{SPR_AUDI, 3, 25, {A_BunnyHop}, 10, 0, S_AUDIENCE_CHAO_WIN1}, // S_AUDIENCE_CHAO_WIN2
+	{SPR_AUDI, 2,  5, NULL,       0, 0, S_AUDIENCE_CHAO_WIN2}, // S_AUDIENCE_CHAO_WIN1
+	{SPR_AUDI, 3, 25, A_BunnyHop, 10, 0, S_AUDIENCE_CHAO_WIN1}, // S_AUDIENCE_CHAO_WIN2
 
-	{SPR_AUDI, 4|FF_ANIMATE,  -1, {NULL},       1, 17, S_NULL}, // S_AUDIENCE_CHAO_LOSE
+	{SPR_AUDI, 4|FF_ANIMATE,  -1, NULL,       1, 17, S_NULL}, // S_AUDIENCE_CHAO_LOSE
 
-	{SPR_FLAM,  0,  3, {NULL}, 0, 0, S_FLAYM2}, // S_FLAYM1,
-	{SPR_FLAM,  1,  3, {NULL}, 0, 0, S_FLAYM3}, // S_FLAYM2,
-	{SPR_FLAM,  2,  3, {NULL}, 0, 0, S_FLAYM4}, // S_FLAYM3,
-	{SPR_FLAM,  3,  3, {NULL}, 0, 0, S_FLAYM1}, // S_FLAYM4,
+	{SPR_FLAM,  0,  3, NULL, 0, 0, S_FLAYM2}, // S_FLAYM1,
+	{SPR_FLAM,  1,  3, NULL, 0, 0, S_FLAYM3}, // S_FLAYM2,
+	{SPR_FLAM,  2,  3, NULL, 0, 0, S_FLAYM4}, // S_FLAYM3,
+	{SPR_FLAM,  3,  3, NULL, 0, 0, S_FLAYM1}, // S_FLAYM4,
 
-	{SPR_DECO, 0, -1, {NULL}, 0, 0, S_NULL}, // S_DEVIL,
-	{SPR_DECO, 1, -1, {NULL}, 0, 0, S_NULL}, // S_ANGEL,
-	{SPR_DECO, 2, -1, {NULL}, 0, 0, S_NULL}, // S_PALMTREE,
-	{SPR_DECO, 3, -1, {NULL}, 0, 0, S_NULL}, // S_FLAG,
-	{SPR_DECO, 4, -1, {NULL}, 0, 0, S_NULL}, // S_HEDGEHOG,
-	{SPR_DECO, 5, -1, {NULL}, 0, 0, S_NULL}, // S_BUSH1,
-	{SPR_DECO, 6, -1, {NULL}, 0, 0, S_NULL}, // S_TWEE,
-	{SPR_DECO, 7, -1, {NULL}, 0, 0, S_NULL}, // S_HYDRANT,
+	{SPR_DECO, 0, -1, NULL, 0, 0, S_NULL}, // S_DEVIL,
+	{SPR_DECO, 1, -1, NULL, 0, 0, S_NULL}, // S_ANGEL,
+	{SPR_DECO, 2, -1, NULL, 0, 0, S_NULL}, // S_PALMTREE,
+	{SPR_DECO, 3, -1, NULL, 0, 0, S_NULL}, // S_FLAG,
+	{SPR_DECO, 4, -1, NULL, 0, 0, S_NULL}, // S_HEDGEHOG,
+	{SPR_DECO, 5, -1, NULL, 0, 0, S_NULL}, // S_BUSH1,
+	{SPR_DECO, 6, -1, NULL, 0, 0, S_NULL}, // S_TWEE,
+	{SPR_DECO, 7, -1, NULL, 0, 0, S_NULL}, // S_HYDRANT,
 
-	{SPR_DECO, FF_FULLBRIGHT|8,  3, {A_FishJump}, 0, 0, S_BIGPUMA2}, //S_BIGPUMA1
-	{SPR_DECO, FF_FULLBRIGHT|9,  3, {A_FishJump}, 0, 0, S_BIGPUMA3}, //S_BIGPUMA2
-	{SPR_DECO, FF_FULLBRIGHT|10, 3, {A_FishJump}, 0, 0, S_BIGPUMA1}, //S_BIGPUMA3
-	{SPR_DECO, FF_FULLBRIGHT|11, 3, {A_FishJump}, 0, 0, S_BIGPUMA5}, //S_BIGPUMA4
-	{SPR_DECO, FF_FULLBRIGHT|12, 3, {A_FishJump}, 0, 0, S_BIGPUMA6}, //S_BIGPUMA5
-	{SPR_DECO, FF_FULLBRIGHT|13, 3, {A_FishJump}, 0, 0, S_BIGPUMA4}, //S_BIGPUMA6
+	{SPR_DECO, FF_FULLBRIGHT|8,  3, A_FishJump, 0, 0, S_BIGPUMA2}, //S_BIGPUMA1
+	{SPR_DECO, FF_FULLBRIGHT|9,  3, A_FishJump, 0, 0, S_BIGPUMA3}, //S_BIGPUMA2
+	{SPR_DECO, FF_FULLBRIGHT|10, 3, A_FishJump, 0, 0, S_BIGPUMA1}, //S_BIGPUMA3
+	{SPR_DECO, FF_FULLBRIGHT|11, 3, A_FishJump, 0, 0, S_BIGPUMA5}, //S_BIGPUMA4
+	{SPR_DECO, FF_FULLBRIGHT|12, 3, A_FishJump, 0, 0, S_BIGPUMA6}, //S_BIGPUMA5
+	{SPR_DECO, FF_FULLBRIGHT|13, 3, A_FishJump, 0, 0, S_BIGPUMA4}, //S_BIGPUMA6
 
-	{SPR_DECO, FF_FULLBRIGHT|14, 2, {NULL}, 0, 0, S_APPLE2}, //S_APPLE1
-	{SPR_DECO, FF_FULLBRIGHT|15, 2, {NULL}, 0, 0, S_APPLE3}, //S_APPLE2
-	{SPR_DECO, FF_FULLBRIGHT|16, 2, {NULL}, 0, 0, S_APPLE4}, //S_APPLE3
-	{SPR_DECO, FF_FULLBRIGHT|17, 2, {NULL}, 0, 0, S_APPLE5}, //S_APPLE4
-	{SPR_DECO, FF_FULLBRIGHT|18, 2, {NULL}, 0, 0, S_APPLE6}, //S_APPLE5
-	{SPR_DECO, FF_FULLBRIGHT|19, 2, {NULL}, 0, 0, S_APPLE7}, //S_APPLE6
-	{SPR_DECO, FF_FULLBRIGHT|20, 2, {NULL}, 0, 0, S_APPLE8}, //S_APPLE7
-	{SPR_DECO, FF_FULLBRIGHT|21, 2, {NULL}, 0, 0, S_APPLE1}, //S_APPLE8
+	{SPR_DECO, FF_FULLBRIGHT|14, 2, NULL, 0, 0, S_APPLE2}, //S_APPLE1
+	{SPR_DECO, FF_FULLBRIGHT|15, 2, NULL, 0, 0, S_APPLE3}, //S_APPLE2
+	{SPR_DECO, FF_FULLBRIGHT|16, 2, NULL, 0, 0, S_APPLE4}, //S_APPLE3
+	{SPR_DECO, FF_FULLBRIGHT|17, 2, NULL, 0, 0, S_APPLE5}, //S_APPLE4
+	{SPR_DECO, FF_FULLBRIGHT|18, 2, NULL, 0, 0, S_APPLE6}, //S_APPLE5
+	{SPR_DECO, FF_FULLBRIGHT|19, 2, NULL, 0, 0, S_APPLE7}, //S_APPLE6
+	{SPR_DECO, FF_FULLBRIGHT|20, 2, NULL, 0, 0, S_APPLE8}, //S_APPLE7
+	{SPR_DECO, FF_FULLBRIGHT|21, 2, NULL, 0, 0, S_APPLE1}, //S_APPLE8
 
-	{SPR_DOOD, 0, -1, {NULL}, 0, 0, S_NULL},         // S_DOOD_FLOWER1
-	{SPR_DOOD, 1, 14, {NULL}, 0, 0, S_DOOD_FLOWER3}, // S_DOOD_FLOWER2
-	{SPR_DOOD, 2, 14, {NULL}, 0, 0, S_DOOD_FLOWER2}, // S_DOOD_FLOWER3
-	{SPR_DOOD, 3,  7, {NULL}, 0, 0, S_DOOD_FLOWER5}, // S_DOOD_FLOWER4
-	{SPR_DOOD, 4,  7, {NULL}, 0, 0, S_DOOD_FLOWER4}, // S_DOOD_FLOWER5
-	{SPR_DOOD, 5, -1, {NULL}, 0, 0, S_NULL},         // S_DOOD_FLOWER6
+	{SPR_DOOD, 0, -1, NULL, 0, 0, S_NULL},         // S_DOOD_FLOWER1
+	{SPR_DOOD, 1, 14, NULL, 0, 0, S_DOOD_FLOWER3}, // S_DOOD_FLOWER2
+	{SPR_DOOD, 2, 14, NULL, 0, 0, S_DOOD_FLOWER2}, // S_DOOD_FLOWER3
+	{SPR_DOOD, 3,  7, NULL, 0, 0, S_DOOD_FLOWER5}, // S_DOOD_FLOWER4
+	{SPR_DOOD, 4,  7, NULL, 0, 0, S_DOOD_FLOWER4}, // S_DOOD_FLOWER5
+	{SPR_DOOD, 5, -1, NULL, 0, 0, S_NULL},         // S_DOOD_FLOWER6
 
-	{SPR_DOOD,  6, 2, {NULL}, 0, 0, S_DOOD_BOX2}, // S_DOOD_BOX1
-	{SPR_DOOD,  7, 2, {NULL}, 0, 0, S_DOOD_BOX3}, // S_DOOD_BOX2
-	{SPR_DOOD,  8, 2, {NULL}, 0, 0, S_DOOD_BOX4}, // S_DOOD_BOX3
-	{SPR_DOOD,  9, 2, {NULL}, 0, 0, S_DOOD_BOX5}, // S_DOOD_BOX4
-	{SPR_DOOD, 10, 2, {NULL}, 0, 0, S_DOOD_BOX1}, // S_DOOD_BOX5
+	{SPR_DOOD,  6, 2, NULL, 0, 0, S_DOOD_BOX2}, // S_DOOD_BOX1
+	{SPR_DOOD,  7, 2, NULL, 0, 0, S_DOOD_BOX3}, // S_DOOD_BOX2
+	{SPR_DOOD,  8, 2, NULL, 0, 0, S_DOOD_BOX4}, // S_DOOD_BOX3
+	{SPR_DOOD,  9, 2, NULL, 0, 0, S_DOOD_BOX5}, // S_DOOD_BOX4
+	{SPR_DOOD, 10, 2, NULL, 0, 0, S_DOOD_BOX1}, // S_DOOD_BOX5
 
-	{SPR_DOOD, 11, -1, {NULL}, 0, 0, S_NULL}, // S_DOOD_BALLOON
+	{SPR_DOOD, 11, -1, NULL, 0, 0, S_NULL}, // S_DOOD_BALLOON
 
-	{SPR_BRNG, 0, 2, {NULL}, 0, 0, S_BIGRING02}, // S_BIGRING01
-	{SPR_BRNG, 1, 2, {NULL}, 0, 0, S_BIGRING03}, // S_BIGRING02
-	{SPR_BRNG, 2, 2, {NULL}, 0, 0, S_BIGRING04}, // S_BIGRING03
-	{SPR_BRNG, 3, 2, {NULL}, 0, 0, S_BIGRING05}, // S_BIGRING04
-	{SPR_BRNG, 4, 2, {NULL}, 0, 0, S_BIGRING06}, // S_BIGRING05
-	{SPR_BRNG, 5, 2, {NULL}, 0, 0, S_BIGRING07}, // S_BIGRING06
-	{SPR_BRNG, 6, 2, {NULL}, 0, 0, S_BIGRING08}, // S_BIGRING05
-	{SPR_BRNG, 7, 2, {NULL}, 0, 0, S_BIGRING09}, // S_BIGRING05
-	{SPR_BRNG, 8, 2, {NULL}, 0, 0, S_BIGRING10}, // S_BIGRING05
-	{SPR_BRNG, 9, 2, {NULL}, 0, 0, S_BIGRING11}, // S_BIGRING10
-	{SPR_BRNG, 10, 2, {NULL}, 0, 0, S_BIGRING12}, // S_BIGRING11
-	{SPR_BRNG, 11, 2, {NULL}, 0, 0, S_BIGRING01}, // S_BIGRING12
+	{SPR_BRNG, 0, 2, NULL, 0, 0, S_BIGRING02}, // S_BIGRING01
+	{SPR_BRNG, 1, 2, NULL, 0, 0, S_BIGRING03}, // S_BIGRING02
+	{SPR_BRNG, 2, 2, NULL, 0, 0, S_BIGRING04}, // S_BIGRING03
+	{SPR_BRNG, 3, 2, NULL, 0, 0, S_BIGRING05}, // S_BIGRING04
+	{SPR_BRNG, 4, 2, NULL, 0, 0, S_BIGRING06}, // S_BIGRING05
+	{SPR_BRNG, 5, 2, NULL, 0, 0, S_BIGRING07}, // S_BIGRING06
+	{SPR_BRNG, 6, 2, NULL, 0, 0, S_BIGRING08}, // S_BIGRING05
+	{SPR_BRNG, 7, 2, NULL, 0, 0, S_BIGRING09}, // S_BIGRING05
+	{SPR_BRNG, 8, 2, NULL, 0, 0, S_BIGRING10}, // S_BIGRING05
+	{SPR_BRNG, 9, 2, NULL, 0, 0, S_BIGRING11}, // S_BIGRING10
+	{SPR_BRNG, 10, 2, NULL, 0, 0, S_BIGRING12}, // S_BIGRING11
+	{SPR_BRNG, 11, 2, NULL, 0, 0, S_BIGRING01}, // S_BIGRING12
 
-	{SPR_SNES, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH1
-	{SPR_SNES, 1, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH2
-	{SPR_SNES, 2, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH3
+	{SPR_SNES, 0, -1, NULL, 0, 0, S_NULL}, // S_SNES_DONUTBUSH1
+	{SPR_SNES, 1, -1, NULL, 0, 0, S_NULL}, // S_SNES_DONUTBUSH2
+	{SPR_SNES, 2, -1, NULL, 0, 0, S_NULL}, // S_SNES_DONUTBUSH3
 
-	{SPR_GBAS, 131072, 12, {NULL}, 0, 0, S_GBA_BOO2}, // S_GBA_BOO1
-	{SPR_GBAS, 196609, 12, {NULL}, 0, 0, S_GBA_BOO3}, // S_GBA_BOO2
-	{SPR_GBAS, 262146, 12, {NULL}, 0, 0, S_GBA_BOO4}, // S_GBA_BOO3
-	{SPR_GBAS, 196611, 12, {NULL}, 0, 0, S_GBA_BOO1}, // S_GBA_BOO4
+	{SPR_GBAS, 131072, 12, NULL, 0, 0, S_GBA_BOO2}, // S_GBA_BOO1
+	{SPR_GBAS, 196609, 12, NULL, 0, 0, S_GBA_BOO3}, // S_GBA_BOO2
+	{SPR_GBAS, 262146, 12, NULL, 0, 0, S_GBA_BOO4}, // S_GBA_BOO3
+	{SPR_GBAS, 196611, 12, NULL, 0, 0, S_GBA_BOO1}, // S_GBA_BOO4
 
-	{SPR_BUZB, 0, 2, {A_Look},  0, 0, S_BUZZBOMBER_LOOK2}, // S_BUZZBOMBER_LOOK1
-	{SPR_BUZB, 1, 2, {A_Look},  0, 0, S_BUZZBOMBER_LOOK1}, // S_BUZZBOMBER_LOOK2
-	{SPR_BUZB, 0, 1, {A_Chase}, 0, 0, S_BUZZBOMBER_FLY2},  // S_BUZZBOMBER_FLY1
-	{SPR_BUZB, 0, 1, {A_Chase}, 0, 0, S_BUZZBOMBER_FLY3},  // S_BUZZBOMBER_FLY2
-	{SPR_BUZB, 1, 1, {A_Chase}, 0, 0, S_BUZZBOMBER_FLY4},  // S_BUZZBOMBER_FLY3
-	{SPR_BUZB, 1, 1, {A_Chase}, 0, 0, S_BUZZBOMBER_FLY1},  // S_BUZZBOMBER_FLY4
+	{SPR_BUZB, 0, 2, A_Look,  0, 0, S_BUZZBOMBER_LOOK2}, // S_BUZZBOMBER_LOOK1
+	{SPR_BUZB, 1, 2, A_Look,  0, 0, S_BUZZBOMBER_LOOK1}, // S_BUZZBOMBER_LOOK2
+	{SPR_BUZB, 0, 1, A_Chase, 0, 0, S_BUZZBOMBER_FLY2},  // S_BUZZBOMBER_FLY1
+	{SPR_BUZB, 0, 1, A_Chase, 0, 0, S_BUZZBOMBER_FLY3},  // S_BUZZBOMBER_FLY2
+	{SPR_BUZB, 1, 1, A_Chase, 0, 0, S_BUZZBOMBER_FLY4},  // S_BUZZBOMBER_FLY3
+	{SPR_BUZB, 1, 1, A_Chase, 0, 0, S_BUZZBOMBER_FLY1},  // S_BUZZBOMBER_FLY4
 
-	{SPR_CHOM, 0,  1, {NULL},                    0,   0, S_CHOMPER_HOP1},       // S_CHOMPER_SPAWN
-	{SPR_CHOM, 1, 20, {A_BunnyHop},              9,  32, S_CHOMPER_HOP2},       // S_CHOMPER_HOP1
-	{SPR_CHOM, 0, 20, {NULL},                    0,   0, S_CHOMPER_TURNAROUND}, // S_CHOMPER_HOP2
-	{SPR_CHOM, 0, 35, {A_ChangeAngleRelative}, 180, 180, S_CHOMPER_HOP1},       // S_CHOMPER_TURNAROUND
+	{SPR_CHOM, 0,  1, NULL,                    0,   0, S_CHOMPER_HOP1},       // S_CHOMPER_SPAWN
+	{SPR_CHOM, 1, 20, A_BunnyHop,              9,  32, S_CHOMPER_HOP2},       // S_CHOMPER_HOP1
+	{SPR_CHOM, 0, 20, NULL,                    0,   0, S_CHOMPER_TURNAROUND}, // S_CHOMPER_HOP2
+	{SPR_CHOM, 0, 35, A_ChangeAngleRelative, 180, 180, S_CHOMPER_HOP1},       // S_CHOMPER_TURNAROUND
 
-	{SPR_SACO, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PALMTREE2
-	{SPR_SACO, 1, -1, {NULL}, 0, 0, S_NULL}, // S_PURPLEFLOWER1
-	{SPR_SACO, 2, -1, {NULL}, 0, 0, S_NULL}, // S_PURPLEFLOWER2
-	{SPR_SACO, 3, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWFLOWER1
-	{SPR_SACO, 4, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWFLOWER2
-	{SPR_SACO, 5, -1, {NULL}, 0, 0, S_NULL}, // S_PLANT2
-	{SPR_SACO, 6, -1, {NULL}, 0, 0, S_NULL}, // S_PLANT3
-	{SPR_SACO, 7, -1, {NULL}, 0, 0, S_NULL}, // S_PLANT4
+	{SPR_SACO, 0, -1, NULL, 0, 0, S_NULL}, // S_PALMTREE2
+	{SPR_SACO, 1, -1, NULL, 0, 0, S_NULL}, // S_PURPLEFLOWER1
+	{SPR_SACO, 2, -1, NULL, 0, 0, S_NULL}, // S_PURPLEFLOWER2
+	{SPR_SACO, 3, -1, NULL, 0, 0, S_NULL}, // S_YELLOWFLOWER1
+	{SPR_SACO, 4, -1, NULL, 0, 0, S_NULL}, // S_YELLOWFLOWER2
+	{SPR_SACO, 5, -1, NULL, 0, 0, S_NULL}, // S_PLANT2
+	{SPR_SACO, 6, -1, NULL, 0, 0, S_NULL}, // S_PLANT3
+	{SPR_SACO, 7, -1, NULL, 0, 0, S_NULL}, // S_PLANT4
 
-	{SPR_CRAB,  0, -1, {NULL}, 0, 0, S_NULL},        // S_SKULL
-	{SPR_CRAB,  1, -1, {NULL}, 0, 0, S_NULL},        // S_PHANTREE
-	{SPR_CRAB,  2,  2, {NULL}, 0, 0, S_FLYINGGARG2}, // S_FLYINGGARG1
-	{SPR_CRAB,  3,  2, {NULL}, 0, 0, S_FLYINGGARG3}, // S_FLYINGGARG2
-	{SPR_CRAB,  4,  2, {NULL}, 0, 0, S_FLYINGGARG4}, // S_FLYINGGARG3
-	{SPR_CRAB,  5,  2, {NULL}, 0, 0, S_FLYINGGARG5}, // S_FLYINGGARG4
-	{SPR_CRAB,  6,  2, {NULL}, 0, 0, S_FLYINGGARG6}, // S_FLYINGGARG5
-	{SPR_CRAB,  7,  2, {NULL}, 0, 0, S_FLYINGGARG7}, // S_FLYINGGARG6
-	{SPR_CRAB,  8,  2, {NULL}, 0, 0, S_FLYINGGARG8}, // S_FLYINGGARG7
-	{SPR_CRAB,  9,  2, {NULL}, 0, 0, S_FLYINGGARG1}, // S_FLYINGGARG8
-	{SPR_CRAB, 10, -1, {NULL}, 0, 0, S_NULL},        // S_LAMPPOST
-	{SPR_CRAB, 11, -1, {NULL}, 0, 0, S_NULL},        // S_MOSSYTREE
+	{SPR_CRAB,  0, -1, NULL, 0, 0, S_NULL},        // S_SKULL
+	{SPR_CRAB,  1, -1, NULL, 0, 0, S_NULL},        // S_PHANTREE
+	{SPR_CRAB,  2,  2, NULL, 0, 0, S_FLYINGGARG2}, // S_FLYINGGARG1
+	{SPR_CRAB,  3,  2, NULL, 0, 0, S_FLYINGGARG3}, // S_FLYINGGARG2
+	{SPR_CRAB,  4,  2, NULL, 0, 0, S_FLYINGGARG4}, // S_FLYINGGARG3
+	{SPR_CRAB,  5,  2, NULL, 0, 0, S_FLYINGGARG5}, // S_FLYINGGARG4
+	{SPR_CRAB,  6,  2, NULL, 0, 0, S_FLYINGGARG6}, // S_FLYINGGARG5
+	{SPR_CRAB,  7,  2, NULL, 0, 0, S_FLYINGGARG7}, // S_FLYINGGARG6
+	{SPR_CRAB,  8,  2, NULL, 0, 0, S_FLYINGGARG8}, // S_FLYINGGARG7
+	{SPR_CRAB,  9,  2, NULL, 0, 0, S_FLYINGGARG1}, // S_FLYINGGARG8
+	{SPR_CRAB, 10, -1, NULL, 0, 0, S_NULL},        // S_LAMPPOST
+	{SPR_CRAB, 11, -1, NULL, 0, 0, S_NULL},        // S_MOSSYTREE
 
 	// Fake Shadow
-	{SPR_SHAD, FF_TRANS50, -1, {NULL}, 0, 0, S_NULL}, // S_SHADOW
-	{SPR_SHAD, FF_FULLBRIGHT|FF_TRANS50|1, -1, {NULL}, 0, 0, S_NULL}, // S_WHITESHADOW
+	{SPR_SHAD, FF_TRANS50, -1, NULL, 0, 0, S_NULL}, // S_SHADOW
+	{SPR_SHAD, FF_FULLBRIGHT|FF_TRANS50|1, -1, NULL, 0, 0, S_NULL}, // S_WHITESHADOW
 
-	{SPR_BUMP, FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_BUMP2}, // S_BUMP1
-	{SPR_BUMP, FF_FULLBRIGHT|1, 3, {NULL}, 0, 0, S_BUMP3}, // S_BUMP2
-	{SPR_BUMP, FF_FULLBRIGHT|2, 3, {NULL}, 0, 0, S_NULL}, // S_BUMP3
+	{SPR_BUMP, FF_FULLBRIGHT, 3, NULL, 0, 0, S_BUMP2}, // S_BUMP1
+	{SPR_BUMP, FF_FULLBRIGHT|1, 3, NULL, 0, 0, S_BUMP3}, // S_BUMP2
+	{SPR_BUMP, FF_FULLBRIGHT|2, 3, NULL, 0, 0, S_NULL}, // S_BUMP3
 
-	{SPR_FLEN, FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_FLINGENERGY2}, // S_FLINGENERGY1,
-	{SPR_FLEN, FF_FULLBRIGHT|1, 3, {NULL}, 0, 0, S_FLINGENERGY3}, // S_FLINGENERGY2,
-	{SPR_FLEN, FF_FULLBRIGHT|2, 3, {NULL}, 0, 0, S_NULL}, // S_FLINGENERGY3,
+	{SPR_FLEN, FF_FULLBRIGHT, 3, NULL, 0, 0, S_FLINGENERGY2}, // S_FLINGENERGY1,
+	{SPR_FLEN, FF_FULLBRIGHT|1, 3, NULL, 0, 0, S_FLINGENERGY3}, // S_FLINGENERGY2,
+	{SPR_FLEN, FF_FULLBRIGHT|2, 3, NULL, 0, 0, S_NULL}, // S_FLINGENERGY3,
 
-	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30, 2, {A_PlayActiveSound}, 0, 0, S_CLASH2}, // S_CLASH1
-	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|1, 2, {NULL}, 0, 0, S_CLASH3}, // S_CLASH2
-	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|2, 2, {NULL}, 0, 0, S_CLASH4}, // S_CLASH3
-	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|3, 2, {NULL}, 0, 0, S_CLASH5}, // S_CLASH4
-	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|4, 2, {NULL}, 0, 0, S_CLASH6}, // S_CLASH5
-	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|5, 2, {NULL}, 0, 0, S_NULL}, // S_CLASH6
+	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30, 2, A_PlayActiveSound, 0, 0, S_CLASH2}, // S_CLASH1
+	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|1, 2, NULL, 0, 0, S_CLASH3}, // S_CLASH2
+	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|2, 2, NULL, 0, 0, S_CLASH4}, // S_CLASH3
+	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|3, 2, NULL, 0, 0, S_CLASH5}, // S_CLASH4
+	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|4, 2, NULL, 0, 0, S_CLASH6}, // S_CLASH5
+	{SPR_CLAS, FF_FULLBRIGHT|FF_TRANS30|5, 2, NULL, 0, 0, S_NULL}, // S_CLASH6
 
-	{SPR_PSHW, FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_FIREDITEM2}, // S_FIREDITEM1
-	{SPR_PSHW, FF_FULLBRIGHT|1, 3, {NULL}, 0, 0, S_FIREDITEM3}, // S_FIREDITEM2
-	{SPR_PSHW, FF_FULLBRIGHT|2, 3, {NULL}, 0, 0, S_FIREDITEM4}, // S_FIREDITEM3
-	{SPR_PSHW, FF_FULLBRIGHT|3, 3, {NULL}, 0, 0, S_NULL}, // S_FIREDITEM4
+	{SPR_PSHW, FF_FULLBRIGHT, 3, NULL, 0, 0, S_FIREDITEM2}, // S_FIREDITEM1
+	{SPR_PSHW, FF_FULLBRIGHT|1, 3, NULL, 0, 0, S_FIREDITEM3}, // S_FIREDITEM2
+	{SPR_PSHW, FF_FULLBRIGHT|2, 3, NULL, 0, 0, S_FIREDITEM4}, // S_FIREDITEM3
+	{SPR_PSHW, FF_FULLBRIGHT|3, 3, NULL, 0, 0, S_NULL}, // S_FIREDITEM4
 
-	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30, 2, {NULL}, 0, 0, S_INSTASHIELDA2},	// S_INSTASHIELDA1
-	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|1, 2, {NULL}, 0, 0, S_INSTASHIELDA3},	// S_INSTASHIELDA2
-	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|2, 2, {NULL}, 0, 0, S_INSTASHIELDA4},	// S_INSTASHIELDA3
-	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|3, 2, {NULL}, 0, 0, S_INSTASHIELDA5},	// S_INSTASHIELDA4
-	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|4, 2, {NULL}, 0, 0, S_INSTASHIELDA6},	// S_INSTASHIELDA5
-	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|5, 2, {NULL}, 0, 0, S_INSTASHIELDA7},	// S_INSTASHIELDA6
-	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|6, 2, {NULL}, 0, 0, S_NULL},			// S_INSTASHIELDA7
+	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30, 2, NULL, 0, 0, S_INSTASHIELDA2},	// S_INSTASHIELDA1
+	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|1, 2, NULL, 0, 0, S_INSTASHIELDA3},	// S_INSTASHIELDA2
+	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|2, 2, NULL, 0, 0, S_INSTASHIELDA4},	// S_INSTASHIELDA3
+	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|3, 2, NULL, 0, 0, S_INSTASHIELDA5},	// S_INSTASHIELDA4
+	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|4, 2, NULL, 0, 0, S_INSTASHIELDA6},	// S_INSTASHIELDA5
+	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|5, 2, NULL, 0, 0, S_INSTASHIELDA7},	// S_INSTASHIELDA6
+	{SPR_ISTA, FF_FULLBRIGHT|FF_TRANS30|6, 2, NULL, 0, 0, S_NULL},			// S_INSTASHIELDA7
 
-	{SPR_ISTB, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_INSTASHIELDB2},		// S_INSTASHIELDB1
-	{SPR_ISTB, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_INSTASHIELDB3},	// S_INSTASHIELDB2
-	{SPR_ISTB, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_INSTASHIELDB4},	// S_INSTASHIELDB3
-	{SPR_ISTB, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_INSTASHIELDB5},	// S_INSTASHIELDB4
-	{SPR_ISTB, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_INSTASHIELDB6},	// S_INSTASHIELDB5
-	{SPR_ISTB, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_INSTASHIELDB7},	// S_INSTASHIELDB6
-	{SPR_ISTB, FF_FULLBRIGHT|6, 2, {NULL}, 0, 0, S_NULL},				// S_INSTASHIELDB7
+	{SPR_ISTB, FF_FULLBRIGHT, 2, NULL, 0, 0, S_INSTASHIELDB2},		// S_INSTASHIELDB1
+	{SPR_ISTB, FF_FULLBRIGHT|1, 2, NULL, 0, 0, S_INSTASHIELDB3},	// S_INSTASHIELDB2
+	{SPR_ISTB, FF_FULLBRIGHT|2, 2, NULL, 0, 0, S_INSTASHIELDB4},	// S_INSTASHIELDB3
+	{SPR_ISTB, FF_FULLBRIGHT|3, 2, NULL, 0, 0, S_INSTASHIELDB5},	// S_INSTASHIELDB4
+	{SPR_ISTB, FF_FULLBRIGHT|4, 2, NULL, 0, 0, S_INSTASHIELDB6},	// S_INSTASHIELDB5
+	{SPR_ISTB, FF_FULLBRIGHT|5, 2, NULL, 0, 0, S_INSTASHIELDB7},	// S_INSTASHIELDB6
+	{SPR_ISTB, FF_FULLBRIGHT|6, 2, NULL, 0, 0, S_NULL},				// S_INSTASHIELDB7
 
 	// Above player arrow
-	{SPR_ARRO, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW
-	{SPR_ARRO, FF_FULLBRIGHT|1, -1, {NULL}, 0, 0, S_NULL}, // S_PLAYERARROW_BOX
-	{SPR_NULL, FF_FULLBRIGHT, -1, {NULL}, 0, 11, S_NULL}, // S_PLAYERARROW_ITEM
-	{SPR_ITMN, FF_FULLBRIGHT, 2, {NULL}, 0, 11, S_NULL}, // S_PLAYERARROW_NUMBER
-	{SPR_ITMN, FF_FULLBRIGHT|11, 2, {NULL}, 0, 11, S_NULL}, // S_PLAYERARROW_X
-	{SPR_WANT, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_PLAYERARROW_WANTED2}, // S_PLAYERARROW_WANTED1
-	{SPR_WANT, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_PLAYERARROW_WANTED3}, // S_PLAYERARROW_WANTED2
-	{SPR_WANT, FF_FULLBRIGHT|2, 3, {NULL}, 0, 0, S_PLAYERARROW_WANTED4}, // S_PLAYERARROW_WANTED3
-	{SPR_WANT, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_PLAYERARROW_WANTED5}, // S_PLAYERARROW_WANTED4
-	{SPR_WANT, FF_FULLBRIGHT|4, 3, {NULL}, 0, 0, S_PLAYERARROW_WANTED6}, // S_PLAYERARROW_WANTED5
-	{SPR_WANT, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_PLAYERARROW_WANTED7}, // S_PLAYERARROW_WANTED6
-	{SPR_WANT, FF_FULLBRIGHT|6, 3, {NULL}, 0, 0, S_PLAYERARROW_WANTED1}, // S_PLAYERARROW_WANTED7
+	{SPR_ARRO, FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_PLAYERARROW
+	{SPR_ARRO, FF_FULLBRIGHT|1, -1, NULL, 0, 0, S_NULL}, // S_PLAYERARROW_BOX
+	{SPR_NULL, FF_FULLBRIGHT, -1, NULL, 0, 11, S_NULL}, // S_PLAYERARROW_ITEM
+	{SPR_ITMN, FF_FULLBRIGHT, 2, NULL, 0, 11, S_NULL}, // S_PLAYERARROW_NUMBER
+	{SPR_ITMN, FF_FULLBRIGHT|11, 2, NULL, 0, 11, S_NULL}, // S_PLAYERARROW_X
+	{SPR_WANT, FF_FULLBRIGHT, 5, NULL, 0, 0, S_PLAYERARROW_WANTED2}, // S_PLAYERARROW_WANTED1
+	{SPR_WANT, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_PLAYERARROW_WANTED3}, // S_PLAYERARROW_WANTED2
+	{SPR_WANT, FF_FULLBRIGHT|2, 3, NULL, 0, 0, S_PLAYERARROW_WANTED4}, // S_PLAYERARROW_WANTED3
+	{SPR_WANT, FF_FULLBRIGHT|3, 1, NULL, 0, 0, S_PLAYERARROW_WANTED5}, // S_PLAYERARROW_WANTED4
+	{SPR_WANT, FF_FULLBRIGHT|4, 3, NULL, 0, 0, S_PLAYERARROW_WANTED6}, // S_PLAYERARROW_WANTED5
+	{SPR_WANT, FF_FULLBRIGHT|5, 1, NULL, 0, 0, S_PLAYERARROW_WANTED7}, // S_PLAYERARROW_WANTED6
+	{SPR_WANT, FF_FULLBRIGHT|6, 3, NULL, 0, 0, S_PLAYERARROW_WANTED1}, // S_PLAYERARROW_WANTED7
 
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0,  S_PLAYERBOMB2}, // S_PLAYERBOMB1
-	{SPR_SPBM, 1, 1, {NULL}, 0, 0,  S_PLAYERBOMB3}, // S_PLAYERBOMB2
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0,  S_PLAYERBOMB4}, // S_PLAYERBOMB3
-	{SPR_SPBM, 2, 1, {NULL}, 0, 0,  S_PLAYERBOMB5}, // S_PLAYERBOMB4
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0,  S_PLAYERBOMB6}, // S_PLAYERBOMB5
-	{SPR_SPBM, 3, 1, {NULL}, 0, 0,  S_PLAYERBOMB7}, // S_PLAYERBOMB6
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0,  S_PLAYERBOMB8}, // S_PLAYERBOMB7
-	{SPR_SPBM, 4, 1, {NULL}, 0, 0,  S_PLAYERBOMB9}, // S_PLAYERBOMB8
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0, S_PLAYERBOMB10}, // S_PLAYERBOMB9
-	{SPR_SPBM, 5, 1, {NULL}, 0, 0, S_PLAYERBOMB11}, // S_PLAYERBOMB10
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0, S_PLAYERBOMB12}, // S_PLAYERBOMB11
-	{SPR_SPBM, 6, 1, {NULL}, 0, 0, S_PLAYERBOMB13}, // S_PLAYERBOMB12
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0, S_PLAYERBOMB14}, // S_PLAYERBOMB13
-	{SPR_SPBM, 7, 1, {NULL}, 0, 0, S_PLAYERBOMB15}, // S_PLAYERBOMB14
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0, S_PLAYERBOMB16}, // S_PLAYERBOMB15
-	{SPR_SPBM, 8, 1, {NULL}, 0, 0, S_PLAYERBOMB17}, // S_PLAYERBOMB16
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0, S_PLAYERBOMB18}, // S_PLAYERBOMB17
-	{SPR_SPBM, 8, 1, {NULL}, 0, 0, S_PLAYERBOMB19}, // S_PLAYERBOMB18
-	{SPR_SPBM, 0, 1, {NULL}, 0, 0, S_PLAYERBOMB20}, // S_PLAYERBOMB19
-	{SPR_SPBM, 8, 1, {NULL}, 0, 0,  S_PLAYERBOMB1}, // S_PLAYERBOMB20
-	{SPR_RNDM, FF_ANIMATE, -1, {NULL}, 23, 3, S_NULL}, // S_PLAYERITEM
-	{SPR_FITM, FF_ANIMATE, -1, {NULL}, 23, 3, S_NULL}, // S_PLAYERFAKE
+	{SPR_SPBM, 0, 1, NULL, 0, 0,  S_PLAYERBOMB2}, // S_PLAYERBOMB1
+	{SPR_SPBM, 1, 1, NULL, 0, 0,  S_PLAYERBOMB3}, // S_PLAYERBOMB2
+	{SPR_SPBM, 0, 1, NULL, 0, 0,  S_PLAYERBOMB4}, // S_PLAYERBOMB3
+	{SPR_SPBM, 2, 1, NULL, 0, 0,  S_PLAYERBOMB5}, // S_PLAYERBOMB4
+	{SPR_SPBM, 0, 1, NULL, 0, 0,  S_PLAYERBOMB6}, // S_PLAYERBOMB5
+	{SPR_SPBM, 3, 1, NULL, 0, 0,  S_PLAYERBOMB7}, // S_PLAYERBOMB6
+	{SPR_SPBM, 0, 1, NULL, 0, 0,  S_PLAYERBOMB8}, // S_PLAYERBOMB7
+	{SPR_SPBM, 4, 1, NULL, 0, 0,  S_PLAYERBOMB9}, // S_PLAYERBOMB8
+	{SPR_SPBM, 0, 1, NULL, 0, 0, S_PLAYERBOMB10}, // S_PLAYERBOMB9
+	{SPR_SPBM, 5, 1, NULL, 0, 0, S_PLAYERBOMB11}, // S_PLAYERBOMB10
+	{SPR_SPBM, 0, 1, NULL, 0, 0, S_PLAYERBOMB12}, // S_PLAYERBOMB11
+	{SPR_SPBM, 6, 1, NULL, 0, 0, S_PLAYERBOMB13}, // S_PLAYERBOMB12
+	{SPR_SPBM, 0, 1, NULL, 0, 0, S_PLAYERBOMB14}, // S_PLAYERBOMB13
+	{SPR_SPBM, 7, 1, NULL, 0, 0, S_PLAYERBOMB15}, // S_PLAYERBOMB14
+	{SPR_SPBM, 0, 1, NULL, 0, 0, S_PLAYERBOMB16}, // S_PLAYERBOMB15
+	{SPR_SPBM, 8, 1, NULL, 0, 0, S_PLAYERBOMB17}, // S_PLAYERBOMB16
+	{SPR_SPBM, 0, 1, NULL, 0, 0, S_PLAYERBOMB18}, // S_PLAYERBOMB17
+	{SPR_SPBM, 8, 1, NULL, 0, 0, S_PLAYERBOMB19}, // S_PLAYERBOMB18
+	{SPR_SPBM, 0, 1, NULL, 0, 0, S_PLAYERBOMB20}, // S_PLAYERBOMB19
+	{SPR_SPBM, 8, 1, NULL, 0, 0,  S_PLAYERBOMB1}, // S_PLAYERBOMB20
+	{SPR_RNDM, FF_ANIMATE, -1, NULL, 23, 3, S_NULL}, // S_PLAYERITEM
+	{SPR_FITM, FF_ANIMATE, -1, NULL, 23, 3, S_NULL}, // S_PLAYERFAKE
 
-	{SPR_PBOM, 0, -1, {NULL}, 0, 0, S_NULL}, // S_KARMAWHEEL
+	{SPR_PBOM, 0, -1, NULL, 0, 0, S_NULL}, // S_KARMAWHEEL
 
-	{SPR_HIT1, FF_FULLBRIGHT, 7, {NULL}, 0, 0, S_BATTLEPOINT1B}, // S_BATTLEPOINT1A
-	{SPR_HIT1, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_BATTLEPOINT1C}, // S_BATTLEPOINT1B
-	{SPR_HIT1, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_BATTLEPOINT1D}, // S_BATTLEPOINT1C
-	{SPR_HIT1, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_BATTLEPOINT1E}, // S_BATTLEPOINT1D
-	{SPR_HIT1, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_BATTLEPOINT1F}, // S_BATTLEPOINT1E
-	{SPR_HIT1, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_BATTLEPOINT1G}, // S_BATTLEPOINT1F
-	{SPR_HIT1, FF_FULLBRIGHT|2, TICRATE, {NULL}, 0, 0, S_BATTLEPOINT1H}, // S_BATTLEPOINT1G
-	{SPR_HIT1, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_BATTLEPOINT1I}, // S_BATTLEPOINT1H
-	{SPR_HIT1, FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_NULL}, // S_BATTLEPOINT1I
+	{SPR_HIT1, FF_FULLBRIGHT, 7, NULL, 0, 0, S_BATTLEPOINT1B}, // S_BATTLEPOINT1A
+	{SPR_HIT1, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_BATTLEPOINT1C}, // S_BATTLEPOINT1B
+	{SPR_HIT1, FF_FULLBRIGHT|4, 1, NULL, 0, 0, S_BATTLEPOINT1D}, // S_BATTLEPOINT1C
+	{SPR_HIT1, FF_FULLBRIGHT|3, 1, NULL, 0, 0, S_BATTLEPOINT1E}, // S_BATTLEPOINT1D
+	{SPR_HIT1, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_BATTLEPOINT1F}, // S_BATTLEPOINT1E
+	{SPR_HIT1, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_BATTLEPOINT1G}, // S_BATTLEPOINT1F
+	{SPR_HIT1, FF_FULLBRIGHT|2, TICRATE, NULL, 0, 0, S_BATTLEPOINT1H}, // S_BATTLEPOINT1G
+	{SPR_HIT1, FF_FULLBRIGHT|5, 1, NULL, 0, 0, S_BATTLEPOINT1I}, // S_BATTLEPOINT1H
+	{SPR_HIT1, FF_FULLBRIGHT|6, 1, NULL, 0, 0, S_NULL}, // S_BATTLEPOINT1I
 
-	{SPR_HIT2, FF_FULLBRIGHT, 7, {NULL}, 0, 0, S_BATTLEPOINT2B}, // S_BATTLEPOINT2A
-	{SPR_HIT2, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_BATTLEPOINT2C}, // S_BATTLEPOINT2B
-	{SPR_HIT2, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_BATTLEPOINT2D}, // S_BATTLEPOINT2C
-	{SPR_HIT2, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_BATTLEPOINT2E}, // S_BATTLEPOINT2D
-	{SPR_HIT2, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_BATTLEPOINT2F}, // S_BATTLEPOINT2E
-	{SPR_HIT2, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_BATTLEPOINT2G}, // S_BATTLEPOINT2F
-	{SPR_HIT2, FF_FULLBRIGHT|2, TICRATE, {NULL}, 0, 0, S_BATTLEPOINT2H}, // S_BATTLEPOINT2G
-	{SPR_HIT2, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_BATTLEPOINT2I}, // S_BATTLEPOINT2H
-	{SPR_HIT2, FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_NULL}, // S_BATTLEPOINT2I
+	{SPR_HIT2, FF_FULLBRIGHT, 7, NULL, 0, 0, S_BATTLEPOINT2B}, // S_BATTLEPOINT2A
+	{SPR_HIT2, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_BATTLEPOINT2C}, // S_BATTLEPOINT2B
+	{SPR_HIT2, FF_FULLBRIGHT|4, 1, NULL, 0, 0, S_BATTLEPOINT2D}, // S_BATTLEPOINT2C
+	{SPR_HIT2, FF_FULLBRIGHT|3, 1, NULL, 0, 0, S_BATTLEPOINT2E}, // S_BATTLEPOINT2D
+	{SPR_HIT2, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_BATTLEPOINT2F}, // S_BATTLEPOINT2E
+	{SPR_HIT2, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_BATTLEPOINT2G}, // S_BATTLEPOINT2F
+	{SPR_HIT2, FF_FULLBRIGHT|2, TICRATE, NULL, 0, 0, S_BATTLEPOINT2H}, // S_BATTLEPOINT2G
+	{SPR_HIT2, FF_FULLBRIGHT|5, 1, NULL, 0, 0, S_BATTLEPOINT2I}, // S_BATTLEPOINT2H
+	{SPR_HIT2, FF_FULLBRIGHT|6, 1, NULL, 0, 0, S_NULL}, // S_BATTLEPOINT2I
 
-	{SPR_HIT3, FF_FULLBRIGHT, 7, {NULL}, 0, 0, S_BATTLEPOINT3B}, // S_BATTLEPOINT3A
-	{SPR_HIT3, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_BATTLEPOINT3C}, // S_BATTLEPOINT3B
-	{SPR_HIT3, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_BATTLEPOINT3D}, // S_BATTLEPOINT3C
-	{SPR_HIT3, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_BATTLEPOINT3E}, // S_BATTLEPOINT3D
-	{SPR_HIT3, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_BATTLEPOINT3F}, // S_BATTLEPOINT3E
-	{SPR_HIT3, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_BATTLEPOINT3G}, // S_BATTLEPOINT3F
-	{SPR_HIT3, FF_FULLBRIGHT|2, TICRATE, {NULL}, 0, 0, S_BATTLEPOINT3H}, // S_BATTLEPOINT3G
-	{SPR_HIT3, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_BATTLEPOINT3I}, // S_BATTLEPOINT3H
-	{SPR_HIT3, FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_NULL}, // S_BATTLEPOINT3I
+	{SPR_HIT3, FF_FULLBRIGHT, 7, NULL, 0, 0, S_BATTLEPOINT3B}, // S_BATTLEPOINT3A
+	{SPR_HIT3, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_BATTLEPOINT3C}, // S_BATTLEPOINT3B
+	{SPR_HIT3, FF_FULLBRIGHT|4, 1, NULL, 0, 0, S_BATTLEPOINT3D}, // S_BATTLEPOINT3C
+	{SPR_HIT3, FF_FULLBRIGHT|3, 1, NULL, 0, 0, S_BATTLEPOINT3E}, // S_BATTLEPOINT3D
+	{SPR_HIT3, FF_FULLBRIGHT|2, 1, NULL, 0, 0, S_BATTLEPOINT3F}, // S_BATTLEPOINT3E
+	{SPR_HIT3, FF_FULLBRIGHT|1, 1, NULL, 0, 0, S_BATTLEPOINT3G}, // S_BATTLEPOINT3F
+	{SPR_HIT3, FF_FULLBRIGHT|2, TICRATE, NULL, 0, 0, S_BATTLEPOINT3H}, // S_BATTLEPOINT3G
+	{SPR_HIT3, FF_FULLBRIGHT|5, 1, NULL, 0, 0, S_BATTLEPOINT3I}, // S_BATTLEPOINT3H
+	{SPR_HIT3, FF_FULLBRIGHT|6, 1, NULL, 0, 0, S_NULL}, // S_BATTLEPOINT3I
 
 	// Oh no it's annoying lightning states.......
 	// Lightning Sparks (it's the ones we'll use for the radius)
-	{SPR_KSPK, FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_KSPARK2},	// S_KSPARK1
-	{SPR_NULL, FF_FULLBRIGHT, 1, {A_LightningFollowPlayer}, 0, 0, S_KSPARK3},	// S_KSPARK2
-	{SPR_KSPK, FF_FULLBRIGHT|1, 2, {A_LightningFollowPlayer}, 0, 0, S_KSPARK4},	// S_KSPARK3
-	{SPR_NULL, FF_FULLBRIGHT, 1, {A_LightningFollowPlayer}, 0, 0, S_KSPARK5},	// S_KSPARK4
-	{SPR_KSPK, FF_FULLBRIGHT|2, 2, {A_LightningFollowPlayer}, 0, 0, S_KSPARK6},	// S_KSPARK5
-	{SPR_NULL, FF_FULLBRIGHT, 1, {A_LightningFollowPlayer}, 0, 0, S_KSPARK7},	// S_KSPARK6
-	{SPR_KSPK, FF_FULLBRIGHT|3, 2, {A_LightningFollowPlayer}, 0, 0, S_KSPARK8},	// S_KSPARK7
-	{SPR_NULL, FF_FULLBRIGHT, 1, {A_LightningFollowPlayer}, 0, 0, S_KSPARK9},	// S_KSPARK8
-	{SPR_KSPK, FF_TRANS40|FF_FULLBRIGHT|4, 2, {A_LightningFollowPlayer}, 0, 0, S_KSPARK10},	// S_KSPARK9
-	{SPR_NULL, FF_FULLBRIGHT, 1, {A_LightningFollowPlayer}, 0, 0, S_KSPARK11},	// S_KSPARK10
-	{SPR_KSPK, FF_TRANS50|FF_FULLBRIGHT|5, 2, {A_LightningFollowPlayer}, 0, 0, S_KSPARK12},	// S_KSPARK11
-	{SPR_NULL, FF_FULLBRIGHT, 1, {A_LightningFollowPlayer}, 0, 0, S_KSPARK13},	// S_KSPARK12
-	{SPR_KSPK, FF_TRANS60|FF_FULLBRIGHT|6, 2, {A_LightningFollowPlayer}, 0, 0, S_NULL},	// S_KSPARK13
+	{SPR_KSPK, FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_KSPARK2},	// S_KSPARK1
+	{SPR_NULL, FF_FULLBRIGHT, 1, A_LightningFollowPlayer, 0, 0, S_KSPARK3},	// S_KSPARK2
+	{SPR_KSPK, FF_FULLBRIGHT|1, 2, A_LightningFollowPlayer, 0, 0, S_KSPARK4},	// S_KSPARK3
+	{SPR_NULL, FF_FULLBRIGHT, 1, A_LightningFollowPlayer, 0, 0, S_KSPARK5},	// S_KSPARK4
+	{SPR_KSPK, FF_FULLBRIGHT|2, 2, A_LightningFollowPlayer, 0, 0, S_KSPARK6},	// S_KSPARK5
+	{SPR_NULL, FF_FULLBRIGHT, 1, A_LightningFollowPlayer, 0, 0, S_KSPARK7},	// S_KSPARK6
+	{SPR_KSPK, FF_FULLBRIGHT|3, 2, A_LightningFollowPlayer, 0, 0, S_KSPARK8},	// S_KSPARK7
+	{SPR_NULL, FF_FULLBRIGHT, 1, A_LightningFollowPlayer, 0, 0, S_KSPARK9},	// S_KSPARK8
+	{SPR_KSPK, FF_TRANS40|FF_FULLBRIGHT|4, 2, A_LightningFollowPlayer, 0, 0, S_KSPARK10},	// S_KSPARK9
+	{SPR_NULL, FF_FULLBRIGHT, 1, A_LightningFollowPlayer, 0, 0, S_KSPARK11},	// S_KSPARK10
+	{SPR_KSPK, FF_TRANS50|FF_FULLBRIGHT|5, 2, A_LightningFollowPlayer, 0, 0, S_KSPARK12},	// S_KSPARK11
+	{SPR_NULL, FF_FULLBRIGHT, 1, A_LightningFollowPlayer, 0, 0, S_KSPARK13},	// S_KSPARK12
+	{SPR_KSPK, FF_TRANS60|FF_FULLBRIGHT|6, 2, A_LightningFollowPlayer, 0, 0, S_NULL},	// S_KSPARK13
 
 	// The straight bolt...
-	{SPR_LZI1, FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO12},	// S_LZIO11
-	{SPR_NULL, FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO13},	// S_LZIO12
-	{SPR_LZI1, FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO14},	// S_LZIO13
-	{SPR_LZI1, FF_FULLBRIGHT|1, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO15},	// S_LZIO14
-	{SPR_NULL, FF_FULLBRIGHT, 4, {A_LightningFollowPlayer}, 0, 0, S_LZIO16},	// S_LZIO15
-	{SPR_LZI1, FF_FULLBRIGHT|1, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO17},	// S_LZIO16
-	{SPR_NULL, 0, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO18}, // S_LZIO17
-	{SPR_LZI1, FF_TRANS50|FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO19},	// S_LZIO18
-	{SPR_LZI1, FF_TRANS70|FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_NULL},	// S_LZIO19
+	{SPR_LZI1, FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_LZIO12},	// S_LZIO11
+	{SPR_NULL, FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_LZIO13},	// S_LZIO12
+	{SPR_LZI1, FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_LZIO14},	// S_LZIO13
+	{SPR_LZI1, FF_FULLBRIGHT|1, 2, A_LightningFollowPlayer, 0, 0, S_LZIO15},	// S_LZIO14
+	{SPR_NULL, FF_FULLBRIGHT, 4, A_LightningFollowPlayer, 0, 0, S_LZIO16},	// S_LZIO15
+	{SPR_LZI1, FF_FULLBRIGHT|1, 2, A_LightningFollowPlayer, 0, 0, S_LZIO17},	// S_LZIO16
+	{SPR_NULL, 0, 2, A_LightningFollowPlayer, 0, 0, S_LZIO18}, // S_LZIO17
+	{SPR_LZI1, FF_TRANS50|FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_LZIO19},	// S_LZIO18
+	{SPR_LZI1, FF_TRANS70|FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_NULL},	// S_LZIO19
 
-	{SPR_NULL, FF_FULLBRIGHT, 6, {A_LightningFollowPlayer}, 0, 0, S_LZIO22},	// S_LZIO21
-	{SPR_LZI2, FF_FULLBRIGHT|1, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO23},	// S_LZIO22
-	{SPR_LZI2, FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO24},	// S_LZIO23
-	{SPR_NULL, FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO25},	// S_LZIO24
-	{SPR_NULL, FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO26},	// S_LZIO25
-	{SPR_NULL, FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO27},	// S_LZIO26
-	{SPR_LZI2, FF_TRANS30|FF_FULLBRIGHT|2, 2, {A_LightningFollowPlayer}, 0, 0, S_LZIO28}, // S_LZIO27
-	{SPR_NULL, 0, 4, {A_LightningFollowPlayer}, 0, 0, S_LZIO29}, // S_LZIO28
-	{SPR_LZI2, FF_TRANS70|FF_FULLBRIGHT, 2, {A_LightningFollowPlayer}, 0, 0, S_NULL}, // S_LZIO29
+	{SPR_NULL, FF_FULLBRIGHT, 6, A_LightningFollowPlayer, 0, 0, S_LZIO22},	// S_LZIO21
+	{SPR_LZI2, FF_FULLBRIGHT|1, 2, A_LightningFollowPlayer, 0, 0, S_LZIO23},	// S_LZIO22
+	{SPR_LZI2, FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_LZIO24},	// S_LZIO23
+	{SPR_NULL, FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_LZIO25},	// S_LZIO24
+	{SPR_NULL, FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_LZIO26},	// S_LZIO25
+	{SPR_NULL, FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_LZIO27},	// S_LZIO26
+	{SPR_LZI2, FF_TRANS30|FF_FULLBRIGHT|2, 2, A_LightningFollowPlayer, 0, 0, S_LZIO28}, // S_LZIO27
+	{SPR_NULL, 0, 4, A_LightningFollowPlayer, 0, 0, S_LZIO29}, // S_LZIO28
+	{SPR_LZI2, FF_TRANS70|FF_FULLBRIGHT, 2, A_LightningFollowPlayer, 0, 0, S_NULL}, // S_LZIO29
 
 	// The slanted bolt. Man these states are boring as all heck to do.
-	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT2},		// S_KLIT1
-	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT3},		// S_KLIT2
-	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|1, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT4},	// S_KLIT3
-	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT5},		// S_KLIT4
-	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|2, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT6},	// S_KLIT5
-	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT7},		// S_KLIT6
-	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|3, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT8},	// S_KLIT7
-	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT9},		// S_KLIT8
-	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|4, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT10},	// S_KLIT9
-	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT11},	    // S_KLIT10
-	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|5, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT12},	// S_KLIT11
-	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT1},		// S_KLIT12
+	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, A_LightningFollowPlayer, 0, 0, S_KLIT2},		// S_KLIT1
+	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, A_LightningFollowPlayer, 0, 0, S_KLIT3},		// S_KLIT2
+	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|1, 2, A_LightningFollowPlayer, 0, 0, S_KLIT4},	// S_KLIT3
+	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, A_LightningFollowPlayer, 0, 0, S_KLIT5},		// S_KLIT4
+	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|2, 2, A_LightningFollowPlayer, 0, 0, S_KLIT6},	// S_KLIT5
+	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, A_LightningFollowPlayer, 0, 0, S_KLIT7},		// S_KLIT6
+	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|3, 2, A_LightningFollowPlayer, 0, 0, S_KLIT8},	// S_KLIT7
+	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, A_LightningFollowPlayer, 0, 0, S_KLIT9},		// S_KLIT8
+	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|4, 2, A_LightningFollowPlayer, 0, 0, S_KLIT10},	// S_KLIT9
+	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, A_LightningFollowPlayer, 0, 0, S_KLIT11},	    // S_KLIT10
+	{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|5, 2, A_LightningFollowPlayer, 0, 0, S_KLIT12},	// S_KLIT11
+	{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, A_LightningFollowPlayer, 0, 0, S_KLIT1},		// S_KLIT12
 
-	{SPR_FZSM, 0, 4, {NULL}, 0, 0, S_FZEROSMOKE2}, // S_FZEROSMOKE1
-	{SPR_FZSM, 1, 4, {NULL}, 0, 0, S_FZEROSMOKE3}, // S_FZEROSMOKE2
-	{SPR_FZSM, 2, 4, {NULL}, 0, 0, S_FZEROSMOKE4}, // S_FZEROSMOKE3
-	{SPR_FZSM, 3, 4, {NULL}, 0, 0, S_FZEROSMOKE5}, // S_FZEROSMOKE4
-	{SPR_FZSM, 4, 4, {NULL}, 0, 0, S_NULL},        // S_FZEROSMOKE5
+	{SPR_FZSM, 0, 4, NULL, 0, 0, S_FZEROSMOKE2}, // S_FZEROSMOKE1
+	{SPR_FZSM, 1, 4, NULL, 0, 0, S_FZEROSMOKE3}, // S_FZEROSMOKE2
+	{SPR_FZSM, 2, 4, NULL, 0, 0, S_FZEROSMOKE4}, // S_FZEROSMOKE3
+	{SPR_FZSM, 3, 4, NULL, 0, 0, S_FZEROSMOKE5}, // S_FZEROSMOKE4
+	{SPR_FZSM, 4, 4, NULL, 0, 0, S_NULL},        // S_FZEROSMOKE5
 
-	{SPR_FZBM, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_FZEROBOOM2},   // S_FZEROBOOM1
-	{SPR_FZBM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_FZEROBOOM3}, // S_FZEROBOOM2
-	{SPR_FZBM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_FZEROBOOM4}, // S_FZEROBOOM3
-	{SPR_FZBM, FF_FULLBRIGHT|3, 2, {A_FZBoomFlash}, 0, 0, S_FZEROBOOM5}, // S_FZEROBOOM4
-	{SPR_FZBM, FF_FULLBRIGHT|2, 1, {A_FZBoomSmoke}, 0, 0, S_FZEROBOOM6}, // S_FZEROBOOM5
-	{SPR_FZBM, FF_FULLBRIGHT|1, 1, {A_FZBoomSmoke}, 0, 0, S_FZEROBOOM7}, // S_FZEROBOOM6
-	{SPR_NULL, 0, 1, {A_FZBoomSmoke}, 1, 0, S_FZEROBOOM8},  // S_FZEROBOOM7
-	{SPR_NULL, 0, 1, {A_FZBoomSmoke}, 2, 0, S_FZEROBOOM9},  // S_FZEROBOOM8
-	{SPR_NULL, 0, 1, {A_FZBoomSmoke}, 3, 0, S_FZEROBOOM10}, // S_FZEROBOOM9
-	{SPR_NULL, 0, 1, {A_FZBoomSmoke}, 2, 0, S_FZEROBOOM11}, // S_FZEROBOOM10
-	{SPR_NULL, 0, 1, {A_FZBoomSmoke}, 1, 0, S_FZEROBOOM12}, // S_FZEROBOOM11
-	{SPR_NULL, 0, 1, {A_FZBoomSmoke}, 0, 0, S_NULL},        // S_FZEROBOOM12
+	{SPR_FZBM, FF_FULLBRIGHT, 2, NULL, 0, 0, S_FZEROBOOM2},   // S_FZEROBOOM1
+	{SPR_FZBM, FF_FULLBRIGHT|1, 2, NULL, 0, 0, S_FZEROBOOM3}, // S_FZEROBOOM2
+	{SPR_FZBM, FF_FULLBRIGHT|2, 2, NULL, 0, 0, S_FZEROBOOM4}, // S_FZEROBOOM3
+	{SPR_FZBM, FF_FULLBRIGHT|3, 2, A_FZBoomFlash, 0, 0, S_FZEROBOOM5}, // S_FZEROBOOM4
+	{SPR_FZBM, FF_FULLBRIGHT|2, 1, A_FZBoomSmoke, 0, 0, S_FZEROBOOM6}, // S_FZEROBOOM5
+	{SPR_FZBM, FF_FULLBRIGHT|1, 1, A_FZBoomSmoke, 0, 0, S_FZEROBOOM7}, // S_FZEROBOOM6
+	{SPR_NULL, 0, 1, A_FZBoomSmoke, 1, 0, S_FZEROBOOM8},  // S_FZEROBOOM7
+	{SPR_NULL, 0, 1, A_FZBoomSmoke, 2, 0, S_FZEROBOOM9},  // S_FZEROBOOM8
+	{SPR_NULL, 0, 1, A_FZBoomSmoke, 3, 0, S_FZEROBOOM10}, // S_FZEROBOOM9
+	{SPR_NULL, 0, 1, A_FZBoomSmoke, 2, 0, S_FZEROBOOM11}, // S_FZEROBOOM10
+	{SPR_NULL, 0, 1, A_FZBoomSmoke, 1, 0, S_FZEROBOOM12}, // S_FZEROBOOM11
+	{SPR_NULL, 0, 1, A_FZBoomSmoke, 0, 0, S_NULL},        // S_FZEROBOOM12
 
-	{SPR_SMOK, 0, 30, {NULL}, 0, 0, S_FZSLOWSMOKE2},	// S_FZSLOWSMOKE1
-	{SPR_SMOK, 1, 30, {NULL}, 0, 0, S_FZSLOWSMOKE3},	// S_FZSLOWSMOKE2
-	{SPR_SMOK, 2, 30, {NULL}, 0, 0, S_FZSLOWSMOKE4},	// S_FZSLOWSMOKE3
-	{SPR_SMOK, 3, 30, {NULL}, 0, 0, S_FZSLOWSMOKE5},	// S_FZSLOWSMOKE4
-	{SPR_SMOK, 4, 30, {NULL}, 0, 0, S_NULL},			// S_FZSLOWSMOKE5
+	{SPR_SMOK, 0, 30, NULL, 0, 0, S_FZSLOWSMOKE2},	// S_FZSLOWSMOKE1
+	{SPR_SMOK, 1, 30, NULL, 0, 0, S_FZSLOWSMOKE3},	// S_FZSLOWSMOKE2
+	{SPR_SMOK, 2, 30, NULL, 0, 0, S_FZSLOWSMOKE4},	// S_FZSLOWSMOKE3
+	{SPR_SMOK, 3, 30, NULL, 0, 0, S_FZSLOWSMOKE5},	// S_FZSLOWSMOKE4
+	{SPR_SMOK, 4, 30, NULL, 0, 0, S_NULL},			// S_FZSLOWSMOKE5
 
 	// Various plants
-	{SPR_SBUS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SONICBUSH
+	{SPR_SBUS, 0, -1, NULL, 0, 0, S_NULL}, // S_SONICBUSH
 
 	// Marble Zone
-	{SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE|5, TICRATE, {NULL}, 3, 3, S_NULL}, // S_FLAMEPARTICLE
-	{SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE, 8*3, {A_FlameParticle}, 3, 3, S_MARBLETORCH}, // S_MARBLETORCH
-	{SPR_MARB, FF_FULLBRIGHT|FF_TRANS80|4, -1, {NULL}, 1, 29, S_NULL}, // S_MARBLELIGHT
-	{SPR_MARB, 9, -1, {NULL}, 0, 0, S_NULL}, // S_MARBLEBURNER
+	{SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE|5, TICRATE, NULL, 3, 3, S_NULL}, // S_FLAMEPARTICLE
+	{SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE, 8*3, A_FlameParticle, 3, 3, S_MARBLETORCH}, // S_MARBLETORCH
+	{SPR_MARB, FF_FULLBRIGHT|FF_TRANS80|4, -1, NULL, 1, 29, S_NULL}, // S_MARBLELIGHT
+	{SPR_MARB, 9, -1, NULL, 0, 0, S_NULL}, // S_MARBLEBURNER
 
 	// CD Special Stage
-	{SPR_FUFO, 0, 1, {A_Thrust},     5, 2,          S_CDUFO},     // S_CDUFO
-	{SPR_FUFO, 0, 4, {A_BossScream}, 0, MT_EXPLODE, S_CDUFO_DIE}, // S_CDUFO_DIE
+	{SPR_FUFO, 0, 1, A_Thrust,     5, 2,          S_CDUFO},     // S_CDUFO
+	{SPR_FUFO, 0, 4, A_BossScream, 0, MT_EXPLODE, S_CDUFO_DIE}, // S_CDUFO_DIE
 
 	// Rusty Rig
-	{SPR_RUST, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_RUSTYLAMP_ORANGE
-	{SPR_RUST, 1,             -1, {NULL}, 0, 0, S_NULL}, // S_RUSTYCHAIN
+	{SPR_RUST, FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_RUSTYLAMP_ORANGE
+	{SPR_RUST, 1,             -1, NULL, 0, 0, S_NULL}, // S_RUSTYCHAIN
 
 	// D2 Balloon Panic
-	{SPR_BLON, FF_ANIMATE,   -1,         {NULL},             2, 5, S_BALLOON},     // S_BALLOON
-	{SPR_BLON, FF_ANIMATE|3, 2,          {NULL},             1, 1, S_BALLOONPOP2}, // S_BALLOONPOP1
-	{SPR_NULL, 0,            15*TICRATE, {NULL},             0, 0, S_BALLOONPOP3}, // S_BALLOONPOP2
-	{SPR_NULL, 0,            0,          {A_SpawnFreshCopy}, 0, 0, S_NULL},        // S_BALLOONPOP3
+	{SPR_BLON, FF_ANIMATE,   -1,         NULL,             2, 5, S_BALLOON},     // S_BALLOON
+	{SPR_BLON, FF_ANIMATE|3, 2,          NULL,             1, 1, S_BALLOONPOP2}, // S_BALLOONPOP1
+	{SPR_NULL, 0,            15*TICRATE, NULL,             0, 0, S_BALLOONPOP3}, // S_BALLOONPOP2
+	{SPR_NULL, 0,            0,          A_SpawnFreshCopy, 0, 0, S_NULL},        // S_BALLOONPOP3
 
 	// Smokin' & Vapin' (Don't try this at home, kids!)
-	{SPR_SMOK, 0,  1, {A_SetScale},   FRACUNIT/2, 0,     S_PETSMOKE1}, // S_PETSMOKE0
-	{SPR_SMOK, 0,  5, {A_SetScale},   FRACUNIT*2, 1,     S_PETSMOKE2}, // S_PETSMOKE1
-	{SPR_SMOK, 1,  5, {A_BubbleRise}, 0,          50096, S_PETSMOKE3}, // S_PETSMOKE2
-	{SPR_SMOK, 2, 15, {A_BubbleRise}, 0,          50096, S_PETSMOKE4}, // S_PETSMOKE3
-	{SPR_SMOK, 3, 25, {A_BubbleRise}, 0,          50096, S_PETSMOKE5}, // S_PETSMOKE4
-	{SPR_SMOK, 4, 35, {A_BubbleRise}, 0,          50096, S_NULL},      // S_PETSMOKE5
-	{SPR_VAPE, 0,  1, {NULL},         0,          0,     S_VVVAPING1}, // S_VVVAPING0
-	{SPR_VAPE, 0,  5, {A_SetScale},   FRACUNIT*2, 1,     S_VVVAPING2}, // S_VVVAPING1
-	{SPR_VAPE, 1,  5, {A_BubbleRise}, 0,          50096, S_VVVAPING3}, // S_VVVAPING2
-	{SPR_VAPE, 2, 15, {A_BubbleRise}, 0,          50096, S_VVVAPING4}, // S_VVVAPING3
-	{SPR_VAPE, 3, 25, {A_BubbleRise}, 0,          50096, S_VVVAPING5}, // S_VVVAPING4
-	{SPR_VAPE, 4, 35, {A_BubbleRise}, 0,          50096, S_NULL},      // S_VVVAPING5
-	{SPR_VAPE, FF_ANIMATE|FF_TRANS30, -1, {NULL}, 6, 6, S_NULL}, // S_VVVAPE
+	{SPR_SMOK, 0,  1, A_SetScale,   FRACUNIT/2, 0,     S_PETSMOKE1}, // S_PETSMOKE0
+	{SPR_SMOK, 0,  5, A_SetScale,   FRACUNIT*2, 1,     S_PETSMOKE2}, // S_PETSMOKE1
+	{SPR_SMOK, 1,  5, A_BubbleRise, 0,          50096, S_PETSMOKE3}, // S_PETSMOKE2
+	{SPR_SMOK, 2, 15, A_BubbleRise, 0,          50096, S_PETSMOKE4}, // S_PETSMOKE3
+	{SPR_SMOK, 3, 25, A_BubbleRise, 0,          50096, S_PETSMOKE5}, // S_PETSMOKE4
+	{SPR_SMOK, 4, 35, A_BubbleRise, 0,          50096, S_NULL},      // S_PETSMOKE5
+	{SPR_VAPE, 0,  1, NULL,         0,          0,     S_VVVAPING1}, // S_VVVAPING0
+	{SPR_VAPE, 0,  5, A_SetScale,   FRACUNIT*2, 1,     S_VVVAPING2}, // S_VVVAPING1
+	{SPR_VAPE, 1,  5, A_BubbleRise, 0,          50096, S_VVVAPING3}, // S_VVVAPING2
+	{SPR_VAPE, 2, 15, A_BubbleRise, 0,          50096, S_VVVAPING4}, // S_VVVAPING3
+	{SPR_VAPE, 3, 25, A_BubbleRise, 0,          50096, S_VVVAPING5}, // S_VVVAPING4
+	{SPR_VAPE, 4, 35, A_BubbleRise, 0,          50096, S_NULL},      // S_VVVAPING5
+	{SPR_VAPE, FF_ANIMATE|FF_TRANS30, -1, NULL, 6, 6, S_NULL}, // S_VVVAPE
 
 	// Hill Top Zone
-	{SPR_HTZA, 0, -1, {A_SetScale}, 2*FRACUNIT, 0, S_NULL}, // S_HTZTREE
-	{SPR_HTZB, 0, -1, {A_SetScale}, 2*FRACUNIT, 0, S_NULL}, // S_HTZBUSH
+	{SPR_HTZA, 0, -1, A_SetScale, 2*FRACUNIT, 0, S_NULL}, // S_HTZTREE
+	{SPR_HTZB, 0, -1, A_SetScale, 2*FRACUNIT, 0, S_NULL}, // S_HTZBUSH
 
 	// Ports of gardens
-	{SPR_SGVA, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SGVINE1
-	{SPR_SGVB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SGVINE2
-	{SPR_SGVC, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SGVINE3
-	{SPR_PGTR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PGTREE
-	{SPR_PGF1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PGFLOWER1
-	{SPR_PGF2, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PGFLOWER2
-	{SPR_PGF3, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PGFLOWER3
-	{SPR_PGBH, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PGBUSH
-	{SPR_DPLR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_DHPILLAR
+	{SPR_SGVA, 0, -1, NULL, 0, 0, S_NULL}, // S_SGVINE1
+	{SPR_SGVB, 0, -1, NULL, 0, 0, S_NULL}, // S_SGVINE2
+	{SPR_SGVC, 0, -1, NULL, 0, 0, S_NULL}, // S_SGVINE3
+	{SPR_PGTR, 0, -1, NULL, 0, 0, S_NULL}, // S_PGTREE
+	{SPR_PGF1, 0, -1, NULL, 0, 0, S_NULL}, // S_PGFLOWER1
+	{SPR_PGF2, 0, -1, NULL, 0, 0, S_NULL}, // S_PGFLOWER2
+	{SPR_PGF3, 0, -1, NULL, 0, 0, S_NULL}, // S_PGFLOWER3
+	{SPR_PGBH, 0, -1, NULL, 0, 0, S_NULL}, // S_PGBUSH
+	{SPR_DPLR, 0, -1, NULL, 0, 0, S_NULL}, // S_DHPILLAR
 
 	// Midnight Channel stuff, yay more boring states!
-	{SPR_SPTL, 0, -1, {NULL}, 0, 0, S_SPOTLIGHT},		// S_SPOTLIGHT
-	{SPR_ENM1, 0, 1, {A_RandomShadowFrame}, 0, 0, S_RANDOMSHADOW},		// S_RANDOMSHADOW
+	{SPR_SPTL, 0, -1, NULL, 0, 0, S_SPOTLIGHT},		// S_SPOTLIGHT
+	{SPR_ENM1, 0, 1, A_RandomShadowFrame, 0, 0, S_RANDOMSHADOW},		// S_RANDOMSHADOW
 
-	{SPR_GARU, 0, 2, {NULL}, 0, 0, S_GARU2},	// S_GARU1
-	{SPR_GARU, 1, 2, {NULL}, 0, 0, S_GARU3},	// S_GARU2
-	{SPR_GARU, 2, 2, {NULL}, 0, 0, S_NULL},		// S_GARU3
+	{SPR_GARU, 0, 2, NULL, 0, 0, S_GARU2},	// S_GARU1
+	{SPR_GARU, 1, 2, NULL, 0, 0, S_GARU3},	// S_GARU2
+	{SPR_GARU, 2, 2, NULL, 0, 0, S_NULL},		// S_GARU3
 
-	{SPR_NULL, 0, 2, {NULL}, 0, 0, S_TGARU1},	// S_TGARU0
-	{SPR_GARU, FF_TRANS30, 2, {NULL}, 0, 0, S_GARU2},	// S_TGARU1
-	{SPR_GARU, 1|FF_TRANS30, 2, {NULL}, 0, 0, S_GARU3},	// S_TGARU2
-	{SPR_GARU, 2|FF_TRANS30, 2, {NULL}, 0, 0, S_NULL},		// S_TGARU3
+	{SPR_NULL, 0, 2, NULL, 0, 0, S_TGARU1},	// S_TGARU0
+	{SPR_GARU, FF_TRANS30, 2, NULL, 0, 0, S_GARU2},	// S_TGARU1
+	{SPR_GARU, 1|FF_TRANS30, 2, NULL, 0, 0, S_GARU3},	// S_TGARU2
+	{SPR_GARU, 2|FF_TRANS30, 2, NULL, 0, 0, S_NULL},		// S_TGARU3
 
-	{SPR_ENM1, 2, 1, {A_RoamingShadowThinker}, 0, 0, S_ROAMINGSHADOW}, //S_ROAMINGSHADOW
+	{SPR_ENM1, 2, 1, A_RoamingShadowThinker, 0, 0, S_ROAMINGSHADOW}, //S_ROAMINGSHADOW
 
-	{SPR_MARR, 0, 1, {A_MayonakaArrow}, 0, 0, S_MAYONAKAARROW}, //S_MAYONAKAARROW
+	{SPR_MARR, 0, 1, A_MayonakaArrow, 0, 0, S_MAYONAKAARROW}, //S_MAYONAKAARROW
 
 	// Mementos stuff
-	{SPR_NULL, 0, TICRATE*20, {NULL}, 0, 0, S_REAPER}, //S_REAPER_INVIS	TODO: DON'T FORGET TO CHANGE THAT BACK TO 130*TICRATE WHEN TESTING IS OVER
-	{SPR_REAP, 0, 1, {A_ReaperThinker}, 0, 0, S_REAPER}, //S_REAPER
-	{SPR_NULL, 0, 1, {A_MementosTPParticles}, 0, 0, S_MEMENTOSTP}, //S_MEMENTOSTP
+	{SPR_NULL, 0, TICRATE*20, NULL, 0, 0, S_REAPER}, //S_REAPER_INVIS	TODO: DON'T FORGET TO CHANGE THAT BACK TO 130*TICRATE WHEN TESTING IS OVER
+	{SPR_REAP, 0, 1, A_ReaperThinker, 0, 0, S_REAPER}, //S_REAPER
+	{SPR_NULL, 0, 1, A_MementosTPParticles, 0, 0, S_MEMENTOSTP}, //S_MEMENTOSTP
 
 	// Jack In The Box
-	{SPR_JITB, 0, 4, {NULL}, 0, 0, S_JITB2},	// S_JITB1
-	{SPR_JITB, 1, 4, {NULL}, 0, 0, S_JITB3},	// S_JITB2
-	{SPR_JITB, 2, 4, {NULL}, 0, 0, S_JITB4},	// S_JITB3
-	{SPR_JITB, 3, 4, {NULL}, 0, 0, S_JITB5},	// S_JITB4
-	{SPR_JITB, 2, 4, {NULL}, 0, 0, S_JITB6},	// S_JITB5
-	{SPR_JITB, 1, 4, {NULL}, 0, 0, S_JITB1},	// S_JITB6
+	{SPR_JITB, 0, 4, NULL, 0, 0, S_JITB2},	// S_JITB1
+	{SPR_JITB, 1, 4, NULL, 0, 0, S_JITB3},	// S_JITB2
+	{SPR_JITB, 2, 4, NULL, 0, 0, S_JITB4},	// S_JITB3
+	{SPR_JITB, 3, 4, NULL, 0, 0, S_JITB5},	// S_JITB4
+	{SPR_JITB, 2, 4, NULL, 0, 0, S_JITB6},	// S_JITB5
+	{SPR_JITB, 1, 4, NULL, 0, 0, S_JITB1},	// S_JITB6
 
 	// Color Drive Stuff:
-	{SPR_CDMO, 0, -1, {NULL}, 0, 0, S_CDMOONSP},	// S_CDMOONSP
-	{SPR_CDBU, 0, -1, {NULL}, 0, 0, S_CDBUSHSP},	// S_CDBUSHSP
-	{SPR_CDBU, 1, -1, {NULL}, 0, 0, S_CDTREEASP},	// S_CDTREEASP
-	{SPR_CDBU, 2, -1, {NULL}, 0, 0, S_CDTREEBSP},	// S_CDTREEBSP
+	{SPR_CDMO, 0, -1, NULL, 0, 0, S_CDMOONSP},	// S_CDMOONSP
+	{SPR_CDBU, 0, -1, NULL, 0, 0, S_CDBUSHSP},	// S_CDBUSHSP
+	{SPR_CDBU, 1, -1, NULL, 0, 0, S_CDTREEASP},	// S_CDTREEASP
+	{SPR_CDBU, 2, -1, NULL, 0, 0, S_CDTREEBSP},	// S_CDTREEBSP
 
 	// Daytona Speedway
-	{SPR_PINE, 1, -1, {NULL}, 0, 0, S_NULL}, // S_PINETREE
-	{SPR_PINE, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_PINETREE_SIDE
+	{SPR_PINE, 1, -1, NULL, 0, 0, S_NULL}, // S_PINETREE
+	{SPR_PINE, FF_PAPERSPRITE, -1, NULL, 0, 0, S_NULL}, // S_PINETREE_SIDE
 
 	// Egg Zeppelin
-	{SPR_PPLR, 0, -1, {NULL}, 0, 0, S_EZZPROPELLER}, // S_EZZPROPELLER
-	{SPR_PPLR, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_EZZPROPELLER_BLADE}, // S_EZZPROPELLER_BLADE
+	{SPR_PPLR, 0, -1, NULL, 0, 0, S_EZZPROPELLER}, // S_EZZPROPELLER
+	{SPR_PPLR, FF_PAPERSPRITE|1, -1, NULL, 0, 0, S_EZZPROPELLER_BLADE}, // S_EZZPROPELLER_BLADE
 
 	// Desert Palace
-	{SPR_DPPT, 0, -1, {NULL}, 0, 0, S_NULL}, // S_DP_PALMTREE
+	{SPR_DPPT, 0, -1, NULL, 0, 0, S_NULL}, // S_DP_PALMTREE
 
 	// Aurora Atoll
-	{SPR_AATR, 0, -1, {NULL}, 0, 0, S_AAZTREE_SEG}, // S_AAZTREE_SEG
-	{SPR_COCO, 0, -1, {NULL}, 0, 0, S_AAZTREE_COCONUT}, // S_AAZTREE_COCONUT
-	{SPR_AATR, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_AAZTREE_LEAF}, // S_AAZTREE_LEAF
+	{SPR_AATR, 0, -1, NULL, 0, 0, S_AAZTREE_SEG}, // S_AAZTREE_SEG
+	{SPR_COCO, 0, -1, NULL, 0, 0, S_AAZTREE_COCONUT}, // S_AAZTREE_COCONUT
+	{SPR_AATR, FF_PAPERSPRITE|1, -1, NULL, 0, 0, S_AAZTREE_LEAF}, // S_AAZTREE_LEAF
 
 	// Barren Badlands
-	{SPR_BDST, FF_TRANS80, 35, {NULL}, 0, 0, S_BBZDUST2}, // S_BBZDUST1
-	{SPR_BDST, FF_TRANS80|1, 12, {NULL}, 0, 0, S_BBZDUST3}, // S_BBZDUST2
-	{SPR_BDST, FF_TRANS80|2, 11, {NULL}, 0, 0, S_BBZDUST4}, // S_BBZDUST3
-	{SPR_BDST, FF_TRANS80|3, 10, {NULL}, 0, 0, S_NULL}, // S_BBZDUST4
+	{SPR_BDST, FF_TRANS80, 35, NULL, 0, 0, S_BBZDUST2}, // S_BBZDUST1
+	{SPR_BDST, FF_TRANS80|1, 12, NULL, 0, 0, S_BBZDUST3}, // S_BBZDUST2
+	{SPR_BDST, FF_TRANS80|2, 11, NULL, 0, 0, S_BBZDUST4}, // S_BBZDUST3
+	{SPR_BDST, FF_TRANS80|3, 10, NULL, 0, 0, S_NULL}, // S_BBZDUST4
 
-	{SPR_FROG, 0, -1, {NULL}, 0, 0, S_FROGGER}, // S_FROGGER
-	{SPR_FROG, 1, -1, {NULL}, 0, 0, S_FROGGER_ATTACK}, // S_FROGGER_ATTACK
-	{SPR_FROG, 2, -1, {NULL}, 0, 0, S_FROGGER_JUMP}, // S_FROGGER_JUMP
+	{SPR_FROG, 0, -1, NULL, 0, 0, S_FROGGER}, // S_FROGGER
+	{SPR_FROG, 1, -1, NULL, 0, 0, S_FROGGER_ATTACK}, // S_FROGGER_ATTACK
+	{SPR_FROG, 2, -1, NULL, 0, 0, S_FROGGER_JUMP}, // S_FROGGER_JUMP
 
-	{SPR_FROG, 3, 7*TICRATE/2, {NULL}, 0, 0, S_NULL}, // S_FROGTONGUE
-	{SPR_FROG, 4, 7*TICRATE/2, {NULL}, 0, 0, S_NULL}, // S_FROGTONGUE_JOINT
+	{SPR_FROG, 3, 7*TICRATE/2, NULL, 0, 0, S_NULL}, // S_FROGTONGUE
+	{SPR_FROG, 4, 7*TICRATE/2, NULL, 0, 0, S_NULL}, // S_FROGTONGUE_JOINT
 
-	{SPR_HOLE, 0, 1, {NULL}, 0, 0, S_ROBRA}, // S_ROBRA
-	{SPR_CBRA, 0, 1, {NULL}, 0, 0, S_ROBRA_HEAD}, // S_ROBRA_HEAD
-	{SPR_CBRA, 1, -1, {NULL}, 0, 0, S_ROBRA_JOINT}, // S_ROBRA_JOINT
-	{SPR_CBRA, 2, -1, {NULL}, 1, 0, S_ROBRASHELL_INSIDE}, // S_ROBRASHELL_INSIDE
-	{SPR_CBRA, 3, -1, {NULL}, 0, 0, S_ROBRASHELL_OUTSIDE}, // S_ROBRASHELL_OUTSIDE
+	{SPR_HOLE, 0, 1, NULL, 0, 0, S_ROBRA}, // S_ROBRA
+	{SPR_CBRA, 0, 1, NULL, 0, 0, S_ROBRA_HEAD}, // S_ROBRA_HEAD
+	{SPR_CBRA, 1, -1, NULL, 0, 0, S_ROBRA_JOINT}, // S_ROBRA_JOINT
+	{SPR_CBRA, 2, -1, NULL, 1, 0, S_ROBRASHELL_INSIDE}, // S_ROBRASHELL_INSIDE
+	{SPR_CBRA, 3, -1, NULL, 0, 0, S_ROBRASHELL_OUTSIDE}, // S_ROBRASHELL_OUTSIDE
 
-	{SPR_HOLE, 0, 1, {NULL}, 0, 0, S_BLUEROBRA}, // S_BLUEROBRA
-	{SPR_BBRA, 0, 1, {NULL}, 0, 0, S_BLUEROBRA_HEAD}, // S_BLUEROBRA_HEAD
-	{SPR_BBRA, 1, -1, {NULL}, 0, 0, S_BLUEROBRA_JOINT}, // S_BLUEROBRA_JOINT
+	{SPR_HOLE, 0, 1, NULL, 0, 0, S_BLUEROBRA}, // S_BLUEROBRA
+	{SPR_BBRA, 0, 1, NULL, 0, 0, S_BLUEROBRA_HEAD}, // S_BLUEROBRA_HEAD
+	{SPR_BBRA, 1, -1, NULL, 0, 0, S_BLUEROBRA_JOINT}, // S_BLUEROBRA_JOINT
 
 	// Eerie Grove
-	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT, 7, {A_SetRandomTics}, 5, 9, S_EERIEFOG2}, // S_EERIEFOG1
-	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT|1, 7, {A_SetRandomTics}, 5, 9, S_EERIEFOG3}, // S_EERIEFOG2
-	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT|2, 7, {A_SetRandomTics}, 5, 9, S_EERIEFOG4}, // S_EERIEFOG3
-	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT|3, 7, {A_SetRandomTics}, 5, 9, S_EERIEFOG5}, // S_EERIEFOG4
-	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT|4, 7, {A_SetRandomTics}, 5, 9, S_EERIEFOG1}, // S_EERIEFOG5
+	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT, 7, A_SetRandomTics, 5, 9, S_EERIEFOG2}, // S_EERIEFOG1
+	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT|1, 7, A_SetRandomTics, 5, 9, S_EERIEFOG3}, // S_EERIEFOG2
+	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT|2, 7, A_SetRandomTics, 5, 9, S_EERIEFOG4}, // S_EERIEFOG3
+	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT|3, 7, A_SetRandomTics, 5, 9, S_EERIEFOG5}, // S_EERIEFOG4
+	{SPR_EGFG, FF_TRANS90|FF_FULLBRIGHT|4, 7, A_SetRandomTics, 5, 9, S_EERIEFOG1}, // S_EERIEFOG5
 
 	// SMK ports
-	{SPR_SMKP, 0, -1, {NULL}, 0, 0, S_SMK_PIPE1}, // S_SMK_PIPE1
-	{SPR_SMKP, 1, -1, {NULL}, 0, 0, S_SMK_PIPE2}, // S_SMK_PIPE2
-	{SPR_MTYM, 0, -1, {NULL}, 0, 0, S_SMK_MOLE}, // S_SMK_MOLE
-	{SPR_THWP, 0, -1, {NULL}, 0, 0, S_SMK_THWOMP}, // S_SMK_THWOMP
-	{SPR_SNOB, 0, -1, {NULL}, 0, 0, S_SMK_SNOWBALL}, // S_SMK_SNOWBALL
-	{SPR_ICEB, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_SMK_ICEBLOCK
-	{SPR_ICEB, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_NULL}, // S_SMK_ICEBLOCK2
-	{SPR_ICEB, 2, 10, {NULL}, 0, 0, S_SMK_ICEBLOCK_DEBRIS2}, // S_SMK_ICEBLOCK_DEBRIS
-	{SPR_ICEB, 3, 10, {NULL}, 0, 0, S_NULL}, // S_SMK_ICEBLOCK_DEBRIS2
+	{SPR_SMKP, 0, -1, NULL, 0, 0, S_SMK_PIPE1}, // S_SMK_PIPE1
+	{SPR_SMKP, 1, -1, NULL, 0, 0, S_SMK_PIPE2}, // S_SMK_PIPE2
+	{SPR_MTYM, 0, -1, NULL, 0, 0, S_SMK_MOLE}, // S_SMK_MOLE
+	{SPR_THWP, 0, -1, NULL, 0, 0, S_SMK_THWOMP}, // S_SMK_THWOMP
+	{SPR_SNOB, 0, -1, NULL, 0, 0, S_SMK_SNOWBALL}, // S_SMK_SNOWBALL
+	{SPR_ICEB, FF_PAPERSPRITE, -1, NULL, 0, 0, S_NULL}, // S_SMK_ICEBLOCK
+	{SPR_ICEB, FF_PAPERSPRITE|1, -1, NULL, 0, 0, S_NULL}, // S_SMK_ICEBLOCK2
+	{SPR_ICEB, 2, 10, NULL, 0, 0, S_SMK_ICEBLOCK_DEBRIS2}, // S_SMK_ICEBLOCK_DEBRIS
+	{SPR_ICEB, 3, 10, NULL, 0, 0, S_NULL}, // S_SMK_ICEBLOCK_DEBRIS2
 
 	// Ezo's maps
-	{SPR_CNDL,   FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_BLUEFIRE2}, // S_BLUEFIRE1
-	{SPR_CNDL, 1|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_BLUEFIRE3}, // S_BLUEFIRE2
-	{SPR_CNDL, 2|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_BLUEFIRE4}, // S_BLUEFIRE3
-	{SPR_CNDL, 3|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_BLUEFIRE1}, // S_BLUEFIRE4
+	{SPR_CNDL,   FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_BLUEFIRE2}, // S_BLUEFIRE1
+	{SPR_CNDL, 1|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_BLUEFIRE3}, // S_BLUEFIRE2
+	{SPR_CNDL, 2|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_BLUEFIRE4}, // S_BLUEFIRE3
+	{SPR_CNDL, 3|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_BLUEFIRE1}, // S_BLUEFIRE4
 
-	{SPR_CNDL, 4|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_GREENFIRE2}, // S_GREENFIRE1
-	{SPR_CNDL, 5|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_GREENFIRE3}, // S_GREENFIRE2
-	{SPR_CNDL, 6|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_GREENFIRE4}, // S_GREENFIRE3
-	{SPR_CNDL, 7|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_GREENFIRE1}, // S_GREENFIRE4
+	{SPR_CNDL, 4|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_GREENFIRE2}, // S_GREENFIRE1
+	{SPR_CNDL, 5|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_GREENFIRE3}, // S_GREENFIRE2
+	{SPR_CNDL, 6|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_GREENFIRE4}, // S_GREENFIRE3
+	{SPR_CNDL, 7|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_GREENFIRE1}, // S_GREENFIRE4
 
-	{SPR_CHES, 0, -1, {NULL}, 0, 0, S_NULL}, // S_REGALCHEST
-	{SPR_CHIM, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_CHIMERASTATUE
-	{SPR_DRGN, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_DRAGONSTATUE
-	{SPR_LZMN, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_LIZARDMANSTATUE
-	{SPR_PGSS, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_PEGASUSSTATUE
+	{SPR_CHES, 0, -1, NULL, 0, 0, S_NULL}, // S_REGALCHEST
+	{SPR_CHIM, FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_CHIMERASTATUE
+	{SPR_DRGN, FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_DRAGONSTATUE
+	{SPR_LZMN, FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_LIZARDMANSTATUE
+	{SPR_PGSS, FF_FULLBRIGHT, -1, NULL, 0, 0, S_NULL}, // S_PEGASUSSTATUE
 
-	{SPR_ZTCH,   FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_ZELDAFIRE2}, // S_ZELDAFIRE1
-	{SPR_ZTCH, 1|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_ZELDAFIRE3}, // S_ZELDAFIRE2
-	{SPR_ZTCH, 2|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_ZELDAFIRE4}, // S_ZELDAFIRE3
-	{SPR_ZTCH, 3|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_ZELDAFIRE1}, // S_ZELDAFIRE4
+	{SPR_ZTCH,   FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_ZELDAFIRE2}, // S_ZELDAFIRE1
+	{SPR_ZTCH, 1|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_ZELDAFIRE3}, // S_ZELDAFIRE2
+	{SPR_ZTCH, 2|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_ZELDAFIRE4}, // S_ZELDAFIRE3
+	{SPR_ZTCH, 3|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_ZELDAFIRE1}, // S_ZELDAFIRE4
 
-	{SPR_DOCH, 0, -1, {NULL}, 0, 0, S_NULL}, // S_GANBARETHING
-	{SPR_DUCK, 0, -1, {NULL}, 0, 0, S_NULL}, // S_GANBAREDUCK
-	{SPR_GTRE, 0, -1, {NULL}, 0, 0, S_NULL}, // S_GANBARETREE
+	{SPR_DOCH, 0, -1, NULL, 0, 0, S_NULL}, // S_GANBARETHING
+	{SPR_DUCK, 0, -1, NULL, 0, 0, S_NULL}, // S_GANBAREDUCK
+	{SPR_GTRE, 0, -1, NULL, 0, 0, S_NULL}, // S_GANBARETREE
 
-	{SPR_MKMA, 1, 2, {A_Look}, (256<<16)|1, 0, S_MONOIDLE}, // S_MONOIDLE
-	{SPR_MKMA, 0, 3, {A_Chase}, 3, 0, S_MONOCHASE2}, // S_MONOCHASE1
-	{SPR_MKMA, 1, 3, {A_Chase}, 3, 0, S_MONOCHASE3}, // S_MONOCHASE2
-	{SPR_MKMA, 2, 3, {A_Chase}, 3, 0, S_MONOCHASE4}, // S_MONOCHASE3
-	{SPR_MKMA, 3, 3, {A_Chase}, 3, 0, S_MONOCHASE1}, // S_MONOCHASE4
-	{SPR_MKMP, 0, 24, {A_Pain}, 3, 0, S_MONOIDLE}, // S_MONOPAIN
+	{SPR_MKMA, 1, 2, A_Look, (256<<16)|1, 0, S_MONOIDLE}, // S_MONOIDLE
+	{SPR_MKMA, 0, 3, A_Chase, 3, 0, S_MONOCHASE2}, // S_MONOCHASE1
+	{SPR_MKMA, 1, 3, A_Chase, 3, 0, S_MONOCHASE3}, // S_MONOCHASE2
+	{SPR_MKMA, 2, 3, A_Chase, 3, 0, S_MONOCHASE4}, // S_MONOCHASE3
+	{SPR_MKMA, 3, 3, A_Chase, 3, 0, S_MONOCHASE1}, // S_MONOCHASE4
+	{SPR_MKMP, 0, 24, A_Pain, 3, 0, S_MONOIDLE}, // S_MONOPAIN
 
-	{SPR_RTCH,   FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_REDZELDAFIRE2}, // S_REDZELDAFIRE1
-	{SPR_RTCH, 1|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_REDZELDAFIRE3}, // S_REDZELDAFIRE2
-	{SPR_RTCH, 2|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_REDZELDAFIRE4}, // S_REDZELDAFIRE3
-	{SPR_RTCH, 3|FF_FULLBRIGHT|FF_TRANS50, 3, {NULL}, 0, 0, S_REDZELDAFIRE1}, // S_REDZELDAFIRE4
+	{SPR_RTCH,   FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_REDZELDAFIRE2}, // S_REDZELDAFIRE1
+	{SPR_RTCH, 1|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_REDZELDAFIRE3}, // S_REDZELDAFIRE2
+	{SPR_RTCH, 2|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_REDZELDAFIRE4}, // S_REDZELDAFIRE3
+	{SPR_RTCH, 3|FF_FULLBRIGHT|FF_TRANS50, 3, NULL, 0, 0, S_REDZELDAFIRE1}, // S_REDZELDAFIRE4
 
-	{SPR_BOWL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BOWLINGPIN
-	{SPR_BOWH, 0, 4, {A_BunnyHop}, 5, 20, S_BOWLINGHIT2}, // S_BOWLINGHIT1
-	{SPR_BOWH, 1, 2, {NULL}, 0, 0, S_BOWLINGHIT3}, // S_BOWLINGHIT2
-	{SPR_BOWH, 2, 2, {NULL}, 0, 0, S_BOWLINGHIT4}, // S_BOWLINGHIT3
-	{SPR_BOWH, 3, 2, {NULL}, 0, 0, S_NULL},        // S_BOWLINGHIT4
+	{SPR_BOWL, 0, -1, NULL, 0, 0, S_NULL}, // S_BOWLINGPIN
+	{SPR_BOWH, 0, 4, A_BunnyHop, 5, 20, S_BOWLINGHIT2}, // S_BOWLINGHIT1
+	{SPR_BOWH, 1, 2, NULL, 0, 0, S_BOWLINGHIT3}, // S_BOWLINGHIT2
+	{SPR_BOWH, 2, 2, NULL, 0, 0, S_BOWLINGHIT4}, // S_BOWLINGHIT3
+	{SPR_BOWH, 3, 2, NULL, 0, 0, S_NULL},        // S_BOWLINGHIT4
 
-	{SPR_TOAD, 0, -1, {NULL}, 0, 0, S_NULL}, // S_ARIDTOAD
-	{SPR_TOAH, 0, 4, {A_BunnyHop}, 10, 60, S_TOADHIT2}, // S_TOADHIT1
-	{SPR_TOAH, 1, 3, {NULL}, 0, 0, S_TOADHIT3},  // S_TOADHIT2
-	{SPR_TOAH, 2, 3, {NULL}, 0, 0, S_TOADHIT4},  // S_TOADHIT3
-	{SPR_TOAH, 3, 3, {NULL}, 0, 0, S_EBARREL18}, // S_TOADHIT4
+	{SPR_TOAD, 0, -1, NULL, 0, 0, S_NULL}, // S_ARIDTOAD
+	{SPR_TOAH, 0, 4, A_BunnyHop, 10, 60, S_TOADHIT2}, // S_TOADHIT1
+	{SPR_TOAH, 1, 3, NULL, 0, 0, S_TOADHIT3},  // S_TOADHIT2
+	{SPR_TOAH, 2, 3, NULL, 0, 0, S_TOADHIT4},  // S_TOADHIT3
+	{SPR_TOAH, 3, 3, NULL, 0, 0, S_EBARREL18}, // S_TOADHIT4
 
-	{SPR_BRRL, 0, 1, {A_Look}, (96<<16)|1, 0, S_EBARRELIDLE}, // S_EBARRELIDLE
-	{SPR_BRRR,  0, 4, {NULL}, 0, 0, S_EBARREL2},  // S_EBARREL1
-	{SPR_BRRR,  1, 4, {NULL}, 0, 0, S_EBARREL3},  // S_EBARREL2
-	{SPR_BRRR,  2, 4, {NULL}, 0, 0, S_EBARREL4},  // S_EBARREL3
-	{SPR_BRRR,  3, 4, {NULL}, 0, 0, S_EBARREL5},  // S_EBARREL4
-	{SPR_BRRR,  4, 4, {NULL}, 0, 0, S_EBARREL6},  // S_EBARREL5
-	{SPR_BRRR,  5, 4, {NULL}, 0, 0, S_EBARREL7},  // S_EBARREL6
-	{SPR_BRRR,  6, 4, {NULL}, 0, 0, S_EBARREL8},  // S_EBARREL7
-	{SPR_BRRR,  7, 4, {NULL}, 0, 0, S_EBARREL9},  // S_EBARREL8
-	{SPR_BRRR,  8, 4, {NULL}, 0, 0, S_EBARREL10}, // S_EBARREL9
-	{SPR_BRRR,  9, 4, {NULL}, 0, 0, S_EBARREL11}, // S_EBARREL10
-	{SPR_BRRR, 10, 4, {NULL}, 0, 0, S_EBARREL12}, // S_EBARREL11
-	{SPR_BRRR, 11, 4, {NULL}, 0, 0, S_EBARREL13}, // S_EBARREL12
-	{SPR_BRRR, 12, 4, {NULL}, 0, 0, S_EBARREL14}, // S_EBARREL13
-	{SPR_BRRR, 13, 4, {NULL}, 0, 0, S_EBARREL15}, // S_EBARREL14
-	{SPR_BRRR, 14, 4, {NULL}, 0, 0, S_EBARREL16}, // S_EBARREL15
-	{SPR_BRRR, 15, 4, {NULL}, 0, 0, S_EBARREL17}, // S_EBARREL16
-	{SPR_BRRR, 16, 4, {NULL}, 0, 0, S_EBARREL18}, // S_EBARREL17
-	{SPR_BRRR, 16, 0, {A_MineExplode}, MT_MINEEXPLOSION, 0, S_NULL}, // S_EBARREL18
+	{SPR_BRRL, 0, 1, A_Look, (96<<16)|1, 0, S_EBARRELIDLE}, // S_EBARRELIDLE
+	{SPR_BRRR,  0, 4, NULL, 0, 0, S_EBARREL2},  // S_EBARREL1
+	{SPR_BRRR,  1, 4, NULL, 0, 0, S_EBARREL3},  // S_EBARREL2
+	{SPR_BRRR,  2, 4, NULL, 0, 0, S_EBARREL4},  // S_EBARREL3
+	{SPR_BRRR,  3, 4, NULL, 0, 0, S_EBARREL5},  // S_EBARREL4
+	{SPR_BRRR,  4, 4, NULL, 0, 0, S_EBARREL6},  // S_EBARREL5
+	{SPR_BRRR,  5, 4, NULL, 0, 0, S_EBARREL7},  // S_EBARREL6
+	{SPR_BRRR,  6, 4, NULL, 0, 0, S_EBARREL8},  // S_EBARREL7
+	{SPR_BRRR,  7, 4, NULL, 0, 0, S_EBARREL9},  // S_EBARREL8
+	{SPR_BRRR,  8, 4, NULL, 0, 0, S_EBARREL10}, // S_EBARREL9
+	{SPR_BRRR,  9, 4, NULL, 0, 0, S_EBARREL11}, // S_EBARREL10
+	{SPR_BRRR, 10, 4, NULL, 0, 0, S_EBARREL12}, // S_EBARREL11
+	{SPR_BRRR, 11, 4, NULL, 0, 0, S_EBARREL13}, // S_EBARREL12
+	{SPR_BRRR, 12, 4, NULL, 0, 0, S_EBARREL14}, // S_EBARREL13
+	{SPR_BRRR, 13, 4, NULL, 0, 0, S_EBARREL15}, // S_EBARREL14
+	{SPR_BRRR, 14, 4, NULL, 0, 0, S_EBARREL16}, // S_EBARREL15
+	{SPR_BRRR, 15, 4, NULL, 0, 0, S_EBARREL17}, // S_EBARREL16
+	{SPR_BRRR, 16, 4, NULL, 0, 0, S_EBARREL18}, // S_EBARREL17
+	{SPR_BRRR, 16, 0, A_MineExplode, MT_MINEEXPLOSION, 0, S_NULL}, // S_EBARREL18
 
-	{SPR_HRSE, 0, 230, {A_PlaySeeSound}, 0, 0, S_MERRYHORSE}, // S_MERRYHORSE
+	{SPR_HRSE, 0, 230, A_PlaySeeSound, 0, 0, S_MERRYHORSE}, // S_MERRYHORSE
 
-	{SPR_BFRT, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BLUEFRUIT
-	{SPR_OFRT, 0, -1, {NULL}, 0, 0, S_NULL}, // S_ORANGEFRUIT
-	{SPR_RFRT, 0, -1, {NULL}, 0, 0, S_NULL}, // S_REDFRUIT
-	{SPR_PFRT, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PINKFRUIT
+	{SPR_BFRT, 0, -1, NULL, 0, 0, S_NULL}, // S_BLUEFRUIT
+	{SPR_OFRT, 0, -1, NULL, 0, 0, S_NULL}, // S_ORANGEFRUIT
+	{SPR_RFRT, 0, -1, NULL, 0, 0, S_NULL}, // S_REDFRUIT
+	{SPR_PFRT, 0, -1, NULL, 0, 0, S_NULL}, // S_PINKFRUIT
 
-	{SPR_ASPK, 0, 50, {A_PlayAttackSound}, 0, 0, S_ADVENTURESPIKEA2}, // S_ADVENTURESPIKEA1
-	{SPR_ASPK, 0, 50, {A_BunnyHop},       20, 0, S_ADVENTURESPIKEA1}, // S_ADVENTURESPIKEA2
-	{SPR_ASPK, 0, 50, {A_PlayAttackSound}, 0, 0, S_ADVENTURESPIKEB2}, // S_ADVENTURESPIKEB1
-	{SPR_ASPK, 0, 35, {A_BunnyHop},       15, 0, S_ADVENTURESPIKEB1}, // S_ADVENTURESPIKEB2
-	{SPR_ASPK, 0, 50, {A_PlayAttackSound}, 0, 0, S_ADVENTURESPIKEC2}, // S_ADVENTURESPIKEC1
-	{SPR_ASPK, 0, 65, {A_BunnyHop},       25, 0, S_ADVENTURESPIKEC1}, // S_ADVENTURESPIKEC1
+	{SPR_ASPK, 0, 50, A_PlayAttackSound, 0, 0, S_ADVENTURESPIKEA2}, // S_ADVENTURESPIKEA1
+	{SPR_ASPK, 0, 50, A_BunnyHop,       20, 0, S_ADVENTURESPIKEA1}, // S_ADVENTURESPIKEA2
+	{SPR_ASPK, 0, 50, A_PlayAttackSound, 0, 0, S_ADVENTURESPIKEB2}, // S_ADVENTURESPIKEB1
+	{SPR_ASPK, 0, 35, A_BunnyHop,       15, 0, S_ADVENTURESPIKEB1}, // S_ADVENTURESPIKEB2
+	{SPR_ASPK, 0, 50, A_PlayAttackSound, 0, 0, S_ADVENTURESPIKEC2}, // S_ADVENTURESPIKEC1
+	{SPR_ASPK, 0, 65, A_BunnyHop,       25, 0, S_ADVENTURESPIKEC1}, // S_ADVENTURESPIKEC1
 
-	{SPR_HBST,   FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTPROMPT2}, // S_BOOSTPROMPT1
-	{SPR_HBST, 1|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTPROMPT1}, // S_BOOSTPROMPT2
+	{SPR_HBST,   FF_FULLBRIGHT, 5, NULL, 0, 0, S_BOOSTPROMPT2}, // S_BOOSTPROMPT1
+	{SPR_HBST, 1|FF_FULLBRIGHT, 5, NULL, 0, 0, S_BOOSTPROMPT1}, // S_BOOSTPROMPT2
 
-	{SPR_HBSF,   FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTOFF2}, // S_BOOSTOFF1
-	{SPR_HBSF, 1|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTOFF1}, // S_BOOSTOFF2
+	{SPR_HBSF,   FF_FULLBRIGHT, 5, NULL, 0, 0, S_BOOSTOFF2}, // S_BOOSTOFF1
+	{SPR_HBSF, 1|FF_FULLBRIGHT, 5, NULL, 0, 0, S_BOOSTOFF1}, // S_BOOSTOFF2
 
-	{SPR_HBSO,   FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTON2}, // S_BOOSTON1
-	{SPR_HBSO, 1|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_BOOSTON1}, // S_BOOSTON2
+	{SPR_HBSO,   FF_FULLBRIGHT, 5, NULL, 0, 0, S_BOOSTON2}, // S_BOOSTON1
+	{SPR_HBSO, 1|FF_FULLBRIGHT, 5, NULL, 0, 0, S_BOOSTON1}, // S_BOOSTON2
 
-	{SPR_WBLZ, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LIZARDMAN
-	{SPR_WBLN, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LIONMAN
+	{SPR_WBLZ, 0, -1, NULL, 0, 0, S_NULL}, // S_LIZARDMAN
+	{SPR_WBLN, 0, -1, NULL, 0, 0, S_NULL}, // S_LIONMAN
 
 	// Opulence
-	{SPR_OPUL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_OPULENCE_PALMTREE
-	{SPR_OPUL, 1, -1, {NULL}, 0, 0, S_NULL}, // S_OPULENCE_FERN
+	{SPR_OPUL, 0, -1, NULL, 0, 0, S_NULL}, // S_OPULENCE_PALMTREE
+	{SPR_OPUL, 1, -1, NULL, 0, 0, S_NULL}, // S_OPULENCE_FERN
 
-	{SPR_TGEM,            1, -1, {NULL}, 0, 0, S_NULL}, // S_TUMBLEGEM_IDLE
-	{SPR_TGEM, FF_ANIMATE|0, -1, {NULL}, 7, 2, S_NULL}, // S_TUMBLEGEM_ROLL
-	{SPR_TCOI,            2, -1, {NULL}, 0, 0, S_NULL}, // S_TUMBLECOIN_IDLE
-	{SPR_TCOI, FF_ANIMATE|0, -1, {NULL}, 3, 1, S_NULL}, // S_TUMBLECOIN_FLIP
+	{SPR_TGEM,            1, -1, NULL, 0, 0, S_NULL}, // S_TUMBLEGEM_IDLE
+	{SPR_TGEM, FF_ANIMATE|0, -1, NULL, 7, 2, S_NULL}, // S_TUMBLEGEM_ROLL
+	{SPR_TCOI,            2, -1, NULL, 0, 0, S_NULL}, // S_TUMBLECOIN_IDLE
+	{SPR_TCOI, FF_ANIMATE|0, -1, NULL, 3, 1, S_NULL}, // S_TUMBLECOIN_FLIP
 
-	{SPR_FWRK,   FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_KARMAFIREWORK2}, // S_KARMAFIREWORK1
-	{SPR_FWRK, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_KARMAFIREWORK3}, // S_KARMAFIREWORK2
-	{SPR_FWRK, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_KARMAFIREWORK4}, // S_KARMAFIREWORK3
-	{SPR_FWRK, 3|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_KARMAFIREWORK1}, // S_KARMAFIREWORK4
-	{SPR_FWRK, 4|FF_FULLBRIGHT, TICRATE, {NULL}, 0, 0, S_NULL}, // S_KARMAFIREWORKTRAIL
+	{SPR_FWRK,   FF_FULLBRIGHT, 2, NULL, 0, 0, S_KARMAFIREWORK2}, // S_KARMAFIREWORK1
+	{SPR_FWRK, 1|FF_FULLBRIGHT, 2, NULL, 0, 0, S_KARMAFIREWORK3}, // S_KARMAFIREWORK2
+	{SPR_FWRK, 2|FF_FULLBRIGHT, 2, NULL, 0, 0, S_KARMAFIREWORK4}, // S_KARMAFIREWORK3
+	{SPR_FWRK, 3|FF_FULLBRIGHT, 2, NULL, 0, 0, S_KARMAFIREWORK1}, // S_KARMAFIREWORK4
+	{SPR_FWRK, 4|FF_FULLBRIGHT, TICRATE, NULL, 0, 0, S_NULL}, // S_KARMAFIREWORKTRAIL
 
 	// Opaque smoke
-	{SPR_SMOK, 0, 4, {NULL}, 0, 0, S_OPAQUESMOKE2}, // S_OPAQUESMOKE1
-	{SPR_SMOK, 1, 5, {NULL}, 0, 0, S_OPAQUESMOKE3}, // S_OPAQUESMOKE2
-	{SPR_SMOK, 2, 6, {NULL}, 0, 0, S_OPAQUESMOKE4}, // S_OPAQUESMOKE3
-	{SPR_SMOK, 3, 7, {NULL}, 0, 0, S_OPAQUESMOKE5}, // S_OPAQUESMOKE4
-	{SPR_SMOK, 4, 8, {NULL}, 0, 0, S_NULL},         // S_OPAQUESMOKE5
+	{SPR_SMOK, 0, 4, NULL, 0, 0, S_OPAQUESMOKE2}, // S_OPAQUESMOKE1
+	{SPR_SMOK, 1, 5, NULL, 0, 0, S_OPAQUESMOKE3}, // S_OPAQUESMOKE2
+	{SPR_SMOK, 2, 6, NULL, 0, 0, S_OPAQUESMOKE4}, // S_OPAQUESMOKE3
+	{SPR_SMOK, 3, 7, NULL, 0, 0, S_OPAQUESMOKE5}, // S_OPAQUESMOKE4
+	{SPR_SMOK, 4, 8, NULL, 0, 0, S_NULL},         // S_OPAQUESMOKE5
 
 #ifdef SEENAMES
-	{SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK
+	{SPR_NULL, 0, 1, NULL, 0, 0, S_NULL}, // S_NAMECHECK
 #endif
 };
 
@@ -11198,22 +11140,22 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_RAIN1,        // spawnstate
 		1000,           // spawnhealth
 		S_NULL,         // seestate
-		sfx_None,       // seesound
-		8,              // reactiontime
+		sfx_rainin,     // seesound
+		0,              // reactiontime
 		sfx_None,       // attacksound
 		S_NULL,         // painstate
 		0,              // painchance
 		sfx_None,       // painsound
 		S_NULL,         // meleestate
 		S_NULL,         // missilestate
-		S_NULL,         // deathstate
+		S_SPLASH1,      // deathstate
 		S_NULL,         // xdeathstate
 		sfx_None,       // deathsound
 		-72*FRACUNIT,   // speed -- -24*FRACUNIT originally, srb2kart x3 (nya)
 		1*FRACUNIT,     // radius
 		8*FRACUNIT,     // height
 		0,              // display offset
-		4,              // mass
+		80,             // mass
 		0,              // damage
 		sfx_None,       // activesound
 		MF_NOBLOCKMAP,  // flags
@@ -11226,7 +11168,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		1000,           // spawnhealth
 		S_NULL,         // seestate
 		sfx_None,       // seesound
-		8,              // reactiontime
+		0,              // reactiontime
 		sfx_None,       // attacksound
 		S_NULL,         // painstate
 		0,              // painchance
@@ -11240,7 +11182,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		4*FRACUNIT,     // radius
 		4*FRACUNIT,     // height
 		0,              // display offset
-		4,              // mass
+		0,              // mass
 		0,              // damage
 		sfx_None,       // activesound
 		MF_NOBLOCKMAP,  // flags
diff --git a/src/info.h b/src/info.h
index aff87a663..69a0a9dcf 100644
--- a/src/info.h
+++ b/src/info.h
@@ -26,7 +26,7 @@
   */
 typedef struct
 {
-	actionf_t action; ///< Function pointer corresponding to the actual action.
+	actionf_p1 action; ///< Function pointer corresponding to the actual action.
 	const char *name; ///< Name of the action in ALL CAPS.
 } actionpointer_t;
 
@@ -159,9 +159,6 @@ enum actionnum
 	A_SPAWNOBJECTRELATIVE,
 	A_CHANGEANGLERELATIVE,
 	A_CHANGEANGLEABSOLUTE,
-	A_ROLLANGLE,
-	A_CHANGEROLLANGLERELATIVE,
-	A_CHANGEROLLANGLEABSOLUTE,
 	A_PLAYSOUND,
 	A_FINDTARGET,
 	A_FINDTRACER,
@@ -249,209 +246,206 @@ struct mobj_s;
 
 // IMPORTANT NOTE: If you add/remove from this list of action
 // functions, don't forget to update them in dehacked.c!
-void A_Explode(struct mobj_s *actor);
-void A_Pain(struct mobj_s *actor);
-void A_Fall(struct mobj_s *actor);
-void A_MonitorPop(struct mobj_s *actor);
-void A_Look(struct mobj_s *actor);
-void A_Chase(struct mobj_s *actor);
-void A_FaceStabChase(struct mobj_s *actor);
-void A_FaceTarget(struct mobj_s *actor);
-void A_FaceTracer(struct mobj_s *actor);
-void A_Scream(struct mobj_s *actor);
-void A_BossDeath(struct mobj_s *actor);
-void A_CustomPower(struct mobj_s *actor); // Use this for a custom power
-void A_GiveWeapon(struct mobj_s *actor); // Gives the player weapon(s)
-void A_JumpShield(struct mobj_s *actor); // Obtained Jump Shield
-void A_RingShield(struct mobj_s *actor); // Obtained Ring Shield
-void A_RingBox(struct mobj_s *actor); // Obtained Ring Box Tails
-void A_Invincibility(struct mobj_s *actor); // Obtained Invincibility Box
-void A_SuperSneakers(struct mobj_s *actor); // Obtained Super Sneakers Box
-void A_BunnyHop(struct mobj_s *actor); // have bunny hop tails
-void A_BubbleSpawn(struct mobj_s *actor); // Randomly spawn bubbles
-void A_FanBubbleSpawn(struct mobj_s *actor);
-void A_BubbleRise(struct mobj_s *actor); // Bubbles float to surface
-void A_BubbleCheck(struct mobj_s *actor); // Don't draw if not underwater
-void A_AwardScore(struct mobj_s *actor);
-void A_ExtraLife(struct mobj_s *actor); // Extra Life
-void A_BombShield(struct mobj_s *actor); // Obtained Bomb Shield
-void A_WaterShield(struct mobj_s *actor); // Obtained Water Shield
-void A_ForceShield(struct mobj_s *actor); // Obtained Force Shield
-void A_PityShield(struct mobj_s *actor); // Obtained Pity Shield. We're... sorry.
-void A_GravityBox(struct mobj_s *actor);
-void A_ScoreRise(struct mobj_s *actor); // Rise the score logo
-void A_ParticleSpawn(struct mobj_s *actor);
-void A_AttractChase(struct mobj_s *actor); // Ring Chase
-void A_DropMine(struct mobj_s *actor); // Drop Mine from Skim or Jetty-Syn Bomber
-void A_FishJump(struct mobj_s *actor); // Fish Jump
-void A_ThrownRing(struct mobj_s *actor); // Sparkle trail for red ring
-void A_GrenadeRing(struct mobj_s *actor); // SRB2kart
-void A_SetSolidSteam(struct mobj_s *actor);
-void A_UnsetSolidSteam(struct mobj_s *actor);
-void A_SignPlayer(struct mobj_s *actor);
-void A_OverlayThink(struct mobj_s *actor);
-void A_JetChase(struct mobj_s *actor);
-void A_JetbThink(struct mobj_s *actor); // Jetty-Syn Bomber Thinker
-void A_JetgThink(struct mobj_s *actor); // Jetty-Syn Gunner Thinker
-void A_JetgShoot(struct mobj_s *actor); // Jetty-Syn Shoot Function
-void A_ShootBullet(struct mobj_s *actor); // JetgShoot without reactiontime setting
-void A_MinusDigging(struct mobj_s *actor);
-void A_MinusPopup(struct mobj_s *actor);
-void A_MinusCheck(struct mobj_s *actor);
-void A_ChickenCheck(struct mobj_s *actor);
-void A_MouseThink(struct mobj_s *actor); // Mouse Thinker
-void A_DetonChase(struct mobj_s *actor); // Deton Chaser
-void A_CapeChase(struct mobj_s *actor); // Fake little Super Sonic cape
-void A_RotateSpikeBall(struct mobj_s *actor); // Spike ball rotation
-void A_SlingAppear(struct mobj_s *actor);
-void A_MaceRotate(struct mobj_s *actor);
-void A_UnidusBall(struct mobj_s *actor);
-void A_RockSpawn(struct mobj_s *actor);
-void A_SetFuse(struct mobj_s *actor);
-void A_CrawlaCommanderThink(struct mobj_s *actor); // Crawla Commander
-void A_SmokeTrailer(struct mobj_s *actor);
-void A_RingExplode(struct mobj_s *actor);
-void A_OldRingExplode(struct mobj_s *actor);
-void A_MixUp(struct mobj_s *actor);
-void A_RecyclePowers(struct mobj_s *actor);
-void A_BossScream(struct mobj_s *actor);
-void A_Boss2TakeDamage(struct mobj_s *actor);
-void A_GoopSplat(struct mobj_s *actor);
-void A_Boss2PogoSFX(struct mobj_s *actor);
-void A_Boss2PogoTarget(struct mobj_s *actor);
-void A_EggmanBox(struct mobj_s *actor);
-void A_TurretFire(struct mobj_s *actor);
-void A_SuperTurretFire(struct mobj_s *actor);
-void A_TurretStop(struct mobj_s *actor);
-void A_JetJawRoam(struct mobj_s *actor);
-void A_JetJawChomp(struct mobj_s *actor);
-void A_PointyThink(struct mobj_s *actor);
-void A_CheckBuddy(struct mobj_s *actor);
-void A_HoodThink(struct mobj_s *actor);
-void A_ArrowCheck(struct mobj_s *actor);
-void A_SnailerThink(struct mobj_s *actor);
-void A_SharpChase(struct mobj_s *actor);
-void A_SharpSpin(struct mobj_s *actor);
-void A_VultureVtol(struct mobj_s *actor);
-void A_VultureCheck(struct mobj_s *actor);
-void A_SkimChase(struct mobj_s *actor);
-void A_SkullAttack(struct mobj_s *actor);
-void A_LobShot(struct mobj_s *actor);
-void A_FireShot(struct mobj_s *actor);
-void A_SuperFireShot(struct mobj_s *actor);
-void A_BossFireShot(struct mobj_s *actor);
-void A_Boss7FireMissiles(struct mobj_s *actor);
-void A_Boss1Laser(struct mobj_s *actor);
-void A_FocusTarget(struct mobj_s *actor);
-void A_Boss4Reverse(struct mobj_s *actor);
-void A_Boss4SpeedUp(struct mobj_s *actor);
-void A_Boss4Raise(struct mobj_s *actor);
-void A_SparkFollow(struct mobj_s *actor);
-void A_BuzzFly(struct mobj_s *actor);
-void A_GuardChase(struct mobj_s *actor);
-void A_EggShield(struct mobj_s *actor);
-void A_SetReactionTime(struct mobj_s *actor);
-void A_Boss1Spikeballs(struct mobj_s *actor);
-void A_Boss3TakeDamage(struct mobj_s *actor);
-void A_Boss3Path(struct mobj_s *actor);
-void A_LinedefExecute(struct mobj_s *actor);
-void A_PlaySeeSound(struct mobj_s *actor);
-void A_PlayAttackSound(struct mobj_s *actor);
-void A_PlayActiveSound(struct mobj_s *actor);
-void A_1upThinker(struct mobj_s *actor);
-void A_BossZoom(struct mobj_s *actor); //Unused
-void A_Boss1Chase(struct mobj_s *actor);
-void A_Boss2Chase(struct mobj_s *actor);
-void A_Boss2Pogo(struct mobj_s *actor);
-void A_Boss7Chase(struct mobj_s *actor);
-void A_BossJetFume(struct mobj_s *actor);
-void A_SpawnObjectAbsolute(struct mobj_s *actor);
-void A_SpawnObjectRelative(struct mobj_s *actor);
-void A_ChangeAngleRelative(struct mobj_s *actor);
-void A_ChangeAngleAbsolute(struct mobj_s *actor);
-void A_RollAngle(struct mobj_s *actor);
-void A_ChangeRollAngleRelative(struct mobj_s *actor);
-void A_ChangeRollAngleAbsolute(struct mobj_s *actor);
-void A_PlaySound(struct mobj_s *actor);
-void A_FindTarget(struct mobj_s *actor);
-void A_FindTracer(struct mobj_s *actor);
-void A_SetTics(struct mobj_s *actor);
-void A_SetRandomTics(struct mobj_s *actor);
-void A_ChangeColorRelative(struct mobj_s *actor);
-void A_ChangeColorAbsolute(struct mobj_s *actor);
-void A_MoveRelative(struct mobj_s *actor);
-void A_MoveAbsolute(struct mobj_s *actor);
-void A_Thrust(struct mobj_s *actor);
-void A_ZThrust(struct mobj_s *actor);
-void A_SetTargetsTarget(struct mobj_s *actor);
-void A_SetObjectFlags(struct mobj_s *actor);
-void A_SetObjectFlags2(struct mobj_s *actor);
-void A_RandomState(struct mobj_s *actor);
-void A_RandomStateRange(struct mobj_s *actor);
-void A_DualAction(struct mobj_s *actor);
-void A_RemoteAction(struct mobj_s *actor);
-void A_ToggleFlameJet(struct mobj_s *actor);
-void A_ItemPop(struct mobj_s *actor); // SRB2kart
-void A_JawzChase(struct mobj_s *actor); // SRB2kart
-void A_JawzExplode(struct mobj_s *actor); // SRB2kart
-void A_SPBChase(struct mobj_s *actor); // SRB2kart
-void A_MineExplode(struct mobj_s *actor); // SRB2kart
-void A_BallhogExplode(struct mobj_s *actor); // SRB2kart
-void A_LightningFollowPlayer(struct mobj_s *actor);	// SRB2kart: Lightning shield effect player chasing
-void A_FZBoomFlash(struct mobj_s *actor); // SRB2kart
-void A_FZBoomSmoke(struct mobj_s *actor); // SRB2kart
-void A_RandomShadowFrame(struct mobj_s *actor);	//SRB2kart: Shadow spawner frame randomizer
-void A_RoamingShadowThinker(struct mobj_s *actor);	// SRB2kart: Roaming Shadow moving + attacking players.
-void A_MayonakaArrow(struct mobj_s *actor);	//SRB2kart: midnight channel arrow sign
-void A_ReaperThinker(struct mobj_s *actor);	//SRB2kart: mementos reaper
-void A_MementosTPParticles(struct mobj_s *actor);	//SRB2kart: mementos teleporter particles. Man that's a lot of actions for my shite.
-void A_FlameParticle(struct mobj_s *actor); // SRB2kart
-void A_OrbitNights(struct mobj_s *actor);
-void A_GhostMe(struct mobj_s *actor);
-void A_SetObjectState(struct mobj_s *actor);
-void A_SetObjectTypeState(struct mobj_s *actor);
-void A_KnockBack(struct mobj_s *actor);
-void A_PushAway(struct mobj_s *actor);
-void A_RingDrain(struct mobj_s *actor);
-void A_SplitShot(struct mobj_s *actor);
-void A_MissileSplit(struct mobj_s *actor);
-void A_MultiShot(struct mobj_s *actor);
-void A_InstaLoop(struct mobj_s *actor);
-void A_Custom3DRotate(struct mobj_s *actor);
-void A_SearchForPlayers(struct mobj_s *actor);
-void A_CheckRandom(struct mobj_s *actor);
-void A_CheckTargetRings(struct mobj_s *actor);
-void A_CheckRings(struct mobj_s *actor);
-void A_CheckTotalRings(struct mobj_s *actor);
-void A_CheckHealth(struct mobj_s *actor);
-void A_CheckRange(struct mobj_s *actor);
-void A_CheckHeight(struct mobj_s *actor);
-void A_CheckTrueRange(struct mobj_s *actor);
-void A_CheckThingCount(struct mobj_s *actor);
-void A_CheckAmbush(struct mobj_s *actor);
-void A_CheckCustomValue(struct mobj_s *actor);
-void A_CheckCusValMemo(struct mobj_s *actor);
-void A_SetCustomValue(struct mobj_s *actor);
-void A_UseCusValMemo(struct mobj_s *actor);
-void A_RelayCustomValue(struct mobj_s *actor);
-void A_CusValAction(struct mobj_s *actor);
-void A_ForceStop(struct mobj_s *actor);
-void A_ForceWin(struct mobj_s *actor);
-void A_SpikeRetract(struct mobj_s *actor);
-void A_InfoState(struct mobj_s *actor);
-void A_Repeat(struct mobj_s *actor);
-void A_SetScale(struct mobj_s *actor);
-void A_RemoteDamage(struct mobj_s *actor);
-void A_HomingChase(struct mobj_s *actor);
-void A_TrapShot(struct mobj_s *actor);
-void A_VileTarget(struct mobj_s *actor);
-void A_VileAttack(struct mobj_s *actor);
-void A_VileFire(struct mobj_s *actor);
-void A_BrakChase(struct mobj_s *actor);
-void A_BrakFireShot(struct mobj_s *actor);
-void A_BrakLobShot(struct mobj_s *actor);
-void A_NapalmScatter(struct mobj_s *actor);
-void A_SpawnFreshCopy(struct mobj_s *actor);
+void A_Explode(void *actor);
+void A_Pain(void *actor);
+void A_Fall(void *actor);
+void A_MonitorPop(void *actor);
+void A_Look(void *actor);
+void A_Chase(void *actor);
+void A_FaceStabChase(void *actor);
+void A_FaceTarget(void *actor);
+void A_FaceTracer(void *actor);
+void A_Scream(void *actor);
+void A_BossDeath(void *actor);
+void A_CustomPower(void *actor); // Use this for a custom power
+void A_GiveWeapon(void *actor); // Gives the player weapon(s)
+void A_JumpShield(void *actor); // Obtained Jump Shield
+void A_RingShield(void *actor); // Obtained Ring Shield
+void A_RingBox(void *actor); // Obtained Ring Box Tails
+void A_Invincibility(void *actor); // Obtained Invincibility Box
+void A_SuperSneakers(void *actor); // Obtained Super Sneakers Box
+void A_BunnyHop(void *actor); // have bunny hop tails
+void A_BubbleSpawn(void *actor); // Randomly spawn bubbles
+void A_FanBubbleSpawn(void *actor);
+void A_BubbleRise(void *actor); // Bubbles float to surface
+void A_BubbleCheck(void *actor); // Don't draw if not underwater
+void A_AwardScore(void *actor);
+void A_ExtraLife(void *actor); // Extra Life
+void A_BombShield(void *actor); // Obtained Bomb Shield
+void A_WaterShield(void *actor); // Obtained Water Shield
+void A_ForceShield(void *actor); // Obtained Force Shield
+void A_PityShield(void *actor); // Obtained Pity Shield. We're... sorry.
+void A_GravityBox(void *actor);
+void A_ScoreRise(void *actor); // Rise the score logo
+void A_ParticleSpawn(void *actor);
+void A_AttractChase(void *actor); // Ring Chase
+void A_DropMine(void *actor); // Drop Mine from Skim or Jetty-Syn Bomber
+void A_FishJump(void *actor); // Fish Jump
+void A_ThrownRing(void *actor); // Sparkle trail for red ring
+void A_GrenadeRing(void *actor); // SRB2kart
+void A_SetSolidSteam(void *actor);
+void A_UnsetSolidSteam(void *actor);
+void A_SignPlayer(void *actor);
+void A_OverlayThink(void *actor);
+void A_JetChase(void *actor);
+void A_JetbThink(void *actor); // Jetty-Syn Bomber Thinker
+void A_JetgThink(void *actor); // Jetty-Syn Gunner Thinker
+void A_JetgShoot(void *actor); // Jetty-Syn Shoot Function
+void A_ShootBullet(void *actor); // JetgShoot without reactiontime setting
+void A_MinusDigging(void *actor);
+void A_MinusPopup(void *actor);
+void A_MinusCheck(void *actor);
+void A_ChickenCheck(void *actor);
+void A_MouseThink(void *actor); // Mouse Thinker
+void A_DetonChase(void *actor); // Deton Chaser
+void A_CapeChase(void *actor); // Fake little Super Sonic cape
+void A_RotateSpikeBall(void *actor); // Spike ball rotation
+void A_SlingAppear(void *actor);
+void A_MaceRotate(void *actor);
+void A_UnidusBall(void *actor);
+void A_RockSpawn(void *actor);
+void A_SetFuse(void *actor);
+void A_CrawlaCommanderThink(void *actor); // Crawla Commander
+void A_SmokeTrailer(void *actor);
+void A_RingExplode(void *actor);
+void A_OldRingExplode(void *actor);
+void A_MixUp(void *actor);
+void A_RecyclePowers(void *actor);
+void A_BossScream(void *actor);
+void A_Boss2TakeDamage(void *actor);
+void A_GoopSplat(void *actor);
+void A_Boss2PogoSFX(void *actor);
+void A_Boss2PogoTarget(void *actor);
+void A_EggmanBox(void *actor);
+void A_TurretFire(void *actor);
+void A_SuperTurretFire(void *actor);
+void A_TurretStop(void *actor);
+void A_JetJawRoam(void *actor);
+void A_JetJawChomp(void *actor);
+void A_PointyThink(void *actor);
+void A_CheckBuddy(void *actor);
+void A_HoodThink(void *actor);
+void A_ArrowCheck(void *actor);
+void A_SnailerThink(void *actor);
+void A_SharpChase(void *actor);
+void A_SharpSpin(void *actor);
+void A_VultureVtol(void *actor);
+void A_VultureCheck(void *actor);
+void A_SkimChase(void *actor);
+void A_SkullAttack(void *actor);
+void A_LobShot(void *actor);
+void A_FireShot(void *actor);
+void A_SuperFireShot(void *actor);
+void A_BossFireShot(void *actor);
+void A_Boss7FireMissiles(void *actor);
+void A_Boss1Laser(void *actor);
+void A_FocusTarget(void *actor);
+void A_Boss4Reverse(void *actor);
+void A_Boss4SpeedUp(void *actor);
+void A_Boss4Raise(void *actor);
+void A_SparkFollow(void *actor);
+void A_BuzzFly(void *actor);
+void A_GuardChase(void *actor);
+void A_EggShield(void *actor);
+void A_SetReactionTime(void *actor);
+void A_Boss1Spikeballs(void *actor);
+void A_Boss3TakeDamage(void *actor);
+void A_Boss3Path(void *actor);
+void A_LinedefExecute(void *actor);
+void A_PlaySeeSound(void *actor);
+void A_PlayAttackSound(void *actor);
+void A_PlayActiveSound(void *actor);
+void A_1upThinker(void *actor);
+void A_BossZoom(void *actor); //Unused
+void A_Boss1Chase(void *actor);
+void A_Boss2Chase(void *actor);
+void A_Boss2Pogo(void *actor);
+void A_Boss7Chase(void *actor);
+void A_BossJetFume(void *actor);
+void A_SpawnObjectAbsolute(void *actor);
+void A_SpawnObjectRelative(void *actor);
+void A_ChangeAngleRelative(void *actor);
+void A_ChangeAngleAbsolute(void *actor);
+void A_PlaySound(void *actor);
+void A_FindTarget(void *actor);
+void A_FindTracer(void *actor);
+void A_SetTics(void *actor);
+void A_SetRandomTics(void *actor);
+void A_ChangeColorRelative(void *actor);
+void A_ChangeColorAbsolute(void *actor);
+void A_MoveRelative(void *actor);
+void A_MoveAbsolute(void *actor);
+void A_Thrust(void *actor);
+void A_ZThrust(void *actor);
+void A_SetTargetsTarget(void *actor);
+void A_SetObjectFlags(void *actor);
+void A_SetObjectFlags2(void *actor);
+void A_RandomState(void *actor);
+void A_RandomStateRange(void *actor);
+void A_DualAction(void *actor);
+void A_RemoteAction(void *actor);
+void A_ToggleFlameJet(void *actor);
+void A_ItemPop(void *actor); // SRB2kart
+void A_JawzChase(void *actor); // SRB2kart
+void A_JawzExplode(void *actor); // SRB2kart
+void A_SPBChase(void *actor); // SRB2kart
+void A_MineExplode(void *actor); // SRB2kart
+void A_BallhogExplode(void *actor); // SRB2kart
+void A_LightningFollowPlayer(void *actor);	// SRB2kart: Lightning shield effect player chasing
+void A_FZBoomFlash(void *actor); // SRB2kart
+void A_FZBoomSmoke(void *actor); // SRB2kart
+void A_RandomShadowFrame(void *actor);	//SRB2kart: Shadow spawner frame randomizer
+void A_RoamingShadowThinker(void *actor);	// SRB2kart: Roaming Shadow moving + attacking players.
+void A_MayonakaArrow(void *actor);	//SRB2kart: midnight channel arrow sign
+void A_ReaperThinker(void *actor);	//SRB2kart: mementos reaper
+void A_MementosTPParticles(void *actor);	//SRB2kart: mementos teleporter particles. Man that's a lot of actions for my shite.
+void A_FlameParticle(void *actor); // SRB2kart
+void A_OrbitNights(void *actor);
+void A_GhostMe(void *actor);
+void A_SetObjectState(void *actor);
+void A_SetObjectTypeState(void *actor);
+void A_KnockBack(void *actor);
+void A_PushAway(void *actor);
+void A_RingDrain(void *actor);
+void A_SplitShot(void *actor);
+void A_MissileSplit(void *actor);
+void A_MultiShot(void *actor);
+void A_InstaLoop(void *actor);
+void A_Custom3DRotate(void *actor);
+void A_SearchForPlayers(void *actor);
+void A_CheckRandom(void *actor);
+void A_CheckTargetRings(void *actor);
+void A_CheckRings(void *actor);
+void A_CheckTotalRings(void *actor);
+void A_CheckHealth(void *actor);
+void A_CheckRange(void *actor);
+void A_CheckHeight(void *actor);
+void A_CheckTrueRange(void *actor);
+void A_CheckThingCount(void *actor);
+void A_CheckAmbush(void *actor);
+void A_CheckCustomValue(void *actor);
+void A_CheckCusValMemo(void *actor);
+void A_SetCustomValue(void *actor);
+void A_UseCusValMemo(void *actor);
+void A_RelayCustomValue(void *actor);
+void A_CusValAction(void *actor);
+void A_ForceStop(void *actor);
+void A_ForceWin(void *actor);
+void A_SpikeRetract(void *actor);
+void A_InfoState(void *actor);
+void A_Repeat(void *actor);
+void A_SetScale(void *actor);
+void A_RemoteDamage(void *actor);
+void A_HomingChase(void *actor);
+void A_TrapShot(void *actor);
+void A_VileTarget(void *actor);
+void A_VileAttack(void *actor);
+void A_VileFire(void *actor);
+void A_BrakChase(void *actor);
+void A_BrakFireShot(void *actor);
+void A_BrakLobShot(void *actor);
+void A_NapalmScatter(void *actor);
+void A_SpawnFreshCopy(void *actor);
 
 extern boolean actionsoverridden[NUMACTIONS];
 
@@ -460,7 +454,6 @@ extern boolean actionsoverridden[NUMACTIONS];
 #define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
 #define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)
 
-// Hey, moron! If you change this table, don't forget about sprnames in info.c and the sprite lights in hw_light.c!
 typedef enum sprite
 {
 	SPR_NULL, // invisible object
@@ -4316,7 +4309,7 @@ typedef struct
 	spritenum_t sprite;
 	UINT32 frame; // we use the upper 16 bits for translucency and other shade effects
 	INT32 tics;
-	actionf_t action;
+	actionf_p1 action;
 	INT32 var1;
 	INT32 var2;
 	statenum_t nextstate;
diff --git a/src/k_director.c b/src/k_director.c
index d57ffbb8e..f6014ca97 100644
--- a/src/k_director.c
+++ b/src/k_director.c
@@ -12,15 +12,28 @@
 
 //#include "k_kart.h"
 #include "doomdef.h"
+<<<<<<< HEAD
 #include "g_game.h"
+=======
+#include "doomstat.h"
+#include "g_game.h"
+#include "m_random.h"
+>>>>>>> Saturn-Next
 #include "v_video.h"
 #include "k_director.h"
 #include "d_netcmd.h"
 #include "p_local.h"
+<<<<<<< HEAD
+=======
+#include "st_stuff.h"
+
+#include "r_fps.h"
+>>>>>>> Saturn-Next
 
 #define SWITCHTIME TICRATE * 5		// cooldown between unforced switches
 #define BOREDOMTIME 3 * TICRATE / 2 // how long until players considered far apart?
 #define TRANSFERTIME TICRATE		// how long to delay reaction shots?
+<<<<<<< HEAD
 #define BREAKAWAYDIST 4000			// how *far* until players considered far apart?
 #define WALKBACKDIST 600			// how close should a trailing player be before we switch?
 #define PINCHDIST 30000				// how close should the leader be to be considered "end of race"?
@@ -28,13 +41,107 @@
 struct directorinfo directorinfo;
 
 static fixed_t P_ScaleFromMap(fixed_t n, fixed_t scale)
+=======
+#define BREAKAWAYDIST 2000			// how *far* until players considered far apart?
+#define WALKBACKDIST 400			// how close should a trailing player be before we switch?
+#define PINCHDIST 20000				// how close should the leader be to be considered "end of race"?
+
+struct directorinfo
+{
+	player_t* viewplayer;
+	tic_t cooldown; // how long has it been since we last switched?
+	tic_t chaosleep;// how long did we watch the same player?
+	tic_t freeze;   // when nonzero, fixed switch pending, freeze logic!
+	INT32 attacker; // who to switch to when freeze delay elapses
+	INT32 maxdist;  // how far is the closest player from finishing?
+
+	INT32 sortedplayers[MAXPLAYERS]; // position-1 goes in, player index comes out.
+	INT32 gap[MAXPLAYERS];           // gap between a given position and their closest pursuer
+	INT32 boredom[MAXPLAYERS];       // how long has a given position had no credible attackers?
+} directorinfo;
+
+static INT32 K_PlayersPlaying(void)
+{
+	INT32 num = 0, i;
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		if (!playeringame[i] || players[i].spectator || !players[i].mo)
+			continue;
+
+		num++;
+	}
+	return num;
+}
+
+static inline boolean race_rules(void)
+{
+	return gametype == GT_RACE;
+}
+
+static fixed_t ScaleFromMap(fixed_t n, fixed_t scale)
+>>>>>>> Saturn-Next
 {
 	return FixedMul(n, FixedDiv(scale, mapobjectscale));
 }
 
+<<<<<<< HEAD
 static boolean K_DirectorIsEnabled(void)
 {
 	return cv_director.value && (gamestate == GS_LEVEL && (!playeringame[consoleplayer] || players[consoleplayer].spectator || demo.playback));
+=======
+boolean K_DirectorIsAvailable(void)
+{
+	if (splitscreen || dedicated || (demo.playback && demo.title) || modeattacking)
+		return false;
+	return ((gamestate == GS_LEVEL) && ((demo.playback && !camera[0].freecam) || (players[consoleplayer].spectator && (K_PlayersPlaying() > 1))));
+}
+
+static boolean K_DirectorIsEnabled(void)
+{
+	return (cv_director.value && K_DirectorIsAvailable());
+}
+
+static mobj_t *finishmo = NULL;
+
+// scan for the waypoint on the finish line
+// used to get a very approximate distance from player to finishline
+// we probably should like, do some maths to find the middle point between multiplayer
+// waypoints with the same values, but idk if its really worth it
+static void K_SetupFinishMo(void)
+{
+	INT16 maxMoveCount = -1;
+	INT16 maxAngle = -1;
+
+	finishmo = NULL;
+
+	if (!(mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE)) // not a sprint map
+	{
+		// waypoint with angle 0 should always be at the finish line
+		for (finishmo = waypointcap; finishmo != NULL; finishmo = finishmo->tracer)
+		{
+			if (finishmo->spawnpoint->angle == 0)
+				break;
+		}
+	}
+	else // crappy optimization weeeee
+	{
+		// sprint maps finishline waypoint is the one with highest movecount AND angle
+		for (finishmo = waypointcap; finishmo != NULL; finishmo = finishmo->tracer)
+		{
+			if (finishmo->movecount > maxMoveCount)
+				maxMoveCount = finishmo->movecount;
+			if (finishmo->spawnpoint->angle > maxAngle)
+				maxAngle = finishmo->spawnpoint->angle;
+		}
+
+		// now actually get the one
+		for (finishmo = waypointcap; finishmo != NULL; finishmo = finishmo->tracer)
+		{
+			if (finishmo->movecount == maxMoveCount && finishmo->spawnpoint->angle == maxAngle)
+				break; // found it
+		}
+	}
+>>>>>>> Saturn-Next
 }
 
 void K_InitDirector(void)
@@ -45,6 +152,11 @@ void K_InitDirector(void)
 	directorinfo.freeze = 0;
 	directorinfo.attacker = 0;
 	directorinfo.maxdist = 0;
+<<<<<<< HEAD
+=======
+	directorinfo.viewplayer = NULL;
+	directorinfo.chaosleep = 0;
+>>>>>>> Saturn-Next
 
 	for (playernum = 0; playernum < MAXPLAYERS; playernum++)
 	{
@@ -52,6 +164,7 @@ void K_InitDirector(void)
 		directorinfo.gap[playernum] = INT32_MAX;
 		directorinfo.boredom[playernum] = 0;
 	}
+<<<<<<< HEAD
 }
 
 /*static fixed_t K_GetFinishGap(INT32 leader, INT32 follower)
@@ -111,6 +224,20 @@ static fixed_t K_GetDistanceToFinish(player_t player)
 	}
 
 	return dist;
+=======
+
+	K_SetupFinishMo();
+}
+
+static fixed_t K_GetDistanceToFinish(player_t player)
+{
+	if (P_MobjWasRemoved(finishmo))
+		return 0;
+
+	return P_AproxDistance(P_AproxDistance(finishmo->x - player.mo->x,
+										   finishmo->y - player.mo->y),
+										   finishmo->z - player.mo->z) / FRACUNIT;
+>>>>>>> Saturn-Next
 }
 
 static fixed_t K_GetFinishGap(INT32 leader, INT32 follower)
@@ -134,10 +261,17 @@ static void K_UpdateDirectorPositions(void)
 	INT32 position;
 	player_t* target;
 
+<<<<<<< HEAD
 	memset(directorinfo.sortedplayers, -1, sizeof(directorinfo.sortedplayers));
 
 	for (playernum = 0; playernum < MAXPLAYERS; playernum++)
 	{
+=======
+	for (playernum = 0; playernum < MAXPLAYERS; playernum++)
+	{
+		directorinfo.sortedplayers[playernum] = -1;
+
+>>>>>>> Saturn-Next
 		target = &players[playernum];
 
 		if (playeringame[playernum] && !target->spectator && target->kartstuff[k_position] > 0)
@@ -155,11 +289,19 @@ static void K_UpdateDirectorPositions(void)
 			continue;
 		}
 
+<<<<<<< HEAD
 		directorinfo.gap[position] = P_ScaleFromMap(K_GetFinishGap(directorinfo.sortedplayers[position], directorinfo.sortedplayers[position + 1]), FRACUNIT);
 
 		if (directorinfo.gap[position] >= BREAKAWAYDIST)
 		{
 			directorinfo.boredom[position] = min(BOREDOMTIME * 2, directorinfo.boredom[position] + 1);
+=======
+		directorinfo.gap[position] = ScaleFromMap(K_GetFinishGap(directorinfo.sortedplayers[position], directorinfo.sortedplayers[position + 1]), FRACUNIT);
+
+		if (directorinfo.gap[position] >= BREAKAWAYDIST)
+		{
+			directorinfo.boredom[position] = (INT32)(min(BOREDOMTIME * 2, directorinfo.boredom[position] + 1));
+>>>>>>> Saturn-Next
 		}
 		else if (directorinfo.boredom[position] > 0)
 		{
@@ -173,11 +315,16 @@ static void K_UpdateDirectorPositions(void)
 		return;
 	}
 
+<<<<<<< HEAD
 	directorinfo.maxdist = P_ScaleFromMap(K_GetDistanceToFinish(players[directorinfo.sortedplayers[0]]), FRACUNIT);
+=======
+	directorinfo.maxdist = ScaleFromMap(K_GetDistanceToFinish(players[directorinfo.sortedplayers[0]]), FRACUNIT);
+>>>>>>> Saturn-Next
 }
 
 static boolean K_CanSwitchDirector(void)
 {
+<<<<<<< HEAD
 	/*INT32 *displayplayerp = &displayplayers[0];
 
 	if (players[*displayplayerp].trickpanel > 0)
@@ -185,6 +332,8 @@ static boolean K_CanSwitchDirector(void)
 		return false;
 	}*/
 
+=======
+>>>>>>> Saturn-Next
 	if (directorinfo.cooldown > 0)
 	{
 		return false;
@@ -195,7 +344,11 @@ static boolean K_CanSwitchDirector(void)
 
 static void K_DirectorSwitch(INT32 player, boolean force)
 {
+<<<<<<< HEAD
 	if (P_IsDisplayPlayer(&players[player]))
+=======
+	if (!K_DirectorIsEnabled())
+>>>>>>> Saturn-Next
 	{
 		return;
 	}
@@ -212,6 +365,10 @@ static void K_DirectorSwitch(INT32 player, boolean force)
 
 	G_ResetView(1, player, true);
 	directorinfo.cooldown = SWITCHTIME;
+<<<<<<< HEAD
+=======
+	directorinfo.chaosleep = 0;
+>>>>>>> Saturn-Next
 }
 
 static void K_DirectorForceSwitch(INT32 player, INT32 time)
@@ -223,6 +380,29 @@ static void K_DirectorForceSwitch(INT32 player, INT32 time)
 
 	directorinfo.attacker = player;
 	directorinfo.freeze = time;
+<<<<<<< HEAD
+=======
+	directorinfo.chaosleep = 0;
+}
+
+static void K_DirectorSwitchRandom(void)
+{
+	INT32 randomplayer = -1;
+
+	// kinda dumb but just check if the random player is existing lmao
+	for (INT32 h = 0; h < MAXPLAYERS; h++)
+	{
+		randomplayer = directorinfo.sortedplayers[M_RandomRange(0, K_PlayersPlaying()-1)]; // switch to someone random
+
+		if (randomplayer != -1 && randomplayer != displayplayers[0]) // dont switch to ourselves Zzz...
+		{
+			break;
+		}
+	}
+
+	if (randomplayer != -1)
+		K_DirectorSwitch(randomplayer, true);
+>>>>>>> Saturn-Next
 }
 
 void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source)
@@ -232,7 +412,11 @@ void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source)
 		return;
 	}
 
+<<<<<<< HEAD
 	if (!P_IsDisplayPlayer(player))
+=======
+	if (directorinfo.viewplayer != player)
+>>>>>>> Saturn-Next
 	{
 		return;
 	}
@@ -265,6 +449,10 @@ void K_DrawDirectorDebugger(void)
 	V_DrawThinString(120, 0, V_70TRANS, va("BORED"));
 	V_DrawThinString(150, 0, V_70TRANS, va("COOLDOWN: %d", directorinfo.cooldown));
 	V_DrawThinString(230, 0, V_70TRANS, va("MAXDIST: %d", directorinfo.maxdist));
+<<<<<<< HEAD
+=======
+	V_DrawThinString(310, 0, V_70TRANS, va("SLEEPTIME: %d", directorinfo.chaosleep));
+>>>>>>> Saturn-Next
 
 	for (position = 0; position < MAXPLAYERS - 1; position++)
 	{
@@ -278,10 +466,17 @@ void K_DrawDirectorDebugger(void)
 		V_DrawThinString(10, ytxt, V_70TRANS, va("%d", position));
 		V_DrawThinString(20, ytxt, V_70TRANS, va("%d", position + 1));
 
+<<<<<<< HEAD
 		/*if (players[leader].positiondelay)
 		{
 			V_DrawThinString(40, ytxt, V_70TRANS, va("NG"));
 		}*/
+=======
+		if (players[leader].kartstuff[k_positiondelay])
+		{
+			V_DrawThinString(40, ytxt, V_70TRANS, va("NG"));
+		}
+>>>>>>> Saturn-Next
 
 		V_DrawThinString(80, ytxt, V_70TRANS, va("%d", directorinfo.gap[position]));
 
@@ -301,8 +496,13 @@ void K_DrawDirectorDebugger(void)
 
 void K_UpdateDirector(void)
 {
+<<<<<<< HEAD
 	INT32 *displayplayerp = &displayplayers[0];
 	INT32 targetposition;
+=======
+	INT32 targetposition;
+	directorinfo.viewplayer = &players[displayplayers[0]];
+>>>>>>> Saturn-Next
 
 	if (!K_DirectorIsEnabled())
 	{
@@ -311,7 +511,12 @@ void K_UpdateDirector(void)
 
 	K_UpdateDirectorPositions();
 
+<<<<<<< HEAD
 	if (directorinfo.cooldown > 0) {
+=======
+	if (directorinfo.cooldown > 0)
+	{
+>>>>>>> Saturn-Next
 		directorinfo.cooldown--;
 	}
 
@@ -325,12 +530,42 @@ void K_UpdateDirector(void)
 	}
 
 	// if there's only one player left in the list, just switch to that player
+<<<<<<< HEAD
 	if (directorinfo.sortedplayers[0] != -1 && directorinfo.sortedplayers[1] == -1)
+=======
+	if (directorinfo.sortedplayers[0] != -1 && (directorinfo.sortedplayers[1] == -1 ||
+		// TODO: Battle; I just threw this together quick. Focus on leader.
+		!race_rules()))
+>>>>>>> Saturn-Next
 	{
 		K_DirectorSwitch(directorinfo.sortedplayers[0], false);
 		return;
 	}
 
+<<<<<<< HEAD
+=======
+	// insta switch if the player were watching finishes
+	if (players[displayplayers[0]].exiting)
+	{
+		K_DirectorSwitchRandom();
+		return;
+	}
+
+	// begin counting when cooldown wore off
+	if (!directorinfo.cooldown)
+	{
+		directorinfo.chaosleep++;
+	}
+
+	// force switch 10 seconds after the cooldown has ended
+	// otherwise i fall asleeb zzz...
+	if (directorinfo.chaosleep > TICRATE*10)
+	{
+		K_DirectorSwitchRandom();
+		return;
+	}
+
+>>>>>>> Saturn-Next
 	// aaight, time to walk through the standings to find the first interesting pair
 	// NB: targetposition/sortedplayers is 0-indexed, aiming at the "back half" of a given pair by default.
 	// we adjust for this when comparing to player->position or when looking at the leading player, Don't Freak Out
@@ -370,14 +605,30 @@ void K_UpdateDirector(void)
 
 		target = directorinfo.sortedplayers[targetposition];
 
+<<<<<<< HEAD
 		// if we're certain the back half of the pair is actually in this position, try to switch
 		if (*displayplayerp != target /*&& !players[target].positiondelay*/)
+=======
+		// stop here since we're already viewing this player
+		if (displayplayers[0] == target)
+		{
+			break;
+		}
+
+		// if we're certain the back half of the pair is actually in this position, try to switch
+		if (!players[target].kartstuff[k_positiondelay])
+>>>>>>> Saturn-Next
 		{
 			K_DirectorSwitch(target, false);
 		}
 
+<<<<<<< HEAD
 		// even if we're not certain, if we're certain we're watching the WRONG player, try to switch
 		if (players[*displayplayerp].kartstuff[k_position] != targetposition+1 /*&& !players[target].positiondelay*/)
+=======
+		// even if we're not certain, if we're cetain we're watching the WRONG player, try to switch
+		if (directorinfo.viewplayer->kartstuff[k_position] != targetposition+1 && !directorinfo.viewplayer->kartstuff[k_positiondelay])
+>>>>>>> Saturn-Next
 		{
 			K_DirectorSwitch(target, false);
 		}
@@ -388,10 +639,25 @@ void K_UpdateDirector(void)
 
 void K_ToggleDirector(void)
 {
+<<<<<<< HEAD
 	if (!K_DirectorIsEnabled())
 	{
 		directorinfo.cooldown = 0; // switch immediately
 	}
 
 	COM_ImmedExecute("add director 1");
+=======
+	if (!K_DirectorIsAvailable())
+		return;
+
+	if (!K_DirectorIsEnabled())
+	{
+		G_AdjustView(1, 1, true);
+		directorinfo.cooldown = 0; // switch immediately
+	}
+
+	directortoggletimer = 0;
+
+	CV_SetValue(&cv_director, (cv_director.value ^ 1));
+>>>>>>> Saturn-Next
 }
diff --git a/src/k_director.h b/src/k_director.h
index 7218cc7e3..9208ef6a4 100644
--- a/src/k_director.h
+++ b/src/k_director.h
@@ -10,6 +10,7 @@
 /// \file  k_director.h
 /// \brief SRB2kart automatic spectator camera.
 
+<<<<<<< HEAD
 extern struct directorinfo
 {
     tic_t cooldown; // how long has it been since we last switched?
@@ -22,6 +23,9 @@ extern struct directorinfo
     INT32 boredom[MAXPLAYERS];       // how long has a given position had no credible attackers?
 } directorinfo;
 
+=======
+boolean K_DirectorIsAvailable(void);
+>>>>>>> Saturn-Next
 void K_InitDirector(void);
 void K_UpdateDirector(void);
 void K_DrawDirectorDebugger(void);
diff --git a/src/k_hud.c b/src/k_hud.c
new file mode 100644
index 000000000..e8e3bcad7
--- /dev/null
+++ b/src/k_hud.c
@@ -0,0 +1,4797 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018-2020 by Kart Krew
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  k_hud.c
+/// \brief HUD drawing functions exclusive to Kart
+
+#include "doomdef.h"
+#include "doomstat.h"
+#include "doomtype.h"
+#include "command.h"
+#include "d_netcmd.h"
+#include "d_player.h"
+#include "hu_stuff.h"
+#include "g_game.h"
+#include "i_joy.h"
+#include "m_fixed.h"
+#include "m_menu.h" // ffdhidshfuisduifigergho9igj89dgodhfih AAAAAAAAAA
+#include "p_local.h"
+#include "p_setup.h"
+#include "r_defs.h"
+#include "r_draw.h"
+#include "r_state.h"
+#include "r_fps.h"
+#include "s_sound.h"
+#include "screen.h"
+#include "st_stuff.h"
+#include "tables.h"
+#include "v_video.h"
+#include "z_zone.h"
+#include "m_cond.h"
+#include "k_director.h"
+#include "k_kart.h"
+#include "lua_hud.h"	// For Lua hud checks
+#include "d_main.h"		// found_extra_kart
+#include "i_video.h"
+
+#include "k_hud.h"
+
+#ifdef ROTSPRITE
+#include "r_patchrotation.h"
+#endif
+
+#ifdef HWRENDER
+#include "hardware/hw_main.h"
+#endif
+
+#define XTRA3PSCALE 50135 //0.765
+#define XTRA3VSCALE 35344 //0.55
+
+// Hud offset cvars
+#define IMPL_HUD_OFFSET_X(name)\
+consvar_t cv_##name##_xoffset = {"hud_" #name "_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+#define IMPL_HUD_OFFSET_Y(name)\
+consvar_t cv_##name##_yoffset = {"hud_" #name "_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+#define IMPL_HUD_OFFSET(name)\
+IMPL_HUD_OFFSET_X(name)\
+IMPL_HUD_OFFSET_Y(name)
+
+IMPL_HUD_OFFSET(item);   // Item box
+IMPL_HUD_OFFSET(time);   // Time
+IMPL_HUD_OFFSET(laps);   // Number of laps
+IMPL_HUD_OFFSET(dnft);   // Countdown (did not finish timer)
+IMPL_HUD_OFFSET(speed);  // Speedometer
+IMPL_HUD_OFFSET(posi);   // Position in race
+IMPL_HUD_OFFSET(wheel);  // RA Wheel
+IMPL_HUD_OFFSET(face);   // Mini rankings
+IMPL_HUD_OFFSET(stcd);   // Starting countdown
+IMPL_HUD_OFFSET_Y(chek); // Check gfx
+IMPL_HUD_OFFSET(mini);   // Minimap
+IMPL_HUD_OFFSET(want);   // Wanted
+IMPL_HUD_OFFSET(stat);   // Stats
+
+#undef IMPL_HUD_OFFSET
+#undef IMPL_HUD_OFFSET_X
+#undef IMPL_HUD_OFFSET_Y
+
+// extra hud things
+consvar_t cv_showstats = {"showstats", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_highresportrait = {"highresportrait", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // make char potraits use their high-res version instead
+
+CV_PossibleValue_t inputdisplay_cons_t[NUMINPUTDISPLAYSTUFF];
+consvar_t cv_showinput = {"showinput", "Off", CV_SAVE, inputdisplay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t minihead_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Others"}, {0, NULL}};
+consvar_t cv_minihead         = {"smallminimapplayers", "Off", CV_SAVE, minihead_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showminimapnames = {"showminimapnames", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
+consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t posanim_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Smooth"}, {0, NULL}};
+consvar_t cv_posanim        = {"postitionanimation", "On", CV_SAVE, posanim_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_smallposnum    = {"smallpositionnumber", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_showlapemblem = {"showlapemblem", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t huditemamount_cons_t[] = {{0, "Vanilla"}, {1, "Multiple"}, {2, "Always"},{0, NULL}};
+consvar_t cv_huditemamount = {"showitemamountnumber", "Vanilla", CV_SAVE, huditemamount_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_fancyroulette = {"animatedroulette", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_darkitembox   = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // itembox gets a dark border with specific items
+consvar_t cv_multiitemicon = {"multiitemicon", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_showlaptimes = {"showlaptimes", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_biglaps = {"biglaphud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // here for ppl who dont want to make 2 more patches for their custom hud
+
+// Speedometer
+CV_PossibleValue_t speedo_cons_t[NUMSPEEDOSTUFF];
+consvar_t cv_newspeedometer = {"newspeedometer", "Default", CV_SAVE, speedo_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_battlespeedo   = {"battlespeedo", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // toggle for showing the speedometer in battlemode
+
+// Colourized HUD
+consvar_t cv_colorizedhud     = {"colorizedhud", "Off", CV_SAVE|CV_CALL, CV_OnOff, SaturnHud_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_colorizeditembox = {"colorizeditembox", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t HudColor_cons_t[MAXSKINCOLORS+1];
+consvar_t cv_colorizedhudcolor = {"colorizedhudcolor", "Skin Color", CV_SAVE, HudColor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+// Driftgauge
+static CV_PossibleValue_t driftgaugeoffset_cons_t[] = {
+	{-FRACUNIT*128, "MIN"}, {FRACUNIT*128, "MAX"}, {0, NULL}};
+CV_PossibleValue_t driftgaugestyle_cons_t[NUMDGAUGESTUFF];
+
+consvar_t cv_driftgauge      = {"kartdriftgauge", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_driftgaugeofs   = {"kartdriftgaugeoffset", "-20", CV_FLOAT|CV_SAVE, driftgaugeoffset_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_driftgaugetrans = {"kartdriftgaugetransparency", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_driftgaugestyle = {"kartdriftgaugestyle", "1", CV_SAVE, driftgaugestyle_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+// Nametags
+static CV_PossibleValue_t nametagtrans_cons_t[] = {
+	{0, "Never"}, {1, "Far only"}, {2, "Dynamic"}, {3, "Always"}, {4, "HUD Trans."}, {0, NULL}};
+static CV_PossibleValue_t nametagdistance_cons_t[] = {
+	{0, "MIN"},  {640, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t nametagmaxplayer_cons_t[] = {
+    {1, "MIN"}, {MAXPLAYERS, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t nametagsize_cons_t[] = {
+	{0, "Off"}, {1, "Small"}, {2, "Minimal"}, {0, NULL}};
+static CV_PossibleValue_t nametagrestat_cons_t[] = {
+	{0, "Off"}, {1, "Restat"}, {2, "Always"}, {0, NULL}};
+
+consvar_t cv_nametag              = {"kartnametag", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_nametagtrans         = {"kartnametagtransparency", "Dynamic", CV_SAVE, nametagtrans_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_nametagfacerank      = {"kartnametagfacerank", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_nametagrestat        = {"kartnametagrestat", "Restat", CV_SAVE, nametagrestat_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_nametagdist          = {"kartnametagdist", "320", CV_SAVE, nametagdistance_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_nametagmaxplayers    = {"kartnametagmaxplayers", "3", CV_SAVE, nametagmaxplayer_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_nametagmaxlenght     = {"kartnametagmaxlenght", "12", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showownnametag       = {"kartnametagshowown", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_smallnametags        = {"kartnametagsmall", "Off", CV_SAVE, nametagsize_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_nametagscore         = {"kartnametagscore", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_shownametagspectator = {"kartshownametagspectator", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+// Registers kart client commands and variables.
+// Nothing needed for a dedicated server should be registered here.
+void K_RegisterKartHudStuff(void)
+{
+	HudColor_cons_t[0].value = 0;
+	HudColor_cons_t[0].strvalue = "Skin Color";
+
+	for (INT32 i = 1; i < MAXSKINCOLORS; i++)
+	{
+		HudColor_cons_t[i].value = i;
+		HudColor_cons_t[i].strvalue = KartColor_Names[i]; // SRB2kart
+	}
+	HudColor_cons_t[MAXSKINCOLORS].value = 0;
+	HudColor_cons_t[MAXSKINCOLORS].strvalue = NULL;
+
+#define REG_HUD_OFFSET_X(name)\
+	CV_RegisterVar(&cv_##name##_xoffset);
+
+#define REG_HUD_OFFSET_Y(name)\
+	CV_RegisterVar(&cv_##name##_yoffset);
+
+#define REG_HUD_OFFSET(name)\
+	REG_HUD_OFFSET_X(name)\
+	REG_HUD_OFFSET_Y(name)
+
+	REG_HUD_OFFSET(item);   // Item box
+	REG_HUD_OFFSET(time);   // Time
+	REG_HUD_OFFSET(laps);   // Number of laps
+	REG_HUD_OFFSET(dnft);   // Countdown (did not finish timer)
+	REG_HUD_OFFSET(speed);  // Speedometer
+	REG_HUD_OFFSET(posi);   // Position in race
+	REG_HUD_OFFSET(wheel);  // Position in race
+	REG_HUD_OFFSET(face);   // Mini rankings
+	REG_HUD_OFFSET(stcd);   // Starting countdown
+	REG_HUD_OFFSET_Y(chek); // Check gfx
+	REG_HUD_OFFSET(mini);   // Minimap
+	REG_HUD_OFFSET(want);   // Wanted
+	REG_HUD_OFFSET(stat);   // Stats
+
+#undef REG_HUD_OFFSET
+#undef REG_HUD_OFFSET_X
+#undef REG_HUD_OFFSET_Y
+
+	CV_RegisterVar(&cv_kartminimap);
+	CV_RegisterVar(&cv_kartcheck);
+
+	CV_RegisterVar(&cv_kartspeedometer);
+
+	CV_RegisterVar(&cv_showstats);
+	CV_RegisterVar(&cv_showinput);
+
+	CV_RegisterVar(&cv_posanim);
+	CV_RegisterVar(&cv_smallposnum);
+
+	CV_RegisterVar(&cv_fancyroulette);
+
+	CV_RegisterVar(&cv_showlaptimes);
+	CV_RegisterVar(&cv_newspeedometer);
+
+	CV_RegisterVar(&cv_battlespeedo);
+
+	CV_RegisterVar(&cv_minihead);
+	CV_RegisterVar(&cv_showminimapnames);
+	CV_RegisterVar(&cv_showminimapangle);
+
+	CV_RegisterVar(&cv_showlapemblem);
+
+	CV_RegisterVar(&cv_stagetitle);
+
+	// Colourized HUD
+	CV_RegisterVar(&cv_colorizedhud);
+	CV_RegisterVar(&cv_colorizedhudcolor);
+	CV_RegisterVar(&cv_colorizeditembox);
+
+	CV_RegisterVar(&cv_biglaps);
+
+	CV_RegisterVar(&cv_darkitembox);
+
+	CV_RegisterVar(&cv_multiitemicon);
+	CV_RegisterVar(&cv_huditemamount);
+
+	CV_RegisterVar(&cv_highresportrait);
+
+	CV_RegisterVar(&cv_nametag);
+	CV_RegisterVar(&cv_nametagtrans);
+	CV_RegisterVar(&cv_nametagfacerank);
+	CV_RegisterVar(&cv_nametagmaxplayers);
+	CV_RegisterVar(&cv_nametagmaxlenght);
+	CV_RegisterVar(&cv_nametagdist);
+	CV_RegisterVar(&cv_showownnametag);
+	CV_RegisterVar(&cv_smallnametags);
+	CV_RegisterVar(&cv_nametagrestat);
+	CV_RegisterVar(&cv_nametagscore);
+	CV_RegisterVar(&cv_shownametagspectator);
+
+	CV_RegisterVar(&cv_driftgauge);
+	CV_RegisterVar(&cv_driftgaugeofs);
+	CV_RegisterVar(&cv_driftgaugetrans);
+	CV_RegisterVar(&cv_driftgaugestyle);
+
+	CV_RegisterVar(&cv_lessflicker);
+}
+
+//{ Patch Definitions
+
+// --Saturn patches--
+// dont leave those unitialized incase we missed a check somewhere
+
+// -Speedometers-
+
+// Smol speedo
+static patch_t *skp_smallsticker    = NULL;
+static patch_t *skp_smallsticker3   = NULL;
+
+static patch_t *skp_speedpatches[5] = {NULL};
+
+// Achii speedo
+static patch_t *skp_smallstickerachi       =  NULL;
+static patch_t *skp_speedpatchesachi[5]    = {NULL};
+static patch_t *skp_smallstickerachiclr    =  NULL;
+static patch_t *skp_speedpatchesachiclr[5] = {NULL};
+
+// Kartz speedo
+static patch_t *kp_kartzspeedo[25]      = {NULL};
+static patch_t *kp_kartzspeedo_smol[25] = {NULL};
+
+// dial speedometer
+static patch_t *skp_rankfinish             =  NULL;
+static patch_t *skp_dialbase[2]            = {NULL};
+static patch_t *skp_speedpatchesdial[5]    = {NULL};
+static patch_t *skp_dialnum[10]            = {NULL};
+//static patch_t *skp_dialclr              =  NULL;
+static patch_t *skp_dialbaseclr[2]         = {NULL};
+static patch_t *skp_speedpatchesdialclr[5] = {NULL};
+static patch_t *skp_dialnumclr[10]         = {NULL};
+
+// -Colourized hud-
+
+static patch_t *kp_timestickerclr        =  NULL;
+static patch_t *kp_timestickerwideclr    =  NULL;
+static patch_t *kp_lapstickerclr         =  NULL;
+static patch_t *kp_lapstickerbigclr      =  NULL;
+static patch_t *kp_lapstickerbig2clr     =  NULL;
+static patch_t *kp_lapstickerwideclr     =  NULL;
+//static patch_t *kp_lapstickernarrowclr =  NULL;
+static patch_t *kp_bumperstickerclr      =  NULL;
+static patch_t *kp_bumperstickerwideclr  =  NULL;
+static patch_t *kp_karmastickerclr       =  NULL;
+static patch_t *kp_timeoutstickerclr     =  NULL;
+static patch_t *skp_smallstickerclr      =  NULL;
+static patch_t *skp_smallstickerclr3     =  NULL;
+static patch_t *kp_itemmulstickerclr[2]  = {NULL};
+static patch_t *kp_itembgclr[4]          = {NULL};
+
+// -Misc.-
+
+static patch_t *kp_lapstickerbig  = NULL;
+static patch_t *kp_lapstickerbig2 = NULL;
+
+static patch_t *nametagpic    = NULL;
+static patch_t *nametagline   = NULL;
+static patch_t *nametagspeed  = NULL;
+static patch_t *nametagweight = NULL;
+
+static patch_t *driftgauge           = NULL;
+static patch_t *driftgaugecolor      = NULL;
+static patch_t *driftgaugesmall      = NULL;
+static patch_t *driftgaugesmallcolor = NULL;
+
+static patch_t *kp_minimapdot = NULL;
+
+static patch_t *joybacking = NULL;
+static patch_t *joyknob    = NULL;
+static patch_t *joyshadow  = NULL;
+
+static patch_t *kp_multjawz       =  NULL;
+static patch_t *kp_multsneaker[2] = {NULL};
+static patch_t *kp_multbanana[3]  = {NULL};
+
+static void K_LoadSaturnHUDGraphics(void)
+{
+	INT32 i;
+	char buffer[9];
+
+	if (found_extra_kart)
+	{
+		if (xtra_speedo) // smol speedometer
+		{
+			skp_smallsticker    = (patch_t *)W_CachePatchName("SP_SMSTC", PU_HUDGFX);
+			skp_speedpatches[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd
+			skp_speedpatches[1] = (patch_t *)W_CachePatchName("SP_MKMH",  PU_HUDGFX);
+			skp_speedpatches[2] = (patch_t *)W_CachePatchName("SP_MMPH",  PU_HUDGFX);
+			skp_speedpatches[3] = (patch_t *)W_CachePatchName("SP_MFRAC", PU_HUDGFX);
+			skp_speedpatches[4] = (patch_t *)W_CachePatchName("SP_MPERC", PU_HUDGFX);
+		}
+
+		if (achi_speedo)
+		{
+			skp_smallstickerachi    = (patch_t *)W_CachePatchName("SP_AMSTC", PU_HUDGFX);
+			skp_speedpatchesachi[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd
+			skp_speedpatchesachi[1] = (patch_t *)W_CachePatchName("SP_AKMH",  PU_HUDGFX);
+			skp_speedpatchesachi[2] = (patch_t *)W_CachePatchName("SP_AMPH",  PU_HUDGFX);
+			skp_speedpatchesachi[3] = (patch_t *)W_CachePatchName("SP_AFRAC", PU_HUDGFX);
+			skp_speedpatchesachi[4] = (patch_t *)W_CachePatchName("SP_APERC", PU_HUDGFX);
+		}
+
+		if (dial_speedo)
+		{
+			skp_rankfinish  = (patch_t *)W_CachePatchName("RANKFIN",  PU_HUDGFX);
+			skp_dialbase[0] = (patch_t *)W_CachePatchName("K_DSPBS1", PU_HUDGFX);
+			skp_dialbase[1] = (patch_t *)W_CachePatchName("K_DSPBS2", PU_HUDGFX);
+
+			skp_speedpatchesdial[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd
+			skp_speedpatchesdial[1] = (patch_t *)W_CachePatchName("SP_DKMH",  PU_HUDGFX);
+			skp_speedpatchesdial[2] = (patch_t *)W_CachePatchName("SP_DMPH",  PU_HUDGFX);
+			skp_speedpatchesdial[3] = (patch_t *)W_CachePatchName("SP_DFRAC", PU_HUDGFX);
+			skp_speedpatchesdial[4] = (patch_t *)W_CachePatchName("SP_DPERC", PU_HUDGFX);
+
+			sprintf(buffer, "K_DSPNMx");
+			for (i = 0; i < 10; i++)
+			{
+				buffer[7] = '0'+(i%10);
+				skp_dialnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+			}
+		}
+
+		// KartZ speedo
+		if (kartz_speedo)
+		{
+			const char* patchNames[] = {
+				"K_KZSP1", "K_KZSP2", "K_KZSP3", "K_KZSP4", "K_KZSP5",
+				"K_KZSP6", "K_KZSP7", "K_KZSP8", "K_KZSP9", "K_KZSP10",
+				"K_KZSP11", "K_KZSP12", "K_KZSP13", "K_KZSP14", "K_KZSP15",
+				"K_KZSP16", "K_KZSP17", "K_KZSP18", "K_KZSP19", "K_KZSP20",
+				"K_KZSP21", "K_KZSP22", "K_KZSP23", "K_KZSP24", "K_KZSP25"
+			};
+
+			for (size_t m = 0; m < sizeof(patchNames) / sizeof(patchNames[0]); ++m)
+			{
+				kp_kartzspeedo[m] = (patch_t *)W_CachePatchName(patchNames[m], PU_HUDGFX);
+			}
+		}
+
+		if (kartz_speedo_smol)
+		{
+			const char* patchNames[] = {
+				"K_KZSS1", "K_KZSS2", "K_KZSS3", "K_KZSS4", "K_KZSS5",
+				"K_KZSS6", "K_KZSS7", "K_KZSS8", "K_KZSS9", "K_KZSS10",
+				"K_KZSS11", "K_KZSS12", "K_KZSS13", "K_KZSS14", "K_KZSS15",
+				"K_KZSS16", "K_KZSS17", "K_KZSS18", "K_KZSS19", "K_KZSS20",
+				"K_KZSS21", "K_KZSS22", "K_KZSS23", "K_KZSS24", "K_KZSS25"
+			};
+
+			for (size_t m = 0; m < sizeof(patchNames) / sizeof(patchNames[0]); ++m)
+			{
+				kp_kartzspeedo_smol[m] = (patch_t *)W_CachePatchName(patchNames[m], PU_HUDGFX);
+			}
+		}
+
+		if (big_lap)
+		{
+			kp_lapstickerbig  = (patch_t *)W_CachePatchName("K_STLAPB", PU_HUDGFX);
+			kp_lapstickerbig2 = (patch_t *)W_CachePatchName("K_STLA2B", PU_HUDGFX);
+		}
+
+		// Nametags
+		if (nametaggfx)
+		{
+			nametagpic    = (patch_t *)W_CachePatchName("NTLINE", PU_HUDGFX);
+			nametagline   = (patch_t *)W_CachePatchName("NTLINEV", PU_HUDGFX);
+			nametagspeed  = (patch_t *)W_CachePatchName("NTSP", PU_HUDGFX);
+			nametagweight = (patch_t *)W_CachePatchName("NTWH", PU_HUDGFX);
+		}
+
+		if (driftgaugegfx)
+		{
+			driftgauge      =  (patch_t *)W_CachePatchName("K_DGAU", PU_HUDGFX);
+			driftgaugesmall =  (patch_t *)W_CachePatchName("K_DGSU", PU_HUDGFX);
+
+			if (driftgaugegfx_clr)
+			{
+				driftgaugecolor      =  (patch_t *)W_CachePatchName("K_DCAU", PU_HUDGFX);
+				driftgaugesmallcolor =  (patch_t *)W_CachePatchName("K_DCSU", PU_HUDGFX);
+			}
+		}
+
+		if (joystickicon)
+		{
+			joybacking = (patch_t *)W_CachePatchName("JOYBCK", PU_HUDGFX);
+			joyknob    = (patch_t *)W_CachePatchName("JOYKNB", PU_HUDGFX);
+			joyshadow  = (patch_t *)W_CachePatchName("JOYSHD", PU_HUDGFX);
+		}
+
+		if (minidoticon)
+		{
+			kp_minimapdot = (patch_t *)W_CachePatchName("MMAPDOT", PU_HUDGFX);
+		}
+
+		if (multiitem_icon)
+		{
+			kp_multsneaker[0] = (patch_t *)W_CachePatchName("K_ITSHO2", PU_HUDGFX);
+			kp_multsneaker[1] = (patch_t *)W_CachePatchName("K_ITSHO3", PU_HUDGFX);
+			kp_multbanana[0]  = (patch_t *)W_CachePatchName("K_ITBAN2", PU_HUDGFX);
+			kp_multbanana[1]  = (patch_t *)W_CachePatchName("K_ITBAN3", PU_HUDGFX);
+			kp_multbanana[2]  = (patch_t *)W_CachePatchName("K_ITBAN4", PU_HUDGFX);
+			kp_multjawz       = (patch_t *)W_CachePatchName("K_ITJAW2", PU_HUDGFX);
+		}
+	}
+
+	if (found_extra2_kart)
+	{
+		if (xtra_speedo_clr)
+		{
+			skp_smallstickerclr = (patch_t *)W_CachePatchName("SC_SMSTC", PU_HUDGFX);
+		}
+
+		if (xtra_speedo_clr3)
+		{
+			skp_smallstickerclr3 = (patch_t *)W_CachePatchName("SC_SM3TC", PU_HUDGFX);
+		}
+
+		if (achi_speedo_clr)
+		{
+			skp_smallstickerachiclr    = (patch_t *)W_CachePatchName("SC_AMSTC", PU_HUDGFX);
+			skp_speedpatchesachiclr[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd
+			skp_speedpatchesachiclr[1] = (patch_t *)W_CachePatchName("SC_AKMH",  PU_HUDGFX);
+			skp_speedpatchesachiclr[2] = (patch_t *)W_CachePatchName("SC_AMPH",  PU_HUDGFX);
+			skp_speedpatchesachiclr[3] = (patch_t *)W_CachePatchName("SC_AFRAC", PU_HUDGFX);
+			skp_speedpatchesachiclr[4] = (patch_t *)W_CachePatchName("SC_APERC", PU_HUDGFX);
+		}
+
+		if (dial_speedo_clr)
+		{
+			skp_dialbaseclr[0] = (patch_t *)W_CachePatchName("K_DSPBC1", PU_HUDGFX);
+			skp_dialbaseclr[1] = (patch_t *)W_CachePatchName("K_DSPBC2", PU_HUDGFX);
+
+			skp_speedpatchesdialclr[0] = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd
+			skp_speedpatchesdialclr[1] = (patch_t *)W_CachePatchName("SC_DKMH",  PU_HUDGFX);
+			skp_speedpatchesdialclr[2] = (patch_t *)W_CachePatchName("SC_DMPH",  PU_HUDGFX);
+			skp_speedpatchesdialclr[3] = (patch_t *)W_CachePatchName("SC_DFRAC", PU_HUDGFX);
+			skp_speedpatchesdialclr[4] = (patch_t *)W_CachePatchName("SC_DPERC", PU_HUDGFX);
+
+			sprintf(buffer, "K_DSPNCx");
+			for (i = 0; i < 10; i++)
+			{
+				buffer[7] = '0'+(i%10);
+				skp_dialnumclr[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+			}
+		}
+
+		if (big_lap_color)
+		{
+			kp_lapstickerbigclr  = (patch_t *)W_CachePatchName("K_SCLAPB", PU_HUDGFX);
+			kp_lapstickerbig2clr = (patch_t *)W_CachePatchName("K_SCLA2B", PU_HUDGFX);
+		}
+
+		// Colourized hud
+		if (clr_hud)
+		{
+			kp_timestickerclr       = (patch_t *)W_CachePatchName("K_SCTIME", PU_HUDGFX);
+			kp_timestickerwideclr   = (patch_t *)W_CachePatchName("K_SCTIMW", PU_HUDGFX);
+			kp_lapstickerclr        = (patch_t *)W_CachePatchName("K_SCLAPS", PU_HUDGFX);
+			kp_lapstickerwideclr    = (patch_t *)W_CachePatchName("K_SCLAPW", PU_HUDGFX);
+			kp_bumperstickerclr     = (patch_t *)W_CachePatchName("K_SCBALN", PU_HUDGFX);
+			kp_bumperstickerwideclr = (patch_t *)W_CachePatchName("K_SCBALW", PU_HUDGFX);
+			kp_karmastickerclr      = (patch_t *)W_CachePatchName("K_SCKARM", PU_HUDGFX);
+			kp_timeoutstickerclr    = (patch_t *)W_CachePatchName("K_SCTOUT", PU_HUDGFX);
+			kp_itembgclr[0]         = (patch_t *)W_CachePatchName("K_ITBC"  , PU_HUDGFX);
+			kp_itembgclr[1]         = (patch_t *)W_CachePatchName("K_ITBCD" , PU_HUDGFX);
+			kp_itembgclr[2]         = (patch_t *)W_CachePatchName("K_ISBC"  , PU_HUDGFX);
+			kp_itembgclr[3]         = (patch_t *)W_CachePatchName("K_ISBCD" , PU_HUDGFX);
+			kp_itemmulstickerclr[1] = (patch_t *)W_CachePatchName("K_ISMULC", PU_HUDGFX);
+			kp_itemmulstickerclr[0] = (patch_t *)W_CachePatchName("K_ITMULC", PU_HUDGFX);
+		}
+	}
+
+	if (found_extra3_kart)
+	{
+		if (xtra_speedo3) // 80x11 patch scaled to size
+		{
+			skp_smallsticker3 = (patch_t *)W_CachePatchName("SP_SM3TC", PU_HUDGFX);
+		}
+	}
+}
+
+// -- Kart patches --
+
+#define NUMPOSNUMS 10
+#define NUMPOSFRAMES 7 // White, three blues, three reds
+#define NUMWINFRAMES 6 // Red, yellow, green, cyan, blue, purple
+
+static patch_t *kp_nodraw;
+static patch_t *kp_timesticker;
+static patch_t *kp_timestickerwide;
+static patch_t *kp_lapsticker;
+static patch_t *kp_lapstickerwide;
+//static patch_t *kp_lapstickernarrow;
+static patch_t *kp_splitlapflag;
+static patch_t *kp_bumpersticker;
+static patch_t *kp_bumperstickerwide;
+static patch_t *kp_karmasticker;
+static patch_t *kp_splitkarmabomb;
+static patch_t *kp_timeoutsticker;
+
+static patch_t *kp_startcountdown[16];
+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];
+static patch_t *kp_facehighlight[8];
+
+static patch_t *kp_rankbumper;
+static patch_t *kp_tinybumper[2];
+static patch_t *kp_ranknobumpers;
+
+static patch_t *kp_battlewin;
+static patch_t *kp_battlecool;
+static patch_t *kp_battlelose;
+static patch_t *kp_battlewait;
+static patch_t *kp_battleinfo;
+static patch_t *kp_wanted;
+static patch_t *kp_wantedsplit;
+static patch_t *kp_wantedreticle;
+
+static patch_t *kp_itembg[4];
+static patch_t *kp_itemtimer[2];
+static patch_t *kp_itemmulsticker[2];
+static patch_t *kp_itemx;
+
+static patch_t *kp_sneaker[2];
+static patch_t *kp_rocketsneaker[2];
+static patch_t *kp_invincibility[13];
+static patch_t *kp_banana[2];
+static patch_t *kp_eggman[2];
+static patch_t *kp_orbinaut[5];
+static patch_t *kp_jawz[2];
+static patch_t *kp_mine[2];
+static patch_t *kp_ballhog[2];
+static patch_t *kp_selfpropelledbomb[2];
+static patch_t *kp_grow[2];
+static patch_t *kp_shrink[2];
+static patch_t *kp_thundershield[2];
+static patch_t *kp_hyudoro[2];
+static patch_t *kp_pogospring[2];
+static patch_t *kp_kitchensink[2];
+static patch_t *kp_sadface[2];
+
+static patch_t *kp_check[6];
+
+static patch_t *kp_eggnum[4];
+
+static patch_t *kp_fpview[3];
+static patch_t *kp_inputwheel[5];
+
+static patch_t *kp_challenger[25];
+
+static patch_t *kp_lapanim_lap[7];
+static patch_t *kp_lapanim_final[11];
+static patch_t *kp_lapanim_number[10][3];
+static patch_t *kp_lapanim_emblem[2];
+static patch_t *kp_lapanim_hand[3];
+
+static patch_t *kp_yougotem;
+
+void K_LoadKartHUDGraphics(void)
+{
+	INT32 i, j;
+	char buffer[9];
+
+	// Null Stuff
+	kp_nodraw = (patch_t *)W_CachePatchName("K_TRNULL", PU_HUDGFX);
+
+	// Stickers
+	kp_timesticker        = (patch_t *)W_CachePatchName("K_STTIME", PU_HUDGFX);
+	kp_timestickerwide    = (patch_t *)W_CachePatchName("K_STTIMW", PU_HUDGFX);
+	kp_lapsticker         = (patch_t *)W_CachePatchName("K_STLAPS", PU_HUDGFX);
+	kp_lapstickerwide     = (patch_t *)W_CachePatchName("K_STLAPW", PU_HUDGFX);
+	//kp_lapstickernarrow = (patch_t *)W_CachePatchName("K_STLAPN", PU_HUDGFX);
+	kp_splitlapflag       = (patch_t *)W_CachePatchName("K_SPTLAP", PU_HUDGFX);
+	kp_bumpersticker      = (patch_t *)W_CachePatchName("K_STBALN", PU_HUDGFX);
+	kp_bumperstickerwide  = (patch_t *)W_CachePatchName("K_STBALW", PU_HUDGFX);
+	kp_karmasticker       = (patch_t *)W_CachePatchName("K_STKARM", PU_HUDGFX);
+	kp_splitkarmabomb     = (patch_t *)W_CachePatchName("K_SPTKRM", PU_HUDGFX);
+	kp_timeoutsticker     = (patch_t *)W_CachePatchName("K_STTOUT", PU_HUDGFX);
+
+	// Starting countdown
+	kp_startcountdown[0] = (patch_t *)W_CachePatchName("K_CNT3A", PU_HUDGFX);
+	kp_startcountdown[1] = (patch_t *)W_CachePatchName("K_CNT2A", PU_HUDGFX);
+	kp_startcountdown[2] = (patch_t *)W_CachePatchName("K_CNT1A", PU_HUDGFX);
+	kp_startcountdown[3] = (patch_t *)W_CachePatchName("K_CNTGOA", PU_HUDGFX);
+	kp_startcountdown[4] = (patch_t *)W_CachePatchName("K_CNT3B", PU_HUDGFX);
+	kp_startcountdown[5] = (patch_t *)W_CachePatchName("K_CNT2B", PU_HUDGFX);
+	kp_startcountdown[6] = (patch_t *)W_CachePatchName("K_CNT1B", PU_HUDGFX);
+	kp_startcountdown[7] = (patch_t *)W_CachePatchName("K_CNTGOB", PU_HUDGFX);
+
+	// Splitscreen
+	kp_startcountdown[8]  = (patch_t *)W_CachePatchName("K_SMC3A", PU_HUDGFX);
+	kp_startcountdown[9]  = (patch_t *)W_CachePatchName("K_SMC2A", PU_HUDGFX);
+	kp_startcountdown[10] = (patch_t *)W_CachePatchName("K_SMC1A", PU_HUDGFX);
+	kp_startcountdown[11] = (patch_t *)W_CachePatchName("K_SMCGOA", PU_HUDGFX);
+	kp_startcountdown[12] = (patch_t *)W_CachePatchName("K_SMC3B", PU_HUDGFX);
+	kp_startcountdown[13] = (patch_t *)W_CachePatchName("K_SMC2B", PU_HUDGFX);
+	kp_startcountdown[14] = (patch_t *)W_CachePatchName("K_SMC1B", PU_HUDGFX);
+	kp_startcountdown[15] = (patch_t *)W_CachePatchName("K_SMCGOB", PU_HUDGFX);
+
+	// Finish
+	kp_racefinish[0] = (patch_t *)W_CachePatchName("K_FINA", PU_HUDGFX);
+	kp_racefinish[1] = (patch_t *)W_CachePatchName("K_FINB", PU_HUDGFX);
+
+	// Splitscreen
+	kp_racefinish[2] = (patch_t *)W_CachePatchName("K_SMFINA", PU_HUDGFX);
+	kp_racefinish[3] = (patch_t *)W_CachePatchName("K_SMFINB", PU_HUDGFX);
+
+	// 2P splitscreen
+	kp_racefinish[4] = (patch_t *)W_CachePatchName("K_2PFINA", PU_HUDGFX);
+	kp_racefinish[5] = (patch_t *)W_CachePatchName("K_2PFINB", PU_HUDGFX);
+
+	// Position numbers
+	sprintf(buffer, "K_POSNxx");
+	for (i = 0; i < NUMPOSNUMS; i++)
+	{
+		buffer[6] = '0'+i;
+		for (j = 0; j < NUMPOSFRAMES; j++)
+		{
+			buffer[7] = '0'+j;
+			kp_positionnum[i][j] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+		}
+	}
+
+	sprintf(buffer, "K_POSNWx");
+	for (i = 0; i < NUMWINFRAMES; i++)
+	{
+		buffer[7] = '0'+i;
+		kp_winnernum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	sprintf(buffer, "OPPRNKxx");
+	for (i = 0; i <= MAXPLAYERS; i++)
+	{
+		buffer[6] = '0'+(i/10);
+		buffer[7] = '0'+(i%10);
+		kp_facenum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	sprintf(buffer, "K_CHILIx");
+	for (i = 0; i < 8; i++)
+	{
+		buffer[7] = '0'+(i+1);
+		kp_facehighlight[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	// Extra ranking icons
+	kp_rankbumper    = (patch_t *)W_CachePatchName("K_BLNICO", PU_HUDGFX);
+	kp_tinybumper[0] = (patch_t *)W_CachePatchName("K_BLNA", PU_HUDGFX);
+	kp_tinybumper[1] = (patch_t *)W_CachePatchName("K_BLNB", PU_HUDGFX);
+	kp_ranknobumpers = (patch_t *)W_CachePatchName("K_NOBLNS", PU_HUDGFX);
+
+	// Battle graphics
+	kp_battlewin     = (patch_t *)W_CachePatchName("K_BWIN", PU_HUDGFX);
+	kp_battlecool    = (patch_t *)W_CachePatchName("K_BCOOL", PU_HUDGFX);
+	kp_battlelose    = (patch_t *)W_CachePatchName("K_BLOSE", PU_HUDGFX);
+	kp_battlewait    = (patch_t *)W_CachePatchName("K_BWAIT", PU_HUDGFX);
+	kp_battleinfo    = (patch_t *)W_CachePatchName("K_BINFO", PU_HUDGFX);
+	kp_wanted        = (patch_t *)W_CachePatchName("K_WANTED", PU_HUDGFX);
+	kp_wantedsplit   = (patch_t *)W_CachePatchName("4PWANTED", PU_HUDGFX);
+	kp_wantedreticle = (patch_t *)W_CachePatchName("MMAPWANT", PU_HUDGFX);
+
+	// Kart Item Windows
+	kp_itembg[0]         = (patch_t *)W_CachePatchName("K_ITBG", PU_HUDGFX);
+	kp_itembg[1]         = (patch_t *)W_CachePatchName("K_ITBGD", PU_HUDGFX);
+	kp_itemtimer[0]      = (patch_t *)W_CachePatchName("K_ITIMER", PU_HUDGFX);
+	kp_itemmulsticker[0] = (patch_t *)W_CachePatchName("K_ITMUL", PU_HUDGFX);
+	kp_itemx             = (patch_t *)W_CachePatchName("K_ITX", PU_HUDGFX);
+	// Splitscreen
+	kp_itembg[2]         = (patch_t *)W_CachePatchName("K_ISBG", PU_HUDGFX);
+	kp_itembg[3]         = (patch_t *)W_CachePatchName("K_ISBGD", PU_HUDGFX);
+	kp_itemtimer[1]      = (patch_t *)W_CachePatchName("K_ISIMER", PU_HUDGFX);
+	kp_itemmulsticker[1] = (patch_t *)W_CachePatchName("K_ISMUL", PU_HUDGFX);
+
+	// Kart Items
+	kp_sneaker[0]           = (patch_t *)W_CachePatchName("K_ITSHOE", PU_HUDGFX);
+	kp_rocketsneaker[0]     = (patch_t *)W_CachePatchName("K_ITRSHE", PU_HUDGFX);
+	kp_banana[0]            = (patch_t *)W_CachePatchName("K_ITBANA", PU_HUDGFX);
+	kp_eggman[0]            = (patch_t *)W_CachePatchName("K_ITEGGM", PU_HUDGFX);
+	kp_jawz[0]              = (patch_t *)W_CachePatchName("K_ITJAWZ", PU_HUDGFX);
+	kp_mine[0]              = (patch_t *)W_CachePatchName("K_ITMINE", PU_HUDGFX);
+	kp_ballhog[0]           = (patch_t *)W_CachePatchName("K_ITBHOG", PU_HUDGFX);
+	kp_selfpropelledbomb[0] = (patch_t *)W_CachePatchName("K_ITSPB", PU_HUDGFX);
+	kp_grow[0]              = (patch_t *)W_CachePatchName("K_ITGROW", PU_HUDGFX);
+	kp_shrink[0]            = (patch_t *)W_CachePatchName("K_ITSHRK", PU_HUDGFX);
+	kp_thundershield[0]     = (patch_t *)W_CachePatchName("K_ITTHNS", PU_HUDGFX);
+	kp_hyudoro[0]           = (patch_t *)W_CachePatchName("K_ITHYUD", PU_HUDGFX);
+	kp_pogospring[0]        = (patch_t *)W_CachePatchName("K_ITPOGO", PU_HUDGFX);
+	kp_kitchensink[0]       = (patch_t *)W_CachePatchName("K_ITSINK", PU_HUDGFX);
+	kp_sadface[0]           = (patch_t *)W_CachePatchName("K_ITSAD", PU_HUDGFX);
+	// Splitscreen
+	kp_sneaker[1]           = (patch_t *)W_CachePatchName("K_ISSHOE", PU_HUDGFX);
+	kp_rocketsneaker[1]     = (patch_t *)W_CachePatchName("K_ISRSHE", PU_HUDGFX);
+	kp_banana[1]            = (patch_t *)W_CachePatchName("K_ISBANA", PU_HUDGFX);
+	kp_eggman[1]            = (patch_t *)W_CachePatchName("K_ISEGGM", PU_HUDGFX);
+	kp_orbinaut[4]          = (patch_t *)W_CachePatchName("K_ISORBN", PU_HUDGFX);
+	kp_jawz[1]              = (patch_t *)W_CachePatchName("K_ISJAWZ", PU_HUDGFX);
+	kp_mine[1]              = (patch_t *)W_CachePatchName("K_ISMINE", PU_HUDGFX);
+	kp_ballhog[1]           = (patch_t *)W_CachePatchName("K_ISBHOG", PU_HUDGFX);
+	kp_selfpropelledbomb[1] = (patch_t *)W_CachePatchName("K_ISSPB", PU_HUDGFX);
+	kp_grow[1]              = (patch_t *)W_CachePatchName("K_ISGROW", PU_HUDGFX);
+	kp_shrink[1]            = (patch_t *)W_CachePatchName("K_ISSHRK", PU_HUDGFX);
+	kp_thundershield[1]     = (patch_t *)W_CachePatchName("K_ISTHNS", PU_HUDGFX);
+	kp_hyudoro[1]           = (patch_t *)W_CachePatchName("K_ISHYUD", PU_HUDGFX);
+	kp_pogospring[1]        = (patch_t *)W_CachePatchName("K_ISPOGO", PU_HUDGFX);
+	kp_kitchensink[1]       = (patch_t *)W_CachePatchName("K_ISSINK", PU_HUDGFX);
+	kp_sadface[1]           = (patch_t *)W_CachePatchName("K_ISSAD", PU_HUDGFX);
+
+	sprintf(buffer, "K_ITINVx");
+	for (i = 0; i < 7; i++)
+	{
+		buffer[7] = '1'+i;
+		kp_invincibility[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	sprintf(buffer, "K_ITORBx");
+	for (i = 0; i < 4; i++)
+	{
+		buffer[7] = '1'+i;
+		kp_orbinaut[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	sprintf(buffer, "K_ISINVx");
+	for (i = 0; i < 6; i++)
+	{
+		buffer[7] = '1'+i;
+		kp_invincibility[i+7] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	// CHECK indicators
+	sprintf(buffer, "K_CHECKx");
+	for (i = 0; i < 6; i++)
+	{
+		buffer[7] = '1'+i;
+		kp_check[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	// Eggman warning numbers
+	sprintf(buffer, "K_EGGNx");
+	for (i = 0; i < 4; i++)
+	{
+		buffer[6] = '0'+i;
+		kp_eggnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	// First person mode
+	kp_fpview[0] = (patch_t *)W_CachePatchName("VIEWA0", PU_HUDGFX);
+	kp_fpview[1] = (patch_t *)W_CachePatchName("VIEWB0D0", PU_HUDGFX);
+	kp_fpview[2] = (patch_t *)W_CachePatchName("VIEWC0E0", PU_HUDGFX);
+
+	// Input UI Wheel
+	sprintf(buffer, "K_WHEELx");
+	for (i = 0; i < 5; i++)
+	{
+		buffer[7] = '0'+i;
+		kp_inputwheel[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	// HERE COMES A NEW CHALLENGER
+	sprintf(buffer, "K_CHALxx");
+	for (i = 0; i < 25; i++)
+	{
+		buffer[6] = '0'+((i+1)/10);
+		buffer[7] = '0'+((i+1)%10);
+		kp_challenger[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	// Lap start animation
+	sprintf(buffer, "K_LAP0x");
+	for (i = 0; i < 7; i++)
+	{
+		buffer[6] = '0'+(i+1);
+		kp_lapanim_lap[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	sprintf(buffer, "K_LAPFxx");
+	for (i = 0; i < 11; i++)
+	{
+		buffer[6] = '0'+((i+1)/10);
+		buffer[7] = '0'+((i+1)%10);
+		kp_lapanim_final[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	sprintf(buffer, "K_LAPNxx");
+	for (i = 0; i < 10; i++)
+	{
+		buffer[6] = '0'+i;
+		for (j = 0; j < 3; j++)
+		{
+			buffer[7] = '0'+(j+1);
+			kp_lapanim_number[i][j] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+		}
+	}
+
+	sprintf(buffer, "K_LAPE0x");
+	for (i = 0; i < 2; i++)
+	{
+		buffer[7] = '0'+(i+1);
+		kp_lapanim_emblem[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	sprintf(buffer, "K_LAPH0x");
+	for (i = 0; i < 3; i++)
+	{
+		buffer[7] = '0'+(i+1);
+		kp_lapanim_hand[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
+	}
+
+	kp_yougotem = (patch_t *)W_CachePatchName("YOUGOTEM", PU_HUDGFX);
+
+	if (found_extra_kart || found_extra2_kart || found_extra3_kart)
+		K_LoadSaturnHUDGraphics();
+}
+
+// For the item toggle menu
+const char *K_GetItemPatch(UINT8 item, boolean tiny)
+{
+	switch (item)
+	{
+		case KITEM_SNEAKER:
+		case KRITEM_TRIPLESNEAKER:
+			return (tiny ? "K_ISSHOE" : "K_ITSHOE");
+		case KITEM_ROCKETSNEAKER:
+			return (tiny ? "K_ISRSHE" : "K_ITRSHE");
+		case KITEM_INVINCIBILITY:
+			return (tiny ? "K_ISINV1" : "K_ITINV1");
+		case KITEM_BANANA:
+		case KRITEM_TRIPLEBANANA:
+		case KRITEM_TENFOLDBANANA:
+			return (tiny ? "K_ISBANA" : "K_ITBANA");
+		case KITEM_EGGMAN:
+			return (tiny ? "K_ISEGGM" : "K_ITEGGM");
+		case KITEM_ORBINAUT:
+			return (tiny ? "K_ISORBN" : "K_ITORB1");
+		case KITEM_JAWZ:
+		case KRITEM_DUALJAWZ:
+			return (tiny ? "K_ISJAWZ" : "K_ITJAWZ");
+		case KITEM_MINE:
+			return (tiny ? "K_ISMINE" : "K_ITMINE");
+		case KITEM_BALLHOG:
+			return (tiny ? "K_ISBHOG" : "K_ITBHOG");
+		case KITEM_SPB:
+			return (tiny ? "K_ISSPB" : "K_ITSPB");
+		case KITEM_GROW:
+			return (tiny ? "K_ISGROW" : "K_ITGROW");
+		case KITEM_SHRINK:
+			return (tiny ? "K_ISSHRK" : "K_ITSHRK");
+		case KITEM_THUNDERSHIELD:
+			return (tiny ? "K_ISTHNS" : "K_ITTHNS");
+		case KITEM_HYUDORO:
+			return (tiny ? "K_ISHYUD" : "K_ITHYUD");
+		case KITEM_POGOSPRING:
+			return (tiny ? "K_ISPOGO" : "K_ITPOGO");
+		case KITEM_KITCHENSINK:
+			return (tiny ? "K_ISSINK" : "K_ITSINK");
+		case KRITEM_TRIPLEORBINAUT:
+			return (tiny ? "K_ISORBN" : "K_ITORB3");
+		case KRITEM_QUADORBINAUT:
+			return (tiny ? "K_ISORBN" : "K_ITORB4");
+		default:
+			return (tiny ? "K_ISSAD" : "K_ITSAD");
+	}
+}
+
+//}
+
+INT32 ITEM_X, ITEM_Y;	// Item Window
+INT32 TIME_X, TIME_Y;	// Time Sticker
+INT32 LAPS_X, LAPS_Y;	// Lap Sticker
+INT32 SPDM_X, SPDM_Y;	// Speedometer
+INT32 POSI_X, POSI_Y;	// Position Number
+INT32 FACE_X, FACE_Y;	// Top-four Faces
+INT32 STCD_X, STCD_Y;	// Starting countdown
+INT32 CHEK_Y;			// CHECK graphic
+INT32 MINI_X, MINI_Y;	// Minimap
+INT32 WANT_X, WANT_Y;	// Battle WANTED poster
+
+// This is for the P2 and P4 side of splitscreen. Then we'll flip P1's and P2's to the bottom with V_SPLITSCREEN.
+INT32 ITEM2_X, ITEM2_Y;
+INT32 LAPS2_X, LAPS2_Y;
+INT32 POSI2_X, POSI2_Y;
+
+static void K_initKartHUD(void)
+{
+	/*
+		BASEVIDWIDTH  = 320
+		BASEVIDHEIGHT = 200
+
+		Item window graphic is 41 x 33
+
+		Time Sticker graphic is 116 x 11
+		Time Font is a solid block of (8 x [12) x 14], equal to 96 x 14
+		Therefore, timestamp is 116 x 14 altogether
+
+		Lap Sticker is 80 x 11
+		Lap flag is 22 x 20
+		Lap Font is a solid block of (3 x [12) x 14], equal to 36 x 14
+		Therefore, lapstamp is 80 x 20 altogether
+
+		Position numbers are 43 x 53
+
+		Faces are 32 x 32
+		Faces draw downscaled at 16 x 16
+		Therefore, the allocated space for them is 16 x 67 altogether
+
+		----
+
+		ORIGINAL CZ64 SPLITSCREEN:
+
+		Item window:
+		if (!splitscreen) 	{ ICONX = 139; 				ICONY = 20; }
+		else 				{ ICONX = BASEVIDWIDTH-315; ICONY = 60; }
+
+		Time: 			   236, STRINGY(			   12)
+		Lap:  BASEVIDWIDTH-304, STRINGY(BASEVIDHEIGHT-189)
+
+	*/
+
+	// Single Screen (defaults)
+	// Item Window
+	ITEM_X = 5 + cv_item_xoffset.value;						//   5
+	ITEM_Y = 5 + cv_item_yoffset.value;						//   5
+	// Level Timer
+	TIME_X = BASEVIDWIDTH - 148 + cv_time_xoffset.value;	// 172
+	TIME_Y = 9 + cv_time_yoffset.value;						//   9
+	// Level Laps
+	LAPS_X = 9 + cv_laps_xoffset.value;						//   9
+	LAPS_Y = BASEVIDHEIGHT - 29 + cv_laps_yoffset.value;	// 171
+	// Speedometer
+	SPDM_X = 9 + cv_speed_xoffset.value; 					//   9
+	SPDM_Y = BASEVIDHEIGHT - 45 + cv_speed_yoffset.value;	// 155
+	// Position Number
+	POSI_X = BASEVIDWIDTH  - 9 + cv_posi_xoffset.value;		// 268
+	POSI_Y = BASEVIDHEIGHT - 9 + cv_posi_yoffset.value;		// 138
+	// Top-Four Faces
+	FACE_X = 9 + cv_face_xoffset.value;						//   9
+	FACE_Y = 92 + cv_face_yoffset.value;					//  92
+	// Starting countdown
+	STCD_X = BASEVIDWIDTH/2 + cv_stcd_xoffset.value;		//   9
+	STCD_Y = BASEVIDHEIGHT/2 + cv_stcd_yoffset.value;		//  92
+	// CHECK graphic
+	CHEK_Y = BASEVIDHEIGHT + cv_chek_yoffset.value;			// 200
+	// Minimap
+	MINI_X = BASEVIDWIDTH - 50 + cv_mini_xoffset.value;		// 270
+	MINI_Y = (BASEVIDHEIGHT/2)-16 + cv_mini_yoffset.value;  //  84
+	// Battle WANTED poster
+	WANT_X = BASEVIDWIDTH - 55 + cv_want_xoffset.value;		// 270
+	WANT_Y = BASEVIDHEIGHT- 71 + cv_want_yoffset.value;		// 176
+
+	if (splitscreen)	// Splitscreen
+	{
+		ITEM_X = 5;
+		ITEM_Y = 3;
+
+		LAPS_Y = (BASEVIDHEIGHT/2)-24;
+
+		POSI_Y = (BASEVIDHEIGHT/2)- 2;
+
+		STCD_Y = BASEVIDHEIGHT/4;
+
+		MINI_Y = (BASEVIDHEIGHT/2);
+
+		if (splitscreen > 1)	// 3P/4P Small Splitscreen
+		{
+			// 1P (top left)
+			ITEM_X = -9;
+			ITEM_Y = -8;
+
+			LAPS_X = 3;
+			LAPS_Y = (BASEVIDHEIGHT/2)-13;
+
+			POSI_X = 24;
+			POSI_Y = (BASEVIDHEIGHT/2)- 16;
+
+			// 2P (top right)
+			ITEM2_X = BASEVIDWIDTH-39;
+			ITEM2_Y = -8;
+
+			LAPS2_X = BASEVIDWIDTH-3;
+			LAPS2_Y = (BASEVIDHEIGHT/2)-13;
+
+			POSI2_X = BASEVIDWIDTH -4;
+			POSI2_Y = (BASEVIDHEIGHT/2)- 16;
+
+			// Reminder that 3P and 4P are just 1P and 2P splitscreen'd to the bottom.
+
+			STCD_X = BASEVIDWIDTH/4;
+
+			MINI_X = (3*BASEVIDWIDTH/4);
+			MINI_Y = (3*BASEVIDHEIGHT/4);
+
+			if (splitscreen > 2) // 4P-only
+			{
+				MINI_X = (BASEVIDWIDTH/2);
+				MINI_Y = (BASEVIDHEIGHT/2);
+			}
+		}
+	}
+
+	if (timeinmap > 113 || forceshowhud)
+		hudtrans = cv_translucenthud.value;
+	else if (timeinmap > 105)
+		hudtrans = ((((INT32)timeinmap) - 105)*cv_translucenthud.value)/(113-105);
+	else
+		hudtrans = 0;
+
+	// K_GetScreenCoords needs the right view* variables
+	R_SetViewContext(stplyrnum);
+	R_InterpolateView(rendertimefrac_unpaused, !cv_uncappedhud.value);
+}
+
+UINT8 K_GetHudColor(void)
+{
+	if (cv_colorizedhud.value && cv_colorizedhudcolor.value)
+		return cv_colorizedhudcolor.value;
+
+	return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value);
+}
+
+boolean K_UseColorHud(void)
+{
+	return (cv_colorizedhud.value && clr_hud);
+}
+
+enum
+{
+	SPEEDO_VANILLA,
+	SPEEDO_EXTRA,
+	SPEEDO_ACHII,
+	SPEEDO_DIAL,
+	SPEEDO_PMETER,
+	SPEEDO_PMETERSMOL,
+	SPEEDO_EXTRA3,
+};
+
+static SINT8 K_GetSpeedometerStyle(void)
+{
+	if (cv_newspeedometer.value == 2 && xtra_speedo)
+		return SPEEDO_EXTRA;
+	else if (cv_newspeedometer.value == 3 && achi_speedo)
+		return SPEEDO_ACHII;
+	else if (cv_newspeedometer.value == 4 && dial_speedo)
+		return SPEEDO_DIAL;
+	else if (cv_newspeedometer.value == 5 && kartz_speedo)
+		return SPEEDO_PMETER;
+	else if (cv_newspeedometer.value == 6 && kartz_speedo_smol)
+		return SPEEDO_PMETERSMOL;
+	else if (cv_newspeedometer.value == 7 && xtra_speedo3)
+		return SPEEDO_EXTRA3;
+	else
+		return SPEEDO_VANILLA;
+}
+
+static boolean K_UseColorSpeedo(int speedostyle)
+{
+	if (!K_UseColorHud())
+		return false;
+
+	switch (speedostyle)
+	{
+		case SPEEDO_EXTRA:
+			return xtra_speedo_clr;
+		case SPEEDO_ACHII:
+			return achi_speedo_clr;
+		case SPEEDO_DIAL:
+			return dial_speedo_clr;
+		case SPEEDO_EXTRA3:
+			return xtra_speedo_clr3;
+		default:
+			return false;
+	}
+}
+
+static boolean K_IsHighResolution(void)
+{
+	return (vid.width >= 640 && vid.height >= 400);
+}
+
+boolean K_UseHighResPortraits(void)
+{
+	return (cv_highresportrait.value && K_IsHighResolution());
+}
+
+// returns the players faceprefix
+// accounts for localskins
+patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum)
+{
+	if (!player->skinlocal)
+		return (K_UseHighResPortraits() ? facewantprefix[skinnum] : facerankprefix[skinnum]);
+	else
+		return (K_UseHighResPortraits() ? localfacewantprefix[skinnum] : localfacerankprefix[skinnum]);
+}
+
+INT32 K_calcSplitFlags(INT32 snapflags)
+{
+	INT32 splitflags = 0;
+
+	if (splitscreen == 0)
+		return snapflags;
+
+	if (stplyrnum != 0)
+	{
+		if (splitscreen == 1 && stplyrnum == 1)
+		{
+			splitflags |= V_SPLITSCREEN;
+		}
+		else if (splitscreen > 1)
+		{
+			if (stplyrnum == 2 || (splitscreen == 3 && stplyrnum == 3))
+				splitflags |= V_SPLITSCREEN;
+			if (stplyrnum == 1 || (splitscreen == 3 && stplyrnum == 3))
+				splitflags |= V_HORZSCREEN;
+		}
+	}
+
+	if (splitflags & V_SPLITSCREEN)
+		snapflags &= ~V_SNAPTOTOP;
+	else
+		snapflags &= ~V_SNAPTOBOTTOM;
+
+	if (splitscreen > 1)
+	{
+		if (splitflags & V_HORZSCREEN)
+			snapflags &= ~V_SNAPTOLEFT;
+		else
+			snapflags &= ~V_SNAPTORIGHT;
+	}
+
+	return (splitflags|snapflags);
+}
+
+void K_getItemBoxDrawinfo(drawinfo_t *out)
+{
+	INT32 fx, fy, fflags;
+
+	// pain and suffering defined below
+	if (splitscreen < 2) // don't change shit for THIS splitscreen.
+	{
+		fx = ITEM_X;
+		fy = ITEM_Y;
+		fflags = K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOLEFT);
+	}
+	else // now we're having a fun game.
+	{
+		if (!(stplyrnum & 1)) // If we are P1 or P3...
+		{
+			fx = ITEM_X;
+			fy = ITEM_Y;
+			fflags = V_SNAPTOLEFT|(stplyrnum & 2 ? V_SPLITSCREEN : V_SNAPTOTOP); // flip P3 to the bottom.
+		}
+		else // else, that means we're P2 or P4.
+		{
+			fx = ITEM2_X;
+			fy = ITEM2_Y;
+			fflags = V_SNAPTORIGHT|(stplyrnum & 2 ? V_SPLITSCREEN : V_SNAPTOTOP); // flip P4 to the bottom
+		}
+	}
+
+	out->x = fx;
+	out->y = fy;
+	out->flags = fflags;
+}
+
+void K_getLapsDrawinfo(drawinfo_t *out)
+{
+	INT32 fx, fy, fflags;
+
+	// pain and suffering defined below
+	if (splitscreen < 2)	// don't change shit for THIS splitscreen.
+	{
+		fx = LAPS_X;
+		fy = LAPS_Y;
+		fflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+	}
+	else
+	{
+		if (!(stplyrnum & 1))	// If we are P1 or P3...
+		{
+			fx = LAPS_X;
+			fy = LAPS_Y;
+			fflags = V_SNAPTOLEFT|(stplyrnum & 2 ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P3 to the bottom.
+		}
+		else // else, that means we're P2 or P4.
+		{
+			fx = LAPS2_X;
+			fy = LAPS2_Y;
+			fflags = V_SNAPTORIGHT|(stplyrnum & 2 ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P4 to the bottom
+		}
+	}
+
+	out->x = fx;
+	out->y = fy;
+	out->flags = fflags;
+}
+
+void K_getMinimapDrawinfo(drawinfo_t *out)
+{
+	INT32 fx = MINI_X, fy = MINI_Y, fflags = (splitscreen == 3 ? 0 : V_SNAPTORIGHT);	// flags should only be 0 when it's centered (4p split)
+
+	out->x = fx;
+	out->y = fy;
+	out->flags = fflags;
+}
+
+INT32 K_getMinimapTrans(void)
+{
+	INT32 minimaptrans = cv_kartminimap.value;
+
+	if (!minimaptrans)
+		return -1;
+
+	if (forceshowhud)
+		return (10-minimaptrans)<<FF_TRANSSHIFT;
+
+	if (timeinmap <= 105)
+		return -1;
+
+	if (timeinmap <= 113)
+		minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105);
+
+	if (!minimaptrans)
+		return -1;
+
+	return (10-minimaptrans)<<FF_TRANSSHIFT;
+}
+
+patch_t *K_getItemBoxPatch(boolean small, boolean dark)
+{
+	UINT8 ofs = (cv_darkitembox.value && dark ? 1 : 0) + (small ? 2 : 0);
+	return (cv_colorizeditembox.value && K_UseColorHud()) ? kp_itembgclr[ofs] : kp_itembg[ofs];
+}
+
+patch_t *K_getItemMulPatch(boolean small)
+{
+	UINT8 ofs = small ? 1 : 0;
+	return K_UseColorHud() ? kp_itemmulstickerclr[ofs] : kp_itemmulsticker[ofs];
+}
+
+static void K_drawKartStats(void)
+{
+	INT32 x, y, spdxoffset, spdoffset, flags;
+
+	// For 1-player display
+	x = 15;
+	y = 150;
+	spdxoffset = 0;
+	spdoffset = 0;
+
+	flags = V_SNAPTOBOTTOM|V_SNAPTOLEFT;
+
+	if (!LUA_HudEnabled(hud_statdisplay))
+		return;
+
+	//Internal offset for speedometer
+
+	const UINT8 speedostyle = K_GetSpeedometerStyle();
+
+	if (cv_kartspeedometer.value && (!splitscreen))
+	{
+		if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII) || (speedostyle == SPEEDO_EXTRA3))
+			spdoffset = -10;
+		else if (speedostyle == SPEEDO_DIAL)
+		{
+			spdxoffset = 11;
+			spdoffset = 14;
+		}
+		else
+			spdoffset = -14;
+	}
+	else
+		spdoffset = 0;
+
+	if ((speedostyle != SPEEDO_DIAL) || (splitscreen))
+		spdoffset += (G_BattleGametype() ? (stplyr->kartstuff[k_bumper] ? -5 : -8) : 0);
+
+	// Customizations c:
+	if (!splitscreen)
+	{
+		x += 18 + cv_stat_xoffset.value + spdxoffset;
+		y += cv_stat_yoffset.value + spdoffset;
+	}
+	else if (splitscreen == 1)	// I tried my best, but this is still mess :/ < :Blobcatpats: c:
+	{
+		x -= 10;
+		y -= 40;
+		y += spdoffset;
+
+		// If we are in 2-player splitscreen, for player 1 we move hud to up and remove snapping
+		// to bottom
+		if (stplyrnum == 0)
+		{
+			y /= 2;
+			flags = V_SNAPTOLEFT;
+		}
+		else
+		{
+			// Can move it down a bit
+			y += 45;
+		}
+	}
+	else
+	{
+		if (stplyrnum == 0 || stplyrnum == 2) // If we are P1 or P3...
+		{
+			// ye i just align it to position number lol
+			x = POSI_X + 19;
+			y = POSI_Y - 6;
+			flags = V_SNAPTOLEFT|((stplyrnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P3 to the bottom.
+		}
+		else // else, that means we're P2 or P4.
+		{
+			x = POSI2_X - 75;
+			y = POSI2_Y - 6;
+			flags = V_SNAPTORIGHT|((stplyrnum == 3) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P4 to the bottom
+		}
+	}
+
+	flags |= V_HUDTRANS;
+
+	if (!splitscreen)
+	{
+		skin_t *fakeskin;
+		fakeskin = K_GetPlayerSkin(stplyr);
+
+		// Skin name
+		if (K_IsHighResolution()) // V_DrawSmallString becomes a mess at low resolutions lel
+		{
+			V_DrawSmallString(x+20, y+12, flags|V_ALLOWLOWERCASE|V_SkinColorToHighlightcolor(stplyr->skincolor), fakeskin->realname);
+		}
+		else
+		{
+			V_DrawThinString(x+20, y+7, flags|V_ALLOWLOWERCASE|V_SkinColorToHighlightcolor(stplyr->skincolor), fakeskin->realname);
+		}
+
+		// Icon and stats
+		if (K_UseHighResPortraits())
+			V_DrawSmallMappedPatch(x, y, flags, R_GetSkinFaceWant(stplyr), R_GetLocalTranslationColormap(fakeskin, fakeskin, stplyr->skincolor, GTC_CACHE, stplyr->skinlocal));
+		else
+			V_DrawMappedPatch(x, y, flags, R_GetSkinFaceRank(stplyr), R_GetLocalTranslationColormap(fakeskin, fakeskin, stplyr->skincolor, GTC_CACHE, stplyr->skinlocal));
+
+		V_DrawMappedPatch(x-3, y-2, flags, kp_facenum[min(9, max(1, stplyr->kartspeed))], R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_BLUEBERRY, GTC_CACHE));
+		V_DrawMappedPatch(x+10, y+10, flags, kp_facenum[min(9, max(1, stplyr->kartweight))], R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_BURGUNDY, GTC_CACHE));
+	}
+	else
+	{
+		// In splitscreen, just draw a string with stats
+		V_DrawString(x, y+10, flags, va("\x84%dS \x87%dW", stplyr->kartspeed, stplyr->kartweight));
+	}
+}
+
+static void K_drawKartItem(void)
+{
+	// ITEM_X = BASEVIDWIDTH-50;	// 270
+	// ITEM_Y = 24;					//  24
+
+	// Why write V_DrawScaledPatch calls over and over when they're all the same?
+	// Set to 'no item' just in case.
+	const UINT8 offset = ((splitscreen > 1) ? 1 : 0);
+	patch_t *localpatch = kp_nodraw;
+	patch_t *localbg;
+	boolean dark = false;
+
+	patch_t *localinv = ((offset) ? kp_invincibility[((leveltime % (6*3)) / 3) + 7] : kp_invincibility[(leveltime % (7*3)) / 3]);
+	INT32 fx = 0, fy = 0, fflags = 0;	// final coords for hud and flags...
+	INT32 numberdisplaymin = cv_huditemamount.value == 2 ? 1 : 2; // No longer a constant so other things can modify this value
+	INT32 itembar = 0;
+	INT32 maxl = 0; // itembar's normal highest value
+	const INT32 barlength = (splitscreen > 1 ? 12 : 26);
+	UINT8 localcolor = SKINCOLOR_NONE;
+	SINT8 colormode = TC_RAINBOW;
+	UINT8 *colmap = NULL;
+	UINT8 *colormap = NULL;
+
+	if (stplyr->kartstuff[k_itemroulette])
+	{
+		localcolor = K_GetHudColor();
+
+		switch((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3)
+		{
+			// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
+			case 0: // Sneaker
+				localpatch = kp_sneaker[offset];
+				//localcolor = SKINCOLOR_RASPBERRY;
+				break;
+			case 1: // Banana
+				localpatch = kp_banana[offset];
+				//localcolor = SKINCOLOR_YELLOW;
+				break;
+			case 2: // Orbinaut
+				localpatch = kp_orbinaut[3+offset];
+				//localcolor = SKINCOLOR_STEEL;
+				break;
+			case 3: // Mine
+				localpatch = kp_mine[offset];
+				//localcolor = SKINCOLOR_JET;
+				break;
+			case 4: // Grow
+				localpatch = kp_grow[offset];
+				//localcolor = SKINCOLOR_TEAL;
+				break;
+			case 5: // Hyudoro
+				localpatch = kp_hyudoro[offset];
+				//localcolor = SKINCOLOR_STEEL;
+				break;
+			case 6: // Rocket Sneaker
+				localpatch = kp_rocketsneaker[offset];
+				//localcolor = SKINCOLOR_TANGERINE;
+				break;
+			case 7: // Jawz
+				localpatch = kp_jawz[offset];
+				//localcolor = SKINCOLOR_JAWZ;
+				break;
+			case 8: // Self-Propelled Bomb
+				localpatch = kp_selfpropelledbomb[offset];
+				//localcolor = SKINCOLOR_JET;
+				break;
+			case 9: // Shrink
+				localpatch = kp_shrink[offset];
+				//localcolor = SKINCOLOR_ORANGE;
+				break;
+			case 10: // Invincibility
+				localpatch = localinv;
+				//localcolor = SKINCOLOR_GREY;
+				break;
+			case 11: // Eggman Monitor
+				localpatch = kp_eggman[offset];
+				//localcolor = SKINCOLOR_ROSE;
+				break;
+			case 12: // Ballhog
+				localpatch = kp_ballhog[offset];
+				//localcolor = SKINCOLOR_LILAC;
+				break;
+			case 13: // Thunder Shield
+				localpatch = kp_thundershield[offset];
+				//localcolor = SKINCOLOR_CYAN;
+				break;
+			/*case 14: // Pogo Spring
+				localpatch = kp_pogospring[offset];
+				localcolor = SKINCOLOR_TANGERINE;
+				break;
+			case 15: // Kitchen Sink
+				localpatch = kp_kitchensink[offset];
+				localcolor = SKINCOLOR_STEEL;
+				break;*/
+			default:
+				break;
+		}
+	}
+	else
+	{
+		// I'm doing this a little weird and drawing mostly in reverse order
+		// The only actual reason is to make sneakers line up this way in the code below
+		// This shouldn't have any actual baring over how it functions
+		// Hyudoro is first, because we're drawing it on top of the player's current item
+		if (stplyr->kartstuff[k_stolentimer] > 0)
+		{
+			if (leveltime & 2)
+				localpatch = kp_hyudoro[offset];
+			else
+				localpatch = kp_nodraw;
+		}
+		else if ((stplyr->kartstuff[k_stealingtimer] > 0) && (leveltime & 2))
+		{
+			localpatch = kp_hyudoro[offset];
+		}
+		else if (stplyr->kartstuff[k_eggmanexplode] > 1)
+		{
+			if (leveltime & 1)
+				localpatch = kp_eggman[offset];
+			else
+				localpatch = kp_nodraw;
+		}
+		else if (stplyr->kartstuff[k_rocketsneakertimer] > 1)
+		{
+			itembar = stplyr->kartstuff[k_rocketsneakertimer];
+			maxl = (itemtime*3) - barlength;
+
+			if (leveltime & 1)
+				localpatch = kp_rocketsneaker[offset];
+			else
+				localpatch = kp_nodraw;
+		}
+		else if (stplyr->kartstuff[k_growshrinktimer] > 0)
+		{
+			if (stplyr->kartstuff[k_growcancel] > 0)
+			{
+				itembar = stplyr->kartstuff[k_growcancel];
+				maxl = 26;
+			}
+
+			if (leveltime & 1)
+				localpatch = kp_grow[offset];
+			else
+				localpatch = kp_nodraw;
+		}
+		else if (stplyr->kartstuff[k_sadtimer] > 0)
+		{
+			if (leveltime & 2)
+				localpatch = kp_sadface[offset];
+			else
+				localpatch = kp_nodraw;
+		}
+		else
+		{
+			if (stplyr->kartstuff[k_itemamount] <= 0)
+				return;
+
+			const boolean usemultiicon = (multiitem_icon && cv_multiitemicon.value && !offset);
+
+			switch (stplyr->kartstuff[k_itemtype])
+			{
+				case KITEM_SNEAKER:
+					if (usemultiicon)
+					{
+						if (!cv_huditemamount.value)
+							numberdisplaymin = 4;
+						switch(stplyr->kartstuff[k_itemamount])
+						{
+							case 1:
+								localpatch = kp_sneaker[offset];
+								break;
+							case 2:
+								localpatch = kp_multsneaker[0];
+								break;
+							default:
+								localpatch = kp_multsneaker[1];
+								break;
+						}
+					}
+					else
+					{
+						localpatch = kp_sneaker[offset];
+					}
+					break;
+				case KITEM_ROCKETSNEAKER:
+					localpatch = kp_rocketsneaker[offset];
+					break;
+				case KITEM_INVINCIBILITY:
+					localpatch = localinv;
+					dark = true;
+					break;
+				case KITEM_BANANA:
+					if (usemultiicon)
+					{
+						if (!cv_huditemamount.value)
+							numberdisplaymin = 4;
+						switch(stplyr->kartstuff[k_itemamount])
+						{
+							case 1:
+								localpatch = kp_banana[offset];
+								break;
+							case 2:
+								localpatch = kp_multbanana[0];
+								break;
+							case 3:
+								localpatch = kp_multbanana[1];
+								break;
+							default:
+								localpatch = kp_multbanana[2];
+								break;
+						}
+					}
+					else
+					{
+						localpatch = kp_banana[offset];
+					}
+					break;
+				case KITEM_EGGMAN:
+					localpatch = kp_eggman[offset];
+					break;
+				case KITEM_ORBINAUT:
+					if (!cv_huditemamount.value)
+						numberdisplaymin = offset ? 2 : 5;
+					localpatch = kp_orbinaut[(offset ? 4 : min(stplyr->kartstuff[k_itemamount]-1, 3))];
+					break;
+				case KITEM_JAWZ:
+					if (usemultiicon)
+					{
+						if (!cv_huditemamount.value)
+							numberdisplaymin = 3;
+						localpatch = ((stplyr->kartstuff[k_itemamount] == 1) ? kp_jawz[offset] : kp_multjawz);
+					}
+					else
+					{
+						localpatch = kp_jawz[offset];
+					}
+					break;
+				case KITEM_MINE:
+					localpatch = kp_mine[offset];
+					break;
+				case KITEM_BALLHOG:
+					localpatch = kp_ballhog[offset];
+					break;
+				case KITEM_SPB:
+					localpatch = kp_selfpropelledbomb[offset];
+					dark = true;
+					break;
+				case KITEM_GROW:
+					localpatch = kp_grow[offset];
+					break;
+				case KITEM_SHRINK:
+					localpatch = kp_shrink[offset];
+					break;
+				case KITEM_THUNDERSHIELD:
+					localpatch = kp_thundershield[offset];
+					dark = true;
+					break;
+				case KITEM_HYUDORO:
+					localpatch = kp_hyudoro[offset];
+					break;
+				case KITEM_POGOSPRING:
+					localpatch = kp_pogospring[offset];
+					break;
+				case KITEM_KITCHENSINK:
+					localpatch = kp_kitchensink[offset];
+					break;
+				case KITEM_SAD:
+					localpatch = kp_sadface[offset];
+					break;
+				default:
+					return;
+			}
+
+			if (stplyr->kartstuff[k_itemheld] && !(leveltime & 1))
+				localpatch = kp_nodraw;
+		}
+
+		if (stplyr->kartstuff[k_itemblink] && (leveltime & 1))
+		{
+			colormode = TC_BLINK;
+
+			switch (stplyr->kartstuff[k_itemblinkmode])
+			{
+				case 2:
+					localcolor = K_RainbowColor();
+					break;
+				case 1:
+					localcolor = SKINCOLOR_RED;
+					break;
+				default:
+					localcolor = SKINCOLOR_WHITE;
+					break;
+			}
+		}
+	}
+
+	localbg = K_getItemBoxPatch((boolean)offset, dark);
+	drawinfo_t info;
+	K_getItemBoxDrawinfo(&info);
+	fx = info.x;
+	fy = info.y;
+	fflags = info.flags;
+
+	boolean flipamount = splitscreen > 1 && stplyrnum & 1;	// Used for 3P/4P splitscreen to flip item amount stuff
+
+	if (K_UseColorHud())
+		colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+
+	V_DrawMappedPatch(fx, fy, V_HUDTRANS|fflags, localbg, cv_colorizeditembox.value ? colormap : NULL);
+
+	fixed_t rfy = fy<<FRACBITS;
+	INT32 fancyflags = V_HUDTRANS|fflags;
+
+	if (cv_fancyroulette.value && stplyr->kartstuff[k_itemroulette] && !stplyr->deadtimer)
+	{
+		fixed_t frac = R_GetHudUncap();
+		UINT8   fancystep = (offset ? 6 : 10);
+		fixed_t fancyoffset = (stplyr->kartstuff[k_itemroulette] % 3)-1;
+
+		if (fancyoffset != 0)
+		{
+			fancyflags &= ~V_HUDTRANS;
+			fancyflags |=V_HUDTRANSHALF;
+		}
+
+		rfy += (fancystep * fancyoffset * FRACUNIT) + FixedMul(fancystep*FRACUNIT, frac) - fancystep/2*FRACUNIT;
+	}
+
+	if (localcolor != SKINCOLOR_NONE)
+		colmap = R_GetTranslationColormap(colormode, localcolor, GTC_CACHE);
+
+	// Then, the numbers:
+	if (stplyr->kartstuff[k_itemamount] >= numberdisplaymin && !stplyr->kartstuff[k_itemroulette])
+	{
+		localbg = K_getItemMulPatch((boolean)offset);
+
+		V_DrawMappedPatch(fx + (flipamount ? 48 : 0), fy, V_HUDTRANS|fflags|(flipamount ? V_FLIP : 0), localbg, colormap); // flip this graphic for p2 and p4 in split and shift it.
+		V_DrawFixedPatch(fx<<FRACBITS, fy<<FRACBITS, FRACUNIT, V_HUDTRANS|fflags, localpatch, colmap);
+
+		if (offset)
+		{
+			const INT32 xofs = flipamount ? 2 : 24; // reminder that this is for 3/4p's right end of the screen.
+			V_DrawString(fx+xofs, fy+31, V_ALLOWLOWERCASE|V_HUDTRANS|fflags, va("x%d", stplyr->kartstuff[k_itemamount]));
+		}
+		else
+		{
+			V_DrawScaledPatch(fx+28, fy+41, V_HUDTRANS|fflags, kp_itemx);
+			V_DrawKartString(fx+38, fy+36, V_HUDTRANS|fflags, va("%d", stplyr->kartstuff[k_itemamount]));
+		}
+	}
+	else
+		V_DrawFixedPatch(fx<<FRACBITS, rfy, FRACUNIT, fancyflags, localpatch, colmap);
+
+	// Extensible meter, currently only used for rocket sneaker...
+	if (itembar && hudtrans)
+	{
+		const INT32 fill = ((itembar*barlength)/maxl);
+		const INT32 length = min(barlength, fill);
+		const INT32 height = (offset ? 1 : 2);
+		const INT32 x = (offset ? 17 : 11), y = (offset ? 27 : 35);
+
+		V_DrawScaledPatch(fx+x, fy+y, V_HUDTRANS|fflags, kp_itemtimer[offset]);
+		// The left dark "AA" edge
+		V_DrawFill(fx+x+1, fy+y+1, (length == 2 ? 2 : 1), height, 12|fflags);
+		// The bar itself
+		if (length > 2)
+		{
+			V_DrawFill(fx+x+length, fy+y+1, 1, height, 12|fflags); // the right one
+			if (height == 2)
+				V_DrawFill(fx+x+2, fy+y+2, length-2, 1, 8|fflags); // the dulled underside
+			V_DrawFill(fx+x+2, fy+y+1, length-2, 1, 120|fflags); // the shine
+		}
+	}
+
+	// Quick Eggman numbers
+	if (stplyr->kartstuff[k_eggmanexplode] > 1 /*&& stplyr->kartstuff[k_eggmanexplode] <= 3*TICRATE*/)
+		V_DrawScaledPatch(fx+17, fy+13-offset, V_HUDTRANS|fflags, kp_eggnum[min(3, G_TicsToSeconds(stplyr->kartstuff[k_eggmanexplode]))]);
+}
+
+void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UINT8 mode)
+{
+	// TIME_X = BASEVIDWIDTH-124;	// 196
+	// TIME_Y = 6;					//   6
+
+	INT32 splitflags = 0;
+
+	if (!mode)
+	{
+		splitflags = V_HUDTRANS|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTORIGHT);
+
+		if (cv_timelimit.value && timelimitintics > 0)
+		{
+			if (drawtime >= timelimitintics)
+				drawtime = 0;
+			else
+				drawtime = timelimitintics - drawtime;
+		}
+	}
+
+	if (K_UseColorHud()) // Colourized hud
+	{
+		UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+		V_DrawMappedPatch(TX, TY, splitflags, ((mode == 2) ? kp_lapstickerwideclr : kp_timestickerwideclr), colormap);
+	}
+	else
+		V_DrawScaledPatch(TX, TY, splitflags, ((mode == 2) ? kp_lapstickerwide : kp_timestickerwide));
+
+	TX += 33;
+
+	if (drawtime == UINT32_MAX)
+		;
+	else if (mode && !drawtime)
+	{
+		V_DrawKartString(TX, TY+3, splitflags, va("--'--\"--"));
+	}
+	else
+	{
+		tic_t worktime = drawtime/(60*TICRATE);
+
+		if (cv_timelimit.value && cv_overtime.value && G_BattleGametype() && !players[consoleplayer].exiting && (leveltime > (timelimitintics + starttime + TICRATE/2))) // i hate this so much
+		{
+			V_DrawKartString(TX, TY+3, splitflags, va("OVERTIME"));
+		}
+		else if (worktime < 100)
+		{
+			// minutes time      00 __ __
+			V_DrawKartString(TX,    TY+3, splitflags, va("%d", worktime/10));
+			V_DrawKartString(TX+12, TY+3, splitflags, va("%d", worktime%10));
+
+			// apostrophe location     _'__ __
+			V_DrawKartString(TX+24, TY+3, splitflags, va("'"));
+
+			worktime = (drawtime/TICRATE % 60);
+
+			// seconds time       _ 00 __
+			V_DrawKartString(TX+36, TY+3, splitflags, va("%d", worktime/10));
+			V_DrawKartString(TX+48, TY+3, splitflags, va("%d", worktime%10));
+
+			// quotation mark location    _ __"__
+			V_DrawKartString(TX+60, TY+3, splitflags, va("\""));
+
+			worktime = G_TicsToCentiseconds(drawtime);
+
+			// tics               _ __ 00
+			V_DrawKartString(TX+72, TY+3, splitflags, va("%d", worktime/10));
+			V_DrawKartString(TX+84, TY+3, splitflags, va("%d", worktime%10));
+		}
+		else if ((drawtime/TICRATE) & 1)
+			V_DrawKartString(TX, TY+3, splitflags, va("99'59\"99"));
+	}
+
+	if (emblemmap && (modeattacking || (mode == 1)) && !demo.playback) // emblem time!
+	{
+		INT32 workx = TX + 96, worky = TY+18;
+		SINT8 curemb = 0;
+		patch_t *emblempic[3] = {NULL, NULL, NULL};
+		UINT8 *emblemcol[3] = {NULL, NULL, NULL};
+
+		emblem_t *emblem = M_GetLevelEmblems(emblemmap);
+		while (emblem)
+		{
+			char targettext[9];
+
+			switch (emblem->type)
+			{
+				case ET_TIME:
+					{
+						static boolean canplaysound = true;
+						tic_t timetoreach = emblem->var;
+
+						if (emblem->collected)
+						{
+							emblempic[curemb] = W_CachePatchName(M_GetEmblemPatch(emblem), PU_PATCH);
+							emblemcol[curemb] = R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_CACHE);
+							if (++curemb == 3)
+								break;
+							goto bademblem;
+						}
+
+						snprintf(targettext, 9, "%i'%02i\"%02i",
+							G_TicsToMinutes(timetoreach, false),
+							G_TicsToSeconds(timetoreach),
+							G_TicsToCentiseconds(timetoreach));
+
+						if (!mode)
+						{
+							if (stplyr->realtime > timetoreach)
+							{
+								splitflags = (splitflags &~ V_HUDTRANS)|V_HUDTRANSHALF;
+								if (canplaysound)
+								{
+									S_StartSound(NULL, sfx_s3k72); //sfx_s26d); -- you STOLE fizzy lifting drinks
+									canplaysound = false;
+								}
+							}
+							else if (!canplaysound)
+								canplaysound = true;
+						}
+
+						targettext[8] = 0;
+					}
+					break;
+				default:
+					goto bademblem;
+			}
+
+			V_DrawRightAlignedString(workx, worky, splitflags, targettext);
+			workx -= 67;
+			V_DrawSmallScaledPatch(workx + 4, worky, splitflags, W_CachePatchName("NEEDIT", PU_PATCH));
+
+			break;
+
+			bademblem:
+			emblem = M_GetLevelEmblems(-1);
+		}
+
+		if (!mode)
+			splitflags = (splitflags &~ V_HUDTRANSHALF)|V_HUDTRANS;
+
+		while (curemb--)
+		{
+			workx -= 12;
+			V_DrawSmallMappedPatch(workx + 4, worky, splitflags, emblempic[curemb], emblemcol[curemb]);
+		}
+	}
+}
+
+#define POS_DELAY_TIME 10
+
+static void K_DrawKartPositionNum(INT32 num)
+{
+	// POSI_X = BASEVIDWIDTH - 51;	// 269
+	// POSI_Y = BASEVIDHEIGHT- 64;	// 136
+
+	const boolean wheeloffs = (cv_showinput.value && cv_posi_xoffset.value == 0 && cv_posi_yoffset.value == 0 && cv_wheel_xoffset.value == 0 && cv_wheel_yoffset.value == 0);
+	const boolean win = (stplyr->exiting && num == 1);
+	INT32 W = kp_positionnum[0][0]->width;
+	fixed_t scale = FRACUNIT;
+	patch_t *localpatch = kp_positionnum[0][0];
+	INT32 fx = 0, fy = 0, fflags = 0;
+	const INT32 xoffs = wheeloffs ? -48 : 0;
+	boolean flipdraw  = false; // flip the order we draw it in for MORE splitscreen bs. fun.
+	boolean flipvdraw = false; // used only for 2p splitscreen so overtaking doesn't make 1P's position fly off the screen.
+	boolean overtake  = false;
+
+	if ((cv_posanim.value && stplyr->kartstuff[k_positiondelay]) || stplyr->exiting)
+	{
+		if (cv_posanim.value == 2)
+		{
+			const UINT8 delay = (stplyr->exiting) ? POS_DELAY_TIME : stplyr->kartstuff[k_positiondelay];
+			const fixed_t add = (scale * 3) >> ((splitscreen == 1) ? 1 : 2);
+			scale = (scale + min((add * (delay * delay)) / (POS_DELAY_TIME * POS_DELAY_TIME), add));
+		}
+		else
+			scale *= 2;
+
+		overtake = true;	// this is used for splitscreen stuff in conjunction with flipdraw.
+	}
+
+	if (splitscreen || cv_smallposnum.value || wheeloffs)
+	{
+		scale /= 2;
+	}
+
+	W = FixedMul(W<<FRACBITS, scale)>>FRACBITS;
+
+	// pain and suffering defined below
+	if (!splitscreen)
+	{
+		fx = POSI_X + xoffs;
+		fy = BASEVIDHEIGHT - 8 + cv_posi_yoffset.value;
+		fflags = V_SNAPTOBOTTOM|V_SNAPTORIGHT;
+	}
+	else if (splitscreen == 1)	// for this splitscreen, we'll use case by case because it's a bit different.
+	{
+		fx = POSI_X;
+		if (stplyrnum == 0)	// for player 1: display this at the top right, above the minimap.
+		{
+			fy = 30 + cv_posi_yoffset.value;
+			fflags = V_SNAPTOTOP|V_SNAPTORIGHT;
+			if (overtake)
+				flipvdraw = true;	// make sure overtaking doesn't explode us
+		}
+		else	// if we're not p1, that means we're p2. display this at the bottom right, below the minimap.
+		{
+			fy = BASEVIDHEIGHT - 8 + cv_posi_yoffset.value;
+			fflags = V_SNAPTOBOTTOM|V_SNAPTORIGHT;
+		}
+	}
+	else
+	{
+		if (!(stplyrnum & 1)) // If we are P1 or P3...
+		{
+			fx = POSI_X;
+			fy = POSI_Y;
+			fflags = V_SNAPTOLEFT|((stplyrnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P3 to the bottom.
+			flipdraw = true;
+			if (num && num >= 10)
+				fx += W;	// this seems dumb, but we need to do this in order for positions above 10 going off screen.
+		}
+		else // else, that means we're P2 or P4.
+		{
+			fx = POSI2_X;
+			fy = POSI2_Y;
+			fflags = V_SNAPTORIGHT|((stplyrnum == 3) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0);	// flip P4 to the bottom
+		}
+	}
+
+	// Special case for 0
+	if (!num)
+	{
+		V_DrawFixedPatch(fx<<FRACBITS, fy<<FRACBITS, scale, V_HUDTRANSHALF|fflags, kp_positionnum[0][0], NULL);
+		return;
+	}
+
+	I_Assert(num >= 0); // This function does not draw negative numbers
+
+	// Draw the number
+	while (num)
+	{
+		if (win) // 1st place winner? You get rainbows!!
+		{
+			localpatch = kp_winnernum[(leveltime % (NUMWINFRAMES*3)) / 3];
+		}
+		else if (stplyr->laps+1 >= cv_numlaps.value || stplyr->exiting) // Check for the final lap, or won
+		{
+			// Alternate frame every three frames
+			switch (leveltime % 9)
+			{
+				case 1: case 2: case 3:
+					if (K_IsPlayerLosing(stplyr))
+						localpatch = kp_positionnum[num % 10][4];
+					else
+						localpatch = kp_positionnum[num % 10][1];
+					break;
+				case 4: case 5: case 6:
+					if (K_IsPlayerLosing(stplyr))
+						localpatch = kp_positionnum[num % 10][5];
+					else
+						localpatch = kp_positionnum[num % 10][2];
+					break;
+				case 7: case 8: case 9:
+					if (K_IsPlayerLosing(stplyr))
+						localpatch = kp_positionnum[num % 10][6];
+					else
+						localpatch = kp_positionnum[num % 10][3];
+					break;
+				default:
+					localpatch = kp_positionnum[num % 10][0];
+					break;
+			}
+		}
+		else
+		{
+			localpatch = kp_positionnum[num % 10][0];
+		}
+
+		V_DrawFixedPatch((fx<<FRACBITS) + ((overtake && flipdraw) ? (localpatch->width*scale/2) : 0), (fy<<FRACBITS) + ((overtake && flipvdraw) ? (localpatch->height*scale/2) : 0), scale, V_HUDTRANSHALF|fflags, localpatch, NULL);
+		// ^ if we overtake as p1 or p3 in splitscren, we shift it so that it doesn't go off screen.
+		// ^ if we overtake as p1 in 2p splits, shift vertically so that this doesn't happen either.
+
+		fx -= W;
+		num /= 10;
+	}
+}
+
+static boolean K_drawKartPositionFaces(void)
+{
+	// FACE_X = 15;				//  15
+	// FACE_Y = 72;				//  72
+
+	INT32 Y = FACE_Y+9; // +9 to offset where it's being drawn if there are more than one
+	INT32 i, j, ranklines, strank = -1;
+	boolean completed[MAXPLAYERS];
+	INT32 rankplayer[MAXPLAYERS];
+	INT32 bumperx, numplayersingame = 0;
+	UINT8 *colormap;
+
+	ranklines = 0;
+	memset(completed, 0, sizeof (completed));
+	memset(rankplayer, 0, sizeof (rankplayer));
+
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		rankplayer[i] = -1;
+
+		if (!playeringame[i] || players[i].spectator || !players[i].mo)
+			continue;
+
+		numplayersingame++;
+	}
+
+	if (numplayersingame <= 1)
+		return true;
+
+	if (!LUA_HudEnabled(hud_minirankings))
+		return false;	// Don't proceed but still return true for free play above if HUD is disabled.
+
+	for (j = 0; j < numplayersingame; j++)
+	{
+		UINT8 lowestposition = MAXPLAYERS+1;
+		for (i = 0; i < MAXPLAYERS; i++)
+		{
+			if (completed[i] || !playeringame[i] || players[i].spectator || !players[i].mo)
+				continue;
+
+			if (players[i].kartstuff[k_position] >= lowestposition)
+				continue;
+
+			rankplayer[ranklines] = i;
+			lowestposition = players[i].kartstuff[k_position];
+		}
+
+		i = rankplayer[ranklines];
+
+		completed[i] = true;
+
+		if (players+i == stplyr)
+			strank = ranklines;
+
+		ranklines++;
+	}
+
+	if (ranklines < 5)
+		Y -= (9*ranklines);
+	else
+		Y -= (9*5);
+
+	if (G_BattleGametype() || strank <= 2) // too close to the top, or playing battle, or a spectator? would have had (strank == -1) called out, but already caught by (strank <= 2)
+	{
+		i = 0;
+		if (ranklines > 5) // could be both...
+			ranklines = 5;
+	}
+	else if (strank+3 > ranklines) // too close to the bottom?
+	{
+		i = ranklines - 5;
+		if (i < 0)
+			i = 0;
+	}
+	else
+	{
+		i = strank-2;
+		ranklines = strank+3;
+	}
+
+	for (; i < ranklines; i++)
+	{
+		player_t *player;
+		player = &players[rankplayer[i]];
+
+		if (!playeringame[rankplayer[i]])
+			continue;
+		if (player->spectator || !player->mo)
+			continue;
+
+		const UINT8 mocolor = player->mo->color;
+
+		bumperx = FACE_X+19;
+
+		if (mocolor)
+		{
+			if (player->mo->colorized)
+				colormap = R_GetTranslationColormap(TC_RAINBOW, mocolor, GTC_CACHE);
+			else
+				colormap = R_GetTranslationColormap(player->skin, mocolor, GTC_CACHE);
+
+			if (K_UseHighResPortraits())
+				V_DrawSmallMappedPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, R_GetSkinFaceWant(player), colormap);
+			else
+				V_DrawMappedPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, R_GetSkinFaceRank(player), colormap);
+
+			if (LUA_HudEnabled(hud_battlebumpers))
+			{
+				if (G_BattleGametype() && player->kartstuff[k_bumper] > 0)
+				{
+					V_DrawMappedPatch(bumperx-2, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_tinybumper[0], colormap);
+					for (j = 1; j < player->kartstuff[k_bumper]; j++)
+					{
+						bumperx += 5;
+						V_DrawMappedPatch(bumperx, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_tinybumper[1], colormap);
+					}
+				}
+			}	// A new level of stupidity: checking if lua is enabled to close a bracket. :Fascinating:
+		}
+
+		if (i == strank)
+			V_DrawScaledPatch(FACE_X, Y, V_HUDTRANS|V_SNAPTOLEFT, kp_facehighlight[(leveltime / 4) % 8]);
+
+		if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
+			V_DrawScaledPatch(FACE_X-4, Y-3, V_HUDTRANS|V_SNAPTOLEFT, kp_ranknobumpers);
+		else
+		{
+			INT32 pos = player->kartstuff[k_position];
+
+			if (pos < 0 || pos > MAXPLAYERS)
+				pos = 0;
+
+			// Draws the little number over the face
+			V_DrawScaledPatch(FACE_X-5, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_facenum[pos]);
+		}
+
+		Y += 18;
+	}
+
+	return false;
+}
+
+//
+// HU_DrawTabRankings -- moved here to take advantage of kart stuff!
+//
+void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol)
+{
+	INT32 i, rightoffset = 240;
+	const UINT8 *colormap;
+	const INT32 dupadjust = cv_betainterscreen.value ? 314 : (vid.width/vid.dupx), duptweak = cv_betainterscreen.value ? -3 : (dupadjust - BASEVIDWIDTH)/2;
+
+	boolean (*_isHighlightedPlayer)(const player_t *) = (demo.playback ? P_IsDisplayPlayer : P_IsLocalPlayer);
+
+	//this function is designed for 9 or less score lines only
+	//I_Assert(scorelines <= 9); -- not today bitch, kart fixed it up
+
+	V_DrawFill(1-duptweak, 26, dupadjust-2, 1, 0); // Draw a horizontal line because it looks nice!
+
+	if (scorelines > 8)
+	{
+		V_DrawFill(160, 26, 1, 147, 0); // Draw a vertical line to separate the two sides.
+		V_DrawFill(1-duptweak, 173, dupadjust-2, 1, 0); // And a horizontal line near the bottom.
+		rightoffset = (BASEVIDWIDTH/2) - 4 - x;
+	}
+
+	for (i = 0; i < scorelines; i++)
+	{
+		char strtime[MAXPLAYERNAME+1];
+		const UINT8 pnum = tab[i].num;
+		player_t *player = &players[pnum];
+
+		if (player->spectator || !player->mo)
+			continue; //ignore them.
+
+		const boolean whiteplayer = _isHighlightedPlayer(player);
+		const INT32 philicol = (whiteplayer ? V_SkinColorToHighlightcolor(player->skincolor) : 0);
+
+		if ((netgame && pnum != serverplayer) || (cv_mindelay.value && P_IsLocalPlayer(player)))
+		{
+			HU_drawPlayerPing(x + ((i < 8) ? -17 : rightoffset + 11), y-4, pnum, 0);
+		}
+
+		STRBUFCPY(strtime, tab[i].name);
+
+		if (scorelines > 8)
+			V_DrawThinString(x + 20, y, philicol|V_ALLOWLOWERCASE|V_6WIDTHSPACE, strtime);
+		else
+			V_DrawString(x + 20, y, philicol|V_ALLOWLOWERCASE, strtime);
+
+		if (player->mo->color)
+		{
+			if (player->mo->colorized)
+				colormap = R_GetTranslationColormap(TC_RAINBOW, player->mo->color, GTC_CACHE);
+			else
+				colormap = R_GetTranslationColormap(player->skin, player->mo->color, GTC_CACHE);
+
+			if (K_UseHighResPortraits())
+				V_DrawSmallMappedPatch(x, y-4, 0, R_GetSkinFaceWant(player), colormap);
+			else
+				V_DrawMappedPatch(x, y-4, 0, R_GetSkinFaceRank(player), colormap);
+
+			/*if (G_BattleGametype() && player->kartstuff[k_bumper] > 0) -- not enough space for this
+			{
+				INT32 bumperx = x+19;
+				V_DrawMappedPatch(bumperx-2, y-4, 0, kp_tinybumper[0], colormap);
+				for (j = 1; j < player->kartstuff[k_bumper]; j++)
+				{
+					bumperx += 5;
+					V_DrawMappedPatch(bumperx, y-4, 0, kp_tinybumper[1], colormap);
+				}
+			}*/
+		}
+
+		if (whiteplayer)
+			V_DrawScaledPatch(x, y-4, 0, kp_facehighlight[(leveltime / 4) % 8]);
+
+		if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0)
+			V_DrawScaledPatch(x-4, y-7, 0, kp_ranknobumpers);
+		else
+		{
+			INT32 pos = player->kartstuff[k_position];
+			if (pos < 0 || pos > MAXPLAYERS)
+				pos = 0;
+			// Draws the little number over the face
+			V_DrawScaledPatch(x-5, y+6, 0, kp_facenum[pos]);
+		}
+
+		if (G_RaceGametype())
+		{
+#define timestring(time) va("%i'%02i\"%02i", G_TicsToMinutes(time, true), G_TicsToSeconds(time), G_TicsToCentiseconds(time))
+			if (scorelines > 8)
+			{
+				if (player->exiting)
+					V_DrawRightAlignedThinString(x+rightoffset, y-1, hilicol|V_6WIDTHSPACE, timestring(player->realtime));
+				else if (player->pflags & PF_TIMEOVER)
+					V_DrawRightAlignedThinString(x+rightoffset, y-1, V_6WIDTHSPACE, "NO CONTEST.");
+				else if (circuitmap)
+					V_DrawRightAlignedThinString(x+rightoffset, y-1, V_6WIDTHSPACE, va("Lap %d", tab[i].count));
+			}
+			else
+			{
+				if (player->exiting)
+					V_DrawRightAlignedString(x+rightoffset, y, hilicol, timestring(player->realtime));
+				else if (player->pflags & PF_TIMEOVER)
+					V_DrawRightAlignedThinString(x+rightoffset, y-1, 0, "NO CONTEST.");
+				else if (circuitmap)
+					V_DrawRightAlignedString(x+rightoffset, y, 0, va("Lap %d", tab[i].count));
+			}
+#undef timestring
+		}
+		else
+			V_DrawRightAlignedString(x+rightoffset, y, 0, va("%u", tab[i].count));
+
+		y += 18;
+		if (i == 7)
+		{
+			y = 33;
+			x = (BASEVIDWIDTH/2) + 4;
+		}
+	}
+}
+
+static boolean K_BigLap(void)
+{
+	return (cv_biglaps.value && (cv_numlaps.value > 9) && (K_UseColorHud() ? big_lap_color : big_lap) && (!stplyr->exiting));
+}
+
+static void K_drawKartLaps(void)
+{
+	const INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+	INT32 fx = 0, fy = 0, fflags = 0;	// stuff for 3p / 4p splitscreen.
+	const boolean flipstring = splitscreen > 1 && stplyrnum & 1;  // used for 3p or 4p
+	INT32 stringw = 0;	// used with the above
+	const char *laps;
+
+	drawinfo_t info;
+	K_getLapsDrawinfo(&info);
+	fx = info.x;
+	fy = info.y;
+	fflags = info.flags;
+
+	laps = (stplyr->exiting ? "FIN" : va("%d/%d", stplyr->laps+1, cv_numlaps.value));
+
+	// draw stuff as god intended.
+	if (splitscreen > 1)
+	{
+		if (flipstring)
+		{
+			stringw = V_StringWidth(laps, 0);
+
+			V_DrawScaledPatch(fx-stringw-13, fy, V_HUDTRANS|fflags, kp_splitlapflag);
+			V_DrawRightAlignedString(fx, fy+1, V_HUDTRANS|fflags, laps);
+		}
+		else	// draw stuff NORMALLY.
+		{
+			V_DrawScaledPatch(fx, fy, V_HUDTRANS|fflags, kp_splitlapflag);
+			V_DrawString(fx+13, fy+1, V_HUDTRANS|fflags, laps);
+		}
+	}
+	else
+	{
+		if (K_UseColorHud()) // Colourized hud
+		{
+			UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+			patch_t *biglapclr = (K_BigLap() ? ((stplyr->laps + 1 > 9) ? kp_lapstickerbig2clr : kp_lapstickerbigclr) : kp_lapstickerclr);
+			V_DrawMappedPatch(fx, fy, V_HUDTRANS|splitflags, biglapclr, colormap);
+		}
+		else
+		{
+			patch_t *biglap = (K_BigLap() ? ((stplyr->laps + 1 > 9) ? kp_lapstickerbig2 : kp_lapstickerbig) : kp_lapsticker);
+			V_DrawScaledPatch(fx, fy, V_HUDTRANS|splitflags, biglap);
+		}
+
+		V_DrawKartString(fx+33, fy+3, V_HUDTRANS|splitflags, laps);
+	}
+}
+
+#ifdef ROTSPRITE
+
+#define DIALSPDDIV 97090 // 1.48148; converts 200 to 135
+#define MPHDIV 68283 // 1.04192; converts 141 to 135
+
+static void K_DrawDialNum(INT32 x, INT32 y, boolean colorized, INT32 flags, INT32 num, INT32 digits, const UINT8 *colormap)
+{
+	INT32 w;
+
+	if (colorized)
+		w = skp_dialnumclr[0]->width;
+	else
+		w = skp_dialnum[0]->width;
+
+	if (flags & V_NOSCALESTART)
+		w *= vid.dupx;
+
+	if (num < 0)
+		num = -num;
+
+	// draw the number
+	do
+	{
+		x -= (w);
+
+		if (colorized)
+			V_DrawFixedPatch(x << FRACBITS, y << FRACBITS, FRACUNIT, flags, skp_dialnumclr[num % 10], colormap);
+		else
+			V_DrawFixedPatch(x << FRACBITS, y << FRACBITS, FRACUNIT, flags, skp_dialnum[num % 10], colormap);
+
+		num /= 10;
+	} while (--digits);
+}
+
+static void K_DrawDialLaps(INT32 x, INT32 y, INT32 num, INT32 total, INT32 flags)
+{
+	INT32 fx;
+	fx = x + ((num < 10) ? 0 : 6);
+	V_DrawRankNum(fx, y, flags, num, (num < 10) ? 1 : 2, NULL);
+	V_DrawScaledPatch(fx + 2, y, flags, frameslash);
+	V_DrawRankNum(fx + 13 + ((total < 10) ? 0 : 6), y, flags, total, (total < 10) ? 1 : 2, NULL);
+}
+
+static void K_DrawDialSpeedometer(fixed_t speed,
+								  fixed_t divisor,
+								  INT32 splitflags,
+								  boolean battlemode,
+								  boolean infoactive,
+								  boolean colorized)
+{
+	const UINT8* colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+
+	INT32 rot = 0;
+	const UINT8 infoidx = (infoactive) ? 1 : 0;
+	patch_t* dialpatch;
+
+	const angle_t speedangle =
+		FixedAngle(((min(135 * FRACUNIT, FixedDiv(speed, divisor)) - (45 * FRACUNIT))));
+
+	rot = R_GetRollAngle(speedangle);
+
+	if (rot)
+	{
+		dialpatch = W_CachePatchNameRotated("K_DSDIAL", rot, PU_PATCH);
+	}
+	else
+	{
+		dialpatch = W_CachePatchName("K_DSDIAL", PU_PATCH);
+	}
+
+	if (colorized)  // Colourized hud
+	{
+		V_DrawMappedPatch(
+			SPDM_X, SPDM_Y - 9, (V_HUDTRANS | splitflags), skp_dialbaseclr[infoidx], colormap);
+		V_DrawMappedPatch(SPDM_X,
+						  SPDM_Y + 30,
+						  V_HUDTRANS | splitflags,
+						  skp_speedpatchesdialclr[cv_kartspeedometer.value],
+						  colormap);
+	}
+	else
+	{
+		V_DrawScaledPatch(SPDM_X, SPDM_Y - 9, (V_HUDTRANS | splitflags), skp_dialbase[infoidx]);
+		V_DrawScaledPatch(SPDM_X,
+						  SPDM_Y + 30,
+						  V_HUDTRANS | splitflags,
+						  skp_speedpatchesdial[cv_kartspeedometer.value]);
+	}
+
+	K_DrawDialNum(SPDM_X + 10,
+				  SPDM_Y + 25,
+				  colorized,
+				  V_HUDTRANS | splitflags,
+				  speed / FRACUNIT,
+				  3,
+				  colormap);
+
+	// gotta center the dial manually
+	V_DrawMappedPatch(SPDM_X - 19, SPDM_Y + 15, (V_HUDTRANS | splitflags), (dialpatch), colormap);
+
+	if (!infoactive)
+	{
+		// no need to draw info if we're not supposed to
+		return;
+	}
+
+	// draw the info
+	if (battlemode)
+	{
+		if (stplyr->kartstuff[k_bumper] <= 0)
+		{
+			V_DrawMappedPatch(
+				SPDM_X + 28, SPDM_Y + 27, V_HUDTRANS | splitflags, kp_splitkarmabomb, colormap);
+			K_DrawDialLaps(SPDM_X + 46,
+						   SPDM_Y + 29,
+						   stplyr->kartstuff[k_comebackpoints],
+						   2,
+						   V_HUDTRANS | splitflags);
+		}
+		else  // the above doesn't need to account for weird stuff since the max amount of karma
+			  // necessary is always 2 ^^^^
+		{
+			V_DrawMappedPatch(
+				SPDM_X + 28, SPDM_Y + 27, V_HUDTRANS | splitflags, kp_rankbumper, colormap);
+			K_DrawDialLaps(SPDM_X + 46,
+						   SPDM_Y + 29,
+						   stplyr->kartstuff[k_bumper],
+						   cv_kartbumpers.value,
+						   V_HUDTRANS | splitflags);
+		}
+	}
+	else
+	{
+		V_DrawScaledPatch(SPDM_X + 28, SPDM_Y + 27, V_HUDTRANS | splitflags, kp_splitlapflag);
+
+		if (stplyr->exiting)
+			V_DrawScaledPatch(SPDM_X + 39, SPDM_Y + 29, V_HUDTRANS | splitflags, skp_rankfinish);
+		else
+			K_DrawDialLaps(SPDM_X + 46,
+						   SPDM_Y + 29,
+						   stplyr->laps + 1,
+						   cv_numlaps.value,
+						   V_HUDTRANS | splitflags);
+	}
+}
+
+#endif
+
+static void K_drawKartSpeedometer(void)
+{
+	// why?
+	if (cv_kartspeedometer.value == 0)
+		return;
+
+	// index 0 is the raw value, index 1 is the converted value
+	fixed_t convSpeed[2] = {0,0};
+#ifdef ROTSPRITE
+	fixed_t dial_divisor = DIALSPDDIV;
+#endif
+
+	INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM|V_SNAPTOLEFT);
+
+	// man.
+	const UINT8 speedostyle = K_GetSpeedometerStyle();
+
+	switch (cv_kartspeedometer.value)
+	{
+		case 1:
+			convSpeed[0] = FixedDiv(FixedMul(stplyr->speed, 142371), mapobjectscale); // 2.172409058
+			convSpeed[1] = convSpeed[0] / FRACUNIT;
+			break;
+		case 2:
+			convSpeed[0] = FixedDiv(FixedMul(stplyr->speed, 88465), mapobjectscale); // 1.349868774
+			convSpeed[1] = convSpeed[0] / FRACUNIT;
+#ifdef ROTSPRITE
+			dial_divisor = MPHDIV;
+#endif
+			break;
+		case 3:
+			convSpeed[0] = FixedDiv(stplyr->speed, mapobjectscale);
+			convSpeed[1] = convSpeed[0] / FRACUNIT;
+#ifdef ROTSPRITE
+			dial_divisor = MPHDIV;
+#endif
+			break;
+		case 4:
+			if (stplyr->mo)
+			{
+				convSpeed[0] = (FixedDiv(stplyr->speed, FixedMul(K_GetKartSpeed(stplyr, false), ORIG_FRICTION))*100);
+				convSpeed[1] = convSpeed[0] >> FRACBITS;
+			}
+			break;
+		default:
+			break;
+	}
+
+	if (speedostyle == SPEEDO_VANILLA)
+	{
+		const char *metric = "";
+
+		switch (cv_kartspeedometer.value)
+		{
+			case 1:
+				metric = va("%3d km/h", convSpeed[1]);
+				break;
+			case 2:
+				metric = va("%3d mph", convSpeed[1]);
+				break;
+			case 3:
+				metric = va("%3d fu/t", convSpeed[1]);
+				break;
+			case 4:
+				// if extra.kart is found, use its included % symbol
+				if (!xtra_speedo)
+					metric = va("%4d P", convSpeed[1]);
+				else
+					metric = va("%4d %%", convSpeed[1]);
+			break;
+			default:
+				break;
+		}
+
+		V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, metric);
+	}
+	else if (speedostyle == SPEEDO_EXTRA) // why bother if we dont?
+	{
+		if (K_UseColorSpeedo(SPEEDO_EXTRA)) //Colourized hud
+		{
+			UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+			V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerclr, colormap);
+		}
+		else
+			V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallsticker);
+
+		V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
+		V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]);
+	}
+	else if (speedostyle == SPEEDO_ACHII) // why bother if we dont?
+	{
+		if (K_UseColorSpeedo(SPEEDO_ACHII)) //Colourized hud
+		{
+			UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+			V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerachiclr, colormap);
+			V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
+			V_DrawMappedPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachiclr[cv_kartspeedometer.value], colormap);
+		}
+		else
+		{
+			V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerachi);
+			V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
+			V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachi[cv_kartspeedometer.value]);
+		}
+	}
+#ifdef ROTSPRITE
+	else if (speedostyle == SPEEDO_DIAL)  // why bother if we dont?
+	{
+		K_DrawDialSpeedometer(convSpeed[0],
+							dial_divisor,
+							splitflags,
+							(boolean)(G_BattleGametype()),
+							(LUA_HudEnabled(hud_gametypeinfo)),
+							(K_UseColorSpeedo(SPEEDO_DIAL)));
+	}
+#endif
+	else if (speedostyle == SPEEDO_EXTRA3) // why bother if we dont?
+	{
+		if (K_UseColorSpeedo(SPEEDO_EXTRA3)) //Colourized hud
+		{
+			UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+			V_DrawStretchyFixedPatch((SPDM_X-1)<<FRACBITS, (SPDM_Y + 5)<<FRACBITS, XTRA3PSCALE, XTRA3VSCALE, V_HUDTRANS|splitflags, skp_smallstickerclr3, colormap, 0);
+		}
+		else
+			V_DrawStretchyFixedPatch((SPDM_X-1)<<FRACBITS, (SPDM_Y + 5)<<FRACBITS, XTRA3PSCALE, XTRA3VSCALE, V_HUDTRANS|splitflags, skp_smallsticker3, NULL, 0);
+
+		V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
+		V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]);
+	}
+	// Kart Z speedo bullshit...
+	// Draw the Speed counter.
+	else if ((speedostyle == SPEEDO_PMETER) || (speedostyle == SPEEDO_PMETERSMOL))
+	{
+		fixed_t fuspeed = 0;
+		INT32 spdpatch = 0;
+		static const INT32 speedIntervals[22] = {2, 5, 7, 10, 12, 15, 17,
+												20, 22, 25, 27, 30, 32,
+												35, 37, 40, 42, 45, 47,
+												50, 52, 55};
+
+		fuspeed = FixedDiv(stplyr->speed, mapobjectscale)/FRACUNIT;
+
+		for (INT32 i = 0; i < 22; ++i)
+		{
+			if (fuspeed < speedIntervals[i])
+			{
+				spdpatch = i;
+				break;
+			}
+		}
+
+		if (((fuspeed < 57 && fuspeed > 54) || (fuspeed < 60 && fuspeed > 56) || (fuspeed > 59)) && (leveltime & 4))
+			spdpatch = 24;
+		else if (((fuspeed < 57 && fuspeed > 54) || (fuspeed < 60 && fuspeed > 56) || (fuspeed > 59)) && !(leveltime & 4))
+			spdpatch = 23;
+
+		V_DrawScaledPatch(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, (speedostyle == SPEEDO_PMETER) ? kp_kartzspeedo[spdpatch] : kp_kartzspeedo_smol[spdpatch]);
+	}
+}
+
+#ifdef ROTSPRITE
+#undef DIALSPDDIV
+#undef MPHDIV
+#endif
+
+static void K_drawKartBumpersOrKarma(void)
+{
+	const UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+	INT32 fx, fy, fflags;
+	const boolean flipstring = splitscreen > 1 && stplyrnum & 1;  // same as laps, used for splitscreen
+	INT32 stringw = 0;	// used with the above
+	const char *bumpval = "";
+
+	drawinfo_t info;
+	K_getLapsDrawinfo(&info);
+	fx = info.x;
+	fy = info.y;
+	fflags = info.flags;
+
+	if (cv_battlespeedo.value && !splitscreen)
+	{
+		const UINT8 speedostyle = K_GetSpeedometerStyle();
+
+		if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII) || (speedostyle == SPEEDO_EXTRA3))
+			fy += 5;
+		else
+			fy += 7;
+	}
+
+	if (splitscreen > 1)
+	{
+		if (stplyr->kartstuff[k_bumper] <= 0)
+		{
+			bumpval = va("%d/2", stplyr->kartstuff[k_comebackpoints]);
+
+			if (flipstring)
+				fx -= 37;
+			V_DrawMappedPatch(fx, fy-1, V_HUDTRANS|fflags, kp_splitkarmabomb, colormap);
+			V_DrawString(fx+13, fy+1, V_HUDTRANS|fflags, bumpval);
+		}
+		else // the above doesn't need to account for weird stuff since the max amount of karma necessary is always 2 ^^^^
+		{
+			bumpval = va("%d/%d", stplyr->kartstuff[k_bumper], cv_kartbumpers.value);
+
+			if (flipstring)	// for p2 and p4, assume we can have more than 10 bumpers. It's retarded but who knows.
+			{
+				stringw = V_StringWidth(bumpval, 0);
+
+				V_DrawMappedPatch(fx-stringw-13, fy-1, V_HUDTRANS|fflags, kp_rankbumper, colormap);
+				V_DrawRightAlignedString(fx, fy+1, V_HUDTRANS|fflags, bumpval);
+			}
+			else // draw bumpers normally.
+			{
+				V_DrawMappedPatch(fx, fy-1, V_HUDTRANS|fflags, kp_rankbumper, colormap);
+				V_DrawString(fx+13, fy+1, V_HUDTRANS|fflags, bumpval);
+			}
+		}
+	}
+	else
+	{
+		patch_t *patch;
+
+		if (stplyr->kartstuff[k_bumper] <= 0)
+		{
+			patch = (K_UseColorHud() ? kp_karmastickerclr : kp_karmasticker);
+			bumpval = va("%d/2", stplyr->kartstuff[k_comebackpoints]);
+		}
+		else
+		{
+			if (stplyr->kartstuff[k_bumper] > 9 && cv_kartbumpers.value > 9)
+				patch = (K_UseColorHud() ? kp_bumperstickerwideclr : kp_bumperstickerwide);
+			else
+				patch = (K_UseColorHud() ? kp_bumperstickerclr : kp_bumpersticker);
+
+			bumpval = va("%d/%d", stplyr->kartstuff[k_bumper], cv_kartbumpers.value);
+		}
+
+		V_DrawMappedPatch(fx, fy, V_HUDTRANS|fflags, patch, colormap);
+		V_DrawKartString(fx+47, fy+3, V_HUDTRANS|fflags, bumpval);
+	}
+}
+
+#define lerp(from, to) cv_uncappedhud.value ? from + FixedMul(rendertimefrac, to - from) : to
+
+// converts mobj coordinates into screen coordinates
+// NOTE: use with V_NOSCALESTART!
+// Code updated in Lua by GenericHeroGuy for libSG
+// Badly ported to C by NepDisk and acutally made to work and fixed by Indev!(Thanks so much!)
+// Badly uncapped in C by GenericHeroGuy
+// original code by Lat'
+static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *target, fixed_t hofs, boolean dontclip)
+{
+	fixed_t y, x;
+	fixed_t targx, targy, targz;
+
+	fixed_t dist;
+	fixed_t distfact;
+	fixed_t offset;
+
+	fixed_t yres, xres;
+	fixed_t fov;
+
+	// this should never happen but its also kart so ¯\_(ツ)_/¯
+	if (!player || P_MobjWasRemoved(target))
+		return false;
+
+	targx = lerp(target->old_x, target->x);
+	targy = lerp(target->old_y, target->y);
+	targz = lerp(target->old_z, target->z);
+
+	// X coordinate
+	// get difference between camangle and angle towards target
+	x = (INT32)viewangle - (INT32)R_PointToAngle(targx, targy);
+
+	distfact = FINECOSINE((x>>ANGLETOFINESHIFT) & FINEMASK);
+    if (!distfact) distfact = 1;
+
+	if (encoremode)
+		x = -x;
+	if (x < (fixed_t)ANGLE_270 || x > (fixed_t)ANGLE_90)
+		return false;
+
+	xres = vid.width<<(FRACBITS-1);
+	yres = vid.height<<(FRACBITS-1);
+	fov = FixedDiv(xres, FINETANGENT(((FixedAngle(cv_fov.value/2)+ANGLE_90)>>ANGLETOFINESHIFT) & 4095));
+
+	// flipping
+	const boolean targflip = target->eflags & MFE_VERTICALFLIP;
+	const boolean srcflip = player->pflags & PF_FLIPCAM && player->mo->eflags & MFE_VERTICALFLIP;
+
+	// Y coordinate
+	// getting the angle difference here is a bit more involved...
+	// start by getting the height difference between the camera and target
+	y = viewz - targz - (targflip ? ((target->height * 2) / 3) : 0); // for some reason needs to be divided by "1.5" idk
+
+	if (hofs)
+		y = y - (targflip ? -hofs : hofs);
+
+	// then get the distance between camera and target
+	dist = R_PointToDist(targx, targy);
+
+#ifdef HWRENDER
+	// NOW we can get the angle differnce
+	if (rendermode == render_opengl && !cv_glshearing.value)
+	{
+		angle_t yang = R_PointToAngle2(0, 0, dist, y); // not perspective
+		x = FixedMul(x, FINECOSINE((yang>>ANGLETOFINESHIFT) & FINEMASK)); // perspective
+		y = -aimingangle - FixedDiv(yang, distfact);
+
+		if (y < (fixed_t)ANGLE_270 || y > (fixed_t)ANGLE_90) // clip points behind the camera
+			return false;
+		if (splitscreen == 1) // multiply by 1.25 for 2P splitscreen
+			y = y + (y/4) ;
+		if (srcflip) // flipcam
+			y = -y;
+
+		y = FixedMul(FINETANGENT((((angle_t)(-y)+ANGLE_90)>>ANGLETOFINESHIFT) & 4095), fov) + yres; // project the angle to get our final Y coordinate
+	}
+	else
+#endif
+	{
+		const fixed_t fovratio = FixedDiv(90*FRACUNIT, 180*FRACUNIT - FixedMul(cv_fov.value, 4*FRACUNIT/3)-FRACUNIT*-30);
+
+		y = FixedDiv(y, FixedMul(dist, distfact));
+		if (srcflip)
+			y = -y; // flipcam
+		if (y != INT32_MIN) // I_Error(): FixedDiv: divide by zero
+			y = FixedMul(FixedDiv(y, fovratio), xres) + yres;
+		//else print("NOPE!")
+
+		offset = FixedMul(FINETANGENT(((aimingangle+ANGLE_90)>>ANGLETOFINESHIFT) & 4095), xres);
+
+		// this isn't fovtan... what am i even doing anymore
+		if (splitscreen == 1)
+			offset = 17*offset/120;
+
+		// thanks fickle
+		offset = FixedDiv(offset, fovratio);
+		if (srcflip)
+			offset = -offset; // flipcam
+		y = y + offset;
+	}
+
+	// project the angle to get our final X coordinate
+	x = FixedMul(FINETANGENT(((x+ANGLE_90)>>ANGLETOFINESHIFT) & 4095), fov);
+	if (splitscreen == 1) // divide by 320/200 (1.6) on 2P splitscreen
+		x = (x/2) + (x/8);
+	x = x + xres;
+
+	// now clip in screen-space
+	if (!dontclip && (x < 0 || x > xres*2 || y < 0 || y > yres*2))
+		return false;
+
+	// adjust coords for splitscreen
+	if (splitscreen == 1) // 2P
+	{
+		y = y>>1;
+		if (stplyrnum > 0)
+			y = y + yres;
+	}
+	if (splitscreen >= 2) // 3P or 4P
+	{
+		x = x>>1;
+		y = y>>1;
+		if (stplyrnum & 1)
+			x = x + xres;
+		if (stplyrnum >= 2)
+			y = y + yres;
+	}
+
+	vec->y = y;
+	vec->x = x;
+	return true;
+}
+
+//Slighty fixed by Alug and further rewritten by NepDisk
+//Decided to port and highly modify sunflower version for the main nametag drawing with additions by NepDisk. My previous one was broken anyway due to the changed screencoords and noscalestart
+static void K_drawNameTags(void)
+{
+	UINT8 i, j;
+	INT32 trans;
+	vector2_t pos = {0};
+	fixed_t namex, namey;
+	int tagsdisplayed = 0;
+	fixed_t distance = 0;
+	fixed_t maxdistance = 0;
+	boolean flipped = false;
+	fixed_t z;
+
+	char *tag;
+	patch_t *icon = NULL;
+
+	INT32 dup;
+	UINT8 *cm = NULL;
+	UINT8 tagcolor = 0;
+	INT32 vflags = 0;
+	boolean usenametagrestat = false;
+	fixed_t tagwidthsmall;
+	fixed_t tagwidth;
+
+	if (P_MobjWasRemoved(stplyr->mo) || (stplyr->spectator && !cv_shownametagspectator.value) || stplyr->exiting)
+		return;
+
+	maxdistance = ((10*cv_nametagdist.value) * mapobjectscale);
+
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		distance = 0;
+		flipped = false;
+
+		if (i > PLAYERSMASK)
+			continue;
+		if (players[i].spectator || !playeringame[i] || P_MobjWasRemoved(players[i].mo))
+			continue;
+		if (i == displayplayers[stplyrnum] && !cv_showownnametag.value && !(leveltime < 130))
+			continue;
+		if (i != displayplayers[stplyrnum] && leveltime < starttime)
+			continue;
+		if (players[i].kartstuff[k_hyudorotimer]) // player is invisible
+			continue;
+		if (maxdistance)
+			distance = R_PointToDist(players[i].mo->x, players[i].mo->y);
+		if (distance > maxdistance)
+			continue;
+		if (!P_CheckSightFast(stplyr->mo, players[i].mo))
+			continue;
+
+		z = players[i].mo->height;
+
+		//Saltyhop hehe
+		z += lerp(players[i].mo->old_spriteyoffset, players[i].mo->spriteyoffset);
+
+		if (!K_GetScreenCoords(&pos, stplyr, players[i].mo, z, false))
+			continue;
+
+		tagsdisplayed++;
+
+		if (tagsdisplayed > cv_nametagmaxplayers.value)
+			break;
+
+		trans = 0;
+
+		switch (cv_nametagtrans.value)
+		{
+			case 1:
+				if (distance > (maxdistance*3/4))
+					trans = V_60TRANS;
+				break;
+			case 2:
+				if (distance > (maxdistance*3/1))
+					trans = V_90TRANS;
+				else if (distance > (maxdistance*3/2))
+					trans = V_80TRANS;
+				else if (distance > (maxdistance*3/3))
+					trans = V_60TRANS;
+				else if (distance > (maxdistance*3/4))
+					trans = V_40TRANS;
+				else if (distance > (maxdistance*3/5))
+					trans = V_20TRANS;
+				break;
+			case 3:
+				trans =  V_40TRANS;
+				break;
+			case 4:
+				trans = V_LocalTransFlag();
+				break;
+			case 0:
+			default:
+				break;
+		}
+
+		namex = pos.x>>FRACBITS;
+		namey = pos.y>>FRACBITS;
+
+		tag = va("%s%s ", HU_SkinColorToConsoleColor(players[i].mo->color), player_names[i]);
+		icon = R_GetSkinFaceMini(players[i].mo->player);
+
+		dup = vid.dupx;
+		cm = R_GetTranslationColormap(players[i].skin, players[i].mo->color, GTC_CACHE);
+		tagcolor = colortranslations[players[i].mo->color][7];
+		vflags = trans | V_NOSCALESTART;
+		usenametagrestat = ((cv_nametagrestat.value == 1 && (players[i].kartspeed != skins[players[i].skin].kartspeed || players[i].kartweight != skins[players[i].skin].kartweight)) || cv_nametagrestat.value == 2);
+		tagwidthsmall = cv_smallnametags.value ? V_SmallStringWidth(player_names[i], V_ALLOWLOWERCASE) : V_ThinStringWidth(player_names[i], V_ALLOWLOWERCASE);
+		tagwidth = dup*tagwidthsmall;
+
+		// If flipcam is on, other player is flipped relative to us when we have different
+		// verticalflip flag value. Otherwise, they are simply flipped when verticalflip flag says so
+		if ((stplyr->pflags & PF_FLIPCAM) && (stplyr->mo->eflags & MFE_VERTICALFLIP))
+			flipped = (players[i].mo->eflags & MFE_VERTICALFLIP) != (stplyr->mo->eflags & MFE_VERTICALFLIP);
+		else
+			flipped = players[i].mo->eflags & MFE_VERTICALFLIP;
+
+		if (cv_smallnametags.value || !nametaggfx)
+		{
+			if (flipped)
+				namey += dup*5;
+			else // small offset
+				namey -= dup*3;
+
+			if (nametaggfx && cv_smallnametags.value == 1)
+			{
+				if (cv_nametagfacerank.value)
+					tagwidthsmall += icon->width - dup;
+
+				// Have to draw the nametag using patches here since drawfill can't draw at this scale...
+				if (!flipped)
+					V_DrawFixedPatch(namex<<FRACBITS, namey<<FRACBITS, FRACUNIT/2, vflags, nametagline, cm);
+
+				V_DrawStretchyFixedPatch(((namex+dup*3)<<FRACBITS), namey<<FRACBITS,
+					tagwidthsmall<<FRACBITS, FRACUNIT/2, vflags, nametagpic, cm, 0);
+
+				namex += dup*2;
+				namey -= dup*4;
+			}
+
+			if (cv_nametagfacerank.value)
+			{
+				V_DrawFixedPatch(namex<<FRACBITS, (namey - icon->height/2)<<FRACBITS, FRACUNIT/2, vflags, icon,  cm);
+				namex += dup*(1+icon->width/2); // add offset to other stuff
+			}
+
+			//Name
+			V_DrawSmallString(namex, namey, V_ALLOWLOWERCASE | vflags, tag);
+
+			if (usenametagrestat)
+			{
+				V_DrawSmallString(namex, namey - dup*5, vflags, va("\x84S%d ", players[i].kartspeed));
+				V_DrawSmallString(namex + dup*10, namey - dup*5, vflags, va("\x87W%d ", players[i].kartweight));
+			}
+
+			if (cv_nametagscore.value)
+			{
+				INT32 yofs = usenametagrestat ? 10 : 5;
+				V_DrawSmallString(namex, namey - dup*yofs, V_ALLOWLOWERCASE | vflags, va("\x8A%d ", players[i].score));
+			}
+		}
+		else
+		{
+			if (cv_nametagfacerank.value)
+				tagwidth += dup*(icon->width+1);
+
+			if (flipped)
+			{
+				for	(j = 0; j < 4; j++)
+				{
+					V_DrawFill(namex, namey, dup*3, dup*4, 31 | vflags);
+					V_DrawFill(namex+dup, namey, dup, dup*4, tagcolor | vflags);
+					namey += dup*4;
+					namex += dup;
+				}
+				namey -= dup*3;
+				V_DrawFill(namex, namey+dup*2, dup, dup, 31 | vflags); // a single black pixel
+				V_DrawFill(namex+dup, namey, tagwidth, dup*3, 31 | vflags);
+				V_DrawFill(namex+dup, namey+dup, tagwidth - dup, dup, tagcolor | vflags);
+				namex += dup*2;
+			}
+			else
+			{
+				for (j = 0; j < 4; j++)
+				{
+					namey -= dup*4;
+					V_DrawFill(namex, namey, dup*3, dup*4, 31 | vflags);
+					V_DrawFill(namex+dup, namey, dup, dup*4, tagcolor | vflags);
+					namex += dup;
+				}
+
+				V_DrawFill(namex, namey, dup, dup, 31 | vflags);
+				V_DrawFill(namex+dup, namey, tagwidth - dup*2, dup*3, 31 | vflags);
+				V_DrawFill(namex+dup, namey+dup, tagwidth - dup*3, dup, tagcolor | vflags);
+			}
+
+			if (cv_nametagfacerank.value)
+			{
+				V_DrawMappedPatch(namex, namey - dup*(icon->height+1), vflags, icon, cm);
+				namex += dup*(icon->height+1); // add offset to other stuff
+			}
+
+			V_DrawThinString(namex, namey - dup*10, V_ALLOWLOWERCASE | vflags, tag);
+
+			if (usenametagrestat)
+			{
+				V_DrawScaledPatch(namex, namey - dup*20, vflags, nametagspeed);
+				V_DrawScaledPatch(namex + dup*18, namey - dup*20, vflags, nametagweight);
+				V_DrawString(namex + dup*9, namey - dup*19, V_ALLOWLOWERCASE | vflags, va("\x84%d ", players[i].kartspeed));
+				V_DrawString(namex + dup*27, namey - dup*19, V_ALLOWLOWERCASE | vflags, va("\x87%d ", players[i].kartweight));
+			}
+
+			if (cv_nametagscore.value)
+			{
+				INT32 yofs = usenametagrestat ? 25 : 15;
+				V_DrawSmallString(namex, namey - dup*yofs, V_ALLOWLOWERCASE | vflags, va("\x8A%d ", players[i].score));
+			}
+		}
+	}
+}
+
+// Based on Driftgauge refactor by GenericHeroGuy ported from lua and expanded by NepDisk
+static void K_drawDriftGauge(void)
+{
+	vector2_t pos = {0};
+	fixed_t basex, basey;
+	const int dup = vid.dupx;
+	int i;
+	UINT8 *cmap;
+
+	static const UINT8 driftcolors[3][4] = {
+		{0, 0, 10, 16},       // no drift
+		{215, 215, 204, 253}, // blue
+		{125, 125, 151, 159}  // red
+	};
+
+	static const UINT8 driftskins[3] = {
+		SKINCOLOR_NONE,
+		SKINCOLOR_TEAL,
+		SKINCOLOR_SALMON,
+	};
+
+	static const UINT8 driftrainbow[18] = {
+		0, 31, 47, 63, 79, 95, 111, 119, 127, 143, 159, 175, 183, 191, 199, 207, 223, 247
+	};
+
+	if (camera[stplyrnum].freecam)
+		return;
+
+	if (!splitscreen && !camera->chase)
+		return;
+
+	if (forceshowhud)
+		goto skipcrap; // i will skip the drift early return and you cant stop me!
+
+	if (!stplyr->kartstuff[k_drift])
+		return;
+
+skipcrap:
+
+	if (P_MobjWasRemoved(stplyr->mo))
+		return;
+
+	if (!K_GetScreenCoords(&pos, stplyr, stplyr->mo, FixedMul(cv_driftgaugeofs.value, cv_driftgaugeofs.value > 0 ? stplyr->mo->scale : mapobjectscale), false))
+		return;
+
+	fixed_t barx;
+	fixed_t bary;
+	INT32 BAR_WIDTH;
+
+	const INT32 driftval    = K_GetKartDriftSparkValue(stplyr);
+	const INT32 driftcharge = min(driftval*4, stplyr->kartstuff[k_driftcharge]);
+	const INT32 driftlevel  = min(driftcharge / driftval, 2);
+	const INT32 drifttrans  = ((cv_driftgaugetrans.value) ? V_LocalTransFlag() : 0);
+
+	basex = pos.x>>FRACBITS;
+	basey = pos.y>>FRACBITS;
+
+	switch (cv_driftgaugestyle.value)
+	{
+		case 1:
+		case 2:
+		case 3:
+		case 5:
+			{
+				if (!driftgaugegfx)
+					break;
+
+				const boolean usescaledpatch = (cv_driftgaugestyle.value == 5 && xtra_speedo3);
+
+				if (cv_driftgaugestyle.value == 1 || cv_driftgaugestyle.value == 3 || usescaledpatch)
+				{
+					barx = basex - dup*23;
+					BAR_WIDTH = dup*47;
+				}
+				else
+				{
+					barx = basex - dup*12;
+					BAR_WIDTH = dup*23;
+				}
+
+				bary = basey - dup*2;
+
+				if (usescaledpatch) // i hate hud code i hate hud code i hate hud code i hate hud code i hate hud code.....
+				{
+					if (K_UseColorSpeedo(SPEEDO_EXTRA3)) // Colourized hud
+					{
+						UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+						V_DrawStretchyFixedPatch((basex - dup*30)<<FRACBITS, ((basey<<FRACBITS) - FixedMul(dup<<FRACBITS, 21*FRACUNIT/10)), XTRA3PSCALE, XTRA3VSCALE, V_NOSCALESTART|V_OFFSET|drifttrans, skp_smallstickerclr3, colormap, 0);
+					}
+					else
+						V_DrawStretchyFixedPatch((basex - dup*30)<<FRACBITS, ((basey<<FRACBITS) - FixedMul(dup<<FRACBITS, 21*FRACUNIT/10)), XTRA3PSCALE, XTRA3VSCALE, V_NOSCALESTART|V_OFFSET|drifttrans, skp_smallsticker3, NULL, 0);
+				}
+				else
+				{
+					if (K_UseColorHud()) // Colourized hud
+					{
+						UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+						V_DrawMappedPatch(cv_driftgaugestyle.value == 2 ? basex + dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, cv_driftgaugestyle.value == 2 ? driftgaugesmallcolor : driftgaugecolor, colormap);
+					}
+					else
+						V_DrawMappedPatch(cv_driftgaugestyle.value == 2 ? basex + dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, cv_driftgaugestyle.value == 2 ? driftgaugesmall : driftgauge, NULL);
+				}
+
+				if (driftcharge >= driftval*4) // rainbow sparks
+				{
+					cmap = R_GetTranslationColormap(TC_RAINBOW, 1 + leveltime % (MAXSKINCOLORS-1),GTC_CACHE);
+
+					for (i = 0; i < 4; i++)
+						V_DrawFill(barx, bary+dup*1+dup*i, BAR_WIDTH, dup, (driftrainbow[min((leveltime % 18) + 1, 18 - 1)] + i*2) | V_NOSCALESTART|drifttrans);
+				}
+				else // none/blue/red
+				{
+					const INT32 limit = (driftval * (driftcharge >= driftval*2 ? 2 : 1));
+					const INT32 width = ((driftcharge - (driftcharge >= driftval ? limit : 0)) * BAR_WIDTH) / limit;
+
+					cmap = R_GetTranslationColormap(TC_RAINBOW, driftskins[driftlevel],GTC_CACHE);
+
+					for (i = 0; i < 4; i++)
+					{
+						if (driftcharge >= driftval)
+							V_DrawFill(barx, bary+dup*1+dup*i, BAR_WIDTH, dup, driftcolors[driftlevel-1][i] | V_NOSCALESTART|drifttrans);
+
+						V_DrawFill(barx, bary+dup*1+dup*i, width, dup, driftcolors[driftlevel][i] | V_NOSCALESTART|drifttrans);
+					}
+				}
+
+				// right, also draw a cool number
+				if (cv_driftgaugestyle.value == 3)
+					V_DrawPaddedTallColorNum(basex + (dup*32), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, cmap);
+				else
+					V_DrawPingNum(cv_driftgaugestyle.value == 2 ? basex + (dup*22) : basex + (dup*32), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, cmap);
+			}
+			break;
+		case 4:
+			{
+				if (driftcharge >= driftval*4)
+					cmap = R_GetTranslationColormap(TC_RAINBOW, 1 + leveltime % (MAXSKINCOLORS-1),GTC_CACHE);
+				else
+					cmap = R_GetTranslationColormap(TC_RAINBOW, driftskins[driftlevel],GTC_CACHE);
+
+				V_DrawPaddedTallColorNum(basex + (dup*16), basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftcharge*100 / driftval, 3, cmap);
+			}
+			break;
+		default:
+			break;
+	}
+}
+
+static fixed_t K_FindCheckX(fixed_t px, fixed_t py, angle_t ang, fixed_t mx, fixed_t my)
+{
+	fixed_t dist, x;
+	fixed_t range = RING_DIST/3;
+	angle_t diff;
+
+	range *= gamespeed+1;
+
+	dist = abs(R_PointToDist2(px, py, mx, my));
+
+	if (dist > range)
+		return -BASEVIDWIDTH;
+
+	diff = R_PointToAngle2(px, py, mx, my) - ang;
+
+	if (diff < ANGLE_90 || diff > ANGLE_270)
+		return -BASEVIDWIDTH;
+	else
+		x = (FixedMul(FINETANGENT(((diff+ANGLE_90)>>ANGLETOFINESHIFT) & 4095), 160<<FRACBITS) + (160<<FRACBITS))>>FRACBITS;
+
+	if (encoremode)
+		x = BASEVIDWIDTH-x;
+
+	if (splitscreen > 1)
+		x /= 2;
+
+	return x;
+}
+
+static void K_drawKartWanted(void)
+{
+	UINT8 i, numwanted = 0;
+	UINT8 *colormap = NULL;
+	INT32 basex = 0, basey = 0;
+
+	if (stplyrnum != 0)
+		return;
+
+	for (i = 0; i < 4; i++)
+	{
+		if (battlewanted[i] == -1)
+			break;
+		numwanted++;
+	}
+
+	if (numwanted <= 0)
+		return;
+
+	// set X/Y coords depending on splitscreen.
+	if (splitscreen < 3)		// 1P and 2P use the same code.
+	{
+		basex = WANT_X;
+		basey = WANT_Y;
+		if (splitscreen == 2)
+		{
+			basey += 16;	// slight adjust for 3P
+			basex -= 6;
+		}
+	}
+	else if (splitscreen == 3)	// 4P splitscreen...
+	{
+		basex = BASEVIDWIDTH/2 - (kp_wantedsplit->width/2);	// center on screen
+		basey = BASEVIDHEIGHT - 55;
+		//basey2 = 4;
+	}
+
+	if (battlewanted[0] != -1)
+		colormap = R_GetTranslationColormap(0, players[battlewanted[0]].skincolor, GTC_CACHE);
+
+	V_DrawFixedPatch(basex<<FRACBITS, basey<<FRACBITS, FRACUNIT, V_HUDTRANS|(splitscreen < 3 ? V_SNAPTORIGHT : 0)|V_SNAPTOBOTTOM, (splitscreen > 1 ? kp_wantedsplit : kp_wanted), colormap);
+	/*if (basey2)
+		V_DrawFixedPatch(basex<<FRACBITS, basey2<<FRACBITS, FRACUNIT, V_HUDTRANS|V_SNAPTOTOP, (splitscreen == 3 ? kp_wantedsplit : kp_wanted), colormap);	// < used for 4p splits.*/
+
+	for (i = 0; i < numwanted; i++)
+	{
+		INT32 x = basex+(splitscreen > 1 ? 13 : 8), y = basey+(splitscreen > 1 ? 16 : 21);
+		fixed_t scale = FRACUNIT/2;
+
+		if (battlewanted[i] == -1)
+			break;
+
+		player_t *p = &players[battlewanted[i]];
+
+		if (numwanted == 1)
+			scale = FRACUNIT;
+		else
+		{
+			if (i & 1)
+				x += 16;
+			if (i > 1)
+				y += 16;
+		}
+
+		if (p->skincolor)
+		{
+			colormap = R_GetTranslationColormap(TC_RAINBOW, p->skincolor, GTC_CACHE);
+			V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, V_HUDTRANS|(splitscreen < 3 ? V_SNAPTORIGHT : 0)|V_SNAPTOBOTTOM, (scale == FRACUNIT ? R_GetSkinFaceWant(p) : R_GetSkinFaceRank(p)), colormap);
+			/*if (basey2)	// again with 4p stuff
+				V_DrawFixedPatch(x<<FRACBITS, (y - (basey-basey2))<<FRACBITS, FRACUNIT, V_HUDTRANS|V_SNAPTOTOP, (scale == FRACUNIT ? facewantprefix[p->skin] : facerankprefix[p->skin]), colormap);*/
+		}
+	}
+}
+
+static void K_drawKartPlayerCheck(void)
+{
+	INT32 i;
+	UINT8 *colormap;
+	INT32 x;
+
+	if (!stplyr->mo || stplyr->spectator || stplyr->awayviewtics)
+		return;
+
+	if (camspin[0])
+		return;
+
+	const INT32 splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM);
+
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		UINT8 pnum = 0;
+
+		if (&players[i] == stplyr)
+			continue;
+		if (!playeringame[i] || players[i].spectator)
+			continue;
+		if (!players[i].mo)
+			continue;
+
+		if ((players[i].kartstuff[k_invincibilitytimer] <= 0) && (leveltime & 2))
+			pnum++; // white frames
+
+		if (players[i].kartstuff[k_itemtype] == KITEM_GROW || players[i].kartstuff[k_growshrinktimer] > 0)
+			pnum += 4;
+		else if (players[i].kartstuff[k_itemtype] == KITEM_INVINCIBILITY || players[i].kartstuff[k_invincibilitytimer])
+			pnum += 2;
+
+		x = K_FindCheckX(stplyr->mo->x, stplyr->mo->y, stplyr->mo->angle, players[i].mo->x, players[i].mo->y);
+		if (x <= 320 && x >= 0)
+		{
+			if (x < 14)
+				x = 14;
+			else if (x > 306)
+				x = 306;
+
+			colormap = R_GetTranslationColormap(TC_DEFAULT, players[i].mo->color, GTC_CACHE);
+			V_DrawMappedPatch(x, CHEK_Y, V_HUDTRANS|splitflags, kp_check[pnum], colormap);
+		}
+	}
+}
+
+static boolean K_useSmallMinimapHead(player_t *player)
+{
+	return cv_minihead.value == 1 || (cv_minihead.value == 2 && !(player && P_IsDisplayPlayer(player)));
+}
+
+static void K_drawKartMinimapIcon(fixed_t objx, fixed_t objy, INT32 hudx, INT32 hudy, INT32 flags, INT32 blend, patch_t *icon, UINT8 *colormap, drawinfo_t *dims, boolean scaleme)
+{
+	// amnum xpos & ypos are the icon's speed around the HUD.
+	// The number being divided by is for how fast it moves.
+	// The higher the number, the slower it moves.
+
+	// am xpos & ypos are the icon's starting position. Withouht
+	// it, they wouldn't 'spawn' on the top-right side of the HUD.
+
+	fixed_t amnumxpos, amnumypos;
+	INT32 amxpos, amypos;
+	fixed_t scale = FRACUNIT;
+	patch_t *AutomapPic;
+	INT16 w, h;
+
+	AutomapPic = minimapinfo.minimap_pic;
+
+	if (AutomapPic == NULL)
+	{
+		return; // no pic, just get outta here
+	}
+
+	amnumxpos = (FixedMul(objx, minimapinfo.zoom) - minimapinfo.offs_x);
+	amnumypos = -(FixedMul(objy, minimapinfo.zoom) - minimapinfo.offs_y);
+
+	if (encoremode)
+		amnumxpos = -amnumxpos;
+
+	if (dims && (dims->x != 0) && (dims->y != 0))
+	{
+		w = dims->x;
+		h = dims->y;
+	}
+	else
+	{
+		w = icon->width;
+		h = icon->height;
+	}
+
+	amxpos = amnumxpos + ((hudx + (AutomapPic->width-w)/2)<<FRACBITS);
+	amypos = amnumypos + ((hudy + (AutomapPic->height-h)/2)<<FRACBITS);
+
+	if (cv_minihead.value && (scaleme))
+	{
+		amxpos += (w / 4)<<FRACBITS;
+		amypos += (h / 4)<<FRACBITS;
+		scale /= 2;
+	}
+
+	V_DrawBlendingFixedPatch(amxpos, amypos, scale, flags, icon, colormap, blend);
+}
+
+static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
+{
+	// amnum xpos & ypos are the icon's speed around the HUD.
+	// The number being divided by is for how fast it moves.
+	// The higher the number, the slower it moves.
+
+	// am xpos & ypos are the icon's starting position. Without
+	// it, they wouldn't 'spawn' on the top-right side of the HUD.
+
+	const skin_t *skin;
+	player_t *player = mo->player;
+	const boolean skinlocal = mo->skinlocal;
+
+	fixed_t amnumxpos, amnumypos;
+	INT32 amxpos, amypos, wntdamxpos, wntdamypos;
+	fixed_t scale = FRACUNIT;
+	patch_t *minimaphead = NULL;
+	boolean minihead = K_useSmallMinimapHead(mo->player);
+
+#ifdef ROTSPRITE
+	angle_t rollangle = 0;
+	INT32 rot = 0;
+#endif
+
+	skin = K_GetMobjSkin(mo);
+	minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)];
+
+	amnumxpos =  (FixedMul(lerp(mo->old_x, mo->x), minimapinfo.zoom) - minimapinfo.offs_x);
+	amnumypos = -(FixedMul(lerp(mo->old_y, mo->y), minimapinfo.zoom) - minimapinfo.offs_y);
+
+	if (encoremode)
+		amnumxpos = -amnumxpos;
+
+	amxpos = amnumxpos + ((x + (minimapinfo.minimap_pic->width-minimaphead->width) / 2)<<FRACBITS);
+	amypos = amnumypos + ((y + (minimapinfo.minimap_pic->height-minimaphead->height) / 2)<<FRACBITS);
+
+	if (cv_showminimapnames.value && player && !(modeattacking || gamestate == GS_TIMEATTACK))
+	{
+		V_DrawCenteredSmallStringAtFixed(amxpos + (4*FRACUNIT), amypos - (3*FRACUNIT), V_ALLOWLOWERCASE|flags|V_SkinColorToHighlightcolor(mo->color), player_names[player - players]);
+	}
+
+
+	// thx wanted reticle for having weird offsets very cool
+	wntdamxpos = minihead ? amxpos + (1<<FRACBITS) : amxpos - (4<<FRACBITS);
+	wntdamypos = minihead ? amypos + (1<<FRACBITS) : amypos - (4<<FRACBITS);
+
+	if (minihead)
+	{
+		amxpos += (minimaphead->width  / 4)<<FRACBITS;
+		amypos += (minimaphead->height / 4)<<FRACBITS;
+		scale /= 2;
+	}
+
+#ifdef ROTSPRITE
+	if (cv_spinoutroll.value && player && player->spinoutrot)
+	{
+		// Rotate counterclockwise.
+		rollangle = FixedAngle(player->spinoutrot * -1);
+		rot = R_GetRollAngle(rollangle);
+
+		if (rot)
+		{
+			minimaphead = W_CachePatchNameRotated(skin->facemmap, rot, PU_PATCH);
+		}
+	}
+#endif
+
+	if (!mo->color) // 'default' color
+		V_DrawSciencePatch(amxpos, amypos, flags, minimaphead, scale);
+	else
+	{
+		UINT8 *colormap;
+
+		if (mo->colorized)
+			colormap = R_GetTranslationColormap(TC_RAINBOW, mo->color, GTC_CACHE);
+		else
+			colormap = R_GetLocalTranslationColormap(mo->skin, mo->localskin, mo->color, GTC_CACHE, skinlocal);
+
+		V_DrawFixedPatch(amxpos, amypos, scale, flags, minimaphead, colormap);
+
+		if (player
+			&& ((G_RaceGametype() && player->kartstuff[k_position] == spbplace)
+			|| (G_BattleGametype() && K_IsPlayerWanted(player))))
+		{
+			V_DrawFixedPatch(wntdamxpos, wntdamypos, scale, flags, kp_wantedreticle, NULL);
+		}
+	}
+}
+
+enum
+{
+	MINIANGLE_NONE = 0,
+	MINIANGLE_DOT,
+	MINIANGLE_LIGHT
+};
+
+static void K_drawKartMinimap(void)
+{
+	INT32 i = 0;
+	INT32 x, y;
+	INT32 minimaptrans, splitflags;
+	SINT8 localplayers[MAXSPLITSCREENPLAYERS];
+	SINT8 numlocalplayers = 0;
+	patch_t *AutomapPic;
+
+	// Draw the HUD only when playing in a level.
+	// hu_stuff needs this, unlike st_stuff.
+	if (gamestate != GS_LEVEL)
+		return;
+
+	// Only draw for the first player
+	if (stplyrnum != 0)
+		return;
+
+	AutomapPic = minimapinfo.minimap_pic;
+
+	if (AutomapPic == NULL)
+	{
+		return; // no pic, just get outta here
+	}
+
+	minimaptrans = K_getMinimapTrans();
+
+	// Exit early if it wouldn't draw anyway.
+	if (minimaptrans == -1)
+		return;
+
+	drawinfo_t info;
+	K_getMinimapDrawinfo(&info);
+	x = info.x - (AutomapPic->width/2);
+	y = info.y - (AutomapPic->height/2);
+	splitflags = info.flags;
+
+	splitflags |= minimaptrans;
+
+	if (encoremode)
+		V_DrawScaledPatch(x+AutomapPic->width, y, splitflags|V_FLIP, AutomapPic);
+	else
+		V_DrawScaledPatch(x, y, splitflags, AutomapPic);
+
+	if (!(splitscreen == 2))
+	{
+		splitflags &= ~minimaptrans;
+		splitflags |= V_HUDTRANSHALF;
+	}
+
+	// let offsets transfer to the heads, too!
+	if (encoremode)
+		x += AutomapPic->leftoffset;
+	else
+		x -= AutomapPic->leftoffset;
+	y -= AutomapPic->topoffset;
+
+	// initialize
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+		localplayers[i] = -1;
+
+	// Player's tiny icons on the Automap. (drawn opposite direction so player 1 is drawn last in splitscreen)
+	if (ghosts)
+	{
+		demoghost *g = ghosts;
+		while (g)
+		{
+			K_drawKartMinimapHead(g->mo, x, y, splitflags);
+			g = g->next;
+		}
+
+		if (!stplyr->mo || stplyr->spectator) // do we need the latter..?
+			return;
+
+		localplayers[numlocalplayers++] = stplyr-players;
+	}
+	else
+	{
+		for (i = MAXPLAYERS-1; i >= 0; i--)
+		{
+			if (!playeringame[i])
+				continue;
+
+			if (!players[i].mo || players[i].spectator)
+				continue;
+
+			if (P_IsDisplayPlayer(&players[i]))
+			{
+				// Draw display players on top of everything else
+				localplayers[numlocalplayers++] = i;
+				continue;
+			}
+
+			// Now we know it's not a display player, handle non-local player exceptions.
+			if (G_BattleGametype() && players[i].kartstuff[k_bumper] <= 0)
+				continue;
+
+			if (players[i].kartstuff[k_hyudorotimer] > 0)
+			{
+				if (!((players[i].kartstuff[k_hyudorotimer] < 1*TICRATE/2
+					|| players[i].kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))
+					&& !(leveltime & 1)))
+					continue;
+			}
+
+			K_drawKartMinimapHead(players[i].mo, x, y, splitflags);
+		}
+	}
+
+	// draw our local players here, opaque.
+	splitflags &= ~V_HUDTRANSHALF;
+	splitflags |= V_HUDTRANS;
+
+	const SINT8 icondotradius = ((cv_minihead.value == 1) && !cv_showminimapnames.value) ? 8 : 10;
+	patch_t* minipatch;
+	INT32 rot;
+	INT32 blending;
+
+	for (i = 0; i < numlocalplayers; i++)
+	{
+		if (localplayers[i] == -1)
+			continue; // this doesn't interest us
+
+		mobj_t *mobj = players[localplayers[i]].mo;
+
+		// dont draw for no contestants
+		boolean playertimedout = (mobj->health <= 0 && players[localplayers[i]].pflags & PF_TIMEOVER);
+
+		if (cv_showminimapangle.value && (minidoticon || minilighticon) && !playertimedout)
+		{
+			UINT8 *colormap;
+			drawinfo_t dims;
+			fixed_t interpx, interpy;
+			fixed_t xoff = 0, yoff = 0;
+			blending = 0;
+
+			angle_t ang = R_InterpolateAngle(mobj->old_angle, mobj->angle);
+
+			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);
+
+			interpx = lerp(mobj->old_x, mobj->x);
+			interpy = lerp(mobj->old_y, mobj->y);
+
+			minipatch = kp_minimapdot;
+
+			dims.x = 0;
+			dims.y = 0;
+
+			if (cv_showminimapangle.value == MINIANGLE_DOT)
+			{
+				xoff = FixedMul(FCOS(ang), icondotradius);
+				yoff = -FixedMul(FSIN(ang), icondotradius);
+			}
+			else if (cv_showminimapangle.value == MINIANGLE_LIGHT)
+			{
+				rot = R_GetRollAngle(ang);
+				minipatch = W_CachePatchNameRotated("MMAPHDLT", rot, PU_PATCH);
+
+				blending = B_ADD;
+				xoff = yoff = 0;
+
+				dims.x = 48;
+				dims.y = 24;
+			}
+
+			K_drawKartMinimapIcon(
+					interpx,
+					interpy,
+					x + xoff,
+					y + yoff,
+					splitflags,
+					blending,
+					minipatch,
+					colormap,
+					&dims,
+					false
+			);
+		}
+
+		// draw the minimap head after the nonsense above
+		K_drawKartMinimapHead(mobj, x, y, splitflags);
+	}
+}
+
+#undef lerp
+
+static void K_drawKartStartCountdown(void)
+{
+	INT32 pnum = 0, splitflags = K_calcSplitFlags(0); // 3
+
+	if (leveltime >= starttime-(2*TICRATE)) // 2
+		pnum++;
+	if (leveltime >= starttime-TICRATE) // 1
+		pnum++;
+	if (leveltime >= starttime) // GO!
+		pnum++;
+	if ((leveltime % (2*5)) / 5) // blink
+		pnum += 4;
+	if (splitscreen) // splitscreen
+		pnum += 8;
+
+	V_DrawScaledPatch(STCD_X - (kp_startcountdown[pnum]->width/2), STCD_Y - (kp_startcountdown[pnum]->height/2), splitflags, kp_startcountdown[pnum]);
+}
+
+static void K_drawKartFinish(void)
+{
+	INT32 pnum = 0, splitflags = K_calcSplitFlags(0);
+
+	if (!stplyr->kartstuff[k_cardanimation] || stplyr->kartstuff[k_cardanimation] >= 2*TICRATE)
+		return;
+
+	if ((stplyr->kartstuff[k_cardanimation] % (2*5)) / 5) // blink
+		pnum = 1;
+
+	if (splitscreen > 1) // 3/4p, stationary FIN
+	{
+		pnum += 2;
+		V_DrawScaledPatch(STCD_X - (kp_racefinish[pnum]->width/2), STCD_Y - (kp_racefinish[pnum]->height/2), splitflags, kp_racefinish[pnum]);
+		return;
+	}
+
+	//else -- 1/2p, scrolling FINISH
+	{
+		INT32 x, xval;
+
+		if (splitscreen) // wide splitscreen
+			pnum += 4;
+
+		x = ((vid.width<<FRACBITS)/vid.dupx);
+		xval = (kp_racefinish[pnum]->width<<FRACBITS);
+		x = (FixedMul(((TICRATE - stplyr->kartstuff[k_cardanimation])<<FRACBITS) - R_GetHudUncap(), xval > x ? xval : x))/TICRATE;
+
+		if (splitscreen && stplyrnum == 1)
+			x = -x;
+
+		V_DrawFixedPatch(x + (STCD_X<<FRACBITS) - (xval>>1),
+			(STCD_Y<<FRACBITS) - (kp_racefinish[pnum]->height<<(FRACBITS-1)),
+			FRACUNIT,
+			splitflags, kp_racefinish[pnum], NULL);
+	}
+}
+
+static void K_drawBattleFullscreen(void)
+{
+	INT32 cardanim = stplyr->kartstuff[k_cardanimation] << FRACBITS;
+
+	// fill in the fractional bits
+	if (cardanim && cardanim != 164*FRACUNIT)
+	{
+		INT32 frac = R_GetHudUncap() * ((164 - stplyr->kartstuff[k_cardanimation])/8 + 1);
+		if (stplyr->exiting)
+			cardanim += frac;
+		else
+			cardanim += stplyr->kartstuff[k_comebacktimer] < 6*TICRATE ? -frac : frac;
+	}
+
+	INT32 x = BASEVIDWIDTH/2;
+	INT32 y = (-64*FRACUNIT) + cardanim; // card animation goes from 0 to 164, 164 is the middle of the screen
+	INT32 splitflags = V_SNAPTOTOP; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead
+	fixed_t scale = FRACUNIT;
+	boolean drawcomebacktimer = true;	// lazy hack because it's cleaner in the long run.
+
+	if (!LUA_HudEnabled(hud_battlecomebacktimer))
+		drawcomebacktimer = false;
+
+	if (splitscreen)
+	{
+		if ((splitscreen == 1 && stplyrnum == 1) || (splitscreen > 1 && stplyrnum & 2))
+		{
+			y = (232*FRACUNIT) - (cardanim/2);
+			splitflags = V_SNAPTOBOTTOM;
+		}
+		else
+			y = (-32*FRACUNIT) + (cardanim/2);
+
+		if (splitscreen > 1)
+		{
+			scale /= 2;
+
+			if (stplyrnum & 1)
+				x = 3*BASEVIDWIDTH/4;
+			else
+				x = BASEVIDWIDTH/4;
+		}
+		else
+		{
+			if (stplyr->exiting)
+			{
+				if (stplyrnum == 1)
+					x = BASEVIDWIDTH-96;
+				else
+					x = 96;
+			}
+			else
+				scale /= 2;
+		}
+	}
+
+	if (stplyr->exiting)
+	{
+		if (stplyrnum == 0)
+			V_DrawFadeScreen(0xFF00, 16);
+		if (stplyr->exiting < 6*TICRATE && !stplyr->spectator)
+		{
+			if (stplyr->kartstuff[k_position] == 1)
+				V_DrawFixedPatch(x<<FRACBITS, y, scale, splitflags, kp_battlewin, NULL);
+			else
+				V_DrawFixedPatch(x<<FRACBITS, y, scale, splitflags, (K_IsPlayerLosing(stplyr) ? kp_battlelose : kp_battlecool), NULL);
+		}
+		else
+			K_drawKartFinish();
+	}
+	else if (stplyr->kartstuff[k_bumper] <= 0 && stplyr->kartstuff[k_comebacktimer] && comeback && !stplyr->spectator && drawcomebacktimer)
+	{
+		UINT16 t = stplyr->kartstuff[k_comebacktimer]/(10*TICRATE);
+		INT32 txoff, adjust = (splitscreen > 1) ? 4 : 6; // normal string is 8, kart string is 12, half of that for ease
+		INT32 ty = (BASEVIDHEIGHT/2)+66;
+
+		txoff = adjust;
+
+		while (t)
+		{
+			txoff += adjust;
+			t /= 10;
+		}
+
+		if (splitscreen)
+		{
+			if (splitscreen > 1)
+				ty = (BASEVIDHEIGHT/4)+33;
+			if ((splitscreen == 1 && stplyrnum == 1) || (splitscreen > 1 && stplyrnum & 2))
+				ty += (BASEVIDHEIGHT/2);
+		}
+		else
+			V_DrawFadeScreen(0xFF00, 16);
+
+		if (!comebackshowninfo)
+			V_DrawFixedPatch(x<<FRACBITS, y, scale, splitflags, kp_battleinfo, NULL);
+		else
+			V_DrawFixedPatch(x<<FRACBITS, y, scale, splitflags, kp_battlewait, NULL);
+
+		if (splitscreen > 1)
+			V_DrawString(x-txoff, ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
+		else
+		{
+			if (K_UseColorHud()) // Colourized hud
+			{
+				UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutstickerclr, colormap);
+			}
+			else
+				V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutsticker, NULL);
+
+
+			V_DrawKartString(x-txoff, ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
+		}
+	}
+
+	if (netgame && cv_showfreeplay.value && !stplyr->spectator && timeinmap > 113) // FREE PLAY?
+	{
+		UINT8 i;
+
+		// check to see if there's anyone else at all
+		for (i = 0; i < MAXPLAYERS; i++)
+		{
+			if (i == displayplayers[0])
+				continue;
+			if (playeringame[i] && !stplyr->spectator)
+				return;
+		}
+
+		if (LUA_HudEnabled(hud_freeplay))
+			K_drawKartFreePlay(leveltime);
+	}
+}
+
+static void K_drawKartFirstPerson(void)
+{
+	static INT32 pnum[4], turn[4], drift[4];
+	INT32 pn = 0, tn = 0, dr = 0;
+	INT32 target = 0, splitflags = K_calcSplitFlags(V_SNAPTOBOTTOM);
+	INT32 x = BASEVIDWIDTH/2, y = BASEVIDHEIGHT;
+	fixed_t scale;
+	UINT8 *colmap = NULL;
+	ticcmd_t *cmd = &stplyr->cmd;
+
+	if (stplyr->spectator || !stplyr->mo || (stplyr->mo->flags2 & MF2_DONTDRAW))
+		return;
+
+	pn = pnum[stplyrnum];
+	tn = turn[stplyrnum];
+	dr = drift[stplyrnum];
+
+	if (splitscreen)
+	{
+		y >>= 1;
+		if (splitscreen > 1)
+			x >>= 1;
+	}
+
+	{
+		if (stplyr->speed < (20*stplyr->mo->scale) && (leveltime & 1) && !splitscreen)
+			y++;
+		// the following isn't EXPLICITLY right, it just gets the result we want, but i'm too lazy to look up the right way to do it
+		if (stplyr->mo->flags2 & MF2_SHADOW)
+			splitflags |= FF_TRANS80;
+		else if (stplyr->mo->frame & FF_TRANSMASK)
+			splitflags |= (stplyr->mo->frame & FF_TRANSMASK);
+	}
+
+	if (cmd->driftturn > 400) // strong left turn
+		target = 2;
+	else if (cmd->driftturn < -400) // strong right turn
+		target = -2;
+	else if (cmd->driftturn > 0) // weak left turn
+		target = 1;
+	else if (cmd->driftturn < 0) // weak right turn
+		target = -1;
+	else // forward
+		target = 0;
+
+	if (encoremode)
+		target = -target;
+
+	if (pn < target)
+		pn++;
+	else if (pn > target)
+		pn--;
+
+	if (pn < 0)
+		splitflags |= V_FLIP; // right turn
+
+	target = abs(pn);
+	if (target > 2)
+		target = 2;
+
+	x <<= FRACBITS;
+	y <<= FRACBITS;
+
+	if (tn != cmd->driftturn/50)
+		tn -= (tn - (cmd->driftturn/50))/8;
+
+	if (dr != stplyr->kartstuff[k_drift]*16)
+		dr -= (dr - (stplyr->kartstuff[k_drift]*16))/8;
+
+	if (splitscreen == 1)
+	{
+		scale = (2*FRACUNIT)/3;
+		y += FRACUNIT/(vid.dupx < vid.dupy ? vid.dupx : vid.dupy); // correct a one-pixel gap on the screen view (not the basevid view)
+	}
+	else if (splitscreen)
+		scale = FRACUNIT/2;
+	else
+		scale = FRACUNIT;
+
+	if (stplyr->mo)
+	{
+		INT32 dsone = K_GetKartDriftSparkValue(stplyr);
+		INT32 dstwo = dsone*2;
+		INT32 dsthree = dstwo*2;
+
+#ifndef DONTLIKETOASTERSFPTWEAKS
+		{
+			const angle_t ang = R_PointToAngle2(0, 0, stplyr->rmomx, stplyr->rmomy) - stplyr->frameangle;
+			// yes, the following is correct. no, you do not need to swap the x and y.
+			fixed_t xoffs = -P_ReturnThrustY(stplyr->mo, ang, (BASEVIDWIDTH<<(FRACBITS-2))/2);
+			fixed_t yoffs = -(P_ReturnThrustX(stplyr->mo, ang, 4*FRACUNIT) - 4*FRACUNIT);
+
+			if (splitscreen)
+				xoffs = FixedMul(xoffs, scale);
+
+			xoffs -= (tn)*scale;
+			xoffs -= (dr)*scale;
+
+			if (stplyr->frameangle == stplyr->mo->angle)
+			{
+				const fixed_t mag = FixedDiv(stplyr->speed, 10*stplyr->mo->scale);
+
+				if (mag < FRACUNIT)
+				{
+					xoffs = FixedMul(xoffs, mag);
+					if (!splitscreen)
+						yoffs = FixedMul(yoffs, mag);
+				}
+			}
+
+			if (stplyr->mo->momz > 0) // TO-DO: Draw more of the kart so we can remove this if!
+				yoffs += stplyr->mo->momz/3;
+
+			if (encoremode)
+				x -= xoffs;
+			else
+				x += xoffs;
+			if (!splitscreen)
+				y += yoffs;
+		}
+
+		// drift sparks!
+		if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dsthree))
+			colmap = R_GetTranslationColormap(TC_RAINBOW, K_RainbowColor(), GTC_CACHE);
+		else if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dstwo))
+			colmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_KETCHUP, GTC_CACHE);
+		else if ((leveltime & 1) && (stplyr->kartstuff[k_driftcharge] >= dsone))
+			colmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_SAPPHIRE, GTC_CACHE);
+		else
+#endif
+		// invincibility/grow/shrink!
+		if (stplyr->mo->colorized && stplyr->mo->color)
+			colmap = R_GetTranslationColormap(TC_RAINBOW, stplyr->mo->color, GTC_CACHE);
+	}
+
+	V_DrawFixedPatch(x, y, scale, splitflags, kp_fpview[target], colmap);
+
+	pnum[stplyrnum]  = pn;
+	turn[stplyrnum]  = tn;
+	drift[stplyrnum] = dr;
+}
+
+// doesn't need to ever support 4p
+static void K_drawInput(void)
+{
+	INT32 offs, col;
+	static INT32 pn = 0;
+
+	if (!cv_showinput.value || (timeinmap <= 105)) // dont bother
+		return;
+
+	INT32 target = 0, splitflags = (V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_HUDTRANS);
+	INT32 x = (BASEVIDWIDTH - 32 + cv_wheel_xoffset.value)*FRACUNIT, y = (BASEVIDHEIGHT - 24 + cv_wheel_yoffset.value)*FRACUNIT;
+
+	const UINT8  hudcolor = K_GetHudColor();
+	const INT32  accent1 = splitflags|colortranslations[hudcolor][5];
+	const INT32  accent2 = splitflags|colortranslations[hudcolor][9];
+	const UINT8 *hudcolormap = R_GetTranslationColormap(0, hudcolor, GTC_CACHE);
+
+	const ticcmd_t *cmd = &stplyr->cmd;
+
+	if (timeinmap < 113)
+	{
+		INT32 count = ((INT32)(timeinmap) - 105);
+		INT32 frac = count > 0 && count < 6 ? R_GetHudUncap() << (FRACBITS - count - 11) : 0;
+
+		offs = 64*FRACUNIT;
+		while (count-- > 0)
+			offs >>= 1;
+		x += (offs < FRACUNIT ? 0 : offs) - frac;
+	}
+
+#define BUTTW 8
+#define BUTTH 11
+
+#define drawbutt(xoffs, butt, symb)\
+	if (cmd->buttons & butt)\
+	{\
+		offs = 2*FRACUNIT;\
+		col = accent1;\
+	}\
+	else\
+	{\
+		offs = 0;\
+		col = accent2;\
+		V_DrawFill((x + xoffs*FRACUNIT)>>FRACBITS, (y + BUTTH*FRACUNIT)>>FRACBITS, BUTTW-1, 2, splitflags|31);\
+	}\
+	V_DrawFill((x + xoffs*FRACUNIT)>>FRACBITS, (y+offs)>>FRACBITS, BUTTW-1, BUTTH, col);\
+	V_DrawFixedPatch(x + FRACUNIT + xoffs*FRACUNIT, y + offs + FRACUNIT, FRACUNIT, splitflags, tny_font[symb-HU_FONTSTART], NULL)
+
+	drawbutt(-2*BUTTW, BT_ACCELERATE, 'A');
+	drawbutt(  -BUTTW, BT_BRAKE,      'B');
+	drawbutt(       0, BT_DRIFT,      'D');
+	drawbutt(   BUTTW, BT_ATTACK,     'I');
+
+#undef drawbutt
+
+#undef BUTTW
+#undef BUTTH
+
+	y -= FRACUNIT;
+
+	if (cv_showinput.value == 2 || cv_showinput.value == 3)
+	{
+		INT32 axis;
+		INT32 hudforward = 0; // for the stick input display :chaosleep:
+		UINT8 *shadowcolormap = NULL;
+		const INT32 joyx = x>>FRACBITS;
+		const INT32 joyy = y>>FRACBITS;
+		static const INT32 joyxoffs = -8;
+		static const INT32 joyyoffs = -24;
+		const boolean usejoysprite  = (cv_showinput.value == 3 && joystickicon);
+
+		// O backing
+		if (usejoysprite)
+		{
+			shadowcolormap = R_GetTranslationColormap(0, SKINCOLOR_BLACK, GTC_CACHE);
+			V_DrawMappedPatch(joyx+joyxoffs, joyy+joyyoffs-1, splitflags, joybacking, hudcolormap);
+		}
+		else
+		{
+			V_DrawFill(joyx+joyxoffs, joyy+joyyoffs-1, 16, 16, splitflags|accent2);
+			V_DrawFill(joyx+joyxoffs, joyy+joyyoffs+15, 16, 1, splitflags|31);
+		}
+
+		// time for pain and suffering
+		// kart does not have anything we can get analogue joystick y axis values from
+		// during normal gameplay, so replicate shit here
+
+		// this is horrid but we cant get actual input in replays so uhh
+		if (demo.playback || !P_IsLocalPlayer(stplyr)) // yeah...........
+		{
+			hudforward = stplyr->kartstuff[k_throwdir] * KART_FULLTURN;
+		}
+		else
+		{
+			const boolean analogjoystickmove = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
+			const boolean gamepadjoystickmove = cv_usejoystick[stplyrnum].value && Joystick[stplyrnum].bGamepadStyle;
+			const UINT8 ssplayer = stplyrnum+1;
+
+			axis = JoyAxis(AXISAIM, ssplayer);
+
+			if (analogjoystickmove && axis != 0)
+			{
+				// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
+				hudforward -= ((axis * KART_FULLTURN) / (JOYAXISRANGE-1));
+			}
+			else
+			{
+				if (InputDown(gc_aimforward, ssplayer) || (gamepadjoystickmove && axis < 0))
+				{
+					hudforward += KART_FULLTURN;
+				}
+				if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
+				{
+					hudforward-= KART_FULLTURN;
+				}
+			}
+
+			hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN);
+		}
+
+		if (cmd->driftturn || hudforward)
+		{
+			INT16 turning = encoremode ? -cmd->driftturn : cmd->driftturn;
+
+			if (usejoysprite)
+			{
+				V_DrawMappedPatch(joyx+joyxoffs+3-turning/80, joyy+joyyoffs+2-hudforward/80, splitflags, joyknob, shadowcolormap);
+				V_DrawMappedPatch(joyx+joyxoffs+3-turning/64, joyy+joyyoffs+1-hudforward/64, splitflags, joyknob, hudcolormap);
+			}
+			else
+			{
+				// joystick hole
+				V_DrawFill(joyx+joyxoffs+5, joyy+joyyoffs+4, 6, 6, splitflags|accent1);
+				// joystick top and back
+				V_DrawFill(joyx+joyxoffs+3-turning/80, joyy+joyyoffs+2-hudforward/80, 10, 10, splitflags|31);
+				V_DrawFill(joyx+joyxoffs+3-turning/64, joyy+joyyoffs+1-hudforward/64, 10, 10, splitflags|accent1);
+			}
+		}
+		else
+		{
+			if (usejoysprite)
+			{
+				V_DrawMappedPatch(joyx+joyxoffs+3, joyy+joyyoffs+8, splitflags, joyshadow, shadowcolormap);
+				V_DrawMappedPatch(joyx+joyxoffs+3, joyy+joyyoffs+1, splitflags, joyknob, hudcolormap);
+			}
+			else
+			{
+				V_DrawFill(joyx+joyxoffs+3, joyy+joyyoffs+11, 10, 1, splitflags|accent2);
+				V_DrawFill(joyx+joyxoffs+3, joyy+joyyoffs+1, 10, 10,splitflags|accent1);
+			}
+		}
+	}
+	else
+	{
+		if (!cmd->driftturn) // no turn
+			target = 0;
+		else // turning of multiple strengths!
+		{
+			target = ((abs(cmd->driftturn) - 1)/125)+1;
+			if (target > 4)
+				target = 4;
+			if (cmd->driftturn < 0)
+				target = -target;
+		}
+
+		if (pn != target)
+		{
+			if (abs(pn - target) == 1)
+				pn = target;
+			else if (pn < target)
+				pn += 2;
+			else //if (pn > target)
+				pn -= 2;
+		}
+
+		if (pn < 0)
+		{
+			splitflags |= V_FLIP; // right turn
+			x -= FRACUNIT;
+		}
+
+		target = abs(pn);
+		if (target > 4)
+			target = 4;
+
+		V_DrawFixedPatch(x, y, FRACUNIT, splitflags, kp_inputwheel[target], hudcolormap);
+	}
+}
+
+static void K_drawChallengerScreen(void)
+{
+	// This is an insanely complicated animation.
+	static const UINT8 anim[52] = {
+		0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13, // frame 1-14, 2 tics: HERE COMES A NEW slides in
+		14,14,14,14,14,14, // frame 15, 6 tics: pause on the W
+		15,16,17,18, // frame 16-19, 1 tic: CHALLENGER approaches screen
+		19,20,19,20,19,20,19,20,19,20, // frame 20-21, 1 tic, 5 alternating: all text vibrates from impact
+		21,22,23,24 // frame 22-25, 1 tic: CHALLENGER turns gold
+	};
+	const UINT8 offset = min(52-1, (3*TICRATE)-mapreset);
+
+	V_DrawFadeScreen(0xFF00, 16); // Fade out
+	V_DrawScaledPatch(0, 0, 0, kp_challenger[anim[offset]]);
+}
+
+static void K_drawLapStartAnim(void)
+{
+	// This is an EVEN MORE insanely complicated animation.
+	const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation];
+	UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
+	INT32 vflags = V_SNAPTOTOP|V_HUDTRANS;
+
+	fixed_t slideout = max(0, 32*(((progress - 76)*FRACUNIT) + R_GetHudUncap()));
+	fixed_t slidein = max(0, 32*(((stplyr->kartstuff[k_lapanimation] - 76)*FRACUNIT) - R_GetHudUncap()));
+
+	// First, draw the emblem and hand
+	INT32 emblemx = (BASEVIDWIDTH << (FRACBITS - 1)) + slidein;
+	INT32 y = 48*FRACUNIT - slideout;
+
+	V_DrawFixedPatch(emblemx, y, FRACUNIT, vflags, kp_lapanim_emblem[modeattacking ? 1 : 0], colormap);
+
+	INT32 hand = stplyr->kartstuff[k_laphand];
+	if (hand >= 1 && hand <= 3)
+	{
+		y += 4*FRACUNIT - abs((int)(leveltime % 8)*FRACUNIT + R_GetHudUncap() - 4*FRACUNIT);
+		V_DrawFixedPatch(emblemx, y, FRACUNIT, vflags, kp_lapanim_hand[hand - 1], NULL);
+	}
+
+	// Then the text
+	INT32 leftx = 82*FRACUNIT - slideout;
+	INT32 rightx = 188*FRACUNIT + slideout;
+	y = 30*FRACUNIT;
+
+	if (stplyr->laps == (UINT8)(cv_numlaps.value - 1))
+	{
+		// FINAL
+		V_DrawFixedPatch(leftx - 20*FRACUNIT, y, FRACUNIT, vflags, kp_lapanim_final[min(progress/2, 10)], NULL);
+
+		// LAP
+		if (progress/2 - 12 >= 0)
+			V_DrawFixedPatch(rightx, y, FRACUNIT, vflags, kp_lapanim_lap[min(progress/2 - 12, 6)], NULL);
+	}
+	else
+	{
+		// LAP
+		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++)
+		{
+			int digit = lapnum[i] - '0';
+			int frame = min(2, progress/2 - 8 - (i*2));
+			if (frame >= 0)
+				V_DrawFixedPatch(rightx + (i*20*FRACUNIT), y, FRACUNIT, vflags, kp_lapanim_number[digit][frame], NULL);
+		}
+	}
+}
+
+void K_drawKartFreePlay(UINT32 flashtime)
+{
+	// no splitscreen support because it's not FREE PLAY if you have more than one player in-game
+	if ((flashtime % TICRATE) < TICRATE/2)
+		return;
+
+	V_DrawKartString((BASEVIDWIDTH - (LAPS_X+1)) - (12*9), // mirror the laps thingy
+		LAPS_Y+3, V_SNAPTOBOTTOM|V_SNAPTORIGHT|V_HUDTRANS, "FREE PLAY");
+}
+
+static void K_drawDistributionDebugger(void)
+{
+	patch_t *items[NUMKARTRESULTS] = {
+		kp_sadface[1],
+		kp_sneaker[1],
+		kp_rocketsneaker[1],
+		kp_invincibility[7],
+		kp_banana[1],
+		kp_eggman[1],
+		kp_orbinaut[4],
+		kp_jawz[1],
+		kp_mine[1],
+		kp_ballhog[1],
+		kp_selfpropelledbomb[1],
+		kp_grow[1],
+		kp_shrink[1],
+		kp_thundershield[1],
+		kp_hyudoro[1],
+		kp_pogospring[1],
+		kp_kitchensink[1],
+
+		kp_sneaker[1],
+		kp_banana[1],
+		kp_banana[1],
+		kp_orbinaut[4],
+		kp_orbinaut[4],
+		kp_jawz[1]
+	};
+	INT32 useodds = 0;
+	INT32 pingame = 0, bestbumper = 0;
+	INT32 i;
+	INT32 x = -9, y = -9;
+	boolean dontforcespb = false;
+	boolean spbrush = false;
+
+	if (stplyrnum != 0) // only for p1
+		return;
+
+	// The only code duplication from the Kart, just to avoid the actual item function from calculating pingame twice
+	for (i = 0; i < MAXPLAYERS; i++)
+	{
+		if (!playeringame[i] || players[i].spectator)
+			continue;
+		pingame++;
+		if (players[i].exiting)
+			dontforcespb = true;
+		if (players[i].kartstuff[k_bumper] > bestbumper)
+			bestbumper = players[i].kartstuff[k_bumper];
+	}
+
+	if (G_RaceGametype())
+		spbrush = (spbplace != -1 && stplyr->kartstuff[k_position] == spbplace+1);
+
+	useodds = K_FindUseodds(stplyr, 0, pingame, bestbumper, spbrush, dontforcespb);
+
+	for (i = 1; i < NUMKARTRESULTS; i++)
+	{
+		const INT32 itemodds = K_KartGetItemOdds(useodds, i, 0, spbrush);
+		if (itemodds <= 0)
+			continue;
+
+		V_DrawScaledPatch(x, y, V_HUDTRANS|V_SNAPTOTOP, items[i]);
+		V_DrawThinString(x+11, y+31, V_HUDTRANS|V_SNAPTOTOP, va("%d", itemodds));
+
+		// Display amount for multi-items
+		if (i >= NUMKARTITEMS)
+		{
+			INT32 amount;
+			switch (i)
+			{
+				case KRITEM_TENFOLDBANANA:
+					amount = 10;
+					break;
+				case KRITEM_QUADORBINAUT:
+					amount = 4;
+					break;
+				case KRITEM_DUALJAWZ:
+					amount = 2;
+					break;
+				default:
+					amount = 3;
+					break;
+			}
+			V_DrawString(x+24, y+31, V_ALLOWLOWERCASE|V_HUDTRANS|V_SNAPTOTOP, va("x%d", amount));
+		}
+
+		x += 32;
+		if (x >= 297)
+		{
+			x = -9;
+			y += 32;
+		}
+	}
+
+	V_DrawString(0, 0, V_HUDTRANS|V_SNAPTOTOP, va("USEODDS %d", useodds));
+}
+
+static void K_drawCheckpointDebugger(void)
+{
+	if (stplyrnum != 0) // only for p1
+		return;
+
+	if (stplyr->starpostnum >= (numstarposts - (numstarposts/2)))
+		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Can finish)", stplyr->starpostnum, numstarposts));
+	else
+		V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((numstarposts/2) + stplyr->starpostnum)));
+
+	V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck]));
+}
+
+// determines if gametype info (laps/bumpers) should be hidden
+static boolean K_DisableGametypeInfo(void)
+{
+	if (!LUA_HudEnabled(hud_gametypeinfo))
+	{
+		return true;
+	}
+
+#ifdef ROTSPRITE
+	if (splitscreen || (!cv_kartspeedometer.value))
+	{
+		// don't need to run checks if we're in splitscreen, or not using the speedometer
+		return false;
+	}
+
+	const UINT8 speedostyle = K_GetSpeedometerStyle();
+
+	if (G_RaceGametype())
+	{
+		if (speedostyle == SPEEDO_DIAL)
+			return true;
+	}
+	else if (G_BattleGametype())
+	{
+		if ((cv_battlespeedo.value) && (speedostyle == SPEEDO_DIAL))
+			return true;
+	}
+#endif
+
+	return false;
+}
+
+void K_drawKartHUD(void)
+{
+	boolean isfreeplay = false;
+	boolean battlefullscreen = false;
+	boolean freecam = camera[stplyrnum].freecam;	//disable some hud elements w/ freecam
+	boolean gameinfovisible = false;
+
+	// Define the X and Y for each drawn object
+	// This is handled by console/menu values
+	K_initKartHUD();
+
+	// Draw that fun first person HUD! Drawn ASAP so it looks more "real".
+	if (!camera[stplyrnum].chase && !freecam)
+		K_drawKartFirstPerson();
+
+	// Draw full screen stuff that turns off the rest of the HUD
+	if (mapreset && stplyrnum == 0)
+	{
+		K_drawChallengerScreen();
+		return;
+	}
+
+	battlefullscreen = ((G_BattleGametype())
+		&& (stplyr->exiting
+		|| (stplyr->kartstuff[k_bumper] <= 0
+		&& stplyr->kartstuff[k_comebacktimer]
+		&& comeback
+		&& stplyr->playerstate == PST_LIVE)));
+
+	if (!demo.title && (!battlefullscreen || splitscreen))
+	{
+		// Draw the CHECK indicator before the other items, so it's overlapped by everything else
+
+		if (LUA_HudEnabled(hud_check))	// delete lua when?
+		{
+			if (cv_kartcheck.value && !splitscreen && !players[displayplayers[0]].exiting && !freecam)
+				K_drawKartPlayerCheck();
+		}
+
+		// Draw WANTED status
+		if (G_BattleGametype())
+		{
+			if (LUA_HudEnabled(hud_wanted))
+				K_drawKartWanted();
+		}
+
+		if (cv_kartminimap.value)
+		{
+			if (LUA_HudEnabled(hud_minimap))
+				K_drawKartMinimap();
+		}
+	}
+
+	if (battlefullscreen && !freecam)
+	{
+		if (LUA_HudEnabled(hud_battlefullscreen))
+			K_drawBattleFullscreen();
+		return;
+	}
+
+	// Draw the item window
+	if (LUA_HudEnabled(hud_item) && !freecam)
+		K_drawKartItem();
+
+	if (cv_driftgauge.value && !modeattacking)
+	{
+		if (LUA_HudEnabled(hud_driftgauge))
+			K_drawDriftGauge();
+	}
+
+	if (cv_nametag.value)
+	{
+		if (LUA_HudEnabled(hud_nametags))
+			K_drawNameTags();
+	}
+
+	// If not splitscreen, draw...
+	if (!splitscreen && !demo.title)
+	{
+		tic_t realtime = stplyr->realtime;
+
+		if (cv_showlaptimes.value
+			&& stplyr->kartstuff[k_lapanimation]
+			&& !stplyr->exiting
+			&& stplyr->laptime[LAP_LAST] != 0
+			&& !midgamejoin) // due to vanilla compat, we cannot synch this oh well
+		{
+			if ((stplyr->kartstuff[k_lapanimation] / 5) & 1)
+			{
+				realtime = stplyr->laptime[LAP_LAST];
+			}
+			else
+			{
+				realtime = UINT32_MAX;
+			}
+		}
+
+		// Draw the timestamp
+		if (LUA_HudEnabled(hud_time))
+			K_drawKartTimestamp(realtime, TIME_X, TIME_Y, gamemap, 0);
+
+		if (!modeattacking)
+		{
+			// The top-four faces on the left
+			//if (LUA_HudEnabled(hud_minirankings))
+				isfreeplay = K_drawKartPositionFaces();
+		}
+	}
+
+	if (!stplyr->spectator && !freecam) // Bottom of the screen elements, don't need in spectate mode
+	{
+		// get gametype info visibility ahead of time
+		gameinfovisible = (!K_DisableGametypeInfo());
+
+		if (!(splitscreen || demo.title))
+		{
+			if (LUA_HudEnabled(hud_inputdisplay))
+				K_drawInput();
+		}
+
+		if (!demo.title && cv_showstats.value)
+		{
+			if (LUA_HudEnabled(hud_statdisplay))
+				K_drawKartStats();
+		}
+
+		if (demo.title) // Draw title logo instead in demo.titles
+		{
+			INT32 x = (BASEVIDWIDTH - 32)*FRACUNIT, y = 128*FRACUNIT, offs;
+			INT32 logoflags = V_SNAPTORIGHT|V_SNAPTOBOTTOM;
+
+			if (splitscreen == 3)
+			{
+				x = BASEVIDWIDTH/2 + 10;
+				y = BASEVIDHEIGHT/2 - 30;
+			}
+
+			if (timeinmap < 113)
+			{
+				INT32 count = ((INT32)(timeinmap) - 104);
+				INT32 frac = count > 0 ? R_GetHudUncap() << max(0, FRACBITS - count - 9) : 0;
+
+				offs = 256*FRACUNIT;
+				while (count-- > 0)
+					offs >>= 1;
+				x += offs - frac;
+			}
+
+			V_DrawSciencePatch(x - (54*FRACUNIT), y, logoflags, W_CachePatchName("TTKBANNR", PU_PATCH), FRACUNIT/4);
+			V_DrawSciencePatch(x - (54*FRACUNIT), y + (25*FRACUNIT), logoflags, W_CachePatchName("TTKART", PU_PATCH), FRACUNIT/4);
+		}
+		else if (G_RaceGametype()) // Race-only elements
+		{
+			// Draw the lap counter
+			if (gameinfovisible)
+				K_drawKartLaps();
+
+			if (!splitscreen)
+			{
+				// Draw the speedometer
+				// TODO: Make a better speedometer. << done :p
+				if (LUA_HudEnabled(hud_speedometer))
+					K_drawKartSpeedometer();
+			}
+
+			if (isfreeplay)
+				;
+			else if (!modeattacking)
+			{
+				// Draw the numerical position
+				if (LUA_HudEnabled(hud_position))
+					K_DrawKartPositionNum(stplyr->kartstuff[k_position]);
+			}
+		}
+		else if (G_BattleGametype()) // Battle-only
+		{
+			// Draw the hits left!
+			if (gameinfovisible)
+				K_drawKartBumpersOrKarma();
+
+			if ((!splitscreen) && cv_battlespeedo.value)
+			{
+				// Draw the speedometer but in battle
+				// TODO: Make a better speedometer. << done :p
+				if (LUA_HudEnabled(hud_speedometer))
+					K_drawKartSpeedometer();
+			}
+		}
+	}
+
+	// Draw the countdowns after everything else.
+	if (leveltime >= starttime-(3*TICRATE)
+		&& leveltime < starttime+TICRATE)
+		K_drawKartStartCountdown();
+	else if (racecountdown && (!splitscreen || !stplyr->exiting))
+	{
+		char *countstr = va("%d", racecountdown/TICRATE);
+
+		// Eeeh dunno if would be better to add another variable instead of LAPS_Y but this works too
+		int yoff = cv_dnft_yoffset.value - cv_laps_yoffset.value;
+		int xoff = cv_dnft_xoffset.value;
+
+		if (splitscreen > 1)
+			V_DrawCenteredString(BASEVIDWIDTH/4+xoff, LAPS_Y+1+yoff, K_calcSplitFlags(V_SNAPTOBOTTOM), countstr);
+		else
+		{
+			INT32 karlen = strlen(countstr)*6; // half of 12
+			V_DrawKartString((BASEVIDWIDTH/2)-karlen+xoff, LAPS_Y+3+yoff, K_calcSplitFlags(V_SNAPTOBOTTOM), countstr);
+		}
+	}
+
+	// Race overlays
+	if (G_RaceGametype() && !freecam)
+	{
+		if (stplyr->exiting)
+			K_drawKartFinish();
+		else if (stplyr->kartstuff[k_lapanimation] && !splitscreen && cv_showlapemblem.value)
+			K_drawLapStartAnim();
+	}
+
+	if (modeattacking || freecam) // everything after here is MP and debug only
+		return;
+
+	if (G_BattleGametype() && !splitscreen && (stplyr->kartstuff[k_yougotem] % 2)) // * YOU GOT EM *
+		V_DrawScaledPatch(BASEVIDWIDTH/2 - (kp_yougotem->width/2), 32, V_HUDTRANS, kp_yougotem);
+
+	// Draw FREE PLAY.
+	if (isfreeplay && cv_showfreeplay.value && !stplyr->spectator && timeinmap > 113)
+	{
+		if (LUA_HudEnabled(hud_freeplay))
+			K_drawKartFreePlay(leveltime);
+	}
+
+	if (cv_kartdebugdistribution.value)
+		K_drawDistributionDebugger();
+
+	if (cv_kartdebugcheckpoint.value)
+		K_drawCheckpointDebugger();
+
+	if (cv_kartdebugdirector.value)
+		K_DrawDirectorDebugger();
+
+	if (cv_kartdebugnodes.value)
+	{
+		UINT8 p;
+		for (p = 0; p < MAXPLAYERS; p++)
+			V_DrawString(8, 64+(8*p), V_YELLOWMAP, va("%d - %d (%dl)", p, playernode[p], players[p].cmd.latency));
+	}
+
+	if (cv_kartdebugcolorize.value && stplyr->mo && stplyr->mo->skin)
+	{
+		INT32 x = 0, y = 0;
+		UINT8 c;
+
+		for (c = 1; c < MAXSKINCOLORS; c++)
+		{
+			UINT8 *cm = R_GetTranslationColormap(TC_RAINBOW, c, GTC_CACHE);
+			V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT>>1, 0, facewantprefix[stplyr->skin], cm);
+
+			x += 16;
+			if (x > BASEVIDWIDTH-16)
+			{
+				x = 0;
+				y += 16;
+			}
+		}
+	}
+}
diff --git a/src/k_hud.h b/src/k_hud.h
new file mode 100644
index 000000000..3d2e478a7
--- /dev/null
+++ b/src/k_hud.h
@@ -0,0 +1,81 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2018-2020 by Kart Krew
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file  k_hud.h
+/// \brief HUD drawing functions exclusive to Kart
+
+#ifndef __K_HUD__
+#define __K_HUD__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "doomdef.h"
+#include "d_player.h" // Need for player_t
+#include "command.h"
+#include "r_defs.h"
+
+UINT8 K_GetHudColor(void);
+boolean K_UseColorHud(void);
+boolean K_UseHighResPortraits(void);
+patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum);
+
+void K_RegisterKartHudStuff(void);
+
+extern consvar_t cv_colorizedhud,
+				 cv_colorizeditembox,
+				 cv_colorizedhudcolor;
+
+extern consvar_t cv_darkitembox;
+extern consvar_t cv_biglaps;
+extern consvar_t cv_highresportrait;
+extern consvar_t cv_stat_xoffset, cv_stat_yoffset;
+extern consvar_t cv_showstats;
+extern consvar_t cv_fancyroulette;
+extern consvar_t cv_showlaptimes;
+extern consvar_t cv_battlespeedo;
+extern consvar_t cv_multiitemicon;
+extern consvar_t cv_huditemamount;
+
+#define NUMSPEEDOSTUFF 8
+extern CV_PossibleValue_t speedo_cons_t[NUMSPEEDOSTUFF];
+#define NUMDGAUGESTUFF 6
+extern CV_PossibleValue_t driftgaugestyle_cons_t[NUMDGAUGESTUFF];
+#define NUMINPUTDISPLAYSTUFF 5
+extern CV_PossibleValue_t inputdisplay_cons_t[NUMINPUTDISPLAYSTUFF];
+#define NUMMINIMAPDOTSTUFF 5
+extern CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
+
+const char *K_GetItemPatch(UINT8 item, boolean tiny);
+INT32 K_calcSplitFlags(INT32 snapflags);
+void K_LoadKartHUDGraphics(void);
+void K_drawKartHUD(void);
+void K_drawKartFreePlay(UINT32 flashtime);
+void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UINT8 mode);
+
+typedef struct
+{
+	INT32 x;
+	INT32 y;
+	INT32 flags;
+} drawinfo_t;
+
+patch_t *K_getItemBoxPatch(boolean small, boolean dark);
+patch_t *K_getItemMulPatch(boolean small);
+void K_getItemBoxDrawinfo(drawinfo_t *out);
+INT32 K_getMinimapTrans(void);
+void K_getLapsDrawinfo(drawinfo_t *out);
+void K_getMinimapDrawinfo(drawinfo_t *out);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+// =========================================================================
+#endif  // __K_HUD__
diff --git a/src/k_kart.c b/src/k_kart.c
index d1acade4c..62a84a039 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -10,7 +10,7 @@
 #include "command.h"
 #include "d_netcmd.h"
 #include "d_player.h"
-#include "hu_stuff.h"
+#include "k_hud.h"
 #include "g_game.h"
 #include "m_fixed.h"
 #include "m_random.h"
@@ -19,31 +19,21 @@
 #include "p_slopes.h"
 #include "r_defs.h"
 #include "r_draw.h"
-#include "r_local.h"
 #include "r_state.h"
 #include "r_things.h"
-#include "r_fps.h"
 #include "s_sound.h"
-#include "screen.h"
-#include "st_stuff.h"
 #include "tables.h"
 #include "v_video.h"
-#include "z_zone.h"
 #include "m_misc.h"
 #include "m_cond.h"
 #include "k_director.h"
 #include "k_kart.h"
-#include "f_finale.h"
-#include "lua_hud.h"	// For Lua hud checks
+#include "k_stats.h"
 #include "lua_hook.h"	// For MobjDamage and ShouldDamage
-#include "d_main.h"		// found_extra_kart
-
 #include "i_video.h"
 
-#ifdef HWRENDER
-#include "hardware/hw_main.h"
-#endif
 
+<<<<<<< HEAD
 // Not sure if thats best place for that
 static mobjtype_t stardust = 0;
 static mobjtype_t watertrailunderlay = 0, watertrail = 0;
@@ -69,57 +59,80 @@ void K_LoadExtraVFX(void)
 // Hud offset cvars
 #define IMPL_HUD_OFFSET_X(name)\
 consvar_t cv_##name##_xoffset = {"hud_" #name "_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+=======
+// extra colourisation stuff
+static CV_PossibleValue_t colorspeedlines_cons_t[] = {{0, "Off"}, {1, "Normal"}, {2, "+Driftcharge"}, {3, "Drift only"}, {0, NULL}};
+consvar_t cv_coloredspeedlines = {"colorizedspeedlines", "Off", CV_SAVE, colorspeedlines_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+>>>>>>> Saturn-Next
 
-#define IMPL_HUD_OFFSET_Y(name)\
-consvar_t cv_##name##_yoffset = {"hud_" #name "_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_coloredsneakertrail = {"sneakertrailcolor", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-#define IMPL_HUD_OFFSET(name)\
-IMPL_HUD_OFFSET_X(name)\
-IMPL_HUD_OFFSET_Y(name)
+consvar_t cv_bananajitter = {"bananadragjitter", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t bananthrowroll_cons_t[] = {{0, "Off"}, {1, "Throw"}, {2, "+Onground"}, {0, NULL}};
+consvar_t cv_bananthrowroll = {"bananthrowroll", "0", CV_SAVE, bananthrowroll_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-IMPL_HUD_OFFSET(item); // Item box
-IMPL_HUD_OFFSET(time); // Time
-IMPL_HUD_OFFSET(laps); // Number of laps
-IMPL_HUD_OFFSET(dnft); // Countdown (did not finish timer)
-IMPL_HUD_OFFSET(speed); // Speedometer
-IMPL_HUD_OFFSET(posi); // Position in race
-IMPL_HUD_OFFSET(face); // Mini rankings
-IMPL_HUD_OFFSET(stcd); // Starting countdown
-IMPL_HUD_OFFSET_Y(chek); // Check gfx
-IMPL_HUD_OFFSET(mini); // Minimap
-IMPL_HUD_OFFSET(want); // Wanted
-IMPL_HUD_OFFSET(stat); // Stats
+consvar_t cv_airsparks = {"airdriftsparks", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-#undef IMPL_HUD_OFFSET
-#undef IMPL_HUD_OFFSET_X
-#undef IMPL_HUD_OFFSET_Y
+consvar_t cv_playerblendeffects = {"playerblendeffects", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-//extra hud things
-consvar_t cv_showstats = {"showstats", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_showinput = {"showinput", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+// funn-E streeetch
+static CV_PossibleValue_t stretchfactor_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
+consvar_t cv_gravstretch = {"gravstretch", "MIN", CV_SAVE|CV_FLOAT, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-CV_PossibleValue_t speedo_cons_t[NUMSPEEDOSTUFF];
-consvar_t cv_newspeedometer = {"newspeedometer", "Default", CV_SAVE, speedo_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t slamsound_t[] = {{0, "Off"}, {1, "On"}, {0, NULL}};
+consvar_t cv_slamsound = {"slamsound", "1", CV_SAVE, slamsound_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+// sprite rotatuer stuff
+static CV_PossibleValue_t sloperolldist_cons_t[] = {
+	{512, "512"},	{768, "768"},
+	{1024, "1024"},	{1536, "1536"},	{2048, "2048"},
+	{3072, "3072"},	{4096, "4096"},	{6144, "6144"},
+	{8192, "8192"},	{0, "Infinite"},	{0, NULL}};
+consvar_t cv_sloperolldist = {"sloperolldist", "Infinite", CV_SAVE, sloperolldist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t sloperoll_cons_t[] = {{0, "Off"}, {1, "Players"}, {2, "Everything"}, {0, NULL}};
+consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL, sloperoll_cons_t, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_sparkroll = {"sparkroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_spinoutroll = {"spinoutroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 //hardcode saltyhop mhhm
-consvar_t cv_saltyhop = {"hardcodehop", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static void saltyhop_onchange(void);
+consvar_t cv_saltyhop = {"hardcodehop", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, saltyhop_onchange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_saltyhopsfx = {"hardcodehopsfx", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_saltysquish = {"hardcodehopsquish", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t saltyheight_t[] = {{FRACUNIT/4, "MIN"}, {2*FRACUNIT, "MAX"}, {0, NULL}};
+consvar_t cv_saltyheight = {"hardcodehopheight", "1", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, saltyheight_t, saltyhop_onchange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_saltyroll = {"hardcodehoproll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-//Colourized HUD
-consvar_t cv_colorizedhud = {"colorizedhud", "Off", CV_SAVE|CV_CALL, CV_OnOff, Saturn_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_colorizeditembox = {"colorizeditembox", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_squishdance = {"squishdance", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-static CV_PossibleValue_t HudColor_cons_t[MAXSKINCOLORS+1];
-consvar_t cv_colorizedhudcolor = {"colorizedhudcolor", "Skin Color", CV_SAVE, HudColor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t squishdancespeed_cons_t[] = {{20, "MIN"}, {280, "MAX"}, {0, NULL}};
+consvar_t cv_squishdancespeed = {"squishdance_speed", "140", CV_SAVE, squishdancespeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_highresportrait = {"highresportrait", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; //make char potraits use their high-res version instead
+static void saltyhop_onchange(void)
+{
+	// reset everything when toggling saltyhop
+	if (gamestate != GS_LEVEL)
+		return;
 
-consvar_t cv_darkitembox = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; //itembox gets a dark box with specific items
+	for (INT32 i = 0; i < MAXPLAYERS; i++)
+	{
+		player_t *player = &players[i];
 
-consvar_t cv_biglaps = {"biglaphud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; //here for ppl who dont want to make 2 more patches for their custom hud
+		if (!player || !playeringame[i] || P_MobjWasRemoved(player->mo))
+			continue;
 
-consvar_t cv_battlespeedo = {"battlespeedo", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; //toggle for showing the speedometer in battlemode
+		player->mo->salty_jump = false;
+		player->mo->salty_zoffset = 0;
+		player->mo->salty_momz = 0;
+
+		player->mo->salty_ready = false;
+		player->mo->salty_tapping = false;
+		player->mo->init_salty = false;
+	}
+}
+
+static boolean K_SpeedLinesShouldBlend(player_t *player);
 
 // SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H:
 // gamespeed is cc (0 for easy, 1 for normal, 2 for hard)
@@ -131,7 +144,6 @@ consvar_t cv_battlespeedo = {"battlespeedo", "Off", CV_SAVE, CV_OnOff, NULL, 0,
 // mapreset is set when enough players fill an empty server
 // nospectategrief is the players in-game needed to eliminate the person in last
 
-
 //{ SRB2kart Color Code
 
 #define SKIN_RAMP_LENGTH 16
@@ -504,6 +516,15 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 	{120, 120,  96,  96,  97,  98,  98,  99,  81,  81,  69,  71,  73,  75,  77,  79}, // SKINCOLOR_CSUPER5
 };
 
+//
+// Gives you a color to use for rainbow effects (like invincibility).
+// Return: Skincolor value.
+//
+UINT8 K_RainbowColor(void)
+{
+	return (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
+}
+
 // Define for getting accurate color brightness readings according to how the human eye sees them.
 // https://en.wikipedia.org/wiki/Relative_luminance
 // 0.2126 to red
@@ -520,10 +541,9 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
 */
 void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
 {
-	INT32 i;
+	INT32 i, j;
 	RGBA_t color;
 	UINT8 brightness;
-	INT32 j;
 	UINT8 colorbrightnesses[16];
 	UINT16 brightdif;
 	INT32 temp;
@@ -543,9 +563,11 @@ void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
 			dest_colormap[i] = (UINT8)i;
 			continue;
 		}
+
 		color = V_GetColor(i);
 		SETBRIGHTNESS(brightness, color.s.red, color.s.green, color.s.blue);
 		brightdif = 256;
+
 		for (j = 0; j < 16; j++)
 		{
 			temp = abs((INT16)brightness - (INT16)colorbrightnesses[j]);
@@ -570,26 +592,41 @@ void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
 */
 void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, boolean local)
 {
-	INT32 i;
-	INT32 starttranscolor;
+	INT32 i, starttranscolor;
 
 	// Handle a couple of simple special cases
-	if (skinnum == TC_BOSS
-		|| skinnum == TC_ALLWHITE
-		|| skinnum == TC_METALSONIC
-		|| skinnum == TC_BLINK
-		|| color == SKINCOLOR_NONE)
+	if (skinnum < TC_DEFAULT)
 	{
-		for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
+		switch (skinnum)
 		{
-			if (skinnum == TC_ALLWHITE)
-				dest_colormap[i] = 0;
-			else if (skinnum == TC_BLINK)
-				dest_colormap[i] = colortranslations[color][3];
-			else
-				dest_colormap[i] = (UINT8)i;
+			case TC_ALLWHITE:
+				memset(dest_colormap, 0, NUM_PALETTE_ENTRIES * sizeof(UINT8));
+				return;
+			case TC_RAINBOW:
+				if (color >= MAXTRANSLATIONS)
+					I_Error("Invalid skin color #%hu.", (UINT16)color);
+				if (color != SKINCOLOR_NONE)
+				{
+					K_RainbowColormap(dest_colormap, color);
+					return;
+				}
+				break;
+			case TC_BLINK:
+				if (color >= MAXTRANSLATIONS)
+					I_Error("Invalid skin color #%hu.", (UINT16)color);
+				if (color != SKINCOLOR_NONE)
+				{
+					memset(dest_colormap, colortranslations[color][3], NUM_PALETTE_ENTRIES * sizeof(UINT8));
+					return;
+				}
+				break;
+			default:
+				break;
 		}
 
+		for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
+			dest_colormap[i] = (UINT8)i;
+
 		// White!
 		if (skinnum == TC_BOSS)
 			dest_colormap[31] = 0;
@@ -598,13 +635,24 @@ void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, bo
 
 		return;
 	}
-	else if (skinnum == TC_RAINBOW)
+	else if (color == SKINCOLOR_NONE)
 	{
-		K_RainbowColormap(dest_colormap, color);
+		for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
+			dest_colormap[i] = (UINT8)i;
+
 		return;
 	}
 
-	starttranscolor = (skinnum != TC_DEFAULT) ? ((local) ? localskins : skins)[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;
+	if (color >= MAXTRANSLATIONS)
+		I_Error("Invalid skin color #%hu.", (UINT16)color);
+
+	if (skinnum < 0 && skinnum > TC_DEFAULT)
+		I_Error("Invalid translation colormap index %d.", skinnum);
+
+	starttranscolor = (skinnum != TC_DEFAULT) ? K_GetSkinArray(local)[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;
+
+	if (starttranscolor >= NUM_PALETTE_ENTRIES)
+		I_Error("Invalid startcolor #%d.", starttranscolor);
 
 	// Fill in the entries of the palette that are fixed
 	for (i = 0; i < starttranscolor; i++)
@@ -638,37 +686,57 @@ UINT8 K_GetKartColorByName(const char *name)
 	return 0;
 }
 
-UINT8 K_GetHudColor(void)
+//
+// returns the players skinnumber
+// accounts for localskins
+//
+INT32 K_GetSkinNum(player_t *player)
 {
-	if (cv_colorizedhud.value){
-		if (cv_colorizedhudcolor.value) return cv_colorizedhudcolor.value;
-	}
-	if (stplyr && P_IsLocalPlayer(stplyr) && gamestate == GS_LEVEL) return stplyr->skincolor;
-	return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value);
+	return player->localskin ? (player->localskin - 1) : player->skin;
 }
 
-boolean K_UseColorHud(void)
+//
+// returns the mobj skinnumber
+// accounts for localskins
+//
+INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local)
 {
-	return (cv_colorizedhud.value && clr_hud);
+	return skin - K_GetSkinArray(local);
+}
+
+//
+// returns the players skinnumber
+// accounts for localskins
+//
+skin_t *K_GetMobjSkin(const mobj_t *mobj)
+{
+	return mobj->localskin ? mobj->localskin : mobj->skin;
+}
+
+//
+// returns the skin array to use
+// accounts for localskins
+//
+skin_t *K_GetSkinArray(boolean local)
+{
+	return local ? localskins : skins;
+}
+
+//
+// returns the players skin
+// accounts for localskins
+//
+skin_t *K_GetPlayerSkin(player_t *player)
+{
+	return &K_GetSkinArray(player->skinlocal)[K_GetSkinNum(player)];
 }
 
 //}
 
 //{ SRB2kart Net Variables
 
-void K_RegisterKartStuff(void)
+void K_RegisterServerKartStuff(void)
 {
-	HudColor_cons_t[0].value = 0;
-	HudColor_cons_t[0].strvalue = "Skin Color";
-
-	for (INT32 i = 1; i < MAXSKINCOLORS; i++)
-	{
-		HudColor_cons_t[i].value = i;
-		HudColor_cons_t[i].strvalue = KartColor_Names[i];				// SRB2kart
-	}
-	HudColor_cons_t[MAXSKINCOLORS].value = 0;
-	HudColor_cons_t[MAXSKINCOLORS].strvalue = NULL;
-
 	CV_RegisterVar(&cv_sneaker);
 	CV_RegisterVar(&cv_rocketsneaker);
 	CV_RegisterVar(&cv_invincibility);
@@ -693,8 +761,6 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_quadorbinaut);
 	CV_RegisterVar(&cv_dualjawz);
 
-	CV_RegisterVar(&cv_kartminimap);
-	CV_RegisterVar(&cv_kartcheck);
 	CV_RegisterVar(&cv_kartinvinsfx);
 	CV_RegisterVar(&cv_kartspeed);
 	CV_RegisterVar(&cv_kartbumpers);
@@ -703,8 +769,8 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_kartencore);
 	CV_RegisterVar(&cv_kartvoterulechanges);
 	CV_RegisterVar(&cv_kartgametypepreference);
-	CV_RegisterVar(&cv_kartspeedometer);
 	CV_RegisterVar(&cv_kartvoices);
+	CV_RegisterVar(&cv_karthitemdialog);
 	CV_RegisterVar(&cv_karteliminatelast);
 	CV_RegisterVar(&cv_votetime);
 
@@ -717,67 +783,39 @@ void K_RegisterKartStuff(void)
 	CV_RegisterVar(&cv_kartdebugcheckpoint);
 	CV_RegisterVar(&cv_kartdebugnodes);
 	CV_RegisterVar(&cv_kartdebugcolorize);
+}
 
-#define REG_HUD_OFFSET_X(name)\
-	CV_RegisterVar(&cv_##name##_xoffset);
+// Registers kart client commands and variables.
+// Nothing needed for a dedicated server should be registered here.
+void K_RegisterClientKartStuff(void)
+{
+	K_RegisterKartHudStuff();
 
-#define REG_HUD_OFFSET_Y(name)\
-	CV_RegisterVar(&cv_##name##_yoffset);
+	// Colored speedlines
+	CV_RegisterVar(&cv_coloredspeedlines);
+	// Colored trails
+	CV_RegisterVar(&cv_coloredsneakertrail);
 
-#define REG_HUD_OFFSET(name)\
-	REG_HUD_OFFSET_X(name)\
-	REG_HUD_OFFSET_Y(name)
+	// makes banans do funny jitter jumpy when dragged
+	CV_RegisterVar(&cv_bananajitter);
+	CV_RegisterVar(&cv_bananthrowroll);
 
-	REG_HUD_OFFSET(item); // Item box
-	REG_HUD_OFFSET(time); // Time
-	REG_HUD_OFFSET(laps); // Number of laps
-	REG_HUD_OFFSET(dnft); // Countdown (did not finish timer)
-	REG_HUD_OFFSET(speed); // Speedometer
-	REG_HUD_OFFSET(posi); // Position in race
-	REG_HUD_OFFSET(face); // Mini rankings
-	REG_HUD_OFFSET(stcd); // Starting countdown
-	REG_HUD_OFFSET_Y(chek); // Check gfx
-	REG_HUD_OFFSET(mini); // Minimap
-	REG_HUD_OFFSET(want); // Wanted
-	REG_HUD_OFFSET(stat); // Stats
+	CV_RegisterVar(&cv_airsparks);
 
-#undef REG_HUD_OFFSET
-#undef REG_HUD_OFFSET_X
-#undef REG_HUD_OFFSET_Y
+	CV_RegisterVar(&cv_playerblendeffects);
 
-	CV_RegisterVar(&cv_showstats);
-	CV_RegisterVar(&cv_showinput);
-	CV_RegisterVar(&cv_newspeedometer);
-	
-	CV_RegisterVar(&cv_battlespeedo);
-	
 	CV_RegisterVar(&cv_saltyhop);
 	CV_RegisterVar(&cv_saltyhopsfx);
 	CV_RegisterVar(&cv_saltysquish);
-	
-	//Colourized HUD
-	CV_RegisterVar(&cv_colorizedhud);
-	CV_RegisterVar(&cv_colorizedhudcolor);
-	CV_RegisterVar(&cv_colorizeditembox);
-	
-	CV_RegisterVar(&cv_darkitembox);
-	
-	CV_RegisterVar(&cv_biglaps);
-	
-	CV_RegisterVar(&cv_highresportrait);
-	
-	CV_RegisterVar(&cv_slamsound);
-	
-	CV_RegisterVar(&cv_minihead);
-	CV_RegisterVar(&cv_showminimapnames);
-	CV_RegisterVar(&cv_showlapemblem);
-	
-	CV_RegisterVar(&cv_stagetitle);	
-	
-	CV_RegisterVar(&cv_lessflicker);
-	
-	CV_RegisterVar(&cv_mouseturn);
+	CV_RegisterVar(&cv_saltyheight);
+	CV_RegisterVar(&cv_saltyroll);
 
+	CV_RegisterVar(&cv_slamsound);
+
+	CV_RegisterVar(&cv_squishdance);
+	CV_RegisterVar(&cv_squishdancespeed);
+
+	CV_RegisterVar(&cv_mouseturn);
 }
 
 //}
@@ -944,7 +982,7 @@ static void K_KartGetItemResult(player_t *player, SINT8 getitem)
 	\return	void
 */
 
-static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush)
+INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush)
 {
 	const INT32 distvar = (64*14);
 	INT32 newodds;
@@ -1103,7 +1141,7 @@ static INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean sp
 
 //{ SRB2kart Roulette Code - Distance Based, no waypoints
 
-static INT32 K_FindUseodds(player_t *player, fixed_t mashed, INT32 pingame, INT32 bestbumper, boolean spbrush, boolean dontforcespb)
+INT32 K_FindUseodds(player_t *player, fixed_t mashed, INT32 pingame, INT32 bestbumper, boolean spbrush, boolean dontforcespb)
 {
 	const INT32 distvar = (64*14);
 	INT32 i;
@@ -1256,7 +1294,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
 		dontforcespb = true;
 
 	// This makes the roulette produce the random noises.
-	if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsDisplayPlayer(player) && !demo.freecam)
+	if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsDisplayPlayer(player))
 	{
 #define PLAYROULETTESND S_StartSound(NULL, sfx_itrol1 + ((player->kartstuff[k_itemroulette] / 3) % 8))
 		for (i = 0; i <= splitscreen; i++)
@@ -1290,7 +1328,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
 		//player->kartstuff[k_itemblinkmode] = 1;
 		player->kartstuff[k_itemroulette] = 0;
 		player->kartstuff[k_roulettetype] = 0;
-		if (P_IsDisplayPlayer(player) && !demo.freecam)
+		if (P_IsDisplayPlayer(player))
 			S_StartSound(NULL, sfx_itrole);
 		return;
 	}
@@ -1303,7 +1341,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
 		player->kartstuff[k_itemblinkmode] = 2;
 		player->kartstuff[k_itemroulette] = 0;
 		player->kartstuff[k_roulettetype] = 0;
-		if (P_IsDisplayPlayer(player) && !demo.freecam)
+		if (P_IsDisplayPlayer(player))
 			S_StartSound(NULL, sfx_dbgsal);
 		return;
 	}
@@ -1335,7 +1373,7 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
 		player->kartstuff[k_itemamount] = 1;
 	}
 
-	if (P_IsDisplayPlayer(player) && !demo.freecam)
+	if (P_IsDisplayPlayer(player))
 		S_StartSound(NULL, ((player->kartstuff[k_roulettetype] == 1) ? sfx_itrolk : (mashed ? sfx_itrolm : sfx_itrolf)));
 
 	player->kartstuff[k_itemblink] = TICRATE;
@@ -1536,6 +1574,10 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
 		fx->eflags |= MFE_VERTICALFLIP;
 	else
 		fx->eflags &= ~MFE_VERTICALFLIP;
+
+	if (cv_playerblendeffects.value)
+		fx->blendmode = AST_ADD;
+
 	P_SetScale(fx, mobj1->scale);
 
 	// Because this is done during collision now, rmomx and rmomy need to be recalculated
@@ -1621,7 +1663,7 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo)
 
 			// we will do essentially the same checks as above instead of bothering with top/bottom height of the FOF.
 			// Reminder that an FOF's floor is its bottom, silly!
-			if ( ((s2->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == cel)	// "floor" check
+			if (   ((s2->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == cel)	// "floor" check
 				|| ((s2->flags & SF_FLIPSPECIAL_CEILING) && (mo->z + mo->height) == flr) )	// "ceiling" check.
 
 				for (i = 2; i < 5; i++)	// check for sector special
@@ -1705,10 +1747,10 @@ static void K_SpawnDashDustRelease(player_t *player)
 	I_Assert(player->mo != NULL);
 	I_Assert(!P_MobjWasRemoved(player->mo));
 
-	if (!P_IsObjectOnGround(player->mo))
+	if (!player->speed && !player->kartstuff[k_startboost])
 		return;
 
-	if (!player->speed && !player->kartstuff[k_startboost])
+	if (!P_IsObjectOnGround(player->mo))
 		return;
 
 	travelangle = player->mo->angle;
@@ -1923,6 +1965,30 @@ static void K_RegularVoiceTimers(player_t *player)
 		player->kartstuff[k_tauntvoices] = 4*TICRATE;
 }
 
+static void K_PlayGenericCombatSound(mobj_t *source, mobj_t *other, sfxenum_t sfx_id)
+{
+	skin_t *skin = NULL;
+
+	// I HATE LOCALSKINS! I HATE LOCALSKINS! :AAAAAAAAAA:
+	if (source->player)
+	{
+		skin = K_GetPlayerSkin(source->player);
+	}
+
+	if (!skin)
+		return;
+
+	boolean alwaysHear = false;
+
+	if (cv_kartvoices.value && !P_MobjWasRemoved(other) && other->player != NULL)
+	{
+		alwaysHear = P_IsDisplayPlayer(other->player);
+		S_StartSound(alwaysHear ? NULL : source, skin->soundsid[S_sfx[sfx_id].skinsound]);
+	}
+
+	K_RegularVoiceTimers(source->player);
+}
+
 void K_PlayAttackTaunt(mobj_t *source)
 {
 	sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
@@ -1940,7 +2006,7 @@ void K_PlayAttackTaunt(mobj_t *source)
 void K_PlayBoostTaunt(mobj_t *source)
 {
 	sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
-	boolean tasteful = (!source->player || !source->player->kartstuff[k_tauntvoices]);
+	const boolean tasteful = (!source->player || !source->player->kartstuff[k_tauntvoices]);
 
 	if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2))
 		S_StartSound(source, sfx_kbost1+pick);
@@ -1953,8 +2019,6 @@ void K_PlayBoostTaunt(mobj_t *source)
 
 void K_PlayOvertakeSound(mobj_t *source)
 {
-	boolean tasteful = (!source->player || !source->player->kartstuff[k_voices]);
-
 	if (!G_RaceGametype()) // Only in race
 		return;
 
@@ -1962,6 +2026,8 @@ void K_PlayOvertakeSound(mobj_t *source)
 	if (leveltime < starttime+(10*TICRATE))
 		return;
 
+	const boolean tasteful = (!source->player || !source->player->kartstuff[k_voices]);
+
 	if (cv_kartvoices.value && (tasteful || cv_kartvoices.value == 2))
 		S_StartSound(source, sfx_kslow);
 
@@ -1971,10 +2037,34 @@ void K_PlayOvertakeSound(mobj_t *source)
 	K_RegularVoiceTimers(source->player);
 }
 
-void K_PlayHitEmSound(mobj_t *source)
+static boolean K_SetDelayedHitEm(player_t *player, player_t *victim)
+{
+	player_t *prevvictim = NULL;
+
+	if (player->hitemtimer)
+		prevvictim = &players[player->hitemvictim];
+
+	// We prioritize local players to hear "hit em" sfx
+	if (prevvictim && P_IsDisplayPlayer(prevvictim) && !P_IsDisplayPlayer(victim))
+		return false;
+
+	player->hitemtimer = TICRATE/2;
+	player->hitemvictim = victim - players;
+
+	return true;
+}
+
+void K_PlayHitEmSound(mobj_t *source, mobj_t *victim)
 {
 	if (cv_kartvoices.value)
+	{
+		if (cv_karthitemdialog.value
+			&& source->player && victim && victim->player
+			&& K_SetDelayedHitEm(source->player, victim->player))
+			return; // Don't call K_RegularVoiceTimers yet, we didn't do any sound
+
 		S_StartSound(source, sfx_khitem);
+	}
 	else
 		S_StartSound(source, sfx_s1c9); // The only lost gameplay functionality with voices disabled
 
@@ -1989,6 +2079,33 @@ void K_PlayPowerGloatSound(mobj_t *source)
 	K_RegularVoiceTimers(source->player);
 }
 
+static void K_HandleDelayedHitByEm(player_t *player)
+{
+	if (player->hitemtimer == 0)
+	{
+		return;
+	}
+
+	player->hitemtimer--;
+
+	if (player->hitemtimer == 0)
+	{
+		mobj_t *victim = NULL;
+
+		if (player->hitemvictim < MAXPLAYERS && playeringame[player->hitemvictim])
+		{
+			player_t *victimPlayer = &players[player->hitemvictim];
+
+			if (victimPlayer != NULL && victimPlayer->spectator == false)
+			{
+				victim = victimPlayer->mo;
+			}
+		}
+
+		K_PlayGenericCombatSound(player->mo, victim, sfx_khitem);
+	}
+}
+
 void K_MomentumToFacing(player_t *player)
 {
 	angle_t dangle = player->mo->angle - R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
@@ -2007,6 +2124,38 @@ void K_MomentumToFacing(player_t *player)
 	player->mo->momy = FixedMul(player->mo->momy - player->cmomy, player->mo->friction) + player->cmomy;
 }
 
+static inline fixed_t K_GetProjectileSpeed(void)
+{
+	switch (gamespeed)
+	{
+		case 0:
+			return 68*mapobjectscale; // Avg Speed is 34
+			break;
+		case 2:
+			return 96*mapobjectscale; // Avg Speed is 48
+			break;
+		default:
+			return 82*mapobjectscale; // Avg Speed is 41
+			break;
+	}
+}
+
+static inline fixed_t K_GetSneakerBoostSpeed(void)
+{
+	switch (gamespeed)
+	{
+		case 0:
+			return 53740+768;
+			break;
+		case 2:
+			return 17294+768;
+			break;
+		default:
+			return 32768;
+			break;
+	}
+}
+
 // sets k_boostpower, k_speedboost, and k_accelboost to whatever we need it to be
 static void K_GetKartBoostPower(player_t *player)
 {
@@ -2040,18 +2189,7 @@ static void K_GetKartBoostPower(player_t *player)
 
 	if (player->kartstuff[k_sneakertimer]) // Sneaker
 	{
-		switch (gamespeed)
-		{
-			case 0:
-				speedboost = max(speedboost, 53740+768);
-				break;
-			case 2:
-				speedboost = max(speedboost, 17294+768);
-				break;
-			default:
-				speedboost = max(speedboost, 32768);
-				break;
-		}
+		speedboost = max(speedboost, K_GetSneakerBoostSpeed());
 		accelboost = max(accelboost, 8*FRACUNIT); // + 800%
 	}
 
@@ -2125,6 +2263,7 @@ fixed_t K_GetKartSpeed(player_t *player, boolean doboostpower)
 
 	if (doboostpower)
 		return FixedMul(finalspeed, player->kartstuff[k_boostpower]+player->kartstuff[k_speedboost]);
+
 	return finalspeed;
 }
 
@@ -2161,10 +2300,14 @@ fixed_t K_3dKartMovement(player_t *player, boolean onground, fixed_t forwardmove
 {
 	fixed_t accelmax = 4000;
 	fixed_t newspeed, oldspeed, finalspeed;
-	fixed_t p_speed = K_GetKartSpeed(player, true);
-	fixed_t p_accel = K_GetKartAccel(player);
+	fixed_t p_speed, p_accel;
 
-	if (!onground) return 0; // If the player isn't on the ground, there is no change in speed
+	// If the player isn't on the ground, there is no change in speed
+	if (!onground)
+		return 0;
+
+	p_speed = K_GetKartSpeed(player, true);
+	p_accel = K_GetKartAccel(player);
 
 	// ACCELCODE!!!1!11!
 	oldspeed = R_PointToDist2(0, 0, player->rmomx, player->rmomy); // FixedMul(P_AproxDistance(player->rmomx, player->rmomy), player->mo->scale);
@@ -2236,14 +2379,19 @@ void K_SpawnBattlePoints(player_t *source, player_t *victim, UINT8 amount)
 	if (!source || !source->mo)
 		return;
 
-	if (amount == 1)
-		st = S_BATTLEPOINT1A;
-	else if (amount == 2)
-		st = S_BATTLEPOINT2A;
-	else if (amount == 3)
-		st = S_BATTLEPOINT3A;
-	else
-		return; // NO STATE!
+	switch (amount)
+	{
+		case 1:
+			st = S_BATTLEPOINT1A;
+			break;
+		case 2:
+			st = S_BATTLEPOINT2A;
+			break;
+		case 3:
+			st = S_BATTLEPOINT3A;
+		default:
+			return; // NO STATE!
+	}
 
 	pt = P_SpawnMobj(source->mo->x, source->mo->y, source->mo->z, MT_BATTLEPOINT);
 	P_SetTarget(&pt->target, source->mo);
@@ -2259,10 +2407,15 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
 	UINT8 scoremultiply = 1;
 	// PS: Inflictor is unused for all purposes here and is actually only ever relevant to Lua. It may be nil too.
 	boolean force = false;	// Used to check if Lua ShouldSpin should get us damaged reguardless of flashtics or heck knows what.
+<<<<<<< HEAD
 	UINT8 shouldForce = LUAh_ShouldSpin(player, inflictor, source);
+=======
+	UINT8 shouldForce = LUA_HookShouldSpin(player, inflictor, source);
+>>>>>>> Saturn-Next
 
 	if (P_MobjWasRemoved(player->mo))
 		return; // mobj was removed (in theory that shouldn't happen)
+
 	if (shouldForce == 1)
 		force = true;
 	else if (shouldForce == 2)
@@ -2292,11 +2445,13 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
 		}
 	}
 
-	if (LUAh_PlayerSpin(player, inflictor, source))	// Let Lua do its thing or overwrite if it wants to. Make sure to let any possible instashield happen because we didn't get "damaged" in this case.
+	if (LUA_HookPlayerSpin(player, inflictor, source))	// Let Lua do its thing or overwrite if it wants to. Make sure to let any possible instashield happen because we didn't get "damaged" in this case.
 		return;
 
+	K_StatPlayerHit(player, source ? source->player : NULL);
+
 	if (source && source != player->mo && source->player)
-		K_PlayHitEmSound(source);
+		K_PlayHitEmSound(source, player->mo);
 
 	//player->kartstuff[k_sneakertimer] = 0;
 	player->kartstuff[k_driftboost] = 0;
@@ -2373,7 +2528,7 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
 
 static void K_RemoveGrowShrink(player_t *player)
 {
-	if (player->mo && !P_MobjWasRemoved(player->mo))
+	if (!P_MobjWasRemoved(player->mo))
 	{
 		if (player->kartstuff[k_growshrinktimer] > 0) // Play Shrink noise
 			S_StartSound(player->mo, sfx_kc59);
@@ -2400,9 +2555,11 @@ void K_SquishPlayer(player_t *player, mobj_t *source, mobj_t *inflictor)
 	UINT8 scoremultiply = 1;
 	// PS: Inflictor is unused for all purposes here and is actually only ever relevant to Lua. It may be nil too.
 	boolean force = false;	// Used to check if Lua ShouldSquish should get us damaged reguardless of flashtics or heck knows what.
-	UINT8 shouldForce = LUAh_ShouldSquish(player, inflictor, source);
+	UINT8 shouldForce = LUA_HookShouldSquish(player, inflictor, source);
+
 	if (P_MobjWasRemoved(player->mo))
 		return; // mobj was removed (in theory that shouldn't happen)
+
 	if (shouldForce == 1)
 		force = true;
 	else if (shouldForce == 2)
@@ -2430,7 +2587,7 @@ void K_SquishPlayer(player_t *player, mobj_t *source, mobj_t *inflictor)
 		}
 	}
 
-	if (LUAh_PlayerSquish(player, inflictor, source))	// Let Lua do its thing or overwrite if it wants to. Make sure to let any possible instashield happen because we didn't get "damaged" in this case.
+	if (LUA_HookPlayerSquish(player, inflictor, source))	// Let Lua do its thing or overwrite if it wants to. Make sure to let any possible instashield happen because we didn't get "damaged" in this case.
 		return;
 
 	player->kartstuff[k_sneakertimer] = 0;
@@ -2496,7 +2653,7 @@ void K_SquishPlayer(player_t *player, mobj_t *source, mobj_t *inflictor)
 	if (player->mo->state != &states[S_KART_SQUISH]) // Squash
 		P_SetPlayerMobjState(player->mo, S_KART_SQUISH);
 
-	P_PlayRinglossSound(player->mo);
+	P_PlayRinglossSound(player->mo, source);
 
 	player->kartstuff[k_instashield] = 15;
 	if (cv_kartdebughuddrop.value && !modeattacking)
@@ -2511,10 +2668,11 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b
 	fixed_t upgoer;
 	UINT8 scoremultiply = 1;
 	boolean force = false;	// Used to check if Lua ShouldExplode should get us damaged reguardless of flashtics or heck knows what.
-	UINT8 shouldForce = LUAh_ShouldExplode(player, inflictor, source);
+	UINT8 shouldForce = LUA_HookShouldExplode(player, inflictor, source);
 
 	if (P_MobjWasRemoved(player->mo))
 		return; // mobj was removed (in theory that shouldn't happen)
+
 	if (shouldForce == 1)
 		force = true;
 	else if (shouldForce == 2)
@@ -2544,11 +2702,11 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b
 		}
 	}
 
-	if (LUAh_PlayerExplode(player, inflictor, source))	// Same thing. Also make sure to let Instashield happen blah blah
+	if (LUA_HookPlayerExplode(player, inflictor, source))	// Same thing. Also make sure to let Instashield happen blah blah
 		return;
 
 	if (source && source != player->mo && source->player)
-		K_PlayHitEmSound(source);
+		K_PlayHitEmSound(source, player->mo);
 
 	player->kartstuff[k_sneakertimer] = 0;
 	player->kartstuff[k_driftboost] = 0;
@@ -2600,6 +2758,7 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b
 	player->powers[pw_flashing] = K_GetKartFlashing(player);
 
 	upgoer = (18*mapobjectscale*P_MobjFlip(player->mo));
+
 	if (player->mo->eflags & MFE_UNDERWATER)
 		upgoer = (117 * upgoer) / 200;
 
@@ -2629,12 +2788,11 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b
 	if (player->mo->state != &states[S_KART_SPIN])
 		P_SetPlayerMobjState(player->mo, S_KART_SPIN);
 
-	P_PlayRinglossSound(player->mo);
+	P_PlayRinglossSound(player->mo, source);
 
 	if (P_IsLocalPlayer(player))
 	{
-		quake.intensity = 64*FRACUNIT;
-		quake.time = 5;
+		P_StartQuake(5, 64<<FRACBITS, 0);
 	}
 
 	player->kartstuff[k_instashield] = 15;
@@ -2727,16 +2885,9 @@ void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32
 	TVector v;
 	TVector *res;
 	fixed_t finalx, finaly, finalz, dist;
-	//mobj_t hoopcenter;
 	angle_t degrees, fa, closestangle;
 	fixed_t mobjx, mobjy, mobjz;
 
-	//hoopcenter.x = x;
-	//hoopcenter.y = y;
-	//hoopcenter.z = z;
-
-	//hoopcenter.z = z - mobjinfo[type].height/2;
-
 	degrees = FINEANGLES/number;
 
 	closestangle = 0;
@@ -2794,7 +2945,7 @@ void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32
 		mobj->momy = FixedMul(FixedDiv(mobjy - y, dist), FixedDiv(dist, 6*FRACUNIT));
 		mobj->momz = FixedMul(FixedDiv(mobjz - z, dist), FixedDiv(dist, 6*FRACUNIT));
 
-		if (source && !P_MobjWasRemoved(source))
+		if (!P_MobjWasRemoved(source))
 			P_SetTarget(&mobj->target, source);
 	}
 }
@@ -2982,6 +3133,29 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
 	return NULL;
 }
 
+static UINT16 K_DriftSparkColor(player_t *player, INT32 charge)
+{
+	UINT16 color = SKINCOLOR_NONE;
+
+	if (charge >= K_GetKartDriftSparkValue(player)*4)
+	{
+		color = K_RainbowColor();
+	}
+	else if (charge >= K_GetKartDriftSparkValue(player)*2)
+	{
+		if (charge <= (K_GetKartDriftSparkValue(player)*2)+(24*3))
+			color = SKINCOLOR_RASPBERRY; // transition
+		else
+			color = SKINCOLOR_KETCHUP;
+	}
+	else
+	{
+		color = SKINCOLOR_SAPPHIRE;
+	}
+
+	return color;
+}
+
 #define DRIFTSPARKGROWTICS 8
 
 static void K_SpawnDriftSparks(player_t *player)
@@ -2999,7 +3173,10 @@ static void K_SpawnDriftSparks(player_t *player)
 	if (leveltime % 2 == 1)
 		return;
 
-	if (!P_IsObjectOnGround(player->mo))
+	const boolean onground = P_IsObjectOnGround(player->mo);
+
+	// kinda sketchy
+	if (!cv_airsparks.value && !onground)
 		return;
 
 	if (!player->kartstuff[k_drift] || player->kartstuff[k_driftcharge] < K_GetKartDriftSparkValue(player))
@@ -3009,55 +3186,37 @@ static void K_SpawnDriftSparks(player_t *player)
 
 	for (i = 0; i < 2; i++)
 	{
-		UINT8 pindex;
 		fixed_t driftExtraScale = 0;
-		newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(32*FRACUNIT, player->mo->scale));
-		newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(32*FRACUNIT, player->mo->scale));
+
+		angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135);
+		fixed_t smolscale = FixedMul(32*FRACUNIT, player->mo->scale);
+
+		newx = player->mo->x + P_ReturnThrustX(player->mo, thrustangle, smolscale);
+		newy = player->mo->y + P_ReturnThrustY(player->mo, thrustangle, smolscale);
 		spark = P_SpawnMobj(newx, newy, player->mo->z, MT_DRIFTSPARK);
 
+		spark->islocal = cv_airsparks.value && !onground;
+
 		P_SetTarget(&spark->target, player->mo);
 		spark->angle = travelangle-(ANGLE_45/5)*player->kartstuff[k_drift];
 
 		// scale increase while driftspark level gained timer is running
-
-		// hack to find the correct player number
-		for (pindex = 0; pindex < MAXPLAYERS; pindex++)
-		{
-			if (player == &players[pindex])
-			{
-				driftExtraScale = FixedDiv(driftsparkGrowTimer[pindex], DRIFTSPARKGROWTICS);
-				break;
-			}
-		}
+		driftExtraScale = FixedDiv(player->driftsparkGrowTimer, DRIFTSPARKGROWTICS);
 		spark->destscale = FixedMul(player->mo->scale, FRACUNIT + FixedMul(driftExtraScale, cv_driftsparkpulse.value));
-		P_SetScale(spark, FixedMul(player->mo->scale, FRACUNIT + FixedMul(driftExtraScale, cv_driftsparkpulse.value)));
+		P_SetScale(spark, spark->destscale); // why not use what we calculated above?
 
 		spark->momx = player->mo->momx/2;
 		spark->momy = player->mo->momy/2;
 		//spark->momz = player->mo->momz/2;
 
 		// rotate the sparks based on pitch and roll; it just looks neat
-		if (cv_sparkroll.value == 1)
+		if (cv_sparkroll.value)
 		{
 			spark->slopepitch = player->mo->slopepitch;
 			spark->sloperoll = player->mo->sloperoll;
 		}
 
-		if (player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(player)*4)
-		{
-			spark->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
-		}
-		else if (player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(player)*2)
-		{
-			if (player->kartstuff[k_driftcharge] <= (K_GetKartDriftSparkValue(player)*2)+(24*3))
-				spark->color = SKINCOLOR_RASPBERRY; // transition
-			else
-				spark->color = SKINCOLOR_KETCHUP;
-		}
-		else
-		{
-			spark->color = SKINCOLOR_SAPPHIRE;
-		}
+		spark->color = K_DriftSparkColor(player, player->kartstuff[k_driftcharge]);
 
 		if ((player->kartstuff[k_drift] > 0 && player->cmd.driftturn > 0) // Inward drifts
 			|| (player->kartstuff[k_drift] < 0 && player->cmd.driftturn < 0))
@@ -3080,6 +3239,9 @@ static void K_SpawnDriftSparks(player_t *player)
 				P_SetMobjState(spark, S_DRIFTSPARK_A1);
 		}
 
+		if (cv_playerblendeffects.value && player->kartstuff[k_sneakertimer])
+			spark->blendmode = AST_ADD;
+
 		K_MatchGenericExtraFlags(spark, player->mo);
 	}
 }
@@ -3092,7 +3254,6 @@ static void K_SpawnAIZDust(player_t *player)
 	angle_t travelangle;
 
 	I_Assert(player != NULL);
-	I_Assert(player->mo != NULL);
 	I_Assert(!P_MobjWasRemoved(player->mo));
 
 	if (leveltime % 2 == 1)
@@ -3105,8 +3266,11 @@ static void K_SpawnAIZDust(player_t *player)
 	//S_StartSound(player->mo, sfx_s3k47);
 
 	{
-		newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle - (player->kartstuff[k_aizdriftstrat]*ANGLE_45), FixedMul(24*FRACUNIT, player->mo->scale));
-		newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle - (player->kartstuff[k_aizdriftstrat]*ANGLE_45), FixedMul(24*FRACUNIT, player->mo->scale));
+		angle_t thrustangle = (travelangle - (player->kartstuff[k_aizdriftstrat]*ANGLE_45));
+		fixed_t smolscale = FixedMul(24*FRACUNIT, player->mo->scale);
+
+		newx = player->mo->x + P_ReturnThrustX(player->mo, thrustangle, smolscale);
+		newy = player->mo->y + P_ReturnThrustY(player->mo, thrustangle, smolscale);
 		spark = P_SpawnMobj(newx, newy, player->mo->z, MT_AIZDRIFTSTRAT);
 
 		spark->angle = travelangle+(player->kartstuff[k_aizdriftstrat]*ANGLE_90);
@@ -3120,192 +3284,249 @@ static void K_SpawnAIZDust(player_t *player)
 	}
 }
 
-static void K_StretchPlayerGravity(player_t *p)
+#define MAXSTRETCHDIV 17476977
+
+static void K_StretchPlayerGravity(player_t *player)
 {
-    fixed_t mos = FRACUNIT;
-    fixed_t rzs = abs(p->mo->momz);
-    fixed_t zspd = abs(rzs/mos);
-	fixed_t stretchScaleFactor = 0;
-	fixed_t rzsDiv = 1;
-	fixed_t slamDiv = 1;
+	I_Assert(player != NULL);
+	I_Assert(!P_MobjWasRemoved(player->mo));
 
-    fixed_t dxs = p->mo->realxscale;
-    fixed_t dys = p->mo->realyscale;
-    //boolean gravSlamming = false;
-    //fixed_t impactFactor = 0;
-	stretchScaleFactor = FixedDiv(FRACUNIT*60, cv_gravstretch.value);
+	mobj_t *pmo = player->mo;
 
-	if (stretchScaleFactor > 17476977)
-		rzsDiv = 0;
-	else
-		rzsDiv = FixedDiv(rzs, stretchScaleFactor);
+	fixed_t tempxscale = pmo->realxscale;
+	fixed_t tempyscale = pmo->realyscale;
 
-	//CONS_Printf(M_GetText("div: %d, scale factor: %d, stretch value: %d\n"), rzsDiv, stretchScaleFactor, cv_gravstretch.value);
+	const fixed_t stretchScaleFactor = min(FixedDiv(FRACUNIT*60, cv_gravstretch.value), MAXSTRETCHDIV);
 
-    I_Assert(p != NULL);
-	I_Assert(p->mo != NULL);
-	I_Assert(!P_MobjWasRemoved(p->mo));
-	
-	if (p->mo->slamsoundtimer)
-		p->mo->slamsoundtimer--;
+	if (pmo->slamsoundtimer)
+		pmo->slamsoundtimer--;
 
-	if (cv_slamsound.value && (p->mo->eflags & MFE_JUSTHITFLOOR) && p->mo->stretchslam > 4*mos && !p->mo->slamsoundtimer)
+	if (!P_IsObjectOnGround(pmo))
 	{
-		S_StartSound(p->mo, sfx_s3k4c);
-		p->mo->slamsoundtimer = TICRATE;
+		fixed_t pzmom = abs(pmo->momz);
+		const fixed_t stretchDiv = FixedDiv(pzmom, stretchScaleFactor);
+
+		if (abs(pzmom/FRACUNIT) != 0)
+		{
+			if (((tempxscale-(stretchDiv))) > (tempxscale/5))
+			{
+				pmo->spritexscale = (tempxscale - stretchDiv);
+				pmo->stretchslam = pzmom;
+			}
+			else
+				pmo->spritexscale = (tempxscale/5);
+
+			pmo->spriteyscale = (tempyscale + ((stretchDiv*2)/3));
+		}
 	}
+	else if (pmo->stretchslam > 0)
+	{
+		// Funni slam sound when landing
+		if (cv_slamsound.value && (pmo->eflags & MFE_JUSTHITFLOOR) && !pmo->slamsoundtimer && (pmo->stretchslam > 4*FRACUNIT))
+		{
+			S_StartSound(pmo, sfx_s3k4c);
+			pmo->slamsoundtimer = TICRATE;
+		}
 
-    if (!P_IsObjectOnGround(p->mo))
-    {
-        if (zspd != 0)
-        {
-            if (((dxs-(rzsDiv))) > (dxs/5))
-            {
-                p->mo->spritexscale = ((dxs-(rzsDiv)));
-                p->mo->stretchslam = rzs;
-            }
-            else
-                p->mo->spritexscale = (dxs/5);
+		const fixed_t slamDiv = FixedDiv(pmo->stretchslam, stretchScaleFactor);
 
-            p->mo->spriteyscale = (dys+((rzsDiv*2)/3));
-        }
-        else
-        {
-            p->mo->spritexscale = (dxs);
-            p->mo->spriteyscale = (dys);
-        }
-    }
-    else
-    {
-		if (stretchScaleFactor > 17476977)
-			slamDiv = 0;
-		else
-			slamDiv = FixedDiv(p->mo->stretchslam, stretchScaleFactor);
-		
-        p->mo->spritexscale = (dxs+(((slamDiv*2)/3)*2));
-        p->mo->spriteyscale = (dys-(slamDiv));
-        if (p->mo->stretchslam > 0)
-            p->mo->stretchslam -= (4*mos);
-        else
-            p->mo->stretchslam = 0;
-    }
+		pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2));
+		pmo->spriteyscale = (tempyscale - slamDiv);
+		pmo->stretchslam -= (4*FRACUNIT);
+	}
+	else
+		pmo->stretchslam = 0;
 }
 
-static void K_QuiteSaltyHop(player_t *p) 
+// copy pasted from above
+// but here to allow salty squish to work when gravstretch is disabled
+static void K_SaltySquish(player_t *player)
 {
+	I_Assert(player != NULL);
+	I_Assert(!P_MobjWasRemoved(player->mo));
+
+	mobj_t *pmo = player->mo;
+
+	fixed_t tempxscale = pmo->realxscale;
+	fixed_t tempyscale = pmo->realyscale;
+
+	if (pmo->stretchslam > 0)
+	{
+		const fixed_t slamDiv = FixedDiv(pmo->stretchslam, 3932160); // stretchScaleFactor = FixedDiv(FRACUNIT*60, FRACUNIT)
+
+		pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2));
+		pmo->spriteyscale = (tempyscale - slamDiv);
+		pmo->stretchslam -= (4*FRACUNIT);
+	}
+	else
+		pmo->stretchslam = 0;
+}
+
+static void K_QuiteSaltyHop(player_t *player)
+{
+	if (!cv_saltyhop.value)
+		return;
+
 	// what the fuck is this haya
-	fixed_t mos = FRACUNIT; // doesnt work correctly if it isnt :/
+	//fixed_t mos = FRACUNIT; // doesnt work correctly if it isnt :/
+	mobj_t *pmo = player->mo;
+	const boolean onground = P_IsObjectOnGround(pmo);
 
 	// ready?
-	if (!p->kartstuff[k_jmp]) {
-		p->mo->salty_ready = true;
-		p->mo->salty_tapping = false;
-	} else if (p->mo->salty_ready) {
-		p->mo->salty_ready = false;
-		p->mo->salty_tapping = true;
-	} else {
-		p->mo->salty_tapping = false;
+	if (!player->kartstuff[k_jmp])
+	{
+		pmo->salty_ready = true;
+		pmo->salty_tapping = false;
+	}
+	else if (pmo->salty_ready)
+	{
+		pmo->salty_ready = false;
+		pmo->salty_tapping = true;
+	}
+	else
+	{
+		pmo->salty_tapping = false;
 	}
 
 	// GO!
-	if (!p->mo->init_salty) {
-		p->mo->salty_jump = false;
-		p->mo->salty_zoffset = 0;
-		p->mo->salty_momz = 0;
-		p->mo->init_salty = true;
-	}	
-	else if ((p->mo->salty_jump)) {
-		if (p->mo->eflags & MFE_JUSTHITFLOOR) {
-			p->mo->salty_zoffset = 0;
-		} else if (P_IsObjectOnGround(p->mo)) {
-			p->mo->salty_zoffset += p->mo->salty_momz;
-			p->mo->salty_momz -= (mos*3/2);
-		} else {
-			p->mo->salty_zoffset *= (49/50)*mos;
-			p->mo->salty_momz = 0;
-		}
-		if (p->mo->salty_zoffset <= 0) {
-			if (!(p->mo->eflags & MFE_JUSTHITFLOOR) && P_IsObjectOnGround(p->mo) && cv_saltyhopsfx.value)
-				S_StartSound(p->mo, sfx_s268);
-			p->mo->salty_jump = false;
-			p->mo->salty_zoffset = 0;
-			p->mo->salty_momz = 0;
-			// shlamma damma
-			p->mo->stretchslam += cv_saltysquish.value ? (8*mos) : 0;
-		} else if (p->mo->salty_zoffset >= 0 && cv_saltysquish.value) {
-			// goofy ahh hack
-			p->mo->spriteyscale += (mos/8);
-			p->mo->spritexscale -= (mos/8);
-		}
-		p->mo->spriteyoffset = p->mo->salty_zoffset;
-		if (S_SoundPlaying(p->mo, sfx_screec))
-			S_StopSoundByID(p->mo, sfx_screec);
-		if (S_SoundPlaying(p->mo, sfx_drift))
-			S_StopSoundByID(p->mo, sfx_drift);
+	if (!pmo->init_salty)
+	{
+		pmo->salty_jump = false;
+		pmo->salty_zoffset = 0;
+		pmo->salty_momz = 0;
+		pmo->init_salty = true;
 	}
-	else if (p->mo->salty_tapping && P_IsObjectOnGround(p->mo) && !p->kartstuff[k_spinouttimer] && !p->kartstuff[k_squishedtimer]) {
-		p->mo->salty_jump = true;
-		p->mo->salty_zoffset = 0;
-		p->mo->salty_momz = 6*mos;
-		if (cv_saltyhopsfx.value) 
-			S_StartSound(p->mo, sfx_s25a);
+	else if (pmo->salty_jump)
+	{
+		if (pmo->eflags & MFE_JUSTHITFLOOR)
+		{
+			pmo->salty_zoffset = 0;
+		}
+		else if (onground)
+		{
+			pmo->salty_zoffset += pmo->salty_momz;
+			pmo->salty_momz -= (FRACUNIT*3/2);
+		}
+		else
+		{
+			pmo->salty_zoffset *= (49/50)*FRACUNIT;
+			pmo->salty_momz = 0;
+		}
+
+		if (pmo->salty_zoffset <= 0)
+		{
+			if (cv_saltyhopsfx.value && !(pmo->eflags & MFE_JUSTHITFLOOR) && onground)
+				S_StartSound(pmo, sfx_s268);
+			pmo->salty_jump = false;
+			pmo->salty_zoffset = 0;
+			pmo->salty_momz = 0;
+			// shlamma damma
+			if (cv_saltysquish.value)
+				pmo->stretchslam += 8*FRACUNIT;
+		}
+		else if (cv_saltysquish.value && pmo->salty_zoffset >= 0)
+		{
+			// goofy ahh hack
+			pmo->spriteyscale += (FRACUNIT/8);
+			pmo->spritexscale -= (FRACUNIT/8);
+		}
+
+		pmo->spriteyoffset = FixedMul(pmo->salty_zoffset, cv_saltyheight.value);
+
+		if (cv_saltyhopsfx.value)
+		{
+			if (S_SoundPlaying(pmo, sfx_screec))
+				S_StopSoundByID(pmo, sfx_screec);
+			if (S_SoundPlaying(pmo, sfx_drift))
+				S_StopSoundByID(pmo, sfx_drift);
+		}
+	}
+	else if (pmo->salty_tapping && onground && !player->kartstuff[k_spinouttimer] && !player->kartstuff[k_squishedtimer])
+	{
+		pmo->salty_jump = true;
+		pmo->salty_zoffset = 0;
+		pmo->salty_momz = 6*FRACUNIT;
+		if (cv_saltyhopsfx.value)
+			S_StartSound(pmo, sfx_s25a);
 	}
 }
 
-#define SLOPEROLL_DIV 3
-
-void K_RollMobjBySlopes(mobj_t* mo, boolean usedistance)
+boolean K_CheckSlopeRollDist(mobj_t *mobj)
 {
-    I_Assert(mo->subsector != NULL);
-    I_Assert(mo->subsector->sector != NULL);
+	const boolean usedistance = cv_sloperolldist.value && !splitscreen;
 
-    angle_t an;
-    boolean flip = mo->eflags & MFE_VERTICALFLIP;
-    fixed_t m_dist = R_PointToDist(mo->x, mo->y);
-    fixed_t rolldist = cv_sloperolldist.value * mapobjectscale;
+	// always roll from any distance
+	if (!usedistance)
+		return true;
 
-    // lifted from hw_md2
-    if (mo->standingslope)
-    {
-        fixed_t tempz = mo->standingslope->normal.z;
-        fixed_t tempy = mo->standingslope->normal.y;
-        fixed_t tempx = mo->standingslope->normal.x;
-        fixed_t tempangle = -(R_PointToAngle2(
-            0, 0, FixedSqrt(FixedMul(tempy, tempy) + FixedMul(tempz, tempz)), tempx));
+	const fixed_t rolldist = (cv_sloperolldist.value * mapobjectscale);
+	const fixed_t m_dist = (R_QuickCamDist(mobj->x, mobj->y) << FRACBITS);
 
-        // admittedly this is a very hacky way to do the pitch and roll easing
+	return (m_dist <= rolldist);
+}
 
-        // pitch
-        if ((!usedistance) || (m_dist <= (rolldist)))
-        {
-            an = (INT32)((angle_t)tempangle - mo->pitch_sprite) / SLOPEROLL_DIV;
+// checks if slope rotation should be applied
+boolean K_ShouldSlopeRoll(mobj_t *mobj)
+{
+	if (!cv_sloperoll.value || (!mobj->player && cv_sloperoll.value != 2)) // not a player and sloperoll not set to "Everything"
+		return false;
 
-            mo->pitch_sprite = an ? mo->pitch_sprite + an : (angle_t)tempangle;
-        }
-        else
-            mo->pitch_sprite = FixedAngle(0);
+	// seeing a character rotate mid-hop looks really janky
+	if (!cv_saltyroll.value && mobj->player && mobj->player->mo->salty_jump)
+		return false;
 
-        mo->slopepitch = flip ? InvAngle(mo->pitch_sprite) : mo->pitch_sprite;
+	return K_CheckSlopeRollDist(mobj);
+}
 
-        // roll
-        tempangle = (R_PointToAngle2(0, 0, tempz, tempy));
+#define SLOPEROLL_DIV 3
+void K_RollMobjBySlopes(mobj_t* mo, pslope_t *slope)
+{
+	// save one P_MobjWasRemoved check for dedis lel
+	if (rendermode == render_none)
+		return;
 
-        if ((!usedistance) || (m_dist <= (rolldist)))
-        {
-            an = (INT32)((angle_t)tempangle - mo->roll_sprite) / SLOPEROLL_DIV;
+	if (P_MobjWasRemoved(mo))
+		return;
 
-            mo->roll_sprite = an ? mo->roll_sprite + an : (angle_t)tempangle;
-        }
-        else
-            mo->roll_sprite = FixedAngle(0);
+	I_Assert(mo->subsector != NULL);
+	I_Assert(mo->subsector->sector != NULL);
 
-        mo->sloperoll = flip ? InvAngle(mo->roll_sprite) : mo->roll_sprite;
-    }
-    else if (P_IsObjectOnGround(mo))
-    {
-        mo->sloperoll = FixedAngle(0);
-        mo->slopepitch = FixedAngle(0);
-    }
+	if (!K_ShouldSlopeRoll(mo))
+	{
+		mo->pitch_sprite = mo->roll_sprite = 0;
+		mo->sloperoll = mo->slopepitch = 0;
+		return;
+	}
+
+	// lifted from hw_md2
+	if (slope)
+	{
+		angle_t an;
+		const boolean flip = (mo->eflags & MFE_VERTICALFLIP);
+		fixed_t tempz = slope->normal.z;
+		fixed_t tempy = slope->normal.y;
+		fixed_t tempx = slope->normal.x;
+		fixed_t tempangle = 0;
+
+		// admittedly this is a very hacky way to do the pitch and roll easing
+
+		// pitch
+		tempangle = -(R_PointToAngle2(0, 0, FixedSqrt(FixedMul(tempy, tempy) + FixedMul(tempz, tempz)), tempx));
+		an = (INT32)((angle_t)tempangle - mo->pitch_sprite) / SLOPEROLL_DIV;
+		mo->pitch_sprite = an ? mo->pitch_sprite + an : (angle_t)tempangle;
+		mo->slopepitch = flip ? InvAngle(mo->pitch_sprite) : mo->pitch_sprite;
+
+		// roll
+		tempangle = R_PointToAngle2(0, 0, tempz, tempy);
+		an = (INT32)((angle_t)tempangle - mo->roll_sprite) / SLOPEROLL_DIV;
+		mo->roll_sprite = an ? mo->roll_sprite + an : (angle_t)tempangle;
+		mo->sloperoll = flip ? InvAngle(mo->roll_sprite) : mo->roll_sprite;
+	}
+	else if (P_IsObjectOnGround(mo))
+	{
+		mo->sloperoll = 0;
+		mo->slopepitch = 0;
+	}
 }
 
 void K_SpawnBoostTrail(player_t *player)
@@ -3338,20 +3559,35 @@ void K_SpawnBoostTrail(player_t *player)
 
 	for (i = 0; i < 2; i++)
 	{
-		newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(24*FRACUNIT, player->mo->scale));
-		newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(24*FRACUNIT, player->mo->scale));
+		angle_t thrustangle = (travelangle + ((i&1) ? -1 : 1)*ANGLE_135);
+		fixed_t smolscale = FixedMul(24*FRACUNIT, player->mo->scale);
+
+		newx = player->mo->x + P_ReturnThrustX(player->mo, thrustangle, smolscale);
+		newy = player->mo->y + P_ReturnThrustY(player->mo, thrustangle, smolscale);
+
 		if (player->mo->standingslope)
 		{
-			ground = P_GetZAt(player->mo->standingslope, newx, newy);
+			ground = P_GetSlopeZAt(player->mo->standingslope, newx, newy);
+
 			if (player->mo->eflags & MFE_VERTICALFLIP)
 				ground -= FixedMul(mobjinfo[MT_SNEAKERTRAIL].height, player->mo->scale);
 		}
+
 		flame = P_SpawnMobj(newx, newy, ground, MT_SNEAKERTRAIL);
 
 		P_SetTarget(&flame->target, player->mo);
 		flame->angle = travelangle;
 		flame->fuse = TICRATE*2;
 		flame->destscale = player->mo->scale;
+
+		if (cv_coloredsneakertrail.value)
+		{
+			flame->colorized = true;
+			flame->color = player->skincolor;
+			if (cv_playerblendeffects.value)
+				flame->blendmode = AST_ADD;
+		}
+
 		P_SetScale(flame, player->mo->scale);
 		// not K_MatchGenericExtraFlags so that a stolen sneaker can be seen
 		K_FlipFromObject(flame, player->mo);
@@ -3359,7 +3595,7 @@ void K_SpawnBoostTrail(player_t *player)
 		flame->momx = 8;
 
 		// since you have to be on the ground for sneaker trails, this should be fine(?)
-		if (cv_sparkroll.value == 1)
+		if (cv_sparkroll.value)
 		{
 			flame->slopepitch = player->mo->slopepitch;
 			flame->sloperoll = player->mo->sloperoll;
@@ -3395,12 +3631,18 @@ void K_SpawnSparkleTrail(mobj_t *mo)
 		fixed_t newz = mo->z + mo->momz + (P_RandomRange(0, mo->height>>FRACBITS)<<FRACBITS);
 
 		sparkle = P_SpawnMobj(newx, newy, newz, MT_SPARKLETRAIL);
+
 		K_FlipFromObject(sparkle, mo);
 
 		P_SetTarget(&sparkle->target, mo);
+
 		sparkle->destscale = mo->destscale;
 		P_SetScale(sparkle, mo->scale);
+
 		sparkle->color = mo->color;
+
+		if (cv_playerblendeffects.value && mo->player && K_SpeedLinesShouldBlend(mo->player))
+			sparkle->blendmode = AST_ADD;
 	}
 
 	P_SetMobjState(sparkle, S_KARTINVULN_LARGE1);
@@ -3455,7 +3697,6 @@ void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
 void K_DriftDustHandling(mobj_t *spawner)
 {
 	angle_t anglediff;
-	const INT16 spawnrange = spawner->radius>>FRACBITS;
 
 	if (!P_IsObjectOnGround(spawner) || leveltime % 2 != 0)
 		return;
@@ -3492,7 +3733,13 @@ void K_DriftDustHandling(mobj_t *spawner)
 	if (anglediff > ANGLE_180)
 		anglediff = InvAngle(anglediff);
 
+<<<<<<< HEAD
 	/*if (anglediff > ANG10*4) // Trying to turn further than 40 degrees
+=======
+	const INT16 spawnrange = spawner->radius>>FRACBITS;
+
+	if (anglediff > ANG10*4) // Trying to turn further than 40 degrees
+>>>>>>> Saturn-Next
 	{
 		fixed_t spawnx = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
 		fixed_t spawny = P_RandomRange(-spawnrange, spawnrange)<<FRACBITS;
@@ -3572,7 +3819,7 @@ static mobj_t *K_FindLastTrailMobj(player_t *player)
 	if (!player || !(trail = player->mo) || !player->mo->hnext || !player->mo->hnext->health)
 		return NULL;
 
-	while (trail->hnext && !P_MobjWasRemoved(trail->hnext) && trail->hnext->health)
+	while (!P_MobjWasRemoved(trail->hnext) && trail->hnext->health)
 	{
 		trail = trail->hnext;
 	}
@@ -3604,18 +3851,7 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
 	}
 	else
 	{
-		switch (gamespeed)
-		{
-			case 0:
-				PROJSPEED = 68*mapobjectscale; // Avg Speed is 34
-				break;
-			case 2:
-				PROJSPEED = 96*mapobjectscale; // Avg Speed is 48
-				break;
-			default:
-				PROJSPEED = 82*mapobjectscale; // Avg Speed is 41
-				break;
-		}
+		PROJSPEED = K_GetProjectileSpeed();
 	}
 
 	if (altthrow)
@@ -3726,6 +3962,15 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
 
 				if (mo->eflags & MFE_UNDERWATER)
 					mo->momz = (117 * mo->momz) / 200;
+
+				if (cv_bananthrowroll.value && (mapthing == MT_BANANA))
+				{
+					//mo->angle = FixedAngle(M_RandomRange(-180, 180) << FRACBITS);
+					if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mo))
+						mo->sloperoll = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS); // im lazy but this makes sure the banan goes back to upright when it lands lmao
+					else if (cv_bananthrowroll.value == 2)
+						mo->rollangle = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS);
+				}
 			}
 
 			// this is the small graphic effect that plops in you when you throw an item:
@@ -3806,12 +4051,11 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
 
 void K_PuntMine(mobj_t *thismine, mobj_t *punter)
 {
-	angle_t fa = R_PointToAngle2(0, 0, punter->momx, punter->momy) >> ANGLETOFINESHIFT;
-	fixed_t z = 30*mapobjectscale + punter->momz;
-	fixed_t spd;
+	angle_t fa;
+	fixed_t z, spd;
 	mobj_t *mine;
 
-	if (!thismine || P_MobjWasRemoved(thismine))
+	if (P_MobjWasRemoved(thismine))
 		return;
 
 	//This guarantees you hit a mine being dragged
@@ -3840,21 +4084,13 @@ void K_PuntMine(mobj_t *thismine, mobj_t *punter)
 	else
 		mine = thismine;
 
-	if (!mine || P_MobjWasRemoved(mine))
+	if (P_MobjWasRemoved(mine))
 		return;
 
-	switch (gamespeed)
-	{
-		case 0:
-			spd = 68*mapobjectscale; // Avg Speed is 34
-			break;
-		case 2:
-			spd = 96*mapobjectscale; // Avg Speed is 48
-			break;
-		default:
-			spd = 82*mapobjectscale; // Avg Speed is 41
-			break;
-	}
+	fa = R_PointToAngle2(0, 0, punter->momx, punter->momy) >> ANGLETOFINESHIFT;
+	z = 30*mapobjectscale + punter->momz;
+
+	spd = K_GetProjectileSpeed();
 
 	mine->flags |= MF_NOCLIPTHING;
 
@@ -4001,20 +4237,7 @@ static void K_DoHyudoroSteal(player_t *player)
 
 void K_DoSneaker(player_t *player, INT32 type)
 {
-	fixed_t intendedboost;
-
-	switch (gamespeed)
-	{
-		case 0:
-			intendedboost = 53740+768;
-			break;
-		case 2:
-			intendedboost = 17294+768;
-			break;
-		default:
-			intendedboost = 32768;
-			break;
-	}
+	const fixed_t intendedboost = K_GetSneakerBoostSpeed();
 
 	if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
 	{
@@ -4031,7 +4254,8 @@ void K_DoSneaker(player_t *player, INT32 type)
 			if (player->mo->hnext)
 			{
 				mobj_t *cur = player->mo->hnext;
-				while (cur && !P_MobjWasRemoved(cur))
+
+				while (!P_MobjWasRemoved(cur))
 				{
 					if (!cur->tracer)
 					{
@@ -4077,8 +4301,10 @@ static void K_DoShrink(player_t *user)
 	{
 		if (!playeringame[i] || players[i].spectator || !players[i].mo)
 			continue;
+
 		if (&players[i] == user)
 			continue;
+
 		if (players[i].kartstuff[k_position] < user->kartstuff[k_position])
 		{
 			//P_FlashPal(&players[i], PAL_NUKE, 10);
@@ -4095,7 +4321,7 @@ static void K_DoShrink(player_t *user)
 				K_DropItems(&players[i]);
 				players[i].kartstuff[k_growshrinktimer] = -(20*TICRATE);
 
-				if (players[i].mo && !P_MobjWasRemoved(players[i].mo))
+				if (!P_MobjWasRemoved(players[i].mo))
 				{
 					players[i].mo->scalespeed = mapobjectscale/TICRATE;
 					players[i].mo->destscale = (6*mapobjectscale)/8;
@@ -4111,14 +4337,14 @@ static void K_DoShrink(player_t *user)
 
 void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound)
 {
-	const fixed_t vscale = mapobjectscale + (mo->scale - mapobjectscale);
-
 	if (mo->player && mo->player->spectator)
 		return;
 
 	if (mo->eflags & MFE_SPRUNG)
 		return;
 
+	const fixed_t vscale = mapobjectscale + (mo->scale - mapobjectscale);
+
 	mo->standingslope = NULL;
 
 	mo->eflags |= MFE_SPRUNG;
@@ -4171,6 +4397,10 @@ void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source)
 	mobj_t *cachenext;
 
 killnext:
+
+	if (!banana)
+		return;
+
 	cachenext = banana->hnext;
 
 	if (banana->health)
@@ -4221,7 +4451,7 @@ void K_DropHnextList(player_t *player)
 	mobjtype_t type;
 	boolean orbit, ponground, dropall = true;
 
-	if (!work || P_MobjWasRemoved(work))
+	if (P_MobjWasRemoved(work))
 		return;
 
 	flip = P_MobjFlip(player->mo);
@@ -4360,7 +4590,7 @@ void K_DropItems(player_t *player)
 
 	K_DropHnextList(player);
 
-	if (player->mo && !P_MobjWasRemoved(player->mo) && player->kartstuff[k_itemamount])
+	if (!P_MobjWasRemoved(player->mo) && player->kartstuff[k_itemamount])
 	{
 		mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
 		P_SetScale(drop, drop->scale>>4);
@@ -4389,7 +4619,7 @@ void K_DropRocketSneaker(player_t *player)
 	fixed_t flingangle;
 	boolean leftshoe = true; //left shoe is first
 
-	if (!(player->mo && !P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
+	if (!(!P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
 		return;
 
 	while ((shoe = shoe->hnext) && !P_MobjWasRemoved(shoe))
@@ -4428,7 +4658,7 @@ void K_DropRocketSneaker(player_t *player)
 
 void K_DropKitchenSink(player_t *player)
 {
-	if (!(player->mo && !P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
+	if (!(!P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
 		return;
 
 	if (player->mo->hnext->type != MT_SINK_SHIELD)
@@ -4445,13 +4675,13 @@ void K_RepairOrbitChain(mobj_t *orbit)
 	mobj_t *cachenext = orbit->hnext;
 
 	// First, repair the chain
-	if (orbit->hnext && orbit->hnext->health && !P_MobjWasRemoved(orbit->hnext))
+	if (!P_MobjWasRemoved(orbit->hnext) && orbit->hnext->health)
 	{
 		P_SetTarget(&orbit->hnext->hprev, orbit->hprev);
 		P_SetTarget(&orbit->hnext, NULL);
 	}
 
-	if (orbit->hprev && orbit->hprev->health && !P_MobjWasRemoved(orbit->hprev))
+	if (!P_MobjWasRemoved(orbit->hprev) && orbit->hprev->health)
 	{
 		P_SetTarget(&orbit->hprev->hnext, cachenext);
 		P_SetTarget(&orbit->hprev, NULL);
@@ -4461,13 +4691,12 @@ void K_RepairOrbitChain(mobj_t *orbit)
 	if (orbit->target && orbit->target->player)
 	{
 		player_t *player = orbit->target->player;
-
 		INT32 num = 0;
 
 		mobj_t *cur = orbit->target->hnext;
 		mobj_t *prev = NULL;
 
-		while (cur && !P_MobjWasRemoved(cur))
+		while (!P_MobjWasRemoved(cur))
 		{
 			prev = cur;
 			cur = cur->hnext;
@@ -4482,6 +4711,145 @@ void K_RepairOrbitChain(mobj_t *orbit)
 	}
 }
 
+// Simplified version of a code bit in P_MobjFloorZ
+static fixed_t K_BananaSlopeZ(pslope_t *slope, fixed_t x, fixed_t y, fixed_t z, fixed_t radius, boolean ceiling)
+{
+	fixed_t testx, testy;
+	fixed_t slopez = 0;
+
+	if (slope == NULL)
+	{
+		testx = x;
+		testy = y;
+	}
+	else
+	{
+		if (slope->d.x < 0)
+			testx = radius;
+		else
+			testx = -radius;
+
+		if (slope->d.y < 0)
+			testy = radius;
+		else
+			testy = -radius;
+
+		if ((slope->zdelta > 0) ^ !!(ceiling))
+		{
+			testx = -testx;
+			testy = -testy;
+		}
+
+		testx += x;
+		testy += y;
+	}
+
+	slopez = P_GetZAt(slope, testx, testy, z);
+
+	return slopez;
+}
+
+static void K_CalculateBananaSlope(mobj_t *mobj, fixed_t x, fixed_t y, fixed_t z, fixed_t radius, fixed_t height, boolean flip, boolean player)
+{
+	fixed_t newz;
+	sector_t *sec;
+	pslope_t *slope = NULL;
+
+	//sec = R_PointInSubsector(x, y)->sector;
+
+	if (mobj->x != x || mobj->y != y || mobj->subsector == NULL)
+		sec = R_PointInSubsectorFast(x, y)->sector;
+	else
+		sec = mobj->subsector->sector;
+
+	if (flip)
+	{
+		slope = sec->c_slope;
+		newz = K_BananaSlopeZ(slope, x, y, sec->ceilingheight, radius, true);
+	}
+	else
+	{
+		slope = sec->f_slope;
+		newz = K_BananaSlopeZ(slope, x, y, sec->floorheight, radius, true);
+	}
+
+	// Check FOFs for a better suited slope
+	if (sec->ffloors)
+	{
+		ffloor_t *rover;
+
+		for (rover = sec->ffloors; rover; rover = rover->next)
+		{
+			fixed_t top, bottom;
+			fixed_t d1, d2;
+
+			if (!(rover->flags & FF_EXISTS))
+				continue;
+
+			if ((!(((rover->flags & FF_BLOCKPLAYER && player)
+				|| (rover->flags & FF_BLOCKOTHERS && !player))
+				|| (rover->flags & FF_QUICKSAND))
+				|| (rover->flags & FF_SWIMMABLE)))
+				continue;
+
+			top = K_BananaSlopeZ(*rover->t_slope, x, y, *rover->topheight, radius, false);
+			bottom = K_BananaSlopeZ(*rover->b_slope, x, y, *rover->bottomheight, radius, true);
+
+			if (flip)
+			{
+				if (rover->flags & FF_QUICKSAND)
+				{
+					if (z < top && (z + height) > bottom)
+					{
+						if (newz > (z + height))
+						{
+							newz = (z + height);
+							slope = NULL;
+						}
+					}
+					continue;
+				}
+
+				d1 = (z + height) - (top + ((bottom - top)/2));
+				d2 = z - (top + ((bottom - top)/2));
+
+				if (bottom < newz && abs(d1) < abs(d2))
+				{
+					newz = bottom;
+					slope = *rover->b_slope;
+				}
+			}
+			else
+			{
+				if (rover->flags & FF_QUICKSAND)
+				{
+					if (z < top && (z + height) > bottom)
+					{
+						if (newz < z)
+						{
+							newz = z;
+							slope = NULL;
+						}
+					}
+					continue;
+				}
+
+				d1 = z - (bottom + ((top - bottom)/2));
+				d2 = (z + height) - (bottom + ((top - bottom)/2));
+
+				if (top > newz && abs(d1) < abs(d2))
+				{
+					newz = top;
+					slope = *rover->t_slope;
+				}
+			}
+		}
+	}
+
+	//mobj->standingslope = slope;
+	K_RollMobjBySlopes(mobj, slope);
+}
+
 // Move the hnext chain!
 static void K_MoveHeldObjects(player_t *player)
 {
@@ -4491,6 +4859,7 @@ static void K_MoveHeldObjects(player_t *player)
 	if (!player->mo->hnext)
 	{
 		player->kartstuff[k_bananadrag] = 0;
+
 		if (player->kartstuff[k_eggmanheld])
 			player->kartstuff[k_eggmanheld] = 0;
 		else if (player->kartstuff[k_itemheld])
@@ -4506,6 +4875,7 @@ static void K_MoveHeldObjects(player_t *player)
 		// we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic...
 		P_SetTarget(&player->mo->hnext, NULL);
 		player->kartstuff[k_bananadrag] = 0;
+
 		if (player->kartstuff[k_eggmanheld])
 			player->kartstuff[k_eggmanheld] = 0;
 		else if (player->kartstuff[k_itemheld])
@@ -4526,7 +4896,7 @@ static void K_MoveHeldObjects(player_t *player)
 
 				player->kartstuff[k_bananadrag] = 0; // Just to make sure
 
-				while (cur && !P_MobjWasRemoved(cur))
+				while (!P_MobjWasRemoved(cur))
 				{
 					const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); // mobj's distance from its Target, or Radius.
 					fixed_t z;
@@ -4604,7 +4974,7 @@ static void K_MoveHeldObjects(player_t *player)
 				if (P_IsObjectOnGround(player->mo) && player->speed > 0)
 					player->kartstuff[k_bananadrag]++;
 
-				while (cur && !P_MobjWasRemoved(cur))
+				while (!P_MobjWasRemoved(cur))
 				{
 					const fixed_t radius = FixedHypot(targ->radius, targ->radius) + FixedHypot(cur->radius, cur->radius);
 					angle_t ang;
@@ -4632,7 +5002,7 @@ static void K_MoveHeldObjects(player_t *player)
 					else
 						dist = cur->extravalue1/2;
 
-					if (!targ || P_MobjWasRemoved(targ))
+					if (P_MobjWasRemoved(targ))
 						continue;
 
 					// Shrink your items if the player shrunk too.
@@ -4658,6 +5028,15 @@ static void K_MoveHeldObjects(player_t *player)
 							targz -= 8*(2*FRACUNIT)/7;
 					}*/
 
+					if (cv_bananajitter.value && P_IsObjectOnGround(player->mo) && player->speed > 0 && player->kartstuff[k_bananadrag] > TICRATE
+						&& M_RandomChance(min(FRACUNIT/2, FixedDiv(player->speed, K_GetKartSpeed(player, false))/2)))
+					{
+						if (leveltime & 1)
+							cur->spriteyoffset += 8*(2*FRACUNIT)/7;
+						else
+							cur->spriteyoffset -= 8*(2*FRACUNIT)/7;
+					}
+
 					if (speed > dist)
 						P_InstaThrust(cur, cur->angle, speed-dist);
 
@@ -4666,6 +5045,12 @@ static void K_MoveHeldObjects(player_t *player)
 					if (R_PointToDist2(cur->x, cur->y, targx, targy) > 768*FRACUNIT)
 						P_MoveOrigin(cur, targx, targy, cur->z);
 
+					if (P_IsObjectOnGround(cur) && K_ShouldSlopeRoll(cur))
+					{
+						K_CalculateBananaSlope(cur, cur->x, cur->y, cur->z,
+											   cur->radius, cur->height, (cur->eflags & MFE_VERTICALFLIP), false);
+					}
+
 					cur = cur->hnext;
 				}
 			}
@@ -4675,7 +5060,7 @@ static void K_MoveHeldObjects(player_t *player)
 				mobj_t *cur = player->mo->hnext;
 				INT32 num = 0;
 
-				while (cur && !P_MobjWasRemoved(cur))
+				while (!P_MobjWasRemoved(cur))
 				{
 					const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius);
 					boolean vibrate = ((leveltime & 1) && !cur->tracer);
@@ -4740,7 +5125,7 @@ static void K_MoveHeldObjects(player_t *player)
 
 					}
 
-					if (cur->tracer && !P_MobjWasRemoved(cur->tracer))
+					if (!P_MobjWasRemoved(cur->tracer))
 					{
 						fixed_t diffx, diffy, diffz;
 
@@ -4804,6 +5189,7 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source)
 
 		// Find the angle, see who's got the best.
 		thisang = actor->angle - R_PointToAngle2(actor->x, actor->y, player->mo->x, player->mo->y);
+
 		if (thisang > ANGLE_180)
 			thisang = InvAngle(thisang);
 
@@ -4862,12 +5248,12 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source)
 // Engine Sounds.
 static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
 {
-	const INT32 numsnds = 13;
+	static const INT32 numsnds = 13;
 
-	const fixed_t closedist = 160*FRACUNIT;
-	const fixed_t fardist = 1536*FRACUNIT;
+	static const fixed_t closedist = 160*FRACUNIT;
+	static const fixed_t fardist   = 1536*FRACUNIT;
 
-	const UINT8 dampenval = 48; // 255 * 48 = close enough to FRACUNIT/6
+	static const UINT8 dampenval = 48; // 255 * 48 = close enough to FRACUNIT/6
 
 	INT32 class, s, w; // engine class number
 
@@ -4877,18 +5263,6 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
 	INT32 targetsnd = 0;
 	INT32 i;
 
-	s = (player->kartspeed - 1) / 3;
-	w = (player->kartweight - 1) / 3;
-
-#define LOCKSTAT(stat) \
-	if (stat < 0) { stat = 0; } \
-	if (stat > 2) { stat = 2; }
-	LOCKSTAT(s);
-	LOCKSTAT(w);
-#undef LOCKSTAT
-
-	class = s + (3*w);
-
 	if (leveltime < 8 || player->spectator || player->exiting)
 	{
 		// Silence the engines, and reset sound number while we're at it.
@@ -4994,16 +5368,29 @@ static void K_UpdateEngineSounds(player_t *player, ticcmd_t *cmd)
 		return;
 	}
 
+	s = (player->kartspeed - 1) / 3;
+	w = (player->kartweight - 1) / 3;
+
+#define LOCKSTAT(stat) \
+	if (stat < 0) { stat = 0; } \
+	if (stat > 2) { stat = 2; }
+	LOCKSTAT(s);
+	LOCKSTAT(w);
+#undef LOCKSTAT
+
+	class = s + (3*w);
+
 	S_StartSoundAtVolume(player->mo, (sfx_krta00 + player->kartstuff[k_enginesnd]) + (class * numsnds), volume);
 }
 
 static void K_UpdateInvincibilitySounds(player_t *player)
 {
 	INT32 sfxnum = sfx_None;
-	boolean localplayer = P_IsLocalPlayer(player);
 
 	if (player->mo->health > 0)
 	{
+		const boolean localplayer = P_IsLocalPlayer(player);
+
 		if (player->kartstuff[k_growshrinktimer] > 0 && (!localplayer || cv_growmusic.value == 2)) // Prioritize Grow
 			sfxnum = cv_kartinvinsfx.value ? sfx_alarmg : sfx_kgrow;
 		else if (player->kartstuff[k_invincibilitytimer] > 0 && (!localplayer || cv_supermusic.value == 2))
@@ -5064,6 +5451,96 @@ void K_KartPlayerHUDUpdate(player_t *player)
 		player->kartstuff[k_cardanimation] = 0;
 }
 
+static boolean K_SpeedLinesShouldBlend(player_t *player)
+{
+	if (!cv_playerblendeffects.value || !player->mo)
+		return false;
+
+	if (player->kartstuff[k_sneakertimer])
+		return true;
+
+	// this is how the percentage speedometer calcs, i suck at maths so this was the easiest thing to do lmao
+	if ((FixedDiv(player->speed, FixedMul(K_GetKartSpeed(player, false), ORIG_FRICTION))*100)>>FRACBITS > 127) // sneaker boost is around 25%
+		return true;
+
+	return false;
+}
+
+static UINT8 K_GetSpeedLineColor(player_t *player, boolean colorSpeed)
+{
+	UINT8 speedcolor = SKINCOLOR_NONE;
+	const UINT8 playercolor = player->mo->color;
+
+	if (colorSpeed)
+	{
+		if (cv_coloredspeedlines.value != 3)
+			speedcolor = playercolor;
+
+		if (cv_coloredspeedlines.value >= 2 && player->kartstuff[k_driftboost])
+		{
+			if (player->kartstuff[k_driftboost] <= 20)
+				speedcolor = SKINCOLOR_SAPPHIRE;
+			else if (player->kartstuff[k_driftboost] <= 50)
+				speedcolor = SKINCOLOR_RASPBERRY;
+			else if (player->kartstuff[k_driftboost] <= 125)
+				speedcolor = K_RainbowColor();
+
+			if (cv_coloredspeedlines.value == 2)
+				speedcolor = (leveltime & 1) ? playercolor : speedcolor;
+		}
+	}
+
+	if (cv_coloredspeedlines.value != 3)
+	{
+		if (player->kartstuff[k_eggmanexplode])
+		{
+			// Make it red when you have the eggman speed boost
+			speedcolor = SKINCOLOR_RED;
+		}
+		else if (player->kartstuff[k_invincibilitytimer])
+		{
+			speedcolor = playercolor;
+		}
+	}
+
+	return speedcolor;
+}
+
+typedef INT32 (*randomFunc)(INT32 min, INT32 max);
+
+FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, boolean synched)
+{
+	randomFunc randomfunc = synched ? P_RandomRange : M_RandomRange;
+
+	mobj_t *fast = P_SpawnMobj(player->mo->x + (randomfunc(-36,36) * player->mo->scale),
+							   player->mo->y + (randomfunc(-36,36) * player->mo->scale),
+							   player->mo->z + (player->mo->height/2) + (randomfunc(-20,20) * player->mo->scale),
+							   MT_FASTLINE);
+
+	fast->angle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
+	fast->momx = 3*player->mo->momx/4;
+	fast->momy = 3*player->mo->momy/4;
+	fast->momz = 3*player->mo->momz/4;
+	fast->islocal = !synched;
+	P_SetTarget(&fast->target, player->mo); // easier lua access
+
+	K_MatchGenericExtraFlags(fast, player->mo);
+
+	if (cv_coloredspeedlines.value || cv_playerblendeffects.value)
+	{
+		const boolean colorSpeed = (player->speed >= (3*K_GetKartSpeed(player, false))/4);
+
+		if (cv_coloredspeedlines.value)
+		{
+			fast->color = K_GetSpeedLineColor(player, colorSpeed);
+			fast->colorized = true;
+		}
+
+		if (colorSpeed && K_SpeedLinesShouldBlend(player))
+			fast->blendmode = AST_ADD;
+	}
+}
+
 /**	\brief	Decreases various kart timers and powers per frame. Called in P_PlayerThink in p_user.c
 
 	\param	player	player object passed from P_PlayerThink
@@ -5085,16 +5562,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 	// Speed lines
 	if ((player->kartstuff[k_sneakertimer] || player->kartstuff[k_driftboost] || player->kartstuff[k_startboost]) && player->speed > 0)
 	{
-		mobj_t *fast = P_SpawnMobj(player->mo->x + (P_RandomRange(-36,36) * player->mo->scale),
-			player->mo->y + (P_RandomRange(-36,36) * player->mo->scale),
-			player->mo->z + (player->mo->height/2) + (P_RandomRange(-20,20) * player->mo->scale),
-			MT_FASTLINE);
-		fast->angle = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
-		fast->momx = 3*player->mo->momx/4;
-		fast->momy = 3*player->mo->momy/4;
-		fast->momz = 3*player->mo->momz/4;
-		P_SetTarget(&fast->target, player->mo); // easier lua access
-		K_MatchGenericExtraFlags(fast, player->mo);
+		K_SpawnNormalSpeedLines(player, true);
+	}
+	else if ((cv_coloredspeedlines.value == 1 || cv_coloredspeedlines.value == 2) && player->kartstuff[k_eggmanexplode]) // gotta love the speedlines calling synched rng :chaosleep:
+	{
+		K_SpawnNormalSpeedLines(player, false);
 	}
 
 	if (player->playerstate == PST_DEAD || player->kartstuff[k_respawn] > 1) // Ensure these are set correctly here
@@ -5105,6 +5577,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 	else if (player->kartstuff[k_eggmanexplode]) // You're gonna diiiiie
 	{
 		const INT32 flashtime = 4<<(player->kartstuff[k_eggmanexplode]/TICRATE);
+
 		if (player->kartstuff[k_eggmanexplode] == 1 || (player->kartstuff[k_eggmanexplode] % (flashtime/2) != 0))
 		{
 			player->mo->colorized = false;
@@ -5352,15 +5825,15 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
 	// Roulette Code
 	K_KartItemRoulette(player, cmd);
 
+	// Used when karthitemdialog is On
+	K_HandleDelayedHitByEm(player);
+
 	// Handle invincibility sfx
 	K_UpdateInvincibilitySounds(player); // Also thanks, VAda!
 
-	// Plays the music after the starting countdown.
-	if (P_IsLocalPlayer(player) && leveltime == (starttime + (TICRATE/2)))
-	{
-		S_ChangeMusic(mapmusname, mapmusflags, true);
-		S_ShowMusicCredit();
-	}
+	// Plays the music during and after the starting countdown.
+	if (P_IsLocalPlayer(player))
+		S_StartMapMusic();
 }
 
 void K_KartPlayerAfterThink(player_t *player)
@@ -5395,7 +5868,7 @@ void K_KartPlayerAfterThink(player_t *player)
 		else
 			targ = K_FindJawzTarget(player->mo, player);
 
-		if (!targ || !targ->mo || P_MobjWasRemoved(targ->mo))
+		if (!targ || P_MobjWasRemoved(targ->mo))
 		{
 			player->kartstuff[k_lastjawztarget] = -1;
 			player->kartstuff[k_jawztargetdelay] = 0;
@@ -5436,6 +5909,7 @@ boolean K_CheckPlayersRespawnColliding(INT32 playernum, fixed_t x, fixed_t y)
 {
 	INT32 i;
 	fixed_t p1radius = players[playernum].mo->radius;
+
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (playernum == i || !playeringame[i] || players[i].spectator || !players[i].mo || players[i].mo->health <= 0
@@ -5456,7 +5930,7 @@ boolean K_CheckPlayersRespawnColliding(INT32 playernum, fixed_t x, fixed_t y)
 static INT16 K_GetKartDriftValue(player_t *player, fixed_t countersteer)
 {
 	INT16 basedrift, driftangle;
-	fixed_t driftweight = player->kartweight*14; // 12
+	fixed_t driftweight;
 
 	// If they aren't drifting or on the ground this doesn't apply
 	if (player->kartstuff[k_drift] == 0 || !P_IsObjectOnGround(player->mo))
@@ -5467,6 +5941,8 @@ static INT16 K_GetKartDriftValue(player_t *player, fixed_t countersteer)
 		return -266*player->kartstuff[k_drift]; // Drift has ended and we are tweaking their angle back a bit
 	}
 
+	driftweight = player->kartweight*14; // 12
+
 	//basedrift = 90*player->kartstuff[k_drift]; // 450
 	//basedrift = 93*player->kartstuff[k_drift] - driftweight*3*player->kartstuff[k_drift]/10; // 447 - 303
 	basedrift = 83*player->kartstuff[k_drift] - (driftweight - 14)*player->kartstuff[k_drift]/5; // 415 - 303
@@ -5477,10 +5953,8 @@ static INT16 K_GetKartDriftValue(player_t *player, fixed_t countersteer)
 
 INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue)
 {
-	fixed_t p_topspeed = K_GetKartSpeed(player, false);
-	fixed_t p_curspeed = min(player->speed, p_topspeed * 2);
-	fixed_t p_maxspeed = p_topspeed * 3;
-	fixed_t adjustangle = FixedDiv((p_maxspeed>>16) - (p_curspeed>>16), (p_maxspeed>>16) + player->kartweight);
+	fixed_t p_topspeed, p_curspeed, p_maxspeed;
+	fixed_t adjustangle;
 
 	if (player->spectator)
 		return turnvalue;
@@ -5500,6 +5974,11 @@ INT16 K_GetKartTurnValue(player_t *player, INT16 turnvalue)
 		return turnvalue;
 	}
 
+	p_topspeed  = K_GetKartSpeed(player, false);
+	p_curspeed  = min(player->speed, p_topspeed * 2);
+	p_maxspeed  = p_topspeed * 3;
+	adjustangle = FixedDiv((p_maxspeed>>16) - (p_curspeed>>16), (p_maxspeed>>16) + player->kartweight);
+
 	turnvalue = FixedMul(turnvalue, adjustangle); // Weight has a small effect on turning
 
 	if (player->kartstuff[k_invincibilitytimer] || player->kartstuff[k_sneakertimer] || player->kartstuff[k_growshrinktimer] > 0)
@@ -5606,101 +6085,79 @@ static void K_KartDrift(player_t *player, boolean onground)
 			player->kartstuff[k_driftend] = 0;
 	}
 
-
 	// Incease/decrease the drift value to continue drifting in that direction
-	if (player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_jmp] == 1 && onground && player->kartstuff[k_drift] != 0)
+	if (player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_jmp] == 1 && player->kartstuff[k_drift] != 0)
 	{
 		fixed_t driftadditive = 24;
 
-		if (player->kartstuff[k_drift] >= 1) // Drifting to the left
+		// well this is kinda dumb but we cannot modify a drift in midair so
+		if (onground)
 		{
-			player->kartstuff[k_drift]++;
-			if (player->kartstuff[k_drift] > 5)
-				player->kartstuff[k_drift] = 5;
-
-			if (player->cmd.driftturn > 0) // Inward
-				driftadditive += abs(player->cmd.driftturn)/100;
-			if (player->cmd.driftturn < 0) // Outward
-				driftadditive -= abs(player->cmd.driftturn)/75;
-		}
-		else if (player->kartstuff[k_drift] <= -1) // Drifting to the right
-		{
-			player->kartstuff[k_drift]--;
-			if (player->kartstuff[k_drift] < -5)
-				player->kartstuff[k_drift] = -5;
-
-			if (player->cmd.driftturn < 0) // Inward
-				driftadditive += abs(player->cmd.driftturn)/100;
-			if (player->cmd.driftturn > 0) // Outward
-				driftadditive -= abs(player->cmd.driftturn)/75;
-		}
-
-		// Disable drift-sparks until you're going fast enough
-		if (player->kartstuff[k_getsparks] == 0 || (player->kartstuff[k_offroad] && !player->kartstuff[k_invincibilitytimer] && !player->kartstuff[k_hyudorotimer] && !player->kartstuff[k_sneakertimer]))
-			driftadditive = 0;
-		if (player->speed > minspeed*2)
-			player->kartstuff[k_getsparks] = 1;
-
-		// Sound whenever you get a different tier of sparks
-		if ((player->kartstuff[k_driftcharge] < dsone && player->kartstuff[k_driftcharge]+driftadditive >= dsone)
-			|| (player->kartstuff[k_driftcharge] < dstwo && player->kartstuff[k_driftcharge]+driftadditive >= dstwo)
-			|| (player->kartstuff[k_driftcharge] < dsthree && player->kartstuff[k_driftcharge]+driftadditive >= dsthree))
-		{
-			UINT8 pindex;
-			//S_StartSound(player->mo, sfx_s3ka2);
-			if (P_IsLocalPlayer(player)) // UGHGHGH...
-				S_StartSoundAtVolume(player->mo, sfx_s3ka2, 192); // Ugh...
-
-			// hack to find the correct player number
-			for (pindex = 0; pindex < MAXPLAYERS; pindex++)
+			if (player->kartstuff[k_drift] >= 1) // Drifting to the left
 			{
-				if (player == &players[pindex])
-				{
-					driftsparkGrowTimer[pindex] = DRIFTSPARKGROWTICS;
-					break;
-				}
+				player->kartstuff[k_drift]++;
+				if (player->kartstuff[k_drift] > 5)
+					player->kartstuff[k_drift] = 5;
+
+				if (player->cmd.driftturn > 0) // Inward
+					driftadditive += abs(player->cmd.driftturn)/100;
+				if (player->cmd.driftturn < 0) // Outward
+					driftadditive -= abs(player->cmd.driftturn)/75;
+			}
+			else if (player->kartstuff[k_drift] <= -1) // Drifting to the right
+			{
+				player->kartstuff[k_drift]--;
+				if (player->kartstuff[k_drift] < -5)
+					player->kartstuff[k_drift] = -5;
+
+				if (player->cmd.driftturn < 0) // Inward
+					driftadditive += abs(player->cmd.driftturn)/100;
+				if (player->cmd.driftturn > 0) // Outward
+					driftadditive -= abs(player->cmd.driftturn)/75;
+			}
+
+			// Disable drift-sparks until you're going fast enough
+			if (player->kartstuff[k_getsparks] == 0 || (player->kartstuff[k_offroad] && !player->kartstuff[k_invincibilitytimer] && !player->kartstuff[k_hyudorotimer] && !player->kartstuff[k_sneakertimer]))
+				driftadditive = 0;
+			if (player->speed > minspeed*2)
+				player->kartstuff[k_getsparks] = 1;
+
+			// Sound whenever you get a different tier of sparks
+			if ((player->kartstuff[k_driftcharge] < dsone && player->kartstuff[k_driftcharge]+driftadditive >= dsone)
+				|| (player->kartstuff[k_driftcharge] < dstwo && player->kartstuff[k_driftcharge]+driftadditive >= dstwo)
+				|| (player->kartstuff[k_driftcharge] < dsthree && player->kartstuff[k_driftcharge]+driftadditive >= dsthree))
+			{
+				//S_StartSound(player->mo, sfx_s3ka2);
+				if (P_IsLocalPlayer(player)) // UGHGHGH...
+					S_StartSoundAtVolume(player->mo, sfx_s3ka2, 192); // Ugh...
+
+				player->driftsparkGrowTimer = DRIFTSPARKGROWTICS;
 			}
 		}
+		else
+		{
+			driftadditive = 0;
+		}
 
-
-		// moved this below sounds to help with scaling
 		// This spawns the drift sparks
 		if (player->kartstuff[k_driftcharge] + driftadditive >= dsone)
 			K_SpawnDriftSparks(player);
 
-		player->kartstuff[k_driftcharge] += driftadditive;
-		player->kartstuff[k_driftend] = 0;
-	}
-
-	{
-		//im putting this in a block because i want the variables here, not at the top of the block
-		UINT8 pindex;
-
-		// hack to find the correct player number
-		for (pindex = 0; pindex < MAXPLAYERS; pindex++)
+		if (onground)
 		{
-			if (player == &players[pindex])
-			{
-				if (driftsparkGrowTimer[pindex])
-					driftsparkGrowTimer[pindex]--;
-				break;
-			}
+			player->kartstuff[k_driftcharge] += driftadditive;
+			player->kartstuff[k_driftend] = 0;
 		}
 	}
 
+	if (player->driftsparkGrowTimer)
+		player->driftsparkGrowTimer--;
 
 	// Stop drifting
 	if (player->kartstuff[k_spinouttimer] > 0 || player->speed < minspeed)
 	{
 		player->kartstuff[k_drift] = player->kartstuff[k_driftcharge] = 0;
 		player->kartstuff[k_aizdriftstrat] = player->kartstuff[k_brakedrift] = 0;
-
-		if (!player->sliproll)
-		{
-			player->sliptidemem = 0;
-			player->sliproll = 0;
-		}
-
 		player->kartstuff[k_getsparks] = 0;
 	}
 
@@ -5720,8 +6177,6 @@ static void K_KartDrift(player_t *player, boolean onground)
 
 		if (player->sliproll < (32*ANG1))
 			player->sliproll += (4*ANG1);
-
-		player->sliptidemem = player->kartstuff[k_aizdriftstrat];
 	}
 
 	if (player->kartstuff[k_drift]
@@ -5742,7 +6197,7 @@ static void K_KartDrift(player_t *player, boolean onground)
 void K_KartUpdatePosition(player_t *player)
 {
 	fixed_t position = 1;
-	fixed_t oldposition = player->kartstuff[k_position];
+	fixed_t oldposition;
 	fixed_t i, ppcd, pncd, ipcd, incd;
 	fixed_t pmo, imo;
 	mobj_t *mo;
@@ -5750,6 +6205,8 @@ void K_KartUpdatePosition(player_t *player)
 	if (player->spectator || !player->mo)
 		return;
 
+	oldposition = player->kartstuff[k_position];
+
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i] || players[i].spectator || !players[i].mo)
@@ -5771,32 +6228,47 @@ void K_KartUpdatePosition(player_t *player)
 				// This checks every thing on the map, and looks for MT_BOSS3WAYPOINT (the thing we're using for checkpoint wp's, for now)
 				for (mo = waypointcap; mo != NULL; mo = mo->tracer)
 				{
-					pmo = P_AproxDistance(P_AproxDistance(	mo->x - player->mo->x,
-															mo->y - player->mo->y),
-															mo->z - player->mo->z) / FRACUNIT;
-					imo = P_AproxDistance(P_AproxDistance(	mo->x - players[i].mo->x,
-															mo->y - players[i].mo->y),
-															mo->z - players[i].mo->z) / FRACUNIT;
+					const boolean isprevcheckpointp = mo->health == player->starpostnum;
+					const boolean isnextcheckpointp = mo->health == (player->starpostnum + 1);
 
-					if (mo->health == player->starpostnum && (!mo->movecount || mo->movecount == player->laps+1))
+					if ((isprevcheckpointp || isnextcheckpointp) && (!mo->movecount || mo->movecount == player->laps+1))
 					{
-						player->kartstuff[k_prevcheck] += pmo;
-						ppcd++;
+						pmo = P_AproxDistance(P_AproxDistance(	mo->x - player->mo->x,
+																mo->y - player->mo->y),
+																mo->z - player->mo->z) / FRACUNIT;
+
+						if (isprevcheckpointp)
+						{
+							player->kartstuff[k_prevcheck] += pmo;
+							ppcd++;
+						}
+
+						if (isnextcheckpointp)
+						{
+							player->kartstuff[k_nextcheck] += pmo;
+							pncd++;
+						}
 					}
-					if (mo->health == (player->starpostnum + 1) && (!mo->movecount || mo->movecount == player->laps+1))
+
+					const boolean isprevcheckpointi = mo->health == players[i].starpostnum;
+					const boolean isnextcheckpointi = mo->health == (players[i].starpostnum + 1);
+
+					if ((isprevcheckpointi || isnextcheckpointi) && (!mo->movecount || mo->movecount == players[i].laps+1))
 					{
-						player->kartstuff[k_nextcheck] += pmo;
-						pncd++;
-					}
-					if (mo->health == players[i].starpostnum && (!mo->movecount || mo->movecount == players[i].laps+1))
-					{
-						players[i].kartstuff[k_prevcheck] += imo;
-						ipcd++;
-					}
-					if (mo->health == (players[i].starpostnum + 1) && (!mo->movecount || mo->movecount == players[i].laps+1))
-					{
-						players[i].kartstuff[k_nextcheck] += imo;
-						incd++;
+						imo = P_AproxDistance(P_AproxDistance(	mo->x - players[i].mo->x,
+																mo->y - players[i].mo->y),
+																mo->z - players[i].mo->z) / FRACUNIT;
+
+						if (isprevcheckpointi)
+						{
+							players[i].kartstuff[k_prevcheck] += imo;
+							ipcd++;
+						}
+						if (isnextcheckpointi )
+						{
+							players[i].kartstuff[k_nextcheck] += imo;
+							incd++;
+						}
 					}
 				}
 
@@ -6073,7 +6545,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 
 	K_KartUpdatePosition(player);
 
-	if (!player->exiting)
+	if (LIKELY(!player->exiting))
 	{
 		if (player->kartstuff[k_oldposition] < player->kartstuff[k_position]) // But first, if you lost a place,
 		{
@@ -6235,10 +6707,10 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 							P_SetScale(overlay, player->mo->scale);
 						}
 						player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds
+
 						if (P_IsLocalPlayer(player) && cv_supermusic.value == 1 && cv_birdmusic.value)
 							S_ChangeMusicSpecial("kinvnc");
-						else
-							S_StartSound(player->mo, (cv_kartinvinsfx.value ? sfx_alarmi : sfx_kinvnc));
+
 						P_RestoreMusic(player);
 						K_PlayPowerGloatSound(player->mo);
 						player->kartstuff[k_itemamount]--;
@@ -6442,8 +6914,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 							player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds
 							if (P_IsLocalPlayer(player) && cv_growmusic.value == 1 && cv_birdmusic.value )
 								S_ChangeMusicSpecial("kgrow");
-							else
-								S_StartSound(player->mo, (cv_kartinvinsfx.value ? sfx_alarmg : sfx_kgrow));
 							P_RestoreMusic(player);
 							S_StartSound(player->mo, sfx_kc5a);
 						}
@@ -6655,35 +7125,18 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 
 	K_KartDrift(player, onground);
 
-	if ((!player->kartstuff[k_aizdriftstrat])||(!P_IsObjectOnGround(player->mo))||(player->kartstuff[k_drift]))
+	if (player->sliproll && ((!player->kartstuff[k_aizdriftstrat]) || (!P_IsObjectOnGround(player->mo)) || (player->kartstuff[k_drift])))
 	{
-		if (player->sliproll && (player->sliproll > 0))
-			player->sliproll -= (4*ANG1);
+		player->sliproll -= (4*ANG1);
 	}
 
-	if (cv_gravstretch.value > 13107)
+	// funneh Saturn sprite stuff
+	if (cv_gravstretch.value)
 		K_StretchPlayerGravity(player);
-	else
-	{
-		player->mo->spritexscale = player->mo->realxscale;
-		player->mo->spriteyscale = player->mo->realyscale;
-	}
-
-	boolean usedist = false;
-
-	if (cv_sloperolldist.value > 0)
-		usedist = true;
-	if ((cv_spriteroll.value) && (cv_sloperoll.value))
-	{
-		if ((!player->mo->salty_jump)) // seeing a character rotate mid-hop looks really janky
-			K_RollMobjBySlopes(player->mo, usedist);
-	}
-	else
-	{
-		player->mo->sloperoll = FixedAngle(0);
-		player->mo->slopepitch = FixedAngle(0);
-	}
+	else if (cv_saltyhop.value && cv_saltysquish.value)
+		K_SaltySquish(player);
 
+	K_RollMobjBySlopes(player->mo, player->mo->standingslope);
 
 	// Quick Turning
 	// You can't turn your kart when you're not moving.
@@ -6714,10 +7167,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 		if ((leveltime == starttime-(3*TICRATE)) || (leveltime == starttime-(2*TICRATE)) || (leveltime == starttime-TICRATE))
 			S_StartSound(NULL, sfx_s3ka7);
 		if (leveltime == starttime)
-		{
 			S_StartSound(NULL, sfx_s3kad);
-			S_StopMusic(); // The GO! sound stops the level start ambience
-		}
 	}
 
 	// Start charging once you're given the opportunity.
@@ -6791,14 +7241,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 	}
 
 	// salty hop! i wanna die
-	if (cv_saltyhop.value)
-		K_QuiteSaltyHop(player);
-	else {
-		player->mo->spriteyoffset = 0;
-		player->mo->salty_jump = false;
-		player->mo->salty_zoffset = 0;
-		player->mo->salty_momz = 0;
-	}
+	K_QuiteSaltyHop(player);
 }
 
 void K_CalculateBattleWanted(void)
@@ -7134,6 +7577,7 @@ void K_UpdateSpectateGrief(void)
 }
 
 //}
+<<<<<<< HEAD
 
 //{ SRB2kart HUD Code
 
@@ -10915,3 +11359,5 @@ void K_drawKartHUD(void)
 }
 
 //}
+=======
+>>>>>>> Saturn-Next
diff --git a/src/k_kart.h b/src/k_kart.h
index 6c6215926..0fb9e73cf 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -6,40 +6,40 @@
 #ifndef __K_KART__
 #define __K_KART__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomdef.h"
 #include "d_player.h" // Need for player_t
 
 #define KART_FULLTURN 800
 
+<<<<<<< HEAD
 void K_LoadExtraVFX(void);
+=======
+>>>>>>> Saturn-Next
 
 extern UINT8 colortranslations[MAXTRANSLATIONS][16];
 extern const char *KartColor_Names[MAXSKINCOLORS];
 extern const UINT8 KartColor_Opposite[MAXSKINCOLORS*2];
+UINT8 K_RainbowColor(void);
 void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor);
 void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color, boolean local);
 UINT8 K_GetKartColorByName(const char *name);
-UINT8 K_GetHudColor(void);
-boolean K_UseColorHud(void);
 
-void K_RegisterKartStuff(void);
+void K_RegisterServerKartStuff(void);
+void K_RegisterClientKartStuff(void);
 
-extern consvar_t cv_colorizedhud;
-extern consvar_t cv_colorizeditembox;
-extern consvar_t cv_colorizedhudcolor;
-extern consvar_t cv_darkitembox;
-extern consvar_t cv_biglaps;
-extern consvar_t cv_highresportrait;
-extern consvar_t cv_stat_xoffset;
-extern consvar_t cv_stat_yoffset;
-extern consvar_t cv_showstats;
-extern consvar_t cv_battlespeedo;
-
-#define NUMSPEEDOSTUFF 6
-extern CV_PossibleValue_t speedo_cons_t[NUMSPEEDOSTUFF];
+extern consvar_t cv_coloredspeedlines, cv_coloredsneakertrail;
+extern consvar_t cv_bananajitter;
+extern consvar_t cv_bananthrowroll;
+extern consvar_t cv_airsparks;
 
 boolean K_IsPlayerLosing(player_t *player);
 boolean K_IsPlayerWanted(player_t *player);
+INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush);
+INT32 K_FindUseodds(player_t *player, fixed_t mashed, INT32 pingame, INT32 bestbumper, boolean spbrush, boolean dontforcespb);
 void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid);
 void K_FlipFromObject(mobj_t *mo, mobj_t *master);
 void K_MatchGenericExtraFlags(mobj_t *mo, mobj_t *master);
@@ -56,7 +56,9 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor);
 void K_StealBumper(player_t *player, player_t *victim, boolean force);
 void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, angle_t rotangle, boolean spawncenter, boolean ghostit, mobj_t *source);
 void K_SpawnMineExplosion(mobj_t *source, UINT8 color);
-void K_RollMobjBySlopes(mobj_t *mo, boolean usedistance);
+boolean K_CheckSlopeRollDist(mobj_t *mobj);
+boolean K_ShouldSlopeRoll(mobj_t *mobj);
+void K_RollMobjBySlopes(mobj_t *mo, pslope_t *slope);
 void K_SpawnBoostTrail(player_t *player);
 void K_SpawnSparkleTrail(mobj_t *mo);
 void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent);
@@ -94,28 +96,12 @@ void K_SpawnWaterRunParticles(mobj_t *mobj);
 void K_PlayAttackTaunt(mobj_t *source);
 void K_PlayBoostTaunt(mobj_t *source);
 void K_PlayOvertakeSound(mobj_t *source);
-void K_PlayHitEmSound(mobj_t *source);
+void K_PlayHitEmSound(mobj_t *source, mobj_t *victim);
 void K_PlayPowerGloatSound(mobj_t *source);
 
-const char *K_GetItemPatch(UINT8 item, boolean tiny);
-INT32 K_calcSplitFlags(INT32 snapflags);
-void K_LoadKartHUDGraphics(void);
-void K_drawKartHUD(void);
-void K_drawKartFreePlay(UINT32 flashtime);
-void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UINT8 mode);
-
-typedef struct
-{
-	INT32 x;
-	INT32 y;
-	INT32 flags;
-} drawinfo_t;
-
-patch_t *K_getItemBoxPatch(boolean small, boolean dark);
-patch_t *K_getItemMulPatch(boolean small);
-void K_getItemBoxDrawinfo(drawinfo_t *out);
-void K_getLapsDrawinfo(drawinfo_t *out);
-void K_getMinimapDrawinfo(drawinfo_t *out);
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
 // =========================================================================
 #endif  // __K_KART__
diff --git a/src/k_stats.c b/src/k_stats.c
new file mode 100644
index 000000000..538b4e3e3
--- /dev/null
+++ b/src/k_stats.c
@@ -0,0 +1,214 @@
+#include "k_stats.h"
+#include "doomstat.h"
+#include "g_game.h"
+#include "byteptr.h"
+#include "z_zone.h"
+
+kartstats_t kartstats = {0};
+
+void K_StatTicker(void)
+{
+	if (demo.playback)
+		return;
+
+	kartstats.totalplaytime++;
+
+	if (netgame)
+		kartstats.onlineplaytime++;
+	else if (modeattacking)
+		kartstats.raplaytime++;
+
+	if (G_RaceGametype())
+		kartstats.raceplaytime++;
+	else
+		kartstats.battleplaytime++;
+
+	// Should this also track splitscreen players?
+	if (!players[consoleplayer].spectator)
+	{
+		player_t *p = &players[consoleplayer];
+
+		if (p->kartstuff[k_position] == spbplace)
+			kartstats.spbtargettime++;
+
+		if (max(p->kartstuff[k_spinouttimer], p->kartstuff[k_wipeoutslow]) > 0)
+			kartstats.spinouttime++;
+	}
+}
+
+void K_StatPlayerHit(player_t *victim, player_t *source)
+{
+	if (demo.playback)
+		return;
+
+	if (victim == &players[consoleplayer])
+	{
+		if (victim == source)
+			kartstats.selfhits++;
+	}
+	else if (source == &players[consoleplayer])
+		kartstats.hits++;
+}
+
+void K_StatPlayerSink(player_t *victim, player_t *source)
+{
+	if (demo.playback)
+		return;
+
+	if (victim == &players[consoleplayer])
+		kartstats.sinked++;
+	else if (source == &players[consoleplayer])
+		kartstats.sinks++;
+}
+
+void K_StatRound(void)
+{
+	if (demo.playback)
+		return;
+
+	int numplayers = 0;
+
+	for (int i = 0; i < MAXPLAYERS; ++i)
+	{
+		if (playeringame[i] && !players[i].spectator)
+			++numplayers;
+	}
+
+	if (numplayers > 1 && !players[consoleplayer].spectator)
+	{
+		if (players[consoleplayer].kartstuff[k_position] == 1)
+			kartstats.totalwins++;
+		else if (players[consoleplayer].kartstuff[k_position] <= 3) // Should this check if there are more than 3 players in game?
+			kartstats.totalpodium++;
+	}
+}
+
+void K_EraseStats(void)
+{
+	// The only field we want to remember
+	boolean vanilla = kartstats.vanilla;
+
+	if (kartstats.copy)
+		Z_Free(kartstats.copy);
+
+	memset(&kartstats, 0, sizeof(kartstats_t));
+
+	kartstats.vanilla = vanilla;
+}
+
+static void K_ReadStatsCustom(savebuffer_t *save)
+{
+	kartstats.size = READUINT32(save->p);
+	kartstats.version = READUINT32(save->p);
+
+	// So many similar-looking read's... scary...
+	kartstats.raplaytime = READUINT32(save->p);
+	kartstats.onlineplaytime = READUINT32(save->p);
+	kartstats.raceplaytime = READUINT32(save->p);
+	kartstats.battleplaytime = READUINT32(save->p);
+	kartstats.spbtargettime = READUINT32(save->p);
+	kartstats.spinouttime = READUINT32(save->p);
+	kartstats.totalwins = READUINT32(save->p);
+	kartstats.totalpodium = READUINT32(save->p);
+	kartstats.hits = READUINT32(save->p);
+	kartstats.selfhits = READUINT32(save->p);
+	kartstats.sinks = READUINT32(save->p);
+	kartstats.sinked = READUINT32(save->p);
+	kartstats.respawns = READUINT32(save->p);
+
+	// If kartstats gets updated, uncomment this and read next fields after this early return. Do same on next updates,
+	// this way even data is read on different versions, it doesn't get corrupted (as long as fields aren't removed, which shouldn't happen)
+	//if (kartstats.version < 2)
+	//	return;
+	//
+	//kartstats.somenewfield = READUINT32(save->p);
+}
+
+void K_ReadStats(savebuffer_t *save, boolean vanilla)
+{
+	// Basically, free old kartstats.copy if needed and memset kartstats with zeros
+	K_EraseStats();
+
+	kartstats.vanilla = vanilla;
+
+	kartstats.totalplaytime = READUINT32(save->p);
+	kartstats.matchesplayed = READUINT32(save->p);
+
+	// Vanilla only has those 2
+	if (vanilla)
+		return;
+
+	// Save where block of custom stats starts
+	UINT8 *customblockstart = save->p;
+
+	K_ReadStatsCustom(save);
+
+	// Make a copy of entire custom stats block, so unread values will still be written back
+	kartstats.copy = Z_Malloc(kartstats.size, PU_STATIC, NULL);
+	memcpy(kartstats.copy, customblockstart, kartstats.size);
+
+	// If there were extra fields we couldn't read, skip them
+	save->p = customblockstart + kartstats.size;
+}
+
+static void K_WriteStatsCustom(savebuffer_t *save)
+{
+	// Update, if needed
+	kartstats.version = max(kartstats.version, KARTSTATSVERSION);
+
+	WRITEUINT32(save->p, kartstats.size); // Note: if we will end up writing more that stored in there, this field in save file would be updated
+	WRITEUINT32(save->p, kartstats.version);
+
+	// Version 1
+	WRITEUINT32(save->p, kartstats.raplaytime);
+	WRITEUINT32(save->p, kartstats.onlineplaytime);
+	WRITEUINT32(save->p, kartstats.raceplaytime);
+	WRITEUINT32(save->p, kartstats.battleplaytime);
+	WRITEUINT32(save->p, kartstats.spbtargettime);
+	WRITEUINT32(save->p, kartstats.spinouttime);
+	WRITEUINT32(save->p, kartstats.totalwins);
+	WRITEUINT32(save->p, kartstats.totalpodium);
+	WRITEUINT32(save->p, kartstats.hits);
+	WRITEUINT32(save->p, kartstats.selfhits);
+	WRITEUINT32(save->p, kartstats.sinks);
+	WRITEUINT32(save->p, kartstats.sinked);
+	WRITEUINT32(save->p, kartstats.respawns);
+
+	// No need for early returns, but please mark each new block of write's with version it corresponds to :3
+
+	// Version 2
+	//WRITEUINT32(save->p, kartstats.somenewfield);
+}
+
+void K_WriteStats(savebuffer_t *save, boolean vanilla)
+{
+	WRITEUINT32(save->p, kartstats.totalplaytime);
+	WRITEUINT32(save->p, kartstats.matchesplayed);
+
+	// Vanilla only has those 2
+	if (vanilla)
+		return;
+
+	// Now need to be careful... We save start of custom stats block
+	UINT8 *customblockstart = save->p;
+
+	// Write everything we know how to write
+	K_WriteStatsCustom(save);
+
+	// Calculate size of data that we wrote
+	UINT32 size = (UINT32)(save->p - customblockstart);
+
+	// Now, if we wrote less data than save originally had, that means our copy that we kept in K_ReadStats
+	// has stats from newer version that we need to append
+	if (size < kartstats.size)
+	{
+		I_Assert(kartstats.copy != NULL); // If kartstats.copy is null, kartstats.size **always** should be 0, this can only happen if we create new save
+		WRITEMEM(save->p, kartstats.copy + size, kartstats.size - size);
+	}
+	else if (size > kartstats.size) // No need to do anything if we wrote exactly same amount...
+	{
+		// ...but, if we wrote more, we need to update size field in header. **It's always located at start of block**
+		// So we can just:
+		WRITEUINT32(customblockstart, size);
+	}
+}
diff --git a/src/k_stats.h b/src/k_stats.h
new file mode 100644
index 000000000..bd145de56
--- /dev/null
+++ b/src/k_stats.h
@@ -0,0 +1,66 @@
+#ifndef __K_STATS__
+#define __K_STATS__
+
+#include "doomtype.h"
+#include "d_player.h"
+#include "p_saveg.h"
+
+#define KARTSTATSVERSION 1
+
+typedef struct kartstats_s {
+	// Remember if stats we loaded are vanilla ones or not
+	boolean vanilla;
+
+	// Vanilla
+	tic_t totalplaytime;
+	UINT32 matchesplayed;
+
+	// Custom data, fields go in same order as they are written into game save
+
+	// IMPORTANT: size **must be first**, so K_WriteStats can overwrite it (not that we're gonna change order, but just in case)
+	UINT32 size; // Size required for our stats. If older version reads save from newer one, it will just skip unread fields, avoiding reading corrupted values
+	UINT32 version; // Version, so we know which fields we actually can read
+
+	tic_t raplaytime;
+	tic_t onlineplaytime;
+	tic_t raceplaytime;
+	tic_t battleplaytime;
+	tic_t spbtargettime;
+	tic_t spinouttime;
+	UINT32 totalwins; // 1st place
+	UINT32 totalpodium; // 2nd and 3rd place, *but not 1st*
+	UINT32 hits;
+	UINT32 selfhits;
+	UINT32 sinks; // Times hitting *others* by kitchen sink
+	UINT32 sinked; // Times *being hit* by kitchen sink
+	UINT32 respawns;
+
+	UINT8 *copy; // Copy of stats block that has been read from file. In case we're older version that reads newer save, we will keep values that we couldn't read
+} kartstats_t;
+
+extern kartstats_t kartstats;
+
+// Note: All stat-tracking functions check for demo.playback and early return if its true
+
+// Update global stats such as total play time, etc
+void K_StatTicker(void);
+
+// Update hit-related stats (PlayerSpin, PlayerSquish, PlayerExplode)
+void K_StatPlayerHit(player_t *victim, player_t *source);
+
+// Separate from stuff above
+void K_StatPlayerSink(player_t *victim, player_t *source);
+
+// Update round-related stats (such as matchesplayed, totalwins, etc)
+void K_StatRound(void);
+
+void K_EraseStats(void);
+
+// If vanilla is true, only read vanilla-supported fields. Everything else is initialized to 0
+void K_ReadStats(savebuffer_t *save, boolean vanilla);
+
+// Same as above, except it just doesn't write non-vanilla fields if vanilla is true
+void K_WriteStats(savebuffer_t *save, boolean vanilla);
+
+
+#endif
diff --git a/src/locale/en.po b/src/locale/en.po
deleted file mode 100644
index ce4510802..000000000
--- a/src/locale/en.po
+++ /dev/null
@@ -1,4023 +0,0 @@
-# Sonic Robo Blast 2 translation PO file.
-
-# Copyright (C) Sonic Team Junior
-
-# 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.
-
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: 2.1\n"
-"Report-Msgid-Bugs-To: Callum Dickinson <callum@huttradio.co.nz>\n"
-"POT-Creation-Date: 2011-02-04 23:01+1300\n"
-"PO-Revision-Date: 2011-02-04 23:01+1300\n"
-"Last-Translator: Callum Dickinson <callum@huttradio.co.nz>\n"
-"Language-Team: Sonic Team Junior <stjr@srb2.org>\n"
-"Language: English\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: command.c:103
-msgid "Command buffer full!\n"
-msgstr ""
-
-#: command.c:480
-#, c-format
-msgid "Unknown command '%s'\n"
-msgstr ""
-
-#: command.c:497
-msgid "alias <name> <command>\n"
-msgstr ""
-
-#: command.c:574
-msgid "exec <filename> : run a script file\n"
-msgstr ""
-
-#: command.c:584
-#, c-format
-msgid "couldn't execute file %s\n"
-msgstr ""
-
-#: command.c:589
-#, c-format
-msgid "executing %s\n"
-msgstr ""
-
-#: command.c:623
-#, c-format
-msgid "Variable %s:\n"
-msgstr ""
-
-#: command.c:624
-msgid "  flags :"
-msgstr ""
-
-#: command.c:643
-#, c-format
-msgid "  range from %d to %d\n"
-msgstr ""
-
-#: command.c:645 command.c:662 command.c:666
-#, c-format
-msgid " Current value: %d\n"
-msgstr ""
-
-#: command.c:650
-#, c-format
-msgid "  possible value : %s\n"
-msgstr ""
-
-#: command.c:660
-#, c-format
-msgid " Current value: %s\n"
-msgstr ""
-
-#: command.c:669
-msgid "No Help for this command/variable\n"
-msgstr ""
-
-#: command.c:674
-msgid "Commands\n"
-msgstr ""
-
-#: command.c:688
-msgid ""
-"\n"
-"Variables\n"
-msgstr ""
-
-#: command.c:696
-msgid ""
-"\n"
-"read help file for more or type help <command or variable>\n"
-msgstr ""
-
-#: command.c:698
-#, c-format
-msgid "Total : %d\n"
-msgstr ""
-
-#: command.c:712
-msgid "Toggle <cvar_name> : Toggle the value of a cvar\n"
-msgstr ""
-
-#: command.c:718
-#, c-format
-msgid "%s is not a cvar\n"
-msgstr ""
-
-#: command.c:724
-#, c-format
-msgid "%s is not a boolean value\n"
-msgstr ""
-
-#: command.c:912
-#, c-format
-msgid "Variable %s is already defined\n"
-msgstr ""
-
-#: command.c:919
-#, c-format
-msgid "%s is a command name\n"
-msgstr ""
-
-#: command.c:942
-#, c-format
-msgid "variable %s has CV_NOINIT without CV_CALL"
-msgstr ""
-
-#: command.c:945
-#, c-format
-msgid "variable %s has CV_CALL without a function"
-msgstr ""
-
-#: command.c:1025
-#, c-format
-msgid "Bounded cvar \"%s\" without maximum!"
-msgstr ""
-
-#: command.c:1086 r_things.c:2527
-#, c-format
-msgid "\"%s\" is not a possible value for \"%s\"\n"
-msgstr ""
-
-#: command.c:1089
-#, c-format
-msgid "Variable %s default value \"%s\" is not a possible value\n"
-msgstr ""
-
-#: command.c:1117 command.c:1120
-#, c-format
-msgid "%s set to %s\n"
-msgstr ""
-
-#: command.c:1145
-#, c-format
-msgid "Illegal netvar command received from %s\n"
-msgstr ""
-
-#: command.c:1165
-#, c-format
-msgid "Netvar not found with netid %hu\n"
-msgstr ""
-
-#: command.c:1169 command.c:1171
-#, c-format
-msgid "Netvar received: %s [netid=%d] value %s\n"
-msgstr ""
-
-#: command.c:1227
-msgid "CV_Set: no variable\n"
-msgstr ""
-
-#: command.c:1249
-#, c-format
-msgid "Only the server can change this variable: %s %s\n"
-msgstr ""
-
-#: command.c:1258 d_netcmd.c:4290
-msgid ""
-"Changing this variable\n"
-"requires cheats to be enabled.\n"
-"Do you wish to enable cheats? (Y/N)\n"
-msgstr ""
-
-#: command.c:1260
-msgid "Cheats must be enabled to use this.\n"
-msgstr ""
-
-#: command.c:1282
-#, c-format
-msgid "This variable can't be changed while in netgame: %s %s\n"
-msgstr ""
-
-#: command.c:1516
-#, c-format
-msgid "\"%s\" is \"%s\" default is \"%s\"\n"
-msgstr ""
-
-#: console.c:165
-#, c-format
-msgid "Number of console HUD lines is now %d\n"
-msgstr ""
-
-#: console.c:193
-msgid "English keymap.\n"
-msgstr ""
-
-#: console.c:207
-msgid "bind <keyname> [<command>]\n"
-msgstr ""
-
-#: console.c:208
-msgid "bind table :\n"
-msgstr ""
-
-#: console.c:217
-msgid "Empty\n"
-msgstr ""
-
-#: console.c:224
-msgid "Invalid key name\n"
-msgstr ""
-
-#: console.c:1072
-msgid "Press ENTER to continue\n"
-msgstr ""
-
-#: d_clisrv.c:201 d_clisrv.c:203
-#, c-format
-msgid ""
-"No more place in the buffer for netcmd %d\n"
-"localtextcmd is %d\n"
-"nparam is %s\n"
-msgstr ""
-
-#: d_clisrv.c:275
-#, c-format
-msgid "Got unknown net command [%s]=%d (max %d)\n"
-msgstr ""
-
-#: d_clisrv.c:381
-msgid "Sending join request...\n"
-msgstr ""
-
-#: d_clisrv.c:577 d_clisrv.c:599 d_clisrv.c:649
-msgid "No more free memory for savegame\n"
-msgstr ""
-
-#: d_clisrv.c:665
-#, c-format
-msgid "Didn't save %s for netgame"
-msgstr ""
-
-#: d_clisrv.c:686
-#, c-format
-msgid "Loading savegame length %s\n"
-msgstr ""
-
-#: d_clisrv.c:689
-msgid "Can't read savegame sent"
-msgstr ""
-
-#: d_clisrv.c:715 g_game.c:2976
-#, c-format
-msgid "Map is now \"%s"
-msgstr ""
-
-#: d_clisrv.c:720 g_game.c:2981 st_stuff.c:776 st_stuff.c:788 st_stuff.c:799
-#: st_stuff.c:810 st_stuff.c:821 st_stuff.c:832 st_stuff.c:843 st_stuff.c:854
-#: st_stuff.c:865 st_stuff.c:876 st_stuff.c:887 st_stuff.c:898 st_stuff.c:909
-#: st_stuff.c:920
-msgid "ZONE"
-msgstr ""
-
-#: d_clisrv.c:728
-msgid "Can't load the level!\n"
-msgstr ""
-
-#: d_clisrv.c:732 d_clisrv.c:740
-#, c-format
-msgid "WARNING: Can't delete %s"
-msgstr ""
-
-#: d_clisrv.c:933
-#, c-format
-msgid "Can't delete %s"
-msgstr ""
-
-#: d_clisrv.c:936
-msgid "Press ESC to abort\n"
-msgstr ""
-
-#: d_clisrv.c:938
-msgid "Searching the server...\n"
-msgstr ""
-
-#: d_clisrv.c:940
-msgid "Contacting the server...\n"
-msgstr ""
-
-#: d_clisrv.c:958
-#, c-format
-msgid "Connecting to: %s\n"
-msgstr ""
-
-#: d_clisrv.c:968
-#, c-format
-msgid "Gametype: %s\n"
-msgstr ""
-
-#: d_clisrv.c:969
-#, c-format
-msgid "Version: %d.%.2d.%u\n"
-msgstr ""
-
-#: d_clisrv.c:986
-msgid "Found, "
-msgstr ""
-
-#: d_clisrv.c:998
-#, c-format
-msgid ""
-"Maximum players reached: %d\n"
-"Press ESC"
-msgstr ""
-
-#: d_clisrv.c:1009
-msgid "Checking files...\n"
-msgstr ""
-
-#: d_clisrv.c:1096
-msgid "Network game synchronization aborted.\n"
-msgstr ""
-
-#: d_clisrv.c:1126
-msgid "Cheats have been activated.\n"
-msgstr ""
-
-#: d_clisrv.c:1149
-msgid "Ban List:\n"
-msgstr ""
-
-#: d_clisrv.c:1161
-#, c-format
-msgid "Why: %s\n"
-msgstr ""
-
-#: d_clisrv.c:1167
-msgid " None\n"
-msgstr ""
-
-#: d_clisrv.c:1184
-msgid "Could not save ban list into ban.txt\n"
-msgstr ""
-
-#: d_clisrv.c:1254
-msgid "Could not open ban.txt for ban list\n"
-msgstr ""
-
-#: d_clisrv.c:1288
-msgid ""
-"Connect <serveraddress>: connect to a server\n"
-"Connect ANY: connect to the first lan server found\n"
-"Connect SELF: connect to your own server.\n"
-msgstr ""
-
-#: d_clisrv.c:1296 d_clisrv.c:1327
-msgid ""
-"You cannot connect while in a game\n"
-"End this game first\n"
-msgstr ""
-
-#: d_clisrv.c:1302
-msgid ""
-"You have wad files loaded and/or\n"
-"modified the game in some way.\n"
-"Please restart SRB2 before\n"
-"connecting."
-msgstr ""
-
-#: d_clisrv.c:1343
-msgid "There is no server identification with this network driver\n"
-msgstr ""
-
-#: d_clisrv.c:1349
-msgid "There is no network driver\n"
-msgstr ""
-
-#: d_clisrv.c:1509
-#, c-format
-msgid "num:%2d  node:%2d  %s\n"
-msgstr ""
-
-#: d_clisrv.c:1511
-#, c-format
-msgid "num:%2d  node:%2d  %s\n"
-msgstr ""
-
-#: d_clisrv.c:1539
-#, c-format
-msgid "There is no player named \"%s\"\n"
-msgstr ""
-
-#: d_clisrv.c:1571
-msgid " (verified admin)"
-msgstr ""
-
-#: d_clisrv.c:1574
-msgid " (spectator)"
-msgstr ""
-
-#: d_clisrv.c:1585
-msgid "Ban <playername> or <playernum> <reason>: ban and kick a player\n"
-msgstr ""
-
-#: d_clisrv.c:1602 d_clisrv.c:1757
-msgid "Too many bans! Geez, that's a lot of people you're excluding...\n"
-msgstr ""
-
-#: d_clisrv.c:1635 d_clisrv.c:1680 d_net.c:1142 d_netcmd.c:1911
-#: d_netcmd.c:2207 d_netcmd.c:2577 d_netcmd.c:2928 d_netcmd.c:3007
-#: d_netcmd.c:3068 d_netcmd.c:3141 d_netcmd.c:3238 d_netcmd.c:3301
-#: d_netcmd.c:4406 g_game.c:1611
-msgid "You are not the server. You cannot do this.\n"
-msgstr ""
-
-#: d_clisrv.c:1646
-msgid "Kick <playername> or <playernum> <reason>: kick a player\n"
-msgstr ""
-
-#: d_clisrv.c:1695
-msgid "Server is being shut down remotely. Goodbye!\n"
-msgstr ""
-
-#: d_clisrv.c:1724
-#, c-format
-msgid "Illegal kick command received from %s for player %d\n"
-msgstr ""
-
-#: d_clisrv.c:1727
-#, c-format
-msgid ""
-"So, you must be asking, why is this an illegal kick?\n"
-"Well, let's take a look at the facts, shall we?\n"
-"\n"
-"playernum (this is the guy who did it), he's %d.\n"
-"pnum (the guy he's trying to kick) is %d.\n"
-"playernum's node is %d.\n"
-"That node has %d players.\n"
-"Player 2 on that node is %d.\n"
-"pnum's node is %d.\n"
-"That node has %d players.\n"
-"Player 2 on that node is %d.\n"
-"\n"
-"If you think this is a bug, please report it, including all of the details above.\n"
-msgstr ""
-
-#: d_clisrv.c:1764
-msgid "has been kicked (Go away)\n"
-msgstr ""
-
-#: d_clisrv.c:1768
-msgid "left the game (Broke ping limit)\n"
-msgstr ""
-
-#: d_clisrv.c:1772
-msgid "left the game (Consistency failure)\n"
-msgstr ""
-
-#: d_clisrv.c:1778
-#, c-format
-msgid "Player kicked is #%d\n"
-msgstr ""
-
-#: d_clisrv.c:1784
-#, c-format
-msgid "Player %d is at %d, %d, %d\n"
-msgstr ""
-
-#: d_clisrv.c:1786
-#, c-format
-msgid "Player %d has a null mo\n"
-msgstr ""
-
-#: d_clisrv.c:1792
-msgid "left the game (Connection timeout)\n"
-msgstr ""
-
-#: d_clisrv.c:1795
-msgid "left the game\n"
-msgstr ""
-
-#: d_clisrv.c:1798
-msgid "has been banned (Don't come back)\n"
-msgstr ""
-
-#: d_clisrv.c:1802
-#, c-format
-msgid "has been kicked (%s)\n"
-msgstr ""
-
-#: d_clisrv.c:1806
-#, c-format
-msgid "has been banned (%s)\n"
-msgstr ""
-
-#: d_clisrv.c:1820
-msgid ""
-"Server closed connection\n"
-"(consistency failure)\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1825
-msgid ""
-"Server closed connection\n"
-"(Broke ping limit)\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1828
-msgid ""
-"You have been banned by the server\n"
-"\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1830
-#, c-format
-msgid ""
-"You have been kicked\n"
-"(%s)\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1832
-#, c-format
-msgid ""
-"You have been banned\n"
-"(%s)\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1834
-msgid ""
-"You have been kicked by the server\n"
-"\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:2017
-#, c-format
-msgid "Illegal add player command received from %s\n"
-msgstr ""
-
-#: d_clisrv.c:2039
-#, c-format
-msgid "Player %d has joined the game (node %d)\n"
-msgstr ""
-
-#: d_clisrv.c:2063
-#, c-format
-msgid "Player Address is %s\n"
-msgstr ""
-
-#: d_clisrv.c:2135
-#, c-format
-msgid "Server added player %d node %d\n"
-msgstr ""
-
-#: d_clisrv.c:2175
-msgid "Starting Server....\n"
-msgstr ""
-
-#: d_clisrv.c:2666
-msgid ""
-"You have been banned\n"
-"from the server"
-msgstr ""
-
-#: d_clisrv.c:2669
-#, c-format
-msgid ""
-"Different SRB2 versions cannot\n"
-"play a netgame!\n"
-"(server version %d.%d.%d)"
-msgstr ""
-
-#: d_clisrv.c:2671
-msgid ""
-"The server is not accepting\n"
-"joins for the moment"
-msgstr ""
-
-#: d_clisrv.c:2673
-#, c-format
-msgid "Maximum players reached: %d"
-msgstr ""
-
-#: d_clisrv.c:2675
-msgid ""
-"Too many players from\n"
-"this node."
-msgstr ""
-
-#: d_clisrv.c:2677
-msgid ""
-"No players from\n"
-"this node."
-msgstr ""
-
-#: d_clisrv.c:2695
-msgid "Server couldn't send info, please try again"
-msgstr ""
-
-#: d_clisrv.c:2719
-msgid ""
-"Server has shutdown\n"
-"\n"
-"Press Esc"
-msgstr ""
-
-#: d_clisrv.c:2728
-msgid ""
-"Server Timeout\n"
-"\n"
-"Press Esc"
-msgstr ""
-
-#: d_clisrv.c:2754
-#, c-format
-msgid "Received packet from unknown host %d\n"
-msgstr ""
-
-#: d_clisrv.c:2781
-#, c-format
-msgid ""
-"Server refuses connection\n"
-"\n"
-"Reason:\n"
-"%s"
-msgstr ""
-
-#: d_clisrv.c:2816
-msgid "Join accepted, waiting for next level change...\n"
-msgstr ""
-
-#: d_clisrv.c:2817
-#, c-format
-msgid "Server accept join gametic=%u mynode=%d\n"
-msgstr ""
-
-#: d_clisrv.c:2855
-#, c-format
-msgid "unknown packet received (%d) from unknown host\n"
-msgstr ""
-
-#: d_clisrv.c:2915
-#, c-format
-msgid "Illegal movement value recieved from node %d\n"
-msgstr ""
-
-#: d_clisrv.c:2940
-#, c-format
-msgid "Consistency failure for player %d, restoring...\n"
-msgstr ""
-
-#: d_clisrv.c:3052 d_clisrv.c:3057
-#, c-format
-msgid "PT_SERVERTICS recieved from non-host %d\n"
-msgstr ""
-
-#: d_clisrv.c:3112 d_clisrv.c:3117
-#, c-format
-msgid "PT_CONSISTENCY recieved from non-host %d\n"
-msgstr ""
-
-#: d_clisrv.c:3135 d_clisrv.c:3140
-#, c-format
-msgid "PT_PING recieved from non-host %d\n"
-msgstr ""
-
-#: d_main.c:822
-#, c-format
-msgid "SRB2.SRB/SRB2.WAD not found! Expected in %s, ss files: %s and %s\n"
-msgstr ""
-
-#: d_main.c:982
-msgid "Development mode ON.\n"
-msgstr ""
-
-#: d_main.c:995
-msgid "Please set $HOME to your home directory\n"
-msgstr ""
-
-#: d_main.c:1098
-msgid "Z_Init: Init zone memory allocation daemon. \n"
-msgstr ""
-
-#: d_main.c:1104
-msgid "W_Init: Init WADfiles.\n"
-msgstr ""
-
-#: d_main.c:1118 d_main.c:1120
-msgid "A WAD file was not found or not valid\n"
-msgstr ""
-
-#: d_main.c:1169
-msgid "HU_Init: Setting up heads up display.\n"
-msgstr ""
-
-#: d_main.c:1214
-msgid "M_Init: Init miscellaneous info.\n"
-msgstr ""
-
-#: d_main.c:1217
-msgid "R_Init: Init SRB2 refresh daemon - "
-msgstr ""
-
-#: d_main.c:1221
-msgid "S_Init: Setting up sound.\n"
-msgstr ""
-
-#: d_main.c:1237
-msgid "ST_Init: Init status bar.\n"
-msgstr ""
-
-#: d_main.c:1244
-msgid "D_CheckNetGame: Checking network game status.\n"
-msgstr ""
-
-#: d_main.c:1284
-#, c-format
-msgid "Playing demo %s.\n"
-msgstr ""
-
-#: d_net.c:1046
-#, c-format
-msgid "Set extratics to %d\n"
-msgstr ""
-
-#: d_net.c:1058
-#, c-format
-msgid "Network bandwidth set to %d\n"
-msgstr ""
-
-#: d_net.c:1061
-msgid "usage: -bandwidth <byte_per_sec>"
-msgstr ""
-
-#: d_net.c:1077
-msgid "usage: -packetsize <bytes_per_packet>"
-msgstr ""
-
-#: d_net.c:1084
-msgid "Doomcom buffer invalid!"
-msgstr ""
-
-#: d_net.c:1086
-#, c-format
-msgid "Too many nodes (%d), max:%d"
-msgstr ""
-
-#: d_net.c:1094 d_net.c:1109
-#, c-format
-msgid "debug output to: %s\n"
-msgstr ""
-
-#: d_net.c:1111
-#, c-format
-msgid "cannot debug output to file %s!\n"
-msgstr ""
-
-#: d_net.c:1133
-#, c-format
-msgid ""
-"%.2d : %s\n"
-" %d tics, %d ms.\n"
-msgstr ""
-
-#: d_net.c:1137
-#, c-format
-msgid ""
-"%.2d : %s\n"
-" %d ms\n"
-msgstr ""
-
-#: d_netcmd.c:1000
-#, c-format
-msgid "%s renamed to %s\n"
-msgstr ""
-
-#: d_netcmd.c:1007
-#, c-format
-msgid "Player %d sent a bad name change\n"
-msgstr ""
-
-#: d_netcmd.c:1381
-#, c-format
-msgid "There is no player %d!"
-msgstr ""
-
-#: d_netcmd.c:1486
-#, c-format
-msgid "Illegal color change received from %s (team: %d), color: %d)\n"
-msgstr ""
-
-#: d_netcmd.c:1590 d_netcmd.c:1932 d_netcmd.c:3500 d_netcmd.c:4453
-#: m_cheat.c:309 m_cheat.c:343 m_cheat.c:369 m_cheat.c:398 m_cheat.c:432
-#: m_cheat.c:508 m_cheat.c:532 m_cheat.c:551 m_cheat.c:570
-msgid "DEVMODE must be enabled.\n"
-msgstr ""
-
-#: d_netcmd.c:1596
-msgid "rteleport -x <value> -y <value> -z <value>: relative teleport to a location\n"
-msgstr ""
-
-#: d_netcmd.c:1602 d_netcmd.c:1672
-msgid "You can't teleport while in a netgame!\n"
-msgstr ""
-
-#: d_netcmd.c:1608 d_netcmd.c:1678
-msgid "Player is dead, etc.\n"
-msgstr ""
-
-#: d_netcmd.c:1627 d_netcmd.c:1703
-msgid "Not a valid location\n"
-msgstr ""
-
-#: d_netcmd.c:1644
-#, c-format
-msgid "Teleporting by %d, %d, %d...\n"
-msgstr ""
-
-#: d_netcmd.c:1648 d_netcmd.c:1723
-msgid "Unable to teleport to that spot!\n"
-msgstr ""
-
-#: d_netcmd.c:1666
-msgid "teleport -x <value> -y <value> -z <value>: teleport to a location\n"
-msgstr ""
-
-#: d_netcmd.c:1687
-msgid "X value not specified\n"
-msgstr ""
-
-#: d_netcmd.c:1696
-msgid "Y value not specified\n"
-msgstr ""
-
-#: d_netcmd.c:1719
-#, c-format
-msgid "Teleporting to %d, %d, %d...\n"
-msgstr ""
-
-#: d_netcmd.c:1741
-msgid "playdemo <demoname>: playback a demo\n"
-msgstr ""
-
-#: d_netcmd.c:1750 d_netcmd.c:1778
-msgid ""
-"\n"
-"You can't play a demo while in a netgame.\n"
-msgstr ""
-
-#: d_netcmd.c:1758
-#, c-format
-msgid "Playing back demo '%s'.\n"
-msgstr ""
-
-#: d_netcmd.c:1769
-msgid "timedemo <demoname>: time a demo\n"
-msgstr ""
-
-#: d_netcmd.c:1786
-#, c-format
-msgid "Timing demo '%s'.\n"
-msgstr ""
-
-#: d_netcmd.c:1795
-msgid "Stopped demo.\n"
-msgstr ""
-
-#: d_netcmd.c:1840
-#, c-format
-msgid "Map change: mapnum=%d gametype=%d ultmode=%d resetplayers=%d delay=%d skipprecutscene=%d\n"
-msgstr ""
-
-#: d_netcmd.c:1905
-msgid "map <mapname> [-gametype <type> [-force]: warp to map\n"
-msgstr ""
-
-#: d_netcmd.c:1918
-#, c-format
-msgid "Internal game level '%s' not found\n"
-msgstr ""
-
-#: d_netcmd.c:1924
-msgid "Sorry, level change disabled in single player.\n"
-msgstr ""
-
-#: d_netcmd.c:1940
-#, c-format
-msgid "Invalid level name %s\n"
-msgstr ""
-
-#: d_netcmd.c:1965
-msgid "You can't switch gametypes in single player!\n"
-msgstr ""
-
-#: d_netcmd.c:2039
-#, c-format
-msgid ""
-"That level doesn't support %s mode!\n"
-"(Use -force to override)\n"
-msgstr ""
-
-#: d_netcmd.c:2045
-msgid "That level doesn't support Single Player mode!\n"
-msgstr ""
-
-#: d_netcmd.c:2068
-#, c-format
-msgid "Illegal map change received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:2145
-#, c-format
-msgid "Speeding off to %s...\n"
-msgstr ""
-
-#: d_netcmd.c:2201 g_game.c:1604
-msgid "You can't pause here.\n"
-msgstr ""
-
-#: d_netcmd.c:2217
-#, c-format
-msgid "Illegal pause command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:2242
-#, c-format
-msgid "Game paused by %s\n"
-msgstr ""
-
-#: d_netcmd.c:2244
-#, c-format
-msgid "Game unpaused by %s\n"
-msgstr ""
-
-#: d_netcmd.c:2267 d_netcmd.c:3541 d_netcmd.c:4394 d_netcmd.c:4410
-#: m_cheat.c:337 m_cheat.c:363 m_cheat.c:392 m_cheat.c:426 p_tick.c:51
-#: p_tick.c:119
-msgid "You must be in a level to use this.\n"
-msgstr ""
-
-#: d_netcmd.c:2273
-msgid "You may only use this in co-op and single player!"
-msgstr ""
-
-#: d_netcmd.c:2286
-#, c-format
-msgid "Illegal suicide command recieved from %s\n"
-msgstr ""
-
-#: d_netcmd.c:2355
-#, c-format
-msgid "Illegal clear scores command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:2370
-msgid "Scores have been reset by the server.\n"
-msgstr ""
-
-#: d_netcmd.c:2387 d_netcmd.c:2424
-msgid "changeteam <team>: switch to a new team (spectator or playing)\n"
-msgstr ""
-
-#: d_netcmd.c:2389 d_netcmd.c:2426
-msgid "changeteam <team>: switch to a new team (red, blue or spectator)\n"
-msgstr ""
-
-#: d_netcmd.c:2391 d_netcmd.c:2417 d_netcmd.c:2488 d_netcmd.c:2514
-#: d_netcmd.c:2593 d_netcmd.c:2632
-msgid "This command cannot be used outside of Match, Tag or CTF.\n"
-msgstr ""
-
-#: d_netcmd.c:2443 d_netcmd.c:2540 d_netcmd.c:2670
-msgid "Invalid gametype after initial checks!"
-msgstr ""
-
-#: d_netcmd.c:2447 d_netcmd.c:2544
-msgid "You're already on that team!\n"
-msgstr ""
-
-#: d_netcmd.c:2453 d_netcmd.c:2550
-msgid "The server does not allow team change.\n"
-msgstr ""
-
-#: d_netcmd.c:2462 d_netcmd.c:2559 d_netcmd.c:2683
-msgid "No tag status changes after hidetime!\n"
-msgstr ""
-
-#: d_netcmd.c:2484 d_netcmd.c:2521
-msgid "changeteam2 <team>: switch to a new team (spectator or playing)\n"
-msgstr ""
-
-#: d_netcmd.c:2486 d_netcmd.c:2523
-msgid "changeteam2 <team>: switch to a new team (red, blue or spectator)\n"
-msgstr ""
-
-#: d_netcmd.c:2587 d_netcmd.c:2639
-msgid "serverchangeteam <playernum> <team>: switch player to a new team (spectator or playing)\n"
-msgstr ""
-
-#: d_netcmd.c:2589 d_netcmd.c:2641
-msgid "serverchangeteam <playernum> <team>: switch player to a new team (it, notit, playing, or spectator)\n"
-msgstr ""
-
-#: d_netcmd.c:2591 d_netcmd.c:2643
-msgid "serverchangeteam <playernum> <team>: switch player to a new team (red, blue or spectator)\n"
-msgstr ""
-
-#: d_netcmd.c:2674
-msgid "That player is already on that team!\n"
-msgstr ""
-
-#: d_netcmd.c:2704 d_netcmd.c:2719 d_netcmd.c:2758
-#, c-format
-msgid "Illegal team change received from player %s\n"
-msgstr ""
-
-#: d_netcmd.c:2808
-#, c-format
-msgid "Player %s sent illegal team change to team %d\n"
-msgstr ""
-
-#: d_netcmd.c:2872
-#, c-format
-msgid "%s was autobalanced to even the teams.\n"
-msgstr ""
-
-#: d_netcmd.c:2874
-#, c-format
-msgid "%s was scrambled to a different team.\n"
-msgstr ""
-
-#: d_netcmd.c:2878 p_inter.c:2042 p_inter.c:2297 p_inter.c:2569 p_tick.c:507
-#: p_user.c:5529
-#, c-format
-msgid "%s is now IT!\n"
-msgstr ""
-
-#: d_netcmd.c:2880
-#, c-format
-msgid "%s switched to the red team\n"
-msgstr ""
-
-#: d_netcmd.c:2885
-#, c-format
-msgid "%s is no longer IT!\n"
-msgstr ""
-
-#: d_netcmd.c:2887
-#, c-format
-msgid "%s switched to the blue team\n"
-msgstr ""
-
-#: d_netcmd.c:2890 p_user.c:5540
-#, c-format
-msgid "%s entered the game.\n"
-msgstr ""
-
-#: d_netcmd.c:2892
-#, c-format
-msgid "%s became a spectator.\n"
-msgstr ""
-
-#: d_netcmd.c:2934
-msgid "password <password>: change password\n"
-msgstr ""
-
-#: d_netcmd.c:2958
-msgid "login <password>: Administrator login\n"
-msgstr ""
-
-#: d_netcmd.c:2974
-#, c-format
-msgid ""
-"Sending Login...%s\n"
-"(Notice only given if password is correct.)\n"
-msgstr ""
-
-#: d_netcmd.c:2992
-#, c-format
-msgid "%s passed authentication. (%s)\n"
-msgstr ""
-
-#: d_netcmd.c:2996
-#, c-format
-msgid "Password from %d failed (%s)\n"
-msgstr ""
-
-#: d_netcmd.c:3013
-msgid "verify <node>: give admin privileges to a node\n"
-msgstr ""
-
-#: d_netcmd.c:3035
-#, c-format
-msgid "Illegal verification received from %s (serverplayer is %s)\n"
-msgstr ""
-
-#: d_netcmd.c:3052
-msgid "Password correct. You are now a server administrator.\n"
-msgstr ""
-
-#: d_netcmd.c:3062
-msgid "motd <message>: Set a message that clients see upon join.\n"
-msgstr ""
-
-#: d_netcmd.c:3089 d_netcmd.c:3122
-msgid "Message of the day set.\n"
-msgstr ""
-
-#: d_netcmd.c:3108
-#, c-format
-msgid "Illegal motd change received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:3133
-msgid "runsoc <socfile.soc> or <lumpname>: run a soc\n"
-msgstr ""
-
-#: d_netcmd.c:3148
-msgid "Could not find SOC.\n"
-msgstr ""
-
-#: d_netcmd.c:3152 d_netcmd.c:3242 d_netcmd.c:3585 d_netcmd.c:3632
-#: d_netcmd.c:3976 d_netcmd.c:4006 d_netcmd.c:4038 d_netcmd.c:4067
-#: d_netcmd.c:4550 m_cheat.c:279 m_cheat.c:299 m_cheat.c:602 p_mobj.c:2682
-msgid "WARNING: Game must be restarted to record statistics.\n"
-msgstr ""
-
-#: d_netcmd.c:3170
-#, c-format
-msgid "Illegal runsoc command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:3194 d_netcmd.c:3433
-#, c-format
-msgid ""
-"The server tried to add %s,\n"
-"but you don't have this file.\n"
-"You need to find it in order\n"
-"to play on this server."
-msgstr ""
-
-#: d_netcmd.c:3199
-#, c-format
-msgid "Unknown error finding soc file (%s) the server added.\n"
-msgstr ""
-
-#: d_netcmd.c:3222
-msgid "addfile <wadfile.wad>: load wad file\n"
-msgstr ""
-
-#: d_netcmd.c:3268
-#, c-format
-msgid "MD5 calc for %s took %f second\n"
-msgstr ""
-
-#: d_netcmd.c:3273 w_wad.c:246
-#, c-format
-msgid "File %s not found.\n"
-msgstr ""
-
-#: d_netcmd.c:3295
-msgid "You must NOT be in a level to use this.\n"
-msgstr ""
-
-#: d_netcmd.c:3344 d_netcmd.c:3414
-#, c-format
-msgid "Illegal addfile command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:3359
-#, c-format
-msgid "The server doesn't have %s\n"
-msgstr ""
-
-#: d_netcmd.c:3361
-#, c-format
-msgid "Checksum mismatch on %s\n"
-msgstr ""
-
-#: d_netcmd.c:3363
-#, c-format
-msgid "Unknown error finding wad file (%s)\n"
-msgstr ""
-
-#: d_netcmd.c:3381
-#, c-format
-msgid "Illegal delfile command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:3438
-#, c-format
-msgid ""
-"Checksum mismatch while loading %s.\n"
-"Make sure you have the copy of\n"
-"this file that the server has.\n"
-msgstr ""
-
-#: d_netcmd.c:3443
-#, c-format
-msgid "Unknown error finding wad file (%s) the server added.\n"
-msgstr ""
-
-#: d_netcmd.c:3457
-#, c-format
-msgid "There are %d wads loaded:\n"
-msgstr ""
-
-#: d_netcmd.c:3477
-#, c-format
-msgid "SRB2%s (%s %s %s)\n"
-msgstr ""
-
-#: d_netcmd.c:3483
-#, c-format
-msgid ""
-"Mod ID: %d\n"
-"Mod Version: %d\n"
-"Code Base:%d\n"
-msgstr ""
-
-#: d_netcmd.c:3491
-#, c-format
-msgid "Current gametype is %d\n"
-msgstr ""
-
-#: d_netcmd.c:3504
-msgid "jumptoaxis <axisnum>: Jump to axis within current mare.\n"
-msgstr ""
-
-#: d_netcmd.c:3549 d_netcmd.c:4466 m_cheat.c:375 m_cheat.c:410 m_cheat.c:444
-msgid "You can't use this in a netgame.\n"
-msgstr ""
-
-#: d_netcmd.c:3637
-msgid "Objectplace Controls:\\\\Camera L: Cycle backwards      \\Camera R: Cycle forwards       \\     Jump: Float up             \\     Spin: Float down           \\    Throw: Place object         \\Toss Flag: Remove object (buggy)\\"
-msgstr ""
-
-#: d_netcmd.c:3702
-#, c-format
-msgid "Levels will end after %s scores %d point%s.\n"
-msgstr ""
-
-#: d_netcmd.c:3704
-msgid "a team"
-msgstr ""
-
-#: d_netcmd.c:3704
-msgid "someone"
-msgstr ""
-
-#: d_netcmd.c:3709
-msgid "Point limit disabled\n"
-msgstr ""
-
-#: d_netcmd.c:3717
-#, c-format
-msgid "Number of laps set to %d\n"
-msgstr ""
-
-#: d_netcmd.c:3747
-#, c-format
-msgid "Levels will end after %d minute%s.\n"
-msgstr ""
-
-#: d_netcmd.c:3759
-msgid "Time limit disabled\n"
-msgstr ""
-
-#: d_netcmd.c:3783
-#, c-format
-msgid "Gametype was changed from %s to %s\n"
-msgstr ""
-
-#: d_netcmd.c:3948
-#, c-format
-msgid "Illegal color change received from %s (team: %d, color: %d)\n"
-msgstr ""
-
-#: d_netcmd.c:3964 d_netcmd.c:3985 d_netcmd.c:4018 d_netcmd.c:4050
-#: d_netcmd.c:4080
-msgid "You haven't earned this yet.\n"
-msgstr ""
-
-#: d_netcmd.c:4137
-msgid "This command cannot be used outside of Team Match or CTF.\n"
-msgstr ""
-
-#: d_netcmd.c:4264
-msgid "Teams will be scrambled next round.\n"
-msgstr ""
-
-#: d_netcmd.c:4272
-msgid "Cheats cannot be disabled after they are activated. You must restart the server to disable cheats.\n"
-msgstr ""
-
-#: d_netcmd.c:4279 d_netcmd.c:4401
-msgid "You can't use this in single player.\n"
-msgstr ""
-
-#: d_netcmd.c:4373
-msgid "HIDETIME cannot be greater or equal to the time limit!\n"
-msgstr ""
-
-#: d_netcmd.c:4425
-#, c-format
-msgid "Illegal exitlevel command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:4446
-#, c-format
-msgid "Displayplayer is %d\n"
-msgstr ""
-
-#: d_netcmd.c:4454
-msgid "If you want to change the sky interactively on a map, use the linedef executor feature instead.\n"
-msgstr ""
-
-#: d_netcmd.c:4460
-msgid "skynum <sky#>: change the sky\n"
-msgstr ""
-
-#: d_netcmd.c:4470
-#, c-format
-msgid "Previewing sky %s...\n"
-msgstr ""
-
-#: d_netcmd.c:4482
-#, c-format
-msgid "tunes <slot#/default> <speed>: play a slot or the default stage tune at the specified speed(100%%)\n"
-msgstr ""
-
-#: d_netcmd.c:4483
-#, c-format
-msgid "The current tune is: %d\n"
-msgstr ""
-
-#: d_netcmd.c:4491
-#, c-format
-msgid "Valid slots are 1 to %d, or 0 to stop music\n"
-msgstr ""
-
-#: d_netcmd.c:4568
-msgid "modifiedgame is true, but you can save emblem and time data in this mod.\n"
-msgstr ""
-
-#: d_netcmd.c:4570
-msgid "modifiedgame is true, secrets will not be unlocked\n"
-msgstr ""
-
-#: d_netcmd.c:4572
-msgid "modifiedgame is false, you can unlock secrets\n"
-msgstr ""
-
-#: d_netcmd.c:4599
-#, c-format
-msgid "Valid skin numbers are 0 to %d (-1 disables)\n"
-msgstr ""
-
-#: d_netcmd.c:4617 d_netcmd.c:4629
-msgid "You may not change your name when chat is muted.\n"
-msgstr ""
-
-#: d_netcmd.c:4755
-msgid "Chat has been muted.\n"
-msgstr ""
-
-#: d_netcmd.c:4757
-msgid "Chat is no longer muted.\n"
-msgstr ""
-
-#: d_netcmd.c:4789 d_netcmd.c:4807
-msgid "This only works in a netgame.\n"
-msgstr ""
-
-#: d_netcmd.c:4797
-#, c-format
-msgid "%s's score is %u\n"
-msgstr ""
-
-#: d_netcmd.c:4799
-#, c-format
-msgid "The pointlimit is %d\n"
-msgstr ""
-
-#: d_netcmd.c:4811
-#, c-format
-msgid ""
-"The current time is %f.\n"
-"The timelimit is %f\n"
-msgstr ""
-
-#: d_netfil.c:308
-#, c-format
-msgid "searching for '%s' "
-msgstr ""
-
-#: d_netfil.c:317
-msgid "already loaded\n"
-msgstr ""
-
-#: d_netfil.c:326
-#, c-format
-msgid "found %d\n"
-msgstr ""
-
-#: d_netfil.c:654
-#, c-format
-msgid "Downloading %s...(done)\n"
-msgstr ""
-
-#: dehacked.c:2148
-#, c-format
-msgid "Thing %d doesn't exist"
-msgstr ""
-
-#: dehacked.c:2166
-#, c-format
-msgid "Character %d out of range"
-msgstr ""
-
-#: dehacked.c:2201
-#, c-format
-msgid "Level number %d out of range"
-msgstr ""
-
-#: dehacked.c:2209
-#, c-format
-msgid "Cutscene number %d out of range"
-msgstr ""
-
-#: dehacked.c:2217
-#, c-format
-msgid "Unlockable number %d out of range"
-msgstr ""
-
-#: dehacked.c:2225
-#, c-format
-msgid "Frame %d doesn't exist"
-msgstr ""
-
-#: dehacked.c:2252
-#, c-format
-msgid "Sound %d doesn't exist"
-msgstr ""
-
-#: dehacked.c:2277
-#, c-format
-msgid "HUD item number %d out of range"
-msgstr ""
-
-#: dehacked.c:2285
-#, c-format
-msgid "Emblem number %d out of range"
-msgstr ""
-
-#: dehacked.c:2298
-#, c-format
-msgid "Warning: patch from a different SRB2 version (%d), "
-msgstr ""
-
-#: dehacked.c:2300
-msgid "only version 2.0 is supported\n"
-msgstr ""
-
-#: dehacked.c:2305
-#, c-format
-msgid "Unknown word: %s"
-msgstr ""
-
-#: dehacked.c:2308
-#, c-format
-msgid "missing argument for '%s'"
-msgstr ""
-
-#: dehacked.c:2311
-#, c-format
-msgid "No word in this line: %s"
-msgstr ""
-
-#: dehacked.c:2315
-#, c-format
-msgid "%d warning%s in the SOC lump\n"
-msgstr ""
-
-#: dehacked.c:2361
-msgid "Unloading WAD SOC edits\n"
-msgstr ""
-
-#: f_finale.c:227
-msgid "Sonic Team Junior\n"
-msgstr ""
-
-#: f_finale.c:228 f_finale.c:230
-msgid "Staff\n"
-msgstr ""
-
-#: f_finale.c:233
-msgid "Producer\n"
-msgstr ""
-
-#: f_finale.c:237 f_finale.c:242
-msgid "Director\n"
-msgstr ""
-
-#: f_finale.c:246
-msgid "Game Designers\n"
-msgstr ""
-
-#: f_finale.c:257
-msgid "Character Designers\n"
-msgstr ""
-
-#: f_finale.c:266
-msgid "Visual Design\n"
-msgstr ""
-
-#: f_finale.c:273
-msgid "Landscape Design\n"
-msgstr ""
-
-#: f_finale.c:282
-msgid "Chief Programmer\n"
-msgstr ""
-
-#: f_finale.c:289
-msgid "Programmers\n"
-msgstr ""
-
-#: f_finale.c:304
-msgid "Coding Assistants\n"
-msgstr ""
-
-#: f_finale.c:321
-msgid "Level Designers\n"
-msgstr ""
-
-#: f_finale.c:349
-msgid "Texture Artists\n"
-msgstr ""
-
-#: f_finale.c:364
-msgid "Music Production\n"
-msgstr ""
-
-#: f_finale.c:386
-msgid "Lead Guitar\n"
-msgstr ""
-
-#: f_finale.c:395
-msgid "Sound Effects\n"
-msgstr ""
-
-#: f_finale.c:406
-msgid "Official Mascot\n"
-msgstr ""
-
-#: f_finale.c:413
-msgid "Sky Sanctuary Team\n"
-msgstr ""
-
-#: f_finale.c:457
-msgid "Special Thanks\n"
-msgstr ""
-
-#: f_finale.c:472
-msgid "In Fond Memory Of\n"
-msgstr ""
-
-#: f_finale.c:487
-msgid "Modification By\n"
-msgstr ""
-
-#: f_finale.c:557
-msgid ""
-"Two months had passed since Dr. Eggman\n"
-"tried to take over the world using his\n"
-"Ring Satellite.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:561
-msgid ""
-"As it was about to drain the rings\n"
-"away from the planet, Sonic burst into\n"
-"the Satellite and for what he thought\n"
-"would be the last time, defeated\n"
-"Dr. Eggman.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:567
-msgid ""
-"\n"
-"What Sonic, Tails, and Knuckles had\n"
-"not anticipated was that Eggman would\n"
-"return, bringing an all new threat.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:571
-msgid ""
-"About once every year, a strange asteroid\n"
-"hovers around the planet. it suddenly\n"
-"appears from nowhere, circles around, and\n"
-"- just as mysteriously as it arrives, it\n"
-"vanishes after about two months.\n"
-"No one knows why it appears, or how.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:578
-msgid ""
-"\"Curses!\" Eggman yelled. \"That hedgehog\n"
-"and his ridiculous friends will pay\n"
-"dearly for this!\" Just then his scanner\n"
-"blipped as the Black Rock made its\n"
-"appearance from nowhere. Eggman looked at\n"
-"the screen, and just shrugged it off.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:585
-msgid ""
-"It was only later\n"
-"that he had an\n"
-"idea. \"The Black\n"
-"Rock usually has a\n"
-"lot of energy\n"
-"within it... if I\n"
-"can somehow\n"
-"harness this, I\n"
-"can turn it into\n"
-"the ultimate\n"
-"battle station,\n"
-"and every last\n"
-"person will be\n"
-"begging for mercy,\n"
-"including Sonic!\"\n"
-"#"
-msgstr ""
-
-#: f_finale.c:601
-msgid ""
-"\n"
-"\n"
-"Before beginning his scheme,\n"
-"Eggman decided to give Sonic\n"
-"a reunion party...\n"
-"#"
-msgstr ""
-
-#: f_finale.c:605
-msgid ""
-"\"We're ready to fire in 15 seconds!\"\n"
-"The robot said, his voice crackling a\n"
-"little down the com-link. \"Good!\"\n"
-"Eggman sat back in his Egg-Mobile and\n"
-"began to count down as he saw the\n"
-"GreenFlower city on the main monitor.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:612
-msgid ""
-"\"10...9...8...\"\n"
-"Meanwhile, Sonic was tearing across the\n"
-"zones, and everything became nothing but\n"
-"a blur as he ran around loops, skimmed\n"
-"over water, and catapulted himself off\n"
-"rocks with his phenomenal speed.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:619
-msgid ""
-"\"5...4...3...\"\n"
-"Sonic knew he was getting closer to the\n"
-"City, and pushed himself harder. Finally,\n"
-"the city appeared in the horizon.\n"
-"\"2...1...Zero.\"\n"
-"#"
-msgstr ""
-
-#: f_finale.c:625
-msgid ""
-"GreenFlower City was gone.\n"
-"Sonic arrived just in time to see what\n"
-"little of the 'ruins' were left. Everyone\n"
-"and everything in the city had been\n"
-"obliterated.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:631
-msgid ""
-"\"You're not quite as dead as we thought,\n"
-"huh? Are you going to tell us your plan as\n"
-"usual or will I 'have to work it out' or\n"
-"something?\"                         \n"
-"\"We'll see... let's give you a quick warm\n"
-"up, Sonic! JETTYSYNS! Open fire!\"\n"
-"#"
-msgstr ""
-
-#: f_finale.c:638
-msgid ""
-"Eggman took this\n"
-"as his cue and\n"
-"blasted off,\n"
-"leaving Sonic\n"
-"and Tails behind.\n"
-"Tails looked at\n"
-"the ruins of the\n"
-"Greenflower City\n"
-"with a grim face\n"
-"and sighed.           \n"
-"\"Now what do we\n"
-"do?\", he asked.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:651
-msgid ""
-"\"Easy! We go\n"
-"find Eggman\n"
-"and stop his\n"
-"latest\n"
-"insane plan.\n"
-"Just like\n"
-"we've always\n"
-"done, right?                 \n"
-"\n"
-"...                    \n"
-"\n"
-"\"Tails,what\n"
-"*ARE* you\n"
-"doing?\"\n"
-"#"
-msgstr ""
-
-#: f_finale.c:664
-msgid ""
-"\"I'm just finding what mission obje...\n"
-"a-ha! Here it is! This will only give\n"
-"the robot's primary objective. It says,\n"
-"* LOCATE AND RETRIEVE CHAOS EMERALD.\n"
-"ESTIMATED LOCATION: GREENFLOWER ZONE *\"\n"
-"\"All right, then let's go!\"\n"
-"#"
-msgstr ""
-
-#: g_game.c:1514
-#, c-format
-msgid "Viewpoint: %s\n"
-msgstr ""
-
-#: g_game.c:2007
-#, c-format
-msgid "Current mare is %d\n"
-msgstr ""
-
-#: g_game.c:2094
-msgid "No deathmatch start in this map - shifting to player starts to avoid crash...\n"
-msgstr ""
-
-#: g_game.c:2098
-msgid "There aren't enough starts in this map!\n"
-msgstr ""
-
-#: g_game.c:2118
-msgid "No Red Team start in this map, resorting to Deathmatch starts!\n"
-msgstr ""
-
-#: g_game.c:2135
-msgid "No Blue Team start in this map, resorting to Deathmatch starts!\n"
-msgstr ""
-
-#: g_game.c:2300
-msgid "The round has ended.\n"
-msgstr ""
-
-#: g_game.c:2337
-#, c-format
-msgid "Unknown gametype! %d\n"
-msgstr ""
-
-#: g_game.c:2432
-#, c-format
-msgid "Next map given (MAP %d) doesn't exist! Reverting to MAP01.\n"
-msgstr ""
-
-#: g_game.c:2445
-#, c-format
-msgid "Warning: Can't find a compatible map after map %d; using map %d even though it is not compatible with the current gametype\n"
-msgstr ""
-
-#: g_game.c:2708 g_game.c:2837
-msgid "No more free memory for saving game data\n"
-msgstr ""
-
-#: g_game.c:2767
-#, c-format
-msgid "Couldn't read file %s\n"
-msgstr ""
-
-#: g_game.c:2859
-msgid "Game saved.\n"
-msgstr ""
-
-#: g_game.c:2861
-#, c-format
-msgid "Error while writing to %s for save slot %u, base: %s\n"
-msgstr ""
-
-#: g_game.c:3187
-#, c-format
-msgid "ERROR: cannot open file '%s'.\n"
-msgstr ""
-
-#: g_game.c:3257
-msgid "Movie mode enabled.\n"
-msgstr ""
-
-#: g_game.c:3266
-msgid "Movie mode disabled.\n"
-msgstr ""
-
-#: g_game.c:3277
-#, c-format
-msgid "Loaded level in %f sec\n"
-msgstr ""
-
-#: g_game.c:3325
-#, c-format
-msgid ""
-"timed %u gametics in %d realtics\n"
-"%f seconds, %f avg fps\n"
-msgstr ""
-
-#: g_game.c:3354
-#, c-format
-msgid "Demo %s recorded\n"
-msgstr ""
-
-#: g_game.c:3356
-#, c-format
-msgid "Demo %s not saved\n"
-msgstr ""
-
-#: g_input.c:1299
-#, c-format
-msgid "Control '%s' unknown\n"
-msgstr ""
-
-#: g_input.c:1320
-msgid "setcontrol <controlname> <keyname> [<2nd keyname>]\n"
-msgstr ""
-
-#: g_input.c:1335
-msgid "setcontrol2 <controlname> <keyname> [<2nd keyname>]\n"
-msgstr ""
-
-#: hardware/hw_main.c:4346
-#, c-format
-msgid "Patch info headers: %7s kb\n"
-msgstr ""
-
-#: hardware/hw_main.c:4347
-#, c-format
-msgid "3D Texture cache  : %7s kb\n"
-msgstr ""
-
-#: hardware/hw_main.c:4348
-#, c-format
-msgid "Plane polygon     : %7s kb\n"
-msgstr ""
-
-#: hardware/hw_md2.c:898
-msgid "Error while loading md2.dat\n"
-msgstr ""
-
-#: hardware/hw_md2.c:915
-#, c-format
-msgid "    Not found: %s\n"
-msgstr ""
-
-#: hardware/s_ds3d/s_ds3d.c:617 p_tick.c:168 sdl/i_sound.c:1347
-#: win32/win_snd.c:1073 win32/win_snd.c:1431
-msgid "Done\n"
-msgstr ""
-
-#: hardware/s_ds3d/s_ds3d.c:617 win32/win_snd.c:1073
-msgid "Failed\n"
-msgstr ""
-
-#: hu_stuff.c:375
-msgid "The chat is muted. You can't say anything at the moment.\n"
-msgstr ""
-
-#: hu_stuff.c:410
-msgid "say <message>: send a message\n"
-msgstr ""
-
-#: hu_stuff.c:427
-msgid "sayto <playername|playernum> <message>: send a message to a player\n"
-msgstr ""
-
-#: hu_stuff.c:434
-msgid "sayto: No player with that name!\n"
-msgstr ""
-
-#: hu_stuff.c:450
-msgid "sayteam <message>: send a message to your team\n"
-msgstr ""
-
-#: hu_stuff.c:456
-msgid "Dedicated servers can't send team messages. Use \"say\".\n"
-msgstr ""
-
-#: hu_stuff.c:470
-msgid "csay <message>: send a message to be shown in the middle of the screen\n"
-msgstr ""
-
-#: hu_stuff.c:476
-msgid "Only servers and admins can use csay.\n"
-msgstr ""
-
-#: hu_stuff.c:502
-#, c-format
-msgid "Illegal csay command received from non-admin %s\n"
-msgstr ""
-
-#: hu_stuff.c:502
-#, c-format
-msgid "Illegal say command received from %s while muted\n"
-msgstr ""
-
-#: hu_stuff.c:526
-#, c-format
-msgid "Illegal say command received from %s containing invalid characters\n"
-msgstr ""
-
-#: hu_stuff.c:723 m_menu.c:6989
-msgid "[Message unsent]\n"
-msgstr ""
-
-#: i_tcp.c:710
-msgid "failed to bind with IPv6 stack"
-msgstr ""
-
-#: i_tcp.c:717
-msgid "UDP_Socket error. Could not set socket to non blocking mode"
-msgstr ""
-
-#: i_tcp.c:724
-msgid "UDP_Socket error. Could not set socket to allow broadcast"
-msgstr ""
-
-#: i_tcp.c:729
-#, c-format
-msgid "Network system buffer: %dKb\n"
-msgstr ""
-
-#: i_tcp.c:738
-msgid "Can't set buffer length to 64k, file transfer will be bad\n"
-msgstr ""
-
-#: i_tcp.c:740
-#, c-format
-msgid "Network system buffer set to: %dKb\n"
-msgstr ""
-
-#: i_tcp.c:799
-#, c-format
-msgid "Network system receive buffer: %dKb\n"
-msgstr ""
-
-#: i_tcp.c:805 i_tcp.c:810
-#, c-format
-msgid "Network system receive buffer set to: %dKb\n"
-msgstr ""
-
-#: i_tcp.c:806
-msgid "Can't set receive buffer length to 64k, file transfer will be bad\n"
-msgstr ""
-
-#: i_tcp.c:991 sdl/i_cdmus.c:383 sdl/i_sound.c:1138 sdl/i_sound.c:1463
-#: sdl/i_video.c:2162
-msgid "shut down\n"
-msgstr ""
-
-#: i_tcp.c:1043
-#, c-format
-msgid "Resolving %s\n"
-msgstr ""
-
-#: i_tcp.c:1047
-#, c-format
-msgid "%s unknown\n"
-msgstr ""
-
-#: i_tcp.c:1054
-#, c-format
-msgid "Resolved %s\n"
-msgstr ""
-
-#: m_argv.c:161
-#, c-format
-msgid "Response file %s not found"
-msgstr ""
-
-#: m_argv.c:163
-#, c-format
-msgid "Found response file %s\n"
-msgstr ""
-
-#: m_argv.c:169
-msgid "No more free memory for the respone file"
-msgstr ""
-
-#: m_argv.c:171
-#, c-format
-msgid "Couldn't read response file because %s"
-msgstr ""
-
-#: m_argv.c:183
-msgid "Not enough memory to read response file"
-msgstr ""
-
-#: m_argv.c:214
-#, c-format
-msgid "%d command-line args:\n"
-msgstr ""
-
-#: m_cheat.c:272
-#, c-format
-msgid "No Clipping %s\n"
-msgstr ""
-
-#: m_cheat.c:272 m_cheat.c:292
-msgid "Off"
-msgstr ""
-
-#: m_cheat.c:272 m_cheat.c:292
-msgid "On"
-msgstr ""
-
-#: m_cheat.c:292
-#, c-format
-msgid "Sissy Mode %s\n"
-msgstr ""
-
-#: m_cheat.c:315 m_cheat.c:349 m_cheat.c:514 m_cheat.c:538 m_cheat.c:557
-#: m_cheat.c:576
-msgid "This only works in single player.\n"
-msgstr ""
-
-#: m_cheat.c:321
-msgid "scale <value> (5-400): set player scale size\n"
-msgstr ""
-
-#: m_cheat.c:330
-#, c-format
-msgid "Scale set to %d\n"
-msgstr ""
-
-#: m_cheat.c:381
-msgid "hurtme <damage>\n"
-msgstr ""
-
-#: m_cheat.c:404 m_cheat.c:419
-msgid "charability <1/2> <value>\n"
-msgstr ""
-
-#: m_cheat.c:438 m_cheat.c:461
-msgid "charspeed <normalspeed/runspeed/thrustfactor/accelstart/acceleration/actionspd> <value>\n"
-msgstr ""
-
-#: m_cheat.c:473
-msgid "Your reality is everyone's reality. Therefore, you should not use this command.\n"
-msgstr ""
-
-#: m_cheat.c:524
-#, c-format
-msgid "Temporary checkpoint created at %d, %d, %d\n"
-msgstr ""
-
-#: m_cheat.c:544
-msgid "You now have all 7 emeralds.\n"
-msgstr ""
-
-#: m_cheat.c:563
-msgid "Emeralds reset to zero.\n"
-msgstr ""
-
-#: m_cheat.c:582
-msgid "All secrets unlocked.\n"
-msgstr ""
-
-#: m_menu.c:4123 m_menu.c:4140 m_menu.c:4157 m_menu.c:4174 m_menu.c:4190
-#: m_menu.c:4669
-msgid ""
-"You are in a network game.\n"
-"End it?\n"
-"(Y/N).\n"
-msgstr ""
-
-#: m_menu.c:7116
-msgid ""
-"Only the server can do a load net game!\n"
-"\n"
-"press a key."
-msgstr ""
-
-#: m_menu.c:7169
-msgid ""
-"Are you sure you want to end the game?\n"
-"\n"
-"press Y or N."
-msgstr ""
-
-#: m_menu.c:7227
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:8195
-msgid ""
-"Eggman's tied explosives\n"
-"to your girlfriend, and\n"
-"will activate them if\n"
-"you press the 'Y' key!\n"
-"Press 'N' to save her!"
-msgstr ""
-
-#: m_menu.c:8196
-msgid ""
-"What would Tails say if\n"
-"he saw you quitting the game?"
-msgstr ""
-
-#: m_menu.c:8197
-msgid ""
-"Hey!\n"
-"Where do ya think you're goin'?"
-msgstr ""
-
-#: m_menu.c:8198
-msgid ""
-"Forget your studies!\n"
-"Play some more!"
-msgstr ""
-
-#: m_menu.c:8199
-msgid ""
-"You're trying to say you\n"
-"like Sonic 2K6 better than\n"
-"this, right?"
-msgstr ""
-
-#: m_menu.c:8200
-msgid ""
-"Don't leave yet -- there's a\n"
-"super emerald around that corner!"
-msgstr ""
-
-#: m_menu.c:8201
-msgid "You'd rather work than play?"
-msgstr ""
-
-#: m_menu.c:8202
-msgid ""
-"Go ahead and leave. See if I care...\n"
-"*sniffle*"
-msgstr ""
-
-#: m_menu.c:8204
-msgid ""
-"If you leave now,\n"
-"Eggman will take over the world!"
-msgstr ""
-
-#: m_menu.c:8205
-msgid ""
-"Don't quit!\n"
-"There are animals\n"
-"to save!"
-msgstr ""
-
-#: m_menu.c:8206
-msgid ""
-"Aw c'mon, just bop\n"
-"a few more robots!"
-msgstr ""
-
-#: m_menu.c:8207
-msgid "Did you get all those Chaos Emeralds?"
-msgstr ""
-
-#: m_menu.c:8208
-msgid ""
-"If you leave, I'll use\n"
-"my spin attack on you!"
-msgstr ""
-
-#: m_menu.c:8209
-msgid ""
-"Don't go!\n"
-"You might find the hidden\n"
-"levels!"
-msgstr ""
-
-#: m_menu.c:8210
-msgid ""
-"Hit the 'N' key, Sonic!\n"
-"The 'N' key!"
-msgstr ""
-
-#: m_menu.c:8212
-msgid ""
-"Are you really going to\n"
-"give up?\n"
-"We certainly would never give you up."
-msgstr ""
-
-#: m_menu.c:8213
-msgid "Come on, just ONE more netgame!"
-msgstr ""
-
-#: m_menu.c:8214
-msgid ""
-"Press 'N' to unlock\n"
-"the Ultimate Cheat!"
-msgstr ""
-
-#: m_menu.c:8215
-msgid ""
-"Why don't you go back and try\n"
-"jumping on that house to\n"
-"see what happens?"
-msgstr ""
-
-#: m_menu.c:8216
-msgid ""
-"Every time you press 'Y', an\n"
-"SRB2 Developer cries..."
-msgstr ""
-
-#: m_menu.c:8217
-msgid ""
-"You'll be back to play soon, though...\n"
-"......right?"
-msgstr ""
-
-#: m_menu.c:8218
-msgid ""
-"Aww, is Egg Rock Zone too\n"
-"difficult for you?"
-msgstr ""
-
-#: m_misc.c:398
-msgid "saveconfig <filename[.cfg]> [-silent] : save config to a file\n"
-msgstr ""
-
-#: m_misc.c:406
-#, c-format
-msgid "config saved as %s\n"
-msgstr ""
-
-#: m_misc.c:417
-msgid "loadconfig <filename[.cfg]> : load config from a file\n"
-msgstr ""
-
-#: m_misc.c:434
-msgid "changeconfig <filename[.cfg]> : save current config and load another\n"
-msgstr ""
-
-#: m_misc.c:454
-#, c-format
-msgid "config file: %s\n"
-msgstr ""
-
-#: m_misc.c:487 m_misc.c:505
-msgid "Config filename must be .cfg\n"
-msgstr ""
-
-#: m_misc.c:497 m_misc.c:512
-#, c-format
-msgid "Couldn't save game config file %s\n"
-msgstr ""
-
-#: m_misc.c:1048
-msgid "Recording into next new file\n"
-msgstr ""
-
-#: m_misc.c:1340
-#, c-format
-msgid "screen shot %s saved in %s\n"
-msgstr ""
-
-#: m_misc.c:1345
-#, c-format
-msgid "Couldn't create screen shot %s in %s\n"
-msgstr ""
-
-#: m_misc.c:1347
-#, c-format
-msgid "Couldn't create screen shot (all 10000 slots used!) in %s\n"
-msgstr ""
-
-#: mserv.c:337 mserv.c:364
-msgid "No servers currently running.\n"
-msgstr ""
-
-#: mserv.c:465 mserv.c:506 mserv.c:572 mserv.c:610 mserv.c:850 mserv.c:947
-msgid "cannot connect to the master server\n"
-msgstr ""
-
-#: mserv.c:466 mserv.c:507 mserv.c:573
-msgid ""
-"There was a problem connecting to\n"
-"the Master Server"
-msgstr ""
-
-#: mserv.c:532
-#, c-format
-msgid ""
-"You have been banned from\n"
-"hosting netgames.\n"
-"\n"
-"Under the following IP Range:\n"
-"%s - %s\n"
-"\n"
-"For the following reason:\n"
-"%s\n"
-"\n"
-"Your ban will expire on:\n"
-"%s"
-msgstr ""
-
-#: mserv.c:534
-#, c-format
-msgid ""
-"You have been banned from\n"
-"joining netgames.\n"
-"\n"
-"Under the following IP Range:\n"
-"%s - %s\n"
-"\n"
-"For the following reason:\n"
-"%s\n"
-"\n"
-"Your ban will expire on:\n"
-"%s"
-msgstr ""
-
-#: mserv.c:557
-msgid "Master Server Offline."
-msgstr ""
-
-#: mserv.c:558
-msgid "Offline"
-msgstr ""
-
-#: mserv.c:602
-msgid "Not yet registered to the master server.\n"
-msgstr ""
-
-#: mserv.c:606
-msgid "Retrieving server list...\n"
-msgstr ""
-
-#: mserv.c:615
-msgid "cannot get server list\n"
-msgstr ""
-
-#: mserv.c:637
-msgid "Connection to master server failed\n"
-msgstr ""
-
-#: mserv.c:668
-msgid "Timeout on masterserver\n"
-msgstr ""
-
-#: mserv.c:679
-#, c-format
-msgid "Masterserver error on select #%u: %s\n"
-msgstr ""
-
-#: mserv.c:691
-#, c-format
-msgid "Masterserver getsockopt error #%u: %s\n"
-msgstr ""
-
-#: mserv.c:703
-msgid "Dedicated internet servers must use the -room parameter!"
-msgstr ""
-
-#: mserv.c:734
-msgid "Master Server Updated Successfully!\n"
-msgstr ""
-
-#: mserv.c:843
-msgid "Registering this server to the master server...\n"
-msgstr ""
-
-#: mserv.c:943
-msgid "Unregistering this server to the master server...\n"
-msgstr ""
-
-#: mserv.c:952
-msgid "cannot remove this server from the master server\n"
-msgstr ""
-
-#: mserv.c:980
-msgid "You cannot register on the Master Server mid-game,  please end your current session and re-host ifyou wish to advertise your server on the Master Server.\n"
-msgstr ""
-
-#: p_enemy.c:2057
-msgid "Note: All monitors turned off.\n"
-msgstr ""
-
-#: p_enemy.c:2252 p_enemy.c:2291 p_enemy.c:2321 p_enemy.c:2352 p_enemy.c:2383
-#: p_enemy.c:2407 p_enemy.c:2437 p_enemy.c:2470 p_enemy.c:2509 p_enemy.c:2540
-#: p_enemy.c:2581 p_enemy.c:2614 p_enemy.c:4957
-msgid "ERROR: Powerup has no target!\n"
-msgstr ""
-
-#: p_enemy.c:2258
-#, c-format
-msgid "Power #%d out of range!\n"
-msgstr ""
-
-#: p_enemy.c:2297
-#, c-format
-msgid "Weapon #%d out of range!\n"
-msgstr ""
-
-#: p_inter.c:1540
-#, c-format
-msgid "%s returned the red flag to base.\n"
-msgstr ""
-
-#: p_inter.c:1555
-#, c-format
-msgid "%s picked up the red flag!\n"
-msgstr ""
-
-#: p_inter.c:1591
-#, c-format
-msgid "%s returned the blue flag to base.\n"
-msgstr ""
-
-#: p_inter.c:1606
-#, c-format
-msgid "%s picked up the blue flag!\n"
-msgstr ""
-
-#: p_inter.c:1665 p_inter.c:1826
-#, c-format
-msgid "%s%s%s died.\n"
-msgstr ""
-
-#: p_inter.c:1679
-#, c-format
-msgid "%s%s%s crushed %s%s%s with a heavy object!\n"
-msgstr ""
-
-#: p_inter.c:1692
-#, c-format
-msgid "%s%s%s suicided.\n"
-msgstr ""
-
-#: p_inter.c:1703
-#, c-format
-msgid "%s%s%s was fried by %s%s%s's fire trail.\n"
-msgstr ""
-
-#: p_inter.c:1707 p_inter.c:1903
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %sbounce ring.\n"
-msgstr ""
-
-#: p_inter.c:1710 p_inter.c:1906
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %sautomatic ring.\n"
-msgstr ""
-
-#: p_inter.c:1713 p_inter.c:1909
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %sscatter ring.\n"
-msgstr ""
-
-#: p_inter.c:1716 p_inter.c:1912
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %sexplosion ring.\n"
-msgstr ""
-
-#: p_inter.c:1719 p_inter.c:1915
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %sgrenade ring.\n"
-msgstr ""
-
-#: p_inter.c:1722 p_inter.c:1918
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %sturbo ring.\n"
-msgstr ""
-
-#: p_inter.c:1725 p_inter.c:1921
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %smine ring.\n"
-msgstr ""
-
-#: p_inter.c:1728 p_inter.c:1924
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %sBFR blast.\n"
-msgstr ""
-
-#: p_inter.c:1732 p_inter.c:1928
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %sBFR laser.\n"
-msgstr ""
-
-#: p_inter.c:1734 p_inter.c:1930
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %srail ring.\n"
-msgstr ""
-
-#: p_inter.c:1738 p_inter.c:1934
-#, c-format
-msgid "%s%s%s was %s by %s%s%s's %sring.\n"
-msgstr ""
-
-#: p_inter.c:1742 p_inter.c:1884
-#, c-format
-msgid "%s%s%s was %s by %s%s%s.\n"
-msgstr ""
-
-#: p_inter.c:1751 p_inter.c:1844
-msgid "killed"
-msgstr ""
-
-#: p_inter.c:1755 p_inter.c:1944
-msgid "reflected "
-msgstr ""
-
-#: p_inter.c:1774
-#, c-format
-msgid "%s%s%s drowned.\n"
-msgstr ""
-
-#: p_inter.c:1779
-#, c-format
-msgid "%s%s%s was impaled by spikes!\n"
-msgstr ""
-
-#: p_inter.c:1784
-#, c-format
-msgid "%s%s%s was crushed.\n"
-msgstr ""
-
-#: p_inter.c:1790
-#, c-format
-msgid "%s%s%s was %s by a blue crawla!\n"
-msgstr ""
-
-#: p_inter.c:1794
-#, c-format
-msgid "%s%s%s was %s by a red crawla!\n"
-msgstr ""
-
-#: p_inter.c:1798
-#, c-format
-msgid "%s%s%s was %s by a jetty-syn gunner!\n"
-msgstr ""
-
-#: p_inter.c:1802
-#, c-format
-msgid "%s%s%s was %s by a jetty-syn bomber!\n"
-msgstr ""
-
-#: p_inter.c:1806
-#, c-format
-msgid "%s%s%s was %s by a crawla commander!\n"
-msgstr ""
-
-#: p_inter.c:1810
-#, c-format
-msgid "%s%s%s was %s by the Egg Mobile!\n"
-msgstr ""
-
-#: p_inter.c:1814
-#, c-format
-msgid "%s%s%s was %s by the Egg Slimer!\n"
-msgstr ""
-
-#: p_inter.c:1828
-#, c-format
-msgid "%s%s%s fell in some nasty goop!\n"
-msgstr ""
-
-#: p_inter.c:1830
-#, c-format
-msgid "%s%s%s burned to death!\n"
-msgstr ""
-
-#: p_inter.c:1832
-#, c-format
-msgid "%s%s%s was electrocuted!\n"
-msgstr ""
-
-#: p_inter.c:1835
-#, c-format
-msgid "%s%s%s fell into a bottomless pit.\n"
-msgstr ""
-
-#: p_inter.c:1837
-#, c-format
-msgid "%s%s%s asphyxiated in space!\n"
-msgstr ""
-
-#: p_inter.c:1854
-#, c-format
-msgid "%s got a game over.\n"
-msgstr ""
-
-#: p_inter.c:1856
-#, c-format
-msgid "%s has %d lives remaining.\n"
-msgstr ""
-
-#: p_inter.c:1891
-#, c-format
-msgid "%s%s%s got nuked by %s%s%s!\n"
-msgstr ""
-
-#: p_inter.c:1899
-#, c-format
-msgid "%s%s%s was burnt by %s%s%s's fire trail.\n"
-msgstr ""
-
-#: p_inter.c:1943
-msgid "hit"
-msgstr ""
-
-#: p_inter.c:2031
-msgid "The IT player has left the game.\n"
-msgstr ""
-
-#: p_inter.c:2051 p_inter.c:2075
-msgid "All players have been tagged!\n"
-msgstr ""
-
-#: p_inter.c:2063
-msgid "There are no players able to become IT.\n"
-msgstr ""
-
-#: p_inter.c:2315 p_inter.c:2574
-#, c-format
-msgid "%s was found!\n"
-msgstr ""
-
-#: p_inter.c:3981
-#, c-format
-msgid "%s tossed the %s flag.\n"
-msgstr ""
-
-#: p_inter.c:3983
-#, c-format
-msgid "%s dropped the %s flag.\n"
-msgstr ""
-
-#: p_mobj.c:202 p_mobj.c:264
-msgid "Warning: State Cycle Detected\n"
-msgstr ""
-
-#: p_mobj.c:5757
-msgid "The red flag has returned to base.\n"
-msgstr ""
-
-#: p_mobj.c:5767
-msgid "The blue flag has returned to base.\n"
-msgstr ""
-
-#: p_setup.c:603 p_setup.c:605 p_setup.c:611
-msgid "You need to unlock this level first!\n"
-msgstr ""
-
-#: p_setup.c:609
-msgid "You need to unlock this level in single player first!\n"
-msgstr ""
-
-#: p_setup.c:876
-msgid "No more free memory for thing writing!\n"
-msgstr ""
-
-#: p_setup.c:901
-#, c-format
-msgid "newthings%d.lmp saved.\n"
-msgstr ""
-
-#: p_setup.c:2228
-msgid "No player currently available to become IT. Awaiting available players.\n"
-msgstr ""
-
-#: p_setup.c:2355
-#, c-format
-msgid "Loading SOC lump: %s\n"
-msgstr ""
-
-#: p_setup.c:2377
-#, c-format
-msgid "Couldn't load wad file %s\n"
-msgstr ""
-
-#: p_setup.c:2420
-#, c-format
-msgid "%s sounds replaced\n"
-msgstr ""
-
-#: p_setup.c:2422
-#, c-format
-msgid "%s musics replaced\n"
-msgstr ""
-
-#: p_setup.c:2481
-msgid "No maps added\n"
-msgstr ""
-
-#: p_setup.c:2489
-#, c-format
-msgid "Current map %d replaced by added file, ending the level to ensure consistiency.\n"
-msgstr ""
-
-#: p_spec.c:3162
-#, c-format
-msgid "%s\\captured the blue flag.\\\\\\\\"
-msgstr ""
-
-#: p_spec.c:3197 p_spec.c:3276
-msgid "the enemy has returned\\their flag.\\\\\\\\"
-msgstr ""
-
-#: p_spec.c:3200 p_spec.c:3279
-msgid "your flag was returned\\to base.\\\\\\\\"
-msgstr ""
-
-#: p_spec.c:3244
-#, c-format
-msgid "%s\\captured the red flag.\\\\\\\\"
-msgstr ""
-
-#: p_spec.c:3482
-#, c-format
-msgid "%s has finished the race.\n"
-msgstr ""
-
-#: p_spec.c:3484
-#, c-format
-msgid "%s started lap %d\n"
-msgstr ""
-
-#: p_spec.c:4166
-#, c-format
-msgid "%s recieved double points for surviving the round.\n"
-msgstr ""
-
-#: p_tick.c:57
-msgid ""
-"numthinkers <#>: Count number of thinkers\n"
-"\t1: P_MobjThinker\n"
-"\t2: P_RainThinker\n"
-"\t3: P_SnowThinker\n"
-"\t4: P_NullPrecipThinker\n"
-"\t5: T_Friction\n"
-"\t6: T_Pusher\n"
-"\t7: P_RemoveThinkerDelayed\n"
-msgstr ""
-
-#: p_tick.c:69
-msgid "Number of P_MobjThinker: "
-msgstr ""
-
-#: p_tick.c:73
-msgid "Number of P_RainThinker: "
-msgstr ""
-
-#: p_tick.c:77
-msgid "Number of P_SnowThinker: "
-msgstr ""
-
-#: p_tick.c:81
-msgid "Number of P_NullPrecipThinker: "
-msgstr ""
-
-#: p_tick.c:85
-msgid "Number of T_Friction: "
-msgstr ""
-
-#: p_tick.c:89
-msgid "Number of T_Pusher: "
-msgstr ""
-
-#: p_tick.c:93
-msgid "Number of P_RemoveThinkerDelayed: "
-msgstr ""
-
-#: p_tick.c:96
-msgid "That is not a valid number.\n"
-msgstr ""
-
-#: p_tick.c:131
-#, c-format
-msgid "Object number %d out of range (max %d).\n"
-msgstr ""
-
-#: p_tick.c:146
-#, c-format
-msgid "There are %d objects of type %d currently in the level.\n"
-msgstr ""
-
-#: p_tick.c:151
-msgid "Count of active objects in level:\n"
-msgstr ""
-
-#: p_user.c:358
-#, c-format
-msgid "%s got a chain of %u!\n"
-msgstr ""
-
-#: p_user.c:1345
-#, c-format
-msgid "%s has completed the level.\n"
-msgstr ""
-
-#: p_user.c:4865 p_user.c:5004
-msgid "Sorry, you're too high to place this object (max: 4095 above bottom floor).\n"
-msgstr ""
-
-#: p_user.c:4999
-msgid "Sorry, you're too high to place this object (max: 2047 above bottom floor).\n"
-msgstr ""
-
-#: p_user.c:5051
-#, c-format
-msgid "Spawned at %d\n"
-msgstr ""
-
-#: p_user.c:5121 p_user.c:5138
-#, c-format
-msgid "Current mapthing is %d\n"
-msgstr ""
-
-#: p_user.c:5215 p_user.c:5225
-#, c-format
-msgid "Sorry, you're too %s to place this object (max: %d %s).\n"
-msgstr ""
-
-#: p_user.c:5215 p_user.c:5225
-msgid "high"
-msgstr ""
-
-#: p_user.c:5215 p_user.c:5225
-msgid "low"
-msgstr ""
-
-#: p_user.c:5216 p_user.c:5226
-msgid "above bottom floor"
-msgstr ""
-
-#: p_user.c:5216 p_user.c:5226
-msgid "below top ceiling"
-msgstr ""
-
-#: p_user.c:5273
-#, c-format
-msgid "Placed object mapthingum %d, not the one below.\n"
-msgstr ""
-
-#: p_user.c:5283
-#, c-format
-msgid "Placed object type %d at %d, %d, %d, %d\n"
-msgstr ""
-
-#: p_user.c:5329
-msgid "Deleting...\n"
-msgstr ""
-
-#: p_user.c:5343
-msgid "Deleted.\n"
-msgstr ""
-
-#: p_user.c:5364
-msgid "You cannot delete this item because it doesn't have a mapthing!\n"
-msgstr ""
-
-#: p_user.c:5545
-msgid "You must wait until next round to enter the game.\n"
-msgstr ""
-
-#: p_user.c:5551 p_user.c:5611
-msgid "Server does not allow team change.\n"
-msgstr ""
-
-#: p_user.c:8721
-#, c-format
-msgid "%s caused a world of pain.\n"
-msgstr ""
-
-#: p_user.c:9737
-#, c-format
-msgid "%s ran out of time.\n"
-msgstr ""
-
-#: r_data.c:481
-#, c-format
-msgid "Number of Extra Colormaps: %s\n"
-msgstr ""
-
-#: r_main.c:136
-msgid "Splitscreen not supported in netplay, sorry!\n"
-msgstr ""
-
-#: r_things.c:410
-#, c-format
-msgid "sprite %s set in pwad %d\n"
-msgstr ""
-
-#: r_things.c:414
-#, c-format
-msgid "%s sprites added from file %s\n"
-msgstr ""
-
-#: r_things.c:460
-#, c-format
-msgid "%s sprites removed from file %s\n"
-msgstr ""
-
-#: r_things.c:2377
-#, c-format
-msgid "Skin %s not found\n"
-msgstr ""
-
-#: r_things.c:2471
-#, c-format
-msgid "Skin %d not found\n"
-msgstr ""
-
-#: r_things.c:2788
-#, c-format
-msgid "Added skin '%s'\n"
-msgstr ""
-
-#: r_things.c:2850
-#, c-format
-msgid "Removed skin '%s'\n"
-msgstr ""
-
-#: s_sound.c:349
-msgid "Loading sounds... "
-msgstr ""
-
-#: s_sound.c:355
-msgid " pre-cached all sound data\n"
-msgstr ""
-
-#: s_sound.c:1081
-#, c-format
-msgid "ERROR: Music lump %.6s not found!\n"
-msgstr ""
-
-#: screen.c:169
-#, c-format
-msgid ""
-"WARNING: Resolution is not aspect-correct!\n"
-"Use a multiple of %dx%d\n"
-msgstr ""
-
-#: screen.c:311
-#, c-format
-msgid "Using resolution: %d x %d\n"
-msgstr ""
-
-#: screen.c:317
-#, c-format
-msgid "Default resolution: %d x %d (%d bits)\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:99 sdl/i_cdmus.c:224 sdl/i_cdmus.c:436 win32/win_cd.c:401
-msgid "No CD in drive\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:105
-#, c-format
-msgid "CD Error: %s\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:132
-msgid "CD eject failed\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:153 win32/win_cd.c:199
-msgid ""
-"cd [on] [off] [remap] [reset] [select]\n"
-"   [open] [info] [play <track>] [resume]\n"
-"   [stop] [pause] [loop <track>]\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:186
-#, c-format
-msgid "Opened CD-ROM drive %s\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:188 sdl/i_cdmus.c:422 sdl/i_cdmus.c:424
-#, c-format
-msgid "Couldn't open CD-ROM drive %s: %s\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:238
-#, c-format
-msgid "%u tracks\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:240 win32/win_cd.c:297
-#, c-format
-msgid "Currently %s track %u\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:240 sdl/i_cdmus.c:242 win32/win_cd.c:297
-msgid "looping"
-msgstr ""
-
-#: sdl/i_cdmus.c:240 sdl/i_cdmus.c:242 win32/win_cd.c:297
-msgid "playing"
-msgstr ""
-
-#: sdl/i_cdmus.c:242
-#, c-format
-msgid "Paused %s track %u\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:243
-#, c-format
-msgid "Volume is %d\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:276 win32/win_cd.c:326
-#, c-format
-msgid "Invalid CD command \"CD %s\"\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:406
-msgid "I_InitCD: Init CD audio\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:411
-#, c-format
-msgid "Couldn't initialize SDL CDROM: %s\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:442 win32/win_cd.c:389
-msgid "CD audio Initialized\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:520
-#, c-format
-msgid "Bad track number %u.\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:527
-#, c-format
-msgid "Track %u is not audio\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:540
-#, c-format
-msgid "Error playing track %d: %s\n"
-msgstr ""
-
-#: sdl/i_main.c:183 win32/win_main.c:598
-msgid "Setting up SRB2...\n"
-msgstr ""
-
-#: sdl/i_main.c:185 win32/win_main.c:600
-msgid "Entering main game loop...\n"
-msgstr ""
-
-#: sdl/i_sound.c:1184 win32/win_snd.c:925
-#, c-format
-msgid " requested frequency of %d hz\n"
-msgstr ""
-
-#: sdl/i_sound.c:1264
-msgid " Using 3D sound driver\n"
-msgstr ""
-
-#: sdl/i_sound.c:1267 sdl/i_sound.c:1272
-msgid " Failed loading 3D sound driver\n"
-msgstr ""
-
-#: sdl/i_sound.c:1278 sdl/i_sound.c:1645
-msgid " couldn't open audio with desired format\n"
-msgstr ""
-
-#: sdl/i_sound.c:1285
-#, c-format
-msgid " Starting up with audio driver : %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1289
-#, c-format
-msgid " configured audio device with %d samples/slice at %ikhz(%dms buffer)\n"
-msgstr ""
-
-#: sdl/i_sound.c:1291
-msgid " Sound module ready\n"
-msgstr ""
-
-#: sdl/i_sound.c:1377
-#, c-format
-msgid "Couldn't load music lump: %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1387
-#, c-format
-msgid "Couldn't load music data: %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1421
-#, c-format
-msgid "Couldn't open file %s to write music in\n"
-msgstr ""
-
-#: sdl/i_sound.c:1428
-#, c-format
-msgid "Couldn't write music into file %s because %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1441
-#, c-format
-msgid "Couldn't load music file %s: %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1455
-msgid "I_ShutdownMusic: "
-msgstr ""
-
-#: sdl/i_sound.c:1494
-msgid " disabled loading FMOD\n"
-msgstr ""
-
-#: sdl/i_sound.c:1513
-msgid " failed to load FMOD\n"
-msgstr ""
-
-#: sdl/i_sound.c:1522 win32/win_snd.c:1237
-#, c-format
-msgid ""
-"Wrong FMOD DLL version.\n"
-"You should be using FMOD %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1611
-msgid "I_InitMusic:"
-msgstr ""
-
-#: sdl/i_sound.c:1617
-msgid " Unable to load FLAC support\n"
-msgstr ""
-
-#: sdl/i_sound.c:1621
-msgid " Unable to load MOD support\n"
-msgstr ""
-
-#: sdl/i_sound.c:1625
-msgid " Unable to load MP3 support\n"
-msgstr ""
-
-#: sdl/i_sound.c:1629
-msgid " Unable to load OGG support\n"
-msgstr ""
-
-#: sdl/i_sound.c:1635
-#, c-format
-msgid " Unable to open music: %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1651
-#, c-format
-msgid " Starting with audio driver : %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1657
-#, c-format
-msgid " Starting up with audio driver : %s with SDL_Mixer\n"
-msgstr ""
-
-#: sdl/i_sound.c:1671
-msgid "Music initialized\n"
-msgstr ""
-
-#: sdl/i_sound.c:1690
-#, c-format
-msgid "Couldn't play song because %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1816
-#, c-format
-msgid "Couldn't load MIDI: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1120 sdl/i_system.c:1414
-#, c-format
-msgid "Couldn't initialize joystick: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1130 sdl/i_system.c:1422
-#, c-format
-msgid "Cannot use joystick #%d/(%s), it doesn't exist\n"
-msgstr ""
-
-#: sdl/i_system.c:1151 sdl/i_system.c:1443
-#, c-format
-msgid "Found %d joysticks on this system\n"
-msgstr ""
-
-#: sdl/i_system.c:1156 sdl/i_system.c:1448
-msgid "Found no joysticks on this system\n"
-msgstr ""
-
-#: sdl/i_system.c:1161
-#, c-format
-msgid "Joystick: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1165
-#, c-format
-msgid "Couldn't open joystick: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1453
-#, c-format
-msgid "Joystick2: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1457
-#, c-format
-msgid "Couldn't open joystick2: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1782 win32/win_sys.c:977
-msgid "Read Error on secondary mouse port\n"
-msgstr ""
-
-#: sdl/i_system.c:1878 win32/win_sys.c:1038
-#, c-format
-msgid "Error opening %s!\n"
-msgstr ""
-
-#: sdl/i_system.c:1946
-#, c-format
-msgid "Can't open %s: Access denied\n"
-msgstr ""
-
-#: sdl/i_system.c:1948 win32/win_sys.c:1040
-#, c-format
-msgid "Can't open %s: error %d\n"
-msgstr ""
-
-#: sdl/i_system.c:2124 win32/win_sys.c:460
-msgid "Using GetTickCount()\n"
-msgstr ""
-
-#: sdl/i_video.c:553 win32/win_vid.c:1084
-#, c-format
-msgid "%d video mode(s) available(s)\n"
-msgstr ""
-
-#: sdl/i_video.c:565
-msgid "Unknown Surface"
-msgstr ""
-
-#: sdl/i_video.c:570
-#, c-format
-msgid " %ix%i at %i bit color\n"
-msgstr ""
-
-#: sdl/i_video.c:573
-msgid " Stored in video memory\n"
-msgstr ""
-
-#: sdl/i_video.c:575
-msgid " Stored in an OpenGL context\n"
-msgstr ""
-
-#: sdl/i_video.c:577
-msgid " Uses preallocated memory\n"
-msgstr ""
-
-#: sdl/i_video.c:579
-msgid " Stored in system memory\n"
-msgstr ""
-
-#: sdl/i_video.c:582
-msgid " Uses asynchronous blits if possible\n"
-msgstr ""
-
-#: sdl/i_video.c:584
-msgid " Uses synchronous blits if possible\n"
-msgstr ""
-
-#: sdl/i_video.c:587
-msgid " Allows any pixel-format\n"
-msgstr ""
-
-#: sdl/i_video.c:590
-msgid " Has exclusive palette access\n"
-msgstr ""
-
-#: sdl/i_video.c:592
-msgid " Has nonexclusive palette access\n"
-msgstr ""
-
-#: sdl/i_video.c:595
-msgid " Double buffered\n"
-msgstr ""
-
-#: sdl/i_video.c:597
-msgid " No hardware flipping\n"
-msgstr ""
-
-#: sdl/i_video.c:600
-msgid " Full screen\n"
-msgstr ""
-
-#: sdl/i_video.c:602
-msgid " Resizable window\n"
-msgstr ""
-
-#: sdl/i_video.c:604
-msgid " Nonresizable window\n"
-msgstr ""
-
-#: sdl/i_video.c:607
-msgid " Uses hardware acceleration blit\n"
-msgstr ""
-
-#: sdl/i_video.c:609
-msgid " Use colorkey blitting\n"
-msgstr ""
-
-#: sdl/i_video.c:611
-msgid " Colorkey RLE acceleration blit\n"
-msgstr ""
-
-#: sdl/i_video.c:613
-msgid " Use alpha blending acceleration blit\n"
-msgstr ""
-
-#: sdl/i_video.c:623
-msgid "Video Interface Capabilities:\n"
-msgstr ""
-
-#: sdl/i_video.c:625
-msgid " Hardware surfaces\n"
-msgstr ""
-
-#: sdl/i_video.c:627
-msgid " Window manager\n"
-msgstr ""
-
-#: sdl/i_video.c:631
-msgid " Accelerated blits HW-2-HW\n"
-msgstr ""
-
-#: sdl/i_video.c:633
-msgid " Accelerated blits HW-2-HW with Colorkey\n"
-msgstr ""
-
-#: sdl/i_video.c:635
-msgid " Accelerated blits HW-2-HW with Alpha\n"
-msgstr ""
-
-#: sdl/i_video.c:638
-msgid " Accelerated blits SW-2-HW\n"
-msgstr ""
-
-#: sdl/i_video.c:642
-msgid " Accelerated blits SW-2-HW with Colorkey\n"
-msgstr ""
-
-#: sdl/i_video.c:644
-msgid " Accelerated blits SW-2-HW with Alpha\n"
-msgstr ""
-
-#: sdl/i_video.c:646
-msgid " Accelerated Color filling\n"
-msgstr ""
-
-#: sdl/i_video.c:649
-#, c-format
-msgid " There is %i KB of video memory\n"
-msgstr ""
-
-#: sdl/i_video.c:651
-msgid " There no video memory for SDL\n"
-msgstr ""
-
-#: sdl/i_video.c:654
-msgid "Current Engine Mode"
-msgstr ""
-
-#: sdl/i_video.c:656
-msgid "Prebuffer Mode"
-msgstr ""
-
-#: sdl/i_video.c:657
-msgid "Postbuffer Mode"
-msgstr ""
-
-#: sdl/i_video.c:659
-msgid "Current Video Mode"
-msgstr ""
-
-#: sdl/i_video.c:675 win32/win_vid.c:1149
-msgid "No video modes present\n"
-msgstr ""
-
-#: sdl/i_video.c:686
-#, c-format
-msgid "Found %d FullScreen Video Modes:\n"
-msgstr ""
-
-#: sdl/i_video.c:693
-#, c-format
-msgid "%dx%d and "
-msgstr ""
-
-#: sdl/i_video.c:697
-msgid "None\n"
-msgstr ""
-
-#: sdl/i_video.c:707 win32/win_vid.c:1142
-#, c-format
-msgid "vid_mode <modenum> : set video mode, current video mode %i\n"
-msgstr ""
-
-#: sdl/i_video.c:714 win32/win_vid.c:1101
-msgid "No such video mode\n"
-msgstr ""
-
-#: sdl/i_video.c:1969
-#, c-format
-msgid "Couldn't initialize SDL's Audio System with Video System: %s\n"
-msgstr ""
-
-#: sdl/i_video.c:1973
-#, c-format
-msgid "Couldn't initialize SDL's Video System: %s\n"
-msgstr ""
-
-#: sdl/i_video.c:1985
-#, c-format
-msgid "Starting up with video driver : %s\n"
-msgstr ""
-
-#: sdl/i_video.c:2054
-msgid ""
-"The version of the renderer doesn't match the version of the executable\n"
-"Be sure you have installed SRB2 properly.\n"
-msgstr ""
-
-#: sdl/i_video.c:2097
-#, c-format
-msgid "Could not set vidmode: %s\n"
-msgstr ""
-
-#: sdl/i_video.c:2106
-msgid "Not enough memory for video buffer\n"
-msgstr ""
-
-#: sounds.c:1473
-msgid "No more free sound slots\n"
-msgstr ""
-
-#: st_stuff.c:1558
-msgid "WAITING FOR PLAYERS TO HIDE..."
-msgstr ""
-
-#: st_stuff.c:1564
-msgid "HIDE BEFORE TIME RUNS OUT!"
-msgstr ""
-
-#: st_stuff.c:1566
-msgid "FLEE BEFORE YOU ARE HUNTED!"
-msgstr ""
-
-#: st_stuff.c:1569
-msgid "HIDE TIME REMAINING:"
-msgstr ""
-
-#: st_stuff.c:1578
-msgid "YOU'RE IT!"
-msgstr ""
-
-#: st_stuff.c:1582
-msgid "TIME REMAINING:"
-msgstr ""
-
-#: st_stuff.c:1584
-msgid "NO TIME LIMIT"
-msgstr ""
-
-#: st_stuff.c:1727 st_stuff.c:1729 st_stuff.c:1773 st_stuff.c:1775
-msgid "RED TEAM"
-msgstr ""
-
-#: st_stuff.c:1734 st_stuff.c:1736 st_stuff.c:1779 st_stuff.c:1781
-msgid "BLUE TEAM"
-msgstr ""
-
-#: st_stuff.c:1741 st_stuff.c:1743 st_stuff.c:1785 st_stuff.c:1787
-msgid "SPECTATOR"
-msgstr ""
-
-#: st_stuff.c:1821
-msgid "TIME LEFT"
-msgstr ""
-
-#: st_stuff.c:1855
-msgid "CONTINUE?"
-msgstr ""
-
-#: st_stuff.c:2196 st_stuff.c:2198
-msgid "OVERTIME!"
-msgstr ""
-
-#: st_stuff.c:2251
-msgid "Viewpoint:"
-msgstr ""
-
-#: st_stuff.c:2269
-msgid "I, Pope Rededict XVI proclaim"
-msgstr ""
-
-#: st_stuff.c:2270
-msgid "AJ & Amy"
-msgstr ""
-
-#: st_stuff.c:2271
-msgid "Husband & Wife"
-msgstr ""
-
-#: st_stuff.c:2272
-msgid "on this day"
-msgstr ""
-
-#: st_stuff.c:2273
-msgid "May 16, 2009"
-msgstr ""
-
-#: st_stuff.c:2279
-msgid "Oh... it's you again..."
-msgstr ""
-
-#: st_stuff.c:2280
-msgid "Look, I wanted to apologize for the way"
-msgstr ""
-
-#: st_stuff.c:2281
-msgid "I've acted in the past."
-msgstr ""
-
-#: st_stuff.c:2282
-msgid "I've seen the error of my ways"
-msgstr ""
-
-#: st_stuff.c:2283
-msgid "and turned over a new leaf."
-msgstr ""
-
-#: st_stuff.c:2284
-msgid "Instead of sending people to hell,"
-msgstr ""
-
-#: st_stuff.c:2285
-msgid "I now send them to heaven!"
-msgstr ""
-
-#: st_stuff.c:2317
-msgid "Thank you!"
-msgstr ""
-
-#: st_stuff.c:2318
-msgid "But our earless leader is in"
-msgstr ""
-
-#: st_stuff.c:2319
-msgid "another castle!"
-msgstr ""
-
-#: st_stuff.c:2328 st_stuff.c:2334 st_stuff.c:2356
-msgid "Press Viewpoint Key to watch a player."
-msgstr ""
-
-#: st_stuff.c:2333
-msgid "You cannot move while hiding."
-msgstr ""
-
-#: st_stuff.c:2344
-#, c-format
-msgid "Respawn in: %d seconds."
-msgstr ""
-
-#: st_stuff.c:2346
-msgid "Press Jump to respawn."
-msgstr ""
-
-#: st_stuff.c:2351
-msgid "You are a spectator."
-msgstr ""
-
-#: st_stuff.c:2353
-msgid "Press Fire to be assigned to a team."
-msgstr ""
-
-#: st_stuff.c:2355
-msgid "Press Fire to enter the game."
-msgstr ""
-
-#: st_stuff.c:2357
-msgid "Press Jump to float and Spin to sink."
-msgstr ""
-
-#: w_wad.c:138
-#, c-format
-msgid "Loading main config from %s\n"
-msgstr ""
-
-#: w_wad.c:148
-#, c-format
-msgid "Loading object config from %s\n"
-msgstr ""
-
-#: w_wad.c:219 w_wad.c:264
-msgid "Maximum wad files reached\n"
-msgstr ""
-
-#: w_wad.c:240
-#, c-format
-msgid "Can't open %s\n"
-msgstr ""
-
-#: w_wad.c:295
-#, c-format
-msgid "Can't read wad header from %s because %s\n"
-msgstr ""
-
-#: w_wad.c:305
-#, c-format
-msgid "%s doesn't have IWAD or PWAD id\n"
-msgstr ""
-
-#: w_wad.c:318
-#, c-format
-msgid "%s wadfile directory is corrupt; maybe %s\n"
-msgstr ""
-
-#: w_wad.c:398
-#, c-format
-msgid "Added file %s (%u lumps)\n"
-msgstr ""
-
-#: w_wad.c:414
-#, c-format
-msgid "You can't remove the IWAD %s!\n"
-msgstr ""
-
-#: w_wad.c:418
-#, c-format
-msgid "Removing WAD %s...\n"
-msgstr ""
-
-#: w_wad.c:438
-msgid " done unloading WAD\n"
-msgstr ""
-
-#: w_wad.c:953
-#, c-format
-msgid "File is corrupt or has been modified: %s (found md5: %s, wanted: %s)\n"
-msgstr ""
-
-#: win32/win_cd.c:229
-msgid "CD tracks remapped in that order :\n"
-msgstr ""
-
-#: win32/win_cd.c:256
-msgid "CD is not ready.\n"
-msgstr ""
-
-#: win32/win_cd.c:281
-msgid "No audio tracks\n"
-msgstr ""
-
-#: win32/win_cd.c:290
-msgid "audio"
-msgstr ""
-
-#: win32/win_cd.c:290
-msgid "data "
-msgstr ""
-
-#: win32/win_cd.c:293
-#, c-format
-msgid "Total time : %s\n"
-msgstr ""
-
-#: win32/win_main.c:335
-msgid "Hello, it's me, SRB2's Console Window\n"
-msgstr ""
-
-#: win32/win_main.c:339
-msgid "We have a console already.\n"
-msgstr ""
-
-#: win32/win_snd.c:987
-#, c-format
-msgid "Using external sound driver %s\n"
-msgstr ""
-
-#: win32/win_snd.c:992
-#, c-format
-msgid "Not using external sound driver %s\n"
-msgstr ""
-
-#: win32/win_snd.c:1003
-msgid " DirectSound DLL not loaded\n"
-msgstr ""
-
-#: win32/win_snd.c:1011
-msgid ""
-" DirectSoundCreate FAILED\n"
-" there is no sound device or the sound device is under\n"
-" the control of another application\n"
-msgstr ""
-
-#: win32/win_snd.c:1023
-msgid " SetCooperativeLevel FAILED\n"
-msgstr ""
-
-#: win32/win_snd.c:1049
-#, c-format
-msgid "CreateSoundBuffer FAILED: %s (ErrNo %ld)\n"
-msgstr ""
-
-#: win32/win_snd.c:1064
-msgid "Couldn't set primary buffer format.\n"
-msgstr ""
-
-#: win32/win_snd.c:1071
-msgid " Compacting onboard sound-memory..."
-msgstr ""
-
-#: win32/win_snd.c:1083
-msgid " Primary buffer continuous play FAILED\n"
-msgstr ""
-
-#: win32/win_snd.c:1120
-msgid "sound initialized.\n"
-msgstr ""
-
-#: win32/win_snd.c:1193
-#, c-format
-msgid "%d mixer devices available\n"
-msgstr ""
-
-#: win32/win_snd.c:1227
-msgid ""
-" failed to load FMOD\n"
-" no DigiMusic support\n"
-msgstr ""
-
-#: win32/win_snd.c:1289
-msgid "No MIDI devices available, music is disabled\n"
-msgstr ""
-
-#: win32/win_snd.c:1353
-msgid "No MIDI music\n"
-msgstr ""
-
-#: win32/win_snd.c:1365
-msgid "midiStreamOpen FAILED\n"
-msgstr ""
-
-#: win32/win_snd.c:1544
-msgid "Couldn't set volume\n"
-msgstr ""
-
-#: win32/win_snd.c:2116
-msgid "Music lump is not MID music format\n"
-msgstr ""
-
-#: win32/win_snd.c:2128
-msgid "I_RegisterSong: StreamBufferSetup FAILED"
-msgstr ""
-
-#: win32/win_sys.c:892
-msgid "Could not create IDirectInput device 2"
-msgstr ""
-
-#: win32/win_sys.c:1185
-msgid "\tMouse will not use DirectInput.\n"
-msgstr ""
-
-#: win32/win_sys.c:1722 win32/win_sys.c:2081
-#, c-format
-msgid "Capabilities: %lu axes, %lu buttons, %lu POVs, poll %u, Gamepad %d\n"
-msgstr ""
-
-#: win32/win_sys.c:1954
-msgid "Joystick disabled\n"
-msgstr ""
-
-#: win32/win_sys.c:1968 win32/win_sys.c:2330
-msgid "Looking for joystick devices:\n"
-msgstr ""
-
-#: win32/win_sys.c:1975 win32/win_sys.c:2338
-msgid "Joystick initialize failed.\n"
-msgstr ""
-
-#: win32/win_sys.c:1983 win32/win_sys.c:2346
-msgid "none found\n"
-msgstr ""
-
-#: win32/win_sys.c:1986 win32/win_sys.c:2349
-msgid "none used\n"
-msgstr ""
-
-#: win32/win_sys.c:1989
-msgid "Set the use_joystick variable to one of the enumerated joystick numbers\n"
-msgstr ""
-
-#: win32/win_sys.c:2002
-msgid "I_InitJoystick: SetCooperativeLevel FAILED"
-msgstr ""
-
-#: win32/win_sys.c:2006 win32/win_sys.c:2373
-msgid "Joystick already initialized\n"
-msgstr ""
-
-#: win32/win_sys.c:2316
-msgid "Joystick2 disabled\n"
-msgstr ""
-
-#: win32/win_sys.c:2353
-msgid "Set the use_joystick2 variable to one of the enumerated joysticks number\n"
-msgstr ""
-
-#: win32/win_sys.c:2364
-msgid "I_InitJoystick2: SetCooperativeLevel FAILED"
-msgstr ""
-
-#: win32/win_sys.c:3466
-#, c-format
-msgid "Couldn't create DirectInput (reason: %s)"
-msgstr ""
-
-#: win32/win_sys.c:3469
-msgid "Using DirectX3 interface\n"
-msgstr ""
-
-#: win32/win_vid.c:621
-msgid "mode skipped (too many)\n"
-msgstr ""
-
-#: win32/win_vid.c:769
-msgid "WARNING: This r_opengl version is not supported, use it at your own risk.\n"
-msgstr ""
-
-#: win32/win_vid.c:981
-#, c-format
-msgid "Mode changed to %d (%s)\n"
-msgstr ""
-
-#: win32/win_vid.c:1108
-#, c-format
-msgid ""
-"width: %d\n"
-"height: %d\n"
-msgstr ""
-
-#: win32/win_vid.c:1110
-#, c-format
-msgid ""
-"bytes per scanline: %d\n"
-"bytes per pixel: %d\n"
-"numpages: %d\n"
-msgstr ""
-
-#: y_inter.c:254
-msgid "GOT TIME BONUS EMBLEM!"
-msgstr ""
-
-#: y_inter.c:256
-msgid "GOT PERFECT BONUS EMBLEM!"
-msgstr ""
-
-#: y_inter.c:567
-msgid "Teams will be scrambled next round!"
-msgstr ""
-
-#: z_zone.c:113
-#, c-format
-msgid "system memory %uMB free %uMB\n"
-msgstr ""
-
-#: z_zone.c:446
-msgid "Memory Info\n"
-msgstr ""
-
-#: z_zone.c:447
-#, c-format
-msgid "Total heap used   : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:448
-#, c-format
-msgid "Static            : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:449
-#, c-format
-msgid "Static (sound)    : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:450
-#, c-format
-msgid "Static (music)    : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:451
-#, c-format
-msgid "Level             : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:452
-#, c-format
-msgid "Special thinker   : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:453
-#, c-format
-msgid "All purgable      : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:458
-#, c-format
-msgid "Patch info headers: %7s KB\n"
-msgstr ""
-
-#: z_zone.c:459
-#, c-format
-msgid "Mipmap patches    : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:460
-#, c-format
-msgid "HW Texture cache  : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:461
-#, c-format
-msgid "Plane polygons    : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:462
-#, c-format
-msgid "HW Texture used   : %7d KB\n"
-msgstr ""
-
-#: z_zone.c:466
-msgid "System Memory Info\n"
-msgstr ""
-
-#: z_zone.c:468
-#, c-format
-msgid "    Total physical memory: %7u KB\n"
-msgstr ""
-
-#: z_zone.c:469
-#, c-format
-msgid "Available physical memory: %7u KB\n"
-msgstr ""
diff --git a/src/locale/srb2.pot b/src/locale/srb2.pot
deleted file mode 100644
index c61cbcc97..000000000
--- a/src/locale/srb2.pot
+++ /dev/null
@@ -1,4240 +0,0 @@
-# Sonic Robo Blast 2 translation base POT file.
-
-# Copyright (C) Sonic Team Junior
-
-# 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.
-
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-02 06:13-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: command.c:104
-msgid "Command buffer full!\n"
-msgstr ""
-
-#: command.c:481
-#, c-format
-msgid "Unknown command '%s'\n"
-msgstr ""
-
-#: command.c:498
-msgid "alias <name> <command>\n"
-msgstr ""
-
-#: command.c:566
-msgid "cechoflags <flags>: set CEcho flags, prepend with 0x to use hexadecimal"
-msgstr ""
-
-#: command.c:585
-msgid "exec <filename> : run a script file\n"
-msgstr ""
-
-#: command.c:595
-#, c-format
-msgid "couldn't execute file %s\n"
-msgstr ""
-
-#: command.c:600
-#, c-format
-msgid "executing %s\n"
-msgstr ""
-
-#: command.c:634
-#, c-format
-msgid "Variable %s:\n"
-msgstr ""
-
-#: command.c:635
-msgid "  flags :"
-msgstr ""
-
-#: command.c:654
-#, c-format
-msgid "  range from %d to %d\n"
-msgstr ""
-
-#: command.c:656 command.c:673 command.c:677
-#, c-format
-msgid " Current value: %d\n"
-msgstr ""
-
-#: command.c:661
-#, c-format
-msgid "  possible value : %s\n"
-msgstr ""
-
-#: command.c:671
-#, c-format
-msgid " Current value: %s\n"
-msgstr ""
-
-#: command.c:680
-msgid "No Help for this command/variable\n"
-msgstr ""
-
-#: command.c:685
-msgid "Commands\n"
-msgstr ""
-
-#: command.c:699
-msgid ""
-"\n"
-"Variables\n"
-msgstr ""
-
-#: command.c:707
-msgid ""
-"\n"
-"read help file for more or type help <command or variable>\n"
-msgstr ""
-
-#: command.c:709
-#, c-format
-msgid "Total : %d\n"
-msgstr ""
-
-#: command.c:723
-msgid "Toggle <cvar_name> : Toggle the value of a cvar\n"
-msgstr ""
-
-#: command.c:729
-#, c-format
-msgid "%s is not a cvar\n"
-msgstr ""
-
-#: command.c:735
-#, c-format
-msgid "%s is not a boolean value\n"
-msgstr ""
-
-#: command.c:923
-#, c-format
-msgid "Variable %s is already defined\n"
-msgstr ""
-
-#: command.c:930
-#, c-format
-msgid "%s is a command name\n"
-msgstr ""
-
-#: command.c:953
-#, c-format
-msgid "variable %s has CV_NOINIT without CV_CALL"
-msgstr ""
-
-#: command.c:956
-#, c-format
-msgid "variable %s has CV_CALL without a function"
-msgstr ""
-
-#: command.c:1043
-#, c-format
-msgid "Bounded cvar \"%s\" without maximum!"
-msgstr ""
-
-#: command.c:1104 r_things.c:2551
-#, c-format
-msgid "\"%s\" is not a possible value for \"%s\"\n"
-msgstr ""
-
-#: command.c:1107
-#, c-format
-msgid "Variable %s default value \"%s\" is not a possible value\n"
-msgstr ""
-
-#: command.c:1146 command.c:1149
-#, c-format
-msgid "%s set to %s\n"
-msgstr ""
-
-#: command.c:1174
-#, c-format
-msgid "Illegal netvar command received from %s\n"
-msgstr ""
-
-#: command.c:1194
-#, c-format
-msgid "Netvar not found with netid %hu\n"
-msgstr ""
-
-#: command.c:1198 command.c:1200
-#, c-format
-msgid "Netvar received: %s [netid=%d] value %s\n"
-msgstr ""
-
-#: command.c:1276
-msgid "CV_Set: no variable\n"
-msgstr ""
-
-#: command.c:1298
-#, c-format
-msgid "Only the server can change this variable: %s %s\n"
-msgstr ""
-
-#: command.c:1317
-#, c-format
-msgid "This variable can't be changed while in netgame: %s %s\n"
-msgstr ""
-
-#: command.c:1527
-#, c-format
-msgid "\"%s\" is \"%s\" default is \"%s\"\n"
-msgstr ""
-
-#: console.c:164
-#, c-format
-msgid "Number of console HUD lines is now %d\n"
-msgstr ""
-
-#: console.c:192
-msgid "English keymap.\n"
-msgstr ""
-
-#: console.c:206
-msgid "bind <keyname> [<command>]\n"
-msgstr ""
-
-#: console.c:207
-msgid "bind table :\n"
-msgstr ""
-
-#: console.c:216
-msgid "Empty\n"
-msgstr ""
-
-#: console.c:223
-msgid "Invalid key name\n"
-msgstr ""
-
-#: console.c:1170
-msgid "NOTICE:"
-msgstr ""
-
-#: console.c:1173
-msgid "WARNING:"
-msgstr ""
-
-#: console.c:1176
-msgid "ERROR:"
-msgstr ""
-
-#: console.c:1199
-msgid "Press ENTER to continue\n"
-msgstr ""
-
-#: d_clisrv.c:216
-#, c-format
-msgid "NetXCmd buffer full, cannot add netcmd %d! (size: %d, needed: %s)\n"
-msgstr ""
-
-#: d_clisrv.c:383
-#, c-format
-msgid "Got unknown net command [%s]=%d (max %d)\n"
-msgstr ""
-
-#: d_clisrv.c:492
-msgid "Sending join request...\n"
-msgstr ""
-
-#: d_clisrv.c:688 d_clisrv.c:710 d_clisrv.c:760
-msgid "No more free memory for savegame\n"
-msgstr ""
-
-#: d_clisrv.c:776
-#, c-format
-msgid "Didn't save %s for netgame"
-msgstr ""
-
-#: d_clisrv.c:797
-#, c-format
-msgid "Loading savegame length %s\n"
-msgstr ""
-
-#: d_clisrv.c:800
-msgid "Can't read savegame sent"
-msgstr ""
-
-#: d_clisrv.c:826 g_game.c:3198
-#, c-format
-msgid "Map is now \"%s"
-msgstr ""
-
-#: d_clisrv.c:831 g_game.c:3222 st_stuff.c:823 st_stuff.c:835 st_stuff.c:846
-#: st_stuff.c:857 st_stuff.c:868 st_stuff.c:879 st_stuff.c:890 st_stuff.c:901
-#: st_stuff.c:912 st_stuff.c:923 st_stuff.c:934 st_stuff.c:945 st_stuff.c:956
-#: st_stuff.c:967
-msgid "ZONE"
-msgstr ""
-
-#: d_clisrv.c:839
-msgid "Can't load the level!\n"
-msgstr ""
-
-#: d_clisrv.c:843 d_clisrv.c:851 d_clisrv.c:1047
-#, c-format
-msgid "Can't delete %s"
-msgstr ""
-
-#: d_clisrv.c:1051
-msgid "Searching for a server...\n"
-msgstr ""
-
-#: d_clisrv.c:1053
-msgid "Contacting the server...\n"
-msgstr ""
-
-#: d_clisrv.c:1054
-msgid "Press ESC to abort\n"
-msgstr ""
-
-#: d_clisrv.c:1075
-#, c-format
-msgid "Connecting to: %s\n"
-msgstr ""
-
-#: d_clisrv.c:1085
-#, c-format
-msgid "Gametype: %s\n"
-msgstr ""
-
-#: d_clisrv.c:1086
-#, c-format
-msgid "Version: %d.%.2d.%u\n"
-msgstr ""
-
-#: d_clisrv.c:1106
-msgid "Found, "
-msgstr ""
-
-#: d_clisrv.c:1118
-#, c-format
-msgid ""
-"Maximum players reached: %d\n"
-"Press ESC"
-msgstr ""
-
-#: d_clisrv.c:1129
-msgid "Checking files...\n"
-msgstr ""
-
-#: d_clisrv.c:1221
-msgid "Network game synchronization aborted.\n"
-msgstr ""
-
-#: d_clisrv.c:1271
-msgid "Ban List:\n"
-msgstr ""
-
-#: d_clisrv.c:1283
-#, c-format
-msgid "Why: %s\n"
-msgstr ""
-
-#: d_clisrv.c:1289
-msgid " None\n"
-msgstr ""
-
-#: d_clisrv.c:1306
-msgid "Could not save ban list into ban.txt\n"
-msgstr ""
-
-#: d_clisrv.c:1376
-msgid "Could not open ban.txt for ban list\n"
-msgstr ""
-
-#: d_clisrv.c:1413
-msgid ""
-"Connect <serveraddress>: connect to a server\n"
-"Connect ANY: connect to the first lan server found\n"
-"Connect SELF: connect to your own server.\n"
-msgstr ""
-
-#: d_clisrv.c:1421 d_clisrv.c:1452
-msgid ""
-"You cannot connect while in a game\n"
-"End this game first\n"
-msgstr ""
-
-#: d_clisrv.c:1427 m_menu.c:4822 m_menu.c:4856 m_menu.c:5074
-msgid ""
-"You have wad files loaded and/or\n"
-"modified the game in some way.\n"
-"Please restart SRB2 before\n"
-"connecting."
-msgstr ""
-
-#: d_clisrv.c:1468
-msgid "There is no server identification with this network driver\n"
-msgstr ""
-
-#: d_clisrv.c:1474
-msgid "There is no network driver\n"
-msgstr ""
-
-#: d_clisrv.c:1634
-#, c-format
-msgid "num:%2d  node:%2d  %s\n"
-msgstr ""
-
-#: d_clisrv.c:1636
-#, c-format
-msgid "num:%2d  node:%2d  %s\n"
-msgstr ""
-
-#: d_clisrv.c:1664
-#, c-format
-msgid "There is no player named \"%s\"\n"
-msgstr ""
-
-#: d_clisrv.c:1696
-msgid " (verified admin)"
-msgstr ""
-
-#: d_clisrv.c:1699
-msgid " (spectator)"
-msgstr ""
-
-#: d_clisrv.c:1710
-msgid "Ban <playername> or <playernum> <reason>: ban and kick a player\n"
-msgstr ""
-
-#: d_clisrv.c:1727 d_clisrv.c:1882
-msgid "Too many bans! Geez, that's a lot of people you're excluding...\n"
-msgstr ""
-
-#: d_clisrv.c:1760 d_clisrv.c:1805 d_net.c:1189 d_netcmd.c:1902
-#: d_netcmd.c:2179 d_netcmd.c:2550 d_netcmd.c:2901 d_netcmd.c:2980
-#: d_netcmd.c:3041 d_netcmd.c:3125 d_netcmd.c:3219 d_netcmd.c:3280
-#: d_netcmd.c:4244 g_game.c:1656
-msgid "You are not the server. You cannot do this.\n"
-msgstr ""
-
-#: d_clisrv.c:1771
-msgid "Kick <playername> or <playernum> <reason>: kick a player\n"
-msgstr ""
-
-#: d_clisrv.c:1820
-msgid "Server is being shut down remotely. Goodbye!\n"
-msgstr ""
-
-#: d_clisrv.c:1849
-#, c-format
-msgid "Illegal kick command received from %s for player %d\n"
-msgstr ""
-
-#: d_clisrv.c:1852
-#, c-format
-msgid ""
-"So, you must be asking, why is this an illegal kick?\n"
-"Well, let's take a look at the facts, shall we?\n"
-"\n"
-"playernum (this is the guy who did it), he's %d.\n"
-"pnum (the guy he's trying to kick) is %d.\n"
-"playernum's node is %d.\n"
-"That node has %d players.\n"
-"Player 2 on that node is %d.\n"
-"pnum's node is %d.\n"
-"That node has %d players.\n"
-"Player 2 on that node is %d.\n"
-"\n"
-"If you think this is a bug, please report it, including all of the details above.\n"
-msgstr ""
-
-#: d_clisrv.c:1889
-msgid "has been kicked (Go away)\n"
-msgstr ""
-
-#: d_clisrv.c:1893
-msgid "left the game (Broke ping limit)\n"
-msgstr ""
-
-#: d_clisrv.c:1897
-msgid "left the game (Consistency failure)\n"
-msgstr ""
-
-#: d_clisrv.c:1903
-#, c-format
-msgid "Player kicked is #%d\n"
-msgstr ""
-
-#: d_clisrv.c:1909
-#, c-format
-msgid "Player %d is at %d, %d, %d\n"
-msgstr ""
-
-#: d_clisrv.c:1911
-#, c-format
-msgid "Player %d has a null mo\n"
-msgstr ""
-
-#: d_clisrv.c:1917
-msgid "left the game (Connection timeout)\n"
-msgstr ""
-
-#: d_clisrv.c:1920
-msgid "left the game\n"
-msgstr ""
-
-#: d_clisrv.c:1923
-msgid "has been banned (Don't come back)\n"
-msgstr ""
-
-#: d_clisrv.c:1927
-#, c-format
-msgid "has been kicked (%s)\n"
-msgstr ""
-
-#: d_clisrv.c:1931
-#, c-format
-msgid "has been banned (%s)\n"
-msgstr ""
-
-#: d_clisrv.c:1945
-msgid ""
-"Server closed connection\n"
-"(consistency failure)\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1950
-msgid ""
-"Server closed connection\n"
-"(Broke ping limit)\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1953
-msgid ""
-"You have been banned by the server\n"
-"\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1955
-#, c-format
-msgid ""
-"You have been kicked\n"
-"(%s)\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1957
-#, c-format
-msgid ""
-"You have been banned\n"
-"(%s)\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:1959
-msgid ""
-"You have been kicked by the server\n"
-"\n"
-"Press ESC\n"
-msgstr ""
-
-#: d_clisrv.c:2142
-#, c-format
-msgid "Illegal add player command received from %s\n"
-msgstr ""
-
-#: d_clisrv.c:2168
-#, c-format
-msgid "Player %d has joined the game (node %d)\n"
-msgstr ""
-
-#: d_clisrv.c:2192
-#, c-format
-msgid "Player Address is %s\n"
-msgstr ""
-
-#: d_clisrv.c:2264
-#, c-format
-msgid "Server added player %d node %d\n"
-msgstr ""
-
-#: d_clisrv.c:2304
-msgid "Starting Server....\n"
-msgstr ""
-
-#: d_clisrv.c:2790
-msgid ""
-"You have been banned\n"
-"from the server"
-msgstr ""
-
-#: d_clisrv.c:2793
-#, c-format
-msgid ""
-"Different SRB2 versions cannot\n"
-"play a netgame!\n"
-"(server version %d.%d.%d)"
-msgstr ""
-
-#: d_clisrv.c:2795
-msgid ""
-"The server is not accepting\n"
-"joins for the moment"
-msgstr ""
-
-#: d_clisrv.c:2797
-#, c-format
-msgid "Maximum players reached: %d"
-msgstr ""
-
-#: d_clisrv.c:2799
-msgid ""
-"Too many players from\n"
-"this node."
-msgstr ""
-
-#: d_clisrv.c:2801
-msgid ""
-"No players from\n"
-"this node."
-msgstr ""
-
-#: d_clisrv.c:2819
-msgid "Server couldn't send info, please try again"
-msgstr ""
-
-#: d_clisrv.c:2843
-msgid ""
-"Server has shutdown\n"
-"\n"
-"Press Esc"
-msgstr ""
-
-#: d_clisrv.c:2852
-msgid ""
-"Server Timeout\n"
-"\n"
-"Press Esc"
-msgstr ""
-
-#: d_clisrv.c:2880
-#, c-format
-msgid "Received packet from unknown host %d\n"
-msgstr ""
-
-#: d_clisrv.c:2907
-#, c-format
-msgid ""
-"Server refuses connection\n"
-"\n"
-"Reason:\n"
-"%s"
-msgstr ""
-
-#: d_clisrv.c:2942
-msgid "Join accepted, waiting for next level change...\n"
-msgstr ""
-
-#: d_clisrv.c:2943
-#, c-format
-msgid "Server accept join gametic=%u mynode=%d\n"
-msgstr ""
-
-#: d_clisrv.c:2981
-#, c-format
-msgid "unknown packet received (%d) from unknown host\n"
-msgstr ""
-
-#: d_clisrv.c:3041
-#, c-format
-msgid "Illegal movement value recieved from node %d\n"
-msgstr ""
-
-#: d_clisrv.c:3066
-#, c-format
-msgid "Consistency failure for player %d, restoring...\n"
-msgstr ""
-
-#: d_clisrv.c:3182 d_clisrv.c:3187
-#, c-format
-msgid "PT_SERVERTICS recieved from non-host %d\n"
-msgstr ""
-
-#: d_clisrv.c:3242 d_clisrv.c:3247
-#, c-format
-msgid "PT_CONSISTENCY recieved from non-host %d\n"
-msgstr ""
-
-#: d_clisrv.c:3265 d_clisrv.c:3270
-#, c-format
-msgid "PT_PING recieved from non-host %d\n"
-msgstr ""
-
-#: d_main.c:821
-#, c-format
-msgid "SRB2.SRB/SRB2.WAD not found! Expected in %s, ss files: %s and %s\n"
-msgstr ""
-
-#: d_main.c:977
-msgid "Development mode ON.\n"
-msgstr ""
-
-#: d_main.c:988
-msgid "Please set $HOME to your home directory\n"
-msgstr ""
-
-#: d_main.c:1092
-msgid "Z_Init: Init zone memory allocation daemon. \n"
-msgstr ""
-
-#: d_main.c:1098
-msgid "W_Init: Init WADfiles.\n"
-msgstr ""
-
-#: d_main.c:1112 d_main.c:1114
-msgid "A WAD file was not found or not valid\n"
-msgstr ""
-
-#: d_main.c:1162
-msgid "HU_Init: Setting up heads up display.\n"
-msgstr ""
-
-#: d_main.c:1207
-msgid "M_Init: Init miscellaneous info.\n"
-msgstr ""
-
-#: d_main.c:1210
-msgid "R_Init: Init SRB2 refresh daemon - "
-msgstr ""
-
-#: d_main.c:1214
-msgid "S_Init: Setting up sound.\n"
-msgstr ""
-
-#: d_main.c:1230
-msgid "ST_Init: Init status bar.\n"
-msgstr ""
-
-#: d_main.c:1237
-msgid "D_CheckNetGame: Checking network game status.\n"
-msgstr ""
-
-#: d_main.c:1288
-#, c-format
-msgid "Playing demo %s.\n"
-msgstr ""
-
-#: d_net.c:1093
-#, c-format
-msgid "Set extratics to %d\n"
-msgstr ""
-
-#: d_net.c:1105
-#, c-format
-msgid "Network bandwidth set to %d\n"
-msgstr ""
-
-#: d_net.c:1108
-msgid "usage: -bandwidth <byte_per_sec>"
-msgstr ""
-
-#: d_net.c:1124
-msgid "usage: -packetsize <bytes_per_packet>"
-msgstr ""
-
-#: d_net.c:1131
-msgid "Doomcom buffer invalid!"
-msgstr ""
-
-#: d_net.c:1133
-#, c-format
-msgid "Too many nodes (%d), max:%d"
-msgstr ""
-
-#: d_net.c:1141 d_net.c:1156
-#, c-format
-msgid "debug output to: %s\n"
-msgstr ""
-
-#: d_net.c:1158
-#, c-format
-msgid "cannot debug output to file %s!\n"
-msgstr ""
-
-#: d_net.c:1180
-#, c-format
-msgid ""
-"%.2d : %s\n"
-" %d tics, %d ms.\n"
-msgstr ""
-
-#: d_net.c:1184
-#, c-format
-msgid ""
-"%.2d : %s\n"
-" %d ms\n"
-msgstr ""
-
-#: d_netcmd.c:997
-#, c-format
-msgid "%s renamed to %s\n"
-msgstr ""
-
-#: d_netcmd.c:1004
-#, c-format
-msgid "Player %d sent a bad name change\n"
-msgstr ""
-
-#: d_netcmd.c:1375
-#, c-format
-msgid "There is no player %d!"
-msgstr ""
-
-#: d_netcmd.c:1477
-#, c-format
-msgid "Illegal color change received from %s (team: %d), color: %d)\n"
-msgstr ""
-
-#: d_netcmd.c:1581 d_netcmd.c:1923 d_netcmd.c:3479 d_netcmd.c:4291
-#: m_cheat.c:325 m_cheat.c:359 m_cheat.c:383 m_cheat.c:412 m_cheat.c:446
-#: m_cheat.c:525 m_cheat.c:549 m_cheat.c:568 m_cheat.c:588
-msgid "DEVMODE must be enabled.\n"
-msgstr ""
-
-#: d_netcmd.c:1587
-msgid "rteleport -x <value> -y <value> -z <value>: relative teleport to a location\n"
-msgstr ""
-
-#: d_netcmd.c:1593 d_netcmd.c:1663
-msgid "You can't teleport while in a netgame!\n"
-msgstr ""
-
-#: d_netcmd.c:1599 d_netcmd.c:1669
-msgid "Player is dead, etc.\n"
-msgstr ""
-
-#: d_netcmd.c:1618 d_netcmd.c:1694
-msgid "Not a valid location\n"
-msgstr ""
-
-#: d_netcmd.c:1635
-#, c-format
-msgid "Teleporting by %d, %d, %d...\n"
-msgstr ""
-
-#: d_netcmd.c:1639 d_netcmd.c:1714
-msgid "Unable to teleport to that spot!\n"
-msgstr ""
-
-#: d_netcmd.c:1657
-msgid "teleport -x <value> -y <value> -z <value>: teleport to a location\n"
-msgstr ""
-
-#: d_netcmd.c:1678
-msgid "X value not specified\n"
-msgstr ""
-
-#: d_netcmd.c:1687
-msgid "Y value not specified\n"
-msgstr ""
-
-#: d_netcmd.c:1710
-#, c-format
-msgid "Teleporting to %d, %d, %d...\n"
-msgstr ""
-
-#: d_netcmd.c:1732
-msgid "playdemo <demoname>: playback a demo\n"
-msgstr ""
-
-#: d_netcmd.c:1741 d_netcmd.c:1769
-msgid ""
-"\n"
-"You can't play a demo while in a netgame.\n"
-msgstr ""
-
-#: d_netcmd.c:1749
-#, c-format
-msgid "Playing back demo '%s'.\n"
-msgstr ""
-
-#: d_netcmd.c:1760
-msgid "timedemo <demoname>: time a demo\n"
-msgstr ""
-
-#: d_netcmd.c:1777
-#, c-format
-msgid "Timing demo '%s'.\n"
-msgstr ""
-
-#: d_netcmd.c:1786
-msgid "Stopped demo.\n"
-msgstr ""
-
-#: d_netcmd.c:1831
-#, c-format
-msgid "Map change: mapnum=%d gametype=%d ultmode=%d resetplayers=%d delay=%d skipprecutscene=%d\n"
-msgstr ""
-
-#: d_netcmd.c:1896
-msgid "map <mapname> [-gametype <type> [-force]: warp to map\n"
-msgstr ""
-
-#: d_netcmd.c:1909
-#, c-format
-msgid "Internal game level '%s' not found\n"
-msgstr ""
-
-#: d_netcmd.c:1915
-msgid "Sorry, level change disabled in single player.\n"
-msgstr ""
-
-#: d_netcmd.c:1931
-#, c-format
-msgid "Invalid level name %s\n"
-msgstr ""
-
-#: d_netcmd.c:1951
-msgid "You can't switch gametypes in single player!\n"
-msgstr ""
-
-#: d_netcmd.c:2022
-#, c-format
-msgid ""
-"That level doesn't support %s mode!\n"
-"(Use -force to override)\n"
-msgstr ""
-
-#: d_netcmd.c:2028
-msgid "That level doesn't support Single Player mode!\n"
-msgstr ""
-
-#: d_netcmd.c:2051
-#, c-format
-msgid "Illegal map change received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:2116
-#, c-format
-msgid "Speeding off to %s...\n"
-msgstr ""
-
-#: d_netcmd.c:2173 g_game.c:1649
-msgid "You can't pause here.\n"
-msgstr ""
-
-#: d_netcmd.c:2189
-#, c-format
-msgid "Illegal pause command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:2214
-#, c-format
-msgid "Game paused by %s\n"
-msgstr ""
-
-#: d_netcmd.c:2216
-#, c-format
-msgid "Game unpaused by %s\n"
-msgstr ""
-
-#: d_netcmd.c:2239 d_netcmd.c:3520 d_netcmd.c:4232 d_netcmd.c:4248
-#: m_cheat.c:353 m_cheat.c:377 m_cheat.c:406 m_cheat.c:440 m_cheat.c:635
-#: m_cheat.c:676 m_cheat.c:712 p_tick.c:51 p_tick.c:119
-msgid "You must be in a level to use this.\n"
-msgstr ""
-
-#: d_netcmd.c:2245
-msgid "You may only use this in co-op, race, and single player!"
-msgstr ""
-
-#: d_netcmd.c:2259
-#, c-format
-msgid "Illegal suicide command recieved from %s\n"
-msgstr ""
-
-#: d_netcmd.c:2328
-#, c-format
-msgid "Illegal clear scores command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:2343
-msgid "Scores have been reset by the server.\n"
-msgstr ""
-
-#: d_netcmd.c:2360 d_netcmd.c:2397
-msgid "changeteam <team>: switch to a new team (spectator or playing)\n"
-msgstr ""
-
-#: d_netcmd.c:2362 d_netcmd.c:2399
-msgid "changeteam <team>: switch to a new team (red, blue or spectator)\n"
-msgstr ""
-
-#: d_netcmd.c:2364 d_netcmd.c:2390 d_netcmd.c:2461 d_netcmd.c:2487
-#: d_netcmd.c:2566 d_netcmd.c:2605
-msgid "This command cannot be used outside of Match, Tag or CTF.\n"
-msgstr ""
-
-#: d_netcmd.c:2416 d_netcmd.c:2513 d_netcmd.c:2643
-msgid "Invalid gametype after initial checks!"
-msgstr ""
-
-#: d_netcmd.c:2420 d_netcmd.c:2517
-msgid "You're already on that team!\n"
-msgstr ""
-
-#: d_netcmd.c:2426 d_netcmd.c:2523
-msgid "The server does not allow team change.\n"
-msgstr ""
-
-#: d_netcmd.c:2435 d_netcmd.c:2532 d_netcmd.c:2656
-msgid "No tag status changes after hidetime!\n"
-msgstr ""
-
-#: d_netcmd.c:2457 d_netcmd.c:2494
-msgid "changeteam2 <team>: switch to a new team (spectator or playing)\n"
-msgstr ""
-
-#: d_netcmd.c:2459 d_netcmd.c:2496
-msgid "changeteam2 <team>: switch to a new team (red, blue or spectator)\n"
-msgstr ""
-
-#: d_netcmd.c:2560 d_netcmd.c:2612
-msgid "serverchangeteam <playernum> <team>: switch player to a new team (spectator or playing)\n"
-msgstr ""
-
-#: d_netcmd.c:2562 d_netcmd.c:2614
-msgid "serverchangeteam <playernum> <team>: switch player to a new team (it, notit, playing, or spectator)\n"
-msgstr ""
-
-#: d_netcmd.c:2564 d_netcmd.c:2616
-msgid "serverchangeteam <playernum> <team>: switch player to a new team (red, blue or spectator)\n"
-msgstr ""
-
-#: d_netcmd.c:2647
-msgid "That player is already on that team!\n"
-msgstr ""
-
-#: d_netcmd.c:2677 d_netcmd.c:2692 d_netcmd.c:2731 d_netcmd.c:2781
-#, c-format
-msgid "Illegal team change received from player %s\n"
-msgstr ""
-
-#: d_netcmd.c:2845
-#, c-format
-msgid "%s was autobalanced to even the teams.\n"
-msgstr ""
-
-#: d_netcmd.c:2847
-#, c-format
-msgid "%s was scrambled to a different team.\n"
-msgstr ""
-
-#: d_netcmd.c:2851 p_inter.c:2061 p_inter.c:2317 p_inter.c:2589 p_tick.c:507
-#: p_user.c:5622
-#, c-format
-msgid "%s is now IT!\n"
-msgstr ""
-
-#: d_netcmd.c:2853
-#, c-format
-msgid "%s switched to the red team\n"
-msgstr ""
-
-#: d_netcmd.c:2858
-#, c-format
-msgid "%s is no longer IT!\n"
-msgstr ""
-
-#: d_netcmd.c:2860
-#, c-format
-msgid "%s switched to the blue team\n"
-msgstr ""
-
-#: d_netcmd.c:2863 p_user.c:5633
-#, c-format
-msgid "%s entered the game.\n"
-msgstr ""
-
-#: d_netcmd.c:2865
-#, c-format
-msgid "%s became a spectator.\n"
-msgstr ""
-
-#: d_netcmd.c:2907
-msgid "password <password>: change password\n"
-msgstr ""
-
-#: d_netcmd.c:2931
-msgid "login <password>: Administrator login\n"
-msgstr ""
-
-#: d_netcmd.c:2947
-#, c-format
-msgid ""
-"Sending Login...%s\n"
-"(Notice only given if password is correct.)\n"
-msgstr ""
-
-#: d_netcmd.c:2965
-#, c-format
-msgid "%s passed authentication. (%s)\n"
-msgstr ""
-
-#: d_netcmd.c:2969
-#, c-format
-msgid "Password from %d failed (%s)\n"
-msgstr ""
-
-#: d_netcmd.c:2986
-msgid "verify <node>: give admin privileges to a node\n"
-msgstr ""
-
-#: d_netcmd.c:3008
-#, c-format
-msgid "Illegal verification received from %s (serverplayer is %s)\n"
-msgstr ""
-
-#: d_netcmd.c:3025
-msgid "Password correct. You are now a server administrator.\n"
-msgstr ""
-
-#: d_netcmd.c:3035
-msgid "motd <message>: Set a message that clients see upon join.\n"
-msgstr ""
-
-#: d_netcmd.c:3067 d_netcmd.c:3104
-msgid "Message of the day set.\n"
-msgstr ""
-
-#: d_netcmd.c:3088
-#, c-format
-msgid "Illegal motd change received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:3117
-msgid "runsoc <socfile.soc> or <lumpname>: run a soc\n"
-msgstr ""
-
-#: d_netcmd.c:3132
-msgid "Could not find SOC.\n"
-msgstr ""
-
-#: d_netcmd.c:3151
-#, c-format
-msgid "Illegal runsoc command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:3175 d_netcmd.c:3412
-#, c-format
-msgid ""
-"The server tried to add %s,\n"
-"but you don't have this file.\n"
-"You need to find it in order\n"
-"to play on this server."
-msgstr ""
-
-#: d_netcmd.c:3180
-#, c-format
-msgid "Unknown error finding soc file (%s) the server added.\n"
-msgstr ""
-
-#: d_netcmd.c:3203
-msgid "addfile <wadfile.wad>: load wad file\n"
-msgstr ""
-
-#: d_netcmd.c:3247
-#, c-format
-msgid "MD5 calc for %s took %f second\n"
-msgstr ""
-
-#: d_netcmd.c:3252 w_wad.c:263
-#, c-format
-msgid "File %s not found.\n"
-msgstr ""
-
-#: d_netcmd.c:3274
-msgid "You must NOT be in a level to use this.\n"
-msgstr ""
-
-#: d_netcmd.c:3323 d_netcmd.c:3393
-#, c-format
-msgid "Illegal addfile command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:3338
-#, c-format
-msgid "The server doesn't have %s\n"
-msgstr ""
-
-#: d_netcmd.c:3340
-#, c-format
-msgid "Checksum mismatch on %s\n"
-msgstr ""
-
-#: d_netcmd.c:3342
-#, c-format
-msgid "Unknown error finding wad file (%s)\n"
-msgstr ""
-
-#: d_netcmd.c:3360
-#, c-format
-msgid "Illegal delfile command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:3417
-#, c-format
-msgid ""
-"Checksum mismatch while loading %s.\n"
-"Make sure you have the copy of\n"
-"this file that the server has.\n"
-msgstr ""
-
-#: d_netcmd.c:3422
-#, c-format
-msgid "Unknown error finding wad file (%s) the server added.\n"
-msgstr ""
-
-#: d_netcmd.c:3436
-#, c-format
-msgid "There are %d wads loaded:\n"
-msgstr ""
-
-#: d_netcmd.c:3456
-#, c-format
-msgid "SRB2%s (%s %s %s)\n"
-msgstr ""
-
-#: d_netcmd.c:3462
-#, c-format
-msgid ""
-"Mod ID: %d\n"
-"Mod Version: %d\n"
-"Code Base:%d\n"
-msgstr ""
-
-#: d_netcmd.c:3470
-#, c-format
-msgid "Current gametype is %d\n"
-msgstr ""
-
-#: d_netcmd.c:3483
-msgid "jumptoaxis <axisnum>: Jump to axis within current mare.\n"
-msgstr ""
-
-#: d_netcmd.c:3528 d_netcmd.c:4304 m_cheat.c:389 m_cheat.c:424 m_cheat.c:458
-msgid "You can't use this in a netgame.\n"
-msgstr ""
-
-#: d_netcmd.c:3605
-msgid "Objectplace Controls:\\\\Camera L: Cycle backwards      \\Camera R: Cycle forwards       \\     Jump: Float up             \\     Spin: Float down           \\    Throw: Place object         \\Toss Flag: Remove object (buggy)\\"
-msgstr ""
-
-#: d_netcmd.c:3670
-#, c-format
-msgid "Levels will end after %s scores %d point%s.\n"
-msgstr ""
-
-#: d_netcmd.c:3672
-msgid "a team"
-msgstr ""
-
-#: d_netcmd.c:3672
-msgid "someone"
-msgstr ""
-
-#: d_netcmd.c:3677
-msgid "Point limit disabled\n"
-msgstr ""
-
-#: d_netcmd.c:3684
-#, c-format
-msgid "Number of laps set to %d\n"
-msgstr ""
-
-#: d_netcmd.c:3714
-#, c-format
-msgid "Levels will end after %d minute%s.\n"
-msgstr ""
-
-#: d_netcmd.c:3726
-msgid "Time limit disabled\n"
-msgstr ""
-
-#: d_netcmd.c:3750
-#, c-format
-msgid "Gametype was changed from %s to %s\n"
-msgstr ""
-
-#: d_netcmd.c:3916
-#, c-format
-msgid "Illegal color change received from %s (team: %d, color: %d)\n"
-msgstr ""
-
-#: d_netcmd.c:3932 d_netcmd.c:3946
-msgid "You haven't earned this yet.\n"
-msgstr ""
-
-#: d_netcmd.c:4006
-msgid "This command cannot be used outside of Team Match or CTF.\n"
-msgstr ""
-
-#: d_netcmd.c:4133
-msgid "Teams will be scrambled next round.\n"
-msgstr ""
-
-#: d_netcmd.c:4211
-msgid "HIDETIME cannot be greater or equal to the time limit!\n"
-msgstr ""
-
-#: d_netcmd.c:4239
-msgid "You can't use this in single player.\n"
-msgstr ""
-
-#: d_netcmd.c:4263
-#, c-format
-msgid "Illegal exitlevel command received from %s\n"
-msgstr ""
-
-#: d_netcmd.c:4284
-#, c-format
-msgid "Displayplayer is %d\n"
-msgstr ""
-
-#: d_netcmd.c:4292
-msgid "If you want to change the sky interactively on a map, use the linedef executor feature instead.\n"
-msgstr ""
-
-#: d_netcmd.c:4298
-msgid "skynum <sky#>: change the sky\n"
-msgstr ""
-
-#: d_netcmd.c:4308
-#, c-format
-msgid "Previewing sky %s...\n"
-msgstr ""
-
-#: d_netcmd.c:4320
-#, c-format
-msgid "tunes <slot#/default> <speed>: play a slot or the default stage tune at the specified speed(100%%)\n"
-msgstr ""
-
-#: d_netcmd.c:4321
-#, c-format
-msgid "The current tune is: %d\n"
-msgstr ""
-
-#: d_netcmd.c:4329
-#, c-format
-msgid "Valid slots are 1 to %d, or 0 to stop music\n"
-msgstr ""
-
-#: d_netcmd.c:4400
-msgid "modifiedgame is true, but you can save emblem and time data in this mod.\n"
-msgstr ""
-
-#: d_netcmd.c:4402
-msgid "modifiedgame is true, secrets will not be unlocked\n"
-msgstr ""
-
-#: d_netcmd.c:4404
-msgid "modifiedgame is false, you can unlock secrets\n"
-msgstr ""
-
-#: d_netcmd.c:4410
-msgid "At least one CHEAT-marked variable has been changed -- Cheats are enabled.\n"
-msgstr ""
-
-#: d_netcmd.c:4412
-msgid "No CHEAT-marked variables are changed -- Cheats are disabled.\n"
-msgstr ""
-
-#: d_netcmd.c:4439
-#, c-format
-msgid "Valid skin numbers are 0 to %d (-1 disables)\n"
-msgstr ""
-
-#: d_netcmd.c:4457 d_netcmd.c:4469
-msgid "You may not change your name when chat is muted.\n"
-msgstr ""
-
-#: d_netcmd.c:4486 d_netcmd.c:4502
-msgid "You can't change your skin at the moment.\n"
-msgstr ""
-
-#: d_netcmd.c:4603
-msgid "Chat has been muted.\n"
-msgstr ""
-
-#: d_netcmd.c:4605
-msgid "Chat is no longer muted.\n"
-msgstr ""
-
-#: d_netcmd.c:4637 d_netcmd.c:4655
-msgid "This only works in a netgame.\n"
-msgstr ""
-
-#: d_netcmd.c:4645
-#, c-format
-msgid "%s's score is %u\n"
-msgstr ""
-
-#: d_netcmd.c:4647
-#, c-format
-msgid "The pointlimit is %d\n"
-msgstr ""
-
-#: d_netcmd.c:4659
-#, c-format
-msgid ""
-"The current time is %f.\n"
-"The timelimit is %f\n"
-msgstr ""
-
-#: d_netfil.c:308
-#, c-format
-msgid "searching for '%s' "
-msgstr ""
-
-#: d_netfil.c:317
-msgid "already loaded\n"
-msgstr ""
-
-#: d_netfil.c:326
-#, c-format
-msgid "found %d\n"
-msgstr ""
-
-#: d_netfil.c:655
-#, c-format
-msgid "Downloading %s...(done)\n"
-msgstr ""
-
-#: dehacked.c:2505
-#, c-format
-msgid "Thing %d doesn't exist"
-msgstr ""
-
-#: dehacked.c:2523
-#, c-format
-msgid "Character %d out of range"
-msgstr ""
-
-#: dehacked.c:2561
-#, c-format
-msgid "Level number %d out of range"
-msgstr ""
-
-#: dehacked.c:2569
-#, c-format
-msgid "Cutscene number %d out of range"
-msgstr ""
-
-#: dehacked.c:2577
-#, c-format
-msgid "Unlockable number %d out of range"
-msgstr ""
-
-#: dehacked.c:2587
-#, c-format
-msgid "Frame %d doesn't exist"
-msgstr ""
-
-#: dehacked.c:2616
-#, c-format
-msgid "Sound %d doesn't exist"
-msgstr ""
-
-#: dehacked.c:2641
-#, c-format
-msgid "HUD item number %d out of range"
-msgstr ""
-
-#: dehacked.c:2649
-#, c-format
-msgid "Emblem number %d out of range"
-msgstr ""
-
-#: dehacked.c:2661
-#, c-format
-msgid ""
-"Patch is for SRB2 version %d,\n"
-"only version %d is supported"
-msgstr ""
-
-#: dehacked.c:2665
-#, c-format
-msgid "Unknown word: %s"
-msgstr ""
-
-#: dehacked.c:2668
-#, c-format
-msgid "missing argument for '%s'"
-msgstr ""
-
-#: dehacked.c:2671
-#, c-format
-msgid "No word in this line: %s"
-msgstr ""
-
-#: dehacked.c:2675
-#, c-format
-msgid "%d warning%s in the SOC lump\n"
-msgstr ""
-
-#: dehacked.c:2723
-msgid "Unloading WAD SOC edits\n"
-msgstr ""
-
-#: f_finale.c:248
-msgid "Sonic Team Junior\n"
-msgstr ""
-
-#: f_finale.c:249 f_finale.c:251
-msgid "Staff\n"
-msgstr ""
-
-#: f_finale.c:254
-msgid "Producer\n"
-msgstr ""
-
-#: f_finale.c:258 f_finale.c:263
-msgid "Director\n"
-msgstr ""
-
-#: f_finale.c:267
-msgid "Game Designers\n"
-msgstr ""
-
-#: f_finale.c:278
-msgid "Character Designers\n"
-msgstr ""
-
-#: f_finale.c:287
-msgid "Visual Design\n"
-msgstr ""
-
-#: f_finale.c:294
-msgid "Landscape Design\n"
-msgstr ""
-
-#: f_finale.c:303
-msgid "Chief Programmer\n"
-msgstr ""
-
-#: f_finale.c:310
-msgid "Programmers\n"
-msgstr ""
-
-#: f_finale.c:327
-msgid "Coding Assistants\n"
-msgstr ""
-
-#: f_finale.c:344
-msgid "Level Designers\n"
-msgstr ""
-
-#: f_finale.c:372
-msgid "Texture Artists\n"
-msgstr ""
-
-#: f_finale.c:387
-msgid "Music Production\n"
-msgstr ""
-
-#: f_finale.c:409
-msgid "Lead Guitar\n"
-msgstr ""
-
-#: f_finale.c:418
-msgid "Sound Effects\n"
-msgstr ""
-
-#: f_finale.c:429
-msgid "Official Mascot\n"
-msgstr ""
-
-#: f_finale.c:436
-msgid "Sky Sanctuary Team\n"
-msgstr ""
-
-#: f_finale.c:480
-msgid "Special Thanks\n"
-msgstr ""
-
-#: f_finale.c:495
-msgid "In Fond Memory Of\n"
-msgstr ""
-
-#: f_finale.c:510
-msgid "Modification By\n"
-msgstr ""
-
-#: f_finale.c:580
-msgid ""
-"Two months had passed since Dr. Eggman\n"
-"tried to take over the world using his\n"
-"Ring Satellite.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:584
-msgid ""
-"As it was about to drain the rings\n"
-"away from the planet, Sonic burst into\n"
-"the Satellite and for what he thought\n"
-"would be the last time, defeated\n"
-"Dr. Eggman.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:590
-msgid ""
-"\n"
-"What Sonic, Tails, and Knuckles had\n"
-"not anticipated was that Eggman would\n"
-"return, bringing an all new threat.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:594
-msgid ""
-"About once every year, a strange asteroid\n"
-"hovers around the planet. it suddenly\n"
-"appears from nowhere, circles around, and\n"
-"- just as mysteriously as it arrives, it\n"
-"vanishes after about two months.\n"
-"No one knows why it appears, or how.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:601
-msgid ""
-"\"Curses!\" Eggman yelled. \"That hedgehog\n"
-"and his ridiculous friends will pay\n"
-"dearly for this!\" Just then his scanner\n"
-"blipped as the Black Rock made its\n"
-"appearance from nowhere. Eggman looked at\n"
-"the screen, and just shrugged it off.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:608
-msgid ""
-"It was only later\n"
-"that he had an\n"
-"idea. \"The Black\n"
-"Rock usually has a\n"
-"lot of energy\n"
-"within it... if I\n"
-"can somehow\n"
-"harness this, I\n"
-"can turn it into\n"
-"the ultimate\n"
-"battle station,\n"
-"and every last\n"
-"person will be\n"
-"begging for mercy,\n"
-"including Sonic!\"\n"
-"#"
-msgstr ""
-
-#: f_finale.c:624
-msgid ""
-"\n"
-"\n"
-"Before beginning his scheme,\n"
-"Eggman decided to give Sonic\n"
-"a reunion party...\n"
-"#"
-msgstr ""
-
-#: f_finale.c:628
-msgid ""
-"\"We're ready to fire in 15 seconds!\"\n"
-"The robot said, his voice crackling a\n"
-"little down the com-link. \"Good!\"\n"
-"Eggman sat back in his Egg-Mobile and\n"
-"began to count down as he saw the\n"
-"GreenFlower city on the main monitor.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:635
-msgid ""
-"\"10...9...8...\"\n"
-"Meanwhile, Sonic was tearing across the\n"
-"zones, and everything became nothing but\n"
-"a blur as he ran around loops, skimmed\n"
-"over water, and catapulted himself off\n"
-"rocks with his phenomenal speed.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:642
-msgid ""
-"\"5...4...3...\"\n"
-"Sonic knew he was getting closer to the\n"
-"City, and pushed himself harder. Finally,\n"
-"the city appeared in the horizon.\n"
-"\"2...1...Zero.\"\n"
-"#"
-msgstr ""
-
-#: f_finale.c:648
-msgid ""
-"GreenFlower City was gone.\n"
-"Sonic arrived just in time to see what\n"
-"little of the 'ruins' were left. Everyone\n"
-"and everything in the city had been\n"
-"obliterated.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:654
-msgid ""
-"\"You're not quite as dead as we thought,\n"
-"huh? Are you going to tell us your plan as\n"
-"usual or will I 'have to work it out' or\n"
-"something?\"                         \n"
-"\"We'll see... let's give you a quick warm\n"
-"up, Sonic! JETTYSYNS! Open fire!\"\n"
-"#"
-msgstr ""
-
-#: f_finale.c:661
-msgid ""
-"Eggman took this\n"
-"as his cue and\n"
-"blasted off,\n"
-"leaving Sonic\n"
-"and Tails behind.\n"
-"Tails looked at\n"
-"the ruins of the\n"
-"Greenflower City\n"
-"with a grim face\n"
-"and sighed.           \n"
-"\"Now what do we\n"
-"do?\", he asked.\n"
-"#"
-msgstr ""
-
-#: f_finale.c:674
-msgid ""
-"\"Easy! We go\n"
-"find Eggman\n"
-"and stop his\n"
-"latest\n"
-"insane plan.\n"
-"Just like\n"
-"we've always\n"
-"done, right?                 \n"
-"\n"
-"...                    \n"
-"\n"
-"\"Tails,what\n"
-"*ARE* you\n"
-"doing?\"\n"
-"#"
-msgstr ""
-
-#: f_finale.c:687
-msgid ""
-"\"I'm just finding what mission obje...\n"
-"a-ha! Here it is! This will only give\n"
-"the robot's primary objective. It says,\n"
-"* LOCATE AND RETRIEVE CHAOS EMERALD.\n"
-"ESTIMATED LOCATION: GREENFLOWER ZONE *\"\n"
-"\"All right, then let's go!\"\n"
-"#"
-msgstr ""
-
-#: g_game.c:506
-msgid "Game must be restarted to record statistics.\n"
-msgstr ""
-
-#: g_game.c:1564
-#, c-format
-msgid "Viewpoint: %s\n"
-msgstr ""
-
-#: g_game.c:2042
-#, c-format
-msgid "Current mare is %d\n"
-msgstr ""
-
-#: g_game.c:2159
-msgid "No player spawns found, spawning at the first mapthing!\n"
-msgstr ""
-
-#: g_game.c:2165
-msgid "No player spawns found, spawning at the origin!\n"
-msgstr ""
-
-#: g_game.c:2179
-msgid "No CTF starts in this map!\n"
-msgstr ""
-
-#: g_game.c:2188
-msgid "No Red Team starts in this map!\n"
-msgstr ""
-
-#: g_game.c:2200
-msgid "Could not spawn at any Red Team starts!\n"
-msgstr ""
-
-#: g_game.c:2208
-msgid "No Blue Team starts in this map!\n"
-msgstr ""
-
-#: g_game.c:2219
-msgid "Could not spawn at any Blue Team starts!\n"
-msgstr ""
-
-#: g_game.c:2239
-msgid "Could not spawn at any Deathmatch starts!\n"
-msgstr ""
-
-#: g_game.c:2244
-msgid "No Deathmatch starts in this map!\n"
-msgstr ""
-
-#: g_game.c:2262
-msgid "No Co-op starts in this map!\n"
-msgstr ""
-
-#: g_game.c:2410
-msgid "The round has ended.\n"
-msgstr ""
-
-#: g_game.c:2465
-#, c-format
-msgid "Unknown gametype! %d\n"
-msgstr ""
-
-#: g_game.c:2568 g_game.c:2582
-#, c-format
-msgid "Next map given (MAP %d) doesn't exist! Reverting to MAP01.\n"
-msgstr ""
-
-#: g_game.c:2595
-#, c-format
-msgid "Can't find a compatible map after map %d; using map %d anyway\n"
-msgstr ""
-
-#: g_game.c:2858 g_game.c:3041
-msgid "No more free memory for saving game data\n"
-msgstr ""
-
-#: g_game.c:2922 g_game.c:2992
-msgid ""
-"Savegame file corrupted\n"
-"\n"
-"Press ESC\n"
-msgstr ""
-
-#: g_game.c:2966
-#, c-format
-msgid "Couldn't read file %s\n"
-msgstr ""
-
-#: g_game.c:2976
-msgid ""
-"Save game from different version.\n"
-"You can load this savegame, but\n"
-"saving afterwards will be disabled.\n"
-"\n"
-"Do you want to continue anyway?\n"
-"\n"
-"(Press 'Y' to confirm)\n"
-msgstr ""
-
-#: g_game.c:3060
-msgid "Game saved.\n"
-msgstr ""
-
-#: g_game.c:3062
-#, c-format
-msgid "Error while writing to %s for save slot %u, base: %s\n"
-msgstr ""
-
-#: g_game.c:3662
-msgid "Demo is desynced!\n"
-msgstr ""
-
-#: g_game.c:4172 g_game.c:4245 g_game.c:4392
-#, c-format
-msgid "Failed to read file '%s'.\n"
-msgstr ""
-
-#: g_game.c:4182 g_game.c:4188
-#, c-format
-msgid "File '%s' invalid format. It will be overwritten.\n"
-msgstr ""
-
-#: g_game.c:4196
-#, c-format
-msgid "File '%s' not from timeattack. It will be overwritten.\n"
-msgstr ""
-
-#: g_game.c:4264
-#, c-format
-msgid "%s is a different replay format and cannot be played.\n"
-msgstr ""
-
-#: g_game.c:4274
-#, c-format
-msgid "%s is the wrong type of recording and cannot be played.\n"
-msgstr ""
-
-#: g_game.c:4319
-msgid "Demo version does not match game version. Desyncs may occur.\n"
-msgstr ""
-
-#: g_game.c:4406 g_game.c:4413
-#, c-format
-msgid "Failed to add ghost %s: Demo format unacceptable.\n"
-msgstr ""
-
-#: g_game.c:4422
-#, c-format
-msgid "Failed to add ghost %s: No ghost data in this demo.\n"
-msgstr ""
-
-#: g_game.c:4468
-#, c-format
-msgid "Added ghost %s from %s\n"
-msgstr ""
-
-#: g_game.c:4537
-msgid "Movie mode enabled.\n"
-msgstr ""
-
-#: g_game.c:4546
-msgid "Movie mode disabled.\n"
-msgstr ""
-
-#: g_game.c:4564
-msgid "No bot recording for this map.\n"
-msgstr ""
-
-#: g_game.c:4582
-msgid "Could not find Metal Sonic.\n"
-msgstr ""
-
-#: g_game.c:4600
-#, c-format
-msgid "Loaded level in %f sec\n"
-msgstr ""
-
-#: g_game.c:4660
-#, c-format
-msgid ""
-"timed %u gametics in %d realtics\n"
-"%f seconds, %f avg fps\n"
-msgstr ""
-
-#: g_game.c:4691
-#, c-format
-msgid "Demo %s recorded\n"
-msgstr ""
-
-#: g_game.c:4693
-#, c-format
-msgid "Demo %s not saved\n"
-msgstr ""
-
-#: g_input.c:1338
-#, c-format
-msgid "Control '%s' unknown\n"
-msgstr ""
-
-#: g_input.c:1359
-msgid "setcontrol <controlname> <keyname> [<2nd keyname>]\n"
-msgstr ""
-
-#: g_input.c:1374
-msgid "setcontrol2 <controlname> <keyname> [<2nd keyname>]\n"
-msgstr ""
-
-#: hardware/hw_main.c:4386
-#, c-format
-msgid "Patch info headers: %7s kb\n"
-msgstr ""
-
-#: hardware/hw_main.c:4387
-#, c-format
-msgid "3D Texture cache  : %7s kb\n"
-msgstr ""
-
-#: hardware/hw_main.c:4388
-#, c-format
-msgid "Plane polygon     : %7s kb\n"
-msgstr ""
-
-#: hardware/hw_md2.c:899
-msgid "Error while loading md2.dat\n"
-msgstr ""
-
-#: hardware/hw_md2.c:916
-#, c-format
-msgid "    Not found: %s\n"
-msgstr ""
-
-#: hardware/s_ds3d/s_ds3d.c:617 p_tick.c:168 sdl/i_sound.c:1347
-#: win32/win_snd.c:1071 win32/win_snd.c:1429
-msgid "Done\n"
-msgstr ""
-
-#: hardware/s_ds3d/s_ds3d.c:617 win32/win_snd.c:1071
-msgid "Failed\n"
-msgstr ""
-
-#: hu_stuff.c:405
-msgid "The chat is muted. You can't say anything at the moment.\n"
-msgstr ""
-
-#: hu_stuff.c:440
-msgid "say <message>: send a message\n"
-msgstr ""
-
-#: hu_stuff.c:457
-msgid "sayto <playername|playernum> <message>: send a message to a player\n"
-msgstr ""
-
-#: hu_stuff.c:464
-msgid "sayto: No player with that name!\n"
-msgstr ""
-
-#: hu_stuff.c:480
-msgid "sayteam <message>: send a message to your team\n"
-msgstr ""
-
-#: hu_stuff.c:486
-msgid "Dedicated servers can't send team messages. Use \"say\".\n"
-msgstr ""
-
-#: hu_stuff.c:500
-msgid "csay <message>: send a message to be shown in the middle of the screen\n"
-msgstr ""
-
-#: hu_stuff.c:506
-msgid "Only servers and admins can use csay.\n"
-msgstr ""
-
-#: hu_stuff.c:532
-#, c-format
-msgid "Illegal csay command received from non-admin %s\n"
-msgstr ""
-
-#: hu_stuff.c:532
-#, c-format
-msgid "Illegal say command received from %s while muted\n"
-msgstr ""
-
-#: hu_stuff.c:556
-#, c-format
-msgid "Illegal say command received from %s containing invalid characters\n"
-msgstr ""
-
-#: hu_stuff.c:753
-msgid "[Message unsent]\n"
-msgstr ""
-
-#: i_tcp.c:310
-msgid "Looking for UPnP Internet Gatewaty Device\n"
-msgstr ""
-
-#: i_tcp.c:326
-#, c-format
-msgid ""
-"Found UPnP device :\n"
-" desc: %s\n"
-" st: %s\n"
-msgstr ""
-
-#: i_tcp.c:330
-#, c-format
-msgid "Local LAN ip address : %s\n"
-msgstr ""
-
-#: i_tcp.c:346
-msgid "Failed to talk to any UPnP device\n"
-msgstr ""
-
-#: i_tcp.c:754
-msgid "Could not get broadcast rights\n"
-msgstr ""
-
-#: i_tcp.c:772
-msgid "Could not limit IPv6 bind\n"
-msgstr ""
-
-#: i_tcp.c:796
-#, c-format
-msgid "Network system buffer: %dKb\n"
-msgstr ""
-
-#: i_tcp.c:805
-msgid "Can't set buffer length to 64k, file transfer will be bad\n"
-msgstr ""
-
-#: i_tcp.c:807
-#, c-format
-msgid "Network system buffer set to: %dKb\n"
-msgstr ""
-
-#: i_tcp.c:1195 sdl/i_cdmus.c:383 sdl/i_sound.c:1138 sdl/i_sound.c:1463
-#: sdl/i_video.c:2154
-msgid "shut down\n"
-msgstr ""
-
-#: m_argv.c:161
-#, c-format
-msgid "Response file %s not found"
-msgstr ""
-
-#: m_argv.c:163
-#, c-format
-msgid "Found response file %s\n"
-msgstr ""
-
-#: m_argv.c:169
-msgid "No more free memory for the respone file"
-msgstr ""
-
-#: m_argv.c:171
-#, c-format
-msgid "Couldn't read response file because %s"
-msgstr ""
-
-#: m_argv.c:183
-msgid "Not enough memory to read response file"
-msgstr ""
-
-#: m_argv.c:214
-#, c-format
-msgid "%d command-line args:\n"
-msgstr ""
-
-#: m_cheat.c:268 m_cheat.c:288 m_cheat.c:308 m_cheat.c:611 m_cheat.c:647
-#: m_cheat.c:688 m_cheat.c:724
-msgid "You're too good to be cheating!\n"
-msgstr ""
-
-#: m_cheat.c:274
-#, c-format
-msgid "No Clipping %s\n"
-msgstr ""
-
-#: m_cheat.c:274 m_cheat.c:294
-msgid "Off"
-msgstr ""
-
-#: m_cheat.c:274 m_cheat.c:294
-msgid "On"
-msgstr ""
-
-#: m_cheat.c:294
-#, c-format
-msgid "Sissy Mode %s\n"
-msgstr ""
-
-#: m_cheat.c:314
-msgid "Disabled"
-msgstr ""
-
-#: m_cheat.c:314
-msgid "Enabled"
-msgstr ""
-
-#: m_cheat.c:314
-#, c-format
-msgid "SEP Field %s\n"
-msgstr ""
-
-#: m_cheat.c:331 m_cheat.c:365 m_cheat.c:531 m_cheat.c:555 m_cheat.c:574
-#: m_cheat.c:594 m_cheat.c:641 m_cheat.c:682 m_cheat.c:718
-msgid "This only works in single player.\n"
-msgstr ""
-
-#: m_cheat.c:337
-msgid "scale <value> (5-400): set player scale size\n"
-msgstr ""
-
-#: m_cheat.c:346
-#, c-format
-msgid "Scale set to %d\n"
-msgstr ""
-
-#: m_cheat.c:395
-msgid "hurtme <damage>\n"
-msgstr ""
-
-#: m_cheat.c:418 m_cheat.c:433
-msgid "charability <1/2> <value>\n"
-msgstr ""
-
-#: m_cheat.c:452 m_cheat.c:478
-msgid "charspeed <normalspeed/runspeed/thrustfactor/accelstart/acceleration/actionspd> <value>\n"
-msgstr ""
-
-#: m_cheat.c:490
-msgid "Your reality is everyone's reality. Therefore, you should not use this command.\n"
-msgstr ""
-
-#: m_cheat.c:541
-#, c-format
-msgid "Temporary checkpoint created at %d, %d, %d\n"
-msgstr ""
-
-#: m_cheat.c:561 m_menu.c:3295
-msgid "You now have all 7 emeralds.\n"
-msgstr ""
-
-#: m_cheat.c:580
-msgid "Emeralds reset to zero.\n"
-msgstr ""
-
-#: m_cheat.c:600
-msgid "All secrets unlocked.\n"
-msgstr ""
-
-#: m_cheat.c:629 m_cheat.c:670 m_cheat.c:706
-msgid "You haven't earned this yet."
-msgstr ""
-
-#: m_menu.c:1848
-msgid ""
-"You can't use this while in a game!\n"
-"\n"
-"(Press a key)"
-msgstr ""
-
-#: m_menu.c:1855
-msgid ""
-"This cannot be done in a modified game.\n"
-"\n"
-"(Press a key)"
-msgstr ""
-
-#: m_menu.c:2173
-msgid ""
-"Eggman's tied explosives\n"
-"to your girlfriend, and\n"
-"will activate them if\n"
-"you press the 'Y' key!\n"
-"Press 'N' to save her!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2174
-msgid ""
-"What would Tails say if\n"
-"he saw you quitting the game?\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2175
-msgid ""
-"Hey!\n"
-"Where do ya think you're goin'?\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2176
-msgid ""
-"Forget your studies!\n"
-"Play some more!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2177
-msgid ""
-"You're trying to say you\n"
-"like Sonic 2K6 better than\n"
-"this, right?\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2178
-msgid ""
-"Don't leave yet -- there's a\n"
-"super emerald around that corner!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2179
-msgid ""
-"You'd rather work than play?\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2180
-msgid ""
-"Go ahead and leave. See if I care...\n"
-"*sniffle*\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2182
-msgid ""
-"If you leave now,\n"
-"Eggman will take over the world!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2183
-msgid ""
-"Don't quit!\n"
-"There are animals\n"
-"to save!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2184
-msgid ""
-"Aw c'mon, just bop\n"
-"a few more robots!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2185
-msgid ""
-"Did you get all those Chaos Emeralds?\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2186
-msgid ""
-"If you leave, I'll use\n"
-"my spin attack on you!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2187
-msgid ""
-"Don't go!\n"
-"You might find the hidden\n"
-"levels!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2188
-msgid ""
-"Hit the 'N' key, Sonic!\n"
-"The 'N' key!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2190
-msgid ""
-"Are you really going to give up?\n"
-"We certainly would never give you up.\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2191
-msgid ""
-"Come on, just ONE more netgame!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2192
-msgid ""
-"Press 'N' to unlock\n"
-"the Ultimate Cheat!\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2193
-msgid ""
-"Why don't you go back and try\n"
-"jumping on that house to\n"
-"see what happens?\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2194
-msgid ""
-"Every time you press 'Y', an\n"
-"SRB2 Developer cries...\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2195
-msgid ""
-"You'll be back to play soon, though...\n"
-"......right?\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:2196
-msgid ""
-"Aww, is Egg Rock Zone too\n"
-"difficult for you?\n"
-"\n"
-"(Press 'Y' to quit)"
-msgstr ""
-
-#: m_menu.c:3218
-msgid ""
-"The server is not allowing\n"
-" team changes at this time.\n"
-"Press a key."
-msgstr ""
-
-#: m_menu.c:3271
-msgid ""
-"Retry this act from the last starpost?\n"
-"\n"
-"(Press 'Y' to confirm)\n"
-msgstr ""
-
-#: m_menu.c:3315
-msgid ""
-"Do you want to destroy all\n"
-"robots in the current level?\n"
-"\n"
-"(Press 'Y' to confirm)\n"
-msgstr ""
-
-#: m_menu.c:3591 m_menu.c:3763
-msgid "No selectable levels found.\n"
-msgstr ""
-
-#: m_menu.c:4141
-msgid ""
-"Are you sure you want to delete\n"
-"this save game?\n"
-"\n"
-"(Press 'Y' to confirm)\n"
-msgstr ""
-
-#: m_menu.c:4531
-msgid "No time-attackable levels found.\n"
-msgstr ""
-
-#: m_menu.c:4562 y_inter.c:909
-msgid "Out of memory for replay filepath\n"
-msgstr ""
-
-#: m_menu.c:4609
-msgid ""
-"Are you sure you want to end the game?\n"
-"\n"
-"(Press 'Y' to confirm)"
-msgstr ""
-
-#: m_menu.c:5467
-msgid ""
-"Are you sure you want to delete\n"
-"the time attack data?\n"
-"\n"
-"(Press 'Y' to confirm)\n"
-msgstr ""
-
-#: m_menu.c:5469
-msgid ""
-"Are you sure you want to delete\n"
-"the secrets data?\n"
-"\n"
-"(Press 'Y' to confirm)\n"
-msgstr ""
-
-#: m_menu.c:5706
-#, c-format
-msgid ""
-"Hit the new key for\n"
-"%s\n"
-"ESC for Cancel"
-msgstr ""
-
-#: m_menu.c:5725 m_menu.c:5732
-msgid "SFX Enabled"
-msgstr ""
-
-#: m_menu.c:5738
-msgid "SFX Disabled"
-msgstr ""
-
-#: m_menu.c:5753 m_menu.c:5760
-msgid "Digital Music Enabled"
-msgstr ""
-
-#: m_menu.c:5766
-msgid "Digital Music Disabled"
-msgstr ""
-
-#: m_menu.c:5780 m_menu.c:5787
-msgid "MIDI Music Enabled"
-msgstr ""
-
-#: m_menu.c:5793
-msgid "MIDI Music Disabled"
-msgstr ""
-
-#: m_misc.c:398
-msgid "saveconfig <filename[.cfg]> [-silent] : save config to a file\n"
-msgstr ""
-
-#: m_misc.c:406
-#, c-format
-msgid "config saved as %s\n"
-msgstr ""
-
-#: m_misc.c:417
-msgid "loadconfig <filename[.cfg]> : load config from a file\n"
-msgstr ""
-
-#: m_misc.c:434
-msgid "changeconfig <filename[.cfg]> : save current config and load another\n"
-msgstr ""
-
-#: m_misc.c:454
-#, c-format
-msgid "config file: %s\n"
-msgstr ""
-
-#: m_misc.c:487 m_misc.c:505
-msgid "Config filename must be .cfg\n"
-msgstr ""
-
-#: m_misc.c:497 m_misc.c:512
-#, c-format
-msgid "Couldn't save game config file %s\n"
-msgstr ""
-
-#: m_misc.c:1054
-msgid "Recording into next new file\n"
-msgstr ""
-
-#: m_misc.c:1346
-#, c-format
-msgid "screen shot %s saved in %s\n"
-msgstr ""
-
-#: m_misc.c:1351
-#, c-format
-msgid "Couldn't create screen shot %s in %s\n"
-msgstr ""
-
-#: m_misc.c:1353
-#, c-format
-msgid "Couldn't create screen shot (all 10000 slots used!) in %s\n"
-msgstr ""
-
-#: mserv.c:346 mserv.c:373
-msgid "No servers currently running.\n"
-msgstr ""
-
-#: mserv.c:478 mserv.c:519 mserv.c:585 mserv.c:623 mserv.c:858 mserv.c:955
-msgid "cannot connect to the master server\n"
-msgstr ""
-
-#: mserv.c:479 mserv.c:520 mserv.c:586
-msgid ""
-"There was a problem connecting to\n"
-"the Master Server"
-msgstr ""
-
-#: mserv.c:545
-#, c-format
-msgid ""
-"You have been banned from\n"
-"hosting netgames.\n"
-"\n"
-"Under the following IP Range:\n"
-"%s - %s\n"
-"\n"
-"For the following reason:\n"
-"%s\n"
-"\n"
-"Your ban will expire on:\n"
-"%s"
-msgstr ""
-
-#: mserv.c:547
-#, c-format
-msgid ""
-"You have been banned from\n"
-"joining netgames.\n"
-"\n"
-"Under the following IP Range:\n"
-"%s - %s\n"
-"\n"
-"For the following reason:\n"
-"%s\n"
-"\n"
-"Your ban will expire on:\n"
-"%s"
-msgstr ""
-
-#: mserv.c:570
-msgid "Master Server Offline."
-msgstr ""
-
-#: mserv.c:571
-msgid "Offline"
-msgstr ""
-
-#: mserv.c:615
-msgid "Not yet registered to the master server.\n"
-msgstr ""
-
-#: mserv.c:619
-msgid "Retrieving server list...\n"
-msgstr ""
-
-#: mserv.c:628
-msgid "cannot get server list\n"
-msgstr ""
-
-#: mserv.c:650
-msgid "Connection to master server failed\n"
-msgstr ""
-
-#: mserv.c:681
-msgid "Timeout on masterserver\n"
-msgstr ""
-
-#: mserv.c:692
-#, c-format
-msgid "Masterserver error on select #%u: %s\n"
-msgstr ""
-
-#: mserv.c:704
-#, c-format
-msgid "Masterserver getsockopt error #%u: %s\n"
-msgstr ""
-
-#: mserv.c:716
-msgid "Dedicated internet servers must use the -room parameter!"
-msgstr ""
-
-#: mserv.c:747
-msgid "Master Server Updated Successfully!\n"
-msgstr ""
-
-#: mserv.c:851
-msgid "Registering this server to the master server...\n"
-msgstr ""
-
-#: mserv.c:951
-msgid "Unregistering this server to the master server...\n"
-msgstr ""
-
-#: mserv.c:960
-msgid "cannot remove this server from the master server\n"
-msgstr ""
-
-#: mserv.c:988
-msgid "You cannot register on the Master Server mid-game,  please end your current session and re-host ifyou wish to advertise your server on the Master Server.\n"
-msgstr ""
-
-#: p_enemy.c:2224
-msgid "All monitors turned off.\n"
-msgstr ""
-
-#: p_enemy.c:2431 p_enemy.c:2468 p_enemy.c:2498 p_enemy.c:2526 p_enemy.c:2554
-#: p_enemy.c:2578 p_enemy.c:2611 p_enemy.c:2644 p_enemy.c:2692 p_enemy.c:2720
-#: p_enemy.c:2758 p_enemy.c:2788 p_enemy.c:5381
-msgid "ERROR: Powerup has no target!\n"
-msgstr ""
-
-#: p_enemy.c:2437
-#, c-format
-msgid "Power #%d out of range!\n"
-msgstr ""
-
-#: p_enemy.c:2474
-#, c-format
-msgid "Weapon #%d out of range!\n"
-msgstr ""
-
-#: p_inter.c:1535
-#, c-format
-msgid "%s returned the red flag to base.\n"
-msgstr ""
-
-#: p_inter.c:1550
-#, c-format
-msgid "%s picked up the red flag!\n"
-msgstr ""
-
-#: p_inter.c:1586
-#, c-format
-msgid "%s returned the blue flag to base.\n"
-msgstr ""
-
-#: p_inter.c:1601
-#, c-format
-msgid "%s picked up the blue flag!\n"
-msgstr ""
-
-#: p_inter.c:1669 p_inter.c:1825
-#, c-format
-msgid "%s died.\n"
-msgstr ""
-
-#: p_inter.c:1699
-#, c-format
-msgid "%s suicided.\n"
-msgstr ""
-
-#: p_inter.c:1704
-#, c-format
-msgid "%s crushed %s with a heavy object!\n"
-msgstr ""
-
-#: p_inter.c:1713
-#, c-format
-msgid "%s was fried by %s%s's fire trail.\n"
-msgstr ""
-
-#: p_inter.c:1717 p_inter.c:1918
-#, c-format
-msgid "%s was %s by %s%s's %sbounce ring.\n"
-msgstr ""
-
-#: p_inter.c:1720 p_inter.c:1921
-#, c-format
-msgid "%s was %s by %s%s's %sautomatic ring.\n"
-msgstr ""
-
-#: p_inter.c:1723 p_inter.c:1924
-#, c-format
-msgid "%s was %s by %s%s's %sscatter ring.\n"
-msgstr ""
-
-#: p_inter.c:1726 p_inter.c:1927
-#, c-format
-msgid "%s was %s by %s%s's %sexplosion ring.\n"
-msgstr ""
-
-#: p_inter.c:1729 p_inter.c:1930
-#, c-format
-msgid "%s was %s by %s%s's %sgrenade ring.\n"
-msgstr ""
-
-#: p_inter.c:1732 p_inter.c:1933
-#, c-format
-msgid "%s was %s by %s%s's %sturbo ring.\n"
-msgstr ""
-
-#: p_inter.c:1735 p_inter.c:1936
-#, c-format
-msgid "%s was %s by %s%s's %smine ring.\n"
-msgstr ""
-
-#: p_inter.c:1738 p_inter.c:1939
-#, c-format
-msgid "%s was %s by %s%s's %sBFR blast.\n"
-msgstr ""
-
-#: p_inter.c:1742 p_inter.c:1943
-#, c-format
-msgid "%s was %s by %s%s's %sBFR laser.\n"
-msgstr ""
-
-#: p_inter.c:1744 p_inter.c:1945
-#, c-format
-msgid "%s was %s by %s%s's %srail ring.\n"
-msgstr ""
-
-#: p_inter.c:1748 p_inter.c:1949
-#, c-format
-msgid "%s was %s by %s%s's %sring.\n"
-msgstr ""
-
-#: p_inter.c:1752 p_inter.c:1894
-#, c-format
-msgid "%s was %s by %s%s.\n"
-msgstr ""
-
-#: p_inter.c:1759 p_inter.c:1840
-msgid "killed"
-msgstr ""
-
-#: p_inter.c:1760 p_inter.c:1766 p_inter.c:1960 p_inter.c:1966
-msgid "the late "
-msgstr ""
-
-#: p_inter.c:1762 p_inter.c:1962
-msgid "reflected "
-msgstr ""
-
-#: p_inter.c:1778
-#, c-format
-msgid "%s drowned.\n"
-msgstr ""
-
-#: p_inter.c:1780
-#, c-format
-msgid "%s was impaled by spikes!\n"
-msgstr ""
-
-#: p_inter.c:1782
-#, c-format
-msgid "%s was crushed.\n"
-msgstr ""
-
-#: p_inter.c:1827
-#, c-format
-msgid "%s fell in some nasty goop!\n"
-msgstr ""
-
-#: p_inter.c:1829
-#, c-format
-msgid "%s burned to death!\n"
-msgstr ""
-
-#: p_inter.c:1831
-#, c-format
-msgid "%s was electrocuted!\n"
-msgstr ""
-
-#: p_inter.c:1834
-#, c-format
-msgid "%s fell into a bottomless pit.\n"
-msgstr ""
-
-#: p_inter.c:1836
-#, c-format
-msgid "%s asphyxiated in space!\n"
-msgstr ""
-
-#: p_inter.c:1906
-#, c-format
-msgid "%s got nuked by %s%s!\n"
-msgstr ""
-
-#: p_inter.c:1914
-#, c-format
-msgid "%s was burnt by %s%s's fire trail.\n"
-msgstr ""
-
-#: p_inter.c:1959
-msgid "hit"
-msgstr ""
-
-#: p_inter.c:2050
-msgid "The IT player has left the game.\n"
-msgstr ""
-
-#: p_inter.c:2070 p_inter.c:2094
-msgid "All players have been tagged!\n"
-msgstr ""
-
-#: p_inter.c:2082
-msgid "There are no players able to become IT.\n"
-msgstr ""
-
-#: p_inter.c:2335 p_inter.c:2594
-#, c-format
-msgid "%s was found!\n"
-msgstr ""
-
-#: p_inter.c:4006
-#, c-format
-msgid "%s tossed the %s flag.\n"
-msgstr ""
-
-#: p_inter.c:4008
-#, c-format
-msgid "%s dropped the %s flag.\n"
-msgstr ""
-
-#: p_mobj.c:202 p_mobj.c:264
-msgid "Warning: State Cycle Detected\n"
-msgstr ""
-
-#: p_mobj.c:6044
-msgid "The red flag has returned to base.\n"
-msgstr ""
-
-#: p_mobj.c:6054
-msgid "The blue flag has returned to base.\n"
-msgstr ""
-
-#: p_setup.c:618 p_setup.c:620 p_setup.c:626
-msgid "You need to unlock this level first!\n"
-msgstr ""
-
-#: p_setup.c:624
-msgid "You need to unlock this level in single player first!\n"
-msgstr ""
-
-#: p_setup.c:897
-msgid "No more free memory for thing writing!\n"
-msgstr ""
-
-#: p_setup.c:922
-#, c-format
-msgid "newthings%d.lmp saved.\n"
-msgstr ""
-
-#: p_setup.c:2287
-msgid "No player currently available to become IT. Awaiting available players.\n"
-msgstr ""
-
-#: p_setup.c:2440
-#, c-format
-msgid "Loading SOC lump: %s\n"
-msgstr ""
-
-#: p_setup.c:2462
-#, c-format
-msgid "Errors occured while loading %s; not added.\n"
-msgstr ""
-
-#: p_setup.c:2510
-#, c-format
-msgid "%s sounds replaced\n"
-msgstr ""
-
-#: p_setup.c:2512
-#, c-format
-msgid "%s midi musics replaced\n"
-msgstr ""
-
-#: p_setup.c:2514
-#, c-format
-msgid "%s digital musics replaced\n"
-msgstr ""
-
-#: p_setup.c:2573
-msgid "No maps added\n"
-msgstr ""
-
-#: p_setup.c:2581
-#, c-format
-msgid "Current map %d replaced by added file, ending the level to ensure consistiency.\n"
-msgstr ""
-
-#: p_spec.c:1445
-#, c-format
-msgid ""
-"WARNING: Linedef executor trigger isn't handling sector triggers properly!\n"
-"specialtype = %d, if you are not a dev, report this warning instance\n"
-"along with the wad that caused it!\n"
-msgstr ""
-
-#: p_spec.c:3228
-#, c-format
-msgid "%s\\captured the blue flag.\\\\\\\\"
-msgstr ""
-
-#: p_spec.c:3263 p_spec.c:3342
-msgid "the enemy has returned\\their flag.\\\\\\\\"
-msgstr ""
-
-#: p_spec.c:3266 p_spec.c:3345
-msgid "your flag was returned\\to base.\\\\\\\\"
-msgstr ""
-
-#: p_spec.c:3310
-#, c-format
-msgid "%s\\captured the red flag.\\\\\\\\"
-msgstr ""
-
-#: p_spec.c:3548
-#, c-format
-msgid "%s has finished the race.\n"
-msgstr ""
-
-#: p_spec.c:3550
-#, c-format
-msgid "%s started lap %d\n"
-msgstr ""
-
-#: p_spec.c:4249
-#, c-format
-msgid "%s recieved double points for surviving the round.\n"
-msgstr ""
-
-#: p_spec.c:4408
-#, c-format
-msgid "A FOF tagged %d has a top height below its bottom.\n"
-msgstr ""
-
-#: p_tick.c:57
-msgid ""
-"numthinkers <#>: Count number of thinkers\n"
-"\t1: P_MobjThinker\n"
-"\t2: P_RainThinker\n"
-"\t3: P_SnowThinker\n"
-"\t4: P_NullPrecipThinker\n"
-"\t5: T_Friction\n"
-"\t6: T_Pusher\n"
-"\t7: P_RemoveThinkerDelayed\n"
-msgstr ""
-
-#: p_tick.c:69
-msgid "Number of P_MobjThinker: "
-msgstr ""
-
-#: p_tick.c:73
-msgid "Number of P_RainThinker: "
-msgstr ""
-
-#: p_tick.c:77
-msgid "Number of P_SnowThinker: "
-msgstr ""
-
-#: p_tick.c:81
-msgid "Number of P_NullPrecipThinker: "
-msgstr ""
-
-#: p_tick.c:85
-msgid "Number of T_Friction: "
-msgstr ""
-
-#: p_tick.c:89
-msgid "Number of T_Pusher: "
-msgstr ""
-
-#: p_tick.c:93
-msgid "Number of P_RemoveThinkerDelayed: "
-msgstr ""
-
-#: p_tick.c:96
-msgid "That is not a valid number.\n"
-msgstr ""
-
-#: p_tick.c:131
-#, c-format
-msgid "Object number %d out of range (max %d).\n"
-msgstr ""
-
-#: p_tick.c:146
-#, c-format
-msgid "There are %d objects of type %d currently in the level.\n"
-msgstr ""
-
-#: p_tick.c:151
-msgid "Count of active objects in level:\n"
-msgstr ""
-
-#: p_user.c:360
-#, c-format
-msgid "%s got a chain of %u!\n"
-msgstr ""
-
-#: p_user.c:1425
-#, c-format
-msgid "%s has completed the level.\n"
-msgstr ""
-
-#: p_user.c:4942 p_user.c:5081
-msgid "Sorry, you're too high to place this object (max: 4095 above bottom floor).\n"
-msgstr ""
-
-#: p_user.c:5076
-msgid "Sorry, you're too high to place this object (max: 2047 above bottom floor).\n"
-msgstr ""
-
-#: p_user.c:5128
-#, c-format
-msgid "Spawned at %d\n"
-msgstr ""
-
-#: p_user.c:5198 p_user.c:5215
-#, c-format
-msgid "Current mapthing is %d\n"
-msgstr ""
-
-#: p_user.c:5292 p_user.c:5302
-#, c-format
-msgid "Sorry, you're too %s to place this object (max: %d %s).\n"
-msgstr ""
-
-#: p_user.c:5292 p_user.c:5302
-msgid "high"
-msgstr ""
-
-#: p_user.c:5292 p_user.c:5302
-msgid "low"
-msgstr ""
-
-#: p_user.c:5293 p_user.c:5303
-msgid "above bottom floor"
-msgstr ""
-
-#: p_user.c:5293 p_user.c:5303
-msgid "below top ceiling"
-msgstr ""
-
-#: p_user.c:5350
-#, c-format
-msgid "Placed object mapthingum %d, not the one below.\n"
-msgstr ""
-
-#: p_user.c:5360
-#, c-format
-msgid "Placed object type %d at %d, %d, %d, %d\n"
-msgstr ""
-
-#: p_user.c:5406
-msgid "Deleting...\n"
-msgstr ""
-
-#: p_user.c:5420
-msgid "Deleted.\n"
-msgstr ""
-
-#: p_user.c:5441
-msgid "You cannot delete this item because it doesn't have a mapthing!\n"
-msgstr ""
-
-#: p_user.c:5638
-msgid "You must wait until next round to enter the game.\n"
-msgstr ""
-
-#: p_user.c:5644 p_user.c:5704
-msgid "Server does not allow team change.\n"
-msgstr ""
-
-#: p_user.c:8806
-#, c-format
-msgid "%s caused a world of pain.\n"
-msgstr ""
-
-#: p_user.c:9855
-#, c-format
-msgid "%s ran out of time.\n"
-msgstr ""
-
-#: r_data.c:491
-#, c-format
-msgid "Number of Extra Colormaps: %s\n"
-msgstr ""
-
-#: r_main.c:139
-msgid "Splitscreen not supported in netplay, sorry!\n"
-msgstr ""
-
-#: r_things.c:211
-#, c-format
-msgid "Bad sprite name: %s"
-msgstr ""
-
-#: r_things.c:428
-#, c-format
-msgid "sprite %s set in pwad %d\n"
-msgstr ""
-
-#: r_things.c:434
-#, c-format
-msgid "%s added %hd frames in %s sprites\n"
-msgstr ""
-
-#: r_things.c:480
-#, c-format
-msgid "%s sprites removed from file %s\n"
-msgstr ""
-
-#: r_things.c:2403
-#, c-format
-msgid "Skin %s not found\n"
-msgstr ""
-
-#: r_things.c:2501
-#, c-format
-msgid "Skin %d not found\n"
-msgstr ""
-
-#: r_things.c:2809
-#, c-format
-msgid "Added skin '%s'\n"
-msgstr ""
-
-#: r_things.c:2871
-#, c-format
-msgid "Removed skin '%s'\n"
-msgstr ""
-
-#: s_sound.c:349
-msgid "Loading sounds... "
-msgstr ""
-
-#: s_sound.c:355
-msgid " pre-cached all sound data\n"
-msgstr ""
-
-#: s_sound.c:1107
-#, c-format
-msgid "Music lump %.6s not found!\n"
-msgstr ""
-
-#: screen.c:169
-#, c-format
-msgid ""
-"Resolution is not aspect-correct!\n"
-"Use a multiple of %dx%d\n"
-msgstr ""
-
-#: screen.c:345
-#, c-format
-msgid "Using resolution: %d x %d\n"
-msgstr ""
-
-#: screen.c:351
-#, c-format
-msgid "Default resolution: %d x %d (%d bits)\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:99 sdl/i_cdmus.c:224 sdl/i_cdmus.c:436 win32/win_cd.c:401
-msgid "No CD in drive\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:105
-#, c-format
-msgid "CD Error: %s\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:132
-msgid "CD eject failed\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:153 win32/win_cd.c:199
-msgid ""
-"cd [on] [off] [remap] [reset] [select]\n"
-"   [open] [info] [play <track>] [resume]\n"
-"   [stop] [pause] [loop <track>]\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:186
-#, c-format
-msgid "Opened CD-ROM drive %s\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:188 sdl/i_cdmus.c:422 sdl/i_cdmus.c:424
-#, c-format
-msgid "Couldn't open CD-ROM drive %s: %s\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:238
-#, c-format
-msgid "%u tracks\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:240 win32/win_cd.c:297
-#, c-format
-msgid "Currently %s track %u\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:240 sdl/i_cdmus.c:242 win32/win_cd.c:297
-msgid "looping"
-msgstr ""
-
-#: sdl/i_cdmus.c:240 sdl/i_cdmus.c:242 win32/win_cd.c:297
-msgid "playing"
-msgstr ""
-
-#: sdl/i_cdmus.c:242
-#, c-format
-msgid "Paused %s track %u\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:243
-#, c-format
-msgid "Volume is %d\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:276 win32/win_cd.c:326
-#, c-format
-msgid "Invalid CD command \"CD %s\"\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:406
-msgid "I_InitCD: Init CD audio\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:411
-#, c-format
-msgid "Couldn't initialize SDL CDROM: %s\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:442 win32/win_cd.c:389
-msgid "CD audio Initialized\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:520
-#, c-format
-msgid "Bad track number %u.\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:527
-#, c-format
-msgid "Track %u is not audio\n"
-msgstr ""
-
-#: sdl/i_cdmus.c:540
-#, c-format
-msgid "Error playing track %d: %s\n"
-msgstr ""
-
-#: sdl/i_main.c:194 win32/win_main.c:598
-msgid "Setting up SRB2...\n"
-msgstr ""
-
-#: sdl/i_main.c:196 win32/win_main.c:600
-msgid "Entering main game loop...\n"
-msgstr ""
-
-#: sdl/i_sound.c:1184 win32/win_snd.c:923
-#, c-format
-msgid " requested frequency of %d hz\n"
-msgstr ""
-
-#: sdl/i_sound.c:1264
-msgid " Using 3D sound driver\n"
-msgstr ""
-
-#: sdl/i_sound.c:1267 sdl/i_sound.c:1272
-msgid " Failed loading 3D sound driver\n"
-msgstr ""
-
-#: sdl/i_sound.c:1278 sdl/i_sound.c:1645
-msgid " couldn't open audio with desired format\n"
-msgstr ""
-
-#: sdl/i_sound.c:1285
-#, c-format
-msgid " Starting up with audio driver : %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1289
-#, c-format
-msgid " configured audio device with %d samples/slice at %ikhz(%dms buffer)\n"
-msgstr ""
-
-#: sdl/i_sound.c:1291
-msgid " Sound module ready\n"
-msgstr ""
-
-#: sdl/i_sound.c:1377
-#, c-format
-msgid "Couldn't load music lump: %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1387
-#, c-format
-msgid "Couldn't load music data: %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1421
-#, c-format
-msgid "Couldn't open file %s to write music in\n"
-msgstr ""
-
-#: sdl/i_sound.c:1428
-#, c-format
-msgid "Couldn't write music into file %s because %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1441
-#, c-format
-msgid "Couldn't load music file %s: %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1455
-msgid "I_ShutdownMusic: "
-msgstr ""
-
-#: sdl/i_sound.c:1494
-msgid " disabled loading FMOD\n"
-msgstr ""
-
-#: sdl/i_sound.c:1513
-msgid " failed to load FMOD\n"
-msgstr ""
-
-#: sdl/i_sound.c:1522 win32/win_snd.c:1235
-#, c-format
-msgid ""
-"Wrong FMOD DLL version.\n"
-"You should be using FMOD %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1611
-msgid "I_InitMusic:"
-msgstr ""
-
-#: sdl/i_sound.c:1617
-msgid " Unable to load FLAC support\n"
-msgstr ""
-
-#: sdl/i_sound.c:1621
-msgid " Unable to load MOD support\n"
-msgstr ""
-
-#: sdl/i_sound.c:1625
-msgid " Unable to load MP3 support\n"
-msgstr ""
-
-#: sdl/i_sound.c:1629
-msgid " Unable to load OGG support\n"
-msgstr ""
-
-#: sdl/i_sound.c:1635
-#, c-format
-msgid " Unable to open music: %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1651
-#, c-format
-msgid " Starting with audio driver : %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1657
-#, c-format
-msgid " Starting up with audio driver : %s with SDL_Mixer\n"
-msgstr ""
-
-#: sdl/i_sound.c:1671
-msgid "Music initialized\n"
-msgstr ""
-
-#: sdl/i_sound.c:1690
-#, c-format
-msgid "Couldn't play song because %s\n"
-msgstr ""
-
-#: sdl/i_sound.c:1816
-#, c-format
-msgid "Couldn't load MIDI: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1127 sdl/i_system.c:1421
-#, c-format
-msgid "Couldn't initialize joystick: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1137 sdl/i_system.c:1429
-#, c-format
-msgid "Cannot use joystick #%d/(%s), it doesn't exist\n"
-msgstr ""
-
-#: sdl/i_system.c:1158 sdl/i_system.c:1450
-#, c-format
-msgid "Found %d joysticks on this system\n"
-msgstr ""
-
-#: sdl/i_system.c:1163 sdl/i_system.c:1455
-msgid "Found no joysticks on this system\n"
-msgstr ""
-
-#: sdl/i_system.c:1168
-#, c-format
-msgid "Joystick: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1172
-#, c-format
-msgid "Couldn't open joystick: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1460
-#, c-format
-msgid "Joystick2: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1464
-#, c-format
-msgid "Couldn't open joystick2: %s\n"
-msgstr ""
-
-#: sdl/i_system.c:1789 win32/win_sys.c:979
-msgid "Read Error on secondary mouse port\n"
-msgstr ""
-
-#: sdl/i_system.c:1885 win32/win_sys.c:1040
-#, c-format
-msgid "Error opening %s!\n"
-msgstr ""
-
-#: sdl/i_system.c:1953
-#, c-format
-msgid "Can't open %s: Access denied\n"
-msgstr ""
-
-#: sdl/i_system.c:1955 win32/win_sys.c:1042
-#, c-format
-msgid "Can't open %s: error %d\n"
-msgstr ""
-
-#: sdl/i_system.c:2131 win32/win_sys.c:460
-msgid "Using GetTickCount()\n"
-msgstr ""
-
-#: sdl/i_video.c:556 win32/win_vid.c:1082
-#, c-format
-msgid "%d video mode(s) available(s)\n"
-msgstr ""
-
-#: sdl/i_video.c:568
-msgid "Unknown Surface"
-msgstr ""
-
-#: sdl/i_video.c:573
-#, c-format
-msgid " %ix%i at %i bit color\n"
-msgstr ""
-
-#: sdl/i_video.c:576
-msgid " Stored in video memory\n"
-msgstr ""
-
-#: sdl/i_video.c:578
-msgid " Stored in an OpenGL context\n"
-msgstr ""
-
-#: sdl/i_video.c:580
-msgid " Uses preallocated memory\n"
-msgstr ""
-
-#: sdl/i_video.c:582
-msgid " Stored in system memory\n"
-msgstr ""
-
-#: sdl/i_video.c:585
-msgid " Uses asynchronous blits if possible\n"
-msgstr ""
-
-#: sdl/i_video.c:587
-msgid " Uses synchronous blits if possible\n"
-msgstr ""
-
-#: sdl/i_video.c:590
-msgid " Allows any pixel-format\n"
-msgstr ""
-
-#: sdl/i_video.c:593
-msgid " Has exclusive palette access\n"
-msgstr ""
-
-#: sdl/i_video.c:595
-msgid " Has nonexclusive palette access\n"
-msgstr ""
-
-#: sdl/i_video.c:598
-msgid " Double buffered\n"
-msgstr ""
-
-#: sdl/i_video.c:600
-msgid " No hardware flipping\n"
-msgstr ""
-
-#: sdl/i_video.c:603
-msgid " Full screen\n"
-msgstr ""
-
-#: sdl/i_video.c:605
-msgid " Resizable window\n"
-msgstr ""
-
-#: sdl/i_video.c:607
-msgid " Nonresizable window\n"
-msgstr ""
-
-#: sdl/i_video.c:610
-msgid " Uses hardware acceleration blit\n"
-msgstr ""
-
-#: sdl/i_video.c:612
-msgid " Use colorkey blitting\n"
-msgstr ""
-
-#: sdl/i_video.c:614
-msgid " Colorkey RLE acceleration blit\n"
-msgstr ""
-
-#: sdl/i_video.c:616
-msgid " Use alpha blending acceleration blit\n"
-msgstr ""
-
-#: sdl/i_video.c:626
-msgid "Video Interface Capabilities:\n"
-msgstr ""
-
-#: sdl/i_video.c:628
-msgid " Hardware surfaces\n"
-msgstr ""
-
-#: sdl/i_video.c:630
-msgid " Window manager\n"
-msgstr ""
-
-#: sdl/i_video.c:634
-msgid " Accelerated blits HW-2-HW\n"
-msgstr ""
-
-#: sdl/i_video.c:636
-msgid " Accelerated blits HW-2-HW with Colorkey\n"
-msgstr ""
-
-#: sdl/i_video.c:638
-msgid " Accelerated blits HW-2-HW with Alpha\n"
-msgstr ""
-
-#: sdl/i_video.c:641
-msgid " Accelerated blits SW-2-HW\n"
-msgstr ""
-
-#: sdl/i_video.c:645
-msgid " Accelerated blits SW-2-HW with Colorkey\n"
-msgstr ""
-
-#: sdl/i_video.c:647
-msgid " Accelerated blits SW-2-HW with Alpha\n"
-msgstr ""
-
-#: sdl/i_video.c:649
-msgid " Accelerated Color filling\n"
-msgstr ""
-
-#: sdl/i_video.c:652
-#, c-format
-msgid " There is %i KB of video memory\n"
-msgstr ""
-
-#: sdl/i_video.c:654
-msgid " There no video memory for SDL\n"
-msgstr ""
-
-#: sdl/i_video.c:657
-msgid "Current Engine Mode"
-msgstr ""
-
-#: sdl/i_video.c:659
-msgid "Prebuffer Mode"
-msgstr ""
-
-#: sdl/i_video.c:660
-msgid "Postbuffer Mode"
-msgstr ""
-
-#: sdl/i_video.c:662
-msgid "Current Video Mode"
-msgstr ""
-
-#: sdl/i_video.c:678 win32/win_vid.c:1147
-msgid "No video modes present\n"
-msgstr ""
-
-#: sdl/i_video.c:689
-#, c-format
-msgid "Found %d FullScreen Video Modes:\n"
-msgstr ""
-
-#: sdl/i_video.c:696
-#, c-format
-msgid "%dx%d and "
-msgstr ""
-
-#: sdl/i_video.c:700
-msgid "None\n"
-msgstr ""
-
-#: sdl/i_video.c:710 win32/win_vid.c:1140
-#, c-format
-msgid "vid_mode <modenum> : set video mode, current video mode %i\n"
-msgstr ""
-
-#: sdl/i_video.c:717 win32/win_vid.c:1099
-msgid "No such video mode\n"
-msgstr ""
-
-#: sdl/i_video.c:1961
-#, c-format
-msgid "Couldn't initialize SDL's Audio System with Video System: %s\n"
-msgstr ""
-
-#: sdl/i_video.c:1965
-#, c-format
-msgid "Couldn't initialize SDL's Video System: %s\n"
-msgstr ""
-
-#: sdl/i_video.c:1977
-#, c-format
-msgid "Starting up with video driver : %s\n"
-msgstr ""
-
-#: sdl/i_video.c:2046
-msgid ""
-"The version of the renderer doesn't match the version of the executable\n"
-"Be sure you have installed SRB2 properly.\n"
-msgstr ""
-
-#: sdl/i_video.c:2089
-#, c-format
-msgid "Could not set vidmode: %s\n"
-msgstr ""
-
-#: sdl/i_video.c:2098
-msgid "Not enough memory for video buffer\n"
-msgstr ""
-
-#: sounds.c:1470
-msgid "No more free sound slots\n"
-msgstr ""
-
-#: st_stuff.c:1604
-msgid "WAITING FOR PLAYERS TO HIDE..."
-msgstr ""
-
-#: st_stuff.c:1610
-msgid "HIDE BEFORE TIME RUNS OUT!"
-msgstr ""
-
-#: st_stuff.c:1612
-msgid "FLEE BEFORE YOU ARE HUNTED!"
-msgstr ""
-
-#: st_stuff.c:1615
-msgid "HIDE TIME REMAINING:"
-msgstr ""
-
-#: st_stuff.c:1624
-msgid "YOU'RE IT!"
-msgstr ""
-
-#: st_stuff.c:1628
-msgid "TIME REMAINING:"
-msgstr ""
-
-#: st_stuff.c:1630
-msgid "NO TIME LIMIT"
-msgstr ""
-
-#: st_stuff.c:1738
-msgid "TIME LEFT"
-msgstr ""
-
-#: st_stuff.c:1772
-msgid "CONTINUE?"
-msgstr ""
-
-#: st_stuff.c:1966 st_stuff.c:1968
-msgid "OVERTIME!"
-msgstr ""
-
-#: st_stuff.c:2015
-msgid "Viewpoint:"
-msgstr ""
-
-#: st_stuff.c:2033
-msgid "I, Pope Rededict XVI proclaim"
-msgstr ""
-
-#: st_stuff.c:2034
-msgid "AJ & Amy"
-msgstr ""
-
-#: st_stuff.c:2035
-msgid "Husband & Wife"
-msgstr ""
-
-#: st_stuff.c:2036
-msgid "on this day"
-msgstr ""
-
-#: st_stuff.c:2037
-msgid "May 16, 2009"
-msgstr ""
-
-#: st_stuff.c:2043
-msgid "Oh... it's you again..."
-msgstr ""
-
-#: st_stuff.c:2044
-msgid "Look, I wanted to apologize for the way"
-msgstr ""
-
-#: st_stuff.c:2045
-msgid "I've acted in the past."
-msgstr ""
-
-#: st_stuff.c:2046
-msgid "I've seen the error of my ways"
-msgstr ""
-
-#: st_stuff.c:2047
-msgid "and turned over a new leaf."
-msgstr ""
-
-#: st_stuff.c:2048
-msgid "Instead of sending people to hell,"
-msgstr ""
-
-#: st_stuff.c:2049
-msgid "I now send them to heaven!"
-msgstr ""
-
-#: st_stuff.c:2081
-msgid "Thank you!"
-msgstr ""
-
-#: st_stuff.c:2082
-msgid "But our earless leader is in"
-msgstr ""
-
-#: st_stuff.c:2083
-msgid "another castle!"
-msgstr ""
-
-#: st_stuff.c:2092 st_stuff.c:2098 st_stuff.c:2120
-msgid "Press Viewpoint Key to watch a player."
-msgstr ""
-
-#: st_stuff.c:2097
-msgid "You cannot move while hiding."
-msgstr ""
-
-#: st_stuff.c:2108
-#, c-format
-msgid "Respawn in: %d seconds."
-msgstr ""
-
-#: st_stuff.c:2110
-msgid "Press Jump to respawn."
-msgstr ""
-
-#: st_stuff.c:2115
-msgid "You are a spectator."
-msgstr ""
-
-#: st_stuff.c:2117
-msgid "Press Fire to be assigned to a team."
-msgstr ""
-
-#: st_stuff.c:2119
-msgid "Press Fire to enter the game."
-msgstr ""
-
-#: st_stuff.c:2121
-msgid "Press Jump to float and Spin to sink."
-msgstr ""
-
-#: w_wad.c:147
-#, c-format
-msgid "Loading main config from %s\n"
-msgstr ""
-
-#: w_wad.c:157
-#, c-format
-msgid "Loading object config from %s\n"
-msgstr ""
-
-#: w_wad.c:236 w_wad.c:281
-msgid "Maximum wad files reached\n"
-msgstr ""
-
-#: w_wad.c:257
-#, c-format
-msgid "Can't open %s\n"
-msgstr ""
-
-#: w_wad.c:312
-#, c-format
-msgid "Can't read wad header from %s because %s\n"
-msgstr ""
-
-#: w_wad.c:322
-#, c-format
-msgid "%s does not have a valid WAD header\n"
-msgstr ""
-
-#: w_wad.c:335
-#, c-format
-msgid "Wadfile directory in %s is corrupted (%s)\n"
-msgstr ""
-
-#: w_wad.c:391
-#, c-format
-msgid "%s is already loaded\n"
-msgstr ""
-
-#: w_wad.c:423
-#, c-format
-msgid "Added file %s (%u lumps)\n"
-msgstr ""
-
-#: w_wad.c:441
-#, c-format
-msgid "You can't remove the IWAD %s!\n"
-msgstr ""
-
-#: w_wad.c:445
-#, c-format
-msgid "Removing WAD %s...\n"
-msgstr ""
-
-#: w_wad.c:465
-msgid " done unloading WAD\n"
-msgstr ""
-
-#: w_wad.c:1014
-#, c-format
-msgid "File is corrupt or has been modified: %s (found md5: %s, wanted: %s)\n"
-msgstr ""
-
-#: win32/win_cd.c:229
-msgid "CD tracks remapped in that order :\n"
-msgstr ""
-
-#: win32/win_cd.c:256
-msgid "CD is not ready.\n"
-msgstr ""
-
-#: win32/win_cd.c:281
-msgid "No audio tracks\n"
-msgstr ""
-
-#: win32/win_cd.c:290
-msgid "audio"
-msgstr ""
-
-#: win32/win_cd.c:290
-msgid "data "
-msgstr ""
-
-#: win32/win_cd.c:293
-#, c-format
-msgid "Total time : %s\n"
-msgstr ""
-
-#: win32/win_main.c:335
-msgid "Hello, it's me, SRB2's Console Window\n"
-msgstr ""
-
-#: win32/win_main.c:339
-msgid "We have a console already.\n"
-msgstr ""
-
-#: win32/win_snd.c:985
-#, c-format
-msgid "Using external sound driver %s\n"
-msgstr ""
-
-#: win32/win_snd.c:990
-#, c-format
-msgid "Not using external sound driver %s\n"
-msgstr ""
-
-#: win32/win_snd.c:1001
-msgid " DirectSound DLL not loaded\n"
-msgstr ""
-
-#: win32/win_snd.c:1009
-msgid ""
-" DirectSoundCreate FAILED\n"
-" there is no sound device or the sound device is under\n"
-" the control of another application\n"
-msgstr ""
-
-#: win32/win_snd.c:1021
-msgid " SetCooperativeLevel FAILED\n"
-msgstr ""
-
-#: win32/win_snd.c:1047
-#, c-format
-msgid "CreateSoundBuffer FAILED: %s (ErrNo %ld)\n"
-msgstr ""
-
-#: win32/win_snd.c:1062
-msgid "Couldn't set primary buffer format.\n"
-msgstr ""
-
-#: win32/win_snd.c:1069
-msgid " Compacting onboard sound-memory..."
-msgstr ""
-
-#: win32/win_snd.c:1081
-msgid " Primary buffer continuous play FAILED\n"
-msgstr ""
-
-#: win32/win_snd.c:1118
-msgid "sound initialized.\n"
-msgstr ""
-
-#: win32/win_snd.c:1191
-#, c-format
-msgid "%d mixer devices available\n"
-msgstr ""
-
-#: win32/win_snd.c:1225
-msgid ""
-" failed to load FMOD\n"
-" no DigiMusic support\n"
-msgstr ""
-
-#: win32/win_snd.c:1287
-msgid "No MIDI devices available, music is disabled\n"
-msgstr ""
-
-#: win32/win_snd.c:1351
-msgid "No MIDI music\n"
-msgstr ""
-
-#: win32/win_snd.c:1363
-msgid "midiStreamOpen FAILED\n"
-msgstr ""
-
-#: win32/win_snd.c:1542
-msgid "Couldn't set volume\n"
-msgstr ""
-
-#: win32/win_snd.c:2114
-msgid "Music lump is not MID music format\n"
-msgstr ""
-
-#: win32/win_snd.c:2126
-msgid "I_RegisterSong: StreamBufferSetup FAILED"
-msgstr ""
-
-#: win32/win_sys.c:894
-msgid "Could not create IDirectInput device 2"
-msgstr ""
-
-#: win32/win_sys.c:1187
-msgid "\tMouse will not use DirectInput.\n"
-msgstr ""
-
-#: win32/win_sys.c:1724 win32/win_sys.c:2083
-#, c-format
-msgid "Capabilities: %lu axes, %lu buttons, %lu POVs, poll %u, Gamepad %d\n"
-msgstr ""
-
-#: win32/win_sys.c:1956
-msgid "Joystick disabled\n"
-msgstr ""
-
-#: win32/win_sys.c:1970 win32/win_sys.c:2332
-msgid "Looking for joystick devices:\n"
-msgstr ""
-
-#: win32/win_sys.c:1977 win32/win_sys.c:2340
-msgid "Joystick initialize failed.\n"
-msgstr ""
-
-#: win32/win_sys.c:1985 win32/win_sys.c:2348
-msgid "none found\n"
-msgstr ""
-
-#: win32/win_sys.c:1988 win32/win_sys.c:2351
-msgid "none used\n"
-msgstr ""
-
-#: win32/win_sys.c:1991
-msgid "Set the use_joystick variable to one of the enumerated joystick numbers\n"
-msgstr ""
-
-#: win32/win_sys.c:2004
-msgid "I_InitJoystick: SetCooperativeLevel FAILED"
-msgstr ""
-
-#: win32/win_sys.c:2008 win32/win_sys.c:2375
-msgid "Joystick already initialized\n"
-msgstr ""
-
-#: win32/win_sys.c:2318
-msgid "Joystick2 disabled\n"
-msgstr ""
-
-#: win32/win_sys.c:2355
-msgid "Set the use_joystick2 variable to one of the enumerated joysticks number\n"
-msgstr ""
-
-#: win32/win_sys.c:2366
-msgid "I_InitJoystick2: SetCooperativeLevel FAILED"
-msgstr ""
-
-#: win32/win_sys.c:3468
-#, c-format
-msgid "Couldn't create DirectInput (reason: %s)"
-msgstr ""
-
-#: win32/win_sys.c:3471
-msgid "Using DirectX3 interface\n"
-msgstr ""
-
-#: win32/win_vid.c:621
-msgid "mode skipped (too many)\n"
-msgstr ""
-
-#: win32/win_vid.c:769
-msgid "This r_opengl version is not supported, use it at your own risk!\n"
-msgstr ""
-
-#: win32/win_vid.c:979
-#, c-format
-msgid "Mode changed to %d (%s)\n"
-msgstr ""
-
-#: win32/win_vid.c:1106
-#, c-format
-msgid ""
-"width: %d\n"
-"height: %d\n"
-msgstr ""
-
-#: win32/win_vid.c:1108
-#, c-format
-msgid ""
-"bytes per scanline: %d\n"
-"bytes per pixel: %d\n"
-"numpages: %d\n"
-msgstr ""
-
-#: y_inter.c:249
-msgid "GOT TIME BONUS EMBLEM!"
-msgstr ""
-
-#: y_inter.c:251
-msgid "GOT PERFECT BONUS EMBLEM!"
-msgstr ""
-
-#: y_inter.c:579
-msgid "Teams will be scrambled next round!"
-msgstr ""
-
-#: y_inter.c:925
-msgid "NEW MAP BEST!"
-msgstr ""
-
-#: y_inter.c:925
-msgid "Saved"
-msgstr ""
-
-#: y_inter.c:936
-msgid "NEW RECORD!"
-msgstr ""
-
-#: y_inter.c:936 y_inter.c:941
-msgid "Saved replay as"
-msgstr ""
-
-#: z_zone.c:148
-#, c-format
-msgid "system memory %uMB free %uMB\n"
-msgstr ""
-
-#: z_zone.c:614
-msgid "Memory Info\n"
-msgstr ""
-
-#: z_zone.c:615
-#, c-format
-msgid "Total heap used   : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:616
-#, c-format
-msgid "Static            : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:617
-#, c-format
-msgid "Static (sound)    : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:618
-#, c-format
-msgid "Static (music)    : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:619
-#, c-format
-msgid "Locked cache      : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:620
-#, c-format
-msgid "Level             : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:621
-#, c-format
-msgid "Special thinker   : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:622
-#, c-format
-msgid "All purgable      : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:628
-#, c-format
-msgid "Patch info headers: %7s KB\n"
-msgstr ""
-
-#: z_zone.c:629
-#, c-format
-msgid "Mipmap patches    : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:630
-#, c-format
-msgid "HW Texture cache  : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:631
-#, c-format
-msgid "Plane polygons    : %7s KB\n"
-msgstr ""
-
-#: z_zone.c:632
-#, c-format
-msgid "HW Texture used   : %7d KB\n"
-msgstr ""
-
-#: z_zone.c:636
-msgid "System Memory Info\n"
-msgstr ""
-
-#: z_zone.c:638
-#, c-format
-msgid "    Total physical memory: %7u KB\n"
-msgstr ""
-
-#: z_zone.c:639
-#, c-format
-msgid "Available physical memory: %7u KB\n"
-msgstr ""
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index b5a2ea87c..1fec173ad 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -16,14 +16,18 @@
 #include "p_slopes.h" // P_GetZAt
 #include "z_zone.h"
 #include "r_main.h"
+#include "r_skins.h"
 #include "r_things.h"
 #include "m_random.h"
 #include "s_sound.h"
 #include "g_game.h"
+#include "g_input.h"
 #include "hu_stuff.h"	// HU_AddChatText
 #include "console.h"
 #include "k_kart.h" // SRB2Kart
+#include "k_hud.h" // SRB2Kart
 #include "d_netcmd.h" // IsPlayerAdmin
+#include "d_main.h"
 
 #include "lua_script.h"
 #include "lua_libs.h"
@@ -256,6 +260,7 @@ static int lib_pAproxDistance(lua_State *L)
 	fixed_t dy = luaL_checkfixed(L, 2);
 	//HUDSAFE
 	//LUA_Deprecated(L, "P_AproxDistance", "FixedHypot");
+	LUA_LogDeprecated(L, "P_AproxDistance", "FixedHypot");
 	lua_pushfixed(L, FixedHypot(dx, dy));
 	return 1;
 }
@@ -1056,6 +1061,7 @@ static int lib_pTeleportMove(lua_State *L)
 	if (!thing)
 		return LUA_ErrInvalid(L, "mobj_t");
 	//LUA_Deprecated(L, "P_TeleportMove", "P_SetOrigin\" or \"P_MoveOrigin");
+	LUA_LogDeprecated(L, "P_TeleportMove", "P_SetOrigin\" or \"P_MoveOrigin");
 	lua_pushboolean(L, P_MoveOrigin(thing, x, y, z));
 	LUA_PushUserdata(L, tmthing, META_MOBJ);
 	P_SetTarget(&tmthing, ptmthing);
@@ -1126,6 +1132,18 @@ static int lib_pCheckSight(lua_State *L)
 	return 1;
 }
 
+// DONT USE THIS FOR ANYTHING GAMEPLAY, THIS WILL DESYNCH!
+static int lib_pCheckSightFast(lua_State *L)
+{
+	mobj_t *t1 = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+	mobj_t *t2 = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
+	//HUDSAFE?
+	if (!t1 || !t2)
+		return LUA_ErrInvalid(L, "mobj_t");
+	lua_pushboolean(L, P_CheckSightFast(t1, t2));
+	return 1;
+}
+
 static int lib_pCheckHoopPosition(lua_State *L)
 {
 	mobj_t *hoopthing = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
@@ -1276,6 +1294,7 @@ static int lib_pPlayRinglossSound(lua_State *L)
 {
 	mobj_t *source = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
 	player_t *player = NULL;
+	mobj_t *damager = NULL;
 	NOHUD
 	if (!source)
 		return LUA_ErrInvalid(L, "mobj_t");
@@ -1285,8 +1304,15 @@ static int lib_pPlayRinglossSound(lua_State *L)
 		if (!player)
 			return LUA_ErrInvalid(L, "player_t");
 	}
+	if (!lua_isnoneornil(L, 3))
+	{
+		damager = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+
+		if (!damager)
+			return LUA_ErrInvalid(L, "mobj_t");
+	}
 	if (!player || P_IsLocalPlayer(player))
-		P_PlayRinglossSound(source);
+		P_PlayRinglossSound(source, damager);
 	return 0;
 }
 
@@ -1390,11 +1416,9 @@ static int lib_pSetMobjStateNF(lua_State *L)
 static int lib_pDoSuperTransformation(lua_State *L)
 {
 	player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
-	boolean giverings = lua_optboolean(L, 2);
 	NOHUD
 	if (!player)
 		return LUA_ErrInvalid(L, "player_t");
-	P_DoSuperTransformation(player, giverings);
 	return 0;
 }
 
@@ -1562,8 +1586,9 @@ static int lib_pSetSkyboxMobj(lua_State *L)
 // Shhh, neither does P_StartQuake.
 static int lib_pStartQuake(lua_State *L)
 {
+	tic_t	q_time 		= (tic_t)luaL_checkinteger(L, 2);
 	fixed_t q_intensity = luaL_checkinteger(L, 1);
-	UINT16  q_time = (UINT16)luaL_checkinteger(L, 2);
+	fixed_t q_radius 	= luaL_optinteger(L, 4, 512<<FRACBITS);
 	static mappoint_t q_epicenter = {0,0,0};
 
 	NOHUD
@@ -1615,11 +1640,8 @@ static int lib_pStartQuake(lua_State *L)
 	}
 	else
 		quake.epicenter = NULL;
-	quake.radius = luaL_optinteger(L, 4, 512*FRACUNIT);
 
-	// These things are actually used in 2.1.
-	quake.intensity = q_intensity;
-	quake.time = q_time;
+	P_StartQuake(q_time, q_intensity, q_radius);
 	return 0;
 }
 
@@ -1648,7 +1670,7 @@ static int lib_pGetZAt(lua_State *L)
 	if (!slope)
 		return LUA_ErrInvalid(L, "pslope_t");
 
-	lua_pushfixed(L, P_GetZAt(slope, x, y));
+	lua_pushfixed(L, P_GetSlopeZAt(slope, x, y));
 	return 1;
 }
 
@@ -1828,7 +1850,7 @@ static int lib_sStartSoundAtVolume(lua_State *L)
 			return LUA_ErrInvalid(L, "player_t");
 	}
 	if (!player || P_IsLocalPlayer(player))
-	S_StartSoundAtVolume(origin, sound_id, volume);
+		S_StartSoundAtVolume(origin, sound_id, volume);
 	return 0;
 }
 
@@ -1930,7 +1952,7 @@ static int lib_sChangeMusic(lua_State *L)
 		music_flags = (UINT16)((music_num & 0x7FFF0000) >> 16);
 	else
 #endif
-	music_flags = (UINT16)luaL_optinteger(L, 4, 0);
+		music_flags = (UINT16)luaL_optinteger(L, 4, 0);
 
 	position = (UINT32)luaL_optinteger(L, 5, 0);
 	prefadems = (UINT32)luaL_optinteger(L, 6, 0);
@@ -2448,16 +2470,15 @@ static int lib_gExitLevel(lua_State *L)
 
 static int lib_gIsSpecialStage(lua_State *L)
 {
-	INT32 mapnum = luaL_optinteger(L, 1, gamemap);
 	//HUDSAFE
-	lua_pushboolean(L, G_IsSpecialStage(mapnum));
+	lua_pushboolean(L, false);
 	return 1;
 }
 
 static int lib_gGametypeUsesLives(lua_State *L)
 {
 	//HUDSAFE
-	lua_pushboolean(L, G_GametypeUsesLives());
+	lua_pushboolean(L, false);
 	return 1;
 }
 
@@ -2574,10 +2595,22 @@ static int lib_kOvertakeSound(lua_State *L)
 static int lib_kHitEmSound(lua_State *L)
 {
 	mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+	mobj_t *victim = NULL;
+
+	if (!lua_isnoneornil(L, 2))
+	{
+		victim = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
+		if (!victim)
+			return LUA_ErrInvalid(L, "mobj_t");
+	}
+
 	NOHUD
 	if (!mobj->player)
 		return luaL_error(L, "K_PlayHitEmSound: mobj_t isn't a player object.");	//Nothing bad would happen if we let it run the func, but telling why it ain't doing anything is helpful.
-	K_PlayHitEmSound(mobj);
+	if (victim && !victim->player)
+		return luaL_error(L, "K_PlayHitEmSound: mobj_t isn't a player object.");	//Same as above
+
+	K_PlayHitEmSound(mobj, victim);
 	return 0;
 }
 
@@ -3018,6 +3051,58 @@ static int lib_kSetHyuCountdown(lua_State *L)
 	return 0;
 }
 
+// G_INPUT
+////////////
+
+static int lib_gSetPlayerGamepadIndicatorColor(lua_State *L)
+{
+	INT32 player = -1;
+	player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
+	UINT16 color = (UINT16)luaL_checkinteger(L, 2); // skincolor
+
+	for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
+	{
+		if (plr - players == displayplayers[i])
+		{
+			player = i;
+			break;
+		}
+	}
+
+	// Not a local player
+	if (player == -1) return 0;
+
+	// pls update with color 0 when youre done with changing led stuff so it can get player color again
+	G_SetPlayerGamepadIndicatorColor(player, color);
+
+	return 0;
+}
+
+static int lib_gPlayerDeviceRumble(lua_State *L)
+{
+	INT32 player = -1;
+	player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));    // retrieve player
+	UINT16 low_strength = (UINT16)luaL_checkinteger(L, 2); // low frequency rumble motor strenght
+	UINT16 high_strength = (UINT16)luaL_checkinteger(L, 3); // high frequency rumble motor strenght
+	UINT32 duration = (UINT32)luaL_optinteger(L, 4, 84); // duration of rumble in ms
+
+	for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
+	{
+		if (plr - players == displayplayers[i])
+		{
+			player = i;
+			break;
+		}
+	}
+
+	// Not a local player
+	if (player == -1) return 0;
+
+	G_PlayerDeviceRumble(player, low_strength, high_strength, duration);
+
+	return 0;
+}
+
 static luaL_Reg lib[] = {
 	{"print", lib_print},
 	{"chatprint", lib_chatprint},
@@ -3103,7 +3188,6 @@ static luaL_Reg lib[] = {
 	{"P_LookForEnemies",lib_pLookForEnemies},
 	{"P_NukeEnemies",lib_pNukeEnemies},
 	{"P_HomingAttack",lib_pHomingAttack},
-	//{"P_SuperReady",lib_pSuperReady},
 	{"P_Telekinesis",lib_pTelekinesis},
 
 	// p_map
@@ -3116,6 +3200,7 @@ static luaL_Reg lib[] = {
 	{"P_SlideMove",lib_pSlideMove},
 	{"P_BounceMove",lib_pBounceMove},
 	{"P_CheckSight", lib_pCheckSight},
+	{"P_CheckSightFast", lib_pCheckSightFast},
 	{"P_CheckHoopPosition",lib_pCheckHoopPosition},
 	{"P_RadiusAttack",lib_pRadiusAttack},
 	{"P_FloorzAtPos",lib_pFloorzAtPos},
@@ -3267,6 +3352,10 @@ static luaL_Reg lib[] = {
 	{"K_SetIndirectItemCooldown",lib_kSetIndirectItemCountdown},
 	{"K_SetHyudoroCooldown",lib_kSetHyuCountdown},
 
+	//g_input
+	{"G_SetPlayerGamepadIndicatorColor",lib_gSetPlayerGamepadIndicatorColor},
+	{"G_PlayerDeviceRumble",lib_gPlayerDeviceRumble},
+
 	{NULL, NULL}
 };
 
@@ -3286,4 +3375,4 @@ int LUA_BaseLib(lua_State *L)
 	lua_pushvalue(L, LUA_GLOBALSINDEX);
 	luaL_register(L, NULL, lib);
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index 3e70ce008..e1e246d28 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -81,6 +81,9 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
 		lua_pushstring(gL, buf);
 	}
 	LUA_Call(gL, (int)argc, 0, 1); // argc is 1-based, so this will cover the player we passed too.
+
+	lua_pop(gL, 1); // Pop LUA_GetErrorMessage (lua_pcall doesn't pop it)
+
 	return;
 
 deny:
@@ -91,11 +94,7 @@ deny:
 	CONS_Alert(CONS_WARNING, M_GetText("Illegal lua command received from %s\n"), player_names[playernum]);
 	if (server)
 	{
-		UINT8 bufn[2];
-
-		bufn[0] = (UINT8)playernum;
-		bufn[1] = KICK_MSG_CON_FAIL;
-		SendNetXCmd(XD_KICK, &bufn, 2);
+		SendKick(playernum, KICK_MSG_CON_FAIL);
 	}
 }
 
@@ -143,7 +142,7 @@ void COM_Lua_f(void)
 	if (netgame && !( flags & COM_LOCAL ))/* don't send local commands */
 	{ // Send the command through the network
 		UINT8 argc;
-		lua_pop(gL, 1); // pop command info table
+		lua_pop(gL, 2); // pop command info table and LUA_GetErrorMessage
 
 		if (flags & COM_ADMIN && !server && !IsPlayerAdmin(playernum)) // flag 1: only server/admin can use this command.
 		{
@@ -166,7 +165,7 @@ void COM_Lua_f(void)
 		for (i = 0; i < argc; i++)
 			WRITESTRINGN(p, COM_Argv(i), 255);
 		if (flags & 2)
-			SendNetXCmd2(XD_LUACMD, buf, p-buf);
+			SendNetXCmdForPlayer(1, XD_LUACMD, buf, p-buf);
 		else
 			SendNetXCmd(XD_LUACMD, buf, p-buf);
 		free(buf);
@@ -182,6 +181,8 @@ void COM_Lua_f(void)
 	for (i = 1; i < COM_Argc(); i++)
 		lua_pushstring(gL, COM_Argv(i));
 	LUA_Call(gL, (int)COM_Argc(), 0, 1); // COM_Argc is 1-based, so this will cover the player we passed too.
+
+	lua_pop(gL, 1); // Pop LUA_GetErrorMessage (lua_pcall doesn't pop it)
 }
 
 // Wrapper for COM_AddCommand
@@ -453,13 +454,10 @@ static int lib_cvRegisterVar(lua_State *L)
 
 	if (!(((cvar->flags & CV_HIDEN)) || (cvar->flags & CV_NOSHOWHELP)) && (cvar->PossibleValue || !(cvar->value == 0 && stricmp(cvar->string, "0"))))
 	{
-		char *temp = NULL;
-
 		if (!category)
 		{
-			temp = strdup(wadfiles[numwadfiles - 1]->filename);
-			nameonly(temp);
-
+			char *temp = wadfiles[numwadfiles - 1]->filename;
+			temp += strlen(temp) - nameonlylength(temp);
 			category = temp;
 		}
 
@@ -467,8 +465,6 @@ static int lib_cvRegisterVar(lua_State *L)
 			M_SlotCvarIntoModMenu(cvar, category, menu_name);
 		else
 			M_SlotCvarIntoModMenu(cvar, category, cvar->name);
-
-		free (temp);
 	}
 
 	// return cvar userdata
@@ -633,7 +629,7 @@ static int cvar_get(lua_State *L)
 		break;
 	default:
 		if (devparm)
-			return luaL_error(L, LUA_QL("consvar_t") " has no field named " LUA_QS, field);
+			return luaL_error(L, LUA_QL("consvar_t") " has no field named " LUA_QS, lua_tostring(L, 2));
 		else
 			return 0;
 	}
diff --git a/src/lua_glib.c b/src/lua_glib.c
index 07b3a87b6..6aa77b22e 100644
--- a/src/lua_glib.c
+++ b/src/lua_glib.c
@@ -8,7 +8,7 @@
     #define GLIB_DATABASE_MTABLE  "metatable"   /* Metatable.*/
     #define GLIB_DATABASE_PROXY   "proxy"       /* Proxy table for the library that isn't the global table. */
 
-static inline void lua_glib_push_db(lua_State *L)
+FUNCINLINE static ATTRINLINE void lua_glib_push_db(lua_State *L)
 {
     lua_pushliteral(L, GLIB_DATABASE_GUID);
     lua_gettable(L, LUA_REGISTRYINDEX);
diff --git a/src/lua_hook.h b/src/lua_hook.h
index 921336cd2..c31a58a67 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -12,105 +12,131 @@
 
 #include "r_defs.h"
 #include "d_player.h"
+#include "s_sound.h"
+#include "lua_hudlib_drawlist.h"
 
-enum hook {
-	hook_NetVars=0,
-	hook_MapChange,
-	hook_MapLoad,
-	hook_PlayerJoin,
-	hook_PreThinkFrame,
-	hook_ThinkFrame,
-	hook_PostThinkFrame,
-	hook_MobjSpawn,
-	hook_MobjCollide,
-	hook_MobjMoveCollide,
-	hook_TouchSpecial,
-	hook_MobjFuse,
-	hook_MobjThinker,
-	hook_BossThinker,
-	hook_ShouldDamage,
-	hook_MobjDamage,
-	hook_MobjDeath,
-	hook_BossDeath,
-	hook_MobjRemoved,
-	hook_JumpSpecial,
-	hook_AbilitySpecial,
-	hook_SpinSpecial,
-	hook_JumpSpinSpecial,
-	hook_BotTiccmd,
-	hook_BotAI,
-	hook_LinedefExecute,
-	hook_PlayerMsg,
-	hook_HurtMsg,
-	hook_PlayerSpawn,
-	hook_PlayerQuit,
-	hook_PlayerThink,
-	hook_MusicChange,
-	hook_ShouldSpin,	//SRB2KART
-	hook_ShouldExplode,	//SRB2KART
-	hook_ShouldSquish,	//SRB2KART
-	hook_PlayerSpin,	//SRB2KART
-	hook_PlayerExplode,	//SRB2KART
-	hook_PlayerSquish,	//SRB2KART
-	hook_PlayerCmd,		//SRB2KART
-	hook_IntermissionThinker, //SRB2KART
-	hook_VoteThinker, //SRB2KART
-	hook_ServerJoin, // SRB2KART - Saturn 32p
+/*
+ * Do you know what an 'X Macro' is? Such a macro is called over each element of
+ * a list and expands the input. I use it for the hook lists because both an enum
+ * and array of hook names need to be kept in order. The X Macro handles this
+ * automatically.
+ */
 
-	hook_MAX // last hook
-};
-extern const char *const hookNames[];
+#define MOBJ_HOOK_LIST(X) \
+	X (MobjSpawn),/* P_SpawnMobj */\
+	X (MobjCollide),/* PIT_CheckThing */\
+	X (MobjMoveCollide),/* tritto */\
+	X (TouchSpecial),/* P_TouchSpecialThing */\
+	X (MobjFuse),/* when mobj->fuse runs out */\
+	X (MobjThinker),/* P_MobjThinker, P_SceneryThinker */\
+	X (BossThinker),/* P_GenericBossThinker */\
+	X (ShouldDamage),/* P_DamageMobj (Should mobj take damage?) */\
+	X (MobjDamage),/* P_DamageMobj (Mobj actually takes damage!) */\
+	X (MobjDeath),/* P_KillMobj */\
+	X (BossDeath),/* A_BossDeath */\
+	X (MobjRemoved),/* P_RemoveMobj */\
+	X (HurtMsg),/* imhurttin */\
+
+#define HOOK_LIST(X) \
+	X (NetVars),/* add to archive table (netsave) */\
+	X (MapChange),/* (before map load) */\
+	X (MapLoad),\
+	X (PlayerJoin),/* Got_AddPlayer */\
+	X (PreThinkFrame)/* frame (before mobj and player thinkers) */,\
+	X (ThinkFrame),/* frame (after mobj and player thinkers) */\
+	X (PostThinkFrame),/* frame (at end of tick, ie after overlays, precipitation, specials) */\
+	X (JumpSpecial),/* P_DoJumpStuff (Any-jumping) */\
+	X (AbilitySpecial),/* P_DoJumpStuff (Double-jumping) */\
+	X (SpinSpecial),/* P_DoSpinAbility (Spin button effect) */\
+	X (JumpSpinSpecial),/* P_DoJumpStuff (Spin button effect (mid-air)) */\
+	X (BotTiccmd),/* B_BuildTiccmd */\
+	X (PlayerMsg),/* chat messages */\
+	X (PlayerSpawn),/* G_SpawnPlayer */\
+	X (PlayerQuit),\
+	X (PlayerThink),/* P_PlayerThink */\
+	X (MusicChange),\
+	X (MusicCredit),\
+	X (ShouldSpin),/*SRB2KART*/\
+	X (ShouldExplode),/*SRB2KART*/\
+	X (ShouldSquish),/*SRB2KART*/\
+	X (PlayerSpin),/*SRB2KART*/\
+	X (PlayerExplode),/*SRB2KART*/\
+	X (PlayerSquish),/*SRB2KART*/\
+	X (PlayerCmd),/* building the player's ticcmd struct (Ported from SRB2Kart) */\
+	X (IntermissionThinker),/* Y_Ticker */\
+	X (VoteThinker),/*SRB2KART*/\
+	X (ServerJoin),/* SRB2KART - Saturn 32p*/\
+
+#define STRING_HOOK_LIST(X) \
+	X (BotAI),/* B_BuildTailsTiccmd by skin name */\
+	X (LinedefExecute),\
+
+#define HUD_HOOK_LIST(X) \
+	X (game),\
+	X (scores),/* emblems/multiplayer list */\
+	X (intermission),\
+	X (vote),\
+
+/*
+ * I chose to access the hook enums through a macro as well. This could provide
+ * a hint to lookup the macro's definition instead of the enum's definition.
+ * (Since each enumeration is not defined in the source code, but by the list
+ * macros above, it is not greppable.) The name passed to the macro can also be
+ * grepped and found in the lists above.
+ */
+
+#define   MOBJ_HOOK(name)   mobjhook_ ## name
+#define        HOOK(name)       hook_ ## name
+#define    HUD_HOOK(name)    hudhook_ ## name
+#define STRING_HOOK(name) stringhook_ ## name
+
+#define ENUM(X) enum { X ## _LIST (X)  X(MAX) }
+
+ENUM   (MOBJ_HOOK);
+ENUM        (HOOK);
+ENUM    (HUD_HOOK);
+ENUM (STRING_HOOK);
+
+#undef ENUM
+
+/* dead simple, LUA_HOOK(GameQuit) */
+#define LUA_HOOK(type) LUA_HookVoid(HOOK(type))
+#define LUA_HUDHOOK(type,drawlist) LUA_HookHUD(HUD_HOOK(type),(drawlist))
 
 extern boolean hook_cmd_running;	// This is used by PlayerCmd and lua_playerlib to prevent anything from being wirtten to player while we run PlayerCmd.
 extern int hook_defrosting;
 
-void LUAh_MapChange(INT16 mapnumber); // Hook for map change (before load)
-void LUAh_MapLoad(void); // Hook for map load
-void LUAh_PlayerJoin(int playernum); // Hook for Got_AddPlayer
-void LUAh_PreThinkFrame(void); // Hook for frame (before mobj and player thinkers)
-void LUAh_ThinkFrame(void); // Hook for frame (after mobj and player thinkers)
-void LUAh_PostThinkFrame(void); // Hook for frame (at end of tick, ie after overlays, precipitation, specials)
-boolean LUAh_MobjHook(mobj_t *mo, enum hook which);
-boolean LUAh_PlayerHook(player_t *plr, enum hook which);
-#define LUAh_MobjSpawn(mo) LUAh_MobjHook(mo, hook_MobjSpawn) // Hook for P_SpawnMobj by mobj type
-UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which);
-#define LUAh_MobjCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjCollide) // Hook for PIT_CheckThing by (thing) mobj type
-#define LUAh_MobjMoveCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjMoveCollide) // Hook for PIT_CheckThing by (tmthing) mobj type
-boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher); // Hook for P_TouchSpecialThing by mobj type
-#define LUAh_MobjFuse(mo) LUAh_MobjHook(mo, hook_MobjFuse) // Hook for mobj->fuse == 0 by mobj type
-boolean LUAh_MobjThinker(mobj_t *mo); // Hook for P_MobjThinker or P_SceneryThinker by mobj type
-#define LUAh_BossThinker(mo) LUAh_MobjHook(mo, hook_BossThinker) // Hook for P_GenericBossThinker by mobj type
-UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage); // Hook for P_DamageMobj by mobj type (Should mobj take damage?)
-boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage); // Hook for P_DamageMobj by mobj type (Mobj actually takes damage!)
-boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source); // Hook for P_KillMobj by mobj type
-#define LUAh_BossDeath(mo) LUAh_MobjHook(mo, hook_BossDeath) // Hook for A_BossDeath by mobj type
-#define LUAh_MobjRemoved(mo) LUAh_MobjHook(mo, hook_MobjRemoved) // Hook for P_RemoveMobj by mobj type
-#define LUAh_JumpSpecial(player) LUAh_PlayerHook(player, hook_JumpSpecial) // Hook for P_DoJumpStuff (Any-jumping)
-#define LUAh_AbilitySpecial(player) LUAh_PlayerHook(player, hook_AbilitySpecial) // Hook for P_DoJumpStuff (Double-jumping)
-#define LUAh_SpinSpecial(player) LUAh_PlayerHook(player, hook_SpinSpecial) // Hook for P_DoSpinDash (Spin button effect)
-#define LUAh_JumpSpinSpecial(player) LUAh_PlayerHook(player, hook_JumpSpinSpecial) // Hook for P_DoJumpStuff (Spin button effect (mid-air))
-boolean LUAh_BotTiccmd(player_t *bot, ticcmd_t *cmd); // Hook for B_BuildTiccmd
-boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd); // Hook for B_BuildTailsTiccmd by skin name
-boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector); // Hook for linedef executors
-boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg, int mute); // Hook for chat messages
-boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source); // Hook for hurt messages
-#define LUAh_PlayerSpawn(player) LUAh_PlayerHook(player, hook_PlayerSpawn) // Hook for G_SpawnPlayer
-void LUAh_PlayerQuit(player_t *plr, int reason); // Hook for player quitting
-boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping,
-	UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms); // Hook for music changes
+void LUA_HookVoid(int hook);
+void LUA_HookHUD(int hook, huddrawlist_h drawlist);
 
-UINT8 LUAh_ShouldSpin(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Should player be spun out?
-UINT8 LUAh_ShouldExplode(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Should player be exploded?
-UINT8 LUAh_ShouldSquish(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Should player be squished?
+int  LUA_HookMobj(mobj_t *, int hook);
+int  LUA_Hook2Mobj(mobj_t *, mobj_t *, int hook);
+void LUA_HookInt(INT32 integer, int hook);
+//void LUA_HookBool(boolean value, int hook);
+int  LUA_HookPlayer(player_t *, int hook);
+int  LUA_HookTiccmd(player_t *, ticcmd_t *, int hook);
 
-boolean LUAh_PlayerSpin(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Hook for K_SpinPlayer. Allows Lua to execute code and/or overwrite its behavior.
-boolean LUAh_PlayerExplode(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Hook for K_ExplodePlayer. Allows Lua to execute code and/or overwrite its behavior.
-boolean LUAh_PlayerSquish(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Hook for K_SquishPlayer. Allows Lua to execute code and/or overwrite its behavior.
+void LUA_HookPreThinkFrame(void);
+void LUA_HookThinkFrame(void);
+void LUA_HookPostThinkFrame(void);
+int  LUA_HookTouchSpecial(mobj_t *special, mobj_t *toucher);
+int  LUA_HookShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage);
+int  LUA_HookMobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage);
+int  LUA_HookMobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source);
+int  LUA_HookBotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd);
+void LUA_HookLinedefExecute(line_t *, mobj_t *, sector_t *);
+int  LUA_HookPlayerMsg(int source, int target, int flags, char *msg, int mute);
+int  LUA_HookHurtMsg(player_t *, mobj_t *inflictor, mobj_t *source);
+int  LUA_HookPlayerCanDamage(player_t *, mobj_t *);
+void LUA_HookPlayerQuit(player_t *, int);
+int  LUA_HookPlayerCmd(player_t *, ticcmd_t *);
+int  LUA_HookMusicChange(const char *oldname, struct MusicChange *);
+int  LUA_HookMusicCredit(musicdef_t *musicdef);
 
-void LUAh_ServerJoin(void); // SRB2KART - Saturn 32p: called by client when joining a server, allows lua to load any sort of config file
+int LUA_HookShouldSpin(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Should player be spun out?
+int LUA_HookShouldExplode(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Should player be exploded?
+int LUA_HookShouldSquish(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Should player be squished?
 
-boolean LUAh_PlayerCmd(player_t *player, ticcmd_t *cmd);	// Allows to write to player cmd before the game does anything with them.
-
-void LUAh_IntermissionThinker(void); // Hook for Y_Ticker
-void LUAh_VoteThinker(void);	// Hook for Y_VoteTicker
-#define LUAh_PlayerThink(player) LUAh_PlayerHook(player, hook_PlayerThink) // Hook for P_PlayerThink
+boolean LUA_HookPlayerSpin(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Hook for K_SpinPlayer. Allows Lua to execute code and/or overwrite its behavior.
+boolean LUA_HookPlayerExplode(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Hook for K_ExplodePlayer. Allows Lua to execute code and/or overwrite its behavior.
+boolean LUA_HookPlayerSquish(player_t *player, mobj_t *inflictor, mobj_t *source); // SRB2KART: Hook for K_SquishPlayer. Allows Lua to execute code and/or overwrite its behavior.
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index 16e72d962..97b86e1bf 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -14,6 +14,7 @@
 #include "doomstat.h"
 #include "p_mobj.h"
 #include "g_game.h"
+#include "r_skins.h"
 #include "r_things.h"
 #include "b_bot.h"
 #include "z_zone.h"
@@ -24,1881 +25,1116 @@
 #include "lua_hook.h"
 #include "lua_hud.h" // hud_running errors
 
-static UINT8 hooksAvailable[(hook_MAX/8)+1];
+/* =========================================================================
+                                  ABSTRACTION
+   ========================================================================= */
 
-const char *const hookNames[hook_MAX+1] = {
-	"NetVars",
-	"MapChange",
-	"MapLoad",
-	"PlayerJoin",
-	"PreThinkFrame",
-	"ThinkFrame",
-	"PostThinkFrame",
-	"MobjSpawn",
-	"MobjCollide",
-	"MobjMoveCollide",
-	"TouchSpecial",
-	"MobjFuse",
-	"MobjThinker",
-	"BossThinker",
-	"ShouldDamage",
-	"MobjDamage",
-	"MobjDeath",
-	"BossDeath",
-	"MobjRemoved",
-	"JumpSpecial",
-	"AbilitySpecial",
-	"SpinSpecial",
-	"JumpSpinSpecial",
-	"BotTiccmd",
-	"BotAI",
-	"LinedefExecute",
-	"PlayerMsg",
-	"HurtMsg",
-	"PlayerSpawn",
-	"PlayerQuit",
-	"PlayerThink",
-	"MusicChange",
-	"ShouldSpin",
-	"ShouldExplode",
-	"ShouldSquish",
-	"PlayerSpin",
-	"PlayerExplode",
-	"PlayerSquish",
-	"PlayerCmd",
-	"IntermissionThinker",
-	"VoteThinker",
-	"ServerJoin",
-	NULL
-};
+#define LIST(id, M) \
+	static const char * const id [] = { M (TOSTR)  NULL }
 
-// Hook metadata
-struct hook_s
+LIST   (mobjHookNames,   MOBJ_HOOK_LIST);
+LIST       (hookNames,        HOOK_LIST);
+LIST    (hudHookNames,    HUD_HOOK_LIST);
+LIST (stringHookNames, STRING_HOOK_LIST);
+
+#undef LIST
+
+typedef struct {
+	int numHooks;
+	int *ids;
+} hook_t;
+
+typedef struct {
+	int numGeneric;
+	int ref;
+} stringhook_t;
+
+static hook_t hookIds[HOOK(MAX)];
+static hook_t hudHookIds[HUD_HOOK(MAX)];
+static hook_t mobjHookIds[NUMMOBJTYPES][MOBJ_HOOK(MAX)];
+
+// Lua tables are used to lookup string hook ids.
+static stringhook_t stringHooks[STRING_HOOK(MAX)];
+
+// This will be indexed by hook id, the value of which fetches the registry.
+static int * hookRefs;
+static int   nextid;
+
+// After a hook errors once, don't print the error again.
+static UINT8 * hooksErrored;
+
+static int errorRef;
+
+FUNCINLINE static ATTRINLINE boolean mobj_hook_available(int hook_type, mobjtype_t mobj_type)
 {
-	struct hook_s *next;
-	enum hook type;
-	UINT16 id;
-	union {
-		mobjtype_t mt;
-		char *skinname;
-		char *funcname;
-	} s;
-	boolean error;
-};
-typedef struct hook_s* hook_p;
+	return
+		(
+			mobjHookIds [MT_NULL] [hook_type].numHooks > 0 ||
+			(mobj_type < NUMMOBJTYPES && mobjHookIds[mobj_type][hook_type].numHooks > 0)
+		);
+}
 
-// For each mobj type, a linked list to its thinker and collision hooks.
-// That way, we don't have to iterate through all the hooks.
-// We could do that with all other mobj hooks, but it would probably just be
-// a waste of memory since they are only called occasionally. Probably...
-static hook_p mobjthinkerhooks[NUMMOBJTYPES];
-static hook_p mobjcollidehooks[NUMMOBJTYPES];
+FUNCINLINE static ATTRINLINE unsigned hook_in_list
+(
+		const char * const         name,
+		const char * const * const list
+){
+	unsigned type;
 
-// For each mobj type, a linked list for other mobj hooks
-static hook_p mobjhooks[NUMMOBJTYPES];
+	for (type = 0; list[type] != NULL; ++type)
+	{
+		if (strcmp(name, list[type]) == 0)
+			break;
+	}
 
-// A linked list for player hooks
-static hook_p playerhooks;
+	return type;
+}
 
-// A linked list for linedef executor hooks
-static hook_p linedefexecutorhooks;
+static void get_table(lua_State *L)
+{
+	lua_pushvalue(L, -1);
+	lua_rawget(L, -3);
 
-// For other hooks, a unique linked list
-hook_p roothook;
+	if (lua_isnil(L, -1))
+	{
+		lua_pop(L, 1);
+		lua_createtable(L, 1, 0);
+		lua_pushvalue(L, -2);
+		lua_pushvalue(L, -2);
+		lua_rawset(L, -5);
+	}
+
+	lua_remove(L, -2);
+}
+
+FUNCINLINE static ATTRINLINE void add_hook_to_table(lua_State *L, int n)
+{
+	lua_pushnumber(L, nextid);
+	lua_rawseti(L, -2, n);
+}
+
+static void add_string_hook(lua_State *L, int type)
+{
+	stringhook_t * hook = &stringHooks[type];
+
+	char * string = NULL;
+
+	switch (type)
+	{
+		case STRING_HOOK(BotAI):
+			if (lua_isstring(L, 3))
+			{ // lowercase copy
+				string = Z_StrDup(lua_tostring(L, 3));
+				strlwr(string);
+			}
+
+			/*hook.s.skinname = NULL;
+			if (lua_isstring(L, 2))
+			{ // lowercase copy
+				const char *s = lua_tostring(L, 2);
+				char *p = hook.s.skinname = ZZ_Alloc(strlen(s)+1);
+				do {
+					*p = tolower(*s);
+					++p;
+				} while(*(++s));
+				*p = 0;
+			}*/
+			break;
+
+		case STRING_HOOK(LinedefExecute):
+			string = Z_StrDup(luaL_checkstring(L, 3));
+			strupr(string);
+
+			/*{ // uppercase copy
+				const char *s = luaL_checkstring(L, 2);
+				char *p = hook.s.funcname = ZZ_Alloc(strlen(s)+1);
+				do {
+					*p = toupper(*s);
+					++p;
+				} while(*(++s));
+				*p = 0;
+			}*/
+			break;
+	}
+
+	if (hook->ref > 0)
+		lua_getref(L, hook->ref);
+	else
+	{
+		lua_newtable(L);
+		lua_pushvalue(L, -1);
+		hook->ref = luaL_ref(L, LUA_REGISTRYINDEX);
+	}
+
+	if (string)
+	{
+		lua_pushstring(L, string);
+		get_table(L);
+		add_hook_to_table(L, 1 + lua_objlen(L, -1));
+	}
+	else
+		add_hook_to_table(L, ++hook->numGeneric);
+}
+
+FUNCINLINE static ATTRINLINE void add_hook(hook_t *map)
+{
+	Z_Realloc(map->ids, (map->numHooks + 1) * sizeof *map->ids,
+			PU_STATIC, &map->ids);
+	map->ids[map->numHooks++] = nextid;
+}
+
+FUNCINLINE static ATTRINLINE void add_mobj_hook(lua_State *L, int hook_type)
+{
+	mobjtype_t   mobj_type = luaL_optnumber(L, 3, MT_NULL);
+
+	luaL_argcheck(L, mobj_type < NUMMOBJTYPES, 3, "invalid mobjtype_t");
+
+	add_hook(&mobjHookIds[mobj_type][hook_type]);
+}
+
+FUNCINLINE static ATTRINLINE void add_hud_hook(lua_State *L, int idx)
+{
+	add_hook(&hudHookIds[luaL_checkoption(L,
+										  idx, "game", hudHookNames)]);
+}
+
+static void add_hook_ref(lua_State *L, int idx)
+{
+	if (!(nextid & 7))
+	{
+		Z_Realloc(hooksErrored,
+				  BIT_ARRAY_SIZE (nextid + 1) * sizeof *hooksErrored,
+				  PU_STATIC, &hooksErrored);
+		hooksErrored[nextid >> 3] = 0;
+	}
+
+	Z_Realloc(hookRefs, (nextid + 1) * sizeof *hookRefs, PU_STATIC, &hookRefs);
+
+	// set the hook function in the registry.
+	lua_pushvalue(L, idx);
+	hookRefs[nextid++] = luaL_ref(L, LUA_REGISTRYINDEX);
+}
 
 // Takes hook, function, and additional arguments (mobj type to act on, etc.)
 static int lib_addHook(lua_State *L)
 {
-	static struct hook_s hook = {NULL, 0, 0, {0}, false};
-	static UINT32 nextid;
-	hook_p hookp, *lastp;
-
-	hook.type = luaL_checkoption(L, 1, NULL, hookNames);
-	lua_remove(L, 1);
-
-	luaL_checktype(L, 1, LUA_TFUNCTION);
+	const char * name;
+	unsigned type;
 
 	if (hud_running)
 		return luaL_error(L, "HUD rendering code should not call this function!");
 
-	switch(hook.type)
+	name = luaL_checkstring(L, 1);
+	luaL_checktype(L, 2, LUA_TFUNCTION);
+
+	/* this is a very special case */
+	if (( type = hook_in_list(name, stringHookNames) ) < STRING_HOOK(MAX))
 	{
-	// Take a mobjtype enum which this hook is specifically for.
-	case hook_MobjSpawn:
-	case hook_MobjCollide:
-	case hook_MobjMoveCollide:
-	case hook_TouchSpecial:
-	case hook_MobjFuse:
-	case hook_MobjThinker:
-	case hook_BossThinker:
-	case hook_ShouldDamage:
-	case hook_MobjDamage:
-	case hook_MobjDeath:
-	case hook_BossDeath:
-	case hook_MobjRemoved:
-	case hook_HurtMsg:
-		hook.s.mt = MT_NULL;
-		if (lua_isnumber(L, 2))
-			hook.s.mt = lua_tonumber(L, 2);
-		luaL_argcheck(L, hook.s.mt < NUMMOBJTYPES, 2, "invalid mobjtype_t");
-		break;
-	case hook_BotAI:
-		hook.s.skinname = NULL;
-		if (lua_isstring(L, 2))
-		{ // lowercase copy
-			const char *s = lua_tostring(L, 2);
-			char *p = hook.s.skinname = ZZ_Alloc(strlen(s)+1);
-			do {
-				*p = tolower(*s);
-				++p;
-			} while(*(++s));
-			*p = 0;
-		}
-		break;
-	case hook_LinedefExecute: // Linedef executor functions
-		{ // uppercase copy
-			const char *s = luaL_checkstring(L, 2);
-			char *p = hook.s.funcname = ZZ_Alloc(strlen(s)+1);
-			do {
-				*p = toupper(*s);
-				++p;
-			} while(*(++s));
-			*p = 0;
-		}
-		break;
-	case hook_ShouldSpin:
-	case hook_ShouldExplode:
-	case hook_ShouldSquish:
-	case hook_PlayerSpin:
-	case hook_PlayerExplode:
-	case hook_PlayerSquish:
-	default:
-		break;
+		add_string_hook(L, type);
 	}
-	lua_settop(L, 1); // lua stack contains only the function now.
-
-	hooksAvailable[hook.type/8] |= 1<<(hook.type%8);
-
-	// set hook.id to the highest id + 1
-	hook.id = nextid++;
-
-	// Special cases for some hook types (see the comments above mobjthinkerhooks declaration)
-	switch(hook.type)
+	else if (( type = hook_in_list(name, mobjHookNames) ) < MOBJ_HOOK(MAX))
 	{
-	case hook_MobjThinker:
-		lastp = &mobjthinkerhooks[hook.s.mt];
-		break;
-	case hook_MobjCollide:
-	case hook_MobjMoveCollide:
-		lastp = &mobjcollidehooks[hook.s.mt];
-		break;
-	case hook_MobjSpawn:
-	case hook_TouchSpecial:
-	case hook_MobjFuse:
-	case hook_BossThinker:
-	case hook_ShouldDamage:
-	case hook_MobjDamage:
-	case hook_MobjDeath:
-	case hook_BossDeath:
-	case hook_MobjRemoved:
-		lastp = &mobjhooks[hook.s.mt];
-		break;
-	case hook_JumpSpecial:
-	case hook_AbilitySpecial:
-	case hook_SpinSpecial:
-	case hook_JumpSpinSpecial:
-	case hook_PlayerSpawn:
-	case hook_PlayerThink:
-		lastp = &playerhooks;
-		break;
-	case hook_LinedefExecute:
-		lastp = &linedefexecutorhooks;
-		break;
-	case hook_ShouldSpin:
-	case hook_ShouldExplode:
-	case hook_ShouldSquish:
-	case hook_PlayerSpin:
-	case hook_PlayerExplode:
-	case hook_PlayerSquish:
-	case hook_ServerJoin:
-	default:
-		lastp = &roothook;
-		break;
+		add_mobj_hook(L, type);
+	}
+	else if (( type = hook_in_list(name, hookNames) ) < HOOK(MAX))
+	{
+		add_hook(&hookIds[type]);
+	}
+	/*else if (strcmp(name, "HUD") == 0) // ehh this is cool and all, but i dont want modders potentially breaking vanilla clients lol
+	{
+		add_hud_hook(L, 3);
+	}*/
+	else
+	{
+		return luaL_argerror(L, 1, lua_pushfstring(L, "invalid hook " LUA_QS, name));
 	}
 
-	// iterate the hook metadata structs
-	// set lastp to the last hook struct's "next" pointer.
-	for (hookp = *lastp; hookp; hookp = hookp->next)
-		lastp = &hookp->next;
-	// allocate a permanent memory struct to stuff hook.
-	hookp = ZZ_Alloc(sizeof(struct hook_s));
-	memcpy(hookp, &hook, sizeof(struct hook_s));
-	// tack it onto the end of the linked list.
-	*lastp = hookp;
+	add_hook_ref(L, 2);/* the function */
 
-	// set the hook function in the registry.
-	lua_getfield(L, LUA_REGISTRYINDEX, "hooks");
-	lua_pushvalue(L, 1);
-	lua_rawseti(L, -2, hook.id);
 	return 0;
 }
 
 int LUA_HookLib(lua_State *L)
 {
-	memset(hooksAvailable,0,sizeof(UINT8[(hook_MAX/8)+1]));
-	roothook = NULL;
-	lua_register(L, "addHook", lib_addHook);
+	lua_pushcfunction(L, LUA_GetErrorMessage);
+	errorRef = luaL_ref(L, LUA_REGISTRYINDEX);
 
-	lua_newtable(L);
-	lua_setfield(L, LUA_REGISTRYINDEX, "hooks");
+	lua_register(L, "addHook", lib_addHook);
 
 	return 0;
 }
 
-boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
+int lib_hudadd(lua_State *L);/* yeah compiler */
+int lib_hudadd(lua_State *L)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
-		return false;
+	luaL_checktype(L, 1, LUA_TFUNCTION);
 
-	I_Assert(mo->type < NUMMOBJTYPES);
+	add_hud_hook(L, 2);
+	add_hook_ref(L, 1);
 
-	if (!(mobjhooks[MT_NULL] || mobjhooks[mo->type]))
-		return false;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// Look for all generic mobj hooks
-	for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
-		if (hookp->type == which)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-				LUA_PushUserdata(gL, mo, META_MOBJ);
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -2);
-			if (lua_pcall(gL, 1, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	for (hookp = mobjhooks[mo->type]; hookp; hookp = hookp->next)
-		if (hookp->type == which)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-				LUA_PushUserdata(gL, mo, META_MOBJ);
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -2);
-			if (lua_pcall(gL, 1, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return hooked;
+	return 0;
 }
 
-boolean LUAh_PlayerHook(player_t *plr, enum hook which)
+typedef struct Hook_State Hook_State;
+typedef void (*Hook_Callback)(Hook_State *);
+
+struct Hook_State {
+	INT32        status;/* return status to calling function */
+	void       * userdata;
+	int          hook_type;
+	mobjtype_t   mobj_type;/* >0 if mobj hook */
+	boolean      force_mobj;// allows mobj_type equal 0
+	const char * string;/* used to fetch table, ran first if set */
+	int          top;/* index of last argument passed to hook */
+	int          id;/* id to fetch ref */
+	int          values;/* num arguments passed to hook */
+	int          results;/* num values returned by hook */
+	Hook_Callback results_handler;/* callback when hook successfully returns */
+};
+
+enum {
+	EINDEX = 1,/* error handler */
+	SINDEX = 2,/* string itself is pushed in case of string hook */
+};
+
+FUNCINLINE static ATTRINLINE void push_error_handler(void)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
-		return false;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	for (hookp = playerhooks; hookp; hookp = hookp->next)
-		if (hookp->type == which)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-				LUA_PushUserdata(gL, plr, META_PLAYER);
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -2);
-			if (lua_pcall(gL, 1, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return hooked;
+	lua_getref(gL, errorRef);
 }
 
-// Hook for map change (before load)
-void LUAh_MapChange(INT16 mapnumber)
+/* repush hook string */
+FUNCINLINE static ATTRINLINE void push_string(void)
 {
-	hook_p hookp;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_MapChange/8] & (1<<(hook_MapChange%8))))
-		return;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	lua_pushinteger(gL, mapnumber);
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_MapChange)
-		{
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -2);
-			if (lua_pcall(gL, 1, 0, 1)) {
-				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-			}
-		}
-
-	lua_settop(gL, 0);
+	lua_pushvalue(gL, SINDEX);
 }
 
-// Hook for map load
-void LUAh_MapLoad(void)
+FUNCINLINE static ATTRINLINE boolean begin_hook_values(Hook_State *hook)
 {
-	hook_p hookp;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_MapLoad/8] & (1<<(hook_MapLoad%8))))
-		return;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	lua_pushinteger(gL, gamemap);
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_MapLoad)
-		{
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -2);
-			if (lua_pcall(gL, 1, 0, 1)) {
-				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-			}
-		}
-	lua_settop(gL, 0);
+	hook->top = lua_gettop(gL);
+	return true;
 }
 
-// Hook for Got_AddPlayer
-void LUAh_PlayerJoin(int playernum)
+FUNCINLINE static ATTRINLINE void start_hook_stack(void)
 {
-	hook_p hookp;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_PlayerJoin/8] & (1<<(hook_PlayerJoin%8))))
-		return;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	lua_pushinteger(gL, playernum);
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_PlayerJoin)
-		{
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -2);
-			if (lua_pcall(gL, 1, 0, 1)) {
-				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-			}
-		}
-
 	lua_settop(gL, 0);
+	push_error_handler();
 }
 
-// Hook for frame (before mobj and player thinkers)
-void LUAh_PreThinkFrame(void)
-{
-	hook_p hookp;
-	int HOOKSINDEX;
-	// variables used by perf stats
-	int hook_index = 0;
-	precise_t time_taken = 0;
-	if (!gL || !(hooksAvailable[hook_PreThinkFrame/8] & (1<<(hook_PreThinkFrame%8))))
-		return;
+static boolean init_hook_type
+(
+		Hook_State * hook,
+		int          status,
+		int          hook_type,
+		mobjtype_t   mobj_type,
+		const char * string,
+		int          nonzero
+){
+	hook->status = status;
 
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
+	if (nonzero)
 	{
-		if (hookp->type == hook_PreThinkFrame)
-		{
-			if (cv_perfstats.value == 4)
-				time_taken = I_GetPreciseTime();
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			if (lua_pcall(gL, 0, 0, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-			}
-			if (cv_perfstats.value == 4)
-			{
-				lua_Debug ar;
-				time_taken = I_GetPreciseTime() - time_taken;
-				// we need the function, let's just retrieve it again
-				lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-				lua_getinfo(gL, ">S", &ar);
-				PS_SetPreThinkFrameHookInfo(hook_index, time_taken, ar.short_src);
-				hook_index++;
-			}
-		}
-
+		start_hook_stack();
+		hook->hook_type = hook_type;
+		hook->mobj_type = mobj_type;
+		hook->string = string;
+		return begin_hook_values(hook);
 	}
-	lua_pop(gL, 2); // Pop error handler and hooks table
+	else
+		return false;
 }
 
-// Hook for frame (after mobj and player thinkers)
-void LUAh_ThinkFrame(void)
-{
-	hook_p hookp;
-	int HOOKSINDEX;
-	// variables used by perf stats
-	int hook_index = 0;
-	precise_t time_taken = 0;
+FUNCINLINE static ATTRINLINE boolean prepare_hook
+(
+		Hook_State * hook,
+		int default_status,
+		int hook_type
+){
+	hook->force_mobj = false;
 
-	if (!gL || !(hooksAvailable[hook_ThinkFrame/8] & (1<<(hook_ThinkFrame%8))))
-		return;
+	return init_hook_type(hook, default_status,
+			hook_type, 0, NULL,
+			hookIds[hook_type].numHooks);
+}
 
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
+FUNCINLINE static ATTRINLINE boolean prepare_mobj_hook
+(
+		Hook_State * hook,
+		int          default_status,
+		int          hook_type,
+		mobj_t     * primary_mobj
+){
+	const mobjtype_t mobj_type =
+		primary_mobj ? primary_mobj->type : NUMMOBJTYPES;
 
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
+	hook->force_mobj = true;
 
-	for (hookp = roothook; hookp; hookp = hookp->next)
+	return init_hook_type(hook, default_status,
+			hook_type, mobj_type, NULL,
+			mobj_hook_available(hook_type, mobj_type));
+}
+
+FUNCINLINE static ATTRINLINE boolean prepare_string_hook
+(
+		Hook_State * hook,
+		int          default_status,
+		int          hook_type,
+		const char * string
+){
+	hook->force_mobj = false;
+
+	if (init_hook_type(hook, default_status,
+				hook_type, 0, string,
+				stringHooks[hook_type].ref))
 	{
-		if (hookp->type == hook_ThinkFrame)
+		lua_pushstring(gL, string);
+		return begin_hook_values(hook);
+	}
+	else
+		return false;
+}
+
+static boolean prepare_hud_hook
+(
+		Hook_State * hook,
+		int hook_type
+){
+	return init_hook_type(hook, 0,
+			hook_type, 0, NULL,
+			hudHookIds[hook_type].numHooks);
+}
+
+FUNCINLINE static ATTRINLINE void init_hook_call
+(
+		Hook_State * hook,
+		int    results,
+		Hook_Callback results_handler
+){
+	const int top = lua_gettop(gL);
+	hook->values = (top - hook->top);
+	hook->top = top;
+	hook->results = results;
+	hook->results_handler = results_handler;
+}
+
+FUNCINLINE static ATTRINLINE void get_hook(Hook_State *hook, const int *ids, int n)
+{
+	hook->id = ids[n];
+	lua_getref(gL, hookRefs[hook->id]);
+}
+
+FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n)
+{
+	lua_rawgeti(gL, -1, n);
+	hook->id = lua_tonumber(gL, -1);
+	lua_pop(gL, 1);
+	lua_getref(gL, hookRefs[hook->id]);
+}
+
+static int call_single_hook_no_copy(Hook_State *hook)
+{
+	if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
+	{
+		if (hook->results > 0)
 		{
-			if (cv_perfstats.value == 3)
-				time_taken = I_GetPreciseTime();
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			if (lua_pcall(gL, 0, 0, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-			}
-			if (cv_perfstats.value == 3)
-			{
-				lua_Debug ar;
-				time_taken = I_GetPreciseTime() - time_taken;
-				// we need the function, let's just retrieve it again
-				lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-				lua_getinfo(gL, ">S", &ar);
-				PS_SetThinkFrameHookInfo(hook_index, time_taken, ar.short_src);
-				hook_index++;
-			}
+			(*hook->results_handler)(hook);
+			lua_pop(gL, hook->results);
 		}
 	}
-
-	lua_pop(gL, 2); // Pop error handler and hooks table
-}
-
-// Hook for frame (at end of tick, ie after overlays, precipitation, specials)
-void LUAh_PostThinkFrame(void)
-{
-	hook_p hookp;
-	int HOOKSINDEX;
-	// variables used by perf stats
-	int hook_index = 0;
-	precise_t time_taken = 0;
-	if (!gL || !(hooksAvailable[hook_PostThinkFrame/8] & (1<<(hook_PostThinkFrame%8))))
-		return;
-
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
+	else
 	{
-		if (hookp->type == hook_PostThinkFrame)
+		/* print the error message once */
+		if (cv_debug & DBG_LUA || !in_bit_array(hooksErrored, hook->id))
 		{
-			if (cv_perfstats.value == 5)
-				time_taken = I_GetPreciseTime();
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			if (lua_pcall(gL, 0, 0, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-			}
-			if (cv_perfstats.value == 5)
-			{
-				lua_Debug ar;
-				time_taken = I_GetPreciseTime() - time_taken;
-				// we need the function, let's just retrieve it again
-				lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-				lua_getinfo(gL, ">S", &ar);
-				PS_SetPostThinkFrameHookInfo(hook_index, time_taken, ar.short_src);
-				hook_index++;
-			}
+			CONS_Alert(CONS_WARNING, "%s\n", lua_tostring(gL, -1));
+			set_bit_array(hooksErrored, hook->id);
 		}
-	}
-
-	lua_pop(gL, 2); // Pop error handler and hooks table
-}
-
-// Hook for Y_Ticker
-void LUAh_IntermissionThinker(void)
-{
-	hook_p hookp;
-	int HOOKSINDEX;
-
-	if (!gL || !(hooksAvailable[hook_IntermissionThinker/8] & (1<<(hook_IntermissionThinker%8))))
-		return;
-
-	lua_pushcfunction(gL, LUA_GetErrorMessage);;
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-	{
-		if (hookp->type == hook_IntermissionThinker)
-		{
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			if (lua_pcall(gL, 0, 0, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-			}
-		}
-	}
-
-	lua_pop(gL, 2); // Pop error handler and hooks table
-}
-
-// Hook for Y_VoteTicker
-void LUAh_VoteThinker(void)
-{
-	hook_p hookp;
-	int HOOKSINDEX;
-
-	if (!gL || !(hooksAvailable[hook_VoteThinker/8] & (1<<(hook_VoteThinker%8))))
-		return;
-
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-	{
-		if (hookp->type == hook_VoteThinker)
-		{
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			if (lua_pcall(gL, 0, 0, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-			}
-		}
-	}
-
-	lua_pop(gL, 2); // Pop error handler and hooks table
-}
-
-
-// Hook for mobj collisions
-UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
-{
-	hook_p hookp;
-	UINT8 shouldCollide = 0; // 0 = default, 1 = force yes, 2 = force no.
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
-		return 0;
-
-	I_Assert(thing1->type < NUMMOBJTYPES);
-
-	if (!(mobjcollidehooks[MT_NULL] || mobjcollidehooks[thing1->type]))
-		return 0;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// Look for all generic mobj collision hooks
-	for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next)
-		if (hookp->type == which)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, thing1, META_MOBJ);
-				LUA_PushUserdata(gL, thing2, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -3);
-			lua_pushvalue(gL, -3);
-			if (lua_pcall(gL, 2, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (!lua_isnil(gL, -1))
-			{ // if nil, leave shouldCollide = 0.
-				if (lua_toboolean(gL, -1))
-					shouldCollide = 1; // Force yes
-				else
-					shouldCollide = 2; // Force no
-			}
-			lua_pop(gL, 1);
-		}
-
-	for (hookp = mobjcollidehooks[thing1->type]; hookp; hookp = hookp->next)
-		if (hookp->type == which)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, thing1, META_MOBJ);
-				LUA_PushUserdata(gL, thing2, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -3);
-			lua_pushvalue(gL, -3);
-			if (lua_pcall(gL, 2, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (!lua_isnil(gL, -1))
-			{ // if nil, leave shouldCollide = 0.
-				if (lua_toboolean(gL, -1))
-					shouldCollide = 1; // Force yes
-				else
-					shouldCollide = 2; // Force no
-			}
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return shouldCollide;
-}
-
-// Hook for mobj thinkers
-boolean LUAh_MobjThinker(mobj_t *mo)
-{
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_MobjThinker/8] & (1<<(hook_MobjThinker%8))))
-		return false;
-
-	I_Assert(mo->type < NUMMOBJTYPES);
-
-	if (!(mobjthinkerhooks[MT_NULL] || mobjthinkerhooks[mo->type]))
-		return false;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// Look for all generic mobj thinker hooks
-	for (hookp = mobjthinkerhooks[MT_NULL]; hookp; hookp = hookp->next)
-	{
-		ps_lua_mobjhooks.value.i++;
-		if (lua_gettop(gL) == 2)
-			LUA_PushUserdata(gL, mo, META_MOBJ);
-		lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-		lua_pushvalue(gL, -2);
-		if (lua_pcall(gL, 1, 1, 1)) {
-			if (!hookp->error || cv_debug & DBG_LUA)
-				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-			lua_pop(gL, 1);
-			hookp->error = true;
-			continue;
-		}
-		if (lua_toboolean(gL, -1))
-			hooked = true;
 		lua_pop(gL, 1);
 	}
 
-	for (hookp = mobjthinkerhooks[mo->type]; hookp; hookp = hookp->next)
+	return 1;
+}
+
+FUNCINLINE static ATTRINLINE int call_single_hook(Hook_State *hook)
+{
+	int i;
+
+	for (i = -(hook->values) + 1; i <= 0; ++i)
+		lua_pushvalue(gL, hook->top + i);
+
+	return call_single_hook_no_copy(hook);
+}
+
+FUNCINLINE static ATTRINLINE int call_hook_table_for(Hook_State *hook, int n)
+{
+	int k;
+
+	for (k = 1; k <= n; ++k)
 	{
-		ps_lua_mobjhooks.value.i++;
-		if (lua_gettop(gL) == 2)
-			LUA_PushUserdata(gL, mo, META_MOBJ);
-		lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-		lua_pushvalue(gL, -2);
-		if (lua_pcall(gL, 1, 1, 1)) {
-			if (!hookp->error || cv_debug & DBG_LUA)
-				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-			lua_pop(gL, 1);
-			hookp->error = true;
-			continue;
-		}
-		if (lua_toboolean(gL, -1))
-			hooked = true;
-		lua_pop(gL, 1);
+		get_hook_from_table(hook, k);
+		call_single_hook(hook);
 	}
 
-	lua_settop(gL, 0);
-	return hooked;
+	return n;
 }
 
-// Hook for P_TouchSpecialThing by mobj type
-boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
+FUNCINLINE static ATTRINLINE int call_hook_table(Hook_State *hook)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_TouchSpecial/8] & (1<<(hook_TouchSpecial%8))))
-		return false;
-
-	I_Assert(special->type < NUMMOBJTYPES);
-
-	if (!(mobjhooks[MT_NULL] || mobjhooks[special->type]))
-		return false;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// Look for all generic touch special hooks
-	for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
-		if (hookp->type == hook_TouchSpecial)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, special, META_MOBJ);
-				LUA_PushUserdata(gL, toucher, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -3);
-			lua_pushvalue(gL, -3);
-			if (lua_pcall(gL, 2, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	for (hookp = mobjhooks[special->type]; hookp; hookp = hookp->next)
-		if (hookp->type == hook_TouchSpecial)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, special, META_MOBJ);
-				LUA_PushUserdata(gL, toucher, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -3);
-			lua_pushvalue(gL, -3);
-			if (lua_pcall(gL, 2, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return hooked;
+	return call_hook_table_for(hook, lua_objlen(gL, -1));
 }
 
-// Hook for P_DamageMobj by mobj type (Should mobj take damage?)
-UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
+FUNCINLINE static ATTRINLINE int call_mapped(Hook_State *hook, const hook_t *map)
 {
-	hook_p hookp;
-	UINT8 shouldDamage = 0; // 0 = default, 1 = force yes, 2 = force no.
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_ShouldDamage/8] & (1<<(hook_ShouldDamage%8))))
-		return 0;
+	int k;
 
-	I_Assert(target->type < NUMMOBJTYPES);
+	for (k = 0; k < map->numHooks; ++k)
+	{
+		get_hook(hook, map->ids, k);
+		call_single_hook(hook);
+	}
 
-	if (!(mobjhooks[MT_NULL] || mobjhooks[target->type]))
-		return 0;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// Look for all generic should damage hooks
-	for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
-		if (hookp->type == hook_ShouldDamage)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, target, META_MOBJ);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-				lua_pushinteger(gL, damage);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			if (lua_pcall(gL, 4, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (!lua_isnil(gL, -1))
-			{
-				if (lua_toboolean(gL, -1))
-					shouldDamage = 1; // Force yes
-				else
-					shouldDamage = 2; // Force no
-			}
-			lua_pop(gL, 1);
-		}
-
-	for (hookp = mobjhooks[target->type]; hookp; hookp = hookp->next)
-		if (hookp->type == hook_ShouldDamage)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, target, META_MOBJ);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-				lua_pushinteger(gL, damage);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			if (lua_pcall(gL, 4, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (!lua_isnil(gL, -1))
-			{
-				if (lua_toboolean(gL, -1))
-					shouldDamage = 1; // Force yes
-				else
-					shouldDamage = 2; // Force no
-			}
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return shouldDamage;
+	return map->numHooks;
 }
 
-// Hook for P_DamageMobj by mobj type (Mobj actually takes damage!)
-boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
+static int call_string_hooks(Hook_State *hook)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_MobjDamage/8] & (1<<(hook_MobjDamage%8))))
-		return false;
+	const stringhook_t *map = &stringHooks[hook->hook_type];
 
-	I_Assert(target->type < NUMMOBJTYPES);
+	int calls = 0;
 
-	if (!(mobjhooks[MT_NULL] || mobjhooks[target->type]))
-		return false;
+	lua_getref(gL, map->ref);
 
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
+	/* call generic string hooks first */
+	calls += call_hook_table_for(hook, map->numGeneric);
 
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
+	push_string();
+	lua_rawget(gL, -2);
+	calls += call_hook_table(hook);
 
-	// Look for all generic mobj damage hooks
-	for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
-		if (hookp->type == hook_MobjDamage)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, target, META_MOBJ);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-				lua_pushinteger(gL, damage);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			if (lua_pcall(gL, 4, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	for (hookp = mobjhooks[target->type]; hookp; hookp = hookp->next)
-		if (hookp->type == hook_MobjDamage)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, target, META_MOBJ);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-				lua_pushinteger(gL, damage);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			lua_pushvalue(gL, -5);
-			if (lua_pcall(gL, 4, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return hooked;
+	return calls;
 }
 
-// Hook for P_KillMobj by mobj type
-boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source)
+FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_MobjDeath/8] & (1<<(hook_MobjDeath%8))))
-		return false;
-
-	I_Assert(target->type < NUMMOBJTYPES);
-
-	if (!(mobjhooks[MT_NULL] || mobjhooks[target->type]))
-		return false;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// Look for all generic mobj death hooks
-	for (hookp = mobjhooks[MT_NULL]; hookp; hookp = hookp->next)
-		if (hookp->type == hook_MobjDeath)
-		{
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, target, META_MOBJ);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	for (hookp = mobjhooks[target->type]; hookp; hookp = hookp->next)
-		if (hookp->type == hook_MobjDeath)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, target, META_MOBJ);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return hooked;
+	return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
 }
 
-// Hook for B_BuildTiccmd
-boolean LUAh_BotTiccmd(player_t *bot, ticcmd_t *cmd)
-{
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_BotTiccmd/8] & (1<<(hook_BotTiccmd%8))))
-		return false;
+static int call_hooks
+(
+		Hook_State * hook,
+		int        results,
+		Hook_Callback results_handler
+){
+	int calls = 0;
+
+	init_hook_call(hook, results, results_handler);
+
+	if (hook->string)
+	{
+		calls += call_string_hooks(hook);
+	}
+	else if (hook->force_mobj)
+	{
+		/* call generic mobj hooks first */
+		calls += call_mobj_type_hooks(hook, MT_NULL);
+
+		if (hook->mobj_type < NUMMOBJTYPES)
+			calls += call_mobj_type_hooks(hook, hook->mobj_type);
+
+		ps_lua_mobjhooks.value.i += calls;
+	}
+	else
+		calls += call_mapped(hook, &hookIds[hook->hook_type]);
 
 	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
 
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_BotTiccmd)
-		{
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, bot, META_PLAYER);
-				LUA_PushUserdata(gL, cmd, META_TICCMD);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -3);
-			lua_pushvalue(gL, -3);
-			if (lua_pcall(gL, 2, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return hooked;
+	return calls;
 }
 
-// Hook for G_BuildTicCmd
-boolean hook_cmd_running = false;
-boolean LUAh_PlayerCmd(player_t *player, ticcmd_t *cmd)
+/* =========================================================================
+                            COMMON RESULT HANDLERS
+   ========================================================================= */
+
+#define res_none NULL
+
+FUNCINLINE static ATTRINLINE void res_true(Hook_State *hook)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_PlayerCmd/8] & (1<<(hook_PlayerCmd%8))))
-		return false;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	hook_cmd_running = true;
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_PlayerCmd)
-		{
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, player, META_PLAYER);
-				LUA_PushUserdata(gL, cmd, META_TICCMD);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -3);
-			lua_pushvalue(gL, -3);
-			if (lua_pcall(gL, 2, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-
-	hook_cmd_running = false;
-	lua_settop(gL, 0);
-	return hooked;
+	if (lua_toboolean(gL, -1))
+		hook->status = true;
 }
 
-// Hook for B_BuildTailsTiccmd by skin name
-boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
+/*static void res_false(Hook_State *hook)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_BotAI/8] & (1<<(hook_BotAI%8))))
-		return false;
+	if (!lua_isnil(gL, -1) && !lua_toboolean(gL, -1))
+		hook->status = false;
+}*/
 
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_BotAI
-		&& (hookp->s.skinname == NULL || !strcmp(hookp->s.skinname, ((skin_t*)tails->skin)->name)))
-		{
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, sonic, META_MOBJ);
-				LUA_PushUserdata(gL, tails, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -3);
-			lua_pushvalue(gL, -3);
-			if (lua_pcall(gL, 2, 8, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-
-			// This turns forward, backward, left, right, jump, and spin into a proper ticcmd for tails.
-			if (lua_istable(gL, -8)) {
-				boolean forward=false, backward=false, left=false, right=false, strafeleft=false, straferight=false, jump=false, spin=false;
-#define CHECKFIELD(field) \
-				lua_getfield(gL, -8, #field);\
-				if (lua_toboolean(gL, -1))\
-					field = true;\
-				lua_pop(gL, 1);
-
-				CHECKFIELD(forward)
-				CHECKFIELD(backward)
-				CHECKFIELD(left)
-				CHECKFIELD(right)
-				CHECKFIELD(strafeleft)
-				CHECKFIELD(straferight)
-				CHECKFIELD(jump)
-				CHECKFIELD(spin)
-#undef CHECKFIELD
-				B_KeysToTiccmd(tails, cmd, forward, backward, left, right, strafeleft, straferight, jump, spin);
-			} else
-				B_KeysToTiccmd(tails, cmd, lua_toboolean(gL, -8), lua_toboolean(gL, -7), lua_toboolean(gL, -6), lua_toboolean(gL, -5), lua_toboolean(gL, -4), lua_toboolean(gL, -3), lua_toboolean(gL, -2), lua_toboolean(gL, -1));
-
-			lua_pop(gL, 8);
-			hooked = true;
-		}
-
-	lua_settop(gL, 0);
-	return hooked;
+FUNCINLINE static ATTRINLINE void res_force(Hook_State *hook)
+{
+	if (!lua_isnil(gL, -1))
+	{
+		if (lua_toboolean(gL, -1))
+			hook->status = 1; // Force yes
+		else
+			hook->status = 2; // Force no
+	}
 }
 
-// Hook for linedef executors
-boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
+FUNCINLINE static ATTRINLINE void res_hud(Hook_State *hook)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_LinedefExecute/8] & (1<<(hook_LinedefExecute%8))))
-		return 0;
+	(void)hook;
 
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	for (hookp = linedefexecutorhooks; hookp; hookp = hookp->next)
-		if (!strcmp(hookp->s.funcname, line->text))
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, line, META_LINE);
-				LUA_PushUserdata(gL, mo, META_MOBJ);
-				LUA_PushUserdata(gL, sector, META_SECTOR);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 0, 1)) {
-				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-			}
-			hooked = true;
-		}
-
-	lua_settop(gL, 0);
-	return hooked;
+	hud_interpolate = hud_interpstring = hud_interplatch = false;
+	hud_interpcounter++;
 }
 
-// Hook for player chat
-// Added the "mute" field. It's set to true if the message was supposed to be eaten by spam protection.
-// But for netgame consistency purposes, this hook is ran first reguardless, so this boolean allows for modders to adapt if they so desire.
-boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg, int mute)
+/* =========================================================================
+                               GENERALISED HOOKS
+   ========================================================================= */
+
+int LUA_HookMobj(mobj_t *mobj, int hook_type)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_PlayerMsg/8] & (1<<(hook_PlayerMsg%8))))
-		return false;
+	Hook_State hook;
+	if (prepare_mobj_hook(&hook, false, hook_type, mobj))
+	{
+		LUA_PushUserdata(gL, mobj, META_MOBJ);
+		call_hooks(&hook, 1, res_true);
+	}
+	return hook.status;
+}
 
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
+int LUA_Hook2Mobj(mobj_t *t1, mobj_t *t2, int hook_type)
+{
+	Hook_State hook;
+	if (prepare_mobj_hook(&hook, 0, hook_type, t1))
+	{
+		LUA_PushUserdata(gL, t1, META_MOBJ);
+		LUA_PushUserdata(gL, t2, META_MOBJ);
+		call_hooks(&hook, 1, res_force);
+	}
+	return hook.status;
+}
 
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
+void LUA_HookVoid(int type)
+{
+	Hook_State hook;
+	if (prepare_hook(&hook, 0, type))
+		call_hooks(&hook, 0, res_none);
+}
 
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_PlayerMsg)
+void LUA_HookInt(INT32 number, int hook_type)
+{
+	Hook_State hook;
+	if (prepare_hook(&hook, 0, hook_type))
+	{
+		lua_pushinteger(gL, number);
+		call_hooks(&hook, 0, res_none);
+	}
+}
+
+/*void LUA_HookBool(boolean value, int hook_type)
+{
+	Hook_State hook;
+	if (prepare_hook(&hook, 0, hook_type))
+	{
+		//lua_pushboolean(gL, value);
+		call_hooks(&hook, 0, res_none);
+	}
+}*/
+
+int LUA_HookPlayer(player_t *player, int hook_type)
+{
+	Hook_State hook;
+	if (prepare_hook(&hook, false, hook_type))
+	{
+		LUA_PushUserdata(gL, player, META_PLAYER);
+		call_hooks(&hook, 1, res_true);
+	}
+	return hook.status;
+}
+
+int LUA_HookTiccmd(player_t *player, ticcmd_t *cmd, int hook_type)
+{
+	Hook_State hook;
+	if (prepare_hook(&hook, false, hook_type))
+	{
+		LUA_PushUserdata(gL, player, META_PLAYER);
+		LUA_PushUserdata(gL, cmd, META_TICCMD);
+
+		if (hook_type == HOOK(PlayerCmd))
+			hook_cmd_running = true;
+
+		call_hooks(&hook, 1, res_true);
+
+		if (hook_type == HOOK(PlayerCmd))
+			hook_cmd_running = false;
+	}
+	return hook.status;
+}
+
+void LUA_HookHUD(int hook_type, huddrawlist_h list)
+{
+	Hook_State hook;
+	if (prepare_hud_hook(&hook, hook_type))
+	{
+		LUA_SetHudHook(hook_type, list);
+
+		hud_running = true; // local hook
+		hud_interpcounter = 0;
+		hud_interpolate = hud_interpstring = hud_interplatch = false;
+		init_hook_call(&hook, 1, res_hud);
+		call_mapped(&hook, &hudHookIds[hook_type]);
+		lua_settop(gL, 0); // destroy le stack!! >:3
+		hud_running = false;
+
+		lua_pushnil(gL);
+		lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
+	}
+}
+
+/* =========================================================================
+                               SPECIALIZED HOOKS
+   ========================================================================= */
+
+static void hook_think_frame(int type)
+{
+	// variables used by perf stats
+	int hook_index = 0;
+	precise_t time_taken = 0;
+
+	Hook_State hook;
+
+	const hook_t * map = &hookIds[type];
+	int k;
+
+	const boolean perfstats = (cv_perfstats.value >= 3);
+
+	if (prepare_hook(&hook, 0, type))
+	{
+		init_hook_call(&hook, 0, res_none);
+
+		for (k = 0; k < map->numHooks; ++k)
 		{
-			if (lua_gettop(gL) == 2)
+			get_hook(&hook, map->ids, k);
+
+			if (perfstats)
 			{
-				LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player
-				if (flags & 2 /*HU_CSAY*/) { // csay TODO: make HU_CSAY accessible outside hu_stuff.c
-					lua_pushinteger(gL, 3); // type
-					lua_pushnil(gL); // target
-				} else if (target == -1) { // sayteam
-					lua_pushinteger(gL, 1); // type
-					lua_pushnil(gL); // target
-				} else if (target == 0) { // say
-					lua_pushinteger(gL, 0); // type
-					lua_pushnil(gL); // target
-				} else { // sayto
-					lua_pushinteger(gL, 2); // type
-					LUA_PushUserdata(gL, &players[target-1], META_PLAYER); // target
+				lua_pushvalue(gL, -1);/* need the function again */
+				time_taken = I_GetPreciseTime();
+			}
+
+			call_single_hook(&hook);
+
+			if (perfstats)
+			{
+				lua_Debug ar;
+				time_taken = I_GetPreciseTime() - time_taken;
+				lua_getinfo(gL, ">S", &ar);
+				if (type == 4) // sorry for magic numbers
+					PS_SetPreThinkFrameHookInfo(hook_index, time_taken, ar.short_src);
+				else if (type == 5)
+					PS_SetThinkFrameHookInfo(hook_index, time_taken, ar.short_src);
+				else if (type == 6)
+					PS_SetPostThinkFrameHookInfo(hook_index, time_taken, ar.short_src);
+
+				hook_index++;
+			}
+		}
+
+		lua_settop(gL, 0);
+	}
+}
+
+void LUA_HookPreThinkFrame(void)
+{
+	hook_think_frame(HOOK(PreThinkFrame));
+}
+
+void LUA_HookThinkFrame(void)
+{
+	hook_think_frame(HOOK(ThinkFrame));
+}
+
+void LUA_HookPostThinkFrame(void)
+{
+	hook_think_frame(HOOK(PostThinkFrame));
+}
+
+int LUA_HookTouchSpecial(mobj_t *special, mobj_t *toucher)
+{
+	Hook_State hook;
+	if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(TouchSpecial), special))
+	{
+		LUA_PushUserdata(gL, special, META_MOBJ);
+		LUA_PushUserdata(gL, toucher, META_MOBJ);
+		call_hooks(&hook, 1, res_true);
+	}
+	return hook.status;
+}
+
+static int damage_hook
+(
+		mobj_t *target,
+		mobj_t *inflictor,
+		mobj_t *source,
+		INT32   damage,
+		int     hook_type,
+		Hook_Callback results_handler
+){
+	Hook_State hook;
+	if (prepare_mobj_hook(&hook, 0, hook_type, target))
+	{
+		LUA_PushUserdata(gL, target, META_MOBJ);
+		LUA_PushUserdata(gL, inflictor, META_MOBJ);
+		LUA_PushUserdata(gL, source, META_MOBJ);
+		if (hook_type != MOBJ_HOOK(MobjDeath))
+			lua_pushinteger(gL, damage);
+		call_hooks(&hook, 1, results_handler);
+	}
+	return hook.status;
+}
+
+int LUA_HookShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
+{
+	return damage_hook(target, inflictor, source, damage,
+					MOBJ_HOOK(ShouldDamage), res_force);
+}
+
+int LUA_HookMobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
+{
+	return damage_hook(target, inflictor, source, damage,
+					   MOBJ_HOOK(MobjDamage), res_true);
+}
+
+int LUA_HookMobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source)
+{
+	return damage_hook(target, inflictor, source, 0,
+					MOBJ_HOOK(MobjDeath), res_true);
+}
+
+typedef struct {
+	mobj_t   * tails;
+	ticcmd_t * cmd;
+} BotAI_State;
+
+FUNCINLINE static ATTRINLINE boolean checkbotkey(const char *field)
+{
+	return lua_toboolean(gL, -1) && strcmp(lua_tostring(gL, -2), field) == 0;
+}
+
+static void res_botai(Hook_State *hook)
+{
+	BotAI_State *botai = hook->userdata;
+
+	int k[8];
+
+	int fields = 0;
+
+	// This turns forward, backward, left, right, jump, and spin into a proper ticcmd for tails.
+	if (lua_istable(gL, -8)) {
+		lua_pushnil(gL); // key
+		while (lua_next(gL, -9)) {
+#define CHECK(n, f) (checkbotkey(f) ? (k[(n)-1] = 1) : 0)
+			if (
+					CHECK(1,    "forward") || CHECK(2,    "backward") ||
+					CHECK(3,       "left") || CHECK(4,       "right") ||
+					CHECK(5, "strafeleft") || CHECK(6, "straferight") ||
+					CHECK(7,       "jump") || CHECK(8,        "spin")
+			){
+				if (8 <= ++fields)
+				{
+					lua_pop(gL, 2); // pop key and value
+					break;
 				}
-				lua_pushstring(gL, msg); // msg
-				if (mute)
-					lua_pushboolean(gL, true); // the message was supposed to be eaten by spamprotecc.
-				else
-					lua_pushboolean(gL, false);
 			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -6);
-			lua_pushvalue(gL, -6);
-			lua_pushvalue(gL, -6);
-			lua_pushvalue(gL, -6);
-			lua_pushvalue(gL, -6);
-			if (lua_pcall(gL, 5, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
 
-	lua_settop(gL, 0);
-	return hooked;
+			lua_pop(gL, 1); // pop value
+#undef CHECK
+		}
+	} else {
+		while (fields < 8)
+		{
+			k[fields] = lua_toboolean(gL, -8 + fields);
+			fields++;
+		}
+	}
+
+	B_KeysToTiccmd(botai->tails, botai->cmd,
+			k[0],k[1],k[2],k[3],k[4],k[5],k[6],k[7]);
+
+	hook->status = true;
 }
 
-// Hook for hurt messages
-boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source)
+int LUA_HookBotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_HurtMsg/8] & (1<<(hook_HurtMsg%8))))
-		return false;
+	const char *skin = ((skin_t *)tails->skin)->name;
 
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
+	Hook_State hook;
+	BotAI_State botai;
 
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
+	if (prepare_string_hook(&hook, false, STRING_HOOK(BotAI), skin))
+	{
+		LUA_PushUserdata(gL, sonic, META_MOBJ);
+		LUA_PushUserdata(gL, tails, META_MOBJ);
 
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_HurtMsg
-		&& (hookp->s.mt == MT_NULL || (inflictor && hookp->s.mt == inflictor->type)))
-		{
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, player, META_PLAYER);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
+		botai.tails = tails;
+		botai.cmd   = cmd;
 
-	lua_settop(gL, 0);
-	return hooked;
+		hook.userdata = &botai;
+
+		call_hooks(&hook, 8, res_botai);
+	}
+
+	return hook.status;
 }
 
-void LUAh_NetArchiveHook(lua_CFunction archFunc)
+void LUA_HookLinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
 {
-	hook_p hookp;
-	int errorhandlerindex;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_NetVars/8] & (1<<(hook_NetVars%8))))
-		return;
-
-	// stack: tables
-	I_Assert(lua_gettop(gL) > 0);
-	I_Assert(lua_istable(gL, -1));
-
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-	errorhandlerindex = lua_gettop(gL);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// tables becomes an upvalue of archFunc
-	lua_pushvalue(gL, -3);
-	lua_pushcclosure(gL, archFunc, 1);
-	// stack: tables, archFunc
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_NetVars)
-		{
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -2); // archFunc
-			if (lua_pcall(gL, 1, 0, errorhandlerindex)) {
-				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-			}
-		}
-
-	lua_pop(gL, 3); // Pop archFunc, error handler and hooks table
-	// stack: tables
+	Hook_State hook;
+	if (prepare_string_hook
+			(&hook, 0, STRING_HOOK(LinedefExecute), line->text))
+	{
+		LUA_PushUserdata(gL, line, META_LINE);
+		LUA_PushUserdata(gL, mo, META_MOBJ);
+		LUA_PushUserdata(gL, sector, META_SECTOR);
+		ps_lua_mobjhooks.value.i += call_hooks(&hook, 0, res_none);
+	}
 }
 
-void LUAh_PlayerQuit(player_t *plr, int reason)
+int LUA_HookPlayerMsg(int source, int target, int flags, char *msg, int mute)
 {
-	hook_p hookp;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_PlayerQuit/8] & (1<<(hook_PlayerQuit%8))))
-		return;
+	Hook_State hook;
+	if (prepare_hook(&hook, false, HOOK(PlayerMsg)))
+	{
+		LUA_PushUserdata(gL, &players[source], META_PLAYER); // Source player
+		if (flags & 2 /*HU_CSAY*/) { // csay TODO: make HU_CSAY accessible outside hu_stuff.c
+			lua_pushinteger(gL, 3); // type
+			lua_pushnil(gL); // target
+		} else if (target == -1) { // sayteam
+			lua_pushinteger(gL, 1); // type
+			lua_pushnil(gL); // target
+		} else if (target == 0) { // say
+			lua_pushinteger(gL, 0); // type
+			lua_pushnil(gL); // target
+		} else { // sayto
+			lua_pushinteger(gL, 2); // type
+			LUA_PushUserdata(gL, &players[target-1], META_PLAYER); // target
+		}
+		lua_pushstring(gL, msg); // msg
+		if (mute)
+			lua_pushboolean(gL, true); // the message was supposed to be eaten by spamprotecc.
+		else
+			lua_pushboolean(gL, false);
+		call_hooks(&hook, 1, res_true);
+	}
+	return hook.status;
+}
 
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
+int LUA_HookHurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source)
+{
+	Hook_State hook;
+	if (prepare_mobj_hook(&hook, false, MOBJ_HOOK(HurtMsg), inflictor))
+	{
+		LUA_PushUserdata(gL, player, META_PLAYER);
+		LUA_PushUserdata(gL, inflictor, META_MOBJ);
+		LUA_PushUserdata(gL, source, META_MOBJ);
+		call_hooks(&hook, 1, res_true);
+	}
+	return hook.status;
+}
 
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
+void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save)
+{
+	const hook_t * map = &hookIds[HOOK(NetVars)];
+	Hook_State hook;
+	/* this is a remarkable case where the stack isn't reset */
+	if (map->numHooks > 0)
+	{
+		// stack: tables
+		I_Assert(lua_gettop(gL) > 0);
+		I_Assert(lua_istable(gL, -1));
 
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_PlayerQuit)
+		push_error_handler();
+		lua_insert(gL, EINDEX);
+
+		begin_hook_values(&hook);
+
+		// tables becomes an upvalue of archFunc
+		lua_pushvalue(gL, -1);
+		lua_pushlightuserdata(gL, save);
+		lua_pushcclosure(gL, archFunc, 2);
+		// stack: tables, savebuffer_t, archFunc
+
+		init_hook_call(&hook, 0, res_none);
+		call_mapped(&hook, map);
+
+		lua_pop(gL, 1); // pop archFunc
+		lua_remove(gL, EINDEX); // pop error handler
+		// stack: tables
+	}
+}
+
+void LUA_HookPlayerQuit(player_t *plr, int reason)
+{
+	Hook_State hook;
+	if (prepare_hook(&hook, 0, HOOK(PlayerQuit)))
+	{
+		LUA_PushUserdata(gL, plr, META_PLAYER); // Player that quit
+		lua_pushinteger(gL, reason); // Reason for quitting
+		call_hooks(&hook, 0, res_none);
+	}
+}
+
+boolean hook_cmd_running = false;
+
+static void update_music_name(struct MusicChange *musicchange)
+{
+	size_t length;
+	const char * new = lua_tolstring(gL, -6, &length);
+
+	if (length < 7)
+	{
+		strcpy(musicchange->newname, new);
+		lua_pushvalue(gL, -6);/* may as well keep it for next call */
+	}
+	else
+	{
+		memcpy(musicchange->newname, new, 6);
+		musicchange->newname[6] = '\0';
+		lua_pushlstring(gL, new, 6);
+	}
+
+	lua_replace(gL, -7);
+}
+
+static void res_musicchange(Hook_State *hook)
+{
+	struct MusicChange *musicchange = hook->userdata;
+
+	// output 1: true, false, or string musicname override
+	if (lua_isstring(gL, -6))
+		update_music_name(musicchange);
+	else if (lua_isboolean(gL, -6) && lua_toboolean(gL, -6))
+		hook->status = true;
+
+	// output 2: mflags override
+	if (lua_isnumber(gL, -5))
+		*musicchange->mflags = lua_tonumber(gL, -5);
+	// output 3: looping override
+	if (lua_isboolean(gL, -4))
+		*musicchange->looping = lua_toboolean(gL, -4);
+	// output 4: position override
+	if (lua_isnumber(gL, -3))
+		*musicchange->position = lua_tonumber(gL, -3);
+	// output 5: prefadems override
+	if (lua_isnumber(gL, -2))
+		*musicchange->prefadems = lua_tonumber(gL, -2);
+	// output 6: fadeinms override
+	if (lua_isnumber(gL, -1))
+		*musicchange->fadeinms = lua_tonumber(gL, -1);
+}
+
+int LUA_HookMusicChange(const char *oldname, struct MusicChange *param)
+{
+	const int type = HOOK(MusicChange);
+	const hook_t * map = &hookIds[type];
+
+	Hook_State hook;
+
+	int k;
+
+	if (prepare_hook(&hook, false, type))
+	{
+		init_hook_call(&hook, 6, res_musicchange);
+		hook.values = 7;/* values pushed later */
+		hook.userdata = param;
+
+		lua_pushstring(gL, oldname);/* the only constant value */
+		lua_pushstring(gL, param->newname);/* semi constant */
+
+		for (k = 0; k < map->numHooks; ++k)
 		{
-		    if (lua_gettop(gL) == 2)
-		    {
-		        LUA_PushUserdata(gL, plr, META_PLAYER); // Player that quit
-		        lua_pushinteger(gL, reason); // Reason for quitting
-		    }
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
+			get_hook(&hook, map->ids, k);
+
 			lua_pushvalue(gL, -3);
 			lua_pushvalue(gL, -3);
-			if (lua_pcall(gL, 2, 0, 1)) {
-				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-			}
+			lua_pushinteger(gL, *param->mflags);
+			lua_pushboolean(gL, *param->looping);
+			lua_pushinteger(gL, *param->position);
+			lua_pushinteger(gL, *param->prefadems);
+			lua_pushinteger(gL, *param->fadeinms);
+
+			call_single_hook_no_copy(&hook);
 		}
 
-	lua_settop(gL, 0);
+		lua_settop(gL, 0);
+	}
+
+	return hook.status;
 }
 
-// Hook for music changes
-boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping,
-	UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms)
+int LUA_HookMusicCredit(musicdef_t *musicdef)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
+	Hook_State hook;
+	if (prepare_hook(&hook, 0, HOOK(MusicCredit)))
+	{
+		LUA_PushUserdata(gL, musicdef, META_MUSICDEF);
+		call_hooks(&hook, 1, res_true);
+	}
 
-	if (!gL || !(hooksAvailable[hook_MusicChange/8] & (1<<(hook_MusicChange%8))))
-		return false;
+	return hook.status;
+}
 
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_MusicChange)
-		{
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushstring(gL, oldname);
-			lua_pushstring(gL, newname);
-			lua_pushinteger(gL, *mflags);
-			lua_pushboolean(gL, *looping);
-			lua_pushinteger(gL, *position);
-			lua_pushinteger(gL, *prefadems);
-			lua_pushinteger(gL, *fadeinms);
-			if (lua_pcall(gL, 7, 6, 1)) {
-				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL,-1));
-				lua_pop(gL, 1);
-				continue;
-			}
-
-			// output 1: true, false, or string musicname override
-			if (lua_isboolean(gL, -6) && lua_toboolean(gL, -6))
-				hooked = true;
-			else if (lua_isstring(gL, -6))
-				strncpy(newname, lua_tostring(gL, -6), 7);
-			// output 2: mflags override
-			if (lua_isnumber(gL, -5))
-				*mflags = lua_tonumber(gL, -5);
-			// output 3: looping override
-			if (lua_isboolean(gL, -4))
-				*looping = lua_toboolean(gL, -4);
-			// output 4: position override
-			if (lua_isnumber(gL, -3))
-				*position = lua_tonumber(gL, -3);
-			// output 5: prefadems override
-			if (lua_isnumber(gL, -2))
-				*prefadems = lua_tonumber(gL, -2);
-			// output 6: fadeinms override
-			if (lua_isnumber(gL, -1))
-				*fadeinms = lua_tonumber(gL, -1);
-
-			lua_pop(gL, 6);
-		}
-
-	lua_settop(gL, 0);
-	newname[6] = 0;
-	return hooked;
+static int kartdamage_hook
+(
+		player_t *player,
+		mobj_t   *inflictor,
+		mobj_t   *source,
+		int       hook_type,
+		Hook_Callback results_handler
+){
+	Hook_State hook;
+	if (prepare_hook(&hook, 0, hook_type))
+	{
+		LUA_PushUserdata(gL, player, META_PLAYER);
+		LUA_PushUserdata(gL, inflictor, META_MOBJ);
+		LUA_PushUserdata(gL, source, META_MOBJ);
+		call_hooks(&hook, 1, results_handler);
+	}
+	return hook.status;
 }
 
 // Hook for K_SpinPlayer. Determines if yes or no we should get damaged reguardless of circumstances.
-UINT8 LUAh_ShouldSpin(player_t *player, mobj_t *inflictor, mobj_t *source)
+int LUA_HookShouldSpin(player_t *player, mobj_t *inflictor, mobj_t *source)
 {
-	hook_p hookp;
-	UINT8 shouldDamage = 0; // 0 = default, 1 = force yes, 2 = force no.
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_ShouldSpin/8] & (1<<(hook_ShouldSpin%8))))
-		return 0;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// We can afford not to check for mobj type because it will always be MT_PLAYER in this case.
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_ShouldSpin)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, player, META_PLAYER);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (!lua_isnil(gL, -1))
-			{
-				if (lua_toboolean(gL, -1))
-					shouldDamage = 1; // Force yes
-				else
-					shouldDamage = 2; // Force no
-			}
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return shouldDamage;
+	return kartdamage_hook(player, inflictor, source, HOOK(ShouldSpin), res_force);
 }
 
 // Hook for K_ExplodePlayer. Determines if yes or no we should get damaged reguardless of circumstances.
-UINT8 LUAh_ShouldExplode(player_t *player, mobj_t *inflictor, mobj_t *source)
+int LUA_HookShouldExplode(player_t *player, mobj_t *inflictor, mobj_t *source)
 {
-	hook_p hookp;
-	UINT8 shouldDamage = 0; // 0 = default, 1 = force yes, 2 = force no.
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_ShouldExplode/8] & (1<<(hook_ShouldExplode%8))))
-		return 0;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// We can afford not to check for mobj type because it will always be MT_PLAYER in this case.
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_ShouldExplode)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, player, META_PLAYER);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (!lua_isnil(gL, -1))
-			{
-				if (lua_toboolean(gL, -1))
-					shouldDamage = 1; // Force yes
-				else
-					shouldDamage = 2; // Force no
-			}
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return shouldDamage;
+	return kartdamage_hook(player, inflictor, source, HOOK(ShouldExplode), res_force);
 }
 
 // Hook for K_SquishPlayer. Determines if yes or no we should get damaged reguardless of circumstances.
-UINT8 LUAh_ShouldSquish(player_t *player, mobj_t *inflictor, mobj_t *source)
+int LUA_HookShouldSquish(player_t *player, mobj_t *inflictor, mobj_t *source)
 {
-	hook_p hookp;
-	UINT8 shouldDamage = 0; // 0 = default, 1 = force yes, 2 = force no.
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_ShouldSquish/8] & (1<<(hook_ShouldSquish%8))))
-		return 0;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// We can afford not to check for mobj type because it will always be MT_PLAYER in this case.
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_ShouldSquish)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, player, META_PLAYER);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (!lua_isnil(gL, -1))
-			{
-				if (lua_toboolean(gL, -1))
-					shouldDamage = 1; // Force yes
-				else
-					shouldDamage = 2; // Force no
-			}
-			lua_pop(gL, 1);
-		}
-
-	lua_settop(gL, 0);
-	return shouldDamage;
+	return kartdamage_hook(player, inflictor, source, HOOK(ShouldSquish), res_force);
 }
 
 // Hook for K_SpinPlayer. This is used when the player has actually been spun out, but before anything has actually been done. This allows Lua to overwrite the behavior or to just perform actions.
-boolean LUAh_PlayerSpin(player_t *player, mobj_t *inflictor, mobj_t *source)
+boolean LUA_HookPlayerSpin(player_t *player, mobj_t *inflictor, mobj_t *source)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_PlayerSpin/8] & (1<<(hook_PlayerSpin%8))))
-		return 0;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// We can afford not to look for target->type because it will always be MT_PLAYER.
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_PlayerSpin)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, player, META_PLAYER);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-	lua_settop(gL, 0);
-	return hooked;
+	return kartdamage_hook(player, inflictor, source, HOOK(PlayerSpin), res_true);
 }
 
 // Hook for K_SquishPlayer. This is used when the player has actually been spun out, but before anything has actually been done. This allows Lua to overwrite the behavior or to just perform actions.
-boolean LUAh_PlayerSquish(player_t *player, mobj_t *inflictor, mobj_t *source)
+boolean LUA_HookPlayerSquish(player_t *player, mobj_t *inflictor, mobj_t *source)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_PlayerSquish/8] & (1<<(hook_PlayerSquish%8))))
-		return 0;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// We can afford not to look for target->type because it will always be MT_PLAYER.
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_PlayerSquish)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, player, META_PLAYER);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-	lua_settop(gL, 0);
-	return hooked;
+	return kartdamage_hook(player, inflictor, source, HOOK(PlayerSquish), res_true);
 }
 
 // Hook for K_ExplodePlayer. This is used when the player has actually been spun out, but before anything has actually been done. This allows Lua to overwrite the behavior or to just perform actions.
-boolean LUAh_PlayerExplode(player_t *player, mobj_t *inflictor, mobj_t *source)
+boolean LUA_HookPlayerExplode(player_t *player, mobj_t *inflictor, mobj_t *source)
 {
-	hook_p hookp;
-	boolean hooked = false;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_PlayerExplode/8] & (1<<(hook_PlayerExplode%8))))
-		return 0;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// We can afford not to look for target->type because it will always be MT_PLAYER.
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_PlayerExplode)
-		{
-			ps_lua_mobjhooks.value.i++;
-			if (lua_gettop(gL) == 2)
-			{
-				LUA_PushUserdata(gL, player, META_PLAYER);
-				LUA_PushUserdata(gL, inflictor, META_MOBJ);
-				LUA_PushUserdata(gL, source, META_MOBJ);
-			}
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			lua_pushvalue(gL, -4);
-			if (lua_pcall(gL, 3, 1, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-			if (lua_toboolean(gL, -1))
-				hooked = true;
-			lua_pop(gL, 1);
-		}
-	lua_settop(gL, 0);
-	return hooked;
-}
-
-void LUAh_ServerJoin(void)
-{
-	hook_p hookp;
-	int HOOKSINDEX;
-	if (!gL || !(hooksAvailable[hook_ServerJoin/8] & (1<<(hook_ServerJoin%8))))
-		return;
-
-	lua_settop(gL, 0);
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "hooks");
-	HOOKSINDEX = lua_gettop(gL);
-	I_Assert(lua_istable(L, HOOKSINDEX));
-
-	// We can afford not to look for target->type because it will always be MT_PLAYER.
-
-	for (hookp = roothook; hookp; hookp = hookp->next)
-		if (hookp->type == hook_ServerJoin)
-		{
-			lua_rawgeti(gL, HOOKSINDEX, hookp->id);
-			if (lua_pcall(gL, 0, 0, 1)) {
-				if (!hookp->error || cv_debug & DBG_LUA)
-					CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
-				lua_pop(gL, 1);
-				hookp->error = true;
-				continue;
-			}
-		}
-	lua_settop(gL, 0);
+	return kartdamage_hook(player, inflictor, source, HOOK(PlayerExplode), res_true);
 }
diff --git a/src/lua_hud.h b/src/lua_hud.h
index 5d1f41c83..ea4d8ee02 100644
--- a/src/lua_hud.h
+++ b/src/lua_hud.h
@@ -32,6 +32,7 @@ enum hud {
 	hud_wanted,
 	hud_speedometer,
 	hud_statdisplay,
+	hud_inputdisplay,
 	hud_nametags,
 	hud_driftgauge,
 	hud_freeplay,
@@ -50,9 +51,6 @@ extern boolean hud_interplatch; // string mode was toggled
 
 boolean LUA_HudEnabled(enum hud option);
 
-void LUAh_GameHUD(huddrawlist_h list);
-void LUAh_ScoresHUD(huddrawlist_h list);
-void LUAh_IntermissionHUD(huddrawlist_h list);
-void LUAh_VoteHUD(huddrawlist_h list);
+void LUA_SetHudHook(int hook, huddrawlist_h list);
 
 #endif // __LUA_HUD_H__
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 0af7f2c36..98120cebf 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -24,10 +24,16 @@
 #include "w_wad.h"
 #include "z_zone.h"
 #include "k_kart.h"
+#include "k_hud.h" // SRB2kart
 
 #include "lua_script.h"
 #include "lua_libs.h"
 #include "lua_hud.h"
+#include "lua_hook.h"
+
+#ifdef ROTSPRITE
+#include "r_patchrotation.h"
+#endif
 
 #define HUDONLY if (!hud_running) return luaL_error(L, "HUD rendering code should not be called outside of rendering hooks!");
 
@@ -40,8 +46,6 @@ boolean hud_interpstring = false;
 boolean hud_interplatch = false;
 static UINT8 hud_enabled[(hud_MAX/8)+1];
 
-static UINT8 hudAvailable; // hud hooks field
-
 static UINT8 camnum = 1;
 
 // must match enum hud in lua_hud.h
@@ -62,6 +66,7 @@ static const char *const hud_disable_options[] = {
 	"wanted",
 	"speedometer",
 	"statdisplay",
+	"inputdisplay",
 	"nametags",
 	"driftgauge",
 	"freeplay",
@@ -93,19 +98,6 @@ static const char *const patch_opt[] = {
 	"topoffset",
 	NULL};
 
-enum hudhook {
-	hudhook_game = 0,
-	hudhook_scores = 1,
-	hudhook_intermission = 2,
-	hudhook_vote = 3,
-};
-static const char *const hudhook_opt[] = {
-	"game",
-	"scores",
-	"intermission",
-	"vote",
-	NULL};
-
 static int patch_fields_ref = LUA_NOREF;
 
 // alignment types for v.drawString
@@ -201,7 +193,8 @@ enum hudoffsets {
 	hudoffsets_check,
 	hudoffsets_minimap,
 	hudoffsets_wanted,
-	hudoffsets_statdisplay
+	hudoffsets_statdisplay,
+	hudoffsets_inputdisplay,
 };
 
 static const char *const hud_offsets_options[] = {
@@ -217,6 +210,7 @@ static const char *const hud_offsets_options[] = {
 	"minimap",
 	"wanted",
 	"statdisplay",
+	"inputdisplay",
 	NULL};
 
 enum huddrawinfo {
@@ -304,9 +298,13 @@ static int patch_get(lua_State *L)
 	patch_t *patch = *((patch_t **)luaL_checkudata(L, 1, META_PATCH));
 	enum patch field = Lua_optoption(L, 2, -1, patch_fields_ref);
 
-	// patches are CURRENTLY always valid, expected to be cached with PU_STATIC
-	// this may change in the future, so patch.valid still exists
-	I_Assert(patch != NULL);
+	if (!patch) {
+		if (field == patch_valid) {
+			lua_pushboolean(L, 0);
+			return 1;
+		}
+		return LUA_ErrInvalid(L, "patch_t");
+	}
 
 	switch (field)
 	{
@@ -314,16 +312,16 @@ static int patch_get(lua_State *L)
 		lua_pushboolean(L, patch != NULL);
 		break;
 	case patch_width:
-		lua_pushinteger(L, SHORT(patch->width));
+		lua_pushinteger(L, patch->width);
 		break;
 	case patch_height:
-		lua_pushinteger(L, SHORT(patch->height));
+		lua_pushinteger(L, patch->height);
 		break;
 	case patch_leftoffset:
-		lua_pushinteger(L, SHORT(patch->leftoffset));
+		lua_pushinteger(L, patch->leftoffset);
 		break;
 	case patch_topoffset:
-		lua_pushinteger(L, SHORT(patch->topoffset));
+		lua_pushinteger(L, patch->topoffset);
 		break;
 	}
 	return 1;
@@ -407,10 +405,22 @@ static int libd_patchExists(lua_State *L)
 static int libd_cachePatch(lua_State *L)
 {
 	HUDONLY
-	LUA_PushUserdata(L, W_CachePatchName(luaL_checkstring(L, 1), PU_STATIC), META_PATCH);
+	LUA_PushUserdata(L, W_CachePatchName(luaL_checkstring(L, 1), PU_PATCH), META_PATCH);
 	return 1;
 }
 
+#ifdef ROTSPRITE
+static int libd_cachePatchRotated(lua_State *L)
+{
+	HUDONLY
+	angle_t rollangle = luaL_checkangle(L, 2);
+	INT32 rot = R_GetRollAngle(rollangle);
+	LUA_PushUserdata(L, W_CachePatchNameRotated(luaL_checkstring(L, 1), rot, PU_PATCH), META_PATCH);
+
+	return 1;
+}
+#endif
+
 // this is structured like getSprite2Patch in vanilla 2.2
 // v.getSpritePatch(skin, sprite, [frame, [angle, [rollangle]]])
 static int libd_getSpritePatch(lua_State *L)
@@ -476,12 +486,16 @@ static int libd_getSpritePatch(lua_State *L)
 	if (skn < 0) // standard sprite
 	{
 		sprdef = &sprites[i];
+#ifdef ROTSPRITE
 		sprinfo = &spriteinfo[i];
+#endif
 	}
 	else // player skin
 	{
 		sprdef = &skins[skn].spritedef;
+#ifdef ROTSPRITE
 		sprinfo = &skins[skn].sprinfo;
+#endif
 	}
 
 	// set frame number
@@ -502,30 +516,33 @@ static int libd_getSpritePatch(lua_State *L)
 	if (angle >= 8) // out of range?
 		angle = (angle & 7); // modulus angle by 8
 
+#ifdef ROTSPRITE
 	// rotsprite?????
-	if (lua_isnumber(L, 4) && (cv_spriteroll.value))
+	if (lua_isnumber(L, 4))
 	{
 		angle_t rollangle = luaL_checkangle(L, 4);
 		INT32 rot = R_GetRollAngle(rollangle);
 
-		if (rot) {
-			patch_t *rotsprite = Patch_GetRotatedSprite(sprframe, frame, angle, sprframe->flip & (1<<angle), false, sprinfo, rot);
+		if (rot)
+		{
+			patch_t *rotsprite = Patch_GetRotatedSprite(sprframe, frame, angle, sprframe->flip & (1<<angle), sprinfo, rot);
 			LUA_PushUserdata(L, rotsprite, META_PATCH);
 			lua_pushboolean(L, false);
 			lua_pushboolean(L, true);
 			return 3;
 		}
 	}
+#endif
 
 	// push both the patch and its "flip" value
-	LUA_PushUserdata(L, W_CachePatchNum(sprframe->lumppat[angle], PU_STATIC), META_PATCH);
+	LUA_PushUserdata(L, W_CachePatchNum(sprframe->lumppat[angle], PU_SPRITE), META_PATCH);
 	lua_pushboolean(L, (sprframe->flip & (1<<angle)) != 0);
 	return 2;
 }
 
 static int libd_draw(lua_State *L)
 {
-	INT32 x, y, flags;
+	INT32 x, y, flags, blend;
 	patch_t *patch;
 	UINT8 *colormap = NULL;
 	huddrawlist_h list;
@@ -534,9 +551,12 @@ static int libd_draw(lua_State *L)
 	x = luaL_checkinteger(L, 1);
 	y = luaL_checkinteger(L, 2);
 	patch = *((patch_t **)luaL_checkudata(L, 3, META_PATCH));
+	if (!patch)
+		return LUA_ErrInvalid(L, "patch_t");
 	flags = luaL_optinteger(L, 4, 0);
 	if (!lua_isnoneornil(L, 5))
 		colormap = *((UINT8 **)luaL_checkudata(L, 5, META_COLORMAP));
+	blend = luaL_optinteger(L, 6, 0);
 
 	flags &= ~V_PARAMMASK; // Don't let crashes happen.
 
@@ -545,16 +565,16 @@ static int libd_draw(lua_State *L)
 	lua_pop(L, 1);
 
 	if (LUA_HUD_IsDrawListValid(list))
-		LUA_HUD_AddDraw(list, x, y, patch, flags, colormap);
+		LUA_HUD_AddDraw(list, x, y, patch, flags, colormap, blend);
 	else
-		V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, flags, patch, colormap);
+		V_DrawBlendingFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, flags, patch, colormap, blend);
 	return 0;
 }
 
 static int libd_drawScaled(lua_State *L)
 {
 	fixed_t x, y, scale;
-	INT32 flags;
+	INT32 flags, blend;
 	patch_t *patch;
 	UINT8 *colormap = NULL;
 	huddrawlist_h list;
@@ -566,9 +586,12 @@ static int libd_drawScaled(lua_State *L)
 	if (scale < 0)
 		return luaL_error(L, "negative scale");
 	patch = *((patch_t **)luaL_checkudata(L, 4, META_PATCH));
+	if (!patch)
+		return LUA_ErrInvalid(L, "patch_t");
 	flags = luaL_optinteger(L, 5, 0);
 	if (!lua_isnoneornil(L, 6))
 		colormap = *((UINT8 **)luaL_checkudata(L, 6, META_COLORMAP));
+	blend = luaL_optinteger(L, 7, 0);
 
 	flags &= ~V_PARAMMASK; // Don't let crashes happen.
 
@@ -577,9 +600,9 @@ static int libd_drawScaled(lua_State *L)
 	lua_pop(L, 1);
 
 	if (LUA_HUD_IsDrawListValid(list))
-		LUA_HUD_AddDrawScaled(list, x, y, scale, patch, flags, colormap);
+		LUA_HUD_AddDrawScaled(list, x, y, scale, patch, flags, colormap, blend);
 	else
-		V_DrawFixedPatch(x, y, scale, flags, patch, colormap);
+		V_DrawBlendingFixedPatch(x, y, scale, flags, patch, colormap, blend);
 	return 0;
 }
 
@@ -591,75 +614,52 @@ static int libd_drawOnMinimap(lua_State *L)
 	UINT8 *colormap = NULL;	// do we want to colormap this patch?
 	boolean centered;	// the patch is centered and doesn't need readjusting on x/y coordinates.
 	huddrawlist_h list;
-
-	// variables used to replicate k_kart's mmap drawer:
-	INT32 lumpnum;
-	patch_t *AutomapPic;
-	INT32 mx, my;
-	INT32 splitflags, minimaptrans;
-
-	// base position of the minimap which also takes splits into account:
-	INT32 MM_X, MM_Y;
+	patch_t *AutomapPic = NULL;
+	drawinfo_t info;
 
 	// variables used for actually drawing the icon:
+	INT32 splitflags, minimaptrans;
 	fixed_t amnumxpos, amnumypos;
-	INT32 amxpos, amypos;
+	fixed_t amxpos, amypos;
+	INT32 mm_x, mm_y;
+	fixed_t patchw = 0, patchh = 0;
 
-	node_t *bsp = &nodes[numnodes-1];
-	fixed_t maxx, minx, maxy, miny;
+	HUDONLY // only run this function in hud hooks
 
-	fixed_t mapwidth, mapheight;
-	fixed_t xoffset, yoffset;
-	fixed_t xscale, yscale, zoom;
-	fixed_t patchw, patchh;
+	// Draw the HUD only when playing in a level.
+	// hu_stuff needs this, unlike st_stuff.
+	if (gamestate != GS_LEVEL)
+		return 0;
+
+	if (stplyrnum != 0)
+		return 0;
+
+	AutomapPic = minimapinfo.minimap_pic;
+
+	if (!AutomapPic)
+	{
+		return 0; // no pic, just get outta here
+	}
+
+	minimaptrans = K_getMinimapTrans();
+
+	// Exit early if it wouldn't draw anyway.
+	if (minimaptrans == -1)
+		return 0;
 
-	HUDONLY	// only run this function in hud hooks
 	x = luaL_checkinteger(L, 1);
 	y = luaL_checkinteger(L, 2);
 	scale = luaL_checkinteger(L, 3);
 	patch = *((patch_t **)luaL_checkudata(L, 4, META_PATCH));
+	if (!patch)
+		return LUA_ErrInvalid(L, "patch_t");
 	if (!lua_isnoneornil(L, 5))
 		colormap = *((UINT8 **)luaL_checkudata(L, 5, META_COLORMAP));
 	centered = lua_optboolean(L, 6);
 
-	// replicate exactly what source does for its minimap drawer; AKA hardcoded garbo.
+	K_getMinimapDrawinfo(&info);
 
-	// first, check what position the mmap is supposed to be in (pasted from k_kart.c):
-	MM_X = BASEVIDWIDTH - 50 + cv_mini_xoffset.value;		// 270
-	MM_Y = (BASEVIDHEIGHT/2)-16 + cv_mini_yoffset.value; //  84
-	if (splitscreen)
-	{
-		MM_Y = (BASEVIDHEIGHT/2) + cv_mini_yoffset.value;
-		if (splitscreen > 1)	// 3P : bottom right
-		{
-			MM_X = (3*BASEVIDWIDTH/4) + cv_mini_xoffset.value;
-			MM_Y = (3*BASEVIDHEIGHT/4) + cv_mini_yoffset.value;
-
-			if (splitscreen > 2) // 4P: centered
-			{
-				MM_X = (BASEVIDWIDTH/2) + cv_mini_xoffset.value;
-				MM_Y = (BASEVIDHEIGHT/2) + cv_mini_yoffset.value;
-			}
-		}
-	}
-
-	// splitscreen flags
-	splitflags = (splitscreen == 3 ? 0 : V_SNAPTORIGHT);	// flags should only be 0 when it's centered (4p split)
-
-	// translucency:
-	if (timeinmap > 105)
-	{
-		minimaptrans = cv_kartminimap.value;
-		if (timeinmap <= 113)
-			minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105);
-		if (!minimaptrans)
-			return 0;
-	}
-	else
-		return 0;
-
-
-	minimaptrans = ((10-minimaptrans)<<FF_TRANSSHIFT);
+	splitflags = info.flags;
 	splitflags |= minimaptrans;
 
 	if (!(splitscreen == 2))
@@ -671,112 +671,69 @@ static int libd_drawOnMinimap(lua_State *L)
 	splitflags &= ~V_HUDTRANSHALF;
 	splitflags |= V_HUDTRANS;
 
-	// Draw the HUD only when playing in a level.
-	// hu_stuff needs this, unlike st_stuff.
-	if (gamestate != GS_LEVEL)
-		return 0;
-
-	if (stplyr != &players[displayplayers[0]])
-		return 0;
-
-	lumpnum = W_CheckNumForName(va("%sR", G_BuildMapName(gamemap)));
-
-	if (lumpnum != -1)
-		AutomapPic = W_CachePatchName(va("%sR", G_BuildMapName(gamemap)), PU_HUDGFX);
-	else
-		return 0; // no pic, just get outta here
-
-	mx = MM_X - (AutomapPic->width/2);
-	my = MM_Y - (AutomapPic->height/2);
+	// Handle offsets and stuff.
+	mm_x = info.x - (AutomapPic->width/2);
+	mm_y = info.y - (AutomapPic->height/2);
 
 	// let offsets transfer to the heads, too!
 	if (encoremode)
-		mx += SHORT(AutomapPic->leftoffset);
+	{
+		mm_x += AutomapPic->leftoffset;
+	}
 	else
-		mx -= SHORT(AutomapPic->leftoffset);
-	my -= SHORT(AutomapPic->topoffset);
+	{
+		mm_x -= AutomapPic->leftoffset;
+	}
 
-	// now that we have replicated this behavior, we can draw an icon from our supplied x, y coordinates by replicating k_kart.c's totally understandable uncommented code!!!
+	mm_y -= AutomapPic->topoffset;
 
-	// get map boundaries using nodes
-	maxx = maxy = INT32_MAX;
-	minx = miny = INT32_MIN;
-	minx = bsp->bbox[0][BOXLEFT];
-	maxx = bsp->bbox[0][BOXRIGHT];
-	miny = bsp->bbox[0][BOXBOTTOM];
-	maxy = bsp->bbox[0][BOXTOP];
+	// patch is supposedly already centered, don't butt in.
+	if (!centered)
+	{
+		// scale patch coords
+		patchw = (patch->width * scale / 2);
+		patchh = (patch->height * scale / 2);
+	}
 
-	if (bsp->bbox[1][BOXLEFT] < minx)
-		minx = bsp->bbox[1][BOXLEFT];
-	if (bsp->bbox[1][BOXRIGHT] > maxx)
-		maxx = bsp->bbox[1][BOXRIGHT];
-	if (bsp->bbox[1][BOXBOTTOM] < miny)
-		miny = bsp->bbox[1][BOXBOTTOM];
-	if (bsp->bbox[1][BOXTOP] > maxy)
-		maxy = bsp->bbox[1][BOXTOP];
-
-	// You might be wondering why these are being bitshift here
-	// it's because mapwidth and height would otherwise overflow for maps larger than half the size possible...
-	// map boundaries and sizes will ALWAYS be whole numbers thankfully
-	// later calculations take into consideration that these are actually not in terms of FRACUNIT though
-	minx >>= FRACBITS;
-	maxx >>= FRACBITS;
-	miny >>= FRACBITS;
-	maxy >>= FRACBITS;
-
-	// these are our final map boundaries:
-	mapwidth = maxx - minx;
-	mapheight = maxy - miny;
-
-	// These should always be small enough to be bitshift back right now
-	xoffset = (minx + mapwidth/2)<<FRACBITS;
-	yoffset = (miny + mapheight/2)<<FRACBITS;
-
-	xscale = FixedDiv(AutomapPic->width, mapwidth);
-	yscale = FixedDiv(AutomapPic->height, mapheight);
-	zoom = FixedMul(min(xscale, yscale), FRACUNIT-FRACUNIT/20);
-
-	amnumxpos = (FixedMul(x, zoom) - FixedMul(xoffset, zoom));
-	amnumypos = -(FixedMul(y, zoom) - FixedMul(yoffset, zoom));
+	amnumxpos = (FixedMul(x, minimapinfo.zoom) - minimapinfo.offs_x);
+	amnumypos = -(FixedMul(y, minimapinfo.zoom) - minimapinfo.offs_y);
 
 	if (encoremode)
+	{
 		amnumxpos = -amnumxpos;
+	}
 
-	// scale patch coords
-	patchw = patch->width*scale /2;
-	patchh = patch->height*scale /2;
+	amxpos = amnumxpos + ((mm_x + AutomapPic->width / 2)<<FRACBITS) - patchw;
+	amypos = amnumypos + ((mm_y + AutomapPic->height / 2)<<FRACBITS) - patchh;
 
-	if (centered)
-		patchw = patchh = 0;	// patch is supposedly already centered, don't butt in.
-
-	amxpos = amnumxpos + ((mx + AutomapPic->width/2)<<FRACBITS) - patchw;
-	amypos = amnumypos + ((my + AutomapPic->height/2)<<FRACBITS) - patchh;
+	if (cv_minihead.value)
+	{
+		amxpos += patchw / 2;
+		amypos += patchh / 2;
+		scale /= 2;
+	}
 
 	// and NOW we can FINALLY DRAW OUR GOD DAMN PATCH :V
 	lua_getfield(L, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
 	list = (huddrawlist_h) lua_touserdata(L, -1);
 	lua_pop(L, 1);
 
-	if (LUA_HUD_IsDrawListValid(list)){
-		if (cv_minihead.value)
-			LUA_HUD_AddDrawScaled(list, amxpos, amypos, scale/2, patch, splitflags, colormap);
-		else
-			LUA_HUD_AddDrawScaled(list, amxpos, amypos, scale, patch, splitflags, colormap);
-	}else{
-		if (cv_minihead.value)
-			V_DrawFixedPatch(amxpos, amypos, scale/2, splitflags, patch, colormap);
-		else
-			V_DrawFixedPatch(amxpos, amypos, scale, splitflags, patch, colormap);
+	if (LUA_HUD_IsDrawListValid(list))
+	{
+		LUA_HUD_AddDrawScaled(list, amxpos, amypos, scale, patch, splitflags, colormap, 0);
+	}
+	else
+	{
+		V_DrawFixedPatch(amxpos, amypos, scale, splitflags, patch, colormap);
 	}
 
-	
 	return 0;
 }
 
 static int libd_drawStretched(lua_State *L)
 {
 	fixed_t x, y, hscale, vscale;
-	INT32 flags;
+	INT32 flags, blend;
 	patch_t *patch;
 	UINT8 *colormap = NULL;
 	huddrawlist_h list;
@@ -791,9 +748,12 @@ static int libd_drawStretched(lua_State *L)
 	if (vscale < 0)
 		return luaL_error(L, "negative vertical scale");
 	patch = *((patch_t **)luaL_checkudata(L, 5, META_PATCH));
+	if (!patch)
+		return LUA_ErrInvalid(L, "patch_t");
 	flags = luaL_optinteger(L, 6, 0);
 	if (!lua_isnoneornil(L, 7))
 		colormap = *((UINT8 **)luaL_checkudata(L, 7, META_COLORMAP));
+	blend = luaL_optinteger(L, 8, 0);
 
 	flags &= ~V_PARAMMASK; // Don't let crashes happen.
 
@@ -802,9 +762,9 @@ static int libd_drawStretched(lua_State *L)
 	lua_pop(L, 1);
 
 	if (LUA_HUD_IsDrawListValid(list))
-		LUA_HUD_AddDrawStretched(list, x, y, hscale, vscale, patch, flags, colormap);
+		LUA_HUD_AddDrawStretched(list, x, y, hscale, vscale, patch, flags, colormap, blend);
 	else
-		V_DrawStretchyFixedPatch(x, y, hscale, vscale, flags, patch, colormap);
+		V_DrawStretchyFixedPatch(x, y, hscale, vscale, flags, patch, colormap, blend);
 	return 0;
 }
 
@@ -963,35 +923,37 @@ static int libd_drawString(lua_State *L)
 	if (LUA_HUD_IsDrawListValid(list))
 		LUA_HUD_AddDrawString(list, x, y, str, flags, align);
 	else
-	switch(align)
 	{
-	// hu_font
-	case align_left:
-		V_DrawString(x, y, flags, str);
-		break;
-	case align_center:
-		V_DrawCenteredString(x, y, flags, str);
-		break;
-	case align_right:
-		V_DrawRightAlignedString(x, y, flags, str);
-		break;
-	case align_fixed:
-		V_DrawStringAtFixed(x, y, flags, str);
-		break;
-	// hu_font, 0.5x scale
-	case align_small:
-		V_DrawSmallString(x, y, flags, str);
-		break;
-	case align_smallright:
-		V_DrawRightAlignedSmallString(x, y, flags, str);
-		break;
-	// tny_font
-	case align_thin:
-		V_DrawThinString(x, y, flags, str);
-		break;
-	case align_thinright:
-		V_DrawRightAlignedThinString(x, y, flags, str);
-		break;
+		switch(align)
+		{
+			// hu_font
+			case align_left:
+				V_DrawString(x, y, flags, str);
+				break;
+			case align_center:
+				V_DrawCenteredString(x, y, flags, str);
+				break;
+			case align_right:
+				V_DrawRightAlignedString(x, y, flags, str);
+				break;
+			case align_fixed:
+				V_DrawStringAtFixed(x, y, flags, str);
+				break;
+			// hu_font, 0.5x scale
+			case align_small:
+				V_DrawSmallString(x, y, flags, str);
+				break;
+			case align_smallright:
+				V_DrawRightAlignedSmallString(x, y, flags, str);
+				break;
+			// tny_font
+			case align_thin:
+				V_DrawThinString(x, y, flags, str);
+				break;
+			case align_thinright:
+				V_DrawRightAlignedThinString(x, y, flags, str);
+				break;
+		}
 	}
 	return 0;
 }
@@ -1078,7 +1040,8 @@ static int libd_getColorHudPatch(lua_State *L)
 	UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
 	boolean small, dark;
 
-	switch (option) {
+	switch (option)
+	{
 		case hudpatch_item:
 			small = lua_optboolean(L, 2);
 			dark = lua_optboolean(L, 3);
@@ -1226,6 +1189,10 @@ static int libd_interpLatch(lua_State *L)
 static luaL_Reg lib_draw[] = {
 	{"patchExists", libd_patchExists},
 	{"cachePatch", libd_cachePatch},
+#ifdef ROTSPRITE
+	// Is this ifdef nonsense? Yes.
+	{"cachePatchRotated", libd_cachePatchRotated},
+#endif
 	{"draw", libd_draw},
 	{"drawScaled", libd_drawScaled},
 	{"drawStretched", libd_drawStretched},
@@ -1255,6 +1222,8 @@ static luaL_Reg lib_draw[] = {
 	{NULL, NULL}
 };
 
+static int lib_draw_ref;
+
 //
 // lib_hud
 //
@@ -1288,37 +1257,14 @@ static int lib_hudenabled(lua_State *L)
 }
 
 // add a HUD element for rendering
-static int lib_hudadd(lua_State *L)
-{
-	enum hudhook field;
-
-	luaL_checktype(L, 1, LUA_TFUNCTION);
-	field = luaL_checkoption(L, 2, "game", hudhook_opt);
-
-	lua_getfield(L, LUA_REGISTRYINDEX, "HUD");
-	I_Assert(lua_istable(L, -1));
-	lua_rawgeti(L, -1, field+2); // HUD[2+]
-	I_Assert(lua_istable(L, -1));
-	lua_remove(L, -2);
-
-	lua_pushvalue(L, 1);
-	lua_rawseti(L, -2, (int)(lua_objlen(L, -2) + 1));
-
-	hudAvailable |= 1<<field;
-	return 0;
-}
+extern int lib_hudadd(lua_State *L);
 
 static int lib_hudsetvotebackground(lua_State *L)
 {
+	memset(VoteScreen.luaPrefix, 0, sizeof(VoteScreen.luaPrefix));
+
 	if (lua_isnoneornil(L, 1))
 	{
-		if (luaVoteScreen)
-		{
-			free(luaVoteScreen);
-		}
-
-		luaVoteScreen = NULL;
-
 		return 0;
 	}
 
@@ -1329,15 +1275,8 @@ static int lib_hudsetvotebackground(lua_State *L)
 		return luaL_argerror(L, 1, "prefix should 4 characters wide");
 	}
 
-	if (!luaVoteScreen)
-	{
-		luaVoteScreen = (char*)malloc(5);
-		luaVoteScreen[4] = 0;
-	}
-
-	strncpy(luaVoteScreen, prefix, 4);
-
-	strupr(luaVoteScreen);
+	strncpy(VoteScreen.luaPrefix, prefix, 4);
+	strupr(VoteScreen.luaPrefix);
 
 	return 0;
 }
@@ -1362,6 +1301,7 @@ static int lib_hudgetoffsets(lua_State *L)
 		case hudoffsets_minimap:        OFS(mini)
 		case hudoffsets_wanted:         OFS(want)
 		case hudoffsets_statdisplay:    OFS(stat)
+		case hudoffsets_inputdisplay:   OFS(wheel)
 		default:
 			return 0; // unreachable
 	}
@@ -1391,23 +1331,9 @@ int LUA_HudLib(lua_State *L)
 {
 	memset(hud_enabled, 0xff, (hud_MAX/8)+1);
 
-	lua_newtable(L); // HUD registry table
-		lua_newtable(L);
-		luaL_register(L, NULL, lib_draw);
-		lua_rawseti(L, -2, 1); // HUD[1] = lib_draw
-
-		lua_newtable(L);
-		lua_rawseti(L, -2, 2); // HUD[2] = game rendering functions array
-
-		lua_newtable(L);
-		lua_rawseti(L, -2, 3); // HUD[3] = scores rendering functions array
-
-		lua_newtable(L);
-		lua_rawseti(L, -2, 4); // HUD[4] = intermission rendering functions array
-
-		lua_newtable(L);
-		lua_rawseti(L, -2, 5); // HUD[5] = vote rendering functions array
-	lua_setfield(L, LUA_REGISTRYINDEX, "HUD");
+	lua_newtable(L);
+	luaL_register(L, NULL, lib_draw);
+	lib_draw_ref = luaL_ref(L, LUA_REGISTRYINDEX);
 
 	luaL_newmetatable(L, META_HUDINFO);
 		lua_pushcfunction(L, hudinfo_get);
@@ -1463,153 +1389,19 @@ boolean LUA_HudEnabled(enum hud option)
 	return false;
 }
 
-// Hook for HUD rendering
-void LUAh_GameHUD(huddrawlist_h list)
+void LUA_SetHudHook(int hook, huddrawlist_h list)
 {
-	if (!gL || !(hudAvailable & (1<<hudhook_game)))
-		return;
-	
+	lua_getref(gL, lib_draw_ref);
+
 	lua_pushlightuserdata(gL, list);
 	lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
 
-	hud_running = true;
-	lua_settop(gL, 0);
-	
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
-	I_Assert(lua_istable(gL, -1));
-	lua_rawgeti(gL, -1, hudhook_game+2); // HUD[2] = rendering funcs
-	I_Assert(lua_istable(gL, -1));
-
-	lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
-	I_Assert(lua_istable(gL, -1));
-	lua_remove(gL, -3); // pop HUD
-	LUA_PushUserdata(gL, stplyr, META_PLAYER);
-	LUA_PushUserdata(gL, &camera[stplyrnum], META_CAMERA);
-	camnum = stplyrnum + 1;
-
-	hud_interpcounter = 0;
-	lua_pushnil(gL);
-	while (lua_next(gL, -5) != 0) {
-		hud_interpolate = hud_interpstring = hud_interplatch = false;
-		hud_interpcounter++;
-		lua_pushvalue(gL, -5); // graphics library (HUD[1])
-		lua_pushvalue(gL, -5); // stplyr
-		lua_pushvalue(gL, -5); // camera
-		LUA_Call(gL, 3, 0, 1);
+	// there used to be a switch statement here, its gone now.
+	if (hook == HUD_HOOK(game))
+	{
+		LUA_PushUserdata(gL, stplyr, META_PLAYER);
+		LUA_PushUserdata(gL, &camera[stplyrnum], META_CAMERA);
+		camnum = stplyrnum + 1; // for compatibility
 	}
-	lua_settop(gL, 0);
-	hud_running = false;
-
-	lua_pushlightuserdata(gL, NULL);
-	lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
 }
 
-void LUAh_ScoresHUD(huddrawlist_h list)
-{
-	if (!gL || !(hudAvailable & (1<<hudhook_scores)))
-		return;
-	
-	lua_pushlightuserdata(gL, list);
-	lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
-
-	hud_running = true;
-	lua_settop(gL, 0);
-	
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
-	I_Assert(lua_istable(gL, -1));
-	lua_rawgeti(gL, -1, hudhook_scores+2); // HUD[3] = rendering funcs
-	I_Assert(lua_istable(gL, -1));
-
-	lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
-	I_Assert(lua_istable(gL, -1));
-	lua_remove(gL, -3); // pop HUD
-	lua_pushnil(gL);
-	hud_interpcounter = 0;
-	while (lua_next(gL, -3) != 0) {
-		hud_interpolate = hud_interpstring = hud_interplatch = false;
-		hud_interpcounter++;
-		lua_pushvalue(gL, -3); // graphics library (HUD[1])
-		LUA_Call(gL, 1, 0, 1);
-	}
-	lua_settop(gL, 0);
-	hud_running = false;
-
-	lua_pushlightuserdata(gL, NULL);
-	lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
-}
-
-void LUAh_IntermissionHUD(huddrawlist_h list)
-{
-	if (!gL || !(hudAvailable & (1<<hudhook_intermission)))
-		return;
-	
-	lua_pushlightuserdata(gL, list);
-	lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
-
-	hud_running = true;
-	lua_settop(gL, 0);
-	
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
-	I_Assert(lua_istable(gL, -1));
-	lua_rawgeti(gL, -1, hudhook_intermission+2); // HUD[4] = rendering funcs
-	I_Assert(lua_istable(gL, -1));
-
-	lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
-	I_Assert(lua_istable(gL, -1));
-	lua_remove(gL, -3); // pop HUD
-	lua_pushnil(gL);
-	hud_interpcounter = 0;
-	while (lua_next(gL, -3) != 0) {
-		hud_interpolate = hud_interpstring = hud_interplatch = false;
-		hud_interpcounter++;
-		lua_pushvalue(gL, -3); // graphics library (HUD[1])
-		LUA_Call(gL, 1, 0, 1);
-	}
-	lua_settop(gL, 0);
-	hud_running = false;
-
-	lua_pushlightuserdata(gL, NULL);
-	lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
-}
-
-void LUAh_VoteHUD(huddrawlist_h list)
-{
-	if (!gL || !(hudAvailable & (1<<hudhook_vote)))
-		return;
-	
-	lua_pushlightuserdata(gL, list);
-	lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
-
-	hud_running = true;
-	lua_settop(gL, 0);
-	
-	lua_pushcfunction(gL, LUA_GetErrorMessage);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
-	I_Assert(lua_istable(gL, -1));
-	lua_rawgeti(gL, -1, hudhook_vote+2); // HUD[5] = rendering funcs
-	I_Assert(lua_istable(gL, -1));
-
-	lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
-	I_Assert(lua_istable(gL, -1));
-	lua_remove(gL, -3); // pop HUD
-	lua_pushnil(gL);
-	hud_interpcounter = 0;
-	while (lua_next(gL, -3) != 0) {
-		hud_interpolate = hud_interpstring = hud_interplatch = false;
-		hud_interpcounter++;
-		lua_pushvalue(gL, -3); // graphics library (HUD[1])
-		LUA_Call(gL, 1, 0, 1);
-	}
-	lua_settop(gL, 0);
-	hud_running = false;
-
-	lua_pushlightuserdata(gL, NULL);
-	lua_setfield(gL, LUA_REGISTRYINDEX, "HUD_DRAW_LIST");
-}
\ No newline at end of file
diff --git a/src/lua_hudlib_drawlist.c b/src/lua_hudlib_drawlist.c
index 2ee9b8156..9a9e472aa 100644
--- a/src/lua_hudlib_drawlist.c
+++ b/src/lua_hudlib_drawlist.c
@@ -69,6 +69,7 @@ typedef struct drawitem_s {
 		size_t stroffset; // offset into strbuf to get str
 	};
 	const UINT8 *colormap;
+	INT32 blend;
 } drawitem_t;
 
 // The internal structure of a drawlist.
@@ -298,6 +299,7 @@ static void CalcFillCoords(drawitem_t *item)
 			else if (!(c & V_SNAPTOLEFT))
 				x += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
 		}
+
 		if (vid.height != BASEVIDHEIGHT * dupy)
 		{
 			// same thing here
@@ -306,6 +308,7 @@ static void CalcFillCoords(drawitem_t *item)
 			else if (!(c & V_SNAPTOTOP))
 				y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
 		}
+
 		if (c & V_SPLITSCREEN)
 			y += (BASEVIDHEIGHT * dupy)/2;
 		if (c & V_HORZSCREEN)
@@ -333,6 +336,7 @@ static UINT64 GetItemId(void)
 		id |= INTERP_LATCH;
 		hud_interplatch = false;
 	}
+
 	if (hud_interpstring)
 		id |= INTERP_STRING;
 
@@ -345,7 +349,8 @@ void LUA_HUD_AddDraw(
 	INT32 y,
 	patch_t *patch,
 	INT32 flags,
-	UINT8 *colormap
+	UINT8 *colormap,
+	INT32 blend
 )
 {
 	size_t i = AllocateDrawItem(list);
@@ -357,6 +362,7 @@ void LUA_HUD_AddDraw(
 	item->patch = patch;
 	item->flags = flags;
 	item->colormap = colormap;
+	item->blend = blend;
 }
 
 void LUA_HUD_AddDrawScaled(
@@ -366,7 +372,8 @@ void LUA_HUD_AddDrawScaled(
 	fixed_t scale,
 	patch_t *patch,
 	INT32 flags,
-	UINT8 *colormap
+	UINT8 *colormap,
+	INT32 blend
 )
 {
 	size_t i = AllocateDrawItem(list);
@@ -379,6 +386,7 @@ void LUA_HUD_AddDrawScaled(
 	item->patch = patch;
 	item->flags = flags;
 	item->colormap = colormap;
+	item->blend = blend;
 }
 
 void LUA_HUD_AddDrawStretched(
@@ -389,7 +397,8 @@ void LUA_HUD_AddDrawStretched(
 	fixed_t vscale,
 	patch_t *patch,
 	INT32 flags,
-	UINT8 *colormap
+	UINT8 *colormap,
+	INT32 blend
 )
 {
 	size_t i = AllocateDrawItem(list);
@@ -403,6 +412,7 @@ void LUA_HUD_AddDrawStretched(
 	item->patch = patch;
 	item->flags = flags;
 	item->colormap = colormap;
+	item->blend = blend;
 }
 
 void LUA_HUD_AddDrawNum(
@@ -632,13 +642,13 @@ void LUA_HUD_DrawList(huddrawlist_h list)
 		switch (item->type)
 		{
 			case DI_Draw:
-				V_DrawFixedPatch(LERPS(x), LERPS(y), FRACUNIT, item->flags, item->patch, item->colormap);
+				V_DrawBlendingFixedPatch(LERPS(x), LERPS(y), FRACUNIT, item->flags, item->patch, item->colormap, item->blend);
 				break;
 			case DI_DrawScaled:
-				V_DrawFixedPatch(LERPS(x), LERPS(y), LERP(scale), item->flags, item->patch, item->colormap);
+				V_DrawBlendingFixedPatch(LERPS(x), LERPS(y), LERP(scale), item->flags, item->patch, item->colormap, item->blend);
 				break;
 			case DI_DrawStretched:
-				V_DrawStretchyFixedPatch(LERPS(x), LERPS(y), LERP(hscale), LERP(vscale), item->flags, item->patch, item->colormap);
+				V_DrawStretchyFixedPatch(LERPS(x), LERPS(y), LERP(hscale), LERP(vscale), item->flags, item->patch, item->colormap, item->blend);
 				break;
 			case DI_DrawNum:
 				V_DrawTallNum(LERPS(x), LERPS(y), item->flags, item->num);
diff --git a/src/lua_hudlib_drawlist.h b/src/lua_hudlib_drawlist.h
index 4354b6f95..4d19bcae2 100644
--- a/src/lua_hudlib_drawlist.h
+++ b/src/lua_hudlib_drawlist.h
@@ -40,7 +40,8 @@ void LUA_HUD_AddDraw(
 	INT32 y,
 	patch_t *patch,
 	INT32 flags,
-	UINT8 *colormap
+	UINT8 *colormap,
+	INT32 blend
 );
 void LUA_HUD_AddDrawStretched(
 	huddrawlist_h list,
@@ -50,7 +51,8 @@ void LUA_HUD_AddDrawStretched(
 	fixed_t vscale,
 	patch_t *patch,
 	INT32 flags,
-	UINT8 *colormap
+	UINT8 *colormap,
+	INT32 blend
 );
 void LUA_HUD_AddDrawScaled(
 	huddrawlist_h list,
@@ -59,7 +61,8 @@ void LUA_HUD_AddDrawScaled(
 	fixed_t scale,
 	patch_t *patch,
 	INT32 flags,
-	UINT8 *colormap
+	UINT8 *colormap,
+	INT32 blend
 );
 void LUA_HUD_AddDrawNum(
 	huddrawlist_h list,
diff --git a/src/lua_infolib.c b/src/lua_infolib.c
index 8754176ed..e4ea2c009 100644
--- a/src/lua_infolib.c
+++ b/src/lua_infolib.c
@@ -16,6 +16,7 @@
 #include "dehacked.h"
 #include "p_mobj.h"
 #include "p_local.h"
+#include "s_sound.h"
 #include "z_zone.h"
 
 #include "lua_script.h"
@@ -111,6 +112,8 @@ static void A_Lua(mobj_t *actor)
 	lua_pushinteger(gL, var2);
 	LUA_Call(gL, 3, 0, 1);
 
+	lua_pop(gL, 1); // pop error handler
+
 	if (found)
 	{
 		--superstack;
@@ -152,7 +155,7 @@ static int lib_setState(lua_State *L)
 		return luaL_error(L, "Do not alter states in BuildCMD code!");
 
 	// clear the state to start with, in case of missing table elements
-	memset(state,0,sizeof(state_t));
+	memset(state, 0, sizeof(state_t));
 	state->tics = -1;
 
 	lua_pushnil(L);
@@ -178,7 +181,7 @@ static int lib_setState(lua_State *L)
 			switch(lua_type(L, 3))
 			{
 			case LUA_TNIL: // Null? Set the action to nothing, then.
-				state->action.acp1 = NULL;
+				state->action = NULL;
 				break;
 			case LUA_TSTRING: // It's a string, expect the name of a built-in action
 				LUA_SetActionByName(state, lua_tostring(L, 3));
@@ -190,7 +193,7 @@ static int lib_setState(lua_State *L)
 				lua_pushvalue(L, 3); // Bring it to the top of the stack
 				lua_rawset(L, -3); // Set it in the registry
 				lua_pop(L, 1); // pop LREG_STATEACTION
-				state->action.acp1 = (actionf_p1)A_Lua; // Set the action for the userdata.
+				state->action = (actionf_p1)A_Lua; // Set the action for the userdata.
 				break;
 			default: // ?!
 				return luaL_typerror(L, 3, "function");
@@ -248,7 +251,7 @@ boolean LUA_SetLuaAction(void *stv, const char *action)
 	lua_pop(gL, 1); // pop LREG_STATEACTION
 
 	lua_pop(gL, 2); // pop the function and LREG_ACTIONS
-	st->action.acp1 = (actionf_p1)A_Lua; // Set the action for the userdata.
+	st->action = (actionf_p1)A_Lua; // Set the action for the userdata.
 	return true; // action successfully set.
 }
 
@@ -260,8 +263,8 @@ boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor)
 		return false; // action not called.
 
 	if (superstack && fasticmp(actionpointers[actionnum].name, superactions[superstack-1])) // the action is calling itself,
-		return false; // let it call the hardcoded function 
-		
+		return false; // let it call the hardcoded function
+
 	lua_pushcfunction(gL, LUA_GetErrorMessage);
 
 	// grab function by uppercase name.
@@ -347,9 +350,9 @@ static int state_get(lua_State *L)
 		case state_action:
 		{
 			const char *name;
-			if (!st->action.acp1) // Action is NULL.
+			if (!st->action) // Action is NULL.
 				return 0; // return nil.
-			if (st->action.acp1 == (actionf_p1)A_Lua) { // This is a Lua function?
+			if (st->action == (actionf_p1)A_Lua) { // This is a Lua function?
 				lua_getfield(L, LUA_REGISTRYINDEX, LREG_STATEACTION);
 				I_Assert(lua_istable(L, -1));
 				lua_pushlightuserdata(L, st); // Push the state pointer and
@@ -383,7 +386,7 @@ static int state_get(lua_State *L)
 		default:
 		{
 			if (devparm)
-				return luaL_error(L, LUA_QL("state_t") " has no field named " LUA_QS, field);
+				return luaL_error(L, LUA_QL("state_t") " has no field named " LUA_QS, lua_tostring(L, 2));
 			return 0;
 		}
 	}
@@ -425,7 +428,7 @@ static int state_set(lua_State *L)
 		switch(lua_type(L, 3))
 		{
 		case LUA_TNIL: // Null? Set the action to nothing, then.
-			st->action.acp1 = NULL;
+			st->action = NULL;
 			break;
 		case LUA_TSTRING: // It's a string, expect the name of a built-in action
 			LUA_SetActionByName(st, lua_tostring(L, 3));
@@ -437,7 +440,7 @@ static int state_set(lua_State *L)
 			lua_pushvalue(L, 3); // Bring it to the top of the stack
 			lua_rawset(L, -3); // Set it in the registry
 			lua_pop(L, 1); // pop LREG_STATEACTION
-			st->action.acp1 = (actionf_p1)A_Lua; // Set the action for the userdata.
+			st->action = (actionf_p1)A_Lua; // Set the action for the userdata.
 			break;
 		default: // ?!
 			return luaL_typerror(L, 3, "function");
@@ -460,7 +463,7 @@ static int state_set(lua_State *L)
 	break;
 
 	default:
-		return luaL_error(L, LUA_QL("state_t") " has no field named " LUA_QS, field);
+		return luaL_error(L, LUA_QL("state_t") " has no field named " LUA_QS, lua_tostring(L, 2));
 	}
 
 	return 0;
@@ -512,7 +515,7 @@ static int lib_setMobjInfo(lua_State *L)
 		return luaL_error(L, "Do not alter mobjinfo in BuildCMD code!");
 
 	// clear the mobjinfo to start with, in case of missing table elements
-	memset(info,0,sizeof(mobjinfo_t));
+	memset(info, 0, sizeof(mobjinfo_t));
 	info->doomednum = -1; // default to no editor value
 	info->spawnhealth = 1; // avoid 'dead' noclip behaviors
 
@@ -940,7 +943,7 @@ static int lib_setSfxInfo(lua_State *L)
 
 		if (lua_isnumber(L, 2))
 		{
-			int j = lua_tointeger(L, 2) - 1;
+			int j = lua_tointeger(L, 2);
 
 			// Read and Write enums were combined, need to do this switch now
 			switch (j)
@@ -1070,6 +1073,109 @@ static int sfxinfo_num(lua_State *L)
 	return 1;
 }
 
+enum musicdef_e {
+	musicdef_name = 0,
+	musicdef_usage,
+	musicdef_source,
+	musicdef_filename,
+	musicdef_title,
+	musicdef_alttitle,
+	musicdef_authors,
+};
+
+const char *const musicdef_opt[] = {
+	"name",
+	"usage",
+	"source",
+	"filename",
+	"title",
+	"alttitle",
+	"authors",
+	NULL
+};
+
+static int musicdef_fields_ref = LUA_NOREF;
+
+static int lib_sFindMusicCredit(lua_State *L)
+{
+	const char *name = luaL_checkstring(L, 1);
+	LUA_PushUserdata(L, S_FindMusicCredit(name), META_MUSICDEF);
+	return 1;
+}
+
+static int lib_getMusicDef(lua_State *L)
+{
+	musicdef_t *def = NULL;
+
+	if (lua_isnumber(L, 2))
+		def = S_GetMusicCredit(lua_tonumber(L, 2));
+	else if (lua_isstring(L, 2))
+		def = S_FindMusicCredit(lua_tostring(L, 2));
+	else
+		return luaL_error(L, "musicdefs index must be number or string (got %s)", luaL_typename(L, 2));
+
+	LUA_PushUserdata(L, def, META_MUSICDEF);
+
+	return 1;
+}
+
+static int lib_setMusicDef(lua_State *L)
+{
+	return luaL_error(L, "musicdefs is read only");
+}
+
+static int lib_musicdefslen(lua_State *L)
+{
+	lua_pushinteger(L, nummusicdefs);
+	return 1;
+}
+
+static int musicdef_get(lua_State *L)
+{
+	musicdef_t *musicdef = *((musicdef_t **)luaL_checkudata(L, 1, META_MUSICDEF));
+	enum musicdef_e field = Lua_optoption(L, 2, -1, musicdef_fields_ref);
+
+	I_Assert(musicdef != NULL);
+
+	switch (field)
+	{
+	case musicdef_name:
+		lua_pushstring(L, musicdef->name);
+		return 1;
+	case musicdef_usage:
+		lua_pushstring(L, musicdef->usage);
+		return 1;
+	case musicdef_source:
+		lua_pushstring(L, musicdef->source);
+		return 1;
+	case musicdef_filename:
+		lua_pushstring(L, musicdef->filename);
+		return 1;
+	case musicdef_title:
+		lua_pushstring(L, musicdef->title);
+		return 1;
+	case musicdef_alttitle:
+		lua_pushstring(L, musicdef->alttitle);
+		return 1;
+	case musicdef_authors:
+		lua_pushstring(L, musicdef->authors);
+		return 1;
+	default:
+		return luaL_error(L, LUA_QL("musicdef_t") " has no field named " LUA_QS, lua_tostring(L, 2));
+	}
+	return 0;
+}
+
+static int musicdef_num(lua_State *L)
+{
+	musicdef_t *musicdef = *((musicdef_t **)luaL_checkudata(L, 1, META_MUSICDEF));
+
+	I_Assert(musicdef != NULL);
+
+	lua_pushinteger(L, musicdef->num);
+	return 1;
+}
+
 //////////////////////////////
 //
 // Now push all these functions into the Lua state!
@@ -1124,6 +1230,18 @@ int LUA_InfoLib(lua_State *L)
 
 	sfxinfo_fields_ref = Lua_CreateFieldTable(L, sfxinfo_opt);
 
+	luaL_newmetatable(L, META_MUSICDEF);
+		lua_pushcfunction(L, musicdef_get);
+		lua_setfield(L, -2, "__index");
+
+		lua_pushcfunction(L, musicdef_num);
+		lua_setfield(L, -2, "__len");
+	lua_pop(L, 1);
+
+	musicdef_fields_ref = Lua_CreateFieldTable(L, musicdef_opt);
+
+	lua_register(L, "S_FindMusicCredit", lib_sFindMusicCredit);
+
 	lua_newuserdata(L, 0);
 		lua_createtable(L, 0, 2);
 			lua_pushcfunction(L, lib_getSprname);
@@ -1174,5 +1292,19 @@ int LUA_InfoLib(lua_State *L)
 	lua_pushvalue(L, -1);
 	lua_setglobal(L, "S_sfx");
 	lua_setglobal(L, "sfxinfo");
+
+	lua_newuserdata(L, 0);
+		lua_createtable(L, 0, 2);
+			lua_pushcfunction(L, lib_getMusicDef);
+			lua_setfield(L, -2, "__index");
+
+			lua_pushcfunction(L, lib_setMusicDef);
+			lua_setfield(L, -2, "__newindex");
+
+			lua_pushcfunction(L, lib_musicdefslen);
+			lua_setfield(L, -2, "__len");
+		lua_setmetatable(L, -2);
+	lua_setglobal(L, "musicdefs");
+
 	return 0;
 }
diff --git a/src/lua_libs.h b/src/lua_libs.h
index c226c4714..729cea68d 100644
--- a/src/lua_libs.h
+++ b/src/lua_libs.h
@@ -10,6 +10,9 @@
 /// \file  lua_libs.h
 /// \brief libraries for Lua scripting
 
+#include "doomtype.h"
+#include "blua/lua.h"
+
 extern lua_State *gL;
 
 #define LREG_VALID "VALID_USERDATA"
@@ -20,6 +23,7 @@ extern lua_State *gL;
 #define META_STATE "STATE_T*"
 #define META_MOBJINFO "MOBJINFO_T*"
 #define META_SFXINFO "SFXINFO_T*"
+#define META_MUSICDEF "MUSICDEF_T*"
 
 #define META_MOBJ "MOBJ_T*"
 #define META_MAPTHING "MAPTHING_T*"
@@ -68,4 +72,4 @@ int LUA_SkinLib(lua_State *L);
 int LUA_ThinkerLib(lua_State *L);
 int LUA_MapLib(lua_State *L);
 int LUA_BlockmapLib(lua_State *L);
-int LUA_HudLib(lua_State *L);
\ No newline at end of file
+int LUA_HudLib(lua_State *L);
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index d92cd1f8b..c4718ae90 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -94,6 +94,7 @@ enum line_e {
 	line_sidenum,
 	line_frontside,
 	line_backside,
+	line_alpha,
 	line_slopetype,
 	line_frontsector,
 	line_backsector,
@@ -115,6 +116,7 @@ static const char *const line_opt[] = {
 	"sidenum",
 	"frontside",
 	"backside",
+	"alpha",
 	"slopetype",
 	"frontsector",
 	"backsector",
@@ -186,6 +188,7 @@ enum ffloor_e {
 	ffloor_next,
 	ffloor_prev,
 	ffloor_alpha,
+	ffloor_blend,
 };
 
 static const char *const ffloor_opt[] = {
@@ -204,6 +207,7 @@ static const char *const ffloor_opt[] = {
 	"next",
 	"prev",
 	"alpha",
+	"blend",
 	NULL};
 
 static int ffloor_fields_ref = LUA_NOREF;
@@ -281,7 +285,7 @@ static int lib_iterateSectorThinglist(lua_State *L)
 	if (!lua_isnil(L, 1))
 	{
 		thing = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
-		if (P_MobjWasRemoved(thing))
+		if (!thing)
 			return luaL_error(L, "current entry in thinglist was removed; avoid calling P_RemoveMobj on entries!");
 		thing = thing->snext;
 	}
@@ -652,6 +656,9 @@ static int line_get(lua_State *L)
 			return 0;
 		LUA_PushUserdata(L, &sides[line->sidenum[1]], META_SIDE);
 		return 1;
+	case line_alpha:
+		lua_pushfixed(L, line->alpha);
+		return 1;
 	case line_slopetype:
 		switch(line->slopetype)
 		{
@@ -1168,6 +1175,9 @@ static int ffloor_get(lua_State *L)
 	case ffloor_alpha:
 		lua_pushinteger(L, ffloor->alpha);
 		return 1;
+	case ffloor_blend:
+		lua_pushinteger(L, ffloor->blend);
+		return 1;
 	}
 	return 0;
 }
@@ -1246,6 +1256,9 @@ static int ffloor_set(lua_State *L)
 	case ffloor_alpha:
 		ffloor->alpha = (INT32)luaL_checkinteger(L, 3);
 		break;
+	case ffloor_blend:
+		ffloor->blend = (INT32)luaL_checkinteger(L, 3);
+		break;
 	}
 	return 0;
 }
diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c
index c392ac6eb..bb772cf86 100644
--- a/src/lua_mathlib.c
+++ b/src/lua_mathlib.c
@@ -227,4 +227,4 @@ int LUA_MathLib(lua_State *L)
 	lua_pushvalue(L, LUA_GLOBALSINDEX);
 	luaL_register(L, NULL, lib);
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index 7385cccf6..ea936d773 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -15,6 +15,7 @@
 #include "doomdef.h"
 #include "fastcmp.h"
 #include "r_things.h"
+#include "r_skins.h"
 #include "r_main.h"
 #include "p_local.h"
 #include "g_game.h"
@@ -40,6 +41,7 @@ int mobj_sprev_unimplemented(lua_State *L);
 int mobj_angle_setter(lua_State *L);
 int mobj_sloperoll_noop(lua_State *L);
 int mobj_spritescale_setter(lua_State *L);
+int mobj_spriteoffset_setter(lua_State *L);
 int mobj_touching_sectorlist_unimplemented(lua_State *L);
 int mobj_radius_setter(lua_State *L);
 int mobj_height_setter(lua_State *L);
@@ -52,6 +54,7 @@ int mobj_skin_setter(lua_State *L);
 int mobj_localskin_getter(lua_State *L);
 int mobj_localskin_setter(lua_State *L);
 int mobj_color_setter(lua_State *L);
+int mobj_blendmode_setter(lua_State *L);
 int mobj_bnext_noset(lua_State *L);
 int mobj_bprev_unimplemented(lua_State *L);
 int mobj_hnext_setter(lua_State *L);
@@ -94,9 +97,10 @@ static const udata_field_t mobj_fields[] = {
     FIELD(mobj_t, anim_duration,       udatalib_getter_uint16,     udatalib_setter_uint16),
     FIELD(mobj_t, spritexscale,        udatalib_getter_fixed,      mobj_spritescale_setter),
     FIELD(mobj_t, spriteyscale,        udatalib_getter_fixed,      mobj_spritescale_setter),
-    FIELD(mobj_t, spritexoffset,       udatalib_getter_fixed,      udatalib_setter_fixed),
-    FIELD(mobj_t, spriteyoffset,       udatalib_getter_fixed,      udatalib_setter_fixed),
+    FIELD(mobj_t, spritexoffset,       udatalib_getter_fixed,      mobj_spriteoffset_setter),
+    FIELD(mobj_t, spriteyoffset,       udatalib_getter_fixed,      mobj_spriteoffset_setter),
     FIELD(mobj_t, touching_sectorlist, mobj_touching_sectorlist_unimplemented, mobj_touching_sectorlist_unimplemented),
+    FIELD(mobj_t, lightlevel,          udatalib_getter_int16,      udatalib_setter_int16),
     FIELD(mobj_t, subsector,           udatalib_getter_subsector,  mobj_nosetpos_subsector),
     FIELD(mobj_t, floorz,              udatalib_getter_fixed,      mobj_nosetpos_floorz),
     FIELD(mobj_t, ceilingz,            udatalib_getter_fixed,      mobj_nosetpos_ceilingz),
@@ -114,6 +118,7 @@ static const udata_field_t mobj_fields[] = {
     FIELD(mobj_t, skin,                mobj_skin_getter,           mobj_skin_setter),
     FIELD(mobj_t, localskin,           mobj_localskin_getter,      mobj_localskin_setter),
     FIELD(mobj_t, color,               udatalib_getter_uint8,      mobj_color_setter),
+    FIELD(mobj_t, blendmode,           udatalib_getter_int32,      mobj_blendmode_setter),
     FIELD(mobj_t, bnext,               udatalib_getter_mobj,       mobj_bnext_noset),
     FIELD(mobj_t, bprev,               mobj_bprev_unimplemented,   mobj_bprev_unimplemented),
     FIELD(mobj_t, hnext,               udatalib_getter_mobj,       mobj_hnext_setter),
@@ -145,8 +150,8 @@ static const udata_field_t mobj_fields[] = {
     FIELD(mobj_t, cvmem,               udatalib_getter_int32,      udatalib_setter_int32),
     FIELD(mobj_t, standingslope,       udatalib_getter_slope,      mobj_standingslope_noset),
     FIELD(mobj_t, colorized,           udatalib_getter_boolean,    udatalib_setter_boolean),
-	FIELD(mobj_t, mirrored,           udatalib_getter_boolean,    udatalib_setter_boolean),
-    FIELD(mobj_t, rollmodel,           udatalib_getter_boolean,    udatalib_setter_boolean),
+	FIELD(mobj_t, mirrored,            udatalib_getter_boolean,    udatalib_setter_boolean),
+	FIELD(mobj_t, islocal,             udatalib_getter_boolean,    udatalib_setter_boolean),
     { NULL, 0, NULL, NULL },
 };
 #undef FIELD
@@ -277,6 +282,26 @@ int mobj_spritescale_setter(lua_State *L)
     return 0;
 }
 
+int mobj_spriteoffset_setter(lua_State *L)
+{
+    mobj_t *mo = GETMO();
+
+    fixed_t *spriteoffset;
+    UDATALIB_GETFIELD(fixed_t, spriteoffset);
+
+    if (!mo->player)
+        *spriteoffset = luaL_checkfixed(L, 2);
+    else
+    {
+        // Mmm yea
+        if (spriteoffset == &mo->spritexoffset)
+            mo->realxoffset = luaL_checkfixed(L, 2);
+        else
+            mo->realyoffset = luaL_checkfixed(L, 2);
+    }
+    return 0;
+}
+
 int mobj_radius_setter(lua_State *L)
 {
     mobj_t *mo = GETMO();
@@ -369,16 +394,16 @@ int mobj_skin_getter(lua_State *L)
     mobj_t *mo = GETMO();
 
     if (!mo->skin)
-		return 0;
+        return 0;
+
+    // HUD ONLY!!!!!!!!!!
+    if (hud_running && cv_luaimmersion.value)
+    {
+        lua_pushstring(L, K_GetMobjSkin(mo)->name);
+    }
+    else
+        lua_pushstring(L, ((skin_t *)mo->skin)->name);
 
-	if (hud_running && cv_luaimmersion.value) {
-			if (mo->localskin) // HUD ONLY!!!!!!!!!!
-				lua_pushstring(L, ((skin_t *)mo->localskin)->name);
-			else
-				lua_pushstring(L, ((skin_t *)mo->skin)->name);
-		} else {
-			lua_pushstring(L, ((skin_t *)mo->skin)->name);
-		}
     return 1;
 }
 
@@ -429,7 +454,7 @@ int mobj_localskin_setter(lua_State *L)
 		strlcpy(skin, luaL_optstring(L, 2, "none"), sizeof skin);
 		strlwr(skin); // all skin names are lowercase
 
-		if (strcasecmp(skin, "none"))
+		if (stricmp(skin, "none"))
 		{
 			// Try localskins
 			for (i = 0; i < numlocalskins; i++)
@@ -445,7 +470,7 @@ int mobj_localskin_setter(lua_State *L)
 			// Try other skins
 			for (i = 0; i < numskins; i++)
 			{
-				if (fastcmp(skins[i].name, skin))
+				if (stricmp(skins[i].name, skin) == 0)
 				{
 					mo->localskin = &skins[i];
 					mo->skinlocal = false;
@@ -460,7 +485,6 @@ int mobj_localskin_setter(lua_State *L)
 		}
 	}
 
-
 	return 0;
 }
 
@@ -476,6 +500,18 @@ int mobj_color_setter(lua_State *L)
     return 0;
 }
 
+int mobj_blendmode_setter(lua_State *L)
+{
+    mobj_t *mo = GETMO();
+
+	INT32 blendmode = (INT32)luaL_checkinteger(L, 2);
+	if (blendmode < 0 || blendmode > AST_OVERLAY)
+		return luaL_error(L, "mobj.blendmode %d out of range (0 - %d).", blendmode, AST_OVERLAY);
+	mo->blendmode = blendmode;
+
+    return 0;
+}
+
 int mobj_hnext_setter(lua_State *L)
 {
     mobj_t *mo = GETMO();
@@ -843,7 +879,7 @@ static int mapthing_get(lua_State *L)
 			break;
 		default:
 			if (devparm)
-				return luaL_error(L, LUA_QL("mapthing_t") " has no field named " LUA_QS, field);
+				return luaL_error(L, LUA_QL("mapthing_t") " has no field named " LUA_QS, lua_tostring(L, 2));
 			else
 				return 0;
 	}
@@ -897,7 +933,7 @@ static int mapthing_set(lua_State *L)
 			mt->mobj = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
 			break;
 		default:
-			return luaL_error(L, LUA_QL("mapthing_t") " has no field named " LUA_QS, field);
+			return luaL_error(L, LUA_QL("mapthing_t") " has no field named " LUA_QS, lua_tostring(L, 2));
 	}
 
 	return 0;
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 74e6b0f32..665512aef 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -13,6 +13,7 @@
 #include "doomdef.h"
 #include "fastcmp.h"
 #include "r_main.h"
+#include "r_skins.h"
 #include "r_things.h"
 #include "p_mobj.h"
 #include "d_player.h"
@@ -51,6 +52,9 @@ int player_localskin_setter(lua_State *L);
 int player_sliproll_getter(lua_State *L);
 int player_sliproll_noset(lua_State *L);
 
+int player_viewrollangle_getter(lua_State *L);
+int player_viewrollangle_noset(lua_State *L);
+
 #define FIELD(type, field_name, getter, setter) { #field_name, offsetof(type, field_name), getter, setter }
 static const udata_field_t player_fields[] = {
     // Player doesn't actually have field "name" so macro fails. Need to declare field manually.
@@ -154,11 +158,11 @@ static const udata_field_t player_fields[] = {
     FIELD(player_t, grieftime,        udatalib_getter_tic,         udatalib_setter_tic),
     FIELD(player_t, griefstrikes,     udatalib_getter_uint8,       udatalib_setter_uint8),
     FIELD(player_t, splitscreenindex, udatalib_getter_uint8,       player_splitscreenindex_noset),
-#ifdef HWRENDER
     FIELD(player_t, fovadd,           udatalib_getter_fixed,       udatalib_setter_fixed), // Mmm yeah thats definitely synch safe
-#endif
+
     // Same as player.name
 	{ "sliproll", 0, player_sliproll_getter, player_sliproll_noset },
+	{ "viewrollangle", 0, player_viewrollangle_getter, player_viewrollangle_noset },
     { "ping", 0, player_ping_getter, player_ping_noset }, // Hmm originally setter doesn't exist so data is written as unreachable custom field...
     { NULL, 0, NULL, NULL },
 };
@@ -217,6 +221,7 @@ NOSET(bot)
 NOSET(splitscreenindex)
 NOSET(ping)
 NOSET(sliproll)
+NOSET(viewrollangle)
 
 #undef NOSET
 
@@ -291,7 +296,7 @@ int player_localskin_getter(lua_State *L)
 	player_t *plr = GETPLAYER();
 
 	if (plr->localskin)
-		lua_pushstring(L, (plr->skinlocal ? localskins : skins)[plr->localskin - 1].name);
+		lua_pushstring(L, K_GetPlayerSkin(plr)->name);
 	else
 		lua_pushnil(L);
 
@@ -372,6 +377,15 @@ int player_sliproll_getter(lua_State *L)
 	return 1;
 }
 
+int player_viewrollangle_getter(lua_State *L)
+{
+	player_t *plr = GETPLAYER();
+
+	lua_pushangle(L, R_ViewRollAngle(plr));
+
+	return 1;
+}
+
 static int lib_iteratePlayers(lua_State *L)
 {
 	INT32 i = -1;
@@ -472,6 +486,7 @@ static int lib_iterateDisplayplayers(lua_State *L)
 
 		if (!players[displayplayers[i]].mo)
 			continue;
+
 		LUA_PushUserdata(L, &players[displayplayers[i]], META_PLAYER);
 		lua_pushinteger(L, i);	// push this to recall what number we were on for the next function call. I suppose this also means you can retrieve the splitscreen player number with 'for p, n in displayplayers.iterate'!
 		return 2;
@@ -693,8 +708,8 @@ static int kartstuff_len(lua_State *L)
 	return 1;
 }
 
-#define NOFIELD luaL_error(L, LUA_QL("ticcmd_t") " has no field named " LUA_QS, field)
-#define NOSET luaL_error(L, LUA_QL("ticcmd_t") " field " LUA_QS " should not be set directly.", field)
+#define NOFIELD luaL_error(L, LUA_QL("ticcmd_t") " has no field named " LUA_QS, lua_tostring(L, 2))
+#define NOSET luaL_error(L, LUA_QL("ticcmd_t") " field " LUA_QS " should not be set directly.", lua_tostring(L, 2))
 
 enum ticcmd_e
 {
@@ -868,4 +883,4 @@ int LUA_PlayerLib(lua_State *L)
 	lua_setglobal(L, "displayplayers");
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/src/lua_script.c b/src/lua_script.c
index e5cd0d9ee..3a8b8758b 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -22,6 +22,8 @@
 #include "p_saveg.h"
 #include "p_local.h"
 #include "p_slopes.h" // for P_SlopeById
+#include "s_sound.h"
+#include "m_menu.h"
 #ifdef LUA_ALLOW_BYTECODE
 #include "d_netfil.h" // for LUA_DumpFile
 #endif
@@ -402,9 +404,21 @@ fixed_t LUA_EvalMathEx(const char *word, const char **error)
 	if (luaL_dostring(mL, buf))
 	{
 		p = lua_tostring(mL, -1);
+<<<<<<< HEAD
 		while (*p++ != ':' && *p) ;
 		p += 3; // "1: "
 		if (error) *error = p;
+=======
+
+		// If there is [string "..."]:1: text, skip it
+		if (strstr(p, ":") != NULL)
+		{
+			while (*p++ != ':' && *p);
+
+			p += 3; // "1: "
+		}
+		CONS_Alert(CONS_WARNING, "%s\n", p);
+>>>>>>> Saturn-Next
 	}
 	else
 		res = lua_tointeger(mL, -1);
@@ -544,6 +558,8 @@ void LUA_InvalidateLevel(void)
 {
 	thinker_t *th;
 	size_t i;
+	ffloor_t *rover = NULL;
+
 	if (!gL)
 		return;
 
@@ -555,32 +571,55 @@ void LUA_InvalidateLevel(void)
 	for (i = 0; i < numsubsectors; i++)
 		LUA_InvalidateUserdata(&subsectors[i]);
 	for (i = 0; i < numsectors; i++)
+	{
 		LUA_InvalidateUserdata(&sectors[i]);
+		LUA_InvalidateUserdata(&sectors[i].lines);
+
+		if (sectors[i].ffloors)
+		{
+			for (rover = sectors[i].ffloors; rover; rover = rover->next)
+				LUA_InvalidateUserdata(rover);
+		}
+	}
+
 	for (i = 0; i < numlines; i++)
 	{
 		LUA_InvalidateUserdata(&lines[i]);
 		LUA_InvalidateUserdata(lines[i].sidenum);
 	}
+
 	for (i = 0; i < numsides; i++)
 		LUA_InvalidateUserdata(&sides[i]);
 	for (i = 0; i < numvertexes; i++)
 		LUA_InvalidateUserdata(&vertexes[i]);
+
+	for (pslope_t *slope = slopelist; slope; slope = slope->next)
+	{
+		LUA_InvalidateUserdata(slope);
+		LUA_InvalidateUserdata(&slope->normal);
+		LUA_InvalidateUserdata(&slope->o);
+		LUA_InvalidateUserdata(&slope->d);
+	}
 }
 
 void LUA_InvalidateMapthings(void)
 {
 	size_t i;
+
 	if (!gL)
 		return;
 
 	for (i = 0; i < nummapthings; i++)
+	{
 		LUA_InvalidateUserdata(&mapthings[i]);
+	}
 }
 
 void LUA_InvalidatePlayer(player_t *player)
 {
 	if (!gL)
 		return;
+
 	LUA_InvalidateUserdata(player);
 	LUA_InvalidateUserdata(player->powers);
 	LUA_InvalidateUserdata(player->kartstuff);
@@ -626,7 +665,7 @@ static const struct {
 	{META_SUBSECTOR,ARCH_SUBSECTOR},
 	{META_SECTOR,   ARCH_SECTOR},
 	{META_SLOPE,    ARCH_SLOPE},
-	{META_MAPHEADER,   ARCH_MAPHEADER},
+	{META_MAPHEADER,ARCH_MAPHEADER},
 	{NULL,          ARCH_NULL}
 };
 
@@ -650,7 +689,7 @@ static UINT8 GetUserdataArchType(int index)
 	return ARCH_NULL;
 }
 
-static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
+static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
 {
 	if (myindex < 0)
 		myindex = lua_gettop(gL)+1+myindex;
@@ -658,23 +697,23 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
 	{
 	case LUA_TNONE:
 	case LUA_TNIL:
-		WRITEUINT8(save_p, ARCH_NULL);
+		WRITEUINT8(*p, ARCH_NULL);
 		break;
 	// This might be a problem. D:
 	case LUA_TLIGHTUSERDATA:
 	case LUA_TTHREAD:
 	case LUA_TFUNCTION:
-		WRITEUINT8(save_p, ARCH_NULL);
+		WRITEUINT8(*p, ARCH_NULL);
 		return 2;
 	case LUA_TBOOLEAN:
-		WRITEUINT8(save_p, ARCH_BOOLEAN);
-		WRITEUINT8(save_p, lua_toboolean(gL, myindex));
+		WRITEUINT8(*p, ARCH_BOOLEAN);
+		WRITEUINT8(*p, lua_toboolean(gL, myindex));
 		break;
 	case LUA_TNUMBER:
 	{
 		lua_Integer number = lua_tointeger(gL, myindex);
-        WRITEUINT8(save_p, ARCH_SIGNED);
-        WRITEFIXED(save_p, number);
+        WRITEUINT8(*p, ARCH_SIGNED);
+        WRITEFIXED(*p, number);
 		break;
 	}
 	case LUA_TSTRING:
@@ -682,7 +721,7 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
 		UINT16 len = (UINT16)lua_objlen(gL, myindex); // get length of string, including embedded zeros
 		const char *s = lua_tostring(gL, myindex);
 		UINT16 i = 0;
-		WRITEUINT8(save_p, ARCH_STRING);
+		WRITEUINT8(*p, ARCH_STRING);
 		// if you're wondering why we're writing a string to save_p this way,
 		// it turns out that Lua can have embedded zeros ('\0') in the strings,
 		// so we can't use WRITESTRING as that cuts off when it finds a '\0'.
@@ -690,9 +729,9 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
 		// fixing the awful crashes previously encountered for reading strings longer than 1024
 		// (yes I know that's kind of a stupid thing to care about, but it'd be evil to trim or ignore them?)
 		// -- Monster Iestyn 05/08/18
-		WRITEUINT16(save_p, len); // save size of string
+		WRITEUINT16(*p, len); // save size of string
 		while (i < len)
-			WRITECHAR(save_p, s[i++]); // write chars individually, including the embedded zeros
+			WRITECHAR(*p, s[i++]); // write chars individually, including the embedded zeros
 		break;
 	}
 	case LUA_TTABLE:
@@ -711,223 +750,21 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
 			}
 			lua_pop(gL, 1);
 		}
+
 		if (!found)
+		{
 			t++;
 
-		WRITEUINT8(save_p, ARCH_TABLE);
-		WRITEUINT16(save_p, t);
-
-		if (!found)
-		{
-			lua_pushvalue(gL, myindex);
-			lua_rawseti(gL, TABLESINDEX, t);
-			return 1;
-		}
-		break;
-	}
-	case LUA_TUSERDATA:
-		switch (GetUserdataArchType(myindex))
-		{
-		case ARCH_MOBJINFO:
-		{
-			mobjinfo_t *info = *((mobjinfo_t **)lua_touserdata(gL, myindex));
-			WRITEUINT8(save_p, ARCH_MOBJINFO);
-			WRITEUINT16(save_p, info - mobjinfo);
-			break;
-		}
-		case ARCH_STATE:
-		{
-			state_t *state = *((state_t **)lua_touserdata(gL, myindex));
-			WRITEUINT8(save_p, ARCH_STATE);
-			WRITEUINT16(save_p, state - states);
-			break;
-		}
-		case ARCH_MOBJ:
-		{
-			mobj_t *mobj = *((mobj_t **)lua_touserdata(gL, myindex));
-			if (!mobj)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_MOBJ);
-				WRITEUINT32(save_p, mobj->mobjnum);
-			}
-			break;
-		}
-		case ARCH_PLAYER:
-		{
-			player_t *player = *((player_t **)lua_touserdata(gL, myindex));
-			if (!player)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_PLAYER);
-				WRITEUINT8(save_p, player - players);
-			}
-			break;
-		}
-		case ARCH_MAPTHING:
-		{
-			mapthing_t *mapthing = *((mapthing_t **)lua_touserdata(gL, myindex));
-			if (!mapthing)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_MAPTHING);
-				WRITEUINT16(save_p, mapthing - mapthings);
-			}
-			break;
-		}
-		case ARCH_VERTEX:
-		{
-			vertex_t *vertex = *((vertex_t **)lua_touserdata(gL, myindex));
-			if (!vertex)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_VERTEX);
-				WRITEUINT16(save_p, vertex - vertexes);
-			}
-			break;
-		}
-		case ARCH_LINE:
-		{
-			line_t *line = *((line_t **)lua_touserdata(gL, myindex));
-			if (!line)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_LINE);
-				WRITEUINT16(save_p, line - lines);
-			}
-			break;
-		}
-		case ARCH_SIDE:
-		{
-			side_t *side = *((side_t **)lua_touserdata(gL, myindex));
-			if (!side)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_SIDE);
-				WRITEUINT16(save_p, side - sides);
-			}
-			break;
-		}
-		case ARCH_SUBSECTOR:
-		{
-			subsector_t *subsector = *((subsector_t **)lua_touserdata(gL, myindex));
-			if (!subsector)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_SUBSECTOR);
-				WRITEUINT16(save_p, subsector - subsectors);
-			}
-			break;
-		}
-		case ARCH_SECTOR:
-		{
-			sector_t *sector = *((sector_t **)lua_touserdata(gL, myindex));
-			if (!sector)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_SECTOR);
-				WRITEUINT16(save_p, sector - sectors);
-			}
-			break;
-		}
-		case ARCH_SLOPE:
-		{
-			pslope_t *slope = *((pslope_t **)lua_touserdata(gL, myindex));
-			if (!slope)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_SLOPE);
-				WRITEUINT16(save_p, slope->id);
-			}
-			break;
-		}
-		case ARCH_MAPHEADER:
-		{
-			mapheader_t *header = *((mapheader_t **)lua_touserdata(gL, myindex));
-			if (!header)
-				WRITEUINT8(save_p, ARCH_NULL);
-			else {
-				WRITEUINT8(save_p, ARCH_MAPHEADER);
-				WRITEUINT16(save_p, header - *mapheaderinfo);
-			}
-			break;
-		}
-		default:
-			WRITEUINT8(save_p, ARCH_NULL);
-			return 2;
-		}
-		break;
-	}
-	return 0;
-}
-
-// because of how this function works it has to be pasted allll over again just to save to demo_p since it returns an uint8 to begin with
-static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
-{
-	if (myindex < 0)
-		myindex = lua_gettop(gL)+1+myindex;
-	switch (lua_type(gL, myindex))
-	{
-	case LUA_TNONE:
-	case LUA_TNIL:
-		WRITEUINT8(demo_p, ARCH_NULL);
-		break;
-	// This might be a problem. D:
-	case LUA_TLIGHTUSERDATA:
-	case LUA_TTHREAD:
-	case LUA_TFUNCTION:
-		WRITEUINT8(demo_p, ARCH_NULL);
-		return 2;
-	case LUA_TBOOLEAN:
-		WRITEUINT8(demo_p, ARCH_BOOLEAN);
-		WRITEUINT8(demo_p, lua_toboolean(gL, myindex));
-		break;
-	case LUA_TNUMBER:
-	{
-		lua_Integer number = lua_tointeger(gL, myindex);
-        WRITEUINT8(demo_p, ARCH_SIGNED);
-        WRITEFIXED(demo_p, number);
-		break;
-	}
-	case LUA_TSTRING:
-	{
-		UINT16 len = (UINT16)lua_objlen(gL, myindex); // get length of string, including embedded zeros
-		const char *s = lua_tostring(gL, myindex);
-		UINT16 i = 0;
-		WRITEUINT8(demo_p, ARCH_STRING);
-		// if you're wondering why we're writing a string to demo_p this way,
-		// it turns out that Lua can have embedded zeros ('\0') in the strings,
-		// so we can't use WRITESTRING as that cuts off when it finds a '\0'.
-		// Saving the size of the string also allows us to get the size of the string on the other end,
-		// fixing the awful crashes previously encountered for reading strings longer than 1024
-		// (yes I know that's kind of a stupid thing to care about, but it'd be evil to trim or ignore them?)
-		// -- Monster Iestyn 05/08/18
-		WRITEUINT16(demo_p, len); // save size of string
-		while (i < len)
-			WRITECHAR(demo_p, s[i++]); // write chars individually, including the embedded zeros
-		break;
-	}
-	case LUA_TTABLE:
-	{
-		boolean found = false;
-		INT32 i;
-		UINT16 t = (UINT16)lua_objlen(gL, TABLESINDEX);
-
-		for (i = 1; i <= t && !found; i++)
-		{
-			lua_rawgeti(gL, TABLESINDEX, i);
-			if (lua_rawequal(gL, myindex, -1))
+			if (t == 0)
 			{
-				t = i;
-				found = true;
+				CONS_Alert(CONS_ERROR, "Too many tables to archive!\n");
+				WRITEUINT8(*p, ARCH_NULL);
+				return 0;
 			}
-			lua_pop(gL, 1);
 		}
-		if (!found)
-			t++;
 
-		WRITEUINT8(demo_p, ARCH_TABLE);
-		WRITEUINT16(demo_p, t);
+		WRITEUINT8(*p, ARCH_TABLE);
+		WRITEUINT16(*p, t);
 
 		if (!found)
 		{
@@ -943,25 +780,25 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		case ARCH_MOBJINFO:
 		{
 			mobjinfo_t *info = *((mobjinfo_t **)lua_touserdata(gL, myindex));
-			WRITEUINT8(demo_p, ARCH_MOBJINFO);
-			WRITEUINT16(demo_p, info - mobjinfo);
+			WRITEUINT8(*p, ARCH_MOBJINFO);
+			WRITEUINT16(*p, info - mobjinfo);
 			break;
 		}
 		case ARCH_STATE:
 		{
 			state_t *state = *((state_t **)lua_touserdata(gL, myindex));
-			WRITEUINT8(demo_p, ARCH_STATE);
-			WRITEUINT16(demo_p, state - states);
+			WRITEUINT8(*p, ARCH_STATE);
+			WRITEUINT16(*p, state - states);
 			break;
 		}
 		case ARCH_MOBJ:
 		{
 			mobj_t *mobj = *((mobj_t **)lua_touserdata(gL, myindex));
 			if (!mobj)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_MOBJ);
-				WRITEUINT32(demo_p, mobj->mobjnum);
+				WRITEUINT8(*p, ARCH_MOBJ);
+				WRITEUINT32(*p, mobj->mobjnum);
 			}
 			break;
 		}
@@ -969,10 +806,10 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		{
 			player_t *player = *((player_t **)lua_touserdata(gL, myindex));
 			if (!player)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_PLAYER);
-				WRITEUINT8(demo_p, player - players);
+				WRITEUINT8(*p, ARCH_PLAYER);
+				WRITEUINT8(*p, player - players);
 			}
 			break;
 		}
@@ -980,10 +817,10 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		{
 			mapthing_t *mapthing = *((mapthing_t **)lua_touserdata(gL, myindex));
 			if (!mapthing)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_MAPTHING);
-				WRITEUINT16(demo_p, mapthing - mapthings);
+				WRITEUINT8(*p, ARCH_MAPTHING);
+				WRITEUINT16(*p, mapthing - mapthings);
 			}
 			break;
 		}
@@ -991,10 +828,10 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		{
 			vertex_t *vertex = *((vertex_t **)lua_touserdata(gL, myindex));
 			if (!vertex)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_VERTEX);
-				WRITEUINT16(demo_p, vertex - vertexes);
+				WRITEUINT8(*p, ARCH_VERTEX);
+				WRITEUINT16(*p, vertex - vertexes);
 			}
 			break;
 		}
@@ -1002,10 +839,10 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		{
 			line_t *line = *((line_t **)lua_touserdata(gL, myindex));
 			if (!line)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_LINE);
-				WRITEUINT16(demo_p, line - lines);
+				WRITEUINT8(*p, ARCH_LINE);
+				WRITEUINT16(*p, line - lines);
 			}
 			break;
 		}
@@ -1013,10 +850,10 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		{
 			side_t *side = *((side_t **)lua_touserdata(gL, myindex));
 			if (!side)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_SIDE);
-				WRITEUINT16(demo_p, side - sides);
+				WRITEUINT8(*p, ARCH_SIDE);
+				WRITEUINT16(*p, side - sides);
 			}
 			break;
 		}
@@ -1024,10 +861,10 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		{
 			subsector_t *subsector = *((subsector_t **)lua_touserdata(gL, myindex));
 			if (!subsector)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_SUBSECTOR);
-				WRITEUINT16(demo_p, subsector - subsectors);
+				WRITEUINT8(*p, ARCH_SUBSECTOR);
+				WRITEUINT16(*p, subsector - subsectors);
 			}
 			break;
 		}
@@ -1035,10 +872,10 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		{
 			sector_t *sector = *((sector_t **)lua_touserdata(gL, myindex));
 			if (!sector)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_SECTOR);
-				WRITEUINT16(demo_p, sector - sectors);
+				WRITEUINT8(*p, ARCH_SECTOR);
+				WRITEUINT16(*p, sector - sectors);
 			}
 			break;
 		}
@@ -1046,10 +883,10 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		{
 			pslope_t *slope = *((pslope_t **)lua_touserdata(gL, myindex));
 			if (!slope)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_SLOPE);
-				WRITEUINT16(demo_p, slope->id);
+				WRITEUINT8(*p, ARCH_SLOPE);
+				WRITEUINT16(*p, slope->id);
 			}
 			break;
 		}
@@ -1057,15 +894,15 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 		{
 			mapheader_t *header = *((mapheader_t **)lua_touserdata(gL, myindex));
 			if (!header)
-				WRITEUINT8(demo_p, ARCH_NULL);
+				WRITEUINT8(*p, ARCH_NULL);
 			else {
-				WRITEUINT8(demo_p, ARCH_MAPHEADER);
-				WRITEUINT16(demo_p, header - *mapheaderinfo);
+				WRITEUINT8(*p, ARCH_MAPHEADER);
+				WRITEUINT16(*p, header - *mapheaderinfo);
 			}
 			break;
 		}
 		default:
-			WRITEUINT8(demo_p, ARCH_NULL);
+			WRITEUINT8(*p, ARCH_NULL);
 			return 2;
 		}
 		break;
@@ -1073,14 +910,15 @@ static UINT8 ArchiveValueDemo(int TABLESINDEX, int myindex)
 	return 0;
 }
 
-static void ArchiveExtVars(void *pointer, const char *ptype)
+static void ArchiveExtVars(UINT8 **p, void *pointer, const char *ptype)
 {
 	int TABLESINDEX;
 	UINT16 i;
 
-	if (!gL) {
+	if (!gL)
+	{
 		if (fastcmp(ptype,"player")) // players must always be included, even if no vars
-			WRITEUINT16(save_p, 0);
+			WRITEUINT16(*p, 0);
 		return;
 	}
 
@@ -1096,7 +934,7 @@ static void ArchiveExtVars(void *pointer, const char *ptype)
 	{ // no extra values table
 		lua_pop(gL, 1);
 		if (fastcmp(ptype,"player")) // players must always be included, even if no vars
-			WRITEUINT16(save_p, 0);
+			WRITEUINT16(*p, 0);
 		return;
 	}
 
@@ -1108,77 +946,22 @@ static void ArchiveExtVars(void *pointer, const char *ptype)
 	if (i == 0)
 	{
 		if (fastcmp(ptype,"player")) // always include players even if they have no extra variables
-			WRITEUINT16(save_p, 0);
+			WRITEUINT16(*p, 0);
 		lua_pop(gL, 1);
 		return;
 	}
 
 	if (fastcmp(ptype,"mobj")) // mobjs must write their mobjnum as a header
-		WRITEUINT32(save_p, ((mobj_t *)pointer)->mobjnum);
-	WRITEUINT16(save_p, i);
+		WRITEUINT32(*p, ((mobj_t *)pointer)->mobjnum);
+
+	WRITEUINT16(*p, i);
 	lua_pushnil(gL);
+
 	while (lua_next(gL, -2))
 	{
 		I_Assert(lua_type(gL, -2) == LUA_TSTRING);
-		WRITESTRING(save_p, lua_tostring(gL, -2));
-		if (ArchiveValue(TABLESINDEX, -1) == 2)
-			CONS_Alert(CONS_ERROR, "Type of value for %s entry '%s' (%s) could not be archived!\n", ptype, lua_tostring(gL, -2), luaL_typename(gL, -1));
-		lua_pop(gL, 1);
-	}
-
-	lua_pop(gL, 1);
-}
-
-// simplified for demos
-static void ArchiveExtVarsDemo(void *pointer, const char *ptype)
-{
-	int TABLESINDEX;
-	UINT16 i;
-
-	if (!gL) {
-		if (fastcmp(ptype,"player")) // players must always be included, even if no vars
-			WRITEUINT16(demo_p, 0);
-		return;
-	}
-
-	TABLESINDEX = lua_gettop(gL);
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, LREG_EXTVARS);
-	I_Assert(lua_istable(gL, -1));
-	lua_pushlightuserdata(gL, pointer);
-	lua_rawget(gL, -2);
-	lua_remove(gL, -2); // pop LREG_EXTVARS
-
-	if (!lua_istable(gL, -1))
-	{ // no extra values table
-		lua_pop(gL, 1);
-		if (fastcmp(ptype,"player")) // players must always be included, even if no vars
-			WRITEUINT16(demo_p, 0);
-		return;
-	}
-
-	lua_pushnil(gL);
-	for (i = 0; lua_next(gL, -2); i++)
-		lua_pop(gL, 1);
-
-	// skip anything that has an empty table and isn't a player.
-	if (i == 0)
-	{
-		if (fastcmp(ptype,"player")) // always include players even if they have no extra variables
-			WRITEUINT16(demo_p, 0);
-		lua_pop(gL, 1);
-		return;
-	}
-
-	if (fastcmp(ptype,"mobj")) // mobjs must write their mobjnum as a header
-		WRITEUINT32(demo_p, ((mobj_t *)pointer)->mobjnum);
-	WRITEUINT16(demo_p, i);
-	lua_pushnil(gL);
-	while (lua_next(gL, -2))
-	{
-		I_Assert(lua_type(gL, -2) == LUA_TSTRING);
-		WRITESTRING(demo_p, lua_tostring(gL, -2));
-		if (ArchiveValueDemo(TABLESINDEX, -1) == 2)
+		WRITESTRING(*p, lua_tostring(gL, -2));
+		if (ArchiveValue(p, TABLESINDEX, -1) == 2)
 			CONS_Alert(CONS_ERROR, "Type of value for %s entry '%s' (%s) could not be archived!\n", ptype, lua_tostring(gL, -2), luaL_typename(gL, -1));
 		lua_pop(gL, 1);
 	}
@@ -1189,13 +972,14 @@ static void ArchiveExtVarsDemo(void *pointer, const char *ptype)
 static int NetArchive(lua_State *L)
 {
 	int TABLESINDEX = lua_upvalueindex(1);
+	savebuffer_t *save = lua_touserdata(L, lua_upvalueindex(2));
 	int i, n = lua_gettop(L);
 	for (i = 1; i <= n; i++)
-		ArchiveValue(TABLESINDEX, i);
+		ArchiveValue(&save->p, TABLESINDEX, i);
 	return n;
 }
 
-static void ArchiveTables(void)
+static void ArchiveTables(UINT8 **p)
 {
 	int TABLESINDEX;
 	UINT16 i, n;
@@ -1214,7 +998,7 @@ static void ArchiveTables(void)
 		while (lua_next(gL, -2))
 		{
 			// Write key
-			e = ArchiveValue(TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
+			e = ArchiveValue(p, TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
 			if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
 			{
 				lua_pushvalue(gL, -2);
@@ -1222,7 +1006,7 @@ static void ArchiveTables(void)
 				lua_pop(gL, 1);
 			}
 			// Write value
-			e = ArchiveValue(TABLESINDEX, -1);
+			e = ArchiveValue(p, TABLESINDEX, -1);
 			if (e == 1)
 				n++; // the table contained a new table we'll have to archive. :(
 			else if (e == 2) // invalid value type
@@ -1235,71 +1019,27 @@ static void ArchiveTables(void)
 			lua_pop(gL, 1);
 		}
 		lua_pop(gL, 1);
-		WRITEUINT8(save_p, ARCH_TEND);
+		WRITEUINT8(*p, ARCH_TEND);
 	}
 }
 
-static void ArchiveTablesDemo(void)
+static UINT8 UnArchiveValue(UINT8 **p, int TABLESINDEX, boolean network)
 {
-	int TABLESINDEX;
-	UINT16 i, n;
-	UINT8 e;
-
-	if (!gL)
-		return;
-
-	TABLESINDEX = lua_gettop(gL);
-
-	n = (UINT16)lua_objlen(gL, TABLESINDEX);
-	for (i = 1; i <= n; i++)
-	{
-		lua_rawgeti(gL, TABLESINDEX, i);
-		lua_pushnil(gL);
-		while (lua_next(gL, -2))
-		{
-			// Write key
-			e = ArchiveValueDemo(TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
-			if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
-			{
-				lua_pushvalue(gL, -2);
-				CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -1), luaL_typename(gL, -1), i);
-				lua_pop(gL, 1);
-			}
-			// Write value
-			e = ArchiveValueDemo(TABLESINDEX, -1);
-			if (e == 1)
-				n++; // the table contained a new table we'll have to archive. :(
-			else if (e == 2) // invalid value type
-			{
-				lua_pushvalue(gL, -2);
-				CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -1), luaL_typename(gL, -1));
-				lua_pop(gL, 1);
-			}
-
-			lua_pop(gL, 1);
-		}
-		lua_pop(gL, 1);
-		WRITEUINT8(demo_p, ARCH_TEND);
-	}
-}
-
-static UINT8 UnArchiveValue(int TABLESINDEX)
-{
-	UINT8 type = READUINT8(save_p);
+	UINT8 type = READUINT8(*p);
 	switch (type)
 	{
 	case ARCH_NULL:
 		lua_pushnil(gL);
 		break;
 	case ARCH_BOOLEAN:
-		lua_pushboolean(gL, READUINT8(save_p));
+		lua_pushboolean(gL, READUINT8(*p));
 		break;
 	case ARCH_SIGNED:
-		lua_pushinteger(gL, READFIXED(save_p));
+		lua_pushinteger(gL, READFIXED(*p));
 		break;
 	case ARCH_STRING:
 	{
-		UINT16 len = READUINT16(save_p); // length of string, including embedded zeros
+		UINT16 len = READUINT16(*p); // length of string, including embedded zeros
 		char *value;
 		UINT16 i = 0;
 		// See my comments in the ArchiveValue function;
@@ -1309,14 +1049,14 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
 		value = malloc(len); // make temp buffer of size len
 		// now read the actual string
 		while (i < len)
-			value[i++] = READCHAR(save_p); // read chars individually, including the embedded zeros
+			value[i++] = READCHAR(*p); // read chars individually, including the embedded zeros
 		lua_pushlstring(gL, value, len); // push the string (note: this function supports embedded zeros)
 		free(value); // free the buffer
 		break;
 	}
 	case ARCH_TABLE:
 	{
-		UINT16 tid = READUINT16(save_p);
+		UINT16 tid = READUINT16(*p);
 		lua_rawgeti(gL, TABLESINDEX, tid);
 		if (lua_isnil(gL, -1))
 		{
@@ -1329,166 +1069,96 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
 		break;
 	}
 	case ARCH_MOBJINFO:
-		LUA_PushUserdata(gL, &mobjinfo[READUINT16(save_p)], META_MOBJINFO);
+		LUA_PushUserdata(gL, &mobjinfo[READUINT16(*p)], META_MOBJINFO);
 		break;
 	case ARCH_STATE:
-		LUA_PushUserdata(gL, &states[READUINT16(save_p)], META_STATE);
+		LUA_PushUserdata(gL, &states[READUINT16(*p)], META_STATE);
 		break;
 	case ARCH_MOBJ:
-		LUA_PushUserdata(gL, P_FindNewPosition(READUINT32(save_p)), META_MOBJ);
+		if (network == false) // for replays :chaosleep:
+		{
+			*p += sizeof(UINT32);	// Skip this data, we can't read a mobj here, it'd point to garbage and crash the game.
+			return 3;	// Don't set the field
+		}
+
+		LUA_PushUserdata(gL, P_FindNewPosition(READUINT32(*p)), META_MOBJ);
 		break;
 	case ARCH_PLAYER:
-		LUA_PushUserdata(gL, &players[READUINT8(save_p)], META_PLAYER);
+		LUA_PushUserdata(gL, &players[READUINT8(*p)], META_PLAYER);
 		break;
 	case ARCH_MAPTHING:
-		LUA_PushUserdata(gL, &mapthings[READUINT16(save_p)], META_MAPTHING);
+		LUA_PushUserdata(gL, &mapthings[READUINT16(*p)], META_MAPTHING);
 		break;
 	case ARCH_VERTEX:
-		LUA_PushUserdata(gL, &vertexes[READUINT16(save_p)], META_VERTEX);
+		LUA_PushUserdata(gL, &vertexes[READUINT16(*p)], META_VERTEX);
 		break;
 	case ARCH_LINE:
-		LUA_PushUserdata(gL, &lines[READUINT16(save_p)], META_LINE);
+		LUA_PushUserdata(gL, &lines[READUINT16(*p)], META_LINE);
 		break;
 	case ARCH_SIDE:
-		LUA_PushUserdata(gL, &sides[READUINT16(save_p)], META_SIDE);
+		LUA_PushUserdata(gL, &sides[READUINT16(*p)], META_SIDE);
 		break;
 	case ARCH_SUBSECTOR:
-		LUA_PushUserdata(gL, &subsectors[READUINT16(save_p)], META_SUBSECTOR);
+		LUA_PushUserdata(gL, &subsectors[READUINT16(*p)], META_SUBSECTOR);
 		break;
 	case ARCH_SECTOR:
-		LUA_PushUserdata(gL, &sectors[READUINT16(save_p)], META_SECTOR);
+		LUA_PushUserdata(gL, &sectors[READUINT16(*p)], META_SECTOR);
 		break;
 	case ARCH_SLOPE:
-		LUA_PushUserdata(gL, P_SlopeById(READUINT16(save_p)), META_SLOPE);
+		LUA_PushUserdata(gL, P_SlopeById(READUINT16(*p)), META_SLOPE);
 		break;
 	case ARCH_MAPHEADER:
-		LUA_PushUserdata(gL, mapheaderinfo[READUINT16(save_p)], META_MAPHEADER);
+		LUA_PushUserdata(gL, mapheaderinfo[READUINT16(*p)], META_MAPHEADER);
 		break;
 	case ARCH_TEND:
 		return 1;
+	default:
+		CONS_Alert(CONS_ERROR, "Unknown value type unarchived, save is corrupted!\n");
+		G_SetExitGameFlag();
+		S_StartSound(NULL, sfx_syfail); // he he he
+		M_StartMessage(M_GetText("Corrupted save received\nPress ESC\n"), NULL, MM_NOTHING);
+		return 1;
 	}
 	return 0;
 }
 
-
-// Unarchives from demo_p:
-// Return values:
-// 0: Normal
-// 1: Read table key
-// 2: Read table value
-// 3: Don't use setfield
-
-static UINT8 UnArchiveValueDemo(int TABLESINDEX, char field[1024])
+static void UnArchiveExtVars(UINT8 **p, void *pointer, boolean network)
 {
-	UINT8 type = READUINT8(demo_p);
-	switch (type)
+	int TABLESINDEX;
+	UINT16 field_count = READUINT16(*p);
+	UINT16 i;
+	char field[1024];
+
+	if (field_count == 0)
+		return;
+
+	// Technically possible new, since server may have local lua scripts but no "public" ones, so
+	// field_count would be non zero (there is no way to tell local field from non-local, so
+	// everything gets archived)
+	if (!gL)
+		return;
+
+	TABLESINDEX = lua_gettop(gL);
+	lua_createtable(gL, 0, field_count); // pointer's ext vars subtable
+
+	for (i = 0; i < field_count; i++)
 	{
-	case ARCH_NULL:
-		lua_pushnil(gL);
-		break;
-	case ARCH_BOOLEAN:
-		lua_pushboolean(gL, READUINT8(demo_p));
-		break;
-	case ARCH_SIGNED:
-		lua_pushinteger(gL, READFIXED(demo_p));
-		break;
-	case ARCH_STRING:
-	{
-		UINT16 len = READUINT16(demo_p); // length of string, including embedded zeros
-		char *value;
-		UINT16 i = 0;
-		// See my comments in the ArchiveValue function;
-		// it's much the same for reading strings as writing them!
-		// (i.e. we can't use READSTRING either)
-		// -- Monster Iestyn 05/08/18
-		value = malloc(len); // make temp buffer of size len
-		// now read the actual string
-		while (i < len)
-			value[i++] = READCHAR(demo_p); // read chars individually, including the embedded zeros
-		lua_pushlstring(gL, value, len); // push the string (note: this function supports embedded zeros)
-		free(value); // free the buffer
-		break;
-	}
-	case ARCH_TABLE:
-	{
-		UINT16 tid = READUINT16(demo_p);
-		lua_rawgeti(gL, TABLESINDEX, tid);
-		if (lua_isnil(gL, -1))
+		UINT8 ret;
+		READSTRING(*p, field);
+
+		ret = UnArchiveValue(p, TABLESINDEX, network);
+
+		if (ret == 1)
 		{
-			lua_pop(gL, 1);
-			lua_newtable(gL);
-			lua_pushvalue(gL, -1);
-			lua_rawseti(gL, TABLESINDEX, tid);
-			return 2;
+			CONS_Alert(CONS_ERROR, "Unexpected end marker when reading ExtVars (field '%s')\n", field);
+			break;
 		}
-		break;
-	}
-	case ARCH_MOBJINFO:
-		LUA_PushUserdata(gL, &mobjinfo[READUINT16(demo_p)], META_MOBJINFO);
-		break;
-	case ARCH_STATE:
-		LUA_PushUserdata(gL, &states[READUINT16(demo_p)], META_STATE);
-		break;
-	case ARCH_MOBJ:
-		demo_p += sizeof(UINT32);	// Skip this data, we can't read a mobj here, it'd point to garbage and crash the game.
-		if (field)
+		else if (ret == 3)	// This will return 3 if we shouldn't set this field.
+		{
 			CONS_Alert(CONS_WARNING,"Cannot read mobj_t stored in player variable \'%s\'. Desyncs may occur.\n", field);
-		else
-			CONS_Alert(CONS_WARNING,"Couldn't read mobj_t\n");
+			continue;
+		}
 
-		return 3;	// Don't set the field
-
-	case ARCH_PLAYER:
-		LUA_PushUserdata(gL, &players[READUINT8(demo_p)], META_PLAYER);
-		break;
-	case ARCH_MAPTHING:
-		LUA_PushUserdata(gL, &mapthings[READUINT16(demo_p)], META_MAPTHING);
-		break;
-	case ARCH_VERTEX:
-		LUA_PushUserdata(gL, &vertexes[READUINT16(demo_p)], META_VERTEX);
-		break;
-	case ARCH_LINE:
-		LUA_PushUserdata(gL, &lines[READUINT16(demo_p)], META_LINE);
-		break;
-	case ARCH_SIDE:
-		LUA_PushUserdata(gL, &sides[READUINT16(demo_p)], META_SIDE);
-		break;
-	case ARCH_SUBSECTOR:
-		LUA_PushUserdata(gL, &subsectors[READUINT16(demo_p)], META_SUBSECTOR);
-		break;
-	case ARCH_SECTOR:
-		LUA_PushUserdata(gL, &sectors[READUINT16(demo_p)], META_SECTOR);
-		break;
-	case ARCH_SLOPE:
-		LUA_PushUserdata(gL, P_SlopeById(READUINT16(demo_p)), META_SLOPE);
-		break;
-	case ARCH_MAPHEADER:
-		LUA_PushUserdata(gL, mapheaderinfo[READUINT16(demo_p)], META_MAPHEADER);
-		break;
-	case ARCH_TEND:
-		return 1;
-	}
-	return 0;
-}
-
-static void UnArchiveExtVars(void *pointer)
-{
-	int TABLESINDEX;
-	UINT16 field_count = READUINT16(save_p);
-	UINT16 i;
-	char field[1024];
-
-	if (field_count == 0)
-		return;
-	I_Assert(gL != NULL);
-
-	TABLESINDEX = lua_gettop(gL);
-	lua_createtable(gL, 0, field_count); // pointer's ext vars subtable
-
-	for (i = 0; i < field_count; i++)
-	{
-		READSTRING(save_p, field);
-		UnArchiveValue(TABLESINDEX);
 		lua_setfield(gL, -2, field);
 	}
 
@@ -1500,45 +1170,17 @@ static void UnArchiveExtVars(void *pointer)
 	lua_pop(gL, 2); // pop LREG_EXTVARS and pointer's subtable
 }
 
-static void UnArchiveExtVarsDemo(void *pointer)
-{
-	int TABLESINDEX;
-	UINT16 field_count = READUINT16(demo_p);
-	UINT16 i;
-	char field[1024];
-
-	if (field_count == 0)
-		return;
-	I_Assert(gL != NULL);
-
-	TABLESINDEX = lua_gettop(gL);
-	lua_createtable(gL, 0, field_count); // pointer's ext vars subtable
-
-	for (i = 0; i < field_count; i++)
-	{
-		READSTRING(demo_p, field);
-		if (UnArchiveValueDemo(TABLESINDEX, field) != 3)	// This will return 3 if we shouldn't set this field.
-			lua_setfield(gL, -2, field);
-	}
-
-	lua_getfield(gL, LUA_REGISTRYINDEX, LREG_EXTVARS);
-	I_Assert(lua_istable(gL, -1));
-	lua_pushlightuserdata(gL, pointer);
-	lua_pushvalue(gL, -3); // pointer's ext vars subtable
-	lua_rawset(gL, -3);
-	lua_pop(gL, 2); // pop LREG_EXTVARS and pointer's subtable
-}
-
 static int NetUnArchive(lua_State *L)
 {
 	int TABLESINDEX = lua_upvalueindex(1);
+	savebuffer_t *save = lua_touserdata(L, lua_upvalueindex(2));
 	int i, n = lua_gettop(L);
 	for (i = 1; i <= n; i++)
-		UnArchiveValue(TABLESINDEX);
+		UnArchiveValue(&save->p, TABLESINDEX, true);
 	return n;
 }
 
-static void UnArchiveTables(void)
+static void UnArchiveTables(UINT8 **p, boolean network)
 {
 	int TABLESINDEX;
 	UINT16 i, n;
@@ -1549,55 +1191,42 @@ static void UnArchiveTables(void)
 	TABLESINDEX = lua_gettop(gL);
 
 	n = (UINT16)lua_objlen(gL, TABLESINDEX);
+
 	for (i = 1; i <= n; i++)
 	{
 		lua_rawgeti(gL, TABLESINDEX, i);
-		while (true)
+
+		if (!lua_istable(gL, -1))
 		{
-			if (UnArchiveValue(TABLESINDEX) == 1) // read key
-				break;
-			if (UnArchiveValue(TABLESINDEX) == 2) // read value
-				n++;
-			if (lua_isnil(gL, -2)) // if key is nil (if a function etc was accidentally saved)
-			{
-				CONS_Alert(CONS_ERROR, "A nil key in table %d was found! (Invalid key type or corrupted save?)\n", i);
-				lua_pop(gL, 2); // pop key and value instead of setting them in the table, to prevent Lua panic errors
-			}
-			else
-				lua_rawset(gL, -3);
+			CONS_Alert(CONS_ERROR, "Value in tables list #%d is not a table! (corrupted save?)\n", i);
+			continue;
 		}
-		lua_pop(gL, 1);
-	}
-}
 
-static void UnArchiveTablesDemo(void)
-{
-	int TABLESINDEX;
-	UINT16 i, n;
-
-	if (!gL)
-		return;
-
-	TABLESINDEX = lua_gettop(gL);
-
-	n = (UINT16)lua_objlen(gL, TABLESINDEX);
-	for (i = 1; i <= n; i++)
-	{
-		lua_rawgeti(gL, TABLESINDEX, i);
 		while (true)
 		{
 			UINT8 ret;
 
-			ret = UnArchiveValueDemo(TABLESINDEX, NULL);
+			ret = UnArchiveValue(p, TABLESINDEX, network);
 			if (ret == 3)
+			{
+				CONS_Alert(CONS_WARNING,"Couldn't read mobj_t\n");
 				lua_pushnil(gL);
+			}
 			else if (ret == 1) // read key
 				break;
 
-			ret = UnArchiveValueDemo(TABLESINDEX, NULL);
-
-			if (ret == 3)
+			ret = UnArchiveValue(p, TABLESINDEX, network);
+			if (ret == 1)
+			{
+				CONS_Alert(CONS_ERROR, "Unexpected end of save reached (Corrupted save?)\n");
+				lua_pop(gL, 1); // Pop key
+				break;
+			}
+			else if (ret == 3)
+			{
+				CONS_Alert(CONS_WARNING,"Couldn't read mobj_t\n");
 				lua_pushnil(gL);
+			}
 			else if (ret == 2) // read value
 				n++;
 
@@ -1609,19 +1238,25 @@ static void UnArchiveTablesDemo(void)
 			else
 				lua_rawset(gL, -3);
 		}
+
 		lua_pop(gL, 1);
 	}
 }
 
-void LUA_Step(void)
+/*void LUA_Step(void)
 {
 	if (!gL)
 		return;
-	lua_settop(gL, 0);
-	lua_gc(gL, LUA_GCSTEP, 1);
-}
 
-void LUA_Archive(void)
+	if (lua_gettop(gL) != 0)
+	{
+		CONS_Alert(CONS_WARNING, "Eek, there is garbage on lua stack!\n");
+		lua_settop(gL, 0);
+		lua_gc(gL, LUA_GCSTEP, 1);
+	}
+}*/
+
+void LUA_Archive(savebuffer_t *save, boolean network)
 {
 	INT32 i;
 	thinker_t *th;
@@ -1631,37 +1266,38 @@ void LUA_Archive(void)
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		if (!playeringame[i] && i > 0)	// NEVER skip player 0, this is for dedi servs.
+		if (!playeringame[i] && i > 0) // NEVER skip player 0, this is for dedi servs.
 			continue;
 		// all players in game will be archived, even if they just add a 0.
-		ArchiveExtVars(&players[i], "player");
+		ArchiveExtVars(&save->p, &players[i], "player");
 	}
 
-	if (gamestate == GS_LEVEL)
+	if (network == true)
 	{
-		for (th = thinkercap.next; th != &thinkercap; th = th->next)
+		if (gamestate == GS_LEVEL)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
+			for (th = thinkercap.next; th != &thinkercap; th = th->next)
+			{
+				if (th->function != (actionf_p1)P_MobjThinker)
+					continue;
 
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-				continue;
-
-			// archive function will determine when to skip mobjs,
-			// and write mobjnum in otherwise.
-			ArchiveExtVars(th, "mobj");
+				// archive function will determine when to skip mobjs,
+				// and write mobjnum in otherwise.
+				ArchiveExtVars(&save->p, th, "mobj");
+			}
 		}
-	}
-	WRITEUINT32(save_p, UINT32_MAX); // end of mobjs marker, replaces mobjnum.
+		WRITEUINT32(save->p, UINT32_MAX); // end of mobjs marker, replaces mobjnum.
 
-	LUAh_NetArchiveHook(NetArchive); // call the NetArchive hook in archive mode
-	ArchiveTables();
+		LUA_HookNetArchive(NetArchive, save); // call the NetArchive hook in archive mode
+	}
+
+	ArchiveTables(&save->p);
 
 	if (gL)
 		lua_pop(gL, 1); // pop tables
 }
 
-void LUA_UnArchive(void)
+void LUA_UnArchive(savebuffer_t *save, boolean network)
 {
 	UINT32 mobjnum;
 	INT32 i;
@@ -1674,9 +1310,11 @@ void LUA_UnArchive(void)
 	{
 		if (!playeringame[i] && i > 0)	// same here, this is to synch dediservs properly.
 			continue;
-		UnArchiveExtVars(&players[i]);
+
+		UnArchiveExtVars(&save->p, &players[i], network);
 	}
 
+<<<<<<< HEAD
 	do {
 		mobjnum = READUINT32(save_p); // read a mobjnum	
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
@@ -1707,35 +1345,29 @@ void LUA_ArchiveDemo(void)
 		lua_newtable(gL); // tables to be archived.
 
 	for (i = 0; i < MAXPLAYERS; i++)
+=======
+	if (network == true)
+>>>>>>> Saturn-Next
 	{
-		if (!playeringame[i] && i > 0)	// NEVER skip player 0, this is for dedi servs.
-			continue;
-		// all players in game will be archived, even if they just add a 0.
-		ArchiveExtVarsDemo(&players[i], "player");
+		do {
+			mobjnum = READUINT32(save->p); // read a mobjnum
+
+			for (th = thinkercap.next; th != &thinkercap; th = th->next)
+			{
+				if (th->function != (actionf_p1)P_MobjThinker)
+					continue;
+
+				if (((mobj_t *)th)->mobjnum != mobjnum) // find matching mobj
+					continue;
+				UnArchiveExtVars(&save->p, th, network); // apply variables
+			}
+
+		} while (mobjnum != UINT32_MAX); // repeat until end of mobjs marker.
+
+		LUA_HookNetArchive(NetUnArchive, save); // call the NetArchive hook in unarchive mode
 	}
 
-	ArchiveTablesDemo();
-
-	if (gL)
-		lua_pop(gL, 1); // pop tables
-}
-
-// this time make sure we read from demo_p
-void LUA_UnArchiveDemo(void)
-{
-	INT32 i;
-
-	if (gL)
-		lua_newtable(gL); // tables to be read
-
-	for (i = 0; i < MAXPLAYERS; i++)
-	{
-		if (!playeringame[i] && i > 0)	// same here, this is to synch dediservs properly.
-			continue;
-		UnArchiveExtVarsDemo(&players[i]);
-	}
-
-	UnArchiveTablesDemo();
+	UnArchiveTables(&save->p, network);
 
 	if (gL)
 		lua_pop(gL, 1); // pop tables
diff --git a/src/lua_script.h b/src/lua_script.h
index e16911d9c..a8f102522 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -10,9 +10,13 @@
 /// \file  lua_script.h
 /// \brief Lua scripting basics
 
+#ifndef LUA_SCRIPT_H
+#define LUA_SCRIPT_H
+
 #include "m_fixed.h"
 #include "doomtype.h"
 #include "d_player.h"
+#include "p_saveg.h"
 
 #include "blua/lua.h"
 #include "blua/lualib.h"
@@ -56,18 +60,15 @@ void LUA_InvalidateUserdata(void *data);
 void LUA_InvalidateLevel(void);
 void LUA_InvalidateMapthings(void);
 void LUA_InvalidatePlayer(player_t *player);
-void LUA_Step(void);
-void LUA_Archive(void);
-void LUA_UnArchive(void);
-
-void LUA_ArchiveDemo(void);
-void LUA_UnArchiveDemo(void);
+//void LUA_Step(void);
+void LUA_Archive(savebuffer_t *save, boolean network);
+void LUA_UnArchive(savebuffer_t *save, boolean network);
 
 void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c
 void LUA_CVarChanged(const char *name); // lua_consolelib.c
 int Lua_optoption(lua_State *L, int narg, int def, int list_ref);
 int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
-void LUAh_NetArchiveHook(lua_CFunction archFunc);
+void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save);
 
 // Console wrapper
 void COM_Lua_f(void);
@@ -79,19 +80,30 @@ void COM_Lua_f(void);
 #define LUA_Deprecated(L,this_func,use_instead)\
 {\
 	static UINT8 seen = 0;\
-	if (!seen) {\
+	if (UNLIKELY(!seen)) {\
 		seen = 1;\
 		CONS_Alert(CONS_WARNING,"\"%s\" is deprecated and will be removed.\nUse \"%s\" instead.\n", this_func, use_instead);\
 	}\
 }
 
+#define LUA_LogDeprecated(L,this_func,use_instead)\
+{\
+	static UINT8 seen = 0;\
+	if (UNLIKELY(!seen)) {\
+		seen = 1;\
+		CON_LogMessage(va("\"%s\" is deprecated and will be removed.\nUse \"%s\" instead.\n", this_func, use_instead));\
+	}\
+}
+
 // Warnings about incorrect function usage.
 // Shows once, then never again, like deprecation
 #define LUA_UsageWarning(L, warningmsg)\
 {\
 	static UINT8 seen = 0;\
-	if (!seen) {\
+	if (UNLIKELY(!seen)) {\
 		seen = 1;\
 		CONS_Alert(CONS_WARNING,"%s\n", warningmsg);\
 	}\
 }
+
+#endif/*LUA_SCRIPT_H*/
diff --git a/src/lua_skinlib.c b/src/lua_skinlib.c
index 403ac834e..4425f125c 100644
--- a/src/lua_skinlib.c
+++ b/src/lua_skinlib.c
@@ -12,6 +12,7 @@
 
 #include "doomdef.h"
 #include "fastcmp.h"
+#include "r_skins.h"
 #include "r_things.h"
 #include "sounds.h"
 
@@ -277,4 +278,4 @@ int LUA_SkinLib(lua_State *L)
 	lua_setglobal(L, "skins");
 
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/src/lua_thinkerlib.c b/src/lua_thinkerlib.c
index 8315e7c3d..142bc103a 100644
--- a/src/lua_thinkerlib.c
+++ b/src/lua_thinkerlib.c
@@ -32,7 +32,7 @@ struct iterationState {
 	int next;
 };
 
-static int iterationState_gc(lua_State *L)
+FUNCINLINE static ATTRINLINE int iterationState_gc(lua_State *L)
 {
 	struct iterationState *it = luaL_checkudata(L, -1, META_ITERATIONSTATE);
 	if (it->next != LUA_REFNIL)
@@ -44,7 +44,7 @@ static int iterationState_gc(lua_State *L)
 }
 
 #define push_thinker(th) {\
-	if ((th)->function.acp1 == (actionf_p1)P_MobjThinker) \
+	if ((th)->function == (actionf_p1)P_MobjThinker) \
 		LUA_PushUserdata(L, (th), META_MOBJ); \
 	else \
 		lua_pushlightuserdata(L, (th)); \
@@ -88,7 +88,7 @@ static int lib_iterateThinkers(lua_State *L)
 		return luaL_error(L, "next thinker invalidated during iteration");
 
 	for (; next != &thinkercap; next = next->next)
-		if (!it->filter || next->function.acp1 == it->filter)
+		if (!it->filter || next->function == it->filter)
 		{
 			push_thinker(next);
 			if (next->next != &thinkercap)
@@ -130,4 +130,4 @@ int LUA_ThinkerLib(lua_State *L)
 		lua_setfield(L, -2, "iterate");
 	lua_setglobal(L, "thinkers");
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/src/lzf.c b/src/lzf.c
index f81c3ee0a..96f8973fc 100644
--- a/src/lzf.c
+++ b/src/lzf.c
@@ -37,9 +37,8 @@
 /*
  * Sacrifice very little compression quality in favour of compression speed.
  * This gives almost the same compression as the default code, and is
- * (very roughly) 15% faster. This is the preferable mode of operation.
+ * (very roughly) 15% faster. This is the preferred mode of operation.
  */
-
 #ifndef VERY_FAST
 # define VERY_FAST 1
 #endif
@@ -48,7 +47,7 @@
  * Sacrifice some more compression quality in favour of compression speed.
  * (roughly 1-2% worse compression for large blocks and
  * 9-10% for small, redundant, blocks and >>20% better speed in both cases)
- * In INT16: when in need for speed, enable this for binary data,
+ * In short: when in need for speed, enable this for binary data,
  * possibly disable this for text data.
  */
 #ifndef ULTRA_FAST
@@ -80,7 +79,8 @@
 
 /*
  * You may choose to pre-set the hash table (might be faster on some
- * modern cpus and large (>>64k) blocks)
+ * modern cpus and large (>>64k) blocks, and also makes compression
+ * deterministic/repeatable when the configuration otherwise is the same).
  */
 #ifndef INIT_HTAB
 # define INIT_HTAB 1
@@ -88,15 +88,15 @@
 
 /*
  * Avoid assigning values to errno variable? for some embedding purposes
- * (linux kernel for example), this is neccessary. NOTE: this breaks
- * the documentation in lzf.h.
+ * (linux kernel for example), this is necessary. NOTE: this breaks
+ * the documentation in lzf.h. Avoiding errno has no speed impact.
  */
 #ifndef AVOID_ERRNO
 # define AVOID_ERRNO 0
 #endif
 
 /*
- * Wether to pass the LZF_STATE variable as argument, or allocate it
+ * Whether to pass the LZF_STATE variable as argument, or allocate it
  * on the stack. For small-stack environments, define this to 1.
  * NOTE: this breaks the prototype in lzf.h.
  */
@@ -105,11 +105,11 @@
 #endif
 
 /*
- * Wether to add extra checks for input validity in lzf_decompress
+ * Whether to add extra checks for input validity in lzf_decompress
  * and return EINVAL if the input stream has been corrupted. This
  * only shields against overflowing the input buffer and will not
  * detect most corrupted streams.
- * This check is not normally noticable on modern hardware
+ * This check is not normally noticeable on modern hardware
  * (<1% slowdown), but might slow down older cpus considerably.
  */
 #ifndef CHECK_INPUT
diff --git a/src/m_aatree.c b/src/m_aatree.c
index f19fa1dc0..56e528f54 100644
--- a/src/m_aatree.c
+++ b/src/m_aatree.c
@@ -20,17 +20,17 @@
 
 typedef struct aatree_node_s
 {
-	INT32	level;
-	INT32	key;
-	void*	value;
+	INT32 key;
+	INT32 depth;
+	void *value;
 
 	struct aatree_node_s *left, *right;
 } aatree_node_t;
 
 struct aatree_s
 {
-	aatree_node_t	*root;
-	UINT32		flags;
+	aatree_node_t *root;
+	UINT32 flags;
 };
 
 aatree_t *M_AATreeAlloc(UINT32 flags)
@@ -56,40 +56,48 @@ void M_AATreeFree(aatree_t *aatree)
 	Z_Free(aatree);
 }
 
-static aatree_node_t *M_AATreeSkew(aatree_node_t *node)
+static aatree_node_t *M_AATreeRotateRight(aatree_node_t *node)
 {
-	if (node && node->left && node->left->level == node->level)
-	{
-		// Not allowed: horizontal left-link. Reverse the
-		// horizontal link and hook the orphan back in.
-		aatree_node_t *oldleft = node->left;
-		node->left = oldleft->right;
-		oldleft->right = node;
-
-		return oldleft;
-	}
-
-	// No change needed.
-	return node;
+	aatree_node_t *newnode = node->left;
+	aatree_node_t *tmp = newnode->right;
+	newnode->right = node;
+	node->left = tmp;
+	return newnode;
 }
 
-static aatree_node_t *M_AATreeSplit(aatree_node_t *node)
+static aatree_node_t *M_AATreeRotateLeft(aatree_node_t *node)
 {
-	if (node && node->right && node->right->right && node->level == node->right->right->level)
+	aatree_node_t *newnode = node->right;
+	aatree_node_t *tmp = newnode->left;
+	newnode->left = node;
+	node->right = tmp;
+	return newnode;
+}
+
+static aatree_node_t *M_AATreeRebalance(aatree_node_t *node)
+{
+	INT32 balance;
+	if (node->left == NULL && node->right == NULL)
+		return node;
+	if (node->left == NULL)
+		balance = -node->right->depth;
+	else if (node->right == NULL)
+		balance = node->left->depth;
+	else
 	{
-		// Not allowed: two consecutive horizontal right-links.
-		// The middle one becomes the new root at this point,
-		// with suitable adjustments below.
+		I_Assert(node->left->key < node->right->key);
+		balance = node->left->depth - node->right->depth;
+	}
 
-		aatree_node_t *oldright = node->right;
-		node->right = oldright->left;
-		oldright->left = node;
-		oldright->level++;
-
-		return oldright;
+	if (balance > 1)
+	{
+		return M_AATreeRotateRight(node);
+	}
+	else if (balance < -1)
+	{
+		return M_AATreeRotateLeft(node);
 	}
 
-	// No change needed.
 	return node;
 }
 
@@ -98,13 +106,12 @@ static aatree_node_t *M_AATreeSet_Node(aatree_node_t *node, UINT32 flags, INT32
 	if (!node)
 	{
 		// Nothing here, so just add where we are
-
 		node = Z_Malloc(sizeof (aatree_node_t), PU_STATIC, NULL);
-		node->level = 1;
 		node->key = key;
 		if (value && (flags & AATREE_ZUSER)) Z_SetUser(value, &node->value);
 		else node->value = value;
 		node->left = node->right = NULL;
+		node->depth = 1;
 	}
 	else
 	{
@@ -118,8 +125,17 @@ static aatree_node_t *M_AATreeSet_Node(aatree_node_t *node, UINT32 flags, INT32
 			else node->value = value;
 		}
 
-		node = M_AATreeSkew(node);
-		node = M_AATreeSplit(node);
+		node = M_AATreeRebalance(node);
+		if (node->left == NULL && node->right == NULL)
+			node->depth = 1;
+		else if (node->left == NULL)
+			node->depth = node->right->depth + 1;
+		else if (node->right == NULL)
+			node->depth = node->left->depth + 1;
+		else if (node->left->depth > node->right->depth)
+			node->depth = node->left->depth + 1;
+		else
+			node->depth = node->right->depth + 1;
 	}
 
 	return node;
@@ -134,11 +150,11 @@ void M_AATreeSet(aatree_t *aatree, INT32 key, void* value)
 // and nodes with value == NULL.
 static void *M_AATreeGet_Node(aatree_node_t *node, INT32 key)
 {
-	if (node)
+	if (LIKELY(node))
 	{
-		if (node->key == key)
+		if (UNLIKELY(node->key == key))
 			return node->value;
-		else if(node->key < key)
+		else if (node->key < key)
 			return M_AATreeGet_Node(node->right, key);
 		else
 			return M_AATreeGet_Node(node->left, key);
@@ -152,7 +168,6 @@ void *M_AATreeGet(aatree_t *aatree, INT32 key)
 	return M_AATreeGet_Node(aatree->root, key);
 }
 
-
 static void M_AATreeIterate_Node(aatree_node_t *node, aatree_iter_t callback)
 {
 	if (node->left) M_AATreeIterate_Node(node->left, callback);
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 44b5a96c0..2d3f9c4e6 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -32,6 +32,7 @@ consvar_t cv_gif_downscale =  {"gif_downscale", "On", CV_SAVE, CV_OnOff, NULL, 0
 #ifdef HAVE_ANIGIF
 static boolean gif_optimize = false; // So nobody can do something dumb
 static boolean gif_downscale = false; // like changing cvars mid output
+static RGBA_t *gif_palette = NULL;
 
 static FILE *gif_out = NULL;
 static INT32 gif_frames = 0;
@@ -461,13 +462,15 @@ static size_t gifframe_size = 8192;
 // converts an RGB frame to a frame with a palette.
 //
 #ifdef HWRENDER
+static colorlookup_t gif_colorlookup;
+
 static void GIF_rgbconvert(UINT8 *linear, UINT8 *scr)
 {
 	UINT8 r, g, b;
 	size_t src, dest;
 	int x, y;
 
-	InitColorLUT();
+	InitColorLUT(&gif_colorlookup, gif_palette, true);
 
 	for (x = 0; x < vid.width; x += scrbuf_downscaleamt)
 	{
@@ -479,7 +482,7 @@ static void GIF_rgbconvert(UINT8 *linear, UINT8 *scr)
 			r = (UINT8)linear[src];
 			g = (UINT8)linear[src + 1];
 			b = (UINT8)linear[src + 2];
-			scr[dest] = colorlookup[r >> SHIFTCOLORBITS][g >> SHIFTCOLORBITS][b >> SHIFTCOLORBITS];
+			scr[dest] = GetColorLUTDirect(&gif_colorlookup, r, g, b);
 		}
 	}
 }
@@ -492,7 +495,7 @@ static void GIF_rgbconvert(UINT8 *linear, UINT8 *scr)
 static void GIF_framewrite(void)
 {
 	UINT8 *p;
-	UINT8 *movie_screen = screens[2];
+	UINT8 *movie_screen = vid.screens[2];
 	INT32 blitx, blity, blitw, blith;
 
 	if (!gifframe_data)
@@ -506,7 +509,7 @@ static void GIF_framewrite(void)
 	if (gif_optimize && gif_frames > 0)
 	{
 		// before blit movie_screen points to last frame, cur_screen points to this frame
-		UINT8 *cur_screen = screens[0];
+		UINT8 *cur_screen = vid.screens[0];
 		GIF_optimizeregion(cur_screen, movie_screen, &blitx, &blity, &blitw, &blith);
 
 		// blit to temp screen
@@ -532,7 +535,7 @@ static void GIF_framewrite(void)
 		if (rendermode == render_opengl)
 		{
 			UINT8 *linear = HWR_GetScreenshot();
-			GIF_rgbconvert(linear, screens[0]);
+			GIF_rgbconvert(linear, vid.screens[0]);
 			//free(linear); // Allocated 'statically', no need to free now
 		}
 #endif
@@ -542,7 +545,7 @@ static void GIF_framewrite(void)
 		if (gif_frames == 0 && rendermode == render_soft)
 			I_ReadScreen(movie_screen);
 
-		movie_screen = screens[0];
+		movie_screen = vid.screens[0];
 	}
 
 	// screen regions are handled in GIF_lzw
@@ -636,6 +639,10 @@ INT32 GIF_open(const char *filename)
 
 	gif_optimize = (!!cv_gif_optimize.value);
 	gif_downscale = (!!cv_gif_downscale.value);
+
+	// no master palettes in SRB2Kart land
+	gif_palette = pLocalPalette;
+
 	GIF_headwrite();
 	gif_frames = 0;
 	return 1;
diff --git a/src/m_argv.h b/src/m_argv.h
index f31a531d0..8f1a08ec4 100644
--- a/src/m_argv.h
+++ b/src/m_argv.h
@@ -14,6 +14,10 @@
 #ifndef __M_ARGV__
 #define __M_ARGV__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //
 // MISC
 //
@@ -42,4 +46,8 @@ const char *M_GetNextParm(void);
 // Finds and loads a response file (@moreargs.txt)
 void M_FindResponseFile(void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif //__M_ARGV__
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 6b93461f3..d4120368d 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -57,29 +57,11 @@ typedef struct
 //                             CHEAT Structures
 // ==========================================================================
 
-// Cheat responders
-/*static UINT8 cheatf_ultimate(void)
-{
-	if (menuactive && (currentMenu != &MainDef && currentMenu != &SP_LoadDef))
-		return 0; // Only on the main menu, or the save select!
-
-	S_StartSound(0, sfx_itemup);
-	ultimate_selectable = (!ultimate_selectable);
-
-	// If on the save select, move to what is now Ultimate Mode!
-	if (currentMenu == &SP_LoadDef)
-		M_ForceSaveSlotSelected(NOSAVESLOT);
-	return 1;
-}*/
-
 static UINT8 cheatf_warp(void)
 {
 	UINT8 i;
 	boolean success = false;
 
-	/*if (modifiedgame)
-		return 0;*/
-
 	if (menuactive && currentMenu != &MainDef)
 		return 0; // Only on the main menu!
 
@@ -134,18 +116,6 @@ static UINT8 cheatf_devmode(void)
 }
 #endif
 
-/*static cheatseq_t cheat_ultimate = {
-	0, cheatf_ultimate,
-	{ SCRAMBLE('u'), SCRAMBLE('l'), SCRAMBLE('t'), SCRAMBLE('i'), SCRAMBLE('m'), SCRAMBLE('a'), SCRAMBLE('t'), SCRAMBLE('e'), 0xff }
-};*/
-
-/*static cheatseq_t cheat_ultimate_joy = {
-	0, cheatf_ultimate,
-	{ SCRAMBLE(KEY_UPARROW), SCRAMBLE(KEY_UPARROW), SCRAMBLE(KEY_DOWNARROW), SCRAMBLE(KEY_DOWNARROW),
-	  SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_RIGHTARROW), SCRAMBLE(KEY_LEFTARROW), SCRAMBLE(KEY_RIGHTARROW),
-	  SCRAMBLE(KEY_ENTER), 0xff }
-};*/
-
 static cheatseq_t cheat_warp = {
 	0, cheatf_warp,
 	//{ SCRAMBLE('r'), SCRAMBLE('e'), SCRAMBLE('d'), SCRAMBLE('x'), SCRAMBLE('v'), SCRAMBLE('i'), 0xff }
@@ -376,70 +346,6 @@ void Command_Hurtme_f(void)
 	P_DamageMobj(players[consoleplayer].mo, NULL, NULL, atoi(COM_Argv(1)));
 }
 
-// Moves the NiGHTS player to another axis within the current mare
-/*void Command_JumpToAxis_f(void)
-{
-	REQUIRE_DEVMODE;
-	REQUIRE_INLEVEL;
-	REQUIRE_SINGLEPLAYER;
-
-	if (COM_Argc() != 2)
-	{
-		CONS_Printf(M_GetText("jumptoaxis <axisnum>: Jump to axis within current mare.\n"));
-		return;
-	}
-
-	P_TransferToAxis(&players[consoleplayer], atoi(COM_Argv(1)));
-}
-
-void Command_Charability_f(void)
-{
-	REQUIRE_DEVMODE;
-	REQUIRE_INLEVEL;
-	REQUIRE_SINGLEPLAYER;
-
-	if (COM_Argc() < 3)
-	{
-		CONS_Printf(M_GetText("charability <1/2> <value>: change character abilities\n"));
-		return;
-	}
-
-	if (atoi(COM_Argv(1)) == 1)
-		players[consoleplayer].charability = (UINT8)atoi(COM_Argv(2));
-	else if (atoi(COM_Argv(1)) == 2)
-		players[consoleplayer].charability2 = (UINT8)atoi(COM_Argv(2));
-	else
-		CONS_Printf(M_GetText("charability <1/2> <value>: change character abilities\n"));
-}
-
-void Command_Charspeed_f(void)
-{
-	REQUIRE_DEVMODE;
-	REQUIRE_INLEVEL;
-	REQUIRE_SINGLEPLAYER;
-
-	if (COM_Argc() < 3)
-	{
-		CONS_Printf(M_GetText("charspeed <normalspeed/runspeed/thrustfactor/accelstart/acceleration/actionspd> <value>: set character speed\n"));
-		return;
-	}
-
-	if (!strcasecmp(COM_Argv(1), "normalspeed"))
-		players[consoleplayer].normalspeed = atoi(COM_Argv(2))<<FRACBITS;
-	else if (!strcasecmp(COM_Argv(1), "runspeed"))
-		players[consoleplayer].runspeed = atoi(COM_Argv(2))<<FRACBITS;
-	else if (!strcasecmp(COM_Argv(1), "thrustfactor"))
-		players[consoleplayer].thrustfactor = atoi(COM_Argv(2));
-	else if (!strcasecmp(COM_Argv(1), "accelstart"))
-		players[consoleplayer].accelstart = atoi(COM_Argv(2));
-	else if (!strcasecmp(COM_Argv(1), "acceleration"))
-		players[consoleplayer].acceleration = atoi(COM_Argv(2));
-	else if (!strcasecmp(COM_Argv(1), "actionspd"))
-		players[consoleplayer].actionspd = atoi(COM_Argv(2))<<FRACBITS;
-	else
-		CONS_Printf(M_GetText("charspeed <normalspeed/runspeed/thrustfactor/accelstart/acceleration/actionspd> <value>: set character speed\n"));
-}*/
-
 void Command_RTeleport_f(void)
 {
 	fixed_t intx, inty, intz;
@@ -682,28 +588,6 @@ void Command_Savecheckpoint_f(void)
 	CONS_Printf(M_GetText("Temporary checkpoint created at %d, %d, %d\n"), players[consoleplayer].starpostx, players[consoleplayer].starposty, players[consoleplayer].starpostz);
 }
 
-// Like M_GetAllEmeralds() but for console devmode junkies.
-/*void Command_Getallemeralds_f(void)
-{
-	REQUIRE_SINGLEPLAYER;
-	REQUIRE_NOULTIMATE;
-	REQUIRE_PANDORA;
-
-	emeralds = ((EMERALD7)*2)-1;
-
-	CONS_Printf(M_GetText("You now have all 7 emeralds.\n"));
-}
-
-void Command_Resetemeralds_f(void)
-{
-	REQUIRE_SINGLEPLAYER;
-	REQUIRE_PANDORA;
-
-	emeralds = 0;
-
-	CONS_Printf(M_GetText("Emeralds reset to zero.\n"));
-}*/
-
 void Command_Devmode_f(void)
 {
 #ifndef _DEBUG
@@ -730,63 +614,6 @@ void Command_Devmode_f(void)
 	G_SetGameModified(multiplayer, true);
 }
 
-/*void Command_Setrings_f(void)
-{
-	REQUIRE_INLEVEL;
-	REQUIRE_SINGLEPLAYER;
-	REQUIRE_NOULTIMATE;
-	REQUIRE_PANDORA;
-
-	if (COM_Argc() > 1)
-	{
-		// P_GivePlayerRings does value clamping
-		players[consoleplayer].health = players[consoleplayer].mo->health = 1;
-		P_GivePlayerRings(&players[consoleplayer], atoi(COM_Argv(1)));
-		if (!G_IsSpecialStage(gamemap) || !useNightsSS)
-			players[consoleplayer].totalring -= atoi(COM_Argv(1)); //undo totalring addition done in P_GivePlayerRings
-
-		G_SetGameModified(multiplayer);
-	}
-}
-
-void Command_Setlives_f(void)
-{
-	REQUIRE_INLEVEL;
-	REQUIRE_SINGLEPLAYER;
-	REQUIRE_NOULTIMATE;
-	REQUIRE_PANDORA;
-
-	if (COM_Argc() > 1)
-	{
-		// P_GivePlayerLives does value clamping
-		players[consoleplayer].lives = 0;
-		P_GivePlayerLives(&players[consoleplayer], atoi(COM_Argv(1)));
-
-		G_SetGameModified(multiplayer);
-	}
-}
-
-void Command_Setcontinues_f(void)
-{
-	REQUIRE_INLEVEL;
-	REQUIRE_SINGLEPLAYER;
-	REQUIRE_NOULTIMATE;
-	REQUIRE_PANDORA;
-
-	if (COM_Argc() > 1)
-	{
-		INT32 numcontinues = atoi(COM_Argv(1));
-		if (numcontinues > 99)
-			numcontinues = 99;
-		else if (numcontinues < 0)
-			numcontinues = 0;
-
-		players[consoleplayer].continues = numcontinues;
-
-		G_SetGameModified(multiplayer);
-	}
-}*/
-
 //
 // OBJECTPLACE (and related variables)
 //
@@ -864,7 +691,7 @@ static boolean OP_HeightOkay(player_t *player, UINT8 ceiling)
 	{
 		// Truncate position to match where mapthing would be when spawned
 		// (this applies to every further P_GetZAt call as well)
-		fixed_t cheight = sec->c_slope ? P_GetZAt(sec->c_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->ceilingheight;
+		fixed_t cheight = P_GetSectorCeilingZAt(sec, (player->mo->x & 0xFFFF0000), (player->mo->y & 0xFFFF0000));
 
 		if (((cheight - player->mo->z - player->mo->height)>>FRACBITS) >= (1 << (16-ZSHIFT)))
 		{
@@ -875,7 +702,8 @@ static boolean OP_HeightOkay(player_t *player, UINT8 ceiling)
 	}
 	else
 	{
-		fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->floorheight;
+		fixed_t fheight = P_GetSectorFloorZAt(sec, (player->mo->x & 0xFFFF0000), (player->mo->y & 0xFFFF0000));
+
 		if (((player->mo->z - fheight)>>FRACBITS) >= (1 << (16-ZSHIFT)))
 		{
 			CONS_Printf(M_GetText("Sorry, you're too %s to place this object (max: %d %s).\n"), M_GetText("high"),
@@ -904,9 +732,7 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
 
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo = (mobj_t *)th;
@@ -924,12 +750,12 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
 	mt->y = (INT16)(player->mo->y>>FRACBITS);
 	if (ceiling)
 	{
-		fixed_t cheight = sec->c_slope ? P_GetZAt(sec->c_slope, mt->x << FRACBITS, mt->y << FRACBITS) : sec->ceilingheight;
+		fixed_t cheight = P_GetSectorCeilingZAt(sec, (mt->x << FRACBITS), (mt->y << FRACBITS));
 		mt->options = (UINT16)((cheight - player->mo->z - player->mo->height)>>FRACBITS);
 	}
 	else
 	{
-		fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, mt->x << FRACBITS, mt->y << FRACBITS) : sec->floorheight;
+		fixed_t fheight = P_GetSectorFloorZAt(sec, (mt->x << FRACBITS), (mt->y << FRACBITS));
 		mt->options = (UINT16)((player->mo->z - fheight)>>FRACBITS);
 	}
 	mt->options <<= ZSHIFT;
@@ -986,8 +812,7 @@ void OP_NightsObjectplace(player_t *player)
 		UINT16 angle = (UINT16)(player->anotherflyangle % 360);
 		INT16 temp = (INT16)FixedInt(AngleFixed(player->mo->angle)); // Traditional 2D Angle
 		sector_t *sec = player->mo->subsector->sector;
-		fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->floorheight;
-
+		fixed_t fheight = P_GetSectorFloorZAt(sec, (player->mo->x & 0xFFFF0000), (player->mo->y & 0xFFFF0000));
 
 		player->pflags |= PF_ATTACKDOWN;
 
@@ -1008,17 +833,6 @@ void OP_NightsObjectplace(player_t *player)
 		P_SpawnHoopsAndRings(mt);
 	}
 
-	// This places a bumper!
-	/*if (cmd->buttons & BT_SPECTATE)
-	{
-		player->pflags |= PF_ATTACKDOWN;
-		if (!OP_HeightOkay(player, false))
-			return;
-
-		mt = OP_CreateNewMapThing(player, (UINT16)mobjinfo[MT_NIGHTSBUMPER].doomednum, false);
-		P_SpawnMapThing(mt);
-	}*/
-
 	// This places a ring!
 	if (cmd->buttons & BT_BACKWARD)
 	{
@@ -1093,7 +907,7 @@ void OP_ObjectplaceMovement(player_t *player)
 {
 	ticcmd_t *cmd = &player->cmd;
 
-	if (!player->climbing && (netgame || !cv_analog.value || (player->pflags & PF_SPINNING)))
+	if (!player->climbing && (netgame || (player->pflags & PF_SPINNING)))
 		player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */);
 
 	ticruned++;
@@ -1143,12 +957,12 @@ void OP_ObjectplaceMovement(player_t *player)
 
 		if (!!(mobjinfo[op_currentthing].flags & MF_SPAWNCEILING) ^ !!(cv_opflags.value & MTF_OBJECTFLIP))
 		{
-			fixed_t cheight = sec->c_slope ? P_GetZAt(sec->c_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->ceilingheight;
+			fixed_t cheight = P_GetSectorCeilingZAt(sec, (player->mo->x & 0xFFFF0000), (player->mo->y & 0xFFFF0000));
 			op_displayflags = (UINT16)((cheight - player->mo->z - mobjinfo[op_currentthing].height)>>FRACBITS);
 		}
 		else
 		{
-			fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->floorheight;
+			fixed_t fheight = P_GetSectorFloorZAt(sec, (player->mo->x & 0xFFFF0000), (player->mo->y & 0xFFFF0000));
 			op_displayflags = (UINT16)((player->mo->z - fheight)>>FRACBITS);
 		}
 		op_displayflags <<= ZSHIFT;
@@ -1165,12 +979,7 @@ void OP_ObjectplaceMovement(player_t *player)
 		return;
 	}
 
-	/*if (cmd->buttons & BT_FORWARD)
-	{
-		OP_CycleThings(-1);
-		player->pflags |= PF_ATTACKDOWN;
-	}
-	else*/ if (cmd->buttons & BT_DRIFT)
+	if (cmd->buttons & BT_DRIFT)
 	{
 		OP_CycleThings(1);
 		player->pflags |= PF_ATTACKDOWN;
diff --git a/src/m_cond.c b/src/m_cond.c
index b777e7d22..f9d871969 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -21,6 +21,7 @@
 #include "r_things.h" // numskins
 //#include "r_draw.h" // R_GetColorByName
 #include "k_kart.h" // K_GetKartColorByName
+#include "k_stats.h"
 
 // Map triggers for linedef executors
 // 32 triggers, one bit each
@@ -286,9 +287,9 @@ UINT8 M_CheckCondition(condition_t *cn)
 	switch (cn->type)
 	{
 		case UC_PLAYTIME: // Requires total playing time >= x
-			return (totalplaytime >= (unsigned)cn->requirement);
+			return (kartstats.totalplaytime >= (unsigned)cn->requirement);
 		case UC_MATCHESPLAYED: // Requires any level completed >= x times
-			return (matchesplayed >= (unsigned)cn->requirement);
+			return (kartstats.matchesplayed >= (unsigned)cn->requirement);
 		case UC_GAMECLEAR: // Requires game beaten >= x times
 			return (timesBeaten >= (unsigned)cn->requirement);
 		case UC_ALLEMERALDS: // Requires game beaten with all 7 emeralds >= x times
@@ -384,9 +385,7 @@ UINT8 M_UpdateUnlockablesAndExtraEmblems(boolean force)
 	INT32 i;
 	char cechoText[992] = "";
 	UINT8 cechoLines = 0;
-
-	if (majormods && !force) // SRB2Kart: for enabling unlocks online in modified servers
-		return false;
+	(void)force;
 
 	M_CheckUnlockConditions();
 
diff --git a/src/m_emotes.cpp b/src/m_emotes.cpp
new file mode 100644
index 000000000..facc7fb54
--- /dev/null
+++ b/src/m_emotes.cpp
@@ -0,0 +1,262 @@
+#include <map>
+#include <string>
+#include <sstream>
+#include <cstring>
+
+#include "m_emotes.h"
+
+extern "C" {
+#include "w_wad.h"
+#include "z_zone.h"
+#include "hu_stuff.h"
+#include "v_video.h"
+}
+
+consvar_t cv_emotes = {"emotes", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};;
+
+static std::map<std::string, emote_t> emotes;
+
+// TODO - Would be really nice to generalize soc-like file parsing and not reimplement it 100 times :)))))
+void M_LoadEmotes(UINT16 wadnum)
+{
+	UINT16 lumpnum = W_CheckNumForNamePwad("EMOTES", wadnum, 0);
+
+	if (lumpnum == INT16_MAX)
+		return;
+
+	char *lump = static_cast<char*>(W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE));
+	size_t size = W_LumpLengthPwad(wadnum, lumpnum);
+
+	std::istringstream file(std::string(lump, size));
+	std::string line;
+
+	emote_t *emote = nullptr;
+	std::string emote_name;
+
+	// Just smol lambda to remove all the trailing chars we might not want
+	auto trim = [](std::string &str) {
+		str.erase(0, str.find_first_not_of(" \t\n\r\f\v"));
+		str.erase(str.find_last_not_of(" \t\n\r\f\v")+1);
+	};
+
+	int numemotes = 0;
+	int linenum = 0;
+
+	while (std::getline(file, line))
+	{
+		++linenum;
+
+		trim(line);
+
+		if (line.empty())
+			continue;
+
+		size_t split = line.find('=');
+
+		// Didn't find the =, means we're about to parse `Emote <name>`
+		if (split == line.npos)
+		{
+			split = line.find(' ');
+
+			if (split == line.npos)
+			{
+				CONS_Alert(CONS_WARNING, "EMOTES: Unrecognized line. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
+				continue;
+			}
+
+			if (strnicmp(line.c_str(), "emote", 5))
+			{
+				CONS_Alert(CONS_WARNING, "EMOTES: 'Emote' expected. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
+				continue;
+			}
+
+			emote_name = line.substr(split+1);
+
+			if (emote_name.find_first_of(" \t\n\r\f\v:") != emote_name.npos)
+			{
+				CONS_Alert(CONS_WARNING, "EMOTES: Emote name cannot contain spaces or ':' symbols. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
+				continue;
+			}
+
+			if (emote_name.size() > MAXEMOTENAME)
+			{
+				CONS_Alert(CONS_WARNING, "EMOTES: Emote name is too long, truncating. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
+				emote_name = emote_name.substr(0, MAXEMOTENAME);
+			}
+
+			emote = &emotes[emote_name];
+			strlcpy(emote->name, emote_name.c_str(), MAXEMOTENAME);
+
+			emote->timeperframe = 1;
+			emote->numframes = 0;
+			std::memset(emote->frames, 0, sizeof(emote->frames));
+
+			++numemotes;
+		}
+		else if (emote)
+		{
+			std::string field = line.substr(0, split);
+			std::string value = line.substr(split+1);
+
+			trim(field);
+			trim(value);
+
+			if (stricmp(field.c_str(), "frames") == 0)
+			{
+				UINT8 numframes = 0;
+
+				auto copy_frame = [&] {
+					if (numframes == MAXEMOTEFRAMES)
+					{
+						CONS_Alert(CONS_WARNING, "EMOTES: Too many frames. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
+						return false;
+					}
+
+					size_t list_split = value.find(',');
+					std::string framelumpname = value.substr(0, list_split);
+					trim(framelumpname);
+
+					if (list_split == value.npos)
+						value = "";
+					else
+						value = value.substr(list_split+1, value.npos);
+
+					// End of list of frames
+					if (framelumpname.size() == 0)
+						return false;
+
+					if (framelumpname.size() > 8)
+					{
+						CONS_Alert(CONS_WARNING, "EMOTES: Frame %d name is too long. (file %s, line %d)", numframes, wadfiles[wadnum]->filename, linenum);
+						framelumpname = framelumpname.substr(0, 8);
+					}
+
+					std::strncpy(emote->frames[numframes], framelumpname.c_str(), framelumpname.size()+1);
+
+					++numframes;
+
+					return true;
+				};
+
+				while (copy_frame()) {}
+
+				if (numframes == 0)
+				{
+					CONS_Alert(CONS_WARNING, "EMOTES: Expected list of frames. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
+				}
+
+				emote->numframes = numframes;
+			}
+			else if (stricmp(field.c_str(), "timeperframe") == 0)
+			{
+				emote->timeperframe = std::stoi(value);
+
+				if (emote->timeperframe <= 0)
+				{
+					emote->timeperframe = 1;
+					CONS_Alert(CONS_WARNING, "EMOTES: Bad value for 'timeperframe'. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
+				}
+			}
+			else
+			{
+				CONS_Alert(CONS_WARNING, "EMOTES: Unrecognized field '%s'. (file %s, line %d)", field.c_str(), wadfiles[wadnum]->filename, linenum);
+			}
+		}
+		else
+		{
+			CONS_Alert(CONS_WARNING, "EMOTES: Unrecognized line. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
+		}
+	}
+
+	CONS_Printf("Added %d emotes\n", numemotes);
+}
+
+void M_InitEmotes(void)
+{
+	UINT16 i;
+	for (i = 0; i < numwadfiles; i++)
+		M_LoadEmotes(i);
+}
+
+emote_t *M_FindEmote(const char *name, int len, int skip)
+{
+	if (!cv_emotes.value)
+		return nullptr;
+
+	char query[MAXEMOTENAME+1] = {0};
+	std::strncpy(query, name, std::min(len, MAXEMOTENAME));
+
+	for (auto &pair: emotes)
+	{
+		if (pair.first.rfind(query, 0, std::min(len, MAXEMOTENAME)) != 0)
+			continue;
+
+		if (skip > 0)
+		{
+			--skip;
+			continue;
+		}
+
+		return &pair.second;
+	}
+
+	return nullptr;
+}
+
+emote_t *M_VerifyEmote(const char *name, int *emotelen)
+{
+	if (*name != ':')
+		return nullptr;
+
+	if (!cv_emotes.value)
+		return nullptr;
+
+	const char *p = name+1; // skip ':'
+	emote_t *match = nullptr;
+
+	while (*p && (p - name) < MAXEMOTENAME)
+	{
+		if (*p == ':')
+		{
+			std::string checkname = std::string(name+1, (p-name)-1);
+			auto it = emotes.find(checkname);
+
+			if (it != emotes.end())
+				match = &it->second;
+
+			break;
+		}
+
+		++p;
+	}
+
+	if (match && emotelen)
+		*emotelen = p-name+1;
+
+	return match;
+}
+
+void M_DrawEmote(INT32 x, INT32 y, emote_t *emote, tic_t anim, INT32 flags)
+{
+	if (emote->numframes == 0)
+		return;
+
+	const char *lumpname = emote->frames[(anim/emote->timeperframe) % emote->numframes];
+	patch_t *emotepatch = (patch_t*)W_CachePatchName(lumpname, PU_CACHE);
+
+	const int CHARHEIGHT = 6;
+
+	fixed_t scale = FRACUNIT;
+
+	x *= FRACUNIT;
+	y *= FRACUNIT;
+
+	if (emotepatch->width > EMOTEWIDTH)
+		scale = (FRACUNIT/emotepatch->width)*EMOTEWIDTH;
+	else if (emotepatch->width < EMOTEWIDTH)
+		x += (EMOTEWIDTH-emotepatch->width)*FRACUNIT/2;
+
+	y -= (scale*emotepatch->height-CHARHEIGHT*FRACUNIT)/2;
+
+	V_DrawFixedPatch(x, y, scale, flags, emotepatch, NULL);
+}
diff --git a/src/m_emotes.h b/src/m_emotes.h
new file mode 100644
index 000000000..783c6ec17
--- /dev/null
+++ b/src/m_emotes.h
@@ -0,0 +1,48 @@
+#ifndef __M_EMOTES__
+#define __M_EMOTES__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "doomdef.h"
+#include "command.h"
+
+extern consvar_t cv_emotes;
+
+#define MAXEMOTENAME 32
+#define MAXEMOTEFRAMES 32
+#define EMOTEWIDTH 6
+
+typedef struct emote_s {
+	char name[MAXEMOTENAME+1];
+	char frames[MAXEMOTEFRAMES][9];
+	UINT8 numframes;
+	tic_t timeperframe;
+} emote_t;
+
+// Reads and adds emotes from EMOTES lump, with syntax similar to soc
+void M_LoadEmotes(UINT16 wadnum);
+
+// Load emotes from all base wads
+void M_InitEmotes(void);
+
+// Finds first matching emote, ignoring first few matches
+emote_t *M_FindEmote(const char *name, int len, int skips);
+
+// If first character is not ':', instantly returns null
+// Starts from ':' character, goes until it finds ':' or end of string
+// If end of string is found, or closing ':' is found but resulting emote name doesn't exist,
+// it returns null, otherwise it returns emote and stores into *emotelen how much characters
+// needs to be skipped to get past emote name
+emote_t *M_VerifyEmote(const char *name, int *emotelen);
+
+// Draw the emote, anim should be some kind of timer ticking every game tic
+// for animated emotes
+void M_DrawEmote(INT32 x, INT32 y, emote_t *emote, tic_t anim, INT32 flags);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // __M_EMOTES__
diff --git a/src/m_fixed.h b/src/m_fixed.h
index d67777162..c0afae941 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -15,6 +15,10 @@
 #ifndef __M_FIXED__
 #define __M_FIXED__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomtype.h"
 #ifdef __GNUC__
 #include <stdlib.h>
@@ -49,6 +53,20 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FloatToFixed(float f)
 	return (fixed_t)(f * FRACUNIT);
 }
 
+/*!
+  \brief convert fixed_t into double-precision floating number
+*/
+
+FUNCMATH FUNCINLINE static ATTRINLINE double FixedToDouble(fixed_t x)
+{
+	return x / (double)FRACUNIT;
+}
+
+FUNCMATH FUNCINLINE static ATTRINLINE fixed_t DoubleToFixed(double f)
+{
+	return (fixed_t)(f * FRACUNIT);
+}
+
 // for backwards compat
 #define FIXED_TO_FLOAT(x) FixedToFloat(x) // (((float)(x)) / ((float)FRACUNIT))
 #define FLOAT_TO_FIXED(f) FloatToFixed(f) // (fixed_t)((f) * ((float)FRACUNIT))
@@ -247,6 +265,35 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FixedRound(fixed_t x)
 	return INT32_MAX;
 }
 
+/**	\brief	The xs_CRoundToInt function
+
+	\param	val	double number
+
+	\return Round toward nearest, but ties round toward even
+*/
+#if defined(SRB2_BIG_ENDIAN)
+	#define _xs_iexp_				0
+	#define _xs_iman_				1
+#else
+	#define _xs_iexp_				1       //intel is little endian
+	#define _xs_iman_				0
+#endif //BigEndian_
+
+typedef double real64;
+
+typedef union _xs_doubleints
+{
+	real64 val;
+	unsigned ival[2];
+} _xs_doubleints;
+
+FUNCMATH FUNCINLINE static ATTRINLINE int xs_CRoundToInt(real64 val)
+{
+	_xs_doubleints uval;
+	uval.val = val + 6755399441055744.0;
+	return uval.ival[_xs_iman_];
+}
+
 typedef struct
 {
 	fixed_t x;
@@ -327,4 +374,8 @@ void FM_MultMatrix(matrix_t *dest, const matrix_t *multme);
 void FM_Translate(matrix_t *dest, fixed_t x, fixed_t y, fixed_t z);
 void FM_Scale(matrix_t *dest, fixed_t x, fixed_t y, fixed_t z);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif //m_fixed.h
diff --git a/src/m_menu.c b/src/m_menu.c
index 31f6cfca1..1653dac28 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -30,6 +30,7 @@
 #include "g_game.h"
 #include "g_input.h"
 #include "m_argv.h"
+#include "m_textinput.h"
 
 // Data.
 #include "sounds.h"
@@ -69,6 +70,8 @@
 #include "st_stuff.h"
 #include "i_sound.h"
 #include "k_kart.h" // SRB2kart
+#include "k_hud.h" // SRB2kart
+#include "k_stats.h" // SRB2kart
 #include "d_player.h" // KITEM_ constants
 
 #include "i_joy.h" // for joystick menu controls
@@ -104,7 +107,7 @@
 #define SMALLLINEHEIGHT 8
 #define SLIDER_RANGE 10
 #define SLIDER_WIDTH (8*SLIDER_RANGE+6)
-#define SERVERS_PER_PAGE 11
+#define SERVERS_PER_PAGE 10
 #define MAXSTAT 9 //Max number a stat can have
 
 typedef enum
@@ -149,9 +152,6 @@ description_t description[MAXSKINS];
 
 INT32 mapwads[NUMMAPS];
 
-//static char *char_notes = NULL;
-//static fixed_t char_scroll = 0;
-
 boolean browselocalskins = false;
 
 boolean menuactive = false;
@@ -159,6 +159,9 @@ boolean fromlevelselect = false;
 
 boolean menu_text_input = false;
 
+char menu_text_input_buf[MAXSTRINGLENGTH];
+static textinput_t menuinput;
+
 static INT32 coolalphatimer = 9;
 
 typedef enum
@@ -177,6 +180,8 @@ static char joystickInfo[8][29];
 static UINT32 serverlistpage;
 static UINT32 oldserverlistpage;
 static float serverlistslidex;
+static INT32 serverlistsearched[MAXSERVERLIST] = {0};
+static UINT32 serverlistsearchedcount = 0;
 #endif
 
 //static saveinfo_t savegameinfo[MAXSAVEGAMES]; // Extra info about the save games.
@@ -205,6 +210,8 @@ static void M_StopMessage(INT32 choice);
 
 #ifndef NONET
 static void M_HandleServerPage(INT32 choice);
+static void M_HandleServerSearch(INT32 choice);
+static void M_SearchServerList(void);
 #endif
 
 // Prototyping is fun, innit?
@@ -215,36 +222,22 @@ static void M_HandleServerPage(INT32 choice);
 void M_SetWaitingMode(int mode);
 int  M_GetWaitingMode(void);
 
-// the haxor message menu
-menu_t MessageDef;
-
 #ifdef HAVE_DISCORDRPC
 menu_t MISC_DiscordRequestsDef;
 static void M_HandleDiscordRequests(INT32 choice);
 static void M_DrawDiscordRequests(void);
 #endif
 
-menu_t SPauseDef;
-
 #define lsheadingheight 16
 
 // Sky Room
-//static void M_CustomLevelSelect(INT32 choice);
-//static void M_CustomWarp(INT32 choice);
-FUNCNORETURN static ATTRNORETURN void M_UltimateCheat(INT32 choice);
-//static void M_LoadGameLevelSelect(INT32 choice);
-static void M_GetAllEmeralds(INT32 choice);
-static void M_DestroyRobots(INT32 choice);
-//static void M_LevelSelectWarp(INT32 choice);
 static void M_Credits(INT32 choice);
 static void M_MusicTest(INT32 choice);
-static void M_PandorasBox(INT32 choice);
-static void M_EmblemHints(INT32 choice);
 static char *M_GetConditionString(condition_t cond);
-menu_t SR_MainDef, SR_UnlockChecklistDef;
 
 // Misc. Main Menu
 static void M_Options(INT32 choice);
+static void M_Multiplayer(INT32 choice);
 static void M_LocalSkinMenu(INT32 choice);
 static void M_LocalSkinChange(INT32 choice);
 static void M_Manual(INT32 choice);
@@ -258,14 +251,9 @@ static void M_ConfirmEnterGame(INT32 choice);
 static void M_ConfirmTeamScramble(INT32 choice);
 static void M_ConfirmTeamChange(INT32 choice);
 static void M_ConfirmSpectateChange(INT32 choice);
-//static void M_SecretsMenu(INT32 choice);
-//static void M_SetupChoosePlayer(INT32 choice);
 static void M_QuitSRB2(INT32 choice);
-menu_t SP_MainDef, MP_MainDef, OP_MainDef;
-menu_t MISC_ScrambleTeamDef, MISC_ChangeTeamDef, MISC_ChangeSpectateDef;
 
 // Single Player
-//static void M_LoadGame(INT32 choice);
 static void M_TimeAttack(INT32 choice);
 static boolean M_QuitTimeAttackMenu(void);
 static void M_Statistics(INT32 choice);
@@ -274,9 +262,6 @@ static void M_ReplayTimeAttack(INT32 choice);
 static void M_ChooseTimeAttack(INT32 choice);
 static void M_ModeAttackEndGame(INT32 choice);
 static void M_SetGuestReplay(INT32 choice);
-//static void M_ChoosePlayer(INT32 choice);
-menu_t SP_LevelStatsDef;
-static menu_t SP_TimeAttackDef, SP_ReplayDef, SP_GuestReplayDef, SP_GhostDef;
 
 // Multiplayer
 #ifndef NONET
@@ -296,24 +281,19 @@ static void M_Connect(INT32 choice);
 #endif
 static void M_StartOfflineServerMenu(INT32 choice);
 static void M_StartServer(INT32 choice);
-static void M_SetupMultiPlayer(INT32 choice);
-static void M_SetupMultiPlayer2(INT32 choice);
-static void M_SetupMultiPlayer3(INT32 choice);
-static void M_SetupMultiPlayer4(INT32 choice);
+static void M_SetupMultiPlayer(void);
+static void M_SetupMultiPlayer2(void);
+static void M_SetupMultiPlayer3(void);
+static void M_SetupMultiPlayer4(void);
 static void M_SetupMultiHandler(INT32 choice);
 
 // Options
 // Split into multiple parts due to size
-// Controls
-menu_t OP_ControlsDef, OP_AllControlsDef;
-menu_t OP_MouseOptionsDef, OP_Mouse2OptionsDef;
-menu_t OP_Joystick1Def, OP_Joystick2Def, OP_Joystick3Def, OP_Joystick4Def;
-menu_t OP_CustomCvarMenuDef;
 static void M_VideoModeMenu(INT32 choice);
-static void M_Setup1PControlsMenu(INT32 choice);
-static void M_Setup2PControlsMenu(INT32 choice);
-static void M_Setup3PControlsMenu(INT32 choice);
-static void M_Setup4PControlsMenu(INT32 choice);
+static void M_Setup1PControlsMenu(void);
+static void M_Setup2PControlsMenu(void);
+static void M_Setup3PControlsMenu(void);
+static void M_Setup4PControlsMenu(void);
 
 static void M_Setup1PJoystickMenu(INT32 choice);
 static void M_Setup2PJoystickMenu(INT32 choice);
@@ -324,28 +304,6 @@ static void M_AssignJoystick(INT32 choice);
 static void M_ChangeControl(INT32 choice);
 static void M_ResetControls(INT32 choice);
 
-// Video & Sound
-menu_t OP_VideoOptionsDef, OP_VideoModeDef, OP_ExpOptionsDef, OP_ColorOptionsDef;
-#ifdef HWRENDER
-menu_t OP_OpenGLOptionsDef;
-#endif
-menu_t OP_SoundOptionsDef;
-menu_t OP_SoundAdvancedDef;
-//static void M_RestartAudio(void);
-
-//Misc
-menu_t OP_DataOptionsDef, OP_ScreenshotOptionsDef, OP_EraseDataDef;
-menu_t OP_ProtocolDef;
-#ifdef HAVE_DISCORDRPC
-menu_t OP_DiscordOptionsDef;
-#endif
-menu_t OP_HUDOptionsDef, OP_ChatOptionsDef;
-menu_t OP_GameOptionsDef, OP_ServerOptionsDef;
-#ifndef NONET
-menu_t OP_AdvServerOptionsDef;
-#endif
-//menu_t OP_NetgameOptionsDef, OP_GametypeOptionsDef;
-menu_t OP_MonitorToggleDef;
 static void M_ScreenshotOptions(INT32 choice);
 static void M_EraseData(INT32 choice);
 
@@ -359,33 +317,11 @@ static patch_t *addonsp[NUM_EXT+5];
 
 static void M_DeleteProtocol(void);
 
-// Saturn
-menu_t OP_SaturnDef;
-menu_t OP_HudOffsetDef;
-menu_t OP_PlayerDistortDef;
-menu_t OP_SaturnCreditsDef;
-
-// Bird
-menu_t OP_BirdDef;
-
-// Stuff, yknow.
-menu_t OP_ForkedBirdDef;
-menu_t OP_LocalSkinDef;
-menu_t OP_TiltDef;
-menu_t OP_AdvancedBirdDef;
-
-// Chaotic
-menu_t OP_NametagDef;
-
-//Driftgauge
-menu_t OP_DriftGaugeDef;
-
 #define numaddonsshown 4
 
 // Replay hut
-menu_t MISC_ReplayHutDef;
-menu_t MISC_ReplayOptionsDef;
 static void M_HandleReplayHutList(INT32 choice);
+static void M_HutCheckReplays(size_t maxnum);
 static void M_DrawReplayHut(void);
 static void M_DrawReplayStartMenu(void);
 static boolean M_QuitReplayHut(void);
@@ -412,7 +348,6 @@ static void M_DrawAddons(void);
 static void M_DrawSkyRoom(void);
 static void M_DrawChecklist(void);
 static void M_DrawMusicTest(void);
-static void M_DrawEmblemHints(void);
 static void M_DrawPauseMenu(void);
 static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade);
 static void M_DrawServerMenu(void);
@@ -437,7 +372,6 @@ static void M_DrawLocalSkinMenu(void);
 #ifndef NONET
 static boolean M_CancelConnect(void);
 #endif
-static boolean M_ExitPandorasBox(void);
 static boolean M_QuitMultiPlayerMenu(void);
 static void M_HandleAddons(INT32 choice);
 static void M_HandleSoundTest(INT32 choice);
@@ -460,10 +394,26 @@ static void Newgametype_OnChange(void);
 static void Dummymenuplayer_OnChange(void);
 static void Dummystaff_OnChange(void);
 
+// Prototypes
+static INT32 M_FindFirstMap(INT32 gtype);
+static INT32 M_GetFirstLevelInList(void);
+
+// crap to force hud to show when in saturns hud options
+boolean forceshowhud = false;
+
+// smol text indicating if game is modified
+// so ppl dont wonder where their ra times went and stuff
+#define SHOWMODDEDGAME \
+	if (savemoddata) \
+		V_DrawThinString(0, 0, V_REDMAP|V_SNAPTOTOP|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("Modified Game"));
+
 // ==========================================================================
 // CONSOLE VARIABLES AND THEIR POSSIBLE VALUES GO HERE.
 // ==========================================================================
 
+// How much replays are checked per frame when using search
+consvar_t cv_replaysearchrate = {"replaysearchrate", "1000", CV_SAVE, CV_Natural, NULL, 0, NULL, NULL, 0, 0, NULL };
+
 consvar_t cv_showfocuslost = {"showfocuslost", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL };
 
 static CV_PossibleValue_t map_cons_t[] = {
@@ -523,9 +473,6 @@ static CV_PossibleValue_t dummyspectate_cons_t[] = {{0, "Spectator"}, {1, "Playi
 static CV_PossibleValue_t dummyscramble_cons_t[] = {{0, "Random"}, {1, "Points"}, {0, NULL}};
 static CV_PossibleValue_t ringlimit_cons_t[] = {{0, "MIN"}, {9999, "MAX"}, {0, NULL}};
 static CV_PossibleValue_t liveslimit_cons_t[] = {{0, "MIN"}, {99, "MAX"}, {0, NULL}};
-/*static CV_PossibleValue_t dummymares_cons_t[] = {
-	{-1, "END"}, {0,"Overall"}, {1,"Mare 1"}, {2,"Mare 2"}, {3,"Mare 3"}, {4,"Mare 4"}, {5,"Mare 5"}, {6,"Mare 6"}, {7,"Mare 7"}, {8,"Mare 8"}, {0,NULL}
-};*/
 static CV_PossibleValue_t dummystaff_cons_t[] = {{0, "MIN"}, {100, "MAX"}, {0, NULL}};
 
 static consvar_t cv_dummymenuplayer = {"dummymenuplayer", "P1", CV_HIDEN|CV_CALL, dummymenuplayer_cons_t, Dummymenuplayer_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -537,6 +484,9 @@ static consvar_t cv_dummylives = {"dummylives", "0", CV_HIDEN, liveslimit_cons_t
 static consvar_t cv_dummycontinues = {"dummycontinues", "0", CV_HIDEN, liveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 static consvar_t cv_dummystaff = {"dummystaff", "0", CV_HIDEN|CV_CALL, dummystaff_cons_t, Dummystaff_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
+// all the menu definitions and onchanges reside in here now
+#include "m_menudefs.c"
+
 static INT32 M_ShiftChar(INT32 ch)
 {
 	if (I_UseNativeKeyboard())
@@ -563,6 +513,7 @@ static INT32 M_ShiftChar(INT32 ch)
 	return ch;
 }
 
+<<<<<<< HEAD
 // ==========================================================================
 // ORGANIZATION START.
 // ==========================================================================
@@ -2530,6 +2481,8 @@ menu_t MISC_ChangeSpectateDef = DEFAULTMENUSTYLE(NULL, MISC_ChangeSpectateMenu,
 menu_t MISC_ChangeLevelDef = MAPICONMENUSTYLE(NULL, MISC_ChangeLevelMenu, &MPauseDef);
 menu_t MISC_HelpDef = IMAGEDEF(MISC_HelpMenu);
 
+=======
+>>>>>>> Saturn-Next
 //
 // M_GetGametypeColor
 //
@@ -2604,332 +2557,6 @@ INT32 HU_GetHighlightColor(void)
 	return highlightflags;
 }
 
-// Sky Room
-menu_t SR_PandoraDef =
-{
-	"M_PANDRA",
-	sizeof (SR_PandorasBox)/sizeof (menuitem_t),
-	&SPauseDef,
-	SR_PandorasBox,
-	M_DrawGenericMenu,
-	60, 40,
-	0,
-	M_ExitPandorasBox,
-	{NULL}
-};
-menu_t SR_MainDef = CENTERMENUSTYLE(NULL, SR_MainMenu, &MainDef, 72);
-
-//menu_t SR_LevelSelectDef = MAPICONMENUSTYLE(NULL, SR_LevelSelectMenu, &SR_MainDef);
-
-menu_t SR_UnlockChecklistDef =
-{
-	NULL,
-	1,
-	&SR_MainDef,
-	SR_UnlockChecklistMenu,
-	M_DrawChecklist,
-	280, 185,
-	0,
-	NULL,
-	{NULL}
-};
-
-menu_t SR_MusicTestDef =
-{
-	NULL,
-	sizeof (SR_MusicTestMenu)/sizeof (menuitem_t),
-	&OP_SoundOptionsDef,
-	SR_MusicTestMenu,
-	M_DrawMusicTest,
-	60, 150,
-	0,
-	NULL,
-	{NULL}
-};
-
-menu_t SR_EmblemHintDef =
-{
-	NULL,
-	sizeof (SR_EmblemHintMenu)/sizeof (menuitem_t),
-	&SPauseDef,
-	SR_EmblemHintMenu,
-	M_DrawEmblemHints,
-	60, 150,
-	0,
-	NULL,
-	{NULL}
-};
-
-// Single Player
-menu_t SP_MainDef = CENTERMENUSTYLE(NULL, SP_MainMenu, &MainDef, 72);
-
-menu_t SP_LevelStatsDef =
-{
-	"M_STATS",
-	1,
-	&SR_MainDef,
-	SP_LevelStatsMenu,
-	M_DrawLevelStats,
-	280, 185,
-	0,
-	NULL,
-	{NULL}
-};
-
-static menu_t SP_TimeAttackDef =
-{
-	"M_ATTACK",
-	sizeof (SP_TimeAttackMenu)/sizeof (menuitem_t),
-	&MainDef,  // Doesn't matter.
-	SP_TimeAttackMenu,
-	M_DrawTimeAttackMenu,
-	34, 40,
-	0,
-	M_QuitTimeAttackMenu,
-	{NULL}
-};
-static menu_t SP_ReplayDef =
-{
-	"M_ATTACK",
-	sizeof(SP_ReplayMenu)/sizeof(menuitem_t),
-	&SP_TimeAttackDef,
-	SP_ReplayMenu,
-	M_DrawTimeAttackMenu,
-	34, 40,
-	0,
-	NULL,
-	{NULL}
-};
-static menu_t SP_GuestReplayDef =
-{
-	"M_ATTACK",
-	sizeof(SP_GuestReplayMenu)/sizeof(menuitem_t),
-	&SP_TimeAttackDef,
-	SP_GuestReplayMenu,
-	M_DrawTimeAttackMenu,
-	34, 40,
-	0,
-	NULL,
-	{NULL}
-};
-static menu_t SP_GhostDef =
-{
-	"M_ATTACK",
-	sizeof(SP_GhostMenu)/sizeof(menuitem_t),
-	&SP_TimeAttackDef,
-	SP_GhostMenu,
-	M_DrawTimeAttackMenu,
-	34, 40,
-	0,
-	NULL,
-	{NULL}
-};
-
-// Multiplayer
-menu_t MP_MainDef =
-{
-	"M_MULTI",
-	sizeof (MP_MainMenu)/sizeof (menuitem_t),
-	&MainDef,
-	MP_MainMenu,
-	M_DrawMPMainMenu,
-	42, 30,
-	0,
-#ifndef NONET
-	M_CancelConnect,
-#else
-	NULL,
-#endif
-	{NULL}
-};
-
-menu_t MP_OfflineServerDef = MAPICONMENUSTYLE("M_MULTI", MP_OfflineServerMenu, &MP_MainDef);
-
-#ifndef NONET
-menu_t MP_ServerDef = MAPICONMENUSTYLE("M_MULTI", MP_ServerMenu, &MP_MainDef);
-
-menu_t MP_ConnectDef =
-{
-	"M_MULTI",
-	sizeof (MP_ConnectMenu)/sizeof (menuitem_t),
-	&MP_MainDef,
-	MP_ConnectMenu,
-	M_DrawConnectMenu,
-	27,24,
-	0,
-	M_CancelConnect,
-	{NULL}
-};
-#endif
-menu_t MP_PlayerSetupDef =
-{
-	NULL, //"M_SPLAYR"
-	sizeof (MP_PlayerSetupMenu)/sizeof (menuitem_t),
-	&MP_MainDef,
-	MP_PlayerSetupMenu,
-	M_DrawSetupMultiPlayerMenu,
-	36, 14,
-	0,
-	M_QuitMultiPlayerMenu,
-	{NULL}
-};
-
-// Options
-menu_t OP_MainDef =
-{
-	"M_OPTTTL",
-	sizeof (OP_MainMenu)/sizeof (menuitem_t),
-	&MainDef,
-	OP_MainMenu,
-	M_DrawGenericMenu,
-	60, 30,
-	0,
-	NULL,
-	{NULL}
-};
-
-menu_t OP_ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 60, 30);
-//WTF
-menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_ControlsDef, 60, 30);
-menu_t OP_AllControlsDef = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef);
-menu_t OP_Joystick1Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_AllControlsDef, 60, 30);
-menu_t OP_Joystick2Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_AllControlsDef, 60, 30);
-menu_t OP_Joystick3Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 60, 30);
-menu_t OP_Joystick4Def = DEFAULTMENUSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 60, 30);
-menu_t OP_JoystickSetDef =
-{
-	"M_CONTRO",
-	sizeof (OP_JoystickSetMenu)/sizeof (menuitem_t),
-	&OP_Joystick1Def,
-	OP_JoystickSetMenu,
-	M_DrawJoystick,
-	50, 40,
-	0,
-	NULL,
-	{NULL}
-};
-
-menu_t OP_VideoOptionsDef =
-{
-	"M_VIDEO",
-	sizeof(OP_VideoOptionsMenu)/sizeof(menuitem_t),
-	&OP_MainDef,
-	OP_VideoOptionsMenu,
-	M_DrawVideoMenu,
-	30, 15,
-	0,
-	NULL,
-	{NULL}
-};
-
-menu_t OP_VideoModeDef =
-{
-	"M_VIDEO",
-	1,
-	&OP_VideoOptionsDef,
-	OP_VideoModeMenu,
-	M_DrawVideoMode,
-	48, 26,
-	0,
-	NULL,
-	{NULL}
-};
-
-menu_t OP_ColorOptionsDef =
-{
-	"M_VIDEO",
-	sizeof (OP_ColorOptionsMenu)/sizeof (menuitem_t),
-	&OP_VideoOptionsDef,
-	OP_ColorOptionsMenu,
-	M_DrawColorMenu,
-	30, 30,
-	0,
-	NULL,
-	{NULL}
-};
-
-menu_t OP_SoundOptionsDef =
-{
-	"M_SOUND",
-	sizeof (OP_SoundOptionsMenu)/sizeof (menuitem_t),
-	&OP_MainDef,
-	OP_SoundOptionsMenu,
-	M_DrawSkyRoom,
-	30, 20,
-	0,
-	NULL,
-	{NULL}
-};
-
-
-menu_t OP_HUDOptionsDef =
-{
-	"M_HUD",
-	sizeof (OP_HUDOptionsMenu)/sizeof (menuitem_t),
-	&OP_MainDef,
-	OP_HUDOptionsMenu,
-	M_DrawHUDOptions,
-	30, 20,
-	0,
-	NULL,
-	{NULL}
-};
-
-
-menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 30);
-
-menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE("M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
-
-menu_t OP_GameOptionsDef = DEFAULTMENUSTYLE("M_GAME", OP_GameOptionsMenu, &OP_MainDef, 30, 20);
-menu_t OP_ServerOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 24, 20);
-#ifndef NONET
-menu_t OP_AdvServerOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_AdvServerOptionsMenu, &OP_ServerOptionsDef, 24, 20);
-#endif
-
-//menu_t OP_NetgameOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_NetgameOptionsMenu, &OP_ServerOptionsDef, 30, 30);
-//menu_t OP_GametypeOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_GametypeOptionsMenu, &OP_ServerOptionsDef, 30, 30);
-//menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_GAME", OP_ChatOptionsMenu, &OP_GameOptionsDef, 30, 30);
-menu_t OP_MonitorToggleDef =
-{
-	"M_GAME",
-	sizeof (OP_MonitorToggleMenu)/sizeof (menuitem_t),
-	&OP_GameOptionsDef,
-	OP_MonitorToggleMenu,
-	M_DrawMonitorToggles,
-	47, 30,
-	0,
-	NULL,
-	{NULL}
-};
-
-#ifdef HWRENDER
-menu_t OP_OpenGLOptionsDef = DEFAULTSCROLLSTYLE("M_VIDEO", OP_OpenGLOptionsMenu, &OP_VideoOptionsDef, 30, 30);
-#endif
-
-menu_t OP_ExpOptionsDef = DEFAULTSCROLLSTYLE("M_VIDEO", OP_ExpOptionsMenu, &OP_VideoOptionsDef, 30, 35);
-
-menu_t OP_DataOptionsDef = DEFAULTMENUSTYLE("M_DATA", OP_DataOptionsMenu, &OP_MainDef, 60, 30);
-menu_t OP_ScreenshotOptionsDef = DEFAULTMENUSTYLE("M_SCSHOT", OP_ScreenshotOptionsMenu, &OP_DataOptionsDef, 30, 30);
-menu_t OP_AddonsOptionsDef = DEFAULTMENUSTYLE("M_ADDONS", OP_AddonsOptionsMenu, &OP_DataOptionsDef, 30, 30);
-menu_t OP_ProtocolDef = DEFAULTMENUSTYLE(NULL, OP_ProtocolMenu, &OP_DataOptionsDef, 30, 30);
-#ifdef HAVE_DISCORDRPC
-menu_t OP_DiscordOptionsDef = DEFAULTMENUSTYLE(NULL, OP_DiscordOptionsMenu, &OP_DataOptionsDef, 30, 30);
-#endif
-menu_t OP_EraseDataDef = DEFAULTMENUSTYLE("M_DATA", OP_EraseDataMenu, &OP_DataOptionsDef, 30, 30);
-
-menu_t OP_SaturnDef = DEFAULTSCROLLSTYLE(NULL, OP_SaturnMenu, &OP_MainDef, 30, 30);
-menu_t OP_PlayerDistortDef = DEFAULTMENUSTYLE("M_VIDEO", OP_PlayerDistortMenu, &OP_SaturnDef, 30, 30);
-menu_t OP_HudOffsetDef = DEFAULTSCROLLSTYLE(NULL, OP_HudOffsetMenu, &OP_SaturnDef, 30, 30);
-menu_t OP_SaturnCreditsDef = DEFAULTMENUSTYLE(NULL, OP_SaturnCreditsMenu, &OP_SaturnDef, 30, 10);
-
-menu_t OP_BirdDef = DEFAULTMENUSTYLE(NULL, OP_BirdMenu, &OP_MainDef, 30, 30);
-
-menu_t OP_NametagDef = DEFAULTMENUSTYLE(NULL, OP_NametagMenu, &OP_SaturnDef, 30, 40);
-menu_t OP_DriftGaugeDef = DEFAULTMENUSTYLE(NULL, OP_DriftGaugeMenu, &OP_SaturnDef, 30, 60);
-
-menu_t OP_TiltDef = DEFAULTMENUSTYLE(NULL, OP_TiltMenu, &OP_BirdDef, 30, 60);
-menu_t OP_AdvancedBirdDef = DEFAULTMENUSTYLE(NULL, OP_AdvancedBirdMenu, &OP_BirdDef, 30, 60);
-
 INT16 ccvarposition = 0;
 
 static void M_CustomCvarMenu(INT32 choice)
@@ -2942,331 +2569,6 @@ static void M_CustomCvarMenu(INT32 choice)
 		M_StartMessage(M_GetText("No custom options were found\n"), NULL, MM_NOTHING);
 }
 
-/*menu_t OP_CustomCvarMenuDef = DEFAULTSCROLLMENUSTYLE(
-	MTREE3(MN_OP_MAIN, MN_OP_DATA, MN_OP_ADDONS),
-	"M_ADDONS", OP_CustomCvarMenu, &OP_MainDef, 30, 30);*/
-menu_t OP_CustomCvarMenuDef = DEFAULTSCROLLSTYLE("M_ADDONS", OP_CustomCvarMenu, &OP_MainDef, 10, 30);
-
-menu_t OP_ForkedBirdDef = {
-	NULL,
-	sizeof(OP_ForkedBirdMenu)/sizeof(menuitem_t),
-	&OP_MainDef,
-	OP_ForkedBirdMenu,
-	M_DrawLocalSkinMenu,
-	30, 6,
-	0,
-	NULL,
-	{NULL}
-};
-
-menu_t OP_LocalSkinDef = DEFAULTMENUSTYLE(NULL, OP_TiltMenu, &OP_ForkedBirdDef, 30, 60);
-
-
-// ==========================================================================
-// CVAR ONCHANGE EVENTS GO HERE
-// ==========================================================================
-// (there's only a couple anyway)
-
-// Prototypes
-static INT32 M_FindFirstMap(INT32 gtype);
-static INT32 M_GetFirstLevelInList(void);
-
-// Nextmap.  Used for Time Attack.
-static void Nextmap_OnChange(void)
-{
-	char *leveltitle;
-	UINT8 active;
-
-	// Update the string in the consvar.
-	Z_Free(cv_nextmap.zstring);
-	leveltitle = G_BuildMapTitle(cv_nextmap.value);
-	cv_nextmap.string = cv_nextmap.zstring = leveltitle ? leveltitle : Z_StrDup(G_BuildMapName(cv_nextmap.value));
-
-	if (currentMenu == &SP_TimeAttackDef)
-	{
-		// see also p_setup.c's P_LoadRecordGhosts
-		const size_t glen = strlen(srb2home)+1+strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1;
-		char *gpath = malloc(glen);
-		INT32 i;
-
-		if (!gpath)
-			return;
-
-		sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
-
-		CV_StealthSetValue(&cv_dummystaff, 0);
-
-		active = false;
-		SP_TimeAttackMenu[taguest].status = IT_DISABLED;
-		SP_TimeAttackMenu[tareplay].status = IT_DISABLED;
-		//SP_TimeAttackMenu[taghost].status = IT_DISABLED;
-
-		// Check if file exists, if not, disable REPLAY option
-		for (i = 0; i < 4; i++)
-		{
-			SP_ReplayMenu[i].status = IT_DISABLED;
-			SP_GuestReplayMenu[i].status = IT_DISABLED;
-		}
-		SP_ReplayMenu[4].status = IT_DISABLED;
-
-		SP_GhostMenu[3].status = IT_DISABLED;
-		SP_GhostMenu[4].status = IT_DISABLED;
-
-		if (FIL_FileExists(va("%s-%s-time-best.lmp", gpath, cv_chooseskin.string))) {
-			SP_ReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
-			SP_GuestReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
-			active |= 3;
-		}
-		if (FIL_FileExists(va("%s-%s-lap-best.lmp", gpath, cv_chooseskin.string))) {
-			SP_ReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
-			SP_GuestReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
-			active |= 3;
-		}
-		if (FIL_FileExists(va("%s-%s-last.lmp", gpath, cv_chooseskin.string))) {
-			SP_ReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
-			SP_GuestReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
-			active |= 3;
-		}
-
-		if (FIL_FileExists(va("%s-guest.lmp", gpath)))
-		{
-			SP_ReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
-			SP_GuestReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
-			SP_GhostMenu[3].status = IT_STRING|IT_CVAR;
-			active |= 3;
-		}
-
-		CV_SetValue(&cv_dummystaff, 1);
-		if (cv_dummystaff.value)
-		{
-			SP_ReplayMenu[4].status = IT_WHITESTRING|IT_KEYHANDLER;
-			SP_GhostMenu[4].status = IT_STRING|IT_CVAR;
-			CV_StealthSetValue(&cv_dummystaff, 1);
-			active |= 1;
-		}
-
-		if (active) {
-			if (active & 1)
-				SP_TimeAttackMenu[tareplay].status = IT_WHITESTRING|IT_SUBMENU;
-			if (active & 2)
-				SP_TimeAttackMenu[taguest].status = IT_WHITESTRING|IT_SUBMENU;
-		}
-		else if (itemOn == tareplay) // Reset lastOn so replay isn't still selected when not available.
-		{
-			currentMenu->lastOn = itemOn;
-			itemOn = tastart;
-		}
-
-		if (mapheaderinfo[cv_nextmap.value-1] && mapheaderinfo[cv_nextmap.value-1]->forcecharacter[0] != '\0')
-			CV_Set(&cv_chooseskin, mapheaderinfo[cv_nextmap.value-1]->forcecharacter);
-
-		free(gpath);
-	}
-}
-
-static void Dummymenuplayer_OnChange(void)
-{
-	if (cv_dummymenuplayer.value < 1)
-		CV_StealthSetValue(&cv_dummymenuplayer, splitscreen+1);
-	else if (cv_dummymenuplayer.value > splitscreen+1)
-		CV_StealthSetValue(&cv_dummymenuplayer, 1);
-}
-
-char dummystaffname[22];
-
-static void Dummystaff_OnChange(void)
-{
-	lumpnum_t l;
-
-	dummystaffname[0] = '\0';
-
-	if ((l = W_CheckNumForName(va("%sS01",G_BuildMapName(cv_nextmap.value)))) == LUMPERROR)
-	{
-		CV_StealthSetValue(&cv_dummystaff, 0);
-		return;
-	}
-	else
-	{
-		char *temp = dummystaffname;
-		UINT8 numstaff = 1;
-		while (numstaff < 99 && (l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value),numstaff+1))) != LUMPERROR)
-			numstaff++;
-
-		if (cv_dummystaff.value < 1)
-			CV_StealthSetValue(&cv_dummystaff, numstaff);
-		else if (cv_dummystaff.value > numstaff)
-			CV_StealthSetValue(&cv_dummystaff, 1);
-
-		if ((l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value), cv_dummystaff.value))) == LUMPERROR)
-			return; // shouldn't happen but might as well check...
-
-		G_UpdateStaffGhostName(l);
-
-		while (*temp)
-			temp++;
-
-		sprintf(temp, " - %d", cv_dummystaff.value);
-	}
-}
-
-// Newgametype.  Used for gametype changes.
-static void Newgametype_OnChange(void)
-{
-	if (cv_nextmap.value && menuactive)
-	{
-		if (!mapheaderinfo[cv_nextmap.value-1])
-			P_AllocMapHeader((INT16)(cv_nextmap.value-1));
-
-		if ((cv_newgametype.value == GT_RACE && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_RACE)) || // SRB2kart
-			((cv_newgametype.value == GT_MATCH || cv_newgametype.value == GT_TEAMMATCH) && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_MATCH)))
-		{
-			INT32 value = 0;
-
-			switch (cv_newgametype.value)
-			{
-				case GT_COOP:
-					value = TOL_RACE; // SRB2kart
-					break;
-				case GT_COMPETITION:
-					value = TOL_COMPETITION;
-					break;
-				case GT_RACE:
-					value = TOL_RACE;
-					break;
-				case GT_MATCH:
-				case GT_TEAMMATCH:
-					value = TOL_MATCH;
-					break;
-				case GT_TAG:
-				case GT_HIDEANDSEEK:
-					value = TOL_TAG;
-					break;
-				case GT_CTF:
-					value = TOL_CTF;
-					break;
-			}
-
-			CV_SetValue(&cv_nextmap, M_FindFirstMap(value));
-			//CV_AddValue(&cv_nextmap, -1);
-			//CV_AddValue(&cv_nextmap, 1);
-		}
-	}
-}
-
-void Screenshot_option_Onchange(void)
-{
-	OP_ScreenshotOptionsMenu[op_screenshot_folder].status =
-		(cv_screenshot_option.value == 3 ? IT_CVAR|IT_STRING|IT_CV_STRING : IT_DISABLED);
-}
-
-void Moviemode_mode_Onchange(void)
-{
-	INT32 i, cstart, cend;
-	for (i = op_screenshot_gif_start; i <= op_screenshot_apng_end; ++i)
-		OP_ScreenshotOptionsMenu[i].status = IT_DISABLED;
-
-	switch (cv_moviemode.value)
-	{
-		case MM_GIF:
-			cstart = op_screenshot_gif_start;
-			cend = op_screenshot_gif_end;
-			break;
-		case MM_APNG:
-			cstart = op_screenshot_apng_start;
-			cend = op_screenshot_apng_end;
-			break;
-		default:
-			return;
-	}
-	for (i = cstart; i <= cend; ++i)
-		OP_ScreenshotOptionsMenu[i].status = IT_STRING|IT_CVAR;
-}
-
-void Addons_option_Onchange(void)
-{
-	OP_AddonsOptionsMenu[op_addons_folder].status =
-		(cv_addons_option.value == 3 ? IT_CVAR|IT_STRING|IT_CV_STRING : IT_DISABLED);
-}
-
-void PDistort_menu_Onchange(void)
-{
-	if (!cv_spriteroll.value)
-	{
-		OP_PlayerDistortMenu[sloperotate].status = IT_GRAYEDOUT;
-		OP_PlayerDistortMenu[sliptide].status = IT_GRAYEDOUT;
-	}
-	else
-	{
-		OP_PlayerDistortMenu[sloperotate].status = IT_STRING | IT_CVAR;
-		OP_PlayerDistortMenu[sliptide].status = IT_STRING | IT_CVAR;
-	}
-
-	if ((cv_sloperoll.value) && (cv_spriteroll.value)) //enable/disable sloperotate distance
-		OP_PlayerDistortMenu[slrotatedist].status = IT_STRING | IT_CVAR;
-	else
-		OP_PlayerDistortMenu[slrotatedist].status = IT_GRAYEDOUT;
-		
-	if ((cv_sloperoll.value == 2) && (cv_spriteroll.value)) //enable/disable sparkroll depending on which setting
-		OP_PlayerDistortMenu[sparkrotate].status = IT_STRING | IT_CVAR;
-	else
-		OP_PlayerDistortMenu[sparkrotate].status = IT_GRAYEDOUT;
-}
-
-void Bird_menu_Onchange(void)
-{
-	UINT16 status;
-
-	if (cv_tilting.value)
-		status = IT_STRING | IT_CVAR;
-	else
-		status = IT_GRAYEDOUT;
-
-	OP_TiltMenu[tiltwturning].status = status;
-	OP_TiltMenu[smoothening].status = status;
-	OP_TiltMenu[tiltwquakes].status = status;
-
-	if (cv_fading.value)
-		status = IT_STRING | IT_CVAR;
-	else
-		status = IT_GRAYEDOUT;
-
-	OP_AdvancedBirdMenu[fadeinvinc].status = status;
-	OP_AdvancedBirdMenu[fadegrow].status = status;
-	OP_AdvancedBirdMenu[respawnfadeout].status = status;
-	OP_AdvancedBirdMenu[respawnfadein].status = status;
-	
-	if (cv_birdmusic.value)
-	{
-		OP_BirdMenu[lvlresum].status = IT_STRING | IT_CVAR;
-		OP_BirdMenu[spclresum].status = IT_STRING | IT_CVAR;
-		OP_BirdMenu[advmusic].status = IT_STRING | IT_SUBMENU;
-	}
-	else
-	{
-		OP_BirdMenu[lvlresum].status = IT_GRAYEDOUT;
-		OP_BirdMenu[spclresum].status = IT_GRAYEDOUT;
-		OP_BirdMenu[advmusic].status = IT_GRAYEDOUT;
-	}	
-}
-
-//menu code is nice
-void Saturn_menu_Onchange(void) 
-{
-	UINT16 status;
-
-	if (cv_colorizedhud.value)
-		status = IT_STRING | IT_CVAR;
-	else
-		status = IT_GRAYEDOUT;
-	
-	OP_SaturnMenu[sm_coloritem].status = status;
-	OP_SaturnMenu[sm_colorhud_customcolor].status = status;
-}
-
-// ==========================================================================
-// END ORGANIZATION STUFF.
-// ==========================================================================
-
 // current menudef
 menu_t *currentMenu = &MainDef;
 
@@ -3293,77 +2595,48 @@ static void M_ChangeCvar(INT32 choice)
 
 	choice = (choice<<1) - 1;
 
-	if (((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_SLIDER)
-	    ||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_INVISSLIDER)
-	    ||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_NOMOD))
-	{
-		CV_SetValue(cv,cv->value+choice);
-	}
-	else if (cv->flags & CV_FLOAT)
+	if (cv->flags & CV_FLOAT)
 	{
 		char s[20];
 		float increment;
 
-		increment = (currentMenu->menuitems[itemOn].status & IT_CV_BIGFLOAT) ? 0.5 : (1.f/16);
-
-		sprintf(s,"%f",FIXED_TO_FLOAT(cv->value)+(choice)*increment);
-		CV_Set(cv,s);
+		increment = FIXED_TO_FLOAT(cv->value)+(choice)*((currentMenu->menuitems[itemOn].status & IT_CV_BIGFLOAT) ? 0.5f : (1.0f/16.0f));
+		sprintf(s,"%ld%s",(long)increment,M_Ftrim(increment));
+		CV_Set(cv, s);
 	}
 	else
 	{
+		if (((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_SLIDER)
+			||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_INVISSLIDER)
+			||((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_NOMOD))
+		{
+			CV_SetValue(cv,cv->value+choice);
+		}
+		else
+		{
 #ifndef NONET
-		if (cv == &cv_nettimeout || cv == &cv_jointimeout)
-			choice *= (TICRATE/7);
-		else if (cv == &cv_maxsend)
-			choice *= 512;
+			if (cv == &cv_nettimeout || cv == &cv_jointimeout)
+				choice *= (TICRATE/7);
+			else if (cv == &cv_maxsend)
+				choice *= 512;
 #endif
-		CV_AddValue(cv,choice);
+			CV_AddValue(cv,choice);
+		}
 	}
 }
 
 static boolean M_ChangeStringCvar(INT32 choice)
 {
 	consvar_t *cv = (consvar_t *)currentMenu->menuitems[itemOn].itemaction;
-	char buf[MAXSTRINGLENGTH];
-	size_t len;
 
-	choice = M_ShiftChar(choice);
-
-	switch (choice)
+	if (M_TextInputHandle(&menuinput, choice))
 	{
-		case KEY_BACKSPACE:
-			len = strlen(cv->string);
-			if (len > 0)
-			{
-				S_StartSound(NULL,sfx_menu1); // Tails
-				M_Memcpy(buf, cv->string, len);
-				buf[len-1] = 0;
-				CV_Set(cv, buf);
-			}
-			return true;
-		case KEY_DEL:
-			if (cv->string[0])
-			{
-				S_StartSound(NULL,sfx_menu1); // Tails
-				CV_Set(cv, "");
-			}
-			return true;
-		default:
-			if ((cv_keyboardlayout.value != 3 && choice >= 32 && choice <= 127) || (cv_keyboardlayout.value == 3 && choice >= 32 && choice <= 141))
-			{
-				len = strlen(cv->string);
-				if (len < MAXSTRINGLENGTH - 1)
-				{
-					S_StartSound(NULL,sfx_menu1); // Tails
-					M_Memcpy(buf, cv->string, len);
-					buf[len++] = (char)choice;
-					buf[len] = 0;
-					CV_Set(cv, buf);
-				}
-				return true;
-			}
-			break;
+		S_StartSound(NULL,sfx_menu1); // Tails
+		CV_Set(cv, menuinput.buffer);
+
+		return true;
 	}
+
 	return false;
 }
 
@@ -3380,6 +2653,21 @@ static void M_ResetCvars(void)
 	}
 }
 
+// If current menu item is IT_CV_STRING, setup menuinput
+static void M_CheckStringItem(void)
+{
+	if (itemOn < currentMenu->numitems && (currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_STRING)
+	{
+		consvar_t *cv = (consvar_t *)currentMenu->menuitems[itemOn].itemaction;
+
+		// Just in case
+		memset(menu_text_input_buf, 0, sizeof menu_text_input_buf);
+		M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf);
+
+		M_TextInputSetString(&menuinput, cv->string);
+	}
+}
+
 static void M_NextOpt(void)
 {
 	INT16 oldItemOn = itemOn; // prevent infinite loop
@@ -3391,6 +2679,8 @@ static void M_NextOpt(void)
 		else
 			itemOn++;
 	} while (oldItemOn != itemOn && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_SPACE);
+
+	M_CheckStringItem();
 }
 
 static void M_PrevOpt(void)
@@ -3404,6 +2694,8 @@ static void M_PrevOpt(void)
 		else
 			itemOn--;
 	} while (oldItemOn != itemOn && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_SPACE);
+
+	M_CheckStringItem();
 }
 
 // lock out further input in a tic when important buttons are pressed
@@ -3419,10 +2711,7 @@ static void Command_Manual_f(void)
 	itemOn = 0;
 }
 
-boolean DPADUPSCROLL = false;
-boolean DPADDOWNSCROLL = false;
-boolean DPADLEFTSCROLL = false;
-boolean DPADRIGHTSCROLL = false;
+boolean dpadscrollstate[4] = {false, false, false, false};
 
 //
 // M_Responder
@@ -3430,7 +2719,6 @@ boolean DPADRIGHTSCROLL = false;
 boolean M_Responder(event_t *ev)
 {
 	INT32 ch = -1;
-//	INT32 i;
 	static tic_t joywaitx = 0, joywaity = 0, joywaitaccel = 0, mousewait = 0;
 	static INT32 pjoyx = 0, pjoyy = 0, pjoyaccel = 0;
 	static INT32 pmousex = 0, pmousey = 0;
@@ -3471,32 +2759,32 @@ boolean M_Responder(event_t *ev)
 				break;
 			case KEY_HAT1:
 				ch = KEY_UPARROW;
+				dpadscrollstate[DPAD_UP] = true;
 				break;
 			case KEY_HAT1 + 1:
 				ch = KEY_DOWNARROW;
+				dpadscrollstate[DPAD_DOWN] = true;
 				break;
 			case KEY_HAT1 + 2:
 				ch = KEY_LEFTARROW;
+				dpadscrollstate[DPAD_LEFT] = true;
 				break;
 			case KEY_HAT1 + 3:
 				ch = KEY_RIGHTARROW;
+				dpadscrollstate[DPAD_RIGHT] = true;
 				break;
 		}
 
-		switch (ev->data1) // if you pressed it set those to true
+		if (menuactive)
 		{
-			case KEY_HAT1:
-				DPADUPSCROLL = true;
-				break;
-			case KEY_HAT1 + 1:
-				DPADDOWNSCROLL = true;
-				break;
-			case KEY_HAT1 + 2:
-				DPADLEFTSCROLL = true;
-				break;
-			case KEY_HAT1 + 3:
-				DPADRIGHTSCROLL = true;
-				break;
+			if (currentMenu == &MISC_ChangeLevelDef || currentMenu == &MP_OfflineServerDef || currentMenu == &MP_ServerDef)
+			{
+				if (ch == gamecontrol[0][gc_fire][0]
+					|| ch == gamecontrol[0][gc_fire][1])
+				{
+					COM_ImmedExecute("add kartencore 1");
+				}
+			}
 		}
 	}
 	else if (ev->type == ev_keyup)
@@ -3504,32 +2792,33 @@ boolean M_Responder(event_t *ev)
 		switch (ev->data1) // if you let go of those set those to false
 		{
 			case KEY_HAT1:
-				DPADUPSCROLL = false;
+				dpadscrollstate[DPAD_UP] = false;
 				break;
 			case KEY_HAT1 + 1:
-				DPADDOWNSCROLL = false;
+				dpadscrollstate[DPAD_DOWN] = false;
 				break;
 			case KEY_HAT1 + 2:
-				DPADLEFTSCROLL = false;
+				dpadscrollstate[DPAD_LEFT] = false;
 				break;
 			case KEY_HAT1 + 3:
-				DPADRIGHTSCROLL = false;
+				dpadscrollstate[DPAD_RIGHT] = false;
 				break;
 		}
 	}
 	else if (menuactive)
 	{
 		tic_t thistime = I_GetTime();
+
 		if (ev->type == ev_joystick)
 		{
-			const INT32 jxdeadzone = ((JOYAXISRANGE-1) * max(cv_xdeadzone.value, FRACUNIT/2)) >> FRACBITS;
-			const INT32 jydeadzone = ((JOYAXISRANGE-1) * max(cv_ydeadzone.value, FRACUNIT/2)) >> FRACBITS;
-			INT32 accelaxis = abs(cv_moveaxis.value);
+			const INT32 jxdeadzone = ((JOYAXISRANGE-1) * max(cv_xdeadzone[0].value, FRACUNIT/2)) >> FRACBITS;
+			const INT32 jydeadzone = ((JOYAXISRANGE-1) * max(cv_ydeadzone[0].value, FRACUNIT/2)) >> FRACBITS;
+			INT32 accelaxis = abs(cv_moveaxis[0].value);
 			if (ev->data1 == 0)
 			{
 				if (ev->data3 != INT32_MAX)
 				{
-					if (Joystick.bGamepadStyle || abs(ev->data3) > jydeadzone)
+					if (Joystick[0].bGamepadStyle || abs(ev->data3) > jydeadzone)
 					{
 						if (joywaity < thistime
 							&& (pjoyy == 0 || (ev->data3 < 0) != (pjoyy < 0))) // no previous direction OR change direction
@@ -3545,7 +2834,7 @@ boolean M_Responder(event_t *ev)
 
 				if (ev->data2 != INT32_MAX && joywaitx < thistime)
 				{
-					if (Joystick.bGamepadStyle || abs(ev->data2) > jxdeadzone)
+					if (Joystick[0].bGamepadStyle || abs(ev->data2) > jxdeadzone)
 					{
 						if (joywaitx < thistime
 							&& (pjoyx == 0 || (ev->data2 < 0) != (pjoyx < 0))) // no previous direction OR change direction
@@ -3573,10 +2862,10 @@ boolean M_Responder(event_t *ev)
 					retaxis = xmode ? ev->data2 : ev->data3;
 					if (retaxis != INT32_MAX)
 					{
-						if (cv_moveaxis.value < 0)
+						if (cv_moveaxis[0].value < 0)
 							retaxis = -retaxis;
 
-						if (Joystick.bGamepadStyle || retaxis > jacceldeadzone)
+						if (Joystick[0].bGamepadStyle || retaxis > jacceldeadzone)
 						{
 							if (joywaitaccel < thistime && retaxis > pjoyaccel) // only on upwards event
 							{
@@ -3625,9 +2914,9 @@ boolean M_Responder(event_t *ev)
 
 	if (ch == -1)
 		return false;
-	else if (ch == gamecontrol[gc_systemmenu][0] || ch == gamecontrol[gc_systemmenu][1]) // allow remappable ESC key
+	else if (ch == gamecontrol[0][gc_systemmenu][0] || ch == gamecontrol[0][gc_systemmenu][1]) // allow remappable ESC key
 		ch = KEY_ESCAPE;
-	else if ((ch == gamecontrol[gc_accelerate][0] || ch == gamecontrol[gc_accelerate][1])  && ch >= KEY_MOUSE1)
+	else if ((ch == gamecontrol[0][gc_accelerate][0] || ch == gamecontrol[0][gc_accelerate][1])  && ch >= KEY_MOUSE1)
 		ch = KEY_ENTER;
 
 	// F-Keys
@@ -3703,7 +2992,7 @@ boolean M_Responder(event_t *ev)
 		return false;
 	}
 
-	if ((ch == gamecontrol[gc_brake][0] || ch == gamecontrol[gc_brake][1]) && ch >= KEY_MOUSE1) // do this here, otherwise brake opens the menu mid-game
+	if ((ch == gamecontrol[0][gc_brake][0] || ch == gamecontrol[0][gc_brake][1]) && ch >= KEY_MOUSE1) // do this here, otherwise brake opens the menu mid-game
 		ch = KEY_ESCAPE;
 
 	routine = currentMenu->menuitems[itemOn].itemaction;
@@ -3734,7 +3023,7 @@ boolean M_Responder(event_t *ev)
 		else
 		{
 			// dirty hack: for customising controls, I want only buttons/keys, not moves
-			if (ev->type == ev_mouse || ev->type == ev_mouse2 || ev->type == ev_joystick
+			if (ev->type == ev_mouse || ev->type == ev_joystick
 				|| ev->type == ev_joystick2 || ev->type == ev_joystick3 || ev->type == ev_joystick4)
 				return true;
 			if (routine)
@@ -3752,7 +3041,6 @@ boolean M_Responder(event_t *ev)
 		if ((currentMenu->menuitems[itemOn].status & IT_CVARTYPE) == IT_CV_STRING)
 		{
 			menu_text_input = true;
-			ch = M_ShiftChar(ch);
 			if (M_ChangeStringCvar(ch))
 				return true;
 			else
@@ -3806,19 +3094,19 @@ boolean M_Responder(event_t *ev)
 			// switch viewpoints:
 			case '1':	// viewpoint for p1 (also f12)
 				// maximum laziness:
-				if (!demo.freecam)
+				if (!camera[0].freecam)
 					G_AdjustView(1, 1, true);
 				break;
 			case '2':	// viewpoint for p2
-				if (!demo.freecam)
+				if (!camera[1].freecam)
 					G_AdjustView(2, 1, true);
 				break;
 			case '3':	// viewpoint for p3
-				if (!demo.freecam)
+				if (!camera[2].freecam)
 					G_AdjustView(3, 1, true);
 				break;
 			case '4':	// viewpoint for p4
-				if (!demo.freecam)
+				if (!camera[3].freecam)
 					G_AdjustView(4, 1, true);
 				break;
 
@@ -3833,22 +3121,12 @@ boolean M_Responder(event_t *ev)
 			M_NextOpt();
 			S_StartSound(NULL, sfx_menu1);
 			coolalphatimer = 9;
-			/*if (currentMenu == &SP_PlayerDef)
-			{
-				Z_Free(char_notes);
-				char_notes = NULL;
-			}*/
 			return true;
 
 		case KEY_UPARROW:
 			M_PrevOpt();
 			S_StartSound(NULL, sfx_menu1);
 			coolalphatimer = 9;
-			/*if (currentMenu == &SP_PlayerDef)
-			{
-				Z_Free(char_notes);
-				char_notes = NULL;
-			}*/
 			return true;
 
 		case KEY_LEFTARROW:
@@ -3885,17 +3163,6 @@ boolean M_Responder(event_t *ev)
 
 			if (routine)
 			{
-				if (((currentMenu->menuitems[itemOn].status & IT_TYPE)==IT_CALL
-				 || (currentMenu->menuitems[itemOn].status & IT_TYPE)==IT_SUBMENU)
-                 && (currentMenu->menuitems[itemOn].status & IT_CALLTYPE))
-				{
-					if (((currentMenu->menuitems[itemOn].status & IT_CALLTYPE) & IT_CALL_NOTMODIFIED) && majormods)
-					{
-						S_StartSound(NULL, sfx_menu1);
-						M_StartMessage(M_GetText("This cannot be done with complex addons\nor in a cheated game.\n\n(Press a key)\n"), NULL, MM_NOTHING);
-						return true;
-					}
-				}
 				S_StartSound(NULL, sfx_menu1);
 				switch (currentMenu->menuitems[itemOn].status & IT_TYPE)
 				{
@@ -3915,7 +3182,6 @@ boolean M_Responder(event_t *ev)
 			return true;
 
 		case KEY_ESCAPE:
-		//case KEY_JOY1 + 2:
 			noFurtherInput = true;
 			currentMenu->lastOn = itemOn;
 			if (currentMenu->prevMenu)
@@ -3968,10 +3234,6 @@ boolean M_Responder(event_t *ev)
 				return true;
 			}
 
-			// Why _does_ backspace go back anyway?
-			//currentMenu->lastOn = itemOn;
-			//if (currentMenu->prevMenu)
-			//	M_SetupNextMenu(currentMenu->prevMenu);
 			return false;
 
 		default:
@@ -3985,7 +3247,6 @@ boolean M_Responder(event_t *ev)
 // special responder for demos
 boolean M_DemoResponder(event_t *ev)
 {
-
 	INT32 ch = -1;	// cur event data
 	boolean eatinput = false;	// :omnom:
 
@@ -4045,19 +3306,19 @@ boolean M_DemoResponder(event_t *ev)
 			// switch viewpoints:
 			case '1':	// viewpoint for p1 (also f12)
 				// maximum laziness:
-				if (!demo.freecam)
+				if (!camera[0].freecam)
 					G_AdjustView(1, 1, true);
 				break;
 			case '2':	// viewpoint for p2
-				if (!demo.freecam)
+				if (!camera[1].freecam)
 					G_AdjustView(2, 1, true);
 				break;
 			case '3':	// viewpoint for p3
-				if (!demo.freecam)
+				if (!camera[2].freecam)
 					G_AdjustView(3, 1, true);
 				break;
 			case '4':	// viewpoint for p4
-				if (!demo.freecam)
+				if (!camera[3].freecam)
 					G_AdjustView(4, 1, true);
 				break;
 
@@ -4068,6 +3329,24 @@ boolean M_DemoResponder(event_t *ev)
 	return eatinput;
 }
 
+// mhhm yes
+static boolean ShouldDrawMenuBG(void)
+{
+	if (WipeInAction) // dont ever draw stuff in wipes
+		return false;
+
+	if (currentMenu == &PlaybackMenuDef) // Replay playback has its own background
+		return false;
+
+	if (forceshowhud)
+		return false;
+
+	// camera options stuff, only do when in level
+	if (gamestate == GS_LEVEL && (currentMenu == &OP_CamOptionsDef || currentMenu == &OP_Player1CamOptionsDef || currentMenu == &OP_Player2CamOptionsDef || currentMenu == &OP_Player3CamOptionsDef || currentMenu == &OP_Player4CamOptionsDef))
+		return false;
+
+	return true;
+}
 
 //
 // M_Drawer
@@ -4079,13 +3358,20 @@ void M_Drawer(void)
 	if (currentMenu == &MessageDef)
 		menuactive = true;
 
+	forceshowhud = (gamestate == GS_LEVEL && menuactive && (currentMenu == &OP_SaturnHudDef || currentMenu == &OP_HudOffsetDef || currentMenu == &OP_NametagDef || currentMenu == &OP_DriftGaugeDef)); // holy fuick
+
 	if (menuactive)
 	{
 		// now that's more readable with a faded background (yeah like Quake...)
+<<<<<<< HEAD
 		if (!WipeInAction && currentMenu != &PlaybackMenuDef) // Replay playback has its own background
 		{
 			if ((!netgame) && gamestate == GS_LEVEL) //only paused when not in netgame
 				V_DrawVhsEffect(false);
+=======
+		if (ShouldDrawMenuBG())
+		{
+>>>>>>> Saturn-Next
 			V_DrawFadeScreen(0xFF00, 16);
 		}
 
@@ -4110,15 +3396,17 @@ void M_Drawer(void)
 				V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch);
 				V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision);
 #else // Regular build
+				V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision); // Removeur this for release! im just lazy to make a new flag or smth
 				V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING));
 #endif
 
 #ifdef HWRENDER
 				if (rendermode == render_opengl)
-				V_DrawThinString(0, 0, V_GREENMAP|V_SNAPTOTOP|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("Opengl"));
-#endif			
+					V_DrawThinString(0, 0, V_GREENMAP|V_SNAPTOTOP|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("Opengl"));
+				else
+#endif
 				if (rendermode == render_soft)
-				V_DrawThinString(0, 0, V_REDMAP|V_SNAPTOTOP|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("Software"));	
+					V_DrawThinString(0, 0, V_REDMAP|V_SNAPTOTOP|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("Software"));
 			}
 		}
 	}
@@ -4149,11 +3437,7 @@ void M_StartControlPanel(void)
 	}
 
 	menuactive = true;
-
-	DPADUPSCROLL = false;
-	DPADDOWNSCROLL = false;
-	DPADLEFTSCROLL = false;
-	DPADRIGHTSCROLL = false;
+	G_ResetControls();
 
 	if (demo.playback)
 	{
@@ -4162,9 +3446,6 @@ void M_StartControlPanel(void)
 	}
 	else if (!Playing())
 	{
-		// Secret menu!
-		//MainMenu[secrets].status = (M_AnySecretUnlocked()) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
-
 		currentMenu = &MainDef;
 		itemOn = singleplr;
 	}
@@ -4177,18 +3458,13 @@ void M_StartControlPanel(void)
 	{
 		if (gamestate != GS_LEVEL) // intermission, so gray out stuff.
 		{
-			SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA)) ? (IT_GRAYEDOUT) : (IT_DISABLED);
 			SPauseMenu[spause_retry].status = IT_GRAYEDOUT;
 		}
 		else
 		{
-			SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA)) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
 			SPauseMenu[spause_retry].status = (IT_STRING | IT_CALL);
 		}
 
-		// And emblem hints.
-		SPauseMenu[spause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS)) ? (IT_STRING | IT_CALL) : (IT_DISABLED);
-
 		currentMenu = &SPauseDef;
 		itemOn = spause_continue;
 	}
@@ -4209,18 +3485,18 @@ void M_StartControlPanel(void)
 		MPauseMenu[mpause_psetup].status = IT_DISABLED;
 		MISC_ChangeTeamMenu[0].status = IT_DISABLED;
 		MISC_ChangeSpectateMenu[0].status = IT_DISABLED;
-		
+
 		MPauseMenu[mpause_addlocalskins].status = IT_STRING | IT_CALL;
 		MPauseMenu[mpause_localskin].status = IT_STRING | IT_CALL;
 
 		// Reset these in case splitscreen messes things up
 		MPauseMenu[mpause_addons].alphaKey = 8;
-		
+
 		if (IsPlayerAdmin(consoleplayer))
 			MPauseMenu[mpause_addlocalskins].alphaKey = 16;
 		else
 			MPauseMenu[mpause_addlocalskins].alphaKey = 24;
-	
+
 		MPauseMenu[mpause_scramble].alphaKey = 8;
 		MPauseMenu[mpause_switchmap].alphaKey = 24;
 
@@ -4237,21 +3513,21 @@ void M_StartControlPanel(void)
 		{
 			MPauseMenu[mpause_switchmap].status = IT_STRING | IT_CALL;
 			MPauseMenu[mpause_addons].status = IT_STRING | IT_CALL;
-			
+
 			if (G_GametypeHasTeams())
 				MPauseMenu[mpause_scramble].status = IT_STRING | IT_SUBMENU;
 		}
-		
+
 		if (server || (!cv_showlocalskinmenus.value))
 		{
 			MPauseMenu[mpause_addlocalskins].status = IT_DISABLED;
 			MPauseMenu[mpause_localskin].status = IT_DISABLED;
-					
+
 			MPauseMenu[mpause_options].alphaKey = 64;
 			MPauseMenu[mpause_title].alphaKey = 80;
 			MPauseMenu[mpause_quit].alphaKey = 88;
 		}
-				
+
 
 		if (splitscreen)
 		{
@@ -4354,7 +3630,7 @@ void M_ClearMenus(boolean callexitmenufunc)
 	if (currentMenu->quitroutine && callexitmenufunc && !currentMenu->quitroutine())
 		return; // we can't quit this menu (also used to set parameter from the menu)
 
-// Save the config file. I'm sick of crashing the game later and losing all my changes!
+	// Save the config file. I'm sick of crashing the game later and losing all my changes!
 	COM_BufAddText(va("saveconfig \"%s\" -silent\n", configfile));
 
 	if (currentMenu == &MessageDef) // Oh sod off!
@@ -4395,6 +3671,8 @@ void M_SetupNextMenu(menu_t *menudef)
 			}
 		}
 	}
+
+	M_CheckStringItem();
 }
 
 //
@@ -4419,6 +3697,9 @@ void M_Ticker(void)
 	else
 		playback_enterheld = 0;
 
+	if (demo.inreplayhut)
+		M_HutCheckReplays(cv_replaysearchrate.value);
+
 	interpTimerHackAllow = true;
 
 	//added : 30-01-98 : test mode for five seconds
@@ -4511,47 +3792,59 @@ void M_Init(void)
 	if (rendermode == render_soft)
 	{
 		OP_VideoOptionsMenu[op_video_ogl].status = IT_DISABLED;
-		OP_ExpOptionsMenu[op_exp_grscrtx].status = IT_DISABLED;
+
+		OP_ExpOptionsMenu[op_exp_glscrtx].status = IT_DISABLED;
 #ifdef USE_FBO_OGL
 		OP_ExpOptionsMenu[op_exp_fbo].status = IT_DISABLED;
 #endif
+<<<<<<< HEAD
+=======
+		OP_ExpOptionsMenu[op_exp_paldepth].status = IT_DISABLED;
+>>>>>>> Saturn-Next
 	}
-
-	if (rendermode == render_opengl)
+	else if (rendermode == render_opengl)
 	{
 #ifdef USE_FBO_OGL
 		if (!supportFBO)
 			OP_ExpOptionsMenu[op_exp_fbo].status = IT_GRAYEDOUT;
 #endif
+		if (!gl_shadersavailable)
+		{
+			OP_OpenGLOptionsMenu[op_gl_shader].status = IT_GRAYEDOUT;
+			OP_OpenGLOptionsMenu[op_gl_lightdither].status = IT_GRAYEDOUT;
+			OP_OpenGLOptionsMenu[op_gl_palrender].status = IT_GRAYEDOUT;
+			OP_OpenGLOptionsMenu[op_gl_flashpal].status = IT_GRAYEDOUT;
+
+			OP_ExpOptionsMenu[op_exp_paldepth].status = IT_GRAYEDOUT;
+		}
 	}
 #endif
 
-	if (!xtra_speedo && !kartzspeedo && !achi_speedo) // why bother?
-		OP_SaturnMenu[sm_speedometer].status = IT_GRAYEDOUT;
-	
-	//if (!xtra_speedo && kartzspeedo)
-		//OP_SaturnMenu[sm_speedometer].text = "Speedometer (No Small)";
-	
-	//if (xtra_speedo && !kartzspeedo)
-		//OP_SaturnMenu[sm_speedometer].text = "Speedometer (No PMeter)";
-	// idk i dont wanna bother with this tbh lmao
+	if (!xtra_speedo && !kartz_speedo && !achi_speedo && !dial_speedo) // why bother?
+		OP_SaturnHudMenu[sh_speedometer].status = IT_GRAYEDOUT;
 
 	if (!clr_hud) // uhguauhauguuhee
 	{
-		OP_SaturnMenu[sm_colorhud].status = IT_GRAYEDOUT;
-		OP_SaturnMenu[sm_coloritem].status = IT_GRAYEDOUT;
-		OP_SaturnMenu[sm_colorhud_customcolor].status = IT_GRAYEDOUT;
+		OP_SaturnHudMenu[sh_colorhud].status = IT_GRAYEDOUT;
+		OP_SaturnHudMenu[sh_coloritem].status = IT_GRAYEDOUT;
+		OP_SaturnHudMenu[sh_colorhud_customcolor].status = IT_GRAYEDOUT;
 	}
 
 	if (!nametaggfx)
 		OP_NametagMenu[nt_ntchar].status = IT_GRAYEDOUT;
 
+	if (!minidoticon && !minilighticon)
+		OP_SaturnHudMenu[sh_minidot].status = IT_GRAYEDOUT;
+
 #ifndef NONET
 	CV_RegisterVar(&cv_serversort);
 #endif
 
 	//todo put this somewhere better...
 	CV_RegisterVar(&cv_allcaps);
+
+	memset(menu_text_input_buf, 0, sizeof menu_text_input_buf);
+	M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf);
 }
 
 void M_InitCharacterTables(void)
@@ -4637,25 +3930,25 @@ static void M_DrawThermo(INT32 x, INT32 y, consvar_t *cv)
 	lumpnum_t leftlump, rightlump, centerlump[2], cursorlump;
 	patch_t *p;
 
-	leftlump = W_GetNumForName("M_THERML");
-	rightlump = W_GetNumForName("M_THERMR");
+	leftlump      = W_GetNumForName("M_THERML");
+	rightlump     = W_GetNumForName("M_THERMR");
 	centerlump[0] = W_GetNumForName("M_THERMM");
 	centerlump[1] = W_GetNumForName("M_THERMM");
-	cursorlump = W_GetNumForName("M_THERMO");
+	cursorlump    = W_GetNumForName("M_THERMO");
 
-	V_DrawScaledPatch(xx, y, 0, p = W_CachePatchNum(leftlump,PU_CACHE));
-	xx += SHORT(p->width) - SHORT(p->leftoffset);
+	V_DrawScaledPatch(xx, y, 0, p = W_CachePatchNum(leftlump, PU_PATCH));
+	xx += p->width - p->leftoffset;
 	for (i = 0; i < 16; i++)
 	{
-		V_DrawScaledPatch(xx, y, V_WRAPX, W_CachePatchNum(centerlump[i & 1], PU_CACHE));
+		V_DrawScaledPatch(xx, y, V_WRAPX, W_CachePatchNum(centerlump[i & 1], PU_PATCH));
 		xx += 8;
 	}
-	V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(rightlump, PU_CACHE));
+	V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(rightlump, PU_PATCH));
 
 	xx = (cv->value - cv->PossibleValue[0].value) * (15*8) /
 		(cv->PossibleValue[1].value - cv->PossibleValue[0].value);
 
-	V_DrawScaledPatch((x + 8) + xx, y, 0, W_CachePatchNum(cursorlump, PU_CACHE));
+	V_DrawScaledPatch((x + 8) + xx, y, 0, W_CachePatchNum(cursorlump, PU_PATCH));
 }
 
 //  A smaller 'Thermo', with range given as percents (0-100)
@@ -4665,53 +3958,60 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv, boolean ontop)
 	INT32 range;
 	patch_t *p;
 
+	x = BASEVIDWIDTH - x - SLIDER_WIDTH;
+
+	p =  W_CachePatchName("M_SLIDEL", PU_PATCH);
+	V_DrawScaledPatch(x - 8, y, 0, p);
+
+	p =  W_CachePatchName("M_SLIDEM", PU_PATCH);
+	for (i = 0; i < SLIDER_RANGE; i++)
+		V_DrawScaledPatch (x+i*8, y, 0,p);
+
+	p = W_CachePatchName("M_SLIDER", PU_PATCH);
+	V_DrawScaledPatch(x+i*8, y, 0, p);
+
+	// draw the slider cursor
+	p = W_CachePatchName("M_SLIDEC", PU_PATCH);
+
 	for (i = 0; cv->PossibleValue[i+1].strvalue; i++);
 
-	x = BASEVIDWIDTH - x - SLIDER_WIDTH;
+	if (cv->flags & CV_FLOAT)
+		range = (INT32)(atof(cv->defaultvalue)*FRACUNIT);
+	else
+		range = atoi(cv->defaultvalue);
+
+	if (range != cv->value)
+	{
+		range = ((range - cv->PossibleValue[0].value) * 100 /
+		 (cv->PossibleValue[i].value - cv->PossibleValue[0].value));
+
+		if (range < 0)
+			range = 0;
+		else if (range > 100)
+			range = 100;
+
+		V_DrawMappedPatch(x - 4 + (((SLIDER_RANGE)*8 + 4)*range)/100, y, 0, p, yellowmap);
+	}
+
+	range = ((cv->value - cv->PossibleValue[0].value) * 100 /
+	 (cv->PossibleValue[i].value - cv->PossibleValue[0].value));
+
+	if (range < 0)
+		range = 0;
+	else if (range > 100)
+		range = 100;
+
+	V_DrawMappedPatch(x - 4 + (((SLIDER_RANGE)*8 + 4)*range)/100, y, 0, p, yellowmap);
 
 	if (ontop)
 	{
 		V_DrawCharacter(x - 16 - (skullAnimCounter/5), y,
-			'\x1C' | highlightflags, false); // left arrow
+			'\x1C' | highlightflags, false);
 		V_DrawCharacter(x+(SLIDER_RANGE*8) + 8 + (skullAnimCounter/5), y,
-			'\x1D' | highlightflags, false); // right arrow
+			'\x1D' | highlightflags, false);
+		V_DrawCenteredString(x + ((SLIDER_RANGE*8) + 8)/2, y, V_30TRANS,
+			(cv->flags & CV_FLOAT) ? va("%.2f", FIXED_TO_FLOAT(cv->value)) : va("%d", cv->value));
 	}
-
-	if ((range = atoi(cv->defaultvalue)) != cv->value)
-	{
-		range = ((range - cv->PossibleValue[0].value) * 100 /
-		(cv->PossibleValue[1].value - cv->PossibleValue[0].value));
-
-		if (range < 0)
-			range = 0;
-		if (range > 100)
-			range = 100;
-
-		// draw the default
-		p = W_CachePatchName("M_SLIDEC", PU_CACHE);
-		V_DrawScaledPatch(x - 4 + (((SLIDER_RANGE)*8 + 4)*range)/100, y, 0, p);
-	}
-
-	V_DrawScaledPatch(x - 8, y, 0, W_CachePatchName("M_SLIDEL", PU_CACHE));
-
-	p =  W_CachePatchName("M_SLIDEM", PU_CACHE);
-	for (i = 0; i < SLIDER_RANGE; i++)
-		V_DrawScaledPatch (x+i*8, y, 0,p);
-
-	p = W_CachePatchName("M_SLIDER", PU_CACHE);
-	V_DrawScaledPatch(x+SLIDER_RANGE*8, y, 0, p);
-
-	range = ((cv->value - cv->PossibleValue[0].value) * 100 /
-	 (cv->PossibleValue[1].value - cv->PossibleValue[0].value));
-
-	if (range < 0)
-		range = 0;
-	if (range > 100)
-		range = 100;
-
-	// draw the slider cursor
-	p = W_CachePatchName("M_SLIDEC", PU_CACHE);
-	V_DrawScaledPatch(x - 4 + (((SLIDER_RANGE)*8 + 4)*range)/100, y, 0, p);
 }
 
 //
@@ -4724,13 +4024,19 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
 	V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 239);
 }
 
+void M_DrawTextBoxFlags(INT32 x, INT32 y, INT32 width, INT32 boxlines, INT32 flags)
+{
+	// Solid color textbox.
+	V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 239|flags);
+}
+
 // horizontally centered text
 static void M_CentreText(INT32 y, const char *string)
 {
 	INT32 x;
 	//added : 02-02-98 : centre on 320, because V_DrawString centers on vid.width...
 	x = (BASEVIDWIDTH - V_StringWidth(string, V_OLDSPACING))>>1;
-	V_DrawString(x,y,V_OLDSPACING,string);
+	V_DrawString(x,y,V_OLDSPACING|MENUCAPS,string);
 }
 
 //
@@ -4749,8 +4055,6 @@ static void M_DrawMapEmblems(INT32 mapnum, INT32 x, INT32 y)
 		{
 			case ET_TIME: //case ET_SCORE: case ET_RINGS:
 				curtype = 1; break;
-			/*case ET_NGRADE: case ET_NTIME:
-				curtype = 2; break;*/
 			default:
 				curtype = 0; break;
 		}
@@ -4761,10 +4065,10 @@ static void M_DrawMapEmblems(INT32 mapnum, INT32 x, INT32 y)
 		lasttype = curtype;
 
 		if (emblem->collected)
-			V_DrawSmallMappedPatch(x, y, 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
+			V_DrawSmallMappedPatch(x, y, 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_PATCH),
 			                       R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_MENUCACHE));
 		else
-			V_DrawSmallScaledPatch(x, y, 0, W_CachePatchName("NEEDIT", PU_CACHE));
+			V_DrawSmallScaledPatch(x, y, 0, W_CachePatchName("NEEDIT", PU_PATCH));
 
 		emblem = M_GetLevelEmblems(-1);
 		x -= 8;
@@ -4775,12 +4079,12 @@ static void M_DrawMenuTitle(void)
 {
 	if (currentMenu->menutitlepic)
 	{
-		patch_t *p = W_CachePatchName(currentMenu->menutitlepic, PU_CACHE);
+		patch_t *p = W_CachePatchName(currentMenu->menutitlepic, PU_PATCH);
 
 		if (p->height > 24) // title is larger than normal
 		{
-			INT32 xtitle = (BASEVIDWIDTH - (SHORT(p->width)/2))/2;
-			INT32 ytitle = (30 - (SHORT(p->height)/2))/2;
+			INT32 xtitle = (BASEVIDWIDTH - (p->width/2))/2;
+			INT32 ytitle = (30 - (p->height/2))/2;
 
 			if (xtitle < 0)
 				xtitle = 0;
@@ -4791,8 +4095,8 @@ static void M_DrawMenuTitle(void)
 		}
 		else
 		{
-			INT32 xtitle = (BASEVIDWIDTH - SHORT(p->width))/2;
-			INT32 ytitle = (30 - SHORT(p->height))/2;
+			INT32 xtitle = (BASEVIDWIDTH - p->width)/2;
+			INT32 ytitle = (30 - p->height)/2;
 
 			if (xtitle < 0)
 				xtitle = 0;
@@ -4834,7 +4138,7 @@ static void M_DrawSplitText(INT32 x, INT32 y, INT32 option, const char* str, INT
 	yoffset = (((5*10 - num_lines*10)));
 
 	// Draw BG first,,,
-	for (int i = 0; i < num_lines; i++) 
+	for (int i = 0; i < num_lines; i++)
 	{
 		V_DrawFill(0, (y + yoffset - 6)+5, vid.width, 11, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
 		yoffset += 11;
@@ -4843,7 +4147,7 @@ static void M_DrawSplitText(INT32 x, INT32 y, INT32 option, const char* str, INT
 	yoffset = (((5*10 - num_lines*10)));
 
 	// THEN the text
-	for (int i = 0; i < num_lines; i++) 
+	for (int i = 0; i < num_lines; i++)
 	{
         V_DrawCenteredThinString(x, y + yoffset, option, clines[i]);
 		V_DrawCenteredThinString(x, y + yoffset, option|V_YELLOWMAP|((9 - alpha) << V_ALPHASHIFT), clines[i]);
@@ -4855,12 +4159,20 @@ static void M_DrawSplitText(INT32 x, INT32 y, INT32 option, const char* str, INT
 	free(clines);
 }
 
+static void M_DoToolTips(menu_t* menu)
+{
+	if (!menu->tooltips || itemOn == -1 || !menu->tooltips[itemOn])
+		return;
+
+	M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, menu->tooltips[itemOn], coolalphatimer);
+
+	if ((coolalphatimer > 0) && interpTimerHackAllow)
+		coolalphatimer--;
+}
 
 static void M_DrawGenericMenu(void)
 {
 	INT32 x, y, w, i, cursory = 0;
-	
-	INT32 lowercase = !cv_menucaps.value ? V_ALLOWLOWERCASE : 0;
 
 	// DRAW MENU
 	x = currentMenu->x;
@@ -4881,13 +4193,13 @@ static void M_DrawGenericMenu(void)
 					if (currentMenu->menuitems[i].status & IT_CENTER)
 					{
 						patch_t *p;
-						p = W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE);
-						V_DrawScaledPatch((BASEVIDWIDTH - SHORT(p->width))/2, y, 0, p);
+						p = W_CachePatchName(currentMenu->menuitems[i].patch, PU_PATCH);
+						V_DrawScaledPatch((BASEVIDWIDTH - p->width)/2, y, 0, p);
 					}
 					else
 					{
 						V_DrawScaledPatch(x, y, 0,
-							W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE));
+							W_CachePatchName(currentMenu->menuitems[i].patch, PU_PATCH));
 					}
 				}
 				/* FALLTHRU */
@@ -4907,9 +4219,9 @@ static void M_DrawGenericMenu(void)
 					cursory = y;
 
 				if ((currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING)
-					V_DrawString(x, y, lowercase, currentMenu->menuitems[i].text);
+					V_DrawString(x, y, MENUCAPS, currentMenu->menuitems[i].text);
 				else
-					V_DrawString(x, y, lowercase|highlightflags, currentMenu->menuitems[i].text);
+					V_DrawString(x, y, MENUCAPS|highlightflags, currentMenu->menuitems[i].text);
 
 				// Cvar specific handling
 				switch (currentMenu->menuitems[i].status & IT_TYPE)
@@ -4925,16 +4237,18 @@ static void M_DrawGenericMenu(void)
 								break;
 							case IT_CV_STRING:
 								M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1);
-								V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
-								if (skullAnimCounter < 4 && i == itemOn)
-									V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
-										'_' | 0x80, false);
+
+								if (itemOn == i)
+									M_DrawTextInput(x + 8, y + 12, &menuinput, 0);
+								else
+									V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
+
 								y += 16;
 								break;
 							default:
 								w = V_StringWidth(cv->string, 0);
 								V_DrawString(BASEVIDWIDTH - x - w, y,
-									((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? warningflags : highlightflags)|lowercase, cv->string);
+									((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? warningflags : highlightflags)|MENUCAPS, cv->string);
 								if (i == itemOn)
 								{
 									V_DrawCharacter(BASEVIDWIDTH - x - 10 - w - (skullAnimCounter/5), y,
@@ -4949,7 +4263,7 @@ static void M_DrawGenericMenu(void)
 					y += STRINGHEIGHT;
 					break;
 			case IT_STRING2:
-				V_DrawString(((BASEVIDWIDTH - V_StringWidth(currentMenu->menuitems[i].text, 0))>>1), y, lowercase, currentMenu->menuitems[i].text);
+				V_DrawString(((BASEVIDWIDTH - V_StringWidth(currentMenu->menuitems[i].text, 0))>>1), y, MENUCAPS, currentMenu->menuitems[i].text);
 				/* FALLTHRU */
 			case IT_DYLITLSPACE:
 				y += SMALLLINEHEIGHT;
@@ -4957,7 +4271,7 @@ static void M_DrawGenericMenu(void)
 			case IT_GRAYPATCH:
 				if (currentMenu->menuitems[i].patch && currentMenu->menuitems[i].patch[0])
 					V_DrawMappedPatch(x, y, 0,
-						W_CachePatchName(currentMenu->menuitems[i].patch,PU_CACHE), graymap);
+						W_CachePatchName(currentMenu->menuitems[i].patch, PU_PATCH), graymap);
 				y += LINEHEIGHT;
 				break;
 			case IT_TRANSTEXT:
@@ -4965,21 +4279,21 @@ static void M_DrawGenericMenu(void)
 					y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
 				/* FALLTHRU */
 			case IT_TRANSTEXT2:
-				V_DrawString(x, y, V_TRANSLUCENT|lowercase, currentMenu->menuitems[i].text);
+				V_DrawString(x, y, V_TRANSLUCENT|MENUCAPS, currentMenu->menuitems[i].text);
 				y += SMALLLINEHEIGHT;
 				break;
 			case IT_QUESTIONMARKS:
 				if (currentMenu->menuitems[i].alphaKey)
 					y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
 
-				V_DrawString(x, y, V_TRANSLUCENT|V_OLDSPACING|lowercase, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
+				V_DrawString(x, y, V_TRANSLUCENT|V_OLDSPACING|MENUCAPS, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
 				y += SMALLLINEHEIGHT;
 				break;
 			case IT_HEADERTEXT: // draws 16 pixels to the left, in yellow text
 				if (currentMenu->menuitems[i].alphaKey)
 					y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
 
-				V_DrawString(x-16, y, highlightflags|lowercase, currentMenu->menuitems[i].text);
+				V_DrawString(x-16, y, highlightflags|MENUCAPS, currentMenu->menuitems[i].text);
 				y += SMALLLINEHEIGHT;
 				break;
 		}
@@ -4990,17 +4304,18 @@ static void M_DrawGenericMenu(void)
 		|| ((currentMenu->menuitems[itemOn].status & IT_DISPLAY) == IT_NOTHING))
 	{
 		V_DrawScaledPatch(currentMenu->x + SKULLXOFF, cursory - 5, 0,
-			W_CachePatchName("M_CURSOR", PU_CACHE));
+			W_CachePatchName("M_CURSOR", PU_PATCH));
 	}
 	else
 	{
 		V_DrawScaledPatch(currentMenu->x - 24, cursory, 0,
-			W_CachePatchName("M_CURSOR", PU_CACHE));
-		V_DrawString(currentMenu->x, cursory, lowercase|highlightflags, currentMenu->menuitems[itemOn].text);
+			W_CachePatchName("M_CURSOR", PU_PATCH));
+		V_DrawString(currentMenu->x, cursory, MENUCAPS|highlightflags, currentMenu->menuitems[itemOn].text);
 	}
 
 	// dumb hack
 	// tooltips
+<<<<<<< HEAD
 	if (currentMenu == &OP_ControlsDef)
 	{
 		if (!(OP_ControlsTooltips[itemOn] == NULL))
@@ -5160,11 +4475,14 @@ static void M_DrawGenericMenu(void)
 				coolalphatimer--;
 		}
 	}
+=======
+	M_DoToolTips(currentMenu);
+>>>>>>> Saturn-Next
 }
 
 static void M_DrawGenericBackgroundMenu(void)
 {
-	V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
+	V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_PATCH));
 	M_DrawGenericMenu();
 }
 
@@ -5213,8 +4531,6 @@ static void M_DrawGenericScrollMenu(void)
 
 	// draw title (or big pic)
 	M_DrawMenuTitle();
-	
-	INT32 lowercase = !cv_menucaps.value ? V_ALLOWLOWERCASE : 0;
 
 	for (; i < max; i++)
 	{
@@ -5232,9 +4548,9 @@ static void M_DrawGenericScrollMenu(void)
 			case IT_STRING:
 			case IT_WHITESTRING:
 				if (i != itemOn && (currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING)
-					V_DrawString(x, y, lowercase, currentMenu->menuitems[i].text);
+					V_DrawString(x, y, MENUCAPS, currentMenu->menuitems[i].text);
 				else
-					V_DrawString(x, y, lowercase|highlightflags, currentMenu->menuitems[i].text);
+					V_DrawString(x, y, MENUCAPS|highlightflags, currentMenu->menuitems[i].text);
 
 				// Cvar specific handling
 				switch (currentMenu->menuitems[i].status & IT_TYPE)
@@ -5252,14 +4568,16 @@ static void M_DrawGenericScrollMenu(void)
 								if (y + 12 > (currentMenu->y + 2*scrollareaheight))
 									break;
 								M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1);
-								V_DrawString(x + 8, y + 12, lowercase, cv->string);
-								if (skullAnimCounter < 4 && i == itemOn)
-									V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
-										'_' | 0x80, false);
+
+								if (itemOn == i)
+									M_DrawTextInput(x + 8, y + 12, &menuinput, 0);
+								else
+									V_DrawString(x + 8, y + 12, MENUCAPS, cv->string);
+
 								break;
 							default:
 								V_DrawRightAlignedString(BASEVIDWIDTH - x, y,
-									((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? V_REDMAP : highlightflags)|lowercase, cv->string);
+									((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? V_REDMAP : highlightflags)|MENUCAPS, cv->string);
 								if (i == itemOn)
 								{
 									V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(cv->string, 0) - (skullAnimCounter/5), y,
@@ -5273,153 +4591,28 @@ static void M_DrawGenericScrollMenu(void)
 					}
 					break;
 			case IT_TRANSTEXT:
-				V_DrawString(x, y, V_TRANSLUCENT|lowercase, currentMenu->menuitems[i].text);
+				V_DrawString(x, y, V_TRANSLUCENT|MENUCAPS, currentMenu->menuitems[i].text);
 				break;
 			case IT_QUESTIONMARKS:
-				V_DrawString(x, y, lowercase|V_TRANSLUCENT|V_OLDSPACING, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
+				V_DrawString(x, y, MENUCAPS|V_TRANSLUCENT|V_OLDSPACING, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
 				break;
 			case IT_HEADERTEXT:
-				V_DrawString(x-16, y, highlightflags|lowercase, currentMenu->menuitems[i].text);
+				V_DrawString(x-16, y, highlightflags|MENUCAPS, currentMenu->menuitems[i].text);
 				break;
 		}
 	}
 
 	// DRAW THE SKULL CURSOR
 	V_DrawScaledPatch(currentMenu->x - 24, cursory, 0,
-		W_CachePatchName("M_CURSOR", PU_CACHE));
+		W_CachePatchName("M_CURSOR", PU_PATCH));
 
-#ifdef HWRENDER
 	// dumb hack
 	// tooltips
-	if (currentMenu == &OP_OpenGLOptionsDef)
-	{
-		if (!(OP_OpenGLTooltips[itemOn] == NULL)) 
-		{
-			M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_OpenGLTooltips[itemOn], coolalphatimer);
-			if (coolalphatimer > 0 && interpTimerHackAllow)
-				coolalphatimer--;
-		}
-	}
-
-	if (currentMenu == &OP_ExpOptionsDef)
-	{
-		if (!(OP_ExpTooltips[itemOn] == NULL))
-		{
-			M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_ExpTooltips[itemOn], coolalphatimer);
-			if (coolalphatimer > 0 && interpTimerHackAllow)
-				coolalphatimer--;
-		}
-	}
-#endif
-	
-	if (currentMenu == &OP_SaturnDef)
-	{
-		if (!(OP_SaturnTooltips[itemOn] == NULL)) 
-		{
-			M_DrawSplitText(BASEVIDWIDTH / 2, BASEVIDHEIGHT-50, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, OP_SaturnTooltips[itemOn], coolalphatimer);
-			if (coolalphatimer > 0 && interpTimerHackAllow)
-				coolalphatimer--;
-		}
-	}
+	M_DoToolTips(currentMenu);
 }
 
 static void M_DrawPauseMenu(void)
 {
-#if 0
-	if (!netgame && !multiplayer && (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_VOTING))
-	{
-		emblem_t *emblem_detail[3] = {NULL, NULL, NULL};
-		char emblem_text[3][20];
-		INT32 i;
-
-		M_DrawTextBox(27, 16, 32, 6);
-
-		// Draw any and all emblems at the top.
-		M_DrawMapEmblems(gamemap, 272, 28);
-
-		if (strlen(mapheaderinfo[gamemap-1]->zonttl) > 0)
-		{
-			if (strlen(mapheaderinfo[gamemap-1]->actnum) > 0)
-				V_DrawString(40, 28, highlightflags, va("%s %s %s", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->zonttl, mapheaderinfo[gamemap-1]->actnum));
-			else
-				V_DrawString(40, 28, highlightflags, va("%s %s", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->zonttl));
-		}
-		else
-		{
-			if (strlen(mapheaderinfo[gamemap-1]->actnum) > 0)
-				V_DrawString(40, 28, highlightflags, va("%s %s", mapheaderinfo[gamemap-1]->lvlttl, mapheaderinfo[gamemap-1]->actnum));
-			else
-				V_DrawString(40, 28, highlightflags, mapheaderinfo[gamemap-1]->lvlttl);
-		}
-
-		// Set up the detail boxes.
-		{
-			emblem_t *emblem = M_GetLevelEmblems(gamemap);
-			while (emblem)
-			{
-				INT32 emblemslot;
-				char targettext[9], currenttext[9];
-
-				switch (emblem->type)
-				{
-					case ET_TIME:
-						emblemslot = emblem->var; // dumb hack
-						snprintf(targettext, 9, "%i:%02i.%02i",
-							G_TicsToMinutes((tic_t)emblemslot, false),
-							G_TicsToSeconds((tic_t)emblemslot),
-							G_TicsToCentiseconds((tic_t)emblemslot));
-
-						emblemslot = (INT32)G_GetBestTime(gamemap); // dumb hack pt ii
-						if ((tic_t)emblemslot == UINT32_MAX)
-							snprintf(currenttext, 9, "-:--.--");
-						else
-							snprintf(currenttext, 9, "%i:%02i.%02i",
-								G_TicsToMinutes((tic_t)emblemslot, false),
-								G_TicsToSeconds((tic_t)emblemslot),
-								G_TicsToCentiseconds((tic_t)emblemslot));
-
-						targettext[8] = 0;
-						currenttext[8] = 0;
-
-						emblemslot = 1;
-						break;
-					default:
-						goto bademblem;
-				}
-				if (emblem_detail[emblemslot])
-					goto bademblem;
-
-				emblem_detail[emblemslot] = emblem;
-				snprintf(emblem_text[emblemslot], 20, "%8s /%8s", currenttext, targettext);
-				emblem_text[emblemslot][19] = 0;
-
-				bademblem:
-				emblem = M_GetLevelEmblems(-1);
-			}
-		}
-		for (i = 0; i < 3; ++i)
-		{
-			emblem_t *emblem = emblem_detail[i];
-			if (!emblem)
-				continue;
-
-			if (emblem->collected)
-				V_DrawSmallMappedPatch(40, 44 + (i*8), 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
-				                       R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_MENUCACHE));
-			else
-				V_DrawSmallScaledPatch(40, 44 + (i*8), 0, W_CachePatchName("NEEDIT", PU_CACHE));
-
-			switch (emblem->type)
-			{
-				case ET_TIME:
-					V_DrawString(56, 44 + (i*8), highlightflags, "TIME:");
-					break;
-			}
-			V_DrawRightAlignedString(284, 44 + (i*8), V_MONOSPACE, emblem_text[i]);
-		}
-	}
-#endif
-
 #ifdef HAVE_DISCORDRPC
 	// kind of hackily baked in here
 	if (currentMenu == &MPauseDef && discordRequestList != NULL)
@@ -5432,7 +4625,7 @@ static void M_DrawPauseMenu(void)
 				(currentMenu->y + MPauseMenu[mpause_discordrequests].alphaKey - 1) * FRACUNIT,
 				FRACUNIT,
 				0,
-				W_CachePatchName("K_REQUE2", PU_CACHE),
+				W_CachePatchName("K_REQUE2", PU_PATCH),
 				NULL
 			);
 		}
@@ -5452,8 +4645,6 @@ static void M_DrawCenteredMenu(void)
 
 	// draw title (or big pic)
 	M_DrawMenuTitle();
-	
-	INT32 lowercase = !cv_menucaps.value ? V_ALLOWLOWERCASE : 0;
 
 	for (i = 0; i < currentMenu->numitems; i++)
 	{
@@ -5464,16 +4655,15 @@ static void M_DrawCenteredMenu(void)
 			case IT_PATCH:
 				if (currentMenu->menuitems[i].patch && currentMenu->menuitems[i].patch[0])
 				{
+					patch_t *p = W_CachePatchName(currentMenu->menuitems[i].patch, PU_PATCH);
+
 					if (currentMenu->menuitems[i].status & IT_CENTER)
 					{
-						patch_t *p;
-						p = W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE);
-						V_DrawScaledPatch((BASEVIDWIDTH - SHORT(p->width))/2, y, 0, p);
+						V_DrawScaledPatch((BASEVIDWIDTH - p->width)/2, y, 0, p);
 					}
 					else
 					{
-						V_DrawScaledPatch(x, y, 0,
-							W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE));
+						V_DrawScaledPatch(x, y, 0, p);
 					}
 				}
 				/* FALLTHRU */
@@ -5493,9 +4683,9 @@ static void M_DrawCenteredMenu(void)
 					cursory = y;
 
 				if ((currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING)
-					V_DrawCenteredString(x, y, lowercase, currentMenu->menuitems[i].text);
+					V_DrawCenteredString(x, y, MENUCAPS, currentMenu->menuitems[i].text);
 				else
-					V_DrawCenteredString(x, y, highlightflags|lowercase, currentMenu->menuitems[i].text);
+					V_DrawCenteredString(x, y, highlightflags|MENUCAPS, currentMenu->menuitems[i].text);
 
 				// Cvar specific handling
 				switch(currentMenu->menuitems[i].status & IT_TYPE)
@@ -5510,15 +4700,17 @@ static void M_DrawCenteredMenu(void)
 								break;
 							case IT_CV_STRING:
 								M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1);
-								V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
-								if (skullAnimCounter < 4 && i == itemOn)
-									V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
-										'_' | 0x80, false);
+
+								if (itemOn == i)
+									M_DrawTextInput(x + 8, y + 12, &menuinput, 0);
+								else
+									V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
+
 								y += 16;
 								break;
 							default:
 								V_DrawString(BASEVIDWIDTH - x - V_StringWidth(cv->string, 0), y,
-									((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? warningflags : highlightflags)|lowercase, cv->string);
+									((cv->flags & CV_CHEAT) && !CV_IsSetToDefault(cv) ? warningflags : highlightflags)|MENUCAPS, cv->string);
 								break;
 						}
 						break;
@@ -5526,7 +4718,7 @@ static void M_DrawCenteredMenu(void)
 					y += STRINGHEIGHT;
 					break;
 			case IT_STRING2:
-				V_DrawCenteredString(x, y, lowercase, currentMenu->menuitems[i].text);
+				V_DrawCenteredString(x, y, MENUCAPS, currentMenu->menuitems[i].text);
 				/* FALLTHRU */
 			case IT_DYLITLSPACE:
 				y += SMALLLINEHEIGHT;
@@ -5535,13 +4727,13 @@ static void M_DrawCenteredMenu(void)
 				if (currentMenu->menuitems[i].alphaKey)
 					y = currentMenu->y+currentMenu->menuitems[i].alphaKey;
 
-				V_DrawCenteredString(x, y, V_TRANSLUCENT|V_OLDSPACING|lowercase, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
+				V_DrawCenteredString(x, y, V_TRANSLUCENT|V_OLDSPACING|MENUCAPS, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
 				y += SMALLLINEHEIGHT;
 				break;
 			case IT_GRAYPATCH:
 				if (currentMenu->menuitems[i].patch && currentMenu->menuitems[i].patch[0])
 					V_DrawMappedPatch(x, y, 0,
-						W_CachePatchName(currentMenu->menuitems[i].patch,PU_CACHE), graymap);
+						W_CachePatchName(currentMenu->menuitems[i].patch, PU_PATCH), graymap);
 				y += LINEHEIGHT;
 				break;
 		}
@@ -5552,13 +4744,13 @@ static void M_DrawCenteredMenu(void)
 		|| ((currentMenu->menuitems[itemOn].status & IT_DISPLAY) == IT_NOTHING))
 	{
 		V_DrawScaledPatch(x + SKULLXOFF, cursory - 5, 0,
-			W_CachePatchName("M_CURSOR", PU_CACHE));
+			W_CachePatchName("M_CURSOR", PU_PATCH));
 	}
 	else
 	{
 		V_DrawScaledPatch(x - V_StringWidth(currentMenu->menuitems[itemOn].text, 0)/2 - 24, cursory, 0,
-			W_CachePatchName("M_CURSOR", PU_CACHE));
-		V_DrawCenteredString(x, cursory, highlightflags|lowercase, currentMenu->menuitems[itemOn].text);
+			W_CachePatchName("M_CURSOR", PU_PATCH));
+		V_DrawCenteredString(x, cursory, highlightflags|MENUCAPS, currentMenu->menuitems[itemOn].text);
 	}
 }
 
@@ -5649,14 +4841,13 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt)
 	switch (levellistmode)
 	{
 		case LLM_CREATESERVER:
-			// Should the map be hidden?
-			//if (mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU && mapnum+1 != gamemap)
-				//return false;
-			
 			// Should the map be hidden? <-- well imma wanna toggle it, its just annoying being unable to select hell maps in mapselect
-			if ((mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU && mapnum+1 != gamemap) && (gt == GT_RACE && (mapheaderinfo[mapnum]->typeoflevel & TOL_RACE))) // map hell
+
+			if (mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU && mapnum+1 != gamemap)
 			{
-				if (cv_showallmaps.value)
+				if (cv_showallmaps.value &&
+					((gt == GT_RACE && (mapheaderinfo[mapnum]->typeoflevel & TOL_RACE)) ||                         // race map hell
+					((gt == GT_MATCH || gt == GT_TEAMMATCH) && (mapheaderinfo[mapnum]->typeoflevel & TOL_MATCH)))) // battle map hell
 					return true;
 				else
 					return false;
@@ -5664,12 +4855,7 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt)
 
 			// same goes here, just show every map if i want to
 			if (M_MapLocked(mapnum+1)) // not unlocked
-			{
-				if (cv_showallmaps.value)
-					return true;
-				else
-					return false;
-			}
+				return cv_showallmaps.value;
 
 			if ((gt == GT_MATCH || gt == GT_TEAMMATCH) && (mapheaderinfo[mapnum]->typeoflevel & TOL_MATCH))
 				return true;
@@ -5679,18 +4865,7 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt)
 
 			return false;
 
-		/*case LLM_LEVELSELECT:
-			if (mapheaderinfo[mapnum]->levelselect != maplistoption)
-				return false;
-
-			if (M_MapLocked(mapnum+1))
-				return false; // not unlocked
-
-			return true;*/
 		case LLM_RECORDATTACK:
-			/*if (!(mapheaderinfo[mapnum]->menuflags & LF2_RECORDATTACK))
-				return false;*/
-
 			if (!(mapheaderinfo[mapnum]->typeoflevel & TOL_RACE))
 				return false;
 
@@ -5703,12 +4878,6 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt)
 			if (mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU)
 				return false; // map hell
 
-			/*if (mapheaderinfo[mapnum]->menuflags & LF2_NOVISITNEEDED)
-				return true;
-
-			if (!mapvisited[mapnum])
-				return false;*/
-
 			return true;
 		default:
 			return false;
@@ -5762,10 +4931,9 @@ menu_t MessageDef =
 	0, 0,               // x, y                (TO HACK)
 	0,                  // lastOn, flags       (TO HACK)
 	NULL,
-	{0},
+	NULL,               // tooltips lel
 };
 
-
 void M_StartMessage(const char *string, void *routine,
 	menumessagetype_t itemtype)
 {
@@ -5884,7 +5052,7 @@ static void M_DrawMessageMenu(void)
 
 	// hack: draw RA background in RA menus
 	if (gamestate == GS_TIMEATTACK)
-		V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
+		V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_PATCH));
 
 	M_DrawTextBox(currentMenu->x, y - 8, (max+7)>>3, mlines);
 
@@ -5929,7 +5097,7 @@ static void M_DrawMessageMenu(void)
 		}
 
 		V_DrawString((BASEVIDWIDTH - V_StringWidth(string, 0))/2,y,V_ALLOWLOWERCASE,string);
-		y += 8; //SHORT(hu_font[0]->height);
+		y += 8; //hu_font[0]->height;
 	}
 }
 
@@ -5950,7 +5118,7 @@ static void M_StopMessage(INT32 choice)
 // You can even put multiple images in one menu!
 static void M_DrawImageDef(void)
 {
-	patch_t *patch = W_CachePatchName(currentMenu->menuitems[itemOn].text,PU_CACHE);
+	patch_t *patch = W_CachePatchName(currentMenu->menuitems[itemOn].text, PU_PATCH);
 	if (patch->width <= BASEVIDWIDTH)
 		V_DrawScaledPatch(0,0,0,patch);
 	else
@@ -5965,12 +5133,12 @@ static void M_DrawImageDef(void)
 	{
 		INT32 x = BASEVIDWIDTH>>1, y = (BASEVIDHEIGHT>>1) - 4;
 		x += (itemOn ? 1 : -1)*((BASEVIDWIDTH>>2) + 10);
-		V_DrawCenteredString(x, y-10, highlightflags, "USE ARROW KEYS");
+		V_DrawCenteredString(x, y-10, highlightflags|MENUCAPS, "Use arrow keys");
 		V_DrawCharacter(x - 10 - (skullAnimCounter/5), y,
 			'\x1C' | highlightflags, false); // left arrow
 		V_DrawCharacter(x + 2 + (skullAnimCounter/5), y,
 			'\x1D' | highlightflags, false); // right arrow
-		V_DrawCenteredString(x, y+10, highlightflags, "TO LEAF THROUGH");
+		V_DrawCenteredString(x, y+10, highlightflags|MENUCAPS, "to leaf through");
 	}
 }
 
@@ -6024,21 +5192,29 @@ static void M_AddonsOptions(INT32 choice)
 	M_SetupNextMenu(&OP_AddonsOptionsDef);
 }
 
-#define LOCATIONSTRING1 "Visit \x83SRB2.ORG/MODS\x80 to get & make addons!"
-#define LOCATIONSTRING2 "Visit \x88SRB2.ORG/MODS\x80 to get & make addons!"
+#define LOCATIONSTRING1 "Visit \x83mb.srb2.org/addons\x80 to get addons!"
+#define LOCATIONSTRING2 "Visit \x88mb.srb2.org/addons\x80 to get addons!"
 
 static void M_AddonsInternal(void)
 {
 	const char *pathname = ".";
 
-	if (cv_addons_option.value == 0)
-		pathname = usehome ? srb2home : srb2path;
-	else if (cv_addons_option.value == 1)
-		pathname = srb2home;
-	else if (cv_addons_option.value == 2)
-		pathname = srb2path;
-	else if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
-		pathname = cv_addons_folder.string;
+	switch (cv_addons_option.value)
+	{
+		case 0:
+			pathname = usehome ? srb2home : srb2path;
+			break;
+		case 1:
+			pathname = srb2home;
+			break;
+		case 2:
+			pathname = srb2path;
+			break;
+		case 3:
+			if (*cv_addons_folder.string != '\0')
+				pathname = cv_addons_folder.string;
+			break;
+	}
 
 	strlcpy(menupath, pathname, 1024);
 	menupathindex[(menudepthleft = menudepth-1)] = strlen(menupath) + 1;
@@ -6066,23 +5242,23 @@ static void M_AddonsInternal(void)
 			W_UnlockCachedPatch(addonsp[i]);
 	}
 
-	addonsp[EXT_FOLDER] = W_CachePatchName("M_FFLDR", PU_STATIC);
-	addonsp[EXT_UP] = W_CachePatchName("M_FBACK", PU_STATIC);
-	addonsp[EXT_NORESULTS] = W_CachePatchName("M_FNOPE", PU_STATIC);
-	addonsp[EXT_TXT] = W_CachePatchName("M_FTXT", PU_STATIC);
-	addonsp[EXT_CFG] = W_CachePatchName("M_FCFG", PU_STATIC);
-	addonsp[EXT_WAD] = W_CachePatchName("M_FWAD", PU_STATIC);
+	addonsp[EXT_FOLDER]    = W_CachePatchName("M_FFLDR", PU_PATCH);
+	addonsp[EXT_UP]        = W_CachePatchName("M_FBACK", PU_PATCH);
+	addonsp[EXT_NORESULTS] = W_CachePatchName("M_FNOPE", PU_PATCH);
+	addonsp[EXT_TXT]       = W_CachePatchName("M_FTXT", PU_PATCH);
+	addonsp[EXT_CFG]       = W_CachePatchName("M_FCFG", PU_PATCH);
+	addonsp[EXT_WAD]       = W_CachePatchName("M_FWAD", PU_PATCH);
 #ifdef USE_KART
-	addonsp[EXT_KART] = W_CachePatchName("M_FKART", PU_STATIC);
+	addonsp[EXT_KART]      = W_CachePatchName("M_FKART", PU_PATCH);
 #endif
-	addonsp[EXT_PK3] = W_CachePatchName("M_FPK3", PU_STATIC);
-	addonsp[EXT_SOC] = W_CachePatchName("M_FSOC", PU_STATIC);
-	addonsp[EXT_LUA] = W_CachePatchName("M_FLUA", PU_STATIC);
-	addonsp[NUM_EXT] = W_CachePatchName("M_FUNKN", PU_STATIC);
-	addonsp[NUM_EXT+1] = W_CachePatchName("M_FSEL", PU_STATIC);
-	addonsp[NUM_EXT+2] = W_CachePatchName("M_FLOAD", PU_STATIC);
-	addonsp[NUM_EXT+3] = W_CachePatchName("M_FSRCH", PU_STATIC);
-	addonsp[NUM_EXT+4] = W_CachePatchName("M_FSAVE", PU_STATIC);
+	addonsp[EXT_PK3]   = W_CachePatchName("M_FPK3", PU_PATCH);
+	addonsp[EXT_SOC]   = W_CachePatchName("M_FSOC", PU_PATCH);
+	addonsp[EXT_LUA]   = W_CachePatchName("M_FLUA", PU_PATCH);
+	addonsp[NUM_EXT]   = W_CachePatchName("M_FUNKN", PU_PATCH);
+	addonsp[NUM_EXT+1] = W_CachePatchName("M_FSEL", PU_PATCH);
+	addonsp[NUM_EXT+2] = W_CachePatchName("M_FLOAD", PU_PATCH);
+	addonsp[NUM_EXT+3] = W_CachePatchName("M_FSRCH", PU_PATCH);
+	addonsp[NUM_EXT+4] = W_CachePatchName("M_FSAVE", PU_PATCH);
 
 	MISC_AddonsDef.prevMenu = currentMenu;
 	M_SetupNextMenu(&MISC_AddonsDef);
@@ -6186,8 +5362,6 @@ static void M_AddonsClearName(INT32 choice)
 	M_StopMessage(choice);
 }
 
-int errorshitspam = 0; // prevent the warning screen from crapping itself when errors get spammed lmao
-
 // returns whether to do message draw
 static boolean M_AddonsRefresh(void)
 {
@@ -6212,26 +5386,41 @@ static boolean M_AddonsRefresh(void)
 		{
 			S_StartSound(NULL, sfx_s26d);
 			if (refreshdirmenu & REFRESHDIR_MAX)
-				message = va("%c%s\x80\nMaximum number of addons reached.\nA file could not be loaded.\nIf you wish to play with this addon, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
+			{
+				if (refreshdirname)
+					message = va("%c%s\x80\nMaximum number of addons reached.\nA file could not be loaded.\nIf you wish to play with this addon, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
+				else
+					message = va("%c\x80 Maximum number of addons reached.\nA file could not be loaded.\nIf you wish to play with this addon, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)));
+			}
 			else
-				message = va("%c%s\x80\nA file was not loaded.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
+			{
+				if (refreshdirname)
+					message = va("%c%s\x80\nA file was not loaded.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
+				else
+					message = va("%c\x80 A file was not loaded.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)));
+			}
 		}
-		else if ((refreshdirmenu & (REFRESHDIR_WARNING | REFRESHDIR_ERROR)) && !errorshitspam)
+		else if (refreshdirmenu & (REFRESHDIR_WARNING | REFRESHDIR_ERROR))
 		{
 			S_StartSound(NULL, sfx_s224);
-			message = va("%c%s\x80\nA file was loaded with %s.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname, ((refreshdirmenu & REFRESHDIR_ERROR) ? "errors" : "warnings"));
-			errorshitspam = 1; // you already said that shit
+			if (refreshdirname)
+				message = va("%c%s\x80\nA file was loaded with %s.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname, ((refreshdirmenu & REFRESHDIR_ERROR) ? "errors" : "warnings"));
+			else
+				message = va("%c\x80 A file was loaded with %s.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), ((refreshdirmenu & REFRESHDIR_ERROR) ? "errors" : "warnings"));
 		}
 		else if (majormods && !prevmajormods)
 		{
 			S_StartSound(NULL, sfx_s221);
-			message = va("%c%s\x80\nYou've loaded a gameplay-modifying addon.\n\nRecord Attack has been disabled, but you\ncan still play alone in local Multiplayer.\n\nIf you wish to play Record Attack mode, restart the game to disable loaded addons.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
+			if (refreshdirname)
+				message = va("%c%s\x80\nYou've loaded a gameplay-modifying addon.\n\nRecord Attack data will be saved to a seperate save file.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
+			else
+				message = va("%c\x80 You've loaded a gameplay-modifying addon.\n\nRecord Attack data will be saved to a seperate save file.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)));
 			prevmajormods = majormods;
 		}
 
 		if (message)
 		{
-			M_StartMessage(message,M_AddonsClearName,MM_EVENTHANDLER);
+			M_StartMessage(message, M_AddonsClearName, MM_EVENTHANDLER);
 			return true;
 		}
 
@@ -6242,6 +5431,8 @@ static boolean M_AddonsRefresh(void)
 	return false;
 }
 
+static tic_t addons_scrolltic = 0; // maybe not the best place but e
+
 static void M_DrawAddons(void)
 {
 	INT32 x, y;
@@ -6249,6 +5440,8 @@ static void M_DrawAddons(void)
 	const UINT8 *flashcol = NULL;
 	UINT8 hilicol;
 
+	if (renderisnewtic) addons_scrolltic++;
+
 	// hack - need to refresh at end of frame to handle addfile...
 	if (refreshdirmenu & M_AddonsRefresh())
 	{
@@ -6332,6 +5525,9 @@ static void M_DrawAddons(void)
 	for (; i < m; i++)
 	{
 		UINT32 flags = V_ALLOWLOWERCASE;
+#define MAXADDONNAME 31
+		char scrollbuf[MAXADDONNAME+1] = {0};
+
 		if (y > BASEVIDHEIGHT) break;
 		if (dirmenu[i])
 #define type (UINT8)(dirmenu[i][DIR_TYPE])
@@ -6352,11 +5548,22 @@ static void M_DrawAddons(void)
 			}
 
 #define charsonside 14
-			if (dirmenu[i][DIR_LEN] > (charsonside*2 + 3))
-				V_DrawString(x, y+4, flags, va("%.*s...%s", charsonside, dirmenu[i]+DIR_STRING, dirmenu[i]+DIR_STRING+dirmenu[i][DIR_LEN]-(charsonside+1)));
+			if (dirmenu[i][DIR_LEN] > MAXADDONNAME)
+			{
+				if ((size_t)i == dir_on[menudepthleft])
+				{
+					M_ScrollString(dirmenu[i]+DIR_STRING, dirmenu[i][DIR_LEN]-1, scrollbuf, MAXADDONNAME, addons_scrolltic);
+				}
+				else
+					strncpy(scrollbuf, va("%.*s...%s", charsonside, dirmenu[i]+DIR_STRING, dirmenu[i]+DIR_STRING+dirmenu[i][DIR_LEN]-(charsonside+1)), MAXADDONNAME);
+
+				V_DrawString(x, y+4, flags, scrollbuf);
+			}
 #undef charsonside
 			else
 				V_DrawString(x, y+4, flags, dirmenu[i]+DIR_STRING);
+
+#undef MAXADDONNAME
 		}
 #undef type
 		y += 16;
@@ -6368,22 +5575,22 @@ static void M_DrawAddons(void)
 	y = BASEVIDHEIGHT - currentMenu->y + 1;
 
 	M_DrawTextBox(x - (21 + 5), y, MAXSTRINGLENGTH, 1);
-	if (menusearch[0])
-		V_DrawString(x - 18, y + 8, V_ALLOWLOWERCASE, menusearch+1);
+
+	if (menusearch.length)
+		M_DrawTextInput(x - 18, y + 8, &menusearch, 0);
 	else
 		V_DrawString(x - 18, y + 8, V_ALLOWLOWERCASE|V_TRANSLUCENT, "Type to search...");
-	if (skullAnimCounter < 4)
-		V_DrawCharacter(x - 18 + V_StringWidth(menusearch+1, 0), y + 8,
-			'_' | 0x80, false);
 
 	x -= (21 + 5 + 16);
-	V_DrawSmallScaledPatch(x, y + 4, (menusearch[0] ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+3]);
+	V_DrawSmallScaledPatch(x, y + 4, (menusearch.length ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+3]);
 
 	x = BASEVIDWIDTH - x - 16;
 	V_DrawSmallScaledPatch(x, y + 4, ((!majormods) ? 0 : V_TRANSLUCENT), addonsp[NUM_EXT+4]);
 
 	if (modifiedgame)
 		V_DrawSmallScaledPatch(x, y + 4, 0, addonsp[NUM_EXT+2]);
+
+	V_DrawThinString(0, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("END Key - Add addon to autoload"));
 }
 
 static void M_AddonExec(INT32 ch)
@@ -6405,12 +5612,12 @@ static void M_AddonAutoLoad(INT32 ch)
 	FILE *autoloadconfigfile;
 
 	// check our controls //
-	if (ch != 'y' && ch != KEY_ENTER && ch != KEY_RSHIFT)
+	if (ch != 'y' && ch != KEY_ENTER && ch != KEY_END)
 	{
 		S_StartSound(NULL, sfx_s26d);
 		return;
 	}
-	
+
 	// first, find the file //
 	path = va("%s"PATHSEP"%s", srb2home, AUTOLOADCONFIGFILENAME);
 	autoloadconfigfile = fopen(path, "a");
@@ -6425,7 +5632,7 @@ static void M_AddonAutoLoad(INT32 ch)
 		case EXT_CFG:
 			CONS_Printf("Added the \x82%s\x80 console script to the autoload configuration list.\n", dirmenu[dir_on[menudepthleft]]+DIR_STRING);
 			fprintf(autoloadconfigfile, "%s\n", dirmenu[dir_on[menudepthleft]]+DIR_STRING);
-				
+
 			S_StartSound(NULL, sfx_s221);
 			break;
 		case EXT_LUA:
@@ -6438,7 +5645,7 @@ static void M_AddonAutoLoad(INT32 ch)
 			{
 				CONS_Printf("Added \x82%s\x80 to the autoload configuration list.\n", dirmenu[dir_on[menudepthleft]]+DIR_STRING);
 				fprintf(autoloadconfigfile, "%s\n", dirmenu[dir_on[menudepthleft]]+DIR_STRING);
-				
+
 				S_StartSound(NULL, sfx_s221);
 			}
 			else
@@ -6448,48 +5655,11 @@ static void M_AddonAutoLoad(INT32 ch)
 			}
 			break;
 	}
-	
+
 	// lastly, do some last things and close the autoload config file //
 	fclose(autoloadconfigfile);
 }
 
-#define len menusearch[0]
-static boolean M_ChangeStringAddons(INT32 choice)
-{
-	choice = M_ShiftChar(choice);
-
-	switch (choice)
-	{
-		case KEY_DEL:
-			if (len)
-			{
-				len = menusearch[1] = 0;
-				return true;
-			}
-			break;
-		case KEY_BACKSPACE:
-			if (len)
-			{
-				menusearch[1+--len] = 0;
-				return true;
-			}
-			break;
-		default:
-			if (choice >= 32 && choice <= 127)
-			{
-				if (len < MAXSTRINGLENGTH - 1)
-				{
-					menusearch[1+len++] = (char)choice;
-					menusearch[1+len] = 0;
-					return true;
-				}
-			}
-			break;
-	}
-	return false;
-}
-#undef len
-
 // i hate myself
 static boolean DumbStartsWith(const char *pre, const char *str)
 {
@@ -6502,8 +5672,10 @@ static void M_HandleAddons(INT32 choice)
 {
 	boolean exitmenu = false; // exit to previous menu
 
-	if (M_ChangeStringAddons(choice))
+	if (M_TextInputHandle(&menusearch, choice))
 	{
+		S_StartSound(NULL,sfx_menu1);
+
 		char *tempname = NULL;
 		if (dirmenu && dirmenu[dir_on[menudepthleft]])
 			tempname = Z_StrDup(dirmenu[dir_on[menudepthleft]]+DIR_STRING); // don't need to I_Error if can't make - not important, just QoL
@@ -6516,11 +5688,13 @@ static void M_HandleAddons(INT32 choice)
 		case KEY_DOWNARROW:
 			if (dir_on[menudepthleft] < sizedirmenu-1)
 				dir_on[menudepthleft]++;
+			addons_scrolltic = 0;
 			S_StartSound(NULL, sfx_menu1);
 			break;
 		case KEY_UPARROW:
 			if (dir_on[menudepthleft])
 				dir_on[menudepthleft]--;
+			addons_scrolltic = 0;
 			S_StartSound(NULL, sfx_menu1);
 			break;
 		case KEY_PGDN:
@@ -6529,6 +5703,7 @@ static void M_HandleAddons(INT32 choice)
 				for (i = numaddonsshown; i && (dir_on[menudepthleft] < sizedirmenu-1); i--)
 					dir_on[menudepthleft]++;
 			}
+			addons_scrolltic = 0;
 			S_StartSound(NULL, sfx_menu1);
 			break;
 		case KEY_PGUP:
@@ -6537,6 +5712,7 @@ static void M_HandleAddons(INT32 choice)
 				for (i = numaddonsshown; i && (dir_on[menudepthleft]); i--)
 					dir_on[menudepthleft]--;
 			}
+			addons_scrolltic = 0;
 			S_StartSound(NULL, sfx_menu1);
 			break;
 		case KEY_ENTER:
@@ -6604,11 +5780,11 @@ static void M_HandleAddons(INT32 choice)
 						case EXT_KART:
 #endif
 						case EXT_PK3:
-							if (browselocalskins) {
-							if (DumbStartsWith("KC_", dirmenu[dir_on[menudepthleft]]+DIR_STRING) || DumbStartsWith("kc_", dirmenu[dir_on[menudepthleft]]+DIR_STRING)) {
+							if (browselocalskins)
+							{
+								if (DumbStartsWith("KC_", dirmenu[dir_on[menudepthleft]]+DIR_STRING) || DumbStartsWith("kc_", dirmenu[dir_on[menudepthleft]]+DIR_STRING)) {
 									M_StartMessage(va("%c%s\x80\nYou are loading a local skin.\nLocal skins will not be usable\nafter going back from\nthe title screen.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
-									COM_BufAddText(va("addskins \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
-									errorshitspam = 0; // reset it so it can show the warning screen again lmao
+									COM_BufAddText(va("addfilelocal \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
 								}
 								else
 									S_StartSound(NULL, sfx_s26d);
@@ -6616,7 +5792,6 @@ static void M_HandleAddons(INT32 choice)
 							else
 							{
 								COM_BufAddText(va("addfile \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
-								errorshitspam = 0; // reset it so it can show the warning screen again lmao
 							}
 							break;
 						default:
@@ -6628,7 +5803,7 @@ static void M_HandleAddons(INT32 choice)
 			}
 			break;
 
-		case KEY_RSHIFT:
+		case KEY_END:
 			{
 				boolean refresh = true;
 				if (!dirmenu[dir_on[menudepthleft]])
@@ -6651,7 +5826,7 @@ static void M_HandleAddons(INT32 choice)
 								|| (strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, AUTOLOADCONFIGFILENAME) == 0)
 								|| (strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartserv.cfg") == 0)
 								|| (strcmp(dirmenu[dir_on[menudepthleft]]+DIR_STRING, "kartexec.cfg") == 0))
-							{	
+							{
 								M_StartMessage(va("%c%s\x80\nYou can't autoload this builds' base console scripts, silly!\n They're already autoloaded on startup! \n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
 								S_StartSound(NULL, sfx_s26d);
 							}
@@ -6677,6 +5852,7 @@ static void M_HandleAddons(INT32 choice)
 
 		case KEY_ESCAPE:
 			exitmenu = true;
+			addons_scrolltic = 0;
 			break;
 
 		default:
@@ -6697,42 +5873,232 @@ static void M_HandleAddons(INT32 choice)
 }
 
 // ---- REPLAY HUT -----
-menudemo_t *demolist;
+menudemo_t *demolist; // Replays that that have been checked to match with query
+
+// Locked behind Lock_search_state
+menudemo_t *demolist_all; // All replays
+boolean replaynamesloaded = false;
+
+#ifdef HAVE_THREADS
+I_mutex replayquerymutex;
+
+// g_in_exiting_signal_handler is an evil hack
+// to avoid infinite SIGABRT recursion in the signal handler
+// due to poisoned locks or mach-o kernel not supporting locks in signals
+// or something like that. idk
+#  define Lock_search_state()    if (!g_in_exiting_signal_handler) { I_lock_mutex(&replayquerymutex); }
+#  define Unlock_search_state()  if (!g_in_exiting_signal_handler) { I_unlock_mutex(replayquerymutex); }
+#else/*HAVE_THREADS*/
+#  define Lock_search_state()
+#  define Unlock_search_state()
+#endif/*HAVE_THREADS*/
+
+
+#define MAXREPLAYQUERY 40
+static char replayqueryinput_buffer[MAXREPLAYQUERY+1]; // The input typed
+static textinput_t replayqueryinput;
+
+static size_t replayqueryfound = 0; // Number of checked replay entries
+static size_t replayquerycheck = 0; // Index of next replay entry to check in demolist_all
 
 #define DF_ENCORE       0x40
 static INT16 replayScrollTitle = 0;
 static SINT8 replayScrollDelay = TICRATE, replayScrollDir = 1;
 
-static void PrepReplayList(void)
+static void ReplayNamesLoadThread(void* userdata)
+{
+	Lock_search_state();
+
+	size_t demolist_all_size = sizedirmenu;
+	menudemo_t *demolist_all_local = (menudemo_t*)malloc(sizeof(menudemo_t)*sizedirmenu);
+	memcpy(demolist_all_local, demolist_all, sizeof(menudemo_t)*sizedirmenu);
+	char *replaydirpath = (char*)userdata;
+
+	Unlock_search_state();
+
+	for (size_t i = 0; i < demolist_all_size; ++i)
+	{
+		if (demolist_all_local[i].type != MD_SUBDIR)
+		{
+			G_LoadDemoTitle(&demolist_all_local[i]);
+
+			// this is fucking horrid, but i wanna be able to search for dates
+			/*if (demolist_all_local[i].date[0] != '\0')
+			{
+				snprintf(demolist_all_local[i].title, sizeof(demolist_all_local[i].title), "%s %s", demolist_all_local[i].title, demolist_all_local[i].date);
+			}*/
+		}
+	}
+
+	Lock_search_state();
+
+	if (strcmp(menupath, replaydirpath) == 0)
+	{
+		memcpy(demolist_all, demolist_all_local, sizeof(menudemo_t)*sizedirmenu);
+		replaynamesloaded = true;
+	}
+
+	Unlock_search_state();
+
+	// Was allocated before thread start, we need to free it
+	free(replaydirpath);
+	free(demolist_all_local);
+}
+
+static void LoadReplayNames(void)
+{
+	char *replaydirpath = strdup(menupath);
+
+	Lock_search_state();
+	replaynamesloaded = false;
+	Unlock_search_state();
+
+#ifdef HAVE_THREADS
+	I_spawn_thread("replay-names-load", ReplayNamesLoadThread, replaydirpath);
+#else
+	ReplayNamesLoadThread(replaydirpath);
+#endif
+}
+
+static void ResetReplayQuery(void)
+{
+	memset(replayqueryinput_buffer, 0, MAXREPLAYQUERY);
+	M_TextInputInit(&replayqueryinput, replayqueryinput_buffer, MAXREPLAYQUERY);
+
+	replayqueryfound = 0;
+	replayquerycheck = 0;
+}
+
+static void AddCheckedReplay(void)
+{
+	memcpy(&demolist[replayqueryfound], &demolist_all[replayquerycheck], sizeof(menudemo_t));
+	++replayqueryfound;
+	++replayquerycheck;
+}
+
+// Check up to maxnum replays if they match with query
+static void M_HutCheckReplays(size_t maxnum)
+{
+	if (!replaynamesloaded)
+		return;
+
+	// Already checked everything
+	if (replayquerycheck == sizedirmenu)
+		return;
+
+	// If we don't have any query, just copy all demos and consider them checked
+	if (replayqueryinput.length == 0)
+	{
+		// Mark as done
+		replayqueryfound = replayquerycheck = sizedirmenu;
+
+		memcpy(demolist, demolist_all, sizeof(menudemo_t) * sizedirmenu);
+
+		return;
+	}
+
+	while (maxnum-- && replayquerycheck < sizedirmenu)
+	{
+		switch (demolist_all[replayquerycheck].type)
+		{
+			case MD_SUBDIR:
+				AddCheckedReplay(); // Just add subdirs
+				// Will also be decremented on next iteration. Basically, we just don't want to
+				// spend our number of tries on subdirs, since we don't check anything for them
+				++maxnum;
+				break;
+
+			case MD_NOTLOADED:
+			case MD_OUTDATED:
+			case MD_LOADED:
+				if (demolist_all[replayquerycheck].title[0] && strcasestr(demolist_all[replayquerycheck].title, replayqueryinput.buffer) != NULL)
+					AddCheckedReplay(); // It matches, add it!
+				else
+					replayquerycheck++; // Doesn't match, moving on...
+
+				break;
+
+			// Don't show invalid replays
+			case MD_INVALID:
+				replayquerycheck++;
+		}
+	}
+}
+
+static int ReplayListSortComparator(const void *entry1, const void *entry2)
+{
+	const menudemo_t *demo1 = (const menudemo_t*)entry1;
+	const menudemo_t *demo2 = (const menudemo_t*)entry2;
+
+	char filepath1[sizeof(demo1->filepath)];
+	char filepath2[sizeof(demo2->filepath)];
+
+	// First check for directories, they always should be at the top
+	if (demo1->type == MD_SUBDIR && demo2->type != MD_SUBDIR)
+		return -1;
+	else if (demo2->type == MD_SUBDIR && demo1->type != MD_SUBDIR)
+		return 1;
+	else if (demo1->type == MD_SUBDIR && demo2->type == MD_SUBDIR)
+		return 0;
+
+	memcpy(filepath1, demo1->filepath, sizeof(filepath1));
+	memcpy(filepath2, demo2->filepath, sizeof(filepath2));
+
+	nameonly(filepath1);
+	nameonly(filepath2);
+
+	// Comparing in opposite order to move new replays to the top
+	return strncmp(filepath2, filepath1, sizeof(filepath1));
+}
+
+static void PrepReplayList(boolean reset)
 {
 	size_t i;
 
+	replayquerycheck = replayqueryfound = 0;
+
 	if (demolist)
 		Z_Free(demolist);
 
 	demolist = Z_Calloc(sizeof(menudemo_t) * sizedirmenu, PU_STATIC, NULL);
 
+	// If directory didn't change, keep demolist_all
+	if (!reset) return;
+
+	Lock_search_state();
+
+	if (demolist_all)
+		Z_Free(demolist_all);
+
+	demolist_all = Z_Calloc(sizeof(menudemo_t) * sizedirmenu, PU_STATIC, NULL);
+
 	for (i = 0; i < sizedirmenu; i++)
 	{
 		if (dirmenu[i][DIR_TYPE] == EXT_UP)
 		{
-			demolist[i].type = MD_SUBDIR;
-			sprintf(demolist[i].title, "UP");
+			demolist_all[i].type = MD_SUBDIR;
+			sprintf(demolist_all[i].title, "UP");
 		}
 		else if (dirmenu[i][DIR_TYPE] == EXT_FOLDER)
 		{
-			demolist[i].type = MD_SUBDIR;
-			strncpy(demolist[i].title, dirmenu[i] + DIR_STRING, 64);
+			demolist_all[i].type = MD_SUBDIR;
+			strncpy(demolist_all[i].title, dirmenu[i] + DIR_STRING, 64);
 		}
 		else
 		{
-			demolist[i].type = MD_NOTLOADED;
+			demolist_all[i].type = MD_NOTLOADED;
 			// FIXME - do something with buffer sizes. menupath is 1024 chars but filepath is only
 			// 256. I'm not really sure what to do here but don't want to leave warnings...
-			snprintf(demolist[i].filepath, 255, "%.254s%s", menupath, dirmenu[i] + DIR_STRING);
-			sprintf(demolist[i].title, ".....");
+			snprintf(demolist_all[i].filepath, 255, "%.254s%s", menupath, dirmenu[i] + DIR_STRING);
+			sprintf(demolist_all[i].title, ".....");
 		}
 	}
+
+	qs22j(demolist_all, sizedirmenu, sizeof(menudemo_t), ReplayListSortComparator);
+
+	Unlock_search_state();
+
+	LoadReplayNames();
 }
 
 void M_ReplayHut(INT32 choice)
@@ -6743,7 +6109,9 @@ void M_ReplayHut(INT32 choice)
 	{
 		snprintf(menupath, 1024, "%s"PATHSEP"replay"PATHSEP"online"PATHSEP, srb2home);
 		menupathindex[(menudepthleft = menudepth-1)] = strlen(menupath);
+		ResetReplayQuery();
 	}
+
 	if (!preparefilemenu(false, true))
 	{
 		M_StartMessage("No replays found.\n\n(Press a key)\n", NULL, MM_NOTHING);
@@ -6755,7 +6123,7 @@ void M_ReplayHut(INT32 choice)
 
 	replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1;
 
-	PrepReplayList();
+	PrepReplayList(true);
 
 	menuactive = true;
 	M_SetupNextMenu(&MISC_ReplayHutDef);
@@ -6767,13 +6135,48 @@ void M_ReplayHut(INT32 choice)
 	S_ChangeMusicInternal("replst", true);
 }
 
+static boolean M_HandleReplayHutQuery(INT32 choice)
+{
+	// Yea gonna copy buffer and check if it changed, thats better than checking for specific keys i think
+	char tmp[MAXREPLAYQUERY+1];
+	memcpy(tmp, replayqueryinput_buffer, MAXREPLAYQUERY+1);
+
+	if (M_TextInputHandle(&replayqueryinput, choice))
+	{
+		S_StartSound(NULL,sfx_menu1);
+
+		// Restart search only if we actually modified input and not just moved in it
+		if (memcmp(tmp, replayqueryinput_buffer, MAXREPLAYQUERY+1))
+		{
+			preparefilemenu(false, true);
+			dir_on[menudepthleft] = 0;
+			PrepReplayList(false);
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
 static void M_HandleReplayHutList(INT32 choice)
 {
+	if (M_HandleReplayHutQuery(choice))
+		return;
+
+	size_t scrollamt = 1;
+
 	switch (choice)
 	{
+	case KEY_PGUP:
+		scrollamt = 8;
+		/* FALLTHRU */
 	case KEY_UPARROW:
+		if (!replaynamesloaded)
+			return;
+
 		if (dir_on[menudepthleft])
-			dir_on[menudepthleft]--;
+			dir_on[menudepthleft] -= min(dir_on[menudepthleft], scrollamt);
 		else
 			return;
 			//M_PrevOpt();
@@ -6782,9 +6185,15 @@ static void M_HandleReplayHutList(INT32 choice)
 		replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1;
 		break;
 
+	case KEY_PGDN:
+		scrollamt = 8;
+		/* FALLTHRU */
 	case KEY_DOWNARROW:
-		if (dir_on[menudepthleft] < sizedirmenu-1)
-			dir_on[menudepthleft]++;
+		if (!replaynamesloaded)
+			return;
+
+		if (dir_on[menudepthleft] < replayqueryfound-1)
+			dir_on[menudepthleft] = min(replayqueryfound-1, dir_on[menudepthleft] + scrollamt);
 		else
 			return;
 			//itemOn = 0; // Not M_NextOpt because that would take us to the extra dummy item
@@ -6798,6 +6207,9 @@ static void M_HandleReplayHutList(INT32 choice)
 		break;
 
 	case KEY_ENTER:
+		if (!replaynamesloaded)
+			return;
+
 		switch (dirmenu[dir_on[menudepthleft]][DIR_TYPE])
 		{
 			case EXT_FOLDER:
@@ -6823,7 +6235,8 @@ static void M_HandleReplayHutList(INT32 choice)
 					{
 						S_StartSound(NULL, sfx_menu1);
 						dir_on[menudepthleft] = 1;
-						PrepReplayList();
+						ResetReplayQuery();
+						PrepReplayList(true);
 					}
 				}
 				else
@@ -6841,7 +6254,7 @@ static void M_HandleReplayHutList(INT32 choice)
 					M_QuitReplayHut();
 					return;
 				}
-				PrepReplayList();
+				PrepReplayList(true);
 				break;
 			default:
 				// We can't just use M_SetupNextMenu because that'll run ReplayDef's quitroutine and boot us back to the title screen!
@@ -6900,19 +6313,19 @@ static void DrawReplayHutReplayInfo(void)
 	switch (demolist[dir_on[menudepthleft]].type)
 	{
 	case MD_NOTLOADED:
-		V_DrawCenteredString(160, 40, V_SNAPTOTOP, "Loading replay information...");
+		V_DrawCenteredString(160, 40, V_SNAPTOTOP|MENUCAPS, "Loading replay information...");
 		break;
 
 	case MD_INVALID:
-		V_DrawCenteredString(160, 40, V_SNAPTOTOP|warningflags, "This replay cannot be played.");
+		V_DrawCenteredString(160, 40, V_SNAPTOTOP|warningflags|MENUCAPS, "This replay cannot be played.");
 		break;
 
 	case MD_SUBDIR:
 		break; // Can't think of anything to draw here right now
 
 	case MD_OUTDATED:
-		V_DrawThinString(17, 64, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT|highlightflags, "Recorded on an outdated version.");
-		/*fallthru*/
+		V_DrawThinString(17, 64, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT|highlightflags, va("Recorded on an outdated version. %s", demolist[dir_on[menudepthleft]].version));
+		/* FALLTHRU */
 	default:
 		// Draw level stuff
 		x = 15; y = 15;
@@ -6921,22 +6334,22 @@ static void DrawReplayHutReplayInfo(void)
 		//CONS_Printf("%d %s\n", demolist[dir_on[menudepthleft]].map, G_BuildMapName(demolist[dir_on[menudepthleft]].map));
 		lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(demolist[dir_on[menudepthleft]].map)));
 		if (lumpnum != LUMPERROR)
-			patch = W_CachePatchNum(lumpnum, PU_CACHE);
+			patch = W_CachePatchNum(lumpnum, PU_PATCH);
 		else
-			patch = W_CachePatchName("M_NOLVL", PU_CACHE);
+			patch = W_CachePatchName("M_NOLVL", PU_PATCH);
 
 		if (!(demolist[dir_on[menudepthleft]].kartspeed & DF_ENCORE))
 			V_DrawSmallScaledPatch(x, y, V_SNAPTOTOP, patch);
 		else
 		{
-			w = SHORT(patch->width);
-			h = SHORT(patch->height);
+			w = patch->width;
+			h = patch->height;
 			V_DrawSmallScaledPatch(x+(w>>1), y, V_SNAPTOTOP|V_FLIP, patch);
 
 			{
 				static angle_t rubyfloattime = 0;
 				const fixed_t rubyheight = FINESINE(rubyfloattime>>ANGLETOFINESHIFT);
-				V_DrawFixedPatch((x+(w>>2))<<FRACBITS, ((y+(h>>2))<<FRACBITS) - (rubyheight<<1), FRACUNIT, V_SNAPTOTOP, W_CachePatchName("RUBYICON", PU_CACHE), NULL);
+				V_DrawFixedPatch((x+(w>>2))<<FRACBITS, ((y+(h>>2))<<FRACBITS) - (rubyheight<<1), FRACUNIT, V_SNAPTOTOP, W_CachePatchName("RUBYICON", PU_PATCH), NULL);
 				rubyfloattime += FixedMul(ANGLE_MAX/NEWTICRATE, renderdeltatics);
 			}
 		}
@@ -6946,14 +6359,25 @@ static void DrawReplayHutReplayInfo(void)
 		if (mapheaderinfo[demolist[dir_on[menudepthleft]].map-1])
 		{
 			char *title = G_BuildMapTitle(demolist[dir_on[menudepthleft]].map);
-			V_DrawString(x, y, V_SNAPTOTOP, title);
-			Z_Free(title);
+			if (title)
+			{
+				V_DrawString(x, y, V_SNAPTOTOP|MENUCAPS, title);
+				Z_Free(title);
+			}
 		}
 		else
 			V_DrawString(x, y, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "Level is not loaded.");
 
+		INT32 datew = 0;
+
+		if (demolist[dir_on[menudepthleft]].date[0] != '\0')
+		{
+			datew = V_StringWidth(demolist[dir_on[menudepthleft]].date, 0);
+			V_DrawThinString(x, y+9, V_SNAPTOTOP|V_ALLOWLOWERCASE, va("%s", demolist[dir_on[menudepthleft]].date));
+		}
+
 		if (demolist[dir_on[menudepthleft]].numlaps)
-			V_DrawThinString(x, y+9, V_SNAPTOTOP|V_ALLOWLOWERCASE, va("(%d laps)", demolist[dir_on[menudepthleft]].numlaps));
+			V_DrawThinString(x+datew, y+9, V_SNAPTOTOP|V_ALLOWLOWERCASE, va("(%d laps)", demolist[dir_on[menudepthleft]].numlaps));
 
 		V_DrawString(x, y+20, V_SNAPTOTOP|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].gametype == GT_RACE ?
 			va("Race (%s speed)", kartspeed_cons_t[demolist[dir_on[menudepthleft]].kartspeed & ~DF_ENCORE].strvalue) :
@@ -6963,26 +6387,24 @@ static void DrawReplayHutReplayInfo(void)
 		{
 			// No standings were loaded!
 			V_DrawString(x, y+39, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "No standings available.");
-
-
 			break;
 		}
 
-		V_DrawThinString(x, y+29, V_SNAPTOTOP|highlightflags, "WINNER");
+		V_DrawThinString(x, y+29, V_SNAPTOTOP|highlightflags|MENUCAPS, "Winner");
 		V_DrawString(x+38, y+30, V_SNAPTOTOP|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].standings[0].name);
 
 		if (demolist[dir_on[menudepthleft]].gametype == GT_RACE)
 		{
-			V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags, "TIME");
+			V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags|MENUCAPS, "Time");
 		}
 		else
 		{
-			V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags, "SCORE");
+			V_DrawThinString(x, y+39, V_SNAPTOTOP|highlightflags|MENUCAPS, "Score");
 		}
 
 		if (demolist[dir_on[menudepthleft]].standings[0].timeorscore == (UINT32_MAX-1))
 		{
-			V_DrawThinString(x+32, y+40-1, V_SNAPTOTOP, "NO CONTEST");
+			V_DrawThinString(x+32, y+40-1, V_SNAPTOTOP|MENUCAPS, "No Contest");
 		}
 		else if (demolist[dir_on[menudepthleft]].gametype == GT_RACE)
 		{
@@ -7008,14 +6430,14 @@ static void DrawReplayHutReplayInfo(void)
 		}
 		else
 		{
-			patch = W_CachePatchName("M_NOWANT", PU_CACHE);
+			patch = W_CachePatchName("M_NOWANT", PU_PATCH);
 			colormap = R_GetTranslationColormap(
 				TC_RAINBOW,
 				demolist[dir_on[menudepthleft]].standings[0].color,
 				GTC_MENUCACHE);
 		}
 
-		V_DrawMappedPatch(BASEVIDWIDTH-15 - SHORT(patch->width), y+20, V_SNAPTOTOP, patch, colormap);
+		V_DrawMappedPatch(BASEVIDWIDTH-15 - patch->width, y+20, V_SNAPTOTOP, patch, colormap);
 
 		break;
 	}
@@ -7030,7 +6452,7 @@ static void M_DrawReplayHut(void)
 
 	static UINT16 replayhutmenuy = 0;
 
-	V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
+	V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_PATCH));
 
 	if (cv_vhseffect.value)
 		V_DrawVhsEffect(false);
@@ -7042,7 +6464,7 @@ static void M_DrawReplayHut(void)
 	if (itemOn > replaylistitem)
 	{
 		itemOn = replaylistitem;
-		dir_on[menudepthleft] = sizedirmenu-1;
+		dir_on[menudepthleft] = replayqueryfound-1;
 		replayScrollTitle = 0; replayScrollDelay = TICRATE; replayScrollDir = 1;
 	}
 	else if (itemOn < replaylistitem)
@@ -7056,7 +6478,7 @@ static void M_DrawReplayHut(void)
 		INT32 maxy;
 		// Scroll menu items if needed
 		cursory = y + currentMenu->menuitems[replaylistitem].alphaKey + dir_on[menudepthleft]*10;
-		maxy = y + currentMenu->menuitems[replaylistitem].alphaKey + sizedirmenu*10;
+		maxy = y + currentMenu->menuitems[replaylistitem].alphaKey + replayqueryfound*10;
 
 		if (cursory > maxy - 20)
 			cursory = maxy - 20;
@@ -7090,14 +6512,20 @@ static void M_DrawReplayHut(void)
 
 	y += currentMenu->menuitems[replaylistitem].alphaKey;
 
-	for (i = 0; i < (INT16)sizedirmenu; i++)
+	if (!replaynamesloaded)
+	{
+		const char *msg = "Loading replays, please wait...";
+		V_DrawCenteredString(160, 100, V_ALLOWLOWERCASE, msg);
+	}
+
+	for (i = 0; i < (INT16)replayqueryfound; i++)
 	{
 		INT32 localy = y+i*10;
 		INT32 localx = x;
 
 		if (localy < 65)
 			continue;
-		if (localy >= SCALEDVIEWHEIGHT)
+		if (localy >= SCALEDVIEWHEIGHT - 24)
 			break;
 
 		if (demolist[i].type == MD_NOTLOADED && !processed_one_this_frame)
@@ -7109,7 +6537,7 @@ static void M_DrawReplayHut(void)
 		if (demolist[i].type == MD_SUBDIR)
 		{
 			localx += 8;
-			V_DrawScaledPatch(x - 4, localy, V_SNAPTOTOP|V_SNAPTOLEFT, W_CachePatchName(dirmenu[i][DIR_TYPE] == EXT_UP ? "M_RBACK" : "M_RFLDR", PU_CACHE));
+			V_DrawScaledPatch(x - 4, localy, V_SNAPTOTOP|V_SNAPTOLEFT, W_CachePatchName(dirmenu[i][DIR_TYPE] == EXT_UP ? "M_RBACK" : "M_RFLDR", PU_PATCH));
 		}
 
 		if (itemOn == replaylistitem && i == (INT16)dir_on[menudepthleft])
@@ -7148,7 +6576,7 @@ static void M_DrawReplayHut(void)
 	}
 
 	// Draw scrollbar
-	y = sizedirmenu*10 + currentMenu->menuitems[replaylistitem].alphaKey + 30;
+	y = replayqueryfound*10 + currentMenu->menuitems[replaylistitem].alphaKey + 30;
 	if (y > SCALEDVIEWHEIGHT-80)
 	{
 		V_DrawFill(BASEVIDWIDTH-4, 75, 4, SCALEDVIEWHEIGHT-80, V_SNAPTOTOP|V_SNAPTORIGHT|239);
@@ -7157,7 +6585,7 @@ static void M_DrawReplayHut(void)
 
 	// Draw the cursor
 	V_DrawScaledPatch(currentMenu->x - 24, cursory, V_SNAPTOTOP|V_SNAPTOLEFT,
-		W_CachePatchName("M_CURSOR", PU_CACHE));
+		W_CachePatchName("M_CURSOR", PU_PATCH));
 	V_DrawString(currentMenu->x, cursory, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags, currentMenu->menuitems[itemOn].text);
 
 	// Now draw some replay info!
@@ -7167,11 +6595,24 @@ static void M_DrawReplayHut(void)
 	{
 		DrawReplayHutReplayInfo();
 	}
+
+	x -= 40;
+
+	// Draw search query
+	M_DrawTextBoxFlags(x, 200 - 22, MAXREPLAYQUERY, 1, V_SNAPTOBOTTOM);
+
+	if (replayqueryinput.length)
+		M_DrawTextInput(x + 8, 200 - 14, &replayqueryinput, V_SNAPTOBOTTOM);
+	else
+		V_DrawString(x + 8, 200 - 14, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, "\x86Type to search...");
+
+	if (replaynamesloaded && replayquerycheck < sizedirmenu)
+		V_DrawString(x + 8, 200 - 30, V_ALLOWLOWERCASE|V_SNAPTOBOTTOM, va("Searching %u/%u...", (unsigned)replayquerycheck, (unsigned)sizedirmenu));
 }
 
 static void M_DrawReplayStartMenu(void)
 {
-	const char *warning;
+	const char *warning = "";
 	UINT8 i;
 
 	M_DrawGenericBackgroundMenu();
@@ -7208,14 +6649,14 @@ static void M_DrawReplayStartMenu(void)
 		}
 		else
 		{
-			patch = W_CachePatchName("M_NORANK", PU_CACHE);
+			patch = W_CachePatchName("M_NORANK", PU_PATCH);
 			colormap = R_GetTranslationColormap(
 				TC_RAINBOW,
 				demolist[dir_on[menudepthleft]].standings[i].color,
 				GTC_MENUCACHE);
 		}
 
-		V_DrawMappedPatch(BASEVIDWIDTH-5 - SHORT(patch->width), STARTY + i*20, V_SNAPTOTOP, patch, colormap);
+		V_DrawMappedPatch(BASEVIDWIDTH-5 - patch->width, STARTY + i*20, V_SNAPTOTOP, patch, colormap);
 	}
 #undef STARTY
 
@@ -7274,7 +6715,8 @@ static void M_DrawReplayStartMenu(void)
 		return;
 	}
 
-	V_DrawSmallString(4, BASEVIDHEIGHT-14, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, warning);
+	if (warning)
+		V_DrawSmallString(4, BASEVIDHEIGHT-14, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, warning);
 }
 
 static boolean M_QuitReplayHut(void)
@@ -7360,10 +6802,6 @@ static void M_DrawPlaybackMenu(void)
 		currentMenu->x = BASEVIDWIDTH/2 - 88;
 	}
 
-	// wip
-	//M_DrawTextBox(currentMenu->x-68, currentMenu->y-7, 15, 15);
-	//M_DrawCenteredMenu();
-
 	for (i = 0; i < currentMenu->numitems; i++)
 	{
 		UINT8 *inactivemap = NULL;
@@ -7381,16 +6819,16 @@ static void M_DrawPlaybackMenu(void)
 					inactivemap = R_GetTranslationColormap(players[ply].skin, players[ply].skincolor, GTC_MENUCACHE);
 			}
 			else if (currentMenu->menuitems[i].patch && W_CheckNumForName(currentMenu->menuitems[i].patch) != LUMPERROR)
-				icon = W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE);
+				icon = W_CachePatchName(currentMenu->menuitems[i].patch, PU_PATCH);
 			else
-				icon = W_CachePatchName("PLAYRANK", PU_CACHE); // temp
+				icon = W_CachePatchName("PLAYRANK", PU_PATCH); // temp
 		}
 		else if (currentMenu->menuitems[i].status == IT_DISABLED)
 			continue;
 		else if (currentMenu->menuitems[i].patch && W_CheckNumForName(currentMenu->menuitems[i].patch) != LUMPERROR)
-			icon = W_CachePatchName(currentMenu->menuitems[i].patch, PU_CACHE);
+			icon = W_CachePatchName(currentMenu->menuitems[i].patch, PU_PATCH);
 		else
-			icon = W_CachePatchName("PLAYRANK", PU_CACHE); // temp
+			icon = W_CachePatchName("PLAYRANK", PU_PATCH); // temp
 
 		if ((i == playback_fastforward && cv_playbackspeed.value > 1) || (i == playback_rewind && demo.rewinding))
 			V_DrawMappedPatch(currentMenu->x + currentMenu->menuitems[i].alphaKey, currentMenu->y, transmap|V_SNAPTOTOP, icon, R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_JAWZ, GTC_MENUCACHE));
@@ -7454,7 +6892,10 @@ static void M_PlaybackRewind(INT32 choice)
 			S_PauseAudio();
 		}
 		else
-			demo.rewinding = paused = true;
+		{
+			demo.rewinding = true;
+			paused = true;
+		}
 	}
 	else if (lastconfirmtime + TICRATE/2 < I_GetTime())
 	{
@@ -7510,8 +6951,7 @@ static void M_PlaybackAdvance(INT32 choice)
 
 static void M_PlaybackSetViews(INT32 choice)
 {
-
-	if (demo.freecam)
+	if (camera[0].freecam || camera[1].freecam || camera[2].freecam || camera[3].freecam)
 		return;	// not here.
 
 	if (choice > 0)
@@ -7541,23 +6981,13 @@ static void M_PlaybackToggleFreecam(INT32 choice)
 	splitscreen = 0;
 	R_ExecuteSetViewSize();
 
-	P_InitCameraCmd();	// init camera controls
-	if (!demo.freecam)	// toggle on
+	UINT8 i;
+	for (i = 0; i <= splitscreen; ++i)
 	{
-		demo.freecam = true;
-		democam.cam = &camera[0];	// this is rather useful
-	}
-	else	// toggle off
-	{
-		demo.freecam = false;
-		// reset democam vars:
-		democam.cam = NULL;
-		democam.turnheld = false;
-		democam.keyboardlook = false;	// reset only these. localangle / aiming gets set before the cam does anything anyway
+		P_ToggleDemoCamera(i);
 	}
 }
 
-
 static void M_PlaybackQuit(INT32 choice)
 {
 	(void)choice;
@@ -7574,26 +7004,6 @@ static void M_PlaybackQuit(INT32 choice)
 		D_StartTitle();
 }
 
-static void M_PandorasBox(INT32 choice)
-{
-	(void)choice;
-	CV_StealthSetValue(&cv_dummyrings, max(players[consoleplayer].health - 1, 0));
-	CV_StealthSetValue(&cv_dummylives, players[consoleplayer].lives);
-	CV_StealthSetValue(&cv_dummycontinues, players[consoleplayer].continues);
-	M_SetupNextMenu(&SR_PandoraDef);
-}
-
-static boolean M_ExitPandorasBox(void)
-{
-	if (cv_dummyrings.value != max(players[consoleplayer].health - 1, 0))
-		COM_ImmedExecute(va("setrings %d", cv_dummyrings.value));
-	if (cv_dummylives.value != players[consoleplayer].lives)
-		COM_ImmedExecute(va("setlives %d", cv_dummylives.value));
-	if (cv_dummycontinues.value != players[consoleplayer].continues)
-		COM_ImmedExecute(va("setcontinues %d", cv_dummycontinues.value));
-	return true;
-}
-
 static void M_ChangeLevel(INT32 choice)
 {
 	char mapname[6];
@@ -7706,11 +7116,11 @@ static void M_Options(INT32 choice)
 	(void)choice;
 
 	// if the player is not admin or server, disable gameplay & server options
-	OP_MainMenu[4].status = OP_MainMenu[5].status = (Playing() && !(server || IsPlayerAdmin(consoleplayer))) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU);
+	OP_MainMenu[gameopt].status = OP_MainMenu[serveropt].status = (Playing() && !(server || IsPlayerAdmin(consoleplayer))) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU);
 
-	OP_MainMenu[9].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_CALL); // Play credits
-	
-	OP_MainMenu[12].status = (!cv_showlocalskinmenus.value) ? (IT_DISABLED) : (IT_CALL|IT_STRING);
+	OP_MainMenu[credits].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_CALL); // Play credits
+
+	OP_MainMenu[localskin].status = (!cv_showlocalskinmenus.value) ? (IT_DISABLED) : (IT_CALL|IT_STRING);
 
 #ifdef HAVE_DISCORDRPC
 	OP_DataOptionsMenu[4].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU); // Erase data
@@ -7718,8 +7128,7 @@ static void M_Options(INT32 choice)
 	OP_DataOptionsMenu[3].status = (Playing()) ? (IT_GRAYEDOUT) : (IT_STRING|IT_SUBMENU); // Erase data
 #endif
 
-	OP_GameOptionsMenu[3].status =
-		(M_SecretUnlocked(SECRET_ENCORE)) ? (IT_CVAR|IT_STRING) : IT_SECRET; // cv_kartencore
+	OP_GameOptionsMenu[op_game_encore].status = (M_SecretUnlocked(SECRET_ENCORE)) ? (IT_CVAR|IT_STRING) : IT_SECRET; // cv_kartencore
 
 	OP_MainDef.prevMenu = currentMenu;
 	M_SetupNextMenu(&OP_MainDef);
@@ -7838,69 +7247,6 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	++ccvarposition;
 }
 
-// ======
-// CHEATS
-// ======
-
-static void M_UltimateCheat(INT32 choice)
-{
-	(void)choice;
-	I_Quit();
-}
-
-static void M_GetAllEmeralds(INT32 choice)
-{
-	(void)choice;
-
-	emeralds = ((EMERALD7)*2)-1;
-	M_StartMessage(M_GetText("You now have all 7 emeralds.\nUse them wisely.\nWith great power comes great ring drain.\n"),NULL,MM_NOTHING);
-
-	G_SetGameModified(multiplayer, true);
-}
-
-static void M_DestroyRobotsResponse(INT32 ch)
-{
-	if (ch != 'y' && ch != KEY_ENTER)
-		return;
-
-	// Destroy all robots
-	P_DestroyRobots();
-
-	G_SetGameModified(multiplayer, true);
-}
-
-static void M_DestroyRobots(INT32 choice)
-{
-	(void)choice;
-
-	M_StartMessage(M_GetText("Do you want to destroy all\nrobots in the current level?\n\n(Press 'Y' to confirm)\n"),M_DestroyRobotsResponse,MM_YESNO);
-}
-
-/*static void M_LevelSelectWarp(INT32 choice)
-{
-	boolean fromloadgame = (currentMenu == &SP_LevelSelectDef);
-
-	(void)choice;
-
-	if (W_CheckNumForName(G_BuildMapName(cv_nextmap.value)) == LUMPERROR)
-	{
-//		CONS_Alert(CONS_WARNING, "Internal game map '%s' not found\n", G_BuildMapName(cv_nextmap.value));
-		return;
-	}
-
-	startmap = (INT16)(cv_nextmap.value);
-
-	fromlevelselect = true;
-
-	if (fromloadgame)
-		G_LoadGame((UINT32)cursaveslot, startmap);
-	else
-	{
-		cursaveslot = -1;
-		M_SetupChoosePlayer(0);
-	}
-}*/
-
 // ========
 // SKY ROOM
 // ========
@@ -7909,6 +7255,9 @@ UINT8 skyRoomMenuTranslations[MAXUNLOCKABLES];
 
 static char *M_GetConditionString(condition_t cond)
 {
+	char *title = NULL;
+	char *response = NULL;
+
 	switch(cond.type)
 	{
 		case UC_PLAYTIME:
@@ -7935,33 +7284,45 @@ static char *M_GetConditionString(condition_t cond)
 				G_TicsToSeconds(cond.requirement));
 		case UC_MAPVISITED:
 		{
-			char *title = G_BuildMapTitle(cond.requirement-1);
-			char *response = va("Visit %s", title);
-			Z_Free(title);
+			title = G_BuildMapTitle(cond.requirement-1);
+			if (title)
+			{
+				response = va("Visit %s", title);
+				Z_Free(title);
+			}
 			return response;
 		}
 		case UC_MAPBEATEN:
 		{
-			char *title = G_BuildMapTitle(cond.requirement-1);
-			char *response = va("Beat %s", title);
-			Z_Free(title);
+			title = G_BuildMapTitle(cond.requirement-1);
+			if (title)
+			{
+				response = va("Beat %s", title);
+				Z_Free(title);
+			}
 			return response;
 		}
 		case UC_MAPALLEMERALDS:
 		{
-			char *title = G_BuildMapTitle(cond.requirement-1);
-			char *response = va("Beat %s w/ all emeralds", title);
-			Z_Free(title);
+			title = G_BuildMapTitle(cond.requirement-1);
+			if (title)
+			{
+				response = va("Beat %s w/ all emeralds", title);
+				Z_Free(title);
+			}
 			return response;
 		}
 		case UC_MAPTIME:
 		{
-			char *title = G_BuildMapTitle(cond.extrainfo1-1);
-			char *response = va("Beat %s in %i:%02i.%02i", title,
-				G_TicsToMinutes(cond.requirement, true),
-				G_TicsToSeconds(cond.requirement),
-				G_TicsToCentiseconds(cond.requirement));
-			Z_Free(title);
+			title = G_BuildMapTitle(cond.extrainfo1-1);
+			if (title)
+			{
+				response = va("Beat %s in %i:%02i.%02i", title,
+					G_TicsToMinutes(cond.requirement, true),
+					G_TicsToSeconds(cond.requirement),
+					G_TicsToCentiseconds(cond.requirement));
+				Z_Free(title);
+			}
 			return response;
 		}
 		case UC_TOTALEMBLEMS:
@@ -7994,7 +7355,7 @@ static void M_DrawChecklist(void)
 		++line;
 		secretname = M_CreateSecretMenuOption(unlockables[i].name);
 
-		V_DrawString(8, (line*8), V_RETURN8|(unlockables[i].unlocked ? recommendedflags : warningflags), (secret ? secretname : unlockables[i].name));
+		V_DrawString(8, (line*8), V_RETURN8|MENUCAPS|(unlockables[i].unlocked ? recommendedflags : warningflags), (secret ? secretname : unlockables[i].name));
 
 		if (conditionSets[unlockables[i].conditionset - 1].numconditions)
 		{
@@ -8036,56 +7397,6 @@ static void M_DrawChecklist(void)
 }
 #undef NUMCHECKLIST
 
-#define NUMHINTS 5
-static void M_EmblemHints(INT32 choice)
-{
-	(void)choice;
-	SR_EmblemHintMenu[0].status = (M_SecretUnlocked(SECRET_ITEMFINDER)) ? (IT_CVAR|IT_STRING) : (IT_SECRET);
-	M_SetupNextMenu(&SR_EmblemHintDef);
-	itemOn = 1; // always start on back.
-}
-
-static void M_DrawEmblemHints(void)
-{
-	INT32 i, j = 0;
-	UINT32 collected = 0;
-	emblem_t *emblem;
-	const char *hint;
-
-	for (i = 0; i < numemblems; i++)
-	{
-		emblem = &emblemlocations[i];
-		if (emblem->level != gamemap || emblem->type > ET_SKIN)
-			continue;
-
-		if (emblem->collected)
-		{
-			collected = recommendedflags;
-			V_DrawMappedPatch(12, 12+(28*j), 0, W_CachePatchName(M_GetEmblemPatch(emblem), PU_CACHE),
-				R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(emblem), GTC_MENUCACHE));
-		}
-		else
-		{
-			collected = 0;
-			V_DrawScaledPatch(12, 12+(28*j), 0, W_CachePatchName("NEEDIT", PU_CACHE));
-		}
-
-		if (emblem->hint[0])
-			hint = emblem->hint;
-		else
-			hint = M_GetText("No hints available.");
-		hint = V_WordWrap(40, BASEVIDWIDTH-12, 0, hint);
-		V_DrawString(40, 8+(28*j), V_RETURN8|V_ALLOWLOWERCASE|collected, hint);
-
-		if (++j >= NUMHINTS)
-			break;
-	}
-	if (!j)
-		V_DrawCenteredString(160, 48, highlightflags, "No hidden medals on this map.");
-
-	M_DrawGenericMenu();
-}
-
 static void M_DrawSkyRoom(void)
 {
 	INT32 i, y = 0;
@@ -8198,59 +7509,11 @@ static musicdef_t *curplaying = NULL;
 static INT32 st_sel = 0;
 static tic_t st_musictime = 0;
 
-static void scrollMusicName(const char name[], size_t len, size_t maxlen, char result[])
-{
-	// How much should we scroll. Not sure why +1 is needed, but without it this function skips 2
-	// characters at once sometimes
-	const size_t amount = len - maxlen + 1;
-
-	// Note: anything above 17 will cause zero division
-	const size_t MAXSPEED = 6;
-	const size_t t = st_musictime / (35/min(amount, MAXSPEED));
-
-	const size_t state = (t / amount) % 4;
-
-	switch (state)
-	{
-		// Show beginning of the name
-		case 0:
-			memcpy(result, name, maxlen-1);
-		break;
-
-		// Scroll towards end of the name
-		case 1:
-		{
-			const size_t advance = t % amount;
-			memcpy(result, name+advance, maxlen-1);
-		}
-		break;
-
-		// Show end of the name
-		case 2:
-			memcpy(result, name+len+1-maxlen, maxlen-1);
-		break;
-
-		// Scroll towards start of the name
-		case 3:
-		{
-			const size_t advance = t % amount;
-			memcpy(result, name+len+1-maxlen-advance, maxlen-1);
-		}
-		break;
-	}
-
-	// Technically not necessary, since it gets set again after function call, but just in case
-	result[maxlen] = 0;
-}
-
-//static patch_t* st_radio[9];
-//static patch_t* st_launchpad[4];
-
 static void M_MusicTest(INT32 choice)
 {
 	(void)choice;
 
-	if (!S_PrepareSoundTest())
+	if (!nummusicdefs)
 	{
 		M_StartMessage(M_GetText("No selectable tracks found.\n"),NULL,MM_NOTHING);
 		return;
@@ -8311,14 +7574,14 @@ static void M_DrawMusicTest(void)
 
 		if (curplaying && curplaying->authors[0])
 			V_DrawRightAlignedThinString(BASEVIDWIDTH-16, 46, V_ALLOWLOWERCASE, curplaying->authors);
-		
+
 		if (curplaying)
 		{
 			if (!curplaying->usage[0])
 				V_DrawString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_ALLOWLOWERCASE, va("%.6s", curplaying->name));
 			else
 				V_DrawSmallString(vid.dupx, vid.height - 5*vid.dupy, V_NOSCALESTART|V_ALLOWLOWERCASE, va("%.6s - %.255s\n", curplaying->name, curplaying->usage));
-			
+
 			if (cv_showmusicfilename.value)
 				V_DrawSmallString(0, 0, V_SNAPTOTOP|V_SNAPTOLEFT|V_ALLOWLOWERCASE, curplaying->filename);
 		}
@@ -8329,33 +7592,33 @@ static void M_DrawMusicTest(void)
 	{
 		INT32 t, b, q, m = 128;
 
-		if (numsoundtestdefs <= 8)
+		if (nummusicdefs <= 8)
 		{
 			t = 0;
-			b = numsoundtestdefs - 1;
+			b = nummusicdefs - 1;
 			i = 0;
 		}
 		else
 		{
 			q = m;
-			m = (5*m)/numsoundtestdefs;
+			m = (5*m)/nummusicdefs;
 			if (st_sel < 3)
 			{
 				t = 0;
 				b = 7;
 				i = 0;
 			}
-			else if (st_sel >= numsoundtestdefs-4)
+			else if (st_sel >= nummusicdefs-4)
 			{
-				t = numsoundtestdefs - 8;
-				b = numsoundtestdefs - 1;
+				t = nummusicdefs - 8;
+				b = nummusicdefs - 1;
 				i = q-m;
 			}
 			else
 			{
 				t = st_sel - 3;
 				b = st_sel + 4;
-				i = (t * (q-m))/(numsoundtestdefs - 8);
+				i = (t * (q-m))/(nummusicdefs - 8);
 			}
 		}
 
@@ -8364,7 +7627,7 @@ static void M_DrawMusicTest(void)
 		if (t != 0)
 			V_DrawString(20+280+4, 60+4 - (skullAnimCounter/5), V_YELLOWMAP, "\x1A");
 
-		if (b != numsoundtestdefs - 1)
+		if (b != nummusicdefs - 1)
 			V_DrawString(20+280+4, 60+128-12 + (skullAnimCounter/5), V_YELLOWMAP, "\x1B");
 
 		x = 24;
@@ -8378,21 +7641,21 @@ static void M_DrawMusicTest(void)
 				V_DrawFill(20, y-4, 280-1, 16, 237);
 
 			{
+				const musicdef_t *def = S_GetMusicCredit(t);
 				const size_t MAXLENGTH = 34;
-				const char *songname = soundtestdefs[t]->title[0] ? soundtestdefs[t]->title : soundtestdefs[t]->source;
+				const char *songname = def->title[0] ? def->title : def->source;
 
 				size_t namelength = strlen(songname);
 
 				char buf[MAXLENGTH+1];
 
 				if (t == st_sel && namelength > MAXLENGTH)
-					scrollMusicName(songname, namelength, MAXLENGTH, buf);
+					M_ScrollString(songname, namelength, buf, MAXLENGTH, st_musictime);
 				else
-					strncpy(buf, songname, MAXLENGTH);
-				buf[MAXLENGTH] = 0;
+					strlcpy(buf, songname, MAXLENGTH);
 
 				V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf);
-				if (curplaying == soundtestdefs[t])
+				if (curplaying == def)
 				{
 					V_DrawFill(20+280-9, y-4, 8, 16, 230);
 				}
@@ -8410,7 +7673,7 @@ static void M_HandleMusicTest(INT32 choice)
 	switch (choice)
 	{
 		case KEY_DOWNARROW:
-			if (st_sel++ >= numsoundtestdefs-1)
+			if (st_sel++ >= nummusicdefs-1)
 				st_sel = 0;
 			{
 				S_StartSound(NULL, sfx_menu1);
@@ -8419,18 +7682,18 @@ static void M_HandleMusicTest(INT32 choice)
 			break;
 		case KEY_UPARROW:
 			if (!st_sel--)
-				st_sel = numsoundtestdefs-1;
+				st_sel = nummusicdefs-1;
 			{
 				S_StartSound(NULL, sfx_menu1);
 			}
 			st_musictime = 0;
 			break;
 		case KEY_PGDN:
-			if (st_sel < numsoundtestdefs-1)
+			if (st_sel < nummusicdefs-1)
 			{
 				st_sel += 3;
-				if (st_sel >= numsoundtestdefs-1)
-					st_sel = numsoundtestdefs-1;
+				if (st_sel >= nummusicdefs-1)
+					st_sel = nummusicdefs-1;
 				S_StartSound(NULL, sfx_menu1);
 			}
 			st_musictime = 0;
@@ -8464,7 +7727,7 @@ static void M_HandleMusicTest(INT32 choice)
 		case KEY_ENTER:
 			S_StopSounds();
 			S_StopMusic();
-			curplaying = soundtestdefs[st_sel];		
+			curplaying = S_GetMusicCredit(st_sel);
 			S_ChangeMusicInternal(curplaying->name, true);
 			break;
 
@@ -8473,9 +7736,6 @@ static void M_HandleMusicTest(INT32 choice)
 	}
 	if (exitmenu)
 	{
-		Z_Free(soundtestdefs);
-		soundtestdefs = NULL;
-
 		if (currentMenu->prevMenu)
 			M_SetupNextMenu(currentMenu->prevMenu);
 		else
@@ -8499,9 +7759,28 @@ static void M_Credits(INT32 choice)
 // STATISTICS MENU
 // ===============
 
+static void M_DrawStatsMaps(void);
+static void M_DrawStatsPlaytime(void);
+static void M_DrawStatsExtra(void); // dunno how to name this one
+
 static INT32 statsLocation;
 static INT32 statsMax;
 static INT16 statsMapList[NUMMAPS+1];
+static UINT8 statsCurrentPage = 0;
+
+typedef struct statpage_s {
+	const char *title;
+	void (*drawer)(void);
+} statpage_t;
+
+static statpage_t statsPages[] = {
+	{ "Play Time Statistics", M_DrawStatsPlaytime, },
+	{ "Level Statistics", M_DrawStatsMaps, },
+	{ "Extra Statistics", M_DrawStatsExtra, },
+};
+
+#define LENSTATSPAGES (sizeof(statsPages)/sizeof(statsPages[0]))
+#define NUMSTATSPAGES (kartstats.vanilla ? 2 : LENSTATSPAGES)
 
 static void M_Statistics(INT32 choice)
 {
@@ -8528,6 +7807,7 @@ static void M_Statistics(INT32 choice)
 	statsMapList[j] = -1;
 	statsMax = j - 11 + numextraemblems;
 	statsLocation = 0;
+	statsCurrentPage = 0;
 
 	if (statsMax < 0)
 		statsMax = 0;
@@ -8535,13 +7815,47 @@ static void M_Statistics(INT32 choice)
 	M_SetupNextMenu(&SP_LevelStatsDef);
 }
 
-static void M_DrawStatsMaps(int location)
+static void M_DrawStatsMaps(void)
 {
-	INT32 y = 80, i = -1;
+	char beststr[40];
+	tic_t besttime = 0;
+	INT32 mapsunfinished = 0;
+
+	int location = statsLocation;
+	INT32 y = 62, i = -1, j;
 	INT16 mnum;
 	extraemblem_t *exemblem;
 	boolean dotopname = true, dobottomarrow = (location < statsMax);
 
+	SHOWMODDEDGAME
+
+	for (j = 0; j < NUMMAPS; j++)
+	{
+		if (!mapheaderinfo[j] || !(mapheaderinfo[j]->menuflags & LF2_RECORDATTACK))
+			continue;
+
+		if (!mainrecords[j] || mainrecords[j]->time <= 0)
+		{
+			mapsunfinished++;
+			continue;
+		}
+
+		besttime += mainrecords[j]->time;
+	}
+
+	V_DrawString(20, 42, highlightflags|MENUCAPS, "Combined time records:");
+
+	sprintf(beststr, "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime));
+	V_DrawRightAlignedString(BASEVIDWIDTH-16, 42, (mapsunfinished ? warningflags : 0), beststr);
+
+	if (mapsunfinished)
+		V_DrawRightAlignedString(BASEVIDWIDTH-16, 50, warningflags|MENUCAPS, va("(%d unfinished)", mapsunfinished));
+	else
+		V_DrawRightAlignedString(BASEVIDWIDTH-16, 50, recommendedflags|MENUCAPS, "(complete)");
+
+	V_DrawString(32, 50, MENUCAPS, va("x %d/%d", M_CountEmblems(), numemblems+numextraemblems));
+	V_DrawSmallScaledPatch(20, 50, 0, W_CachePatchName("GOTITA", PU_PATCH));
+
 	if (location)
 		V_DrawCharacter(10, y-(skullAnimCounter/5),
 			'\x1A' | highlightflags, false); // up arrow
@@ -8555,8 +7869,8 @@ static void M_DrawStatsMaps(int location)
 		}
 		else if (dotopname)
 		{
-			V_DrawString(20,  y, highlightflags, "LEVEL NAME");
-			V_DrawString(256, y, highlightflags, "MEDALS");
+			V_DrawString(20,  y, highlightflags|MENUCAPS, "Level name");
+			V_DrawString(256, y, highlightflags|MENUCAPS, "Medals");
 			y += 8;
 			dotopname = false;
 		}
@@ -8565,11 +7879,11 @@ static void M_DrawStatsMaps(int location)
 		M_DrawMapEmblems(mnum+1, 295, y);
 
 		if (mapheaderinfo[mnum]->levelflags & LF_NOZONE)
-			V_DrawString(20, y, 0, va("%s %s",
+			V_DrawString(20, y, MENUCAPS, va("%s %s",
 				mapheaderinfo[mnum]->lvlttl,
 				mapheaderinfo[mnum]->actnum));
 		else
-			V_DrawString(20, y, 0, va("%s %s %s",
+			V_DrawString(20, y, MENUCAPS, va("%s %s %s",
 				mapheaderinfo[mnum]->lvlttl,
 				(mapheaderinfo[mnum]->zonttl[0] ? mapheaderinfo[mnum]->zonttl : "Zone"),
 				mapheaderinfo[mnum]->actnum));
@@ -8581,8 +7895,8 @@ static void M_DrawStatsMaps(int location)
 	}
 	if (dotopname && !location)
 	{
-		V_DrawString(20,  y, highlightflags, "LEVEL NAME");
-		V_DrawString(256, y, highlightflags, "MEDALS");
+		V_DrawString(20,  y, highlightflags|MENUCAPS, "Level name");
+		V_DrawString(256, y, highlightflags|MENUCAPS, "Medals");
 		y += 8;
 	}
 	else if (location)
@@ -8593,7 +7907,7 @@ static void M_DrawStatsMaps(int location)
 	{
 		if (i == -1)
 		{
-			V_DrawString(20, y, highlightflags, "EXTRA MEDALS");
+			V_DrawString(20, y, highlightflags|MENUCAPS, "Extra medals");
 			if (location)
 			{
 				y += 8;
@@ -8611,12 +7925,12 @@ static void M_DrawStatsMaps(int location)
 			exemblem = &extraemblems[i];
 
 			if (exemblem->collected)
-				V_DrawSmallMappedPatch(295, y, 0, W_CachePatchName(M_GetExtraEmblemPatch(exemblem), PU_CACHE),
+				V_DrawSmallMappedPatch(295, y, 0, W_CachePatchName(M_GetExtraEmblemPatch(exemblem), PU_PATCH),
 				                       R_GetTranslationColormap(TC_DEFAULT, M_GetExtraEmblemColor(exemblem), GTC_MENUCACHE));
 			else
-				V_DrawSmallScaledPatch(295, y, 0, W_CachePatchName("NEEDIT", PU_CACHE));
+				V_DrawSmallScaledPatch(295, y, 0, W_CachePatchName("NEEDIT", PU_PATCH));
 
-			V_DrawString(20, y, 0, va("%s", exemblem->description));
+			V_DrawString(20, y, MENUCAPS, va("%s", exemblem->description));
 		}
 
 		y += 8;
@@ -8630,53 +7944,78 @@ bottomarrow:
 			'\x1B' | highlightflags, false); // down arrow
 }
 
-static void M_DrawLevelStats(void)
-{
-	char beststr[40];
-
-	tic_t besttime = 0;
-
-	INT32 i;
-	INT32 mapsunfinished = 0;
-
-	M_DrawMenuTitle();
-
-	V_DrawString(20, 24, highlightflags, "Total Play Time:");
-	V_DrawCenteredString(BASEVIDWIDTH/2, 32, 0, va("%i hours, %i minutes, %i seconds",
-	                         G_TicsToHours(totalplaytime),
-	                         G_TicsToMinutes(totalplaytime, false),
-	                         G_TicsToSeconds(totalplaytime)));
-	V_DrawString(20, 42, highlightflags, "Total Matches:");
-	V_DrawRightAlignedString(BASEVIDWIDTH-16, 42, 0, va("%i played", matchesplayed));
-
-	for (i = 0; i < NUMMAPS; i++)
-	{
-		if (!mapheaderinfo[i] || !(mapheaderinfo[i]->menuflags & LF2_RECORDATTACK))
-			continue;
-
-		if (!mainrecords[i] || mainrecords[i]->time <= 0)
-		{
-			mapsunfinished++;
-			continue;
-		}
-
-		besttime += mainrecords[i]->time;
+#define DRAWTIMESTAT(y, title, field) { \
+		char timebuf[80]; \
+		V_DrawString(20, (y), highlightflags|MENUCAPS, title); \
+		tic_t timeval = kartstats.field; \
+		snprintf(timebuf, 80, "%02i:%02i:%02i", G_TicsToHours(timeval), G_TicsToMinutes(timeval, false), G_TicsToSeconds(timeval)); \
+		V_DrawRightAlignedString(BASEVIDWIDTH-16, (y), MENUCAPS, timebuf); \
 	}
 
-	V_DrawString(20, 62, highlightflags, "Combined time records:");
+#define DRAWAMOUNTSTAT(y, title, field) { \
+		V_DrawString(20, (y), highlightflags|MENUCAPS, title); \
+		unsigned amountval = kartstats.field; \
+		V_DrawRightAlignedString(BASEVIDWIDTH-16, (y), MENUCAPS, va("%u", amountval)); \
+	}
 
-	sprintf(beststr, "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime));
-	V_DrawRightAlignedString(BASEVIDWIDTH-16, 62, (mapsunfinished ? warningflags : 0), beststr);
+static void M_DrawStatsPlaytime(void)
+{
+	V_DrawString(20, 42, highlightflags|MENUCAPS, "Total Play Time:");
+	V_DrawCenteredString(BASEVIDWIDTH/2, 52, MENUCAPS, va("%i hours, %i minutes, %i seconds",
+	                         G_TicsToHours(kartstats.totalplaytime),
+	                         G_TicsToMinutes(kartstats.totalplaytime, false),
+	                         G_TicsToSeconds(kartstats.totalplaytime)));
+	V_DrawString(20, 62, highlightflags|MENUCAPS, "Total Matches:");
+	V_DrawRightAlignedString(BASEVIDWIDTH-16, 62, MENUCAPS, va("%i played", kartstats.matchesplayed));
 
-	if (mapsunfinished)
-		V_DrawRightAlignedString(BASEVIDWIDTH-16, 70, warningflags, va("(%d unfinished)", mapsunfinished));
-	else
-		V_DrawRightAlignedString(BASEVIDWIDTH-16, 70, recommendedflags, "(complete)");
+	// Nothing else to draw
+	if (kartstats.vanilla)
+		return;
 
-	V_DrawString(32, 70, 0, va("x %d/%d", M_CountEmblems(), numemblems+numextraemblems));
-	V_DrawSmallScaledPatch(20, 70, 0, W_CachePatchName("GOTITA", PU_STATIC));
+	SHOWMODDEDGAME
 
-	M_DrawStatsMaps(statsLocation);
+	DRAWTIMESTAT(82, "RA Play Time:", raplaytime);
+	DRAWTIMESTAT(92, "Online Play Time:", onlineplaytime);
+	DRAWTIMESTAT(102, "Race Play Time:", raceplaytime);
+	DRAWTIMESTAT(112, "Battle Play Time:", battleplaytime);
+}
+
+// Note: only available with non-vanilla stats loaded, so it doesn't check for that
+static void M_DrawStatsExtra(void)
+{
+	SHOWMODDEDGAME
+
+	DRAWTIMESTAT(42, "Time being SPB target:", spbtargettime);
+	DRAWTIMESTAT(52, "Time spent in spinout:", spinouttime);
+
+	DRAWAMOUNTSTAT(72, "Total wins:", totalwins);
+	DRAWAMOUNTSTAT(82, "Total podium (2nd/3rd place):", totalpodium);
+
+	DRAWAMOUNTSTAT(102, "Hits landed:", hits);
+	DRAWAMOUNTSTAT(112, "Self-hits landed:", selfhits);
+
+	DRAWAMOUNTSTAT(132, "Sinks landed:", sinks);
+	DRAWAMOUNTSTAT(142, "Times hit by sink:", sinked);
+
+	DRAWAMOUNTSTAT(162, "Total respawns:", respawns);
+}
+
+#undef DRAWAMOUNTSTAT
+#undef DRAWTIMESTAT
+
+static void M_DrawLevelStats(void)
+{
+	M_DrawMenuTitle();
+
+	V_DrawCenteredString(BASEVIDWIDTH/2, 28, highlightflags|MENUCAPS, statsPages[statsCurrentPage].title);
+
+	INT32 w = V_StringWidth(statsPages[statsCurrentPage].title, highlightflags|MENUCAPS);
+	V_DrawCharacter(BASEVIDWIDTH/2 - w/2 - 10 - (skullAnimCounter/5), 28,
+			'\x1C' | highlightflags, false); // left arrow
+	V_DrawCharacter(BASEVIDWIDTH/2 + w/2 + 2 + (skullAnimCounter/5), 28,
+			'\x1D' | highlightflags, false); // right arrow
+
+	statsPages[statsCurrentPage].drawer();
 }
 
 // Handle statistics.
@@ -8687,23 +8026,46 @@ static void M_HandleLevelStats(INT32 choice)
 	switch (choice)
 	{
 		case KEY_DOWNARROW:
+			if (statsCurrentPage != 1) // Must be on level stats page
+				break;
 			S_StartSound(NULL, sfx_menu1);
 			if (statsLocation < statsMax)
 				++statsLocation;
 			break;
 
 		case KEY_UPARROW:
+			if (statsCurrentPage != 1) // Must be on level stats page
+				break;
 			S_StartSound(NULL, sfx_menu1);
 			if (statsLocation)
 				--statsLocation;
 			break;
 
+		case KEY_RIGHTARROW:
+			S_StartSound(NULL, sfx_menu1);
+			statsCurrentPage++;
+			if (statsCurrentPage >= NUMSTATSPAGES)
+				statsCurrentPage = 0;
+			break;
+
+		case KEY_LEFTARROW:
+			S_StartSound(NULL, sfx_menu1);
+			if (statsCurrentPage == 0)
+				statsCurrentPage = NUMSTATSPAGES-1;
+			else
+				--statsCurrentPage;
+			break;
+
 		case KEY_PGDN:
+			if (statsCurrentPage != 1) // Must be on level stats page
+				break;
 			S_StartSound(NULL, sfx_menu1);
 			statsLocation += (statsLocation+13 >= statsMax) ? statsMax-statsLocation : 13;
 			break;
 
 		case KEY_PGUP:
+			if (statsCurrentPage != 1) // Must be on level stats page
+				break;
 			S_StartSound(NULL, sfx_menu1);
 			statsLocation -= (statsLocation < 13) ? statsLocation : 13;
 			break;
@@ -8733,7 +8095,7 @@ void M_DrawTimeAttackMenu(void)
 
 	//S_ChangeMusicInternal("racent", true); // Eww, but needed for when user hits escape during demo playback
 
-	V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
+	V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_PATCH));
 
 	M_DrawMenuTitle();
 	if (currentMenu == &SP_TimeAttackDef)
@@ -8744,11 +8106,13 @@ void M_DrawTimeAttackMenu(void)
 	x = currentMenu->x;
 	y = currentMenu->y;
 
+	SHOWMODDEDGAME
+
 	// Character face!
 	if (W_CheckNumForName(skins[cv_chooseskin.value-1].facewant) != LUMPERROR)
 	{
 		UINT8 *colormap = R_GetTranslationColormap(cv_chooseskin.value-1, cv_playercolor.value, GTC_MENUCACHE);
-		V_DrawMappedPatch(BASEVIDWIDTH-x - SHORT(facewantprefix[cv_chooseskin.value-1]->width), y, 0, facewantprefix[cv_chooseskin.value-1], colormap);
+		V_DrawMappedPatch(BASEVIDWIDTH-x - facewantprefix[cv_chooseskin.value-1]->width, y, 0, facewantprefix[cv_chooseskin.value-1], colormap);
 	}
 
 	for (i = 0; i < currentMenu->numitems; ++i)
@@ -8761,7 +8125,7 @@ void M_DrawTimeAttackMenu(void)
 		if (i == itemOn)
 			cursory = y;
 
-		V_DrawString(x, y, (dispstatus == IT_WHITESTRING) ? highlightflags : 0 , currentMenu->menuitems[i].text);
+		V_DrawString(x, y, ((dispstatus == IT_WHITESTRING) ? highlightflags : 0)|MENUCAPS, currentMenu->menuitems[i].text);
 
 		// Cvar specific handling
 		if ((currentMenu->menuitems[i].status & IT_TYPE) == IT_CVAR)
@@ -8770,9 +8134,11 @@ void M_DrawTimeAttackMenu(void)
 			if (currentMenu->menuitems[i].status & IT_CV_STRING)
 			{
 				M_DrawTextBox(x + 32, y - 8, MAXPLAYERNAME, 1);
-				V_DrawString(x + 40, y, V_ALLOWLOWERCASE, cv->string);
-				if (itemOn == i && skullAnimCounter < 4) // blink cursor
-					V_DrawCharacter(x + 40 + V_StringWidth(cv->string, V_ALLOWLOWERCASE), y, '_',false);
+
+				if (itemOn != i)
+					V_DrawString(x + 40, y, V_ALLOWLOWERCASE, cv->string);
+				else
+					M_DrawTextInput(x + 40, y, &menuinput, 0);
 			}
 			else
 			{
@@ -8784,7 +8150,7 @@ void M_DrawTimeAttackMenu(void)
 					soffset = 0;
 
 				// Should see nothing but strings
-				V_DrawString(BASEVIDWIDTH - x - soffset - strw, y, highlightflags, str);
+				V_DrawString(BASEVIDWIDTH - x - soffset - strw, y, highlightflags|MENUCAPS, str);
 
 				if (i == itemOn)
 				{
@@ -8813,8 +8179,8 @@ void M_DrawTimeAttackMenu(void)
 	y = currentMenu->y;
 
 	// DRAW THE SKULL CURSOR
-	V_DrawScaledPatch(x - 24, cursory, 0, W_CachePatchName("M_CURSOR", PU_CACHE));
-	V_DrawString(x, cursory, highlightflags, currentMenu->menuitems[itemOn].text);
+	V_DrawScaledPatch(x - 24, cursory, 0, W_CachePatchName("M_CURSOR", PU_PATCH));
+	V_DrawString(x, cursory, highlightflags|MENUCAPS, currentMenu->menuitems[itemOn].text);
 
 	// Level record list
 	if (cv_nextmap.value)
@@ -8829,57 +8195,12 @@ void M_DrawTimeAttackMenu(void)
 
 		V_DrawFill((BASEVIDWIDTH - dupadjust)>>1, 78, dupadjust, 36, 239);
 
-		V_DrawRightAlignedString(149, 80, highlightflags, "BEST LAP:");
+		V_DrawRightAlignedString(149, 80, highlightflags|MENUCAPS, "Best Lap:");
 		K_drawKartTimestamp(lap, 19, 86, 0, 2);
 
-		V_DrawRightAlignedString(292, 80, highlightflags, "BEST TIME:");
+		V_DrawRightAlignedString(292, 80, highlightflags|MENUCAPS, "Best Time:");
 		K_drawKartTimestamp(time, 162, 86, cv_nextmap.value, 1);
 	}
-	/*{
-		char beststr[40];
-		emblem_t *em;
-
-		if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->time)
-			sprintf(beststr, "(none)");
-		else
-			sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(mainrecords[cv_nextmap.value-1]->time, true),
-			                                 G_TicsToSeconds(mainrecords[cv_nextmap.value-1]->time),
-			                                 G_TicsToCentiseconds(mainrecords[cv_nextmap.value-1]->time));
-
-		V_DrawString(64, y+48, highlightflags, "BEST TIME:");
-		V_DrawRightAlignedString(BASEVIDWIDTH - 64 - 24 - 8, y+48, V_ALLOWLOWERCASE, beststr);
-
-		if (!mainrecords[cv_nextmap.value-1] || !mainrecords[cv_nextmap.value-1]->lap)
-			sprintf(beststr, "(none)");
-		else
-			sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(mainrecords[cv_nextmap.value-1]->lap, true),
-			                                 G_TicsToSeconds(mainrecords[cv_nextmap.value-1]->lap),
-			                                 G_TicsToCentiseconds(mainrecords[cv_nextmap.value-1]->lap));
-
-		V_DrawString(64, y+56, highlightflags, "BEST LAP:");
-		V_DrawRightAlignedString(BASEVIDWIDTH - 64 - 24 - 8, y+56, V_ALLOWLOWERCASE, beststr);
-
-		// Draw record emblems.
-		em = M_GetLevelEmblems(cv_nextmap.value);
-		while (em)
-		{
-			switch (em->type)
-			{
-				case ET_TIME: break;
-				default:
-					goto skipThisOne;
-			}
-
-			if (em->collected)
-				V_DrawMappedPatch(BASEVIDWIDTH - 64 - 24, y+48, 0, W_CachePatchName(M_GetEmblemPatch(em), PU_CACHE),
-				                       R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_MENUCACHE));
-			else
-				V_DrawScaledPatch(BASEVIDWIDTH - 64 - 24, y+48, 0, W_CachePatchName("NEEDIT", PU_CACHE));
-
-			skipThisOne:
-			em = M_GetLevelEmblems(-1);
-		}
-	}*/
 
 	// ALWAYS DRAW player name, level name, skin and color even when not on this menu!
 	if (currentMenu != &SP_TimeAttackDef)
@@ -8889,7 +8210,7 @@ void M_DrawTimeAttackMenu(void)
 		for (i = 0; i < 4; ++i)
 		{
 			y = currentMenu->y+SP_TimeAttackMenu[i].alphaKey;
-			V_DrawString(x, y, V_TRANSLUCENT, SP_TimeAttackMenu[i].text);
+			V_DrawString(x, y, V_TRANSLUCENT|MENUCAPS, SP_TimeAttackMenu[i].text);
 			ncv = (consvar_t *)SP_TimeAttackMenu[i].itemaction;
 			if (SP_TimeAttackMenu[i].status & IT_CV_STRING)
 			{
@@ -8906,7 +8227,7 @@ void M_DrawTimeAttackMenu(void)
 					soffset = 0;
 
 				// Should see nothing but strings
-				V_DrawString(BASEVIDWIDTH - x - soffset - strw, y, highlightflags|V_TRANSLUCENT, str);
+				V_DrawString(BASEVIDWIDTH - x - soffset - strw, y, highlightflags|V_TRANSLUCENT|MENUCAPS, str);
 			}
 		}
 	}
@@ -8923,7 +8244,7 @@ static void M_TimeAttack(INT32 choice)
 
 	if (M_CountLevelsToShowInList() == 0)
 	{
-		M_StartMessage(M_GetText("No record-attackable levels found.\n"),NULL,MM_NOTHING);
+		M_StartMessage(M_GetText("No record-attackable levels found.\n"), NULL, MM_NOTHING);
 		return;
 	}
 
@@ -9019,6 +8340,7 @@ static void M_HandleStaffReplay(INT32 choice)
 		default:
 			break;
 	}
+
 	if (exitmenu)
 	{
 		if (currentMenu->prevMenu)
@@ -9154,13 +8476,7 @@ static void M_ModeAttackEndGame(INT32 choice)
 		Command_ExitGame_f();
 
 	M_StartControlPanel();
-	switch(modeattacking)
-	{
-	default:
-	case ATTACKING_RECORD:
-		currentMenu = &SP_TimeAttackDef;
-		break;
-	}
+	currentMenu = &SP_TimeAttackDef;
 	itemOn = currentMenu->lastOn;
 	G_SetGamestate(GS_TIMEATTACK);
 	modeattacking = ATTACKING_NONE;
@@ -9311,7 +8627,7 @@ Fetch_servers_thread (int *id)
 }
 #endif/*MASTERSERVER*/
 
-#define SERVERHEADERHEIGHT 36
+#define SERVERHEADERHEIGHT 48
 #define SERVERLINEHEIGHT 12
 
 #define S_LINEY(n) currentMenu->y + SERVERHEADERHEIGHT + (n * SERVERLINEHEIGHT)
@@ -9319,6 +8635,57 @@ Fetch_servers_thread (int *id)
 #ifndef NONET
 static UINT32 localservercount;
 
+static void M_SearchServerList(void)
+{
+	char servername[MAXSERVERNAME+1] = {0};
+	serverlistsearchedcount = 0;
+
+	for (UINT32 i = 0; i < serverlistcount; ++i)
+	{
+		StripColors(servername, serverlist[i].info.servername, MAXSERVERNAME);
+		if (menuinput.length == 0 || strcasestr(servername, menuinput.buffer) != NULL)
+			serverlistsearched[serverlistsearchedcount++] = i;
+	}
+
+	if (menuinput.length > 0)
+		serverlistpage = 0;
+}
+
+static void M_HandleServerSearch(INT32 choice)
+{
+	boolean exitmenu = false; // exit to previous menu
+
+	switch (choice)
+	{
+		case KEY_DOWNARROW:
+			M_NextOpt();
+			S_StartSound(NULL, sfx_menu1);
+			break;
+		case KEY_UPARROW:
+			M_PrevOpt();
+			S_StartSound(NULL, sfx_menu1);
+			break;
+		case KEY_ESCAPE:
+			exitmenu = true;
+			break;
+
+		default:
+			if (M_TextInputHandle(&menuinput, choice))
+			{
+				S_StartSound(NULL, sfx_menu1);
+				M_SearchServerList();
+			}
+			break;
+	}
+	if (exitmenu)
+	{
+		if (currentMenu->prevMenu)
+			M_SetupNextMenu(currentMenu->prevMenu);
+		else
+			M_ClearMenus(true);
+	}
+}
+
 static void M_HandleServerPage(INT32 choice)
 {
 	boolean exitmenu = false; // exit to previous menu
@@ -9341,7 +8708,7 @@ static void M_HandleServerPage(INT32 choice)
 		case KEY_ENTER:
 		case KEY_RIGHTARROW:
 			S_StartSound(NULL, sfx_menu1);
-			if ((serverlistpage + 1) * SERVERS_PER_PAGE < serverlistcount)
+			if ((serverlistpage + 1) * SERVERS_PER_PAGE < serverlistsearchedcount)
 			{
 				oldserverlistpage = serverlistpage++;
 				serverlistslidex = BASEVIDWIDTH;
@@ -9359,6 +8726,7 @@ static void M_HandleServerPage(INT32 choice)
 		default:
 			break;
 	}
+
 	if (exitmenu)
 	{
 		if (currentMenu->prevMenu)
@@ -9372,10 +8740,7 @@ static void M_Connect(INT32 choice)
 {
 	// do not call menuexitfunc
 	M_ClearMenus(false);
-	
-	CV_Set(&cv_lastserver, I_GetNodeAddress(serverlist[choice-FIRSTSERVERLINE + serverlistpage * SERVERS_PER_PAGE].node));
-		
-	COM_BufAddText(va("connect node %d\n", serverlist[choice-FIRSTSERVERLINE + serverlistpage * SERVERS_PER_PAGE].node));	
+	COM_BufAddText(va("connect node %d\n", serverlist[serverlistsearched[choice-FIRSTSERVERLINE + serverlistpage * SERVERS_PER_PAGE]].node));
 }
 
 static void M_Refresh(INT32 choice)
@@ -9433,11 +8798,11 @@ static void M_DrawServerCountAndHorizontalBar(void)
 
 	radius = V_StringWidth(text, 0) / 2;
 
-	V_DrawCenteredString(center, currentMenu->y+28, 0, text);
+	V_DrawCenteredString(center, currentMenu->y+40, 0, text);
 
 	// Horizontal line!
-	V_DrawFill(1, currentMenu->y+32, center - radius - 2, 1, 0);
-	V_DrawFill(center + radius + 2, currentMenu->y+32, BASEVIDWIDTH - 1, 1, 0);
+	V_DrawFill(1, currentMenu->y+44, center - radius - 2, 1, 0);
+	V_DrawFill(center + radius + 2, currentMenu->y+44, BASEVIDWIDTH - 1, 1, 0);
 }
 #endif
 
@@ -9447,9 +8812,9 @@ static void M_DrawServerLines(INT32 x, INT32 page)
 	const char *gt = "Unknown";
 	const char *spd = "";
 
-	for (i = 0; i < min(serverlistcount - page * SERVERS_PER_PAGE, SERVERS_PER_PAGE); i++)
+	for (i = 0; i < min(serverlistsearchedcount - page * SERVERS_PER_PAGE, SERVERS_PER_PAGE); i++)
 	{
-		INT32 slindex = i + page * SERVERS_PER_PAGE;
+		INT32 slindex = serverlistsearched[i + page * SERVERS_PER_PAGE];
 		UINT32 globalflags = ((serverlist[slindex].info.numberofplayer >= serverlist[slindex].info.maxplayer) ? V_TRANSLUCENT : 0)
 			|((itemOn == FIRSTSERVERLINE+i) ? highlightflags : 0)|V_ALLOWLOWERCASE;
 
@@ -9462,7 +8827,7 @@ static void M_DrawServerLines(INT32 x, INT32 page)
 			V_DrawSmallString(x+222, S_LINEY(i)+8, globalflags, "\x83" "Cheats");
 
 		V_DrawSmallString(x, S_LINEY(i)+8, globalflags,
-		                     va("Ping: %u", (UINT32)LONG(serverlist[slindex].info.time)));
+								va("Ping: %u", (UINT32)LONG(serverlist[slindex].info.time)));
 
 		gt = "Unknown";
 		if (serverlist[slindex].info.gametype < NUMGAMETYPES)
@@ -9488,7 +8853,7 @@ static void M_DrawServerLines(INT32 x, INT32 page)
 static void M_DrawConnectMenu(void)
 {
 	UINT16 i;
-	INT32 numPages = (serverlistcount+(SERVERS_PER_PAGE-1))/SERVERS_PER_PAGE;
+	INT32 numPages = (serverlistsearchedcount+(SERVERS_PER_PAGE-1))/SERVERS_PER_PAGE;
 	INT32 mservflags = V_ALLOWLOWERCASE;
 
 	for (i = FIRSTSERVERLINE; i < min(localservercount, SERVERS_PER_PAGE)+FIRSTSERVERLINE; i++)
@@ -9502,16 +8867,17 @@ static void M_DrawConnectMenu(void)
 	                         highlightflags, va("%u of %d", serverlistpage+1, numPages));
 
 	// Did you change the Server Browser address? Have a little reminder.
-	#ifdef MASTERSERVER
+#ifdef MASTERSERVER
 	if (CV_IsSetToDefault(&cv_masterserver))
 		mservflags = mservflags|highlightflags|V_30TRANS;
 	else
 		mservflags = mservflags|warningflags;
+
 	V_DrawRightAlignedSmallString(BASEVIDWIDTH - currentMenu->x, currentMenu->y+3 + MP_ConnectMenu[mp_connect_refresh].alphaKey,
 	                         mservflags, va("MS: %s", cv_masterserver.string));
 
 	M_DrawServerCountAndHorizontalBar();
-	#endif
+#endif
 
 	// When switching pages, slide the old page and the
 	// new page across the screen
@@ -9537,6 +8903,17 @@ static void M_DrawConnectMenu(void)
 		M_DrawServerLines(currentMenu->x, serverlistpage);
 	}
 
+	INT32 input_y = currentMenu->menuitems[mp_connect_search].alphaKey;
+
+	V_DrawFill(currentMenu->x, currentMenu->y+input_y, MAXSTRINGLENGTH*8+6, 8+6, 239);
+
+	const INT32 xoff = 3, yoff = 3;
+
+	if (itemOn != mp_connect_search)
+		V_DrawString(currentMenu->x+xoff, currentMenu->y+yoff+input_y, V_ALLOWLOWERCASE, menuinput.buffer);
+	else
+		M_DrawTextInput(currentMenu->x+xoff, currentMenu->y+yoff+input_y, &menuinput, 0);
+
 	localservercount = serverlistcount;
 
 	M_DrawGenericMenu();
@@ -9616,17 +8993,19 @@ void M_SortServerList(void)
 		qs22j(serverlist, serverlistcount, sizeof(serverelem_t), ServerListEntryComparator_gametype);
 		break;
 	}
+	M_SearchServerList();
 #endif
 }
 
 #ifndef NONET
 #ifdef UPDATE_ALERT
-#ifdef MASTERSERVER	
+#ifdef MASTERSERVER
 static void M_CheckMODVersion(int id)
 {
 	char updatestring[500];
 	const char *updatecheck = GetMODVersion(id);
-	if(updatecheck)
+
+	if (updatecheck)
 	{
 		sprintf(updatestring, UPDATE_ALERT_STRING, VERSIONSTRING, updatecheck);
 #ifdef HAVE_THREADS
@@ -9674,6 +9053,9 @@ static void M_ConnectMenu(INT32 choice)
 
 	CL_UpdateServerList();
 
+	// Reset
+	M_TextInputSetString(&menuinput, "");
+
 	M_SetupNextMenu(&MP_ConnectDef);
 	itemOn = 0;
 
@@ -9738,7 +9120,7 @@ static void M_HandleMasterServerResetChoice(event_t *ev)
 
 	if (ev->type == ev_keydown)
 	{
-		if (choice == ' ' || choice == 'y' || choice == KEY_ENTER || choice == gamecontrol[gc_accelerate][0] || choice == gamecontrol[gc_accelerate][1])
+		if (choice == ' ' || choice == 'y' || choice == KEY_ENTER || choice == gamecontrol[0][gc_accelerate][0] || choice == gamecontrol[0][gc_accelerate][1])
 		{
 			CV_Set(&cv_masterserver, cv_masterserver.defaultvalue);
 			CV_Set(&cv_masterserver_nagattempts, cv_masterserver_nagattempts.defaultvalue);
@@ -9889,20 +9271,34 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
 	patch_t *PictureOfLevel;
 	INT32 x, y, w, i, oldval, trans, dupadjust = ((vid.width/vid.dupx) - BASEVIDWIDTH)>>1;
 
+	if (levellistmode != LLM_RECORDATTACK) // so it doesent show in record attack menu
+	{
+		char encoretoggle[32] = {0};
+		const char *item1 = gamecontrol[0][gc_fire][0] != 0 ? G_KeynumToString(gamecontrol[0][gc_fire][0]) : NULL;
+		const char *item2 = gamecontrol[0][gc_fire][1] != 0 ? G_KeynumToString(gamecontrol[0][gc_fire][1]) : NULL;
+
+		if (item1 != NULL && item2 != NULL)
+			snprintf(encoretoggle, 32, "%s/%s - Toggle Encore", item1, item2);
+		else
+			snprintf(encoretoggle, 32, "%s - Toggle Encore", item1 != NULL ? item1 : item2 != NULL ? item2 : "Item");
+
+		V_DrawThinString(1, BASEVIDHEIGHT-8-1, V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_TRANSLUCENT|V_ALLOWLOWERCASE, encoretoggle);
+	}
+
 	//  A 160x100 image of the level as entry MAPxxP
 	if (cv_nextmap.value)
 	{
 		lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(cv_nextmap.value)));
 		if (lumpnum != LUMPERROR)
-			PictureOfLevel = W_CachePatchNum(lumpnum, PU_CACHE);
+			PictureOfLevel = W_CachePatchNum(lumpnum, PU_PATCH);
 		else
-			PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
+			PictureOfLevel = W_CachePatchName("BLANKLVL", PU_PATCH);
 	}
 	else
-		PictureOfLevel = W_CachePatchName("RANDOMLV", PU_CACHE);
+		PictureOfLevel = W_CachePatchName("RANDOMLV", PU_PATCH);
 
-	w = SHORT(PictureOfLevel->width)/2;
-	i = SHORT(PictureOfLevel->height)/2;
+	w = PictureOfLevel->width/2;
+	i = PictureOfLevel->height/2;
 	x = BASEVIDWIDTH/2 - w/2;
 	y = currentMenu->y + 130 + 8 - i;
 
@@ -9915,17 +9311,28 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
 
 	if (cv_nextmap.value && cv_showtrackaddon.value)
 	{
+		static tic_t namescroll = 0;
+		static INT32 namescrollmap = 0;
+		char namescrollbuf[64]= {0};
+
+		if (cv_nextmap.value != namescrollmap)
+		{
+			namescrollmap = cv_nextmap.value;
+			namescroll = 0;
+		}
+
+		if (renderisnewtic) namescroll++;
+
 		char *addonname = wadfiles[mapwads[cv_nextmap.value-1]]->filename;
 		INT32 len;
-		INT32 charlimit = 21 + (dupadjust/5);
+		INT32 charlimit = min((size_t)(21 + (dupadjust/5)), sizeof(namescrollbuf)-1);
 		nameonly(addonname);
 		len = strlen(addonname);
-#define charsonside 14
 		if (len > charlimit)
-			V_DrawThinString(x+w+5, y+i-8, V_TRANSLUCENT, va("%.*s...%s", charsonside, addonname, addonname+((len-charlimit) + charsonside))); // variable reuse...
-#undef charsonside
+			M_ScrollString(addonname, len, namescrollbuf, charlimit, namescroll);
 		else
-			V_DrawThinString(x+w+5, y+i-8, V_TRANSLUCENT, addonname); // variable reuse...
+			strncpy(namescrollbuf, addonname, sizeof(namescrollbuf));
+		V_DrawThinString(x+w+5, y+i-8, V_TRANSLUCENT|MENUCAPS, namescrollbuf); // variable reuse...
 	}
 
 	if (!cv_kartencore.value || gamestate == GS_TIMEATTACK || cv_newgametype.value != GT_RACE)
@@ -9934,19 +9341,17 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
 	{
 		/*UINT8 *mappingforencore = NULL;
 		if ((lumpnum = W_CheckNumForName(va("%sE", mapname))) != LUMPERROR)
-			mappingforencore = W_CachePatchNum(lumpnum, PU_CACHE);*/
+			mappingforencore = W_CachePatchNum(lumpnum, PU_PATCH);*/
 
 		V_DrawFixedPatch((x+w)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/2, V_FLIP, PictureOfLevel, 0);
 
 		{
 			static angle_t rubyfloattime = 0;
 			const fixed_t rubyheight = FINESINE(rubyfloattime>>ANGLETOFINESHIFT);
-			V_DrawFixedPatch((x+w/2)<<FRACBITS, ((y+i/2)<<FRACBITS) - (rubyheight<<1), FRACUNIT, 0, W_CachePatchName("RUBYICON", PU_CACHE), NULL);
+			V_DrawFixedPatch((x+w/2)<<FRACBITS, ((y+i/2)<<FRACBITS) - (rubyheight<<1), FRACUNIT, 0, W_CachePatchName("RUBYICON", PU_PATCH), NULL);
 			rubyfloattime += FixedMul(ANGLE_MAX/NEWTICRATE, renderdeltatics);
 		}
 	}
-	/*V_DrawDiag(x, y, 12, 31);
-	V_DrawDiag(x, y, 10, G_GetGametypeColor(cv_newgametype.value));*/
 
 	y += i/4;
 	i = cv_nextmap.value - 1;
@@ -9975,12 +9380,12 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
 		{
 			lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(i+1)));
 			if (lumpnum != LUMPERROR)
-				PictureOfLevel = W_CachePatchNum(lumpnum, PU_CACHE);
+				PictureOfLevel = W_CachePatchNum(lumpnum, PU_PATCH);
 			else
-				PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
+				PictureOfLevel = W_CachePatchName("BLANKLVL", PU_PATCH);
 		}
 		else
-			PictureOfLevel = W_CachePatchName("RANDOMLV", PU_CACHE);
+			PictureOfLevel = W_CachePatchName("RANDOMLV", PU_PATCH);
 
 		x -= horizspac + w/2;
 
@@ -10013,12 +9418,12 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
 		{
 			lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(i+1)));
 			if (lumpnum != LUMPERROR)
-				PictureOfLevel = W_CachePatchNum(lumpnum, PU_CACHE);
+				PictureOfLevel = W_CachePatchNum(lumpnum, PU_PATCH);
 			else
-				PictureOfLevel = W_CachePatchName("BLANKLVL", PU_CACHE);
+				PictureOfLevel = W_CachePatchName("BLANKLVL", PU_PATCH);
 		}
 		else
-			PictureOfLevel = W_CachePatchName("RANDOMLV", PU_CACHE);
+			PictureOfLevel = W_CachePatchName("RANDOMLV", PU_PATCH);
 
 		V_DrawTinyScaledPatch(x, y, trans, PictureOfLevel);
 
@@ -10031,7 +9436,7 @@ static void M_DrawServerMenu(void)
 {
 
 	M_DrawLevelSelectOnly(false, false);
-	#ifdef MASTERSERVER
+#ifdef MASTERSERVER
 	if (currentMenu == &MP_ServerDef && cv_advertise.value) // Remind players where they're hosting.
 	{
 		int mservflags = V_ALLOWLOWERCASE;
@@ -10041,7 +9446,7 @@ static void M_DrawServerMenu(void)
 			mservflags = mservflags|warningflags;
 		V_DrawCenteredThinString(BASEVIDWIDTH/2, BASEVIDHEIGHT-12, mservflags, va("Master Server: %s", cv_masterserver.string));
 	}
-	#endif
+#endif
 	M_DrawGenericMenu();
 
 }
@@ -10074,7 +9479,9 @@ static void M_StartServerMenu(INT32 choice)
 	levellistmode = LLM_CREATESERVER;
 	M_PrepareLevelSelect();
 	M_SetupNextMenu(&MP_ServerDef);
+#ifdef MASTERSERVER
 	Get_rules();
+#endif
 	M_PopupMasterServerRules();
 }
 
@@ -10082,8 +9489,21 @@ static void M_StartServerMenu(INT32 choice)
 // CONNECT VIA IP
 // ==============
 
-static char setupm_ip[28];
+#define SETUPM_IP_MAXSIZE ((28-1)*8)
+static char setupm_ip[64];
+static textinput_t setupm_input_ip;
 #endif
+
+void M_Multiplayer(INT32 choice)
+{
+	(void)choice;
+#ifndef NONET
+	memset(setupm_ip, 0, sizeof(setupm_ip));
+	M_TextInputInit(&setupm_input_ip, setupm_ip, sizeof(setupm_ip));
+#endif
+	M_SetupNextMenu(&MP_MainDef);
+}
+
 static UINT8 setupm_pselect = 1;
 
 // Draw the funky Connect IP menu. Tails 11-19-2002
@@ -10095,19 +9515,17 @@ static void M_DrawMPMainMenu(void)
 
 	// use generic drawer for cursor, items and title
 	M_DrawGenericMenu();
-	
-	INT32 lowercase = !cv_menucaps.value ? V_ALLOWLOWERCASE : 0;
 
 #ifndef NONET
 #if MAXPLAYERS != 16
 Update the maxplayers label...
 #endif
 	V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[4].alphaKey,
-		((itemOn == 4) ? highlightflags : 0)|lowercase, "(2-16 Players)");
+		((itemOn == 4) ? highlightflags : 0)|MENUCAPS, "(2-16 Players)");
 #endif
 
 	V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[5].alphaKey,
-		((itemOn == 5) ? highlightflags : 0)|lowercase,
+		((itemOn == 5) ? highlightflags : 0)|MENUCAPS,
 		"(2-4 players)"
 		);
 
@@ -10117,12 +9535,10 @@ Update the maxplayers label...
 	V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 239);
 
 	// draw name string
-	V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip);
-
-	// draw text cursor for name
-	if (itemOn == 9
-	    && skullAnimCounter < 4)   //blink cursor
-		V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_ALLOWLOWERCASE),y+12,'_',false);
+	if (itemOn != 9)
+		V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip);
+	else
+		M_DrawTextInputScroll(x+8, y+12, &setupm_input_ip, 0, SETUPM_IP_MAXSIZE);
 #endif
 
 	// character bar, ripped off the color bar :V
@@ -10177,7 +9593,7 @@ Update the maxplayers label...
 				cursorframe += renderdeltatics / 4;
 				for (; cursorframe > 7 * FRACUNIT; cursorframe -= 7 * FRACUNIT) {}
 
-				V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, 0, W_CachePatchName(va("K_BHILI%d", (cursorframe >> FRACBITS) + 1), PU_CACHE), NULL);
+				V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, 0, W_CachePatchName(va("K_BHILI%d", (cursorframe >> FRACBITS) + 1), PU_PATCH), NULL);
 			}
 
 			x += incrwidth;
@@ -10235,18 +9651,19 @@ static void M_SetupMultiHandler(INT32 choice)
 			switch (setupm_pselect)
 			{
 				case 2:
-					M_SetupMultiPlayer2(0);
+					M_SetupMultiPlayer2();
 					return;
 				case 3:
-					M_SetupMultiPlayer3(0);
+					M_SetupMultiPlayer3();
 					return;
 				case 4:
-					M_SetupMultiPlayer4(0);
+					M_SetupMultiPlayer4();
 					return;
 				default:
-					M_SetupMultiPlayer(0);
+					M_SetupMultiPlayer();
 					return;
 			}
+
 			break;
 		}
 
@@ -10279,7 +9696,6 @@ static void M_ConnectIP(INT32 choice)
 
 	M_ClearMenus(true);
 
-	CV_Set(&cv_lastserver,setupm_ip);
 	COM_BufAddText(va("connect \"%s\"\n", setupm_ip));
 
 	// A little "please wait" message.
@@ -10304,13 +9720,12 @@ static void M_ConnectLastServer(INT32 choice)
 	}
 
 	M_ClearMenus(true);
-	COM_BufAddText(va("connect \"%s\"\n", cv_lastserver.string));	
+	COM_BufAddText(va("connect \"%s\"\n", cv_lastserver.string));
 }
 
 // Tails 11-19-2002
 static void M_HandleConnectIP(INT32 choice)
 {
-	size_t l;
 	boolean exitmenu = false;  // exit to previous menu and send name change
 
 	switch (choice)
@@ -10335,41 +9750,22 @@ static void M_HandleConnectIP(INT32 choice)
 			exitmenu = true;
 			break;
 
+		case KEY_LEFTARROW:
+		case KEY_RIGHTARROW:
 		case KEY_BACKSPACE:
-			if ((l = strlen(setupm_ip)) != 0)
-			{
-				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_ip[l-1] = 0;
-			}
-			break;
-
 		case KEY_DEL:
-			if (setupm_ip[0])
-			{
+			if (M_TextInputHandle(&setupm_input_ip, choice))
 				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_ip[0] = 0;
-			}
 			break;
 
 		default:
-			l = strlen(setupm_ip);
-			if (l >= 28-1)
-				break;
-
 			// Rudimentary number and period enforcing - also allows letters so hostnames can be used instead
-			if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z'))
+			// ctrl-v allows to bypass that anyway, so we just remove that for now to allow stuff like shift+insert
+			/*if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z')
+				|| (choice >= 199 && choice <= 211 && choice != 202 && choice != 206))*/ //numpad too!
 			{
-				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_ip[l] = (char)choice;
-				setupm_ip[l+1] = 0;
-			}
-			else if (choice >= 199 && choice <= 211 && choice != 202 && choice != 206) //numpad too!
-			{
-				char keypad_translation[] = {'7','8','9','-','4','5','6','+','1','2','3','0','.'};
-				choice = keypad_translation[choice - 199];
-				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_ip[l] = (char)choice;
-				setupm_ip[l+1] = 0;
+				if (M_TextInputHandle(&setupm_input_ip, choice))
+					S_StartSound(NULL,sfx_menu1); // Tails
 			}
 			break;
 	}
@@ -10394,20 +9790,23 @@ static state_t   *multi_state;
 
 // this is set before entering the MultiPlayer setup menu,
 // for either player 1 or 2
-static char       setupm_name[MAXPLAYERNAME+1];
-static player_t  *setupm_player;
-static consvar_t *setupm_cvskin;
-static consvar_t *setupm_cvcolor;
-static consvar_t *setupm_cvname;
-static UINT8      setupm_skinxpos;
-static INT32      setupm_fakeskin;
-static INT32      setupm_fakecolor;
+static char        setupm_name[MAXPLAYERNAME+1];
+static textinput_t setupm_input;
+static player_t   *setupm_player;
+static consvar_t  *setupm_cvskin;
+static consvar_t  *setupm_cvcolor;
+static consvar_t  *setupm_cvname;
+static UINT8       setupm_skinxpos;
+static INT32       setupm_fakeskin;
+static INT32       setupm_fakecolor;
 
 //variables used for other skin select menus
 static UINT8 setupm_skinypos;
 static INT32 setupm_skinselect;
 static boolean setupm_skinlockedselect;
 
+static UINT8 setupm_playernum; //brap
+
 #define SELECTEDSTATSCOUNT skinstatscount[setupm_skinxpos][setupm_skinypos]
 #define LASTSELECTEDSTAT skinstats[setupm_skinxpos][setupm_skinypos][skinstatscount[setupm_skinxpos][setupm_skinypos]]
 
@@ -10432,10 +9831,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	INT32 tw = 0;
 	spritedef_t *sprdef;
 	spriteframe_t *sprframe;
-	patch_t *statbg = W_CachePatchName("K_STATBG", PU_CACHE);
-	patch_t *statlr = W_CachePatchName("K_STATLR", PU_CACHE);
-	patch_t *statud = W_CachePatchName("K_STATUD", PU_CACHE);
-	patch_t *statdot = W_CachePatchName("K_SDOT0", PU_CACHE);
+	patch_t *statbg = W_CachePatchName("K_STATBG", PU_PATCH);
+	patch_t *statlr = W_CachePatchName("K_STATLR", PU_PATCH);
+	patch_t *statud = W_CachePatchName("K_STATUD", PU_PATCH);
+	patch_t *statdot = W_CachePatchName("K_SDOT0", PU_PATCH);
 	patch_t *patch;
 	UINT8 frame;
 	UINT8 speed;
@@ -10475,11 +9874,11 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	}
 
 	M_DrawTextBox(mx + 32, my - 8 + nameboxaddy, MAXPLAYERNAME, 1);
-	V_DrawString(mx + 40, my + nameboxaddy, V_ALLOWLOWERCASE, setupm_name);
 
-	// draw text cursor for name
-	if (!itemOn && skullAnimCounter < 4) // blink cursor
-		V_DrawCharacter(mx + 40 + V_StringWidth(setupm_name, V_ALLOWLOWERCASE), my + nameboxaddy, '_', false);
+	if (itemOn != 0)
+		V_DrawString(mx + 40, my + nameboxaddy, V_ALLOWLOWERCASE, setupm_input.buffer);
+	else
+		M_DrawTextInput(mx + 40, my + nameboxaddy, &setupm_input, 0);
 
 	// draw skin string
 	st = V_StringWidth(skins[setupm_fakeskin].realname, 0);
@@ -10493,11 +9892,11 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			statoffset = 0;
 			tw = V_StringWidth("Character", 0);//V_StringWidth(GETSELECTEDSKINNAME, 0);
 			st = V_StringWidth(GETSELECTEDSKINNAME, 0);
-			
+
 			INT32 selectedskin = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
 			speed = skins[selectedskin].kartspeed;
-			weight = skins[selectedskin].kartweight;		
-				
+			weight = skins[selectedskin].kartweight;
+
 			V_DrawString((mx+(tw/2)) - (st/2), my + 37,
 				((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0) | highlightflags | V_ALLOWLOWERCASE,
 				GETSELECTEDSKINNAME);
@@ -10505,7 +9904,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				statoffset = 50;
 			else
 				statoffset = 113;
-				
+
 			V_DrawString(statx - statoffset, staty - 10, V_6WIDTHSPACE, va("\x84%dS \x87%dW", GETSELECTEDSPEED, GETSELECTEDWEIGHT));
 #undef GETSELECTEDSKINNAME
 #undef GETSELECTEDSPEED
@@ -10556,9 +9955,11 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			}
 			break;
 	}
+
 	// draw the name of the color you have chosen
 	// Just so people don't go thinking that "Default" is Green.
 	st = V_StringWidth(KartColor_Names[setupm_fakecolor], 0);
+
 	switch (cv_skinselectmenu.value)
 	{
 		case SKINMENUTYPE_EXTENDED:
@@ -10570,7 +9971,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				V_DrawCharacter(mx + 2 + st + (skullAnimCounter/5), my + 164,
 					'\x1D' | highlightflags, false); // right arrow
 			}
-			break;	
+			break;
 		case SKINMENUTYPE_GRID:
 		case SKINMENUTYPE_2D:
 			V_DrawString(mx, my + 152, highlightflags | V_ALLOWLOWERCASE, KartColor_Names[setupm_fakecolor]); // SRB2kart
@@ -10613,29 +10014,29 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			if (statdp == true)
 			{
 				//Background
-				V_DrawScaledPatch(statx - 50, staty + 4, 0, W_CachePatchName("K_STATNB", PU_CACHE));
-				
-				//Speed				
+				V_DrawScaledPatch(statx - 50, staty + 4, 0, W_CachePatchName("K_STATNB", PU_PATCH));
+
+				//Speed
 				for (i = 0; i < GETSELECTEDSPEED; i++) // draw the stat bars
 				{
 					if (i == 0)
-						V_DrawScaledPatch(statx - 45, staty + 63, 0, W_CachePatchName("K_STATN1", PU_CACHE));
+						V_DrawScaledPatch(statx - 45, staty + 63, 0, W_CachePatchName("K_STATN1", PU_PATCH));
 					else if (i == GETSELECTEDSPEED -1 )
-						V_DrawScaledPatch(statx - 45, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN3", PU_CACHE));
+						V_DrawScaledPatch(statx - 45, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN3", PU_PATCH));
 					else
-						V_DrawScaledPatch(statx - 45, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN2", PU_CACHE));
+						V_DrawScaledPatch(statx - 45, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN2", PU_PATCH));
 				}
-					
+
 				//Weight
 				for (i = 0; i < GETSELECTEDWEIGHT; i++) // draw the stat bars
 				{
-					
+
 					if (i == 0)
-						V_DrawScaledPatch(statx - 30, staty + 63, 0, W_CachePatchName("K_STATN4", PU_CACHE));
+						V_DrawScaledPatch(statx - 30, staty + 63, 0, W_CachePatchName("K_STATN4", PU_PATCH));
 					else if (i == GETSELECTEDWEIGHT -1)
-						V_DrawScaledPatch(statx - 30, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN6", PU_CACHE));
+						V_DrawScaledPatch(statx - 30, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN6", PU_PATCH));
 					else
-						V_DrawScaledPatch(statx - 30, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN5", PU_CACHE));
+						V_DrawScaledPatch(statx - 30, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN5", PU_PATCH));
 				}
 			}
 
@@ -10765,7 +10166,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 
 					UINT8 cursorframe = (I_GetTime() / 4) % 7;
 
-					cursor = W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_CACHE);
+					cursor = W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
 					V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
 			}
 
@@ -10813,7 +10214,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				{
 					UINT8 cursorframe = (I_GetTime() / 4) % 7;
 
-					cursor = W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_CACHE);
+					cursor = W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
 					V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
 				}
 			}
@@ -10822,13 +10223,13 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				INT32 selectedskin = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
 				speed = skins[selectedskin].kartspeed;
 				weight = skins[selectedskin].kartweight;
-				statdot = W_CachePatchName("K_SDOT1", PU_CACHE);
+				statdot = W_CachePatchName("K_SDOT1", PU_PATCH);
 				if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
 					V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, flashcol);
 				else
 					V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
 
-				statdot = W_CachePatchName("K_SDOT2", PU_CACHE); // coloured center
+				statdot = W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
 				if (setupm_fakecolor)
 					V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
 			}
@@ -10877,7 +10278,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 				{
 					UINT8 cursorframe = (I_GetTime() / 4) % 7;
 
-					cursor = W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_CACHE);
+					cursor = W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
 					V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
 				}
 			}
@@ -10888,13 +10289,13 @@ static void M_DrawSetupMultiPlayerMenu(void)
 			speed = skins[setupm_fakeskin].kartspeed;
 			weight = skins[setupm_fakeskin].kartweight;
 
-			statdot = W_CachePatchName("K_SDOT1", PU_CACHE);
+			statdot = W_CachePatchName("K_SDOT1", PU_PATCH);
 			if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
 				V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, flashcol);
 			else
 				V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, NULL);
 
-			statdot = W_CachePatchName("K_SDOT2", PU_CACHE); // coloured center
+			statdot = W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
 			if (setupm_fakecolor)
 				V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
 			break;
@@ -10905,10 +10306,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
 #define indexwidth 8
 	{
 		INT32 colwidth = ((BASEVIDWIDTH-(2*mx))-charw)/(2*indexwidth);
-		
+
 		if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
 			colwidth = colwidth - 10;
-		
+
 		INT32 j = -colwidth;
 		INT16 col = setupm_fakecolor - colwidth;
 		INT32 x = mx;
@@ -10950,7 +10351,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
 		cursorframe += renderdeltatics / 4;
 		for (; cursorframe > 7 * FRACUNIT; cursorframe -= 7 * FRACUNIT) {}
 
-		cursor = W_CachePatchName(va("K_BHILI%d", (cursorframe >> FRACBITS) + 1), PU_CACHE);
+		cursor = W_CachePatchName(va("K_BHILI%d", (cursorframe >> FRACBITS) + 1), PU_PATCH);
 
 		if (col < 0)
 			col += numskins;
@@ -10983,9 +10384,11 @@ static void M_DrawSetupMultiPlayerMenu(void)
 
 	// anim the player in the box
 	multi_tics -= renderdeltatics;
+
 	while (multi_tics <= 0)
 	{
 		st = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? S_KART_PAIN : multi_state->nextstate;
+
 		if (st != S_NULL)
 			multi_state = &states[st];
 
@@ -10996,44 +10399,31 @@ static void M_DrawSetupMultiPlayerMenu(void)
 	}
 
 	// skin 0 is default player sprite
-
 	switch (cv_skinselectmenu.value)
 	{
 		case SKINMENUTYPE_2D:
 			skintodisplay = setupm_fakeskin;
-			if (setupm_skinlockedselect) //show the skin we are trying to select
+			if (setupm_skinlockedselect) // show the skin we are trying to select
 				skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][setupm_skinselect];
 			else if (skinstatscount[setupm_skinxpos][setupm_skinypos] && itemOn == 1)
 				skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][(I_GetTime()/TICRATE)%SELECTEDSTATSCOUNT];
-
-			if (R_SkinAvailable(skins[skintodisplay].name) != -1)
-				sprdef = &skins[R_SkinAvailable(skins[skintodisplay].name)].spritedef;
-			else
-				sprdef = &skins[0].spritedef;
 			break;
 		case SKINMENUTYPE_EXTENDED:
-				skintodisplay = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
-			if (R_SkinAvailable(skins[skintodisplay].name) != -1)
-				sprdef = &skins[R_SkinAvailable(skins[skintodisplay].name)].spritedef;
-			else
-				sprdef = &skins[0].spritedef;
-			break;
 		case SKINMENUTYPE_GRID:
 			skintodisplay = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
-			if (R_SkinAvailable(skins[skintodisplay].name) != -1)
-				sprdef = &skins[R_SkinAvailable(skins[skintodisplay].name)].spritedef;
-			else
-				sprdef = &skins[0].spritedef;
 			break;
 		default:
 			skintodisplay = setupm_fakeskin;
-			if (R_SkinAvailable(skins[setupm_fakeskin].name) != -1)
-				sprdef = &skins[R_SkinAvailable(skins[setupm_fakeskin].name)].spritedef;
-			else
-				sprdef = &skins[0].spritedef;
 			break;
 	}
 
+	const INT32 skinnum = R_SkinAvailable(skins[skintodisplay].name);
+
+	if (skinnum != -1)
+		sprdef = &skins[skinnum].spritedef;
+	else
+		sprdef = &skins[0].spritedef;
+
 	if (!sprdef->numframes) // No frames ??
 		return; // Can't render!
 
@@ -11042,17 +10432,17 @@ static void M_DrawSetupMultiPlayerMenu(void)
 		frame = 0; // Try to use standing frame
 
 	sprframe = &sprdef->spriteframes[frame];
-	
+
 	//minenice's speen css, it's a piece of shit but hey
-	//patch = W_CachePatchNum(sprframe->lumppat[1], PU_CACHE);
+	//patch = W_CachePatchNum(sprframe->lumppat[1], PU_PATCH);
 	speenframe = (I_GetTime()*cv_skinselectspin.value/TICRATE + 1)%8;
 
 	//this is a very shitty solution for checking if a sprite needs flipping
 	//but it works
-	if ((sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]) && (speenframe > 4)) {
+	if ((sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]) && (speenframe > 4))
 		flags = V_FLIP; // This sprite is left/right flipped!
-	}
-	patch = W_CachePatchNum(sprframe->lumppat[speenframe], PU_CACHE);
+
+	patch = W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
 
 	// draw box around guy
 	V_DrawFill(mx + 36 - (charw/2), my+65, charw, 84, 239);
@@ -11078,10 +10468,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
 // Handle 1P/2P MP Setup
 static void M_HandleSetupMultiPlayer(INT32 choice)
 {
-	size_t   l;
-	boolean  exitmenu = false;  // exit to previous menu and send name change
+	boolean exitmenu = false;  // exit to previous menu and send name change
+	const boolean gridselect = (cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED); // menus with "grids"
 
-	if ((choice == gamecontrol[gc_fire][0] || choice == gamecontrol[gc_fire][1]) && itemOn == 2)
+	if ((choice == gamecontrol[0][gc_fire][0] || choice == gamecontrol[0][gc_fire][1]) && (itemOn == 2 || (gridselect && itemOn == 1 && choice != KEY_ENTER)))
 		choice = KEY_BACKSPACE; // Hack to allow resetting prefcolor on controllers
 
 #define BREAKWHENLOCKED {\
@@ -11106,19 +10496,21 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				S_StartSound(NULL,sfx_menu1); // Tails
 				break;
 			}
-			else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED) //grid skin select menu
+			else if (gridselect) //grid skin select menu
 			{
 				if (itemOn == 1) //if we are on the skin select menu
 				{
 					if (setupm_skinselect < ROUNDSKINSUPTO8 - SKINGRIDWIDTH) //if we arent at the bottom of the menu
 					{
 						setupm_skinselect += SKINGRIDWIDTH;
-						
-						if (cv_skinselectmenu.value == SKINMENUTYPE_GRID){
+
+						if (cv_skinselectmenu.value == SKINMENUTYPE_GRID)
+						{
 							if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT)
 								setupm_skinypos++;
 						}
-						else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED){
+						else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
+						{
 							if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8+24 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT+24)
 								setupm_skinypos++;
 						}
@@ -11160,13 +10552,14 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				S_StartSound(NULL,sfx_menu1); // Tails
 				break;
 			}
-			else if (cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
+			else if (gridselect)
 			{
 				if (itemOn == 1)
 				{
 					if (setupm_skinselect >= SKINGRIDWIDTH) //if we arent at the top of the menu
 					{
 						setupm_skinselect -= SKINGRIDWIDTH;
+
 						if (setupm_skinselect < ((setupm_skinypos+1)*SKINGRIDWIDTH) && setupm_skinypos > 0)
 							setupm_skinypos--;
 					}
@@ -11179,16 +10572,17 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				else if (itemOn == 2)
 				{
 					setupm_skinselect = numskins - 1;
-					if (cv_skinselectmenu.value == SKINMENUTYPE_GRID){
+					if (cv_skinselectmenu.value == SKINMENUTYPE_GRID)
+					{
 						setupm_skinypos = (((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)) > 0 ? ((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)) : 0);
 						M_PrevOpt();
 					}
-					else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED){
-							setupm_skinypos = (((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)-2) > 0 ? ((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)-2) : 0);
-							M_PrevOpt();
-						
+					else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
+					{
+						setupm_skinypos = (((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)-2) > 0 ? ((numskins / SKINGRIDWIDTH) - (SKINGRIDHEIGHT-1)-2) : 0);
+						M_PrevOpt();
 					}
-						
+
 				}
 				else
 					M_PrevOpt();
@@ -11200,7 +10594,12 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 			break;
 
 		case KEY_LEFTARROW:
-			if (cv_skinselectmenu.value == SKINMENUTYPE_2D && itemOn == 1)
+			if (itemOn == 0)
+			{
+				M_TextInputHandle(&setupm_input, choice);
+				S_StartSound(NULL,sfx_menu1); // Tails
+			}
+			else if (cv_skinselectmenu.value == SKINMENUTYPE_2D && itemOn == 1)
 			{
 				if (setupm_skinlockedselect)
 				{
@@ -11213,6 +10612,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				else       //player skin
 				{
 					S_StartSound(NULL,sfx_menu1); // Tails
+
 					if (setupm_skinxpos > 0)
 						setupm_skinxpos--;
 					else
@@ -11220,11 +10620,12 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				}
 				break;
 			}
-			else if ((cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED) && itemOn == 1)
+			else if (gridselect && itemOn == 1)
 			{
 				if (setupm_skinselect > 0)
 				{
 					setupm_skinselect--;
+
 					if (setupm_skinselect < ((setupm_skinypos+1)*SKINGRIDWIDTH) && setupm_skinypos > 0)
 						setupm_skinypos--;
 				}
@@ -11232,6 +10633,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				{
 					INT32 roundedskins = ROUNDSKINSUPTO8;
 					setupm_skinselect = roundedskins-1;
+
 					if (cv_skinselectmenu.value == SKINMENUTYPE_GRID)
 						setupm_skinypos = (((roundedskins/8) - SKINGRIDHEIGHT) > 0 ? (roundedskins/8) - SKINGRIDHEIGHT : 0);
 					else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
@@ -11249,11 +10651,17 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 			{
 				S_StartSound(NULL,sfx_menu1); // Tails
 				setupm_fakecolor--;
+				G_SetPlayerGamepadIndicatorColor(setupm_playernum, setupm_fakecolor);
 			}
 			break;
 
 		case KEY_RIGHTARROW:
-			if (cv_skinselectmenu.value == SKINMENUTYPE_2D && itemOn == 1)
+			if (itemOn == 0)
+			{
+				M_TextInputHandle(&setupm_input, choice);
+				S_StartSound(NULL,sfx_menu1); // Tails
+			}
+			else if (cv_skinselectmenu.value == SKINMENUTYPE_2D && itemOn == 1)
 			{
 				if (setupm_skinlockedselect)
 				{
@@ -11273,18 +10681,21 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				}
 				break;
 			}
-			else if ((cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED) && itemOn == 1)
+			else if (gridselect && itemOn == 1)
 			{
 				if (setupm_skinselect < ROUNDSKINSUPTO8 - 1)
 				{
 					setupm_skinselect++;
-					if (cv_skinselectmenu.value == SKINMENUTYPE_GRID){
+
+					if (cv_skinselectmenu.value == SKINMENUTYPE_GRID)
+					{
 						if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT)
 							setupm_skinypos++;
 					}
-					else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED){
+					else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
+					{
 						if (setupm_skinselect >= ((setupm_skinypos-1)+SKINGRIDHEIGHT)*8+24 && setupm_skinypos < (ROUNDSKINSUPTO8/8)-SKINGRIDHEIGHT+24)
-							setupm_skinypos++;							
+							setupm_skinypos++;
 					}
 				}
 				else
@@ -11304,6 +10715,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 			{
 				S_StartSound(NULL,sfx_menu1); // Tails
 				setupm_fakecolor++;
+				G_SetPlayerGamepadIndicatorColor(setupm_playernum, setupm_fakecolor);
 			}
 			break;
 
@@ -11321,13 +10733,10 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				BREAKWHENLOCKED
 			if (itemOn == 0)
 			{
-				if ((l = strlen(setupm_name))!=0)
-				{
-					S_StartSound(NULL,sfx_menu1); // Tails
-					setupm_name[l-1] =0;
-				}
+				M_TextInputHandle(&setupm_input, choice);
+				S_StartSound(NULL,sfx_menu1); // Tails
 			}
-			else if ((cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED) && itemOn == 1)
+			else if (gridselect && itemOn == 1)
 			{
 				// change sort for select menu (damn now i have to add another cvar...)
 				// now we have the cvar
@@ -11343,22 +10752,21 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 				{
 					S_StartSound(NULL,sfx_menu1); // Tails
 					setupm_fakecolor = col;
+					G_SetPlayerGamepadIndicatorColor(setupm_playernum, setupm_fakecolor);
 				}
 			}
 			break;
+
 		case KEY_DEL:
 			if (cv_skinselectmenu.value)
 				BREAKWHENLOCKED
-			if (itemOn == 0 && (l = strlen(setupm_name))!=0)
+			if (itemOn == 0)
 			{
+				M_TextInputHandle(&setupm_input, choice);
 				S_StartSound(NULL,sfx_menu1); // Tails
-				setupm_name[0] = 0;
 			}
 			break;
 
-		//c why?????
-		//case gamecontrol[gc_accelerate][0]:
-		//case gamecontrol[gc_accelerate][1]:
 		case KEY_ENTER:
 			if (cv_skinselectmenu.value == SKINMENUTYPE_2D)
 			{
@@ -11381,7 +10789,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 					S_StartSound(NULL,sfx_menu1);
 				}
 			}
-			else if ((cv_skinselectmenu.value == SKINMENUTYPE_GRID || cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED ) && itemOn == 1 && setupm_skinselect < numskins)
+			else if (gridselect && itemOn == 1 && setupm_skinselect < numskins)
 			{
 				setupm_fakeskin = skinsorted[setupm_skinselect];
 				S_StartSound(NULL, sfx_s221);
@@ -11389,17 +10797,10 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
 			break;
 
 		default:
-			if (choice < 32 || choice > 127)
-				break;
 			if (itemOn == 0)
 			{
-				l = strlen(setupm_name);
-				if (l < MAXPLAYERNAME)
-				{
+				if (M_TextInputHandle(&setupm_input, choice))
 					S_StartSound(NULL,sfx_menu1); // Tails
-					setupm_name[l] =(char)choice;
-					setupm_name[l+1] =0;
-				}
 			}
 			break;
 		}
@@ -11458,24 +10859,49 @@ default:\
 }
 
 // start the multiplayer setup menu
-static void M_SetupMultiPlayer(INT32 choice)
-{
-	(void)choice;
 
+static void M_DoSetupMultiPlayer(UINT8 pnum)
+{
 	multi_state = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? &states[S_KART_PAIN] : &states[mobjinfo[MT_PLAYER].seestate];
 	multi_tics = multi_state->tics*FRACUNIT;
-	strcpy(setupm_name, cv_playername.string);
 
-	// set for player 1
-	setupm_player = &players[consoleplayer];
-	setupm_cvskin = &cv_skin;
-	setupm_cvcolor = &cv_playercolor;
-	setupm_cvname = &cv_playername;
+	M_TextInputInit(&setupm_input, setupm_name, sizeof(setupm_name));
+	M_TextInputSetString(&setupm_input, cv_playername.string);
+
+	switch (pnum)
+	{
+		case 1:
+			setupm_player  = &players[displayplayers[pnum]];
+			setupm_cvskin  = &cv_skin2;
+			setupm_cvcolor = &cv_playercolor2;
+			setupm_cvname  = &cv_playername2;
+			break;
+		case 2:
+			setupm_player  = &players[displayplayers[pnum]];
+			setupm_cvskin  = &cv_skin3;
+			setupm_cvcolor = &cv_playercolor3;
+			setupm_cvname  = &cv_playername3;
+			break;
+		case 3:
+			setupm_player  = &players[displayplayers[pnum]];
+			setupm_cvskin  = &cv_skin4;
+			setupm_cvcolor = &cv_playercolor4;
+			setupm_cvname  = &cv_playername4;
+			break;
+		case 0:
+			setupm_player  = &players[consoleplayer];
+			setupm_cvskin  = &cv_skin;
+			setupm_cvcolor = &cv_playercolor;
+			setupm_cvname  = &cv_playername;
+			break;
+	}
 
 	setupm_skinxpos = 4;
 	setupm_skinypos = 0;
 	setupm_skinlockedselect = false;
 
+	setupm_playernum = pnum;
+
 	// For whatever reason this doesn't work right if you just use ->value
 	setupm_fakeskin = R_SkinAvailable(setupm_cvskin->string);
 	if (setupm_fakeskin == -1)
@@ -11483,10 +10909,20 @@ static void M_SetupMultiPlayer(INT32 choice)
 	setupm_fakecolor = setupm_cvcolor->value;
 
 	// disable skin changes if we can't actually change skins
-	if (!CanChangeSkin(consoleplayer))
-		MP_PlayerSetupMenu[2].status = (IT_GRAYEDOUT);
+	if (splitscreen && pnum > 0)
+	{
+		if (splitscreen && !CanChangeSkin(displayplayers[pnum]))
+			MP_PlayerSetupMenu[2].status = (IT_GRAYEDOUT);
+		else
+			MP_PlayerSetupMenu[2].status = (IT_KEYHANDLER | IT_STRING);
+	}
 	else
-		MP_PlayerSetupMenu[2].status = (IT_KEYHANDLER|IT_STRING);
+	{
+		if (!CanChangeSkin(consoleplayer))
+			MP_PlayerSetupMenu[2].status = (IT_GRAYEDOUT);
+		else
+			MP_PlayerSetupMenu[2].status = (IT_KEYHANDLER|IT_STRING);
+	}
 
 	//change the y offsets of the menu depending on cvar settings
 	SKINSELECTMENUEDIT
@@ -11496,6 +10932,7 @@ static void M_SetupMultiPlayer(INT32 choice)
 	MP_PlayerSetupDef.prevMenu = currentMenu;
 	M_SetupNextMenu(&MP_PlayerSetupDef);
 }
+<<<<<<< HEAD
 
 // start the multiplayer setup menu, for secondary player (splitscreen mode)
 static void M_SetupMultiPlayer2(INT32 choice)
@@ -11614,11 +11051,34 @@ static void M_SetupMultiPlayer4(INT32 choice)
 	M_SetupNextMenu(&MP_PlayerSetupDef);
 }
 
+=======
+>>>>>>> Saturn-Next
 #undef SKINSELECTMENUEDIT
 
+static void M_SetupMultiPlayer(void)
+{
+	M_DoSetupMultiPlayer(0);
+}
+
+static void M_SetupMultiPlayer2(void)
+{
+	M_DoSetupMultiPlayer(1);
+}
+
+static void M_SetupMultiPlayer3(void)
+{
+	M_DoSetupMultiPlayer(2);
+}
+
+static void M_SetupMultiPlayer4(void)
+{
+	M_DoSetupMultiPlayer(3);
+}
+
 static boolean M_QuitMultiPlayerMenu(void)
 {
 	size_t l;
+
 	// send name if changed
 	if (strcmp(setupm_name, setupm_cvname->string))
 	{
@@ -11628,9 +11088,11 @@ static boolean M_QuitMultiPlayerMenu(void)
 			setupm_name[l] =0;
 		COM_BufAddText (va("%s \"%s\"\n",setupm_cvname->name,setupm_name));
 	}
+
 	// you know what? always putting these in the buffer won't hurt anything.
 	COM_BufAddText (va("%s \"%s\"\n",setupm_cvskin->name,skins[setupm_fakeskin].name));
-	COM_BufAddText (va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor));	
+	COM_BufAddText (va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor));
+
 	return true;
 }
 
@@ -11651,14 +11113,16 @@ static void M_EraseDataResponse(INT32 ch)
 	if (erasecontext == 2)
 	{
 		// SRB2Kart: This actually needs to be done FIRST, so that you don't immediately regain playtime/matches secrets
-		totalplaytime = 0;
-		matchesplayed = 0;
+		K_EraseStats();
 		F_StartIntro();
 	}
+
 	if (erasecontext != 1)
 		G_ClearRecords();
+
 	if (erasecontext != 0)
 		M_ClearSecrets();
+
 	M_ClearMenus(true);
 }
 
@@ -11714,33 +11178,33 @@ static void M_DrawJoystick(void)
 		//M_DrawSaveLoadBorder(OP_JoystickSetDef.x, OP_JoystickSetDef.y+LINEHEIGHT*i);
 
 #ifdef JOYSTICK_HOTPLUG
-		if (atoi(cv_usejoystick4.string) > I_NumJoys())
-			compareval4 = atoi(cv_usejoystick4.string);
+		if (atoi(cv_usejoystick[3].string) > I_NumJoys())
+			compareval4 = atoi(cv_usejoystick[3].string);
 		else
-			compareval4 = cv_usejoystick4.value;
+			compareval4 = cv_usejoystick[3].value;
 
-		if (atoi(cv_usejoystick3.string) > I_NumJoys())
-			compareval3 = atoi(cv_usejoystick3.string);
+		if (atoi(cv_usejoystick[2].string) > I_NumJoys())
+			compareval3 = atoi(cv_usejoystick[2].string);
 		else
-			compareval3 = cv_usejoystick3.value;
+			compareval3 = cv_usejoystick[2].value;
 
-		if (atoi(cv_usejoystick2.string) > I_NumJoys())
-			compareval2 = atoi(cv_usejoystick2.string);
+		if (atoi(cv_usejoystick[1].string) > I_NumJoys())
+			compareval2 = atoi(cv_usejoystick[1].string);
 		else
-			compareval2 = cv_usejoystick2.value;
+			compareval2 = cv_usejoystick[1].value;
 
-		if (atoi(cv_usejoystick.string) > I_NumJoys())
-			compareval = atoi(cv_usejoystick.string);
+		if (atoi(cv_usejoystick[0].string) > I_NumJoys())
+			compareval = atoi(cv_usejoystick[0].string);
 		else
-			compareval = cv_usejoystick.value;
+			compareval = cv_usejoystick[0].value;
 #else
-		compareval4 = cv_usejoystick4.value;
-		compareval3 = cv_usejoystick3.value;
-		compareval2 = cv_usejoystick2.value;
-		compareval = cv_usejoystick.value;
+		compareval4 = cv_usejoystick[3].value;
+		compareval3 = cv_usejoystick[2].value;
+		compareval2 = cv_usejoystick[1].value;
+		compareval = cv_usejoystick[0].value;
 #endif
 
-		if ((setupcontrolplayer == 4 && (i == compareval4))
+		if    ((setupcontrolplayer == 4 && (i == compareval4))
 			|| (setupcontrolplayer == 3 && (i == compareval3))
 			|| (setupcontrolplayer == 2 && (i == compareval2))
 			|| (setupcontrolplayer == 1 && (i == compareval)))
@@ -11775,14 +11239,14 @@ void M_SetupJoystickMenu(INT32 choice)
 		//
 		// Update cv_usejoystick.string here so that the user can
 		// properly change this value.
-		if (i == cv_usejoystick.value)
-			CV_SetValue(&cv_usejoystick, i);
-		if (i == cv_usejoystick2.value)
-			CV_SetValue(&cv_usejoystick2, i);
-		if (i == cv_usejoystick3.value)
-			CV_SetValue(&cv_usejoystick3, i);
-		if (i == cv_usejoystick4.value)
-			CV_SetValue(&cv_usejoystick4, i);
+		if (i == cv_usejoystick[0].value)
+			CV_SetValue(&cv_usejoystick[0], i);
+		if (i == cv_usejoystick[1].value)
+			CV_SetValue(&cv_usejoystick[1], i);
+		if (i == cv_usejoystick[2].value)
+			CV_SetValue(&cv_usejoystick[2], i);
+		if (i == cv_usejoystick[3].value)
+			CV_SetValue(&cv_usejoystick[3], i);
 #endif
 	}
 
@@ -11817,141 +11281,76 @@ static void M_Setup4PJoystickMenu(INT32 choice)
 	M_SetupJoystickMenu(choice);
 }
 
+#ifdef JOYSTICK_HOTPLUG
+static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
+{
+	INT32 oldchoice, oldstringchoice;
+	const INT32 numjoys = I_NumJoys();
+
+	oldchoice = oldstringchoice = atoi(cv_usejoystick[pnum].string) > numjoys ? atoi(cv_usejoystick[pnum].string) : cv_usejoystick[pnum].value;
+	CV_SetValue(&cv_usejoystick[pnum], choice);
+
+	// Just in case last-minute changes were made to cv_usejoystick.value,
+	// update the string too
+	// But don't do this if we're intentionally setting higher than numjoys
+	if (choice <= numjoys)
+	{
+		CV_SetValue(&cv_usejoystick[pnum], cv_usejoystick[pnum].value);
+
+		if (oldchoice > numjoys)  /* reset this so the comparison is valid*/
+			oldchoice = cv_usejoystick[pnum].value;
+
+		if (oldchoice != choice)
+		{
+			if (choice && oldstringchoice > numjoys) // if we did not select "None", we likely selected a used device
+				CV_SetValue(&cv_usejoystick[pnum], (oldstringchoice > numjoys ? oldstringchoice : oldchoice));
+
+			if (oldstringchoice ==
+				(atoi(cv_usejoystick[pnum].string) > numjoys ? atoi(cv_usejoystick[pnum].string) : cv_usejoystick[pnum].value))
+				M_StartMessage("This joystick is used by another\n"
+				"player. Reset the joystick\n"
+				"for that player first.\n\n"
+				"(Press a key)\n", NULL, MM_NOTHING);
+		}
+	}
+}
+#endif
+
 static void M_AssignJoystick(INT32 choice)
 {
 #ifdef JOYSTICK_HOTPLUG
-	INT32 oldchoice, oldstringchoice;
-	INT32 numjoys = I_NumJoys();
-
-	if (setupcontrolplayer == 4)
+	switch (setupcontrolplayer)
 	{
-		oldchoice = oldstringchoice = atoi(cv_usejoystick4.string) > numjoys ? atoi(cv_usejoystick4.string) : cv_usejoystick4.value;
-		CV_SetValue(&cv_usejoystick4, choice);
-
-		// Just in case last-minute changes were made to cv_usejoystick.value,
-		// update the string too
-		// But don't do this if we're intentionally setting higher than numjoys
-		if (choice <= numjoys)
-		{
-			CV_SetValue(&cv_usejoystick4, cv_usejoystick4.value);
-
-			// reset this so the comparison is valid
-			if (oldchoice > numjoys)
-				oldchoice = cv_usejoystick4.value;
-
-			if (oldchoice != choice)
-			{
-				if (choice && oldstringchoice > numjoys) // if we did not select "None", we likely selected a used device
-					CV_SetValue(&cv_usejoystick4, (oldstringchoice > numjoys ? oldstringchoice : oldchoice));
-
-				if (oldstringchoice ==
-					(atoi(cv_usejoystick4.string) > numjoys ? atoi(cv_usejoystick4.string) : cv_usejoystick4.value))
-					M_StartMessage("This joystick is used by another\n"
-								   "player. Reset the joystick\n"
-								   "for that player first.\n\n"
-								   "(Press a key)\n", NULL, MM_NOTHING);
-			}
-		}
-	}
-	else if (setupcontrolplayer == 3)
-	{
-		oldchoice = oldstringchoice = atoi(cv_usejoystick3.string) > numjoys ? atoi(cv_usejoystick3.string) : cv_usejoystick3.value;
-		CV_SetValue(&cv_usejoystick3, choice);
-
-		// Just in case last-minute changes were made to cv_usejoystick.value,
-		// update the string too
-		// But don't do this if we're intentionally setting higher than numjoys
-		if (choice <= numjoys)
-		{
-			CV_SetValue(&cv_usejoystick3, cv_usejoystick3.value);
-
-			// reset this so the comparison is valid
-			if (oldchoice > numjoys)
-				oldchoice = cv_usejoystick3.value;
-
-			if (oldchoice != choice)
-			{
-				if (choice && oldstringchoice > numjoys) // if we did not select "None", we likely selected a used device
-					CV_SetValue(&cv_usejoystick3, (oldstringchoice > numjoys ? oldstringchoice : oldchoice));
-
-				if (oldstringchoice ==
-					(atoi(cv_usejoystick3.string) > numjoys ? atoi(cv_usejoystick3.string) : cv_usejoystick3.value))
-					M_StartMessage("This joystick is used by another\n"
-								   "player. Reset the joystick\n"
-								   "for that player first.\n\n"
-								   "(Press a key)\n", NULL, MM_NOTHING);
-			}
-		}
-	}
-	else if (setupcontrolplayer == 2)
-	{
-		oldchoice = oldstringchoice = atoi(cv_usejoystick2.string) > numjoys ? atoi(cv_usejoystick2.string) : cv_usejoystick2.value;
-		CV_SetValue(&cv_usejoystick2, choice);
-
-		// Just in case last-minute changes were made to cv_usejoystick.value,
-		// update the string too
-		// But don't do this if we're intentionally setting higher than numjoys
-		if (choice <= numjoys)
-		{
-			CV_SetValue(&cv_usejoystick2, cv_usejoystick2.value);
-
-			// reset this so the comparison is valid
-			if (oldchoice > numjoys)
-				oldchoice = cv_usejoystick2.value;
-
-			if (oldchoice != choice)
-			{
-				if (choice && oldstringchoice > numjoys) // if we did not select "None", we likely selected a used device
-					CV_SetValue(&cv_usejoystick2, (oldstringchoice > numjoys ? oldstringchoice : oldchoice));
-
-				if (oldstringchoice ==
-					(atoi(cv_usejoystick2.string) > numjoys ? atoi(cv_usejoystick2.string) : cv_usejoystick2.value))
-					M_StartMessage("This joystick is used by another\n"
-					               "player. Reset the joystick\n"
-					               "for that player first.\n\n"
-					               "(Press a key)\n", NULL, MM_NOTHING);
-			}
-		}
-	}
-	else if (setupcontrolplayer == 1)
-	{
-		oldchoice = oldstringchoice = atoi(cv_usejoystick.string) > numjoys ? atoi(cv_usejoystick.string) : cv_usejoystick.value;
-		CV_SetValue(&cv_usejoystick, choice);
-
-		// Just in case last-minute changes were made to cv_usejoystick.value,
-		// update the string too
-		// But don't do this if we're intentionally setting higher than numjoys
-		if (choice <= numjoys)
-		{
-			CV_SetValue(&cv_usejoystick, cv_usejoystick.value);
-
-			// reset this so the comparison is valid
-			if (oldchoice > numjoys)
-				oldchoice = cv_usejoystick.value;
-
-			if (oldchoice != choice)
-			{
-				if (choice && oldstringchoice > numjoys) // if we did not select "None", we likely selected a used device
-					CV_SetValue(&cv_usejoystick, (oldstringchoice > numjoys ? oldstringchoice : oldchoice));
-
-				if (oldstringchoice ==
-					(atoi(cv_usejoystick.string) > numjoys ? atoi(cv_usejoystick.string) : cv_usejoystick.value))
-					M_StartMessage("This joystick is used by another\n"
-					               "player. Reset the joystick\n"
-					               "for that player first.\n\n"
-					               "(Press a key)\n", NULL, MM_NOTHING);
-			}
-		}
+		case 4:
+			M_DoAssignJoystick(3, choice);
+			break;
+		case 3:
+			M_DoAssignJoystick(2, choice);
+			break;
+		case 2:
+			M_DoAssignJoystick(1, choice);
+			break;
+		case 1:
+			M_DoAssignJoystick(0, choice);
+			break;
 	}
 #else
-	if (setupcontrolplayer == 4)
-		CV_SetValue(&cv_usejoystick4, choice);
-	else if (setupcontrolplayer == 3)
-		CV_SetValue(&cv_usejoystick3, choice);
-	else if (setupcontrolplayer == 2)
-		CV_SetValue(&cv_usejoystick2, choice);
-	else if (setupcontrolplayer == 1)
-		CV_SetValue(&cv_usejoystick, choice);
+
+	switch (setupcontrolplayer)
+	{
+		case 4:
+			CV_SetValue(&cv_usejoystick[3], choice);
+			break;
+		case 3:
+			CV_SetValue(&cv_usejoystick[2], choice);
+			break;
+		case 2:
+			CV_SetValue(&cv_usejoystick[1], choice);
+			break;
+		case 1:
+			CV_SetValue(&cv_usejoystick[0], choice);
+			break;
+	}
 #endif
 }
 
@@ -11959,132 +11358,75 @@ static void M_AssignJoystick(INT32 choice)
 // CONTROLS MENU
 // =============
 
-static void M_Setup1PControlsMenu(INT32 choice)
+static void M_SetupControlsMenu(UINT8 pnum)
 {
-	(void)choice;
-	setupcontrolplayer = 1;
-	setupcontrols = gamecontrol;        // was called from main Options (for console player, then)
+	setupcontrolplayer = pnum+1;
+	setupcontrols = gamecontrol[pnum];        // was called from main Options (for console player, then)
 	currentMenu->lastOn = itemOn;
 
 	// Set proper gamepad options
-	OP_AllControlsMenu[0].itemaction = &OP_Joystick1Def;
+	switch (pnum)
+	{
+		case 1:
+			OP_AllControlsMenu[0].itemaction = &OP_Joystick2Def;
+			break;
+		case 2:
+			OP_AllControlsMenu[0].itemaction = &OP_Joystick3Def;
+			break;
+		case 3:
+			OP_AllControlsMenu[0].itemaction = &OP_Joystick4Def;
+			break;
+		case 0:
+			OP_AllControlsMenu[0].itemaction = &OP_Joystick1Def;
+			break;
+	}
 
-	// Unhide P1-only controls
-	OP_AllControlsMenu[15].status = IT_CONTROL; // Chat
-	//OP_AllControlsMenu[16].status = IT_CONTROL; // Team-chat
-	OP_AllControlsMenu[16].status = IT_CONTROL; // Rankings
-	//OP_AllControlsMenu[17].status = IT_CONTROL; // Viewpoint
-	// 18 is Reset Camera, 19 is Toggle Chasecam
-	OP_AllControlsMenu[20].status = IT_CONTROL; // Pause
-	OP_AllControlsMenu[21].status = IT_CONTROL; // Screenshot
-	OP_AllControlsMenu[22].status = IT_CONTROL; // GIF
-	OP_AllControlsMenu[23].status = IT_CONTROL; // System Menu
-	OP_AllControlsMenu[24].status = IT_CONTROL; // Console
-	/*OP_AllControlsMenu[25].status = IT_HEADER; // Spectator Controls header
-	OP_AllControlsMenu[26].status = IT_SPACE; // Spectator Controls space
-	OP_AllControlsMenu[27].status = IT_CONTROL; // Spectate
-	OP_AllControlsMenu[28].status = IT_CONTROL; // Look Up
-	OP_AllControlsMenu[29].status = IT_CONTROL; // Look Down
-	OP_AllControlsMenu[30].status = IT_CONTROL; // Center View
-	*/
+	if (pnum > 0)
+	{
+		// Hide P1-only controls
+		OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
+		OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
+		OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Pause
+		OP_AllControlsMenu[18].status = IT_GRAYEDOUT2; // Screenshot
+		OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // GIF
+		OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // System Menu
+		OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Console
+		OP_AllControlsMenu[37].status = IT_GRAYEDOUT2; // Director
+	}
+	else
+	{
+		// Unhide P1-only controls
+		OP_AllControlsMenu[15].status = IT_CONTROL; // Chat
+		OP_AllControlsMenu[16].status = IT_CONTROL; // Rankings
+		OP_AllControlsMenu[17].status = IT_CONTROL; // Pause
+		OP_AllControlsMenu[18].status = IT_CONTROL; // Screenshot
+		OP_AllControlsMenu[19].status = IT_CONTROL; // GIF
+		OP_AllControlsMenu[20].status = IT_CONTROL; // System Menu
+		OP_AllControlsMenu[21].status = IT_CONTROL; // Console
+		OP_AllControlsMenu[37].status = IT_CONTROL; // Director
+	}
 
 	M_SetupNextMenu(&OP_AllControlsDef);
 }
 
-static void M_Setup2PControlsMenu(INT32 choice)
+static void M_Setup1PControlsMenu(void)
 {
-	(void)choice;
-	setupcontrolplayer = 2;
-	setupcontrols = gamecontrolbis;
-	currentMenu->lastOn = itemOn;
-
-	// Set proper gamepad options
-	OP_AllControlsMenu[0].itemaction = &OP_Joystick2Def;
-
-	// Hide P1-only controls
-	OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
-	//OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Team-chat
-	OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
-	//OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Viewpoint
-	// 18 is Reset Camera, 19 is Toggle Chasecam
-	OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
-	OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
-	OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
-	OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
-	OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
-	/*OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Spectator Controls header
-	OP_AllControlsMenu[26].status = IT_GRAYEDOUT2; // Spectator Controls space
-	OP_AllControlsMenu[27].status = IT_GRAYEDOUT2; // Spectate
-	OP_AllControlsMenu[28].status = IT_GRAYEDOUT2; // Look Up
-	OP_AllControlsMenu[29].status = IT_GRAYEDOUT2; // Look Down
-	OP_AllControlsMenu[30].status = IT_GRAYEDOUT2; // Center View
-	*/
-
-	M_SetupNextMenu(&OP_AllControlsDef);
+	M_SetupControlsMenu(0);
 }
 
-static void M_Setup3PControlsMenu(INT32 choice)
+static void M_Setup2PControlsMenu(void)
 {
-	(void)choice;
-	setupcontrolplayer = 3;
-	setupcontrols = gamecontrol3;
-	currentMenu->lastOn = itemOn;
-
-	// Set proper gamepad options
-	OP_AllControlsMenu[0].itemaction = &OP_Joystick3Def;
-
-	// Hide P1-only controls
-	OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
-	//OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Team-chat
-	OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
-	//OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Viewpoint
-	// 18 is Reset Camera, 19 is Toggle Chasecam
-	OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
-	OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
-	OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
-	OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
-	OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
-	/*OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Spectator Controls header
-	OP_AllControlsMenu[26].status = IT_GRAYEDOUT2; // Spectator Controls space
-	OP_AllControlsMenu[27].status = IT_GRAYEDOUT2; // Spectate
-	OP_AllControlsMenu[28].status = IT_GRAYEDOUT2; // Look Up
-	OP_AllControlsMenu[29].status = IT_GRAYEDOUT2; // Look Down
-	OP_AllControlsMenu[30].status = IT_GRAYEDOUT2; // Center View
-	*/
-
-	M_SetupNextMenu(&OP_AllControlsDef);
+	M_SetupControlsMenu(1);
 }
 
-static void M_Setup4PControlsMenu(INT32 choice)
+static void M_Setup3PControlsMenu(void)
 {
-	(void)choice;
-	setupcontrolplayer = 4;
-	setupcontrols = gamecontrol4;
-	currentMenu->lastOn = itemOn;
+	M_SetupControlsMenu(2);
+}
 
-	// Set proper gamepad options
-	OP_AllControlsMenu[0].itemaction = &OP_Joystick4Def;
-
-	// Hide P1-only controls
-	OP_AllControlsMenu[15].status = IT_GRAYEDOUT2; // Chat
-	//OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Team-chat
-	OP_AllControlsMenu[16].status = IT_GRAYEDOUT2; // Rankings
-	//OP_AllControlsMenu[17].status = IT_GRAYEDOUT2; // Viewpoint
-	// 18 is Reset Camera, 19 is Toggle Chasecam
-	OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Pause
-	OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Screenshot
-	OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // GIF
-	OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // System Menu
-	OP_AllControlsMenu[24].status = IT_GRAYEDOUT2; // Console
-	/*OP_AllControlsMenu[25].status = IT_GRAYEDOUT2; // Spectator Controls header
-	OP_AllControlsMenu[26].status = IT_GRAYEDOUT2; // Spectator Controls space
-	OP_AllControlsMenu[27].status = IT_GRAYEDOUT2; // Spectate
-	OP_AllControlsMenu[28].status = IT_GRAYEDOUT2; // Look Up
-	OP_AllControlsMenu[29].status = IT_GRAYEDOUT2; // Look Down
-	OP_AllControlsMenu[30].status = IT_GRAYEDOUT2; // Center View
-	*/
-
-	M_SetupNextMenu(&OP_AllControlsDef);
+static void M_Setup4PControlsMenu(void)
+{
+	M_SetupControlsMenu(3);
 }
 
 #define controlheight 18
@@ -12100,11 +11442,6 @@ static void M_DrawControl(void)
 	x = currentMenu->x;
 	y = currentMenu->y;
 
-	/*i = itemOn - (controlheight/2);
-	if (i < 0)
-		i = 0;
-	*/
-
 	iter = (controlheight/2);
 	for (i = itemOn; ((iter || currentMenu->menuitems[i].status == IT_GRAYEDOUT2) && i > 0); i--)
 	{
@@ -12131,16 +11468,6 @@ static void M_DrawControl(void)
 		}
 	}
 
-	/*max = i + controlheight;
-	if (max > currentMenu->numitems)
-	{
-		max = currentMenu->numitems;
-		if (max < controlheight)
-			i = 0;
-		else
-			i = max - controlheight;
-	}*/
-
 	// draw title (or big pic)
 	M_DrawMenuTitle();
 
@@ -12165,7 +11492,7 @@ static void M_DrawControl(void)
 
 		if (currentMenu->menuitems[i].status == IT_CONTROL)
 		{
-			V_DrawString(x, y, ((i == itemOn) ? highlightflags : 0), currentMenu->menuitems[i].text);
+			V_DrawString(x, y, ((i == itemOn) ? highlightflags|V_ALLOWLOWERCASE : V_ALLOWLOWERCASE), currentMenu->menuitems[i].text);
 			keys[0] = setupcontrols[currentMenu->menuitems[i].alphaKey][0];
 			keys[1] = setupcontrols[currentMenu->menuitems[i].alphaKey][1];
 
@@ -12186,20 +11513,18 @@ static void M_DrawControl(void)
 					strcat (tmp, G_KeynumToString (keys[1]));
 
 			}
-			V_DrawRightAlignedString(BASEVIDWIDTH-currentMenu->x, y, highlightflags, tmp);
+			V_DrawRightAlignedString(BASEVIDWIDTH-currentMenu->x, y, highlightflags|V_ALLOWLOWERCASE, tmp);
 		}
-		/*else if (currentMenu->menuitems[i].status == IT_GRAYEDOUT2)
-			V_DrawString(x, y, V_TRANSLUCENT, currentMenu->menuitems[i].text);*/
 		else if ((currentMenu->menuitems[i].status == IT_HEADER) && (i != max-1))
-			V_DrawString(19, y+6, highlightflags, currentMenu->menuitems[i].text);
+			V_DrawString(19, y+6, highlightflags|V_ALLOWLOWERCASE, currentMenu->menuitems[i].text);
 		else if (currentMenu->menuitems[i].status & IT_STRING)
-			V_DrawString(x, y, ((i == itemOn) ? highlightflags : 0), currentMenu->menuitems[i].text);
+			V_DrawString(x, y, ((i == itemOn) ? highlightflags|V_ALLOWLOWERCASE : V_ALLOWLOWERCASE), currentMenu->menuitems[i].text);
 
 		y += SMALLLINEHEIGHT;
 	}
 
 	V_DrawScaledPatch(currentMenu->x - 20, cursory, 0,
-		W_CachePatchName("M_CURSOR", PU_CACHE));
+		W_CachePatchName("M_CURSOR", PU_PATCH));
 }
 
 #undef controlheight
@@ -12222,7 +11547,6 @@ static void M_ChangecontrolResponse(event_t *ev)
 		{
 			// ignore mouse/joy movements, just get buttons
 			case ev_mouse:
-			case ev_mouse2:
 			case ev_joystick:
 			case ev_joystick2:
 			case ev_joystick3:
@@ -12255,8 +11579,6 @@ static void M_ChangecontrolResponse(event_t *ev)
 				setupcontrols[control][found] = ch-KEY_MOUSE1+KEY_DBLMOUSE1;
 			else if (ch >= KEY_JOY1 && ch <= KEY_JOY1+JOYBUTTONS)
 				setupcontrols[control][found] = ch-KEY_JOY1+KEY_DBLJOY1;
-			else if (ch >= KEY_2MOUSE1 && ch <= KEY_2MOUSE1+MOUSEBUTTONS)
-				setupcontrols[control][found] = ch-KEY_2MOUSE1+KEY_DBL2MOUSE1;
 			else if (ch >= KEY_2JOY1 && ch <= KEY_2JOY1+JOYBUTTONS)
 				setupcontrols[control][found] = ch-KEY_2JOY1+KEY_DBL2JOY1;
 			else if (ch >= KEY_3JOY1 && ch <= KEY_3JOY1+JOYBUTTONS)
@@ -12334,17 +11656,17 @@ static void M_ResetControlsResponse(INT32 ch)
 		switch (setupcontrolplayer)
 		{
 			case 4:
-				G_ClearControlKeys(gamecontrol4, i);
+				G_ClearControlKeys(gamecontrol[3], i);
 				break;
 			case 3:
-				G_ClearControlKeys(gamecontrol3, i);
+				G_ClearControlKeys(gamecontrol[2], i);
 				break;
 			case 2:
-				G_ClearControlKeys(gamecontrolbis, i);
+				G_ClearControlKeys(gamecontrol[1], i);
 				break;
 			case 1:
 			default:
-				G_ClearControlKeys(gamecontrol, i);
+				G_ClearControlKeys(gamecontrol[0], i);
 				break;
 		}
 	}
@@ -12353,55 +11675,26 @@ static void M_ResetControlsResponse(INT32 ch)
 	G_Controldefault(setupcontrolplayer);
 
 	// Setup gamepad option defaults (yucky)
-	switch (setupcontrolplayer)
+	for (UINT8 j = 0; j < MAXSPLITSCREENPLAYERS; j++)
 	{
-		case 4:
-			CV_StealthSet(&cv_usejoystick4, cv_usejoystick4.defaultvalue);
-			CV_StealthSet(&cv_turnaxis4, cv_turnaxis4.defaultvalue);
-			CV_StealthSet(&cv_moveaxis4, cv_moveaxis4.defaultvalue);
-			CV_StealthSet(&cv_brakeaxis4, cv_brakeaxis4.defaultvalue);
-			CV_StealthSet(&cv_aimaxis4, cv_aimaxis4.defaultvalue);
-			CV_StealthSet(&cv_lookaxis4, cv_lookaxis4.defaultvalue);
-			CV_StealthSet(&cv_fireaxis4, cv_fireaxis4.defaultvalue);
-			CV_StealthSet(&cv_driftaxis4, cv_driftaxis4.defaultvalue);
-			CV_StealthSet(&cv_lookbackaxis4, cv_lookbackaxis4.defaultvalue);
-			break;
-		case 3:
-			CV_StealthSet(&cv_usejoystick3, cv_usejoystick3.defaultvalue);
-			CV_StealthSet(&cv_turnaxis3, cv_turnaxis3.defaultvalue);
-			CV_StealthSet(&cv_moveaxis3, cv_moveaxis3.defaultvalue);
-			CV_StealthSet(&cv_brakeaxis3, cv_brakeaxis3.defaultvalue);
-			CV_StealthSet(&cv_aimaxis3, cv_aimaxis3.defaultvalue);
-			CV_StealthSet(&cv_lookaxis3, cv_lookaxis3.defaultvalue);
-			CV_StealthSet(&cv_fireaxis3, cv_fireaxis3.defaultvalue);
-			CV_StealthSet(&cv_driftaxis3, cv_driftaxis3.defaultvalue);
-			CV_StealthSet(&cv_lookbackaxis3, cv_lookbackaxis3.defaultvalue);
-			break;
-		case 2:
-			CV_StealthSet(&cv_usejoystick2, cv_usejoystick2.defaultvalue);
-			CV_StealthSet(&cv_turnaxis2, cv_turnaxis2.defaultvalue);
-			CV_StealthSet(&cv_moveaxis2, cv_moveaxis2.defaultvalue);
-			CV_StealthSet(&cv_brakeaxis2, cv_brakeaxis2.defaultvalue);
-			CV_StealthSet(&cv_aimaxis2, cv_aimaxis2.defaultvalue);
-			CV_StealthSet(&cv_lookaxis2, cv_lookaxis2.defaultvalue);
-			CV_StealthSet(&cv_fireaxis2, cv_fireaxis2.defaultvalue);
-			CV_StealthSet(&cv_driftaxis2, cv_driftaxis2.defaultvalue);
-			CV_StealthSet(&cv_lookbackaxis2, cv_lookbackaxis2.defaultvalue);
-			break;
-		case 1:
-		default:
-			CV_StealthSet(&cv_usejoystick, cv_usejoystick.defaultvalue);
-			CV_StealthSet(&cv_turnaxis, cv_turnaxis.defaultvalue);
-			CV_StealthSet(&cv_moveaxis, cv_moveaxis.defaultvalue);
-			CV_StealthSet(&cv_brakeaxis, cv_brakeaxis.defaultvalue);
-			CV_StealthSet(&cv_aimaxis, cv_aimaxis.defaultvalue);
-			CV_StealthSet(&cv_lookaxis, cv_lookaxis.defaultvalue);
-			CV_StealthSet(&cv_fireaxis, cv_fireaxis.defaultvalue);
-			CV_StealthSet(&cv_driftaxis, cv_driftaxis.defaultvalue);
-			CV_StealthSet(&cv_lookbackaxis, cv_lookbackaxis.defaultvalue);
-			break;
-	}
+		if (setupcontrolplayer != j)
+			continue;
 
+		CV_StealthSet(&cv_usejoystick[j],	cv_usejoystick[j].defaultvalue);
+		CV_StealthSet(&cv_turnaxis[j],		cv_turnaxis[j].defaultvalue);
+		CV_StealthSet(&cv_camturnaxis[j],	cv_camturnaxis[j].defaultvalue);
+		CV_StealthSet(&cv_camstrafeaxis[j],	cv_camstrafeaxis[j].defaultvalue);
+		CV_StealthSet(&cv_moveaxis[j],		cv_moveaxis[j].defaultvalue);
+		CV_StealthSet(&cv_brakeaxis[j],		cv_brakeaxis[j].defaultvalue);
+		CV_StealthSet(&cv_aimaxis[j],		cv_aimaxis[j].defaultvalue);
+		CV_StealthSet(&cv_lookaxis[j],		cv_lookaxis[j].defaultvalue);
+		CV_StealthSet(&cv_fireaxis[j],		cv_fireaxis[j].defaultvalue);
+		CV_StealthSet(&cv_driftaxis[j],		cv_driftaxis[j].defaultvalue);
+		CV_StealthSet(&cv_lookbackaxis[j],	cv_lookbackaxis[j].defaultvalue);
+		CV_StealthSet(&cv_custom1axis[j],	cv_custom1axis[j].defaultvalue);
+		CV_StealthSet(&cv_custom2axis[j],	cv_custom2axis[j].defaultvalue);
+		CV_StealthSet(&cv_custom3axis[j],	cv_custom3axis[j].defaultvalue);
+	}
 	S_StartSound(NULL, sfx_s224);
 }
 
@@ -12411,15 +11704,6 @@ static void M_ResetControls(INT32 choice)
 	M_StartMessage(va(M_GetText("Reset Player %d's controls to defaults?\n\n(Press 'Y' to confirm)\n"), setupcontrolplayer), M_ResetControlsResponse, MM_YESNO);
 }
 
-// =====
-// SOUND
-// =====
-
-/*static void M_RestartAudio(void)
-{
-	COM_ImmedExecute("restartaudio");
-}*/
-
 // ===============
 // VIDEO MODE MENU
 // ===============
@@ -12505,11 +11789,9 @@ static void M_VideoModeMenu(INT32 choice)
 static void M_DrawVideoMenu(void)
 {
 	M_DrawGenericMenu();
-	
-	INT32 lowercase = !cv_menucaps.value ? V_ALLOWLOWERCASE : 0;
 
 	V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + OP_VideoOptionsMenu[0].alphaKey,
-		(SCR_IsAspectCorrect(vid.width, vid.height) ? recommendedflags : highlightflags)|lowercase,
+		(SCR_IsAspectCorrect(vid.width, vid.height) ? recommendedflags : highlightflags)|MENUCAPS,
 			va("%dx%d", vid.width, vid.height));
 }
 
@@ -12574,8 +11856,9 @@ static void M_DrawLocalSkinMenu(void)
 	spriteframe_t *sprframe;
 	patch_t *patch;
 	UINT8 frame;
-	UINT8 skintodisplay;
+	INT16 skintodisplay;
 	UINT32 speenframe;
+	skin_t displayskin;
 
 	mx = OP_ForkedBirdDef.x;
 	my = OP_ForkedBirdDef.y;
@@ -12583,13 +11866,15 @@ static void M_DrawLocalSkinMenu(void)
 	// use generic drawer for cursor, items and title
 	M_DrawGenericMenu();
 
-	#define charw 72
+#define charw 72
 
 	// anim the player in the box
 	multi_tics -= renderdeltatics;
+
 	while (multi_tics <= 0)
 	{
 		st = cv_skinselectspin.value == SKINSELECTSPIN_PAIN ? S_KART_PAIN : multi_state->nextstate;
+
 		if (st != S_NULL)
 			multi_state = &states[st];
 
@@ -12598,26 +11883,25 @@ static void M_DrawLocalSkinMenu(void)
 		else
 			multi_tics += multi_state->tics * FRACUNIT;
 	}
-	
+
 	// skin 0 is default player sprite
-	if (R_AnySkinAvailable(cv_fakelocalskin.string) != -1)
+	skintodisplay = R_AnySkinAvailable(cv_fakelocalskin.string);
+
+	if (skintodisplay == -1)
 	{
-		sprdef = &allskins[R_AnySkinAvailable(cv_fakelocalskin.string)].spritedef;
-		skintodisplay = R_AnySkinAvailable(cv_fakelocalskin.string);
-	}
-	else
-	{
-		// ATTEMPT TO FIND REAL SKIN	
-		if (R_AnySkinAvailable(cv_skin.string) != -1)
+		// ATTEMPT TO FIND REAL SKIN
+		skintodisplay = R_AnySkinAvailable(cv_skin.string);
+
+		if (skintodisplay == -1) // STILL NOTHIN? use sonic instead
 		{
-			sprdef = &allskins[R_AnySkinAvailable(cv_skin.string)].spritedef;
-			skintodisplay = R_AnySkinAvailable(cv_skin.string);
-		} else { // STILL NOTHIN? use sonic instead
-			sprdef = &allskins[0].spritedef;
 			skintodisplay = 0;
 		}
 	}
 
+	displayskin = allskins[skintodisplay];
+
+	sprdef = &displayskin.spritedef;
+
 	if (!sprdef->numframes) // No frames ??
 		return; // Can't render!
 
@@ -12628,36 +11912,36 @@ static void M_DrawLocalSkinMenu(void)
 	sprframe = &sprdef->spriteframes[frame];
 
 	//minenice's speen css, it's a piece of shit but hey
-	//patch = W_CachePatchNum(sprframe->lumppat[1], PU_CACHE);
+	//patch = W_CachePatchNum(sprframe->lumppat[1], PU_PATCH);
 	speenframe = (I_GetTime()*cv_skinselectspin.value/TICRATE + 1)%8;
 
 	//this is a very shitty solution for checking if a sprite needs flipping
 	//but it works
-	if ((sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]) && (speenframe > 4)) {
+	if ((sprframe->lumppat[speenframe] == sprframe->lumppat[8-speenframe]) && (speenframe > 4))
+	{
 		flags = V_FLIP; // This sprite is left/right flipped!
 	}
-	patch = W_CachePatchNum(sprframe->lumppat[speenframe], PU_CACHE);
+	patch = W_CachePatchNum(sprframe->lumppat[speenframe], PU_PATCH);
 
 	// draw box around guy
 	V_DrawFill(mx + 220 - (charw/2), my+54, charw, 84, 239);
 
 	// draw player sprite
-	UINT8 *colormap = R_GetTranslationColormap(skintodisplay, cv_playercolor.value, GTC_MENUCACHE);
-	colormap = R_GetLocalTranslationColormap(&skins[allskins[skintodisplay].localnum], (allskins[skintodisplay].localskin ? &localskins[allskins[skintodisplay].localnum] : NULL), cv_playercolor.value, GTC_MENUCACHE, allskins[skintodisplay].localskin);
+	UINT8 *colormap = R_GetLocalTranslationColormap(&skins[displayskin.localnum], (displayskin.localskin ? &localskins[displayskin.localnum] : NULL), cv_playercolor.value, GTC_MENUCACHE, displayskin.localskin);
 
-	V_DrawMappedPatch(mx, my+50, 0, W_CachePatchName(allskins[skintodisplay].facewant, PU_CACHE), colormap);
-	V_DrawMappedPatch(mx+8, my+85, 0, W_CachePatchName(allskins[skintodisplay].facerank, PU_CACHE), colormap);
+	V_DrawMappedPatch(mx, my+50, 0, W_CachePatchName(displayskin.facewant, PU_PATCH), colormap);
+	V_DrawMappedPatch(mx+8, my+85, 0, W_CachePatchName(displayskin.facerank, PU_PATCH), colormap);
 	V_DrawString(mx, my+108, V_ALLOWLOWERCASE, "Character");
-	if (strlen(allskins[skintodisplay].realname) > 10)
-		V_DrawThinString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, allskins[skintodisplay].realname);
+	if (strlen(displayskin.realname) > 10)
+		V_DrawThinString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, displayskin.realname);
 	else
-		V_DrawString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, allskins[skintodisplay].realname);
+		V_DrawString(mx+20, my+118, V_ALLOWLOWERCASE|highlightflags, displayskin.realname);
 
-	if (allskins[skintodisplay].flags & SF_HIRES)
+	if (displayskin.flags & SF_HIRES)
 	{
 		V_DrawFixedPatch((mx+220)<<FRACBITS,
 					(my+120)<<FRACBITS,
-			allskins[skintodisplay].highresscale,
+			displayskin.highresscale,
 			flags, patch, colormap);
 	}
 	else
@@ -12674,17 +11958,17 @@ static void M_DrawVideoMode(void)
 	M_DrawMenuTitle();
 
 	V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y,
-		highlightflags, "Choose mode, reselect to change default");
+		highlightflags|MENUCAPS, "Choose mode, reselect to change default");
 
 	row = 41;
 	col = OP_VideoModeDef.y + 14;
 	for (i = 0; i < vidm_nummodes; i++)
 	{
 		if (i == vidm_selected)
-			V_DrawString(row, col, highlightflags, modedescs[i].desc);
+			V_DrawString(row, col, highlightflags|MENUCAPS, modedescs[i].desc);
 		// Show multiples of 320x200 as green.
 		else
-			V_DrawString(row, col, (modedescs[i].goodratio) ? recommendedflags : 0, modedescs[i].desc);
+			V_DrawString(row, col, ((modedescs[i].goodratio) ? recommendedflags : 0)|MENUCAPS, modedescs[i].desc);
 
 		col += 8;
 		if ((i % vidm_column_size) == (vidm_column_size-1))
@@ -12722,11 +12006,11 @@ static void M_DrawVideoMode(void)
 				cv_scr_width.value, cv_scr_height.value));
 
 		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 138,
-			recommendedflags, "Marked modes are recommended.");
+			recommendedflags|MENUCAPS, "Marked modes are recommended.");
 		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 146,
-			highlightflags, "Other modes may have visual errors.");
+			highlightflags|MENUCAPS, "Other modes may have visual errors.");
 		V_DrawCenteredString(BASEVIDWIDTH/2, OP_VideoModeDef.y + 158,
-			highlightflags, "Larger modes may have performance issues.");
+			highlightflags|MENUCAPS, "Larger modes may have performance issues.");
 	}
 
 	// Draw the cursor for the VidMode menu
@@ -12734,7 +12018,7 @@ static void M_DrawVideoMode(void)
 	j = OP_VideoModeDef.y + 14 + ((vidm_selected % vidm_column_size)*8);
 
 	V_DrawScaledPatch(i - 8, j, 0,
-		W_CachePatchName("M_CURSOR", PU_CACHE));
+		W_CachePatchName("M_CURSOR", PU_PATCH));
 }
 
 // Just M_DrawGenericScrollMenu but showing a backing behind the headers.
@@ -12794,9 +12078,9 @@ static void M_DrawColorMenu(void)
 			case IT_STRING:
 			case IT_WHITESTRING:
 				if (i != itemOn && (currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING)
-					V_DrawString(x, y, 0, currentMenu->menuitems[i].text);
+					V_DrawString(x, y, MENUCAPS, currentMenu->menuitems[i].text);
 				else
-					V_DrawString(x, y, V_YELLOWMAP, currentMenu->menuitems[i].text);
+					V_DrawString(x, y, V_YELLOWMAP|MENUCAPS, currentMenu->menuitems[i].text);
 
 				// Cvar specific handling
 				switch (currentMenu->menuitems[i].status & IT_TYPE)
@@ -12814,10 +12098,12 @@ static void M_DrawColorMenu(void)
 								if (y + 12 > (currentMenu->y + 2*scrollareaheight))
 									break;
 								M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1);
-								V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
-								if (skullAnimCounter < 4 && i == itemOn)
-									V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12,
-										'_' | 0x80, false);
+
+								if (itemOn == i)
+									M_DrawTextInput(x + 8, y + 12, &menuinput, 0);
+								else
+									V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, cv->string);
+
 								y += 16;
 								break;
 							default:
@@ -12829,23 +12115,20 @@ static void M_DrawColorMenu(void)
 					}
 					break;
 			case IT_TRANSTEXT:
-				V_DrawString(x, y, V_TRANSLUCENT, currentMenu->menuitems[i].text);
+				V_DrawString(x, y, V_TRANSLUCENT|MENUCAPS, currentMenu->menuitems[i].text);
 				break;
 			case IT_QUESTIONMARKS:
-				V_DrawString(x, y, V_TRANSLUCENT|V_OLDSPACING, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
+				V_DrawString(x, y, V_TRANSLUCENT|V_OLDSPACING|MENUCAPS, M_CreateSecretMenuOption(currentMenu->menuitems[i].text));
 				break;
 			case IT_HEADERTEXT:
-				V_DrawString(x-16, y, V_YELLOWMAP, currentMenu->menuitems[i].text);
-				//V_DrawFill(19, y, 281, 9, currentMenu->menuitems[i+1].alphaKey);
-				//V_DrawFill(300, y, 1, 9, 26);
-				//M_DrawLevelPlatterHeader(y - (lsheadingheight - 12), currentMenu->menuitems[i].text, false);
+				V_DrawString(x-16, y, V_YELLOWMAP|MENUCAPS, currentMenu->menuitems[i].text);
 				break;
 		}
 	}
 
 	// DRAW THE SKULL CURSOR
 	V_DrawScaledPatch(currentMenu->x - 24, cursory, 0,
-		W_CachePatchName("M_CURSOR", PU_CACHE));
+		W_CachePatchName("M_CURSOR", PU_PATCH));
 }
 
 
@@ -13006,14 +12289,14 @@ static void M_DrawMonitorToggles(void)
 #ifdef ITEMTOGGLEBOTTOMRIGHT
 			if (currentMenu->menuitems[thisitem].alphaKey == 255)
 			{
-				V_DrawScaledPatch(x, y, V_TRANSLUCENT, W_CachePatchName("K_ISBG", PU_CACHE));
+				V_DrawScaledPatch(x, y, V_TRANSLUCENT, W_CachePatchName("K_ISBG", PU_PATCH));
 				continue;
 			}
 #endif
 			if (currentMenu->menuitems[thisitem].alphaKey == 0)
 			{
-				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISBG", PU_CACHE));
-				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISTOGL", PU_CACHE));
+				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISBG", PU_PATCH));
+				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISTOGL", PU_PATCH));
 				continue;
 			}
 
@@ -13042,18 +12325,18 @@ static void M_DrawMonitorToggles(void)
 			}
 
 			if (cv->value)
-				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISBG", PU_CACHE));
+				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISBG", PU_PATCH));
 			else
-				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISBGD", PU_CACHE));
+				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISBGD", PU_PATCH));
 
 			if (drawnum != 0)
 			{
-				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISMUL", PU_CACHE));
-				V_DrawScaledPatch(x, y, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[thisitem].alphaKey, true), PU_CACHE));
+				V_DrawScaledPatch(x, y, 0, W_CachePatchName("K_ISMUL", PU_PATCH));
+				V_DrawScaledPatch(x, y, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[thisitem].alphaKey, true), PU_PATCH));
 				V_DrawString(x+24, y+31, V_ALLOWLOWERCASE|translucent, va("x%d", drawnum));
 			}
 			else
-				V_DrawScaledPatch(x, y, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[thisitem].alphaKey, true), PU_CACHE));
+				V_DrawScaledPatch(x, y, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[thisitem].alphaKey, true), PU_PATCH));
 
 			y += spacing;
 		}
@@ -13066,7 +12349,7 @@ static void M_DrawMonitorToggles(void)
 #ifdef ITEMTOGGLEBOTTOMRIGHT
 		if (currentMenu->menuitems[itemOn].alphaKey == 255)
 		{
-			V_DrawScaledPatch(onx-1, ony-2, V_TRANSLUCENT, W_CachePatchName("K_ITBG", PU_CACHE));
+			V_DrawScaledPatch(onx-1, ony-2, V_TRANSLUCENT, W_CachePatchName("K_ITBG", PU_PATCH));
 			if (shitsfree)
 			{
 				INT32 trans = V_TRANSLUCENT;
@@ -13074,15 +12357,15 @@ static void M_DrawMonitorToggles(void)
 					trans = ((10-TICRATE)+shitsfree-1)<<V_ALPHASHIFT;
 				else if (shitsfree < 5)
 					trans = (10-shitsfree)<<V_ALPHASHIFT;
-				V_DrawScaledPatch(onx-1, ony-2, trans, W_CachePatchName("K_ITFREE", PU_CACHE));
+				V_DrawScaledPatch(onx-1, ony-2, trans, W_CachePatchName("K_ITFREE", PU_PATCH));
 			}
 		}
 		else
 #endif
 		if (currentMenu->menuitems[itemOn].alphaKey == 0)
 		{
-			V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITBG", PU_CACHE));
-			V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITTOGL", PU_CACHE));
+			V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITBG", PU_PATCH));
+			V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITTOGL", PU_PATCH));
 		}
 		else
 		{
@@ -13107,19 +12390,19 @@ static void M_DrawMonitorToggles(void)
 			}
 
 			if (cv->value)
-				V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITBG", PU_CACHE));
+				V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITBG", PU_PATCH));
 			else
-				V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITBGD", PU_CACHE));
+				V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITBGD", PU_PATCH));
 
 			if (drawnum != 0)
 			{
-				V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITMUL", PU_CACHE));
-				V_DrawScaledPatch(onx-1, ony-2, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[itemOn].alphaKey, false), PU_CACHE));
-				V_DrawScaledPatch(onx+27, ony+39, translucent, W_CachePatchName("K_ITX", PU_CACHE));
+				V_DrawScaledPatch(onx-1, ony-2, 0, W_CachePatchName("K_ITMUL", PU_PATCH));
+				V_DrawScaledPatch(onx-1, ony-2, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[itemOn].alphaKey, false), PU_PATCH));
+				V_DrawScaledPatch(onx+27, ony+39, translucent, W_CachePatchName("K_ITX", PU_PATCH));
 				V_DrawKartString(onx+37, ony+34, translucent, va("%d", drawnum));
 			}
 			else
-				V_DrawScaledPatch(onx-1, ony-2, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[itemOn].alphaKey, false), PU_CACHE));
+				V_DrawScaledPatch(onx-1, ony-2, translucent, W_CachePatchName(K_GetItemPatch(currentMenu->menuitems[itemOn].alphaKey, false), PU_PATCH));
 		}
 	}
 
@@ -13230,7 +12513,7 @@ static void M_HandleMonitorToggles(INT32 choice)
 // =========
 // Quit Game
 // =========
-static INT32 quitsounds[] =
+static const INT32 quitsounds[] =
 {
 	// holy shit we're changing things up!
 	// srb2kart: you ain't seen nothing yet
@@ -13281,7 +12564,7 @@ void M_QuitResponse(INT32 ch)
 		while (ptime > I_GetTime())
 		{
 			V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
-			V_DrawSmallScaledPatch(0, 0, 0, W_CachePatchName("GAMEQUIT", PU_CACHE)); // Demo 3 Quit Screen Tails 06-16-2001
+			V_DrawSmallScaledPatch(0, 0, 0, W_CachePatchName("GAMEQUIT", PU_PATCH)); // Demo 3 Quit Screen Tails 06-16-2001
 			I_FinishUpdate(); // Update the screen with the image Tails 06-19-2001
 			I_Sleep(cv_sleep.value);
 			I_UpdateTime(cv_timescale.value);
@@ -13298,13 +12581,12 @@ static void M_QuitSRB2(INT32 choice)
 	M_StartMessage(quitmsg[M_RandomKey(NUM_QUITMESSAGES)], M_QuitResponse, MM_YESNO);
 }
 
-#ifdef HWRENDER
-// =====================================================================
-// OpenGL specific options
-// =====================================================================
-#endif
-
 #ifdef HAVE_DISCORDRPC
+
+// =====================================================================
+// DiscordRPC specific options
+// =====================================================================
+
 static const tic_t confirmLength = 3*TICRATE/4;
 static tic_t confirmDelay = 0;
 static boolean confirmAccept = false;
@@ -13351,12 +12633,12 @@ static void M_DrawSticker(INT32 x, INT32 y, INT32 width, INT32 flags, boolean is
 
 	if (isSmall == true)
 	{
-		stickerEnd = W_CachePatchName("K_STIKE2", PU_CACHE);
+		stickerEnd = W_CachePatchName("K_STIKE2", PU_PATCH);
 		height = 6;
 	}
 	else
 	{
-		stickerEnd = W_CachePatchName("K_STIKEN", PU_CACHE);
+		stickerEnd = W_CachePatchName("K_STIKEN", PU_PATCH);
 		height = 11;
 	}
 
@@ -13386,12 +12668,12 @@ static void M_DrawDiscordRequests(void)
 		if (confirmAccept == true)
 		{
 			colormap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_GREEN, GTC_MENUCACHE);
-			hand = W_CachePatchName("K_LAPH02", PU_CACHE);
+			hand = W_CachePatchName("K_LAPH02", PU_PATCH);
 		}
 		else
 		{
 			colormap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_RED, GTC_MENUCACHE);
-			hand = W_CachePatchName("K_LAPH03", PU_CACHE);
+			hand = W_CachePatchName("K_LAPH03", PU_PATCH);
 		}
 
 		slide = confirmLength - confirmDelay;
@@ -13406,7 +12688,7 @@ static void M_DrawDiscordRequests(void)
 		colormap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_GREY, GTC_MENUCACHE);
 	}
 
-	V_DrawFixedPatch(56*FRACUNIT, 150*FRACUNIT, FRACUNIT, 0, W_CachePatchName("K_LAPE01", PU_CACHE), colormap);
+	V_DrawFixedPatch(56*FRACUNIT, 150*FRACUNIT, FRACUNIT, 0, W_CachePatchName("K_LAPE01", PU_PATCH), colormap);
 
 	if (hand != NULL)
 	{
diff --git a/src/m_menu.h b/src/m_menu.h
index a01c2ddef..06e0273fe 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -15,12 +15,19 @@
 #ifndef __X_MENU__
 #define __X_MENU__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "r_skins.h"
 #include "d_event.h"
 #include "command.h"
 #include "i_threads.h"
 #include "mserv.h"
 #include "r_things.h" // for SKINNAMESIZE
 
+extern boolean forceshowhud;
+
 //
 // MENUS
 //
@@ -31,6 +38,16 @@
 // Does all the real work of the menu interaction.
 boolean M_Responder(event_t *ev);
 
+// for scrolling through menus with controllers
+extern boolean dpadscrollstate[4];
+enum
+{
+	DPAD_UP,
+	DPAD_DOWN,
+	DPAD_LEFT,
+	DPAD_RIGHT
+};
+
 // Called by main loop, runs for demo playback. If this returns true, nullify any further user input.
 boolean M_DemoResponder(event_t *ev);
 
@@ -59,6 +76,9 @@ void M_SortServerList(void);
 // Draws a box with a texture inside as background for messages
 void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines);
 
+// Same but with extra flags applied
+void M_DrawTextBoxFlags(INT32 x, INT32 y, INT32 width, INT32 boxlines, INT32 flags);
+
 // Used in d_netcmd to restart time attack
 void M_ModeAttackRetry(INT32 choice);
 
@@ -192,14 +212,14 @@ extern menuitem_t PlayerMenu[MAXSKINS];
 typedef struct menu_s
 {
 	const char    *menutitlepic;
-	INT16          numitems;           // # of menu items
-	struct menu_s *prevMenu;           // previous menu
-	menuitem_t    *menuitems;          // menu items
-	void         (*drawroutine)(void); // draw routine
-	INT16          x, y;               // x, y of menu
-	INT16          lastOn;             // last item user was on in menu
-	boolean      (*quitroutine)(void); // called before quit a menu return true if we can
-	const char*		tooltips[MAXTOOLTIPS]; // tooltips! give me that info bitch
+	INT16          numitems;              // # of menu items
+	struct menu_s *prevMenu;              // previous menu
+	menuitem_t    *menuitems;             // menu items
+	void         (*drawroutine)(void);    // draw routine
+	INT16          x, y;                  // x, y of menu
+	INT16          lastOn;                // last item user was on in menu
+	boolean      (*quitroutine)(void);    // called before quit a menu return true if we can
+	const char*   *tooltips; // tooltips! give me that info bitch
 } menu_t;
 
 void M_SetupNextMenu(menu_t *menudef);
@@ -255,6 +275,7 @@ extern INT32 mapwads[NUMMAPS];
 
 extern description_t description[MAXSKINS];
 
+extern consvar_t cv_replaysearchrate;
 extern consvar_t cv_showfocuslost;
 extern consvar_t cv_newgametype, cv_nextmap, cv_chooseskin, cv_serversort;
 extern consvar_t cv_showallmaps;
@@ -280,14 +301,23 @@ void Screenshot_option_Onchange(void);
 // Addons menu updating
 void Addons_option_Onchange(void);
 
+// Moviemode menu updating
+void Moviemode_option_Onchange(void);
+
 // Player distortion menu updating
 void PDistort_menu_Onchange(void);
 
 // Bird menu updating
 void Bird_menu_Onchange(void);
 
-// Saturn menu updating
-void Saturn_menu_Onchange(void);
+// Saturn Hud menu updating
+void SaturnHud_menu_Onchange(void);
+
+void GameFocus_menu_Onchange (void);
+
+#ifdef HWRENDER
+void M_UpdateOGLMenu(void);
+#endif
 
 void M_ReplayHut(INT32 choice);
 void M_SetPlaybackMenuPointer(void);
@@ -305,7 +335,7 @@ void M_PopupMasterServerConnectError(void);
 void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* name);
 
 // These defines make it a little easier to make menus
-#define DEFAULTMENUSTYLE(header, source, prev, x, y)\
+#define DEFAULTMENUSTYLE(header, source, prev, x, y, tooltip)\
 {\
 	header,\
 	sizeof(source)/sizeof(menuitem_t),\
@@ -315,10 +345,10 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	x, y,\
 	0,\
 	NULL,\
-	{NULL}\
+	tooltip\
 }
 
-#define DEFAULTSCROLLSTYLE(header, source, prev, x, y)\
+#define DEFAULTSCROLLSTYLE(header, source, prev, x, y, tooltip)\
 {\
 	header,\
 	sizeof(source)/sizeof(menuitem_t),\
@@ -328,7 +358,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	x, y,\
 	0,\
 	NULL,\
-	{NULL}\
+	tooltip\
 }
 
 
@@ -342,7 +372,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	x, y,\
 	0,\
 	NULL,\
-	{NULL}\
+	NULL\
 }
 
 #define CENTERMENUSTYLE(header, source, prev, y)\
@@ -355,7 +385,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	BASEVIDWIDTH/2, y,\
 	0,\
 	NULL,\
-	{NULL}\
+	NULL\
 }
 
 #define MAPICONMENUSTYLE(header, source, prev)\
@@ -368,7 +398,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	24,40,\
 	0,\
 	NULL,\
-	{NULL}\
+	NULL\
 }
 
 #define CONTROLMENUSTYLE(source, prev)\
@@ -381,7 +411,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	26, 40,\
 	0,\
 	NULL,\
-	{NULL}\
+	NULL\
 }
 
 #define IMAGEDEF(source)\
@@ -394,7 +424,11 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
 	0, 0,\
 	0,\
 	NULL,\
-	{NULL}\
+	NULL\
 }
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif //__X_MENU__
diff --git a/src/m_menudefs.c b/src/m_menudefs.c
new file mode 100644
index 000000000..7029a212b
--- /dev/null
+++ b/src/m_menudefs.c
@@ -0,0 +1,2946 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 2011-2016 by Matthew "Inuyasha" Walsh.
+// Copyright (C) 1999-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  m_menudefs.c
+/// \brief XMOD's extremely revamped menu system.
+
+#include "m_menu.h"
+
+// Note: Never should we be jumping from one category of menu options to another
+//       without first going to the Main Menu.
+// Note: Ignore the above if you're working with the Pause menu.
+// Note: (Prefix)_MainMenu should be the target of all Main Menu options that
+//       point to submenus.
+
+
+// the haxor message menu
+menu_t MessageDef;
+
+// Pause and Main Menu stuff
+menu_t SPauseDef;
+menu_t SR_MainDef, SR_UnlockChecklistDef;
+menu_t SP_MainDef, MP_MainDef, OP_MainDef;
+menu_t MISC_ScrambleTeamDef, MISC_ChangeTeamDef, MISC_ChangeSpectateDef;
+menu_t SP_LevelStatsDef;
+static menu_t SP_TimeAttackDef, SP_ReplayDef, SP_GuestReplayDef, SP_GhostDef;
+
+// Control menus
+menu_t OP_ControlsDef, OP_AllControlsDef;
+menu_t OP_MouseOptionsDef;
+menu_t OP_Joystick1Def, OP_Joystick2Def, OP_Joystick3Def, OP_Joystick4Def;
+
+// Custom cvar menu
+menu_t OP_CustomCvarMenuDef;
+
+// Camera menus
+menu_t OP_CamOptionsDef;
+menu_t OP_Player1CamOptionsDef, OP_Player2CamOptionsDef, OP_Player3CamOptionsDef, OP_Player4CamOptionsDef;
+
+// Video & Sound
+menu_t OP_VideoOptionsDef, OP_VideoModeDef, OP_ExpOptionsDef, OP_ColorOptionsDef;
+#ifdef HWRENDER
+menu_t OP_OpenGLOptionsDef;
+#endif
+menu_t OP_SoundOptionsDef;
+menu_t OP_SoundAdvancedDef;
+
+menu_t OP_FocusOptionsDef;
+
+//Misc
+menu_t OP_DataOptionsDef, OP_ScreenshotOptionsDef, OP_EraseDataDef;
+menu_t OP_ProtocolDef;
+#ifdef HAVE_DISCORDRPC
+menu_t OP_DiscordOptionsDef;
+#endif
+menu_t OP_HUDOptionsDef, OP_ChatOptionsDef;
+menu_t OP_GameOptionsDef, OP_ServerOptionsDef;
+#ifndef NONET
+menu_t OP_AdvServerOptionsDef;
+#endif
+menu_t OP_MonitorToggleDef;
+
+menu_t OP_AccessibilityDef;
+
+// Saturn
+menu_t OP_SaturnDef;
+menu_t OP_SaturnHudDef;
+menu_t OP_HudOffsetDef;
+menu_t OP_PlayerDistortDef;
+menu_t OP_SaturnCreditsDef;
+
+// Bird
+menu_t OP_BirdDef;
+
+// Stuff, yknow.
+menu_t OP_ForkedBirdDef;
+menu_t OP_LocalSkinDef;
+menu_t OP_TiltDef;
+menu_t OP_AdvancedBirdDef;
+
+// Chaotic
+menu_t OP_NametagDef;
+
+// Driftgauge
+menu_t OP_DriftGaugeDef;
+
+// Replays
+menu_t MISC_ReplayHutDef;
+menu_t MISC_ReplayOptionsDef;
+
+// ---------
+// Main Menu
+// ---------
+static menuitem_t MainMenu[] =
+{
+	{IT_SUBMENU|IT_STRING, NULL, "Extras",      &SR_MainDef,        76},
+	{IT_CALL   |IT_STRING, NULL, "Time Attack", M_TimeAttack,       84},
+	{IT_CALL   |IT_STRING, NULL, "Multiplayer", M_Multiplayer,      92},
+	{IT_CALL   |IT_STRING, NULL, "Options",     M_Options,          100},
+	{IT_CALL   |IT_STRING, NULL, "Addons",      M_Addons,           108},
+	{IT_CALL   |IT_STRING, NULL, "Quit  Game",  M_QuitSRB2,         116},
+};
+
+typedef enum
+{
+	secrets = 0,
+	singleplr,
+	multiplr,
+	options,
+	addons,
+	quitdoom
+} main_e;
+
+static menuitem_t MISC_AddonsMenu[] =
+{
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleAddons, 0},     // dummy menuitem for the control func
+};
+
+static menuitem_t MISC_ReplayHutMenu[] =
+{
+	{IT_KEYHANDLER|IT_NOTHING, NULL, "", M_HandleReplayHutList, 0}, // Dummy menuitem for the replay list
+	{IT_NOTHING,               NULL, "", NULL,                  0}, // Dummy for handling wrapping to the top of the menu..
+};
+
+static menuitem_t MISC_ReplayStartMenu[] =
+{
+	{IT_CALL      |IT_STRING,  NULL, "Load Addons and Watch", M_HutStartReplay,   0},
+	{IT_CALL      |IT_STRING,  NULL, "Watch Without Addons",  M_HutStartReplay,   10},
+	{IT_CALL      |IT_STRING,  NULL, "Watch Replay",          M_HutStartReplay,   10},
+	{IT_SUBMENU   |IT_STRING,  NULL, "Back",                  &MISC_ReplayHutDef, 30},
+};
+
+static menuitem_t MISC_ReplayOptionsMenu[] =
+{
+	{IT_CVAR|IT_STRING, NULL, "Record Replays",      			&cv_recordmultiplayerdemos,  0},
+	{IT_CVAR|IT_STRING, NULL, "Save Replays on Map change",		&cv_demochangemap, 			10},
+	{IT_CVAR|IT_STRING, NULL, "Sync Check Interval",			&cv_netdemosyncquality,     20},
+	{IT_CVAR|IT_STRING, NULL, "Max demo size (MiB)",			&cv_maxdemosize,			30},
+	{IT_CVAR|IT_STRING, NULL, "Replay Search Rate",				&cv_replaysearchrate,       40},
+	{IT_CVAR|IT_STRING, NULL, "Replay Date Format",				&cv_demodateformat,         50},
+};
+
+static tic_t playback_last_menu_interaction_leveltime = 0;
+static menuitem_t PlaybackMenu[] =
+{
+	{IT_CALL   | IT_STRING, "M_PHIDE",  "Hide Menu (Esc)", M_SelectableClearMenus,             0},
+
+	{IT_CALL   | IT_STRING, "M_PREW",   "Rewind ([)",        M_PlaybackRewind,                20},
+	{IT_CALL   | IT_STRING, "M_PPAUSE", "Pause (\\)",         M_PlaybackPause,                36},
+	{IT_CALL   | IT_STRING, "M_PFFWD",  "Fast-Forward (])",  M_PlaybackFastForward,           52},
+	{IT_CALL   | IT_STRING, "M_PSTEPB", "Backup Frame ([)",  M_PlaybackRewind,                20},
+	{IT_CALL   | IT_STRING, "M_PRESUM", "Resume",        M_PlaybackPause,                     36},
+	{IT_CALL   | IT_STRING, "M_PFADV",  "Advance Frame (])", M_PlaybackAdvance,               52},
+
+	{IT_ARROWS | IT_STRING, "M_PVIEWS", "View Count (- and =)",  M_PlaybackSetViews,          72},
+	{IT_ARROWS | IT_STRING, "M_PNVIEW", "Viewpoint (1)",   M_PlaybackAdjustView,              88},
+	{IT_ARROWS | IT_STRING, "M_PNVIEW", "Viewpoint 2 (2)", M_PlaybackAdjustView,             104},
+	{IT_ARROWS | IT_STRING, "M_PNVIEW", "Viewpoint 3 (3)", M_PlaybackAdjustView,             120},
+	{IT_ARROWS | IT_STRING, "M_PNVIEW", "Viewpoint 4 (4)", M_PlaybackAdjustView,             136},
+
+	{IT_CALL   | IT_STRING, "M_PVIEWS", "Toggle Free Camera (')",	M_PlaybackToggleFreecam, 156},
+	{IT_CALL   | IT_STRING, "M_PEXIT",  "Stop Playback",   M_PlaybackQuit,                   172},
+};
+typedef enum
+{
+	playback_hide,
+	playback_rewind,
+	playback_pause,
+	playback_fastforward,
+	playback_backframe,
+	playback_resume,
+	playback_advanceframe,
+	playback_viewcount,
+	playback_view1,
+	playback_view2,
+	playback_view3,
+	playback_view4,
+	playback_freecamera,
+	//playback_moreoptions,
+	playback_quit
+} playback_e;
+
+// ---------------------------------
+// Pause Menu Mode Attacking Edition
+// ---------------------------------
+static menuitem_t MAPauseMenu[] =
+{
+	{IT_CALL | IT_STRING,    NULL, "Continue",             M_SelectableClearMenus,48},
+	{IT_CALL | IT_STRING,    NULL, "Retry",                M_ModeAttackRetry,     56},
+	{IT_CALL | IT_STRING,    NULL, "Abort",                M_ModeAttackEndGame,   64},
+};
+
+typedef enum
+{
+	mapause_continue,
+	mapause_retry,
+	mapause_abort
+} mapause_e;
+
+// ---------------------
+// Pause Menu MP Edition
+// ---------------------
+static menuitem_t MPauseMenu[] =
+{
+	{IT_STRING | IT_CALL,     NULL, "Addons...",          M_Addons,               8},
+	{IT_STRING | IT_CALL,     NULL, "Add local skins...", M_LocalSkins,           16},
+	{IT_STRING | IT_SUBMENU,  NULL, "Scramble Teams...", &MISC_ScrambleTeamDef,  24},
+	{IT_STRING | IT_CALL,     NULL, "Switch Map..."    , M_MapChange,            32},
+
+#ifdef HAVE_DISCORDRPC
+	{IT_STRING | IT_SUBMENU,  NULL, "Ask To Join Requests...", &MISC_DiscordRequestsDef, 32},
+#endif
+
+	{IT_CALL | IT_STRING,    NULL, "Continue",           M_SelectableClearMenus, 40},
+	{IT_CALL | IT_STRING,    NULL, "P1 Setup...",        M_SetupMultiPlayer,     48}, // splitscreen
+	{IT_CALL | IT_STRING,    NULL, "P2 Setup...",        M_SetupMultiPlayer2,    56}, // splitscreen
+	{IT_CALL | IT_STRING,    NULL, "P3 Setup...",        M_SetupMultiPlayer3,    64}, // splitscreen
+	{IT_CALL | IT_STRING,    NULL, "P4 Setup...",        M_SetupMultiPlayer4,    72}, // splitscreen
+
+	{IT_STRING | IT_CALL,    NULL, "Spectate",           M_ConfirmSpectate,      48}, // alone
+	{IT_STRING | IT_CALL,    NULL, "Enter Game",         M_ConfirmEnterGame,     48}, // alone
+	{IT_STRING | IT_CALL,    NULL, "Cancel Join",        M_ConfirmSpectate,      48}, // alone
+	{IT_STRING | IT_SUBMENU, NULL, "Switch Team...",     &MISC_ChangeTeamDef,    48},
+	{IT_STRING | IT_SUBMENU, NULL, "Enter/Spectate...",  &MISC_ChangeSpectateDef,48},
+	{IT_CALL | IT_STRING,    NULL, "Player Setup...",    M_SetupMultiPlayer,     56}, // alone
+	{IT_CALL | IT_STRING,    NULL, "Local Skin...",    	 M_LocalSkinMenu,     	 64}, // alone
+	{IT_CALL | IT_STRING,    NULL, "Options",            M_Options,              72},
+
+	{IT_CALL | IT_STRING,    NULL, "Return to Title",    M_EndGame,              88},
+	{IT_CALL | IT_STRING,    NULL, "Quit Game",          M_QuitSRB2,             96},
+};
+
+typedef enum
+{
+	mpause_addons = 0,
+	mpause_addlocalskins,
+	mpause_scramble,
+	mpause_switchmap,
+#ifdef HAVE_DISCORDRPC
+	mpause_discordrequests,
+#endif
+	mpause_continue,
+	mpause_psetupsplit,
+	mpause_psetupsplit2,
+	mpause_psetupsplit3,
+	mpause_psetupsplit4,
+
+	mpause_spectate,
+	mpause_entergame,
+	mpause_canceljoin,
+	mpause_switchteam,
+	mpause_switchspectate,
+	mpause_psetup,
+	mpause_localskin,
+	mpause_options,
+
+	mpause_title,
+	mpause_quit
+} mpause_e;
+
+// ---------------------
+// Pause Menu SP Edition
+// ---------------------
+static menuitem_t SPauseMenu[] =
+{
+	{IT_CALL | IT_STRING,    NULL, "Continue",             M_SelectableClearMenus,48},
+	{IT_CALL | IT_STRING,    NULL, "Retry",                M_Retry,               56},
+	{IT_CALL | IT_STRING,    NULL, "Options",              M_Options,             64},
+
+	{IT_CALL | IT_STRING,    NULL, "Return to Title",      M_EndGame,             80},
+	{IT_CALL | IT_STRING,    NULL, "Quit Game",            M_QuitSRB2,            88},
+};
+
+typedef enum
+{
+	spause_continue = 0,
+	spause_retry,
+	spause_options,
+	spause_title,
+	spause_quit
+} spause_e;
+
+#ifdef HAVE_DISCORDRPC
+static menuitem_t MISC_DiscordRequestsMenu[] =
+{
+	{IT_KEYHANDLER|IT_NOTHING, NULL, "", M_HandleDiscordRequests, 0},
+};
+#endif
+
+// -----------------
+// Misc menu options
+// -----------------
+// Prefix: MISC_
+static menuitem_t MISC_ScrambleTeamMenu[] =
+{
+	{IT_STRING|IT_CVAR,      NULL, "Scramble Method", &cv_dummyscramble,     30},
+	{IT_WHITESTRING|IT_CALL, NULL, "Confirm",         M_ConfirmTeamScramble, 90},
+};
+
+static menuitem_t MISC_ChangeTeamMenu[] =
+{
+	{IT_STRING|IT_CVAR,              NULL, "Player",            &cv_dummymenuplayer,    30},
+	{IT_STRING|IT_CVAR,              NULL, "Team",              &cv_dummyteam,          40},
+	{IT_WHITESTRING|IT_CALL,         NULL, "Confirm",           M_ConfirmTeamChange,    90},
+};
+
+static menuitem_t MISC_ChangeSpectateMenu[] =
+{
+	{IT_STRING|IT_CVAR,              NULL, "Player",        &cv_dummymenuplayer,        30},
+	{IT_STRING|IT_CVAR,              NULL, "Status",        &cv_dummyspectate,          40},
+	{IT_WHITESTRING|IT_CALL,         NULL, "Confirm",       M_ConfirmSpectateChange,    90},
+};
+
+static menuitem_t MISC_ChangeLevelMenu[] =
+{
+	{IT_STRING|IT_CVAR,              NULL, "Game Type",             &cv_newgametype,    68},
+	{IT_STRING|IT_CVAR,              NULL, "Level",                 &cv_nextmap,        78},
+	{IT_WHITESTRING|IT_CALL,         NULL, "Change Level",          M_ChangeLevel,     130},
+};
+
+static menuitem_t MISC_HelpMenu[] =
+{
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL00", M_HandleImageDef, 0},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL01", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL02", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL03", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL04", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL05", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL06", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL07", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL08", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL09", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL10", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL11", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL12", M_HandleImageDef, 1},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "MANUAL99", M_HandleImageDef, 0},
+};
+
+// --------------------------------
+// Sky Room and all of its submenus
+// --------------------------------
+// Prefix: SR_
+
+
+// Sky Room Custom Unlocks
+static menuitem_t SR_MainMenu[] =
+{
+	{IT_STRING|IT_SUBMENU,                  NULL, "Unlockables", &SR_UnlockChecklistDef, 100},
+	{IT_CALL|IT_STRING|IT_CALL_NOTMODIFIED, NULL, "Statistics",  M_Statistics,           108},
+	{IT_CALL|IT_STRING,                     NULL, "Replay Hut",  M_ReplayHut,            116},
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom1
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom2
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom3
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom4
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom5
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom6
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom7
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom8
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom9
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom10
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom11
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom12
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom13
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom14
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom15
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom16
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom17
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom18
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom19
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom20
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom21
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom22
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom23
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom24
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom25
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom26
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom27
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom28
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom29
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom30
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom31
+	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom32
+
+};
+
+static menuitem_t SR_UnlockChecklistMenu[] =
+{
+	{IT_SUBMENU | IT_STRING,         NULL, "NEXT", &MainDef, 192},
+};
+
+static menuitem_t SR_MusicTestMenu[] =
+{
+	{IT_KEYHANDLER | IT_STRING, NULL, "", M_HandleMusicTest, 0},
+};
+
+
+// --------------------------------
+// 1 Player and all of its submenus
+// --------------------------------
+// Prefix: SP_
+
+// Single Player Main
+static menuitem_t SP_MainMenu[] =
+{
+	{IT_SECRET,                                 NULL, "Record Attack", M_TimeAttack,     100},
+	{IT_CALL | IT_STRING | IT_CALL_NOTMODIFIED, NULL, "Statistics",    M_Statistics,     108},
+};
+
+enum
+{
+	sprecordattack,
+	spstatistics
+};
+
+// Single Player Time Attack
+static menuitem_t SP_TimeAttackMenu[] =
+{
+	{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Name",       &cv_playername,        0},
+	{IT_STRING|IT_CVAR,              NULL, "Character",  &cv_chooseskin,       13},
+	{IT_STRING|IT_CVAR,              NULL, "Color",      &cv_playercolor,      26},
+	{IT_STRING|IT_CVAR,              NULL, "Level",      &cv_nextmap,          78},
+
+	{IT_DISABLED,                                NULL, "Guest...",      &SP_GuestReplayDef,    98},
+	{IT_DISABLED,                                NULL, "Replay...",     &SP_ReplayDef,        108},
+	{IT_WHITESTRING|IT_SUBMENU,                  NULL, "Ghosts...",     &SP_GhostDef,         118},
+	{IT_WHITESTRING|IT_CALL|IT_CALL_NOTMODIFIED, NULL, "Start",         M_ChooseTimeAttack,   130},
+};
+
+enum
+{
+	taname,
+	taplayer,
+	tacolor,
+	talevel,
+
+	taguest,
+	tareplay,
+	taghost,
+	tastart
+};
+
+static menuitem_t SP_ReplayMenu[] =
+{
+	{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Time",  M_ReplayTimeAttack,  90},
+	{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Lap",   M_ReplayTimeAttack,  98},
+
+	{IT_WHITESTRING|IT_CALL, NULL, "Replay Last",       M_ReplayTimeAttack, 106},
+	{IT_WHITESTRING|IT_CALL, NULL, "Replay Guest",      M_ReplayTimeAttack, 114},
+	{IT_WHITESTRING|IT_KEYHANDLER, NULL, "Replay Staff",M_HandleStaffReplay,122},
+
+	{IT_WHITESTRING|IT_SUBMENU, NULL, "Back",           &SP_TimeAttackDef,  130}
+};
+
+static menuitem_t SP_GuestReplayMenu[] =
+{
+	{IT_WHITESTRING|IT_CALL, NULL, "Save Best Time as Guest",  M_SetGuestReplay, 94},
+	{IT_WHITESTRING|IT_CALL, NULL, "Save Best Lap as Guest",   M_SetGuestReplay,102},
+	{IT_WHITESTRING|IT_CALL, NULL, "Save Last as Guest",       M_SetGuestReplay,110},
+
+	{IT_WHITESTRING|IT_CALL, NULL, "Delete Guest Replay",      M_SetGuestReplay,120},
+
+	{IT_WHITESTRING|IT_SUBMENU, NULL, "Back",                &SP_TimeAttackDef, 130}
+};
+
+static menuitem_t SP_GhostMenu[] =
+{
+	{IT_STRING|IT_CVAR,         NULL, "Best Time",   &cv_ghost_besttime, 88},
+	{IT_STRING|IT_CVAR,         NULL, "Best Lap",    &cv_ghost_bestlap,  96},
+	{IT_STRING|IT_CVAR,         NULL, "Last",        &cv_ghost_last,    104},
+	{IT_DISABLED,               NULL, "Guest",       &cv_ghost_guest,   112},
+	{IT_DISABLED,               NULL, "Staff Attack",&cv_ghost_staff,   120},
+
+	{IT_WHITESTRING|IT_SUBMENU, NULL, "Back",        &SP_TimeAttackDef, 130}
+};
+
+enum
+{
+	nalevel,
+	narecords,
+
+	naguest,
+	nareplay,
+	naghost,
+	nastart
+};
+
+// Statistics
+static menuitem_t SP_LevelStatsMenu[] =
+{
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleLevelStats, '\0'},     // dummy menuitem for the control func
+};
+
+// A rare case.
+// External files modify this menu, so we can't call it static.
+// And I'm too lazy to go through and rename it everywhere. ARRGH!
+#define M_ChoosePlayer NULL
+menuitem_t PlayerMenu[MAXSKINS];
+
+// -----------------------------------
+// Multiplayer and all of its submenus
+// -----------------------------------
+// Prefix: MP_
+
+static menuitem_t MP_MainMenu[] =
+{
+	{IT_HEADER, NULL, "Players", NULL, 0},
+	{IT_STRING|IT_CVAR,      NULL, "Number of local players",     &cv_splitplayers,            10},
+
+	{IT_STRING|IT_KEYHANDLER,NULL, "Player setup...",     M_SetupMultiHandler,                 18},
+
+	{IT_HEADER, NULL, "Host a game", NULL, 100-24},
+#ifndef NONET
+	{IT_STRING|IT_CALL,       NULL, "Internet/LAN...",           M_PreStartServerMenu,     110-24},
+#else
+	{IT_GRAYEDOUT,            NULL, "Internet/LAN...",           NULL,                     110-24},
+#endif
+	{IT_STRING|IT_CALL,       NULL, "Offline...",                M_StartOfflineServerMenu, 118-24},
+
+	{IT_HEADER, NULL, "Join a game", NULL, 132-24},
+#ifndef NONET
+#ifndef MASTERSERVER
+	{IT_GRAYEDOUT,       NULL, "Internet server browser...",NULL,                          142-24},
+#else
+	{IT_STRING|IT_CALL,       NULL, "Internet server browser...",M_PreConnectMenu,         142-24},
+#endif
+	{IT_STRING|IT_CALL, NULL, "Join last server",     M_ConnectLastServer,                 150-24},
+	{IT_STRING|IT_KEYHANDLER, NULL, "Specify IPv4 address:",     M_HandleConnectIP,        158-24},
+#else
+	{IT_GRAYEDOUT,            NULL, "Internet server browser...",NULL,                     142-24},
+	{IT_GRAYEDOUT,            NULL, "Join last server",     NULL,               	       150-24},
+	{IT_GRAYEDOUT,            NULL, "Specify IPv4 address:",     NULL,                     158-24},
+#endif
+};
+
+#ifndef NONET
+static menuitem_t MP_ServerMenu[] =
+{
+	{IT_STRING|IT_CVAR,                NULL, "Max. Player Count",     &cv_maxplayers,        10},
+#ifndef MASTERSERVER
+	{IT_GRAYEDOUT,                NULL, "Advertise",             NULL,         20},
+#else
+	{IT_STRING|IT_CVAR,                NULL, "Advertise",             &cv_advertise,         20},
+#endif
+	{IT_STRING|IT_CVAR|IT_CV_STRING,   NULL, "Server Name",           &cv_servername,        30},
+
+	{IT_STRING|IT_CVAR,                NULL, "Game Type",             &cv_newgametype,       68},
+	{IT_STRING|IT_CVAR,                NULL, "Level",                 &cv_nextmap,           78},
+
+	{IT_WHITESTRING|IT_CALL,           NULL, "Start",                 M_StartServer,        130},
+};
+#endif
+
+// Separated offline and normal servers.
+static menuitem_t MP_OfflineServerMenu[] =
+{
+	{IT_STRING|IT_CVAR,      NULL, "Game Type",             &cv_newgametype,       68},
+	{IT_STRING|IT_CVAR,      NULL, "Level",                 &cv_nextmap,           78},
+
+	{IT_WHITESTRING|IT_CALL, NULL, "Start",                 M_StartServer,        130},
+};
+//Char select
+static menuitem_t MP_PlayerSetupMenu[] =
+{
+	{IT_KEYHANDLER | IT_STRING,   NULL, "Name",      M_HandleSetupMultiPlayer,   0},
+	{IT_KEYHANDLER | IT_STRING,   NULL, "Character", M_HandleSetupMultiPlayer,  16}, // Tails 01-18-2001
+	{IT_KEYHANDLER | IT_STRING,   NULL, "Color",     M_HandleSetupMultiPlayer, 152},
+};
+
+#ifndef NONET
+static menuitem_t MP_ConnectMenu[] =
+{
+	{IT_STRING | IT_CVAR,       NULL, "Sort By",  &cv_serversort,      0},
+	{IT_STRING | IT_KEYHANDLER, NULL, "Page",     M_HandleServerPage,  8},
+	{IT_STRING | IT_CALL,       NULL, "Refresh",  M_Refresh,          16},
+	{IT_STRING | IT_KEYHANDLER, NULL, "",         M_HandleServerSearch,25},
+
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,          48},
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,          60},
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,          72},
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,          84},
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,          96},
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,         108},
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,         120},
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,         132},
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,         144},
+	{IT_STRING | IT_SPACE, NULL, "",              M_Connect,         156},
+};
+
+enum
+{
+	mp_connect_sort,
+	mp_connect_page,
+	mp_connect_refresh,
+	mp_connect_search,
+	FIRSTSERVERLINE
+};
+#endif
+
+// ------------------------------------
+// Options and most (?) of its submenus
+// ------------------------------------
+// Prefix: OP_
+static menuitem_t OP_MainMenu[] =
+{
+	{IT_SUBMENU|IT_STRING,		NULL, "Control Setup...",		&OP_ControlsDef,			  0},
+
+	{IT_SUBMENU|IT_STRING,		NULL, "Video Options...",		&OP_VideoOptionsDef,		 13},
+	{IT_SUBMENU|IT_STRING,		NULL, "Sound Options...",		&OP_SoundOptionsDef,		 23},
+	{IT_SUBMENU|IT_STRING,		NULL, "Game Focus Options...",	&OP_FocusOptionsDef,		 33},
+
+	{IT_SUBMENU|IT_STRING,		NULL, "HUD Options...",			&OP_HUDOptionsDef,			 46},
+	{IT_SUBMENU|IT_STRING,		NULL, "Camera Options...",		&OP_CamOptionsDef,			 56},
+	{IT_SUBMENU|IT_STRING,		NULL, "Gameplay Options...",	&OP_GameOptionsDef,			 66},
+	{IT_SUBMENU|IT_STRING,		NULL, "Server Options...",		&OP_ServerOptionsDef,		 76},
+
+	{IT_SUBMENU|IT_STRING,		NULL, "Data Options...",		&OP_DataOptionsDef,			 89},
+	{IT_CALL|IT_STRING, 		NULL, "Custom Addon Options...", M_CustomCvarMenu,   		 99},
+
+	{IT_CALL|IT_STRING,			NULL, "Tricks & Secrets (F1)",	M_Manual,					109},
+	{IT_CALL|IT_STRING,			NULL, "Play Credits",			M_Credits,					119},
+
+	{IT_SUBMENU|IT_STRING,		NULL, "Accessibility Options...",&OP_AccessibilityDef,		132},
+	{IT_SUBMENU|IT_STRING,		NULL, "Saturn Options...",		&OP_SaturnDef,				142},
+
+	{IT_SUBMENU|IT_STRING,		NULL, "Bird...",				&OP_BirdDef,				152},
+	{IT_CALL|IT_STRING,			NULL, "Local Skin Options...",	M_LocalSkinMenu,			162},
+};
+
+enum
+{
+	ctrlsetup,
+	vidopt,
+	soundopt,
+	focusopt,
+	hudopt,
+	camopt,
+	gameopt,
+	serveropt,
+	dataopt,
+	addonopt,
+	tricksandshit,
+	credits,
+	accesability,
+	satopt,
+	bird,
+	localskin
+};
+
+static menuitem_t OP_ControlsMenu[] =
+{
+	{IT_CALL | IT_STRING, NULL, "Player 1 Controls...", M_Setup1PControlsMenu,  10},
+	{IT_CALL | IT_STRING, NULL, "Player 2 Controls...", M_Setup2PControlsMenu,  20},
+
+	{IT_CALL | IT_STRING, NULL, "Player 3 Controls...", &M_Setup3PControlsMenu, 30},
+	{IT_CALL | IT_STRING, NULL, "Player 4 Controls...", &M_Setup4PControlsMenu, 40},
+
+	{IT_SUBMENU | IT_STRING, NULL, "Mouse Options...", &OP_MouseOptionsDef,     60},
+
+	{IT_STRING | IT_CVAR, NULL, "Controls per key",    &cv_controlperkey,       80},
+	{IT_STRING | IT_CVAR, NULL, "Digital turn easing", &cv_turnsmooth,          90},
+};
+
+static const char* OP_ControlsTooltips[] =
+{
+	"Setup player 1 controls.",
+	"Setup player 2 controls.",
+	"Setup player 3 controls.",
+	"Setup player 4 controls.",
+	"Options for mouse control.",
+	"Allowed amount of controls per key.",
+	"Turn smoothing for non-analog turning.",
+};
+
+static menuitem_t OP_AllControlsMenu[] =
+{
+	{IT_SUBMENU|IT_STRING, NULL, "Gamepad Options...", &OP_Joystick1Def, 0},
+	{IT_CALL|IT_STRING, NULL, "Reset to defaults", M_ResetControls, 8},
+
+	//{IT_SPACE, NULL, NULL, NULL, 0},
+	{IT_HEADER, NULL, "Gameplay Controls", NULL, 0},
+	{IT_SPACE, NULL, NULL, NULL, 0},
+	{IT_CONTROL, NULL, "Accelerate",            M_ChangeControl, gc_accelerate },
+	{IT_CONTROL, NULL, "Turn Left",             M_ChangeControl, gc_turnleft   },
+	{IT_CONTROL, NULL, "Turn Right",            M_ChangeControl, gc_turnright  },
+	{IT_CONTROL, NULL, "Drift",                 M_ChangeControl, gc_drift      },
+	{IT_CONTROL, NULL, "Brake",                 M_ChangeControl, gc_brake      },
+	{IT_CONTROL, NULL, "Use/Throw Item",        M_ChangeControl, gc_fire       },
+	{IT_CONTROL, NULL, "Aim Forward",           M_ChangeControl, gc_aimforward },
+	{IT_CONTROL, NULL, "Aim Backward",          M_ChangeControl, gc_aimbackward},
+	{IT_CONTROL, NULL, "Look Backward",         M_ChangeControl, gc_lookback   },
+
+	{IT_HEADER, NULL, "Miscellaneous Controls", NULL, 0},
+	{IT_SPACE, NULL, NULL, NULL, 0},
+	{IT_CONTROL, NULL, "Chat",                  M_ChangeControl, gc_talkkey    },
+	{IT_CONTROL, NULL, "Show Rankings",         M_ChangeControl, gc_scores     },
+	{IT_CONTROL, NULL, "Pause",                 M_ChangeControl, gc_pause      },
+	{IT_CONTROL, NULL, "Screenshot",            M_ChangeControl, gc_screenshot },
+	{IT_CONTROL, NULL, "Toggle GIF Recording",  M_ChangeControl, gc_recordgif  },
+	{IT_CONTROL, NULL, "Open/Close Menu (ESC)", M_ChangeControl, gc_systemmenu },
+	{IT_CONTROL, NULL, "Developer Console",     M_ChangeControl, gc_console    },
+
+	{IT_HEADER, NULL, "Camera Controls", NULL, 0},
+	{IT_SPACE, NULL, NULL, NULL, 0},
+	{IT_CONTROL, NULL, "Toggle Freecam",        M_ChangeControl, gc_freecam    },
+	{IT_CONTROL, NULL, "Look Up",               M_ChangeControl, gc_lookup     },
+	{IT_CONTROL, NULL, "Look Down",             M_ChangeControl, gc_lookdown   },
+	{IT_CONTROL, NULL, "Center View",           M_ChangeControl, gc_centerview },
+	{IT_CONTROL, NULL, "Float",                 M_ChangeControl, gc_camfloat   },
+	{IT_CONTROL, NULL, "Sink",                  M_ChangeControl, gc_camsink    },
+	{IT_CONTROL, NULL, "Change Viewpoint",      M_ChangeControl, gc_viewpoint  },
+	{IT_CONTROL, NULL, "Reset Camera",          M_ChangeControl, gc_camreset   },
+	{IT_CONTROL, NULL, "Strafe Left",           M_ChangeControl, gc_strafeleft },
+	{IT_CONTROL, NULL, "Strafe Right",          M_ChangeControl, gc_straferight},
+
+	{IT_HEADER, NULL, "Spectator Controls", NULL, 0},
+	{IT_SPACE, NULL, NULL, NULL, 0},
+	{IT_CONTROL, NULL, "Become Spectator",      M_ChangeControl, gc_spectate   },
+	{IT_CONTROL, NULL, "Toggle Director",       M_ChangeControl, gc_director   },
+
+	{IT_HEADER, NULL, "Custom Lua Actions", NULL, 0},
+	{IT_SPACE, NULL, NULL, NULL, 0},
+	{IT_CONTROL, NULL, "Custom Action 1",       M_ChangeControl, gc_custom1    },
+	{IT_CONTROL, NULL, "Custom Action 2",       M_ChangeControl, gc_custom2    },
+	{IT_CONTROL, NULL, "Custom Action 3",       M_ChangeControl, gc_custom3    },
+};
+
+#define OP_JOYMENU(pnum) \
+	{IT_HEADER, NULL, "Gameplay Controls", NULL, 7},                                        \
+	{IT_STRING | IT_CVAR,  NULL, "Aim Forward/Back"       , &cv_aimaxis[pnum]       ,  15}, \
+	{IT_STRING | IT_CVAR,  NULL, "Turn Left/Right"        , &cv_turnaxis[pnum]      ,  20}, \
+	{IT_STRING | IT_CVAR,  NULL, "Accelerate"             , &cv_moveaxis[pnum]      ,  25}, \
+	{IT_STRING | IT_CVAR,  NULL, "Brake"                  , &cv_brakeaxis[pnum]     ,  30}, \
+	{IT_STRING | IT_CVAR,  NULL, "Drift"                  , &cv_driftaxis[pnum]     ,  35}, \
+	{IT_STRING | IT_CVAR,  NULL, "Use Item"               , &cv_fireaxis[pnum]      ,  40}, \
+	{IT_STRING | IT_CVAR,  NULL, "Look Backward"          , &cv_lookbackaxis[pnum]  ,  45}, \
+	{IT_STRING | IT_CVAR,  NULL, "Custom Button 1"        , &cv_custom1axis[pnum]   ,  50}, \
+	{IT_STRING | IT_CVAR,  NULL, "Custom Button 2"        , &cv_custom2axis[pnum]   ,  55}, \
+	{IT_STRING | IT_CVAR,  NULL, "Custom Button 3"        , &cv_custom3axis[pnum]   ,  60}, \
+	{IT_HEADER, NULL, "Camera Controls", NULL, 67}, \
+	{IT_STRING | IT_CVAR,  NULL, "Look Up/Down"           , &cv_lookaxis[pnum]      ,  75}, \
+	{IT_STRING | IT_CVAR,  NULL, "Turn Left/Right"        , &cv_camturnaxis[pnum]   ,  80}, \
+	{IT_STRING | IT_CVAR,  NULL, "Strafe Left/Right"      , &cv_camstrafeaxis[pnum] ,  85}, \
+	{IT_HEADER, NULL, "Deadzones", NULL, 92}, \
+	{IT_STRING | IT_CVAR,  NULL, "X deadzone"             , &cv_xdeadzone[pnum]     , 100}, \
+	{IT_STRING | IT_CVAR,  NULL, "Y deadzone"             , &cv_ydeadzone[pnum]     , 105}, \
+	{IT_HEADER, NULL, "Miscellaneous", NULL, 112},                                          \
+	{IT_STRING | IT_CVAR,  NULL, "Controller Rumble"      , &cv_rumble[pnum]        , 120}, \
+	{IT_STRING | IT_CVAR,  NULL, "Set LED to Player color", &cv_gamepadled[pnum]    , 125},
+
+static menuitem_t OP_Joystick1Menu[] =
+{
+	{IT_STRING | IT_CALL,  NULL, "Select Gamepad...", M_Setup1PJoystickMenu, 0},
+	OP_JOYMENU(0)
+};
+
+static menuitem_t OP_Joystick2Menu[] =
+{
+	{IT_STRING | IT_CALL,  NULL, "Select Gamepad...", M_Setup2PJoystickMenu, 0},
+	OP_JOYMENU(1)
+};
+
+static menuitem_t OP_Joystick3Menu[] =
+{
+	{IT_STRING | IT_CALL,  NULL, "Select Gamepad...", M_Setup3PJoystickMenu, 0},
+	OP_JOYMENU(2)
+};
+
+static menuitem_t OP_Joystick4Menu[] =
+{
+	{IT_STRING | IT_CALL,  NULL, "Select Gamepad...", M_Setup4PJoystickMenu, 0},
+	OP_JOYMENU(3)
+};
+
+static menuitem_t OP_JoystickSetMenu[] =
+{
+	{IT_CALL | IT_NOTHING, "None", NULL, M_AssignJoystick,  LINEHEIGHT+5},
+	{IT_CALL | IT_NOTHING, "",     NULL, M_AssignJoystick, (LINEHEIGHT*2)+5},
+	{IT_CALL | IT_NOTHING, "",     NULL, M_AssignJoystick, (LINEHEIGHT*3)+5},
+	{IT_CALL | IT_NOTHING, "",     NULL, M_AssignJoystick, (LINEHEIGHT*4)+5},
+	{IT_CALL | IT_NOTHING, "",     NULL, M_AssignJoystick, (LINEHEIGHT*5)+5},
+	{IT_CALL | IT_NOTHING, "",     NULL, M_AssignJoystick, (LINEHEIGHT*6)+5},
+	{IT_CALL | IT_NOTHING, "",     NULL, M_AssignJoystick, (LINEHEIGHT*7)+5},
+	{IT_CALL | IT_NOTHING, "",     NULL, M_AssignJoystick, (LINEHEIGHT*8)+5},
+};
+
+//WTF
+static menuitem_t OP_MouseOptionsMenu[] =
+{
+	{IT_STRING | IT_CVAR,                NULL, "Use Mouse",      &cv_usemouse,     10},
+
+	{IT_STRING | IT_CVAR,                NULL, "Mouse Turning",  &cv_mouseturn,    20},
+	{IT_STRING | IT_CVAR,                NULL, "Invert Mouse",   &cv_invertmouse,  30},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse X Speed",  &cv_mousesens,    40},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse Y Speed",  &cv_mouseysens,   50},
+};
+
+static const char* OP_MouseTooltips[] =
+{
+	"Enable the use of the mouse.",
+	"Turn using the mouse.",
+	"Invert mouse movements.",
+	"Mouse horizontal sensitivity.",
+	"Mouse vertical sensitivity.",
+};
+
+static menuitem_t OP_VideoOptionsMenu[] =
+{
+	{IT_STRING | IT_CALL,	NULL,	"Set Resolution...",		  M_VideoModeMenu,		  10},
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+	{IT_STRING|IT_CVAR,		NULL,	"Fullscreen",				  &cv_fullscreen,		  20},
+#endif
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
+							NULL,	"Brightness",				  &cv_globalgamma,		  30},
+
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
+	                        NULL, 	"Saturation",      			  &cv_globalsaturation ,  40},
+
+	{IT_SUBMENU|IT_STRING, NULL, 	"Advanced Color Settings...", &OP_ColorOptionsDef,    50},
+
+	{IT_STRING | IT_CVAR,	NULL,	"Draw Distance",			  &cv_drawdist,			  65},
+	{IT_STRING | IT_CVAR,	NULL,	"Weather Draw Distance",	  &cv_drawdist_precip,	  75},
+
+	{IT_STRING | IT_CVAR,	NULL,	"Show FPS",					  &cv_ticrate,			  95},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Sync",			  &cv_vidwait,			 105},
+	{IT_STRING | IT_CVAR,   NULL,   "FPS Cap",              	  &cv_fpscap,            115},
+	{IT_STRING | IT_CVAR,   NULL,   "Drift spark pulse size",	  &cv_driftsparkpulse,   125},
+	{IT_STRING | IT_CVAR, 	NULL, 	"VHS effect", 				  &cv_vhseffect, 		 135},
+#ifdef HWRENDER
+	{IT_SUBMENU|IT_STRING,	NULL,	"OpenGL Options...",		  &OP_OpenGLOptionsDef,	 145},
+#endif
+	{IT_SUBMENU|IT_STRING,  NULL,   "Advanced Video Options...",  &OP_ExpOptionsDef,     155},
+};
+
+static const char* OP_VideoTooltips[] =
+{
+	"Resolution game runs at.",
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+	"Enable fullscreen.",
+#endif
+	"Gamma (brightness) of the game.",
+	"Saturation of the game.",
+	"Advanced color settings of the game.",
+	"How far away objects are drawn.",
+	"How far away weather is drawn.",
+	"Show current game framerate and select the style.",
+	"Sync game framerate to refresh rate of monitor.",
+	"Set manual framerate cap.",
+	"Size of drift spark pulse.",
+	"Show a VHS-like effect when the game is paused\n or youre rewinding replays.",
+#ifdef HWRENDER
+	"Options for OpenGL renderer.",
+#endif
+	"Advanced graphical options.",
+};
+
+
+enum
+{
+	op_video_res = 0,
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+	op_video_fullscreen,
+#endif
+	op_video_gamma,
+	op_video_sat,
+	op_video_color,
+	op_video_dd,
+	op_video_wdd,
+	op_video_fps,
+	op_video_vsync,
+	op_video_fpscap,
+	op_video_driftsparkpulse,
+	op_exp_vhs,
+#ifdef HWRENDER
+	op_video_ogl,
+#endif
+	op_video_exp,
+};
+
+static menuitem_t OP_VideoModeMenu[] =
+{
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleVideoMode, '\0'},     // dummy menuitem for the control func
+};
+
+static menuitem_t OP_ColorOptionsMenu[] =
+{
+	{IT_STRING | IT_CALL, NULL, "Reset all", M_ResetCvars, 0},
+
+	{IT_HEADER, NULL, "Red", NULL, 9},
+	{IT_DISABLED, NULL, NULL, NULL, 35},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_rhue,         15},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_rsaturation,  20},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_rgamma,       25},
+
+	{IT_HEADER, NULL, "Yellow", NULL, 34},
+	{IT_DISABLED, NULL, NULL, NULL, 73},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_yhue,         40},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_ysaturation,  45},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_ygamma,       50},
+
+	{IT_HEADER, NULL, "Green", NULL, 59},
+	{IT_DISABLED, NULL, NULL, NULL, 112},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_ghue,         65},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_gsaturation,  70},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_ggamma,       75},
+
+	{IT_HEADER, NULL, "Cyan", NULL, 84},
+	{IT_DISABLED, NULL, NULL, NULL, 255},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_chue,         90},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_csaturation,  95},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_cgamma,      100},
+
+	{IT_HEADER, NULL, "Blue", NULL, 109},
+	{IT_DISABLED, NULL, NULL, NULL, 152},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_bhue,        115},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_bsaturation, 120},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_bgamma,      125},
+
+	{IT_HEADER, NULL, "Magenta", NULL, 134},
+	{IT_DISABLED, NULL, NULL, NULL, 181},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue",          &cv_mhue,        140},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation",   &cv_msaturation, 145},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness",   &cv_mgamma,      150},
+};
+
+static menuitem_t OP_ExpOptionsMenu[] =
+{
+	{IT_HEADER, NULL, "Advanced Video Options", NULL, 0},
+	{IT_STRING|IT_CVAR,		NULL, "Interpolation Distance",			&cv_maxinterpdist,		 	 10},
+	{IT_STRING | IT_CVAR, 	NULL, "Weather Interpolation", 			&cv_precipinterp, 		 	 15},
+
+	{IT_STRING | IT_CVAR, 	NULL, "Scale Weather with Mobjscale", 	&cv_mobjscaleprecip, 		 25},
+	{IT_STRING | IT_CVAR, 	NULL, "Less Weather Effects", 			&cv_lessprecip, 		 	 30},
+
+	{IT_STRING | IT_CVAR,   NULL, "Minimum Sector Brightness",		&cv_secbright,	  		 	 40},
+
+	//{IT_STRING | IT_CVAR,  NULL, "Randomized Directional Light",	&cv_randomdirlight,	  		 55}, // should this ever come back
+
+	{IT_STRING | IT_CVAR,	NULL, "Skyboxes",						&cv_skybox,				 	 50},
+
+	{IT_STRING | IT_CVAR,	NULL, "FPS counter sampling",			&cv_accuratefps,			 60},
+
+	{IT_STRING | IT_CVAR,	NULL, "Votescreen Scaling",				&cv_votebgscaling,			 70},
+
+#ifdef HWRENDER
+	{IT_STRING | IT_CVAR, 	NULL, "Screen Textures", 				&cv_glscreentextures, 		 80},
+#ifdef USE_FBO_OGL
+	{IT_STRING | IT_CVAR, 	NULL, "FBO Downsampling support", 		&cv_glframebuffer, 			 85},
+	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		 95},
+	{IT_DISABLED, 			NULL, "", 								NULL,     			 		105},	// dummy text
+#else
+	{IT_STRING | IT_CVAR, 	NULL, "Palette Depth", 					&cv_glpalettedepth, 		 90},
+	{IT_DISABLED, 			NULL, "", 								NULL,     			 		100},	// dummy text
+#endif
+#endif
+};
+
+static const char* OP_ExpTooltips[] =
+{
+	NULL,
+	"How far Mobj interpolation should take effect.",
+	"Should weather be interpolated? Weather should look about the\nsame but perform a bit better when disabled.",
+	"Should weather be scaled with Mapobjectscale?.",
+	"When weather is on this will cut the object amount used in half.",
+	"Sets minimum sector brightness, useful for dark areas",
+	//"Should the directional lightning be randomized each map?\nTakes effect on next map load.",
+	"Toggle being able to see the sky.",
+	"Change the FPS counter sampling method\nInaccurate updates slower and might miss frame drops and such\nAccurate updates faster and is more accurate, but might be less readable", // how to ingles??
+	"Different methods of scaling the votescreen backgrounds.",
+#ifdef HWRENDER
+	"Should the game do Screen Textures? Provides a good boost to frames\nat the cost of some visual effects not working when disabled.",
+#ifdef USE_FBO_OGL
+	"Allows the game to downsample from a higher resolution than your display\nin OpenGL renderer mode. Requires a GPU with atleast OpenGL 3.0 support.",
+#endif
+	"Change the bit depth of the Lookup Palette in Palette rendering mode\n 16 bits is like software looks ingame\nwhile 24 bits is how software looks in screenshots.",
+#endif
+};
+
+enum
+{
+	op_exp_header,
+	op_exp_interpdist,
+	op_exp_precipinter,
+	op_exp_precipmoscale,
+	op_exp_lessprecip,
+	op_exp_secbright,
+	//op_exp_dirlight,
+	op_exp_skybox,
+	op_exp_accuratefps,
+	op_exp_votescrn,
+#ifdef HWRENDER
+	op_exp_glscrtx,
+#ifdef USE_FBO_OGL
+	op_exp_fbo,
+#endif
+	op_exp_paldepth,
+#endif
+};
+
+
+#ifdef HWRENDER
+static menuitem_t OP_OpenGLOptionsMenu[] =
+{
+	{IT_STRING | IT_CVAR,	NULL, "3D Models",					&cv_glmdls,					15},
+	{IT_STRING | IT_CVAR,	NULL, "Fallback Player 3D Model",	&cv_glfallbackplayermodel,	20},
+	{IT_STRING | IT_CVAR,	NULL, "Shaders",					&cv_glshaders,				25},
+	{IT_STRING | IT_CVAR,	NULL, "Palette Rendering",			&cv_glpaletterendering,		30},
+	{IT_STRING | IT_CVAR,   NULL, "Palette Rendering Flashpals",&cv_glflashpal,				35},
+	//{IT_STRING | IT_CVAR, 	NULL, "Min Shader Brightness", 		&cv_glsecbright,			40},
+
+	{IT_STRING | IT_CVAR,	NULL, "Texture Quality",			&cv_gltexturedepth,			45},
+	{IT_STRING | IT_CVAR,	NULL, "Texture Filter",				&cv_glfiltermode,			50},
+	{IT_STRING | IT_CVAR,	NULL, "Anisotropic",				&cv_glanisotropicmode,		55},
+	{IT_STRING | IT_CVAR,	NULL, "Visual Portals",		  		&cv_glportals,				60},
+
+	{IT_STRING | IT_CVAR,	NULL, "Wall Contrast Style",		&cv_glfakecontrast,			70},
+	{IT_STRING | IT_CVAR,	NULL, "Slope Contrast",				&cv_glslopecontrast,		75},
+	{IT_STRING | IT_CVAR, 	NULL, "Dithered Lightning", 		&cv_gllightdither,			80},
+	{IT_STRING | IT_CVAR,	NULL, "Sprite Billboarding",		&cv_glspritebillboarding,	85},
+	{IT_STRING | IT_CVAR,	NULL, "Software Perspective",		&cv_glshearing,				90},
+	{IT_STRING | IT_CVAR,	NULL, "Rendering Distance",			&cv_glrenderdistance,		95},
+};
+
+static const char* OP_OpenGLTooltips[] =
+{
+	"Use 3D models.",
+	"Fallback 3D model for characters that don't have any.",
+	"Graphical Shaders.",
+	"Recreates the look of software mode.",
+	"Flash palettes for palette rendering.",
+	"Bit-depth of textures.",
+	"Filter to use on textures.",
+	"Anisotropic filtering.",
+	"Recreates an effect from software mode that is used on some maps.",
+	"The look of the wall contrast effect.",
+	"Wall contrast but for slopes.",
+	"Should shader lightning be dithered?",
+	"Should sprites always face the camera?",
+	"Recreates the look of software mode camera perspective.",
+	"How far the game world should be drawn.",
+};
+
+enum
+{
+	op_gl_mdls,
+	op_gl_falbckmdls,
+	op_gl_shader,
+	op_gl_palrender,
+	op_gl_flashpal,
+	op_gl_scrdepth,
+	op_gl_filter,
+	op_gl_anis,
+	op_gl_portal,
+	op_gl_wallcont,
+	op_gl_slopecont,
+	op_gl_lightdither,
+	op_gl_bill,
+	op_gl_shearing,
+	op_gl_renderdist,
+};
+
+#endif
+
+static menuitem_t OP_SoundOptionsMenu[] =
+{
+	{IT_STRING|IT_CVAR|IT_CV_NOPRINT,			NULL, "SFX",							&cv_gamesounds,			 	10},
+	{IT_STRING|IT_CVAR|IT_CV_SLIDER,
+												NULL, "SFX Volume",						&cv_soundvolume,		 	18},
+
+	{IT_STRING|IT_CVAR|IT_CV_NOPRINT,			NULL, "Music",							&cv_gamedigimusic,		 	30},
+	{IT_STRING|IT_CVAR|IT_CV_SLIDER,
+												NULL, "Music Volume",					&cv_digmusicvolume,		 	38},
+
+#ifndef NO_MIDI
+	{IT_STRING|IT_CVAR,			NULL, "MIDI",					&cv_gamemidimusic,		 50},
+	{IT_STRING|IT_CVAR|IT_CV_SLIDER,
+								NULL, "MIDI Volume",			&cv_midimusicvolume,	 58},
+
+	{IT_STRING|IT_CVAR,							NULL, "Reverse L/R Channels",			&stereoreverse,			 	50},
+
+	{IT_STRING|IT_CVAR,							NULL, "Chat Notifications",				&cv_chatnotifications,	 	65},
+	{IT_STRING|IT_CVAR,							NULL, "Character voices",				&cv_kartvoices,			 	75},
+	{IT_STRING|IT_CVAR,							NULL, "Hit Em Delay",				    &cv_karthitemdialog,		85},
+	{IT_STRING|IT_CVAR,							NULL, "Powerup Warning",				&cv_kartinvinsfx,		 	95},
+
+	{IT_KEYHANDLER|IT_STRING,					NULL, "Sound Test",						M_HandleSoundTest,			105},
+	{IT_STRING|IT_CALL,							NULL, "Music Test",						M_MusicTest,				115},
+
+	{IT_STRING|IT_SUBMENU, 						NULL, "Advanced Settings...", 			&OP_SoundAdvancedDef, 		125}
+#else
+	{IT_STRING|IT_CVAR,							NULL, "Reverse L/R Channels",			&stereoreverse,			 	60},
+
+	{IT_STRING|IT_CVAR,							NULL, "Chat Notifications",				&cv_chatnotifications,	 	75},
+	{IT_STRING|IT_CVAR,							NULL, "Character voices",				&cv_kartvoices,			 	85},
+	{IT_STRING|IT_CVAR,							NULL, "Hit Em Delay",				    &cv_karthitemdialog,		95},
+	{IT_STRING|IT_CVAR,							NULL, "Powerup Warning",				&cv_kartinvinsfx,		 	105},
+
+	{IT_KEYHANDLER|IT_STRING,					NULL, "Sound Test",						M_HandleSoundTest,			115},
+	{IT_STRING|IT_CALL,							NULL, "Music Test",						M_MusicTest,				125},
+
+	{IT_STRING|IT_SUBMENU, 						NULL, "Advanced Settings...", 			&OP_SoundAdvancedDef, 		135}
+#endif
+};
+
+static const char* OP_SoundTooltips[] =
+{
+	"Turn Sound effects on or off.",
+	"Volume of Sound effects.",
+	"Turn Music on or off.",
+	"Volume of Music.",
+#ifndef NO_MIDI
+	"Turn Midi Music on or off.",
+	"Volume of Midi Music.",
+#endif
+	"Reverse left and right channels of audio.",
+	"Chat notification sound.",
+	"Frequency of character voice lines.",
+	"Play 'Hit Em' character line after other player's hurt line.",
+	"Should the powerup warning be a sound effect or music?",
+	"Testing sounds...",
+	"Testing music...",
+	"Options for advanced sound settings.",
+};
+
+
+static menuitem_t OP_SoundAdvancedMenu[] =
+{
+#ifdef HAVE_OPENMPT
+	{IT_HEADER, NULL, "Tracker Module Options", NULL, 0},
+
+	{IT_STRING | IT_CVAR, 	NULL, "Instrument Filter", 			&cv_modfilter, 		 10},
+	{IT_STRING | IT_CVAR,	NULL, "Amiga Resampler", 			&cv_amigafilter, 	 20},
+#if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR > 4
+	{IT_STRING | IT_CVAR, 	NULL, "Amiga Type", 				&cv_amigatype, 		 25},
+#endif
+	{IT_STRING | IT_CVAR, 	NULL, "Stereo Seperation", 			&cv_stereosep, 		 35},
+#endif
+
+	{IT_HEADER, 			NULL, "Misc", 						NULL, 				 45},
+
+	{IT_STRING | IT_CVAR, 	NULL, "Same Sound Limit", 			&cv_samesoundlimit,  55},
+
+	{IT_STRING | IT_CVAR, 	NULL, "Grow Music", 				&cv_growmusic, 		 65},
+	{IT_STRING | IT_CVAR, 	NULL, "Invulnerability Music", 		&cv_supermusic, 	 70},
+
+	{IT_STRING | IT_CVAR, 	NULL, "Keep Map Music", 			&cv_keepmusic, 		 80},
+	{IT_STRING | IT_CVAR, 	NULL, "Skip Intro Music", 			&cv_skipintromusic,  85},
+
+	{IT_STRING | IT_CVAR, 	NULL, "Audio Buffer Size", 			&cv_audbuffersize,   90},
+	{IT_DISABLED, 			NULL, "", 							NULL,     			100},	// dummy text
+};
+
+static const char* OP_SoundAdvancedTooltips[] =
+{
+#ifdef HAVE_OPENMPT
+	NULL,
+
+	"Filter used to resample tracker instruments.",
+	"Resample tracker modules to sound similar to Paula hardware.",
+#if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR > 4
+	"Which Amiga should be used for .mod playback?",
+#endif
+	"How far should the four channels in .mod be panned?",
+#endif
+	NULL,
+	"How many times is the same sound allowed to play at once?\nIf 0 theres no limit.",
+	"Should the Grow music be on or off?",
+	"Should the Invulnerability music be on or off?",
+	"Should music be kept when restarting the map?",
+	"Should the Intro fanfare be skipped\nand map music be played on map start?",
+	"Size of the Audio Buffer\nreducing it will result in less sound latency\nbut may cause issues such as crackling or distorted Sound.",
+};
+
+static menuitem_t OP_FocusOptionsMenu[] =
+{
+	{IT_HEADER, NULL, "Game Focus Options", NULL, 0},
+
+	{IT_STRING|IT_CVAR,	NULL, "Play Music While Unfocused",					&cv_playmusicifunfocused, 	30},
+	{IT_STRING|IT_CVAR,	NULL, "Play SFX While Unfocused",					&cv_playsoundifunfocused, 	40},
+
+	{IT_STRING|IT_CVAR,	NULL, "Pause Game While Unfocused",					&cv_pauseifunfocused,		60},
+
+	{IT_STRING|IT_CVAR,	NULL, "Background FPS Cap",         				&cv_fpscapbg,          		80},
+
+	{IT_STRING|IT_CVAR,	NULL, "Show \"FOCUS LOST\"",						&cv_showfocuslost,		   100},
+
+	{IT_STRING|IT_CVAR,	NULL, "Always Grab Mouse While Focused",			&cv_alwaysgrabmouse,	   120},
+};
+
+static const char* OP_FocusOptionsTooltips[] =
+{
+	NULL,
+	"Should music play while the game is unfocused?",
+	"Should soundeffects play while the game is unfocused?",
+	"Should the game pause while the game is unfocused?",
+	"Set manual framerate cap while the game is unfocused.",
+	"Should the FOCUS LOST window appear\n while the game is unfocused?",
+	"Should the mouse cursor be grabbed and hidden\n while the game is in focus?",
+};
+
+static menuitem_t OP_DataOptionsMenu[] =
+{
+	{IT_STRING | IT_CALL,		NULL, "Screenshot Options...",	M_ScreenshotOptions,	 10},
+	{IT_STRING | IT_CALL,		NULL, "Addon Options...",		M_AddonsOptions,		 20},
+	{IT_STRING | IT_SUBMENU,	NULL, "Replay Options...",		&MISC_ReplayOptionsDef,	 30},
+	{IT_STRING | IT_SUBMENU,	NULL, "Protocol options...",	&OP_ProtocolDef,		 40},
+#ifdef HAVE_DISCORDRPC
+	{IT_STRING | IT_SUBMENU,	NULL, "Discord Options...",		&OP_DiscordOptionsDef,	 50},
+
+	{IT_STRING | IT_SUBMENU,	NULL, "Erase Data...",			&OP_EraseDataDef,		 70},
+#else
+	{IT_STRING | IT_SUBMENU,	NULL, "Erase Data...",			&OP_EraseDataDef,		 60},
+#endif
+};
+
+static menuitem_t OP_ScreenshotOptionsMenu[] =
+{
+	{IT_HEADER, NULL, "Screenshots (F8)", NULL, 5},
+	{IT_STRING|IT_CVAR, NULL, "Storage Location",  &cv_screenshot_option,          10},
+	{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder", &cv_screenshot_folder, 15},
+	{IT_STRING|IT_CVAR, NULL, "Memory Level",      &cv_zlib_memory,                30},
+	{IT_STRING|IT_CVAR, NULL, "Compression Level", &cv_zlib_level,                 35},
+	{IT_STRING|IT_CVAR, NULL, "Strategy",          &cv_zlib_strategy,              40},
+	{IT_STRING|IT_CVAR, NULL, "Window Size",       &cv_zlib_window_bits,           45},
+
+	{IT_HEADER, NULL, "Movie Mode (F9)", NULL, 55},
+	{IT_STRING|IT_CVAR, NULL, "Storage Location",  &cv_movie_option,              60},
+	{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder", &cv_movie_folder, 	  65},
+	{IT_STRING|IT_CVAR, NULL, "Capture Mode",      &cv_moviemode,                 80},
+
+	{IT_STRING|IT_CVAR, NULL, "Region Optimizing", &cv_gif_optimize,              90},
+	{IT_STRING|IT_CVAR, NULL, "Downscaling",       &cv_gif_downscale,             95},
+
+	{IT_STRING|IT_CVAR, NULL, "Memory Level",      &cv_zlib_memorya,              90},
+	{IT_STRING|IT_CVAR, NULL, "Compression Level", &cv_zlib_levela,               95},
+	{IT_STRING|IT_CVAR, NULL, "Strategy",          &cv_zlib_strategya,            100},
+	{IT_STRING|IT_CVAR, NULL, "Window Size",       &cv_zlib_window_bitsa,         105},
+};
+
+enum
+{
+	op_screenshot_folder = 2,
+	op_movie_folder = 9,
+	op_screenshot_capture = 10,
+	op_screenshot_gif_start = 11,
+	op_screenshot_gif_end = 12,
+	op_screenshot_apng_start = 13,
+	op_screenshot_apng_end = 16,
+};
+
+
+static menuitem_t OP_EraseDataMenu[] =
+{
+	{IT_STRING | IT_CALL, NULL, "Erase Record Data", M_EraseData, 10},
+	{IT_STRING | IT_CALL, NULL, "Erase Unlockable Data", M_EraseData, 20},
+
+	{IT_STRING | IT_CALL, NULL, "\x85" "Erase ALL Data", M_EraseData, 40},
+};
+
+static menuitem_t OP_AddonsOptionsMenu[] =
+{
+	{IT_HEADER,                      NULL, "Menu",                        NULL,                    0},
+	{IT_STRING|IT_CVAR,              NULL, "Location",                    &cv_addons_option,      10},
+	{IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder",               &cv_addons_folder,      20},
+	{IT_STRING|IT_CVAR,              NULL, "Identify addons via",         &cv_addons_md5,         48},
+	{IT_STRING|IT_CVAR,              NULL, "Show unsupported file types", &cv_addons_showall,     58},
+
+	{IT_HEADER,                      NULL, "Search",                      NULL,                   76},
+	{IT_STRING|IT_CVAR,              NULL, "Matching",                    &cv_addons_search_type, 86},
+	{IT_STRING|IT_CVAR,              NULL, "Case-sensitive",              &cv_addons_search_case, 96},
+};
+
+enum
+{
+	op_addons_folder = 2,
+};
+
+static menuitem_t OP_ProtocolMenu[] =
+{
+	{IT_STRING | IT_CALL, NULL, "Register protocol", D_CreateProtocol, 10},
+	{IT_STRING | IT_CALL, NULL, "\x85" "Disable and delete protocols", M_DeleteProtocol, 20},
+};
+
+#ifdef HAVE_DISCORDRPC
+static menuitem_t OP_DiscordOptionsMenu[] =
+{
+	{IT_STRING | IT_CVAR,		NULL, "Rich Presence",			&cv_discordrp,			 10},
+
+	{IT_HEADER,					NULL, "Rich Presence Settings",	NULL,					 30},
+	{IT_STRING | IT_CVAR,		NULL, "Streamer Mode",			&cv_discordstreamer,	 40},
+
+	{IT_STRING | IT_CVAR,		NULL, "Allow Ask To Join",		&cv_discordasks,		 60},
+	{IT_STRING | IT_CVAR,		NULL, "Allow Invites",			&cv_discordinvites,		 70},
+};
+#endif
+
+static menuitem_t OP_HUDOptionsMenu[] =
+{
+	{IT_STRING | IT_CVAR, NULL,		"Show HUD (F3)",			&cv_showhud,			 10},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
+	                      NULL,		"HUD Visibility",			&cv_translucenthud,		 20},
+
+	{IT_STRING | IT_SUBMENU, NULL,	"Online HUD options...",	&OP_ChatOptionsDef,		 35},
+	{IT_STRING | IT_CVAR, NULL,		"Background Glass",			&cons_backcolor,		 45},
+
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
+						  NULL,		"Minimap Visibility",		&cv_kartminimap,		 60},
+	{IT_STRING | IT_CVAR, NULL,		"Speedometer Display",		&cv_kartspeedometer,	 70},
+	{IT_STRING | IT_CVAR, NULL,		"Show \"CHECK\"",			&cv_kartcheck,			 80},
+
+	{IT_STRING | IT_CVAR, NULL,		"Menu Highlights",			&cons_menuhighlight,	 95},
+	// highlight info - (GOOD HIGHLIGHT, WARNING HIGHLIGHT) - 110 (see M_DrawHUDOptions)
+
+	{IT_STRING | IT_CVAR, NULL,		"Console Text Size",		&cv_constextsize,		120},
+
+	{IT_STRING | IT_CVAR, NULL,		"Show Track Addon Name",	&cv_showtrackaddon,   	135},
+
+	{IT_STRING | IT_CVAR, NULL,		"Show All Maps",			&cv_showallmaps,		145},
+
+	{IT_STRING | IT_CVAR, NULL,		"2D character select",		&cv_skinselectmenu,		155},
+};
+
+static menuitem_t OP_CamOptionsMenu[] =
+{
+	{IT_HEADER, NULL, "Camera Options", NULL, 0},
+
+	{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT,	NULL,	"Field of View",&cv_fov,				  	 30},
+
+	{IT_STRING | IT_SUBMENU,	NULL, "Player 1 Camera options...",	&OP_Player1CamOptionsDef,	 50},
+	{IT_STRING | IT_SUBMENU,	NULL, "Player 2 Camera options...",	&OP_Player2CamOptionsDef,	 60},
+	{IT_STRING | IT_SUBMENU,	NULL, "Player 3 Camera options...",	&OP_Player3CamOptionsDef,	 70},
+	{IT_STRING | IT_SUBMENU,	NULL, "Player 4 Camera options...",	&OP_Player4CamOptionsDef,	 80},
+};
+
+static const char* OP_CamOptionsTooltips[] =
+{
+	NULL,
+	"Player field of view.",
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+};
+
+#define OP_CAMMENU(pnum) \
+{IT_STRING | IT_CVAR, NULL,						"Flipcam",   				&cv_flipcam[pnum],			30}, \
+{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL,	"Camera Distance",   		&cv_cam_dist[pnum],		    50}, \
+{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL,	"Camera Height",   			&cv_cam_height[pnum],		60}, \
+{IT_STRING | IT_CVAR, NULL,						"Camera Speed",   			&cv_cam_speed[pnum],		70}, \
+{IT_STRING | IT_CVAR, NULL, 					"Camera Lookback Momentum", &cv_lookbackmom[pnum], 	    90}, \
+{IT_STRING | IT_CVAR, NULL, 					"Camera Vertical Look",     &cv_verticallook[pnum],    100}, \
+{IT_STRING | IT_CVAR, NULL,						"Freecam Speed",   			&cv_freecam_speed[pnum],   120}, \
+{IT_STRING | IT_CVAR, NULL,						"Third Person Camera",   	&cv_chasecam[pnum],	       135}, \
+
+static menuitem_t OP_Player1CamOptionsMenu[] =
+{
+	{IT_HEADER, NULL, "Player 1 Camera Options", NULL, 0},
+	OP_CAMMENU(0)
+};
+
+static menuitem_t OP_Player2CamOptionsMenu[] =
+{
+	{IT_HEADER, NULL, "Player 2 Camera Options", NULL, 0},
+	OP_CAMMENU(1)
+};
+
+static menuitem_t OP_Player3CamOptionsMenu[] =
+{
+	{IT_HEADER, NULL, "Player 3 Camera Options", NULL, 0},
+	OP_CAMMENU(2)
+};
+
+static menuitem_t OP_Player4CamOptionsMenu[] =
+{
+	{IT_HEADER, NULL, "Player 4 Camera Options", NULL, 0},
+	OP_CAMMENU(3)
+};
+
+static const char* OP_PlayerCamOptionsTooltips[] =
+{
+	NULL,
+	"Should the Camera flip on gravity flipped sections?.",
+	"Camera distance relative to the Player.",
+	"Height of the Camera",
+	"Speed of the Camera",
+	"Should looking back inherit the Players Momentum?\nEither inherit Player Momentum or double of it\nmay make looking back while boosting or going in high speed less jarring",
+	"Allows looking up/down by holding\naim forward/backward while standing still.",
+	"Speed of the Freecam/Spectator Camera",
+	"Toggle between Third or First Person camera",
+};
+
+// Ok it's still called chatoptions but we'll put ping display in here to be clean
+static menuitem_t OP_ChatOptionsMenu[] =
+{
+	// will ANYONE who doesn't know how to use the console want to touch this one?
+	{IT_STRING | IT_CVAR, NULL, "Chat Mode",				&cv_consolechat,		5}, // nonetheless...
+
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
+	                      NULL, "Chat Box Width",			&cv_chatwidth,			20},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER,
+	                      NULL, "Chat Box Height",			&cv_chatheight,			30},
+
+	{IT_STRING | IT_CVAR, NULL, "Chat Background Tint",		&cv_chatbacktint,		45},
+	{IT_STRING | IT_CVAR, NULL, "Message Fadeout Time",		&cv_chattime,			55},
+	{IT_STRING | IT_CVAR, NULL, "Spam Protection",			&cv_chatspamprotection,	65},
+	{IT_STRING | IT_CVAR, NULL, "Max Chat Messages",		&cv_chatlogsize,		75},
+
+	{IT_STRING | IT_CVAR, NULL, "Local ping display",		&cv_showping,			95},	// shows ping above the framerate if we want to.
+	{IT_STRING | IT_CVAR, NULL, "Ping display style",		&cv_pingstyle,			105},
+	{IT_STRING | IT_CVAR, NULL, "Ping measurement",			&cv_pingmeasurement,	115},
+	{IT_STRING | IT_CVAR, NULL, "Ping icon",				&cv_pingicon,			125},
+
+	{IT_STRING | IT_CVAR, NULL, "Show IP address in playerlist",		&cv_shownodeip,	135},
+};
+
+static const char* OP_ChatOptionsTooltips[] =
+{
+	"Chat mode used for in-game chat.",
+	"Width of chat box.",
+	"Height of chat box.",
+	"Chatbox background.",
+	"Fadeout time for new chat message.",
+	"Spam protection for in-game chat.",
+	"Maxiumum amount of chat messages to look back at.",
+	"Show player ping.",
+	"Choose the looks of the ping display.", // this is ass idk english lmao
+	"Measurement used for ping.",
+	"Visibility of ping icon.",
+	"Should Player IP addresses be printed when using\nthe nodes or listplayers command?",
+};
+
+static menuitem_t OP_GameOptionsMenu[] =
+{
+	{IT_STRING | IT_SUBMENU, NULL, "Random Item Toggles...",	&OP_MonitorToggleDef,	 10},
+
+	{IT_STRING | IT_CVAR, NULL, "Game Speed",					&cv_kartspeed,			 30},
+	{IT_STRING | IT_CVAR, NULL, "Frantic Items",				&cv_kartfrantic,		 40},
+	{IT_SECRET,           NULL, "Encore Mode",					&cv_kartencore,			 50},
+
+	{IT_STRING | IT_CVAR, NULL, "Number of Laps",				&cv_basenumlaps,		 70},
+	{IT_STRING | IT_CVAR, NULL, "Exit Countdown Timer",			&cv_countdowntime,		 80},
+
+	{IT_STRING | IT_CVAR, NULL, "Time Limit",					&cv_timelimit,			100},
+	{IT_STRING | IT_CVAR, NULL, "Starting Bumpers",				&cv_kartbumpers,		110},
+	{IT_STRING | IT_CVAR, NULL, "Karma Comeback",				&cv_kartcomeback,		120},
+
+	{IT_STRING | IT_CVAR, NULL, "Force Character",				&cv_forceskin,          140},
+	{IT_STRING | IT_CVAR, NULL, "Restrict Character Changes",	&cv_restrictskinchange, 150},
+};
+
+enum
+{
+	op_game_ittggl,
+	op_game_spd,
+	op_game_frantic,
+	op_game_encore,
+	op_game_numlaps,
+	op_game_countdown,
+	op_game_timelimit,
+	op_game_startbump,
+	op_game_karma,
+	op_game_forcechar,
+	op_game_restrictchar,
+};
+
+static const char* OP_GameTooltips[] =
+{
+	"Toggles for all in-game items.",
+	"Driving speed of game in race mode.",
+	"Crazier item rolls.",
+	"Mirror mode.",
+	"Number of laps.",
+	"Countdown for other players when people finish.",
+	"Time limit for battle mode.",
+	"Number of bumpers to start with in battle mode.",
+	"Allow players to come back via karma in battle mode.",
+	"Force everyone to use the same character.",
+	"Prevent character changes.",
+};
+
+static menuitem_t OP_ServerOptionsMenu[] =
+{
+#ifndef NONET
+	{IT_STRING | IT_CVAR | IT_CV_STRING,
+	                         NULL, "Server Name",					&cv_servername,			 10},
+#endif
+	{IT_STRING | IT_CVAR,    NULL, "Intermission Timer",			&cv_inttime,			 40},
+	{IT_STRING | IT_CVAR,    NULL, "Map Progression",				&cv_advancemap,			 50},
+	{IT_STRING | IT_CVAR,    NULL, "Voting Timer",					&cv_votetime,			 60},
+	{IT_STRING | IT_CVAR,    NULL, "Voting Rule Changes",			&cv_kartvoterulechanges, 70},
+
+#ifndef NONET
+	{IT_STRING | IT_CVAR,    NULL, "Max. Player Count",				&cv_maxplayers,			 90},
+	{IT_STRING | IT_CVAR,    NULL, "Allow Players to Join",			&cv_allownewplayer,		100},
+	{IT_STRING | IT_CVAR,    NULL, "Allow Addon Downloading",		&cv_downloading,		110},
+	{IT_STRING | IT_CVAR,    NULL, "Pause Permission",				&cv_pause,				120},
+	{IT_STRING | IT_CVAR,    NULL, "Mute All Chat",					&cv_mute,				130},
+
+	{IT_SUBMENU|IT_STRING,   NULL, "Advanced Options...",			&OP_AdvServerOptionsDef,150},
+#endif
+};
+
+static const char* OP_ServerOptionsTooltips[] =
+{
+#ifndef NONET
+	"Name of server.",
+#endif
+	"Length of intermission after races.",
+	"How the next map to be played is choosen.",
+	"How long map voting is.",
+	"How often should other gamemodes appear.",
+#ifndef NONET
+	"Max amount of players allowed in this server.",
+	"Allow players to join this server.",
+	"Allow players to download addons.",
+	"Who has permission to pause the server?",
+	"Completely mute in game chat.",
+	"Options for advanced server settings.",
+#endif
+};
+
+#ifndef NONET
+static menuitem_t OP_AdvServerOptionsMenu[] =
+{
+#ifndef MASTERSERVER
+	{IT_GRAYEDOUT, 			 NULL, "Server Browser Address",		NULL,		 			 10},
+#else
+	{IT_STRING | IT_CVAR | IT_CV_STRING,
+							 NULL, "Server Browser Address",		&cv_masterserver,	 	 10},
+#endif
+	{IT_STRING | IT_CVAR,    NULL, "Attempts to resynchronise",		&cv_resynchattempts,	 25},
+#ifdef SATURNPAK
+	{IT_STRING | IT_CVAR,    NULL, "Resend Gamestate Cooldown",		&cv_resynchcooldown,	 35},
+	{IT_STRING | IT_CVAR,    NULL, "Resend Gamestate Attempts",		&cv_gamestateattempts,	 40},
+
+	{IT_STRING | IT_CVAR,    NULL, "Delay limit (frames)",			&cv_maxping,			 50},
+	{IT_STRING | IT_CVAR,    NULL, "Delay timeout (s)",				&cv_pingtimeout,		 55},
+	{IT_STRING | IT_CVAR,    NULL, "Connection timeout (tics)",		&cv_nettimeout,			 60},
+	{IT_STRING | IT_CVAR,    NULL, "Join timeout (tics)",			&cv_jointimeout,		 65},
+
+	{IT_STRING | IT_CVAR,    NULL, "Max. file transfer send (KB)",	&cv_maxsend,			 75},
+	{IT_STRING | IT_CVAR,    NULL, "File transfer packet rate",		&cv_downloadspeed,		 80},
+
+	{IT_STRING | IT_CVAR,    NULL, "Log join addresses",			&cv_showjoinaddress,	 90},
+	{IT_STRING | IT_CVAR,    NULL, "Log resyncs",					&cv_blamecfail,			 95},
+	{IT_STRING | IT_CVAR,    NULL, "Log file transfers",			&cv_noticedownload,		100},
+#else
+	{IT_STRING | IT_CVAR,    NULL, "Delay limit (frames)",			&cv_maxping,			 35},
+	{IT_STRING | IT_CVAR,    NULL, "Delay timeout (s)",				&cv_pingtimeout,		 40},
+	{IT_STRING | IT_CVAR,    NULL, "Connection timeout (tics)",		&cv_nettimeout,			 45},
+	{IT_STRING | IT_CVAR,    NULL, "Join timeout (tics)",			&cv_jointimeout,		 50},
+
+	{IT_STRING | IT_CVAR,    NULL, "Max. file transfer send (KB)",	&cv_maxsend,			 60},
+	{IT_STRING | IT_CVAR,    NULL, "File transfer packet rate",		&cv_downloadspeed,		 65},
+
+	{IT_STRING | IT_CVAR,    NULL, "Log join addresses",			&cv_showjoinaddress,	 70},
+	{IT_STRING | IT_CVAR,    NULL, "Log resyncs",					&cv_blamecfail,			 75},
+	{IT_STRING | IT_CVAR,    NULL, "Log file transfers",			&cv_noticedownload,		 80},
+#endif
+};
+
+static const char* OP_AdvServerOptionsTooltips[] =
+{
+	"Server used for master server.",
+	"Attempts to resynchronise player to server.",
+#ifdef SATURNPAK
+	"Cooldown in seconds before the Server attempts\nto resend the gamestate to a Saturn Client\nbetween resending attempts.",
+	"Attempts to resend the Gamestate to player\nThis increments a Counter everytime a gamestate resend occurs\nThis Counter decrements at double the time of the Cooldown\nonce the Counter reaches the threshold, the client gets kicked.",
+#endif
+	"Maximum allowed delay.",
+	"Delay timeout in seconds.",
+	"Connection timeout in tics.",
+	"Join timeout in tics",
+	"Max file size sent in kilobytes.",
+	"Packet rate for file transfers.",
+	"Log ip addresses of players who join.",
+	"Log player resync attempts.",
+	"Log player file transfers.",
+};
+#endif
+
+#define ITEMTOGGLEBOTTOMRIGHT
+
+static menuitem_t OP_MonitorToggleMenu[] =
+{
+	// Mostly handled by the drawing function.
+	// Instead of using this for dumb monitors, lets use the new item bools we have :V
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Sneakers",				M_HandleMonitorToggles, KITEM_SNEAKER},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Sneakers x3",			M_HandleMonitorToggles, KRITEM_TRIPLESNEAKER},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Rocket Sneakers",		M_HandleMonitorToggles, KITEM_ROCKETSNEAKER},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Toggle All",			M_HandleMonitorToggles, 0},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Bananas",				M_HandleMonitorToggles, KITEM_BANANA},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Bananas x3",			M_HandleMonitorToggles, KRITEM_TRIPLEBANANA},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Bananas x10",			M_HandleMonitorToggles, KRITEM_TENFOLDBANANA},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Eggman Monitors",		M_HandleMonitorToggles, KITEM_EGGMAN},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Orbinauts",				M_HandleMonitorToggles, KITEM_ORBINAUT},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Orbinauts x3",			M_HandleMonitorToggles, KRITEM_TRIPLEORBINAUT},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Orbinauts x4",			M_HandleMonitorToggles, KRITEM_QUADORBINAUT},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Mines",					M_HandleMonitorToggles, KITEM_MINE},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Jawz",					M_HandleMonitorToggles, KITEM_JAWZ},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Jawz x2",				M_HandleMonitorToggles, KRITEM_DUALJAWZ},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Ballhogs",				M_HandleMonitorToggles, KITEM_BALLHOG},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Self-Propelled Bombs",	M_HandleMonitorToggles, KITEM_SPB},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Invincibility",			M_HandleMonitorToggles, KITEM_INVINCIBILITY},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Grow",					M_HandleMonitorToggles, KITEM_GROW},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Shrink",				M_HandleMonitorToggles, KITEM_SHRINK},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Thunder Shields",		M_HandleMonitorToggles, KITEM_THUNDERSHIELD},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Hyudoros",				M_HandleMonitorToggles, KITEM_HYUDORO},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Pogo Springs",		 	M_HandleMonitorToggles, KITEM_POGOSPRING},
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "Kitchen Sinks",			M_HandleMonitorToggles, KITEM_KITCHENSINK},
+#ifdef ITEMTOGGLEBOTTOMRIGHT
+	{IT_KEYHANDLER | IT_NOTHING, NULL, "---",					M_HandleMonitorToggles, 255},
+#endif
+};
+
+static menuitem_t OP_AccessibilityMenu[] =
+{
+	{IT_HEADER, NULL, "Accessibility options", NULL, 0},
+
+	{IT_HEADER, NULL, "Visual", NULL, 10},
+
+	{IT_STRING|IT_CVAR|IT_CV_SLIDER,   NULL,   "Brightness",                     &cv_globalgamma,        20},
+	{IT_STRING|IT_CVAR|IT_CV_SLIDER,   NULL,   "Saturation",                     &cv_globalsaturation,   25},
+	{IT_SUBMENU|IT_STRING,             NULL,   "Video Color Settings...",        &OP_ColorOptionsDef,    30},
+
+	{IT_STRING|IT_CVAR,                NULL,   "Midnight Channel Flicker",       &cv_lessflicker,        35},
+
+	{IT_STRING|IT_CVAR,                NULL,   "Minimum Sector Brightness",      &cv_secbright,          40},
+
+#ifdef HWRENDER
+	{IT_STRING|IT_CVAR,                NULL,   "Screen Textures",                &cv_glscreentextures,   45},
+#endif
+
+	{IT_STRING|IT_CVAR,                NULL,   "Water Surface Ripples",          &cv_ripplewater,        50},
+
+	{IT_STRING|IT_CVAR,                NULL,   "Fade Players near Camera",       &cv_playerfade,         55},
+
+	{IT_STRING|IT_CVAR,                NULL,   "Quake Screenshakes",             &cv_screenquake,        60},
+
+	{IT_SUBMENU|IT_STRING,             NULL,   "Camera Options...",              &OP_CamOptionsDef,      65},
+
+	{IT_HEADER, NULL, "Audio", NULL, 75},
+
+	{IT_STRING|IT_CVAR,                NULL,   "Reverse L/R Channels",           &stereoreverse,         85},
+	{IT_STRING|IT_CVAR,                NULL,   "Same Sound Limit",               &cv_samesoundlimit,     90},
+};
+
+static const char* OP_AccessibilityTooltips[] =
+{
+	NULL,
+	NULL,
+	"Gamma (brightness) of the game.",
+	"Saturation of the game.",
+	"Advanced color settings of the game.",
+	"Disables the flicker effect on Midnight Channel.",
+	"Sets minimum sector brightness, useful for dark areas",
+#ifdef HWRENDER
+	"Should the game do Screen Textures? Provides a good boost to frames\nat the cost of some visual effects not working when disabled.",
+#endif
+	"Toggles the ripple effect on water surfaces",
+	"Fades other Players that are close to the camera in and out",
+	"Toggles the screen shake effect during Earthquakes",
+	"Camera Options",
+	NULL,
+	"Reverse left and right channels of audio.",
+	"Change how often the same Sound is allowed to play at once.",
+};
+
+static menuitem_t OP_SaturnMenu[] =
+{
+	{IT_HEADER, NULL, "Saturn Options", NULL, 0},
+
+	{IT_STRING | IT_CVAR, NULL, "Serverqueue waittime", 				&cv_connectawaittime, 	 	 10},
+
+	{IT_STRING | IT_CVAR, NULL, "Minimum Input Delay", 					&cv_mindelay, 	 	 		 20},
+	{IT_STRING | IT_CVAR, NULL, "Gentlemens Ping", 						&cv_gentlemens, 	 	 	 25},
+	{IT_STRING | IT_CVAR, NULL, "Server Info Screen", 				    &cv_serverinfoscreen, 	 	 30},
+
+	{IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed",		 	&cv_skinselectspin, 	 	 40},
+
+	{IT_STRING | IT_CVAR, NULL, "Colorized Speedlines", 				&cv_coloredspeedlines, 		 50},
+	{IT_STRING | IT_CVAR, NULL, "Colorized Sneakertrails", 				&cv_coloredsneakertrail, 	 55},
+
+	{IT_STRING | IT_CVAR, NULL, "Player Blendeffects", 					&cv_playerblendeffects, 	 65},
+
+	{IT_STRING | IT_CVAR, NULL, "Bananadrag Jitter", 					&cv_bananajitter, 	 		 75},
+
+	{IT_STRING | IT_CVAR, NULL, "Midair Driftsparks", 					&cv_airsparks, 	 		 	 85},
+
+	{IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", 				&cv_showlocalskinmenus, 	 95},
+
+	{IT_STRING | IT_CVAR, NULL, "Uppercase Menu",						&cv_menucaps,   		    105},
+
+	{IT_STRING | IT_CVAR, NULL, "Keyboard Layout",						&cv_keyboardlayout,   	   	115},
+
+	{IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", 		&cv_lessflicker, 		   	125},
+
+	{IT_SUBMENU|IT_STRING,	NULL,	"Saturn Hud...", 					&OP_SaturnHudDef,		   	135},
+	{IT_SUBMENU|IT_STRING,	NULL,	"Sprite Distortion...", 			&OP_PlayerDistortDef,	   	140},
+	{IT_SUBMENU|IT_STRING,	NULL,	"Saturn Credits", 					&OP_SaturnCreditsDef,	   	145}, // uwu
+};
+
+static const char* OP_SaturnTooltips[] =
+{
+	NULL,
+	"How long can the game wait before it kicks you out from the server\nconnecting screen.",
+	"Practice for online play! 0 = instant response.",
+	"Simulate online input delay when hosting a server.\nValue choosen by Player with the lowest ping",
+	"Show a screen before joining a server displaying important information about it",
+	"How much speen do you want?",
+	"Colourize the speedlines in your skincolor if you go fast enough!",
+	"Colourize the sneaker flame trails in your skincolor!",
+	"Enables blending effects for certain player effects when boosting.",
+	"Makes bananas and other items jump and jitter\nwhen dragged behind.",
+	"Keep your driftsparks going while in air.",
+	"Show Localskin Menus.",
+	"Force menu to only use uppercase.",
+	"Use your desired Keyboard Layout for Text Input\nthis is either the Default, Native or Azerty\nNative does not affect Gameplay only Text!",
+	"Disables the flicker effect on Midnight Channel.",
+	"Options for Saturn specific HUD things.",
+	"Options for sprite distortion effects.",
+	"See the people who helped make this project possible!",
+};
+
+enum
+{
+	sm_header,
+	sm_waittime,
+	sm_mindelay,
+	sm_gentlemens,
+	sm_skinselspeed,
+	sm_colorlines,
+	sm_colorflames,
+	sm_blendeffects,
+	sm_bananjumpy,
+	sm_airsparks,
+	sm_showlocalskin,
+	op_uppercase_menu,
+	sm_nativkey,
+	sm_pisschannel,
+	sm_hud,
+	sm_distortionmenu,
+	sm_credits,
+};
+
+static menuitem_t OP_PlayerDistortMenu[] =
+{
+	{IT_HEADER, NULL, "Sprite Distortion", NULL, 0},
+
+	{IT_STRING | IT_CVAR, 				 NULL, "Sprite Slope Rotation",			 &cv_sloperoll,		 	10},
+	{IT_STRING | IT_CVAR, 				 NULL, "Slope Rotation Distance",		 &cv_sloperolldist,  	15},
+
+	{IT_STRING | IT_CVAR,				 NULL, "Rotate Players when Sliptiding", &cv_sliptideroll,	 	25},
+	{IT_STRING | IT_CVAR,				 NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll,		 	30},
+	{IT_STRING | IT_CVAR,				 NULL, "Rotate Bananas on Throw",		 &cv_bananthrowroll, 	35},
+
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Player Stretch Factor",			 &cv_gravstretch,	 	45},
+	{IT_STRING | IT_CVAR,				 NULL, "Squish Sound Effect",			 &cv_slamsound,		 	50},
+
+	{IT_STRING | IT_CVAR,				 NULL, "Saltyhop",						 &cv_saltyhop,		 	60},
+	{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saltyhop Height",				 &cv_saltyheight,	 	65},
+	{IT_STRING | IT_CVAR,				 NULL, "Saltyhop Sound Effect",			 &cv_saltyhopsfx,		70},
+	{IT_STRING | IT_CVAR,				 NULL, "Saltyhop Squish",				 &cv_saltysquish,	 	75},
+	{IT_STRING | IT_CVAR,				 NULL, "Saltyhop Roll",				 	 &cv_saltyroll,	 	 	80},
+
+	{IT_STRING | IT_CVAR,				 NULL, "Squishdance",				 	 &cv_squishdance,	 	90},
+	{IT_STRING | IT_CVAR,				 NULL, "Squishdance Speed",				 &cv_squishdancespeed,	96},
+};
+
+static const char* OP_PlayerDistortTooltips[] =
+{
+	NULL,
+	"Sprite rotation on slopes. Can either be just players or all objects.",
+	"Distance object rotation should be visable.",
+	"Player rotation when sliptiding.",
+	"Rotation of a player's boost trails and drift sparks.",
+	"Should banans rotate when thrown?\nAnd should they stay rotated when on the ground?.",
+	"Player squash and stretch.",
+	"Player landing sound effect.",
+	"Kart hopping while drifting. This is purely visual.",
+	"Jump Height for Kart hopping.",
+	"Player hop sound effect.",
+	"Player hop squash and stretch.",
+	"Should the player rotation be kept during player hop.",
+	"Do a funny squishy dance when holding CUSTOM 3.",
+	"Speed of the Squishy dance in BPM.",
+};
+
+enum
+{
+	spriteheader,
+	sloperotate,
+	slrotatedist,
+	sliptide,
+	sparkrotate,
+	bananrotat,
+	stretchyplayer,
+	squishsound,
+	salthmmm,
+	saltheight,
+	saltsound,
+	saltsquishy,
+	saltroll,
+	squishdance,
+	squishdancespd,
+};
+
+static menuitem_t OP_SaturnHudMenu[] =
+{
+	{IT_HEADER, NULL, "Saturn Hud Options", NULL, 0},
+
+	{IT_STRING|IT_CVAR,    NULL, "Speedometer Style",           &cv_newspeedometer,    10},
+	{IT_STRING|IT_CVAR,    NULL, "Battle Speedometer",          &cv_battlespeedo,      15},
+
+	{IT_STRING|IT_CVAR,    NULL, "Colourized HUD",              &cv_colorizedhud,      25},
+	{IT_STRING|IT_CVAR,    NULL, "Colourized Itembox",          &cv_colorizeditembox,  30},
+	{IT_STRING|IT_CVAR,    NULL, "Colourized HUD Color",        &cv_colorizedhudcolor, 35},
+
+	{IT_STRING|IT_CVAR,    NULL, "Input Display",               &cv_showinput,         45},
+
+	{IT_STRING|IT_CVAR,    NULL, "Stat Display",                &cv_showstats,         55},
+
+	{IT_STRING|IT_CVAR,    NULL, "Higher Resolution Portraits", &cv_highresportrait,   65},
+
+	{IT_STRING|IT_CVAR,    NULL, "Small Positionnumber",        &cv_smallposnum,       75},
+	{IT_STRING|IT_CVAR,    NULL, "Positionnumber Animation",    &cv_posanim,           80},
+
+	{IT_STRING|IT_CVAR,    NULL, "Flash Lap Times",             &cv_showlaptimes,      90},
+
+	{IT_STRING|IT_CVAR,    NULL, "Multi-Item icons",            &cv_multiitemicon,    100},
+	{IT_STRING|IT_CVAR,    NULL, "Item Amount Number",          &cv_huditemamount,    105},
+	{IT_STRING|IT_CVAR,    NULL, "Animated Roulette",           &cv_fancyroulette,    110},
+
+	{IT_STRING|IT_CVAR,    NULL, "Show Lap Emblem",             &cv_showlapemblem,    120},
+	{IT_STRING|IT_CVAR,    NULL, "Show Cecho Messages",         &cv_cechotoggle,      125},
+
+	{IT_STRING|IT_CVAR,    NULL, "Show Names on Minimap",       &cv_showminimapnames, 135},
+	{IT_STRING|IT_CVAR,    NULL, "Small Minimap Players",       &cv_minihead,         140},
+	{IT_STRING|IT_CVAR,    NULL, "Spin Minimap Icons",          &cv_spinoutroll,      145},
+	{IT_STRING|IT_CVAR,    NULL, "Player Angle Visual",         &cv_showminimapangle, 150},
+
+	{IT_STRING|IT_CVAR,    NULL, "Music Credits",               &cv_songcredits,      160},
+
+	{IT_STRING|IT_CVAR,    NULL, "Beta Intermissionscreen",     &cv_betainterscreen,  170},
+
+	{IT_STRING|IT_CVAR,    NULL, "Show Director Prompt",        &cv_showdirectorhud,  180},
+
+	{IT_STRING|IT_SUBMENU, NULL, "Nametags...",                 &OP_NametagDef,       190},
+	{IT_STRING|IT_SUBMENU, NULL, "Driftgauge...",               &OP_DriftGaugeDef,    195},
+
+	{IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...",              &OP_HudOffsetDef,     205},
+};
+
+static const char* OP_SaturnHudTooltips[] =
+{
+	NULL,
+	"Change what style the speedometer is.",
+	"Draw the Speedometer in Battle.",
+	"Enable colourized hud.",
+	"Enable the colourized itembox when colourized hud is enabled.",
+	"The color to use instead of the player color when\ncolourized hud is enabled.",
+	"Displays the input display and lets you choose its style.",
+	"Enable the stat display.",
+	"Enable the use of the higher resolution want icons instead of rank\nfor some places.",
+	"Make the Postionnumber half the size.",
+	"Disable the animation of the Positionnumber\nwhen overtaking someone.",
+	"Flash current Lap Time when doing a Lap on the Timer.",
+	"Use extra graphics for multiple sneakers, bananas and jawz.",
+	"Change when the item amount is to be displayed\nMultiple will always display the number.\nwhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.",
+	"Enables an animation while the roulette is active.",
+	"Show the big 'LAP' text on a lap change.",
+	"Show the big Cecho Messages.",
+	"Show player names on the minimap.",
+	"Minimize the player icons on the minimap.",
+	"Erratically rotate player icons during spinouts.",
+	"Visualize the player facing angle.",
+	"Show the Music Credits and which style.",
+	"Make the Intermission screen look like in beta versions of Kart!\nEither with background or just the rest.",
+	"Show the Director Toggle prompt when spectating.",
+	"Nametag Options.",
+	"Driftgauge Options.",
+	"Move position of HUD elements.",
+};
+
+enum
+{
+	sh_header,
+	sh_speedometer,
+	sh_battlespeedo,
+	sh_colorhud,
+	sh_coloritem,
+	sh_colorhud_customcolor,
+	sh_input,
+	sh_statdisplay,
+	sh_highresport,
+	sh_smolpos,
+	sh_posanim,
+	sh_multicon,
+	sh_itamnum,
+	sh_laptime,
+	sh_fancy,
+	sh_lapemblem,
+	sh_cechotogle,
+	sh_mapname,
+	sh_smallmap,
+	sh_iconspinout,
+	sh_minidot,
+	sh_songcred,
+	sh_betainter,
+	sh_directorhud,
+	sh_nametagmen,
+	sh_driftgaugemen,
+	sh_hudoffsets,
+};
+
+static menuitem_t OP_HudOffsetMenu[] =
+{
+	{IT_HEADER, NULL, "Kart Hud Offsets", NULL, 0},
+
+	{IT_STRING | IT_CALL, NULL, "Reset all", M_ResetCvars, 5},
+
+	{IT_HEADER, NULL, "Itembox", NULL, 15},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Horizontal Offset",			&cv_item_xoffset, 		20},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Vertical Offset",				&cv_item_yoffset,     	25},
+
+	{IT_HEADER, NULL, "Timer", NULL, 35},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Horizontal Offset",			&cv_time_xoffset, 		40},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Offset",				&cv_time_yoffset,     	45},
+
+	{IT_HEADER, NULL, "Lap Count", NULL, 55},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Horizontal Offset",     		&cv_laps_xoffset, 		60},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Vertical Offset",       		&cv_laps_yoffset,     	65},
+
+	{IT_HEADER, NULL, "Speedometer", NULL, 75},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Horizontal Offset",  			&cv_speed_xoffset, 		80},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Offset",	  			&cv_speed_yoffset,     	85},
+
+	{IT_HEADER, NULL, "Mini Rankings", NULL, 95},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Horizontal Offset",  			&cv_face_xoffset, 		100},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Offset",	  			&cv_face_yoffset,     	105},
+
+	{IT_HEADER, NULL, "Minimap", NULL, 115},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Horizontal Offset",  			&cv_mini_xoffset, 		120},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Offset",	  	 		&cv_mini_yoffset,     	125},
+
+	{IT_HEADER, NULL, "Position Number", NULL, 135},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Horizontal Offset",  	  		&cv_posi_xoffset, 		140},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Offset",	  	  		&cv_posi_yoffset,     	145},
+
+	{IT_HEADER, NULL, "R.A. Wheel", NULL, 155},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Horizontal Offset",  	  		&cv_wheel_xoffset, 		160},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Offset",	  	  		&cv_wheel_yoffset,     	165},
+
+	{IT_HEADER, NULL, "Stat Display", NULL, 175},
+	{IT_STRING | IT_CVAR, 	NULL, 	"Horizontal Offset",  	  		&cv_stat_xoffset, 		180},
+	{IT_STRING | IT_CVAR,	NULL,	"Vertical Offset",	  	  		&cv_stat_yoffset,     	185},
+};
+
+// FIXME: WE EFFECTIVELY HAVE NO MORE SPACE FOR GREEN RES
+// i had to put multiple names into single lines at this point
+// we ought to really do something better for this at this point
+// absolutely crazy how many people put work into this at this point <3
+static menuitem_t OP_SaturnCreditsMenu[] =
+{
+	{IT_HEADER, NULL, "Thanks to all contributers <3", 									NULL,       0},
+
+	{IT_STRING2+IT_SPACE, NULL, 	"Alug",      										NULL, 	   10},
+	{IT_STRING2+IT_SPACE, NULL, 	"Indev",        									NULL,      20},
+	{IT_STRING2+IT_SPACE, NULL, 	"Haya",       										NULL,      30},
+	{IT_STRING2+IT_SPACE, NULL, 	"Nepdisk", 		 									NULL, 	   40},
+	{IT_STRING2+IT_SPACE, NULL, 	"GenericHeroGuy", 		 							NULL, 	   50},
+	{IT_STRING2+IT_SPACE, NULL, 	"xyzzy",     										NULL, 	   60},
+	{IT_STRING2+IT_SPACE, NULL, 	"Chearii", 		 									NULL, 	   70},
+	{IT_STRING2+IT_SPACE, NULL, 	"riomccloud", 		 								NULL, 	   80},
+	{IT_STRING2+IT_SPACE, NULL, 	"chromaticpipe", 		 							NULL, 	   90},
+	{IT_STRING2+IT_SPACE, NULL, 	"PAS", 		 										NULL, 	  100},
+	{IT_STRING2+IT_SPACE, NULL, 	"$HOME", 		 									NULL, 	  110},
+	{IT_STRING2+IT_SPACE, NULL, 	"Achii", 		 									NULL, 	  120},
+	{IT_STRING2+IT_SPACE, NULL, 	"Anonimus", 		 								NULL, 	  130},
+	{IT_STRING2+IT_SPACE, NULL, 	"scizor300", 		 								NULL, 	  140},
+	{IT_STRING2+IT_SPACE, NULL, 	"Lugent", 		 									NULL, 	  150},
+
+	{IT_HEADER, 		  NULL, 	"", 												NULL,     124},
+
+	{IT_STRING2+IT_SPACE, NULL, 	"Sunflower	Yuz", 		 							NULL, 	  180},
+	{IT_STRING2+IT_SPACE, NULL, 	"Democrab	EXpand", 		  						NULL, 	  190},
+	{IT_STRING2+IT_SPACE, NULL, 	"Nexit	Spee", 		  								NULL, 	  200},
+	{IT_STRING2+IT_SPACE, NULL, 	"jin", 		 										NULL, 	  210},
+
+	{IT_HEADER, 		  NULL, 	"Special Thanks <3", 								NULL,     168},
+
+	{IT_STRING2+IT_SPACE, NULL,		"All of Sunflower's Garden",	      				NULL,     178},
+	{IT_STRING2+IT_SPACE, NULL, 	"The Moe Mansion and Birdhouse Team",       		NULL,     188},
+	{IT_STRING2+IT_SPACE, NULL, 	"Galactice for Galaxy",       						NULL,     198},
+
+	{IT_STRING+IT_SPACE, NULL, "", 														NULL,     198},	// dummy text I
+	{IT_STRING, NULL, "", 																NULL,     258},	// dummy text II
+};
+
+// sry we dont have space for this anymore :c
+/*static const char* OP_CreditTooltips[] =
+{
+	NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+	"Thanks everyone! <3"
+};*/
+
+
+static menuitem_t OP_BirdMenu[] =
+{
+	{IT_HEADER, NULL, "Crazy", NULL, 0},
+	{IT_STRING | IT_SUBMENU, NULL, "Screen Tilting...", &OP_TiltDef, 10},
+
+	{IT_HEADER, NULL, "HUD", NULL, 30},
+	{IT_STRING | IT_CVAR, NULL, "Show Viewpoint Text in Replays", &cv_showviewpointtext, 40},
+	{IT_STRING | IT_CVAR, NULL, "Show FREE PLAY Text",            &cv_showfreeplay,      50},
+
+	//{IT_HEADER, NULL, "Voting", NULL, 70},
+	//{IT_STRING | IT_CVAR, NULL, "Only Show One Battle Choice", &cv_lessbattlevotes, 80},
+	//{IT_STRING | IT_CVAR, NULL, "Encore Choices",              &cv_encorevotes,     90},
+
+	{IT_HEADER, NULL, "Music", NULL, 70},
+	{IT_STRING | IT_CVAR, NULL, "Music Features",    	 &cv_birdmusic,            80},
+	{IT_STRING | IT_CVAR, NULL, "Resume Level Music",    &cv_resume,            95},
+	{IT_STRING | IT_CVAR, NULL, "Restart Special Music", &cv_resetspecialmusic, 105},
+
+	{IT_STRING | IT_SUBMENU, NULL, "Advanced Music Options...", &OP_AdvancedBirdDef, 130},
+};
+
+static const char* OP_BirdTooltips[] =
+{
+	NULL,
+	"Options for screen tilting.",
+	NULL,
+	"Show player names in replay playback.",
+	"Show FREE PLAY text when in a empty server.",
+	//NULL,
+	//"Only show one battle choice in map vote",
+	//"Amount of encore choices in map vote.",
+	NULL,
+	"Global toggle for all bird music features.",
+	"Resume level music from last position after music change.",
+	"Restart Special music if item is used again.",
+	"Options for advanced music settings.",
+};
+
+enum
+{
+	headercrzy,
+	tiltmenu,
+	headerhud,
+	viewpointext,
+	freeplaytext,
+	headermusic,
+	birdmusic,
+	lvlresum,
+	spclresum,
+	advmusic,
+};
+
+static menuitem_t OP_ForkedBirdMenu[] =
+{
+	{IT_HEADER, NULL, "Local Skins", NULL, 0},
+	{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Local Skin Name", &cv_fakelocalskin, 10},
+	{IT_STRING2 | IT_SPACE, NULL, "SET TO NONE FOR NO LOCAL SKIN", NULL, 20},
+	{IT_STRING | IT_CALL, NULL, "Apply to All Players", M_LocalSkinChange, 140},
+	{IT_STRING | IT_CALL, NULL, "Apply to Displaying Player", M_LocalSkinChange, 150},
+	{IT_STRING | IT_CALL, NULL, "Apply to Yourself", M_LocalSkinChange, 160},
+	{IT_STRING | IT_CVAR, NULL, "Lua Immersion", &cv_luaimmersion, 170},
+};
+
+static menuitem_t OP_NametagMenu[] =
+{
+	{IT_HEADER, NULL, "Nametag", NULL, 0},
+	{IT_STRING | IT_CVAR, NULL, "Nametag", &cv_nametag, 20},
+	{IT_STRING | IT_CVAR, NULL, "Show Char image in Nametag", &cv_nametagfacerank, 30},
+	{IT_STRING | IT_CVAR, NULL, "Show Own Nametag", &cv_showownnametag, 40},
+	{IT_STRING | IT_CVAR, NULL, "Nametag Max distance", &cv_nametagdist, 50},
+	{IT_STRING | IT_CVAR, NULL, "Nametag Max Display Players", &cv_nametagmaxplayers, 60},
+	{IT_STRING | IT_CVAR, NULL, "Nametag Transparency", &cv_nametagtrans, 70},
+	{IT_STRING | IT_CVAR, NULL, "Nametag Score", &cv_nametagscore, 80},
+	{IT_STRING | IT_CVAR, NULL, "Nametag Restat", &cv_nametagrestat, 90},
+	{IT_STRING | IT_CVAR, NULL, "Small Nametags", &cv_smallnametags, 100},
+	{IT_STRING | IT_CVAR, NULL, "Show Nametags while Spectating", &cv_shownametagspectator, 110},
+	//{IT_STRING | IT_CVAR, NULL, "Nametag Scaling", &cv_nametagscaling, 70}
+};
+
+static const char* OP_NametagTooltips[] =
+{
+	NULL,
+	"Enable nametags in game.",
+	"Show character icon in nametag.",
+	"Show your own nametag in game.",
+	"Distance nametags are visible.",
+	"Maximum amount of nametags on screen.",
+	"Transparency of nametags.",
+	"Show player score in nametag.",
+	"Show stats in nametags.",
+	"Alternative smaller nametags.",
+	"Show Nametags when you are spectating.",
+};
+
+enum
+{
+	nt_header,
+	nt_nametag,
+	nt_ntchar,
+	nt_owntag,
+	nt_maxdist,
+	nt_maxplayer,
+	nt_nttrans,
+	nt_ntpscore,
+	nt_ntrestat,
+	nt_smol,
+	nt_spec,
+};
+
+static menuitem_t OP_DriftGaugeMenu[] =
+{
+	{IT_HEADER, NULL, "Driftgauge", NULL, 0},
+	{IT_STRING | IT_CVAR, NULL, "Driftgauge", &cv_driftgauge, 20},
+	{IT_STRING | IT_CVAR, NULL, "Driftgauge Transparency", &cv_driftgaugetrans, 30},
+	{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Driftgauge Offset", &cv_driftgaugeofs, 40},
+	{IT_STRING | IT_CVAR, NULL, "Driftgauge Style", &cv_driftgaugestyle, 50},
+};
+
+static const char* OP_DriftGaugeTooltips[] =
+{
+	NULL,
+	"Enable driftgauge in game.",
+	"Have driftgauge use hud transparency.",
+	"Vertical driftgauge offset.",
+	"Driftgauge style.",
+};
+
+enum
+{
+	dg_header,
+	dg_dg,
+	dg_dgtrans,
+	dg_dgoffset,
+	dg_dgstyle,
+};
+
+
+static menuitem_t OP_TiltMenu[] =
+{
+	{IT_STRING | IT_CVAR, NULL, "Camera Tilting", &cv_tilting, 0},
+	{IT_STRING | IT_CVAR, NULL, "Tilt While Turning", &cv_quaketilt, 10},
+	{IT_STRING | IT_CVAR, NULL, "Smoothing Divisor", &cv_tiltsmoothing, 20},
+
+	{IT_STRING | IT_CVAR, NULL, "Also Tilt During Quakes", &cv_actionmovie, 40},
+};
+
+static const char* OP_TiltTooltips[] =
+{
+	"Camera tilting during gameplay.",
+	"Tilt camera while turning.",
+	"Smoothing value used.",
+	"Tilt during screen quakes.",
+};
+
+enum
+{
+	tilting,
+	tiltwturning,
+	smoothening,
+	tiltwquakes,
+	windowshake,
+};
+
+static menuitem_t OP_AdvancedBirdMenu[] =
+{
+	{IT_STRING | IT_CVAR, NULL, "Fading",                        &cv_fading,                  0},
+	{IT_STRING | IT_CVAR, NULL, "Fade Back from Invincibility",  &cv_invincmusicfade,        10},
+	{IT_STRING | IT_CVAR, NULL, "Fade Back from Grow",           &cv_growmusicfade,          20},
+	{IT_STRING | IT_CVAR, NULL, "Fade Out Before Respawning",    &cv_respawnfademusicout,    30},
+	{IT_STRING | IT_CVAR, NULL, "Fade Back In While Respawning", &cv_respawnfademusicback,   40},
+
+	{IT_STRING | IT_CVAR, NULL, "Resync Threshold",          &cv_music_resync_threshold,     60},
+	{IT_STRING | IT_CVAR, NULL, "Resync Special Music Only", &cv_music_resync_powerups_only, 70},
+};
+
+static const char* OP_AdvancedBirdTooltips[] =
+{
+	"Music fading.",
+	"Fade in music after Invincibility.",
+	"Fade in music after Grow.",
+	"Fade out music before respawning.",
+	"Fade in music while respawning.",
+	"Threshold for syncing music.",
+	"Only sync special music.",
+};
+
+enum
+{
+	fading,
+	fadeinvinc,
+	fadegrow,
+	respawnfadeout,
+	respawnfadein,
+	syncthreshold,
+	syncspecialonly,
+};
+
+menuitem_t OP_CustomCvarMenu[MAXMENUCCVARS];
+
+// ==========================================================================
+// ALL MENU DEFINITIONS GO HERE
+// ==========================================================================
+
+// Main Menu and related
+menu_t MainDef = CENTERMENUSTYLE(NULL, MainMenu, NULL, 72);
+
+menu_t MISC_AddonsDef =
+{
+	NULL,
+	sizeof (MISC_AddonsMenu)/sizeof (menuitem_t),
+	&OP_DataOptionsDef,
+	MISC_AddonsMenu,
+	M_DrawAddons,
+	50, 28,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t MISC_ReplayHutDef =
+{
+	NULL,
+	sizeof (MISC_ReplayHutMenu)/sizeof (menuitem_t),
+	NULL,
+	MISC_ReplayHutMenu,
+	M_DrawReplayHut,
+	30, 80,
+	0,
+	M_QuitReplayHut,
+	NULL
+};
+
+menu_t MISC_ReplayOptionsDef =
+{
+	"M_REPOPT",
+	sizeof (MISC_ReplayOptionsMenu)/sizeof (menuitem_t),
+	&OP_DataOptionsDef,
+	MISC_ReplayOptionsMenu,
+	M_DrawGenericMenu,
+	27, 40,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t MISC_ReplayStartDef =
+{
+	NULL,
+	sizeof (MISC_ReplayStartMenu)/sizeof (menuitem_t),
+	&MISC_ReplayHutDef,
+	MISC_ReplayStartMenu,
+	M_DrawReplayStartMenu,
+	30, 90,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t PlaybackMenuDef = {
+	NULL,
+	sizeof (PlaybackMenu)/sizeof (menuitem_t),
+	NULL,
+	PlaybackMenu,
+	M_DrawPlaybackMenu,
+	//BASEVIDWIDTH/2 - 94, 2,
+	BASEVIDWIDTH/2 - 88, 2,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t MAPauseDef = PAUSEMENUSTYLE(MAPauseMenu, 40, 72);
+menu_t SPauseDef  = PAUSEMENUSTYLE(SPauseMenu, 40, 72);
+menu_t MPauseDef  = PAUSEMENUSTYLE(MPauseMenu, 40, 72);
+
+#ifdef HAVE_DISCORDRPC
+menu_t MISC_DiscordRequestsDef = {
+	NULL,
+	sizeof (MISC_DiscordRequestsMenu)/sizeof (menuitem_t),
+	&MPauseDef,
+	MISC_DiscordRequestsMenu,
+	M_DrawDiscordRequests,
+	0, 0,
+	0,
+	NULL,
+	NULL
+};
+#endif
+
+// Misc Main Menu
+menu_t MISC_ScrambleTeamDef   = DEFAULTMENUSTYLE(NULL, MISC_ScrambleTeamMenu, &MPauseDef, 27, 40, NULL);
+menu_t MISC_ChangeTeamDef     = DEFAULTMENUSTYLE(NULL, MISC_ChangeTeamMenu, &MPauseDef, 27, 40, NULL);
+menu_t MISC_ChangeSpectateDef = DEFAULTMENUSTYLE(NULL, MISC_ChangeSpectateMenu, &MPauseDef, 27, 40, NULL);
+menu_t MISC_ChangeLevelDef    = MAPICONMENUSTYLE(NULL, MISC_ChangeLevelMenu, &MPauseDef);
+menu_t MISC_HelpDef           = IMAGEDEF(MISC_HelpMenu);
+
+// Sky Room
+menu_t SR_MainDef = CENTERMENUSTYLE(NULL, SR_MainMenu, &MainDef, 72);
+
+menu_t SR_UnlockChecklistDef =
+{
+	NULL,
+	1,
+	&SR_MainDef,
+	SR_UnlockChecklistMenu,
+	M_DrawChecklist,
+	280, 185,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t SR_MusicTestDef =
+{
+	NULL,
+	sizeof (SR_MusicTestMenu)/sizeof (menuitem_t),
+	&OP_SoundOptionsDef,
+	SR_MusicTestMenu,
+	M_DrawMusicTest,
+	60, 150,
+	0,
+	NULL,
+	NULL
+};
+
+// Single Player
+menu_t SP_MainDef = CENTERMENUSTYLE(NULL, SP_MainMenu, &MainDef, 72);
+
+menu_t SP_LevelStatsDef =
+{
+	"M_STATS",
+	1,
+	&SR_MainDef,
+	SP_LevelStatsMenu,
+	M_DrawLevelStats,
+	280, 185,
+	0,
+	NULL,
+	NULL
+};
+
+static menu_t SP_TimeAttackDef =
+{
+	"M_ATTACK",
+	sizeof (SP_TimeAttackMenu)/sizeof (menuitem_t),
+	&MainDef,  // Doesn't matter.
+	SP_TimeAttackMenu,
+	M_DrawTimeAttackMenu,
+	34, 40,
+	0,
+	M_QuitTimeAttackMenu,
+	NULL
+};
+static menu_t SP_ReplayDef =
+{
+	"M_ATTACK",
+	sizeof(SP_ReplayMenu)/sizeof(menuitem_t),
+	&SP_TimeAttackDef,
+	SP_ReplayMenu,
+	M_DrawTimeAttackMenu,
+	34, 40,
+	0,
+	NULL,
+	NULL
+};
+static menu_t SP_GuestReplayDef =
+{
+	"M_ATTACK",
+	sizeof(SP_GuestReplayMenu)/sizeof(menuitem_t),
+	&SP_TimeAttackDef,
+	SP_GuestReplayMenu,
+	M_DrawTimeAttackMenu,
+	34, 40,
+	0,
+	NULL,
+	NULL
+};
+static menu_t SP_GhostDef =
+{
+	"M_ATTACK",
+	sizeof(SP_GhostMenu)/sizeof(menuitem_t),
+	&SP_TimeAttackDef,
+	SP_GhostMenu,
+	M_DrawTimeAttackMenu,
+	34, 40,
+	0,
+	NULL,
+	NULL
+};
+
+// Multiplayer
+menu_t MP_MainDef =
+{
+	"M_MULTI",
+	sizeof (MP_MainMenu)/sizeof (menuitem_t),
+	&MainDef,
+	MP_MainMenu,
+	M_DrawMPMainMenu,
+	42, 30,
+	0,
+#ifndef NONET
+	M_CancelConnect,
+#else
+	NULL,
+#endif
+	NULL
+};
+
+menu_t MP_OfflineServerDef = MAPICONMENUSTYLE("M_MULTI", MP_OfflineServerMenu, &MP_MainDef);
+
+#ifndef NONET
+menu_t MP_ServerDef = MAPICONMENUSTYLE("M_MULTI", MP_ServerMenu, &MP_MainDef);
+
+menu_t MP_ConnectDef =
+{
+	"M_MULTI",
+	sizeof (MP_ConnectMenu)/sizeof (menuitem_t),
+	&MP_MainDef,
+	MP_ConnectMenu,
+	M_DrawConnectMenu,
+	27,24,
+	0,
+	M_CancelConnect,
+	NULL
+};
+#endif
+menu_t MP_PlayerSetupDef =
+{
+	NULL, //"M_SPLAYR"
+	sizeof (MP_PlayerSetupMenu)/sizeof (menuitem_t),
+	&MP_MainDef,
+	MP_PlayerSetupMenu,
+	M_DrawSetupMultiPlayerMenu,
+	36, 14,
+	0,
+	M_QuitMultiPlayerMenu,
+	NULL
+};
+
+// Options
+menu_t OP_MainDef =
+{
+	"M_OPTTTL",
+	sizeof (OP_MainMenu)/sizeof (menuitem_t),
+	&MainDef,
+	OP_MainMenu,
+	M_DrawGenericMenu,
+	60, 25,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t OP_ControlsDef     = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 60, 30, OP_ControlsTooltips);
+//WTF
+menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_ControlsDef, 60, 30, OP_MouseTooltips);
+menu_t OP_AllControlsDef  = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef);
+menu_t OP_Joystick1Def    = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick1Menu, &OP_AllControlsDef, 30, 36, NULL);
+menu_t OP_Joystick2Def    = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick2Menu, &OP_AllControlsDef, 30, 36, NULL);
+menu_t OP_Joystick3Def    = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 30, 36, NULL);
+menu_t OP_Joystick4Def    = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 30, 36, NULL);
+
+menu_t OP_JoystickSetDef  =
+{
+	"M_CONTRO",
+	sizeof (OP_JoystickSetMenu)/sizeof (menuitem_t),
+	&OP_Joystick1Def,
+	OP_JoystickSetMenu,
+	M_DrawJoystick,
+	50, 40,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t OP_VideoOptionsDef =
+{
+	"M_VIDEO",
+	sizeof(OP_VideoOptionsMenu)/sizeof(menuitem_t),
+	&OP_MainDef,
+	OP_VideoOptionsMenu,
+	M_DrawVideoMenu,
+	30, 15,
+	0,
+	NULL,
+	OP_VideoTooltips
+};
+
+menu_t OP_VideoModeDef =
+{
+	"M_VIDEO",
+	1,
+	&OP_VideoOptionsDef,
+	OP_VideoModeMenu,
+	M_DrawVideoMode,
+	48, 26,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t OP_ColorOptionsDef =
+{
+	"M_VIDEO",
+	sizeof (OP_ColorOptionsMenu)/sizeof (menuitem_t),
+	&OP_VideoOptionsDef,
+	OP_ColorOptionsMenu,
+	M_DrawColorMenu,
+	30, 30,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t OP_SoundOptionsDef =
+{
+	"M_SOUND",
+	sizeof (OP_SoundOptionsMenu)/sizeof (menuitem_t),
+	&OP_MainDef,
+	OP_SoundOptionsMenu,
+	M_DrawSkyRoom,
+	30, 20,
+	0,
+	NULL,
+	OP_SoundTooltips
+};
+
+
+menu_t OP_HUDOptionsDef =
+{
+	"M_HUD",
+	sizeof (OP_HUDOptionsMenu)/sizeof (menuitem_t),
+	&OP_MainDef,
+	OP_HUDOptionsMenu,
+	M_DrawHUDOptions,
+	30, 20,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t OP_CamOptionsDef        = DEFAULTMENUSTYLE(NULL, OP_CamOptionsMenu, &OP_MainDef, 30, 30, OP_CamOptionsTooltips);
+menu_t OP_Player1CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player1CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips);
+menu_t OP_Player2CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player2CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips);
+menu_t OP_Player3CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player3CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips);
+menu_t OP_Player4CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player4CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips);
+
+menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 30, OP_ChatOptionsTooltips);
+
+menu_t OP_SoundAdvancedDef = DEFAULTSCROLLSTYLE("M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30, OP_SoundAdvancedTooltips);
+
+menu_t OP_FocusOptionsDef = DEFAULTMENUSTYLE(NULL, OP_FocusOptionsMenu, &OP_MainDef, 17, 30, OP_FocusOptionsTooltips);
+
+menu_t OP_GameOptionsDef = DEFAULTMENUSTYLE("M_GAME", OP_GameOptionsMenu, &OP_MainDef, 30, 20, OP_GameTooltips);
+menu_t OP_ServerOptionsDef = DEFAULTMENUSTYLE("M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 24, 20, OP_ServerOptionsTooltips);
+#ifndef NONET
+menu_t OP_AdvServerOptionsDef = DEFAULTSCROLLSTYLE("M_SERVER", OP_AdvServerOptionsMenu, &OP_ServerOptionsDef, 24, 30, OP_AdvServerOptionsTooltips);
+#endif
+
+menu_t OP_MonitorToggleDef =
+{
+	"M_GAME",
+	sizeof (OP_MonitorToggleMenu)/sizeof (menuitem_t),
+	&OP_GameOptionsDef,
+	OP_MonitorToggleMenu,
+	M_DrawMonitorToggles,
+	47, 30,
+	0,
+	NULL,
+	NULL
+};
+
+#ifdef HWRENDER
+menu_t OP_OpenGLOptionsDef = DEFAULTSCROLLSTYLE("M_VIDEO", OP_OpenGLOptionsMenu, &OP_VideoOptionsDef, 30, 30, OP_OpenGLTooltips);
+#endif
+
+menu_t OP_ExpOptionsDef = DEFAULTSCROLLSTYLE("M_VIDEO", OP_ExpOptionsMenu, &OP_VideoOptionsDef, 30, 25, OP_ExpTooltips);
+
+menu_t OP_DataOptionsDef       = DEFAULTMENUSTYLE("M_DATA", OP_DataOptionsMenu, &OP_MainDef, 60, 30, NULL);
+menu_t OP_ScreenshotOptionsDef = DEFAULTSCROLLSTYLE("M_SCSHOT", OP_ScreenshotOptionsMenu, &OP_DataOptionsDef, 30, 30, NULL);
+menu_t OP_AddonsOptionsDef     = DEFAULTMENUSTYLE("M_ADDONS", OP_AddonsOptionsMenu, &OP_DataOptionsDef, 30, 30, NULL);
+menu_t OP_ProtocolDef          = DEFAULTMENUSTYLE(NULL, OP_ProtocolMenu, &OP_DataOptionsDef, 30, 30, NULL);
+#ifdef HAVE_DISCORDRPC
+menu_t OP_DiscordOptionsDef    = DEFAULTMENUSTYLE(NULL, OP_DiscordOptionsMenu, &OP_DataOptionsDef, 30, 30, NULL);
+#endif
+menu_t OP_EraseDataDef         = DEFAULTMENUSTYLE("M_DATA", OP_EraseDataMenu, &OP_DataOptionsDef, 30, 30, NULL);
+
+menu_t OP_AccessibilityDef     = DEFAULTSCROLLSTYLE(NULL, OP_AccessibilityMenu, &OP_MainDef, 30, 30, OP_AccessibilityTooltips);
+
+menu_t OP_SaturnDef        = DEFAULTSCROLLSTYLE(NULL, OP_SaturnMenu, &OP_MainDef, 30, 30, OP_SaturnTooltips);
+menu_t OP_SaturnCreditsDef = DEFAULTMENUSTYLE(NULL, OP_SaturnCreditsMenu, &OP_SaturnDef, 30, 0, NULL); // OP_CreditTooltips no space :c
+
+menu_t OP_SaturnHudDef     = DEFAULTSCROLLSTYLE(NULL, OP_SaturnHudMenu, &OP_SaturnDef, 30, 30, OP_SaturnHudTooltips);
+menu_t OP_PlayerDistortDef = DEFAULTSCROLLSTYLE("M_VIDEO", OP_PlayerDistortMenu, &OP_SaturnDef, 30, 30, OP_PlayerDistortTooltips);
+menu_t OP_HudOffsetDef     = DEFAULTSCROLLSTYLE(NULL, OP_HudOffsetMenu, &OP_SaturnHudDef, 30, 30, NULL);
+
+menu_t OP_BirdDef = DEFAULTMENUSTYLE(NULL, OP_BirdMenu, &OP_MainDef, 30, 30, OP_BirdTooltips);
+
+menu_t OP_NametagDef    = DEFAULTMENUSTYLE(NULL, OP_NametagMenu, &OP_SaturnHudDef, 30, 40, OP_NametagTooltips);
+menu_t OP_DriftGaugeDef = DEFAULTMENUSTYLE(NULL, OP_DriftGaugeMenu, &OP_SaturnHudDef, 30, 40, OP_DriftGaugeTooltips);
+
+menu_t OP_TiltDef         = DEFAULTMENUSTYLE(NULL, OP_TiltMenu, &OP_BirdDef, 30, 60, OP_TiltTooltips);
+menu_t OP_AdvancedBirdDef = DEFAULTMENUSTYLE(NULL, OP_AdvancedBirdMenu, &OP_BirdDef, 30, 60, OP_AdvancedBirdTooltips);
+
+
+menu_t OP_CustomCvarMenuDef = DEFAULTSCROLLSTYLE("M_ADDONS", OP_CustomCvarMenu, &OP_MainDef, 10, 30, NULL);
+
+menu_t OP_ForkedBirdDef = {
+	NULL,
+	sizeof(OP_ForkedBirdMenu)/sizeof(menuitem_t),
+	&OP_MainDef,
+	OP_ForkedBirdMenu,
+	M_DrawLocalSkinMenu,
+	30, 6,
+	0,
+	NULL,
+	NULL
+};
+
+menu_t OP_LocalSkinDef = DEFAULTMENUSTYLE(NULL, OP_TiltMenu, &OP_ForkedBirdDef, 30, 60, NULL);
+
+
+// ==========================================================================
+// CVAR ONCHANGE EVENTS GO HERE
+// ==========================================================================
+// (there's only a couple anyway)
+
+// Nextmap.  Used for Time Attack.
+static void Nextmap_OnChange(void)
+{
+	char *leveltitle;
+	UINT8 active;
+
+	// Update the string in the consvar.
+	Z_Free(cv_nextmap.zstring);
+	leveltitle = G_BuildMapTitle(cv_nextmap.value);
+	cv_nextmap.string = cv_nextmap.zstring = leveltitle ? leveltitle : Z_StrDup(G_BuildMapName(cv_nextmap.value));
+
+	if (currentMenu == &SP_TimeAttackDef)
+	{
+		// see also p_setup.c's P_LoadRecordGhosts
+		const size_t glen = strlen(srb2home)+1+strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1;
+		char *gpath = malloc(glen);
+		INT32 i;
+
+		if (!gpath)
+			return;
+
+		sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
+
+		CV_StealthSetValue(&cv_dummystaff, 0);
+
+		active = false;
+		SP_TimeAttackMenu[taguest].status = IT_DISABLED;
+		SP_TimeAttackMenu[tareplay].status = IT_DISABLED;
+
+		// Check if file exists, if not, disable REPLAY option
+		for (i = 0; i < 4; i++)
+		{
+			SP_ReplayMenu[i].status = IT_DISABLED;
+			SP_GuestReplayMenu[i].status = IT_DISABLED;
+		}
+		SP_ReplayMenu[4].status = IT_DISABLED;
+
+		SP_GhostMenu[3].status = IT_DISABLED;
+		SP_GhostMenu[4].status = IT_DISABLED;
+
+		if (FIL_FileExists(va("%s-%s-time-best.lmp", gpath, cv_chooseskin.string))) {
+			SP_ReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
+			SP_GuestReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
+			active |= 3;
+		}
+		if (FIL_FileExists(va("%s-%s-lap-best.lmp", gpath, cv_chooseskin.string))) {
+			SP_ReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
+			SP_GuestReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
+			active |= 3;
+		}
+		if (FIL_FileExists(va("%s-%s-last.lmp", gpath, cv_chooseskin.string))) {
+			SP_ReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
+			SP_GuestReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
+			active |= 3;
+		}
+
+		if (FIL_FileExists(va("%s-guest.lmp", gpath)))
+		{
+			SP_ReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
+			SP_GuestReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
+			SP_GhostMenu[3].status = IT_STRING|IT_CVAR;
+			active |= 3;
+		}
+
+		CV_SetValue(&cv_dummystaff, 1);
+		if (cv_dummystaff.value)
+		{
+			SP_ReplayMenu[4].status = IT_WHITESTRING|IT_KEYHANDLER;
+			SP_GhostMenu[4].status = IT_STRING|IT_CVAR;
+			CV_StealthSetValue(&cv_dummystaff, 1);
+			active |= 1;
+		}
+
+		if (active) {
+			if (active & 1)
+				SP_TimeAttackMenu[tareplay].status = IT_WHITESTRING|IT_SUBMENU;
+			if (active & 2)
+				SP_TimeAttackMenu[taguest].status = IT_WHITESTRING|IT_SUBMENU;
+		}
+		else if (itemOn == tareplay) // Reset lastOn so replay isn't still selected when not available.
+		{
+			currentMenu->lastOn = itemOn;
+			itemOn = tastart;
+		}
+
+		if (mapheaderinfo[cv_nextmap.value-1] && mapheaderinfo[cv_nextmap.value-1]->forcecharacter[0] != '\0')
+			CV_Set(&cv_chooseskin, mapheaderinfo[cv_nextmap.value-1]->forcecharacter);
+
+		free(gpath);
+	}
+}
+
+static void Dummymenuplayer_OnChange(void)
+{
+	if (cv_dummymenuplayer.value < 1)
+		CV_StealthSetValue(&cv_dummymenuplayer, splitscreen+1);
+	else if (cv_dummymenuplayer.value > splitscreen+1)
+		CV_StealthSetValue(&cv_dummymenuplayer, 1);
+}
+
+char dummystaffname[22];
+
+static void Dummystaff_OnChange(void)
+{
+	lumpnum_t l;
+
+	dummystaffname[0] = '\0';
+
+	if ((l = W_CheckNumForName(va("%sS01",G_BuildMapName(cv_nextmap.value)))) == LUMPERROR)
+	{
+		CV_StealthSetValue(&cv_dummystaff, 0);
+		return;
+	}
+	else
+	{
+		char *temp = dummystaffname;
+		UINT8 numstaff = 1;
+		while (numstaff < 99 && (l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value),numstaff+1))) != LUMPERROR)
+			numstaff++;
+
+		if (cv_dummystaff.value < 1)
+			CV_StealthSetValue(&cv_dummystaff, numstaff);
+		else if (cv_dummystaff.value > numstaff)
+			CV_StealthSetValue(&cv_dummystaff, 1);
+
+		if ((l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value), cv_dummystaff.value))) == LUMPERROR)
+			return; // shouldn't happen but might as well check...
+
+		G_UpdateStaffGhostName(l);
+
+		while (*temp)
+			temp++;
+
+		sprintf(temp, " - %d", cv_dummystaff.value);
+	}
+}
+
+// Newgametype.  Used for gametype changes.
+static void Newgametype_OnChange(void)
+{
+	if (cv_nextmap.value && menuactive)
+	{
+		if (!mapheaderinfo[cv_nextmap.value-1])
+			P_AllocMapHeader((INT16)(cv_nextmap.value-1));
+
+		if ((cv_newgametype.value == GT_RACE && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_RACE)) || // SRB2kart
+			((cv_newgametype.value == GT_MATCH || cv_newgametype.value == GT_TEAMMATCH) && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_MATCH)))
+		{
+			INT32 value = 0;
+
+			switch (cv_newgametype.value)
+			{
+				case GT_COOP:
+					value = TOL_RACE; // SRB2kart
+					break;
+				case GT_COMPETITION:
+					value = TOL_COMPETITION;
+					break;
+				case GT_RACE:
+					value = TOL_RACE;
+					break;
+				case GT_MATCH:
+				case GT_TEAMMATCH:
+					value = TOL_MATCH;
+					break;
+				case GT_TAG:
+				case GT_HIDEANDSEEK:
+					value = TOL_TAG;
+					break;
+				case GT_CTF:
+					value = TOL_CTF;
+					break;
+			}
+
+			CV_SetValue(&cv_nextmap, M_FindFirstMap(value));
+		}
+	}
+}
+
+void Screenshot_option_Onchange(void)
+{
+	OP_ScreenshotOptionsMenu[op_screenshot_folder].status =
+		(cv_screenshot_option.value == 3 ? IT_CVAR|IT_STRING|IT_CV_STRING : IT_DISABLED);
+}
+
+void Moviemode_mode_Onchange(void)
+{
+	INT32 i, cstart, cend;
+	for (i = op_screenshot_gif_start; i <= op_screenshot_apng_end; ++i)
+		OP_ScreenshotOptionsMenu[i].status = IT_DISABLED;
+
+	switch (cv_moviemode.value)
+	{
+		case MM_GIF:
+			cstart = op_screenshot_gif_start;
+			cend = op_screenshot_gif_end;
+			break;
+		case MM_APNG:
+			cstart = op_screenshot_apng_start;
+			cend = op_screenshot_apng_end;
+			break;
+		default:
+			return;
+	}
+	for (i = cstart; i <= cend; ++i)
+		OP_ScreenshotOptionsMenu[i].status = IT_STRING|IT_CVAR;
+}
+
+void Addons_option_Onchange(void)
+{
+	OP_AddonsOptionsMenu[op_addons_folder].status =
+		(cv_addons_option.value == 3 ? IT_CVAR|IT_STRING|IT_CV_STRING : IT_DISABLED);
+}
+
+void Moviemode_option_Onchange(void)
+{
+	OP_ScreenshotOptionsMenu[op_movie_folder].status =
+		(cv_movie_option.value == 3 ? IT_CVAR|IT_STRING|IT_CV_STRING : IT_DISABLED);
+}
+
+void PDistort_menu_Onchange(void)
+{
+	if (cv_sloperoll.value)
+	{
+		OP_PlayerDistortMenu[slrotatedist].status = IT_STRING | IT_CVAR;
+		OP_PlayerDistortMenu[saltroll].status = IT_STRING | IT_CVAR;
+	}
+	else
+	{
+		OP_PlayerDistortMenu[slrotatedist].status = IT_GRAYEDOUT;
+		OP_PlayerDistortMenu[saltroll].status = IT_GRAYEDOUT;
+	}
+}
+
+void Bird_menu_Onchange(void)
+{
+	UINT16 status;
+
+	if (cv_tilting.value)
+		status = IT_STRING | IT_CVAR;
+	else
+		status = IT_GRAYEDOUT;
+
+	OP_TiltMenu[tiltwturning].status = status;
+	OP_TiltMenu[smoothening].status = status;
+	OP_TiltMenu[tiltwquakes].status = status;
+
+	if (cv_fading.value)
+		status = IT_STRING | IT_CVAR;
+	else
+		status = IT_GRAYEDOUT;
+
+	OP_AdvancedBirdMenu[fadeinvinc].status = status;
+	OP_AdvancedBirdMenu[fadegrow].status = status;
+	OP_AdvancedBirdMenu[respawnfadeout].status = status;
+	OP_AdvancedBirdMenu[respawnfadein].status = status;
+
+	if (cv_birdmusic.value)
+	{
+		OP_BirdMenu[lvlresum].status = IT_STRING | IT_CVAR;
+		OP_BirdMenu[spclresum].status = IT_STRING | IT_CVAR;
+		OP_BirdMenu[advmusic].status = IT_STRING | IT_SUBMENU;
+	}
+	else
+	{
+		OP_BirdMenu[lvlresum].status = IT_GRAYEDOUT;
+		OP_BirdMenu[spclresum].status = IT_GRAYEDOUT;
+		OP_BirdMenu[advmusic].status = IT_GRAYEDOUT;
+	}
+}
+
+//menu code is nice
+void SaturnHud_menu_Onchange(void)
+{
+	UINT16 status;
+
+	if (cv_colorizedhud.value)
+		status = IT_STRING | IT_CVAR;
+	else
+		status = IT_GRAYEDOUT;
+
+	OP_SaturnHudMenu[sh_coloritem].status = status;
+	OP_SaturnHudMenu[sh_colorhud_customcolor].status = status;
+}
+
+void GameFocus_menu_Onchange(void)
+{
+	OP_FocusOptionsMenu[5].status = cv_usemouse.value ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
+}
+
+#ifdef HWRENDER
+void M_UpdateOGLMenu(void)
+{
+#ifdef USE_FBO_OGL
+	OP_ExpOptionsMenu[op_exp_fbo].status = (!supportFBO || cv_glscreentextures.value != 2) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
+#endif
+	OP_ExpOptionsMenu[op_exp_paldepth].status = (!HWR_ShouldUsePaletteRendering()) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
+
+	OP_OpenGLOptionsMenu[op_gl_falbckmdls].status = (!cv_glmdls.value) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
+
+	OP_OpenGLOptionsMenu[op_gl_lightdither].status = (!HWR_UseShader()) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
+
+	OP_OpenGLOptionsMenu[op_gl_palrender].status = (cv_glscreentextures.value != 2 || !HWR_UseShader()) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
+	OP_OpenGLOptionsMenu[op_gl_flashpal].status = (!HWR_ShouldUsePaletteRendering()) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
+}
+#endif
diff --git a/src/m_misc.c b/src/m_misc.c
index b8c88abb5..386bc031d 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -14,6 +14,10 @@
 
 #ifdef __GNUC__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 // Ignore "argument might be clobbered by longjmp" warning in GCC
 // (if libpng is compiled with setjmp error handling)
@@ -27,6 +31,8 @@
 // Extended map support.
 #include <ctype.h>
 
+#include "am_map.h"
+
 #include "doomdef.h"
 #include "g_game.h"
 #include "m_misc.h"
@@ -53,12 +59,13 @@
 
 #ifdef HAVE_SDL
 #include "sdl/hwsym_sdl.h"
+#endif
+
 #ifdef __linux__
 #ifndef _LARGEFILE64_SOURCE
 typedef off_t off64_t;
 #endif
 #endif
-#endif
 
 #if defined(__MINGW32__) && ((__GNUC__ > 7) || (__GNUC__ == 6 && __GNUC_MINOR__ >= 3)) && (__GNUC__ < 8)
 #define PRIdS "u"
@@ -108,6 +115,9 @@ consvar_t cv_screenshot_folder = {"screenshot_folder", "", CV_SAVE, NULL, NULL,
 static CV_PossibleValue_t moviemode_cons_t[] = {{MM_GIF, "GIF"}, {MM_APNG, "aPNG"}, {MM_SCREENSHOT, "Screenshots"}, {0, NULL}};
 consvar_t cv_moviemode = {"moviemode_mode", "GIF", CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_movie_option = {"movie_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Moviemode_option_Onchange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_movie_folder = {"movie_folder", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 static CV_PossibleValue_t zlib_mem_level_t[] = {
 	{1, "(Min Memory) 1"},
 	{2, "2"}, {3, "3"}, {4, "4"}, {5, "5"}, {6, "6"}, {7, "7"},
@@ -438,7 +448,6 @@ char configfile[MAX_WADPATH];
 // ==========================================================================
 //                          CONFIGURATION
 // ==========================================================================
-static boolean gameconfig_loaded = false; // true once config.cfg loaded AND executed
 
 /** Saves a player's config, possibly to a particular file.
   *
@@ -543,10 +552,28 @@ void M_FirstLoadConfig(void)
 	// don't filter anymore vars and don't let this convsvar be changed
 	COM_BufInsertText(va("%s \"%d\"\n", cv_execversion.name, EXECVERSION));
 	CV_ToggleExecVersion(false);
+}
 
-	// make sure I_Quit() will write back the correct config
-	// (do not write back the config if it crash before)
-	gameconfig_loaded = true;
+static boolean M_BackupConfig(const char *filename)
+{
+	char backupfile[MAX_WADPATH+4];
+
+	snprintf(backupfile, sizeof backupfile, "%s.bak", filename);
+	backupfile[sizeof backupfile - 1] = '\0';
+
+	FILE *config = fopen(filename, "r");
+
+	if (config != NULL)
+	{
+		fclose(config);
+		if (FIL_CopyFile(filename, backupfile) == false)
+		{
+			CONS_Alert(CONS_WARNING,"Failed to create a backup of the configuration file. Will not attempt to write to file\n");
+			return false;
+		}
+	}
+
+	return true;
 }
 
 /** Saves the game configuration.
@@ -560,7 +587,7 @@ void M_SaveConfig(const char *filename)
 	char backupfile[MAX_WADPATH+4];
 
 	// make sure not to write back the config until it's been correctly loaded
-	if (!gameconfig_loaded)
+	if (!loaded_config)
 		return;
 
 	// Create backup of the config file
@@ -595,6 +622,10 @@ void M_SaveConfig(const char *filename)
 		else
 			filepath = Z_StrDup(filename);
 
+		// If failed to backup, do not proceed
+		if (!M_BackupConfig(filepath))
+			return;
+
 		f = fopen(filepath, "w");
 		// change it only if valid
 		if (f)
@@ -613,6 +644,10 @@ void M_SaveConfig(const char *filename)
 			return;
 		}
 
+		// If failed to backup, do not proceed
+		if (!M_BackupConfig(configfile))
+			return;
+
 		f = fopen(configfile, "w");
 		if (!f)
 		{
@@ -1046,7 +1081,7 @@ static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
 	png_init_io(apng_ptr, apng_FILE);
 
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
-	png_set_user_limits(apng_ptr, MAXPNGWIDTH, MAXPNGHEIGHT);
+	png_set_user_limits(apng_ptr, MAXVIDWIDTH, MAXVIDHEIGHT);
 #endif
 
 	//png_set_filter(apng_ptr, 0, PNG_ALL_FILTERS);
@@ -1142,19 +1177,25 @@ static inline moviemode_t M_StartMovieGIF(const char *pathname)
 void M_StartMovie(void)
 {
 #if NUMSCREENS > 2
-	const char *pathname = ".";
+	char pathname[MAX_WADPATH];
 
 	if (moviemode)
 		return;
 
-	if (cv_screenshot_option.value == 0)
-		pathname = usehome ? srb2home : srb2path;
-	else if (cv_screenshot_option.value == 1)
-		pathname = srb2home;
-	else if (cv_screenshot_option.value == 2)
-		pathname = srb2path;
-	else if (cv_screenshot_option.value == 3 && *cv_screenshot_folder.string != '\0')
-		pathname = cv_screenshot_folder.string;
+	if (cv_movie_option.value == 0)
+		strcpy(pathname, usehome ? srb2home : srb2path);
+	else if (cv_movie_option.value == 1)
+		strcpy(pathname, srb2home);
+	else if (cv_movie_option.value == 2)
+		strcpy(pathname, srb2path);
+	else if (cv_movie_option.value == 3 && *cv_movie_folder.string != '\0')
+		strcpy(pathname, cv_movie_folder.string);
+
+	if (cv_movie_option.value != 3)
+	{
+		strcat(pathname, PATHSEP"gifs"PATHSEP);
+		I_mkdir(pathname, 0755);
+	}
 
 	if (rendermode == render_none)
 		I_Error("Can't make a movie without a render system\n");
@@ -1217,7 +1258,7 @@ void M_SaveFrame(void)
 				if (rendermode == render_soft)
 				{
 					// munge planar buffer to linear
-					linear = screens[2];
+					linear = vid.screens[2];
 					I_ReadScreen(linear);
 				}
 #ifdef HWRENDER
@@ -1355,7 +1396,7 @@ boolean M_SavePNG(const char *filename, void *data, int width, int height, const
 	png_init_io(png_ptr, png_FILE);
 
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
-	png_set_user_limits(png_ptr, MAXPNGWIDTH, MAXPNGHEIGHT);
+	png_set_user_limits(png_ptr, MAXVIDWIDTH, MAXVIDHEIGHT);
 #endif
 
 	//png_set_filter(png_ptr, 0, PNG_ALL_FILTERS);
@@ -1480,7 +1521,8 @@ void M_ScreenShot(void)
 void M_DoScreenShot(void)
 {
 #if NUMSCREENS > 2
-	const char *freename = NULL, *pathname = ".";
+	const char *freename = NULL;
+	char pathname[MAX_WADPATH];
 	boolean ret = false;
 	UINT8 *linear = NULL;
 
@@ -1492,13 +1534,19 @@ void M_DoScreenShot(void)
 		return;
 
 	if (cv_screenshot_option.value == 0)
-		pathname = usehome ? srb2home : srb2path;
+		strcpy(pathname, usehome ? srb2home : srb2path);
 	else if (cv_screenshot_option.value == 1)
-		pathname = srb2home;
+		strcpy(pathname, srb2home);
 	else if (cv_screenshot_option.value == 2)
-		pathname = srb2path;
+		strcpy(pathname, srb2path);
 	else if (cv_screenshot_option.value == 3 && *cv_screenshot_folder.string != '\0')
-		pathname = cv_screenshot_folder.string;
+		strcpy(pathname, cv_screenshot_folder.string);
+
+	if (cv_screenshot_option.value != 3)
+	{
+		strcat(pathname, PATHSEP"screenshots"PATHSEP);
+		I_mkdir(pathname, 0755);
+	}
 
 #ifdef USE_PNG
 	freename = Newsnapshotfile(pathname,"png");
@@ -1512,7 +1560,7 @@ void M_DoScreenShot(void)
 	if (rendermode == render_soft)
 	{
 		// munge planar buffer to linear
-		linear = screens[2];
+		linear = vid.screens[2];
 		I_ReadScreen(linear);
 	}
 
@@ -1564,62 +1612,137 @@ boolean M_ScreenshotResponder(event_t *ev)
 	if (ch >= KEY_MOUSE1 && menuactive) // If it's not a keyboard key, then don't allow it in the menus!
 		return false;
 
-	if (ch == KEY_F8 || ch == gamecontrol[gc_screenshot][0] || ch == gamecontrol[gc_screenshot][1]) // remappable F8
+	if (ch == KEY_F8 || ch == gamecontrol[0][gc_screenshot][0] || ch == gamecontrol[0][gc_screenshot][1]) // remappable F8
 		M_ScreenShot();
-	else if (ch == KEY_F9 || ch == gamecontrol[gc_recordgif][0] || ch == gamecontrol[gc_recordgif][1]) // remappable F9
+	else if (ch == KEY_F9 || ch == gamecontrol[0][gc_recordgif][0] || ch == gamecontrol[0][gc_recordgif][1]) // remappable F9
 		((moviemode) ? M_StopMovie : M_StartMovie)();
 	else
 		return false;
 	return true;
 }
 
-// ==========================================================================
-//                       TRANSLATION FUNCTIONS
-// ==========================================================================
 
-// M_StartupLocale.
-// Sets up gettext to translate SRB2's strings.
-#ifdef GETTEXT
-#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
-#define GETTEXTDOMAIN1 "/usr/share/locale"
-#define GETTEXTDOMAIN2 "/usr/local/share/locale"
-#elif defined (_WIN32)
-#define GETTEXTDOMAIN1 "."
-#endif
-
-void M_StartupLocale(void)
+void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen, tic_t timer)
 {
-	char *textdomhandle = NULL;
+	// How much should we scroll. Not sure why +1 is needed, but without it this function skips 2
+	// characters at once sometimes
+	const size_t amount = len - maxlen + 1;
 
-	CONS_Printf("M_StartupLocale...\n");
+	// Note: anything above 17 will cause zero division
+	const size_t MAXSPEED = 6;
+	const tic_t t = timer / (35/min(amount, MAXSPEED));
 
-	setlocale(LC_ALL, "");
+	const size_t state = (t / amount) % 4;
 
-	// Do not set numeric locale as that affects atof
-	setlocale(LC_NUMERIC, "C");
+	switch (state)
+	{
+		// Show beginning of the name
+		case 0:
+			memcpy(result, name, maxlen-1);
+		break;
 
-	// FIXME: global name define anywhere?
-#ifdef GETTEXTDOMAIN1
-	textdomhandle = bindtextdomain("srb2", GETTEXTDOMAIN1);
-#endif
-#ifdef GETTEXTDOMAIN2
-	if (!textdomhandle)
-		textdomhandle = bindtextdomain("srb2", GETTEXTDOMAIN2);
-#endif
-#ifdef GETTEXTDOMAIN3
-	if (!textdomhandle)
-		textdomhandle = bindtextdomain("srb2", GETTEXTDOMAIN3);
-#endif
-#ifdef GETTEXTDOMAIN4
-	if (!textdomhandle)
-		textdomhandle = bindtextdomain("srb2", GETTEXTDOMAIN4);
-#endif
-	if (textdomhandle)
-		textdomain("srb2");
+		// Scroll towards end of the name
+		case 1:
+		{
+			const size_t advance = t % amount;
+			memcpy(result, name+advance, maxlen-1);
+		}
+		break;
+
+		// Show end of the name
+		case 2:
+			memcpy(result, name+len+1-maxlen, maxlen-1);
+		break;
+
+		// Scroll towards start of the name
+		case 3:
+		{
+			const size_t advance = t % amount;
+			memcpy(result, name+len+1-maxlen-advance, maxlen-1);
+		}
+		break;
+	}
+
+	// Technically not necessary, since it gets set again after function call, but just in case
+	result[maxlen] = 0;
+}
+
+void M_MinimapGenerate(void)
+{
+#ifdef USE_PNG
+	char *filepath;
+	boolean ret = false;
+	minigen_t *minigen = NULL;
+	size_t option_scale;
+	INT32 mul = 1;
+
+	if (gamestate != GS_LEVEL)
+	{
+		CONS_Alert(CONS_ERROR, "You must be in a level to generate a preliminary minimap!\n");
+		return;
+	}
+
+	if (automapactive)
+	{
+		CONS_Alert(CONS_ERROR, "The automap is active! Please deactivate it and try again.\n");
+		return;
+	}
+
+	option_scale = COM_CheckPartialParm("-m");
+
+	if (option_scale)
+	{
+		if (COM_Argc() < option_scale + 2)/* no argument after? */
+		{
+			CONS_Alert(CONS_ERROR,
+					"No multiplier follows parameter '%s'.\n",
+					COM_Argv(option_scale));
+			return;
+		}
+
+		mul = atoi(COM_Argv(option_scale + 1));
+
+		if (mul < 1 || mul > 10)
+		{
+			CONS_Alert(CONS_ERROR,
+					"Multiplier %d must be within range 1-10.\n",
+					mul);
+			return;
+		}
+
+		filepath = va("%s" PATHSEP "%s-MINIMAP-%d.png", srb2home, G_BuildMapName(gamemap), mul);
+	}
 	else
-		CONS_Printf("Could not find locale text domain!\n");
+	{
+		filepath = va("%s" PATHSEP "%s-MINIMAP.png", srb2home, G_BuildMapName(gamemap));
+	}
+
+	minigen = AM_MinimapGenerate(mul);
+
+	if (minigen == NULL || minigen->buf == NULL)
+		goto failure;
+
+	M_CreateScreenShotPalette();
+	ret = M_SavePNG(filepath, minigen->buf, minigen->w, minigen->h, screenshot_palette);
+
+failure:
+	if (minigen->buf != NULL)
+		free(minigen->buf);
+
+	if (ret)
+	{
+		CONS_Printf(M_GetText("%s saved.\nRemember that this is not a complete minimap,\nand must be edited before putting in-game.\n"), filepath);
+		if (mul != 1)
+		{
+			CONS_Printf("You should divide its size by %d!\n", mul);
+		}
+	}
+	else
+	{
+		CONS_Alert(CONS_ERROR, M_GetText("Couldn't create %s\n"), filepath);
+	}
+#endif //#ifdef USE_PNG
 }
-#endif
 
 // ==========================================================================
 //                        MISC STRING FUNCTIONS
@@ -1702,6 +1825,87 @@ INT32 axtoi(const char *hexStg)
 	return intValue;
 }
 
+void CopyCaretColors(char *p, const char *s, int n)
+{
+	char *t;
+	int   m;
+	int   c;
+
+	if (!n)
+		return;
+
+	while (( t = strchr(s, '^') ))
+	{
+		m = ( t - s );
+
+		if (m >= n)
+		{
+			memcpy(p, s, n);
+			return;
+		}
+		else
+			memcpy(p, s, m);
+
+		p += m;
+		n -= m;
+		s += m;
+
+		if (!n)
+			return;
+
+		if (s[1])
+		{
+			c = toupper(s[1]);
+			if (isdigit(c))
+				c = 0x80 + ( c - '0' );
+			else if (c >= 'A' && c <= 'F')
+				c = 0x80 + ( c - 'A' );
+			else
+				c = 0;
+
+			if (c)
+			{
+				*p++ = c;
+				n--;
+
+				if (!n)
+					return;
+			}
+			else
+			{
+				if (n < 2)
+					break;
+
+				memcpy(p, s, 2);
+
+				p += 2;
+				n -= 2;
+			}
+
+			s += 2;
+		}
+		else
+			break;
+	}
+
+	strncpy(p, s, n);
+}
+
+void StripColors(char *dst, char *src, size_t n)
+{
+	size_t j = 0;
+
+	for (size_t i = 0; j < n && src[i] != 0; ++i)
+	{
+		char c = src[i];
+
+		if ((c & 0x80) == 0)
+			dst[j++] = c;
+	}
+
+	dst[j] = 0;
+}
+
 /** Token parser for TEXTURES, ANIMDEFS, and potentially other lumps later down the line.
   * Was originally R_GetTexturesToken when I was coding up the TEXTURES parser, until I realized I needed it for ANIMDEFS too.
   * Parses up to the next whitespace character or comma. When finding the start of the next token, whitespace is skipped.
@@ -1862,6 +2066,25 @@ char *M_GetToken(const char *inputString)
 	return texturesToken;
 }
 
+
+const char * M_Ftrim (double f)
+{
+	static char dig[9];/* "0." + 6 digits (6 is printf's default) */
+	int i;
+	/* I know I said it's the default, but just in case... */
+	sprintf(dig, "%.6f", fabs(modf(f, &f)));
+	/* trim trailing zeroes */
+	for (i = strlen(dig)-1; dig[i] == '0'; --i)
+		;
+	if (dig[i] == '.')/* :NOTHING: */
+		return "";
+	else
+	{
+		dig[i + 1] = '\0';
+		return &dig[1];/* skip the 0 */
+	}
+}
+
 /** Count bits in a number.
   */
 UINT8 M_CountBits(UINT32 num, UINT8 size)
@@ -1987,11 +2210,6 @@ char *sizeu5(size_t num)
 	return sizeu5_buf;
 }
 
-FUNCINLINE ATTRINLINE void *M_Memcpy(void *dest, const void *src, size_t n)
-{
-	return memcpy(dest, src, n);
-}
-
 /** Return the appropriate message for a file error or end of file.
 */
 const char *M_FileError(FILE *fp)
@@ -2001,3 +2219,143 @@ const char *M_FileError(FILE *fp)
 	else
 		return "end-of-file";
 }
+
+/** Return the number of parts of this path.
+*/
+int M_PathParts(const char *path)
+{
+	int n;
+	const char *p;
+	const char *t;
+	if (path == NULL)
+		return 0;
+	for (n = 0, p = path ;; ++n)
+	{
+		t = p;
+		if (( p = strchr(p, PATHSEP[0]) ))
+			p += strspn(p, PATHSEP);
+		else
+		{
+			if (*t)/* there is something after the final delimiter */
+				n++;
+			break;
+		}
+	}
+	return n;
+}
+
+/** Check whether a path is an absolute path.
+*/
+boolean M_IsPathAbsolute(const char *path)
+{
+#ifdef _WIN32
+	return ( strncmp(&path[1], ":\\", 2) == 0 );
+#else
+	return ( path[0] == '/' );
+#endif
+}
+
+/** I_mkdir for each part of the path.
+*/
+void M_MkdirEachUntil(const char *cpath, int start, int end, int mode)
+{
+	char path[MAX_WADPATH];
+	char *p;
+	char *t;
+
+	if (end > 0 && end <= start)
+		return;
+
+	strlcpy(path, cpath, sizeof path);
+#ifdef _WIN32
+	if (strncmp(&path[1], ":\\", 2) == 0)
+		p = &path[3];
+	else
+#endif
+		p = path;
+
+	if (end > 0)
+		end -= start;
+
+	for (; start > 0; --start)
+	{
+		p += strspn(p, PATHSEP);
+		if (!( p = strchr(p, PATHSEP[0]) ))
+			return;
+	}
+	p += strspn(p, PATHSEP);
+	for (;;)
+	{
+		if (end > 0 && !--end)
+			break;
+
+		t = p;
+		if (( p = strchr(p, PATHSEP[0]) ))
+		{
+			*p = '\0';
+			I_mkdir(path, mode);
+			*p = PATHSEP[0];
+			p += strspn(p, PATHSEP);
+		}
+		else
+		{
+			if (*t)
+				I_mkdir(path, mode);
+			break;
+		}
+	}
+}
+
+void M_MkdirEach(const char *path, int start, int mode)
+{
+	M_MkdirEachUntil(path, start, -1, mode);
+}
+
+// Hashes some message using FNV-1a
+#define FNV1A_OFFSET_BASIS 0x811C9DC5
+#define FNV1A_PRIME        0x01000193
+
+UINT32 FNV1a_Hash(const char *message, size_t size)
+{
+	UINT32 hash = FNV1A_OFFSET_BASIS;
+
+	for (size_t i = 0; i < size; i++)
+	{
+		hash ^= message[i];
+		hash *= FNV1A_PRIME;
+	}
+
+	return hash;
+}
+
+UINT32 FNV1a_HashString(const char *message)
+{
+	UINT32 hash = FNV1A_OFFSET_BASIS;
+
+	while (*message)
+	{
+		hash ^= *message;
+		hash *= FNV1A_PRIME;
+		message++;
+	}
+
+	return hash;
+}
+
+UINT32 FNV1a_HashLowercaseString(const char *message)
+{
+	UINT32 hash = FNV1A_OFFSET_BASIS;
+
+	while (*message)
+	{
+		hash ^= tolower(*message);
+		hash *= FNV1A_PRIME;
+		message++;
+	}
+
+	return hash;
+}
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/m_misc.h b/src/m_misc.h
index 333398161..2cdad977a 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -15,6 +15,10 @@
 #ifndef __M_MISC__
 #define __M_MISC__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomtype.h"
 #include "tables.h"
 
@@ -30,7 +34,7 @@ typedef enum {
 extern moviemode_t moviemode;
 
 extern consvar_t cv_screenshot_option, cv_screenshot_folder;
-extern consvar_t cv_moviemode;
+extern consvar_t cv_moviemode, cv_movie_folder, cv_movie_option;
 extern consvar_t cv_zlib_memory, cv_zlib_level, cv_zlib_strategy, cv_zlib_window_bits;
 extern consvar_t cv_zlib_memorya, cv_zlib_levela, cv_zlib_strategya, cv_zlib_window_bitsa;
 extern consvar_t cv_apng_delay;
@@ -69,6 +73,10 @@ void M_ScreenShot(void);
 void M_DoScreenShot(void);
 boolean M_ScreenshotResponder(event_t *ev);
 
+void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen, tic_t timer);
+
+void M_MinimapGenerate(void);
+
 void Command_SaveConfig_f(void);
 void Command_LoadConfig_f(void);
 void Command_ChangeConfig_f(void);
@@ -79,6 +87,11 @@ void M_SaveConfig(const char *filename);
 
 INT32 axtoi(const char *hexStg);
 
+void CopyCaretColors(char *p, const char *s, int n);
+
+// Remove color codes from string
+void StripColors(char *dst, char *src, size_t n);
+
 const char *GetRevisionString(void);
 
 // Vector/matrix math
@@ -97,10 +110,30 @@ void strcatbf(char *s1, const char *s2, const char *s3);
 
 const char *M_FileError(FILE *handle);
 
+int     M_PathParts      (const char *path);
+boolean M_IsPathAbsolute (const char *path);
+void    M_MkdirEach      (const char *path, int start, int mode);
+void    M_MkdirEachUntil (const char *path, int start, int end, int mode);
+
+/*
+Return dot and then the fractional part of a float, without
+trailing zeros, or "" if the fractional part is zero.
+*/
+const char * M_Ftrim (double);
+
 // counting bits, for weapon ammo code, usually
 FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size);
 
+// Hashes some message using FNV-1a
+UINT32 FNV1a_Hash(const char *message, size_t size);
+UINT32 FNV1a_HashString(const char *message);
+UINT32 FNV1a_HashLowercaseString(const char *message);
+
 #include "w_wad.h"
 extern char configfile[MAX_WADPATH];
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/m_perfstats.c b/src/m_perfstats.c
index 04e51a657..5a30a6cf7 100644
--- a/src/m_perfstats.c
+++ b/src/m_perfstats.c
@@ -10,6 +10,7 @@
 /// \brief Performance measurement tools.
 
 #include "m_perfstats.h"
+#include "p_mobj.h"
 #include "v_video.h"
 #include "i_video.h"
 #include "d_netcmd.h"
@@ -125,11 +126,11 @@ perfstatrow_t commoncounter_rows[] = {
 	{0}
 };
 
-/*perfstatrow_t interpolation_rows[] = {
-	{"intpfrc", "Interp frac: ", &ps_interp_frac, PS_TIME},
-	{"intplag", "Interp lag:  ", &ps_interp_lag, PS_TIME},
+perfstatrow_t interpolation_rows[] = {
+	{"intpfrc", "Interp frac: ", &ps_interp_frac, 0},
+	{"intplag", "Interp lag:  ", &ps_interp_lag, 0},
 	{0}
-};*/
+};
 
 #ifdef HWRENDER
 perfstatrow_t batchcount_rows[] = {
@@ -172,8 +173,8 @@ perfstatrow_t thinkercount_rows[] = {
 	{"  regular", "  Regular:        ", &ps_regularcount, PS_LEVEL},
 	{"  scenery", "  Scenery:        ", &ps_scenerycount, PS_LEVEL},
 	{"  nothink", "  Nothink:        ", &ps_nothinkcount, PS_HIDE_ZERO|PS_LEVEL},
-	{" other  ", " Other:          ", &ps_otherthcount, PS_LEVEL},
 	{" precip ", " Precipitation:  ", &ps_precipcount, PS_LEVEL},
+	{" other  ", " Other:          ", &ps_otherthcount, PS_LEVEL},
 	{" remove ", " Pending removal:", &ps_removecount, PS_LEVEL},
 	{0}
 };
@@ -213,6 +214,7 @@ void PS_SetPreThinkFrameHookInfo(int index, precise_t time_taken, char* short_sr
 		// array needs to be initialized
 		prethinkframe_hooks = Z_Calloc(sizeof(ps_hookinfo_t) * prethinkframe_hooks_capacity, PU_STATIC, NULL);
 	}
+
 	if (index >= prethinkframe_hooks_capacity)
 	{
 		// array needs more space, realloc with double size
@@ -224,6 +226,7 @@ void PS_SetPreThinkFrameHookInfo(int index, precise_t time_taken, char* short_sr
 			sizeof(ps_hookinfo_t) * prethinkframe_hooks_capacity);
 		prethinkframe_hooks_capacity = new_capacity;
 	}
+
 	prethinkframe_hooks[index].time_taken.value.p = time_taken;
 	memcpy(prethinkframe_hooks[index].short_src, short_src, LUA_IDSIZE * sizeof(char));
 	// since the values are set sequentially from begin to end, the last call should leave
@@ -238,6 +241,7 @@ void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src)
 		// array needs to be initialized
 		thinkframe_hooks = Z_Calloc(sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity, PU_STATIC, NULL);
 	}
+
 	if (index >= thinkframe_hooks_capacity)
 	{
 		// array needs more space, realloc with double size
@@ -249,6 +253,7 @@ void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src)
 			sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity);
 		thinkframe_hooks_capacity = new_capacity;
 	}
+
 	thinkframe_hooks[index].time_taken.value.p = time_taken;
 	memcpy(thinkframe_hooks[index].short_src, short_src, LUA_IDSIZE * sizeof(char));
 	// since the values are set sequentially from begin to end, the last call should leave
@@ -263,6 +268,7 @@ void PS_SetPostThinkFrameHookInfo(int index, precise_t time_taken, char* short_s
 		// array needs to be initialized
 		postthinkframe_hooks = Z_Calloc(sizeof(ps_hookinfo_t) * postthinkframe_hooks_capacity, PU_STATIC, NULL);
 	}
+
 	if (index >= postthinkframe_hooks_capacity)
 	{
 		// array needs more space, realloc with double size
@@ -274,6 +280,7 @@ void PS_SetPostThinkFrameHookInfo(int index, precise_t time_taken, char* short_s
 			sizeof(ps_hookinfo_t) * postthinkframe_hooks_capacity);
 		postthinkframe_hooks_capacity = new_capacity;
 	}
+
 	postthinkframe_hooks[index].time_taken.value.p = time_taken;
 	memcpy(postthinkframe_hooks[index].short_src, short_src, LUA_IDSIZE * sizeof(char));
 	// since the values are set sequentially from begin to end, the last call should leave
@@ -281,8 +288,6 @@ void PS_SetPostThinkFrameHookInfo(int index, precise_t time_taken, char* short_s
 	postthinkframe_hooks_length = index + 1;
 }
 
-
-
 static boolean PS_HighResolution(void)
 {
 	return (vid.width >= 640 && vid.height >= 400);
@@ -300,7 +305,7 @@ static boolean PS_IsRowValid(perfstatrow_t *row)
 		|| (row->flags & PS_SW && rendermode != render_soft)
 		|| (row->flags & PS_HW && rendermode != render_opengl)
 #ifdef HWRENDER
-		|| (row->flags & PS_BATCHING && !cv_grbatching.value)
+		|| (row->flags & PS_BATCHING && !cv_glbatching.value)
 #endif
 		);
 }
@@ -348,6 +353,7 @@ static INT32 PS_GetMetricMinOrMax(ps_metric_t *metric, boolean time_metric, bool
 	for (i = 0; i < cv_ps_samplesize.value; i++)
 	{
 		INT32 value;
+
 		if (time_metric)
 			value = (*((precise_t*)history_read_pos)) / (I_GetPrecisePrecision() / 1000000);
 		else
@@ -358,6 +364,7 @@ static INT32 PS_GetMetricMinOrMax(ps_metric_t *metric, boolean time_metric, bool
 		{
 			found_value = value;
 		}
+
 		history_read_pos += value_size;
 	}
 
@@ -376,6 +383,7 @@ static INT32 PS_GetMetricSD(ps_metric_t *metric, boolean time_metric)
 	for (i = 0; i < cv_ps_samplesize.value; i++)
 	{
 		INT64 value;
+
 		if (time_metric)
 			value = (*((precise_t*)history_read_pos)) / (I_GetPrecisePrecision() / 1000000);
 		else
@@ -395,14 +403,17 @@ static INT32 PS_GetMetricScreenValue(ps_metric_t *metric, boolean time_metric)
 {
 	if (cv_ps_samplesize.value > 1 && metric->history)
 	{
-		if (cv_ps_descriptor.value == 1)
-			return PS_GetMetricAverage(metric, time_metric);
-		else if (cv_ps_descriptor.value == 2)
-			return PS_GetMetricSD(metric, time_metric);
-		else if (cv_ps_descriptor.value == 3)
-			return PS_GetMetricMinOrMax(metric, time_metric, false);
-		else
-			return PS_GetMetricMinOrMax(metric, time_metric, true);
+		switch (cv_ps_descriptor.value)
+		{
+			case 1:
+				return PS_GetMetricAverage(metric, time_metric);
+			case 2:
+				return PS_GetMetricSD(metric, time_metric);
+			case 3:
+				return PS_GetMetricMinOrMax(metric, time_metric, false);
+			default:
+				return PS_GetMetricMinOrMax(metric, time_metric, true);
+		}
 	}
 	else
 	{
@@ -451,7 +462,7 @@ static int PS_DrawPerfRows(int x, int y, int color, perfstatrow_t *rows)
 	return draw_y;
 }
 
-static void PS_UpdateMetricHistory(ps_metric_t *metric, boolean time_metric, boolean frame_metric, boolean set_user)
+static void PS_UpdateMetricHistory(ps_metric_t *metric, boolean time_metric, boolean frame_metric)
 {
 	int index = frame_metric ? ps_frame_index : ps_tick_index;
 
@@ -459,7 +470,7 @@ static void PS_UpdateMetricHistory(ps_metric_t *metric, boolean time_metric, boo
 	{
 		// allocate history table
 		int value_size = time_metric ? sizeof(precise_t) : sizeof(INT32);
-		void** memory_user = set_user ? &metric->history : NULL;
+		void** memory_user = &metric->history;
 
 		metric->history = Z_Calloc(value_size * cv_ps_samplesize.value, PU_PERFSTATS,
 				memory_user);
@@ -489,7 +500,7 @@ static void PS_UpdateRowHistories(perfstatrow_t *rows, boolean frame_metric)
 	for (row = rows; row->lores_label; row++)
 	{
 		if (PS_IsRowValid(row))
-			PS_UpdateMetricHistory(row->metric, !!(row->flags & PS_TIME), frame_metric, true);
+			PS_UpdateMetricHistory(row->metric, !!(row->flags & PS_TIME), frame_metric);
 	}
 }
 
@@ -517,7 +528,7 @@ static void PS_UpdateFrameStats(void)
 				ps_hw_spritesorttime.value.p +
 				ps_hw_spritedrawtime.value.p;
 
-			if (cv_grbatching.value)
+			if (cv_glbatching.value)
 			{
 				ps_otherrendertime.value.p -=
 					ps_hw_batchsorttime.value.p +
@@ -542,11 +553,11 @@ static void PS_UpdateFrameStats(void)
 		if (PS_IsLevelActive())
 			PS_UpdateRowHistories(commoncounter_rows, true);
 
-		/*if (R_UsingFrameInterpolation())
-			PS_UpdateRowHistories(interpolation_rows, true);*/
+		if (R_UsingFrameInterpolation())
+			PS_UpdateRowHistories(interpolation_rows, true);
 
 #ifdef HWRENDER
-		if (rendermode == render_opengl && cv_grbatching.value)
+		if (rendermode == render_opengl && cv_glbatching.value)
 		{
 			PS_UpdateRowHistories(batchcount_rows, true);
 			PS_UpdateRowHistories(batchcalls_rows, true);
@@ -571,15 +582,17 @@ static void PS_CountThinkers(void)
 	ps_regularcount.value.i = 0;
 	ps_scenerycount.value.i = 0;
 	ps_nothinkcount.value.i = 0;
-	ps_otherthcount.value.i = 0;
 	ps_precipcount.value.i = 0;
+	ps_otherthcount.value.i = 0;
 	ps_removecount.value.i = 0;
+
 	for (thinker = thinkercap.next; thinker != &thinkercap; thinker = thinker->next)
 	{
 		ps_thinkercount.value.i++;
-		if (thinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+
+		if (thinker->function == (actionf_p1)P_RemoveThinkerDelayed)
 			ps_removecount.value.i++;
-		else if (thinker->function.acp1 == (actionf_p1)P_MobjThinker)
+		else if (thinker->function == (actionf_p1)P_MobjThinker)
 		{
 			mobj_t *mobj = (mobj_t*)thinker;
 			ps_mobjcount.value.i++;
@@ -590,17 +603,24 @@ static void PS_CountThinkers(void)
 			else
 				ps_regularcount.value.i++;
 		}
-		else if (thinker->function.acp1 == (actionf_p1)P_NullPrecipThinker)
-			ps_precipcount.value.i++;
 		else
 			ps_otherthcount.value.i++;
 	}
+
+	for (thinker = precipcap.next; thinker != &precipcap; thinker = thinker->next)
+	{
+		if (thinker->function != (actionf_p1)P_NullPrecipThinker)
+			continue; // not a precipmobj thinker
+
+		ps_precipcount.value.i++;
+	}
+
 	/*for (i = 0; i < NUM_THINKERLISTS; i++)
 	{
 		for (thinker = thlist[i].next; thinker != &thlist[i]; thinker = thinker->next)
 		{
 			ps_thinkercount.value.i++;
-			if (thinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (thinker->function == (actionf_p1)P_RemoveThinkerDelayed)
 				ps_removecount.value.i++;
 			else if (i == THINK_POLYOBJ)
 				ps_polythcount.value.i++;
@@ -608,7 +628,7 @@ static void PS_CountThinkers(void)
 				ps_mainthcount.value.i++;
 			else if (i == THINK_MOBJ)
 			{
-				if (thinker->function.acp1 == (actionf_p1)P_MobjThinker)
+				if (thinker->function == (actionf_p1)P_MobjThinker)
 				{
 					mobj_t *mobj = (mobj_t*)thinker;
 					ps_mobjcount.value.i++;
@@ -635,6 +655,7 @@ void PS_UpdateTickStats(void)
 	{
 		PS_UpdateRowHistories(gamelogicbrief_row, false);
 	}
+
 	if (cv_perfstats.value == 2)
 	{
 		if (PS_IsLevelActive())
@@ -647,8 +668,6 @@ void PS_UpdateTickStats(void)
 				ps_lua_thinkframe_time.value.p -
 				ps_lua_postthinkframe_time.value.p;
 
-
-
 			PS_CountThinkers();
 		}
 
@@ -659,37 +678,47 @@ void PS_UpdateTickStats(void)
 			PS_UpdateRowHistories(misc_calls_rows, false);
 		}
 	}
+
 	if (cv_ps_samplesize.value > 1)
 	{
-		if(cv_perfstats.value >= 3 && PS_IsLevelActive())
+		if (cv_perfstats.value >= 3 && PS_IsLevelActive())
 		{
-						int i;
-			if (cv_perfstats.value == 3)
+			int i;
+
+			switch (cv_perfstats.value)
 			{
-				for (i = 0; i < thinkframe_hooks_length; i++)
-					PS_UpdateMetricHistory(&thinkframe_hooks[i].time_taken, true, false, false);
-			}
-			else if (cv_perfstats.value == 4)
-			{
-				for (i = 0; i < prethinkframe_hooks_length; i++)
-					PS_UpdateMetricHistory(&prethinkframe_hooks[i].time_taken, true, false, false);
-			}
-			else if (cv_perfstats.value == 5)
-			{
-				for (i = 0; i < postthinkframe_hooks_length; i++)
-					PS_UpdateMetricHistory(&postthinkframe_hooks[i].time_taken, true, false, false);
+				case 3:
+					for (i = 0; i < thinkframe_hooks_length; i++)
+					{
+						PS_UpdateMetricHistory(&thinkframe_hooks[i].time_taken, true, false);
+					}
+					break;
+				case 4:
+					for (i = 0; i < prethinkframe_hooks_length; i++)
+					{
+						PS_UpdateMetricHistory(&prethinkframe_hooks[i].time_taken, true, false);
+					}
+					break;
+				case 5:
+					for (i = 0; i < postthinkframe_hooks_length; i++)
+					{
+						PS_UpdateMetricHistory(&postthinkframe_hooks[i].time_taken, true, false);
+					}
+					break;
+				default:
+					break;
 			}
 		}
 		if (cv_perfstats.value)
 		{
 			ps_tick_index++;
+
 			if (ps_tick_index >= cv_ps_samplesize.value)
 				ps_tick_index = 0;
+
 			if (ps_tick_samples_left)
 				ps_tick_samples_left--;
-
 		}
-
 	}
 }
 
@@ -703,13 +732,14 @@ static void PS_DrawDescriptorHeader(void)
 			"minimum",
 			"maximum"
 		};
+
 		const boolean hires = PS_HighResolution();
 		char* str;
 		INT32 flags = V_MONOSPACE | V_ALLOWLOWERCASE;
 		int samples_left = max(ps_frame_samples_left, ps_tick_samples_left);
 		int x, y;
 
-		if (cv_perfstats.value >= 3)		
+		if (cv_perfstats.value >= 3)
 		{
 			x = 2;
 			y = 0;
@@ -743,7 +773,7 @@ static void PS_DrawRenderStats(void)
 {
 	const boolean hires = PS_HighResolution();
 	const int half_row = hires ? 5 : 4;
-	int x, y = 10; //, cy = 10;
+	int x, y, cy = 10;
 
 	PS_DrawDescriptorHeader();
 
@@ -754,10 +784,10 @@ static void PS_DrawRenderStats(void)
 	if (PS_IsLevelActive())
 	{
 		x = hires ? 115 : 90;
-		/*cy = */PS_DrawPerfRows(x, 10, V_BLUEMAP, commoncounter_rows);// + half_row;
+		cy = PS_DrawPerfRows(x, 10, V_BLUEMAP, commoncounter_rows) + half_row;
 
 #ifdef HWRENDER
-		if (rendermode == render_opengl && cv_grbatching.value)
+		if (rendermode == render_opengl && cv_glbatching.value)
 		{
 			x = hires ? 200 : 155;
 			y = PS_DrawPerfRows(x, 10, V_PURPLEMAP, batchcount_rows);
@@ -769,11 +799,11 @@ static void PS_DrawRenderStats(void)
 #endif
 	}
 
-	/*if (R_UsingFrameInterpolation())
+	if (R_UsingFrameInterpolation())
 	{
 		x = hires ? 115 : 90;
-		PS_DrawPerfRows(x, cy, V_ROSYMAP, interpolation_rows);
-	}*/
+		PS_DrawPerfRows(x, cy, V_PEACHMAP, interpolation_rows);
+	}
 }
 
 static void PS_DrawGameLogicStats(void)
@@ -810,12 +840,12 @@ static void PS_DrawGameLogicStats(void)
 
 static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 {
-    char s[100];
+	char s[100];
 	int i;
 	int maxpage = 0;
-    int page = 0;
-    int pagestart = 0;
-    int pageend = 0;
+	int page = 0;
+	int pagestart = 0;
+	int pageend = 0;
 	// text writing position
 	int x = START_X;
 	int y = START_Y;
@@ -823,57 +853,69 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 	char tempbuffer[LUA_IDSIZE];
 	char last_mod_name[LUA_IDSIZE];
 	last_mod_name[0] = '\0';
-    INT32 total = 0;
+	INT32 total = 0;
 
 	//Decide page length based and drawn text on choosen thinker type
-	if (cv_perfstats.value == 3){
-    	maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
-		page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
-    	pagestart = min((page - 1)*PAGE_ENTRIES, thinkframe_hooks_length);
-    	pageend   = min(pagestart + PAGE_ENTRIES, thinkframe_hooks_length);
-		
-		V_DrawSmallString(MAX_X-50, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "ThinkFrame");
-	}
-	else if (cv_perfstats.value == 4){
-		maxpage = prethinkframe_hooks_length/PAGE_ENTRIES + 1;
-		page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
-    	pagestart = min((page - 1)*PAGE_ENTRIES, prethinkframe_hooks_length);
-    	pageend   = min(pagestart + PAGE_ENTRIES, prethinkframe_hooks_length);
-		V_DrawSmallString(MAX_X-60, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "PreThinkFrame");
-	}
-	else if (cv_perfstats.value == 5){
-		maxpage = postthinkframe_hooks_length/PAGE_ENTRIES + 1;
-		page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
-    	pagestart = min((page - 1)*PAGE_ENTRIES, postthinkframe_hooks_length);
-    	pageend   = min(pagestart + PAGE_ENTRIES, postthinkframe_hooks_length);
-		V_DrawSmallString(MAX_X-65, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "PostThinkFrame");
+	switch (cv_perfstats.value)
+	{
+		case 3:
+			{
+				maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
+				page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
+				pagestart = min((page - 1)*PAGE_ENTRIES, thinkframe_hooks_length);
+				pageend   = min(pagestart + PAGE_ENTRIES, thinkframe_hooks_length);
 
+				V_DrawSmallString(MAX_X-50, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "ThinkFrame");
+			}
+			break;
+		case 4:
+			{
+				maxpage = prethinkframe_hooks_length/PAGE_ENTRIES + 1;
+				page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
+				pagestart = min((page - 1)*PAGE_ENTRIES, prethinkframe_hooks_length);
+				pageend   = min(pagestart + PAGE_ENTRIES, prethinkframe_hooks_length);
+				V_DrawSmallString(MAX_X-60, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "PreThinkFrame");
+			}
+			break;
+		case 5:
+			{
+				maxpage = postthinkframe_hooks_length/PAGE_ENTRIES + 1;
+				page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
+				pagestart = min((page - 1)*PAGE_ENTRIES, postthinkframe_hooks_length);
+				pageend   = min(pagestart + PAGE_ENTRIES, postthinkframe_hooks_length);
+				V_DrawSmallString(MAX_X-65, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "PostThinkFrame");
+			}
+			break;
+		default:
+			break;
 	}
-	
+
 	PS_DrawDescriptorHeader();
 
-	for (i = 0; i < hook_length; i++)	
+	for (i = 0; i < hook_length; i++)
 	{
-
 #define NEXT_ROW() y += HEIGHT;
 
-        INT32 value = PS_GetMetricScreenValue(&hook[i].time_taken, true);
-        total += value;
+		INT32 value = PS_GetMetricScreenValue(&hook[i].time_taken, true);
+		total += value;
 
-        if (i < pagestart || i >= pageend) continue;
+		if (i < pagestart || i >= pageend) continue;
 
 		char* str = hook[i].short_src;
 		char* tempstr = tempbuffer;
 		int len = (int)strlen(str);
 		char* str_ptr;
+
 		if (strcmp(".lua", str + len - 4) == 0)
 		{
 			str[len-4] = '\0'; // remove .lua at end
 			len -= 4;
 		}
+
 		// Print wad name first.
 		strcpy(tempstr, str);
 		str_ptr = strrchr(tempstr, '|');
+
 		if (str_ptr)
 		{
 			*str_ptr = '\0';
@@ -882,12 +924,12 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 			if (str_ptr)
 				tempstr = str_ptr + 1;
 			// tempstr should now point to the mod name, (wad/pk3) possibly truncated
-            strcpy(last_mod_name, tempstr);
-            len = (int)strlen(tempstr);
-            if (len > 30)
-                tempstr += len - 30;
-            snprintf(s, sizeof s - 1, "%s", tempstr);
-            V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s);
+			strcpy(last_mod_name, tempstr);
+			len = (int)strlen(tempstr);
+			if (len > 30)
+				tempstr += len - 30;
+			snprintf(s, sizeof s - 1, "%s", tempstr);
+			V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s);
 			text_color = V_YELLOWMAP;
 		}
 		else
@@ -899,35 +941,35 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
 				str = str_ptr + 1;
 			text_color = 0; // white
 		}
+
 		len = (int)strlen(str);
+
 		if (len > 40)
 			str += len - 40;
+
 		snprintf(s, sizeof s - 1, "%40s: %d", str, value);
 		V_DrawSmallString(x + WIDTH, y, V_MONOSPACE | V_ALLOWLOWERCASE | text_color, s);
 		NEXT_ROW()
 
 #undef NEXT_ROW
-
 	}
 
-    snprintf(s, sizeof s - 1, "TOTAL %d", total);
-    V_DrawSmallString(MAX_X, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, s);
+	snprintf(s, sizeof s - 1, "TOTAL %d", total);
+	V_DrawSmallString(MAX_X, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, s);
 
-    if (maxpage > 1) {
-        snprintf(s, sizeof s - 1, "PAGE %d", page);
-        V_DrawSmallString(START_X, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, s);
-    }
-	
-	
+	if (maxpage > 1)
+	{
+		snprintf(s, sizeof s - 1, "PAGE %d", page);
+		V_DrawSmallString(START_X, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, s);
+	}
 }
 
 void PS_ThinkFrame_Page_OnChange(void)
 {
-    int maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
+	int maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
 
-    if (cv_ps_thinkframe_page.value > maxpage) {
-        CV_StealthSetValue(&cv_ps_thinkframe_page, maxpage);
-    }
+	if (cv_ps_thinkframe_page.value > maxpage)
+		CV_StealthSetValue(&cv_ps_thinkframe_page, maxpage);
 }
 
 #undef WIDTH
@@ -939,8 +981,6 @@ void PS_ThinkFrame_Page_OnChange(void)
 
 #undef PAGE_ENTRIES
 
-
-
 static void PS_DrawPreThinkFrameStats(void)
 {
 	draw_think_frame_stats(prethinkframe_hooks_length, prethinkframe_hooks);
@@ -970,10 +1010,11 @@ void M_DrawPerfStats(void)
 		// tics when frame skips happen
 		PS_DrawGameLogicStats();
 	}
-	else if (cv_perfstats.value >= 3) // lua thinkframe	
+	else if (cv_perfstats.value >= 3) // lua thinkframe
 	{
 		if (!PS_IsLevelActive())
 			return;
+
 		if (!PS_HighResolution())
 		{
 			// Low resolutions can't really use V_DrawSmallString that is used by thinkframe stats.
@@ -983,19 +1024,21 @@ void M_DrawPerfStats(void)
 			V_DrawThinString(80, 100, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "for resolutions below 640x400.");
 			return;
 		}
-		if (cv_perfstats.value == 3)
-		{
-			PS_DrawThinkFrameStats();
-		}
-		else if (cv_perfstats.value == 4)
-		{
-			PS_DrawPreThinkFrameStats();
-		}
-		else if (cv_perfstats.value == 5)
-		{
-			PS_DrawPostThinkFrameStats();
-		}
 
+		switch (cv_perfstats.value)
+		{
+			case 3:
+				PS_DrawThinkFrameStats();
+				break;
+			case 4:
+				PS_DrawPreThinkFrameStats();
+				break;
+			case 5:
+				PS_DrawPostThinkFrameStats();
+				break;
+			default:
+				break;
+		}
 	}
 }
 
@@ -1005,15 +1048,18 @@ static void PS_ClearHistory(void)
 	int i;
 
 	Z_FreeTags(PU_PERFSTATS, PU_PERFSTATS);
+
 	// thinkframe hook metric history pointers need to be cleared manually
 	for (i = 0; i < prethinkframe_hooks_length; i++)
 	{
 		prethinkframe_hooks[i].time_taken.history = NULL;
 	}
+
 	for (i = 0; i < thinkframe_hooks_length; i++)
 	{
 		thinkframe_hooks[i].time_taken.history = NULL;
 	}
+
 	for (i = 0; i < postthinkframe_hooks_length; i++)
 	{
 		postthinkframe_hooks[i].time_taken.history = NULL;
diff --git a/src/m_perfstats.h b/src/m_perfstats.h
index ade7efd33..083656d61 100644
--- a/src/m_perfstats.h
+++ b/src/m_perfstats.h
@@ -55,7 +55,6 @@ void PS_SetPreThinkFrameHookInfo(int index, precise_t time_taken, char* short_sr
 void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src);
 void PS_SetPostThinkFrameHookInfo(int index, precise_t time_taken, char* short_src);
 
-
 void PS_UpdateTickStats(void);
 
 void M_DrawPerfStats(void);
diff --git a/src/m_random.c b/src/m_random.c
index a917a1bf4..3b7b034ba 100644
--- a/src/m_random.c
+++ b/src/m_random.c
@@ -14,12 +14,17 @@
 
 #include "doomdef.h"
 #include "doomtype.h"
+<<<<<<< HEAD
 #include "doomstat.h" // totalplaytime
 #include "i_system.h" // I_GetRandomBytes
+=======
+#include "k_stats.h" // kartstats.totalplaytime
+>>>>>>> Saturn-Next
 
 #include "m_random.h"
 #include "m_fixed.h"
 
+<<<<<<< HEAD
 
 // SFC32 random number generator implementation
 
@@ -135,6 +140,8 @@ static rnstate_t m_randomstate = {
 
 
 
+=======
+>>>>>>> Saturn-Next
 // ---------------------------
 // RNG functions (not synched)
 // ---------------------------
@@ -414,6 +421,7 @@ void P_SetRandSeedD(const char *rfile, INT32 rline, UINT32 seed)
   */
 UINT32 M_RandomizedSeed(void)
 {
+<<<<<<< HEAD
 	UINT32 seed;
 
 	do {
@@ -421,4 +429,7 @@ UINT32 M_RandomizedSeed(void)
 	} while(seed == 0);
 
 	return seed;
+=======
+	return ((kartstats.totalplaytime & 0xFFFF) << 16)|M_RandomFixed();
+>>>>>>> Saturn-Next
 }
diff --git a/src/m_textinput.c b/src/m_textinput.c
new file mode 100644
index 000000000..353c8122b
--- /dev/null
+++ b/src/m_textinput.c
@@ -0,0 +1,551 @@
+#include "m_textinput.h"
+#include "m_menu.h" // MAXSTRINGLENGTH
+#include "v_video.h"
+#include "r_main.h" // renderisnewtic
+#include "i_system.h"
+#include "keys.h"
+#include "console.h"
+
+static void M_TextInputDel(textinput_t *input, size_t start, size_t end)
+{
+	size_t len;
+
+	len = (end - start);
+
+	if (end != input->length)
+		memmove(&input->buffer[start], &input->buffer[end], input->length-end);
+	memset(&input->buffer[input->length - len], 0, len);
+
+	input->length -= len;
+
+	if (input->select >= end)
+		input->select -= len;
+	else if (input->select > start)
+		input->select = start;
+
+	if (input->cursor >= end)
+		input->cursor -= len;
+	else if (input->cursor > start)
+		input->cursor = start;
+}
+
+static void M_TextInputDelSelection(textinput_t *input)
+{
+	size_t start, end;
+
+	if (input->cursor > input->select)
+	{
+		start = input->select;
+		end = input->cursor;
+	}
+	else
+	{
+		start = input->cursor;
+		end = input->select;
+	}
+
+	M_TextInputDel(input, start, end);
+
+	input->select = input->cursor = start;
+}
+
+static void M_TextInputAddString(textinput_t *input, const char *c)
+{
+	size_t csize = strlen(c);
+
+	if (input->length + csize > input->buffer_size-1)
+		return;
+
+	if (input->cursor != input->length)
+		memmove(&input->buffer[input->cursor+csize], &input->buffer[input->cursor], input->length-input->cursor);
+	memcpy(&input->buffer[input->cursor], c, csize);
+	input->length += csize;
+	input->select = (input->cursor += csize);
+	input->buffer[input->length] = 0;
+}
+
+static void M_TextInputAddChar(textinput_t *input, char c)
+{
+	if (input->length >= input->buffer_size-1)
+		return;
+
+	if (input->cursor != input->length)
+		memmove(&input->buffer[input->cursor+1], &input->buffer[input->cursor], input->length-input->cursor);
+	input->buffer[input->cursor++] = c;
+	input->buffer[++input->length] = 0;
+	input->select = input->cursor;
+}
+
+static void M_TextInputDelChar(textinput_t *input)
+{
+	if (!input->cursor)
+		return;
+
+	if (input->cursor != input->length)
+		memmove(&input->buffer[input->cursor-1], &input->buffer[input->cursor], input->length-input->cursor);
+	input->buffer[--input->length] = 0;
+	input->select = --input->cursor;
+}
+
+static void M_TextInputToWordEnd(textinput_t *input, boolean move_sel)
+{
+	// Skip spaces
+	while (input->cursor < input->length && isspace(input->buffer[input->cursor]))
+		++input->cursor;
+
+	// Skip word
+	while (input->cursor < input->length && !isspace(input->buffer[input->cursor]))
+		++input->cursor;
+
+	if (move_sel) input->select = input->cursor;
+}
+
+static void M_TextInputToWordBegin(textinput_t *input, boolean move_sel)
+{
+	// Hack, always move back 1 character if possible so if we press ctrl-left at a word beginning
+	// we move to previous word
+	if (input->cursor) --input->cursor;
+
+	// Skip spaces
+	while (input->cursor && isspace(input->buffer[input->cursor]))
+		--input->cursor;
+
+	// Skip word
+	while (input->cursor && !isspace(input->buffer[input->cursor]))
+		--input->cursor;
+
+	// Unless we reached beginning of line, we're pointing at a space before word, so move cursor
+	// forward to fix that
+	if (input->cursor) ++input->cursor;
+
+	if (move_sel) input->select = input->cursor;
+}
+
+static void M_TextInputPaste(textinput_t *input)
+{
+	const char *paste = I_ClipboardPaste();
+	if (input->select != input->cursor)
+		M_TextInputDelSelection(input);
+	if (paste != NULL)
+		M_TextInputAddString(input, paste);
+}
+
+static void M_TextInputLeft(textinput_t *input, boolean emotes)
+{
+	// Just do it simple way if possible
+	if (!emotes || input->cursor < 2 || input->buffer[input->cursor-1] != ':')
+	{
+		if (input->cursor != 0)
+			--input->cursor;
+		return;
+	}
+
+	// Otherwise we need to check if we have to skip emote
+	size_t start = input->cursor-2;
+
+	while (input->buffer[start] != ':')
+	{
+		// We reached start of string and didn't find ':' symbol, thats definitely not an emote
+		// so just do it simple way
+		if (start == 0)
+		{
+			M_TextInputLeft(input, false);
+			return;
+		}
+
+		--start;
+	}
+
+	int emotelen = 0;
+	if (M_VerifyEmote(input->buffer+start, &emotelen))
+		input->cursor -= emotelen; // also skip the :
+	else
+		M_TextInputLeft(input, false); // Not a valid emote, do the simple thing
+}
+
+static void M_TextInputRight(textinput_t *input, boolean emotes)
+{
+	// Just do it simple way if possible
+	if (!emotes || input->cursor == input->length || input->buffer[input->cursor] != ':')
+	{
+		if (input->cursor < input->length)
+			++input->cursor;
+		return;
+	}
+
+	int emotelen = 0;
+	if (M_VerifyEmote(input->buffer+input->cursor, &emotelen))
+		input->cursor += emotelen; // Also skip the :
+	else
+		M_TextInputRight(input, false); // Not a valid emote, do the simple thing
+}
+
+// Check if we're inside a valid emote
+static boolean M_TextInputCheckEmote(textinput_t *input)
+{
+	int start = input->cursor;
+
+	// Definitely not an emote
+	if (start == 0)
+		return false;
+
+	// Might be closing :, need to skip it just in case
+	if (input->buffer[start] == ':')
+		--start;
+
+	while (input->buffer[start] != ':')
+	{
+		// No ':' found, definitely not inside emote
+		if (start == 0)
+			return false;
+
+		--start;
+	}
+
+	// Found what may be emote start, now we can check
+	return M_VerifyEmote(input->buffer+start, NULL) != NULL;
+}
+
+void M_TextInputInit(textinput_t *input, char *buffer, size_t buffer_size)
+{
+	input->buffer = buffer;
+	input->buffer_size = buffer_size;
+
+	input->skull = 0;
+
+	M_TextInputClear(input);
+}
+
+void M_TextInputClear(textinput_t *input)
+{
+	input->cursor = 0;
+	input->select = 0;
+	input->length = 0;
+
+	input->buffer[0] = 0;
+}
+
+void M_TextInputSetString(textinput_t *input, const char *c)
+{
+	memset(input->buffer, 0, input->buffer_size);
+	strcpy(input->buffer, c);
+	input->cursor = input->select = input->length = strlen(c);
+}
+
+static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emotes)
+{
+	if (key == KEY_LSHIFT || key == KEY_RSHIFT
+	 || key == KEY_LCTRL || key == KEY_RCTRL
+	 || key == KEY_LALT || key == KEY_RALT)
+		return false;
+
+	if (shiftdown && key == KEY_INS)
+	{
+		M_TextInputPaste(input);
+		return true;
+	}
+
+	if ((cv_keyboardlayout.value != 3 && ctrldown) || (cv_keyboardlayout.value == 3 && ctrldown && !altdown))
+	{
+		if (key == 'x' || key == 'X')
+		{
+			if (input->select > input->cursor)
+				I_ClipboardCopy(&input->buffer[input->cursor], input->select-input->cursor);
+			else
+				I_ClipboardCopy(&input->buffer[input->select], input->cursor-input->select);
+			M_TextInputDelSelection(input);
+			return true;
+		}
+		else if (key == 'c' || key == 'C')
+		{
+			if (input->select > input->cursor)
+				I_ClipboardCopy(&input->buffer[input->cursor], input->select-input->cursor);
+			else
+				I_ClipboardCopy(&input->buffer[input->select], input->cursor-input->select);
+			return true;
+		}
+		else if (key == 'v' || key == 'V')
+		{
+			M_TextInputPaste(input);
+			return true;
+		}
+		else if (key == 'w' || key == 'W')
+		{
+			size_t word_start, word_end, i;
+			word_end = i = input->cursor;
+
+			// Unless we're pointing at the beginning of line, decrement i so we only start
+			// removing symbols that come before the cursor
+			if (i) --i;
+
+			// We might be pointing to spaces, skip them first
+			while (i && isspace(input->buffer[i]))
+				--i;
+
+			// Now skip the "word"
+			while (i && !isspace(input->buffer[i]))
+				--i;
+
+			// Unless we reached beginning of line, i is pointing at first space that was found
+			// before word start, and we don't want to remove it
+			if (i) ++i;
+
+			word_start = i;
+
+			if (word_start != word_end)
+				M_TextInputDel(input, word_start, word_end);
+
+			return true;
+		}
+		else if (key == KEY_RIGHTARROW)
+			M_TextInputToWordEnd(input, !shiftdown);
+		else if (key == KEY_LEFTARROW)
+			M_TextInputToWordBegin(input, !shiftdown);
+
+		// Select all
+		if (key == 'a' || key == 'A')
+		{
+			input->select = 0;
+			input->cursor = input->length;
+			return true;
+		}
+
+		// ...why shouldn't it eat the key? if it doesn't, it just means you
+		// can control Sonic from the console, which is silly
+		return true;
+	}
+
+	if (key == KEY_LEFTARROW)
+	{
+		M_TextInputLeft(input, emotes);
+		if (!shiftdown)
+			input->select = input->cursor;
+		return true;
+	}
+	else if (key == KEY_RIGHTARROW)
+	{
+		M_TextInputRight(input, emotes);
+		if (!shiftdown)
+			input->select = input->cursor;
+		return true;
+	}
+	else if (key == KEY_HOME)
+	{
+		input->cursor = 0;
+		if (!shiftdown)
+			input->select = input->cursor;
+		return true;
+	}
+	else if (key == KEY_END)
+	{
+		input->cursor = input->length;
+		if (!shiftdown)
+			input->select = input->cursor;
+		return true;
+	}
+
+	// backspace and delete command prompt
+	if (input->select != input->cursor)
+	{
+		if (key == KEY_BACKSPACE || key == KEY_DEL)
+		{
+			M_TextInputDelSelection(input);
+			return true;
+		}
+	}
+	else if (key == KEY_BACKSPACE)
+	{
+		M_TextInputDelChar(input);
+		return true;
+	}
+	else if (key == KEY_DEL)
+	{
+		if (input->cursor == input->length)
+			return true;
+		++input->cursor;
+		M_TextInputDelChar(input);
+		return true;
+	}
+
+	// allow people to use keypad in console (good for typing IP addresses) - Calum
+	if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL)
+	{
+		char keypad_translation[] = {'7','8','9','-',
+		                             '4','5','6','+',
+		                             '1','2','3',
+		                             '0','.'};
+
+		key = keypad_translation[key - KEY_KEYPAD7];
+	}
+	else if (key == KEY_KPADSLASH)
+		key = '/';
+
+	// same capslock code as hu_stuff.c's HU_responder. Check there for details.
+	key = cv_keyboardlayout.value == 3 ? CON_ShitAndAltGrChar(key) : CON_ShiftChar(key);
+
+	// enter a char into the command prompt
+	if (key < 32 || key > 127)
+		return false;
+
+	if (input->select != input->cursor)
+		M_TextInputDelSelection(input);
+	M_TextInputAddChar(input, key);
+
+	return true;
+}
+
+// Just an alias, more or less
+boolean M_TextInputHandle(textinput_t *input, INT32 key)
+{
+	return M_TextInputHandleBase(input, key, false);
+}
+
+boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggestions[], int maxsuggestions)
+{
+	boolean ret = M_TextInputHandleBase(input, key, true);
+
+	// After this handled key we ended up inside an emote, lets fix that
+	if (M_TextInputCheckEmote(input))
+		M_TextInputToWordEnd(input, !shiftdown);
+
+	// Always clear the first entry
+	suggestions[0] = NULL;
+
+	// For autocomplete
+	int emotestart = 0;
+
+	// Try find suggestions for emote names
+	for (int i = input->cursor-1; i >= 0 && input->cursor-i <= MAXEMOTENAME; --i)
+	{
+		// Space can't be part of emote name
+		if (isspace(input->buffer[i]))
+			break;
+
+		// Found a :, try suggest emotes
+		if (input->buffer[i] == ':')
+		{
+			emotestart = i+1;
+			// ...But only if we typed at least something
+			if ((int)input->cursor-(i-1) < 3)
+				break;
+
+			for (int skip = 0; skip < maxsuggestions; ++skip)
+			{
+				suggestions[skip] = M_FindEmote(input->buffer+i+1, input->cursor-i-1, skip);
+
+				// No more suggestions
+				if (!suggestions[skip])
+					break;
+			}
+
+			// In any case, we found what we wanted, can exit the loop now
+			break;
+		}
+	}
+
+	// If we suggest emotes, try autocomplete
+	if (key == '\t' && suggestions[0])
+	{
+		int pos = (input->cursor-emotestart);
+		boolean autocomplete = true;
+
+		while (autocomplete)
+		{
+			// Check if current character matches for all suggestions
+			char c = suggestions[0]->name[pos];
+
+			// End of string reached
+			if (!c)
+				break;
+
+			for (int i = 1; i < maxsuggestions && suggestions[i]; ++i)
+			{
+				if (suggestions[i]->name[pos] != c)
+				{
+					autocomplete = false;
+					break;
+				}
+			}
+
+			++pos;
+
+			if (autocomplete)
+				M_TextInputAddChar(input, c);
+		}
+
+		// This was the only suggestion, finish autocomplete with a ':' and clear suggestions
+		if (maxsuggestions == 1 || !suggestions[1])
+		{
+			M_TextInputAddChar(input, ':');
+			suggestions[0] = NULL;
+		}
+	}
+
+	return ret;
+}
+
+void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH)
+{
+	if (renderisnewtic)
+		input->skull++;
+	input->skull %= 8;
+
+	char nametodraw[MAXSTRINGLENGTH*2+1] = {0};
+
+	size_t drawstart = 0;
+	size_t drawend = 0; // Only used for selection
+
+	INT32 skullx = x;
+
+	while (V_SubStringWidth(input->buffer+drawstart, input->cursor-drawstart, V_ALLOWLOWERCASE) > MAXINPUTWIDTH)
+		++drawstart;
+
+	size_t drawlength = V_SubStringLengthToFit(input->buffer+drawstart, MAXINPUTWIDTH+8, V_ALLOWLOWERCASE)+1;
+	drawend = drawstart + drawlength;
+
+	memcpy(nametodraw, input->buffer+drawstart, drawlength);
+
+	if (input->length)
+		skullx += V_SubStringWidth(nametodraw, input->cursor-drawstart, V_ALLOWLOWERCASE);
+
+	V_DrawString(x, y, V_ALLOWLOWERCASE|flags, nametodraw);
+
+	// draw text cursor for name
+	if (input->skull < 4) // blink cursor
+		V_DrawCharacter(skullx, y+3, '_'|flags, false);
+
+	// draw selection
+	if (input->select != input->cursor)
+	{
+		size_t start = min(input->select, input->cursor);
+		size_t end =   max(input->select, input->cursor);
+
+		INT32 startx = 0;
+		INT32 width = 0;
+
+		// I couldn't figure out one formula so here's bunch of separate cases
+		if (start < drawstart && end > drawend) // Selection covers whole visible portion of demo name
+		{
+			startx = -2;
+			width = V_StringWidth(nametodraw, V_ALLOWLOWERCASE)+4;
+		}
+		else if (start < drawstart) // Only left side of selection is off visible part
+		{
+			startx = -2;
+			size_t len = (end - start) - (drawstart - start);
+			width = V_SubStringWidth(nametodraw, len, V_ALLOWLOWERCASE)+2;
+		}
+		else if (end > drawend) // Only right side of selection is off visible part
+		{
+			startx = V_SubStringWidth(nametodraw, start-drawstart, V_ALLOWLOWERCASE);
+			width = V_StringWidth(nametodraw+(start-drawstart), V_ALLOWLOWERCASE)+2;
+		}
+		else // All selection is on visible part
+		{
+			startx = V_SubStringWidth(nametodraw, start-drawstart, V_ALLOWLOWERCASE);
+			width = V_SubStringWidth(nametodraw+(start-drawstart), end-start, V_ALLOWLOWERCASE);
+		}
+
+		V_DrawFill(x+startx, y, width, 8, 103|V_TRANSLUCENT|flags);
+	}
+}
diff --git a/src/m_textinput.h b/src/m_textinput.h
new file mode 100644
index 000000000..1cc1c5005
--- /dev/null
+++ b/src/m_textinput.h
@@ -0,0 +1,33 @@
+#ifndef __M_TEXTINPUT__
+#define __M_TEXTINPUT__
+
+#include "doomtype.h"
+#include "m_emotes.h" // M_VerifyEmote, M_FindEmote
+
+typedef struct textinput_s {
+	size_t cursor;
+	size_t select;
+	size_t length;
+
+	char *buffer;
+	size_t buffer_size;
+
+	unsigned skull;
+} textinput_t;
+
+void M_TextInputInit(textinput_t *input, char *buffer, size_t buffer_size);
+
+void M_TextInputClear(textinput_t *input);
+
+void M_TextInputSetString(textinput_t *input, const char *c);
+
+boolean M_TextInputHandle(textinput_t *input, INT32 key);
+
+// Does everything same as M_TextInputHandle, but also handles emotes in input string
+// If currently typing something that looks like an existing emote, return suggestions for it
+boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggestions[], int maxsuggestions);
+
+#define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-1)*8)
+void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH);
+
+#endif
diff --git a/src/md5.c b/src/md5.c
index 66d563666..8292fb9ee 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -26,12 +26,6 @@
 
 #if defined (STDC_HEADERS) || defined (_LIBC)
  #include <stdlib.h>
-#else
- #ifndef HAVE_MEMCPY
-  #if !(defined (_WIN32) && !defined (__CYGWIN__)) && !defined (__APPLE__)
-   #define memcpy(d, s, n) bcopy ((s), (d), (n))
-  #endif
- #endif
 #endif
 
 #include "md5.h"
diff --git a/src/mserv.h b/src/mserv.h
index 8142716ef..0b4e09bb8 100644
--- a/src/mserv.h
+++ b/src/mserv.h
@@ -30,7 +30,11 @@ typedef union
 typedef struct
 {
 	msg_header_t header;
+#ifndef HAVE_IPV6
 	char ip[16];
+#else
+	char ip[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];
+#endif
 	char port[8];
 	char contact[32];
 	char version[8]; // format is: x.yy.z (like 1.30.2 or 1.31)
diff --git a/src/p_ceilng.c b/src/p_ceilng.c
index 908e493d8..b80656360 100644
--- a/src/p_ceilng.c
+++ b/src/p_ceilng.c
@@ -412,7 +412,7 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type)
 		ceiling = Z_Calloc(sizeof (*ceiling), PU_LEVSPEC, NULL);
 		P_AddThinker(&ceiling->thinker);
 		sec->ceilingdata = ceiling;
-		ceiling->thinker.function.acp1 = (actionf_p1)T_MoveCeiling;
+		ceiling->thinker.function = (actionf_p1)T_MoveCeiling;
 		ceiling->sector = sec;
 		ceiling->crush = false;
 		ceiling->sourceline = (INT32)(line-lines);
@@ -635,7 +635,7 @@ INT32 EV_DoCrush(line_t *line, ceiling_e type)
 		ceiling = Z_Calloc(sizeof (*ceiling), PU_LEVSPEC, NULL);
 		P_AddThinker(&ceiling->thinker);
 		sec->ceilingdata = ceiling;
-		ceiling->thinker.function.acp1 = (actionf_p1)T_CrushCeiling;
+		ceiling->thinker.function = (actionf_p1)T_CrushCeiling;
 		ceiling->sector = sec;
 		ceiling->crush = true;
 		ceiling->sourceline = (INT32)(line-lines);
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 1a23317ed..f5bf852f8 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -16,6 +16,7 @@
 #include "g_game.h"
 #include "p_local.h"
 #include "r_main.h"
+#include "r_skins.h"
 #include "r_state.h"
 #include "s_sound.h"
 #include "m_random.h"
@@ -25,11 +26,7 @@
 #include "lua_hook.h"
 #include "k_kart.h" // SRB2kart
 
-#ifdef HW3SOUND
-#include "hardware/hw3sound.h"
-#endif
-
-boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor);
+boolean LUA_CallAction(enum actionnum actionnum, void *thing);
 
 INT32 var1;
 INT32 var2;
@@ -48,212 +45,6 @@ static dirtype_t diags[] =
 	DI_NORTHWEST, DI_NORTHEAST, DI_SOUTHWEST, DI_SOUTHEAST
 };
 
-//Real Prototypes to A_*
-void A_Fall(mobj_t *actor);
-void A_Look(mobj_t *actor);
-void A_Chase(mobj_t *actor);
-void A_FaceStabChase(mobj_t *actor);
-void A_JetJawRoam(mobj_t *actor);
-void A_JetJawChomp(mobj_t *actor);
-void A_PointyThink(mobj_t *actor);
-void A_CheckBuddy(mobj_t *actor);
-void A_HoodThink(mobj_t *actor);
-void A_ArrowCheck(mobj_t *actor);
-void A_SnailerThink(mobj_t *actor);
-void A_SharpChase(mobj_t *actor);
-void A_SharpSpin(mobj_t *actor);
-void A_VultureVtol(mobj_t *actor);
-void A_VultureCheck(mobj_t *actor);
-void A_SkimChase(mobj_t *actor);
-void A_FaceTarget(mobj_t *actor);
-void A_FaceTracer(mobj_t *actor);
-void A_LobShot(mobj_t *actor);
-void A_FireShot(mobj_t *actor);
-void A_SuperFireShot(mobj_t *actor);
-void A_BossFireShot(mobj_t *actor);
-void A_Boss7FireMissiles(mobj_t *actor);
-void A_Boss1Laser(mobj_t *actor);
-void A_FocusTarget(mobj_t *actor);
-void A_Boss4Reverse(mobj_t *actor);
-void A_Boss4SpeedUp(mobj_t *actor);
-void A_Boss4Raise(mobj_t *actor);
-void A_SkullAttack(mobj_t *actor);
-void A_BossZoom(mobj_t *actor);
-void A_BossScream(mobj_t *actor);
-void A_Scream(mobj_t *actor);
-void A_Pain(mobj_t *actor);
-void A_1upThinker(mobj_t *actor);
-void A_MonitorPop(mobj_t *actor);
-void A_Explode(mobj_t *actor);
-void A_BossDeath(mobj_t *actor);
-void A_CustomPower(mobj_t *actor);
-void A_GiveWeapon(mobj_t *actor);
-void A_JumpShield(mobj_t *actor);
-void A_RingShield(mobj_t *actor);
-void A_RingBox(mobj_t *actor);
-void A_Invincibility(mobj_t *actor);
-void A_SuperSneakers(mobj_t *actor);
-void A_AwardScore(mobj_t *actor);
-void A_ExtraLife(mobj_t *actor);
-void A_BombShield(mobj_t *actor);
-void A_WaterShield(mobj_t *actor);
-void A_ForceShield(mobj_t *actor);
-void A_PityShield(mobj_t *actor);
-void A_GravityBox(mobj_t *actor);
-void A_ScoreRise(mobj_t *actor);
-void A_ParticleSpawn(mobj_t *actor);
-void A_BunnyHop(mobj_t *actor);
-void A_BubbleSpawn(mobj_t *actor);
-void A_FanBubbleSpawn(mobj_t *actor);
-void A_BubbleRise(mobj_t *actor);
-void A_BubbleCheck(mobj_t *actor);
-void A_AttractChase(mobj_t *actor);
-void A_DropMine(mobj_t *actor);
-void A_FishJump(mobj_t *actor);
-void A_ThrownRing(mobj_t *actor);
-void A_GrenadeRing(mobj_t *actor);
-void A_SetSolidSteam(mobj_t *actor);
-void A_UnsetSolidSteam(mobj_t *actor);
-void A_SignPlayer(mobj_t *actor);
-void A_OverlayThink(mobj_t *actor);
-void A_JetChase(mobj_t *actor);
-void A_JetbThink(mobj_t *actor);
-void A_JetgShoot(mobj_t *actor);
-void A_JetgThink(mobj_t *actor);
-void A_ShootBullet(mobj_t *actor);
-void A_MinusDigging(mobj_t *actor);
-void A_MinusPopup(mobj_t *actor);
-void A_MinusCheck(mobj_t *actor);
-void A_ChickenCheck(mobj_t *actor);
-void A_MouseThink(mobj_t *actor);
-void A_DetonChase(mobj_t *actor);
-void A_CapeChase(mobj_t *actor);
-void A_RotateSpikeBall(mobj_t *actor);
-void A_SlingAppear(mobj_t *actor);
-void A_MaceRotate(mobj_t *actor);
-void A_UnidusBall(mobj_t *actor);
-void A_RockSpawn(mobj_t *actor);
-void A_SetFuse(mobj_t *actor);
-void A_CrawlaCommanderThink(mobj_t *actor);
-void A_RingExplode(mobj_t *actor);
-void A_OldRingExplode(mobj_t *actor);
-void A_MixUp(mobj_t *actor);
-void A_RecyclePowers(mobj_t *actor);
-void A_Boss2TakeDamage(mobj_t *actor);
-void A_Boss7Chase(mobj_t *actor);
-void A_GoopSplat(mobj_t *actor);
-void A_Boss2PogoSFX(mobj_t *actor);
-void A_Boss2PogoTarget(mobj_t *actor);
-void A_EggmanBox(mobj_t *actor);
-void A_TurretFire(mobj_t *actor);
-void A_SuperTurretFire(mobj_t *actor);
-void A_TurretStop(mobj_t *actor);
-void A_SparkFollow(mobj_t *actor);
-void A_BuzzFly(mobj_t *actor);
-void A_GuardChase(mobj_t *actor);
-void A_EggShield(mobj_t *actor);
-void A_SetReactionTime(mobj_t *actor);
-void A_Boss1Spikeballs(mobj_t *actor);
-void A_Boss3TakeDamage(mobj_t *actor);
-void A_Boss3Path(mobj_t *actor);
-void A_LinedefExecute(mobj_t *actor);
-void A_PlaySeeSound(mobj_t *actor);
-void A_PlayAttackSound(mobj_t *actor);
-void A_PlayActiveSound(mobj_t *actor);
-void A_SmokeTrailer(mobj_t *actor);
-void A_SpawnObjectAbsolute(mobj_t *actor);
-void A_SpawnObjectRelative(mobj_t *actor);
-void A_ChangeAngleRelative(mobj_t *actor);
-void A_ChangeAngleAbsolute(mobj_t *actor);
-void A_RollAngle(mobj_t *actor);
-void A_ChangeRollAngleRelative(mobj_t *actor);
-void A_ChangeRollAngleAbsolute(mobj_t *actor);
-void A_PlaySound(mobj_t *actor);
-void A_FindTarget(mobj_t *actor);
-void A_FindTracer(mobj_t *actor);
-void A_SetTics(mobj_t *actor);
-void A_SetRandomTics(mobj_t *actor);
-void A_ChangeColorRelative(mobj_t *actor);
-void A_ChangeColorAbsolute(mobj_t *actor);
-void A_MoveRelative(mobj_t *actor);
-void A_MoveAbsolute(mobj_t *actor);
-void A_Thrust(mobj_t *actor);
-void A_ZThrust(mobj_t *actor);
-void A_SetTargetsTarget(mobj_t *actor);
-void A_SetObjectFlags(mobj_t *actor);
-void A_SetObjectFlags2(mobj_t *actor);
-void A_RandomState(mobj_t *actor);
-void A_RandomStateRange(mobj_t *actor);
-void A_DualAction(mobj_t *actor);
-void A_RemoteAction(mobj_t *actor);
-void A_ToggleFlameJet(mobj_t *actor);
-void A_ItemPop(mobj_t *actor); // SRB2kart
-void A_JawzChase(mobj_t *actor); // SRB2kart
-void A_JawzExplode(mobj_t *actor); // SRB2kart
-void A_SPBChase(mobj_t *actor); // SRB2kart
-void A_MineExplode(mobj_t *actor); // SRB2kart
-void A_BallhogExplode(mobj_t *actor); // SRB2kart
-void A_LightningFollowPlayer(mobj_t *actor); // SRB2kart
-void A_FZBoomFlash(mobj_t *actor); // SRB2kart
-void A_FZBoomSmoke(mobj_t *actor); // SRB2kart
-void A_RandomShadowFrame(mobj_t *actor);	// SRB2kart
-void A_RoamingShadowThinker(mobj_t *actor);	//SRB2kart
-void A_MayonakaArrow(mobj_t *actor);	//SRB2kart
-void A_ReaperThinker(mobj_t *actor);	//SRB2kart
-void A_MementosTPParticles(mobj_t *actor);	//SRB2kart
-void A_FlameParticle(mobj_t *actor); // SRB2kart
-void A_OrbitNights(mobj_t *actor);
-void A_GhostMe(mobj_t *actor);
-void A_SetObjectState(mobj_t *actor);
-void A_SetObjectTypeState(mobj_t *actor);
-void A_KnockBack(mobj_t *actor);
-void A_PushAway(mobj_t *actor);
-void A_RingDrain(mobj_t *actor);
-void A_SplitShot(mobj_t *actor);
-void A_MissileSplit(mobj_t *actor);
-void A_MultiShot(mobj_t *actor);
-void A_InstaLoop(mobj_t *actor);
-void A_Custom3DRotate(mobj_t *actor);
-void A_SearchForPlayers(mobj_t *actor);
-void A_CheckRandom(mobj_t *actor);
-void A_CheckTargetRings(mobj_t *actor);
-void A_CheckRings(mobj_t *actor);
-void A_CheckTotalRings(mobj_t *actor);
-void A_CheckHealth(mobj_t *actor);
-void A_CheckRange(mobj_t *actor);
-void A_CheckHeight(mobj_t *actor);
-void A_CheckTrueRange(mobj_t *actor);
-void A_CheckThingCount(mobj_t *actor);
-void A_CheckAmbush(mobj_t *actor);
-void A_CheckCustomValue(mobj_t *actor);
-void A_CheckCusValMemo(mobj_t *actor);
-void A_SetCustomValue(mobj_t *actor);
-void A_UseCusValMemo(mobj_t *actor);
-void A_RelayCustomValue(mobj_t *actor);
-void A_CusValAction(mobj_t *actor);
-void A_ForceStop(mobj_t *actor);
-void A_ForceWin(mobj_t *actor);
-void A_SpikeRetract(mobj_t *actor);
-void A_InfoState(mobj_t *actor);
-void A_Repeat(mobj_t *actor);
-void A_SetScale(mobj_t *actor);
-void A_RemoteDamage(mobj_t *actor);
-void A_HomingChase(mobj_t *actor);
-void A_TrapShot(mobj_t *actor);
-//for p_enemy.c
-void A_Boss1Chase(mobj_t *actor);
-void A_Boss2Chase(mobj_t *actor);
-void A_Boss2Pogo(mobj_t *actor);
-void A_BossJetFume(mobj_t *actor);
-void A_VileTarget(mobj_t *actor);
-void A_VileAttack(mobj_t *actor);
-void A_VileFire(mobj_t *actor);
-void A_BrakChase(mobj_t *actor);
-void A_BrakFireShot(mobj_t *actor);
-void A_BrakLobShot(mobj_t *actor);
-void A_NapalmScatter(mobj_t *actor);
-void A_SpawnFreshCopy(mobj_t *actor);
-
 //
 // ENEMY THINKING
 // Enemies are always spawned with targetplayer = -1, threshold = 0
@@ -459,7 +250,7 @@ boolean P_Move(mobj_t *actor, fixed_t speed)
 	I_Assert(movedir < NUMDIRS);
 
 	tryx = actor->x + FixedMul(speed*xspeed[movedir], actor->scale);
-	if (twodlevel || actor->flags2 & MF2_TWOD)
+	if (UNLIKELY(twodlevel || actor->flags2 & MF2_TWOD))
 		tryy = actor->y;
 	else
 		tryy = actor->y + FixedMul(speed*yspeed[movedir], actor->scale);
@@ -503,7 +294,9 @@ static boolean P_TryWalk(mobj_t *actor)
 {
 	if (!P_Move(actor, actor->info->speed))
 		return false;
+
 	actor->movecount = P_RandomByte() & 15;
+
 	return true;
 }
 
@@ -678,7 +471,7 @@ boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed
 		if (player->pflags & PF_INVIS)
 			continue; // ignore notarget
 
-		if (!player->mo || P_MobjWasRemoved(player->mo))
+		if (P_MobjWasRemoved(player->mo))
 			continue;
 
 		if (dist > 0
@@ -688,6 +481,7 @@ boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed
 		if (!allaround)
 		{
 			an = R_PointToAngle2(actor->x, actor->y, player->mo->x, player->mo->y) - actor->angle;
+
 			if (an > ANGLE_90 && an < ANGLE_270)
 			{
 				dist = P_AproxDistance(player->mo->x - actor->x, player->mo->y - actor->y);
@@ -704,6 +498,7 @@ boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed
 			P_SetTarget(&actor->tracer, player->mo);
 		else
 			P_SetTarget(&actor->target, player->mo);
+
 		return true;
 	}
 
@@ -776,8 +571,10 @@ static boolean P_LookForShield(mobj_t *actor)
 //		upper 16 bits = distance limit
 // var2 = If 1, only change to seestate. If 2, only play seesound. If 0, do both.
 //
-void A_Look(mobj_t *actor)
+void A_Look(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -812,8 +609,10 @@ void A_Look(mobj_t *actor)
 //		3 = don't check meleestate and missilestate
 // var2 = unused
 //
-void A_Chase(mobj_t *actor)
+void A_Chase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 delta;
 	INT32 locvar1 = var1;
 
@@ -904,8 +703,10 @@ nomissile:
 // var1 = unused
 // var2 = unused
 //
-void A_FaceStabChase(mobj_t *actor)
+void A_FaceStabChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 delta;
 
 	if (LUA_CallAction(A_FACESTABCHASE, actor))
@@ -992,8 +793,11 @@ nomissile:
 // var1 = unused
 // var2 = unused
 //
-void A_JetJawRoam(mobj_t *actor)
+void A_JetJawRoam(void *thing)
 {
+	mobj_t *actor = thing;
+
+
 	if (LUA_CallAction(A_JETJAWROAM, actor))
 		return;
 
@@ -1019,8 +823,10 @@ void A_JetJawRoam(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_JetJawChomp(mobj_t *actor)
+void A_JetJawChomp(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 delta;
 
 	if (LUA_CallAction(A_JETJAWCHOMP, actor))
@@ -1058,8 +864,10 @@ void A_JetJawChomp(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_PointyThink(mobj_t *actor)
+void A_PointyThink(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 i;
 	player_t *player = NULL;
 	mobj_t *ball;
@@ -1081,10 +889,7 @@ void A_PointyThink(mobj_t *actor)
 		if (!playeringame[i] || players[i].spectator)
 			continue;
 
-		if (!players[i].mo)
-			continue;
-
-		if (!players[i].mo->health)
+		if (!players[i].mo || !players[i].mo->health)
 			continue;
 
 		if (!P_CheckSight(actor, players[i].mo))
@@ -1164,8 +969,10 @@ void A_PointyThink(mobj_t *actor)
 //		1 = tracer
 // var2 = unused
 //
-void A_CheckBuddy(mobj_t *actor)
+void A_CheckBuddy(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 
 	if (LUA_CallAction(A_CHECKBUDDY, actor))
@@ -1184,8 +991,10 @@ void A_CheckBuddy(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_HoodThink(mobj_t *actor)
+void A_HoodThink(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_HOODTHINK, actor))
 		return;
 
@@ -1241,8 +1050,10 @@ void A_HoodThink(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_ArrowCheck(mobj_t *actor)
+void A_ArrowCheck(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t x,y,z;
 	angle_t angle;
 	fixed_t dist;
@@ -1283,8 +1094,10 @@ void A_ArrowCheck(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SnailerThink(mobj_t *actor)
+void A_SnailerThink(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_SNAILERTHINK, actor))
 		return;
 
@@ -1356,8 +1169,10 @@ void A_SnailerThink(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SharpChase(mobj_t *actor)
+void A_SharpChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_SHARPCHASE, actor))
 		return;
 
@@ -1414,8 +1229,10 @@ void A_SharpChase(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SharpSpin(mobj_t *actor)
+void A_SharpSpin(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_SHARPSPIN, actor))
 		return;
 
@@ -1450,8 +1267,10 @@ void A_SharpSpin(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_VultureVtol(mobj_t *actor)
+void A_VultureVtol(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_VULTUREVTOL, actor))
 		return;
 
@@ -1485,8 +1304,10 @@ void A_VultureVtol(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_VultureCheck(mobj_t *actor)
+void A_VultureCheck(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_VULTURECHECK, actor))
 		return;
 
@@ -1509,8 +1330,10 @@ void A_VultureCheck(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SkimChase(mobj_t *actor)
+void A_SkimChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 delta;
 
 	if (LUA_CallAction(A_SKIMCHASE, actor))
@@ -1597,8 +1420,10 @@ nomissile:
 // var1 = unused
 // var2 = unused
 //
-void A_FaceTarget(mobj_t *actor)
+void A_FaceTarget(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_FACETARGET, actor))
 		return;
 
@@ -1615,8 +1440,10 @@ void A_FaceTarget(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_FaceTracer(mobj_t *actor)
+void A_FaceTracer(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_FACETRACER, actor))
 		return;
 
@@ -1635,8 +1462,10 @@ void A_FaceTracer(mobj_t *actor)
 //		var2 >> 16 = height offset
 //		var2 & 65535 = airtime
 //
-void A_LobShot(mobj_t *actor)
+void A_LobShot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2 >> 16;
 	mobj_t *shot, *hitspot;
@@ -1697,30 +1526,6 @@ void A_LobShot(mobj_t *actor)
 	shot->momy = FixedMul(horizontal, FINESINE(an));
 	shot->momz = vertical;
 
-/* Try to adjust when destination is not the same height
-	if (actor->z != actor->target->z)
-	{
-		fixed_t launchhyp;
-		fixed_t diff;
-		fixed_t orig;
-
-		diff = actor->z - actor->target->z;
-		{
-			launchhyp = P_AproxDistance(horizontal, vertical);
-
-			orig = FixedMul(FixedDiv(vertical, horizontal), diff);
-
-			CONS_Debug(DBG_GAMELOGIC, "orig: %d\n", (orig)>>FRACBITS);
-
-			horizontal = dist / airtime;
-			vertical = (gravity*airtime)/2;
-		}
-		dist -= orig;
-		shot->momx = FixedMul(horizontal, FINECOSINE(an));
-		shot->momy = FixedMul(horizontal, FINESINE(an));
-		shot->momz = vertical;
-*/
-
 	if (shot->info->seesound)
 		S_StartSound(shot, shot->info->seesound);
 
@@ -1740,8 +1545,10 @@ void A_LobShot(mobj_t *actor)
 // var1 = object # to shoot
 // var2 = height offset
 //
-void A_FireShot(mobj_t *actor)
+void A_FireShot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t z;
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
@@ -1777,8 +1584,10 @@ void A_FireShot(mobj_t *actor)
 // var1 = object # to shoot
 // var2 = height offset
 //
-void A_SuperFireShot(mobj_t *actor)
+void A_SuperFireShot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t z;
 	mobj_t *mo;
 	INT32 locvar1 = var1;
@@ -1824,8 +1633,10 @@ void A_SuperFireShot(mobj_t *actor)
 //		4 - Boss 3 Right side upper
 //		5 - Boss 3 Right side lower
 //
-void A_BossFireShot(mobj_t *actor)
+void A_BossFireShot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t x, y, z;
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
@@ -1905,8 +1716,10 @@ void A_BossFireShot(mobj_t *actor)
 // var1 = object # to shoot
 // var2 = firing sound
 //
-void A_Boss7FireMissiles(mobj_t *actor)
+void A_Boss7FireMissiles(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t dummymo;
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
@@ -1959,8 +1772,10 @@ void A_Boss7FireMissiles(mobj_t *actor)
 //		0 - Boss 1 Left side
 //		1 - Boss 1 Right side
 //
-void A_Boss1Laser(mobj_t *actor)
+void A_Boss1Laser(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t x, y, z, floorz, speed;
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
@@ -2019,6 +1834,7 @@ void A_Boss1Laser(mobj_t *actor)
 		angle = FixedAngle(FixedDiv(actor->tics*160*FRACUNIT, actor->state->tics*FRACUNIT) + 10*FRACUNIT);
 	else
 		angle = R_PointToAngle2(z + (mobjinfo[locvar1].height>>1), 0, actor->target->z, R_PointToDist2(x, y, actor->target->x, actor->target->y));
+
 	point = P_SpawnMobj(x, y, z, locvar1);
 	P_SetTarget(&point->target, actor);
 	point->angle = actor->angle;
@@ -2065,8 +1881,10 @@ void A_Boss1Laser(mobj_t *actor)
 //		1 - steady focus with fixed movement speed
 // var2 = unused
 //
-void A_FocusTarget(mobj_t *actor)
+void A_FocusTarget(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 
 	if (LUA_CallAction(A_FOCUSTARGET, actor))
@@ -2080,30 +1898,30 @@ void A_FocusTarget(mobj_t *actor)
 		angle_t hangle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y);
 		switch(locvar1)
 		{
-		case 0:
-			{
-				actor->momx -= actor->momx>>4, actor->momy -= actor->momy>>4, actor->momz -= actor->momz>>4;
-				actor->momz += FixedMul(FINECOSINE(vangle>>ANGLETOFINESHIFT), speed);
-				actor->momx += FixedMul(FINESINE(vangle>>ANGLETOFINESHIFT), FixedMul(FINECOSINE(hangle>>ANGLETOFINESHIFT), speed));
-				actor->momy += FixedMul(FINESINE(vangle>>ANGLETOFINESHIFT), FixedMul(FINESINE(hangle>>ANGLETOFINESHIFT), speed));
-			}
-			break;
-		case 1:
-			if (dist > speed)
-			{
-				actor->momz = FixedMul(FINECOSINE(vangle>>ANGLETOFINESHIFT), speed);
-				actor->momx = FixedMul(FINESINE(vangle>>ANGLETOFINESHIFT), FixedMul(FINECOSINE(hangle>>ANGLETOFINESHIFT), speed));
-				actor->momy = FixedMul(FINESINE(vangle>>ANGLETOFINESHIFT), FixedMul(FINESINE(hangle>>ANGLETOFINESHIFT), speed));
-			}
-			else
-			{
-				actor->momx = 0, actor->momy = 0, actor->momz = 0;
-				actor->z = actor->target->z + (actor->target->height>>1);
-				P_TryMove(actor, actor->target->x, actor->target->y, true);
-			}
-			break;
-		default:
-			break;
+			case 0:
+				{
+					actor->momx -= actor->momx>>4, actor->momy -= actor->momy>>4, actor->momz -= actor->momz>>4;
+					actor->momz += FixedMul(FINECOSINE(vangle>>ANGLETOFINESHIFT), speed);
+					actor->momx += FixedMul(FINESINE(vangle>>ANGLETOFINESHIFT), FixedMul(FINECOSINE(hangle>>ANGLETOFINESHIFT), speed));
+					actor->momy += FixedMul(FINESINE(vangle>>ANGLETOFINESHIFT), FixedMul(FINESINE(hangle>>ANGLETOFINESHIFT), speed));
+				}
+				break;
+			case 1:
+				if (dist > speed)
+				{
+					actor->momz = FixedMul(FINECOSINE(vangle>>ANGLETOFINESHIFT), speed);
+					actor->momx = FixedMul(FINESINE(vangle>>ANGLETOFINESHIFT), FixedMul(FINECOSINE(hangle>>ANGLETOFINESHIFT), speed));
+					actor->momy = FixedMul(FINESINE(vangle>>ANGLETOFINESHIFT), FixedMul(FINESINE(hangle>>ANGLETOFINESHIFT), speed));
+				}
+				else
+				{
+					actor->momx = 0, actor->momy = 0, actor->momz = 0;
+					actor->z = actor->target->z + (actor->target->height>>1);
+					P_TryMove(actor, actor->target->x, actor->target->y, true);
+				}
+				break;
+			default:
+				break;
 		}
 	}
 }
@@ -2115,8 +1933,10 @@ void A_FocusTarget(mobj_t *actor)
 // var1 = sfx to play
 // var2 = unused
 //
-void A_Boss4Reverse(mobj_t *actor)
+void A_Boss4Reverse(void *thing)
 {
+	mobj_t *actor = thing;
+
 	sfxenum_t locvar1 = (sfxenum_t)var1;
 
 	if (LUA_CallAction(A_BOSS4REVERSE, actor))
@@ -2137,8 +1957,10 @@ void A_Boss4Reverse(mobj_t *actor)
 // var1 = sfx to play
 // var2 = unused
 //
-void A_Boss4SpeedUp(mobj_t *actor)
+void A_Boss4SpeedUp(void *thing)
 {
+	mobj_t *actor = thing;
+
 	sfxenum_t locvar1 = (sfxenum_t)var1;
 
 	if (LUA_CallAction(A_BOSS4SPEEDUP, actor))
@@ -2155,8 +1977,10 @@ void A_Boss4SpeedUp(mobj_t *actor)
 // var1 = sfx to play
 // var2 = unused
 //
-void A_Boss4Raise(mobj_t *actor)
+void A_Boss4Raise(void *thing)
 {
+	mobj_t *actor = thing;
+
 	sfxenum_t locvar1 = (sfxenum_t)var1;
 
 	if (LUA_CallAction(A_BOSS4RAISE, actor))
@@ -2180,8 +2004,10 @@ void A_Boss4Raise(mobj_t *actor)
 //
 #define SKULLSPEED (20*FRACUNIT)
 
-void A_SkullAttack(mobj_t *actor)
+void A_SkullAttack(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *dest;
 	angle_t an;
 	INT32 dist;
@@ -2233,8 +2059,10 @@ void A_SkullAttack(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_BossZoom(mobj_t *actor)
+void A_BossZoom(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *dest;
 	angle_t an;
 	INT32 dist;
@@ -2270,8 +2098,10 @@ void A_BossZoom(mobj_t *actor)
 //		1 - Use P_Random to spawn explosions at complete random
 // var2 = Object to spawn. Default is MT_BOSSEXPLODE.
 //
-void A_BossScream(mobj_t *actor)
+void A_BossScream(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *mo;
 	fixed_t x, y, z;
 	angle_t fa;
@@ -2284,15 +2114,15 @@ void A_BossScream(mobj_t *actor)
 
 	switch (locvar1)
 	{
-	default:
-	case 0:
-		actor->movecount += 4*16;
-		actor->movecount %= 360;
-		fa = (FixedAngle(actor->movecount*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK;
-		break;
-	case 1:
-		fa = (FixedAngle(P_RandomKey(360)*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK;
-		break;
+		default:
+		case 0:
+			actor->movecount += 4*16;
+			actor->movecount %= 360;
+			fa = (FixedAngle(actor->movecount*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK;
+			break;
+		case 1:
+			fa = (FixedAngle(P_RandomKey(360)*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK;
+			break;
 	}
 	x = actor->x + FixedMul(FINECOSINE(fa),actor->radius);
 	y = actor->y + FixedMul(FINESINE(fa),actor->radius);
@@ -2324,8 +2154,10 @@ void A_BossScream(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_Scream(mobj_t *actor)
+void A_Scream(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_SCREAM, actor))
 		return;
 
@@ -2342,8 +2174,10 @@ void A_Scream(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_Pain(mobj_t *actor)
+void A_Pain(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_PAIN, actor))
 		return;
 
@@ -2361,8 +2195,10 @@ void A_Pain(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_Fall(mobj_t *actor)
+void A_Fall(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_FALL, actor))
 		return;
 
@@ -2385,8 +2221,10 @@ void A_Fall(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_1upThinker(mobj_t *actor)
+void A_1upThinker(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 i;
 	fixed_t dist = INT32_MAX;
 	fixed_t temp;
@@ -2418,11 +2256,9 @@ void A_1upThinker(mobj_t *actor)
 	if (closestplayer == -1 || skins[players[closestplayer].skin].spritedef.numframes <= states[S_PLAY_BOX1].frame)
 	{ // Closest player not found (no players in game?? may be empty dedicated server!), or does not have correct sprite.
 		actor->frame = 0;
-		if (actor->tracer)
-		{
-			mobj_t *tracer = actor->tracer;
-			P_SetTarget(&actor->tracer, NULL);
-			P_RemoveMobj(tracer);
+		if (actor->tracer) {
+			P_RemoveMobj(actor->tracer);
+			P_SetTarget(&actor->target, NULL);
 		}
 		return;
 	}
@@ -2445,12 +2281,13 @@ void A_1upThinker(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_MonitorPop(mobj_t *actor)
+void A_MonitorPop(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *remains;
 	mobjtype_t explode;
 	mobjtype_t item = 0;
-	//mobjtype_t newbox;
 
 	if (LUA_CallAction(A_MONITORPOP, actor))
 		return;
@@ -2499,47 +2336,7 @@ void A_MonitorPop(mobj_t *actor)
 	if (actor->info->deathsound)
 		S_StartSound(remains, actor->info->deathsound);
 
-	switch (actor->type)
-	{
-		/*case MT_QUESTIONBOX: // Random!
-		{
-			mobjtype_t spawnchance[256];
-			INT32 numchoices = 0, i = 0;
-
-#define QUESTIONBOXCHANCES(type, cvar) \
-for (i = cvar.value; i; --i) spawnchance[numchoices++] = type
-
-			QUESTIONBOXCHANCES(MT_SUPERRINGBOX,	cv_superring);
-			QUESTIONBOXCHANCES(MT_SNEAKERTV,	cv_supersneakers);
-			QUESTIONBOXCHANCES(MT_INV,			cv_invincibility);
-			QUESTIONBOXCHANCES(MT_WHITETV,		cv_jumpshield);
-			QUESTIONBOXCHANCES(MT_GREENTV,		cv_watershield);
-			QUESTIONBOXCHANCES(MT_YELLOWTV,		cv_ringshield);
-			QUESTIONBOXCHANCES(MT_BLUETV,		cv_forceshield);
-			QUESTIONBOXCHANCES(MT_BLACKTV,		cv_bombshield);
-			QUESTIONBOXCHANCES(MT_PRUP,			cv_1up);
-			QUESTIONBOXCHANCES(MT_EGGMANBOX,	cv_eggmanbox);
-			QUESTIONBOXCHANCES(MT_MIXUPBOX,		cv_teleporters);
-			QUESTIONBOXCHANCES(MT_RECYCLETV,	cv_recycler);
-
-#undef QUESTIONBOXCHANCES
-
-			if (numchoices == 0)
-			{
-				CONS_Alert(CONS_WARNING, M_GetText("All monitors turned off.\n"));
-				return;
-			}
-
-			newbox = spawnchance[P_RandomKey(numchoices)];
-			item = mobjinfo[newbox].damage;
-
-			remains->flags2 &= ~MF2_AMBUSH;
-			break;
-		}*/
-		default:
-			item = actor->info->damage;
-			break;
-	}
+	item = actor->info->damage;
 
 	if (item != 0)
 	{
@@ -2588,8 +2385,10 @@ for (i = cvar.value; i; --i) spawnchance[numchoices++] = type
 // var1 = unused
 // var2 = unused
 //
-void A_Explode(mobj_t *actor)
+void A_Explode(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_EXPLODE, actor))
 		return;
 
@@ -2603,8 +2402,10 @@ void A_Explode(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_BossDeath(mobj_t *mo)
+void A_BossDeath(void *thing)
 {
+	mobj_t *mo = thing;
+
 	thinker_t *th;
 	mobj_t *mo2;
 	line_t junk;
@@ -2633,9 +2434,7 @@ void A_BossDeath(mobj_t *mo)
 	// if all bosses are dead
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -2662,7 +2461,7 @@ void A_BossDeath(mobj_t *mo)
 	}
 
 bossjustdie:
-	if (LUAh_BossDeath(mo))
+	if (LUA_HookMobj(mo, MOBJ_HOOK(BossDeath)))
 		return;
 	else if (P_MobjWasRemoved(mo))
 		return;
@@ -2693,9 +2492,7 @@ bossjustdie:
 		// scan the thinkers to find the runaway point
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
@@ -2776,8 +2573,10 @@ bossjustdie:
 // var1 = Power index #
 // var2 = Power duration in tics
 //
-void A_CustomPower(mobj_t *actor)
+void A_CustomPower(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
@@ -2818,8 +2617,10 @@ void A_CustomPower(mobj_t *actor)
 // var1 = Weapon index #
 // var2 = unused
 //
-void A_GiveWeapon(mobj_t *actor)
+void A_GiveWeapon(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 	INT32 locvar1 = var1;
 
@@ -2852,8 +2653,10 @@ void A_GiveWeapon(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_JumpShield(mobj_t *actor)
+void A_JumpShield(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_JUMPSHIELD, actor))
@@ -2883,8 +2686,10 @@ void A_JumpShield(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_RingShield(mobj_t *actor)
+void A_RingShield(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_RINGSHIELD, actor))
@@ -2915,8 +2720,10 @@ void A_RingShield(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_RingBox(mobj_t *actor)
+void A_RingBox(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_RINGBOX, actor))
@@ -2942,8 +2749,10 @@ void A_RingBox(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_Invincibility(mobj_t *actor)
+void A_Invincibility(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_INVINCIBILITY, actor))
@@ -2974,8 +2783,10 @@ void A_Invincibility(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SuperSneakers(mobj_t *actor)
+void A_SuperSneakers(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_SUPERSNEAKERS, actor))
@@ -3010,8 +2821,10 @@ void A_SuperSneakers(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_AwardScore(mobj_t *actor)
+void A_AwardScore(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_AWARDSCORE, actor))
@@ -3037,8 +2850,10 @@ void A_AwardScore(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_ExtraLife(mobj_t *actor)
+void A_ExtraLife(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_EXTRALIFE, actor))
@@ -3076,8 +2891,10 @@ void A_ExtraLife(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_BombShield(mobj_t *actor)
+void A_BombShield(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_BOMBSHIELD, actor))
@@ -3107,8 +2924,10 @@ void A_BombShield(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_WaterShield(mobj_t *actor)
+void A_WaterShield(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_WATERSHIELD, actor))
@@ -3145,8 +2964,10 @@ void A_WaterShield(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_ForceShield(mobj_t *actor)
+void A_ForceShield(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_FORCESHIELD, actor))
@@ -3182,8 +3003,10 @@ void A_ForceShield(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_PityShield(mobj_t *actor)
+void A_PityShield(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_PITYSHIELD, actor))
@@ -3214,8 +3037,10 @@ void A_PityShield(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_GravityBox(mobj_t *actor)
+void A_GravityBox(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_GRAVITYBOX, actor))
@@ -3240,8 +3065,10 @@ void A_GravityBox(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_ScoreRise(mobj_t *actor)
+void A_ScoreRise(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_SCORERISE, actor))
 		return;
 
@@ -3256,8 +3083,10 @@ void A_ScoreRise(mobj_t *actor)
 // var1 = type (if 0, defaults to MT_PARTICLE)
 // var2 = unused
 //
-void A_ParticleSpawn(mobj_t *actor)
+void A_ParticleSpawn(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	fixed_t speed;
 	mobjtype_t type;
@@ -3294,8 +3123,10 @@ void A_ParticleSpawn(mobj_t *actor)
 // var1 = jump strength
 // var2 = horizontal movement
 //
-void A_BunnyHop(mobj_t *actor)
+void A_BunnyHop(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -3317,8 +3148,10 @@ void A_BunnyHop(mobj_t *actor)
 // var1 = Distance to look for players.  If no player is in this distance, bubbles aren't spawned. (Ambush overrides)
 // var2 = unused
 //
-void A_BubbleSpawn(mobj_t *actor)
+void A_BubbleSpawn(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 i, locvar1 = var1;
 	UINT8 prandom;
 	mobj_t *bubble = NULL;
@@ -3369,8 +3202,10 @@ void A_BubbleSpawn(mobj_t *actor)
 // var1 = Distance to look for players.  If no player is in this distance, bubbles aren't spawned. (Ambush overrides)
 // var2 = unused
 //
-void A_FanBubbleSpawn(mobj_t *actor)
+void A_FanBubbleSpawn(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 i, locvar1 = var1;
 	UINT8 prandom;
 	mobj_t *bubble = NULL;
@@ -3417,8 +3252,10 @@ void A_FanBubbleSpawn(mobj_t *actor)
 //		1 = Rise straight up
 // var2 = rising speed
 //
-void A_BubbleRise(mobj_t *actor)
+void A_BubbleRise(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -3456,8 +3293,10 @@ void A_BubbleRise(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_BubbleCheck(mobj_t *actor)
+void A_BubbleCheck(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_BUBBLECHECK, actor))
 		return;
 
@@ -3474,8 +3313,10 @@ void A_BubbleCheck(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_AttractChase(mobj_t *actor)
+void A_AttractChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_ATTRACTCHASE, actor))
 		return;
 
@@ -3541,8 +3382,10 @@ void A_AttractChase(mobj_t *actor)
 //		lower 16 bits = proximity check distance (0 disables)
 //		upper 16 bits = 0 to check proximity with target, 1 for tracer
 //
-void A_DropMine(mobj_t *actor)
+void A_DropMine(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	fixed_t z;
@@ -3591,8 +3434,10 @@ void A_DropMine(mobj_t *actor)
 // var1 = Jump strength (in FRACBITS), if specified. Otherwise, uses the angle value.
 // var2 = unused
 //
-void A_FishJump(mobj_t *actor)
+void A_FishJump(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 
 	if (LUA_CallAction(A_FISHJUMP, actor))
@@ -3624,8 +3469,10 @@ void A_FishJump(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_ThrownRing(mobj_t *actor)
+void A_ThrownRing(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 c = 0;
 	INT32 stop;
 	player_t *player;
@@ -3651,10 +3498,6 @@ void A_ThrownRing(mobj_t *actor)
 
 		if (ring)
 		{
-			/*
-			P_SetTarget(&ring->target, actor);
-			ring->color = actor->color; //copy color
-			*/
 			ring->destscale = actor->scale;
 			P_SetScale(ring, actor->scale);
 		}
@@ -3733,12 +3576,9 @@ void A_ThrownRing(mobj_t *actor)
 
 		player = &players[actor->lastlook];
 
-		if (!player->mo)
+		if (!player->mo || (player->mo->health <= 0)) // dead
 			continue;
 
-		if (player->mo->health <= 0)
-			continue; // dead
-
 		if ((netgame || multiplayer) && player->spectator)
 			continue; // spectator
 
@@ -3775,6 +3615,7 @@ void A_ThrownRing(mobj_t *actor)
 
 		if (dist < FixedMul(2048*FRACUNIT, player->mo->scale)) // SRB2kart  // (player->powers[pw_shield] & SH_NOSTACK) == SH_ATTRACT &&
 			P_SetTarget(&actor->tracer, player->mo);
+
 		return;
 	}
 
@@ -3832,8 +3673,10 @@ static inline boolean PIT_GrenadeRing(mobj_t *thing)
 	return false;
 }
 
-void A_GrenadeRing(mobj_t *actor)
+void A_GrenadeRing(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 bx, by, xl, xh, yl, yh;
 	explodedist = FixedMul(actor->info->painchance, mapobjectscale);
 
@@ -3864,7 +3707,7 @@ void A_GrenadeRing(mobj_t *actor)
 
 static inline boolean PIT_MineExplode(mobj_t *thing)
 {
-	if (!grenade || P_MobjWasRemoved(grenade))
+	if (P_MobjWasRemoved(grenade))
 		return false; // There's the possibility these can chain react onto themselves after they've already died if there are enough all in one spot
 
 	if (grenade->flags2 & MF2_DEBRIS)	// don't explode twice
@@ -3900,8 +3743,10 @@ static inline boolean PIT_MineExplode(mobj_t *thing)
 	return true;
 }
 
-void A_MineExplode(mobj_t *actor)
+void A_MineExplode(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 bx, by, xl, xh, yl, yh;
 	INT32 d;
 	INT32 locvar1 = var1;
@@ -3933,10 +3778,12 @@ void A_MineExplode(mobj_t *actor)
 	for (d = 0; d < 16; d++)
 		K_SpawnKartExplosion(actor->x, actor->y, actor->z, explodedist + 32*mapobjectscale, 32, type, d*(ANGLE_45/4), true, false, actor->target); // 32 <-> 64
 
+	skincolors_t color = SKINCOLOR_KETCHUP;
+
 	if (actor->target && actor->target->player)
-		K_SpawnMineExplosion(actor, actor->target->player->skincolor);
-	else
-		K_SpawnMineExplosion(actor, SKINCOLOR_KETCHUP);
+		color = actor->target->player->skincolor;
+
+	K_SpawnMineExplosion(actor, color);
 
 	P_SpawnMobj(actor->x, actor->y, actor->z, MT_MINEEXPLOSIONSOUND);
 
@@ -3951,8 +3798,10 @@ void A_MineExplode(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SetSolidSteam(mobj_t *actor)
+void A_SetSolidSteam(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_SETSOLIDSTEAM, actor))
 		return;
 
@@ -3983,8 +3832,9 @@ void A_SetSolidSteam(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_UnsetSolidSteam(mobj_t *actor)
+void A_UnsetSolidSteam(void *thing)
 {
+	mobj_t *actor = thing;
 
 	if (LUA_CallAction(A_UNSETSOLIDSTEAM, actor))
 		return;
@@ -4000,8 +3850,10 @@ void A_UnsetSolidSteam(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SignPlayer(mobj_t *actor)
+void A_SignPlayer(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *ov;
 
 	if (LUA_CallAction(A_SIGNPLAYER, actor))
@@ -4022,18 +3874,15 @@ void A_SignPlayer(mobj_t *actor)
 	P_SetTarget(&ov->target, actor);
 	ov->color = actor->target->player->skincolor;
 	ov->skin = &skins[actor->target->player->skin];
-	if (actor->target->skinlocal) {
-		// needs - 1 or else it pukes an error out
-		// same thing happens on p_mobj.c
+
+	// needs - 1 or else it pukes an error out
+	// same thing happens on p_mobj.c
+	if (actor->target->skinlocal)
 		ov->localskin = &localskins[actor->target->player->localskin - 1];
-		ov->skinlocal = actor->target->skinlocal;
-	} else {
-		// needs - 1 or else it pukes an error out
-		// same thing happens on p_mobj.c
-		if (actor->target->player->localskin)
-			ov->localskin = &skins[actor->target->player->localskin - 1];
-		ov->skinlocal = actor->target->skinlocal;
-	}
+	else if (actor->target->player->localskin)
+		ov->localskin = &skins[actor->target->player->localskin - 1];
+	ov->skinlocal = actor->target->skinlocal;
+
 	P_SetMobjState(ov, actor->info->seestate); // S_PLAY_SIGN
 }
 
@@ -4044,8 +3893,10 @@ void A_SignPlayer(mobj_t *actor)
 // var1 = unused
 // var2 = invert, z offset
 //
-void A_OverlayThink(mobj_t *actor)
+void A_OverlayThink(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t destx, desty;
 
 	if (LUA_CallAction(A_OVERLAYTHINK, actor))
@@ -4096,8 +3947,10 @@ void A_OverlayThink(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_JetChase(mobj_t *actor)
+void A_JetChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t thefloor;
 
 	if (LUA_CallAction(A_JETCHASE, actor))
@@ -4191,8 +4044,10 @@ void A_JetChase(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_JetbThink(mobj_t *actor)
+void A_JetbThink(void *thing)
 {
+	mobj_t *actor = thing;
+
 	sector_t *nextsector;
 	fixed_t thefloor;
 
@@ -4256,8 +4111,10 @@ void A_JetbThink(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_JetgShoot(mobj_t *actor)
+void A_JetgShoot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t dist;
 
 	if (LUA_CallAction(A_JETGSHOOT, actor))
@@ -4296,8 +4153,10 @@ void A_JetgShoot(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_ShootBullet(mobj_t *actor)
+void A_ShootBullet(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t dist;
 
 	if (LUA_CallAction(A_SHOOTBULLET, actor))
@@ -4325,8 +4184,10 @@ void A_ShootBullet(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_MinusDigging(mobj_t *actor)
+void A_MinusDigging(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_MINUSDIGGING, actor))
 		return;
 
@@ -4376,8 +4237,9 @@ void A_MinusDigging(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_MinusPopup(mobj_t *actor)
+void A_MinusPopup(void *thing)
 {
+	mobj_t *actor = thing;
 
 	if (LUA_CallAction(A_MINUSPOPUP, actor))
 		return;
@@ -4398,8 +4260,10 @@ void A_MinusPopup(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_MinusCheck(mobj_t *actor)
+void A_MinusCheck(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_MINUSCHECK, actor))
 		return;
 
@@ -4425,8 +4289,10 @@ void A_MinusCheck(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_ChickenCheck(mobj_t *actor)
+void A_ChickenCheck(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_CHICKENCHECK, actor))
 		return;
 
@@ -4452,8 +4318,10 @@ void A_ChickenCheck(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_JetgThink(mobj_t *actor)
+void A_JetgThink(void *thing)
 {
+	mobj_t *actor = thing;
+
 	sector_t *nextsector;
 
 	fixed_t thefloor;
@@ -4506,8 +4374,10 @@ void A_JetgThink(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_MouseThink(mobj_t *actor)
+void A_MouseThink(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_MOUSETHINK, actor))
 		return;
 
@@ -4518,7 +4388,7 @@ void A_MouseThink(mobj_t *actor)
 		|| (actor->eflags & MFE_VERTICALFLIP && actor->z + actor->height == actor->ceilingz))
 		&& !actor->reactiontime)
 	{
-		if (twodlevel || actor->flags2 & MF2_TWOD)
+		if (UNLIKELY(twodlevel || actor->flags2 & MF2_TWOD))
 		{
 			if (P_RandomChance(FRACUNIT/2))
 				actor->angle += ANGLE_180;
@@ -4540,8 +4410,10 @@ void A_MouseThink(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_DetonChase(mobj_t *actor)
+void A_DetonChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	angle_t exact;
 	fixed_t xydist, dist;
 
@@ -4571,40 +4443,11 @@ void A_DetonChase(mobj_t *actor)
 	// Face movement direction if not doing so
 	exact = R_PointToAngle2(actor->x, actor->y, actor->tracer->x, actor->tracer->y);
 	actor->angle = exact;
-	/*if (exact != actor->angle)
-	{
-		if (exact - actor->angle > ANGLE_180)
-		{
-			actor->angle -= actor->info->raisestate;
-			if (exact - actor->angle < ANGLE_180)
-				actor->angle = exact;
-		}
-		else
-		{
-			actor->angle += actor->info->raisestate;
-			if (exact - actor->angle > ANGLE_180)
-				actor->angle = exact;
-		}
-	}*/
+
 	// movedir is up/down angle: how much it has to go up as it goes over to the player
 	xydist = P_AproxDistance(actor->tracer->x - actor->x, actor->tracer->y - actor->y);
 	exact = R_PointToAngle2(0, 0, xydist, actor->tracer->z - actor->z);
 	actor->movedir = exact;
-	/*if (exact != actor->movedir)
-	{
-		if (exact - actor->movedir > ANGLE_180)
-		{
-			actor->movedir -= actor->info->raisestate;
-			if (exact - actor->movedir < ANGLE_180)
-				actor->movedir = exact;
-		}
-		else
-		{
-			actor->movedir += actor->info->raisestate;
-			if (exact - actor->movedir > ANGLE_180)
-				actor->movedir = exact;
-		}
-	}*/
 
 	// check for melee attack
 	if (actor->tracer)
@@ -4684,8 +4527,10 @@ void A_DetonChase(mobj_t *actor)
 //		upper 16 bits = forward/backward offset
 //		lower 16 bits = sideways offset
 //
-void A_CapeChase(mobj_t *actor)
+void A_CapeChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *chaser;
 	fixed_t foffsetx, foffsety, boffsetx, boffsety;
 	INT32 locvar1 = var1;
@@ -4744,8 +4589,10 @@ void A_CapeChase(mobj_t *actor)
 //		1 = Use tracer
 // var2 = unused
 //
-void A_RotateSpikeBall(mobj_t *actor)
+void A_RotateSpikeBall(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	const fixed_t radius = FixedMul(12*actor->info->speed, actor->scale);
 
@@ -4798,8 +4645,10 @@ void A_RotateSpikeBall(mobj_t *actor)
 //		2 = Throw when target leaves MF2_SKULLFLY.
 // var2 = unused
 //
-void A_UnidusBall(mobj_t *actor)
+void A_UnidusBall(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	boolean canthrow = false;
 
@@ -4860,27 +4709,27 @@ void A_UnidusBall(mobj_t *actor)
 		}
 		switch(actor->extravalue2)
 		{
-		case 0: // at least one frame where not dashing
-			if (!skull) ++actor->extravalue2;
-			else break;
-			/* FALLTHRU */
-		case 1: // at least one frame where ARE dashing
-			if (skull) ++actor->extravalue2;
-			else break;
-			/* FALLTHRU */
-		case 2: // not dashing again?
-			if (skull) break;
-			// launch.
-		{
-			mobj_t *target = actor->target;
-			if (actor->target->target)
-				target = actor->target->target;
-			actor->movecount = actor->info->damage>>FRACBITS;
-			actor->flags &= ~(MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING);
-			P_InstaThrust(actor, R_PointToAngle2(actor->x, actor->y, target->x, target->y), FixedMul(actor->info->damage, actor->scale));
-		}
-		default: // from our compiler appeasement program (CAP).
-			break;
+			case 0: // at least one frame where not dashing
+				if (!skull) ++actor->extravalue2;
+				else break;
+				/* FALLTHRU */
+			case 1: // at least one frame where ARE dashing
+				if (skull) ++actor->extravalue2;
+				else break;
+				/* FALLTHRU */
+			case 2: // not dashing again?
+				if (skull) break;
+				// launch.
+			{
+				mobj_t *target = actor->target;
+				if (actor->target->target)
+					target = actor->target->target;
+				actor->movecount = actor->info->damage>>FRACBITS;
+				actor->flags &= ~(MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING);
+				P_InstaThrust(actor, R_PointToAngle2(actor->x, actor->y, target->x, target->y), FixedMul(actor->info->damage, actor->scale));
+			}
+			default: // from our compiler appeasement program (CAP).
+				break;
 		}
 	}
 }
@@ -4891,8 +4740,10 @@ void A_UnidusBall(mobj_t *actor)
 //
 // var1 = unused
 // var2 = unused
-void A_RockSpawn(mobj_t *actor)
+void A_RockSpawn(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *mo;
 	mobjtype_t type;
 	INT32 i = P_FindSpecialLineFromTag(12, (INT16)actor->threshold, -1);
@@ -4948,8 +4799,10 @@ void A_RockSpawn(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SlingAppear(mobj_t *actor)
+void A_SlingAppear(void *thing)
 {
+	mobj_t *actor = thing;
+
 	boolean firsttime = true;
 	UINT8 mlength = 4;
 	mobj_t *spawnee;
@@ -5008,8 +4861,10 @@ void A_SlingAppear(mobj_t *actor)
 // movedir - current angle holder
 // extravalue1 - smoothly move link into place
 //
-void A_MaceRotate(mobj_t *actor)
+void A_MaceRotate(void *thing)
 {
+	mobj_t *actor = thing;
+
 	TVector v;
 	TVector *res;
 	fixed_t radius;
@@ -5121,8 +4976,10 @@ void A_MaceRotate(mobj_t *actor)
 //		lower 16 bits = if > 0, state to change to when fuse = 1
 //		upper 16 bits: 0 = (default) don't set fuse unless 0, 1 = force change, 2 = force no change
 //
-void A_SetFuse(mobj_t *actor)
+void A_SetFuse(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -5146,8 +5003,10 @@ void A_SetFuse(mobj_t *actor)
 // var1 = shoot bullets?
 // var2 = "pogo mode" speed
 //
-void A_CrawlaCommanderThink(mobj_t *actor)
+void A_CrawlaCommanderThink(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t dist;
 	sector_t *nextsector;
 	fixed_t thefloor;
@@ -5286,8 +5145,10 @@ void A_CrawlaCommanderThink(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_RingExplode(mobj_t *actor)
+void A_RingExplode(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *mo2;
 	thinker_t *th;
 	angle_t d;
@@ -5302,9 +5163,7 @@ void A_RingExplode(mobj_t *actor)
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -5332,8 +5191,12 @@ void A_RingExplode(mobj_t *actor)
 // var1 = object # to explode as debris
 // var2 = unused
 //
-void A_OldRingExplode(mobj_t *actor) {
+void A_OldRingExplode(void *thing)
+{
+	mobj_t *actor = thing;
+
 	UINT8 i;
+
 	mobj_t *mo;
 	const fixed_t ns = FixedMul(20 * FRACUNIT, actor->scale);
 	INT32 locvar1 = var1;
@@ -5411,8 +5274,10 @@ void A_OldRingExplode(mobj_t *actor) {
 // var1 = unused
 // var2 = unused
 //
-void A_MixUp(mobj_t *actor)
+void A_MixUp(void *thing)
 {
+	mobj_t *actor = thing;
+
 	boolean teleported[MAXPLAYERS];
 	INT32 i, numplayers = 0, prandom = 0;
 
@@ -5661,8 +5526,10 @@ void A_MixUp(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_RecyclePowers(mobj_t *actor)
+void A_RecyclePowers(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 i, j, k, numplayers = 0;
 
 	UINT8 playerslist[MAXPLAYERS];
@@ -5714,14 +5581,16 @@ void A_RecyclePowers(mobj_t *actor)
 		postscramble[1] = playerslist[0];
 	}
 	else
-	for (j = 0; j < numplayers; j++)
 	{
-		UINT8 tempint;
+		for (j = 0; j < numplayers; j++)
+		{
+			UINT8 tempint;
 
-		i = j + ((P_RandomByte() + leveltime) % (numplayers - j));
-		tempint = postscramble[j];
-		postscramble[j] = postscramble[i];
-		postscramble[i] = tempint;
+			i = j + ((P_RandomByte() + leveltime) % (numplayers - j));
+			tempint = postscramble[j];
+			postscramble[j] = postscramble[i];
+			postscramble[i] = tempint;
+		}
 	}
 
 	// now assign!
@@ -5730,7 +5599,7 @@ void A_RecyclePowers(mobj_t *actor)
 		UINT8 send_pl = playerslist[i];
 		UINT8 recv_pl = postscramble[i];
 
-		// debugF
+		// debug
 		CONS_Debug(DBG_GAMELOGIC, "sending player %hu's items to %hu\n", (UINT16)send_pl, (UINT16)recv_pl);
 
 		for (j = 0; j < NUMPOWERS; j++)
@@ -5761,8 +5630,10 @@ void A_RecyclePowers(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_Boss1Chase(mobj_t *actor)
+void A_Boss1Chase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 delta;
 
 	if (LUA_CallAction(A_BOSS1CHASE, actor))
@@ -5879,8 +5750,10 @@ nomissile:
 // var1 = unused
 // var2 = unused
 //
-void A_Boss2Chase(mobj_t *actor)
+void A_Boss2Chase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t radius;
 	boolean reverse = false;
 	INT32 speedvar;
@@ -6009,8 +5882,10 @@ void A_Boss2Chase(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_Boss2Pogo(mobj_t *actor)
+void A_Boss2Pogo(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_BOSS2POGO, actor))
 		return;
 
@@ -6055,8 +5930,10 @@ void A_Boss2Pogo(mobj_t *actor)
 // var1 = Invincibility duration
 // var2 = unused
 //
-void A_Boss2TakeDamage(mobj_t *actor)
+void A_Boss2TakeDamage(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 
 	if (LUA_CallAction(A_BOSS2TAKEDAMAGE, actor))
@@ -6077,8 +5954,10 @@ void A_Boss2TakeDamage(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_Boss7Chase(mobj_t *actor)
+void A_Boss7Chase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 delta;
 	INT32 i;
 
@@ -6121,10 +6000,7 @@ void A_Boss7Chase(mobj_t *actor)
 		if (!playeringame[i] || players[i].spectator)
 			continue;
 
-		if (!players[i].mo)
-			continue;
-
-		if (players[i].mo->health <= 0)
+		if (!players[i].mo || (players[i].mo->health <= 0))
 			continue;
 
 		if (P_AproxDistance(players[i].mo->x - actor->x, players[i].mo->y - actor->y) > actor->radius)
@@ -6210,8 +6086,10 @@ void A_Boss7Chase(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_GoopSplat(mobj_t *actor)
+void A_GoopSplat(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_GOOPSPLAT, actor))
 		return;
 
@@ -6232,8 +6110,10 @@ void A_GoopSplat(mobj_t *actor)
 // var1 = pogo jump strength
 // var2 = idle pogo speed
 //
-void A_Boss2PogoSFX(mobj_t *actor)
+void A_Boss2PogoSFX(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -6274,8 +6154,10 @@ void A_Boss2PogoSFX(mobj_t *actor)
 // var1 = pogo jump strength
 // var2 = idle pogo speed
 //
-void A_Boss2PogoTarget(mobj_t *actor)
+void A_Boss2PogoTarget(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -6315,16 +6197,6 @@ void A_Boss2PogoTarget(mobj_t *actor)
 		actor->z++; // unstick from the floor
 		actor->momz = FixedMul(locvar1 + (locvar1>>2), actor->scale); // Bounce up in air
 
-		/*badmath = 0;
-		airtime = 0;
-		do {
-			badmath += momz;
-			momz += gravityadd;
-			airtime++;
-		} while(badmath > 0);
-		airtime = 2*airtime<<FRACBITS;
-		*/
-
 		// Remember, kids!
 		// Reduced down Calculus lets you avoid bad 'logic math' loops!
 		//airtime = FixedDiv(-actor->momz<<1, gravityadd)<<1; // going from 0 to 0 is much simpler
@@ -6362,8 +6234,10 @@ void A_Boss2PogoTarget(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_EggmanBox(mobj_t *actor)
+void A_EggmanBox(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_EGGMANBOX, actor))
 		return;
 
@@ -6383,8 +6257,10 @@ void A_EggmanBox(mobj_t *actor)
 // var1 = object # to repeatedly fire
 // var2 = distance threshold
 //
-void A_TurretFire(mobj_t *actor)
+void A_TurretFire(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 count = 0;
 	fixed_t dist;
 	INT32 locvar1 = var1;
@@ -6421,8 +6297,10 @@ void A_TurretFire(mobj_t *actor)
 // var1 = object # to repeatedly fire
 // var2 = distance threshold
 //
-void A_SuperTurretFire(mobj_t *actor)
+void A_SuperTurretFire(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 count = 0;
 	fixed_t dist;
 	INT32 locvar1 = var1;
@@ -6460,8 +6338,10 @@ void A_SuperTurretFire(mobj_t *actor)
 // var1 = Don't play activesound?
 // var2 = unused
 //
-void A_TurretStop(mobj_t *actor)
+void A_TurretStop(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 
 	if (LUA_CallAction(A_TURRETSTOP, actor))
@@ -6481,8 +6361,10 @@ void A_TurretStop(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SparkFollow(mobj_t *actor)
+void A_SparkFollow(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_SPARKFOLLOW, actor))
 		return;
 
@@ -6514,8 +6396,10 @@ void A_SparkFollow(mobj_t *actor)
 // var1 = sfx to play
 // var2 = length of sfx, set to threshold if played
 //
-void A_BuzzFly(mobj_t *actor)
+void A_BuzzFly(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -6614,8 +6498,10 @@ void A_BuzzFly(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_GuardChase(mobj_t *actor)
+void A_GuardChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 delta;
 
 	if (LUA_CallAction(A_GUARDCHASE, actor))
@@ -6670,10 +6556,10 @@ void A_GuardChase(mobj_t *actor)
 	// Now that we've moved, its time for our shield to move!
 	// Otherwise it'll never act as a proper overlay.
 	if (actor->tracer && actor->tracer->state
-	&& actor->tracer->state->action.acp1)
+	&& actor->tracer->state->action)
 	{
 		var1 = actor->tracer->state->var1, var2 = actor->tracer->state->var2;
-		actor->tracer->state->action.acp1(actor->tracer);
+		actor->tracer->state->action(actor->tracer);
 	}
 }
 
@@ -6684,8 +6570,10 @@ void A_GuardChase(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_EggShield(mobj_t *actor)
+void A_EggShield(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 i;
 	player_t *player;
 	fixed_t blockdist;
@@ -6773,8 +6661,10 @@ void A_EggShield(mobj_t *actor)
 // var1 = 1 (use value in var2); 0 (use info table value)
 // var2 = if var1 = 1, then value to set
 //
-void A_SetReactionTime(mobj_t *actor)
+void A_SetReactionTime(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_SETREACTIONTIME, actor))
 		return;
 
@@ -6791,8 +6681,10 @@ void A_SetReactionTime(mobj_t *actor)
 // var1 = ball number
 // var2 = total balls
 //
-void A_Boss1Spikeballs(mobj_t *actor)
+void A_Boss1Spikeballs(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *ball;
@@ -6807,7 +6699,7 @@ void A_Boss1Spikeballs(mobj_t *actor)
 
 	S_StartSound(ball, ball->info->seesound);
 	var1 = ball->state->var1, var2 = ball->state->var2;
-	ball->state->action.acp1(ball);
+	ball->state->action(ball);
 }
 
 // Function: A_Boss3TakeDamage
@@ -6817,8 +6709,10 @@ void A_Boss1Spikeballs(mobj_t *actor)
 // var1 = movecount value
 // var2 = unused
 //
-void A_Boss3TakeDamage(mobj_t *actor)
+void A_Boss3TakeDamage(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_BOSS3TAKEDAMAGE, actor))
 		return;
 
@@ -6835,8 +6729,10 @@ void A_Boss3TakeDamage(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_Boss3Path(mobj_t *actor)
+void A_Boss3Path(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_BOSS3PATH, actor))
 		return;
 
@@ -6872,25 +6768,15 @@ void A_Boss3Path(mobj_t *actor)
 		// the number
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
-
-			if (mo2->type != MT_BOSS3WAYPOINT)
-				continue;
-
-			if(!mo2->spawnpoint)
-				continue;
-
-			if (mo2->spawnpoint->angle != actor->threshold)
-				continue;
-
-
-			P_SetTarget(&actor->target, mo2);
-			break;
+			if (mo2->type == MT_BOSS3WAYPOINT && mo2->spawnpoint && mo2->spawnpoint->angle == actor->threshold)
+			{
+				P_SetTarget(&actor->target, mo2);
+				break;
+			}
 		}
 
 		if (!actor->target) // Should NEVER happen
@@ -6967,8 +6853,10 @@ void A_Boss3Path(mobj_t *actor)
 // var1 = tag
 // var2 = add angle to tag (optional)
 //
-void A_LinedefExecute(mobj_t *actor)
+void A_LinedefExecute(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 tagnum;
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
@@ -6995,8 +6883,10 @@ void A_LinedefExecute(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_PlaySeeSound(mobj_t *actor)
+void A_PlaySeeSound(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_PLAYSEESOUND, actor))
 		return;
 
@@ -7011,8 +6901,10 @@ void A_PlaySeeSound(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_PlayAttackSound(mobj_t *actor)
+void A_PlayAttackSound(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_PLAYATTACKSOUND, actor))
 		return;
 
@@ -7027,8 +6919,10 @@ void A_PlayAttackSound(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_PlayActiveSound(mobj_t *actor)
+void A_PlayActiveSound(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_PLAYACTIVESOUND, actor))
 		return;
 
@@ -7043,8 +6937,10 @@ void A_PlayActiveSound(mobj_t *actor)
 // var1 = object # to spawn as smoke
 // var2 = unused
 //
-void A_SmokeTrailer(mobj_t *actor)
+void A_SmokeTrailer(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *th;
 	INT32 locvar1 = var1;
 
@@ -7062,9 +6958,11 @@ void A_SmokeTrailer(mobj_t *actor)
 	}
 	else
 		th = P_SpawnMobj(actor->x-actor->momx, actor->y-actor->momy, actor->z, locvar1);
+
 	P_SetObjectMomZ(th, FRACUNIT, false);
 	th->destscale = actor->scale;
 	P_SetScale(th, actor->scale);
+
 	th->tics -= P_RandomByte() & 3;
 	if (th->tics < 1)
 		th->tics = 1;
@@ -7081,8 +6979,10 @@ void A_SmokeTrailer(mobj_t *actor)
 //		var2 >> 16 = z
 //		var2 & 65535 = type
 //
-void A_SpawnObjectAbsolute(mobj_t *actor)
+void A_SpawnObjectAbsolute(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT16 x, y, z; // Want to be sure we can use negative values
 	mobjtype_t type;
 	mobj_t *mo;
@@ -7117,8 +7017,10 @@ void A_SpawnObjectAbsolute(mobj_t *actor)
 //		var2 >> 16 = z
 //		var2 & 65535 = type
 //
-void A_SpawnObjectRelative(mobj_t *actor)
+void A_SpawnObjectRelative(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT16 x, y, z; // Want to be sure we can use negative values
 	mobjtype_t type;
 	mobj_t *mo;
@@ -7155,8 +7057,10 @@ void A_SpawnObjectRelative(mobj_t *actor)
 // var1 = min
 // var2 = max
 //
-void A_ChangeAngleRelative(mobj_t *actor)
+void A_ChangeAngleRelative(void *thing)
 {
+	mobj_t *actor = thing;
+
 	// Oh god, the old code /sucked/. Changed this and the absolute version to get a random range using amin and amax instead of
 	//  getting a random angle from the _entire_ spectrum and then clipping. While we're at it, do the angle conversion to the result
 	//  rather than the ranges, so <0 and >360 work as possible values. -Red
@@ -7183,8 +7087,10 @@ void A_ChangeAngleRelative(mobj_t *actor)
 // var1 = min
 // var2 = max
 //
-void A_ChangeAngleAbsolute(mobj_t *actor)
+void A_ChangeAngleAbsolute(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	const fixed_t amin = locvar1*FRACUNIT;
@@ -7201,80 +7107,6 @@ void A_ChangeAngleAbsolute(mobj_t *actor)
 	actor->angle = FixedAngle(P_RandomRange(amin, amax));
 }
 
-// Function: A_RollAngle
-//
-// Description: Changes the roll angle.
-//
-// var1 = angle
-// var2 = relative? (default)
-//
-void A_RollAngle(mobj_t *actor)
-{
-	INT32 locvar1 = var1;
-	INT32 locvar2 = var2;
-	const angle_t angle = FixedAngle(locvar1*FRACUNIT);
-
-	if (LUA_CallAction(A_ROLLANGLE, actor))
-		return;
-
-	// relative (default)
-	if (!locvar2)
-		actor->rollangle += angle;
-	// absolute
-	else
-		actor->rollangle = angle;
-}
-
-// Function: A_ChangeRollAngleRelative
-//
-// Description: Changes the roll angle to a random relative value between the min and max. Set min and max to the same value to eliminate randomness
-//
-// var1 = min
-// var2 = max
-//
-void A_ChangeRollAngleRelative(mobj_t *actor)
-{
-	INT32 locvar1 = var1;
-	INT32 locvar2 = var2;
-	const fixed_t amin = locvar1*FRACUNIT;
-	const fixed_t amax = locvar2*FRACUNIT;
-
-	if (LUA_CallAction(A_CHANGEROLLANGLERELATIVE, actor))
-		return;
-
-#ifdef PARANOIA
-	if (amin > amax)
-		I_Error("A_ChangeRollAngleRelative: var1 is greater than var2");
-#endif
-
-	actor->rollangle += FixedAngle(P_RandomRange(amin, amax));
-}
-
-// Function: A_ChangeRollAngleAbsolute
-//
-// Description: Changes the roll angle to a random absolute value between the min and max. Set min and max to the same value to eliminate randomness
-//
-// var1 = min
-// var2 = max
-//
-void A_ChangeRollAngleAbsolute(mobj_t *actor)
-{
-	INT32 locvar1 = var1;
-	INT32 locvar2 = var2;
-	const fixed_t amin = locvar1*FRACUNIT;
-	const fixed_t amax = locvar2*FRACUNIT;
-
-	if (LUA_CallAction(A_CHANGEROLLANGLEABSOLUTE, actor))
-		return;
-
-#ifdef PARANOIA
-	if (amin > amax)
-		I_Error("A_ChangeRollAngleAbsolute: var1 is greater than var2");
-#endif
-
-	actor->rollangle = FixedAngle(P_RandomRange(amin, amax));
-}
-
 // Function: A_PlaySound
 //
 // Description: Plays a sound
@@ -7284,11 +7116,13 @@ void A_ChangeRollAngleAbsolute(mobj_t *actor)
 //		0 = Play sound without an origin
 //		1 = Play sound using calling object as origin
 //
-void A_PlaySound(mobj_t *actor)
+void A_PlaySound(void *thing)
 {
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_PLAYSOUND, actor))
 		return;
 
@@ -7302,8 +7136,10 @@ void A_PlaySound(mobj_t *actor)
 // var1 = mobj type
 // var2 = if (0) nearest; else furthest;
 //
-void A_FindTarget(mobj_t *actor)
+void A_FindTarget(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *targetedmobj = NULL;
@@ -7319,9 +7155,7 @@ void A_FindTarget(mobj_t *actor)
 	// scan the thinkers
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -7368,8 +7202,10 @@ void A_FindTarget(mobj_t *actor)
 // var1 = mobj type
 // var2 = if (0) nearest; else furthest;
 //
-void A_FindTracer(mobj_t *actor)
+void A_FindTracer(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *targetedmobj = NULL;
@@ -7385,9 +7221,7 @@ void A_FindTracer(mobj_t *actor)
 	// scan the thinkers
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -7434,8 +7268,10 @@ void A_FindTracer(mobj_t *actor)
 // var1 = tics to set to
 // var2 = if this is set, and no var1 is supplied, the mobj's threshold value will be used.
 //
-void A_SetTics(mobj_t *actor)
+void A_SetTics(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -7455,11 +7291,13 @@ void A_SetTics(mobj_t *actor)
 // var1 = lower bound
 // var2 = upper bound
 //
-void A_SetRandomTics(mobj_t *actor)
+void A_SetRandomTics(void *thing)
 {
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_SETRANDOMTICS, actor))
 		return;
 
@@ -7473,8 +7311,10 @@ void A_SetRandomTics(mobj_t *actor)
 // var1 = if (var1 > 0), find target and add its color value to yours
 // var2 = if (var1 = 0), color value to add
 //
-void A_ChangeColorRelative(mobj_t *actor)
+void A_ChangeColorRelative(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -7498,8 +7338,10 @@ void A_ChangeColorRelative(mobj_t *actor)
 // var1 = if (var1 > 0), set your color to your target's color
 // var2 = if (var1 = 0), color value to set to
 //
-void A_ChangeColorAbsolute(mobj_t *actor)
+void A_ChangeColorAbsolute(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -7522,8 +7364,10 @@ void A_ChangeColorAbsolute(mobj_t *actor)
 // var1 = angle
 // var2 = force
 //
-void A_MoveRelative(mobj_t *actor)
+void A_MoveRelative(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -7540,8 +7384,10 @@ void A_MoveRelative(mobj_t *actor)
 // var1 = angle
 // var2 = force
 //
-void A_MoveAbsolute(mobj_t *actor)
+void A_MoveAbsolute(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -7558,8 +7404,10 @@ void A_MoveAbsolute(mobj_t *actor)
 // var1 = amount of force
 // var2 = If 1, xy momentum is lost. If 0, xy momentum is kept
 //
-void A_Thrust(mobj_t *actor)
+void A_Thrust(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -7584,8 +7432,10 @@ void A_Thrust(mobj_t *actor)
 //		lower 16 bits = If 1, xy momentum is lost. If 0, xy momentum is kept
 //		upper 16 bits = If 1, z momentum is lost. If 0, z momentum is kept
 //
-void A_ZThrust(mobj_t *actor)
+void A_ZThrust(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -7617,10 +7467,13 @@ void A_ZThrust(mobj_t *actor)
 //		0 = target/tracer's target
 //		1 = target/tracer's tracer
 //
-void A_SetTargetsTarget(mobj_t *actor)
+void A_SetTargetsTarget(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
+
 	mobj_t *oldtarg = NULL, *newtarg = NULL;
 
 	if (LUA_CallAction(A_SETTARGETSTARGET, actor))
@@ -7661,8 +7514,10 @@ void A_SetTargetsTarget(mobj_t *actor)
 //		else if var2 == 1, remove the flag from the current flags
 //		else if var2 == 0, set the flags to the exact value
 //
-void A_SetObjectFlags(mobj_t *actor)
+void A_SetObjectFlags(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	boolean unlinkthings = false;
@@ -7678,8 +7533,10 @@ void A_SetObjectFlags(mobj_t *actor)
 	if ((UINT32)(locvar1 & (MF_NOBLOCKMAP|MF_NOSECTOR)) != (actor->flags & (MF_NOBLOCKMAP|MF_NOSECTOR))) // Blockmap/sector status has changed, so reset the links
 		unlinkthings = true;
 
-	if (unlinkthings) {
+	if (unlinkthings)
+	{
 		P_UnsetThingPosition(actor);
+
 		if (sector_list)
 		{
 			P_DelSeclist(sector_list);
@@ -7703,20 +7560,28 @@ void A_SetObjectFlags(mobj_t *actor)
 //		else if var2 == 1, remove the flag from the current flags
 //		else if var2 == 0, set the flags to the exact value
 //
-void A_SetObjectFlags2(mobj_t *actor)
+void A_SetObjectFlags2(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
 	if (LUA_CallAction(A_SETOBJECTFLAGS2, actor))
 		return;
 
-	if (locvar2 == 2)
-		actor->flags2 |= locvar1;
-	else if (locvar2 == 1)
-		actor->flags2 &= ~locvar1;
-	else
-		actor->flags2 = locvar1;
+	switch (locvar2)
+	{
+		case 2:
+			actor->flags2 |= locvar1;
+			break;
+		case 1:
+			actor->flags2 &= ~locvar1;
+			break;
+		default:
+			actor->flags2 = locvar1;
+			break;
+	}
 }
 
 // Function: A_BossJetFume
@@ -7730,106 +7595,116 @@ void A_SetObjectFlags2(mobj_t *actor)
 //		3 - Boss 4 jet flame
 // var2 = unused
 //
-void A_BossJetFume(mobj_t *actor)
+void A_BossJetFume(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *filler;
 	INT32 locvar1 = var1;
 
 	if (LUA_CallAction(A_BOSSJETFUME, actor))
 		return;
 
-	if (locvar1 == 0) // Boss1 jet fumes
+	switch (locvar1)
 	{
-		fixed_t jetx, jety, jetz;
+		default:
+		case 0: // Boss1 jet fumes
+			{
+				fixed_t jetx, jety, jetz;
 
-		jetx = actor->x + P_ReturnThrustX(actor, actor->angle, -FixedMul(64*FRACUNIT, actor->scale));
-		jety = actor->y + P_ReturnThrustY(actor, actor->angle, -FixedMul(64*FRACUNIT, actor->scale));
-		if (actor->eflags & MFE_VERTICALFLIP)
-			jetz = actor->z + actor->height - FixedMul(38*FRACUNIT + mobjinfo[MT_JETFUME1].height, actor->scale);
-		else
-			jetz = actor->z + FixedMul(38*FRACUNIT, actor->scale);
+				jetx = actor->x + P_ReturnThrustX(actor, actor->angle, -FixedMul(64*FRACUNIT, actor->scale));
+				jety = actor->y + P_ReturnThrustY(actor, actor->angle, -FixedMul(64*FRACUNIT, actor->scale));
+				if (actor->eflags & MFE_VERTICALFLIP)
+					jetz = actor->z + actor->height - FixedMul(38*FRACUNIT + mobjinfo[MT_JETFUME1].height, actor->scale);
+				else
+					jetz = actor->z + FixedMul(38*FRACUNIT, actor->scale);
 
-		filler = P_SpawnMobj(jetx, jety, jetz, MT_JETFUME1);
-		P_SetTarget(&filler->target, actor);
-		filler->destscale = actor->scale;
-		P_SetScale(filler, filler->destscale);
-		if (actor->eflags & MFE_VERTICALFLIP)
-			filler->flags2 |= MF2_OBJECTFLIP;
-		filler->fuse = 56;
+				filler = P_SpawnMobj(jetx, jety, jetz, MT_JETFUME1);
+				P_SetTarget(&filler->target, actor);
+				filler->destscale = actor->scale;
+				P_SetScale(filler, filler->destscale);
+				if (actor->eflags & MFE_VERTICALFLIP)
+					filler->flags2 |= MF2_OBJECTFLIP;
+				filler->fuse = 56;
 
-		if (actor->eflags & MFE_VERTICALFLIP)
-			jetz = actor->z + actor->height - FixedMul(12*FRACUNIT + mobjinfo[MT_JETFUME1].height, actor->scale);
-		else
-			jetz = actor->z + FixedMul(12*FRACUNIT, actor->scale);
+				if (actor->eflags & MFE_VERTICALFLIP)
+					jetz = actor->z + actor->height - FixedMul(12*FRACUNIT + mobjinfo[MT_JETFUME1].height, actor->scale);
+				else
+					jetz = actor->z + FixedMul(12*FRACUNIT, actor->scale);
 
-		filler = P_SpawnMobj(jetx + P_ReturnThrustX(actor, actor->angle-ANGLE_90, FixedMul(24*FRACUNIT, actor->scale)),
-				jety + P_ReturnThrustY(actor, actor->angle-ANGLE_90, FixedMul(24*FRACUNIT, actor->scale)),
-				jetz, MT_JETFUME1);
-		P_SetTarget(&filler->target, actor);
-		filler->destscale = actor->scale;
-		P_SetScale(filler, filler->destscale);
-		if (actor->eflags & MFE_VERTICALFLIP)
-			filler->flags2 |= MF2_OBJECTFLIP;
-		filler->fuse = 57;
+				filler = P_SpawnMobj(jetx + P_ReturnThrustX(actor, actor->angle-ANGLE_90, FixedMul(24*FRACUNIT, actor->scale)),
+						jety + P_ReturnThrustY(actor, actor->angle-ANGLE_90, FixedMul(24*FRACUNIT, actor->scale)),
+						jetz, MT_JETFUME1);
+				P_SetTarget(&filler->target, actor);
+				filler->destscale = actor->scale;
+				P_SetScale(filler, filler->destscale);
+				if (actor->eflags & MFE_VERTICALFLIP)
+					filler->flags2 |= MF2_OBJECTFLIP;
+				filler->fuse = 57;
 
-		filler = P_SpawnMobj(jetx + P_ReturnThrustX(actor, actor->angle+ANGLE_90, FixedMul(24*FRACUNIT, actor->scale)),
-				jety + P_ReturnThrustY(actor, actor->angle+ANGLE_90, FixedMul(24*FRACUNIT, actor->scale)),
-				jetz, MT_JETFUME1);
-		P_SetTarget(&filler->target, actor);
-		filler->destscale = actor->scale;
-		P_SetScale(filler, filler->destscale);
-		if (actor->eflags & MFE_VERTICALFLIP)
-			filler->flags2 |= MF2_OBJECTFLIP;
-		filler->fuse = 58;
+				filler = P_SpawnMobj(jetx + P_ReturnThrustX(actor, actor->angle+ANGLE_90, FixedMul(24*FRACUNIT, actor->scale)),
+						jety + P_ReturnThrustY(actor, actor->angle+ANGLE_90, FixedMul(24*FRACUNIT, actor->scale)),
+						jetz, MT_JETFUME1);
+				P_SetTarget(&filler->target, actor);
+				filler->destscale = actor->scale;
+				P_SetScale(filler, filler->destscale);
+				if (actor->eflags & MFE_VERTICALFLIP)
+					filler->flags2 |= MF2_OBJECTFLIP;
+				filler->fuse = 58;
 
-		P_SetTarget(&actor->tracer, filler);
-	}
-	else if (locvar1 == 1) // Boss 3 propeller
-	{
-		fixed_t jetx, jety, jetz;
+				P_SetTarget(&actor->tracer, filler);
+			}
+			break;
+		case 1: // Boss 3 propeller
+			{
+				fixed_t jetx, jety, jetz;
 
-		jetx = actor->x + P_ReturnThrustX(actor, actor->angle, -FixedMul(60*FRACUNIT, actor->scale));
-		jety = actor->y + P_ReturnThrustY(actor, actor->angle, -FixedMul(60*FRACUNIT, actor->scale));
-		if (actor->eflags & MFE_VERTICALFLIP)
-			jetz = actor->z + actor->height - FixedMul(17*FRACUNIT + mobjinfo[MT_PROPELLER].height, actor->scale);
-		else
-			jetz = actor->z + FixedMul(17*FRACUNIT, actor->scale);
+				jetx = actor->x + P_ReturnThrustX(actor, actor->angle, -FixedMul(60*FRACUNIT, actor->scale));
+				jety = actor->y + P_ReturnThrustY(actor, actor->angle, -FixedMul(60*FRACUNIT, actor->scale));
+				if (actor->eflags & MFE_VERTICALFLIP)
+					jetz = actor->z + actor->height - FixedMul(17*FRACUNIT + mobjinfo[MT_PROPELLER].height, actor->scale);
+				else
+					jetz = actor->z + FixedMul(17*FRACUNIT, actor->scale);
 
-		filler = P_SpawnMobj(jetx, jety, jetz, MT_PROPELLER);
-		P_SetTarget(&filler->target, actor);
-		filler->destscale = actor->scale;
-		P_SetScale(filler, filler->destscale);
-		if (actor->eflags & MFE_VERTICALFLIP)
-			filler->flags2 |= MF2_OBJECTFLIP;
-		filler->angle = actor->angle - ANGLE_180;
+				filler = P_SpawnMobj(jetx, jety, jetz, MT_PROPELLER);
+				P_SetTarget(&filler->target, actor);
+				filler->destscale = actor->scale;
+				P_SetScale(filler, filler->destscale);
+				if (actor->eflags & MFE_VERTICALFLIP)
+					filler->flags2 |= MF2_OBJECTFLIP;
+				filler->angle = actor->angle - ANGLE_180;
 
-		P_SetTarget(&actor->tracer, filler);
-	}
-	else if (locvar1 == 2) // Metal Sonic jet fumes
-	{
-		filler = P_SpawnMobj(actor->x, actor->y, actor->z, MT_JETFUME1);
-		P_SetTarget(&filler->target, actor);
-		filler->fuse = 59;
-		P_SetTarget(&actor->tracer, filler);
-		filler->destscale = actor->scale/2;
-		P_SetScale(filler, filler->destscale);
-		if (actor->eflags & MFE_VERTICALFLIP)
-			filler->flags2 |= MF2_OBJECTFLIP;
-	}
-	else if (locvar1 == 3) // Boss 4 jet flame
-	{
-		fixed_t jetz;
-		if (actor->eflags & MFE_VERTICALFLIP)
-			jetz = actor->z + actor->height + FixedMul(50*FRACUNIT - mobjinfo[MT_JETFLAME].height, actor->scale);
-		else
-			jetz = actor->z - FixedMul(50*FRACUNIT, actor->scale);
-		filler = P_SpawnMobj(actor->x, actor->y, jetz, MT_JETFLAME);
-		P_SetTarget(&filler->target, actor);
-		// Boss 4 already uses its tracer for other things
-		filler->destscale = actor->scale;
-		P_SetScale(filler, filler->destscale);
-		if (actor->eflags & MFE_VERTICALFLIP)
-			filler->flags2 |= MF2_OBJECTFLIP;
+				P_SetTarget(&actor->tracer, filler);
+			}
+			break;
+		case 2: // Metal Sonic jet fumes
+			{
+				filler = P_SpawnMobj(actor->x, actor->y, actor->z, MT_JETFUME1);
+				P_SetTarget(&filler->target, actor);
+				filler->fuse = 59;
+				P_SetTarget(&actor->tracer, filler);
+				filler->destscale = actor->scale/2;
+				P_SetScale(filler, filler->destscale);
+				if (actor->eflags & MFE_VERTICALFLIP)
+					filler->flags2 |= MF2_OBJECTFLIP;
+			}
+			break;
+		case 3: // Boss 4 jet flame
+			{
+				fixed_t jetz;
+				if (actor->eflags & MFE_VERTICALFLIP)
+					jetz = actor->z + actor->height + FixedMul(50*FRACUNIT - mobjinfo[MT_JETFLAME].height, actor->scale);
+				else
+					jetz = actor->z - FixedMul(50*FRACUNIT, actor->scale);
+				filler = P_SpawnMobj(actor->x, actor->y, jetz, MT_JETFLAME);
+				P_SetTarget(&filler->target, actor);
+				// Boss 4 already uses its tracer for other things
+				filler->destscale = actor->scale;
+				P_SetScale(filler, filler->destscale);
+				if (actor->eflags & MFE_VERTICALFLIP)
+					filler->flags2 |= MF2_OBJECTFLIP;
+			}
+			break;
 	}
 }
 
@@ -7840,8 +7715,10 @@ void A_BossJetFume(mobj_t *actor)
 // var1 = state number 1
 // var2 = state number 2
 //
-void A_RandomState(mobj_t *actor)
+void A_RandomState(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -7858,11 +7735,13 @@ void A_RandomState(mobj_t *actor)
 // var1 = Minimum state number to choose.
 // var2 = Maximum state number to use.
 //
-void A_RandomStateRange(mobj_t *actor)
+void A_RandomStateRange(void *thing)
 {
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_RANDOMSTATERANGE, actor))
 		return;
 
@@ -7876,8 +7755,10 @@ void A_RandomStateRange(mobj_t *actor)
 // var1 = state # to use 1st action from
 // var2 = state # to use 2nd action from
 //
-void A_DualAction(mobj_t *actor)
+void A_DualAction(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -7891,14 +7772,14 @@ void A_DualAction(mobj_t *actor)
 	astate = &states[locvar1];
 
 	CONS_Debug(DBG_GAMELOGIC, "A_DualAction: Calling First Action (state %d)...\n", locvar1);
-	states[locvar1].action.acp1(actor);
+	states[locvar1].action(actor);
 
 	var1 = states[locvar2].var1;
 	var2 = states[locvar2].var2;
 	astate = &states[locvar2];
 
 	CONS_Debug(DBG_GAMELOGIC, "A_DualAction: Calling Second Action (state %d)...\n", locvar2);
-	states[locvar2].action.acp1(actor);
+	states[locvar2].action(actor);
 }
 
 // Function: A_RemoteAction
@@ -7908,10 +7789,13 @@ void A_DualAction(mobj_t *actor)
 // var1 = remote object (-2 uses tracer, -1 uses target)
 // var2 = state reference for calling an action
 //
-void A_RemoteAction(mobj_t *actor)
+void A_RemoteAction(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
+
 	mobj_t *originaltarget = actor->target; // Hold on to the target for later.
 
 	if (LUA_CallAction(A_REMOTEACTION, actor))
@@ -7929,9 +7813,7 @@ void A_RemoteAction(mobj_t *actor)
 		// scan the thinkers
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
@@ -7983,7 +7865,7 @@ void A_RemoteAction(mobj_t *actor)
 
 		CONS_Debug(DBG_GAMELOGIC, "A_RemoteAction: Calling action on %p\n"
 				"var1 is %d\nvar2 is %d\n", actor->target, var1, var2);
-		states[locvar2].action.acp1(actor->target);
+		states[locvar2].action(actor->target);
 	}
 
 	P_SetTarget(&actor->target, originaltarget); // Restore the original target.
@@ -7996,8 +7878,10 @@ void A_RemoteAction(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_ToggleFlameJet(mobj_t* actor)
+void A_ToggleFlameJet(void* thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_TOGGLEFLAMEJET, actor))
 		return;
 
@@ -8021,8 +7905,10 @@ void A_ToggleFlameJet(mobj_t* actor)
 }
 
 //{ SRB2kart Actions
-void A_ItemPop(mobj_t *actor)
+void A_ItemPop(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *remains;
 	mobjtype_t explode;
 
@@ -8088,8 +7974,10 @@ void A_ItemPop(mobj_t *actor)
 	P_RemoveMobj(actor);
 }
 
-void A_JawzChase(mobj_t *actor)
+void A_JawzChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player;
 
 	if (LUA_CallAction(A_JAWZCHASE, actor))
@@ -8097,9 +7985,6 @@ void A_JawzChase(mobj_t *actor)
 
 	if (actor->tracer)
 	{
-		/*if (G_RaceGametype()) // Stop looking after first target in race
-			actor->extravalue1 = 1;*/
-
 		if (actor->tracer->health)
 		{
 			mobj_t *ret;
@@ -8122,7 +8007,7 @@ void A_JawzChase(mobj_t *actor)
 	if (actor->extravalue1) // Disable looking by setting this
 		return;
 
-	if (!actor->target || P_MobjWasRemoved(actor->target)) // No source!
+	if (P_MobjWasRemoved(actor->target)) // No source!
 		return;
 
 	player = K_FindJawzTarget(actor, actor->target->player);
@@ -8132,8 +8017,10 @@ void A_JawzChase(mobj_t *actor)
 	return;
 }
 
-void A_JawzExplode(mobj_t *actor)
+void A_JawzExplode(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 shrapnel = 2;
 	mobj_t *truc;
 
@@ -8168,8 +8055,10 @@ void A_JawzExplode(mobj_t *actor)
 	return;
 }
 
-void A_SPBChase(mobj_t *actor)
+void A_SPBChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	player_t *player = NULL;
 	UINT8 i;
 	UINT8 bestrank = UINT8_MAX;
@@ -8198,15 +8087,6 @@ void A_SPBChase(mobj_t *actor)
 		if (!playeringame[i] || players[i].spectator || players[i].exiting)
 			continue; // not in-game
 
-		/*if (!players[i].mo)
-			continue; // no mobj
-
-		if (players[i].mo->health <= 0)
-			continue; // dead
-
-		if (players[i].kartstuff[k_respawn])
-			continue;*/ // respawning
-
 		if (players[i].kartstuff[k_position] < bestrank)
 		{
 			bestrank = players[i].kartstuff[k_position];
@@ -8218,7 +8098,6 @@ void A_SPBChase(mobj_t *actor)
 	{
 		if (actor->tracer && actor->tracer->health && !(actor->tracer->player && actor->tracer->player->spectator))
 		{
-
 			fixed_t defspeed = wspeed;
 			fixed_t range = (160*actor->tracer->scale);
 			fixed_t cx = 0, cy =0;
@@ -8452,8 +8331,10 @@ void A_SPBChase(mobj_t *actor)
 	return;
 }
 
-void A_BallhogExplode(mobj_t *actor)
+void A_BallhogExplode(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *mo2;
 
 	if (LUA_CallAction(A_BALLHOGEXPLODE, actor))
@@ -8468,8 +8349,10 @@ void A_BallhogExplode(mobj_t *actor)
 
 // A_LightningFollowPlayer:
 // Dumb simple function that gives a mobj its target's momentums without updating its angle.
-void A_LightningFollowPlayer(mobj_t *actor)
+void A_LightningFollowPlayer(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t sx, sy;
 
 	if (LUA_CallAction(A_LIGHTNINGFOLLOWPLAYER, actor))
@@ -8478,27 +8361,27 @@ void A_LightningFollowPlayer(mobj_t *actor)
 	if (!actor->target)
 		return;
 
+	if (actor->extravalue1)	// Make the radius also follow the player somewhat accuratly
 	{
-		if (actor->extravalue1)	// Make the radius also follow the player somewhat accuratly
-		{
-			sx = actor->target->x + FixedMul((actor->target->scale*actor->extravalue1), FINECOSINE((actor->angle)>>ANGLETOFINESHIFT));
-			sy = actor->target->y + FixedMul((actor->target->scale*actor->extravalue1), FINESINE((actor->angle)>>ANGLETOFINESHIFT));
-			P_MoveOrigin(actor, sx, sy, actor->target->z);
-		}
-		else	// else just teleport to player directly
-			P_MoveOrigin(actor, actor->target->x, actor->target->y, actor->target->z);
-
-		K_MatchGenericExtraFlags(actor, actor->target);	// copy our target for graviflip
-		actor->momx = actor->target->momx;
-		actor->momy = actor->target->momy;
-		actor->momz = actor->target->momz;	// Give momentum since we don't teleport to our player literally every frame.
+		sx = actor->target->x + FixedMul((actor->target->scale*actor->extravalue1), FINECOSINE((actor->angle)>>ANGLETOFINESHIFT));
+		sy = actor->target->y + FixedMul((actor->target->scale*actor->extravalue1), FINESINE((actor->angle)>>ANGLETOFINESHIFT));
+		P_MoveOrigin(actor, sx, sy, actor->target->z);
 	}
+	else	// else just teleport to player directly
+		P_MoveOrigin(actor, actor->target->x, actor->target->y, actor->target->z);
+
+	K_MatchGenericExtraFlags(actor, actor->target);	// copy our target for graviflip
+	actor->momx = actor->target->momx;
+	actor->momy = actor->target->momy;
+	actor->momz = actor->target->momz;	// Give momentum since we don't teleport to our player literally every frame.
 }
 
 // A_FZBoomFlash:
 // Flash everyone close enough to the boom
-void A_FZBoomFlash(mobj_t *actor)
+void A_FZBoomFlash(void *thing)
 {
+	mobj_t *actor = thing;
+
 	UINT8 i;
 
 	if (LUA_CallAction(A_FZBOOMFLASH, actor))
@@ -8509,7 +8392,9 @@ void A_FZBoomFlash(mobj_t *actor)
 		fixed_t dist;
 		if (!playeringame[i] || !players[i].mo)
 			continue;
+
 		dist = P_AproxDistance(P_AproxDistance(actor->x-players[i].mo->x, actor->y-players[i].mo->y), actor->z-players[i].mo->z);
+
 		if (dist < 1536<<FRACBITS)
 			P_FlashPal(&players[i], PAL_WHITE, 2);
 	}
@@ -8519,8 +8404,10 @@ void A_FZBoomFlash(mobj_t *actor)
 // A_FZBoomSmoke:
 // Spawns pinkish smoke around the object
 // Var1 is radius add
-void A_FZBoomSmoke(mobj_t *actor)
+void A_FZBoomSmoke(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 i;
 	INT32 rad = 47+(23*var1);
 
@@ -8536,13 +8423,16 @@ void A_FZBoomSmoke(mobj_t *actor)
 		smoke->tics += P_RandomRange(-3, 4);
 		smoke->scale = actor->scale*3;
 	}
+
 	return;
 }
 
 // A_RandomShadowFrame
 // Gives a random sprite for the Mayonaka static shadows. Dumb and simple.
-void A_RandomShadowFrame(mobj_t *actor)
+void A_RandomShadowFrame(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *fire;
 	mobj_t *fake;
 
@@ -8584,13 +8474,16 @@ void A_RandomShadowFrame(mobj_t *actor)
 			S_StartSound(actor->target, sfx_fire2);
 		}
 	}
+
 	return;
 }
 
 // A_RoamingShadowThinker
 // Thinker for Midnight Channel's Roaming Shadows:
-void A_RoamingShadowThinker(mobj_t *actor)
+void A_RoamingShadowThinker(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *wind;
 
 	if (LUA_CallAction(A_ROAMINGSHADOWTHINKER, actor))
@@ -8646,8 +8539,10 @@ void A_RoamingShadowThinker(mobj_t *actor)
 // A_MayonakaArrow
 // Used for the arrow sprite animations in Mayonaka. It's only extra visual bullshit to make em more random.
 
-void A_MayonakaArrow(mobj_t *actor)
+void A_MayonakaArrow(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 flip = 0;
 	INT32 iswarning;
 
@@ -8684,8 +8579,10 @@ void A_MayonakaArrow(mobj_t *actor)
 // A_MementosTPParticles
 // Mementos teleporters particles effects. Short and simple.
 
-void A_MementosTPParticles(mobj_t *actor)
+void A_MementosTPParticles(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *particle;
 	mobj_t *mo2;
 	int i = 0;
@@ -8694,7 +8591,7 @@ void A_MementosTPParticles(mobj_t *actor)
 	if (LUA_CallAction(A_MEMENTOSTPPARTICLES, actor))
 		return;
 
-	for (; i<4; i++)
+	for (; i < 4; i++)
 	{
 		particle = P_SpawnMobj(actor->x + (P_RandomRange(-256, 256)<<FRACBITS), actor->y + (P_RandomRange(-256, 256)<<FRACBITS), actor->z + (P_RandomRange(48, 256)<<FRACBITS), MT_MEMENTOSPARTICLE);
 		particle->frame = 0;
@@ -8709,9 +8606,7 @@ void A_MementosTPParticles(mobj_t *actor)
 	{
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
@@ -8727,8 +8622,10 @@ void A_MementosTPParticles(mobj_t *actor)
 // A_ReaperThinker
 // Mementos's Reaper's thinker. A huge pain in the Derek Bum to translate from Lua to this shite if you ask me.
 
-void A_ReaperThinker(mobj_t *actor)
+void A_ReaperThinker(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *particle;	// particles to spawn
 	int i = 0;			// for loops
 	angle_t an = ANGLE_22h;		// Reminder that angle constants suck.
@@ -8770,11 +8667,11 @@ void A_ReaperThinker(mobj_t *actor)
 
 		// Spawn particles in some edgy circle or w/e.
 
-		if (leveltime%5 != 0)	// spawn the thing under that every tic.
+		if (leveltime % 5 != 0)	// spawn the thing under that every tic.
 			return;
 
-		i=0;
-		for (; i<15; i++)	// spawn in a circle formation or w/e.
+		i = 0;
+		for (; i < 15; i++)	// spawn in a circle formation or w/e.
 		{
 			particle = P_SpawnMobj(actor->x, actor->y, actor->z, MT_THOK);
 			particle->momz = 20<<FRACBITS;
@@ -8810,9 +8707,7 @@ void A_ReaperThinker(mobj_t *actor)
 		// We have no target and oughta find one, so let's scan through thinkers for a waypoint of angle 0, or something.
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
@@ -8839,7 +8734,7 @@ void A_ReaperThinker(mobj_t *actor)
 		actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y);
 
 		// The player we should target if it's near us:
-		for (i=0; i<MAXPLAYERS; i++)
+		for (i = 0; i<MAXPLAYERS; i++)
 		{
 
 			if (!playeringame[i])
@@ -8877,9 +8772,7 @@ void A_ReaperThinker(mobj_t *actor)
 				// If we reach close to a waypoint, then we should go to the NEXT one.
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-						continue;
-					if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+					if (th->function != (actionf_p1)P_MobjThinker)
 						continue;
 
 					mo2 = (mobj_t *)th;
@@ -8896,7 +8789,6 @@ void A_ReaperThinker(mobj_t *actor)
 				}
 			}
 
-
 			if (!actor->target)	// If we have no target, revert back to waypoint 0.
 			{
 				actor->extravalue1 = 0;
@@ -8911,8 +8803,10 @@ void A_ReaperThinker(mobj_t *actor)
 	}
 }
 
-void A_FlameParticle(mobj_t *actor)
+void A_FlameParticle(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t rad = actor->radius>>FRACBITS, hei = actor->radius>>FRACBITS;
 	mobj_t *par;
 
@@ -8936,8 +8830,10 @@ void A_FlameParticle(mobj_t *actor)
 // var1 = Angle adjustment (aka orbit speed)
 // var2 = Lower four bits: height offset, Upper 4 bits = set if object is Nightopian Helper
 //
-void A_OrbitNights(mobj_t* actor)
+void A_OrbitNights(void* thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 ofs = (var2 & 0xFFFF);
 	boolean ishelper = (var2 & 0xFFFF0000);
 
@@ -8982,8 +8878,10 @@ void A_OrbitNights(mobj_t* actor)
 // var1 = unused
 // var2 = unused
 //
-void A_GhostMe(mobj_t *actor)
+void A_GhostMe(void *thing)
 {
+	mobj_t *actor = thing;
+
 	if (LUA_CallAction(A_GHOSTME, actor))
 		return;
 
@@ -8999,8 +8897,10 @@ void A_GhostMe(mobj_t *actor)
 //		0 = target
 //		1 = tracer
 //
-void A_SetObjectState(mobj_t *actor)
+void A_SetObjectState(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *target;
@@ -9038,8 +8938,10 @@ void A_SetObjectState(mobj_t *actor)
 //		lower 16 bits = type
 //		upper 16 bits = range (if == 0, across whole map)
 //
-void A_SetObjectTypeState(mobj_t *actor)
+void A_SetObjectTypeState(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	const UINT16 loc2lw = (UINT16)(locvar2 & 65535);
@@ -9054,9 +8956,7 @@ void A_SetObjectTypeState(mobj_t *actor)
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -9088,8 +8988,10 @@ void A_SetObjectTypeState(mobj_t *actor)
 //		1 = tracer
 // var2 = unused
 //
-void A_KnockBack(mobj_t *actor)
+void A_KnockBack(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	mobj_t *target;
 
@@ -9121,8 +9023,10 @@ void A_KnockBack(mobj_t *actor)
 //		lower 16 bits = If 1, xy momentum is lost. If 0, xy momentum is kept
 //		upper 16 bits = 0 - target, 1 - tracer
 //
-void A_PushAway(mobj_t *actor)
+void A_PushAway(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *target; // target
@@ -9157,8 +9061,10 @@ void A_PushAway(mobj_t *actor)
 // var1 = ammount of drained rings
 // var2 = unused
 //
-void A_RingDrain(mobj_t *actor)
+void A_RingDrain(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	player_t *player;
 
@@ -9185,8 +9091,10 @@ void A_RingDrain(mobj_t *actor)
 //		lower 16 bits = missile type
 //		upper 16 bits = height offset
 //
-void A_SplitShot(mobj_t *actor)
+void A_SplitShot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	const UINT16 loc2lw = (UINT16)(locvar2 & 65535);
@@ -9198,22 +9106,21 @@ void A_SplitShot(mobj_t *actor)
 		return;
 
 	A_FaceTarget(actor);
-	{
-		const angle_t an = (actor->angle + ANGLE_90) >> ANGLETOFINESHIFT;
-		const fixed_t fasin = FINESINE(an);
-		const fixed_t facos = FINECOSINE(an);
-		fixed_t xs = FixedMul(facos,FixedMul(offs, actor->scale));
-		fixed_t ys = FixedMul(fasin,FixedMul(offs, actor->scale));
-		fixed_t z;
 
-		if (actor->eflags & MFE_VERTICALFLIP)
-			z = actor->z + actor->height - FixedMul(hoffs, actor->scale);
-		else
-			z = actor->z + FixedMul(hoffs, actor->scale);
+	const angle_t an = (actor->angle + ANGLE_90) >> ANGLETOFINESHIFT;
+	const fixed_t fasin = FINESINE(an);
+	const fixed_t facos = FINECOSINE(an);
+	fixed_t xs = FixedMul(facos,FixedMul(offs, actor->scale));
+	fixed_t ys = FixedMul(fasin,FixedMul(offs, actor->scale));
+	fixed_t z;
 
-		P_SpawnPointMissile(actor, actor->target->x+xs, actor->target->y+ys, actor->target->z, loc2lw, actor->x, actor->y, z);
-		P_SpawnPointMissile(actor, actor->target->x-xs, actor->target->y-ys, actor->target->z, loc2lw, actor->x, actor->y, z);
-	}
+	if (actor->eflags & MFE_VERTICALFLIP)
+		z = actor->z + actor->height - FixedMul(hoffs, actor->scale);
+	else
+		z = actor->z + FixedMul(hoffs, actor->scale);
+
+	P_SpawnPointMissile(actor, actor->target->x+xs, actor->target->y+ys, actor->target->z, loc2lw, actor->x, actor->y, z);
+	P_SpawnPointMissile(actor, actor->target->x-xs, actor->target->y-ys, actor->target->z, loc2lw, actor->x, actor->y, z);
 }
 
 // Function: A_MissileSplit
@@ -9223,8 +9130,10 @@ void A_SplitShot(mobj_t *actor)
 // var1 = splitting missile type
 // var2 = splitting angle
 //
-void A_MissileSplit(mobj_t *actor)
+void A_MissileSplit(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9246,8 +9155,10 @@ void A_MissileSplit(mobj_t *actor)
 //		upper 16 bits = missile type #
 // var2 = height offset
 //
-void A_MultiShot(mobj_t *actor)
+void A_MultiShot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t z, xr, yr;
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
@@ -9262,7 +9173,7 @@ void A_MultiShot(mobj_t *actor)
 	if (actor->target)
 		A_FaceTarget(actor);
 
-	if(loc1lw > 90)
+	if (loc1lw > 90)
 		ad = FixedMul(90*FRACUNIT, actor->scale);
 	else
 		ad = FixedMul(loc1lw*FRACUNIT, actor->scale);
@@ -9274,7 +9185,7 @@ void A_MultiShot(mobj_t *actor)
 	xr = FixedMul((P_SignedRandom()/3)<<FRACBITS, actor->scale); // please note p_mobj.c's P_Rand() abuse
 	yr = FixedMul((P_SignedRandom()/3)<<FRACBITS, actor->scale); // of rand(), RAND_MAX and signness mess
 
-	while(count <= loc1lw && loc1lw >= 1)
+	while (count <= loc1lw && loc1lw >= 1)
 	{
 		const angle_t fa = FixedAngleC(count*FRACUNIT*360, ad)>>ANGLETOFINESHIFT;
 		const fixed_t rc = FINECOSINE(fa);
@@ -9306,8 +9217,10 @@ void A_MultiShot(mobj_t *actor)
 //		upper 16 bits = maximum step #
 // var2 = force
 //
-void A_InstaLoop(mobj_t *actor)
+void A_InstaLoop(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	fixed_t force = max(locvar2, 1)*FRACUNIT; // defaults to 1 if var2 < 1
@@ -9335,8 +9248,10 @@ void A_InstaLoop(mobj_t *actor)
 //		lower 16 bits = vertical rotation speed in 1/10 fracunits per tic
 //		upper 16 bits = horizontal rotation speed in 1/10 fracunits per tic
 //
-void A_Custom3DRotate(mobj_t *actor)
+void A_Custom3DRotate(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9365,7 +9280,7 @@ void A_Custom3DRotate(mobj_t *actor)
 		P_RemoveMobj(actor);
 		return;
 	}
-	
+
 	if (hspeed==0 && vspeed==0)
 	{
 		if (cv_debug)
@@ -9405,8 +9320,10 @@ void A_Custom3DRotate(mobj_t *actor)
 //		else, do not call a specific state if no players are available
 // var2 = state number
 //
-void A_SearchForPlayers(mobj_t *actor)
+void A_SearchForPlayers(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9419,7 +9336,7 @@ void A_SearchForPlayers(mobj_t *actor)
 		if (P_LookForPlayers(actor, true, false, 0))
 			return; // got a new target
 
-		if(locvar1==0)
+		if (locvar1==0)
 		{
 			P_SetMobjStateNF(actor, locvar2);
 			return;
@@ -9436,8 +9353,10 @@ void A_SearchForPlayers(mobj_t *actor)
 //		upper 16 bits = numerator (defaults to 1 if zero)
 // var2 = state number
 //
-void A_CheckRandom(mobj_t *actor)
+void A_CheckRandom(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	fixed_t chance = FRACUNIT;
@@ -9464,8 +9383,10 @@ void A_CheckRandom(mobj_t *actor)
 // var1 = if player rings >= var1 call state
 // var2 = state number
 //
-void A_CheckTargetRings(mobj_t *actor)
+void A_CheckTargetRings(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9486,8 +9407,10 @@ void A_CheckTargetRings(mobj_t *actor)
 // var1 = if player rings >= var1 call state
 // var2 = state number
 //
-void A_CheckRings(mobj_t *actor)
+void A_CheckRings(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	INT32 i, cntr = 0;
@@ -9509,8 +9432,10 @@ void A_CheckRings(mobj_t *actor)
 // var1 = if total player rings >= var1 call state
 // var2 = state number
 //
-void A_CheckTotalRings(mobj_t *actor)
+void A_CheckTotalRings(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9533,8 +9458,10 @@ void A_CheckTotalRings(mobj_t *actor)
 // var1 = if health <= var1 call state
 // var2 = state number
 //
-void A_CheckHealth(mobj_t *actor)
+void A_CheckHealth(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9554,8 +9481,10 @@ void A_CheckHealth(mobj_t *actor)
 //		upper 16 bits = 0 - target, 1 - tracer
 // var2 = state number
 //
-void A_CheckRange(mobj_t *actor)
+void A_CheckRange(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	fixed_t dist;
@@ -9584,8 +9513,10 @@ void A_CheckRange(mobj_t *actor)
 //		upper 16 bits = 0 - target, 1 - tracer
 // var2 = state number
 //
-void A_CheckHeight(mobj_t *actor)
+void A_CheckHeight(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	fixed_t height;
@@ -9614,8 +9545,10 @@ void A_CheckHeight(mobj_t *actor)
 //		upper 16 bits = 0 - target, 1 - tracer
 // var2 = state number
 //
-void A_CheckTrueRange(mobj_t *actor)
+void A_CheckTrueRange(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	fixed_t height; // vertical range
@@ -9658,8 +9591,10 @@ void A_CheckTrueRange(mobj_t *actor)
 //		lower 16 bits = state to call
 //		upper 16 bits = range (if == 0, check whole map)
 //
-void A_CheckThingCount(mobj_t *actor)
+void A_CheckThingCount(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9678,9 +9613,7 @@ void A_CheckThingCount(mobj_t *actor)
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -9699,7 +9632,7 @@ void A_CheckThingCount(mobj_t *actor)
 		}
 	}
 
-	if(loc1lw <= count)
+	if (loc1lw <= count)
 		P_SetMobjState(actor, loc2lw);
 }
 
@@ -9712,8 +9645,10 @@ void A_CheckThingCount(mobj_t *actor)
 //		1 = tracer
 // var2 = state number
 //
-void A_CheckAmbush(mobj_t *actor)
+void A_CheckAmbush(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	angle_t at; // angle target is currently facing
@@ -9753,8 +9688,10 @@ void A_CheckAmbush(mobj_t *actor)
 // var1 = if custom value >= var1, call state
 // var2 = state number
 //
-void A_CheckCustomValue(mobj_t *actor)
+void A_CheckCustomValue(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9772,8 +9709,10 @@ void A_CheckCustomValue(mobj_t *actor)
 // var1 = if memory value >= var1, call state
 // var2 = state number
 //
-void A_CheckCusValMemo(mobj_t *actor)
+void A_CheckCusValMemo(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9797,8 +9736,10 @@ void A_CheckCusValMemo(mobj_t *actor)
 //      else if var2 == 1, substract var1 from the custom value
 //      else if var2 == 0, replace the custom value with var1
 //
-void A_SetCustomValue(mobj_t *actor)
+void A_SetCustomValue(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9812,20 +9753,29 @@ void A_SetCustomValue(mobj_t *actor)
 		return; // DON'T DIVIDE BY ZERO
 
 	// no need for a "temp" value here, just modify the cusval directly
-	if (locvar2 == 5) // multiply
-		actor->cusval *= locvar1;
-	else if (locvar2 == 4) // divide
-		actor->cusval /= locvar1;
-	else if (locvar2 == 3) // modulo
-		actor->cusval %= locvar1;
-	else if (locvar2 == 2) // add
-		actor->cusval += locvar1;
-	else if (locvar2 == 1) // subtract
-		actor->cusval -= locvar1;
-	else // replace
-		actor->cusval = locvar1;
+	switch (locvar2)
+	{
+		case 5: // multiply
+			actor->cusval *= locvar1;
+			break;
+		case 4: // divide
+			actor->cusval /= locvar1;
+			break;
+		case 3: // modulo
+			actor->cusval %= locvar1;
+			break;
+		case 2: // add
+			actor->cusval += locvar1;
+			break;
+		case 1: // subtract
+			actor->cusval -= locvar1;
+			break;
+		default: // replace
+			actor->cusval = locvar1;
+			break;
+	}
 
-	if(cv_debug)
+	if (cv_debug)
 		CONS_Printf("New custom value is %d\n", actor->cusval);
 }
 
@@ -9844,8 +9794,10 @@ void A_SetCustomValue(mobj_t *actor)
 //      else if var2 == 1,  mem -= cv  ||  cv -= mem
 //      else mem = cv  ||  cv = mem
 //
-void A_UseCusValMemo(mobj_t *actor)
+void A_UseCusValMemo(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9870,18 +9822,27 @@ void A_UseCusValMemo(mobj_t *actor)
 		return; // DON'T DIVIDE BY ZERO
 
 	// now get new value for cusval/cvmem using the other
-	if (locvar2 == 5) // multiply
-		temp *= tempM;
-	else if (locvar2 == 4) // divide
-		temp /= tempM;
-	else if (locvar2 == 3) // modulo
-		temp %= tempM;
-	else if (locvar2 == 2) // add
-		temp += tempM;
-	else if (locvar2 == 1) // subtract
-		temp -= tempM;
-	else // replace
-		temp = tempM;
+	switch (locvar2)
+	{
+		case 5: // multiply
+			temp *= tempM;
+			break;
+		case 4: // divide
+			temp /= tempM;
+			break;
+		case 3: // modulo
+			temp %= tempM;
+			break;
+		case 2: // add
+			temp += tempM;
+			break;
+		case 1: // subtract
+			temp -= tempM;
+			break;
+		default: // replace
+			temp = tempM;
+			break;
+	}
 
 	// finally, give cusval/cvmem the new value!
 	if (locvar1 == 1)
@@ -9907,8 +9868,10 @@ void A_UseCusValMemo(mobj_t *actor)
 //      else if var2 == 1, substract var1 from the target's custom value
 //      else if var2 == 0, replace the target's custom value with var1
 //
-void A_RelayCustomValue(mobj_t *actor)
+void A_RelayCustomValue(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -9936,18 +9899,27 @@ void A_RelayCustomValue(mobj_t *actor)
 		return; // DON'T DIVIDE BY ZERO
 
 	// now get new cusval using target's and the reference
-	if (locvar2 == 5) // multiply
-		tempT *= temp;
-	else if (locvar2 == 4) // divide
-		tempT /= temp;
-	else if (locvar2 == 3) // modulo
-		tempT %= temp;
-	else if (locvar2 == 2) // add
-		tempT += temp;
-	else if (locvar2 == 1) // subtract
-		tempT -= temp;
-	else // replace
-		tempT = temp;
+	switch (locvar2)
+	{
+		case 5: // multiply
+			tempT *= temp;
+			break;
+		case 4: // divide
+			tempT /= temp;
+			break;
+		case 3: // modulo
+			tempT %= temp;
+			break;
+		case 2: // add
+			tempT += temp;
+			break;
+		case 1: // subtract
+			tempT -= temp;
+			break;
+		default: // replace
+			tempT = temp;
+			break;
+	}
 
 	// finally, give target/tracer the new cusval!
 	if (!(locvar1 >> 16)) // target
@@ -9969,47 +9941,46 @@ void A_RelayCustomValue(mobj_t *actor)
 //      else if var2 == 1, only replace new action's var2 with custom value
 //      else if var2 == 0, only replace new action's var1 with custom value
 //
-void A_CusValAction(mobj_t *actor)
+void A_CusValAction(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
 	if (LUA_CallAction(A_CUSVALACTION, actor))
 		return;
 
-	if (locvar2 == 5)
+	switch (locvar2)
 	{
-		var1 = states[locvar1].var1;
-		var2 = (INT32)actor->cvmem;
-	}
-	else if (locvar2 == 4)
-	{
-		var1 = (INT32)actor->cvmem;
-		var2 = states[locvar1].var2;
-	}
-	else if (locvar2 == 3)
-	{
-		var1 = (INT32)actor->cvmem;
-		var2 = (INT32)actor->cusval;
-	}
-	else if (locvar2 == 2)
-	{
-		var1 = (INT32)actor->cusval;
-		var2 = (INT32)actor->cvmem;
-	}
-	else if (locvar2 == 1)
-	{
-		var1 = states[locvar1].var1;
-		var2 = (INT32)actor->cusval;
-	}
-	else
-	{
-		var1 = (INT32)actor->cusval;
-		var2 = states[locvar1].var2;
+		case 5:
+			var1 = states[locvar1].var1;
+			var2 = (INT32)actor->cvmem;
+			break;
+		case 4:
+			var1 = (INT32)actor->cvmem;
+			var2 = states[locvar1].var2;
+			break;
+		case 3:
+			var1 = (INT32)actor->cvmem;
+			var2 = (INT32)actor->cusval;
+			break;
+		case 2:
+			var1 = (INT32)actor->cusval;
+			var2 = (INT32)actor->cvmem;
+			break;
+		case 1:
+			var1 = states[locvar1].var1;
+			var2 = (INT32)actor->cusval;
+			break;
+		default:
+			var1 = (INT32)actor->cusval;
+			var2 = states[locvar1].var2;
+			break;
 	}
 
 	astate = &states[locvar1];
-	states[locvar1].action.acp1(actor);
+	states[locvar1].action(actor);
 }
 
 // Function: A_ForceStop
@@ -10021,14 +9992,17 @@ void A_CusValAction(mobj_t *actor)
 //      else, stop x-y-movement only
 // var2 = unused
 //
-void A_ForceStop(mobj_t *actor)
+void A_ForceStop(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 
 	if (LUA_CallAction(A_FORCESTOP, actor))
 		return;
 
 	actor->momx = actor->momy = 0;
+
 	if (locvar1 == 0)
 		actor->momz = 0;
 }
@@ -10040,8 +10014,10 @@ void A_ForceStop(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_ForceWin(mobj_t *actor)
+void A_ForceWin(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 i;
 
 	if (LUA_CallAction(A_FORCEWIN, actor))
@@ -10070,8 +10046,10 @@ void A_ForceWin(mobj_t *actor)
 //        else, actor solid
 // var2 = unused
 //
-void A_SpikeRetract(mobj_t *actor)
+void A_SpikeRetract(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 
 	if (LUA_CallAction(A_SPIKERETRACT, actor))
@@ -10090,6 +10068,7 @@ void A_SpikeRetract(mobj_t *actor)
 		actor->flags |= MF_SOLID;
 		actor->flags &= ~MF_NOCLIPTHING;
 	}
+
 	if (actor->flags & MF_SOLID)
 		P_CheckPosition(actor, actor->x, actor->y);
 }
@@ -10108,41 +10087,43 @@ void A_SpikeRetract(mobj_t *actor)
 //        else if var1 == 6, set actor to raisestate
 // var2 = unused
 //
-void A_InfoState(mobj_t *actor)
+void A_InfoState(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	switch (locvar1)
 	{
-	case 0:
-		if (actor->state != &states[actor->info->spawnstate])
-			P_SetMobjState(actor, actor->info->spawnstate);
-		break;
-	case 1:
-		if (actor->state != &states[actor->info->seestate])
-			P_SetMobjState(actor, actor->info->seestate);
-		break;
-	case 2:
-		if (actor->state != &states[actor->info->meleestate])
-			P_SetMobjState(actor, actor->info->meleestate);
-		break;
-	case 3:
-		if (actor->state != &states[actor->info->missilestate])
-			P_SetMobjState(actor, actor->info->missilestate);
-		break;
-	case 4:
-		if (actor->state != &states[actor->info->deathstate])
-			P_SetMobjState(actor, actor->info->deathstate);
-		break;
-	case 5:
-		if (actor->state != &states[actor->info->xdeathstate])
-			P_SetMobjState(actor, actor->info->xdeathstate);
-		break;
-	case 6:
-		if (actor->state != &states[actor->info->raisestate])
-			P_SetMobjState(actor, actor->info->raisestate);
-		break;
-	default:
-		break;
+		case 0:
+			if (actor->state != &states[actor->info->spawnstate])
+				P_SetMobjState(actor, actor->info->spawnstate);
+			break;
+		case 1:
+			if (actor->state != &states[actor->info->seestate])
+				P_SetMobjState(actor, actor->info->seestate);
+			break;
+		case 2:
+			if (actor->state != &states[actor->info->meleestate])
+				P_SetMobjState(actor, actor->info->meleestate);
+			break;
+		case 3:
+			if (actor->state != &states[actor->info->missilestate])
+				P_SetMobjState(actor, actor->info->missilestate);
+			break;
+		case 4:
+			if (actor->state != &states[actor->info->deathstate])
+				P_SetMobjState(actor, actor->info->deathstate);
+			break;
+		case 5:
+			if (actor->state != &states[actor->info->xdeathstate])
+				P_SetMobjState(actor, actor->info->xdeathstate);
+			break;
+		case 6:
+			if (actor->state != &states[actor->info->raisestate])
+				P_SetMobjState(actor, actor->info->raisestate);
+			break;
+		default:
+			break;
 	}
 }
 
@@ -10153,8 +10134,10 @@ void A_InfoState(mobj_t *actor)
 // var1 = repeat count
 // var2 = state to return to if extravalue2 > 0
 //
-void A_Repeat(mobj_t *actor)
+void A_Repeat(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 
@@ -10177,8 +10160,10 @@ void A_Repeat(mobj_t *actor)
 //        upper 16 bits: 0 = actor, 1 = target, 2 = tracer
 //        lower 16 bits: 0 = instant change, 1 = smooth change
 //
-void A_SetScale(mobj_t *actor)
+void A_SetScale(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *target;
@@ -10188,7 +10173,7 @@ void A_SetScale(mobj_t *actor)
 
 	if (locvar1 <= 0)
 	{
-		if(cv_debug)
+		if (cv_debug)
 			CONS_Printf("A_SetScale: Valid scale not specified!\n");
 		return;
 	}
@@ -10202,7 +10187,7 @@ void A_SetScale(mobj_t *actor)
 
 	if (!target)
 	{
-		if(cv_debug)
+		if (cv_debug)
 			CONS_Printf("A_SetScale: No target!\n");
 		return;
 	}
@@ -10221,8 +10206,10 @@ void A_SetScale(mobj_t *actor)
 // var1 = Mobj affected: 0 - actor, 1 - target, 2 - tracer
 // var2 = Action: 0 - Damage, 1 - Kill, 2 - Remove
 //
-void A_RemoteDamage(mobj_t *actor)
+void A_RemoteDamage(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *target; // we MUST have a target
@@ -10231,15 +10218,20 @@ void A_RemoteDamage(mobj_t *actor)
 	if (LUA_CallAction(A_REMOTEDAMAGE, actor))
 		return;
 
-	if (locvar1 == 1)
-		target = actor->target;
-	else if (locvar1 == 2)
-		target = actor->tracer;
-	else // default to yourself!
-		target = actor;
-
-	if (locvar1 == 1 || locvar1 == 2)
-		source = actor;
+	switch (locvar1)
+	{
+		case 1:
+			target = actor->target;
+			source = actor;
+			break;
+		case 2:
+			target = actor->tracer;
+			source = actor;
+			break;
+		default: // default to yourself!
+			target = actor;
+			break;
+	}
 
 	if (!target)
 	{
@@ -10248,22 +10240,24 @@ void A_RemoteDamage(mobj_t *actor)
 		return;
 	}
 
-	if (locvar2 == 1) // Kill mobj!
+	switch (locvar2)
 	{
-		if (target->player) // players die using P_DamageMobj instead for some reason
-			P_DamageMobj(target, source, source, 10000);
-		else
-			P_KillMobj(target, source, source);
-	}
-	else if (locvar2 == 2) // Remove mobj!
-	{
-		if (target->player) //don't remove players!
-			return;
+		case 1: // Kill mobj!
+			if (target->player) // players die using P_DamageMobj instead for some reason
+				P_DamageMobj(target, source, source, DMG_INSTAKILL);
+			else
+				P_KillMobj(target, source, source);
+			break;
+		case 2: // Remove mobj!
+			if (target->player) //don't remove players!
+				return;
 
-		P_RemoveMobj(target);
+			P_RemoveMobj(target);
+			break;
+		default: // default: Damage mobj!
+			P_DamageMobj(target, source, source, 1);
+			break;
 	}
-	else // default: Damage mobj!
-		P_DamageMobj(target, source, source, 1);
 }
 
 // Function: A_HomingChase
@@ -10273,8 +10267,10 @@ void A_RemoteDamage(mobj_t *actor)
 // var1 = speed multiple
 // var2 = destination: 0 = target, 1 = tracer
 //
-void A_HomingChase(mobj_t *actor)
+void A_HomingChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *dest;
@@ -10317,8 +10313,10 @@ void A_HomingChase(mobj_t *actor)
 //        lower 16 bits = vertical angle
 //        upper 16 bits = height offset
 //
-void A_TrapShot(mobj_t *actor)
+void A_TrapShot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	angle_t vertang = FixedAngle(((INT16)(locvar2 & 65535))*FRACUNIT);
@@ -10374,8 +10372,10 @@ void A_TrapShot(mobj_t *actor)
 // var1 = mobj to spawn
 // var2 = If 0, target only the actor's target. Else, target every player, period.
 //
-void A_VileTarget(mobj_t *actor)
+void A_VileTarget(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *fog;
@@ -10423,16 +10423,13 @@ void A_VileTarget(mobj_t *actor)
 			if (!playeringame[i] || players[i].spectator)
 				continue;
 
-			if (!players[i].mo)
+			if (!players[i].mo || !players[i].mo->health)
 				continue;
 
-			if (!players[i].mo->health)
-				continue;
+			fog = P_SpawnMobj(players[i].mo->x, players[i].mo->y,
+							 players[i].mo->z + ((players[i].mo->eflags & MFE_VERTICALFLIP) ? players[i].mo->height - mobjinfo[fogtype].height : 0),
+							 fogtype);
 
-			fog = P_SpawnMobj(players[i].mo->x,
-							players[i].mo->y,
-							players[i].mo->z + ((players[i].mo->eflags & MFE_VERTICALFLIP) ? players[i].mo->height - mobjinfo[fogtype].height : 0),
-							fogtype);
 			if (players[i].mo->eflags & MFE_VERTICALFLIP)
 			{
 				fog->eflags |= MFE_VERTICALFLIP;
@@ -10460,8 +10457,10 @@ void A_VileTarget(mobj_t *actor)
 //		Lower 16 bits = optional explosion object
 //		Upper 16 bits = If 0, attack only the actor's target. Else, attack all the players. All of them.
 //
-void A_VileAttack(mobj_t *actor)
+void A_VileAttack(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	sfxenum_t soundtoplay;
@@ -10487,7 +10486,8 @@ void A_VileAttack(mobj_t *actor)
 		explosionType = (mobjtype_t)(locvar2 & 0xFFFF);
 	}
 
-	if (!(locvar2 & 0xFFFF0000)) {
+	if (!(locvar2 & 0xFFFF0000))
+	{
 		if (!P_CheckSight(actor, actor->target))
 			return;
 
@@ -10523,10 +10523,7 @@ void A_VileAttack(mobj_t *actor)
 			if (!playeringame[i] || players[i].spectator)
 				continue;
 
-			if (!players[i].mo)
-				continue;
-
-			if (!players[i].mo->health)
+			if (!players[i].mo || !players[i].mo->health)
 				continue;
 
 			if (!P_CheckSight(actor, players[i].mo))
@@ -10561,7 +10558,6 @@ void A_VileAttack(mobj_t *actor)
 			P_RadiusAttack(fire, actor, 70*FRACUNIT);
 		}
 	}
-
 }
 
 // Function: A_VileFire
@@ -10575,8 +10571,10 @@ void A_VileAttack(mobj_t *actor)
 //		Lower 16 bits = mobj to spawn (0 doesn't spawn a line at all)
 //		Upper 16 bits = # to spawn (default is 8)
 //
-void A_VileFire(mobj_t *actor)
+void A_VileFire(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 locvar1 = var1;
 	INT32 locvar2 = var2;
 	mobj_t *dest;
@@ -10628,9 +10626,9 @@ void A_VileFire(mobj_t *actor)
 
 		lineMobj = (mobjtype_t)(locvar2 & 0xFFFF);
 		numLineMobjs = (UINT16)(locvar2 >> 16);
-		if (numLineMobjs == 0) {
+
+		if (numLineMobjs == 0)
 			numLineMobjs = 8;
-		}
 
 		// Get distance for each step
 		distX = (actor->target->x - actor->x) / numLineMobjs;
@@ -10659,8 +10657,10 @@ void A_VileFire(mobj_t *actor)
 // var1 = lower-bound of frame length, in tics
 // var2 = optional sound to play
 //
-void A_BrakChase(mobj_t *actor)
+void A_BrakChase(void *thing)
 {
+	mobj_t *actor = thing;
+
 	INT32 delta;
 	INT32 lowerbound;
 	INT32 newtics;
@@ -10782,8 +10782,10 @@ void A_BrakChase(mobj_t *actor)
 // var1 = object # to shoot
 // var2 = unused
 //
-void A_BrakFireShot(mobj_t *actor)
+void A_BrakFireShot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t x, y, z;
 	INT32 locvar1 = var1;
 
@@ -10801,6 +10803,7 @@ void A_BrakFireShot(mobj_t *actor)
 	y = actor->y
 		+ P_ReturnThrustY(actor, actor->angle, FixedMul(64*FRACUNIT, actor->scale))
 		+ P_ReturnThrustY(actor, actor->angle+ANGLE_270, FixedMul(32*FRACUNIT, actor->scale));
+
 	if (actor->eflags & MFE_VERTICALFLIP)
 		z = actor->z + actor->height - FixedMul(144*FRACUNIT, actor->scale);
 	else
@@ -10830,8 +10833,10 @@ void A_BrakFireShot(mobj_t *actor)
 //		Upper 16 bits: if 0, aim 1/3 of the way. Else, aim directly at target.
 //
 
-void A_BrakLobShot(mobj_t *actor)
+void A_BrakLobShot(void *thing)
 {
+	mobj_t *actor = thing;
+
 	fixed_t v; // Velocity to shoot object
 	fixed_t a1, a2, aToUse; // Velocity squared
 	fixed_t g; // Gravity
@@ -10864,6 +10869,7 @@ void A_BrakLobShot(mobj_t *actor)
 
 	// Look up distance between actor and its target
 	x = P_AproxDistance(actor->target->x - actor->x, actor->target->y - actor->y);
+
 	if (!aimDirect)
 	{
 		// Distance should actually be a third of the way over
@@ -10944,8 +10950,10 @@ void A_BrakLobShot(mobj_t *actor)
 //		Lower 16 bits: distance to toss them (No default - 0 does just that - but negatives will revert to 128)
 //		Upper 16 bits: airtime in tics (default 16)
 //
-void A_NapalmScatter(mobj_t *actor)
+void A_NapalmScatter(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobjtype_t typeOfShot = var1 & 0x0000FFFF; // Type
 	INT32 numToShoot = (var1 & 0xFFFF0000) >> 16; // How many
 	fixed_t distance = (var2 & 0x0000FFFF) << FRACBITS; // How far
@@ -10982,7 +10990,7 @@ void A_NapalmScatter(mobj_t *actor)
 	// vx = distance/airtime
 	vx = FixedDiv(distance, airtime);
 
-	for (i = 0; i<numToShoot; i++)
+	for (i = 0; i < numToShoot; i++)
 	{
 		const angle_t fa = (i*FINEANGLES/numToShoot) & FINEMASK;
 
@@ -11004,8 +11012,10 @@ void A_NapalmScatter(mobj_t *actor)
 // var1 = unused
 // var2 = unused
 //
-void A_SpawnFreshCopy(mobj_t *actor)
+void A_SpawnFreshCopy(void *thing)
 {
+	mobj_t *actor = thing;
+
 	mobj_t *newObject;
 
 	if (LUA_CallAction(A_SPAWNFRESHCOPY, actor))
diff --git a/src/p_floor.c b/src/p_floor.c
index bebc9a272..86447c5ba 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -327,7 +327,7 @@ void T_MoveFloor(floormove_t *movefloor)
 					movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
 					movefloor->sector->floorspeed = movefloor->speed * movefloor->direction;
 					movefloor->delaytimer = movefloor->delay;
-					P_RecalcPrecipInSector(movefloor->sector);
+					movefloor->sector->moved = true;
 					return; // not break, why did this work? Graue 04-03-2004
 				case bounceFloorCrush: // Graue 03-27-2004
 					if (movefloor->floordestheight == lines[movefloor->texture].frontsector->floorheight)
@@ -343,14 +343,14 @@ void T_MoveFloor(floormove_t *movefloor)
 					movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
 					movefloor->sector->floorspeed = movefloor->speed * movefloor->direction;
 					movefloor->delaytimer = movefloor->delay;
-					P_RecalcPrecipInSector(movefloor->sector);
+					movefloor->sector->moved = true;
 					return; // not break, why did this work? Graue 04-03-2004
 				case crushFloorOnce:
 					movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight;
 					movefloor->direction = -1;
 					movefloor->sector->soundorg.z = movefloor->sector->floorheight;
 					S_StartSound(&movefloor->sector->soundorg,sfx_pstop);
-					P_RecalcPrecipInSector(movefloor->sector);
+					movefloor->sector->moved = true;
 					return;
 				default:
 					break;
@@ -376,7 +376,7 @@ void T_MoveFloor(floormove_t *movefloor)
 					movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
 					movefloor->sector->floorspeed = movefloor->speed * movefloor->direction;
 					movefloor->delaytimer = movefloor->delay;
-					P_RecalcPrecipInSector(movefloor->sector);
+					movefloor->sector->moved = true;
 					return; // not break, why did this work? Graue 04-03-2004
 				case bounceFloorCrush: // Graue 03-27-2004
 					if (movefloor->floordestheight == lines[movefloor->texture].frontsector->floorheight)
@@ -392,13 +392,13 @@ void T_MoveFloor(floormove_t *movefloor)
 					movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
 					movefloor->sector->floorspeed = movefloor->speed * movefloor->direction;
 					movefloor->delaytimer = movefloor->delay;
-					P_RecalcPrecipInSector(movefloor->sector);
+					movefloor->sector->moved = true;
 					return; // not break, why did this work? Graue 04-03-2004
 				case crushFloorOnce:
 					movefloor->sector->floordata = NULL; // Clear up the thinker so others can use it
 					P_RemoveThinker(&movefloor->thinker);
 					movefloor->sector->floorspeed = 0;
-					P_RecalcPrecipInSector(movefloor->sector);
+					movefloor->sector->moved = true;
 					return;
 				default:
 					break;
@@ -415,7 +415,7 @@ void T_MoveFloor(floormove_t *movefloor)
 	else
 		movefloor->sector->floorspeed = 0;
 
-	P_RecalcPrecipInSector(movefloor->sector);
+	movefloor->sector->moved = true;
 }
 
 //
@@ -452,25 +452,16 @@ void T_MoveElevator(elevator_t *elevator)
 			const fixed_t dh = abs(elevator->sector->floorheight - elevator->floordestheight);
 
 			// Slow down when reaching destination Tails 12-06-2000
-			if (wh < dh)
-				elevator->speed = FixedDiv(wh,25*FRACUNIT) + FRACUNIT/4;
-			else
-				elevator->speed = FixedDiv(dh,25*FRACUNIT) + FRACUNIT/4;
+			elevator->speed = FixedDiv(((wh < dh) ? wh : dh), 25*FRACUNIT) + FRACUNIT/4;
 
 			if (elevator->origspeed)
 			{
-				elevator->speed = FixedMul(elevator->speed,origspeed);
-				if (elevator->speed > elevator->origspeed)
-					elevator->speed = (elevator->origspeed);
-				if (elevator->speed < 1)
-					elevator->speed = 1;
+				elevator->speed = FixedMul(elevator->speed, origspeed);
+				elevator->speed = CLAMP(elevator->speed, 1, elevator->origspeed);
 			}
 			else
 			{
-				if (elevator->speed > 3*FRACUNIT)
-					elevator->speed = 3*FRACUNIT;
-				if (elevator->speed < 1)
-					elevator->speed = 1;
+				elevator->speed = CLAMP(elevator->speed, 1, 3*FRACUNIT);
 			}
 		}
 
@@ -513,26 +504,18 @@ void T_MoveElevator(elevator_t *elevator)
 			const fixed_t origspeed = FixedDiv(elevator->origspeed,(ELEVATORSPEED/2));
 			const fixed_t wc = abs(elevator->sector->ceilingheight - elevator->ceilingwasheight);
 			const fixed_t dc = abs(elevator->sector->ceilingheight - elevator->ceilingdestheight);
+
 			// Slow down when reaching destination Tails 12-06-2000
-			if (wc < dc)
-				elevator->speed = FixedDiv(wc,25*FRACUNIT) + FRACUNIT/4;
-			else
-				elevator->speed = FixedDiv(dc,25*FRACUNIT) + FRACUNIT/4;
+			elevator->speed = FixedDiv(((wc < dc) ? wc : dc), 25*FRACUNIT) + FRACUNIT/4;
 
 			if (elevator->origspeed)
 			{
-				elevator->speed = FixedMul(elevator->speed,origspeed);
-				if (elevator->speed > elevator->origspeed)
-					elevator->speed = (elevator->origspeed);
-				if (elevator->speed < 1)
-					elevator->speed = 1;
+				elevator->speed = FixedMul(elevator->speed, origspeed);
+				elevator->speed = CLAMP(elevator->speed, 1, elevator->origspeed);
 			}
 			else
 			{
-				if (elevator->speed > 3*FRACUNIT)
-					elevator->speed = 3*FRACUNIT;
-				if (elevator->speed < 1)
-					elevator->speed = 1;
+				elevator->speed = CLAMP(elevator->speed, 1, 3*FRACUNIT);
 			}
 		}
 
@@ -571,11 +554,7 @@ void T_MoveElevator(elevator_t *elevator)
 		else
 			res = res1;
 	}
-/*
-	// make floor move sound
-	if (!(leveltime&7))
-		S_StartSound(&elevator->sector->soundorg, sfx_stnmov);
-*/
+
 	if (res == pastdest || res == crushed)            // if destination height acheived
 	{
 		if (elevator->type == elevateContinuous)
@@ -608,7 +587,6 @@ void T_MoveElevator(elevator_t *elevator)
 					elevator->ceilingdestheight =
 						elevator->floordestheight + elevator->sector->ceilingheight - elevator->sector->floorheight;
 				}
-//				T_MoveElevator(elevator);
 			}
 			else
 			{
@@ -638,7 +616,6 @@ void T_MoveElevator(elevator_t *elevator)
 					elevator->ceilingdestheight =
 						elevator->floordestheight + elevator->sector->ceilingheight - elevator->sector->floorheight;
 				}
-//				T_MoveElevator(elevator);
 			}
 			elevator->delaytimer = elevator->delay;
 		}
@@ -651,9 +628,8 @@ void T_MoveElevator(elevator_t *elevator)
 			P_RemoveThinker(&elevator->thinker);    // remove elevator from actives
 			dontupdate = true;
 		}
-		// make floor stop sound
-		// S_StartSound(&elevator->sector->soundorg, sfx_pstop);
 	}
+
 	if (!dontupdate)
 	{
 		elevator->sector->floorspeed = elevator->speed*elevator->direction;
@@ -817,7 +793,6 @@ void T_BounceCheese(levelspecthink_t *bouncer)
 			bouncer->sector->floorheight = bouncer->sector->ceilingheight - (halfheight*2);
 			T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling
 			T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
-			P_RecalcPrecipInSector(actionsector);
 			bouncer->sector->ceilingdata = NULL;
 			bouncer->sector->floordata = NULL;
 			bouncer->sector->floorspeed = 0;
@@ -833,7 +808,6 @@ void T_BounceCheese(levelspecthink_t *bouncer)
 			bouncer->sector->floorheight = floorheight;
 			T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling
 			T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
-			P_RecalcPrecipInSector(actionsector);
 			bouncer->sector->ceilingdata = NULL;
 			bouncer->sector->floordata = NULL;
 			bouncer->sector->floorspeed = 0;
@@ -913,9 +887,6 @@ void T_BounceCheese(levelspecthink_t *bouncer)
 
 		if (bouncer->distance > 0)
 			bouncer->distance--;
-
-		if (actionsector)
-			P_RecalcPrecipInSector(actionsector);
 	}
 #undef speed
 #undef distance
@@ -1102,7 +1073,6 @@ void T_StartCrumble(elevator_t *elevator)
 	{
 		sector = &sectors[i];
 		sector->moved = true;
-		P_RecalcPrecipInSector(sector);
 	}
 }
 
@@ -1156,7 +1126,7 @@ void T_MarioBlock(levelspecthink_t *block)
 	}
 
 	for (i = -1; (i = P_FindSectorFromTag((INT16)block->vars[0], i)) >= 0 ;)
-		P_RecalcPrecipInSector(&sectors[i]);
+		sectors[i].moved = true;
 
 #undef speed
 #undef direction
@@ -1272,7 +1242,7 @@ void T_FloatSector(levelspecthink_t *floater)
 		else if (floater->sector->crumblestate == 0 || floater->sector->crumblestate >= 3/* || floatanyway*/)
 			EV_BounceSector(floater->sector, FRACUNIT, floater->sourceline);
 
-		P_RecalcPrecipInSector(actionsector);
+		actionsector->moved = true;
 	}
 }
 
@@ -1974,7 +1944,7 @@ void T_ThwompSector(levelspecthink_t *thwomp)
 		thwomp->sector->floorspeed = 0;
 	}
 
-	P_RecalcPrecipInSector(actionsector);
+	actionsector->moved = true;
 #undef speed
 #undef direction
 #undef distance
@@ -2119,10 +2089,11 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
 		sec = &sectors[secnum];
 
 		FOFsector = false;
+		const INT32 secspecial = GETSECSPECIAL(sec->special, 2);
 
-		if (GETSECSPECIAL(sec->special, 2) == 3 || GETSECSPECIAL(sec->special, 2) == 5)
+		if (secspecial == 3 || secspecial == 5)
 			floortouch = true;
-		else if (GETSECSPECIAL(sec->special, 2) >= 1 && GETSECSPECIAL(sec->special, 2) <= 8)
+		else if (secspecial >= 1 && secspecial <= 8)
 			floortouch = false;
 		else
 			continue;
@@ -2159,10 +2130,7 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
 					if (!playeringame[j])
 						continue;
 
-					if (!players[j].mo)
-						continue;
-
-					if (players[j].mo->health <= 0)
+					if (!players[j].mo || (players[j].mo->health <= 0))
 						continue;
 
 					if ((netgame || multiplayer) && players[j].spectator)
@@ -2173,6 +2141,7 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
 					else if (sec->flags & SF_TRIGGERSPECIAL_TOUCH)
 					{
 						boolean insector = false;
+
 						for (node = players[j].mo->touching_sectorlist; node; node = node->m_sectorlist_next)
 						{
 							if (node->m_sector == targetsec)
@@ -2181,6 +2150,7 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
 								break;
 							}
 						}
+
 						if (!insector)
 							continue;
 					}
@@ -2225,10 +2195,7 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
 				if (!playeringame[i])
 					continue;
 
-				if (!players[i].mo)
-					continue;
-
-				if (players[i].mo->health <= 0)
+				if (!players[i].mo || (players[i].mo->health <= 0))
 					continue;
 
 				if ((netgame || multiplayer) && players[i].spectator)
@@ -2239,6 +2206,7 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
 				else if (sec->flags & SF_TRIGGERSPECIAL_TOUCH)
 				{
 					boolean insector = false;
+
 					for (node = players[i].mo->touching_sectorlist; node; node = node->m_sectorlist_next)
 					{
 						if (node->m_sector == sec)
@@ -2247,6 +2215,7 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
 							break;
 						}
 					}
+
 					if (!insector)
 						continue;
 				}
@@ -2254,7 +2223,7 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
 					continue;
 
 				if (!(players[i].mo->subsector->sector == sec
-					|| P_PlayerTouchingSectorSpecial(&players[i], 2, (GETSECSPECIAL(sec->special, 2))) == sec))
+					|| P_PlayerTouchingSectorSpecial(&players[i], 2, GETSECSPECIAL(sec->special, 2)) == sec))
 					continue;
 
 				if (floortouch == true && P_IsObjectOnRealGround(players[i].mo, sec))
@@ -2298,17 +2267,16 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
 
 	while ((affectPlayer = P_HavePlayersEnteredArea(playersArea, oldPlayersArea, inAndOut)) != -1)
 	{
-		if (GETSECSPECIAL(sec->special, 2) == 2 || GETSECSPECIAL(sec->special, 2) == 3)
+		const INT32 secspecial = GETSECSPECIAL(sec->special, 2);
+
+		if (secspecial == 2 || secspecial == 3)
 		{
 			for (i = 0; i < MAXPLAYERS; i++)
 			{
 				if (!playeringame[i])
 					continue;
 
-				if (!players[i].mo)
-					continue;
-
-				if (players[i].mo->health <= 0)
+				if (!players[i].mo || (players[i].mo->health <= 0))
 					continue;
 
 				if ((netgame || multiplayer) && players[i].spectator)
@@ -2362,11 +2330,7 @@ void T_RaiseSector(levelspecthink_t *raise)
 		{
 			thing = node->m_thing;
 
-			if (!thing->player)
-				continue;
-
-			// Ignore spectators.
-			if (thing->player && thing->player->spectator)
+			if (!thing->player || thing->player->spectator) // Ignore spectators.
 				continue;
 
 			// Option to require spindashing.
@@ -2500,130 +2464,51 @@ void T_RaiseSector(levelspecthink_t *raise)
 	raise->sector->floorspeed = raise->vars[3]*raise->vars[8];
 
 	for (i = -1; (i = P_FindSectorFromTag(raise->sourceline->tag, i)) >= 0 ;)
-		P_RecalcPrecipInSector(&sectors[i]);
+		sectors[i].moved = true;
 }
 
 void T_CameraScanner(elevator_t *elevator)
 {
 	// leveltime is compared to make multiple scanners in one map function correctly.
 	static tic_t lastleveltime = 32000; // any number other than 0 should do here
-	static boolean camerascanned, camerascanned2, camerascanned3, camerascanned4;
+	static boolean camerascanned[MAXSPLITSCREENPLAYERS];
+	static fixed_t t_cam_dist[MAXSPLITSCREENPLAYERS] = {-42, -42, -42, -42};
+	static fixed_t t_cam_height[MAXSPLITSCREENPLAYERS] = {-42, -42, -42, -42};
 
 	if (leveltime != lastleveltime) // Back on the first camera scanner
 	{
-		camerascanned = camerascanned2 = camerascanned3 = camerascanned4 = false;
+		memset(camerascanned, false, sizeof (camerascanned));
 		lastleveltime = leveltime;
 	}
 
-	if (players[displayplayers[0]].mo)
+	for (UINT8 i = 0; i <= splitscreen; i++)
 	{
-		if (players[displayplayers[0]].mo->subsector->sector == elevator->actionsector)
-		{
-			if (t_cam_dist == -42)
-				t_cam_dist = cv_cam_dist.value;
-			if (t_cam_height == -42)
-				t_cam_height = cv_cam_height.value;
-			if (t_cam_rotate == -42)
-				t_cam_rotate = cv_cam_rotate.value;
-			CV_SetValue(&cv_cam_height, FixedInt(elevator->sector->floorheight));
-			CV_SetValue(&cv_cam_dist, FixedInt(elevator->sector->ceilingheight));
-			CV_SetValue(&cv_cam_rotate, elevator->distance);
-			camerascanned = true;
-		}
-		else if (!camerascanned)
-		{
-			if (t_cam_height != -42 && cv_cam_height.value != t_cam_height)
-				CV_Set(&cv_cam_height, va("%f", (double)FIXED_TO_FLOAT(t_cam_height)));
-			if (t_cam_dist != -42 && cv_cam_dist.value != t_cam_dist)
-				CV_Set(&cv_cam_dist, va("%f", (double)FIXED_TO_FLOAT(t_cam_dist)));
-			if (t_cam_rotate != -42 && cv_cam_rotate.value != t_cam_rotate)
-				CV_Set(&cv_cam_rotate, va("%f", (double)t_cam_rotate));
+		if (P_MobjWasRemoved(players[displayplayers[i]].mo))
+			continue;
 
-			t_cam_dist = t_cam_height = t_cam_rotate = -42;
-		}
-	}
-
-	if (splitscreen && players[displayplayers[1]].mo)
-	{
-		if (players[displayplayers[1]].mo->subsector->sector == elevator->actionsector)
+		if (players[displayplayers[i]].mo->subsector->sector == elevator->actionsector)
 		{
-			if (t_cam2_rotate == -42)
-				t_cam2_dist = cv_cam2_dist.value;
-			if (t_cam2_rotate == -42)
-				t_cam2_height = cv_cam2_height.value;
-			if (t_cam2_rotate == -42)
-				t_cam2_rotate = cv_cam2_rotate.value;
-			CV_SetValue(&cv_cam2_height, FixedInt(elevator->sector->floorheight));
-			CV_SetValue(&cv_cam2_dist, FixedInt(elevator->sector->ceilingheight));
-			CV_SetValue(&cv_cam2_rotate, elevator->distance);
-			camerascanned2 = true;
+			if (t_cam_dist[i] == -42)
+				t_cam_dist[i] = cv_cam_dist[i].value;
+			if (t_cam_height[i] == -42)
+				t_cam_height[i] = cv_cam_height[i].value;
+			if (t_cam_rotate[i] == -42)
+				t_cam_rotate[i] = cv_cam_rotate[i].value;
+			CV_SetValue(&cv_cam_height[i], FixedInt(elevator->sector->floorheight));
+			CV_SetValue(&cv_cam_dist[i], FixedInt(elevator->sector->ceilingheight));
+			CV_SetValue(&cv_cam_rotate[i], elevator->distance);
+			camerascanned[i] = true;
 		}
-		else if (!camerascanned2)
+		else if (!camerascanned[i])
 		{
-			if (t_cam2_height != -42 && cv_cam2_height.value != t_cam2_height)
-				CV_Set(&cv_cam2_height, va("%f", (double)FIXED_TO_FLOAT(t_cam2_height)));
-			if (t_cam2_dist != -42 && cv_cam2_dist.value != t_cam2_dist)
-				CV_Set(&cv_cam2_dist, va("%f", (double)FIXED_TO_FLOAT(t_cam2_dist)));
-			if (t_cam2_rotate != -42 && cv_cam2_rotate.value != t_cam2_rotate)
-				CV_Set(&cv_cam2_rotate, va("%f", (double)t_cam2_rotate));
+			if (t_cam_height[i] != -42 && cv_cam_height[i].value != t_cam_height[i])
+				CV_Set(&cv_cam_height[i], va("%f", (double)FIXED_TO_FLOAT(t_cam_height[i])));
+			if (t_cam_dist[i] != -42 && cv_cam_dist[i].value != t_cam_dist[i])
+				CV_Set(&cv_cam_dist[i], va("%f", (double)FIXED_TO_FLOAT(t_cam_dist[i])));
+			if (t_cam_rotate[i] != -42 && cv_cam_rotate[i].value != t_cam_rotate[i])
+				CV_Set(&cv_cam_rotate[i], va("%f", (double)t_cam_rotate[i]));
 
-			t_cam2_dist = t_cam2_height = t_cam2_rotate = -42;
-		}
-	}
-
-	if (splitscreen > 1 && players[displayplayers[2]].mo)
-	{
-		if (players[displayplayers[2]].mo->subsector->sector == elevator->actionsector)
-		{
-			if (t_cam3_rotate == -42)
-				t_cam3_dist = cv_cam3_dist.value;
-			if (t_cam3_rotate == -42)
-				t_cam3_height = cv_cam3_height.value;
-			if (t_cam3_rotate == -42)
-				t_cam3_rotate = cv_cam3_rotate.value;
-			CV_SetValue(&cv_cam3_height, FixedInt(elevator->sector->floorheight));
-			CV_SetValue(&cv_cam3_dist, FixedInt(elevator->sector->ceilingheight));
-			CV_SetValue(&cv_cam3_rotate, elevator->distance);
-			camerascanned3 = true;
-		}
-		else if (!camerascanned3)
-		{
-			if (t_cam3_height != -42 && cv_cam3_height.value != t_cam3_height)
-				CV_Set(&cv_cam3_height, va("%f", (double)FIXED_TO_FLOAT(t_cam3_height)));
-			if (t_cam3_dist != -42 && cv_cam3_dist.value != t_cam3_dist)
-				CV_Set(&cv_cam3_dist, va("%f", (double)FIXED_TO_FLOAT(t_cam3_dist)));
-			if (t_cam3_rotate != -42 && cv_cam3_rotate.value != t_cam3_rotate)
-				CV_Set(&cv_cam3_rotate, va("%f", (double)t_cam3_rotate));
-
-			t_cam3_dist = t_cam3_height = t_cam3_rotate = -42;
-		}
-	}
-
-	if (splitscreen > 2 && players[displayplayers[3]].mo)
-	{
-		if (players[displayplayers[3]].mo->subsector->sector == elevator->actionsector)
-		{
-			if (t_cam4_rotate == -42)
-				t_cam4_dist = cv_cam4_dist.value;
-			if (t_cam4_rotate == -42)
-				t_cam4_height = cv_cam4_height.value;
-			if (t_cam4_rotate == -42)
-				t_cam4_rotate = cv_cam4_rotate.value;
-			CV_SetValue(&cv_cam4_height, FixedInt(elevator->sector->floorheight));
-			CV_SetValue(&cv_cam4_dist, FixedInt(elevator->sector->ceilingheight));
-			CV_SetValue(&cv_cam4_rotate, elevator->distance);
-			camerascanned4 = true;
-		}
-		else if (!camerascanned4)
-		{
-			if (t_cam4_height != -42 && cv_cam4_height.value != t_cam4_height)
-				CV_Set(&cv_cam4_height, va("%f", (double)FIXED_TO_FLOAT(t_cam4_height)));
-			if (t_cam4_dist != -42 && cv_cam4_dist.value != t_cam4_dist)
-				CV_Set(&cv_cam4_dist, va("%f", (double)FIXED_TO_FLOAT(t_cam4_dist)));
-			if (t_cam4_rotate != -42 && cv_cam4_rotate.value != t_cam4_rotate)
-				CV_Set(&cv_cam4_rotate, va("%f", (double)t_cam4_rotate));
-
-			t_cam4_dist = t_cam4_height = t_cam4_rotate = -42;
+			t_cam_dist[i] = t_cam_height[i] = t_cam_rotate[i] = -42;
 		}
 	}
 }
@@ -2660,7 +2545,7 @@ INT32 EV_DoFloor(line_t *line, floor_e floortype)
 		sec->floordata = dofloor;
 
 		// set up some generic aspects of the floormove_t
-		dofloor->thinker.function.acp1 = (actionf_p1)T_MoveFloor;
+		dofloor->thinker.function = (actionf_p1)T_MoveFloor;
 		dofloor->type = floortype;
 		dofloor->crush = false; // default: types that crush will change this
 		dofloor->sector = sec;
@@ -2881,7 +2766,7 @@ INT32 EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
 		P_AddThinker(&elevator->thinker);
 		sec->floordata = elevator;
 		sec->ceilingdata = elevator;
-		elevator->thinker.function.acp1 = (actionf_p1)T_MoveElevator;
+		elevator->thinker.function = (actionf_p1)T_MoveElevator;
 		elevator->type = elevtype;
 		elevator->sourceline = line;
 		elevator->distance = 1; // Always crush unless otherwise
@@ -2996,14 +2881,16 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
 	fixed_t a, b, c;
 	mobjtype_t type = MT_ROCKCRUMBLE1;
 	const fixed_t spacing = 48*mapobjectscale;
+	const INT32 secspecial = GETSECSPECIAL(rover->master->frontsector->special, 3);
 
 	// If the control sector has a special
 	// of Section3:7-15, use the custom debris.
-	if (GETSECSPECIAL(rover->master->frontsector->special, 3) >= 8)
-		type = MT_ROCKCRUMBLE1+(GETSECSPECIAL(rover->master->frontsector->special, 3)-7);
+	if (secspecial >= 8)
+		type = MT_ROCKCRUMBLE1+(secspecial-7);
 
 	// soundorg z height never gets set normally, so MEH.
 	sec->soundorg.z = sec->floorheight;
+	//sec->soundorg.z = (rover->master->frontsector->floorheight + rover->master->frontsector->ceilingheight)/2; // actual accurate z but well smth smth synchsafe
 	S_StartSound(&sec->soundorg, sfx_crumbl);
 
 	// Find the outermost vertexes in the subsector
@@ -3036,6 +2923,7 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
 			if (R_PointInSubsector(a, b)->sector == sec)
 			{
 				mobj_t *spawned = NULL;
+
 				for (c = topz; c > *rover->bottomheight; c -= spacing)
 				{
 					spawned = P_SpawnMobj(a, b, c, type);
@@ -3066,7 +2954,7 @@ INT32 EV_BounceSector(sector_t *sec, fixed_t momz, line_t *sourceline)
 	bouncer = Z_Calloc(sizeof (*bouncer), PU_LEVSPEC, NULL);
 	P_AddThinker(&bouncer->thinker);
 	sec->ceilingdata = bouncer;
-	bouncer->thinker.function.acp1 = (actionf_p1)T_BounceCheese;
+	bouncer->thinker.function = (actionf_p1)T_BounceCheese;
 
 	// set up the fields according to the type of elevator action
 	bouncer->sector = sec;
@@ -3103,7 +2991,7 @@ INT32 EV_DoContinuousFall(sector_t *sec, sector_t *backsector, fixed_t spd, bool
 	// create and initialize new thinker
 	faller = Z_Calloc(sizeof (*faller), PU_LEVSPEC, NULL);
 	P_AddThinker(&faller->thinker);
-	faller->thinker.function.acp1 = (actionf_p1)T_ContinuousFalling;
+	faller->thinker.function = (actionf_p1)T_ContinuousFalling;
 
 	// set up the fields
 	faller->sector = sec;
@@ -3156,7 +3044,7 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating,
 	// create and initialize new elevator thinker
 	elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL);
 	P_AddThinker(&elevator->thinker);
-	elevator->thinker.function.acp1 = (actionf_p1)T_StartCrumble;
+	elevator->thinker.function = (actionf_p1)T_StartCrumble;
 
 	// Does this crumbler return?
 	if (crumblereturn)
@@ -3200,7 +3088,6 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating,
 	for (i = -1; (i = P_FindSectorFromTag(elevator->sourceline->tag, i)) >= 0 ;)
 	{
 		foundsec = &sectors[i];
-
 		P_SpawnMobj(foundsec->soundorg.x, foundsec->soundorg.y, elevator->direction == 1 ? elevator->sector->floorheight : elevator->sector->ceilingheight, MT_CRUMBLEOBJ);
 	}
 
@@ -3236,7 +3123,7 @@ INT32 EV_MarioBlock(sector_t *sec, sector_t *roversector, fixed_t topheight, mob
 		P_AddThinker(&block->thinker);
 		sec->floordata = block;
 		sec->ceilingdata = block;
-		block->thinker.function.acp1 = (actionf_p1)T_MarioBlock;
+		block->thinker.function = (actionf_p1)T_MarioBlock;
 
 		// Set up the fields
 		block->sector = sec;
diff --git a/src/p_inter.c b/src/p_inter.c
index 90bb3f8da..5412d3eec 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -37,62 +37,6 @@
 #define CTFTEAMCODE(pl) pl->ctfteam ? (pl->ctfteam == 1 ? "\x85" : "\x84") : ""
 #define CTFTEAMENDCODE(pl) pl->ctfteam ? "\x80" : ""
 
-void P_ForceFeed(const player_t *player, INT32 attack, INT32 fade, tic_t duration, INT32 period)
-{
-	BasicFF_t Basicfeed;
-	if (!player)
-		return;
-	Basicfeed.Duration = (UINT32)(duration * (100L/TICRATE));
-	Basicfeed.ForceX = Basicfeed.ForceY = 1;
-	Basicfeed.Gain = 25000;
-	Basicfeed.Magnitude = period*10;
-	Basicfeed.player = player;
-	/// \todo test FFB
-	P_RampConstant(&Basicfeed, attack, fade);
-}
-
-void P_ForceConstant(const BasicFF_t *FFInfo)
-{
-	JoyFF_t ConstantQuake;
-	if (!FFInfo || !FFInfo->player)
-		return;
-	ConstantQuake.ForceX    = FFInfo->ForceX;
-	ConstantQuake.ForceY    = FFInfo->ForceY;
-	ConstantQuake.Duration  = FFInfo->Duration;
-	ConstantQuake.Gain      = FFInfo->Gain;
-	ConstantQuake.Magnitude = FFInfo->Magnitude;
-	if (FFInfo->player == &players[consoleplayer])
-		I_Tactile(ConstantForce, &ConstantQuake);
-	else if (splitscreen && FFInfo->player == &players[displayplayers[1]])
-		I_Tactile2(ConstantForce, &ConstantQuake);
-	else if (splitscreen > 1 && FFInfo->player == &players[displayplayers[2]])
-		I_Tactile3(ConstantForce, &ConstantQuake);
-	else if (splitscreen > 2 && FFInfo->player == &players[displayplayers[3]])
-		I_Tactile4(ConstantForce, &ConstantQuake);
-}
-void P_RampConstant(const BasicFF_t *FFInfo, INT32 Start, INT32 End)
-{
-	JoyFF_t RampQuake;
-	if (!FFInfo || !FFInfo->player)
-		return;
-	RampQuake.ForceX    = FFInfo->ForceX;
-	RampQuake.ForceY    = FFInfo->ForceY;
-	RampQuake.Duration  = FFInfo->Duration;
-	RampQuake.Gain      = FFInfo->Gain;
-	RampQuake.Magnitude = FFInfo->Magnitude;
-	RampQuake.Start     = Start;
-	RampQuake.End       = End;
-	if (FFInfo->player == &players[consoleplayer])
-		I_Tactile(ConstantForce, &RampQuake);
-	else if (splitscreen && FFInfo->player == &players[displayplayers[1]])
-		I_Tactile2(ConstantForce, &RampQuake);
-	else if (splitscreen > 1 && FFInfo->player == &players[displayplayers[2]])
-		I_Tactile3(ConstantForce, &RampQuake);
-	else if (splitscreen > 2 && FFInfo->player == &players[displayplayers[3]])
-		I_Tactile4(ConstantForce, &RampQuake);
-}
-
-
 //
 // GET STUFF
 //
@@ -107,9 +51,6 @@ boolean P_CanPickupItem(player_t *player, UINT8 weapon)
 	if (player->exiting || mapreset)
 		return false;
 
-	/*if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0) // No bumpers in Match
-        return false;*/
-
 	if (weapon)
 	{
 		// Item slot already taken up
@@ -165,26 +106,14 @@ void P_DoNightsScore(player_t *player)
 		return; // Don't do any fancy shit for failures.
 
 	dummymo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z+player->mo->height/2, MT_NIGHTSCORE);
+
 	if (player->bot)
 		player = &players[consoleplayer];
 
-	if (G_IsSpecialStage(gamemap)) // Global link count? Maybe not a good idea...
-	{
-		INT32 i;
-		for (i = 0; i < MAXPLAYERS; i++)
-			if (playeringame[i])
-			{
-				if (++players[i].linkcount > players[i].maxlink)
-					players[i].maxlink = players[i].linkcount;
-				players[i].linktimer = 2*TICRATE;
-			}
-	}
-	else // Individual link counts
-	{
-		if (++player->linkcount > player->maxlink)
-			player->maxlink = player->linkcount;
-		player->linktimer = 2*TICRATE;
-	}
+	// Individual link counts
+	if (++player->linkcount > player->maxlink)
+		player->maxlink = player->linkcount;
+	player->linktimer = 2*TICRATE;
 
 	if (player->linkcount < 10)
 	{
@@ -214,12 +143,10 @@ void P_DoNightsScore(player_t *player)
 	}
 
 	// Hoops are the only things that should add to your drill meter
-	//player->drillmeter += TICRATE;
 	dummymo->momz = FRACUNIT;
 	dummymo->fuse = 3*TICRATE;
 
 	// What?! NO, don't use the camera! Scale up instead!
-	//P_InstaThrust(dummymo, R_PointToAngle2(dummymo->x, dummymo->y, camera[0].x, camera[0].y), 3*FRACUNIT);
 	dummymo->scalespeed = FRACUNIT/25;
 	dummymo->destscale = 2*FRACUNIT;
 }
@@ -254,26 +181,21 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 	if (heightcheck)
 	{
-		/*if (special->type == MT_FLINGEMERALD) // little hack here...
-		{ // flingemerald sprites are low to the ground, so extend collision radius down some.
-			if (toucher->z > (special->z + special->height))
-				return;
-			if (special->z - special->height > (toucher->z + toucher->height))
-				return;
-		}
-		else*/
+		if (toucher->momz < 0)
 		{
-			if (toucher->momz < 0) {
-				if (toucher->z + toucher->momz > special->z + special->height)
-					return;
-			} else if (toucher->z > special->z + special->height)
-				return;
-			if (toucher->momz > 0) {
-				if (toucher->z + toucher->height + toucher->momz < special->z)
-					return;
-			} else if (toucher->z + toucher->height < special->z)
+			if (toucher->z + toucher->momz > special->z + special->height)
 				return;
 		}
+		else if (toucher->z > special->z + special->height)
+			return;
+
+		if (toucher->momz > 0)
+		{
+			if (toucher->z + toucher->height + toucher->momz < special->z)
+				return;
+		}
+		else if (toucher->z + toucher->height < special->z)
+			return;
 	}
 
 	if (special->health <= 0)
@@ -289,7 +211,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 	if (special->flags & MF_BOSS && special->flags2 & MF2_FRET)
 		return;
 
-	if (LUAh_TouchSpecial(special, toucher) || P_MobjWasRemoved(special))
+	if (LUA_HookTouchSpecial(special, toucher) || P_MobjWasRemoved(special))
 		return;
 
 	if (special->flags & MF_BOSS)
@@ -379,21 +301,12 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			else
 			{
 				K_DropItems(player); //K_StripItems(player);
-				//K_StripOther(player);
 				player->kartstuff[k_itemroulette] = 1;
 				player->kartstuff[k_roulettetype] = 2;
 			}
 
-#if 0
-			// Eggbox snipe!
-			if (special->type == MT_EGGMANITEM && special->health > 1)
-				S_StartSound(toucher, sfx_bsnipe);
-#endif
-
-			{
-				mobj_t *poof = P_SpawnMobj(special->x, special->y, special->z, MT_EXPLODE);
-				S_StartSound(poof, special->info->deathsound);
-			}
+			mobj_t *poof = P_SpawnMobj(special->x, special->y, special->z, MT_EXPLODE);
+			S_StartSound(poof, special->info->deathsound);
 
 			if (special->target && special->target->player)
 			{
@@ -476,8 +389,8 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			}
 			else if (special->target->player->kartstuff[k_comebackmode] == 1 && P_CanPickupItem(player, 1))
 			{
-				mobj_t *poof = P_SpawnMobj(special->x, special->y, special->z, MT_EXPLODE);
-				S_StartSound(poof, special->info->seesound);
+				mobj_t *poof2 = P_SpawnMobj(special->x, special->y, special->z, MT_EXPLODE);
+				S_StartSound(poof2, special->info->seesound);
 
 				// Karma fireworks
 				for (i = 0; i < 5; i++)
@@ -503,10 +416,10 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			}
 			else if (special->target->player->kartstuff[k_comebackmode] == 2 && P_CanPickupItem(player, 2))
 			{
-				mobj_t *poof = P_SpawnMobj(special->x, special->y, special->z, MT_EXPLODE);
+				mobj_t *poof3 = P_SpawnMobj(special->x, special->y, special->z, MT_EXPLODE);
 				UINT8 ptadd = 1; // No WANTED bonus for tricking
 
-				S_StartSound(poof, special->info->seesound);
+				S_StartSound(poof3, special->info->seesound);
 
 				if (player->kartstuff[k_bumper] == 1) // If you have only one bumper left, and see if it's a 1v1
 				{
@@ -534,8 +447,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 				special->target->player->kartstuff[k_comebacktimer] = comebacktime;
 
-				K_DropItems(player); //K_StripItems(player);
-				//K_StripOther(player);
+				K_DropItems(player);
 
 				player->kartstuff[k_itemroulette] = 1;
 				player->kartstuff[k_roulettetype] = 2;
@@ -561,13 +473,12 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			if (player->spectator)
 				return;
 
-			if (special->tracer && !P_MobjWasRemoved(special->tracer) && toucher == special->tracer)
+			if (!P_MobjWasRemoved(special->tracer) && toucher == special->tracer)
 			{
 				mobj_t *spbexplode;
 
 				if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0)
 				{
-					//player->powers[pw_flashing] = 0;
 					K_DropHnextList(player);
 					K_StripItems(player);
 				}
@@ -576,7 +487,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 				spbexplode = P_SpawnMobj(toucher->x, toucher->y, toucher->z, MT_SPBEXPLOSION);
 				spbexplode->extravalue1 = 1; // Tell K_ExplodePlayer to use extra knockback
-				if (special->target && !P_MobjWasRemoved(special->target))
+				if (!P_MobjWasRemoved(special->target))
 					P_SetTarget(&spbexplode->target, special->target);
 
 				P_RemoveMobj(special);
@@ -584,12 +495,8 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			else
 				K_SpinPlayer(player, special->target, 0, special, false);
 			return;
-		/*case MT_EERIEFOG:
-			special->frame &= ~FF_TRANS80;
-			special->frame |= FF_TRANS90;
-			return;*/
 		case MT_SMK_MOLE:
-			if (special->target && !P_MobjWasRemoved(special->target))
+			if (!P_MobjWasRemoved(special->target))
 				return;
 
 			if (special->health <= 0 || toucher->health <= 0)
@@ -680,7 +587,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			special->momx = special->momy = special->momz = 0;
 			P_GivePlayerRings(player, 1);
 
-			if ((maptol & TOL_NIGHTS) && special->type != MT_FLINGRING)
+			if (UNLIKELY((maptol & TOL_NIGHTS) && special->type != MT_FLINGRING))
 				P_DoNightsScore(player);
 			break;
 
@@ -692,7 +599,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			special->momx = special->momy = 0;
 			P_GivePlayerRings(player, 1);
 
-			if ((maptol & TOL_NIGHTS) && special->type != MT_FLINGCOIN)
+			if (UNLIKELY((maptol & TOL_NIGHTS) && special->type != MT_FLINGCOIN))
 				P_DoNightsScore(player);
 			break;
 		case MT_BLUEBALL:
@@ -708,7 +615,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			else
 				special->scalespeed = 4*FRACUNIT/5;
 
-			if (maptol & TOL_NIGHTS)
+			if (UNLIKELY(maptol & TOL_NIGHTS))
 				P_DoNightsScore(player);
 			break;
 		case MT_AUTOPICKUP:
@@ -859,8 +766,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 				return;
 			if (special->fuse == 1)
 				return;
-//			if (special->momz > 0)
-//				return;
 			{
 				UINT8 flagteam = (special->type == MT_REDFLAG) ? 1 : 2;
 				const char *flagtext;
@@ -927,6 +832,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			if (player->bumpertime < TICRATE/4)
 			{
 				S_StartSound(toucher, special->info->seesound);
+
 				if (player->pflags & PF_NIGHTSMODE)
 				{
 					player->bumpertime = TICRATE/2;
@@ -936,12 +842,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 						player->flyangle = special->threshold;
 
 					player->speed = FixedMul(special->info->speed, special->scale);
-					// Potentially causes axis transfer failures.
-					// Also rarely worked properly anyway.
-					//P_UnsetThingPosition(player->mo);
-					//player->mo->x = special->x;
-					//player->mo->y = special->y;
-					//P_SetThingPosition(player->mo);
 					toucher->z = special->z+(special->height/4);
 				}
 				else // More like a spring
@@ -986,158 +886,16 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 				}
 			}
 			return;
-		/*case MT_NIGHTSSUPERLOOP:
-			if (player->bot || !(player->pflags & PF_NIGHTSMODE))
-				return;
-			if (!G_IsSpecialStage(gamemap))
-				player->powers[pw_nights_superloop] = (UINT16)special->info->speed;
-			else
-			{
-				for (i = 0; i < MAXPLAYERS; i++)
-					if (playeringame[i] && players[i].pflags & PF_NIGHTSMODE)
-						players[i].powers[pw_nights_superloop] = (UINT16)special->info->speed;
-				if (special->info->deathsound != sfx_None)
-					S_StartSound(NULL, special->info->deathsound);
-			}
-
-			// CECHO showing you what this item is
-			if (player == &players[displayplayers[0]] || G_IsSpecialStage(gamemap))
-			{
-				HU_SetCEchoFlags(V_AUTOFADEOUT);
-				HU_SetCEchoDuration(4);
-				HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Super Paraloop"));
-			}
-			break;
-		case MT_NIGHTSDRILLREFILL:
-			if (player->bot || !(player->pflags & PF_NIGHTSMODE))
-				return;
-			if (!G_IsSpecialStage(gamemap))
-				player->drillmeter = special->info->speed;
-			else
-			{
-				for (i = 0; i < MAXPLAYERS; i++)
-					if (playeringame[i] && players[i].pflags & PF_NIGHTSMODE)
-						players[i].drillmeter = special->info->speed;
-				if (special->info->deathsound != sfx_None)
-					S_StartSound(NULL, special->info->deathsound);
-			}
-
-			// CECHO showing you what this item is
-			if (player == &players[displayplayers[0]] || G_IsSpecialStage(gamemap))
-			{
-				HU_SetCEchoFlags(V_AUTOFADEOUT);
-				HU_SetCEchoDuration(4);
-				HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Drill Refill"));
-			}
-			break;
-		case MT_NIGHTSHELPER:
-			if (player->bot || !(player->pflags & PF_NIGHTSMODE))
-				return;
-			if (!G_IsSpecialStage(gamemap))
-			{
-				// A flicky orbits us now
-				mobj_t *flickyobj = P_SpawnMobj(toucher->x, toucher->y, toucher->z + toucher->info->height, MT_NIGHTOPIANHELPER);
-				P_SetTarget(&flickyobj->target, toucher);
-
-				player->powers[pw_nights_helper] = (UINT16)special->info->speed;
-			}
-			else
-			{
-				mobj_t *flickyobj;
-				for (i = 0; i < MAXPLAYERS; i++)
-					if (playeringame[i] && players[i].mo && players[i].pflags & PF_NIGHTSMODE) {
-						players[i].powers[pw_nights_helper] = (UINT16)special->info->speed;
-						flickyobj = P_SpawnMobj(players[i].mo->x, players[i].mo->y, players[i].mo->z + players[i].mo->info->height, MT_NIGHTOPIANHELPER);
-						P_SetTarget(&flickyobj->target, players[i].mo);
-					}
-				if (special->info->deathsound != sfx_None)
-					S_StartSound(NULL, special->info->deathsound);
-			}
-
-			// CECHO showing you what this item is
-			if (player == &players[displayplayers[0]] || G_IsSpecialStage(gamemap))
-			{
-				HU_SetCEchoFlags(V_AUTOFADEOUT);
-				HU_SetCEchoDuration(4);
-				HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Nightopian Helper"));
-			}
-			break;
-		case MT_NIGHTSEXTRATIME:
-			if (player->bot || !(player->pflags & PF_NIGHTSMODE))
-				return;
-			if (!G_IsSpecialStage(gamemap))
-			{
-				player->nightstime += special->info->speed;
-				player->startedtime += special->info->speed;
-				P_RestoreMusic(player);
-			}
-			else
-			{
-				for (i = 0; i < MAXPLAYERS; i++)
-					if (playeringame[i] && players[i].pflags & PF_NIGHTSMODE)
-					{
-						players[i].nightstime += special->info->speed;
-						players[i].startedtime += special->info->speed;
-						P_RestoreMusic(&players[i]);
-					}
-				if (special->info->deathsound != sfx_None)
-					S_StartSound(NULL, special->info->deathsound);
-			}
-
-			// CECHO showing you what this item is
-			if (player == &players[displayplayers[0]] || G_IsSpecialStage(gamemap))
-			{
-				HU_SetCEchoFlags(V_AUTOFADEOUT);
-				HU_SetCEchoDuration(4);
-				HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Extra Time"));
-			}
-			break;
-		case MT_NIGHTSLINKFREEZE:
-			if (player->bot || !(player->pflags & PF_NIGHTSMODE))
-				return;
-			if (!G_IsSpecialStage(gamemap))
-			{
-				player->powers[pw_nights_linkfreeze] = (UINT16)special->info->speed;
-				player->linktimer = 2*TICRATE;
-			}
-			else
-			{
-				for (i = 0; i < MAXPLAYERS; i++)
-					if (playeringame[i] && players[i].pflags & PF_NIGHTSMODE)
-					{
-						players[i].powers[pw_nights_linkfreeze] += (UINT16)special->info->speed;
-						players[i].linktimer = 2*TICRATE;
-					}
-				if (special->info->deathsound != sfx_None)
-					S_StartSound(NULL, special->info->deathsound);
-			}
-
-			// CECHO showing you what this item is
-			if (player == &players[displayplayers[0]] || G_IsSpecialStage(gamemap))
-			{
-				HU_SetCEchoFlags(V_AUTOFADEOUT);
-				HU_SetCEchoDuration(4);
-				HU_DoCEcho(M_GetText("\\\\\\\\\\\\\\\\Link Freeze"));
-			}
-			break;*/
 		case MT_NIGHTSWING:
-			if (G_IsSpecialStage(gamemap) && useNightsSS)
-			{ // Pseudo-ring.
-				S_StartSound(toucher, special->info->painsound);
-				player->totalring++;
-			}
-			else
-				S_StartSound(toucher, special->info->activesound);
-
+			S_StartSound(toucher, special->info->activesound);
 			P_DoNightsScore(player);
 			break;
 		case MT_HOOPCOLLIDE:
 			// This produces a kind of 'domino effect' with the hoop's pieces.
-			if (!midgamejoin)
-				for (; special->hprev != NULL; special = special->hprev); // Move to the first sprite in the hoop
+			for (; !P_MobjWasRemoved(special->hprev); special = special->hprev); // Move to the first sprite in the hoop
 
 			i = 0;
-			for (; special->type == MT_HOOP; special = special->hnext)
+			for (; !P_MobjWasRemoved(special->hnext) && special->type == MT_HOOP; special = special->hnext)
 			{
 				special->fuse = 11;
 				special->movedir = i;
@@ -1160,13 +918,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 
 			// Hoops are the only things that should add to the drill meter
 			// Also, one tic's worth of drill is too much.
-			if (G_IsSpecialStage(gamemap))
-			{
-				for (i = 0; i < MAXPLAYERS; i++)
-					if (playeringame[i] && players[i].pflags & PF_NIGHTSMODE)
-						players[i].drillmeter += TICRATE/2;
-			}
-			else if (player->bot)
+			if (player->bot)
 				players[consoleplayer].drillmeter += TICRATE/2;
 			else
 				player->drillmeter += TICRATE/2;
@@ -1210,9 +962,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 				// scan the remaining thinkers to find koopa
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-						continue;
-					if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+					if (th->function != (actionf_p1)P_MobjThinker)
 						continue;
 
 					mo2 = (mobj_t *)th;
@@ -1453,31 +1203,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			P_SetMobjState(special, special->info->deathstate);
 			return;
 		case MT_SPECIALSPIKEBALL:
-			if (!(!useNightsSS && G_IsSpecialStage(gamemap))) // Only for old special stages
-			{
-				P_DamageMobj(toucher, special, special, 1);
-				return;
-			}
-
-			if (player->powers[pw_invulnerability] || player->powers[pw_flashing]
-			|| (player->powers[pw_super] && !(ALL7EMERALDS(player->powers[pw_emeralds]))))
-				return;
-			if (player->powers[pw_shield] || player->bot)  //If One-Hit Shield
-			{
-				P_RemoveShield(player);
-				S_StartSound(toucher, sfx_shldls); // Ba-Dum! Shield loss.
-			}
-			else
-			{
-				P_PlayRinglossSound(toucher);
-				if (toucher->health > 10)
-					toucher->health -= 10;
-				else
-					toucher->health = 1;
-				player->health = toucher->health;
-			}
-
-			P_DoPlayerPain(player, special, NULL);
+			P_DamageMobj(toucher, special, special, 1);
 			return;
 		case MT_EGGMOBILE2_POGO:
 			// sanity checks
@@ -1501,9 +1227,9 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 			return; // SRB2kart - don't need bubbles mucking with the player
 			if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL)
 				return;
-			if (maptol & TOL_NIGHTS)
+			if (UNLIKELY(maptol & TOL_NIGHTS))
 				return;
-			if (mariomode)
+			if (UNLIKELY(mariomode))
 				return;
 			else if (toucher->eflags & MFE_VERTICALFLIP)
 			{
@@ -1515,23 +1241,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
 				|| special->z > toucher->z + (toucher->height*2/3))
 				return; // Only go in the mouth
 
-			/* // SRB2kart - Can't drown.
-			// Eaten by player!
-			if (player->powers[pw_underwater] && player->powers[pw_underwater] <= 12*TICRATE + 1)
-				P_RestoreMusic(player);
-
-			if (player->powers[pw_underwater] < underwatertics + 1)
-				player->powers[pw_underwater] = underwatertics + 1;
-			*/
-
-			/*
-			if (!player->climbing)
-			{
-				P_SetPlayerMobjState(toucher, S_PLAY_GASP);
-				P_ResetPlayer(player);
-			}
-			*/
-
 			toucher->momx = toucher->momy = toucher->momz = 0;
 			break;
 
@@ -1588,26 +1297,7 @@ void P_CheckTimeLimit(void)
 	if (gameaction == ga_completed)
 		return;
 
-	//Tagmode round end but only on the tic before the
-	//XD_EXITLEVEL packet is received by all players.
-	/*if (G_TagGametype())
-	{
-		if (leveltime == (timelimitintics + 1))
-		{
-			for (i = 0; i < MAXPLAYERS; i++)
-			{
-				if (!playeringame[i] || players[i].spectator
-				 || (players[i].pflags & PF_TAGGED) || (players[i].pflags & PF_TAGIT))
-					continue;
-
-				CONS_Printf(M_GetText("%s received double points for surviving the round.\n"), player_names[i]);
-				P_AddPlayerScore(&players[i], players[i].score);
-			}
-		}
-	}
-
-	//Optional tie-breaker for Match/CTF
-	else*/ if (cv_overtime.value)
+	if (cv_overtime.value)
 	{
 		INT32 playerarray[MAXPLAYERS];
 		INT32 tempplayer = 0;
@@ -1680,9 +1370,6 @@ void P_CheckTimeLimit(void)
 			return;
 		P_DoPlayerExit(&players[i]);
 	}
-
-	/*if (server)
-		SendNetXCmd(XD_EXITLEVEL, NULL, 0);*/
 }
 
 /** Checks if a player's score is over the pointlimit and the round should end.
@@ -1704,127 +1391,27 @@ void P_CheckPointLimit(void)
 	if (G_RaceGametype())
 		return;
 
-	// pointlimit is nonzero, check if it's been reached by this player
-	/*if (G_GametypeHasTeams())
+	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		// Just check both teams
-		if ((UINT32)cv_pointlimit.value <= redscore || (UINT32)cv_pointlimit.value <= bluescore)
-		{
-			if (server)
-				SendNetXCmd(XD_EXITLEVEL, NULL, 0);
-		}
-	}
-	else*/
-	{
-		for (i = 0; i < MAXPLAYERS; i++)
-		{
-			if (!playeringame[i] || players[i].spectator)
-				continue;
+		if (!playeringame[i] || players[i].spectator)
+			continue;
 
-			if ((UINT32)cv_pointlimit.value <= players[i].marescore)
+		if ((UINT32)cv_pointlimit.value <= players[i].marescore)
+		{
+			for (i = 0; i < MAXPLAYERS; i++) // AAAAA nested loop using the same iteration variable ;;
 			{
-				for (i = 0; i < MAXPLAYERS; i++) // AAAAA nested loop using the same iteration variable ;;
-				{
-					if (!playeringame[i] || players[i].spectator)
-						continue;
-					if (players[i].exiting)
-						return;
-					P_DoPlayerExit(&players[i]);
-				}
-
-				/*if (server)
-					SendNetXCmd(XD_EXITLEVEL, NULL, 0);*/
-				return; // good thing we're leaving the function immediately instead of letting the loop get mangled!
+				if (!playeringame[i] || players[i].spectator)
+					continue;
+				if (players[i].exiting)
+					return;
+				P_DoPlayerExit(&players[i]);
 			}
+
+			return; // good thing we're leaving the function immediately instead of letting the loop get mangled!
 		}
 	}
 }
 
-/*Checks for untagged remaining players in both tag derivitave modes.
- *If no untagged players remain, end the round.
- *Also serves as error checking if the only IT player leaves.*/
-/*void P_CheckSurvivors(void)
-{
-	INT32 i;
-	INT32 survivors = 0;
-	INT32 taggers = 0;
-	INT32 spectators = 0;
-	INT32 survivorarray[MAXPLAYERS];
-
-	if (!D_NumPlayers()) //no players in the game, no check performed.
-		return;
-
-	for (i=0; i < MAXPLAYERS; i++) //figure out counts of taggers, survivors and spectators.
-	{
-		if (playeringame[i])
-		{
-			if (players[i].spectator)
-				spectators++;
-			else if (players[i].pflags & PF_TAGIT)
-				taggers++;
-			else if (!(players[i].pflags & PF_TAGGED))
-			{
-				survivorarray[survivors] = i;
-				survivors++;
-			}
-		}
-	}
-
-	if (!taggers) //If there are no taggers, pick a survivor at random to be it.
-	{
-		// Exception for hide and seek. If a round has started and the IT player leaves, end the round.
-		if (gametype == GT_HIDEANDSEEK && (leveltime >= (hidetime * TICRATE)))
-		{
-			CONS_Printf(M_GetText("The IT player has left the game.\n"));
-			if (server)
-				SendNetXCmd(XD_EXITLEVEL, NULL, 0);
-
-			return;
-		}
-
-		if (survivors)
-		{
-			INT32 newtagger = survivorarray[P_RandomKey(survivors)];
-
-			CONS_Printf(M_GetText("%s is now IT!\n"), player_names[newtagger]); // Tell everyone who is it!
-			players[newtagger].pflags |= PF_TAGIT;
-
-			survivors--; //Get rid of the guy we just made IT.
-
-			//Yeah, we have an eligible tagger, but we may not have anybody for him to tag!
-			//If there is only one guy waiting on the game to fill or spectators to enter game, don't bother.
-			if (!survivors && (D_NumPlayers() - spectators) > 1)
-			{
-				CONS_Printf(M_GetText("All players have been tagged!\n"));
-				if (server)
-					SendNetXCmd(XD_EXITLEVEL, NULL, 0);
-			}
-
-			return;
-		}
-
-		//If we reach this point, no player can replace the one that was IT.
-		//Unless it is one player waiting on a game, end the round.
-		if ((D_NumPlayers() - spectators) > 1)
-		{
-			CONS_Printf(M_GetText("There are no players able to become IT.\n"));
-			if (server)
-				SendNetXCmd(XD_EXITLEVEL, NULL, 0);
-		}
-
-		return;
-	}
-
-	//If there are taggers, but no survivors, end the round.
-	//Except when the tagger is by himself and the rest of the game are spectators.
-	if (!survivors && (D_NumPlayers() - spectators) > 1)
-	{
-		CONS_Printf(M_GetText("All players have been tagged!\n"));
-		if (server)
-			SendNetXCmd(XD_EXITLEVEL, NULL, 0);
-	}
-}*/
-
 // Checks whether or not to end a race netgame.
 boolean P_CheckRacers(void)
 {
@@ -1913,9 +1500,6 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 	mobj_t *mo;
 	int ms;
 
-	if (!useNightsSS && G_IsSpecialStage(gamemap) && target->player && sstimer > 6)
-		sstimer = 6; // Just let P_Ticker take care of the rest.
-
 	if (target->flags & (MF_ENEMY|MF_BOSS))
 		target->momx = target->momy = target->momz = 0;
 
@@ -1939,7 +1523,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 	target->flags2 &= ~(MF2_SKULLFLY|MF2_NIGHTSPULL);
 	target->health = 0; // This makes it easy to check if something's dead elsewhere.
 
-	if (LUAh_MobjDeath(target, inflictor, source) || P_MobjWasRemoved(target))
+	if (LUA_HookMobjDeath(target, inflictor, source) || P_MobjWasRemoved(target))
 		return;
 
 	// SRB2kart
@@ -1957,8 +1541,9 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 			{
 				if (target->movedir != 0 && target->movedir < (UINT16)target->target->player->kartstuff[k_itemamount])
 				{
-					if (target->target->hnext && !P_MobjWasRemoved(target->target->hnext))
+					if (target->target->hnext)
 						K_KillBananaChain(target->target->hnext, inflictor, source);
+
 					target->target->player->kartstuff[k_itemamount] = 0;
 				}
 				else
@@ -1968,6 +1553,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 				|| (target->type == MT_JAWZ_SHIELD && target->target->player->kartstuff[k_itemtype] == KITEM_JAWZ))
 			{
 				target->target->player->kartstuff[k_itemamount]--;
+
 				if (target->lastlook != 0)
 				{
 					K_RepairOrbitChain(target);
@@ -1993,14 +1579,6 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 	{
 		if (metalrecording) // Ack! Metal Sonic shouldn't die! Cut the tape, end recording!
 			G_StopMetalRecording();
-		/*if (gametype == GT_MATCH && cv_match_scoring.value == 0 // note, no team match suicide penalty
-			&& ((target == source) || (source == NULL && inflictor == NULL) || (source && !source->player)))
-		{ // Suicide penalty - Not in Kart
-			if (target->player->score >= 50)
-				target->player->score -= 50;
-			else
-				target->player->score = 0;
-		}*/
 
 		target->flags2 &= ~MF2_DONTDRAW;
 	}
@@ -2017,85 +1595,6 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 				target->fuse = cv_itemrespawntime.value*TICRATE + 2; // Random box generation
 			}
 		}
-
-		// Award Score Tails
-		/*{ // Enemies shouldn't award points in Kart
-			INT32 score = 0;
-
-			if (maptol & TOL_NIGHTS) // Enemies always worth 200, bosses don't do anything.
-			{
-				if ((target->flags & MF_ENEMY) && !(target->flags & (MF_MISSILE|MF_BOSS)))
-				{
-					score = 200;
-
-					if (source->player->bonustime)
-						score *= 2;
-
-					// Also, add to the link.
-					// I don't know if NiGHTS did this, but
-					// Sonic Time Attacked did and it seems like a good enough incentive
-					// to make people want to actually dash towards/paraloop enemies
-					if (++source->player->linkcount > source->player->maxlink)
-						source->player->maxlink = source->player->linkcount;
-					source->player->linktimer = 2*TICRATE;
-				}
-			}
-			else
-			{
-				if (target->flags & MF_BOSS)
-					score = 1000;
-				else if ((target->flags & MF_ENEMY) && !(target->flags & MF_MISSILE))
-				{
-					mobj_t *scoremobj;
-					UINT32 scorestate = mobjinfo[MT_SCORE].spawnstate;
-
-					scoremobj = P_SpawnMobj(target->x, target->y, target->z + (target->height / 2), MT_SCORE);
-
-					// On ground? No chain starts.
-					if (!source->player->powers[pw_invulnerability] && P_IsObjectOnGround(source))
-					{
-						source->player->scoreadd = 0;
-						score = 100;
-					}
-					// Mario Mode has Mario-like chain point values
-					else if (mariomode) switch (++source->player->scoreadd)
-					{
-						case 1: score = 100;  break;
-						case 2: score = 200;  scorestate += 1; break;
-						case 3: score = 400;  scorestate += 5; break;
-						case 4: score = 800;  scorestate += 6; break;
-						case 5: score = 1000; scorestate += 3; break;
-						case 6: score = 2000; scorestate += 7; break;
-						case 7: score = 4000; scorestate += 8; break;
-						case 8: score = 8000; scorestate += 9; break;
-						default: // 1up for a chain this long
-							if (modeattacking) // but 1ups don't exist in record attack!
-							{ // So we just go back to 10k points.
-								score = 10000; scorestate += 4; break;
-							}
-							P_GivePlayerLives(source->player, 1);
-							P_PlayLivesJingle(source->player);
-							scorestate += 10;
-							break;
-					}
-					// More Sonic-like point system
-					else switch (++source->player->scoreadd)
-					{
-						case 1:  score = 100;   break;
-						case 2:  score = 200;   scorestate += 1; break;
-						case 3:  score = 500;   scorestate += 2; break;
-						case 4: case 5: case 6: case 7: case 8: case 9:
-						case 10: case 11: case 12: case 13: case 14:
-						         score = 1000;  scorestate += 3; break;
-						default: score = 10000; scorestate += 4; break;
-					}
-
-					P_SetMobjState(scoremobj, scorestate);
-				}
-			}
-
-			P_AddPlayerScore(source->player, score);
-		}*/
 	}
 
 	// if a player avatar dies...
@@ -2106,23 +1605,9 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 		target->flags |= MF_NOBLOCKMAP|MF_NOCLIPHEIGHT;
 		P_SetThingPosition(target);
 
-		if (!target->player->bot && !G_IsSpecialStage(gamemap)
-		 && G_GametypeUsesLives())
-		{
-			target->player->lives -= 1; // Lose a life Tails 03-11-2000
-
-			if (target->player->lives <= 0) // Tails 03-14-2000
-			{
-				if (P_IsLocalPlayer(target->player)/* && target->player == &players[consoleplayer] */)
-				{
-					S_StopMusic(); // Stop the Music! Tails 03-14-2000
-					S_ChangeMusicInternal("gmover", false); // Yousa dead now, Okieday? Tails 03-14-2000
-				}
-			}
-		}
 		target->player->playerstate = PST_DEAD;
 
-		if (cv_fading.value && cv_birdmusic.value && P_IsLocalPlayer(target->player))
+		if (cv_birdmusic.value && cv_fading.value && P_IsLocalPlayer(target->player))
 		{
 			if (netgame || multiplayer)
 				ms = cv_respawntime.value * 1000;
@@ -2133,7 +1618,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 			If the time spent with the music paused is less than half
 			a second, continue playing the song (just mute it).
 			*/
-			if (( ms - cv_respawnfademusicout.value ) < 500)
+			if ((ms - cv_respawnfademusicout.value) < 500)
 				S_FadeMusic(0, cv_respawnfademusicout.value);
 			else
 				S_FadeOutStopMusic(cv_respawnfademusicout.value);
@@ -2159,42 +1644,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 		if (target->player == &players[displayplayers[3]])
 			localaiming[3] = 0;
 
-		//tag deaths handled differently in suicide cases. Don't count spectators!
-		/*if (G_TagGametype()
-		 && !(target->player->pflags & PF_TAGIT) && (!source || !source->player) && !(target->player->spectator))
-		{
-			// if you accidentally die before you run out of time to hide, ignore it.
-			// allow them to try again, rather than sitting the whole thing out.
-			if (leveltime >= hidetime * TICRATE)
-			{
-				if (gametype == GT_TAG)//suiciding in survivor makes you IT.
-				{
-					target->player->pflags |= PF_TAGIT;
-					CONS_Printf(M_GetText("%s is now IT!\n"), player_names[target->player-players]); // Tell everyone who is it!
-					P_CheckSurvivors();
-				}
-				else
-				{
-					if (!(target->player->pflags & PF_TAGGED))
-					{
-						//otherwise, increment the tagger's score.
-						//in hide and seek, suiciding players are counted as found.
-						INT32 w;
-
-						for (w=0; w < MAXPLAYERS; w++)
-						{
-							if (players[w].pflags & PF_TAGIT)
-								P_AddPlayerScore(&players[w], 1);
-						}
-
-						target->player->pflags |= PF_TAGGED;
-						CONS_Printf(M_GetText("%s was found!\n"), player_names[target->player-players]);
-						P_CheckSurvivors();
-					}
-				}
-			}
-		}
-		else*/ if (G_BattleGametype())
+		if (G_BattleGametype())
 			K_CheckBumpers();
 
 		target->player->kartstuff[k_pogospring] = 0;
@@ -2316,7 +1766,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 		case MT_SMK_ICEBLOCK:
 			{
 				mobj_t *cur = target->hnext;
-				while (cur && !P_MobjWasRemoved(cur))
+				while (!P_MobjWasRemoved(cur))
 				{
 					P_SetMobjState(cur, S_SMK_ICEBLOCK2);
 					cur = cur->hnext;
@@ -2367,9 +1817,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 		// this can happen if the boss was hurt earlier than expected
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo = (mobj_t *)th;
@@ -2391,14 +1839,14 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
 	// kill tracer
 	if (target->type == MT_FROGGER)
 	{
-		if (target->tracer && !P_MobjWasRemoved(target->tracer))
+		if (!P_MobjWasRemoved(target->tracer))
 			P_KillMobj(target->tracer, inflictor, source);
 	}
 
 	if (target->type == MT_FROGGER || target->type == MT_ROBRA_HEAD || target->type == MT_BLUEROBRA_HEAD) // clean hnext list
 	{
 		mobj_t *cur = target->hnext;
-		while (cur && !P_MobjWasRemoved(cur))
+		while (!P_MobjWasRemoved(cur))
 		{
 			P_KillMobj(cur, inflictor, source);
 			cur = cur->hnext;
@@ -2611,26 +2059,6 @@ static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *sou
 		return false;
 	}
 
-	// The tag occurs so long as you aren't shooting another tagger with friendlyfire on.
-	/*if (source->player->pflags & PF_TAGIT && !(player->pflags & PF_TAGIT))
-	{
-		P_AddPlayerScore(source->player, 1); //award points to tagger.
-
-		if (gametype == GT_TAG) //survivor
-		{
-			player->pflags |= PF_TAGIT; //in survivor, the player becomes IT and helps hunt down the survivors.
-			CONS_Printf(M_GetText("%s is now IT!\n"), player_names[player-players]); // Tell everyone who is it!
-		}
-		else
-		{
-			player->pflags |= PF_TAGGED; //in hide and seek, the player is tagged and stays stationary.
-			CONS_Printf(M_GetText("%s was found!\n"), player_names[player-players]); // Tell everyone who is it!
-		}
-
-		//checks if tagger has tagged all players, if so, end round early.
-		P_CheckSurvivors();
-	}*/
-
 	P_DoPlayerPain(player, source, inflictor);
 
 	// Check for a shield
@@ -2648,7 +2076,7 @@ static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *sou
 	}
 	else if (target->health > 1) // Ring loss
 	{
-		P_PlayRinglossSound(target);
+		P_PlayRinglossSound(target, source);
 		P_PlayerRingBurst(player, player->mo->health - 1);
 	}
 
@@ -2669,15 +2097,6 @@ static inline boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj
 {
 	player_t *player = target->player;
 
-	// You can't kill yourself, idiot... // Unless it's Mario kart. Which it is. In this mod. All the time.
-	//if (source == target)
-	//	return false;
-
-	// In COOP/RACE/CHAOS, you can't hurt other players unless cv_friendlyfire is on
-	// ...But in SRB2kart, you can!
-	//if (!cv_friendlyfire.value && (G_RaceGametype()))
-	//	return false;
-
 	// Tag handling
 	if (G_TagGametype())
 		return P_TagDamage(target, inflictor, source, damage);
@@ -2704,7 +2123,7 @@ static inline boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj
 	return true;
 }
 
-static void P_KillPlayer(player_t *player, mobj_t *source, INT32 damage)
+static void P_KillPlayer(player_t *player, mobj_t *source)
 {
 	player->pflags &= ~(PF_CARRIED|PF_SLIDING|PF_ITEMHANG|PF_MACESPIN|PF_ROPEHANG|PF_NIGHTSMODE);
 
@@ -2723,38 +2142,10 @@ static void P_KillPlayer(player_t *player, mobj_t *source, INT32 damage)
 	// Get rid of emeralds
 	player->powers[pw_emeralds] = 0;
 
-	P_ForceFeed(player, 40, 10, TICRATE, 40 + min(damage, 100)*2);
-
 	P_ResetPlayer(player);
 
 	P_SetPlayerMobjState(player->mo, player->mo->info->deathstate);
 
-	/*if (gametype == GT_CTF && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
-	{
-		P_PlayerFlagBurst(player, false);
-		if (source && source->player)
-		{
-			// Award no points when players shoot each other when cv_friendlyfire is on.
-			if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
-				P_AddPlayerScore(source->player, 1);
-		}
-	}
-	if (source && source->player && !player->powers[pw_super]) //don't score points against super players
-	{
-		// Award no points when players shoot each other when cv_friendlyfire is on.
-		if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
-			P_AddPlayerScore(source->player, 1);
-	}
-
-	// If the player was super, tell them he/she ain't so super nomore.
-	if (gametype != GT_COOP && player->powers[pw_super])
-	{
-		S_StartSound(NULL, sfx_s3k66); //let all players hear it.
-		HU_SetCEchoFlags(0);
-		HU_SetCEchoDuration(5);
-		HU_DoCEcho(va("%s\\is no longer super.\\\\\\\\", player_names[player-players]));
-	}*/
-
 	if (player->pflags & PF_TIMEOVER)
 	{
 		mobj_t *boom;
@@ -2815,74 +2206,18 @@ void P_RemoveShield(player_t *player)
 		player->powers[pw_shield] = player->powers[pw_shield] & SH_STACK;
 }
 
-/*
-static void P_ShieldDamage(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 damage) // SRB2kart - unused.
+static void P_RingDamage(player_t *player, mobj_t *inflictor, mobj_t *source)
 {
-	// Must do pain first to set flashing -- P_RemoveShield can cause damage
-	P_DoPlayerPain(player, source, inflictor);
-
-	P_RemoveShield(player);
-
-	P_ForceFeed(player, 40, 10, TICRATE, 40 + min(damage, 100)*2);
-
-	if (source && (source->type == MT_SPIKE || (source->type == MT_NULL && source->threshold == 43))) // spikes
-		S_StartSound(player->mo, sfx_spkdth);
-	else
-		S_StartSound (player->mo, sfx_shldls); // Ba-Dum! Shield loss.
-
-	if (gametype == GT_CTF && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
-	{
-		P_PlayerFlagBurst(player, false);
-		if (source && source->player)
-		{
-			// Award no points when players shoot each other when cv_friendlyfire is on.
-			if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
-				P_AddPlayerScore(source->player, 25);
-		}
-	}
-	if (source && source->player && !player->powers[pw_super]) //don't score points against super players
-	{
-		// Award no points when players shoot each other when cv_friendlyfire is on.
-		if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
-			P_AddPlayerScore(source->player, cv_match_scoring.value == 1 ? 25 : 50);
-	}
-}
-*/
-
-static void P_RingDamage(player_t *player, mobj_t *inflictor, mobj_t *source, INT32 damage)
-{
-	//const UINT8 scoremultiply = ((K_IsWantedPlayer(player) && !trapitem) : 2 ? 1);
-
 	if (!(inflictor && ((inflictor->flags & MF_MISSILE) || inflictor->player) && player->powers[pw_super] && ALL7EMERALDS(player->powers[pw_emeralds])))
 	{
 		P_DoPlayerPain(player, source, inflictor);
 
-		P_ForceFeed(player, 40, 10, TICRATE, 40 + min(damage, 100)*2);
-
 		if (source && (source->type == MT_SPIKE || (source->type == MT_NULL && source->threshold == 43))) // spikes
 			S_StartSound(player->mo, sfx_spkdth);
 	}
 
-	/*if (source && source->player && !player->powers[pw_super]) //don't score points against super players
-	{
-		// Award no points when players shoot each other when cv_friendlyfire is on.
-		if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
-			P_AddPlayerScore(source->player, scoremultiply);
-	}
-
-	if (gametype == GT_CTF && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
-	{
-		P_PlayerFlagBurst(player, false);
-		if (source && source->player)
-		{
-			// Award no points when players shoot each other when cv_friendlyfire is on.
-			if (!G_GametypeHasTeams() || !(source->player->ctfteam == player->ctfteam && source != player->mo))
-				P_AddPlayerScore(source->player, scoremultiply);
-		}
-	}*/
-
 	// Ring loss sound plays despite hitting spikes
-	P_PlayRinglossSound(player->mo); // Ringledingle!
+	P_PlayRinglossSound(player->mo, source); // Ringledingle!
 }
 
 /** Damages an object, which may or may not be a player.
@@ -2896,10 +2231,9 @@ static void P_RingDamage(player_t *player, mobj_t *inflictor, mobj_t *source, IN
   *                  player is hit by a ring, the player who shot it. In some
   *                  cases, the target will go after this object after
   *                  receiving damage. This can be NULL.
-  * \param damage    Amount of damage to be dealt. 10000 is instant death.
+  * \param damage    Amount of damage to be dealt. DMG_INSTAKILL is instant death.
   * \return True if the target sustained damage, otherwise false.
   * \todo Clean up this mess, split into multiple functions.
-  * \todo Get rid of the magic number 10000.
   * \sa P_KillMobj
   */
 boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
@@ -2910,14 +2244,15 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 	if (objectplacing)
 		return false;
 
-	if (target->health <= 0)
+	// well no clue but this may happen ig
+	if (!target || (target->health <= 0))
 		return false;
 
 	// Spectator handling
 	if (netgame)
 	{
-		if (damage == 42000 && target->player && target->player->spectator)
-			damage = 10000;
+		if (damage == DMG_SPECTATOR && target->player && target->player->spectator)
+			damage = DMG_INSTAKILL;
 		else if (target->player && target->player->spectator)
 			return false;
 
@@ -2928,11 +2263,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 	// Everything above here can't be forced.
 	if (!metalrecording)
 	{
-		UINT8 shouldForce = LUAh_ShouldDamage(target, inflictor, source, damage);
+		UINT8 shouldForce = LUA_HookShouldDamage(target, inflictor, source, damage);
+
 		if (P_MobjWasRemoved(target))
 			return (shouldForce == 1); // mobj was removed
-		if (P_MobjWasRemoved(source))
-			source = NULL;
+
 		if (shouldForce == 1)
 			force = true;
 		else if (shouldForce == 2)
@@ -2971,7 +2306,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 		if (!force && target->fuse) // Invincible
 			return false;
 
-		if (LUAh_MobjDamage(target, inflictor, source, damage) || P_MobjWasRemoved(target))
+		if (LUA_HookMobjDamage(target, inflictor, source, damage) || P_MobjWasRemoved(target))
 			return true;
 
 		if (target->health > 1)
@@ -2997,7 +2332,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 		if (!force && target->flags2 & MF2_FRET) // Currently flashing from being hit
 			return false;
 
-		if (LUAh_MobjDamage(target, inflictor, source, damage) || P_MobjWasRemoved(target))
+		if (LUA_HookMobjDamage(target, inflictor, source, damage) || P_MobjWasRemoved(target))
 			return true;
 
 		if (target->health > 1)
@@ -3005,7 +2340,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 	}
 	else if (target->flags & MF_ENEMY)
 	{
-		if (LUAh_MobjDamage(target, inflictor, source, damage) || P_MobjWasRemoved(target))
+		if (LUA_HookMobjDamage(target, inflictor, source, damage) || P_MobjWasRemoved(target))
 			return true;
 	}
 
@@ -3018,11 +2353,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 			if (player->exiting)
 				return false;
 
-			if (!(target->player->pflags & (PF_NIGHTSMODE|PF_NIGHTSFALL)) && (maptol & TOL_NIGHTS))
+			if (UNLIKELY(!(target->player->pflags & (PF_NIGHTSMODE|PF_NIGHTSFALL)) && (maptol & TOL_NIGHTS)))
 				return false;
 		}
 
-		if (player->pflags & PF_NIGHTSMODE) // NiGHTS damage handling
+		if (UNLIKELY(player->pflags & PF_NIGHTSMODE)) // NiGHTS damage handling
 		{
 			if (!force)
 			{
@@ -3034,14 +2369,14 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 					return false; // Don't run eachother over in special stages and team games and such
 			}
 
-			if (LUAh_MobjDamage(target, inflictor, source, damage))
+			if (LUA_HookMobjDamage(target, inflictor, source, damage))
 				return true;
 
 			P_NiGHTSDamage(target, source); // -5s :(
 			return true;
 		}
 
-		if (LUAh_MobjDamage(target, inflictor, source, damage))
+		if (LUA_HookMobjDamage(target, inflictor, source, damage))
 			return true;
 
 		if (!force && inflictor && (inflictor->flags & MF_FIRE))
@@ -3058,7 +2393,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 		{
 			if ((G_BattleGametype()) && cv_suddendeath.value
 				&& !player->powers[pw_flashing] && !player->powers[pw_invulnerability])
-				damage = 10000;
+				damage = DMG_INSTAKILL;
 		}
 
 		// Player hits another player
@@ -3072,8 +2407,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 			return false;
 
 		// Instant-Death
-		if (damage == 10000)
-			P_KillPlayer(player, source, damage);
+		if (damage == DMG_INSTAKILL)
+			P_KillPlayer(player, source);
+
 		else if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->powers[pw_flashing])
 		{
 			if (!force)	// shoulddamage bypasses all of that.
@@ -3091,18 +2427,19 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 				player->kartstuff[k_sneakertimer] = 0;
 				K_SpinPlayer(player, source, 1, inflictor, false);
 				damage = player->mo->health - 1;
-				P_RingDamage(player, inflictor, source, damage);
+				P_RingDamage(player, inflictor, source);
 				P_PlayerRingBurst(player, 5);
+
 				if (P_IsLocalPlayer(player))
 				{
-					quake.intensity = 32*FRACUNIT;
-					quake.time = 5;
+					P_StartQuake(5, 32<<FRACBITS, 0);
 				}
 			}
 			else
 			{
 				K_SpinPlayer(player, source, 0, inflictor, false);
 			}
+
 			return true;
 		}
 
@@ -3126,7 +2463,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 		else
 		{
 			player->health -= damage; // mirror mobj health here
-			if (damage < 10000)
+			if (damage < DMG_INSTAKILL)
 			{
 				target->player->powers[pw_flashing] = K_GetKartFlashing(target->player);
 				if (damage > 0) // don't spill emeralds/ammo/panels for shield damage
@@ -3136,8 +2473,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 
 		if (player->health < 0)
 			player->health = 0;
-
-		P_ForceFeed(player, 40, 10, TICRATE, 40 + min(damage, 100)*2);
 	}
 
 	// Killing dead. Just for kicks.
@@ -3170,22 +2505,13 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 			P_ResetPlayer(target->player);
 	}
 	else
-		switch (target->type)
-		{
-		case MT_EGGMOBILE2: // egg slimer
-			if (target->health < target->info->damage) // in pinch phase
-			{
-				P_SetMobjState(target, target->info->meleestate); // go to pinch pain state
-				break;
-			}
-			/* FALLTHRU */
-		default:
+	{
+		// egg slimer
+		if (target->type == MT_EGGMOBILE2 && (target->health < target->info->damage)) // in pinch phase
+			P_SetMobjState(target, target->info->meleestate); // go to pinch pain state
+		else
 			P_SetMobjState(target, target->info->painstate);
-			break;
-		}
-		
-	if (P_MobjWasRemoved(target))
-		return false;
+	}
 
 	if (!P_MobjWasRemoved(target))
 	{
@@ -3196,6 +2522,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 			// if not intent on another player,
 			// chase after this one
 			P_SetTarget(&target->target, source);
+
 			if (target->state == &states[target->info->spawnstate] && target->info->seestate != S_NULL)
 			{
 				if (player)
@@ -3275,7 +2602,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
 			ns = FixedMul(((i*FRACUNIT)/16)+2*FRACUNIT, mo->scale);
 			mo->momx = FixedMul(FINECOSINE(fa),ns);
 
-			if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
+			if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
 				mo->momy = FixedMul(FINESINE(fa),ns);
 
 			P_SetObjectMomZ(mo, 8*FRACUNIT, false);
@@ -3299,7 +2626,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
 			ns = FixedMul(momxy, mo->scale);
 			mo->momx = FixedMul(FINECOSINE(fa),ns);
 
-			if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
+			if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
 				mo->momy = FixedMul(FINESINE(fa),ns);
 
 			ns = momz;
@@ -3406,7 +2733,7 @@ void P_PlayerWeaponPanelBurst(player_t *player)
 		ns = FixedMul(3*FRACUNIT, mo->scale);
 		mo->momx = FixedMul(FINECOSINE(fa),ns);
 
-		if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
+		if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
 			mo->momy = FixedMul(FINESINE(fa),ns);
 
 		P_SetObjectMomZ(mo, 4*FRACUNIT, false);
@@ -3490,7 +2817,7 @@ void P_PlayerWeaponAmmoBurst(player_t *player)
 		ns = FixedMul(2*FRACUNIT, mo->scale);
 		mo->momx = FixedMul(FINECOSINE(fa), ns);
 
-		if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
+		if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
 			mo->momy = FixedMul(FINESINE(fa),ns);
 
 		P_SetObjectMomZ(mo, 3*FRACUNIT, false);
@@ -3606,7 +2933,7 @@ void P_PlayerEmeraldBurst(player_t *player, boolean toss)
 
 			momx = FixedMul(FINECOSINE(fa), ns);
 
-			if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
+			if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
 				momy = FixedMul(FINESINE(fa),ns);
 			else
 				momy = 0;
@@ -3663,7 +2990,7 @@ void P_PlayerFlagBurst(player_t *player, boolean toss)
 	{
 		angle_t fa = P_RandomByte()*FINEANGLES/256;
 		flag->momx = FixedMul(FINECOSINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
-		if (!(twodlevel || (player->mo->flags2 & MF2_TWOD)))
+		if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
 			flag->momy = FixedMul(FINESINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
 	}
 
@@ -3680,32 +3007,30 @@ void P_PlayerFlagBurst(player_t *player, boolean toss)
 	P_SetTarget(&flag->target, player->mo);
 
 	// Flag text
+	char plname[MAXPLAYERNAME+4];
+	const char *flagtext;
+	char flagcolor;
+
+	snprintf(plname, sizeof(plname), "%s%s%s",
+			 CTFTEAMCODE(player),
+			 player_names[player - players],
+			 CTFTEAMENDCODE(player));
+
+	if (type == MT_REDFLAG)
 	{
-		char plname[MAXPLAYERNAME+4];
-		const char *flagtext;
-		char flagcolor;
-
-		snprintf(plname, sizeof(plname), "%s%s%s",
-				 CTFTEAMCODE(player),
-				 player_names[player - players],
-				 CTFTEAMENDCODE(player));
-
-		if (type == MT_REDFLAG)
-		{
-			flagtext = M_GetText("Red flag");
-			flagcolor = '\x85';
-		}
-		else
-		{
-			flagtext = M_GetText("Blue flag");
-			flagcolor = '\x84';
-		}
-
-		if (toss)
-			CONS_Printf(M_GetText("%s tossed the %c%s%c.\n"), plname, flagcolor, flagtext, 0x80);
-		else
-			CONS_Printf(M_GetText("%s dropped the %c%s%c.\n"), plname, flagcolor, flagtext, 0x80);
+		flagtext = M_GetText("Red flag");
+		flagcolor = '\x85';
 	}
+	else
+	{
+		flagtext = M_GetText("Blue flag");
+		flagcolor = '\x84';
+	}
+
+	if (toss)
+		CONS_Printf(M_GetText("%s tossed the %c%s%c.\n"), plname, flagcolor, flagtext, 0x80);
+	else
+		CONS_Printf(M_GetText("%s dropped the %c%s%c.\n"), plname, flagcolor, flagtext, 0x80);
 
 	player->gotflag = 0;
 
diff --git a/src/p_lights.c b/src/p_lights.c
index 2da38d1dc..ba7be57d7 100644
--- a/src/p_lights.c
+++ b/src/p_lights.c
@@ -78,7 +78,7 @@ fireflicker_t *P_SpawnAdjustableFireFlicker(sector_t *minsector, sector_t *maxse
 
 	P_AddThinker(&flick->thinker);
 
-	flick->thinker.function.acp1 = (actionf_p1)T_FireFlicker;
+	flick->thinker.function = (actionf_p1)T_FireFlicker;
 	flick->sector = maxsector;
 	flick->maxlight = maxsector->lightlevel;
 	flick->minlight = minsector->lightlevel;
@@ -140,7 +140,7 @@ void P_SpawnLightningFlash(sector_t *sector)
 
 	if (sector->lightingdata)
 	{
-		if (((lightflash_t *)sector->lightingdata)->thinker.function.acp1
+		if (((lightflash_t *)sector->lightingdata)->thinker.function
 			== (actionf_p1)T_LightningFlash)
 		{
 			// lightning was already flashing in this sector
@@ -157,7 +157,7 @@ void P_SpawnLightningFlash(sector_t *sector)
 
 	P_AddThinker(&flash->thinker);
 
-	flash->thinker.function.acp1 = (actionf_p1)T_LightningFlash;
+	flash->thinker.function = (actionf_p1)T_LightningFlash;
 	flash->sector = sector;
 	flash->maxlight = 255;
 	flash->minlight = minlight;
@@ -219,7 +219,7 @@ strobe_t *P_SpawnAdjustableStrobeFlash(sector_t *minsector, sector_t *maxsector,
 	flash->sector = maxsector;
 	flash->darktime = darktime;
 	flash->brighttime = brighttime;
-	flash->thinker.function.acp1 = (actionf_p1)T_StrobeFlash;
+	flash->thinker.function = (actionf_p1)T_StrobeFlash;
 	flash->maxlight = maxsector->lightlevel;
 	flash->minlight = minsector->lightlevel;
 
@@ -301,7 +301,7 @@ glow_t *P_SpawnAdjustableGlowingLight(sector_t *minsector, sector_t *maxsector,
 		g->minlight = g->maxlight;
 		g->maxlight = oops;
 	}
-	g->thinker.function.acp1 = (actionf_p1)T_Glow;
+	g->thinker.function = (actionf_p1)T_Glow;
 	g->direction = 1;
 	g->speed = length/4;
 	if (g->speed > (g->maxlight - g->minlight)/2) // don't make it ridiculous speed
@@ -347,7 +347,7 @@ void P_FadeLight(INT16 tag, INT32 destvalue, INT32 speed)
 
 		P_RemoveLighting(sector); // remove the old lighting effect first
 		ll = Z_Calloc(sizeof (*ll), PU_LEVSPEC, NULL);
-		ll->thinker.function.acp1 = (actionf_p1)T_LightFade;
+		ll->thinker.function = (actionf_p1)T_LightFade;
 		sector->lightingdata = ll; // set it to the lightlevel_t
 
 		P_AddThinker(&ll->thinker); // add thinker
diff --git a/src/p_local.h b/src/p_local.h
index e1a07526a..de62c86a1 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -66,19 +66,38 @@
 
 // both the head and tail of the thinker list
 extern thinker_t thinkercap;
+extern thinker_t precipcap;
+extern mobj_t *mobjcache;
 
 void P_InitThinkers(void);
 void P_AddThinker(thinker_t *thinker);
+void P_AddPrecipThinker(thinker_t *thinker);
 void P_RemoveThinker(thinker_t *thinker);
+void P_UnlinkThinker(thinker_t *thinker);
 
 //
 // P_USER
 //
+
 typedef struct camera_s
 {
 	boolean chase;
+	boolean freecam;
+
+	angle_t localangle;
+	INT32 localaiming;
+
 	angle_t aiming;
 
+	// Freecam: A button was held since entering from menu, so don't move camera
+	UINT8 button_a_held;
+
+	// Freecam: aiming needs to be reset after switching from chasecam
+	boolean reset_aiming;
+
+	// Hold up/down to pan the camera vertically
+	SINT8 dpad_y_held;
+
 	// Things used by FS cameras.
 	fixed_t viewheight;
 	angle_t startangle;
@@ -108,34 +127,30 @@ typedef struct camera_s
 
 	// SRB2Kart: camera pans while drifting
 	fixed_t pan;
+
+	// postproccess effects
+	UINT8 postimg;
 } camera_t;
 
-// demo freecam or something before i commit die
-struct demofreecam_s {
-
-	camera_t *cam;	// this is useful when the game is paused, notably
-	mobj_t *soundmobj;	// mobj to play sound from, used in s_sound
-	
-	angle_t localangle;	// keeps track of the cam angle for cmds
-	angle_t localaiming;	// ditto with aiming
-	boolean turnheld;	// holding turn button for gradual turn speed
-	boolean keyboardlook;	// keyboard look
+// post process types
+enum
+{
+	POSTIMG_WATER	= 1,	// Underwater screen effect.
+	POSTIMG_MOTION	= 1<<1, // Unused motion blur effect.
+	POSTIMG_FLIP	= 1<<2, // Flipcam screen effect.
+	POSTIMG_HEAT	= 1<<3, // Heatwave screen effect.
+	POSTIMG_MIRROR	= 1<<4, // encore screen effect.
 };
 
-extern struct demofreecam_s democam;
-
 extern camera_t camera[MAXSPLITSCREENPLAYERS];
-extern consvar_t cv_cam_dist, cv_cam_still, cv_cam_height;
-extern consvar_t cv_cam_speed, cv_cam_rotate, cv_cam_rotspeed;
+extern consvar_t cv_cam_dist[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_cam_still[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_cam_height[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_cam_speed[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_cam_rotate[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_cam_timeover[MAXSPLITSCREENPLAYERS];
 
-extern consvar_t cv_cam2_dist, cv_cam2_still, cv_cam2_height;
-extern consvar_t cv_cam2_speed, cv_cam2_rotate, cv_cam2_rotspeed;
-
-extern consvar_t cv_cam3_dist, cv_cam3_still, cv_cam3_height;
-extern consvar_t cv_cam3_speed, cv_cam3_rotate, cv_cam3_rotspeed;
-
-extern consvar_t cv_cam4_dist, cv_cam4_still, cv_cam4_height;
-extern consvar_t cv_cam4_speed, cv_cam4_rotate, cv_cam4_rotspeed;
+extern consvar_t cv_freecam_speed[MAXSPLITSCREENPLAYERS];
 
 extern consvar_t cv_tilting;
 extern consvar_t cv_quaketilt;
@@ -143,10 +158,13 @@ extern consvar_t cv_tiltsmoothing;
 
 extern consvar_t cv_actionmovie;
 
-extern fixed_t t_cam_dist, t_cam_height, t_cam_rotate;
-extern fixed_t t_cam2_dist, t_cam2_height, t_cam2_rotate;
-extern fixed_t t_cam3_dist, t_cam3_height, t_cam3_rotate;
-extern fixed_t t_cam4_dist, t_cam4_height, t_cam4_rotate;
+extern consvar_t cv_screenquake;
+
+extern consvar_t cv_lookbackmom[MAXSPLITSCREENPLAYERS];
+
+extern consvar_t cv_verticallook[MAXSPLITSCREENPLAYERS];
+
+extern fixed_t t_cam_rotate[MAXSPLITSCREENPLAYERS];
 
 fixed_t P_GetPlayerHeight(player_t *player);
 fixed_t P_GetPlayerSpinHeight(player_t *player);
@@ -154,15 +172,17 @@ void P_AddPlayerScore(player_t *player, UINT32 amount);
 void P_ResetCamera(player_t *player, camera_t *thiscam);
 boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam);
 void P_SlideCameraMove(camera_t *thiscam);
-void P_DemoCameraMovement(camera_t *cam);
+//void P_DemoCameraMovement(camera_t *cam, UINT8 num);
 boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcalled);
 void P_ResetLocalCamAiming(player_t *player);
-void P_InitCameraCmd(void);
+void P_ToggleDemoCamera(UINT8 viewnum);
+void P_CalcChasePostImg(player_t *player, camera_t *thiscam);
 boolean P_PlayerInPain(player_t *player);
 void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor);
 void P_ResetPlayer(player_t *player);
-boolean P_IsLocalPlayer(player_t *player);
-boolean P_IsDisplayPlayer(player_t *player);
+boolean P_IsLocalPlayer(const player_t *player);
+boolean P_IsDisplayPlayer(const player_t *player);
+
 boolean P_SpectatorJoinGame(player_t *player);
 
 boolean P_IsObjectInGoop(mobj_t *mo);
@@ -215,11 +235,10 @@ boolean P_PlayerMoving(INT32 pnum);
 void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range);
 
 void P_PlayLivesJingle(player_t *player);
-void P_PlayRinglossSound(mobj_t *source);
+void P_PlayRinglossSound(mobj_t *source, mobj_t *damager);
 void P_PlayDeathSound(mobj_t *source);
 void P_PlayVictorySound(mobj_t *source);
 
-
 //
 // P_MOBJ
 //
@@ -241,11 +260,10 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);
 
 mobj_t *P_SpawnShadowMobj(mobj_t * caster);
 
-void P_RecalcPrecipInSector(sector_t *sector);
 void P_PrecipitationEffects(void);
 
 void P_RemoveMobj(mobj_t *th);
-boolean P_MobjWasRemoved(mobj_t *th);
+
 void P_RemoveSavegameMobj(mobj_t *th);
 boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state);
 boolean P_SetMobjState(mobj_t *mobj, statenum_t state);
@@ -257,6 +275,12 @@ boolean P_RailThinker(mobj_t *mobj);
 void P_PushableThinker(mobj_t *mobj);
 void P_SceneryThinker(mobj_t *mobj);
 
+// This does not need to be added to Lua.
+// To test it in Lua, check mobj.valid
+FUNCINLINE static ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj)
+{
+	return (!mobj || mobj->thinker.function != (actionf_p1)P_MobjThinker);
+}
 
 fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect);
 fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect);
@@ -288,7 +312,14 @@ mobj_t *P_SPMAngle(mobj_t *source, mobjtype_t type, angle_t angle, UINT8 aimtype
 #define P_SpawnNameFinder(s,t) P_SPMAngle(s,t,s->angle,true,0)
 #endif
 void P_ColorTeamMissile(mobj_t *missile, player_t *source);
-SINT8 P_MobjFlip(mobj_t *mobj);
+
+// P_MobjFlip
+// Special utility to return +1 or -1 depending on mobj's gravity
+FUNCINLINE static ATTRINLINE SINT8 P_MobjFlip(const mobj_t *mobj)
+{
+	return (mobj && (mobj->eflags & MFE_VERTICALFLIP)) ? -1 : 1;
+}
+
 fixed_t P_GetMobjGravity(mobj_t *mo);
 FUNCMATH boolean P_WeaponOrPanel(mobjtype_t type);
 
@@ -343,8 +374,6 @@ extern line_t *ceilingline;
 extern line_t *blockingline;
 extern msecnode_t *sector_list;
 
-extern mprecipsecnode_t *precipsector_list;
-
 void P_UnsetThingPosition(mobj_t *thing);
 void P_SetThingPosition(mobj_t *thing);
 void P_SetUnderlayPosition(mobj_t *thing);
@@ -358,13 +387,16 @@ boolean P_MoveOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z);
 void P_SlideMove(mobj_t *mo, boolean forceslide);
 void P_BouncePlayerMove(mobj_t *mo);
 void P_BounceMove(mobj_t *mo);
-boolean P_CheckSight(mobj_t *t1, mobj_t *t2);
+
+#define P_CheckSight(t1, t2) P_CheckSight2(t1, t2, false)
+#define P_CheckSightFast(t1, t2) P_CheckSight2(t1, t2, true)
+boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast);
+
 void P_CheckHoopPosition(mobj_t *hoopthing, fixed_t x, fixed_t y, fixed_t z, fixed_t radius);
 
 boolean P_CheckSector(sector_t *sector, boolean crunch);
 
 void P_DelSeclist(msecnode_t *node);
-void P_DelPrecipSeclist(mprecipsecnode_t *node);
 
 void P_CreateSecNodeList(mobj_t *thing, fixed_t x, fixed_t y);
 void P_Initsecnode(void);
@@ -389,24 +421,25 @@ extern fixed_t bmaporgy; // origin of block map
 extern mobj_t **blocklinks; // for thing chains
 extern precipmobj_t **precipblocklinks; // special blockmap for precip rendering
 
+extern struct minimapinfo
+{
+	patch_t *minimap_pic;
+	INT32 min_x, min_y;
+	INT32 max_x, max_y;
+	INT32 map_w, map_h;
+	INT32 minimap_w, minimap_h;
+	fixed_t offs_x, offs_y;
+	fixed_t zoom;
+} minimapinfo;
+
 //
 // P_INTER
 //
-typedef struct BasicFF_s
-{
-	INT32 ForceX; ///< The X of the Force's Vel
-	INT32 ForceY; ///< The Y of the Force's Vel
-	const player_t *player; ///< Player of Rumble
-	//All
-	UINT32 Duration; ///< The total duration of the effect, in microseconds
-	INT32 Gain; ///< /The gain to be applied to the effect, in the range from 0 through 10,000.
-	//All, CONSTANTFORCE �10,000 to 10,000
-	INT32 Magnitude; ///< Magnitude of the effect, in the range from 0 through 10,000.
-} BasicFF_t;
 
-void P_ForceFeed(const player_t *player, INT32 attack, INT32 fade, tic_t duration, INT32 period);
-void P_ForceConstant(const BasicFF_t *FFInfo);
-void P_RampConstant(const BasicFF_t *FFInfo, INT32 Start, INT32 End);
+// replace damage magic numbers with smth readable
+#define DMG_INSTAKILL 10000
+#define DMG_SPECTATOR 42000
+
 void P_RemoveShield(player_t *player);
 boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage);
 void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source);
@@ -419,7 +452,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck);
 void P_PlayerFlagBurst(player_t *player, boolean toss);
 void P_CheckTimeLimit(void);
 void P_CheckPointLimit(void);
-//void P_CheckSurvivors(void);
 boolean P_CheckRacers(void);
 
 boolean P_CanPickupItem(player_t *player, UINT8 weapon);
@@ -444,7 +476,6 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle
 boolean P_SetMobjStateNF(mobj_t *mobj, statenum_t state);
 boolean P_CheckMissileSpawn(mobj_t *th);
 void P_Thrust(mobj_t *mo, angle_t angle, fixed_t move);
-void P_DoSuperTransformation(player_t *player, boolean giverings);
 void P_ExplodeMissile(mobj_t *mo);
 void P_CheckGravity(mobj_t *mo, boolean affect);
 
diff --git a/src/p_map.c b/src/p_map.c
index bcb2b6a73..4a73dcd19 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -26,6 +26,7 @@
 #include "s_sound.h"
 #include "w_wad.h"
 #include "k_kart.h" // SRB2kart 011617
+#include "k_stats.h"
 
 #include "hu_stuff.h" // SRB2kart
 #include "i_system.h" // SRB2kart
@@ -46,9 +47,6 @@ static INT32 tmflags;
 fixed_t tmx;
 fixed_t tmy;
 
-static precipmobj_t *tmprecipthing;
-static fixed_t preciptmbbox[4];
-
 // If "floatok" true, move would be ok
 // if within "tmfloorz - tmceilingz".
 boolean floatok;
@@ -68,7 +66,6 @@ line_t *ceilingline;
 line_t *blockingline;
 
 msecnode_t *sector_list = NULL;
-mprecipsecnode_t *precipsector_list = NULL;
 camera_t *mapcampointer;
 
 //
@@ -76,9 +73,9 @@ camera_t *mapcampointer;
 //
 
 //
-// P_TeleportMove
+// P_MoveOrigin - P_TeleportMove which KEEPS interpolation values.
 //
-static boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z)
+boolean P_MoveOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z)
 {
 	// the move is ok,
 	// so link the thing into its new position
@@ -108,28 +105,19 @@ static boolean P_TeleportMove(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z)
 	return true;
 }
 
+//
 // P_SetOrigin - P_TeleportMove which RESETS interpolation values.
 //
 boolean P_SetOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z)
 {
-	boolean result = P_TeleportMove(thing, x, y, z);
-
-	if (result == true)
+	if (P_MoveOrigin(thing, x, y, z))
 	{
 		thing->old_x = thing->x;
 		thing->old_y = thing->y;
 		thing->old_z = thing->z;
 	}
 
-	return result;
-}
-
-//
-// P_MoveOrigin - P_TeleportMove which KEEPS interpolation values.
-//
-boolean P_MoveOrigin(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z)
-{
-	return P_TeleportMove(thing, x, y, z);
+	return true;
 }
 
 // =========================================================================
@@ -152,7 +140,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 	if (object->player && object->player->spectator)
 		return false;
 
-	if (object->player && (object->player->pflags & PF_NIGHTSMODE))
+	if (UNLIKELY(object->player && (object->player->pflags & PF_NIGHTSMODE)))
 	{
 		/*Someone want to make these work like bumpers?*/
 		return false;
@@ -235,14 +223,15 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 
 			if (!demo.playback || P_AnalogMove(object->player))
 			{
-				if (object->player == &players[consoleplayer])
-					localangle[0] = spring->angle;
-				else if (object->player == &players[displayplayers[1]])
-					localangle[1] = spring->angle;
-				else if (object->player == &players[displayplayers[2]])
-					localangle[2] = spring->angle;
-				else if (object->player == &players[displayplayers[3]])
-					localangle[3] = spring->angle;
+				for (UINT8 j = 0; j <= splitscreen; ++j)
+				{
+					INT32 id = (j == 0 ? consoleplayer : displayplayers[j]);
+					if (object->player == &players[id])
+					{
+						localangle[j] = spring->angle;
+						break;
+					}
+				}
 			}
 		}
 
@@ -319,78 +308,6 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
 	}
 }
 
-#if 0
-static void P_DoTailsCarry(player_t *sonic, player_t *tails)
-{
-	INT32 p;
-	fixed_t zdist; // z distance between the two players' bottoms
-
-	if ((tails->pflags & PF_CARRIED) && tails->mo->tracer == sonic->mo)
-		return;
-	if ((sonic->pflags & PF_CARRIED) && sonic->mo->tracer == tails->mo)
-		return;
-	if (tails->bot == 1)
-		return;
-
-	if (sonic->pflags & PF_NIGHTSMODE)
-		return;
-
-	if (sonic->mo->tracer && sonic->mo->tracer->type == MT_TUBEWAYPOINT
-	&& !(sonic->pflags & PF_ROPEHANG))
-		return; // don't steal players from zoomtubes!
-
-	if ((sonic->mo->eflags & MFE_VERTICALFLIP) != (tails->mo->eflags & MFE_VERTICALFLIP))
-		return; // Both should be in same gravity
-
-	if (tails->mo->eflags & MFE_VERTICALFLIP)
-	{
-		if (tails->mo->ceilingz - (tails->mo->z + tails->mo->height) < sonic->mo->height-FixedMul(2*FRACUNIT, sonic->mo->scale))
-			return;
-	}
-	else if (tails->mo->z - tails->mo->floorz < sonic->mo->height-FixedMul(2*FRACUNIT, sonic->mo->scale))
-		return; // No room to pick up this guy!
-
-	// Search in case another player is already being carried by this fox.
-	for (p = 0; p < MAXPLAYERS; p++)
-		if (playeringame[p] && players[p].mo
-		&& players[p].pflags & PF_CARRIED && players[p].mo->tracer == tails->mo)
-			return;
-
-	if (tails->mo->eflags & MFE_VERTICALFLIP)
-		zdist = (sonic->mo->z + sonic->mo->height) - (tails->mo->z + tails->mo->height);
-	else
-		zdist = tails->mo->z - sonic->mo->z;
-
-	if (zdist <= sonic->mo->height + FixedMul(FRACUNIT, sonic->mo->scale)
-		&& zdist > sonic->mo->height*2/3
-		&& P_MobjFlip(tails->mo)*sonic->mo->momz <= 0)
-	{
-	// Why block opposing teams from tailsflying each other?
-		// Sneaking into the hands of a flying tails player in Race might be a viable strategy, who knows.
-		if (tails->spectator || sonic->spectator || G_RaceGametype()) // SRB2kart
-			sonic->pflags &= ~PF_CARRIED;
-		else
-		{
-			if (sonic-players == consoleplayer && botingame)
-				//CV_SetValue(&cv_analog2, false);
-			P_ResetPlayer(sonic);
-			P_SetTarget(&sonic->mo->tracer, tails->mo);
-			sonic->pflags |= PF_CARRIED;
-			S_StartSound(sonic->mo, sfx_s3k4a);
-			P_UnsetThingPosition(sonic->mo);
-			sonic->mo->x = tails->mo->x;
-			sonic->mo->y = tails->mo->y;
-			P_SetThingPosition(sonic->mo);
-		}
-	}
-	else {
-		if (sonic-players == consoleplayer && botingame)
-			//CV_SetValue(&cv_analog2, true);
-		sonic->pflags &= ~PF_CARRIED;
-	}
-}
-#endif
-
 //
 // PIT_CheckThing
 //
@@ -404,7 +321,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		return true;
 
 	// Ignore... things.
-	if (!tmthing || !thing || P_MobjWasRemoved(thing))
+	if (!tmthing || P_MobjWasRemoved(thing))
 		return true;
 
 	I_Assert(!P_MobjWasRemoved(tmthing));
@@ -416,11 +333,11 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		return true;
 
 #ifdef SEENAMES
-  // Do name checks all the way up here
-  // So that NOTHING ELSE can see MT_NAMECHECK because it is client-side.
-	if (tmthing->type == MT_NAMECHECK)
+	// Do name checks all the way up here
+	// So that NOTHING ELSE can see MT_NAMECHECK because it is client-side.
+	if (UNLIKELY(tmthing->type == MT_NAMECHECK))
 	{
-	  // Ignore things that aren't players, ignore spectators, ignore yourself.
+	    // Ignore things that aren't players, ignore spectators, ignore yourself.
 		// (also don't bother to check that tmthing->target->player is non-NULL because we're not actually using it here.)
 		if (!thing->player || thing->player->spectator || (tmthing->target && thing->player == tmthing->target->player))
 			return true;
@@ -444,8 +361,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		return true;
 
 	// Don't collide with your buddies while NiGHTS-flying.
-	if (tmthing->player && thing->player && (maptol & TOL_NIGHTS)
-		&& ((tmthing->player->pflags & PF_NIGHTSMODE) || (thing->player->pflags & PF_NIGHTSMODE)))
+	if (UNLIKELY(tmthing->player && thing->player && (maptol & TOL_NIGHTS)
+		&& ((tmthing->player->pflags & PF_NIGHTSMODE) || (thing->player->pflags & PF_NIGHTSMODE))))
 		return true;
 
 	blockdist = thing->radius + tmthing->radius;
@@ -521,7 +438,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 	}
 
 	{
-		UINT8 shouldCollide = LUAh_MobjCollide(thing, tmthing); // checks hook for thing's type
+		UINT8 shouldCollide = LUA_Hook2Mobj(thing, tmthing, MOBJ_HOOK(MobjCollide)); // checks hook for thing's type
 		if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing))
 			return true; // one of them was removed???
 		if (shouldCollide == 1)
@@ -530,7 +447,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 			return true; // force no collide
 	}
 	{
-		UINT8 shouldCollide = LUAh_MobjMoveCollide(tmthing, thing); // checks hook for tmthing's type
+		UINT8 shouldCollide = LUA_Hook2Mobj(tmthing, thing, MOBJ_HOOK(MobjMoveCollide)); // checks hook for tmthing's type
 		if (P_MobjWasRemoved(tmthing) || P_MobjWasRemoved(thing))
 			return true; // one of them was removed???
 		if (shouldCollide == 1)
@@ -588,20 +505,15 @@ static boolean PIT_CheckThing(mobj_t *thing)
 	// check for skulls slamming into things
 	if (tmthing->flags2 & MF2_SKULLFLY)
 	{
-		/*if (tmthing->type == MT_EGGMOBILE) // Don't make Eggman stop!
-			return true; // Let him RUN YOU RIGHT OVER. >:3
-		else*/
-		{
-			// see if it went over / under
-			if (tmthing->z > thing->z + thing->height)
-				return true; // overhead
-			if (tmthing->z + tmthing->height < thing->z)
-				return true; // underneath
+		// see if it went over / under
+		if (tmthing->z > thing->z + thing->height)
+			return true; // overhead
+		if (tmthing->z + tmthing->height < thing->z)
+			return true; // underneath
 
-			tmthing->flags2 &= ~MF2_SKULLFLY;
-			tmthing->momx = tmthing->momy = tmthing->momz = 0;
-			return false; // stop moving
-		}
+		tmthing->flags2 &= ~MF2_SKULLFLY;
+		tmthing->momx = tmthing->momy = tmthing->momz = 0;
+		return false; // stop moving
 	}
 
 	// SRB2kart 011617 - Colission[sic] code for kart items //{
@@ -629,10 +541,6 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		if (thing->health)
 			P_KillMobj(thing, tmthing, tmthing);
 
-		/*if (tmthing->player && (tmthing->player->kartstuff[k_invincibilitytimer] > 0
-			|| tmthing->player->kartstuff[k_growshrinktimer] > 0))
-			return true;*/
-
 		K_KartBouncing(tmthing, thing, false, true);
 		return false;
 	}
@@ -794,12 +702,14 @@ static boolean PIT_CheckThing(mobj_t *thing)
 
 		if (thing->type == MT_PLAYER)
 		{
+			K_StatPlayerSink(thing->player, P_MobjWasRemoved(tmthing->target) ? NULL : tmthing->target->player);
+
 			S_StartSound(NULL, sfx_bsnipe); //let all players hear it.
 			HU_SetCEchoFlags(0);
 			HU_SetCEchoDuration(5);
 			HU_DoCEcho(va("%s\\was hit by a kitchen sink.\\\\\\\\", player_names[thing->player-players]));
 			I_OutputMsg("%s was hit by a kitchen sink.\n", player_names[thing->player-players]);
-			P_DamageMobj(thing, tmthing, tmthing->target, 10000);
+			P_DamageMobj(thing, tmthing, tmthing->target, DMG_INSTAKILL);
 			P_KillMobj(tmthing, thing, thing);
 		}
 
@@ -813,7 +723,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
 		if (tmthing->z + tmthing->height < thing->z)
 			return true; // underneath
 
-		if (!(thing->type == MT_PLAYER))
+		if (thing->type != MT_PLAYER)
 			return true;
 
 		if (thing->player && thing->player->powers[pw_flashing])
@@ -1061,12 +971,14 @@ static boolean PIT_CheckThing(mobj_t *thing)
 			if ((thing->target == tmthing) && (thing->threshold > 0))
 				return true;
 
+			K_StatPlayerSink(tmthing->player, P_MobjWasRemoved(thing->target) ? NULL : thing->target->player);
+
 			S_StartSound(NULL, sfx_cgot); //let all players hear it.
 			HU_SetCEchoFlags(0);
 			HU_SetCEchoDuration(5);
 			HU_DoCEcho(va("%s\\was hit by a kitchen sink.\\\\\\\\", player_names[tmthing->player-players]));
 			I_OutputMsg("%s was hit by a kitchen sink.\n", player_names[tmthing->player-players]);
-			P_DamageMobj(tmthing, thing, thing->target, 10000);
+			P_DamageMobj(tmthing, thing, thing->target, DMG_INSTAKILL);
 			P_KillMobj(thing, tmthing, tmthing);
 		}
 
@@ -1676,7 +1588,7 @@ static boolean PIT_CheckLine(line_t *ld)
 	if (P_BoxOnLineSide(tmbbox, ld) != -1)
 		return true;
 
-if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag.
+	if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag.
 	{
 		fixed_t cosradius, sinradius;
 		cosradius = FixedMul(tmthing->radius, FINECOSINE(tmthing->angle>>ANGLETOFINESHIFT));
@@ -1779,9 +1691,9 @@ if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a
 boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 {
 	INT32 xl, xh, yl, yh, bx, by;
-	subsector_t *newsubsec;
+	sector_t *newsec;
 	boolean blockval = true;
-	
+
 	ps_checkposition_calls.value.i++;
 
 	I_Assert(thing != NULL);
@@ -1801,40 +1713,45 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 	tmbbox[BOXRIGHT] = x + tmthing->radius;
 	tmbbox[BOXLEFT] = x - tmthing->radius;
 
-	newsubsec = R_PointInSubsector(x, y);
+	if (thing->x != x || thing->y != y || thing->subsector == NULL)
+		newsec = R_PointInSubsector(x, y)->sector;
+	else
+		newsec = thing->subsector->sector;
+
 	ceilingline = blockingline = NULL;
 
 	// The base floor / ceiling is from the subsector
 	// that contains the point.
 	// Any contacted lines the step closer together
 	// will adjust them.
-	tmfloorz = tmdropoffz = P_GetFloorZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->floorheight;
-	tmceilingz = P_GetCeilingZ(thing, newsubsec->sector, x, y, NULL); //newsubsec->sector->ceilingheight;
-	tmfloorslope = newsubsec->sector->f_slope;
-	tmceilingslope = newsubsec->sector->c_slope;
+	tmfloorz = tmdropoffz = P_GetFloorZ(thing, newsec, x, y, NULL); //newsec->floorheight;
+	tmceilingz = P_GetCeilingZ(thing, newsec, x, y, NULL); //newsec->ceilingheight;
+	tmfloorslope = newsec->f_slope;
+	tmceilingslope = newsec->c_slope;
 
 	// Check list of fake floors and see if tmfloorz/tmceilingz need to be altered.
-	if (newsubsec->sector->ffloors)
+	if (newsec->ffloors)
 	{
 		ffloor_t *rover;
 		fixed_t delta1, delta2;
 		INT32 thingtop = thing->z + thing->height;
 
-		for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
+		for (rover = newsec->ffloors; rover; rover = rover->next)
 		{
-			fixed_t topheight, bottomheight;
+			fixed_t topheight, bottomheight, midheight;
 
 			if (!(rover->flags & FF_EXISTS))
 				continue;
 
-			topheight = P_GetFOFTopZ(thing, newsubsec->sector, rover, x, y, NULL);
-			bottomheight = P_GetFOFBottomZ(thing, newsubsec->sector, rover, x, y, NULL);
+			topheight    = P_GetFOFTopZ(thing, newsec, rover, x, y, NULL);
+			bottomheight = P_GetFOFBottomZ(thing, newsec, rover, x, y, NULL);
 
 			if ((rover->flags & (FF_SWIMMABLE|FF_GOOWATER)) == (FF_SWIMMABLE|FF_GOOWATER) && !(thing->flags & MF_NOGRAVITY))
 			{
 				// If you're inside goowater and slowing down
 				fixed_t sinklevel = FixedMul(thing->info->height/6, thing->scale);
 				fixed_t minspeed = FixedMul(thing->info->height/9, thing->scale);
+
 				if (thing->z < topheight && bottomheight < thingtop
 				&& abs(thing->momz) < minspeed)
 				{
@@ -1849,14 +1766,16 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 					// Land on the top or the bottom, depending on gravity flip.
 					if (!(thing->eflags & MFE_VERTICALFLIP) && thing->z >= topheight - sinklevel && thing->momz <= 0)
 					{
-						if (tmfloorz < topheight - sinklevel) {
+						if (tmfloorz < topheight - sinklevel)
+						{
 							tmfloorz = topheight - sinklevel;
 							tmfloorslope = *rover->t_slope;
 						}
 					}
 					else if (thing->eflags & MFE_VERTICALFLIP && thingtop <= bottomheight + sinklevel && thing->momz >= 0)
 					{
-						if (tmceilingz > bottomheight + sinklevel) {
+						if (tmceilingz > bottomheight + sinklevel)
+						{
 							tmceilingz = bottomheight + sinklevel;
 							tmceilingslope = *rover->b_slope;
 						}
@@ -1878,7 +1797,8 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 			{
 				if (thing->z < topheight && bottomheight < thingtop)
 				{
-					if (tmfloorz < thing->z) {
+					if (tmfloorz < thing->z)
+					{
 						tmfloorz = thing->z;
 						tmfloorslope = NULL;
 					}
@@ -1887,10 +1807,10 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 				continue;
 			}
 
-			delta1 = thing->z - (bottomheight
-				+ ((topheight - bottomheight)/2));
-			delta2 = thingtop - (bottomheight
-				+ ((topheight - bottomheight)/2));
+			midheight = (bottomheight + ((topheight - bottomheight)/2));
+
+			delta1 = thing->z - midheight;
+			delta2 = thingtop - midheight;
 
 			if (topheight > tmfloorz && abs(delta1) < abs(delta2)
 				&& !(rover->flags & FF_REVERSEPLATFORM))
@@ -1898,6 +1818,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 				tmfloorz = tmdropoffz = topheight;
 				tmfloorslope = *rover->t_slope;
 			}
+
 			if (bottomheight < tmceilingz && abs(delta1) >= abs(delta2)
 				&& !(rover->flags & FF_PLATFORM)
 				&& !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)))
@@ -1921,10 +1842,13 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 	BMBOUNDFIX(xl, xh, yl, yh);
 
 	// Check polyobjects and see if tmfloorz/tmceilingz need to be altered
+	// do we really have to iterate through the complete blockmap for polyobjects if there are no polyobjects on the map?
+	if (numPolyObjects)
 	{
 		validcount++;
 
 		for (by = yl; by <= yh; by++)
+		{
 			for (bx = xl; bx <= xh; bx++)
 			{
 				INT32 offset;
@@ -1975,12 +1899,14 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 						delta1 = thing->z - (polybottom + ((polytop - polybottom)/2));
 						delta2 = thingtop - (polybottom + ((polytop - polybottom)/2));
 
-						if (polytop > tmfloorz && abs(delta1) < abs(delta2)) {
+						if (polytop > tmfloorz && abs(delta1) < abs(delta2))
+						{
 							tmfloorz = tmdropoffz = polytop;
 							tmfloorslope = NULL;
 						}
 
-						if (polybottom < tmceilingz && abs(delta1) >= abs(delta2)) {
+						if (polybottom < tmceilingz && abs(delta1) >= abs(delta2))
+						{
 							tmceilingz = tmdrpoffceilz = polybottom;
 							tmceilingslope = NULL;
 						}
@@ -1988,6 +1914,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
 					plink = (polymaplink_t *)(plink->link.next);
 				}
 			}
+		}
 	}
 
 	// tmfloorthing is set when tmfloorz comes from a thing's top
@@ -2058,7 +1985,7 @@ void P_CheckHoopPosition(mobj_t *hoopthing, fixed_t x, fixed_t y, fixed_t z, fix
 boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 {
 	INT32 xl, xh, yl, yh, bx, by;
-	subsector_t *newsubsec;
+	sector_t *newsec;
 
 	tmx = x;
 	tmy = y;
@@ -2068,12 +1995,16 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 	tmbbox[BOXRIGHT] = x + thiscam->radius;
 	tmbbox[BOXLEFT] = x - thiscam->radius;
 
-	newsubsec = R_PointInSubsector(x, y);
+	if (thiscam->x != x || thiscam->y != y || thiscam->subsector == NULL)
+		newsec = R_PointInSubsectorFast(x, y)->sector;
+	else
+		newsec = thiscam->subsector->sector;
+
 	ceilingline = blockingline = NULL;
 
 	mapcampointer = thiscam;
 
-	if (GETSECSPECIAL(newsubsec->sector->special, 4) == 12)
+	if (UNLIKELY(GETSECSPECIAL(newsec->special, 4) == 12))
 	{ // Camera noclip on entire sector.
 		tmfloorz = tmdropoffz = thiscam->z;
 		tmceilingz = tmdrpoffceilz = thiscam->z + thiscam->height;
@@ -2084,45 +2015,47 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 	// that contains the point.
 	// Any contacted lines the step closer together
 	// will adjust them.
-	tmfloorz = tmdropoffz = P_CameraGetFloorZ(thiscam, newsubsec->sector, x, y, NULL);
+	tmfloorz = tmdropoffz = P_CameraGetFloorZ(thiscam, newsec, x, y, NULL);
 
-	tmceilingz = P_CameraGetCeilingZ(thiscam, newsubsec->sector, x, y, NULL);
+	tmceilingz = P_CameraGetCeilingZ(thiscam, newsec, x, y, NULL);
 
 	// Cameras use the heightsec's heights rather then the actual sector heights.
 	// If you can see through it, why not move the camera through it too?
-	if (newsubsec->sector->heightsec >= 0)
+	if (newsec->heightsec >= 0)
 	{
-		tmfloorz = tmdropoffz = sectors[newsubsec->sector->heightsec].floorheight;
-		tmceilingz = tmdrpoffceilz = sectors[newsubsec->sector->heightsec].ceilingheight;
+		tmfloorz = tmdropoffz = sectors[newsec->heightsec].floorheight;
+		tmceilingz = tmdrpoffceilz = sectors[newsec->heightsec].ceilingheight;
 	}
 
 	// Use preset camera clipping heights if set with Sector Special Parameters whose control sector has Camera Intangible special -Red
-	if (newsubsec->sector->camsec >= 0)
+	if (newsec->camsec >= 0)
 	{
-		tmfloorz = tmdropoffz = sectors[newsubsec->sector->camsec].floorheight;
-		tmceilingz = tmdrpoffceilz = sectors[newsubsec->sector->camsec].ceilingheight;
+		tmfloorz = tmdropoffz = sectors[newsec->camsec].floorheight;
+		tmceilingz = tmdrpoffceilz = sectors[newsec->camsec].ceilingheight;
 	}
 
 	// Check list of fake floors and see if tmfloorz/tmceilingz need to be altered.
-	if (newsubsec->sector->ffloors)
+	if (newsec->ffloors)
 	{
 		ffloor_t *rover;
 		fixed_t delta1, delta2;
 		INT32 thingtop = thiscam->z + thiscam->height;
 
-		for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
+		for (rover = newsec->ffloors; rover; rover = rover->next)
 		{
 			fixed_t topheight, bottomheight;
-			if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
+
+			if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 				continue;
 
-			topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, x, y, NULL);
-			bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, x, y, NULL);
+			topheight    = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL);
+			bottomheight = P_CameraGetFOFBottomZ(thiscam, newsec, rover, x, y, NULL);
 
 			delta1 = thiscam->z - (bottomheight
 				+ ((topheight - bottomheight)/2));
 			delta2 = thingtop - (bottomheight
 				+ ((topheight - bottomheight)/2));
+
 			if (topheight > tmfloorz && abs(delta1) < abs(delta2))
 			{
 				tmfloorz = tmdropoffz = topheight;
@@ -2147,6 +2080,8 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 	BMBOUNDFIX(xl, xh, yl, yh);
 
 	// Check polyobjects and see if tmfloorz/tmceilingz need to be altered
+	// do we really have to iterate through the complete blockmap for polyobjects if there are no polyobjects on the map?
+	if (numPolyObjects)
 	{
 		validcount++;
 
@@ -2185,7 +2120,7 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 						// We're inside it! Yess...
 						polysec = po->lines[0]->backsector;
 
-						if (GETSECSPECIAL(polysec->special, 4) == 12)
+						if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
 						{ // Camera noclip polyobj.
 							plink = (polymaplink_t *)(plink->link.next);
 							continue;
@@ -2238,29 +2173,20 @@ boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
 //
 boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 {
-	subsector_t *s = R_PointInSubsector(x, y);
-	boolean retval = true;
-	boolean itsatwodlevel = false;
+	subsector_t *s;
 	UINT8 i;
 
 	floatok = false;
 
-	if (twodlevel)
-		itsatwodlevel = true;
-	else
-	{
-		for (i = 0; i <= splitscreen; i++)
-		{
-			if (thiscam == &camera[i] && players[displayplayers[i]].mo
-				&& (players[displayplayers[i]].mo->flags2 & MF2_TWOD))
-			{
-				itsatwodlevel = true;
-				break;
-			}
-		}
-	}
+	if (dedicated) // this crashes so don't even try it
+		return false;
 
-	if (!itsatwodlevel && players[displayplayers[0]].mo)
+	if (thiscam->x != x || thiscam->y != y || thiscam->subsector == NULL)
+		s = R_PointInSubsectorFast(x, y);
+	else
+		s = thiscam->subsector;
+
+	if (players[displayplayers[0]].mo)
 	{
 		fixed_t tryx = thiscam->x;
 		fixed_t tryy = thiscam->y;
@@ -2297,12 +2223,12 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 			else
 				tryy = y;
 
-			if (!P_CheckCameraPosition(tryx, tryy, thiscam))
-				return false; // solid wall or thing
-
 			if (tmceilingz - tmfloorz < thiscam->height)
 				return false; // doesn't fit
 
+			if (!P_CheckCameraPosition(tryx, tryy, thiscam))
+				return false; // solid wall or thing
+
 			floatok = true;
 
 			if (tmceilingz - thiscam->z < thiscam->height)
@@ -2323,11 +2249,12 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 
 			if ((tmfloorz - thiscam->z > MAXCAMERASTEPMOVE))
 				return false; // too big a step up
-		} while(tryx != x || tryy != y);
+
+		} while (tryx != x || tryy != y);
 	}
 	else
 	{
-		tmfloorz = P_CameraGetFloorZ(thiscam, thiscam->subsector->sector, x, y, NULL);
+		tmfloorz   = P_CameraGetFloorZ(thiscam, thiscam->subsector->sector, x, y, NULL);
 		tmceilingz = P_CameraGetCeilingZ(thiscam, thiscam->subsector->sector, x, y, NULL);
 	}
 
@@ -2340,7 +2267,7 @@ boolean P_TryCameraMove(fixed_t x, fixed_t y, camera_t *thiscam)
 	thiscam->y = y;
 	thiscam->subsector = s;
 
-	return retval;
+	return true;
 }
 
 //
@@ -2438,10 +2365,13 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 		radius = MAXRADIUS/2;
 
 	do {
-		if (thing->flags & MF_NOCLIP) {
+		if (thing->flags & MF_NOCLIP)
+		{
 			tryx = x;
 			tryy = y;
-		} else {
+		}
+		else
+		{
 			if (x-tryx > radius)
 				tryx += radius;
 			else if (x-tryx < -radius)
@@ -2474,14 +2404,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 				else if (P_PlayerTouchingSectorSpecial(thing->player, 1, 12)
 				|| GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 12)
 					maxstep = 0;
-
-				// Don't 'step up' while springing,
-				// Only step up "if needed".
-				/* // SRB2kart - don't need
-				if (thing->state == &states[S_PLAY_SPRING]
-				&& P_MobjFlip(thing)*thing->momz > FixedMul(FRACUNIT, thing->scale))
-					maxstep = 0;
-				*/
 			}
 
 			if (thing->type == MT_SKIM)
@@ -2592,14 +2514,16 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
 	if (!(thing->flags & MF_NOCLIPHEIGHT))
 	{
 		// Assign thing's standingslope if needed
-		if (thing->z <= tmfloorz && !(thing->eflags & MFE_VERTICALFLIP)) {
+		if (thing->z <= tmfloorz && !(thing->eflags & MFE_VERTICALFLIP))
+		{
 			if (!startingonground && tmfloorslope)
 				P_HandleSlopeLanding(thing, tmfloorslope);
 
 			if (thing->momz <= 0)
 				thing->standingslope = tmfloorslope;
 		}
-		else if (thing->z+thing->height >= tmceilingz && (thing->eflags & MFE_VERTICALFLIP)) {
+		else if (thing->z+thing->height >= tmceilingz && (thing->eflags & MFE_VERTICALFLIP))
+		{
 			if (!startingonground && tmceilingslope)
 				P_HandleSlopeLanding(thing, tmceilingslope);
 
@@ -3261,7 +3185,7 @@ stairstep:
 
 	P_HitSlideLine(bestslideline); // clip the moves
 
-	if ((twodlevel || (mo->flags2 & MF2_TWOD)) && mo->player)
+	if (UNLIKELY((twodlevel || (mo->flags2 & MF2_TWOD)) && mo->player))
 	{
 		mo->momx = tmxmove;
 		tmymove = 0;
@@ -3704,7 +3628,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
 
 						for (think = thinkercap.next; think != &thinkercap; think = think->next)
 						{
-							if (think->function.acp1 != (actionf_p1)T_StartCrumble)
+							if (think->function != (actionf_p1)T_StartCrumble)
 								continue;
 
 							crumbler = (elevator_t *)think;
@@ -3728,7 +3652,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
 		{
 			// Crush the object
 			if (netgame && thing->player && thing->player->spectator)
-				P_DamageMobj(thing, NULL, NULL, 42000); // Respawn crushed spectators
+				P_DamageMobj(thing, NULL, NULL, DMG_SPECTATOR); // Respawn crushed spectators
 			else
 			{
 				if (!killer)
@@ -3738,7 +3662,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
 					killer->threshold = 44; // Special flag for crushing
 				}
 				if (!thing->player)
-					P_DamageMobj(thing, killer, killer, 10000);
+					P_DamageMobj(thing, killer, killer, DMG_INSTAKILL);
 				else
 					K_SquishPlayer(thing->player, killer, killer); // SRB2kart - Squish instead of kill
 			}
@@ -3784,8 +3708,6 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
 
 			sec->moved = true;
 
-			P_RecalcPrecipInSector(sec);
-
 			if (!sector->attachedsolid[i])
 				continue;
 
@@ -3846,8 +3768,6 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
 
 			sec->moved = true;
 
-			P_RecalcPrecipInSector(sec);
-
 			if (!sector->attachedsolid[i])
 				continue;
 
@@ -3898,12 +3818,10 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
 */
 
 static msecnode_t *headsecnode = NULL;
-static mprecipsecnode_t *headprecipsecnode = NULL;
 
 void P_Initsecnode(void)
 {
 	headsecnode = NULL;
-	headprecipsecnode = NULL;
 }
 
 // P_GetSecnode() retrieves a node from the freelist. The calling routine
@@ -3923,20 +3841,6 @@ static msecnode_t *P_GetSecnode(void)
 	return node;
 }
 
-static mprecipsecnode_t *P_GetPrecipSecnode(void)
-{
-	mprecipsecnode_t *node;
-
-	if (headprecipsecnode)
-	{
-		node = headprecipsecnode;
-		headprecipsecnode = headprecipsecnode->m_thinglist_next;
-	}
-	else
-		node = Z_Calloc(sizeof (*node), PU_LEVEL, NULL);
-	return node;
-}
-
 // P_PutSecnode() returns a node to the freelist.
 
 static inline void P_PutSecnode(msecnode_t *node)
@@ -3945,13 +3849,6 @@ static inline void P_PutSecnode(msecnode_t *node)
 	headsecnode = node;
 }
 
-// Tails 08-25-2002
-static inline void P_PutPrecipSecnode(mprecipsecnode_t *node)
-{
-	node->m_thinglist_next = headprecipsecnode;
-	headprecipsecnode = node;
-}
-
 // P_AddSecnode() searches the current list to see if this sector is
 // already there. If not, it adds a sector node at the head of the list of
 // sectors this object appears in. This is called when creating a list of
@@ -3997,47 +3894,6 @@ static msecnode_t *P_AddSecnode(sector_t *s, mobj_t *thing, msecnode_t *nextnode
 	return node;
 }
 
-// More crazy crap Tails 08-25-2002
-static mprecipsecnode_t *P_AddPrecipSecnode(sector_t *s, precipmobj_t *thing, mprecipsecnode_t *nextnode)
-{
-	mprecipsecnode_t *node;
-
-	node = nextnode;
-	while (node)
-	{
-		if (node->m_sector == s) // Already have a node for this sector?
-		{
-			node->m_thing = thing; // Yes. Setting m_thing says 'keep it'.
-			return nextnode;
-		}
-		node = node->m_sectorlist_next;
-	}
-
-	// Couldn't find an existing node for this sector. Add one at the head
-	// of the list.
-
-	node = P_GetPrecipSecnode();
-
-	// mark new nodes unvisited.
-	node->visited = 0;
-
-	node->m_sector = s; // sector
-	node->m_thing = thing; // mobj
-	node->m_sectorlist_prev = NULL; // prev node on Thing thread
-	node->m_sectorlist_next = nextnode; // next node on Thing thread
-	if (nextnode)
-		nextnode->m_sectorlist_prev = node; // set back link on Thing
-
-	// Add new node at head of sector thread starting at s->touching_thinglist
-
-	node->m_thinglist_prev = NULL; // prev node on sector thread
-	node->m_thinglist_next = s->touching_preciplist; // next node on sector thread
-	if (s->touching_preciplist)
-		node->m_thinglist_next->m_thinglist_prev = node;
-	s->touching_preciplist = node;
-	return node;
-}
-
 // P_DelSecnode() deletes a sector node from the list of
 // sectors this object appears in. Returns a pointer to the next node
 // on the linked list, or NULL.
@@ -4080,45 +3936,6 @@ static msecnode_t *P_DelSecnode(msecnode_t *node)
 	return tn;
 }
 
-// Tails 08-25-2002
-static mprecipsecnode_t *P_DelPrecipSecnode(mprecipsecnode_t *node)
-{
-	mprecipsecnode_t *tp; // prev node on thing thread
-	mprecipsecnode_t *tn; // next node on thing thread
-	mprecipsecnode_t *sp; // prev node on sector thread
-	mprecipsecnode_t *sn; // next node on sector thread
-
-	if (!node)
-		return NULL;
-
-	// Unlink from the Thing thread. The Thing thread begins at
-	// sector_list and not from mobj_t->touching_sectorlist.
-
-	tp = node->m_sectorlist_prev;
-	tn = node->m_sectorlist_next;
-	if (tp)
-		tp->m_sectorlist_next = tn;
-	if (tn)
-		tn->m_sectorlist_prev = tp;
-
-	// Unlink from the sector thread. This thread begins at
-	// sector_t->touching_thinglist.
-
-	sp = node->m_thinglist_prev;
-	sn = node->m_thinglist_next;
-	if (sp)
-		sp->m_thinglist_next = sn;
-	else
-		node->m_sector->touching_preciplist = sn;
-	if (sn)
-		sn->m_thinglist_prev = sp;
-
-	// Return this node to the freelist
-
-	P_PutPrecipSecnode(node);
-	return tn;
-}
-
 // Delete an entire sector list
 void P_DelSeclist(msecnode_t *node)
 {
@@ -4126,13 +3943,6 @@ void P_DelSeclist(msecnode_t *node)
 		node = P_DelSecnode(node);
 }
 
-// Tails 08-25-2002
-void P_DelPrecipSeclist(mprecipsecnode_t *node)
-{
-	while (node)
-		node = P_DelPrecipSecnode(node);
-}
-
 // PIT_GetSectors
 // Locates all the sectors the object is in by looking at the lines that
 // cross through it. You have already decided that the object is allowed
@@ -4145,7 +3955,7 @@ static inline boolean PIT_GetSectors(line_t *ld)
 		tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
 		tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
 		tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
-	return true;
+		return true;
 
 	if (P_BoxOnLineSide(tmbbox, ld) != -1)
 		return true;
@@ -4173,41 +3983,6 @@ static inline boolean PIT_GetSectors(line_t *ld)
 	return true;
 }
 
-// Tails 08-25-2002
-static inline boolean PIT_GetPrecipSectors(line_t *ld)
-{
-	if (preciptmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
-		preciptmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
-		preciptmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
-		preciptmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
-	return true;
-
-	if (P_BoxOnLineSide(preciptmbbox, ld) != -1)
-		return true;
-
-	if (ld->polyobj) // line belongs to a polyobject, don't add it
-		return true;
-
-	// This line crosses through the object.
-
-	// Collect the sector(s) from the line and add to the
-	// sector_list you're examining. If the Thing ends up being
-	// allowed to move to this position, then the sector_list
-	// will be attached to the Thing's mobj_t at touching_sectorlist.
-
-	precipsector_list = P_AddPrecipSecnode(ld->frontsector, tmprecipthing, precipsector_list);
-
-	// Don't assume all lines are 2-sided, since some Things
-	// like MT_TFOG are allowed regardless of whether their radius takes
-	// them beyond an impassable linedef.
-
-	// Use sidedefs instead of 2s flag to determine two-sidedness.
-	if (ld->backsector)
-		precipsector_list = P_AddPrecipSecnode(ld->backsector, tmprecipthing, precipsector_list);
-
-	return true;
-}
-
 // P_CreateSecNodeList alters/creates the sector_list that shows what sectors
 // the object resides in.
 
@@ -4294,73 +4069,6 @@ void P_CreateSecNodeList(mobj_t *thing, fixed_t x, fixed_t y)
 	}
 }
 
-// More crazy crap Tails 08-25-2002
-void P_CreatePrecipSecNodeList(precipmobj_t *thing,fixed_t x,fixed_t y)
-{
-	INT32 xl, xh, yl, yh, bx, by;
-	mprecipsecnode_t *node = precipsector_list;
-	precipmobj_t *saved_tmthing = tmprecipthing; /* cph - see comment at func end */
-
-	// First, clear out the existing m_thing fields. As each node is
-	// added or verified as needed, m_thing will be set properly. When
-	// finished, delete all nodes where m_thing is still NULL. These
-	// represent the sectors the Thing has vacated.
-
-	while (node)
-	{
-		node->m_thing = NULL;
-		node = node->m_sectorlist_next;
-	}
-
-	tmprecipthing = thing;
-
-	preciptmbbox[BOXTOP] = y + 2*FRACUNIT;
-	preciptmbbox[BOXBOTTOM] = y - 2*FRACUNIT;
-	preciptmbbox[BOXRIGHT] = x + 2*FRACUNIT;
-	preciptmbbox[BOXLEFT] = x - 2*FRACUNIT;
-
-	validcount++; // used to make sure we only process a line once
-
-	xl = (unsigned)(preciptmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
-	xh = (unsigned)(preciptmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
-	yl = (unsigned)(preciptmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
-	yh = (unsigned)(preciptmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
-
-	BMBOUNDFIX(xl, xh, yl, yh);
-
-	for (bx = xl; bx <= xh; bx++)
-		for (by = yl; by <= yh; by++)
-			P_BlockLinesIterator(bx, by, PIT_GetPrecipSectors);
-
-	// Add the sector of the (x, y) point to sector_list.
-	precipsector_list = P_AddPrecipSecnode(thing->subsector->sector, thing, precipsector_list);
-
-	// Now delete any nodes that won't be used. These are the ones where
-	// m_thing is still NULL.
-	node = precipsector_list;
-	while (node)
-	{
-		if (!node->m_thing)
-		{
-			if (node == precipsector_list)
-				precipsector_list = node->m_sectorlist_next;
-			node = P_DelPrecipSecnode(node);
-		}
-		else
-			node = node->m_sectorlist_next;
-	}
-
-	/* cph -
-	* This is the strife we get into for using global variables. tmthing
-	*  is being used by several different functions calling
-	*  P_BlockThingIterator, including functions that can be called *from*
-	*  P_BlockThingIterator. Using a global tmthing is not reentrant.
-	* OTOH for Boom/MBF demos we have to preserve the buggy behavior.
-	*  Fun. We restore its previous value unless we're in a Boom/MBF demo.
-	*/
-	tmprecipthing = saved_tmthing;
-}
-
 /* cphipps 2004/08/30 -
  * Must clear tmthing at tic end, as it might contain a pointer to a removed thinker, or the level might have ended/been ended and we clear the objects it was pointing too. Hopefully we don't need to carry this between tics for sync. */
 void P_MapStart(void)
@@ -4380,10 +4088,7 @@ void P_MapEnd(void)
 fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
 {
 	sector_t *sec = R_PointInSubsector(x, y)->sector;
-	fixed_t floorz = sec->floorheight;
-
-	if (sec->f_slope)
-		floorz = P_GetZAt(sec->f_slope, x, y);
+	fixed_t floorz = P_GetSectorFloorZAt(sec, x, y);
 
 	// Intercept the stupid 'fall through 3dfloors' bug Tails 03-17-2002
 	if (sec->ffloors)
@@ -4394,19 +4099,15 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
 		for (rover = sec->ffloors; rover; rover = rover->next)
 		{
 			fixed_t topheight, bottomheight;
+
 			if (!(rover->flags & FF_EXISTS))
 				continue;
 
 			if ((!(rover->flags & FF_SOLID || rover->flags & FF_QUICKSAND) || (rover->flags & FF_SWIMMABLE)))
 				continue;
 
-			topheight = *rover->topheight;
-			bottomheight = *rover->bottomheight;
-
-			if (*rover->t_slope)
-				topheight = P_GetZAt(*rover->t_slope, x, y);
-			if (*rover->b_slope)
-				bottomheight = P_GetZAt(*rover->b_slope, x, y);
+			topheight    = P_GetFFloorTopZAt   (rover, x, y);
+			bottomheight = P_GetFFloorBottomZAt(rover, x, y);
 
 			if (rover->flags & FF_QUICKSAND)
 			{
@@ -4420,6 +4121,7 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
 
 			delta1 = z - (bottomheight + ((topheight - bottomheight)/2));
 			delta2 = thingtop - (bottomheight + ((topheight - bottomheight)/2));
+
 			if (topheight > floorz && abs(delta1) < abs(delta2))
 				floorz = topheight;
 		}
diff --git a/src/p_maputl.c b/src/p_maputl.c
index fc7ea89ec..2b381eaab 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -294,150 +294,142 @@ void P_CameraLineOpening(line_t *linedef)
 	// If you can see through it, why not move the camera through it too?
 	if (front->camsec >= 0)
 	{
-		frontfloor = sectors[front->camsec].floorheight;
-		frontceiling = sectors[front->camsec].ceilingheight;
-		if (sectors[front->camsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
-			frontfloor = P_GetZAt(sectors[front->camsec].f_slope, camera[0].x, camera[0].y);
-		if (sectors[front->camsec].c_slope)
-			frontceiling = P_GetZAt(sectors[front->camsec].c_slope, camera[0].x, camera[0].y);
+		frontfloor   = P_GetSectorFloorZAt  (&sectors[front->camsec], camera[0].x, camera[0].y);
+		frontceiling = P_GetSectorCeilingZAt(&sectors[front->camsec], camera[0].x, camera[0].y);
 
 	}
 	else if (front->heightsec >= 0)
 	{
-		frontfloor = sectors[front->heightsec].floorheight;
-		frontceiling = sectors[front->heightsec].ceilingheight;
-		if (sectors[front->heightsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
-			frontfloor = P_GetZAt(sectors[front->heightsec].f_slope, camera[0].x, camera[0].y);
-		if (sectors[front->heightsec].c_slope)
-			frontceiling = P_GetZAt(sectors[front->heightsec].c_slope, camera[0].x, camera[0].y);
+		frontfloor   = P_GetSectorFloorZAt  (&sectors[front->heightsec], camera[0].x, camera[0].y);
+		frontceiling = P_GetSectorCeilingZAt(&sectors[front->heightsec], camera[0].x, camera[0].y);
 	}
 	else
 	{
-		frontfloor = P_CameraGetFloorZ(mapcampointer, front, tmx, tmy, linedef);
+		frontfloor   = P_CameraGetFloorZ  (mapcampointer, front, tmx, tmy, linedef);
 		frontceiling = P_CameraGetCeilingZ(mapcampointer, front, tmx, tmy, linedef);
 	}
+
 	if (back->camsec >= 0)
 	{
-		backfloor = sectors[back->camsec].floorheight;
-		backceiling = sectors[back->camsec].ceilingheight;
-		if (sectors[back->camsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
-			frontfloor = P_GetZAt(sectors[back->camsec].f_slope, camera[0].x, camera[0].y);
-		if (sectors[back->camsec].c_slope)
-			frontceiling = P_GetZAt(sectors[back->camsec].c_slope, camera[0].x, camera[0].y);
+		backfloor   = P_GetSectorFloorZAt  (&sectors[back->camsec], camera[0].x, camera[0].y);
+		backceiling = P_GetSectorCeilingZAt(&sectors[back->camsec], camera[0].x, camera[0].y);
 	}
 	else if (back->heightsec >= 0)
 	{
-		backfloor = sectors[back->heightsec].floorheight;
-		backceiling = sectors[back->heightsec].ceilingheight;
-		if (sectors[back->heightsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
-			frontfloor = P_GetZAt(sectors[back->heightsec].f_slope, camera[0].x, camera[0].y);
-		if (sectors[back->heightsec].c_slope)
-			frontceiling = P_GetZAt(sectors[back->heightsec].c_slope, camera[0].x, camera[0].y);
+		backfloor   = P_GetSectorFloorZAt  (&sectors[back->heightsec], camera[0].x, camera[0].y);
+		backceiling = P_GetSectorCeilingZAt(&sectors[back->heightsec], camera[0].x, camera[0].y);
 	}
 	else
 	{
-		backfloor = P_CameraGetFloorZ(mapcampointer, back, tmx, tmy, linedef);
+		backfloor   = P_CameraGetFloorZ(mapcampointer, back, tmx, tmy, linedef);
 		backceiling = P_CameraGetCeilingZ(mapcampointer, back, tmx, tmy, linedef);
 	}
 
+	fixed_t thingtop = mapcampointer->z + mapcampointer->height;
+
+	if (frontceiling < backceiling)
 	{
-		fixed_t thingtop = mapcampointer->z + mapcampointer->height;
-
-		if (frontceiling < backceiling)
-		{
-			opentop = frontceiling;
-			highceiling = backceiling;
-		}
-		else
-		{
-			opentop = backceiling;
-			highceiling = frontceiling;
-		}
-
-		if (frontfloor > backfloor)
-		{
-			openbottom = frontfloor;
-			lowfloor = backfloor;
-		}
-		else
-		{
-			openbottom = backfloor;
-			lowfloor = frontfloor;
-		}
-
-		// Check for fake floors in the sector.
-		if (front->ffloors || back->ffloors)
-		{
-			ffloor_t *rover;
-			fixed_t highestceiling = highceiling;
-			fixed_t lowestceiling = opentop;
-			fixed_t highestfloor = openbottom;
-			fixed_t lowestfloor = lowfloor;
-			fixed_t delta1, delta2;
-
-			// Check for frontsector's fake floors
-			if (front->ffloors)
-				for (rover = front->ffloors; rover; rover = rover->next)
-				{
-					fixed_t topheight, bottomheight;
-					if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
-						continue;
-
-					topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
-					bottomheight = P_CameraGetFOFBottomZ(mapcampointer, front, rover, tmx, tmy, linedef);
-
-					delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
-					delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
-					if (bottomheight < lowestceiling && delta1 >= delta2)
-						lowestceiling = bottomheight;
-					else if (bottomheight < highestceiling && delta1 >= delta2)
-						highestceiling = bottomheight;
-
-					if (topheight > highestfloor && delta1 < delta2)
-						highestfloor = topheight;
-					else if (topheight > lowestfloor && delta1 < delta2)
-						lowestfloor = topheight;
-				}
-
-			// Check for backsectors fake floors
-			if (back->ffloors)
-				for (rover = back->ffloors; rover; rover = rover->next)
-				{
-					fixed_t topheight, bottomheight;
-					if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
-						continue;
-
-					topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
-					bottomheight = P_CameraGetFOFBottomZ(mapcampointer, back, rover, tmx, tmy, linedef);
-
-					delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
-					delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
-					if (bottomheight < lowestceiling && delta1 >= delta2)
-						lowestceiling = bottomheight;
-					else if (bottomheight < highestceiling && delta1 >= delta2)
-						highestceiling = bottomheight;
-
-					if (topheight > highestfloor && delta1 < delta2)
-						highestfloor = topheight;
-					else if (topheight > lowestfloor && delta1 < delta2)
-						lowestfloor = topheight;
-				}
-
-			if (highestceiling < highceiling)
-				highceiling = highestceiling;
-
-			if (highestfloor > openbottom)
-				openbottom = highestfloor;
-
-			if (lowestceiling < opentop)
-				opentop = lowestceiling;
-
-			if (lowestfloor > lowfloor)
-				lowfloor = lowestfloor;
-		}
-		openrange = opentop - openbottom;
-		return;
+		opentop = frontceiling;
+		highceiling = backceiling;
 	}
+	else
+	{
+		opentop = backceiling;
+		highceiling = frontceiling;
+	}
+
+	if (frontfloor > backfloor)
+	{
+		openbottom = frontfloor;
+		lowfloor = backfloor;
+	}
+	else
+	{
+		openbottom = backfloor;
+		lowfloor = frontfloor;
+	}
+
+	// Check for fake floors in the sector.
+	if (front->ffloors || back->ffloors)
+	{
+		ffloor_t *rover;
+		fixed_t highestceiling = highceiling;
+		fixed_t lowestceiling = opentop;
+		fixed_t highestfloor = openbottom;
+		fixed_t lowestfloor = lowfloor;
+		fixed_t delta1, delta2;
+
+		// Check for frontsector's fake floors
+		if (front->ffloors)
+		{
+			for (rover = front->ffloors; rover; rover = rover->next)
+			{
+				fixed_t topheight, bottomheight;
+
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
+					continue;
+
+				topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
+				bottomheight = P_CameraGetFOFBottomZ(mapcampointer, front, rover, tmx, tmy, linedef);
+
+				delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
+				delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
+
+				if (bottomheight < lowestceiling && delta1 >= delta2)
+					lowestceiling = bottomheight;
+				else if (bottomheight < highestceiling && delta1 >= delta2)
+					highestceiling = bottomheight;
+
+				if (topheight > highestfloor && delta1 < delta2)
+					highestfloor = topheight;
+				else if (topheight > lowestfloor && delta1 < delta2)
+					lowestfloor = topheight;
+			}
+		}
+
+		// Check for backsectors fake floors
+		if (back->ffloors)
+		{
+			for (rover = back->ffloors; rover; rover = rover->next)
+			{
+				fixed_t topheight, bottomheight;
+
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
+					continue;
+
+				topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
+				bottomheight = P_CameraGetFOFBottomZ(mapcampointer, back, rover, tmx, tmy, linedef);
+
+				delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
+				delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
+
+				if (bottomheight < lowestceiling && delta1 >= delta2)
+					lowestceiling = bottomheight;
+				else if (bottomheight < highestceiling && delta1 >= delta2)
+					highestceiling = bottomheight;
+
+				if (topheight > highestfloor && delta1 < delta2)
+					highestfloor = topheight;
+				else if (topheight > lowestfloor && delta1 < delta2)
+					lowestfloor = topheight;
+			}
+		}
+
+		if (highestceiling < highceiling)
+			highceiling = highestceiling;
+
+		if (highestfloor > openbottom)
+			openbottom = highestfloor;
+
+		if (lowestceiling < opentop)
+			opentop = lowestceiling;
+
+		if (lowestfloor > lowfloor)
+			lowfloor = lowestfloor;
+	}
+
+	openrange = opentop - openbottom;
+	return;
 }
 
 void P_LineOpening(line_t *linedef, mobj_t *mobj)
@@ -466,40 +458,39 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 	I_Assert(front != NULL);
 	I_Assert(back != NULL);
 
-	{ // Set open and high/low values here
-		fixed_t frontheight, backheight;
+	// Set open and high/low values here
+	fixed_t frontheight, backheight;
 
-		frontheight = P_GetCeilingZ(mobj, front, tmx, tmy, linedef);
-		backheight = P_GetCeilingZ(mobj, back, tmx, tmy, linedef);
+	frontheight = P_GetCeilingZ(mobj, front, tmx, tmy, linedef);
+	backheight = P_GetCeilingZ(mobj, back, tmx, tmy, linedef);
 
-		if (frontheight < backheight)
-		{
-			opentop = frontheight;
-			highceiling = backheight;
-			opentopslope = front->c_slope;
-		}
-		else
-		{
-			opentop = backheight;
-			highceiling = frontheight;
-			opentopslope = back->c_slope;
-		}
+	if (frontheight < backheight)
+	{
+		opentop = frontheight;
+		highceiling = backheight;
+		opentopslope = front->c_slope;
+	}
+	else
+	{
+		opentop = backheight;
+		highceiling = frontheight;
+		opentopslope = back->c_slope;
+	}
 
-		frontheight = P_GetFloorZ(mobj, front, tmx, tmy, linedef);
-		backheight = P_GetFloorZ(mobj, back, tmx, tmy, linedef);
+	frontheight = P_GetFloorZ(mobj, front, tmx, tmy, linedef);
+	backheight = P_GetFloorZ(mobj, back, tmx, tmy, linedef);
 
-		if (frontheight > backheight)
-		{
-			openbottom = frontheight;
-			lowfloor = backheight;
-			openbottomslope = front->f_slope;
-		}
-		else
-		{
-			openbottom = backheight;
-			lowfloor = frontheight;
-			openbottomslope = back->f_slope;
-		}
+	if (frontheight > backheight)
+	{
+		openbottom = frontheight;
+		lowfloor = backheight;
+		openbottomslope = front->f_slope;
+	}
+	else
+	{
+		openbottom = backheight;
+		lowfloor = frontheight;
+		openbottomslope = back->f_slope;
 	}
 
 	if (mobj)
@@ -508,29 +499,33 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 
 		// Check for collision with front side's midtexture if Effect 4 is set
 		if (linedef->flags & ML_EFFECT4
-			&& !linedef->polyobj // don't do anything for polyobjects! ...for now
-			) {
+				  && !linedef->polyobj) // don't do anything for polyobjects! ...for now
+			{
 			side_t *side = &sides[linedef->sidenum[0]];
 			fixed_t textop, texbottom, texheight;
 			fixed_t texmid, delta1, delta2;
 			INT32 texnum = R_GetTextureNum(side->midtexture); // make sure the texture is actually valid
 
-			if (texnum) {
+			if (texnum)
+			{
 				// Get the midtexture's height
 				texheight = textures[texnum]->height << FRACBITS;
 
 				// Set texbottom and textop to the Z coordinates of the texture's boundaries
+				if (linedef->flags & ML_EFFECT5 && !side->repeatcnt) // "infinite" repeat
 				{
-					if (linedef->flags & ML_EFFECT5 && !side->repeatcnt) { // "infinite" repeat
-						texbottom = openbottom + side->rowoffset;
-						textop = opentop + side->rowoffset;
-					} else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3)) {
-						texbottom = openbottom + side->rowoffset;
-						textop = texbottom + texheight*(side->repeatcnt+1);
-					} else {
-						textop = opentop + side->rowoffset;
-						texbottom = textop - texheight*(side->repeatcnt+1);
-					}
+					texbottom = openbottom + side->rowoffset;
+					textop = opentop + side->rowoffset;
+				}
+				else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
+				{
+					texbottom = openbottom + side->rowoffset;
+					textop = texbottom + texheight*(side->repeatcnt+1);
+				}
+				else
+				{
+					textop = opentop + side->rowoffset;
+					texbottom = textop - texheight*(side->repeatcnt+1);
 				}
 
 				texmid = texbottom+(textop-texbottom)/2;
@@ -538,10 +533,13 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 				delta1 = abs(mobj->z - texmid);
 				delta2 = abs(thingtop - texmid);
 
-				if (delta1 > delta2) { // Below
+				if (delta1 > delta2) // Below
+				{
 					if (opentop > texbottom)
 						opentop = texbottom;
-				} else { // Above
+				}
+				else  				 // Above
+				{
 					if (openbottom < textop)
 						openbottom = textop;
 				}
@@ -549,9 +547,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 		}
 
 		// Check for fake floors in the sector.
-		if (front->ffloors || back->ffloors
-		    || linedef->polyobj
-		   )
+		if (front->ffloors || back->ffloors || linedef->polyobj)
 		{
 			ffloor_t *rover;
 
@@ -567,6 +563,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 			for (rover = front->ffloors; rover; rover = rover->next)
 			{
 				fixed_t topheight, bottomheight;
+
 				if (!(rover->flags & FF_EXISTS))
 					continue;
 
@@ -584,7 +581,8 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 
 				if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
 				{
-					if (bottomheight < lowestceiling) {
+					if (bottomheight < lowestceiling)
+					{
 						lowestceiling = bottomheight;
 						ceilingslope = *rover->b_slope;
 					}
@@ -594,7 +592,8 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 
 				if (delta1 < delta2 && !(rover->flags & FF_REVERSEPLATFORM)) // thing is above FOF
 				{
-					if (topheight > highestfloor) {
+					if (topheight > highestfloor)
+					{
 						highestfloor = topheight;
 						floorslope = *rover->t_slope;
 					}
@@ -624,7 +623,8 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 
 				if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
 				{
-					if (bottomheight < lowestceiling) {
+					if (bottomheight < lowestceiling)
+					{
 						lowestceiling = bottomheight;
 						ceilingslope = *rover->b_slope;
 					}
@@ -634,7 +634,8 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 
 				if (delta1 < delta2 && !(rover->flags & FF_REVERSEPLATFORM)) // thing is above FOF
 				{
-					if (topheight > highestfloor) {
+					if (topheight > highestfloor)
+					{
 						highestfloor = topheight;
 						floorslope = *rover->t_slope;
 					}
@@ -650,29 +651,35 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
 
 				delta1 = abs(mobj->z - (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight)/2)));
 				delta2 = abs(thingtop - (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight)/2)));
-				if (polysec->floorheight < lowestceiling && delta1 >= delta2) {
+
+				if (polysec->floorheight < lowestceiling && delta1 >= delta2)
+				{
 					lowestceiling = polysec->floorheight;
 					ceilingslope = NULL;
 				}
 				else if (polysec->floorheight < highestceiling && delta1 >= delta2)
 					highestceiling = polysec->floorheight;
 
-				if (polysec->ceilingheight > highestfloor && delta1 < delta2) {
+				if (polysec->ceilingheight > highestfloor && delta1 < delta2)
+				{
 					highestfloor = polysec->ceilingheight;
 					floorslope = NULL;
 				}
 				else if (polysec->ceilingheight > lowestfloor && delta1 < delta2)
 					lowestfloor = polysec->ceilingheight;
 			}
+
 			if (highestceiling < highceiling)
 				highceiling = highestceiling;
 
-			if (highestfloor > openbottom) {
+			if (highestfloor > openbottom)
+			{
 				openbottom = highestfloor;
 				openbottomslope = floorslope;
 			}
 
-			if (lowestceiling < opentop) {
+			if (lowestceiling < opentop)
+			{
 				opentop = lowestceiling;
 				opentopslope = ceilingslope;
 			}
@@ -759,9 +766,6 @@ FUNCINLINE ATTRINLINE void P_UnsetPrecipThingPosition(precipmobj_t *thing)
 
 	if (bprev && (*bprev = bnext) != NULL)  // unlink from block map
 		bnext->bprev = bprev;
-
-	precipsector_list = thing->touching_sectorlist;
-	thing->touching_sectorlist = NULL; //to be restored by P_SetPrecipThingPosition
 }
 
 static void P_LinkToBlockMap(mobj_t *thing, mobj_t **bmap)
@@ -904,11 +908,7 @@ void P_SetUnderlayPosition(mobj_t *thing)
 
 FUNCINLINE ATTRINLINE void P_SetPrecipitationThingPosition(precipmobj_t *thing)
 {
-	thing->subsector = R_PointInSubsector(thing->x, thing->y);
-
-	P_CreatePrecipSecNodeList(thing, thing->x, thing->y);
-	thing->touching_sectorlist = precipsector_list; // Attach to Thing's precipmobj_t
-	precipsector_list = NULL; // clear for next time
+	thing->subsector = R_PointInSubsectorFast(thing->x, thing->y);
 
 	// NOTE: this works because bnext/bprev are at the same
 	// offsets in precipmobj_t and mobj_t
diff --git a/src/p_mobj.c b/src/p_mobj.c
index f85e6754d..fee6370d1 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -20,6 +20,7 @@
 #include "p_setup.h"
 #include "r_fps.h"
 #include "r_main.h"
+#include "r_skins.h"
 #include "r_things.h"
 #include "r_sky.h"
 #include "r_splats.h"
@@ -48,6 +49,7 @@ actioncache_t actioncachehead;
 static mobj_t *overlaycap = NULL;
 static mobj_t *shadowcap = NULL;
 mobj_t *waypointcap = NULL;
+mobj_t *mobjcache = NULL;
 
 void P_InitCachedActions(void)
 {
@@ -65,8 +67,8 @@ void P_RunCachedActions(void)
 		var2 = states[ac->statenum].var2;
 		astate = &states[ac->statenum];
 
-		if (ac->mobj && !P_MobjWasRemoved(ac->mobj)) // just in case...
-			states[ac->statenum].action.acp1(ac->mobj);
+		if (!P_MobjWasRemoved(ac->mobj)) // just in case...
+			states[ac->statenum].action(ac->mobj);
 		next = ac->next;
 		Z_Free(ac);
 	}
@@ -91,6 +93,7 @@ FUNCINLINE static ATTRINLINE void P_CycleStateAnimation(mobj_t *mobj)
 	// var2 determines delay between animation frames
 	if (!(mobj->frame & FF_ANIMATE) || --mobj->anim_duration != 0)
 		return;
+
 	mobj->anim_duration = (UINT16)mobj->state->var2;
 
 	// compare the current sprite frame to the one we started from
@@ -170,20 +173,28 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
 	{
 		// Start flashing, since you've landed.
 		player->powers[pw_flashing] = K_GetKartFlashing(player)-1;
-		//P_DoPityCheck(player);
 	}
 
 	// Set animation state
 	// The pflags version of this was just as convoluted.
 	// Rewriten for SRB2kart ... though I don't know what this is.
-	if ((state >= S_KART_STND1 && state <= S_KART_STND2_R) || state == S_KART_SQUISH || state == S_KART_SPIN)
-		player->panim = PA_IDLE;
-	else if (state >= S_KART_WALK1 && state <= S_KART_WALK2_R)
-		player->panim = PA_WALK;
-	else if (state >= S_KART_RUN1 && state <= S_KART_DRIFT2_R)
-		player->panim = PA_RUN;
-	else
-		player->panim = PA_ETC;
+	switch (state)
+	{
+		case S_KART_STND1...S_KART_STND2_R:
+		case S_KART_SQUISH:
+		case S_KART_SPIN:
+			player->panim = PA_IDLE;
+			break;
+		case S_KART_WALK1...S_KART_WALK2_R:
+			player->panim = PA_WALK;
+			break;
+		case S_KART_RUN1...S_KART_DRIFT2_R:
+			player->panim = PA_RUN;
+			break;
+		default:
+			player->panim = PA_ETC;
+			break;
+	}
 
 	if (recursion++) // if recursion detected,
 		memset(seenstate = tempstate, 0, sizeof tempstate); // clear state table
@@ -192,7 +203,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
 
 	do
 	{
-		if (state == S_NULL)
+		if (UNLIKELY(state == S_NULL))
 		{ // Bad SOC!
 			CONS_Alert(CONS_ERROR, "Cannot remove player mobj by setting its state to S_NULL.\n");
 			//P_RemoveMobj(mobj);
@@ -209,13 +220,13 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
 		// Modified handling.
 		// Call action functions when the state is set
 
-		if (st->action.acp1)
+		if (st->action)
 		{
 			var1 = st->var1;
 			var2 = st->var2;
 			astate = st;
 
-			st->action.acp1(mobj);
+			st->action(mobj);
 
 			// woah. a player was removed by an action.
 			// this sounds like a VERY BAD THING, but there's nothing we can do now...
@@ -228,7 +239,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
 		state = st->nextstate;
 	} while (!mobj->tics && !seenstate[state]);
 
-	if (!mobj->tics)
+	if (UNLIKELY(!mobj->tics))
 		CONS_Alert(CONS_WARNING, M_GetText("State cycle detected, exiting.\n"));
 
 	if (!--recursion)
@@ -279,13 +290,13 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state)
 		// Modified handling.
 		// Call action functions when the state is set
 
-		if (st->action.acp1)
+		if (st->action)
 		{
 			var1 = st->var1;
 			var2 = st->var2;
 			astate = st;
 
-			st->action.acp1(mobj);
+			st->action(mobj);
 			if (P_MobjWasRemoved(mobj))
 				return false;
 		}
@@ -295,7 +306,7 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state)
 		state = st->nextstate;
 	} while (!mobj->tics && !seenstate[state]);
 
-	if (!mobj->tics)
+	if (UNLIKELY(!mobj->tics))
 		CONS_Alert(CONS_WARNING, M_GetText("State cycle detected, exiting.\n"));
 
 	if (!--recursion)
@@ -318,10 +329,11 @@ boolean P_SetMobjStateNF(mobj_t *mobj, statenum_t state)
 	state_t *st;
 
 	if (state == S_NULL)
-	{ // Remove mobj
-		P_RemoveMobj(mobj);
+	{
+		P_RemoveMobj(mobj); // Remove mobj
 		return false;
 	}
+
 	st = &states[state];
 	mobj->state = st;
 	mobj->tics = st->tics;
@@ -337,10 +349,11 @@ static boolean P_SetPrecipMobjState(precipmobj_t *mobj, statenum_t state)
 	state_t *st;
 
 	if (state == S_NULL)
-	{ // Remove mobj
-		P_RemovePrecipMobj(mobj);
+	{
+		P_FreePrecipMobj(mobj); // Remove mobj
 		return false;
 	}
+
 	st = &states[state];
 	mobj->state = st;
 	mobj->tics = st->tics;
@@ -351,18 +364,6 @@ static boolean P_SetPrecipMobjState(precipmobj_t *mobj, statenum_t state)
 	return true;
 }
 
-//
-// P_MobjFlip
-//
-// Special utility to return +1 or -1 depending on mobj's gravity
-//
-SINT8 P_MobjFlip(mobj_t *mobj)
-{
-	if (mobj && mobj->eflags & MFE_VERTICALFLIP)
-		return -1;
-	return 1;
-}
-
 //
 // P_WeaponOrPanel
 //
@@ -370,19 +371,7 @@ SINT8 P_MobjFlip(mobj_t *mobj)
 //
 boolean P_WeaponOrPanel(mobjtype_t type)
 {
-	if (type == MT_BOUNCERING
-	|| type == MT_AUTOMATICRING
-	|| type == MT_INFINITYRING
-	|| type == MT_RAILRING
-	|| type == MT_EXPLOSIONRING
-	|| type == MT_SCATTERRING
-	|| type == MT_GRENADERING
-	|| type == MT_BOUNCEPICKUP
-	|| type == MT_RAILPICKUP
-	|| type == MT_AUTOPICKUP
-	|| type == MT_EXPLODEPICKUP
-	|| type == MT_SCATTERPICKUP
-	|| type == MT_GRENADEPICKUP)
+	if (UNLIKELY(type >= MT_BOUNCERING && type <= MT_GRENADEPICKUP)) // doubt those get used at all in kart tbh
 		return true;
 
 	return false;
@@ -408,7 +397,8 @@ void P_ExplodeMissile(mobj_t *mo)
 		P_RadiusAttack(mo, mo, 96*FRACUNIT);
 
 		explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE);
-		if (!P_MobjWasRemoved(explodemo))
+
+		if (explodemo)
 		{
 			P_SetScale(explodemo, mo->scale);
 			explodemo->destscale = mo->destscale;
@@ -416,8 +406,10 @@ void P_ExplodeMissile(mobj_t *mo)
 			explodemo->momy += (P_RandomByte() % 32) * FixedMul(FRACUNIT/8, explodemo->scale);
 			S_StartSound(explodemo, sfx_pop);
 		}
+
 		explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE);
-		if (!P_MobjWasRemoved(explodemo))
+
+		if (explodemo)
 		{
 			P_SetScale(explodemo, mo->scale);
 			explodemo->destscale = mo->destscale;
@@ -425,8 +417,10 @@ void P_ExplodeMissile(mobj_t *mo)
 			explodemo->momy -= (P_RandomByte() % 64) * FixedMul(FRACUNIT/8, explodemo->scale);
 			S_StartSound(explodemo, sfx_dmpain);
 		}
+
 		explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE);
-		if (!P_MobjWasRemoved(explodemo))
+
+		if (explodemo)
 		{
 			P_SetScale(explodemo, mo->scale);
 			explodemo->destscale = mo->destscale;
@@ -434,8 +428,10 @@ void P_ExplodeMissile(mobj_t *mo)
 			explodemo->momy += (P_RandomByte() % 128) * FixedMul(FRACUNIT/8, explodemo->scale);
 			S_StartSound(explodemo, sfx_pop);
 		}
+
 		explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE);
-		if (!P_MobjWasRemoved(explodemo))
+
+		if (explodemo)
 		{
 			P_SetScale(explodemo, mo->scale);
 			explodemo->destscale = mo->destscale;
@@ -445,7 +441,7 @@ void P_ExplodeMissile(mobj_t *mo)
 		}
 
 		// Hack: Release an animal.
-		P_DamageMobj(mo, NULL, NULL, 10000);
+		P_DamageMobj(mo, NULL, NULL, DMG_INSTAKILL);
 	}
 
 	mo->flags &= ~MF_MISSILE;
@@ -465,6 +461,7 @@ void P_ExplodeMissile(mobj_t *mo)
 boolean P_InsideANonSolidFFloor(mobj_t *mobj, ffloor_t *rover)
 {
 	fixed_t topheight, bottomheight;
+
 	if (!(rover->flags & FF_EXISTS))
 		return false;
 
@@ -475,10 +472,7 @@ boolean P_InsideANonSolidFFloor(mobj_t *mobj, ffloor_t *rover)
 	topheight    = P_GetFFloorTopZAt   (rover, mobj->x, mobj->y);
 	bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
 
-	if (mobj->z > topheight)
-		return false;
-
-	if (mobj->z + mobj->height < bottomheight)
+	if (mobj->z > topheight || (mobj->z + mobj->height < bottomheight))
 		return false;
 
 	return true;
@@ -501,18 +495,8 @@ static fixed_t HighestOnLine(fixed_t radius, fixed_t x, fixed_t y, line_t *line,
 	v2.x = line->v2->x;
 	v2.y = line->v2->y;
 
-	/*CONS_Printf("BEFORE: v1 = %f %f %f\n",
-				FIXED_TO_FLOAT(v1.x),
-				FIXED_TO_FLOAT(v1.y),
-				FIXED_TO_FLOAT(P_GetZAt(slope, v1.x, v1.y))
-				);
-	CONS_Printf("        v2 = %f %f %f\n",
-				FIXED_TO_FLOAT(v2.x),
-				FIXED_TO_FLOAT(v2.y),
-				FIXED_TO_FLOAT(P_GetZAt(slope, v2.x, v2.y))
-				);*/
-
-	if (abs(v1.x-x) > radius) {
+	if (abs(v1.x-x) > radius)
+	{
 		// v1's x is out of range, so rein it in
 		fixed_t diff = abs(v1.x-x) - radius;
 
@@ -525,7 +509,8 @@ static fixed_t HighestOnLine(fixed_t radius, fixed_t x, fixed_t y, line_t *line,
 		}
 	}
 
-	if (abs(v1.y-y) > radius) {
+	if (abs(v1.y-y) > radius)
+	{
 		// v1's y is out of range, so rein it in
 		fixed_t diff = abs(v1.y-y) - radius;
 
@@ -538,7 +523,8 @@ static fixed_t HighestOnLine(fixed_t radius, fixed_t x, fixed_t y, line_t *line,
 		}
 	}
 
-	if (abs(v2.x-x) > radius) {
+	if (abs(v2.x-x) > radius)
+	{
 		// v1's x is out of range, so rein it in
 		fixed_t diff = abs(v2.x-x) - radius;
 
@@ -551,7 +537,8 @@ static fixed_t HighestOnLine(fixed_t radius, fixed_t x, fixed_t y, line_t *line,
 		}
 	}
 
-	if (abs(v2.y-y) > radius) {
+	if (abs(v2.y-y) > radius)
+	{
 		// v2's y is out of range, so rein it in
 		fixed_t diff = abs(v2.y-y) - radius;
 
@@ -564,27 +551,16 @@ static fixed_t HighestOnLine(fixed_t radius, fixed_t x, fixed_t y, line_t *line,
 		}
 	}
 
-	/*CONS_Printf("AFTER:  v1 = %f %f %f\n",
-				FIXED_TO_FLOAT(v1.x),
-				FIXED_TO_FLOAT(v1.y),
-				FIXED_TO_FLOAT(P_GetZAt(slope, v1.x, v1.y))
-				);
-	CONS_Printf("        v2 = %f %f %f\n",
-				FIXED_TO_FLOAT(v2.x),
-				FIXED_TO_FLOAT(v2.y),
-				FIXED_TO_FLOAT(P_GetZAt(slope, v2.x, v2.y))
-				);*/
-
 	// Return the higher of the two points
 	if (actuallylowest)
 		return min(
-			P_GetZAt(slope, v1.x, v1.y),
-			P_GetZAt(slope, v2.x, v2.y)
+			P_GetSlopeZAt(slope, v1.x, v1.y),
+			P_GetSlopeZAt(slope, v2.x, v2.y)
 		);
 	else
 		return max(
-			P_GetZAt(slope, v1.x, v1.y),
-			P_GetZAt(slope, v2.x, v2.y)
+			P_GetSlopeZAt(slope, v1.x, v1.y),
+			P_GetSlopeZAt(slope, v2.x, v2.y)
 		);
 }
 
@@ -592,7 +568,9 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
 {
 	I_Assert(mobj != NULL);
 	I_Assert(sector != NULL);
-	if (sector->f_slope) {
+
+	if (sector->f_slope)
+	{
 		fixed_t testx, testy;
 		pslope_t *slope = sector->f_slope;
 
@@ -607,7 +585,8 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
 		else
 			testy = -mobj->radius;
 
-		if ((slope->zdelta > 0) ^ !!(lowest)) {
+		if ((slope->zdelta > 0) ^ !!(lowest))
+		{
 			testx = -testx;
 			testy = -testy;
 		}
@@ -617,25 +596,29 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
 
 		// If the highest point is in the sector, then we have it easy! Just get the Z at that point
 		if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
+<<<<<<< HEAD
 				return P_GetZAt(slope, testx, testy);
+=======
+			return P_GetSlopeZAt(slope, testx, testy);
+>>>>>>> Saturn-Next
 
 		// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
-		if (perfect) {
+		if (perfect)
+		{
 			size_t i;
 			line_t *ld;
 			fixed_t bbox[4];
 			fixed_t finalheight;
 
-			if (lowest)
-				finalheight = INT32_MAX;
-			else
-				finalheight = INT32_MIN;
+			finalheight = lowest ? INT32_MAX : INT32_MIN;
 
 			bbox[BOXLEFT] = x-mobj->radius;
 			bbox[BOXRIGHT] = x+mobj->radius;
 			bbox[BOXTOP] = y+mobj->radius;
 			bbox[BOXBOTTOM] = y-mobj->radius;
-			for (i = 0; i < boundsec->linecount; i++) {
+
+			for (i = 0; i < boundsec->linecount; i++)
+			{
 				ld = boundsec->lines[i];
 
 				if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
@@ -657,10 +640,11 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
 		// If we're just testing for base sector location (no collision line), just go for the center's spot...
 		// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
 		if (line == NULL)
-			return P_GetZAt(slope, x, y);
+			return P_GetSlopeZAt(slope, x, y);
 
 		return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
-	} else // Well, that makes it easy. Just get the floor height
+	}
+	else // Well, that makes it easy. Just get the floor height
 		return sector->floorheight;
 }
 
@@ -668,7 +652,9 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
 {
 	I_Assert(mobj != NULL);
 	I_Assert(sector != NULL);
-	if (sector->c_slope) {
+
+	if (sector->c_slope)
+	{
 		fixed_t testx, testy;
 		pslope_t *slope = sector->c_slope;
 
@@ -683,7 +669,8 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
 		else
 			testy = -mobj->radius;
 
-		if ((slope->zdelta > 0) ^ !!(lowest)) {
+		if ((slope->zdelta > 0) ^ !!(lowest))
+		{
 			testx = -testx;
 			testy = -testy;
 		}
@@ -693,25 +680,29 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
 
 		// If the highest point is in the sector, then we have it easy! Just get the Z at that point
 		if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
+<<<<<<< HEAD
 				return P_GetZAt(slope, testx, testy);
+=======
+			return P_GetSlopeZAt(slope, testx, testy);
+>>>>>>> Saturn-Next
 
 		// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
-		if (perfect) {
+		if (perfect)
+		{
 			size_t i;
 			line_t *ld;
 			fixed_t bbox[4];
 			fixed_t finalheight;
 
-			if (lowest)
-				finalheight = INT32_MAX;
-			else
-				finalheight = INT32_MIN;
+			finalheight = lowest ? INT32_MAX : INT32_MIN;
 
 			bbox[BOXLEFT] = x-mobj->radius;
 			bbox[BOXRIGHT] = x+mobj->radius;
 			bbox[BOXTOP] = y+mobj->radius;
 			bbox[BOXBOTTOM] = y-mobj->radius;
-			for (i = 0; i < boundsec->linecount; i++) {
+
+			for (i = 0; i < boundsec->linecount; i++)
+			{
 				ld = boundsec->lines[i];
 
 				if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
@@ -733,10 +724,11 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
 		// If we're just testing for base sector location (no collision line), just go for the center's spot...
 		// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
 		if (line == NULL)
-			return P_GetZAt(slope, x, y);
+			return P_GetSlopeZAt(slope, x, y);
 
 		return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
-	} else // Well, that makes it easy. Just get the ceiling height
+	}
+	else // Well, that makes it easy. Just get the ceiling height
 		return sector->ceilingheight;
 }
 
@@ -746,7 +738,8 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
 	I_Assert(mobj != NULL);
 	I_Assert(sector != NULL);
 
-	if (sector->f_slope) {
+	if (sector->f_slope)
+	{
 		fixed_t testx, testy;
 		pslope_t *slope = sector->f_slope;
 
@@ -761,7 +754,8 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
 		else
 			testy = -mobj->radius;
 
-		if ((slope->zdelta > 0) ^ !!(lowest)) {
+		if ((slope->zdelta > 0) ^ !!(lowest))
+		{
 			testx = -testx;
 			testy = -testy;
 		}
@@ -770,26 +764,26 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
 		testy += y;
 
 		// If the highest point is in the sector, then we have it easy! Just get the Z at that point
-		if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
-			return P_GetZAt(slope, testx, testy);
+		if (R_PointInSubsectorFast(testx, testy)->sector == (boundsec ? boundsec : sector))
+			return P_GetSlopeZAt(slope, testx, testy);
 
 		// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
-		if (perfect) {
+		if (perfect)
+		{
 			size_t i;
 			line_t *ld;
 			fixed_t bbox[4];
 			fixed_t finalheight;
 
-			if (lowest)
-				finalheight = INT32_MAX;
-			else
-				finalheight = INT32_MIN;
+			finalheight = lowest ? INT32_MAX : INT32_MIN;
 
 			bbox[BOXLEFT] = x-mobj->radius;
 			bbox[BOXRIGHT] = x+mobj->radius;
 			bbox[BOXTOP] = y+mobj->radius;
 			bbox[BOXBOTTOM] = y-mobj->radius;
-			for (i = 0; i < boundsec->linecount; i++) {
+
+			for (i = 0; i < boundsec->linecount; i++)
+			{
 				ld = boundsec->lines[i];
 
 				if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
@@ -811,10 +805,11 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
 		// If we're just testing for base sector location (no collision line), just go for the center's spot...
 		// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
 		if (line == NULL)
-			return P_GetZAt(slope, x, y);
+			return P_GetSlopeZAt(slope, x, y);
 
 		return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
-	} else // Well, that makes it easy. Just get the floor height
+	}
+	else // Well, that makes it easy. Just get the floor height
 		return sector->floorheight;
 }
 
@@ -823,7 +818,8 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
 	I_Assert(mobj != NULL);
 	I_Assert(sector != NULL);
 
-	if (sector->c_slope) {
+	if (sector->c_slope)
+	{
 		fixed_t testx, testy;
 		pslope_t *slope = sector->c_slope;
 
@@ -838,7 +834,8 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
 		else
 			testy = -mobj->radius;
 
-		if ((slope->zdelta > 0) ^ !!(lowest)) {
+		if ((slope->zdelta > 0) ^ !!(lowest))
+		{
 			testx = -testx;
 			testy = -testy;
 		}
@@ -847,26 +844,26 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
 		testy += y;
 
 		// If the highest point is in the sector, then we have it easy! Just get the Z at that point
-		if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
-			return P_GetZAt(slope, testx, testy);
+		if (R_PointInSubsectorFast(testx, testy)->sector == (boundsec ? boundsec : sector))
+			return P_GetSlopeZAt(slope, testx, testy);
 
 		// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
-		if (perfect) {
+		if (perfect)
+		{
 			size_t i;
 			line_t *ld;
 			fixed_t bbox[4];
 			fixed_t finalheight;
 
-			if (lowest)
-				finalheight = INT32_MAX;
-			else
-				finalheight = INT32_MIN;
+			finalheight = lowest ? INT32_MAX : INT32_MIN;
 
 			bbox[BOXLEFT] = x-mobj->radius;
 			bbox[BOXRIGHT] = x+mobj->radius;
 			bbox[BOXTOP] = y+mobj->radius;
 			bbox[BOXBOTTOM] = y-mobj->radius;
-			for (i = 0; i < boundsec->linecount; i++) {
+
+			for (i = 0; i < boundsec->linecount; i++)
+			{
 				ld = boundsec->lines[i];
 
 				if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT]
@@ -888,10 +885,11 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
 		// If we're just testing for base sector location (no collision line), just go for the center's spot...
 		// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
 		if (line == NULL)
-			return P_GetZAt(slope, x, y);
+			return P_GetSlopeZAt(slope, x, y);
 
 		return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
-	} else // Well, that makes it easy. Just get the ceiling height
+	}
+	else // Well, that makes it easy. Just get the ceiling height
 		return sector->ceilingheight;
 }
 static void P_PlayerFlip(mobj_t *mo)
@@ -902,7 +900,7 @@ static void P_PlayerFlip(mobj_t *mo)
 	G_GhostAddFlip((INT32) (mo->player - players));
 	// Flip aiming to match!
 
-	if (mo->player->pflags & PF_NIGHTSMODE) // NiGHTS doesn't use flipcam
+	if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam
 	{
 		if (mo->tracer)
 			mo->tracer->eflags ^= MFE_VERTICALFLIP;
@@ -915,7 +913,11 @@ static void P_PlayerFlip(mobj_t *mo)
 
 		for (i = 0; i <= splitscreen; i++)
 		{
+<<<<<<< HEAD
 			if (!(mo->player-players == displayplayers[i]))
+=======
+			if (mo->player-players != displayplayers[i])
+>>>>>>> Saturn-Next
 				continue;
 
 			localaiming[i] = mo->player->aiming;
@@ -1000,7 +1002,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
 		//|| (mo->player->charability == CA_FLY && (mo->player->powers[pw_tailsfly]
 		//	|| (mo->state >= &states[S_PLAY_SPC1] && mo->state <= &states[S_PLAY_SPC4]))))
 		//	gravityadd = gravityadd/3; // less gravity while flying/gliding
-		if (mo->player->climbing || (mo->player->pflags & PF_NIGHTSMODE))
+		if (UNLIKELY(mo->player->climbing || (mo->player->pflags & PF_NIGHTSMODE)))
 			return 0;
 
 		if (!(mo->flags2 & MF2_OBJECTFLIP) != !(mo->player->powers[pw_gravityboots])) // negated to turn numeric into bool - would be double negated, but not needed if both would be
@@ -1116,9 +1118,6 @@ void P_CheckGravity(mobj_t *mo, boolean affect)
 	}
 }
 
-#define STOPSPEED (FRACUNIT)
-//#define FRICTION (ORIG_FRICTION) // 0.90625
-
 //
 // P_SceneryXYFriction
 //
@@ -1127,8 +1126,8 @@ static void P_SceneryXYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy)
 	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
-	if (abs(mo->momx) < FixedMul(STOPSPEED/32, mo->scale)
-		&& abs(mo->momy) < FixedMul(STOPSPEED/32, mo->scale))
+	if (abs(mo->momx) < FixedMul(FRACUNIT/32, mo->scale)
+		&& abs(mo->momy) < FixedMul(FRACUNIT/32, mo->scale))
 	{
 		mo->momx = 0;
 		mo->momy = 0;
@@ -1137,13 +1136,13 @@ static void P_SceneryXYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy)
 	{
 		if ((oldx == mo->x) && (oldy == mo->y)) // didn't go anywhere
 		{
-			mo->momx = FixedMul(mo->momx,ORIG_FRICTION);
-			mo->momy = FixedMul(mo->momy,ORIG_FRICTION);
+			mo->momx = FixedMul(mo->momx, ORIG_FRICTION);
+			mo->momy = FixedMul(mo->momy, ORIG_FRICTION);
 		}
 		else
 		{
-			mo->momx = FixedMul(mo->momx,mo->friction);
-			mo->momy = FixedMul(mo->momy,mo->friction);
+			mo->momx = FixedMul(mo->momx, mo->friction);
+			mo->momy = FixedMul(mo->momy, mo->friction);
 		}
 
 		if (mo->type == MT_CANNONBALLDECOR)
@@ -1170,17 +1169,18 @@ static void P_XYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy)
 	I_Assert(!P_MobjWasRemoved(mo));
 
 	player = mo->player;
+
 	if (player) // valid only if player avatar
 	{
 		// spinning friction
 		if (player->pflags & PF_SPINNING && (player->rmomx || player->rmomy) && !(player->pflags & PF_STARTDASH))
 		{
-			const fixed_t ns = FixedDiv(549*ORIG_FRICTION,500*FRACUNIT); //const fixed_t ns = FixedDiv(549*FRICTION,500*FRACUNIT);
+			const fixed_t ns = FixedDiv(549*ORIG_FRICTION, 500*FRACUNIT); //const fixed_t ns = FixedDiv(549*FRICTION,500*FRACUNIT);
 			mo->momx = FixedMul(mo->momx, ns);
 			mo->momy = FixedMul(mo->momy, ns);
 		}
-		else if (abs(player->rmomx) < FixedMul(STOPSPEED, mo->scale)
-		    && abs(player->rmomy) < FixedMul(STOPSPEED, mo->scale)
+		else if (abs(player->rmomx) < FixedMul(FRACUNIT, mo->scale)
+		    && abs(player->rmomy) < FixedMul(FRACUNIT, mo->scale)
 		    && (!(player->cmd.forwardmove && !(twodlevel || mo->flags2 & MF2_TWOD)) && !player->cmd.sidemove && !(player->pflags & PF_SPINNING))
 			&& !(player->mo->standingslope && (!(player->mo->standingslope->flags & SL_NOPHYSICS)) && (abs(player->mo->standingslope->zdelta) >= FRACUNIT/2))
 				)
@@ -1236,7 +1236,11 @@ static void P_PushableCheckBustables(mobj_t *mo)
 		if (!node->m_sector)
 			break;
 
+<<<<<<< HEAD
 		if (!(node->m_sector->ffloors))
+=======
+		if (!node->m_sector->ffloors)
+>>>>>>> Saturn-Next
 			continue;
 
 		ffloor_t *rover;
@@ -1244,18 +1248,31 @@ static void P_PushableCheckBustables(mobj_t *mo)
 
 		for (rover = node->m_sector->ffloors; rover; rover = rover->next)
 		{
+<<<<<<< HEAD
 			if (!(rover->flags & FF_EXISTS)) continue;
 
 			if (!(rover->flags & FF_BUSTUP)) continue;
 
 			// Needs ML_EFFECT4 flag for pushables to break it
 			if (!(rover->master->flags & ML_EFFECT4)) continue;
+=======
+			if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BUSTUP))
+				continue;
+
+			// Needs ML_EFFECT4 flag for pushables to break it
+			if (!(rover->master->flags & ML_EFFECT4))
+				continue;
+>>>>>>> Saturn-Next
 
 			if (rover->master->frontsector->crumblestate)
 				continue;
 
 			topheight = P_GetFOFTopZ(mo, node->m_sector, rover, mo->x, mo->y, NULL);
 			bottomheight = P_GetFOFBottomZ(mo, node->m_sector, rover, mo->x, mo->y, NULL);
+<<<<<<< HEAD
+=======
+
+>>>>>>> Saturn-Next
 			// Height checks
 			if (rover->flags & FF_SHATTERBOTTOM)
 			{
@@ -1299,6 +1316,7 @@ static void P_PushableCheckBustables(mobj_t *mo)
 			goto bustupdone;
 		}
 	}
+
 bustupdone:
 	P_UnsetThingPosition(mo);
 	mo->x = oldx;
@@ -1363,12 +1381,16 @@ void P_XYMovement(mobj_t *mo)
 	oldy = mo->y;
 
 	// adjust various things based on slope
-	if (mo->standingslope && abs(mo->standingslope->zdelta) > FRACUNIT>>8) {
-		if (!P_IsObjectOnGround(mo)) { // We fell off at some point? Do the twisty thing!
+	if (mo->standingslope && abs(mo->standingslope->zdelta) > FRACUNIT>>8)
+	{
+		if (!P_IsObjectOnGround(mo)) // We fell off at some point? Do the twisty thing!
+		{
 			P_SlopeLaunch(mo);
 			xmove = mo->momx;
 			ymove = mo->momy;
-		} else { // Still on the ground.
+		}
+		else // Still on the ground.
+		{
 			slopemom.x = xmove;
 			slopemom.y = ymove;
 			slopemom.z = 0;
@@ -1381,7 +1403,8 @@ void P_XYMovement(mobj_t *mo)
 
 			oldslope = mo->standingslope;
 		}
-	} else if (P_IsObjectOnGround(mo) && !mo->momz)
+	}
+	else if (P_IsObjectOnGround(mo) && !mo->momz)
 		predictedz = mo->z;
 
 	// Pushables can break some blocks
@@ -1412,10 +1435,11 @@ void P_XYMovement(mobj_t *mo)
 		// blocked move
 		moved = false;
 
-		if (player) {
-			if (player->bot)
-				B_MoveBlocked(player);
+		if (player && player->bot)
+		{
+			B_MoveBlocked(player);
 		}
+
 		//{ SRB2kart - Jawz
 		if (mo->type == MT_JAWZ || mo->type == MT_JAWZ_DUD)
 		{
@@ -1510,8 +1534,8 @@ void P_XYMovement(mobj_t *mo)
 				return;
 			}
 		}
-		else if (player || mo->flags & (MF_SLIDEME|MF_PUSHABLE))
-		{ // try to slide along it
+		else if (player || mo->flags & (MF_SLIDEME|MF_PUSHABLE)) // try to slide along it
+		{
 			P_SlideMove(mo, false);
 			xmove = ymove = 0;
 		}
@@ -1569,9 +1593,10 @@ void P_XYMovement(mobj_t *mo)
 	if (P_MobjWasRemoved(mo)) // MF_SPECIAL touched a player! O_o;;
 		return;
 
-	if (moved && oldslope) { // Check to see if we ran off
-
-		if (oldslope != mo->standingslope) { // First, compare different slopes
+	if (moved && oldslope) // Check to see if we ran off
+	{
+		if (oldslope != mo->standingslope) // First, compare different slopes
+		{
 			angle_t oldangle, newangle;
 			angle_t moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
 
@@ -1583,50 +1608,42 @@ void P_XYMovement(mobj_t *mo)
 				newangle = 0;
 
 			// Now compare the Zs of the different quantizations
-			if (oldangle-newangle > ANG30 && oldangle-newangle < ANGLE_180) { // Allow for a bit of sticking - this value can be adjusted later
+			if (oldangle-newangle > ANG30 && oldangle-newangle < ANGLE_180) // Allow for a bit of sticking - this value can be adjusted later
+			{
 				mo->standingslope = oldslope;
 				P_SlopeLaunch(mo);
-
-				//CONS_Printf("launched off of slope - ");
 			}
-
-			/*CONS_Printf("old angle %f - new angle %f = %f\n",
-						FIXED_TO_FLOAT(AngleFixed(oldangle)),
-						FIXED_TO_FLOAT(AngleFixed(newangle)),
-						FIXED_TO_FLOAT(AngleFixed(oldangle-newangle))
-						);*/
-		// Sryder 2018-11-26: Don't launch here if it's a slope without physics, we stick to those like glue anyway
-		} else if (predictedz-mo->z > abs(slopemom.z/2)
-			&& !(mo->standingslope->flags & SL_NOPHYSICS)) { // Now check if we were supposed to stick to this slope
-			//CONS_Printf("%d-%d > %d\n", (predictedz), (mo->z), (slopemom.z/2));
+		}
+		else if (predictedz-mo->z > abs(slopemom.z/2) // Sryder 2018-11-26: Don't launch here if it's a slope without physics, we stick to those like glue anyway
+			&& !(mo->standingslope->flags & SL_NOPHYSICS)) // Now check if we were supposed to stick to this slope
+		{
 			P_SlopeLaunch(mo);
 		}
-	} else if (moved && mo->standingslope && predictedz) {
+	}
+	else if (moved && mo->standingslope && predictedz)
+	{
 		angle_t moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
 		angle_t newangle = FixedMul((signed)mo->standingslope->zangle, FINECOSINE((moveangle - mo->standingslope->xydirection) >> ANGLETOFINESHIFT));
 
-			/*CONS_Printf("flat to angle %f - predicted z of %f\n",
-						FIXED_TO_FLOAT(AngleFixed(ANGLE_MAX-newangle)),
-						FIXED_TO_FLOAT(predictedz)
-						);*/
-		if (ANGLE_MAX-newangle > ANG30 && newangle > ANGLE_180) {
+		if (ANGLE_MAX-newangle > ANG30 && newangle > ANGLE_180)
+		{
 			mo->momz = P_MobjFlip(mo)*FRACUNIT/2;
 			mo->z = predictedz + P_MobjFlip(mo);
 			mo->standingslope = NULL;
-			//CONS_Printf("Launched off of flat surface running into downward slope\n");
 		}
 	}
 
 	// Check the gravity status.
 	P_CheckGravity(mo, false);
 
-	if (player && !moved && player->pflags & PF_NIGHTSMODE && mo->target)
+	if (UNLIKELY(player && !moved && player->pflags & PF_NIGHTSMODE && mo->target))
 	{
 		angle_t fa;
 
 		P_UnsetThingPosition(mo);
 		player->angle_pos = player->old_angle_pos;
 		player->speed = FixedMul(player->speed, 4*FRACUNIT/5);
+
 		if (player->flyangle >= 0 && player->flyangle < 90)
 			player->flyangle = 135;
 		else if (player->flyangle >= 90 && player->flyangle < 180)
@@ -1635,6 +1652,7 @@ void P_XYMovement(mobj_t *mo)
 			player->flyangle = 315;
 		else
 			player->flyangle = 225;
+
 		player->flyangle %= 360;
 
 		if (player->pflags & PF_TRANSFERTOCLOSEST)
@@ -1663,7 +1681,7 @@ void P_XYMovement(mobj_t *mo)
 	if (player && player->homing) // no friction for homing
 		return;
 
-	if (player && player->pflags & PF_NIGHTSMODE)
+	if (UNLIKELY(player && player->pflags & PF_NIGHTSMODE))
 		return; // no friction for NiGHTS players
 
 	if ((mo->type == MT_BIGTUMBLEWEED || mo->type == MT_LITTLETUMBLEWEED)
@@ -1746,9 +1764,6 @@ static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motyp
 		if (!(rover->flags & FF_EXISTS))
 			continue;
 
-		topheight = P_GetFOFTopZ(mo, sector, rover, mo->x, mo->y, NULL);
-		bottomheight = P_GetFOFBottomZ(mo, sector, rover, mo->x, mo->y, NULL);
-
 		if (mo->player && P_CheckSolidLava(mo, rover)) // only the player should be affected
 			;
 		else if (motype != 0 && rover->flags & FF_SWIMMABLE) // "scenery" only
@@ -1758,6 +1773,10 @@ static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motyp
 		else if (!((rover->flags & FF_BLOCKPLAYER && mo->player) // solid to players?
 			    || (rover->flags & FF_BLOCKOTHERS && !mo->player))) // solid to others?
 			continue;
+
+		topheight = P_GetFOFTopZ(mo, sector, rover, mo->x, mo->y, NULL);
+		bottomheight = P_GetFOFBottomZ(mo, sector, rover, mo->x, mo->y, NULL);
+
 		if (rover->flags & FF_QUICKSAND)
 		{
 			switch (motype)
@@ -1781,6 +1800,7 @@ static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motyp
 
 		delta1 = mo->z - (bottomheight + ((topheight - bottomheight)/2));
 		delta2 = thingtop - (bottomheight + ((topheight - bottomheight)/2));
+
 		if (topheight > mo->floorz && abs(delta1) < abs(delta2)
 			&& !(rover->flags & FF_REVERSEPLATFORM)
 			&& ((P_MobjFlip(mo)*mo->momz >= 0) || (!(rover->flags & FF_PLATFORM)))) // In reverse gravity, only clip for FOFs that are intangible from their bottom (the "top" you're falling through) if you're coming from above ("below" in your frame of reference)
@@ -1814,7 +1834,7 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec)
 
 	thingtop = mo->z + mo->height;
 
-	while(po)
+	while (po)
 	{
 		if (!P_MobjInsidePolyobj(po, mo) || !(po->flags & POF_SOLID))
 		{
@@ -1866,6 +1886,7 @@ static void P_RingZMovement(mobj_t *mo)
 		mo->momz += mo->pmomz;
 		mo->eflags &= ~MFE_APPLYPMOMZ;
 	}
+
 	mo->z += mo->momz;
 
 	// clip movement
@@ -1888,12 +1909,13 @@ boolean P_CheckDeathPitCollide(mobj_t *mo)
 	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
+	const INT32 secspecial = GETSECSPECIAL(mo->subsector->sector->special, 1);
+
 	if (((mo->z <= mo->subsector->sector->floorheight
 		&& !(mo->eflags & MFE_VERTICALFLIP) && (mo->subsector->sector->flags & SF_FLIPSPECIAL_FLOOR))
 	|| (mo->z + mo->height >= mo->subsector->sector->ceilingheight
 		&& (mo->eflags & MFE_VERTICALFLIP) && (mo->subsector->sector->flags & SF_FLIPSPECIAL_CEILING)))
-	&& (GETSECSPECIAL(mo->subsector->sector->special, 1) == 6
-	|| GETSECSPECIAL(mo->subsector->sector->special, 1) == 7))
+	&& (secspecial == 6 || secspecial == 7))
 		return true;
 
 	return false;
@@ -1904,16 +1926,10 @@ boolean P_CheckSolidLava(mobj_t *mo, ffloor_t *rover)
 	I_Assert(mo != NULL);
 	I_Assert(!P_MobjWasRemoved(mo));
 
-	{
-		fixed_t topheight =
-			*rover->t_slope ? P_GetZAt(*rover->t_slope, mo->x, mo->y) :
-			*rover->topheight;
-
-		if (rover->flags & FF_SWIMMABLE && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3
-			&& !(rover->master->flags & ML_BLOCKMONSTERS)
-			&& ((rover->master->flags & ML_EFFECT3) || mo->z-mo->momz > topheight - FixedMul(16*FRACUNIT, mo->scale)))
-				return true;
-	}
+	if (rover->flags & FF_SWIMMABLE && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3
+		&& !(rover->master->flags & ML_BLOCKMONSTERS)
+		&& ((rover->master->flags & ML_EFFECT3) || mo->z-mo->momz > P_GetFFloorTopZAt(rover, mo->x, mo->y) - FixedMul(16*FRACUNIT, mo->scale)))
+			return true;
 
 	return false;
 }
@@ -1941,6 +1957,7 @@ static boolean P_ZMovement(mobj_t *mo)
 		mo->momz += mo->pmomz;
 		mo->eflags &= ~MFE_APPLYPMOMZ;
 	}
+
 	mo->z += mo->momz;
 
 	if (mo->standingslope)
@@ -2225,16 +2242,16 @@ static boolean P_ZMovement(mobj_t *mo)
 				|| mo->type == MT_CANNONBALLDECOR
 				|| mo->type == MT_FALLINGROCK)
 			{
-				if (maptol & TOL_NIGHTS)
+				if (UNLIKELY(maptol & TOL_NIGHTS))
 					mom.z = -FixedDiv(mom.z, 10*FRACUNIT);
 				else
 					mom.z = -FixedMul(mom.z, FixedDiv(17*FRACUNIT,20*FRACUNIT));
 
 				if (mo->type == MT_BIGTUMBLEWEED || mo->type == MT_LITTLETUMBLEWEED)
 				{
-					if (abs(mom.x) < FixedMul(STOPSPEED, mo->scale)
-						&& abs(mom.y) < FixedMul(STOPSPEED, mo->scale)
-						&& abs(mom.z) < FixedMul(STOPSPEED*3, mo->scale))
+					if (abs(mom.x) < FixedMul(FRACUNIT, mo->scale)
+						&& abs(mom.y) < FixedMul(FRACUNIT, mo->scale)
+						&& abs(mom.z) < FixedMul(FRACUNIT*3, mo->scale))
 					{
 						if (mo->flags2 & MF2_AMBUSH)
 						{
@@ -2275,9 +2292,9 @@ static boolean P_ZMovement(mobj_t *mo)
 					mom.z /= 2; // Rocks not so bouncy
 
 					if (!mo->fuse
-						&& abs(mom.x) < FixedMul(STOPSPEED*2, mo->scale)
-						&& abs(mom.y) < FixedMul(STOPSPEED*2, mo->scale)
-						&& abs(mom.z) < FixedMul(STOPSPEED*2*3, mo->scale))
+						&& abs(mom.x) < FixedMul(FRACUNIT*2, mo->scale)
+						&& abs(mom.y) < FixedMul(FRACUNIT*2, mo->scale)
+						&& abs(mom.z) < FixedMul(FRACUNIT*2*3, mo->scale))
 					{
 						//P_RemoveMobj(mo);
 						//return false;
@@ -2287,7 +2304,7 @@ static boolean P_ZMovement(mobj_t *mo)
 				else if (mo->type == MT_CANNONBALLDECOR)
 				{
 					mom.z /= 2;
-					if (abs(mom.z) < FixedMul(STOPSPEED*3, mo->scale))
+					if (abs(mom.z) < FixedMul(FRACUNIT*3, mo->scale))
 						mom.z = 0;
 				}
 			}
@@ -2365,9 +2382,9 @@ static boolean P_ZMovement(mobj_t *mo)
 				mo->momz = -mo->momz;
 			else
 			// Flags bounce
-			if (mo->type == MT_REDFLAG || mo->type == MT_BLUEFLAG)
+			if (UNLIKELY(mo->type == MT_REDFLAG || mo->type == MT_BLUEFLAG))
 			{
-				if (maptol & TOL_NIGHTS)
+				if (UNLIKELY(maptol & TOL_NIGHTS))
 					mo->momz = -FixedDiv(mo->momz, 10*FRACUNIT);
 				else
 					mo->momz = -FixedMul(mo->momz, FixedDiv(17*FRACUNIT,20*FRACUNIT));
@@ -2402,9 +2419,6 @@ static void P_PlayerZMovement(mobj_t *mo)
 			mo->player->viewheight -= (mo->z+mo->height) - mo->ceilingz;
 		else
 			mo->player->viewheight -= mo->floorz - mo->z;
-
-		/*mo->player->deltaviewheight =
-			(FixedMul(cv_viewheight.value<<FRACBITS, mo->scale) - mo->player->viewheight)>>3;*/
 	}
 
 	// adjust height
@@ -2437,7 +2451,7 @@ static void P_PlayerZMovement(mobj_t *mo)
 		else
 			mo->z = mo->floorz;
 
-		if (mo->player->pflags & PF_NIGHTSMODE)
+		if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE))
 		{
 			// bounce off floor if you were flying towards it
 			if ((mo->eflags & MFE_VERTICALFLIP && mo->player->flyangle > 0 && mo->player->flyangle < 180)
@@ -2470,11 +2484,6 @@ static void P_PlayerZMovement(mobj_t *mo)
 		{
 			mo->pmomz = 0; // We're on a new floor, don't keep doing platform movement.
 
-			// Squat down. Decrease viewheight for a moment after hitting the ground (hard),
-			/*if (P_MobjFlip(mo)*mo->momz < -FixedMul(8*FRACUNIT, mo->scale))
-				mo->player->deltaviewheight = (P_MobjFlip(mo)*mo->momz)>>3; // make sure momz is negative
-			*/
-
 			if (!tmfloorthing || tmfloorthing->flags & (MF_PUSHABLE|MF_MONITOR)
 				|| tmfloorthing->flags2 & MF2_STANDONME || tmfloorthing->type == MT_PLAYER) // Spin Attack
 			{
@@ -2487,16 +2496,15 @@ static void P_PlayerZMovement(mobj_t *mo)
 					msecnode_t *node;
 					boolean stopmovecut = false;
 
-					for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
+					if (numPolyObjects)
 					{
-						sector_t *sec = node->m_sector;
-						subsector_t *newsubsec;
-						size_t i;
-
-						for (i = 0; i < numsubsectors; i++)
+						for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
 						{
-							newsubsec = &subsectors[i];
+							sector_t *sec = node->m_sector;
+							subsector_t *newsubsec;
+							size_t i;
 
+<<<<<<< HEAD
 							if (newsubsec->sector != sec)
 								continue;
 
@@ -2509,6 +2517,22 @@ static void P_PlayerZMovement(mobj_t *mo)
 							while(po)
 							{
 								if (!P_MobjInsidePolyobj(po, mo) || !(po->flags & POF_SOLID))
+=======
+							for (i = 0; i < numsubsectors; i++)
+							{
+								newsubsec = &subsectors[i];
+
+								if (newsubsec->sector != sec)
+									continue;
+
+								if (!newsubsec->polyList)
+									continue;
+
+								polyobj_t *po = newsubsec->polyList;
+								sector_t *polysec;
+
+								while(po)
+>>>>>>> Saturn-Next
 								{
 									po = (polyobj_t *)(po->link.next);
 									continue;
@@ -2579,7 +2603,6 @@ static void P_PlayerZMovement(mobj_t *mo)
 					if (!(mo->player->pflags & PF_GLIDING))
 						mo->player->pflags &= ~PF_JUMPED;
 					mo->player->pflags &= ~PF_THOKKED;
-					//mo->player->pflags &= ~PF_GLIDING;
 					mo->player->jumping = 0;
 					mo->player->secondjump = 0;
 					mo->player->glidetime = 0;
@@ -2630,7 +2653,7 @@ nightsdone:
 		else
 			mo->z = mo->ceilingz - mo->height;
 
-		if (mo->player->pflags & PF_NIGHTSMODE)
+		if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE))
 		{
 			// bounce off ceiling if you were flying towards it
 			if ((mo->eflags & MFE_VERTICALFLIP && mo->player->flyangle > 180 && mo->player->flyangle <= 359)
@@ -2675,7 +2698,7 @@ nightsdone:
 			}
 
 			// hit the ceiling
-			if (mariomode)
+			if (UNLIKELY(mariomode))
 				S_StartSound(mo, sfx_mario1);
 
 			if (!mo->player->climbing)
@@ -2881,14 +2904,8 @@ void P_MobjCheckWater(mobj_t *mobj)
 		 || ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
 			continue;
 
-		topheight = *rover->topheight;
-		bottomheight = *rover->bottomheight;
-
-		if (*rover->t_slope)
-			topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
-
-		if (*rover->b_slope)
-			bottomheight = P_GetZAt(*rover->b_slope, mobj->x, mobj->y);
+		topheight    = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
+		bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
 
 		if (mobj->eflags & MFE_VERTICALFLIP)
 		{
@@ -3008,11 +3025,6 @@ void P_MobjCheckWater(mobj_t *mobj)
 				else if (mobj->eflags & MFE_VERTICALFLIP && mobj->momz > FixedMul(-min, mobj->scale))
 					mobj->momz = FixedMul(-min, mobj->scale);
 
-				/*if (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->momz > FixedMul(max, mobj->scale))
-					mobj->momz = FixedMul(max, mobj->scale);
-				else if (mobj->eflags & MFE_VERTICALFLIP && mobj->momz < FixedMul(-max, mobj->scale))
-					mobj->momz = FixedMul(-max, mobj->scale);*/
-
 				p->kartstuff[k_waterskip]++;
 			}
 
@@ -3025,6 +3037,7 @@ void P_MobjCheckWater(mobj_t *mobj)
 			{
 				// Spawn a splash
 				mobj_t *splish;
+
 				if (mobj->eflags & MFE_VERTICALFLIP)
 				{
 					splish = P_SpawnMobj(mobj->x, mobj->y, mobj->waterbottom-FixedMul(mobjinfo[MT_SPLISH].height, mobj->scale), MT_SPLISH);
@@ -3033,6 +3046,7 @@ void P_MobjCheckWater(mobj_t *mobj)
 				}
 				else
 					splish = P_SpawnMobj(mobj->x, mobj->y, mobj->watertop, MT_SPLISH);
+
 				splish->destscale = mobj->scale;
 				P_SetScale(splish, mobj->scale);
 			}
@@ -3113,14 +3127,8 @@ static void P_SceneryCheckWater(mobj_t *mobj)
 			if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKOTHERS)
 				continue;
 
-			topheight = *rover->topheight;
-			bottomheight = *rover->bottomheight;
-
-			if (*rover->t_slope)
-				topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
-
-			if (*rover->b_slope)
-				bottomheight = P_GetZAt(*rover->b_slope, mobj->x, mobj->y);
+			topheight    = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
+			bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
 
 			if (topheight <= mobj->z
 				|| bottomheight > (mobj->z + FixedMul(mobj->info->height >> 1, mobj->scale)))
@@ -3150,10 +3158,15 @@ static boolean P_CameraCheckHeat(camera_t *thiscam)
 	sector_t *sector;
 	fixed_t halfheight;
 
+<<<<<<< HEAD
 	if (!thiscam)
 		return false;
 
 	halfheight = thiscam->z + (thiscam->height >> 1);
+=======
+	if (!thiscam || !thiscam->subsector)
+		return false;
+>>>>>>> Saturn-Next
 
 	// see if we are in water
 	sector = thiscam->subsector->sector;
@@ -3165,6 +3178,8 @@ static boolean P_CameraCheckHeat(camera_t *thiscam)
 	{
 		ffloor_t *rover;
 
+		halfheight = thiscam->z + (thiscam->height >> 1);
+
 		for (rover = sector->ffloors; rover; rover = rover->next)
 		{
 			if (!(rover->flags & FF_EXISTS))
@@ -3188,10 +3203,15 @@ static boolean P_CameraCheckWater(camera_t *thiscam)
 	sector_t *sector;
 	fixed_t halfheight;
 
+<<<<<<< HEAD
 	if (!thiscam)
 		return false;
 
 	halfheight = thiscam->z + (thiscam->height >> 1);
+=======
+	if (!thiscam || !thiscam->subsector)
+		return false;
+>>>>>>> Saturn-Next
 
 	// see if we are in water
 	sector = thiscam->subsector->sector;
@@ -3200,6 +3220,8 @@ static boolean P_CameraCheckWater(camera_t *thiscam)
 	{
 		ffloor_t *rover;
 
+		halfheight = thiscam->z + (thiscam->height >> 1);
+
 		for (rover = sector->ffloors; rover; rover = rover->next)
 		{
 			if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKOTHERS)
@@ -3225,12 +3247,11 @@ void P_DestroyRobots(void)
 
 	for (think = thinkercap.next; think != &thinkercap; think = think->next)
 	{
-		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
+		if (think->function != (actionf_p1)P_MobjThinker)
 			continue; // not a mobj thinker
-		if (think->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
 
 		mo = (mobj_t *)think;
+
 		if (mo->health <= 0 || !(mo->flags & MF_ENEMY || mo->flags & MF_BOSS))
 			continue; // not a valid enemy
 
@@ -3242,65 +3263,52 @@ void P_DestroyRobots(void)
 	}
 }
 
-// P_CameraThinker
-//
-// Process the mobj-ish required functions of the camera
-boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled)
+// the below is chasecam only, if you're curious. check out P_CalcPostImg in p_user.c for first person
+void P_CalcChasePostImg(player_t *player, camera_t *thiscam)
 {
-	boolean itsatwodlevel = false;
-	boolean flipcam = (player->pflags & PF_FLIPCAM && !(player->pflags & PF_NIGHTSMODE) && player->mo->eflags & MFE_VERTICALFLIP);
-	postimg_t postimg = postimg_none;
-	UINT8 i;
+	const boolean flipcam = (player->pflags & PF_FLIPCAM && !(player->pflags & PF_NIGHTSMODE) && player->mo->eflags & MFE_VERTICALFLIP);
+	UINT8 postimgtype = 0;
 
-	// This can happen when joining
-	if (thiscam->subsector == NULL || thiscam->subsector->sector == NULL)
-		return true;
+	if (encoremode)
+		postimgtype |= POSTIMG_MIRROR;
+	if (flipcam)
+		postimgtype |= POSTIMG_FLIP;
 
-	if (twodlevel)
-		itsatwodlevel = true;
-	else
+#ifdef HWRENDER
+	if (rendermode == render_opengl && splitscreen)
 	{
-		for (i = 0; i <= splitscreen; i++)
-		{
-			if (thiscam == &camera[i] && players[displayplayers[i]].mo
-				&& (players[displayplayers[i]].mo->flags2 & MF2_TWOD))
-			{
-				itsatwodlevel = true;
-				break;
-			}
-		}
+		thiscam->postimg = postimgtype;
+		return;
 	}
+#endif
 
-	if (encoremode && !flipcam)
-		postimg = postimg_mirror;
-	else if (!encoremode && flipcam)
-		postimg = postimg_flip;
-	else if (encoremode && flipcam)
-		postimg = postimg_mirrorflip;
-	else if (player->awayviewtics && player->awayviewmobj && !P_MobjWasRemoved(player->awayviewmobj)) // Camera must obviously exist
+	if (player->awayviewtics && !P_MobjWasRemoved(player->awayviewmobj)) // Camera must obviously exist
 	{
 		camera_t dummycam;
+
 		dummycam.subsector = player->awayviewmobj->subsector;
 		dummycam.x = player->awayviewmobj->x;
 		dummycam.y = player->awayviewmobj->y;
 		dummycam.z = player->awayviewmobj->z;
 		//dummycam.height = 40*FRACUNIT; // alt view height is 20*FRACUNIT
 		dummycam.height = 0;			 // Why? Remote viewpoint cameras have no height.
+
 		// Are we in water?
 		if (P_CameraCheckWater(&dummycam))
-			postimg = postimg_water;
+			postimgtype |= POSTIMG_WATER;
 		else if (P_CameraCheckHeat(&dummycam))
-			postimg = postimg_heat;
+			postimgtype |= POSTIMG_HEAT;
 	}
 	else
 	{
 		// Are we in water?
 		if (P_CameraCheckWater(thiscam))
-			postimg = postimg_water;
+			postimgtype |= POSTIMG_WATER;
 		else if (P_CameraCheckHeat(thiscam))
-			postimg = postimg_heat;
+			postimgtype |= POSTIMG_HEAT;
 	}
 
+<<<<<<< HEAD
 	if (postimg != postimg_none)
 	{
 		for (i = 0; i <= splitscreen; i++)
@@ -3311,33 +3319,49 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
 			postimgtype[i] = postimg;
 		}
 	}
+=======
+	thiscam->postimg = postimgtype;
+}
+
+// P_CameraThinker
+//
+// Process the mobj-ish required functions of the camera
+boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled)
+{
+	// This can happen when joining
+	if (thiscam->subsector == NULL || thiscam->subsector->sector == NULL)
+		return true;
+
+	P_CalcChasePostImg(player, thiscam);
+>>>>>>> Saturn-Next
 
 	if (thiscam->momx || thiscam->momy)
 	{
-		if (!P_TryCameraMove(thiscam->x + thiscam->momx, thiscam->y + thiscam->momy, thiscam))
-		{ // Never fails for 2D mode.
+		if (!P_TryCameraMove(thiscam->x + thiscam->momx, thiscam->y + thiscam->momy, thiscam)) // Never fails for 2D mode.
+		{
 			mobj_t dummy;
-			dummy.thinker.function.acp1 = (actionf_p1)P_MobjThinker;
+
+			dummy.thinker.function = (actionf_p1)P_MobjThinker;
 			dummy.subsector = thiscam->subsector;
 			dummy.x = thiscam->x;
 			dummy.y = thiscam->y;
 			dummy.z = thiscam->z;
 			dummy.height = thiscam->height;
+
 			if (player->pflags & PF_TIMEOVER)
 				player->kartstuff[k_timeovercam] = (2*TICRATE)+1;
-			if (!resetcalled && !(player->pflags & PF_NOCLIP || leveltime < introtime) && !P_CheckSight(&dummy, player->mo)) // TODO: "P_CheckCameraSight" instead.
+
+			if (!resetcalled && !(player->pflags & PF_NOCLIP || leveltime < introtime) && !P_CheckSightFast(&dummy, player->mo)) // TODO: "P_CheckCameraSight" instead.
 				P_ResetCamera(player, thiscam);
 			else
 				P_SlideCameraMove(thiscam);
+
 			if (resetcalled) // Okay this means the camera is fully reset.
 				return true;
 		}
 	}
 
-	if (!itsatwodlevel)
-		P_CheckCameraPosition(thiscam->x, thiscam->y, thiscam);
-
-	thiscam->subsector = R_PointInSubsector(thiscam->x, thiscam->y);
+	thiscam->subsector = R_PointInSubsectorFast(thiscam->x, thiscam->y);
 	thiscam->floorz = tmfloorz;
 	thiscam->ceilingz = tmceilingz;
 
@@ -3390,13 +3414,13 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled
 #endif
 	}
 
-	if (itsatwodlevel
-	|| (thiscam->ceilingz - thiscam->z < thiscam->height
-		&& thiscam->ceilingz >= thiscam->z))
+	if (thiscam->ceilingz - thiscam->z < thiscam->height
+		&& thiscam->ceilingz >= thiscam->z)
 	{
 		thiscam->ceilingz = thiscam->z + thiscam->height;
 		thiscam->floorz = thiscam->z;
 	}
+
 	return false;
 }
 
@@ -3410,8 +3434,8 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 	I_Assert(mobj != NULL);
 	I_Assert(mobj->player != NULL);
 	I_Assert(!P_MobjWasRemoved(mobj));
-	
-	if (P_MobjWasRemoved(mobj))
+
+	if (!mobj)
 		return;
 
 	P_MobjCheckWater(mobj);
@@ -3422,7 +3446,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 	mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN;
 
 	// Zoom tube
-	if (mobj->tracer && mobj->tracer->type == MT_TUBEWAYPOINT)
+	if (UNLIKELY(mobj->tracer && mobj->tracer->type == MT_TUBEWAYPOINT))
 	{
 		P_UnsetThingPosition(mobj);
 		mobj->x += mobj->momx;
@@ -3432,7 +3456,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 		P_CheckPosition(mobj, mobj->x, mobj->y);
 		goto animonly;
 	}
-	else if (mobj->player->pflags & PF_MACESPIN && mobj->tracer)
+	else if (UNLIKELY(mobj->player->pflags & PF_MACESPIN && mobj->tracer))
 	{
 		P_CheckPosition(mobj, mobj->x, mobj->y);
 		goto animonly;
@@ -3451,7 +3475,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 	else
 		P_TryMove(mobj, mobj->x, mobj->y, true);
 
-	if (!(netgame && mobj->player->spectator))
+	if (LIKELY(!(netgame && mobj->player->spectator)))
 	{
 		// Crumbling platforms
 		for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
@@ -3498,6 +3522,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 				}
 			}
 		}
+
 		if (thereiswater)
 		{
 			for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
@@ -3538,15 +3563,18 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
 	}
 	else
 	{
-		if (!(mobj->player->pflags & PF_NIGHTSMODE)) // "jumping" is used for drilling
+		if (LIKELY(!(mobj->player->pflags & PF_NIGHTSMODE))) // "jumping" is used for drilling
 			mobj->player->jumping = 0;
+
 		mobj->player->pflags &= ~PF_JUMPED;
+
 		if (mobj->player->secondjump || mobj->player->powers[pw_tailsfly])
 		{
 			mobj->player->secondjump = 0;
 			mobj->player->powers[pw_tailsfly] = 0;
 			P_SetPlayerMobjState(mobj, S_KART_WALK1); // SRB2kart - was S_PLAY_RUN1
 		}
+
 		mobj->eflags &= ~MFE_JUSTHITFLOOR;
 	}
 
@@ -3564,15 +3592,22 @@ animonly:
 	}
 }
 
-static void CalculatePrecipFloor(precipmobj_t *mobj)
+static void P_CalculatePrecipFloor(precipmobj_t *mobj, boolean spawn)
 {
 	// recalculate floorz each time
 	const sector_t *mobjsecsubsec;
+
 	if (mobj && mobj->subsector && mobj->subsector->sector)
 		mobjsecsubsec = mobj->subsector->sector;
 	else
 		return;
+
+	// no need to recalc anything if not moved
+	if (!spawn && !mobjsecsubsec->moved)
+		return;
+
 	mobj->floorz = P_GetSectorFloorZAt(mobjsecsubsec, mobj->x, mobj->y);
+
 	if (mobjsecsubsec->ffloors)
 	{
 		ffloor_t *rover;
@@ -3595,83 +3630,95 @@ static void CalculatePrecipFloor(precipmobj_t *mobj)
 	}
 }
 
-void P_RecalcPrecipInSector(sector_t *sector)
-{
-	mprecipsecnode_t *psecnode;
-
-	if (!sector)
-		return;
-
-	sector->moved = true; // Recalc lighting and things too, maybe
-
-	for (psecnode = sector->touching_preciplist; psecnode; psecnode = psecnode->m_thinglist_next)
-		CalculatePrecipFloor(psecnode->m_thing);
-}
-
 //
 // P_NullPrecipThinker
 //
-// For "Blank" precipitation
+// Just the identification of a precip thinker. The thinker
+// should never actually be called!
 //
 void P_NullPrecipThinker(precipmobj_t *mobj)
 {
-	//(void)mobj;
-	mobj->precipflags &= ~PCF_THUNK;
-	R_ResetPrecipitationMobjInterpolationState(mobj);
+	(void)mobj;
+	I_Assert("P_NullPrecipThinker should not be called" == 0);
 }
 
-void P_SnowThinker(precipmobj_t *mobj)
+boolean P_PrecipThinker(precipmobj_t *mobj)
 {
+	if (mobj->lastThink == leveltime)
+		return true; // already thinked this tick
+
+	mobj->lastThink = leveltime;
+
+	R_ResetPrecipitationMobjInterpolationState(mobj);
 	P_CycleStateAnimation((mobj_t *)mobj);
 
+	if (mobj->state == &states[S_RAINRETURN])
+	{
+		// Reset to ceiling!
+		if (!P_SetPrecipMobjState(mobj, mobj->info->spawnstate))
+			return false;
+
+		mobj->z = mobj->ceilingz;
+		mobj->momz = cv_mobjscaleprecip.value ? FixedMul(mobj->info->speed, mapobjectscale) : mobj->info->speed;
+		mobj->precipflags &= ~PCF_SPLASH;
+		R_ResetPrecipitationMobjInterpolationState(mobj);
+	}
+
+	if (mobj->tics != -1)
+	{
+		if (mobj->tics)
+		{
+			mobj->tics--;
+		}
+
+		if (mobj->tics == 0)
+		{
+			if ((mobj->precipflags & PCF_SPLASH) && (mobj->state->nextstate == S_NULL))
+			{
+				// HACK: sprite changes are 1 tic late, so you would see splashes on the ceiling if not for this state.
+				// We need to use the settings from the previous state, since some of those are NOT 1 tic late.
+				INT32 frame = (mobj->frame & ~FF_FRAMEMASK);
+
+				if (!P_SetPrecipMobjState(mobj, S_RAINRETURN))
+					return false;
+
+				mobj->frame = frame;
+				return true;
+			}
+			else
+			{
+				if (!P_SetPrecipMobjState(mobj, mobj->state->nextstate))
+					return false;
+			}
+		}
+	}
+
+	if (mobj->precipflags & PCF_SPLASH)
+		return true;
+
+	if (renderisnewtic)
+		P_CalculatePrecipFloor(mobj, false);
+
 	// adjust height
 	if ((mobj->z += mobj->momz) <= mobj->floorz)
 	{
-		mobj->z = mobj->ceilingz;
-		R_ResetPrecipitationMobjInterpolationState(mobj);
-	}
-}
+		if ((mobj->info->deathstate == S_NULL) || (mobj->precipflags & PCF_PIT)) // no splashes on sky or bottomless pits
+		{
+			mobj->z = mobj->ceilingz;
+			R_ResetPrecipitationMobjInterpolationState(mobj);
+		}
+		else
+		{
+			if (!P_SetPrecipMobjState(mobj, mobj->info->deathstate))
+				return false;
 
-void P_RainThinker(precipmobj_t *mobj)
-{
-	P_CycleStateAnimation((mobj_t *)mobj);
-
-	if (mobj->state != &states[S_RAIN1])
-	{
-		// cycle through states,
-		// calling action functions at transitions
-		if (mobj->tics <= 0)
-			return;
-
-		if (--mobj->tics)
-			return;
-
-		if (!P_SetPrecipMobjState(mobj, mobj->state->nextstate))
-			return;
-
-		if (mobj->state != &states[S_RAINRETURN])
-			return;
-
-		mobj->z = mobj->ceilingz;
-		R_ResetPrecipitationMobjInterpolationState(mobj);
-		P_SetPrecipMobjState(mobj, S_RAIN1);
-
-		return;
+			mobj->z = mobj->floorz;
+			mobj->precipflags |= PCF_SPLASH;
+			R_ResetPrecipitationMobjInterpolationState(mobj);
+		}
 	}
 
-	// adjust height
-	if ((mobj->z += mobj->momz) > mobj->floorz)
-		return;
-
-	// no splashes on sky or bottomless pits
-	if (mobj->precipflags & PCF_PIT)
-	{
-		mobj->z = mobj->ceilingz;
-		return;
-	}
-
-	mobj->z = mobj->floorz;
-	P_SetPrecipMobjState(mobj, S_SPLASH1);
+	return true;
 }
 
 static void P_RingThinker(mobj_t *mobj)
@@ -3737,7 +3784,7 @@ boolean P_BossTargetPlayer(mobj_t *actor, boolean closest)
 		if (player->pflags & PF_INVIS || player->bot || player->spectator)
 			continue; // ignore notarget
 
-		if (!player->mo || P_MobjWasRemoved(player->mo))
+		if (P_MobjWasRemoved(player->mo))
 			continue;
 
 		if (!P_CheckSight(actor, player->mo))
@@ -3957,6 +4004,7 @@ static void P_Boss3Thinker(mobj_t *mobj)
 			P_SetMobjState(mobj, mobj->info->spawnstate);
 
 		mobj->reactiontime--;
+
 		if (!mobj->reactiontime)
 		{
 			ffloor_t *rover;
@@ -3967,10 +4015,7 @@ static void P_Boss3Thinker(mobj_t *mobj)
 				if (!playeringame[i] || players[i].spectator)
 					continue;
 
-				if (!players[i].mo)
-					continue;
-
-				if (players[i].mo->health <= 0)
+				if (!players[i].mo || (players[i].mo->health <= 0))
 					continue;
 
 				if (players[i].mo->eflags & MFE_UNDERWATER)
@@ -3985,10 +4030,7 @@ static void P_Boss3Thinker(mobj_t *mobj)
 
 				for (rover = sectors[i].ffloors; rover; rover = rover->next)
 				{
-					if (!(rover->flags & FF_EXISTS))
-						continue;
-
-					if (!(rover->flags & FF_SWIMMABLE))
+					if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE))
 						continue;
 
 					P_SpawnLightningFlash(rover->master->frontsector);
@@ -4016,15 +4058,16 @@ static void P_Boss3Thinker(mobj_t *mobj)
 					continue;
 
 				if (players[i].mo->eflags & MFE_UNDERWATER)
-				{ // Stay put
-					mobj->reactiontime = 2*TICRATE;
+				{
+					mobj->reactiontime = 2*TICRATE; // Stay put
 					return;
 				}
 			}
 		}
 
+		// Spawn pinch dummies from the center when we're leaving it.
 		if (!mobj->reactiontime && mobj->health <= mobj->info->damage)
-		{ // Spawn pinch dummies from the center when we're leaving it.
+		{
 			thinker_t *th;
 			mobj_t *mo2;
 			mobj_t *dummy;
@@ -4037,17 +4080,17 @@ static void P_Boss3Thinker(mobj_t *mobj)
 			// this can happen if the boss was hurt earlier than expected
 			for (th = thinkercap.next; th != &thinkercap; th = th->next)
 			{
-				if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-					continue;
-				if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+				if (th->function != (actionf_p1)P_MobjThinker)
 					continue;
 
 				mo2 = (mobj_t *)th;
+
 				if (mo2->type == (mobjtype_t)mobj->info->mass && mo2->tracer == mobj)
 				{
 					P_RemoveMobj(mo2);
 					i++;
 				}
+
 				if (i == 2) // we've already removed 2 of these, let's stop now
 					break;
 			}
@@ -4130,23 +4173,15 @@ static void P_Boss3Thinker(mobj_t *mobj)
 		// the number
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
 
-			if (!mo2)
+			if (!mo2 || mo2->type != MT_BOSS3WAYPOINT)
 				continue;
 
-			if (mo2->type != MT_BOSS3WAYPOINT)
-				continue;
-
-			if (!mo2->spawnpoint)
-				continue;
-
-			if (mo2->spawnpoint->angle != mobj->threshold)
+			if (!mo2->spawnpoint || mo2->spawnpoint->angle != mobj->threshold)
 				continue;
 
 			P_SetTarget(&mobj->target, mo2);
@@ -4164,7 +4199,7 @@ static void P_Boss3Thinker(mobj_t *mobj)
 		if (dist < 1)
 			dist = 1;
 
-		if ((mobj->movedir) || (mobj->health <= mobj->info->damage))
+		if (mobj->movedir || (mobj->health <= mobj->info->damage))
 			speed = mobj->info->speed * 2;
 		else
 			speed = mobj->info->speed;
@@ -4227,7 +4262,7 @@ static void P_Boss3Thinker(mobj_t *mobj)
 // Move Boss4's sectors by delta.
 static boolean P_Boss4MoveCage(fixed_t delta)
 {
-	const UINT16 tag = 65534;
+	static const UINT16 tag = 65534;
 	INT32 snum;
 	sector_t *sector;
 	for (snum = sectors[tag%numsectors].firsttag; snum != -1; snum = sector->nexttag)
@@ -4276,7 +4311,7 @@ static void P_Boss4PinchSpikeballs(mobj_t *mobj, angle_t angle, fixed_t fz)
 // Destroy cage FOFs.
 static void P_Boss4DestroyCage(void)
 {
-	const UINT16 tag = 65534;
+	static const UINT16 tag = 65534;
 	INT32 snum, next;
 	size_t a;
 	sector_t *sector, *rsec;
@@ -4752,10 +4787,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
 			if (!playeringame[i] || players[i].spectator)
 				continue;
 
-			if (!players[i].mo)
-				continue;
-
-			if (players[i].mo->health <= 0)
+			if (!players[i].mo || (players[i].mo->health <= 0))
 				continue;
 
 			if (players[i].powers[pw_ingoop])
@@ -4766,9 +4798,7 @@ static void P_Boss7Thinker(mobj_t *mobj)
 				// Find waypoint he is closest to
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-						continue;
-					if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+					if (th->function != (actionf_p1)P_MobjThinker)
 						continue;
 
 					mo2 = (mobj_t *)th;
@@ -4823,13 +4853,15 @@ static void P_Boss7Thinker(mobj_t *mobj)
 		// the waypoint to use
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
-			if (mo2->type == MT_BOSS3WAYPOINT && mo2->spawnpoint && (mo2->spawnpoint->options & 7) == waypointNum)
+
+			if (mo2->type != MT_BOSS3WAYPOINT || !mo2->spawnpoint)
+				continue;
+
+			if ((mo2->spawnpoint->options & 7) == waypointNum)
 			{
 				hitspot = mo2;
 				break;
@@ -4895,19 +4927,14 @@ static void P_Boss7Thinker(mobj_t *mobj)
 			if (!playeringame[i] || players[i].spectator)
 				continue;
 
-			if (!players[i].mo)
-				continue;
-
-			if (players[i].mo->health <= 0)
+			if (!players[i].mo || (players[i].mo->health <= 0))
 				continue;
 
 			if (P_AproxDistance(players[i].mo->x - mobj->x, players[i].mo->y - mobj->y) > mobj->radius*4)
 				continue;
 
-			if (players[i].mo->z > mobj->z + 128*FRACUNIT)
-				continue;
-
-			if (players[i].mo->z < mobj->z - 64*FRACUNIT)
+			if ((players[i].mo->z > mobj->z + 128*FRACUNIT)
+				|| (players[i].mo->z < mobj->z - 64*FRACUNIT))
 				continue;
 
 			P_DamageMobj(players[i].mo, mobj, mobj, 1);
@@ -4948,21 +4975,21 @@ static void P_Boss9Thinker(mobj_t *mobj)
 		// Build a hoop linked list of 'em!
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
-			if (mo2->type == MT_BOSS9GATHERPOINT)
-			{
-				if (last)
-					P_SetTarget(&last->hnext, mo2);
-				else
-					P_SetTarget(&mobj->hnext, mo2);
-				P_SetTarget(&mo2->hprev, last);
-				last = mo2;
-			}
+
+			if (mo2->type != MT_BOSS9GATHERPOINT)
+				continue;
+
+			if (last)
+				P_SetTarget(&last->hnext, mo2);
+			else
+				P_SetTarget(&mobj->hnext, mo2);
+
+			P_SetTarget(&mo2->hprev, last);
+			last = mo2;
 		}
 	}
 
@@ -4974,6 +5001,7 @@ static void P_Boss9Thinker(mobj_t *mobj)
 		P_BossTargetPlayer(mobj, false);
 		if (mobj->target && (!P_IsObjectOnGround(mobj->target) || mobj->target->player->pflags & PF_SPINNING))
 			P_SetTarget(&mobj->target, NULL); // Wait for them to hit the ground first
+
 		if (!mobj->target) // Still no target, aww.
 		{
 			// Reset the boss.
@@ -4997,13 +5025,15 @@ static void P_Boss9Thinker(mobj_t *mobj)
 		else
 			mobj->momz = (mobj->watertop-mobj->z)/40; // Float to your desired position
 
-		if (mobj->movecount == 2) {
+		if (mobj->movecount == 2)
+		{
 			mobj_t *spawner;
 			fixed_t dist = 0;
 			angle = 0x06000000*leveltime;
 
 			// Alter your energy bubble's size/position
-			if (mobj->health > 3) {
+			if (mobj->health > 3)
+			{
 				mobj->tracer->destscale = FRACUNIT + (4*TICRATE - mobj->fuse)*(FRACUNIT/2)/TICRATE + FixedMul(FINECOSINE(angle>>ANGLETOFINESHIFT),FRACUNIT/2);
 				P_SetScale(mobj->tracer, mobj->tracer->destscale);
 				P_SetOrigin(mobj->tracer, mobj->x, mobj->y, mobj->z + mobj->height/2 - mobj->tracer->height/2);
@@ -5016,6 +5046,7 @@ static void P_Boss9Thinker(mobj_t *mobj)
 			P_BossTargetPlayer(mobj, true);
 			angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y); // absolute angle
 			angle = (angle-mobj->angle); // relative angle
+
 			if (angle < ANGLE_180)
 				mobj->angle += angle/8;
 			else
@@ -5028,6 +5059,7 @@ static void P_Boss9Thinker(mobj_t *mobj)
 				if (P_RandomRange(1,(dist>>FRACBITS)/16) == 1)
 					break;
 			}
+
 			if (spawner && dist)
 			{
 				mobj_t *missile = P_SpawnMissile(spawner, mobj, MT_MSGATHER);
@@ -5039,8 +5071,10 @@ static void P_Boss9Thinker(mobj_t *mobj)
 		}
 
 		// Pre-threshold reactiontime stuff for attack phases
-		if (mobj->reactiontime && mobj->movecount == 3) {
-			if (mobj->movedir == 0 || mobj->movedir == 2) { // Pausing between bounces in the pinball phase
+		if (mobj->reactiontime && mobj->movecount == 3)
+		{
+			if (mobj->movedir == 0 || mobj->movedir == 2) // Pausing between bounces in the pinball phase
+			{
 				if (mobj->target->player->powers[pw_tailsfly]) // Trying to escape, eh?
 					mobj->watertop = mobj->target->z + mobj->target->momz*6; // Readjust your aim. >:3
 				else
@@ -5054,13 +5088,16 @@ static void P_Boss9Thinker(mobj_t *mobj)
 		}
 
 		// threshold is used for attacks/maneuvers.
-		if (mobj->threshold) {
+		if (mobj->threshold)
+		{
 			fixed_t speed = 20*FRACUNIT + FixedMul(40*FRACUNIT, FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, mobj->info->spawnhealth<<FRACBITS));
 			int tries = 0;
 
 			// Firin' mah lazors
-			if (mobj->movecount == 3 && mobj->movedir == 1) {
-				if (!(mobj->threshold&1)) {
+			if (mobj->movecount == 3 && mobj->movedir == 1)
+			{
+				if (!(mobj->threshold&1))
+				{
 					mobj_t *missile;
 					if (mobj->info->seesound)
 						S_StartSound(mobj, mobj->info->seesound);
@@ -5072,18 +5109,21 @@ static void P_Boss9Thinker(mobj_t *mobj)
 
 					A_FaceTarget(mobj);
 					missile = P_SpawnMissile(mobj, mobj->target, mobj->info->speed);
-					if (mobj->extravalue1 == 2 || mobj->extravalue1 == 3) {
+					if (mobj->extravalue1 == 2 || mobj->extravalue1 == 3)
+					{
 						missile->destscale = FRACUNIT>>1;
 						P_SetScale(missile, missile->destscale);
 					}
 					missile->fuse = 3*TICRATE;
 					missile->z -= missile->height/2;
 
-					if (mobj->extravalue1 == 2) {
+					if (mobj->extravalue1 == 2)
+					{
 						int i;
 						mobj_t *spread;
 						missile->flags |= MF_MISSILE;
-						for (i = 0; i < 5; i++) {
+						for (i = 0; i < 5; i++)
+						{
 							if (i == 2)
 								continue;
 							spread = P_SpawnMobj(missile->x, missile->y, missile->z, missile->type);
@@ -5096,7 +5136,9 @@ static void P_Boss9Thinker(mobj_t *mobj)
 						}
 						missile->flags &= ~MF_MISSILE;
 					}
-				} else {
+				}
+				else
+				{
 					P_SetMobjState(mobj, mobj->state->nextstate);
 					if (mobj->extravalue1 == 3)
 						mobj->reactiontime = TICRATE/8;
@@ -5110,7 +5152,8 @@ static void P_Boss9Thinker(mobj_t *mobj)
 			P_SpawnGhostMobj(mobj);
 
 			// Pinball attack!
-			if (mobj->movecount == 3 && (mobj->movedir == 0 || mobj->movedir == 2)) {
+			if (mobj->movecount == 3 && (mobj->movedir == 0 || mobj->movedir == 2))
+			{
 				if ((statenum_t)(mobj->state-states) != mobj->info->seestate)
 					P_SetMobjState(mobj, mobj->info->seestate);
 				if (mobj->movedir == 0) // mobj health == 1
@@ -5119,16 +5162,22 @@ static void P_Boss9Thinker(mobj_t *mobj)
 					P_InstaThrust(mobj, mobj->angle, 22*FRACUNIT);
 				else // mobj health == 2
 					P_InstaThrust(mobj, mobj->angle, 30*FRACUNIT);
-				if (!P_TryMove(mobj, mobj->x+mobj->momx, mobj->y+mobj->momy, true)) { // Hit a wall? Find a direction to bounce
+
+				if (!P_TryMove(mobj, mobj->x+mobj->momx, mobj->y+mobj->momy, true)) // Hit a wall? Find a direction to bounce
+				{
 					mobj->threshold--;
-					if (mobj->threshold) {
+					if (mobj->threshold)
+					{
 						P_SetMobjState(mobj, mobj->state->nextstate);
 						if (mobj->info->mass)
 							S_StartSound(mobj, mobj->info->mass);
-						if (!(mobj->threshold%4)) { // We've decided to lock onto the player this bounce.
+						if (!(mobj->threshold%4)) // We've decided to lock onto the player this bounce.
+						{
 							mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x + mobj->target->momx*4, mobj->target->y + mobj->target->momy*4);
 							mobj->reactiontime = TICRATE; // targetting time
-						} else { // No homing, just use P_BounceMove
+						}
+						else // No homing, just use P_BounceMove
+						{
 							P_BounceMove(mobj);
 							mobj->angle = R_PointToAngle2(0,0,mobj->momx,mobj->momy);
 							mobj->reactiontime = TICRATE/4; // just a pause before you bounce away
@@ -5142,18 +5191,16 @@ static void P_Boss9Thinker(mobj_t *mobj)
 			// Vector form dodge!
 			mobj->angle += mobj->movedir;
 			P_InstaThrust(mobj, mobj->angle, -speed);
-			while (!P_TryMove(mobj, mobj->x+mobj->momx, mobj->y+mobj->momy, true) && tries++ < 16) {
+			while (!P_TryMove(mobj, mobj->x+mobj->momx, mobj->y+mobj->momy, true) && tries++ < 16)
+			{
 				mobj->angle += mobj->movedir;
 				P_InstaThrust(mobj, mobj->angle, -speed);
 			}
 			mobj->momx = mobj->momy = 0;
 			mobj->threshold--;
 			if (!mobj->threshold)
-			{ // Go into stun after dodge.
-				// from 3*TICRATE down to 1.25*TICRATE
-				//mobj->reactiontime = 5*TICRATE/4 + (FixedMul((7*TICRATE/4)<<FRACBITS, FixedDiv((mobj->health-1)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS))>>FRACBITS);
-				// from 3*TICRATE down to 2*TICRATE
-				mobj->reactiontime = 2*TICRATE + (FixedMul((1*TICRATE)<<FRACBITS, FixedDiv((mobj->health-1)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS))>>FRACBITS);
+			{
+				mobj->reactiontime = 2*TICRATE + (FixedMul((1*TICRATE)<<FRACBITS, FixedDiv((mobj->health-1)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS))>>FRACBITS); // Go into stun after dodge.
 				mobj->flags |= MF_SPECIAL|MF_SHOOTABLE;
 				P_SetMobjState(mobj, mobj->state->nextstate);
 			}
@@ -5176,10 +5223,12 @@ static void P_Boss9Thinker(mobj_t *mobj)
 				mobj->angle -= FixedAngle(FixedMul(AngleFixed(InvAngle(mobj->movedir)),FixedDiv(mobj->reactiontime<<FRACBITS,24<<FRACBITS)));
 			else
 				mobj->angle += FixedAngle(FixedMul(AngleFixed(mobj->movedir),FixedDiv(mobj->reactiontime<<FRACBITS,24<<FRACBITS)));
+
 			mobj->reactiontime--;
-			if (!mobj->reactiontime)
-				// Out of stun.
+
+			if (!mobj->reactiontime) // Out of stun.
 				P_SetMobjState(mobj, mobj->state->nextstate);
+
 			return;
 		}
 
@@ -5198,9 +5247,10 @@ static void P_Boss9Thinker(mobj_t *mobj)
 		if (mobj->flags2 & MF2_FRET)
 			return;
 
-		if (mobj->state == &states[mobj->info->raisestate])
-		{ // Charging energy
-			if (mobj->momx != 0 || mobj->momy != 0) { // Apply the air breaks
+		if (mobj->state == &states[mobj->info->raisestate]) // Charging energy
+		{
+			if (mobj->momx != 0 || mobj->momy != 0) // Apply the air breaks
+			{
 				if (abs(mobj->momx)+abs(mobj->momy) < FRACUNIT)
 					mobj->momx = mobj->momy = 0;
 				else
@@ -5225,7 +5275,8 @@ static void P_Boss9Thinker(mobj_t *mobj)
 					mobj->watertop = mobj->target->floorz + 256*FRACUNIT;
 				break;
 
-			case 1: {
+			case 1:
+			{
 				// Okay, we're up? Good, time to gather energy...
 				if (mobj->health > mobj->info->damage)
 				{ // No more bubble if we're broken (pinch phase)
@@ -5251,7 +5302,8 @@ static void P_Boss9Thinker(mobj_t *mobj)
 					P_SetTarget(&mobj->tracer, mobj->hnext);
 					P_RemoveMobj(removemobj);
 				}
-				if (mobj->health <= mobj->info->damage) {
+				if (mobj->health <= mobj->info->damage)
+				{
 					// Attack 1: Pinball dash!
 					if (mobj->health == 1)
 						mobj->movedir = 0;
@@ -5266,7 +5318,9 @@ static void P_Boss9Thinker(mobj_t *mobj)
 						mobj->threshold = 32; // bounce 32 times
 					mobj->watertop = mobj->target->floorz + 16*FRACUNIT;
 					P_LinedefExecute(LE_PINCHPHASE, mobj, NULL);
-				} else {
+				}
+				else
+				{
 					// Attack 2: Energy shot!
 					mobj->movedir = 1;
 
@@ -5279,7 +5333,8 @@ static void P_Boss9Thinker(mobj_t *mobj)
 					else
 						mobj->extravalue1 = 3;
 
-					switch(mobj->extravalue1) {
+					switch(mobj->extravalue1)
+					{
 					case 0: // shoot once
 					case 2: // spread-shot
 					default:
@@ -5323,7 +5378,6 @@ static void P_Boss9Thinker(mobj_t *mobj)
 				mobj->angle += angle/8;
 			else
 				mobj->angle -= InvAngle(angle)/8;
-			//A_FaceTarget(mobj);
 
 			// Check if we're being attacked
 			if (!(mobj->target->player->pflags & (PF_JUMPED|PF_SPINNING)
@@ -5343,7 +5397,8 @@ static void P_Boss9Thinker(mobj_t *mobj)
 				danger = false;
 			if (mobj->target->z+mobj->target->momz*2 > mobj->z+mobj->height)
 				danger = false;
-			if (danger) {
+			if (danger)
+			{
 				// An incoming attack is detected! What should we do?!
 				// Go into vector form!
 				mobj->movedir = ANGLE_11hh - FixedAngle(FixedMul(AngleFixed(ANGLE_11hh), FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS)));
@@ -5383,14 +5438,16 @@ mobj_t *P_GetClosestAxis(mobj_t *source)
 	// scan the thinkers to find the closest axis point
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
 
+<<<<<<< HEAD
 		if (!(mo2->type == MT_AXIS))
+=======
+		if (mo2->type != MT_AXIS)
+>>>>>>> Saturn-Next
 			continue;
 
 		if (closestaxis == NULL)
@@ -5426,8 +5483,6 @@ static void P_GimmeAxisXYPos(mobj_t *closestaxis, degenmobj_t *mobj)
 
 static void P_MoveHoop(mobj_t *mobj)
 {
-	const fixed_t fuse = (mobj->fuse*mobj->extravalue2);
-	const angle_t fa = mobj->movedir*(FINEANGLES/mobj->extravalue1);
 	TVector v;
 	TVector *res;
 	fixed_t finalx, finaly, finalz;
@@ -5437,6 +5492,9 @@ static void P_MoveHoop(mobj_t *mobj)
 	if (!mobj->target) /// \todo DEBUG ME! Target was P_RemoveMobj'd at some point, and therefore no longer valid!
 		return;
 
+	const fixed_t fuse = (mobj->fuse*mobj->extravalue2);
+	const angle_t fa = mobj->movedir*(FINEANGLES/mobj->extravalue1);
+
 	x = mobj->target->x;
 	y = mobj->target->y;
 	z = mobj->target->z+mobj->target->height/2;
@@ -5649,9 +5707,6 @@ void P_Attract(mobj_t *source, mobj_t *dest, boolean nightsgrab) // Home in on y
 	if (!dest || dest->health <= 0 || !dest->player || !source->tracer)
 		return;
 
-	// change angle
-	//source->angle = R_PointToAngle2(source->x, source->y, tx, ty);
-
 	// change slope
 	dist = P_AproxDistance(P_AproxDistance(tx - source->x, ty - source->y), tz - source->z);
 
@@ -5777,7 +5832,8 @@ static void P_AddOverlay(mobj_t *thing)
 
 	if (overlaycap == NULL)
 		P_SetTarget(&overlaycap, thing);
-	else {
+	else
+	{
 		mobj_t *mo;
 		for (mo = overlaycap; mo && mo->hnext; mo = mo->hnext)
 			;
@@ -5824,7 +5880,7 @@ void P_RunShadows(void)
 		next = mobj->hnext;
 		P_SetTarget(&mobj->hnext, NULL);
 
-		if (!mobj->target || P_MobjWasRemoved(mobj->target))
+		if (P_MobjWasRemoved(mobj->target))
 		{
 			mobj->flags2 |= MF2_DONTDRAW;
 			continue; // shouldn't you already be dead?
@@ -5890,7 +5946,8 @@ static void P_AddShadow(mobj_t *thing)
 
 	if (shadowcap == NULL)
 		P_SetTarget(&shadowcap, thing);
-	else {
+	else
+	{
 		mobj_t *mo;
 		for (mo = shadowcap; mo && mo->hnext; mo = mo->hnext)
 			;
@@ -5926,7 +5983,7 @@ static void P_RemoveShadow(mobj_t *thing)
 	}
 }
 
-void A_BossDeath(mobj_t *mo);
+void A_BossDeath(void *thing);
 // AI for the Koopa boss.
 static void P_KoopaThinker(mobj_t *koopa)
 {
@@ -5990,41 +6047,26 @@ static void P_KoopaThinker(mobj_t *koopa)
 //
 void P_RollPitchMobj(mobj_t* mobj)
 {
-    boolean usedist = false;
-	
-	if (P_MobjWasRemoved(mobj))
-        return;
-
-    if (cv_sloperolldist.value > 0)
-        usedist = true;
-
-    if ((cv_spriteroll.value) && (cv_sloperoll.value == 2))
-    {
-        K_RollMobjBySlopes(mobj, usedist);
-    }
-    else
-    {
-        mobj->sloperoll = FixedAngle(0);
-        mobj->slopepitch = FixedAngle(0);
-    }
+	K_RollMobjBySlopes(mobj, mobj->standingslope);
 }
 
 angle_t P_MobjPitchAndRoll(mobj_t *mobj)
 {
-    spritedef_t *sprdef;
-    spriteframe_t *sprframe;
-    angle_t ang = 0;
+	spritedef_t *sprdef;
+	spriteframe_t *sprframe;
+	angle_t ang = 0;
 	angle_t camang = 0;
 	angle_t return_angle = 0;
-	
-	if (!cv_spriteroll.value)
+
+	if (P_MobjWasRemoved(mobj))
 		return 0;
 
-    if (P_MobjWasRemoved(mobj))
-        return 0;
+	// if mobj doesent have any of those, no need to do the rest
+	if (mobj->roll == 0 && mobj->pitch == 0
+	 && mobj->sloperoll == 0 && mobj->slopepitch == 0)
+		return 0;
 
-    size_t rot = mobj->frame & FF_FRAMEMASK;
-    boolean papersprite = (mobj->frame & FF_PAPERSPRITE);
+	size_t rot = (mobj->frame & FF_FRAMEMASK);
 
 	if (mobj->skin && mobj->sprite == SPR_PLAY)
 	{
@@ -6041,54 +6083,71 @@ angle_t P_MobjPitchAndRoll(mobj_t *mobj)
 	if (rot >= sprdef->numframes)
 	{
 		sprdef = &sprites[states[S_UNKNOWN].sprite];
-		rot = states[S_UNKNOWN].frame&FF_FRAMEMASK;
+		rot = (states[S_UNKNOWN].frame & FF_FRAMEMASK);
 	}
 
 	sprframe = &sprdef->spriteframes[rot];
 
 	// No sprite frame? I guess it is possible
-	if (!sprframe) return 0;
+	if (!sprframe)
+		return 0;
 
-	if (sprframe->rotate != SRF_SINGLE || papersprite)
+	if (sprframe->rotate != SRF_SINGLE || (mobj->frame & FF_PAPERSPRITE))
 	{
 		ang = R_PointToAngle(mobj->x, mobj->y) - mobj->angle;
 		camang = R_PointToAngle(mobj->x, mobj->y);
 	}
 
-	return_angle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mobj->roll) 
-			        + FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), mobj->pitch);
-
-	if (cv_sloperoll.value)
-	{
-		return_angle += FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), mobj->sloperoll) 
-						+ FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), mobj->slopepitch);
-	}
+	return_angle = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mobj->roll)
+				 + FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), mobj->pitch)
+				 + FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), mobj->sloperoll)
+				 + FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), mobj->slopepitch);
 
 	return return_angle;
 }
 
-//
-// P_MobjThinker
-//
-void P_MobjThinker(mobj_t *mobj)
+static void P_MobjScaleThink(mobj_t *mobj)
 {
-	I_Assert(mobj != NULL);
-	I_Assert(!P_MobjWasRemoved(mobj));
+	fixed_t oldheight = mobj->height;
+	UINT8 correctionType = 0; // Don't correct Z position, just gain height
 
-	if (mobj->flags & MF_NOTHINK)
+	if (mobj->z > mobj->floorz && mobj->z + mobj->height < mobj->ceilingz
+		&& mobj->type != MT_EGGMOBILE_FIRE)
+		correctionType = 1; // Correct Z position by centering
+	else if (mobj->eflags & MFE_VERTICALFLIP)
+		correctionType = 2; // Correct Z position by moving down
+
+	if (abs(mobj->scale - mobj->destscale) < mobj->scalespeed)
+		P_SetScale(mobj, mobj->destscale);
+	else if (mobj->scale < mobj->destscale)
+		P_SetScale(mobj, mobj->scale + mobj->scalespeed);
+	else if (mobj->scale > mobj->destscale)
+		P_SetScale(mobj, mobj->scale - mobj->scalespeed);
+
+	if (correctionType == 1)
+		mobj->z -= (mobj->height - oldheight)/2;
+	else if (correctionType == 2)
+		mobj->z -= mobj->height - oldheight;
+
+	if (mobj->scale == mobj->destscale && mobj->type == MT_EGGMOBILE_FIRE)
+	{
+		/// \todo Lua hook for "reached destscale"?
+		mobj->destscale = FRACUNIT;
+		mobj->scalespeed = FRACUNIT>>4;
+	}
+}
+
+// Special thinker for scenery objects
+// this does not need to return anything
+static void P_MobjSceneryThink(mobj_t *mobj)
+{
+	if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjThinker)))
 		return;
 
-	// Remove dead target/tracer.
-	if (mobj->target && P_MobjWasRemoved(mobj->target))
-		P_SetTarget(&mobj->target, NULL);
-	if (mobj->tracer && P_MobjWasRemoved(mobj->tracer))
-		P_SetTarget(&mobj->tracer, NULL);
-	// hnext/hprev changes suggested by toaster
-	if (mobj->hnext && P_MobjWasRemoved(mobj->hnext))
-		P_SetTarget(&mobj->hnext, NULL);
-	if (mobj->hprev && P_MobjWasRemoved(mobj->hprev))
-		P_SetTarget(&mobj->hprev, NULL);
+	if (P_MobjWasRemoved(mobj))
+		return;
 
+<<<<<<< HEAD
 	mobj->flags2 &= ~MF2_PUSHED;
 	mobj->eflags &= ~(MFE_SPRUNG|MFE_JUSTBOUNCEDWALL);
 
@@ -6097,846 +6156,745 @@ void P_MobjThinker(mobj_t *mobj)
 
 	// 970 allows ANY mobj to trigger a linedef exec
 	if (mobj->subsector && GETSECSPECIAL(mobj->subsector->sector->special, 2) == 8)
+=======
+	switch (mobj->type)
+>>>>>>> Saturn-Next
 	{
-		sector_t *sec2;
+		case MT_HOOP:
+			if (mobj->fuse > 1)
+				P_MoveHoop(mobj);
+			else if (mobj->fuse == 1)
+				mobj->movecount = 1;
 
-		sec2 = P_ThingOnSpecial3DFloor(mobj);
-		if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1)
-			P_LinedefExecute(sec2->tag, mobj, sec2);
-	}
-
-	// Slowly scale up/down to reach your destscale.
-	if (mobj->scale != mobj->destscale)
-	{
-		fixed_t oldheight = mobj->height;
-		UINT8 correctionType = 0; // Don't correct Z position, just gain height
-
-		if (mobj->z > mobj->floorz && mobj->z + mobj->height < mobj->ceilingz
-		&& mobj->type != MT_EGGMOBILE_FIRE)
-			correctionType = 1; // Correct Z position by centering
-		else if (mobj->eflags & MFE_VERTICALFLIP)
-			correctionType = 2; // Correct Z position by moving down
-
-		if (abs(mobj->scale - mobj->destscale) < mobj->scalespeed)
-			P_SetScale(mobj, mobj->destscale);
-		else if (mobj->scale < mobj->destscale)
-			P_SetScale(mobj, mobj->scale + mobj->scalespeed);
-		else if (mobj->scale > mobj->destscale)
-			P_SetScale(mobj, mobj->scale - mobj->scalespeed);
-
-		if (correctionType == 1)
-			mobj->z -= (mobj->height - oldheight)/2;
-		else if (correctionType == 2)
-			mobj->z -= mobj->height - oldheight;
-
-		if (mobj->scale == mobj->destscale)
-			/// \todo Lua hook for "reached destscale"?
-			switch(mobj->type)
+			if (mobj->movecount)
 			{
-			case MT_EGGMOBILE_FIRE:
-				mobj->destscale = FRACUNIT;
-				mobj->scalespeed = FRACUNIT>>4;
-				break;
-			default:
-				break;
+				mobj->fuse++;
+
+				if (mobj->fuse > 32)
+				{
+					// Don't kill the hoop center. For the sake of respawning.
+					//if (mobj->target)
+					//	P_RemoveMobj(mobj->target);
+
+					P_RemoveMobj(mobj);
+				}
 			}
-	}
-
-	if (mobj->type == MT_GHOST && mobj->fuse > 0 // Not guaranteed to be MF_SCENERY or not MF_SCENERY!
-	&& (signed)(mobj->frame >> FF_TRANSSHIFT) < (NUMTRANSMAPS-1) - mobj->fuse / 2)
-		// fade out when nearing the end of fuse...
-		mobj->frame = (mobj->frame & ~FF_TRANSMASK) | (((NUMTRANSMAPS-1) - mobj->fuse / 2) << FF_TRANSSHIFT);
-
-	// Special thinker for scenery objects
-	if (mobj->flags & MF_SCENERY)
-	{
-		if (LUAh_MobjThinker(mobj))
+			else
+				mobj->fuse--;
 			return;
+		case MT_NIGHTSPARKLE:
+			if (mobj->tics != -1)
+			{
+				mobj->tics--;
 
-		if (P_MobjWasRemoved(mobj))
+				// you can cycle through multiple states in a tic
+				if (!mobj->tics)
+					if (!P_SetMobjState(mobj, mobj->state->nextstate))
+						return; // freed itself
+			}
+
+			P_UnsetThingPosition(mobj);
+			mobj->x += mobj->momx;
+			mobj->y += mobj->momy;
+			mobj->z += mobj->momz;
+			P_SetThingPosition(mobj);
 			return;
+		case MT_NIGHTSLOOPHELPER:
+			if (--mobj->tics <= 0)
+				P_RemoveMobj(mobj);
 
-		switch (mobj->type)
-		{
-			case MT_HOOP:
-				if (mobj->fuse > 1)
-					P_MoveHoop(mobj);
-				else if (mobj->fuse == 1)
-					mobj->movecount = 1;
-
-				if (mobj->movecount)
-				{
-					mobj->fuse++;
-
-					if (mobj->fuse > 32)
-					{
-						// Don't kill the hoop center. For the sake of respawning.
-						//if (mobj->target)
-						//	P_RemoveMobj(mobj->target);
-
-						P_RemoveMobj(mobj);
-					}
-				}
-				else
-					mobj->fuse--;
+			// Don't touch my fuse!
+			return;
+		case MT_OVERLAY:
+			if (!mobj->target)
+			{
+				P_RemoveMobj(mobj);
 				return;
-			case MT_NIGHTSPARKLE:
-				if (mobj->tics != -1)
-				{
-					mobj->tics--;
+			}
 
-					// you can cycle through multiple states in a tic
-					if (!mobj->tics)
-						if (!P_SetMobjState(mobj, mobj->state->nextstate))
-							return; // freed itself
-				}
+			if (mobj->state == &states[S_PLAY_SIGN]) // hack to make the player sign icon roll with the sign itself
+			{
+				mobj->slopepitch = mobj->target->slopepitch;
+				mobj->sloperoll = mobj->target->sloperoll;
+			}
 
-				P_UnsetThingPosition(mobj);
-				mobj->x += mobj->momx;
-				mobj->y += mobj->momy;
-				mobj->z += mobj->momz;
-				P_SetThingPosition(mobj);
+			P_AddOverlay(mobj);
+			break;
+		case MT_SHADOW:
+			if (!mobj->target)
+			{
+				P_RemoveMobj(mobj);
 				return;
-			case MT_NIGHTSLOOPHELPER:
-				if (--mobj->tics <= 0)
-					P_RemoveMobj(mobj);
+			}
 
-				// Don't touch my fuse!
+			K_RollMobjBySlopes(mobj, mobj->target->standingslope);
+
+			P_AddShadow(mobj);
+			break;
+		//{ SRB2kart mobs
+		case MT_ORBINAUT_SHIELD: // Kart orbit/trail items
+		case MT_JAWZ_SHIELD:
+		case MT_BANANA_SHIELD:
+		case MT_SSMINE_SHIELD:
+		case MT_EGGMANITEM_SHIELD:
+		case MT_SINK_SHIELD:
+			if ((mobj->health > 0
+				&& (!mobj->target || !mobj->target->player || mobj->target->player->health <= 0 || mobj->target->player->spectator))
+				|| (mobj->health <= 0 && P_IsObjectOnGround(mobj))
+				|| P_CheckDeathPitCollide(mobj)) // When in death state
+			{
+				P_RemoveMobj(mobj);
 				return;
-			case MT_OVERLAY:
-				if (!mobj->target)
-				{
-					P_RemoveMobj(mobj);
-					return;
-				}
+			}
 
-				if (mobj->state == &states[S_PLAY_SIGN]) // hack to make the player sign icon roll with the sign itself
-				{
-					mobj->slopepitch = mobj->target->slopepitch;
-					mobj->sloperoll = mobj->target->sloperoll;
-				}
-
-				P_AddOverlay(mobj);
-				break;
-			case MT_SHADOW:
-				if (!mobj->target)
-				{
-					P_RemoveMobj(mobj);
-					return;
-				}
-				
-				if (mobj->state == &states[S_SHADOW] && cv_sloperoll.value == 2)
-				{
-					mobj->slopepitch = mobj->target->slopepitch;
-					mobj->sloperoll = mobj->target->sloperoll;
-				}
-				P_AddShadow(mobj);
-				break;
-			//{ SRB2kart mobs
-			case MT_ORBINAUT_SHIELD: // Kart orbit/trail items
-			case MT_JAWZ_SHIELD:
-			case MT_BANANA_SHIELD:
-			case MT_SSMINE_SHIELD:
-			case MT_EGGMANITEM_SHIELD:
-			case MT_SINK_SHIELD:
-				if ((mobj->health > 0
-					&& (!mobj->target || !mobj->target->player || mobj->target->player->health <= 0 || mobj->target->player->spectator))
-					|| (mobj->health <= 0 && P_IsObjectOnGround(mobj))
-					|| P_CheckDeathPitCollide(mobj)) // When in death state
-				{
-					P_RemoveMobj(mobj);
-					return;
-				}
-				P_RollPitchMobj(mobj);
-				break;
-			case MT_SMOLDERING:
+			P_RollPitchMobj(mobj);
+			break;
+		case MT_SMOLDERING:
+			if (leveltime % 2 == 0)
+			{
+				fixed_t x = P_RandomRange(-35, 35)*mobj->scale;
+				fixed_t y = P_RandomRange(-35, 35)*mobj->scale;
+				fixed_t z = P_RandomRange(0, 70)*mobj->scale;
+				mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE);
+				P_SetMobjState(smoke, S_OPAQUESMOKE1);
+				K_MatchGenericExtraFlags(smoke, mobj);
+				smoke->scale = mobj->scale * 2;
+				smoke->destscale = mobj->scale * 6;
+				smoke->momz = P_RandomRange(4, 9)*FRACUNIT*P_MobjFlip(smoke);
+			}
+			break;
+		case MT_BOOMPARTICLE:
+			{
+				fixed_t x = P_RandomRange(-16, 16)*mobj->scale;
+				fixed_t y = P_RandomRange(-16, 16)*mobj->scale;
+				fixed_t z = P_RandomRange(0, 32)*mobj->scale*P_MobjFlip(mobj);
 				if (leveltime % 2 == 0)
 				{
-					fixed_t x = P_RandomRange(-35, 35)*mobj->scale;
-					fixed_t y = P_RandomRange(-35, 35)*mobj->scale;
-					fixed_t z = P_RandomRange(0, 70)*mobj->scale;
+					mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_BOSSEXPLODE);
+					K_MatchGenericExtraFlags(smoke, mobj);
+					P_SetMobjState(smoke, S_QUICKBOOM1);
+					smoke->scale = mobj->scale/2;
+					smoke->destscale = mobj->scale;
+					smoke->color = mobj->color;
+				}
+				else
+				{
 					mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE);
 					P_SetMobjState(smoke, S_OPAQUESMOKE1);
 					K_MatchGenericExtraFlags(smoke, mobj);
-					smoke->scale = mobj->scale * 2;
-					smoke->destscale = mobj->scale * 6;
-					smoke->momz = P_RandomRange(4, 9)*FRACUNIT*P_MobjFlip(smoke);
+					smoke->scale = mobj->scale;
+					smoke->destscale = mobj->scale*2;
 				}
-				break;
-			case MT_BOOMPARTICLE:
+				if (mobj->tics <= TICRATE)
 				{
-					fixed_t x = P_RandomRange(-16, 16)*mobj->scale;
-					fixed_t y = P_RandomRange(-16, 16)*mobj->scale;
-					fixed_t z = P_RandomRange(0, 32)*mobj->scale*P_MobjFlip(mobj);
-					if (leveltime % 2 == 0)
-					{
-						mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_BOSSEXPLODE);
-						K_MatchGenericExtraFlags(smoke, mobj);
-						P_SetMobjState(smoke, S_QUICKBOOM1);
-						smoke->scale = mobj->scale/2;
-						smoke->destscale = mobj->scale;
-						smoke->color = mobj->color;
-					}
-					else
-					{
-						mobj_t *smoke = P_SpawnMobj(mobj->x + x, mobj->y + y, mobj->z + z, MT_SMOKE);
-						P_SetMobjState(smoke, S_OPAQUESMOKE1);
-						K_MatchGenericExtraFlags(smoke, mobj);
-						smoke->scale = mobj->scale;
-						smoke->destscale = mobj->scale*2;
-					}
-					if (mobj->tics <= TICRATE)
-					{
-						mobj->destscale = FixedDiv(mobj->scale, 100*FRACUNIT);
-					}
+					mobj->destscale = FixedDiv(mobj->scale, 100*FRACUNIT);
 				}
-				break;
-			case MT_BATTLEBUMPER:
-				if (mobj->health > 0 && mobj->target && mobj->target->player
-					&& mobj->target->player->health > 0 && !mobj->target->player->spectator)
-				{
-					fixed_t rad = 32*mobj->target->scale;
-					fixed_t offz;
-					angle_t ang, diff;
+			}
+			break;
+		case MT_BATTLEBUMPER:
+			if (mobj->health > 0 && mobj->target && mobj->target->player
+				&& mobj->target->player->health > 0 && !mobj->target->player->spectator)
+			{
+				fixed_t rad = 32*mobj->target->scale;
+				fixed_t offz;
+				angle_t ang, diff;
 
-					if (!((mobj->target->player-players) & 1))
-						ang = (FixedAngle(mobj->info->speed) * -1);
-					else
-						ang = FixedAngle(mobj->info->speed);
+				if (!((mobj->target->player-players) & 1))
+					ang = (FixedAngle(mobj->info->speed) * -1);
+				else
+					ang = FixedAngle(mobj->info->speed);
 
-					if (mobj->target->player->kartstuff[k_bumper] <= 1)
-						diff = 0;
-					else
-						diff = FixedAngle(360*FRACUNIT/mobj->target->player->kartstuff[k_bumper]);
+				if (mobj->target->player->kartstuff[k_bumper] <= 1)
+					diff = 0;
+				else
+					diff = FixedAngle(360*FRACUNIT/mobj->target->player->kartstuff[k_bumper]);
 
-					ang = (ang*leveltime) + (diff * (mobj->threshold-1));
-
-					// If the player is on the ceiling, then flip your items as well.
-					if (mobj->target->eflags & MFE_VERTICALFLIP)
-					{
-						mobj->eflags |= MFE_VERTICALFLIP;
-						offz = mobj->target->height / 2;
-					}
-					else
-					{
-						mobj->eflags &= ~MFE_VERTICALFLIP;
-						offz = mobj->target->height / 5;
-					}
-
-					if (mobj->target->eflags & MFE_DRAWONLYFORP1) // groooooaann...
-						mobj->eflags |= MFE_DRAWONLYFORP1;
-					else
-						mobj->eflags &= ~MFE_DRAWONLYFORP1;
-
-					if (mobj->target->eflags & MFE_DRAWONLYFORP2)
-						mobj->eflags |= MFE_DRAWONLYFORP2;
-					else
-						mobj->eflags &= ~MFE_DRAWONLYFORP2;
-
-					if (mobj->target->eflags & MFE_DRAWONLYFORP3)
-						mobj->eflags |= MFE_DRAWONLYFORP3;
-					else
-						mobj->eflags &= ~MFE_DRAWONLYFORP3;
-
-					if (mobj->target->eflags & MFE_DRAWONLYFORP4)
-						mobj->eflags |= MFE_DRAWONLYFORP4;
-					else
-						mobj->eflags &= ~MFE_DRAWONLYFORP4;
-
-					if (mobj->target->flags2 & MF2_DONTDRAW)
-						mobj->flags2 |= MF2_DONTDRAW;
-					else
-						mobj->flags2 &= ~MF2_DONTDRAW;
-
-					if (mobj->target->eflags & MFE_VERTICALFLIP)
-						offz += 4*FRACUNIT;
-					else
-						offz -= 4*FRACUNIT;
-
-					if (mobj->tracer && mobj->tracer->player && mobj->tracer->player->mo
-						&& mobj->tracer->player->health > 0 && !mobj->tracer->player->spectator) // STOLEN
-						mobj->color = mobj->tracer->player->skincolor; // don't do star flashing for stolen bumpers
-					else
-						mobj->color = mobj->target->color; // but do so if it belongs to you :B
-
-					if (mobj->target->player->kartstuff[k_bumper] < 2)
-						P_SetMobjState(mobj, S_BATTLEBUMPER3);
-					else if (mobj->target->player->kartstuff[k_bumper] < 3)
-						P_SetMobjState(mobj, S_BATTLEBUMPER2);
-					else
-						P_SetMobjState(mobj, S_BATTLEBUMPER1);
-
-					// Shrink your items if the player shrunk too.
-					mobj->scale = mobj->target->scale;
-
-					P_UnsetThingPosition(mobj);
-					{
-						const angle_t fa = ang>>ANGLETOFINESHIFT;
-						mobj->x = mobj->target->x + FixedMul(FINECOSINE(fa), rad);
-						mobj->y = mobj->target->y + FixedMul(FINESINE(fa), rad);
-						mobj->z = mobj->target->z + offz;
-						P_SetThingPosition(mobj);
-					}
-
-					// Was this so hard?
-					if (mobj->target->player->kartstuff[k_bumper] <= mobj->threshold)
-					{
-						P_RemoveMobj(mobj);
-						return;
-					}
-				}
-				else if ((mobj->health > 0
-					&& (!mobj->target || !mobj->target->player || !mobj->target->player->mo || mobj->target->player->health <= 0 || mobj->target->player->spectator))
-					|| (mobj->health <= 0 && P_IsObjectOnGround(mobj))
-					|| P_CheckDeathPitCollide(mobj)) // When in death state
-				{
-					P_RemoveMobj(mobj);
-					return;
-				}
-				break;
-			case MT_PLAYERARROW:
-				if (mobj->target && mobj->target->health
-					&& mobj->target->player && !mobj->target->player->spectator
-					&& mobj->target->player->health && mobj->target->player->playerstate != PST_DEAD
-					/*&& players[displayplayers[0]].mo && !players[displayplayers[0]].spectator*/)
-				{
-					fixed_t scale = 3*mobj->target->scale;
-					mobj->color = mobj->target->color;
-					K_MatchGenericExtraFlags(mobj, mobj->target);
-
-					if ((G_RaceGametype() || mobj->target->player->kartstuff[k_bumper] <= 0)
-#if 1 // Set to 0 to test without needing to host
-						|| ((mobj->target->player == &players[displayplayers[0]]) || P_IsLocalPlayer(mobj->target->player))
-#endif
-						)
-						mobj->flags2 |= MF2_DONTDRAW;
-
-					P_UnsetThingPosition(mobj);
-					mobj->x = mobj->target->x;
-					mobj->y = mobj->target->y;
-
-					mobj->angle = R_PointToAngle(mobj->x, mobj->y) + ANGLE_90; // literally only happened because i wanted to ^L^R the SPR_ITEM's
-
-					if (!splitscreen && players[displayplayers[0]].mo)
-					{
-						scale = mobj->target->scale + FixedMul(FixedDiv(abs(P_AproxDistance(players[displayplayers[0]].mo->x-mobj->target->x,
-							players[displayplayers[0]].mo->y-mobj->target->y)), RING_DIST), mobj->target->scale);
-						if (scale > 16*mobj->target->scale)
-							scale = 16*mobj->target->scale;
-					}
-					mobj->destscale = scale;
-
-					if (!(mobj->target->eflags & MFE_VERTICALFLIP))
-					{
-						mobj->z = mobj->target->z + P_GetPlayerHeight(mobj->target->player) + (16*mobj->target->scale);
-						mobj->eflags &= ~MFE_VERTICALFLIP;
-					}
-					else
-					{
-						mobj->z = mobj->target->z - P_GetPlayerHeight(mobj->target->player) - (16*mobj->target->scale);
-						mobj->eflags |= MFE_VERTICALFLIP;
-					}
-					P_SetThingPosition(mobj);
-
-					if (!mobj->tracer)
-					{
-						mobj_t *overlay = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY);
-						P_SetTarget(&mobj->tracer, overlay);
-						P_SetTarget(&mobj->tracer->target, mobj);
-						P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM);
-						P_SetScale(mobj->tracer, (mobj->tracer->destscale = mobj->scale));
-					}
-
-					// Do this in an easy way
-					if (mobj->target->player->kartstuff[k_itemroulette])
-					{
-						mobj->tracer->color = mobj->target->player->skincolor;
-						mobj->tracer->colorized = true;
-					}
-					else
-					{
-						mobj->tracer->color = SKINCOLOR_NONE;
-						mobj->tracer->colorized = false;
-					}
-
-					if (!(mobj->flags2 & MF2_DONTDRAW))
-					{
-						const INT32 numberdisplaymin = ((mobj->target->player->kartstuff[k_itemtype] == KITEM_ORBINAUT) ? 5 : 2);
-
-						// Set it to use the correct states for its condition
-						if (mobj->target->player->kartstuff[k_itemroulette])
-						{
-							P_SetMobjState(mobj, S_PLAYERARROW_BOX);
-							mobj->tracer->sprite = SPR_ITEM;
-							mobj->tracer->frame = FF_FULLBRIGHT|(((mobj->target->player->kartstuff[k_itemroulette] % (13*3)) / 3) + 1);
-							mobj->tracer->flags2 &= ~MF2_DONTDRAW;
-						}
-						else if (mobj->target->player->kartstuff[k_stolentimer] > 0)
-						{
-							P_SetMobjState(mobj, S_PLAYERARROW_BOX);
-							mobj->tracer->sprite = SPR_ITEM;
-							mobj->tracer->frame = FF_FULLBRIGHT|KITEM_HYUDORO;
-							if (leveltime & 2)
-								mobj->tracer->flags2 &= ~MF2_DONTDRAW;
-							else
-								mobj->tracer->flags2 |= MF2_DONTDRAW;
-						}
-						else if ((mobj->target->player->kartstuff[k_stealingtimer] > 0) && (leveltime & 2))
-						{
-							P_SetMobjState(mobj, S_PLAYERARROW_BOX);
-							mobj->tracer->sprite = SPR_ITEM;
-							mobj->tracer->frame = FF_FULLBRIGHT|KITEM_HYUDORO;
-							mobj->tracer->flags2 &= ~MF2_DONTDRAW;
-						}
-						else if (mobj->target->player->kartstuff[k_eggmanexplode] > 1)
-						{
-							P_SetMobjState(mobj, S_PLAYERARROW_BOX);
-							mobj->tracer->sprite = SPR_ITEM;
-							mobj->tracer->frame = FF_FULLBRIGHT|KITEM_EGGMAN;
-							if (leveltime & 1)
-								mobj->tracer->flags2 &= ~MF2_DONTDRAW;
-							else
-								mobj->tracer->flags2 |= MF2_DONTDRAW;
-						}
-						else if (mobj->target->player->kartstuff[k_rocketsneakertimer] > 1)
-						{
-							//itembar = mobj->target->player->kartstuff[k_rocketsneakertimer]; -- not today satan
-							P_SetMobjState(mobj, S_PLAYERARROW_BOX);
-							mobj->tracer->sprite = SPR_ITEM;
-							mobj->tracer->frame = FF_FULLBRIGHT|KITEM_ROCKETSNEAKER;
-							if (leveltime & 1)
-								mobj->tracer->flags2 &= ~MF2_DONTDRAW;
-							else
-								mobj->tracer->flags2 |= MF2_DONTDRAW;
-						}
-						else if (mobj->target->player->kartstuff[k_growshrinktimer] > 0)
-						{
-							P_SetMobjState(mobj, S_PLAYERARROW_BOX);
-							mobj->tracer->sprite = SPR_ITEM;
-							mobj->tracer->frame = FF_FULLBRIGHT|KITEM_GROW;
-
-							if (leveltime & 1)
-								mobj->tracer->flags2 &= ~MF2_DONTDRAW;
-							else
-								mobj->tracer->flags2 |= MF2_DONTDRAW;
-						}
-						else if (mobj->target->player->kartstuff[k_itemtype] && mobj->target->player->kartstuff[k_itemamount] > 0)
-						{
-							P_SetMobjState(mobj, S_PLAYERARROW_BOX);
-
-							switch (mobj->target->player->kartstuff[k_itemtype])
-							{
-								case KITEM_ORBINAUT:
-									mobj->tracer->sprite = SPR_ITMO;
-									mobj->tracer->frame = FF_FULLBRIGHT|(min(mobj->target->player->kartstuff[k_itemamount]-1, 3));
-									break;
-								case KITEM_INVINCIBILITY:
-									mobj->tracer->sprite = SPR_ITMI;
-									mobj->tracer->frame = FF_FULLBRIGHT|((leveltime % (7*3)) / 3);
-									break;
-								case KITEM_SAD:
-									mobj->tracer->sprite = SPR_ITEM;
-									mobj->tracer->frame = FF_FULLBRIGHT;
-									break;
-								default:
-									mobj->tracer->sprite = SPR_ITEM;
-									mobj->tracer->frame = FF_FULLBRIGHT|(mobj->target->player->kartstuff[k_itemtype]);
-									break;
-							}
-
-							if (mobj->target->player->kartstuff[k_itemheld])
-							{
-								if (leveltime & 1)
-									mobj->tracer->flags2 &= ~MF2_DONTDRAW;
-								else
-									mobj->tracer->flags2 |= MF2_DONTDRAW;
-							}
-							else
-								mobj->tracer->flags2 &= ~MF2_DONTDRAW;
-						}
-						else
-						{
-							P_SetMobjState(mobj, S_PLAYERARROW);
-							P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM);
-						}
-
-						mobj->tracer->destscale = scale;
-
-						if (mobj->target->player->kartstuff[k_itemamount] >= numberdisplaymin
-							&& mobj->target->player->kartstuff[k_itemamount] <= 10) // Meh, too difficult to support greater than this; convert this to a decent HUD object and then maybe :V
-						{
-							mobj_t *number = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY);
-							mobj_t *numx = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY);
-
-							P_SetTarget(&number->target, mobj);
-							P_SetMobjState(number, S_PLAYERARROW_NUMBER);
-							P_SetScale(number, mobj->scale);
-							number->destscale = scale;
-							number->frame = FF_FULLBRIGHT|(mobj->target->player->kartstuff[k_itemamount]);
-
-							P_SetTarget(&numx->target, mobj);
-							P_SetMobjState(numx, S_PLAYERARROW_X);
-							P_SetScale(numx, mobj->scale);
-							numx->destscale = scale;
-						}
-
-						if (K_IsPlayerWanted(mobj->target->player) && mobj->movecount != 1)
-						{
-							mobj_t *wanted = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_PLAYERWANTED);
-							P_SetTarget(&wanted->target, mobj->target);
-							P_SetTarget(&wanted->tracer, mobj);
-							P_SetScale(wanted, mobj->scale);
-							wanted->destscale = scale;
-							mobj->movecount = 1;
-						}
-						else if (!K_IsPlayerWanted(mobj->target->player))
-							mobj->movecount = 0;
-					}
-					else
-						mobj->tracer->flags2 |= MF2_DONTDRAW;
-				}
-				else if (mobj->health > 0)
-				{
-					P_KillMobj(mobj, NULL, NULL);
-					return;
-				}
-				break;
-			case MT_PLAYERWANTED:
-				if (mobj->target && mobj->target->health && mobj->tracer
-					&& mobj->target->player && !mobj->target->player->spectator
-					&& mobj->target->player->health && mobj->target->player->playerstate != PST_DEAD
-					&& players[displayplayers[0]].mo && !players[displayplayers[0]].spectator)
-				{
-					fixed_t scale = 3*mobj->target->scale;
-
-					if (!K_IsPlayerWanted(mobj->target->player))
-					{
-						mobj->tracer->movecount = 0;
-						P_RemoveMobj(mobj);
-						return;
-					}
-
-					if (mobj->tracer->flags2 & MF2_DONTDRAW)
-						mobj->flags2 |= MF2_DONTDRAW;
-					else
-						mobj->flags2 &= ~MF2_DONTDRAW;
-
-					P_UnsetThingPosition(mobj);
-					mobj->x = mobj->target->x;
-					mobj->y = mobj->target->y;
-
-					if (!splitscreen)
-					{
-						scale = mobj->target->scale + FixedMul(FixedDiv(abs(P_AproxDistance(players[displayplayers[0]].mo->x-mobj->target->x,
-							players[displayplayers[0]].mo->y-mobj->target->y)), RING_DIST), mobj->target->scale);
-						if (scale > 16*mobj->target->scale)
-							scale = 16*mobj->target->scale;
-					}
-					mobj->destscale = scale;
-
-					if (!(mobj->target->eflags & MFE_VERTICALFLIP))
-					{
-						mobj->z = mobj->target->z + (P_GetPlayerHeight(mobj->target->player)) + (16*mobj->target->scale) + (64*scale);
-						mobj->eflags &= ~MFE_VERTICALFLIP;
-					}
-					else
-					{
-						mobj->z = mobj->target->z - (P_GetPlayerHeight(mobj->target->player)) - (16*mobj->target->scale) - (64*scale);
-						mobj->eflags |= MFE_VERTICALFLIP;
-					}
-					P_SetThingPosition(mobj);
-				}
-				else if (mobj->health > 0)
-				{
-					P_KillMobj(mobj, NULL, NULL);
-					return;
-				}
-				break;
-			case MT_PETSMOKER:
-				if (!(leveltime % 10))
-				{
-					mobj_t *smok = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_PETSMOKE);
-					if (mobj->spawnpoint && mobj->spawnpoint->options & MTF_OBJECTSPECIAL)
-						P_SetMobjStateNF(smok, smok->info->painstate); // same function, diff sprite
-				}
-				break;
-			//}
-			case MT_WATERDROP:
-				P_SceneryCheckWater(mobj);
-				if ((mobj->z <= mobj->floorz || mobj->z <= mobj->watertop)
-					&& mobj->health > 0)
-				{
-					mobj->health = 0;
-					P_SetMobjState(mobj, mobj->info->deathstate);
-					S_StartSound(mobj, mobj->info->deathsound+P_RandomKey(mobj->info->mass));
-					return;
-				}
-				break;
-			case MT_BUBBLES:
-				P_SceneryCheckWater(mobj);
-				break;
-			case MT_SMALLBUBBLE:
-			case MT_MEDIUMBUBBLE:
-			case MT_EXTRALARGEBUBBLE:	// start bubble dissipate
-				P_SceneryCheckWater(mobj);
-				if (P_MobjWasRemoved(mobj)) // bubble was removed by not being in water
-					return;
-				if (!(mobj->eflags & MFE_UNDERWATER)
-					|| (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + mobj->height >= mobj->ceilingz)
-					|| (mobj->eflags & MFE_VERTICALFLIP && mobj->z <= mobj->floorz)
-					|| (P_CheckDeathPitCollide(mobj))
-					|| --mobj->fuse <= 0) // Bubbles eventually dissipate if they can't reach the surface.
-				{
-					// no playing sound: no point; the object is being removed
-					P_RemoveMobj(mobj);
-					return;
-				}
-				break;
-			case MT_DROWNNUMBERS:
-				if (!mobj->target)
-				{
-					P_RemoveMobj(mobj);
-					return;
-				}
-				if (!mobj->target->player || !(mobj->target->player->powers[pw_underwater] || mobj->target->player->powers[pw_spacetime]))
-				{
-					P_RemoveMobj(mobj);
-					return;
-				}
-				mobj->x = mobj->target->x;
-				mobj->y = mobj->target->y;
-
-				mobj->destscale = mobj->target->destscale;
-				P_SetScale(mobj, mobj->target->scale);
+				ang = (ang*leveltime) + (diff * (mobj->threshold-1));
 
+				// If the player is on the ceiling, then flip your items as well.
 				if (mobj->target->eflags & MFE_VERTICALFLIP)
 				{
-					mobj->z = mobj->target->z - FixedMul(16*FRACUNIT, mobj->target->scale) - mobj->height;
-					if (mobj->target->player->pflags & PF_FLIPCAM)
-						mobj->eflags |= MFE_VERTICALFLIP;
+					mobj->eflags |= MFE_VERTICALFLIP;
+					offz = mobj->target->height / 2;
 				}
 				else
-					mobj->z = mobj->target->z + (mobj->target->height) + FixedMul(8*FRACUNIT, mobj->target->scale); // Adjust height for height changes
+				{
+					mobj->eflags &= ~MFE_VERTICALFLIP;
+					offz = mobj->target->height / 5;
+				}
 
-				if (mobj->threshold <= 35)
+				if (mobj->target->eflags & MFE_DRAWONLYFORP1) // groooooaann...
+					mobj->eflags |= MFE_DRAWONLYFORP1;
+				else
+					mobj->eflags &= ~MFE_DRAWONLYFORP1;
+
+				if (mobj->target->eflags & MFE_DRAWONLYFORP2)
+					mobj->eflags |= MFE_DRAWONLYFORP2;
+				else
+					mobj->eflags &= ~MFE_DRAWONLYFORP2;
+
+				if (mobj->target->eflags & MFE_DRAWONLYFORP3)
+					mobj->eflags |= MFE_DRAWONLYFORP3;
+				else
+					mobj->eflags &= ~MFE_DRAWONLYFORP3;
+
+				if (mobj->target->eflags & MFE_DRAWONLYFORP4)
+					mobj->eflags |= MFE_DRAWONLYFORP4;
+				else
+					mobj->eflags &= ~MFE_DRAWONLYFORP4;
+
+				if (mobj->target->flags2 & MF2_DONTDRAW)
 					mobj->flags2 |= MF2_DONTDRAW;
 				else
 					mobj->flags2 &= ~MF2_DONTDRAW;
-				if (mobj->threshold <= 30)
-					mobj->threshold = 40;
-				mobj->threshold--;
-				break;
-			case MT_FLAMEJET:
-				if ((mobj->flags2 & MF2_FIRING) && (leveltime & 3) == 0)
+
+				if (mobj->target->eflags & MFE_VERTICALFLIP)
+					offz += 4*FRACUNIT;
+				else
+					offz -= 4*FRACUNIT;
+
+				if (mobj->tracer && mobj->tracer->player && mobj->tracer->player->mo
+					&& mobj->tracer->player->health > 0 && !mobj->tracer->player->spectator) // STOLEN
+					mobj->color = mobj->tracer->player->skincolor; // don't do star flashing for stolen bumpers
+				else
+					mobj->color = mobj->target->color; // but do so if it belongs to you :B
+
+				if (mobj->target->player->kartstuff[k_bumper] < 2)
+					P_SetMobjState(mobj, S_BATTLEBUMPER3);
+				else if (mobj->target->player->kartstuff[k_bumper] < 3)
+					P_SetMobjState(mobj, S_BATTLEBUMPER2);
+				else
+					P_SetMobjState(mobj, S_BATTLEBUMPER1);
+
+				// Shrink your items if the player shrunk too.
+				mobj->scale = mobj->target->scale;
+
+				P_UnsetThingPosition(mobj);
 				{
-					mobj_t *flame;
-					fixed_t strength;
-
-					// Wave the flames back and forth. Reactiontime determines which direction it's going.
-					if (mobj->fuse <= -16)
-						mobj->reactiontime = 1;
-					else if (mobj->fuse >= 16)
-						mobj->reactiontime = 0;
-
-					if (mobj->reactiontime)
-						mobj->fuse += 2;
-					else
-						mobj->fuse -= 2;
-
-					flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME);
-
-					flame->angle = mobj->angle;
-
-					if (mobj->flags2 & MF2_AMBUSH) // Wave up and down instead of side-to-side
-						flame->momz = mobj->fuse << (FRACBITS-2);
-					else
-						flame->angle += FixedAngle(mobj->fuse*FRACUNIT);
-
-					strength = 20*FRACUNIT;
-					strength -= ((20*FRACUNIT)/16)*mobj->movedir;
-
-					P_InstaThrust(flame, flame->angle, strength);
-					S_StartSound(flame, sfx_fire);
+					const angle_t fa = ang>>ANGLETOFINESHIFT;
+					mobj->x = mobj->target->x + FixedMul(FINECOSINE(fa), rad);
+					mobj->y = mobj->target->y + FixedMul(FINESINE(fa), rad);
+					mobj->z = mobj->target->z + offz;
+					P_SetThingPosition(mobj);
 				}
-				break;
-			case MT_VERTICALFLAMEJET:
-				if ((mobj->flags2 & MF2_FIRING) && (leveltime & 3) == 0)
+
+				// Was this so hard?
+				if (mobj->target->player->kartstuff[k_bumper] <= mobj->threshold)
 				{
-					mobj_t *flame;
-					fixed_t strength;
-
-					// Wave the flames back and forth. Reactiontime determines which direction it's going.
-					if (mobj->fuse <= -16)
-						mobj->reactiontime = 1;
-					else if (mobj->fuse >= 16)
-						mobj->reactiontime = 0;
-
-					if (mobj->reactiontime)
-						mobj->fuse++;
-					else
-						mobj->fuse--;
-
-					flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME);
-
-					strength = 20*FRACUNIT;
-					strength -= ((20*FRACUNIT)/16)*mobj->movedir;
-
-					// If deaf'd, the object spawns on the ceiling.
-					if (mobj->flags2 & MF2_AMBUSH)
-					{
-						mobj->z = mobj->ceilingz-mobj->height;
-						flame->momz = -strength;
-					}
-					else
-						flame->momz = strength;
-					P_InstaThrust(flame, mobj->angle, FixedDiv(mobj->fuse*FRACUNIT,3*FRACUNIT));
-					S_StartSound(flame, sfx_fire);
-				}
-				break;
-			case MT_SEED:
-				mobj->momz = mobj->info->speed;
-				break;
-			case MT_ROCKCRUMBLE1:
-			case MT_ROCKCRUMBLE2:
-			case MT_ROCKCRUMBLE3:
-			case MT_ROCKCRUMBLE4:
-			case MT_ROCKCRUMBLE5:
-			case MT_ROCKCRUMBLE6:
-			case MT_ROCKCRUMBLE7:
-			case MT_ROCKCRUMBLE8:
-			case MT_ROCKCRUMBLE9:
-			case MT_ROCKCRUMBLE10:
-			case MT_ROCKCRUMBLE11:
-			case MT_ROCKCRUMBLE12:
-			case MT_ROCKCRUMBLE13:
-			case MT_ROCKCRUMBLE14:
-			case MT_ROCKCRUMBLE15:
-			case MT_ROCKCRUMBLE16:
-				if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
-					&& mobj->state != &states[mobj->info->deathstate])
-				{
-					P_SetMobjState(mobj, mobj->info->deathstate);
+					P_RemoveMobj(mobj);
 					return;
 				}
-				break;
-			case MT_FIREDITEM:
-				if (mobj->target && !P_MobjWasRemoved(mobj->target))
+			}
+			else if ((mobj->health > 0
+				&& (!mobj->target || !mobj->target->player || !mobj->target->player->mo || mobj->target->player->health <= 0 || mobj->target->player->spectator))
+				|| (mobj->health <= 0 && P_IsObjectOnGround(mobj))
+				|| P_CheckDeathPitCollide(mobj)) // When in death state
+			{
+				P_RemoveMobj(mobj);
+				return;
+			}
+			break;
+		case MT_PLAYERARROW:
+			if (mobj->target && mobj->target->health
+				&& mobj->target->player && !mobj->target->player->spectator
+				&& mobj->target->player->health && mobj->target->player->playerstate != PST_DEAD)
+			{
+				fixed_t scale = 3*mobj->target->scale;
+				mobj->color = mobj->target->color;
+				K_MatchGenericExtraFlags(mobj, mobj->target);
+
+				if ((G_RaceGametype() || mobj->target->player->kartstuff[k_bumper] <= 0)
+#if 1 // Set to 0 to test without needing to host
+					|| ((mobj->target->player == &players[displayplayers[0]]) || P_IsLocalPlayer(mobj->target->player))
+#endif
+					)
+					mobj->flags2 |= MF2_DONTDRAW;
+
+				P_UnsetThingPosition(mobj);
+				mobj->x = mobj->target->x;
+				mobj->y = mobj->target->y;
+
+				mobj->angle = R_PointToAngle(mobj->x, mobj->y) + ANGLE_90; // literally only happened because i wanted to ^L^R the SPR_ITEM's
+
+				if (!splitscreen && players[displayplayers[0]].mo)
 				{
-					fixed_t x, y, z;
-					if (mobj->movecount)
+					scale = mobj->target->scale + FixedMul(FixedDiv(abs(P_AproxDistance(players[displayplayers[0]].mo->x-mobj->target->x,
+						players[displayplayers[0]].mo->y-mobj->target->y)), RING_DIST), mobj->target->scale);
+					if (scale > 16*mobj->target->scale)
+						scale = 16*mobj->target->scale;
+				}
+				mobj->destscale = scale;
+
+				if (!(mobj->target->eflags & MFE_VERTICALFLIP))
+				{
+					mobj->z = mobj->target->z + P_GetPlayerHeight(mobj->target->player) + (16*mobj->target->scale);
+					mobj->eflags &= ~MFE_VERTICALFLIP;
+				}
+				else
+				{
+					mobj->z = mobj->target->z - P_GetPlayerHeight(mobj->target->player) - (16*mobj->target->scale);
+					mobj->eflags |= MFE_VERTICALFLIP;
+				}
+				P_SetThingPosition(mobj);
+
+				if (!mobj->tracer)
+				{
+					mobj_t *overlay = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY);
+					P_SetTarget(&mobj->tracer, overlay);
+					P_SetTarget(&mobj->tracer->target, mobj);
+					P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM);
+					P_SetScale(mobj->tracer, (mobj->tracer->destscale = mobj->scale));
+				}
+
+				// Do this in an easy way
+				if (mobj->target->player->kartstuff[k_itemroulette])
+				{
+					mobj->tracer->color = mobj->target->player->skincolor;
+					mobj->tracer->colorized = true;
+				}
+				else
+				{
+					mobj->tracer->color = SKINCOLOR_NONE;
+					mobj->tracer->colorized = false;
+				}
+
+				if (!(mobj->flags2 & MF2_DONTDRAW))
+				{
+					const INT32 numberdisplaymin = ((mobj->target->player->kartstuff[k_itemtype] == KITEM_ORBINAUT) ? 5 : 2);
+
+					// Set it to use the correct states for its condition
+					if (mobj->target->player->kartstuff[k_itemroulette])
 					{
-						x = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle + mobj->movedir, mobj->target->radius + mobj->radius);
-						y = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle + mobj->movedir, mobj->target->radius + mobj->radius);
-						z = mobj->target->z + mobj->target->height/3;
+						P_SetMobjState(mobj, S_PLAYERARROW_BOX);
+						mobj->tracer->sprite = SPR_ITEM;
+						mobj->tracer->frame = FF_FULLBRIGHT|(((mobj->target->player->kartstuff[k_itemroulette] % (13*3)) / 3) + 1);
+						mobj->tracer->flags2 &= ~MF2_DONTDRAW;
+					}
+					else if (mobj->target->player->kartstuff[k_stolentimer] > 0)
+					{
+						P_SetMobjState(mobj, S_PLAYERARROW_BOX);
+						mobj->tracer->sprite = SPR_ITEM;
+						mobj->tracer->frame = FF_FULLBRIGHT|KITEM_HYUDORO;
+						if (leveltime & 2)
+							mobj->tracer->flags2 &= ~MF2_DONTDRAW;
+						else
+							mobj->tracer->flags2 |= MF2_DONTDRAW;
+					}
+					else if ((mobj->target->player->kartstuff[k_stealingtimer] > 0) && (leveltime & 2))
+					{
+						P_SetMobjState(mobj, S_PLAYERARROW_BOX);
+						mobj->tracer->sprite = SPR_ITEM;
+						mobj->tracer->frame = FF_FULLBRIGHT|KITEM_HYUDORO;
+						mobj->tracer->flags2 &= ~MF2_DONTDRAW;
+					}
+					else if (mobj->target->player->kartstuff[k_eggmanexplode] > 1)
+					{
+						P_SetMobjState(mobj, S_PLAYERARROW_BOX);
+						mobj->tracer->sprite = SPR_ITEM;
+						mobj->tracer->frame = FF_FULLBRIGHT|KITEM_EGGMAN;
+						if (leveltime & 1)
+							mobj->tracer->flags2 &= ~MF2_DONTDRAW;
+						else
+							mobj->tracer->flags2 |= MF2_DONTDRAW;
+					}
+					else if (mobj->target->player->kartstuff[k_rocketsneakertimer] > 1)
+					{
+						//itembar = mobj->target->player->kartstuff[k_rocketsneakertimer]; -- not today satan
+						P_SetMobjState(mobj, S_PLAYERARROW_BOX);
+						mobj->tracer->sprite = SPR_ITEM;
+						mobj->tracer->frame = FF_FULLBRIGHT|KITEM_ROCKETSNEAKER;
+						if (leveltime & 1)
+							mobj->tracer->flags2 &= ~MF2_DONTDRAW;
+						else
+							mobj->tracer->flags2 |= MF2_DONTDRAW;
+					}
+					else if (mobj->target->player->kartstuff[k_growshrinktimer] > 0)
+					{
+						P_SetMobjState(mobj, S_PLAYERARROW_BOX);
+						mobj->tracer->sprite = SPR_ITEM;
+						mobj->tracer->frame = FF_FULLBRIGHT|KITEM_GROW;
+
+						if (leveltime & 1)
+							mobj->tracer->flags2 &= ~MF2_DONTDRAW;
+						else
+							mobj->tracer->flags2 |= MF2_DONTDRAW;
+					}
+					else if (mobj->target->player->kartstuff[k_itemtype] && mobj->target->player->kartstuff[k_itemamount] > 0)
+					{
+						P_SetMobjState(mobj, S_PLAYERARROW_BOX);
+
+						switch (mobj->target->player->kartstuff[k_itemtype])
+						{
+							case KITEM_ORBINAUT:
+								mobj->tracer->sprite = SPR_ITMO;
+								mobj->tracer->frame = FF_FULLBRIGHT|(min(mobj->target->player->kartstuff[k_itemamount]-1, 3));
+								break;
+							case KITEM_INVINCIBILITY:
+								mobj->tracer->sprite = SPR_ITMI;
+								mobj->tracer->frame = FF_FULLBRIGHT|((leveltime % (7*3)) / 3);
+								break;
+							case KITEM_SAD:
+								mobj->tracer->sprite = SPR_ITEM;
+								mobj->tracer->frame = FF_FULLBRIGHT;
+								break;
+							default:
+								mobj->tracer->sprite = SPR_ITEM;
+								mobj->tracer->frame = FF_FULLBRIGHT|(mobj->target->player->kartstuff[k_itemtype]);
+								break;
+						}
+
+						if (mobj->target->player->kartstuff[k_itemheld])
+						{
+							if (leveltime & 1)
+								mobj->tracer->flags2 &= ~MF2_DONTDRAW;
+							else
+								mobj->tracer->flags2 |= MF2_DONTDRAW;
+						}
+						else
+							mobj->tracer->flags2 &= ~MF2_DONTDRAW;
 					}
 					else
 					{
-						x = mobj->target->x;
-						y = mobj->target->y;
-						z = mobj->target->z + (80*mapobjectscale);
+						P_SetMobjState(mobj, S_PLAYERARROW);
+						P_SetMobjState(mobj->tracer, S_PLAYERARROW_ITEM);
 					}
-					if (mobj->target->eflags & MFE_VERTICALFLIP)
-						z += mobj->target->height - FixedMul(mobj->target->scale, mobj->height);
 
-					P_MoveOrigin(mobj, x, y, z);
-				}
-				break;
-			default:
-				if (mobj->fuse)
-				{ // Scenery object fuse! Very basic!
-					mobj->fuse--;
-					if (!mobj->fuse)
+					mobj->tracer->destscale = scale;
+
+					if (mobj->target->player->kartstuff[k_itemamount] >= numberdisplaymin
+						&& mobj->target->player->kartstuff[k_itemamount] <= 10) // Meh, too difficult to support greater than this; convert this to a decent HUD object and then maybe :V
 					{
-						if (!LUAh_MobjFuse(mobj))
-							P_RemoveMobj(mobj);
-						return;
+						mobj_t *number = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY);
+						mobj_t *numx = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_OVERLAY);
+
+						P_SetTarget(&number->target, mobj);
+						P_SetMobjState(number, S_PLAYERARROW_NUMBER);
+						P_SetScale(number, mobj->scale);
+						number->destscale = scale;
+						number->frame = FF_FULLBRIGHT|(mobj->target->player->kartstuff[k_itemamount]);
+
+						P_SetTarget(&numx->target, mobj);
+						P_SetMobjState(numx, S_PLAYERARROW_X);
+						P_SetScale(numx, mobj->scale);
+						numx->destscale = scale;
 					}
+
+					if (K_IsPlayerWanted(mobj->target->player) && mobj->movecount != 1)
+					{
+						mobj_t *wanted = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_PLAYERWANTED);
+						P_SetTarget(&wanted->target, mobj->target);
+						P_SetTarget(&wanted->tracer, mobj);
+						P_SetScale(wanted, mobj->scale);
+						wanted->destscale = scale;
+						mobj->movecount = 1;
+					}
+					else if (!K_IsPlayerWanted(mobj->target->player))
+						mobj->movecount = 0;
 				}
-				break;
-		}
-
-		P_SceneryThinker(mobj);
-		return;
-	}
-
-	// Check for a Lua thinker first
-	if (!mobj->player)
-	{
-		if (LUAh_MobjThinker(mobj) || P_MobjWasRemoved(mobj))
-			return;
-	}
-	else if (!mobj->player->spectator)
-	{
-		// You cannot short-circuit the player thinker like you can other thinkers.
-		LUAh_MobjThinker(mobj);
-		if (P_MobjWasRemoved(mobj))
-			return;
-	}
-
-	// if it's pushable, or if it would be pushable other than temporary disablement, use the
-	// separate thinker
-	if (mobj->flags & MF_PUSHABLE || (mobj->info->flags & MF_PUSHABLE && mobj->fuse))
-	{
-		if (P_MobjWasRemoved(mobj))
-			return;
-
-		P_MobjCheckWater(mobj);
-		P_PushableThinker(mobj);
-
-		// Extinguish fire objects in water. (Yes, it's extraordinarily rare to have a pushable flame object, but Brak uses such a case.)
-		if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL
-			&& (mobj->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
-		{
-			P_KillMobj(mobj, NULL, NULL);
-			return;
-		}
-	}
-	else if (mobj->flags & MF_BOSS)
-	{
-		if (LUAh_BossThinker(mobj))
-		{
-			if (P_MobjWasRemoved(mobj))
+				else
+					mobj->tracer->flags2 |= MF2_DONTDRAW;
+			}
+			else if (mobj->health > 0)
+			{
+				P_KillMobj(mobj, NULL, NULL);
 				return;
-		}
-		else if (P_MobjWasRemoved(mobj))
-			return;
-		else
-		switch (mobj->type)
-		{
-			case MT_EGGMOBILE:
-				if (mobj->health < mobj->info->damage+1 && leveltime & 1 && mobj->health > 0)
-					P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SMOKE);
-				if (mobj->flags2 & MF2_SKULLFLY)
-					P_SpawnGhostMobj(mobj);
-				P_Boss1Thinker(mobj);
-				break;
-			case MT_EGGMOBILE2:
-				P_Boss2Thinker(mobj);
-				break;
-			case MT_EGGMOBILE3:
-				P_Boss3Thinker(mobj);
-				break;
-			case MT_EGGMOBILE4:
-				P_Boss4Thinker(mobj);
-				break;
-			case MT_BLACKEGGMAN:
-				P_Boss7Thinker(mobj);
-				break;
-			case MT_METALSONIC_BATTLE:
-				P_Boss9Thinker(mobj);
-				break;
-			default: // Generic SOC-made boss
-				if (mobj->flags2 & MF2_SKULLFLY)
-					P_SpawnGhostMobj(mobj);
-				P_GenericBossThinker(mobj);
-				break;
-		}
-		if (mobj->flags2 & MF2_BOSSFLEE)
-			P_InstaThrust(mobj, mobj->angle, FixedMul(12*FRACUNIT, mobj->scale));
+			}
+			break;
+		case MT_PLAYERWANTED:
+			if (mobj->target && mobj->target->health && mobj->tracer
+				&& mobj->target->player && !mobj->target->player->spectator
+				&& mobj->target->player->health && mobj->target->player->playerstate != PST_DEAD
+				&& players[displayplayers[0]].mo && !players[displayplayers[0]].spectator)
+			{
+				fixed_t scale = 3*mobj->target->scale;
+
+				if (!K_IsPlayerWanted(mobj->target->player))
+				{
+					mobj->tracer->movecount = 0;
+					P_RemoveMobj(mobj);
+					return;
+				}
+
+				if (mobj->tracer->flags2 & MF2_DONTDRAW)
+					mobj->flags2 |= MF2_DONTDRAW;
+				else
+					mobj->flags2 &= ~MF2_DONTDRAW;
+
+				P_UnsetThingPosition(mobj);
+				mobj->x = mobj->target->x;
+				mobj->y = mobj->target->y;
+
+				if (!splitscreen)
+				{
+					scale = mobj->target->scale + FixedMul(FixedDiv(abs(P_AproxDistance(players[displayplayers[0]].mo->x-mobj->target->x,
+						players[displayplayers[0]].mo->y-mobj->target->y)), RING_DIST), mobj->target->scale);
+					if (scale > 16*mobj->target->scale)
+						scale = 16*mobj->target->scale;
+				}
+				mobj->destscale = scale;
+
+				if (!(mobj->target->eflags & MFE_VERTICALFLIP))
+				{
+					mobj->z = mobj->target->z + (P_GetPlayerHeight(mobj->target->player)) + (16*mobj->target->scale) + (64*scale);
+					mobj->eflags &= ~MFE_VERTICALFLIP;
+				}
+				else
+				{
+					mobj->z = mobj->target->z - (P_GetPlayerHeight(mobj->target->player)) - (16*mobj->target->scale) - (64*scale);
+					mobj->eflags |= MFE_VERTICALFLIP;
+				}
+				P_SetThingPosition(mobj);
+			}
+			else if (mobj->health > 0)
+			{
+				P_KillMobj(mobj, NULL, NULL);
+				return;
+			}
+			break;
+		case MT_PETSMOKER:
+			if (!(leveltime % 10))
+			{
+				mobj_t *smok = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_PETSMOKE);
+				if (mobj->spawnpoint && mobj->spawnpoint->options & MTF_OBJECTSPECIAL)
+					P_SetMobjStateNF(smok, smok->info->painstate); // same function, diff sprite
+			}
+			break;
+		//}
+		case MT_WATERDROP:
+			P_SceneryCheckWater(mobj);
+			if ((mobj->z <= mobj->floorz || mobj->z <= mobj->watertop)
+				&& mobj->health > 0)
+			{
+				mobj->health = 0;
+				P_SetMobjState(mobj, mobj->info->deathstate);
+				S_StartSound(mobj, mobj->info->deathsound+P_RandomKey(mobj->info->mass));
+				return;
+			}
+			break;
+		case MT_BUBBLES:
+			P_SceneryCheckWater(mobj);
+			break;
+		case MT_SMALLBUBBLE:
+		case MT_MEDIUMBUBBLE:
+		case MT_EXTRALARGEBUBBLE:	// start bubble dissipate
+			P_SceneryCheckWater(mobj);
+			if (P_MobjWasRemoved(mobj)) // bubble was removed by not being in water
+				return;
+			if (!(mobj->eflags & MFE_UNDERWATER)
+				|| (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + mobj->height >= mobj->ceilingz)
+				|| (mobj->eflags & MFE_VERTICALFLIP && mobj->z <= mobj->floorz)
+				|| (P_CheckDeathPitCollide(mobj))
+				|| --mobj->fuse <= 0) // Bubbles eventually dissipate if they can't reach the surface.
+			{
+				// no playing sound: no point; the object is being removed
+				P_RemoveMobj(mobj);
+				return;
+			}
+			break;
+		case MT_DROWNNUMBERS:
+			if (!mobj->target)
+			{
+				P_RemoveMobj(mobj);
+				return;
+			}
+			if (!mobj->target->player || !(mobj->target->player->powers[pw_underwater] || mobj->target->player->powers[pw_spacetime]))
+			{
+				P_RemoveMobj(mobj);
+				return;
+			}
+			mobj->x = mobj->target->x;
+			mobj->y = mobj->target->y;
+
+			mobj->destscale = mobj->target->destscale;
+			P_SetScale(mobj, mobj->target->scale);
+
+			if (mobj->target->eflags & MFE_VERTICALFLIP)
+			{
+				mobj->z = mobj->target->z - FixedMul(16*FRACUNIT, mobj->target->scale) - mobj->height;
+				if (mobj->target->player->pflags & PF_FLIPCAM)
+					mobj->eflags |= MFE_VERTICALFLIP;
+			}
+			else
+				mobj->z = mobj->target->z + (mobj->target->height) + FixedMul(8*FRACUNIT, mobj->target->scale); // Adjust height for height changes
+
+			if (mobj->threshold <= 35)
+				mobj->flags2 |= MF2_DONTDRAW;
+			else
+				mobj->flags2 &= ~MF2_DONTDRAW;
+			if (mobj->threshold <= 30)
+				mobj->threshold = 40;
+			mobj->threshold--;
+			break;
+		case MT_FLAMEJET:
+			if ((mobj->flags2 & MF2_FIRING) && (leveltime & 3) == 0)
+			{
+				mobj_t *flame;
+				fixed_t strength;
+
+				// Wave the flames back and forth. Reactiontime determines which direction it's going.
+				if (mobj->fuse <= -16)
+					mobj->reactiontime = 1;
+				else if (mobj->fuse >= 16)
+					mobj->reactiontime = 0;
+
+				if (mobj->reactiontime)
+					mobj->fuse += 2;
+				else
+					mobj->fuse -= 2;
+
+				flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME);
+
+				flame->angle = mobj->angle;
+
+				if (mobj->flags2 & MF2_AMBUSH) // Wave up and down instead of side-to-side
+					flame->momz = mobj->fuse << (FRACBITS-2);
+				else
+					flame->angle += FixedAngle(mobj->fuse*FRACUNIT);
+
+				strength = 20*FRACUNIT;
+				strength -= ((20*FRACUNIT)/16)*mobj->movedir;
+
+				P_InstaThrust(flame, flame->angle, strength);
+				S_StartSound(flame, sfx_fire);
+			}
+			break;
+		case MT_VERTICALFLAMEJET:
+			if ((mobj->flags2 & MF2_FIRING) && (leveltime & 3) == 0)
+			{
+				mobj_t *flame;
+				fixed_t strength;
+
+				// Wave the flames back and forth. Reactiontime determines which direction it's going.
+				if (mobj->fuse <= -16)
+					mobj->reactiontime = 1;
+				else if (mobj->fuse >= 16)
+					mobj->reactiontime = 0;
+
+				if (mobj->reactiontime)
+					mobj->fuse++;
+				else
+					mobj->fuse--;
+
+				flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME);
+
+				strength = 20*FRACUNIT;
+				strength -= ((20*FRACUNIT)/16)*mobj->movedir;
+
+				// If deaf'd, the object spawns on the ceiling.
+				if (mobj->flags2 & MF2_AMBUSH)
+				{
+					mobj->z = mobj->ceilingz-mobj->height;
+					flame->momz = -strength;
+				}
+				else
+					flame->momz = strength;
+				P_InstaThrust(flame, mobj->angle, FixedDiv(mobj->fuse*FRACUNIT,3*FRACUNIT));
+				S_StartSound(flame, sfx_fire);
+			}
+			break;
+		case MT_SEED:
+			mobj->momz = mobj->info->speed;
+			break;
+		case MT_ROCKCRUMBLE1 ... MT_ROCKCRUMBLE16:
+			if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
+				&& mobj->state != &states[mobj->info->deathstate])
+			{
+				P_SetMobjState(mobj, mobj->info->deathstate);
+				return;
+			}
+			break;
+		case MT_FIREDITEM:
+			if (!P_MobjWasRemoved(mobj->target))
+			{
+				fixed_t x, y, z;
+				if (mobj->movecount)
+				{
+					x = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle + mobj->movedir, mobj->target->radius + mobj->radius);
+					y = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle + mobj->movedir, mobj->target->radius + mobj->radius);
+					z = mobj->target->z + mobj->target->height/3;
+				}
+				else
+				{
+					x = mobj->target->x;
+					y = mobj->target->y;
+					z = mobj->target->z + (80*mapobjectscale);
+				}
+				if (mobj->target->eflags & MFE_VERTICALFLIP)
+					z += mobj->target->height - FixedMul(mobj->target->scale, mobj->height);
+
+				P_MoveOrigin(mobj, x, y, z);
+			}
+			break;
+		default:
+			if (mobj->fuse) // Scenery object fuse! Very basic!
+			{
+				mobj->fuse--;
+
+				if (!mobj->fuse)
+				{
+					if (!LUA_HookMobj(mobj, MOBJ_HOOK(MobjFuse)))
+						P_RemoveMobj(mobj);
+					return;
+				}
+			}
+			break;
 	}
-	else if (mobj->health <= 0) // Dead things think differently than the living.
-		switch (mobj->type)
-		{
+
+	P_SceneryThinker(mobj);
+}
+
+static boolean P_MobjBossThink(mobj_t *mobj)
+{
+	if (LUA_HookMobj(mobj, MOBJ_HOOK(BossThinker)))
+	{
+		if (P_MobjWasRemoved(mobj))
+			return false;
+	}
+
+	if (P_MobjWasRemoved(mobj))
+		return false;
+
+	switch (mobj->type)
+	{
+		case MT_EGGMOBILE:
+			if (mobj->health < mobj->info->damage+1 && leveltime & 1 && mobj->health > 0)
+				P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SMOKE);
+			if (mobj->flags2 & MF2_SKULLFLY)
+				P_SpawnGhostMobj(mobj);
+			P_Boss1Thinker(mobj);
+			break;
+		case MT_EGGMOBILE2:
+			P_Boss2Thinker(mobj);
+			break;
+		case MT_EGGMOBILE3:
+			P_Boss3Thinker(mobj);
+			break;
+		case MT_EGGMOBILE4:
+			P_Boss4Thinker(mobj);
+			break;
+		case MT_BLACKEGGMAN:
+			P_Boss7Thinker(mobj);
+			break;
+		case MT_METALSONIC_BATTLE:
+			P_Boss9Thinker(mobj);
+			break;
+		default: // Generic SOC-made boss
+			if (mobj->flags2 & MF2_SKULLFLY)
+				P_SpawnGhostMobj(mobj);
+			P_GenericBossThinker(mobj);
+			break;
+	}
+
+	if (mobj->flags2 & MF2_BOSSFLEE)
+		P_InstaThrust(mobj, mobj->angle, FixedMul(12*FRACUNIT, mobj->scale));
+
+	return true;
+}
+
+static boolean P_MobjDeadThink(mobj_t *mobj)
+{
+	switch (mobj->type)
+	{
 		case MT_BLUEBALL:
 			if ((mobj->tics>>2)+1 > 0 && (mobj->tics>>2)+1 <= tr_trans60) // tr_trans50 through tr_trans90, shifting once every second frame
 				mobj->frame = (NUMTRANSMAPS-((mobj->tics>>2)+1))<<FF_TRANSSHIFT;
@@ -6947,7 +6905,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (mobj->z <= mobj->floorz)
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			break;
 		case MT_EGGTRAP: // Egg Capsule animal release
@@ -6961,6 +6919,7 @@ void P_MobjThinker(mobj_t *mobj)
 
 				i = P_RandomByte();
 				z = mobj->subsector->sector->floorheight + ((P_RandomByte()&63)*FRACUNIT);
+
 				for (j = 0; j < 2; j++)
 				{
 					const angle_t fa = (P_RandomByte()*FINEANGLES/16) & FINEMASK;
@@ -6997,8 +6956,8 @@ void P_MobjThinker(mobj_t *mobj)
 			/// \todo Have the player's dead body completely finish its animation even if they've already respawned.
 			if (!(mobj->flags2 & MF2_DONTDRAW))
 			{
-				if (!mobj->fuse)
-				{ // Go away.
+				if (!mobj->fuse) // Go away.
+				{
 					/// \todo Actually go ahead and remove mobj completely, and fix any bugs and crashes doing this creates. Chasecam should stop moving, and F12 should never return to it.
 					mobj->momz = 0;
 					if (mobj->player)
@@ -7006,7 +6965,7 @@ void P_MobjThinker(mobj_t *mobj)
 					else // safe to remove, nobody's going to complain!
 					{
 						P_RemoveMobj(mobj);
-						return;
+						return false;
 					}
 				}
 				else // Apply gravity to fall downwards.
@@ -7017,17 +6976,26 @@ void P_MobjThinker(mobj_t *mobj)
 				}
 			}
 			break;
-		//{ SRB2kart Items - Death States
-		case MT_ORBINAUT:
+			//{ SRB2kart Items - Death States
 		case MT_BANANA:
+			if (cv_bananthrowroll.value)
+			{
+				//mobj->angle -= spin;
+				if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj))
+					mobj->sloperoll += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao
+				else if (cv_bananthrowroll.value == 2)
+					mobj->rollangle += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h);
+			}
+			/* FALLTHRU */
+		case MT_ORBINAUT:
 		case MT_EGGMANITEM:
 		case MT_SPB:
 			if (P_IsObjectOnGround(mobj))
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
-			// fallthru
+			/* FALLTHRU */
 		case MT_ORBINAUT_SHIELD:
 		case MT_BANANA_SHIELD:
 		case MT_EGGMANITEM_SHIELD:
@@ -7037,7 +7005,7 @@ void P_MobjThinker(mobj_t *mobj)
 		case MT_JAWZ_DUD:
 			if (P_IsObjectOnGround(mobj))
 				P_SetMobjState(mobj, mobj->info->xdeathstate);
-			// fallthru
+			/* FALLTHRU */
 		case MT_JAWZ_SHIELD:
 			mobj->flags2 ^= MF2_DONTDRAW;
 			break;
@@ -7051,12 +7019,12 @@ void P_MobjThinker(mobj_t *mobj)
 			else
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			break;
 		case MT_MINEEXPLOSIONSOUND:
 			P_RemoveMobj(mobj);
-			return;
+			return false;
 		case MT_CDUFO:
 			if (mobj->fuse > TICRATE)
 				mobj->flags2 ^= MF2_DONTDRAW; // only by good fortune does this end with it having MF2_DONTDRAW... don't touch!
@@ -7066,20 +7034,20 @@ void P_MobjThinker(mobj_t *mobj)
 				P_SetMobjStateNF(mobj, mobj->info->seestate);
 			else
 				P_SetMobjStateNF(mobj, mobj->info->spawnstate);
-			/* FALLTHRU */
+		/* FALLTHRU */
 		case MT_SMK_MOLE:
 			mobj->flags2 ^= MF2_DONTDRAW;
 			if (P_IsObjectOnGround(mobj))
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			break;
 		case MT_SMK_THWOMP:
 			if (mobj->flags2 & MF2_AMBUSH)
 			{
 				mobj->colorized = true;
-				mobj->color = (1 + (leveltime % (MAXSKINCOLORS-1)));
+				mobj->color = K_RainbowColor();
 				mobj->frame |= FF_FULLBRIGHT;
 			}
 			else
@@ -7093,14 +7061,20 @@ void P_MobjThinker(mobj_t *mobj)
 			if (P_IsObjectOnGround(mobj))
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			break;
-		//}
+			//}
 		default:
 			break;
-		}
-	else switch (mobj->type)
+	}
+
+	return true;
+}
+
+static boolean P_MobjRegularThink(mobj_t *mobj)
+{
+	switch (mobj->type)
 	{
 		case MT_FALLINGROCK:
 			// Despawn rocks here in case zmovement code can't do so (blame slopes)
@@ -7109,8 +7083,6 @@ void P_MobjThinker(mobj_t *mobj)
 				  mobj->z + mobj->height >= mobj->ceilingz
 				: mobj->z <= mobj->floorz))
 			{
-				//P_RemoveMobj(mobj);
-				//return;
 				mobj->fuse = TICRATE;
 			}
 			P_MobjCheckWater(mobj);
@@ -7202,11 +7174,22 @@ void P_MobjThinker(mobj_t *mobj)
 				P_SetTarget(&mobj->target, NULL);
 				for (i = 0; i < MAXPLAYERS; i++)
 				{
+<<<<<<< HEAD
 					if (!(playeringame[i] && players[i].mo
 					&& players[i].mare == mobj->threshold && players[i].health > 1))
 						continue;
 
 					fixed_t dist = P_AproxDistance(players[i].mo->x - mobj->x, players[i].mo->y - mobj->y);
+=======
+					if (!playeringame[i] || !players[i].mo)
+						continue;
+
+					if ((players[i].mare != mobj->threshold) || (players[i].health <= 1))
+						continue;
+
+					fixed_t dist = P_AproxDistance(players[i].mo->x - mobj->x, players[i].mo->y - mobj->y);
+
+>>>>>>> Saturn-Next
 					if (!(dist < shortest))
 						continue;
 
@@ -7222,7 +7205,7 @@ void P_MobjThinker(mobj_t *mobj)
 			|| mobj->target->state == &states[mobj->target->info->raisestate])
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z - mobj->height);
 			break;
@@ -7230,7 +7213,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (mobj->z <= mobj->floorz)
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			break;
 		case MT_KOOPA:
@@ -7241,11 +7224,11 @@ void P_MobjThinker(mobj_t *mobj)
 				&& mobj->flags & MF_MISSILE)
 			{
 				P_ExplodeMissile(mobj);
-				return;
+				return false;
 			}
 			break;
 		case MT_BOSSFLYPOINT:
-			return;
+			return false;
 		case MT_NIGHTSCORE:
 			mobj->color = (UINT8)(leveltime % SKINCOLOR_WHITE);
 			break;
@@ -7255,67 +7238,76 @@ void P_MobjThinker(mobj_t *mobj)
 
 				if (!mobj->target // if you have no target
 				|| (!(mobj->target->flags & MF_BOSS) && mobj->target->health <= 0)) // or your target isn't a boss and it's popped now
-				{ // then remove yourself as well!
-					P_RemoveMobj(mobj);
-					return;
+				{
+					P_RemoveMobj(mobj); // then remove yourself as well!
+					return false;
 				}
 
 				jetx = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle, FixedMul(-64*FRACUNIT, mobj->target->scale));
 				jety = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle, FixedMul(-64*FRACUNIT, mobj->target->scale));
 
-				if (mobj->fuse == 56) // First one
+				switch (mobj->fuse)
 				{
-					P_UnsetThingPosition(mobj);
-					mobj->x = jetx;
-					mobj->y = jety;
-					if (mobj->target->eflags & MFE_VERTICALFLIP)
-						mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(38*FRACUNIT, mobj->target->scale);
-					else
-						mobj->z = mobj->target->z + FixedMul(38*FRACUNIT, mobj->target->scale);
-					mobj->floorz = mobj->z;
-					mobj->ceilingz = mobj->z+mobj->height;
-					P_SetThingPosition(mobj);
-				}
-				else if (mobj->fuse == 57)
-				{
-					P_UnsetThingPosition(mobj);
-					mobj->x = jetx + P_ReturnThrustX(mobj->target, mobj->target->angle-ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
-					mobj->y = jety + P_ReturnThrustY(mobj->target, mobj->target->angle-ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
-					if (mobj->target->eflags & MFE_VERTICALFLIP)
-						mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(12*FRACUNIT, mobj->target->scale);
-					else
-						mobj->z = mobj->target->z + FixedMul(12*FRACUNIT, mobj->target->scale);
-					mobj->floorz = mobj->z;
-					mobj->ceilingz = mobj->z+mobj->height;
-					P_SetThingPosition(mobj);
-				}
-				else if (mobj->fuse == 58)
-				{
-					P_UnsetThingPosition(mobj);
-					mobj->x = jetx + P_ReturnThrustX(mobj->target, mobj->target->angle+ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
-					mobj->y = jety + P_ReturnThrustY(mobj->target, mobj->target->angle+ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
-					if (mobj->target->eflags & MFE_VERTICALFLIP)
-						mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(12*FRACUNIT, mobj->target->scale);
-					else
-						mobj->z = mobj->target->z + FixedMul(12*FRACUNIT, mobj->target->scale);
-					mobj->floorz = mobj->z;
-					mobj->ceilingz = mobj->z+mobj->height;
-					P_SetThingPosition(mobj);
-				}
-				else if (mobj->fuse == 59)
-				{
-					jetx = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle, -mobj->target->radius);
-					jety = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle, -mobj->target->radius);
-					P_UnsetThingPosition(mobj);
-					mobj->x = jetx;
-					mobj->y = jety;
-					if (mobj->target->eflags & MFE_VERTICALFLIP)
-						mobj->z = mobj->target->z + mobj->target->height/2 + mobj->height/2;
-					else
-						mobj->z = mobj->target->z + mobj->target->height/2 - mobj->height/2;
-					mobj->floorz = mobj->z;
-					mobj->ceilingz = mobj->z+mobj->height;
-					P_SetThingPosition(mobj);
+					case 56: // First one
+						{
+							P_UnsetThingPosition(mobj);
+							mobj->x = jetx;
+							mobj->y = jety;
+							if (mobj->target->eflags & MFE_VERTICALFLIP)
+								mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(38*FRACUNIT, mobj->target->scale);
+							else
+								mobj->z = mobj->target->z + FixedMul(38*FRACUNIT, mobj->target->scale);
+							mobj->floorz = mobj->z;
+							mobj->ceilingz = mobj->z+mobj->height;
+							P_SetThingPosition(mobj);
+						}
+						break;
+					case 57:
+						{
+							P_UnsetThingPosition(mobj);
+							mobj->x = jetx + P_ReturnThrustX(mobj->target, mobj->target->angle-ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
+							mobj->y = jety + P_ReturnThrustY(mobj->target, mobj->target->angle-ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
+							if (mobj->target->eflags & MFE_VERTICALFLIP)
+								mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(12*FRACUNIT, mobj->target->scale);
+							else
+								mobj->z = mobj->target->z + FixedMul(12*FRACUNIT, mobj->target->scale);
+							mobj->floorz = mobj->z;
+							mobj->ceilingz = mobj->z+mobj->height;
+							P_SetThingPosition(mobj);
+						}
+						break;
+					case 58:
+						{
+							P_UnsetThingPosition(mobj);
+							mobj->x = jetx + P_ReturnThrustX(mobj->target, mobj->target->angle+ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
+							mobj->y = jety + P_ReturnThrustY(mobj->target, mobj->target->angle+ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
+							if (mobj->target->eflags & MFE_VERTICALFLIP)
+								mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(12*FRACUNIT, mobj->target->scale);
+							else
+								mobj->z = mobj->target->z + FixedMul(12*FRACUNIT, mobj->target->scale);
+							mobj->floorz = mobj->z;
+							mobj->ceilingz = mobj->z+mobj->height;
+							P_SetThingPosition(mobj);
+						}
+						break;
+					case 59:
+						{
+							jetx = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle, -mobj->target->radius);
+							jety = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle, -mobj->target->radius);
+							P_UnsetThingPosition(mobj);
+							mobj->x = jetx;
+							mobj->y = jety;
+							if (mobj->target->eflags & MFE_VERTICALFLIP)
+								mobj->z = mobj->target->z + mobj->target->height/2 + mobj->height/2;
+							else
+								mobj->z = mobj->target->z + mobj->target->height/2 - mobj->height/2;
+							mobj->floorz = mobj->z;
+							mobj->ceilingz = mobj->z+mobj->height;
+							P_SetThingPosition(mobj);
+						}
+						break;
+					default:
+						break;
 				}
 				mobj->fuse++;
 			}
@@ -7328,7 +7320,7 @@ void P_MobjThinker(mobj_t *mobj)
 				|| (!(mobj->target->flags & MF_BOSS) && mobj->target->health <= 0)) // or your target isn't a boss and it's popped now
 				{ // then remove yourself as well!
 					P_RemoveMobj(mobj);
-					return;
+					return false;
 				}
 
 				jetx = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle, FixedMul(-60*FRACUNIT, mobj->target->scale));
@@ -7350,7 +7342,7 @@ void P_MobjThinker(mobj_t *mobj)
 				|| (!(mobj->target->flags & MF_BOSS) && mobj->target->health <= 0)) // or your target isn't a boss and it's popped now
 				{ // then remove yourself as well!
 					P_RemoveMobj(mobj);
-					return;
+					return false;
 				}
 
 				P_UnsetThingPosition(mobj);
@@ -7377,24 +7369,7 @@ void P_MobjThinker(mobj_t *mobj)
 					P_SetTarget(&mobj->target, goalpost);
 				}
 
-				if (G_IsSpecialStage(gamemap))
-				{ // Never show the NiGHTS drone in special stages. Check ANYONE for bonustime.
-					INT32 i;
-					boolean bonustime = false;
-					for (i = 0; i < MAXPLAYERS; i++)
-						if (playeringame[i] && players[i].bonustime)
-						{
-							bonustime = true;
-							break;
-						}
-					if (!bonustime)
-					{
-						mobj->flags &= ~MF_NOGRAVITY;
-						P_SetMobjState(mobj, S_NIGHTSDRONE1);
-						mobj->flags2 |= MF2_DONTDRAW;
-					}
-				}
-				else if (mobj->tracer && mobj->tracer->player)
+				if (mobj->tracer && mobj->tracer->player)
 				{
 					if (!(mobj->tracer->player->pflags & PF_NIGHTSMODE))
 					{
@@ -7411,35 +7386,7 @@ void P_MobjThinker(mobj_t *mobj)
 			}
 			else
 			{
-				if (G_IsSpecialStage(gamemap))
-				{ // Never show the NiGHTS drone in special stages. Check ANYONE for bonustime.
-					INT32 i;
-
-					boolean bonustime = false;
-					for (i = 0; i < MAXPLAYERS; i++)
-						if (playeringame[i] && players[i].bonustime)
-						{
-							bonustime = true;
-							break;
-						}
-
-					if (bonustime)
-					{
-						P_SetMobjState(mobj, S_NIGHTSDRONE_SPARKLING1);
-						mobj->flags |= MF_NOGRAVITY;
-					}
-					else
-					{
-						if (mobj->target)
-						{
-							CONS_Debug(DBG_NIGHTSBASIC, "Removing goal post\n");
-							P_RemoveMobj(mobj->target);
-							P_SetTarget(&mobj->target, NULL);
-						}
-						mobj->flags2 |= MF2_DONTDRAW;
-					}
-				}
-				else if (mobj->tracer && mobj->tracer->player)
+				if (mobj->tracer && mobj->tracer->player)
 				{
 					if (mobj->target)
 					{
@@ -7461,7 +7408,9 @@ void P_MobjThinker(mobj_t *mobj)
 					else // Not NiGHTS
 						mobj->flags2 &= ~MF2_DONTDRAW;
 				}
+
 				mobj->angle += ANG10;
+
 				if (mobj->z <= mobj->floorz)
 					mobj->momz = 5*FRACUNIT;
 			}
@@ -7469,7 +7418,7 @@ void P_MobjThinker(mobj_t *mobj)
 		case MT_PLAYER:
 			if (mobj->player)
 				P_PlayerMobjThinker(mobj);
-			return;
+			return false;
 		case MT_SKIM:
 			// check mobj against possible water content, before movement code
 			P_MobjCheckWater(mobj);
@@ -7504,7 +7453,7 @@ void P_MobjThinker(mobj_t *mobj)
 				P_NightsItemChase(mobj);
 			else
 				A_AttractChase(mobj);
-			return;
+			return false;
 		// Flung items
 		case MT_FLINGRING:
 		case MT_FLINGCOIN:
@@ -7542,7 +7491,7 @@ void P_MobjThinker(mobj_t *mobj)
 				if (P_CheckDeathPitCollide(mobj))
 				{
 					P_RemoveMobj(mobj);
-					return;
+					return false;
 				}
 				else if (P_IsObjectOnGround(mobj))
 				{
@@ -7561,7 +7510,7 @@ void P_MobjThinker(mobj_t *mobj)
 					|| mobj->scale <= mapobjectscale>>4)
 					{
 						P_RemoveMobj(mobj);
-						return;
+						return false;
 					}
 					P_Attract(mobj, mobj->tracer, true);
 				}
@@ -7678,6 +7627,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (G_RaceGametype() && mobj->tracer)
 			{
 				distaway = P_AproxDistance(mobj->tracer->x - mobj->x, mobj->tracer->y - mobj->y);
+
 				if (distaway < distbarrier)
 				{
 					if (mobj->tracer->player)
@@ -7755,6 +7705,17 @@ void P_MobjThinker(mobj_t *mobj)
 		}
 		case MT_BANANA:
 		case MT_EGGMANITEM:
+			if (cv_bananthrowroll.value && !P_IsObjectOnGround(mobj))
+			{
+				// tilt n tumble
+				//mobj->angle += spin;
+
+				if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj))
+					mobj->sloperoll -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao
+				else if (cv_bananthrowroll.value == 2)
+					mobj->rollangle -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h);
+			}
+
 			mobj->friction = ORIG_FRICTION/4;
 			if (mobj->momx || mobj->momy)
 				P_SpawnGhostMobj(mobj);
@@ -7835,8 +7796,10 @@ void P_MobjThinker(mobj_t *mobj)
 
 				// you can cycle through multiple states in a tic
 				if (!mobj->tics)
+				{
 					if (!P_SetMobjState(mobj, mobj->state->nextstate))
-						return; // freed itself
+						return false; // freed itself
+				}
 			}
 
 			P_UnsetThingPosition(mobj);
@@ -7844,7 +7807,7 @@ void P_MobjThinker(mobj_t *mobj)
 			mobj->y += mobj->momy;
 			mobj->z += mobj->momz;
 			P_SetThingPosition(mobj);
-			return;
+			return false;
 		case MT_MINEEXPLOSIONSOUND:
 			if (mobj->health == 100)
 				S_StartSound(mobj, sfx_s3k4e);
@@ -7854,7 +7817,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (!mobj->target || !mobj->target->health)
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 
 			mobj->angle = mobj->target->angle;
@@ -7864,6 +7827,7 @@ void P_MobjThinker(mobj_t *mobj)
 
 			{
 				player_t *p = NULL;
+
 				if (mobj->target->target && mobj->target->target->player)
 					p = mobj->target->target->player;
 				else if (mobj->target->player)
@@ -7896,7 +7860,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (!mobj->target)
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			mobj->color = mobj->target->color;
 			mobj->colorized = mobj->target->colorized;
@@ -7905,7 +7869,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (!mobj->target || !mobj->target->health || (mobj->target->player && !mobj->target->player->kartstuff[k_invincibilitytimer]))
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			P_SetOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
 			break;
@@ -7916,7 +7880,7 @@ void P_MobjThinker(mobj_t *mobj)
 				|| !(mobj->target->player->cmd.buttons & BT_ACCELERATE))) // Letting go of accel functions about the same as brake-drifting
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			else
 			{
@@ -7933,7 +7897,7 @@ void P_MobjThinker(mobj_t *mobj)
 				P_SetScale(mobj, (mobj->destscale = mobj->target->scale));
 
 				if (mobj->target->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(mobj->target->player)*4)
-					mobj->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
+					mobj->color = K_RainbowColor();
 				else if (mobj->target->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(mobj->target->player)*2)
 					mobj->color = SKINCOLOR_KETCHUP;
 				else if (mobj->target->player->kartstuff[k_driftcharge] >= K_GetKartDriftSparkValue(mobj->target->player))
@@ -7953,7 +7917,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (!mobj->target || !mobj->target->health)
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
 			break;
@@ -7964,17 +7928,17 @@ void P_MobjThinker(mobj_t *mobj)
 			if (!mobj->target || !mobj->target->health || (mobj->target->player && !mobj->target->player->kartstuff[k_instashield]))
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 
 			K_MatchGenericExtraFlags(mobj, mobj->target);
 			P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
 			break;
 		case MT_BATTLEPOINT:
-			if (!mobj->target || P_MobjWasRemoved(mobj->target))
+			if (P_MobjWasRemoved(mobj->target))
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 
 			if (mobj->movefactor < 48*mobj->target->scale)
@@ -7998,7 +7962,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (!mobj->target || !mobj->target->health || (mobj->target->player && mobj->target->player->kartstuff[k_curshield] != 1))
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			P_SetScale(mobj, (mobj->destscale = (5*mobj->target->destscale)>>2));
 
@@ -8034,7 +7998,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (!mobj->target || !mobj->target->health)
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			if (mobj->target->player && !mobj->target->player->kartstuff[k_rocketsneakertimer])
 			{
@@ -8048,7 +8012,7 @@ void P_MobjThinker(mobj_t *mobj)
 				else if (P_IsObjectOnGround(mobj))
 				{
 					P_RemoveMobj(mobj);
-					return;
+					return false;
 				}
 			}
 			break;
@@ -8060,7 +8024,7 @@ void P_MobjThinker(mobj_t *mobj)
 					|| (G_RaceGametype() || mobj->target->player->kartstuff[k_bumper]))
 				{
 					P_RemoveMobj(mobj);
-					return;
+					return false;
 				}
 
 				P_MoveOrigin(mobj, mobj->target->x, mobj->target->y, mobj->target->z);
@@ -8114,7 +8078,7 @@ void P_MobjThinker(mobj_t *mobj)
 					const fixed_t rad = FixedMul(mobjinfo[MT_PLAYER].radius, mobj->target->scale);
 					mobj_t *cur = mobj->hnext;
 
-					while (cur && !P_MobjWasRemoved(cur))
+					while (!P_MobjWasRemoved(cur))
 					{
 						fixed_t offx = rad;
 						fixed_t offy = rad;
@@ -8250,7 +8214,7 @@ void P_MobjThinker(mobj_t *mobj)
 			{
 				mobj_t *cur = mobj->hnext;
 
-				while (cur && !P_MobjWasRemoved(cur))
+				while (!P_MobjWasRemoved(cur))
 				{
 					cur->angle += FixedAngle(mobj->info->speed);
 					P_MoveOrigin(cur, mobj->x + FINECOSINE((cur->angle*8)>>ANGLETOFINESHIFT),
@@ -8282,7 +8246,7 @@ void P_MobjThinker(mobj_t *mobj)
 					if (mobj->hnext) // Clean hnext list
 					{
 						mobj_t *cur = mobj->hnext;
-						while (cur && !P_MobjWasRemoved(cur))
+						while (!P_MobjWasRemoved(cur))
 						{
 							mobj_t *next = cur->hnext;
 							P_RemoveMobj(cur);
@@ -8310,7 +8274,7 @@ void P_MobjThinker(mobj_t *mobj)
 				}
 				else if (frogstate == S_FROGGER_ATTACK)
 				{
-					if (!mobj->tracer || P_MobjWasRemoved(mobj->tracer))
+					if (P_MobjWasRemoved(mobj->tracer))
 					{
 						mobj->reactiontime = mobj->info->reactiontime;
 						P_SetMobjState(mobj, S_FROGGER);
@@ -8360,7 +8324,7 @@ void P_MobjThinker(mobj_t *mobj)
 						if (mobj->hnext) // Clean hnext list
 						{
 							mobj_t *cur = mobj->hnext;
-							while (cur && !P_MobjWasRemoved(cur))
+							while (!P_MobjWasRemoved(cur))
 							{
 								mobj_t *next = cur->hnext;
 								P_RemoveMobj(cur);
@@ -8385,7 +8349,7 @@ void P_MobjThinker(mobj_t *mobj)
 							fixed_t wy = mobj->tracer->y + (joint * (mobj->y - mobj->tracer->y) / (numjoints+1));
 							fixed_t wz = mobj->tracer->z + (joint * ((mobj->z + (mobj->height/2)) - mobj->tracer->z) / (numjoints+1));
 
-							if (cur && !P_MobjWasRemoved(cur))
+							if (!P_MobjWasRemoved(cur))
 								P_MoveOrigin(cur, wx, wy, wz);
 							else
 								cur = P_SpawnMobj(wx, wy, wz, MT_FROGTONGUE_JOINT);
@@ -8450,14 +8414,14 @@ void P_MobjThinker(mobj_t *mobj)
 					}
 				}
 
-				if ((mobj->extravalue1) && !(mobj->tracer && !P_MobjWasRemoved(mobj->tracer)))
+				if (mobj->extravalue1 && P_MobjWasRemoved(mobj->tracer))
 				{
 					mobj->reactiontime = 20*mobj->info->reactiontime;
 					P_SetTarget(&mobj->target, NULL);
 					mobj->extravalue1 = 0;
 				}
 
-				if ((mobj->tracer && !P_MobjWasRemoved(mobj->tracer)) && !(leveltime % 10))
+				if (!P_MobjWasRemoved(mobj->tracer) && !(leveltime % 10))
 				{
 					mobj_t *dust = P_SpawnMobj(mobj->x + (P_RandomRange(-4, 4)<<FRACBITS),
 						mobj->y + (P_RandomRange(-4, 4)<<FRACBITS),
@@ -8487,7 +8451,7 @@ void P_MobjThinker(mobj_t *mobj)
 				{
 					fixed_t segz = mobj->z - ((i+1) * (32 * mobj->scale));
 
-					if (cur && !P_MobjWasRemoved(cur))
+					if (!P_MobjWasRemoved(cur))
 					{
 						if (i >= locnumsegs) // Remove extras
 						{
@@ -8543,10 +8507,10 @@ void P_MobjThinker(mobj_t *mobj)
 			break;
 		case MT_ROBRA_JOINT:
 		case MT_BLUEROBRA_JOINT:
-			if (!mobj->target || P_MobjWasRemoved(mobj->target))
+			if (P_MobjWasRemoved(mobj->target))
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			break;
 		case MT_SMK_PIPE:
@@ -8556,15 +8520,15 @@ void P_MobjThinker(mobj_t *mobj)
 				P_SetMobjStateNF(mobj, mobj->info->spawnstate);
 			break;
 		case MT_SMK_MOLESPAWNER:
-			if (!mobj->target || P_MobjWasRemoved(mobj->target))
+			if (P_MobjWasRemoved(mobj->target))
 			{
 				mobj_t *newmole = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SMK_MOLE);
 				P_SetTarget(&mobj->target, newmole);
-				return;
+				return false;
 			}
 			break;
 		case MT_SMK_MOLE:
-			if (mobj->target && !P_MobjWasRemoved(mobj->target) && mobj->target->player)
+			if (!P_MobjWasRemoved(mobj->target) && mobj->target->player)
 			{
 				player_t *player = mobj->target->player;
 
@@ -8632,7 +8596,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (mobj->flags2 & MF2_AMBUSH)
 			{
 				mobj->colorized = true;
-				mobj->color = (1 + (leveltime % (MAXSKINCOLORS-1)));
+				mobj->color = K_RainbowColor();
 				mobj->frame |= FF_FULLBRIGHT;
 			}
 			else
@@ -8681,7 +8645,6 @@ void P_MobjThinker(mobj_t *mobj)
 					if (mobj->z == mobj->movefactor)
 					{
 						mobj->extravalue1 = 1;
-						//S_StartSound(mobj, sfx_s1bb);
 					}
 					else
 						mobj->momz = (mobj->info->speed/16) * P_MobjFlip(mobj);
@@ -8702,7 +8665,7 @@ void P_MobjThinker(mobj_t *mobj)
 			if (mobj->momz == 0)
 			{
 				P_RemoveMobj(mobj);
-				return;
+				return false;
 			}
 			else
 			{
@@ -8720,7 +8683,7 @@ void P_MobjThinker(mobj_t *mobj)
 			P_MobjCheckWater(mobj);
 			P_CheckPosition(mobj, mobj->x, mobj->y);
 			if (P_MobjWasRemoved(mobj))
-				return;
+				return false;
 			mobj->floorz = tmfloorz;
 			mobj->ceilingz = tmceilingz;
 
@@ -8790,264 +8753,420 @@ void P_MobjThinker(mobj_t *mobj)
 				&& (mobj->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
 			{
 				P_KillMobj(mobj, NULL, NULL);
-				return;
+				return false;
 			}
 			break;
 	}
+
+	return true;
+}
+
+static void P_FlagFuseThink(mobj_t *mobj)
+{
+	subsector_t *ss;
+	fixed_t x, y, z;
+	mobj_t* flagmo;
+
+	if (!mobj->spawnpoint)
+		return;
+
+	x = mobj->spawnpoint->x << FRACBITS;
+	y = mobj->spawnpoint->y << FRACBITS;
+	ss = R_PointInSubsector(x, y);
+
+	if (mobj->spawnpoint->options & MTF_OBJECTFLIP)
+	{
+		z = ss->sector->ceilingheight - mobjinfo[mobj->type].height;
+		if (mobj->spawnpoint->options >> ZSHIFT)
+			z -= (mobj->spawnpoint->options >> ZSHIFT) << FRACBITS;
+	}
+	else
+	{
+		z = ss->sector->floorheight;
+		if (mobj->spawnpoint->options >> ZSHIFT)
+			z += (mobj->spawnpoint->options >> ZSHIFT) << FRACBITS;
+	}
+
+	flagmo = P_SpawnMobj(x, y, z, mobj->type);
+	flagmo->spawnpoint = mobj->spawnpoint;
+
+	if (mobj->spawnpoint->options & MTF_OBJECTFLIP)
+	{
+		flagmo->eflags |= MFE_VERTICALFLIP;
+		flagmo->flags2 |= MF2_OBJECTFLIP;
+	}
+
+	if (mobj->type == MT_REDFLAG)
+	{
+		if (!(mobj->flags2 & MF2_JUSTATTACKED))
+			CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x85, M_GetText("Red flag"), 0x80);
+
+		// Assumedly in splitscreen players will be on opposing teams
+		if (players[consoleplayer].ctfteam == 1 || splitscreen)
+			S_StartSound(NULL, sfx_hoop1);
+		else if (players[consoleplayer].ctfteam == 2)
+			S_StartSound(NULL, sfx_hoop3);
+
+		redflag = flagmo;
+	}
+	else // MT_BLUEFLAG
+	{
+		if (!(mobj->flags2 & MF2_JUSTATTACKED))
+			CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x84, M_GetText("Blue flag"), 0x80);
+
+		// Assumedly in splitscreen players will be on opposing teams
+		if (players[consoleplayer].ctfteam == 2 || splitscreen)
+			S_StartSound(NULL, sfx_hoop1);
+		else if (players[consoleplayer].ctfteam == 1)
+			S_StartSound(NULL, sfx_hoop3);
+
+		blueflag = flagmo;
+	}
+
+	P_RemoveMobj(mobj);
+}
+
+
+static void P_MonitorFuseThink(mobj_t *mobj)
+{
+	mobj_t *newmobj;
+
+	if ((mobj->flags2 & MF2_AMBUSH || mobj->flags2 & MF2_STRONGBOX) && mobj->type != MT_QUESTIONBOX)
+	{
+		mobjtype_t spawnchance[64];
+		INT32 numchoices = 0, i = 0;
+
+		// This define should make it a lot easier to organize and change monitor weights
+#define SETMONITORCHANCES(type, strongboxamt, weakboxamt) \
+		for (i = ((mobj->flags2 & MF2_STRONGBOX) ? strongboxamt : weakboxamt); i; --i) spawnchance[numchoices++] = type
+
+			//                Type            SRM WRM
+			SETMONITORCHANCES(MT_SNEAKERTV,     0, 10); // Super Sneakers
+			SETMONITORCHANCES(MT_INV,           2,  0); // Invincibility
+			SETMONITORCHANCES(MT_WHITETV,       3,  8); // Whirlwind Shield
+			SETMONITORCHANCES(MT_GREENTV,       3,  8); // Elemental Shield
+			SETMONITORCHANCES(MT_YELLOWTV,      2,  0); // Attraction Shield
+			SETMONITORCHANCES(MT_BLUETV,        3,  3); // Force Shield
+			SETMONITORCHANCES(MT_BLACKTV,       2,  0); // Armageddon Shield
+			SETMONITORCHANCES(MT_MIXUPBOX,      0,  1); // Teleporters
+			SETMONITORCHANCES(MT_RECYCLETV,     0,  1); // Recycler
+			SETMONITORCHANCES(MT_PRUP,          1,  1); // 1-Up
+			// ======================================
+			//                Total            16  32
+
+#undef SETMONITORCHANCES
+
+			i = P_RandomKey(numchoices); // Gotta love those random numbers!
+			newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, spawnchance[i]);
+
+			// Transfer flags2 (strongbox, objectflip, ambush)
+			newmobj->flags2 = mobj->flags2;
+	}
+	else
+	{
+		newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->type);
+
+		// Transfer flags2 (strongbox, objectflip)
+		newmobj->flags2 = mobj->flags2;
+	}
+
+	P_RemoveMobj(mobj); // make sure they disappear
+}
+
+static boolean P_RandomItemFuseThink(mobj_t *mobj)
+{
+	mobj_t *newmobj;
+
+	if (G_BattleGametype())
+	{
+		if (mobj->threshold != 69)
+			return false;
+	}
+	else
+	{
+		// Respawn from mapthing if you have one!
+		if (mobj->spawnpoint)
+		{
+			P_SpawnMapThing(mobj->spawnpoint);
+			newmobj = mobj->spawnpoint->mobj; // this is set to the new mobj in P_SpawnMapThing
+		}
+		else
+			newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->type);
+
+		// Transfer flags2 (strongbox, objectflip)
+		newmobj->flags2 = mobj->flags2 & ~MF2_DONTDRAW;
+	}
+
+	return true;
+}
+
+static void P_IceBlockFuseThink(mobj_t *mobj)
+{
+	mobj_t *cur = mobj->hnext, *next;
+	UINT8 i;
+
+	for (i = 0; i < 5; i++)
+	{
+		mobj_t *debris = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SMK_ICEBLOCK_DEBRIS);
+		debris->angle = FixedAngle(P_RandomRange(0,360)<<FRACBITS);
+		P_InstaThrust(debris, debris->angle, P_RandomRange(3,18)*(FRACUNIT/4));
+		debris->momz = P_RandomRange(4,8)<<FRACBITS;
+		if (!i) // kinda hacky :V
+			S_StartSound(debris, sfx_s3k82);
+	}
+
+	while (!P_MobjWasRemoved(cur))
+	{
+		next = cur->hnext;
+		P_RemoveMobj(cur);
+		cur = next;
+	}
+
+	P_RemoveMobj(mobj);
+}
+
+static boolean P_FuseThink(mobj_t *mobj)
+{
+	mobj->fuse--;
+
+	if (mobj->fuse)
+	{
+		if (((mobj->type == MT_RANDOMITEM && mobj->threshold == 69) || mobj->type == MT_EGGMANITEM || mobj->type == MT_FALLINGROCK) && mobj->fuse <= TICRATE)
+			mobj->flags2 ^= MF2_DONTDRAW;
+
+		return true;
+	}
+
+	if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjFuse)) || P_MobjWasRemoved(mobj))
+		;
+	else switch (mobj->type)
+	{
+		// gargoyle and snowman handled in P_PushableThinker, not here
+		case MT_THROWNGRENADE:
+		case MT_CYBRAKDEMON_NAPALM_BOMB_LARGE:
+			P_SetMobjState(mobj, mobj->info->deathstate);
+			break;
+		case MT_BLUEFLAG:
+		case MT_REDFLAG:
+			P_FlagFuseThink(mobj);
+			return false;
+		case MT_YELLOWTV: // Ring shield box
+		case MT_BLUETV: // Force shield box
+		case MT_GREENTV: // Water shield box
+		case MT_BLACKTV: // Bomb shield box
+		case MT_WHITETV: // Jump shield box
+		case MT_SNEAKERTV: // Super Sneaker box
+		case MT_SUPERRINGBOX: // 10-Ring box
+		case MT_REDRINGBOX: // Red Team 10-Ring box
+		case MT_BLUERINGBOX: // Blue Team 10-Ring box
+		case MT_INV: // Invincibility box
+		case MT_MIXUPBOX: // Teleporter Mixup box
+		case MT_RECYCLETV: // Recycler box
+		case MT_SCORETVSMALL:
+		case MT_SCORETVLARGE:
+		case MT_PRUP: // 1up!
+		case MT_EGGMANBOX: // Eggman box
+		case MT_GRAVITYBOX: // Gravity box
+		case MT_QUESTIONBOX:
+			P_MonitorFuseThink(mobj);
+			return false;
+		case MT_RANDOMITEM:
+			if (!P_RandomItemFuseThink(mobj))
+				break;
+			P_RemoveMobj(mobj); // make sure they disappear
+			return false;
+		case MT_METALSONIC_BATTLE:
+			break; // don't remove
+		case MT_SPIKE:
+			P_SetMobjState(mobj, mobj->state->nextstate);
+			mobj->fuse = mobj->info->speed;
+			if (mobj->spawnpoint)
+				mobj->fuse += mobj->spawnpoint->angle;
+			break;
+		case MT_NIGHTSCORE:
+			P_RemoveMobj(mobj);
+			return false;
+		case MT_PLAYER:
+			break; // don't remove
+		case MT_SMK_ICEBLOCK:
+			P_IceBlockFuseThink(mobj);
+			return false;
+		default:
+			P_SetMobjState(mobj, mobj->info->xdeathstate); // will remove the mobj if S_NULL.
+			break;
+	}
+
+	return !P_MobjWasRemoved(mobj);
+}
+
+static boolean P_MobjPushableThink(mobj_t *mobj)
+{
+	// would be cool if we could use P_MobjWasRemoved Zzz...
+	if (!mobj)
+		return false;
+
+	P_MobjCheckWater(mobj);
+	P_PushableThinker(mobj);
+
+	// Extinguish fire objects in water. (Yes, it's extraordinarily rare to have a pushable flame object, but Brak uses such a case.)
+	if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL
+		&& (mobj->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
+	{
+		P_KillMobj(mobj, NULL, NULL);
+		return false;
+	}
+
+	return true;
+}
+
+static void P_FiringThink(mobj_t *mobj)
+{
+	if (mobj->state->action == (actionf_p1)A_Boss1Laser)
+	{
+		var1 = mobj->state->var1;
+		var2 = mobj->state->var2;
+		mobj->state->action(mobj);
+	}
+	else if (leveltime & 1) // Fire mode
+	{
+		mobj_t *missile;
+
+		if (mobj->target->player && mobj->target->player->nightstime)
+		{
+			fixed_t oldval = mobjinfo[mobj->extravalue1].speed;
+
+			mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x+mobj->target->momx, mobj->target->y+mobj->target->momy);
+			mobjinfo[mobj->extravalue1].speed = FixedMul(60*FRACUNIT, mobj->scale);
+			missile = P_SpawnMissile(mobj, mobj->target, mobj->extravalue1);
+			mobjinfo[mobj->extravalue1].speed = oldval;
+		}
+		else
+		{
+			mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+			missile = P_SpawnMissile(mobj, mobj->target, mobj->extravalue1);
+		}
+
+		if (missile)
+		{
+			if (mobj->flags2 & MF2_SUPERFIRE)
+				missile->flags2 |= MF2_SUPERFIRE;
+
+			if (mobj->info->attacksound)
+				S_StartSound(missile, mobj->info->attacksound);
+		}
+	}
+	else
+		mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+}
+
+//
+// P_MobjThinker
+//
+void P_MobjThinker(mobj_t *mobj)
+{
+	I_Assert(mobj != NULL);
+	I_Assert(!P_MobjWasRemoved(mobj));
+
+	if (UNLIKELY(mobj->flags & MF_NOTHINK))
+		return;
+
+	// Remove dead target/tracer.
+	if (mobj->target && P_MobjWasRemoved(mobj->target))
+		P_SetTarget(&mobj->target, NULL);
+	if (mobj->tracer && P_MobjWasRemoved(mobj->tracer))
+		P_SetTarget(&mobj->tracer, NULL);
+	// hnext/hprev changes suggested by toaster
+	if (mobj->hnext && P_MobjWasRemoved(mobj->hnext))
+		P_SetTarget(&mobj->hnext, NULL);
+	if (mobj->hprev && P_MobjWasRemoved(mobj->hprev))
+		P_SetTarget(&mobj->hprev, NULL);
+
+	mobj->flags2 &= ~MF2_PUSHED;
+	mobj->eflags &= ~(MFE_SPRUNG|MFE_JUSTBOUNCEDWALL);
+
+	tmfloorthing = tmhitthing = NULL;
+
+	const sector_t *sec1 = mobj->subsector ? mobj->subsector->sector : NULL;
+
+	// 970 allows ANY mobj to trigger a linedef exec
+	if (UNLIKELY(!mobj->islocal && sec1 && GETSECSPECIAL(sec1->special, 2) == 8)) // BEWARE: islocal does not exist in vanilla
+	{
+		sector_t *sec2;
+		sec2 = P_ThingOnSpecial3DFloor(mobj);
+		if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1)
+			P_LinedefExecute(sec2->tag, mobj, sec2);
+	}
+
+	if (mobj->scale != mobj->destscale)
+		P_MobjScaleThink(mobj); // Slowly scale up/down to reach your destscale.
+
+	if (mobj->type == MT_GHOST && mobj->fuse > 0 // Not guaranteed to be MF_SCENERY or not MF_SCENERY!
+	&& (signed)((mobj->frame & FF_TRANSMASK) >> FF_TRANSSHIFT) < (NUMTRANSMAPS-1) - mobj->fuse / 2)
+		// fade out when nearing the end of fuse...
+		mobj->frame = (mobj->frame & ~FF_TRANSMASK) | (((NUMTRANSMAPS-1) - mobj->fuse / 2) << FF_TRANSSHIFT);
+
+	// Special thinker for scenery objects
+	if (mobj->flags & MF_SCENERY)
+	{
+		P_MobjSceneryThink(mobj);
+		return;
+	}
+
+	// Check for a Lua thinker first
+	if (!mobj->player)
+	{
+		if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjThinker)) || P_MobjWasRemoved(mobj))
+			return;
+	}
+	else if (!mobj->player->spectator)
+	{
+		// You cannot short-circuit the player thinker like you can other thinkers.
+		LUA_HookMobj(mobj, MOBJ_HOOK(MobjThinker));
+		if (P_MobjWasRemoved(mobj))
+			return;
+	}
+
+	// if it's pushable, or if it would be pushable other than temporary disablement, use the
+	// separate thinker
+	if (mobj->flags & MF_PUSHABLE || (mobj->info->flags & MF_PUSHABLE && mobj->fuse))
+	{
+		if (!P_MobjPushableThink(mobj))
+			return;
+	}
+	else if (mobj->flags & MF_BOSS)
+	{
+		if (!P_MobjBossThink(mobj))
+			return;
+	}
+	else if (mobj->health <= 0) // Dead things think differently than the living.
+	{
+		if (!P_MobjDeadThink(mobj))
+			return;
+	}
+	else
+	{
+		if (!P_MobjRegularThink(mobj))
+			return;
+	}
+
 	if (P_MobjWasRemoved(mobj))
 		return;
 
 	if (mobj->flags2 & MF2_FIRING && mobj->target && mobj->health > 0)
+		P_FiringThink(mobj);
+
+	if (UNLIKELY(mobj->flags & MF_AMBIENT))
 	{
-		if (mobj->state->action.acp1 == (actionf_p1)A_Boss1Laser)
-		{
-			var1 = mobj->state->var1;
-			var2 = mobj->state->var2;
-			mobj->state->action.acp1(mobj);
-		}
-		else if (leveltime & 1) // Fire mode
-		{
-			mobj_t *missile;
-
-			if (mobj->target->player && mobj->target->player->nightstime)
-			{
-				fixed_t oldval = mobjinfo[mobj->extravalue1].speed;
-
-				mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x+mobj->target->momx, mobj->target->y+mobj->target->momy);
-				mobjinfo[mobj->extravalue1].speed = FixedMul(60*FRACUNIT, mobj->scale);
-				missile = P_SpawnMissile(mobj, mobj->target, mobj->extravalue1);
-				mobjinfo[mobj->extravalue1].speed = oldval;
-			}
-			else
-			{
-				mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
-				missile = P_SpawnMissile(mobj, mobj->target, mobj->extravalue1);
-			}
-
-			if (missile)
-			{
-				if (mobj->flags2 & MF2_SUPERFIRE)
-					missile->flags2 |= MF2_SUPERFIRE;
-
-				if (mobj->info->attacksound)
-					S_StartSound(missile, mobj->info->attacksound);
-			}
-		}
-		else
-			mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
-	}
-
-	if (mobj->flags & MF_AMBIENT)
-	{
-		if (!(leveltime % mobj->health) && mobj->info->seesound)
+		if (leveltime % mobj->health)
+			return;
+		if (mobj->info->seesound)
 			S_StartSound(mobj, mobj->info->seesound);
 		return;
 	}
 
 	// Check fuse
-	if (mobj->fuse)
-	{
-		mobj->fuse--;
-		if (!mobj->fuse)
-		{
-			subsector_t *ss;
-			fixed_t x, y, z;
-			mobj_t *flagmo, *newmobj;
-
-			if (!LUAh_MobjFuse(mobj) && !P_MobjWasRemoved(mobj))
-			{
-				switch (mobj->type)
-				{
-					// gargoyle and snowman handled in P_PushableThinker, not here
-					case MT_THROWNGRENADE:
-					case MT_CYBRAKDEMON_NAPALM_BOMB_LARGE:
-						P_SetMobjState(mobj, mobj->info->deathstate);
-						break;
-					case MT_BLUEFLAG:
-					case MT_REDFLAG:
-						if (mobj->spawnpoint)
-						{
-							x = mobj->spawnpoint->x << FRACBITS;
-							y = mobj->spawnpoint->y << FRACBITS;
-							ss = R_PointInSubsector(x, y);
-							if (mobj->spawnpoint->options & MTF_OBJECTFLIP)
-							{
-								z = ss->sector->ceilingheight - mobjinfo[mobj->type].height;
-								if (mobj->spawnpoint->options >> ZSHIFT)
-									z -= (mobj->spawnpoint->options >> ZSHIFT) << FRACBITS;
-							}
-							else
-							{
-								z = ss->sector->floorheight;
-								if (mobj->spawnpoint->options >> ZSHIFT)
-									z += (mobj->spawnpoint->options >> ZSHIFT) << FRACBITS;
-							}
-							flagmo = P_SpawnMobj(x, y, z, mobj->type);
-							flagmo->spawnpoint = mobj->spawnpoint;
-							if (mobj->spawnpoint->options & MTF_OBJECTFLIP)
-							{
-								flagmo->eflags |= MFE_VERTICALFLIP;
-								flagmo->flags2 |= MF2_OBJECTFLIP;
-							}
-
-							if (mobj->type == MT_REDFLAG)
-							{
-								if (!(mobj->flags2 & MF2_JUSTATTACKED))
-									CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x85, M_GetText("Red flag"), 0x80);
-
-								// Assumedly in splitscreen players will be on opposing teams
-								if (players[consoleplayer].ctfteam == 1 || splitscreen)
-									S_StartSound(NULL, sfx_hoop1);
-								else if (players[consoleplayer].ctfteam == 2)
-									S_StartSound(NULL, sfx_hoop3);
-
-								redflag = flagmo;
-							}
-							else // MT_BLUEFLAG
-							{
-								if (!(mobj->flags2 & MF2_JUSTATTACKED))
-									CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x84, M_GetText("Blue flag"), 0x80);
-
-								// Assumedly in splitscreen players will be on opposing teams
-								if (players[consoleplayer].ctfteam == 2 || splitscreen)
-									S_StartSound(NULL, sfx_hoop1);
-								else if (players[consoleplayer].ctfteam == 1)
-									S_StartSound(NULL, sfx_hoop3);
-
-								blueflag = flagmo;
-							}
-						}
-						P_RemoveMobj(mobj);
-						return;
-					case MT_YELLOWTV: // Ring shield box
-					case MT_BLUETV: // Force shield box
-					case MT_GREENTV: // Water shield box
-					case MT_BLACKTV: // Bomb shield box
-					case MT_WHITETV: // Jump shield box
-					case MT_SNEAKERTV: // Super Sneaker box
-					case MT_SUPERRINGBOX: // 10-Ring box
-					case MT_REDRINGBOX: // Red Team 10-Ring box
-					case MT_BLUERINGBOX: // Blue Team 10-Ring box
-					case MT_INV: // Invincibility box
-					case MT_MIXUPBOX: // Teleporter Mixup box
-					case MT_RECYCLETV: // Recycler box
-					case MT_SCORETVSMALL:
-					case MT_SCORETVLARGE:
-					case MT_PRUP: // 1up!
-					case MT_EGGMANBOX: // Eggman box
-					case MT_GRAVITYBOX: // Gravity box
-					case MT_QUESTIONBOX:
-						if ((mobj->flags2 & MF2_AMBUSH || mobj->flags2 & MF2_STRONGBOX) && mobj->type != MT_QUESTIONBOX)
-						{
-							mobjtype_t spawnchance[64];
-							INT32 numchoices = 0, i = 0;
-
-	// This define should make it a lot easier to organize and change monitor weights
-#define SETMONITORCHANCES(type, strongboxamt, weakboxamt) \
-	for (i = ((mobj->flags2 & MF2_STRONGBOX) ? strongboxamt : weakboxamt); i; --i) spawnchance[numchoices++] = type
-
-							//                Type            SRM WRM
-							SETMONITORCHANCES(MT_SNEAKERTV,     0, 10); // Super Sneakers
-							SETMONITORCHANCES(MT_INV,           2,  0); // Invincibility
-							SETMONITORCHANCES(MT_WHITETV,       3,  8); // Whirlwind Shield
-							SETMONITORCHANCES(MT_GREENTV,       3,  8); // Elemental Shield
-							SETMONITORCHANCES(MT_YELLOWTV,      2,  0); // Attraction Shield
-							SETMONITORCHANCES(MT_BLUETV,        3,  3); // Force Shield
-							SETMONITORCHANCES(MT_BLACKTV,       2,  0); // Armageddon Shield
-							SETMONITORCHANCES(MT_MIXUPBOX,      0,  1); // Teleporters
-							SETMONITORCHANCES(MT_RECYCLETV,     0,  1); // Recycler
-							SETMONITORCHANCES(MT_PRUP,          1,  1); // 1-Up
-							// ======================================
-							//                Total            16  32
-
-#undef SETMONITORCHANCES
-
-							i = P_RandomKey(numchoices); // Gotta love those random numbers!
-							newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, spawnchance[i]);
-
-							// Transfer flags2 (strongbox, objectflip, ambush)
-							newmobj->flags2 = mobj->flags2;
-						}
-						else
-						{
-							newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->type);
-
-							// Transfer flags2 (strongbox, objectflip)
-							newmobj->flags2 = mobj->flags2;
-						}
-						P_RemoveMobj(mobj); // make sure they disappear
-						return;
-					case MT_RANDOMITEM:
-						if (G_BattleGametype())
-						{
-							if (mobj->threshold != 69)
-								break;
-						}
-						else
-						{
-							// Respawn from mapthing if you have one!
-							if (mobj->spawnpoint)
-							{
-								P_SpawnMapThing(mobj->spawnpoint);
-								newmobj = mobj->spawnpoint->mobj; // this is set to the new mobj in P_SpawnMapThing
-							}
-							else
-								newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->type);
-
-							// Transfer flags2 (strongbox, objectflip)
-							newmobj->flags2 = mobj->flags2 & ~MF2_DONTDRAW;
-						}
-						P_RemoveMobj(mobj); // make sure they disappear
-						return;
-					case MT_METALSONIC_BATTLE:
-						break; // don't remove
-					case MT_SPIKE:
-						P_SetMobjState(mobj, mobj->state->nextstate);
-						mobj->fuse = mobj->info->speed;
-						if (mobj->spawnpoint)
-							mobj->fuse += mobj->spawnpoint->angle;
-						break;
-					case MT_NIGHTSCORE:
-						P_RemoveMobj(mobj);
-						return;
-					case MT_PLAYER:
-						break; // don't remove
-					case MT_SMK_ICEBLOCK:
-						{
-							mobj_t *cur = mobj->hnext, *next;
-							UINT8 i;
-
-							for (i = 0; i < 5; i++)
-							{
-								mobj_t *debris = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SMK_ICEBLOCK_DEBRIS);
-								debris->angle = FixedAngle(P_RandomRange(0,360)<<FRACBITS);
-								P_InstaThrust(debris, debris->angle, P_RandomRange(3,18)*(FRACUNIT/4));
-								debris->momz = P_RandomRange(4,8)<<FRACBITS;
-								if (!i) // kinda hacky :V
-									S_StartSound(debris, sfx_s3k82);
-							}
-
-							while (cur && !P_MobjWasRemoved(cur))
-							{
-								next = cur->hnext;
-								P_RemoveMobj(cur);
-								cur = next;
-							}
-
-							P_RemoveMobj(mobj);
-							return;
-						}
-					default:
-						P_SetMobjState(mobj, mobj->info->xdeathstate); // will remove the mobj if S_NULL.
-						break;
-				}
-			}
-			if (P_MobjWasRemoved(mobj))
-				return;
-		}
-		else if (((mobj->type == MT_RANDOMITEM && mobj->threshold == 69) || mobj->type == MT_EGGMANITEM || mobj->type == MT_FALLINGROCK) && mobj->fuse <= TICRATE)
-			mobj->flags2 ^= MF2_DONTDRAW;
-	}
+	if (mobj->fuse && !P_FuseThink(mobj))
+		return;
 
 	I_Assert(mobj != NULL);
 	I_Assert(!P_MobjWasRemoved(mobj));
@@ -9068,7 +9187,9 @@ void P_MobjThinker(mobj_t *mobj)
 	{
 		if (!P_ZMovement(mobj))
 			return; // mobj was removed
+
 		P_CheckPosition(mobj, mobj->x, mobj->y); // Need this to pick up objects!
+
 		if (P_MobjWasRemoved(mobj))
 			return;
 	}
@@ -9078,21 +9199,21 @@ void P_MobjThinker(mobj_t *mobj)
 		mobj->eflags &= ~MFE_JUSTHITFLOOR;
 	}
 
-	if (mobj->type == MT_FLINGRING
+	if (UNLIKELY(mobj->type == MT_FLINGRING
 		|| mobj->type == MT_FLINGCOIN
 		|| P_WeaponOrPanel(mobj->type)
 		|| mobj->type == MT_FLINGEMERALD
 		|| mobj->type == MT_BIGTUMBLEWEED
 		|| mobj->type == MT_LITTLETUMBLEWEED
-		|| mobj->type == MT_CANNONBALLDECOR
-		|| mobj->type == MT_FALLINGROCK) {
+		|| mobj->type == MT_CANNONBALLDECOR)
+		|| mobj->type == MT_FALLINGROCK)
+	{
 		P_TryMove(mobj, mobj->x, mobj->y, true); // Sets mo->standingslope correctly
-		//if (mobj->standingslope) CONS_Printf("slope physics on mobj\n");
 		P_ButteredSlope(mobj);
 	}
 
-	if (mobj->flags & (MF_ENEMY|MF_BOSS) && mobj->health
-		&& P_CheckDeathPitCollide(mobj)) // extra pit check in case these didn't have momz
+	if (UNLIKELY(mobj->flags & (MF_ENEMY|MF_BOSS) && mobj->health
+		&& P_CheckDeathPitCollide(mobj))) // extra pit check in case these didn't have momz
 	{
 		P_KillMobj(mobj, NULL, NULL);
 		return;
@@ -9101,10 +9222,10 @@ void P_MobjThinker(mobj_t *mobj)
 	// Crush enemies!
 	if (mobj->ceilingz - mobj->floorz < mobj->height)
 	{
-		if ((
+		if (UNLIKELY((
 		(mobj->flags & (MF_ENEMY|MF_BOSS)
 			&& mobj->flags & MF_SHOOTABLE)
-		|| mobj->type == MT_EGGSHIELD)
+		|| mobj->type == MT_EGGSHIELD))
 		&& !(mobj->flags & MF_NOCLIPHEIGHT)
 		&& mobj->health > 0)
 		{
@@ -9122,30 +9243,21 @@ void P_MobjThinker(mobj_t *mobj)
 	if (P_MobjWasRemoved(mobj))
 		return;
 
-	switch (mobj->type)
+	if (UNLIKELY(P_WeaponOrPanel(mobj->type)))
 	{
-		case MT_BOUNCEPICKUP:
-		case MT_RAILPICKUP:
-		case MT_AUTOPICKUP:
-		case MT_EXPLODEPICKUP:
-		case MT_SCATTERPICKUP:
-		case MT_GRENADEPICKUP:
-			if (mobj->health == 0) // Fading tile
-			{
-				INT32 value = mobj->info->damage/10;
-				value = mobj->fuse/value;
-				value = 10-value;
-				value--;
+		if (mobj->health == 0) // Fading tile
+		{
+			INT32 value = mobj->info->damage/10;
+			value = mobj->fuse/value;
+			value = 10-value;
+			value--;
 
-				if (value <= 0)
-					value = 1;
+			if (value <= 0)
+				value = 1;
 
-				mobj->frame &= ~FF_TRANSMASK;
-				mobj->frame |= value << FF_TRANSSHIFT;
-			}
-			break;
-		default:
-			break;
+			mobj->frame &= ~FF_TRANSMASK;
+			mobj->frame |= value << FF_TRANSSHIFT;
+		}
 	}
 }
 
@@ -9171,7 +9283,6 @@ boolean P_RailThinker(mobj_t *mobj)
 	{
 		if (!P_ZMovement(mobj))
 			return true; // mobj was removed
-		//P_CheckPosition(mobj, mobj->x, mobj->y);
 	}
 
 	return P_MobjWasRemoved(mobj) || (x == mobj->x && y == mobj->y && z == mobj->z);
@@ -9185,11 +9296,13 @@ void P_PushableThinker(mobj_t *mobj)
 	I_Assert(mobj != NULL);
 	I_Assert(!P_MobjWasRemoved(mobj));
 
+	if (!mobj)
+		return;
+
 	sec = mobj->subsector->sector;
 
 	if (GETSECSPECIAL(sec->special, 2) == 1 && mobj->z == sec->floorheight)
 		P_LinedefExecute(sec->tag, mobj, sec);
-//	else if (GETSECSPECIAL(sec->special, 2) == 8)
 	{
 		sector_t *sec2;
 
@@ -9226,12 +9339,16 @@ void P_PushableThinker(mobj_t *mobj)
 					z = ss->sector->floorheight;
 
 				spawnmo = P_SpawnMobj(x, y, z, mobj->type);
-				spawnmo->spawnpoint = mobj->spawnpoint;
-				P_UnsetThingPosition(spawnmo);
-				spawnmo->flags = mobj->flags;
-				P_SetThingPosition(spawnmo);
-				spawnmo->flags2 = mobj->flags2;
-				spawnmo->flags |= MF_PUSHABLE;
+				if (spawnmo)
+				{
+					spawnmo->spawnpoint = mobj->spawnpoint;
+					P_UnsetThingPosition(spawnmo);
+					spawnmo->flags = mobj->flags;
+					P_SetThingPosition(spawnmo);
+					spawnmo->flags2 = mobj->flags2;
+					spawnmo->flags |= MF_PUSHABLE;
+				}
+
 				P_RemoveMobj(mobj);
 				break;
 			default:
@@ -9240,6 +9357,39 @@ void P_PushableThinker(mobj_t *mobj)
 	}
 }
 
+static void P_RandomAudienceThink(mobj_t *mobj)
+{
+	if (!mobj->colorized) // a fan of someone?
+		return;
+
+	if (mobj->threshold >= 0) // not already happy or sad?
+	{
+		if (!playeringame[mobj->threshold] || players[mobj->threshold].spectator) // focused on a valid player?
+			return;
+
+		if (!(players[mobj->threshold].exiting) && !(players[mobj->threshold].pflags & PF_TIMEOVER)) // not finished yet?
+			return;
+
+		if (K_IsPlayerLosing(&players[mobj->threshold]))
+			mobj->threshold = -2;
+		else
+		{
+			mobj->threshold = -1;
+			S_StartSound(mobj, sfx_chaooo);
+		}
+	}
+
+	if (mobj->threshold == -1)
+		mobj->angle += ANGLE_22h;
+
+	if (((statenum_t)(mobj->state-states) != S_AUDIENCE_CHAO_CHEER2) || (mobj->tics != states[S_AUDIENCE_CHAO_CHEER2].tics)) // not at the start of your cheer jump?
+		return;
+
+	mobj->momz = 0;
+
+	P_SetMobjState(mobj, ((mobj->threshold == -1) ? S_AUDIENCE_CHAO_WIN2 : S_AUDIENCE_CHAO_LOSE));
+}
+
 // Quick, optimized function for scenery
 void P_SceneryThinker(mobj_t *mobj)
 {
@@ -9279,9 +9429,12 @@ void P_SceneryThinker(mobj_t *mobj)
 	{
 		if (!P_SceneryZMovement(mobj))
 			return; // mobj was removed
+
 		P_CheckPosition(mobj, mobj->x, mobj->y); // Need this to pick up objects!
+
 		if (P_MobjWasRemoved(mobj))
 			return;
+
 		mobj->floorz = tmfloorz;
 		mobj->ceilingz = tmceilingz;
 	}
@@ -9293,46 +9446,32 @@ void P_SceneryThinker(mobj_t *mobj)
 
 	P_CycleMobjState(mobj);
 
-	if (mobj->type != MT_RANDOMAUDIENCE)
-		return;
-
-	{
-		if (!mobj->colorized) // a fan of someone?
-			return;
-
-		if (mobj->threshold >= 0) // not already happy or sad?
-		{
-			if (!playeringame[mobj->threshold] || players[mobj->threshold].spectator) // focused on a valid player?
-				return;
-
-			if (!(players[mobj->threshold].exiting) && !(players[mobj->threshold].pflags & PF_TIMEOVER)) // not finished yet?
-				return;
-
-			if (K_IsPlayerLosing(&players[mobj->threshold]))
-				mobj->threshold = -2;
-			else
-			{
-				mobj->threshold = -1;
-				S_StartSound(mobj, sfx_chaooo);
-			}
-		}
-
-		if (mobj->threshold == -1)
-			mobj->angle += ANGLE_22h;
-
-		if (((statenum_t)(mobj->state-states) != S_AUDIENCE_CHAO_CHEER2) || (mobj->tics != states[S_AUDIENCE_CHAO_CHEER2].tics)) // not at the start of your cheer jump?
-			return;
-
-		mobj->momz = 0;
-
-		P_SetMobjState(mobj, ((mobj->threshold == -1) ? S_AUDIENCE_CHAO_WIN2 : S_AUDIENCE_CHAO_LOSE));
-	}
+	if (mobj->type == MT_RANDOMAUDIENCE)
+		P_RandomAudienceThink(mobj);
 }
 
 //
 // GAME SPAWN FUNCTIONS
 //
 
+FUNCINLINE static ATTRINLINE mobj_t *P_AllocMobj(void)
+{
+	mobj_t *mobj;
+
+	if (mobjcache != NULL)
+	{
+		mobj = mobjcache;
+		mobjcache = mobjcache->hnext;
+		memset(mobj, 0, sizeof(*mobj));
+	}
+	else
+	{
+		mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
+	}
+
+	return mobj;
+}
+
 //
 // P_SpawnMobj
 //
@@ -9340,10 +9479,12 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 {
 	const mobjinfo_t *info = &mobjinfo[type];
 	state_t *st;
-	mobj_t *mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
+	mobj_t *mobj;
+
+	mobj = P_AllocMobj();
 
 	// this is officially a mobj, declared as soon as possible.
-	mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
+	mobj->thinker.function = (actionf_p1)P_MobjThinker;
 	mobj->type = type;
 	mobj->info = info;
 
@@ -9353,11 +9494,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 	mobj->radius = info->radius;
 	mobj->height = info->height;
 	mobj->flags = info->flags;
-	mobj->sloperoll = 0;
-	mobj->slopepitch = 0;
-
-	mobj->pitch_sprite = 0;
-	mobj->roll_sprite = 0;
 
 	mobj->health = info->spawnhealth;
 
@@ -9389,15 +9525,12 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 		mobj->destscale = mapobjectscale;
 		mobj->scalespeed = mapobjectscale/12;
 	}
-	
-	// Sprite rendering
-	mobj->realxscale = mobj->realyscale = mobj->scale; 
-	mobj->spritexscale = mobj->realxscale;
-	mobj->spriteyscale = mobj->realyscale; 
-	mobj->spritexoffset = mobj->spriteyoffset = 0;
 
-	// Funni slam sound when landing
-	mobj->slamsoundtimer = 0;
+	// Sprite rendering
+	mobj->blendmode = AST_TRANSLUCENT;
+	mobj->realxscale = mobj->realyscale = mobj->scale;
+	mobj->spritexscale = mobj->realxscale;
+	mobj->spriteyscale = mobj->realyscale;
 
 	// set subsector and/or block links
 	P_SetThingPosition(mobj);
@@ -9406,12 +9539,8 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 	// Make sure scale matches destscale immediately when spawned
 	P_SetScale(mobj, mobj->destscale);
 
-	mobj->floorz =
-				mobj->subsector->sector->f_slope ? P_GetZAt(mobj->subsector->sector->f_slope, x, y) :
-				mobj->subsector->sector->floorheight;
-	mobj->ceilingz =
-				mobj->subsector->sector->c_slope ? P_GetZAt(mobj->subsector->sector->c_slope, x, y) :
-				mobj->subsector->sector->ceilingheight;
+	mobj->floorz   = P_GetSectorFloorZAt(mobj->subsector->sector, x, y);
+	mobj->ceilingz = P_GetSectorCeilingZAt(mobj->subsector->sector, x, y);
 
 	// Tells MobjCheckWater that the water height was not set.
 	mobj->watertop = INT32_MAX;
@@ -9445,7 +9574,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 
 	// DANGER! This can cause P_SpawnMobj to return NULL!
 	// Avoid using P_RemoveMobj on the newly created mobj in "MobjSpawn" Lua hooks!
-	if (LUAh_MobjSpawn(mobj))
+	if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjSpawn)))
 	{
 		if (P_MobjWasRemoved(mobj))
 			return NULL;
@@ -9501,7 +9630,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 				ball->threshold = ball->radius + mobj->radius + FixedMul(ball->info->painchance, ball->scale);
 
 				var1 = ball->state->var1, var2 = ball->state->var2;
-				ball->state->action.acp1(ball);
+				ball->state->action(ball);
 			}
 			break;
 		}
@@ -9761,7 +9890,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 	}
 
 	// Call action functions when the state is set
-	if (st->action.acp1 && (mobj->flags & MF_RUNSPAWNFUNC))
+	if (st->action && (mobj->flags & MF_RUNSPAWNFUNC))
 	{
 		if (levelloading)
 		{
@@ -9777,7 +9906,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 			var2 = st->var2;
 			astate = st;
 
-			st->action.acp1(mobj);
+			st->action(mobj);
 			// DANGER! This can cause P_SpawnMobj to return NULL!
 			// Avoid using MF_RUNSPAWNFUNC on mobjs whose spawn state expects target or tracer to already be set!
 			if (P_MobjWasRemoved(mobj))
@@ -9801,10 +9930,12 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster)
 {
 	const mobjinfo_t *info = &mobjinfo[MT_SHADOW];
 	state_t *st;
-	mobj_t *mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
+	mobj_t *mobj;
+
+	mobj = P_AllocMobj();
 
 	// this is officially a mobj, declared as soon as possible.
-	mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker;
+	mobj->thinker.function = (actionf_p1)P_MobjThinker;
 	mobj->type = MT_SHADOW;
 	mobj->info = info;
 
@@ -9814,6 +9945,7 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster)
 	mobj->radius = info->radius;
 	mobj->height = info->height;
 	mobj->flags = info->flags;
+	mobj->blendmode = AST_TRANSLUCENT;
 
 	mobj->health = info->spawnhealth;
 
@@ -9847,11 +9979,10 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster)
 		mobj->destscale = mapobjectscale;
 		mobj->scalespeed = mapobjectscale/12;
 	}
-	
+
 	// Sprite rendering
-	mobj->spritexscale = mobj->spriteyscale = mobj->scale; 
-	mobj->spritexoffset = mobj->spriteyoffset = 0;
-	
+	mobj->spritexscale = mobj->spriteyscale = mobj->scale;
+
 	// set subsector and/or block links
 	P_SetThingPosition(mobj);
 	I_Assert(mobj->subsector != NULL);
@@ -9875,7 +10006,7 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster)
 		P_AddThinker(&mobj->thinker);
 
 	// Call action functions when the state is set
-	if (st->action.acp1 && (mobj->flags & MF_RUNSPAWNFUNC))
+	if (st->action && (mobj->flags & MF_RUNSPAWNFUNC))
 	{
 		if (levelloading)
 		{
@@ -9891,7 +10022,7 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster)
 			var2 = st->var2;
 			astate = st;
 
-			st->action.acp1(mobj);
+			st->action(mobj);
 			// DANGER! This is the ONLY way for P_SpawnMobj to return NULL!
 			// Avoid using MF_RUNSPAWNFUNC on mobjs whose spawn state expects target or tracer to already be set!
 			if (P_MobjWasRemoved(mobj))
@@ -9911,17 +10042,21 @@ mobj_t *P_SpawnShadowMobj(mobj_t * caster)
 
 static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
 {
+	const mobjinfo_t *info = &mobjinfo[type];
 	state_t *st;
 	precipmobj_t *mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
 	fixed_t starting_floorz;
 
+	mobj->type = type;
+	mobj->info = info;
+
 	mobj->x = x;
 	mobj->y = y;
-	mobj->flags = mobjinfo[type].flags;
+	mobj->flags = info->flags;
 
 	// do not set the state with P_SetMobjState,
 	// because action routines can not be called yet
-	st = &states[mobjinfo[type].spawnstate];
+	st = &states[info->spawnstate];
 
 	mobj->state = st;
 	mobj->tics = st->tics;
@@ -9936,40 +10071,28 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype
 	mobj->ceilingz                   = P_GetSectorCeilingZAt(mobj->subsector->sector, x, y);
 
 	mobj->z = z;
-	mobj->momz = mobjinfo[type].speed;
+	mobj->momz = cv_mobjscaleprecip.value ? FixedMul(info->speed, mapobjectscale) : info->speed;
 
-	mobj->thinker.function.acp1 = (actionf_p1)P_NullPrecipThinker;
-	P_AddThinker(&mobj->thinker);
+	mobj->thinker.function = (actionf_p1)P_NullPrecipThinker;
+	P_AddPrecipThinker(&mobj->thinker);
 
-	CalculatePrecipFloor(mobj);
+	P_CalculatePrecipFloor(mobj, true);
 
 	if (mobj->floorz != starting_floorz)
 		mobj->precipflags |= PCF_FOF;
-	else if (GETSECSPECIAL(mobj->subsector->sector->special, 1) == 7
-	 || GETSECSPECIAL(mobj->subsector->sector->special, 1) == 6
-	 || mobj->subsector->sector->floorpic == skyflatnum)
-		mobj->precipflags |= PCF_PIT;
+	else
+	{
+		const INT32 special = GETSECSPECIAL(mobj->subsector->sector->special, 1);
+
+		if (special == 7 || special == 6 || mobj->subsector->sector->floorpic == skyflatnum)
+			mobj->precipflags |= PCF_PIT;
+	}
 
 	R_ResetPrecipitationMobjInterpolationState(mobj);
 
 	return mobj;
 }
 
-static inline precipmobj_t *P_SpawnRainMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
-{
-	precipmobj_t *mo = P_SpawnPrecipMobj(x,y,z,type);
-	mo->precipflags |= PCF_RAIN;
-	//mo->thinker.function.acp1 = (actionf_p1)P_RainThinker;
-	return mo;
-}
-
-static inline precipmobj_t *P_SpawnSnowMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
-{
-	precipmobj_t *mo = P_SpawnPrecipMobj(x,y,z,type);
-	//mo->thinker.function.acp1 = (actionf_p1)P_SnowThinker;
-	return mo;
-}
-
 //
 // P_RemoveMobj
 //
@@ -9987,19 +10110,19 @@ void P_RemoveMobj(mobj_t *mobj)
 	if (P_MobjWasRemoved(mobj))
 		return; // something already removing this mobj.
 
-	mobj->thinker.function.acp1 = (actionf_p1)P_RemoveThinkerDelayed; // shh. no recursing.
-	LUAh_MobjRemoved(mobj);
-	mobj->thinker.function.acp1 = (actionf_p1)P_MobjThinker; // needed for P_UnsetThingPosition, etc. to work.
+	mobj->thinker.function = (actionf_p1)P_RemoveThinkerDelayed; // shh. no recursing.
+	LUA_HookMobj(mobj, MOBJ_HOOK(MobjRemoved));
+	mobj->thinker.function = (actionf_p1)P_MobjThinker; // needed for P_UnsetThingPosition, etc. to work.
 
 	// Rings only, please!
-	if (mobj->spawnpoint &&
+	if (UNLIKELY(mobj->spawnpoint &&
 		(mobj->type == MT_RING
 		|| mobj->type == MT_COIN
 		|| mobj->type == MT_BLUEBALL
 		|| mobj->type == MT_REDTEAMRING
 		|| mobj->type == MT_BLUETEAMRING
 		|| P_WeaponOrPanel(mobj->type))
-		&& !(mobj->flags2 & MF2_DONTRESPAWN))
+		&& !(mobj->flags2 & MF2_DONTRESPAWN)))
 	{
 		itemrespawnque[iquehead] = mobj->spawnpoint;
 		itemrespawntime[iquehead] = leveltime;
@@ -10013,7 +10136,7 @@ void P_RemoveMobj(mobj_t *mobj)
 	{
 		mobj_t *cur = mobj->hnext;
 
-		while (cur && !P_MobjWasRemoved(cur))
+		while (!P_MobjWasRemoved(cur))
 		{
 			mobj_t *prev = cur; // Kind of a dumb var, but we need to set cur before we remove the mobj
 			cur = cur->hnext;
@@ -10021,13 +10144,13 @@ void P_RemoveMobj(mobj_t *mobj)
 		}
 	}
 
-	if (mobj->type == MT_OVERLAY)
+	if (UNLIKELY(mobj->type == MT_OVERLAY))
 		P_RemoveOverlay(mobj);
 
-	if (mobj->type == MT_SHADOW)
+	if (UNLIKELY(mobj->type == MT_SHADOW))
 		P_RemoveShadow(mobj);
 
-	if (mobj->type == MT_SPB)
+	if (UNLIKELY(mobj->type == MT_SPB))
 		spbplace = -1;
 
 	mobj->health = 0; // Just because
@@ -10039,6 +10162,7 @@ void P_RemoveMobj(mobj_t *mobj)
 		P_DelSeclist(sector_list);
 		sector_list = NULL;
 	}
+
 	mobj->flags |= MF_NOSECTOR|MF_NOBLOCKMAP;
 	mobj->subsector = NULL;
 	mobj->state = NULL;
@@ -10050,12 +10174,12 @@ void P_RemoveMobj(mobj_t *mobj)
 	// killough 11/98:
 	//
 	// Remove any references to other mobjs.
-	P_SetTarget(&mobj->target, NULL);
-	P_SetTarget(&mobj->tracer, NULL);
+	P_SetTarget(&mobj->target, P_SetTarget(&mobj->tracer, NULL));
 
 	// repair hnext chain
 	mobj_t *cachenext = mobj->hnext;
 
+<<<<<<< HEAD
 	if (mobj->hnext && !P_MobjWasRemoved(mobj->hnext))
 	{
 		if (mobj->hnext->hprev == mobj)
@@ -10072,33 +10196,52 @@ void P_RemoveMobj(mobj_t *mobj)
 		{
 			P_SetTarget(&mobj->hprev->hnext, cachenext);
 		}
+=======
+	if (!P_MobjWasRemoved(mobj->hnext))
+	{
+		P_SetTarget(&mobj->hnext->hprev, mobj->hprev);
+		P_SetTarget(&mobj->hnext, NULL);
+	}
+
+	if (!P_MobjWasRemoved(mobj->hprev))
+	{
+		P_SetTarget(&mobj->hprev->hnext, cachenext);
+		P_SetTarget(&mobj->hprev, NULL);
+	}
+>>>>>>> Saturn-Next
 
 		P_SetTarget(&mobj->hprev, NULL);
 	}
 	
 	// clear the reference from the mapthing
 	if (mobj->spawnpoint)
-		P_SetTarget(&mobj->spawnpoint->mobj, NULL);
+		mobj->spawnpoint->mobj = NULL;
 
 	R_RemoveMobjInterpolator(mobj);
 
 	// free block
-	if (!mobj->thinker.next)
+	if (mobj->flags & MF_NOTHINK && !mobj->thinker.next)
 	{ // Uh-oh, the mobj doesn't think, P_RemoveThinker would never go through!
-		INT32 prevreferences;
 		if (!mobj->thinker.references)
 		{
-			Z_Free(mobj); // No references? Can be removed immediately! :D
+			// no references, dump it directly in the mobj cache
+			mobj->hnext = mobjcache;
+			mobjcache = mobj;
 			return;
 		}
 
-		prevreferences = mobj->thinker.references;
+		// Add thinker just to delay removing it until refrences are gone.
+		mobj->flags &= ~MF_NOTHINK;
 		P_AddThinker((thinker_t *)mobj);
-		mobj->thinker.references = prevreferences;
 	}
 
 	P_RemoveThinker((thinker_t *)mobj);
 
+#ifdef PARANOIA
+	// Saved to avoid being scrambled like below...
+	mobj->thinker.debug_mobjtype = mobj->type;
+#endif
+
 	// DBG: set everything in mobj_t to 0xFF instead of leaving it. debug memory error.
 #ifdef SCRAMBLE_REMOVED
 	// Invalidate mobj_t data to cause crashes if accessed!
@@ -10106,6 +10249,7 @@ void P_RemoveMobj(mobj_t *mobj)
 #endif
 }
 
+<<<<<<< HEAD
 // This does not need to be added to Lua.
 // To test it in Lua, check mobj.valid
 boolean P_MobjWasRemoved(mobj_t *mobj)
@@ -10114,59 +10258,45 @@ boolean P_MobjWasRemoved(mobj_t *mobj)
 }
 
 void P_RemovePrecipMobj(precipmobj_t *mobj)
+=======
+void P_FreePrecipMobj(precipmobj_t *mobj)
+>>>>>>> Saturn-Next
 {
 	// unlink from sector and block lists
 	P_UnsetPrecipThingPosition(mobj);
 
-	if (precipsector_list)
-	{
-		P_DelPrecipSeclist(precipsector_list);
-		precipsector_list = NULL;
-	}
-
 	// free block
-	P_RemoveThinker((thinker_t *)mobj);
+	// Precipmobjs don't actually think using their thinker,
+	// so the free cannot be delayed.
+	P_UnlinkThinker((thinker_t*)mobj);
 }
 
 // Clearing out stuff for savegames
 void P_RemoveSavegameMobj(mobj_t *mobj)
 {
+	thinker_t *th = (thinker_t*)mobj;
+
 	// unlink from sector and block lists
-	if (((thinker_t *)mobj)->function.acp1 == (actionf_p1)P_NullPrecipThinker)
-	{
-		P_UnsetPrecipThingPosition((precipmobj_t *)mobj);
+	P_UnsetThingPosition(mobj);
 
-		if (precipsector_list)
-		{
-			P_DelPrecipSeclist(precipsector_list);
-			precipsector_list = NULL;
-		}
-	}
-	else
+	// Remove touching_sectorlist from mobj.
+	if (sector_list)
 	{
-		// unlink from sector and block lists
-		P_UnsetThingPosition(mobj);
-
-		// Remove touching_sectorlist from mobj.
-		if (sector_list)
-		{
-			P_DelSeclist(sector_list);
-			sector_list = NULL;
-		}
+		P_DelSeclist(sector_list);
+		sector_list = NULL;
 	}
 
 	// stop any playing sound
 	S_StopSound(mobj);
 	R_RemoveMobjInterpolator(mobj);
 
+	// just set its reference count to 0 to not trigger the assert in P_UnlinkThinker
+	if (th->references != 0)
+		th->references = 0;
+
 	// free block
 	// Here we use the same code as R_RemoveThinkerDelayed, but without reference counting (we're removing everything so it shouldn't matter) and without touching currentthinker since we aren't in P_RunThinkers
-	{
-		thinker_t *thinker = (thinker_t *)mobj;
-		thinker_t *next = thinker->next;
-		(next->prev = thinker->prev)->next = next;
-		Z_Free(thinker);
-	}
+	P_UnlinkThinker(th);
 }
 
 static CV_PossibleValue_t respawnitemtime_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}};
@@ -10178,27 +10308,32 @@ consvar_t cv_suddendeath = {"suddendeath", "Off", CV_NETVAR|CV_CHEAT|CV_NOSHOWHE
 
 void P_SpawnPrecipitation(void)
 {
-	INT32 i, mrand;
-	fixed_t basex, basey, x, y, height;
+	INT32 i, j, mrand;
+	fixed_t basex, basey, x, y, z;
 	subsector_t *precipsector = NULL;
 	precipmobj_t *rainmo = NULL;
 
-	if (dedicated || !cv_drawdist_precip.value || curWeather == PRECIP_NONE) // SRB2Kart
+	if (dedicated || !cv_drawdist_precip.value || curWeather == PRECIP_NONE || curWeather == PRECIP_STORM_NORAIN)
 		return;
 
+	const fixed_t precipmoscale = (cv_mobjscaleprecip.value ? mapobjectscale : FRACUNIT);
+	const INT32 density = (cv_lessprecip.value ? 2 : 1); // only spawn half as much
+
 	// Use the blockmap to narrow down our placing patterns
-	for (i = 0; i < bmapwidth*bmapheight; ++i)
+	for (i = 0; i < bmapwidth*bmapheight; i += density)
 	{
 		basex = bmaporgx + (i % bmapwidth) * MAPBLOCKSIZE;
 		basey = bmaporgy + (i / bmapwidth) * MAPBLOCKSIZE;
 
-		//for (j = 0; j < cv_precipdensity.value; ++j) -- density is 1 for kart always
+		// If mobjscale < FRACUNIT, each blockmap cell covers
+		// more area so spawn more precipitation in that area.
+		for (j = 0; j < FRACUNIT; j += precipmoscale)
 		{
 			INT32 floorz;
 			INT32 ceilingz;
 
-			x = ((cv_lessprecip.value ? basex*1.5 : basex) + ((M_RandomKey(MAPBLOCKUNITS<<3)<<FRACBITS)>>3));
-			y = ((cv_lessprecip.value ? basey*1.5 : basey) + ((M_RandomKey(MAPBLOCKUNITS<<3)<<FRACBITS)>>3));
+			x = basex + ((M_RandomKey(MAPBLOCKUNITS << 3) << FRACBITS) >> 3);
+			y = basey + ((M_RandomKey(MAPBLOCKUNITS << 3) << FRACBITS) >> 3);
 
 			precipsector = R_IsPointInSubsector(x, y);
 
@@ -10212,15 +10347,15 @@ void P_SpawnPrecipitation(void)
 				continue;
 
 			// Exists, but is too small for reasonable precipitation.
-			if (!(precipsector->sector->floorheight <= precipsector->sector->ceilingheight - (32<<FRACBITS)))
+			if (FixedDiv(precipsector->sector->ceilingheight - precipsector->sector->floorheight, mapobjectscale) < 64<<FRACBITS)
 				continue;
 
-			// Don't set height yet...
-			height = precipsector->sector->ceilingheight;
+			// Don't set z properly yet...
+			z = precipsector->sector->ceilingheight;
 
 			if (curWeather == PRECIP_SNOW)
 			{
-				rainmo = P_SpawnSnowMobj(x, y, height, MT_SNOWFLAKE);
+				rainmo = P_SpawnPrecipMobj(x, y, z, MT_SNOWFLAKE);
 				mrand = M_RandomByte();
 				if (mrand < 64)
 					P_SetPrecipMobjState(rainmo, S_SNOW3);
@@ -10228,7 +10363,10 @@ void P_SpawnPrecipitation(void)
 					P_SetPrecipMobjState(rainmo, S_SNOW2);
 			}
 			else // everything else.
-				rainmo = P_SpawnRainMobj(x, y, height, MT_RAIN);
+				rainmo = P_SpawnPrecipMobj(x, y, z, MT_RAIN);
+
+			if (curWeather == PRECIP_BLANK)
+				rainmo->precipflags |= PCF_INVISIBLE;
 
 			floorz = rainmo->floorz >> FRACBITS;
 			ceilingz = rainmo->ceilingz >> FRACBITS;
@@ -10245,17 +10383,6 @@ void P_SpawnPrecipitation(void)
 			}
 		}
 	}
-
-	if (curWeather == PRECIP_BLANK)
-	{
-		curWeather = PRECIP_RAIN;
-		P_SwitchWeather(PRECIP_BLANK);
-	}
-	else if (curWeather == PRECIP_STORM_NORAIN)
-	{
-		curWeather = PRECIP_RAIN;
-		P_SwitchWeather(PRECIP_STORM_NORAIN);
-	}
 }
 
 //
@@ -10267,7 +10394,7 @@ void P_PrecipitationEffects(void)
 	INT32 volume;
 	size_t i;
 
-	boolean sounds_rain = true;
+	boolean rainsfx = true;
 	boolean sounds_thunder = true;
 	boolean effects_lightning = true;
 	boolean lightningStrike = false;
@@ -10300,7 +10427,7 @@ void P_PrecipitationEffects(void)
 			effects_lightning = false;
 			break;
 		case PRECIP_STORM_NORAIN: // no rain, lightning and thunder allowed
-			sounds_rain = false;
+			rainsfx = false;
 		case PRECIP_STORM: // everything.
 			break;
 		default:
@@ -10308,6 +10435,8 @@ void P_PrecipitationEffects(void)
 			return;
 	}
 
+	boolean sounds_rain = ((cv_drawdist_precip.value != 0) && rainsfx && (!leveltime || leveltime % 80 == 1));
+
 	// Currently thunderstorming with lightning, and we're sounding the thunder...
 	// and where there's thunder, there's gotta be lightning!
 	if (effects_lightning && lightningStrike)
@@ -10319,23 +10448,29 @@ void P_PrecipitationEffects(void)
 				P_SpawnLightningFlash(ss); // Spawn a quick flash thinker
 	}
 
+	const mobj_t *pmo = players[displayplayers[0]].mo;
+
 	// Local effects from here on out!
 	// If we're not in game fully yet, we don't worry about them.
-	if (!playeringame[displayplayers[0]] || !players[displayplayers[0]].mo)
+	if (!playeringame[displayplayers[0]] || !pmo)
 		return;
 
 	if (sound_disabled)
 		return; // Sound off? D'aw, no fun.
 
-	if (players[displayplayers[0]].mo->subsector->sector->ceilingpic == skyflatnum)
+	if (!sounds_rain && !sounds_thunder)
+		return; // no need to calculate volume at ALL
+
+	if (pmo->subsector->sector->ceilingpic == skyflatnum)
 		volume = 255; // Sky above? We get it full blast.
 	else
 	{
 		/* GCC is optimizing away y >= yl, FUCK YOU */
-		volatile fixed_t x, y, yl, yh, xl, xh;
+		INT64 x, y, yl, yh, xl, xh;
 		fixed_t closedist, newdist;
 
 		// Essentially check in a 1024 unit radius of the player for an outdoor area.
+<<<<<<< HEAD
 		yl = players[displayplayers[0]].mo->y - 1024*FRACUNIT;
 		yh = players[displayplayers[0]].mo->y + 1024*FRACUNIT;
 		xl = players[displayplayers[0]].mo->x - 1024*FRACUNIT;
@@ -10349,20 +10484,47 @@ void P_PrecipitationEffects(void)
 					continue;
 
 				newdist = S_CalculateSoundDistance(players[displayplayers[0]].mo->x, players[displayplayers[0]].mo->y, 0, x, y, 0);
+=======
+#define RADIUSSTEP (64*FRACUNIT)
+#define SEARCHRADIUS (16*RADIUSSTEP)
+		yl = yh = pmo->y;
+		yl -= SEARCHRADIUS;
+		while (yl < INT32_MIN)
+			yl += RADIUSSTEP;
+		yh += SEARCHRADIUS;
+		while (yh > INT32_MAX)
+			yh -= RADIUSSTEP;
+
+		xl = xh = pmo->x;
+		xl -= SEARCHRADIUS;
+		while (xl < INT32_MIN)
+			xl += RADIUSSTEP;
+		xh += SEARCHRADIUS;
+		while (xh > INT32_MAX)
+			xh -= RADIUSSTEP;
+
+		closedist = SEARCHRADIUS*2;
+#undef SEARCHRADIUS
+		for (y = yl; y <= yh; y += RADIUSSTEP)
+			for (x = xl; x <= xh; x += RADIUSSTEP)
+			{
+				if (R_PointInSubsectorFast((fixed_t)x, (fixed_t)y)->sector->ceilingpic != skyflatnum) // Found the outdoors!
+					continue;
+
+				newdist = S_CalculateSoundDistance(pmo->x, pmo->y, 0, (fixed_t)x, (fixed_t)y, 0);
+
+>>>>>>> Saturn-Next
 				if (newdist < closedist)
 					closedist = newdist;
 			}
 
 		volume = 255 - (closedist>>(FRACBITS+2));
+		volume = CLAMP(volume, 0, 255);
 	}
+#undef RADIUSSTEP
 
-	if (volume < 0)
-		volume = 0;
-	else if (volume > 255)
-		volume = 255;
-
-	if (sounds_rain && (!leveltime || leveltime % 80 == 1))
-		S_StartSoundAtVolume(players[displayplayers[0]].mo, sfx_rainin, volume);
+	if (sounds_rain)
+		S_StartSoundAtVolume(pmo, sfx_rainin, volume);
 
 	if (!sounds_thunder)
 		return;
@@ -10370,7 +10532,7 @@ void P_PrecipitationEffects(void)
 	if (effects_lightning && lightningStrike && volume)
 	{
 		// Large, close thunder sounds to go with our lightning.
-		S_StartSoundAtVolume(players[displayplayers[0]].mo, sfx_litng1 + M_RandomKey(4), volume);
+		S_StartSoundAtVolume(pmo, sfx_litng1 + M_RandomKey(4), volume);
 	}
 	else if (thunderchance < 20)
 	{
@@ -10378,7 +10540,7 @@ void P_PrecipitationEffects(void)
 		if (volume < 80)
 			volume = 80;
 
-		S_StartSoundAtVolume(players[displayplayers[0]].mo, sfx_athun1 + M_RandomKey(2), volume);
+		S_StartSoundAtVolume(pmo, sfx_athun1 + M_RandomKey(2), volume);
 	}
 }
 
@@ -10401,9 +10563,7 @@ void P_RespawnSpecials(void)
 			mobj_t *box;
 			mobj_t *newmobj;
 
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)	// not a mobj
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)	// not a mobj
 				continue;
 
 			box = (mobj_t *)th;
@@ -10439,10 +10599,6 @@ void P_RespawnSpecials(void)
 	if (!cv_itemrespawn.value)
 		return;
 
-	// Don't respawn in special stages!
-	if (G_IsSpecialStage(gamemap))
-		return;
-
 	// nothing left to respawn?
 	if (iquehead == iquetail)
 		return;
@@ -10490,9 +10646,8 @@ void P_RespawnSpecials(void)
 
 		if (mthing->options & MTF_OBJECTFLIP)
 		{
-			z = (
-			ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
-			ss->sector->ceilingheight) - (mthing->options >> ZSHIFT) * FRACUNIT;
+			z = P_GetSectorCeilingZAt(ss->sector, x, y) - (mthing->options >> ZSHIFT) * FRACUNIT;
+
 			if (mthing->options & MTF_AMBUSH
 			&& (i == MT_RING || i == MT_REDTEAMRING || i == MT_BLUETEAMRING || i == MT_COIN || P_WeaponOrPanel(i)))
 				z -= 24*FRACUNIT;
@@ -10500,9 +10655,8 @@ void P_RespawnSpecials(void)
 		}
 		else
 		{
-			z = (
-			ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-			ss->sector->floorheight) + (mthing->options >> ZSHIFT) * FRACUNIT;
+			z = P_GetSectorFloorZAt(ss->sector, x, y) + (mthing->options >> ZSHIFT) * FRACUNIT;
+
 			if (mthing->options & MTF_AMBUSH
 			&& (i == MT_RING || i == MT_REDTEAMRING || i == MT_BLUETEAMRING || i == MT_COIN || P_WeaponOrPanel(i)))
 				z += 24*FRACUNIT;
@@ -10548,9 +10702,12 @@ void P_SpawnPlayer(INT32 playernum)
 	}
 
 	// spawn as spectator determination
-	if (multiplayer && demo.playback); // Don't mess with spectator values since the demo setup handles them already.
+	if (multiplayer && demo.playback)
+		; // Don't mess with spectator values since the demo setup handles them already.
 	else if (!G_GametypeHasSpectators())
+	{
 		p->spectator = false;
+	}
 	else if (netgame && p->jointime <= 1 && pcount)
 	{
 		p->spectator = true;
@@ -10582,7 +10739,9 @@ void P_SpawnPlayer(INT32 playernum)
 			SendNetXCmd(XD_TEAMCHANGE, &usvalue, sizeof(usvalue));
 		}
 		else // Otherwise, never spectator.
+		{
 			p->spectator = false;
+		}
 	}
 
 	if (G_GametypeHasTeams())
@@ -10604,9 +10763,7 @@ void P_SpawnPlayer(INT32 playernum)
 
 	mobj = P_SpawnMobj(0, 0, 0, MT_PLAYER);
 	I_Assert(mobj != NULL);
-
-	mobj->player = p;
-	P_SetTarget(&p->mo, mobj);
+	(mobj->player = p)->mo = mobj;
 
 	mobj->angle = 0;
 
@@ -10617,15 +10774,8 @@ void P_SpawnPlayer(INT32 playernum)
 	// (usefulness: when body mobj is detached from player (who respawns),
 	// the dead body mobj retains the skin through the 'spritedef' override).
 	mobj->skin = &skins[p->skin];
-	if (p->localskin > 0)
-	{
-		if (p->skinlocal)
-			mobj->localskin = &localskins[p->localskin - 1];
-		else
-			mobj->localskin = &     skins[p->localskin - 1];
-	}
-	else
-		mobj->localskin = 0;
+
+	mobj->localskin = (p->localskin ? K_GetPlayerSkin(p) : 0);
 	mobj->skinlocal = p->skinlocal;
 
 	mobj->health = p->health;
@@ -10644,10 +10794,11 @@ void P_SpawnPlayer(INT32 playernum)
 	P_SetScale(mobj, mobj->destscale);
 	P_FlashPal(p, 0, 0); // Resets
 
-	// Spawn with a pity shield if necessary.
-	//P_DoPityCheck(p);
-
 	p->grieftime = 0;
+	p->hitemtimer = 0;
+	p->hitemvictim = 255;
+
+	p->spinoutrot = 0;
 
 	if (G_BattleGametype()) // SRB2kart
 	{
@@ -10694,6 +10845,30 @@ void P_SpawnPlayer(INT32 playernum)
 			P_SetScale(karmahitbox, mobj->scale);
 		}
 	}
+
+	// TODO: handle splitscreen
+	// Spectators can switch to freecam. This should be
+	// disabled when they enter the race, or when the level
+	// changes.
+	if (!demo.playback)
+	{
+		if (!p->spectator)
+		{
+			if (playernum == consoleplayer)
+				camera[0].freecam = false;
+			else if (splitscreen)
+			{
+				for (i = 1; i <= splitscreen; i++)
+				{
+					if (playernum == displayplayers[i])
+					{
+						camera[i].freecam = false;
+						break;
+					}
+				}
+			}
+		}
+	}
 }
 
 void P_AfterPlayerSpawn(INT32 playernum)
@@ -10736,13 +10911,26 @@ void P_AfterPlayerSpawn(INT32 playernum)
 
 	SV_SpawnPlayer(playernum, mobj->x, mobj->y, mobj->angle);
 
-	for (i = 0; i <= splitscreen; i++)
+	if (p->spectator == false)
 	{
+<<<<<<< HEAD
 		if (!camera[i].chase)
 			continue;
 
 		if (displayplayers[i] == playernum)
 			P_ResetCamera(p, &camera[i]);
+=======
+		for (i = 0; i <= splitscreen; i++)
+		{
+			if (!camera[i].chase)
+				continue;
+
+			if (displayplayers[i] != playernum)
+				continue;
+
+			P_ResetCamera(p, &camera[i]);
+		}
+>>>>>>> Saturn-Next
 	}
 
 	if (CheckForReverseGravity)
@@ -10772,14 +10960,9 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing)
 	//spawn at the origin as a desperation move if there is no mapthing
 
 	// set Z height
-	sector = R_PointInSubsector(x, y)->sector;
-
-	floor =
-	sector->f_slope ? P_GetZAt(sector->f_slope, x, y) :
-	sector->floorheight;
-	ceiling =
-	sector->c_slope ? P_GetZAt(sector->c_slope, x, y) :
-	sector->ceilingheight;
+	sector  = R_PointInSubsector(x, y)->sector;
+	floor   = P_GetSectorFloorZAt(sector, x, y);
+	ceiling = P_GetSectorCeilingZAt(sector, x, y);
 
 	if (mthing)
 	{
@@ -10847,21 +11030,17 @@ void P_MovePlayerToStarpost(INT32 playernum)
 	mobj->x = p->starpostx << FRACBITS;
 	mobj->y = p->starposty << FRACBITS;
 	P_SetThingPosition(mobj);
-	sector = R_PointInSubsector(mobj->x, mobj->y)->sector;
 
-	floor =
-	sector->f_slope ? P_GetZAt(sector->f_slope, mobj->x, mobj->y) :
-	sector->floorheight;
-	ceiling =
-	sector->c_slope ? P_GetZAt(sector->c_slope, mobj->x, mobj->y) :
-	sector->ceilingheight;
+	// set Z height
+	sector  = R_PointInSubsector(mobj->x, mobj->y)->sector;
+	floor   = P_GetSectorFloorZAt(sector, mobj->x, mobj->y);
+	ceiling = P_GetSectorCeilingZAt(sector, mobj->x, mobj->y);
 
 	if (mobj->player->kartstuff[k_starpostflip])
 		z = (p->starpostz<<FRACBITS) - FixedMul(128<<FRACBITS, mapobjectscale) - mobj->height;
 	else
 		z = (p->starpostz<<FRACBITS) + FixedMul(128<<FRACBITS, mapobjectscale);
 
-	//z = (p->starpostz + 128) << FRACBITS; // reverse gravity exists, pls
 	mobj->player->kartstuff[k_starpostflip] = 0;
 
 	if (z < floor)
@@ -10881,9 +11060,6 @@ void P_MovePlayerToStarpost(INT32 playernum)
 	p->kartstuff[k_waypoint] = p->kartstuff[k_starpostwp]; // SRB2kart
 
 	P_AfterPlayerSpawn(playernum);
-
-	//if (!(netgame || multiplayer))
-	//	leveltime = p->starposttime;
 }
 
 #define MAXHUNTEMERALDS 64
@@ -10925,84 +11101,92 @@ void P_SpawnMapThing(mapthing_t *mthing)
 	}
 
 	// count deathmatch start positions
-	if (mthing->type == 33)
+	switch (mthing->type)
 	{
-		if (numdmstarts < MAX_DM_STARTS)
-		{
-			deathmatchstarts[numdmstarts] = mthing;
-			mthing->type = 0;
-			numdmstarts++;
-		}
-		return;
-	}
-
-	else if (mthing->type == 34) // Red CTF Starts
-	{
-		if (numredctfstarts < MAXPLAYERS)
-		{
-			redctfstarts[numredctfstarts] = mthing;
-			mthing->type = 0;
-			numredctfstarts++;
-		}
-		return;
-	}
-
-	else if (mthing->type == 35) // Blue CTF Starts
-	{
-		if (numbluectfstarts < MAXPLAYERS)
-		{
-			bluectfstarts[numbluectfstarts] = mthing;
-			mthing->type = 0;
-			numbluectfstarts++;
-		}
-		return;
-	}
-
-	else if (mthing->type == 750) // Slope vertex point (formerly chaos spawn)
-		return;
-
-	else if (mthing->type == 300 // Ring
-		|| mthing->type == 308 || mthing->type == 309 // Team Rings
-		|| mthing->type == 1706 // Nights Wing
-		|| (mthing->type >= 600 && mthing->type <= 609) // Placement patterns
-		|| mthing->type == 1705 || mthing->type == 1713 // NiGHTS Hoops
-		|| mthing->type == 1800) // Mario Coin
-	{
-		// Don't spawn hoops, wings, or rings yet!
-		return;
+		case 33:
+			if (numdmstarts < MAX_DM_STARTS)
+			{
+				deathmatchstarts[numdmstarts] = mthing;
+				mthing->type = 0;
+				numdmstarts++;
+			}
+			return;
+		case 34:          // Red CTF Starts
+			if (numredctfstarts < MAXPLAYERS)
+			{
+				redctfstarts[numredctfstarts] = mthing;
+				mthing->type = 0;
+				numredctfstarts++;
+			}
+			return;
+		case 35:          // Blue CTF Starts
+			if (numbluectfstarts < MAXPLAYERS)
+			{
+				bluectfstarts[numbluectfstarts] = mthing;
+				mthing->type = 0;
+				numbluectfstarts++;
+			}
+			return;
+		case 300:         // Ring
+		case 308:
+		case 309:         // Team Rings
+		case 600 ... 609: // Placement patterns
+		case 750:         // Slope vertex point (formerly chaos spawn)
+		case 1705:
+		case 1706:        // Nights Wing
+		case 1713:        // NiGHTS Hoops
+		case 1800:        // Mario Coin
+			return; // Don't spawn hoops, wings, or rings yet!
+		default:
+			break;
 	}
 
 	// check for players specially
 	if (mthing->type > 0 && mthing->type <= 32)
 	{
-		// save spots for respawning in network games
-		if (!metalrecording)
-			playerstarts[mthing->type-1] = mthing;
+		if (mthing->type > MAXPLAYERS) // be wary of playerstarts size!  playerstarts[MAXPLAYERS]
+		{
+			CONS_Alert(CONS_ERROR, "Excess player start detected %d This will crash vanilla clients!\n", mthing->type);
+		}
+		else
+		{
+			// save spots for respawning in network games
+			if (!metalrecording)
+				playerstarts[mthing->type-1] = mthing;
+		}
+
 		return;
 	}
 
+	// If recording, you ARE Metal Sonic. Do not spawn it, do not save normal spawnpoints.
 	if (metalrecording && mthing->type == mobjinfo[MT_METALSONIC_RACE].doomednum)
-	{ // If recording, you ARE Metal Sonic. Do not spawn it, do not save normal spawnpoints.
+	{
 		playerstarts[0] = mthing;
 		return;
 	}
 
 	// find which type to spawn
 	for (i = 0; i < NUMMOBJTYPES; i++)
+	{
 		if (mthing->type == mobjinfo[i].doomednum)
 			break;
+	}
 
 	if (i == NUMMOBJTYPES)
 	{
 		if (mthing->type == 3328) // 3D Mode start Thing
 			return;
+
 		CONS_Alert(CONS_WARNING, M_GetText("Unknown thing type %d placed at (%d, %d)\n"), mthing->type, mthing->x, mthing->y);
+
 		i = MT_UNKNOWN;
 	}
 
 	if (metalrecording) // Metal Sonic can't use these things.
+	{
 		if (mobjinfo[i].flags & (MF_ENEMY|MF_BOSS) || i == MT_EMMY || i == MT_STARPOST)
 			return;
+	}
 
 	if (i >= MT_EMERALD1 && i <= MT_EMERALD7) // Pickupable Emeralds
 	{
@@ -11017,8 +11201,10 @@ void P_SpawnMapThing(mapthing_t *mthing)
 	}
 
 	if (!G_BattleGametype() || !cv_specialrings.value)
+	{
 		if (P_WeaponOrPanel(i))
 			return; // Don't place weapons/panels in non-ringslinger modes
+	}
 
 	if (i == MT_EMERHUNT)
 	{
@@ -11026,10 +11212,8 @@ void P_SpawnMapThing(mapthing_t *mthing)
 		if (gametype != GT_COOP)
 			return;
 
-		ss = R_PointInSubsector(mthing->x << FRACBITS, mthing->y << FRACBITS);
-		mthing->z = (INT16)(((
-								ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, mthing->x << FRACBITS, mthing->y << FRACBITS) :
-								ss->sector->floorheight)>>FRACBITS) + (mthing->options >> ZSHIFT));
+		ss = R_PointInSubsector((mthing->x << FRACBITS), (mthing->y << FRACBITS));
+		mthing->z = (INT16)((P_GetSectorFloorZAt(ss->sector, (mthing->x << FRACBITS), (mthing->y << FRACBITS)) >> FRACBITS) + (mthing->options >> ZSHIFT));
 
 		if (numhuntemeralds < MAXHUNTEMERALDS)
 			huntemeralds[numhuntemeralds++] = mthing;
@@ -11038,60 +11222,71 @@ void P_SpawnMapThing(mapthing_t *mthing)
 
 	if (i == MT_EMERALDSPAWN)
 	{
-		if (!cv_powerstones.value)
-			return;
-
-		if (!G_BattleGametype())
+		if (!cv_powerstones.value || !G_BattleGametype())
 			return;
 
 		runemeraldmanager = true;
 	}
 
 	if (!G_RaceGametype()) // No enemies in match or CTF modes
+	{
 		if ((mobjinfo[i].flags & MF_ENEMY) || (mobjinfo[i].flags & MF_BOSS))
 			return;
-
-	// Set powerup boxes to user settings for competition.
-	if (gametype == GT_COMPETITION)
-	{
-		if ((mobjinfo[i].flags & MF_MONITOR) && cv_competitionboxes.value) // not Normal
-		{
-			if (cv_competitionboxes.value == 1) // Random
-				i = MT_QUESTIONBOX;
-			else if (cv_competitionboxes.value == 2) // Teleports
-				i = MT_MIXUPBOX;
-			else if (cv_competitionboxes.value == 3) // None
-				return; // Don't spawn!
-		}
 	}
 
-	// Set powerup boxes to user settings for other netplay modes
-	else if (gametype != GT_COOP)
+	// Set powerup boxes to user settings for competition.
+	if (gametype == GT_COMPETITION && cv_competitionboxes.value && (mobjinfo[i].flags & MF_MONITOR)) // not Normal
 	{
-		if ((mobjinfo[i].flags & MF_MONITOR) && cv_matchboxes.value) // not Normal
+		switch (cv_competitionboxes.value)
 		{
-			if (cv_matchboxes.value == 1) // Random
+			case 1: // Random
 				i = MT_QUESTIONBOX;
-			else if (cv_matchboxes.value == 3) // Don't spawn
-				return;
-			else // cv_matchboxes.value == 2, Non-Random
-			{
+				break;
+			case 2: // Teleports
+				i = MT_MIXUPBOX;
+				break;
+			case 3: // None
+				return; // Don't spawn!
+			default:
+				break;
+		}
+	}
+	// Set powerup boxes to user settings for other netplay modes
+	else if (gametype != GT_COOP && cv_matchboxes.value && (mobjinfo[i].flags & MF_MONITOR)) // not Normal
+	{
+		switch (cv_matchboxes.value)
+		{
+			case 1: // Random
+				i = MT_QUESTIONBOX;
+				break;
+			case 3: // None
+				return; // Don't spawn!
+			default:
 				if (i == MT_QUESTIONBOX)
 					return; // don't spawn in Non-Random
-
 				mthing->options &= ~(MTF_AMBUSH|MTF_OBJECTSPECIAL); // no random respawning!
-			}
+				break;
 		}
 	}
 
 	if (gametype != GT_CTF) // CTF specific things
 	{
-		if (i == MT_BLUETEAMRING || i == MT_REDTEAMRING)
-			i = MT_RING;
-		else if (i == MT_BLUERINGBOX || i == MT_REDRINGBOX)
-			i = MT_SUPERRINGBOX;
-		else if (i == MT_BLUEFLAG || i == MT_REDFLAG)
-			return; // No flags in non-CTF modes!
+		switch (i)
+		{
+			case MT_BLUETEAMRING:
+			case MT_REDTEAMRING:
+				i = MT_RING;
+				break;
+			case MT_BLUERINGBOX:
+			case MT_REDRINGBOX:
+				i = MT_SUPERRINGBOX;
+				break;
+			case MT_BLUEFLAG:
+			case MT_REDFLAG:
+				return; // No flags in non-CTF modes!
+			default:
+				break;
+		}
 	}
 	else
 	{
@@ -11127,7 +11322,7 @@ void P_SpawnMapThing(mapthing_t *mthing)
 		if (i == MT_PITYTV || i == MT_GREENTV || i == MT_YELLOWTV || i == MT_BLUETV || i == MT_BLACKTV || i == MT_WHITETV)
 			return; // No shields in Ultimate mode
 
-		if (i == MT_SUPERRINGBOX && !G_IsSpecialStage(gamemap))
+		if (i == MT_SUPERRINGBOX)
 			return; // No rings in Ultimate mode (except special stages)
 	}
 
@@ -11143,18 +11338,14 @@ void P_SpawnMapThing(mapthing_t *mthing)
 	ss = R_PointInSubsector(x, y);
 
 	if (i == MT_NIGHTSBUMPER)
-		z = (
-			ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-			ss->sector->floorheight) + ((mthing->options >> ZSHIFT) << FRACBITS);
+		z = P_GetSectorFloorZAt(ss->sector, x, y) + ((mthing->options >> ZSHIFT) << FRACBITS);
 	else if (i == MT_AXIS || i == MT_AXISTRANSFER || i == MT_AXISTRANSFERLINE)
 		z = ONFLOORZ;
 	else if (i == MT_SPECIALSPIKEBALL || P_WeaponOrPanel(i) || i == MT_EMERALDSPAWN || i == MT_EMMY)
 	{
 		if (mthing->options & MTF_OBJECTFLIP)
 		{
-			z = (
-			ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
-			ss->sector->ceilingheight);
+			z = P_GetSectorCeilingZAt(ss->sector, x, y);
 
 			if (mthing->options & MTF_AMBUSH) // Special flag for rings
 				z -= 24*FRACUNIT;
@@ -11165,9 +11356,7 @@ void P_SpawnMapThing(mapthing_t *mthing)
 		}
 		else
 		{
-			z = (
-			ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-			ss->sector->floorheight);
+			z = P_GetSectorFloorZAt(ss->sector, x, y);
 
 			if (mthing->options & MTF_AMBUSH) // Special flag for rings
 				z += 24*FRACUNIT;
@@ -11187,23 +11376,32 @@ void P_SpawnMapThing(mapthing_t *mthing)
 
 		// base positions
 		if (flip)
-			z = (
-			ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
-			ss->sector->ceilingheight) - mobjinfo[i].height;
+			z = P_GetSectorCeilingZAt(ss->sector, x, y) - mobjinfo[i].height;
 		else
-			z = (
-			ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-			ss->sector->floorheight);
+			z = P_GetSectorFloorZAt(ss->sector, x, y);
 
 		// offsetting
 		if (mthing->options >> ZSHIFT)
 			offset = ((mthing->options >> ZSHIFT) << FRACBITS);
-		else if (i == MT_CRAWLACOMMANDER || i == MT_DETON || i == MT_JETTBOMBER || i == MT_JETTGUNNER || i == MT_EGGMOBILE2)
-			offset = 33*FRACUNIT;
-		else if (i == MT_EGGMOBILE)
-			offset = 128*FRACUNIT;
-		else if (i == MT_GOLDBUZZ || i == MT_REDBUZZ)
-			offset = 288*FRACUNIT;
+		else switch (i)
+		{
+			case MT_CRAWLACOMMANDER:
+			case MT_DETON:
+			case MT_JETTBOMBER:
+			case MT_JETTGUNNER:
+			case MT_EGGMOBILE2:
+				offset = 33*FRACUNIT;
+				break;
+			case MT_EGGMOBILE:
+				offset = 128*FRACUNIT;
+				break;
+			case MT_GOLDBUZZ:
+			case MT_REDBUZZ:
+				offset = 288*FRACUNIT;
+				break;
+			default:
+				break;
+		}
 
 		// applying offsets! (if any)
 		if (flip)
@@ -11229,7 +11427,8 @@ void P_SpawnMapThing(mapthing_t *mthing)
 
 	mobj = P_SpawnMobj(x, y, z, i);
 
-	if (!mobj || P_MobjWasRemoved(mobj)) {
+	if (P_MobjWasRemoved(mobj))
+	{
 		CONS_Alert(CONS_ERROR, "Failed to spawn map thing #%d at %d, %d. This will crash vanilla clients!\n", mthing->type, x>>FRACBITS, y>>FRACBITS);
 		return;
 	}
@@ -11540,7 +11739,7 @@ ML_NOCLIMB : Direction not controllable
 		mobj_t *elecmobj;
 		elecmobj = P_SpawnMobj(x, y, z, MT_CYBRAKDEMON_ELECTRIC_BARRIER);
 		P_SetTarget(&elecmobj->target, mobj);
-		elecmobj->angle = FixedAngle(mthing->angle*FRACUNIT);;
+		elecmobj->angle = FixedAngle(mthing->angle*FRACUNIT);
 		elecmobj->destscale = mobj->scale*2;
 		P_SetScale(elecmobj, elecmobj->destscale);
 	}
@@ -11554,9 +11753,7 @@ ML_NOCLIMB : Direction not controllable
 		// See if other starposts exist in this level that have the same value.
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
@@ -11642,14 +11839,6 @@ ML_NOCLIMB : Direction not controllable
 			mobj->health |= 1; // If ambush is set, push using XYZ
 		if (mthing->options & MTF_OBJECTSPECIAL)
 			mobj->health |= 2; // If object special is set, fade using XY
-
-		if (G_IsSpecialStage(gamemap))
-		{
-			if (i == MT_PUSH)
-				P_SetMobjState(mobj, S_GRAVWELLGREEN);
-			if (i == MT_PULL)
-				P_SetMobjState(mobj, S_GRAVWELLRED);
-		}
 	}
 
 	// ignore MTF_ flags and return early
@@ -11765,15 +11954,9 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
 		z = mthing->options << FRACBITS;
 
 		hoopcenter = P_SpawnMobj(x, y, z, MT_HOOPCENTER);
-
 		hoopcenter->spawnpoint = mthing;
 
-		// Screw these damn hoops, I need this thinker.
-		//hoopcenter->flags |= MF_NOTHINK;
-
-		z +=
-			sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
-			sec->floorheight;
+		z += P_GetSectorFloorZAt(sec, x, y);
 
 		hoopcenter->z = z - hoopcenter->height/2;
 
@@ -11816,10 +11999,8 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
 
 			mobj = P_SpawnMobj(finalx, finaly, finalz, MT_HOOP);
 
-			//if (maptol & TOL_XMAS)
-				//P_SetMobjState(mobj, mobj->info->seestate + (i & 1));
-
 			mobj->z -= mobj->height/2;
+
 			P_SetTarget(&mobj->target, hoopcenter); // Link the sprite to the center.
 			mobj->fuse = 0;
 
@@ -11830,10 +12011,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
 				P_SetTarget(&mobj->hprev->hnext, mobj);
 			}
 			else
-			{
-				P_SetTarget(&mobj->hprev, NULL);
-				P_SetTarget(&mobj->hnext, NULL);
-			}
+				mobj->hprev = mobj->hnext = NULL;
 
 			nextmobj = mobj;
 		}
@@ -11859,7 +12037,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
 			mobj->z -= mobj->height/2;
 
 			// Link all the collision sprites together.
-			P_SetTarget(&mobj->hnext, NULL);
+			mobj->hnext = NULL;
 			P_SetTarget(&mobj->hprev, nextmobj);
 			P_SetTarget(&mobj->hprev->hnext, mobj);
 
@@ -11886,7 +12064,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
 			mobj->z -= mobj->height/2;
 
 			// Link all the collision sprites together.
-			P_SetTarget(&mobj->hnext, NULL);
+			mobj->hnext = NULL;
 			P_SetTarget(&mobj->hprev, nextmobj);
 			P_SetTarget(&mobj->hprev->hnext, mobj);
 
@@ -11909,9 +12087,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
 		hoopcenter = P_SpawnMobj(x, y, z, MT_HOOPCENTER);
 		hoopcenter->spawnpoint = mthing;
 
-		z +=
-			sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
-			sec->floorheight;
+		z += P_GetSectorFloorZAt(sec, x, y);
 		hoopcenter->z = z - hoopcenter->height/2;
 
 		P_UnsetThingPosition(hoopcenter);
@@ -11959,9 +12135,6 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
 
 			mobj = P_SpawnMobj(finalx, finaly, finalz, MT_HOOP);
 
-			//if (maptol & TOL_XMAS)
-				//P_SetMobjState(mobj, mobj->info->seestate + (i & 1));
-
 			mobj->z -= mobj->height/2;
 			P_SetTarget(&mobj->target, hoopcenter); // Link the sprite to the center.
 			mobj->fuse = 0;
@@ -11973,10 +12146,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
 				P_SetTarget(&mobj->hprev->hnext, mobj);
 			}
 			else
-			{
-				P_SetTarget(&mobj->hprev, NULL);
-				P_SetTarget(&mobj->hnext, NULL);
-			}
+				mobj->hprev = mobj->hnext = NULL;
 
 			nextmobj = mobj;
 		}
@@ -12013,7 +12183,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing)
 				mobj->z -= mobj->height/2;
 
 				// Link all the collision sprites together.
-				P_SetTarget(&mobj->hnext, NULL);
+				mobj->hnext = NULL;
 				P_SetTarget(&mobj->hprev, nextmobj);
 				P_SetTarget(&mobj->hprev->hnext, mobj);
 
@@ -12335,10 +12505,6 @@ void P_ColorTeamMissile(mobj_t *missile, player_t *source)
 		else if (source->ctfteam == 1)
 			missile->color = skincolor_redring;
 	}
-	/*
-	else
-		missile->color = player->mo->color; //copy color
-	*/
 }
 
 //
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 90c9cceb1..75a615f07 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -14,6 +14,10 @@
 #ifndef __P_MOBJ__
 #define __P_MOBJ__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Basics.
 #include "tables.h"
 #include "m_fixed.h"
@@ -254,19 +258,14 @@ typedef enum
 // PRECIPITATION flags ?! ?! ?!
 //
 typedef enum {
-	// Don't draw.
-	PCF_INVISIBLE = 1,
-	// Above pit.
-	PCF_PIT = 2,
-	// Above FOF.
-	PCF_FOF = 4,
-	// Above MOVING FOF (this means we need to keep floorz up to date...)
-	PCF_MOVINGFOF = 8,
-	// Is rain.
-	PCF_RAIN = 16,
-	// Ran the thinker this tic.
-	PCF_THUNK = 32,
+	PCF_INVISIBLE = 1, // Don't draw.
+	PCF_PIT       = 1<<1, // Above pit.
+	PCF_FOF       = 1<<2, // Above FOF.
+	PCF_MOVINGFOF = 1<<3, // Above MOVING FOF (this means we need to keep floorz up to date...)
+	PCF_SPLASH    = 1<<4, // Splashed on the ground, return to the ceiling after the animation's over
+	PCF_THUNK     = 1<<5, // Ran the thinker this tic.
 } precipflag_t;
+
 // Map Object definition.
 typedef struct mobj_s
 {
@@ -278,6 +277,9 @@ typedef struct mobj_s
 	fixed_t old_x, old_y, old_z; // position interpolation
 	fixed_t old_x2, old_y2, old_z2;
 
+	mobjtype_t type;
+	const mobjinfo_t *info; // &mobjinfo[mobj->type]
+
 	// More list: links in sector (if needed)
 	struct mobj_s *bnext;
 	struct mobj_s **bprev; // killough 8/11/98: change to ptr-to-ptr
@@ -290,14 +292,18 @@ typedef struct mobj_s
 	spritenum_t sprite; // used to find patch_t and flip value
 	UINT32 frame; // frame number, plus bits see p_pspr.h
 	UINT16 anim_duration; // for FF_ANIMATE states
-	
-	UINT32 renderflags; // render flags
+
+	INT32 blendmode; // blend mode
 	fixed_t spritexscale, spriteyscale;
 	fixed_t spritexoffset, spriteyoffset;
 	fixed_t old_spritexscale, old_spriteyscale;
+	fixed_t old_spritexscale2, old_spriteyscale2;
 	fixed_t old_spritexoffset, old_spriteyoffset;
+	fixed_t old_spritexoffset2, old_spriteyoffset2;
+	INT16 lightlevel; // Add to sector lightlevel, -255 - 255
 
 	fixed_t realxscale, realyscale; // funn-E streeetch
+	fixed_t realxoffset, realyoffset;
 
 	fixed_t stretchslam; // "squish" effect when you land
 
@@ -345,9 +351,6 @@ typedef struct mobj_s
 	struct mobj_s *hnext;
 	struct mobj_s *hprev;
 
-	mobjtype_t type;
-	const mobjinfo_t *info; // &mobjinfo[mobj->type]
-
 	INT32 health; // for player this is rings + 1
 
 	// Movement direction, movement generation (zig-zagging).
@@ -399,9 +402,8 @@ typedef struct mobj_s
 	boolean resetinterp; // if true, some fields should not be interpolated (see R_InterpolateMobjState implementation)
 	boolean colorized; // Whether the mobj uses the rainbow colormap
 	boolean mirrored; // The object's rotations will be mirrored left to right, e.g., see frame AL from the right and AR from the left
-	boolean rollmodel; // OpenGL: Should this model rotate?
 
-	tic_t slamsoundtimer;
+	tic_t slamsoundtimer; // Funni slam sound when landing
 
 	// saltyhop! hardcode edition
 	boolean salty_ready;
@@ -412,7 +414,11 @@ typedef struct mobj_s
 	boolean init_salty;
 
 	// WARNING: New fields must be added separately to savegame and Lua.
+<<<<<<< HEAD
 	struct mobj_s *watertrail[4];
+=======
+	boolean islocal; // BEWARE: islocal does not exist in vanilla, strictly to be used for locally loaded addons to not cause desynchs with the mobj linedef trigger check. DO NOT USE THIS IN ACTUAL ADDONS YOU INTEND TO USE ON YOUR SERVER
+>>>>>>> Saturn-Next
 } mobj_t;
 
 //
@@ -432,6 +438,9 @@ typedef struct precipmobj_s
 	fixed_t old_x, old_y, old_z; // position interpolation
 	fixed_t old_x2, old_y2, old_z2;
 
+	mobjtype_t type;
+	const mobjinfo_t *info; // &mobjinfo[mobj->type]
+
 	// More list: links in sector (if needed)
 	struct precipmobj_s *bnext;
 	struct precipmobj_s **bprev; // killough 8/11/98: change to ptr-to-ptr
@@ -444,17 +453,21 @@ typedef struct precipmobj_s
 	spritenum_t sprite; // used to find patch_t and flip value
 	UINT32 frame; // frame number, plus bits see p_pspr.h
 	UINT16 anim_duration; // for FF_ANIMATE states
-	
-	UINT32 renderflags; // render flags
+
+	INT32 blendmode; // blend mode
 	fixed_t spritexscale, spriteyscale;
 	fixed_t spritexoffset, spriteyoffset;
 	fixed_t old_spritexscale, old_spriteyscale;
+	fixed_t old_spritexscale2, old_spriteyscale2;
 	fixed_t old_spritexoffset, old_spriteyoffset;
+	fixed_t old_spritexoffset2, old_spriteyoffset2;
+	INT16 lightlevel; // Add to sector lightlevel, -255 - 255
 
 	fixed_t realxscale, realyscale; // funn-E streeetch
+	fixed_t realxoffset, realyoffset;
 
 	fixed_t stretchslam; // "squish" effect when you land
-	
+
 	//sloperollangle
 	angle_t sloperoll, slopepitch;
 	angle_t old_sloperoll, old_slopepitch;
@@ -480,6 +493,7 @@ typedef struct precipmobj_s
 	INT32 tics; // state tic counter
 	state_t *state;
 	INT32 flags; // flags from mobjinfo tables
+	tic_t lastThink;
 } precipmobj_t;
 
 typedef struct actioncache_s
@@ -519,10 +533,9 @@ void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 numb
 boolean P_BossTargetPlayer(mobj_t *actor, boolean closest);
 boolean P_SupermanLook4Players(mobj_t *actor);
 void P_DestroyRobots(void);
-void P_SnowThinker(precipmobj_t *mobj);
-void P_RainThinker(precipmobj_t *mobj);
+boolean P_PrecipThinker(precipmobj_t *mobj);
 void P_NullPrecipThinker(precipmobj_t *mobj);
-void P_RemovePrecipMobj(precipmobj_t *mobj);
+void P_FreePrecipMobj(precipmobj_t *mobj);
 void P_SetScale(mobj_t *mobj, fixed_t newscale);
 void P_XYMovement(mobj_t *mo);
 void P_EmeraldManager(void);
@@ -532,4 +545,9 @@ extern mapthing_t *huntemeralds[MAXHUNTEMERALDS];
 extern INT32 numhuntemeralds;
 extern boolean runemeraldmanager;
 extern INT32 numstarposts;
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/p_polyobj.c b/src/p_polyobj.c
index 7ac63dac1..210644a67 100644
--- a/src/p_polyobj.c
+++ b/src/p_polyobj.c
@@ -28,6 +28,7 @@
 #include "r_main.h"
 #include "r_state.h"
 #include "r_defs.h"
+#include "qs22j.h"
 
 
 /*
@@ -95,6 +96,8 @@ INT32 numPolyObjects;
 // Polyobject Blockmap -- initialized in P_LoadBlockMap
 polymaplink_t **polyblocklinks;
 
+static size_t *KnownPolySides;
+static size_t KnownPolySidesCount;
 
 //
 // Static Data
@@ -150,6 +153,42 @@ FUNCINLINE static ATTRINLINE void PolyObj_AddThinker(thinker_t *th)
 	th->next = thinkercap.next;
 	th->prev = &thinkercap;
 	thinkercap.next = th;
+
+	th->references = 0;
+	th->cachable = false; // not initialising this made the mobjcache die thx!
+#ifdef PARANOIA
+	th->debug_mobjtype = MT_NULL;
+#endif
+}
+
+static void FreeSideLists(void)
+{
+	free(KnownPolySides);
+	KnownPolySides = NULL;
+	KnownPolySidesCount = 0;
+}
+
+//==========================================================================
+//
+// InitSideLists [RH]
+//
+// Group sides by vertex and collect side that are known to belong to a
+// polyobject so that they can be initialized fast.
+//==========================================================================
+static void InitSideLists(void)
+{
+	size_t i;
+	FreeSideLists();
+	KnownPolySides = malloc(numsegs * sizeof(KnownPolySides[0]));
+	for (i = 0; i < numsegs; i++)
+	{
+		if (segs[i].linedef &&
+			(segs[i].linedef->special == POLYOBJ_START_LINE ||
+			segs[i].linedef->special == POLYOBJ_EXPLICIT_LINE))
+		{
+			KnownPolySides[KnownPolySidesCount++] = i;
+		}
+	}
 }
 
 //
@@ -512,11 +551,12 @@ static void Polyobj_findExplicit(polyobj_t *po)
 	size_t numSegItems = 0;
 	size_t numSegItemsAlloc = 0;
 
-	size_t i;
+	size_t i, ii;
 
 	// first loop: save off all segs with polyobject's id number
-	for (i = 0; i < numsegs; ++i)
+	for (ii = 0; ii < KnownPolySidesCount; ii++)
 	{
+		i = KnownPolySides[ii];
 		INT32 polyID, parentID;
 
 		if (segs[i].linedef->special != POLYOBJ_EXPLICIT_LINE)
@@ -547,7 +587,7 @@ static void Polyobj_findExplicit(polyobj_t *po)
 
 	// sort the array if necessary
 	if (numSegItems >= 2)
-		qsort(segitems, numSegItems, sizeof(segitem_t), Polyobj_segCompare);
+		qs22j(segitems, numSegItems, sizeof(segitem_t), Polyobj_segCompare);
 
 	// second loop: put the sorted segs into the polyobject
 	for (i = 0; i < numSegItems; ++i)
@@ -566,7 +606,7 @@ static void Polyobj_findExplicit(polyobj_t *po)
 //
 static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
 {
-	size_t i;
+	size_t i, ii;
 	polyobj_t *po = &PolyObjects[num];
 
 	// don't spawn a polyobject more than once
@@ -590,8 +630,9 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
 	// 1. Search segs for "line start" special with tag matching this
 	//    polyobject's id number. If found, iterate through segs which
 	//    share common vertices and record them into the polyobject.
-	for (i = 0; i < numsegs; ++i)
+	for (ii = 0; ii < KnownPolySidesCount; ii++)
 	{
+		i = KnownPolySides[ii];
 		seg_t *seg = &segs[i];
 		INT32 polyID, parentID;
 
@@ -810,8 +851,7 @@ static polymaplink_t *Polyobj_getLink(void)
 	}
 	else
 	{
-		l = Z_Malloc(sizeof(*l), PU_LEVEL, NULL);
-		memset(l, 0, sizeof(*l));
+		l = Z_Calloc(sizeof(*l), PU_LEVEL, NULL);
 	}
 
 	return l;
@@ -1415,7 +1455,10 @@ static boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings)
 	{
 		// update seg angles (used only by renderer)
 		for (i = 0; i < po->segCount; ++i)
+		{
 			po->segs[i]->angle += delta;
+			P_UpdateSegLightOffset(po->segs[i]);
+		}
 
 		// update polyobject's angle
 		po->angle += delta;
@@ -1514,10 +1557,8 @@ void Polyobj_InitLevel(void)
 	// the mobj_t pointers on a queue for use below.
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
+		if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
 
 		mobj_t *mo = (mobj_t *)th;
 
@@ -1526,8 +1567,7 @@ void Polyobj_InitLevel(void)
 		{
 			++numPolyObjects;
 
-			qitem = malloc(sizeof(mobjqitem_t));
-			memset(qitem, 0, sizeof(mobjqitem_t));
+			qitem = calloc(1, sizeof(mobjqitem_t));
 			qitem->mo = mo;
 			M_QueueInsert(&(qitem->mqitem), &spawnqueue);
 		}
@@ -1535,8 +1575,7 @@ void Polyobj_InitLevel(void)
 		{
 			++numAnchors;
 
-			qitem = malloc(sizeof(mobjqitem_t));
-			memset(qitem, 0, sizeof(mobjqitem_t));
+			qitem = calloc(1, sizeof(mobjqitem_t));
 			qitem->mo = mo;
 			M_QueueInsert(&(qitem->mqitem), &anchorqueue);
 		}
@@ -1552,6 +1591,9 @@ void Polyobj_InitLevel(void)
 		for (i = 0; i < numPolyObjects; ++i)
 			PolyObjects[i].first = PolyObjects[i].next = numPolyObjects;
 
+		// [RH] Make this faster
+		InitSideLists();
+
 		// setup polyobjects
 		for (i = 0; i < numPolyObjects; ++i)
 		{
@@ -1560,6 +1602,9 @@ void Polyobj_InitLevel(void)
 			Polyobj_spawnPolyObj(i, qitem->mo, qitem->mo->spawnpoint->angle);
 		}
 
+		// [RH] Don't need the side lists anymore
+		FreeSideLists();
+
 		// move polyobjects to spawn points
 		for (i = 0; i < numAnchors; ++i)
 		{
@@ -1787,9 +1832,7 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
 	// We redo this each tic to make savegame compatibility easier.
 	for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
 	{
-		if (wp->function.acp1 != (actionf_p1)P_MobjThinker) // Not a mobj thinker
-			continue;
-		if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
 			continue;
 
 		mo2 = (mobj_t *)wp;
@@ -1870,7 +1913,41 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
 		{
 			CONS_Debug(DBG_POLYOBJ, "Looking for next waypoint...\n");
 
+<<<<<<< HEAD
 			waypoint = (th->direction == -1) ? P_GetPreviousWaypoint(target, false) : P_GetNextWaypoint(target, false);
+=======
+			// Find next waypoint
+			for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
+			{
+				if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+					continue;
+
+				mo2 = (mobj_t *)wp;
+
+				if (mo2->type != MT_TUBEWAYPOINT)
+					continue;
+
+				if (mo2->threshold != th->sequence)
+					continue;
+
+				if (th->direction == -1)
+				{
+					if (mo2->health == target->health - 1)
+					{
+						waypoint = mo2;
+						break;
+					}
+				}
+				else
+				{
+					if (mo2->health == target->health + 1)
+					{
+						waypoint = mo2;
+						break;
+					}
+				}
+			}
+>>>>>>> Saturn-Next
 
 			if (!waypoint && th->wrap) // If specified, wrap waypoints
 			{
@@ -1880,7 +1957,39 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
 					th->stophere = true;
 				}
 
+<<<<<<< HEAD
 				waypoint = (th->direction == -1) ? P_GetLastWaypoint(th->sequence) : P_GetFirstWaypoint(th->sequence);
+=======
+				for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
+				{
+					if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+						continue;
+
+					mo2 = (mobj_t *)wp;
+
+					if (mo2->type != MT_TUBEWAYPOINT)
+						continue;
+
+					if (mo2->threshold != th->sequence)
+						continue;
+
+					if (th->direction == -1)
+					{
+						if (waypoint == NULL)
+							waypoint = mo2;
+						else if (mo2->health > waypoint->health)
+							waypoint = mo2;
+					}
+					else
+					{
+						if (mo2->health == 0)
+						{
+							waypoint = mo2;
+							break;
+						}
+					}
+				}
+>>>>>>> Saturn-Next
 			}
 			else if (!waypoint && th->comeback) // Come back to the start
 			{
@@ -1889,7 +1998,40 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
 				if (!th->continuous)
 					th->comeback = false;
 
+<<<<<<< HEAD
 				waypoint = (th->direction == -1) ? P_GetPreviousWaypoint(target, false) : P_GetNextWaypoint(target, false);
+=======
+				for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
+				{
+					if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+						continue;
+
+					mo2 = (mobj_t *)wp;
+
+					if (mo2->type != MT_TUBEWAYPOINT)
+						continue;
+
+					if (mo2->threshold != th->sequence)
+						continue;
+
+					if (th->direction == -1)
+					{
+						if (mo2->health == target->health - 1)
+						{
+							waypoint = mo2;
+							break;
+						}
+					}
+					else
+					{
+						if (mo2->health == target->health + 1)
+						{
+							waypoint = mo2;
+							break;
+						}
+					}
+				}
+>>>>>>> Saturn-Next
 			}
 		}
 
@@ -2227,7 +2369,7 @@ INT32 EV_DoPolyObjRotate(polyrotdata_t *prdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polyrotate_t), PU_LEVSPEC, NULL);
-	th->thinker.function.acp1 = (actionf_p1)T_PolyObjRotate;
+	th->thinker.function = (actionf_p1)T_PolyObjRotate;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 
@@ -2295,7 +2437,7 @@ INT32 EV_DoPolyObjMove(polymovedata_t *pmdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polymove_t), PU_LEVSPEC, NULL);
-	th->thinker.function.acp1 = (actionf_p1)T_PolyObjMove;
+	th->thinker.function = (actionf_p1)T_PolyObjMove;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 
@@ -2359,7 +2501,7 @@ INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polywaypoint_t), PU_LEVSPEC, NULL);
-	th->thinker.function.acp1 = (actionf_p1)T_PolyObjWaypoint;
+	th->thinker.function = (actionf_p1)T_PolyObjWaypoint;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 
@@ -2375,8 +2517,49 @@ INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
 	th->stophere = false;
 
 	// Find the first waypoint we need to use
+<<<<<<< HEAD
 	first = (th->direction == -1) ? P_GetLastWaypoint(th->sequence) : P_GetFirstWaypoint(th->sequence);
 	last = (th->direction == -1) ? P_GetFirstWaypoint(th->sequence) : P_GetLastWaypoint(th->sequence);
+=======
+	for (wp = thinkercap.next; wp != &thinkercap; wp = wp->next)
+	{
+		if (wp->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+			continue;
+
+		mo2 = (mobj_t *)wp;
+
+		if (mo2->type != MT_TUBEWAYPOINT)
+			continue;
+
+		if (mo2->threshold != th->sequence)
+			continue;
+
+		if (th->direction == -1) // highest waypoint #
+		{
+			if (mo2->health == 0)
+				last = mo2;
+			else
+			{
+				if (first == NULL)
+					first = mo2;
+				else if (mo2->health > first->health)
+					first = mo2;
+			}
+		}
+		else // waypoint 0
+		{
+			if (mo2->health == 0)
+				first = mo2;
+			else
+			{
+				if (last == NULL)
+					last = mo2;
+				else if (mo2->health > last->health)
+					last = mo2;
+			}
+		}
+	}
+>>>>>>> Saturn-Next
 
 	if (!first)
 	{
@@ -2423,7 +2606,7 @@ INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
 	R_CreateInterpolator_Polyobj(&th->thinker, po);
 	// T_PolyObjWaypoint is the only polyobject movement
 	// that can adjust z, so we add these ones too.
-	R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, false); 
+	R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, false);
 	R_CreateInterpolator_SectorPlane(&th->thinker, po->lines[0]->backsector, true);
 
 	// Most other polyobject functions handle children by recursively
@@ -2456,7 +2639,7 @@ static void Polyobj_doSlideDoor(polyobj_t *po, polydoordata_t *doordata)
 
 	// allocate and add a new slide door thinker
 	th = Z_Malloc(sizeof(polyslidedoor_t), PU_LEVSPEC, NULL);
-	th->thinker.function.acp1 = (actionf_p1)T_PolyDoorSlide;
+	th->thinker.function = (actionf_p1)T_PolyDoorSlide;
 	PolyObj_AddThinker(&th->thinker);
 
 	// point the polyobject to this thinker
@@ -2507,7 +2690,7 @@ static void Polyobj_doSwingDoor(polyobj_t *po, polydoordata_t *doordata)
 
 	// allocate and add a new swing door thinker
 	th = Z_Malloc(sizeof(polyswingdoor_t), PU_LEVSPEC, NULL);
-	th->thinker.function.acp1 = (actionf_p1)T_PolyDoorSwing;
+	th->thinker.function = (actionf_p1)T_PolyDoorSwing;
 	PolyObj_AddThinker(&th->thinker);
 
 	// point the polyobject to this thinker
@@ -2592,7 +2775,7 @@ INT32 EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polydisplace_t), PU_LEVSPEC, NULL);
-	th->thinker.function.acp1 = (actionf_p1)T_PolyObjDisplace;
+	th->thinker.function = (actionf_p1)T_PolyObjDisplace;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 
@@ -2696,7 +2879,7 @@ INT32 EV_DoPolyObjFlag(line_t *pfdata)
 
 	// create a new thinker
 	th = Z_Malloc(sizeof(polymove_t), PU_LEVSPEC, NULL);
-	th->thinker.function.acp1 = (actionf_p1)T_PolyObjFlag;
+	th->thinker.function = (actionf_p1)T_PolyObjFlag;
 	PolyObj_AddThinker(&th->thinker);
 	po->thinker = &th->thinker;
 
diff --git a/src/p_pspr.h b/src/p_pspr.h
index 5ac1d1d84..89f6c1108 100644
--- a/src/p_pspr.h
+++ b/src/p_pspr.h
@@ -41,10 +41,18 @@
 #define FF_HORIZONTALFLIP 0x400
 /// \brief Frame flags: Thin, paper-like sprite (for collision equivalent, see MF_PAPERCOLLISION)
 #define FF_PAPERSPRITE 0x800
-/// \brief Frame flags: Simple stateless animation
-#define FF_ANIMATE 0x4000
-/// \brief Frame flags: frame always appears full bright
-#define FF_FULLBRIGHT 0x8000
+
+/// \brief Frame flags: blend types
+#define FF_BLENDMASK 0x7000
+/// \brief shift for FF_BLENDMASK
+#define FF_BLENDSHIFT 12
+/// \brief preshifted blend flags minus 1 as effects don't distinguish between AST_COPY and AST_TRANSLUCENT
+#define FF_ADD             ((AST_ADD-1)<<FF_BLENDSHIFT)
+#define FF_SUBTRACT        ((AST_SUBTRACT-1)<<FF_BLENDSHIFT)
+#define FF_REVERSESUBTRACT ((AST_REVERSESUBTRACT-1)<<FF_BLENDSHIFT)
+#define FF_MODULATE        ((AST_MODULATE-1)<<FF_BLENDSHIFT)
+#define FF_OVERLAY         ((AST_OVERLAY-1)<<FF_BLENDSHIFT)
+
 /// \brief Frame flags: 0 = no trans(opaque), 1-15 = transl. table
 #define FF_TRANSMASK 0xf0000
 /// \brief shift for FF_TRANSMASK
@@ -60,6 +68,21 @@
 #define FF_TRANS80 (tr_trans80<<FF_TRANSSHIFT)
 #define FF_TRANS90 (tr_trans90<<FF_TRANSSHIFT)
 
+/// \brief Frame flags: brightness mask
+#define FF_BRIGHTMASK	0x00300000
+/// \brief Frame flags: frame always appears full bright
+#define FF_FULLBRIGHT	0x00100000
+/// \brief Frame flags: frame always appears full darkness
+#define FF_FULLDARK		0x00200000
+/// \brief Frame flags: frame appears between sector bright and full bright
+#define FF_SEMIBRIGHT	(FF_FULLBRIGHT|FF_FULLDARK)
+
+/// \brief mobj_t.lightlevel is absolute instead of relative
+#define FF_ABSOLUTELIGHTLEVEL 0x00400000
+
+/// \brief Frame flags: Simple stateless animation
+#define FF_ANIMATE 0x10000000
+
 /**	\brief translucency tables
 
 	\todo add another asm routine which use the fg and bg indexes in the
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 3c1b1c2f2..f53843838 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -24,6 +24,7 @@
 #include "r_fps.h"
 #include "r_things.h"
 #include "r_state.h"
+#include "r_skins.h"
 #include "w_wad.h"
 #include "y_inter.h"
 #include "z_zone.h"
@@ -34,7 +35,6 @@
 #include "p_slopes.h"
 
 savedata_t savedata;
-UINT8 *save_p;
 
 // Block UINT32s to attempt to ensure that the correct data is
 // being sent and received
@@ -60,45 +60,45 @@ typedef enum
 //
 // P_ArchivePlayer
 //
-static inline void P_ArchivePlayer(void)
+static inline void P_ArchivePlayer(savebuffer_t *save)
 {
 	const player_t *player = &players[consoleplayer];
 	INT32 pllives = player->lives;
 	if (pllives < 3) // Bump up to 3 lives if the player
 		pllives = 3; // has less than that.
 
-	WRITEUINT8(save_p, player->skincolor);
-	WRITEUINT8(save_p, player->skin);
+	WRITEUINT8(save->p, player->skincolor);
+	WRITEUINT8(save->p, player->skin);
 
-	WRITEUINT32(save_p, player->score);
-	WRITEINT32(save_p, pllives);
-	WRITEINT32(save_p, player->continues);
+	WRITEUINT32(save->p, player->score);
+	WRITEINT32(save->p, pllives);
+	WRITEINT32(save->p, player->continues);
 
 	if (botskin)
 	{
-		WRITEUINT8(save_p, botskin);
-		WRITEUINT8(save_p, botcolor);
+		WRITEUINT8(save->p, botskin);
+		WRITEUINT8(save->p, botcolor);
 	}
 }
 
 //
 // P_UnArchivePlayer
 //
-static inline void P_UnArchivePlayer(void)
+static inline void P_UnArchivePlayer(savebuffer_t *save)
 {
-	savedata.skincolor = READUINT8(save_p);
-	savedata.skin = READUINT8(save_p);
+	savedata.skincolor = READUINT8(save->p);
+	savedata.skin = READUINT8(save->p);
 
-	savedata.score = READINT32(save_p);
-	savedata.lives = READINT32(save_p);
-	savedata.continues = READINT32(save_p);
+	savedata.score = READINT32(save->p);
+	savedata.lives = READINT32(save->p);
+	savedata.continues = READINT32(save->p);
 
 	if (savedata.botcolor)
 	{
-		savedata.botskin = READUINT8(save_p);
+		savedata.botskin = READUINT8(save->p);
 		if (savedata.botskin-1 >= numskins)
 			savedata.botskin = 0;
-		savedata.botcolor = READUINT8(save_p);
+		savedata.botcolor = READUINT8(save->p);
 	}
 	else
 		savedata.botskin = 0;
@@ -107,136 +107,135 @@ static inline void P_UnArchivePlayer(void)
 //
 // P_NetArchivePlayers
 //
-static void P_NetArchivePlayers(boolean resending)
+static void P_NetArchivePlayers(savebuffer_t *save, boolean resending)
 {
 	INT32 i, j;
 	UINT16 flags;
 //	size_t q;
 
-	WRITEUINT32(save_p, ARCHIVEBLOCK_PLAYERS);
+	WRITEUINT32(save->p, ARCHIVEBLOCK_PLAYERS);
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		if (resending)
-			WRITESINT8(save_p, (SINT8)adminplayers[i]);
+			WRITESINT8(save->p, (SINT8)adminplayers[i]);
 
 		if (!playeringame[i])
 			continue;
 
 		flags = 0;
 
-		// no longer send ticcmds, player name, skin, or color
+		// no longer send ticcmds
 
 		if (resending)
-			WRITESTRINGN(save_p, player_names[i], MAXPLAYERNAME);
+			WRITESTRINGN(save->p, player_names[i], MAXPLAYERNAME);
 
-		WRITEANGLE(save_p, players[i].aiming);
-		WRITEANGLE(save_p, players[i].awayviewaiming);
-		WRITEINT32(save_p, players[i].awayviewtics);
-		WRITEINT32(save_p, players[i].health);
+		WRITEANGLE(save->p, players[i].aiming);
+		WRITEANGLE(save->p, players[i].awayviewaiming);
+		WRITEINT32(save->p, players[i].awayviewtics);
+		WRITEINT32(save->p, players[i].health);
 
-		WRITESINT8(save_p, players[i].pity);
-		WRITEINT32(save_p, players[i].currentweapon);
-		WRITEINT32(save_p, players[i].ringweapons);
+		WRITESINT8(save->p, players[i].pity);
+		WRITEINT32(save->p, players[i].currentweapon);
+		WRITEINT32(save->p, players[i].ringweapons);
 
 		for (j = 0; j < NUMPOWERS; j++)
-			WRITEUINT16(save_p, players[i].powers[j]);
+			WRITEUINT16(save->p, players[i].powers[j]);
 		for (j = 0; j < NUMKARTSTUFF; j++)
-			WRITEINT32(save_p, players[i].kartstuff[j]);
+			WRITEINT32(save->p, players[i].kartstuff[j]);
 
-		WRITEANGLE(save_p, players[i].frameangle);
+		WRITEANGLE(save->p, players[i].frameangle);
 
-		WRITEUINT8(save_p, players[i].playerstate);
-		WRITEUINT32(save_p, players[i].pflags);
-		WRITEUINT8(save_p, players[i].panim);
-		WRITEUINT8(save_p, players[i].spectator);
+		WRITEUINT8(save->p, players[i].playerstate);
+		WRITEUINT32(save->p, players[i].pflags);
+		WRITEUINT8(save->p, players[i].panim);
+		WRITEUINT8(save->p, players[i].spectator);
 
-		WRITEUINT16(save_p, players[i].flashpal);
-		WRITEUINT16(save_p, players[i].flashcount);
+		WRITEUINT16(save->p, players[i].flashpal);
+		WRITEUINT16(save->p, players[i].flashcount);
 
 		if (resending)
 		{
-			WRITEUINT8(save_p, players[i].skincolor);
-			WRITEINT32(save_p, players[i].skin);
+			WRITEUINT8(save->p, players[i].skincolor);
+			WRITEINT32(save->p, players[i].skin);
 		}
 
-
-		WRITEUINT32(save_p, players[i].score);
-		WRITEFIXED(save_p, players[i].dashspeed);
-		WRITEINT32(save_p, players[i].dashtime);
-		WRITESINT8(save_p, players[i].lives);
-		WRITESINT8(save_p, players[i].continues);
-		WRITESINT8(save_p, players[i].xtralife);
-		WRITEUINT8(save_p, players[i].gotcontinue);
-		WRITEFIXED(save_p, players[i].speed);
-		WRITEUINT8(save_p, players[i].jumping);
-		WRITEUINT8(save_p, players[i].secondjump);
-		WRITEUINT8(save_p, players[i].fly1);
-		WRITEUINT8(save_p, players[i].scoreadd);
-		WRITEUINT32(save_p, players[i].glidetime);
-		WRITEUINT8(save_p, players[i].climbing);
-		WRITEINT32(save_p, players[i].deadtimer);
-		WRITEUINT32(save_p, players[i].exiting);
-		WRITEUINT8(save_p, players[i].homing);
-		WRITEUINT32(save_p, players[i].skidtime);
+		WRITEUINT32(save->p, players[i].score);
+		WRITEFIXED(save->p, players[i].dashspeed);
+		WRITEINT32(save->p, players[i].dashtime);
+		WRITESINT8(save->p, players[i].lives);
+		WRITESINT8(save->p, players[i].continues);
+		WRITESINT8(save->p, players[i].xtralife);
+		WRITEUINT8(save->p, players[i].gotcontinue);
+		WRITEFIXED(save->p, players[i].speed);
+		WRITEUINT8(save->p, players[i].jumping);
+		WRITEUINT8(save->p, players[i].secondjump);
+		WRITEUINT8(save->p, players[i].fly1);
+		WRITEUINT8(save->p, players[i].scoreadd);
+		WRITEUINT32(save->p, players[i].glidetime);
+		WRITEUINT8(save->p, players[i].climbing);
+		WRITEINT32(save->p, players[i].deadtimer);
+		WRITEUINT32(save->p, players[i].exiting);
+		WRITEUINT8(save->p, players[i].homing);
+		WRITEUINT32(save->p, players[i].skidtime);
 
 		////////////////////////////
 		// Conveyor Belt Movement //
 		////////////////////////////
-		WRITEFIXED(save_p, players[i].cmomx); // Conveyor momx
-		WRITEFIXED(save_p, players[i].cmomy); // Conveyor momy
-		WRITEFIXED(save_p, players[i].rmomx); // "Real" momx (momx - cmomx)
-		WRITEFIXED(save_p, players[i].rmomy); // "Real" momy (momy - cmomy)
+		WRITEFIXED(save->p, players[i].cmomx); // Conveyor momx
+		WRITEFIXED(save->p, players[i].cmomy); // Conveyor momy
+		WRITEFIXED(save->p, players[i].rmomx); // "Real" momx (momx - cmomx)
+		WRITEFIXED(save->p, players[i].rmomy); // "Real" momy (momy - cmomy)
 
 		/////////////////////
 		// Race Mode Stuff //
 		/////////////////////
-		WRITEINT16(save_p, players[i].numboxes);
-		WRITEINT16(save_p, players[i].totalring);
-		WRITEUINT32(save_p, players[i].realtime);
-		WRITEUINT8(save_p, players[i].laps);
+		WRITEINT16(save->p, players[i].numboxes);
+		WRITEINT16(save->p, players[i].totalring);
+		WRITEUINT32(save->p, players[i].realtime);
+		WRITEUINT8(save->p, players[i].laps);
 
 		////////////////////
 		// CTF Mode Stuff //
 		////////////////////
-		WRITEINT32(save_p, players[i].ctfteam);
-		WRITEUINT16(save_p, players[i].gotflag);
+		WRITEINT32(save->p, players[i].ctfteam);
+		WRITEUINT16(save->p, players[i].gotflag);
 
-		WRITEINT32(save_p, players[i].weapondelay);
-		WRITEINT32(save_p, players[i].tossdelay);
+		WRITEINT32(save->p, players[i].weapondelay);
+		WRITEINT32(save->p, players[i].tossdelay);
 
-		WRITEUINT32(save_p, players[i].starposttime);
-		WRITEINT16(save_p, players[i].starpostx);
-		WRITEINT16(save_p, players[i].starposty);
-		WRITEINT16(save_p, players[i].starpostz);
-		WRITEINT32(save_p, players[i].starpostnum);
-		WRITEANGLE(save_p, players[i].starpostangle);
+		WRITEUINT32(save->p, players[i].starposttime);
+		WRITEINT16(save->p, players[i].starpostx);
+		WRITEINT16(save->p, players[i].starposty);
+		WRITEINT16(save->p, players[i].starpostz);
+		WRITEINT32(save->p, players[i].starpostnum);
+		WRITEANGLE(save->p, players[i].starpostangle);
 
-		WRITEANGLE(save_p, players[i].angle_pos);
-		WRITEANGLE(save_p, players[i].old_angle_pos);
+		WRITEANGLE(save->p, players[i].angle_pos);
+		WRITEANGLE(save->p, players[i].old_angle_pos);
 
-		WRITEINT32(save_p, players[i].flyangle);
-		WRITEUINT32(save_p, players[i].drilltimer);
-		WRITEINT32(save_p, players[i].linkcount);
-		WRITEUINT32(save_p, players[i].linktimer);
-		WRITEINT32(save_p, players[i].anotherflyangle);
-		WRITEUINT32(save_p, players[i].nightstime);
-		WRITEUINT32(save_p, players[i].bumpertime);
-		WRITEINT32(save_p, players[i].drillmeter);
-		WRITEUINT8(save_p, players[i].drilldelay);
-		WRITEUINT8(save_p, players[i].bonustime);
-		WRITEUINT8(save_p, players[i].mare);
+		WRITEINT32(save->p, players[i].flyangle);
+		WRITEUINT32(save->p, players[i].drilltimer);
+		WRITEINT32(save->p, players[i].linkcount);
+		WRITEUINT32(save->p, players[i].linktimer);
+		WRITEINT32(save->p, players[i].anotherflyangle);
+		WRITEUINT32(save->p, players[i].nightstime);
+		WRITEUINT32(save->p, players[i].bumpertime);
+		WRITEINT32(save->p, players[i].drillmeter);
+		WRITEUINT8(save->p, players[i].drilldelay);
+		WRITEUINT8(save->p, players[i].bonustime);
+		WRITEUINT8(save->p, players[i].mare);
 
-		WRITEUINT32(save_p, players[i].marebegunat);
-		WRITEUINT32(save_p, players[i].startedtime);
-		WRITEUINT32(save_p, players[i].finishedtime);
-		WRITEINT16(save_p, players[i].finishedrings);
-		WRITEUINT32(save_p, players[i].marescore);
-		WRITEUINT32(save_p, players[i].lastmarescore);
-		WRITEUINT8(save_p, players[i].lastmare);
-		WRITEINT32(save_p, players[i].maxlink);
-		WRITEUINT8(save_p, players[i].texttimer);
-		WRITEUINT8(save_p, players[i].textvar);
+		WRITEUINT32(save->p, players[i].marebegunat);
+		WRITEUINT32(save->p, players[i].startedtime);
+		WRITEUINT32(save->p, players[i].finishedtime);
+		WRITEINT16(save->p, players[i].finishedrings);
+		WRITEUINT32(save->p, players[i].marescore);
+		WRITEUINT32(save->p, players[i].lastmarescore);
+		WRITEUINT8(save->p, players[i].lastmare);
+		WRITEINT32(save->p, players[i].maxlink);
+		WRITEUINT8(save->p, players[i].texttimer);
+		WRITEUINT8(save->p, players[i].textvar);
 
 		if (players[i].capsule)
 			flags |= CAPSULE;
@@ -250,47 +249,47 @@ static void P_NetArchivePlayers(boolean resending)
 		if (players[i].axis2)
 			flags |= SECONDAXIS;
 
-		WRITEINT16(save_p, players[i].lastsidehit);
-		WRITEINT16(save_p, players[i].lastlinehit);
+		WRITEINT16(save->p, players[i].lastsidehit);
+		WRITEINT16(save->p, players[i].lastlinehit);
 
-		WRITEUINT32(save_p, players[i].losstime);
+		WRITEUINT32(save->p, players[i].losstime);
 
-		WRITEUINT8(save_p, players[i].timeshit);
+		WRITEUINT8(save->p, players[i].timeshit);
 
-		WRITEINT32(save_p, players[i].onconveyor);
+		WRITEINT32(save->p, players[i].onconveyor);
 
-		WRITEUINT32(save_p, players[i].jointime);
-		WRITEUINT32(save_p, players[i].spectatorreentry);
+		WRITEUINT32(save->p, players[i].jointime);
+		WRITEUINT32(save->p, players[i].spectatorreentry);
 
-		WRITEUINT32(save_p, players[i].grieftime);
-		WRITEUINT8(save_p, players[i].griefstrikes);
+		WRITEUINT32(save->p, players[i].grieftime);
+		WRITEUINT8(save->p, players[i].griefstrikes);
 
-		WRITEUINT8(save_p, players[i].splitscreenindex);
+		WRITEUINT8(save->p, players[i].splitscreenindex);
 
-		WRITEUINT16(save_p, flags);
+		WRITEUINT16(save->p, flags);
 
 		if (flags & CAPSULE)
-			WRITEUINT32(save_p, players[i].capsule->mobjnum);
+			WRITEUINT32(save->p, players[i].capsule->mobjnum);
 
 		if (flags & FIRSTAXIS)
-			WRITEUINT32(save_p, players[i].axis1->mobjnum);
+			WRITEUINT32(save->p, players[i].axis1->mobjnum);
 
 		if (flags & SECONDAXIS)
-			WRITEUINT32(save_p, players[i].axis2->mobjnum);
+			WRITEUINT32(save->p, players[i].axis2->mobjnum);
 
 		if (flags & AWAYVIEW)
-			WRITEUINT32(save_p, players[i].awayviewmobj->mobjnum);
+			WRITEUINT32(save->p, players[i].awayviewmobj->mobjnum);
 
-		WRITEUINT32(save_p, players[i].charflags);
+		WRITEUINT32(save->p, players[i].charflags);
 		// SRB2kart
-		WRITEUINT8(save_p, players[i].kartspeed);
-		WRITEUINT8(save_p, players[i].kartweight);
+		WRITEUINT8(save->p, players[i].kartspeed);
+		WRITEUINT8(save->p, players[i].kartweight);
 		//
 
 		for (j = 0; j < MAXPREDICTTICS; j++)
 		{
-			WRITEINT16(save_p, players[i].lturn_max[j]);
-			WRITEINT16(save_p, players[i].rturn_max[j]);
+			WRITEINT16(save->p, players[i].lturn_max[j]);
+			WRITEINT16(save->p, players[i].rturn_max[j]);
 		}
 	}
 }
@@ -298,18 +297,19 @@ static void P_NetArchivePlayers(boolean resending)
 //
 // P_NetUnArchivePlayers
 //
-static void P_NetUnArchivePlayers(boolean resending)
+static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
 {
 	INT32 i, j;
 	UINT16 flags;
 
-	if (READUINT32(save_p) != ARCHIVEBLOCK_PLAYERS)
+	if (READUINT32(save->p) != ARCHIVEBLOCK_PLAYERS)
 		I_Error("Bad $$$.sav at archive block Players");
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		if (resending)
-			adminplayers[i] = (INT32)READSINT8(save_p);
+		if (reloading)
+			adminplayers[i] = (INT32)READSINT8(save->p);
+
 		// Do NOT memset player struct to 0
 		// other areas may initialize data elsewhere
 		//memset(&players[i], 0, sizeof (player_t));
@@ -317,167 +317,169 @@ static void P_NetUnArchivePlayers(boolean resending)
 			continue;
 
 		// NOTE: sending tics should (hopefully) no longer be necessary
-		// sending player names, skin and color should not be necessary at all!
-		// (that data is handled in the server config now)
 
-		if (resending)
-			READSTRINGN(save_p, player_names[i], MAXPLAYERNAME);
+		if (reloading)
+			READSTRINGN(save->p, player_names[i], MAXPLAYERNAME);
 
-		players[i].aiming = READANGLE(save_p);
-		players[i].awayviewaiming = READANGLE(save_p);
-		players[i].awayviewtics = READINT32(save_p);
-		players[i].health = READINT32(save_p);
+		players[i].aiming = READANGLE(save->p);
+		players[i].awayviewaiming = READANGLE(save->p);
+		players[i].awayviewtics = READINT32(save->p);
+		players[i].health = READINT32(save->p);
 
-		players[i].pity = READSINT8(save_p);
-		players[i].currentweapon = READINT32(save_p);
-		players[i].ringweapons = READINT32(save_p);
+		players[i].pity = READSINT8(save->p);
+		players[i].currentweapon = READINT32(save->p);
+		players[i].ringweapons = READINT32(save->p);
 
 		for (j = 0; j < NUMPOWERS; j++)
-			players[i].powers[j] = READUINT16(save_p);
+			players[i].powers[j] = READUINT16(save->p);
 		for (j = 0; j < NUMKARTSTUFF; j++)
-			players[i].kartstuff[j] = READINT32(save_p);
+			players[i].kartstuff[j] = READINT32(save->p);
 
-		players[i].frameangle = READANGLE(save_p);
+		players[i].frameangle = READANGLE(save->p);
 
-		players[i].playerstate = READUINT8(save_p);
-		players[i].pflags = READUINT32(save_p);
-		players[i].panim = READUINT8(save_p);
-		players[i].spectator = READUINT8(save_p);
+		players[i].playerstate = READUINT8(save->p);
+		players[i].pflags = READUINT32(save->p);
+		players[i].panim = READUINT8(save->p);
+		players[i].spectator = READUINT8(save->p);
 
-		players[i].flashpal = READUINT16(save_p);
-		players[i].flashcount = READUINT16(save_p);
+		players[i].flashpal = READUINT16(save->p);
+		players[i].flashcount = READUINT16(save->p);
 
-		if (resending)
+		if (reloading)
 		{
-			players[i].skincolor = READUINT8(save_p);
-			players[i].skin = READINT32(save_p);
+			players[i].skincolor = READUINT8(save->p);
+			players[i].skin = READINT32(save->p);
 		}
 
-		players[i].score = READUINT32(save_p);
-		players[i].dashspeed = READFIXED(save_p); // dashing speed
-		players[i].dashtime = READINT32(save_p); // dashing speed
-		players[i].lives = READSINT8(save_p);
-		players[i].continues = READSINT8(save_p); // continues that player has acquired
-		players[i].xtralife = READSINT8(save_p); // Ring Extra Life counter
-		players[i].gotcontinue = READUINT8(save_p); // got continue from stage
-		players[i].speed = READFIXED(save_p); // Player's speed (distance formula of MOMX and MOMY values)
-		players[i].jumping = READUINT8(save_p); // Jump counter
-		players[i].secondjump = READUINT8(save_p);
-		players[i].fly1 = READUINT8(save_p); // Tails flying
-		players[i].scoreadd = READUINT8(save_p); // Used for multiple enemy attack bonus
-		players[i].glidetime = READUINT32(save_p); // Glide counter for thrust
-		players[i].climbing = READUINT8(save_p); // Climbing on the wall
-		players[i].deadtimer = READINT32(save_p); // End game if game over lasts too long
-		players[i].exiting = READUINT32(save_p); // Exitlevel timer
-		players[i].homing = READUINT8(save_p); // Are you homing?
-		players[i].skidtime = READUINT32(save_p); // Skid timer
+		players[i].score = READUINT32(save->p);
+		players[i].dashspeed = READFIXED(save->p); // dashing speed
+		players[i].dashtime = READINT32(save->p); // dashing speed
+		players[i].lives = READSINT8(save->p);
+		players[i].continues = READSINT8(save->p); // continues that player has acquired
+		players[i].xtralife = READSINT8(save->p); // Ring Extra Life counter
+		players[i].gotcontinue = READUINT8(save->p); // got continue from stage
+		players[i].speed = READFIXED(save->p); // Player's speed (distance formula of MOMX and MOMY values)
+		players[i].jumping = READUINT8(save->p); // Jump counter
+		players[i].secondjump = READUINT8(save->p);
+		players[i].fly1 = READUINT8(save->p); // Tails flying
+		players[i].scoreadd = READUINT8(save->p); // Used for multiple enemy attack bonus
+		players[i].glidetime = READUINT32(save->p); // Glide counter for thrust
+		players[i].climbing = READUINT8(save->p); // Climbing on the wall
+		players[i].deadtimer = READINT32(save->p); // End game if game over lasts too long
+		players[i].exiting = READUINT32(save->p); // Exitlevel timer
+		players[i].homing = READUINT8(save->p); // Are you homing?
+		players[i].skidtime = READUINT32(save->p); // Skid timer
 
 		////////////////////////////
 		// Conveyor Belt Movement //
 		////////////////////////////
-		players[i].cmomx = READFIXED(save_p); // Conveyor momx
-		players[i].cmomy = READFIXED(save_p); // Conveyor momy
-		players[i].rmomx = READFIXED(save_p); // "Real" momx (momx - cmomx)
-		players[i].rmomy = READFIXED(save_p); // "Real" momy (momy - cmomy)
+		players[i].cmomx = READFIXED(save->p); // Conveyor momx
+		players[i].cmomy = READFIXED(save->p); // Conveyor momy
+		players[i].rmomx = READFIXED(save->p); // "Real" momx (momx - cmomx)
+		players[i].rmomy = READFIXED(save->p); // "Real" momy (momy - cmomy)
 
 		/////////////////////
 		// Race Mode Stuff //
 		/////////////////////
-		players[i].numboxes = READINT16(save_p); // Number of item boxes obtained for Race Mode
-		players[i].totalring = READINT16(save_p); // Total number of rings obtained for Race Mode
-		players[i].realtime = READUINT32(save_p); // integer replacement for leveltime
-		players[i].laps = READUINT8(save_p); // Number of laps (optional)
+		players[i].numboxes = READINT16(save->p); // Number of item boxes obtained for Race Mode
+		players[i].totalring = READINT16(save->p); // Total number of rings obtained for Race Mode
+		players[i].realtime = READUINT32(save->p); // integer replacement for leveltime
+		players[i].laps = READUINT8(save->p); // Number of laps (optional)
 
 		////////////////////
 		// CTF Mode Stuff //
 		////////////////////
-		players[i].ctfteam = READINT32(save_p); // 1 == Red, 2 == Blue
-		players[i].gotflag = READUINT16(save_p); // 1 == Red, 2 == Blue Do you have the flag?
+		players[i].ctfteam = READINT32(save->p); // 1 == Red, 2 == Blue
+		players[i].gotflag = READUINT16(save->p); // 1 == Red, 2 == Blue Do you have the flag?
 
-		players[i].weapondelay = READINT32(save_p);
-		players[i].tossdelay = READINT32(save_p);
+		players[i].weapondelay = READINT32(save->p);
+		players[i].tossdelay = READINT32(save->p);
 
-		players[i].starposttime = READUINT32(save_p);
-		players[i].starpostx = READINT16(save_p);
-		players[i].starposty = READINT16(save_p);
-		players[i].starpostz = READINT16(save_p);
-		players[i].starpostnum = READINT32(save_p);
-		players[i].starpostangle = READANGLE(save_p);
+		players[i].starposttime = READUINT32(save->p);
+		players[i].starpostx = READINT16(save->p);
+		players[i].starposty = READINT16(save->p);
+		players[i].starpostz = READINT16(save->p);
+		players[i].starpostnum = READINT32(save->p);
+		players[i].starpostangle = READANGLE(save->p);
 
-		players[i].angle_pos = READANGLE(save_p);
-		players[i].old_angle_pos = READANGLE(save_p);
+		players[i].angle_pos = READANGLE(save->p);
+		players[i].old_angle_pos = READANGLE(save->p);
 
-		players[i].flyangle = READINT32(save_p);
-		players[i].drilltimer = READUINT32(save_p);
-		players[i].linkcount = READINT32(save_p);
-		players[i].linktimer = READUINT32(save_p);
-		players[i].anotherflyangle = READINT32(save_p);
-		players[i].nightstime = READUINT32(save_p);
-		players[i].bumpertime = READUINT32(save_p);
-		players[i].drillmeter = READINT32(save_p);
-		players[i].drilldelay = READUINT8(save_p);
-		players[i].bonustime = (boolean)READUINT8(save_p);
-		players[i].mare = READUINT8(save_p);
+		players[i].flyangle = READINT32(save->p);
+		players[i].drilltimer = READUINT32(save->p);
+		players[i].linkcount = READINT32(save->p);
+		players[i].linktimer = READUINT32(save->p);
+		players[i].anotherflyangle = READINT32(save->p);
+		players[i].nightstime = READUINT32(save->p);
+		players[i].bumpertime = READUINT32(save->p);
+		players[i].drillmeter = READINT32(save->p);
+		players[i].drilldelay = READUINT8(save->p);
+		players[i].bonustime = (boolean)READUINT8(save->p);
+		players[i].mare = READUINT8(save->p);
 
-		players[i].marebegunat = READUINT32(save_p);
-		players[i].startedtime = READUINT32(save_p);
-		players[i].finishedtime = READUINT32(save_p);
-		players[i].finishedrings = READINT16(save_p);
-		players[i].marescore = READUINT32(save_p);
-		players[i].lastmarescore = READUINT32(save_p);
-		players[i].lastmare = READUINT8(save_p);
-		players[i].maxlink = READINT32(save_p);
-		players[i].texttimer = READUINT8(save_p);
-		players[i].textvar = READUINT8(save_p);
+		players[i].marebegunat = READUINT32(save->p);
+		players[i].startedtime = READUINT32(save->p);
+		players[i].finishedtime = READUINT32(save->p);
+		players[i].finishedrings = READINT16(save->p);
+		players[i].marescore = READUINT32(save->p);
+		players[i].lastmarescore = READUINT32(save->p);
+		players[i].lastmare = READUINT8(save->p);
+		players[i].maxlink = READINT32(save->p);
+		players[i].texttimer = READUINT8(save->p);
+		players[i].textvar = READUINT8(save->p);
 
-		players[i].lastsidehit = READINT16(save_p);
-		players[i].lastlinehit = READINT16(save_p);
+		players[i].lastsidehit = READINT16(save->p);
+		players[i].lastlinehit = READINT16(save->p);
 
-		players[i].losstime = READUINT32(save_p);
+		players[i].losstime = READUINT32(save->p);
 
-		players[i].timeshit = READUINT8(save_p);
+		players[i].timeshit = READUINT8(save->p);
 
-		players[i].onconveyor = READINT32(save_p);
+		players[i].onconveyor = READINT32(save->p);
 
-		players[i].jointime = READUINT32(save_p);
-		players[i].spectatorreentry = READUINT32(save_p);
+		players[i].jointime = READUINT32(save->p);
+		players[i].spectatorreentry = READUINT32(save->p);
 
-		players[i].grieftime = READUINT32(save_p);
-		players[i].griefstrikes = READUINT8(save_p);
+		players[i].grieftime = READUINT32(save->p);
+		players[i].griefstrikes = READUINT8(save->p);
 
-		players[i].splitscreenindex = READUINT8(save_p);
+		players[i].splitscreenindex = READUINT8(save->p);
 
-		flags = READUINT16(save_p);
+		flags = READUINT16(save->p);
 
 		if (flags & CAPSULE)
-			players[i].capsule = (mobj_t *)(size_t)READUINT32(save_p);
+			players[i].capsule = (mobj_t *)(size_t)READUINT32(save->p);
 
 		if (flags & FIRSTAXIS)
-			players[i].axis1 = (mobj_t *)(size_t)READUINT32(save_p);
+			players[i].axis1 = (mobj_t *)(size_t)READUINT32(save->p);
 
 		if (flags & SECONDAXIS)
-			players[i].axis2 = (mobj_t *)(size_t)READUINT32(save_p);
+			players[i].axis2 = (mobj_t *)(size_t)READUINT32(save->p);
 
 		if (flags & AWAYVIEW)
-			players[i].awayviewmobj = (mobj_t *)(size_t)READUINT32(save_p);
+			players[i].awayviewmobj = (mobj_t *)(size_t)READUINT32(save->p);
 
 		players[i].viewheight = 32<<FRACBITS;
 
 		//SetPlayerSkinByNum(i, players[i].skin);
-		players[i].charflags = READUINT32(save_p);
+		players[i].charflags = READUINT32(save->p);
 		// SRB2kart
-		players[i].kartspeed = READUINT8(save_p);
-		players[i].kartweight = READUINT8(save_p);
+		players[i].kartspeed = READUINT8(save->p);
+		players[i].kartweight = READUINT8(save->p);
 		//
 
 		for (j = 0; j < MAXPREDICTTICS; j++)
 		{
-			players[i].lturn_max[j] = READINT16(save_p);
-			players[i].rturn_max[j] = READINT16(save_p);
+			players[i].lturn_max[j] = READINT16(save->p);
+			players[i].rturn_max[j] = READINT16(save->p);
 		}
 	}
 }
 
+///
+/// World Archiving
+///
+
 #define SD_FLOORHT  0x01
 #define SD_CEILHT   0x02
 #define SD_FLOORPIC 0x04
@@ -515,7 +517,7 @@ static void P_NetUnArchivePlayers(boolean resending)
 //
 // P_NetArchiveWorld
 //
-static void P_NetArchiveWorld(void)
+static void P_NetArchiveWorld(savebuffer_t *save)
 {
 	size_t i;
 	const line_t *li = lines;
@@ -530,8 +532,8 @@ static void P_NetArchiveWorld(void)
 	const sector_t *ss = sectors;
 	UINT8 diff, diff2;
 
-	WRITEUINT32(save_p, ARCHIVEBLOCK_WORLD);
-	put = save_p;
+	WRITEUINT32(save->p, ARCHIVEBLOCK_WORLD);
+	put = save->p;
 
 	for (i = 0; i < numsectors; i++, ss++, ms++)
 	{
@@ -743,13 +745,13 @@ static void P_NetArchiveWorld(void)
 	R_ClearTextureNumCache(false);
 
 	vres_Free(virt);
-	save_p = put;
+	save->p = put;
 }
 
 //
 // P_NetUnArchiveWorld
 //
-static void P_NetUnArchiveWorld(void)
+static void P_NetUnArchiveWorld(savebuffer_t *save)
 {
 	UINT16 i;
 	line_t *li;
@@ -757,10 +759,10 @@ static void P_NetUnArchiveWorld(void)
 	UINT8 *get;
 	UINT8 diff, diff2;
 
-	if (READUINT32(save_p) != ARCHIVEBLOCK_WORLD)
+	if (READUINT32(save->p) != ARCHIVEBLOCK_WORLD)
 		I_Error("Bad $$$.sav at archive block World");
 
-	get = save_p;
+	get = save->p;
 
 	for (;;)
 	{
@@ -902,7 +904,7 @@ static void P_NetUnArchiveWorld(void)
 			si->midtexture = READINT32(get);
 	}
 
-	save_p = get;
+	save->p = get;
 }
 
 //
@@ -1008,13 +1010,13 @@ static inline UINT32 SaveMobjnum(const mobj_t *mobj)
 	return 0;
 }
 
-static UINT32 SaveSector(const sector_t *sector)
+static inline UINT32 SaveSector(const sector_t *sector)
 {
 	if (sector) return (UINT32)(sector - sectors);
 	return 0xFFFFFFFF;
 }
 
-static UINT32 SaveLine(const line_t *line)
+static inline UINT32 SaveLine(const line_t *line)
 {
 	if (line) return (UINT32)(line - lines);
 	return 0xFFFFFFFF;
@@ -1026,23 +1028,20 @@ static inline UINT32 SavePlayer(const player_t *player)
 	return 0xFFFFFFFF;
 }
 
+
 //
 // SaveMobjThinker
 //
 // Saves a mobj_t thinker
 //
-static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
+static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const mobj_t *mobj = (const mobj_t *)th;
 	UINT32 diff;
 	UINT16 diff2;
 
 	// Ignore stationary hoops - these will be respawned from mapthings.
-	if (mobj->type == MT_HOOP)
-		return;
-
-	// These are NEVER saved.
-	if (mobj->type == MT_HOOPCOLLIDE)
+	if (mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE) // These are NEVER saved.
 		return;
 
 	// This hoop has already been collected.
@@ -1160,17 +1159,17 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
 	if (mobj->type == MT_HOOPCENTER)
 		diff = MD_SPAWNPOINT;
 
-	WRITEUINT8(save_p, type);
-	WRITEUINT32(save_p, diff);
+	WRITEUINT8(save->p, type);
+	WRITEUINT32(save->p, diff);
 	if (diff & MD_MORE)
-		WRITEUINT16(save_p, diff2);
+		WRITEUINT16(save->p, diff2);
 
 	// save pointer, at load time we will search this pointer to reinitilize pointers
-	WRITEUINT32(save_p, (size_t)mobj);
+	WRITEUINT32(save->p, (size_t)mobj);
 
-	WRITEFIXED(save_p, mobj->z); // Force this so 3dfloor problems don't arise.
-	WRITEFIXED(save_p, mobj->floorz);
-	WRITEFIXED(save_p, mobj->ceilingz);
+	WRITEFIXED(save->p, mobj->z); // Force this so 3dfloor problems don't arise.
+	WRITEFIXED(save->p, mobj->floorz);
+	WRITEFIXED(save->p, mobj->ceilingz);
 
 	if (diff & MD_SPAWNPOINT)
 	{
@@ -1178,102 +1177,102 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
 
 		for (z = 0; z < nummapthings; z++)
 			if (&mapthings[z] == mobj->spawnpoint)
-				WRITEUINT16(save_p, z);
+				WRITEUINT16(save->p, z);
 		if (mobj->type == MT_HOOPCENTER)
 			return;
 	}
 
 	if (diff & MD_TYPE)
-		WRITEUINT32(save_p, mobj->type);
+		WRITEUINT32(save->p, mobj->type);
 	if (diff & MD_POS)
 	{
-		WRITEFIXED(save_p, mobj->x);
-		WRITEFIXED(save_p, mobj->y);
-		WRITEANGLE(save_p, mobj->angle);
+		WRITEFIXED(save->p, mobj->x);
+		WRITEFIXED(save->p, mobj->y);
+		WRITEANGLE(save->p, mobj->angle);
 	}
 	if (diff & MD_MOM)
 	{
-		WRITEFIXED(save_p, mobj->momx);
-		WRITEFIXED(save_p, mobj->momy);
-		WRITEFIXED(save_p, mobj->momz);
+		WRITEFIXED(save->p, mobj->momx);
+		WRITEFIXED(save->p, mobj->momy);
+		WRITEFIXED(save->p, mobj->momz);
 	}
 	if (diff & MD_RADIUS)
-		WRITEFIXED(save_p, mobj->radius);
+		WRITEFIXED(save->p, mobj->radius);
 	if (diff & MD_HEIGHT)
-		WRITEFIXED(save_p, mobj->height);
+		WRITEFIXED(save->p, mobj->height);
 	if (diff & MD_FLAGS)
-		WRITEUINT32(save_p, mobj->flags);
+		WRITEUINT32(save->p, mobj->flags);
 	if (diff & MD_FLAGS2)
-		WRITEUINT32(save_p, mobj->flags2);
+		WRITEUINT32(save->p, mobj->flags2);
 	if (diff & MD_HEALTH)
-		WRITEINT32(save_p, mobj->health);
+		WRITEINT32(save->p, mobj->health);
 	if (diff & MD_RTIME)
-		WRITEINT32(save_p, mobj->reactiontime);
+		WRITEINT32(save->p, mobj->reactiontime);
 	if (diff & MD_STATE)
-		WRITEUINT16(save_p, mobj->state-states);
+		WRITEUINT16(save->p, mobj->state-states);
 	if (diff & MD_TICS)
-		WRITEINT32(save_p, mobj->tics);
+		WRITEINT32(save->p, mobj->tics);
 	if (diff & MD_SPRITE)
-		WRITEUINT16(save_p, mobj->sprite);
+		WRITEUINT16(save->p, mobj->sprite);
 	if (diff & MD_FRAME)
 	{
-		WRITEUINT32(save_p, mobj->frame);
-		WRITEUINT16(save_p, mobj->anim_duration);
+		WRITEUINT32(save->p, mobj->frame);
+		WRITEUINT16(save->p, mobj->anim_duration);
 	}
 	if (diff & MD_EFLAGS)
-		WRITEUINT16(save_p, mobj->eflags);
+		WRITEUINT16(save->p, mobj->eflags);
 	if (diff & MD_PLAYER)
-		WRITEUINT8(save_p, mobj->player-players);
+		WRITEUINT8(save->p, mobj->player-players);
 	if (diff & MD_MOVEDIR)
-		WRITEANGLE(save_p, mobj->movedir);
+		WRITEANGLE(save->p, mobj->movedir);
 	if (diff & MD_MOVECOUNT)
-		WRITEINT32(save_p, mobj->movecount);
+		WRITEINT32(save->p, mobj->movecount);
 	if (diff & MD_THRESHOLD)
-		WRITEINT32(save_p, mobj->threshold);
+		WRITEINT32(save->p, mobj->threshold);
 	if (diff & MD_LASTLOOK)
-		WRITEINT32(save_p, mobj->lastlook);
+		WRITEINT32(save->p, mobj->lastlook);
 	if (diff & MD_TARGET)
-		WRITEUINT32(save_p, mobj->target->mobjnum);
+		WRITEUINT32(save->p, mobj->target->mobjnum);
 	if (diff & MD_TRACER)
-		WRITEUINT32(save_p, mobj->tracer->mobjnum);
+		WRITEUINT32(save->p, mobj->tracer->mobjnum);
 	if (diff & MD_FRICTION)
-		WRITEFIXED(save_p, mobj->friction);
+		WRITEFIXED(save->p, mobj->friction);
 	if (diff & MD_MOVEFACTOR)
-		WRITEFIXED(save_p, mobj->movefactor);
+		WRITEFIXED(save->p, mobj->movefactor);
 	if (diff & MD_FUSE)
-		WRITEINT32(save_p, mobj->fuse);
+		WRITEINT32(save->p, mobj->fuse);
 	if (diff & MD_WATERTOP)
-		WRITEFIXED(save_p, mobj->watertop);
+		WRITEFIXED(save->p, mobj->watertop);
 	if (diff & MD_WATERBOTTOM)
-		WRITEFIXED(save_p, mobj->waterbottom);
+		WRITEFIXED(save->p, mobj->waterbottom);
 	if (diff & MD_SCALE)
-		WRITEFIXED(save_p, mobj->scale);
+		WRITEFIXED(save->p, mobj->scale);
 	if (diff & MD_DSCALE)
-		WRITEFIXED(save_p, mobj->destscale);
+		WRITEFIXED(save->p, mobj->destscale);
 	if (diff2 & MD2_SCALESPEED)
-		WRITEFIXED(save_p, mobj->scalespeed);
+		WRITEFIXED(save->p, mobj->scalespeed);
 	if (diff2 & MD2_CUSVAL)
-		WRITEINT32(save_p, mobj->cusval);
+		WRITEINT32(save->p, mobj->cusval);
 	if (diff2 & MD2_CVMEM)
-		WRITEINT32(save_p, mobj->cvmem);
+		WRITEINT32(save->p, mobj->cvmem);
 	if (diff2 & MD2_SKIN)
-		WRITEUINT8(save_p, (UINT8)((skin_t *)mobj->skin - skins));
+		WRITEUINT8(save->p, (UINT8)((skin_t *)mobj->skin - skins));
 	if (diff2 & MD2_COLOR)
-		WRITEUINT8(save_p, mobj->color);
+		WRITEUINT8(save->p, mobj->color);
 	if (diff2 & MD2_EXTVAL1)
-		WRITEINT32(save_p, mobj->extravalue1);
+		WRITEINT32(save->p, mobj->extravalue1);
 	if (diff2 & MD2_EXTVAL2)
-		WRITEINT32(save_p, mobj->extravalue2);
+		WRITEINT32(save->p, mobj->extravalue2);
 	if (diff2 & MD2_HNEXT)
-		WRITEUINT32(save_p, mobj->hnext->mobjnum);
+		WRITEUINT32(save->p, mobj->hnext->mobjnum);
 	if (diff2 & MD2_HPREV)
-		WRITEUINT32(save_p, mobj->hprev->mobjnum);
+		WRITEUINT32(save->p, mobj->hprev->mobjnum);
 	if (diff2 & MD2_SLOPE)
-		WRITEUINT16(save_p, mobj->standingslope->id);
+		WRITEUINT16(save->p, mobj->standingslope->id);
 	if (diff2 & MD2_COLORIZED)
-		WRITEUINT8(save_p, mobj->colorized);
+		WRITEUINT8(save->p, mobj->colorized);
 
-	WRITEUINT32(save_p, mobj->mobjnum);
+	WRITEUINT32(save->p, mobj->mobjnum);
 }
 
 //
@@ -1281,18 +1280,18 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a levelspecthink_t thinker
 //
-static void SaveSpecialLevelThinker(const thinker_t *th, const UINT8 type)
+static void SaveSpecialLevelThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const levelspecthink_t *ht  = (const void *)th;
 	size_t i;
-	WRITEUINT8(save_p, type);
+	WRITEUINT8(save->p, type);
 	for (i = 0; i < 16; i++)
 	{
-		WRITEFIXED(save_p, ht->vars[i]); //var[16]
-		WRITEFIXED(save_p, ht->var2s[i]); //var[16]
+		WRITEFIXED(save->p, ht->vars[i]); //var[16]
+		WRITEFIXED(save->p, ht->var2s[i]); //var[16]
 	}
-	WRITEUINT32(save_p, SaveLine(ht->sourceline));
-	WRITEUINT32(save_p, SaveSector(ht->sector));
+	WRITEUINT32(save->p, SaveLine(ht->sourceline));
+	WRITEUINT32(save->p, SaveSector(ht->sector));
 }
 
 //
@@ -1300,25 +1299,25 @@ static void SaveSpecialLevelThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a ceiling_t thinker
 //
-static void SaveCeilingThinker(const thinker_t *th, const UINT8 type)
+static void SaveCeilingThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const ceiling_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT8(save_p, ht->type);
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEFIXED(save_p, ht->bottomheight);
-	WRITEFIXED(save_p, ht->topheight);
-	WRITEFIXED(save_p, ht->speed);
-	WRITEFIXED(save_p, ht->oldspeed);
-	WRITEFIXED(save_p, ht->delay);
-	WRITEFIXED(save_p, ht->delaytimer);
-	WRITEUINT8(save_p, ht->crush);
-	WRITEINT32(save_p, ht->texture);
-	WRITEINT32(save_p, ht->direction);
-	WRITEINT32(save_p, ht->tag);
-	WRITEINT32(save_p, ht->olddirection);
-	WRITEFIXED(save_p, ht->origspeed);
-	WRITEFIXED(save_p, ht->sourceline);
+	WRITEUINT8(save->p, type);
+	WRITEUINT8(save->p, ht->type);
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEFIXED(save->p, ht->bottomheight);
+	WRITEFIXED(save->p, ht->topheight);
+	WRITEFIXED(save->p, ht->speed);
+	WRITEFIXED(save->p, ht->oldspeed);
+	WRITEFIXED(save->p, ht->delay);
+	WRITEFIXED(save->p, ht->delaytimer);
+	WRITEUINT8(save->p, ht->crush);
+	WRITEINT32(save->p, ht->texture);
+	WRITEINT32(save->p, ht->direction);
+	WRITEINT32(save->p, ht->tag);
+	WRITEINT32(save->p, ht->olddirection);
+	WRITEFIXED(save->p, ht->origspeed);
+	WRITEFIXED(save->p, ht->sourceline);
 }
 
 //
@@ -1326,20 +1325,20 @@ static void SaveCeilingThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a floormove_t thinker
 //
-static void SaveFloormoveThinker(const thinker_t *th, const UINT8 type)
+static void SaveFloormoveThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const floormove_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT8(save_p, ht->type);
-	WRITEUINT8(save_p, ht->crush);
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEINT32(save_p, ht->direction);
-	WRITEINT32(save_p, ht->texture);
-	WRITEFIXED(save_p, ht->floordestheight);
-	WRITEFIXED(save_p, ht->speed);
-	WRITEFIXED(save_p, ht->origspeed);
-	WRITEFIXED(save_p, ht->delay);
-	WRITEFIXED(save_p, ht->delaytimer);
+	WRITEUINT8(save->p, type);
+	WRITEUINT8(save->p, ht->type);
+	WRITEUINT8(save->p, ht->crush);
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEINT32(save->p, ht->direction);
+	WRITEINT32(save->p, ht->texture);
+	WRITEFIXED(save->p, ht->floordestheight);
+	WRITEFIXED(save->p, ht->speed);
+	WRITEFIXED(save->p, ht->origspeed);
+	WRITEFIXED(save->p, ht->delay);
+	WRITEFIXED(save->p, ht->delaytimer);
 }
 
 //
@@ -1347,13 +1346,13 @@ static void SaveFloormoveThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a lightflash_t thinker
 //
-static void SaveLightflashThinker(const thinker_t *th, const UINT8 type)
+static void SaveLightflashThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const lightflash_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEINT32(save_p, ht->maxlight);
-	WRITEINT32(save_p, ht->minlight);
+	WRITEUINT8(save->p, type);
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEINT32(save->p, ht->maxlight);
+	WRITEINT32(save->p, ht->minlight);
 }
 
 //
@@ -1361,16 +1360,16 @@ static void SaveLightflashThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a strobe_t thinker
 //
-static void SaveStrobeThinker(const thinker_t *th, const UINT8 type)
+static void SaveStrobeThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const strobe_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEINT32(save_p, ht->count);
-	WRITEINT32(save_p, ht->minlight);
-	WRITEINT32(save_p, ht->maxlight);
-	WRITEINT32(save_p, ht->darktime);
-	WRITEINT32(save_p, ht->brighttime);
+	WRITEUINT8(save->p, type);
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEINT32(save->p, ht->count);
+	WRITEINT32(save->p, ht->minlight);
+	WRITEINT32(save->p, ht->maxlight);
+	WRITEINT32(save->p, ht->darktime);
+	WRITEINT32(save->p, ht->brighttime);
 }
 
 //
@@ -1378,15 +1377,15 @@ static void SaveStrobeThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a glow_t thinker
 //
-static void SaveGlowThinker(const thinker_t *th, const UINT8 type)
+static void SaveGlowThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const glow_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEINT32(save_p, ht->minlight);
-	WRITEINT32(save_p, ht->maxlight);
-	WRITEINT32(save_p, ht->direction);
-	WRITEINT32(save_p, ht->speed);
+	WRITEUINT8(save->p, type);
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEINT32(save->p, ht->minlight);
+	WRITEINT32(save->p, ht->maxlight);
+	WRITEINT32(save->p, ht->direction);
+	WRITEINT32(save->p, ht->speed);
 }
 
 //
@@ -1394,15 +1393,15 @@ static void SaveGlowThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a fireflicker_t thinker
 //
-static inline void SaveFireflickerThinker(const thinker_t *th, const UINT8 type)
+static inline void SaveFireflickerThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const fireflicker_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEINT32(save_p, ht->count);
-	WRITEINT32(save_p, ht->resetcount);
-	WRITEINT32(save_p, ht->maxlight);
-	WRITEINT32(save_p, ht->minlight);
+	WRITEUINT8(save->p, type);
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEINT32(save->p, ht->count);
+	WRITEINT32(save->p, ht->resetcount);
+	WRITEINT32(save->p, ht->maxlight);
+	WRITEINT32(save->p, ht->minlight);
 }
 
 //
@@ -1410,27 +1409,27 @@ static inline void SaveFireflickerThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a elevator_t thinker
 //
-static void SaveElevatorThinker(const thinker_t *th, const UINT8 type)
+static void SaveElevatorThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const elevator_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT8(save_p, ht->type);
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEUINT32(save_p, SaveSector(ht->actionsector));
-	WRITEINT32(save_p, ht->direction);
-	WRITEFIXED(save_p, ht->floordestheight);
-	WRITEFIXED(save_p, ht->ceilingdestheight);
-	WRITEFIXED(save_p, ht->speed);
-	WRITEFIXED(save_p, ht->origspeed);
-	WRITEFIXED(save_p, ht->low);
-	WRITEFIXED(save_p, ht->high);
-	WRITEFIXED(save_p, ht->distance);
-	WRITEFIXED(save_p, ht->delay);
-	WRITEFIXED(save_p, ht->delaytimer);
-	WRITEFIXED(save_p, ht->floorwasheight);
-	WRITEFIXED(save_p, ht->ceilingwasheight);
-	WRITEUINT32(save_p, SavePlayer(ht->player)); // was dummy
-	WRITEUINT32(save_p, SaveLine(ht->sourceline));
+	WRITEUINT8(save->p, type);
+	WRITEUINT8(save->p, ht->type);
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEUINT32(save->p, SaveSector(ht->actionsector));
+	WRITEINT32(save->p, ht->direction);
+	WRITEFIXED(save->p, ht->floordestheight);
+	WRITEFIXED(save->p, ht->ceilingdestheight);
+	WRITEFIXED(save->p, ht->speed);
+	WRITEFIXED(save->p, ht->origspeed);
+	WRITEFIXED(save->p, ht->low);
+	WRITEFIXED(save->p, ht->high);
+	WRITEFIXED(save->p, ht->distance);
+	WRITEFIXED(save->p, ht->delay);
+	WRITEFIXED(save->p, ht->delaytimer);
+	WRITEFIXED(save->p, ht->floorwasheight);
+	WRITEFIXED(save->p, ht->ceilingwasheight);
+	WRITEUINT32(save->p, SavePlayer(ht->player)); // was dummy
+	WRITEUINT32(save->p, SaveLine(ht->sourceline));
 }
 
 //
@@ -1438,20 +1437,20 @@ static void SaveElevatorThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a scroll_t thinker
 //
-static inline void SaveScrollThinker(const thinker_t *th, const UINT8 type)
+static inline void SaveScrollThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const scroll_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEFIXED(save_p, ht->dx);
-	WRITEFIXED(save_p, ht->dy);
-	WRITEINT32(save_p, ht->affectee);
-	WRITEINT32(save_p, ht->control);
-	WRITEFIXED(save_p, ht->last_height);
-	WRITEFIXED(save_p, ht->vdx);
-	WRITEFIXED(save_p, ht->vdy);
-	WRITEINT32(save_p, ht->accel);
-	WRITEINT32(save_p, ht->exclusive);
-	WRITEUINT8(save_p, ht->type);
+	WRITEUINT8(save->p, type);
+	WRITEFIXED(save->p, ht->dx);
+	WRITEFIXED(save->p, ht->dy);
+	WRITEINT32(save->p, ht->affectee);
+	WRITEINT32(save->p, ht->control);
+	WRITEFIXED(save->p, ht->last_height);
+	WRITEFIXED(save->p, ht->vdx);
+	WRITEFIXED(save->p, ht->vdy);
+	WRITEINT32(save->p, ht->accel);
+	WRITEINT32(save->p, ht->exclusive);
+	WRITEUINT8(save->p, ht->type);
 }
 
 //
@@ -1459,15 +1458,15 @@ static inline void SaveScrollThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a friction_t thinker
 //
-static inline void SaveFrictionThinker(const thinker_t *th, const UINT8 type)
+static inline void SaveFrictionThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const friction_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEINT32(save_p, ht->friction);
-	WRITEINT32(save_p, ht->movefactor);
-	WRITEINT32(save_p, ht->affectee);
-	WRITEINT32(save_p, ht->referrer);
-	WRITEUINT8(save_p, ht->roverfriction);
+	WRITEUINT8(save->p, type);
+	WRITEINT32(save->p, ht->friction);
+	WRITEINT32(save->p, ht->movefactor);
+	WRITEINT32(save->p, ht->affectee);
+	WRITEINT32(save->p, ht->referrer);
+	WRITEUINT8(save->p, ht->roverfriction);
 }
 
 //
@@ -1475,23 +1474,23 @@ static inline void SaveFrictionThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a pusher_t thinker
 //
-static inline void SavePusherThinker(const thinker_t *th, const UINT8 type)
+static inline void SavePusherThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const pusher_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT8(save_p, ht->type);
-	WRITEINT32(save_p, ht->x_mag);
-	WRITEINT32(save_p, ht->y_mag);
-	WRITEINT32(save_p, ht->magnitude);
-	WRITEINT32(save_p, ht->radius);
-	WRITEINT32(save_p, ht->x);
-	WRITEINT32(save_p, ht->y);
-	WRITEINT32(save_p, ht->z);
-	WRITEINT32(save_p, ht->affectee);
-	WRITEUINT8(save_p, ht->roverpusher);
-	WRITEINT32(save_p, ht->referrer);
-	WRITEINT32(save_p, ht->exclusive);
-	WRITEINT32(save_p, ht->slider);
+	WRITEUINT8(save->p, type);
+	WRITEUINT8(save->p, ht->type);
+	WRITEINT32(save->p, ht->x_mag);
+	WRITEINT32(save->p, ht->y_mag);
+	WRITEINT32(save->p, ht->magnitude);
+	WRITEINT32(save->p, ht->radius);
+	WRITEINT32(save->p, ht->x);
+	WRITEINT32(save->p, ht->y);
+	WRITEINT32(save->p, ht->z);
+	WRITEINT32(save->p, ht->affectee);
+	WRITEUINT8(save->p, ht->roverpusher);
+	WRITEINT32(save->p, ht->referrer);
+	WRITEINT32(save->p, ht->exclusive);
+	WRITEINT32(save->p, ht->slider);
 }
 
 //
@@ -1499,13 +1498,13 @@ static inline void SavePusherThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a laserthink_t thinker
 //
-static void SaveLaserThinker(const thinker_t *th, const UINT8 type)
+static void SaveLaserThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const laserthink_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEUINT32(save_p, SaveSector(ht->sec));
-	WRITEUINT32(save_p, SaveLine(ht->sourceline));
+	WRITEUINT8(save->p, type);
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEUINT32(save->p, SaveSector(ht->sec));
+	WRITEUINT32(save->p, SaveLine(ht->sourceline));
 }
 
 //
@@ -1513,13 +1512,13 @@ static void SaveLaserThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a lightlevel_t thinker
 //
-static void SaveLightlevelThinker(const thinker_t *th, const UINT8 type)
+static void SaveLightlevelThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const lightlevel_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEINT32(save_p, ht->destlevel);
-	WRITEINT32(save_p, ht->speed);
+	WRITEUINT8(save->p, type);
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEINT32(save->p, ht->destlevel);
+	WRITEINT32(save->p, ht->speed);
 }
 
 //
@@ -1527,14 +1526,14 @@ static void SaveLightlevelThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a executor_t thinker
 //
-static void SaveExecutorThinker(const thinker_t *th, const UINT8 type)
+static void SaveExecutorThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const executor_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT32(save_p, SaveLine(ht->line));
-	WRITEUINT32(save_p, SaveMobjnum(ht->caller));
-	WRITEUINT32(save_p, SaveSector(ht->sector));
-	WRITEINT32(save_p, ht->timer);
+	WRITEUINT8(save->p, type);
+	WRITEUINT32(save->p, SaveLine(ht->line));
+	WRITEUINT32(save->p, SaveMobjnum(ht->caller));
+	WRITEUINT32(save->p, SaveSector(ht->sector));
+	WRITEINT32(save->p, ht->timer);
 }
 
 //
@@ -1542,33 +1541,32 @@ static void SaveExecutorThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a disappear_t thinker
 //
-static void SaveDisappearThinker(const thinker_t *th, const UINT8 type)
+static void SaveDisappearThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const disappear_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEUINT32(save_p, ht->appeartime);
-	WRITEUINT32(save_p, ht->disappeartime);
-	WRITEUINT32(save_p, ht->offset);
-	WRITEUINT32(save_p, ht->timer);
-	WRITEINT32(save_p, ht->affectee);
-	WRITEINT32(save_p, ht->sourceline);
-	WRITEINT32(save_p, ht->exists);
+	WRITEUINT8(save->p, type);
+	WRITEUINT32(save->p, ht->appeartime);
+	WRITEUINT32(save->p, ht->disappeartime);
+	WRITEUINT32(save->p, ht->offset);
+	WRITEUINT32(save->p, ht->timer);
+	WRITEINT32(save->p, ht->affectee);
+	WRITEINT32(save->p, ht->sourceline);
+	WRITEINT32(save->p, ht->exists);
 }
 
-
 //
 // SavePolyrotateThinker
 //
 // Saves a polyrotate_t thinker
 //
-static inline void SavePolyrotatetThinker(const thinker_t *th, const UINT8 type)
+static inline void SavePolyrotatetThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const polyrotate_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEINT32(save_p, ht->polyObjNum);
-	WRITEINT32(save_p, ht->speed);
-	WRITEINT32(save_p, ht->distance);
-	WRITEUINT8(save_p, ht->turnobjs);
+	WRITEUINT8(save->p, type);
+	WRITEINT32(save->p, ht->polyObjNum);
+	WRITEINT32(save->p, ht->speed);
+	WRITEINT32(save->p, ht->distance);
+	WRITEUINT8(save->p, ht->turnobjs);
 }
 
 //
@@ -1576,16 +1574,16 @@ static inline void SavePolyrotatetThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a polymovet_t thinker
 //
-static void SavePolymoveThinker(const thinker_t *th, const UINT8 type)
+static void SavePolymoveThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const polymove_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEINT32(save_p, ht->polyObjNum);
-	WRITEINT32(save_p, ht->speed);
-	WRITEFIXED(save_p, ht->momx);
-	WRITEFIXED(save_p, ht->momy);
-	WRITEINT32(save_p, ht->distance);
-	WRITEANGLE(save_p, ht->angle);
+	WRITEUINT8(save->p, type);
+	WRITEINT32(save->p, ht->polyObjNum);
+	WRITEINT32(save->p, ht->speed);
+	WRITEFIXED(save->p, ht->momx);
+	WRITEFIXED(save->p, ht->momy);
+	WRITEINT32(save->p, ht->distance);
+	WRITEANGLE(save->p, ht->angle);
 }
 
 //
@@ -1593,22 +1591,22 @@ static void SavePolymoveThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a polywaypoint_t thinker
 //
-static void SavePolywaypointThinker(const thinker_t *th, UINT8 type)
+static void SavePolywaypointThinker(savebuffer_t *save, const thinker_t *th, UINT8 type)
 {
 	const polywaypoint_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEINT32(save_p, ht->polyObjNum);
-	WRITEINT32(save_p, ht->speed);
-	WRITEINT32(save_p, ht->sequence);
-	WRITEINT32(save_p, ht->pointnum);
-	WRITEINT32(save_p, ht->direction);
-	WRITEUINT8(save_p, ht->comeback);
-	WRITEUINT8(save_p, ht->wrap);
-	WRITEUINT8(save_p, ht->continuous);
-	WRITEUINT8(save_p, ht->stophere);
-	WRITEFIXED(save_p, ht->diffx);
-	WRITEFIXED(save_p, ht->diffy);
-	WRITEFIXED(save_p, ht->diffz);
+	WRITEUINT8(save->p, type);
+	WRITEINT32(save->p, ht->polyObjNum);
+	WRITEINT32(save->p, ht->speed);
+	WRITEINT32(save->p, ht->sequence);
+	WRITEINT32(save->p, ht->pointnum);
+	WRITEINT32(save->p, ht->direction);
+	WRITEUINT8(save->p, ht->comeback);
+	WRITEUINT8(save->p, ht->wrap);
+	WRITEUINT8(save->p, ht->continuous);
+	WRITEUINT8(save->p, ht->stophere);
+	WRITEFIXED(save->p, ht->diffx);
+	WRITEFIXED(save->p, ht->diffy);
+	WRITEFIXED(save->p, ht->diffz);
 }
 
 //
@@ -1616,23 +1614,23 @@ static void SavePolywaypointThinker(const thinker_t *th, UINT8 type)
 //
 // Saves a polyslidedoor_t thinker
 //
-static void SavePolyslidedoorThinker(const thinker_t *th, const UINT8 type)
+static void SavePolyslidedoorThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const polyslidedoor_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEINT32(save_p, ht->polyObjNum);
-	WRITEINT32(save_p, ht->delay);
-	WRITEINT32(save_p, ht->delayCount);
-	WRITEINT32(save_p, ht->initSpeed);
-	WRITEINT32(save_p, ht->speed);
-	WRITEINT32(save_p, ht->initDistance);
-	WRITEINT32(save_p, ht->distance);
-	WRITEUINT32(save_p, ht->initAngle);
-	WRITEUINT32(save_p, ht->angle);
-	WRITEUINT32(save_p, ht->revAngle);
-	WRITEFIXED(save_p, ht->momx);
-	WRITEFIXED(save_p, ht->momy);
-	WRITEUINT8(save_p, ht->closing);
+	WRITEUINT8(save->p, type);
+	WRITEINT32(save->p, ht->polyObjNum);
+	WRITEINT32(save->p, ht->delay);
+	WRITEINT32(save->p, ht->delayCount);
+	WRITEINT32(save->p, ht->initSpeed);
+	WRITEINT32(save->p, ht->speed);
+	WRITEINT32(save->p, ht->initDistance);
+	WRITEINT32(save->p, ht->distance);
+	WRITEUINT32(save->p, ht->initAngle);
+	WRITEUINT32(save->p, ht->angle);
+	WRITEUINT32(save->p, ht->revAngle);
+	WRITEFIXED(save->p, ht->momx);
+	WRITEFIXED(save->p, ht->momy);
+	WRITEUINT8(save->p, ht->closing);
 }
 
 //
@@ -1640,68 +1638,232 @@ static void SavePolyslidedoorThinker(const thinker_t *th, const UINT8 type)
 //
 // Saves a polyswingdoor_t thinker
 //
-static void SavePolyswingdoorThinker(const thinker_t *th, const UINT8 type)
+static void SavePolyswingdoorThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const polyswingdoor_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEINT32(save_p, ht->polyObjNum);
-	WRITEINT32(save_p, ht->delay);
-	WRITEINT32(save_p, ht->delayCount);
-	WRITEINT32(save_p, ht->initSpeed);
-	WRITEINT32(save_p, ht->speed);
-	WRITEINT32(save_p, ht->initDistance);
-	WRITEINT32(save_p, ht->distance);
-	WRITEUINT8(save_p, ht->closing);
+	WRITEUINT8(save->p, type);
+	WRITEINT32(save->p, ht->polyObjNum);
+	WRITEINT32(save->p, ht->delay);
+	WRITEINT32(save->p, ht->delayCount);
+	WRITEINT32(save->p, ht->initSpeed);
+	WRITEINT32(save->p, ht->speed);
+	WRITEINT32(save->p, ht->initDistance);
+	WRITEINT32(save->p, ht->distance);
+	WRITEUINT8(save->p, ht->closing);
 }
 
-static void SavePolydisplaceThinker(const thinker_t *th, const UINT8 type)
+static void SavePolydisplaceThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
 {
 	const polydisplace_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-	WRITEINT32(save_p, ht->polyObjNum);
-	WRITEUINT32(save_p, SaveSector(ht->controlSector));
-	WRITEFIXED(save_p, ht->dx);
-	WRITEFIXED(save_p, ht->dy);
-	WRITEFIXED(save_p, ht->oldHeights);
+	WRITEUINT8(save->p, type);
+	WRITEINT32(save->p, ht->polyObjNum);
+	WRITEUINT32(save->p, SaveSector(ht->controlSector));
+	WRITEFIXED(save->p, ht->dx);
+	WRITEFIXED(save->p, ht->dy);
+	WRITEFIXED(save->p, ht->oldHeights);
 }
 
-/*
-//
-// SaveWhatThinker
-//
-// Saves a what_t thinker
-//
-static inline void SaveWhatThinker(const thinker_t *th, const UINT8 type)
-{
-	const what_t *ht = (const void *)th;
-	WRITEUINT8(save_p, type);
-}
-*/
-
 //
 // P_NetArchiveThinkers
 //
 //
-static void P_NetArchiveThinkers(void)
+static void P_NetArchiveThinkers(savebuffer_t *save)
 {
 	const thinker_t *th;
 	UINT32 numsaved = 0;
 
-	WRITEUINT32(save_p, ARCHIVEBLOCK_THINKERS);
+	WRITEUINT32(save->p, ARCHIVEBLOCK_THINKERS);
 
 	// save off the current thinkers
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (!(th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed
-		 || th->function.acp1 == (actionf_p1)P_NullPrecipThinker))
-			numsaved++;
+		if (th->function == (actionf_p1)P_RemoveThinkerDelayed)
+			continue;
 
-		if (th->function.acp1 == (actionf_p1)P_MobjThinker)
+		numsaved++;
+
+		if (th->function == (actionf_p1)P_MobjThinker)
 		{
-			SaveMobjThinker(th, tc_mobj);
+			SaveMobjThinker(save, th, tc_mobj);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_MoveCeiling)
+		{
+			SaveCeilingThinker(save, th, tc_ceiling);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_CrushCeiling)
+		{
+			SaveCeilingThinker(save, th, tc_crushceiling);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_MoveFloor)
+		{
+			SaveFloormoveThinker(save, th, tc_floor);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_LightningFlash)
+		{
+			SaveLightflashThinker(save, th, tc_flash);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_StrobeFlash)
+		{
+			SaveStrobeThinker(save, th, tc_strobe);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_Glow)
+		{
+			SaveGlowThinker(save, th, tc_glow);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_FireFlicker)
+		{
+			SaveFireflickerThinker(save, th, tc_fireflicker);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_MoveElevator)
+		{
+			SaveElevatorThinker(save, th, tc_elevator);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_ContinuousFalling)
+		{
+			SaveSpecialLevelThinker(save, th, tc_continuousfalling);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_ThwompSector)
+		{
+			SaveSpecialLevelThinker(save, th, tc_thwomp);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_NoEnemiesSector)
+		{
+			SaveSpecialLevelThinker(save, th, tc_noenemies);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_EachTimeThinker)
+		{
+			SaveSpecialLevelThinker(save, th, tc_eachtime);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_RaiseSector)
+		{
+			SaveSpecialLevelThinker(save, th, tc_raisesector);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_CameraScanner)
+		{
+			SaveElevatorThinker(save, th, tc_camerascanner);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_Scroll)
+		{
+			SaveScrollThinker(save, th, tc_scroll);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_Friction)
+		{
+			SaveFrictionThinker(save, th, tc_friction);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_Pusher)
+		{
+			SavePusherThinker(save, th, tc_pusher);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_BounceCheese)
+		{
+			SaveSpecialLevelThinker(save, th, tc_bouncecheese);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_StartCrumble)
+		{
+			SaveElevatorThinker(save, th, tc_startcrumble);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_MarioBlock)
+		{
+			SaveSpecialLevelThinker(save, th, tc_marioblock);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_MarioBlockChecker)
+		{
+			SaveSpecialLevelThinker(save, th, tc_marioblockchecker);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_SpikeSector)
+		{
+			SaveSpecialLevelThinker(save, th, tc_spikesector);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_FloatSector)
+		{
+			SaveSpecialLevelThinker(save, th, tc_floatsector);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_BridgeThinker)
+		{
+			SaveSpecialLevelThinker(save, th, tc_bridgethinker);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_LaserFlash)
+		{
+			SaveLaserThinker(save, th, tc_laserflash);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_LightFade)
+		{
+			SaveLightlevelThinker(save, th, tc_lightfade);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_ExecutorDelay)
+		{
+			SaveExecutorThinker(save, th, tc_executor);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_Disappear)
+		{
+			SaveDisappearThinker(save, th, tc_disappear);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_PolyObjRotate)
+		{
+			SavePolyrotatetThinker(save, th, tc_polyrotate);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_PolyObjMove)
+		{
+			SavePolymoveThinker(save, th, tc_polymove);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_PolyObjWaypoint)
+		{
+			SavePolywaypointThinker(save, th, tc_polywaypoint);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_PolyDoorSlide)
+		{
+			SavePolyslidedoorThinker(save, th, tc_polyslidedoor);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_PolyDoorSwing)
+		{
+			SavePolyswingdoorThinker(save, th, tc_polyswingdoor);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_PolyObjFlag)
+		{
+			SavePolymoveThinker(save, th, tc_polyflag);
+			continue;
+		}
+		else if (th->function == (actionf_p1)T_PolyObjDisplace)
+		{
+			SavePolydisplaceThinker(save, th, tc_polydisplace);
 			continue;
 		}
 #ifdef PARANOIA
+<<<<<<< HEAD
 		else if (th->function.acp1 == (actionf_p1)P_NullPrecipThinker);
 #endif
 		else if (th->function.acp1 == (actionf_p1)T_MoveCeiling)
@@ -1882,12 +2044,16 @@ static void P_NetArchiveThinkers(void)
 #ifdef PARANOIA
 		else if (th->function.acp1 != P_RemoveThinkerDelayed) // wait garbage collection
 			I_Error("unknown thinker type %p", th->function.acp1);
+=======
+		else if (th->function != (actionf_p1)P_RemoveThinkerDelayed) // wait garbage collection
+			I_Error("unknown thinker type %p", th->function);
+>>>>>>> Saturn-Next
 #endif
 	}
 
 	CONS_Debug(DBG_NETPLAY, "%u thinkers saved\n", numsaved);
 
-	WRITEUINT8(save_p, tc_end);
+	WRITEUINT8(save->p, tc_end);
 }
 
 // Now save the pointers, tracer and target, but at load time we must
@@ -1901,18 +2067,15 @@ mobj_t *P_FindNewPosition(UINT32 oldposition)
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mobj = (mobj_t *)th;
-		if (mobj->mobjnum != oldposition)
-			continue;
 
-		return mobj;
+		if (mobj->mobjnum == oldposition)
+			return mobj;
 	}
-	CONS_Debug(DBG_GAMELOGIC, "mobj not found\n");
+	CONS_Debug(DBG_GAMELOGIC, "mobj %d not found\n", oldposition);
 	return NULL;
 }
 
@@ -1922,13 +2085,13 @@ static inline mobj_t *LoadMobj(UINT32 mobjnum)
 	return (mobj_t *)(size_t)mobjnum;
 }
 
-static sector_t *LoadSector(UINT32 sector)
+static inline sector_t *LoadSector(UINT32 sector)
 {
 	if (sector >= numsectors) return NULL;
 	return &sectors[sector];
 }
 
-static line_t *LoadLine(UINT32 line)
+static inline line_t *LoadLine(UINT32 line)
 {
 	if (line >= numlines) return NULL;
 	return &lines[line];
@@ -1945,7 +2108,26 @@ static inline player_t *LoadPlayer(UINT32 player)
 //
 // Loads a mobj_t from a save game
 //
-static void LoadMobjThinker(actionf_p1 thinker)
+
+FUNCINLINE static ATTRINLINE mobj_t *AllocMobj(void)
+{
+	mobj_t *mobj;
+
+	if (mobjcache != NULL)
+	{
+		mobj = mobjcache;
+		mobjcache = mobjcache->hnext;
+		memset(mobj, 0, sizeof(*mobj));
+	}
+	else
+	{
+		mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
+	}
+
+	return mobj;
+}
+
+static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	thinker_t *next;
 	mobj_t *mobj;
@@ -1954,21 +2136,21 @@ static void LoadMobjThinker(actionf_p1 thinker)
 	INT32 i;
 	fixed_t z, floorz, ceilingz;
 
-	diff = READUINT32(save_p);
+	diff = READUINT32(save->p);
 	if (diff & MD_MORE)
-		diff2 = READUINT16(save_p);
+		diff2 = READUINT16(save->p);
 	else
 		diff2 = 0;
 
-	next = (void *)(size_t)READUINT32(save_p);
+	next = (void *)(size_t)READUINT32(save->p);
 
-	z = READFIXED(save_p); // Force this so 3dfloor problems don't arise.
-	floorz = READFIXED(save_p);
-	ceilingz = READFIXED(save_p);
+	z = READFIXED(save->p); // Force this so 3dfloor problems don't arise.
+	floorz = READFIXED(save->p);
+	ceilingz = READFIXED(save->p);
 
 	if (diff & MD_SPAWNPOINT)
 	{
-		UINT16 spawnpointnum = READUINT16(save_p);
+		UINT16 spawnpointnum = READUINT16(save->p);
 
 		if (mapthings[spawnpointnum].type == 1705 || mapthings[spawnpointnum].type == 1713) // NiGHTS Hoop special case
 		{
@@ -1976,23 +2158,22 @@ static void LoadMobjThinker(actionf_p1 thinker)
 			return;
 		}
 
-		mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
-
+		mobj = AllocMobj();
 		mobj->spawnpoint = &mapthings[spawnpointnum];
 		mapthings[spawnpointnum].mobj = mobj;
 	}
 	else
-		mobj = Z_Calloc(sizeof (*mobj), PU_LEVEL, NULL);
+		mobj = AllocMobj();
 
 	// declare this as a valid mobj as soon as possible.
-	mobj->thinker.function.acp1 = thinker;
+	mobj->thinker.function = thinker;
 
 	mobj->z = z;
 	mobj->floorz = floorz;
 	mobj->ceilingz = ceilingz;
 
 	if (diff & MD_TYPE)
-		mobj->type = READUINT32(save_p);
+		mobj->type = READUINT32(save->p);
 	else
 	{
 		for (i = 0; i < NUMMOBJTYPES; i++)
@@ -2008,12 +2189,14 @@ static void LoadMobjThinker(actionf_p1 thinker)
 		}
 		mobj->type = i;
 	}
+
 	mobj->info = &mobjinfo[mobj->type];
+
 	if (diff & MD_POS)
 	{
-		mobj->x = READFIXED(save_p);
-		mobj->y = READFIXED(save_p);
-		mobj->angle = READANGLE(save_p);
+		mobj->x = READFIXED(save->p);
+		mobj->y = READFIXED(save->p);
+		mobj->angle = READANGLE(save->p);
 	}
 	else
 	{
@@ -2021,52 +2204,53 @@ static void LoadMobjThinker(actionf_p1 thinker)
 		mobj->y = mobj->spawnpoint->y << FRACBITS;
 		mobj->angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT);
 	}
+
 	if (diff & MD_MOM)
 	{
-		mobj->momx = READFIXED(save_p);
-		mobj->momy = READFIXED(save_p);
-		mobj->momz = READFIXED(save_p);
+		mobj->momx = READFIXED(save->p);
+		mobj->momy = READFIXED(save->p);
+		mobj->momz = READFIXED(save->p);
 	} // otherwise they're zero, and the memset took care of it
 
 	if (diff & MD_RADIUS)
-		mobj->radius = READFIXED(save_p);
+		mobj->radius = READFIXED(save->p);
 	else
 		mobj->radius = mobj->info->radius;
 	if (diff & MD_HEIGHT)
-		mobj->height = READFIXED(save_p);
+		mobj->height = READFIXED(save->p);
 	else
 		mobj->height = mobj->info->height;
 	if (diff & MD_FLAGS)
-		mobj->flags = READUINT32(save_p);
+		mobj->flags = READUINT32(save->p);
 	else
 		mobj->flags = mobj->info->flags;
 	if (diff & MD_FLAGS2)
-		mobj->flags2 = READUINT32(save_p);
+		mobj->flags2 = READUINT32(save->p);
 	if (diff & MD_HEALTH)
-		mobj->health = READINT32(save_p);
+		mobj->health = READINT32(save->p);
 	else
 		mobj->health = mobj->info->spawnhealth;
 	if (diff & MD_RTIME)
-		mobj->reactiontime = READINT32(save_p);
+		mobj->reactiontime = READINT32(save->p);
 	else
 		mobj->reactiontime = mobj->info->reactiontime;
 
 	if (diff & MD_STATE)
-		mobj->state = &states[READUINT16(save_p)];
+		mobj->state = &states[READUINT16(save->p)];
 	else
 		mobj->state = &states[mobj->info->spawnstate];
 	if (diff & MD_TICS)
-		mobj->tics = READINT32(save_p);
+		mobj->tics = READINT32(save->p);
 	else
 		mobj->tics = mobj->state->tics;
 	if (diff & MD_SPRITE)
-		mobj->sprite = READUINT16(save_p);
+		mobj->sprite = READUINT16(save->p);
 	else
 		mobj->sprite = mobj->state->sprite;
 	if (diff & MD_FRAME)
 	{
-		mobj->frame = READUINT32(save_p);
-		mobj->anim_duration = READUINT16(save_p);
+		mobj->frame = READUINT32(save->p);
+		mobj->anim_duration = READUINT16(save->p);
 	}
 	else
 	{
@@ -2074,10 +2258,10 @@ static void LoadMobjThinker(actionf_p1 thinker)
 		mobj->anim_duration = (UINT16)mobj->state->var2;
 	}
 	if (diff & MD_EFLAGS)
-		mobj->eflags = READUINT16(save_p);
+		mobj->eflags = READUINT16(save->p);
 	if (diff & MD_PLAYER)
 	{
-		i = READUINT8(save_p);
+		i = READUINT8(save->p);
 		mobj->player = &players[i];
 		mobj->player->mo = mobj;
 		// added for angle prediction
@@ -2091,97 +2275,71 @@ static void LoadMobjThinker(actionf_p1 thinker)
 			localangle[3] = mobj->angle;
 	}
 	if (diff & MD_MOVEDIR)
-		mobj->movedir = READANGLE(save_p);
+		mobj->movedir = READANGLE(save->p);
 	if (diff & MD_MOVECOUNT)
-		mobj->movecount = READINT32(save_p);
+		mobj->movecount = READINT32(save->p);
 	if (diff & MD_THRESHOLD)
-		mobj->threshold = READINT32(save_p);
+		mobj->threshold = READINT32(save->p);
 	if (diff & MD_LASTLOOK)
-		mobj->lastlook = READINT32(save_p);
+		mobj->lastlook = READINT32(save->p);
 	else
 		mobj->lastlook = -1;
 	if (diff & MD_TARGET)
-		mobj->target = (mobj_t *)(size_t)READUINT32(save_p);
+		mobj->target = (mobj_t *)(size_t)READUINT32(save->p);
 	if (diff & MD_TRACER)
-		mobj->tracer = (mobj_t *)(size_t)READUINT32(save_p);
+		mobj->tracer = (mobj_t *)(size_t)READUINT32(save->p);
 	if (diff & MD_FRICTION)
-		mobj->friction = READFIXED(save_p);
+		mobj->friction = READFIXED(save->p);
 	else
 		mobj->friction = ORIG_FRICTION;
 	if (diff & MD_MOVEFACTOR)
-		mobj->movefactor = READFIXED(save_p);
+		mobj->movefactor = READFIXED(save->p);
 	else
 		mobj->movefactor = FRACUNIT; //mobj->movefactor = ORIG_FRICTION_FACTOR;
 	if (diff & MD_FUSE)
-		mobj->fuse = READINT32(save_p);
+		mobj->fuse = READINT32(save->p);
 	if (diff & MD_WATERTOP)
-		mobj->watertop = READFIXED(save_p);
+		mobj->watertop = READFIXED(save->p);
 	if (diff & MD_WATERBOTTOM)
-		mobj->waterbottom = READFIXED(save_p);
+		mobj->waterbottom = READFIXED(save->p);
 	if (diff & MD_SCALE)
-		mobj->scale = READFIXED(save_p);
+		mobj->scale = READFIXED(save->p);
 	else
 		mobj->scale = FRACUNIT;
 	if (diff & MD_DSCALE)
-		mobj->destscale = READFIXED(save_p);
+		mobj->destscale = READFIXED(save->p);
 	else
 		mobj->destscale = mobj->scale;
 	if (diff2 & MD2_SCALESPEED)
-		mobj->scalespeed = READFIXED(save_p);
+		mobj->scalespeed = READFIXED(save->p);
 	else
 		mobj->scalespeed = mapobjectscale/12;
 	if (diff2 & MD2_CUSVAL)
-		mobj->cusval = READINT32(save_p);
+		mobj->cusval = READINT32(save->p);
 	if (diff2 & MD2_CVMEM)
-		mobj->cvmem = READINT32(save_p);
+		mobj->cvmem = READINT32(save->p);
 	if (diff2 & MD2_SKIN)
-		mobj->skin = &skins[READUINT8(save_p)];
+		mobj->skin = &skins[READUINT8(save->p)];
 	if (diff2 & MD2_COLOR)
-		mobj->color = READUINT8(save_p);
+		mobj->color = READUINT8(save->p);
 	if (diff2 & MD2_EXTVAL1)
-		mobj->extravalue1 = READINT32(save_p);
+		mobj->extravalue1 = READINT32(save->p);
 	if (diff2 & MD2_EXTVAL2)
-		mobj->extravalue2 = READINT32(save_p);
+		mobj->extravalue2 = READINT32(save->p);
 	if (diff2 & MD2_HNEXT)
-		mobj->hnext = (mobj_t *)(size_t)READUINT32(save_p);
+		mobj->hnext = (mobj_t *)(size_t)READUINT32(save->p);
 	if (diff2 & MD2_HPREV)
-		mobj->hprev = (mobj_t *)(size_t)READUINT32(save_p);
+		mobj->hprev = (mobj_t *)(size_t)READUINT32(save->p);
 	if (diff2 & MD2_SLOPE)
-		mobj->standingslope = P_SlopeById(READUINT16(save_p));
+		mobj->standingslope = P_SlopeById(READUINT16(save->p));
 	if (diff2 & MD2_COLORIZED)
-		mobj->colorized = READUINT8(save_p);
+		mobj->colorized = READUINT8(save->p);
 
 	//{ Saturn stuff, needs to be set, but shouldnt be synched
-
-	// Sprite Rotation
-	mobj->rollangle = 0;
-	mobj->pitch = 0;
-	mobj->roll = 0;
-	mobj->sloperoll = 0;
-	mobj->slopepitch = 0;
-	mobj->pitch_sprite = 0;
-	mobj->roll_sprite = 0;
-
-	// Horizontal flip
-	mobj->mirrored = 0;
-
 	// Sprite Rendering stuff
-	mobj->spritexoffset = 0;
-	mobj->spriteyoffset = 0;
-	mobj->spritexscale = FRACUNIT;
-	mobj->spriteyscale = FRACUNIT;
-	mobj->realxscale = FRACUNIT;
-	mobj->realyscale = FRACUNIT;
-	mobj->stretchslam = 0;
-
-	mobj->stretchslam = 0;
-	mobj->slamsoundtimer = 0;
-
-	mobj->mirrored = 0;
-
-	// Timer for slam sound effect
-	mobj->slamsoundtimer = 0;
-
+	mobj->blendmode = AST_TRANSLUCENT;
+	mobj->spritexscale = mobj->realxscale = FRACUNIT;
+	mobj->spriteyscale = mobj->realyscale = FRACUNIT;
 	//}
 
 	if (diff & MD_REDFLAG)
@@ -2198,7 +2356,7 @@ static void LoadMobjThinker(actionf_p1 thinker)
 	// set sprev, snext, bprev, bnext, subsector
 	P_SetThingPosition(mobj);
 
-	mobj->mobjnum = READUINT32(save_p);
+	mobj->mobjnum = READUINT32(save->p);
 
 	if (mobj->player)
 	{
@@ -2237,18 +2395,18 @@ static void LoadMobjThinker(actionf_p1 thinker)
 //		2 - Ceiling Only
 //		3 - Both
 //
-static void LoadSpecialLevelThinker(actionf_p1 thinker, UINT8 floorOrCeiling)
+static void LoadSpecialLevelThinker(savebuffer_t *save, actionf_p1 thinker, UINT8 floorOrCeiling)
 {
 	levelspecthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
 	size_t i;
-	ht->thinker.function.acp1 = thinker;
+	ht->thinker.function = thinker;
 	for (i = 0; i < 16; i++)
 	{
-		ht->vars[i] = READFIXED(save_p); //var[16]
-		ht->var2s[i] = READFIXED(save_p); //var[16]
+		ht->vars[i] = READFIXED(save->p); //var[16]
+		ht->var2s[i] = READFIXED(save->p); //var[16]
 	}
-	ht->sourceline = LoadLine(READUINT32(save_p));
-	ht->sector = LoadSector(READUINT32(save_p));
+	ht->sourceline = LoadLine(READUINT32(save->p));
+	ht->sector = LoadSector(READUINT32(save->p));
 
 	if (ht->sector)
 	{
@@ -2266,25 +2424,25 @@ static void LoadSpecialLevelThinker(actionf_p1 thinker, UINT8 floorOrCeiling)
 //
 // Loads a ceiling_t from a save game
 //
-static void LoadCeilingThinker(actionf_p1 thinker)
+static void LoadCeilingThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	ceiling_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->type = READUINT8(save_p);
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->bottomheight = READFIXED(save_p);
-	ht->topheight = READFIXED(save_p);
-	ht->speed = READFIXED(save_p);
-	ht->oldspeed = READFIXED(save_p);
-	ht->delay = READFIXED(save_p);
-	ht->delaytimer = READFIXED(save_p);
-	ht->crush = READUINT8(save_p);
-	ht->texture = READINT32(save_p);
-	ht->direction = READINT32(save_p);
-	ht->tag = READINT32(save_p);
-	ht->olddirection = READINT32(save_p);
-	ht->origspeed = READFIXED(save_p);
-	ht->sourceline = READFIXED(save_p);
+	ht->thinker.function = thinker;
+	ht->type = READUINT8(save->p);
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->bottomheight = READFIXED(save->p);
+	ht->topheight = READFIXED(save->p);
+	ht->speed = READFIXED(save->p);
+	ht->oldspeed = READFIXED(save->p);
+	ht->delay = READFIXED(save->p);
+	ht->delaytimer = READFIXED(save->p);
+	ht->crush = READUINT8(save->p);
+	ht->texture = READINT32(save->p);
+	ht->direction = READINT32(save->p);
+	ht->tag = READINT32(save->p);
+	ht->olddirection = READINT32(save->p);
+	ht->origspeed = READFIXED(save->p);
+	ht->sourceline = READFIXED(save->p);
 	if (ht->sector)
 		ht->sector->ceilingdata = ht;
 	P_AddThinker(&ht->thinker);
@@ -2295,20 +2453,20 @@ static void LoadCeilingThinker(actionf_p1 thinker)
 //
 // Loads a floormove_t from a save game
 //
-static void LoadFloormoveThinker(actionf_p1 thinker)
+static void LoadFloormoveThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	floormove_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->type = READUINT8(save_p);
-	ht->crush = READUINT8(save_p);
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->direction = READINT32(save_p);
-	ht->texture = READINT32(save_p);
-	ht->floordestheight = READFIXED(save_p);
-	ht->speed = READFIXED(save_p);
-	ht->origspeed = READFIXED(save_p);
-	ht->delay = READFIXED(save_p);
-	ht->delaytimer = READFIXED(save_p);
+	ht->thinker.function = thinker;
+	ht->type = READUINT8(save->p);
+	ht->crush = READUINT8(save->p);
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->direction = READINT32(save->p);
+	ht->texture = READINT32(save->p);
+	ht->floordestheight = READFIXED(save->p);
+	ht->speed = READFIXED(save->p);
+	ht->origspeed = READFIXED(save->p);
+	ht->delay = READFIXED(save->p);
+	ht->delaytimer = READFIXED(save->p);
 	if (ht->sector)
 		ht->sector->floordata = ht;
 	P_AddThinker(&ht->thinker);
@@ -2319,13 +2477,13 @@ static void LoadFloormoveThinker(actionf_p1 thinker)
 //
 // Loads a lightflash_t from a save game
 //
-static void LoadLightflashThinker(actionf_p1 thinker)
+static void LoadLightflashThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	lightflash_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->maxlight = READINT32(save_p);
-	ht->minlight = READINT32(save_p);
+	ht->thinker.function = thinker;
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->maxlight = READINT32(save->p);
+	ht->minlight = READINT32(save->p);
 	if (ht->sector)
 		ht->sector->lightingdata = ht;
 	P_AddThinker(&ht->thinker);
@@ -2336,16 +2494,16 @@ static void LoadLightflashThinker(actionf_p1 thinker)
 //
 // Loads a strobe_t from a save game
 //
-static void LoadStrobeThinker(actionf_p1 thinker)
+static void LoadStrobeThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	strobe_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->count = READINT32(save_p);
-	ht->minlight = READINT32(save_p);
-	ht->maxlight = READINT32(save_p);
-	ht->darktime = READINT32(save_p);
-	ht->brighttime = READINT32(save_p);
+	ht->thinker.function = thinker;
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->count = READINT32(save->p);
+	ht->minlight = READINT32(save->p);
+	ht->maxlight = READINT32(save->p);
+	ht->darktime = READINT32(save->p);
+	ht->brighttime = READINT32(save->p);
 	if (ht->sector)
 		ht->sector->lightingdata = ht;
 	P_AddThinker(&ht->thinker);
@@ -2356,15 +2514,15 @@ static void LoadStrobeThinker(actionf_p1 thinker)
 //
 // Loads a glow_t from a save game
 //
-static void LoadGlowThinker(actionf_p1 thinker)
+static void LoadGlowThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	glow_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->minlight = READINT32(save_p);
-	ht->maxlight = READINT32(save_p);
-	ht->direction = READINT32(save_p);
-	ht->speed = READINT32(save_p);
+	ht->thinker.function = thinker;
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->minlight = READINT32(save->p);
+	ht->maxlight = READINT32(save->p);
+	ht->direction = READINT32(save->p);
+	ht->speed = READINT32(save->p);
 	if (ht->sector)
 		ht->sector->lightingdata = ht;
 	P_AddThinker(&ht->thinker);
@@ -2375,15 +2533,15 @@ static void LoadGlowThinker(actionf_p1 thinker)
 //
 // Loads a fireflicker_t from a save game
 //
-static void LoadFireflickerThinker(actionf_p1 thinker)
+static void LoadFireflickerThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	fireflicker_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->count = READINT32(save_p);
-	ht->resetcount = READINT32(save_p);
-	ht->maxlight = READINT32(save_p);
-	ht->minlight = READINT32(save_p);
+	ht->thinker.function = thinker;
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->count = READINT32(save->p);
+	ht->resetcount = READINT32(save->p);
+	ht->maxlight = READINT32(save->p);
+	ht->minlight = READINT32(save->p);
 	if (ht->sector)
 		ht->sector->lightingdata = ht;
 	P_AddThinker(&ht->thinker);
@@ -2394,27 +2552,27 @@ static void LoadFireflickerThinker(actionf_p1 thinker)
 //
 // Loads a elevator_t from a save game
 //
-static void LoadElevatorThinker(actionf_p1 thinker, UINT8 floorOrCeiling)
+static void LoadElevatorThinker(savebuffer_t *save, actionf_p1 thinker, UINT8 floorOrCeiling)
 {
 	elevator_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->type = READUINT8(save_p);
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->actionsector = LoadSector(READUINT32(save_p));
-	ht->direction = READINT32(save_p);
-	ht->floordestheight = READFIXED(save_p);
-	ht->ceilingdestheight = READFIXED(save_p);
-	ht->speed = READFIXED(save_p);
-	ht->origspeed = READFIXED(save_p);
-	ht->low = READFIXED(save_p);
-	ht->high = READFIXED(save_p);
-	ht->distance = READFIXED(save_p);
-	ht->delay = READFIXED(save_p);
-	ht->delaytimer = READFIXED(save_p);
-	ht->floorwasheight = READFIXED(save_p);
-	ht->ceilingwasheight = READFIXED(save_p);
-	ht->player = LoadPlayer(READUINT32(save_p)); // was dummy
-	ht->sourceline = LoadLine(READUINT32(save_p));
+	ht->thinker.function = thinker;
+	ht->type = READUINT8(save->p);
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->actionsector = LoadSector(READUINT32(save->p));
+	ht->direction = READINT32(save->p);
+	ht->floordestheight = READFIXED(save->p);
+	ht->ceilingdestheight = READFIXED(save->p);
+	ht->speed = READFIXED(save->p);
+	ht->origspeed = READFIXED(save->p);
+	ht->low = READFIXED(save->p);
+	ht->high = READFIXED(save->p);
+	ht->distance = READFIXED(save->p);
+	ht->delay = READFIXED(save->p);
+	ht->delaytimer = READFIXED(save->p);
+	ht->floorwasheight = READFIXED(save->p);
+	ht->ceilingwasheight = READFIXED(save->p);
+	ht->player = LoadPlayer(READUINT32(save->p)); // was dummy
+	ht->sourceline = LoadLine(READUINT32(save->p));
 
 	if (ht->sector)
 	{
@@ -2432,20 +2590,20 @@ static void LoadElevatorThinker(actionf_p1 thinker, UINT8 floorOrCeiling)
 //
 // Loads a scroll_t from a save game
 //
-static void LoadScrollThinker(actionf_p1 thinker)
+static void LoadScrollThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	scroll_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->dx = READFIXED(save_p);
-	ht->dy = READFIXED(save_p);
-	ht->affectee = READINT32(save_p);
-	ht->control = READINT32(save_p);
-	ht->last_height = READFIXED(save_p);
-	ht->vdx = READFIXED(save_p);
-	ht->vdy = READFIXED(save_p);
-	ht->accel = READINT32(save_p);
-	ht->exclusive = READINT32(save_p);
-	ht->type = READUINT8(save_p);
+	ht->thinker.function = thinker;
+	ht->dx = READFIXED(save->p);
+	ht->dy = READFIXED(save->p);
+	ht->affectee = READINT32(save->p);
+	ht->control = READINT32(save->p);
+	ht->last_height = READFIXED(save->p);
+	ht->vdx = READFIXED(save->p);
+	ht->vdy = READFIXED(save->p);
+	ht->accel = READINT32(save->p);
+	ht->exclusive = READINT32(save->p);
+	ht->type = READUINT8(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
@@ -2454,15 +2612,15 @@ static void LoadScrollThinker(actionf_p1 thinker)
 //
 // Loads a friction_t from a save game
 //
-static inline void LoadFrictionThinker(actionf_p1 thinker)
+static inline void LoadFrictionThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	friction_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->friction = READINT32(save_p);
-	ht->movefactor = READINT32(save_p);
-	ht->affectee = READINT32(save_p);
-	ht->referrer = READINT32(save_p);
-	ht->roverfriction = READUINT8(save_p);
+	ht->thinker.function = thinker;
+	ht->friction = READINT32(save->p);
+	ht->movefactor = READINT32(save->p);
+	ht->affectee = READINT32(save->p);
+	ht->referrer = READINT32(save->p);
+	ht->roverfriction = READUINT8(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
@@ -2471,23 +2629,23 @@ static inline void LoadFrictionThinker(actionf_p1 thinker)
 //
 // Loads a pusher_t from a save game
 //
-static void LoadPusherThinker(actionf_p1 thinker)
+static void LoadPusherThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	pusher_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->type = READUINT8(save_p);
-	ht->x_mag = READINT32(save_p);
-	ht->y_mag = READINT32(save_p);
-	ht->magnitude = READINT32(save_p);
-	ht->radius = READINT32(save_p);
-	ht->x = READINT32(save_p);
-	ht->y = READINT32(save_p);
-	ht->z = READINT32(save_p);
-	ht->affectee = READINT32(save_p);
-	ht->roverpusher = READUINT8(save_p);
-	ht->referrer = READINT32(save_p);
-	ht->exclusive = READINT32(save_p);
-	ht->slider = READINT32(save_p);
+	ht->thinker.function = thinker;
+	ht->type = READUINT8(save->p);
+	ht->x_mag = READINT32(save->p);
+	ht->y_mag = READINT32(save->p);
+	ht->magnitude = READINT32(save->p);
+	ht->radius = READINT32(save->p);
+	ht->x = READINT32(save->p);
+	ht->y = READINT32(save->p);
+	ht->z = READINT32(save->p);
+	ht->affectee = READINT32(save->p);
+	ht->roverpusher = READUINT8(save->p);
+	ht->referrer = READINT32(save->p);
+	ht->exclusive = READINT32(save->p);
+	ht->slider = READINT32(save->p);
 	ht->source = P_GetPushThing(ht->affectee);
 	P_AddThinker(&ht->thinker);
 }
@@ -2497,14 +2655,14 @@ static void LoadPusherThinker(actionf_p1 thinker)
 //
 // Loads a laserthink_t from a save game
 //
-static inline void LoadLaserThinker(actionf_p1 thinker)
+static inline void LoadLaserThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	laserthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
 	ffloor_t *rover = NULL;
-	ht->thinker.function.acp1 = thinker;
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->sec = LoadSector(READUINT32(save_p));
-	ht->sourceline = LoadLine(READUINT32(save_p));
+	ht->thinker.function = thinker;
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->sec = LoadSector(READUINT32(save->p));
+	ht->sourceline = LoadLine(READUINT32(save->p));
 	for (rover = ht->sector->ffloors; rover; rover = rover->next)
 		if (rover->secnum == (size_t)(ht->sec - sectors)
 		&& rover->master == ht->sourceline)
@@ -2517,13 +2675,13 @@ static inline void LoadLaserThinker(actionf_p1 thinker)
 //
 // Loads a lightlevel_t from a save game
 //
-FUNCINLINE static ATTRINLINE void LoadLightlevelThinker(actionf_p1 thinker)
+FUNCINLINE static ATTRINLINE void LoadLightlevelThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	lightlevel_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->destlevel = READINT32(save_p);
-	ht->speed = READINT32(save_p);
+	ht->thinker.function = thinker;
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->destlevel = READINT32(save->p);
+	ht->speed = READINT32(save->p);
 	if (ht->sector)
 		ht->sector->lightingdata = ht;
 	P_AddThinker(&ht->thinker);
@@ -2534,14 +2692,14 @@ FUNCINLINE static ATTRINLINE void LoadLightlevelThinker(actionf_p1 thinker)
 //
 // Loads a executor_t from a save game
 //
-static inline void LoadExecutorThinker(actionf_p1 thinker)
+static inline void LoadExecutorThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	executor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->line = LoadLine(READUINT32(save_p));
-	ht->caller = LoadMobj(READUINT32(save_p));
-	ht->sector = LoadSector(READUINT32(save_p));
-	ht->timer = READINT32(save_p);
+	ht->thinker.function = thinker;
+	ht->line = LoadLine(READUINT32(save->p));
+	ht->caller = LoadMobj(READUINT32(save->p));
+	ht->sector = LoadSector(READUINT32(save->p));
+	ht->timer = READINT32(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
@@ -2550,34 +2708,33 @@ static inline void LoadExecutorThinker(actionf_p1 thinker)
 //
 // Loads a disappear_t thinker
 //
-static inline void LoadDisappearThinker(actionf_p1 thinker)
+static inline void LoadDisappearThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	disappear_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->appeartime = READUINT32(save_p);
-	ht->disappeartime = READUINT32(save_p);
-	ht->offset = READUINT32(save_p);
-	ht->timer = READUINT32(save_p);
-	ht->affectee = READINT32(save_p);
-	ht->sourceline = READINT32(save_p);
-	ht->exists = READINT32(save_p);
+	ht->thinker.function = thinker;
+	ht->appeartime = READUINT32(save->p);
+	ht->disappeartime = READUINT32(save->p);
+	ht->offset = READUINT32(save->p);
+	ht->timer = READUINT32(save->p);
+	ht->affectee = READINT32(save->p);
+	ht->sourceline = READINT32(save->p);
+	ht->exists = READINT32(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
-
 //
 // LoadPolyrotateThinker
 //
 // Loads a polyrotate_t thinker
 //
-static inline void LoadPolyrotatetThinker(actionf_p1 thinker)
+static inline void LoadPolyrotatetThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polyrotate_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->polyObjNum = READINT32(save_p);
-	ht->speed = READINT32(save_p);
-	ht->distance = READINT32(save_p);
-	ht->turnobjs = READUINT8(save_p);
+	ht->thinker.function = thinker;
+	ht->polyObjNum = READINT32(save->p);
+	ht->speed = READINT32(save->p);
+	ht->distance = READINT32(save->p);
+	ht->turnobjs = READUINT8(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
@@ -2586,16 +2743,16 @@ static inline void LoadPolyrotatetThinker(actionf_p1 thinker)
 //
 // Loads a polymovet_t thinker
 //
-static void LoadPolymoveThinker(actionf_p1 thinker)
+static void LoadPolymoveThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polymove_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->polyObjNum = READINT32(save_p);
-	ht->speed = READINT32(save_p);
-	ht->momx = READFIXED(save_p);
-	ht->momy = READFIXED(save_p);
-	ht->distance = READINT32(save_p);
-	ht->angle = READANGLE(save_p);
+	ht->thinker.function = thinker;
+	ht->polyObjNum = READINT32(save->p);
+	ht->speed = READINT32(save->p);
+	ht->momx = READFIXED(save->p);
+	ht->momy = READFIXED(save->p);
+	ht->distance = READINT32(save->p);
+	ht->angle = READANGLE(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
@@ -2604,22 +2761,22 @@ static void LoadPolymoveThinker(actionf_p1 thinker)
 //
 // Loads a polywaypoint_t thinker
 //
-static inline void LoadPolywaypointThinker(actionf_p1 thinker)
+static inline void LoadPolywaypointThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polywaypoint_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->polyObjNum = READINT32(save_p);
-	ht->speed = READINT32(save_p);
-	ht->sequence = READINT32(save_p);
-	ht->pointnum = READINT32(save_p);
-	ht->direction = READINT32(save_p);
-	ht->comeback = READUINT8(save_p);
-	ht->wrap = READUINT8(save_p);
-	ht->continuous = READUINT8(save_p);
-	ht->stophere = READUINT8(save_p);
-	ht->diffx = READFIXED(save_p);
-	ht->diffy = READFIXED(save_p);
-	ht->diffz = READFIXED(save_p);
+	ht->thinker.function = thinker;
+	ht->polyObjNum = READINT32(save->p);
+	ht->speed = READINT32(save->p);
+	ht->sequence = READINT32(save->p);
+	ht->pointnum = READINT32(save->p);
+	ht->direction = READINT32(save->p);
+	ht->comeback = READUINT8(save->p);
+	ht->wrap = READUINT8(save->p);
+	ht->continuous = READUINT8(save->p);
+	ht->stophere = READUINT8(save->p);
+	ht->diffx = READFIXED(save->p);
+	ht->diffy = READFIXED(save->p);
+	ht->diffz = READFIXED(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
@@ -2628,23 +2785,23 @@ static inline void LoadPolywaypointThinker(actionf_p1 thinker)
 //
 // loads a polyslidedoor_t thinker
 //
-static inline void LoadPolyslidedoorThinker(actionf_p1 thinker)
+static inline void LoadPolyslidedoorThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polyslidedoor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->polyObjNum = READINT32(save_p);
-	ht->delay = READINT32(save_p);
-	ht->delayCount = READINT32(save_p);
-	ht->initSpeed = READINT32(save_p);
-	ht->speed = READINT32(save_p);
-	ht->initDistance = READINT32(save_p);
-	ht->distance = READINT32(save_p);
-	ht->initAngle = READUINT32(save_p);
-	ht->angle = READUINT32(save_p);
-	ht->revAngle = READUINT32(save_p);
-	ht->momx = READFIXED(save_p);
-	ht->momy = READFIXED(save_p);
-	ht->closing = READUINT8(save_p);
+	ht->thinker.function = thinker;
+	ht->polyObjNum = READINT32(save->p);
+	ht->delay = READINT32(save->p);
+	ht->delayCount = READINT32(save->p);
+	ht->initSpeed = READINT32(save->p);
+	ht->speed = READINT32(save->p);
+	ht->initDistance = READINT32(save->p);
+	ht->distance = READINT32(save->p);
+	ht->initAngle = READUINT32(save->p);
+	ht->angle = READUINT32(save->p);
+	ht->revAngle = READUINT32(save->p);
+	ht->momx = READFIXED(save->p);
+	ht->momy = READFIXED(save->p);
+	ht->closing = READUINT8(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
@@ -2653,18 +2810,18 @@ static inline void LoadPolyslidedoorThinker(actionf_p1 thinker)
 //
 // Loads a polyswingdoor_t thinker
 //
-static inline void LoadPolyswingdoorThinker(actionf_p1 thinker)
+static inline void LoadPolyswingdoorThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polyswingdoor_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->polyObjNum = READINT32(save_p);
-	ht->delay = READINT32(save_p);
-	ht->delayCount = READINT32(save_p);
-	ht->initSpeed = READINT32(save_p);
-	ht->speed = READINT32(save_p);
-	ht->initDistance = READINT32(save_p);
-	ht->distance = READINT32(save_p);
-	ht->closing = READUINT8(save_p);
+	ht->thinker.function = thinker;
+	ht->polyObjNum = READINT32(save->p);
+	ht->delay = READINT32(save->p);
+	ht->delayCount = READINT32(save->p);
+	ht->initSpeed = READINT32(save->p);
+	ht->speed = READINT32(save->p);
+	ht->initDistance = READINT32(save->p);
+	ht->distance = READINT32(save->p);
+	ht->closing = READUINT8(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
@@ -2673,35 +2830,22 @@ static inline void LoadPolyswingdoorThinker(actionf_p1 thinker)
 //
 // Loads a polydisplace_t thinker
 //
-static inline void LoadPolydisplaceThinker(actionf_p1 thinker)
+static inline void LoadPolydisplaceThinker(savebuffer_t *save, actionf_p1 thinker)
 {
 	polydisplace_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-	ht->polyObjNum = READINT32(save_p);
-	ht->controlSector = LoadSector(READUINT32(save_p));
-	ht->dx = READFIXED(save_p);
-	ht->dy = READFIXED(save_p);
-	ht->oldHeights = READFIXED(save_p);
+	ht->thinker.function = thinker;
+	ht->polyObjNum = READINT32(save->p);
+	ht->controlSector = LoadSector(READUINT32(save->p));
+	ht->dx = READFIXED(save->p);
+	ht->dy = READFIXED(save->p);
+	ht->oldHeights = READFIXED(save->p);
 	P_AddThinker(&ht->thinker);
 }
 
-/*
-//
-// LoadWhatThinker
-//
-// load a what_t thinker
-//
-static inline void LoadWhatThinker(actionf_p1 thinker)
-{
-	what_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
-	ht->thinker.function.acp1 = thinker;
-}
-*/
-
 //
 // P_NetUnArchiveThinkers
 //
-static void P_NetUnArchiveThinkers(void)
+static void P_NetUnArchiveThinkers(savebuffer_t *save)
 {
 	thinker_t *currentthinker;
 	thinker_t *next;
@@ -2710,7 +2854,7 @@ static void P_NetUnArchiveThinkers(void)
 	UINT32 i;
 	UINT32 numloaded = 0;
 
-	if (READUINT32(save_p) != ARCHIVEBLOCK_THINKERS)
+	if (READUINT32(save->p) != ARCHIVEBLOCK_THINKERS)
 		I_Error("Bad $$$.sav at archive block Thinkers");
 
 	// remove all the current thinkers
@@ -2719,7 +2863,7 @@ static void P_NetUnArchiveThinkers(void)
 	{
 		next = currentthinker->next;
 
-		if (currentthinker->function.acp1 == (actionf_p1)P_MobjThinker || currentthinker->function.acp1 == (actionf_p1)P_NullPrecipThinker)
+		if (currentthinker->function == (actionf_p1)P_MobjThinker)
 			P_RemoveSavegameMobj((mobj_t *)currentthinker); // item isn't saved, don't remove it
 		else
 		{
@@ -2729,6 +2873,9 @@ static void P_NetUnArchiveThinkers(void)
 		}
 	}
 
+	// remove all the current precip thinkers
+	P_PurgePrecipitation();
+
 	// we don't want the removed mobjs to come back
 	iquetail = iquehead = 0;
 	P_InitThinkers();
@@ -2742,7 +2889,7 @@ static void P_NetUnArchiveThinkers(void)
 	// read in saved thinkers
 	for (;;)
 	{
-		tclass = READUINT8(save_p);
+		tclass = READUINT8(save->p);
 
 		if (tclass == tc_end)
 			break; // leave the saved thinker reading loop
@@ -2751,148 +2898,149 @@ static void P_NetUnArchiveThinkers(void)
 		switch (tclass)
 		{
 			case tc_mobj:
-				LoadMobjThinker((actionf_p1)P_MobjThinker);
+				LoadMobjThinker(save, (actionf_p1)P_MobjThinker);
 				break;
 
 			case tc_ceiling:
-				LoadCeilingThinker((actionf_p1)T_MoveCeiling);
+				LoadCeilingThinker(save, (actionf_p1)T_MoveCeiling);
 				break;
 
 			case tc_crushceiling:
-				LoadCeilingThinker((actionf_p1)T_CrushCeiling);
+				LoadCeilingThinker(save, (actionf_p1)T_CrushCeiling);
 				break;
 
 			case tc_floor:
-				LoadFloormoveThinker((actionf_p1)T_MoveFloor);
+				LoadFloormoveThinker(save, (actionf_p1)T_MoveFloor);
 				break;
 
 			case tc_flash:
-				LoadLightflashThinker((actionf_p1)T_LightningFlash);
+				LoadLightflashThinker(save, (actionf_p1)T_LightningFlash);
 				break;
 
 			case tc_strobe:
-				LoadStrobeThinker((actionf_p1)T_StrobeFlash);
+				LoadStrobeThinker(save, (actionf_p1)T_StrobeFlash);
 				break;
 
 			case tc_glow:
-				LoadGlowThinker((actionf_p1)T_Glow);
+				LoadGlowThinker(save, (actionf_p1)T_Glow);
 				break;
 
 			case tc_fireflicker:
-				LoadFireflickerThinker((actionf_p1)T_FireFlicker);
+				LoadFireflickerThinker(save, (actionf_p1)T_FireFlicker);
 				break;
 
 			case tc_elevator:
-				LoadElevatorThinker((actionf_p1)T_MoveElevator, 3);
+				LoadElevatorThinker(save, (actionf_p1)T_MoveElevator, 3);
 				break;
 
 			case tc_continuousfalling:
-				LoadSpecialLevelThinker((actionf_p1)T_ContinuousFalling, 3);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_ContinuousFalling, 3);
 				break;
 
 			case tc_thwomp:
-				LoadSpecialLevelThinker((actionf_p1)T_ThwompSector, 3);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_ThwompSector, 3);
 				break;
 
 			case tc_noenemies:
-				LoadSpecialLevelThinker((actionf_p1)T_NoEnemiesSector, 0);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_NoEnemiesSector, 0);
 				break;
 
 			case tc_eachtime:
-				LoadSpecialLevelThinker((actionf_p1)T_EachTimeThinker, 0);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_EachTimeThinker, 0);
 				break;
 
 			case tc_raisesector:
-				LoadSpecialLevelThinker((actionf_p1)T_RaiseSector, 0);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_RaiseSector, 0);
 				break;
 
 			/// \todo rewrite all the code that uses an elevator_t but isn't an elevator
 			/// \note working on it!
 			case tc_camerascanner:
-				LoadElevatorThinker((actionf_p1)T_CameraScanner, 0);
+				LoadElevatorThinker(save, (actionf_p1)T_CameraScanner, 0);
 				break;
 
 			case tc_bouncecheese:
-				LoadSpecialLevelThinker((actionf_p1)T_BounceCheese, 2);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_BounceCheese, 2);
 				break;
 
 			case tc_startcrumble:
-				LoadElevatorThinker((actionf_p1)T_StartCrumble, 1);
+				LoadElevatorThinker(save, (actionf_p1)T_StartCrumble, 1);
 				break;
 
 			case tc_marioblock:
-				LoadSpecialLevelThinker((actionf_p1)T_MarioBlock, 3);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_MarioBlock, 3);
 				break;
 
 			case tc_marioblockchecker:
-				LoadSpecialLevelThinker((actionf_p1)T_MarioBlockChecker, 0);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_MarioBlockChecker, 0);
 				break;
 
 			case tc_spikesector:
-				LoadSpecialLevelThinker((actionf_p1)T_SpikeSector, 0);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_SpikeSector, 0);
 				break;
 
 			case tc_floatsector:
-				LoadSpecialLevelThinker((actionf_p1)T_FloatSector, 0);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_FloatSector, 0);
 				break;
 
 			case tc_bridgethinker:
-				LoadSpecialLevelThinker((actionf_p1)T_BridgeThinker, 3);
+				LoadSpecialLevelThinker(save, (actionf_p1)T_BridgeThinker, 3);
 				break;
 
 			case tc_laserflash:
-				LoadLaserThinker((actionf_p1)T_LaserFlash);
+				LoadLaserThinker(save, (actionf_p1)T_LaserFlash);
 				break;
 
 			case tc_lightfade:
-				LoadLightlevelThinker((actionf_p1)T_LightFade);
+				LoadLightlevelThinker(save, (actionf_p1)T_LightFade);
 				break;
 
 			case tc_executor:
-				LoadExecutorThinker((actionf_p1)T_ExecutorDelay);
+				LoadExecutorThinker(save, (actionf_p1)T_ExecutorDelay);
 				restoreNum = true;
 				break;
 
 			case tc_disappear:
-				LoadDisappearThinker((actionf_p1)T_Disappear);
+				LoadDisappearThinker(save, (actionf_p1)T_Disappear);
 				break;
+
 			case tc_polyrotate:
-				LoadPolyrotatetThinker((actionf_p1)T_PolyObjRotate);
+				LoadPolyrotatetThinker(save, (actionf_p1)T_PolyObjRotate);
 				break;
 
 			case tc_polymove:
-				LoadPolymoveThinker((actionf_p1)T_PolyObjMove);
+				LoadPolymoveThinker(save, (actionf_p1)T_PolyObjMove);
 				break;
 
 			case tc_polywaypoint:
-				LoadPolywaypointThinker((actionf_p1)T_PolyObjWaypoint);
+				LoadPolywaypointThinker(save, (actionf_p1)T_PolyObjWaypoint);
 				break;
 
 			case tc_polyslidedoor:
-				LoadPolyslidedoorThinker((actionf_p1)T_PolyDoorSlide);
+				LoadPolyslidedoorThinker(save, (actionf_p1)T_PolyDoorSlide);
 				break;
 
 			case tc_polyswingdoor:
-				LoadPolyswingdoorThinker((actionf_p1)T_PolyDoorSwing);
+				LoadPolyswingdoorThinker(save, (actionf_p1)T_PolyDoorSwing);
 				break;
 
 			case tc_polyflag:
-				LoadPolymoveThinker((actionf_p1)T_PolyObjFlag);
+				LoadPolymoveThinker(save, (actionf_p1)T_PolyObjFlag);
 				break;
 
 			case tc_polydisplace:
-				LoadPolydisplaceThinker((actionf_p1)T_PolyObjDisplace);
+				LoadPolydisplaceThinker(save, (actionf_p1)T_PolyObjDisplace);
 				break;
 			case tc_scroll:
-				LoadScrollThinker((actionf_p1)T_Scroll);
+				LoadScrollThinker(save, (actionf_p1)T_Scroll);
 				break;
 
 			case tc_friction:
-				LoadFrictionThinker((actionf_p1)T_Friction);
+				LoadFrictionThinker(save, (actionf_p1)T_Friction);
 				break;
 
 			case tc_pusher:
-				LoadPusherThinker((actionf_p1)T_Pusher);
+				LoadPusherThinker(save, (actionf_p1)T_Pusher);
 				break;
 
 			default:
@@ -2909,14 +3057,13 @@ static void P_NetUnArchiveThinkers(void)
 		for (currentthinker = thinkercap.next; currentthinker != &thinkercap;
 			currentthinker = currentthinker->next)
 		{
-			if (currentthinker->function.acp1 != (actionf_p1)T_ExecutorDelay)
+			if (currentthinker->function != (actionf_p1)T_ExecutorDelay)
 				continue;
 
 			delay = (void *)currentthinker;
-			if (!(mobjnum = (UINT32)(size_t)delay->caller))
-				continue;
 
-			delay->caller = P_FindNewPosition(mobjnum);
+			if ((mobjnum = (UINT32)(size_t)delay->caller))
+				delay->caller = P_FindNewPosition(mobjnum);
 		}
 	}
 }
@@ -2928,29 +3075,29 @@ static void P_NetUnArchiveThinkers(void)
 #define PD_FLAGS  0x01
 #define PD_TRANS   0x02
 
-static inline void P_ArchivePolyObj(polyobj_t *po)
+static inline void P_ArchivePolyObj(savebuffer_t *save, polyobj_t *po)
 {
 	UINT8 diff = 0;
-	WRITEINT32(save_p, po->id);
-	WRITEANGLE(save_p, po->angle);
+	WRITEINT32(save->p, po->id);
+	WRITEANGLE(save->p, po->angle);
 
-	WRITEFIXED(save_p, po->spawnSpot.x);
-	WRITEFIXED(save_p, po->spawnSpot.y);
+	WRITEFIXED(save->p, po->spawnSpot.x);
+	WRITEFIXED(save->p, po->spawnSpot.y);
 
 	if (po->flags != po->spawnflags)
 		diff |= PD_FLAGS;
 	if (po->translucency != 0)
 		diff |= PD_TRANS;
 
-	WRITEUINT8(save_p, diff);
+	WRITEUINT8(save->p, diff);
 
 	if (diff & PD_FLAGS)
-		WRITEINT32(save_p, po->flags);
+		WRITEINT32(save->p, po->flags);
 	if (diff & PD_TRANS)
-		WRITEINT32(save_p, po->translucency);
+		WRITEINT32(save->p, po->translucency);
 }
 
-static inline void P_UnArchivePolyObj(polyobj_t *po)
+static inline void P_UnArchivePolyObj(savebuffer_t *save, polyobj_t *po)
 {
 	INT32 id;
 	UINT32 angle;
@@ -2962,19 +3109,19 @@ static inline void P_UnArchivePolyObj(polyobj_t *po)
 	// when they first start to run.
 	po->thinker = NULL;
 
-	id = READINT32(save_p);
+	id = READINT32(save->p);
 
-	angle = READANGLE(save_p);
+	angle = READANGLE(save->p);
 
-	x = READFIXED(save_p);
-	y = READFIXED(save_p);
+	x = READFIXED(save->p);
+	y = READFIXED(save->p);
 
-	diff = READUINT8(save_p);
+	diff = READUINT8(save->p);
 
 	if (diff & PD_FLAGS)
-		po->flags = READINT32(save_p);
+		po->flags = READINT32(save->p);
 	if (diff & PD_TRANS)
-		po->translucency = READINT32(save_p);
+		po->translucency = READINT32(save->p);
 
 	// if the object is bad or isn't in the id hash, we can do nothing more
 	// with it, so return now
@@ -2985,33 +3132,33 @@ static inline void P_UnArchivePolyObj(polyobj_t *po)
 	Polyobj_MoveOnLoad(po, angle, x, y);
 }
 
-static inline void P_ArchivePolyObjects(void)
+static inline void P_ArchivePolyObjects(savebuffer_t *save)
 {
 	INT32 i;
 
-	WRITEUINT32(save_p, ARCHIVEBLOCK_POBJS);
+	WRITEUINT32(save->p, ARCHIVEBLOCK_POBJS);
 
 	// save number of polyobjects
-	WRITEINT32(save_p, numPolyObjects);
+	WRITEINT32(save->p, numPolyObjects);
 
 	for (i = 0; i < numPolyObjects; ++i)
-		P_ArchivePolyObj(&PolyObjects[i]);
+		P_ArchivePolyObj(save, &PolyObjects[i]);
 }
 
-static inline void P_UnArchivePolyObjects(void)
+static inline void P_UnArchivePolyObjects(savebuffer_t *save)
 {
 	INT32 i, numSavedPolys;
 
-	if (READUINT32(save_p) != ARCHIVEBLOCK_POBJS)
+	if (READUINT32(save->p) != ARCHIVEBLOCK_POBJS)
 		I_Error("Bad $$$.sav at archive block Pobjs");
 
-	numSavedPolys = READINT32(save_p);
+	numSavedPolys = READINT32(save->p);
 
 	if (numSavedPolys != numPolyObjects)
 		I_Error("P_UnArchivePolyObjects: polyobj count inconsistency\n");
 
 	for (i = 0; i < numSavedPolys; ++i)
-		P_UnArchivePolyObj(&PolyObjects[i]);
+		P_UnArchivePolyObj(save, &PolyObjects[i]);
 }
 //
 // P_FinishMobjs
@@ -3025,37 +3172,52 @@ static inline void P_FinishMobjs(void)
 	for (currentthinker = thinkercap.next; currentthinker != &thinkercap;
 		currentthinker = currentthinker->next)
 	{
-		if (currentthinker->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (currentthinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (currentthinker->function != (actionf_p1)P_MobjThinker)
 			continue;
+
 		mobj = (mobj_t *)currentthinker;
 		mobj->info = &mobjinfo[mobj->type];
 	}
 }
 
+static inline mobj_t *RelinkMobj(mobj_t **ptr)
+{
+	UINT32 temp = (UINT32)(size_t)*ptr;
+	*ptr = NULL;
+	return P_SetTarget(ptr, P_FindNewPosition(temp));
+}
+
 static void P_RelinkPointers(void)
 {
 	thinker_t *currentthinker;
 	mobj_t *mobj;
-	UINT32 temp;
+	player_t *player;
 
 	// use info field (value = oldposition) to relink mobjs
 	for (currentthinker = thinkercap.next; currentthinker != &thinkercap;
 		currentthinker = currentthinker->next)
 	{
-		if (currentthinker->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (currentthinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (currentthinker->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mobj = (mobj_t *)currentthinker;
 
-		if (mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE || mobj->type == MT_HOOPCENTER)
+		if (UNLIKELY(mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE || mobj->type == MT_HOOPCENTER))
 			continue;
 
-		if (mobj->tracer)
+#define RELINK(obj, name) if ((obj) && !RelinkMobj(&(obj))) \
+		CONS_Debug(DBG_GAMELOGIC, name " not found on %d\n", obj->type);
+
+		RELINK(mobj->tracer, "tracer");
+		RELINK(mobj->target, "target");
+		RELINK(mobj->hnext, "hnext");
+		RELINK(mobj->hprev, "hprev");
+
+		player = mobj->player;
+
+		if (player)
 		{
+<<<<<<< HEAD
 			temp = (UINT32)(size_t)mobj->tracer;
 			mobj->tracer = NULL;
 			if (!P_SetTarget(&mobj->tracer, P_FindNewPosition(temp)))
@@ -3109,18 +3271,25 @@ static void P_RelinkPointers(void)
 			mobj->player->awayviewmobj = NULL;
 			if (!P_SetTarget(&mobj->player->awayviewmobj, P_FindNewPosition(temp)))
 				CONS_Debug(DBG_GAMELOGIC, "awayviewmobj not found on %d\n", mobj->type);
+=======
+			RELINK(player->capsule, "capsule");
+			RELINK(player->axis1, "axis1");
+			RELINK(player->axis2, "axis2");
+			RELINK(player->awayviewmobj, "awayviewmobj");
+>>>>>>> Saturn-Next
 		}
+#undef RELINK
 	}
 }
 
 //
 // P_NetArchiveSpecials
 //
-static inline void P_NetArchiveSpecials(void)
+static inline void P_NetArchiveSpecials(savebuffer_t *save)
 {
 	size_t i, z;
 
-	WRITEUINT32(save_p, ARCHIVEBLOCK_SPECIALS);
+	WRITEUINT32(save->p, ARCHIVEBLOCK_SPECIALS);
 
 	// itemrespawn queue for deathmatch
 	i = iquetail;
@@ -3130,56 +3299,56 @@ static inline void P_NetArchiveSpecials(void)
 		{
 			if (&mapthings[z] == itemrespawnque[i])
 			{
-				WRITEUINT32(save_p, z);
+				WRITEUINT32(save->p, z);
 				break;
 			}
 		}
-		WRITEUINT32(save_p, itemrespawntime[i]);
+		WRITEUINT32(save->p, itemrespawntime[i]);
 		i = (i + 1) & (ITEMQUESIZE-1);
 	}
 
 	// end delimiter
-	WRITEUINT32(save_p, 0xffffffff);
+	WRITEUINT32(save->p, 0xffffffff);
 
 	// Sky number
-	WRITEINT32(save_p, globallevelskynum);
+	WRITEINT32(save->p, globallevelskynum);
 
 	// Current global weather type
-	WRITEUINT8(save_p, globalweather);
+	WRITEUINT8(save->p, globalweather);
 
 	if (metalplayback) // Is metal sonic running?
 	{
-		WRITEUINT8(save_p, 0x01);
-		G_SaveMetal(&save_p);
+		WRITEUINT8(save->p, 0x01);
+		G_SaveMetal(&save->p);
 	}
 	else
-		WRITEUINT8(save_p, 0x00);
+		WRITEUINT8(save->p, 0x00);
 }
 
 //
 // P_NetUnArchiveSpecials
 //
-static void P_NetUnArchiveSpecials(void)
+static void P_NetUnArchiveSpecials(savebuffer_t *save)
 {
 	size_t i;
 	INT32 j;
 
-	if (READUINT32(save_p) != ARCHIVEBLOCK_SPECIALS)
+	if (READUINT32(save->p) != ARCHIVEBLOCK_SPECIALS)
 		I_Error("Bad $$$.sav at archive block Specials");
 
 	// BP: added save itemrespawn queue for deathmatch
 	iquetail = iquehead = 0;
-	while ((i = READUINT32(save_p)) != 0xffffffff)
+	while ((i = READUINT32(save->p)) != 0xffffffff)
 	{
 		itemrespawnque[iquehead] = &mapthings[i];
-		itemrespawntime[iquehead++] = READINT32(save_p);
+		itemrespawntime[iquehead++] = READINT32(save->p);
 	}
 
-	j = READINT32(save_p);
+	j = READINT32(save->p);
 	if (j != globallevelskynum)
 		P_SetupLevelSky(j, true);
 
-	globalweather = READUINT8(save_p);
+	globalweather = READUINT8(save->p);
 
 	if (globalweather)
 	{
@@ -3194,31 +3363,31 @@ static void P_NetUnArchiveSpecials(void)
 			P_SwitchWeather(globalweather);
 	}
 
-	if (READUINT8(save_p) == 0x01) // metal sonic
-		G_LoadMetal(&save_p);
+	if (READUINT8(save->p) == 0x01) // metal sonic
+		G_LoadMetal(&save->p);
 }
 
 // =======================================================================
 //          Misc
 // =======================================================================
-static inline void P_ArchiveMisc(void)
+static inline void P_ArchiveMisc(savebuffer_t *save)
 {
 	if (gamecomplete)
-		WRITEINT16(save_p, gamemap | 8192);
+		WRITEINT16(save->p, gamemap | 8192);
 	else
-		WRITEINT16(save_p, gamemap);
+		WRITEINT16(save->p, gamemap);
 
 	lastmapsaved = gamemap;
 
-	WRITEUINT16(save_p, (botskin ? (emeralds|(1<<10)) : emeralds)+357);
-	WRITESTRINGN(save_p, timeattackfolder, sizeof(timeattackfolder));
+	WRITEUINT16(save->p, (botskin ? (emeralds|(1<<10)) : emeralds)+357);
+	WRITESTRINGN(save->p, timeattackfolder, sizeof(timeattackfolder));
 }
 
-static inline void P_UnArchiveSPGame(INT16 mapoverride)
+static inline void P_UnArchiveSPGame(savebuffer_t *save, INT16 mapoverride)
 {
 	char testname[sizeof(timeattackfolder)];
 
-	gamemap = READINT16(save_p);
+	gamemap = READINT16(save->p);
 
 	if (mapoverride != 0)
 	{
@@ -3230,7 +3399,7 @@ static inline void P_UnArchiveSPGame(INT16 mapoverride)
 
 	// gamemap changed; we assume that its map header is always valid,
 	// so make it so
-	if(!mapheaderinfo[gamemap-1])
+	if (!mapheaderinfo[gamemap-1])
 		P_AllocMapHeader(gamemap-1);
 
 	lastmapsaved = gamemap;
@@ -3238,12 +3407,12 @@ static inline void P_UnArchiveSPGame(INT16 mapoverride)
 	tokenlist = 0;
 	token = 0;
 
-	savedata.emeralds = READUINT16(save_p)-357;
+	savedata.emeralds = READUINT16(save->p)-357;
 	if (savedata.emeralds & (1<<10))
 		savedata.botcolor = 0xFF;
 	savedata.emeralds &= 0xff;
 
-	READSTRINGN(save_p, testname, sizeof(testname));
+	READSTRINGN(save->p, testname, sizeof(testname));
 
 	if (strcmp(testname, timeattackfolder))
 	{
@@ -3257,120 +3426,121 @@ static inline void P_UnArchiveSPGame(INT16 mapoverride)
 	playeringame[consoleplayer] = true;
 }
 
-static void P_NetArchiveMisc(boolean resending)
+static void P_NetArchiveMisc(savebuffer_t *save, boolean resending)
 {
 	UINT32 pig = 0;
 	INT32 i;
 
-	WRITEUINT32(save_p, ARCHIVEBLOCK_MISC);
+	WRITEUINT32(save->p, ARCHIVEBLOCK_MISC);
 
 	if (resending)
-		WRITEUINT32(save_p, gametic);
+		WRITEUINT32(save->p, gametic);
+
+	WRITEINT16(save->p, gamemap);
 
-	WRITEINT16(save_p, gamemap);
 	if (gamestate != GS_LEVEL)
-		WRITEINT16(save_p, GS_WAITINGPLAYERS); // nice hack to put people back into waitingplayers
+		WRITEINT16(save->p, GS_WAITINGPLAYERS); // nice hack to put people back into waitingplayers
 	else
-		WRITEINT16(save_p, gamestate);
+		WRITEINT16(save->p, gamestate);
 
 	if (resending)
-		WRITEINT16(save_p, gametype);
+		WRITEINT16(save->p, gametype);
 
 	for (i = 0; i < MAXPLAYERS; i++)
 		pig |= (playeringame[i] != 0)<<i;
-	WRITEUINT32(save_p, pig);
+	WRITEUINT32(save->p, pig);
 
-	WRITEUINT32(save_p, P_GetRandSeed());
+	WRITEUINT32(save->p, P_GetRandSeed());
 
-	WRITEUINT32(save_p, tokenlist);
+	WRITEUINT32(save->p, tokenlist);
 
-	WRITEUINT8(save_p, encoremode);
+	WRITEUINT8(save->p, encoremode);
 
-	WRITEUINT32(save_p, leveltime);
-	WRITEUINT32(save_p, totalrings);
-	WRITEINT16(save_p, lastmap);
+	WRITEUINT32(save->p, leveltime);
+	WRITEUINT32(save->p, totalrings);
+	WRITEINT16(save->p, lastmap);
 
 	for (i = 0; i < 4; i++)
 	{
-		WRITEINT16(save_p, votelevels[i][0]);
-		WRITEINT16(save_p, votelevels[i][1]);
+		WRITEINT16(save->p, votelevels[i][0]);
+		WRITEINT16(save->p, votelevels[i][1]);
 	}
 
 	for (i = 0; i < MAXPLAYERS; i++)
-		WRITESINT8(save_p, votes[i]);
+		WRITESINT8(save->p, votes[i]);
 
-	WRITESINT8(save_p, pickedvote);
+	WRITESINT8(save->p, pickedvote);
 
-	WRITEUINT16(save_p, emeralds);
-	WRITEUINT8(save_p, stagefailed);
+	WRITEUINT16(save->p, emeralds);
+	WRITEUINT8(save->p, stagefailed);
 
-	WRITEUINT32(save_p, token);
-	WRITEINT32(save_p, sstimer);
-	WRITEUINT32(save_p, bluescore);
-	WRITEUINT32(save_p, redscore);
+	WRITEUINT32(save->p, token);
+	WRITEINT32(save->p, sstimer);
+	WRITEUINT32(save->p, bluescore);
+	WRITEUINT32(save->p, redscore);
 
-	WRITEINT16(save_p, autobalance);
-	WRITEINT16(save_p, teamscramble);
+	WRITEINT16(save->p, autobalance);
+	WRITEINT16(save->p, teamscramble);
 
 	for (i = 0; i < MAXPLAYERS; i++)
-		WRITEINT16(save_p, scrambleplayers[i]);
+		WRITEINT16(save->p, scrambleplayers[i]);
 
 	for (i = 0; i < MAXPLAYERS; i++)
-		WRITEINT16(save_p, scrambleteams[i]);
+		WRITEINT16(save->p, scrambleteams[i]);
 
-	WRITEINT16(save_p, scrambletotal);
-	WRITEINT16(save_p, scramblecount);
+	WRITEINT16(save->p, scrambletotal);
+	WRITEINT16(save->p, scramblecount);
 
-	WRITEUINT32(save_p, racecountdown);
-	WRITEUINT32(save_p, exitcountdown);
+	WRITEUINT32(save->p, racecountdown);
+	WRITEUINT32(save->p, exitcountdown);
 
-	WRITEFIXED(save_p, gravity);
-	WRITEFIXED(save_p, mapobjectscale);
+	WRITEFIXED(save->p, gravity);
+	WRITEFIXED(save->p, mapobjectscale);
 
-	WRITEUINT32(save_p, countdowntimer);
-	WRITEUINT8(save_p, countdowntimeup);
+	WRITEUINT32(save->p, countdowntimer);
+	WRITEUINT8(save->p, countdowntimeup);
 
-	WRITEUINT32(save_p, hidetime);
+	WRITEUINT32(save->p, hidetime);
 
 	// SRB2kart
-	WRITEINT32(save_p, numgotboxes);
+	WRITEINT32(save->p, numgotboxes);
 
-	WRITEUINT8(save_p, gamespeed);
-	WRITEUINT8(save_p, franticitems);
-	WRITEUINT8(save_p, comeback);
+	WRITEUINT8(save->p, gamespeed);
+	WRITEUINT8(save->p, franticitems);
+	WRITEUINT8(save->p, comeback);
 
 	for (i = 0; i < 4; i++)
-		WRITESINT8(save_p, battlewanted[i]);
+		WRITESINT8(save->p, battlewanted[i]);
 
-	WRITEUINT32(save_p, wantedcalcdelay);
-	WRITEUINT32(save_p, indirectitemcooldown);
-	WRITEUINT32(save_p, hyubgone);
-	WRITEUINT32(save_p, mapreset);
-	WRITEUINT8(save_p, nospectategrief);
-	WRITEUINT8(save_p, thwompsactive);
-	WRITESINT8(save_p, spbplace);
-	WRITEUINT8(save_p, startedInFreePlay);
+	WRITEUINT32(save->p, wantedcalcdelay);
+	WRITEUINT32(save->p, indirectitemcooldown);
+	WRITEUINT32(save->p, hyubgone);
+	WRITEUINT32(save->p, mapreset);
+	WRITEUINT8(save->p, nospectategrief);
+	WRITEUINT8(save->p, thwompsactive);
+	WRITESINT8(save->p, spbplace);
+	WRITEUINT8(save->p, startedInFreePlay);
 
 	// Is it paused?
 	if (paused)
-		WRITEUINT8(save_p, 0x2f);
+		WRITEUINT8(save->p, 0x2f);
 	else
-		WRITEUINT8(save_p, 0x2e);
+		WRITEUINT8(save->p, 0x2e);
 }
 
-FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(boolean reloading)
+FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading)
 {
 	UINT32 pig;
 	INT32 i;
 	UINT8 *old_save_p;
 
-	if (READUINT32(save_p) != ARCHIVEBLOCK_MISC)
+	if (READUINT32(save->p) != ARCHIVEBLOCK_MISC)
 		I_Error("Bad $$$.sav at archive block Misc");
 
 	if (reloading)
-		gametic = READUINT32(save_p);
+		gametic = READUINT32(save->p);
 
-	gamemap = READINT16(save_p);
+	gamemap = READINT16(save->p);
 
 	// gamemap changed; we assume that its map header is always valid,
 	// so make it so
@@ -3380,25 +3550,25 @@ FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(boolean reloading)
 	// tell the sound code to reset the music since we're skipping what
 	// normally sets this flag
 	if (!reloading)
-		mapmusflags |= MUSIC_RELOADRESET;
+		mapmusic.flags |= MUSIC_RELOADRESET;
 
-	G_SetGamestate(READINT16(save_p));
+	G_SetGamestate(READINT16(save->p));
 
 	if (reloading)
-		gametype = READINT16(save_p);
+		gametype = READINT16(save->p);
 
-	pig = READUINT32(save_p);
+	pig = READUINT32(save->p);
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
 		playeringame[i] = (pig & (1<<i)) != 0;
 		// playerstate is set in unarchiveplayers
 	}
 
-	P_SetRandSeed(READUINT32(save_p));
+	P_SetRandSeed(READUINT32(save->p));
 
-	tokenlist = READUINT32(save_p);
+	tokenlist = READUINT32(save->p);
 
-	encoremode = (boolean)READUINT8(save_p);
+	encoremode = (boolean)READUINT8(save->p);
 
 	// FIXME: save_p should not be global!!!
 	old_save_p = save_p;
@@ -3412,125 +3582,126 @@ FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(boolean reloading)
 	save_p = old_save_p;
 
 	// get the time
-	leveltime = READUINT32(save_p);
-	totalrings = READUINT32(save_p);
-	lastmap = READINT16(save_p);
+	leveltime = READUINT32(save->p);
+	totalrings = READUINT32(save->p);
+	lastmap = READINT16(save->p);
 
 	for (i = 0; i < 4; i++)
 	{
-		votelevels[i][0] = READINT16(save_p);
-		votelevels[i][1] = READINT16(save_p);
+		votelevels[i][0] = READINT16(save->p);
+		votelevels[i][1] = READINT16(save->p);
 	}
 
 	for (i = 0; i < MAXPLAYERS; i++)
-		votes[i] = READSINT8(save_p);
+		votes[i] = READSINT8(save->p);
 
-	pickedvote = READSINT8(save_p);
+	pickedvote = READSINT8(save->p);
 
-	emeralds = READUINT16(save_p);
-	stagefailed = READUINT8(save_p);
+	emeralds = READUINT16(save->p);
+	stagefailed = READUINT8(save->p);
 
-	token = READUINT32(save_p);
-	sstimer = READINT32(save_p);
-	bluescore = READUINT32(save_p);
-	redscore = READUINT32(save_p);
+	token = READUINT32(save->p);
+	sstimer = READINT32(save->p);
+	bluescore = READUINT32(save->p);
+	redscore = READUINT32(save->p);
 
-	autobalance = READINT16(save_p);
-	teamscramble = READINT16(save_p);
+	autobalance = READINT16(save->p);
+	teamscramble = READINT16(save->p);
 
 	for (i = 0; i < MAXPLAYERS; i++)
-		scrambleplayers[i] = READINT16(save_p);
+		scrambleplayers[i] = READINT16(save->p);
 
 	for (i = 0; i < MAXPLAYERS; i++)
-		scrambleteams[i] = READINT16(save_p);
+		scrambleteams[i] = READINT16(save->p);
 
-	scrambletotal = READINT16(save_p);
-	scramblecount = READINT16(save_p);
+	scrambletotal = READINT16(save->p);
+	scramblecount = READINT16(save->p);
 
-	racecountdown = READUINT32(save_p);
-	exitcountdown = READUINT32(save_p);
+	racecountdown = READUINT32(save->p);
+	exitcountdown = READUINT32(save->p);
 
-	gravity = READFIXED(save_p);
-	mapobjectscale = READFIXED(save_p);
+	gravity = READFIXED(save->p);
+	mapobjectscale = READFIXED(save->p);
 
-	countdowntimer = (tic_t)READUINT32(save_p);
-	countdowntimeup = (boolean)READUINT8(save_p);
+	countdowntimer = (tic_t)READUINT32(save->p);
+	countdowntimeup = (boolean)READUINT8(save->p);
 
-	hidetime = READUINT32(save_p);
+	hidetime = READUINT32(save->p);
 
 	// SRB2kart
-	numgotboxes = READINT32(save_p);
+	numgotboxes = READINT32(save->p);
 
-	gamespeed = READUINT8(save_p);
-	franticitems = (boolean)READUINT8(save_p);
-	comeback = (boolean)READUINT8(save_p);
+	gamespeed = READUINT8(save->p);
+	franticitems = (boolean)READUINT8(save->p);
+	comeback = (boolean)READUINT8(save->p);
 
 	for (i = 0; i < 4; i++)
-		battlewanted[i] = READSINT8(save_p);
+		battlewanted[i] = READSINT8(save->p);
 
-	wantedcalcdelay = READUINT32(save_p);
-	indirectitemcooldown = READUINT32(save_p);
-	hyubgone = READUINT32(save_p);
-	mapreset = READUINT32(save_p);
-	nospectategrief = READUINT8(save_p);
-	thwompsactive = (boolean)READUINT8(save_p);
-	spbplace = READSINT8(save_p);
-	startedInFreePlay = READUINT8(save_p);
+	wantedcalcdelay = READUINT32(save->p);
+	indirectitemcooldown = READUINT32(save->p);
+	hyubgone = READUINT32(save->p);
+	mapreset = READUINT32(save->p);
+	nospectategrief = READUINT8(save->p);
+	thwompsactive = (boolean)READUINT8(save->p);
+	spbplace = READSINT8(save->p);
+	startedInFreePlay = READUINT8(save->p);
 
 	// Is it paused?
-	if (READUINT8(save_p) == 0x2f)
+	if (READUINT8(save->p) == 0x2f)
 		paused = true;
 
 	return true;
 }
 
-void P_SaveGame(void)
+void P_SaveGame(savebuffer_t *save)
 {
-	P_ArchiveMisc();
-	P_ArchivePlayer();
+	P_ArchiveMisc(save);
+	P_ArchivePlayer(save);
 
-	WRITEUINT8(save_p, 0x1d); // consistency marker
+	WRITEUINT8(save->p, 0x1d); // consistency marker
 }
 
-void P_SaveNetGame(boolean resending)
+void P_SaveNetGame(savebuffer_t *save, boolean resending)
 {
 	thinker_t *th;
 	mobj_t *mobj;
-	INT32 i = 1; // don't start from 0, it'd be confused with a blank pointer otherwise
+	UINT32 i = 1; // don't start from 0, it'd be confused with a blank pointer otherwise
 
-	CV_SaveNetVars(&save_p, false);
-	P_NetArchiveMisc(resending);
+	CV_SaveNetVars(&save->p, false);
+	P_NetArchiveMisc(save, resending);
 
 	// Assign the mobjnumber for pointer tracking
 	if (gamestate == GS_LEVEL)
 	{
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
+
 			mobj = (mobj_t *)th;
-			if (mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE || mobj->type == MT_HOOPCENTER)
+
+			if (UNLIKELY(mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE || mobj->type == MT_HOOPCENTER))
 				continue;
+
 			mobj->mobjnum = i++;
 		}
 	}
 
-	P_NetArchivePlayers(resending);
+	P_NetArchivePlayers(save, resending);
 	if (gamestate == GS_LEVEL)
 	{
-		P_NetArchiveWorld();
-		P_ArchivePolyObjects();
-		P_NetArchiveThinkers();
-		P_NetArchiveSpecials();
+		P_NetArchiveWorld(save);
+		P_ArchivePolyObjects(save);
+		P_NetArchiveThinkers(save);
+		P_NetArchiveSpecials(save);
 	}
 
-	LUA_Archive();
-	WRITEUINT8(save_p, 0x1d); // consistency marker
+	LUA_Archive(save, true);
+	WRITEUINT8(save->p, 0x1d); // consistency marker
 }
 
-boolean P_LoadGame(INT16 mapoverride)
+boolean P_LoadGame(savebuffer_t *save, INT16 mapoverride)
 {
 	if (gamestate == GS_INTERMISSION)
 		Y_EndIntermission();
@@ -3538,11 +3709,15 @@ boolean P_LoadGame(INT16 mapoverride)
 		Y_EndVote();
 	G_SetGamestate(GS_NULL); // should be changed in P_UnArchiveMisc
 
-	P_UnArchiveSPGame(mapoverride);
-	P_UnArchivePlayer();
+	P_UnArchiveSPGame(save, mapoverride);
+	P_UnArchivePlayer(save);
 
 	// Savegame end marker
+<<<<<<< HEAD
 	if (READUINT8(save_p) != 0x1d)
+=======
+	if (READUINT8(save->p) != 0x1d)
+>>>>>>> Saturn-Next
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Failed consistency check)\n"));
 		return false;
@@ -3555,23 +3730,26 @@ boolean P_LoadGame(INT16 mapoverride)
 	return true;
 }
 
-boolean P_LoadNetGame(boolean resending)
+boolean P_LoadNetGame(savebuffer_t *save, boolean reloading)
 {
-	CV_LoadNetVars(&save_p);
-	if (!P_NetUnArchiveMisc(resending))
+	CV_LoadNetVars(&save->p);
+
+	if (!P_NetUnArchiveMisc(save, reloading))
 		return false;
-	P_NetUnArchivePlayers(resending);
+
+	P_NetUnArchivePlayers(save, reloading);
+
 	if (gamestate == GS_LEVEL)
 	{
-		P_NetUnArchiveWorld();
-		P_UnArchivePolyObjects();
-		P_NetUnArchiveThinkers();
-		P_NetUnArchiveSpecials();
+		P_NetUnArchiveWorld(save);
+		P_UnArchivePolyObjects(save);
+		P_NetUnArchiveThinkers(save);
+		P_NetUnArchiveSpecials(save);
 		P_RelinkPointers();
 		P_FinishMobjs();
 	}
 
-	LUA_UnArchive();
+	LUA_UnArchive(save, true);
 
 	// This is stupid and hacky, but maybe it'll work!
 	P_SetRandSeed(P_GetInitSeed());
@@ -3582,5 +3760,5 @@ boolean P_LoadNetGame(boolean resending)
 	// precipitation when loading a netgame save. Instead, precip has to be spawned here.
 	// This is done in P_NetUnArchiveSpecials now.
 
-	return READUINT8(save_p) == 0x1d;
+	return READUINT8(save->p) == 0x1d;
 }
diff --git a/src/p_saveg.h b/src/p_saveg.h
index 9e73ad8fc..9a0e26c39 100644
--- a/src/p_saveg.h
+++ b/src/p_saveg.h
@@ -21,13 +21,6 @@
 // Persistent storage/archiving.
 // These are the load / save game routines.
 
-void P_SaveGame(void);
-void P_SaveNetGame(boolean resending);
-boolean P_LoadGame(INT16 mapoverride);
-boolean P_LoadNetGame(boolean resending);
-
-mobj_t *P_FindNewPosition(UINT32 oldposition);
-
 typedef struct
 {
 	UINT8 skincolor;
@@ -41,6 +34,21 @@ typedef struct
 } savedata_t;
 
 extern savedata_t savedata;
-extern UINT8 *save_p;
+
+typedef struct
+{
+	UINT8 *buffer;
+	UINT8 *p;
+} savebuffer_t;
+
+// Persistent storage/archiving.
+// These are the load / save game routines.
+
+void P_SaveGame(savebuffer_t *save);
+void P_SaveNetGame(savebuffer_t *save, boolean resending);
+boolean P_LoadGame(savebuffer_t *save, INT16 mapoverride);
+boolean P_LoadNetGame(savebuffer_t *save, boolean reloading);
+
+mobj_t *P_FindNewPosition(UINT32 oldposition);
 
 #endif
diff --git a/src/p_setup.c b/src/p_setup.c
index 97fd46e51..b659c2dac 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -34,6 +34,7 @@
 #include "r_fps.h" // R_ResetViewInterpolation in level load
 
 #include "s_sound.h"
+#include "m_emotes.h"
 #include "st_stuff.h"
 #include "w_wad.h"
 #include "z_zone.h"
@@ -63,10 +64,12 @@
 
 #include "md5.h" // map MD5
 
-// for LUAh_MapLoad
+// for MapLoad hook
 #include "lua_script.h"
 #include "lua_hook.h"
 
+#include "y_inter.h"
+
 #if !defined (UNDER_CE)
 #include <time.h>
 #endif
@@ -91,6 +94,9 @@
 //
 unsigned char mapmd5[16];
 
+// true when level was loaded from netsave
+boolean midgamejoin = false;
+
 //
 // MAP related Lookup tables.
 // Store VERTEXES, LINEDEFS, SIDEDEFS, etc.
@@ -247,8 +253,6 @@ static SINT8 partadd_stage = -1;
 static boolean partadd_replacescurrentmap = false;
 static boolean partadd_important = false;
 
-SINT8 midgamejoin = 0;
-
 /** Logs an error about a map being corrupt, then terminate.
   * This allows reporting highly technical errors for usefulness, without
   * confusing a novice map designer who simply needs to run ZenNode.
@@ -278,6 +282,15 @@ FUNCNORETURN static ATTRNORETURN void CorruptMapError(const char *msg)
 
 #define NUMLAPS_DEFAULT 3
 
+static void P_ClearMapHeaderLighting(mapheader_lighting_t *lighting)
+{
+	lighting->light_contrast = 8;
+	lighting->sprite_backlight = 0;
+	lighting->use_light_angle = false;
+	lighting->light_angle = 0;
+	lighting->use_custom_light = false;
+}
+
 /** Clears the data from a single map header.
   *
   * \param i Map number to clear header for.
@@ -286,83 +299,54 @@ FUNCNORETURN static ATTRNORETURN void CorruptMapError(const char *msg)
 static void P_ClearSingleMapHeaderInfo(INT16 i)
 {
 	const INT16 num = (INT16)(i-1);
-	DEH_WriteUndoline("LEVELNAME", mapheaderinfo[num]->lvlttl, UNDO_NONE);
+
 	mapheaderinfo[num]->lvlttl[0] = '\0';
-	DEH_WriteUndoline("SUBTITLE", mapheaderinfo[num]->subttl, UNDO_NONE);
 	mapheaderinfo[num]->subttl[0] = '\0';
-	DEH_WriteUndoline("ZONETITLE", mapheaderinfo[num]->zonttl, UNDO_NONE); // SRB2kart
 	mapheaderinfo[num]->zonttl[0] = '\0';
-	DEH_WriteUndoline("ACT", mapheaderinfo[num]->actnum, UNDO_NONE); // SRB2kart
 	mapheaderinfo[num]->actnum[0] = '\0';
-	DEH_WriteUndoline("TYPEOFLEVEL", va("%d", mapheaderinfo[num]->typeoflevel), UNDO_NONE);
 	mapheaderinfo[num]->typeoflevel = 0;
-	DEH_WriteUndoline("NEXTLEVEL", va("%d", mapheaderinfo[num]->nextlevel), UNDO_NONE);
 	mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
-	DEH_WriteUndoline("MUSIC", mapheaderinfo[num]->musname, UNDO_NONE);
 	snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
 	mapheaderinfo[num]->musname[6] = 0;
-	DEH_WriteUndoline("MUSICTRACK", va("%d", mapheaderinfo[num]->mustrack), UNDO_NONE);
 	mapheaderinfo[num]->mustrack = 0;
-	DEH_WriteUndoline("MUSICPOS", va("%d", mapheaderinfo[num]->muspos), UNDO_NONE);
 	mapheaderinfo[num]->muspos = 0;
-	DEH_WriteUndoline("MUSICINTERFADEOUT", va("%d", mapheaderinfo[num]->musinterfadeout), UNDO_NONE);
 	mapheaderinfo[num]->musinterfadeout = 0;
-	DEH_WriteUndoline("MUSICINTER", mapheaderinfo[num]->musintername, UNDO_NONE);
 	mapheaderinfo[num]->musintername[0] = '\0';
-	DEH_WriteUndoline("FORCECHARACTER", va("%d", mapheaderinfo[num]->forcecharacter), UNDO_NONE);
 	mapheaderinfo[num]->forcecharacter[0] = '\0';
-	DEH_WriteUndoline("WEATHER", va("%d", mapheaderinfo[num]->weather), UNDO_NONE);
 	mapheaderinfo[num]->weather = 0;
-	DEH_WriteUndoline("SKYNUM", va("%d", mapheaderinfo[num]->skynum), UNDO_NONE);
 	mapheaderinfo[num]->skynum = 1;
-	DEH_WriteUndoline("SKYBOXSCALEX", va("%d", mapheaderinfo[num]->skybox_scalex), UNDO_NONE);
 	mapheaderinfo[num]->skybox_scalex = 16;
-	DEH_WriteUndoline("SKYBOXSCALEY", va("%d", mapheaderinfo[num]->skybox_scaley), UNDO_NONE);
 	mapheaderinfo[num]->skybox_scaley = 16;
-	DEH_WriteUndoline("SKYBOXSCALEZ", va("%d", mapheaderinfo[num]->skybox_scalez), UNDO_NONE);
 	mapheaderinfo[num]->skybox_scalez = 16;
-	DEH_WriteUndoline("INTERSCREEN", mapheaderinfo[num]->interscreen, UNDO_NONE);
 	mapheaderinfo[num]->interscreen[0] = '#';
-	DEH_WriteUndoline("RUNSOC", mapheaderinfo[num]->runsoc, UNDO_NONE);
 	mapheaderinfo[num]->runsoc[0] = '#';
-	DEH_WriteUndoline("SCRIPTNAME", mapheaderinfo[num]->scriptname, UNDO_NONE);
 	mapheaderinfo[num]->scriptname[0] = '#';
-	DEH_WriteUndoline("PRECUTSCENENUM", va("%d", mapheaderinfo[num]->precutscenenum), UNDO_NONE);
 	mapheaderinfo[num]->precutscenenum = 0;
-	DEH_WriteUndoline("CUTSCENENUM", va("%d", mapheaderinfo[num]->cutscenenum), UNDO_NONE);
 	mapheaderinfo[num]->cutscenenum = 0;
-	DEH_WriteUndoline("COUNTDOWN", va("%d", mapheaderinfo[num]->countdown), UNDO_NONE);
 	mapheaderinfo[num]->countdown = 0;
-	DEH_WriteUndoline("PALLETE", va("%u", mapheaderinfo[num]->palette), UNDO_NONE);
 	mapheaderinfo[num]->palette = UINT16_MAX;
-	DEH_WriteUndoline("ENCOREPAL", va("%u", mapheaderinfo[num]->encorepal), UNDO_NONE);
 	mapheaderinfo[num]->encorepal = UINT16_MAX;
-	DEH_WriteUndoline("NUMLAPS", va("%u", mapheaderinfo[num]->numlaps), UNDO_NONE);
 	mapheaderinfo[num]->numlaps = NUMLAPS_DEFAULT;
-	DEH_WriteUndoline("UNLOCKABLE", va("%s", mapheaderinfo[num]->unlockrequired), UNDO_NONE);
 	mapheaderinfo[num]->unlockrequired = -1;
-	DEH_WriteUndoline("LEVELSELECT", va("%d", mapheaderinfo[num]->levelselect), UNDO_NONE);
 	mapheaderinfo[num]->levelselect = 0;
-	DEH_WriteUndoline("BONUSTYPE", va("%d", mapheaderinfo[num]->bonustype), UNDO_NONE);
 	mapheaderinfo[num]->bonustype = 0;
-	DEH_WriteUndoline("SAVEOVERRIDE", va("%d", mapheaderinfo[num]->saveoverride), UNDO_NONE);
 	mapheaderinfo[num]->saveoverride = SAVE_DEFAULT;
-	DEH_WriteUndoline("LEVELFLAGS", va("%d", mapheaderinfo[num]->levelflags), UNDO_NONE);
 	mapheaderinfo[num]->levelflags = 0;
-	DEH_WriteUndoline("MENUFLAGS", va("%d", mapheaderinfo[num]->menuflags), UNDO_NONE);
 	mapheaderinfo[num]->menuflags = (mainwads ? 0 : LF2_EXISTSHACK); // see p_setup.c - prevents replacing maps in addons with easier versions
+
 	// TODO grades support for delfile (pfft yeah right)
 	P_DeleteGrades(num);
+
 	// SRB2Kart
-	//DEH_WriteUndoline("AUTOMAP", va("%d", mapheaderinfo[num]->automap), UNDO_NONE);
 	//mapheaderinfo[num]->automap = false;
-	DEH_WriteUndoline("MOBJSCALE", va("%d", mapheaderinfo[num]->mobj_scale), UNDO_NONE);
 	mapheaderinfo[num]->mobj_scale = FRACUNIT;
-	// an even further impossibility, delfile custom opts support
+
 	mapheaderinfo[num]->customopts = NULL;
 	mapheaderinfo[num]->numCustomOptions = 0;
 
-	DEH_WriteUndoline(va("# uload for map %d", i), NULL, UNDO_DONE);
+	P_ClearMapHeaderLighting(&mapheaderinfo[num]->lighting);
+	P_ClearMapHeaderLighting(&mapheaderinfo[num]->lighting_encore);
+	mapheaderinfo[num]->use_encore_lighting = false;
 }
 
 /** Allocates a new map-header structure.
@@ -376,6 +360,7 @@ void P_AllocMapHeader(INT16 i)
 		mapheaderinfo[i] = Z_Malloc(sizeof(mapheader_t), PU_STATIC, NULL);
 		mapheaderinfo[i]->grades = NULL;
 	}
+
 	P_ClearSingleMapHeaderInfo(i + 1);
 }
 
@@ -453,8 +438,10 @@ UINT8 P_GetGrade(UINT32 pscore, INT16 map, UINT8 mare)
 			if (pscore >= mapheaderinfo[map-1]->grades[mare].grade[i])
 				++pgrade;
 		}
+
 		return (UINT8)pgrade;
 	}
+
 	return 0;
 }
 
@@ -462,10 +449,8 @@ UINT8 P_HasGrades(INT16 map, UINT8 mare)
 {
 	// Determining the grade
 	// Mare 0 is treated as overall and is true if ANY grades exist
-	if (mapheaderinfo[map-1] && mapheaderinfo[map-1]->grades
-		&& (mare == 0 || mapheaderinfo[map-1]->numGradedMares >= mare))
-		return true;
-	return false;
+	return (mapheaderinfo[map-1] && mapheaderinfo[map-1]->grades
+	&& (mare == 0 || mapheaderinfo[map-1]->numGradedMares >= mare));
 }
 
 UINT32 P_GetScoreForGrade(INT16 map, UINT8 mare, UINT8 grade)
@@ -496,7 +481,11 @@ FUNCINLINE static ATTRINLINE void P_LoadRawVertexes(UINT8 *data)
   * \param seg Seg to compute length for.
   * \return Length in fracunits.
   */
+#if defined (WALLSPLATS) || defined (FLOORSPLATS)
 fixed_t P_SegLength(seg_t *seg)
+#else
+static inline fixed_t P_SegLength(seg_t *seg)
+#endif
 {
 	INT64 dx = (seg->v2->x - seg->v1->x)>>1;
 	INT64 dy = (seg->v2->y - seg->v1->y)>>1;
@@ -518,20 +507,152 @@ static inline float P_SegLengthFloat(seg_t *seg)
 	dx = FIXED_TO_FLOAT(seg->v2->x - seg->v1->x);
 	dy = FIXED_TO_FLOAT(seg->v2->y - seg->v1->y);
 
-	return (float)hypot(dx, dy);
+	return hypotf(dx, dy);
 }
 #endif
 
+/** Updates the light offset
+  *
+  * \param li Seg to update the light offsets of
+  */
+void P_UpdateSegLightOffset(seg_t *li)
+{
+	const UINT8 contrast = maplighting.contrast;
+	const fixed_t contrastFixed = ((fixed_t)contrast) * FRACUNIT;
+	fixed_t light = FRACUNIT;
+	fixed_t extralight = 0;
+
+	if (maplighting.directional == true)
+	{
+		angle_t liAngle = R_PointToAngle2(0, 0, (li->v1->x - li->v2->x), (li->v1->y - li->v2->y)) - ANGLE_90;
+
+		light = FixedMul(FINECOSINE(liAngle >> ANGLETOFINESHIFT), FINECOSINE(maplighting.angle >> ANGLETOFINESHIFT))
+		+ FixedMul(FINESINE(liAngle >> ANGLETOFINESHIFT), FINESINE(maplighting.angle >> ANGLETOFINESHIFT));
+		light = (light + FRACUNIT) / 2;
+	}
+	else
+	{
+		light = FixedDiv(R_PointToAngle2(0, 0, abs(li->v1->x - li->v2->x), abs(li->v1->y - li->v2->y)), ANGLE_90);
+	}
+
+	extralight = -contrastFixed + FixedMul(light, contrastFixed * 2);
+
+	// Between -2 and 2 for software, -8 and 8 for hardware
+	li->lightOffset = FixedFloor((extralight / 8) + (FRACUNIT / 2)) / FRACUNIT;
+#ifdef HWRENDER
+	li->hwLightOffset = FixedFloor(extralight + (FRACUNIT / 2)) / FRACUNIT;
+#endif
+}
+
+boolean P_SectorUsesDirectionalLighting(const sector_t *sector)
+{
+	if (sector != NULL)
+	{
+		// automatically turned on
+		if (sector->ceilingpic == skyflatnum || sector->floorpic == skyflatnum)
+		{
+			// sky is visible
+			return true;
+		}
+	}
+
+	// default is off, for indoors
+	return false;
+}
+
+boolean P_ApplyLightOffset(UINT8 baselightnum, const sector_t *sector)
+{
+	mapheader_lighting_t *lighting = &mapheaderinfo[gamemap-1]->lighting;
+
+	if (encoremode && mapheaderinfo[gamemap-1]->use_encore_lighting)
+	{
+		lighting = &mapheaderinfo[gamemap-1]->lighting_encore;
+	}
+
+	if (!cv_randomdirlight.value && lighting->use_custom_light == false)
+		return (baselightnum < LIGHTLEVELS-1 && baselightnum > 0);
+
+	if (!P_SectorUsesDirectionalLighting(sector))
+	{
+		return false;
+	}
+
+	// Don't apply light offsets at full bright or full dark.
+	// Is in steps of light num .
+	return (baselightnum < LIGHTLEVELS-1 && baselightnum > 0);
+}
+
+boolean P_ApplyLightOffsetFine(UINT8 baselightlevel, const sector_t *sector)
+{
+	mapheader_lighting_t *lighting = &mapheaderinfo[gamemap-1]->lighting;
+
+	if (encoremode && mapheaderinfo[gamemap-1]->use_encore_lighting)
+	{
+		lighting = &mapheaderinfo[gamemap-1]->lighting_encore;
+	}
+
+	if (!cv_randomdirlight.value && lighting->use_custom_light == false)
+		return (baselightlevel < 255 && baselightlevel > 0);
+
+	if (!P_SectorUsesDirectionalLighting(sector))
+	{
+		return false;
+	}
+
+	// Don't apply light offsets at full bright or full dark.
+	// Uses exact light levels for more smoothness.
+	return (baselightlevel < 255 && baselightlevel > 0);
+}
+
+// dumb thing to reset maplight on next map change when its toggled
+boolean reinitmaplight = false;
+static void P_SetupDirectionalLight(void)
+{
+	mapheader_lighting_t *lighting = &mapheaderinfo[gamemap-1]->lighting;
+
+	if (encoremode && mapheaderinfo[gamemap-1]->use_encore_lighting)
+	{
+		lighting = &mapheaderinfo[gamemap-1]->lighting_encore;
+	}
+
+	if (cv_randomdirlight.value && lighting->use_custom_light == false)
+	{
+		static INT16 oldmap = 0; // dont reset stuff when you restart a map
+		static boolean oldencore = false;
+
+		if (gamemap != oldmap || encoremode != oldencore || reinitmaplight)
+		{
+			lighting->light_contrast = M_RandomRange(0, 58);
+			lighting->sprite_backlight = 0;
+			lighting->use_light_angle = M_RandomRange(0, 1); // either on or off
+			lighting->light_angle = M_RandomRange(-382, 382);
+
+			reinitmaplight = false;
+		}
+
+		oldmap = gamemap;
+		oldencore = encoremode;
+		return;
+	}
+
+	maplighting.contrast = lighting->light_contrast;
+	maplighting.backlight = lighting->sprite_backlight;
+	maplighting.directional = lighting->use_light_angle;
+	maplighting.angle = lighting->light_angle;
+}
 
 // Loads the SEGS resource from a level.
 static void P_LoadRawSegs(UINT8 *data)
 {
-	INT32 linedef, side;
+	INT32 rawlinedef, rawside;
 	mapseg_t *ml = (mapseg_t*)data;
 	seg_t *li = segs;
 	line_t *ldef;
 	size_t i;
 
+	// Set map lighting settings.
+	P_SetupDirectionalLight();
+
 	for (i = 0; i < numsegs; i++, li++, ml++)
 	{
 		li->v1 = &vertexes[SHORT(ml->v1)];
@@ -546,23 +667,21 @@ static void P_LoadRawSegs(UINT8 *data)
 
 		li->angle = (SHORT(ml->angle))<<FRACBITS;
 		li->offset = (SHORT(ml->offset))<<FRACBITS;
-		linedef = SHORT(ml->linedef);
-		ldef = &lines[linedef];
+		rawlinedef = SHORT(ml->linedef);
+		ldef = &lines[rawlinedef];
 		li->linedef = ldef;
-		li->side = side = SHORT(ml->side);
-		li->sidedef = &sides[ldef->sidenum[side]];
-		li->frontsector = sides[ldef->sidenum[side]].sector;
+		li->side = rawside = SHORT(ml->side);
+		li->sidedef = &sides[ldef->sidenum[rawside]];
+		li->frontsector = sides[ldef->sidenum[rawside]].sector;
 		if (ldef->flags & ML_TWOSIDED)
-			li->backsector = sides[ldef->sidenum[side^1]].sector;
+			li->backsector = sides[ldef->sidenum[rawside^1]].sector;
 		else
 			li->backsector = 0;
 
-		li->numlights = 0;
-		li->rlights = NULL;
+		P_UpdateSegLightOffset(li);
 	}
 }
 
-
 // Loads the SSECTORS resource from a level.
 FUNCINLINE static ATTRINLINE void P_LoadRawSubsectors(void *data)
 {
@@ -574,7 +693,7 @@ FUNCINLINE static ATTRINLINE void P_LoadRawSubsectors(void *data)
 	{
 		ss->sector = NULL;
 		ss->numlines = SHORT(ms->numsegs);
-		ss->firstline = SHORT(ms->firstseg);
+		ss->firstline = (UINT16)SHORT(ms->firstseg);
 #ifdef FLOORSPLATS
 		ss->splats = NULL;
 #endif
@@ -597,21 +716,56 @@ levelflat_t *levelflats;
 //SoM: Other files want this info.
 size_t P_PrecacheLevelFlats(void)
 {
+	levelflat_t levelflat;
 	lumpnum_t lump;
 	size_t i, flatmem = 0;
+	INT32 k;
 
 	//SoM: 4/18/2000: New flat code to make use of levelflats.
 	for (i = 0; i < numlevelflats; i++)
 	{
-		lump = levelflats[i].lumpnum;
+		levelflat = levelflats[i];
+		lump = levelflat.lumpnum;
 		if (devparm)
 			flatmem += W_LumpLength(lump);
 		R_GetFlat(lump);
+
+		if (levelflat.speed) // it is an animated flat
+		{
+			for (k = 1; k < levelflat.numpics; k++)
+			{
+				lump = levelflat.baselumpnum + k;
+				if (devparm)
+					flatmem += W_LumpLength(lump);
+				R_GetFlat(lump);
+			}
+		}
 	}
 
 	return flatmem;
 }
 
+// check if our flat contains cyan pixels
+// not sure if this is the best way to do it but it works
+static void P_CheckCyanFlat(levelflat_t *levelflat)
+{
+	// only need this for software
+	if (rendermode != render_soft)
+		return;
+
+	const UINT8 *flat = R_GetFlat(levelflat->lumpnum);
+	const size_t size = W_LumpLength(levelflat->lumpnum);
+
+	for (size_t steppy = 0; steppy < size; steppy++)
+	{
+		if (flat[steppy] == TRANSPARENTPIXEL)
+		{
+			levelflat->cyan = true;
+			break;
+		}
+	}
+}
+
 // help function for P_LoadSectors, find a flat in the active wad files,
 // allocate an id for it, and set the levelflat (to speedup search)
 //
@@ -623,7 +777,7 @@ INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat)
 	//  first scan through the already found flats
 	//
 	for (i = 0; i < numlevelflats; i++, levelflat++)
-		if (strnicmp(levelflat->name,flatname,8)==0)
+		if (strnicmp(levelflat->name, flatname, 8) == 0)
 			break;
 
 	// that flat was already found in the level, return the id
@@ -635,6 +789,9 @@ INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat)
 
 		// store the flat lump number
 		levelflat->lumpnum = R_GetFlatNumForName(flatname);
+		levelflat->baselumpnum = LUMPERROR;
+
+		P_CheckCyanFlat(levelflat);
 
 #ifndef ZDEBUG
 		CONS_Debug(DBG_SETUP, "flat #%03d: %s\n", atoi(sizeu1(numlevelflats)), levelflat->name);
@@ -663,7 +820,7 @@ INT32 P_AddLevelFlatRuntime(const char *flatname)
 	//  first scan through the already found flats
 	//
 	for (i = 0; i < numlevelflats; i++, levelflat++)
-		if (strnicmp(levelflat->name,flatname,8)==0)
+		if (strnicmp(levelflat->name, flatname, 8) == 0)
 			break;
 
 	// that flat was already found in the level, return the id
@@ -679,6 +836,9 @@ INT32 P_AddLevelFlatRuntime(const char *flatname)
 
 		// store the flat lump number
 		levelflat->lumpnum = R_GetFlatNumForName(flatname);
+		levelflat->baselumpnum = LUMPERROR;
+
+		P_CheckCyanFlat(levelflat);
 
 #ifndef ZDEBUG
 		CONS_Debug(DBG_SETUP, "flat #%03d: %s\n", atoi(sizeu1(numlevelflats)), levelflat->name);
@@ -703,7 +863,7 @@ INT32 P_CheckLevelFlat(const char *flatname)
 	//  scan through the already found flats
 	//
 	for (i = 0; i < numlevelflats; i++, levelflat++)
-		if (strnicmp(levelflat->name,flatname,8)==0)
+		if (strnicmp(levelflat->name, flatname, 8) == 0)
 			break;
 
 	if (i == numlevelflats)
@@ -751,8 +911,6 @@ static void P_LoadRawSectors(UINT8 *data)
 		ss->thinglist = NULL;
 		ss->touching_thinglist = NULL;
 
-		ss->touching_preciplist = NULL;
-
 		ss->floordata = NULL;
 		ss->ceilingdata = NULL;
 		ss->lightingdata = NULL;
@@ -818,6 +976,7 @@ static void P_LoadRawNodes(UINT8 *data)
 		no->y = SHORT(mn->y)<<FRACBITS;
 		no->dx = SHORT(mn->dx)<<FRACBITS;
 		no->dy = SHORT(mn->dy)<<FRACBITS;
+
 		for (j = 0; j < 2; j++)
 		{
 			no->children[j] = SHORT(mn->children[j]);
@@ -827,138 +986,6 @@ static void P_LoadRawNodes(UINT8 *data)
 	}
 }
 
-
-//
-// P_ReloadRings
-// Used by NiGHTS, clears all ring/wing/etc items and respawns them
-//
-void P_ReloadRings(void)
-{
-	mobj_t *mo;
-	thinker_t *th;
-	size_t i, numHoops = 0;
-	// Okay, if you have more than 4000 hoops in your map,
-	// you're insane.
-	mapthing_t *hoopsToRespawn[4096];
-	mapthing_t *mt = mapthings;
-
-	// scan the thinkers to find rings/wings/hoops to unset
-	for (th = thinkercap.next; th != &thinkercap; th = th->next)
-	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
-
-		mo = (mobj_t *)th;
-
-		if (mo->type == MT_HOOPCENTER)
-		{
-			// Hoops give me a headache
-			if (mo->threshold == 4242) // Dead hoop
-			{
-				hoopsToRespawn[numHoops++] = mo->spawnpoint;
-				P_RemoveMobj(mo);
-			}
-			continue;
-		}
-		if (!(mo->type == MT_RING || mo->type == MT_NIGHTSWING || mo->type == MT_COIN
-			|| mo->type == MT_BLUEBALL))
-			continue;
-
-		// Don't auto-disintegrate things being pulled to us
-		if (mo->flags2 & MF2_NIGHTSPULL)
-			continue;
-
-		P_RemoveMobj(mo);
-	}
-
-	// Reiterate through mapthings
-	for (i = 0; i < nummapthings; i++, mt++)
-	{
-		// Notice an omission? We handle hoops differently.
-		if (mt->type == 300 || mt->type == 308 || mt->type == 309
-		 || mt->type == 1706 || (mt->type >= 600 && mt->type <= 609)
-		 || mt->type == 1800)
-		{
-			mt->mobj = NULL;
-
-			// Z for objects Tails 05-26-2002
-			mt->z = (INT16)(R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)
-				->sector->floorheight>>FRACBITS);
-
-			P_SpawnHoopsAndRings (mt);
-		}
-	}
-	for (i = 0; i < numHoops; i++)
-	{
-		P_SpawnHoopsAndRings(hoopsToRespawn[i]);
-	}
-}
-
-#ifdef SCANTHINGS
-void P_ScanThings(INT16 mapnum, INT16 wadnum, INT16 lumpnum)
-{
-	size_t i, n;
-	UINT8 *data, *datastart;
-	UINT16 type, maprings;
-	INT16 tol;
-	UINT32 flags;
-
-	tol = mapheaderinfo[mapnum-1]->typeoflevel;
-	if (!(tol & TOL_SP))
-		return;
-	flags = mapheaderinfo[mapnum-1]->levelflags;
-
-	n = W_LumpLengthPwad(wadnum, lumpnum) / (5 * sizeof (INT16));
-	//CONS_Printf("%u map things found!\n", n);
-
-	maprings = 0;
-	data = datastart = W_CacheLumpNumPwad(wadnum, lumpnum, PU_STATIC);
-	for (i = 0; i < n; i++)
-	{
-		data += 3 * sizeof (INT16); // skip x y position, angle
-		type = READUINT16(data) & 4095;
-		data += sizeof (INT16); // skip options
-
-		switch (type)
-		{
-		case 300: // MT_RING
-		case 1800: // MT_COIN
-		case 308: // red team ring
-		case 309: // blue team ring
-			maprings++;
-			break;
-		case 400: // MT_SUPERRINGBOX
-		case 414: // red ring box
-		case 415: // blue ring box
-		case 603: // 10 diagonal rings
-			maprings += 10;
-			break;
-		case 600: // 5 vertical rings
-		case 601: // 5 vertical rings
-		case 602: // 5 diagonal rings
-			maprings += 5;
-			break;
-		case 604: // 8 circle rings
-		case 609: // 16 circle rings & wings
-			maprings += 8;
-			break;
-		case 605: // 16 circle rings
-			maprings += 16;
-			break;
-		case 608: // 8 circle rings & wings
-			maprings += 4;
-			break;
-		}
-	}
-	Z_Free(datastart);
-
-	if (maprings)
-		CONS_Printf("%s has %u rings\n", G_BuildMapName(mapnum), maprings);
-}
-#endif
-
 //
 // P_LoadThings
 //
@@ -1005,14 +1032,13 @@ static void P_LoadThings(void)
 
 	mt = mapthings;
 	numhuntemeralds = 0;
+
 	for (i = 0; i < nummapthings; i++, mt++)
 	{
-		sector_t *mtsector = R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)->sector;
+		sector_t *mtsector = R_PointInSubsector((mt->x << FRACBITS), (mt->y << FRACBITS))->sector;
 
 		// Z for objects
-		mt->z = (INT16)(
-				mtsector->f_slope ? P_GetZAt(mtsector->f_slope, mt->x << FRACBITS, mt->y << FRACBITS) :
-				mtsector->floorheight)>>FRACBITS;
+		mt->z = (INT16)(P_GetSectorFloorZAt(mtsector, (mt->x << FRACBITS), (mt->y << FRACBITS))) >> FRACBITS;
 
 		if (mt->type == 1700 // MT_AXIS
 			|| mt->type == 1701 // MT_AXISTRANSFER
@@ -1131,7 +1157,7 @@ static inline void P_SpawnEmblems(void)
 static void P_SpawnSecretItems(boolean loademblems)
 {
 	// Now let's spawn those funky emblem things! Tails 12-08-2002
-	if (netgame || multiplayer || majormods) // No cheating!!
+	if (netgame || multiplayer) // No cheating!!
 		return;
 
 	if (loademblems)
@@ -1144,14 +1170,14 @@ void P_WriteThings(lumpnum_t lumpnum)
 	size_t i, length;
 	mapthing_t *mt;
 	UINT8 *data;
-	UINT8 *savebuffer, *savebuf_p;
+	savebuffer_t save;
 	INT16 temp;
 
 	data = W_CacheLumpNum(lumpnum, PU_LEVEL);
 
-	savebuf_p = savebuffer = (UINT8 *)malloc(nummapthings * sizeof (mapthing_t));
+	save.p = save.buffer = (UINT8 *)malloc(nummapthings * sizeof (mapthing_t));
 
-	if (!savebuf_p)
+	if (!save.p)
 	{
 		CONS_Alert(CONS_ERROR, M_GetText("No more free memory for thing writing!\n"));
 		return;
@@ -1160,23 +1186,23 @@ void P_WriteThings(lumpnum_t lumpnum)
 	mt = mapthings;
 	for (i = 0; i < nummapthings; i++, mt++)
 	{
-		WRITEINT16(savebuf_p, mt->x);
-		WRITEINT16(savebuf_p, mt->y);
+		WRITEINT16(save.p, mt->x);
+		WRITEINT16(save.p, mt->y);
 
-		WRITEINT16(savebuf_p, mt->angle);
+		WRITEINT16(save.p, mt->angle);
 
 		temp = (INT16)(mt->type + ((INT16)mt->extrainfo << 12));
-		WRITEINT16(savebuf_p, temp);
-		WRITEUINT16(savebuf_p, mt->options);
+		WRITEINT16(save.p, temp);
+		WRITEUINT16(save.p, mt->options);
 	}
 
 	Z_Free(data);
 
-	length = savebuf_p - savebuffer;
+	length = save.p - save.buffer;
 
-	FIL_WriteFile(va("newthings%d.lmp", gamemap), savebuffer, length);
-	free(savebuffer);
-	savebuf_p = NULL;
+	FIL_WriteFile(va("newthings%d.lmp", gamemap), save.buffer, length);
+	free(save.buffer);
+	save.p = NULL;
 
 	CONS_Printf(M_GetText("newthings%d.lmp saved.\n"), gamemap);
 }
@@ -1218,6 +1244,9 @@ static void P_SetupLines(void)
 		ld->dx = v2->x - v1->x;
 		ld->dy = v2->y - v1->y;
 
+		ld->alpha = FRACUNIT;
+		ld->blendmode = 0;
+
 		if (!ld->dx)
 			ld->slopetype = ST_VERTICAL;
 		else if (!ld->dy)
@@ -1325,74 +1354,203 @@ static void P_LoadLineDefs2(void)
 			}
 			break;
 		}
-	}
 
-	// Optimize sidedefs
-	if (M_CheckParm("-compress"))
+		// Set alpha for translucent walls
+		if (ld->special >= 900 && ld->special < 909)
+			ld->alpha = ((909 - ld->special) << FRACBITS)/10;
+
+		// Set alpha for additive/subtractive/reverse subtractive walls
+		if (ld->special >= 910 && ld->special <= 939)
+			ld->alpha = ((10 - ld->special % 10) << FRACBITS)/10;
+
+		if (ld->special >= 910 && ld->special <= 919) // additive
+			ld->blendmode = AST_ADD;
+
+		if (ld->special >= 920 && ld->special <= 929) // subtractive
+			ld->blendmode = AST_SUBTRACT;
+
+		if (ld->special >= 930 && ld->special <= 939) // reverse subtractive
+			ld->blendmode = AST_REVERSESUBTRACT;
+
+		if (ld->special == 940) // modulate
+			ld->blendmode = AST_MODULATE;
+	}
+}
+
+static void P_LoadSideColormaps(mapsidedef_t *msd, side_t *sd, sector_t *sec)
+{
+	INT32 num;
+
+#ifdef HWRENDER
+	if (rendermode == render_opengl)
 	{
-		side_t *newsides;
-		size_t numnewsides = 0;
-		size_t z;
-
-		for (i = 0; i < numsides; i++)
+		// for now, full support of toptexture only
+		if ((msd->toptexture[0] == '#' && msd->toptexture[1] && msd->toptexture[2] && msd->toptexture[3] && msd->toptexture[4] && msd->toptexture[5] && msd->toptexture[6])
+			|| (msd->bottomtexture[0] == '#' && msd->bottomtexture[1] && msd->bottomtexture[2] && msd->bottomtexture[3] && msd->bottomtexture[4] && msd->bottomtexture[5] && msd->bottomtexture[6]))
 		{
-			size_t j, k;
-			if (sides[i].sector == NULL)
-				continue;
+			char *col;
+			RGBA_t color;
+			size_t j;
 
-			for (k = numlines, ld = lines; k--; ld++)
+			sec->midmap = R_CreateColormap(msd->toptexture, msd->midtexture,
+				msd->bottomtexture);
+			sd->toptexture = sd->bottomtexture = 0;
+#define HEX2INT(x) (x >= '0' && x <= '9' ? x - '0' : x >= 'a' && x <= 'f' ? x - 'a' + 10 : x >= 'A' && x <= 'F' ? x - 'A' + 10 : 0)
+#define ALPHA2INT(x) (x >= 'a' && x <= 'z' ? x - 'a' : x >= 'A' && x <= 'Z' ? x - 'A' : x >= '0' && x <= '9' ? 25 : 0)
+			sec->extra_colormap = &extra_colormaps[sec->midmap];
+
+			if (msd->toptexture[0] == '#' && msd->toptexture[1] && msd->toptexture[2] && msd->toptexture[3] && msd->toptexture[4] && msd->toptexture[5] && msd->toptexture[6])
 			{
-				if (ld->sidenum[0] == i)
-					ld->sidenum[0] = (UINT16)numnewsides;
+				col = msd->toptexture;
 
-				if (ld->sidenum[1] == i)
-					ld->sidenum[1] = (UINT16)numnewsides;
-			}
+				// encore mode colormaps!
+				// do it like software by aproximating a color to a palette index, and then convert it to its encore variant and then back to a color code.
+				// do this for both the start and fade colormaps.
 
-			for (j = i+1; j < numsides; j++)
-			{
-				if (sides[j].sector == NULL)
-					continue;
+				color.s.red = (HEX2INT(col[1]) << 4) + HEX2INT(col[2]);
+				color.s.green = (HEX2INT(col[3]) << 4) + HEX2INT(col[4]);
+				color.s.blue = (HEX2INT(col[5]) << 4) + HEX2INT(col[6]);
 
-				if (!memcmp(&sides[i], &sides[j], sizeof(side_t)))
+#ifdef GLENCORE
+				if (encoremap)
 				{
-					// Find the linedefs that belong to this one
-					for (k = numlines, ld = lines; k--; ld++)
-					{
-						if (ld->sidenum[0] == j)
-							ld->sidenum[0] = (UINT16)numnewsides;
-
-						if (ld->sidenum[1] == j)
-							ld->sidenum[1] = (UINT16)numnewsides;
-					}
-					sides[j].sector = NULL; // Flag for deletion
+					j = encoremap[NearestColor(color.s.red, color.s.green, color.s.blue)];
+					color = pLocalPalette[j]; // note: this sets alpha to 255, we will reset it below
 				}
+#endif
+				color.s.alpha = 0; // reset/init the alpha, so the addition below will work correctly
+				sec->extra_colormap->rgba = color.rgba;
+
+				// alpha
+				if (msd->toptexture[7])
+					sec->extra_colormap->rgba += (ALPHA2INT(col[7]) << 24);
+				else
+					sec->extra_colormap->rgba += (25 << 24);
 			}
-			numnewsides++;
+			else
+				sec->extra_colormap->rgba = 0;
+
+			if (msd->bottomtexture[0] == '#' && msd->bottomtexture[1] && msd->bottomtexture[2] && msd->bottomtexture[3] && msd->bottomtexture[4] && msd->bottomtexture[5] && msd->bottomtexture[6])
+			{
+				col = msd->bottomtexture;
+
+				// do the exact same thing as above here.
+
+				color.s.red = (HEX2INT(col[1]) << 4) + HEX2INT(col[2]);
+				color.s.green = (HEX2INT(col[3]) << 4) + HEX2INT(col[4]);
+				color.s.blue = (HEX2INT(col[5]) << 4) + HEX2INT(col[6]);
+
+#ifdef GLENCORE
+				if (encoremap)
+				{
+					j = encoremap[NearestColor(color.s.red, color.s.green, color.s.blue)];
+					color = pLocalPalette[j]; // note: this sets alpha to 255, we will reset it below
+				}
+#endif
+				color.s.alpha = 0; // reset/init the alpha, so the addition below will work correctly
+				sec->extra_colormap->fadergba = color.rgba;
+
+				// alpha
+				if (msd->bottomtexture[7])
+					sec->extra_colormap->fadergba += (ALPHA2INT(col[7]) << 24);
+				else
+					sec->extra_colormap->fadergba += (25 << 24);
+			}
+			else
+				sec->extra_colormap->fadergba = 0x19000000; // default alpha, (25 << 24)
+#undef ALPHA2INT
+#undef HEX2INT
 		}
-
-		// We're loading crap into this block anyhow, so no point in zeroing it out.
-		newsides = Z_Malloc(numnewsides * sizeof(*newsides), PU_LEVEL, NULL);
-
-		// Copy the sides to their new block of memory.
-		for (i = 0, z = 0; i < numsides; i++)
+		else
 		{
-			if (sides[i].sector != NULL)
-				M_Memcpy(&newsides[z++], &sides[i], sizeof(side_t));
+			if ((num = R_CheckTextureNumForName(msd->toptexture)) == -1)
+				sd->toptexture = 0;
+			else
+				sd->toptexture = num;
+
+			if ((num = R_CheckTextureNumForName(msd->midtexture)) == -1)
+				sd->midtexture = 0;
+			else
+				sd->midtexture = num;
+
+			if ((num = R_CheckTextureNumForName(msd->bottomtexture)) == -1)
+				sd->bottomtexture = 0;
+			else
+				sd->bottomtexture = num;
 		}
-
-		CONS_Debug(DBG_SETUP, "Old sides is %s, new sides is %s\n", sizeu1(numsides), sizeu1(numnewsides));
-
-		Z_Free(sides);
-		sides = newsides;
-		numsides = numnewsides;
 	}
+#endif
+#ifdef HWRENDER
+	else
+#endif
+	{
+		if (msd->toptexture[0] == '#' || msd->bottomtexture[0] == '#')
+		{
+			sec->midmap = R_CreateColormap(msd->toptexture, msd->midtexture,
+				msd->bottomtexture);
+			sd->toptexture = sd->bottomtexture = 0;
+		}
+		else
+		{
+			if ((num = R_CheckTextureNumForName(msd->toptexture)) == -1)
+				sd->toptexture = 0;
+			else
+				sd->toptexture = num;
+			if ((num = R_CheckTextureNumForName(msd->midtexture)) == -1)
+				sd->midtexture = 0;
+			else
+				sd->midtexture = num;
+			if ((num = R_CheckTextureNumForName(msd->bottomtexture)) == -1)
+				sd->bottomtexture = 0;
+			else
+				sd->bottomtexture = num;
+		}
+	}
+}
+
+static void P_LoadSideChangeMusic(boolean firstside, mapsidedef_t *msd, side_t *sd)
+{
+	char process[8+1];
+
+	sd->toptexture = sd->midtexture = sd->bottomtexture = 0;
+
+	if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
+	{
+		M_Memcpy(process,msd->bottomtexture,8);
+		process[8] = '\0';
+		sd->bottomtexture = get_number(process);
+	}
+
+	if (!(msd->midtexture[0] == '-' && msd->midtexture[1] == '\0') || msd->midtexture[1] != '\0')
+	{
+		M_Memcpy(process,msd->midtexture,8);
+		process[8] = '\0';
+		sd->midtexture = get_number(process);
+	}
+
+	// always process if back sidedef, because we need that - symbol
+	sd->text = Z_Malloc(7, PU_LEVEL, NULL);
+
+	if (firstside || msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
+	{
+		M_Memcpy(process,msd->toptexture,8);
+		process[8] = '\0';
+
+		// If they type in O_ or D_ and their music name, just shrug,
+		// then copy the rest instead.
+		if ((process[0] == 'O' || process[0] == 'D') && process[7])
+			M_Memcpy(sd->text, process+2, 6);
+		else // Assume it's a proper music name.
+			M_Memcpy(sd->text, process, 6);
+		sd->text[6] = 0;
+	}
+	else
+		sd->text[0] = 0;
 }
 
 static void P_LoadRawSideDefs2(void *data)
 {
 	UINT16 i;
-	INT32 num;
 
 	for (i = 0; i < numsides; i++)
 	{
@@ -1426,186 +1584,11 @@ static void P_LoadRawSideDefs2(void *data)
 			case 606: //SoM: 4/4/2000: Just colormap transfer
 				// SoM: R_CreateColormap will only create a colormap in software mode...
 				// Perhaps we should just call it instead of doing the calculations here.
-#ifdef HWRENDER
-				if (rendermode != render_opengl)
-#endif
-				{
-					if (msd->toptexture[0] == '#' || msd->bottomtexture[0] == '#')
-					{
-						sec->midmap = R_CreateColormap(msd->toptexture, msd->midtexture,
-							msd->bottomtexture);
-						sd->toptexture = sd->bottomtexture = 0;
-					}
-					else
-					{
-						if ((num = R_CheckTextureNumForName(msd->toptexture)) == -1)
-							sd->toptexture = 0;
-						else
-							sd->toptexture = num;
-						if ((num = R_CheckTextureNumForName(msd->midtexture)) == -1)
-							sd->midtexture = 0;
-						else
-							sd->midtexture = num;
-						if ((num = R_CheckTextureNumForName(msd->bottomtexture)) == -1)
-							sd->bottomtexture = 0;
-						else
-							sd->bottomtexture = num;
-					}
-					break;
-				}
-#ifdef HWRENDER
-				else
-				{
-					// for now, full support of toptexture only
-					if ((msd->toptexture[0] == '#' && msd->toptexture[1] && msd->toptexture[2] && msd->toptexture[3] && msd->toptexture[4] && msd->toptexture[5] && msd->toptexture[6])
-						|| (msd->bottomtexture[0] == '#' && msd->bottomtexture[1] && msd->bottomtexture[2] && msd->bottomtexture[3] && msd->bottomtexture[4] && msd->bottomtexture[5] && msd->bottomtexture[6]))
-					{
-						char *col;
-						RGBA_t color;
-						size_t j;
-
-						sec->midmap = R_CreateColormap(msd->toptexture, msd->midtexture,
-							msd->bottomtexture);
-						sd->toptexture = sd->bottomtexture = 0;
-#define HEX2INT(x) (x >= '0' && x <= '9' ? x - '0' : x >= 'a' && x <= 'f' ? x - 'a' + 10 : x >= 'A' && x <= 'F' ? x - 'A' + 10 : 0)
-#define ALPHA2INT(x) (x >= 'a' && x <= 'z' ? x - 'a' : x >= 'A' && x <= 'Z' ? x - 'A' : x >= '0' && x <= '9' ? 25 : 0)
-						sec->extra_colormap = &extra_colormaps[sec->midmap];
-
-						if (msd->toptexture[0] == '#' && msd->toptexture[1] && msd->toptexture[2] && msd->toptexture[3] && msd->toptexture[4] && msd->toptexture[5] && msd->toptexture[6])
-						{
-							col = msd->toptexture;
-
-							// encore mode colormaps!
-							// do it like software by aproximating a color to a palette index, and then convert it to its encore variant and then back to a color code.
-							// do this for both the start and fade colormaps.
-							
-							color.s.red = (HEX2INT(col[1]) << 4) + HEX2INT(col[2]);
-							color.s.green = (HEX2INT(col[3]) << 4) + HEX2INT(col[4]);
-							color.s.blue = (HEX2INT(col[5]) << 4) + HEX2INT(col[6]);
-
-#ifdef GLENCORE
-							if (encoremap)
-							{
-								j = encoremap[NearestColor(color.s.red, color.s.green, color.s.blue)];
-								//CONS_Printf("R_CreateColormap: encoremap[%d] = %d\n", j, encoremap[j]); -- moved encoremap upwards for optimisation
-								color = pLocalPalette[j]; // note: this sets alpha to 255, we will reset it below
-							}
-#endif
-							color.s.alpha = 0; // reset/init the alpha, so the addition below will work correctly
-							sec->extra_colormap->rgba = color.rgba;
-
-							// alpha
-							if (msd->toptexture[7])
-								sec->extra_colormap->rgba += (ALPHA2INT(col[7]) << 24);
-							else
-								sec->extra_colormap->rgba += (25 << 24);
-
-							/*nearest = NearestColor(
-								(HEX2INT(col[1]) << 4) + (HEX2INT(col[2]) << 0),
-								(HEX2INT(col[3]) << 4) + (HEX2INT(col[4]) << 0),
-								(HEX2INT(col[5]) << 4) + (HEX2INT(col[6]) << 0)
-							);
-
-							sec->extra_colormap->rgba =
-								pLocalPalette[nearest].s.red +
-								(pLocalPalette[nearest].s.green << 8) +
-								(pLocalPalette[nearest].s.blue << 16);*/
-						}
-						else
-							sec->extra_colormap->rgba = 0;
-
-						if (msd->bottomtexture[0] == '#' && msd->bottomtexture[1] && msd->bottomtexture[2] && msd->bottomtexture[3] && msd->bottomtexture[4] && msd->bottomtexture[5] && msd->bottomtexture[6])
-						{
-							col = msd->bottomtexture;
-
-							// do the exact same thing as above here.
-							
-							color.s.red = (HEX2INT(col[1]) << 4) + HEX2INT(col[2]);
-							color.s.green = (HEX2INT(col[3]) << 4) + HEX2INT(col[4]);
-							color.s.blue = (HEX2INT(col[5]) << 4) + HEX2INT(col[6]);
-
-#ifdef GLENCORE
-							if (encoremap)
-							{
-								j = encoremap[NearestColor(color.s.red, color.s.green, color.s.blue)];
-								//CONS_Printf("R_CreateColormap: encoremap[%d] = %d\n", j, encoremap[j]); -- moved encoremap upwards for optimisation
-								color = pLocalPalette[j]; // note: this sets alpha to 255, we will reset it below
-							}
-#endif
-							color.s.alpha = 0; // reset/init the alpha, so the addition below will work correctly
-							sec->extra_colormap->fadergba = color.rgba;
-
-							// alpha
-							if (msd->bottomtexture[7])
-								sec->extra_colormap->fadergba += (ALPHA2INT(col[7]) << 24);
-							else
-								sec->extra_colormap->fadergba += (25 << 24);
-						}
-						else
-							sec->extra_colormap->fadergba = 0x19000000; // default alpha, (25 << 24)
-#undef ALPHA2INT
-#undef HEX2INT
-					}
-					else
-					{
-						if ((num = R_CheckTextureNumForName(msd->toptexture)) == -1)
-							sd->toptexture = 0;
-						else
-							sd->toptexture = num;
-
-						if ((num = R_CheckTextureNumForName(msd->midtexture)) == -1)
-							sd->midtexture = 0;
-						else
-							sd->midtexture = num;
-
-						if ((num = R_CheckTextureNumForName(msd->bottomtexture)) == -1)
-							sd->bottomtexture = 0;
-						else
-							sd->bottomtexture = num;
-					}
-					break;
-				}
-#endif
-
+				P_LoadSideColormaps(msd, sd, sec);
+				break;
 			case 413: // Change music
-			{
-				char process[8+1];
-
-				sd->toptexture = sd->midtexture = sd->bottomtexture = 0;
-				if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
-				{
-					M_Memcpy(process,msd->bottomtexture,8);
-					process[8] = '\0';
-					sd->bottomtexture = get_number(process);
-				}
-
-				if (!(msd->midtexture[0] == '-' && msd->midtexture[1] == '\0') || msd->midtexture[1] != '\0')
-				{
-					M_Memcpy(process,msd->midtexture,8);
-					process[8] = '\0';
-					sd->midtexture = get_number(process);
-				}
-
-				// always process if back sidedef, because we need that - symbol
- 				sd->text = Z_Malloc(7, PU_LEVEL, NULL);
-				if (i == 1 || msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
-				{
-					M_Memcpy(process,msd->toptexture,8);
-					process[8] = '\0';
-
-					// If they type in O_ or D_ and their music name, just shrug,
-					// then copy the rest instead.
-					if ((process[0] == 'O' || process[0] == 'D') && process[7])
-						M_Memcpy(sd->text, process+2, 6);
-					else // Assume it's a proper music name.
-						M_Memcpy(sd->text, process, 6);
-					sd->text[6] = 0;
-				}
-				else
-					sd->text[0] = 0;
+				P_LoadSideChangeMusic((i == 1), msd, sd);
 				break;
-			}
-
 			case 4: // Speed pad parameters
 			case 414: // Play SFX
 			{
@@ -1619,7 +1602,6 @@ static void P_LoadRawSideDefs2(void *data)
 				}
 				break;
 			}
-
 			case 9: // Mace parameters
 			case 14: // Bustable block parameters
 			case 15: // Fan particle spawner parameters
@@ -1639,9 +1621,9 @@ static void P_LoadRawSideDefs2(void *data)
 				if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
 					M_Memcpy(process+strlen(process), msd->bottomtexture, 8);
 				sd->toptexture = get_number(process);
+
 				break;
 			}
-
 			case 443: // Calls a named Lua function
 			{
 				char process[8*3+1];
@@ -1657,15 +1639,17 @@ static void P_LoadRawSideDefs2(void *data)
 					M_Memcpy(process+strlen(process), msd->bottomtexture, 8);
 				sd->text = Z_Malloc(strlen(process)+1, PU_LEVEL, NULL);
 				M_Memcpy(sd->text, process, strlen(process)+1);
+
 				break;
 			}
-
 			default: // normal cases
 				if (msd->toptexture[0] == '#')
 				{
 					char *col = msd->toptexture;
-					sd->toptexture = sd->bottomtexture =
-						((col[1]-'0')*100 + (col[2]-'0')*10 + col[3]-'0') + 1;
+					sd->toptexture =
+						((col[1]-'0')*100 + (col[2]-'0')*10 + col[3]-'0')+1;
+					if (col[4]) // extra num for blendmode
+						sd->toptexture += (col[4]-'0')*1000;
 					sd->midtexture = R_TextureNumForName(msd->midtexture);
 				}
 				else
@@ -1677,6 +1661,7 @@ static void P_LoadRawSideDefs2(void *data)
 				break;
 		}
 	}
+
 	R_ClearTextureNumCache(true);
 }
 
@@ -1746,20 +1731,27 @@ static void P_CreateBlockMap(void)
 {
 	register size_t i;
 	fixed_t minx = INT32_MAX, miny = INT32_MAX, maxx = INT32_MIN, maxy = INT32_MIN;
-	// First find limits of map
 
+	// First find limits of map
 	for (i = 0; i < numvertexes; i++)
 	{
-		if (vertexes[i].x>>FRACBITS < minx)
-			minx = vertexes[i].x>>FRACBITS;
-		else if (vertexes[i].x>>FRACBITS > maxx)
-			maxx = vertexes[i].x>>FRACBITS;
-		if (vertexes[i].y>>FRACBITS < miny)
-			miny = vertexes[i].y>>FRACBITS;
-		else if (vertexes[i].y>>FRACBITS > maxy)
-			maxy = vertexes[i].y>>FRACBITS;
+		fixed_t t;
+
+		if ((t = vertexes[i].x) < minx)
+			minx = t;
+		else if (t > maxx)
+			maxx = t;
+		if ((t = vertexes[i].y) < miny)
+			miny = t;
+		else if (t > maxy)
+			maxy = t;
 	}
 
+	minx >>= FRACBITS;
+	maxx >>= FRACBITS;
+	miny >>= FRACBITS;
+	maxy >>= FRACBITS;
+
 	// Save blockmap parameters
 	bmaporgx = minx << FRACBITS;
 	bmaporgy = miny << FRACBITS;
@@ -2239,8 +2231,6 @@ static void P_LevelInitStuff(boolean reloadinggamestate)
 
 	leveltime = 0;
 
-	memset(localaiming, 0, sizeof(localaiming));
-
 	// map object scale
 	mapobjectscale = mapheaderinfo[gamemap-1]->mobj_scale;
 
@@ -2290,7 +2280,13 @@ static void P_LevelInitStuff(boolean reloadinggamestate)
 		players[i].lives = 1; // SRB2Kart
 
 		players[i].realtime = racecountdown = exitcountdown = 0;
-		curlap = bestlap = 0; // SRB2Kart
+
+		for (INT32 j = 0; j < LAP__MAX; j++)
+		{
+			players[i].laptime[j] = 0;
+		}
+
+		players[i].driftsparkGrowTimer = 0;
 
 		players[i].gotcontinue = false;
 
@@ -2342,6 +2338,7 @@ static void P_LevelInitStuff(boolean reloadinggamestate)
 			gamespeed = 0;
 		else
 			gamespeed = (UINT8)cv_kartspeed.value;
+
 		franticitems = (boolean)cv_kartfrantic.value;
 		comeback = (boolean)cv_kartcomeback.value;
 	}
@@ -2350,38 +2347,6 @@ static void P_LevelInitStuff(boolean reloadinggamestate)
 		battlewanted[i] = -1;
 }
 
-//
-// P_LoadThingsOnly
-//
-// "Reloads" a level, but only reloads all of the mobjs.
-//
-void P_LoadThingsOnly(void)
-{
-	// Search through all the thinkers.
-	thinker_t *think;
-
-	virtres_t* virt = vres_GetMap(lastloadedmaplumpnum);
-	virtlump_t* vth = vres_Find(virt, "THINGS");
-
-	for (think = thinkercap.next; think != &thinkercap; think = think->next)
-	{
-		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (think->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
-		P_RemoveMobj((mobj_t *)think);
-	}
-
-	P_LevelInitStuff(false);
-
-	P_PrepareRawThings(vth->data);
-	P_LoadThings();
-
-	vres_Free(virt);
-
-	P_SpawnSecretItems(true);
-}
-
 /** Compute MD5 message digest for bytes read from memory source
   *
   * The resulting message digest number will be written into the 16 bytes
@@ -2400,10 +2365,14 @@ static INT32 P_MakeBufferMD5(const char *buffer, size_t len, void *resblock)
 	return 1;
 #else
 	tic_t t = I_GetTime();
+
 	CONS_Debug(DBG_SETUP, "Making MD5\n");
+
 	if (md5_buffer(buffer, len, resblock) == NULL)
 		return 1;
+
 	CONS_Debug(DBG_SETUP, "MD5 calc took %f seconds\n", (float)(I_GetTime() - t)/NEWTICRATE);
+
 	return 0;
 #endif
 }
@@ -2484,6 +2453,7 @@ static void P_RunLevelScript(const char *scriptname)
 	{
 		COM_BufAddText(va("exec %s\n", scriptname));
 	}
+
 	COM_BufExecute(); // Run it!
 }
 
@@ -2631,7 +2601,6 @@ static void P_SetupCamera(UINT8 pnum, camera_t *cam)
 		cam->y = players[pnum].mo->y;
 		cam->z = players[pnum].mo->z;
 		cam->angle = players[pnum].mo->angle;
-		cam->subsector = R_PointInSubsector(cam->x, cam->y); // make sure camera has a subsector set -- Monster Iestyn (12/11/18)
 	}
 	else
 	{
@@ -2656,112 +2625,104 @@ static void P_SetupCamera(UINT8 pnum, camera_t *cam)
 		cam->y = thing->y;
 		cam->z = thing->z;
 		cam->angle = FixedAngle((fixed_t)thing->angle << FRACBITS);
-		cam->subsector = R_PointInSubsector(cam->x, cam->y); // make sure camera has a subsector set -- Monster Iestyn (12/11/18)
 	}
+
+	cam->subsector = R_PointInSubsectorFast(cam->x, cam->y); // make sure camera has a subsector set -- Monster Iestyn (12/11/18)
+
+	cam->chase = false; // tell camera to reset its position next tic
 }
 
-static boolean P_CanSave(void)
+static void P_InitCamera(void)
 {
-#if 0
-	// Saving is completely ignored under these conditions:
-	if ((cursaveslot < 0) // Playing without saving
-		|| (modifiedgame && !savemoddata) // Game is modified
-		|| (netgame || multiplayer) // Not in single-player
-		|| (demo.playback || demo.recording || metalrecording) // Currently in demo
-		|| (players[consoleplayer].lives <= 0) // Completely dead
-		|| (modeattacking || ultimatemode || G_IsSpecialStage(gamemap))) // Specialized instances
-		return false;
+	INT32 i;
 
-	if (mapheaderinfo[gamemap-1]->saveoverride == SAVE_ALWAYS)
-		return true; // Saving should ALWAYS happen!
-	else if (mapheaderinfo[gamemap-1]->saveoverride == SAVE_NEVER)
-		return false; // Saving should NEVER happen!
-
-	// Default condition: In a non-hidden map, at the beginning of a zone or on a completed save-file, and not on save reload.
-	return (!(mapheaderinfo[gamemap-1]->menuflags & LF2_HIDEINMENU)
-			&& (mapheaderinfo[gamemap-1]->actnum < 2 || gamecomplete)
-			&& (gamemap != lastmapsaved));
-#else
-	return false; // SRB2Kart: no SP, no saving.
-#endif
-}
-
-/** Loads a level from a lump or external wad.
-  *
-  * \param skipprecip If true, don't spawn precipitation.
-  * \todo Clean up, refactor, split up; get rid of the bloat.
-  */
-boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
-{
-	// use gamemap to get map number.
-	// 99% of the things already did, so.
-	// Map header should always be in place at this point
-	INT32 i, loadprecip = 1, ranspecialwipe = 0;
-	INT32 loademblems = 1;
-	INT32 fromnetsave = 0;
-	midgamejoin = 0;
-	sector_t *ss;
-	boolean chase;
-
-	levelloading = true;
-
-	// This is needed. Don't touch.
-	maptol = mapheaderinfo[gamemap-1]->typeoflevel;
-
-	CON_Drawer(); // let the user know what we are going to do
-	I_FinishUpdate(); // page flip or blit buffer
-
-	// Initialize sector node list.
-	P_Initsecnode();
-
-	if (netgame || multiplayer)
-		cv_debug = botskin = 0;
-
-	if (metalplayback)
-		G_StopMetalDemo();
-
-	// Clear CECHO messages
-	HU_ClearCEcho();
-
-	if (mapheaderinfo[gamemap-1]->runsoc[0] != '#')
-		P_RunSOC(mapheaderinfo[gamemap-1]->runsoc);
-
-	if (cv_runscripts.value && mapheaderinfo[gamemap-1]->scriptname[0] != '#')
-		P_RunLevelScript(mapheaderinfo[gamemap-1]->scriptname);
-
-	P_LevelInitStuff(reloadinggamestate);
+	if (dedicated)
+		return;
 
 	for (i = 0; i <= splitscreen; i++)
-		postimgtype[i] = postimg_none;
-
-	if (mapheaderinfo[gamemap-1]->forcecharacter[0] != '\0'
-	&& atoi(mapheaderinfo[gamemap-1]->forcecharacter) != 255)
-		P_ForceCharacter(mapheaderinfo[gamemap-1]->forcecharacter);
-
-	// chasecam on in chaos, race, coop
-	// chasecam off in match, tag, capture the flag
-	chase = true; // srb2kart: always on
-
-	if (!dedicated)
 	{
-		if (!cv_chasecam.changed)
-			CV_SetValue(&cv_chasecam, chase);
+		if (camera[i].freecam)
+			continue;
 
-		// same for second player
-		if (!cv_chasecam2.changed)
-			CV_SetValue(&cv_chasecam2, chase);
-
-		if (!cv_chasecam3.changed)
-			CV_SetValue(&cv_chasecam3, chase);
-
-		if (!cv_chasecam4.changed)
-			CV_SetValue(&cv_chasecam4, chase);
+		P_SetupCamera(displayplayers[i], &camera[i]);
 	}
 
-	// Initial height of PointOfView
-	// will be set by player think.
-	players[consoleplayer].viewz = 1;
+	// Though, I don't think anyone would care about cam_rotate being reset back to the only value that makes sense :P
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (!cv_cam_rotate[i].changed)
+			CV_Set(&cv_cam_rotate[i], cv_cam_rotate[i].defaultvalue);
+	}
 
+	displayplayers[0] = consoleplayer; // Start with your OWN view, please!
+}
+
+struct minimapinfo minimapinfo;
+static void P_InitMinimapInfo(void)
+{
+	lumpnum_t lumpnum;
+	fixed_t a;
+	fixed_t b;
+
+	node_t *bsp = &nodes[numnodes-1];
+
+	minimapinfo.minimap_pic = NULL;
+
+	lumpnum = W_CheckNumForName(va("%sR", G_BuildMapName(gamemap)));
+
+	if (lumpnum != LUMPERROR)
+		minimapinfo.minimap_pic = W_CachePatchName(va("%sR", G_BuildMapName(gamemap)), PU_HUDGFX);
+
+	minimapinfo.min_x = bsp->bbox[0][BOXLEFT];
+	minimapinfo.max_x = bsp->bbox[0][BOXRIGHT];
+	minimapinfo.min_y = bsp->bbox[0][BOXBOTTOM];
+	minimapinfo.max_y = bsp->bbox[0][BOXTOP];
+
+	if (bsp->bbox[1][BOXLEFT] < minimapinfo.min_x)
+		minimapinfo.min_x = bsp->bbox[1][BOXLEFT];
+	if (bsp->bbox[1][BOXRIGHT] > minimapinfo.max_x)
+		minimapinfo.max_x = bsp->bbox[1][BOXRIGHT];
+	if (bsp->bbox[1][BOXBOTTOM] < minimapinfo.min_y)
+		minimapinfo.min_y = bsp->bbox[1][BOXBOTTOM];
+	if (bsp->bbox[1][BOXTOP] > minimapinfo.max_y)
+		minimapinfo.max_y = bsp->bbox[1][BOXTOP];
+
+	// You might be wondering why these are being bitshift here
+	// it's because mapwidth and height would otherwise overflow for maps larger than half the size possible...
+	// map boundaries and sizes will ALWAYS be whole numbers thankfully
+	// later calculations take into consideration that these are actually not in terms of FRACUNIT though
+	minimapinfo.map_w = (minimapinfo.max_x >>= FRACBITS) - (minimapinfo.min_x >>= FRACBITS);
+	minimapinfo.map_h = (minimapinfo.max_y >>= FRACBITS) - (minimapinfo.min_y >>= FRACBITS);
+
+	minimapinfo.minimap_w = minimapinfo.minimap_h = 100;
+
+	a = FixedDiv(minimapinfo.minimap_w<<FRACBITS, minimapinfo.map_w<<4);
+	b = FixedDiv(minimapinfo.minimap_h<<FRACBITS, minimapinfo.map_h<<4);
+
+	if (a < b)
+	{
+		minimapinfo.minimap_h = FixedMul(a, minimapinfo.map_h)>>(FRACBITS-4);
+		minimapinfo.zoom = a;
+	}
+	else
+	{
+		if (a != b)
+		{
+			minimapinfo.minimap_w = FixedMul(b, minimapinfo.map_w)>>(FRACBITS-4);
+		}
+		minimapinfo.zoom = b;
+	}
+
+	minimapinfo.zoom >>= (FRACBITS-4);
+	minimapinfo.zoom -= (minimapinfo.zoom/20);
+
+	// These should always be small enough to be bitshift back right now
+	minimapinfo.offs_x = FixedMul((minimapinfo.min_x + minimapinfo.map_w/2) << FRACBITS, minimapinfo.zoom);
+	minimapinfo.offs_y = FixedMul((minimapinfo.min_y + minimapinfo.map_h/2) << FRACBITS, minimapinfo.zoom);
+}
+
+static boolean P_RunSpecialWipe(boolean reloadinggamestate)
+{
 	// Cancel all d_main.c fadeouts (keep fade in though).
 	if (reloadinggamestate)
 		wipegamestate = gamestate; // Don't fade if reloading the gamestate
@@ -2789,12 +2750,12 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 			F_WipeEndScreen();
 			F_RunWipe(wipedefs[wipe_level_final], false);
 		}
-		else //dedicated servers can call this now, to wait the appropriate amount of time for clients to wipe
+		else // dedicated servers can call this now, to wait the appropriate amount of time for clients to wipe
 		{
 			F_RunWipe(wipedefs[wipe_speclevel_towhite], false);
 			F_RunWipe(wipedefs[wipe_level_final], false);
 		}
-		
+
 		locstarttime = nowtime = lastwipetic;
 		endtime = locstarttime + (3*TICRATE)/2;
 
@@ -2807,7 +2768,9 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 				I_Sleep(cv_sleep.value);
 				I_UpdateTime(cv_timescale.value);
 			}
+
 			lastwipetic = nowtime;
+
 			if (moviemode) // make sure we save frames for the white hold too
 				M_SaveFrame();
 
@@ -2815,12 +2778,13 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 			NetKeepAlive();
 		}
 
-		ranspecialwipe = 1;
+		return true;
 	}
 
-	// Make sure all sounds are stopped before Z_FreeTags.
-	S_StopSounds();
+	return false;
+}
 
+<<<<<<< HEAD
 	if (!S_PrecacheSound())
 		S_ClearSfx();
 
@@ -2967,8 +2931,14 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 	if (fromnetsave)
 		goto netgameskip;
 	// ==========
+=======
+static void P_SetupPlayer(void)
+{
+	INT32 i;
+>>>>>>> Saturn-Next
 
 	for (i = 0; i < MAXPLAYERS; i++)
+	{
 		if (playeringame[i])
 		{
 			players[i].pflags &= ~PF_NIGHTSMODE;
@@ -2984,15 +2954,10 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 			else // gametype is GT_COOP or GT_RACE
 			{
 				players[i].mo = NULL;
-
-				if (players[i].starposttime)
-				{
-					G_SpawnPlayer(i, true);
-				}
-				else
-					G_SpawnPlayer(i, false);
+				G_SpawnPlayer(i, (players[i].starposttime));
 			}
 		}
+	}
 
 	if (modeattacking == ATTACKING_RECORD && !demo.playback)
 		P_LoadRecordGhosts();
@@ -3017,7 +2982,7 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 			}
 		}
 
-		if (realnumplayers) //this should also fix the dedicated crash bug. You only pick a player if one exists to be picked.
+		if (realnumplayers) // this should also fix the dedicated crash bug. You only pick a player if one exists to be picked.
 		{
 			i = P_RandomKey(realnumplayers);
 			players[playersactive[i]].pflags |= PF_TAGIT; //choose our initial tagger before map starts.
@@ -3043,16 +3008,15 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 			: mapheaderinfo[gamemap - 1]->numlaps);
 
 	// Start recording replay in multiplayer with a temp filename
-	//Ensure dedis only record a replay if there is a player at the start of the map, otherwise we get invalid replays!
-	if (!demo.playback && multiplayer && D_NumPlayers()) {
+	// Ensure dedis only record a replay if there is a player at the start of the map, otherwise we get invalid replays!
+	if (!demo.playback && multiplayer && D_NumPlayers())
+	{
 		static char buf[256];
 		sprintf(buf, "replay"PATHSEP"online"PATHSEP"%d-%s", (int) (time(NULL)), G_BuildMapName(gamemap));
 
 		I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755);
 		I_mkdir(va("%s"PATHSEP"replay"PATHSEP"online", srb2home), 0755);
 		G_RecordDemo(buf);
-		if (dedicated)
-			G_BeginRecording(); //this has to move here, since dedicated servers dont run got_mapcmd
 	}
 
 	K_InitDirector();
@@ -3087,31 +3051,226 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 			startedInFreePlay = true;
 		}
 	}
+}
 
-	// ===========
-	// landing point for netgames.
-	netgameskip:
+/** Loads a level from a lump or external wad.
+  *
+  * \param fromnetsave If true, skip some stuff because we're loading a netgame snapshot.
+  * \todo Clean up, refactor, split up; get rid of the bloat.
+  */
+boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
+{
+	// use gamemap to get map number.
+	// 99% of the things already did, so.
+	// Map header should always be in place at this point
+	INT32 i;
+	boolean ranspecialwipe = false;
+	sector_t *ss;
+
+	midgamejoin = fromnetsave; // makes dynslopes run in P_Ticker/P_PreTicker to avoid synch issues and other stuff
+
+	levelloading = true;
+
+	// This is needed. Don't touch.
+	maptol = mapheaderinfo[gamemap-1]->typeoflevel;
+
+	CON_Drawer(); // let the user know what we are going to do
+	I_FinishUpdate(); // page flip or blit buffer
+
+	// Initialize sector node list.
+	P_Initsecnode();
+
+	if (netgame || multiplayer)
+		cv_debug = botskin = 0;
+
+	if (metalplayback)
+		G_StopMetalDemo();
+
+	// Clear CECHO messages
+	HU_ClearCEcho();
+
+	if (mapheaderinfo[gamemap-1]->runsoc[0] != '#')
+		P_RunSOC(mapheaderinfo[gamemap-1]->runsoc);
+
+	if (cv_runscripts.value && mapheaderinfo[gamemap-1]->scriptname[0] != '#')
+		P_RunLevelScript(mapheaderinfo[gamemap-1]->scriptname);
+
+	P_LevelInitStuff(reloadinggamestate);
+
+	if (mapheaderinfo[gamemap-1]->forcecharacter[0] != '\0'
+	&& atoi(mapheaderinfo[gamemap-1]->forcecharacter) != 255)
+		P_ForceCharacter(mapheaderinfo[gamemap-1]->forcecharacter);
 
 	if (!dedicated)
 	{
-		if (!demo.freecam)
-			for (i = 0; i <= splitscreen; i++)
-				P_SetupCamera(displayplayers[i], &camera[i]);
+		for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+		{
+			if (!cv_chasecam[i].changed)
+				CV_SetValue(&cv_chasecam[i], true); // srb2kart: always on
+		}
+	}
 
-		// Though, I don't think anyone would care about cam_rotate being reset back to the only value that makes sense :P
-		if (!cv_cam_rotate.changed)
-			CV_Set(&cv_cam_rotate, cv_cam_rotate.defaultvalue);
+	// Initial height of PointOfView
+	// will be set by player think.
+	players[consoleplayer].viewz = 1;
 
-		if (!cv_cam2_rotate.changed)
-			CV_Set(&cv_cam2_rotate, cv_cam2_rotate.defaultvalue);
+	ranspecialwipe = P_RunSpecialWipe(reloadinggamestate);
 
-		if (!cv_cam3_rotate.changed)
-			CV_Set(&cv_cam3_rotate, cv_cam3_rotate.defaultvalue);
+	// Make sure all sounds are stopped before Z_FreeTags.
+	S_StopSounds();
 
-		if (!cv_cam4_rotate.changed)
-			CV_Set(&cv_cam4_rotate, cv_cam4_rotate.defaultvalue);
+	if (!S_PrecacheSound())
+		S_ClearSfx();
 
-		displayplayers[0] = consoleplayer; // Start with your OWN view, please!
+	// As oddly named as this is, this handles music only.
+	// We should be fine starting it here.
+	if (!reloadinggamestate)
+		S_InitMapMusic();
+
+	levelfadecol = (encoremode && !ranspecialwipe ? 122 : 120);
+
+	// Let's fade to white here
+	// But only if we didn't do the encore startup wipe
+	if (!ranspecialwipe && !demo.rewinding && !reloadinggamestate)
+	{
+		if (rendermode != render_none)
+		{
+			F_WipeStartScreen();
+			V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol);
+			F_WipeEndScreen();
+		}
+
+		F_RunWipe(wipedefs[(encoremode ? wipe_level_final : wipe_level_toblack)], false);
+	}
+
+	// Reset the palette now all fades have been done
+	if (rendermode != render_none)
+	{
+		//V_ResetPaletteCVars(); // dont carry over changed palettes
+		V_SetPaletteLump(GetPalette()); // Set the level palette
+	}
+
+	// Print "SPEEDING OFF TO [ZONE] [ACT 1]..."
+	/*if (rendermode != render_none)
+	{
+		// Don't include these in the fade!
+		char tx[64];
+		V_DrawSmallString(1, 191, V_ALLOWLOWERCASE, M_GetText("Speeding off to..."));
+		snprintf(tx, 63, "%s%s%s",
+			mapheaderinfo[gamemap-1]->lvlttl,
+			(strlen(mapheaderinfo[gamemap-1]->zonttl) > 0) ? va(" %s",mapheaderinfo[gamemap-1]->zonttl) : // SRB2kart
+			((mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE) ? "" : " Zone"),
+			(strlen(mapheaderinfo[gamemap-1]->actnum) > 0) ? va(", Act %s",mapheaderinfo[gamemap-1]->actnum) : "");
+		V_DrawSmallString(1, 195, V_ALLOWLOWERCASE, tx);
+		I_UpdateNoVsync();
+	}*/
+
+	LUA_InvalidateLevel();
+
+	for (ss = sectors; sectors+numsectors != ss; ss++)
+	{
+		Z_Free(ss->attached);
+		Z_Free(ss->attachedsolid);
+	}
+
+	// Clear pointers that would be left dangling by the purge
+	R_FlushTranslationColormapCache();
+
+#ifdef HWRENDER
+	// Free GPU textures before freeing patches.
+	if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
+		HWR_ClearAllTextures();
+
+	// Delete light table textures
+	HWR_ClearLightTables();
+#endif
+
+	Patch_FreeTag(PU_PATCH_LOWPRIORITY);
+	//Patch_FreeTag(PU_PATCH_ROTATED); // we keep those ty!
+	Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
+
+#if defined (WALLSPLATS) || defined (FLOORSPLATS)
+	// clear the splats from previous level
+	R_ClearLevelSplats();
+#endif
+
+	mobjcache = NULL;
+
+	R_InitializeLevelInterpolators();
+
+	P_InitThinkers();
+	R_InitMobjInterpolators();
+	P_InitCachedActions();
+
+	// internal game map
+	maplumpname = G_BuildMapName(gamemap);
+	lastloadedmaplumpnum = W_CheckNumForName(maplumpname);
+	if (lastloadedmaplumpnum == INT16_MAX)
+		I_Error("Map %s not found.\n", maplumpname);
+
+	curmapvirt = vres_GetMap(lastloadedmaplumpnum);
+
+	R_ReInitColormaps(mapheaderinfo[gamemap-1]->palette,
+		W_CheckNumForName(va("%s%c", maplumpname, (encoremode ? 'E' : 'T'))));
+	CON_SetupBackColormap();
+
+	// SRB2 determines the sky texture to be used depending on the map header.
+	P_SetupLevelSky(mapheaderinfo[gamemap-1]->skynum, true);
+
+	numdmstarts = numredctfstarts = numbluectfstarts = 0;
+
+	// reset the player starts
+	memset(playerstarts, 0, sizeof(playerstarts));
+	memset(skyboxmo, 0, sizeof(skyboxmo));
+
+	P_MapStart();
+
+	if (lastloadedmaplumpnum)
+		P_LoadMapFromFile();
+
+	P_ResetDynamicSlopes();
+
+	P_LoadThings();
+
+	P_SpawnSecretItems(!fromnetsave);
+
+	P_InitMinimapInfo();
+
+	for (numcoopstarts = 0; numcoopstarts < MAXPLAYERS; numcoopstarts++)
+		if (!playerstarts[numcoopstarts])
+			break;
+
+	globalweather = mapheaderinfo[gamemap-1]->weather;
+
+	// set up world state
+	P_SpawnSpecials(fromnetsave, reloadinggamestate);
+
+	if (!fromnetsave) //  ugly hack for P_NetUnArchiveMisc (and P_LoadNetGame)
+		P_SpawnPrecipitation();
+
+#ifdef HWRENDER // not win32 only 19990829 by Kin
+	if (rendermode == render_opengl)
+	{
+		// Create plane polygons.
+		HWR_LoadLevel();
+	}
+#endif
+
+	// oh god I hope this helps
+	// (addendum: apparently it does!
+	//  none of this needs to be done because it's not the beginning of the map when
+	//  a netgame save is being loaded, and could actively be harmful by messing with
+	//  the client's view of the data.)
+	if (!fromnetsave)
+		P_SetupPlayer();
+
+	if (!reloadinggamestate)
+	{
+		P_InitCamera();
+		memset(localaiming, 0, sizeof(localaiming));
+
+		if (!dedicated)
+			K_InitDirector();
 	}
 
 	// clear special respawning que
@@ -3120,25 +3279,22 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 	P_MapEnd();
 
 	// Remove the loading shit from the screen
-	if (rendermode != render_none && (!reloadinggamestate))
+	if (rendermode != render_none && !reloadinggamestate)
 		V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol);
 
-	if (precache || dedicated)
+	if (cv_precachetextures.value)
 		R_PrecacheLevel();
 
 	nextmapoverride = 0;
 	skipstats = false;
 
-	if (!(netgame || multiplayer) && !majormods)
+	if (!(netgame || multiplayer))
 		mapvisited[gamemap-1] |= MV_VISITED;
 
 	levelloading = false;
 
 	P_RunCachedActions();
 
-	if (P_CanSave())
-		G_SaveGame((UINT32)cursaveslot);
-
 	if (savedata.lives > 0)
 	{
 		players[consoleplayer].continues = savedata.continues;
@@ -3155,19 +3311,23 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate)
 	skyVisible = true;
 	memset(skyVisiblePerPlayer, true, sizeof(skyVisiblePerPlayer));
 
-	if (loadprecip) // uglier hack
+	if (!fromnetsave) // uglier hack
 	{ // to make a newly loaded level start on the second frame.
-		INT32 buf = gametic % TICQUEUE;
+		INT32 buf = gametic % BACKUPTICS;
+
 		for (i = 0; i < MAXPLAYERS; i++)
 		{
 			if (playeringame[i])
 				G_CopyTiccmd(&players[i].cmd, &netcmds[buf][i], 1);
 		}
+
 		P_PreTicker(2);
-		LUAh_MapLoad();
+
+		if (!reloadinggamestate)
+			LUA_HookInt(gamemap, HOOK(MapLoad));
 	}
 
-	if (rendermode != render_none)
+	if (rendermode != render_none && !reloadinggamestate)
 	{
 		R_ResetViewInterpolation(0);
 		R_UpdateMobjInterpolators();
@@ -3217,55 +3377,24 @@ boolean P_AddWadFile(const char *wadfilename, boolean local)
 	return true;
 }
 
-boolean P_AddWadFileLocal(const char *wadfilename)
-{
-	UINT16 wadnum;
-
-	if ((wadnum = P_PartialAddWadFile(wadfilename, true)) == UINT16_MAX)
-		return false;
-
-	P_MultiSetupWadFiles(true);
-	return true;
-}
+static size_t sreplaces = 0, mreplaces = 0, digmreplaces = 0;
 
 //
-// Add a WAD file and do the per-WAD setup stages.
-// Call P_MultiSetupWadFiles as soon as possible after any number of these.
+// search for sound replacements
 //
-UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
+static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
 {
-	size_t i, j, sreplaces = 0, mreplaces = 0, digmreplaces = 0;
-	UINT16 numlumps, wadnum;
-	char *name;
-	boolean mapsadded = false;
-	lumpinfo_t *lumpinfo;
+	size_t j;
+	lumpnum_t lumpnum = (i|(wadnum<<16));
 
-	if ((numlumps = W_InitFile(wadfilename, local)) == INT16_MAX)
+	if (name[0] == 'D')
 	{
-		refreshdirmenu |= REFRESHDIR_NOTLOADED;
-		CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), wadfilename);
-		return UINT16_MAX;
-	}
-	else wadnum = (UINT16)(numwadfiles-1);
-
-	if (wadfiles[wadnum]->important)
-		partadd_important = true;
-
-	wadfiles[wadnum]->localfile = local;
-
-	//
-	// search for sound replacements
-	//
-	lumpinfo = wadfiles[wadnum]->lumpinfo;
-	for (i = 0; i < numlumps; i++, lumpinfo++)
-	{
-		name = lumpinfo->name;
-		lumpnum_t lumpnum = i|(wadnum<<16);
-		if (name[0] == 'D')
+		if (name[1] == 'S')
 		{
-			if (name[1] == 'S') for (j = 1; j < NUMSFX; j++)
+			for (j = 1; j < NUMSFX; j++)
 			{
-				if (S_sfx[j].name && !strnicmp(S_sfx[j].name, name + 2, 6) && S_sfx[j].lumpnum != lumpnum && S_sfx[j].lumpnum != LUMPERROR)
+				if (S_sfx[j].name && !strnicmp(S_sfx[j].name, name + 2, 6)
+				&& (S_sfx[j].lumpnum != lumpnum) && (S_sfx[j].lumpnum != LUMPERROR))
 				{
 					// the sound will be reloaded when needed,
 					// since sfx->data will be NULL
@@ -3278,20 +3407,146 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 						S_sfx[j].data = I_GetSfx(&S_sfx[j]);
 
 					sreplaces++;
+					return true;
 				}
 			}
-			else if (name[1] == '_')
-			{
-				CONS_Debug(DBG_SETUP, "Music %.8s ignored\n", name);
-				mreplaces++;
-			}
 		}
-		else if (name[0] == 'O' && name[1] == '_')
+		else if (name[1] == '_')
 		{
-			CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name);
-			digmreplaces++;
+			CONS_Debug(DBG_SETUP, "Music %.8s ignored\n", name);
+			mreplaces++;
+			return true;
 		}
 	}
+	else if (name[0] == 'O' && name[1] == '_')
+	{
+		CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name);
+		digmreplaces++;
+		return true;
+	}
+
+	return false;
+}
+
+//
+// search for maps
+//
+static boolean P_CheckMapReplacements(char *name)
+{
+	if (memcmp(name, "MAP", 3) == 0) // Ignore the headers
+	{
+		INT16 num;
+
+		if (name[5] != '\0')
+			return false;
+
+		num = (INT16)M_MapNumber(name[3], name[4]);
+
+		// we want to record whether this map exists. if it doesn't have a header, we can assume it's not relephant
+		if (num <= NUMMAPS && mapheaderinfo[num-1])
+		{
+			if (mapheaderinfo[num-1]->menuflags & LF2_EXISTSHACK)
+				G_SetGameModified(multiplayer, true); // oops, double-defined - no record attack privileges for you
+			mapheaderinfo[num-1]->menuflags |= LF2_EXISTSHACK;
+		}
+
+		if (num == gamemap)
+			partadd_replacescurrentmap = true;
+
+		CONS_Printf("%s\n", name);
+		return true;
+	}
+
+	return false;
+}
+
+//
+// check for non Lua votescreen replacements
+//
+static boolean P_CheckVoteReplacements(char *name)
+{
+	// widescreen patch Race
+	if (!VoteScreen.replaced.widerace && !memcmp(name, "INTERSCW", 8))
+	{
+		VoteScreen.replaced.widerace = true;
+		return false;
+	}
+
+	if (!VoteScreen.replaced.race && !memcmp(name, "INTERSCR", 8))
+	{
+		VoteScreen.replaced.race = true;
+		return false;
+	}
+
+	// widescreen patch Battle
+	if (!VoteScreen.replaced.widebattle && !memcmp(name, "BATTLSCW", 8))
+	{
+		VoteScreen.replaced.widebattle = true;
+		return false;
+	}
+
+	if (!VoteScreen.replaced.battle && !memcmp(name, "BATTLSCR", 8))
+	{
+		VoteScreen.replaced.battle = true;
+		return false;
+	}
+
+	if (VoteScreen.replaced.widerace && VoteScreen.replaced.race
+	&& VoteScreen.replaced.widebattle && VoteScreen.replaced.battle)
+	{
+		return true;
+	}
+
+	return false;
+}
+
+//
+// Add a WAD file and do the per-WAD setup stages.
+// Call P_MultiSetupWadFiles as soon as possible after any number of these.
+//
+UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
+{
+	size_t i;
+	UINT16 numlumps, wadnum;
+	char *name;
+	boolean mapsadded = false;
+	static boolean allvotereplaced = false;
+	lumpinfo_t *lumpinfo;
+
+	sreplaces = mreplaces = digmreplaces = 0;
+
+	if ((numlumps = W_InitFile(wadfilename, local)) == INT16_MAX)
+	{
+		refreshdirmenu |= REFRESHDIR_NOTLOADED;
+		CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), wadfilename);
+		return UINT16_MAX;
+	}
+
+	wadnum = (UINT16)(numwadfiles-1);
+
+	if (wadfiles[wadnum]->important)
+		partadd_important = true;
+
+	wadfiles[wadnum]->localfile = local;
+
+	lumpinfo = wadfiles[wadnum]->lumpinfo;
+	for (i = 0; i < numlumps; i++, lumpinfo++)
+	{
+		name = lumpinfo->name;
+
+		if (P_CheckSoundReplacements(wadnum, name, i))
+			continue;
+
+		if (P_CheckMapReplacements(name))
+		{
+			mapsadded = true;
+			continue;
+		}
+
+		if (!allvotereplaced && P_CheckVoteReplacements(name))
+			allvotereplaced = true;
+	}
+
 	if (!devparm && sreplaces)
 		CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces));
 	if (!devparm && mreplaces)
@@ -3299,11 +3554,21 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 	if (!devparm && digmreplaces)
 		CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces));
 
+	if (!mapsadded)
+		CONS_Printf(M_GetText("No maps added\n"));
+
 	//
 	// search for sprite replacements
 	//
+	//Patch_FreeTag(PU_SPRITE);
+	//Patch_FreeTag(PU_PATCH_ROTATED);
 	R_AddSpriteDefs(wadnum);
 
+	// Reload it all anyway, just in case they
+	// added some textures but didn't insert a
+	// TEXTURES/etc. list.
+	//R_LoadTexturesPwad(wadnum);
+
 	// everything from MultiSetupWadFile until ST_Start was here originally
 
 	//
@@ -3317,42 +3582,9 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 	S_LoadMusicDefs(wadnum);
 
 	//
-	// edit music defs for stuff like musictest
+	// look for emotes
 	//
-	S_LoadMTDefs(wadnum);
-
-	//
-	// search for maps
-	//
-	lumpinfo = wadfiles[wadnum]->lumpinfo;
-	for (i = 0; i < numlumps; i++, lumpinfo++)
-	{
-		name = lumpinfo->name;
-
-		if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers
-		{
-			INT16 num;
-			if (name[5]!='\0')
-				continue;
-			num = (INT16)M_MapNumber(name[3], name[4]);
-
-			// we want to record whether this map exists. if it doesn't have a header, we can assume it's not relephant
-			if (num <= NUMMAPS && mapheaderinfo[num-1])
-			{
-				if (mapheaderinfo[num-1]->menuflags & LF2_EXISTSHACK)
-					G_SetGameModified(multiplayer, true); // oops, double-defined - no record attack privileges for you
-				mapheaderinfo[num-1]->menuflags |= LF2_EXISTSHACK;
-			}
-
-			if (num == gamemap)
-				partadd_replacescurrentmap = true;
-
-			CONS_Printf("%s\n", name);
-			mapsadded = true;
-		}
-	}
-	if (!mapsadded)
-		CONS_Printf(M_GetText("No maps added\n"));
+	M_LoadEmotes(wadnum);
 
 	// TODO: Experimental SPRTINFO support, test first
 	R_LoadSpriteInfoLumps(wadnum, wadfiles[wadnum]->numlumps);
@@ -3364,7 +3596,8 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
 
 // Only exists to make sure there's no way to overwrite partadd_stage externally
 // unless you really push yourself.
-SINT8 P_PartialAddGetStage(void) {
+SINT8 P_PartialAddGetStage(void)
+{
 	return partadd_stage;
 }
 
@@ -3381,17 +3614,32 @@ boolean P_MultiSetupWadFiles(boolean fullsetup)
 	if (partadd_stage == 0)
 	{
 		// Flush and reload HUD graphics
-		ST_UnloadGraphics();
+		//ST_UnloadGraphics();
 		HU_LoadGraphics();
 		ST_LoadGraphics();
 		ST_ReloadSkinFaceGraphics();
 
+<<<<<<< HEAD
 		if (fullsetup)
+=======
+		// reload minimap stuff while were in the map since it may get replaced otherwise
+		if (gamestate == GS_LEVEL)
+			P_InitMinimapInfo();
+
+		if (!partadd_important)
+			partadd_stage = -1; // everything done
+		else if (fullsetup)
+>>>>>>> Saturn-Next
 			++partadd_stage; // run next stage too
 	}
 
 	if (partadd_stage == 1)
 	{
+#ifdef HWRENDER
+		// Free GPU textures before freeing patches.
+		if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
+			HWR_ClearAllTextures();
+#endif
 		// Reload all textures, unconditionally for better or worse.
 		R_LoadTextures();
 
diff --git a/src/p_setup.h b/src/p_setup.h
index 057ea505f..5d4a3b9da 100644
--- a/src/p_setup.h
+++ b/src/p_setup.h
@@ -14,16 +14,21 @@
 #ifndef __P_SETUP__
 #define __P_SETUP__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomdata.h"
 #include "doomstat.h"
 #include "r_defs.h"
 #include "w_wad.h"
 
-extern SINT8 midgamejoin;
-
 // map md5, sent to players via PT_SERVERINFO
 extern unsigned char mapmd5[16];
 
+// true when level was loaded from netsave
+extern boolean midgamejoin;
+
 // Player spawn spots for deathmatch.
 #define MAX_DM_STARTS 64
 extern mapthing_t *deathmatchstarts[MAX_DM_STARTS];
@@ -47,6 +52,7 @@ typedef struct
 	INT32 animseq; // start pos. in the anim sequence
 	INT32 numpics;
 	INT32 speed;
+	boolean cyan;
 } levelflat_t;
 
 extern size_t numlevelflats;
@@ -59,16 +65,13 @@ extern size_t nummapthings;
 extern mapthing_t *mapthings;
 
 void P_SetupLevelSky(INT32 skynum, boolean global);
-#ifdef SCANTHINGS
-void P_ScanThings(INT16 mapnum, INT16 wadnum, INT16 lumpnum);
-#endif
-void P_LoadThingsOnly(void);
-boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate);
+boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate);
+
 #ifdef HWRENDER
 void HWR_LoadLevel(void);
 #endif
+
 boolean P_AddWadFile(const char *wadfilename, boolean local);
-boolean P_AddWadFileLocal(const char *wadfilename);
 
 // WARNING: The following functions should be grouped as follows:
 // any amount of PartialAdds followed by MultiSetups until returned true,
@@ -91,15 +94,30 @@ SINT8 P_PartialAddGetStage(void);
 
 boolean P_RunSOC(const char *socfilename);
 void P_WriteThings(lumpnum_t lump);
+
+#if defined (WALLSPLATS) || defined (FLOORSPLATS)
+fixed_t P_SegLength(seg_t *seg);
+#endif
+
+extern boolean reinitmaplight;
+void P_UpdateSegLightOffset(seg_t *li);
+boolean P_ApplyLightOffset(UINT8 baselightnum, const sector_t *sector);
+boolean P_ApplyLightOffsetFine(UINT8 baselightlevel, const sector_t *sector);
+boolean P_SectorUsesDirectionalLighting(const sector_t *sector);
+
 size_t P_PrecacheLevelFlats(void);
+
 void P_AllocMapHeader(INT16 i);
 
 // Needed for NiGHTS
-void P_ReloadRings(void);
 void P_DeleteGrades(INT16 i);
 void P_AddGradesForMare(INT16 i, UINT8 mare, char *gtext);
 UINT8 P_GetGrade(UINT32 pscore, INT16 map, UINT8 mare);
 UINT8 P_HasGrades(INT16 map, UINT8 mare);
 UINT32 P_GetScoreForGrade(INT16 map, UINT8 mare, UINT8 grade);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/p_sight.c b/src/p_sight.c
index cc96b3c14..c7dbd6d09 100644
--- a/src/p_sight.c
+++ b/src/p_sight.c
@@ -33,6 +33,9 @@ typedef struct {
 
 static INT32 sightcounts[2];
 
+typedef INT32 (*divlinefunc)(fixed_t x, fixed_t y, const divline_t *node);
+typedef INT32 (*divlinecrossfunc)(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, const divline_t *node);
+
 //
 // P_DivlineSide
 //
@@ -42,17 +45,45 @@ static INT32 sightcounts[2];
 static INT32 P_DivlineSide(fixed_t x, fixed_t y, const divline_t *node)
 {
 	fixed_t left, right;
+<<<<<<< HEAD
 	return
+=======
+
+	return(
+>>>>>>> Saturn-Next
 		!node->dx ? x == node->x ? 2 : x <= node->x ? node->dy > 0 : node->dy < 0 :
 		!node->dy ? y == node->y ? 2 : y <= node->y ? node->dx < 0 : node->dx > 0 :
 		(right = ((y - node->y) >> FRACBITS) * (node->dx >> FRACBITS)) <
 		(left  = ((x - node->x) >> FRACBITS) * (node->dy >> FRACBITS)) ? 0 :
+<<<<<<< HEAD
 		right == left ? 2 : 1;
 }
 
 static INT32 P_DivlineCrossed(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, const divline_t *node)
 {
 	return (P_DivlineSide(x1, y1, node) == P_DivlineSide(x2, y2, node));
+=======
+		right == left ? 2 : 1);
+}
+
+static inline INT32 P_DivlineSideFast(fixed_t x, fixed_t y, const divline_t *node)
+{
+	INT64 v = ((INT64)y - node->y) * node->dx - ((INT64)x - node->x) * node->dy;
+
+	if (v == 0)
+		return 2;
+	return v > 0;
+}
+
+static inline INT32 P_DivlineCrossed(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, const divline_t *node)
+{
+	return (P_DivlineSide(x1, y1, node) == P_DivlineSide(x2, y2, node));
+}
+
+static inline INT32 P_DivlineCrossedFast(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, const divline_t *node)
+{
+	return (P_DivlineSideFast(x1, y1, node) == P_DivlineSideFast(x2, y2, node));
+>>>>>>> Saturn-Next
 }
 
 static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
@@ -100,10 +131,13 @@ static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
 		if (P_DivlineCrossed(los->strace.x, los->strace.y, los->t2x, los->t2y, &divl))
 			continue;
 
+<<<<<<< HEAD
 		// stop because it is not two sided
 		//if (!(po->flags & POF_TESTHEIGHT))
 			//return false;
 
+=======
+>>>>>>> Saturn-Next
 		frac = P_InterceptVector(&los->strace, &divl);
 
 		// get slopes of top and bottom of this polyobject line
@@ -112,23 +146,17 @@ static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
 
 		if (topslope >= los->topslope && bottomslope <= los->bottomslope)
 			return false; // view completely blocked
-
-		// TODO: figure out if it's worth considering partially blocked cases or not?
-		// maybe to adjust los's top/bottom slopes if needed
-		//if (los->topslope <= los->bottomslope)
-			//return false;
 	}
 
 	return true;
 }
 
-
 //
 // P_CrossSubsector
 //
 // Returns true if strace crosses the given subsector successfully.
 //
-static boolean P_CrossSubsector(size_t num, register los_t *los)
+static boolean P_CrossSubsector(size_t num, register los_t *los, boolean fast)
 {
 	seg_t *seg;
 	INT32 count;
@@ -157,6 +185,8 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
 		}
 	}
 
+	const divlinecrossfunc divlinecrossFunc = fast ? P_DivlineCrossedFast : P_DivlineCrossed;
+
 	for (count = subsectors[num].numlines; --count >= 0; seg++)  // check lines
 	{
 		line_t *line = seg->linedef;
@@ -185,14 +215,22 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
 		v2 = line->v2;
 
 		// line isn't crossed?
+<<<<<<< HEAD
 		if (P_DivlineCrossed(v1->x, v1->y, v2->x, v2->y, &los->strace))
+=======
+		if (divlinecrossFunc(v1->x, v1->y, v2->x, v2->y, &los->strace))
+>>>>>>> Saturn-Next
 			continue;
 
 		divl.dx = v2->x - (divl.x = v1->x);
 		divl.dy = v2->y - (divl.y = v1->y);
 
 		// line isn't crossed?
+<<<<<<< HEAD
 		if (P_DivlineCrossed(los->strace.x, los->strace.y, los->t2x, los->t2y, &divl))
+=======
+		if (divlinecrossFunc(los->strace.x, los->strace.y, los->t2x, los->t2y, &divl))
+>>>>>>> Saturn-Next
 			continue;
 
 		// stop because it is not two sided anyway
@@ -299,23 +337,36 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
 //  if strace crosses the given node successfully.
 //
 // killough 4/20/98: rewritten to remove tail recursion, clean up, and optimize
+<<<<<<< HEAD
 // cph - Made to use R_PointOnSide instead of P_DivlineSide, since the latter
 //  could return 2 which was ambigous, and the former is
 //  better optimised; also removes two casts :-)
 
 static boolean P_CrossBSPNode(INT32 bspnum, register los_t *los)
+=======
+static boolean P_CrossBSPNode(INT32 bspnum, register los_t *los, boolean fast)
+>>>>>>> Saturn-Next
 {
+	const divlinefunc divlineFunc = fast ? P_DivlineSideFast : P_DivlineSide;
+
 	while (!(bspnum & NF_SUBSECTOR))
 	{
 		register node_t *bsp = nodes + bspnum;
+<<<<<<< HEAD
 		INT32 side = R_PointOnSide(los->strace.x, los->strace.y, bsp);
 		INT32 side2 = R_PointOnSide(los->t2x, los->t2y, bsp);
+=======
+
+		INT32 side = divlineFunc(los->strace.x, los->strace.y, (divline_t *)bsp) & 1;
+		INT32 side2 = divlineFunc(los->t2x, los->t2y, (divline_t *) bsp);
+>>>>>>> Saturn-Next
 
 		if (side == side2)
 		{
 			// doesn't touch the other side
 			bspnum = bsp->children[side];
 		}
+<<<<<<< HEAD
 		else
 		{
 			// the partition plane is crossed here
@@ -331,6 +382,18 @@ static boolean P_CrossBSPNode(INT32 bspnum, register los_t *los)
 	}
 
 	return P_CrossSubsector((bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR), los);
+=======
+		else // the partition plane is crossed here
+		{
+			if (!P_CrossBSPNode(bsp->children[side], los, fast))
+				return false; // cross the starting side
+
+			bspnum = bsp->children[side^1]; // cross the ending side
+		}
+	}
+
+	return P_CrossSubsector((bspnum == -1 ? 0 : bspnum & ~NF_SUBSECTOR), los, fast);
+>>>>>>> Saturn-Next
 }
 
 //
@@ -339,7 +402,7 @@ static boolean P_CrossBSPNode(INT32 bspnum, register los_t *los)
 // Returns true if a straight line between t1 and t2 is unobstructed.
 // Uses REJECT.
 //
-boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
+boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast)
 {
 	const sector_t *s1, *s2;
 	size_t pnum;
@@ -456,5 +519,5 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
 	}
 
 	// the head node is the last node output
-	return P_CrossBSPNode((INT32)numnodes - 1, &los);
-}
\ No newline at end of file
+	return (P_CrossBSPNode((INT32)numnodes - 1, &los, fast));
+}
diff --git a/src/p_slopes.c b/src/p_slopes.c
index 112ba008b..d4c033eeb 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -24,14 +24,86 @@
 #include "w_wad.h"
 
 
-static pslope_t *slopelist = NULL;
+pslope_t *slopelist = NULL;
 static UINT16 slopecount = 0;
 
+// Calculate light
+static void P_UpdateSlopeLightOffset(pslope_t *slope)
+{
+	const UINT8 contrast = maplighting.contrast;
+
+	fixed_t contrastFixed = ((fixed_t)contrast) * FRACUNIT;
+	fixed_t zMul = FRACUNIT;
+	fixed_t light = FRACUNIT;
+	fixed_t extralight = 0;
+
+
+	if (slope->normal.z == 0)
+	{
+		slope->lightOffset = 0;
+#ifdef HWRENDER
+		slope->hwLightOffset = 0;
+#endif
+		return;
+	}
+
+	if (maplighting.directional == true)
+	{
+		fixed_t nX = -slope->normal.x;
+		fixed_t nY = -slope->normal.y;
+		fixed_t nLen = FixedHypot(nX, nY);
+
+		if (nLen == 0)
+		{
+			slope->lightOffset = 0;
+#ifdef HWRENDER
+			slope->hwLightOffset = 0;
+#endif
+			return;
+		}
+
+		nX = FixedDiv(nX, nLen);
+		nY = FixedDiv(nY, nLen);
+
+		/*
+		 * if (slope is ceiling)
+		 * {
+		 *	// There is no good way to calculate this condition here.
+		 *	// We reverse it in R_FindPlane now.
+		 *	nX = -nX;
+		 *	nY = -nY;
+		 *	}
+		 */
+
+		light = FixedMul(nX, FINECOSINE(maplighting.angle >> ANGLETOFINESHIFT))
+		+ FixedMul(nY, FINESINE(maplighting.angle >> ANGLETOFINESHIFT));
+		light = (light + FRACUNIT) / 2;
+	}
+	else
+	{
+		light = FixedDiv(R_PointToAngle2(0, 0, abs(slope->d.x), abs(slope->d.y)), ANGLE_90);
+	}
+
+	zMul = min(FRACUNIT, abs(slope->zdelta)*3/2); // *3/2, to make 60 degree slopes match walls.
+	contrastFixed = FixedMul(contrastFixed, zMul);
+
+	extralight = -contrastFixed + FixedMul(light, contrastFixed * 2);
+
+	// Between -2 and 2 for software, -8 and 8 for hardware
+	slope->lightOffset = FixedFloor((extralight / 8) + (FRACUNIT / 2)) / FRACUNIT;
+#ifdef HWRENDER
+	slope->hwLightOffset = FixedFloor(extralight + (FRACUNIT / 2)) / FRACUNIT;
+#endif
+}
+
 // Calculate line normal
-void P_CalculateSlopeNormal(pslope_t *slope) {
+void P_CalculateSlopeNormal(pslope_t *slope)
+{
 	slope->normal.z = FINECOSINE(slope->zangle>>ANGLETOFINESHIFT);
 	slope->normal.x = -FixedMul(FINESINE(slope->zangle>>ANGLETOFINESHIFT), -slope->d.x);
 	slope->normal.y = -FixedMul(FINESINE(slope->zangle>>ANGLETOFINESHIFT), -slope->d.y);
+
+	P_UpdateSlopeLightOffset(slope);
 }
 
 // With a vertex slope that has its vertices set, configure relevant slope info
@@ -89,69 +161,83 @@ static void P_ReconfigureVertexSlope(pslope_t *slope)
 	slope->real_xydirection = R_PointToAngle2(0, 0, slope->d.x, slope->d.y)+ANGLE_180;
 	slope->real_zangle = InvAngle(R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta));
 
-	if (slope->normal.x == 0 && slope->normal.y == 0) { // Set some defaults for a non-sloped "slope"
+	if (slope->normal.x == 0 && slope->normal.y == 0) // Set some defaults for a non-sloped "slope"
+	{
 		slope->zangle = slope->xydirection = 0;
 		slope->zdelta = slope->d.x = slope->d.y = 0;
-	} else {
+	}
+	else
+	{
 		slope->extent = extent;
 		slope->xydirection = slope->real_xydirection;
 		slope->zangle = slope->real_zangle;
 	}
+
+	P_UpdateSlopeLightOffset(slope);
 }
 
 // Recalculate dynamic slopes
-void P_RunDynamicSlopes(void) {
+void P_RunDynamicSlopes(void)
+{
 	pslope_t *slope;
 
-	for (slope = slopelist; slope; slope = slope->next) {
+	for (slope = slopelist; slope; slope = slope->next)
+	{
 		fixed_t zdelta;
 
 		if (slope->flags & SL_NODYNAMIC)
 			continue;
 
-		switch(slope->refpos) {
-		case 1: // front floor
-			zdelta = slope->sourceline->backsector->floorheight - slope->sourceline->frontsector->floorheight;
-			slope->o.z = slope->sourceline->frontsector->floorheight;
-			break;
-		case 2: // front ceiling
-			zdelta = slope->sourceline->backsector->ceilingheight - slope->sourceline->frontsector->ceilingheight;
-			slope->o.z = slope->sourceline->frontsector->ceilingheight;
-			break;
-		case 3: // back floor
-			zdelta = slope->sourceline->frontsector->floorheight - slope->sourceline->backsector->floorheight;
-			slope->o.z = slope->sourceline->backsector->floorheight;
-			break;
-		case 4: // back ceiling
-			zdelta = slope->sourceline->frontsector->ceilingheight - slope->sourceline->backsector->ceilingheight;
-			slope->o.z = slope->sourceline->backsector->ceilingheight;
-			break;
-		case 5: // vertices
-			{
-				mapthing_t *mt;
-				size_t i;
-				INT32 l;
-				line_t *line;
+		switch (slope->refpos)
+		{
+			case 1: // front floor
+				zdelta = slope->sourceline->backsector->floorheight - slope->sourceline->frontsector->floorheight;
+				slope->o.z = slope->sourceline->frontsector->floorheight;
+				break;
+			case 2: // front ceiling
+				zdelta = slope->sourceline->backsector->ceilingheight - slope->sourceline->frontsector->ceilingheight;
+				slope->o.z = slope->sourceline->frontsector->ceilingheight;
+				break;
+			case 3: // back floor
+				zdelta = slope->sourceline->frontsector->floorheight - slope->sourceline->backsector->floorheight;
+				slope->o.z = slope->sourceline->backsector->floorheight;
+				break;
+			case 4: // back ceiling
+				zdelta = slope->sourceline->frontsector->ceilingheight - slope->sourceline->backsector->ceilingheight;
+				slope->o.z = slope->sourceline->backsector->ceilingheight;
+				break;
+			case 5: // vertices
+				{
+					mapthing_t *mt;
+					size_t i;
+					INT32 l;
+					line_t *line;
 
-				for (i = 0; i < 3; i++) {
-					mt = slope->vertices[i];
-					l = P_FindSpecialLineFromTag(799, mt->angle, -1);
-					if (l != -1) {
-						line = &lines[l];
-						mt->z = line->frontsector->floorheight >> FRACBITS;
+					for (i = 0; i < 3; i++)
+					{
+						mt = slope->vertices[i];
+						l = P_FindSpecialLineFromTag(799, mt->angle, -1);
+
+						if (l != -1)
+						{
+							line = &lines[l];
+							mt->z = line->frontsector->floorheight >> FRACBITS;
+						}
 					}
+
+					P_ReconfigureVertexSlope(slope);
 				}
+				continue; // TODO
 
-				P_ReconfigureVertexSlope(slope);
-			}
-			continue; // TODO
-
-		default:
-			I_Error("P_RunDynamicSlopes: slope has invalid type!");
+			default:
+				I_Error("P_RunDynamicSlopes: slope has invalid type!");
 		}
 
-		if (slope->zdelta != FixedDiv(zdelta, slope->extent)) {
-			slope->zdelta = FixedDiv(zdelta, slope->extent);
+		const fixed_t zeedelta = FixedDiv(zdelta, slope->extent);
+
+		if (slope->zdelta != zeedelta)
+		{
+			slope->zdelta = zeedelta;
 			slope->zangle = R_PointToAngle2(0, 0, slope->extent, -zdelta);
 			slope->real_zangle = slope->zangle;
 			P_CalculateSlopeNormal(slope);
@@ -167,8 +253,7 @@ void P_RunDynamicSlopes(void) {
 static pslope_t *P_MakeSlope(const vector3_t *o, const vector2_t *d,
                              const fixed_t zdelta, UINT8 flags)
 {
-	pslope_t *ret = Z_Malloc(sizeof(pslope_t), PU_LEVEL, NULL);
-	memset(ret, 0, sizeof(*ret));
+	pslope_t *ret = Z_Calloc(sizeof(pslope_t), PU_LEVEL, NULL);
 
 	ret->o.x = o->x;
 	ret->o.y = o->y;
@@ -212,18 +297,18 @@ static fixed_t P_GetExtent(sector_t *sector, line_t *line)
 		fixed_t dist;
 
 		// Don't compare to the slope line.
-		if(li == line)
+		if (li == line)
 			continue;
 
 		P_ClosestPointOnLine(li->v1->x, li->v1->y, line, &tempv);
 		dist = R_PointToDist2(tempv.x, tempv.y, li->v1->x, li->v1->y);
-		if(dist > fardist)
+		if (dist > fardist)
 			fardist = dist;
 
 		// Okay, maybe do it for v2 as well?
 		P_ClosestPointOnLine(li->v2->x, li->v2->y, line, &tempv);
 		dist = R_PointToDist2(tempv.x, tempv.y, li->v2->x, li->v2->y);
-		if(dist > fardist)
+		if (dist > fardist)
 			fardist = dist;
 	}
 
@@ -262,29 +347,27 @@ void P_SpawnSlope_Line(int linenum)
 	if (line->flags & ML_NOKNUX)
 		flags |= SL_ANCHORVERTEX;
 
-	if(!frontfloor && !backfloor && !frontceil && !backceil)
+	if (!frontfloor && !backfloor && !frontceil && !backceil)
 	{
 		CONS_Printf("P_SpawnSlope_Line called with non-slope line special.\n");
 		return;
 	}
 
-	if(!line->frontsector || !line->backsector)
+	if (!line->frontsector || !line->backsector)
 	{
 		CONS_Debug(DBG_SETUP, "P_SpawnSlope_Line used on a line without two sides. (line number %i)\n", linenum);
 		return;
 	}
 
-	{
-		fixed_t len = R_PointToDist2(0, 0, line->dx, line->dy);
-		nx = FixedDiv(line->dy, len);
-		ny = -FixedDiv(line->dx, len);
-	}
+	fixed_t len = R_PointToDist2(0, 0, line->dx, line->dy);
+	nx = FixedDiv(line->dy, len);
+	ny = -FixedDiv(line->dx, len);
 
 	origin.x = line->v1->x + (line->v2->x - line->v1->x)/2;
 	origin.y = line->v1->y + (line->v2->y - line->v1->y)/2;
 
 	// For FOF slopes, make a special function to copy to the xy origin & direction relative to the position of the FOF on the map!
-	if(frontfloor || frontceil)
+	if (frontfloor || frontceil)
 	{
 		line->frontsector->hasslope = true; // Tell the software renderer that we're sloped
 
@@ -294,7 +377,7 @@ void P_SpawnSlope_Line(int linenum)
 
 		extent = P_GetExtent(line->frontsector, line);
 
-		if(extent < 0)
+		if (extent < 0)
 		{
 			CONS_Printf("P_SpawnSlope_Line failed to get frontsector extent on line number %i\n", linenum);
 			return;
@@ -308,7 +391,7 @@ void P_SpawnSlope_Line(int linenum)
 
 		// TODO: We take origin and point 's xy values and translate them to the center of an FOF!
 
-		if(frontfloor)
+		if (frontfloor)
 		{
 			fixed_t highest, lowest;
 			size_t l;
@@ -318,11 +401,11 @@ void P_SpawnSlope_Line(int linenum)
 			// In P_SpawnSlopeLine the origin is the centerpoint of the sourcelinedef
 
 			fslope = line->frontsector->f_slope =
-            P_MakeSlope(&point, &direction, dz, flags);
+			P_MakeSlope(&point, &direction, dz, flags);
 
-            // Set up some shit
-            fslope->extent = extent;
-            fslope->refpos = 1;
+			// Set up some shit
+			fslope->extent = extent;
+			fslope->refpos = 1;
 
 			// Now remember that f_slope IS a vector
 			// fslope->o = origin      3D point 1 of the vector
@@ -334,7 +417,7 @@ void P_SpawnSlope_Line(int linenum)
 			fslope->sourceline = line;
 
 			// To find the real highz/lowz of a slope, you need to check all the vertexes
-			// in the slope's sector with P_GetZAt to get the REAL lowz & highz
+			// in the slope's sector with P_GetSlopeZAt to get the REAL lowz & highz
 			// Although these slopes are set by floorheights the ANGLE is what a slope is,
 			// so technically any slope can extend on forever (they are just bound by sectors)
 			// *You can use sourceline as a reference to see if two slopes really are the same
@@ -348,7 +431,7 @@ void P_SpawnSlope_Line(int linenum)
 
 			for (l = 0; l < line->frontsector->linecount; l++)
 			{
-				fixed_t height = P_GetZAt(line->frontsector->f_slope, line->frontsector->lines[l]->v1->x, line->frontsector->lines[l]->v1->y);
+				fixed_t height = P_GetSlopeZAt(line->frontsector->f_slope, line->frontsector->lines[l]->v1->x, line->frontsector->lines[l]->v1->y);
 
 				if (height > highest)
 					highest = height;
@@ -369,7 +452,8 @@ void P_SpawnSlope_Line(int linenum)
 
 			P_CalculateSlopeNormal(fslope);
 		}
-		if(frontceil)
+
+		if (frontceil)
 		{
 			fixed_t highest, lowest;
 			size_t l;
@@ -378,11 +462,11 @@ void P_SpawnSlope_Line(int linenum)
 			dz = FixedDiv(origin.z - point.z, extent);
 
 			cslope = line->frontsector->c_slope =
-            P_MakeSlope(&point, &direction, dz, flags);
+			P_MakeSlope(&point, &direction, dz, flags);
 
-            // Set up some shit
-            cslope->extent = extent;
-            cslope->refpos = 2;
+			// Set up some shit
+			cslope->extent = extent;
+			cslope->refpos = 2;
 
 			// Sync the linedata of the line that started this slope
 			// TODO: Anything special for control sector based slopes later?
@@ -394,7 +478,7 @@ void P_SpawnSlope_Line(int linenum)
 
 			for (l = 0; l < line->frontsector->linecount; l++)
 			{
-				fixed_t height = P_GetZAt(line->frontsector->c_slope, line->frontsector->lines[l]->v1->x, line->frontsector->lines[l]->v1->y);
+				fixed_t height = P_GetSlopeZAt(line->frontsector->c_slope, line->frontsector->lines[l]->v1->x, line->frontsector->lines[l]->v1->y);
 
 				if (height > highest)
 					highest = height;
@@ -416,7 +500,8 @@ void P_SpawnSlope_Line(int linenum)
 			P_CalculateSlopeNormal(cslope);
 		}
 	}
-	if(backfloor || backceil)
+
+	if (backfloor || backceil)
 	{
 		line->backsector->hasslope = true; // Tell the software renderer that we're sloped
 
@@ -427,7 +512,7 @@ void P_SpawnSlope_Line(int linenum)
 
 		extent = P_GetExtent(line->backsector, line);
 
-		if(extent < 0)
+		if (extent < 0)
 		{
 			CONS_Printf("P_SpawnSlope_Line failed to get backsector extent on line number %i\n", linenum);
 			return;
@@ -439,7 +524,7 @@ void P_SpawnSlope_Line(int linenum)
 		direction.x = -direction.x;
 		direction.y = -direction.y;
 
-		if(backfloor)
+		if (backfloor)
 		{
 			fixed_t highest, lowest;
 			size_t l;
@@ -447,11 +532,11 @@ void P_SpawnSlope_Line(int linenum)
 			dz = FixedDiv(origin.z - point.z, extent);
 
 			fslope = line->backsector->f_slope =
-            P_MakeSlope(&point, &direction, dz, flags);
+			P_MakeSlope(&point, &direction, dz, flags);
 
-            // Set up some shit
-            fslope->extent = extent;
-            fslope->refpos = 3;
+			// Set up some shit
+			fslope->extent = extent;
+			fslope->refpos = 3;
 
 			// Sync the linedata of the line that started this slope
 			// TODO: Anything special for control sector based slopes later?
@@ -463,7 +548,7 @@ void P_SpawnSlope_Line(int linenum)
 
 			for (l = 0; l < line->backsector->linecount; l++)
 			{
-				fixed_t height = P_GetZAt(line->backsector->f_slope, line->backsector->lines[l]->v1->x, line->backsector->lines[l]->v1->y);
+				fixed_t height = P_GetSlopeZAt(line->backsector->f_slope, line->backsector->lines[l]->v1->x, line->backsector->lines[l]->v1->y);
 
 				if (height > highest)
 					highest = height;
@@ -484,7 +569,8 @@ void P_SpawnSlope_Line(int linenum)
 
 			P_CalculateSlopeNormal(fslope);
 		}
-		if(backceil)
+
+		if (backceil)
 		{
 			fixed_t highest, lowest;
 			size_t l;
@@ -493,11 +579,11 @@ void P_SpawnSlope_Line(int linenum)
 			dz = FixedDiv(origin.z - point.z, extent);
 
 			cslope = line->backsector->c_slope =
-            P_MakeSlope(&point, &direction, dz, flags);
+			P_MakeSlope(&point, &direction, dz, flags);
 
-            // Set up some shit
-            cslope->extent = extent;
-            cslope->refpos = 4;
+			// Set up some shit
+			cslope->extent = extent;
+			cslope->refpos = 4;
 
 			// Sync the linedata of the line that started this slope
 			// TODO: Anything special for control sector based slopes later?
@@ -509,7 +595,7 @@ void P_SpawnSlope_Line(int linenum)
 
 			for (l = 0; l < line->backsector->linecount; l++)
 			{
-				fixed_t height = P_GetZAt(line->backsector->c_slope, line->backsector->lines[l]->v1->x, line->backsector->lines[l]->v1->y);
+				fixed_t height = P_GetSlopeZAt(line->backsector->c_slope, line->backsector->lines[l]->v1->x, line->backsector->lines[l]->v1->y);
 
 				if (height > highest)
 					highest = height;
@@ -546,18 +632,17 @@ static pslope_t *P_NewVertexSlope(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag
 	size_t i;
 	mapthing_t *mt = mapthings;
 
-	pslope_t *ret = Z_Malloc(sizeof(pslope_t), PU_LEVEL, NULL);
-	memset(ret, 0, sizeof(*ret));
+	pslope_t *ret = Z_Calloc(sizeof(pslope_t), PU_LEVEL, NULL);
 
 	// Start by setting flags
 	ret->flags = flags;
 
 	// Now set up the vertex list
-	ret->vertices = Z_Malloc(3*sizeof(mapthing_t), PU_LEVEL, NULL);
-	memset(ret->vertices, 0, 3*sizeof(mapthing_t));
+	ret->vertices = Z_Calloc(3*sizeof(mapthing_t), PU_LEVEL, NULL);
 
 	// And... look for the vertices in question.
-	for (i = 0; i < nummapthings; i++, mt++) {
+	for (i = 0; i < nummapthings; i++, mt++)
+	{
 		if (mt->type != 750) // Haha, I'm hijacking the old Chaos Spawn thingtype for something!
 			continue;
 
@@ -570,7 +655,8 @@ static pslope_t *P_NewVertexSlope(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag
 	}
 
 	// Now set heights for each vertex, because they haven't been set yet
-	for (i = 0; i < 3; i++) {
+	for (i = 0; i < 3; i++)
+	{
 		mt = ret->vertices[i];
 		if (!mt) // If a vertex wasn't found, it's game over. There's nothing you can do to recover (except maybe try and kill the slope instead - TODO?)
 			I_Error("P_NewVertexSlope: Slope vertex %s (for linedef tag %d) not found!", sizeu1(i), tag1);
@@ -593,8 +679,6 @@ static pslope_t *P_NewVertexSlope(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag
 	return ret;
 }
 
-
-
 //
 // P_CopySectorSlope
 //
@@ -602,23 +686,23 @@ static pslope_t *P_NewVertexSlope(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag
 //
 void P_CopySectorSlope(line_t *line)
 {
-   sector_t *fsec = line->frontsector;
-   int i, special = line->special;
+	sector_t *fsec = line->frontsector;
+	int i, special = line->special;
 
-   // Check for copy linedefs
-   for(i = -1; (i = P_FindSectorFromLineTag(line, i)) >= 0;)
-   {
-      sector_t *srcsec = sectors + i;
+	// Check for copy linedefs
+	for (i = -1; (i = P_FindSectorFromLineTag(line, i)) >= 0;)
+	{
+		sector_t *srcsec = sectors + i;
 
-      if((special - 719) & 1 && !fsec->f_slope && srcsec->f_slope)
-         fsec->f_slope = srcsec->f_slope; //P_CopySlope(srcsec->f_slope);
-      if((special - 719) & 2 && !fsec->c_slope && srcsec->c_slope)
-         fsec->c_slope = srcsec->c_slope; //P_CopySlope(srcsec->c_slope);
-   }
+		if ((special - 719) & 1 && !fsec->f_slope && srcsec->f_slope)
+			fsec->f_slope = srcsec->f_slope; //P_CopySlope(srcsec->f_slope);
+		if ((special - 719) & 2 && !fsec->c_slope && srcsec->c_slope)
+			fsec->c_slope = srcsec->c_slope; //P_CopySlope(srcsec->c_slope);
+	}
 
-   fsec->hasslope = true;
+	fsec->hasslope = true;
 
-   line->special = 0; // Linedef was use to set slopes, it finished its job, so now make it a normal linedef
+	line->special = 0; // Linedef was use to set slopes, it finished its job, so now make it a normal linedef
 }
 
 //
@@ -634,7 +718,8 @@ pslope_t *P_SlopeById(UINT16 id)
 }
 
 // Reset the dynamic slopes pointer, and read all of the fancy schmancy slopes
-void P_ResetDynamicSlopes(void) {
+void P_ResetDynamicSlopes(void)
+{
 	size_t i;
 
 	slopelist = NULL;
@@ -697,25 +782,24 @@ void P_ResetDynamicSlopes(void) {
 					if (!(lines[i].flags & ML_NOTAILS))
 						flags |= SL_NODYNAMIC;
 
-					if (which == 704)
+					switch (which)
 					{
-						slopetoset = &lines[i].frontsector->f_slope;
-						which = 0;
-					}
-					else if (which == 705)
-					{
-						slopetoset = &lines[i].frontsector->c_slope;
-						which = 0;
-					}
-					else if (which == 714)
-					{
-						slopetoset = &lines[i].backsector->f_slope;
-						which = 1;
-					}
-					else // 715
-					{
-						slopetoset = &lines[i].backsector->c_slope;
-						which = 1;
+						case 704:
+							slopetoset = &lines[i].frontsector->f_slope;
+							which = 0;
+							break;
+						case 705:
+							slopetoset = &lines[i].frontsector->c_slope;
+							which = 0;
+							break;
+						case 714:
+							slopetoset = &lines[i].backsector->f_slope;
+							which = 1;
+							break;
+						default: // 715
+							slopetoset = &lines[i].backsector->c_slope;
+							which = 1;
+							break;
 					}
 
 					if (lines[i].flags & ML_NOKNUX)
@@ -742,49 +826,6 @@ void P_ResetDynamicSlopes(void) {
 // Various utilities related to slopes
 //
 
-//
-// P_GetZAt
-//
-// Returns the height of the sloped plane at (x, y) as a fixed_t
-//
-fixed_t P_GetZAt(pslope_t *slope, fixed_t x, fixed_t y)
-{
-   fixed_t dist = FixedMul(x - slope->o.x, slope->d.x) +
-                  FixedMul(y - slope->o.y, slope->d.y);
-
-   return slope->o.z + FixedMul(dist, slope->zdelta);
-}
-
-// Returns the height of the sector floor at (x, y)
-fixed_t P_GetSectorFloorZAt(const sector_t *sector, fixed_t x, fixed_t y)
-{
-	return sector->f_slope ? P_GetZAt(sector->f_slope, x, y) : sector->floorheight;
-}
-
-// Returns the height of the sector ceiling at (x, y)
-fixed_t P_GetSectorCeilingZAt(const sector_t *sector, fixed_t x, fixed_t y)
-{
-	return sector->c_slope ? P_GetZAt(sector->c_slope, x, y) : sector->ceilingheight;
-}
-
-// Returns the height of the FOF top at (x, y)
-fixed_t P_GetFFloorTopZAt(const ffloor_t *ffloor, fixed_t x, fixed_t y)
-{
-	return *ffloor->t_slope ? P_GetZAt(*ffloor->t_slope, x, y) : *ffloor->topheight;
-}
-
-// Returns the height of the FOF bottom  at (x, y)
-fixed_t P_GetFFloorBottomZAt(const ffloor_t *ffloor, fixed_t x, fixed_t y)
-{
-	return *ffloor->b_slope ? P_GetZAt(*ffloor->b_slope, x, y) : *ffloor->bottomheight;
-}
-
-// Returns the height of the light list at (x, y)
-fixed_t P_GetLightZAt(const lightlist_t *light, fixed_t x, fixed_t y)
-{
-	return light->slope ? P_GetZAt(light->slope, x, y) : light->height;
-}
-
 //
 // P_QuantizeMomentumToSlope
 //
@@ -859,11 +900,14 @@ void P_HandleSlopeLanding(mobj_t *thing, pslope_t *slope)
 {
 	vector3_t mom; // Ditto.
 
-	if (slope->flags & SL_NOPHYSICS) { // No physics, no need to make anything complicated.
-		if (P_MobjFlip(thing)*(thing->momz) < 0) { // falling, land on slope
+	if (slope->flags & SL_NOPHYSICS) // No physics, no need to make anything complicated.
+	{
+		if (P_MobjFlip(thing)*(thing->momz) < 0) // falling, land on slope
+		{
 			thing->momz = -P_MobjFlip(thing);
 			thing->standingslope = slope;
 		}
+
 		return;
 	}
 
@@ -873,11 +917,11 @@ void P_HandleSlopeLanding(mobj_t *thing, pslope_t *slope)
 
 	P_ReverseQuantizeMomentumToSlope(&mom, slope);
 
-	if (P_MobjFlip(thing)*mom.z < 0) { // falling, land on slope
+	if (P_MobjFlip(thing)*mom.z < 0) // falling, land on slope
+	{
 		thing->momx = mom.x;
 		thing->momy = mom.y;
 		thing->momz = -P_MobjFlip(thing);
-
 		thing->standingslope = slope;
 	}
 }
@@ -897,19 +941,25 @@ void P_ButteredSlope(mobj_t *mo)
 	if (mo->flags & (MF_NOCLIPHEIGHT|MF_NOGRAVITY))
 		return; // don't slide down slopes if you can't touch them or you're not affected by gravity
 
-	if (mo->player) {
-		if (abs(mo->standingslope->zdelta) < FRACUNIT/4 && !(mo->player->pflags & PF_SPINNING))
+	if (mo->player)
+	{
+		const int zeedelta = abs(mo->standingslope->zdelta);
+
+		if (zeedelta < FRACUNIT/4 && !(mo->player->pflags & PF_SPINNING))
 			return; // Don't slide on non-steep slopes unless spinning
 
-		if (abs(mo->standingslope->zdelta) < FRACUNIT/2 && !(mo->player->rmomx || mo->player->rmomy))
+		if (zeedelta < FRACUNIT/2 && !(mo->player->rmomx || mo->player->rmomy))
 			return; // Allow the player to stand still on slopes below a certain steepness
 	}
 
 	thrust = FINESINE(mo->standingslope->zangle>>ANGLETOFINESHIFT) * 15 / 16 * (mo->eflags & MFE_VERTICALFLIP ? 1 : -1);
 
-	if (mo->player && (mo->player->pflags & PF_SPINNING)) {
+	if (mo->player && (mo->player->pflags & PF_SPINNING))
+	{
 		fixed_t mult = 0;
-		if (mo->momx || mo->momy) {
+
+		if (mo->momx || mo->momy)
+		{
 			angle_t angle = R_PointToAngle2(0, 0, mo->momx, mo->momy) - mo->standingslope->xydirection;
 
 			if (P_MobjFlip(mo) * mo->standingslope->zdelta < 0)
@@ -934,4 +984,4 @@ void P_ButteredSlope(mobj_t *mo)
 	P_Thrust(mo, mo->standingslope->xydirection, thrust);
 }
 
-// EOF
\ No newline at end of file
+// EOF
diff --git a/src/p_slopes.h b/src/p_slopes.h
index 57683d6e1..40502a5ea 100644
--- a/src/p_slopes.h
+++ b/src/p_slopes.h
@@ -13,9 +13,12 @@
 #ifndef P_SLOPES_H__
 #define P_SLOPES_H__
 
+#include "doomtype.h"
+
 void P_CalculateSlopeNormal(pslope_t *slope);
 void P_ResetDynamicSlopes(void);
 void P_RunDynamicSlopes(void);
+
 // P_SpawnSlope_Line
 // Creates one or more slopes based on the given line type and front/back
 // sectors.
@@ -30,19 +33,52 @@ void P_CopySectorSlope(line_t *line);
 
 pslope_t *P_SlopeById(UINT16 id);
 
+extern pslope_t *slopelist;
+
+//
+// P_GetZAt
+//
+
 // Returns the height of the sloped plane at (x, y) as a fixed_t
-fixed_t P_GetZAt(pslope_t *slope, fixed_t x, fixed_t y);
+FUNCINLINE static ATTRINLINE fixed_t P_GetSlopeZAt(const pslope_t *z_slope, fixed_t x, fixed_t y)
+{
+	return z_slope->o.z + FixedMul((FixedMul(x - z_slope->o.x, z_slope->d.x) + FixedMul(y - z_slope->o.y, z_slope->d.y)), z_slope->zdelta);
+}
 
-// Returns the height of the sector at (x, y)
-fixed_t P_GetSectorFloorZAt  (const sector_t *sector, fixed_t x, fixed_t y);
-fixed_t P_GetSectorCeilingZAt(const sector_t *sector, fixed_t x, fixed_t y);
+// Like P_GetSlopeZAt but falls back to z if slope is NULL
+FUNCINLINE static ATTRINLINE fixed_t P_GetZAt(const pslope_t *slope, fixed_t x, fixed_t y, fixed_t z)
+{
+	return slope ? P_GetSlopeZAt(slope, x, y) : z;
+}
+// Returns the height of the sector floor at (x, y)
+FUNCINLINE static ATTRINLINE fixed_t P_GetSectorFloorZAt(const sector_t *z_sector, fixed_t x, fixed_t y)
+{
+	return z_sector->f_slope ? P_GetSlopeZAt(z_sector->f_slope, x, y) : z_sector->floorheight;
+}
 
-// Returns the height of the FOF at (x, y)
-fixed_t P_GetFFloorTopZAt   (const ffloor_t *ffloor, fixed_t x, fixed_t y);
-fixed_t P_GetFFloorBottomZAt(const ffloor_t *ffloor, fixed_t x, fixed_t y);
+// Returns the height of the sector ceiling at (x, y)
+FUNCINLINE static ATTRINLINE fixed_t P_GetSectorCeilingZAt(const sector_t *z_sector, fixed_t x, fixed_t y)
+{
+	return z_sector->c_slope ? P_GetSlopeZAt(z_sector->c_slope, x, y) : z_sector->ceilingheight;
+}
+
+// Returns the height of the FOF top at (x, y)
+FUNCINLINE static ATTRINLINE fixed_t P_GetFFloorTopZAt(const ffloor_t *z_ffloor, fixed_t x, fixed_t y)
+{
+	return *z_ffloor->t_slope ? P_GetSlopeZAt(*z_ffloor->t_slope, x, y) : *z_ffloor->topheight;
+}
+
+// Returns the height of the FOF bottom  at (x, y)
+FUNCINLINE static ATTRINLINE fixed_t P_GetFFloorBottomZAt(const ffloor_t *z_ffloor, fixed_t x, fixed_t y)
+{
+	return *z_ffloor->b_slope ? P_GetSlopeZAt(*z_ffloor->b_slope, x, y) : *z_ffloor->bottomheight;
+}
 
 // Returns the height of the light list at (x, y)
-fixed_t P_GetLightZAt(const lightlist_t *light, fixed_t x, fixed_t y);
+FUNCINLINE static ATTRINLINE fixed_t P_GetLightZAt(const lightlist_t *z_light, fixed_t x, fixed_t y)
+{
+	return z_light->slope ? P_GetSlopeZAt(z_light->slope, x, y) : z_light->height;
+}
 
 // Lots of physics-based bullshit
 void P_QuantizeMomentumToSlope(vector3_t *momentum, pslope_t *slope);
diff --git a/src/p_spec.c b/src/p_spec.c
index 939b695f9..64f289be8 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -29,20 +29,17 @@
 #include "z_zone.h"
 #include "r_main.h" //Two extra includes.
 #include "r_sky.h"
+#include "st_stuff.h"
 #include "p_polyobj.h"
 #include "p_slopes.h"
 #include "hu_stuff.h"
 #include "m_misc.h"
 #include "m_cond.h" //unlock triggers
-#include "lua_hook.h" // LUAh_LinedefExecute
+#include "lua_hook.h" // LUA_HookLinedefExecute
 
 #include "k_kart.h" // SRB2kart
 #include "console.h" // CON_LogMessage
 
-#ifdef HW3SOUND
-#include "hardware/hw3sound.h"
-#endif
-
 // Not sure if this is necessary, but it was in w_wad.c, so I'm putting it here too -Shadow Hog
 #include <errno.h>
 
@@ -54,19 +51,6 @@ mobj_t *skyboxmo[2];
 // This must be updated whenever we up the max flat size - quicker to assume rather than figuring out the sqrt of the specific flat's filesize.
 #define MAXFLATSIZE (2048<<FRACBITS)
 
-/** Animated texture descriptor
-  * This keeps track of an animated texture or an animated flat.
-  * \sa P_UpdateSpecials, P_InitPicAnims, animdef_t
-  */
-typedef struct
-{
-	SINT8 istexture; ///< ::true for a texture, ::false for a flat
-	INT32 picnum;    ///< The end flat number
-	INT32 basepic;   ///< The start flat number
-	INT32 numpics;   ///< Number of frames in the animation
-	tic_t speed;     ///< Number of tics for which each frame is shown
-} anim_t;
-
 #if defined(_MSC_VER)
 #pragma pack(1)
 #endif
@@ -98,6 +82,8 @@ typedef struct
 	thinker_t **thinkers;
 } thinkerlist_t;
 
+//static boolean fromlapexec = false;
+
 static void P_SearchForDisableLinedefs(void);
 static void P_SpawnScrollers(void);
 static void P_SpawnFriction(void);
@@ -114,8 +100,8 @@ static void P_AddSpikeThinker(sector_t *sec, INT32 referrer);
 
 
 //SoM: 3/7/2000: New sturcture without limits.
-static anim_t *lastanim;
-static anim_t *anims = NULL; /// \todo free leak
+anim_t *lastanim;
+anim_t *anims = NULL; /// \todo free leak
 static size_t maxanims;
 
 //
@@ -622,48 +608,6 @@ void P_SetupLevelFlatAnims(void)
 // UTILITIES
 //
 
-#if 0
-/** Gets a side from a sector line.
-  *
-  * \param currentSector Sector the line is in.
-  * \param line          Index of the line within the sector.
-  * \param side          0 for front, 1 for back.
-  * \return Pointer to the side_t of the side you want.
-  * \sa getSector, twoSided, getNextSector
-  */
-static inline side_t *getSide(INT32 currentSector, INT32 line, INT32 side)
-{
-	return &sides[(sectors[currentSector].lines[line])->sidenum[side]];
-}
-
-/** Gets a sector from a sector line.
-  *
-  * \param currentSector Sector the line is in.
-  * \param line          Index of the line within the sector.
-  * \param side          0 for front, 1 for back.
-  * \return Pointer to the ::sector_t of the sector on that side.
-  * \sa getSide, twoSided, getNextSector
-  */
-static inline sector_t *getSector(INT32 currentSector, INT32 line, INT32 side)
-{
-	return sides[(sectors[currentSector].lines[line])->sidenum[side]].sector;
-}
-
-/** Determines whether a sector line is two-sided.
-  * Uses the Boom method, checking if the line's back side is set to -1, rather
-  * than looking for ::ML_TWOSIDED.
-  *
-  * \param sector The sector.
-  * \param line   Line index within the sector.
-  * \return 1 if the sector is two-sided, 0 otherwise.
-  * \sa getSide, getSector, getNextSector
-  */
-static inline boolean twoSided(INT32 sector, INT32 line)
-{
-	return (sectors[sector].lines[line])->sidenum[1] != 0xffff;
-}
-#endif
-
 /** Finds sector next to current.
   *
   * \param line Pointer to the line to cross.
@@ -822,77 +766,6 @@ fixed_t P_FindNextLowestFloor(sector_t *sec, fixed_t currentheight)
 	return currentheight;
 }
 
-#if 0
-/** Finds next lowest ceiling in adjacent sectors.
-  *
-  * \param sec           Sector to start in.
-  * \param currentheight Height to start at.
-  * \return Next lowest ceiling height in an adjacent sector, or currentheight
-  *         if there are none lower.
-  * \sa P_FindLowestCeilingSurrounding, P_FindNextHighestCeiling,
-  *     P_FindNextLowestFloor
-  * \author Lee Killough
-  */
-static fixed_t P_FindNextLowestCeiling(sector_t *sec, fixed_t currentheight)
-{
-	sector_t *other;
-	size_t i;
-	fixed_t height;
-
-	for (i = 0; i < sec->linecount; i++)
-	{
-		other = getNextSector(sec->lines[i],sec);
-		if (other &&	other->ceilingheight < currentheight)
-		{
-			height = other->ceilingheight;
-			while (++i < sec->linecount)
-			{
-				other = getNextSector(sec->lines[i],sec);
-				if (other &&	other->ceilingheight > height
-					&& other->ceilingheight < currentheight)
-					height = other->ceilingheight;
-			}
-			return height;
-		}
-	}
-	return currentheight;
-}
-
-/** Finds next highest ceiling in adjacent sectors.
-  *
-  * \param sec           Sector to start in.
-  * \param currentheight Height to start at.
-  * \return Next highest ceiling height in an adjacent sector, or currentheight
-  *         if there are none higher.
-  * \sa P_FindHighestCeilingSurrounding, P_FindNextLowestCeiling,
-  *     P_FindNextHighestFloor
-  * \author Lee Killough
-  */
-static fixed_t P_FindNextHighestCeiling(sector_t *sec, fixed_t currentheight)
-{
-	sector_t *other;
-	size_t i;
-	fixed_t height;
-
-	for (i = 0; i < sec->linecount; i++)
-	{
-		other = getNextSector(sec->lines[i], sec);
-		if (other && other->ceilingheight > currentheight)
-		{
-			height = other->ceilingheight;
-			while (++i < sec->linecount)
-			{
-				other = getNextSector(sec->lines[i],sec);
-				if (other && other->ceilingheight < height
-					&& other->ceilingheight > currentheight)
-					height = other->ceilingheight;
-			}
-			return height;
-		}
-	}
-	return currentheight;
-}
-#endif
 
 ////////////////////////////
 // End New Boom functions
@@ -962,133 +835,6 @@ fixed_t P_FindHighestCeilingSurrounding(sector_t *sec)
 	return height;
 }
 
-#if 0
-//SoM: 3/7/2000: UTILS.....
-//
-// P_FindShortestTextureAround()
-//
-// Passed a sector number, returns the shortest lower texture on a
-// linedef bounding the sector.
-//
-//
-static fixed_t P_FindShortestTextureAround(INT32 secnum)
-{
-	fixed_t minsize = 32000<<FRACBITS;
-	side_t *side;
-	size_t i;
-	sector_t *sec= &sectors[secnum];
-
-	for (i = 0; i < sec->linecount; i++)
-	{
-		if (twoSided(secnum, i))
-		{
-			side = getSide(secnum,i,0);
-			if (side->bottomtexture > 0)
-				if (textureheight[side->bottomtexture] < minsize)
-					minsize = textureheight[side->bottomtexture];
-			side = getSide(secnum,i,1);
-			if (side->bottomtexture > 0)
-				if (textureheight[side->bottomtexture] < minsize)
-					minsize = textureheight[side->bottomtexture];
-		}
-	}
-	return minsize;
-}
-
-//SoM: 3/7/2000: Stuff.... (can you tell I'm getting tired? It's 12 : 30!)
-//
-// P_FindShortestUpperAround()
-//
-// Passed a sector number, returns the shortest upper texture on a
-// linedef bounding the sector.
-//
-//
-static fixed_t P_FindShortestUpperAround(INT32 secnum)
-{
-	fixed_t minsize = 32000<<FRACBITS;
-	side_t *side;
-	size_t i;
-	sector_t *sec = &sectors[secnum];
-
-	for (i = 0; i < sec->linecount; i++)
-	{
-		if (twoSided(secnum, i))
-		{
-			side = getSide(secnum,i,0);
-			if (side->toptexture > 0)
-				if (textureheight[side->toptexture] < minsize)
-					minsize = textureheight[side->toptexture];
-			side = getSide(secnum,i,1);
-			if (side->toptexture > 0)
-				if (textureheight[side->toptexture] < minsize)
-					minsize = textureheight[side->toptexture];
-		}
-	}
-	return minsize;
-}
-
-//SoM: 3/7/2000
-//
-// P_FindModelFloorSector()
-//
-// Passed a floor height and a sector number, return a pointer to a
-// a sector with that floor height across the lowest numbered two sided
-// line surrounding the sector.
-//
-// Note: If no sector at that height bounds the sector passed, return NULL
-//
-//
-static sector_t *P_FindModelFloorSector(fixed_t floordestheight, INT32 secnum)
-{
-	size_t i;
-	sector_t *sec = &sectors[secnum];
-
-	for (i = 0; i < sec->linecount; i++)
-	{
-		if (twoSided(secnum, i))
-		{
-			if (getSide(secnum,i,0)->sector-sectors == secnum)
-				sec = getSector(secnum,i,1);
-			else
-				sec = getSector(secnum,i,0);
-
-			if (sec->floorheight == floordestheight)
-				return sec;
-		}
-	}
-	return NULL;
-}
-
-//
-// P_FindModelCeilingSector()
-//
-// Passed a ceiling height and a sector number, return a pointer to a
-// a sector with that ceiling height across the lowest numbered two sided
-// line surrounding the sector.
-//
-// Note: If no sector at that height bounds the sector passed, return NULL
-//
-static sector_t *P_FindModelCeilingSector(fixed_t ceildestheight, INT32 secnum)
-{
-	size_t i;
-	sector_t *sec = &sectors[secnum];
-
-	for (i = 0; i < sec->linecount; i++)
-	{
-		if (twoSided(secnum, i))
-		{
-			if (getSide(secnum, i, 0)->sector - sectors == secnum)
-				sec = getSector(secnum, i, 1);
-			else
-				sec = getSector(secnum, i, 0);
-
-			if (sec->ceilingheight == ceildestheight)
-				return sec;
-		}
-	}
-	return NULL;
-}
-#endif
 
 /** Searches the tag lists for the next sector tagged to a line.
   *
@@ -1176,37 +922,8 @@ static INT32 P_FindLineFromLineTag(const line_t *line, INT32 start)
 		return start;
 	}
 }
-#if 0
-/** Searches the tag lists for the next line with a given tag and special.
-  *
-  * \param tag     Tag number.
-  * \param start   -1 to start anew, or the result of a previous call to keep
-  *                searching.
-  * \return Number of next suitable line found.
-  * \sa P_FindLineFromLineTag
-  * \author Graue <graue@oceanbase.org>
-  */
-static INT32 P_FindLineFromTag(INT32 tag, INT32 start)
-{
-	if (tag == -1)
-	{
-		start++;
 
-		if (start >= numlines)
-			return -1;
 
-		return start;
-	}
-	else
-	{
-		start = start >= 0 ? lines[start].nexttag :
-			lines[(unsigned)tag % numlines].firsttag;
-		while (start >= 0 && lines[start].tag != tag)
-			start = lines[start].nexttag;
-		return start;
-	}
-}
-#endif
 //
 // P_FindSpecialLineFromTag
 //
@@ -1585,7 +1302,7 @@ static void P_AddExecutorDelay(line_t *line, mobj_t *mobj, sector_t *sector)
 
 	e = Z_Calloc(sizeof (*e), PU_LEVSPEC, NULL);
 
-	e->thinker.function.acp1 = (actionf_p1)T_ExecutorDelay;
+	e->thinker.function = (actionf_p1)T_ExecutorDelay;
 	e->line = line;
 	e->sector = sector;
 	e->timer = (line->backsector->ceilingheight>>FRACBITS)+(line->backsector->floorheight>>FRACBITS);
@@ -1608,6 +1325,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
 	fixed_t dist = P_AproxDistance(triggerline->dx, triggerline->dy)>>FRACBITS;
 	size_t i, linecnt, sectori;
 	INT16 specialtype = triggerline->special;
+	//fromlapexec = false;
 
 	/////////////////////////////////////////////////
 	// Distance-checking/sector trigger conditions //
@@ -1696,28 +1414,24 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
 	}
 	else if (caller)
 	{
-		if (GETSECSPECIAL(caller->special, 2) == 6)
+		const INT32 secspecial = GETSECSPECIAL(caller->special, 2);
+
+		if (secspecial == 6)
 		{
 			if (!(ALL7EMERALDS(emeralds)))
 				return false;
 		}
-		else if (GETSECSPECIAL(caller->special, 2) == 7) // SRB2Kart: reusing for Race Lap executor
+		else if (secspecial == 7) // SRB2Kart: reusing for Race Lap executor
 		{
 			UINT8 lap;
 
 			if (actor && actor->player && triggerline->flags & ML_EFFECT4)
 			{
-				/*if (maptol & TOL_NIGHTS)
-					lap = actor->player->mare;
-				else*/
-					lap = actor->player->laps;
+				lap = actor->player->laps;
 			}
 			else
 			{
-				/*if (maptol & TOL_NIGHTS)
-					lap = P_FindLowestMare();
-				else*/
-					lap = P_FindLowestLap();
+				lap = P_FindLowestLap();
 			}
 
 			if (triggerline->flags & ML_NOCLIMB) // Need higher than or equal to
@@ -1735,11 +1449,13 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
 				if (lap != (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS))
 					return false;
 			}
+
+			//fromlapexec = true;
 		}
 		// If we were not triggered by a sector type especially for the purpose,
 		// a Linedef Executor linedef trigger is not handling sector triggers properly, return.
 
-		else if ((!GETSECSPECIAL(caller->special, 2) || GETSECSPECIAL(caller->special, 2) > 7) && (specialtype > 322))
+		else if ((!secspecial || secspecial > 7) && (specialtype > 322))
 		{
 			CONS_Alert(CONS_WARNING,
 				M_GetText("Linedef executor trigger isn't handling sector triggers properly!\nspecialtype = %d, if you are not a dev, report this warning instance\nalong with the wad that caused it!\n"),
@@ -1754,12 +1470,6 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
 
 	switch (specialtype)
 	{
-		/*case 305: // continuous
-		case 306: // each time
-		case 307: // once
-			if (!(actor && actor->player && actor->player->charability == dist/10))
-				return false;
-			break;*/
 		case 309: // continuous
 		case 310: // each time
 			// Only red team members can activate this.
@@ -1930,9 +1640,8 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
 	// "Trigger on X calls" linedefs reset if noclimb is set
 	if ((specialtype == 321 || specialtype == 322) && triggerline->flags & ML_NOCLIMB)
 		triggerline->callcount = sides[triggerline->sidenum[0]].textureoffset>>FRACBITS;
-	else
 	// These special types work only once
-	if (specialtype == 302  // Once
+	else if (specialtype == 302  // Once
 	 || specialtype == 304  // Ring count - Once
 	 || specialtype == 307  // Character ability - Once
 	 || specialtype == 308  // Race only - Once
@@ -1996,6 +1705,35 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller)
 	}
 }
 
+static boolean is_rain_type (INT32 weathernum)
+{
+	switch (weathernum)
+	{
+		case PRECIP_SNOW:
+		case PRECIP_RAIN:
+		case PRECIP_STORM:
+		case PRECIP_STORM_NOSTRIKES:
+		case PRECIP_BLANK:
+			return true;
+
+		default:
+			return false;
+	}
+}
+
+void P_PurgePrecipitation(void)
+{
+	thinker_t *think;
+	thinker_t *next;
+
+	for (think = precipcap.next; think != NULL && think != &precipcap;)
+	{
+		next = think->next;
+		P_FreePrecipMobj((precipmobj_t *)think);
+		think = next;
+	}
+}
+
 //
 // P_SwitchWeather
 //
@@ -2003,101 +1741,46 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller)
 //
 void P_SwitchWeather(INT32 weathernum)
 {
-	boolean purge = false;
-	INT32 swap = 0;
+	boolean purge = true;
+	boolean spawnprecip = false;
 
-	switch (weathernum)
-	{
-		case PRECIP_NONE: // None
-			if (curWeather == PRECIP_NONE)
-				return; // Nothing to do.
-			purge = true;
-			break;
-		case PRECIP_STORM: // Storm
-		case PRECIP_STORM_NOSTRIKES: // Storm w/ no lightning
-		case PRECIP_RAIN: // Rain
-			if (curWeather == PRECIP_SNOW || curWeather == PRECIP_BLANK || curWeather == PRECIP_STORM_NORAIN)
-				swap = PRECIP_RAIN;
-			break;
-		case PRECIP_SNOW: // Snow
-			if (curWeather == PRECIP_SNOW)
-				return; // Nothing to do.
-			if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES || curWeather == PRECIP_BLANK || curWeather == PRECIP_STORM_NORAIN)
-				swap = PRECIP_SNOW; // Need to delete the other precips.
-			break;
-		case PRECIP_STORM_NORAIN: // Storm w/o rain
-			if (curWeather == PRECIP_SNOW
-				|| curWeather == PRECIP_STORM
-				|| curWeather == PRECIP_STORM_NOSTRIKES
-				|| curWeather == PRECIP_RAIN
-				|| curWeather == PRECIP_BLANK)
-				swap = PRECIP_STORM_NORAIN;
-			else if (curWeather == PRECIP_STORM_NORAIN)
-				return;
-			break;
-		case PRECIP_BLANK:
-			if (curWeather == PRECIP_SNOW
-				|| curWeather == PRECIP_STORM
-				|| curWeather == PRECIP_STORM_NOSTRIKES
-				|| curWeather == PRECIP_RAIN)
-				swap = PRECIP_BLANK;
-			else if (curWeather == PRECIP_STORM_NORAIN)
-				swap = PRECIP_BLANK;
-			else if (curWeather == PRECIP_BLANK)
-				return;
-			break;
-		default:
-			CONS_Debug(DBG_GAMELOGIC, "P_SwitchWeather: Unknown weather type %d.\n", weathernum);
-			break;
-	}
+	if (weathernum == curWeather)
+		return;
+
+	if (is_rain_type(weathernum) &&
+		is_rain_type(curWeather))
+		purge = false;
 
 	if (purge)
 	{
-		thinker_t *think;
-		precipmobj_t *precipmobj;
-
-		for (think = thinkercap.next; think != &thinkercap; think = think->next)
-		{
-			if (think->function.acp1 != (actionf_p1)P_NullPrecipThinker)
-				continue; // not a precipmobj thinker
-
-			precipmobj = (precipmobj_t *)think;
-
-			P_RemovePrecipMobj(precipmobj);
-		}
+		P_PurgePrecipitation();
 	}
-	else if (swap && !((swap == PRECIP_BLANK && curWeather == PRECIP_STORM_NORAIN) || (swap == PRECIP_STORM_NORAIN && curWeather == PRECIP_BLANK))) // Rather than respawn all that crap, reuse it!
+	else // Rather than respawn all that crap, reuse it!
 	{
 		thinker_t *think;
 		precipmobj_t *precipmobj;
 		state_t *st;
 
-		for (think = thinkercap.next; think != &thinkercap; think = think->next)
+		for (think = precipcap.next; think != &precipcap; think = think->next)
 		{
-			if (think->function.acp1 != (actionf_p1)P_NullPrecipThinker)
-				continue; // not a precipmobj thinker
 			precipmobj = (precipmobj_t *)think;
 
-			if (swap == PRECIP_RAIN) // Snow To Rain
+			INT32 z = 0;
+			mobjtype_t type = MT_NULL;
+
+			if (weathernum == PRECIP_NONE || weathernum == PRECIP_BLANK || weathernum == PRECIP_STORM_NORAIN) // Remove precip, but keep it around for reuse.
 			{
-				precipmobj->flags = mobjinfo[MT_RAIN].flags;
-				st = &states[mobjinfo[MT_RAIN].spawnstate];
-				precipmobj->state = st;
-				precipmobj->tics = st->tics;
-				precipmobj->sprite = st->sprite;
-				precipmobj->frame = st->frame;
-				precipmobj->momz = mobjinfo[MT_RAIN].speed;
-
-				precipmobj->precipflags &= ~PCF_INVISIBLE;
-
-				precipmobj->precipflags |= PCF_RAIN;
-				//think->function.acp1 = (actionf_p1)P_RainThinker;
+				precipmobj->precipflags |= PCF_INVISIBLE;
+				continue;
 			}
-			else if (swap == PRECIP_SNOW) // Rain To Snow
+			else if (weathernum == PRECIP_RAIN || weathernum == PRECIP_STORM || weathernum == PRECIP_STORM_NOSTRIKES) // Snow To Rain
 			{
-				INT32 z;
+				type = MT_RAIN;
+			}
+			else if (weathernum == PRECIP_SNOW) // Rain To Snow
+			{
+				type = MT_SNOWFLAKE;
 
-				precipmobj->flags = mobjinfo[MT_SNOWFLAKE].flags;
 				z = M_RandomByte();
 
 				if (z < 64)
@@ -2106,24 +1789,21 @@ void P_SwitchWeather(INT32 weathernum)
 					z = 1;
 				else
 					z = 0;
-
-				st = &states[mobjinfo[MT_SNOWFLAKE].spawnstate+z];
-				precipmobj->state = st;
-				precipmobj->tics = st->tics;
-				precipmobj->sprite = st->sprite;
-				precipmobj->frame = st->frame;
-				precipmobj->momz = mobjinfo[MT_SNOWFLAKE].speed;
-
-				precipmobj->precipflags &= ~(PCF_INVISIBLE|PCF_RAIN);
-
-				//think->function.acp1 = (actionf_p1)P_SnowThinker;
 			}
-			else if (swap == PRECIP_BLANK || swap == PRECIP_STORM_NORAIN) // Remove precip, but keep it around for reuse.
-			{
-				//think->function.acp1 = (actionf_p1)P_NullPrecipThinker;
 
-				precipmobj->precipflags |= PCF_INVISIBLE;
-			}
+			precipmobj->type = type; // proper set the type
+			precipmobj->info = &mobjinfo[type];
+			precipmobj->flags = mobjinfo[type].flags;
+
+			st = &states[mobjinfo[type].spawnstate+z];
+
+			precipmobj->state = st;
+			precipmobj->tics = st->tics;
+			precipmobj->sprite = st->sprite;
+			precipmobj->frame = st->frame;
+			precipmobj->momz = (cv_mobjscaleprecip.value ? FixedMul(mobjinfo[type].speed, mapobjectscale) : mobjinfo[type].speed);
+
+			precipmobj->precipflags &= ~(PCF_INVISIBLE|PCF_SPLASH); // P_PrecipThinker will add this again if it needs to
 		}
 	}
 
@@ -2131,71 +1811,34 @@ void P_SwitchWeather(INT32 weathernum)
 	{
 		case PRECIP_SNOW: // snow
 			curWeather = PRECIP_SNOW;
-
-			if (!swap)
-				P_SpawnPrecipitation();
-
-			break;
+			spawnprecip = true;
+		break;
 		case PRECIP_RAIN: // rain
-		{
-			boolean dontspawn = false;
-
-			if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES)
-				dontspawn = true;
-
 			curWeather = PRECIP_RAIN;
-
-			if (!dontspawn && !swap)
-				P_SpawnPrecipitation();
-
+			spawnprecip = true;
 			break;
-		}
 		case PRECIP_STORM: // storm
-		{
-			boolean dontspawn = false;
-
-			if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES)
-				dontspawn = true;
-
 			curWeather = PRECIP_STORM;
-
-			if (!dontspawn && !swap)
-				P_SpawnPrecipitation();
-
+			spawnprecip = true;
 			break;
-		}
 		case PRECIP_STORM_NOSTRIKES: // storm w/o lightning
-		{
-			boolean dontspawn = false;
-
-			if (curWeather == PRECIP_RAIN || curWeather == PRECIP_STORM || curWeather == PRECIP_STORM_NOSTRIKES)
-				dontspawn = true;
-
 			curWeather = PRECIP_STORM_NOSTRIKES;
-
-			if (!dontspawn && !swap)
-				P_SpawnPrecipitation();
-
+			spawnprecip = true;
 			break;
-		}
 		case PRECIP_STORM_NORAIN: // storm w/o rain
 			curWeather = PRECIP_STORM_NORAIN;
-
-			if (!swap)
-				P_SpawnPrecipitation();
-
 			break;
-		case PRECIP_BLANK:
+		case PRECIP_BLANK: //preloaded
 			curWeather = PRECIP_BLANK;
-
-			if (!swap)
-				P_SpawnPrecipitation();
-
-			break;
+			spawnprecip = true;
+		break;
 		default:
 			curWeather = PRECIP_NONE;
 			break;
 	}
+
+	if (spawnprecip && purge)
+		P_SpawnPrecipitation();
 }
 
 /** Gets an object.
@@ -2300,22 +1943,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 			EV_DoCeiling(line, moveCeilingByFrontTexture);
 			break;
 
-/*		case 405: // Lower floor by line, dx = speed, dy = amount to lower
-			EV_DoFloor(line, lowerFloorByLine);
-			break;
-
-		case 406: // Raise floor by line, dx = speed, dy = amount to raise
-			EV_DoFloor(line, raiseFloorByLine);
-			break;
-
-		case 407: // Lower ceiling by line, dx = speed, dy = amount to lower
-			EV_DoCeiling(line, lowerCeilingByLine);
-			break;
-
-		case 408: // Raise ceiling by line, dx = speed, dy = amount to raise
-			EV_DoCeiling(line, raiseCeilingByLine);
-			break;*/
-
 		case 409: // Change tagged sectors' tag
 		// (formerly "Change calling sectors' tag", but behavior was changed)
 		{
@@ -2376,6 +2003,9 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 					mo->y += y;
 					mo->z += z;
 					P_SetThingPosition(mo);
+					mo->old_x = mo->x;
+					mo->old_y = mo->y;
+					mo->old_z = mo->z;
 
 					if (mo->player)
 					{
@@ -2392,9 +2022,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 								camera[i].y += y;
 								camera[i].z += z;
 								camera[i].reset = true;
-								camera[i].subsector = R_PointInSubsector(camera[i].x, camera[i].y);
+								camera[i].subsector = R_PointInSubsectorFast(camera[i].x, camera[i].y);
 								R_RelativeTeleportViewInterpolation(i, x, y, z, 0);
-								R_ResetViewInterpolation(i + 1); // reset view interp as well
 								break;
 							}
 						}
@@ -2410,12 +2039,12 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 						return;
 
 					if (bot)
-						P_Teleport(bot, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ?  mo->angle : dest->angle, (line->flags & ML_BLOCKMONSTERS) == 0, (line->flags & ML_EFFECT4) == ML_EFFECT4);
+						P_Teleport(bot, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, (line->flags & ML_BLOCKMONSTERS) == 0, (line->flags & ML_EFFECT4) == ML_EFFECT4);
 					if (line->flags & ML_BLOCKMONSTERS)
-						P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ?  mo->angle : dest->angle, false, (line->flags & ML_EFFECT4) == ML_EFFECT4);
+						P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, false, (line->flags & ML_EFFECT4) == ML_EFFECT4);
 					else
 					{
-						P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ?  mo->angle : dest->angle, true, (line->flags & ML_EFFECT4) == ML_EFFECT4);
+						P_Teleport(mo, dest->x, dest->y, dest->z, (line->flags & ML_NOCLIMB) ? mo->angle : dest->angle, true, (line->flags & ML_EFFECT4) == ML_EFFECT4);
 						// Play the 'bowrwoosh!' sound
 						S_StartSound(dest, sfx_mixup);
 					}
@@ -2424,6 +2053,12 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 			break;
 
 		case 413: // Change music
+			if (keepmapmusic && (leveltime <= MUSICSTARTTIME)) // why check for starttime? cause encore music Zzz...
+				return;
+
+			//if (cv_ignoremusicchanges.value && (leveltime >= MUSICSTARTTIME) && !fromlapexec) // keep lap music intanct tho
+				//return;
+
 			// console player only unless NOCLIMB is set
 			if ((line->flags & ML_NOCLIMB) || (mo && mo->player && P_IsLocalPlayer(mo->player)))
 			{
@@ -2466,19 +2101,19 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 				// Change the music and apply position/fade operations
 				else
 				{
-					strncpy(mapmusname, sides[line->sidenum[0]].text, 7);
-					mapmusname[6] = 0;
+					strncpy(mapmusic.name, sides[line->sidenum[0]].text, 7);
+					mapmusic.name[6] = 0;
 
-					mapmusflags = tracknum & MUSIC_TRACKMASK;
+					mapmusic.flags = tracknum & MUSIC_TRACKMASK;
 					if (!(line->flags & ML_BLOCKMONSTERS))
-						mapmusflags |= MUSIC_RELOADRESET;
+						mapmusic.flags |= MUSIC_RELOADRESET;
 					if (line->flags & ML_BOUNCY)
-						mapmusflags |= MUSIC_FORCERESET;
+						mapmusic.flags |= MUSIC_FORCERESET;
 
-					mapmusposition = position;
-					mapmusresume = 0;
+					mapmusic.position = position;
+					mapmusic.resume = 0;
 
-					S_ChangeMusicEx(mapmusname, mapmusflags, !(line->flags & ML_EFFECT4), position,
+					S_ChangeMusicEx(mapmusic.name, mapmusic.flags, !(line->flags & ML_EFFECT4), position,
 						!(line->flags & ML_EFFECT2) ? prefadems : 0,
 						!(line->flags & ML_EFFECT2) ? postfadems : 0);
 
@@ -2504,6 +2139,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 			{
 				INT32 sfxnum;
 
+				//dont play any funky sound intros that may interfere with the music
+				if ((skipintromus || keepmapmusic) && (leveltime < MUSICSTARTTIME))
+					return;
+
 				sfxnum = sides[line->sidenum[0]].toptexture; //P_AproxDistance(line->dx, line->dy)>>FRACBITS;
 
 				if (sfxnum == sfx_None)
@@ -2780,6 +2419,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 		case 422: // Cut away to another view
 			{
 				mobj_t *altview;
+				INT32 i;
 
 				if (!mo || !mo->player) // only players have views
 					return;
@@ -2794,6 +2434,17 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 				P_SetTarget(&mo->player->awayviewmobj, altview);
 				mo->player->awayviewtics = P_AproxDistance(line->dx, line->dy)>>FRACBITS;
 
+				if (gamestate == GS_LEVEL)
+				{
+					for (i = 0; i <= splitscreen; i++)
+					{
+						if (displayplayers[i] == (mo->player - players))
+						{
+							R_ResetViewInterpolation(i + 1);
+						}
+					}
+				}
+
 				if (line->flags & ML_NOCLIMB) // lets you specify a vertical angle
 				{
 					INT32 aim;
@@ -2901,7 +2552,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 
 				// Copy effect to bot if necessary
 				// (Teleport them to you so they don't break it.)
-				if (bot && (bot->flags2 & MF2_TWOD) != (mo->flags2 & MF2_TWOD)) {
+				if (bot && (bot->flags2 & MF2_TWOD) != (mo->flags2 & MF2_TWOD))
+				{
 					bot->flags2 = (bot->flags2 & ~MF2_TWOD) | (mo->flags2 & MF2_TWOD);
 					P_SetOrigin(bot, mo->x, mo->y, mo->z);
 				}
@@ -2934,7 +2586,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 				P_SetTarget(&dummy->target, mo);
 				A_CustomPower(dummy);
 
-				if (bot) {
+				if (bot)
+				{
 					P_SetTarget(&dummy->target, bot);
 					A_CustomPower(dummy);
 				}
@@ -2949,7 +2602,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 
 				for (th = thinkercap.next; th != &thinkercap; th = th->next)
 				{
-					if (th->function.acp1 != (actionf_p1)T_Scroll)
+					if (th->function != (actionf_p1)T_Scroll)
 						continue;
 
 					scroller = (scroll_t *)th;
@@ -3122,24 +2775,26 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
 
 		case 443: // Calls a named Lua function
 			if (line->text)
-				LUAh_LinedefExecute(line, mo, callsec);
+				LUA_HookLinedefExecute(line, mo, callsec);
 			else
 				CONS_Alert(CONS_WARNING, "Linedef %s is missing the hook name of the Lua function to call! (This should be given in the front texture fields)\n", sizeu1(line-lines));
 			break;
 
 		case 444: // Earthquake camera
 		{
-			quake.intensity = sides[line->sidenum[0]].textureoffset;
-			quake.radius = sides[line->sidenum[0]].rowoffset;
-			quake.time = P_AproxDistance(line->dx, line->dy)>>FRACBITS;
+			fixed_t intensity = sides[line->sidenum[0]].textureoffset;
+			fixed_t radius = sides[line->sidenum[0]].rowoffset;
+			tic_t time = P_AproxDistance(line->dx, line->dy)>>FRACBITS;
 
 			quake.epicenter = NULL; /// \todo
 
 			// reasonable defaults.
-			if (!quake.intensity)
-				quake.intensity = 8<<FRACBITS;
-			if (!quake.radius)
-				quake.radius = 512<<FRACBITS;
+			if (intensity <= 0)
+				intensity = 8<<FRACBITS;
+			if (radius <= 0)
+				radius = 512<<FRACBITS;
+
+			P_StartQuake(time, intensity, radius);
 			break;
 		}
 
@@ -3282,10 +2937,8 @@ void P_SetupSignExit(player_t *player)
 	// spin all signposts in the level then.
 	for (think = thinkercap.next; think != &thinkercap; think = think->next)
 	{
-		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
+		if (think->function != (actionf_p1)P_MobjThinker)
 			continue; // not a mobj thinker
-		if (think->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
 
 		thing = (mobj_t *)think;
 		if (thing->type != MT_SIGN)
@@ -3333,10 +2986,8 @@ boolean P_IsFlagAtBase(mobjtype_t flag)
 
 	for (think = thinkercap.next; think != &thinkercap; think = think->next)
 	{
-		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
+		if (think->function != (actionf_p1)P_MobjThinker)
 			continue; // not a mobj thinker
-		if (think->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
 
 		mo = (mobj_t *)think;
 
@@ -3357,11 +3008,9 @@ boolean P_IsFlagAtBase(mobjtype_t flag)
 				if (GETSECSPECIAL(rover->master->frontsector->special, 4) != specialnum)
 					continue;
 
-				if (!(mo->z <= P_GetSpecialTopZ(mo, sectors + rover->secnum, mo->subsector->sector)
-					&& mo->z >= P_GetSpecialBottomZ(mo, sectors + rover->secnum, mo->subsector->sector)))
-					continue;
-
-				return true;
+				if (mo->z <= P_GetSpecialTopZ(mo, sectors + rover->secnum, mo->subsector->sector)
+					&& mo->z >= P_GetSpecialBottomZ(mo, sectors + rover->secnum, mo->subsector->sector))
+					return true;
 			}
 		}
 	}
@@ -3528,10 +3177,6 @@ static boolean P_ThingIsOnThe3DFloor(mobj_t *mo, sector_t *sector, sector_t *tar
 		if (rover->master->frontsector != sector)
 			continue;
 
-		// we're assuming the FOF existed when the first player touched it
-		//if (!(rover->flags & FF_EXISTS))
-		//	return false;
-
 		top = P_GetSpecialTopZ(mo, sector, targetsec);
 		bottom = P_GetSpecialBottomZ(mo, sector, targetsec);
 
@@ -3628,9 +3273,10 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
 			if (roversector || P_MobjReadyToTrigger(player->mo, sector))
 				P_DamageMobj(player->mo, NULL, NULL, 1);
 			break;
-		case 2: // Damage (Water) // SRB2kart - These three damage types are now offroad sectors
-		case 3: // Damage (Fire)
-		case 4: // Damage (Electrical)
+		// SRB2kart - These three damage types are now offroad sectors
+		case 2: // Offroad (Weak)
+		case 3: // Offroad
+		case 4: // Offroad (Strong)
 			break;
 		case 5: // Spikes
 			// Don't do anything. In Soviet Russia, spikes find you.
@@ -3638,10 +3284,10 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
 		case 6: // Death Pit (Camera Tilt)
 		case 7: // Death Pit (No Camera Tilt)
 			if (roversector || P_MobjReadyToTrigger(player->mo, sector))
-				P_DamageMobj(player->mo, NULL, NULL, 10000);
+				P_DamageMobj(player->mo, NULL, NULL, DMG_INSTAKILL);
 			break;
 		case 8: // Instant Kill
-			P_DamageMobj(player->mo, NULL, NULL, 10000);
+			P_DamageMobj(player->mo, NULL, NULL, DMG_INSTAKILL);
 			break;
 		case 9: // Ring Drainer (Floor Touch)
 		case 10: // Ring Drainer (No Floor Touch)
@@ -3666,7 +3312,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
 			}
 			else if (player->mo->health > 1)
 			{
-				P_PlayRinglossSound(player->mo);
+				P_PlayRinglossSound(player->mo, NULL);
 				if (player->mo->health > 10)
 					player->mo->health -= 10;
 				else
@@ -3773,9 +3419,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
 			// The chimps are my friends.. heeheeheheehehee..... - LouisJM
 			for (th = thinkercap.next; th != &thinkercap; th = th->next)
 			{
-				if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-					continue;
-				if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+				if (th->function != (actionf_p1)P_MobjThinker)
 					continue;
 
 				mo2 = (mobj_t *)th;
@@ -3891,14 +3535,16 @@ DoneSection2:
 
 				if (!demo.playback || P_AnalogMove(player))
 				{
-					if (player == &players[consoleplayer])
-						localangle[0] = player->mo->angle;
-					else if (player == &players[displayplayers[1]])
-						localangle[1] = player->mo->angle;
-					else if (player == &players[displayplayers[2]])
-						localangle[2] = player->mo->angle;
-					else if (player == &players[displayplayers[3]])
-						localangle[3] = player->mo->angle;
+					for (UINT8 j = 0; j <= splitscreen; ++j)
+					{
+						INT32 id = (j == 0 ? consoleplayer : displayplayers[j]);
+
+						if (player == &players[id])
+						{
+							localangle[j] = player->mo->angle;
+							break;
+						}
+					}
 				}
 
 				if (!(lines[i].flags & ML_EFFECT4))
@@ -3929,7 +3575,6 @@ DoneSection2:
 					sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
 					if (cv_kartvoices.value)
 						S_StartSound(player->mo, sfx_kbost1+pick);
-					//K_TauntVoiceTimers(player);
 				}
 			}
 			break;
@@ -3965,8 +3610,6 @@ DoneSection2:
 		case 2: // Special stage GOAL sector / Exit Sector / CTF Flag Return
 			if (player->bot)
 				break;
-			if (!useNightsSS && G_IsSpecialStage(gamemap) && sstimer > 6)
-				sstimer = 6; // Just let P_Ticker take care of the rest.
 
 			// Exit (for FOF exits; others are handled in P_PlayerThink in p_user.c)
 			{
@@ -4067,8 +3710,6 @@ DoneSection2:
 				player->mo->momz = mobjinfo[MT_FAN].mass;
 
 			P_ResetPlayer(player);
-			//if (player->panim != PA_FALL) 					// SRB2kart
-			//	P_SetPlayerMobjState(player->mo, S_PLAY_FALL1);
 			break;
 
 		case 6: // SRB2kart 190117 - Sneaker Panel
@@ -4113,7 +3754,29 @@ DoneSection2:
 				speed = abs(lines[lineindex].dx)/8;
 				sequence = abs(lines[lineindex].dy)>>FRACBITS;
 
+<<<<<<< HEAD
 				waypoint = P_GetFirstWaypoint(sequence);
+=======
+				// scan the thinkers
+				// to find the first waypoint
+				for (th = thinkercap.next; th != &thinkercap; th = th->next)
+				{
+					if (th->function != (actionf_p1)P_MobjThinker)
+						continue;
+
+					mo2 = (mobj_t *)th;
+
+					if (mo2->type != MT_TUBEWAYPOINT)
+						continue;
+					if (mo2->threshold != sequence)
+						continue;
+					if (mo2->health != 0)
+						continue;
+
+					waypoint = mo2;
+					break;
+				}
+>>>>>>> Saturn-Next
 
 				if (!waypoint)
 				{
@@ -4139,12 +3802,6 @@ DoneSection2:
 
 				if (!(player->mo->state >= &states[S_KART_RUN1] && player->mo->state <= &states[S_KART_RUN2]))
 					P_SetPlayerMobjState(player->mo, S_KART_RUN1);
-
-				//if (!(player->mo->state >= &states[S_PLAY_ATK1] && player->mo->state <= &states[S_PLAY_ATK4])) // SRB2kart
-				//{
-				//	P_SetPlayerMobjState(player->mo, S_PLAY_ATK1);
-				//	S_StartSound(player->mo, sfx_spin);
-				//}
 			}
 			break;
 
@@ -4172,7 +3829,29 @@ DoneSection2:
 				speed = -(abs(lines[lineindex].dx)/8); // Negative means reverse
 				sequence = abs(lines[lineindex].dy)>>FRACBITS;
 
+<<<<<<< HEAD
 				waypoint = P_GetLastWaypoint(sequence);
+=======
+				// scan the thinkers
+				// to find the last waypoint
+				for (th = thinkercap.next; th != &thinkercap; th = th->next)
+				{
+					if (th->function != (actionf_p1)P_MobjThinker)
+						continue;
+
+					mo2 = (mobj_t *)th;
+
+					if (mo2->type != MT_TUBEWAYPOINT)
+						continue;
+					if (mo2->threshold != sequence)
+						continue;
+
+					if (!waypoint)
+						waypoint = mo2;
+					else if (mo2->health > waypoint->health)
+						waypoint = mo2;
+				}
+>>>>>>> Saturn-Next
 
 				if (!waypoint)
 				{
@@ -4196,12 +3875,6 @@ DoneSection2:
 
 				if (!(player->mo->state >= &states[S_KART_RUN1] && player->mo->state <= &states[S_KART_RUN2]))
 					P_SetPlayerMobjState(player->mo, S_KART_RUN1);
-
-				//if (!(player->mo->state >= &states[S_PLAY_ATK1] && player->mo->state <= &states[S_PLAY_ATK4])) // SRB2kart
-				//{
-				//	P_SetPlayerMobjState(player->mo, S_PLAY_ATK1);
-				//	S_StartSound(player->mo, sfx_spin);
-				//}
 			}
 			break;
 
@@ -4220,6 +3893,7 @@ DoneSection2:
 					{
 						if (!playeringame[i] || players[i].spectator)
 							continue;
+
 						nump++;
 					}
 
@@ -4243,20 +3917,21 @@ DoneSection2:
 
 					player->kartstuff[k_lapanimation] = 80;
 
-					if (player->pflags & PF_NIGHTSMODE)
+					if (UNLIKELY(player->pflags & PF_NIGHTSMODE))
 						player->drillmeter += 48*20;
 
 					if (netgame && player->laps >= (UINT8)cv_numlaps.value)
 						CON_LogMessage(va(M_GetText("%s has finished the race.\n"), player_names[player-players]));
 
 					// SRB2Kart: save best lap for record attack
-					if (player == &players[consoleplayer])
+					if (player->laptime[LAP_CUR] < player->laptime[LAP_BEST] || player->laptime[LAP_BEST] == 0)
 					{
-						if (curlap < bestlap || bestlap == 0)
-							bestlap = curlap;
-						curlap = 0;
+						player->laptime[LAP_BEST] = player->laptime[LAP_CUR];
 					}
 
+					player->laptime[LAP_LAST] = player->laptime[LAP_CUR];
+					player->laptime[LAP_CUR] = 0;
+
 					player->starposttime = player->realtime;
 					player->starpostnum = 0;
 
@@ -4285,12 +3960,6 @@ DoneSection2:
 							S_StartSound(NULL, sfx_s221);
 					}
 
-					//player->starpostangle = player->starposttime = player->starpostnum = 0;
-					//player->starpostx = player->starposty = player->starpostz = 0;
-
-					// Play the starpost sound for 'consistency'
-					// S_StartSound(player->mo, sfx_strpst);
-
 					thwompsactive = true; // Lap 2 effects
 					player->grieftime = 0;
 				}
@@ -4373,7 +4042,16 @@ DoneSection2:
 				// Determine the closest spot on the line between the three waypoints
 				// Put player at that location.
 
+<<<<<<< HEAD
 				waypointmid = P_GetClosestWaypoint(sequence, player->mo);
+=======
+				// scan the thinkers
+				// to find the first waypoint
+				for (th = thinkercap.next; th != &thinkercap; th = th->next)
+				{
+					if (th->function != (actionf_p1)P_MobjThinker)
+						continue;
+>>>>>>> Saturn-Next
 
 				if (!waypointmid)
 				{
@@ -4381,8 +4059,64 @@ DoneSection2:
 					break;
 				}
 
+<<<<<<< HEAD
 				waypointlow = P_GetPreviousWaypoint(waypointmid, true);
 				waypointhigh = P_GetNextWaypoint(waypointmid, true);
+=======
+				// Find waypoint before this one (waypointlow)
+				for (th = thinkercap.next; th != &thinkercap; th = th->next)
+				{
+					if (th->function != (actionf_p1)P_MobjThinker)
+						continue;
+
+					mo2 = (mobj_t *)th;
+
+					if (mo2->type != MT_TUBEWAYPOINT)
+						continue;
+
+					if (mo2->threshold != sequence)
+						continue;
+
+					if (waypointmid->health == 0)
+					{
+						if (mo2->health != highest->health)
+							continue;
+					}
+					else if (mo2->health != waypointmid->health - 1)
+						continue;
+
+					// Found a target
+					waypointlow = mo2;
+					break;
+				}
+
+				// Find waypoint after this one (waypointhigh)
+				for (th = thinkercap.next; th != &thinkercap; th = th->next)
+				{
+					if (th->function != (actionf_p1)P_MobjThinker)
+						continue;
+
+					mo2 = (mobj_t *)th;
+
+					if (mo2->type != MT_TUBEWAYPOINT)
+						continue;
+
+					if (mo2->threshold != sequence)
+						continue;
+
+					if (waypointmid->health == highest->health)
+					{
+						if (mo2->health != 0)
+							continue;
+					}
+					else if (mo2->health != waypointmid->health + 1)
+						continue;
+
+					// Found a target
+					waypointhigh = mo2;
+					break;
+				}
+>>>>>>> Saturn-Next
 
 				CONS_Debug(DBG_GAMELOGIC, "WaypointMid: %d; WaypointLow: %d; WaypointHigh: %d\n",
 								waypointmid->health, waypointlow ? waypointlow->health : -1, waypointhigh ? waypointhigh->health : -1);
@@ -4766,24 +4500,10 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
 			break;
 	}
 
-	// Check Section 3
-/*	switch(GETSECSPECIAL(sector->special, 3))
-	{
-
-	}*/
-
 	// Check Section 4
 	switch(GETSECSPECIAL(sector->special, 4))
 	{
 		case 2: // Level Exit / GOAL Sector / Flag Return
-			if (!useNightsSS && G_IsSpecialStage(gamemap))
-			{
-				// Special stage GOAL sector
-				// requires touching floor.
-				break;
-			}
-			/* FALLTHRU */
-
 		case 1: // Starpost activator
 		case 5: // Fan sector
 		case 6: // Super Sonic Transform
@@ -4878,13 +4598,13 @@ void P_UpdateSpecials(void)
 	// LEVEL TIMER
 	P_CheckTimeLimit();
 
+	// POINT LIMIT
+	P_CheckPointLimit();
+
 	// Dynamic slopeness
 	if (!midgamejoin) // run here when not joined midgame to prevent any potential issues that may arise
 		P_RunDynamicSlopes();
 
-	// POINT LIMIT
-	P_CheckPointLimit();
-
 	// ANIMATE TEXTURES
 	for (anim = anims; anim < lastanim; anim++)
 	{
@@ -5053,11 +4773,11 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 	i = 0;
 	th = thinkercap.next;
 
-	for(;;)
+	for (;;)
 	{
-		if(secthinkers)
+		if (secthinkers)
 		{
-			if(i < secthinkers[sec2num].count)
+			if (i < secthinkers[sec2num].count)
 				th = secthinkers[sec2num].thinkers[i];
 			else break;
 		}
@@ -5065,7 +4785,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 			break;
 
 		// Should this FOF have spikeness?
-		if (th->function.acp1 == (actionf_p1)T_SpikeSector)
+		if (th->function == (actionf_p1)T_SpikeSector)
 		{
 			lst = (levelspecthink_t *)th;
 
@@ -5073,7 +4793,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 				P_AddSpikeThinker(sec, (INT32)sec2num);
 		}
 		// Should this FOF have friction?
-		else if(th->function.acp1 == (actionf_p1)T_Friction)
+		else if(th->function == (actionf_p1)T_Friction)
 		{
 			f = (friction_t *)th;
 
@@ -5081,7 +4801,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 				Add_Friction(f->friction, f->movefactor, (INT32)(sec-sectors), f->affectee);
 		}
 		// Should this FOF have wind/current/pusher?
-		else if(th->function.acp1 == (actionf_p1)T_Pusher)
+		else if(th->function == (actionf_p1)T_Pusher)
 		{
 			p = (pusher_t *)th;
 
@@ -5089,20 +4809,40 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
 				Add_Pusher(p->type, p->x_mag<<FRACBITS, p->y_mag<<FRACBITS, p->source, (INT32)(sec-sectors), p->affectee, p->exclusive, p->slider);
 		}
 
-		if(secthinkers) i++;
-		else th = th->next;
+		if (secthinkers)
+			i++;
+		else
+			th = th->next;
 	}
 
-
 	if (flags & FF_TRANSLUCENT)
 	{
 		if (sides[master->sidenum[0]].toptexture > 0)
-			ffloor->alpha = sides[master->sidenum[0]].toptexture; // for future reference, "#0" is 1, and "#255" is 256. Be warned
+		{
+			// for future reference, "#0" is 1, and "#255" is 256. Be warned
+			ffloor->alpha = sides[master->sidenum[0]].toptexture;
+
+			if (ffloor->alpha >= 1001) // fourth digit
+			{
+				ffloor->blend = (ffloor->alpha/1000)+1; // becomes an AST
+				ffloor->alpha %= 1000;
+			}
+			else
+			{
+				ffloor->blend = 0;
+			}
+		}
 		else
+		{
 			ffloor->alpha = 0x80;
+			ffloor->blend = 0;
+		}
 	}
 	else
+	{
 		ffloor->alpha = 0xff;
+		ffloor->blend = 0;
+	}
 
 	ffloor->spawnalpha = ffloor->alpha; // save for netgames
 
@@ -5152,7 +4892,7 @@ static void P_AddSpikeThinker(sector_t *sec, INT32 referrer)
 	spikes = Z_Calloc(sizeof (*spikes), PU_LEVSPEC, NULL);
 	P_AddThinker(&spikes->thinker);
 
-	spikes->thinker.function.acp1 = (actionf_p1)T_SpikeSector;
+	spikes->thinker.function = (actionf_p1)T_SpikeSector;
 
 	spikes->sector = sec;
 	spikes->vars[0] = referrer;
@@ -5174,7 +4914,7 @@ static void P_AddFloatThinker(sector_t *sec, INT32 tag, line_t *sourceline)
 	floater = Z_Calloc(sizeof (*floater), PU_LEVSPEC, NULL);
 	P_AddThinker(&floater->thinker);
 
-	floater->thinker.function.acp1 = (actionf_p1)T_FloatSector;
+	floater->thinker.function = (actionf_p1)T_FloatSector;
 
 	floater->sector = sec;
 	floater->vars[0] = tag;
@@ -5185,42 +4925,6 @@ static void P_AddFloatThinker(sector_t *sec, INT32 tag, line_t *sourceline)
 	R_CreateInterpolator_SectorPlane(&floater->thinker, sec, true);
 }
 
-/** Adds a bridge thinker.
-  * Bridge thinkers cause a group of FOFs to behave like
-  * a bridge made up of pieces, that bows under weight.
-  *
-  * \param sec          Control sector.
-  * \sa P_SpawnSpecials, T_BridgeThinker
-  * \author SSNTails <http://www.ssntails.org>
-  */
-/*
-static inline void P_AddBridgeThinker(line_t *sourceline, sector_t *sec)
-{
-	levelspecthink_t *bridge;
-
-	// create an initialize new thinker
-	bridge = Z_Calloc(sizeof (*bridge), PU_LEVSPEC, NULL);
-	P_AddThinker(&bridge->thinker);
-
-	bridge->thinker.function.acp1 = (actionf_p1)T_BridgeThinker;
-
-	bridge->sector = sec;
-	bridge->vars[0] = sourceline->frontsector->floorheight;
-	bridge->vars[1] = sourceline->frontsector->ceilingheight;
-	bridge->vars[2] = P_AproxDistance(sourceline->dx, sourceline->dy); // Speed
-	bridge->vars[2] = FixedDiv(bridge->vars[2], 16*FRACUNIT);
-	bridge->vars[3] = bridge->vars[2];
-
-	// Start tag and end tag are TARGET SECTORS, not CONTROL SECTORS
-	// Control sector tags should be End_Tag + (End_Tag - Start_Tag)
-	bridge->vars[4] = sourceline->tag; // Start tag
-	bridge->vars[5] = (sides[sourceline->sidenum[0]].textureoffset>>FRACBITS); // End tag
-
-	// interpolation
-	R_CreateInterpolator_SectorPlane(&bridge->thinker, &sectors[affectee], false);
-}
-*/
-
 /** Adds a Mario block thinker, which changes the block's texture between blank
   * and ? depending on whether it has contents.
   * Needed in case objects respawn inside.
@@ -5239,7 +4943,7 @@ static void P_AddBlockThinker(sector_t *sec, line_t *sourceline)
 	block = Z_Calloc(sizeof (*block), PU_LEVSPEC, NULL);
 	P_AddThinker(&block->thinker);
 
-	block->thinker.function.acp1 = (actionf_p1)T_MarioBlockChecker;
+	block->thinker.function = (actionf_p1)T_MarioBlockChecker;
 	block->sourceline = sourceline;
 
 	block->sector = sec;
@@ -5268,7 +4972,7 @@ static void P_AddRaiseThinker(sector_t *sec, line_t *sourceline)
 	raise = Z_Calloc(sizeof (*raise), PU_LEVSPEC, NULL);
 	P_AddThinker(&raise->thinker);
 
-	raise->thinker.function.acp1 = (actionf_p1)T_RaiseSector;
+	raise->thinker.function = (actionf_p1)T_RaiseSector;
 
 	if (sourceline->flags & ML_BLOCKMONSTERS)
 		raise->vars[0] = 1;
@@ -5311,7 +5015,7 @@ static void P_AddOldAirbob(sector_t *sec, line_t *sourceline, boolean noadjust)
 	airbob = Z_Calloc(sizeof (*airbob), PU_LEVSPEC, NULL);
 	P_AddThinker(&airbob->thinker);
 
-	airbob->thinker.function.acp1 = (actionf_p1)T_RaiseSector;
+	airbob->thinker.function = (actionf_p1)T_RaiseSector;
 
 	// set up the fields
 	airbob->sector = sec;
@@ -5376,7 +5080,7 @@ static inline void P_AddThwompThinker(sector_t *sec, sector_t *actionsector, lin
 	thwomp = Z_Calloc(sizeof (*thwomp), PU_LEVSPEC, NULL);
 	P_AddThinker(&thwomp->thinker);
 
-	thwomp->thinker.function.acp1 = (actionf_p1)T_ThwompSector;
+	thwomp->thinker.function = (actionf_p1)T_ThwompSector;
 
 	// set up the fields according to the type of elevator action
 	thwomp->sector = sec;
@@ -5417,7 +5121,7 @@ static inline void P_AddNoEnemiesThinker(sector_t *sec, line_t *sourceline)
 	nobaddies = Z_Calloc(sizeof (*nobaddies), PU_LEVSPEC, NULL);
 	P_AddThinker(&nobaddies->thinker);
 
-	nobaddies->thinker.function.acp1 = (actionf_p1)T_NoEnemiesSector;
+	nobaddies->thinker.function = (actionf_p1)T_NoEnemiesSector;
 
 	nobaddies->sector = sec;
 	nobaddies->sourceline = sourceline;
@@ -5439,7 +5143,7 @@ static inline void P_AddEachTimeThinker(sector_t *sec, line_t *sourceline)
 	eachtime = Z_Calloc(sizeof (*eachtime), PU_LEVSPEC, NULL);
 	P_AddThinker(&eachtime->thinker);
 
-	eachtime->thinker.function.acp1 = (actionf_p1)T_EachTimeThinker;
+	eachtime->thinker.function = (actionf_p1)T_EachTimeThinker;
 
 	eachtime->sector = sec;
 	eachtime->sourceline = sourceline;
@@ -5461,7 +5165,7 @@ static inline void P_AddCameraScanner(sector_t *sourcesec, sector_t *actionsecto
 	elevator = Z_Calloc(sizeof (*elevator), PU_LEVSPEC, NULL);
 	P_AddThinker(&elevator->thinker);
 
-	elevator->thinker.function.acp1 = (actionf_p1)T_CameraScanner;
+	elevator->thinker.function = (actionf_p1)T_CameraScanner;
 	elevator->type = elevateBounce;
 
 	// set up the fields according to the type of elevator action
@@ -5497,11 +5201,10 @@ void T_LaserFlash(laserthink_t *flash)
 
 	sourcesec = ffloor->master->frontsector; // Less to type!
 
-	top = (*ffloor->t_slope) ? P_GetZAt(*ffloor->t_slope, sector->soundorg.x, sector->soundorg.y)
-			: *ffloor->topheight;
-	bottom = (*ffloor->b_slope) ? P_GetZAt(*ffloor->b_slope, sector->soundorg.x, sector->soundorg.y)
-			: *ffloor->bottomheight;
+	top    = P_GetFFloorTopZAt   (ffloor, sector->soundorg.x, sector->soundorg.y);
+	bottom = P_GetFFloorBottomZAt(ffloor, sector->soundorg.x, sector->soundorg.y);
 	sector->soundorg.z = (top + bottom)/2;
+
 	S_StartSound(&sector->soundorg, sfx_laser);
 
 	// Seek out objects to DESTROY! MUAHAHHAHAHAA!!!*cough*
@@ -5551,7 +5254,7 @@ static inline void EV_AddLaserThinker(sector_t *sec, sector_t *sec2, line_t *lin
 
 	P_AddThinker(&flash->thinker);
 
-	flash->thinker.function.acp1 = (actionf_p1)T_LaserFlash;
+	flash->thinker.function = (actionf_p1)T_LaserFlash;
 	flash->ffloor = ffloor;
 	flash->sector = sec; // For finding mobjs
 	flash->sec = sec2;
@@ -5584,7 +5287,7 @@ static void P_RunLevelLoadExecutors(void)
   *       as they'll just be erased by UnArchiveThinkers.
   * \sa P_SpawnPrecipitation, P_SpawnFriction, P_SpawnPushers, P_SpawnScrollers
   */
-void P_SpawnSpecials(INT32 fromnetsave)
+void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
 {
 	sector_t *sector;
 	size_t i;
@@ -5638,12 +5341,6 @@ void P_SpawnSpecials(INT32 fromnetsave)
 				break;
 		}
 
-		// Process Section 3
-/*		switch(GETSECSPECIAL(player->specialsector, 3))
-		{
-
-		}*/
-
 		// Process Section 4
 		switch(GETSECSPECIAL(sector->special, 4))
 		{
@@ -5654,18 +5351,8 @@ void P_SpawnSpecials(INT32 fromnetsave)
 		}
 	}
 
-	if (mapheaderinfo[gamemap-1]->weather == 2) // snow
-		curWeather = PRECIP_SNOW;
-	else if (mapheaderinfo[gamemap-1]->weather == 3) // rain
-		curWeather = PRECIP_RAIN;
-	else if (mapheaderinfo[gamemap-1]->weather == 1) // storm
-		curWeather = PRECIP_STORM;
-	else if (mapheaderinfo[gamemap-1]->weather == 5) // storm w/o rain
-		curWeather = PRECIP_STORM_NORAIN;
-	else if (mapheaderinfo[gamemap-1]->weather == 6) // storm w/o lightning
-		curWeather = PRECIP_STORM_NOSTRIKES;
-	else
-		curWeather = PRECIP_NONE;
+	// set current weather
+	curWeather = mapheaderinfo[gamemap-1]->weather;
 
 	P_InitTagLists();   // Create xref tables for tags
 	P_SearchForDisableLinedefs(); // Disable linedefs are now allowed to disable *any* line
@@ -5681,11 +5368,11 @@ void P_SpawnSpecials(INT32 fromnetsave)
 	// Firstly, find out how many there are in each sector
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 == (actionf_p1)T_SpikeSector)
+		if (th->function == (actionf_p1)T_SpikeSector)
 			secthinkers[((levelspecthink_t *)th)->sector - sectors].count++;
-		else if (th->function.acp1 == (actionf_p1)T_Friction)
+		else if (th->function == (actionf_p1)T_Friction)
 			secthinkers[((friction_t *)th)->affectee].count++;
-		else if (th->function.acp1 == (actionf_p1)T_Pusher)
+		else if (th->function == (actionf_p1)T_Pusher)
 			secthinkers[((pusher_t *)th)->affectee].count++;
 	}
 
@@ -5703,11 +5390,11 @@ void P_SpawnSpecials(INT32 fromnetsave)
 	{
 		size_t secnum = (size_t)-1;
 
-		if (th->function.acp1 == (actionf_p1)T_SpikeSector)
+		if (th->function == (actionf_p1)T_SpikeSector)
 			secnum = ((levelspecthink_t *)th)->sector - sectors;
-		else if (th->function.acp1 == (actionf_p1)T_Friction)
+		else if (th->function == (actionf_p1)T_Friction)
 			secnum = ((friction_t *)th)->affectee;
-		else if (th->function.acp1 == (actionf_p1)T_Pusher)
+		else if (th->function == (actionf_p1)T_Pusher)
 			secnum = ((pusher_t *)th)->affectee;
 
 		if (secnum != (size_t)-1)
@@ -5729,16 +5416,6 @@ void P_SpawnSpecials(INT32 fromnetsave)
 				lines[i].special = 0;
 				continue;
 			}
-			/*else -- commented out because irrelevant to kart. keeping here because we can use these flags for something else now
-			{
-				if ((players[consoleplayer].charability == CA_THOK && (lines[i].flags & ML_NOSONIC))
-				|| (players[consoleplayer].charability == CA_FLY && (lines[i].flags & ML_NOTAILS))
-				|| (players[consoleplayer].charability == CA_GLIDEANDCLIMB && (lines[i].flags & ML_NOKNUX)))
-				{
-					lines[i].special = 0;
-					continue;
-				}
-			}*/
 		}
 
 		switch (lines[i].special)
@@ -5919,12 +5596,14 @@ void P_SpawnSpecials(INT32 fromnetsave)
 				break;
 
 			case 64: // Appearing/Disappearing FOF option
-				if (lines[i].flags & ML_BLOCKMONSTERS) { // Find FOFs by control sector tag
+				if (lines[i].flags & ML_BLOCKMONSTERS) // Find FOFs by control sector tag
+				{
 					for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
 						for (j = 0; (unsigned)j < sectors[s].linecount; j++)
 							if (sectors[s].lines[j]->special >= 100 && sectors[s].lines[j]->special < 300)
 								Add_MasterDisappearer(abs(lines[i].dx>>FRACBITS), abs(lines[i].dy>>FRACBITS), abs(sides[lines[i].sidenum[0]].sector->floorheight>>FRACBITS), (INT32)(sectors[s].lines[j]-lines), (INT32)i);
-				} else // Find FOFs by effect sector tag
+				}
+				else // Find FOFs by effect sector tag
 					for (s = -1; (s = P_FindLineFromLineTag(lines + i, s)) >= 0 ;)
 					{
 						if ((size_t)s == i)
@@ -5935,10 +5614,6 @@ void P_SpawnSpecials(INT32 fromnetsave)
 				break;
 
 			case 65: // Bridge Thinker
-				/*
-				// Disable this until it's working right!
-				for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
-					P_AddBridgeThinker(&lines[i], &sectors[s]);*/
 				break;
 
 			case 100: // FOF (solid, opaque, shadows)
@@ -6629,7 +6304,8 @@ void P_SpawnSpecials(INT32 fromnetsave)
 		}
 	}
 
-	P_RunLevelLoadExecutors();
+	if (!reloadinggamestate)
+		P_RunLevelLoadExecutors();
 }
 
 /** Adds 3Dfloors as appropriate based on a common control linedef.
@@ -6661,6 +6337,7 @@ static void P_AddFakeFloorsByLine(size_t line, ffloortype_e ffloorflags, thinker
 static void P_DoScrollMove(mobj_t *thing, fixed_t dx, fixed_t dy, INT32 exclusive)
 {
 	fixed_t fuckaj = 0; // Nov 05 14:12:08 <+MonsterIestyn> I've heard of explicitly defined variables but this is ridiculous
+
 	if (thing->player)
 	{
 		if (!(dx | dy))
@@ -6682,7 +6359,8 @@ static void P_DoScrollMove(mobj_t *thing, fixed_t dx, fixed_t dy, INT32 exclusiv
 	else if (thing->friction != ORIG_FRICTION)
 		fuckaj = thing->friction;
 
-	if (fuckaj) {
+	if (fuckaj)
+	{
 		// refactor thrust for new friction
 		dx = FixedDiv(dx, CARRYFACTOR);
 		dy = FixedDiv(dy, CARRYFACTOR);
@@ -6741,9 +6419,6 @@ void T_Scroll(scroll_t *s)
 		s->vdy = dy += s->vdy;
 	}
 
-//	if (!(dx | dy)) // no-op if both (x,y) offsets 0
-//		return;
-
 	switch (s->type)
 	{
 		side_t *side;
@@ -6943,7 +6618,7 @@ void T_Scroll(scroll_t *s)
 static void Add_Scroller(INT32 type, fixed_t dx, fixed_t dy, INT32 control, INT32 affectee, INT32 accel, INT32 exclusive)
 {
 	scroll_t *s = Z_Calloc(sizeof *s, PU_LEVSPEC, NULL);
-	s->thinker.function.acp1 = (actionf_p1)T_Scroll;
+	s->thinker.function = (actionf_p1)T_Scroll;
 	s->type = type;
 	s->dx = dx;
 	s->dy = dy;
@@ -7019,27 +6694,21 @@ static void P_SpawnScrollers(void)
 		// this linedef controls the direction and speed of the scrolling. The
 		// most complicated linedef since donuts, but powerful :)
 
-		if (special == 515 || special == 512 || special == 522 || special == 532 || special == 504) // displacement scrollers
+		switch (special)
 		{
-			special -= 2;
-			control = (INT32)(sides[*l->sidenum].sector - sectors);
-		}
-		else if (special == 514 || special == 511 || special == 521 || special == 531 || special == 503) // accelerative scrollers
-		{
-			special--;
-			accel = 1;
-			control = (INT32)(sides[*l->sidenum].sector - sectors);
-		}
-		else if (special == 535 || special == 525) // displacement scrollers
-		{
-			special -= 2;
-			control = (INT32)(sides[*l->sidenum].sector - sectors);
-		}
-		else if (special == 534 || special == 524) // accelerative scrollers
-		{
-			accel = 1;
-			special--;
-			control = (INT32)(sides[*l->sidenum].sector - sectors);
+			case 515: case 512: case 522: case 532: case 504:
+			case 535: case 525: // displacement scrollers
+
+				special -= 2;
+				control = (INT32)(sides[*l->sidenum].sector - sectors);
+				break;
+
+			case 514: case 511: case 521: case 531: case 503:
+			case 534: case 524: // accelerative scrollers
+				special--;
+				accel = 1;
+				control = (INT32)(sides[*l->sidenum].sector - sectors);
+				break;
 		}
 
 		switch (special)
@@ -7119,7 +6788,7 @@ static void Add_MasterDisappearer(tic_t appeartime, tic_t disappeartime, tic_t o
 {
 	disappear_t *d = Z_Malloc(sizeof *d, PU_LEVSPEC, NULL);
 
-	d->thinker.function.acp1 = (actionf_p1)T_Disappear;
+	d->thinker.function = (actionf_p1)T_Disappear;
 	d->appeartime = appeartime;
 	d->disappeartime = disappeartime;
 	d->offset = offset;
@@ -7164,10 +6833,7 @@ void T_Disappear(disappear_t *d)
 
 					if (!(lines[d->sourceline].flags & ML_NOCLIMB))
 					{
-						if (*rover->t_slope)
-							sectors[s].soundorg.z = P_GetZAt(*rover->t_slope, sectors[s].soundorg.x, sectors[s].soundorg.y);
-						else
-						sectors[s].soundorg.z = *rover->topheight;
+						sectors[s].soundorg.z = P_GetFFloorTopZAt(rover, sectors[s].soundorg.x, sectors[s].soundorg.y);
 						S_StartSound(&sectors[s].soundorg, sfx_appear);
 					}
 				}
@@ -7207,7 +6873,7 @@ static void Add_Friction(INT32 friction, INT32 movefactor, INT32 affectee, INT32
 {
 	friction_t *f = Z_Calloc(sizeof *f, PU_LEVSPEC, NULL);
 
-	f->thinker.function.acp1 = (actionf_p1)T_Friction;
+	f->thinker.function = (actionf_p1)T_Friction;
 	f->friction = friction;
 	f->movefactor = movefactor;
 	f->affectee = affectee;
@@ -7241,17 +6907,6 @@ void T_Friction(friction_t *f)
 	//{
 		referrer = sectors + f->referrer;
 
-	/*	if (!(GETSECSPECIAL(referrer->special, 3) == 1
-			|| GETSECSPECIAL(referrer->special, 3) == 3))
-			return;
-	}
-	else
-	{
-		if (!(GETSECSPECIAL(sec->special, 3) == 1
-			|| GETSECSPECIAL(sec->special, 3) == 3))
-			return;
-	}*/
-
 	// Assign the friction value to players on the floor, non-floating,
 	// and clipped. Normally the object's friction value is kept at
 	// ORIG_FRICTION and this thinker changes it for icy or muddy floors.
@@ -7373,7 +7028,7 @@ static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t *
 {
 	pusher_t *p = Z_Calloc(sizeof *p, PU_LEVSPEC, NULL);
 
-	p->thinker.function.acp1 = (actionf_p1)T_Pusher;
+	p->thinker.function = (actionf_p1)T_Pusher;
 	p->source = source;
 	p->type = type;
 	p->x_mag = x_mag>>FRACBITS;
@@ -7433,7 +7088,7 @@ static inline boolean PIT_PushThing(mobj_t *thing)
 		return false;
 
 	// Allow this to affect pushable objects at some point?
-	if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || thing->player->pflags & PF_NIGHTSMODE))
+	if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || UNLIKELY(thing->player->pflags & PF_NIGHTSMODE)))
 	{
 		INT32 dist;
 		INT32 speed;
@@ -7464,7 +7119,7 @@ static inline boolean PIT_PushThing(mobj_t *thing)
 		// Written with bits and pieces of P_HomingAttack
 		if ((speed > 0) && (P_CheckSight(thing, tmpusher->source)))
 		{
-			if (!(thing->player->pflags & PF_NIGHTSMODE))
+			if (LIKELY(!(thing->player->pflags & PF_NIGHTSMODE)))
 			{
 				// only push wrt Z if health & 1 (mapthing has ambush flag)
 				if (tmpusher->source->health & 1)
@@ -7591,14 +7246,11 @@ void T_Pusher(pusher_t *p)
 	{
 		referrer = &sectors[p->referrer];
 
-		//if (!(GETSECSPECIAL(referrer->special, 3) == 2
-		//	|| GETSECSPECIAL(referrer->special, 3) == 3))
 		if (GETSECSPECIAL(referrer->special, 3) != 2)
 			return;
 	}
-	//else if (!(GETSECSPECIAL(sec->special, 3) == 2
-	//		|| GETSECSPECIAL(sec->special, 3) == 3))
 	else if (GETSECSPECIAL(sec->special, 3) != 2)
+
 	// For constant pushers (wind/current) there are 3 situations:
 	//
 	// 1) Affected Thing is above the floor.
@@ -7808,42 +7460,19 @@ void T_Pusher(pusher_t *p)
 
 				if (!demo.playback || P_AnalogMove(thing->player))
 				{
-					if (thing->player == &players[consoleplayer])
+					for (UINT8 i = 0; i <= splitscreen; ++i)
 					{
-						if (thing->angle - localangle[0] > ANGLE_180)
-							localangle[0] -= (localangle[0] - thing->angle) / 8;
-						else
-							localangle[0] += (thing->angle - localangle[0]) / 8;
+						INT32 id = (i == 0 ? consoleplayer : displayplayers[i]);
+						if (thing->player == &players[id])
+						{
+							if (thing->angle - localangle[i] > ANGLE_180)
+								localangle[i] -= (localangle[i] - thing->angle) / 8;
+							else
+								localangle[i] += (thing->angle - localangle[i]) / 8;
+
+							break;
+						}
 					}
-					else if (thing->player == &players[displayplayers[1]])
-					{
-						if (thing->angle - localangle[1] > ANGLE_180)
-							localangle[1] -= (localangle[1] - thing->angle) / 8;
-						else
-							localangle[1] += (thing->angle - localangle[1]) / 8;
-					}
-					else if (thing->player == &players[displayplayers[2]])
-					{
-						if (thing->angle - localangle[2] > ANGLE_180)
-							localangle[2] -= (localangle[2] - thing->angle) / 8;
-						else
-							localangle[2] += (thing->angle - localangle[2]) / 8;
-					}
-					else if (thing->player == &players[displayplayers[3]])
-					{
-						if (thing->angle - localangle[3] > ANGLE_180)
-							localangle[3] -= (localangle[3] - thing->angle) / 8;
-						else
-							localangle[3] += (thing->angle - localangle[3]) / 8;
-					}
-					/*if (thing->player == &players[consoleplayer])
-						localangle[0] = thing->angle;
-					else if (thing->player == &players[displayplayers[1]])
-						localangle[1] = thing->angle;
-					else if (thing->player == &players[displayplayers[2]])
-						localangle[2] = thing->angle;
-					else if (thing->player == &players[displayplayers[3]])
-						localangle[3] = thing->angle;*/
 				}
 			}
 
@@ -7933,6 +7562,23 @@ static void P_SpawnPushers(void)
 		}
 }
 
+void P_StartQuake(tic_t time, fixed_t intensity, fixed_t radius)
+{
+	if (time <= 0 || intensity <= 0)
+	{
+		// Invalid parameters
+		return;
+	}
+
+	quake.time = time;
+	quake.intensity = FixedMul(intensity, mapobjectscale);
+
+	if (radius > 0)
+	{
+		quake.radius = FixedMul(radius, mapobjectscale);
+	}
+}
+
 static void P_SearchForDisableLinedefs(void)
 {
 	size_t i;
@@ -7955,13 +7601,6 @@ static void P_SearchForDisableLinedefs(void)
 			}
 			else if ((lines[i].flags & ML_NETONLY) == ML_NETONLY)
 				continue; // Net-only never triggers in single player
-			// commented out because irrelevant to kart. keeping here because we can use these flags for something else now
-			/*else if (players[consoleplayer].charability == CA_THOK && (lines[i].flags & ML_NOSONIC))
-				continue;
-			else if (players[consoleplayer].charability == CA_FLY && (lines[i].flags & ML_NOTAILS))
-				continue;
-			else if (players[consoleplayer].charability == CA_GLIDEANDCLIMB && (lines[i].flags & ML_NOKNUX))
-				continue;*/
 
 			// Disable any linedef specials with our tag.
 			for (j = -1; (j = P_FindLineFromLineTag(&lines[i], j)) >= 0;)
diff --git a/src/p_spec.h b/src/p_spec.h
index 1231aeda8..60b10a8f4 100644
--- a/src/p_spec.h
+++ b/src/p_spec.h
@@ -25,6 +25,22 @@ extern mobj_t *skyboxmo[2];
 //
 #define GETSECSPECIAL(i,j) ((i >> ((j-1)*4))&15)
 
+/** Animated texture descriptor
+ * This keeps track of an animated texture or an animated flat.
+ * \sa P_UpdateSpecials, P_InitPicAnims, animdef_t
+ */
+typedef struct
+{
+	SINT8 istexture; ///< ::true for a texture, ::false for a flat
+	INT32 picnum;    ///< The end flat number
+	INT32 basepic;   ///< The start flat number
+	INT32 numpics;   ///< Number of frames in the animation
+	tic_t speed;     ///< Number of tics for which each frame is shown
+} anim_t;
+
+extern anim_t *lastanim;
+extern anim_t *anims;
+
 // at game start
 void P_InitPicAnims(void);
 
@@ -32,7 +48,7 @@ void P_InitPicAnims(void);
 void P_SetupLevelFlatAnims(void);
 
 // at map load
-void P_SpawnSpecials(INT32 fromnetsave);
+void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate);
 
 // every tic
 void P_UpdateSpecials(void);
@@ -58,6 +74,7 @@ INT32 P_FindMinSurroundingLight(sector_t *sector, INT32 max);
 void P_SetupSignExit(player_t *player);
 boolean P_IsFlagAtBase(mobjtype_t flag);
 
+void P_PurgePrecipitation(void);
 void P_SwitchWeather(INT32 weathernum);
 
 boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller);
@@ -454,4 +471,6 @@ void P_CalcHeight(player_t *player);
 
 sector_t *P_ThingOnSpecial3DFloor(mobj_t *mo);
 
+void P_StartQuake(tic_t time, fixed_t intensity, fixed_t radius);
+
 #endif
diff --git a/src/p_telept.c b/src/p_telept.c
index a7cef7b1d..ceed7dc93 100644
--- a/src/p_telept.c
+++ b/src/p_telept.c
@@ -166,6 +166,7 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle
 				P_ResetCamera(thing->player, &camera[i]);
 
 			R_ResetViewInterpolation(i + 1);
+			break;
 		}
 
 		// don't run in place after a teleport
diff --git a/src/p_tick.c b/src/p_tick.c
index 6bf32f1c3..dbfad14f9 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -11,6 +11,10 @@
 /// \file  p_tick.c
 /// \brief Archiving: SaveGame I/O, Thinker, Ticker
 
+#ifdef PARANOIA
+#include "dehacked.h" // MOBJTYPE_LIST
+#endif
+
 #include "doomstat.h"
 #include "g_game.h"
 #include "g_input.h"
@@ -25,6 +29,7 @@
 #include "lua_hook.h"
 #include "k_director.h"
 #include "k_kart.h"
+#include "k_stats.h"
 #include "i_system.h"
 #include "r_main.h"
 #include "r_fps.h"
@@ -49,6 +54,7 @@ tic_t leveltime;
 
 // Both the head and tail of the thinker list.
 thinker_t thinkercap;
+thinker_t precipcap;
 
 void Command_Numthinkers_f(void)
 {
@@ -56,6 +62,7 @@ void Command_Numthinkers_f(void)
 	INT32 count = 0;
 	actionf_p1 action;
 	thinker_t *think;
+	thinker_t *listtype;
 
 	if (gamestate != GS_LEVEL)
 	{
@@ -68,8 +75,6 @@ void Command_Numthinkers_f(void)
 		CONS_Printf(M_GetText("numthinkers <#>: Count number of thinkers\n"));
 		CONS_Printf(
 			"\t1: P_MobjThinker\n"
-			/*"\t2: P_RainThinker\n"
-			"\t3: P_SnowThinker\n"*/
 			"\t2: P_NullPrecipThinker\n"
 			"\t3: T_Friction\n"
 			"\t4: T_Pusher\n"
@@ -85,14 +90,6 @@ void Command_Numthinkers_f(void)
 			action = (actionf_p1)P_MobjThinker;
 			CONS_Printf(M_GetText("Number of %s: "), "P_MobjThinker");
 			break;
-		/*case 2:
-			action = (actionf_p1)P_RainThinker;
-			CONS_Printf(M_GetText("Number of %s: "), "P_RainThinker");
-			break;
-		case 3:
-			action = (actionf_p1)P_SnowThinker;
-			CONS_Printf(M_GetText("Number of %s: "), "P_SnowThinker");
-			break;*/
 		case 2:
 			action = (actionf_p1)P_NullPrecipThinker;
 			CONS_Printf(M_GetText("Number of %s: "), "P_NullPrecipThinker");
@@ -114,9 +111,11 @@ void Command_Numthinkers_f(void)
 			return;
 	}
 
-	for (think = thinkercap.next; think != &thinkercap; think = think->next)
+	listtype = (num == 2) ? &precipcap : &thinkercap;
+
+	for (think = listtype->next; think != listtype; think = think->next)
 	{
-		if (think->function.acp1 != action)
+		if (think->function != action)
 			continue;
 
 		count++;
@@ -153,9 +152,7 @@ void Command_CountMobjs_f(void)
 
 			for (th = thinkercap.next; th != &thinkercap; th = th->next)
 			{
-				if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-					continue;
-				if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+				if (th->function != (actionf_p1)P_MobjThinker)
 					continue;
 
 				if (((mobj_t *)th)->type == i)
@@ -175,9 +172,7 @@ void Command_CountMobjs_f(void)
 
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			if (((mobj_t *)th)->type == i)
@@ -195,6 +190,7 @@ void Command_CountMobjs_f(void)
 void P_InitThinkers(void)
 {
 	thinkercap.prev = thinkercap.next = &thinkercap;
+	precipcap.prev  = precipcap.next  = &precipcap;
 	waypointcap = NULL;
 }
 
@@ -210,8 +206,69 @@ void P_AddThinker(thinker_t *thinker)
 	thinkercap.prev = thinker;
 
 	thinker->references = 0;    // killough 11/98: init reference counter to 0
+
+	thinker->cachable = (thinker->function == (actionf_p1)P_MobjThinker);
+#ifdef PARANOIA
+	thinker->debug_mobjtype = MT_NULL;
+#endif
 }
 
+//
+// P_AddPrecipThinker
+// Adds a new precip thinker at the end of the list.
+//
+void P_AddPrecipThinker(thinker_t *thinker)
+{
+	precipcap.prev->next = thinker;
+	thinker->next = &precipcap;
+	thinker->prev = precipcap.prev;
+	precipcap.prev = thinker;
+
+	thinker->references = 0;    // killough 11/98: init reference counter to 0
+
+	thinker->cachable = false;
+#ifdef PARANOIA
+	thinker->debug_mobjtype = MT_NULL;
+#endif
+}
+
+#ifdef PARANOIA
+static const char *MobjTypeName(const mobj_t *mobj)
+{
+	actionf_p1 p1 = mobj->thinker.function;
+
+	if (p1 == (actionf_p1)P_MobjThinker)
+	{
+		return MOBJTYPE_LIST[mobj->type];
+	}
+	else if (p1 == (actionf_p1)P_RemoveThinkerDelayed)
+	{
+		if (mobj->thinker.debug_mobjtype != MT_NULL)
+		{
+			return MOBJTYPE_LIST[mobj->thinker.debug_mobjtype];
+		}
+	}
+
+	return "<Not a mobj>";
+}
+
+static const char *MobjThinkerName(const mobj_t *mobj)
+{
+	actionf_p1 p1 = mobj->thinker.function;
+
+	if (p1 == (actionf_p1)P_MobjThinker)
+	{
+		return "P_MobjThinker";
+	}
+	else if (p1 == (actionf_p1)P_RemoveThinkerDelayed)
+	{
+		return "P_RemoveThinkerDelayed";
+	}
+
+	return "<Unknown Thinker>";
+}
+#endif
+
 //
 // killough 11/98:
 //
@@ -232,25 +289,71 @@ static thinker_t *currentthinker;
 //
 void P_RemoveThinkerDelayed(thinker_t *thinker)
 {
-	thinker_t *next;
+	if (thinker->references != 0)
+	{
 #ifdef PARANOIA
-	if (thinker->next)
-		thinker->next = NULL;
-	else if (thinker->references) // Usually gets cleared up in one frame; what's going on here, then?
-		CONS_Printf("Number of potentially faulty references: %d\n", thinker->references);
+		// Removed mobjs can be the target of another mobj. In
+		// that case, the other mobj will manage its reference
+		// to the removed mobj in P_MobjThinker. However, if
+		// the removed mobj is removed after the other object
+		// thinks, the reference management is delayed by one
+		// tic (or two?)
+		const UINT8 delay = 2;
+
+		if (thinker->debug_time > leveltime)
+		{
+			thinker->debug_time = leveltime + delay + 1; // do not print errors again
+		}
+		else if ((thinker->debug_time + delay) <= leveltime)
+		{
+			CONS_Printf(
+					"PARANOIA/P_RemoveThinkerDelayed: %p %s references=%d\n",
+					(void*)thinker,
+					MobjTypeName((mobj_t*)thinker),
+					thinker->references
+			);
+
+			thinker->debug_time = leveltime + delay + 1; // do not print this error again
+		}
 #endif
-	if (thinker->references)
 		return;
+	}
+
+	R_DestroyLevelInterpolators(thinker);
 
-	/* Remove from main thinker list */
-	next = thinker->next;
 	/* Note that currentthinker is guaranteed to point to us,
 	* and since we're freeing our memory, we had better change that. So
 	* point it to thinker->prev, so the iterator will correctly move on to
 	* thinker->prev->next = thinker->next */
-	(next->prev = currentthinker = thinker->prev)->next = next;
-	R_DestroyLevelInterpolators(thinker);
-	Z_Free(thinker);
+	currentthinker = thinker->prev;
+
+	/* Remove from main thinker list */
+	P_UnlinkThinker(thinker);
+}
+
+//
+// P_UnlinkThinker()
+//
+// Actually removes thinker from the list and frees its memory.
+//
+void P_UnlinkThinker(thinker_t *thinker)
+{
+	thinker_t *next = thinker->next;
+
+	I_Assert(thinker->references == 0);
+
+	(next->prev = thinker->prev)->next = next;
+
+	if (thinker->cachable == true)
+	{
+		// put cachable thinkers in the mobj cache, so we can avoid allocations
+		((mobj_t *)thinker)->hnext = mobjcache;
+		mobjcache = (mobj_t *)thinker;
+	}
+	else
+	{
+		Z_Free(thinker);
+	}
 }
 
 //
@@ -268,7 +371,7 @@ void P_RemoveThinkerDelayed(thinker_t *thinker)
 void P_RemoveThinker(thinker_t *thinker)
 {
 	LUA_InvalidateUserdata(thinker);
-	thinker->function.acp1 = (actionf_p1)P_RemoveThinkerDelayed;
+	thinker->function = (actionf_p1)P_RemoveThinkerDelayed;
 }
 
 /*
@@ -283,12 +386,45 @@ void P_RemoveThinker(thinker_t *thinker)
  * references, and delay removal until the count is 0.
  */
 
-mobj_t *P_SetTarget(mobj_t **mop, mobj_t *targ)
+mobj_t *P_SetTarget2(mobj_t **mop, mobj_t *targ
+#ifdef PARANOIA
+		, const char *source_file, int source_line
+#endif
+)
 {
-	if (*mop)              // If there was a target already, decrease its refcount
+	if (*mop) // If there was a target already, decrease its refcount
+	{
 		(*mop)->thinker.references--;
-	if ((*mop = targ) != NULL) // Set new target and if non-NULL, increase its counter
+
+#ifdef PARANOIA
+		if ((*mop)->thinker.references < 0)
+		{
+			CONS_Printf(
+					"PARANOIA/P_SetTarget: %p %s %s references=%d, references go negative! (%s:%d)\n",
+					(void*)*mop,
+					MobjTypeName(*mop),
+					MobjThinkerName(*mop),
+					(*mop)->thinker.references,
+					source_file,
+					source_line
+			);
+		}
+
+		(*mop)->thinker.debug_time = leveltime;
+#endif
+	}
+
+	if (targ != NULL) // Set new target and if non-NULL, increase its counter
+	{
 		targ->thinker.references++;
+
+#ifdef PARANOIA
+		targ->thinker.debug_time = leveltime;
+#endif
+	}
+
+	*mop = targ;
+
 	return targ;
 }
 
@@ -319,12 +455,13 @@ static inline void P_RunThinkers(void)
 	for (currentthinker = thinkercap.next; currentthinker != &thinkercap; currentthinker = currentthinker->next)
 	{
 #ifdef PARANOIA
-		I_Assert(currentthinker->function.acp1 != NULL)
+		I_Assert(currentthinker->function != NULL);
 #endif
-			currentthinker->function.acp1(currentthinker);
+		currentthinker->function(currentthinker);
 	}
 }
 
+<<<<<<< HEAD
 void P_RunChaseCameras(void)
 {
 	UINT8 i;
@@ -341,6 +478,188 @@ void P_RunChaseCameras(void)
 			if (camera[i].chase)
 				P_MoveChaseCamera(&players[displayplayers[i]], &camera[i], false);
 		}
+=======
+// Controller rumble!
+// this keeps track of a bunch of things
+// and makes your controller rumble accordingly
+static void P_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;
+		}
+
+		UINT16 low = 0, high = 0;
+		UINT16 lenght = 57; // in ms
+
+		const player_t *player = ((i == 0) ? &players[consoleplayer] : &players[displayplayers[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((FRACUNIT / 4), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout
+		}
+		else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2)))
+		{
+			low = high = FRACUNIT / 8;
+		}
+		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 = FRACUNIT / 128;
+			}
+			else if (player->kartstuff[k_invincibilitytimer])
+			{
+				high = FRACUNIT / 64;
+			}
+			else
+			{
+				low = high = FRACUNIT / 64;
+			}
+		}
+		else if ((player->kartstuff[k_bananadrag] > TICRATE)
+			&& player->speed != 0
+			&& P_IsObjectOnGround(player->mo))
+		{
+			if (leveltime & 1) // this is actually funny lel
+				high = FRACUNIT / 64;
+		}
+
+		if (player->kartstuff[k_brakedrift])
+		{
+			high = CLAMP((high + FRACUNIT / 256), 0, UINT16_MAX);
+		}
+
+		// 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);
+	}
+}
+
+void P_RunChaseCameras(void)
+{
+	UINT8 i;
+
+	for (i = 0; i <= splitscreen; i++)
+	{
+		if (camera[i].chase)
+		{
+			player_t *p = &players[displayplayers[i]];
+			camera_t *cam = &camera[i];
+
+			if (cv_verticallook[i].value &&
+				leveltime > starttime
+				&& p->mo
+				&& p->kartstuff[k_respawn] == 0
+				&& p->kartstuff[k_throwdir] != 0)
+			{
+				if (p->speed < 6 * p->mo->scale && abs(cam->dpad_y_held) < 2*TICRATE)
+					cam->dpad_y_held += p->kartstuff[k_throwdir];
+			}
+			else
+				cam->dpad_y_held = 0;
+
+			P_MoveChaseCamera(p, cam, false);
+		}
+	}
+}
+
+static void P_RunQuakes(void)
+{
+	fixed_t ir;
+
+	if (!cv_screenquake.value || quake.time <= 0)
+	{
+		quake.x = quake.y = quake.z = quake.roll = 0;
+		return;
+	}
+
+	ir = quake.intensity>>1;
+
+	/// \todo Calculate distance from epicenter if set and modulate the intensity accordingly based on radius.
+	quake.x = M_RandomRange(-ir,ir);
+	quake.y = M_RandomRange(-ir,ir);
+	quake.z = M_RandomRange(-ir,ir);
+
+	ir >>= 2;
+	ir = M_RandomRange(-ir,ir);
+
+	if (ir < 0)
+		ir = ANGLE_MAX - FixedAngle(-ir);
+	else
+		ir = FixedAngle(ir);
+
+	quake.roll = ir;
+
+	--quake.time;
+}
+
+// Reset our Sprite scales and offsets
+// at the start of our tic
+// this is just to make things simpler
+// as we dont have to reset it ourselves after use
+// done at the start so lua can still overwrite everything
+static inline void P_ResetSpriteStuff(void)
+{
+	thinker_t *th;
+
+	if (rendermode == render_none)
+		return;
+
+	for (th = thinkercap.next; th != &thinkercap; th = th->next)
+	{
+		mobj_t *mo;
+
+		if (th->function != (actionf_p1)P_MobjThinker) // not a mobj
+			continue;
+
+		mo = (mobj_t *)th;
+
+		if (!mo || (mo->sprite == SPR_NULL) || (mo->flags2 & MF2_DONTDRAW) || (mo->type == MT_SHADOW))
+			continue;
+
+		mo->spritexscale  = mo->realxscale;
+		mo->spriteyscale  = mo->realyscale;
+		mo->spritexoffset = mo->realxoffset;
+		mo->spriteyoffset = mo->realyoffset;
+>>>>>>> Saturn-Next
 	}
 }
 
@@ -351,10 +670,21 @@ void P_Ticker(boolean run)
 {
 	INT32 i;
 
-	//Increment jointime even if paused.
+	// Increment jointime even if paused
 	for (i = 0; i < MAXPLAYERS; i++)
+	{
 		if (playeringame[i])
-			++players[i].jointime;
+		{
+			players[i].jointime++;
+		}
+	}
+
+	if (run)
+	{
+		// Update old view state BEFORE ticking so resetting
+		// the old interpolation state from game logic works.
+		R_UpdateViewInterpolation();
+	}
 
 	if (objectplacing)
 	{
@@ -362,6 +692,7 @@ void P_Ticker(boolean run)
 		{
 			P_MapStart();
 			R_UpdateMobjInterpolators();
+			R_UpdateLevelInterpolators();
 			OP_ObjectplaceMovement(&players[0]);
 			P_MoveChaseCamera(&players[0], &camera[0], false);
 			R_UpdateViewInterpolation();
@@ -376,17 +707,16 @@ void P_Ticker(boolean run)
 		if (demo.rewinding && leveltime > 0)
 		{
 			leveltime = (leveltime-1) & ~3;
+			if (timeinmap > 0)
+				timeinmap = (timeinmap-1) & ~3;
 			G_PreviewRewind(leveltime);
 		}
-		else if (demo.freecam && democam.cam)	// special case: allow freecam to MOVE during pause!
-			P_DemoCameraMovement(democam.cam);
+		else
+			P_RunChaseCameras();	// special case: allow freecam to MOVE during pause!
 
 		return;
 	}
 
-	for (i = 0; i <= splitscreen; i++)
-		postimgtype[i] = postimg_none;
-
 	P_MapStart();
 
 	if (run)
@@ -430,24 +760,29 @@ void P_Ticker(boolean run)
 			}
 #endif
 		}
-		
+
 		ps_lua_mobjhooks.value.i = 0;
 		ps_checkposition_calls.value.i = 0;
 
+		P_ResetSpriteStuff();
+
 		PS_START_TIMING(ps_lua_prethinkframe_time);
-		LUAh_PreThinkFrame();
+		LUA_HookPreThinkFrame();
 		PS_STOP_TIMING(ps_lua_prethinkframe_time);
 
 		PS_START_TIMING(ps_playerthink_time);
 		for (i = 0; i < MAXPLAYERS; i++)
-			if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
-				P_PlayerThink(&players[i]);
+		{
+			if (!playeringame[i] || P_MobjWasRemoved(players[i].mo))
+				continue;
+
+			P_PlayerThink(&players[i]);
+		}
 		PS_STOP_TIMING(ps_playerthink_time);
 	}
 
 	// Keep track of how long they've been playing!
-	if (!demo.playback) // Don't increment if a demo is playing.
-		totalplaytime++;
+	K_StatTicker();
 
 	if (run)
 	{
@@ -461,18 +796,25 @@ void P_Ticker(boolean run)
 
 		// Run any "after all the other thinkers" stuff
 		for (i = 0; i < MAXPLAYERS; i++)
-			if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
-				P_PlayerAfterThink(&players[i]);
+		{
+			if (!playeringame[i] || P_MobjWasRemoved(players[i].mo))
+				continue;
+
+			P_PlayerAfterThink(&players[i]);
+		}
+
+		// Apply rumble to local players
+		if (!demo.playback)
+		{
+			P_DeviceRumbleTick();
+		}
 
 		PS_START_TIMING(ps_lua_thinkframe_time);
-		LUAh_ThinkFrame();
+		LUA_HookThinkFrame();
 		PS_STOP_TIMING(ps_lua_thinkframe_time);
 	}
 
-	// Run shield positioning
-	//P_RunShields();
 	P_RunOverlays();
-
 	P_RunShadows();
 
 	P_UpdateSpecials();
@@ -502,7 +844,7 @@ void P_Ticker(boolean run)
 				if (!players[i].mo)
 					continue;
 
-				P_DamageMobj(players[i].mo, NULL, NULL, 10000);
+				P_DamageMobj(players[i].mo, NULL, NULL, DMG_INSTAKILL);
 			}
 		}
 
@@ -528,24 +870,7 @@ void P_Ticker(boolean run)
 				K_CalculateBattleWanted();
 		}
 
-		if (quake.time)
-		{
-			fixed_t ir = quake.intensity>>1;
-			/// \todo Calculate distance from epicenter if set and modulate the intensity accordingly based on radius.
-			quake.x = M_RandomRange(-ir,ir);
-			quake.y = M_RandomRange(-ir,ir);
-			quake.z = M_RandomRange(-ir,ir);
-			ir >>= 2;
-			ir = M_RandomRange(-ir,ir);
-			if (ir < 0)
-				ir = ANGLE_MAX - FixedAngle(-ir);
-			else
-				ir = FixedAngle(ir);
-			quake.roll = ir;
-			--quake.time;
-		}
-		else
-			quake.x = quake.y = quake.z = quake.roll = 0;
+		P_RunQuakes();
 
 		if (metalplayback)
 			G_ReadMetalTic(metalplayback);
@@ -554,18 +879,21 @@ void P_Ticker(boolean run)
 
 		if (demo.recording)
 		{
-			INT32 axis = JoyAxis(AXISLOOKBACK, 1);
-
 			G_WriteAllGhostTics();
 
-			if (cv_recordmultiplayerdemos.value && (demo.savemode == DSM_NOTSAVING || demo.savemode == DSM_WILLAUTOSAVE))
-				if (demo.savebutton && demo.savebutton + 3*TICRATE < leveltime && (InputDown(gc_lookback, 1) || (cv_usejoystick.value && axis > 0)))
-					demo.savemode = DSM_TITLEENTRY;
+			if (cv_recordmultiplayerdemos.value)
+			{
+				const INT32 axis = JoyAxis(AXISLOOKBACK, 1);
 
-			//if there are no players left at all, stop demo recording
-			//Demos that that dont have any players crash during playback, which can happen with dedicated servers
-			if (cv_recordmultiplayerdemos.value && demo.savemode == DSM_WILLAUTOSAVE && !D_NumPlayers())
-				G_SaveDemo();
+				if (demo.savemode == DSM_NOTSAVING || demo.savemode == DSM_WILLAUTOSAVE)
+					if (demo.savebutton && demo.savebutton + 3*TICRATE < leveltime && (InputDown(gc_lookback, 1) || (cv_usejoystick[0].value && axis > 0)))
+						demo.savemode = DSM_TITLEENTRY;
+
+				// if there are no players left at all, stop demo recording
+				// Demos that that dont have any players crash during playback, which can happen with dedicated servers
+				if (demo.savemode == DSM_WILLAUTOSAVE && !D_NumPlayers())
+					G_SaveDemo();
+			}
 		}
 		else if (demo.playback) // Use Ghost data for consistency checks.
 		{
@@ -586,7 +914,7 @@ void P_Ticker(boolean run)
 				D_MapChange(gamemap, gametype, encoremode, true, 0, false, false);
 
 		PS_START_TIMING(ps_lua_postthinkframe_time);
-		LUAh_PostThinkFrame();
+		LUA_HookPostThinkFrame();
 		PS_STOP_TIMING(ps_lua_postthinkframe_time);
 	}
 
@@ -598,7 +926,6 @@ void P_Ticker(boolean run)
 	if (run)
 	{
 		R_UpdateLevelInterpolators();
-		R_UpdateViewInterpolation();
 
 		// Hack: ensure newview is assigned every tic.
 		// Ensures view interpolation is T-1 to T in poor network conditions
@@ -608,14 +935,18 @@ void P_Ticker(boolean run)
 			for (i = 0; i <= splitscreen; i++)
 			{
 				player_t *player = &players[displayplayers[i]];
-				boolean isSkyVisibleForPlayer = skyVisiblePerPlayer[i];
+
 				if (!player->mo)
 					continue;
-				if (isSkyVisibleForPlayer && skyboxmo[0] && cv_skybox.value)
+
+				const boolean skybox = (skyboxmo[0] && cv_skybox.value);
+
+				if (skyVisiblePerPlayer[i] && skybox)
 				{
-					R_SkyboxFrame(player);
+					R_SkyboxFrame(i);
 				}
-				R_SetupFrame(player, (skyboxmo[0] && cv_skybox.value));
+
+				R_SetupFrame(i, skybox);
 			}
 		}
 	}
@@ -624,8 +955,6 @@ void P_Ticker(boolean run)
 
 	if (demo.playback)
 		G_StoreRewindInfo();
-
-//	Z_CheckMemCleanup();
 }
 
 // Abbreviated ticker for pre-loading, calls thinkers and assorted things
@@ -634,9 +963,6 @@ void P_PreTicker(INT32 frames)
 	INT32 i;
 	ticcmd_t temptic;
 
-	for (i = 0; i <= splitscreen; i++)
-		postimgtype[i] = postimg_none;
-
 	hook_defrosting = frames;
 
 	while (hook_defrosting)
@@ -645,9 +971,10 @@ void P_PreTicker(INT32 frames)
 
 		R_UpdateMobjInterpolators();
 
-		LUAh_PreThinkFrame();
+		LUA_HOOK(PreThinkFrame);
 
 		for (i = 0; i < MAXPLAYERS; i++)
+		{
 			if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
 			{
 				// stupid fucking cmd hack
@@ -662,6 +989,7 @@ void P_PreTicker(INT32 frames)
 
 				memcpy(&players[i].cmd, &temptic, sizeof(ticcmd_t));
 			}
+		}
 
 		// Dynamic slopeness
 		if (midgamejoin)
@@ -671,10 +999,14 @@ void P_PreTicker(INT32 frames)
 
 		// Run any "after all the other thinkers" stuff
 		for (i = 0; i < MAXPLAYERS; i++)
-			if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
-				P_PlayerAfterThink(&players[i]);
+		{
+			if (!playeringame[i] || P_MobjWasRemoved(players[i].mo))
+				continue;
 
-		LUAh_ThinkFrame();
+			P_PlayerAfterThink(&players[i]);
+		}
+
+		LUA_HookThinkFrame();
 
 		P_RunOverlays();
 		P_RunShadows();
@@ -682,7 +1014,7 @@ void P_PreTicker(INT32 frames)
 		P_UpdateSpecials();
 		P_RespawnSpecials();
 
-		LUAh_PostThinkFrame();
+		LUA_HOOK(PostThinkFrame);
 
 		R_UpdateLevelInterpolators();
 		R_UpdateViewInterpolation();
diff --git a/src/p_tick.h b/src/p_tick.h
index 11b5889ed..a903be0fd 100644
--- a/src/p_tick.h
+++ b/src/p_tick.h
@@ -14,6 +14,8 @@
 #ifndef __P_TICK__
 #define __P_TICK__
 
+#include "doomdef.h"
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -29,6 +31,16 @@ void P_Ticker(boolean run);
 void P_PreTicker(INT32 frames);
 void P_DoTeamscrambling(void);
 void P_RemoveThinkerDelayed(thinker_t *thinker);
-mobj_t *P_SetTarget(mobj_t **mo, mobj_t *target);   // killough 11/98
 
+mobj_t *P_SetTarget2(mobj_t **mo, mobj_t *target
+#ifdef PARANOIA
+, const char *source_file, int source_line
+#endif
+);
+
+#ifdef PARANOIA
+#define P_SetTarget(...) P_SetTarget2(__VA_ARGS__, __FILE__, __LINE__)
+#else
+#define P_SetTarget P_SetTarget2
+#endif
 #endif
diff --git a/src/p_user.c b/src/p_user.c
index 3fcc6e71b..0a50c270f 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -50,10 +50,6 @@
 #include "console.h" // CON_LogMessage
 #include "m_menu.h"
 
-#ifdef HW3SOUND
-#include "hardware/hw3sound.h"
-#endif
-
 #ifdef HWRENDER
 #include "hardware/hw_main.h"
 #endif
@@ -77,7 +73,7 @@ void P_Thrust(mobj_t *mo, angle_t angle, fixed_t move)
 
 	mo->momx += FixedMul(move, FINECOSINE(angle));
 
-	if (!(twodlevel || (mo->flags2 & MF2_TWOD)))
+	if (LIKELY(!(twodlevel || (mo->flags2 & MF2_TWOD))))
 		mo->momy += FixedMul(move, FINESINE(angle));
 }
 
@@ -94,7 +90,7 @@ void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move)
 
 	mo->momx = FixedMul(move, FINECOSINE(angle));
 
-	if (!(twodlevel || (mo->flags2 & MF2_TWOD)))
+	if (LIKELY(!(twodlevel || (mo->flags2 & MF2_TWOD))))
 		mo->momy = FixedMul(move,FINESINE(angle));
 }
 
@@ -139,9 +135,6 @@ boolean P_AutoPause(void)
 //
 void P_CalcHeight(player_t *player)
 {
-	//INT32 angle;
-	//fixed_t bob;
-	//fixed_t pviewheight;
 	mobj_t *mo = player->mo;
 
 	// Regular movement bobbing.
@@ -260,7 +253,6 @@ void P_GiveEmerald(boolean spawnObj)
 void P_ResetScore(player_t *player)
 {
 	// Formally a host for Chaos mode behavior
-
 	player->scoreadd = 0;
 }
 
@@ -366,7 +358,6 @@ void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor)
 	if (inflictor)
 	{
 		ang = R_PointToAngle2(inflictor->x, inflictor->y, player->mo->x, player->mo->y); // SRB2kart
-		//ang = R_PointToAngle2(inflictor->x-inflictor->momx, inflictor->y - inflictor->momy, player->mo->x - player->mo->momx, player->mo->y - player->mo->momy);
 
 		// explosion and rail rings send you farther back, making it more difficult
 		// to recover
@@ -427,8 +418,6 @@ void P_ResetPlayer(player_t *player)
 	player->powers[pw_tailsfly] = 0;
 	player->onconveyor = 0;
 	player->skidtime = 0;
-	/*if (player-players == consoleplayer && botingame)
-		CV_SetValue(&cv_analog2, true);*/
 }
 
 //
@@ -447,9 +436,7 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings)
 
 	player->mo->health += num_rings;
 	player->health += num_rings;
-
-	if (!G_IsSpecialStage(gamemap) || !useNightsSS)
-		player->totalring += num_rings;
+	player->totalring += num_rings;
 
 	//{ SRB2kart - rings don't really do anything, but we don't want the player spilling them later.
 	{
@@ -457,24 +444,6 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings)
 		player->health = 1;
 	}
 	//}
-
-	// Now extra life bonuses are handled here instead of in P_MovePlayer, since why not?
-	if (!ultimatemode && !modeattacking && !G_IsSpecialStage(gamemap) && G_GametypeUsesLives())
-	{
-		INT32 gainlives = 0;
-
-		while (player->xtralife < maxXtraLife && player->health > 100 * (player->xtralife+1))
-		{
-			++gainlives;
-			++player->xtralife;
-		}
-
-		if (gainlives)
-		{
-			P_GivePlayerLives(player, gainlives);
-			P_PlayLivesJingle(player);
-		}
-	}
 }
 
 //
@@ -493,56 +462,10 @@ void P_GivePlayerLives(player_t *player, INT32 numlives)
 		player->lives = 1;
 }
 
-//
-// P_DoSuperTransformation
-//
-// Transform into Super Sonic!
-void P_DoSuperTransformation(player_t *player, boolean giverings)
-{
-	return; // SRB2kart - this is not a thing we need
-	player->powers[pw_super] = 1;
-	if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC) && P_IsLocalPlayer(player))
-	{
-		S_StopMusic();
-		S_ChangeMusicInternal("supers", true);
-	}
-
-	S_StartSound(NULL, sfx_supert); //let all players hear it -mattw_cfi
-
-	// Transformation animation
-	//P_SetPlayerMobjState(player->mo, S_PLAY_SUPERTRANS1);
-
-	player->mo->momx = player->mo->momy = player->mo->momz = 0;
-
-	if (giverings)
-	{
-		player->mo->health = 51;
-		player->health = player->mo->health;
-	}
-
-	// Just in case.
-	if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOSSMUSIC))
-	{
-		player->powers[pw_extralife] = 0;
-		player->powers[pw_invulnerability] = 0;
-		player->powers[pw_sneakers] = 0;
-	}
-
-	if (gametype != GT_COOP)
-	{
-		HU_SetCEchoFlags(0);
-		HU_SetCEchoDuration(5);
-		HU_DoCEcho(va("%s\\is now super.\\\\\\\\", player_names[player-players]));
-	}
-
-	P_PlayerFlagBurst(player, false);
-}
 // Adds to the player's score
 void P_AddPlayerScore(player_t *player, UINT32 amount)
 {
-	//UINT32 oldscore;
-
-	if (!(G_BattleGametype()))
+	if (!G_BattleGametype())
 		return;
 
 	if (player->bot)
@@ -551,8 +474,6 @@ void P_AddPlayerScore(player_t *player, UINT32 amount)
 	if (player->exiting) // srb2kart
 		return;
 
-	//oldscore = player->score;
-
 	// Don't go above MAXSCORE.
 	if (player->marescore + amount < MAXSCORE)
 		player->marescore += amount;
@@ -577,9 +498,9 @@ void P_PlayLivesJingle(player_t *player)
 	if (player && !P_IsLocalPlayer(player))
 		return;
 
-	if (use1upSound)
+	if (UNLIKELY(use1upSound))
 		S_StartSound(NULL, sfx_oneup);
-	else if (mariomode)
+	else if (UNLIKELY(mariomode))
 		S_StartSound(NULL, sfx_marioa);
 	else
 	{
@@ -590,11 +511,25 @@ void P_PlayLivesJingle(player_t *player)
 	}
 }
 
-void P_PlayRinglossSound(mobj_t *source)
+void P_PlayRinglossSound(mobj_t *source, mobj_t *damager)
 {
 	sfxenum_t key = P_RandomKey(2);
+
 	if (cv_kartvoices.value)
-		S_StartSound(source, (mariomode) ? sfx_mario8 : sfx_khurt1 + key);
+	{
+		if (cv_karthitemdialog.value && source != damager && damager && damager->player && P_IsLocalPlayer(damager->player))
+		{
+			sfxenum_t sfx = sfx_khurt1 + key;
+
+			// I HATE LOCALSKINS! I HATE LOCALSKINS! :AAAAAAAAAA:
+			if (source->player)
+				sfx = K_GetPlayerSkin(source->player)->soundsid[SKSKPAN1 + key];
+
+			S_StartSound(NULL, sfx);
+		}
+		else
+			S_StartSound(source, UNLIKELY(mariomode) ? sfx_mario8 : sfx_khurt1 + key);
+	}
 	else
 		S_StartSound(source, sfx_slip);
 }
@@ -617,9 +552,13 @@ static UINT8 getPlayerPos(player_t *player)
 	{
 		UINT8 pos = 1;
 
-		for (int i = 0; i < MAXPLAYERS; ++i) {
-			if (!playeringame[i] || players[i].spectator) continue;
-			if (players[i].marescore > player->marescore) ++pos;
+		for (UINT8 i = 0; i < MAXPLAYERS; ++i)
+		{
+			if (!playeringame[i] || players[i].spectator)
+				continue;
+
+			if (players[i].marescore > player->marescore)
+				++pos;
 		}
 
 		return pos;
@@ -635,15 +574,21 @@ static boolean isPlayerLosing(player_t *player)
 		UINT8 pos = 1;
 		UINT8 maxpos = 1;
 
-		for (int i = 0; i < MAXPLAYERS; ++i) {
+		for (int i = 0; i < MAXPLAYERS; ++i)
+		{
 			if (!playeringame[i] || players[i].spectator) continue;
-			if (players[i].marescore > player->marescore) ++pos;
+
+			if (players[i].marescore > player->marescore)
+				++pos;
+
 			maxpos = max(getPlayerPos(&players[i]), maxpos);
 		}
 
-		if (maxpos == 1) return false;
+		if (maxpos == 1)
+			return false;
 
-		if (maxpos % 2) ++maxpos;
+		if (maxpos % 2)
+			++maxpos;
 
 		return pos > (maxpos / 2);
 	}
@@ -755,9 +700,8 @@ void P_RestoreMusic(player_t *player)
 	if (P_EndingMusic(player))
 		return;
 
-	// Event - Level Start
-	if (leveltime < (starttime + (TICRATE/2)))
-		S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); //S_StopMusic();
+	if (leveltime < MUSICSTARTTIME)
+		S_StartMapMusic();
 	else // see also where time overs are handled - search for "lives = 2" in this file
 	{
 		INT32 wantedmus = 0; // 0 is level music, 1 is invincibility, 2 is grow
@@ -797,17 +741,13 @@ void P_RestoreMusic(player_t *player)
 		if (wantedmus == 2 && cv_growmusic.value == 1)
 		{
 			S_ChangeMusicInternal("kgrow", true);
-			
-			if (cv_birdmusic.value)
-				S_SetRestoreMusicFadeInCvar(&cv_growmusicfade);
+			S_SetRestoreMusicFadeInCvar(&cv_growmusicfade);
 		}
 		// Item - Invincibility
 		else if (wantedmus == 1 && cv_supermusic.value == 1)
 		{
 			S_ChangeMusicInternal("kinvnc", true);
-			
-			if (cv_birdmusic.value)
-				S_SetRestoreMusicFadeInCvar(&cv_invincmusicfade);
+			S_SetRestoreMusicFadeInCvar(&cv_invincmusicfade);
 		}
 		else
 		{
@@ -817,21 +757,14 @@ void P_RestoreMusic(player_t *player)
 			if (G_RaceGametype() && player->laps >= (UINT8)(cv_numlaps.value - 1))
 				S_SpeedMusic(1.2f);
 #endif
-			if (cv_birdmusic.value)
-			{
-				if (mapmusresume && cv_resume.value)
-					position = mapmusresume;
-				else
-					position = mapmusposition;
-
-				S_ChangeMusicEx(mapmusname, mapmusflags, true, position, 0,
-						S_GetRestoreMusicFadeIn());
-				S_ClearRestoreMusicFadeInCvar();
-			}
+			if (mapmusic.resume && cv_resume.value) // mapmusresume will be 0 anyways when birdmusic stuff is disabled
+				position = mapmusic.resume;
 			else
-				S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
-			
-			mapmusresume = 0;
+				position = mapmusic.position;
+
+			S_ChangeMusicEx(mapmusic.name, mapmusic.flags, true, position, 0, S_GetRestoreMusicFadeIn());
+			S_ClearRestoreMusicFadeInCvar();
+			mapmusic.resume = 0;
 		}
 	}
 }
@@ -864,20 +797,6 @@ boolean P_IsObjectOnGround(mobj_t *mo)
 {
 	if (P_IsObjectInGoop(mo))
 	{
-/*
-		// It's a crazy hack that checking if you're on the ground
-		// would actually CHANGE your position and momentum,
-		if (mo->z < mo->floorz)
-		{
-			mo->z = mo->floorz;
-			mo->momz = 0;
-		}
-		else if (mo->z + mo->height > mo->ceilingz)
-		{
-			mo->z = mo->ceilingz - mo->height;
-			mo->momz = 0;
-		}
-*/
 		// but I don't want you to ever 'stand' while submerged in goo.
 		// You're in constant vertical momentum, even if you get stuck on something.
 		// No exceptions.
@@ -1059,7 +978,7 @@ fixed_t P_GetPlayerSpinHeight(player_t *player)
 // Returns true if player is
 // on the local machine.
 //
-boolean P_IsLocalPlayer(player_t *player)
+boolean P_IsLocalPlayer(const player_t *player)
 {
 	UINT8 i;
 
@@ -1083,12 +1002,21 @@ boolean P_IsLocalPlayer(player_t *player)
 // Returns true if player is
 // currently being watched.
 //
-boolean P_IsDisplayPlayer(player_t *player)
+boolean P_IsDisplayPlayer(const player_t *player)
 {
 	UINT8 i;
 
 	for (i = 0; i <= splitscreen; i++) // DON'T skip P1
 	{
+		if (camera[i].freecam)
+		{
+			// Freecam still techically has a player in
+			// displayplayers. But since the camera is
+			// detached, it would be weird if sounds were
+			// heard from that player's perspective.
+			continue;
+		}
+
 		if (player == &players[displayplayers[i]])
 			return true;
 	}
@@ -1140,9 +1068,7 @@ void P_SpawnShieldOrb(player_t *player)
 	// blaze through the thinkers to see if an orb already exists!
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		shieldobj = (mobj_t *)th;
@@ -1199,6 +1125,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
 	ghost = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_GHOST);
 
 	P_SetScale(ghost, mobj->scale);
+	ghost->scalespeed = mobj->scalespeed;
 	ghost->destscale = mobj->scale;
 
 	if (mobj->eflags & MFE_VERTICALFLIP)
@@ -1215,26 +1142,29 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
 	else
 		ghost->angle = mobj->angle;
 
-	ghost->pitch = mobj->pitch;
-	ghost->roll = mobj->roll;
-
 	ghost->sprite = mobj->sprite;
 	ghost->frame = mobj->frame;
 	ghost->tics = -1;
 	ghost->frame &= ~FF_TRANSMASK;
 	ghost->frame |= tr_trans50<<FF_TRANSSHIFT;
-	ghost->slopepitch = mobj->slopepitch; 
-	ghost->sloperoll = mobj->sloperoll;
-	
+
 	ghost->fuse = ghost->info->damage;
 	ghost->skin = mobj->skin;
 	ghost->localskin = mobj->localskin;
 	ghost->skinlocal = mobj->skinlocal;
+
 	ghost->spritexscale = mobj->spritexscale;
 	ghost->spriteyscale = mobj->spriteyscale;
 	ghost->spritexoffset = mobj->spritexoffset;
 	ghost->spriteyoffset = mobj->spriteyoffset;
 
+	ghost->pitch = mobj->pitch;
+	ghost->roll = mobj->roll;
+	ghost->sloperoll = mobj->sloperoll;
+	ghost->rollangle = mobj->rollangle;
+	ghost->sloperoll = mobj->sloperoll;
+	ghost->slopepitch = mobj->slopepitch;
+
 	if (mobj->flags2 & MF2_OBJECTFLIP)
 		ghost->flags |= MF2_OBJECTFLIP;
 
@@ -1250,6 +1180,11 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
 	ghost->old_roll = mobj->old_roll2;
 	ghost->old_sloperoll = mobj->old_sloperoll2;
 	ghost->old_slopepitch = mobj->old_slopepitch2;
+	ghost->old_scale = mobj->old_scale2;
+	ghost->old_spritexscale = mobj->old_spritexscale2;
+	ghost->old_spriteyscale = mobj->old_spriteyscale2;
+	ghost->old_spritexoffset = mobj->old_spritexoffset2;
+	ghost->old_spriteyoffset = mobj->old_spriteyoffset2;
 
 	return ghost;
 }
@@ -1274,42 +1209,24 @@ void P_DoPlayerExit(player_t *player)
 		player->exiting = raceexittime+2;
 		K_KartUpdatePosition(player);
 
-		if (cv_kartvoices.value)
+		if (cv_kartvoices.value && !P_MobjWasRemoved(player->mo))
 		{
+			const int soundid = K_IsPlayerLosing(player) ? sfx_klose: sfx_kwin; // fix godjjsa win sounds
+
 			if (P_IsLocalPlayer(player))
 			{
-				sfxenum_t sfx_id;
-				// fix godjjsa win sounds
-				if (K_IsPlayerLosing(player)) {
-					if (player->mo->localskin)
-						sfx_id = ((skin_t *)player->mo->localskin)->soundsid[S_sfx[sfx_klose].skinsound];
-					else
-						sfx_id = ((skin_t *)player->mo->skin)->soundsid[S_sfx[sfx_klose].skinsound];
-				}
-				else {
-					if (player->mo->localskin)
-						sfx_id = ((skin_t *)player->mo->localskin)->soundsid[S_sfx[sfx_kwin].skinsound];
-					else
-						sfx_id = ((skin_t *)player->mo->skin)->soundsid[S_sfx[sfx_kwin].skinsound];
-				}
+				sfxenum_t sfx_id = K_GetMobjSkin(player->mo)->soundsid[S_sfx[soundid].skinsound];
 				S_StartSound(NULL, sfx_id);
 			}
 			else
 			{
-				if (K_IsPlayerLosing(player))
-					S_StartSound(player->mo, sfx_klose);
-				else
-					S_StartSound(player->mo, sfx_kwin);
+				S_StartSound(player->mo, soundid);
 			}
 		}
 
 		if (cv_inttime.value > 0)
 			P_EndingMusic(player);
 
-		// SRB2kart 120217
-		//if (!exitcountdown)
-			//exitcountdown = racecountdown + 8*TICRATE;
-
 		if (P_CheckRacers())
 			player->exiting = raceexittime+1;
 	}
@@ -1327,9 +1244,6 @@ void P_DoPlayerExit(player_t *player)
 
 	if (player == &players[consoleplayer])
 		demo.savebutton = leveltime;
-
-	/*if (playeringame[player-players] && netgame && !circuitmap)
-		CONS_Printf(M_GetText("%s has completed the level.\n"), player_names[player-players]);*/
 }
 
 #define SPACESPECIAL 12
@@ -1352,8 +1266,9 @@ boolean P_InSpaceSector(mobj_t *mo) // Returns true if you are in space
 
 			if (GETSECSPECIAL(rover->master->frontsector->special, 1) != SPACESPECIAL)
 				continue;
-			topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, mo->x, mo->y) : *rover->topheight;
-			bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, mo->x, mo->y) : *rover->bottomheight;
+
+			topheight    = P_GetFFloorTopZAt(rover, mo->x, mo->y);
+			bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
 
 			if (mo->z + (mo->height/2) > topheight)
 				continue;
@@ -1372,13 +1287,14 @@ boolean P_InQuicksand(mobj_t *mo) // Returns true if you are in quicksand
 {
 	sector_t *sector = mo->subsector->sector;
 	fixed_t topheight, bottomheight;
-
-	fixed_t flipoffset = ((mo->eflags & MFE_VERTICALFLIP) ? (mo->height/2) : 0);
+	fixed_t flipoffset;
 
 	if (sector->ffloors)
 	{
 		ffloor_t *rover;
 
+		flipoffset = ((mo->eflags & MFE_VERTICALFLIP) ? (mo->height/2) : 0);
+
 		for (rover = sector->ffloors; rover; rover = rover->next)
 		{
 			if (!(rover->flags & FF_EXISTS))
@@ -1387,8 +1303,8 @@ boolean P_InQuicksand(mobj_t *mo) // Returns true if you are in quicksand
 			if (!(rover->flags & FF_QUICKSAND))
 				continue;
 
-			topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, mo->x, mo->y) : *rover->topheight;
-			bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, mo->x, mo->y) : *rover->bottomheight;
+			topheight    = P_GetFFloorTopZAt(rover, mo->x, mo->y);
+			bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
 
 			if (mo->z + flipoffset > topheight)
 				continue;
@@ -1679,8 +1595,8 @@ static void P_CheckQuicksand(player_t *player)
 		if (!(rover->flags & FF_QUICKSAND))
 			continue;
 
-		topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
-		bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
+		topheight    = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
+		bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
 
 		if (topheight >= player->mo->z && bottomheight < player->mo->z + player->mo->height)
 		{
@@ -1725,7 +1641,7 @@ static void P_CheckInvincibilityTimer(player_t *player)
 	if (!player->powers[pw_invulnerability] && !player->kartstuff[k_invincibilitytimer])
 		return;
 
-	player->mo->color = (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
+	player->mo->color = K_RainbowColor();
 
 	// Resume normal music stuff.
 	if (player->powers[pw_invulnerability] == 1 || player->kartstuff[k_invincibilitytimer] == 1)
@@ -1745,7 +1661,6 @@ static void P_CheckInvincibilityTimer(player_t *player)
 	}
 }
 
-
 //
 // P_DoBubbleBreath
 //
@@ -1768,6 +1683,7 @@ static void P_DoBubbleBreath(player_t *player)
 		bubble = P_SpawnMobj(player->mo->x, player->mo->y, zh, MT_SMALLBUBBLE);
 	else if (P_RandomChance(3*FRACUNIT/256))
 		bubble = P_SpawnMobj(player->mo->x, player->mo->y, zh, MT_MEDIUMBUBBLE);
+
 	if (bubble)
 	{
 		bubble->threshold = 42;
@@ -1775,8 +1691,8 @@ static void P_DoBubbleBreath(player_t *player)
 		P_SetScale(bubble, bubble->destscale);
 	}
 
-	if (player->pflags & PF_NIGHTSMODE) // NiGHTS Super doesn't spawn flight bubbles
-		return;
+	//if (player->pflags & PF_NIGHTSMODE) // NiGHTS Super doesn't spawn flight bubbles
+		//return;
 }
 
 //
@@ -1870,9 +1786,7 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range)
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
@@ -1917,11 +1831,8 @@ static void P_3dMovement(player_t *player)
 {
 	ticcmd_t *cmd;
 	angle_t movepushangle, movepushsideangle; // Analog
-	//INT32 topspeed, acceleration, thrustfactor;
 	fixed_t movepushforward = 0, movepushside = 0;
 	angle_t dangle; // replaces old quadrants bits
-	//boolean dangleflip = false; // SRB2kart - toaster
-	//fixed_t normalspd = FixedMul(player->normalspeed, player->mo->scale);
 	boolean analogmove = false;
 	fixed_t oldMagnitude, newMagnitude;
 	vector3_t totalthrust;
@@ -1959,20 +1870,18 @@ static void P_3dMovement(player_t *player)
 		else
 			movepushangle = player->mo->angle;
 	}
+
 	movepushsideangle = movepushangle-ANGLE_90;
 
 	// cmomx/cmomy stands for the conveyor belt speed.
 	if (player->onconveyor == 2) // Wind/Current
 	{
-		//if (player->mo->z > player->mo->watertop || player->mo->z + player->mo->height < player->mo->waterbottom)
 		if (!(player->mo->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
 			player->cmomx = player->cmomy = 0;
 	}
 	else if (player->onconveyor == 4 && !P_IsObjectOnGround(player->mo)) // Actual conveyor belt
 		player->cmomx = player->cmomy = 0;
-	else if (player->onconveyor != 2 && player->onconveyor != 4
-				&& player->onconveyor != 1
-	)
+	else if (player->onconveyor != 2 && player->onconveyor != 4 && player->onconveyor != 1)
 		player->cmomx = player->cmomy = 0;
 
 	player->rmomx = player->mo->momx - player->cmomx;
@@ -1988,29 +1897,8 @@ static void P_3dMovement(player_t *player)
 	if (dangle > ANGLE_180) //flip to keep to one side
 	{
 		dangle = InvAngle(dangle);
-		//dangleflip = true;
 	}
 
-	// anything else will leave both at 0, so no need to do anything else
-
-	//{ SRB2kart 220217 - Toaster Code for misplaced thrust
-	/*
-	if (!player->kartstuff[k_drift]) // Not Drifting
-	{
-		angle_t difference = dangle/2;
-		boolean reverse = (dangle >= ANGLE_90);
-
-		if (dangleflip)
-			difference = InvAngle(difference);
-
-		if (reverse)
-			difference += ANGLE_180;
-
-		P_InstaThrust(player->mo, player->mo->angle + difference, player->speed);
-	}
-	*/
-	//}
-
 	// When sliding, don't allow forward/back
 	if (player->pflags & PF_SLIDING)
 		cmd->forwardmove = 0;
@@ -2024,16 +1912,12 @@ static void P_3dMovement(player_t *player)
 	// Forward movement
 	if (!((player->exiting || mapreset) || (P_PlayerInPain(player) && !onground)))
 	{
-		//movepushforward = cmd->forwardmove * (thrustfactor * acceleration);
 		movepushforward = K_3dKartMovement(player, onground, cmd->forwardmove);
 
 		// allow very small movement while in air for gameplay
 		if (!onground)
 			movepushforward >>= 2; // proper air movement
 
-		// don't need to account for scale here with kart accel code
-		//movepushforward = FixedMul(movepushforward, player->mo->scale);
-
 		if (player->mo->movefactor != FRACUNIT) // Friction-scaled acceleration...
 			movepushforward = FixedMul(movepushforward, player->mo->movefactor);
 
@@ -2100,9 +1984,11 @@ static void P_3dMovement(player_t *player)
 	// If "no" to 1, we're not reaching any limits yet, so ignore this entirely!
 	// -Shadow Hog
 	newMagnitude = R_PointToDist2(player->mo->momx - player->cmomx, player->mo->momy - player->cmomy, 0, 0);
+
 	if (newMagnitude > K_GetKartSpeed(player, true)) //topspeed)
 	{
 		fixed_t tempmomx, tempmomy;
+
 		if (oldMagnitude > K_GetKartSpeed(player, true) && onground) // SRB2Kart: onground check for air speed cap
 		{
 			if (newMagnitude > oldMagnitude)
@@ -2133,7 +2019,7 @@ static void P_SpectatorMovement(player_t *player)
 {
 	ticcmd_t *cmd = &player->cmd;
 
-	player->mo->angle = (cmd->angleturn<<16 /* not FRACBITS */);
+	player->mo->angle = (angle_t)(cmd->angleturn<<16 /* not FRACBITS */);
 
 	ticruned++;
 	if (!(cmd->angleturn & TICCMD_RECEIVED))
@@ -2170,12 +2056,16 @@ static void P_SpectatorMovement(player_t *player)
 void P_BlackOw(player_t *player)
 {
 	INT32 i;
-	S_StartSound (player->mo, sfx_bkpoof); // Sound the BANG!
+	S_StartSound(player->mo, sfx_bkpoof); // Sound the BANG!
 
 	for (i = 0; i < MAXPLAYERS; i++)
-		if (playeringame[i] && P_AproxDistance(player->mo->x - players[i].mo->x,
-			player->mo->y - players[i].mo->y) < 1536*FRACUNIT)
+	{
+		if (!playeringame[i])
+			continue;
+
+		if (P_AproxDistance(player->mo->x - players[i].mo->x, player->mo->y - players[i].mo->y) < 1536*FRACUNIT)
 			P_FlashPal(&players[i], PAL_NUKE, 10);
+	}
 
 	P_NukeEnemies(player->mo, player->mo, 1536*FRACUNIT); // Search for all nearby enemies and nuke their pants off!
 	player->powers[pw_shield] = player->powers[pw_shield] & SH_STACK;
@@ -2205,12 +2095,15 @@ void P_ElementalFireTrail(player_t *player)
 	{
 		newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(24*FRACUNIT, player->mo->scale));
 		newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(24*FRACUNIT, player->mo->scale));
+
 		if (player->mo->standingslope)
 		{
-			ground = P_GetZAt(player->mo->standingslope, newx, newy);
+			ground = P_GetSlopeZAt(player->mo->standingslope, newx, newy);
+
 			if (player->mo->eflags & MFE_VERTICALFLIP)
 				ground -= FixedMul(mobjinfo[MT_SPINFIRE].height, player->mo->scale);
 		}
+
 		flame = P_SpawnMobj(newx, newy, ground, MT_SPINFIRE);
 		P_SetTarget(&flame->target, player->mo);
 		flame->angle = travelangle;
@@ -2221,6 +2114,7 @@ void P_ElementalFireTrail(player_t *player)
 
 		flame->momx = 8;
 		P_XYMovement(flame);
+
 		if (P_MobjWasRemoved(flame))
 			continue;
 
@@ -2267,7 +2161,7 @@ static void P_MovePlayer(player_t *player)
 	}
 	// note: don't unset stasis here
 
-	if (!player->spectator && G_TagGametype())
+	if (UNLIKELY(!player->spectator && G_TagGametype()))
 	{
 		// If we have stasis already here, it's because it's forced on us
 		// by a linedef executor or what have you
@@ -2293,12 +2187,11 @@ static void P_MovePlayer(player_t *player)
 		{
 			player->pflags |= PF_FULLSTASIS;
 			// If you're in stasis in tag, you don't drown.
-			/*if (player->powers[pw_underwater] <= 12*TICRATE + 1)
-				P_RestoreMusic(player);*/
 			player->powers[pw_underwater] = player->powers[pw_spacetime] = 0;
 		}
 	}
 
+	// have to keep this crap for synch reasons
 	if (player->spectator)
 	{
 		P_SpectatorMovement(player);
@@ -2322,11 +2215,13 @@ static void P_MovePlayer(player_t *player)
 		{
 			player->lturn_max[leveltime%MAXPREDICTTICS] = K_GetKartTurnValue(player, KART_FULLTURN)+1;
 			player->rturn_max[leveltime%MAXPREDICTTICS] = K_GetKartTurnValue(player, -KART_FULLTURN)-1;
-		} else {
+		}
+		else
+		{
 			player->lturn_max[leveltime%MAXPREDICTTICS] = player->rturn_max[leveltime%MAXPREDICTTICS] = 0;
 		}
 
-		if (leveltime >= starttime)
+		if (LIKELY(leveltime >= starttime))
 		{
 			// KART: Don't directly apply angleturn! It may have been either A) forged by a malicious client, or B) not be a smooth turn due to a player dropping frames.
 			// Instead, turn the player only up to the amount they're supposed to turn accounting for latency. Allow exactly 1 extra turn unit to try to keep old replays synced.
@@ -2365,11 +2260,9 @@ static void P_MovePlayer(player_t *player)
 		P_3dMovement(player);
 	}
 
-	if (maptol & TOL_2D)
+	if (UNLIKELY(maptol & TOL_2D)) // psure this doesent even work at all
 		runspd = FixedMul(runspd, 2*FRACUNIT/3);
 
-	//P_SkidStuff(player);
-
 	/////////////////////////
 	// MOVEMENT ANIMATIONS //
 	/////////////////////////
@@ -2428,10 +2321,10 @@ static void P_MovePlayer(player_t *player)
 
 	// Drifting sound
 	// Start looping the sound now.
-	if (leveltime % 50 == 0 && onground && player->kartstuff[k_drift] != 0)
+	if (onground && leveltime % 50 == 0 && player->kartstuff[k_drift] != 0)
 		S_StartSound(player->mo, sfx_drift);
 	// Leveltime being 50 might take a while at times. We'll start it up once, isntantly.
-	else if (!S_SoundPlaying(player->mo, sfx_drift) && onground && player->kartstuff[k_drift] != 0)
+	else if (onground && !S_SoundPlaying(player->mo, sfx_drift) && player->kartstuff[k_drift] != 0)
 		S_StartSound(player->mo, sfx_drift);
 	// Ok, we'll stop now.
 	else if (player->kartstuff[k_drift] == 0 || !onground)
@@ -2456,7 +2349,7 @@ static void P_MovePlayer(player_t *player)
 		P_SetPlayerMobjState(player->mo, S_KART_STND1); // SRB2kart - was S_PLAY_STND
 	}
 
-	if (player->gotflag) // If you can't glide, then why the heck would you be gliding?
+	if (UNLIKELY(player->gotflag)) // If you can't glide, then why the heck would you be gliding?
 	{
 		player->pflags &= ~PF_GLIDING;
 		player->glidetime = 0;
@@ -2509,13 +2402,12 @@ static void P_MovePlayer(player_t *player)
 
 	K_DriftDustHandling(player->mo);
 
-
 	// Crush test...
 	if ((player->mo->ceilingz - player->mo->floorz < player->mo->height)
 		&& !(player->mo->flags & MF_NOCLIP))
 	{
 		if ((netgame || multiplayer) && player->spectator)
-			P_DamageMobj(player->mo, NULL, NULL, 42000); // Respawn crushed spectators
+			P_DamageMobj(player->mo, NULL, NULL, DMG_SPECTATOR); // Respawn crushed spectators
 		else
 		{
 			K_SquishPlayer(player, NULL, NULL); // SRB2kart - we don't kill when squished, we squish when squished.
@@ -2525,8 +2417,7 @@ static void P_MovePlayer(player_t *player)
 			return;
 	}
 
-#ifdef HWRENDER
-	if (rendermode != render_soft && rendermode != render_none && cv_grfovchange.value)
+	if (cv_fovchange.value)
 	{
 		fixed_t speed;
 		const fixed_t runnyspeed = 20*FRACUNIT;
@@ -2546,7 +2437,6 @@ static void P_MovePlayer(player_t *player)
 	}
 	else
 		player->fovadd = 0;
-#endif
 
 #ifdef FLOORSPLATS
 	if (cv_shadow.value && rendermode == render_soft)
@@ -2576,8 +2466,6 @@ static void P_DoZoomTube(player_t *player)
 	fixed_t dist;
 	boolean reverse;
 
-	//player->mo->height = P_GetPlayerSpinHeight(player);
-
 	if (player->speed > 0)
 		reverse = false;
 	else
@@ -2618,7 +2506,32 @@ static void P_DoZoomTube(player_t *player)
 		CONS_Debug(DBG_GAMELOGIC, "Looking for next waypoint...\n");
 
 		// Find next waypoint
+<<<<<<< HEAD
 		waypoint = reverse ? P_GetPreviousWaypoint(player->mo->tracer, false) : P_GetNextWaypoint(player->mo->tracer, false);
+=======
+		for (th = thinkercap.next; th != &thinkercap; th = th->next)
+		{
+			if (th->function != (actionf_p1)P_MobjThinker) // Not a mobj thinker
+				continue;
+
+			mo2 = (mobj_t *)th;
+
+			if (mo2->type != MT_TUBEWAYPOINT)
+				continue;
+
+			if (mo2->threshold != sequence)
+				continue;
+
+			if (reverse && mo2->health != player->mo->tracer->health - 1)
+				continue;
+
+			if (!reverse && mo2->health != player->mo->tracer->health + 1)
+				continue;
+
+			waypoint = mo2;
+			break;
+		}
+>>>>>>> Saturn-Next
 
 		if (waypoint)
 		{
@@ -2660,11 +2573,6 @@ static void P_DoZoomTube(player_t *player)
 		else if (player == &players[displayplayers[3]])
 			localangle[3] = player->mo->angle;
 	}
-#if 0
-	if (player->mo->state != &states[S_KART_SPIN])
-		P_SetPlayerMobjState(player->mo, S_KART_SPIN);
-	player->frameangle -= ANGLE_22h;
-#endif
 }
 
 //
@@ -2694,10 +2602,8 @@ void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius)
 
 	for (think = thinkercap.next; think != &thinkercap; think = think->next)
 	{
-		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
+		if (think->function != (actionf_p1)P_MobjThinker)
 			continue; // not a mobj thinker
-		if (think->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
 
 		mo = (mobj_t *)think;
 
@@ -2708,9 +2614,6 @@ void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius)
 		if (mo->flags & MF_MONITOR)
 			continue; // Monitors cannot be 'nuked'.
 
-		//if (!G_BattleGametype() && mo->type == MT_PLAYER)
-		//	continue; // Don't hurt players in Co-Op!
-
 		if (abs(inflictor->x - mo->x) > radius || abs(inflictor->y - mo->y) > radius || abs(inflictor->z - mo->z) > radius)
 			continue; // Workaround for possible integer overflow in the below -Red
 
@@ -2776,12 +2679,11 @@ boolean P_LookForEnemies(player_t *player)
 
 	for (think = thinkercap.next; think != &thinkercap; think = think->next)
 	{
-		if (think->function.acp1 != (actionf_p1)P_MobjThinker)
+		if (think->function != (actionf_p1)P_MobjThinker)
 			continue; // not a mobj thinker
-		if (think->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
-			continue;
 
 		mo = (mobj_t *)think;
+
 		if (!(mo->flags & (MF_ENEMY|MF_BOSS|MF_MONITOR|MF_SPRING)))
 			continue; // not a valid enemy
 
@@ -2808,8 +2710,8 @@ boolean P_LookForEnemies(player_t *player)
 			player->mo->z-mo->z) > FixedMul(RING_DIST, player->mo->scale))
 			continue; // out of range
 
-		if ((twodlevel || player->mo->flags2 & MF2_TWOD)
-		&& abs(player->mo->y-mo->y) > player->mo->radius)
+		if (UNLIKELY((twodlevel || player->mo->flags2 & MF2_TWOD)
+		&& abs(player->mo->y-mo->y) > player->mo->radius))
 			continue; // not in your 2d plane
 
 		if (mo->type == MT_PLAYER) // Don't chase after other players!
@@ -2847,14 +2749,12 @@ void P_HomingAttack(mobj_t *source, mobj_t *enemy) // Home in on your target
 	fixed_t dist;
 	fixed_t ns = 0;
 
-	if (!enemy)
-		return;
-
-	if (!(enemy->health))
+	if (!enemy || !enemy->health)
 		return;
 
 	// change angle
 	source->angle = R_PointToAngle2(source->x, source->y, enemy->x, enemy->y);
+
 	if (source->player)
 	{
 		if (source->player == &players[consoleplayer])
@@ -2903,12 +2803,11 @@ void P_FindEmerald(void)
 	// to find all emeralds
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
 	{
-		if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-			continue;
-		if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+		if (th->function != (actionf_p1)P_MobjThinker)
 			continue;
 
 		mo2 = (mobj_t *)th;
+
 		if (mo2->type == MT_EMERHUNT)
 		{
 			if (!hunt1)
@@ -2929,9 +2828,6 @@ void P_FindEmerald(void)
 //
 static void P_DeathThink(player_t *player)
 {
-	//ticcmd_t *cmd = &player->cmd;
-	//player->deltaviewheight = 0;
-
 	if (player->deadtimer < INT32_MAX)
 		player->deadtimer++;
 
@@ -2968,19 +2864,17 @@ static void P_DeathThink(player_t *player)
 		if (leveltime >= starttime)
 		{
 			player->realtime = leveltime - starttime;
-			if (player == &players[consoleplayer])
-			{
-				if (player->spectator || !circuitmap)
-					curlap = 0;
-				else
-					curlap++; // This is too complicated to sync to realtime, just sorta hope for the best :V
-			}
+
+			if (player->spectator)
+				player->laptime[LAP_CUR] = 0;
+			else if (player->laptime[LAP_CUR] != UINT32_MAX)
+				player->laptime[LAP_CUR]++; // This is too complicated to sync to realtime, just sorta hope for the best :V
 		}
 		else
 		{
 			player->realtime = 0;
-			if (player == &players[consoleplayer])
-				curlap = 0;
+
+			player->laptime[LAP_CUR] = 0;
 		}
 	}
 
@@ -3003,67 +2897,152 @@ camera_t camera[MAXSPLITSCREENPLAYERS]; // Four cameras, three for splitscreen
 
 static void CV_CamRotate_OnChange(void)
 {
-	if (cv_cam_rotate.value < 0)
-		CV_SetValue(&cv_cam_rotate, cv_cam_rotate.value + 360);
-	else if (cv_cam_rotate.value > 359)
-		CV_SetValue(&cv_cam_rotate, cv_cam_rotate.value % 360);
+	if (cv_cam_rotate[0].value < 0)
+		CV_SetValue(&cv_cam_rotate[0], cv_cam_rotate[0].value + 360);
+	else if (cv_cam_rotate[0].value > 359)
+		CV_SetValue(&cv_cam_rotate[0], cv_cam_rotate[0].value % 360);
 }
 
 static void CV_CamRotate2_OnChange(void)
 {
-	if (cv_cam2_rotate.value < 0)
-		CV_SetValue(&cv_cam2_rotate, cv_cam2_rotate.value + 360);
-	else if (cv_cam2_rotate.value > 359)
-		CV_SetValue(&cv_cam2_rotate, cv_cam2_rotate.value % 360);
+	if (cv_cam_rotate[1].value < 0)
+		CV_SetValue(&cv_cam_rotate[1], cv_cam_rotate[1].value + 360);
+	else if (cv_cam_rotate[1].value > 359)
+		CV_SetValue(&cv_cam_rotate[1], cv_cam_rotate[1].value % 360);
 }
 
 static void CV_CamRotate3_OnChange(void)
 {
-	if (cv_cam3_rotate.value < 0)
-		CV_SetValue(&cv_cam3_rotate, cv_cam3_rotate.value + 360);
-	else if (cv_cam3_rotate.value > 359)
-		CV_SetValue(&cv_cam3_rotate, cv_cam3_rotate.value % 360);
+	if (cv_cam_rotate[2].value < 0)
+		CV_SetValue(&cv_cam_rotate[2], cv_cam_rotate[2].value + 360);
+	else if (cv_cam_rotate[2].value > 359)
+		CV_SetValue(&cv_cam_rotate[2], cv_cam_rotate[2].value % 360);
 }
 
 static void CV_CamRotate4_OnChange(void)
 {
-	if (cv_cam4_rotate.value < 0)
-		CV_SetValue(&cv_cam4_rotate, cv_cam4_rotate.value + 360);
-	else if (cv_cam4_rotate.value > 359)
-		CV_SetValue(&cv_cam4_rotate, cv_cam4_rotate.value % 360);
+	if (cv_cam_rotate[3].value < 0)
+		CV_SetValue(&cv_cam_rotate[3], cv_cam_rotate[3].value + 360);
+	else if (cv_cam_rotate[3].value > 359)
+		CV_SetValue(&cv_cam_rotate[3], cv_cam_rotate[3].value % 360);
 }
 
-static CV_PossibleValue_t CV_CamSpeed[] = {{0, "MIN"}, {1*FRACUNIT, "MAX"}, {0, NULL}};
-static CV_PossibleValue_t rotation_cons_t[] = {{1, "MIN"}, {45, "MAX"}, {0, NULL}};
-static CV_PossibleValue_t CV_CamRotate[] = {{-720, "MIN"}, {720, "MAX"}, {0, NULL}};
+static void CV_PlayerCam1_OnChange(void)
+{
+	if (gamestate != GS_LEVEL)
+		return;
 
-consvar_t cv_cam_dist = {"cam_dist", "160", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_height = {"cam_height", "50", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_still = {"cam_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_speed = {"cam_speed", "0.4", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_rotate = {"cam_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_rotspeed = {"cam_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+	if (!playeringame[displayplayers[0]] || players[displayplayers[0]].spectator)
+		return;
 
-consvar_t cv_cam2_dist = {"cam2_dist", "160", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_height = {"cam2_height", "50", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_still = {"cam2_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_speed = {"cam2_speed", "0.4", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_rotate = {"cam2_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate2_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_rotspeed = {"cam2_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+	// dont do stuff when cam speeen at map start
+	if (leveltime < starttime - TICRATE*4)
+		return;
 
-consvar_t cv_cam3_dist = {"cam3_dist", "160", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam3_height = {"cam3_height", "50", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam3_still = {"cam3_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam3_speed = {"cam3_speed", "0.4", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam3_rotate = {"cam3_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate3_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam3_rotspeed = {"cam3_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+	if (camera[displayplayers[0]].chase)
+		P_ResetCamera(&players[displayplayers[0]], &camera[0]);
+}
 
-consvar_t cv_cam4_dist = {"cam4_dist", "160", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam4_height = {"cam4_height", "50", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam4_still = {"cam4_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam4_speed = {"cam4_speed", "0.4", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam4_rotate = {"cam4_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate4_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam4_rotspeed = {"cam4_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static void CV_PlayerCam2_OnChange(void)
+{
+	if (gamestate != GS_LEVEL)
+		return;
+
+	if (!playeringame[displayplayers[1]] || players[displayplayers[1]].spectator)
+		return;
+
+	// dont do stuff when cam speeen at map start
+	if (leveltime < starttime - TICRATE*4)
+		return;
+
+	if (camera[displayplayers[1]].chase)
+		P_ResetCamera(&players[displayplayers[1]], &camera[1]);
+}
+
+static void CV_PlayerCam3_OnChange(void)
+{
+	if (gamestate != GS_LEVEL)
+		return;
+
+	if (!playeringame[displayplayers[2]] || players[displayplayers[2]].spectator)
+		return;
+
+	// dont do stuff when cam speeen at map start
+	if (leveltime < starttime - TICRATE*4)
+		return;
+
+	if (camera[displayplayers[2]].chase)
+		P_ResetCamera(&players[displayplayers[2]], &camera[2]);
+}
+
+static void CV_PlayerCam4_OnChange(void)
+{
+	if (gamestate != GS_LEVEL)
+		return;
+
+	if (!playeringame[displayplayers[3]] || players[displayplayers[3]].spectator)
+		return;
+
+	// dont do stuff when cam speeen at map start
+	if (leveltime < starttime - TICRATE*4)
+		return;
+
+	if (camera[displayplayers[3]].chase)
+		P_ResetCamera(&players[displayplayers[3]], &camera[3]);
+}
+
+consvar_t cv_cam_dist[MAXSPLITSCREENPLAYERS] = {
+	{"cam_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, NULL, CV_PlayerCam1_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"cam2_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, NULL, CV_PlayerCam2_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"cam3_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, NULL, CV_PlayerCam3_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"cam4_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, NULL, CV_PlayerCam4_OnChange, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_cam_height[MAXSPLITSCREENPLAYERS] = {
+	{"cam_height", "50", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, NULL, CV_PlayerCam1_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"cam2_height", "50", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, NULL, CV_PlayerCam2_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"cam3_height", "50", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, NULL, CV_PlayerCam3_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"cam4_height", "50", CV_FLOAT|CV_SAVE|CV_CALL|CV_NOINIT, NULL, CV_PlayerCam4_OnChange, 0, NULL, NULL, 0, 0, NULL},
+};
+
+consvar_t cv_cam_still[MAXSPLITSCREENPLAYERS] = {
+	{"cam_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cam2_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cam3_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cam4_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+static CV_PossibleValue_t cam_speed_cons_t[] = {{0, "MIN"}, {1*FRACUNIT, "MAX"}, {0, NULL}};
+consvar_t cv_cam_speed[MAXSPLITSCREENPLAYERS] = {
+	{"cam_speed", "0.4", CV_FLOAT|CV_SAVE, cam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cam2_speed", "0.4", CV_FLOAT|CV_SAVE, cam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cam3_speed", "0.4", CV_FLOAT|CV_SAVE, cam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cam4_speed", "0.4", CV_FLOAT|CV_SAVE, cam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+
+static CV_PossibleValue_t cam_rotate_cons_t[] = {{-720, "MIN"}, {720, "MAX"}, {0, NULL}};
+consvar_t cv_cam_rotate[MAXSPLITSCREENPLAYERS] = {
+	{"cam_rotate", "0", CV_CALL|CV_NOINIT, cam_rotate_cons_t, CV_CamRotate_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"cam2_rotate", "0", CV_CALL|CV_NOINIT, cam_rotate_cons_t, CV_CamRotate2_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"cam3_rotate", "0", CV_CALL|CV_NOINIT, cam_rotate_cons_t, CV_CamRotate3_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"cam4_rotate", "0", CV_CALL|CV_NOINIT, cam_rotate_cons_t, CV_CamRotate4_OnChange, 0, NULL, NULL, 0, 0, NULL}
+};
+
+consvar_t cv_cam_timeover[MAXSPLITSCREENPLAYERS] = {
+	{"cam_timeover", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cam2_timeover", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cam3_timeover", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cam4_timeover", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+static CV_PossibleValue_t freecam_speed_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
+consvar_t cv_freecam_speed[MAXSPLITSCREENPLAYERS] = {
+	{"freecam_speed", "1", CV_SAVE, freecam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"freecam2_speed", "1", CV_SAVE, freecam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"freecam3_speed", "1", CV_SAVE, freecam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"freecam4_speed", "1", CV_SAVE, freecam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
 
 consvar_t cv_tilting = {"tilting", "Off", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_quaketilt = {"quaketilt", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -3071,76 +3050,107 @@ consvar_t cv_tiltsmoothing = {"tiltsmoothing", "32", CV_SAVE, CV_Natural, NULL,
 
 consvar_t cv_actionmovie = {"actionmovie", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-fixed_t t_cam_dist = -42;
-fixed_t t_cam_height = -42;
-fixed_t t_cam_rotate = -42;
-fixed_t t_cam2_dist = -42;
-fixed_t t_cam2_height = -42;
-fixed_t t_cam2_rotate = -42;
-fixed_t t_cam3_dist = -42;
-fixed_t t_cam3_height = -42;
-fixed_t t_cam3_rotate = -42;
-fixed_t t_cam4_dist = -42;
-fixed_t t_cam4_height = -42;
-fixed_t t_cam4_rotate = -42;
+consvar_t cv_screenquake = {"quakescreenshake", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t lookbackmom_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Double"}, {0, NULL}};
+
+consvar_t cv_lookbackmom[MAXSPLITSCREENPLAYERS] = {
+	{"cameralookbackmom", "Off", CV_SAVE, lookbackmom_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cameralookbackmom2", "Off", CV_SAVE, lookbackmom_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cameralookbackmom3", "Off", CV_SAVE, lookbackmom_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"cameralookbackmom4", "Off", CV_SAVE, lookbackmom_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
+
+fixed_t t_cam_rotate[MAXSPLITSCREENPLAYERS] = {-42, -42, -42, -42};
 
 #define MAXCAMERADIST 140*FRACUNIT // Max distance the camera can be in front of the player (2D mode)
 
-// Heavily simplified version of G_BuildTicCmd that only takes the local first player's control input and converts it to readable ticcmd_t
-// we then throw that ticcmd garbage in the camera and make it move
-
-// redefine this
 static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
 static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
 static fixed_t angleturn[3] = {KART_FULLTURN/2, KART_FULLTURN, KART_FULLTURN/4}; // + slow turn
+static fixed_t strafemove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16}; // faster!
 
-static ticcmd_t cameracmd;
-
-struct demofreecam_s democam;
-
-// called by m_menu to reinit cam input every time it's toggled
-void P_InitCameraCmd(void)
+void P_ToggleDemoCamera(UINT8 viewnum)
 {
-	memset(&cameracmd, 0, sizeof(ticcmd_t));	// initialize cmd
+	camera_t *cam = &camera[viewnum];
+
+	// dont toggle freecam when in spec
+	// special case since only non splitscreen can change viewpoints
+	if ((!splitscreen && players[consoleplayer].spectator) || players[displayplayers[viewnum]].spectator)
+	{
+		cam->freecam = false;
+		return;
+	}
+
+	if (!cam->freecam)	// toggle on
+	{
+		cam->freecam = true;
+		cam->button_a_held = 2;
+		cam->reset_aiming = true;
+
+		// get rid of some hud elements
+		if (displayplayers[0] != consoleplayer)
+		{
+			displayplayers[0] = consoleplayer;
+		}
+	}
+	else				// toggle off
+	{
+		cam->freecam = false;
+		G_FixCamera(viewnum+1);
+	}
 }
 
-static ticcmd_t *P_CameraCmd(camera_t *cam)
+static ticcmd_t cameracmd[MAXSPLITSCREENPLAYERS];
+static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num)
 {
-	INT32 laim, th, tspeed, forward, side, axis; //i
-	const INT32 speed = 1;
+	INT32 laim, forward, side, axis;
+
 	// these ones used for multiple conditions
-	boolean turnleft, turnright, mouseaiming;
-	boolean invertmouse, lookaxis, usejoystick, kbl;
+	boolean turnleft, turnright;
+	boolean strafeleft, straferight;
+	boolean usejoystick;
 	angle_t lang;
-	INT32 player_invert;
-	INT32 screen_invert;
+	const UINT8 forplayer = num+1;
 
-	ticcmd_t *cmd = &cameracmd;
+	SINT8 player_invert = cv_invertmouse.value ? -1 : 1; // who tf uses two mice?
 
-	(void)cam;
+	memset(&cameracmd[num], 0, sizeof(ticcmd_t));	// initialize cmd
 
-	if (!demo.playback)
-		return cmd;	// empty cmd, no.
+	ticcmd_t *cmd = &cameracmd[num];
 
-	lang = democam.localangle;
-	laim = democam.localaiming;
-	th = democam.turnheld;
-	kbl = democam.keyboardlook;
+	lang = cam->localangle;
+	laim = cam->localaiming;
 
-	G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver
+	switch (forplayer)
+	{
+		case 2:
+			G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1);
+			break;
+		case 3:
+			G_CopyTiccmd(cmd, I_BaseTiccmd3(), 1);
+			break;
+		case 4:
+			G_CopyTiccmd(cmd, I_BaseTiccmd4(), 1);
+			break;
+		case 1:
+		default:
+			G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver
+			break;
+	}
 
 	cmd->angleturn = (INT16)(lang >> 16);
 	cmd->aiming = G_ClipAimingPitch(&laim);
 
-	mouseaiming = true;
-	invertmouse = cv_invertmouse.value;
-	lookaxis = cv_lookaxis.value;
+	const boolean analogjoystickmove = cv_usejoystick[num].value && !Joystick[num].bGamepadStyle;
+	const boolean gamepadjoystickmove = cv_usejoystick[num].value && Joystick[num].bGamepadStyle;
 
-	usejoystick = true;
-	turnright = InputDown(gc_turnright, 1);
-	turnleft = InputDown(gc_turnleft, 1);
+	usejoystick = (analogjoystickmove || gamepadjoystickmove);
 
-	axis = JoyAxis(AXISTURN, 1);
+	turnright = InputDown(gc_turnright, forplayer);
+	turnleft = InputDown(gc_turnleft, forplayer);
+
+	axis = JoyAxis(AXISCAMTURN, forplayer);
 
 	if (encoremode)
 	{
@@ -3150,87 +3160,119 @@ static ticcmd_t *P_CameraCmd(camera_t *cam)
 		axis = -axis;
 	}
 
-	if (axis != 0)
+	if (usejoystick && axis != 0)
 	{
 		turnright = turnright || (axis > 0);
 		turnleft = turnleft || (axis < 0);
 	}
 	forward = side = 0;
 
-	// use two stage accelerative turning
-	// on the keyboard and joystick
-	if (turnleft || turnright)
-		th += 1;
-	else
-		th = 0;
-
-	if (th < SLOWTURNTICS)
-		tspeed = 2; // slow turn
-	else
-		tspeed = speed;
-
 	// let movement keys cancel each other out
 	if (turnright && !(turnleft))
 	{
-		cmd->angleturn = (INT16)(cmd->angleturn - (angleturn[tspeed]));
+		cmd->angleturn = (INT16)(cmd->angleturn - (angleturn[1]));
 		side += sidemove[1];
 	}
 	else if (turnleft && !(turnright))
 	{
-		cmd->angleturn = (INT16)(cmd->angleturn + (angleturn[tspeed]));
+		cmd->angleturn = (INT16)(cmd->angleturn + (angleturn[1]));
 		side -= sidemove[1];
 	}
 
+	straferight = InputDown(gc_straferight, forplayer);
+	strafeleft = InputDown(gc_strafeleft, forplayer);
+
+	axis = JoyAxis(AXISCAMSTRAFE, forplayer);
+
+	if (encoremode)
+	{
+		straferight ^= strafeleft; // swap these using three XORs
+		strafeleft ^= straferight;
+		straferight ^= strafeleft;
+		axis = -axis;
+	}
+
+	if (usejoystick && axis != 0)
+	{
+		straferight = straferight || (axis > 0);
+		strafeleft = strafeleft || (axis < 0);
+	}
+
+	// let strafe keys cancel each other out
+	if (straferight && !(strafeleft))
+	{
+		side += strafemove[1];
+	}
+	else if (strafeleft && !(straferight))
+	{
+		side -= strafemove[1];
+	}
+
 	cmd->angleturn = (INT16)(cmd->angleturn - ((mousex*(encoremode ? -1 : 1)*8)));
 
-	axis = JoyAxis(AXISMOVE, 1);
-	if (InputDown(gc_accelerate, 1) || (usejoystick && axis > 0))
-		cmd->buttons |= BT_ACCELERATE;
-	axis = JoyAxis(AXISBRAKE, 1);
-	if (InputDown(gc_brake, 1) || (usejoystick && axis > 0))
-		cmd->buttons |= BT_BRAKE;
-	axis = JoyAxis(AXISAIM, 1);
-	if (InputDown(gc_aimforward, 1) || (usejoystick && axis < 0))
+	axis = JoyAxis(AXISAIM, forplayer);
+	if (InputDown(gc_aimforward, forplayer) || (usejoystick && axis < 0))
 		forward += forwardmove[1];
-	if (InputDown(gc_aimbackward, 1) || (usejoystick && axis > 0))
+	if (InputDown(gc_aimbackward, forplayer) || (usejoystick && axis > 0))
 		forward -= forwardmove[1];
 
-	// fire with any button/key
-	axis = JoyAxis(AXISFIRE, 1);
-	if (InputDown(gc_fire, 1) || (usejoystick && axis > 0))
+	axis = JoyAxis(AXISFIRE, forplayer);
+	if (InputDown(gc_fire, forplayer) || (usejoystick && axis > 0))
 		cmd->buttons |= BT_ATTACK;
 
-	// spectator aiming shit, ahhhh...
-	player_invert = invertmouse ? -1 : 1;
-	screen_invert = 1;	// nope
+	// drift with any button/key
+	axis = JoyAxis(AXISDRIFT, forplayer);
+	if (InputDown(gc_drift, forplayer) || (usejoystick && axis > 0))
+		cmd->buttons |= BT_DRIFT;
 
-	// mouse look stuff (mouse look is not the same as mouse aim)
-	kbl = false;
+	// float and sink
+	axis = JoyAxis(AXISMOVE, forplayer);
+	if (InputDown(gc_accelerate, forplayer) || (usejoystick && axis > 0))
+		cmd->buttons |= BT_ACCELERATE;
+	axis = JoyAxis(AXISBRAKE, forplayer);
+	if (InputDown(gc_brake, forplayer) || (usejoystick && axis > 0))
+		cmd->buttons |= BT_BRAKE;
 
-	// looking up/down
-	laim += (mlooky<<19)*player_invert*screen_invert;
+	axis = JoyAxis(AXISLOOK, forplayer);
 
-	axis = JoyAxis(AXISLOOK, 1);
+	laim += (mlooky<<19)*player_invert;
 
-	// spring back if not using keyboard neither mouselookin'
-	if (!kbl && !lookaxis && !mouseaiming)
-		laim = 0;
-
-	if (InputDown(gc_lookup, 1) || (axis < 0))
+	if (InputDown(gc_lookup, forplayer) || (usejoystick && axis < 0))
 	{
-		laim += KB_LOOKSPEED * screen_invert;
-		kbl = true;
+		laim += KB_LOOKSPEED;
 	}
-	else if (InputDown(gc_lookdown, 1) || (axis > 0))
+	else if (InputDown(gc_lookdown, forplayer) || (usejoystick && axis > 0))
 	{
-		laim -= KB_LOOKSPEED * screen_invert;
-		kbl = true;
+		laim -= KB_LOOKSPEED;
 	}
 
-	if (InputDown(gc_centerview, 1)) // No need to put a spectator limit on this one though :V
+	if (InputDown(gc_centerview, forplayer)) // No need to put a spectator limit on this one though :V
+	{
 		laim = 0;
+		cam->reset_aiming = false;
+	}
 
-	cmd->aiming = G_ClipAimingPitch(&laim);
+	//if (cam->reset_aiming || ((cmd->buttons & BT_DRIFT) && !cam->button_a_held))
+	if (cam->reset_aiming)
+	{
+		INT32 aiming = laim;
+		INT32 smooth = FixedMul(ANGLE_11hh / 4, FCOS(laim));
+
+		if (abs(smooth) < abs(aiming))
+		{
+			laim -= (angle_t)(smooth * intsign(aiming));
+		}
+		else
+		{
+			laim = 0;
+			cam->reset_aiming = false; // completely smoothed out
+		}
+	}
+
+	if (!cam->reset_aiming)
+	{
+		cmd->aiming = G_ClipAimingPitch(&laim);
+	}
 
 	mousex = mousey = mlooky = 0;
 
@@ -3252,80 +3294,132 @@ static ticcmd_t *P_CameraCmd(camera_t *cam)
 
 	lang += (cmd->angleturn<<16);
 
-	democam.localangle = lang;
-	democam.localaiming = laim;
-	democam.turnheld = th;
-	democam.keyboardlook = kbl;
+	cam->localangle = lang;
+	if (!cam->reset_aiming)
+	{
+		cam->localaiming = laim;
+	}
 
 	return cmd;
 }
 
-void P_DemoCameraMovement(camera_t *cam)
+static void P_DemoCameraMovement(camera_t *cam, UINT8 num)
 {
 	ticcmd_t *cmd;
 	angle_t thrustangle;
-	mobj_t *awayviewmobj_hack;
 	player_t *lastp;
+	const UINT8 forplayer = num+1;
 
-	// update democam stuff with what we got here:
-	democam.cam = cam;
-	democam.localangle = cam->angle;
-	democam.localaiming = cam->aiming;
+	cam->localangle = cam->angle;
+	cam->localaiming = cam->aiming;
 
 	// first off we need to get button input
-	cmd = P_CameraCmd(cam);
+	cmd = P_CameraCmd(cam, num);
 
-	cam->aiming = cmd->aiming<<FRACBITS;
-	cam->angle = cmd->angleturn<<16;
+	// make sure we dont aim away during reset
+	if (!cam->reset_aiming)
+	{
+		cam->aiming = cmd->aiming << FRACBITS;
+	}
+
+	cam->angle = cmd->angleturn << 16;
 
 	// camera movement:
+	if (!cam->button_a_held)
+	{
+		fixed_t spd = (32*mapobjectscale*cv_freecam_speed[num].value);
+		int dir = ((cmd->buttons & BT_ACCELERATE || InputDown(gc_camfloat, forplayer)) ? 1 : 0) + ((cmd->buttons & BT_BRAKE || InputDown(gc_camsink, forplayer)) ? -1 : 0);
+		cam->z += spd * dir;
+	}
 
-	if (cmd->buttons & BT_ACCELERATE)
-		cam->z += 32*mapobjectscale;
-	else if (cmd->buttons & BT_BRAKE)
-		cam->z -= 32*mapobjectscale;
+	if (!(cmd->buttons & (BT_ACCELERATE | BT_DRIFT) || InputDown(gc_camfloat, forplayer)) && cam->button_a_held)
+	{
+		cam->button_a_held--;
+	}
 
 	// if you hold item, you will lock on to displayplayer. (The last player you were ""f12-ing"")
-	if (cmd->buttons & BT_ATTACK)
+	// this feels kinda pointless for ingame freecam so keep it for replays only
+	if (demo.playback && cmd->buttons & BT_ATTACK)
 	{
 		lastp = &players[displayplayers[0]];	// Fun fact, I was trying displayplayers[0]->mo as if it was Lua like an absolute idiot.
+
+		const fixed_t dist = R_PointToDist2(cam->x, cam->y, lastp->mo->x, lastp->mo->y);
 		cam->angle = R_PointToAngle2(cam->x, cam->y, lastp->mo->x, lastp->mo->y);
-		cam->aiming = R_PointToAngle2(0, cam->z, R_PointToDist2(cam->x, cam->y, lastp->mo->x, lastp->mo->y), lastp->mo->z + lastp->mo->scale*128*P_MobjFlip(lastp->mo));	// This is still unholy. Aim a bit above their heads.
+		cam->aiming = R_PointToAngle2(0, cam->z, dist, lastp->mo->z + lastp->mo->scale*128*P_MobjFlip(lastp->mo));	// This is still unholy. Aim a bit above their heads.
+		cam->reset_aiming = false;
+	}
+
+	if (InputDown(gc_centerview, forplayer)) // No need to put a spectator limit on this one though :V
+	{
+		cam->aiming = 0;
+		cam->reset_aiming = false;
+	}
+
+	// After switching to democam, the vertical angle of
+	// chasecam is inherited. This is intentional because it
+	// creates a smooth transition. However, moving
+	// forward/back will have a slope. So, as long as democam
+	// controls haven't been used to alter the vertical angle,
+	// slowly reset it to flat.
+	//if (cam->reset_aiming || ((cmd->buttons & BT_DRIFT) && !cam->button_a_held))
+	if (cam->reset_aiming)
+	{
+		INT32 aiming = cam->aiming;
+		INT32 smooth = FixedMul(ANGLE_11hh / 4, FCOS(cam->aiming));
+
+		if (abs(smooth) < abs(aiming))
+		{
+			cam->aiming -= smooth * intsign(aiming);
+		}
+		else
+		{
+			cam->aiming = 0;
+			cam->reset_aiming = false; // completely smoothed out
+		}
 	}
 
 	cam->momx = cam->momy = cam->momz = 0;
 	if (cmd->forwardmove != 0)
 	{
+		fixed_t spd = cmd->forwardmove*mapobjectscale*cv_freecam_speed[num].value;
 
 		thrustangle = cam->angle >> ANGLETOFINESHIFT;
 
-		cam->x += FixedMul(cmd->forwardmove*mapobjectscale, FINECOSINE(thrustangle));
-		cam->y += FixedMul(cmd->forwardmove*mapobjectscale, FINESINE(thrustangle));
-		cam->z += FixedMul(cmd->forwardmove*mapobjectscale, AIMINGTOSLOPE(cam->aiming));
+		cam->x += FixedMul(spd, FINECOSINE(thrustangle));
+		cam->y += FixedMul(spd, FINESINE(thrustangle));
+		if (!cam->reset_aiming)
+		{
+			cam->z += FixedMul(spd, AIMINGTOSLOPE(cam->aiming));
+		}
+
 		// momentums are useless here, directly add to the coordinates
 
 		// this.......... doesn't actually check for floors and walls and whatnot but the function to do that is a pure mess so fuck that.
 		// besides freecam going inside walls sounds pretty cool on paper.
 	}
 
-	// awayviewmobj hack; this is to prevent us from hearing sounds from the player's perspective
+	// cmd->strafemove -- cant really add stuff to ticcmd struct so im reusing this
+	if (cmd->sidemove != 0) // was disabled in practice anyways, since sidemove was suppressed
+	{
+		//False I fixed this shit - Nep
+		fixed_t spd = cmd->sidemove*mapobjectscale*cv_freecam_speed[num].value;
 
-	awayviewmobj_hack = P_SpawnMobj(cam->x, cam->y, cam->z, MT_THOK);
-	awayviewmobj_hack->tics = 2;
-	awayviewmobj_hack->flags2 |= MF2_DONTDRAW;
-
-	democam.soundmobj = awayviewmobj_hack;
+		thrustangle = (cam->angle-ANGLE_90) >> ANGLETOFINESHIFT;
+		cam->x += FixedMul(spd, FINECOSINE(thrustangle));
+		cam->y += FixedMul(spd, FINESINE(thrustangle));
+	}
 
 	// update subsector to avoid crashes;
-	cam->subsector = R_PointInSubsector(cam->x, cam->y);
+	cam->subsector = R_PointInSubsectorFast(cam->x, cam->y);
 }
 
 void P_ResetCamera(player_t *player, camera_t *thiscam)
 {
 	tic_t tries = 0;
 	fixed_t x, y, z;
+	UINT8 i;
 
-	if (demo.freecam)
+	if (thiscam->freecam)
 		return;	// do not reset the camera there.
 
 	if (!player->mo)
@@ -3348,325 +3442,39 @@ void P_ResetCamera(player_t *player, camera_t *thiscam)
 	thiscam->z = z;
 	thiscam->reset = true;
 
-	if (!(thiscam == &camera[0] && (cv_cam_still.value || cv_analog.value))
-		&& !(thiscam == &camera[1] && (cv_cam2_still.value || cv_analog2.value))
-		&& !(thiscam == &camera[2] && (cv_cam3_still.value || cv_analog3.value))
-		&& !(thiscam == &camera[3] && (cv_cam4_still.value || cv_analog4.value)))
+	for (i = 0; i <= splitscreen; i++)
 	{
-		thiscam->angle = player->mo->angle;
-		thiscam->aiming = 0;
+		if (!(thiscam == &camera[i] && cv_cam_still[i].value))
+		{
+			thiscam->angle = player->mo->angle;
+			thiscam->aiming = 0;
+			break;
+		}
 	}
+
 	thiscam->relativex = 0;
 
-	thiscam->subsector = R_PointInSubsector(thiscam->x,thiscam->y);
+	thiscam->subsector = R_PointInSubsectorFast(thiscam->x,thiscam->y);
 
 	thiscam->radius = 20*FRACUNIT;
 	thiscam->height = 16*FRACUNIT;
 
+	thiscam->reset_aiming = true;
+
 	while (!P_MoveChaseCamera(player,thiscam,true) && ++tries < 2*TICRATE);
 }
 
-boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcalled)
-{
-	static boolean lookbackactive[MAXSPLITSCREENPLAYERS];
-	static UINT8 lookbackdelay[MAXSPLITSCREENPLAYERS];
-	UINT8 num;
-	angle_t angle = 0, focusangle = 0, focusaiming = 0;
-	fixed_t x, y, z, dist, viewpointx, viewpointy, camspeed, camdist, camheight, pviewheight;
-	fixed_t pan, xpan, ypan;
-	INT32 camrotate;
-	boolean camstill, lookback, lookbackdown;
-	UINT8 timeover;
-	mobj_t *mo;
-	fixed_t f1, f2;
-#ifndef NOCLIPCAM
-	boolean cameranoclip;
-	subsector_t *newsubsec;
-#endif
-
-	democam.soundmobj = NULL;	// reset this each frame, we don't want the game crashing for stupid reasons now do we
-
-	// We probably shouldn't move the camera if there is no player or player mobj somehow
-	if (!player || !player->mo)
-		return true;
-
-	// This can happen when joining
-	if (thiscam->subsector == NULL || thiscam->subsector->sector == NULL)
-		return true;
-
-	if (demo.freecam)
-	{
-		P_DemoCameraMovement(thiscam);
-		return true;
-	}
-
-	mo = player->mo;
-
-#ifndef NOCLIPCAM
-	cameranoclip = ((player->pflags & (PF_NOCLIP|PF_NIGHTSMODE))
-		|| (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)) // Noclipping player camera noclips too!!
-		|| (leveltime < introtime)); // Kart intro cam
-#endif
-
-	if (player->pflags & PF_TIMEOVER) // 1 for momentum keep, 2 for turnaround
-		timeover = (player->kartstuff[k_timeovercam] > 2*TICRATE ? 2 : 1);
-	else
-		timeover = 0;
-
-	if (!(player->playerstate == PST_DEAD || player->exiting))
-	{
-		if (player->spectator) // force cam off for spectators
-			return true;
-
-		if (!cv_chasecam.value && thiscam == &camera[0])
-			return true;
-
-		if (!cv_chasecam2.value && thiscam == &camera[1])
-			return true;
-
-		if (!cv_chasecam3.value && thiscam == &camera[2])
-			return true;
-
-		if (!cv_chasecam4.value && thiscam == &camera[3])
-			return true;
-	}
-
-	if (!thiscam->chase && !resetcalled)
-	{
-		if (player == &players[consoleplayer])
-			focusangle = localangle[0];
-		else if (player == &players[displayplayers[1]])
-			focusangle = localangle[1];
-		else if (player == &players[displayplayers[2]])
-			focusangle = localangle[2];
-		else if (player == &players[displayplayers[3]])
-			focusangle = localangle[3];
-		else
-			focusangle = mo->angle;
-
-		if (thiscam == &camera[0])
-			camrotate = cv_cam_rotate.value;
-		else if (thiscam == &camera[1])
-			camrotate = cv_cam2_rotate.value;
-		else if (thiscam == &camera[2])
-			camrotate = cv_cam3_rotate.value;
-		else if (thiscam == &camera[3])
-			camrotate = cv_cam4_rotate.value;
-		else
-			camrotate = 0;
-
-		if (leveltime < introtime) // Whoooshy camera!
-		{
-			const INT32 introcam = (introtime - leveltime);
-			camrotate += introcam*5;
-		}
-
-		thiscam->angle = focusangle + FixedAngle(camrotate*FRACUNIT);
-		P_ResetCamera(player, thiscam);
-		return true;
-	}
-
-	thiscam->radius = 20*mapobjectscale;
-	thiscam->height = 16*mapobjectscale;
-
-	// Don't run while respawning from a starpost
-	// Inu 4/8/13 Why not?!
-//	if (leveltime > 0 && timeinmap <= 0)
-//		return true;
-
-	if (demo.playback)
-	{
-		focusangle = mo->angle;
-		focusaiming = 0;
-	}
-	else if (player == &players[consoleplayer])
-	{
-		focusangle = localangle[0];
-		focusaiming = localaiming[0];
-	}
-	else if (player == &players[displayplayers[1]])
-	{
-		focusangle = localangle[1];
-		focusaiming = localaiming[1];
-	}
-	else if (player == &players[displayplayers[2]])
-	{
-		focusangle = localangle[2];
-		focusaiming = localaiming[2];
-	}
-	else if (player == &players[displayplayers[3]])
-	{
-		focusangle = localangle[3];
-		focusaiming = localaiming[3];
-	}
-	else
-	{
-		focusangle = mo->angle;
-		focusaiming = player->aiming;
-	}
-
-	if (P_CameraThinker(player, thiscam, resetcalled))
-		return true;
-
-	if (thiscam == &camera[1]) // Camera 2
-	{
-		num = 1;
-		camspeed = cv_cam2_speed.value;
-		camstill = cv_cam2_still.value;
-		camrotate = cv_cam2_rotate.value;
-		camdist = FixedMul(cv_cam2_dist.value, mapobjectscale);
-		camheight = FixedMul(cv_cam2_height.value, mapobjectscale);
-		lookback = camspin[1];
-	}
-	else if (thiscam == &camera[2]) // Camera 3
-	{
-		num = 2;
-		camspeed = cv_cam3_speed.value;
-		camstill = cv_cam3_still.value;
-		camrotate = cv_cam3_rotate.value;
-		camdist = FixedMul(cv_cam3_dist.value, mapobjectscale);
-		camheight = FixedMul(cv_cam3_height.value, mapobjectscale);
-		lookback = camspin[2];
-	}
-	else if (thiscam == &camera[3]) // Camera 4
-	{
-		num = 3;
-		camspeed = cv_cam4_speed.value;
-		camstill = cv_cam4_still.value;
-		camrotate = cv_cam4_rotate.value;
-		camdist = FixedMul(cv_cam4_dist.value, mapobjectscale);
-		camheight = FixedMul(cv_cam4_height.value, mapobjectscale);
-		lookback = camspin[3];
-	}
-	else // Camera 1
-	{
-		num = 0;
-		camspeed = cv_cam_speed.value;
-		camstill = cv_cam_still.value;
-		camrotate = cv_cam_rotate.value;
-		camdist = FixedMul(cv_cam_dist.value, mapobjectscale);
-		camheight = FixedMul(cv_cam_height.value, mapobjectscale);
-		lookback = camspin[0];
-	}
-
-	if (timeover)
-	{
-		const INT32 timeovercam = max(0, min(180, (player->kartstuff[k_timeovercam] - 2*TICRATE)*15));
-		camrotate += timeovercam;
-	}
-	else if (leveltime < introtime && !(modeattacking && !demo.playback)) // Whoooshy camera! (don't do this in RA when we PLAY, still do it in replays however~)
-	{
-		const INT32 introcam = (introtime - leveltime);
-		camrotate += introcam*5;
-		camdist += (introcam * mapobjectscale)*3;
-		camheight += (introcam * mapobjectscale)*2;
-	}
-	else if (player->exiting) // SRB2Kart: Leave the camera behind while exiting, for dramatic effect!
-		camstill = true;
-	else if (lookback || lookbackdelay[num]) // SRB2kart - Camera flipper
-	{
-#define MAXLOOKBACKDELAY 2
-		camspeed = FRACUNIT;
-		if (lookback)
-		{
-			camrotate += 180;
-			lookbackdelay[num] = MAXLOOKBACKDELAY;
-		}
-		else
-			lookbackdelay[num]--;
-	}
-	lookbackdown = (lookbackdelay[num] == MAXLOOKBACKDELAY) != lookbackactive[num];
-	lookbackactive[num] = (lookbackdelay[num] == MAXLOOKBACKDELAY);
-#undef MAXLOOKBACKDELAY
-
-	if (mo->eflags & MFE_VERTICALFLIP)
-		camheight += thiscam->height;
-
-	if (camspeed > FRACUNIT)
-		camspeed = FRACUNIT;
-
-	if (timeover)
-		angle = mo->angle + FixedAngle(camrotate*FRACUNIT);
-	else if (leveltime < starttime)
-		angle = focusangle + FixedAngle(camrotate*FRACUNIT);
-	else if (camstill || resetcalled || player->playerstate == PST_DEAD)
-		angle = thiscam->angle;
-	else
-	{
-		if (camspeed == FRACUNIT)
-			angle = focusangle + FixedAngle(camrotate<<FRACBITS);
-		else
-		{
-			angle_t input = focusangle + FixedAngle(camrotate<<FRACBITS) - thiscam->angle;
-			boolean invert = (input > ANGLE_180);
-			if (invert)
-				input = InvAngle(input);
-
-			input = FixedAngle(FixedMul(AngleFixed(input), camspeed));
-			if (invert)
-				input = InvAngle(input);
-
-			angle = thiscam->angle + input;
-		}
-	}
-
-	if (!resetcalled && (leveltime > starttime && timeover != 2)
-		&& ((thiscam == &camera[0] && t_cam_rotate != -42)
-		|| (thiscam == &camera[1] && t_cam2_rotate != -42)
-		|| (thiscam == &camera[2] && t_cam3_rotate != -42)
-		|| (thiscam == &camera[3] && t_cam4_rotate != -42)))
-	{
-		angle = FixedAngle(camrotate*FRACUNIT);
-		thiscam->angle = angle;
-	}
-
-	// sets ideal cam pos
-	dist = camdist;
-
-	if (player->speed > K_GetKartSpeed(player, false))
-		dist += 4*(player->speed - K_GetKartSpeed(player, false));
-	dist += abs(thiscam->momz)/4;
-
-	if (player->kartstuff[k_boostcam])
-		dist -= FixedMul(11*dist/16, player->kartstuff[k_boostcam]);
-
-	x = mo->x - FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
-	y = mo->y - FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
-
-	// SRB2Kart: set camera panning
-	if (camstill || resetcalled || player->playerstate == PST_DEAD)
-		pan = xpan = ypan = 0;
-	else
-	{
-		if (player->kartstuff[k_drift] != 0)
-		{
-			fixed_t panmax = (dist/5);
-			pan = FixedDiv(FixedMul(min((fixed_t)player->kartstuff[k_driftcharge], K_GetKartDriftSparkValue(player)), panmax), K_GetKartDriftSparkValue(player));
-			if (pan > panmax)
-				pan = panmax;
-			if (player->kartstuff[k_drift] < 0)
-				pan *= -1;
-		}
-		else
-			pan = 0;
-
-		pan = thiscam->pan + FixedMul(pan - thiscam->pan, camspeed/4);
-
-		xpan = FixedMul(FINECOSINE(((angle+ANGLE_90)>>ANGLETOFINESHIFT) & FINEMASK), pan);
-		ypan = FixedMul(FINESINE(((angle+ANGLE_90)>>ANGLETOFINESHIFT) & FINEMASK), pan);
-
-		x += xpan;
-		y += ypan;
-	}
-
-	pviewheight = FixedMul(32<<FRACBITS, mo->scale);
-
-	if (mo->eflags & MFE_VERTICALFLIP)
-		z = mo->z + mo->height - pviewheight - camheight;
-	else
-		z = mo->z + pviewheight + camheight;
-
 #ifndef NOCLIPCAM // Disable all z-clipping for noclip cam
+static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam, fixed_t x, fixed_t y, fixed_t z, boolean resetcalled)
+{
+	subsector_t *newsubsec;
+	boolean cameranoclip;
+	mobj_t *mo = player->mo;
+
+	cameranoclip = ((player->pflags & (PF_NOCLIP|PF_NIGHTSMODE))
+	|| (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)) // Noclipping player camera noclips too!!
+	|| (leveltime < introtime)); // Kart intro cam
+
 	// move camera down to move under lower ceilings
 	newsubsec = R_IsPointInSubsector(((mo->x>>FRACBITS) + (thiscam->x>>FRACBITS))<<(FRACBITS-1), ((mo->y>>FRACBITS) + (thiscam->y>>FRACBITS))<<(FRACBITS-1));
 
@@ -3708,7 +3516,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 			for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
 			{
 				fixed_t topheight, bottomheight;
-				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
+				if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 					continue;
 
 				topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -3725,84 +3533,86 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 			}
 		}
 
-	// Check polyobjects and see if floorz/ceilingz need to be altered
-	{
-		INT32 xl, xh, yl, yh, bx, by;
-		validcount++;
+		// Check polyobjects and see if floorz/ceilingz need to be altered
+		{
+			INT32 xl, xh, yl, yh, bx, by;
+			validcount++;
 
-		xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
-		xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
-		yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
-		yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
+			xl = (unsigned)(tmbbox[BOXLEFT] - bmaporgx)>>MAPBLOCKSHIFT;
+			xh = (unsigned)(tmbbox[BOXRIGHT] - bmaporgx)>>MAPBLOCKSHIFT;
+			yl = (unsigned)(tmbbox[BOXBOTTOM] - bmaporgy)>>MAPBLOCKSHIFT;
+			yh = (unsigned)(tmbbox[BOXTOP] - bmaporgy)>>MAPBLOCKSHIFT;
 
-		BMBOUNDFIX(xl, xh, yl, yh);
+			BMBOUNDFIX(xl, xh, yl, yh);
 
-		for (by = yl; by <= yh; by++)
-			for (bx = xl; bx <= xh; bx++)
+			for (by = yl; by <= yh; by++)
 			{
-				INT32 offset;
-				polymaplink_t *plink; // haleyjd 02/22/06
-
-				if (bx < 0 || by < 0 || bx >= bmapwidth || by >= bmapheight)
-					continue;
-
-				offset = by*bmapwidth + bx;
-
-				// haleyjd 02/22/06: consider polyobject lines
-				plink = polyblocklinks[offset];
-
-				while (plink)
+				for (bx = xl; bx <= xh; bx++)
 				{
-					polyobj_t *po = plink->po;
+					INT32 offset;
+					polymaplink_t *plink; // haleyjd 02/22/06
 
-					if (po->validcount != validcount) // if polyobj hasn't been checked
+					if (bx < 0 || by < 0 || bx >= bmapwidth || by >= bmapheight)
+						continue;
+
+					offset = by*bmapwidth + bx;
+
+					// haleyjd 02/22/06: consider polyobject lines
+					plink = polyblocklinks[offset];
+
+					while (plink)
 					{
-						sector_t *polysec;
-						fixed_t delta1, delta2, thingtop;
-						fixed_t polytop, polybottom;
+						polyobj_t *po = plink->po;
 
-						po->validcount = validcount;
-
-						if (!P_PointInsidePolyobj(po, x, y) || !(po->flags & POF_SOLID))
+						if (po->validcount != validcount) // if polyobj hasn't been checked
 						{
-							plink = (polymaplink_t *)(plink->link.next);
-							continue;
+							sector_t *polysec;
+							fixed_t delta1, delta2, thingtop;
+							fixed_t polytop, polybottom;
+
+							po->validcount = validcount;
+
+							if (!P_PointInsidePolyobj(po, x, y) || !(po->flags & POF_SOLID))
+							{
+								plink = (polymaplink_t *)(plink->link.next);
+								continue;
+							}
+
+							// We're inside it! Yess...
+							polysec = po->lines[0]->backsector;
+
+							if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
+							{ // Camera noclip polyobj.
+								plink = (polymaplink_t *)(plink->link.next);
+								continue;
+							}
+
+							if (po->flags & POF_CLIPPLANES)
+							{
+								polytop = polysec->ceilingheight;
+								polybottom = polysec->floorheight;
+							}
+							else
+							{
+								polytop = INT32_MAX;
+								polybottom = INT32_MIN;
+							}
+
+							thingtop = midz + thiscam->height;
+							delta1 = midz - (polybottom + ((polytop - polybottom)/2));
+							delta2 = thingtop - (polybottom + ((polytop - polybottom)/2));
+
+							if (polytop > myfloorz && abs(delta1) < abs(delta2))
+								myfloorz = polytop;
+
+							if (polybottom < myceilingz && abs(delta1) >= abs(delta2))
+								myceilingz = polybottom;
 						}
-
-						// We're inside it! Yess...
-						polysec = po->lines[0]->backsector;
-
-						if (GETSECSPECIAL(polysec->special, 4) == 12)
-						{ // Camera noclip polyobj.
-							plink = (polymaplink_t *)(plink->link.next);
-							continue;
-						}
-
-						if (po->flags & POF_CLIPPLANES)
-						{
-							polytop = polysec->ceilingheight;
-							polybottom = polysec->floorheight;
-						}
-						else
-						{
-							polytop = INT32_MAX;
-							polybottom = INT32_MIN;
-						}
-
-						thingtop = midz + thiscam->height;
-						delta1 = midz - (polybottom + ((polytop - polybottom)/2));
-						delta2 = thingtop - (polybottom + ((polytop - polybottom)/2));
-
-						if (polytop > myfloorz && abs(delta1) < abs(delta2))
-							myfloorz = polytop;
-
-						if (polybottom < myceilingz && abs(delta1) >= abs(delta2))
-							myceilingz = polybottom;
+						plink = (polymaplink_t *)(plink->link.next);
 					}
-					plink = (polymaplink_t *)(plink->link.next);
 				}
 			}
-	}
+		}
 
 		// crushed camera
 		if (myceilingz <= myfloorz + thiscam->height && !resetcalled && !cameranoclip)
@@ -3827,7 +3637,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 			for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
 			{
 				fixed_t topheight, bottomheight;
-				if ((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)
+				if (UNLIKELY((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
 				{
 					topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
 					bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
@@ -3855,6 +3665,284 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 
 	if (thiscam->z < thiscam->floorz && !cameranoclip)
 		thiscam->z = thiscam->floorz;
+
+	return false;
+}
+#endif
+
+static void P_MoveCameraToSpawn(UINT8 playernum)
+{
+	camera_t *thiscam = &camera[playernum];
+	player_t *player = playernum == 0 ? &players[consoleplayer] : &players[displayplayers[playernum]];
+
+	if (!thiscam || !player->mo)
+		return;
+
+	thiscam->x = player->mo->x - P_ReturnThrustX(player->mo, thiscam->angle, player->mo->radius);
+	thiscam->y = player->mo->y - P_ReturnThrustY(player->mo, thiscam->angle, player->mo->radius);
+	if (player->mo->eflags & MFE_VERTICALFLIP)
+		thiscam->z = player->mo->z + player->mo->height - (32<<FRACBITS) - 16*FRACUNIT;
+	else
+		thiscam->z = player->mo->z + (32<<FRACBITS);
+
+	thiscam->reset = true;
+
+	thiscam->angle = player->mo->angle;
+	thiscam->aiming = 0;
+
+	thiscam->subsector = R_PointInSubsectorFast(thiscam->x,thiscam->y);
+
+	thiscam->reset_aiming = true;
+
+	R_ResetViewInterpolation(playernum);
+}
+
+boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcalled)
+{
+	static boolean lookbackactive[MAXSPLITSCREENPLAYERS];
+	static UINT8 lookbackdelay[MAXSPLITSCREENPLAYERS];
+	UINT8 num = 0;
+	angle_t angle = 0, focusangle = 0, focusaiming = 0;
+	fixed_t x, y, z, dist, viewpointx, viewpointy, camspeed, camdist, camheight, pviewheight;
+	fixed_t pan, xpan, ypan;
+	INT32 camrotate;
+	boolean camstill, lookback, lookbackdown;
+	UINT8 timeover;
+	mobj_t *mo;
+	fixed_t f1, f2;
+
+	// We probably shouldn't move the camera if there is no player or player mobj somehow
+	if (!player || !player->mo)
+		return true;
+
+	// This can happen when joining
+	if (thiscam->subsector == NULL || thiscam->subsector->sector == NULL)
+		return true;
+
+	for (UINT8 i = 0; i <= splitscreen; i++)
+	{
+		if (thiscam == &camera[i])
+		{
+			num = i;
+			break;
+		}
+	}
+
+	if (thiscam->freecam || player->spectator)
+	{
+		// idk if this is the best place?
+		if (player->spectator && InputDown(gc_freecam, num+1))
+		{
+			P_MoveCameraToSpawn(num);
+			return true; // dont move while you hold this
+		}
+
+		P_DemoCameraMovement(thiscam, num);
+		P_CalcChasePostImg(player, thiscam);
+		return true;
+	}
+
+	if (paused || P_AutoPause())
+		return true;
+
+	mo = player->mo;
+
+	const boolean vflip = (mo->eflags & MFE_VERTICALFLIP);
+
+	if (cv_cam_timeover[num].value && (player->pflags & PF_TIMEOVER))
+		timeover = (player->kartstuff[k_timeovercam] > 2*TICRATE ? 2 : 1); // 1 for momentum keep, 2 for turnaround
+	else
+		timeover = 0;
+
+	if (!(player->playerstate == PST_DEAD || player->exiting))
+	{
+		if (player->spectator) // force cam off for spectators
+			return true;
+
+		if (!cv_chasecam[num].value && thiscam == &camera[num])
+			return true;
+	}
+
+	if (!thiscam->chase && !resetcalled)
+	{
+		focusangle = ((P_IsLocalPlayer(player)) ? localangle[num] : mo->angle);
+		camrotate = ((thiscam == &camera[num]) ? cv_cam_rotate[num].value : 0);
+
+		if (leveltime < introtime) // Whoooshy camera!
+		{
+			const INT32 introcam = (introtime - leveltime);
+			camrotate += introcam*5;
+		}
+
+		thiscam->angle = focusangle + FixedAngle(camrotate*FRACUNIT);
+		P_ResetCamera(player, thiscam);
+		return true;
+	}
+
+	thiscam->radius = 20*mapobjectscale;
+	thiscam->height = 16*mapobjectscale;
+
+	if (demo.playback)
+	{
+		focusangle = mo->angle;
+		focusaiming = 0;
+	}
+	else if (P_IsLocalPlayer(player))
+	{
+		focusangle = localangle[num];
+		focusaiming = localaiming[num];
+	}
+	else
+	{
+		focusangle = mo->angle;
+		focusaiming = player->aiming;
+	}
+
+	if (abs(thiscam->dpad_y_held) >= 2*TICRATE)
+	{
+		focusaiming += ANGLE_45 * intsign(thiscam->dpad_y_held) * P_MobjFlip(mo);
+	}
+
+	if (P_CameraThinker(player, thiscam, resetcalled))
+		return true;
+
+	camspeed = cv_cam_speed[num].value;
+	camstill = cv_cam_still[num].value;
+	camrotate = cv_cam_rotate[num].value;
+	camdist = FixedMul(cv_cam_dist[num].value, mapobjectscale);
+	camheight = FixedMul(cv_cam_height[num].value, mapobjectscale);
+	lookback = camspin[num];
+
+	if (timeover)
+	{
+		const INT32 timeovercam = max(0, min(180, (player->kartstuff[k_timeovercam] - 2*TICRATE)*15));
+		camrotate += timeovercam;
+	}
+	else if (leveltime < introtime && !(modeattacking && !demo.playback)) // Whoooshy camera! (don't do this in RA when we PLAY, still do it in replays however~)
+	{
+		const INT32 introcam = (introtime - leveltime);
+		camrotate += introcam*5;
+		camdist += (introcam * mapobjectscale)*3;
+		camheight += (introcam * mapobjectscale)*2;
+	}
+	else if (player->exiting) // SRB2Kart: Leave the camera behind while exiting, for dramatic effect!
+	{
+		camstill = true;
+	}
+	else if (lookback || lookbackdelay[num]) // SRB2kart - Camera flipper
+	{
+#define MAXLOOKBACKDELAY 2
+		camspeed = FRACUNIT;
+		if (lookback)
+		{
+			camrotate += 180;
+			lookbackdelay[num] = MAXLOOKBACKDELAY;
+		}
+		else
+			lookbackdelay[num]--;
+	}
+
+	lookbackdown = (lookbackdelay[num] == MAXLOOKBACKDELAY) != lookbackactive[num];
+	lookbackactive[num] = (lookbackdelay[num] == MAXLOOKBACKDELAY);
+#undef MAXLOOKBACKDELAY
+
+	if (vflip)
+		camheight += thiscam->height;
+
+	if (camspeed > FRACUNIT)
+		camspeed = FRACUNIT;
+
+	if (timeover)
+	{
+		angle = mo->angle + FixedAngle(camrotate*FRACUNIT);
+	}
+	else if (leveltime < starttime)
+	{
+		angle = focusangle + FixedAngle(camrotate*FRACUNIT);
+	}
+	else if (camstill || resetcalled || player->playerstate == PST_DEAD)
+	{
+		angle = thiscam->angle;
+	}
+	else
+	{
+		if (camspeed == FRACUNIT)
+		{
+			angle = focusangle + FixedAngle(camrotate<<FRACBITS);
+		}
+		else
+		{
+			angle_t input = focusangle + FixedAngle(camrotate<<FRACBITS) - thiscam->angle;
+			boolean invert = (input > ANGLE_180);
+			if (invert)
+				input = InvAngle(input);
+
+			input = FixedAngle(FixedMul(AngleFixed(input), camspeed));
+			if (invert)
+				input = InvAngle(input);
+
+			angle = thiscam->angle + input;
+		}
+	}
+
+	if (!resetcalled && (leveltime > starttime && timeover != 2)
+		&& (thiscam == &camera[num] && t_cam_rotate[num] != -42))
+	{
+		angle = FixedAngle(camrotate*FRACUNIT);
+		thiscam->angle = angle;
+	}
+
+	// sets ideal cam pos
+	dist = camdist;
+
+	if (player->speed > K_GetKartSpeed(player, false))
+		dist += 4*(player->speed - K_GetKartSpeed(player, false));
+	dist += abs(thiscam->momz)/4;
+
+	if (player->kartstuff[k_boostcam])
+		dist -= FixedMul(11*dist/16, player->kartstuff[k_boostcam]);
+
+	x = mo->x - FixedMul(FINECOSINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+	y = mo->y - FixedMul(FINESINE((angle>>ANGLETOFINESHIFT) & FINEMASK), dist);
+
+	// SRB2Kart: set camera panning
+	if (camstill || resetcalled || player->playerstate == PST_DEAD)
+	{
+		pan = xpan = ypan = 0;
+	}
+	else
+	{
+		if (player->kartstuff[k_drift] != 0)
+		{
+			fixed_t panmax = (dist/5);
+			pan = FixedDiv(FixedMul(min((fixed_t)player->kartstuff[k_driftcharge], K_GetKartDriftSparkValue(player)), panmax), K_GetKartDriftSparkValue(player));
+			if (pan > panmax)
+				pan = panmax;
+			if (player->kartstuff[k_drift] < 0)
+				pan *= -1;
+		}
+		else
+			pan = 0;
+
+		pan = thiscam->pan + FixedMul(pan - thiscam->pan, camspeed/4);
+
+		xpan = FixedMul(FINECOSINE(((angle+ANGLE_90)>>ANGLETOFINESHIFT) & FINEMASK), pan);
+		ypan = FixedMul(FINESINE(((angle+ANGLE_90)>>ANGLETOFINESHIFT) & FINEMASK), pan);
+
+		x += xpan;
+		y += ypan;
+	}
+
+	pviewheight = FixedMul(32<<FRACBITS, mo->scale);
+
+	if (vflip)
+		z = mo->z + mo->height - pviewheight - camheight;
+	else
+		z = mo->z + pviewheight + camheight;
+
+#ifndef NOCLIPCAM // Disable all z-clipping for noclip cam
+	if (P_CheckNoclipCameraPosition(player, thiscam, x, y, z, resetcalled))
+		return true;
 #endif // NOCLIPCAM
 
 	// point viewed by the camera
@@ -3875,7 +3963,9 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 		thiscam->momz = 0;
 	}
 	else if (player->exiting || timeover == 2)
+	{
 		thiscam->momx = thiscam->momy = thiscam->momz = 0;
+	}
 	else if (leveltime < starttime)
 	{
 		thiscam->momx = FixedMul(x - thiscam->x, camspeed);
@@ -3886,6 +3976,16 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	{
 		thiscam->momx = x - thiscam->x;
 		thiscam->momy = y - thiscam->y;
+
+		// when looking back, camera's momentum
+		// should inherit the momentum of the player
+		// if value is 2, add extra
+		if (cv_lookbackmom[num].value && lookback && lookbackdelay[num])
+		{
+			thiscam->momx += cv_lookbackmom[num].value*mo->momx;
+			thiscam->momy += cv_lookbackmom[num].value*mo->momy;
+		}
+
 		thiscam->momz = FixedMul(z - thiscam->z, camspeed/2);
 	}
 
@@ -3896,7 +3996,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	f2 = viewpointy-thiscam->y;
 	dist = FixedHypot(f1, f2);
 
-	if (mo->eflags & MFE_VERTICALFLIP)
+	if (vflip)
 		angle = R_PointToAngle2(0, thiscam->z + thiscam->height, dist, mo->z + mo->height - P_GetPlayerHeight(player));
 	else
 		angle = R_PointToAngle2(0, thiscam->z, dist, mo->z + P_GetPlayerHeight(player));
@@ -3904,12 +4004,14 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	if (player->playerstate != PST_DEAD && !((player->pflags & PF_NIGHTSMODE) && player->exiting))
 		angle += (focusaiming < ANGLE_180 ? focusaiming/2 : InvAngle(InvAngle(focusaiming)/2)); // overcomplicated version of '((signed)focusaiming)/2;'
 
-	if (twodlevel || (mo->flags2 & MF2_TWOD) || (!camstill && !timeover)) // Keep the view still...
+	if (!camstill && !timeover) // Keep the view still...
 	{
 		G_ClipAimingPitch((INT32 *)&angle);
 
 		if (camspeed == FRACUNIT)
+		{
 			thiscam->aiming = angle;
+		}
 		else
 		{
 			angle_t input;
@@ -3932,12 +4034,13 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	{
 		// Don't let the camera match your movement.
 		thiscam->momz = 0;
+
 		if (player->spectator)
 			thiscam->aiming = 0;
 		// Only let the camera go a little bit downwards.
-		else if (!(mo->eflags & MFE_VERTICALFLIP) && thiscam->aiming < ANGLE_337h && thiscam->aiming > ANGLE_180)
+		else if (!vflip && thiscam->aiming < ANGLE_337h && thiscam->aiming > ANGLE_180)
 			thiscam->aiming = ANGLE_337h;
-		else if (mo->eflags & MFE_VERTICALFLIP && thiscam->aiming > ANGLE_22h && thiscam->aiming < ANGLE_180)
+		else if (vflip && thiscam->aiming > ANGLE_22h && thiscam->aiming < ANGLE_180)
 			thiscam->aiming = ANGLE_22h;
 	}
 
@@ -3945,7 +4048,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 	{
 		P_MoveChaseCamera(player, thiscam, false);
 		R_ResetViewInterpolation(num + 1);
-		R_ResetViewInterpolation(num + 1);
 	}
 
 	return (x == thiscam->x && y == thiscam->y && z == thiscam->z && angle == thiscam->aiming);
@@ -3953,12 +4055,19 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
 
 void P_ResetLocalCamAiming(player_t *player)
 {
-	for (int i = 0; i <= splitscreen; i++)
+	UINT8 i;
+
+	if (player == &players[consoleplayer])
+		localaiming[0] = 0;
+	else if (splitscreen)
 	{
-		UINT8 id = (i == 0) ? consoleplayer : displayplayers[i];
-		if (player - players == id)
+		for (i = 1; i <= splitscreen; i++) // Skip P1
 		{
-			localaiming[i] = 0;
+			if (player == &players[displayplayers[i]])
+			{
+				localaiming[i] = 0;
+				break;
+			}
 		}
 	}
 }
@@ -3970,13 +4079,12 @@ boolean P_SpectatorJoinGame(player_t *player)
 	{
 		if (P_IsLocalPlayer(player))
 			CONS_Printf(M_GetText("Server does not allow team change.\n"));
-		//player->powers[pw_flashing] = TICRATE + 1; //to prevent message spam.
 	}
 	// Team changing in Team Match and CTF
 	// Pressing fire assigns you to a team that needs players if allowed.
 	// Partial code reproduction from p_tick.c autobalance code.
-	else if (G_GametypeHasTeams())
-	{		
+	else if (UNLIKELY(G_GametypeHasTeams()))
+	{
 		INT32 changeto = 0;
 		INT32 z, numplayersred = 0, numplayersblue = 0;
 
@@ -4005,7 +4113,7 @@ boolean P_SpectatorJoinGame(player_t *player)
 		if (player->mo)
 		{
 			P_RemoveMobj(player->mo);
-			P_SetTarget(&player->mo, NULL);
+			player->mo = NULL;
 		}
 		player->spectator = false;
 		player->pflags &= ~PF_WANTSTOJOIN;
@@ -4029,11 +4137,11 @@ boolean P_SpectatorJoinGame(player_t *player)
 	}
 	// Joining in game from firing.
 	else
-	{		
+	{
 		if (player->mo)
 		{
 			P_RemoveMobj(player->mo);
-			P_SetTarget(&player->mo, NULL);
+			player->mo = NULL;
 		}
 		player->spectator = false;
 		player->pflags &= ~PF_WANTSTOJOIN;
@@ -4053,109 +4161,121 @@ boolean P_SpectatorJoinGame(player_t *player)
 	return false;
 }
 
-static void P_CalcPostImg(player_t *player)
+static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector, fixed_t pviewheight)
 {
-	sector_t *sector = player->mo->subsector->sector;
-	postimg_t *type = NULL;
-	INT32 *param;
-	fixed_t pviewheight;
-	UINT8 i;
-
-	if (player->mo->eflags & MFE_VERTICALFLIP)
-		pviewheight = player->mo->z + player->mo->height - player->viewheight;
-	else
-		pviewheight = player->mo->z + player->viewheight;
-
-	if (player->awayviewtics && player->awayviewmobj && !P_MobjWasRemoved(player->awayviewmobj))
-	{
-		sector = player->awayviewmobj->subsector->sector;
-		pviewheight = player->awayviewmobj->z + 20*FRACUNIT;
-	}
-
-	for (i = 0; i <= splitscreen; i++)
-	{
-		if (player == &players[displayplayers[i]])
-		{
-			type = &postimgtype[i];
-			param = &postimgparam[i];
-			break;
-		}
-	}
-
-	// see if we are in heat (no, not THAT kind of heat...)
-
 	if (P_FindSpecialLineFromTag(13, sector->tag, -1) != -1)
-		*type = postimg_heat;
-	else if (sector->ffloors)
+		return true;
+
+	if (sector->ffloors)
 	{
 		ffloor_t *rover;
-		fixed_t topheight;
-		fixed_t bottomheight;
 
 		for (rover = sector->ffloors; rover; rover = rover->next)
 		{
 			if (!(rover->flags & FF_EXISTS))
 				continue;
 
-			topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
-			bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
+			if (pviewheight >= P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y))
+				continue;
 
-			if (pviewheight >= topheight || pviewheight <= bottomheight)
+			if (pviewheight <= P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y))
 				continue;
 
 			if (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
-				*type = postimg_heat;
+				return true;
 		}
 	}
 
-	// see if we are in water (water trumps heat)
+	return false;
+}
+
+static boolean P_CameraCheckWaterFirstperson(player_t *player, sector_t *sector, fixed_t pviewheight)
+{
 	if (sector->ffloors)
 	{
 		ffloor_t *rover;
-		fixed_t topheight;
-		fixed_t bottomheight;
 
 		for (rover = sector->ffloors; rover; rover = rover->next)
 		{
 			if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKPLAYER)
 				continue;
 
-			topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
-			bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
-
-			if (pviewheight >= topheight || pviewheight <= bottomheight)
+			if (pviewheight >= P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y))
 				continue;
 
-			*type = postimg_water;
+			if (pviewheight <= P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y))
+				continue;
+
+			return true;
 		}
 	}
 
-	if (!encoremode) // srb2kart
+	return false;
+}
+
+// the below is first person only, if you're curious. check out P_CalcChasePostImg in p_mobj.c for chasecam
+static void P_CalcPostImg(player_t *player, camera_t *thiscam)
+{
+	sector_t *sector = NULL;
+	UINT8 postimgtype = 0;
+	//INT32 *param;
+	fixed_t pviewheight = 0;
+
+	/*for (i = 0; i <= splitscreen; i++)
 	{
-		if (player->mo->eflags & MFE_VERTICALFLIP)
-			*type = postimg_flip;
+		if (player == &players[displayplayers[i]])
+		{
+			param = &postimgparam[i];
+			break;
+		}
+	}*/
+
+	if (encoremode) // srb2kart
+		postimgtype |= POSTIMG_MIRROR;
+
+	if (player->mo->eflags & MFE_VERTICALFLIP)
+		postimgtype |= POSTIMG_FLIP;
+
+#ifdef HWRENDER
+	if (rendermode == render_opengl && splitscreen)
+	{
+		thiscam->postimg = postimgtype;
+		return;
 	}
+#endif
+
+	sector = player->mo->subsector->sector;
+
+	if (player->mo->eflags & MFE_VERTICALFLIP)
+		pviewheight = player->mo->z + player->mo->height - player->viewheight;
 	else
+		pviewheight = player->mo->z + player->viewheight;
+
+	if (player->awayviewtics && !P_MobjWasRemoved(player->awayviewmobj))
 	{
-		if (player->mo->eflags & MFE_VERTICALFLIP)
-			*type = postimg_mirrorflip;
-		else
-			*type = postimg_mirror;
+		sector = player->awayviewmobj->subsector->sector;
+		pviewheight = player->awayviewmobj->z + 20*FRACUNIT;
 	}
 
-#if 1
-	(void)param;
-#else
+	// see if we are in water (water trumps heat)
+	if (P_CameraCheckWaterFirstperson(player, sector, pviewheight))
+		postimgtype |= POSTIMG_WATER;
+	// see if we are in heat (no, not THAT kind of heat...)
+	else if (P_CameraCheckHeatFirstperson(player, sector, pviewheight))
+		postimgtype |= POSTIMG_HEAT;
+
 	// Motion blur
-	if (player->speed > (35<<FRACBITS))
+	// unused
+	/*if (player->speed > (35<<FRACBITS))
 	{
-		*type = postimg_motion;
+		postimgtype |= POSTIMG_MOTION;
 		*param = (player->speed - 32)/4;
 
 		if (*param > 5)
 			*param = 5;
-	}
-#endif
+	}*/
+
+	thiscam->postimg = postimgtype;
 }
 
 void P_DoTimeOver(player_t *player)
@@ -4165,13 +4285,15 @@ void P_DoTimeOver(player_t *player)
 
 	player->pflags |= PF_TIMEOVER;
 
+	demo.savebutton = leveltime;
+
 	if (P_IsLocalPlayer(player) && !demo.playback)
 		legitimateexit = true; // SRB2kart: losing a race is still seeing it through to the end :p
 
 	if (player->mo)
 	{
 		S_StopSound(player->mo);
-		P_DamageMobj(player->mo, NULL, NULL, 10000);
+		P_DamageMobj(player->mo, NULL, NULL, DMG_INSTAKILL);
 	}
 
 	player->lives = 0;
@@ -4182,19 +4304,21 @@ void P_DoTimeOver(player_t *player)
 		exitcountdown = 5*TICRATE;
 }
 
-	/* gaysed script from me, based on Golden's sprite slope roll */
-
+/* gaysed script from me, based on Golden's sprite slope roll */
 // holy SHIT
-static INT32
-Quaketilt (player_t *player)
+static INT32 Quaketilt(player_t *player)
 {
-	angle_t tilt;
+	angle_t tilt, moma;
 	fixed_t lowb; // this threshold for speed
-	angle_t moma = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
-	INT32 delta = (INT32)( player->mo->angle - moma );
+	INT32 delta;
 	fixed_t speed;
 
+<<<<<<< HEAD
 	boolean sliptiding = player->kartstuff[k_drift] ? 0 : player->kartstuff[k_aizdriftstrat];
+=======
+	moma = R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
+	delta = (INT32)( player->mo->angle - moma );
+>>>>>>> Saturn-Next
 
 	if (delta == (INT32)ANGLE_180)/* FUCK YOU HAVE A HACK */
 	{
@@ -4204,8 +4328,11 @@ Quaketilt (player_t *player)
 	// Hi! I'm "not a math guy"!
 	if (abs(delta) > ANGLE_90)
 		delta = (INT32)(( moma + ANGLE_180 ) - player->mo->angle );
+
 	if (P_IsObjectOnGround(player->mo))
 	{
+		const boolean sliptiding = player->kartstuff[k_drift] ? 0 : player->kartstuff[k_aizdriftstrat];
+
 		if (sliptiding)
 		{
 			tilt = ANGLE_45;
@@ -4222,22 +4349,39 @@ Quaketilt (player_t *player)
 		tilt = ANGLE_22h;
 		lowb = 10*FRACUNIT;
 	}
+<<<<<<< HEAD
+=======
+
+>>>>>>> Saturn-Next
 	lowb = FixedMul(lowb, player->mo->scale);
 	moma = FixedMul(FixedDiv(delta, ANGLE_90), tilt);
 	speed = abs( player->mo->momx + player->mo->momy );
+
 	if (speed < lowb)
 	{
 		// ease out tilt as we slow...
 		moma = FixedMul(moma, FixedDiv(speed, lowb));
 	}
+
 	return moma;
 }
 
-static void
-DoABarrelRoll (player_t *player)
+static void DoABarrelRoll(player_t *player)
 {
-	angle_t slope;
+	angle_t slope = 0;
 	angle_t delta;
+	fixed_t smoothing;
+
+	if (player->exiting)
+	{
+		return;
+	}
+
+	if (player->kartstuff[k_respawn])
+	{
+		player->tilt = 0;
+		return;
+	}
 
 	fixed_t smoothing;
 
@@ -4256,10 +4400,6 @@ DoABarrelRoll (player_t *player)
 	{
 		slope = player->mo->standingslope->real_zangle;
 	}
-	else
-	{
-		slope = 0;
-	}
 
 	if (abs((INT32)slope) > ANGLE_11hh)
 	{
@@ -4280,7 +4420,11 @@ DoABarrelRoll (player_t *player)
 	smoothing = FixedDiv(AbsAngle(slope), ANGLE_45);
 
 	delta = FixedDiv(delta, cv_tiltsmoothing.value *
+<<<<<<< HEAD
 	FixedDiv(FRACUNIT, FRACUNIT + smoothing));
+=======
+			FixedDiv(FRACUNIT, FRACUNIT + smoothing));
+>>>>>>> Saturn-Next
 
 	if (delta)
 		player->tilt += delta;
@@ -4288,6 +4432,39 @@ DoABarrelRoll (player_t *player)
 		player->tilt = slope;
 }
 
+// mhhm this is definitely not mostly copy pasted code from SRB2s music test (:
+// TODO: make this sane lmao
+static void P_DoFunnyDance(player_t *player)
+{
+	fixed_t bpm; // 140bpm ish
+
+	if (player->spectator || !player->mo || player->kartstuff[k_respawn] || player->mo->salty_jump) // this looks jank as hell during hop
+		return;
+
+	player->squishdance.bounce = 0;
+
+	// bpm = FixedDiv((60*TICRATE)<<FRACBITS, FLOAT_TO_FIXED(mapmusic.bpm)); << maybe can get the tempo and beat detection lib to work for bpm autodetection
+	bpm = FixedDiv((60*TICRATE)<<FRACBITS, FLOAT_TO_FIXED((float)cv_squishdancespeed.value));
+
+	player->squishdance.work = (player->squishdance.time << FRACBITS) % bpm;
+
+	if (player->squishdance.time >= (FRACUNIT >> 1)) // prevent overflow jump - takes about 15 minutes
+		player->squishdance.time = (player->squishdance.work >> FRACBITS);
+
+	player->squishdance.work = FixedDiv(player->squishdance.work*180, bpm);
+
+	player->squishdance.ang = ((FixedAngle(player->squishdance.work) >> ANGLETOFINESHIFT) & FINEMASK);
+	player->squishdance.bounce = ((FINESINE(player->squishdance.ang) - FRACUNIT/2) / 2);
+
+	player->mo->spritexscale -= player->squishdance.bounce;
+	player->mo->spriteyscale += player->squishdance.bounce;
+
+	player->squishdance.time++;
+}
+
+#define SPINOUTROTSPEED (24 * FRACUNIT)
+#define MAXSPINROT (360 * FRACUNIT)
+
 //
 // P_PlayerThink
 //
@@ -4318,7 +4495,7 @@ void P_PlayerThink(player_t *player)
 		}
 		if (player->playerstate == PST_REBORN)
 		{
-			LUAh_PlayerThink(player);
+			LUA_HookPlayer(player, HOOK(PlayerThink));
 			return;
 		}
 	}
@@ -4328,8 +4505,8 @@ void P_PlayerThink(player_t *player)
 	{
 		seenplayer = NULL;
 
-		if (cv_seenames.value && cv_allowseenames.value &&
-			!(G_TagGametype() && (player->pflags & PF_TAGIT)))
+		if (UNLIKELY(cv_seenames.value && cv_allowseenames.value &&
+			!(G_TagGametype() && (player->pflags & PF_TAGIT))))
 		{
 			mobj_t *mo = P_SpawnNameFinder(player->mo, MT_NAMECHECK);
 
@@ -4425,12 +4602,37 @@ void P_PlayerThink(player_t *player)
 
 				if (player->playerstate == PST_DEAD)
 				{
-					LUAh_PlayerThink(player);
+					LUA_HookPlayer(player, HOOK(PlayerThink));
 					return;
 				}
 			}
 		}
 
+		if (player->kartstuff[k_spinouttimer] && (player->spinoutrot == 0))
+		{
+			player->spinoutrot = SPINOUTROTSPEED;
+		}
+
+		// MKWii-styled icon spinouts: do a full 360 rotation before stopping.
+		if (player->spinoutrot && (player->spinoutrot < MAXSPINROT))
+		{
+			if ((player->spinoutrot + SPINOUTROTSPEED) >= MAXSPINROT)
+			{
+				if (player->kartstuff[k_spinouttimer])
+				{
+					player->spinoutrot = (player->spinoutrot + SPINOUTROTSPEED) % MAXSPINROT;
+				}
+				else
+				{
+					player->spinoutrot = 0;
+				}
+			}
+			else
+			{
+				player->spinoutrot += SPINOUTROTSPEED;
+			}
+		}
+
 		// If it is set, start subtracting
 		// Don't allow it to go back to 0
 		if (player->exiting > 1 && (player->exiting < raceexittime+2 || !G_RaceGametype())) // SRB2kart - "&& player->exiting > 1"
@@ -4491,7 +4693,7 @@ void P_PlayerThink(player_t *player)
 		else
 			player->mo->flags2 &= ~MF2_SHADOW;
 		P_DeathThink(player);
-		LUAh_PlayerThink(player);
+		LUA_HookPlayer(player, HOOK(PlayerThink));
 		return;
 	}
 
@@ -4515,19 +4717,16 @@ void P_PlayerThink(player_t *player)
 		if (leveltime >= starttime)
 		{
 			player->realtime = leveltime - starttime;
-			if (player == &players[consoleplayer])
-			{
-				if (player->spectator || !circuitmap)
-					curlap = 0;
-				else
-					curlap++; // This is too complicated to sync to realtime, just sorta hope for the best :V
-			}
+
+			if (player->spectator)
+				player->laptime[LAP_CUR] = 0;
+			else if (player->laptime[LAP_CUR] != UINT32_MAX)
+				player->laptime[LAP_CUR]++; // This is too complicated to sync to realtime, just sorta hope for the best :V
 		}
 		else
 		{
 			player->realtime = 0;
-			if (player == &players[consoleplayer])
-				curlap = 0;
+			player->laptime[LAP_CUR] = 0;
 		}
 	}
 
@@ -4542,7 +4741,7 @@ void P_PlayerThink(player_t *player)
 				continue;
 			break;
 		}
-		
+
 		if (i < MAXPLAYERS && !player->spectator && !player->exiting && !(player->pflags & PF_TIMEOVER))
 		{
 			const tic_t griefval = cv_antigrief.value * TICRATE;
@@ -4563,11 +4762,7 @@ void P_PlayerThink(player_t *player)
 							&& !P_IsLocalPlayer(player)) // P_IsMachineLocalPlayer for DRRR
 						{
 							// Send kick
-							UINT8 buf[2];
-
-							buf[0] = n;
-							buf[1] = KICK_MSG_GRIEF;
-							SendNetXCmd(XD_KICK, &buf, 2);
+							SendKick(n, KICK_MSG_GRIEF);
 						}
 						else
 						{
@@ -4597,13 +4792,11 @@ void P_PlayerThink(player_t *player)
 	{
 		player->pflags ^= PF_WANTSTOJOIN;
 		player->powers[pw_flashing] = TICRATE/2 + 1;
-		/*if (P_SpectatorJoinGame(player))
-			return; // player->mo was removed.*/
 	}
 
 	// Even if not NiGHTS, pull in nearby objects when walking around as John Q. Elliot.
-	if (!objectplacing && !((netgame || multiplayer) && player->spectator)
-	&& maptol & TOL_NIGHTS && (!(player->pflags & PF_NIGHTSMODE) || player->powers[pw_nights_helper]))
+	if (UNLIKELY(!objectplacing && !((netgame || multiplayer) && player->spectator)
+	&& maptol & TOL_NIGHTS && (!(player->pflags & PF_NIGHTSMODE) || player->powers[pw_nights_helper])))
 	{
 		thinker_t *th;
 		mobj_t *mo2;
@@ -4613,9 +4806,7 @@ void P_PlayerThink(player_t *player)
 
 		for (th = thinkercap.next; th != &thinkercap; th = th->next)
 		{
-			if (th->function.acp1 != (actionf_p1)P_MobjThinker)
-				continue;
-			if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+			if (th->function != (actionf_p1)P_MobjThinker)
 				continue;
 
 			mo2 = (mobj_t *)th;
@@ -4640,25 +4831,27 @@ void P_PlayerThink(player_t *player)
 			player->linkcount = 0;
 	}
 
-	// Move around.
-	// Reactiontime is used to prevent movement
-	//  for a bit after a teleport.
 	if (player->mo->reactiontime)
+	{
+		// Reactiontime is used to prevent movement
+		// for a bit after a teleport.
 		player->mo->reactiontime--;
+	}
 	else if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT)
 	{
-		{
-			P_DoZoomTube(player);
-		}
+		P_DoZoomTube(player);
 		player->rmomx = player->rmomy = 0; // no actual momentum from your controls
 		P_ResetScore(player);
 	}
 	else
+	{
+		// Move around.
 		P_MovePlayer(player);
+	}
 
 	if (!player->mo)
 	{
-		LUAh_PlayerThink(player);
+		LUA_HookPlayer(player, HOOK(PlayerThink));
 		return; // P_MovePlayer removed player->mo.
 	}
 
@@ -4668,12 +4861,9 @@ void P_PlayerThink(player_t *player)
 	player->pflags &= ~PF_FULLSTASIS;
 
 	if (player->onconveyor == 1)
-			player->cmomy = player->cmomx = 0;
+		player->cmomy = player->cmomx = 0;
 
-	//P_DoSuperStuff(player);
-	//P_CheckSneakerAndLivesTimer(player);
 	P_DoBubbleBreath(player); // Spawn Sonic's bubbles
-	//P_CheckUnderwaterAndSpaceTimer(player); // Display the countdown drown numbers!
 	P_CheckInvincibilityTimer(player); // Spawn Invincibility Sparkles
 	P_DoPlayerHeadSigns(player); // Spawn Tag/CTF signs over player's head
 
@@ -4708,7 +4898,7 @@ void P_PlayerThink(player_t *player)
 #endif
 
 	// check for use
-	if (!(player->pflags & PF_NIGHTSMODE))
+	if (LIKELY(!(player->pflags & PF_NIGHTSMODE)))
 	{
 		if (cmd->buttons & BT_BRAKE)
 			player->pflags |= PF_USEDOWN;
@@ -4812,6 +5002,19 @@ void P_PlayerThink(player_t *player)
 	if (player->losstime && !player->powers[pw_flashing])
 		player->losstime--;
 
+	if (cv_squishdance.value && (cmd->buttons & BT_CUSTOM3))
+	{
+		player->squishdance.countdown++;
+
+		if (player->squishdance.countdown > TICRATE*2)
+			P_DoFunnyDance(player);
+	}
+	else
+	{
+		player->squishdance.countdown = 0;
+		player->squishdance.time = 0;
+	}
+
 	// Flash player after being hit.
 	if (!(player->kartstuff[k_hyudorotimer] // SRB2kart - fixes Hyudoro not flashing when it should.
 		|| player->kartstuff[k_growshrinktimer] > 0 // Grow doesn't flash either.
@@ -4826,22 +5029,15 @@ void P_PlayerThink(player_t *player)
 		else
 			player->mo->flags2 &= ~MF2_DONTDRAW;
 	}
-	/*else if (player->mo->tracer)
-	{
-		if (player->powers[pw_flashing] & 1)
-			player->mo->tracer->flags2 |= MF2_DONTDRAW;
-		else
-			player->mo->tracer->flags2 &= ~MF2_DONTDRAW;
-	}*/
 
 	player->pflags &= ~PF_SLIDING;
 
 	K_KartPlayerThink(player, cmd); // SRB2kart
 
-	if (rendermode != render_none)
+	if (cv_tilting.value && rendermode != render_none)
 		DoABarrelRoll(player);
 
-	LUAh_PlayerThink(player);
+	LUA_HookPlayer(player, HOOK(PlayerThink));
 }
 
 //
@@ -4852,7 +5048,6 @@ void P_PlayerThink(player_t *player)
 void P_PlayerAfterThink(player_t *player)
 {
 	ticcmd_t *cmd;
-	//INT32 oldweapon = player->currentweapon; // SRB2kart - unused
 	camera_t *thiscam = NULL; // if not one of the displayed players, just don't bother
 	UINT8 i;
 
@@ -4868,13 +5063,18 @@ void P_PlayerAfterThink(player_t *player)
 
 #ifdef SECTORSPECIALSAFTERTHINK
 	if (player->onconveyor != 1 || !P_IsObjectOnGround(player->mo))
-	player->onconveyor = 0;
+		player->onconveyor = 0;
 	// check special sectors : damage & secrets
 
 	if (!player->spectator)
 		P_PlayerInSpecialSector(player);
 #endif
 
+	if (player->playerstate == PST_DEAD)
+	{
+		return;
+	}
+
 	for (i = 0; i <= splitscreen; i++)
 	{
 		if (player == &players[displayplayers[i]])
@@ -4884,15 +5084,9 @@ void P_PlayerAfterThink(player_t *player)
 		}
 	}
 
-	if (player->playerstate == PST_DEAD)
-	{
-		return;
-	}
-
-	if (player->pflags & PF_NIGHTSMODE)
+	if (UNLIKELY(player->pflags & PF_NIGHTSMODE))
 	{
 		player->powers[pw_gravityboots] = 0;
-		//player->mo->eflags &= ~MFE_VERTICALFLIP;
 	}
 
 	if (player->pflags & PF_SLIDING)
@@ -4915,11 +5109,10 @@ void P_PlayerAfterThink(player_t *player)
 		else if (cmd->forwardmove < 0 && player->mo->tracer->target->lastlook > player->mo->tracer->target->movecount)
 			player->mo->tracer->target->lastlook -= 2;
 
-		if (!(player->mo->tracer->target->flags & MF_SLIDEME) // Noclimb on chain parameters gives this
-		&& !(twodlevel || player->mo->flags2 & MF2_TWOD)) // why on earth would you want to turn them in 2D mode?
+		if (!(player->mo->tracer->target->flags & MF_SLIDEME)) // Noclimb on chain parameters gives this
 		{
 			player->mo->tracer->target->health += cmd->sidemove;
-			player->mo->angle += cmd->sidemove<<ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX
+			player->mo->angle += cmd->sidemove << ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX
 
 			if (player == &players[consoleplayer])
 				localangle[0] = player->mo->angle; // Adjust the local control angle.
@@ -4937,13 +5130,14 @@ void P_PlayerAfterThink(player_t *player)
 		if (!thiscam->chase) // bob view only if looking through the player's eyes
 		{
 			P_CalcHeight(player);
-			P_CalcPostImg(player);
+			P_CalcPostImg(player, thiscam);
 		}
 		else
 		{
 			// defaults to make sure 1st person cam doesn't do anything weird on startup
 			//player->deltaviewheight = 0;
 			player->viewheight = FixedMul(32 << FRACBITS, player->mo->scale);
+
 			if (player->mo->eflags & MFE_VERTICALFLIP)
 				player->viewz = player->mo->z + player->mo->height - player->viewheight;
 			else
diff --git a/src/qs22j.c b/src/qs22j.c
index 16dc217bd..c610bde4d 100644
--- a/src/qs22j.c
+++ b/src/qs22j.c
@@ -16,15 +16,18 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include "qs22j.h"
 
-#define INSORTTHRESH    5           // if n < this use insertion sort
-                                    // MUST be >= 2
-#define MIDTHRESH       20          // < this use middle as pivot
-#define MEDOF3THRESH    50          // < this use median-of-3 as pivot
-                                    // larger subfiles use med-of-3-medians
+#define INSORTTHRESH	5			// if n < this use insertion sort
+									// MUST be >= 2
+#define MIDTHRESH		20			// < this use middle as pivot
+#define MEDOF3THRESH	50			// < this use median-of-3 as pivot
+									// larger subfiles use med-of-3-medians
 
+#ifndef min
 #define min(a,b) (((a) < (b)) ? (a) : (b))
+#endif
 
 typedef int32_t WORD;
 typedef int64_t DWORD;
@@ -37,242 +40,240 @@ typedef void *pref_typ;
 #define ASWAP(a, b, t) ((void)(t = a, a = b, b = t))
 
 #define SWAP(a, b) if (swap_type) swapf(a, b, size);\
-    else do {pref_typ t; ASWAP(*(pref_typ*)(a), *(pref_typ*)(b), t);} while (0)
+	else do {pref_typ t; ASWAP(*(pref_typ*)(a), *(pref_typ*)(b), t);} while (0)
 
-#define  COMP(a, b)  ((*compar)((void *)(a), (void *)(b)))
+#define COMP(a, b)  ((*compar)((void *)(a), (void *)(b)))
 
 static inline void swapbytes(void *a0, void *b0, size_t n)
 {
-    char *a = a0, *b = b0, t;
-    do {ASWAP(*a, *b, t); a++; b++;} while (--n);
+	char *a = a0, *b = b0, t;
+	do {ASWAP(*a, *b, t); a++; b++;} while (--n);
 }
 
 static inline void swapdword(void *a0, void *b0, size_t n)
 {
-    DWORD *a = a0, *b = b0, t;
-    ASWAP(*a, *b, t);
-    (void)n;
+	(void)n;
+	DWORD *a = a0, *b = b0, t;
+	ASWAP(*a, *b, t);
 }
 
 static inline void swapdwords(void *a0, void *b0, size_t n)
 {
-    DWORD *a = a0, *b = b0, t;
-    do {ASWAP(*a, *b, t); a++; b++;} while (n -= sizeof(DWORD));
+	DWORD *a = a0, *b = b0, t;
+	do {ASWAP(*a, *b, t); a++; b++;} while (n -= sizeof(DWORD));
 }
 
 static inline void swapword(void *a0, void *b0, size_t n)
 {
-    WORD *a = a0, *b = b0, t;
-    ASWAP(*a, *b, t);
-    (void)n;
+	(void)n;
+	WORD *a = a0, *b = b0, t;
+	ASWAP(*a, *b, t);
 }
 
 static inline void swapwords(void *a0, void *b0, size_t n)
 {
-    WORD *a = a0, *b = b0, t;
-    do {ASWAP(*a, *b, t); a++; b++;} while (n -= sizeof(WORD));
+	WORD *a = a0, *b = b0, t;
+	do {ASWAP(*a, *b, t); a++; b++;} while (n -= sizeof(WORD));
 }
 
 typedef void (*swapf_typ)(void *, void *, size_t);
 
 static inline char *med3(char *a, char *b, char *c, int (*compar)(const void *, const void *))
 {
-    return COMP(a, b) < 0 ?
-        (COMP(b, c) < 0 ? b : COMP(a, c) < 0 ? c : a) :
-        (COMP(b, c) > 0 ? b : COMP(a, c) > 0 ? c : a);
+	return COMP(a, b) < 0 ?
+		(COMP(b, c) < 0 ? b : COMP(a, c) < 0 ? c : a) :
+		(COMP(b, c) > 0 ? b : COMP(a, c) > 0 ? c : a);
 }
 
 void qs22j(void *base, size_t nmemb, size_t size,
                                      int (*compar)(const void *, const void *))
 {
-    char *stack[2*8*sizeof(size_t)], **sp = stack; // stack and stack pointer
-    char *left = base;                      // set up char * base pointer
-    char *limit = left + nmemb * size;      // pointer past end of array
-    char *i, *ii, *j, *jj;                  // scan pointers
-    int ki = 0, kj = 0;
-    int swap_type = 1;
-    swapf_typ swapf, vecswapf;
+	char *stack[2*8*sizeof(size_t)], **sp = stack;	// stack and stack pointer
+	char *left = base;								// set up char * base pointer
+	char *limit = left + nmemb * size;				// pointer past end of array
+	char *i, *ii, *j, *jj;							// scan pointers
+	int ki = 0, kj = 0;
+	int swap_type = 1;
+	swapf_typ swapf, vecswapf;
 
-    vecswapf = swapf = swapbytes;
-    if ((ptr_to_int(left) | size) % sizeof(WORD))
+	vecswapf = swapf = swapbytes;
+	if ((ptr_to_int(left) | size) % sizeof(WORD))
 	{
-        ;  // unaligned or not multple of WORD size; swap bytes
-    }
+		;											// unaligned or not multple of WORD size; swap bytes
+	}
 	else if (size == sizeof(DWORD))
 	{
-        swapf = swapdword;
-        vecswapf = swapdwords;
-        if (size == sizeof(pref_typ))
-            swap_type = 0;
-    }
+		swapf = swapdword;
+		vecswapf = swapdwords;
+		if (size == sizeof(pref_typ))
+		swap_type = 0;
+	}
 	else if (size == sizeof(WORD))
 	{
-        swapf = swapword;
-        vecswapf = swapwords;
-        if (size == sizeof(pref_typ))
-            swap_type = 0;
+		swapf = swapword;
+		vecswapf = swapwords;
+		if (size == sizeof(pref_typ))
+			swap_type = 0;
     } 
 	else if ((size % sizeof(DWORD)) == 0)
 	{
-        swapf = vecswapf = swapdwords;
-    }
+		swapf = vecswapf = swapdwords;
+	}
 	else if ((size % sizeof(WORD)) == 0)
 	{
-        swapf = vecswapf = swapwords;
-    }
-    for (;;)
+		swapf = vecswapf = swapwords;
+	}
+	for (;;)
 	{
-        nmemb = (limit - left) / size;
-        for (i = left + size; i < limit && COMP(i - size, i) <= 0; i += size)
-            ;
+		nmemb = (limit - left) / size;
+		for (i = left + size; i < limit && COMP(i - size, i) <= 0; i += size)
+			;
 
-        if (i == limit)                     // if already in order
-            goto pop;
+		if (i == limit)								// if already in order
+			goto pop;
 
-        if (nmemb >= INSORTTHRESH) // otherwise use insertion sort
+		if (nmemb >= INSORTTHRESH)					// otherwise use insertion sort
 		{        
-            char *right = limit - size;
-            // best so far? fewer compares, a few more swaps
-            char *p = left + (nmemb / 2) * size;
-            if (nmemb >= MIDTHRESH)
+			char *right = limit - size;
+			// best so far? fewer compares, a few more swaps
+			char *p = left + (nmemb / 2) * size;
+			if (nmemb >= MIDTHRESH)
 			{
-                char *pleft = left + size;
-                char *pright = right - size;
+				char *pleft = left + size;
+				char *pright = right - size;
 
-                if (nmemb >= MEDOF3THRESH)
+				if (nmemb >= MEDOF3THRESH)
 				{
-                    size_t k = (nmemb / 8) * size;
-                    pleft = med3(pleft, left + k, left + k * 2, compar);
-                    p = med3(p - k, p, p + k, compar);
-                    pright = med3(right - k * 2, right - k, pright, compar);
-                }
+					size_t k = (nmemb / 8) * size;
+					pleft = med3(pleft, left + k, left + k * 2, compar);
+					p = med3(p - k, p, p + k, compar);
+					pright = med3(right - k * 2, right - k, pright, compar);
+				}
 
-                p = med3(pleft, p, pright, compar);
-            }
+				p = med3(pleft, p, pright, compar);
+			}
 
-            i = ii = left;                  // i scans left to right
-            j = jj = right;                 // j scans right to left
+			i = ii = left;							// i scans left to right
+			j = jj = right;							// j scans right to left
             for (;;)
 			{
-
                 while (i <= j)
 				{
                     if (i != p && ((ki = COMP(i, p)) >= 0))
 					{
-                        if (ki)
-                            break;
+						if (ki)
+							break;
 
                         if (ii == p)
 						{
-                            p = i;
+							p = i;
 						}
                         else if (i != ii)
 						{
-                            SWAP(i, ii);
+							SWAP(i, ii);
 						}
 
-                        ii += size;
-                    }
-                    i += size;
-                }
+						ii += size;
+					}
+					i += size;
+				}
 
-                while (i < j)
+				while (i < j)
 				{
-                    if (j != p && ((kj = COMP(j, p)) <= 0))
+					if (j != p && ((kj = COMP(j, p)) <= 0))
 					{
-                        if (kj)
-                            break;
+						if (kj)
+							break;
 
-                        if (jj == p)
+						if (jj == p)
 						{
-                            p = j;
+							p = j;
 						}
-                        else if (j != jj)
+						else if (j != jj)
 						{
-                            SWAP(j, jj);
+							SWAP(j, jj);
 						}
 
-                        jj -= size;
-                    }
-                    j -= size;
-                }
+						jj -= size;
+					}
+					j -= size;
+				}
 
-                if (i >= j)
-                    break;
+				if (i >= j)
+					break;
 
-                SWAP(i, j);
-                i += size;
-                j -= size;
-            }
+				SWAP(i, j);
+				i += size;
+				j -= size;
+			}
 
-            if (p < i)
-                i -= size;
+			if (p < i)
+				i -= size;
 
             if (p != i)
 			{
                 SWAP(p, i);
 			}
 
-            ptrdiff_t lessthan = i - ii;
-            size_t k = min(lessthan, ii - left);
+			ptrdiff_t lessthan = i - ii;
+			size_t k = min(lessthan, ii - left);
 
-            if (k)
-                vecswapf(left, i - k, k);
+			if (k)
+				vecswapf(left, i - k, k);
 
-            ptrdiff_t morethan = jj - i;
-            k = min(morethan, right - jj);
+			ptrdiff_t morethan = jj - i;
+			k = min(morethan, right - jj);
 
-            if (k)
-                vecswapf(i + size, limit - k, k);
+			if (k)
+				vecswapf(i + size, limit - k, k);
 
-            if (lessthan > morethan)
+			if (lessthan > morethan)
 			{
-                if (lessthan > 1)
+				if (lessthan > 1)
 				{
-                    sp[0] = left;
-                    sp[1] = left + lessthan;
-                    sp += 2;                // increment stack pointer
-                }
+					sp[0] = left;
+					sp[1] = left + lessthan;
+					sp += 2;						// increment stack pointer
+				}
 
-                if (morethan <= 1)
-                    goto pop;
+				if (morethan <= 1)
+					goto pop;
 
-                left = limit - morethan;
+				left = limit - morethan;
             }
 			else
 			{
-                if (morethan > 1)
+				if (morethan > 1)
 				{
-                    sp[0] = limit - morethan;
-                    sp[1] = limit;
-                    sp += 2;                // increment stack pointer
-                }
+					sp[0] = limit - morethan;
+					sp[1] = limit;
+					sp += 2;						// increment stack pointer
+				}
 
-                if (lessthan <= 1)
-                    goto pop;
+				if (lessthan <= 1)
+					goto pop;
 
-                limit = left + lessthan;
-            }
-
-        }
+				limit = left + lessthan;
+			}
+		}
 		else			// else subfile is small, use insertion sort
 		{
-            for (i = left + size; i < limit; i += size)
+			for (i = left + size; i < limit; i += size)
 			{
-                for (j = i; j != left && COMP(j - size, j) > 0; j -= size)
+				for (j = i; j != left && COMP(j - size, j) > 0; j -= size)
 				{
-                    SWAP(j - size, j);
-                }
-            }
+					SWAP(j - size, j);
+				}
+			}
 pop:
-            if (sp != stack)				// if any entries on stack
+			if (sp != stack)						// if any entries on stack
 			{
-                sp -= 2;                    // pop the left and limit
-                left = sp[0];
-                limit = sp[1];
-            }
-			else                          // else stack empty, done
-                break;
+				sp -= 2;							// pop the left and limit
+				left = sp[0];
+				limit = sp[1];
+			}
+			else									// else stack empty, done
+				break;
         }
     }
 }
diff --git a/src/qs22j.h b/src/qs22j.h
index 95d1c1292..cf522b73d 100644
--- a/src/qs22j.h
+++ b/src/qs22j.h
@@ -1,7 +1,30 @@
+//  License: 0BSD
+//
+//  Copyright 2022 Raymond Gardner
+//
+//  Permission to use, copy, modify, and/or distribute this software for any
+//  purpose with or without fee is hereby granted.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+//  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+//  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+//  SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+//  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+//  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+//  IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+
 #ifndef __QS22J__
 #define __QS22J__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void qs22j(void *base, size_t nmemb, size_t size,
                                      int (*compar)(const void *, const void *));
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
 #endif
diff --git a/src/r_bsp.c b/src/r_bsp.cpp
similarity index 73%
rename from src/r_bsp.c
rename to src/r_bsp.cpp
index 452d30a97..f1a39d2ad 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.cpp
@@ -13,10 +13,13 @@
 
 #include "doomdef.h"
 #include "g_game.h"
+
+#include "r_fps.h"
 #include "r_local.h"
 #include "r_state.h"
-
+#include "r_portal.h" // Add seg portals
 #include "r_splats.h"
+
 #include "p_local.h" // camera
 #include "p_slopes.h"
 #include "z_zone.h" // Check R_Prep3DFloors
@@ -28,11 +31,11 @@ side_t *sidedef;
 line_t *linedef;
 sector_t *frontsector;
 sector_t *backsector;
-boolean portalline; // is curline a portal seg?
 
 // very ugly realloc() of drawsegs at run-time, I upped it to 512
 // instead of 256.. and someone managed to send me a level with
 // 896 drawsegs! So too bad here's a limit removal a-la-Boom
+drawseg_t *curdrawsegs = NULL; /**< This is used to handle multiple lists for masked drawsegs. */
 drawseg_t *drawsegs = NULL;
 drawseg_t *ds_p = NULL;
 
@@ -71,165 +74,96 @@ void R_ClearDrawSegs(void)
 	ds_p = drawsegs;
 }
 
-// Fix from boom.
-#define MAXSEGS (MAXVIDWIDTH/2+1)
+// CPhipps -
+// Instead of clipsegs, let's try using an array with one entry for each column,
+// indicating whether it's blocked by a solid wall yet or not.
+UINT8 *solidcol;
 
-// newend is one past the last valid seg
-static cliprange_t *newend;
-static cliprange_t solidsegs[MAXSEGS];
-
-//
-// R_ClipSolidWallSegment
-// Does handle solid walls,
-//  e.g. single sided LineDefs (middle texture)
-//  that entirely block the view.
-//
-static void R_ClipSolidWallSegment(INT32 first, INT32 last)
+void R_AllocClipSegMemory(void)
 {
-	cliprange_t *next;
-	cliprange_t *start;
+	solidcol = static_cast<UINT8*>(Z_Realloc(solidcol, sizeof(*solidcol) * viewwidth, PU_STATIC, NULL));
+}
 
-	// Find the first range that touches the range (adjacent pixels are touching).
-	start = solidsegs;
-	while (start->last < first - 1)
-		start++;
+namespace
+{
 
-	if (first < start->first)
+enum class ClipType
+{
+	// Does handle solid walls,
+	//  e.g. single sided LineDefs (middle texture)
+	//  that entirely block the view.
+	kSolid,
+	kSolidDontRender,
+
+	// Clips the given range of columns, but does not include it in the clip list.
+	// Does handle windows, e.g. LineDefs with upper and lower texture.
+	kPass,
+};
+
+// CPhipps -
+// R_ClipWallSegment
+//
+// Replaces the old R_Clip*WallSegment functions. It draws bits of walls in those
+// columns which aren't solid, and updates the solidcol[] array appropriately
+template <ClipType Type>
+static void R_ClipWallSegment(int first, int last)
+{
+	while (first < last)
 	{
-		if (last < start->first - 1)
-		{
-			// Post is entirely visible (above start), so insert a new clippost.
-			R_StoreWallRange(first, last);
-			next = newend;
-			newend++;
-			// NO MORE CRASHING!
-			if (newend - solidsegs > MAXSEGS)
-				I_Error("R_ClipSolidWallSegment: Solid Segs overflow!\n");
+		UINT8 *p;
 
-			while (next != start)
+		if (solidcol[first])
+		{
+			p = static_cast<UINT8*>(memchr(solidcol+first, 0, last-first));
+			if (!p)
+				return; // All solid
+
+			first = p - solidcol;
+		}
+		else
+		{
+			p = static_cast<UINT8*>(memchr(solidcol+first, 1, last-first));
+
+			int to;
+			if (!p)
+				to = last;
+			else
+				to = p - solidcol;
+
+			if constexpr (Type != ClipType::kSolidDontRender)
 			{
-				*next = *(next-1);
-				next--;
+				R_StoreWallRange(first, to-1);
 			}
-			next->first = first;
-			next->last = last;
-			return;
-		}
 
-		// There is a fragment above *start.
-		R_StoreWallRange(first, start->first - 1);
-		// Now adjust the clip size.
-		start->first = first;
-	}
+			if constexpr (Type != ClipType::kPass)
+			{
+				memset(solidcol+first, 1, to-first);
+			}
 
-	// Bottom contained in start?
-	if (last <= start->last)
-		return;
-
-	next = start;
-	while (last >= (next+1)->first - 1)
-	{
-		// There is a fragment between two posts.
-		R_StoreWallRange(next->last + 1, (next+1)->first - 1);
-		next++;
-
-		if (last <= next->last)
-		{
-			// Bottom is contained in next.
-			// Adjust the clip size.
-			start->last = next->last;
-			goto crunch;
+			first = to;
 		}
 	}
-
-	// There is a fragment after *next.
-	R_StoreWallRange(next->last + 1, last);
-	// Adjust the clip size.
-	start->last = last;
-
-	// Remove start+1 to next from the clip list, because start now covers their area.
-crunch:
-	if (next == start)
-		return; // Post just extended past the bottom of one post.
-
-	while (next++ != newend)
-		*++start = *next; // Remove a post.
-
-	newend = start + 1;
-
-	// NO MORE CRASHING!
-	if (newend - solidsegs > MAXSEGS)
-		I_Error("R_ClipSolidWallSegment: Solid Segs overflow!\n");
 }
 
-//
-// R_ClipPassWallSegment
-// Clips the given range of columns, but does not include it in the clip list.
-// Does handle windows, e.g. LineDefs with upper and lower texture.
-//
-static inline void R_ClipPassWallSegment(INT32 first, INT32 last, boolean soliddontrender)
-{
-	cliprange_t *start;
-
-	// Find the first range that touches the range
-	//  (adjacent pixels are touching).
-	start = solidsegs;
-	while (start->last < first - 1)
-		start++;
-
-	if (first < start->first)
-	{
-		if (last < start->first - 1)
-		{
-			// Post is entirely visible (above start).
-			if (!soliddontrender)
-				R_StoreWallRange(first, last);
-			return;
-		}
-
-		// There is a fragment above *start.
-		if (!soliddontrender)
-			R_StoreWallRange(first, start->first - 1);
-	}
-
-	// Bottom contained in start?
-	if (last <= start->last)
-		return;
-
-	while (last >= (start+1)->first - 1)
-	{
-		// There is a fragment between two posts.
-		if (!soliddontrender)
-			R_StoreWallRange(start->last + 1, (start+1)->first - 1);
-		start++;
-
-		if (last <= start->last)
-			return;
-	}
-
-	// There is a fragment after *next.
-	if (!soliddontrender)
-		R_StoreWallRange(start->last + 1, last);
-}
+}; // namespace
 
 //
 // R_ClearClipSegs
 //
 void R_ClearClipSegs(void)
 {
-	solidsegs[0].first = -0x7fffffff;
-	solidsegs[0].last = -1;
-	solidsegs[1].first = viewwidth;
-	solidsegs[1].last = 0x7fffffff;
-	newend = solidsegs + 2;
+	memset(solidcol, 0, viewwidth);
 }
+
 void R_PortalClearClipSegs(INT32 start, INT32 end)
 {
-	solidsegs[0].first = -0x7fffffff;
-	solidsegs[0].last = start-1;
-	solidsegs[1].first = end;
-	solidsegs[1].last = 0x7fffffff;
-	newend = solidsegs + 2;
+	R_ClearClipSegs();
+
+	if (start > 0)
+		memset(solidcol, 1, start);
+
+	if (end < viewwidth)
+		memset(solidcol + end, 1, viewwidth - end);
 }
 
 //
@@ -259,22 +193,15 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
 	else if (sec->heightsec != -1)
 	{
 		const sector_t *s = &sectors[sec->heightsec];
-		mobj_t *viewmobj = viewplayer->mo;
+		mobj_t *pviewmobj = viewplayer->mo;
 		INT32 heightsec;
 		boolean underwater;
-		UINT8 i;
+		camera_t *thiscam = &camera[R_GetViewNumber()];
 
-		for (i = 0; i <= splitscreen; i++)
-		{
-			if (!(viewplayer == &players[displayplayers[i]] && camera[i].chase))
-				continue;
-
-			heightsec = R_PointInSubsector(camera[i].x, camera[i].y)->sector->heightsec;
-			break;
-		}
-
-		if (i > splitscreen && viewmobj)
-			heightsec = R_PointInSubsector(viewmobj->x, viewmobj->y)->sector->heightsec;
+		if (thiscam->chase)
+			heightsec = thiscam->subsector->sector->heightsec;
+		else if (viewmobj)
+			heightsec = pviewmobj->subsector->sector->heightsec;
 		else
 			return sec;
 
@@ -378,30 +305,11 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
 	return sec;
 }
 
-boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back)
+boolean R_IsEmptyLine(seg_t *line, const sector_t *front, const sector_t *back)
 {
-	return (
-		!line->polyseg &&
-		back->ceilingpic == front->ceilingpic
-		&& back->floorpic == front->floorpic
-		&& back->f_slope == front->f_slope
-		&& back->c_slope == front->c_slope
-		&& back->lightlevel == front->lightlevel
-		&& !line->sidedef->midtexture
-		// Check offsets too!
-		&& back->floor_xoffs == front->floor_xoffs
-		&& back->floor_yoffs == front->floor_yoffs
-		&& back->floorpic_angle == front->floorpic_angle
-		&& back->ceiling_xoffs == front->ceiling_xoffs
-		&& back->ceiling_yoffs == front->ceiling_yoffs
-		&& back->ceilingpic_angle == front->ceilingpic_angle
-		// Consider altered lighting.
-		&& back->floorlightsec == front->floorlightsec
-		&& back->ceilinglightsec == front->ceilinglightsec
-		// Consider colormaps
-		&& back->extra_colormap == front->extra_colormap
-		&& ((!front->ffloors && !back->ffloors)
-		|| front->tag == back->tag));
+	return (!line->sidedef->midtexture && !line->polyseg
+	&& ((!front->ffloors && !back->ffloors) || front->tag == back->tag)
+	&& (memcmp(front, back, (offsetof(sector_t, extra_colormap) + sizeof(extracolormap_t *))) == 0));
 }
 
 //
@@ -413,8 +321,9 @@ static void R_AddLine(seg_t *line)
 	INT32 x1, x2;
 	angle_t angle1, angle2, span, tspan;
 	static sector_t tempsec;
+	boolean bothfloorssky   = false;
 
-	portalline = false;
+	g_portal = NULL;
 
 	if (line->polyseg && !(line->polyseg->flags & POF_RENDERSIDES))
 		return;
@@ -448,6 +357,7 @@ static void R_AddLine(seg_t *line)
 
 		angle1 = clipangle;
 	}
+
 	tspan = clipangle - angle2;
 	if (tspan > doubleclipangle)
 	{
@@ -463,6 +373,8 @@ static void R_AddLine(seg_t *line)
 	// The seg is in the view range, but not necessarily visible.
 	angle1 = (angle1+ANGLE_90)>>ANGLETOFINESHIFT;
 	angle2 = (angle2+ANGLE_90)>>ANGLETOFINESHIFT;
+
+	// killough 1/31/98: Here is where "slime trails" can SOMETIMES occur:
 	x1 = viewangletox[angle1];
 	x2 = viewangletox[angle2];
 
@@ -473,17 +385,19 @@ static void R_AddLine(seg_t *line)
 	backsector = line->backsector;
 
 	// Portal line
-	if (line->linedef->special == 40 && line->side == 0)
+	if (line->linedef->special == PORTALSPECIAL && line->side == 0)
 	{
 		if (portalrender < cv_maxportals.value)
 		{
 			// Find the other side!
-			INT32 line2 = P_FindSpecialLineFromTag(40, line->linedef->tag, -1);
+			INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, -1);
+
 			if (line->linedef == &lines[line2])
-				line2 = P_FindSpecialLineFromTag(40, line->linedef->tag, line2);
+				line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, line2);
+
 			if (line2 >= 0) // found it!
 			{
-				R_AddPortal(line->linedef-lines, line2, x1, x2); // Remember the lines for later rendering
+				Portal_Add2Lines(line->linedef-lines, line2, x1, x2); // Remember the lines for later rendering
 				//return; // Don't fill in that space now!
 				goto clipsolid;
 			}
@@ -500,74 +414,63 @@ static void R_AddLine(seg_t *line)
 
 	doorclosed = 0;
 
+	// likewise, but for floors and upper textures
+	if (backsector->floorpic == skyflatnum && frontsector->floorpic == skyflatnum)
+		bothfloorssky = true;
+
+	fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
+	fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
+
 	// Closed door.
 	if (frontsector->f_slope || frontsector->c_slope || backsector->f_slope || backsector->c_slope)
 	{
-		fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
-		fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
 #define SLOPEPARAMS(slope, end1, end2, normalheight) \
-		if (slope) { \
-			end1 = P_GetZAt(slope, line->v1->x, line->v1->y); \
-			end2 = P_GetZAt(slope, line->v2->x, line->v2->y); \
-		} else \
-			end1 = end2 = normalheight;
+	end1 = P_GetZAt(slope, line->v1->x, line->v1->y, normalheight); \
+	end2 = P_GetZAt(slope, line->v2->x, line->v2->y, normalheight);
 
 		SLOPEPARAMS(frontsector->f_slope, frontf1, frontf2, frontsector->floorheight)
 		SLOPEPARAMS(frontsector->c_slope, frontc1, frontc2, frontsector->ceilingheight)
 		SLOPEPARAMS( backsector->f_slope, backf1,  backf2,  backsector->floorheight)
 		SLOPEPARAMS( backsector->c_slope, backc1,  backc2,  backsector->ceilingheight)
 #undef SLOPEPARAMS
-		if (viewsector != backsector && viewsector != frontsector)
-		{
-			if ((backc1 <= frontf1 && backc2 <= frontf2)
-				|| (backf1 >= frontc1 && backf2 >= frontc2))
-			{
-				goto clipsolid;
-			}
-
-			// Check for automap fix. Store in doorclosed for r_segs.c
-			doorclosed = (backc1 <= backf1 && backc2 <= backf2
-			&& ((backc1 >= frontc1 && backc2 >= frontc2) || curline->sidedef->toptexture)
-			&& ((backf1 <= frontf1 && backf2 >= frontf2) || curline->sidedef->bottomtexture)
-			&& (backsector->ceilingpic != skyflatnum || frontsector->ceilingpic != skyflatnum));
-
-			if (doorclosed)
-				goto clipsolid;
-		}
-
-		// Window.
-		if (backc1 != frontc1 || backc2 != frontc2
-			|| backf1 != frontf1 || backf2 != frontf2)
-		{
-			goto clippass;
-		}
 	}
 	else
 	{
-		if (viewsector != backsector && viewsector != frontsector)
-		{
-			if (backsector->ceilingheight <= frontsector->floorheight
-				|| backsector->floorheight >= frontsector->ceilingheight)
-			{
-				goto clipsolid;
-			}
+		frontf1 = frontf2 = frontsector->floorheight;
+		frontc1 = frontc2 = frontsector->ceilingheight;
+		backf1 = backf2 = backsector->floorheight;
+		backc1 = backc2 = backsector->ceilingheight;
+	}
 
-			// Check for automap fix. Store in doorclosed for r_segs.c
-			doorclosed = (backsector->ceilingheight <= backsector->floorheight
-			&& (backsector->ceilingheight >= frontsector->ceilingheight || curline->sidedef->toptexture)
-			&& (backsector->floorheight <= frontsector->floorheight || curline->sidedef->bottomtexture)
-			&& (backsector->ceilingpic != skyflatnum || frontsector->ceilingpic != skyflatnum));
+	if (viewsector != backsector && viewsector != frontsector)
+	{
+		// here we're talking about a CEILING lower than a floor. ...yeah we don't even need to bother.
+		const boolean ceillow = (backc1 <= frontf1 && backc2 <= frontf2);
 
-			if (doorclosed)
-				goto clipsolid;
-		}
-
-		// Window.
-		if (backsector->ceilingheight != frontsector->ceilingheight
-			|| backsector->floorheight != frontsector->floorheight)
+		// this tries to fix some skyboxes drawing a black void as a midtexture lel
+		if (ceillow && (!bothfloorssky && backsector->ceilingpic == skyflatnum && frontsector->ceilingpic != skyflatnum) // double sided with back ceiling sky but not front ceiling sky
+			&& !line->sidedef->midtexture && !line->sidedef->bottomtexture && !line->sidedef->toptexture && !line->polyseg) // effectively empty
 		{
 			goto clippass;
 		}
+
+		doorclosed = ceillow
+		|| (backf1 >= frontc1 && backf2 >= frontc2)
+		// Check for automap fix. Store in doorclosed for r_segs.c
+		|| (backc1 <= backf1 && backc2 <= backf2
+		&& ((backc1 >= frontc1 && backc2 >= frontc2) || curline->sidedef->toptexture)
+		&& ((backf1 <= frontf1 && backf2 >= frontf2) || curline->sidedef->bottomtexture)
+		&& (backsector->ceilingpic != skyflatnum || frontsector->ceilingpic != skyflatnum));
+
+		if (doorclosed)
+			goto clipsolid;
+	}
+
+	// Window.
+	if (backc1 != frontc1 || backc2 != frontc2
+		|| backf1 != frontf1 || backf2 != frontf2)
+	{
+		goto clippass;
 	}
 
 	// Reject empty lines used for triggers and special events.
@@ -579,15 +482,15 @@ static void R_AddLine(seg_t *line)
 
 clippass:
 	g_walloffscreen = false;
+	R_ClipWallSegment<ClipType::kPass>(x1, x2);
+
 	if (g_walloffscreen)
-		R_ClipPassWallSegment(x1, x2 - 1, true);
-	else
-		R_ClipPassWallSegment(x1, x2 - 1, false);
+		R_ClipWallSegment<ClipType::kSolidDontRender>(x1, x2);
 	return;
 
 clipsolid:
 	g_walloffscreen = false;
-	R_ClipSolidWallSegment(x1, x2 - 1);
+	R_ClipWallSegment<ClipType::kSolid>(x1, x2);
 }
 
 //
@@ -620,8 +523,8 @@ static boolean R_CheckBBox(const fixed_t *bspcoord)
 	angle_t angle1, angle2;
 	INT32 sx1, sx2, boxpos;
 	const INT32* check;
-	cliprange_t *start;
 
+<<<<<<< HEAD:src/r_bsp.c
 	// Find the corners of the box that define the edges from current viewpoint.
 	if (viewx <= bspcoord[BOXLEFT])
 		boxpos = 0;
@@ -636,6 +539,12 @@ static boolean R_CheckBBox(const fixed_t *bspcoord)
 		boxpos |= 1<<2;
 	else
 		boxpos |= 2<<2;
+=======
+	// Find the corners of the box
+	// that define the edges from current viewpoint.
+	boxpos = (viewx <= bspcoord[BOXLEFT] ? 0 : viewx < bspcoord[BOXRIGHT ] ? 1 : 2) +
+	(viewy >= bspcoord[BOXTOP ] ? 0 : viewy > bspcoord[BOXBOTTOM] ? 4 : 8);
+>>>>>>> Saturn-Next:src/r_bsp.cpp
 
 	if (boxpos == 5)
 		return true;
@@ -646,18 +555,23 @@ static boolean R_CheckBBox(const fixed_t *bspcoord)
 	angle1 = R_PointToAngle64(bspcoord[check[0]], bspcoord[check[1]]) - viewangle;
 	angle2 = R_PointToAngle64(bspcoord[check[2]], bspcoord[check[3]]) - viewangle;
 
-	if ((signed)angle1 < (signed)angle2)
+	// cph - replaced old code, which was unclear and badly commented
+	// Much more efficient code now
+	if ((signed)angle1 < (signed)angle2) /* it's "behind" us */
 	{
+		/* Either angle1 or angle2 is behind us, so it doesn't matter if we
+		 * change it to the corect sign
+		 */
 		if ((angle1 >= ANGLE_180) && (angle1 < ANGLE_270))
 			angle1 = ANGLE_180-1;
 		else
 			angle2 = ANGLE_180;
 	}
 
-	if ((signed)angle2 >= (signed)clipangle) return false;
-	if ((signed)angle1 <= -(signed)clipangle) return false;
-	if ((signed)angle1 >= (signed)clipangle) angle1 = clipangle;
-	if ((signed)angle2 <= -(signed)clipangle) angle2 = 0-clipangle;
+	if ((signed)angle2 >= (signed)clipangle)  return false;                // Both off left edge
+	if ((signed)angle1 <= -(signed)clipangle) return false;                // Both off right edge
+	if ((signed)angle1 >= (signed)clipangle)  angle1 = clipangle;          // Clip at left edge
+	if ((signed)angle2 <= -(signed)clipangle) angle2 = -(signed)clipangle; // Clip at right edge
 
 	// Find the first clippost that touches the source post (adjacent pixels are touching).
 	angle1 = (angle1+ANGLE_90)>>ANGLETOFINESHIFT;
@@ -669,20 +583,18 @@ static boolean R_CheckBBox(const fixed_t *bspcoord)
 	if (sx1 >= sx2)
 		return false;
 
-	start = solidsegs;
-	while (start->last < sx2)
-		start++;
-
-	if (sx1 >= start->first && sx2 <= start->last)
-		return false; // The clippost contains the new span.
+	if (!memchr(solidcol+sx1, 0, sx2-sx1))
+	{
+		// All columns it covers are already solidly covered
+		return false;
+	}
 
 	return true;
 }
 
-
 size_t numpolys;        // number of polyobjects in current subsector
 size_t num_po_ptrs;     // number of polyobject pointers allocated
-polyobj_t **po_ptrs; // temp ptr array to sort polyobject pointers
+polyobj_t **po_ptrs;    // temp ptr array to sort polyobject pointers
 
 //
 // R_PolyobjCompare
@@ -720,8 +632,7 @@ void R_SortPolyObjects(subsector_t *sub)
 		{
 			// use free instead realloc since faster (thanks Lee ^_^)
 			free(po_ptrs);
-			po_ptrs = malloc((num_po_ptrs = numpolys*2)
-				* sizeof(*po_ptrs));
+			po_ptrs = static_cast<polyobj_t**>(malloc((num_po_ptrs = numpolys*2)* sizeof(*po_ptrs)));
 		}
 
 		po = sub->polyList;
@@ -738,8 +649,7 @@ void R_SortPolyObjects(subsector_t *sub)
 		// 03/10/06: only bother if there are actually polys to sort
 		if (numpolys >= 2)
 		{
-			qs22j(po_ptrs, numpolys, sizeof(polyobj_t *),
-				R_PolyobjCompare);
+			qs22j(po_ptrs, numpolys, sizeof(polyobj_t *), R_PolyobjCompare);
 		}
 	}
 }
@@ -765,8 +675,8 @@ static int R_PolysegCompare(const void *p1, const void *p2)
 	dist2v1 = vxdist(seg2->v1);
 	dist2v2 = vxdist(seg2->v2);
 
-	if (min(dist1v1, dist1v2) != min(dist2v1, dist2v2))
-		return min(dist1v1, dist1v2) - min(dist2v1, dist2v2);
+	if (std::min(dist1v1, dist1v2) != std::min(dist2v1, dist2v2))
+		return std::min(dist1v1, dist1v2) - std::min(dist2v1, dist2v2);
 
 	{ // That didn't work, so now let's try this.......
 		fixed_t delta1, delta2, x1, y1, x2, y2;
@@ -831,7 +741,7 @@ static void R_AddPolyObjects(subsector_t *sub)
 		++numpolys;
 		po = (polyobj_t *)(po->link.next);
 	}
-	
+
 	// for render stats
 	ps_numpolyobjects.value.i += numpolys;
 
@@ -867,14 +777,15 @@ static void R_Subsector(size_t num)
 	fixed_t floorcenterz, ceilingcenterz;
 	ffloor_t *rover;
 
-#ifdef RANGECHECK
-	if (num >= numsubsectors)
-		I_Error("R_Subsector: ss %s with numss = %s\n", sizeu1(num), sizeu2(numsubsectors));
-#endif
-
 	// subsectors added at run-time
 	if (num >= numsubsectors)
+	{
+#ifdef RANGECHECK
+		I_Error("R_Subsector: ss %s with numss = %s\n", sizeu1(num), sizeu2(numsubsectors));
+#else
 		return;
+#endif
+	}
 
 	sub = &subsectors[num];
 	frontsector = sub->sector;
@@ -886,13 +797,8 @@ static void R_Subsector(size_t num)
 
 	floorcolormap = ceilingcolormap = frontsector->extra_colormap;
 
-	floorcenterz =
-		frontsector->f_slope ? P_GetZAt(frontsector->f_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
-		frontsector->floorheight;
-
-	ceilingcenterz =
-		frontsector->c_slope ? P_GetZAt(frontsector->c_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
-		frontsector->ceilingheight;
+	floorcenterz   = P_GetSectorFloorZAt(frontsector, frontsector->soundorg.x, frontsector->soundorg.y);
+	ceilingcenterz = P_GetSectorCeilingZAt(frontsector, frontsector->soundorg.x, frontsector->soundorg.y);
 
 	// Check and prep all 3D floors. Set the sector floor/ceiling light levels and colormaps.
 	if (frontsector->ffloors)
@@ -903,6 +809,9 @@ static void R_Subsector(size_t num)
 		{
 			for (rover = frontsector->ffloors; rover; rover = rover->next)
 			{
+				if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES))
+					continue;
+
 				sector_t *controlSec = &sectors[rover->secnum];
 
 				if (controlSec->moved != true)
@@ -934,23 +843,19 @@ static void R_Subsector(size_t num)
 
 	sub->sector->extra_colormap = frontsector->extra_colormap;
 
-	if (((
-			frontsector->f_slope ? P_GetZAt(frontsector->f_slope, viewx, viewy) :
-		frontsector->floorheight) < viewz || (frontsector->heightsec != -1
+	if ((P_GetSectorFloorZAt(frontsector, viewx, viewy) < viewz || (frontsector->heightsec != -1
 		&& sectors[frontsector->heightsec].ceilingpic == skyflatnum)))
 	{
 		floorplane = R_FindPlane(frontsector->floorheight, frontsector->floorpic, floorlightlevel,
 			frontsector->floor_xoffs, frontsector->floor_yoffs, frontsector->floorpic_angle, floorcolormap, NULL
 			, NULL
 			, frontsector->f_slope
-			, R_NoEncore(frontsector, false));
+			, R_NoEncore(frontsector, false), false, frontsector);
 	}
 	else
 		floorplane = NULL;
 
-	if (((
-			frontsector->c_slope ? P_GetZAt(frontsector->c_slope, viewx, viewy) :
-		frontsector->ceilingheight) > viewz || frontsector->ceilingpic == skyflatnum
+	if ((P_GetSectorCeilingZAt(frontsector, viewx, viewy) > viewz || frontsector->ceilingpic == skyflatnum
 		|| (frontsector->heightsec != -1
 		&& sectors[frontsector->heightsec].floorpic == skyflatnum)))
 	{
@@ -959,7 +864,7 @@ static void R_Subsector(size_t num)
 			ceilingcolormap, NULL
 			, NULL
 			, frontsector->c_slope
-			, R_NoEncore(frontsector, true));
+			, R_NoEncore(frontsector, true), true, frontsector);
 	}
 	else
 		ceilingplane = NULL;
@@ -968,13 +873,14 @@ static void R_Subsector(size_t num)
 	ffloor[numffloors].slope = NULL;
 	ffloor[numffloors].plane = NULL;
 	ffloor[numffloors].polyobj = NULL;
+
 	if (frontsector->ffloors)
 	{
 		fixed_t heightcheck, planecenterz;
 
 		for (rover = frontsector->ffloors; rover && numffloors < MAXFFLOORS; rover = rover->next)
 		{
-			if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES))
+			if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES) || !(rover->flags & FF_RENDERALL))
 				continue;
 
 			if (frontsector->cullheight)
@@ -989,13 +895,9 @@ static void R_Subsector(size_t num)
 			ffloor[numffloors].plane = NULL;
 			ffloor[numffloors].polyobj = NULL;
 
-			heightcheck =
-				*rover->b_slope ? P_GetZAt(*rover->b_slope, viewx, viewy) :
-				*rover->bottomheight;
+			heightcheck  = P_GetFFloorBottomZAt(rover, viewx, viewy);
+			planecenterz = P_GetFFloorBottomZAt(rover, frontsector->soundorg.x, frontsector->soundorg.y);
 
-			planecenterz =
-				*rover->b_slope ? P_GetZAt(*rover->b_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
-				*rover->bottomheight;
 			if (planecenterz <= ceilingcenterz
 				&& planecenterz >= floorcenterz
 				&& ((viewz < heightcheck && !(rover->flags & FF_INVERTPLANES))
@@ -1009,7 +911,7 @@ static void R_Subsector(size_t num)
 					*rover->bottomyoffs, *rover->bottomangle, frontsector->lightlist[light].extra_colormap, rover
 					, NULL
 					, *rover->b_slope
-					, R_NoEncore(rover->master->frontsector, true));
+					, R_NoEncore(rover->master->frontsector, true), true, frontsector);
 
 				ffloor[numffloors].slope = *rover->b_slope;
 
@@ -1021,18 +923,16 @@ static void R_Subsector(size_t num)
 				ffloor[numffloors].ffloor = rover;
 				numffloors++;
 			}
+
 			if (numffloors >= MAXFFLOORS)
 				break;
+
 			ffloor[numffloors].plane = NULL;
 			ffloor[numffloors].polyobj = NULL;
 
-			heightcheck =
-				*rover->t_slope ? P_GetZAt(*rover->t_slope, viewx, viewy) :
-				*rover->topheight;
+			heightcheck  = P_GetFFloorTopZAt(rover, viewx, viewy);
+			planecenterz = P_GetFFloorTopZAt(rover, frontsector->soundorg.x, frontsector->soundorg.y);
 
-			planecenterz =
-				*rover->t_slope ? P_GetZAt(*rover->t_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
-				*rover->topheight;
 			if (planecenterz >= floorcenterz
 				&& planecenterz <= ceilingcenterz
 				&& ((viewz > heightcheck && !(rover->flags & FF_INVERTPLANES))
@@ -1045,7 +945,7 @@ static void R_Subsector(size_t num)
 					frontsector->lightlist[light].extra_colormap, rover
 					, NULL
 					, *rover->t_slope
-					, R_NoEncore(rover->master->frontsector, false));
+					, R_NoEncore(rover->master->frontsector, false), false, frontsector);
 
 				ffloor[numffloors].slope = *rover->t_slope;
 
@@ -1090,7 +990,11 @@ static void R_Subsector(size_t num)
 					polysec->floorpic_angle-po->angle,
 					(light == -1 ? frontsector->extra_colormap : frontsector->lightlist[light].extra_colormap), NULL, po
 					,NULL // will ffloors be slopable eventually?
+<<<<<<< HEAD:src/r_bsp.c
 					, R_NoEncore(polysec, false));
+=======
+					, R_NoEncore(polysec, false), false, frontsector);
+>>>>>>> Saturn-Next:src/r_bsp.cpp
 
 				ffloor[numffloors].height = polysec->floorheight;
 				ffloor[numffloors].polyobj = po;
@@ -1114,7 +1018,11 @@ static void R_Subsector(size_t num)
 					(light == -1 ? frontsector->lightlevel : *frontsector->lightlist[light].lightlevel), polysec->ceiling_xoffs, polysec->ceiling_yoffs, polysec->ceilingpic_angle-po->angle,
 					(light == -1 ? frontsector->extra_colormap : frontsector->lightlist[light].extra_colormap), NULL, po
 					,NULL // will ffloors be slopable eventually?
+<<<<<<< HEAD:src/r_bsp.c
 					, R_NoEncore(polysec, true));
+=======
+					, R_NoEncore(polysec, true), false, frontsector);
+>>>>>>> Saturn-Next:src/r_bsp.cpp
 
 				ffloor[numffloors].polyobj = po;
 				ffloor[numffloors].height = polysec->ceilingheight;
@@ -1157,7 +1065,7 @@ static void R_Subsector(size_t num)
 	{
 //		CONS_Debug(DBG_GAMELOGIC, "Adding normal line %d...(%d)\n", line->linedef-lines, leveltime);
 		if (!line->polyseg) // ignore segs that belong to polyobjects
-		R_AddLine(line);
+			R_AddLine(line);
 		line++;
 		curline = NULL; /* cph 2001/11/18 - must clear curline now we're done with it, so stuff doesn't try using it for other things */
 	}
@@ -1182,25 +1090,25 @@ void R_Prep3DFloors(sector_t *sector)
 	count = 1;
 	for (rover = sector->ffloors; rover; rover = rover->next)
 	{
-		if (!((rover->flags & FF_EXISTS) && (!(rover->flags & FF_NOSHADE)
-			|| (rover->flags & FF_CUTLEVEL) || (rover->flags & FF_CUTSPRITES))))
-			continue;
-
-		count++;
-		if (rover->flags & FF_DOUBLESHADOW)
+		if ((rover->flags & FF_EXISTS) && (!(rover->flags & FF_NOSHADE)
+			|| (rover->flags & FF_CUTLEVEL) || (rover->flags & FF_CUTSPRITES)))
+		{
 			count++;
+			if (rover->flags & FF_DOUBLESHADOW)
+				count++;
+		}
 	}
 
 	if (count != sector->numlights)
 	{
 		Z_Free(sector->lightlist);
-		sector->lightlist = Z_Calloc(sizeof (*sector->lightlist) * count, PU_LEVEL, NULL);
+		sector->lightlist = static_cast<lightlist_t*>(Z_Calloc(sizeof (*sector->lightlist) * count, PU_LEVEL, NULL));
 		sector->numlights = count;
 	}
 	else
 		memset(sector->lightlist, 0, sizeof (lightlist_t) * count);
 
-	heighttest = sector->c_slope ? P_GetZAt(sector->c_slope, sector->soundorg.x, sector->soundorg.y) : sector->ceilingheight;
+	heighttest = P_GetSectorCeilingZAt(sector, sector->soundorg.x, sector->soundorg.y);
 
 	sector->lightlist[0].height = heighttest + 1;
 	sector->lightlist[0].slope = sector->c_slope;
@@ -1219,9 +1127,9 @@ void R_Prep3DFloors(sector_t *sector)
 			rover->lastlight = 0;
 			if (!(rover->flags & FF_EXISTS) || (rover->flags & FF_NOSHADE
 				&& !(rover->flags & FF_CUTLEVEL) && !(rover->flags & FF_CUTSPRITES)))
-			continue;
+				continue;
 
-			heighttest = *rover->t_slope ? P_GetZAt(*rover->t_slope, sector->soundorg.x, sector->soundorg.y) : *rover->topheight;
+			heighttest = P_GetFFloorTopZAt(rover, sector->soundorg.x, sector->soundorg.y);
 
 			if (heighttest > bestheight && heighttest < maxheight)
 			{
@@ -1230,8 +1138,9 @@ void R_Prep3DFloors(sector_t *sector)
 				bestslope = *rover->t_slope;
 				continue;
 			}
-			if (rover->flags & FF_DOUBLESHADOW) {
-				heighttest = *rover->b_slope ? P_GetZAt(*rover->b_slope, sector->soundorg.x, sector->soundorg.y) : *rover->bottomheight;
+			if (rover->flags & FF_DOUBLESHADOW)
+			{
+				heighttest = P_GetFFloorBottomZAt(rover, sector->soundorg.x, sector->soundorg.y);
 
 				if (heighttest > bestheight
 					&& heighttest < maxheight)
@@ -1243,6 +1152,7 @@ void R_Prep3DFloors(sector_t *sector)
 				}
 			}
 		}
+
 		if (!best)
 		{
 			sector->numlights = i;
@@ -1255,6 +1165,7 @@ void R_Prep3DFloors(sector_t *sector)
 		sector->lightlist[i].slope = bestslope;
 		sec = &sectors[best->secnum];
 		mapnum = sec->midmap;
+
 		if (mapnum >= 0 && (size_t)mapnum < num_extra_colormaps)
 			sec->extra_colormap = &extra_colormaps[mapnum];
 		else
@@ -1278,7 +1189,8 @@ void R_Prep3DFloors(sector_t *sector)
 
 		if (best->flags & FF_DOUBLESHADOW)
 		{
-			heighttest = *best->b_slope ? P_GetZAt(*best->b_slope, sector->soundorg.x, sector->soundorg.y) : *best->bottomheight;
+			heighttest = P_GetFFloorBottomZAt(best, sector->soundorg.x, sector->soundorg.y);
+
 			if (bestheight == heighttest) ///TODO: do this in a more efficient way -Red
 			{
 				sector->lightlist[i].lightlevel = sector->lightlist[best->lastlight].lightlevel;
@@ -1331,7 +1243,7 @@ void R_RenderBSPNode(INT32 bspnum)
 		bsp = &nodes[bspnum];
 
 		// Decide which side the view point is on.
-		side = R_PointOnSide(viewx, viewy, bsp);
+		side = R_PointOnSideFast(viewx, viewy, bsp);
 		// Recursively divide front space.
 		R_RenderBSPNode(bsp->children[side]);
 
@@ -1345,8 +1257,7 @@ void R_RenderBSPNode(INT32 bspnum)
 	// PORTAL CULLING
 	if (portalcullsector)
 	{
-		sector_t *sect = subsectors[bspnum & ~NF_SUBSECTOR].sector;
-		if (sect != portalcullsector)
+		if (subsectors[bspnum & ~NF_SUBSECTOR].sector != portalcullsector)
 			return;
 		portalcullsector = NULL;
 	}
diff --git a/src/r_bsp.h b/src/r_bsp.h
index 2803a90e4..b9e4e291d 100644
--- a/src/r_bsp.h
+++ b/src/r_bsp.h
@@ -14,32 +14,41 @@
 #ifndef __R_BSP__
 #define __R_BSP__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include "r_main.h"
+
 extern seg_t *curline;
 extern side_t *sidedef;
 extern line_t *linedef;
 extern sector_t *frontsector;
 extern sector_t *backsector;
-extern boolean portalline; // is curline a portal seg?
+typedef struct portal_s portal_t;
+extern portal_t *g_portal; // is curline a portal seg?
 
 // drawsegs are allocated on the fly... see r_segs.c
 
 extern INT32 checkcoord[12][4];
 
+extern drawseg_t *curdrawsegs;
 extern drawseg_t *drawsegs;
 extern drawseg_t *ds_p;
 extern INT32 doorclosed;
+extern UINT8 *solidcol;
 extern boolean g_walloffscreen;
 
 // BSP?
 void R_ClearClipSegs(void);
 void R_PortalClearClipSegs(INT32 start, INT32 end);
+void R_AllocClipSegMemory(void);
 void R_ClearDrawSegs(void);
 void R_RenderBSPNode(INT32 bspnum);
-void R_AddPortal(INT32 line1, INT32 line2, INT32 x1, INT32 x2);
 
 // determines when a given sector shouldn't abide by the encoremap's palette.
 // no longer a static since this is used for encore in hw_main.c as well now:
@@ -53,8 +62,13 @@ extern polyobj_t **po_ptrs; // temp ptr array to sort polyobject pointers
 
 sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
 	INT32 *ceilinglightlevel, boolean back);
-boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back);
+boolean R_IsEmptyLine(seg_t *line, const sector_t *front, const sector_t *back);
 
 INT32 R_GetPlaneLight(sector_t *sector, fixed_t planeheight, boolean underside);
 void R_Prep3DFloors(sector_t *sector);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/r_data.c b/src/r_data.c
index a725d2ac9..688b03972 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -28,7 +28,6 @@
 
 #ifdef HWRENDER
 #include "hardware/hw_main.h"
-#include "hardware/hw_glob.h" // HWR_ClearLightTables
 #endif
 
 #ifdef _WIN32
@@ -101,10 +100,10 @@ INT32 numtextures = 0; // total number of textures found,
 
 texture_t **textures = NULL;
 static UINT32 **texturecolumnofs; // column offset lookup table for each texture
-static UINT8 **texturecache; // graphics data for each generated full-size texture
+UINT8 **texturecache; // graphics data for each generated full-size texture
 
 // texture width is a power of 2, so it can easily repeat along sidedefs using a simple mask
-INT32 *texturewidthmask;
+static INT32 *texturewidthmask;
 
 fixed_t *textureheight; // needed for texture pegging
 
@@ -126,6 +125,113 @@ size_t flatmemory, spritememory, texturememory; // gotta play by 2.2 rules to ge
 INT16 color8to16[256]; // remap color index to highcolor rgb value
 INT16 *hicolormaps; // test a 32k colormap remaps high -> high
 
+// Blends two pixels together, using the equation
+// that matches the specified alpha style.
+UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha)
+{
+	RGBA_t output;
+	INT16 fullalpha = (alpha - (0xFF - foreground.s.alpha));
+	if (style == AST_TRANSLUCENT)
+	{
+		if (fullalpha <= 0)
+			output.rgba = background.rgba;
+		else
+		{
+			// don't go too high
+			if (fullalpha >= 0xFF)
+				fullalpha = 0xFF;
+			alpha = (UINT8)fullalpha;
+
+			// if the background pixel is empty,
+			// match software and don't blend anything
+			if (!background.s.alpha)
+			{
+				// ...unless the foreground pixel ISN'T actually translucent.
+				if (alpha == 0xFF)
+					output.rgba = foreground.rgba;
+				else
+					output.rgba = 0;
+			}
+			else
+			{
+				UINT8 beta = (0xFF - alpha);
+				output.s.red = ((background.s.red * beta) + (foreground.s.red * alpha)) / 0xFF;
+				output.s.green = ((background.s.green * beta) + (foreground.s.green * alpha)) / 0xFF;
+				output.s.blue = ((background.s.blue * beta) + (foreground.s.blue * alpha)) / 0xFF;
+				output.s.alpha = 0xFF;
+			}
+		}
+		return output.rgba;
+	}
+#define clamp(c) max(min(c, 0xFF), 0x00);
+	else
+	{
+		float falpha = ((float)alpha / 256.0f);
+		float fr = ((float)foreground.s.red * falpha);
+		float fg = ((float)foreground.s.green * falpha);
+		float fb = ((float)foreground.s.blue * falpha);
+		if (style == AST_ADD)
+		{
+			output.s.red = clamp((int)(background.s.red + fr));
+			output.s.green = clamp((int)(background.s.green + fg));
+			output.s.blue = clamp((int)(background.s.blue + fb));
+		}
+		else if (style == AST_SUBTRACT)
+		{
+			output.s.red = clamp((int)(background.s.red - fr));
+			output.s.green = clamp((int)(background.s.green - fg));
+			output.s.blue = clamp((int)(background.s.blue - fb));
+		}
+		else if (style == AST_REVERSESUBTRACT)
+		{
+			output.s.red = clamp((int)((-background.s.red) + fr));
+			output.s.green = clamp((int)((-background.s.green) + fg));
+			output.s.blue = clamp((int)((-background.s.blue) + fb));
+		}
+		else if (style == AST_MODULATE)
+		{
+			fr = ((float)foreground.s.red / 256.0f);
+			fg = ((float)foreground.s.green / 256.0f);
+			fb = ((float)foreground.s.blue / 256.0f);
+			output.s.red = clamp((int)(background.s.red * fr));
+			output.s.green = clamp((int)(background.s.green * fg));
+			output.s.blue = clamp((int)(background.s.blue * fb));
+		}
+		// just copy the pixel
+		else if (style == AST_COPY)
+			output.rgba = foreground.rgba;
+
+		output.s.alpha = 0xFF;
+		return output.rgba;
+	}
+#undef clamp
+	return 0;
+}
+
+INT32 ASTTextureBlendingThreshold[2] = {255/11, (10*255/11)};
+
+// Blends a pixel for a texture patch.
+UINT32 ASTBlendTexturePixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha)
+{
+	// Alpha style set to translucent?
+	if (style == AST_TRANSLUCENT)
+	{
+		// Is the alpha small enough for translucency?
+		if (alpha <= ASTTextureBlendingThreshold[1])
+		{
+			// Is the patch way too translucent? Don't blend then.
+			if (alpha < ASTTextureBlendingThreshold[0])
+				return background.rgba;
+
+			return ASTBlendPixel(background, foreground, style, alpha);
+		}
+		else // just copy the pixel
+			return foreground.rgba;
+	}
+	else
+		return ASTBlendPixel(background, foreground, style, alpha);
+}
+
 // Painfully simple texture id cacheing to make maps load faster. :3
 static struct {
 	char name[9];
@@ -190,14 +296,15 @@ static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, INT32 orig
 // This is not optimised, but it's supposed to be executed only once
 // per level, when enough memory is available.
 //
-static UINT8 *R_GenerateTexture(size_t texnum)
+UINT8 *R_GenerateTexture(size_t texnum)
 {
 	UINT8 *block;
 	UINT8 *blocktex;
 	texture_t *texture;
 	texpatch_t *patch;
-	patch_t *realpatch;
-	int x, x1, x2, i;
+	softwarepatch_t *realpatch;
+	UINT8 *pdata;
+	int x, x1, x2, i, width, height;
 	size_t blocksize;
 	column_t *patchcol;
 	UINT8 *colofs;
@@ -216,29 +323,37 @@ static UINT8 *R_GenerateTexture(size_t texnum)
 	{
 		boolean holey = false;
 		patch = texture->patches;
-		realpatch = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_CACHE);
+		pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
+		realpatch = (softwarepatch_t *)pdata;
 
 		// Check the patch for holes.
 		if (texture->width > SHORT(realpatch->width) || texture->height > SHORT(realpatch->height))
 			holey = true;
-		colofs = (UINT8 *)realpatch->columnofs;
-		for (x = 0; x < texture->width && !holey; x++)
+		else
 		{
-			column_t *col = (column_t *)((UINT8 *)realpatch + LONG(*(UINT32 *)&colofs[x<<2]));
-			INT32 topdelta, prevdelta = -1, y = 0;
-			while (col->topdelta != 0xff)
+			colofs = (UINT8 *)realpatch->columnofs;
+
+			for (x = 0; x < texture->width; x++)
 			{
-				topdelta = col->topdelta;
-				if (topdelta <= prevdelta)
-					topdelta += prevdelta;
-				prevdelta = topdelta;
-				if (topdelta > y)
-					break;
-				y = topdelta + col->length + 1;
-				col = (column_t *)((UINT8 *)col + col->length + 4);
+				column_t *col = (column_t *)((UINT8 *)realpatch + LONG(*(UINT32 *)&colofs[x<<2]));
+
+				INT32 topdelta, prevdelta = -1, y = 0;
+
+				while (col->topdelta != 0xff)
+				{
+					topdelta = col->topdelta;
+					if (topdelta <= prevdelta)
+						topdelta += prevdelta;
+					prevdelta = topdelta;
+					if (topdelta > y)
+						break;
+					y = topdelta + col->length + 1;
+					col = (column_t *)((UINT8 *)col + col->length + 4);
+				}
+
+				if (y < texture->height)
+					holey = true; // this texture is HOLEy! D:
 			}
-			if (y < texture->height)
-				holey = true; // this texture is HOLEy! D:
 		}
 
 		// If the patch uses transparency, we have to save it this way.
@@ -246,8 +361,7 @@ static UINT8 *R_GenerateTexture(size_t texnum)
 		{
 			texture->holes = true;
 			blocksize = W_LumpLengthPwad(patch->wad, patch->lump);
-			block = Z_Calloc(blocksize, PU_STATIC, // will change tag at end of this function
-				&texturecache[texnum]);
+			block = Z_Calloc(blocksize, PU_LEVEL, &texturecache[texnum]);
 			M_Memcpy(block, realpatch, blocksize);
 			texturememory += blocksize;
 
@@ -255,8 +369,12 @@ static UINT8 *R_GenerateTexture(size_t texnum)
 			colofs = (block + 8);
 			texturecolumnofs[texnum] = (UINT32 *)colofs;
 			blocktex = block;
+
 			for (x = 0; x < texture->width; x++)
+			{
 				*(UINT32 *)&colofs[x<<2] = LONG(LONG(*(UINT32 *)&colofs[x<<2]) + 3);
+			}
+
 			goto done;
 		}
 
@@ -267,9 +385,9 @@ static UINT8 *R_GenerateTexture(size_t texnum)
 	texture->holes = false;
 	blocksize = (texture->width * 4) + (texture->width * texture->height);
 	texturememory += blocksize;
-	block = Z_Malloc(blocksize+1, PU_STATIC, &texturecache[texnum]);
+	block = Z_Malloc(blocksize+1, PU_LEVEL, &texturecache[texnum]);
 
-	memset(block, 0xF7, blocksize+1); // Transparency hack
+	memset(block, TRANSPARENTPIXEL, blocksize+1); // Transparency hack
 
 	// columns lookup table
 	colofs = block;
@@ -281,15 +399,30 @@ static UINT8 *R_GenerateTexture(size_t texnum)
 	// Composite the columns together.
 	for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
 	{
-		realpatch = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_CACHE);
-		x1 = patch->originx;
-		x2 = x1 + SHORT(realpatch->width);
+		pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
+		realpatch = (softwarepatch_t *)pdata;
 
+		x1 = patch->originx;
+		width = SHORT(realpatch->width);
+		height = SHORT(realpatch->height);
+		x2 = x1 + width;
+
+		if (x1 > texture->width || x2 < 0)
+			continue; // patch not located within texture's x bounds, ignore
+
+		if (patch->originy > texture->height || (patch->originy + height) < 0)
+			continue; // patch not located within texture's y bounds, ignore
+
+		// patch is actually inside the texture!
+		// now check if texture is partly off-screen and adjust accordingly
+
+		// left edge
 		if (x1 < 0)
 			x = 0;
 		else
 			x = x1;
 
+		// right edge
 		if (x2 > texture->width)
 			x2 = texture->width;
 
@@ -304,8 +437,6 @@ static UINT8 *R_GenerateTexture(size_t texnum)
 	}
 
 done:
-	// Now that the texture has been built in column cache, it is purgable from zone memory.
-	Z_ChangeTag(block, PU_CACHE);
 	return blocktex;
 }
 
@@ -342,11 +473,26 @@ UINT8 *R_GetColumn(fixed_t tex, INT32 col)
 {
 	UINT8 *data;
 
-	col &= texturewidthmask[tex];
 	data = texturecache[tex];
 
+	if (texturewidthmask[tex])
+		col &= texturewidthmask[tex];  // set by load textures
+	else
+	{
+		const INT16 texwidth = textures[tex]->width;
+
+		// Odd width texture, cannot just mask.
+		// Sometime gets colnum = -1 or = width, even without tiling.
+		// Test LostCiv, Map 20, crates.
+		col = ((col % texwidth) + texwidth) % texwidth;
+	}
+
 	if (!data)
+	{
+		// This must be here because cache can be freed by other operations.
+		// To prevent must lock individual texture cache on every draw.
 		data = R_GenerateTexture(tex);
+	}
 
 	return data + LONG(texturecolumnofs[tex][col]);
 }
@@ -355,7 +501,7 @@ UINT8 *R_GetColumn(fixed_t tex, INT32 col)
 //
 UINT8 *R_GetFlat(lumpnum_t flatlumpnum)
 {
-	return W_CacheLumpNum(flatlumpnum, PU_CACHE);
+	return W_CacheLumpNum(flatlumpnum, PU_LEVEL);
 }
 
 //
@@ -385,7 +531,7 @@ void R_LoadTextures(void)
 	INT32 i, k, w;
 	UINT16 j;
 	UINT16 texstart, texend, texturesLumpPos;
-	patch_t *patchlump;
+	softwarepatch_t *patchlump;
 	texpatch_t *patch;
 	texture_t *texture;
 
@@ -410,7 +556,7 @@ void R_LoadTextures(void)
 	// but the alternative is to spend a ton of time checking and re-checking all previous entries just to skip any potentially patched textures.
 	for (w = 0, numtextures = 0; w < numwadfiles; w++)
 	{
-		if (wadfiles[w]->type == RET_PK3)
+		if (W_FileHasFolders(wadfiles[w]))
 		{
 			texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
 			texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
@@ -429,7 +575,7 @@ void R_LoadTextures(void)
 		}
 
 		// Add all the textures between TX_START and TX_END
-		if (!(texstart != INT16_MAX && texend != INT16_MAX))
+		if (texstart == INT16_MAX || texend == INT16_MAX)
 			continue;
 
 		// PK3s have subfolders, so we can't just make a simple sum
@@ -474,7 +620,7 @@ void R_LoadTextures(void)
 	for (i = 0, w = 0; w < numwadfiles; w++)
 	{
 		// Get the lump numbers for the markers in the WAD, if they exist.
-		if (wadfiles[w]->type == RET_PK3)
+		if (W_FileHasFolders(wadfiles[w]))
 		{
 			texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
 			texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
@@ -500,20 +646,25 @@ void R_LoadTextures(void)
 		// Work through each lump between the markers in the WAD.
 		for (j = 0; j < (texend - texstart); j++)
 		{
+			UINT16 wadnum = (UINT16)w;
+			lumpnum_t lumpnum = texstart + j;
+
 			if (W_FileHasFolders(wadfiles[w]))
 			{
-				if (W_IsLumpFolder(w, texstart + j)) // Check if lump is a folder
+				if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
 					continue; // If it is then SKIP IT
 			}
-			patchlump = W_CacheLumpNumPwad((UINT16)w, texstart + j, PU_CACHE);
 
-			//CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),patchlump->width, patchlump->height);
+			patchlump = (softwarepatch_t *)W_CacheLumpNumPwad(wadnum, lumpnum, PU_STATIC);
+
+			//CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad(wadnum, lumpnum), patchlump->width, patchlump->height);
 			texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
 
 			// Set texture properties.
-			M_Memcpy(texture->name, W_CheckNameForNumPwad((UINT16)w, texstart + j), sizeof(texture->name));
+			M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
 			texture->width = SHORT(patchlump->width);
 			texture->height = SHORT(patchlump->height);
+			texture->type = TEXTURETYPE_SINGLEPATCH;
 			texture->patchcount = 1;
 			texture->holes = false;
 
@@ -521,14 +672,28 @@ void R_LoadTextures(void)
 			patch = &texture->patches[0];
 
 			patch->originx = patch->originy = 0;
-			patch->wad = (UINT16)w;
+			patch->wad = wadnum;
 			patch->lump = texstart + j;
 
-			Z_Unlock(patchlump);
+			Z_Free(patchlump);
 
+			// determine width power of 2
+#if 1
+			// [WDJ] only need to determine if exact power of 2.
+			k = 1;
+			while (k < texture->width)
+				k<<=1;
+#else
+			// Largest power of 2 that fits within width.
 			k = 1;
 			while (k << 1 <= texture->width)
 				k <<= 1;
+#endif
+			if (k != texture->width)
+			{
+				// Odd width
+				k = 1;  // make texturewidthmask = 0
+			}
 
 			texturewidthmask[i] = k - 1;
 			textureheight[i] = texture->height << FRACBITS;
@@ -538,7 +703,7 @@ void R_LoadTextures(void)
 
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
-		HWR_LoadTextures(numtextures);
+		HWR_LoadMapTextures(numtextures);
 #endif
 }
 
@@ -555,12 +720,15 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 
 	// Patch identifier
 	texturesToken = M_GetToken(NULL);
+
 	if (texturesToken == NULL)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where patch name should be");
 	}
+
 	texturesTokenLength = strlen(texturesToken);
-	if (texturesTokenLength>8)
+
+	if (texturesTokenLength > 8)
 	{
 		I_Error("Error parsing TEXTURES lump: Patch name \"%s\" exceeds 8 characters",texturesToken);
 	}
@@ -578,10 +746,12 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 	// Comma 1
 	Z_Free(texturesToken);
 	texturesToken = M_GetToken(NULL);
+
 	if (texturesToken == NULL)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after \"%s\"'s patch name should be",patchName);
 	}
+
 	if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after %s's patch name, got \"%s\"",patchName,texturesToken);
@@ -590,14 +760,17 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 	// XPos
 	Z_Free(texturesToken);
 	texturesToken = M_GetToken(NULL);
+
 	if (texturesToken == NULL)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where patch \"%s\"'s x coordinate should be",patchName);
 	}
+
 	endPos = NULL;
 #ifndef AVOID_ERRNO
 	errno = 0;
 #endif
+
 	patchXPos = strtol(texturesToken,&endPos,10);
 	(void)patchXPos; //unused for now
 	if (endPos == texturesToken // Empty string
@@ -613,10 +786,12 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 	// Comma 2
 	Z_Free(texturesToken);
 	texturesToken = M_GetToken(NULL);
+
 	if (texturesToken == NULL)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where comma after patch \"%s\"'s x coordinate should be",patchName);
 	}
+
 	if (strcmp(texturesToken,",")!=0)
 	{
 		I_Error("Error parsing TEXTURES lump: Expected \",\" after patch \"%s\"'s x coordinate, got \"%s\"",patchName,texturesToken);
@@ -625,6 +800,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
 	// YPos
 	Z_Free(texturesToken);
 	texturesToken = M_GetToken(NULL);
+
 	if (texturesToken == NULL)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where patch \"%s\"'s y coordinate should be",patchName);
@@ -769,19 +945,22 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
 
 	// Left Curly Brace
 	texturesToken = M_GetToken(NULL);
+
 	if (texturesToken == NULL)
 	{
 		I_Error("Error parsing TEXTURES lump: Unexpected end of file where open curly brace for texture \"%s\" should be",newTextureName);
 	}
+
 	if (strcmp(texturesToken,"{")==0)
 	{
 		if (actuallyLoadTexture)
 		{
 			// Allocate memory for a zero-patch texture. Obviously, we'll be adding patches momentarily.
-			resultTexture = (texture_t *)Z_Calloc(sizeof(texture_t),PU_STATIC,NULL);
+			resultTexture = (texture_t *)Z_Calloc(sizeof(texture_t), PU_STATIC, NULL);
 			M_Memcpy(resultTexture->name, newTextureName, 8);
 			resultTexture->width = newTextureWidth;
 			resultTexture->height = newTextureHeight;
+			resultTexture->type = TEXTURETYPE_COMPOSITE;
 		}
 		Z_Free(texturesToken);
 		texturesToken = M_GetToken(NULL);
@@ -996,9 +1175,9 @@ static void R_InitExtraColormaps(void)
 lumpnum_t R_GetFlatNumForName(const char *name)
 {
 	INT32 i;
-	lumpnum_t lump;
-	lumpnum_t start;
-	lumpnum_t end;
+	lumpnum_t lump = LUMPERROR;
+	lumpnum_t start = LUMPERROR;
+	lumpnum_t end = LUMPERROR;
 
 	// Scan wad files backwards so patched flats take preference.
 	for (i = numwadfiles - 1; i >= 0; i--)
@@ -1073,8 +1252,7 @@ static void R_InitColormaps(void)
 
 	// Load in the light tables
 	lump = W_GetNumForName("COLORMAP");
-	//Z_MallocAlign(W_LumpLength (lump), PU_STATIC, NULL, 8);
-	colormaps = Z_MallocAlign((256 * 64), PU_STATIC, NULL, 8);
+	colormaps = Z_Malloc((256 * 64), PU_STATIC, NULL);
 	W_ReadLump(lump, colormaps);
 	// no need to init encoremap at this stage
 
@@ -1115,7 +1293,7 @@ void R_ReInitColormaps(UINT16 num, lumpnum_t newencoremap)
 		lighttable_t *colormap_p, *colormap_p2;
 		size_t p, i;
 
-		encoremap = Z_MallocAlign(256 + 10, PU_LEVEL, NULL, 8);
+		encoremap = Z_Malloc(256 + 10, PU_LEVEL, NULL);
 		W_ReadLump(newencoremap, encoremap);
 		colormap_p = colormap_p2 = colormaps;
 		colormap_p += (256 * 32);
@@ -1154,11 +1332,6 @@ void R_ClearColormaps(void)
 		foundcolormaps[i] = LUMPERROR;
 
 	memset(extra_colormaps, 0, sizeof (extra_colormaps));
-
-#ifdef HWRENDER
-	if (rendermode == render_opengl)
-		HWR_ClearLightTables();
-#endif
 }
 
 /*INT32 R_ColormapNumForName(char *name)
@@ -1179,7 +1352,7 @@ void R_ClearColormaps(void)
 	foundcolormaps[num_extra_colormaps] = lump;
 
 	// aligned on 8 bit for asm code
-	extra_colormaps[num_extra_colormaps].colormap = Z_MallocAlign(W_LumpLength(lump), PU_LEVEL, NULL, 16);
+	extra_colormaps[num_extra_colormaps].colormap = Z_Malloc(W_LumpLength(lump), PU_LEVEL, NULL);
 	W_ReadLump(lump, extra_colormaps[num_extra_colormaps].colormap);
 
 	// We set all params of the colormap to normal because there
@@ -1339,13 +1512,13 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
 	extra_colormaps[mapnum].fadestart = (UINT16)fadestart;
 	extra_colormaps[mapnum].fadeend = (UINT16)fadeend;
 	extra_colormaps[mapnum].fog = fog;
-	
+
 	if (rendermode != render_none)
-	{	
+	{
 		double r, g, b, cbrightness;
 		int p;
 		lighttable_t *colormap_p;
-	
+
 		// Initialise the map and delta arrays
 		// map[i] stores an RGB color (as double) for index i,
 		//  which is then converted to SRB2's palette later
@@ -1375,7 +1548,7 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
 		}
 
 		// Now allocate memory for the actual colormap array itself!
-		colormap_p = Z_MallocAlign((256 * (encoremap ? 64 : 32)) + 10, PU_LEVEL, NULL, 8);
+		colormap_p = Z_Malloc((256 * (encoremap ? 64 : 32)) + 10, PU_LEVEL, NULL);
 		extra_colormaps[mapnum].colormap = (UINT8 *)colormap_p;
 
 		// Calculate the palette index for each palette index, for each light level
@@ -1425,7 +1598,7 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
 			}
 		}
 	}
-	
+
 	return (INT32)mapnum;
 }
 
@@ -1478,7 +1651,7 @@ const char *R_ColormapNameForNum(INT32 num)
 	if (num == -1)
 		return "NONE";
 
-	if (num < 0 || num > MAXCOLORMAPS)
+	if (num < 0 || num >= MAXCOLORMAPS)
 		I_Error("R_ColormapNameForNum: num %d is invalid!\n", num);
 
 	if (foundcolormaps[num] == LUMPERROR)
@@ -1618,33 +1791,13 @@ INT32 R_TextureNumForName(const char *name)
 	return i;
 }
 
-//
-// R_PrecacheLevel
-//
-// Preloads all relevant graphics for the level.
-//
-void R_PrecacheLevel(void)
+static void R_PrecacheLevelTextures(void)
 {
-	char *texturepresent, *spritepresent;
-	size_t i, j, k;
-	lumpnum_t lump;
+	char *texturepresent;
+	anim_t *anim;
+	size_t j;
+	INT32 h;
 
-	thinker_t *th;
-	spriteframe_t *sf;
-
-	if (demo.playback)
-		return;
-
-	// do not flush the memory, Z_Malloc twice with same user will cause error in Z_CheckHeap()
-	if (rendermode != render_soft)
-		return;
-
-	// Precache flats.
-	flatmemory = P_PrecacheLevelFlats();
-
-	//
-	// Precache textures.
-	//
 	// no need to precache all software textures in 3D mode
 	// (note they are still used with the reference software view)
 	texturepresent = calloc(numtextures, sizeof (*texturepresent));
@@ -1661,6 +1814,22 @@ void R_PrecacheLevel(void)
 			texturepresent[sides[j].bottomtexture] = 1;
 	}
 
+	// check for animated textures
+	for (anim = anims; anim < lastanim; anim++)
+	{
+		if (!anim->istexture)
+			continue;
+
+		if (!texturepresent[anim->basepic])
+			continue;
+
+		for (h = 1; h < anim->numpics; h++)
+		{
+			if (!texturecache[anim->basepic+h])
+				R_GenerateTexture(anim->basepic+h);
+		}
+	}
+
 	// Sky texture is always present.
 	// Note that F_SKY1 is the name used to indicate a sky floor/ceiling as a flat,
 	// while the sky texture is stored like a wall texture, with a skynum dependent name.
@@ -1678,17 +1847,27 @@ void R_PrecacheLevel(void)
 		// since we cache entire composite textures
 	}
 	free(texturepresent);
+}
+
+static void R_PrecacheLevelSprites(void)
+{
+	char *spritepresent;
+	size_t i, j, k;
+	lumpnum_t lump;
+
+	thinker_t *th;
+	spriteframe_t *sf;
 
-	//
-	// Precache sprites.
-	//
 	spritepresent = calloc(numsprites, sizeof (*spritepresent));
 	if (spritepresent == NULL) I_Error("%s: Out of memory looking up sprites", "R_PrecacheLevel");
 
 	for (th = thinkercap.next; th != &thinkercap; th = th->next)
-		if (th->function.acp1 == (actionf_p1)P_MobjThinker)
-			if (th->function.acp1 != (actionf_p1)P_RemoveThinkerDelayed)
-				spritepresent[((mobj_t *)th)->sprite] = 1;
+	{
+		if (th->function != (actionf_p1)P_MobjThinker)
+			continue;
+
+		spritepresent[((mobj_t *)th)->sprite] = 1;
+	}
 
 	spritememory = 0;
 	for (i = 0; i < numsprites; i++)
@@ -1699,17 +1878,65 @@ void R_PrecacheLevel(void)
 		for (j = 0; j < sprites[i].numframes; j++)
 		{
 			sf = &sprites[i].spriteframes[j];
-			for (k = 0; k < 8; k++)
-			{
-				// see R_InitSprites for more about lumppat,lumpid
-				lump = sf->lumppat[k];
-				if (devparm)
-					spritememory += W_LumpLength(lump);
-				W_CachePatchNum(lump, PU_CACHE);
+#define cacheang(a) {\
+				lump = sf->lumppat[a];\
+				if (devparm)\
+					spritememory += W_LumpLength(lump);\
+				W_CachePatchNum(lump, PU_SPRITE);\
 			}
+			// see R_InitSprites for more about lumppat,lumpid
+			switch (sf->rotate)
+			{
+				case SRF_SINGLE:
+					cacheang(0);
+					break;
+				case SRF_2D:
+					cacheang(2);
+					cacheang(6);
+					break;
+				default:
+					k = 8;
+					while (k--)
+						cacheang(k);
+					break;
+			}
+#undef cacheang
 		}
 	}
+
 	free(spritepresent);
+}
+
+//
+// R_PrecacheLevel
+//
+// Preloads all relevant graphics for the level.
+//
+void R_PrecacheLevel(void)
+{
+	// do not flush the memory, Z_Malloc twice with same user will cause error in Z_CheckHeap()
+	if (rendermode == render_none)
+		return;
+
+	if (demo.playback)
+		return;
+
+#ifdef HWRENDER
+	if (rendermode == render_opengl)
+	{
+		HWR_PrecacheLevel();
+		return;
+	}
+#endif
+
+	// Precache flats.
+	flatmemory = P_PrecacheLevelFlats();
+
+	// Precache textures.
+	R_PrecacheLevelTextures();
+
+	// Precache sprites.
+	R_PrecacheLevelSprites();
 
 	// FIXME: this is no longer correct with OpenGL render mode
 	CONS_Debug(DBG_SETUP, "Precache level done:\n"
diff --git a/src/r_data.h b/src/r_data.h
index ec1146322..58afc34d0 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -14,6 +14,10 @@
 #ifndef __R_DATA__
 #define __R_DATA__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "r_defs.h"
 #include "r_state.h"
 
@@ -33,6 +37,14 @@ typedef struct
 	UINT16 wad, lump;
 } texpatch_t;
 
+// texture type
+enum
+{
+	TEXTURETYPE_UNKNOWN,
+	TEXTURETYPE_SINGLEPATCH,
+	TEXTURETYPE_COMPOSITE,
+};
+
 // A maptexturedef_t describes a rectangular texture,
 //  which is composed of one or more mappatch_t structures
 //  that arrange graphic patches.
@@ -40,9 +52,9 @@ typedef struct
 {
 	// Keep name for switch changing, etc.
 	char name[8];
+	UINT8 type; // TEXTURETYPE_
 	INT16 width, height;
 	boolean holes;
-
 	// All the patches[patchcount] are drawn back to front into the cached texture.
 	INT16 patchcount;
 	texpatch_t patches[0];
@@ -50,12 +62,13 @@ typedef struct
 
 // all loaded and prepared textures from the start of the game
 extern texture_t **textures;
-
-// texture width is a power of 2, so it can easily repeat along sidedefs using a simple mask
-extern INT32 *texturewidthmask;
+extern UINT8 **texturecache; // graphics data for each generated full-size texture
 
 extern fixed_t *textureheight; // needed for texture pegging
 
+UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha);
+UINT32 ASTBlendTexturePixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha);
+
 extern INT16 color8to16[256]; // remap color index to highcolor
 extern INT16 *hicolormaps; // remap high colors to high colors..
 
@@ -65,6 +78,8 @@ extern CV_PossibleValue_t Color_cons_t[];
 void R_LoadTextures(void);
 void R_FlushTextureCache(void);
 
+UINT8 *R_GenerateTexture(size_t texnum);
+
 INT32 R_GetTextureNum(INT32 texnum);
 void R_CheckTextureCache(INT32 tex);
 
@@ -105,4 +120,8 @@ UINT8 NearestPaletteColor(UINT8 r, UINT8 g, UINT8 b, RGBA_t *palette);
 
 extern INT32 numtextures;
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/r_defs.h b/src/r_defs.h
index 6ced3b8a8..e1fc574bc 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -68,6 +68,37 @@ typedef struct
 #endif
 } extracolormap_t;
 
+typedef struct
+{
+	lighttable_t* colormap;
+
+	INT32 x;
+	INT32 yl;
+	INT32 yh;
+	fixed_t iscale;
+	fixed_t texturemid;
+
+	UINT8* source; // first pixel in a column
+	UINT8* lightmap; // lighting only
+
+	// translucency stuff here
+	UINT8* transmap;
+
+	// translation stuff here
+	UINT8* translation;
+
+	struct r_lightlist_s* lightlist;
+
+	INT32 numlights;
+	INT32 maxlights;
+
+	//Fix TUTIFRUTI
+	INT32 texheight;
+	INT32 sourcelength;
+} drawcolumndata_t;
+
+extern drawcolumndata_t g_dc;
+
 //
 // INTERNAL MAP TYPES used by play and refresh
 //
@@ -172,6 +203,7 @@ typedef struct ffloor_s
 
 	INT32 lastlight;
 	INT32 alpha;
+	UINT8 blend; // blendmode
 	tic_t norender; // for culling
 
 	// these are saved for netgames, so do not let Lua touch these!
@@ -256,6 +288,12 @@ typedef struct pslope_s
 	mapthing_t **vertices; // List should be three long for slopes made by vertex things, or one long for slopes using one vertex thing to anchor
 
 	struct pslope_s *next; // Make a linked list of dynamic slopes, for easy reference later
+
+	// Light offsets (see seg_t)
+	SINT8 lightOffset;
+#ifdef HWRENDER
+	INT16 hwLightOffset;
+#endif
 } pslope_t;
 
 typedef enum
@@ -272,13 +310,32 @@ typedef enum
 //
 typedef struct sector_s
 {
-	fixed_t floorheight;
-	fixed_t ceilingheight;
 	INT32 floorpic;
 	INT32 ceilingpic;
 	INT16 lightlevel;
+
+	pslope_t *f_slope; // floor slope
+	pslope_t *c_slope; // ceiling slope
+
+	// floor and ceiling texture offsets
+	fixed_t floor_xoffs, floor_yoffs;
+	fixed_t ceiling_xoffs, ceiling_yoffs;
+
+	// flat angle
+	angle_t floorpic_angle;
+	angle_t ceilingpic_angle;
+
+	INT32 floorlightsec, ceilinglightsec;
+
+	// per-sector colormaps!
+	extracolormap_t *extra_colormap;
+
+	fixed_t floorheight;
+	fixed_t ceilingheight;
+
 	INT16 special;
 	UINT16 tag;
+
 	INT32 nexttag, firsttag; // for fast tag searches
 
 	// origin for any sounds played by the sector
@@ -296,18 +353,9 @@ typedef struct sector_s
 	void *ceilingdata; // ceiling move thinker
 	void *lightingdata; // lighting change thinker
 
-	// floor and ceiling texture offsets
-	fixed_t floor_xoffs, floor_yoffs;
-	fixed_t ceiling_xoffs, ceiling_yoffs;
-
-	// flat angle
-	angle_t floorpic_angle;
-	angle_t ceilingpic_angle;
-
 	INT32 heightsec; // other sector, or -1 if no other sector
 	INT32 camsec; // used for camera clipping
 
-	INT32 floorlightsec, ceilinglightsec;
 	INT32 crumblestate; // used for crumbling and bobbing
 
 	INT32 bottommap, midmap, topmap; // dynamic colormaps
@@ -334,9 +382,6 @@ typedef struct sector_s
 	INT32 numlights;
 	boolean moved;
 
-	// per-sector colormaps!
-	extracolormap_t *extra_colormap;
-
 	// This points to the master's floorheight, so it can be changed in realtime!
 	fixed_t *gravity; // per-sector gravity
 	boolean verticalflip; // If gravity < 0, then allow flipped physics
@@ -348,12 +393,7 @@ typedef struct sector_s
 	// Current speed of ceiling/floor. For Knuckles to hold onto stuff.
 	fixed_t floorspeed, ceilspeed;
 
-	// list of precipitation mobjs in sector
-	struct mprecipsecnode_s *touching_preciplist;
-
 	// Eternity engine slope
-	pslope_t *f_slope; // floor slope
-	pslope_t *c_slope; // ceiling slope
 	boolean hasslope; // The sector, or one of its visible FOFs, contains a slope
 
 	// these are saved for netgames, so do not let Lua touch these!
@@ -380,6 +420,7 @@ typedef enum
 } slopetype_t;
 
 #define HORIZONSPECIAL 41
+#define PORTALSPECIAL  40
 
 typedef struct line_s
 {
@@ -396,6 +437,8 @@ typedef struct line_s
 
 	// Visual appearance: sidedefs.
 	UINT16 sidenum[2]; // sidenum[1] will be 0xffff if one-sided
+	fixed_t alpha; // translucency
+	UINT8 blendmode; // blendmode
 
 	fixed_t bbox[4]; // bounding box for the extent of the linedef
 
@@ -453,7 +496,7 @@ typedef struct subsector_s
 {
 	sector_t *sector;
 	INT16 numlines;
-	UINT16 firstline;
+	UINT32 firstline;
 	struct polyobj_s *polyList; // haleyjd 02/19/06: list of polyobjects
 #if 1//#ifdef FLOORSPLATS
 	void *splats; // floorsplat_t list
@@ -486,17 +529,6 @@ typedef struct msecnode_s
 	boolean visited; // used in search algorithms
 } msecnode_t;
 
-typedef struct mprecipsecnode_s
-{
-	sector_t *m_sector; // a sector containing this object
-	struct precipmobj_s *m_thing;  // this object
-	struct mprecipsecnode_s *m_sectorlist_prev;  // prev msecnode_t for this thing
-	struct mprecipsecnode_s *m_sectorlist_next;  // next msecnode_t for this thing
-	struct mprecipsecnode_s *m_thinglist_prev;  // prev msecnode_t for this sector
-	struct mprecipsecnode_s *m_thinglist_next;  // next msecnode_t for this sector
-	boolean visited; // used in search algorithms
-} mprecipsecnode_t;
-
 //
 // The lineseg.
 //
@@ -527,11 +559,14 @@ typedef struct seg_s
 	float flength; // length of the seg, used by hardware renderer
 #endif
 
-	// Why slow things down by calculating lightlists for every thick side?
-	size_t numlights;
-	r_lightlist_t *rlights;
 	polyobj_t *polyseg;
 	boolean dontrenderme;
+
+	// Fake contrast calculated on level load
+	SINT8 lightOffset;
+#ifdef HWRENDER
+	INT16 hwLightOffset;
+#endif
 } seg_t;
 
 //
@@ -604,11 +639,11 @@ typedef struct drawseg_s
 	struct ffloor_s *thicksides[MAXFFLOORS];
 	INT16 *thicksidecol;
 	INT32 numthicksides;
-	fixed_t frontscale[MAXVIDWIDTH];
+	fixed_t *frontscale;
 
 	UINT8 portalpass; // if > 0 and <= portalrender, do not affect sprite clipping
 
-	fixed_t maskedtextureheight[MAXVIDWIDTH]; // For handling sloped midtextures
+	fixed_t *maskedtextureheight; // For handling sloped midtextures
 
 	vertex_t leftpos, rightpos; // Used for rendering FOF walls with slopes
 } drawseg_t;
@@ -636,7 +671,22 @@ typedef struct
 // Patches are used for sprites and all masked pictures, and we compose
 // textures from the TEXTURE1 list of patches.
 //
-// WARNING: this structure is cloned in GLPatch_t
+
+typedef struct
+{
+	INT16 width, height;
+	INT16 leftoffset, topoffset;
+
+	INT32 *columnofs; // Column offsets. This is relative to patch->columns
+	UINT8 *columns; // Software column data
+
+	void *hardware; // OpenGL patch, allocated whenever necessary
+
+#ifdef ROTSPRITE
+	rotsprite_t *rotated; // Rotated patches
+#endif
+} patch_t;
+
 #if defined(_MSC_VER)
 #pragma pack(1)
 #endif
@@ -649,7 +699,7 @@ typedef struct
 	INT16 topoffset;      // pixels below the origin
 	INT32 columnofs[];     // only [width] used
 	// the [0] is &columnofs[width]
-} patch_t;
+} ATTRPACK softwarepatch_t;
 
 #ifdef _MSC_VER
 #pragma warning(disable :  4200)
@@ -675,13 +725,8 @@ typedef struct
 #pragma pack()
 #endif
 
-typedef enum // trimmed since its only real use here is for xscale/yscale
-{
-	RF_HORIZONTALFLIP   = 0x0001,   // Flip sprite horizontally
-	RF_VERTICALFLIP     = 0x0002,   // Flip sprite vertically
-	RF_ABSOLUTEOFFSETS  = 0x0004,   // Sprite uses the object's offsets absolutely, instead of relatively
-	RF_FLIPOFFSETS      = 0x0008,   // Relative object offsets are flipped with the sprite
-} renderflags_t;
+// Possible alpha types for a patch.
+enum patchalphastyle {AST_COPY, AST_TRANSLUCENT, AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY};
 
 typedef enum
 {
@@ -719,9 +764,9 @@ typedef struct
 
 	// Flip bits (1 = flip) to use for view angles 0-7.
 	UINT8 flip;
-	
+
 #ifdef ROTSPRITE
-	rotsprite_t *rotated[2][16]; // Rotated patches
+	rotsprite_t *rotated[16]; // Rotated patches
 #endif
 } spriteframe_t;
 
diff --git a/src/r_draw.c b/src/r_draw.cpp
similarity index 56%
rename from src/r_draw.c
rename to src/r_draw.cpp
index fa19a6ac2..e399fab0e 100644
--- a/src/r_draw.c
+++ b/src/r_draw.cpp
@@ -15,6 +15,8 @@
 ///        not the architecture of the frame buffer.
 ///        The frame buffer is a linear one, and we need only the base address.
 
+#include <algorithm>
+
 #include "doomdef.h"
 #include "doomstat.h"
 #include "r_local.h"
@@ -38,46 +40,14 @@
 
 /**	\brief view info
 */
-INT32 viewwidth, scaledviewwidth, viewheight, viewwindowx, viewwindowy;
-
-/**	\brief pointer to the start of each line of the screen,
-*/
-UINT8 *ylookup[MAXVIDHEIGHT*4];
-
-/**	\brief pointer to the start of each line of the screen, for view1 (splitscreen)
-*/
-UINT8 *ylookup1[MAXVIDHEIGHT*4];
-
-/**	\brief pointer to the start of each line of the screen, for view2 (splitscreen)
-*/
-UINT8 *ylookup2[MAXVIDHEIGHT*4];
-
-/**	\brief pointer to the start of each line of the screen, for view3 (splitscreen)
-*/
-UINT8 *ylookup3[MAXVIDHEIGHT*4];
-
-/**	\brief pointer to the start of each line of the screen, for view4 (splitscreen)
-*/
-UINT8 *ylookup4[MAXVIDHEIGHT*4];
-
-/**	\brief  x byte offset for columns inside the viewwindow,
-	so the first column starts at (SCRWIDTH - VIEWWIDTH)/2
-*/
-INT32 columnofs[MAXVIDWIDTH*4];
-
-UINT8 *topleft;
+INT32 linesize, viewwidth, viewheight, viewwindowx, viewwindowy;
+UINT8 *renderscreen;            // haleyjd
 
 // =========================================================================
 //                      COLUMN DRAWING CODE STUFF
 // =========================================================================
 
-lighttable_t *dc_colormap;
-INT32 dc_x = 0, dc_yl = 0, dc_yh = 0;
-
-fixed_t dc_iscale, dc_texturemid;
-UINT8 dc_hires; // under MSVC boolean is a byte, while on other systems, it a bit,
-               // soo lets make it a byte on all system for the ASM code
-UINT8 *dc_source;
+drawcolumndata_t g_dc;
 
 // -----------------------
 // translucency stuff here
@@ -85,43 +55,36 @@ UINT8 *dc_source;
 #define NUMTRANSTABLES 9 // how many translucency tables are used
 
 UINT8 *transtables; // translucency tables
+UINT8 *blendtables[NUMBLENDMAPS];
 
-/**	\brief R_DrawTransColumn uses this
-*/
-UINT8 *dc_transmap; // one of the translucency tables
+// --------------------------------------------
+// c drawer routines
+// --------------------------------------------
 
-// ----------------------
-// translation stuff here
-// ----------------------
-
-
-/**	\brief R_DrawTranslatedColumn uses this
-*/
-UINT8 *dc_translation;
-
-struct r_lightlist_s *dc_lightlist = NULL;
-INT32 dc_numlights = 0, dc_maxlights, dc_texheight;
+coldrawfunc_t *colfunc;
+coldrawfunc_t *colfuncs[COLDRAWFUNC_MAX];
+int colfunctype;
 
 // =========================================================================
 //                      SPAN DRAWING CODE STUFF
 // =========================================================================
 
-INT32 ds_y, ds_x1, ds_x2;
-lighttable_t *ds_colormap;
-fixed_t ds_xfrac, ds_yfrac, ds_xstep, ds_ystep;
-
-UINT8 *ds_source; // points to the start of a flat
-UINT8 *ds_transmap; // one of the translucency tables
+drawspandata_t g_ds;
 
 // Vectors for Software's tilted slope drawers
 floatv3_t *ds_su, *ds_sv, *ds_sz;
-floatv3_t *ds_sup, *ds_svp, *ds_szp;
-float focallengthf, zeroheight;
 
-/**	\brief Variable flat sizes
-*/
+float focallengthf;
 
-UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
+// For, uh, tilted lighting, duh.
+//static INT32 *tiltlighting;
+
+// --------------------------------------------
+// c drawer routines
+// --------------------------------------------
+
+spandrawfunc_t *spanfunc;
+spandrawfunc_t *spanfuncs[SPANDRAWFUNC_MAX];
 
 // ==========================================================================
 //                        OLD DOOM FUZZY EFFECT
@@ -142,87 +105,21 @@ UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
 #define DEFAULT_STARTTRANSCOLOR 160
 #define NUM_PALETTE_ENTRIES 256
 
-static UINT8** translationtablecache[TT_CACHE_SIZE] = {NULL};
-static UINT8** localtranslationtablecache[MAXLOCALSKINS] = {NULL};
-
-
-// See also the enum skincolors_t
-// TODO Callum: Can this be translated?
-/*
-const char *Color_Names[MAXSKINCOLORS] =
-{
-	"None",      // SKINCOLOR_NONE
-	"White",     // SKINCOLOR_WHITE
-	"Silver",    // SKINCOLOR_SILVER
-	"Grey",      // SKINCOLOR_GREY
-	"Black",     // SKINCOLOR_BLACK
-	"Cyan",      // SKINCOLOR_CYAN
-	"Teal",      // SKINCOLOR_TEAL
-	"Steel_Blue",// SKINCOLOR_STEEL
-	"Blue",      // SKINCOLOR_BLUE
-	"Peach",     // SKINCOLOR_PEACH
-	"Tan",       // SKINCOLOR_TAN
-	"Pink",      // SKINCOLOR_PINK
-	"Lavender",  // SKINCOLOR_LAVENDER
-	"Purple",    // SKINCOLOR_PURPLE
-	"Orange",    // SKINCOLOR_ORANGE
-	"Rosewood",  // SKINCOLOR_ROSEWOOD
-	"Beige",     // SKINCOLOR_BEIGE
-	"Brown",     // SKINCOLOR_BROWN
-	"Red",       // SKINCOLOR_RED
-	"Dark_Red",  // SKINCOLOR_DARKRED
-	"Neon_Green",// SKINCOLOR_NEONGREEN
-	"Green",     // SKINCOLOR_GREEN
-	"Zim",       // SKINCOLOR_ZIM
-	"Olive",     // SKINCOLOR_OLIVE
-	"Yellow",    // SKINCOLOR_YELLOW
-	"Gold"       // SKINCOLOR_GOLD
-};
-
-const UINT8 Color_Opposite[MAXSKINCOLORS*2] =
-{
-	SKINCOLOR_NONE,8,   // SKINCOLOR_NONE
-	SKINCOLOR_BLACK,10, // SKINCOLOR_WHITE
-	SKINCOLOR_GREY,4,   // SKINCOLOR_SILVER
-	SKINCOLOR_SILVER,12,// SKINCOLOR_GREY
-	SKINCOLOR_WHITE,8,  // SKINCOLOR_BLACK
-	SKINCOLOR_NONE,8,   // SKINCOLOR_CYAN
-	SKINCOLOR_NONE,8,   // SKINCOLOR_TEAL
-	SKINCOLOR_NONE,8,   // SKINCOLOR_STEEL
-	SKINCOLOR_ORANGE,9, // SKINCOLOR_BLUE
-	SKINCOLOR_NONE,8,   // SKINCOLOR_PEACH
-	SKINCOLOR_NONE,8,   // SKINCOLOR_TAN
-	SKINCOLOR_NONE,8,   // SKINCOLOR_PINK
-	SKINCOLOR_NONE,8,   // SKINCOLOR_LAVENDER
-	SKINCOLOR_NONE,8,   // SKINCOLOR_PURPLE
-	SKINCOLOR_BLUE,12,  // SKINCOLOR_ORANGE
-	SKINCOLOR_NONE,8,   // SKINCOLOR_ROSEWOOD
-	SKINCOLOR_NONE,8,   // SKINCOLOR_BEIGE
-	SKINCOLOR_NONE,8,   // SKINCOLOR_BROWN
-	SKINCOLOR_GREEN,5,  // SKINCOLOR_RED
-	SKINCOLOR_NONE,8,   // SKINCOLOR_DARKRED
-	SKINCOLOR_NONE,8,   // SKINCOLOR_NEONGREEN
-	SKINCOLOR_RED,11,   // SKINCOLOR_GREEN
-	SKINCOLOR_PURPLE,3, // SKINCOLOR_ZIM
-	SKINCOLOR_NONE,8,   // SKINCOLOR_OLIVE
-	SKINCOLOR_NONE,8,   // SKINCOLOR_YELLOW
-	SKINCOLOR_NONE,8    // SKINCOLOR_GOLD
-};
-*/
+static UINT8 **translationtablecache[TT_CACHE_SIZE] = {NULL};
+static UINT8 **localtranslationtablecache[MAXLOCALSKINS] = {NULL};
 
 CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
 
-/**	\brief The R_InitTranslationTables
+static void R_GenerateBlendTables(void);
 
-  load in color translation tables
+/** \brief Initializes the translucency tables used by the Software renderer.
 */
-void R_InitTranslationTables(void)
+void R_InitTranslucencyTables(void)
 {
-	// Load here the transparency lookup tables 'TINTTAB'
-	// NOTE: the TINTTAB resource MUST BE aligned on 64k for the asm
+	// Load here the transparency lookup tables 'TRANSx0'
+	// NOTE: the TRANSx0 resources MUST BE aligned on 64k for the asm
 	// optimised code (in other words, transtables pointer low word is 0)
-	transtables = Z_MallocAlign(NUMTRANSTABLES*0x10000, PU_STATIC,
-		NULL, 16);
+	transtables = static_cast<UINT8*>(Z_Malloc(NUMTRANSTABLES*0x10000, PU_STATIC, NULL));
 
 	W_ReadLump(W_GetNumForName("TRANS10"), transtables);
 	W_ReadLump(W_GetNumForName("TRANS20"), transtables+0x10000);
@@ -233,13 +130,196 @@ void R_InitTranslationTables(void)
 	W_ReadLump(W_GetNumForName("TRANS70"), transtables+0x60000);
 	W_ReadLump(W_GetNumForName("TRANS80"), transtables+0x70000);
 	W_ReadLump(W_GetNumForName("TRANS90"), transtables+0x80000);
+
+	R_GenerateBlendTables();
+}
+
+static colorlookup_t transtab_lut;
+
+static void BlendTab_Translucent(UINT8 *table, int style, UINT8 blendamt)
+{
+	INT16 bg, fg;
+
+	if (table == NULL)
+		I_Error("BlendTab_Translucent: input table was NULL!");
+
+	for (bg = 0; bg < 0x100; bg++)
+	{
+		for (fg = 0; fg < 0x100; fg++)
+		{
+			RGBA_t backrgba = V_GetColor(bg);
+			RGBA_t frontrgba = V_GetColor(fg);
+			RGBA_t result;
+
+			result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
+			result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
+
+			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+		}
+	}
+}
+
+static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
+{
+	INT16 bg, fg;
+
+	if (table == NULL)
+		I_Error("BlendTab_Subtractive: input table was NULL!");
+
+	if (blendamt == 0xFF)
+	{
+		memset(table, GetColorLUT(&transtab_lut, 0, 0, 0), 0x10000);
+		return;
+	}
+
+	for (bg = 0; bg < 0x100; bg++)
+	{
+		for (fg = 0; fg < 0x100; fg++)
+		{
+			RGBA_t backrgba = V_GetColor(bg);
+			RGBA_t frontrgba = V_GetColor(fg);
+			RGBA_t result;
+
+			result.rgba    = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
+			result.s.red   = std::max(0, result.s.red - blendamt);
+			result.s.green = std::max(0, result.s.green - blendamt);
+			result.s.blue  = std::max(0, result.s.blue - blendamt);
+
+			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+		}
+	}
+}
+
+static void BlendTab_Modulative(UINT8 *table)
+{
+	INT16 bg, fg;
+
+	if (table == NULL)
+		I_Error("BlendTab_Modulative: input table was NULL!");
+
+	for (bg = 0; bg < 0x100; bg++)
+	{
+		for (fg = 0; fg < 0x100; fg++)
+		{
+			RGBA_t backrgba = V_GetColor(bg);
+			RGBA_t frontrgba = V_GetColor(fg);
+			RGBA_t result;
+			result.rgba = ASTBlendPixel(backrgba, frontrgba, AST_MODULATE, 0);
+			table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+		}
+	}
+}
+
+static INT32 BlendTab_Count[NUMBLENDMAPS] =
+{
+	NUMTRANSTABLES+1, // blendtab_add
+	NUMTRANSTABLES+1, // blendtab_subtract
+	NUMTRANSTABLES+1, // blendtab_reversesubtract
+	1                 // blendtab_modulate
+};
+
+static INT32 BlendTab_FromStyle[] =
+{
+	0,                        // AST_COPY
+	0,                        // AST_TRANSLUCENT
+	blendtab_add,             // AST_ADD
+	blendtab_subtract,        // AST_SUBTRACT
+	blendtab_reversesubtract, // AST_REVERSESUBTRACT
+	blendtab_modulate,        // AST_MODULATE
+	0                         // AST_OVERLAY
+};
+
+static void BlendTab_GenerateMaps(INT32 tab, INT32 style, void (*genfunc)(UINT8 *, int, UINT8))
+{
+	INT32 i = 0, num = BlendTab_Count[tab];
+	const float amtmul = (256.0f / (float)(NUMTRANSTABLES + 1));
+	for (; i < num; i++)
+	{
+		const size_t offs = (0x10000 * i);
+		const UINT16 alpha = std::fmin(amtmul * i, 0xFF);
+		genfunc(blendtables[tab] + offs, style, alpha);
+	}
+}
+
+static void R_GenerateBlendTables(void)
+{
+	INT32 i;
+
+	for (i = 0; i < NUMBLENDMAPS; i++)
+		blendtables[i] = static_cast<UINT8*>(Z_Malloc(BlendTab_Count[i] * 0x10000, PU_STATIC, NULL));
+
+	InitColorLUT(&transtab_lut, pLocalPalette, false);
+
+	// Additive
+	BlendTab_GenerateMaps(blendtab_add, AST_ADD, BlendTab_Translucent);
+
+	// Subtractive
+#if 1
+	BlendTab_GenerateMaps(blendtab_subtract, AST_SUBTRACT, BlendTab_Subtractive);
+#else
+	BlendTab_GenerateMaps(blendtab_subtract, AST_SUBTRACT, BlendTab_Translucent);
+#endif
+
+	// Reverse subtractive
+	BlendTab_GenerateMaps(blendtab_reversesubtract, AST_REVERSESUBTRACT, BlendTab_Translucent);
+
+	// Modulative blending only requires a single table
+	BlendTab_Modulative(blendtables[blendtab_modulate]);
+}
+
+#define ClipBlendLevel(style, trans) std::max(std::min((trans), BlendTab_Count[BlendTab_FromStyle[style]]-1), 0)
+#define ClipTransLevel(trans) std::max(std::min((trans), NUMTRANSMAPS-2), 0)
+
+UINT8 *R_GetTranslucencyTable(INT32 alphalevel)
+{
+	return transtables + (ClipTransLevel(alphalevel-1) << FF_TRANSSHIFT);
+}
+
+UINT8 *R_GetBlendTable(int style, INT32 alphalevel)
+{
+	size_t offs;
+
+	if (style <= AST_COPY || style >= AST_OVERLAY)
+		return transtables + (ClipTransLevel(alphalevel) << FF_TRANSSHIFT);
+
+	offs = (ClipBlendLevel(style, alphalevel) << FF_TRANSSHIFT);
+
+	// Lactozilla: Returns the equivalent to AST_TRANSLUCENT
+	// if no alpha style matches any of the blend tables.
+	switch (style)
+	{
+		case AST_ADD:
+			return blendtables[blendtab_add] + offs;
+		case AST_SUBTRACT:
+			return blendtables[blendtab_subtract] + offs;
+		case AST_REVERSESUBTRACT:
+			return blendtables[blendtab_reversesubtract] + offs;
+		case AST_MODULATE:
+			return blendtables[blendtab_modulate];
+		default:
+			break;
+	}
+
+	// Return a normal translucency table
+	if (--alphalevel >= 0)
+		return transtables + (ClipTransLevel(alphalevel) << FF_TRANSSHIFT);
+	else
+		return NULL;
+}
+
+boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel)
+{
+	if (blendmode <= AST_COPY || blendmode == AST_SUBTRACT || blendmode == AST_MODULATE || blendmode >= AST_OVERLAY)
+		return true;
+
+	return (alphalevel < BlendTab_Count[BlendTab_FromStyle[blendmode]]);
 }
 
 /**	\brief	Retrieves a translation colormap from the cache.
 
-	\param	skinnum	number of skin, TC_DEFAULT or TC_BOSS
-	\param	color	translation color
-	\param	flags	set GTC_CACHE to use the cache
+	\param	skinnum		skin number, or a translation mode
+	\param	color		translation color
+	\param	flags		set GTC_CACHE to use the cache
 
 	\return	Colormap. If not cached, caller should Z_Free.
 */
@@ -257,22 +337,25 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f
 	else
 	{
 		tt = translationtablecache;
+
 		// Adjust if we want the default colormap
-		if (skinnum == TC_DEFAULT) skintableindex = DEFAULT_TT_CACHE_INDEX;
-		else if (skinnum == TC_BOSS) skintableindex = BOSS_TT_CACHE_INDEX;
-		else if (skinnum == TC_METALSONIC) skintableindex = METALSONIC_TT_CACHE_INDEX;
-		else if (skinnum == TC_ALLWHITE) skintableindex = ALLWHITE_TT_CACHE_INDEX;
-		else if (skinnum == TC_RAINBOW) skintableindex = RAINBOW_TT_CACHE_INDEX;
-		else if (skinnum == TC_BLINK) skintableindex = BLINK_TT_CACHE_INDEX;
-		else skintableindex = skinnum;
+		switch (skinnum)
+		{
+			case TC_DEFAULT:    skintableindex = DEFAULT_TT_CACHE_INDEX; break;
+			case TC_BOSS:       skintableindex = BOSS_TT_CACHE_INDEX; break;
+			case TC_METALSONIC: skintableindex = METALSONIC_TT_CACHE_INDEX; break;
+			case TC_ALLWHITE:   skintableindex = ALLWHITE_TT_CACHE_INDEX; break;
+			case TC_RAINBOW:    skintableindex = RAINBOW_TT_CACHE_INDEX; break;
+			case TC_BLINK:      skintableindex = BLINK_TT_CACHE_INDEX; break;
+			default:       skintableindex = skinnum; break;
+		}
 	}
 
 	if (flags & GTC_CACHE)
 	{
-
 		// Allocate table for skin if necessary
 		if (!tt[skintableindex])
-			tt[skintableindex] = Z_Calloc(MAXTRANSLATIONS * sizeof(UINT8**), PU_STATIC, NULL);
+			tt[skintableindex] = static_cast<UINT8**>(Z_Calloc(MAXTRANSLATIONS * sizeof(UINT8**), PU_STATIC, NULL));
 
 		// Get colormap
 		ret = tt[skintableindex][color];
@@ -282,7 +365,7 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f
 	// Generate the colormap if necessary
 	if (!ret)
 	{
-		ret = Z_MallocAlign(NUM_PALETTE_ENTRIES, (flags & GTC_CACHE) ? PU_LEVEL : PU_STATIC, NULL, 8);
+		ret = static_cast<UINT8*>(Z_Malloc(NUM_PALETTE_ENTRIES, (flags & GTC_CACHE) ? PU_LEVEL : PU_STATIC, NULL));
 		K_GenerateKartColormap(ret, skinnum, color, local); //R_GenerateTranslationColormap(ret, skinnum, color);		// SRB2kart
 
 		// Cache the colormap if desired
@@ -301,12 +384,12 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags)
 UINT8* R_GetLocalTranslationColormap(skin_t *skin, skin_t *localskin, skincolors_t color, UINT8 flags, boolean local)
 {
 	if (localskin)
-		return RGetTranslationColormap(( localskin - ( (local) ? localskins : skins ) ), color, flags, local);
+		return RGetTranslationColormap(localskin - K_GetSkinArray(local), color, flags, local);
 	else
-		return RGetTranslationColormap(( skin - skins ), color, flags, false);
+		return RGetTranslationColormap((skin - skins), color, flags, false);
 }
 
-patch_t* R_GetSkinFaceRank(player_t* ply) 
+patch_t* R_GetSkinFaceRank(player_t* ply)
 {
 	if (ply->skinlocal && ply->localskin)
 		return localfacerankprefix[ply->localskin - 1];
@@ -315,7 +398,7 @@ patch_t* R_GetSkinFaceRank(player_t* ply)
 	return facerankprefix[ply->skin];
 }
 
-patch_t* R_GetSkinFaceWant(player_t* ply) 
+patch_t* R_GetSkinFaceWant(player_t* ply)
 {
 	if (ply->skinlocal && ply->localskin)
 		return localfacewantprefix[ply->localskin - 1];
@@ -324,7 +407,7 @@ patch_t* R_GetSkinFaceWant(player_t* ply)
 	return facewantprefix[ply->skin];
 }
 
-patch_t* R_GetSkinFaceMini(player_t* ply) 
+patch_t* R_GetSkinFaceMini(player_t* ply)
 {
 	if (ply->skinlocal && ply->localskin)
 		return localfacemmapprefix[ply->localskin - 1];
@@ -354,19 +437,6 @@ void R_FlushTranslationColormapCache(void)
 			memset(localtranslationtablecache[i], 0, MAXTRANSLATIONS * sizeof(UINT8**));
 }
 
-/*
-UINT8 R_GetColorByName(const char *name)
-{
-	UINT8 color = (UINT8)atoi(name);
-	if (color > 0 && color < MAXSKINCOLORS)
-		return color;
-	for (color = 1; color < MAXSKINCOLORS; color++)
-		if (!stricmp(Color_Names[color], name))
-			return color;
-	return 0;
-}
-*/
-
 // ==========================================================================
 //               COMMON DRAWER FOR 8 AND 16 BIT COLOR MODES
 // ==========================================================================
@@ -386,39 +456,44 @@ UINT8 R_GetColorByName(const char *name)
 	\param	height	hieght of buffer
 
 	\return	void
-
-
 */
 
+static void R_AllocViewMemory(void)
+{
+	negonearray       = static_cast<INT16*>(Z_Realloc(negonearray, sizeof(*negonearray) * viewwidth, PU_STATIC, NULL));
+	screenheightarray = static_cast<INT16*>(Z_Realloc(screenheightarray, sizeof(*screenheightarray) * viewwidth, PU_STATIC, NULL));
+
+	floorclip         = static_cast<INT16*>(Z_Realloc(floorclip, sizeof(*floorclip) * viewwidth, PU_STATIC, NULL));
+	ceilingclip       = static_cast<INT16*>(Z_Realloc(ceilingclip, sizeof(*ceilingclip) * viewwidth, PU_STATIC, NULL));
+
+	frontscale        = static_cast<fixed_t*>(Z_Realloc(frontscale, sizeof(*frontscale) * viewwidth, PU_STATIC, NULL));
+
+	xtoviewangle      = static_cast<angle_t*>(Z_Realloc(xtoviewangle, sizeof(*xtoviewangle) * (viewwidth + 1), PU_STATIC, NULL));
+
+	R_AllocSegMemory();
+	R_AllocClipSegMemory();
+	R_AllocPlaneMemory();
+#ifdef FLOORSPLATS
+	R_AllocFloorSpriteTables();
+#endif
+	R_AllocVisSpriteMemory();
+}
+
+
 void R_InitViewBuffer(INT32 width, INT32 height)
 {
-	INT32 i, bytesperpixel = vid.bpp;
-
 	if (width > MAXVIDWIDTH)
 		width = MAXVIDWIDTH;
 	if (height > MAXVIDHEIGHT)
 		height = MAXVIDHEIGHT;
-	if (bytesperpixel < 1 || bytesperpixel > 4)
-		I_Error("R_InitViewBuffer: wrong bytesperpixel value %d\n", bytesperpixel);
+
+	R_AllocViewMemory();
 
 	viewwindowx = 0;
 	viewwindowy = 0;
 
-	// Column offset for those columns of the view window, but relative to the entire screen
-	for (i = 0; i < width; i++)
-		columnofs[i] = (viewwindowx + i) * bytesperpixel;
-
-	// Precalculate all row offsets.
-	for (i = 0; i < height; i++)
-	{
-		ylookup[i] = ylookup1[i] = screens[0] + i*vid.width*bytesperpixel;
-		if (splitscreen == 1)
-			ylookup2[i] = screens[0] + (i+viewheight)*vid.width*bytesperpixel;
-		else
-			ylookup2[i] = screens[0] + i*vid.width*bytesperpixel + (viewwidth*bytesperpixel);
-		ylookup3[i] = screens[0] + (i+viewheight)*vid.width*bytesperpixel;
-		ylookup4[i] = screens[0] + (i+viewheight)*vid.width*bytesperpixel + (viewwidth*bytesperpixel);
-	}
+	linesize     = vid.width;      // killough 11/98
+	renderscreen = vid.screens[0]; // haleyjd 07/02/14
 }
 
 /**	\brief viewborder patches lump numbers
@@ -440,6 +515,28 @@ void R_InitViewBorder(void)
 	viewborderlump[BRDR_BR] = W_GetNumForName("brdr_br");
 }
 
+/**	\brief	The R_VideoErase function
+
+	Copy a screen buffer.
+
+	\param	ofs	offest from buffer
+	\param	count	bytes to erase
+
+	\return	void
+
+
+*/
+void R_VideoErase(size_t ofs, INT32 count)
+{
+	// LFB copy.
+	// This might not be a good idea if memcpy
+	//  is not optimal, e.g. byte by byte on
+	//  a 32bit CPU, as GNU GCC/Linux libc did
+	//  at one point.
+	M_Memcpy(vid.screens[0] + ofs, vid.screens[1] + ofs, count);
+}
+
+
 #if 0
 /**	\brief R_FillBackScreen
 
@@ -462,7 +559,7 @@ void R_FillBackScreen(void)
 		return;
 
 	src = scr_borderpatch;
-	dest = screens[1];
+	dest = vid.screens[1];
 
 	for (y = 0; y < vid.height; y++)
 	{
@@ -513,30 +610,7 @@ void R_FillBackScreen(void)
 	V_DrawPatch(viewwindowx + scaledviewwidth, viewwindowy + viewheight, 1,
 		W_CacheLumpNum(viewborderlump[BRDR_BR], PU_CACHE));
 }
-#endif
 
-/**	\brief	The R_VideoErase function
-
-	Copy a screen buffer.
-
-	\param	ofs	offest from buffer
-	\param	count	bytes to erase
-
-	\return	void
-
-
-*/
-void R_VideoErase(size_t ofs, INT32 count)
-{
-	// LFB copy.
-	// This might not be a good idea if memcpy
-	//  is not optimal, e.g. byte by byte on
-	//  a 32bit CPU, as GNU GCC/Linux libc did
-	//  at one point.
-	M_Memcpy(screens[0] + ofs, screens[1] + ofs, count);
-}
-
-#if 0
 /**	\brief The R_DrawViewBorder
 
   Draws the border around the view
@@ -580,21 +654,14 @@ void R_DrawViewBorder(void)
 	side <<= 1;
 
     // simpler using our VID_Blit routine
-	VID_BlitLinearScreen(screens[1] + ofs, screens[0] + ofs, side, viewheight - 1,
+	VID_BlitLinearScreen(vid.screens[1] + ofs, vid.screens[0] + ofs, side, viewheight - 1,
 		vid.width, vid.width);
 }
 #endif
 
 // ==========================================================================
-//                   INCLUDE 8bpp DRAWING CODE HERE
+//                   INCLUDE DRAWING CODE HERE
 // ==========================================================================
 
-#include "r_draw8.c"
-
-// ==========================================================================
-//                   INCLUDE 16bpp DRAWING CODE HERE
-// ==========================================================================
-
-#ifdef HIGHCOLOR
-#include "r_draw16.c"
-#endif
+#include "r_draw_column.cpp"
+#include "r_draw_span.cpp"
diff --git a/src/r_draw.h b/src/r_draw.h
index 58775fe1d..763375709 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -14,72 +14,143 @@
 #ifndef __R_DRAW__
 #define __R_DRAW__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "r_defs.h"
 #include "r_things.h"
+#include "r_skins.h"
 
 // -------------------------------
 // COMMON STUFF FOR 8bpp AND 16bpp
 // -------------------------------
-extern UINT8 *ylookup[MAXVIDHEIGHT*4];
-extern UINT8 *ylookup1[MAXVIDHEIGHT*4];
-extern UINT8 *ylookup2[MAXVIDHEIGHT*4];
-extern UINT8 *ylookup3[MAXVIDHEIGHT*4];
-extern UINT8 *ylookup4[MAXVIDHEIGHT*4];
-extern INT32 columnofs[MAXVIDWIDTH*4];
-extern UINT8 *topleft;
+extern UINT8 *renderscreen;
+extern INT32 linesize;
 
-// -------------------------
-// COLUMN DRAWING CODE STUFF
-// -------------------------
+FUNCINLINE static ATTRINLINE UINT8 *R_Address(INT32 px, INT32 py)
+{
+	return renderscreen + (py + viewwindowy) * linesize + (viewwindowx + px);
+}
 
-extern lighttable_t *dc_colormap;
-extern INT32 dc_x, dc_yl, dc_yh;
-extern fixed_t dc_iscale, dc_texturemid;
-extern UINT8 dc_hires;
-
-extern UINT8 *dc_source; // first pixel in a column
-
-// translucency stuff here
-extern UINT8 *transtables; // translucency tables, should be (*transtables)[5][256][256]
-extern UINT8 *dc_transmap;
-
-// translation stuff here
-
-extern UINT8 *dc_translation;
-
-extern struct r_lightlist_s *dc_lightlist;
-extern INT32 dc_numlights, dc_maxlights;
-
-//Fix TUTIFRUTI
-extern INT32 dc_texheight;
-
-// -----------------------
-// SPAN DRAWING CODE STUFF
-// -----------------------
-
-extern INT32 ds_y, ds_x1, ds_x2;
-extern lighttable_t *ds_colormap;
-extern fixed_t ds_xfrac, ds_yfrac, ds_xstep, ds_ystep;
-extern INT32 ds_waterofs, ds_bgofs;
-extern UINT8 *ds_source; // start of a 64*64 tile image
-extern UINT8 *ds_transmap;
-
-extern INT32 ds_bgofs;
 
 typedef struct {
 	float x, y, z;
 } floatv3_t;
 
+typedef struct
+{
+	INT32 y;
+	INT32 x1;
+	INT32 x2;
+	lighttable_t* colormap;
+	lighttable_t* translation;
+
+	fixed_t xfrac;
+	fixed_t yfrac;
+	fixed_t xstep;
+	fixed_t ystep;
+	INT32 waterofs;
+	INT32 bgofs;
+
+	fixed_t xoffs;
+	fixed_t yoffs;
+
+	visplane_t *currentplane;
+	UINT8 *source;
+	UINT8 *transmap;
+
+	float zeroheight;
+
+	// Vectors for Software's tilted slope drawers
+	floatv3_t sup;
+	floatv3_t svp;
+	floatv3_t szp;
+	floatv3_t slope_origin;
+	floatv3_t slope_u;
+	floatv3_t slope_v;
+
+	// Variable flat sizes
+	UINT32 nflatxshift;
+	UINT32 nflatyshift;
+	UINT32 nflatshiftup;
+	UINT32 nflatmask;
+
+	fixed_t planeheight;
+	lighttable_t **planezlight;
+
+	//
+	// Water ripple effect
+	// Needs the height of the plane, and the vertical position of the span.
+	// Sets planeripple.xfrac and planeripple.yfrac, added to ds_xfrac and ds_yfrac, if the span is not tilted.
+	//
+	struct
+	{
+		INT32 offset;
+		fixed_t xfrac, yfrac;
+		boolean active;
+	} planeripple;
+} drawspandata_t;
+
+extern drawspandata_t g_ds;
+
+// Draws a single visplane.
+void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_parallel);
+
 // Vectors for Software's tilted slope drawers
 extern floatv3_t *ds_su, *ds_sv, *ds_sz;
-extern floatv3_t *ds_sup, *ds_svp, *ds_szp;
-extern float focallengthf, zeroheight;
 
-// Variable flat sizes
-extern UINT32 nflatxshift;
-extern UINT32 nflatyshift;
-extern UINT32 nflatshiftup;
-extern UINT32 nflatmask;
+extern float focallengthf;
+
+
+typedef void (coldrawfunc_t)(drawcolumndata_t*);
+typedef void (spandrawfunc_t)(drawspandata_t*);
+
+#define BASEDRAWFUNC 0
+
+enum
+{
+	COLDRAWFUNC_BASE = BASEDRAWFUNC,
+	COLDRAWFUNC_FUZZY,
+	COLDRAWFUNC_TRANS,
+	COLDRAWFUNC_SHADOWED,
+	COLDRAWFUNC_TRANSTRANS,
+	COLDRAWFUNC_TWOSMULTIPATCH,
+	COLDRAWFUNC_TWOSMULTIPATCHTRANS,
+	COLDRAWFUNC_FOG,
+
+	COLDRAWFUNC_MAX
+};
+
+extern int colfunctype;
+extern coldrawfunc_t *colfunc;
+extern coldrawfunc_t *colfuncs[COLDRAWFUNC_MAX];
+
+enum
+{
+	SPANDRAWFUNC_BASE = BASEDRAWFUNC,
+	SPANDRAWFUNC_TRANS,
+	SPANDRAWFUNC_TILTED,
+	SPANDRAWFUNC_TILTEDTRANS,
+
+	SPANDRAWFUNC_SPLAT,
+	SPANDRAWFUNC_TRANSSPLAT,
+	SPANDRAWFUNC_TILTEDSPLAT,
+	SPANDRAWFUNC_TILTEDTRANSSPLAT,
+
+	SPANDRAWFUNC_WATER,
+	SPANDRAWFUNC_TILTEDWATER,
+
+	SPANDRAWFUNC_FOG,
+	SPANDRAWFUNC_TILTEDFOG,
+
+	SPANDRAWFUNC_MAX
+};
+
+extern spandrawfunc_t *spanfunc;
+extern spandrawfunc_t *spanfuncs[SPANDRAWFUNC_MAX];
+
+void R_DrawMaskedColumn(drawcolumndata_t* dc, column_t *column);
 
 /// \brief Top border
 #define BRDR_T 0
@@ -108,15 +179,17 @@ extern lumpnum_t viewborderlump[8];
 #define GTC_MENUCACHE GTC_CACHE
 //@TODO Add a separate caching mechanism for menu colormaps distinct from in-level GTC_CACHE. For now this is still preferable to memory leaks...
 
-#define TC_DEFAULT    -1
-#define TC_BOSS       -2
-#define TC_METALSONIC -3 // For Metal Sonic battle
-#define TC_ALLWHITE   -4 // For Cy-Brak-demon
-#define TC_RAINBOW    -5 // For invincibility power
-#define TC_BLINK      -6 // For item blinking
+enum
+{
+	TC_BLINK  = -6, // For item blinking, according to kart
+	TC_RAINBOW,     // For single colour
+	TC_ALLWHITE,    // For Cy-Brak-demon
+	TC_METALSONIC,  // For Metal Sonic battle
+	TC_BOSS,
+	TC_DEFAULT
+};
 
 // Initialize color translation tables, for player rendering etc.
-void R_InitTranslationTables(void);
 UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags);
 UINT8* R_GetLocalTranslationColormap(skin_t *skin, skin_t *localskin, skincolors_t color, UINT8 flags, boolean local);
 patch_t* R_GetSkinFaceRank(player_t* ply);
@@ -125,6 +198,26 @@ patch_t* R_GetSkinFaceMini(player_t* ply);
 void R_FlushTranslationColormapCache(void);
 UINT8 R_GetColorByName(const char *name);
 
+extern UINT8 *transtables; // translucency tables, should be (*transtables)[5][256][256]
+
+enum
+{
+	blendtab_add,
+	blendtab_subtract,
+	blendtab_reversesubtract,
+	blendtab_modulate,
+	NUMBLENDMAPS
+};
+
+extern UINT8 *blendtables[NUMBLENDMAPS];
+
+void R_InitTranslucencyTables(void);
+
+UINT8 *R_GetTranslucencyTable(INT32 alphalevel);
+UINT8 *R_GetBlendTable(int style, INT32 alphalevel);
+
+boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel);
+
 // Custom player skin translation
 void R_InitViewBuffer(INT32 width, INT32 height);
 void R_InitViewBorder(void);
@@ -141,44 +234,43 @@ void R_DrawViewBorder(void);
 #define TRANSPARENTPIXEL 247
 
 // -----------------
-// 8bpp DRAWING CODE
+// DRAWING CODE
 // -----------------
 
-void R_DrawColumn_8(void);
-#define R_DrawWallColumn_8	R_DrawColumn_8
-void R_DrawShadeColumn_8(void);
-void R_DrawTranslucentColumn_8(void);
+// column drawers
+void R_DrawColumn(drawcolumndata_t* dc);
+void R_DrawColumnShadowed(drawcolumndata_t* dc);
 
-void R_DrawTranslatedColumn_8(void);
-void R_DrawTranslatedTranslucentColumn_8(void);
-void R_DrawSpan_8(void);
-void R_CalcTiltedLighting(fixed_t start, fixed_t end);
-void R_DrawTiltedSpan_8(void);
-void R_DrawTiltedTranslucentSpan_8(void);
-#ifndef NOWATER
-void R_DrawTiltedTranslucentWaterSpan_8(void);
-#endif
-void R_DrawTiltedSplat_8(void);
-void R_DrawSplat_8(void);
-void R_DrawTranslucentSplat_8(void);
-void R_DrawTranslucentSpan_8(void);
-void R_DrawTranslucentWaterSpan_8(void);
-void R_Draw2sMultiPatchColumn_8(void);
-void R_Draw2sMultiPatchTranslucentColumn_8(void);
-void R_DrawFogSpan_8(void);
-void R_DrawFogColumn_8(void);
-void R_DrawColumnShadowed_8(void);
+void R_DrawTranslucentColumn(drawcolumndata_t* dc);
 
-// ------------------
-// 16bpp DRAWING CODE
-// ------------------
+void R_DrawTranslatedColumn(drawcolumndata_t* dc);
+void R_DrawTranslatedTranslucentColumn(drawcolumndata_t* dc);
 
-#ifdef HIGHCOLOR
-void R_DrawColumn_16(void);
-void R_DrawWallColumn_16(void);
-void R_DrawTranslucentColumn_16(void);
-void R_DrawTranslatedColumn_16(void);
-void R_DrawSpan_16(void);
+void R_Draw2sMultiPatchColumn(drawcolumndata_t* dc);
+void R_Draw2sMultiPatchTranslucentColumn(drawcolumndata_t* dc);
+
+void R_DrawFogColumn(drawcolumndata_t* dc);
+
+// span drawers
+void R_DrawSpan(drawspandata_t* ds);
+
+void R_DrawSpan_Tilted(drawspandata_t* ds);
+void R_DrawTranslucentSpan_Tilted(drawspandata_t* ds);
+void R_DrawTranslucentWaterSpan_Tilted(drawspandata_t* ds);
+
+void R_DrawTranslucentSpan(drawspandata_t* ds);
+void R_DrawTranslucentWaterSpan(drawspandata_t* ds);
+
+void R_DrawFogSpan(drawspandata_t* ds);
+void R_DrawFogSpan_Tilted(drawspandata_t* ds);
+
+void R_DrawSplat_Tilted(drawspandata_t* ds);
+void R_DrawSplat(drawspandata_t* ds);
+void R_DrawTranslucentSplat(drawspandata_t* ds);
+void R_DrawTranslucentSplat_Tilted(drawspandata_t* ds);
+
+#ifdef __cplusplus
+} // extern "C"
 #endif
 
 // =========================================================================
diff --git a/src/r_draw16.c b/src/r_draw16.c
deleted file mode 100644
index 918dd356c..000000000
--- a/src/r_draw16.c
+++ /dev/null
@@ -1,214 +0,0 @@
-// SONIC ROBO BLAST 2
-//-----------------------------------------------------------------------------
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-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  r_draw16.c
-/// \brief 16bpp (HIGHCOLOR) span/column drawer functions
-/// \note  no includes because this is included as part of r_draw.c
-
-// ==========================================================================
-// COLUMNS
-// ==========================================================================
-
-/// \brief kick out the upper bit of each component (we're in 5 : 5 : 5)
-#define HIMASK1 0x7bde
-
-/**	\brief The R_DrawColumn_16 function
-	standard upto 128high posts column drawer
-*/
-void R_DrawColumn_16(void)
-{
-	INT32 count;
-	INT16 *dest;
-	fixed_t frac, fracstep;
-
-	count = dc_yh - dc_yl + 1;
-
-	// Zero length, column does not exceed a pixel.
-	if (count <= 0)
-		return;
-
-#ifdef RANGECHECK
-	if (dc_x >= vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		I_Error("R_DrawColumn_16: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
-	// Framebuffer destination address.
-	// Use ylookup LUT to avoid multiply with ScreenWidth.
-	// Use columnofs LUT for subwindows?
-	dest = (INT16 *)(void *)(ylookup[dc_yl] + columnofs[dc_x]);
-
-	// Determine scaling, which is the only mapping to be done.
-	fracstep = dc_iscale;
-	frac = dc_texturemid + (dc_yl - centery)*fracstep;
-
-	// Inner loop that does the actual texture mapping, e.g. a DDA-like scaling.
-	// This is as fast as it gets.
-
-	do
-	{
-		// Re-map color indices from wall texture column using a lighting/special effects LUT.
-		*dest = hicolormaps[((INT16 *)(void *)dc_source)[(frac>>FRACBITS)&127]>>1];
-
-		dest += vid.width;
-		frac += fracstep;
-	} while (--count);
-}
-
-/**	\brief The R_DrawWallColumn_16 function
-	LAME cutnpaste: same as R_DrawColumn_16 but wraps around 256
-	instead of 128 for the tall sky textures (256x240)
-*/
-void R_DrawWallColumn_16(void)
-{
-	INT32 count;
-	INT16 *dest;
-	fixed_t frac, fracstep;
-
-	count = dc_yh - dc_yl + 1;
-
-	// Zero length, column does not exceed a pixel.
-	if (count <= 0)
-		return;
-
-#ifdef RANGECHECK
-	if (dc_x >= vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		I_Error("R_DrawWallColumn_16: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
-	dest = (INT16 *)(void *)(ylookup[dc_yl] + columnofs[dc_x]);
-
-	fracstep = dc_iscale;
-	frac = dc_texturemid + (dc_yl - centery)*fracstep;
-
-	do
-	{
-		*dest = hicolormaps[((INT16 *)(void *)dc_source)[(frac>>FRACBITS)&255]>>1];
-
-		dest += vid.width;
-		frac += fracstep;
-	} while (--count);
-}
-
-/**	\brief The R_DrawTranslucentColumn_16 function
-		LAME cutnpaste: same as R_DrawColumn_16 but does
-		translucent
-*/
-void R_DrawTranslucentColumn_16(void)
-{
-	INT32 count;
-	INT16 *dest;
-	fixed_t frac, fracstep;
-
-	// check out coords for src*
-	if ((dc_yl < 0) || (dc_x >= vid.width))
-		return;
-
-	count = dc_yh - dc_yl;
-	if (count < 0)
-		return;
-
-#ifdef RANGECHECK
-	if (dc_x >= vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		I_Error("R_DrawTranslucentColumn_16: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
-	// FIXME. As above.
-	dest = (INT16 *)(void *)(ylookup[dc_yl] + columnofs[dc_x]);
-
-	// Looks familiar.
-	fracstep = dc_iscale;
-	frac = dc_texturemid + (dc_yl - centery)*fracstep;
-
-	// Here we do an additional index re-mapping.
-	do
-	{
-		*dest = (INT16)((INT16)((color8to16[dc_source[frac>>FRACBITS]]>>1) & 0x39ce)
-			+ (INT16)(((*dest & HIMASK1)) & 0x7fff));
-
-		dest += vid.width;
-		frac += fracstep;
-	} while (count--);
-}
-
-/**	\brief The R_DrawTranslatedColumn_16 function
-	?
-*/
-void R_DrawTranslatedColumn_16(void)
-{
-	INT32 count;
-	INT16 *dest;
-	fixed_t frac, fracstep;
-
-	count = dc_yh - dc_yl;
-	if (count < 0)
-		return;
-
-#ifdef RANGECHECK
-	if (dc_x >= vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		I_Error("R_DrawTranslatedColumn_16: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
-	dest = (INT16 *)(void *)(ylookup[dc_yl] + columnofs[dc_x]);
-
-	// Looks familiar.
-	fracstep = dc_iscale;
-	frac = dc_texturemid + (dc_yl - centery)*fracstep;
-
-	// Here we do an additional index re-mapping.
-	do
-	{
-		*dest = color8to16[dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]]];
-		dest += vid.width;
-
-		frac += fracstep;
-	} while (count--);
-}
-
-// ==========================================================================
-// SPANS
-// ==========================================================================
-
-/**	\brief The R_*_16 function
-	Draws the actual span.
-*/
-void R_DrawSpan_16(void)
-{
-	fixed_t xfrac, yfrac;
-	INT16 *dest;
-	INT32 count, spot;
-
-#ifdef RANGECHECK
-	if (ds_x2 < ds_x1 || ds_x1 < 0 || ds_x2 >= vid.width || ds_y > vid.height)
-		I_Error("R_DrawSpan_16: %d to %d at %d", ds_x1, ds_x2, ds_y);
-#endif
-
-	xfrac = ds_xfrac;
-	yfrac = ds_yfrac;
-
-	dest = (INT16 *)(void *)(ylookup[ds_y] + columnofs[ds_x1]);
-
-	// We do not check for zero spans here?
-	count = ds_x2 - ds_x1;
-
-	if (count <= 0) // We do now!
-		return;
-
-	do
-	{
-		// Current texture index in u, v.
-		spot = ((yfrac>>(16-6))&(63*64)) + ((xfrac>>16)&63);
-
-		// Lookup pixel from flat texture tile, re-index using light/colormap.
-		*dest++ = hicolormaps[((INT16 *)(void *)ds_source)[spot]>>1];
-
-		// Next step in u, v.
-		xfrac += ds_xstep;
-		yfrac += ds_ystep;
-	} while (count--);
-}
diff --git a/src/r_draw8.c b/src/r_draw8.c
deleted file mode 100644
index 57f5366aa..000000000
--- a/src/r_draw8.c
+++ /dev/null
@@ -1,1721 +0,0 @@
-// SONIC ROBO BLAST 2
-//-----------------------------------------------------------------------------
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-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  r_draw8.c
-/// \brief 8bpp span/column drawer functions
-/// \note  no includes because this is included as part of r_draw.c
-
-// ==========================================================================
-// COLUMNS
-// ==========================================================================
-
-// A column is a vertical slice/span of a wall texture that uses
-// a has a constant z depth from top to bottom.
-//
-
-/**	\brief The R_DrawColumn_8 function
-	Experiment to make software go faster. Taken from the Boom source
-*/
-void R_DrawColumn_8(void)
-{
-	INT32 count;
-	register UINT8 *dest;
-	register fixed_t frac;
-	fixed_t fracstep;
-
-	count = dc_yh - dc_yl;
-
-	if (count < 0) // Zero length, column does not exceed a pixel.
-		return;
-
-#ifdef RANGECHECK
-	if ((unsigned)dc_x >= (unsigned)vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		return;
-#endif
-
-	// Framebuffer destination address.
-	// Use ylookup LUT to avoid multiply with ScreenWidth.
-	// Use columnofs LUT for subwindows?
-
-	dest = &topleft[dc_yl*vid.width + dc_x];
-
-	count++;
-
-	// Determine scaling, which is the only mapping to be done.
-	fracstep = dc_iscale;
-	frac = (dc_texturemid + FixedMul((dc_yl << FRACBITS) - centeryfrac, fracstep))*(!dc_hires);
-
-
-	// Inner loop that does the actual texture mapping, e.g. a DDA-like scaling.
-	// This is as fast as it gets.
-	{
-		register const UINT8 *source = dc_source;
-		register const lighttable_t *colormap = dc_colormap;
-		register INT32 heightmask = dc_texheight-1;
-		if (dc_texheight & heightmask)   // not a power of 2 -- killough
-		{
-			heightmask++;
-			heightmask <<= FRACBITS;
-
-			if (frac < 0)
-				while ((frac += heightmask) <  0);
-			else
-				while (frac >= heightmask)
-					frac -= heightmask;
-
-			do
-			{
-				// Re-map color indices from wall texture column
-				//  using a lighting/special effects LUT.
-				// heightmask is the Tutti-Frutti fix
-				*dest = colormap[source[frac>>FRACBITS]];
-				dest += vid.width;
-
-				// Avoid overflow.
-				if (fracstep > 0x7FFFFFFF - frac)
-					frac += fracstep - heightmask;
-				else
-					frac += fracstep;
-
-				while (frac >= heightmask)
-					frac -= heightmask;
-			} while (--count);
-		}
-		else
-		{
-			while ((count -= 2) >= 0) // texture height is a power of 2
-			{
-				*dest = colormap[source[(frac>>FRACBITS) & heightmask]];
-				dest += vid.width;
-				frac += fracstep;
-				*dest = colormap[source[(frac>>FRACBITS) & heightmask]];
-				dest += vid.width;
-				frac += fracstep;
-			}
-			if (count & 1)
-				*dest = colormap[source[(frac>>FRACBITS) & heightmask]];
-		}
-	}
-}
-
-
-void R_Draw2sMultiPatchColumn_8(void)
-{
-	INT32 count;
-	register UINT8 *dest;
-	register fixed_t frac;
-	fixed_t fracstep;
-
-	count = dc_yh - dc_yl;
-
-	if (count < 0) // Zero length, column does not exceed a pixel.
-		return;
-
-#ifdef RANGECHECK
-	if ((unsigned)dc_x >= (unsigned)vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		return;
-#endif
-
-	// Framebuffer destination address.
-	// Use ylookup LUT to avoid multiply with ScreenWidth.
-	// Use columnofs LUT for subwindows?
-
-	//dest = ylookup[dc_yl] + columnofs[dc_x];
-	dest = &topleft[dc_yl*vid.width + dc_x];
-
-	count++;
-
-	// Determine scaling, which is the only mapping to be done.
-	fracstep = dc_iscale;
-	//frac = dc_texturemid + (dc_yl - centery)*fracstep;
-	frac = (dc_texturemid + FixedMul((dc_yl << FRACBITS) - centeryfrac, fracstep))*(!dc_hires);
-
-	// Inner loop that does the actual texture mapping, e.g. a DDA-like scaling.
-	// This is as fast as it gets.
-	{
-		register const UINT8 *source = dc_source;
-		register const lighttable_t *colormap = dc_colormap;
-		register INT32 heightmask = dc_texheight-1;
-		register UINT8 val;
-		if (dc_texheight & heightmask)   // not a power of 2 -- killough
-		{
-			heightmask++;
-			heightmask <<= FRACBITS;
-
-			if (frac < 0)
-				while ((frac += heightmask) <  0);
-			else
-				while (frac >= heightmask)
-					frac -= heightmask;
-
-			do
-			{
-				// Re-map color indices from wall texture column
-				//  using a lighting/special effects LUT.
-				// heightmask is the Tutti-Frutti fix
-				val = source[frac>>FRACBITS];
-
-				if (val != TRANSPARENTPIXEL)
-					*dest = colormap[val];
-
-				dest += vid.width;
-
-				// Avoid overflow.
-				if (fracstep > 0x7FFFFFFF - frac)
-					frac += fracstep - heightmask;
-				else
-					frac += fracstep;
-
-				while (frac >= heightmask)
-					frac -= heightmask;
-			} while (--count);
-		}
-		else
-		{
-			while ((count -= 2) >= 0) // texture height is a power of 2
-			{
-				val = source[(frac>>FRACBITS) & heightmask];
-				if (val != TRANSPARENTPIXEL)
-					*dest = colormap[val];
-				dest += vid.width;
-				frac += fracstep;
-				val = source[(frac>>FRACBITS) & heightmask];
-				if (val != TRANSPARENTPIXEL)
-					*dest = colormap[val];
-				dest += vid.width;
-				frac += fracstep;
-			}
-			if (count & 1)
-			{
-				val = source[(frac>>FRACBITS) & heightmask];
-				if (val != TRANSPARENTPIXEL)
-					*dest = colormap[val];
-			}
-		}
-	}
-}
-
-void R_Draw2sMultiPatchTranslucentColumn_8(void)
-{
-	INT32 count;
-	register UINT8 *dest;
-	register fixed_t frac;
-	fixed_t fracstep;
-
-	count = dc_yh - dc_yl;
-
-	if (count < 0) // Zero length, column does not exceed a pixel.
-		return;
-
-#ifdef RANGECHECK
-	if ((unsigned)dc_x >= (unsigned)vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		return;
-#endif
-
-	// Framebuffer destination address.
-	// Use ylookup LUT to avoid multiply with ScreenWidth.
-	// Use columnofs LUT for subwindows?
-
-	//dest = ylookup[dc_yl] + columnofs[dc_x];
-	dest = &topleft[dc_yl*vid.width + dc_x];
-
-	count++;
-
-	// Determine scaling, which is the only mapping to be done.
-	fracstep = dc_iscale;
-	//frac = dc_texturemid + (dc_yl - centery)*fracstep;
-	frac = (dc_texturemid + FixedMul((dc_yl << FRACBITS) - centeryfrac, fracstep))*(!dc_hires);
-
-	// Inner loop that does the actual texture mapping, e.g. a DDA-like scaling.
-	// This is as fast as it gets.
-	{
-		register const UINT8 *source = dc_source;
-		register const UINT8 *transmap = dc_transmap;
-		register const lighttable_t *colormap = dc_colormap;
-		register INT32 heightmask = dc_texheight-1;
-		register UINT8 val;
-		if (dc_texheight & heightmask)   // not a power of 2 -- killough
-		{
-			heightmask++;
-			heightmask <<= FRACBITS;
-
-			if (frac < 0)
-				while ((frac += heightmask) <  0);
-			else
-				while (frac >= heightmask)
-					frac -= heightmask;
-
-			do
-			{
-				// Re-map color indices from wall texture column
-				//  using a lighting/special effects LUT.
-				// heightmask is the Tutti-Frutti fix
-				val = source[frac>>FRACBITS];
-
-				if (val != TRANSPARENTPIXEL)
-					*dest = *(transmap + (colormap[val]<<8) + (*dest));
-
-				dest += vid.width;
-
-				// Avoid overflow.
-				if (fracstep > 0x7FFFFFFF - frac)
-					frac += fracstep - heightmask;
-				else
-					frac += fracstep;
-
-				while (frac >= heightmask)
-					frac -= heightmask;
-			} while (--count);
-		}
-		else
-		{
-			while ((count -= 2) >= 0) // texture height is a power of 2
-			{
-				val = source[(frac>>FRACBITS) & heightmask];
-				if (val != TRANSPARENTPIXEL)
-					*dest = *(transmap + (colormap[val]<<8) + (*dest));
-				dest += vid.width;
-				frac += fracstep;
-				val = source[(frac>>FRACBITS) & heightmask];
-				if (val != TRANSPARENTPIXEL)
-					*dest = *(transmap + (colormap[val]<<8) + (*dest));
-				dest += vid.width;
-				frac += fracstep;
-			}
-			if (count & 1)
-			{
-				val = source[(frac>>FRACBITS) & heightmask];
-				if (val != TRANSPARENTPIXEL)
-					*dest = *(transmap + (colormap[val]<<8) + (*dest));
-			}
-		}
-	}
-}
-
-/**	\brief The R_DrawShadeColumn_8 function
-	Experiment to make software go faster. Taken from the Boom source
-*/
-void R_DrawShadeColumn_8(void)
-{
-	register INT32 count;
-	register UINT8 *dest;
-	register fixed_t frac, fracstep;
-
-	// check out coords for src*
-	if ((dc_yl < 0) || (dc_x >= vid.width))
-		return;
-
-	count = dc_yh - dc_yl;
-	if (count < 0)
-		return;
-
-#ifdef RANGECHECK
-	if ((unsigned)dc_x >= (unsigned)vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		I_Error("R_DrawShadeColumn_8: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
-	// FIXME. As above.
-	//dest = ylookup[dc_yl] + columnofs[dc_x];
-	dest = &topleft[dc_yl*vid.width + dc_x];
-
-	// Looks familiar.
-	fracstep = dc_iscale;
-	//frac = dc_texturemid + (dc_yl - centery)*fracstep;
-	frac = (dc_texturemid + FixedMul((dc_yl << FRACBITS) - centeryfrac, fracstep))*(!dc_hires);
-
-	// Here we do an additional index re-mapping.
-	do
-	{
-		*dest = colormaps[(dc_source[frac>>FRACBITS] <<8) + (*dest)];
-		dest += vid.width;
-		frac += fracstep;
-	} while (count--);
-}
-
-/**	\brief The R_DrawTranslucentColumn_8 function
-	I've made an asm routine for the transparency, because it slows down
-	a lot in 640x480 with big sprites (bfg on all screen, or transparent
-	walls on fullscreen)
-*/
-void R_DrawTranslucentColumn_8(void)
-{
-	register INT32 count;
-	register UINT8 *dest;
-	register fixed_t frac, fracstep;
-
-	count = dc_yh - dc_yl + 1;
-
-	if (count <= 0) // Zero length, column does not exceed a pixel.
-		return;
-
-#ifdef RANGECHECK
-	if ((unsigned)dc_x >= (unsigned)vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		I_Error("R_DrawTranslucentColumn_8: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
-	// FIXME. As above.
-	//dest = ylookup[dc_yl] + columnofs[dc_x];
-	dest = &topleft[dc_yl*vid.width + dc_x];
-
-	// Looks familiar.
-	fracstep = dc_iscale;
-	//frac = dc_texturemid + (dc_yl - centery)*fracstep;
-	frac = (dc_texturemid + FixedMul((dc_yl << FRACBITS) - centeryfrac, fracstep))*(!dc_hires);
-
-	// Inner loop that does the actual texture mapping, e.g. a DDA-like scaling.
-	// This is as fast as it gets.
-	{
-		register const UINT8 *source = dc_source;
-		register const UINT8 *transmap = dc_transmap;
-		register const lighttable_t *colormap = dc_colormap;
-		register INT32 heightmask = dc_texheight - 1;
-		if (dc_texheight & heightmask)
-		{
-			heightmask++;
-			heightmask <<= FRACBITS;
-
-			if (frac < 0)
-				while ((frac += heightmask) < 0)
-					;
-			else
-				while (frac >= heightmask)
-					frac -= heightmask;
-
-			do
-			{
-				// Re-map color indices from wall texture column
-				// using a lighting/special effects LUT.
-				// heightmask is the Tutti-Frutti fix
-				*dest = *(transmap + (colormap[source[frac>>FRACBITS]]<<8) + (*dest));
-				dest += vid.width;
-				if ((frac += fracstep) >= heightmask)
-					frac -= heightmask;
-			}
-			while (--count);
-		}
-		else
-		{
-			while ((count -= 2) >= 0) // texture height is a power of 2
-			{
-				*dest = *(transmap + (colormap[source[(frac>>FRACBITS)&heightmask]]<<8) + (*dest));
-				dest += vid.width;
-				frac += fracstep;
-				*dest = *(transmap + (colormap[source[(frac>>FRACBITS)&heightmask]]<<8) + (*dest));
-				dest += vid.width;
-				frac += fracstep;
-			}
-			if (count & 1)
-				*dest = *(transmap + (colormap[source[(frac>>FRACBITS)&heightmask]]<<8) + (*dest));
-		}
-	}
-}
-
-/**	\brief The R_DrawTranslatedTranslucentColumn_8 function
-	Spiffy function. Not only does it colormap a sprite, but does translucency as well.
-	Uber-kudos to Cyan Helkaraxe
-*/
-void R_DrawTranslatedTranslucentColumn_8(void)
-{
-	register INT32 count;
-	register UINT8 *dest;
-	register fixed_t frac, fracstep;
-
-	count = dc_yh - dc_yl + 1;
-
-	if (count <= 0) // Zero length, column does not exceed a pixel.
-		return;
-
-	// FIXME. As above.
-	//dest = ylookup[dc_yl] + columnofs[dc_x];
-	dest = &topleft[dc_yl*vid.width + dc_x];
-
-	// Looks familiar.
-	fracstep = dc_iscale;
-	//frac = dc_texturemid + (dc_yl - centery)*fracstep;
-	frac = (dc_texturemid + FixedMul((dc_yl << FRACBITS) - centeryfrac, fracstep))*(!dc_hires);
-
-	// Inner loop that does the actual texture mapping, e.g. a DDA-like scaling.
-	// This is as fast as it gets.
-	{
-		register INT32 heightmask = dc_texheight - 1;
-		if (dc_texheight & heightmask)
-		{
-			heightmask++;
-			heightmask <<= FRACBITS;
-
-			if (frac < 0)
-				while ((frac += heightmask) < 0)
-					;
-			else
-				while (frac >= heightmask)
-					frac -= heightmask;
-
-			do
-			{
-				// Re-map color indices from wall texture column
-				//  using a lighting/special effects LUT.
-				// heightmask is the Tutti-Frutti fix
-
-				*dest = *(dc_transmap + (dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]]<<8) + (*dest));
-
-				dest += vid.width;
-				if ((frac += fracstep) >= heightmask)
-					frac -= heightmask;
-			}
-			while (--count);
-		}
-		else
-		{
-			while ((count -= 2) >= 0) // texture height is a power of 2
-			{
-				*dest = *(dc_transmap + (dc_colormap[dc_translation[dc_source[(frac>>FRACBITS)&heightmask]]]<<8) + (*dest));
-				dest += vid.width;
-				frac += fracstep;
-				*dest = *(dc_transmap + (dc_colormap[dc_translation[dc_source[(frac>>FRACBITS)&heightmask]]]<<8) + (*dest));
-				dest += vid.width;
-				frac += fracstep;
-			}
-			if (count & 1)
-				*dest = *(dc_transmap + (dc_colormap[dc_translation[dc_source[(frac>>FRACBITS)&heightmask]]]<<8) + (*dest));
-		}
-	}
-}
-
-/**	\brief The R_DrawTranslatedColumn_8 function
-	Draw columns up to 128 high but remap the green ramp to other colors
-
-  \warning STILL NOT IN ASM, TO DO..
-*/
-void R_DrawTranslatedColumn_8(void)
-{
-	register INT32 count;
-	register UINT8 *dest;
-	register fixed_t frac, fracstep;
-
-	count = dc_yh - dc_yl;
-	if (count < 0)
-		return;
-
-#ifdef RANGECHECK
-	if ((unsigned)dc_x >= (unsigned)vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		I_Error("R_DrawTranslatedColumn_8: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
-	// FIXME. As above.
-	//dest = ylookup[dc_yl] + columnofs[dc_x];
-	dest = &topleft[dc_yl*vid.width + dc_x];
-
-	// Looks familiar.
-	fracstep = dc_iscale;
-	//frac = dc_texturemid + (dc_yl-centery)*fracstep;
-	frac = (dc_texturemid + FixedMul((dc_yl << FRACBITS) - centeryfrac, fracstep))*(!dc_hires);
-
-	// Here we do an additional index re-mapping.
-	do
-	{
-		// Translation tables are used
-		//  to map certain colorramps to other ones,
-		//  used with PLAY sprites.
-		// Thus the "green" ramp of the player 0 sprite
-		//  is mapped to gray, red, black/indigo.
-		*dest = dc_colormap[dc_translation[dc_source[frac>>FRACBITS]]];
-
-		dest += vid.width;
-
-		frac += fracstep;
-	} while (count--);
-}
-
-// ==========================================================================
-// SPANS
-// ==========================================================================
-
-/**	\brief The R_DrawSpan_8 function
-	Draws the actual span.
-*/
-void R_DrawSpan_8 (void)
-{
-	fixed_t xposition;
-	fixed_t yposition;
-	fixed_t xstep, ystep;
-
-	UINT8 *source;
-	UINT8 *colormap;
-	UINT8 *dest;
-	const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
-
-	size_t count = (ds_x2 - ds_x1 + 1);
-
-	xposition = ds_xfrac; yposition = ds_yfrac;
-	xstep = ds_xstep; ystep = ds_ystep;
-
-	// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
-	// can be used for the fraction part. This allows calculation of the memory address in the
-	// texture with two shifts, an OR and one AND. (see below)
-	// for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
-	// bit per power of two (obviously)
-	// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
-	// than the original span renderer. Whodathunkit?
-	xposition <<= nflatshiftup; yposition <<= nflatshiftup;
-	xstep <<= nflatshiftup; ystep <<= nflatshiftup;
-
-	source = ds_source;
-	colormap = ds_colormap;
-	dest = ylookup[ds_y] + columnofs[ds_x1];
-
-	if (dest+8 > deststop)
-		return;
-
-	while (count >= 8)
-	{
-		// SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
-		// have the uber complicated math to calculate it now, so that was a memory write we didn't
-		// need!
-		dest[0] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[1] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[2] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[3] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[4] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[5] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[6] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[7] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest += 8;
-		count -= 8;
-	}
-	while (count-- && dest <= deststop)
-	{
-		*dest++ = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
-		xposition += xstep;
-		yposition += ystep;
-	}
-}
-
-// R_CalcTiltedLighting
-// Exactly what it says on the tin. I wish I wasn't too lazy to explain things properly.
-static INT32 tiltlighting[MAXVIDWIDTH];
-void R_CalcTiltedLighting(fixed_t start, fixed_t end)
-{
-	// ZDoom uses a different lighting setup to us, and I couldn't figure out how to adapt their version
-	// of this function. Here's my own.
-	INT32 left = ds_x1, right = ds_x2;
-	fixed_t step = (end-start)/(ds_x2-ds_x1+1);
-	INT32 i;
-
-	// I wanna do some optimizing by checking for out-of-range segments on either side to fill in all at once,
-	// but I'm too bad at coding to not crash the game trying to do that. I guess this is fast enough for now...
-
-	for (i = left; i <= right; i++) {
-		tiltlighting[i] = (start += step) >> FRACBITS;
-		if (tiltlighting[i] < 0)
-			tiltlighting[i] = 0;
-		else if (tiltlighting[i] >= MAXLIGHTSCALE)
-			tiltlighting[i] = MAXLIGHTSCALE-1;
-	}
-}
-
-#define PLANELIGHTFLOAT ((float)BASEVIDWIDTH * BASEVIDWIDTH / vid.width / (zeroheight - FIXED_TO_FLOAT(viewz)) / 21.0f * FIXED_TO_FLOAT(fovtan))
-
-/**	\brief The R_DrawTiltedSpan_8 function
-	Draw slopes! Holy sheit!
-*/
-void R_DrawTiltedSpan_8(void)
-{
-	// x1, x2 = ds_x1, ds_x2
-	int width = ds_x2 - ds_x1;
-	double iz, uz, vz;
-	UINT32 u, v;
-	int i;
-
-	UINT8 *source;
-	UINT8 *colormap;
-	UINT8 *dest;
-
-	double startz, startu, startv;
-	double izstep, uzstep, vzstep;
-	double endz, endu, endv;
-	UINT32 stepu, stepv;
-
-	iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
-
-	// Lighting is simple. It's just linear interpolation from start to end
-	{
-		float planelightfloat = PLANELIGHTFLOAT;
-		float lightstart, lightend;
-
-		lightend = (iz + ds_szp->x*width) * planelightfloat;
-		lightstart = iz * planelightfloat;
-
-		R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend));
-		//CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf);
-	}
-
-	uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
-	vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
-
-	dest = ylookup[ds_y] + columnofs[ds_x1];
-	source = ds_source;
-	//colormap = ds_colormap;
-
-#if 0	// The "perfect" reference version of this routine. Pretty slow.
-		// Use it only to see how things are supposed to look.
-	i = 0;
-	do
-	{
-		double z = 1.f/iz;
-		u = (INT64)(uz*z) + viewx;
-		v = (INT64)(vz*z) + viewy;
-
-		colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-
-		*dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
-		dest++;
-		iz += ds_szp->x;
-		uz += ds_sup->x;
-		vz += ds_svp->x;
-	} while (--width >= 0);
-#else
-#define SPANSIZE 16
-#define INVSPAN	0.0625f
-
-	startz = 1.f/iz;
-	startu = uz*startz;
-	startv = vz*startz;
-
-	izstep = ds_szp->x * SPANSIZE;
-	uzstep = ds_sup->x * SPANSIZE;
-	vzstep = ds_svp->x * SPANSIZE;
-	//x1 = 0;
-	width++;
-
-	while (width >= SPANSIZE)
-	{
-		iz += izstep;
-		uz += uzstep;
-		vz += vzstep;
-
-		endz = 1.f/iz;
-		endu = uz*endz;
-		endv = vz*endz;
-		stepu = (INT64)((endu - startu) * INVSPAN);
-		stepv = (INT64)((endv - startv) * INVSPAN);
-		u = (INT64)(startu) + viewx;
-		v = (INT64)(startv) + viewy;
-
-		for (i = SPANSIZE-1; i >= 0; i--)
-		{
-			colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-			*dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
-			dest++;
-			u += stepu;
-			v += stepv;
-		}
-		startu = endu;
-		startv = endv;
-		width -= SPANSIZE;
-	}
-	if (width > 0)
-	{
-		if (width == 1)
-		{
-			u = (INT64)(startu);
-			v = (INT64)(startv);
-			colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-			*dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
-		}
-		else
-		{
-			double left = width;
-			iz += ds_szp->x * left;
-			uz += ds_sup->x * left;
-			vz += ds_svp->x * left;
-
-			endz = 1.f/iz;
-			endu = uz*endz;
-			endv = vz*endz;
-			left = 1.f/left;
-			stepu = (INT64)((endu - startu) * left);
-			stepv = (INT64)((endv - startv) * left);
-			u = (INT64)(startu) + viewx;
-			v = (INT64)(startv) + viewy;
-
-			for (; width != 0; width--)
-			{
-				colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-				*dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
-				dest++;
-				u += stepu;
-				v += stepv;
-			}
-		}
-	}
-#endif
-}
-
-/**	\brief The R_DrawTiltedTranslucentSpan_8 function
-	Like DrawTiltedSpan, but translucent
-*/
-void R_DrawTiltedTranslucentSpan_8(void)
-{
-	// x1, x2 = ds_x1, ds_x2
-	int width = ds_x2 - ds_x1;
-	double iz, uz, vz;
-	UINT32 u, v;
-	int i;
-
-	UINT8 *source;
-	UINT8 *colormap;
-	UINT8 *dest;
-
-	double startz, startu, startv;
-	double izstep, uzstep, vzstep;
-	double endz, endu, endv;
-	UINT32 stepu, stepv;
-
-	iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
-
-	// Lighting is simple. It's just linear interpolation from start to end
-	{
-		float planelightfloat = PLANELIGHTFLOAT;
-		float lightstart, lightend;
-
-		lightend = (iz + ds_szp->x*width) * planelightfloat;
-		lightstart = iz * planelightfloat;
-
-		R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend));
-		//CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf);
-	}
-
-	uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
-	vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
-
-	dest = ylookup[ds_y] + columnofs[ds_x1];
-	source = ds_source;
-	//colormap = ds_colormap;
-
-#if 0	// The "perfect" reference version of this routine. Pretty slow.
-		// Use it only to see how things are supposed to look.
-	i = 0;
-	do
-	{
-		double z = 1.f/iz;
-		u = (INT64)(uz*z) + viewx;
-		v = (INT64)(vz*z) + viewy;
-
-		colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-		*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
-		dest++;
-		iz += ds_szp->x;
-		uz += ds_sup->x;
-		vz += ds_svp->x;
-	} while (--width >= 0);
-#else
-#define SPANSIZE 16
-#define INVSPAN	0.0625f
-
-	startz = 1.f/iz;
-	startu = uz*startz;
-	startv = vz*startz;
-
-	izstep = ds_szp->x * SPANSIZE;
-	uzstep = ds_sup->x * SPANSIZE;
-	vzstep = ds_svp->x * SPANSIZE;
-	//x1 = 0;
-	width++;
-
-	while (width >= SPANSIZE)
-	{
-		iz += izstep;
-		uz += uzstep;
-		vz += vzstep;
-
-		endz = 1.f/iz;
-		endu = uz*endz;
-		endv = vz*endz;
-		stepu = (INT64)((endu - startu) * INVSPAN);
-		stepv = (INT64)((endv - startv) * INVSPAN);
-		u = (INT64)(startu) + viewx;
-		v = (INT64)(startv) + viewy;
-
-		for (i = SPANSIZE-1; i >= 0; i--)
-		{
-			colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-			*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
-			dest++;
-			u += stepu;
-			v += stepv;
-		}
-		startu = endu;
-		startv = endv;
-		width -= SPANSIZE;
-	}
-	if (width > 0)
-	{
-		if (width == 1)
-		{
-			u = (INT64)(startu);
-			v = (INT64)(startv);
-			colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-			*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
-		}
-		else
-		{
-			double left = width;
-			iz += ds_szp->x * left;
-			uz += ds_sup->x * left;
-			vz += ds_svp->x * left;
-
-			endz = 1.f/iz;
-			endu = uz*endz;
-			endv = vz*endz;
-			left = 1.f/left;
-			stepu = (INT64)((endu - startu) * left);
-			stepv = (INT64)((endv - startv) * left);
-			u = (INT64)(startu) + viewx;
-			v = (INT64)(startv) + viewy;
-
-			for (; width != 0; width--)
-			{
-				colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-				*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
-				dest++;
-				u += stepu;
-				v += stepv;
-			}
-		}
-	}
-#endif
-}
-
-#ifndef NOWATER
-/**	\brief The R_DrawTiltedTranslucentWaterSpan_8 function
-	Like DrawTiltedTranslucentSpan, but for water
-*/
-void R_DrawTiltedTranslucentWaterSpan_8(void)
-{
-	// x1, x2 = ds_x1, ds_x2
-	int width = ds_x2 - ds_x1;
-	double iz, uz, vz;
-	UINT32 u, v;
-	int i;
-
-	UINT8 *source;
-	UINT8 *colormap;
-	UINT8 *dest;
-	UINT8 *dsrc;
-
-	double startz, startu, startv;
-	double izstep, uzstep, vzstep;
-	double endz, endu, endv;
-	UINT32 stepu, stepv;
-
-	iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
-
-	// Lighting is simple. It's just linear interpolation from start to end
-	{
-		float planelightfloat = PLANELIGHTFLOAT;
-		float lightstart, lightend;
-
-		lightend = (iz + ds_szp->x*width) * planelightfloat;
-		lightstart = iz * planelightfloat;
-
-		R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend));
-		//CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf);
-	}
-
-	uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
-	vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
-
-	dest = ylookup[ds_y] + columnofs[ds_x1];
-	dsrc = screens[1] + (ds_y+ds_bgofs)*vid.width + ds_x1;
-	source = ds_source;
-	//colormap = ds_colormap;
-
-#if 0	// The "perfect" reference version of this routine. Pretty slow.
-		// Use it only to see how things are supposed to look.
-	i = 0;
-	do
-	{
-		double z = 1.f/iz;
-		u = (INT64)(uz*z) + viewx;
-		v = (INT64)(vz*z) + viewy;
-
-		colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-		*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dsrc++);
-		dest++;
-		iz += ds_szp->x;
-		uz += ds_sup->x;
-		vz += ds_svp->x;
-	} while (--width >= 0);
-#else
-#define SPANSIZE 16
-#define INVSPAN	0.0625f
-
-	startz = 1.f/iz;
-	startu = uz*startz;
-	startv = vz*startz;
-
-	izstep = ds_szp->x * SPANSIZE;
-	uzstep = ds_sup->x * SPANSIZE;
-	vzstep = ds_svp->x * SPANSIZE;
-	//x1 = 0;
-	width++;
-
-	while (width >= SPANSIZE)
-	{
-		iz += izstep;
-		uz += uzstep;
-		vz += vzstep;
-
-		endz = 1.f/iz;
-		endu = uz*endz;
-		endv = vz*endz;
-		stepu = (INT64)((endu - startu) * INVSPAN);
-		stepv = (INT64)((endv - startv) * INVSPAN);
-		u = (INT64)(startu) + viewx;
-		v = (INT64)(startv) + viewy;
-
-		for (i = SPANSIZE-1; i >= 0; i--)
-		{
-			colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-			*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dsrc++);
-			dest++;
-			u += stepu;
-			v += stepv;
-		}
-		startu = endu;
-		startv = endv;
-		width -= SPANSIZE;
-	}
-	if (width > 0)
-	{
-		if (width == 1)
-		{
-			u = (INT64)(startu);
-			v = (INT64)(startv);
-			colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-			*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dsrc++);
-		}
-		else
-		{
-			double left = width;
-			iz += ds_szp->x * left;
-			uz += ds_sup->x * left;
-			vz += ds_svp->x * left;
-
-			endz = 1.f/iz;
-			endu = uz*endz;
-			endv = vz*endz;
-			left = 1.f/left;
-			stepu = (INT64)((endu - startu) * left);
-			stepv = (INT64)((endv - startv) * left);
-			u = (INT64)(startu) + viewx;
-			v = (INT64)(startv) + viewy;
-
-			for (; width != 0; width--)
-			{
-				colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-				*dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dsrc++);
-				dest++;
-				u += stepu;
-				v += stepv;
-			}
-		}
-	}
-#endif
-}
-#endif // NOWATER
-
-void R_DrawTiltedSplat_8(void)
-{
-	// x1, x2 = ds_x1, ds_x2
-	int width = ds_x2 - ds_x1;
-	double iz, uz, vz;
-	UINT32 u, v;
-	int i;
-
-	UINT8 *source;
-	UINT8 *colormap;
-	UINT8 *dest;
-
-	UINT8 val;
-
-	double startz, startu, startv;
-	double izstep, uzstep, vzstep;
-	double endz, endu, endv;
-	UINT32 stepu, stepv;
-
-	iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
-
-	// Lighting is simple. It's just linear interpolation from start to end
-	{
-		float planelightfloat = PLANELIGHTFLOAT;
-		float lightstart, lightend;
-
-		lightend = (iz + ds_szp->x*width) * planelightfloat;
-		lightstart = iz * planelightfloat;
-
-		R_CalcTiltedLighting(FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend));
-		//CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf);
-	}
-
-	uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
-	vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
-
-	dest = ylookup[ds_y] + columnofs[ds_x1];
-	source = ds_source;
-	//colormap = ds_colormap;
-
-#if 0	// The "perfect" reference version of this routine. Pretty slow.
-		// Use it only to see how things are supposed to look.
-	i = 0;
-	do
-	{
-		double z = 1.f/iz;
-		u = (INT64)(uz*z) + viewx;
-		v = (INT64)(vz*z) + viewy;
-
-		colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-
-		val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			*dest = colormap[val];
-		dest++;
-		iz += ds_szp->x;
-		uz += ds_sup->x;
-		vz += ds_svp->x;
-	} while (--width >= 0);
-#else
-#define SPANSIZE 16
-#define INVSPAN	0.0625f
-
-	startz = 1.f/iz;
-	startu = uz*startz;
-	startv = vz*startz;
-
-	izstep = ds_szp->x * SPANSIZE;
-	uzstep = ds_sup->x * SPANSIZE;
-	vzstep = ds_svp->x * SPANSIZE;
-	//x1 = 0;
-	width++;
-
-	while (width >= SPANSIZE)
-	{
-		iz += izstep;
-		uz += uzstep;
-		vz += vzstep;
-
-		endz = 1.f/iz;
-		endu = uz*endz;
-		endv = vz*endz;
-		stepu = (INT64)((endu - startu) * INVSPAN);
-		stepv = (INT64)((endv - startv) * INVSPAN);
-		u = (INT64)(startu) + viewx;
-		v = (INT64)(startv) + viewy;
-
-		for (i = SPANSIZE-1; i >= 0; i--)
-		{
-			colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-			val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
-			if (val != TRANSPARENTPIXEL)
-				*dest = colormap[val];
-			dest++;
-			u += stepu;
-			v += stepv;
-		}
-		startu = endu;
-		startv = endv;
-		width -= SPANSIZE;
-	}
-	if (width > 0)
-	{
-		if (width == 1)
-		{
-			u = (INT64)(startu);
-			v = (INT64)(startv);
-			colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-			val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
-			if (val != TRANSPARENTPIXEL)
-				*dest = colormap[val];
-		}
-		else
-		{
-			double left = width;
-			iz += ds_szp->x * left;
-			uz += ds_sup->x * left;
-			vz += ds_svp->x * left;
-
-			endz = 1.f/iz;
-			endu = uz*endz;
-			endv = vz*endz;
-			left = 1.f/left;
-			stepu = (INT64)((endu - startu) * left);
-			stepv = (INT64)((endv - startv) * left);
-			u = (INT64)(startu) + viewx;
-			v = (INT64)(startv) + viewy;
-
-			for (; width != 0; width--)
-			{
-				colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
-				val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
-				if (val != TRANSPARENTPIXEL)
-					*dest = colormap[val];
-				dest++;
-				u += stepu;
-				v += stepv;
-			}
-		}
-	}
-#endif
-}
-
-/**	\brief The R_DrawSplat_8 function
-	Just like R_DrawSpan_8, but skips transparent pixels.
-*/
-void R_DrawSplat_8 (void)
-{
-	UINT32 xposition;
-	UINT32 yposition;
-	UINT32 xstep, ystep;
-
-	UINT8 *source;
-	UINT8 *colormap;
-	UINT8 *dest;
-
-	size_t count;
-	UINT32 val;
-
-	// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
-	// can be used for the fraction part. This allows calculation of the memory address in the
-	// texture with two shifts, an OR and one AND. (see below)
-	// for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
-	// bit per power of two (obviously)
-	// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
-	// than the original span renderer. Whodathunkit?
-	xposition = ds_xfrac << nflatshiftup; yposition = ds_yfrac << nflatshiftup;
-	xstep = ds_xstep << nflatshiftup; ystep = ds_ystep << nflatshiftup;
-
-	source = ds_source;
-	colormap = ds_colormap;
-	dest = ylookup[ds_y] + columnofs[ds_x1];
-	count = ds_x2 - ds_x1 + 1;
-
-	while (count >= 8)
-	{
-		// SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
-		// have the uber complicated math to calculate it now, so that was a memory write we didn't
-		// need!
-		//
-		// <Callum> 4194303 = (2048x2048)-1 (2048x2048 is maximum flat size)
-		val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
-		val &= 4194303;
-		val = source[val];
-		if (val != TRANSPARENTPIXEL)
-			dest[0] = colormap[val];
-		xposition += xstep;
-		yposition += ystep;
-
-		val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
-		val &= 4194303;
-		val = source[val];
-		if (val != TRANSPARENTPIXEL)
-			dest[1] = colormap[val];
-		xposition += xstep;
-		yposition += ystep;
-
-		val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
-		val &= 4194303;
-		val = source[val];
-		if (val != TRANSPARENTPIXEL)
-			dest[2] = colormap[val];
-		xposition += xstep;
-		yposition += ystep;
-
-		val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
-		val &= 4194303;
-		val = source[val];
-		if (val != TRANSPARENTPIXEL)
-			dest[3] = colormap[val];
-		xposition += xstep;
-		yposition += ystep;
-
-		val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
-		val &= 4194303;
-		val = source[val];
-		if (val != TRANSPARENTPIXEL)
-			dest[4] = colormap[val];
-		xposition += xstep;
-		yposition += ystep;
-
-		val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
-		val &= 4194303;
-		val = source[val];
-		if (val != TRANSPARENTPIXEL)
-			dest[5] = colormap[val];
-		xposition += xstep;
-		yposition += ystep;
-
-		val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
-		val &= 4194303;
-		val = source[val];
-		if (val != TRANSPARENTPIXEL)
-			dest[6] = colormap[val];
-		xposition += xstep;
-		yposition += ystep;
-
-		val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
-		val &= 4194303;
-		val = source[val];
-		if (val != TRANSPARENTPIXEL)
-			dest[7] = colormap[val];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest += 8;
-		count -= 8;
-	}
-	while (count--)
-	{
-		val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
-		val &= 4194303;
-		val = source[val];
-		if (val != TRANSPARENTPIXEL)
-			*dest = colormap[val];
-
-		dest++;
-		xposition += xstep;
-		yposition += ystep;
-	}
-}
-
-/**	\brief The R_DrawTranslucentSplat_8 function
-	Just like R_DrawSplat_8, but is translucent!
-*/
-void R_DrawTranslucentSplat_8 (void)
-{
-	UINT32 xposition;
-	UINT32 yposition;
-	UINT32 xstep, ystep;
-
-	UINT8 *source;
-	UINT8 *colormap;
-	UINT8 *dest;
-
-	size_t count;
-	UINT8 val;
-
-	// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
-	// can be used for the fraction part. This allows calculation of the memory address in the
-	// texture with two shifts, an OR and one AND. (see below)
-	// for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
-	// bit per power of two (obviously)
-	// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
-	// than the original span renderer. Whodathunkit?
-	xposition = ds_xfrac << nflatshiftup; yposition = ds_yfrac << nflatshiftup;
-	xstep = ds_xstep << nflatshiftup; ystep = ds_ystep << nflatshiftup;
-
-	source = ds_source;
-	colormap = ds_colormap;
-	dest = ylookup[ds_y] + columnofs[ds_x1];
-	count = ds_x2 - ds_x1 + 1;
-
-	while (count >= 8)
-	{
-		// SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
-		// have the uber complicated math to calculate it now, so that was a memory write we didn't
-		// need!
-		val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			dest[0] = *(ds_transmap + (colormap[val] << 8) + dest[0]);
-		xposition += xstep;
-		yposition += ystep;
-
-		val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			dest[1] = *(ds_transmap + (colormap[val] << 8) + dest[1]);
-		xposition += xstep;
-		yposition += ystep;
-
-		val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			dest[2] = *(ds_transmap + (colormap[val] << 8) + dest[2]);
-		xposition += xstep;
-		yposition += ystep;
-
-		val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			dest[3] = *(ds_transmap + (colormap[val] << 8) + dest[3]);
-		xposition += xstep;
-		yposition += ystep;
-
-		val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			dest[4] = *(ds_transmap + (colormap[val] << 8) + dest[4]);
-		xposition += xstep;
-		yposition += ystep;
-
-		val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			dest[5] = *(ds_transmap + (colormap[val] << 8) + dest[5]);
-		xposition += xstep;
-		yposition += ystep;
-
-		val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			dest[6] = *(ds_transmap + (colormap[val] << 8) + dest[6]);
-		xposition += xstep;
-		yposition += ystep;
-
-		val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			dest[7] = *(ds_transmap + (colormap[val] << 8) + dest[7]);
-		xposition += xstep;
-		yposition += ystep;
-
-		dest += 8;
-		count -= 8;
-	}
-	while (count--)
-	{
-		val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
-		if (val != TRANSPARENTPIXEL)
-			*dest = *(ds_transmap + (colormap[val] << 8) + *dest);
-
-		dest++;
-		xposition += xstep;
-		yposition += ystep;
-	}
-}
-
-/**	\brief The R_DrawTranslucentSpan_8 function
-	Draws the actual span with translucent.
-*/
-void R_DrawTranslucentSpan_8 (void)
-{
-	fixed_t xposition;
-	fixed_t yposition;
-	fixed_t xstep, ystep;
-
-	UINT8 *source;
-	UINT8 *colormap;
-	UINT8 *dest;
-	const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
-
-	size_t count = (ds_x2 - ds_x1 + 1);
-	UINT32 val;
-
-	xposition = ds_xfrac; yposition = ds_yfrac;
-	xstep = ds_xstep; ystep = ds_ystep;
-
-	// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
-	// can be used for the fraction part. This allows calculation of the memory address in the
-	// texture with two shifts, an OR and one AND. (see below)
-	// for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
-	// bit per power of two (obviously)
-	// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
-	// than the original span renderer. Whodathunkit?
-	xposition <<= nflatshiftup; yposition <<= nflatshiftup;
-	xstep <<= nflatshiftup; ystep <<= nflatshiftup;
-
-	source = ds_source;
-	colormap = ds_colormap;
-	dest = ylookup[ds_y] + columnofs[ds_x1];
-
-	while (count >= 8)
-	{
-		// SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
-		// have the uber complicated math to calculate it now, so that was a memory write we didn't
-		// need!
-		dest[0] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[0]);
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[1] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[1]);
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[2] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[2]);
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[3] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[3]);
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[4] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[4]);
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[5] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[5]);
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[6] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[6]);
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[7] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[7]);
-		xposition += xstep;
-		yposition += ystep;
-
-		dest += 8;
-		count -= 8;
-	}
-	while (count-- && dest <= deststop)
-	{
-		val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
-		*dest = *(ds_transmap + (colormap[source[val]] << 8) + *dest);
-		dest++;
-		xposition += xstep;
-		yposition += ystep;
-	}
-}
-
-#ifndef NOWATER
-void R_DrawTranslucentWaterSpan_8(void)
-{
-	UINT32 xposition;
-	UINT32 yposition;
-	UINT32 xstep, ystep;
-
-	UINT8 *source;
-	UINT8 *colormap;
-	UINT8 *dest;
-	UINT8 *dsrc;
-
-	size_t count;
-
-	// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
-	// can be used for the fraction part. This allows calculation of the memory address in the
-	// texture with two shifts, an OR and one AND. (see below)
-	// for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
-	// bit per power of two (obviously)
-	// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
-	// than the original span renderer. Whodathunkit?
-	xposition = ds_xfrac << nflatshiftup; yposition = (ds_yfrac + ds_waterofs) << nflatshiftup;
-	xstep = ds_xstep << nflatshiftup; ystep = ds_ystep << nflatshiftup;
-
-	source = ds_source;
-	colormap = ds_colormap;
-	dest = ylookup[ds_y] + columnofs[ds_x1];
-	dsrc = screens[1] + (ds_y+ds_bgofs)*vid.width + ds_x1;
-	count = ds_x2 - ds_x1 + 1;
-
-	while (count >= 8)
-	{
-		// SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
-		// have the uber complicated math to calculate it now, so that was a memory write we didn't
-		// need!
-		dest[0] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[1] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[2] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[3] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[4] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[5] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[6] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest[7] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
-		xposition += xstep;
-		yposition += ystep;
-
-		dest += 8;
-		count -= 8;
-	}
-	while (count--)
-	{
-		*dest++ = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
-		xposition += xstep;
-		yposition += ystep;
-	}
-}
-#endif
-
-/**	\brief The R_DrawFogSpan_8 function
-	Draws the actual span with fogging.
-*/
-void R_DrawFogSpan_8(void)
-{
-	UINT8 *colormap;
-	UINT8 *dest;
-
-	size_t count;
-
-	colormap = ds_colormap;
-	//dest = ylookup[ds_y] + columnofs[ds_x1];
-	dest = &topleft[ds_y *vid.width + ds_x1];
-
-	count = ds_x2 - ds_x1 + 1;
-
-	while (count >= 4)
-	{
-		dest[0] = colormap[dest[0]];
-		dest[1] = colormap[dest[1]];
-		dest[2] = colormap[dest[2]];
-		dest[3] = colormap[dest[3]];
-
-		dest += 4;
-		count -= 4;
-	}
-
-	while (count--)
-	{
-		*dest = colormap[*dest];
-		dest++;
-	}
-}
-
-/**	\brief The R_DrawFogColumn_8 function
-	Fog wall.
-*/
-void R_DrawFogColumn_8(void)
-{
-	INT32 count;
-	UINT8 *dest;
-
-	count = dc_yh - dc_yl;
-
-	// Zero length, column does not exceed a pixel.
-	if (count < 0)
-		return;
-
-#ifdef RANGECHECK
-	if ((unsigned)dc_x >= (unsigned)vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		I_Error("R_DrawFogColumn_8: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
-	// Framebuffer destination address.
-	// Use ylookup LUT to avoid multiply with ScreenWidth.
-	// Use columnofs LUT for subwindows?
-	//dest = ylookup[dc_yl] + columnofs[dc_x];
-	dest = &topleft[dc_yl*vid.width + dc_x];
-
-	// Determine scaling, which is the only mapping to be done.
-	do
-	{
-		// Simple. Apply the colormap to what's already on the screen.
-		*dest = dc_colormap[*dest];
-		dest += vid.width;
-	} while (count--);
-}
-
-/**	\brief The R_DrawShadeColumn_8 function
-	This is for 3D floors that cast shadows on walls.
-
-	This function just cuts the column up into sections and calls R_DrawColumn_8
-*/
-void R_DrawColumnShadowed_8(void)
-{
-	INT32 count, realyh, i, height, bheight = 0, solid = 0;
-
-	realyh = dc_yh;
-
-	count = dc_yh - dc_yl;
-
-	// Zero length, column does not exceed a pixel.
-	if (count < 0)
-		return;
-
-#ifdef RANGECHECK
-	if ((unsigned)dc_x >= (unsigned)vid.width || dc_yl < 0 || dc_yh >= vid.height)
-		I_Error("R_DrawColumnShadowed_8: %d to %d at %d", dc_yl, dc_yh, dc_x);
-#endif
-
-	// This runs through the lightlist from top to bottom and cuts up the column accordingly.
-	for (i = 0; i < dc_numlights; i++)
-	{
-		// If the height of the light is above the column, get the colormap
-		// anyway because the lighting of the top should be affected.
-		solid = dc_lightlist[i].flags & FF_CUTSOLIDS;
-
-		height = dc_lightlist[i].height >> LIGHTSCALESHIFT;
-		if (solid)
-		{
-			bheight = dc_lightlist[i].botheight >> LIGHTSCALESHIFT;
-			if (bheight < height)
-			{
-				// confounded slopes sometimes allow partial invertedness,
-				// even including cases where the top and bottom heights
-				// should actually be the same!
-				// swap the height values as a workaround for this quirk
-				INT32 temp = height;
-				height = bheight;
-				bheight = temp;
-			}
-		}
-		if (height <= dc_yl)
-		{
-			dc_colormap = dc_lightlist[i].rcolormap;
-			if (encoremap)
-				dc_colormap += COLORMAP_REMAPOFFSET;
-			if (solid && dc_yl < bheight)
-				dc_yl = bheight;
-			continue;
-		}
-		// Found a break in the column!
-		dc_yh = height;
-
-		if (dc_yh > realyh)
-			dc_yh = realyh;
-		basecolfunc();		// R_DrawColumn_8 for the appropriate architecture
-		if (solid)
-			dc_yl = bheight;
-		else
-			dc_yl = dc_yh + 1;
-
-		dc_colormap = dc_lightlist[i].rcolormap;
-		if (encoremap)
-			dc_colormap += COLORMAP_REMAPOFFSET;
-	}
-	dc_yh = realyh;
-	if (dc_yl <= realyh)
-		walldrawerfunc();		// R_DrawWallColumn_8 for the appropriate architecture
-}
diff --git a/src/r_draw_column.cpp b/src/r_draw_column.cpp
new file mode 100644
index 000000000..dcc1a5b90
--- /dev/null
+++ b/src/r_draw_column.cpp
@@ -0,0 +1,356 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by Kart Krew.
+// Copyright (C) 2020 by Sonic Team Junior.
+// Copyright (C) 2000 by DooM Legacy Team.
+// Copyright (C) 1996 by id Software, Inc.
+//
+// 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  r_draw_column.cpp
+/// \brief column drawer functions
+/// \note  no includes because this is included as part of r_draw.cpp
+
+// ==========================================================================
+// COLUMNS
+// ==========================================================================
+
+// A column is a vertical slice/span of a wall texture that uses
+// a has a constant z depth from top to bottom.
+//
+
+enum DrawColumnType
+{
+	DC_BASIC			= 0x0000,
+	DC_COLORMAP			= 0x0001,
+	DC_TRANSMAP			= 0x0002,
+	DC_HOLES			= 0x0004,
+	DC_LIGHTLIST		= 0x0008,
+};
+
+template<DrawColumnType Type>
+static constexpr UINT8 R_GetColumnTranslated(drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap)
+{
+	if constexpr (Type & DrawColumnType::DC_COLORMAP)
+	{
+		col = dc->translation[col];
+	}
+
+	return colormap[col];
+}
+
+template<DrawColumnType Type>
+static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 * restrict dest, UINT8 col, const UINT8 * restrict colormap)
+{
+	col = R_GetColumnTranslated<Type>(dc, col, colormap);
+
+	if constexpr (Type & DrawColumnType::DC_TRANSMAP)
+	{
+		return *(dc->transmap + (col << 8) + (*dest));
+	}
+	else
+	{
+		return col;
+	}
+}
+
+template<DrawColumnType Type>
+static constexpr UINT8 R_DrawColumnPixel(drawcolumndata_t* dc, UINT8 * restrict dest, UINT32 bit, const restrict UINT8 *source, const restrict UINT8 *colormap)
+{
+	UINT8 col = source[bit];
+
+	if constexpr (Type & DrawColumnType::DC_HOLES)
+	{
+		if (col == TRANSPARENTPIXEL)
+		{
+			return *dest;
+		}
+	}
+
+	return R_GetColumnTranslucent<Type>(dc, dest, col, colormap);
+}
+
+/**	\brief The R_DrawColumn function
+	Experiment to make software go faster. Taken from the Boom source
+*/
+template<DrawColumnType Type>
+static void R_DrawColumnTemplate(drawcolumndata_t *dc)
+{
+	INT32 count;
+
+	count = dc->yh - dc->yl;
+
+	if (count < 0) // Zero length, column does not exceed a pixel.
+	{
+		return;
+	}
+
+	if ((unsigned)dc->x >= (unsigned)vid.width || dc->yl < 0 || dc->yh >= vid.height)
+	{
+		return;
+	}
+
+	if constexpr (Type & DrawColumnType::DC_LIGHTLIST)
+	{
+		constexpr DrawColumnType NewType = static_cast<DrawColumnType>(Type & ~DC_LIGHTLIST);
+		INT32 i, height, bheight = 0, solid = 0;
+		drawcolumndata_t dc_copy = *dc;
+
+		const INT32 realyh = dc_copy.yh;
+
+		// This runs through the lightlist from top to bottom and cuts up the column accordingly.
+		for (i = 0; i < dc_copy.numlights; i++)
+		{
+			// If the height of the light is above the column, get the colormap
+			// anyway because the lighting of the top should be affected.
+			solid = dc_copy.lightlist[i].flags & FF_CUTSOLIDS;
+			height = dc_copy.lightlist[i].height >> LIGHTSCALESHIFT;
+
+			if (solid)
+			{
+				bheight = dc_copy.lightlist[i].botheight >> LIGHTSCALESHIFT;
+
+				if (bheight < height)
+				{
+					// confounded slopes sometimes allow partial invertedness,
+					// even including cases where the top and bottom heights
+					// should actually be the same!
+					// swap the height values as a workaround for this quirk
+					INT32 temp = height;
+					height = bheight;
+					bheight = temp;
+				}
+			}
+
+			if (height <= dc_copy.yl)
+			{
+				dc_copy.colormap = dc_copy.lightlist[i].rcolormap;
+
+				if (encoremap)
+				{
+					dc_copy.colormap += COLORMAP_REMAPOFFSET;
+				}
+
+				if (solid && dc_copy.yl < bheight)
+				{
+					dc_copy.yl = bheight;
+				}
+
+				continue;
+			}
+
+			// Found a break in the column!
+			dc_copy.yh = height;
+
+			if (dc_copy.yh > realyh)
+			{
+				dc_copy.yh = realyh;
+			}
+
+			R_DrawColumnTemplate<NewType>(&dc_copy);
+			if (solid)
+			{
+				dc_copy.yl = bheight;
+			}
+			else
+			{
+				dc_copy.yl = dc_copy.yh + 1;
+			}
+
+			dc_copy.colormap = dc_copy.lightlist[i].rcolormap;
+
+			if (encoremap)
+			{
+				dc_copy.colormap += COLORMAP_REMAPOFFSET;
+			}
+		}
+
+		dc_copy.yh = realyh;
+
+		if (dc_copy.yl <= realyh)
+		{
+			R_DrawColumnTemplate<NewType>(&dc_copy);
+		}
+	}
+	else
+	{
+		// Inner loop that does the actual texture mapping,
+		//  e.g. a DDA-lile scaling.
+		// This is as fast as it gets.       (Yeah, right!!! -- killough)
+		//
+		// killough 2/1/98: more performance tuning
+
+		intptr_t frac;
+		const intptr_t fracstep = dc->iscale;
+		const intptr_t heightmask = dc->sourcelength-1;
+		constexpr INT32 npow2min = -1;
+		const INT32 npow2max = dc->sourcelength;
+		const INT32 stride = vid.width;
+
+		const UINT8 * restrict source = dc->source;
+		const lighttable_t * restrict colormap = dc->colormap;
+
+		// Framebuffer destination address.
+		UINT8 * restrict dest = R_Address(dc->x, dc->yl);
+
+		count++;
+
+		// Determine scaling, which is the only mapping to be done.
+		frac = (dc->texturemid + FixedMul((dc->yl << FRACBITS) - centeryfrac, fracstep));
+
+		switch (heightmask)
+		{
+			case 255:
+			case 127:
+				{
+					while(count--)
+					{
+						*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
+						dest += stride;
+						frac += fracstep;
+					}
+				}
+				break;
+			case -1:
+				{
+					if (frac < 0)
+						// adjust in case we underread
+						frac += FRACUNIT;
+
+					// texture has no height, so just go
+					while (--count >= 0)
+					{
+						*dest = R_DrawColumnPixel<Type>(dc, dest, frac>>FRACBITS, source, colormap);
+						dest += stride;
+						frac += fracstep;
+					}
+				}
+				break;
+			default:
+				{
+					if (!(dc->sourcelength & heightmask))   // power of 2 -- killough
+					{
+						while ((count -= 2) >= 0) // texture height is a power of 2 -- killough
+						{
+							*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
+							dest += stride;
+							frac += fracstep;
+
+							*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
+							dest += stride;
+							frac += fracstep;
+						}
+
+						if (count & 1)
+						{
+							*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
+						}
+					}
+					else
+					{
+						const intptr_t fixed_heightmask = dc->texheight << FRACBITS;
+
+						if (frac < 0)
+						{
+							while ((frac += fixed_heightmask) < 0)
+							{
+								;
+							}
+						}
+						else
+						{
+							while (frac >= fixed_heightmask)
+							{
+								frac -= fixed_heightmask;
+							}
+						}
+
+						do
+						{
+							// Re-map color indices from wall texture column
+							//  using a lighting/special effects LUT.
+							// heightmask is the Tutti-Frutti fix
+
+							// -1 is the lower clamp bound because column posts have a "safe" byte before the real data
+							// and a few bytes after as well
+							*dest = R_DrawColumnPixel<Type>(dc, dest, CLAMP((frac >> FRACBITS), npow2min, npow2max), source, colormap);
+
+							dest += stride;
+
+#if __SIZEOF_POINTER__ < 8  // 64-bit systems have large enough numbers for this to be a non-issue
+							// Avoid overflow.
+							if (fracstep > 0x7FFFFFFF - frac)
+							{
+								frac += fracstep - fixed_heightmask;
+							}
+							else
+#endif
+							{
+								frac += fracstep;
+							}
+
+							while (frac >= fixed_heightmask)
+							{
+								frac -= fixed_heightmask;
+							}
+						}
+						while (--count);
+					}
+				}
+				break;
+		}
+	}
+}
+
+#define DEFINE_COLUMN_FUNC(name, flags) \
+	void name(drawcolumndata_t *dc) \
+	{ \
+		constexpr DrawColumnType opt = static_cast<DrawColumnType>(flags); \
+		R_DrawColumnTemplate<opt>(dc); \
+	}
+
+DEFINE_COLUMN_FUNC(R_DrawColumn, DC_BASIC)
+DEFINE_COLUMN_FUNC(R_DrawTranslucentColumn, DC_TRANSMAP)
+DEFINE_COLUMN_FUNC(R_DrawTranslatedColumn, DC_COLORMAP)
+DEFINE_COLUMN_FUNC(R_DrawColumnShadowed, DC_LIGHTLIST)
+DEFINE_COLUMN_FUNC(R_DrawTranslatedTranslucentColumn, DC_COLORMAP|DC_TRANSMAP)
+DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchColumn, DC_HOLES)
+DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchTranslucentColumn, DC_HOLES|DC_TRANSMAP)
+
+/**	\brief The R_DrawFogColumn function
+	Fog wall.
+*/
+void R_DrawFogColumn(drawcolumndata_t* dc)
+{
+	INT32 count;
+	UINT8 * restrict dest;
+
+	count = dc->yh - dc->yl;
+
+	// Zero length, column does not exceed a pixel.
+	if (count < 0)
+	{
+		return;
+	}
+
+	if ((unsigned)dc->x >= (unsigned)vid.width || dc->yl < 0 || dc->yh >= vid.height)
+	{
+		return;
+	}
+
+	// Framebuffer destination address.
+	dest = R_Address(dc->x, dc->yl);
+
+	const INT32 stride = vid.width;
+	const lighttable_t * restrict colormap = dc->colormap;
+
+	// Determine scaling, which is the only mapping to be done.
+	do
+	{
+		// Simple. Apply the colormap to what's already on the screen.
+		*dest = colormap[*dest];
+		dest += stride;
+	} while (count--);
+}
diff --git a/src/r_draw_span.cpp b/src/r_draw_span.cpp
new file mode 100644
index 000000000..a8ed71008
--- /dev/null
+++ b/src/r_draw_span.cpp
@@ -0,0 +1,459 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by Kart Krew.
+// Copyright (C) 2020 by Sonic Team Junior.
+// Copyright (C) 2000 by DooM Legacy Team.
+// Copyright (C) 1996 by id Software, Inc.
+//
+// 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  r_draw_span.cpp
+/// \brief span drawer functions
+/// \note  no includes because this is included as part of r_draw.cpp
+
+#ifdef HAVE_THREADS
+#ifdef _WIN32
+#include <windows.h>
+#define local_for_thread static __thread
+#else
+#include <threads.h>
+#define local_for_thread thread_local static
+#endif
+#else
+#define local_for_thread static
+#endif
+
+// ==========================================================================
+// SPANS
+// ==========================================================================
+
+#define SPANSIZE 16
+#define INVSPAN 0.0625f
+
+// <Callum> 4194303 = (2048x2048)-1 (2048x2048 is maximum flat size)
+#define MAXFLATBYTES 4194303
+
+#define PLANELIGHTFLOAT ((float)BASEVIDWIDTH * BASEVIDWIDTH / stride / ds->zeroheight / 21.0f * FIXED_TO_FLOAT(fovtan))
+
+enum DrawSpanType
+{
+	DS_BASIC			= 0x0000,
+	DS_COLORMAP			= 0x0001,
+	DS_TRANSMAP			= 0x0002,
+	DS_HOLES			= 0x0004,
+	DS_RIPPLE			= 0x0008,
+};
+
+template<DrawSpanType Type>
+static constexpr UINT8 R_GetSpanTranslated(drawspandata_t* ds, UINT8 col)
+{
+	if constexpr (Type & DrawSpanType::DS_COLORMAP)
+	{
+		return ds->translation[col];
+	}
+	else
+	{
+		return col;
+	}
+}
+
+template<DrawSpanType Type>
+static constexpr UINT8 R_GetSpanTranslucent(drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT8 col)
+{
+	col = colormap[R_GetSpanTranslated<Type>(ds, col)];
+
+	if constexpr (Type & DrawSpanType::DS_TRANSMAP)
+	{
+		return *(ds->transmap + (col << 8) + (*dsrc));
+	}
+	else
+	{
+		return col;
+	}
+}
+
+template<DrawSpanType Type>
+static constexpr UINT8 R_DrawSpanPixel(drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT32 bit, const UINT8 *source)
+{
+	UINT8 col = source[bit];
+
+	if constexpr (Type & DrawSpanType::DS_HOLES)
+	{
+		if (col == TRANSPARENTPIXEL)
+		{
+			return *dsrc;
+		}
+	}
+
+	return R_GetSpanTranslucent<Type>(ds, dsrc, colormap, col);
+}
+
+/**	\brief The R_DrawSpan_8 function
+	Draws the actual span.
+*/
+template<DrawSpanType Type>
+static void R_DrawSpanTemplate(drawspandata_t* ds)
+{
+	UINT32 xposition;
+	UINT32 yposition;
+	UINT32 xstep, ystep;
+	UINT32 bit;
+
+	UINT8 * restrict dest = R_Address(ds->x1, ds->y);
+	UINT8 * restrict dsrc;
+
+	const UINT8 * restrict deststop = vid.screens[0] + vid.rowbytes * vid.height;
+
+	if (dest+8 > deststop)
+	{
+		return;
+	}
+
+	intptr_t count = (ds->x2 - ds->x1 + 1);
+	size_t i;
+
+	xposition = ds->xfrac; yposition = ds->yfrac;
+	xstep = ds->xstep; ystep = ds->ystep;
+
+	const UINT8 * restrict source = ds->source;
+	const UINT8 * restrict colormap = ds->colormap;
+
+	if constexpr (Type & DS_RIPPLE)
+	{
+		yposition += ds->waterofs;
+	}
+
+	// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
+	// can be used for the fraction part. This allows calculation of the memory address in the
+	// texture with two shifts, an OR and one AND. (see below)
+	// for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
+	// bit per power of two (obviously)
+	// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
+	// than the original span renderer. Whodathunkit?
+	xposition <<= ds->nflatshiftup; yposition <<= ds->nflatshiftup;
+	xstep <<= ds->nflatshiftup; ystep <<= ds->nflatshiftup;
+
+	if constexpr (Type & DS_RIPPLE)
+	{
+		dsrc = vid.screens[1] + (ds->y + ds->bgofs) * vid.width + ds->x1;
+	}
+	else
+	{
+		dsrc = dest;
+	}
+
+	while (count >= 8)
+	{
+		// SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
+		// have the uber complicated math to calculate it now, so that was a memory write we didn't
+		// need!
+
+		for (i = 0; i < 8; i++)
+		{
+			bit = ((yposition >> ds->nflatyshift) & ds->nflatmask) | (xposition >> ds->nflatxshift);
+
+			dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
+
+			xposition += xstep;
+			yposition += ystep;
+		}
+
+		dest += 8;
+		dsrc += 8;
+
+		count -= 8;
+	}
+
+	while (count-- && dest <= deststop)
+	{
+		bit = ((yposition >> ds->nflatyshift) & ds->nflatmask) | (xposition >> ds->nflatxshift);
+
+		*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
+
+		dest++;
+		dsrc++;
+
+		xposition += xstep;
+		yposition += ystep;
+	}
+}
+
+// R_CalcTiltedLighting
+// Exactly what it says on the tin. I wish I wasn't too lazy to explain things properly.
+static void R_CalcTiltedLighting(INT32 *lightbuffer, INT32 x1, INT32 x2, fixed_t start, fixed_t end)
+{
+	// ZDoom uses a different lighting setup to us, and I couldn't figure out how to adapt their version
+	// of this function. Here's my own.
+	INT32 i, left = x1, right = x2;
+	const fixed_t step = (end-start)/(x2 - x1 + 1);
+
+	// I wanna do some optimizing by checking for out-of-range segments on either side to fill in all at once,
+	// but I'm too bad at coding to not crash the game trying to do that. I guess this is fast enough for now...
+
+	for (i = left; i <= right; i++)
+	{
+		lightbuffer[i] = (start += step) >> FRACBITS;
+
+		if (lightbuffer[i] < 0)
+		{
+			lightbuffer[i] = 0;
+		}
+		else if (lightbuffer[i] >= MAXLIGHTSCALE)
+		{
+			lightbuffer[i] = MAXLIGHTSCALE-1;
+		}
+	}
+}
+
+template<DrawSpanType Type>
+static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
+{
+	int width = ds->x2 - ds->x1;
+	float iz, uz, vz;
+	UINT32 u, v;
+	int i;
+
+	UINT8 * restrict dest = R_Address(ds->x1, ds->y);
+	UINT8 * restrict dsrc;
+
+	float startz, startu, startv;
+	float izstep, uzstep, vzstep;
+	float endz, endu, endv;
+	UINT32 stepu, stepv;
+	UINT32 bit;
+	local_for_thread INT32 *tiltlighting = NULL;
+	local_for_thread INT32 oldviewwidth = 0;
+
+	// dont realloc every frame pls thx
+	if (tiltlighting == NULL || oldviewwidth != viewwidth)
+	{
+		tiltlighting = static_cast<INT32*>(realloc(tiltlighting, sizeof(*tiltlighting) * viewwidth));
+		oldviewwidth = viewwidth;
+	}
+
+	INT32 x1 = ds->x1;
+	const INT32 nflatxshift = ds->nflatxshift;
+	const INT32 nflatyshift = ds->nflatyshift;
+	const INT32 nflatmask = ds->nflatmask;
+	const INT32 stride = vid.width;
+
+	iz = ds->szp.z + ds->szp.y*(centery-ds->y) + ds->szp.x*(ds->x1-centerx);
+
+	// Lighting is simple. It's just linear interpolation from start to end
+	{
+		float planelightfloat = PLANELIGHTFLOAT;
+		float lightstart, lightend;
+
+		lightend = (iz + ds->szp.x*width) * planelightfloat;
+		lightstart = iz * planelightfloat;
+
+		R_CalcTiltedLighting(tiltlighting, ds->x1, ds->x2, FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend));
+		//CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf);
+	}
+
+	uz = ds->sup.z + ds->sup.y*(centery-ds->y) + ds->sup.x*(ds->x1-centerx);
+	vz = ds->svp.z + ds->svp.y*(centery-ds->y) + ds->svp.x*(ds->x1-centerx);
+
+	const UINT8 *source = ds->source;
+	const UINT8 *colormap = ds->colormap;
+
+	if constexpr (Type & DS_RIPPLE)
+	{
+		dsrc = vid.screens[1] + (ds->y + ds->bgofs) * stride + ds->x1;
+	}
+	else
+	{
+		dsrc = dest;
+	}
+
+#if 0	// The "perfect" reference version of this routine. Pretty slow.
+		// Use it only to see how things are supposed to look.
+	i = 0;
+	do
+	{
+		double z = 1.f/iz;
+		u = (INT64)(uz*z);
+		v = (INT64)(vz*z);
+
+		bit = ((v >> nflatyshift) & nflatmask) | (u >> nflatxshift);
+		colormap = planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps);
+
+		*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit);
+		dest++;
+		ds->x1++;
+		dsrc++;
+		iz += ds_szp->x;
+		uz += ds_sup->x;
+		vz += ds_svp->x;
+	} while (--width >= 0);
+#else
+	startz = 1.f/iz;
+	startu = uz*startz;
+	startv = vz*startz;
+
+	izstep = ds->szp.x * SPANSIZE;
+	uzstep = ds->sup.x * SPANSIZE;
+	vzstep = ds->svp.x * SPANSIZE;
+	//x1 = 0;
+	width++;
+
+	while (width >= SPANSIZE)
+	{
+		iz += izstep;
+		uz += uzstep;
+		vz += vzstep;
+
+		endz = 1.f/iz;
+		endu = uz*endz;
+		endv = vz*endz;
+		stepu = (INT64)((endu - startu) * INVSPAN);
+		stepv = (INT64)((endv - startv) * INVSPAN);
+		u = (INT64)(startu);
+		v = (INT64)(startv);
+
+		x1 = ds->x1;
+
+		for (i = 0; i < SPANSIZE; i++)
+		{
+			bit = (((v + stepv * i) >> nflatyshift) & nflatmask) | ((u + stepu * i) >> nflatxshift);
+			colormap = ds->planezlight[tiltlighting[x1 + i]] + (ds->colormap - colormaps);
+			dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
+		}
+
+		ds->x1 += SPANSIZE;
+		dest += SPANSIZE;
+		dsrc += SPANSIZE;
+		startu = endu;
+		startv = endv;
+		width -= SPANSIZE;
+	}
+
+	if (width > 0)
+	{
+		if (width == 1)
+		{
+			u = (INT64)(startu);
+			v = (INT64)(startv);
+			bit = ((v >> nflatyshift) & nflatmask) | (u >> nflatxshift);
+			colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps);
+			*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
+			ds->x1++;
+		}
+		else
+		{
+			double left = width;
+			iz += ds->szp.x * left;
+			uz += ds->sup.x * left;
+			vz += ds->svp.x * left;
+
+			endz = 1.f/iz;
+			endu = uz*endz;
+			endv = vz*endz;
+			left = 1.f/left;
+			stepu = (INT64)((endu - startu) * left);
+			stepv = (INT64)((endv - startv) * left);
+			u = (INT64)(startu);
+			v = (INT64)(startv);
+
+			for (; width != 0; width--)
+			{
+				bit = ((v >> ds->nflatyshift) & ds->nflatmask) | (u >> ds->nflatxshift);
+				colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps);
+				*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
+				dest++;
+				ds->x1++;
+				dsrc++;
+				u += stepu;
+				v += stepv;
+			}
+		}
+	}
+#endif
+}
+
+#define DEFINE_SPAN_FUNC(name, flags, template) \
+void name(drawspandata_t* ds) \
+{ \
+	constexpr DrawSpanType opt = static_cast<DrawSpanType>(flags); \
+	template<opt>(ds); \
+}
+
+#define DEFINE_SPAN_COMBO(name, flags) \
+DEFINE_SPAN_FUNC(name, flags, R_DrawSpanTemplate) \
+DEFINE_SPAN_FUNC(name ## _Tilted, flags, R_DrawTiltedSpanTemplate) \
+
+DEFINE_SPAN_COMBO(R_DrawSpan, DS_BASIC)
+DEFINE_SPAN_COMBO(R_DrawTranslucentSpan, DS_TRANSMAP)
+DEFINE_SPAN_COMBO(R_DrawSplat, DS_HOLES)
+DEFINE_SPAN_COMBO(R_DrawTranslucentSplat, DS_TRANSMAP|DS_HOLES)
+DEFINE_SPAN_COMBO(R_DrawTranslucentWaterSpan, DS_TRANSMAP|DS_RIPPLE)
+
+/**	\brief The R_DrawFogSpan function
+	Draws the actual span with fogging.
+*/
+void R_DrawFogSpan(drawspandata_t* ds)
+{
+	const UINT8 * restrict colormap = ds->colormap;
+	UINT8 * restrict dest = R_Address(ds->x1, ds->y);
+
+	intptr_t count = ds->x2 - ds->x1 + 1;
+
+	while (count >= 4)
+	{
+		dest[0] = colormap[dest[0]];
+		dest[1] = colormap[dest[1]];
+		dest[2] = colormap[dest[2]];
+		dest[3] = colormap[dest[3]];
+
+		dest += 4;
+		count -= 4;
+	}
+
+	while (count--)
+	{
+		*dest = colormap[*dest];
+		dest++;
+	}
+}
+
+void R_DrawFogSpan_Tilted(drawspandata_t* ds)
+{
+	int width = ds->x2 - ds->x1;
+	float iz = ds->szp.z + ds->szp.y*(centery-ds->y) + ds->szp.x*(ds->x1-centerx);
+	UINT8 * restrict dest;
+
+	local_for_thread INT32 *tiltlighting = NULL;
+	local_for_thread INT32 oldviewwidth = 0;
+
+	// dont realloc every frame pls thx
+	if (tiltlighting == NULL || oldviewwidth != viewwidth)
+	{
+		tiltlighting = static_cast<INT32*>(realloc(tiltlighting, sizeof(*tiltlighting) * viewwidth));
+		oldviewwidth = viewwidth;
+	}
+
+	dest = R_Address(ds->x1, ds->y);
+	const INT32 stride = vid.width;
+
+	// Lighting is simple. It's just linear interpolation from start to end
+	{
+		float planelightfloat = PLANELIGHTFLOAT;
+		float lightstart, lightend;
+
+		lightend = (iz + ds->szp.x*width) * planelightfloat;
+		lightstart = iz * planelightfloat;
+
+		R_CalcTiltedLighting(tiltlighting, ds->x1, ds->x2, FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend));
+		//CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf);
+	}
+
+	do
+	{
+		UINT8 *colormap = ds->planezlight[tiltlighting[ds->x1++]] + (ds->colormap - colormaps);
+		*dest = colormap[*dest];
+		dest++;
+	}
+	while (--width >= 0);
+}
diff --git a/src/r_fps.c b/src/r_fps.c
index b84d07993..fc9a45aa9 100644
--- a/src/r_fps.c
+++ b/src/r_fps.c
@@ -23,6 +23,7 @@
 #include "r_state.h"
 #include "z_zone.h"
 #include "console.h" // con_startup_loadprogress
+#include "i_time.h"
 
 #ifdef HWRENDER
 #include "hardware/hw_main.h" // for cv_grshearing
@@ -40,10 +41,49 @@ static CV_PossibleValue_t fpscap_cons_t[] = {
 	{0, "Match refresh rate"},
 	{0, NULL}
 };
-consvar_t cv_fpscap = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_fpscap   = {"fpscap", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_fpscapbg = {"fpscapbackground", "Match refresh rate", CV_SAVE, fpscap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_precipinterp = {"precipinterpolation", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+ps_metric_t ps_interp_frac = {0};
+ps_metric_t ps_interp_lag  = {0};
+
+static boolean R_UseBackgroundFramerateCap(void)
+{
+	if (!window_notinfocus)
+		return false;
+
+	// if foreground is unlimited or matched to refresh rate but bg is limited
+	if (cv_fpscap.value <= 0 && cv_fpscapbg.value >= 0)
+		return true;
+
+	// use the lower value
+	if ((cv_fpscap.value > 0 && cv_fpscapbg.value > 0)
+	&& (cv_fpscapbg.value < cv_fpscap.value))
+		return true;
+
+	return false;
+}
+
+static UINT32 R_GetFrameCap(INT32 val)
+{
+	if (val == 0)
+	{
+		// 0: Match refresh rate
+		return I_GetRefreshRate();
+	}
+
+	if (val < 0)
+	{
+		// -1: Unlimited
+		return 0;
+	}
+
+	return val;
+}
+
 UINT32 R_GetFramerateCap(void)
 {
 	if (rendermode == render_none)
@@ -53,19 +93,12 @@ UINT32 R_GetFramerateCap(void)
 		return TICRATE;
 	}
 
-	if (cv_fpscap.value == 0)
+	if (R_UseBackgroundFramerateCap())
 	{
-		// 0: Match refresh rate
-		return I_GetRefreshRate();
+		return R_GetFrameCap(cv_fpscapbg.value);
 	}
 
-	if (cv_fpscap.value < 0)
-	{
-		// -1: Unlimited
-		return 0;
-	}
-
-	return cv_fpscap.value;
+	return R_GetFrameCap(cv_fpscap.value);
 }
 
 boolean R_UsingFrameInterpolation(void)
@@ -79,6 +112,7 @@ static viewvars_t skyview_old[MAXSPLITSCREENPLAYERS];
 static viewvars_t skyview_new[MAXSPLITSCREENPLAYERS];
 
 static viewvars_t *oldview = &pview_old[0];
+static tic_t last_view_update;
 static int oldview_invalid[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0};
 viewvars_t *newview = &pview_new[0];
 
@@ -89,17 +123,26 @@ static levelinterpolator_t **levelinterpolators;
 static size_t levelinterpolators_len;
 static size_t levelinterpolators_size;
 
-
-static fixed_t R_LerpFixed(fixed_t from, fixed_t to, fixed_t frac)
+static inline fixed_t R_LerpFixedView(fixed_t from, fixed_t to, fixed_t frac)
 {
 	return from + FixedMul(frac, to - from);
 }
 
-static angle_t R_LerpAngle(angle_t from, angle_t to, fixed_t frac)
+static inline angle_t R_LerpAngleView(angle_t from, angle_t to, fixed_t frac)
 {
 	return from + FixedMul(frac, to - from);
 }
 
+static inline fixed_t R_LerpFixed(fixed_t from, fixed_t to, fixed_t frac)
+{
+	return ((from == to) ? to : (from + FixedMul(frac, to - from)));
+}
+
+static inline angle_t R_LerpAngle(angle_t from, angle_t to, fixed_t frac)
+{
+	return ((from == to) ? to : (from + FixedMul(frac, to - from)));
+}
+
 /*static vector2_t *R_LerpVector2(const vector2_t *from, const vector2_t *to, fixed_t frac, vector2_t *out)
 {
 	FV2_SubEx(to, from, out);
@@ -118,14 +161,14 @@ static vector3_t *R_LerpVector3(const vector3_t *from, const vector3_t *to, fixe
 
 // recalc necessary stuff for mouseaiming
 // slopes are already calculated for the full possible view (which is 4*viewheight).
-// 18/08/18: (No it's actually 16*viewheight, thanks Jimita for finding this out)
+// 18/08/18: (No it's actually 16*viewheight, thanks Lactozilla for finding this out)
 static void R_SetupFreelook(void)
 {
 	// clip it in the case we are looking a hardware 90 degrees full aiming
 	// (lmps, network and use F12...)
 	if (rendermode == render_soft
 #ifdef HWRENDER
-		|| cv_grshearing.value
+		|| cv_glshearing.value
 #endif
 	)
 	{
@@ -147,47 +190,47 @@ static void R_SetupFreelook(void)
 
 void R_InterpolateViewRollAngle(fixed_t frac)
 {
+<<<<<<< HEAD
 	viewroll = oldview->roll + R_LerpAngle(oldview->roll, newview->roll, frac);
+=======
+	viewroll = R_LerpAngleView(oldview->roll, newview->roll, frac);
+>>>>>>> Saturn-Next
 }
 
 void R_InterpolateView(fixed_t frac, boolean forceinvalid)
 {
 	viewvars_t* prevview = oldview;
-	UINT8 i;
 
 	if (FIXED_TO_FLOAT(frac) < 0)
 		frac = 0;
 	if (frac > FRACUNIT)
 		frac = FRACUNIT;
 
-	if (viewcontext >= VIEWCONTEXT_SKY1)
-	{
-		i = viewcontext - VIEWCONTEXT_SKY1;
-	}
-	else
-	{
-		i = viewcontext - VIEWCONTEXT_PLAYER1;
-	}
-
-	if (oldview_invalid[i] != 0 || forceinvalid)
+	if (oldview_invalid[R_GetViewNumber()] != 0 || forceinvalid)
 	{
 		// interpolate from newview to newview
 		prevview = newview;
 	}
 
-	viewx = R_LerpFixed(prevview->x, newview->x, frac);
-	viewy = R_LerpFixed(prevview->y, newview->y, frac);
-	viewz = R_LerpFixed(prevview->z, newview->z, frac);
+	viewx = R_LerpFixedView(prevview->x, newview->x, frac);
+	viewy = R_LerpFixedView(prevview->y, newview->y, frac);
+	viewz = R_LerpFixedView(prevview->z, newview->z, frac);
 
+<<<<<<< HEAD
 	viewangle = R_LerpAngle(prevview->angle, newview->angle, frac);
 	aimingangle = R_LerpAngle(prevview->aim, newview->aim, frac);
 	viewroll = R_LerpAngle(prevview->roll, newview->roll, frac);
+=======
+	viewangle = R_LerpAngleView(prevview->angle, newview->angle, frac);
+	aimingangle = R_LerpAngleView(prevview->aim, newview->aim, frac);
+	viewroll = R_LerpAngleView(prevview->roll, newview->roll, frac);
+>>>>>>> Saturn-Next
 
 	viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
 	viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
 
 	viewplayer = newview->player;
-	viewsector = R_PointInSubsector(viewx, viewy)->sector;
+	viewsector = R_PointInSubsectorFast(viewx, viewy)->sector;
 
 	R_SetupFreelook();
 }
@@ -200,24 +243,29 @@ void R_UpdateViewInterpolation(void)
 	{
 		pview_old[i] = pview_new[i];
 		skyview_old[i] = skyview_new[i];
-
-		if (oldview_invalid[i]) oldview_invalid[i]--;
+		if (oldview_invalid[i] > 0) oldview_invalid[i]--;
 	}
+
+	last_view_update = I_GetTime();
 }
 
 void R_ResetViewInterpolation(UINT8 p)
 {
+	// Wait an extra tic if the interpolation state hasn't
+	// updated yet.
+	int t = ((last_view_update == I_GetTime()) ? 1 : 2);
+
 	if (p == 0)
 	{
 		UINT8 i;
 		for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
 		{
-			oldview_invalid[i]++;
+			oldview_invalid[i] = t;
 		}
 	}
 	else
 	{
-		oldview_invalid[p - 1]++;
+		oldview_invalid[p - 1] = t;
 	}
 }
 
@@ -269,7 +317,7 @@ void R_SetViewContext(enum viewcontext_e _viewcontext)
 	}
 
 	return (R_LerpFixed(from, to, rendertimefrac));
-}
+}*/
 
 angle_t R_InterpolateAngle(angle_t from, angle_t to)
 {
@@ -279,12 +327,7 @@ angle_t R_InterpolateAngle(angle_t from, angle_t to)
 	}
 
 	return (R_LerpAngle(from, to, rendertimefrac));
-}*/
-
-#define IFCHANGED(a, b)\
-if (mobj->a == mobj->b)\
-(out->a = mobj->a);\
-else
+}
 
 void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out)
 {
@@ -294,7 +337,7 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out)
 		out->y = mobj->y;
 		out->z = mobj->z;
 		out->scale = mobj->scale;
-		out->subsector = mobj->subsector;
+		//out->subsector = mobj->subsector;
 		out->angle = mobj->player ? mobj->player->frameangle : mobj->angle;
 		out->pitch = mobj->pitch;
 		out->roll = mobj->roll;
@@ -307,60 +350,31 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out)
 		return;
 	}
 
-	IFCHANGED(x, old_x)
-		out->x = R_LerpFixed(mobj->old_x, mobj->x, frac);
-
-	IFCHANGED(y, old_y)
-		out->y = R_LerpFixed(mobj->old_y, mobj->y, frac);
-
-	IFCHANGED(z, old_z)
-		out->z = R_LerpFixed(mobj->old_z, mobj->z, frac);
-
-	IFCHANGED(spritexscale, old_spritexscale)
-		out->spritexscale = mobj->resetinterp ? mobj->spritexscale : R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac);
-
-	IFCHANGED(spriteyscale, old_spriteyscale)
-		out->spriteyscale = mobj->resetinterp ? mobj->spriteyscale : R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac);
-
-	IFCHANGED(spritexoffset, old_spritexoffset)
-		out->spritexoffset = mobj->resetinterp ? mobj->spritexoffset : R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac);
-
-	IFCHANGED(spriteyoffset, old_spriteyoffset)
-		out->spriteyoffset = mobj->resetinterp ? mobj->spriteyoffset : R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac);
-
-	IFCHANGED(scale, old_scale)
-		out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac);
-
-	//out->subsector = R_PointInSubsector(out->x, out->y); // why was this even done?
-	out->subsector = mobj->subsector;
+	out->x = R_LerpFixed(mobj->old_x, mobj->x, frac);
+	out->y = R_LerpFixed(mobj->old_y, mobj->y, frac);
+	out->z = R_LerpFixed(mobj->old_z, mobj->z, frac);
+	out->spritexscale = mobj->resetinterp ? mobj->spritexscale : R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac);
+	out->spriteyscale = mobj->resetinterp ? mobj->spriteyscale : R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac);
+	out->spritexoffset = mobj->resetinterp ? mobj->spritexoffset : R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac);
+	out->spriteyoffset = mobj->resetinterp ? mobj->spriteyoffset : R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac);
+	out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac);
+	//out->subsector = R_PointInSubsector(out->x, out->y); // this is unused
 
 	if (mobj->player)
-	{
-		IFCHANGED(angle, player->old_frameangle)
-			out->angle = mobj->resetinterp ? mobj->player->frameangle : R_LerpAngle(mobj->player->old_frameangle, mobj->player->frameangle, frac);
-	}
+		out->angle = mobj->resetinterp ? mobj->player->frameangle : R_LerpAngle(mobj->player->old_frameangle, mobj->player->frameangle, frac);
 	else
-	{
-		IFCHANGED(angle, old_angle)
-			out->angle = mobj->resetinterp ? mobj->angle : R_LerpAngle(mobj->old_angle, mobj->angle, frac);
-	}
+		out->angle = mobj->resetinterp ? mobj->angle : R_LerpAngle(mobj->old_angle, mobj->angle, frac);
 
 #ifdef HWRENDER
-	if (cv_grmdls.value)
+	if (rendermode == render_opengl && cv_glmdls.value)
 	{
 		// pitch roll stuff
-		IFCHANGED(pitch, old_pitch)
-			out->pitch = mobj->resetinterp ? mobj->pitch : R_LerpAngle(mobj->old_pitch, mobj->pitch, frac);
-
-		IFCHANGED(roll, old_roll)
-			out->roll = mobj->resetinterp ? mobj->roll : R_LerpAngle(mobj->old_roll, mobj->roll, frac);
+		out->pitch = mobj->resetinterp ? mobj->pitch : R_LerpAngle(mobj->old_pitch, mobj->pitch, frac);
+		out->roll = mobj->resetinterp ? mobj->roll : R_LerpAngle(mobj->old_roll, mobj->roll, frac);
 
 		// and the slope stuff
-		IFCHANGED(slopepitch, old_slopepitch)
-			out->slopepitch = mobj->resetinterp ? mobj->slopepitch : R_LerpAngle(mobj->old_slopepitch, mobj->slopepitch, frac);
-
-		IFCHANGED(sloperoll, old_sloperoll)
-			out->sloperoll = mobj->resetinterp ? mobj->sloperoll : R_LerpAngle(mobj->old_sloperoll, mobj->sloperoll, frac);
+		out->slopepitch = mobj->resetinterp ? mobj->slopepitch : R_LerpAngle(mobj->old_slopepitch, mobj->slopepitch, frac);
+		out->sloperoll = mobj->resetinterp ? mobj->sloperoll : R_LerpAngle(mobj->old_sloperoll, mobj->sloperoll, frac);
 	}
 	else
 #endif
@@ -379,6 +393,7 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst
 		out->x = mobj->x;
 		out->y = mobj->y;
 		out->z = mobj->z;
+<<<<<<< HEAD
 		out->scale = mapobjectscale;
 		out->subsector = mobj->subsector;
 		out->angle = mobj->angle;
@@ -386,12 +401,18 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst
 		out->spriteyscale = mobj->spriteyscale;
 		out->spritexoffset = mobj->spritexoffset;
 		out->spriteyoffset = mobj->spriteyoffset;
+=======
+		out->scale = cv_mobjscaleprecip.value ? mapobjectscale : FRACUNIT;
+		//out->subsector = mobj->subsector;
+		//out->angle = mobj->angle;
+>>>>>>> Saturn-Next
 		return;
 	}
 
 		out->x = R_LerpFixed(mobj->old_x, mobj->x, frac);
 		out->y = R_LerpFixed(mobj->old_y, mobj->y, frac);
 		out->z = R_LerpFixed(mobj->old_z, mobj->z, frac);
+<<<<<<< HEAD
 		out->scale = mapobjectscale;
 		out->spritexscale = mobj->spritexscale;
 		out->spriteyscale = mobj->spriteyscale;
@@ -404,10 +425,13 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst
 		//IFCHANGED(angle, old_angle)
 			//out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac);
 		out->angle = mobj->angle;
+=======
+		out->scale = cv_mobjscaleprecip.value ? mapobjectscale : FRACUNIT;
+		//out->subsector = R_PointInSubsector(out->x, out->y); // this is unused
+		//out->angle = R_LerpAngle(mobj->old_angle, mobj->angle, frac);
+>>>>>>> Saturn-Next
 }
 
-#undef IFCHANGED
-
 static void AddInterpolator(levelinterpolator_t* interpolator)
 {
 	if (levelinterpolators_len >= levelinterpolators_size)
@@ -493,8 +517,8 @@ void R_CreateInterpolator_Polyobj(thinker_t *thinker, polyobj_t *polyobj)
 	interp->polyobj.polyobj = polyobj;
 	interp->polyobj.vertices_size = polyobj->numVertices;
 
-	interp->polyobj.oldvertices = Z_CallocAlign(sizeof(fixed_t) * 2 * polyobj->numVertices, PU_LEVEL, NULL, 32);
-	interp->polyobj.bakvertices = Z_CallocAlign(sizeof(fixed_t) * 2 * polyobj->numVertices, PU_LEVEL, NULL, 32);
+	interp->polyobj.oldvertices = Z_Calloc(sizeof(fixed_t) * 2 * polyobj->numVertices, PU_LEVEL, NULL);
+	interp->polyobj.bakvertices = Z_Calloc(sizeof(fixed_t) * 2 * polyobj->numVertices, PU_LEVEL, NULL);
 	for (size_t i = 0; i < polyobj->numVertices; i++)
 	{
 		interp->polyobj.oldvertices[i * 2    ] = interp->polyobj.bakvertices[i * 2    ] = polyobj->vertices[i]->x;
@@ -602,11 +626,6 @@ void R_ClearLevelInterpolatorState(thinker_t *thinker)
 	}
 }
 
-#define IFCHANGED(a, b, c)\
-if (interp->a == interp->b)\
-	(interp->a = interp->c);\
-else
-
 void R_ApplyLevelInterpolators(fixed_t frac)
 {
 	size_t i, ii;
@@ -619,57 +638,35 @@ void R_ApplyLevelInterpolators(fixed_t frac)
 		{
 		case LVLINTERP_SectorPlane:
 			if (interp->sectorplane.ceiling)
-			{
-				IFCHANGED(sectorplane.sector->ceilingheight, sectorplane.oldheight, sectorplane.bakheight)
-					interp->sectorplane.sector->ceilingheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac);
-			}
+				interp->sectorplane.sector->ceilingheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac);
 			else
-			{
-				IFCHANGED(sectorplane.sector->floorheight, sectorplane.oldheight, sectorplane.bakheight)
-					interp->sectorplane.sector->floorheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac);
-			}
+				interp->sectorplane.sector->floorheight = R_LerpFixed(interp->sectorplane.oldheight, interp->sectorplane.bakheight, frac);
 			interp->sectorplane.sector->moved = true;
 			break;
 		case LVLINTERP_SectorScroll:
 			if (interp->sectorscroll.ceiling)
 			{
-				IFCHANGED(sectorscroll.sector->ceiling_xoffs, sectorscroll.oldxoffs, sectorscroll.bakxoffs)
-					interp->sectorscroll.sector->ceiling_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac);
-
-				IFCHANGED(sectorscroll.sector->ceiling_yoffs, sectorscroll.oldyoffs, sectorscroll.bakyoffs)
-					interp->sectorscroll.sector->ceiling_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac);
+				interp->sectorscroll.sector->ceiling_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac);
+				interp->sectorscroll.sector->ceiling_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac);
 			}
 			else
 			{
-				IFCHANGED(sectorscroll.sector->floor_xoffs, sectorscroll.oldxoffs, sectorscroll.bakxoffs)
-					interp->sectorscroll.sector->floor_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac);
-
-				IFCHANGED(sectorscroll.sector->floor_yoffs, sectorscroll.oldyoffs, sectorscroll.bakyoffs)
-					interp->sectorscroll.sector->floor_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac);
+				interp->sectorscroll.sector->floor_xoffs = R_LerpFixed(interp->sectorscroll.oldxoffs, interp->sectorscroll.bakxoffs, frac);
+				interp->sectorscroll.sector->floor_yoffs = R_LerpFixed(interp->sectorscroll.oldyoffs, interp->sectorscroll.bakyoffs, frac);
 			}
 			break;
 		case LVLINTERP_SideScroll:
-			IFCHANGED(sidescroll.side->textureoffset, sidescroll.oldtextureoffset, sidescroll.baktextureoffset)
-				interp->sidescroll.side->textureoffset = R_LerpFixed(interp->sidescroll.oldtextureoffset, interp->sidescroll.baktextureoffset, frac);
-
-			IFCHANGED(sidescroll.side->rowoffset, sidescroll.oldrowoffset, sidescroll.bakrowoffset)
-				interp->sidescroll.side->rowoffset = R_LerpFixed(interp->sidescroll.oldrowoffset, interp->sidescroll.bakrowoffset, frac);
+			interp->sidescroll.side->textureoffset = R_LerpFixed(interp->sidescroll.oldtextureoffset, interp->sidescroll.baktextureoffset, frac);
+			interp->sidescroll.side->rowoffset = R_LerpFixed(interp->sidescroll.oldrowoffset, interp->sidescroll.bakrowoffset, frac);
 			break;
 		case LVLINTERP_Polyobj:
 			for (ii = 0; ii < interp->polyobj.vertices_size; ii++)
 			{
-				IFCHANGED(polyobj.polyobj->vertices[ii]->x, polyobj.oldvertices[ii * 2    ], polyobj.bakvertices[ii * 2    ])
-					interp->polyobj.polyobj->vertices[ii]->x = R_LerpFixed(interp->polyobj.oldvertices[ii * 2    ], interp->polyobj.bakvertices[ii * 2    ], frac);
-
-				IFCHANGED(polyobj.polyobj->vertices[ii]->y, polyobj.oldvertices[ii * 2 + 1], polyobj.bakvertices[ii * 2 + 1])
-					interp->polyobj.polyobj->vertices[ii]->y = R_LerpFixed(interp->polyobj.oldvertices[ii * 2 + 1], interp->polyobj.bakvertices[ii * 2 + 1], frac);
+				interp->polyobj.polyobj->vertices[ii]->x = R_LerpFixed(interp->polyobj.oldvertices[ii * 2    ], interp->polyobj.bakvertices[ii * 2    ], frac);
+				interp->polyobj.polyobj->vertices[ii]->y = R_LerpFixed(interp->polyobj.oldvertices[ii * 2 + 1], interp->polyobj.bakvertices[ii * 2 + 1], frac);
 			}
-			IFCHANGED(polyobj.polyobj->centerPt.x, polyobj.oldcx, polyobj.bakcx)
-				interp->polyobj.polyobj->centerPt.x = R_LerpFixed(interp->polyobj.oldcx, interp->polyobj.bakcx, frac);
-
-			IFCHANGED(polyobj.polyobj->centerPt.y, polyobj.oldcy, polyobj.bakcy)
-				interp->polyobj.polyobj->centerPt.y = R_LerpFixed(interp->polyobj.oldcy, interp->polyobj.bakcy, frac);
-
+			interp->polyobj.polyobj->centerPt.x = R_LerpFixed(interp->polyobj.oldcx, interp->polyobj.bakcx, frac);
+			interp->polyobj.polyobj->centerPt.y = R_LerpFixed(interp->polyobj.oldcy, interp->polyobj.bakcy, frac);
 			break;
 		/*case LVLINTERP_DynSlope:
 			R_LerpVector3(&interp->dynslope.oldo, &interp->dynslope.bako, frac, &interp->dynslope.slope->o);
@@ -680,8 +677,6 @@ void R_ApplyLevelInterpolators(fixed_t frac)
 	}
 }
 
-#undef IFCHANGED
-
 void R_RestoreLevelInterpolators(void)
 {
 	size_t i, ii;
@@ -849,6 +844,11 @@ void R_ResetMobjInterpolationState(mobj_t *mobj)
 	mobj->old_slopepitch2 = mobj->old_slopepitch;
 	mobj->old_sloperoll2 = mobj->old_sloperoll;
 
+	mobj->old_spritexscale2 = mobj->old_spritexscale;
+	mobj->old_spriteyscale2 = mobj->old_spriteyscale;
+	mobj->old_spritexoffset2 = mobj->old_spritexoffset;
+	mobj->old_spriteyoffset2 = mobj->old_spriteyoffset;
+
 	mobj->old_x = mobj->x;
 	mobj->old_y = mobj->y;
 	mobj->old_z = mobj->z;
diff --git a/src/r_fps.h b/src/r_fps.h
index a4aef71cd..870fa70f1 100644
--- a/src/r_fps.h
+++ b/src/r_fps.h
@@ -15,13 +15,21 @@
 #ifndef __R_FPS_H__
 #define __R_FPS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "m_fixed.h"
 #include "p_local.h"
 #include "r_state.h"
+#include "m_perfstats.h"
 
-extern consvar_t cv_fpscap;
+extern consvar_t cv_fpscap, cv_fpscapbg;
 extern consvar_t cv_precipinterp;
 
+extern ps_metric_t ps_interp_frac;
+extern ps_metric_t ps_interp_lag;
+
 UINT32 R_GetFramerateCap(void);
 boolean R_UsingFrameInterpolation(void);
 
@@ -37,6 +45,10 @@ enum viewcontext_e
 	VIEWCONTEXT_SKY4
 };
 
+extern enum viewcontext_e viewcontext;
+
+#define R_GetViewNumber() ((viewcontext - VIEWCONTEXT_PLAYER1) & 3)
+
 typedef struct {
 	fixed_t x;
 	fixed_t y;
@@ -59,7 +71,7 @@ typedef struct {
 	fixed_t x;
 	fixed_t y;
 	fixed_t z;
-	subsector_t *subsector;
+	//subsector_t *subsector;
 	angle_t angle;
 	fixed_t scale;
 	fixed_t spritexscale;
@@ -130,7 +142,7 @@ void R_RelativeTeleportViewInterpolation(UINT8 p, fixed_t xdiff, fixed_t ydiff,
 // Set the current view context (the viewvars pointed to by newview)
 void R_SetViewContext(enum viewcontext_e _viewcontext);
 
-fixed_t R_InterpolateFixed(fixed_t from, fixed_t to);
+//fixed_t R_InterpolateFixed(fixed_t from, fixed_t to);
 angle_t R_InterpolateAngle(angle_t from, angle_t to);
 
 // Evaluate the interpolated mobj state for the given mobj
@@ -167,4 +179,8 @@ void R_UpdateMobjInterpolators(void);
 void R_ResetMobjInterpolationState(mobj_t *mobj);
 void R_ResetPrecipitationMobjInterpolationState(precipmobj_t *mobj);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/r_local.h b/src/r_local.h
index 1d3187750..4701cb400 100644
--- a/src/r_local.h
+++ b/src/r_local.h
@@ -14,6 +14,10 @@
 #ifndef __R_LOCAL__
 #define __R_LOCAL__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Screen size related parameters.
 #include "doomdef.h"
 
@@ -38,4 +42,8 @@ extern drawseg_t *firstseg;
 
 void SplitScreen_OnChange(void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // __R_LOCAL__
diff --git a/src/r_main.c b/src/r_main.cpp
similarity index 59%
rename from src/r_main.c
rename to src/r_main.cpp
index aca5b00e6..71ef3c7c1 100644
--- a/src/r_main.c
+++ b/src/r_main.cpp
@@ -13,9 +13,12 @@
 ///        utility functions (BSP, geometry, trigonometry).
 ///        See tables.c, too.
 
+#include <algorithm>
+
 #include "doomdef.h"
 #include "g_game.h"
 #include "g_input.h"
+#include "g_state.h"
 #include "r_local.h"
 #include "r_splats.h" // faB(21jan): testing
 #include "r_sky.h"
@@ -28,8 +31,10 @@
 #include "d_main.h"
 #include "v_video.h"
 #include "p_spec.h" // skyboxmo
+#include "p_setup.h"
 #include "z_zone.h"
 #include "m_random.h" // quake camera shake
+#include "r_portal.h"
 #include "doomstat.h" // MAXSPLITSCREENPLAYERS
 #include "r_fps.h" // Frame interpolation/uncapped
 #include "tables.h"
@@ -65,33 +70,8 @@ boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisibl
 sector_t *viewsector;
 player_t *viewplayer;
 
-// PORTALS!
-// You can thank and/or curse JTE for these.
-UINT8 portalrender;
-sector_t *portalcullsector;
-typedef struct portal_pair
-{
-	INT32 line1;
-	INT32 line2;
-	UINT8 pass;
-	struct portal_pair *next;
-
-	fixed_t viewx;
-	fixed_t viewy;
-	fixed_t viewz;
-	angle_t viewangle;
-
-	INT32 start;
-	INT32 end;
-	INT16 *ceilingclip;
-	INT16 *floorclip;
-	fixed_t *frontscale;
-} portal_pair;
-portal_pair *portal_base, *portal_cap;
-line_t *portalclipline;
-INT32 portalclipstart, portalclipend;
-
 fixed_t rendertimefrac;
+fixed_t rendertimefrac_unpaused;
 fixed_t renderdeltatics;
 boolean renderisnewtic;
 
@@ -110,7 +90,7 @@ INT32 viewangletox[FINEANGLES/2];
 // The xtoviewangleangle[] table maps a screen pixel
 // to the lowest viewangle that maps back to x ranges
 // from clipangle to -clipangle.
-angle_t xtoviewangle[MAXVIDWIDTH+1];
+angle_t *xtoviewangle;
 
 lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
 lighttable_t *scalelightfixed[MAXLIGHTSCALE];
@@ -122,103 +102,129 @@ extracolormap_t extra_colormaps[MAXCOLORMAPS];
 
 // Performance stats
 precise_t ps_prevframetime = 0;
-ps_metric_t ps_rendercalltime = {0};
-ps_metric_t ps_otherrendertime = {0};
-ps_metric_t ps_uitime = {0};
-ps_metric_t ps_swaptime = {0};
+ps_metric_t ps_rendercalltime = {};
+ps_metric_t ps_otherrendertime = {};
+ps_metric_t ps_uitime = {};
+ps_metric_t ps_swaptime = {};
 
-ps_metric_t ps_skyboxtime = {0};
-ps_metric_t ps_bsptime = {0};
+ps_metric_t ps_skyboxtime = {};
+ps_metric_t ps_bsptime = {};
 
-ps_metric_t ps_sw_spritecliptime = {0};
-ps_metric_t ps_sw_portaltime = {0};
-ps_metric_t ps_sw_planetime = {0};
-ps_metric_t ps_sw_maskedtime = {0};
+ps_metric_t ps_sw_spritecliptime = {};
+ps_metric_t ps_sw_portaltime = {};
+ps_metric_t ps_sw_planetime = {};
+ps_metric_t ps_sw_maskedtime = {};
 
-ps_metric_t ps_numbspcalls = {0};
-ps_metric_t ps_numsprites = {0};
-ps_metric_t ps_numdrawnodes = {0};
-ps_metric_t ps_numpolyobjects = {0};
+ps_metric_t ps_numbspcalls = {};
+ps_metric_t ps_numsprites = {};
+ps_metric_t ps_numdrawnodes = {};
+ps_metric_t ps_numpolyobjects = {};
 
 static CV_PossibleValue_t drawdist_cons_t[] = {
 	/*{256, "256"},*/	{512, "512"},	{768, "768"},
 	{1024, "1024"},	{1536, "1536"},	{2048, "2048"},
 	{3072, "3072"},	{4096, "4096"},	{6144, "6144"},
-	{8192, "8192"},	{0, "Infinite"},	{0, NULL}};
+	{8192, "8192"},	{12288, "12288"}, {20480, "20480"},
+	{24576, "24576"},{0, "Infinite"},	{0, NULL}};
 
-#if defined(__x86_64__) || defined(__amd64__) || defined(__aarch64__) || defined(__arm64__) // only for 64bit (idk how else to proper check lmao)
+#if __SIZEOF_POINTER__ < 8 // only for 64bit
 static CV_PossibleValue_t drawdist_precip_cons_t[] = {
-	{256, "256"},	{512, "512"},	{768, "768"},
-	{1024, "1024"},	{1536, "1536"},	{2048, "2048"},
-	{3072, "3072"},	{4096, "4096"}, {0, "None"},	{0, NULL}};
+	{256, "256"},   {512, "512"},   {768, "768"},
+	{1024, "1024"}, {1536, "1536"}, {2048, "2048"},
+	{0, "None"},    {0, NULL}};
+
 #else
 static CV_PossibleValue_t drawdist_precip_cons_t[] = {
-	{256, "256"},	{512, "512"},	{768, "768"},
-	{1024, "1024"},	{1536, "1536"},	{2048, "2048"},
-	{0, "None"},	{0, NULL}};
+	{256, "256"},   {512, "512"},   {768, "768"},
+	{1024, "1024"}, {1536, "1536"}, {2048, "2048"},
+	{3072, "3072"}, {4096, "4096"}, {0, "None"}, {0, NULL}};
 #endif
 
 static CV_PossibleValue_t maxinterpdist_cons_t[] = {
-       /*{256, "256"},*/       {512, "512"},   {768, "768"},
-       {1024, "1024"}, {1536, "1536"}, {2048, "2048"},
-       {3072, "3072"}, {4096, "4096"}, {6144, "6144"},
-       {8192, "8192"}, {0, "Infinite"},        {0, NULL}};
+	/*{256, "256"},*/ {512, "512"}, {768, "768"},
+	{1024, "1024"}, {1536, "1536"}, {2048, "2048"},
+	{3072, "3072"}, {4096, "4096"}, {6144, "6144"},
+	{8192, "8192"}, {0, "Infinite"}, {0, NULL}};
 
-static CV_PossibleValue_t fov_cons_t[] = {{5*FRACUNIT, "MIN"}, {178*FRACUNIT, "MAX"}, {0, NULL}};
+static CV_PossibleValue_t fov_cons_t[] = {{MINFOV*FRACUNIT, "MIN"}, {MAXFOV*FRACUNIT, "MAX"}, {0, NULL}};
 
 static CV_PossibleValue_t translucenthud_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
 static CV_PossibleValue_t maxportals_cons_t[] = {{0, "MIN"}, {12, "MAX"}, {0, NULL}}; // lmao rendering 32 portals, you're a card
 static CV_PossibleValue_t homremoval_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Flash"}, {0, NULL}};
+static CV_PossibleValue_t secbright_cons_t[] = {{0, "MIN"}, {255, "MAX"}, {0, NULL}};
+
+static void R_SetFov(fixed_t playerfov);
 
 static void Fov_OnChange(void);
-static void ChaseCam_OnChange(void);
-static void ChaseCam2_OnChange(void);
-static void ChaseCam3_OnChange(void);
-static void ChaseCam4_OnChange(void);
 static void FlipCam_OnChange(void);
 static void FlipCam2_OnChange(void);
 static void FlipCam3_OnChange(void);
 static void FlipCam4_OnChange(void);
-void SendWeaponPref(void);
-void SendWeaponPref2(void);
-void SendWeaponPref3(void);
-void SendWeaponPref4(void);
+
+static void DirLight_OnChange(void);
+
+static void Precipstuff_OnChange(void);
 
 consvar_t cv_tailspickup = {"tailspickup", "On", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasecam = {"chasecam", "On", CV_CALL, CV_OnOff, ChaseCam_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasecam2 = {"chasecam2", "On", CV_CALL, CV_OnOff, ChaseCam2_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasecam3 = {"chasecam3", "On", CV_CALL, CV_OnOff, ChaseCam3_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasecam4 = {"chasecam4", "On", CV_CALL, CV_OnOff, ChaseCam4_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_flipcam = {"flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_flipcam2 = {"flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam2_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_flipcam3 = {"flipcam3", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam3_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_flipcam4 = {"flipcam4", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam4_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_shadow = {"shadow", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_shadowoffs = {"offsetshadows", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_skybox = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ffloorclip = {"r_ffloorclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_spriteclip = {"r_spriteclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_soniccd = {"soniccd", "Off", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_allowmlook = {"allowmlook", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_showhud = {"showhud", "Yes", CV_CALL,  CV_YesNo, R_SetViewSize, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_translucenthud = {"translucenthud", "10", CV_SAVE, translucenthud_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_uncappedhud = {"uncappedhud", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+// if enabled, load all graphics at level load
+consvar_t cv_precachetextures = {"precachetextures", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_translucency = {"translucency", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_drawdist = {"drawdist", "Infinite", CV_SAVE, drawdist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_drawdist_precip = {"drawdist_precip", "1024", CV_SAVE, drawdist_precip_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lessprecip = {"lessweathereffects", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_chasecam[MAXSPLITSCREENPLAYERS] = {
+	{"chasecam",  "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"chasecam2", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"chasecam3", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
+	{"chasecam4", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
+};
 
-consvar_t cv_grmaxinterpdist = {"gr_maxinterpdist", "Infinite", CV_SAVE, maxinterpdist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_flipcam[MAXSPLITSCREENPLAYERS] = {
+	{"flipcam",  "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange,  0, NULL, NULL, 0, 0, NULL},
+	{"flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam2_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"flipcam3", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam3_OnChange, 0, NULL, NULL, 0, 0, NULL},
+	{"flipcam4", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam4_OnChange, 0, NULL, NULL, 0, 0, NULL}
+};
 
-// cap fov, fov too high tears software apart.
-consvar_t cv_fov = {"fov", "90", CV_FLOAT|CV_CALL|CV_SAVE, fov_cons_t, Fov_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_shadow          = {"shadow", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_shadowoffs      = {"offsetshadows", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_skybox          = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_ffloorclip      = {"r_ffloorclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_spriteclip      = {"r_spriteclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_softcyancut     = {"softwarecyancut", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_translucency    = {"translucency", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_drawdist        = {"drawdist", "Infinite", CV_SAVE, drawdist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_drawdist_precip = {"drawdist_precip", "1024", CV_SAVE|CV_CALL|CV_NOINIT, drawdist_precip_cons_t, Precipstuff_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_lessprecip      = {"lessweathereffects", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Precipstuff_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mobjscaleprecip = {"scaleprecipmobjscale", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Precipstuff_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_maxinterpdist   = {"maxinterpdist", "Infinite", CV_SAVE, maxinterpdist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_playerfade      = {"playerfade", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_ripplewater     = {"waterripples", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 // Okay, whoever said homremoval causes a performance hit should be shot.
-consvar_t cv_homremoval = {"homremoval", "Yes", CV_SAVE, homremoval_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_homremoval      = {"homremoval", "Yes", CV_SAVE, homremoval_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_maxportals = {"maxportals", "2", CV_SAVE, maxportals_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_secbright       = {"r_secbright", "0", CV_SAVE, secbright_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_maxportals      = {"maxportals", "2", CV_SAVE, maxportals_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+// cap fov, fov too high tears software apart.
+consvar_t cv_fov             = {"fov", "90", CV_FLOAT|CV_CALL|CV_SAVE, fov_cons_t, Fov_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_fovchange       = {"fovchange", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+// randomized directional lightning
+consvar_t cv_randomdirlight  = {"randomdirectionallight", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, DirLight_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_showhud         = {"showhud", "Yes", CV_CALL,  CV_YesNo, R_SetViewSize, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_translucenthud  = {"translucenthud", "10", CV_SAVE, translucenthud_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_uncappedhud     = {"uncappedhud", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_soniccd         = {"soniccd", "Off", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_allowmlook      = {"allowmlook", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+// tells to reset the maplight at next map change
+static void DirLight_OnChange(void)
+{
+	reinitmaplight = true;
+}
 
 void SplitScreen_OnChange(void)
 {
@@ -267,47 +273,9 @@ void SplitScreen_OnChange(void)
 }
 static void Fov_OnChange(void)
 {
-	// Shouldn't be needed with render parity?
-	//if ((netgame || multiplayer) && !cv_debug && cv_fov.value != 90*FRACUNIT)
-	//	CV_Set(&cv_fov, cv_fov.defaultvalue);
-
 	R_SetViewSize();
 }
 
-static void ChaseCam_OnChange(void)
-{
-	/*if (!cv_chasecam.value || !cv_useranalog.value)
-		CV_SetValue(&cv_analog, 0);
-	else
-		CV_SetValue(&cv_analog, 1);*/
-}
-
-static void ChaseCam2_OnChange(void)
-{
-	if (botingame)
-		return;
-	/*if (!cv_chasecam2.value || !cv_useranalog2.value)
-		CV_SetValue(&cv_analog2, 0);
-	else
-		CV_SetValue(&cv_analog2, 1);*/
-}
-
-static void ChaseCam3_OnChange(void)
-{
-	/*if (!cv_chasecam3.value || !cv_useranalog3.value)
-		CV_SetValue(&cv_analog3, 0);
-	else
-		CV_SetValue(&cv_analog3, 1);*/
-}
-
-static void ChaseCam4_OnChange(void)
-{
-	/*if (!cv_chasecam4.value || !cv_useranalog4.value)
-		CV_SetValue(&cv_analog4, 0);
-	else
-		CV_SetValue(&cv_analog4, 1);*/
-}
-
 static void FlipCam_OnChange(void)
 {
 	SendWeaponPref();
@@ -328,6 +296,7 @@ static void FlipCam4_OnChange(void)
 	SendWeaponPref4();
 }
 
+<<<<<<< HEAD:src/r_main.c
 //
 // R_PointOnSide
 // Traverse BSP (sub) tree,
@@ -375,6 +344,15 @@ FUNCINLINE ATTRINLINE PUREFUNC INT32 R_PointOnSegSide(fixed_t x, fixed_t y, cons
 	if ((ldy ^ ldx ^ x ^ y) < 0)
 		return (ldy ^ x) < 0;          // (left is negative)
 	return FixedMul(y, ldx>>FRACBITS) >= FixedMul(ldy>>FRACBITS, x);
+=======
+static void Precipstuff_OnChange(void)
+{
+	if (gamestate == GS_LEVEL)
+	{
+		P_PurgePrecipitation();
+		P_SpawnPrecipitation();
+	}
+>>>>>>> Saturn-Next:src/r_main.cpp
 }
 
 //
@@ -439,25 +417,22 @@ angle_t R_PointToAngle2(fixed_t pviewx, fixed_t pviewy, fixed_t x, fixed_t y)
 		0;
 }
 
-fixed_t R_PointToDist2(fixed_t px2, fixed_t py2, fixed_t px1, fixed_t py1)
-{
-	return FixedHypot(px1 - px2, py1 - py2);
-}
-
 angle_t R_PlayerSliptideAngle(player_t *player)
 {
 	mobj_t *mo;
-    spritedef_t *sprdef;
-    spriteframe_t *sprframe;
-    angle_t ang = 0;
+	spritedef_t *sprdef;
+	spriteframe_t *sprframe;
+	angle_t ang = 0;
 
-    if (!cv_sliptideroll.value || !player || P_MobjWasRemoved(player->mo))
-        return 0;
+	if (!cv_sliptideroll.value || !player || P_MobjWasRemoved(player->mo))
+		return 0;
 
-    mo = player->mo;
+	mo = player->mo;
 
-    size_t rot = mo->frame & FF_FRAMEMASK;
-    boolean papersprite = (mo->frame & FF_PAPERSPRITE);
+	if (mo->player->sliproll == 0 || mo->player->kartstuff[k_aizdriftstrat] == 0)
+		return 0;
+
+	size_t rot = (mo->frame & FF_FRAMEMASK);
 
 	if (mo->skin && mo->sprite == SPR_PLAY)
 	{
@@ -474,24 +449,19 @@ angle_t R_PlayerSliptideAngle(player_t *player)
 	if (rot >= sprdef->numframes)
 	{
 		sprdef = &sprites[states[S_UNKNOWN].sprite];
-		rot = states[S_UNKNOWN].frame&FF_FRAMEMASK;
+		rot = (states[S_UNKNOWN].frame & FF_FRAMEMASK);
 	}
 
 	sprframe = &sprdef->spriteframes[rot];
 
 	// No sprite frame? I guess it is possible
-	if (!sprframe) return 0;
+	if (!sprframe)
+		return 0;
 
-	if (sprframe->rotate != SRF_SINGLE || papersprite)
+	if (sprframe->rotate != SRF_SINGLE || (mo->frame & FF_PAPERSPRITE))
 		ang = R_PointToAngle(mo->x, mo->y) - mo->angle;
 
-	return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll*(mo->player->sliptidemem));
-}
-
-// Little extra utility. Works in the same way as R_PointToAngle2
-fixed_t R_PointToDist(fixed_t x, fixed_t y)
-{
-	return R_PointToDist2(viewx, viewy, x, y);
+	return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll * mo->player->kartstuff[k_aizdriftstrat]);
 }
 
 INT32 R_GetHudUncap(void)
@@ -499,6 +469,11 @@ INT32 R_GetHudUncap(void)
 	return cv_uncappedhud.value ? rendertimefrac & FRACMASK : 0;
 }
 
+INT32 R_GetMenuUncap(void)
+{
+	return cv_uncappedhud.value ? rendertimefrac_unpaused & FRACMASK : 0;
+}
+
 //
 // R_ScaleFromGlobalAngle
 // Returns the texture mapping scale for the current line (horizontal span)
@@ -541,6 +516,7 @@ boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixe
 		return false;
 
 	cullplane = cullheight->frontsector->floorheight;
+
 	if (cullheight->flags & ML_NOCLIMB) // Group culling
 	{
 		if (!viewcullheight)
@@ -572,7 +548,7 @@ boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixe
 // Returns search dimensions within a blockmap, in the direction of viewangle and out to a certain distance.
 void R_GetRenderBlockMapDimensions(fixed_t drawdist, INT32 *xl, INT32 *xh, INT32 *yl, INT32 *yh)
 {
-	const angle_t left = viewangle - clipangle;
+	const angle_t left  = viewangle - clipangle;
 	const angle_t right = viewangle + clipangle;
 
 	const fixed_t vxleft = viewx + FixedMul(drawdist, FCOS(left));
@@ -582,10 +558,10 @@ void R_GetRenderBlockMapDimensions(fixed_t drawdist, INT32 *xl, INT32 *xh, INT32
 	const fixed_t vyright = viewy + FixedMul(drawdist, FSIN(right));
 
 	// Try to narrow the search to within only the field of view
-	*xl = (unsigned)(min(viewx, min(vxleft, vxright)) - bmaporgx)>>MAPBLOCKSHIFT;
-	*xh = (unsigned)(max(viewx, max(vxleft, vxright)) - bmaporgx)>>MAPBLOCKSHIFT;
-	*yl = (unsigned)(min(viewy, min(vyleft, vyright)) - bmaporgy)>>MAPBLOCKSHIFT;
-	*yh = (unsigned)(max(viewy, max(vyleft, vyright)) - bmaporgy)>>MAPBLOCKSHIFT;
+	*xl = (unsigned)(std::min(viewx, std::min(vxleft, vxright)) - bmaporgx)>>MAPBLOCKSHIFT;
+	*xh = (unsigned)(std::max(viewx, std::max(vxleft, vxright)) - bmaporgx)>>MAPBLOCKSHIFT;
+	*yl = (unsigned)(std::min(viewy, std::min(vyleft, vyright)) - bmaporgy)>>MAPBLOCKSHIFT;
+	*yh = (unsigned)(std::max(viewy, std::max(vyleft, vyright)) - bmaporgy)>>MAPBLOCKSHIFT;
 
 	if (*xh >= bmapwidth)
 		*xh = bmapwidth - 1;
@@ -660,8 +636,6 @@ static void R_InitTextureMapping(void)
 	doubleclipangle = clipangle*2;
 }
 
-
-
 //
 // R_InitLightTables
 // Only inits the zlight table,
@@ -709,7 +683,7 @@ static struct {
 	INT32 scrmapsize;
 
 	INT32 x1; // clip rendering horizontally for efficiency
-	INT16 ceilingclip[MAXVIDWIDTH], floorclip[MAXVIDWIDTH];
+	INT16 *ceilingclip, *floorclip;
 
 	boolean use;
 } viewmorph = {
@@ -720,7 +694,7 @@ static struct {
 	0,
 
 	0,
-	{}, {},
+	NULL, NULL,
 
 	false
 };
@@ -738,7 +712,6 @@ void R_CheckViewMorph(void)
 	rollangle >>= ANGLETOFINESHIFT;
 	rollangle = ((rollangle+2) & ~3) & FINEMASK; // Limit the distinct number of angles to reduce recalcs from angles changing a lot.
 
-
 	if (rollangle == viewmorph.rollangle &&
 		viewmorph.scrmapsize == vid.width*vid.height)
 		return; // No change
@@ -758,10 +731,10 @@ void R_CheckViewMorph(void)
 
 	if (viewmorph.scrmapsize != vid.width*vid.height)
 	{
-		if (viewmorph.scrmap)
-			free(viewmorph.scrmap);
-		viewmorph.scrmap = malloc(vid.width*vid.height * sizeof(INT32));
 		viewmorph.scrmapsize = vid.width*vid.height;
+		viewmorph.scrmap = static_cast<INT32*>(realloc(viewmorph.scrmap, vid.width*vid.height * sizeof(INT32)));
+		viewmorph.ceilingclip = static_cast<INT16*>(realloc(viewmorph.ceilingclip, vid.width * sizeof(INT16)));
+		viewmorph.floorclip = static_cast<INT16*>(realloc(viewmorph.floorclip, vid.width * sizeof(INT16)));
 	}
 
 	temp = FINECOSINE(rollangle);
@@ -773,7 +746,7 @@ void R_CheckViewMorph(void)
 	x1 = (vid.width*fabsf(rollcos) + vid.height*fabsf(rollsin)) / vid.width;
 	y1 = (vid.height*fabsf(rollcos) + vid.width*fabsf(rollsin)) / vid.height;
 
-	temp = max(x1, y1)*FRACUNIT;
+	temp = std::max(x1, y1)*FRACUNIT;
 	if (temp < FRACUNIT)
 		temp = FRACUNIT;
 	else
@@ -819,10 +792,10 @@ void R_CheckViewMorph(void)
 		xb = vid.width-1-xa;
 		yb = vid.height-1-ya;
 
-		viewmorph.ceilingclip[xa] = min(viewmorph.ceilingclip[xa], ya);
-		viewmorph.floorclip[xa] = max(viewmorph.floorclip[xa], ya);
-		viewmorph.ceilingclip[xb] = min(viewmorph.ceilingclip[xb], yb);
-		viewmorph.floorclip[xb] = max(viewmorph.floorclip[xb], yb);
+		viewmorph.ceilingclip[xa] = std::min(viewmorph.ceilingclip[xa], ya);
+		viewmorph.floorclip[xa]   = std::max(viewmorph.floorclip[xa], ya);
+		viewmorph.ceilingclip[xb] = std::min(viewmorph.ceilingclip[xb], yb);
+		viewmorph.floorclip[xb]   = std::max(viewmorph.floorclip[xb], yb);
 		x2 += rollcos;
 		y2 += rollsin;
 	}
@@ -836,10 +809,10 @@ void R_CheckViewMorph(void)
 		xb = vid.width-1-xa;
 		yb = vid.height-1-ya;
 
-		viewmorph.ceilingclip[xa] = min(viewmorph.ceilingclip[xa], ya);
-		viewmorph.floorclip[xa] = max(viewmorph.floorclip[xa], ya);
-		viewmorph.ceilingclip[xb] = min(viewmorph.ceilingclip[xb], yb);
-		viewmorph.floorclip[xb] = max(viewmorph.floorclip[xb], yb);
+		viewmorph.ceilingclip[xa] = std::min(viewmorph.ceilingclip[xa], ya);
+		viewmorph.floorclip[xa]   = std::max(viewmorph.floorclip[xa], ya);
+		viewmorph.ceilingclip[xb] = std::min(viewmorph.ceilingclip[xb], yb);
+		viewmorph.floorclip[xb]   = std::max(viewmorph.floorclip[xb], yb);
 		x2 -= rollsin;
 		y2 += rollcos;
 	}
@@ -877,8 +850,8 @@ void R_CheckViewMorph(void)
 
 void R_ApplyViewMorph(void)
 {
-	UINT8 *tmpscr = screens[4];
-	UINT8 *srcscr = screens[0];
+	UINT8 *tmpscr = vid.screens[4];
+	UINT8 *srcscr = vid.screens[0];
 	INT32 p, end = vid.width * vid.height;
 
 	if (!viewmorph.use)
@@ -913,10 +886,10 @@ void R_ApplyViewMorph(void)
 		for (p = 0; p < end; p++)
 			tmpscr[p] = srcscr[viewmorph.scrmap[p]];
 
-	VID_BlitLinearScreen(tmpscr, screens[0],
-			vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.width);
+	VID_BlitLinearScreen(tmpscr, vid.screens[0], vid.width, vid.height, vid.width, vid.width);
 }
 
+<<<<<<< HEAD:src/r_main.c
 static inline int intsign(int n) {
 	return n < 0 ? -1 : n > 0 ? 1 : 0;
 }
@@ -924,6 +897,12 @@ static inline int intsign(int n) {
 angle_t R_ViewRollAngle(const player_t *player)
 {
 	angle_t roll = 0;
+=======
+angle_t R_ViewRollAngle(const player_t *player)
+{
+	angle_t roll = 0;
+	const UINT8 viewnum = R_GetViewNumber();
+>>>>>>> Saturn-Next:src/r_main.cpp
 
 	if (gamestate != GS_LEVEL)
 	{
@@ -942,7 +921,11 @@ angle_t R_ViewRollAngle(const player_t *player)
 
 	if (cv_tilting.value)
 	{
+<<<<<<< HEAD:src/r_main.c
 		if (!player->spectator && !demo.freecam)
+=======
+		if (!player->spectator && !camera[viewnum].freecam)
+>>>>>>> Saturn-Next:src/r_main.cpp
 			roll += player->tilt;
 
 		if (cv_actionmovie.value)
@@ -970,17 +953,17 @@ void R_SetViewSize(void)
 	setsizeneeded = true;
 }
 
+static void R_SetupViewBuffers(void);
+
 //
 // R_ExecuteSetViewSize
 //
 void R_ExecuteSetViewSize(void)
 {
-	fixed_t dy;
 	INT32 i;
 	INT32 j;
 	INT32 level;
 	INT32 startmapl;
-	angle_t fov;
 
 	setsizeneeded = false;
 
@@ -990,18 +973,15 @@ void R_ExecuteSetViewSize(void)
 	// status bar overlay
 	st_overlay = cv_showhud.value;
 
-	scaledviewwidth = vid.width;
+	viewwidth = vid.width;
 	viewheight = vid.height;
 
 	if (splitscreen)
 		viewheight >>= 1;
 
-	viewwidth = scaledviewwidth;
-
 	if (splitscreen > 1)
 	{
 		viewwidth >>= 1;
-		scaledviewwidth >>= 1;
 	}
 
 	centerx = viewwidth/2;
@@ -1009,47 +989,34 @@ void R_ExecuteSetViewSize(void)
 	centerxfrac = centerx<<FRACBITS;
 	centeryfrac = centery<<FRACBITS;
 
-	fov = FixedAngle(cv_fov.value/2) + ANGLE_90;
-	fovtan = FixedMul(FINETANGENT(fov >> ANGLETOFINESHIFT), viewmorph.zoomneeded);
-	if (splitscreen == 1) // Splitscreen FOV should be adjusted to maintain expected vertical view
-		fovtan = 17*fovtan/10;
+	R_SetupViewBuffers();
 
-	projection = projectiony = FixedDiv(centerxfrac, fovtan);
-
-	R_InitViewBuffer(scaledviewwidth, viewheight);
-
-	R_InitTextureMapping();
+	// why did we calc all the software crap?
+#ifdef HWRENDER
+	if (rendermode == render_opengl)
+	{
+		HWR_SetViewSize();
+		am_recalc = true;
+		return;
+	}
+#endif
 
 	// thing clipping
 	for (i = 0; i < viewwidth; i++)
-		screenheightarray[i] = (INT16)viewheight;
-
-	// setup sky scaling
-	R_SetSkyScale();
-
-	// planes
-	if (rendermode == render_soft)
 	{
-		// this is only used for planes rendering in software mode
-		j = viewheight*16;
-		for (i = 0; i < j; i++)
-		{
-			dy = (i - viewheight*8)<<FRACBITS;
-			dy = FixedMul(abs(dy), fovtan);
-			yslopetab[i] = FixedDiv(centerx*FRACUNIT, dy);
-		}
-		
-		if (ds_su)
-			Z_Free(ds_su);
-		if (ds_sv)
-			Z_Free(ds_sv);
-		if (ds_sz)
-			Z_Free(ds_sz);
-
-		ds_su = ds_sv = ds_sz = NULL;
-		ds_sup = ds_svp = ds_szp = NULL;
+		negonearray[i] = -1;
+		screenheightarray[i] = (INT16)viewheight;
 	}
 
+	if (ds_su)
+		Z_Free(ds_su);
+	if (ds_sv)
+		Z_Free(ds_sv);
+	if (ds_sz)
+		Z_Free(ds_sz);
+
+	ds_su = ds_sv = ds_sz = NULL;
+
 	memset(scalelight, 0xFF, sizeof(scalelight));
 
 	// Calculate the light levels to use for each level/scale combination.
@@ -1070,15 +1037,59 @@ void R_ExecuteSetViewSize(void)
 		}
 	}
 
-	// continue to do the software setviewsize as long as we use the reference software view
-#ifdef HWRENDER
-	if (rendermode != render_soft)
-		HWR_SetViewSize();
-#endif
-
 	am_recalc = true;
 }
 
+fixed_t R_GetPlayerFov(player_t *player)
+{
+	fixed_t fov = cv_fov.value + player->fovadd;
+	return std::max(MINFOV*FRACUNIT, std::min(fov, MAXFOV*FRACUNIT));
+}
+
+static void R_CalcFov(fixed_t playerfov)
+{
+	angle_t fov = FixedAngle(playerfov/2) + ANGLE_90;
+	fovtan = FixedMul(FINETANGENT(fov >> ANGLETOFINESHIFT), viewmorph.zoomneeded);
+	if (splitscreen == 1) // Splitscreen FOV should be adjusted to maintain expected vertical view
+		fovtan = 17*fovtan/10;
+
+	projection = projectiony = FixedDiv(centerxfrac, fovtan);
+}
+
+static void R_InitViewMapping(void)
+{
+	R_InitTextureMapping();
+
+	if (rendermode == render_soft)
+	{
+		// this is only used for planes rendering in software mode
+		INT32 j = viewheight*16;
+
+		for (INT32 i = 0; i < j; i++)
+		{
+			fixed_t dy = (i - viewheight*8)<<FRACBITS;
+			dy = FixedMul(abs(dy), fovtan);
+			yslopetab[i] = FixedDiv(centerx*FRACUNIT, dy);
+		}
+	}
+
+	// setup sky scaling
+	R_SetSkyScale();
+}
+
+static void R_SetupViewBuffers(void)
+{
+	R_CalcFov(cv_fov.value);
+	R_InitViewBuffer(viewwidth, viewheight);
+	R_InitViewMapping();
+}
+
+static void R_SetFov(fixed_t playerfov)
+{
+	R_CalcFov(playerfov);
+	R_InitViewMapping();
+}
+
 //
 // R_Init
 //
@@ -1093,15 +1104,12 @@ void R_Init(void)
 	R_InitViewBorder();
 	R_SetViewSize(); // setsizeneeded is set true
 
-	//I_OutputMsg("\nR_InitPlanes");
-	R_InitPlanes();
-
 	// this is now done by SCR_Recalc() at the first mode set
 	//I_OutputMsg("\nR_InitLightTables");
 	R_InitLightTables();
 
-	//I_OutputMsg("\nR_InitTranslationTables\n");
-	R_InitTranslationTables();
+	//I_OutputMsg("\nR_InitTranslucencyTables\n");
+	R_InitTranslucencyTables();
 
 	R_InitDrawNodes();
 
@@ -1109,6 +1117,7 @@ void R_Init(void)
 }
 
 //
+<<<<<<< HEAD:src/r_main.c
 // R_PointInSubsector
 //
 FUNCINLINE ATTRINLINE subsector_t *R_PointInSubsector(fixed_t x, fixed_t y)
@@ -1122,6 +1131,8 @@ FUNCINLINE ATTRINLINE subsector_t *R_PointInSubsector(fixed_t x, fixed_t y)
 }
 
 //
+=======
+>>>>>>> Saturn-Next:src/r_main.cpp
 // R_IsPointInSubsector, same as above but returns 0 if not in subsector
 //
 FUNCINLINE ATTRINLINE subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
@@ -1131,10 +1142,6 @@ FUNCINLINE ATTRINLINE subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
 	size_t nodenum;
 	subsector_t *ret;
 
-	// single subsector is a special case
-	//if (numnodes == 0)
-		//return subsectors;
-
 	nodenum = numnodes - 1;
 
 	while (!(nodenum & NF_SUBSECTOR))
@@ -1156,10 +1163,11 @@ FUNCINLINE ATTRINLINE subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
 // R_SetupFrame
 //
 
-static mobj_t *viewmobj;
+mobj_t *viewmobj;
 
-void R_SkyboxFrame(player_t *player)
+static void R_SetupCommonFrame(player_t * player, sector_t * sector)
 {
+<<<<<<< HEAD:src/r_main.c
 	camera_t *thiscam = &camera[0];
 	UINT8 i;
 
@@ -1228,263 +1236,229 @@ void R_SkyboxFrame(player_t *player)
 	newview->angle += viewmobj->angle;
 	newview->roll = R_ViewRollAngle(player);
 
+=======
+>>>>>>> Saturn-Next:src/r_main.cpp
 	newview->player = player;
 
-	newview->x = viewmobj->x;
-	newview->y = viewmobj->y;
-	newview->z = 0;
-	if (viewmobj->spawnpoint)
-		newview->z = ((fixed_t)viewmobj->spawnpoint->angle)<<FRACBITS;
-
 	newview->x += quake.x;
 	newview->y += quake.y;
 	newview->z += quake.z;
 
-	if (mapheaderinfo[gamemap-1])
-	{
-		mapheader_t *mh = mapheaderinfo[gamemap-1];
-		if (player->awayviewtics)
-		{
-			if (skyboxmo[1])
-			{
-				fixed_t x = 0, y = 0;
-				if (mh->skybox_scalex > 0)
-					x = (player->awayviewmobj->x - skyboxmo[1]->x) / mh->skybox_scalex;
-				else if (mh->skybox_scalex < 0)
-					x = (player->awayviewmobj->x - skyboxmo[1]->x) * -mh->skybox_scalex;
+	newview->roll = R_ViewRollAngle(player);
 
-				if (mh->skybox_scaley > 0)
-					y = (player->awayviewmobj->y - skyboxmo[1]->y) / mh->skybox_scaley;
-				else if (mh->skybox_scaley < 0)
-					y = (player->awayviewmobj->y - skyboxmo[1]->y) * -mh->skybox_scaley;
-
-				if (viewmobj->angle == 0)
-				{
-					newview->x  += x;
-					newview->y += y;
-				}
-				else if (viewmobj->angle == ANGLE_90)
-				{
-					newview->x  -= y;
-					newview->y += x;
-				}
-				else if (viewmobj->angle == ANGLE_180)
-				{
-					newview->x  -= x;
-					newview->y -= y;
-				}
-				else if (viewmobj->angle == ANGLE_270)
-				{
-					newview->x  += y;
-					newview->y -= x;
-				}
-				else
-				{
-					angle_t ang = viewmobj->angle>>ANGLETOFINESHIFT;
-					newview->x  += FixedMul(x,FINECOSINE(ang)) - FixedMul(y,  FINESINE(ang));
-					newview->y += FixedMul(x,  FINESINE(ang)) + FixedMul(y,FINECOSINE(ang));
-				}
-			}
-			if (mh->skybox_scalez > 0)
-				newview->z += (player->awayviewmobj->z + 20*FRACUNIT) / mh->skybox_scalez;
-			else if (mh->skybox_scalez < 0)
-				newview->z += (player->awayviewmobj->z + 20*FRACUNIT) * -mh->skybox_scalez;
-		}
-		else if (thiscam->chase)
-		{
-			if (skyboxmo[1])
-			{
-				fixed_t x = 0, y = 0;
-				if (mh->skybox_scalex > 0)
-					x = (thiscam->x - skyboxmo[1]->x) / mh->skybox_scalex;
-				else if (mh->skybox_scalex < 0)
-					x = (thiscam->x - skyboxmo[1]->x) * -mh->skybox_scalex;
-
-				if (mh->skybox_scaley > 0)
-					y = (thiscam->y - skyboxmo[1]->y) / mh->skybox_scaley;
-				else if (mh->skybox_scaley < 0)
-					y = (thiscam->y - skyboxmo[1]->y) * -mh->skybox_scaley;
-
-				if (viewmobj->angle == 0)
-				{
-					newview->x += x;
-					newview->y += y;
-				}
-				else if (viewmobj->angle == ANGLE_90)
-				{
-					newview->x -= y;
-					newview->y += x;
-				}
-				else if (viewmobj->angle == ANGLE_180)
-				{
-					newview->x -= x;
-					newview->y -= y;
-				}
-				else if (viewmobj->angle == ANGLE_270)
-				{
-					newview->x += y;
-					newview->y -= x;
-				}
-				else
-				{
-					angle_t ang = viewmobj->angle>>ANGLETOFINESHIFT;
-					newview->x += FixedMul(x,FINECOSINE(ang)) - FixedMul(y,  FINESINE(ang));
-					newview->y += FixedMul(x,  FINESINE(ang)) + FixedMul(y,FINECOSINE(ang));
-				}
-			}
-			if (mh->skybox_scalez > 0)
-				newview->z += (thiscam->z + (thiscam->height>>1)) / mh->skybox_scalez;
-			else if (mh->skybox_scalez < 0)
-				newview->z += (thiscam->z + (thiscam->height>>1)) * -mh->skybox_scalez;
-		}
-		else
-		{
-			if (skyboxmo[1])
-			{
-				fixed_t x = 0, y = 0;
-				if (mh->skybox_scalex > 0)
-					x = (player->mo->x - skyboxmo[1]->x) / mh->skybox_scalex;
-				else if (mh->skybox_scalex < 0)
-					x = (player->mo->x - skyboxmo[1]->x) * -mh->skybox_scalex;
-				if (mh->skybox_scaley > 0)
-					y = (player->mo->y - skyboxmo[1]->y) / mh->skybox_scaley;
-				else if (mh->skybox_scaley < 0)
-					y = (player->mo->y - skyboxmo[1]->y) * -mh->skybox_scaley;
-
-				if (viewmobj->angle == 0)
-				{
-					newview->x += x;
-					newview->y += y;
-				}
-				else if (viewmobj->angle == ANGLE_90)
-				{
-					newview->x -= y;
-					newview->y += x;
-				}
-				else if (viewmobj->angle == ANGLE_180)
-				{
-					newview->x -= x;
-					newview->y -= y;
-				}
-				else if (viewmobj->angle == ANGLE_270)
-				{
-					newview->x += y;
-					newview->y -= x;
-				}
-				else
-				{
-					angle_t ang = viewmobj->angle>>ANGLETOFINESHIFT;
-					newview->x += FixedMul(x,FINECOSINE(ang)) - FixedMul(y,  FINESINE(ang));
-					newview->y += FixedMul(x,  FINESINE(ang)) + FixedMul(y,FINECOSINE(ang));
-				}
-			}
-			if (mh->skybox_scalez > 0)
-				newview->z += player->viewz / mh->skybox_scalez;
-			else if (mh->skybox_scalez < 0)
-				newview->z += player->viewz * -mh->skybox_scalez;
-		}
-	}
-
-	if (viewmobj->subsector)
-		newview->sector = viewmobj->subsector->sector;
+	if (sector != NULL)
+		newview->sector = sector;
 	else
-		newview->sector = R_PointInSubsector(newview->x, newview->y)->sector;
+		newview->sector = R_PointInSubsectorFast(newview->x, newview->y)->sector;
 
-	// newview->sin = FINESINE(viewangle>>ANGLETOFINESHIFT);
-	// newview->cos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
-
-	R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT, false);
+	R_InterpolateView(rendertimefrac_unpaused, false);
 }
 
-void R_SetupFrame(player_t *player, boolean skybox)
+static void R_SetupAimingFrame(player_t *player, camera_t *thiscam)
 {
-	camera_t *thiscam;
-	boolean chasecam = false;
-
-	if (splitscreen > 2 && player == &players[displayplayers[3]])
+	if (player->awayviewtics && player->awayviewmobj)
 	{
-		thiscam = &camera[3];
-		chasecam = (cv_chasecam4.value != 0);
-		R_SetViewContext(VIEWCONTEXT_PLAYER4);
-		if (thiscam->reset)
-		{
-			R_ResetViewInterpolation(4);
-			thiscam->reset = false;
-		}
+		newview->aim = player->awayviewaiming;
+		newview->angle = player->awayviewmobj->angle;
 	}
-	else if (splitscreen > 1 && player == &players[displayplayers[2]])
+	else if (thiscam && thiscam->chase)
 	{
-		thiscam = &camera[2];
-		chasecam = (cv_chasecam3.value != 0);
-		R_SetViewContext(VIEWCONTEXT_PLAYER3);
-		if (thiscam->reset)
-		{
-			R_ResetViewInterpolation(3);
-			thiscam->reset = false;
-		}
+		newview->aim = thiscam->aiming;
+		newview->angle = thiscam->angle;
 	}
-	else if (splitscreen && player == &players[displayplayers[1]])
+	else if (P_IsLocalPlayer(player) && !demo.playback && player->playerstate != PST_DEAD)
 	{
-		thiscam = &camera[1];
-		chasecam = (cv_chasecam2.value != 0);
-		R_SetViewContext(VIEWCONTEXT_PLAYER2);
-		if (thiscam->reset)
-		{
-			R_ResetViewInterpolation(2);
-			thiscam->reset = false;
-		}
+		newview->aim = localaiming[viewssnum];
+		newview->angle = localangle[viewssnum];
 	}
 	else
 	{
-		thiscam = &camera[0];
-		chasecam = (cv_chasecam.value != 0);
-		R_SetViewContext(VIEWCONTEXT_PLAYER1);
-		if (thiscam->reset)
+		newview->aim = player->aiming;
+		newview->angle = player->mo->angle;
+	}
+}
+
+static void R_SetupSkyScale(player_t *player, camera_t *thiscam, mapheader_t *mh)
+{
+	if (!mh->skybox_scalex && !mh->skybox_scaley && !mh->skybox_scalez)
+		return;
+
+	auto setup_skyscale = [&](fixed_t mox, fixed_t moy, fixed_t zscale)
+	{
+		if (skyboxmo[1])
 		{
-			R_ResetViewInterpolation(1);
-			thiscam->reset = false;
+			fixed_t x = 0, y = 0;
+
+			if (mh->skybox_scalex > 0)
+				x = (mox - skyboxmo[1]->x) / mh->skybox_scalex;
+			else if (mh->skybox_scalex < 0)
+				x = (mox - skyboxmo[1]->x) * -mh->skybox_scalex;
+
+			if (mh->skybox_scaley > 0)
+				y = (moy - skyboxmo[1]->y) / mh->skybox_scaley;
+			else if (mh->skybox_scaley < 0)
+				y = (moy - skyboxmo[1]->y) * -mh->skybox_scaley;
+
+			switch (viewmobj->angle)
+			{
+				case 0:
+					newview->x += x;
+					newview->y += y;
+					break;
+				case ANGLE_90:
+					newview->x -= y;
+					newview->y += x;
+					break;
+				case ANGLE_180:
+					newview->x -= x;
+					newview->y -= y;
+					break;
+				case ANGLE_270:
+					newview->x += y;
+					newview->y -= x;
+					break;
+				default:
+					angle_t ang = viewmobj->angle>>ANGLETOFINESHIFT;
+					newview->x += FixedMul(x,FINECOSINE(ang)) - FixedMul(y,  FINESINE(ang));
+					newview->y += FixedMul(x,  FINESINE(ang)) + FixedMul(y,FINECOSINE(ang));
+					break;
+			}
 		}
+
+		if (mh->skybox_scalez > 0)
+			newview->z += zscale / mh->skybox_scalez;
+		else if (mh->skybox_scalez < 0)
+			newview->z += zscale * -mh->skybox_scalez;
+	};
+
+	if (player->awayviewtics && player->awayviewmobj)
+	{
+		setup_skyscale(player->awayviewmobj->x, player->awayviewmobj->y, (player->awayviewmobj->z + 20*FRACUNIT));
+	}
+	else if (thiscam && thiscam->chase)
+	{
+		setup_skyscale(thiscam->x, thiscam->y, (thiscam->z + (thiscam->height>>1)));
+	}
+	else
+	{
+		setup_skyscale(player->mo->x, player->mo->y, player->viewz);
+	}
+}
+
+void R_SkyboxFrame(UINT8 pnum)
+{
+	player_t *player = &players[displayplayers[pnum]];
+	camera_t *thiscam = &camera[pnum];
+	sector_t *viewsec = NULL;
+	mapheader_t *mh = mapheaderinfo[gamemap-1];
+
+	R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_SKY1 + pnum));
+
+	// cut-away view stuff
+	newview->sky = true;
+	viewmobj = skyboxmo[0];
+
+#ifdef PARANOIA
+	if (P_MobjWasRemoved(viewmobj))
+	{
+		const size_t playeri = (size_t)(player - players);
+		I_Error("R_SkyboxFrame: viewmobj null (player %s)", sizeu1(playeri));
+	}
+#endif
+
+	R_SetupAimingFrame(player, thiscam);
+
+	if (!P_MobjWasRemoved(viewmobj))
+	{
+		newview->angle += viewmobj->angle;
+
+		newview->x = viewmobj->x;
+		newview->y = viewmobj->y;
+		newview->z = (viewmobj->spawnpoint) ? (((fixed_t)viewmobj->spawnpoint->angle) << FRACBITS) : 0;
+
+		if (viewmobj->subsector)
+			viewsec = viewmobj->subsector->sector;
 	}
 
-	if (player->spectator) // no spectator chasecam
-		chasecam = false; // force chasecam off
-	else if (player->playerstate == PST_DEAD || player->exiting)
+	if (mh)
+	{
+		R_SetupSkyScale(player, thiscam, mh);
+	}
+
+	R_SetupCommonFrame(player, viewsec);
+}
+
+void R_SetupFrame(UINT8 pnum, boolean skybox)
+{
+	player_t *player = &players[displayplayers[pnum]];
+	camera_t *thiscam = &camera[pnum];
+	boolean chasecam = (cv_chasecam[pnum].value);
+	sector_t *viewsec = NULL;
+
+	R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_PLAYER1 + pnum));
+
+	if (thiscam->reset)
+	{
+		R_ResetViewInterpolation(pnum);
+		thiscam->reset = false;
+	}
+
+	if (player->spectator)
+	{
+		// Free flying spectator uses demo freecam. This
+		// requires chasecam to be enabled.
+		chasecam = true;
+	}
+
+	if (player->playerstate == PST_DEAD || player->exiting)
 		chasecam = true; // force chasecam on
 
-	if (chasecam && !thiscam->chase)
+	if (chasecam && (thiscam && !thiscam->chase))
 	{
 		P_ResetCamera(player, thiscam);
 		thiscam->chase = true;
 	}
-	else if (!chasecam)
+	else if (thiscam && !chasecam)
 		thiscam->chase = false;
 
 	newview->sky = !skybox;
-	if (player->awayviewtics)
+
+	R_SetupAimingFrame(player, thiscam);
+
+	if (player->awayviewtics && player->awayviewmobj) // cut-away view stuff
 	{
-		// cut-away view stuff
 		viewmobj = player->awayviewmobj; // should be a MT_ALTVIEWMAN
 		I_Assert(viewmobj != NULL);
+
+		newview->x = viewmobj->x;
+		newview->y = viewmobj->y;
 		newview->z = viewmobj->z + 20*FRACUNIT;
-		newview->aim = player->awayviewaiming;
-		newview->angle = viewmobj->angle;
+
+		if (viewmobj->subsector)
+			viewsec = viewmobj->subsector->sector;
+
+		R_SetupCommonFrame(player, viewsec);
 	}
-	else if (!player->spectator && chasecam)
-	// use outside cam view
+	else if (thiscam && chasecam) // use outside cam view
 	{
 		viewmobj = NULL;
-		newview->z = thiscam->z + (thiscam->height>>1);
-		newview->aim = thiscam->aiming;
-		newview->angle = thiscam->angle;
-	}
-	else
-	// use the player's eyes view
-	{
-		newview->z = player->viewz;
+		I_Assert(thiscam != NULL);
 
+		newview->x = thiscam->x;
+		newview->y = thiscam->y;
+		newview->z = thiscam->z + (thiscam->height>>1);
+
+		if (thiscam->subsector)
+			viewsec = thiscam->subsector->sector;
+
+		R_SetupCommonFrame(player, viewsec);
+	}
+	else if (player->mo) // use the player's eyes view
+	{
 		viewmobj = player->mo;
 		I_Assert(viewmobj != NULL);
 
+<<<<<<< HEAD:src/r_main.c
 		newview->aim = player->aiming;
 		newview->angle = viewmobj->angle;
 
@@ -1529,208 +1503,127 @@ void R_SetupFrame(player_t *player, boolean skybox)
 	}
 	else
 	{
+=======
+>>>>>>> Saturn-Next:src/r_main.cpp
 		newview->x = viewmobj->x;
 		newview->y = viewmobj->y;
-		newview->x += quake.x;
-		newview->y += quake.y;
+		newview->z = player->viewz;
 
-		if (viewmobj->subsector && thiscam->subsector->sector)
-			newview->sector = viewmobj->subsector->sector;
-		else
-			newview->sector = R_PointInSubsector(newview->x, newview->y)->sector;
+		if (viewmobj->subsector)
+			viewsec = viewmobj->subsector->sector;
+
+		R_SetupCommonFrame(player, viewsec);
 	}
-
-	// newview->sin = FINESINE(viewangle>>ANGLETOFINESHIFT);
-	// newview->cos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
-
-	R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT, false);
 }
 
-#define ANGLED_PORTALS
-
-static void R_PortalFrame(line_t *start, line_t *dest, portal_pair *portal)
+static void R_PortalFrame(portal_t *portal)
 {
-	vertex_t dest_c, start_c;
-#ifdef ANGLED_PORTALS
-	// delta angle
-	angle_t dangle = R_PointToAngle2(0,0,dest->dx,dest->dy) - R_PointToAngle2(start->dx,start->dy,0,0);
-#endif
-
-	//R_SetupFrame(player, false);
 	viewx = portal->viewx;
 	viewy = portal->viewy;
 	viewz = portal->viewz;
 
 	viewangle = portal->viewangle;
-	// newview->sin = FINESINE(newview->angle>>ANGLETOFINESHIFT);
-	// newview->cos = FINECOSINE(newview->angle>>ANGLETOFINESHIFT);
+	//viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
+	//viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
 
-	portalcullsector = dest->frontsector;
-	viewsector = dest->frontsector;
-	portalclipline = dest;
 	portalclipstart = portal->start;
 	portalclipend = portal->end;
 
-	// Offset the portal view by the linedef centers
-
-	// looking glass center
-	start_c.x = (start->v1->x + start->v2->x) / 2;
-	start_c.y = (start->v1->y + start->v2->y) / 2;
-
-	// other side center
-	dest_c.x = (dest->v1->x + dest->v2->x) / 2;
-	dest_c.y = (dest->v1->y + dest->v2->y) / 2;
-
-	// Heights!
-	viewz += dest->frontsector->floorheight - start->frontsector->floorheight;
-
-	// calculate the difference in position and rotation!
-#ifdef ANGLED_PORTALS
-	if (dangle == 0)
-#endif
-	{ // the entrance goes straight opposite the exit, so we just need to mess with the offset.
-		viewx += dest_c.x - start_c.x;
-		viewy += dest_c.y - start_c.y;
-		return;
-	}
-
-#ifdef ANGLED_PORTALS
-	viewangle += dangle;
-	// newview->sin = FINESINE(newview->angle>>ANGLETOFINESHIFT);
-	// newview->cos = FINECOSINE(newview->angle>>ANGLETOFINESHIFT);
-	//CONS_Printf("dangle == %u\n", AngleFixed(dangle)>>FRACBITS);
-
-	// ????
+	if (portal->clipline != -1)
 	{
-		fixed_t disttopoint;
-		angle_t angtopoint;
-
-		disttopoint = R_PointToDist2(start_c.x, start_c.y, newview->x, newview->y);
-		angtopoint = R_PointToAngle2(start_c.x, start_c.y, newview->x, newview->y);
-		angtopoint += dangle;
-
-		viewx = dest_c.x+FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
-		viewy = dest_c.y+FixedMul(FINESINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
-	}
-#endif
-}
-
-void R_AddPortal(INT32 line1, INT32 line2, INT32 x1, INT32 x2)
-{
-	portal_pair *portal = Z_Malloc(sizeof(portal_pair), PU_LEVEL, NULL);
-	INT16 *ceilingclipsave = Z_Malloc(sizeof(INT16)*(x2-x1), PU_LEVEL, NULL);
-	INT16 *floorclipsave = Z_Malloc(sizeof(INT16)*(x2-x1), PU_LEVEL, NULL);
-	fixed_t *frontscalesave = Z_Malloc(sizeof(fixed_t)*(x2-x1), PU_LEVEL, NULL);
-
-	portal->line1 = line1;
-	portal->line2 = line2;
-	portal->pass = portalrender+1;
-	portal->next = NULL;
-
-	R_PortalStoreClipValues(x1, x2, ceilingclipsave, floorclipsave, frontscalesave);
-
-	portal->ceilingclip = ceilingclipsave;
-	portal->floorclip = floorclipsave;
-	portal->frontscale = frontscalesave;
-
-	portal->start = x1;
-	portal->end = x2;
-
-	portalline = true; // this tells R_StoreWallRange that curline is a portal seg
-
-	portal->viewx = viewx;
-	portal->viewy = viewy;
-	portal->viewz = viewz;
-	portal->viewangle = viewangle;
-
-	if (!portal_base)
-	{
-		portal_base = portal;
-		portal_cap = portal;
+		portalclipline = &lines[portal->clipline];
+		viewsector = portalcullsector = portalclipline->frontsector;
 	}
 	else
 	{
-		portal_cap->next = portal;
-		portal_cap = portal;
+		portalclipline = NULL;
+		portalcullsector = NULL;
+		viewsector = R_PointInSubsectorFast(viewx, viewy)->sector;
 	}
 }
 
+static void Mask_Pre (maskcount_t* m)
+{
+	m->drawsegs[0] = ds_p - drawsegs;
+	m->vissprites[0] = visspritecount;
+	m->viewx = viewx;
+	m->viewy = viewy;
+	m->viewz = viewz;
+	m->viewsector = viewsector;
+}
+
+static void Mask_Post (maskcount_t* m)
+{
+	m->drawsegs[1] = ds_p - drawsegs;
+	m->vissprites[1] = visspritecount;
+}
+
 // ================
 // R_RenderView
 // ================
 
+// viewx, viewy, viewangle, all that good stuff must be set
+static void R_RenderViewpoint(maskcount_t* mask, boolean drawprecip)
+{
+	Mask_Pre(mask);
+
+	curdrawsegs = ds_p;
+
+	R_RenderBSPNode((INT32)numnodes - 1);
+
+	if (drawprecip)
+		R_AddPrecipitationSprites();
+
+	Mask_Post(mask);
+}
+
 //                     FAB NOTE FOR WIN32 PORT !! I'm not finished already,
 // but I suspect network may have problems with the video buffer being locked
 // for all duration of rendering, and being released only once at the end..
 // I mean, there is a win16lock() or something that lasts all the rendering,
 // so maybe we should release screen lock before each netupdate below..?
 
+static fixed_t viewfov[MAXSPLITSCREENPLAYERS];
+
 void R_RenderPlayerView(player_t *player)
 {
-	portal_pair *portal;
-	const boolean skybox = (skyboxmo[0] && cv_skybox.value);
-	UINT8 i;
-
-	// if this is display player 1
-	if (cv_homremoval.value && player == &players[displayplayers[0]])
-	{
-		if (cv_homremoval.value == 1)
-			V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // No HOM effect!
-		else //'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
-			V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 128+(timeinmap&15));
-	}
-	// Draw over the fourth screen so you don't have to stare at a HOM :V
-	else if (splitscreen == 2 && player == &players[displayplayers[2]])
-	{
-		// V_DrawPatchFill, but for the fourth screen only
-		patch_t *pat = W_CachePatchName("SRB2BACK", PU_CACHE);
-		INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
-		INT32 x, y, pw = SHORT(pat->width) * dupz, ph = SHORT(pat->height) * dupz;
-
-		for (x = vid.width>>1; x < vid.width; x += pw)
-		{
-			for (y = vid.height>>1; y < vid.height; y += ph)
-				V_DrawScaledPatch(x, y, V_NOSCALESTART, pat);
-		}
-	}
+	INT32           nummasks = 1;
+	maskcount_t*    masks    = static_cast<maskcount_t*>(malloc(sizeof(maskcount_t)));
+	const boolean   skybox   = (skyboxmo[0] && cv_skybox.value);
 
 	// load previous saved value of skyVisible for the player
-	for (i = 0; i <= splitscreen; i++)
-	{
-		if (player != &players[displayplayers[i]])
-			continue;
+	skyVisible = skyVisiblePerPlayer[viewssnum];
 
-		skyVisible = skyVisiblePerPlayer[i];
-		break;
+	const fixed_t fov = R_GetPlayerFov(player);
+
+	if (viewfov[viewssnum] != fov)
+	{
+		viewfov[viewssnum] = fov;
+		R_SetFov(fov);
 	}
 
-	portalrender = 0;
-	portal_base = portal_cap = NULL;
-	
+	Portal_InitList();
+
 	PS_START_TIMING(ps_skyboxtime);
 	if (skybox && skyVisible)
 	{
-		R_SkyboxFrame(player);
+		R_SkyboxFrame(viewssnum);
 
 		R_ClearClipSegs();
 		R_ClearDrawSegs();
 		R_ClearPlanes();
 		R_ClearSprites();
-#ifdef FLOORSPLATS
-		R_ClearVisibleFloorSplats();
-#endif
 
-		R_RenderBSPNode((INT32)numnodes - 1);
-		R_ClipSprites();
+		R_RenderViewpoint(&masks[nummasks - 1], false);
+
+		R_ClipSprites(drawsegs, NULL);
+		R_DrawSkyPlanes(); // draw the fucker again to prevent some artifacts
 		R_DrawPlanes();
-#ifdef FLOORSPLATS
-		R_DrawVisibleFloorSplats();
-#endif
-		R_DrawMasked();
+		R_DrawMasked(masks, nummasks);
 	}
 	PS_STOP_TIMING(ps_skyboxtime);
 
-	R_SetupFrame(player, skybox);
+	R_SetupFrame(viewssnum, skybox);
 	skyVisible = false;
 	framecount++;
 	validcount++;
@@ -1748,82 +1641,83 @@ void R_RenderPlayerView(player_t *player)
 	else
 	{
 		portalclipstart = 0;
-		portalclipend = viewwidth-1;
+		portalclipend = viewwidth;
 		R_ClearClipSegs();
 	}
 	R_ClearDrawSegs();
 	R_ClearSprites();
-#ifdef FLOORSPLATS
-	R_ClearVisibleFloorSplats();
-#endif
 
-	// The head node is the last node output.
+	// check for new console commands.
+	NetUpdate();
 
 	ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0;
 	PS_START_TIMING(ps_bsptime);
-	R_RenderBSPNode((INT32)numnodes - 1);
+	R_RenderViewpoint(&masks[nummasks - 1], true);
 	PS_STOP_TIMING(ps_bsptime);
-	R_AddPrecipitationSprites();
 	PS_START_TIMING(ps_sw_spritecliptime);
-	R_ClipSprites();
+	R_ClipSprites(drawsegs, NULL);
 	PS_STOP_TIMING(ps_sw_spritecliptime);
-	
+
 	ps_numsprites.value.i = numvisiblesprites;
 
-	// PORTAL RENDERING
 	PS_START_TIMING(ps_sw_portaltime);
-	for(portal = portal_base; portal; portal = portal_base)
+	// Portal rendering. Hijacks the BSP traversal.
+	if (portal_base)
 	{
-		// render the portal
-		CONS_Debug(DBG_RENDER, "Rendering portal from line %d to %d\n", portal->line1, portal->line2);
-		portalrender = portal->pass;
+		portal_t *portal;
 
-		R_PortalFrame(&lines[portal->line1], &lines[portal->line2], portal);
+		for (portal = portal_base; portal; portal = portal_base)
+		{
+			portalrender = portal->pass; // Recursiveness depth.
 
-		R_PortalClearClipSegs(portal->start, portal->end);
+			R_ClearFFloorClips();
 
-		R_PortalRestoreClipValues(portal->start, portal->end, portal->ceilingclip, portal->floorclip, portal->frontscale);
+			// Apply the viewpoint stored for the portal.
+			R_PortalFrame(portal);
 
-		validcount++;
+			// Hack in the clipsegs to delimit the starting
+			// clipping for sprites and possibly other similar
+			// future items.
+			R_PortalClearClipSegs(portal->start, portal->end);
 
-		R_RenderBSPNode((INT32)numnodes - 1);
-		R_ClipSprites();
-		//R_DrawPlanes();
-		//R_DrawMasked();
+			// Hack in the top/bottom clip values for the window
+			// that were previously stored.
+			Portal_ClipApply(portal);
 
-		// okay done. free it.
-		portalcullsector = NULL; // Just in case...
-		portal_base = portal->next;
-		Z_Free(portal->ceilingclip);
-		Z_Free(portal->floorclip);
-		Z_Free(portal->frontscale);
-		Z_Free(portal);
+			validcount++;
+
+			masks = static_cast<maskcount_t*>(realloc(masks, (++nummasks)*sizeof(maskcount_t)));
+
+			// Render the BSP from the new viewpoint, and clip
+			// any sprites with the new clipsegs and window.
+			R_RenderViewpoint(&masks[nummasks - 1], true);
+
+			R_ClipSprites(ds_p - (masks[nummasks - 1].drawsegs[1] - masks[nummasks - 1].drawsegs[0]), portal);
+
+			Portal_Remove(portal);
+		}
 	}
 	PS_STOP_TIMING(ps_sw_portaltime);
-	// END PORTAL RENDERING
 
 	PS_START_TIMING(ps_sw_planetime);
+	if (!skybox)
+		R_DrawSkyPlanes();
 	R_DrawPlanes();
 	PS_STOP_TIMING(ps_sw_planetime);
-#ifdef FLOORSPLATS
-	R_DrawVisibleFloorSplats();
-#endif
 	// draw mid texture and sprite
 	// And now 3D floors/sides!
 	PS_START_TIMING(ps_sw_maskedtime);
-	R_DrawMasked();
+	R_DrawMasked(masks, nummasks);
 	PS_STOP_TIMING(ps_sw_maskedtime);
 
+	free(masks);
+
+	// Check for new console commands.
+	NetUpdate();
+
 	// save value to skyVisiblePerPlayer
 	// this is so that P1 can't affect whether P2 can see a skybox or not, or vice versa
-	for (i = 0; i <= splitscreen; i++)
-	{
-		if (player != &players[displayplayers[i]])
-			continue;
-
-		skyVisiblePerPlayer[i] = skyVisible;
-		break;
-	}
+	skyVisiblePerPlayer[viewssnum] = skyVisible;
 }
 
 // =========================================================================
@@ -1832,76 +1726,71 @@ void R_RenderPlayerView(player_t *player)
 
 void R_RegisterEngineStuff(void)
 {
+	INT32 i;
+
 	CV_RegisterVar(&cv_gravity);
 	CV_RegisterVar(&cv_tailspickup);
 	CV_RegisterVar(&cv_soniccd);
 	CV_RegisterVar(&cv_allowmlook);
 	CV_RegisterVar(&cv_homremoval);
-	CV_RegisterVar(&cv_flipcam);
-	CV_RegisterVar(&cv_flipcam2);
-	CV_RegisterVar(&cv_flipcam3);
-	CV_RegisterVar(&cv_flipcam4);
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		CV_RegisterVar(&cv_flipcam[i]);
+	}
 
 	// Enough for dedicated server
 	if (dedicated)
 		return;
 
+	CV_RegisterVar(&cv_precachetextures);
+
 	CV_RegisterVar(&cv_translucency);
 	CV_RegisterVar(&cv_drawdist);
 	CV_RegisterVar(&cv_drawdist_precip);
 	CV_RegisterVar(&cv_lessprecip);
+	CV_RegisterVar(&cv_mobjscaleprecip);
+
+	CV_RegisterVar(&cv_fovchange);
 	CV_RegisterVar(&cv_fov);
 
-	CV_RegisterVar(&cv_chasecam);
-	CV_RegisterVar(&cv_chasecam2);
-	CV_RegisterVar(&cv_chasecam3);
-	CV_RegisterVar(&cv_chasecam4);
 	CV_RegisterVar(&cv_shadow);
 	CV_RegisterVar(&cv_shadowoffs);
 	CV_RegisterVar(&cv_skybox);
 	CV_RegisterVar(&cv_ffloorclip);
 	CV_RegisterVar(&cv_spriteclip);
+	CV_RegisterVar(&cv_secbright);
+	CV_RegisterVar(&cv_softcyancut);
 
-	CV_RegisterVar(&cv_cam_dist);
-	CV_RegisterVar(&cv_cam_still);
-	CV_RegisterVar(&cv_cam_height);
-	CV_RegisterVar(&cv_cam_speed);
-	CV_RegisterVar(&cv_cam_rotate);
-	CV_RegisterVar(&cv_cam_rotspeed);
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		CV_RegisterVar(&cv_chasecam[i]);
 
-	CV_RegisterVar(&cv_cam2_dist);
-	CV_RegisterVar(&cv_cam2_still);
-	CV_RegisterVar(&cv_cam2_height);
-	CV_RegisterVar(&cv_cam2_speed);
-	CV_RegisterVar(&cv_cam2_rotate);
-	CV_RegisterVar(&cv_cam2_rotspeed);
+		CV_RegisterVar(&cv_cam_dist[i]);
+		CV_RegisterVar(&cv_cam_still[i]);
+		CV_RegisterVar(&cv_cam_height[i]);
+		CV_RegisterVar(&cv_cam_speed[i]);
+		CV_RegisterVar(&cv_cam_rotate[i]);
+		CV_RegisterVar(&cv_cam_timeover[i]);
+		CV_RegisterVar(&cv_freecam_speed[i]);
 
-	CV_RegisterVar(&cv_cam3_dist);
-	CV_RegisterVar(&cv_cam3_still);
-	CV_RegisterVar(&cv_cam3_height);
-	CV_RegisterVar(&cv_cam3_speed);
-	CV_RegisterVar(&cv_cam3_rotate);
-	CV_RegisterVar(&cv_cam3_rotspeed);
-
-	CV_RegisterVar(&cv_cam4_dist);
-	CV_RegisterVar(&cv_cam4_still);
-	CV_RegisterVar(&cv_cam4_height);
-	CV_RegisterVar(&cv_cam4_speed);
-	CV_RegisterVar(&cv_cam4_rotate);
-	CV_RegisterVar(&cv_cam4_rotspeed);
+		CV_RegisterVar(&cv_lookbackmom[i]);
+	}
 
 	CV_RegisterVar(&cv_tilting);
 	CV_RegisterVar(&cv_quaketilt);
 	CV_RegisterVar(&cv_tiltsmoothing);
 	CV_RegisterVar(&cv_actionmovie);
 
+	CV_RegisterVar(&cv_screenquake);
+
 	CV_RegisterVar(&cv_driftsparkpulse);
 	CV_RegisterVar(&cv_gravstretch);
 	CV_RegisterVar(&cv_sloperoll);
-	CV_RegisterVar(&cv_spriteroll);
 	CV_RegisterVar(&cv_sliptideroll);
 	CV_RegisterVar(&cv_sloperolldist);
 	CV_RegisterVar(&cv_sparkroll);
+	CV_RegisterVar(&cv_spinoutroll);
 
 	CV_RegisterVar(&cv_showhud);
 	CV_RegisterVar(&cv_translucenthud);
@@ -1909,7 +1798,12 @@ void R_RegisterEngineStuff(void)
 
 	CV_RegisterVar(&cv_maxportals);
 
-	CV_RegisterVar(&cv_grmaxinterpdist);
+	CV_RegisterVar(&cv_randomdirlight);
+
+	CV_RegisterVar(&cv_maxinterpdist);
+	CV_RegisterVar(&cv_playerfade);
+
+	CV_RegisterVar(&cv_ripplewater);
 
 	// Default viewheight is changeable,
 	// initialized to standard viewheight
@@ -1917,5 +1811,6 @@ void R_RegisterEngineStuff(void)
 
 	// Frame interpolation/uncapped
 	CV_RegisterVar(&cv_fpscap);
+	CV_RegisterVar(&cv_fpscapbg);
 	CV_RegisterVar(&cv_precipinterp);
 }
diff --git a/src/r_main.h b/src/r_main.h
index 6c59d9961..db3142548 100644
--- a/src/r_main.h
+++ b/src/r_main.h
@@ -14,6 +14,10 @@
 #ifndef __R_MAIN__
 #define __R_MAIN__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "d_player.h"
 #include "r_data.h"
 #include "m_perfstats.h"
@@ -29,15 +33,22 @@ extern fixed_t centerxfrac, centeryfrac;
 extern fixed_t projection, projectiony;
 extern fixed_t fovtan; // field of view
 
+#define MINFOV 5
+#define MAXFOV 179
+
 extern size_t validcount, linecount, loopcount, framecount;
 
 // The fraction of a tic being drawn (for interpolation between two tics)
 extern fixed_t rendertimefrac;
+// Same as rendertimefrac but not suspended when the game is paused
+extern fixed_t rendertimefrac_unpaused;
 // Evaluated delta tics for this frame (how many tics since the last frame)
 extern fixed_t renderdeltatics;
 // The current render is a new logical tic
 extern boolean renderisnewtic;
 
+extern mobj_t *viewmobj;
+
 //
 // Lighting LUT.
 // Used for z-depth cuing per column/row,
@@ -68,19 +79,81 @@ extern lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
 #define COLORMAP_REMAPOFFSET COLORMAP_SIZE
 
 // Utility functions.
-INT32 R_PointOnSide(fixed_t x, fixed_t y, const node_t *node);
-INT32 R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line);
+
+//
+// R_PointOnSide
+// Traverse BSP (sub) tree,
+// check point against partition plane.
+// Returns side 0 (front) or 1 (back).
+//
+// killough 5/2/98: reformatted
+//
+FUNCINLINE static ATTRINLINE PUREFUNC INT32 R_PointOnSide(fixed_t x, fixed_t y, const node_t* restrict node)
+{
+	if (!node->dx)
+		return x <= node->x ? node->dy > 0 : node->dy < 0;
+
+	if (!node->dy)
+		return y <= node->y ? node->dx < 0 : node->dx > 0;
+
+	x -= node->x;
+	y -= node->y;
+
+	// Try to quickly decide by looking at sign bits.
+	// also use a mask to avoid branch prediction
+	INT32 mask = (node->dy ^ node->dx ^ x ^ y) >> 31;
+	return (mask & ((node->dy ^ x) < 0)) |  // (left is negative)
+	       (~mask & (FixedMul(y, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, x)));
+}
+
+// This is not as accurate
+// SHOULD NOT BE USED FOR ANYTHING GAMEPLAY RELATED!!
+FUNCINLINE static ATTRINLINE PUREFUNC INT32 R_PointOnSideFast(fixed_t x, fixed_t y, const node_t *node)
+{
+	// use cross product to determine side quickly
+	INT64 v = ((INT64)y - node->y) * node->dx - ((INT64)x - node->x) * node->dy;
+	return v > 0;
+}
+
+FUNCINLINE static ATTRINLINE PUREFUNC INT32 R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line)
+{
+	fixed_t lx = line->v1->x;
+	fixed_t ly = line->v1->y;
+	fixed_t ldx = line->v2->x - lx;
+	fixed_t ldy = line->v2->y - ly;
+
+	// use cross product to determine side quickly
+	INT64 v = ((INT64)y - ly) * ldx - ((INT64)x - lx) * ldy;
+	return v > 0;
+}
+
 angle_t R_PointToAngle(fixed_t x, fixed_t y);
 angle_t R_PointToAngle64(INT64 x, INT64 y);
 angle_t R_PointToAngle2(fixed_t px2, fixed_t py2, fixed_t px1, fixed_t py1);
-fixed_t R_PointToDist(fixed_t x, fixed_t y);
-fixed_t R_PointToDist2(fixed_t px2, fixed_t py2, fixed_t px1, fixed_t py1);
 angle_t R_PlayerSliptideAngle(player_t *player);
 
 fixed_t R_ScaleFromGlobalAngle(angle_t visangle);
-subsector_t *R_PointInSubsector(fixed_t x, fixed_t y);
+
+//
+// R_PointInSubsector
+//
+#define R_POINTINSUBSECTOR(FUNCNAME, SIDEFUNC)\
+FUNCINLINE static ATTRINLINE subsector_t *FUNCNAME(fixed_t x, fixed_t y)\
+{\
+	size_t nodenum = numnodes-1;\
+	while (!(nodenum & NF_SUBSECTOR))\
+		nodenum = nodes[nodenum].children[SIDEFUNC(x, y, nodes+nodenum)];\
+	return &subsectors[nodenum & ~NF_SUBSECTOR];\
+}
+
+R_POINTINSUBSECTOR(R_PointInSubsector, R_PointOnSide)
+R_POINTINSUBSECTOR(R_PointInSubsectorFast, R_PointOnSideFast)
+
 subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y);
 
+#define R_PointToDist(x, y) R_PointToDist2(viewx, viewy, x, y)
+#define R_PointToDist2(px2, py2, px1, py1) FixedHypot((px1) - (px2), (py1) - (py2))
+
 boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixed_t bottomh, fixed_t toph);
 void R_GetRenderBlockMapDimensions(fixed_t drawdist, INT32 *xl, INT32 *xh, INT32 *yl, INT32 *yh);
 
@@ -108,18 +181,30 @@ extern ps_metric_t ps_numpolyobjects;
 // REFRESH - the actual rendering functions.
 //
 
+extern consvar_t cv_precachetextures;
 extern consvar_t cv_showhud, cv_translucenthud, cv_uncappedhud;
 extern consvar_t cv_homremoval;
-extern consvar_t cv_chasecam, cv_chasecam2, cv_chasecam3, cv_chasecam4;
-extern consvar_t cv_flipcam, cv_flipcam2, cv_flipcam3, cv_flipcam4;
+extern consvar_t cv_chasecam[MAXSPLITSCREENPLAYERS];
+extern consvar_t cv_flipcam[MAXSPLITSCREENPLAYERS];
 extern consvar_t cv_shadow, cv_shadowoffs;
 extern consvar_t cv_ffloorclip, cv_spriteclip;
+extern consvar_t cv_softcyancut;
 extern consvar_t cv_translucency;
-extern consvar_t cv_drawdist, cv_drawdist_precip, cv_lessprecip;
-extern consvar_t cv_fov;
+extern consvar_t cv_drawdist, cv_drawdist_precip, cv_lessprecip, cv_mobjscaleprecip;
+extern consvar_t cv_fov, cv_fovchange;
 extern consvar_t cv_skybox;
 extern consvar_t cv_tailspickup;
-extern consvar_t cv_grmaxinterpdist;
+extern consvar_t cv_maxinterpdist;
+extern consvar_t cv_playerfade;
+extern consvar_t cv_ripplewater;
+extern consvar_t cv_secbright;
+
+extern consvar_t cv_randomdirlight;
+
+static inline INT32 R_GetSoftLightlevel(INT32 llevel)
+{
+	return CLAMP(llevel, cv_secbright.value, 255) >> LIGHTSEGSHIFT;
+}
 
 // Called by startup code.
 void R_Init(void);
@@ -135,9 +220,10 @@ void R_SetViewSize(void);
 // do it (sometimes explicitly called)
 void R_ExecuteSetViewSize(void);
 
-void R_SkyboxFrame(player_t *player);
+fixed_t R_GetPlayerFov(player_t *player);
+void R_SkyboxFrame(UINT8 pnum);
+void R_SetupFrame(UINT8 pnum, boolean skybox);
 
-void R_SetupFrame(player_t *player, boolean skybox);
 // Called by G_Drawer.
 void R_RenderPlayerView(player_t *player);
 
@@ -146,4 +232,11 @@ void R_RegisterEngineStuff(void);
 
 // return multiplier for HUD uncap
 INT32 R_GetHudUncap(void);
+// same as above but keeps interpolation during pause
+INT32 R_GetMenuUncap(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/r_patch.c b/src/r_patch.c
index eea97cfbb..f48996ea4 100644
--- a/src/r_patch.c
+++ b/src/r_patch.c
@@ -13,12 +13,10 @@
 /// \brief Patch generation.
 
 #include "byteptr.h"
-#include "dehacked.h"
-#include "i_video.h"
-#include "r_data.h"
-#include "r_draw.h"
+#include "doomdef.h"
 #include "r_patch.h"
 #include "r_things.h"
+#include "r_skins.h"
 #include "z_zone.h"
 #include "w_wad.h"
 
@@ -26,425 +24,6 @@
 #include "hardware/hw_glob.h"
 #endif
 
-static unsigned char imgbuf[1<<26];
-
-//
-// R_CheckIfPatch
-//
-// Returns true if the lump is a valid patch.
-//
-boolean R_CheckIfPatch(lumpnum_t lump)
-{
-	size_t size;
-	INT16 width, height;
-	patch_t *patch;
-	boolean result;
-
-	size = W_LumpLength(lump);
-
-	// minimum length of a valid Doom patch
-	if (size < 13)
-		return false;
-
-	patch = (patch_t *)W_CacheLumpNum(lump, PU_STATIC);
-
-	width = SHORT(patch->width);
-	height = SHORT(patch->height);
-
-	result = (height > 0 && height <= 16384 && width > 0 && width <= 16384 && width < (INT16)(size / 4));
-
-	if (result)
-	{
-		// The dimensions seem like they might be valid for a patch, so
-		// check the column directory for extra security. All columns
-		// must begin after the column directory, and none of them must
-		// point past the end of the patch.
-		INT16 x;
-
-		for (x = 0; x < width; x++)
-		{
-			UINT32 ofs = LONG(patch->columnofs[x]);
-
-			// Need one byte for an empty column (but there's patches that don't know that!)
-			if (ofs < (UINT32)width * 4 + 8 || ofs >= (UINT32)size)
-			{
-				result = false;
-				break;
-			}
-		}
-	}
-
-	return result;
-}
-
-//
-// R_TextureToFlat
-//
-// Convert a texture to a flat.
-//
-void R_TextureToFlat(size_t tex, UINT8 *flat)
-{
-	texture_t *texture = textures[tex];
-
-	fixed_t col, ofs;
-	column_t *column;
-	UINT8 *desttop, *dest, *deststop;
-	UINT8 *source;
-
-	// yea
-	R_CheckTextureCache(tex);
-
-	desttop = flat;
-	deststop = desttop + (texture->width * texture->height);
-
-	for (col = 0; col < texture->width; col++, desttop++)
-	{
-		// no post_t info
-		if (!texture->holes)
-		{
-			column = (column_t *)(R_GetColumn(tex, col));
-			source = (UINT8 *)(column);
-			dest = desttop;
-			for (ofs = 0; dest < deststop && ofs < texture->height; ofs++)
-			{
-				if (source[ofs] != TRANSPARENTPIXEL)
-					*dest = source[ofs];
-				dest += texture->width;
-			}
-		}
-		else
-		{
-			INT32 topdelta, prevdelta = -1;
-			column = (column_t *)((UINT8 *)R_GetColumn(tex, col) - 3);
-			while (column->topdelta != 0xff)
-			{
-				topdelta = column->topdelta;
-				if (topdelta <= prevdelta)
-					topdelta += prevdelta;
-				prevdelta = topdelta;
-
-				dest = desttop + (topdelta * texture->width);
-				source = (UINT8 *)column + 3;
-				for (ofs = 0; dest < deststop && ofs < column->length; ofs++)
-				{
-					if (source[ofs] != TRANSPARENTPIXEL)
-						*dest = source[ofs];
-					dest += texture->width;
-				}
-				column = (column_t *)((UINT8 *)column + column->length + 4);
-			}
-		}
-	}
-}
-
-//
-// R_PatchToFlat
-//
-// Convert a patch to a flat.
-//
-void R_PatchToFlat(patch_t *patch, UINT8 *flat)
-{
-	fixed_t col, ofs;
-	column_t *column;
-	UINT8 *desttop, *dest, *deststop;
-	UINT8 *source;
-
-	desttop = flat;
-	deststop = desttop + (SHORT(patch->width) * SHORT(patch->height));
-
-	for (col = 0; col < SHORT(patch->width); col++, desttop++)
-	{
-		INT32 topdelta, prevdelta = -1;
-		column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[col]));
-
-		while (column->topdelta != 0xff)
-		{
-			topdelta = column->topdelta;
-			if (topdelta <= prevdelta)
-				topdelta += prevdelta;
-			prevdelta = topdelta;
-
-			dest = desttop + (topdelta * SHORT(patch->width));
-			source = (UINT8 *)(column) + 3;
-			for (ofs = 0; dest < deststop && ofs < column->length; ofs++)
-			{
-				*dest = source[ofs];
-				dest += SHORT(patch->width);
-			}
-			column = (column_t *)((UINT8 *)column + column->length + 4);
-		}
-	}
-}
-
-//
-// R_PatchToMaskedFlat
-//
-// Convert a patch to a masked flat.
-// Now, what is a "masked" flat anyway?
-// It means the flat uses two bytes to store image data.
-// The upper byte is used to store the transparent pixel,
-// and the lower byte stores a palette index.
-//
-void R_PatchToMaskedFlat(patch_t *patch, UINT16 *raw, boolean flip)
-{
-	fixed_t col, ofs;
-	column_t *column;
-	UINT16 *desttop, *dest, *deststop;
-	UINT8 *source;
-
-	desttop = raw;
-	deststop = desttop + (SHORT(patch->width) * SHORT(patch->height));
-
-	for (col = 0; col < SHORT(patch->width); col++, desttop++)
-	{
-		INT32 topdelta, prevdelta = -1;
-		column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[flip ? (patch->width-1-col) : col]));
-		while (column->topdelta != 0xff)
-		{
-			topdelta = column->topdelta;
-			if (topdelta <= prevdelta)
-				topdelta += prevdelta;
-			prevdelta = topdelta;
-			dest = desttop + (topdelta * SHORT(patch->width));
-			source = (UINT8 *)(column) + 3;
-			for (ofs = 0; dest < deststop && ofs < column->length; ofs++)
-			{
-				*dest = source[ofs];
-				dest += SHORT(patch->width);
-			}
-			column = (column_t *)((UINT8 *)column + column->length + 4);
-		}
-	}
-}
-
-//
-// R_FlatToPatch
-//
-// Convert a flat to a patch.
-//
-patch_t *R_FlatToPatch(UINT8 *raw, UINT16 width, UINT16 height, UINT16 leftoffset, UINT16 topoffset, size_t *destsize, boolean transparency)
-{
-	UINT32 x, y;
-	UINT8 *img;
-	UINT8 *imgptr = imgbuf;
-	UINT8 *colpointers, *startofspan;
-	size_t size = 0;
-
-	if (!raw)
-		return NULL;
-
-	// Write image size and offset
-	WRITEINT16(imgptr, width);
-	WRITEINT16(imgptr, height);
-	WRITEINT16(imgptr, leftoffset);
-	WRITEINT16(imgptr, topoffset);
-
-	// Leave placeholder to column pointers
-	colpointers = imgptr;
-	imgptr += width*4;
-
-	// Write columns
-	for (x = 0; x < width; x++)
-	{
-		int lastStartY = 0;
-		int spanSize = 0;
-		startofspan = NULL;
-
-		// Write column pointer
-		WRITEINT32(colpointers, imgptr - imgbuf);
-
-		// Write pixels
-		for (y = 0; y < height; y++)
-		{
-			UINT8 paletteIndex = raw[((y * width) + x)];
-			boolean opaque = transparency ? (paletteIndex != TRANSPARENTPIXEL) : true;
-
-			// End span if we have a transparent pixel
-			if (!opaque)
-			{
-				if (startofspan)
-					WRITEUINT8(imgptr, 0);
-				startofspan = NULL;
-				continue;
-			}
-
-			// Start new column if we need to
-			if (!startofspan || spanSize == 255)
-			{
-				int writeY = y;
-
-				// If we reached the span size limit, finish the previous span
-				if (startofspan)
-					WRITEUINT8(imgptr, 0);
-
-				if (y > 254)
-				{
-					// Make sure we're aligned to 254
-					if (lastStartY < 254)
-					{
-						WRITEUINT8(imgptr, 254);
-						WRITEUINT8(imgptr, 0);
-						imgptr += 2;
-						lastStartY = 254;
-					}
-
-					// Write stopgap empty spans if needed
-					writeY = y - lastStartY;
-
-					while (writeY > 254)
-					{
-						WRITEUINT8(imgptr, 254);
-						WRITEUINT8(imgptr, 0);
-						imgptr += 2;
-						writeY -= 254;
-					}
-				}
-
-				startofspan = imgptr;
-				WRITEUINT8(imgptr, writeY);
-				imgptr += 2;
-				spanSize = 0;
-
-				lastStartY = y;
-			}
-
-			// Write the pixel
-			WRITEUINT8(imgptr, paletteIndex);
-			spanSize++;
-			startofspan[1] = spanSize;
-		}
-
-		if (startofspan)
-			WRITEUINT8(imgptr, 0);
-
-		WRITEUINT8(imgptr, 0xFF);
-	}
-
-	size = imgptr-imgbuf;
-	img = Z_Malloc(size, PU_STATIC, NULL);
-	memcpy(img, imgbuf, size);
-
-	Z_Free(raw);
-
-	if (destsize != NULL)
-		*destsize = size;
-	return (patch_t *)img;
-}
-
-//
-// R_MaskedFlatToPatch
-//
-// Convert a masked flat to a patch.
-// Explanation of "masked" flats in R_PatchToMaskedFlat.
-//
-patch_t *R_MaskedFlatToPatch(UINT16 *raw, UINT16 width, UINT16 height, UINT16 leftoffset, UINT16 topoffset, size_t *destsize)
-{
-	UINT32 x, y;
-	UINT8 *img;
-	UINT8 *imgptr = imgbuf;
-	UINT8 *colpointers, *startofspan;
-	size_t size = 0;
-
-	if (!raw)
-		return NULL;
-
-	// Write image size and offset
-	WRITEINT16(imgptr, width);
-	WRITEINT16(imgptr, height);
-	WRITEINT16(imgptr, leftoffset);
-	WRITEINT16(imgptr, topoffset);
-
-	// Leave placeholder to column pointers
-	colpointers = imgptr;
-	imgptr += width*4;
-
-	// Write columns
-	for (x = 0; x < width; x++)
-	{
-		int lastStartY = 0;
-		int spanSize = 0;
-		startofspan = NULL;
-
-		// Write column pointer
-		WRITEINT32(colpointers, imgptr - imgbuf);
-
-		// Write pixels
-		for (y = 0; y < height; y++)
-		{
-			UINT16 pixel = raw[((y * width) + x)];
-			UINT8 paletteIndex = (pixel & 0xFF);
-			UINT8 opaque = (pixel != 0xFF00); // If 1, we have a pixel
-
-			// End span if we have a transparent pixel
-			if (!opaque)
-			{
-				if (startofspan)
-					WRITEUINT8(imgptr, 0);
-				startofspan = NULL;
-				continue;
-			}
-
-			// Start new column if we need to
-			if (!startofspan || spanSize == 255)
-			{
-				int writeY = y;
-
-				// If we reached the span size limit, finish the previous span
-				if (startofspan)
-					WRITEUINT8(imgptr, 0);
-
-				if (y > 254)
-				{
-					// Make sure we're aligned to 254
-					if (lastStartY < 254)
-					{
-						WRITEUINT8(imgptr, 254);
-						WRITEUINT8(imgptr, 0);
-						imgptr += 2;
-						lastStartY = 254;
-					}
-
-					// Write stopgap empty spans if needed
-					writeY = y - lastStartY;
-
-					while (writeY > 254)
-					{
-						WRITEUINT8(imgptr, 254);
-						WRITEUINT8(imgptr, 0);
-						imgptr += 2;
-						writeY -= 254;
-					}
-				}
-
-				startofspan = imgptr;
-				WRITEUINT8(imgptr, writeY);
-				imgptr += 2;
-				spanSize = 0;
-
-				lastStartY = y;
-			}
-
-			// Write the pixel
-			WRITEUINT8(imgptr, paletteIndex);
-			spanSize++;
-			startofspan[1] = spanSize;
-		}
-
-		if (startofspan)
-			WRITEUINT8(imgptr, 0);
-
-		WRITEUINT8(imgptr, 0xFF);
-	}
-
-	size = imgptr-imgbuf;
-	img = Z_Malloc(size, PU_STATIC, NULL);
-	memcpy(img, imgbuf, size);
-
-	if (destsize != NULL)
-		*destsize = size;
-	return (patch_t *)img;
-}
-
 //
 // R_ParseSpriteInfoFrame
 //
@@ -743,296 +322,296 @@ void R_LoadSpriteInfoLumps(UINT16 wadnum, UINT16 numlumps)
 	}
 }
 
-static UINT16 GetPatchPixel(patch_t *patch, INT32 x, INT32 y, boolean flip)
+
+static unsigned char imgbuf[1<<26];
+
+//
+// Creates a patch.
+// Assumes a PU_PATCH zone memory tag and no user, but can always be set later
+//
+
+patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
+{
+	patch_t *patch = (dest == NULL) ? Z_Calloc(sizeof(patch_t), PU_PATCH, NULL) : (patch_t *)(dest);
+
+	if (source)
+	{
+		INT32 col, colsize;
+		size_t size = sizeof(INT32) * SHORT(source->width);
+		size_t offs = (sizeof(INT16) * 4) + size;
+
+		patch->width      = SHORT(source->width);
+		patch->height     = SHORT(source->height);
+		patch->leftoffset = SHORT(source->leftoffset);
+		patch->topoffset  = SHORT(source->topoffset);
+		patch->columnofs  = Z_Calloc(size, PU_PATCH_DATA, NULL);
+
+		for (col = 0; col < source->width; col++)
+		{
+			// This makes the column offsets relative to the column data itself,
+			// instead of the entire patch data
+			patch->columnofs[col] = LONG(source->columnofs[col]) - offs;
+		}
+
+		if (!srcsize)
+			I_Error("Patch_Create: no source size!");
+
+		colsize = (INT32)(srcsize) - (INT32)offs;
+		if (colsize <= 0)
+			I_Error("Patch_Create: no column data!");
+
+		patch->columns = Z_Calloc(colsize, PU_PATCH_DATA, NULL);
+		M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize);
+	}
+
+	return patch;
+}
+
+//
+// Frees a patch from memory.
+//
+
+static void Patch_FreeData(patch_t *patch)
+{
+#ifdef HWRENDER
+	if (patch->hardware)
+		HWR_FreeTexture(patch);
+#endif
+
+#ifdef ROTSPRITE
+	/*if (patch->rotated)
+	{
+		rotsprite_t *rotsprite = patch->rotated;
+		INT32 i = 0;
+
+		for (; i < rotsprite->angles; i++)
+		{
+			if (rotsprite->patches[i])
+				Patch_Free(rotsprite->patches[i]);
+		}
+
+		Z_Free(rotsprite->patches);
+		Z_Free(rotsprite);
+	}*/
+#endif
+
+	if (patch->columnofs)
+		Z_Free(patch->columnofs);
+	if (patch->columns)
+		Z_Free(patch->columns);
+}
+
+void Patch_Free(patch_t *patch)
+{
+	Patch_FreeData(patch);
+	Z_Free(patch);
+}
+
+//
+// Frees patches with a tag range.
+//
+
+static boolean Patch_FreeTagsCallback(void *mem)
+{
+	patch_t *patch = (patch_t *)mem;
+	Patch_FreeData(patch);
+	return true;
+}
+
+void Patch_FreeTags(INT32 lowtag, INT32 hightag)
+{
+	Z_IterateTags(lowtag, hightag, Patch_FreeTagsCallback);
+}
+
+#ifdef HWRENDER
+//
+// Allocates a hardware patch.
+//
+
+void *Patch_AllocateHardwarePatch(patch_t *patch)
+{
+	if (!patch->hardware)
+	{
+		GLPatch_t *glPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware);
+		glPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &glPatch->mipmap);
+	}
+	return (void *)(patch->hardware);
+}
+
+//
+// Creates a hardware patch.
+//
+
+void *Patch_CreateGL(patch_t *patch)
+{
+	GLPatch_t *glPatch = (GLPatch_t *)Patch_AllocateHardwarePatch(patch);
+	if (!glPatch->mipmap->data) // Run HWR_MakePatch in all cases, to recalculate some things
+		HWR_MakePatch(patch, glPatch, glPatch->mipmap, false);
+	return glPatch;
+}
+#endif // HWRENDER
+
+
+//
+// R_MaskedFlatToPatch
+//
+// Convert a masked flat to a patch.
+// Explanation of "masked" flats in R_PatchToMaskedFlat.
+//
+void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffset, INT16 topoffset, size_t *destsize)
+{
+	INT16 x, y;
+	UINT8 *img;
+	UINT8 *imgptr = imgbuf;
+	UINT8 *colpointers, *startofspan;
+	size_t size = 0;
+
+	if (!raw)
+		return NULL;
+
+	// Write image size and offset
+	WRITEINT16(imgptr, width);
+	WRITEINT16(imgptr, height);
+	WRITEINT16(imgptr, leftoffset);
+	WRITEINT16(imgptr, topoffset);
+
+	// Leave placeholder to column pointers
+	colpointers = imgptr;
+	imgptr += width*4;
+
+	// Write columns
+	for (x = 0; x < width; x++)
+	{
+		int lastStartY = 0;
+		int spanSize = 0;
+		startofspan = NULL;
+
+		// Write column pointer
+		WRITEINT32(colpointers, imgptr - imgbuf);
+
+		// Write pixels
+		for (y = 0; y < height; y++)
+		{
+			UINT16 pixel = raw[((y * width) + x)];
+			UINT8 paletteIndex = (pixel & 0xFF);
+			UINT8 opaque = (pixel != 0xFF00); // If 1, we have a pixel
+
+			// End span if we have a transparent pixel
+			if (!opaque)
+			{
+				if (startofspan)
+					WRITEUINT8(imgptr, 0);
+				startofspan = NULL;
+				continue;
+			}
+
+			// Start new column if we need to
+			if (!startofspan || spanSize == 255)
+			{
+				int writeY = y;
+
+				// If we reached the span size limit, finish the previous span
+				if (startofspan)
+					WRITEUINT8(imgptr, 0);
+
+				if (y > 254)
+				{
+					// Make sure we're aligned to 254
+					if (lastStartY < 254)
+					{
+						WRITEUINT8(imgptr, 254);
+						WRITEUINT8(imgptr, 0);
+						imgptr += 2;
+						lastStartY = 254;
+					}
+
+					// Write stopgap empty spans if needed
+					writeY = y - lastStartY;
+
+					while (writeY > 254)
+					{
+						WRITEUINT8(imgptr, 254);
+						WRITEUINT8(imgptr, 0);
+						imgptr += 2;
+						writeY -= 254;
+					}
+				}
+
+				startofspan = imgptr;
+				WRITEUINT8(imgptr, writeY);
+				imgptr += 2;
+				spanSize = 0;
+
+				lastStartY = y;
+			}
+
+			// Write the pixel
+			WRITEUINT8(imgptr, paletteIndex);
+			spanSize++;
+			startofspan[1] = spanSize;
+		}
+
+		if (startofspan)
+			WRITEUINT8(imgptr, 0);
+
+		WRITEUINT8(imgptr, 0xFF);
+	}
+
+	size = imgptr-imgbuf;
+	img = Z_Malloc(size, PU_STATIC, NULL);
+	memcpy(img, imgbuf, size);
+
+	if (destsize != NULL)
+		*destsize = size;
+
+	patch_t *converted = Patch_Create((softwarepatch_t *)img, size, NULL);
+#ifdef HWRENDER
+	Patch_CreateGL(converted);
+#endif
+	Z_Free(img);
+
+	return converted;
+}
+
+UINT16 R_GetPatchPixel(patch_t *patch, INT32 x, INT32 y, boolean flip)
 {
 	fixed_t ofs;
 	column_t *column;
-	UINT8 *source;
+	UINT8 *source = NULL;
+	INT16 width;
 
-	if (x >= 0 && x < SHORT(patch->width))
+	if (patch == NULL)
+		I_Error("GetPatchPixel: patch == NULL");
+
+	width = patch->width;
+
+	if (x >= 0 && x < width)
 	{
+		INT32 colx = flip ? (width-1)-x : x;
 		INT32 topdelta, prevdelta = -1;
-		column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[flip ? (patch->width-1-x) : x]));
+
+		column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[colx]));
+
 		while (column->topdelta != 0xff)
 		{
 			topdelta = column->topdelta;
+
 			if (topdelta <= prevdelta)
 				topdelta += prevdelta;
+
 			prevdelta = topdelta;
-			source = (UINT8 *)(column) + 3;
-			for (ofs = 0; ofs < column->length; ofs++)
+
+			ofs = (y - topdelta);
+
+			if (y >= topdelta && ofs < column->length)
 			{
-				if ((topdelta + ofs) == y)
-					return source[ofs];
+				source = (UINT8 *)(column) + 3;
+				return source[ofs];
 			}
+
 			column = (column_t *)((UINT8 *)column + column->length + 4);
 		}
 	}
 
 	return 0xFF00;
 }
-
-#ifdef HWRENDER
-static patch_t *R_CreateHardwarePatch(patch_t *patch)
-{
-	GLPatch_t *grPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, NULL);
-	grPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, NULL);
-	grPatch->rawpatch = patch;
-	HWR_MakePatch(patch, grPatch, grPatch->mipmap, false);
-    return (patch_t *)grPatch;
-}
-#endif
-
-#ifdef ROTSPRITE
-//
-// R_GetRollAngle
-//
-// Angles precalculated in R_InitSprites.
-//
-fixed_t rollcosang[ROTANGLES];
-fixed_t rollsinang[ROTANGLES];
-
-INT32 R_GetRollAngle(angle_t rollangle)
-{
-	INT32 ra = AngleFixed(rollangle)>>FRACBITS;
-#if (ROTANGDIFF > 1)
-	ra += (ROTANGDIFF/2);
-#endif
-	ra /= ROTANGDIFF;
-	ra %= ROTANGLES;
-	return ra;
-}
-
-patch_t *Patch_GetRotatedSprite(spriteframe_t *sprite, size_t frame, size_t spriteangle, boolean flip, boolean adjustfeet, void *info, INT32 rotationangle)
-{
-	rotsprite_t *rotsprite;
-	spriteinfo_t *sprinfo = (spriteinfo_t *)info;
-	INT32 idx = rotationangle;
-	UINT8 type = (adjustfeet ? 1 : 0);
-
-	if (rotationangle < 1 || rotationangle >= ROTANGLES)
-		return NULL;
-
-	rotsprite = sprite->rotated[type][spriteangle];
-
-	if (rotsprite == NULL)
-	{
-		rotsprite = RotatedPatch_Create(ROTANGLES);
-		sprite->rotated[type][spriteangle] = rotsprite;
-	}
-
-	if (flip)
-		idx += rotsprite->angles;
-
-	if (rotsprite->patches[idx] == NULL)
-	{
-		patch_t *patch;
-		INT32 xpivot = 0, ypivot = 0;
-		lumpnum_t lump = sprite->lumppat[spriteangle];
-
-		if (lump == LUMPERROR)
-			return NULL;
-
-		patch = (patch_t *)W_CacheLumpNum(lump, PU_STATIC);
-
-		if (sprinfo->available)
-		{
-			xpivot = sprinfo->pivot[frame].x;
-			ypivot = sprinfo->pivot[frame].y;
-		}
-		else
-		{
-			xpivot = patch->leftoffset;
-			ypivot = patch->height / 2;
-		}
-
-		RotatedPatch_DoRotation(rotsprite, patch, rotationangle, xpivot, ypivot, flip);
-
-		//BP: we cannot use special tric in hardware mode because feet in ground caused by z-buffer
-		if (adjustfeet)
-			((patch_t *)rotsprite->patches[idx])->topoffset += FEETADJUST>>FRACBITS;
-
-		// free image data
-		Z_Free(patch);
-	}
-
-	return rotsprite->patches[idx];
-}
-
-rotsprite_t *RotatedPatch_Create(INT32 numangles)
-{
-	rotsprite_t *rotsprite = Z_Calloc(sizeof(rotsprite_t), PU_STATIC, NULL);
-	rotsprite->angles = numangles;
-	rotsprite->patches = Z_Calloc(rotsprite->angles * 2 * sizeof(void *), PU_STATIC, NULL);
-	return rotsprite;
-}
-
-static void RotatedPatch_CalculateDimensions(
-	INT32 width, INT32 height,
-	fixed_t ca, fixed_t sa,
-	INT32 *newwidth, INT32 *newheight)
-{
-	fixed_t fixedwidth = (width * FRACUNIT);
-	fixed_t fixedheight = (height * FRACUNIT);
-
-	fixed_t w1 = abs(FixedMul(fixedwidth, ca) - FixedMul(fixedheight, sa));
-	fixed_t w2 = abs(FixedMul(-fixedwidth, ca) - FixedMul(fixedheight, sa));
-	fixed_t h1 = abs(FixedMul(fixedwidth, sa) + FixedMul(fixedheight, ca));
-	fixed_t h2 = abs(FixedMul(-fixedwidth, sa) + FixedMul(fixedheight, ca));
-
-	w1 = FixedInt(FixedCeil(w1 + (FRACUNIT/2)));
-	w2 = FixedInt(FixedCeil(w2 + (FRACUNIT/2)));
-	h1 = FixedInt(FixedCeil(h1 + (FRACUNIT/2)));
-	h2 = FixedInt(FixedCeil(h2 + (FRACUNIT/2)));
-
-	*newwidth = max(width, max(w1, w2));
-	*newheight = max(height, max(h1, h2));
-}
-
-void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip)
-{
-	UINT32 i;
-	patch_t *rotated;
-
-#ifdef HWRENDER
-	patch_t *hwpatch;
-#endif
-
-	UINT16 *rawdst, *rawconv;
-	size_t size;
-	INT32 bflip = (flip != 0x00);
-
-	INT32 width = patch->width;
-	INT32 height = patch->height;
-	INT32 leftoffset = patch->leftoffset;
-	INT32 newwidth, newheight;
-
-	fixed_t ca = rollcosang[angle];
-	fixed_t sa = rollsinang[angle];
-	fixed_t xcenter, ycenter;
-	INT32 idx = angle;
-	INT32 x, y;
-	INT32 sx, sy;
-	INT32 dx, dy;
-	INT32 ox, oy;
-	INT32 minx, miny, maxx, maxy;
-
-	// Don't cache angle = 0
-	if (angle < 1 || angle >= ROTANGLES)
-		return;
-
-	if (flip)
-	{
-		idx += rotsprite->angles;
-		xpivot = width - xpivot;
-		leftoffset = width - leftoffset;
-	}
-
-	if (rotsprite->patches[idx])
-		return;
-
-	// Find the dimensions of the rotated patch.
-	RotatedPatch_CalculateDimensions(width, height, ca, sa, &newwidth, &newheight);
-
-	xcenter = (xpivot * FRACUNIT);
-	ycenter = (ypivot * FRACUNIT);
-
-	if (xpivot != width / 2 || ypivot != height / 2)
-	{
-		newwidth *= 2;
-		newheight *= 2;
-	}
-
-	minx = newwidth;
-	miny = newheight;
-	maxx = 0;
-	maxy = 0;
-
-	// Draw the rotated sprite to a temporary buffer.
-	size = (newwidth * newheight);
-	if (!size)
-		size = (width * height);
-	rawdst = Z_Calloc(size * sizeof(UINT16), PU_STATIC, NULL);
-
-	for (i = 0; i < size; i++)
-		rawdst[i] = 0xFF00;
-
-	for (dy = 0; dy < newheight; dy++)
-	{
-		for (dx = 0; dx < newwidth; dx++)
-		{
-			x = (dx - (newwidth / 2)) * FRACUNIT;
-			y = (dy - (newheight / 2)) * FRACUNIT;
-			sx = FixedMul(x, ca) + FixedMul(y, sa) + xcenter;
-			sy = -FixedMul(x, sa) + FixedMul(y, ca) + ycenter;
-
-			sx >>= FRACBITS;
-			sy >>= FRACBITS;
-		
-			if (sx >= 0 && sy >= 0 && sx < width && sy < height)
-					rawdst[(dy*newwidth)+dx] = GetPatchPixel(patch, sx, sy, bflip);
-		}
-	}
-
-	ox = (newwidth / 2) + (leftoffset - xpivot);
-	oy = (newheight / 2) + (patch->topoffset - ypivot);
-	width = (maxx - minx);
-	height = (maxy - miny);
-
-	if ((unsigned)(width * height) > size)
-	{
-		UINT16 *src, *dest;
-
-		size = (width * height);
-		rawconv = Z_Calloc(size * sizeof(UINT16), PU_STATIC, NULL);
-
-		src = &rawdst[(miny * newwidth) + minx];
-		dest = rawconv;
-		dy = height;
-
-		while (dy--)
-		{
-			M_Memcpy(dest, src, width * sizeof(UINT16));
-			dest += width;
-			src += newwidth;
-		}
-
-		ox -= minx;
-		oy -= miny;
-
-		Z_Free(rawdst);
-	}
-	else
-	{
-		rawconv = rawdst;
-		width = newwidth;
-		height = newheight;
-	}
-	
-	// make patch
-	rotated = R_MaskedFlatToPatch(rawconv, width, height, 0, 0, &size);
-	{
-					rotated->leftoffset = ox;
-					rotated->topoffset = oy;
-	}
-#ifdef HWRENDER
-		if (rendermode == render_opengl)
-		{
-				hwpatch = R_CreateHardwarePatch(rotated);
-		}
-#endif // HWRENDER
-
-		//Z_ChangeTag(rotated, PU_PATCH_ROTATED); // important for memory clearing
-#ifdef HWRENDER
-	if (rendermode == render_opengl)
-		Z_SetUser(hwpatch, (void **)(&rotsprite->patches[idx]));
-	else
-#endif
-		Z_SetUser(rotated, (void **)(&rotsprite->patches[idx]));
-
-	Z_Free(rawconv);
-
-	rotated->leftoffset = ox;
-	rotated->topoffset = oy;
-}
-#endif
diff --git a/src/r_patch.h b/src/r_patch.h
index ac8072a43..2978ff10c 100644
--- a/src/r_patch.h
+++ b/src/r_patch.h
@@ -15,7 +15,6 @@
 #define __R_PATCH__
 
 #include "r_defs.h"
-#include "doomdef.h"
 
 // Structs
 typedef enum
@@ -37,32 +36,27 @@ typedef struct
 	boolean available;
 } spriteinfo_t;
 
+// Patch functions
+patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest);
+void Patch_Free(patch_t *patch);
+
+#define Patch_FreeTag(tagnum) Patch_FreeTags(tagnum, tagnum)
+void Patch_FreeTags(INT32 lowtag, INT32 hightag);
+
+#ifdef HWRENDER
+void *Patch_AllocateHardwarePatch(patch_t *patch);
+void *Patch_CreateGL(patch_t *patch);
+#endif
+
 // Conversions between patches / flats / textures...
 boolean R_CheckIfPatch(lumpnum_t lump);
-void R_TextureToFlat(size_t tex, UINT8 *flat);
-void R_PatchToFlat(patch_t *patch, UINT8 *flat);
-void R_PatchToMaskedFlat(patch_t *patch, UINT16 *raw, boolean flip);
-patch_t *R_FlatToPatch(UINT8 *raw, UINT16 width, UINT16 height, UINT16 leftoffset, UINT16 topoffset, size_t *destsize, boolean transparency);
-patch_t *R_MaskedFlatToPatch(UINT16 *raw, UINT16 width, UINT16 height, UINT16 leftoffset, UINT16 topoffset, size_t *destsize);
 
 // SpriteInfo
 extern spriteinfo_t spriteinfo[NUMSPRITES];
 void R_LoadSpriteInfoLumps(UINT16 wadnum, UINT16 numlumps);
 void R_ParseSPRTINFOLump(UINT16 wadNum, UINT16 lumpNum);
 
-// Sprite rotation
-#ifdef ROTSPRITE
-INT32 R_GetRollAngle(angle_t rollangle);
-patch_t *Patch_GetRotatedSprite(
-	spriteframe_t *sprite,
-	size_t frame, size_t spriteangle,
-	boolean flip, boolean adjustfeet,
-	void *info, INT32 rotationangle);	
-rotsprite_t *RotatedPatch_Create(INT32 numangles);
-void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip);
-
-extern fixed_t rollcosang[ROTANGLES];
-extern fixed_t rollsinang[ROTANGLES];
-#endif
+void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffset, INT16 topoffset, size_t *destsize);
+UINT16 R_GetPatchPixel(patch_t *patch, INT32 x, INT32 y, boolean flip);
 
 #endif // __R_PATCH__
diff --git a/src/r_patchrotation.c b/src/r_patchrotation.c
new file mode 100644
index 000000000..3f1836ad1
--- /dev/null
+++ b/src/r_patchrotation.c
@@ -0,0 +1,262 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020-2023 by Lactozilla.
+//
+// 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  r_patchrotation.c
+/// \brief Patch rotation.
+
+#include "doomdef.h"
+#include "r_fps.h"
+#include "r_patch.h"
+#include "r_patchrotation.h"
+#include "z_zone.h"
+#include "w_wad.h"
+
+#ifdef ROTSPRITE
+//
+// R_GetRollAngle
+//
+// Angles precalculated in R_InitSprites.
+//
+fixed_t rollcosang[ROTANGLES];
+fixed_t rollsinang[ROTANGLES];
+
+INT32 R_GetRollAngle(angle_t rollangle)
+{
+	INT32 ra = AngleFixed(rollangle)>>FRACBITS;
+#if (ROTANGDIFF > 1)
+	ra += (ROTANGDIFF/2);
+#endif
+	ra /= ROTANGDIFF;
+	ra %= ROTANGLES;
+	return ra;
+}
+
+angle_t R_RotationAngle(angle_t ang, angle_t camang, interpmobjstate_t *interp)
+{
+	return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp->roll) +
+	FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp->pitch) +
+	FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp->sloperoll) +
+	FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp->slopepitch);
+}
+
+patch_t *Patch_GetRotatedSprite(spriteframe_t *sprite, size_t frame, size_t spriteangle, boolean flip, void *info, INT32 rotationangle)
+{
+	rotsprite_t *rotsprite;
+	spriteinfo_t *sprinfo = (spriteinfo_t *)info;
+	INT32 idx = rotationangle;
+
+	if (rotationangle < 1 || rotationangle >= ROTANGLES)
+		return NULL;
+
+	rotsprite = sprite->rotated[spriteangle];
+
+	if (rotsprite == NULL)
+	{
+		rotsprite = RotatedPatch_Create(ROTANGLES);
+		sprite->rotated[spriteangle] = rotsprite;
+	}
+
+	if (flip)
+		idx += rotsprite->angles;
+
+	if (rotsprite->patches[idx] == NULL)
+	{
+		patch_t *patch;
+		INT32 xpivot = 0, ypivot = 0;
+		lumpnum_t lump = sprite->lumppat[spriteangle];
+
+		if (lump == LUMPERROR)
+			return NULL;
+
+		patch = W_CachePatchNum(lump, PU_SPRITE);
+
+		if (sprinfo->available)
+		{
+			xpivot = sprinfo->pivot[frame].x;
+			ypivot = sprinfo->pivot[frame].y;
+		}
+		else
+		{
+			xpivot = patch->leftoffset;
+			ypivot = patch->height / 2;
+		}
+
+		RotatedPatch_DoRotation(rotsprite, patch, rotationangle, xpivot, ypivot, flip);
+	}
+
+	return rotsprite->patches[idx];
+}
+
+rotsprite_t *RotatedPatch_Create(INT32 numangles)
+{
+	rotsprite_t *rotsprite = Z_Calloc(sizeof(rotsprite_t), PU_STATIC, NULL);
+	rotsprite->angles = numangles;
+	rotsprite->patches = Z_Calloc(rotsprite->angles * 2 * sizeof(void *), PU_STATIC, NULL);
+	return rotsprite;
+}
+
+static void RotatedPatch_CalculateDimensions(
+	INT32 width, INT32 height,
+	fixed_t ca, fixed_t sa,
+	INT32 *newwidth, INT32 *newheight)
+{
+	fixed_t fixedwidth = (width * FRACUNIT);
+	fixed_t fixedheight = (height * FRACUNIT);
+
+	fixed_t w1 = abs(FixedMul(fixedwidth, ca) - FixedMul(fixedheight, sa));
+	fixed_t w2 = abs(FixedMul(-fixedwidth, ca) - FixedMul(fixedheight, sa));
+	fixed_t h1 = abs(FixedMul(fixedwidth, sa) + FixedMul(fixedheight, ca));
+	fixed_t h2 = abs(FixedMul(-fixedwidth, sa) + FixedMul(fixedheight, ca));
+
+	w1 = FixedInt(FixedCeil(w1 + (FRACUNIT/2)));
+	w2 = FixedInt(FixedCeil(w2 + (FRACUNIT/2)));
+	h1 = FixedInt(FixedCeil(h1 + (FRACUNIT/2)));
+	h2 = FixedInt(FixedCeil(h2 + (FRACUNIT/2)));
+
+	*newwidth = max(width, max(w1, w2));
+	*newheight = max(height, max(h1, h2));
+}
+
+void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip)
+{
+	UINT32 i;
+	patch_t *rotated;
+
+	UINT16 *rawdst, *rawconv;
+	size_t size;
+	INT32 bflip = (flip != 0x00);
+
+	INT32 width = patch->width;
+	INT32 height = patch->height;
+	INT32 leftoffset = patch->leftoffset;
+	INT32 newwidth, newheight;
+
+	fixed_t ca = rollcosang[angle];
+	fixed_t sa = rollsinang[angle];
+	fixed_t xcenter, ycenter;
+	INT32 idx = angle;
+	INT32 x, y;
+	INT32 sx, sy;
+	INT32 dx, dy;
+	INT32 ox, oy;
+	INT32 minx, miny, maxx, maxy;
+
+	// Don't cache angle = 0
+	if (angle < 1 || angle >= ROTANGLES)
+		return;
+
+	if (flip)
+	{
+		idx += rotsprite->angles;
+		xpivot = width - xpivot;
+		leftoffset = width - leftoffset;
+	}
+
+	if (rotsprite->patches[idx])
+		return;
+
+	// Find the dimensions of the rotated patch.
+	RotatedPatch_CalculateDimensions(width, height, ca, sa, &newwidth, &newheight);
+
+	xcenter = (xpivot * FRACUNIT);
+	ycenter = (ypivot * FRACUNIT);
+
+	if (xpivot != width / 2 || ypivot != height / 2)
+	{
+		newwidth *= 2;
+		newheight *= 2;
+	}
+
+	minx = newwidth;
+	miny = newheight;
+	maxx = 0;
+	maxy = 0;
+
+	// Draw the rotated sprite to a temporary buffer.
+	size = (newwidth * newheight);
+	if (!size)
+		size = (width * height);
+	rawdst = Z_Malloc(size * sizeof(UINT16), PU_STATIC, NULL);
+
+	for (i = 0; i < size; i++)
+		rawdst[i] = 0xFF00;
+
+	for (dy = 0; dy < newheight; dy++)
+	{
+		for (dx = 0; dx < newwidth; dx++)
+		{
+			x = (dx - (newwidth / 2)) * FRACUNIT;
+			y = (dy - (newheight / 2)) * FRACUNIT;
+			sx = FixedMul(x, ca) + FixedMul(y, sa) + xcenter;
+			sy = -FixedMul(x, sa) + FixedMul(y, ca) + ycenter;
+
+			sx >>= FRACBITS;
+			sy >>= FRACBITS;
+
+			if (sx >= 0 && sy >= 0 && sx < width && sy < height)
+			{
+				rawdst[(dy * newwidth) + dx] = R_GetPatchPixel(patch, sx, sy, bflip);
+
+				if (dx < minx)
+					minx = dx;
+				if (dy < miny)
+					miny = dy;
+				if (dx > maxx)
+					maxx = dx;
+				if (dy > maxy)
+					maxy = dy;
+			}
+		}
+	}
+
+	ox = (newwidth / 2) + (leftoffset - xpivot);
+	oy = (newheight / 2) + (patch->topoffset - ypivot);
+	width = (maxx - minx);
+	height = (maxy - miny);
+
+	if ((unsigned)(width * height) > size)
+	{
+		UINT16 *src, *dest;
+
+		size = (width * height);
+		rawconv = Z_Calloc(size * sizeof(UINT16), PU_STATIC, NULL);
+
+		src = &rawdst[(miny * newwidth) + minx];
+		dest = rawconv;
+		dy = height;
+
+		while (dy--)
+		{
+			M_Memcpy(dest, src, width * sizeof(UINT16));
+			dest += width;
+			src += newwidth;
+		}
+
+		ox -= minx;
+		oy -= miny;
+
+		Z_Free(rawdst);
+	}
+	else
+	{
+		rawconv = rawdst;
+		width = newwidth;
+		height = newheight;
+	}
+
+	// make patch
+	rotated = (patch_t *)R_MaskedFlatToPatch(rawconv, width, height, 0, 0, &size);
+
+	Z_ChangeTag(rotated, PU_PATCH_ROTATED);
+	Z_SetUser(rotated, (void **)(&rotsprite->patches[idx]));
+	Z_Free(rawconv);
+
+	rotated->leftoffset = ox;
+	rotated->topoffset = oy;
+}
+#endif
diff --git a/src/r_patchrotation.h b/src/r_patchrotation.h
new file mode 100644
index 000000000..b3bcd7a97
--- /dev/null
+++ b/src/r_patchrotation.h
@@ -0,0 +1,38 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020-2023 by Lactozilla.
+//
+// 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  r_patchrotation.h
+/// \brief Patch rotation.
+
+#ifndef __R_PATCHROTATION__
+#define __R_PATCHROTATION__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "r_fps.h"
+
+// Sprite rotation
+#ifdef ROTSPRITE
+INT32 R_GetRollAngle(angle_t rollangle);
+angle_t R_RotationAngle(angle_t ang, angle_t camang, interpmobjstate_t *interp);
+
+rotsprite_t *RotatedPatch_Create(INT32 numangles);
+void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip);
+patch_t *Patch_GetRotatedSprite(spriteframe_t *sprite, size_t frame, size_t spriteangle, boolean flip, void *info, INT32 rotationangle);
+
+extern fixed_t rollcosang[ROTANGLES];
+extern fixed_t rollsinang[ROTANGLES];
+#endif
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // __R_PATCHROTATION__
diff --git a/src/r_plane.cpp b/src/r_plane.cpp
new file mode 100644
index 000000000..dd4813794
--- /dev/null
+++ b/src/r_plane.cpp
@@ -0,0 +1,1410 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-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  r_plane.c
+/// \brief Here is a core component: drawing the floors and ceilings,
+///        while maintaining a per column clipping list only.
+///        Moreover, the sky areas have to be determined.
+
+#include <algorithm>
+
+#include "doomdef.h"
+#include "console.h"
+#include "g_game.h"
+#include "p_setup.h" // levelflats
+#include "p_slopes.h"
+#include "r_data.h"
+#include "r_local.h"
+#include "r_state.h"
+#include "r_splats.h" // faB(21jan):testing
+#include "r_sky.h"
+#include "v_video.h"
+#include "w_wad.h"
+#include "z_zone.h"
+#include "p_tick.h"
+#include "r_fps.h"
+#include "r_portal.h"
+
+#ifdef HAVE_THREADS
+#include "core/thread_pool.h"
+#endif
+
+//
+// opening
+//
+
+// Quincunx antialiasing of flats!
+//#define QUINCUNX
+
+// good night sweet prince
+//#define SHITPLANESPARENCY
+
+visplane_t *visplanes[MAXVISPLANES];
+static visplane_t *freetail;
+static visplane_t **freehead = &freetail;
+
+visplane_t *floorplane;
+visplane_t *ceilingplane;
+
+visffloor_t ffloor[MAXFFLOORS];
+INT32 numffloors;
+
+//SoM: 3/23/2000: Boom visplane hashing routine.
+#define visplane_hash(picnum,lightlevel,height) \
+  ((unsigned)((picnum)*3+(lightlevel)+(height)*7) & VISPLANEHASHMASK)
+
+//SoM: 3/23/2000: Use boom opening limit removal
+size_t maxopenings;
+INT16 *openings, *lastopening; /// \todo free leak
+
+//
+// Clip values are the solid pixel bounding the range.
+//  floorclip starts out SCREENHEIGHT
+//  ceilingclip starts out -1
+//
+INT16 *floorclip, *ceilingclip;
+fixed_t *frontscale;
+
+//
+// spanstart holds the start of a plane span
+// initialized to 0 at start
+//
+static INT32 *spanstart;
+
+//added : 10-02-98: yslopetab is what yslope used to be,
+//                yslope points somewhere into yslopetab,
+//                now (viewheight/2) slopes are calculated above and
+//                below the original viewheight for mouselook
+//                (this is to calculate yslopes only when really needed)
+//                (when mouselookin', yslope is moving into yslopetab)
+//                Check R_SetupFrame, R_SetViewSize for more...
+fixed_t *yslopetab;
+fixed_t *yslope;
+
+fixed_t basexscale, baseyscale;
+
+static INT16 *ffloor_f_clip;
+static INT16 *ffloor_c_clip;
+
+static void R_SetTiltedSpan(drawspandata_t* ds, INT32 span);
+static void R_SetSlopePlaneVectors(drawspandata_t* ds, visplane_t *pl, INT32 y, fixed_t xoff, fixed_t yoff);
+
+static void R_ReallocPlaneBounds(visplane_t *pl)
+{
+	pl->top_memory    = static_cast<UINT16*>(Z_Realloc(pl->top_memory, sizeof(UINT16) * (viewwidth + 2), PU_STATIC, NULL));
+	pl->bottom_memory = static_cast<UINT16*>(Z_Realloc(pl->bottom_memory, sizeof(UINT16) * (viewwidth + 2), PU_STATIC, NULL));
+	pl->top    = pl->top_memory + 1;
+	pl->bottom = pl->bottom_memory + 1;
+}
+
+void R_AllocPlaneMemory(void)
+{
+	visplane_t *check;
+
+	// Alloc visplane top/bottom bounds
+	for (unsigned i = 0; i < MAXVISPLANES; i++)
+	{
+		check = visplanes[i];
+
+		while (check)
+		{
+			R_ReallocPlaneBounds(check);
+			check = check->next;
+		}
+	}
+
+	// Need to do it for "freed" visplanes too
+	check = freetail;
+	while (check)
+	{
+		R_ReallocPlaneBounds(check);
+		check = check->next;
+	}
+
+	// Alloc ffloor clip tables
+	ffloor_f_clip = static_cast<INT16*>(Z_Realloc(ffloor_f_clip, sizeof(*ffloor_f_clip) * (viewwidth * MAXFFLOORS), PU_STATIC, NULL));
+	ffloor_c_clip = static_cast<INT16*>(Z_Realloc(ffloor_c_clip, sizeof(*ffloor_c_clip) * (viewwidth * MAXFFLOORS), PU_STATIC, NULL));
+
+	for (unsigned i = 0; i < MAXFFLOORS; i++)
+	{
+		ffloor[i].f_clip = ffloor_f_clip + (i * viewwidth);
+		ffloor[i].c_clip = ffloor_c_clip + (i * viewwidth);
+	}
+
+	yslopetab = static_cast<fixed_t*>(Z_Realloc(yslopetab, sizeof(*yslopetab) * (viewheight * 16), PU_STATIC, NULL));
+	spanstart = static_cast<fixed_t*>(Z_Realloc(spanstart, sizeof(*spanstart) * viewheight, PU_STATIC, NULL));
+}
+
+//
+// Water ripple effect!!
+// Needs the height of the plane, and the vertical position of the span.
+// Sets planeripple.xfrac and planeripple.yfrac, added to ds_xfrac and ds_yfrac, if the span is not tilted.
+//
+static fixed_t R_CalculateRippleOffset(drawspandata_t* ds, INT32 y)
+{
+	const fixed_t distance = FixedMul(ds->planeheight, yslope[y]);
+	const INT32 yay = (ds->planeripple.offset + (distance>>9)) & 8191;
+	return FixedDiv(FINESINE(yay), (1<<12) + (distance>>11));
+}
+
+static void R_CalculatePlaneRipple(drawspandata_t* ds, angle_t angle)
+{
+	angle >>= ANGLETOFINESHIFT;
+	angle = (angle + 2048) & 8191; // 90 degrees
+	ds->planeripple.xfrac = FixedMul(FINECOSINE(angle), ds->bgofs);
+	ds->planeripple.yfrac = FixedMul(FINESINE(angle), ds->bgofs);
+}
+
+static void R_UpdatePlaneRipple(drawspandata_t* ds)
+{
+	ds->waterofs = (leveltime & 1)*16384;
+	ds->planeripple.offset = ((leveltime-1)*140) + ((rendertimefrac*140) / FRACUNIT);
+}
+
+static bool R_CheckMapPlane(const char* funcname, INT32 y, INT32 x1, INT32 x2)
+{
+	if (x1 == x2)
+		return true;
+
+	if (x1 < x2 && x1 >= 0 && x2 < viewwidth && y >= 0 && y < viewheight)
+		return true;
+
+	CONS_Debug(DBG_RENDER, "%s: x1=%d, x2=%d at y=%d\n", funcname, x1, x2, y);
+	return false;
+}
+
+//
+// R_MapPlane
+//
+// Uses global vars:
+//  basexscale
+//  baseyscale
+//  centerx
+//  viewx
+//  viewy
+//  viewsin
+//  viewcos
+//  viewheight
+static void R_MapPlane(drawspandata_t *ds, spandrawfunc_t *localspanfunc, INT32 y, INT32 x1, INT32 x2, boolean allow_parallel)
+{
+	angle_t angle, planecos, planesin;
+	fixed_t distance = 0, span;
+	size_t pindex;
+
+	(void)allow_parallel;
+
+	if (!R_CheckMapPlane(__func__, y, x1, x2))
+		return;
+
+	angle    = (ds->currentplane->viewangle + ds->currentplane->plangle)>>ANGLETOFINESHIFT;
+	planecos = FINECOSINE(angle);
+	planesin = FINESINE(angle);
+
+	// [RH] Notice that I dumped the caching scheme used by Doom.
+	// It did not offer any appreciable speedup.
+	distance = FixedMul(ds->planeheight, yslope[y]);
+	span     = abs(centery - y);
+
+	if (span) // don't divide by zero
+	{
+		ds->xstep = FixedMul(planesin, ds->planeheight) / span;
+		ds->ystep = FixedMul(planecos, ds->planeheight) / span;
+	}
+	else
+	{
+		ds->xstep = FixedMul(distance, basexscale);
+		ds->ystep = FixedMul(distance, baseyscale);
+	}
+
+	// [RH] Instead of using the xtoviewangle array, I calculated the fractional values
+	// at the middle of the screen, then used the calculated ds_xstep and ds_ystep
+	// to step from those to the proper texture coordinate to start drawing at.
+	// That way, the texture coordinate is always calculated by its position
+	// on the screen and not by its position relative to the edge of the visplane.
+	ds->xfrac = ds->xoffs + FixedMul(planecos, distance) + (x1 - centerx) * ds->xstep;
+	ds->yfrac = ds->yoffs - FixedMul(planesin, distance) + (x1 - centerx) * ds->ystep;
+
+	if (ds->planeripple.active)
+	{
+		ds->bgofs = R_CalculateRippleOffset(ds, y);
+
+		R_CalculatePlaneRipple(ds, ds->currentplane->viewangle + ds->currentplane->plangle);
+
+		ds->xfrac += ds->planeripple.xfrac;
+		ds->yfrac += ds->planeripple.yfrac;
+		ds->bgofs >>= FRACBITS;
+
+		if ((y + ds->bgofs) >= viewheight)
+			ds->bgofs = viewheight-y-1;
+		if ((y + ds->bgofs) < 0)
+			ds->bgofs = -y;
+	}
+
+	pindex = std::min<size_t>(distance >> LIGHTZSHIFT, MAXLIGHTZ - 1);
+
+	ds->colormap = ds->planezlight[pindex];
+
+	if (encoremap && !ds->currentplane->noencore)
+		ds->colormap += COLORMAP_REMAPOFFSET;
+
+	if (ds->currentplane->extra_colormap)
+		ds->colormap = ds->currentplane->extra_colormap->colormap + (ds->colormap - colormaps);
+
+	ds->y  = y;
+	ds->x1 = x1;
+	ds->x2 = x2;
+
+	localspanfunc(ds);
+}
+
+static void R_MapTiltedPlane(drawspandata_t *ds, spandrawfunc_t *localspanfunc, INT32 y, INT32 x1, INT32 x2, boolean allow_parallel)
+{
+	(void)allow_parallel;
+
+	if (!R_CheckMapPlane(__func__, y, x1, x2))
+		return;
+
+	// Water ripple effect
+	if (ds->planeripple.active)
+	{
+		ds->bgofs = R_CalculateRippleOffset(ds, y);
+
+		R_SetTiltedSpan(ds, std::clamp(y, 0, viewheight));
+
+		R_CalculatePlaneRipple(ds, ds->currentplane->viewangle + ds->currentplane->plangle);
+		R_SetSlopePlaneVectors(ds, ds->currentplane, y, (ds->xoffs + ds->planeripple.xfrac), (ds->yoffs + ds->planeripple.yfrac));
+
+		ds->bgofs >>= FRACBITS;
+
+		if ((y + ds->bgofs) >= viewheight)
+			ds->bgofs = viewheight-y-1;
+		if ((y + ds->bgofs) < 0)
+			ds->bgofs = -y;
+	}
+
+	if (ds->currentplane->extra_colormap)
+		ds->colormap = ds->currentplane->extra_colormap->colormap;
+	else
+		ds->colormap = colormaps;
+
+	if (encoremap && !ds->currentplane->noencore)
+	{
+		ds->colormap += COLORMAP_REMAPOFFSET;
+	}
+
+	ds->y  = y;
+	ds->x1 = x1;
+	ds->x2 = x2;
+
+	localspanfunc(ds);
+}
+
+void R_ClearFFloorClips(void)
+{
+	INT32 p;
+
+	// opening / clipping determination
+	for (p = 0; p < MAXFFLOORS; p++)
+	{
+		visffloor_t *fffloor = &ffloor[p];
+		std::fill(fffloor->f_clip, fffloor->f_clip + viewwidth, static_cast<INT16>(viewheight));
+		std::fill(fffloor->c_clip, fffloor->c_clip + viewwidth, static_cast<INT16>(-1));
+	}
+
+	numffloors = 0;
+}
+
+//
+// R_ClearPlanes
+// At begining of frame.
+//
+void R_ClearPlanes(void)
+{
+	INT32 i;
+	angle_t angle;
+
+	// opening / clipping determination
+	std::fill(floorclip, floorclip + viewwidth, static_cast<INT16>(viewheight));
+	std::fill(ceilingclip, ceilingclip + viewwidth, static_cast<INT16>(-1));
+	std::fill(frontscale, frontscale + viewwidth, INT32_MAX);
+
+	R_ClearFFloorClips();
+
+	for (i = 0; i < MAXVISPLANES; i++)
+		for (*freehead = visplanes[i], visplanes[i] = NULL;
+			freehead && *freehead ;)
+		{
+			freehead = &(*freehead)->next;
+		}
+
+	lastopening = openings;
+
+	// left to right mapping
+	angle = (viewangle-ANGLE_90)>>ANGLETOFINESHIFT;
+
+	// scale will be unit scale at SCREENWIDTH/2 distance
+	basexscale =  FixedDiv (FINECOSINE(angle), centerxfrac);
+	baseyscale = -FixedDiv (FINESINE(angle),   centerxfrac);
+}
+
+static visplane_t *new_visplane(unsigned hash)
+{
+	visplane_t *check = freetail;
+
+	if (!check)
+	{
+		check = static_cast<visplane_t*>(calloc(1, sizeof (*check)));
+		if (check == NULL)
+			I_Error("new_visplane: Out of memory");
+		check->top_memory = static_cast<UINT16*>(Z_Malloc(sizeof(UINT16) * (viewwidth + 2), PU_STATIC, NULL));
+		check->bottom_memory = static_cast<UINT16*>(Z_Malloc(sizeof(UINT16) * (viewwidth + 2), PU_STATIC, NULL));
+		check->top = check->top_memory + 1;
+		check->bottom = check->bottom_memory + 1;
+	}
+	else
+	{
+		freetail = freetail->next;
+		if (!freetail)
+			freehead = &freetail;
+	}
+
+	check->next = visplanes[hash];
+	visplanes[hash] = check;
+
+	return check;
+}
+
+//
+// R_FindPlane: Seek a visplane having the identical values:
+//              Same height, same flattexture, same lightlevel.
+//              If not, allocates another of them.
+//
+visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
+	fixed_t xoff, fixed_t yoff, angle_t plangle, extracolormap_t *planecolormap
+			, ffloor_t *pfloor
+			, polyobj_t *polyobj
+			, pslope_t *slope
+			, boolean noencore
+			, boolean reverseLight, const sector_t *lighting_sector)
+{
+	visplane_t *check;
+	unsigned hash;
+
+	if (!slope) // Don't mess with this right now if a slope is involved
+	{
+		if (plangle != 0)
+		{
+			// Must use 64-bit math to avoid an overflow!
+			INT64 vx = xoff + viewx;
+			INT64 vy = yoff - viewy;
+
+			// Add the view offset, rotated by the plane angle.
+			float ang = ANG2RAD(plangle);
+			float x = vx / (float)FRACUNIT;
+			float y = vy / (float)FRACUNIT;
+
+			vx = (x * cos(ang) + y * sin(ang)) * FRACUNIT;
+			vy = (-x * sin(ang) + y * cos(ang)) * FRACUNIT;
+
+			xoff = vx;
+			yoff = vy;
+		}
+		else
+		{
+			xoff += viewx;
+			yoff -= viewy;
+		}
+	}
+
+	if (polyobj)
+	{
+		if (polyobj->angle != 0)
+		{
+			float ang = ANG2RAD(polyobj->angle);
+			float x = FixedToFloat(polyobj->centerPt.x);
+			float y = FixedToFloat(polyobj->centerPt.y);
+			xoff -= FloatToFixed(x * cos(ang) + y * sin(ang));
+			yoff -= FloatToFixed(x * sin(ang) - y * cos(ang));
+		}
+		else
+		{
+			xoff -= polyobj->centerPt.x;
+			yoff += polyobj->centerPt.y;
+		}
+	}
+
+	if (!pfloor)
+	{
+		if (slope != NULL && P_ApplyLightOffset(lightlevel >> LIGHTSEGSHIFT, lighting_sector))
+		{
+			if (reverseLight)
+			{
+				lightlevel -= slope->lightOffset * 8;
+			}
+			else
+			{
+				lightlevel += slope->lightOffset * 8;
+			}
+		}
+
+		hash = visplane_hash(picnum, lightlevel, height);
+
+		for (check = visplanes[hash]; check; check = check->next)
+		{
+			if (polyobj != check->polyobj)
+				continue;
+
+			if (height == check->height && picnum == check->picnum
+				&& lightlevel == check->lightlevel
+				&& xoff == check->xoffs && yoff == check->yoffs
+				&& planecolormap == check->extra_colormap
+				&& check->viewx == viewx && check->viewy == viewy && check->viewz == viewz
+				&& check->viewangle == viewangle
+				&& check->plangle == plangle
+				&& check->slope == slope
+				&& check->noencore == noencore)
+			{
+				return check;
+			}
+		}
+	}
+	else
+	{
+		// This appears to fix the Nimbus Ruins sky bug.
+		if (picnum == skyflatnum)
+		{
+			height     = 0; // all skies map together
+			lightlevel = 0;
+		}
+
+		hash = MAXVISPLANES - 1;
+	}
+
+	check = new_visplane(hash);
+
+	check->height = height;
+	check->picnum = picnum;
+	check->lightlevel = lightlevel;
+	check->minx = vid.width;
+	check->maxx = -1;
+	check->xoffs = xoff;
+	check->yoffs = yoff;
+	check->extra_colormap = planecolormap;
+	check->ffloor = pfloor;
+	check->viewx = viewx;
+	check->viewy = viewy;
+	check->viewz = viewz;
+	check->viewangle = viewangle;
+	check->plangle = plangle;
+	check->polyobj = polyobj;
+	check->slope = slope;
+	check->noencore = noencore;
+	check->cyan = levelflats[picnum].cyan;
+
+	memset(check->top, 0xff, sizeof(*check->top) * viewwidth);
+	memset(check->bottom, 0x00, sizeof(*check->bottom) * viewwidth);
+
+	return check;
+}
+
+//
+// R_CheckPlane: return same visplane or alloc a new one if needed
+//
+visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop)
+{
+	INT32 intrl, intrh;
+	INT32 unionl, unionh;
+	INT32 x;
+
+	if (start < pl->minx)
+	{
+		intrl = pl->minx;
+		unionl = start;
+	}
+	else
+	{
+		unionl = pl->minx;
+		intrl = start;
+	}
+
+	if (stop > pl->maxx)
+	{
+		intrh = pl->maxx;
+		unionh = stop;
+	}
+	else
+	{
+		unionh = pl->maxx;
+		intrh = stop;
+	}
+
+	// 0xff is not equal to -1 with shorts...
+	for (x = intrl; x <= intrh; x++)
+		if (pl->top[x] != 0xffff || pl->bottom[x] != 0x0000)
+			break;
+
+	if (x > intrh) /* Can use existing plane; extend range */
+	{
+		pl->minx = unionl;
+		pl->maxx = unionh;
+	}
+	else /* Cannot use existing plane; create a new one */
+	{
+		visplane_t *new_pl;
+
+		if (pl->ffloor)
+		{
+			new_pl = new_visplane(MAXVISPLANES - 1);
+		}
+		else
+		{
+			unsigned hash = visplane_hash(pl->picnum, pl->lightlevel, pl->height);
+			new_pl = new_visplane(hash);
+		}
+
+		new_pl->height = pl->height;
+		new_pl->picnum = pl->picnum;
+		new_pl->lightlevel = pl->lightlevel;
+		new_pl->xoffs = pl->xoffs;
+		new_pl->yoffs = pl->yoffs;
+		new_pl->extra_colormap = pl->extra_colormap;
+		new_pl->ffloor = pl->ffloor;
+		new_pl->viewx = pl->viewx;
+		new_pl->viewy = pl->viewy;
+		new_pl->viewz = pl->viewz;
+		new_pl->viewangle = pl->viewangle;
+		new_pl->plangle = pl->plangle;
+		new_pl->polyobj = pl->polyobj;
+		new_pl->slope = pl->slope;
+		new_pl->noencore = pl->noencore;
+		new_pl->cyan = pl->cyan;
+		pl = new_pl;
+		pl->minx = start;
+		pl->maxx = stop;
+		memset(pl->top, 0xff, sizeof(*pl->top) * viewwidth);
+		memset(pl->bottom, 0x00, sizeof(*pl->bottom) * viewwidth);
+	}
+
+	return pl;
+}
+
+
+//
+// R_ExpandPlane
+//
+// This function basically expands the visplane.
+// The reason for this is that when creating 3D floor planes, there is no
+// need to create new ones with R_CheckPlane, because 3D floor planes
+// are created by subsector and there is no way a subsector can graphically
+// overlap.
+void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop)
+{
+	// Don't expand polyobject planes here - we do that on our own.
+	if (pl->polyobj)
+		return;
+
+	if (pl->minx > start) pl->minx = start;
+	if (pl->maxx < stop)  pl->maxx = stop;
+}
+
+//
+// R_MakeSpans
+//
+static void R_MakeSpans(void (*mapfunc)(drawspandata_t* ds, void(*spanfunc)(drawspandata_t*), INT32, INT32, INT32, boolean), spandrawfunc_t* localspanfunc, drawspandata_t* ds, INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2, boolean allow_parallel)
+{
+	const INT32 vidheight = vid.height;
+
+	//    Alam: from r_splats's R_RenderFloorSplat
+	if (t1 >= vidheight) t1 = vidheight-1;
+	if (b1 >= vidheight) b1 = vidheight-1;
+	if (t2 >= vidheight) t2 = vidheight-1;
+	if (b2 >= vidheight) b2 = vidheight-1;
+	if (x-1 >= vid.width) x = vid.width;
+
+#ifdef HAVE_THREADS
+	// We want to draw N spans per subtask to ensure the work is
+	// coarse enough to not be too slow due to task scheduling overhead.
+	// To safely do this, we need to copy part of spanstart to a local.
+	// This is essentially loop unrolling across threads.
+	constexpr const int kSpanTaskGranularity = 8;
+	drawspandata_t ds_copy = *ds;
+	while (t1 < t2 && t1 <= b1)
+	{
+		INT32 spanstartcopy[kSpanTaskGranularity] = {0};
+		INT32 taskspans = 0;
+		for (int i = 0; i < kSpanTaskGranularity; i++)
+		{
+			if (!((t1 + i) < t2 && (t1 + i) <= b1))
+			{
+				break;
+			}
+			spanstartcopy[i] = spanstart[t1 + i];
+			taskspans += 1;
+		}
+		auto task = [=]() mutable -> void {
+			for (int i = 0; i < taskspans; i++)
+			{
+				mapfunc(&ds_copy, localspanfunc, t1 + i, spanstartcopy[i], x - 1, false);
+			}
+		};
+		if (allow_parallel)
+		{
+			srb2::g_main_threadpool->schedule(std::move(task));
+		}
+		else
+		{
+			(task)();
+		}
+		t1 += taskspans;
+	}
+	while (b1 > b2 && b1 >= t1)
+	{
+		INT32 spanstartcopy[kSpanTaskGranularity] = {0};
+		INT32 taskspans = 0;
+		for (int i = 0; i < kSpanTaskGranularity; i++)
+		{
+			if (!((b1 - i) > b2 && (b1 - i) >= t1))
+			{
+				break;
+			}
+			spanstartcopy[i] = spanstart[b1 - i];
+			taskspans += 1;
+		}
+		auto task = [=]() mutable -> void {
+			for (int i = 0; i < taskspans; i++)
+			{
+				mapfunc(&ds_copy, localspanfunc, b1 - i, spanstartcopy[i], x - 1, false);
+			}
+		};
+		if (allow_parallel)
+		{
+			srb2::g_main_threadpool->schedule(std::move(task));
+		}
+		else
+		{
+			(task)();
+		}
+		b1 -= taskspans;
+	}
+#else
+	(void)allow_parallel;
+
+	while (t1 < t2 && t1 <= b1)
+	{
+		mapfunc(ds, localspanfunc, t1, spanstart[t1], x - 1, false);
+		t1++;
+	}
+	while (b1 > b2 && b1 >= t1)
+	{
+		mapfunc(ds, localspanfunc, b1, spanstart[b1], x - 1, false);
+		b1--;
+	}
+#endif
+
+	while (t2 < t1 && t2 <= b2)
+		spanstart[t2++] = x;
+	while (b2 > b1 && b2 >= t2)
+		spanstart[b2--] = x;
+}
+
+void R_DrawPlanes(void)
+{
+	visplane_t *pl;
+	INT32 i;
+	drawspandata_t ds = {};
+#ifdef HAVE_THREADS
+	srb2::ThreadPool::Sema tp_sema;
+#endif
+
+	R_UpdatePlaneRipple(&ds);
+
+#ifdef HAVE_THREADS
+	srb2::g_main_threadpool->begin_sema();
+#endif
+	for (i = 0; i < MAXVISPLANES; i++, pl++)
+	{
+		for (pl = visplanes[i]; pl; pl = pl->next)
+		{
+			if (pl->ffloor != NULL || pl->polyobj != NULL)
+				continue;
+
+			R_DrawSinglePlane(&ds, pl, cv_parallelsoftware.value);
+		}
+	}
+#ifdef HAVE_THREADS
+	tp_sema = srb2::g_main_threadpool->end_sema();
+	srb2::g_main_threadpool->notify_sema(tp_sema);
+	srb2::g_main_threadpool->wait_sema(tp_sema);
+#endif
+}
+
+static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc2)(drawcolumndata_t*), boolean allow_parallel);
+
+void R_DrawSkyPlanes(void)
+{
+	visplane_t *pl;
+	INT32 i;
+
+#ifdef HAVE_THREADS
+	srb2::ThreadPool::Sema tp_sema;
+	srb2::g_main_threadpool->begin_sema();
+#endif
+	for (i = 0; i < MAXVISPLANES; i++, pl++)
+	{
+		for (pl = visplanes[i]; pl; pl = pl->next)
+		{
+			if (pl->picnum != skyflatnum || pl->ffloor || pl->polyobj)
+				continue;
+
+			R_DrawSkyPlane(pl, colfunc, cv_parallelsoftware.value);
+		}
+	}
+#ifdef HAVE_THREADS
+	tp_sema = srb2::g_main_threadpool->end_sema();
+	srb2::g_main_threadpool->notify_sema(tp_sema);
+	srb2::g_main_threadpool->wait_sema(tp_sema);
+#endif
+}
+
+static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc2)(drawcolumndata_t*), boolean allow_parallel)
+{
+	INT32 x;
+
+	if (!(pl->minx <= pl->maxx))
+		return;
+
+	// If we're not supposed to draw the sky (e.g. for skyboxes), don't do anything!
+	// This probably utterly ruins sky rendering for FOFs and polyobjects, unfortunately
+	if (!newview->sky)
+	{
+		return;
+	}
+
+	drawcolumndata_t dc = {};
+
+	// Reset column drawer function (note: couldn't we just call walldrawerfunc directly?)
+	// (that is, unless we'll need to switch drawers in future for some reason)
+	R_SetColumnFunc(BASEDRAWFUNC);
+
+	// use correct aspect ratio scale
+	dc.iscale = skyscale;
+
+	// Sky is always drawn full bright,
+	//  i.e. colormaps[0] is used.
+	// Because of this hack, sky is not affected
+	//  by INVUL inverse mapping.
+	dc.colormap = colormaps;
+
+	if (encoremap)
+		dc.colormap += COLORMAP_REMAPOFFSET;
+
+	dc.texturemid = skytexturemid;
+	dc.texheight = textureheight[skytexture] >>FRACBITS;
+	dc.sourcelength = dc.texheight;
+
+	x = pl->minx;
+
+	// Precache the texture so we don't corrupt the zoned heap off-main thread
+	if (!texturecache[texturetranslation[skytexture]])
+	{
+		R_GenerateTexture(texturetranslation[skytexture]);
+	}
+
+#ifdef HAVE_THREADS
+	while (x <= pl->maxx)
+	{
+		// Tune concurrency granularity here to maximize throughput
+		// The cheaper colfunc is, the more coarse the task should be
+		constexpr const int kSkyPlaneMacroColumns = 8;
+
+		auto thunk = [=]() mutable -> void {
+			for (int i = 0; i < kSkyPlaneMacroColumns && i + x <= pl->maxx; i++)
+			{
+				dc.yl = pl->top[x + i];
+				dc.yh = pl->bottom[x + i];
+
+				if (dc.yl > dc.yh)
+				{
+					continue;
+				}
+
+				INT32 angle = (pl->viewangle + xtoviewangle[x + i])>>ANGLETOSKYSHIFT;
+				angle -= (skytextureoffset >> FRACBITS);
+
+				dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x + i]>>ANGLETOFINESHIFT));
+				dc.x = x + i;
+				dc.source =
+					R_GetColumn(texturetranslation[skytexture],
+						-angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
+
+				colfunc2(&dc);
+			}
+		};
+
+		if (allow_parallel)
+		{
+			srb2::g_main_threadpool->schedule(std::move(thunk));
+		}
+		else
+		{
+			(thunk)();
+		}
+
+		x += kSkyPlaneMacroColumns;
+	}
+#else
+	(void)allow_parallel;
+
+	for (x = pl->minx; x <= pl->maxx; x++)
+	{
+		dc.yl = pl->top[x];
+		dc.yh = pl->bottom[x];
+
+		if (dc.yl > dc.yh)
+		{
+			continue;
+		}
+
+		INT32 angle = (pl->viewangle + xtoviewangle[x])>>ANGLETOSKYSHIFT;
+		angle -= (skytextureoffset >> FRACBITS);
+
+		dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x]>>ANGLETOFINESHIFT));
+		dc.x = x;
+		dc.source =
+		R_GetColumn(texturetranslation[skytexture],
+					-angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
+
+		colfunc2(&dc);
+	}
+#endif
+}
+
+// Returns the height of the sloped plane at (x, y) as a 32.16 fixed_t
+static INT64 R_GetSlopeZAt(const pslope_t *slope, fixed_t x, fixed_t y)
+{
+	INT64 x64 = ((INT64)x - (INT64)slope->o.x);
+	INT64 y64 = ((INT64)y - (INT64)slope->o.y);
+
+	x64 = (x64 * (INT64)slope->d.x) / FRACUNIT;
+	y64 = (y64 * (INT64)slope->d.y) / FRACUNIT;
+
+	return (INT64)slope->o.z + ((x64 + y64) * (INT64)slope->zdelta) / FRACUNIT;
+}
+
+// Sets the texture origin vector of the sloped plane.
+static void R_SetSlopePlaneOrigin(drawspandata_t *ds, pslope_t *slope, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xoff, fixed_t yoff, fixed_t angle)
+{
+	floatv3_t *p = &ds->slope_origin;
+
+	INT64 vx = (INT64)xpos + (INT64)xoff;
+	INT64 vy = (INT64)ypos - (INT64)yoff;
+
+	float vxf = vx / (float)FRACUNIT;
+	float vyf = vy / (float)FRACUNIT;
+	float ang = ANG2RAD(ANGLE_270 - angle);
+
+	// p is the texture origin in view space
+	// Don't add in the offsets at this stage, because doing so can result in
+	// errors if the flat is rotated.
+	p->x = vxf * cos(ang) - vyf * sin(ang);
+	p->z = vxf * sin(ang) + vyf * cos(ang);
+	p->y = (R_GetSlopeZAt(slope, -xoff, yoff) - zpos) / (float)FRACUNIT;
+}
+
+// This function calculates all of the vectors necessary for drawing a sloped plane.
+static void R_SetSlopePlane(drawspandata_t* ds, pslope_t *slope, fixed_t xpos, fixed_t ypos, fixed_t zpos, fixed_t xoff, fixed_t yoff, angle_t angle, angle_t plangle)
+{
+	// Potentially override other stuff for now cus we're mean. :< But draw a slope plane!
+	// I copied ZDoom's code and adapted it to SRB2... -Red
+	floatv3_t *m = &ds->slope_v, *n = &ds->slope_u;
+	fixed_t height, temp;
+	float ang;
+
+	R_SetSlopePlaneOrigin(ds, slope, xpos, ypos, zpos, xoff, yoff, angle);
+	height = P_GetSlopeZAt(slope, xpos, ypos);
+	ds->zeroheight = FixedToFloat(height - zpos);
+
+	// m is the v direction vector in view space
+	ang = ANG2RAD(ANGLE_180 - (angle + plangle));
+	m->x = cos(ang);
+	m->z = sin(ang);
+
+	// n is the u direction vector in view space
+	n->x = sin(ang);
+	n->z = -cos(ang);
+
+	plangle >>= ANGLETOFINESHIFT;
+	temp = P_GetSlopeZAt(slope, xpos + FINESINE(plangle), ypos + FINECOSINE(plangle));
+	m->y = FixedToFloat(temp - height);
+	temp = P_GetSlopeZAt(slope, xpos + FINECOSINE(plangle), ypos - FINESINE(plangle));
+	n->y = FixedToFloat(temp - height);
+}
+
+static void R_CalculateSlopeVectors(drawspandata_t* ds)
+{
+	float sfmult = 65536.f;
+
+	// Eh. I tried making this stuff fixed-point and it exploded on me. Here's a macro for the only floating-point vector function I recall using.
+#define CROSS(d, v1, v2) \
+d.x = (v1.y * v2.z) - (v1.z * v2.y);\
+d.y = (v1.z * v2.x) - (v1.x * v2.z);\
+d.z = (v1.x * v2.y) - (v1.y * v2.x)
+	CROSS(ds->sup, ds->slope_origin, ds->slope_v);
+	CROSS(ds->svp, ds->slope_origin, ds->slope_u);
+	CROSS(ds->szp, ds->slope_v, ds->slope_u);
+#undef CROSS
+
+	ds->sup.z *= focallengthf;
+	ds->svp.z *= focallengthf;
+	ds->szp.z *= focallengthf;
+
+	// Premultiply the texture vectors with the scale factors
+	sfmult *= (1 << ds->nflatshiftup);
+
+	ds->sup.x *= sfmult;
+	ds->sup.y *= sfmult;
+	ds->sup.z *= sfmult;
+	ds->svp.x *= sfmult;
+	ds->svp.y *= sfmult;
+	ds->svp.z *= sfmult;
+}
+
+void R_SetTiltedSpan(drawspandata_t* ds, INT32 span)
+{
+	if (ds_su == NULL)
+		ds_su = static_cast<floatv3_t*>(Z_Calloc(sizeof(*ds_su) * vid.height, PU_STATIC, NULL));
+	if (ds_sv == NULL)
+		ds_sv = static_cast<floatv3_t*>(Z_Calloc(sizeof(*ds_sv) * vid.height, PU_STATIC, NULL));
+	if (ds_sz == NULL)
+		ds_sz = static_cast<floatv3_t*>(Z_Calloc(sizeof(*ds_sz) * vid.height, PU_STATIC, NULL));
+
+	ds->sup = ds_su[span];
+	ds->svp = ds_sv[span];
+	ds->szp = ds_sz[span];
+}
+
+static void R_SetSlopePlaneVectors(drawspandata_t* ds, visplane_t *pl, INT32 y, fixed_t xoff, fixed_t yoff)
+{
+	R_SetTiltedSpan(ds, y);
+	R_SetSlopePlane(ds, pl->slope, pl->viewx, pl->viewy, pl->viewz, xoff, yoff, pl->viewangle, pl->plangle);
+	R_CalculateSlopeVectors(ds);
+}
+
+static inline void R_AdjustSlopeCoordinates(drawspandata_t* ds, vector3_t *origin)
+{
+	const fixed_t modmask = ((1 << (32-ds->nflatshiftup)) - 1);
+
+	const fixed_t ox = (origin->x & modmask);
+	const fixed_t oy = -(origin->y & modmask);
+
+	ds->xoffs &= modmask;
+	ds->yoffs &= modmask;
+
+	ds->xoffs -= (origin->x - ox);
+	ds->yoffs += (origin->y + oy);
+}
+
+void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_parallel)
+{
+	INT32 light = 0;
+	INT32 x;
+	INT32 stop;
+	size_t size;
+	INT32 spanfunctype = BASEDRAWFUNC;
+	ffloor_t *rover;
+	levelflat_t *levelflat;
+	void (*mapfunc)(drawspandata_t*, void(*)(drawspandata_t*), INT32, INT32, INT32, boolean) = R_MapPlane;
+
+	if (pl->minx > pl->maxx)
+		return;
+
+	// sky flat
+	if (pl->picnum == skyflatnum)
+	{
+		// horrific
+		if (!newview->sky)
+		{
+			skyVisible = true;
+		}
+
+		return;
+	}
+
+	R_UpdatePlaneRipple(ds);
+
+	ds->planeripple.active = false;
+	R_SetSpanFunc(BASEDRAWFUNC);
+
+	if (pl->polyobj && pl->polyobj->translucency != 0)
+	{
+		spanfunctype = SPANDRAWFUNC_TRANS;
+
+		// Hacked up support for alpha value in software mode Tails 09-24-2002 (sidenote: ported to polys 10-15-2014, there was no time travel involved -Red)
+		if (pl->polyobj->translucency >= NUMTRANSMAPS)
+			return; // Don't even draw it
+		else if (pl->polyobj->translucency > 0)
+			ds->transmap = R_GetTranslucencyTable(pl->polyobj->translucency);
+		else // Opaque, but allow transparent flat pixels
+			spanfunctype = SPANDRAWFUNC_SPLAT;
+
+#ifdef SHITPLANESPARENCY
+		if (spanfunc == spanfuncs[SPANDRAWFUNC_SPLAT] || (pl->extra_colormap && pl->extra_colormap->fog))
+#else
+		if (!pl->extra_colormap || !(pl->extra_colormap->fog & 2))
+#endif
+			light = R_GetSoftLightlevel(pl->lightlevel);
+		else
+			light = LIGHTLEVELS-1;
+	}
+	else
+	{
+		if (pl->ffloor)
+		{
+			// Don't draw planes that shouldn't be drawn.
+			for (rover = pl->ffloor->target->ffloors; rover; rover = rover->next)
+			{
+				if ((pl->ffloor->flags & FF_CUTEXTRA) && (rover->flags & FF_EXTRA))
+				{
+					if (!(rover->flags & FF_EXTRA))
+						continue;
+
+					// The plane is from an extra 3D floor... Check the flags so
+					// there are no undesired cuts.
+					if (((pl->ffloor->flags & (FF_FOG|FF_SWIMMABLE)) == (rover->flags & (FF_FOG|FF_SWIMMABLE)))
+						&& pl->height < *rover->topheight
+						&& pl->height > *rover->bottomheight)
+						return;
+				}
+			}
+
+			if (cv_softcyancut.value && pl->cyan && !(pl->ffloor->flags & FF_RIPPLE))
+				spanfunctype = SPANDRAWFUNC_SPLAT;
+
+			if (pl->ffloor->flags & FF_TRANSLUCENT)
+			{
+				spanfunctype = SPANDRAWFUNC_TRANS;
+
+				// Hacked up support for alpha value in software mode Tails 09-24-2002
+				// ...unhacked by toaster 04-01-2021, re-hacked a little by sphere 19-11-2021
+				// and mercilessly shoved into saturn by chearii 02-02-2025
+				{
+					INT32 trans = (10*((256+12) - pl->ffloor->alpha))/255;
+
+					if (trans >= 10)
+						return; // Don't even draw it
+
+					if (pl->ffloor->blend) // additive, (reverse) subtractive, modulative
+						ds->transmap = R_GetBlendTable(pl->ffloor->blend, trans);
+					else if (!(ds->transmap = R_GetTranslucencyTable(trans)) || trans == 0)
+						spanfunctype = SPANDRAWFUNC_SPLAT; // Opaque, but allow transparent flat pixels
+				}
+
+#ifdef SHITPLANESPARENCY
+				if (spanfunc == spanfuncs[SPANDRAWFUNC_SPLAT] || (pl->extra_colormap && pl->extra_colormap->fog))
+#else
+				if (!pl->extra_colormap || !(pl->extra_colormap->fog & 2))
+#endif
+					light = R_GetSoftLightlevel(pl->lightlevel);
+				else
+					light = LIGHTLEVELS-1;
+			}
+			else if (pl->ffloor->flags & FF_FOG)
+			{
+				spanfunctype = SPANDRAWFUNC_FOG;
+				light = R_GetSoftLightlevel(pl->lightlevel);
+			}
+			else
+				light = R_GetSoftLightlevel(pl->lightlevel);
+
+			if (pl->ffloor->flags & FF_RIPPLE && cv_ripplewater.value)
+			{
+				INT32 top, bottom;
+
+				ds->planeripple.active = true;
+
+				if (spanfunctype == SPANDRAWFUNC_TRANS)
+				{
+					spanfunctype = SPANDRAWFUNC_WATER;
+
+					// Copy the current scene, ugh
+					top    = std::max(0, pl->high - 8);
+					bottom = std::min(viewheight, pl->low + 8);
+
+					// Only copy the part of the screen we need
+					UINT8 i = R_GetViewNumber();
+					INT32 scrx = 0;
+					INT32 scry = top;
+					INT32 offset;
+
+					if (splitscreen == 1)
+					{
+						if (i & 1)
+						{
+							scry += viewheight;
+						}
+					}
+					else
+					{
+						if (i & 1)
+						{
+							scrx += viewwidth;
+						}
+
+						if (i / 2)
+						{
+							scry += viewheight;
+						}
+					}
+
+					offset = (scry*vid.width) + scrx;
+
+					// No idea if this works
+					VID_BlitLinearScreen(renderscreen + offset,
+										 vid.screens[1] + (top*vid.width), // intentionally not +offset
+										 viewwidth, bottom-top,
+										 vid.width, vid.width);
+				}
+			}
+		}
+		else
+			light = R_GetSoftLightlevel(pl->lightlevel);
+	}
+
+	ds->currentplane = pl;
+
+	levelflat = &levelflats[pl->picnum];
+
+	// Get the texture
+	ds->source = R_GetFlat(levelflat->lumpnum);
+
+	if (ds->source == NULL)
+		return;
+
+	size = W_LumpLength(levelflat->lumpnum);
+
+	switch (size)
+	{
+		case 4194304: // 2048x2048 lump
+			ds->nflatmask = 0x3FF800;
+			ds->nflatxshift = 21;
+			ds->nflatyshift = 10;
+			ds->nflatshiftup = 5;
+			break;
+		case 1048576: // 1024x1024 lump
+			ds->nflatmask = 0xFFC00;
+			ds->nflatxshift = 22;
+			ds->nflatyshift = 12;
+			ds->nflatshiftup = 6;
+			break;
+		case 262144:// 512x512 lump'
+			ds->nflatmask = 0x3FE00;
+			ds->nflatxshift = 23;
+			ds->nflatyshift = 14;
+			ds->nflatshiftup = 7;
+			break;
+		case 65536: // 256x256 lump
+			ds->nflatmask = 0xFF00;
+			ds->nflatxshift = 24;
+			ds->nflatyshift = 16;
+			ds->nflatshiftup = 8;
+			break;
+		case 16384: // 128x128 lump
+			ds->nflatmask = 0x3F80;
+			ds->nflatxshift = 25;
+			ds->nflatyshift = 18;
+			ds->nflatshiftup = 9;
+			break;
+		case 1024: // 32x32 lump
+			ds->nflatmask = 0x3E0;
+			ds->nflatxshift = 27;
+			ds->nflatyshift = 22;
+			ds->nflatshiftup = 11;
+			break;
+		default: // 64x64 lump
+			ds->nflatmask = 0xFC0;
+			ds->nflatxshift = 26;
+			ds->nflatyshift = 20;
+			ds->nflatshiftup = 10;
+			break;
+	}
+
+	ds->xoffs = pl->xoffs;
+	ds->yoffs = pl->yoffs;
+
+	light = CLAMP(light, 0, LIGHTLEVELS-1);
+
+	if (pl->slope)
+	{
+		mapfunc = R_MapTiltedPlane;
+
+		if (!pl->plangle)
+		{
+			R_AdjustSlopeCoordinates(ds, &pl->slope->o);
+		}
+
+		if (ds->planeripple.active)
+		{
+			ds->planeheight = abs(P_GetSlopeZAt(pl->slope, pl->viewx, pl->viewy) - pl->viewz);
+
+			R_PlaneBounds(pl);
+
+			for (x = pl->high; x < pl->low; x++)
+			{
+				ds->bgofs = R_CalculateRippleOffset(ds, x);
+				R_CalculatePlaneRipple(ds, pl->viewangle + pl->plangle);
+				R_SetSlopePlaneVectors(ds, pl, x, (ds->xoffs + ds->planeripple.xfrac), (ds->yoffs + ds->planeripple.yfrac));
+			}
+		}
+		else
+			R_SetSlopePlaneVectors(ds, pl, 0, ds->xoffs, ds->yoffs);
+
+		switch (spanfunctype)
+		{
+			case SPANDRAWFUNC_WATER:
+				spanfunctype = SPANDRAWFUNC_TILTEDWATER;
+				break;
+			case SPANDRAWFUNC_TRANS:
+				spanfunctype = SPANDRAWFUNC_TILTEDTRANS;
+				break;
+			case SPANDRAWFUNC_SPLAT:
+				spanfunctype = SPANDRAWFUNC_TILTEDSPLAT;
+				break;
+			case SPANDRAWFUNC_TRANSSPLAT:
+				spanfunctype = SPANDRAWFUNC_TILTEDTRANSSPLAT;
+				break;
+			case SPANDRAWFUNC_FOG:
+				spanfunctype = SPANDRAWFUNC_TILTEDFOG;
+				break;
+			default:
+				spanfunctype = SPANDRAWFUNC_TILTED;
+				break;
+		}
+
+		ds->planezlight = scalelight[light];
+	}
+	else
+	{
+		// Don't mess with angle on slopes! We'll handle this ourselves later
+		if (viewangle != pl->viewangle + pl->plangle)
+		{
+			viewangle = pl->viewangle + pl->plangle;
+		}
+
+		ds->planeheight = abs(pl->height - pl->viewz);
+		ds->planezlight = zlight[light];
+	}
+
+	R_SetSpanFunc(spanfunctype);
+
+	// set the maximum value for unsigned
+	pl->top[pl->maxx+1]    = pl->top[pl->minx-1]    = 0xffff;
+	pl->bottom[pl->maxx+1] = pl->bottom[pl->minx-1] = 0x0000;
+
+	stop = pl->maxx + 1;
+
+	for (x = pl->minx; x <= stop; x++)
+	{
+		R_MakeSpans(mapfunc, spanfunc, ds, x, pl->top[x-1], pl->bottom[x-1], pl->top[x], pl->bottom[x], allow_parallel);
+	}
+
+/*
+QUINCUNX anti-aliasing technique (sort of)
+
+Normally, Quincunx antialiasing staggers pixels
+in a 5-die pattern like so:
+
+o   o
+  o
+o   o
+
+To simulate this, we offset the plane by
+FRACUNIT/4 in each direction, and draw
+at 50% translucency. The result is
+a 'smoothing' of the texture while
+using the palette colors.
+*/
+#ifdef QUINCUNX
+	if (spanfunc == spanfuncs[BASEDRAWFUNC])
+	{
+		INT32 i;
+
+		ds->transmap = R_GetTranslucencyTable(tr_trans50);
+
+		R_SetSpanFunc(SPANDRAWFUNC_TRANS);
+
+		for (i = 0; i < 4; i++)
+		{
+			ds->xoffs = pl->xoffs;
+			ds->yoffs = pl->yoffs;
+
+			switch(i)
+			{
+				case 0:
+					ds->xoffs -= FRACUNIT/4;
+					ds->yoffs -= FRACUNIT/4;
+					break;
+				case 1:
+					ds->xoffs -= FRACUNIT/4;
+					ds->yoffs += FRACUNIT/4;
+					break;
+				case 2:
+					ds->xoffs += FRACUNIT/4;
+					ds->yoffs -= FRACUNIT/4;
+					break;
+				case 3:
+					ds->xoffs += FRACUNIT/4;
+					ds->yoffs += FRACUNIT/4;
+					break;
+			}
+			ds->planeheight = abs(pl->height - pl->viewz);
+
+			if (light >= LIGHTLEVELS)
+				light = LIGHTLEVELS-1;
+
+			if (light < 0)
+				light = 0;
+
+			ds->planezlight = zlight[light];
+
+			// set the maximum value for unsigned
+			pl->top[pl->maxx+1] = 0xffff;
+			pl->top[pl->minx-1] = 0xffff;
+			pl->bottom[pl->maxx+1] = 0x0000;
+			pl->bottom[pl->minx-1] = 0x0000;
+
+			stop = pl->maxx + 1;
+
+			for (x = pl->minx; x <= stop; x++)
+				R_MakeSpans(x, pl->top[x-1], pl->bottom[x-1],
+					pl->top[x], pl->bottom[x]);
+		}
+	}
+#endif
+}
+
+void R_PlaneBounds(visplane_t *plane)
+{
+	INT32 i;
+	INT32 hi, low;
+
+	hi = plane->top[plane->minx];
+	low = plane->bottom[plane->minx];
+
+	for (i = plane->minx + 1; i <= plane->maxx; i++)
+	{
+		if (plane->top[i] < hi)
+			hi = plane->top[i];
+		if (plane->bottom[i] > low)
+			low = plane->bottom[i];
+	}
+
+	plane->high = hi;
+	plane->low = low;
+}
diff --git a/src/r_plane.h b/src/r_plane.h
index 96217b387..f330baa3d 100644
--- a/src/r_plane.h
+++ b/src/r_plane.h
@@ -14,10 +14,15 @@
 #ifndef __R_PLANE__
 #define __R_PLANE__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "screen.h" // needs MAXVIDWIDTH/MAXVIDHEIGHT
 #include "r_data.h"
 #include "p_polyobj.h"
 
+//SoM: 3/23/2000: Use Boom visplane hashing.
 #define VISPLANEHASHBITS 9
 #define VISPLANEHASHMASK ((1<<VISPLANEHASHBITS)-1)
 // the last visplane list is outside of the hash table and is used for fof planes
@@ -42,9 +47,8 @@ typedef struct visplane_s
 	// colormaps per sector
 	extracolormap_t *extra_colormap;
 
-	// leave pads for [minx-1]/[maxx+1]
-	UINT16 padtopstart, top[MAXVIDWIDTH], padtopend;
-	UINT16 padbottomstart, bottom[MAXVIDWIDTH], padbottomend;
+	UINT16 *top, *top_memory;
+	UINT16 *bottom, *bottom_memory;
 	INT32 high, low; // R_PlaneBounds should set these.
 
 	fixed_t xoffs, yoffs; // Scrolling flats.
@@ -54,8 +58,11 @@ typedef struct visplane_s
 	pslope_t *slope;
 
 	boolean noencore;
+	boolean cyan;
 } visplane_t;
 
+extern visplane_t *visplanes[MAXVISPLANES];
+
 extern visplane_t *floorplane;
 extern visplane_t *ceilingplane;
 
@@ -63,38 +70,29 @@ extern visplane_t *ceilingplane;
 extern INT16 *lastopening, *openings;
 extern size_t maxopenings;
 
-extern INT16 floorclip[MAXVIDWIDTH], ceilingclip[MAXVIDWIDTH];
-extern fixed_t frontscale[MAXVIDWIDTH], yslopetab[MAXVIDHEIGHT*16];
-extern fixed_t cachedheight[MAXVIDHEIGHT];
-extern fixed_t cacheddistance[MAXVIDHEIGHT];
-extern fixed_t cachedxstep[MAXVIDHEIGHT];
-extern fixed_t cachedystep[MAXVIDHEIGHT];
+extern INT16 *floorclip, *ceilingclip;
+extern fixed_t *frontscale, *yslopetab;
 extern fixed_t basexscale, baseyscale;
 
 extern fixed_t *yslope;
-extern lighttable_t **planezlight;
 
-void R_InitPlanes(void);
-void R_PortalStoreClipValues(INT32 start, INT32 end, INT16 *ceil, INT16 *floor, fixed_t *scale);
-void R_PortalRestoreClipValues(INT32 start, INT32 end, INT16 *ceil, INT16 *floor, fixed_t *scale);
+void R_AllocPlaneMemory(void);
 void R_ClearPlanes(void);
+void R_ClearFFloorClips (void);
 
-void R_MapPlane(INT32 y, INT32 x1, INT32 x2);
-void R_MakeSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2);
+void R_DrawSkyPlanes(void);
 void R_DrawPlanes(void);
-void R_CalculateSlopeVectors(pslope_t *slope, fixed_t planeviewx, fixed_t planeviewy, fixed_t planeviewz, fixed_t planexscale, fixed_t planeyscale, fixed_t planexoffset, fixed_t planeyoffset, angle_t planeviewangle, angle_t planeangle, float fudge);
+
 visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel, fixed_t xoff, fixed_t yoff, angle_t plangle,
 	extracolormap_t *planecolormap, ffloor_t *ffloor
 	, polyobj_t *polyobj
 	, pslope_t *slope
-	, boolean noencore);
+	, boolean noencore
+	, boolean reverseLight, const sector_t *lighting_sector);
 visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop);
 void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop);
 void R_PlaneBounds(visplane_t *plane);
 
-// Draws a single visplane.
-void R_DrawSinglePlane(visplane_t *pl);
-
 typedef struct planemgr_s
 {
 	visplane_t *plane;
@@ -103,8 +101,8 @@ typedef struct planemgr_s
 	fixed_t b_pos; // B for Back sector
 	fixed_t f_frac, f_step;
 	fixed_t b_frac, b_step;
-	INT16 f_clip[MAXVIDWIDTH];
-	INT16 c_clip[MAXVIDWIDTH];
+	INT16 *f_clip;
+	INT16 *c_clip;
 
 	// For slope rendering; the height at the other end
 	fixed_t f_pos_slope;
@@ -118,4 +116,9 @@ typedef struct planemgr_s
 
 extern visffloor_t ffloor[MAXFFLOORS];
 extern INT32 numffloors;
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/r_portal.c b/src/r_portal.c
new file mode 100644
index 000000000..432e3f50d
--- /dev/null
+++ b/src/r_portal.c
@@ -0,0 +1,356 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by Kart Krew.
+// Copyright (C) 2020 by Sonic Team Junior.
+// Copyright (C) 2000 by DooM Legacy Team.
+// Copyright (C) 1996 by id Software, Inc.
+//
+// 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  r_portal.c
+/// \brief Software renderer portals.
+
+#include "r_portal.h"
+#include "r_plane.h"
+#include "r_main.h"
+#include "doomstat.h"
+#include "p_spec.h" // Skybox viewpoints
+#include "z_zone.h"
+#include "r_things.h"
+#include "r_sky.h"
+
+UINT8 portalrender;			/**< When rendering a portal, it establishes the depth of the current BSP traversal. */
+
+// Linked list for portals.
+portal_t *portal_base, *portal_cap;
+
+line_t *portalclipline;
+sector_t *portalcullsector;
+INT32 portalclipstart, portalclipend;
+
+portal_t *g_portal; // is curline a portal seg?
+
+void Portal_InitList (void)
+{
+	portalrender = 0;
+	portal_base = portal_cap = NULL;
+}
+
+/** Store the clipping window for a portal in its given range.
+ *
+ * The window is copied from the current window at the time
+ * the function is called, so it is useful for converting one-sided
+ * lines into portals.
+ */
+static void Portal_ClipRange (portal_t* portal)
+{
+	INT32 start	= portal->start;
+	INT32 end	= portal->end;
+	INT16 *ceil		= portal->ceilingclip;
+	INT16 *floor	= portal->floorclip;
+	fixed_t *scale	= portal->frontscale;
+
+	INT32 i;
+	for (i = 0; i < end-start; i++)
+	{
+		*ceil = ceilingclip[start+i];
+		ceil++;
+		*floor = floorclip[start+i];
+		floor++;
+		*scale = frontscale[start+i];
+		scale++;
+	}
+}
+
+/** Apply the clipping window from a portal.
+ */
+void Portal_ClipApply (const portal_t* portal)
+{
+	INT32 i;
+	INT32 start	= portal->start;
+	INT32 end	= portal->end;
+	INT16 *ceil		= portal->ceilingclip;
+	INT16 *floor	= portal->floorclip;
+	fixed_t *scale	= portal->frontscale;
+
+	for (i = 0; i < end-start; i++)
+	{
+		ceilingclip[start+i] = *ceil;
+		ceil++;
+		floorclip[start+i] = *floor;
+		floor++;
+		frontscale[start+i] = *scale;
+		scale++;
+	}
+
+	// HACKS FOLLOW
+	for (i = 0; i < start; i++)
+	{
+		floorclip[i] = -1;
+		ceilingclip[i] = (INT16)viewheight;
+	}
+
+	for (i = end; i < vid.width; i++)
+	{
+		floorclip[i] = -1;
+		ceilingclip[i] = (INT16)viewheight;
+	}
+}
+
+static portal_t* Portal_Add (const INT16 x1, const INT16 x2)
+{
+	portal_t *portal		= Z_Malloc(sizeof(portal_t), PU_LEVEL, NULL);
+	INT16 *ceilingclipsave	= Z_Malloc(sizeof(INT16)*(x2-x1 + 1), PU_LEVEL, NULL);
+	INT16 *floorclipsave	= Z_Malloc(sizeof(INT16)*(x2-x1 + 1), PU_LEVEL, NULL);
+	fixed_t *frontscalesave	= Z_Malloc(sizeof(fixed_t)*(x2-x1 + 1), PU_LEVEL, NULL);
+
+	// Linked list.
+	if (!portal_base)
+	{
+		portal_base	= portal;
+		portal_cap	= portal;
+	}
+	else
+	{
+		portal_cap->next = portal;
+		portal_cap = portal;
+	}
+	portal->next = NULL;
+
+	// Store clipping values so they can be restored once the portal is rendered.
+	portal->ceilingclip = ceilingclipsave;
+	portal->floorclip   = floorclipsave;
+	portal->frontscale  = frontscalesave;
+	portal->start       = x1;
+	portal->end         = x2;
+
+	// Increase recursion level.
+	portal->pass = portalrender+1;
+
+	return portal;
+}
+
+void Portal_Remove (portal_t* portal)
+{
+	portalcullsector = NULL;
+	portal_base = portal->next;
+	Z_Free(portal->ceilingclip);
+	Z_Free(portal->floorclip);
+	Z_Free(portal->frontscale);
+	Z_Free(portal);
+}
+
+/** Creates a portal out of two lines and a determined screen range.
+ *
+ * line1 determines the entrance, and line2 the exit.
+ * x1 and x2 determine the screen's column bounds.
+
+ * The view's offset from the entry line center is obtained,
+ * and then rotated&translated to the exit line's center.
+ * When the portal renders, it will create the illusion of
+ * the two lines being seamed together.
+ */
+void Portal_Add2Lines (const INT32 line1, const INT32 line2, const INT32 x1, const INT32 x2)
+{
+	portal_t* portal = Portal_Add(x1, x2);
+
+	// Offset the portal view by the linedef centers
+	line_t* start	= &lines[line1];
+	line_t* dest	= &lines[line2];
+
+	angle_t dangle = R_PointToAngle2(0,0,dest->dx,dest->dy) - R_PointToAngle2(start->dx,start->dy,0,0);
+
+	fixed_t disttopoint;
+	angle_t angtopoint;
+
+	vertex_t dest_c, start_c;
+
+	portal->viewx = viewx;
+	portal->viewy = viewy;
+	portal->viewz = viewz;
+
+	// looking glass center
+	start_c.x = (start->v1->x + start->v2->x) / 2;
+	start_c.y = (start->v1->y + start->v2->y) / 2;
+
+	// other side center
+	dest_c.x = (dest->v1->x + dest->v2->x) / 2;
+	dest_c.y = (dest->v1->y + dest->v2->y) / 2;
+
+	portal->viewz = viewz + dest->frontsector->floorheight - start->frontsector->floorheight;
+
+	if (dangle == 0)
+	{
+		// the entrance goes straight opposite the exit, so we just need to mess with the offset.
+		portal->viewx += dest_c.x - start_c.x;
+		portal->viewy += dest_c.y - start_c.y;
+	}
+	else
+	{
+		disttopoint = R_PointToDist2(start_c.x, start_c.y, viewx, viewy);
+		angtopoint = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy);
+		angtopoint += dangle;
+
+		portal->viewx = dest_c.x + FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
+		portal->viewy = dest_c.y + FixedMul(FINESINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
+	}
+
+	portal->viewangle = viewangle + dangle;
+
+	portal->clipline = line2;
+
+	Portal_ClipRange(portal);
+
+	g_portal = portal; // this tells R_StoreWallRange that curline is a portal seg
+}
+
+/** Store the clipping window for a portal using a visplane.
+ *
+ * Since visplanes top/bottom windows work in an identical way,
+ * it can just be copied almost directly.
+ */
+static void Portal_ClipVisplane (const visplane_t* plane, portal_t* portal)
+{
+	INT16 start	= portal->start;
+	INT16 end	= portal->end;
+	INT32 i;
+
+	for (i = 0; i < end - start; i++)
+	{
+		// Invalid column.
+		if (plane->top[i + start] == 65535)
+		{
+			portal->ceilingclip[i] = -1;
+			portal->floorclip[i] = -1;
+			continue;
+		}
+		portal->ceilingclip[i] = plane->top[i + start] - 1;
+		portal->floorclip[i] = plane->bottom[i + start] + 1;
+		portal->frontscale[i] = INT32_MAX;
+	}
+}
+
+extern INT32 viewwidth;
+
+static boolean TrimVisplaneBounds (const visplane_t* plane, INT16* start, INT16* end)
+{
+	*start = plane->minx;
+	*end = plane->maxx + 1;
+
+	// Visplanes have 1-px pads on their sides (extra columns).
+	// Trim them, else it may render out of bounds.
+	if (*end > viewwidth)
+		*end = viewwidth;
+
+	if (!(*start < *end))
+		return true;
+
+
+	/** Trims a visplane's horizontal gap to match its render area.
+	 *
+	 * Visplanes' minx/maxx may sometimes exceed the area they're
+	 * covering. This merely adjusts the boundaries to the next
+	 * valid area.
+	 */
+
+	while (plane->bottom[*start] == 0 && plane->top[*start] == 65535 && *start < *end)
+	{
+		(*start)++;
+	}
+
+
+	while (plane->bottom[*end - 1] == 0 && plane->top[*start] == 65535 && *end > *start)
+	{
+		(*end)--;
+	}
+
+	return false;
+}
+
+/** Creates a skybox portal out of a visplane.
+ *
+ * Applies the necessary offsets and rotation to give
+ * a depth illusion to the skybox.
+ */
+void Portal_AddSkybox(const visplane_t* plane)
+{
+	INT16 start, end;
+	mapheader_t *mh;
+	portal_t* portal;
+
+	if (TrimVisplaneBounds(plane, &start, &end))
+		return;
+
+	portal = Portal_Add(start, end);
+
+	Portal_ClipVisplane(plane, portal);
+
+	portal->viewx = skyboxmo[0]->x;
+	portal->viewy = skyboxmo[0]->y;
+	portal->viewz = skyboxmo[0]->z;
+	if (skyboxmo[0]->spawnpoint)
+		portal->viewz = ((fixed_t)skyboxmo[0]->spawnpoint->angle)<<FRACBITS;
+
+	portal->viewangle = viewangle + skyboxmo[0]->angle;
+
+	mh = mapheaderinfo[gamemap-1];
+
+	// If a relative viewpoint exists, offset the viewpoint.
+	if (skyboxmo[1])
+	{
+		fixed_t x = 0, y = 0;
+		angle_t ang = skyboxmo[0]->angle>>ANGLETOFINESHIFT;
+
+		if (mh->skybox_scalex > 0)
+			x = (viewx - skyboxmo[1]->x) / mh->skybox_scalex;
+		else if (mh->skybox_scalex < 0)
+			x = (viewx - skyboxmo[1]->x) * -mh->skybox_scalex;
+
+		if (mh->skybox_scaley > 0)
+			y = (viewy - skyboxmo[1]->y) / mh->skybox_scaley;
+		else if (mh->skybox_scaley < 0)
+			y = (viewy - skyboxmo[1]->y) * -mh->skybox_scaley;
+
+		// Apply transform to account for the skybox viewport angle.
+		portal->viewx += FixedMul(x,FINECOSINE(ang)) - FixedMul(y,  FINESINE(ang));
+		portal->viewy += FixedMul(x,  FINESINE(ang)) + FixedMul(y,FINECOSINE(ang));
+	}
+
+	if (mh->skybox_scalez > 0)
+		portal->viewz += viewz / mh->skybox_scalez;
+	else if (mh->skybox_scalez < 0)
+		portal->viewz += viewz * -mh->skybox_scalez;
+
+	portal->clipline = -1;
+}
+
+/** Creates portals for the currently existing sky visplanes.
+ * The visplanes are also removed and cleared from the list.
+ */
+void Portal_AddSkyboxPortals(void)
+{
+	visplane_t *pl;
+	INT32 i;
+	UINT16 count = 0;
+
+	for (i = 0; i < MAXVISPLANES; i++, pl++)
+	{
+		for (pl = visplanes[i]; pl; pl = pl->next)
+		{
+			if (pl->picnum == skyflatnum)
+			{
+				Portal_AddSkybox(pl);
+
+				pl->minx = 0;
+				pl->maxx = -1;
+
+				count++;
+			}
+		}
+	}
+
+	CONS_Debug(DBG_RENDER, "Skybox portals: %d\n", count);
+}
+
diff --git a/src/r_portal.h b/src/r_portal.h
new file mode 100644
index 000000000..223dd83be
--- /dev/null
+++ b/src/r_portal.h
@@ -0,0 +1,68 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1993-1996 by id Software, Inc.
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-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  r_portal.h
+/// \brief Software renderer portal struct, functions, linked list extern.
+
+#ifndef __R_PORTAL__
+#define __R_PORTAL__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "r_data.h"
+#include "r_plane.h" // visplanes
+
+/** Portal structure for the software renderer.
+ */
+typedef struct portal_s
+{
+	struct portal_s *next;
+
+	// Viewport.
+	fixed_t viewx;
+	fixed_t viewy;
+	fixed_t viewz;
+	angle_t viewangle;
+
+	UINT8 pass;			/**< Keeps track of the portal's recursion depth. */
+	INT32 clipline;		/**< Optional clipline for line-based portals. */
+
+	// Clipping information.
+	INT32 start;		/**< First horizontal pixel coordinate to draw at. */
+	INT32 end;			/**< Last horizontal pixel coordinate to draw at. */
+	INT16 *ceilingclip; /**< Temporary screen top clipping array. */
+	INT16 *floorclip;	/**< Temporary screen bottom clipping array. */
+	fixed_t *frontscale;/**< Temporary screen bottom clipping array. */
+} portal_t;
+
+extern portal_t* portal_base;
+extern portal_t* portal_cap;
+extern UINT8 portalrender;
+
+extern line_t *portalclipline;
+extern sector_t *portalcullsector;
+extern INT32 portalclipstart, portalclipend;
+
+void Portal_InitList	(void);
+void Portal_Remove		(portal_t* portal);
+void Portal_Add2Lines	(const INT32 line1, const INT32 line2, const INT32 x1, const INT32 x2);
+
+void Portal_ClipApply (const portal_t* portal);
+
+void Portal_AddSkybox(const visplane_t* plane);
+void Portal_AddSkyboxPortals(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif
diff --git a/src/r_segs.c b/src/r_segs.cpp
similarity index 52%
rename from src/r_segs.c
rename to src/r_segs.cpp
index 3a0e4338a..cc4f70fe5 100644
--- a/src/r_segs.c
+++ b/src/r_segs.cpp
@@ -15,15 +15,24 @@
 #include "r_local.h"
 #include "r_sky.h"
 
+#include "r_portal.h"
 #include "r_splats.h"
+#include "r_fps.h" // newview
 
 #include "w_wad.h"
 #include "z_zone.h"
 #include "d_netcmd.h"
 #include "m_misc.h"
 #include "p_local.h" // Camera...
+#include "p_setup.h"
 #include "p_slopes.h"
 #include "console.h" // con_clipviewtop
+#include "screen.h"
+
+#include "core/memory.h"
+
+#define HEIGHTBITS              12
+#define HEIGHTUNIT              (1<<HEIGHTBITS)
 
 // OPTIMIZE: closed two sided lines as single sided
 
@@ -34,6 +43,7 @@ static boolean markceiling;
 
 static boolean maskedtexture;
 static INT32 toptexture, bottomtexture, midtexture;
+static bool topremap, bottomremap, midremap;
 static INT32 numthicksides, numbackffloors;
 
 angle_t rw_normalangle;
@@ -71,172 +81,6 @@ static lighttable_t **walllights;
 static INT16 *maskedtexturecol;
 static fixed_t *maskedtextureheight = NULL;
 
-// ==========================================================================
-// R_Splats Wall Splats Drawer
-// ==========================================================================
-
-#ifdef WALLSPLATS
-static INT16 last_ceilingclip[MAXVIDWIDTH];
-static INT16 last_floorclip[MAXVIDWIDTH];
-
-static void R_DrawSplatColumn(column_t *column)
-{
-	INT32 topscreen, bottomscreen;
-	fixed_t basetexturemid;
-	INT32 topdelta, prevdelta = -1;
-
-	basetexturemid = dc_texturemid;
-
-	for (; column->topdelta != 0xff ;)
-	{
-		// calculate unclipped screen coordinates for post
-		topdelta = column->topdelta;
-		if (topdelta <= prevdelta)
-			topdelta += prevdelta;
-		prevdelta = topdelta;
-		topscreen = sprtopscreen + spryscale*topdelta;
-		bottomscreen = topscreen + spryscale*column->length;
-
-		dc_yl = (topscreen+FRACUNIT-1)>>FRACBITS;
-		dc_yh = (bottomscreen-1)>>FRACBITS;
-
-		if (dc_yh >= last_floorclip[dc_x])
-			dc_yh = last_floorclip[dc_x] - 1;
-		if (dc_yl <= last_ceilingclip[dc_x])
-			dc_yl = last_ceilingclip[dc_x] + 1;
-		if (dc_yl <= dc_yh && dl_yh < vid.height && yh > 0)
-		{
-			dc_source = (UINT8 *)column + 3;
-			dc_texturemid = basetexturemid - (topdelta<<FRACBITS);
-
-			// Drawn by R_DrawColumn.
-			colfunc();
-		}
-		column = (column_t *)((UINT8 *)column + column->length + 4);
-	}
-
-	dc_texturemid = basetexturemid;
-}
-
-static void R_DrawWallSplats(void)
-{
-	wallsplat_t *splat;
-	seg_t *seg;
-	angle_t angle, angle1, angle2;
-	INT32 x1, x2;
-	size_t pindex;
-	column_t *col;
-	patch_t *patch;
-	fixed_t texturecolumn;
-
-	splat = (wallsplat_t *)linedef->splats;
-
-	I_Assert(splat != NULL);
-
-	seg = ds_p->curline;
-
-	// draw all splats from the line that touches the range of the seg
-	for (; splat; splat = splat->next)
-	{
-		angle1 = R_PointToAngle(splat->v1.x, splat->v1.y);
-		angle2 = R_PointToAngle(splat->v2.x, splat->v2.y);
-		angle1 = (angle1 - viewangle + ANGLE_90)>>ANGLETOFINESHIFT;
-		angle2 = (angle2 - viewangle + ANGLE_90)>>ANGLETOFINESHIFT;
-		// out of the viewangletox lut
-		/// \todo clip it to the screen
-		if (angle1 > FINEANGLES/2 || angle2 > FINEANGLES/2)
-			continue;
-		x1 = viewangletox[angle1];
-		x2 = viewangletox[angle2];
-
-		if (x1 >= x2)
-			continue; // does not cross a pixel
-
-		// splat is not in this seg range
-		if (x2 < ds_p->x1 || x1 > ds_p->x2)
-			continue;
-
-		if (x1 < ds_p->x1)
-			x1 = ds_p->x1;
-		if (x2 > ds_p->x2)
-			x2 = ds_p->x2;
-		if (x2 <= x1)
-			continue;
-
-		// calculate incremental stepping values for texture edges
-		rw_scalestep = ds_p->scalestep;
-		spryscale = ds_p->scale1 + (x1 - ds_p->x1)*rw_scalestep;
-		mfloorclip = floorclip;
-		mceilingclip = ceilingclip;
-
-		patch = W_CachePatchNum(splat->patch, PU_CACHE);
-
-		dc_texturemid = splat->top + (SHORT(patch->height)<<(FRACBITS-1)) - viewz;
-		if (splat->yoffset)
-			dc_texturemid += *splat->yoffset;
-
-		sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-
-		// set drawing mode
-		switch (splat->flags & SPLATDRAWMODE_MASK)
-		{
-			case SPLATDRAWMODE_OPAQUE:
-				colfunc = basecolfunc;
-				break;
-			case SPLATDRAWMODE_TRANS:
-				if (!cv_translucency.value)
-					colfunc = basecolfunc;
-				else
-				{
-					dc_transmap = transtables + ((tr_trans50 - 1)<<FF_TRANSSHIFT);
-					colfunc = fuzzcolfunc;
-				}
-
-				break;
-			case SPLATDRAWMODE_SHADE:
-				colfunc = shadecolfunc;
-				break;
-		}
-
-		dc_texheight = 0;
-
-		// draw the columns
-		for (dc_x = x1; dc_x <= x2; dc_x++, spryscale += rw_scalestep)
-		{
-			pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
-			if (pindex >= MAXLIGHTSCALE)
-				pindex = MAXLIGHTSCALE - 1;
-			dc_colormap = walllights[pindex];
-			if (encoremap && !(seg->linedef->flags & ML_TFERLINE))
-				dc_colormap += COLORMAP_REMAPOFFSET;
-
-			if (frontsector->extra_colormap)
-				dc_colormap = frontsector->extra_colormap->colormap + (dc_colormap - colormaps);
-
-			sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-			dc_iscale = 0xffffffffu / (unsigned)spryscale;
-
-			// find column of patch, from perspective
-			angle = (rw_centerangle + xtoviewangle[dc_x])>>ANGLETOFINESHIFT;
-				texturecolumn = rw_offset2 - splat->offset
-					- FixedMul(FINETANGENT(angle), rw_distance);
-
-			// FIXME!
-			texturecolumn >>= FRACBITS;
-			if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
-				continue;
-
-			// draw the texture
-			col = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn]));
-			R_DrawSplatColumn(col);
-		}
-	} // next splat
-
-	colfunc = basecolfunc;
-}
-
-#endif //WALLSPLATS
-
 // ==========================================================================
 // R_RenderMaskedSegRange
 // ==========================================================================
@@ -246,193 +90,152 @@ static void R_DrawWallSplats(void)
 //  way we don't have to store extra post_t info with each column for
 //  multi-patch textures. They are not normally needed as multi-patch
 //  textures don't have holes in it. At least not for now.
-static INT32 column2s_length; // column->length : for multi-patch on 2sided wall = texture->height
 
-static void R_Render2sidedMultiPatchColumn(column_t *column)
+static void R_Render2sidedMultiPatchColumn(drawcolumndata_t* dc, column_t *column)
 {
 	INT32 topscreen, bottomscreen;
 
 	topscreen = sprtopscreen; // + spryscale*column->topdelta;  topdelta is 0 for the wall
-	bottomscreen = topscreen + spryscale * column2s_length;
+	bottomscreen = topscreen + spryscale * lengthcol;
 
-	dc_yl = (sprtopscreen+FRACUNIT-1)>>FRACBITS;
-	dc_yh = (bottomscreen-1)>>FRACBITS;
+	dc->yl = (sprtopscreen+FRACUNIT-1)>>FRACBITS;
+	dc->yh = (bottomscreen-1)>>FRACBITS;
 
 	if (windowtop != INT32_MAX && windowbottom != INT32_MAX)
 	{
-		dc_yl = ((windowtop + FRACUNIT)>>FRACBITS);
-		dc_yh = (windowbottom - 1)>>FRACBITS;
+		dc->yl = ((windowtop + FRACUNIT)>>FRACBITS);
+		dc->yh = (windowbottom - 1)>>FRACBITS;
 	}
 
-	if (dc_yh >= mfloorclip[dc_x])
-		dc_yh =  mfloorclip[dc_x] - 1;
-	if (dc_yl <= mceilingclip[dc_x])
-		dc_yl =  mceilingclip[dc_x] + 1;
+	if (dc->yh >= mfloorclip[dc->x])
+		dc->yh =  mfloorclip[dc->x] - 1;
+	if (dc->yl <= mceilingclip[dc->x])
+		dc->yl =  mceilingclip[dc->x] + 1;
 
-	if (dc_yl >= vid.height || dc_yh < 0)
+	if (dc->yl >= vid.height || dc->yh < 0)
 		return;
 
-	if (dc_yl <= dc_yh && dc_yh < vid.height && dc_yh > 0)
+	if (dc->yl <= dc->yh && dc->yh < vid.height && dc->yh > 0)
 	{
-		dc_source = (UINT8 *)column + 3;
+		dc->source = (UINT8 *)column + 3;
+		dc->sourcelength = lengthcol;
 
-		if (colfunc == wallcolfunc)
-			twosmultipatchfunc();
-		else if (colfunc == fuzzcolfunc)
-			twosmultipatchtransfunc();
-		else
-			colfunc();
+		// Drawn by R_DrawColumn.
+		drawcolumndata_t dc_copy = *dc;
+		coldrawfunc_t* colfunccopy = colfunc;
+
+		// FIXME: do something better to look these up WITHOUT affecting global state...
+		if (R_CheckColumnFunc(BASEDRAWFUNC) == true)
+		{
+			colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCH];
+		}
+		else if (R_CheckColumnFunc(COLDRAWFUNC_FUZZY) == true)
+		{
+			colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS];
+		}
+
+		colfunccopy(const_cast<drawcolumndata_t*>(&dc_copy));
 	}
 }
 
-void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
+transnum_t R_GetLinedefTransTable(fixed_t alpha)
+{
+	return static_cast<transnum_t>((20*(FRACUNIT - alpha - 1) + FRACUNIT) >> (FRACBITS+1));
+}
+
+static inline boolean R_OverflowTest(drawcolumndata_t* dc)
+{
+	INT64 overflow_test;
+
+	overflow_test = (INT64)centeryfrac - (((INT64)dc->texturemid*spryscale)>>FRACBITS);
+
+	if (overflow_test < 0)
+		overflow_test = -overflow_test;
+
+	if ((UINT64)overflow_test&0xFFFFFFFF80000000ULL)
+		return true;
+
+	return false;
+}
+
+static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT32 x1, INT32 x2, INT32 texnum, void (*colfunc_2s)(drawcolumndata_t*, column_t *))
 {
 	size_t pindex;
 	column_t *col;
-	INT32 lightnum, texnum, i;
+	INT32 lightnum, i;
 	fixed_t height, realbot;
 	lightlist_t *light;
 	r_lightlist_t *rlight;
-	void (*colfunc_2s)(column_t *);
-	line_t *ldef;
 	sector_t *front, *back;
 	INT32 times, repeats;
-	INT64 overflow_test;
 	INT32 range;
+	line_t *ldef;
 
-	// Calculate light table.
-	// Use different light tables
-	//   for horizontal / vertical / diagonal. Diagonal?
-	// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-	curline = ds->curline;
-	frontsector = curline->frontsector;
-	backsector = curline->backsector;
-	texnum = R_GetTextureNum(curline->sidedef->midtexture);
-	windowbottom = windowtop = sprbotscreen = INT32_MAX;
-
-	// hack translucent linedef types (900-909 for transtables 1-9)
 	ldef = curline->linedef;
-	switch (ldef->special)
-	{
-		case 900:
-		case 901:
-		case 902:
-		case 903:
-		case 904:
-		case 905:
-		case 906:
-		case 907:
-		case 908:
-			dc_transmap = transtables + ((ldef->special-900)<<FF_TRANSSHIFT);
-			colfunc = fuzzcolfunc;
-			break;
-		case 909:
-			colfunc = R_DrawFogColumn_8;
-			windowtop = frontsector->ceilingheight;
-			windowbottom = frontsector->floorheight;
-			break;
-		default:
-			colfunc = wallcolfunc;
-			break;
-	}
 
-	if (curline->polyseg && curline->polyseg->translucency > 0)
-	{
-		if (curline->polyseg->translucency >= NUMTRANSMAPS)
-			return;
-
-		dc_transmap = transtables + ((curline->polyseg->translucency-1)<<FF_TRANSSHIFT);
-		colfunc = fuzzcolfunc;
-	}
-
-	range = max(ds->x2-ds->x1, 1);
-	rw_scalestep = ds->scalestep;
-	spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
-
-	// Texture must be cached before setting colfunc_2s,
-	// otherwise texture[texnum]->holes may be false when it shouldn't be
-	R_CheckTextureCache(texnum);
-	// handle case where multipatch texture is drawn on a 2sided wall, multi-patch textures
-	// are not stored per-column with post info in SRB2
-	if (textures[texnum]->holes)
-		colfunc_2s = R_DrawMaskedColumn; // render the usual 2sided single-patch packed texture
-	else
-	{
-		colfunc_2s = R_Render2sidedMultiPatchColumn; // render multipatch with no holes (no post_t info)
-		column2s_length = textures[texnum]->height;
-	}
+	range = std::max(drawseg->x2-drawseg->x1, 1);
 
 	// Setup lighting based on the presence/lack-of 3D floors.
-	dc_numlights = 0;
+	dc->numlights = 0;
+
 	if (frontsector->numlights)
 	{
-		dc_numlights = frontsector->numlights;
-		if (dc_numlights >= dc_maxlights)
+		dc->numlights = frontsector->numlights;
+
+		if (dc->numlights > dc->maxlights)
 		{
-			dc_maxlights = dc_numlights;
-			dc_lightlist = Z_Realloc(dc_lightlist, sizeof (*dc_lightlist) * dc_maxlights, PU_STATIC, NULL);
+			dc->maxlights = dc->numlights;
+			dc->lightlist = static_cast<r_lightlist_t*>(Z_Frame_Alloc(sizeof (*dc->lightlist) * dc->maxlights));
 		}
 
-		for (i = 0; i < dc_numlights; i++)
+		for (i = 0; i < dc->numlights; i++)
 		{
 			fixed_t leftheight, rightheight;
 			light = &frontsector->lightlist[i];
-			rlight = &dc_lightlist[i];
-			if (light->slope) {
-				leftheight = P_GetZAt(light->slope, ds->leftpos.x, ds->leftpos.y);
-				rightheight = P_GetZAt(light->slope, ds->rightpos.x, ds->rightpos.y);
-			} else
-				leftheight = rightheight = light->height;
+			rlight = &dc->lightlist[i];
 
-			leftheight -= viewz;
+			leftheight  = P_GetLightZAt(light, drawseg-> leftpos.x, drawseg-> leftpos.y);
+			rightheight = P_GetLightZAt(light, drawseg->rightpos.x, drawseg->rightpos.y);
+
+			leftheight  -= viewz;
 			rightheight -= viewz;
 
-			rlight->height = (centeryfrac) - FixedMul(leftheight, ds->scale1);
-			rlight->heightstep = (centeryfrac) - FixedMul(rightheight, ds->scale2);
-			rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
-			//if (x1 > ds->x1)
-				//rlight->height -= (x1 - ds->x1)*rlight->heightstep;
-			rlight->startheight = rlight->height; // keep starting value here to reset for each repeat
-			rlight->lightlevel = *light->lightlevel;
+			rlight->height         = (centeryfrac) - FixedMul(leftheight, drawseg->scale1);
+			rlight->heightstep     = (centeryfrac) - FixedMul(rightheight, drawseg->scale2);
+			rlight->heightstep     = (rlight->heightstep-rlight->height)/(range);
+			rlight->startheight    = rlight->height; // keep starting value here to reset for each repeat
+			rlight->lightlevel     = *light->lightlevel;
 			rlight->extra_colormap = light->extra_colormap;
-			rlight->flags = light->flags;
+			rlight->flags = static_cast<ffloortype_e>(light->flags);
 
 			if (rlight->flags & FF_FOG || (rlight->extra_colormap && rlight->extra_colormap->fog))
-				lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT);
-			else if (colfunc == fuzzcolfunc)
+				lightnum = R_GetSoftLightlevel(rlight->lightlevel);
+			else if (R_CheckColumnFunc(COLDRAWFUNC_FUZZY))
 				lightnum = LIGHTLEVELS - 1;
 			else
-				lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT);
+				lightnum = R_GetSoftLightlevel(rlight->lightlevel);
 
 			if (rlight->extra_colormap && rlight->extra_colormap->fog)
 				;
-			else if (curline->v1->y == curline->v2->y)
-				lightnum--;
-			else if (curline->v1->x == curline->v2->x)
-				lightnum++;
+			else if (P_ApplyLightOffset(lightnum, frontsector))
+				lightnum += curline->lightOffset;
 
 			rlight->lightnum = lightnum;
 		}
 	}
 	else
 	{
-		if (colfunc == fuzzcolfunc)
-		{
-			if (frontsector->extra_colormap && frontsector->extra_colormap->fog)
-				lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT);
-			else
-				lightnum = LIGHTLEVELS - 1;
-		}
+		if ((R_CheckColumnFunc(COLDRAWFUNC_FUZZY) == false)
+			|| (frontsector->extra_colormap && frontsector->extra_colormap->fog))
+			lightnum = R_GetSoftLightlevel(frontsector->lightlevel);
 		else
-			lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT);
+			lightnum = LIGHTLEVELS - 1;
 
-		if (colfunc == R_DrawFogColumn_8
+		if ((R_CheckColumnFunc(COLDRAWFUNC_FOG) == true)
 			|| (frontsector->extra_colormap && frontsector->extra_colormap->fog))
 			;
-		else if (curline->v1->y == curline->v2->y)
-			lightnum--;
-		else if (curline->v1->x == curline->v2->x)
-			lightnum++;
+		else if (P_ApplyLightOffset(lightnum, frontsector))
+			lightnum += curline->lightOffset;
 
 		if (lightnum < 0)
 			walllights = scalelight[0];
@@ -442,11 +245,6 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 			walllights = scalelight[lightnum];
 	}
 
-	maskedtexturecol = ds->maskedtexturecol;
-
-	mfloorclip = ds->sprbottomclip;
-	mceilingclip = ds->sprtopclip;
-
 	if (frontsector->heightsec != -1)
 		front = &sectors[frontsector->heightsec];
 	else
@@ -457,8 +255,8 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 	else
 		back = backsector;
 
-	if (ds->curline->sidedef->repeatcnt)
-		repeats = 1 + ds->curline->sidedef->repeatcnt;
+	if (drawseg->curline->sidedef->repeatcnt)
+		repeats = 1 + drawseg->curline->sidedef->repeatcnt;
 	else if (ldef->flags & ML_EFFECT5)
 	{
 		fixed_t high, low;
@@ -484,76 +282,77 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 	{
 		if (times > 0)
 		{
-			rw_scalestep = ds->scalestep;
-			spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
-			if (dc_numlights)
+			rw_scalestep = drawseg->scalestep;
+			spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep;
+			if (dc->numlights)
 			{ // reset all lights to their starting heights
-				for (i = 0; i < dc_numlights; i++)
+				for (i = 0; i < dc->numlights; i++)
 				{
-					rlight = &dc_lightlist[i];
+					rlight = &dc->lightlist[i];
 					rlight->height = rlight->startheight;
 				}
 			}
 		}
 
-		dc_texheight = textureheight[texnum]>>FRACBITS;
+		dc->texheight = textureheight[texnum]>>FRACBITS;
 
 		// draw the columns
-		for (dc_x = x1; dc_x <= x2; dc_x++)
+		for (dc->x = x1; dc->x <= x2; dc->x++)
 		{
-			dc_texturemid = ds->maskedtextureheight[dc_x];
+			dc->texturemid = drawseg->maskedtextureheight[dc->x];
 
 			if (!!(curline->linedef->flags & ML_DONTPEGBOTTOM) ^ !!(curline->linedef->flags & ML_EFFECT3))
-				dc_texturemid += (textureheight[texnum])*times + textureheight[texnum];
+				dc->texturemid += (textureheight[texnum])*times + textureheight[texnum];
 			else
-				dc_texturemid -= (textureheight[texnum])*times;
+				dc->texturemid -= (textureheight[texnum])*times;
+
+			const INT16 colnum = maskedtexturecol[dc->x];
+
 			// calculate lighting
-			if (maskedtexturecol[dc_x] != INT16_MAX)
+			if (colnum != INT16_MAX)
 			{
 				// Check for overflows first
-				overflow_test = (INT64)centeryfrac - (((INT64)dc_texturemid*spryscale)>>FRACBITS);
-				if (overflow_test < 0) overflow_test = -overflow_test;
-				if ((UINT64)overflow_test&0xFFFFFFFF80000000ULL)
+				if (R_OverflowTest(dc))
 				{
 					// Eh, no, go away, don't waste our time
-					if (dc_numlights)
+					if (dc->numlights)
 					{
-						for (i = 0; i < dc_numlights; i++)
+						for (i = 0; i < dc->numlights; i++)
 						{
-							rlight = &dc_lightlist[i];
+							rlight = &dc->lightlist[i];
 							rlight->height += rlight->heightstep;
 						}
 					}
+
 					spryscale += rw_scalestep;
 					continue;
 				}
 
-				if (dc_numlights)
+				if (dc->numlights)
 				{
 					lighttable_t **xwalllights;
 
 					sprbotscreen = INT32_MAX;
-					sprtopscreen = windowtop = (centeryfrac - FixedMul(dc_texturemid, spryscale));
+					sprtopscreen = windowtop = (centeryfrac - FixedMul(dc->texturemid, spryscale));
 
 					realbot = windowbottom = FixedMul(textureheight[texnum], spryscale) + sprtopscreen;
-					dc_iscale = 0xffffffffu / (unsigned)spryscale;
+					dc->iscale = 0xffffffffu / (unsigned)spryscale;
 
 					// draw the texture
-					col = (column_t *)((UINT8 *)R_GetColumn(texnum, maskedtexturecol[dc_x]) - 3);
+					col = (column_t *)((UINT8 *)R_GetColumn(texnum, colnum) - 3);
 
-					for (i = 0; i < dc_numlights; i++)
+					auto set_light_vars = [&](INT32 k)
 					{
-						rlight = &dc_lightlist[i];
+						rlight = &dc->lightlist[k];
 
-						if ((rlight->flags & FF_NOSHADE))
-							continue;
+						lightnum = rlight->lightnum;
 
-						if (rlight->lightnum < 0)
+						if (lightnum < 0)
 							xwalllights = scalelight[0];
-						else if (rlight->lightnum >= LIGHTLEVELS)
+						else if (lightnum >= LIGHTLEVELS)
 							xwalllights = scalelight[LIGHTLEVELS-1];
 						else
-							xwalllights = scalelight[rlight->lightnum];
+							xwalllights = scalelight[lightnum];
 
 						pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
 
@@ -564,15 +363,33 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 							rlight->rcolormap = rlight->extra_colormap->colormap + (xwalllights[pindex] - colormaps);
 						else
 							rlight->rcolormap = xwalllights[pindex];
+					};
+
+					auto set_colormap_below_light = [&]
+					{
+						dc->colormap = rlight->rcolormap;
+						if (encoremap && !(ldef->flags & ML_TFERLINE))
+							dc->colormap += COLORMAP_REMAPOFFSET;
+					};
+
+					// Use the base sector's light level above the first FOF.
+					// You can imagine it as the sky casting its light on top of the highest FOF.
+					set_light_vars(0);
+					set_colormap_below_light();
+
+					for (i = 0; i < dc->numlights; i++)
+					{
+						if ((dc->lightlist[i].flags & FF_NOSHADE))
+							continue;
+
+						set_light_vars(i);
 
 						height = rlight->height;
 						rlight->height += rlight->heightstep;
 
 						if (height <= windowtop)
 						{
-							dc_colormap = rlight->rcolormap;
-							if (encoremap && !(ldef->flags & ML_TFERLINE))
-								dc_colormap += COLORMAP_REMAPOFFSET;
+							set_colormap_below_light();
 							continue;
 						}
 
@@ -580,24 +397,23 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 						if (windowbottom >= realbot)
 						{
 							windowbottom = realbot;
-							colfunc_2s(col);
-							for (i++; i < dc_numlights; i++)
+							colfunc_2s(dc, col);
+							for (i++; i < dc->numlights; i++)
 							{
-								rlight = &dc_lightlist[i];
+								rlight = &dc->lightlist[i];
 								rlight->height += rlight->heightstep;
 							}
 
 							continue;
 						}
-						colfunc_2s(col);
+						colfunc_2s(dc, col);
+
 						windowtop = windowbottom + 1;
-						dc_colormap = rlight->rcolormap;
-						if (encoremap && !(ldef->flags & ML_TFERLINE))
-							dc_colormap += COLORMAP_REMAPOFFSET;
+						set_colormap_below_light();
 					}
 					windowbottom = realbot;
 					if (windowtop < windowbottom)
-						colfunc_2s(col);
+						colfunc_2s(dc, col);
 
 					spryscale += rw_scalestep;
 					continue;
@@ -609,47 +425,170 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 				if (pindex >= MAXLIGHTSCALE)
 					pindex = MAXLIGHTSCALE - 1;
 
-				dc_colormap = walllights[pindex];
+				dc->colormap = walllights[pindex];
 				if (encoremap && !(ldef->flags & ML_TFERLINE))
-					dc_colormap += COLORMAP_REMAPOFFSET;
+					dc->colormap += COLORMAP_REMAPOFFSET;
 
 				if (frontsector->extra_colormap)
-					dc_colormap = frontsector->extra_colormap->colormap + (dc_colormap - colormaps);
+					dc->colormap = frontsector->extra_colormap->colormap + (dc->colormap - colormaps);
 
-				sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-				dc_iscale = 0xffffffffu / (unsigned)spryscale;
+				sprtopscreen = centeryfrac - FixedMul(dc->texturemid, spryscale);
+				dc->iscale = 0xffffffffu / (unsigned)spryscale;
 
 				// draw the texture
-				col = (column_t *)((UINT8 *)R_GetColumn(texnum, maskedtexturecol[dc_x]) - 3);
-				
-				colfunc_2s(col);
+				col = (column_t *)((UINT8 *)R_GetColumn(texnum, colnum) - 3);
+
+				colfunc_2s(dc, col);
 			}
+
 			spryscale += rw_scalestep;
 		}
 	}
-	colfunc = wallcolfunc;
+}
+
+static boolean R_CheckBlendMode(drawcolumndata_t* dc, const line_t *ldef)
+{
+	if (!ldef->alpha)
+		return false;
+
+	if (ldef->blendmode)
+	{
+		if (ldef->alpha == NUMTRANSMAPS || ldef->blendmode == AST_MODULATE)
+			dc->transmap = R_GetBlendTable(ldef->blendmode, 0);
+		else
+			dc->transmap = R_GetBlendTable(ldef->blendmode, R_GetLinedefTransTable(ldef->alpha));
+
+		R_SetColumnFunc(COLDRAWFUNC_FUZZY);
+	}
+	else if (ldef->alpha > 0 && ldef->alpha < FRACUNIT)
+	{
+		dc->transmap = R_GetTranslucencyTable(R_GetLinedefTransTable(ldef->alpha));
+		R_SetColumnFunc(COLDRAWFUNC_FUZZY);
+	}
+	else if (ldef->special == 909)
+	{
+		windowtop = frontsector->ceilingheight;
+		windowbottom = frontsector->floorheight;
+		R_SetColumnFunc(COLDRAWFUNC_FOG);
+	}
+	else
+	{
+		R_SetColumnFunc(BASEDRAWFUNC);
+	}
+
+	if (curline->polyseg && curline->polyseg->translucency > 0)
+	{
+		if (curline->polyseg->translucency >= NUMTRANSMAPS)
+			return false;
+
+		dc->transmap = R_GetTranslucencyTable(curline->polyseg->translucency);
+		R_SetColumnFunc(COLDRAWFUNC_FUZZY);
+	}
+
+	return true;
+}
+
+void R_RenderMaskedSegRange(drawseg_t *drawseg, INT32 x1, INT32 x2)
+{
+	INT32 texnum;
+	line_t *ldef;
+	void (*colfunc_2s)(drawcolumndata_t* dc, column_t *);
+	drawcolumndata_t *dc = &g_dc;
+
+	// Calculate light table.
+	// Use different light tables
+	//   for horizontal / vertical / diagonal. Diagonal?
+	// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
+	curline = drawseg->curline;
+
+	frontsector = curline->frontsector;
+	backsector = curline->backsector;
+	texnum = R_GetTextureNum(curline->sidedef->midtexture);
+	windowbottom = windowtop = sprbotscreen = INT32_MAX;
+
+	// hack translucent linedef types (900-909 for transtables 1-9)
+	ldef = curline->linedef;
+
+	if (R_CheckBlendMode(dc, ldef) == false)
+	{
+		return; // does not render
+	}
+
+	rw_scalestep = drawseg->scalestep;
+	spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep;
+
+	// Texture must be cached before setting colfunc_2s,
+	// otherwise texture[texnum]->holes may be false when it shouldn't be
+	R_CheckTextureCache(texnum);
+
+	// handle case where multipatch texture is drawn on a 2sided wall, multi-patch textures
+	// are not stored per-column with post info in SRB2
+	if (textures[texnum]->holes)
+		colfunc_2s = R_DrawMaskedColumn; // render the usual 2sided single-patch packed texture
+	else
+	{
+		colfunc_2s = R_Render2sidedMultiPatchColumn; // render multipatch with no holes (no post_t info)
+		lengthcol = textures[texnum]->height;
+	}
+
+	maskedtexturecol = drawseg->maskedtexturecol;
+
+	mfloorclip = drawseg->sprbottomclip;
+	mceilingclip = drawseg->sprtopclip;
+
+	R_RenderMaskedSegLoop(dc, drawseg, x1, x2, texnum, colfunc_2s);
+
+	R_SetColumnFunc(BASEDRAWFUNC);
+}
+
+template <typename T>
+static constexpr T saturating_add(T x, T y) noexcept
+{
+	INT64 z = static_cast<INT64>(x) + static_cast<INT64>(y);
+	if (z > static_cast<INT64>(std::numeric_limits<T>::max()))
+	{
+		z = static_cast<INT64>(std::numeric_limits<T>::max());
+	}
+	else if (z < static_cast<INT64>(std::numeric_limits<T>::min()))
+	{
+		z = static_cast<INT64>(std::numeric_limits<T>::min());
+	}
+	return static_cast<T>(z);
+}
+
+template <typename T>
+static constexpr T saturating_mul(T x, T y) noexcept
+{
+	INT64 z = static_cast<INT64>(x) * static_cast<INT64>(y);
+	if (z > static_cast<INT64>(std::numeric_limits<T>::max()))
+	{
+		z = static_cast<INT64>(std::numeric_limits<T>::max());
+	}
+	else if (z < static_cast<INT64>(std::numeric_limits<T>::min()))
+	{
+		z = static_cast<INT64>(std::numeric_limits<T>::min());
+	}
+	return static_cast<T>(z);
 }
 
 // Loop through R_DrawMaskedColumn calls
-static void R_DrawRepeatMaskedColumn(column_t *col)
+static void R_DrawRepeatMaskedColumn(drawcolumndata_t* dc, column_t *col)
 {
-	INT64 z;
 	while (sprtopscreen < sprbotscreen)
 	{
-		R_DrawMaskedColumn(col);
-		z = sprtopscreen + (INT64)dc_texheight*spryscale;
-		if (z > (INT64)INT32_MAX) // prevent overflow
-			sprtopscreen = INT32_MAX;
-		else
-			sprtopscreen = z;
+		R_DrawMaskedColumn(dc, col);
+		sprtopscreen = saturating_add(sprtopscreen, saturating_mul(dc->texheight, spryscale));
 	}
 }
 
 // Returns true if a fake floor is translucent.
 static boolean R_IsFFloorTranslucent(visffloor_t *pfloor)
 {
+	if (cv_softcyancut.value && pfloor->plane->cyan)
+		return true;
+
 	if (pfloor->polyobj)
-		return (pfloor->polyobj->translucency > 0);
+		return true;
 
 	// Polyobjects have no ffloors, and they're handled in the conditional above.
 	if (pfloor->ffloor != NULL)
@@ -661,15 +600,15 @@ static boolean R_IsFFloorTranslucent(visffloor_t *pfloor)
 //
 // R_RenderThickSideRange
 // Renders all the thick sides in the given range.
-void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
+void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pfloor)
 {
-	size_t          pindex;
+	size_t          pindex = 0;
 	column_t *      col;
-	INT32             lightnum;
-	INT32            texnum;
+	INT32           lightnum;
+	INT32           texnum;
 	sector_t        tempsec;
-	INT32             templight;
-	INT32             i, p;
+	INT32           templight;
+	INT32           i, p;
 	fixed_t         bottombounds = viewheight << FRACBITS;
 	fixed_t         topbounds = (con_clipviewtop - 1) << FRACBITS;
 	fixed_t         offsetvalue = 0;
@@ -686,91 +625,93 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 	INT32         oldx = -1;
 	fixed_t       left_top, left_bottom; // needed here for slope skewing
 	pslope_t      *skewslope = NULL;
+	boolean fog = false;
+	boolean fuzzy = false;
 
-	void (*colfunc_2s) (column_t *);
+	drawcolumndata_t *dc = &g_dc;
+
+	void (*colfunc_2s) (drawcolumndata_t* dc, column_t *);
 
 	// Calculate light table.
 	// Use different light tables
 	//   for horizontal / vertical / diagonal. Diagonal?
 	// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
 
-	curline = ds->curline;
+	curline = drawseg->curline;
 	backsector = pfloor->target;
 	frontsector = curline->frontsector == pfloor->target ? curline->backsector : curline->frontsector;
 	texnum = R_GetTextureNum(sides[pfloor->master->sidenum[0]].midtexture);
 
-	colfunc = wallcolfunc;
+	R_SetColumnFunc(BASEDRAWFUNC);
 
 	if (pfloor->master->flags & ML_TFERLINE)
 	{
-		size_t linenum = min((size_t)(curline->linedef-backsector->lines[0]), pfloor->master->frontsector->linecount);
+		size_t linenum = std::min((size_t)(curline->linedef-backsector->lines[0]), pfloor->master->frontsector->linecount);
 		newline = pfloor->master->frontsector->lines[0] + linenum;
 		texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
 	}
 
 	if (pfloor->flags & FF_TRANSLUCENT)
 	{
-		boolean fuzzy = true;
+		fuzzy = true;
 
 		// Hacked up support for alpha value in software mode Tails 09-24-2002
-		if (pfloor->alpha < 12)
-			return; // Don't even draw it
-		else if (pfloor->alpha < 38)
-			dc_transmap = transtables + ((tr_trans90-1)<<FF_TRANSSHIFT);
-		else if (pfloor->alpha < 64)
-			dc_transmap = transtables + ((tr_trans80-1)<<FF_TRANSSHIFT);
-		else if (pfloor->alpha < 89)
-			dc_transmap = transtables + ((tr_trans70-1)<<FF_TRANSSHIFT);
-		else if (pfloor->alpha < 115)
-			dc_transmap = transtables + ((tr_trans60-1)<<FF_TRANSSHIFT);
-		else if (pfloor->alpha < 140)
-			dc_transmap = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
-		else if (pfloor->alpha < 166)
-			dc_transmap = transtables + ((tr_trans40-1)<<FF_TRANSSHIFT);
-		else if (pfloor->alpha < 192)
-			dc_transmap = transtables + ((tr_trans30-1)<<FF_TRANSSHIFT);
-		else if (pfloor->alpha < 217)
-			dc_transmap = transtables + ((tr_trans20-1)<<FF_TRANSSHIFT);
-		else if (pfloor->alpha < 243)
-			dc_transmap = transtables + ((tr_trans10-1)<<FF_TRANSSHIFT);
-		else
-			fuzzy = false; // Opaque
-
-		if (fuzzy)
-			colfunc = fuzzcolfunc;
+		// ...unhacked by toaster 04-01-2021, re-hacked a little by sphere 19-11-2021
+		// and mercilessly shoved into saturn by chearii 02-02-2025
+		{
+			INT32 trans = (10*((256+12) - pfloor->alpha))/255;
+			if (trans >= 10)
+				return; // Don't even draw it
+			if (pfloor->blend) // additive, (reverse) subtractive, modulative
+				dc->transmap = R_GetBlendTable(pfloor->blend, trans);
+			else if (!(dc->transmap = R_GetTranslucencyTable(trans)) || trans == 0)
+				fuzzy = false; // Opaque
+		}
 	}
 	else if (pfloor->flags & FF_FOG)
-		colfunc = R_DrawFogColumn_8;
+	{
+		R_SetColumnFunc(COLDRAWFUNC_FOG);
+		fog = true;
+	}
 
-	range = max(ds->x2-ds->x1, 1);
+	range = std::max(drawseg->x2-drawseg->x1, 1);
 	//SoM: Moved these up here so they are available for my lightlist calculations
-	rw_scalestep = ds->scalestep;
-	spryscale = ds->scale1 + (x1 - ds->x1)*rw_scalestep;
+	rw_scalestep = drawseg->scalestep;
+	spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep;
 
-	dc_numlights = 0;
+#define CLAMPMAX INT32_MAX
+#define CLAMPMIN (-INT32_MAX) // This is not INT32_MIN on purpose! INT32_MIN makes the drawers freak out.
+	auto overflow_clamp = [&](INT64 overflow_test)
+	{
+		return (overflow_test > (INT64)CLAMPMAX) ? CLAMPMAX :
+		(overflow_test > (INT64)CLAMPMIN) ? (fixed_t)overflow_test :
+		CLAMPMIN;
+	};
+#undef CLAMPMAX
+#undef CLAMPMIN
+
+	dc->numlights = 0;
 	if (frontsector->numlights)
 	{
-		dc_numlights = frontsector->numlights;
-		if (dc_numlights > dc_maxlights)
+		dc->numlights = frontsector->numlights;
+
+		if (dc->numlights > dc->maxlights)
 		{
-			dc_maxlights = dc_numlights;
-			dc_lightlist = Z_Realloc(dc_lightlist, sizeof (*dc_lightlist) * dc_maxlights, PU_STATIC, NULL);
+			dc->maxlights = dc->numlights;
+			dc->lightlist = static_cast<r_lightlist_t*>(Z_Frame_Alloc(sizeof (*dc->lightlist) * dc->maxlights));
 		}
 
-		for (i = p = 0; i < dc_numlights; i++)
+		for (i = p = 0; i < dc->numlights; i++)
 		{
 			fixed_t leftheight, rightheight;
 			fixed_t pfloorleft, pfloorright;
 			INT64 overflow_test;
 			light = &frontsector->lightlist[i];
-			rlight = &dc_lightlist[p];
+			rlight = &dc->lightlist[p];
 
 #define SLOPEPARAMS(slope, end1, end2, normalheight) \
-	if (slope) { \
-		end1 = P_GetZAt(slope, ds->leftpos.x, ds->leftpos.y); \
-		end2 = P_GetZAt(slope, ds->rightpos.x, ds->rightpos.y); \
-	} else \
-		end1 = end2 = normalheight;
+	end1 = P_GetZAt(slope, drawseg->leftpos.x, drawseg->leftpos.y, normalheight); \
+	end2 = P_GetZAt(slope, drawseg->rightpos.x, drawseg->rightpos.y, normalheight);
 
 			SLOPEPARAMS(light->slope,     leftheight, rightheight, light->height)
 			SLOPEPARAMS(*pfloor->b_slope, pfloorleft, pfloorright, *pfloor->bottomheight)
@@ -780,31 +721,27 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 
 			SLOPEPARAMS(*pfloor->t_slope, pfloorleft, pfloorright, *pfloor->topheight)
 
-			if (leftheight > pfloorleft && rightheight > pfloorright && i+1 < dc_numlights)
+			if (leftheight > pfloorleft && rightheight > pfloorright && i+1 < dc->numlights)
 			{
 				lightlist_t *nextlight = &frontsector->lightlist[i+1];
-				if ((nextlight->slope ? P_GetZAt(nextlight->slope, ds->leftpos.x, ds->leftpos.y) : nextlight->height) > pfloorleft
-				 && (nextlight->slope ? P_GetZAt(nextlight->slope, ds->rightpos.x, ds->rightpos.y) : nextlight->height) > pfloorright)
+				if ((P_GetLightZAt(nextlight, drawseg->leftpos.x, drawseg->leftpos.y) > pfloorleft)
+				 && (P_GetLightZAt(nextlight, drawseg->rightpos.x, drawseg->rightpos.y) > pfloorright))
 					continue;
 			}
 
 			leftheight -= viewz;
 			rightheight -= viewz;
 
-#define CLAMPMAX INT32_MAX
-#define CLAMPMIN (-INT32_MAX) // This is not INT32_MIN on purpose! INT32_MIN makes the drawers freak out.
 			// Monster Iestyn (25/03/18): do not skip these lights if they fail overflow test, just clamp them instead so they behave.
-			overflow_test = (INT64)centeryfrac - (((INT64)leftheight*ds->scale1)>>FRACBITS);
-			if      (overflow_test > (INT64)CLAMPMAX) rlight->height = CLAMPMAX;
-			else if (overflow_test > (INT64)CLAMPMIN) rlight->height = (fixed_t)overflow_test;
-			else                                      rlight->height = CLAMPMIN;
+			overflow_test = (INT64)centeryfrac - (((INT64)leftheight*drawseg->scale1)>>FRACBITS);
+			rlight->height = overflow_clamp(overflow_test);
+
+			overflow_test = (INT64)centeryfrac - (((INT64)rightheight*drawseg->scale2)>>FRACBITS);
+			rlight->heightstep = overflow_clamp(overflow_test);
 
-			overflow_test = (INT64)centeryfrac - (((INT64)rightheight*ds->scale2)>>FRACBITS);
-			if      (overflow_test > (INT64)CLAMPMAX) rlight->heightstep = CLAMPMAX;
-			else if (overflow_test > (INT64)CLAMPMIN) rlight->heightstep = (fixed_t)overflow_test;
-			else                                      rlight->heightstep = CLAMPMIN;
 			rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
-			rlight->flags = light->flags;
+			rlight->flags = static_cast<ffloortype_e>(light->flags);
+
 			if (light->flags & FF_CUTLEVEL)
 			{
 				SLOPEPARAMS(*light->caster->b_slope, leftheight, rightheight, *light->caster->bottomheight)
@@ -813,15 +750,12 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 				rightheight -= viewz;
 
 				// Monster Iestyn (25/03/18): do not skip these lights if they fail overflow test, just clamp them instead so they behave.
-				overflow_test = (INT64)centeryfrac - (((INT64)leftheight*ds->scale1)>>FRACBITS);
-				if      (overflow_test > (INT64)CLAMPMAX) rlight->botheight = CLAMPMAX;
-				else if (overflow_test > (INT64)CLAMPMIN) rlight->botheight = (fixed_t)overflow_test;
-				else                                      rlight->botheight = CLAMPMIN;
+				overflow_test = (INT64)centeryfrac - (((INT64)leftheight*drawseg->scale1)>>FRACBITS);
+				rlight->botheight = overflow_clamp(overflow_test);
+
+				overflow_test = (INT64)centeryfrac - (((INT64)rightheight*drawseg->scale2)>>FRACBITS);
+				rlight->botheightstep = overflow_clamp(overflow_test);
 
-				overflow_test = (INT64)centeryfrac - (((INT64)rightheight*ds->scale2)>>FRACBITS);
-				if      (overflow_test > (INT64)CLAMPMAX) rlight->botheightstep = CLAMPMAX;
-				else if (overflow_test > (INT64)CLAMPMIN) rlight->botheightstep = (fixed_t)overflow_test;
-				else                                      rlight->botheightstep = CLAMPMIN;
 				rlight->botheightstep = (rlight->botheightstep-rlight->botheight)/(range);
 			}
 
@@ -830,40 +764,36 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 
 			// Check if the current light effects the colormap/lightlevel
 			if (pfloor->flags & FF_FOG)
-				rlight->lightnum = (pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT);
+				rlight->lightnum = R_GetSoftLightlevel(pfloor->master->frontsector->lightlevel);
 			else
-				rlight->lightnum = (rlight->lightlevel >> LIGHTSEGSHIFT);
+				rlight->lightnum = R_GetSoftLightlevel(rlight->lightlevel);
 
 			if (pfloor->flags & FF_FOG || rlight->flags & FF_FOG || (rlight->extra_colormap && rlight->extra_colormap->fog))
 				;
-			else if (curline->v1->y == curline->v2->y)
-				rlight->lightnum--;
-			else if (curline->v1->x == curline->v2->x)
-				rlight->lightnum++;
+			else if (P_ApplyLightOffset(rlight->lightnum, frontsector))
+				rlight->lightnum += curline->lightOffset;
 
 			p++;
 		}
 
-		dc_numlights = p;
+		dc->numlights = p;
 	}
 	else
 	{
 		// Get correct light level!
 		if ((frontsector->extra_colormap && frontsector->extra_colormap->fog))
-			lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT);
-		else if (pfloor->flags & FF_FOG)
-			lightnum = (pfloor->master->frontsector->lightlevel >> LIGHTSEGSHIFT);
-		else if (colfunc == fuzzcolfunc)
+			lightnum = R_GetSoftLightlevel(frontsector->lightlevel);
+		else if (fog)
+			lightnum = R_GetSoftLightlevel(pfloor->master->frontsector->lightlevel);
+		else if (fuzzy)
 			lightnum = LIGHTLEVELS-1;
 		else
-			lightnum = R_FakeFlat(frontsector, &tempsec, &templight, &templight, false)
-				->lightlevel >> LIGHTSEGSHIFT;
+			lightnum = R_GetSoftLightlevel(R_FakeFlat(frontsector, &tempsec, &templight, &templight, false)->lightlevel);
 
-		if (pfloor->flags & FF_FOG || (frontsector->extra_colormap && frontsector->extra_colormap->fog));
-			else if (curline->v1->y == curline->v2->y)
-		lightnum--;
-		else if (curline->v1->x == curline->v2->x)
-			lightnum++;
+		if (pfloor->flags & FF_FOG || (frontsector->extra_colormap && frontsector->extra_colormap->fog))
+			;
+		else if (P_ApplyLightOffset(lightnum, frontsector))
+			lightnum += curline->lightOffset;
 
 		if (lightnum < 0)
 			walllights = scalelight[0];
@@ -873,23 +803,18 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 			walllights = scalelight[lightnum];
 	}
 
-	maskedtexturecol = ds->thicksidecol;
+	maskedtexturecol = drawseg->thicksidecol;
 
-	mfloorclip = ds->sprbottomclip;
-	mceilingclip = ds->sprtopclip;
-	dc_texheight = textureheight[texnum]>>FRACBITS;
+	mfloorclip = drawseg->sprbottomclip;
+	mceilingclip = drawseg->sprtopclip;
+	dc->texheight = textureheight[texnum]>>FRACBITS;
 
-	// calculate both left ends
-	if (*pfloor->t_slope)
-		left_top = P_GetZAt(*pfloor->t_slope, ds->leftpos.x, ds->leftpos.y) - viewz;
-	else
-		left_top = *pfloor->topheight - viewz;
+	// calculate both left endrawseg
+	left_top    = P_GetFFloorTopZAt   (pfloor, drawseg->leftpos.x, drawseg->leftpos.y) - viewz;
+	left_bottom = P_GetFFloorBottomZAt(pfloor, drawseg->leftpos.x, drawseg->leftpos.y) - viewz;
 
-	if (*pfloor->b_slope)
-		left_bottom = P_GetZAt(*pfloor->b_slope, ds->leftpos.x, ds->leftpos.y) - viewz;
-	else
-		left_bottom = *pfloor->bottomheight - viewz;
 	skewslope = *pfloor->t_slope; // skew using top slope by default
+
 	if (newline)
 	{
 		if (newline->flags & ML_DONTPEGTOP)
@@ -899,9 +824,9 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 		slopeskew = true;
 
 	if (slopeskew)
-		dc_texturemid = left_top;
+		dc->texturemid = left_top;
 	else
-		dc_texturemid = *pfloor->topheight - viewz;
+		dc->texturemid = *pfloor->topheight - viewz;
 
 	if (newline)
 	{
@@ -910,7 +835,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 		{
 			skewslope = *pfloor->b_slope; // skew using bottom slope
 			if (slopeskew)
-				dc_texturemid = left_bottom;
+				dc->texturemid = left_bottom;
 			else
 			offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
 		}
@@ -922,33 +847,32 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 		{
 			skewslope = *pfloor->b_slope; // skew using bottom slope
 			if (slopeskew)
-				dc_texturemid = left_bottom;
+				dc->texturemid = left_bottom;
 			else
 			offsetvalue -= *pfloor->topheight - *pfloor->bottomheight;
 		}
 	}
 
-	if (slopeskew)
+	if (slopeskew && skewslope)
 	{
 		angle_t lineangle = R_PointToAngle2(curline->v1->x, curline->v1->y, curline->v2->x, curline->v2->y);
-
-		if (skewslope)
-			ffloortextureslide = FixedMul(skewslope->zdelta, FINECOSINE((lineangle-skewslope->xydirection)>>ANGLETOFINESHIFT));
+		ffloortextureslide = FixedMul(skewslope->zdelta, FINECOSINE((lineangle-skewslope->xydirection)>>ANGLETOFINESHIFT));
 	}
 
-	dc_texturemid += offsetvalue;
+	dc->texturemid += offsetvalue;
 
 	// Texture must be cached before setting colfunc_2s,
 	// otherwise texture[texnum]->holes may be false when it shouldn't be
 	R_CheckTextureCache(texnum);
+
 	//faB: handle case where multipatch texture is drawn on a 2sided wall, multi-patch textures
 	//     are not stored per-column with post info anymore in Doom Legacy
 	if (textures[texnum]->holes)
-		colfunc_2s = R_DrawRepeatMaskedColumn;                    //render the usual 2sided single-patch packed texture
+		colfunc_2s = R_DrawRepeatMaskedColumn;              //render the usual 2sided single-patch packed texture
 	else
 	{
 		colfunc_2s = R_Render2sidedMultiPatchColumn;        //render multipatch with no holes (no post_t info)
-		column2s_length = textures[texnum]->height;
+		lengthcol = textures[texnum]->height;
 	}
 
 	// Set heights according to plane, or slope, whichever
@@ -956,235 +880,272 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 		fixed_t right_top, right_bottom;
 
 		// calculate right ends now
-		if (*pfloor->t_slope)
-			right_top = P_GetZAt(*pfloor->t_slope, ds->rightpos.x, ds->rightpos.y) - viewz;
-		else
-			right_top = *pfloor->topheight - viewz;
-
-		if (*pfloor->b_slope)
-			right_bottom = P_GetZAt(*pfloor->b_slope, ds->rightpos.x, ds->rightpos.y) - viewz;
-		else
-			right_bottom = *pfloor->bottomheight - viewz;
+		right_top    = P_GetFFloorTopZAt   (pfloor, drawseg->rightpos.x, drawseg->rightpos.y) - viewz;
+		right_bottom = P_GetFFloorBottomZAt(pfloor, drawseg->rightpos.x, drawseg->rightpos.y) - viewz;
 
 		// using INT64 to avoid 32bit overflow
-		top_frac =    (INT64)centeryfrac - (((INT64)left_top     * ds->scale1) >> FRACBITS);
-		bottom_frac = (INT64)centeryfrac - (((INT64)left_bottom  * ds->scale1) >> FRACBITS);
-		top_step =    (INT64)centeryfrac - (((INT64)right_top    * ds->scale2) >> FRACBITS);
-		bottom_step = (INT64)centeryfrac - (((INT64)right_bottom * ds->scale2) >> FRACBITS);
+		top_frac =    (INT64)centeryfrac - (((INT64)left_top     * drawseg->scale1) >> FRACBITS);
+		bottom_frac = (INT64)centeryfrac - (((INT64)left_bottom  * drawseg->scale1) >> FRACBITS);
+		top_step =    (INT64)centeryfrac - (((INT64)right_top    * drawseg->scale2) >> FRACBITS);
+		bottom_step = (INT64)centeryfrac - (((INT64)right_bottom * drawseg->scale2) >> FRACBITS);
 
 		top_step = (top_step-top_frac)/(range);
 		bottom_step = (bottom_step-bottom_frac)/(range);
 
-		top_frac += top_step * (x1 - ds->x1);
-		bottom_frac += bottom_step * (x1 - ds->x1);
+		top_frac += top_step * (x1 - drawseg->x1);
+		bottom_frac += bottom_step * (x1 - drawseg->x1);
 	}
 
 	// draw the columns
-	for (dc_x = x1; dc_x <= x2; dc_x++)
+	for (dc->x = x1; dc->x <= x2; dc->x++)
 	{
-		if (maskedtexturecol[dc_x] == INT16_MAX)
+		if (maskedtexturecol[dc->x] == INT16_MAX)
 			continue;
 
+		// skew FOF walls
+		if (ffloortextureslide)
 		{
-			if (ffloortextureslide) { // skew FOF walls
-				if (oldx != -1)
-					dc_texturemid += FixedMul(ffloortextureslide, (maskedtexturecol[oldx]-maskedtexturecol[dc_x])<<FRACBITS);
-				oldx = dc_x;
-			}
-			// Calculate bounds
-			// clamp the values if necessary to avoid overflows and rendering glitches caused by them
+			if (oldx != -1)
+				dc->texturemid += FixedMul(ffloortextureslide, (maskedtexturecol[oldx]-maskedtexturecol[dc->x])<<FRACBITS);
+			oldx = dc->x;
+		}
 
-			if      (top_frac > (INT64)CLAMPMAX) sprtopscreen = windowtop = CLAMPMAX;
-			else if (top_frac > (INT64)CLAMPMIN) sprtopscreen = windowtop = (fixed_t)top_frac;
-			else                                 sprtopscreen = windowtop = CLAMPMIN;
-			if      (bottom_frac > (INT64)CLAMPMAX) sprbotscreen = windowbottom = CLAMPMAX;
-			else if (bottom_frac > (INT64)CLAMPMIN) sprbotscreen = windowbottom = (fixed_t)bottom_frac;
-			else                                    sprbotscreen = windowbottom = CLAMPMIN;
+		// Calculate bounds
+		// clamp the values if necessary to avoid overflows and rendering glitches caused by them
+		sprtopscreen = windowtop = overflow_clamp(top_frac);
+		sprbotscreen = windowbottom = overflow_clamp(bottom_frac);
 
-			top_frac += top_step;
-			bottom_frac += bottom_step;
+		top_frac += top_step;
+		bottom_frac += bottom_step;
 
-			// SoM: If column is out of range, why bother with it??
-			if (windowbottom < topbounds || windowtop > bottombounds)
+		// SoM: If column is out of range, why bother with it??
+		if (windowbottom < topbounds || windowtop > bottombounds)
+		{
+			if (dc->numlights)
 			{
-				if (dc_numlights)
+				for (i = 0; i < dc->numlights; i++)
 				{
-					for (i = 0; i < dc_numlights; i++)
-					{
-						rlight = &dc_lightlist[i];
-						rlight->height += rlight->heightstep;
-						if (rlight->flags & FF_CUTLEVEL)
-							rlight->botheight += rlight->botheightstep;
-					}
+					rlight = &dc->lightlist[i];
+					rlight->height += rlight->heightstep;
+					if (rlight->flags & FF_CUTLEVEL)
+						rlight->botheight += rlight->botheightstep;
 				}
-				spryscale += rw_scalestep;
-				continue;
 			}
 
-			dc_iscale = 0xffffffffu / (unsigned)spryscale;
+			spryscale += rw_scalestep;
+			continue;
+		}
 
-			// Get data for the column
-			col = (column_t *)((UINT8 *)R_GetColumn(texnum,maskedtexturecol[dc_x]) - 3);
+		// Get data for the column
+		col = (column_t *)((UINT8 *)R_GetColumn(texnum, maskedtexturecol[dc->x]) - 3);
 
-			// SoM: New code does not rely on R_DrawColumnShadowed_8 which
-			// will (hopefully) put less strain on the stack.
-			if (dc_numlights)
+		if (!fog)
+		{
+			dc->iscale = 0xffffffffu / (unsigned)spryscale;
+
+			if (fuzzy)
+				R_SetColumnFunc(COLDRAWFUNC_FUZZY);
+			else
+				R_SetColumnFunc(BASEDRAWFUNC);
+		}
+
+		// SoM: New code does not rely on R_DrawColumnShadowed which
+		// will (hopefully) put less strain on the stack.
+		if (dc->numlights)
+		{
+			lighttable_t **xwalllights;
+			fixed_t height;
+			fixed_t bheight = 0;
+			INT32 solid = 0;
+
+			auto set_light_vars = [&](INT32 k)
 			{
-				lighttable_t **xwalllights;
-				fixed_t height;
-				fixed_t bheight = 0;
-				INT32 solid = 0;
-				INT32 lighteffect = 0;
+				rlight = &dc->lightlist[k];
 
-				for (i = 0; i < dc_numlights; i++)
+				lightnum = rlight->lightnum;
+
+				if (lightnum < 0)
+					xwalllights = scalelight[0];
+				else if (lightnum >= LIGHTLEVELS)
+					xwalllights = scalelight[LIGHTLEVELS-1];
+				else
+					xwalllights = scalelight[lightnum];
+
+				pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
+
+				if (pindex >= MAXLIGHTSCALE)
+					pindex = MAXLIGHTSCALE-1;
+
+				if (pfloor->flags & FF_FOG)
 				{
-					// Check if the current light effects the colormap/lightlevel
-					rlight = &dc_lightlist[i];
-					lighteffect = !(dc_lightlist[i].flags & FF_NOSHADE);
-					if (lighteffect)
+					if (pfloor->master->frontsector->extra_colormap)
+						rlight->rcolormap = pfloor->master->frontsector->extra_colormap->colormap + (xwalllights[pindex] - colormaps);
+					else
+						rlight->rcolormap = xwalllights[pindex];
+				}
+				else
+				{
+					if (rlight->extra_colormap)
+						rlight->rcolormap = rlight->extra_colormap->colormap + (xwalllights[pindex] - colormaps);
+					else
+						rlight->rcolormap = xwalllights[pindex];
+				}
+			};
+
+			auto set_colormap_below_light = [&]
+			{
+				dc->colormap = rlight->rcolormap;
+				if (encoremap && !(curline->linedef->flags & ML_TFERLINE))
+					dc->colormap += COLORMAP_REMAPOFFSET;
+			};
+
+			// Use the base sector's light level above the first FOF.
+			// You can imagine it as the sky casting its light on top of the highest FOF.
+			set_light_vars(0);
+			set_colormap_below_light();
+
+			for (i = 0; i < dc->numlights; i++)
+			{
+				// Check if the current light effects the colormap/lightlevel
+				rlight = &dc->lightlist[i];
+				xwalllights = NULL;
+
+				if (!(dc->lightlist[i].flags & FF_NOSHADE))
+					set_light_vars(i);
+
+				solid = 0; // don't carry over solid-cutting flag from the previous light
+
+				// Check if the current light can cut the current 3D floor.
+				if (rlight->flags & FF_CUTSOLIDS && !(pfloor->flags & FF_EXTRA))
+				{
+					solid = 1;
+				}
+				else if (rlight->flags & FF_CUTEXTRA && pfloor->flags & FF_EXTRA)
+				{
+					if (rlight->flags & FF_EXTRA)
 					{
-						lightnum = rlight->lightnum;
-
-						if (lightnum < 0)
-							xwalllights = scalelight[0];
-						else if (lightnum >= LIGHTLEVELS)
-							xwalllights = scalelight[LIGHTLEVELS-1];
-						else
-							xwalllights = scalelight[lightnum];
-
-						pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
-
-						if (pindex >= MAXLIGHTSCALE)
-							pindex = MAXLIGHTSCALE-1;
-
-						if (pfloor->flags & FF_FOG)
-						{
-							if (pfloor->master->frontsector->extra_colormap)
-								rlight->rcolormap = pfloor->master->frontsector->extra_colormap->colormap + (xwalllights[pindex] - colormaps);
-							else
-								rlight->rcolormap = xwalllights[pindex];
-						}
-						else
-						{
-							if (rlight->extra_colormap)
-								rlight->rcolormap = rlight->extra_colormap->colormap + (xwalllights[pindex] - colormaps);
-							else
-								rlight->rcolormap = xwalllights[pindex];
-						}
-					}
-
-					solid = 0; // don't carry over solid-cutting flag from the previous light
-
-					// Check if the current light can cut the current 3D floor.
-					if (rlight->flags & FF_CUTSOLIDS && !(pfloor->flags & FF_EXTRA))
-						solid = 1;
-					else if (rlight->flags & FF_CUTEXTRA && pfloor->flags & FF_EXTRA)
-					{
-						if (rlight->flags & FF_EXTRA)
-						{
-							// The light is from an extra 3D floor... Check the flags so
-							// there are no undesired cuts.
-							if ((rlight->flags & (FF_FOG|FF_SWIMMABLE)) == (pfloor->flags & (FF_FOG|FF_SWIMMABLE)))
-								solid = 1;
-						}
-						else
+						// The light is from an extra 3D floor... Check the flags so
+						// there are no undesired cuts.
+						if ((rlight->flags & (FF_FOG|FF_SWIMMABLE)) == (pfloor->flags & (FF_FOG|FF_SWIMMABLE)))
 							solid = 1;
 					}
 					else
-						solid = 0;
-
-					height = rlight->height;
-					rlight->height += rlight->heightstep;
-
-					if (solid)
-					{
-						bheight = rlight->botheight - (FRACUNIT >> 1);
-						rlight->botheight += rlight->botheightstep;
-					}
-
-					if (height <= windowtop)
-					{
-						if (lighteffect)
-						{
-							dc_colormap = rlight->rcolormap;
-							if (encoremap && !(curline->linedef->flags & ML_TFERLINE))
-								dc_colormap += COLORMAP_REMAPOFFSET;
-						}
-						if (solid && windowtop < bheight)
-							windowtop = bheight;
-						continue;
-					}
-
-					windowbottom = height;
-					if (windowbottom >= sprbotscreen)
-					{
-						windowbottom = sprbotscreen;
-						// draw the texture
-						colfunc_2s (col);
-						for (i++; i < dc_numlights; i++)
-						{
-							rlight = &dc_lightlist[i];
-							rlight->height += rlight->heightstep;
-							if (rlight->flags & FF_CUTLEVEL)
-								rlight->botheight += rlight->botheightstep;
-						}
-						continue;
-					}
-					// draw the texture
-					colfunc_2s (col);
-					if (solid)
-						windowtop = bheight;
-					else
-						windowtop = windowbottom + 1;
-					if (lighteffect)
-					{
-						dc_colormap = rlight->rcolormap;
-						if (encoremap && !(curline->linedef->flags & ML_TFERLINE))
-							dc_colormap += COLORMAP_REMAPOFFSET;
-					}
+						solid = 1;
 				}
-				windowbottom = sprbotscreen;
-				// draw the texture, if there is any space left
-				if (windowtop < windowbottom)
-					colfunc_2s (col);
+				else
+					solid = 0;
 
-				spryscale += rw_scalestep;
-				continue;
+				height = rlight->height;
+				rlight->height += rlight->heightstep;
+
+				if (solid)
+				{
+					bheight = rlight->botheight - (FRACUNIT >> 1);
+					rlight->botheight += rlight->botheightstep;
+				}
+
+				if (height <= windowtop)
+				{
+					if (xwalllights)
+					{
+						set_colormap_below_light();
+					}
+
+					if (solid && windowtop < bheight)
+					{
+						windowtop = bheight;
+					}
+
+					continue;
+				}
+
+				windowbottom = height;
+				if (windowbottom >= sprbotscreen)
+				{
+					windowbottom = sprbotscreen;
+
+					// draw the texture
+					colfunc_2s (dc, col);
+					for (i++; i < dc->numlights; i++)
+					{
+						rlight = &dc->lightlist[i];
+						rlight->height += rlight->heightstep;
+
+						if (rlight->flags & FF_CUTLEVEL)
+							rlight->botheight += rlight->botheightstep;
+					}
+
+					continue;
+				}
+
+				// draw the texture
+				colfunc_2s (dc, col);
+
+				if (solid)
+					windowtop = bheight;
+				else
+					windowtop = windowbottom + 1;
+
+				if (xwalllights)
+				{
+					set_colormap_below_light();
+				}
 			}
 
-			// calculate lighting
-			pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
+			windowbottom = sprbotscreen;
 
-			if (pindex >= MAXLIGHTSCALE)
-				pindex = MAXLIGHTSCALE - 1;
+			// draw the texture, if there is any space left
+			if (windowtop < windowbottom)
+			{
+				colfunc_2s (dc, col);
+			}
 
-			dc_colormap = walllights[pindex];
-
-			if (encoremap && !(curline->linedef->flags & ML_TFERLINE))
-				dc_colormap += COLORMAP_REMAPOFFSET;
-
-			if (pfloor->flags & FF_FOG && pfloor->master->frontsector->extra_colormap)
-				dc_colormap = pfloor->master->frontsector->extra_colormap->colormap + (dc_colormap - colormaps);
-			else if (frontsector->extra_colormap)
-				dc_colormap = frontsector->extra_colormap->colormap + (dc_colormap - colormaps);
-
-			// draw the texture
-			colfunc_2s (col);
 			spryscale += rw_scalestep;
+			continue;
 		}
-	}
-	colfunc = wallcolfunc;
 
-#undef CLAMPMAX
-#undef CLAMPMIN
+		// calculate lighting
+		pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
+
+		if (pindex >= MAXLIGHTSCALE)
+			pindex = MAXLIGHTSCALE - 1;
+
+		dc->colormap = walllights[pindex];
+
+		if (encoremap && !(curline->linedef->flags & ML_TFERLINE))
+			dc->colormap += COLORMAP_REMAPOFFSET;
+
+		if (pfloor->flags & FF_FOG && pfloor->master->frontsector->extra_colormap)
+			dc->colormap = pfloor->master->frontsector->extra_colormap->colormap + (dc->colormap - colormaps);
+		else if (frontsector->extra_colormap)
+			dc->colormap = frontsector->extra_colormap->colormap + (dc->colormap - colormaps);
+
+		// draw the texture
+		colfunc_2s (dc, col);
+		spryscale += rw_scalestep;
+	}
+
+	R_SetColumnFunc(BASEDRAWFUNC);
 }
 
 // R_FFloorCanClip
 //
 // Returns true if a fake floor can clip a column away.
-static boolean R_FFloorCanClip(visffloor_t *pfloor)
+static inline boolean R_FFloorCanClip(visffloor_t *pfloor)
 {
-	return (cv_ffloorclip.value && !R_IsFFloorTranslucent(pfloor) && !pfloor->polyobj);
+	return (cv_ffloorclip.value && !R_IsFFloorTranslucent(pfloor));
+}
+
+// R_ExpandPlaneY
+//
+// A simple function to modify a vsplane's top and bottom for a particular column
+// Sort of like R_ExpandPlane in r_plane.c, except this is vertical expansion
+static inline void R_ExpandPlaneY(visplane_t *pl, INT32 x, INT16 top, INT16 bottom)
+{
+	// Expand the plane, don't shrink it!
+	// note: top and bottom default to 0xFFFF and 0x0000 respectively, which is totally compatible with this
+	if (pl->top[x] > top)       pl->top[x] = top;
+	if (pl->bottom[x] < bottom) pl->bottom[x] = bottom;
 }
 
 //
@@ -1195,10 +1156,28 @@ static boolean R_FFloorCanClip(visffloor_t *pfloor)
 //  textures.
 // CALLED: CORE LOOPING ROUTINE.
 //
-#define HEIGHTBITS              12
-#define HEIGHTUNIT              (1<<HEIGHTBITS)
 
-static void R_RenderSegLoop (void)
+static void R_DrawWallColumn(drawcolumndata_t* dc, INT32 yl, INT32 yh, fixed_t mid, fixed_t texturecolumn, INT32 texture, boolean remap)
+{
+	dc->yl = yl;
+	dc->yh = yh;
+	dc->texturemid = mid;
+	dc->source = R_GetColumn(texture, texturecolumn);
+	dc->texheight = textureheight[texture] >> FRACBITS;
+	dc->sourcelength = dc->texheight;
+	//R_SetColumnFunc(colfunctype);
+	coldrawfunc_t* colfunccopy = colfunc;
+	drawcolumndata_t dc_copy = *dc;
+	if (remap)
+	{
+		dc_copy.colormap += COLORMAP_REMAPOFFSET;
+	}
+	colfunccopy(const_cast<drawcolumndata_t*>(&dc_copy));
+}
+
+static boolean didsolidcol; // True if at least one column was marked solid
+
+static void R_RenderSegLoop(drawcolumndata_t* dc)
 {
 	angle_t angle;
 	size_t  pindex;
@@ -1212,6 +1191,7 @@ static void R_RenderSegLoop (void)
 	INT32     bottom;
 	INT32     i;
 
+	// Loop over width
 	for (; rw_x < rw_stopx; rw_x++)
 	{
 		// mark floor / ceiling areas
@@ -1226,15 +1206,11 @@ static void R_RenderSegLoop (void)
 
 		if (markceiling)
 		{
-			bottom = yl-1;
+			bottom = yl > floorclip[rw_x] ? floorclip[rw_x] : yl;
 
-			if (bottom >= floorclip[rw_x])
-				bottom = floorclip[rw_x]-1;
-
-			if (top <= bottom && ceilingplane)
+			if (top <= --bottom && ceilingplane)
 			{
-				ceilingplane->top[rw_x] = (INT16)top;
-				ceilingplane->bottom[rw_x] = (INT16)bottom;
+				R_ExpandPlaneY(ceilingplane, rw_x, top, bottom);
 			}
 		}
 
@@ -1251,8 +1227,7 @@ static void R_RenderSegLoop (void)
 
 			if (++top <= bottom && floorplane)
 			{
-				floorplane->top[rw_x] = (INT16)top;
-				floorplane->bottom[rw_x] = (INT16)bottom;
+				R_ExpandPlaneY(floorplane, rw_x, top, bottom);
 			}
 		}
 
@@ -1272,14 +1247,6 @@ static void R_RenderSegLoop (void)
 				if (ffloor[i].polyobj && (!curline->polyseg || ffloor[i].polyobj != curline->polyseg))
 					continue;
 
-				// FIXME hack to fix planes disappearing when a seg goes behind the camera. This NEEDS to be changed to be done properly. -Red
-				if (curline->polyseg) {
-					if (ffloor[i].plane->minx > rw_x)
-						ffloor[i].plane->minx = rw_x;
-					else if (ffloor[i].plane->maxx < rw_x)
-						ffloor[i].plane->maxx = rw_x;
-				}
-
 				if (ffloor[i].height < viewz)
 				{
 					INT32 top_w = (ffloor[i].f_frac >> HEIGHTBITS) + 1;
@@ -1292,11 +1259,12 @@ static void R_RenderSegLoop (void)
 						bottom_w = bottom;
 
 					// Polyobject-specific hack to fix plane leaking -Red
-					if (curline->polyseg && ffloor[i].polyobj && ffloor[i].polyobj == curline->polyseg && top_w >= bottom_w) {
-						ffloor[i].plane->top[rw_x] = ffloor[i].plane->bottom[rw_x] = 0xFFFF;
-					} else
-
-					if (top_w <= bottom_w)
+					if (ffloor[i].polyobj && top_w >= bottom_w)
+					{
+						ffloor[i].plane->top[rw_x] = 0xFFFF;
+						ffloor[i].plane->bottom[rw_x] = 0x0000; // fix for sky plane drawing crashes - Monster Iestyn 25/05/18
+					}
+					else if (top_w <= bottom_w)
 					{
 						fftop = (INT16)top_w;
 						ffbottom = (INT16)bottom_w;
@@ -1310,6 +1278,7 @@ static void R_RenderSegLoop (void)
 						{
 							rw_floormarked = true;
 							floorclip[rw_x] = fftop;
+
 							if (yh > fftop)
 								yh = fftop;
 
@@ -1336,11 +1305,12 @@ static void R_RenderSegLoop (void)
 						bottom_w = bottom;
 
 					// Polyobject-specific hack to fix plane leaking -Red
-					if (curline->polyseg && ffloor[i].polyobj && ffloor[i].polyobj == curline->polyseg && top_w >= bottom_w) {
-						ffloor[i].plane->top[rw_x] = ffloor[i].plane->bottom[rw_x] = 0xFFFF;
-					} else
-
-					if (top_w <= bottom_w)
+					if (ffloor[i].polyobj && top_w >= bottom_w)
+					{
+						ffloor[i].plane->top[rw_x] = 0xFFFF;
+						ffloor[i].plane->bottom[rw_x] = 0x0000; // fix for sky plane drawing crashes - Monster Iestyn 25/05/18
+					}
+					else if (top_w <= bottom_w)
 					{
 						fftop = (INT16)top_w;
 						ffbottom = (INT16)bottom_w;
@@ -1354,6 +1324,7 @@ static void R_RenderSegLoop (void)
 						{
 							rw_ceilingmarked = true;
 							ceilingclip[rw_x] = ffbottom;
+
 							if (yl < ffbottom)
 								yl = ffbottom;
 
@@ -1377,7 +1348,8 @@ static void R_RenderSegLoop (void)
 		// Mask 4095 to guarantee this index is within bounds
 		texturecolumn = rw_offset-FixedMul(FINETANGENT(angle & 4095),rw_distance);
 
-		if (oldtexturecolumn != -1) {
+		if (oldtexturecolumn != -1)
+		{
 			rw_bottomtexturemid += FixedMul(rw_bottomtextureslide,  oldtexturecolumn-texturecolumn);
 			rw_midtexturemid    += FixedMul(rw_midtextureslide,     oldtexturecolumn-texturecolumn);
 			rw_toptexturemid    += FixedMul(rw_toptextureslide,     oldtexturecolumn-texturecolumn);
@@ -1396,30 +1368,28 @@ static void R_RenderSegLoop (void)
 			if (pindex >=  MAXLIGHTSCALE)
 				pindex = MAXLIGHTSCALE-1;
 
-			dc_colormap = walllights[pindex];
-			if (encoremap && !(curline->linedef->flags & ML_TFERLINE))
-				dc_colormap += COLORMAP_REMAPOFFSET;
-			dc_x = rw_x;
-			dc_iscale = 0xffffffffu / (unsigned)rw_scale;
+			dc->colormap = walllights[pindex];
+
+			dc->x = rw_x;
+			dc->iscale = 0xffffffffu / (unsigned)rw_scale;
 
 			if (frontsector->extra_colormap)
-				dc_colormap = frontsector->extra_colormap->colormap + (dc_colormap - colormaps);
+				dc->colormap = frontsector->extra_colormap->colormap + (dc->colormap - colormaps);
 		}
 
-		if (dc_numlights)
+		if (dc->numlights)
 		{
 			lighttable_t **xwalllights;
-			for (i = 0; i < dc_numlights; i++)
+
+			for (i = 0; i < dc->numlights; i++)
 			{
 				INT32 lightnum;
-				lightnum = (dc_lightlist[i].lightlevel >> LIGHTSEGSHIFT);
+				lightnum = R_GetSoftLightlevel(dc->lightlist[i].lightlevel);
 
-				if (dc_lightlist[i].extra_colormap)
+				if (dc->lightlist[i].extra_colormap)
 					;
-				else if (curline->v1->y == curline->v2->y)
-					lightnum--;
-				else if (curline->v1->x == curline->v2->x)
-					lightnum++;
+				else if (P_ApplyLightOffset(lightnum, curline->frontsector))
+					lightnum += curline->lightOffset;
 
 				if (lightnum < 0)
 					xwalllights = scalelight[0];
@@ -1433,29 +1403,27 @@ static void R_RenderSegLoop (void)
 				if (pindex >=  MAXLIGHTSCALE)
 					pindex = MAXLIGHTSCALE-1;
 
-				if (dc_lightlist[i].extra_colormap)
-					dc_lightlist[i].rcolormap = dc_lightlist[i].extra_colormap->colormap + (xwalllights[pindex] - colormaps);
+				if (dc->lightlist[i].extra_colormap)
+					dc->lightlist[i].rcolormap = dc->lightlist[i].extra_colormap->colormap + (xwalllights[pindex] - colormaps);
 				else
-					dc_lightlist[i].rcolormap = xwalllights[pindex];
+					dc->lightlist[i].rcolormap = xwalllights[pindex];
 
-				colfunc = R_DrawColumnShadowed_8;
+				R_SetColumnFunc(COLDRAWFUNC_SHADOWED);
 			}
 		}
 
 		frontscale[rw_x] = rw_scale;
 
+		const INT16 topclip = (yl >= 0) ? ((yl > viewheight) ? (INT16)viewheight : (INT16)((INT16)yl - 1)) : -1;
+		const INT16 bottomclip = (yh < viewheight) ? ((yh < -1) ? -1 : (INT16)((INT16)yh + 1)) : (INT16)viewheight;
+
 		// draw the wall tiers
 		if (midtexture)
 		{
 			// single sided line
 			if (yl <= yh && yh >= 0 && yl < viewheight)
 			{
-				dc_yl = yl;
-				dc_yh = yh;
-				dc_texturemid = rw_midtexturemid;
-				dc_source = R_GetColumn(midtexture,texturecolumn);
-				dc_texheight = textureheight[midtexture]>>FRACBITS;
-				colfunc();
+				R_DrawWallColumn(dc, yl, yh, rw_midtexturemid, texturecolumn, midtexture, midremap);
 
 				// dont draw anything more for this column, since
 				// a midtexture blocks the view
@@ -1468,16 +1436,13 @@ static void R_RenderSegLoop (void)
 			{
 				// note: don't use min/max macros, since casting from INT32 to INT16 is involved here
 				if (markceiling && (!rw_ceilingmarked))
-					ceilingclip[rw_x] = (yl >= 0) ? ((yl > viewheight) ? (INT16)viewheight : (INT16)((INT16)yl - 1)) : -1;
+					ceilingclip[rw_x] = topclip;
 				if (markfloor && (!rw_floormarked))
-					floorclip[rw_x] = (yh < viewheight) ? ((yh < -1) ? -1 : (INT16)((INT16)yh + 1)) : (INT16)viewheight;
+					floorclip[rw_x] = bottomclip;
 			}
 		}
 		else
 		{
-			INT16 topclip = (yl >= 0) ? ((yl > viewheight) ? (INT16)viewheight : (INT16)((INT16)yl - 1)) : -1;
-			INT16 bottomclip = (yh < viewheight) ? ((yh < -1) ? -1 : (INT16)((INT16)yh + 1)) : (INT16)viewheight;
-
 			// two sided line
 			if (toptexture)
 			{
@@ -1497,12 +1462,7 @@ static void R_RenderSegLoop (void)
 					}
 					else if (mid >= 0) // safe to draw top texture
 					{
-						dc_yl = yl;
-						dc_yh = mid;
-						dc_texturemid = rw_toptexturemid;
-						dc_source = R_GetColumn(toptexture,texturecolumn);
-						dc_texheight = textureheight[toptexture]>>FRACBITS;
-						colfunc();
+						R_DrawWallColumn(dc, yl, mid, rw_toptexturemid, texturecolumn, toptexture, topremap);
 						ceilingclip[rw_x] = (INT16)mid;
 					}
 					else if (!rw_ceilingmarked) // entirely off top of screen
@@ -1533,13 +1493,7 @@ static void R_RenderSegLoop (void)
 					}
 					else if (mid < viewheight) // safe to draw bottom texture
 					{
-						dc_yl = mid;
-						dc_yh = yh;
-						dc_texturemid = rw_bottomtexturemid;
-						dc_source = R_GetColumn(bottomtexture,
-							texturecolumn);
-						dc_texheight = textureheight[bottomtexture]>>FRACBITS;
-						colfunc();
+						R_DrawWallColumn(dc, mid, yh, rw_bottomtexturemid, texturecolumn, bottomtexture, bottomremap);
 						floorclip[rw_x] = (INT16)mid;
 					}
 					else if (!rw_floormarked)  // entirely off bottom of screen
@@ -1552,25 +1506,33 @@ static void R_RenderSegLoop (void)
 				floorclip[rw_x] = bottomclip;
 		}
 
+		if ((markceiling || markfloor) && (floorclip[rw_x] <= ceilingclip[rw_x] + 1))
+		{
+			solidcol[rw_x] = 1;
+			didsolidcol = true;
+		}
+
 		if (maskedtexture || numthicksides)
 		{
 			// save texturecol for backdrawing of masked mid texture
 			maskedtexturecol[rw_x] = (INT16)texturecolumn;
 
-			if (maskedtextureheight != NULL) {
+			if (maskedtextureheight != NULL)
+			{
 				maskedtextureheight[rw_x] = (!!(curline->linedef->flags & ML_DONTPEGBOTTOM) ^ !!(curline->linedef->flags & ML_EFFECT3) ?
-											max(rw_midtexturemid, rw_midtextureback) :
-											min(rw_midtexturemid, rw_midtextureback));
+											std::max(rw_midtexturemid, rw_midtextureback) :
+											std::min(rw_midtexturemid, rw_midtextureback));
 			}
 		}
 
-		if (dc_numlights)
+		if (dc->numlights)
 		{
-			for (i = 0; i < dc_numlights; i++)
+			for (i = 0; i < dc->numlights; i++)
 			{
-				dc_lightlist[i].height += dc_lightlist[i].heightstep;
-				if (dc_lightlist[i].flags & FF_CUTSOLIDS)
-					dc_lightlist[i].botheight += dc_lightlist[i].botheightstep;
+				dc->lightlist[i].height += dc->lightlist[i].heightstep;
+
+				if (dc->lightlist[i].flags & FF_CUTSOLIDS)
+					dc->lightlist[i].botheight += dc->lightlist[i].botheightstep;
 			}
 		}
 
@@ -1586,7 +1548,7 @@ static void R_RenderSegLoop (void)
 		{
 			if (curline->polyseg && (ffloor[i].polyobj != curline->polyseg))
 				continue;
-			
+
 			ffloor[i].f_clip[rw_x] = ffloor[i].c_clip[rw_x] = (INT16)((ffloor[i].b_frac >> HEIGHTBITS) & 0xFFFF);
 			ffloor[i].b_frac += ffloor[i].b_step;
 		}
@@ -1599,6 +1561,75 @@ static void R_RenderSegLoop (void)
 	//colfunc = wallcolfunc;
 }
 
+static void R_MarkSegBounds(void)
+{
+	INT32     yl, yh;
+	INT32 top, bottom;
+	INT16 topclip, bottomclip;
+
+	// Loop over width
+	for (; rw_x < rw_stopx; rw_x++)
+	{
+		// mark floor / ceiling areas
+		yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS;
+
+		// no space above wall?
+		top = ceilingclip[rw_x]+1;
+
+		// no space above wall?
+		if (yl < top)
+			yl = top;
+
+		if (markceiling)
+		{
+			bottom = yl > floorclip[rw_x] ? floorclip[rw_x] : yl;
+
+			if (top <= --bottom && ceilingplane)
+			{
+				R_ExpandPlaneY(ceilingplane, rw_x, top, bottom);
+			}
+		}
+
+		yh = bottomfrac>>HEIGHTBITS;
+
+		bottom = floorclip[rw_x]-1;
+
+		if (yh > bottom)
+			yh = bottom;
+
+		if (markfloor)
+		{
+			top = yh < ceilingclip[rw_x] ? ceilingclip[rw_x] : yh;
+
+			if (++top <= bottom && floorplane)
+			{
+				R_ExpandPlaneY(floorplane, rw_x, top, bottom);
+			}
+		}
+
+		frontscale[rw_x] = rw_scale;
+
+		topclip = (yl >= 0) ? ((yl > viewheight) ? (INT16)viewheight : (INT16)((INT16)yl - 1)) : -1;
+		bottomclip = (yh < viewheight) ? ((yh < -1) ? -1 : (INT16)((INT16)yh + 1)) : (INT16)viewheight;
+
+		if (markceiling) // no top wall
+			ceilingclip[rw_x] = topclip;
+
+		if (markfloor) // no bottom wall
+			floorclip[rw_x] = bottomclip;
+
+		if (floorclip[rw_x] <= ceilingclip[rw_x] + 1)
+		{
+			solidcol[rw_x] = 1;
+			didsolidcol = true;
+		}
+
+		rw_scale += rw_scalestep;
+		topfrac += topstep;
+		bottomfrac += bottomstep;
+	}
+}
+
 // Uses precalculated seg->length
 static INT64 R_CalcSegDist(seg_t* seg, INT64 x2, INT64 y2)
 {
@@ -1616,6 +1647,33 @@ static INT64 R_CalcSegDist(seg_t* seg, INT64 x2, INT64 y2)
 	}
 }
 
+static size_t maxdrawsegs = 0;
+
+static fixed_t *frontscaletable = NULL;
+static fixed_t *maskedheighttable = NULL;
+
+void R_AllocSegMemory(void)
+{
+	if (!maxdrawsegs)
+		return;
+
+	frontscaletable = static_cast<fixed_t*>(Z_Realloc(frontscaletable, sizeof(*frontscaletable) * (maxdrawsegs * viewwidth), PU_STATIC, NULL));
+	maskedheighttable = static_cast<fixed_t*>(Z_Realloc(maskedheighttable, sizeof(*maskedheighttable) * (maxdrawsegs * viewwidth), PU_STATIC, NULL));
+
+	drawseg_t *lastseg = drawsegs + maxdrawsegs;
+
+	fixed_t *frontscale_p = frontscaletable;
+	fixed_t *maskedheight_p = maskedheighttable;
+
+	for (drawseg_t *ds = drawsegs; ds < lastseg; ds++)
+	{
+		ds->frontscale = frontscale_p;
+		ds->maskedtextureheight = maskedheight_p;
+		frontscale_p += viewwidth;
+		maskedheight_p += viewwidth;
+	}
+}
+
 //
 // R_StoreWallRange
 // A wall segment will be drawn
@@ -1634,7 +1692,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	INT32 range;
 	vertex_t segleft, segright;
 	fixed_t ceilingfrontslide, floorfrontslide, ceilingbackslide, floorbackslide;
-	static size_t maxdrawsegs = 0;
+	drawcolumndata_t dc = {};
 
 	maskedtextureheight = NULL;
 	//initialize segleft and segright
@@ -1643,15 +1701,24 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 	if (ds_p == drawsegs+maxdrawsegs)
 	{
+		size_t curpos = curdrawsegs - drawsegs;
 		size_t pos = ds_p - drawsegs;
 		size_t newmax = maxdrawsegs ? maxdrawsegs*2 : 128;
+
 		if (firstseg)
 			firstseg = (drawseg_t *)(firstseg - drawsegs);
-		drawsegs = Z_Realloc(drawsegs, newmax*sizeof (*drawsegs), PU_STATIC, NULL);
+
+		drawsegs = static_cast<drawseg_t*>(Z_Realloc(drawsegs, newmax*sizeof (*drawsegs), PU_STATIC, NULL));
+
 		ds_p = drawsegs + pos;
+
 		maxdrawsegs = newmax;
+		curdrawsegs = drawsegs + curpos;
+
 		if (firstseg)
 			firstseg = drawsegs + (size_t)firstseg;
+
+		R_AllocSegMemory();
 	}
 
 	sidedef = curline->sidedef;
@@ -1684,6 +1751,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	{
 		size_t pos = lastopening - openings;
 		size_t need = (rw_stopx - start)*4 + pos;
+
 		if (need > maxopenings)
 		{
 			drawseg_t *ds;  //needed for fix from *cough* zdoom *cough*
@@ -1693,18 +1761,18 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			do
 				maxopenings = maxopenings ? maxopenings*2 : 16384;
 			while (need > maxopenings);
-			openings = Z_Realloc(openings, maxopenings * sizeof (*openings), PU_STATIC, NULL);
+			openings = static_cast<INT16*>(Z_Realloc(openings, maxopenings * sizeof (*openings), PU_STATIC, NULL));
 			lastopening = openings + pos;
-			
+
 			if (oldopenings == NULL)
-			return;
+				return;
 
 			// borrowed fix from *cough* zdoom *cough*
 			// [RH] We also need to adjust the openings pointers that
 			//    were already stored in drawsegs.
 			for (ds = drawsegs; ds < ds_p; ds++)
 			{
-#define ADJUST(p) if (ds->p + ds->x1 >= oldopenings && ds->p + ds->x1 <= oldlast) ds->p = ds->p - oldopenings + openings;
+#define ADJUST(p) if (ds->p + ds->x1 >= oldopenings && ds->p + ds->x1 <= oldlast) ds->p = (ds->p - oldopenings) + openings;
 				ADJUST(maskedtexturecol);
 				ADJUST(sprtopclip);
 				ADJUST(sprbottomclip);
@@ -1752,77 +1820,55 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	if (frontsector->hasslope || (backsector && backsector->hasslope)) // Commenting this out for FOFslop. -Red
 	{
 		angle_t temp;
+		double a1, b1, c1, a2, b2, c2, det; // 1 is the seg, 2 is the view angle vector...
 
 		// left
 		temp = xtoviewangle[start]+viewangle;
 
-#define FIXED_TO_DOUBLE(x) (((double)(x)) / ((double)FRACUNIT))
-#define DOUBLE_TO_FIXED(x) (fixed_t)((x) * ((double)FRACUNIT))
+		a1 = FixedToDouble(curline->v2->y-curline->v1->y);
+		b1 = FixedToDouble(curline->v1->x-curline->v2->x);
+		c1 = a1*FixedToDouble(curline->v1->x) + b1*FixedToDouble(curline->v1->y);
 
-		{
-			// Both lines can be written in slope-intercept form, so figure out line intersection
-			double a1, b1, c1, a2, b2, c2, det; // 1 is the seg, 2 is the view angle vector...
-			///TODO: convert to fixed point
+		// Both lines can be written in slope-intercept form, so figure out line intersection
 
-			a1 = FIXED_TO_DOUBLE(curline->v2->y-curline->v1->y);
-			b1 = FIXED_TO_DOUBLE(curline->v1->x-curline->v2->x);
-			c1 = a1*FIXED_TO_DOUBLE(curline->v1->x) + b1*FIXED_TO_DOUBLE(curline->v1->y);
+		// left
+		a2 = -FixedToDouble(FINESINE(temp>>ANGLETOFINESHIFT));
+		b2 = FixedToDouble(FINECOSINE(temp>>ANGLETOFINESHIFT));
+		c2 = a2*FixedToDouble(viewx) + b2*FixedToDouble(viewy);
 
-			a2 = -FIXED_TO_DOUBLE(FINESINE(temp>>ANGLETOFINESHIFT));
-			b2 = FIXED_TO_DOUBLE(FINECOSINE(temp>>ANGLETOFINESHIFT));
-			c2 = a2*FIXED_TO_DOUBLE(viewx) + b2*FIXED_TO_DOUBLE(viewy);
+		det = a1*b2 - a2*b1;
 
-			det = a1*b2 - a2*b1;
-
-			ds_p->leftpos.x = segleft.x = DOUBLE_TO_FIXED((b2*c1 - b1*c2)/det);
-			ds_p->leftpos.y = segleft.y = DOUBLE_TO_FIXED((a1*c2 - a2*c1)/det);
-		}
+		ds_p->leftpos.x = segleft.x = DoubleToFixed((b2*c1 - b1*c2)/det);
+		ds_p->leftpos.y = segleft.y = DoubleToFixed((a1*c2 - a2*c1)/det);
 
 		// right
 		temp = xtoviewangle[stop]+viewangle;
 
-		{
-			// Both lines can be written in slope-intercept form, so figure out line intersection
-			double a1, b1, c1, a2, b2, c2, det; // 1 is the seg, 2 is the view angle vector...
-			///TODO: convert to fixed point
+		a2 = -FixedToDouble(FINESINE(temp>>ANGLETOFINESHIFT));
+		b2 = FixedToDouble(FINECOSINE(temp>>ANGLETOFINESHIFT));
+		c2 = a2*FixedToDouble(viewx) + b2*FixedToDouble(viewy);
 
-			a1 = FIXED_TO_DOUBLE(curline->v2->y-curline->v1->y);
-			b1 = FIXED_TO_DOUBLE(curline->v1->x-curline->v2->x);
-			c1 = a1*FIXED_TO_DOUBLE(curline->v1->x) + b1*FIXED_TO_DOUBLE(curline->v1->y);
-
-			a2 = -FIXED_TO_DOUBLE(FINESINE(temp>>ANGLETOFINESHIFT));
-			b2 = FIXED_TO_DOUBLE(FINECOSINE(temp>>ANGLETOFINESHIFT));
-			c2 = a2*FIXED_TO_DOUBLE(viewx) + b2*FIXED_TO_DOUBLE(viewy);
-
-			det = a1*b2 - a2*b1;
-
-			ds_p->rightpos.x = segright.x = DOUBLE_TO_FIXED((b2*c1 - b1*c2)/det);
-			ds_p->rightpos.y = segright.y = DOUBLE_TO_FIXED((a1*c2 - a2*c1)/det);
-		}
-
-#undef FIXED_TO_DOUBLE
-#undef DOUBLE_TO_FIXED
+		det = a1*b2 - a2*b1;
 
+		ds_p->rightpos.x = segright.x = DoubleToFixed((b2*c1 - b1*c2)/det);
+		ds_p->rightpos.y = segright.y = DoubleToFixed((a1*c2 - a2*c1)/det);
 	}
 
-	if (frontsector->c_slope) {
-		worldtop = P_GetZAt(frontsector->c_slope, segleft.x, segleft.y) - viewz;
-		worldtopslope = P_GetZAt(frontsector->c_slope, segright.x, segright.y) - viewz;
-	} else {
-		worldtopslope =
-		worldtop = frontsector->ceilingheight - viewz;
-	}
+#define SLOPEPARAMS(slope, end1, end2, normalheight) \
+	end1 = P_GetZAt(slope,  segleft.x,  segleft.y, normalheight); \
+	end2 = P_GetZAt(slope, segright.x, segright.y, normalheight);
 
-
-	if (frontsector->f_slope) {
-		worldbottom = P_GetZAt(frontsector->f_slope, segleft.x, segleft.y) - viewz;
-		worldbottomslope = P_GetZAt(frontsector->f_slope, segright.x, segright.y) - viewz;
-	} else {
-		worldbottomslope =
-		worldbottom = frontsector->floorheight - viewz;
-	}
+	SLOPEPARAMS(frontsector->c_slope, worldtop,    worldtopslope,    frontsector->ceilingheight)
+	SLOPEPARAMS(frontsector->f_slope, worldbottom, worldbottomslope, frontsector->floorheight)
+	// subtract viewz from these to turn them into
+	// positions relative to the camera's z position
+	worldtop -= viewz;
+	worldtopslope -= viewz;
+	worldbottom -= viewz;
+	worldbottomslope -= viewz;
 
 	midtexture = toptexture = bottomtexture = maskedtexture = 0;
+	midremap = topremap = bottomremap = false;
 	ds_p->maskedtexturecol = NULL;
 	ds_p->numthicksides = numthicksides = 0;
 	ds_p->thicksidecol = NULL;
@@ -1840,12 +1886,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			if (ffloor[i].polyobj && (!ds_p->curline->polyseg || ffloor[i].polyobj != ds_p->curline->polyseg))
 				continue;
 
-			if (ffloor[i].slope) {
-				ffloor[i].f_pos = P_GetZAt(ffloor[i].slope, segleft.x, segleft.y) - viewz;
-				ffloor[i].f_pos_slope = P_GetZAt(ffloor[i].slope, segright.x, segright.y) - viewz;
-			} else
-				ffloor[i].f_pos_slope =
-			ffloor[i].f_pos = ffloor[i].height - viewz;
+			ffloor[i].f_pos       = P_GetZAt(ffloor[i].slope, segleft .x, segleft .y, ffloor[i].height) - viewz;
+			ffloor[i].f_pos_slope = P_GetZAt(ffloor[i].slope, segright.x, segright.y, ffloor[i].height) - viewz;
 		}
 	}
 
@@ -1853,30 +1895,38 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	rw_toptextureslide = rw_midtextureslide = rw_bottomtextureslide = 0;
 	ceilingfrontslide = floorfrontslide = ceilingbackslide = floorbackslide = 0;
 
+	if (backsector || frontsector->f_slope || frontsector->c_slope)
 	{
 		angle_t lineangle = R_PointToAngle2(curline->v1->x, curline->v1->y, curline->v2->x, curline->v2->y);
 
 		if (frontsector->f_slope)
-			floorfrontslide = FixedMul(frontsector->f_slope->zdelta, FINECOSINE((lineangle-frontsector->f_slope->xydirection)>>ANGLETOFINESHIFT));
+			floorfrontslide   = FixedMul(frontsector->f_slope->zdelta, FINECOSINE((lineangle-frontsector->f_slope->xydirection)>>ANGLETOFINESHIFT));
 
 		if (frontsector->c_slope)
 			ceilingfrontslide = FixedMul(frontsector->c_slope->zdelta, FINECOSINE((lineangle-frontsector->c_slope->xydirection)>>ANGLETOFINESHIFT));
 
-		if (backsector && backsector->f_slope)
-			floorbackslide = FixedMul(backsector->f_slope->zdelta, FINECOSINE((lineangle-backsector->f_slope->xydirection)>>ANGLETOFINESHIFT));
+		if (backsector)
+		{
+			if (backsector->f_slope)
+				floorbackslide    = FixedMul(backsector->f_slope->zdelta,  FINECOSINE((lineangle-backsector->f_slope->xydirection)>>ANGLETOFINESHIFT));
 
-		if (backsector && backsector->c_slope)
-			ceilingbackslide = FixedMul(backsector->c_slope->zdelta, FINECOSINE((lineangle-backsector->c_slope->xydirection)>>ANGLETOFINESHIFT));
+			if (backsector->c_slope)
+				ceilingbackslide  = FixedMul(backsector->c_slope->zdelta,  FINECOSINE((lineangle-backsector->c_slope->xydirection)>>ANGLETOFINESHIFT));
+		}
 	}
 
 	if (!backsector)
 	{
 		fixed_t texheight;
+
 		// single sided line
 		midtexture = R_GetTextureNum(sidedef->midtexture);
+		midremap = (encoremap && !(curline->linedef->flags & ML_TFERLINE));
 		texheight = textureheight[midtexture];
+
 		// a single sided line is terminal, so it must mark ends
 		markfloor = markceiling = true;
+
 		if (linedef->flags & ML_EFFECT2)
 		{
 			if (linedef->flags & ML_DONTPEGBOTTOM)
@@ -1906,85 +1956,80 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	else
 	{
 		// two sided line
+		boolean bothceilingssky = false; // turned on if both back and front ceilings are sky
 
-		if (backsector->c_slope) {
-			worldhigh = P_GetZAt(backsector->c_slope, segleft.x, segleft.y) - viewz;
-			worldhighslope = P_GetZAt(backsector->c_slope, segright.x, segright.y) - viewz;
-		} else {
-			worldhighslope =
-			worldhigh = backsector->ceilingheight - viewz;
-		}
-
-
-		if (backsector->f_slope) {
-			worldlow = P_GetZAt(backsector->f_slope, segleft.x, segleft.y) - viewz;
-			worldlowslope = P_GetZAt(backsector->f_slope, segright.x, segright.y) - viewz;
-		} else {
-			worldlowslope =
-			worldlow = backsector->floorheight - viewz;
-		}
-
+		SLOPEPARAMS(backsector->c_slope, worldhigh, worldhighslope, backsector->ceilingheight)
+		SLOPEPARAMS(backsector->f_slope, worldlow,  worldlowslope,  backsector->floorheight)
+		worldhigh -= viewz;
+		worldhighslope -= viewz;
+		worldlow -= viewz;
+		worldlowslope -= viewz;
 
 		// hack to allow height changes in outdoor areas
+		// This is what gets rid of the upper textures if there should be sky
 		if (frontsector->ceilingpic == skyflatnum
 			&& backsector->ceilingpic == skyflatnum)
 		{
 			worldtopslope = worldhighslope =
 			worldtop = worldhigh;
+
+			bothceilingssky = true;
 		}
 
 		ds_p->sprtopclip = ds_p->sprbottomclip = NULL;
 		ds_p->silhouette = 0;
 
-		if (
-			worldbottomslope > worldlowslope ||
-			worldbottom > worldlow)
+		if (worldbottomslope > worldlowslope || worldbottom > worldlow)
 		{
 			ds_p->silhouette = SIL_BOTTOM;
-			if ((backsector->f_slope ? P_GetZAt(backsector->f_slope, viewx, viewy) : backsector->floorheight) > viewz)
+			if (P_GetSectorFloorZAt(backsector, viewx, viewy) > viewz)
 				ds_p->bsilheight = INT32_MAX;
 			else
 				ds_p->bsilheight = (frontsector->f_slope ? INT32_MAX : frontsector->floorheight);
 		}
-		else if ((backsector->f_slope ? P_GetZAt(backsector->f_slope, viewx, viewy) : backsector->floorheight) > viewz)
+		else if (P_GetSectorFloorZAt(backsector, viewx, viewy) > viewz)
 		{
 			ds_p->silhouette = SIL_BOTTOM;
 			ds_p->bsilheight = INT32_MAX;
 			// ds_p->sprbottomclip = negonearray;
 		}
 
-		if (
-			worldtopslope < worldhighslope ||
-			worldtop < worldhigh)
+		if (!bothceilingssky)
 		{
-			ds_p->silhouette |= SIL_TOP;
-			if ((backsector->c_slope ? P_GetZAt(backsector->c_slope, viewx, viewy) : backsector->ceilingheight) < viewz)
+			if (worldtopslope < worldhighslope || worldtop < worldhigh)
+			{
+				ds_p->silhouette |= SIL_TOP;
+				if (P_GetSectorCeilingZAt(backsector, viewx, viewy) < viewz)
+					ds_p->tsilheight = INT32_MIN;
+				else
+					ds_p->tsilheight = (frontsector->c_slope ? INT32_MIN : frontsector->ceilingheight);
+			}
+			else if (P_GetSectorCeilingZAt(backsector, viewx, viewy) < viewz)
+			{
+				ds_p->silhouette |= SIL_TOP;
 				ds_p->tsilheight = INT32_MIN;
-			else
-				ds_p->tsilheight = (frontsector->c_slope ? INT32_MIN : frontsector->ceilingheight);
-		}
-		else if ((backsector->c_slope ? P_GetZAt(backsector->c_slope, viewx, viewy) : backsector->ceilingheight) < viewz)
-		{
-			ds_p->silhouette |= SIL_TOP;
-			ds_p->tsilheight = INT32_MIN;
-			// ds_p->sprtopclip = screenheightarray;
+				// ds_p->sprtopclip = screenheightarray;
+			}
 		}
 
 		if (viewsector != frontsector && viewsector != backsector)
 		{
-			if (worldhigh <= worldbottom && worldhighslope <= worldbottomslope)
+			//SoM: 3/25/2000: This code fixes an automap bug that didn't check
+			// frontsector->ceiling and backsector->floor to see if a door was closed.
+			// Without the following code, sprites get displayed behind closed doors.
+			if (doorclosed || (worldhigh <= worldbottom && worldhighslope <= worldbottomslope))
 			{
 				ds_p->sprbottomclip = negonearray;
 				ds_p->bsilheight = INT32_MAX;
 				ds_p->silhouette |= SIL_BOTTOM;
 			}
-
-			if (worldlow >= worldtop && worldlowslope >= worldtopslope)
-			{
+			if (doorclosed || (worldlow >= worldtop && worldlowslope >= worldtopslope))
+			{                   // killough 1/17/98, 2/8/98
 				ds_p->sprtopclip = screenheightarray;
 				ds_p->tsilheight = INT32_MIN;
 				ds_p->silhouette |= SIL_TOP;
 			}
+<<<<<<< HEAD:src/r_segs.c
 
 			//SoM: 3/25/2000: This code fixes an automap bug that didn't check
 			// frontsector->ceiling and backsector->floor to see if a door was closed.
@@ -2001,23 +2046,25 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				ds_p->tsilheight = INT32_MIN;
 				ds_p->silhouette |= SIL_TOP;
 			}
+=======
+>>>>>>> Saturn-Next:src/r_segs.cpp
 		}
 
 		if (worldlow != worldbottom
 			|| worldlowslope != worldbottomslope
 			|| backsector->f_slope != frontsector->f_slope
-		    || backsector->floorpic != frontsector->floorpic
-		    || backsector->lightlevel != frontsector->lightlevel
-		    //SoM: 3/22/2000: Check floor x and y offsets.
-		    || backsector->floor_xoffs != frontsector->floor_xoffs
-		    || backsector->floor_yoffs != frontsector->floor_yoffs
-		    || backsector->floorpic_angle != frontsector->floorpic_angle
-		    //SoM: 3/22/2000: Prevents bleeding.
-		    || frontsector->heightsec != -1
-		    || backsector->floorlightsec != frontsector->floorlightsec
-		    //SoM: 4/3/2000: Check for colormaps
-		    || frontsector->extra_colormap != backsector->extra_colormap
-		    || (frontsector->ffloors != backsector->ffloors && frontsector->tag != backsector->tag))
+			|| backsector->floorpic != frontsector->floorpic
+			|| backsector->lightlevel != frontsector->lightlevel
+			//SoM: 3/22/2000: Check floor x and y offsets.
+			|| backsector->floor_xoffs != frontsector->floor_xoffs
+			|| backsector->floor_yoffs != frontsector->floor_yoffs
+			|| backsector->floorpic_angle != frontsector->floorpic_angle
+			//SoM: 3/22/2000: Prevents bleeding.
+			|| frontsector->heightsec != -1
+			|| backsector->floorlightsec != frontsector->floorlightsec
+			//SoM: 4/3/2000: Check for colormaps
+			|| frontsector->extra_colormap != backsector->extra_colormap
+			|| (frontsector->ffloors != backsector->ffloors && frontsector->tag != backsector->tag))
 		{
 			markfloor = true;
 		}
@@ -2030,20 +2077,20 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		if (worldhigh != worldtop
 			|| worldhighslope != worldtopslope
 			|| backsector->c_slope != frontsector->c_slope
-		    || backsector->ceilingpic != frontsector->ceilingpic
-		    || backsector->lightlevel != frontsector->lightlevel
-		    //SoM: 3/22/2000: Check floor x and y offsets.
-		    || backsector->ceiling_xoffs != frontsector->ceiling_xoffs
-		    || backsector->ceiling_yoffs != frontsector->ceiling_yoffs
-		    || backsector->ceilingpic_angle != frontsector->ceilingpic_angle
-		    //SoM: 3/22/2000: Prevents bleeding.
-		    || (frontsector->heightsec != -1 && frontsector->ceilingpic != skyflatnum)
-		    || backsector->ceilinglightsec != frontsector->ceilinglightsec
-		    //SoM: 4/3/2000: Check for colormaps
-		    || frontsector->extra_colormap != backsector->extra_colormap
-		    || (frontsector->ffloors != backsector->ffloors && frontsector->tag != backsector->tag))
+			|| backsector->ceilingpic != frontsector->ceilingpic
+			|| backsector->lightlevel != frontsector->lightlevel
+			//SoM: 3/22/2000: Check floor x and y offsets.
+			|| backsector->ceiling_xoffs != frontsector->ceiling_xoffs
+			|| backsector->ceiling_yoffs != frontsector->ceiling_yoffs
+			|| backsector->ceilingpic_angle != frontsector->ceilingpic_angle
+			//SoM: 3/22/2000: Prevents bleeding.
+			|| (frontsector->heightsec != -1 && frontsector->ceilingpic != skyflatnum)
+			|| backsector->ceilinglightsec != frontsector->ceilinglightsec
+			//SoM: 4/3/2000: Check for colormaps
+			|| frontsector->extra_colormap != backsector->extra_colormap
+			|| (frontsector->ffloors != backsector->ffloors && frontsector->tag != backsector->tag))
 		{
-				markceiling = true;
+			markceiling = true;
 		}
 		else
 		{
@@ -2052,19 +2099,20 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		}
 
 		if (backsector->ceilingheight <= frontsector->floorheight ||
-		    backsector->floorheight >= frontsector->ceilingheight)
+			backsector->floorheight >= frontsector->ceilingheight)
 		{
 			// closed door
 			markceiling = markfloor = true;
 		}
 
 		// check TOP TEXTURE
-		if (worldhigh < worldtop
-				|| worldhighslope < worldtopslope
-			)
+		if (!bothceilingssky // never draw the top texture if on
+			&& (worldhigh < worldtop || worldhighslope < worldtopslope))
 		{
 			fixed_t texheight;
 			// top texture
+			topremap = (encoremap && !(curline->linedef->flags & ML_TFERLINE));
+
 			if ((linedef->flags & (ML_DONTPEGTOP) && (linedef->flags & ML_DONTPEGBOTTOM))
 				&& linedef->sidenum[1] != 0xffff)
 			{
@@ -2081,13 +2129,15 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				toptexture = R_GetTextureNum(sidedef->toptexture);
 				texheight = textureheight[toptexture];
 			}
-			if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked
+
+			if (!(linedef->flags & ML_EFFECT1)) // Ignore slopes for lower/upper textures unless flag is checked
+			{
 				if (linedef->flags & ML_DONTPEGTOP)
 					rw_toptexturemid = frontsector->ceilingheight - viewz;
 				else
 					rw_toptexturemid = backsector->ceilingheight - viewz;
-			} else
-			if (linedef->flags & ML_DONTPEGTOP)
+			}
+			else if (linedef->flags & ML_DONTPEGTOP)
 			{
 				// top of texture at top
 				rw_toptexturemid = worldtop;
@@ -2099,26 +2149,30 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				rw_toptextureslide = ceilingbackslide;
 			}
 		}
+
 		// check BOTTOM TEXTURE
 		if (worldlow > worldbottom || worldlowslope > worldbottomslope) // Only if VISIBLE!!!
 		{
 			// bottom texture
 			bottomtexture = R_GetTextureNum(sidedef->bottomtexture);
+			bottomremap = (encoremap && !(curline->linedef->flags & ML_TFERLINE));
 
-			if (!(linedef->flags & ML_EFFECT1)) { // Ignore slopes for lower/upper textures unless flag is checked
+			if (!(linedef->flags & ML_EFFECT1)) // Ignore slopes for lower/upper textures unless flag is checked
+			{
 				if (linedef->flags & ML_DONTPEGBOTTOM)
 					rw_bottomtexturemid = frontsector->floorheight - viewz;
 				else
 					rw_bottomtexturemid = backsector->floorheight - viewz;
-			} else
-			if (linedef->flags & ML_DONTPEGBOTTOM)
+			}
+			else if (linedef->flags & ML_DONTPEGBOTTOM)
 			{
 				// bottom of texture at bottom
 				// top of texture at top
 				rw_bottomtexturemid = worldbottom;
 				rw_bottomtextureslide = floorfrontslide;
 			}
-			else {   // top of texture at top
+			else // top of texture at top
+			{
 				rw_bottomtexturemid = worldlow;
 				rw_bottomtextureslide = floorbackslide;
 			}
@@ -2128,7 +2182,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		rw_bottomtexturemid += sidedef->rowoffset;
 
 		// allocate space for masked texture tables
-		if (frontsector && backsector && frontsector->tag != backsector->tag && (backsector->ffloors || frontsector->ffloors))
+		if (frontsector && backsector && (frontsector->tag != backsector->tag) && (backsector->ffloors || frontsector->ffloors))
 		{
 			ffloor_t *rover;
 			ffloor_t *r2;
@@ -2143,14 +2197,23 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			ds_p->thicksidecol = maskedtexturecol = lastopening - rw_x;
 			lastopening += rw_stopx - rw_x;
 
-			lowcut = max(worldbottom, worldlow) + viewz;
-			highcut = min(worldtop, worldhigh) + viewz;
-			lowcutslope = max(worldbottomslope, worldlowslope) + viewz;
-			highcutslope = min(worldtopslope, worldhighslope) + viewz;
+			lowcut       = std::max(worldbottom, worldlow) + viewz;
+			highcut      = std::min(worldtop, worldhigh) + viewz;
+			lowcutslope  = std::max(worldbottomslope, worldlowslope) + viewz;
+			highcutslope = std::min(worldtopslope, worldhighslope) + viewz;
+
+			auto check_fof_offscreen = [&](INT32 bottom, INT32 bottomslope, INT32 top, INT32 topslope)
+			{
+				return ((P_GetFFloorTopZAt    (rover, segleft .x, segleft .y) <= bottom      + viewz
+					&&   P_GetFFloorTopZAt    (rover, segright.x, segright.y) <= bottomslope + viewz)
+					|| ( P_GetFFloorBottomZAt (rover, segleft .x, segleft .y) >= top         + viewz
+					&&   P_GetFFloorBottomZAt (rover, segright.x, segright.y) >= topslope    + viewz));
+			};
 
 			if (frontsector->ffloors && backsector->ffloors)
 			{
 				i = 0;
+
 				for (rover = backsector->ffloors; rover && i < MAXFFLOORS; rover = rover->next)
 				{
 					if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS))
@@ -2161,16 +2224,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 					if (rover->norender == leveltime)
 						continue;
 
-					if (*rover->t_slope) {
-						high1 = P_GetZAt(*rover->t_slope, segleft.x, segleft.y);
-						highslope1 = P_GetZAt(*rover->t_slope, segright.x, segright.y);
-					} else
-						high1 = highslope1 = *rover->topheight;
-					if (*rover->b_slope) {
-						low1 = P_GetZAt(*rover->b_slope, segleft.x, segleft.y);
-						lowslope1 = P_GetZAt(*rover->b_slope, segright.x, segright.y);
-					} else
-						low1 = lowslope1 = *rover->bottomheight;
+					SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
+					SLOPEPARAMS(*rover->b_slope, low1,  lowslope1,  *rover->bottomheight)
 
 					if ((high1 < lowcut && highslope1 < lowcutslope) || (low1 > highcut && lowslope1 > highcutslope))
 						continue;
@@ -2197,16 +2252,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 								continue;
 						}
 
-						if (*r2->t_slope) {
-							high2 = P_GetZAt(*r2->t_slope, segleft.x, segleft.y);
-							highslope2 = P_GetZAt(*r2->t_slope, segright.x, segright.y);
-						} else
-							high2 = highslope2 = *r2->topheight;
-						if (*r2->b_slope) {
-							low2 = P_GetZAt(*r2->b_slope, segleft.x, segleft.y);
-							lowslope2 = P_GetZAt(*r2->b_slope, segright.x, segright.y);
-						} else
-							low2 = lowslope2 = *r2->bottomheight;
+						SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight)
+						SLOPEPARAMS(*r2->b_slope, low2,  lowslope2,  *r2->bottomheight)
 
 						if ((high2 < lowcut || highslope2 < lowcutslope) || (low2 > highcut || lowslope2 > highcutslope))
 							continue;
@@ -2215,6 +2262,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 						break;
 					}
+
 					if (r2)
 						continue;
 
@@ -2232,16 +2280,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 					if (rover->norender == leveltime)
 						continue;
 
-					if (*rover->t_slope) {
-						high1 = P_GetZAt(*rover->t_slope, segleft.x, segleft.y);
-						highslope1 = P_GetZAt(*rover->t_slope, segright.x, segright.y);
-					} else
-						high1 = highslope1 = *rover->topheight;
-					if (*rover->b_slope) {
-						low1 = P_GetZAt(*rover->b_slope, segleft.x, segleft.y);
-						lowslope1 = P_GetZAt(*rover->b_slope, segright.x, segright.y);
-					} else
-						low1 = lowslope1 = *rover->bottomheight;
+					SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
+					SLOPEPARAMS(*rover->b_slope, low1,  lowslope1,  *rover->bottomheight)
 
 					if ((high1 < lowcut && highslope1 < lowcutslope) || (low1 > highcut && lowslope1 > highcutslope))
 						continue;
@@ -2268,17 +2308,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 								continue;
 						}
 
-						if (*r2->t_slope) {
-							high2 = P_GetZAt(*r2->t_slope, segleft.x, segleft.y);
-							highslope2 = P_GetZAt(*r2->t_slope, segright.x, segright.y);
-						} else
-							high2 = highslope2 = *r2->topheight;
-						if (*r2->b_slope) {
-							low2 = P_GetZAt(*r2->b_slope, segleft.x, segleft.y);
-							lowslope2 = P_GetZAt(*r2->b_slope, segright.x, segright.y);
-						} else
-							low2 = lowslope2 = *r2->bottomheight;
-
+						SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight)
+						SLOPEPARAMS(*r2->b_slope, low2,  lowslope2,  *r2->bottomheight)
+#undef SLOPEPARAMS
 						if ((high2 < lowcut || highslope2 < lowcutslope) || (low2 > highcut || lowslope2 > highcutslope))
 							continue;
 						if ((high1 > high2 || highslope1 > highslope2) || (low1 < low2 || lowslope1 < lowslope2))
@@ -2299,14 +2331,12 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				{
 					if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS) || rover->flags & FF_INVERTSIDES)
 						continue;
+
 					if (rover->norender == leveltime)
 						continue;
 
 					// Oy vey.
-					if ((	   (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) <= worldbottom+viewz
-							&& (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) <= worldbottomslope+viewz)
-							||((*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) >= worldtop+viewz
-							&& (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) >= worldtopslope+viewz))
+					if (check_fof_offscreen(worldbottom, worldbottomslope, worldtop, worldtopslope))
 						continue;
 
 					ds_p->thicksides[i] = rover;
@@ -2319,19 +2349,15 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				{
 					if (!(rover->flags & FF_RENDERSIDES) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_ALLSIDES))
 						continue;
+
 					if (rover->norender == leveltime)
 						continue;
+
 					// Oy vey.
-					if ((	   (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) <= worldbottom+viewz
-							&& (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) <= worldbottomslope+viewz)
-							||((*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) >= worldtop+viewz
-							&& (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) >= worldtopslope+viewz))
+					if (check_fof_offscreen(worldbottom, worldbottomslope, worldtop, worldtopslope))
 						continue;
 
-					if ((	   (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) <= worldlow+viewz
-							&& (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) <= worldlowslope+viewz)
-							||((*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) >= worldhigh+viewz
-							&& (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) >= worldhighslope+viewz))
+					if (check_fof_offscreen(worldlow, worldlowslope, worldhigh, worldhighslope))
 						continue;
 
 					ds_p->thicksides[i] = rover;
@@ -2341,6 +2367,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 			ds_p->numthicksides = numthicksides = i;
 		}
+
 		if (sidedef->midtexture > 0 && sidedef->midtexture < numtextures)
 		{
 			// masked midtexture
@@ -2357,10 +2384,11 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			if (curline->polyseg) // use REAL front and back floors please, so midtexture rendering isn't mucked up
 			{
 				rw_midtextureslide = rw_midtexturebackslide = 0;
+
 				if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
-					rw_midtexturemid = rw_midtextureback = max(curline->frontsector->floorheight, curline->backsector->floorheight) - viewz;
+					rw_midtexturemid = rw_midtextureback = std::max(curline->frontsector->floorheight, curline->backsector->floorheight) - viewz;
 				else
-					rw_midtexturemid = rw_midtextureback = min(curline->frontsector->ceilingheight, curline->backsector->ceilingheight) - viewz;
+					rw_midtexturemid = rw_midtextureback = std::min(curline->frontsector->ceilingheight, curline->backsector->ceilingheight) - viewz;
 			}
 			else
 			{
@@ -2368,10 +2396,11 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				if (linedef->flags & ML_EFFECT2) // Ignore slopes when texturing
 				{
 					rw_midtextureslide = rw_midtexturebackslide = 0;
+
 					if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
-						rw_midtexturemid = rw_midtextureback = max(frontsector->floorheight, backsector->floorheight) - viewz;
+						rw_midtexturemid = rw_midtextureback = std::max(frontsector->floorheight, backsector->floorheight) - viewz;
 					else
-						rw_midtexturemid = rw_midtextureback = min(frontsector->ceilingheight, backsector->ceilingheight) - viewz;
+						rw_midtexturemid = rw_midtextureback = std::min(frontsector->ceilingheight, backsector->ceilingheight) - viewz;
 
 				}
 				else if (!!(linedef->flags & ML_DONTPEGBOTTOM) ^ !!(linedef->flags & ML_EFFECT3))
@@ -2397,7 +2426,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	}
 
 	// calculate rw_offset (only needed for textured lines)
-	segtextured = midtexture || toptexture || bottomtexture || maskedtexture || (numthicksides > 0);
+	segtextured = (midtexture || toptexture || bottomtexture || maskedtexture || (numthicksides > 0));
 
 	if (segtextured)
 	{
@@ -2434,12 +2463,10 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		//  use different light tables
 		//  for horizontal / vertical / diagonal
 		// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
-		lightnum = (frontsector->lightlevel >> LIGHTSEGSHIFT);
+		lightnum = R_GetSoftLightlevel(frontsector->lightlevel);
 
-		if (curline->v1->y == curline->v2->y)
-			lightnum--;
-		else if (curline->v1->x == curline->v2->x)
-			lightnum++;
+		if (P_ApplyLightOffset(lightnum, frontsector))
+			lightnum += curline->lightOffset;
 
 		if (lightnum < 0)
 			walllights = scalelight[0];
@@ -2454,18 +2481,13 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	//  and doesn't need to be marked.
 	if (frontsector->heightsec == -1)
 	{
-		if ((
-			frontsector->f_slope ? P_GetZAt(frontsector->f_slope, viewx, viewy) :
-			frontsector->floorheight) >= viewz)
+		if (P_GetSectorFloorZAt(frontsector, viewx, viewy) >= viewz)
 		{
 			// above view plane
 			markfloor = false;
 		}
 
-		if ((
-			frontsector->c_slope ? P_GetZAt(frontsector->c_slope, viewx, viewy) :
-			frontsector->ceilingheight) <= viewz &&
-		    frontsector->ceilingpic != skyflatnum)
+		if (frontsector->ceilingpic != skyflatnum && P_GetSectorCeilingZAt(frontsector, viewx, viewy) <= viewz)
 		{
 			// below view plane
 			markceiling = false;
@@ -2478,7 +2500,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	worldtopslope >>= 4;
 	worldbottomslope >>= 4;
 
-	if (linedef->special == 41) // HORIZON LINES
+	if (linedef->special == HORIZONSPECIAL) // HORIZON LINES
 	{
 		topstep = bottomstep = 0;
 		topfrac = bottomfrac = (centeryfrac>>4);
@@ -2486,10 +2508,53 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 	}
 	else
 	{
-		topstep = -FixedMul (rw_scalestep, worldtop);
-		topfrac = (centeryfrac>>4) - FixedMul (worldtop, rw_scale);
+		// for anyone that sees this
+		// dont.
+		// this is absolute shit-tier hacks
+		// but i just cant determine this in any sane way
+		// but this checks a shitton of things to make software handle skies better
 
-		bottomstep = -FixedMul (rw_scalestep,worldbottom);
+		auto set_topstep_normal = [&]
+		{
+			topstep = -FixedMul (rw_scalestep, worldtop);
+			topfrac = (centeryfrac>>4) - FixedMul (worldtop, rw_scale);
+		};
+
+		// untextured seg
+		if (!segtextured && !curline->polyseg)
+		{
+			const bool tophigh = (worldhigh <= worldtop && worldhighslope <= worldtopslope);
+
+			// if we cant see the goddamn skyplane, well there wont be any skybox
+			// we could kill skyVisible instead, but i want to keep the performance improvemnts it yields
+			// so we do this absolute trash
+			if ((tophigh
+				&& (frontsector->floorpic != skyflatnum && frontsector->ceilingpic != skyflatnum)) // try to guess if its a "window"
+				&& ((!backsector) // single sided
+				|| ((backsector && (worldhigh != worldtop || worldhighslope != worldtopslope))
+				&& (backsector->floorheight >= frontsector->ceilingheight || backsector->ceilingheight <= frontsector->floorheight)))) // check if there is a "thok" sector behind it
+				skyVisible = true;
+
+			// this is an attempt to fix issues with textureless single sided lines drawing nothing where they should just draw sky instead
+			if (tophigh && !backsector && frontsector->ceilingpic == skyflatnum)
+			{
+				topstep = -FixedMul (rw_scalestep, worldbottom);
+				topfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
+
+				// account for slopes to try and get rid of sharp edges from the black void
+				if (frontsector->f_slope || (backsector && backsector->f_slope))
+				{
+					topstep = -FixedMul (rw_scalestep, worldbottomslope);
+					topfrac = (centeryfrac>>4) - FixedMul (worldbottomslope, rw_scale);
+				}
+			}
+			else
+				set_topstep_normal();
+		}
+		else
+			set_topstep_normal();
+
+		bottomstep = -FixedMul (rw_scalestep, worldbottom);
 		bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
 
 		if (frontsector->c_slope)
@@ -2497,6 +2562,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			fixed_t topfracend = (centeryfrac>>4) - FixedMul (worldtopslope, ds_p->scale2);
 			topstep = (topfracend-topfrac)/(range);
 		}
+
 		if (frontsector->f_slope)
 		{
 			fixed_t bottomfracend = (centeryfrac>>4) - FixedMul (worldbottomslope, ds_p->scale2);
@@ -2504,32 +2570,27 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		}
 	}
 
-	dc_numlights = 0;
+	dc.numlights = 0;
 
 	if (frontsector->numlights)
 	{
-		dc_numlights = frontsector->numlights;
-		if (dc_numlights >= dc_maxlights)
-		{
-			dc_maxlights = dc_numlights;
-			dc_lightlist = Z_Realloc(dc_lightlist, sizeof (*dc_lightlist) * dc_maxlights, PU_STATIC, NULL);
-		}
+		dc.numlights = frontsector->numlights;
+		dc.maxlights = dc.numlights;
+		dc.lightlist = static_cast<r_lightlist_t*>(Z_Frame_Alloc(sizeof(*dc.lightlist) * dc.maxlights));
 
-		for (i = p = 0; i < dc_numlights; i++)
+		for (i = p = 0; i < dc.numlights; i++)
 		{
 			fixed_t leftheight, rightheight;
 
 			light = &frontsector->lightlist[i];
-			rlight = &dc_lightlist[p];
+			rlight = &dc.lightlist[p];
 
-			if (light->slope) {
-				leftheight = P_GetZAt(light->slope, segleft.x, segleft.y);
-				rightheight = P_GetZAt(light->slope, segright.x, segright.y);
+			leftheight  = P_GetLightZAt(light,  segleft.x,  segleft.y);
+			rightheight = P_GetLightZAt(light, segright.x, segright.y);
 
-				// Flag sector as having slopes
+			// Flag sector as having slopes
+			if (light->slope)
 				frontsector->hasslope = true;
-			} else
-				leftheight = rightheight = light->height;
 
 			leftheight -= viewz;
 			rightheight -= viewz;
@@ -2542,25 +2603,23 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 				if (leftheight < worldbottom && rightheight < worldbottomslope)
 					continue;
 
-				if (leftheight > worldtop && rightheight > worldtopslope && i+1 < dc_numlights && frontsector->lightlist[i+1].height > frontsector->ceilingheight)
+				if (leftheight > worldtop && rightheight > worldtopslope && i+1 < dc.numlights && frontsector->lightlist[i+1].height > frontsector->ceilingheight)
 					continue;
 			}
 
 			rlight->height = (centeryfrac>>4) - FixedMul(leftheight, rw_scale);
 			rlight->heightstep = (centeryfrac>>4) - FixedMul(rightheight, ds_p->scale2);
 			rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
-			rlight->flags = light->flags;
+			rlight->flags = static_cast<ffloortype_e>(light->flags);
 
 			if (light->caster && light->caster->flags & FF_CUTSOLIDS)
 			{
-				if (*light->caster->b_slope) {
-					leftheight = P_GetZAt(*light->caster->b_slope, segleft.x, segleft.y);
-					rightheight = P_GetZAt(*light->caster->b_slope, segright.x, segright.y);
+				leftheight  = P_GetFFloorBottomZAt(light->caster,  segleft.x,  segleft.y);
+				rightheight = P_GetFFloorBottomZAt(light->caster, segright.x, segright.y);
 
-					// Flag sector as having slopes
+				// Flag sector as having slopes
+				if (*light->caster->b_slope)
 					frontsector->hasslope = true;
-				} else
-					leftheight = rightheight = *light->caster->bottomheight;
 
 				leftheight -= viewz;
 				rightheight -= viewz;
@@ -2579,7 +2638,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			p++;
 		}
 
-		dc_numlights = p;
+		dc.numlights = p;
 	}
 
 	if (numffloors)
@@ -2588,7 +2647,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		{
 			ffloor[i].f_pos >>= 4;
 			ffloor[i].f_pos_slope >>= 4;
-			if (linedef->special == 41) // Horizon lines extend FOFs in contact with them too.
+
+			if (linedef->special == HORIZONSPECIAL) // Horizon lines extend FOFs in contact with them too.
 			{
 				ffloor[i].f_step = 0;
 				ffloor[i].f_frac = (centeryfrac>>4);
@@ -2611,13 +2671,13 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 
 		if (toptexture)
 		{
-			fixed_t topfracend = (centeryfrac>>4) - FixedMul (worldhighslope, ds_p->scale2);
+			fixed_t topfracend = (centeryfrac>>4) - FixedMul(worldhighslope, ds_p->scale2);
 
 			pixhigh = (centeryfrac>>4) - FixedMul (worldhigh, rw_scale);
 			pixhighstep = (topfracend-pixhigh)/(range);
 
 			// If the lowest part of a ceiling stretching down covers the entire screen
-			if (min(pixhigh, topfracend)>>HEIGHTBITS >= viewheight-1)
+			if (std::min(pixhigh, topfracend)>>HEIGHTBITS >= viewheight-1)
 				g_walloffscreen = true;
 		}
 
@@ -2629,7 +2689,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			pixlowstep = (bottomfracend-pixlow)/(range);
 
 			// If the highest part of a floor stretching up covers the entire screen
-			if ((max(pixlow, bottomfracend)+HEIGHTUNIT-1)>>HEIGHTBITS <= 0)
+			if ((std::max(pixlow, bottomfracend)+HEIGHTUNIT-1)>>HEIGHTBITS <= 0)
 				g_walloffscreen = true;
 		}
 
@@ -2639,12 +2699,25 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			fixed_t planevistest;
 			i = 0;
 
+			auto setup_back_fof = [&]
+			{
+				//ffloor[i].slope = *rover->b_slope;
+				ffloor[i].b_pos = roverleft;
+				ffloor[i].b_pos_slope = roverright;
+				ffloor[i].b_pos >>= 4;
+				ffloor[i].b_pos_slope >>= 4;
+				ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
+				ffloor[i].b_step = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos_slope, ds_p->scale2);
+				ffloor[i].b_step = (ffloor[i].b_step-ffloor[i].b_frac)/(range);
+			};
+
 			if (backsector->ffloors)
 			{
 				for (rover = backsector->ffloors; rover && i < MAXFFLOORS; rover = rover->next)
 				{
 					if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES))
 						continue;
+
 					if (rover->norender == leveltime)
 						continue;
 
@@ -2652,46 +2725,32 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 					if (*rover->b_slope || *rover->t_slope)
 						backsector->hasslope = true;
 
-					roverleft = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) - viewz;
-					roverright = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) - viewz;
-					planevistest = (*rover->b_slope ? P_GetZAt(*rover->b_slope, viewx, viewy) : *rover->bottomheight);
+					roverleft    = P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) - viewz;
+					roverright   = P_GetFFloorBottomZAt(rover, segright.x, segright.y) - viewz;
+					planevistest = P_GetFFloorBottomZAt(rover, viewx, viewy);
 
 					if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
-					    (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
-					    ((viewz < planevistest && !(rover->flags & FF_INVERTPLANES)) ||
-					     (viewz > planevistest && (rover->flags & FF_BOTHPLANES))))
+						(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
+						((viewz < planevistest && !(rover->flags & FF_INVERTPLANES)) ||
+						 (viewz > planevistest && (rover->flags & FF_BOTHPLANES))))
 					{
-						//ffloor[i].slope = *rover->b_slope;
-						ffloor[i].b_pos = roverleft;
-						ffloor[i].b_pos_slope = roverright;
-						ffloor[i].b_pos >>= 4;
-						ffloor[i].b_pos_slope >>= 4;
-						ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
-						ffloor[i].b_step = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos_slope, ds_p->scale2);
-						ffloor[i].b_step = (ffloor[i].b_step-ffloor[i].b_frac)/(range);
+						setup_back_fof();
 						i++;
 					}
 
 					if (i >= MAXFFLOORS)
 						break;
 
-					roverleft = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) - viewz;
-					roverright = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) - viewz;
-					planevistest = (*rover->t_slope ? P_GetZAt(*rover->t_slope, viewx, viewy) : *rover->topheight);
+					roverleft    = P_GetFFloorTopZAt(rover, segleft .x, segleft .y) - viewz;
+					roverright   = P_GetFFloorTopZAt(rover, segright.x, segright.y) - viewz;
+					planevistest = P_GetFFloorTopZAt(rover, viewx, viewy);
 
 					if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
-					    (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
-					    ((viewz > planevistest && !(rover->flags & FF_INVERTPLANES)) ||
-					     (viewz < planevistest && (rover->flags & FF_BOTHPLANES))))
+						(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
+						((viewz > planevistest && !(rover->flags & FF_INVERTPLANES)) ||
+						 (viewz < planevistest && (rover->flags & FF_BOTHPLANES))))
 					{
-						//ffloor[i].slope = *rover->t_slope;
-						ffloor[i].b_pos = roverleft;
-						ffloor[i].b_pos_slope = roverright;
-						ffloor[i].b_pos >>= 4;
-						ffloor[i].b_pos_slope >>= 4;
-						ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
-						ffloor[i].b_step = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos_slope, ds_p->scale2);
-						ffloor[i].b_step = (ffloor[i].b_step-ffloor[i].b_frac)/(range);
+						setup_back_fof();
 						i++;
 					}
 				}
@@ -2705,90 +2764,74 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 					if (rover->norender == leveltime)
 						continue;
 
-
 					// Let the renderer know this sector is sloped.
 					if (*rover->b_slope || *rover->t_slope)
 						frontsector->hasslope = true;
 
-					roverleft = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) - viewz;
-					roverright = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) - viewz;
-					planevistest = (*rover->b_slope ? P_GetZAt(*rover->b_slope, viewx, viewy) : *rover->bottomheight);
+					roverleft    = P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) - viewz;
+					roverright   = P_GetFFloorBottomZAt(rover, segright.x, segright.y) - viewz;
+					planevistest = P_GetFFloorBottomZAt(rover, viewx, viewy);
 
 					if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
-					    (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
-					    ((viewz < planevistest && !(rover->flags & FF_INVERTPLANES)) ||
-					     (viewz > planevistest && (rover->flags & FF_BOTHPLANES))))
+						(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
+						((viewz < planevistest && !(rover->flags & FF_INVERTPLANES)) ||
+						 (viewz > planevistest && (rover->flags & FF_BOTHPLANES))))
 					{
-						//ffloor[i].slope = *rover->b_slope;
-						ffloor[i].b_pos = roverleft;
-						ffloor[i].b_pos_slope = roverright;
-						ffloor[i].b_pos >>= 4;
-						ffloor[i].b_pos_slope >>= 4;
-						ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
-						ffloor[i].b_step = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos_slope, ds_p->scale2);
-						ffloor[i].b_step = (ffloor[i].b_step-ffloor[i].b_frac)/(range);
+						setup_back_fof();
 						i++;
 					}
 
 					if (i >= MAXFFLOORS)
 						break;
 
-					roverleft = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) - viewz;
-					roverright = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) - viewz;
-					planevistest = (*rover->t_slope ? P_GetZAt(*rover->t_slope, viewx, viewy) : *rover->topheight);
+					roverleft    = P_GetFFloorTopZAt(rover, segleft .x, segleft .y) - viewz;
+					roverright   = P_GetFFloorTopZAt(rover, segright.x, segright.y) - viewz;
+					planevistest = P_GetFFloorTopZAt(rover, viewx, viewy);
 
 					if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
-					    (roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
-					    ((viewz > planevistest && !(rover->flags & FF_INVERTPLANES)) ||
-					     (viewz < planevistest && (rover->flags & FF_BOTHPLANES))))
+						(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
+						((viewz > planevistest && !(rover->flags & FF_INVERTPLANES)) ||
+						 (viewz < planevistest && (rover->flags & FF_BOTHPLANES))))
 					{
-						//ffloor[i].slope = *rover->t_slope;
-						ffloor[i].b_pos = roverleft;
-						ffloor[i].b_pos_slope = roverright;
-						ffloor[i].b_pos >>= 4;
-						ffloor[i].b_pos_slope >>= 4;
-						ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
-						ffloor[i].b_step = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos_slope, ds_p->scale2);
-						ffloor[i].b_step = (ffloor[i].b_step-ffloor[i].b_frac)/(range);
+						setup_back_fof();
 						i++;
 					}
 				}
 			}
+
 			if (curline->polyseg && frontsector && (curline->polyseg->flags & POF_RENDERPLANES))
 			{
-				while (i < numffloors && ffloor[i].polyobj != curline->polyseg) i++;
+				auto setup_back_polyobj = [&](fixed_t height)
+				{
+					if (ffloor[i].plane->minx > ds_p->x1)
+						ffloor[i].plane->minx = ds_p->x1;
+
+					if (ffloor[i].plane->maxx < ds_p->x2)
+						ffloor[i].plane->maxx = ds_p->x2;
+
+					ffloor[i].slope = NULL;
+					ffloor[i].b_pos = height;
+					ffloor[i].b_pos = (ffloor[i].b_pos - viewz) >> 4;
+					ffloor[i].b_step = FixedMul(-rw_scalestep, ffloor[i].b_pos);
+					ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
+				};
+
+				while (i < numffloors && ffloor[i].polyobj != curline->polyseg)
+					i++;
+
 				if (i < numffloors && backsector->floorheight <= frontsector->ceilingheight &&
 					backsector->floorheight >= frontsector->floorheight &&
 					(viewz < backsector->floorheight))
 				{
-					if (ffloor[i].plane->minx > ds_p->x1)
-						ffloor[i].plane->minx = ds_p->x1;
-
-					if (ffloor[i].plane->maxx < ds_p->x2)
-						ffloor[i].plane->maxx = ds_p->x2;
-
-					ffloor[i].slope = NULL;
-					ffloor[i].b_pos = backsector->floorheight;
-					ffloor[i].b_pos = (ffloor[i].b_pos - viewz) >> 4;
-					ffloor[i].b_step = FixedMul(-rw_scalestep, ffloor[i].b_pos);
-					ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
+					setup_back_polyobj(backsector->floorheight);
 					i++;
 				}
+
 				if (i < numffloors && backsector->ceilingheight >= frontsector->floorheight &&
 					backsector->ceilingheight <= frontsector->ceilingheight &&
 					(viewz > backsector->ceilingheight))
 				{
-					if (ffloor[i].plane->minx > ds_p->x1)
-						ffloor[i].plane->minx = ds_p->x1;
-
-					if (ffloor[i].plane->maxx < ds_p->x2)
-						ffloor[i].plane->maxx = ds_p->x2;
-
-					ffloor[i].slope = NULL;
-					ffloor[i].b_pos = backsector->ceilingheight;
-					ffloor[i].b_pos = (ffloor[i].b_pos - viewz) >> 4;
-					ffloor[i].b_step = FixedMul(-rw_scalestep, ffloor[i].b_pos);
-					ffloor[i].b_frac = (centeryfrac >> 4) - FixedMul(ffloor[i].b_pos, rw_scale);
+					setup_back_polyobj(backsector->ceilingheight);
 					i++;
 				}
 			}
@@ -2845,34 +2888,77 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 			for (i = 0; i < numffloors; i++)
 				R_ExpandPlane(ffloor[i].plane, rw_x, rw_stopx - 1);
 		}
-	}
-	
-	rw_silhouette = &(ds_p->silhouette);
-	rw_tsilheight = &(ds_p->tsilheight);
-	rw_bsilheight = &(ds_p->bsilheight);
 
-#ifdef WALLSPLATS
-	if (linedef->splats && cv_splats.value)
+		// FIXME hack to fix planes disappearing when a seg goes behind the camera. This NEEDS to be changed to be done properly. -Red
+		if (curline->polyseg)
+		{
+			for (i = 0; i < numffloors; i++)
+			{
+				if (!ffloor[i].polyobj || ffloor[i].polyobj != curline->polyseg)
+					continue;
+				if (ffloor[i].plane->minx > rw_x)
+					ffloor[i].plane->minx = rw_x;
+
+				if (ffloor[i].plane->maxx < rw_stopx - 1)
+					ffloor[i].plane->maxx = rw_stopx - 1;
+			}
+		}
+
+	}
+
+	didsolidcol = false;
+
+	if (!segtextured && !numffloors && !numbackffloors)
 	{
-		// Isn't a bit wasteful to copy the ENTIRE array for every drawseg?
-		M_Memcpy(last_ceilingclip + ds_p->x1, ceilingclip + ds_p->x1,
-			sizeof (INT16) * (ds_p->x2 - ds_p->x1 + 1));
-		M_Memcpy(last_floorclip + ds_p->x1, floorclip + ds_p->x1,
-			sizeof (INT16) * (ds_p->x2 - ds_p->x1 + 1));
-		R_RenderSegLoop();
-		R_DrawWallSplats();
+		if (markfloor || markceiling)
+			R_MarkSegBounds();
+		else
+		{
+			for (; rw_x < rw_stopx; rw_x++)
+			{
+				frontscale[rw_x] = rw_scale;
+				rw_scale += rw_scalestep;
+			}
+		}
 	}
 	else
+<<<<<<< HEAD:src/r_segs.c
 #endif
 
 	R_RenderSegLoop();
 	colfunc = wallcolfunc;
+=======
+	{
+		rw_silhouette = &ds_p->silhouette;
+		rw_tsilheight = &ds_p->tsilheight;
+		rw_bsilheight = &ds_p->bsilheight;
+>>>>>>> Saturn-Next:src/r_segs.cpp
 
-	if (portalline) // if curline is a portal, set portalrender for drawseg
+		R_RenderSegLoop(&dc);
+	}
+
+	R_SetColumnFunc(BASEDRAWFUNC);
+
+	if (g_portal) // if curline is a portal, set portalrender for drawseg
 		ds_p->portalpass = portalrender+1;
 	else
 		ds_p->portalpass = 0;
 
+	// cph - if a column was made solid by this wall, we _must_ save full clipping info
+	if (backsector && didsolidcol)
+	{
+		if (!(ds_p->silhouette & SIL_BOTTOM))
+		{
+			ds_p->silhouette |= SIL_BOTTOM;
+			ds_p->bsilheight = backsector->f_slope ? INT32_MAX : backsector->floorheight;
+		}
+		if (!(ds_p->silhouette & SIL_TOP))
+		{
+			ds_p->silhouette |= SIL_TOP;
+			ds_p->tsilheight = backsector->c_slope ? INT32_MIN : backsector->ceilingheight;
+		}
+	}
+
 	// save sprite clipping info
 	if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
 	{
@@ -2888,15 +2974,20 @@ void R_StoreWallRange(INT32 start, INT32 stop)
 		lastopening += rw_stopx - start;
 	}
 
-	if (maskedtexture && !(ds_p->silhouette & SIL_TOP))
+	if (maskedtexture)
 	{
-		ds_p->silhouette |= SIL_TOP;
-		ds_p->tsilheight = (sidedef->midtexture > 0 && sidedef->midtexture < numtextures) ? INT32_MIN: INT32_MAX;
-	}
-	if (maskedtexture && !(ds_p->silhouette & SIL_BOTTOM))
-	{
-		ds_p->silhouette |= SIL_BOTTOM;
-		ds_p->bsilheight = (sidedef->midtexture > 0 && sidedef->midtexture < numtextures) ? INT32_MAX: INT32_MIN;
+		if (!(ds_p->silhouette & SIL_TOP))
+		{
+			ds_p->silhouette |= SIL_TOP;
+			ds_p->tsilheight = (sidedef->midtexture > 0 && sidedef->midtexture < numtextures) ? INT32_MIN: INT32_MAX;
+		}
+
+		if (!(ds_p->silhouette & SIL_BOTTOM))
+		{
+			ds_p->silhouette |= SIL_BOTTOM;
+			ds_p->bsilheight = (sidedef->midtexture > 0 && sidedef->midtexture < numtextures) ? INT32_MAX: INT32_MIN;
+		}
 	}
+
 	ds_p++;
 }
diff --git a/src/r_segs.h b/src/r_segs.h
index 92d0100e2..27dbbe54f 100644
--- a/src/r_segs.h
+++ b/src/r_segs.h
@@ -14,6 +14,10 @@
 #ifndef __R_SEGS__
 #define __R_SEGS__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -22,4 +26,12 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2);
 void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pffloor);
 void R_StoreWallRange(INT32 start, INT32 stop);
 
+void R_AllocSegMemory(void);
+
+transnum_t R_GetLinedefTransTable(fixed_t alpha);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/r_skins.c b/src/r_skins.c
new file mode 100644
index 000000000..6bda9e263
--- /dev/null
+++ b/src/r_skins.c
@@ -0,0 +1,791 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by Vivian "toastergrl" Grannell.
+// Copyright (C) 2025 by Kart Krew.
+// Copyright (C) 2020 by Sonic Team Junior.
+// Copyright (C) 2000 by DooM Legacy Team.
+// Copyright (C) 1996 by id Software, Inc.
+//
+// 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  r_skins.c
+/// \brief Loading skins
+
+#include "dehacked.h" // get_number (for thok)
+#include "doomdef.h"
+#include "console.h"
+#include "r_draw.h"
+#include "r_things.h"
+#include "r_skins.h"
+#include "g_game.h"
+#include "k_kart.h" // SRB2kart
+#include "p_local.h"
+#include "st_stuff.h"
+#include "i_video.h" // rendermode
+#include "w_wad.h"
+#include "z_zone.h"
+
+#ifdef HWRENDER
+#include "hardware/hw_md2.h"
+#endif
+
+#include "qs22j.h"
+
+CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2];
+
+INT32 numskins = 0;
+INT32 numallskins = 0;
+INT32 numlocalskins = 0;
+skin_t skins[MAXSKINS];
+UINT8 skinstats[9][9][MAXSKINS];
+UINT8 skinstatscount[9][9] = {
+	{0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 1, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0}
+};
+UINT8 skinsorted[MAXSKINS];
+skin_t localskins[MAXLOCALSKINS];
+skin_t allskins[MAXSKINS+MAXLOCALSKINS];
+
+// FIXTHIS: don't work because it must be inistilised before the config load
+//#define SKINVALUES
+#ifdef SKINVALUES
+CV_PossibleValue_t skin_cons_t[MAXSKINS+1];
+CV_PossibleValue_t localskin_cons_t[MAXLOCALSKINS+1];
+#endif
+
+static void Sk_SetDefaultValue(skin_t *skin, boolean local)
+{
+	INT32 i;
+	//
+	// set default skin values
+	//
+	memset(skin, 0, sizeof (skin_t));
+	snprintf(skin->name, sizeof skin->name, "skin %u", K_GetMobjSkinNum(skin, local));
+	skin->name[sizeof skin->name - 1] = '\0';
+	skin->wadnum = INT16_MAX;
+	strcpy(skin->sprite, "");
+
+	skin->flags = 0;
+
+	strcpy(skin->realname, "Someone");
+	strcpy(skin->hudname, "???");
+	strncpy(skin->facerank, "PLAYRANK", 9);
+	strncpy(skin->facewant, "PLAYWANT", 9);
+	strncpy(skin->facemmap, "PLAYMMAP", 9);
+
+	skin->starttranscolor = 160;
+	skin->prefcolor = SKINCOLOR_GREEN;
+
+	// SRB2kart
+	skin->kartspeed = 5;
+	skin->kartweight = 5;
+	//
+
+	skin->highresscale = FRACUNIT>>1;
+
+	for (i = 0; i < sfx_skinsoundslot0; i++)
+		if (S_sfx[i].skinsound != -1)
+			skin->soundsid[S_sfx[i].skinsound] = i;
+}
+
+//
+// Initialize the basic skins
+//
+void R_InitSkins(void)
+{
+	skin_t *skin;
+#ifdef SKINVALUES
+	INT32 i;
+
+	for (i = 0; i <= MAXSKINS; i++)
+	{
+		skin_cons_t[i].value = 0;
+		skin_cons_t[i].strvalue = NULL;
+	}
+	for (i = 0; i <= MAXLOCALSKINS; i++)
+	{
+		localskin_cons_t[i].value = 0;
+		localskin_cons_t[i].strvalue = NULL;
+	}
+#endif
+
+	// skin[0] = Sonic skin
+	skin = &skins[0];
+	numskins = 1;
+	Sk_SetDefaultValue(skin, false);
+	memset(skinstats, 0, sizeof(skinstats));
+	memset(skinsorted, 0, sizeof(skinsorted));
+
+	// Hardcoded S_SKIN customizations for Sonic.
+	strcpy(skin->name,       DEFAULTSKIN);
+#ifdef SKINVALUES
+	skin_cons_t[0].strvalue = skins[0].name;
+#endif
+	skin->flags = 0;
+	strcpy(skin->realname,   "Sonic");
+	strcpy(skin->hudname,    "SONIC");
+
+	strncpy(skin->facerank, "PLAYRANK", 9);
+	strncpy(skin->facewant, "PLAYWANT", 9);
+	strncpy(skin->facemmap, "PLAYMMAP", 9);
+	skin->wadnum = 0; // god what have you brought to this world
+	skin->prefcolor = SKINCOLOR_BLUE;
+	skin->localskin = false;
+	skin->localnum = 0;
+
+	// SRB2kart
+	skin->kartspeed = 8;
+	skin->kartweight = 2;
+	//
+
+	skin->spritedef.numframes = sprites[SPR_PLAY].numframes;
+	skin->spritedef.spriteframes = sprites[SPR_PLAY].spriteframes;
+	skin->sprinfo = spriteinfo[SPR_PLAY];
+	ST_LoadFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, 0);
+
+	// Set values for Sonic skin
+	Forceskin_cons_t[1].value = 0;
+	Forceskin_cons_t[1].strvalue = skin->name;
+
+	//MD2 for sonic doesn't want to load in Linux.
+#ifdef HWRENDER
+	if (rendermode == render_opengl)
+		HWR_AddPlayerMD2(0, false);
+#endif
+
+	// lets set it
+	allskins[0] = skins[0];
+	numallskins = 1;
+}
+
+// returns true if the skin name is found (loaded from pwad)
+// warning return -1 if not found
+INT32 R_SkinAvailable(const char *name)
+{
+	INT32 i;
+
+	for (i = 0; i < numskins; i++)
+	{
+		if (stricmp(skins[i].name,name) == 0)
+			return i;
+	}
+	return -1;
+}
+
+// returns true if the skin name is found (loaded from pwad)
+// warning return -1 if not found
+INT32 R_AnySkinAvailable(const char *name)
+{
+	INT32 i;
+
+	for (i = 0; i < numallskins; i++)
+	{
+		if (stricmp(allskins[i].name,name) == 0)
+			return i;
+	}
+	return -1;
+}
+
+INT32 R_LocalSkinAvailable(const char *name, boolean local)
+{
+	INT32 i;
+
+	if (local)
+	{
+		for (i = 0; i < numlocalskins; i++)
+		{
+			if (stricmp(localskins[i].name,name) == 0)
+				return i;
+		}
+		return -1;
+	}
+	else
+		return R_SkinAvailable(name);
+}
+
+// network code calls this when a 'skin change' is received
+boolean SetPlayerSkin(INT32 playernum, const char *skinname)
+{
+	INT32 i;
+	player_t *player = &players[playernum];
+
+	for (i = 0; i < numskins; i++)
+	{
+		// search in the skin list
+		if (stricmp(skins[i].name, skinname) == 0)
+		{
+			SetPlayerSkinByNum(playernum, i);
+			return true;
+		}
+	}
+
+	if (P_IsLocalPlayer(player))
+		CONS_Alert(CONS_WARNING, M_GetText("Skin '%s' not found.\n"), skinname);
+	else if(server || IsPlayerAdmin(consoleplayer))
+		CONS_Alert(CONS_WARNING, M_GetText("Player %d (%s) skin '%s' not found\n"), playernum, player_names[playernum], skinname);
+
+	SetPlayerSkinByNum(playernum, 0);
+	return false;
+}
+
+void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar)
+{
+	INT32 i;
+	player_t *player = &players[playernum];
+
+	if (stricmp(skinname, "none"))
+	{
+		for (i = 0; i < numlocalskins; i++)
+		{
+			// search in the localskin list
+			if (stricmp(localskins[i].name, skinname) == 0)
+			{
+				player->localskin = 1 + i;
+				player->skinlocal = true;
+				if (player->mo)
+				{
+					player->mo->localskin = &localskins[i];
+					player->mo->skinlocal = true;
+				}
+
+				goto setcvar;
+			}
+		}
+
+		for (i = 0; i < numskins; i++)
+		{
+			// search in the skin list
+			if (stricmp(skins[i].name, skinname) == 0)
+			{
+				player->localskin = 1 + i;
+				player->skinlocal = false;
+				if (player->mo)
+				{
+					player->mo->localskin = &skins[i];
+					player->mo->skinlocal = false;
+				}
+
+				goto setcvar;
+			}
+		}
+	}
+	else
+	{
+		player->localskin = 0;
+		player->skinlocal = false;
+		if (player->mo)
+		{
+			player->mo->localskin = 0;
+			player->mo->skinlocal = false;
+		}
+	}
+
+setcvar:
+	if (cvar != NULL)
+	{
+		if (player->localskin > 0)
+		{
+			CV_StealthSet(&cv_fakelocalskin, K_GetSkinArray(player->skinlocal)[player->localskin-1].name);
+			CV_StealthSet(cvar, K_GetSkinArray(player->skinlocal)[player->localskin-1].name);
+
+		}
+		else
+		{
+			CV_StealthSet(&cv_fakelocalskin, "none");
+			CV_StealthSet(cvar, "none");
+		}
+	}
+}
+
+// Same as SetPlayerSkin, but uses the skin #.
+// network code calls this when a 'skin change' is received
+void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
+{
+	player_t *player = &players[playernum];
+	skin_t *skin = &skins[skinnum];
+
+	if (skinnum >= 0 && skinnum < numskins) // Make sure it exists!
+	{
+		player->skin = skinnum;
+		if (player->mo)
+			player->mo->skin = skin;
+
+		player->charflags = (UINT32)skin->flags;
+
+		// SRB2kart
+		player->kartspeed = skin->kartspeed;
+		player->kartweight = skin->kartweight;
+
+		if (player->mo)
+			P_SetScale(player->mo, player->mo->scale);
+
+		demo_extradata[playernum] |= DXD_SKIN;
+
+		return;
+	}
+
+	if (P_IsLocalPlayer(player))
+		CONS_Alert(CONS_WARNING, M_GetText("Skin %d not found\n"), skinnum);
+	else if(server || IsPlayerAdmin(consoleplayer))
+		CONS_Alert(CONS_WARNING, "Player %d (%s) skin %d not found\n", playernum, player_names[playernum], skinnum);
+
+	SetPlayerSkinByNum(playernum, 0); // not found put the sonic skin
+}
+
+//
+// Add skins from a pwad, each skin preceded by 'S_SKIN' marker
+//
+
+// Does the same is in w_wad, but check only for
+// the first 6 characters (this is so we can have S_SKIN1, S_SKIN2..
+// for wad editors that don't like multiple resources of the same name)
+//
+static UINT16 W_CheckForSkinMarkerInPwad(UINT16 wadid, UINT16 startlump)
+{
+	UINT16 i;
+	const char *S_SKIN = "S_SKIN";
+	lumpinfo_t *lump_p;
+
+	// scan forward, start at <startlump>
+	if (startlump < wadfiles[wadid]->numlumps)
+	{
+		lump_p = wadfiles[wadid]->lumpinfo + startlump;
+		for (i = startlump; i < wadfiles[wadid]->numlumps; i++, lump_p++)
+			if (memcmp(lump_p->name,S_SKIN,6)==0)
+				return i;
+	}
+	return INT16_MAX; // not found
+}
+
+//sort function for sorting skin names
+static int skinSortFunc(const void *a, const void *b) //tbh i have no clue what the naming conventions for local functions are
+{
+	const skin_t *in1 = &skins[*(const UINT8 *)a];
+	const skin_t *in2 = &skins[*(const UINT8 *)b];
+	INT32 temp = 0;
+	const UINT8 val_a = *((const UINT8 *)a);
+	const UINT8 val_b = *((const UINT8 *)b);
+
+	//return (strcmp(in1->realname, in2->realname) < 0) || (strcmp(in1->realname, in2->realname) ==);
+
+	switch (cv_skinselectgridsort.value)
+	{
+		case SKINMENUSORT_REALNAME:
+			//CONS_Printf("Sorting by realname\n");
+			// check name
+			if ((temp = strcmp(in1->realname, in2->realname)))
+				return temp;
+			// sort by internal name
+			return strcmp(in1->name, in2->name);
+			break;
+
+		case SKINMENUSORT_NAME:
+			//CONS_Printf("Sorting by name\n");
+			return strcmp(in1->name, in2->name);
+			break;
+
+		case SKINMENUSORT_SPEED:
+			//CONS_Printf("Sorting by speed\n");
+			// check speed
+			if (in1->kartspeed < in2->kartspeed)
+				return -1;
+			else if (in2->kartspeed < in1->kartspeed)
+				return 1;
+			// then check weight
+			if (in1->kartweight < in2->kartweight)
+				return -1;
+			else if (in2->kartweight < in1->kartweight)
+				return 1;
+			// then check name
+			if ((temp = strcmp(in1->realname, in2->realname)))
+				return temp;
+			// sort by internal name
+			return strcmp(in1->name, in2->name);
+			break;
+
+		case SKINMENUSORT_WEIGHT:
+			//CONS_Printf("Sorting by weight\n");
+			// check weight
+			if (in1->kartweight < in2->kartweight)
+				return -1;
+			else if (in2->kartweight < in1->kartweight)
+				return 1;
+			// then check speed
+			if (in1->kartspeed < in2->kartspeed)
+				return -1;
+			else if (in2->kartspeed < in1->kartspeed)
+				return 1;
+			// then check name
+			if ((temp = strcmp(in1->realname, in2->realname)))
+				return temp;
+			// sort by internal name
+			return strcmp(in1->name, in2->name);
+			break;
+
+		case SKINMENUSORT_PREFCOLOR:
+			//CONS_Printf("Sorting by prefcolor\n");
+			// check prefcolor
+			if (in1->prefcolor < in2->prefcolor)
+				return -1;
+			else if (in2->prefcolor < in1->prefcolor)
+				return 1;
+			// then check name
+			if ((temp = strcmp(in1->realname, in2->realname)))
+				return temp;
+			// sort by internal name
+			return strcmp(in1->name, in2->name);
+			break;
+
+		case SKINMENUSORT_ID:
+			//CONS_Printf("Sorting by id\n");
+			//how do i do by ID?????
+			//wait why dont i just convert the inputs to UINT32s
+			//please tell me im allowed to define variables in here since its a block
+
+			if (val_a == val_b)
+				return 0;
+			else if (val_a < val_b)
+				return -1;
+			else
+				return 1;
+
+		default:
+			return strcmp(in1->name, in2->name);
+			break;
+	}
+	//im scared this somehow will sometimes end up here so im gonna add this here just to be safe
+	return strcmp(in1->name, in2->name);
+}
+
+void sortSkinGrid(void)
+{
+	//CONS_Printf("Sorting skin list (%d)...\n", cv_skinselectgridsort.value);
+	qs22j(skinsorted, numskins, sizeof(UINT8), skinSortFunc);
+}
+
+//
+// Find skin sprites, sounds & optional status bar face, & add them
+//
+void R_AddSkins(UINT16 wadnum, boolean local)
+{
+	UINT16 lump, lastlump = 0;
+	char *buf;
+	char *buf2;
+	char *stoken;
+	char *value;
+	size_t size;
+	skin_t *skin;
+	boolean hudname, realname;
+
+#define lnumskins (local ? numlocalskins : numskins)
+
+	//
+	// search for all skin markers in pwad
+	//
+
+	while ((lump = W_CheckForSkinMarkerInPwad(wadnum, lastlump)) != INT16_MAX)
+	{
+		// advance by default
+		lastlump = lump + 1;
+
+		if (!local && numskins >= MAXSKINS)
+		{
+			CONS_Alert(CONS_WARNING, M_GetText("Unable to add skin, too many characters are loaded (%d maximum)\n"), MAXSKINS);
+			continue; // so we know how many skins couldn't be added
+		}
+		if (local && numlocalskins >= MAXLOCALSKINS)
+		{
+			CONS_Alert(CONS_WARNING, M_GetText("Unable to add localskin, too many localskins are loaded (%d maximum)\n"), MAXLOCALSKINS);
+			continue; // so we know how many skins couldn't be added
+		}
+
+		buf = W_CacheLumpNumPwad(wadnum, lump, PU_CACHE);
+		size = W_LumpLengthPwad(wadnum, lump);
+
+		// for strtok
+		buf2 = malloc(size+1);
+		if (!buf2)
+			I_Error("R_AddSkins: No more free memory\n");
+		M_Memcpy(buf2,buf,size);
+		buf2[size] = '\0';
+
+		// set defaults
+		skin = &K_GetSkinArray(local)[lnumskins];
+		Sk_SetDefaultValue(skin, local);
+		skin->wadnum = wadnum;
+		hudname = realname = false;
+		// parse
+		stoken = strtok (buf2, "\r\n= ");
+		while (stoken)
+		{
+			if ((stoken[0] == '/' && stoken[1] == '/')
+				|| (stoken[0] == '#'))// skip comments
+			{
+				stoken = strtok(NULL, "\r\n"); // skip end of line
+				goto next_token;              // find the real next token
+			}
+
+			value = strtok(NULL, "\r\n= ");
+
+			if (!value)
+				I_Error("R_AddSkins: syntax error in S_SKIN lump# %d(%s) in WAD %s\n", lump, W_CheckNameForNumPwad(wadnum,lump), wadfiles[wadnum]->filename);
+
+			if (!stricmp(stoken, "name"))
+			{
+				// the skin name must uniquely identify a single skin
+				// I'm lazy so if name is already used I leave the 'skin x'
+				// default skin name set in Sk_SetDefaultValue
+				if (R_LocalSkinAvailable(value, local) == -1)
+				{
+					STRBUFCPY(skin->name, value);
+					strlwr(skin->name);
+				}
+				// I'm not lazy, so if the name is already used I make the name 'namex'
+				// using the default skin name's number set above
+				else
+				{
+					const size_t stringspace =
+						strlen(value) + sizeof lnumskins + 1;
+					char *value2 = Z_Malloc(stringspace, PU_STATIC, NULL);
+					snprintf(value2, stringspace,
+						"%s%d", value, lnumskins);
+					value2[stringspace - 1] = '\0';
+					if (R_LocalSkinAvailable(value2, local) == -1)
+					{
+						STRBUFCPY(skin->name,
+							value2);
+						strlwr(skin->name);
+					}
+					Z_Free(value2);
+				}
+
+				// copy to hudname and fullname as a default.
+				if (!realname)
+				{
+					STRBUFCPY(skin->realname, skin->name);
+					for (value = skin->realname; *value; value++)
+						if (*value == '_') *value = ' '; // turn _ into spaces.
+				}
+				if (!hudname)
+				{
+					STRBUFCPY(skin->hudname, skin->name);
+					strupr(skin->hudname);
+					for (value = skin->hudname; *value; value++)
+						if (*value == '_') *value = ' '; // turn _ into spaces.
+				}
+			}
+			else if (!stricmp(stoken, "realname"))
+			{ // Display name (eg. "Knuckles")
+				realname = true;
+				STRBUFCPY(skin->realname, value);
+				for (value = skin->realname; *value; value++)
+					if (*value == '_') *value = ' '; // turn _ into spaces.
+				if (!hudname)
+					STRBUFCPY(skin->hudname, skin->realname);
+			}
+			else if (!stricmp(stoken, "hudname"))
+			{ // Life icon name (eg. "K.T.E")
+				hudname = true;
+				STRBUFCPY(skin->hudname, value);
+				for (value = skin->hudname; *value; value++)
+					if (*value == '_') *value = ' '; // turn _ into spaces.
+				if (!realname)
+					STRBUFCPY(skin->realname, skin->hudname);
+			}
+
+			else if (!stricmp(stoken, "sprite"))
+			{
+				strupr(value);
+				memcpy(skin->sprite, value, sizeof skin->sprite);
+			}
+			else if (!stricmp(stoken, "facerank"))
+			{
+				strupr(value);
+				memcpy(skin->facerank, value, sizeof(skin->facerank)-1);
+				skin->facerank[sizeof(skin->facerank)-1] = '\0';
+			}
+			else if (!stricmp(stoken, "facewant"))
+			{
+				strupr(value);
+				memcpy(skin->facewant, value, sizeof(skin->facewant)-1);
+				skin->facewant[sizeof(skin->facewant)-1] = '\0';
+			}
+			else if (!stricmp(stoken, "facemmap"))
+			{
+				strupr(value);
+				strncpy(skin->facemmap, value, sizeof(skin->facemmap)-1);
+				skin->facemmap[sizeof(skin->facemmap)-1] = '\0';
+			}
+
+#define FULLPROCESS(field) else if (!stricmp(stoken, #field)) skin->field = get_number(value);
+			// character type identification
+			FULLPROCESS(flags)
+#undef FULLPROCESS
+
+#define GETKARTSTAT(field) \
+	else if (!stricmp(stoken, #field)) \
+	{ \
+		skin->field = atoi(value); \
+		if (skin->field < 1) skin->field = 1; \
+		if (skin->field > 9) skin->field = 9; \
+	}
+			GETKARTSTAT(kartspeed)
+			GETKARTSTAT(kartweight)
+#undef GETKARTSTAT
+
+			// custom translation table
+			else if (!stricmp(stoken, "startcolor"))
+				skin->starttranscolor = atoi(value);
+
+			else if (!stricmp(stoken, "prefcolor"))
+				skin->prefcolor = K_GetKartColorByName(value);
+			else if (!stricmp(stoken, "highresscale"))
+				skin->highresscale = FLOAT_TO_FIXED(atof(value));
+			else
+			{
+				INT32 found = false;
+				sfxenum_t i;
+				// copy name of sounds that are remapped
+				// for this skin
+				for (i = 0; i < sfx_skinsoundslot0; i++)
+				{
+					if (!S_sfx[i].name)
+						continue;
+					if (S_sfx[i].skinsound != -1
+						&& !stricmp(S_sfx[i].name,
+							stoken + 2))
+					{
+						skin->soundsid[S_sfx[i].skinsound] =
+							S_AddSoundFx(value+2, S_sfx[i].singularity, S_sfx[i].pitch, true);
+						found = true;
+					}
+				}
+				if (!found)
+					CONS_Debug(DBG_SETUP, "R_AddSkins: Unknown keyword '%s' in S_SKIN lump# %d (WAD %s)\n", stoken, lump, wadfiles[wadnum]->filename);
+			}
+next_token:
+			stoken = strtok(NULL, "\r\n= ");
+		}
+		free(buf2);
+
+		lump++; // if no sprite defined use spirte just after this one
+		if (skin->sprite[0] == '\0')
+		{
+			const char *csprname = W_CheckNameForNumPwad(wadnum, lump);
+
+			// skip to end of this skin's frames
+			lastlump = lump;
+			while (W_CheckNameForNumPwad(wadnum,lastlump) && memcmp(W_CheckNameForNumPwad(wadnum, lastlump),csprname,4)==0)
+				lastlump++;
+			// allocate (or replace) sprite frames, and set spritedef
+			R_AddSingleSpriteDef(csprname, &skin->spritedef, wadnum, lump, lastlump);
+		}
+		else
+		{
+			// search in the normal sprite tables
+			size_t name;
+			boolean found = false;
+			const char *sprname = skin->sprite;
+			for (name = 0;sprnames[name][0] != '\0';name++)
+				if (strncmp(sprnames[name], sprname, 4) == 0)
+				{
+					found = true;
+					skin->spritedef = sprites[name];
+				}
+
+			// not found so make a new one
+			// go through the entire current wad looking for our sprite
+			// don't just mass add anything beginning with our four letters.
+			// "HOODFACE" is not a sprite name.
+			if (!found)
+			{
+				UINT16 localllump = 0, lstart = UINT16_MAX, lend = UINT16_MAX;
+				const char *lname;
+
+				while ((lname = W_CheckNameForNumPwad(wadnum,localllump)))
+				{
+					// If this is a valid sprite...
+					if (!memcmp(lname,sprname,4) && lname[4] && lname[5] && lname[5] >= '0' && lname[5] <= '8')
+					{
+						if (lstart == UINT16_MAX)
+							lstart = localllump;
+						// If already set do nothing
+					}
+					else
+					{
+						if (lstart != UINT16_MAX)
+						{
+							lend = localllump;
+							break;
+						}
+						// If not already set do nothing
+					}
+					++localllump;
+				}
+
+				R_AddSingleSpriteDef(sprname, &skin->spritedef, wadnum, lstart, lend);
+			}
+
+			// I don't particularly care about skipping to the end of the used frames.
+			// We could be using frames from ANYWHERE in the current WAD file, including
+			// right before us, which is a terrible idea.
+			// So just let the function in the while loop take care of it for us.
+		}
+
+		R_FlushTranslationColormapCache();
+
+		CONS_Printf(M_GetText("Added skin '%s'\n"), skin->name);
+#ifdef SKINVALUES
+		(local ? localskin_cons_t : skin_cons_t)[lnumskins].value = lnumskins;
+		(local ? localskin_cons_t : skin_cons_t)[lnumskins].strvalue = skin->name;
+#endif
+
+		if (!local)
+		{
+			// Update the forceskin possiblevalues
+			Forceskin_cons_t[numskins+1].value = numskins;
+			Forceskin_cons_t[numskins+1].strvalue = skins[numskins].name;
+			skin->localskin = false;
+			skin->localnum = numskins;
+			ST_LoadFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, numskins);
+		}
+		else
+		{
+			skin->localskin = true;
+			skin->localnum = numlocalskins;
+			ST_LoadLocalFaceGraphics(skin->facerank, skin->facewant, skin->facemmap, numlocalskins);
+		}
+
+#ifdef HWRENDER
+		if (rendermode == render_opengl)
+			HWR_AddPlayerMD2(lnumskins, local);
+#endif
+		if (!local)
+		{
+			skinstats[skin->kartspeed-1][skin->kartweight-1][skinstatscount[skin->kartspeed-1][skin->kartweight-1]] = numskins;
+			CONS_Debug(DBG_SETUP, M_GetText("Added %d to %d, %d\n"), numskins, skin->kartweight, skin->kartweight);
+			skinstatscount[skin->kartspeed-1][skin->kartweight-1]++;
+			CONS_Debug(DBG_SETUP, M_GetText("Incremented %d, %d to %d\n"), skin->kartspeed, skin->kartweight, skinstatscount[skin->kartspeed - 1][skin->kartweight - 1]);
+			skinsorted[numskins] = numskins;
+		}
+
+		allskins[numallskins] = K_GetSkinArray(local)[lnumskins];
+
+		local ? numlocalskins++ : numskins++;
+		numallskins++;
+	}
+
+#undef lnumskins
+	//sortSkinGrid();
+
+	return;
+}
diff --git a/src/r_skins.h b/src/r_skins.h
new file mode 100644
index 000000000..cada396f4
--- /dev/null
+++ b/src/r_skins.h
@@ -0,0 +1,152 @@
+// SONIC ROBO BLAST 2 KART
+//-----------------------------------------------------------------------------
+// Copyright (C) 2025 by Vivian "toastergrl" Grannell.
+// Copyright (C) 2025 by Kart Krew.
+// Copyright (C) 2020 by Sonic Team Junior.
+// Copyright (C) 2000 by DooM Legacy Team.
+// Copyright (C) 1996 by id Software, Inc.
+//
+// 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  r_skins.h
+/// \brief Skins stuff
+
+#ifndef __R_SKINS__
+#define __R_SKINS__
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "d_player.h"
+#include "sounds.h"
+#include "r_patch.h"
+
+// "Left" and "Right" character symbols for additional rotation functionality
+#define ROT_L ('L' - '0')
+#define ROT_R ('R' - '0')
+
+#define SKINNAMESIZE 16
+// should be all lowercase!! S_SKIN processing does a strlwr
+#define DEFAULTSKIN "sonic"
+#define DEFAULTSKIN2 "tails" // secondary player
+#define DEFAULTSKIN3 "knuckles" // third player
+#define DEFAULTSKIN4 "eggman" // fourth player
+
+typedef struct
+{
+	char name[SKINNAMESIZE+1]; // INT16 descriptive name of the skin
+	spritedef_t spritedef;
+	spriteinfo_t sprinfo;
+	UINT16 wadnum;
+	char sprite[4]; // Sprite name, if seperated from S_SKIN.
+	skinflags_t flags;
+
+	char realname[SKINNAMESIZE+1]; // Display name for level completion.
+	char hudname[SKINNAMESIZE+1]; // HUD name to display (officially exactly 5 characters long)
+	char facerank[9], facewant[9], facemmap[9]; // Arbitrarily named patch lumps
+
+	// SRB2kart
+	UINT8 kartspeed;
+	UINT8 kartweight;
+	//
+
+	// Definable color translation table
+	UINT8 starttranscolor;
+	UINT8 prefcolor;
+	fixed_t highresscale; // scale of highres, default is 0.5
+
+	// specific sounds per skin
+	sfxenum_t soundsid[NUMSKINSOUNDS]; // sound # in S_sfx table
+
+	boolean localskin;
+	INT32 localnum;
+} skin_t;
+
+extern CV_PossibleValue_t Forceskin_cons_t[];
+
+extern INT32 numskins;
+extern INT32 numlocalskins;
+extern INT32 numallskins;
+extern skin_t skins[MAXSKINS];
+extern UINT8 skinstats[9][9][MAXSKINS];
+extern UINT8 skinstatscount[9][9];
+extern UINT8 skinsorted[MAXSKINS];
+
+extern skin_t localskins[MAXLOCALSKINS];
+extern skin_t allskins[MAXSKINS+MAXLOCALSKINS];
+
+//faB: find sprites in wadfile, replace existing, add new ones
+//     (only sprites from namelist are added or replaced)
+void R_AddSpriteDefs(UINT16 wadnum);
+
+void R_InitSkins(void);
+void R_AddSkins(UINT16 wadnum, boolean local);
+
+INT32 R_SkinAvailable(const char *name);
+INT32 R_AnySkinAvailable(const char *name);
+INT32 R_LocalSkinAvailable(const char *name, boolean local);
+
+// had to move those here Zzz...
+INT32 K_GetSkinNum(player_t *player);
+INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local);
+skin_t *K_GetPlayerSkin(player_t *player);
+skin_t *K_GetMobjSkin(const mobj_t *mobj);
+patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum);
+skin_t *K_GetSkinArray(boolean local);
+
+void sortSkinGrid(void);
+
+boolean SetPlayerSkin(INT32 playernum,const char *skinname);
+void SetPlayerSkinByNum(INT32 playernum,INT32 skinnum); // Tails 03-16-2002
+void SetLocalPlayerSkin(INT32 playernum,const char *skinname, consvar_t *cvar);
+
+char *GetPlayerFacePic(INT32 skinnum);
+
+// Functions to go from sprite character ID to frame number
+// for 2.1 compatibility this still uses the old 'A' + frame code
+// The use of symbols tends to be painful for wad editors though
+// So the future version of this tries to avoid using symbols
+// as much as possible while also defining all 64 slots in a sane manner
+// 2.1:    [[ ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~   ]]
+// Future: [[ ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz!@ ]]
+FUNCMATH FUNCINLINE static ATTRINLINE char R_Frame2Char(UINT8 frame)
+{
+#if 1 // 2.1 compat
+	return 'A' + frame;
+#else
+	if (frame < 26) return 'A' + frame;
+	if (frame < 36) return '0' + (frame - 26);
+	if (frame < 62) return 'a' + (frame - 36);
+	if (frame == 62) return '!';
+	if (frame == 63) return '@';
+	return '\xFF';
+#endif
+}
+
+FUNCMATH FUNCINLINE static ATTRINLINE UINT8 R_Char2Frame(char cn)
+{
+#if 1 // 2.1 compat
+	if (cn == '+') return '\\' - 'A'; // PK3 can't use backslash, so use + instead
+	return cn - 'A';
+#else
+	if (cn >= 'A' && cn <= 'Z') return cn - 'A';
+	if (cn >= '0' && cn <= '9') return (cn - '0') + 26;
+	if (cn >= 'a' && cn <= 'z') return (cn - 'a') + 36;
+	if (cn == '!') return 62;
+	if (cn == '@') return 63;
+	return 255;
+#endif
+}
+
+FUNCMATH FUNCINLINE static ATTRINLINE boolean R_ValidSpriteAngle(UINT8 rotation)
+{
+	return ((rotation <= 8) || (rotation == ROT_L) || (rotation == ROT_R));
+}
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif //__R_SKINS__
diff --git a/src/r_sky.c b/src/r_sky.c
index f42907a54..8cbdd3a59 100644
--- a/src/r_sky.c
+++ b/src/r_sky.c
@@ -41,6 +41,10 @@ INT32 skytexture;
 */
 INT32 skytexturemid;
 
+/**	\brief the x offset of the sky texture
+ */
+INT32 skytextureoffset;
+
 /**	\brief the scale of the sky
 */
 fixed_t skyscale;
@@ -50,6 +54,7 @@ fixed_t skyscale;
 INT32 levelskynum;
 INT32 globallevelskynum;
 
+
 /**	\brief	The R_SetupSkyDraw function
 
 	Called at loadlevel after skytexture is set, or when sky texture changes.
@@ -61,12 +66,19 @@ INT32 globallevelskynum;
 */
 void R_SetupSkyDraw(void)
 {
-	// the horizon line in a 256x128 sky texture
-	skytexturemid = (textures[skytexture]->height/2)<<FRACBITS;
+	// the horizon line in the sky texture
+	skytexturemid = (textures[skytexture]->height / 2) << FRACBITS;
+	skytextureoffset = 0;
 
-	// get the right drawer, it was set by screen.c, depending on the
-	// current video mode bytes per pixel (quick fix)
-	wallcolfunc = walldrawerfunc;
+	if (textures[skytexture]->type == TEXTURETYPE_SINGLEPATCH)
+	{
+		// Sal: Allow for sky offsets
+		texpatch_t *const tex_patch = &textures[skytexture]->patches[0];
+		patch_t *patch = W_CachePatchNumPwad(tex_patch->wad, tex_patch->lump, PU_CACHE);
+
+		skytexturemid += (patch->topoffset << FRACBITS);
+		skytextureoffset += (patch->leftoffset << FRACBITS);
+	}
 
 	R_SetSkyScale();
 }
@@ -79,6 +91,7 @@ void R_SetupSkyDraw(void)
 */
 void R_SetSkyScale(void)
 {
+	//skyscale = FixedDiv(fovtan, FixedDiv(vid.width*FRACUNIT, BASEVIDWIDTH*FRACUNIT));
 	fixed_t difference = vid.fdupx-(vid.dupx<<FRACBITS);
 	skyscale = FixedDiv(fovtan, vid.fdupx+difference);
 }
diff --git a/src/r_sky.h b/src/r_sky.h
index 86b615595..507d93e5f 100644
--- a/src/r_sky.h
+++ b/src/r_sky.h
@@ -14,6 +14,10 @@
 #ifndef __R_SKY__
 #define __R_SKY__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "m_fixed.h"
 
 #ifdef __GNUG__
@@ -26,7 +30,7 @@
 /// \brief The sky map is 256*128*4 maps.
 #define ANGLETOSKYSHIFT 22
 
-extern INT32 skytexture, skytexturemid;
+extern INT32 skytexture, skytexturemid, skytextureoffset;
 extern fixed_t skyscale;
 
 extern INT32 skyflatnum;
@@ -38,4 +42,8 @@ void R_SetupSkyDraw(void);
 
 void R_SetSkyScale(void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/r_splats.c b/src/r_splats.c
index f86f16860..bcef8cf24 100644
--- a/src/r_splats.c
+++ b/src/r_splats.c
@@ -33,7 +33,16 @@ struct rastery_s
 	fixed_t tx1, ty1;
 	fixed_t tx2, ty2; // start/end points in texture at this line
 };
-static struct rastery_s rastertab[MAXVIDHEIGHT];
+static struct rastery_s *rastertab;
+
+static boolean *cliptable;
+
+void R_AllocFloorSpriteTables(void)
+{
+	//cliptable = Z_Realloc(cliptable, sizeof(*cliptable) * (viewwidth + 1), PU_STATIC, NULL);
+	rastertab = Z_Realloc(rastertab, sizeof(*rastertab) * viewheight, PU_STATIC, NULL);
+}
+
 
 static void prepare_rastertab(void);
 #endif
@@ -142,7 +151,7 @@ void R_AddWallSplat(line_t *wallline, INT16 sectorside, const char *patchname, f
 	splat->flags = flags;
 
 	// bad.. but will be needed for drawing anyway..
-	patch = W_CachePatchNum(splat->patch, PU_CACHE);
+	patch = W_CachePatchNum(splat->patch, PU_SPRITE); // idk?
 
 	// offset needed by draw code for texture mapping
 	linelength = P_SegLength((seg_t *)wallline);
diff --git a/src/r_splats.h b/src/r_splats.h
index 387b29582..2dddb2523 100644
--- a/src/r_splats.h
+++ b/src/r_splats.h
@@ -59,9 +59,6 @@ typedef struct floorsplat_s
 	struct floorsplat_s *nextvis;
 } floorsplat_t;
 
-// p_setup.c
-fixed_t P_SegLength(seg_t *seg);
-
 // call at P_SetupLevel()
 void R_ClearLevelSplats(void);
 
@@ -78,4 +75,6 @@ void R_ClearVisibleFloorSplats(void);
 void R_AddVisibleFloorSplats(subsector_t *subsec);
 void R_DrawVisibleFloorSplats(void);
 
+void R_AllocFloorSpriteTables(void);
+
 #endif /*__R_SPLATS_H__*/
diff --git a/src/r_state.h b/src/r_state.h
index 5234d1d62..0431525e7 100644
--- a/src/r_state.h
+++ b/src/r_state.h
@@ -94,10 +94,6 @@ extern boolean viewsky, skyVisible;
 extern boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible of each splitscreen player
 extern sector_t *viewsector;
 extern player_t *viewplayer;
-extern UINT8 portalrender;
-extern sector_t *portalcullsector;
-extern line_t *portalclipline;
-extern INT32 portalclipstart, portalclipend;
 
 extern consvar_t cv_allowmlook;
 extern consvar_t cv_maxportals;
@@ -108,7 +104,7 @@ extern angle_t clipangle;
 extern angle_t doubleclipangle;
 
 extern INT32 viewangletox[FINEANGLES/2];
-extern angle_t xtoviewangle[MAXVIDWIDTH+1];
+extern angle_t *xtoviewangle;
 
 extern fixed_t rw_distance;
 extern angle_t rw_normalangle;
diff --git a/src/r_things.c b/src/r_things.cpp
similarity index 73%
rename from src/r_things.c
rename to src/r_things.cpp
index aebeb94c5..d195218e8 100644
--- a/src/r_things.c
+++ b/src/r_things.cpp
@@ -1,4 +1,4 @@
-// SONIC ROBO BLAST 2
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
 // Copyright (C) 1993-1996 by id Software, Inc.
 // Copyright (C) 1998-2000 by DooM Legacy Team.
@@ -11,31 +11,32 @@
 /// \file  r_things.c
 /// \brief Refresh of things, i.e. objects represented by sprites
 
-#include "doomdef.h"
-#include "console.h"
-#include "g_game.h"
-#include "r_local.h"
-#include "st_stuff.h"
-#include "w_wad.h"
-#include "z_zone.h"
-#include "m_misc.h"
-#include "i_video.h" // rendermode
+#include "r_main.h" // stplyr
 #include "r_fps.h"
 #include "r_things.h"
-#include "r_patch.h"
 #include "r_plane.h"
+#include "r_portal.h"
+#include "r_local.h"
+#include "doomdef.h"
+#include "d_netfil.h" // blargh. for nameonly().
+#include "console.h"
+#include "g_game.h"
 #include "p_tick.h"
 #include "p_local.h"
+#include "p_setup.h"
 #include "p_slopes.h"
-#include "dehacked.h" // get_number (for thok)
-#include "d_netfil.h" // blargh. for nameonly().
-#include "m_cheat.h" // objectplace
-#include "k_kart.h" // SRB2kart
-#include "p_local.h" // stplyr
+#include "st_stuff.h"
+#include "i_video.h" // rendermode
+#include "w_wad.h"
+#include "z_zone.h"
+
+#include "core/thread_pool.h"
+
 #ifdef HWRENDER
 #include "hardware/hw_md2.h"
 #endif
 
+<<<<<<< HEAD:src/r_things.c
 #include "qs22j.h"
 
 CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2];
@@ -43,6 +44,13 @@ CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2];
 static void R_InitSkins(void);
 
 #define MINZ (FRACUNIT*4)
+=======
+#ifdef ROTSPRITE
+#include "r_patchrotation.h"
+#endif
+
+#define MINZ (FRACUNIT*16)
+>>>>>>> Saturn-Next:src/r_things.cpp
 #define BASEYCENTER (BASEVIDHEIGHT/2)
 
 typedef struct
@@ -62,23 +70,13 @@ typedef struct
 static lighttable_t **spritelights;
 
 // constant arrays used for psprite clipping and initializing clipping
-INT16 negonearray[MAXVIDWIDTH];
-INT16 screenheightarray[MAXVIDWIDTH];
-
-spriteinfo_t spriteinfo[NUMSPRITES];
+INT16 *negonearray;
+INT16 *screenheightarray;
 
 //
 // INITIALIZATION FUNCTIONS
 //
 
-// variables used to look up and range check thing_t sprites patches
-spritedef_t *sprites;
-size_t numsprites;
-
-static spriteframe_t sprtemp[64];
-static size_t maxframe;
-static const char *spritename;
-
 //
 // Clipping against drawsegs optimization, from prboom-plus
 //
@@ -106,6 +104,44 @@ static drawseg_xrange_item_t *drawsegs_xrange;
 static size_t drawsegs_xrange_size = 0;
 static INT32 drawsegs_xrange_count = 0;
 
+INT32 R_ThingLightLevel(mobj_t* thing)
+{
+	INT32 lightlevel = thing->lightlevel;
+
+	return lightlevel;
+}
+
+//
+// Sprite rotation 0 is facing the viewer,
+//  rotation 1 is one angle turn CLOCKWISE around the axis.
+// This is not the same as the angle,
+//  which increases counter clockwise (protractor).
+// There was a lot of stuff grabbed wrong, so I changed it...
+//
+
+spriteinfo_t spriteinfo[NUMSPRITES];
+
+//
+// INITIALIZATION FUNCTIONS
+//
+
+// variables used to look up and range check thing_t sprites patches
+spritedef_t *sprites;
+size_t numsprites;
+
+static spriteframe_t sprtemp[64];
+static size_t maxframe;
+static const char *spritename;
+
+//
+// GAME FUNCTIONS
+//
+UINT32 visspritecount, numvisiblesprites;
+
+static UINT32 clippedvissprites;
+static vissprite_t *visspritechunks[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {NULL};
+
+
 // ==========================================================================
 //
 // Sprite loading routines: support sprites in pwad, dehacked sprite renaming,
@@ -141,8 +177,7 @@ static void R_InstallSpriteLump(UINT16 wad,            // graphics patch
 #ifdef ROTSPRITE
 	for (r = 0; r < 16; r++)
 	{
-		sprtemp[frame].rotated[0][r] = NULL;
-		sprtemp[frame].rotated[1][r] = NULL;
+		sprtemp[frame].rotated[r] = NULL;
 	}
 #endif/*ROTSPRITE*/
 
@@ -239,13 +274,13 @@ static void R_InstallSpriteLump(UINT16 wad,            // graphics patch
 //
 // Returns true if the sprite was succesfully added
 //
-static boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16 wadnum, UINT16 startlump, UINT16 endlump)
+boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16 wadnum, UINT16 startlump, UINT16 endlump)
 {
 	UINT16 l;
 	UINT8 frame;
 	UINT8 rotation;
 	lumpinfo_t *lumpinfo;
-	patch_t patch;
+	softwarepatch_t patch;
 	UINT8 numadded = 0;
 
 	memset(sprtemp,0xFF, sizeof (sprtemp));
@@ -269,7 +304,7 @@ static boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef,
 
 	for (l = startlump; l < endlump; l++)
 	{
-		if (memcmp(lumpinfo[l].name,sprname,4))
+		if (memcmp(lumpinfo[l].name, sprname, 4))
 			continue;
 
 		frame = R_Char2Frame(lumpinfo[l].name[4]);
@@ -282,16 +317,16 @@ static boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef,
 		}
 
 		// skip NULL sprites from very old dmadds pwads
-		if (W_LumpLengthPwad(wadnum,l)<=8)
+		if (W_LumpLengthPwad(wadnum, l) <= 8)
 			continue;
 
 		// store sprite info in lookup tables
 		//FIXME : numspritelumps do not duplicate sprite replacements
-		W_ReadLumpHeaderPwad(wadnum, l, &patch, sizeof (patch_t), 0);
-		spritecachedinfo[numspritelumps].width = SHORT(patch.width)<<FRACBITS;
-		spritecachedinfo[numspritelumps].offset = SHORT(patch.leftoffset)<<FRACBITS;
-		spritecachedinfo[numspritelumps].topoffset = SHORT(patch.topoffset)<<FRACBITS;
-		spritecachedinfo[numspritelumps].height = SHORT(patch.height)<<FRACBITS;
+		W_ReadLumpHeaderPwad(wadnum, l, &patch, (sizeof(INT16) *4), 0);
+		spritecachedinfo[numspritelumps].width = (INT32)(SHORT(patch.width))<<FRACBITS;
+		spritecachedinfo[numspritelumps].offset = (INT32)(SHORT(patch.leftoffset))<<FRACBITS;
+		spritecachedinfo[numspritelumps].topoffset = (INT32)(SHORT(patch.topoffset))<<FRACBITS;
+		spritecachedinfo[numspritelumps].height = (INT32)(SHORT(patch.height))<<FRACBITS;
 
 		//BP: we cannot use special tric in hardware mode because feet in ground caused by z-buffer
 		if (rendermode != render_none) // not for psprite
@@ -389,8 +424,7 @@ static boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef,
 
 	// allocate this sprite's frames
 	if (!spritedef->spriteframes)
-		spritedef->spriteframes =
-		 Z_Malloc(maxframe * sizeof (*spritedef->spriteframes), PU_STATIC, NULL);
+		spritedef->spriteframes = static_cast<spriteframe_t*>(Z_Malloc(maxframe * sizeof (*spritedef->spriteframes), PU_STATIC, NULL));
 
 	spritedef->numframes = maxframe;
 	M_Memcpy(spritedef->spriteframes, sprtemp, maxframe*sizeof (spriteframe_t));
@@ -463,16 +497,6 @@ void R_AddSpriteDefs(UINT16 wadnum)
 	CONS_Printf(M_GetText("%s added %d frames in %s sprites\n"), wadname, end-start, sizeu1(addsprites));
 }
 
-
-//
-// GAME FUNCTIONS
-//
-UINT32 visspritecount, numvisiblesprites;
-
-static UINT32 clippedvissprites;
-static vissprite_t *visspritechunks[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {NULL};
-
-
 //
 // R_InitSprites
 // Called at program start.
@@ -485,11 +509,6 @@ void R_InitSprites(void)
 	float fa;
 #endif
 
-	for (i = 0; i < MAXVIDWIDTH; i++)
-	{
-		negonearray[i] = -1;
-	}
-
 #ifdef ROTSPRITE
 	for (angle = 1; angle < ROTANGLES; angle++)
 	{
@@ -509,7 +528,7 @@ void R_InitSprites(void)
 	if (!numsprites)
 		I_Error("R_AddSpriteDefs: no sprites in namelist\n");
 
-	sprites = Z_Calloc(numsprites * sizeof (*sprites), PU_STATIC, NULL);
+	sprites = static_cast<spritedef_t*>(Z_Calloc(numsprites * sizeof (*sprites), PU_STATIC, NULL));
 
 	// find sprites in each -file added pwad
 	for (i = 0; i < numwadfiles; i++)
@@ -521,7 +540,7 @@ void R_InitSprites(void)
 
 	// it can be is do before loading config for skin cvar possible value
 	R_InitSkins();
-	for (i = 0; i < numwadfiles; i++) 
+	for (i = 0; i < numwadfiles; i++)
 	{
 		R_AddSkins((UINT16)i, false);
 		R_LoadSpriteInfoLumps(i, wadfiles[i]->numlumps);
@@ -537,6 +556,34 @@ void R_ClearSprites(void)
 	visspritecount = numvisiblesprites = clippedvissprites = 0;
 }
 
+static INT16 *vissprite_clipbot[MAXVISSPRITES >> VISSPRITECHUNKBITS];
+static INT16 *vissprite_cliptop[MAXVISSPRITES >> VISSPRITECHUNKBITS];
+
+static void R_AllocVisSpriteChunkMemory(UINT32 chunk)
+{
+	vissprite_clipbot[chunk] = static_cast<INT16*>(Z_Realloc(vissprite_clipbot[chunk], sizeof(INT16) * (VISSPRITESPERCHUNK * viewwidth), PU_STATIC, NULL));
+	vissprite_cliptop[chunk] = static_cast<INT16*>(Z_Realloc(vissprite_cliptop[chunk], sizeof(INT16) * (VISSPRITESPERCHUNK * viewwidth), PU_STATIC, NULL));
+
+	for (unsigned i = 0; i < VISSPRITESPERCHUNK; i++)
+	{
+		vissprite_t *sprite = visspritechunks[chunk] + i;
+
+		sprite->clipbot = vissprite_clipbot[chunk] + (viewwidth * i);
+		sprite->cliptop = vissprite_cliptop[chunk] + (viewwidth * i);
+	}
+}
+
+void R_AllocVisSpriteMemory(void)
+{
+	unsigned numchunks = MAXVISSPRITES >> VISSPRITECHUNKBITS;
+
+	for (unsigned i = 0; i < numchunks; i++)
+	{
+		if (visspritechunks[i])
+			R_AllocVisSpriteChunkMemory(i);
+	}
+}
+
 //
 // R_NewVisSprite
 //
@@ -548,7 +595,10 @@ static vissprite_t *R_GetVisSprite(UINT32 num)
 
 		// Allocate chunk if necessary
 		if (!visspritechunks[chunk])
+		{
 			Z_Malloc(sizeof(vissprite_t) * VISSPRITESPERCHUNK, PU_LEVEL, &visspritechunks[chunk]);
+			R_AllocVisSpriteChunkMemory(chunk);
+		}
 
 		return visspritechunks[chunk] + (num & VISSPRITEINDEXMASK);
 }
@@ -573,16 +623,16 @@ INT16 *mceilingclip;
 fixed_t spryscale = 0, sprtopscreen = 0, sprbotscreen = 0;
 fixed_t windowtop = 0, windowbottom = 0;
 
-void R_DrawMaskedColumn(column_t *column)
+void R_DrawMaskedColumn(drawcolumndata_t* dc, column_t *column)
 {
 	INT32 topscreen;
 	INT32 bottomscreen;
 	fixed_t basetexturemid;
 	INT32 topdelta, prevdelta = 0;
 
-	basetexturemid = dc_texturemid;
+	basetexturemid = dc->texturemid;
 
-	for (; column->topdelta != 0xff ;)
+	while (column->topdelta != 0xff)
 	{
 		// calculate unclipped screen coordinates
 		// for post
@@ -593,55 +643,56 @@ void R_DrawMaskedColumn(column_t *column)
 		topscreen = sprtopscreen + spryscale*topdelta;
 		bottomscreen = topscreen + spryscale*column->length;
 
-		dc_yl = (topscreen+FRACUNIT-1)>>FRACBITS;
-		dc_yh = (bottomscreen-1)>>FRACBITS;
+		dc->yl = (topscreen+FRACUNIT-1)>>FRACBITS;
+		dc->yh = (bottomscreen-1)>>FRACBITS;
 
 		if (windowtop != INT32_MAX && windowbottom != INT32_MAX)
 		{
 			if (windowtop > topscreen)
-				dc_yl = (windowtop + FRACUNIT - 1)>>FRACBITS;
+				dc->yl = (windowtop + FRACUNIT - 1)>>FRACBITS;
 			if (windowbottom < bottomscreen)
-				dc_yh = (windowbottom - 1)>>FRACBITS;
+				dc->yh = (windowbottom - 1)>>FRACBITS;
 		}
 
-		if (dc_yh >= mfloorclip[dc_x])
-			dc_yh = mfloorclip[dc_x]-1;
-		if (dc_yl <= mceilingclip[dc_x])
-			dc_yl = mceilingclip[dc_x]+1;
-		if (dc_yl < 0)
-			dc_yl = 0;
-		if (dc_yh >= vid.height)
-			dc_yh = vid.height - 1;
+		if (dc->yh >= mfloorclip[dc->x])
+			dc->yh = mfloorclip[dc->x]-1;
+		if (dc->yl <= mceilingclip[dc->x])
+			dc->yl = mceilingclip[dc->x]+1;
 
-		if (dc_yl <= dc_yh && dc_yh > 0)
+		if (dc->yl < 0)
+			dc->yl = 0;
+		if (dc->yh >= vid.height)
+			dc->yh = vid.height - 1;
+
+		if (dc->yl <= dc->yh && dc->yh > 0 && column->length != 0)
 		{
-			dc_source = (UINT8 *)column + 3;
-			dc_texturemid = basetexturemid - (topdelta<<FRACBITS);
+			dc->source = (UINT8 *)column + 3;
+			dc->sourcelength = column->length;
+			dc->texturemid = basetexturemid - (topdelta<<FRACBITS);
 
 			// Drawn by R_DrawColumn.
-			// This stuff is a likely cause of the splitscreen water crash bug.
-			// FIXTHIS: Figure out what "something more proper" is and do it.
-			// quick fix... something more proper should be done!!!
-			if (ylookup[dc_yl])
-				colfunc();
+			drawcolumndata_t dc_copy = *dc;
+			void (*colfunccopy)(drawcolumndata_t*);
+			colfunccopy = colfunc;
+			colfunccopy(const_cast<drawcolumndata_t*>(&dc_copy));
 		}
 		column = (column_t *)((UINT8 *)column + column->length + 4);
 	}
 
-	dc_texturemid = basetexturemid;
+	dc->texturemid = basetexturemid;
 }
 
 INT32 lengthcol; // column->length : for flipped column function pointers and multi-patch on 2sided wall = texture->height
 
-static void R_DrawFlippedMaskedColumn(column_t *column)
+static void R_DrawFlippedMaskedColumn(drawcolumndata_t* dc, column_t *column)
 {
 	INT32 topscreen;
 	INT32 bottomscreen;
-	fixed_t basetexturemid = dc_texturemid;
+	fixed_t basetexturemid = dc->texturemid;
 	INT32 topdelta, prevdelta = -1;
 	UINT8 *d,*s;
 
-	for (; column->topdelta != 0xff ;)
+	while (column->topdelta != 0xff)
 	{
 		// calculate unclipped screen coordinates
 		// for post
@@ -653,39 +704,60 @@ static void R_DrawFlippedMaskedColumn(column_t *column)
 		topscreen = sprtopscreen + spryscale*topdelta;
 		bottomscreen = sprbotscreen == INT32_MAX ? topscreen + spryscale*column->length
 		                                      : sprbotscreen + spryscale*column->length;
-		dc_yl = (topscreen+FRACUNIT-1)>>FRACBITS;
-		dc_yh = (bottomscreen-1)>>FRACBITS;
+		dc->yl = (topscreen+FRACUNIT-1)>>FRACBITS;
+		dc->yh = (bottomscreen-1)>>FRACBITS;
 
 		if (windowtop != INT32_MAX && windowbottom != INT32_MAX)
 		{
 			if (windowtop > topscreen)
-				dc_yl = (windowtop + FRACUNIT - 1)>>FRACBITS;
+				dc->yl = (windowtop + FRACUNIT - 1)>>FRACBITS;
 			if (windowbottom < bottomscreen)
-				dc_yh = (windowbottom - 1)>>FRACBITS;
+				dc->yh = (windowbottom - 1)>>FRACBITS;
 		}
 
-		if (dc_yh >= mfloorclip[dc_x])
-			dc_yh = mfloorclip[dc_x]-1;
-		if (dc_yl <= mceilingclip[dc_x])
-			dc_yl = mceilingclip[dc_x]+1;
-		if (dc_yl < 0)
-			dc_yl = 0;
-		if (dc_yh >= vid.height)
-			dc_yh = vid.height - 1;
+		if (dc->yh >= mfloorclip[dc->x])
+			dc->yh = mfloorclip[dc->x]-1;
+		if (dc->yl <= mceilingclip[dc->x])
+			dc->yl = mceilingclip[dc->x]+1;
+		if (dc->yl < 0)
+			dc->yl = 0;
+		if (dc->yh >= vid.height) // dc->yl must be < vid.height, so reduces number of checks in tight loop
+			dc->yh = vid.height - 1;
 
-		if (dc_yl <= dc_yh && dc_yh > 0)
+		if (dc->yl <= dc->yh && dc->yh > 0 && column->length != 0)
 		{
-			dc_source = ZZ_Alloc(column->length);
-			for (s = (UINT8 *)column+2+column->length, d = dc_source; d < dc_source+column->length; --s)
+			dc->source = static_cast<UINT8*>(ZZ_Alloc(column->length));
+			dc->sourcelength = column->length;
+
+			for (s = (UINT8 *)column+2+column->length, d = dc->source; d < dc->source+column->length; --s)
 				*d++ = *s;
+<<<<<<< HEAD:src/r_things.c
 			dc_texturemid = basetexturemid - (topdelta<<FRACBITS);
 			colfunc();
 			Z_Free(dc_source);
+=======
+			dc->texturemid = basetexturemid - (topdelta<<FRACBITS);
+
+			// Still drawn by R_DrawColumn.
+			drawcolumndata_t dc_copy = *dc;
+			void (*colfunccopy)(drawcolumndata_t*);
+			colfunccopy = colfunc;
+			colfunccopy(const_cast<drawcolumndata_t*>(&dc_copy));
+
+			Z_Free(dc->source);
+>>>>>>> Saturn-Next:src/r_things.cpp
 		}
 		column = (column_t *)((UINT8 *)column + column->length + 4);
 	}
 
-	dc_texturemid = basetexturemid;
+	dc->texturemid = basetexturemid;
+}
+
+
+// Based off of R_GetLinedefTransTable
+transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap)
+{
+	return static_cast<transnum_t>((20*(FRACUNIT - ((alpha * (10 - transmap))/10) - 1) + FRACUNIT) >> (FRACBITS+1));
 }
 
 //
@@ -695,7 +767,7 @@ static void R_DrawFlippedMaskedColumn(column_t *column)
 static void R_DrawVisSprite(vissprite_t *vis)
 {
 	column_t *column;
-	void (*localcolfunc)(column_t *);
+	void (*localcolfunc)(drawcolumndata_t*, column_t *);
 	INT32 texturecolumn;
 	INT32 pwidth;
 	fixed_t frac;
@@ -703,6 +775,7 @@ static void R_DrawVisSprite(vissprite_t *vis)
 	fixed_t this_scale = vis->thingscale;
 	INT32 x1, x2;
 	INT64 overflow_test;
+	drawcolumndata_t dc = {};
 
 	if (!patch)
 		return;
@@ -718,89 +791,85 @@ static void R_DrawVisSprite(vissprite_t *vis)
 		if (overflow_test < 0) overflow_test = -overflow_test;
 		if ((UINT64)overflow_test&0xFFFFFFFF80000000ULL) return; // ditto
 	}
-	
+
 	// TODO This check should not be necessary. But Papersprites near to the camera will sometimes create invalid values
 	// for the vissprite's startfrac. This happens because they are not depth culled like other sprites.
 	// Someone who is more familiar with papersprites pls check and try to fix <3
-	if (vis->startfrac < 0 || vis->startfrac > (SHORT(patch->width) << FRACBITS))
+	if (vis->startfrac < 0 || vis->startfrac > (patch->width << FRACBITS))
 	{
 		// never draw vissprites with startfrac out of patch range
 		return;
 	}
 
-	colfunc = basecolfunc; // hack: this isn't resetting properly somewhere.
-	dc_colormap = vis->colormap;
+	R_SetColumnFunc(BASEDRAWFUNC); // hack: this isn't resetting properly somewhere.
+	dc.colormap = vis->colormap;
 	if ((vis->mobj->flags & MF_BOSS) && (vis->mobj->flags2 & MF2_FRET) && (leveltime & 1)) // Bosses "flash"
 	{
-		// translate certain pixels to white
-		colfunc = transcolfunc;
+		R_SetColumnFunc(COLDRAWFUNC_TRANS); // translate certain pixels to white
 		if (vis->mobj->type == MT_CYBRAKDEMON)
-			dc_translation = R_GetTranslationColormap(TC_ALLWHITE, 0, GTC_CACHE);
+			dc.translation = R_GetTranslationColormap(TC_ALLWHITE, SKINCOLOR_NONE, GTC_CACHE);
 		else if (vis->mobj->type == MT_METALSONIC_BATTLE)
-			dc_translation = R_GetTranslationColormap(TC_METALSONIC, 0, GTC_CACHE);
+			dc.translation = R_GetTranslationColormap(TC_METALSONIC, SKINCOLOR_NONE, GTC_CACHE);
 		else
-			dc_translation = R_GetTranslationColormap(TC_BOSS, 0, GTC_CACHE);
+			dc.translation = R_GetTranslationColormap(TC_BOSS, SKINCOLOR_NONE, GTC_CACHE);
 	}
 	else if (vis->mobj->color && vis->transmap) // Color mapping
 	{
-		colfunc = transtransfunc;
-		dc_transmap = vis->transmap;
+		R_SetColumnFunc(COLDRAWFUNC_TRANSTRANS);
+		dc.transmap = vis->transmap;
 		if (vis->mobj->colorized)
-			dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
+			dc.translation = R_GetTranslationColormap(TC_RAINBOW, static_cast<skincolors_t>(vis->mobj->color), GTC_CACHE);
 		else if (vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // MT_GHOST LOOKS LIKE A PLAYER SO USE THE PLAYER TRANSLATION TABLES. >_>
-			dc_translation = R_GetLocalTranslationColormap(vis->mobj->skin, vis->mobj->localskin, vis->mobj->color, GTC_CACHE, vis->mobj->skinlocal);
+			dc.translation = R_GetLocalTranslationColormap(static_cast<skin_t*>(vis->mobj->skin), static_cast<skin_t*>(vis->mobj->localskin), static_cast<skincolors_t>(vis->mobj->color), GTC_CACHE, vis->mobj->skinlocal);
 		else // Use the defaults
-			dc_translation = R_GetTranslationColormap(TC_DEFAULT, vis->mobj->color, GTC_CACHE);
+			dc.translation = R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolors_t>(vis->mobj->color), GTC_CACHE);
 	}
 	else if (vis->transmap)
 	{
-		colfunc = fuzzcolfunc;
-		dc_transmap = vis->transmap;    //Fab : 29-04-98: translucency table
+		R_SetColumnFunc(COLDRAWFUNC_FUZZY);
+		dc.transmap = vis->transmap;    //Fab : 29-04-98: translucency table
 	}
 	else if (vis->mobj->color)
 	{
 		// translate green skin to another color
-		colfunc = transcolfunc;
+		R_SetColumnFunc(COLDRAWFUNC_TRANS);
 
 		// New colormap stuff for skins Tails 06-07-2002
 		if (vis->mobj->colorized)
-			dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
+			dc.translation = R_GetTranslationColormap(TC_RAINBOW, static_cast<skincolors_t>(vis->mobj->color), GTC_CACHE);
 		else if (vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // This thing is a player!
-			dc_translation = R_GetLocalTranslationColormap(vis->mobj->skin, vis->mobj->localskin, vis->mobj->color, GTC_CACHE, vis->mobj->skinlocal);
+			dc.translation = R_GetLocalTranslationColormap(static_cast<skin_t*>(vis->mobj->skin), static_cast<skin_t*>(vis->mobj->localskin), static_cast<skincolors_t>(vis->mobj->color), GTC_CACHE, vis->mobj->skinlocal);
 		else // Use the defaults
-			dc_translation = R_GetTranslationColormap(TC_DEFAULT, vis->mobj->color, GTC_CACHE);
+			dc.translation = R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolors_t>(vis->mobj->color), GTC_CACHE);
 	}
 	else if (vis->mobj->sprite == SPR_PLAY) // Looks like a player, but doesn't have a color? Get rid of green sonic syndrome.
 	{
-		colfunc = transcolfunc;
-		dc_translation = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_BLUE, GTC_CACHE);
+		R_SetColumnFunc(COLDRAWFUNC_TRANS);
+		dc.translation = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_BLUE, GTC_CACHE);
 	}
 
 	if (vis->extra_colormap)
 	{
-		if (!dc_colormap)
-			dc_colormap = vis->extra_colormap->colormap;
+		if (!dc.colormap)
+			dc.colormap = vis->extra_colormap->colormap;
 		else
-			dc_colormap = &vis->extra_colormap->colormap[dc_colormap - colormaps];
+			dc.colormap = &vis->extra_colormap->colormap[dc.colormap - colormaps];
 	}
-	if (!dc_colormap)
-		dc_colormap = colormaps;
+	if (!dc.colormap)
+		dc.colormap = colormaps;
 
 	if (encoremap && !vis->mobj->color && !(vis->mobj->flags & MF_DONTENCOREMAP))
-			dc_colormap += COLORMAP_REMAPOFFSET;
+		dc.colormap += COLORMAP_REMAPOFFSET;
 
-	dc_texturemid = vis->texturemid;
-	dc_texheight = 0;
+	dc.texturemid = vis->texturemid;
+	dc.texheight = patch->height;
 
 	frac = vis->startfrac;
 	windowtop = windowbottom = sprbotscreen = INT32_MAX;
 
-	if (vis->mobj->localskin && ((skin_t *)vis->mobj->localskin)->flags & SF_HIRES)
-		this_scale = FixedMul(this_scale, ((skin_t *)vis->mobj->localskin)->highresscale);
-	else if (vis->mobj->skin && ((skin_t *)vis->mobj->skin)->flags & SF_HIRES)
-		this_scale = FixedMul(this_scale, ((skin_t *)vis->mobj->skin)->highresscale);
 	if (this_scale <= 0)
 		this_scale = 1;
+
 	if (this_scale != FRACUNIT)
 	{
 		if (!vis->isScaled)
@@ -810,15 +879,15 @@ static void R_DrawVisSprite(vissprite_t *vis)
 			vis->xiscale = FixedDiv(vis->xiscale, this_scale);
 			vis->isScaled = true;
 		}
-		dc_texturemid = FixedDiv(dc_texturemid, this_scale);
+		dc.texturemid = FixedDiv(dc.texturemid, this_scale);
 	}
 
 	spryscale = vis->scale;
 
 	if (!(vis->scalestep))
 	{
-		sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-		dc_iscale = FixedDiv(FRACUNIT, vis->scale);
+		sprtopscreen = centeryfrac - FixedMul(dc.texturemid, spryscale);
+		dc.iscale = FixedDiv(FRACUNIT, vis->scale);
 	}
 
 	x1 = vis->x1;
@@ -833,28 +902,20 @@ static void R_DrawVisSprite(vissprite_t *vis)
 	if (vis->x2 >= vid.width)
 		vis->x2 = vid.width-1;
 
-	// Something is occasionally setting 1px-wide sprites whose frac is exactly the width of the sprite, causing crashes due to
-	// accessing invalid column info. Until the cause is found, let's try to correct those manually...
-	{
-		fixed_t temp = ((frac + vis->xiscale*(vis->x2-vis->x1))>>FRACBITS) - SHORT(patch->width);
-		if (temp > 0)
-			vis->x2 -= temp;
-	}
-
 	localcolfunc = (vis->vflip) ? R_DrawFlippedMaskedColumn : R_DrawMaskedColumn;
 	lengthcol = patch->height;
+	pwidth = patch->width;
 
 	// Split drawing loops for paper and non-paper to reduce conditional checks per sprite
 	if (vis->scalestep)
 	{
 		fixed_t horzscale = FixedMul(vis->spritexscale, this_scale);
 		fixed_t scalestep = FixedMul(vis->scalestep, vis->spriteyscale);
-		pwidth = SHORT(patch->width);
 
 		// Papersprite drawing loop
-		for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, spryscale += scalestep)
+		for (dc.x = vis->x1; dc.x <= vis->x2; dc.x++, spryscale += scalestep)
 		{
-			angle_t angle = ((vis->centerangle + xtoviewangle[dc_x]) >> ANGLETOFINESHIFT) & 0xFFF;
+			angle_t angle = ((vis->centerangle + xtoviewangle[dc.x]) >> ANGLETOFINESHIFT) & 0xFFF;
 			texturecolumn = (vis->paperoffset - FixedMul(FINETANGENT(angle), vis->paperdistance)) / horzscale;
 
 			if (texturecolumn < 0 || texturecolumn >= pwidth)
@@ -863,29 +924,31 @@ static void R_DrawVisSprite(vissprite_t *vis)
 			if (vis->xiscale < 0) // Flipped sprite
 				texturecolumn = pwidth - 1 - texturecolumn;
 
-			sprtopscreen = (centeryfrac - FixedMul(dc_texturemid, spryscale));
-			dc_iscale = (0xffffffffu / (unsigned)spryscale);
+			sprtopscreen = (centeryfrac - FixedMul(dc.texturemid, spryscale));
+			dc.iscale = (0xffffffffu / (unsigned)spryscale);
 
-			column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn]));
+			column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn]));
 
-			localcolfunc (column);
+			localcolfunc(&dc, column);
 		}
 	}
 	else
 	{
-		pwidth = SHORT(patch->width);
-
 		// Non-paper drawing loop
-		for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
-		{	
+		for (dc.x = vis->x1; dc.x <= vis->x2; dc.x++, frac += vis->xiscale)
+		{
 			texturecolumn = CLAMP(frac >> FRACBITS, 0, pwidth - 1);
-			column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn]));
-
-			localcolfunc (column);
+			column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn]));
+			localcolfunc(&dc, column);
 		}
 	}
 
+<<<<<<< HEAD:src/r_things.c
 	colfunc = basecolfunc;
+=======
+	R_SetColumnFunc(BASEDRAWFUNC);
+
+>>>>>>> Saturn-Next:src/r_things.cpp
 	vis->x1 = x1;
 	vis->x2 = x2;
 }
@@ -899,9 +962,11 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis)
 	patch_t *patch;
 	fixed_t this_scale = vis->thingscale;
 	INT64 overflow_test;
+	drawcolumndata_t dc = {};
 
 	//Fab : R_InitSprites now sets a wad lump number
 	patch = vis->patch;
+
 	if (!patch)
 		return;
 
@@ -912,21 +977,27 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis)
 
 	if (vis->transmap)
 	{
-		colfunc = fuzzcolfunc;
-		dc_transmap = vis->transmap;    //Fab : 29-04-98: translucency table
+		R_SetColumnFunc(COLDRAWFUNC_FUZZY);
+		dc.transmap = vis->transmap;    //Fab : 29-04-98: translucency table
 	}
 
-	dc_colormap = colormaps;
+	dc.colormap = colormaps;
 	if (encoremap)
-		dc_colormap += COLORMAP_REMAPOFFSET;
+		dc.colormap += COLORMAP_REMAPOFFSET;
 
+<<<<<<< HEAD:src/r_things.c
 	dc_iscale = FixedDiv(FRACUNIT, vis->scale);
 	dc_texturemid = FixedDiv(vis->texturemid, this_scale);
 	dc_texheight = 0;
+=======
+	dc.iscale = FixedDiv(FRACUNIT, vis->scale);
+	dc.texturemid = FixedDiv(vis->texturemid, this_scale);
+	dc.texheight = patch->height;
+>>>>>>> Saturn-Next:src/r_things.cpp
 
 	frac = vis->startfrac;
 	spryscale = vis->scale;
-	sprtopscreen = centeryfrac - FixedMul(dc_texturemid,spryscale);
+	sprtopscreen = centeryfrac - FixedMul(dc.texturemid,spryscale);
 	windowtop = windowbottom = sprbotscreen = INT32_MAX;
 
 	if (vis->x1 < 0)
@@ -935,46 +1006,51 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis)
 	if (vis->x2 >= vid.width)
 		vis->x2 = vid.width-1;
 
-	for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale)
+	for (dc.x = vis->x1; dc.x <= vis->x2; dc.x++, frac += vis->xiscale)
 	{
-		texturecolumn = CLAMP(frac >> FRACBITS, 0, SHORT(patch->width) - 1);
-		column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn]));
+		texturecolumn = frac>>FRACBITS;
 
-		R_DrawMaskedColumn(column);
+		if (texturecolumn < 0 || texturecolumn >= patch->width)
+		{
+			CONS_Debug(DBG_RENDER, "R_DrawPrecipitationSpriteRange: bad texturecolumn\n");
+			break;
+		}
+
+		column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn]));
+
+		R_DrawMaskedColumn(&dc, column);
 	}
 
-	colfunc = basecolfunc;
+	R_SetColumnFunc(BASEDRAWFUNC);
 }
 
 //
 // R_SplitSprite
 // runs through a sector's lightlist and splits the sprite according to the heights
 //
+<<<<<<< HEAD:src/r_things.c
 static void R_SplitSprite(vissprite_t *sprite, mobj_t *thing)
+=======
+static void R_SplitSprite(vissprite_t *sprite)
+>>>>>>> Saturn-Next:src/r_things.cpp
 {
-	INT32 i, lightnum, lindex;
-	INT16 cutfrac;
-	sector_t *sector;
-	vissprite_t *newsprite;
+	sector_t *sector = sprite->sector;
 
-	sector = sprite->sector;
-
-	for (i = 1; i < sector->numlights; i++)
+	for (INT32 i = 1; i < sector->numlights; i++)
 	{
-		fixed_t testheight = sector->lightlist[i].height;
+		fixed_t testheight;
 
 		if (!(sector->lightlist[i].caster->flags & FF_CUTSPRITES))
 			continue;
 
-		if (sector->lightlist[i].slope)
-			testheight = P_GetZAt(sector->lightlist[i].slope, sprite->gx, sprite->gy);
+		testheight = P_GetLightZAt(&sector->lightlist[i], sprite->gx, sprite->gy);
 
 		if (testheight >= sprite->gzt)
 			continue;
 		if (testheight <= sprite->gz)
 			return;
 
-		cutfrac = (INT16)((centeryfrac - FixedMul(testheight - viewz, sprite->sortscale))>>FRACBITS);
+		INT16 cutfrac = (INT16)((centeryfrac - FixedMul(testheight - viewz, sprite->sortscale))>>FRACBITS);
 		if (cutfrac < 0)
 			continue;
 		if (cutfrac > viewheight)
@@ -982,9 +1058,18 @@ static void R_SplitSprite(vissprite_t *sprite, mobj_t *thing)
 
 		// Found a split! Make a new sprite, copy the old sprite to it, and
 		// adjust the heights.
-		newsprite = M_Memcpy(R_NewVisSprite(), sprite, sizeof (vissprite_t));
+		vissprite_t *newsprite = R_NewVisSprite();
 
-		sprite->cut |= SC_BOTTOM;
+		// Needs to keep the new sprite's clipping tables
+		INT16 *cliptop = newsprite->cliptop;
+		INT16 *clipbot = newsprite->clipbot;
+
+		M_Memcpy(newsprite, sprite, sizeof (vissprite_t));
+
+		newsprite->cliptop = cliptop;
+		newsprite->clipbot = clipbot;
+
+		sprite->cut = static_cast<spritecut_e>(sprite->cut | SC_BOTTOM);
 		sprite->gz = testheight;
 
 		newsprite->gzt = sprite->gz;
@@ -1002,10 +1087,11 @@ static void R_SplitSprite(vissprite_t *sprite, mobj_t *thing)
 
 		newsprite->szt -= 8;
 
-		newsprite->cut |= SC_TOP;
+		sprite->cut = static_cast<spritecut_e>(sprite->cut | SC_TOP);
+
 		if (!(sector->lightlist[i].caster->flags & FF_NOSHADE))
 		{
-			lightnum = (*sector->lightlist[i].lightlevel >> LIGHTSEGSHIFT);
+			INT32 lightnum = R_GetSoftLightlevel(*sector->lightlist[i].lightlevel);
 
 			if (lightnum < 0)
 				spritelights = scalelight[0];
@@ -1016,14 +1102,21 @@ static void R_SplitSprite(vissprite_t *sprite, mobj_t *thing)
 
 			newsprite->extra_colormap = sector->lightlist[i].extra_colormap;
 
+<<<<<<< HEAD:src/r_things.c
 			if (!((thing->frame & (FF_FULLBRIGHT|FF_TRANSMASK) || thing->flags2 & MF2_SHADOW)
+=======
+			if (!((newsprite->cut & SC_FULLBRIGHT)
+>>>>>>> Saturn-Next:src/r_things.cpp
 				&& (!newsprite->extra_colormap || !(newsprite->extra_colormap->fog & 1))))
 			{
-				lindex = FixedMul(sprite->xscale, LIGHTRESOLUTIONFIX)>>(LIGHTSCALESHIFT);
+				INT32 lindex = FixedMul(sprite->xscale, LIGHTRESOLUTIONFIX)>>(LIGHTSCALESHIFT);
 
 				// Mitigate against negative xscale and arithmetic overflow
 				lindex = CLAMP(lindex, 0, MAXLIGHTSCALE - 1);
 
+				if (newsprite->cut & SC_SEMIBRIGHT)
+					lindex = (MAXLIGHTSCALE/2) + (lindex >>1);
+
 				newsprite->colormap = spritelights[lindex];
 			}
 		}
@@ -1092,6 +1185,26 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
 #undef CHECKZ
 }
 
+fixed_t R_GetSpriteDirectionalLighting(angle_t angle)
+{
+	// Copied from P_UpdateSegLightOffset
+	const UINT8 contrast = std::min(std::max(0, maplighting.contrast - maplighting.backlight), UINT8_MAX);
+	const fixed_t contrastFixed = ((fixed_t)contrast) * FRACUNIT;
+
+	fixed_t light = FRACUNIT;
+	fixed_t extralight = 0;
+
+	light = FixedMul(FINECOSINE(angle >> ANGLETOFINESHIFT), FINECOSINE(maplighting.angle >> ANGLETOFINESHIFT))
+		+ FixedMul(FINESINE(angle >> ANGLETOFINESHIFT), FINESINE(maplighting.angle >> ANGLETOFINESHIFT));
+	light = (light + FRACUNIT) / 2;
+
+	light = FixedMul(light, FRACUNIT - FSIN(abs(AngleDeltaSigned(angle, maplighting.angle)) / 2));
+
+	extralight = -contrastFixed + FixedMul(light, contrastFixed * 2);
+
+	return extralight;
+}
+
 //
 // R_ProjectSprite
 // Generates a vissprite for a thing
@@ -1099,10 +1212,7 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
 //
 static void R_ProjectSprite(mobj_t *thing)
 {
-	mobj_t *oldthing = thing;
-
 	fixed_t tr_x, tr_y;
-	fixed_t gxt, gyt;
 	fixed_t tx, tz;
 	fixed_t xscale, yscale, sortscale; //added : 02-02-98 : aaargll..if I were a math-guy!!!
 
@@ -1118,25 +1228,25 @@ static void R_ProjectSprite(mobj_t *thing)
 	size_t rot;
 	UINT8 flip;
 
-	boolean mirrored = thing->mirrored;
-	boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
-
 	INT32 lindex;
+	INT32 trans;
 
 	vissprite_t *vis;
 
 	angle_t ang = 0; // gcc 4.6 and lower fix
+#ifdef ROTSPRITE
 	angle_t camang = 0;
+#endif
 	fixed_t iscale;
 	fixed_t scalestep; // toast '16
 	fixed_t offset, offset2;
-	boolean papersprite = (thing->frame & FF_PAPERSPRITE);
 	fixed_t paperoffset = 0, paperdistance = 0; angle_t centerangle = 0;
 
 	//SoM: 3/17/2000
 	fixed_t gz, gzt;
 	INT32 heightsec, phs;
 	INT32 light = 0;
+	lighttable_t **lights_array = spritelights;
 	fixed_t this_scale;
 	fixed_t spritexscale, spriteyscale;
 
@@ -1147,21 +1257,25 @@ static void R_ProjectSprite(mobj_t *thing)
 #ifdef ROTSPRITE
 	patch_t *rotsprite = NULL;
 	INT32 rollangle = 0;
-	angle_t rollsum = 0;
 	angle_t pitchnroll = 0;
 	angle_t sliptiderollangle = 0;
 #endif
-	
-	INT32 dist = -1;
 
-	if (cv_grmaxinterpdist.value)
-		dist = R_QuickCamDist(thing->x, thing->y);
+	if (!thing || thing->subsector == NULL)
+		return;
+
+	mobj_t *oldthing = thing;
+
+	const boolean mirrored = thing->mirrored;
+	const boolean vflip = (thing->eflags & MFE_VERTICALFLIP);
+	const boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
+	const boolean papersprite = (thing->frame & FF_PAPERSPRITE);
 
 	// uncapped/interpolation
-	interpmobjstate_t interp = {0};
+	interpmobjstate_t interp = {};
 
 	// do interpolation
-	if (R_UsingFrameInterpolation() && !paused && (!cv_grmaxinterpdist.value || dist < cv_grmaxinterpdist.value))
+	if (R_UsingFrameInterpolation() && !paused && R_CheckInterpDist(oldthing))
 	{
 		R_InterpolateMobjState(oldthing, rendertimefrac, &interp);
 	}
@@ -1172,25 +1286,23 @@ static void R_ProjectSprite(mobj_t *thing)
 
 	this_scale = interp.scale;
 
+	if (this_scale < 1)
+		return;
+
 	// transform the origin point
 	tr_x = interp.x - viewx;
 	tr_y = interp.y - viewy;
 
-	gxt = FixedMul(tr_x, viewcos);
-	gyt = -FixedMul(tr_y, viewsin);
-
-	tz = gxt-gyt;
+	tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); // near/far distance
 
 	// thing is behind view plane?
 	if (!papersprite && (tz < FixedMul(MINZ, this_scale))) // papersprite clipping is handled later
 		return;
 
-	gxt = -FixedMul(tr_x, viewsin);
-	gyt = FixedMul(tr_y, viewcos);
-	tx = -(gyt + gxt);
+	tx = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos); // sideways distance
 
 	// too far off the side?
-	if (!papersprite && abs(tx) > tz<<2) // papersprite clipping is handled later
+	if (!papersprite && abs(tx) > (INT64)FixedMul(tz, fovtan)<<2) // papersprite clipping is handled later
 		return;
 
 	// aspect ratio stuff
@@ -1203,14 +1315,20 @@ static void R_ProjectSprite(mobj_t *thing)
 		I_Error("R_ProjectSprite: invalid sprite number %d ", thing->sprite);
 #endif
 
-	rot = thing->frame&FF_FRAMEMASK;
+	rot = (thing->frame & FF_FRAMEMASK);
+
+#ifdef ROTSPRITE
+	// determine here if sprite should rotate for optimization
+	const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll));
+	const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || sliprollrotate);
+#endif
 
 	//Fab : 02-08-98: 'skin' override spritedef currently used for skin
 	if ((thing->skin || thing->localskin) && thing->sprite == SPR_PLAY)
 	{
-		sprdef = &((skin_t *)( (thing->localskin) ? thing->localskin : thing->skin ))->spritedef;
+		sprdef = &K_GetMobjSkin(thing)->spritedef;
 #ifdef ROTSPRITE
-		sprinfo = &((skin_t *)( (thing->localskin) ? thing->localskin : thing->skin ))->sprinfo;
+		sprinfo = &K_GetMobjSkin(thing)->sprinfo;
 #endif
 
 		if (rot >= sprdef->numframes)
@@ -1234,7 +1352,7 @@ static void R_ProjectSprite(mobj_t *thing)
 #ifdef ROTSPRITE
 		sprinfo = &spriteinfo[thing->sprite];
 #endif
-		rot = thing->frame&FF_FRAMEMASK;
+		rot = (thing->frame & FF_FRAMEMASK);
 		if (!thing->skin)
 		{
 			thing->state->sprite = thing->sprite;
@@ -1249,11 +1367,18 @@ static void R_ProjectSprite(mobj_t *thing)
 		I_Error("R_ProjectSprite: sprframes NULL for sprite %d\n", thing->sprite);
 #endif
 
-	if (sprframe->rotate != SRF_SINGLE || papersprite || (cv_sloperoll.value == 2 && cv_spriteroll.value))
+	if (sprframe->rotate != SRF_SINGLE || papersprite
+#ifdef ROTSPRITE
+		|| (shouldrotate)
+#endif
+	)
 	{
-		ang = R_PointToAngle (interp.x, interp.y) - interp.angle;
-		camang = R_PointToAngle (interp.x, interp.y);
-		
+		ang = R_PointToAngle(interp.x, interp.y);
+#ifdef ROTSPRITE
+		camang = ang;
+#endif
+		ang -= interp.angle;
+
 		if (mirrored)
 			ang = InvAngle(ang);
 	}
@@ -1270,9 +1395,9 @@ static void R_ProjectSprite(mobj_t *thing)
 		// choose a different rotation based on player view
 		//ang = R_PointToAngle (interp.x, interp.y) - interpangle;
 
-		if ((ang < ANGLE_180) && (sprframe->rotate & SRF_RIGHT)) // See from right
+		if ((sprframe->rotate & SRF_RIGHT) && (ang < ANGLE_180)) // See from right
 			rot = 6; // F7 slot
-		else if ((ang >= ANGLE_180) && (sprframe->rotate & SRF_LEFT)) // See from left
+		else if ((sprframe->rotate & SRF_LEFT) && (ang >= ANGLE_180)) // See from left
 			rot = 2; // F3 slot
 		else // Normal behaviour
 			rot = (ang+ANGLE_202h)>>29;
@@ -1283,11 +1408,6 @@ static void R_ProjectSprite(mobj_t *thing)
 	}
 
 	I_Assert(lump < max_spritelumps);
-	
-	if (thing->localskin && ((skin_t *)thing->localskin)->flags & SF_HIRES)
-		this_scale = FixedMul(this_scale, ((skin_t *)thing->localskin)->highresscale);
-	else if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES)
-		this_scale = FixedMul(this_scale, ((skin_t *)thing->skin)->highresscale);
 
 	spr_width = spritecachedinfo[lump].width;
 	spr_height = spritecachedinfo[lump].height;
@@ -1295,9 +1415,7 @@ static void R_ProjectSprite(mobj_t *thing)
 	spr_topoffset = spritecachedinfo[lump].topoffset;
 
 #ifdef ROTSPRITE
-    pitchnroll = 0;  // set this to 0, non-paper sprites will affect this value
-	
-	if (cv_spriteroll.value)
+	if (shouldrotate)
 	{
 		if (papersprite)
 		{
@@ -1315,30 +1433,26 @@ static void R_ProjectSprite(mobj_t *thing)
 		{
 			// this is very messy, but it on-the-fly calculates rotations for all the
 			// pitch and roll variables
-			pitchnroll = FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), interp.roll) +
-						 FixedMul(FINESINE((ang) >> ANGLETOFINESHIFT), interp.pitch) +
-						 FixedMul(FINECOSINE((camang) >> ANGLETOFINESHIFT), interp.sloperoll) +
-						 FixedMul(FINESINE((camang) >> ANGLETOFINESHIFT), interp.slopepitch);
-
+			pitchnroll = R_RotationAngle(ang, camang, &interp);
 			rollangle = thing->rollangle;
 		}
 
+<<<<<<< HEAD:src/r_things.c
 		if (rollangle || pitchnroll || (thing->player && thing->player->sliproll))
+=======
+		if (rollangle || pitchnroll || sliprollrotate)
+>>>>>>> Saturn-Next:src/r_things.cpp
 		{
-			rollsum = pitchnroll;
-
-			if (thing->player)
+			if (sliprollrotate)
 			{
-				sliptiderollangle =
-					cv_sliptideroll.value ? thing->player->sliproll * (thing->player->sliptidemem) : 0;
-				rollsum += thing->rollangle +
-						   FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle);
+				sliptiderollangle = thing->player->sliproll * thing->player->kartstuff[k_aizdriftstrat];
+				pitchnroll += rollangle + FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), sliptiderollangle);
 			}
 			else
-				rollsum += thing->rollangle;
+				pitchnroll += rollangle;
 
-			rollangle = R_GetRollAngle(rollsum);
-			rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle);
+			rollangle = R_GetRollAngle(pitchnroll);
+			rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, sprinfo, rollangle);
 
 			if (rotsprite != NULL)
 			{
@@ -1360,24 +1474,19 @@ static void R_ProjectSprite(mobj_t *thing)
 	// calculate edges of the shape
 	spritexscale = interp.spritexscale;
 	spriteyscale = interp.spriteyscale;
+
+	if ((thing->skin || thing->localskin) && K_GetMobjSkin(thing)->flags & SF_HIRES)
+	{
+		fixed_t highresscale = ((skin_t *)thing->skin)->highresscale;
+		spritexscale = FixedMul(spritexscale, highresscale);
+		spriteyscale = FixedMul(spriteyscale, highresscale);
+	}
+
 	if (spritexscale < 1 || spriteyscale < 1)
 		return;
 
-	if (thing->renderflags & RF_ABSOLUTEOFFSETS)
-	{
-		spr_offset = interp.spritexoffset;
-		spr_topoffset = interp.spriteyoffset;
-	}
-	else
-	{
-		SINT8 flipoffset = 1;
-
-		if ((thing->renderflags & RF_FLIPOFFSETS) && flip)
-			flipoffset = -1;
-
-		spr_offset += interp.spritexoffset * flipoffset;
-		spr_topoffset += interp.spriteyoffset * flipoffset;
-	}
+	spr_offset += interp.spritexoffset;
+	spr_topoffset += interp.spriteyoffset;
 
 	if (flip)
 		offset = spr_offset - spr_width;
@@ -1403,16 +1512,9 @@ static void R_ProjectSprite(mobj_t *thing)
 
 		tr_x += FixedMul(offset, cosmul);
 		tr_y += FixedMul(offset, sinmul);
-		gxt = FixedMul(tr_x, viewcos);
-		gyt = -FixedMul(tr_y, viewsin);
-		tz = gxt-gyt;
-		yscale = FixedDiv(projectiony, tz);
+		tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
 
-		gxt = -FixedMul(tr_x, viewsin);
-		gyt = FixedMul(tr_y, viewcos);
-		tx = -(gyt + gxt);
-		xscale = FixedDiv(projection, tz);
-		x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS;
+		tx = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos);
 
 		// Get paperoffset (offset) and paperoffset (distance)
 		paperoffset = -FixedMul(tr_x, cosmul) - FixedMul(tr_y, sinmul);
@@ -1426,19 +1528,11 @@ static void R_ProjectSprite(mobj_t *thing)
 
 		tr_x += FixedMul(offset2, cosmul);
 		tr_y += FixedMul(offset2, sinmul);
-		gxt = FixedMul(tr_x, viewcos);
-		gyt = -FixedMul(tr_y, viewsin);
-		tz2 = gxt-gyt;
-		yscale2 = FixedDiv(projectiony, tz2);
-		//if (yscale2 < 64) return; // ditto
+		tz2 = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
 
-		gxt = -FixedMul(tr_x, viewsin);
-		gyt = FixedMul(tr_y, viewcos);
-		tx2 = -(gyt + gxt);
-		xscale2 = FixedDiv(projection, tz2);
-		x2 = ((centerxfrac + FixedMul(tx2,xscale2))>>FRACBITS);
+		tx2 = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos);
 
-		if (max(tz, tz2) < FixedMul(MINZ, this_scale)) // non-papersprite clipping is handled earlier
+		if (std::max(tz, tz2) < FixedMul(MINZ, this_scale)) // non-papersprite clipping is handled earlier
 			return;
 
 		// Needs partially clipped
@@ -1454,7 +1548,7 @@ static void R_ProjectSprite(mobj_t *thing)
 			tx2 += FixedDiv(tx-tx2, div);
 			tz2 = FixedMul(MINZ, this_scale);
 		}
-		
+
 		if ((tx2 / 4) < -(FixedMul(tz2, fovtan)) || (tx / 4) > FixedMul(tz, fovtan)) // too far off the side?
 			return;
 
@@ -1476,21 +1570,20 @@ static void R_ProjectSprite(mobj_t *thing)
 		if (x2 < 0)
 			return;
 
-		range = x2 - x1;
-
-		if (range < 0)
+		if ((range = x2 - x1) <= 0)
 			return;
 
 		range++; // fencepost problem
-		
-		if (range > 32767)
+
+		if (range > INT16_MAX)
 		{
 			// If the range happens to be too large for fixed_t,
 			// abort the draw to avoid xscale becoming negative due to arithmetic overflow.
 			return;
 		}
 
-		scalestep = ((yscale2 - yscale)/range) ?: 1;
+		// Compatibility with MSVC - SSNTails
+		scalestep = ((yscale2 - yscale)/range);
 
 		if (scalestep == 0)
 			scalestep = 1;
@@ -1506,7 +1599,6 @@ static void R_ProjectSprite(mobj_t *thing)
 		scalestep = 0;
 		yscale = sortscale;
 		tx += offset;
-		//x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS;
 		x1 = centerx + (FixedMul(tx,xscale) / FRACUNIT);
 
 		// off the right side?
@@ -1514,7 +1606,6 @@ static void R_ProjectSprite(mobj_t *thing)
 			return;
 
 		tx += offset2;
-		//x2 = ((centerxfrac + FixedMul(tx,xscale))>>FRACBITS); x2--;
 		x2 = (centerx + (FixedMul(tx,xscale) / FRACUNIT)) - 1;
 
 		// off the left side
@@ -1525,15 +1616,36 @@ static void R_ProjectSprite(mobj_t *thing)
 	// PORTAL SPRITE CLIPPING
 	if (portalrender && portalclipline)
 	{
-		if (x2 < portalclipstart || x1 > portalclipend)
+		if (x2 < portalclipstart || x1 >= portalclipend)
 			return;
 
 		if (P_PointOnLineSide(interp.x, interp.y, portalclipline) != 0)
 			return;
 	}
 
+	// Determine the blendmode and translucency value
+	INT32 blendmode;
+	if (oldthing->frame & FF_BLENDMASK)
+		blendmode = ((oldthing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
+	else
+		blendmode = oldthing->blendmode;
+
+	if (oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW) // actually only the player should use this (temporary invisibility)
+		trans = tr_trans80; // because now the translucency is set through FF_TRANSMASK
+	else if (oldthing->frame & FF_TRANSMASK)
+	{
+		trans = (oldthing->frame & FF_TRANSMASK) >> FF_TRANSSHIFT;
+		if (!R_BlendLevelVisible(blendmode, trans))
+			return;
+	}
+	else
+		trans = 0;
+
+	if (cv_playerfade.value && oldthing->player)
+		trans = static_cast<INT32>(R_GetThingTransTable(R_DoPlayerFade(oldthing), static_cast<transnum_t>(trans)));
+
 	//SoM: 3/17/2000: Disregard sprites that are out of view..
-	if (thing->eflags & MFE_VERTICALFLIP)
+	if (vflip)
 	{
 		// When vertical flipped, draw sprites from the top down, at least as far as offsets are concerned.
 		// sprite height - sprite topoffset is the proper inverse of the vertical offset, of course.
@@ -1553,11 +1665,17 @@ static void R_ProjectSprite(mobj_t *thing)
 			return;
 	}
 
-	if (thing->subsector->sector->numlights)
+	if (oldthing->frame & FF_ABSOLUTELIGHTLEVEL)
+	{
+		const UINT8 n = R_ThingLightLevel(oldthing);
+		// n = uint8 aka 0 - 255, so the shift will always be 0 - LIGHTLEVELS - 1
+		lights_array = scalelight[n >> LIGHTSEGSHIFT];
+	}
+	else
 	{
 		INT32 lightnum;
-		light = thing->subsector->sector->numlights - 1;
 
+<<<<<<< HEAD:src/r_things.c
 		for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) {
 			fixed_t h = thing->subsector->sector->lightlist[lightnum].slope ? P_GetZAt(thing->subsector->sector->lightlist[lightnum].slope, interp.x, interp.y)
 			            : thing->subsector->sector->lightlist[lightnum].height;
@@ -1565,16 +1683,73 @@ static void R_ProjectSprite(mobj_t *thing)
 			{
 				light = lightnum - 1;
 				break;
+=======
+		if (thing->subsector->sector->numlights)
+		{
+			light = thing->subsector->sector->numlights - 1;
+
+			// R_GetPlaneLight won't work on sloped lights!
+			for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++)
+			{
+				fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], interp.x, interp.y);
+
+				if (h <= gzt)
+				{
+					light = lightnum - 1;
+					break;
+				}
+			}
+
+			lightnum = *thing->subsector->sector->lightlist[light].lightlevel;
+		}
+		else
+		{
+			lightnum = thing->subsector->sector->lightlevel;
+		}
+
+		lightnum = R_GetSoftLightlevel(lightnum + R_ThingLightLevel(thing));
+
+		if (maplighting.directional && P_SectorUsesDirectionalLighting(thing->subsector->sector))
+		{
+			fixed_t extralight = R_GetSpriteDirectionalLighting(papersprite
+					? interp.angle + (ang >= ANGLE_180 ? -ANGLE_90 : ANGLE_90)
+					: R_PointToAngle(interp.x, interp.y));
+
+			// Krangle contrast in 3P/4P because scalelight
+			// scales differently depending on the screen
+			// width (which is halved in 3P/4P).
+			if (splitscreen > 1)
+			{
+				extralight *= 2;
+			}
+
+			// Less change in contrast in dark sectors
+			extralight = FixedMul(extralight, std::min(std::max(0, lightnum), LIGHTLEVELS - 1) * FRACUNIT / (LIGHTLEVELS - 1));
+
+			if (papersprite)
+			{
+				// Papersprite contrast should match walls
+				lightnum += FixedFloor((extralight / 8) + (FRACUNIT / 2)) / FRACUNIT;
+			}
+			else
+			{
+				fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT));
+
+				// Less change in contrast at further distances, to counteract DOOM diminished light
+				extralight = FixedMul(extralight, std::min(n, FRACUNIT));
+
+				// Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance
+				lightnum += FixedFloor((extralight / 4) + (FRACUNIT / 2)) / FRACUNIT;
+>>>>>>> Saturn-Next:src/r_things.cpp
 			}
 		}
-		lightnum = (*thing->subsector->sector->lightlist[light].lightlevel >> LIGHTSEGSHIFT);
 
 		if (lightnum < 0)
-			spritelights = scalelight[0];
+			lights_array = scalelight[0];
 		else if (lightnum >= LIGHTLEVELS)
-			spritelights = scalelight[LIGHTLEVELS-1];
+			lights_array = scalelight[LIGHTLEVELS-1];
 		else
-			spritelights = scalelight[lightnum];
+			lights_array = scalelight[lightnum];
 	}
 
 	heightsec = thing->subsector->sector->heightsec;
@@ -1586,18 +1761,17 @@ static void R_ProjectSprite(mobj_t *thing)
 	if (heightsec != -1 && phs != -1) // only clip things which are in special sectors
 	{
 		if (viewz < sectors[phs].floorheight ?
-		interp.z >= sectors[heightsec].floorheight :
-		gzt < sectors[heightsec].floorheight)
+			interp.z >= sectors[heightsec].floorheight :
+			gzt < sectors[heightsec].floorheight)
 			return;
 		if (viewz > sectors[phs].ceilingheight ?
-		gzt < sectors[heightsec].ceilingheight && viewz >= sectors[heightsec].ceilingheight :
-		interp.z >= sectors[heightsec].ceilingheight)
+			gzt < sectors[heightsec].ceilingheight && viewz >= sectors[heightsec].ceilingheight :
+			interp.z >= sectors[heightsec].ceilingheight)
 			return;
 	}
 
 	// store information in a vissprite
 	vis = R_NewVisSprite();
-	vis->renderflags = thing->renderflags;
 	vis->heightsec = heightsec; //SoM: 3/17/2000
 	vis->mobjflags = thing->flags;
 	vis->scale = yscale; //<<detailshift;
@@ -1618,17 +1792,8 @@ static void R_ProjectSprite(mobj_t *thing)
 
 	vis->mobj = thing; // Easy access! Tails 06-07-2002
 
-	vis->x1 = x1 < 0 ? 0 : x1;
-	vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;
-
-	// PORTAL SEMI-CLIPPING
-	if (portalrender && portalclipline)
-	{
-		if (vis->x1 < portalclipstart)
-			vis->x1 = portalclipstart;
-		if (vis->x2 > portalclipend)
-			vis->x2 = portalclipend;
-	}
+	vis->x1 = x1 < portalclipstart ? portalclipstart : x1;
+	vis->x2 = x2 >= portalclipend ? portalclipend-1 : x2;
 
 	vis->sector = thing->subsector->sector;
 	vis->szt = (INT16)((centeryfrac - FixedMul(vis->gzt - viewz, sortscale))>>FRACBITS);
@@ -1668,34 +1833,30 @@ static void R_ProjectSprite(mobj_t *thing)
 		vis->scale += FixedMul(scalestep, spriteyscale) * (vis->x1 - x1);
 	}
 
-	//Fab: lumppat is the lump number of the patch to use, this is different
-	//     than lumpid for sprites-in-pwad : the graphics are patched
-#ifdef ROTSPRITE
-	if ((rotsprite != NULL) && (cv_spriteroll.value))
-		vis->patch = rotsprite;
+	if ((blendmode != AST_COPY) && cv_translucency.value)
+		vis->transmap = R_GetBlendTable(blendmode, trans);
 	else
-#endif
-		vis->patch = W_CachePatchNum(sprframe->lumppat[rot], PU_CACHE);
+		vis->transmap = NULL;
 
-//
-// determine the colormap (lightlevel & special effects)
-//
-	vis->transmap = NULL;
+	if (R_ThingIsFullBright(oldthing) || oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW)
+		vis->cut = static_cast<spritecut_e>(vis->cut | SC_FULLBRIGHT);
+	else if (R_ThingIsSemiBright(oldthing))
+		vis->cut = static_cast<spritecut_e>(vis->cut | SC_SEMIBRIGHT);
+	else if (R_ThingIsFullDark(oldthing))
+		vis->cut = static_cast<spritecut_e>(vis->cut | SC_FULLDARK);
 
-	// specific translucency
-	if (!cv_translucency.value)
-		; // no translucency
-	else if (thing->flags2 & MF2_SHADOW) // actually only the player should use this (temporary invisibility)
-		vis->transmap = transtables + ((tr_trans80-1)<<FF_TRANSSHIFT); // because now the translucency is set through FF_TRANSMASK
-	else if (thing->frame & FF_TRANSMASK)
-		vis->transmap = transtables + (thing->frame & FF_TRANSMASK) - 0x10000;
+	//
+	// determine the colormap (lightlevel & special effects)
+	//
 
-	if (((thing->frame & FF_FULLBRIGHT) || (thing->flags2 & MF2_SHADOW))
+	if ((vis->cut & SC_FULLBRIGHT)
 		&& (!vis->extra_colormap || !(vis->extra_colormap->fog & 1)))
 	{
 		// full bright: goggles
 		vis->colormap = colormaps;
 	}
+	else if (vis->cut & SC_FULLDARK)
+		vis->colormap = scalelight[0][0];
 	else
 	{
 		// diminished light
@@ -1704,20 +1865,29 @@ static void R_ProjectSprite(mobj_t *thing)
 		// Mitigate against negative xscale and arithmetic overflow
 		lindex = CLAMP(lindex, 0, MAXLIGHTSCALE - 1);
 
-		vis->colormap = spritelights[lindex];
+		if (vis->cut & SC_SEMIBRIGHT)
+			lindex = (MAXLIGHTSCALE/2) + (lindex >> 1);
+
+		vis->colormap = lights_array[lindex];
 	}
 
+	//Fab: lumppat is the lump number of the patch to use, this is different
+	//     than lumpid for sprites-in-pwad : the graphics are patched
+#ifdef ROTSPRITE
+	if (rotsprite != NULL)
+		vis->patch = rotsprite;
+	else
+#endif
+		vis->patch = static_cast<patch_t*>(W_CachePatchNum(sprframe->lumppat[rot], PU_SPRITE));
+
 	vis->precip = false;
 
-	if (thing->eflags & MFE_VERTICALFLIP)
-		vis->vflip = true;
-	else
-		vis->vflip = false;
+	vis->vflip = vflip;
 
 	vis->isScaled = false;
 
 	if (thing->subsector->sector->numlights)
-		R_SplitSprite(vis, thing);
+		R_SplitSprite(vis);
 
 	// Debug
 	++objectsdrawn;
@@ -1744,16 +1914,20 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
 	fixed_t gz, gzt;
 	fixed_t this_scale;
 
-	INT32 dist = 1;
+	if (!thing || thing->subsector == NULL)
+		return;
 
-	if (cv_grmaxinterpdist.value)
-		dist = R_QuickCamDist(thing->x, thing->y);
+	// okay... this is a hack, but weather isn't networked, so it should be ok
+	if (!P_PrecipThinker(thing))
+	{
+		return;
+	}
 
 	// uncapped/interpolation
-	interpmobjstate_t interp = {0};
+	interpmobjstate_t interp = {};
 
 	// do interpolation
-	if (R_UsingFrameInterpolation() && !paused && (!cv_grmaxinterpdist.value || dist < cv_grmaxinterpdist.value))
+	if (R_UsingFrameInterpolation() && !paused && R_CheckInterpDist((mobj_t*)thing))
 	{
 		R_InterpolatePrecipMobjState(thing, rendertimefrac, &interp);
 	}
@@ -1782,12 +1956,11 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
 	tx = -(gyt + gxt);
 
 	// too far off the side?
-	if (abs(tx) > FixedMul(tz, fovtan)<<2)
+	if (abs(tx) > tz<<2)
 		return;
 
 	// aspect ratio stuff :
 	xscale = FixedDiv(projection, tz);
-	yscale = FixedDiv(projectiony, tz);
 
 	// decide which patch to use for sprite relative to player
 #ifdef RANGECHECK
@@ -1832,7 +2005,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
 	// PORTAL SPRITE CLIPPING
 	if (portalrender && portalclipline)
 	{
-		if (x2 < portalclipstart || x1 > portalclipend)
+		if (x2 < portalclipstart || x1 >= portalclipend)
 			return;
 
 		if (P_PointOnLineSide(interp.x, interp.y, portalclipline) != 0)
@@ -1846,9 +2019,12 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
 	if (thing->subsector->sector->cullheight)
 	{
 		if (R_DoCulling(thing->subsector->sector->cullheight, viewsector->cullheight, viewz, gz, gzt))
-			goto weatherthink;
+			return;
 	}
 
+	// aspect ratio stuff :
+	yscale = FixedDiv(projectiony, tz);
+
 	// store information in a vissprite
 	vis = R_NewVisSprite();
 	vis->scale = FixedMul(yscale, this_scale);
@@ -1859,24 +2035,15 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
 	vis->gy = interp.y;
 	vis->gz = gz;
 	vis->gzt = gzt;
-	vis->thingheight = 4*FRACUNIT;
+	vis->thingheight = 4 << FRACBITS;
 	vis->pz = interp.z;
 	vis->pzt = vis->pz + vis->thingheight;
 	vis->texturemid = vis->gzt - viewz;
 	vis->scalestep = 0;
 	vis->paperdistance = 0;
 
-	vis->x1 = x1 < 0 ? 0 : x1;
-	vis->x2 = x2 >= viewwidth ? viewwidth-1 : x2;
-
-	// PORTAL SEMI-CLIPPING
-	if (portalrender && portalclipline)
-	{
-		if (vis->x1 < portalclipstart)
-			vis->x1 = portalclipstart;
-		if (vis->x2 > portalclipend)
-			vis->x2 = portalclipend;
-	}
+	vis->x1 = x1 < portalclipstart ? portalclipstart : x1;
+	vis->x2 = x2 >= portalclipend ? portalclipend-1 : x2;
 
 	vis->xscale = xscale; //SoM: 4/17/2000
 	vis->sector = thing->subsector->sector;
@@ -1887,19 +2054,22 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
 
 	vis->startfrac = 0;
 	vis->xiscale = FixedDiv(iscale, this_scale);
+<<<<<<< HEAD:src/r_things.c
 
 	vis->thingscale = interp.scale;
+=======
+>>>>>>> Saturn-Next:src/r_things.cpp
 
 	if (vis->x1 > x1)
 		vis->startfrac += vis->xiscale*(vis->x1-x1);
 
 	//Fab: lumppat is the lump number of the patch to use, this is different
 	//     than lumpid for sprites-in-pwad : the graphics are patched
-	vis->patch = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
+	vis->patch = static_cast<patch_t*>(W_CachePatchNum(sprframe->lumppat[0], PU_SPRITE));
 
 	// specific translucency
-	if (thing->frame & FF_TRANSMASK)
-		vis->transmap = (thing->frame & FF_TRANSMASK) - 0x10000 + transtables;
+	if ((thing->blendmode != AST_COPY) && cv_translucency.value)
+		vis->transmap = R_GetTranslucencyTable((thing->frame & FF_TRANSMASK) >> FF_TRANSSHIFT);
 	else
 		vis->transmap = NULL;
 
@@ -1913,18 +2083,6 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
 	vis->precip = true;
 	vis->vflip = false;
 	vis->isScaled = false;
-	
-weatherthink:
-	// okay... this is a hack, but weather isn't networked, so it should be ok
-	if (!(thing->precipflags & PCF_THUNK))
-	{
-		if (thing->precipflags & PCF_RAIN)
-			P_RainThinker(thing);
-		else
-			P_SnowThinker(thing);
-		thing->precipflags |= PCF_THUNK;
-	}
-
 }
 
 // R_AddSprites
@@ -1934,17 +2092,13 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 {
 	mobj_t *thing;
 	INT32 lightnum;
-	fixed_t approx_dist, limit_dist;
-
-	INT32 splitflags;			// check if a mobj has spliscreen flags
-	boolean split_drawsprite;	// used for splitscreen flags
 
 	if (rendermode != render_soft)
 		return;
 
 	// BSP is traversed by subsector.
 	// A sector might have been split into several
-	//  subsectors during BSP building.
+	// subsectors during BSP building.
 	// Thus we check whether its already added.
 	if (sec->validcount == validcount)
 		return;
@@ -1956,7 +2110,7 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 	{
 		if (sec->heightsec == -1) lightlevel = sec->lightlevel;
 
-		lightnum = (lightlevel >> LIGHTSEGSHIFT);
+		lightnum = R_GetSoftLightlevel(lightlevel);
 
 		if (lightnum < 0)
 			spritelights = scalelight[0];
@@ -1968,88 +2122,17 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 
 	// Handle all things in sector.
 	// If a limit exists, handle things a tiny bit different.
-	if ((limit_dist = (fixed_t)(cv_drawdist.value) * mapobjectscale))
+	const INT32 limit_dist = cv_drawdist.value;
+
+	for (thing = sec->thinglist; thing; thing = thing->snext)
 	{
-		for (thing = sec->thinglist; thing; thing = thing->snext)
-		{
-			split_drawsprite = false;
+		if (!R_ThingWithinDist(thing, limit_dist))
+			continue;
 
-			if (thing->sprite == SPR_NULL || thing->flags2 & MF2_DONTDRAW)
-				continue;
+		if (!R_ThingVisible(thing))
+			continue;
 
-			splitflags = thing->eflags & (MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4);
-
-			if (splitscreen && splitflags)
-			{
-				if (thing->eflags & MFE_DRAWONLYFORP1)
-					if (viewssnum == 0)
-						split_drawsprite = true;
-
-				if (thing->eflags & MFE_DRAWONLYFORP2)
-					if (viewssnum == 1)
-						split_drawsprite = true;
-
-				if (thing->eflags & MFE_DRAWONLYFORP3 && splitscreen > 1)
-					if (viewssnum == 2)
-						split_drawsprite = true;
-
-				if (thing->eflags & MFE_DRAWONLYFORP4 && splitscreen > 2)
-					if (viewssnum == 3)
-						split_drawsprite = true;
-			}
-			else
-				split_drawsprite = true;
-
-			if (!split_drawsprite)
-				continue;
-
-			approx_dist = P_AproxDistance(viewx-thing->x, viewy-thing->y);
-
-			if (approx_dist > limit_dist)
-				continue;
-
-			R_ProjectSprite(thing);
-		}
-	}
-	else
-	{
-		// Draw everything in sector, no checks
-		for (thing = sec->thinglist; thing; thing = thing->snext)
-		{
-
-			split_drawsprite = false;
-
-			if (thing->sprite == SPR_NULL || thing->flags2 & MF2_DONTDRAW)
-				continue;
-
-			splitflags = thing->eflags & (MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4);
-
-			if (splitscreen && splitflags)
-			{
-				if (thing->eflags & MFE_DRAWONLYFORP1)
-					if (viewssnum == 0)
-						split_drawsprite = true;
-
-				if (thing->eflags & MFE_DRAWONLYFORP2)
-					if (viewssnum == 1)
-						split_drawsprite = true;
-
-				if (thing->eflags & MFE_DRAWONLYFORP3 && splitscreen > 1)
-					if (viewssnum == 2)
-						split_drawsprite = true;
-
-				if (thing->eflags & MFE_DRAWONLYFORP4 && splitscreen > 2)
-					if (viewssnum == 3)
-						split_drawsprite = true;
-			}
-			else
-				split_drawsprite = true;
-
-			if (!split_drawsprite)
-				continue;
-
-			R_ProjectSprite(thing);
-		}
+		R_ProjectSprite(thing);
 	}
 }
 
@@ -2060,11 +2143,18 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
 //
 void R_AddPrecipitationSprites(void)
 {
-	const fixed_t drawdist = (fixed_t)(cv_drawdist_precip.value) * mapobjectscale;
-
 	INT32 xl, xh, yl, yh, bx, by;
 	precipmobj_t *th, *next;
 
+	// save a little time if theres no or invisible weather
+	if (curWeather == PRECIP_NONE || curWeather == PRECIP_BLANK || curWeather == PRECIP_STORM_NORAIN)
+	{
+		return;
+	}
+
+	const fixed_t precipscale = (cv_mobjscaleprecip.value ? mapobjectscale : FRACUNIT);
+	const fixed_t drawdist = ((fixed_t)(cv_drawdist_precip.value) * precipscale);
+
 	// no, no infinite draw distance for precipitation. this option at zero is supposed to turn it off
 	if (drawdist == 0)
 	{
@@ -2079,7 +2169,7 @@ void R_AddPrecipitationSprites(void)
 		{
 			for (th = precipblocklinks[(by * bmapwidth) + bx]; th; th = next)
 			{
-				// Store this beforehand because R_ProjectPrecipitionSprite may free th (see P_PrecipThinker)
+				// Store this beforehand because R_ProjectPrecipitationSprite may free th (see P_PrecipThinker)
 				next = th->bnext;
 
 				if (th->precipflags & PCF_INVISIBLE)
@@ -2094,9 +2184,7 @@ void R_AddPrecipitationSprites(void)
 //
 // R_SortVisSprites
 //
-static vissprite_t vsprsortedhead;
-
-void R_SortVisSprites(void)
+static void R_SortVisSprites(vissprite_t* vsprsortedhead, UINT32 start, UINT32 end)
 {
 	UINT32       i;
 	vissprite_t *ds, *dsprev, *dsnext, *dsfirst;
@@ -2105,20 +2193,18 @@ void R_SortVisSprites(void)
 	fixed_t      bestscale;
 	INT32        bestdispoffset;
 
-	if (!visspritecount)
-		return;
-
 	unsorted.next = unsorted.prev = &unsorted;
 
-	dsfirst = R_GetVisSprite(0);
+	dsfirst = R_GetVisSprite(start);
 
 	// The first's prev and last's next will be set to
 	// nonsense, but are fixed in a moment
-	for (i = 0, dsnext = dsfirst, ds = NULL; i < visspritecount; i++)
+	for (i = start, dsnext = dsfirst, ds = NULL; i < end; i++)
 	{
 		dsprev = ds;
 		ds = dsnext;
-		if (i < visspritecount - 1) dsnext = R_GetVisSprite(i + 1);
+		if (i < end - 1)
+			dsnext = R_GetVisSprite(i + 1);
 
 		ds->next = dsnext;
 		ds->prev = dsprev;
@@ -2132,8 +2218,8 @@ void R_SortVisSprites(void)
 	unsorted.prev = ds;
 
 	// pull the vissprites out by scale
-	vsprsortedhead.next = vsprsortedhead.prev = &vsprsortedhead;
-	for (i = 0; i < visspritecount; i++)
+	vsprsortedhead->next = vsprsortedhead->prev = vsprsortedhead;
+	for (i = start; i < end; i++)
 	{
 		bestscale = bestdispoffset = INT32_MAX;
 		for (ds = unsorted.next; ds != &unsorted; ds = ds->next)
@@ -2163,10 +2249,10 @@ void R_SortVisSprites(void)
 		{
 			best->next->prev = best->prev;
 			best->prev->next = best->next;
-			best->next = &vsprsortedhead;
-			best->prev = vsprsortedhead.prev;
-			vsprsortedhead.prev->next = best;
-			vsprsortedhead.prev = best;
+			best->next = vsprsortedhead;
+			best->prev = vsprsortedhead->prev;
+			vsprsortedhead->prev->next = best;
+			vsprsortedhead->prev = best;
 		}
 	}
 }
@@ -2177,42 +2263,45 @@ void R_SortVisSprites(void)
 static drawnode_t *R_CreateDrawNode(drawnode_t *link);
 
 static drawnode_t nodebankhead;
-static drawnode_t nodehead;
 
-static void R_CreateDrawNodes(void)
+static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean tempskip)
 {
 	drawnode_t *entry;
 	drawseg_t *ds;
 	INT32 i, p, best, x1, x2;
 	fixed_t bestdelta, delta;
 	vissprite_t *rover;
+	static vissprite_t vsprsortedhead;
 	drawnode_t *r2;
 	visplane_t *plane;
 	INT32 sintersect;
 	fixed_t scale = 0;
+	const INT32 vidheight = vid.height;
 
 	// Add the 3D floors, thicksides, and masked textures...
-	for (ds = ds_p; ds-- > drawsegs ;)
+	for (ds = drawsegs + mask->drawsegs[1]; ds-- > drawsegs + mask->drawsegs[0];)
 	{
 		if (ds->numthicksides)
 		{
 			for (i = 0; i < ds->numthicksides; i++)
 			{
-				entry = R_CreateDrawNode(&nodehead);
+				entry = R_CreateDrawNode(head);
 				entry->thickseg = ds;
 				entry->ffloor = ds->thicksides[i];
 			}
 		}
 		// Check for a polyobject plane, but only if this is a front line
-		if (ds->curline->polyseg && ds->curline->polyseg->visplane && !ds->curline->side) {
+		if (ds->curline->polyseg && ds->curline->polyseg->visplane && !ds->curline->side)
+		{
 			plane = ds->curline->polyseg->visplane;
 			R_PlaneBounds(plane);
 
-			if (plane->low < 0 || plane->high > vid.height || plane->high > plane->low)
+			if (plane->low < 0 || plane->high > vidheight || plane->high > plane->low)
 				;
-			else {
+			else
+			{
 				// Put it in!
-				entry = R_CreateDrawNode(&nodehead);
+				entry = R_CreateDrawNode(head);
 				entry->plane = plane;
 				entry->seg = ds;
 			}
@@ -2220,7 +2309,7 @@ static void R_CreateDrawNodes(void)
 		}
 		if (ds->maskedtexturecol)
 		{
-			entry = R_CreateDrawNode(&nodehead);
+			entry = R_CreateDrawNode(head);
 			entry->seg = ds;
 		}
 		if (ds->numffloorplanes)
@@ -2233,10 +2322,11 @@ static void R_CreateDrawNodes(void)
 				{
 					if (!ds->ffloorplanes[p])
 						continue;
+
 					plane = ds->ffloorplanes[p];
 					R_PlaneBounds(plane);
 
-					if (plane->low < 0 || plane->high > vid.height || plane->high > plane->low || plane->polyobj)
+					if (plane->low < 0 || plane->high > vidheight || plane->high > plane->low || plane->polyobj)
 					{
 						ds->ffloorplanes[p] = NULL;
 						continue;
@@ -2251,7 +2341,7 @@ static void R_CreateDrawNodes(void)
 				}
 				if (best != -1)
 				{
-					entry = R_CreateDrawNode(&nodehead);
+					entry = R_CreateDrawNode(head);
 					entry->plane = ds->ffloorplanes[best];
 					entry->seg = ds;
 					ds->ffloorplanes[best] = NULL;
@@ -2262,6 +2352,9 @@ static void R_CreateDrawNodes(void)
 		}
 	}
 
+	if (tempskip)
+		return;
+
 	// find all the remaining polyobject planes and add them on the end of the list
 	// probably this is a terrible idea if we wanted them to be sorted properly
 	// but it works getting them in for now
@@ -2269,32 +2362,36 @@ static void R_CreateDrawNodes(void)
 	{
 		if (!PolyObjects[i].visplane)
 			continue;
+
 		plane = PolyObjects[i].visplane;
 		R_PlaneBounds(plane);
 
-		if (plane->low < 0 || plane->high > vid.height || plane->high > plane->low)
+		if (plane->low < 0 || plane->high > vidheight || plane->high > plane->low)
 		{
 			PolyObjects[i].visplane = NULL;
 			continue;
 		}
-		entry = R_CreateDrawNode(&nodehead);
+
+		entry = R_CreateDrawNode(head);
 		entry->plane = plane;
 		// note: no seg is set, for what should be obvious reasons
 		PolyObjects[i].visplane = NULL;
 	}
 
-	if (visspritecount == 0)
+	// No vissprites in this mask?
+	if (mask->vissprites[1] - mask->vissprites[0] == 0)
 		return;
 
-	R_SortVisSprites();
+	R_SortVisSprites(&vsprsortedhead, mask->vissprites[0], mask->vissprites[1]);
+
 	for (rover = vsprsortedhead.prev; rover != &vsprsortedhead; rover = rover->prev)
 	{
-		if (rover->szt > vid.height || rover->sz < 0)
+		if (rover->szt > vidheight || rover->sz < 0)
 			continue;
 
 		sintersect = (rover->x1 + rover->x2) / 2;
 
-		for (r2 = nodehead.next; r2 != &nodehead; r2 = r2->next)
+		for (r2 = head->next; r2 != head; r2 = r2->next)
 		{
 			if (r2->plane)
 			{
@@ -2305,25 +2402,18 @@ static void R_CreateDrawNodes(void)
 					continue;
 
 				// Effective height may be different for each comparison in the case of slopes
-				if (r2->plane->slope) {
-					planeobjectz = P_GetZAt(r2->plane->slope, rover->gx, rover->gy);
-					planecameraz = P_GetZAt(r2->plane->slope, viewx, viewy);
-				} else
-					planeobjectz = planecameraz = r2->plane->height;
+				planeobjectz = P_GetZAt(r2->plane->slope, rover->gx, rover->gy, r2->plane->height);
+				planecameraz = P_GetZAt(r2->plane->slope,     viewx,     viewy, r2->plane->height);
 
-				if (rover->mobjflags & MF_NOCLIPHEIGHT)
+				// bird: if any part of the sprite peeks in front the plane
+				if (planecameraz < viewz)
 				{
-					//Objects with NOCLIPHEIGHT can appear halfway in.
-					if (planecameraz < viewz && rover->pz+(rover->thingheight/2) >= planeobjectz)
-						continue;
-					if (planecameraz > viewz && rover->pzt-(rover->thingheight/2) <= planeobjectz)
+					if (rover->gzt >= planeobjectz)
 						continue;
 				}
-				else
+				else if (planecameraz > viewz)
 				{
-					if (planecameraz < viewz && rover->pz >= planeobjectz)
-						continue;
-					if (planecameraz > viewz && rover->pzt <= planeobjectz)
+					if (rover->gz <= planeobjectz)
 						continue;
 				}
 
@@ -2344,6 +2434,7 @@ static void R_CreateDrawNodes(void)
 						if (r2->seg->frontscale[i] > rover->sortscale)
 							break;
 					}
+
 					if (i > x2)
 						continue;
 				}
@@ -2356,32 +2447,33 @@ static void R_CreateDrawNodes(void)
 			}
 			else if (r2->thickseg)
 			{
-				fixed_t topplaneobjectz, topplanecameraz, botplaneobjectz, botplanecameraz;
+				//fixed_t topplaneobjectz, topplanecameraz, botplaneobjectz, botplanecameraz;
+
 				if (rover->x1 > r2->thickseg->x2 || rover->x2 < r2->thickseg->x1)
 					continue;
 
 				scale = r2->thickseg->scale1 > r2->thickseg->scale2 ? r2->thickseg->scale1 : r2->thickseg->scale2;
 				if (scale <= rover->sortscale)
 					continue;
+
 				scale = r2->thickseg->scale1 + (r2->thickseg->scalestep * (sintersect - r2->thickseg->x1));
 				if (scale <= rover->sortscale)
 					continue;
 
-				if (*r2->ffloor->t_slope) {
-					topplaneobjectz = P_GetZAt(*r2->ffloor->t_slope, rover->gx, rover->gy);
-					topplanecameraz = P_GetZAt(*r2->ffloor->t_slope, viewx, viewy);
-				} else
-					topplaneobjectz = topplanecameraz = *r2->ffloor->topheight;
-
-				if (*r2->ffloor->b_slope) {
-					botplaneobjectz = P_GetZAt(*r2->ffloor->b_slope, rover->gx, rover->gy);
-					botplanecameraz = P_GetZAt(*r2->ffloor->b_slope, viewx, viewy);
-				} else
-					botplaneobjectz = botplanecameraz = *r2->ffloor->bottomheight;
+				// bird: Always sort sprites behind segs. This helps the plane
+				// sorting above too. Basically if the sprite gets sorted behind
+				// the seg here, it will be behind the plane too, since planes
+				// are added after segs in the list.
+#if 0
+				topplaneobjectz = P_GetFFloorTopZAt   (r2->ffloor, rover->gx, rover->gy);
+				topplanecameraz = P_GetFFloorTopZAt   (r2->ffloor,     viewx,     viewy);
+				botplaneobjectz = P_GetFFloorBottomZAt(r2->ffloor, rover->gx, rover->gy);
+				botplanecameraz = P_GetFFloorBottomZAt(r2->ffloor,     viewx,     viewy);
 
 				if ((topplanecameraz > viewz && botplanecameraz < viewz) ||
 				    (topplanecameraz < viewz && rover->gzt < topplaneobjectz) ||
 				    (botplanecameraz > viewz && rover->gz > botplaneobjectz))
+#endif
 				{
 					entry = R_CreateDrawNode(NULL);
 					(entry->prev = r2->prev)->next = entry;
@@ -2427,9 +2519,9 @@ static void R_CreateDrawNodes(void)
 				}
 			}
 		}
-		if (r2 == &nodehead)
+		if (r2 == head)
 		{
-			entry = R_CreateDrawNode(&nodehead);
+			entry = R_CreateDrawNode(head);
 			entry->sprite = rover;
 		}
 	}
@@ -2441,7 +2533,7 @@ static drawnode_t *R_CreateDrawNode(drawnode_t *link)
 
 	if (node == &nodebankhead)
 	{
-		node = malloc(sizeof (*node));
+		node = static_cast<drawnode_t*>(malloc(sizeof (*node)));
 		if (!node)
 			I_Error("No more free memory to CreateDrawNode");
 	}
@@ -2461,7 +2553,7 @@ static drawnode_t *R_CreateDrawNode(drawnode_t *link)
 	node->thickseg = NULL;
 	node->ffloor = NULL;
 	node->sprite = NULL;
-	
+
 	ps_numdrawnodes.value.i++;
 	return node;
 }
@@ -2473,25 +2565,24 @@ static void R_DoneWithNode(drawnode_t *node)
 	(node->prev = &nodebankhead)->next = node;
 }
 
-static void R_ClearDrawNodes(void)
+static void R_ClearDrawNodes(drawnode_t* head)
 {
 	drawnode_t *rover;
 	drawnode_t *next;
 
-	for (rover = nodehead.next; rover != &nodehead ;)
+	for (rover = head->next; rover != head;)
 	{
 		next = rover->next;
 		R_DoneWithNode(rover);
 		rover = next;
 	}
 
-	nodehead.next = nodehead.prev = &nodehead;
+	head->next = head->prev = head;
 }
 
 void R_InitDrawNodes(void)
 {
 	nodebankhead.next = nodebankhead.prev = &nodebankhead;
-	nodehead.next = nodehead.prev = &nodehead;
 }
 
 //
@@ -2520,8 +2611,8 @@ static boolean R_CheckSpriteVisible(vissprite_t *spr, INT32 x1, INT32 x2)
 	INT16 sz = spr->sz;
 	INT16 szt = spr->szt;
 
-	fixed_t texturemid, yscale, scalestep = spr->scalestep;
-	INT32 height;
+	fixed_t texturemid = 0, yscale = 0, scalestep = spr->scalestep; // "= 0" pleases the compiler
+	INT32 height = 0;
 
 	if (scalestep)
 	{
@@ -2530,7 +2621,7 @@ static boolean R_CheckSpriteVisible(vissprite_t *spr, INT32 x1, INT32 x2)
 		scalestep = FixedMul(scalestep, spr->spriteyscale);
 
 		if (spr->thingscale != FRACUNIT)
-			texturemid = FixedDiv(spr->texturemid, max(spr->thingscale, 1));
+			texturemid = FixedDiv(spr->texturemid, std::max(spr->thingscale, 1));
 		else
 			texturemid = spr->texturemid;
 	}
@@ -2555,7 +2646,7 @@ static boolean R_CheckSpriteVisible(vissprite_t *spr, INT32 x1, INT32 x2)
 
 // R_ClipVisSprite
 // Clips vissprites without drawing, so that portals can work. -Red
-static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2)
+static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* portal)
 {
 	drawseg_t *ds;
 	INT32		x;
@@ -2585,8 +2676,10 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2)
 
 		while (++curr <= last)
 		{
+			__builtin_prefetch(curr + 1, 0, 3);
+
 			// determine if the drawseg obscures the sprite
-			if (curr->x1 > spr->x2 || curr->x2 < spr->x1)
+			if (curr->x1 > x2 || curr->x2 < x1)
 			{
 				// does not cover sprite
 				continue;
@@ -2594,33 +2687,33 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2)
 
 			ds = curr->user;
 
-			if (ds->portalpass > 0 && ds->portalpass <= portalrender)
-				continue; // is a portal
-
-			r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
-			r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
-
-			if (ds->scale1 > ds->scale2)
+			if (ds->portalpass != 66) // unused?
 			{
-				lowscale = ds->scale2;
-				scale = ds->scale1;
-			}
-			else
-			{
-				lowscale = ds->scale1;
-				scale = ds->scale2;
+				if (ds->portalpass > 0 && ds->portalpass <= portalrender)
+					continue; // is a portal
+
+				if (ds->scale1 > ds->scale2)
+				{
+					lowscale = ds->scale2;
+					scale = ds->scale1;
+				}
+				else
+				{
+					lowscale = ds->scale1;
+					scale = ds->scale2;
+				}
+
+				if (scale < spr->sortscale ||
+					(lowscale < spr->sortscale &&
+					!R_PointOnSegSide(spr->gx, spr->gy, ds->curline)))
+				{
+					// seg is behind sprite
+					continue;
+				}
 			}
 
-			if (scale < spr->sortscale ||
-			    (lowscale < spr->sortscale &&
-			     !R_PointOnSegSide (spr->gx, spr->gy, ds->curline)))
-			{
-				// masked mid texture?
-				/*if (ds->maskedtexturecol)
-					R_RenderMaskedSegRange (ds, r1, r2);*/
-				// seg is behind sprite
-				continue;
-			}
+			r1 = ds->x1 < x1 ? x1 : ds->x1;
+			r2 = ds->x2 > x2 ? x2 : ds->x2;
 
 			// clip this piece of the sprite
 			silhouette = ds->silhouette;
@@ -2662,20 +2755,21 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2)
 	if (spr->heightsec != -1)  // only things in specially marked sectors
 	{
 		fixed_t mh, h;
-		INT32 phs = viewplayer->mo->subsector->sector->heightsec;
+		const INT32 phs = viewplayer->mo->subsector->sector->heightsec;
+
 		if ((mh = sectors[spr->heightsec].floorheight) > spr->gz &&
 			(h = centeryfrac - FixedMul(mh -= viewz, spr->sortscale)) >= 0 &&
 			(h >>= FRACBITS) < viewheight)
 		{
 			if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight))
 			{                          // clip bottom
-				for (x = spr->x1; x <= spr->x2; x++)
+				for (x = x1; x <= x2; x++)
 					if (spr->clipbot[x] == -2 || h < spr->clipbot[x])
 						spr->clipbot[x] = (INT16)h;
 			}
 			else						// clip top
 			{
-				for (x = spr->x1; x <= spr->x2; x++)
+				for (x = x1; x <= x2; x++)
 					if (spr->cliptop[x] == -2 || h > spr->cliptop[x])
 						spr->cliptop[x] = (INT16)h;
 			}
@@ -2687,21 +2781,22 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2)
 		{
 			if (phs != -1 && viewz >= sectors[phs].ceilingheight)
 			{                         // clip bottom
-				for (x = spr->x1; x <= spr->x2; x++)
+				for (x = x1; x <= x2; x++)
 					if (spr->clipbot[x] == -2 || h < spr->clipbot[x])
 						spr->clipbot[x] = (INT16)h;
 			}
 			else                       // clip top
 			{
-				for (x = spr->x1; x <= spr->x2; x++)
+				for (x = x1; x <= x2; x++)
 					if (spr->cliptop[x] == -2 || h > spr->cliptop[x])
 						spr->cliptop[x] = (INT16)h;
 			}
 		}
 	}
+
 	if (spr->cut & SC_TOP && spr->cut & SC_BOTTOM)
 	{
-		for (x = spr->x1; x <= spr->x2; x++)
+		for (x = x1; x <= x2; x++)
 		{
 			if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x])
 				spr->cliptop[x] = spr->szt;
@@ -2712,7 +2807,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2)
 	}
 	else if (spr->cut & SC_TOP)
 	{
-		for (x = spr->x1; x <= spr->x2; x++)
+		for (x = x1; x <= x2; x++)
 		{
 			if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x])
 				spr->cliptop[x] = spr->szt;
@@ -2720,7 +2815,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2)
 	}
 	else if (spr->cut & SC_BOTTOM)
 	{
-		for (x = spr->x1; x <= spr->x2; x++)
+		for (x = x1; x <= x2; x++)
 		{
 			if (spr->clipbot[x] == -2 || spr->sz < spr->clipbot[x])
 				spr->clipbot[x] = spr->sz;
@@ -2730,7 +2825,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2)
 	// all clipping has been performed, so store the values - what, did you think we were drawing them NOW?
 
 	// check for unclipped columns
-	for (x = spr->x1; x <= spr->x2; x++)
+	for (x = x1; x <= x2; x++)
 	{
 		if (spr->clipbot[x] == -2)
 			spr->clipbot[x] = (INT16)viewheight;
@@ -2738,19 +2833,43 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2)
 		if (spr->cliptop[x] == -2)
 			spr->cliptop[x] = -1;
 	}
-	
+
 	// Check if it'll be visible
 	// Not done for floorsprites.
 	if (cv_spriteclip.value)
 	{
 		if (!R_CheckSpriteVisible(spr, x1, x2))
-			spr->cut |= SC_NOTVISIBLE;
+			spr->cut = static_cast<spritecut_e>(spr->cut | SC_NOTVISIBLE);
+	}
+
+	if (portal)
+	{
+		INT32 start_index = std::max(portal->start, x1);
+		INT32 end_index = std::min(portal->start + portal->end - portal->start, x2);
+
+		for (x = x1; x < start_index; x++)
+		{
+			spr->clipbot[x] = -1;
+			spr->cliptop[x] = -1;
+		}
+		for (x = start_index; x <= end_index; x++)
+		{
+			if (spr->clipbot[x] > portal->floorclip[x - portal->start])
+				spr->clipbot[x] = portal->floorclip[x - portal->start];
+			if (spr->cliptop[x] < portal->ceilingclip[x - portal->start])
+				spr->cliptop[x] = portal->ceilingclip[x - portal->start];
+		}
+		for (x = end_index + 1; x <= x2; x++)
+		{
+			spr->clipbot[x] = -1;
+			spr->cliptop[x] = -1;
+		}
 	}
 }
 
-void R_ClipSprites(void)
+void R_ClipSprites(drawseg_t* dsstart, portal_t* portal)
 {
-	const size_t maxdrawsegs = ds_p - drawsegs;
+	const size_t maxdrawsegs = ds_p - dsstart;
 	const INT32 cx = viewwidth / 2;
 	drawseg_t* ds;
 	INT32 i;
@@ -2775,15 +2894,15 @@ void R_ClipSprites(void)
 
 		for (i = 0; i < DS_RANGES_COUNT; i++)
 		{
-			drawsegs_xranges[i].items = Z_Realloc(
+			drawsegs_xranges[i].items = static_cast<drawseg_xrange_item_t*>(Z_Realloc(
 				drawsegs_xranges[i].items,
 				drawsegs_xrange_size * sizeof(drawsegs_xranges[i].items[0]),
 				PU_STATIC, NULL
-			);
+			));
 		}
 	}
 
-	for (ds = ds_p; ds-- > drawsegs;)
+	for (ds = ds_p; ds-- > dsstart;)
 	{
 		if (ds->silhouette || ds->maskedtexturecol)
 		{
@@ -2813,11 +2932,11 @@ void R_ClipSprites(void)
 	for (; clippedvissprites < visspritecount; clippedvissprites++)
 	{
 		vissprite_t *spr = R_GetVisSprite(clippedvissprites);
-		
+
 		if (cv_spriteclip.value
 		&& (spr->szt > vid.height || spr->sz < 0))
 		{
-			spr->cut |= SC_NOTVISIBLE;
+			spr->cut = static_cast<spritecut_e>(spr->cut | SC_NOTVISIBLE);
 			continue;
 		}
 
@@ -2837,36 +2956,131 @@ void R_ClipSprites(void)
 			drawsegs_xrange_count = drawsegs_xranges[0].count;
 		}
 
-		R_ClipVisSprite(spr, spr->x1, spr->x2);
-		
+		R_ClipVisSprite(spr, spr->x1, spr->x2, portal);
+
 		if ((spr->cut & SC_NOTVISIBLE) == 0)
 			numvisiblesprites++;
 	}
 }
 
+/* Check if thing may be drawn from our current view. */
+boolean R_ThingVisible(mobj_t *thing)
+{
+	if (UNLIKELY((thing->sprite == SPR_NULL) || (thing->flags2 & MF2_DONTDRAW)))
+		return false;
+
+	if (UNLIKELY(splitscreen))
+	{
+		if    ((viewssnum == 0 && (thing->eflags & MFE_DRAWONLYFORP1))
+			|| (viewssnum == 1 && (thing->eflags & MFE_DRAWONLYFORP2))
+			|| (viewssnum == 2 && (thing->eflags & MFE_DRAWONLYFORP2))
+			|| (viewssnum == 3 && (thing->eflags & MFE_DRAWONLYFORP4)))
+			return true;
+	}
+
+	return true;
+}
+
+boolean R_ThingWithinDist(mobj_t *thing, INT32 limit_dist)
+{
+	if (limit_dist)
+	{
+		if ((R_QuickCamDist(thing->x, thing->y) << FRACBITS)/mapobjectscale > limit_dist)
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+fixed_t R_DoPlayerFade(mobj_t *thing)
+{
+	fixed_t fadealpha = FRACUNIT;
+	static constexpr tic_t countdownstarttime = (15 * TICRATE) / 4; // starttime - (3*TICRATE)
+
+	if (thing->player == viewplayer || viewplayer->exiting || camera[R_GetViewNumber()].freecam || leveltime < countdownstarttime)
+		return fadealpha;
+
+	const INT32 playerdist     = (FixedMul((thing->x - viewx), viewcos) + FixedMul((thing->y - viewy), viewsin)) >> FRACBITS;
+	const INT32 viewplayerdist = (FixedMul((viewplayer->mo->x - viewx), viewcos) + FixedMul((viewplayer->mo->y - viewy), viewsin)) >> FRACBITS;
+
+	if (playerdist < viewplayerdist)
+	{
+		if (playerdist < viewplayerdist / 2) // stronger fade when very close
+		{
+			fadealpha = (playerdist * FRACUNIT) / (viewplayerdist / 2) / 3;
+		}
+		else
+		{
+			fadealpha = (playerdist * FRACUNIT) / viewplayerdist;
+		}
+	}
+
+	return fadealpha;
+}
+
+boolean R_CheckInterpDist(mobj_t *thing)
+{
+	if (!cv_maxinterpdist.value)
+		return true;
+
+	const INT32 dist = R_QuickCamDist(thing->x, thing->y);
+
+	return (dist < cv_maxinterpdist.value);
+}
+
+boolean R_ThingIsFullBright(mobj_t *thing)
+{
+	return ((thing->frame & FF_BRIGHTMASK) == FF_FULLBRIGHT);
+}
+
+boolean R_ThingIsSemiBright(mobj_t *thing)
+{
+	return ((thing->frame & FF_BRIGHTMASK) == FF_SEMIBRIGHT);
+}
+
+boolean R_ThingIsFullDark(mobj_t *thing)
+{
+	return ((thing->frame & FF_BRIGHTMASK) == FF_FULLDARK);
+}
+
 //
 // R_DrawMasked
 //
-void R_DrawMasked(void)
+static void R_DrawMaskedList(drawnode_t* head)
 {
 	drawnode_t *r2;
 	drawnode_t *next;
 
-	R_CreateDrawNodes();
-
-	for (r2 = nodehead.next; r2 != &nodehead; r2 = r2->next)
+	for (r2 = head->next; r2 != head; r2 = r2->next)
 	{
 		if (r2->plane)
 		{
+			drawspandata_t ds = {};
 			next = r2->prev;
-			R_DrawSinglePlane(r2->plane);
+			boolean parallel = cv_parallelsoftware.value && cv_paralleldrawmasked.value;
+#ifdef HAVE_THREADS
+			srb2::ThreadPool::Sema tp_sema;
+			if (parallel)
+				srb2::g_main_threadpool->begin_sema();
+#endif
+			R_DrawSinglePlane(&ds, r2->plane, parallel);
+#ifdef HAVE_THREADS
+			if (parallel)
+			{
+				tp_sema = srb2::g_main_threadpool->end_sema();
+				srb2::g_main_threadpool->notify_sema(tp_sema);
+				srb2::g_main_threadpool->wait_sema(tp_sema);
+			}
+#endif
 			R_DoneWithNode(r2);
 			r2 = next;
 		}
 		else if (r2->seg && r2->seg->maskedtexturecol != NULL)
 		{
 			next = r2->prev;
-			R_RenderMaskedSegRange(r2->seg, r2->seg->x1, r2->seg->x2);
+			R_RenderMaskedSegRange( r2->seg, r2->seg->x1, r2->seg->x2);
 			r2->seg->maskedtexturecol = NULL;
 			R_DoneWithNode(r2);
 			r2 = next;
@@ -2883,108 +3097,52 @@ void R_DrawMasked(void)
 			next = r2->prev;
 
 			// Tails 08-18-2002
-			if (r2->sprite->precip == true)
+			if (r2->sprite->precip)
+			{
 				R_DrawPrecipitationSprite(r2->sprite);
+			}
 			else
+			{
 				R_DrawSprite(r2->sprite);
+			}
 
 			R_DoneWithNode(r2);
 			r2 = next;
 		}
 	}
-	R_ClearDrawNodes();
 }
 
-// ==========================================================================
-//
-//                              SKINS CODE
-//
-// ==========================================================================
-
-INT32 numskins = 0;
-INT32 numallskins = 0;
-INT32 numlocalskins = 0;
-skin_t skins[MAXSKINS];
-UINT8 skinstats[9][9][MAXSKINS];
-UINT8 skinstatscount[9][9] = {
-	{0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 1, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0}
-};
-UINT8 skinsorted[MAXSKINS];
-skin_t localskins[MAXLOCALSKINS];
-skin_t allskins[MAXSKINS+MAXLOCALSKINS];
-
-// FIXTHIS: don't work because it must be inistilised before the config load
-//#define SKINVALUES
-#ifdef SKINVALUES
-CV_PossibleValue_t skin_cons_t[MAXSKINS+1];
-CV_PossibleValue_t localskin_cons_t[MAXLOCALSKINS+1];
-#endif
-
-static void Sk_SetDefaultValue(skin_t *skin, boolean local)
+void R_DrawMasked(maskcount_t* masks, INT32 nummasks)
 {
 	INT32 i;
-	//
-	// set default skin values
-	//
-	memset(skin, 0, sizeof (skin_t));
-	snprintf(skin->name,
-		sizeof skin->name, "skin %u", (UINT32)(skin-( (local) ? localskins : skins )));
-	skin->name[sizeof skin->name - 1] = '\0';
-	skin->wadnum = INT16_MAX;
-	strcpy(skin->sprite, "");
+	drawnode_t *heads;	/**< Drawnode lists; as many as number of views/portals. */
 
-	skin->flags = 0;
+	heads = static_cast<drawnode_t*>(calloc(nummasks, sizeof(drawnode_t)));
 
-	strcpy(skin->realname, "Someone");
-	strcpy(skin->hudname, "???");
-	strncpy(skin->facerank, "PLAYRANK", 9);
-	strncpy(skin->facewant, "PLAYWANT", 9);
-	strncpy(skin->facemmap, "PLAYMMAP", 9);
-
-	skin->starttranscolor = 160;
-	skin->prefcolor = SKINCOLOR_GREEN;
-
-	// SRB2kart
-	skin->kartspeed = 5;
-	skin->kartweight = 5;
-	//
-
-	skin->highresscale = FRACUNIT>>1;
-
-	for (i = 0; i < sfx_skinsoundslot0; i++)
-		if (S_sfx[i].skinsound != -1)
-			skin->soundsid[S_sfx[i].skinsound] = i;
-}
-
-//
-// Initialize the basic skins
-//
-void R_InitSkins(void)
-{
-	skin_t *skin;
-#ifdef SKINVALUES
-	INT32 i;
-
-	for (i = 0; i <= MAXSKINS; i++)
+	for (i = 0; i < nummasks; i++)
 	{
-		skin_cons_t[i].value = 0;
-		skin_cons_t[i].strvalue = NULL;
-	}
-	for (i = 0; i <= MAXLOCALSKINS; i++)
-	{
-		localskin_cons_t[i].value = 0;
-		localskin_cons_t[i].strvalue = NULL;
-	}
-#endif
+		heads[i].next = heads[i].prev = &heads[i];
 
+		viewx = masks[i].viewx;
+		viewy = masks[i].viewy;
+		viewz = masks[i].viewz;
+		viewsector = masks[i].viewsector;
+
+		R_CreateDrawNodes(&masks[i], &heads[i], false);
+	}
+
+	for (; nummasks > 0; nummasks--)
+	{
+		viewx = masks[nummasks - 1].viewx;
+		viewy = masks[nummasks - 1].viewy;
+		viewz = masks[nummasks - 1].viewz;
+		viewsector = masks[nummasks - 1].viewsector;
+
+		R_DrawMaskedList(&heads[nummasks - 1]);
+		R_ClearDrawNodes(&heads[nummasks - 1]);
+	}
+
+<<<<<<< HEAD:src/r_things.c
 	// skin[0] = Sonic skin
 	skin = &skins[0];
 	numskins = 1;
@@ -3666,4 +3824,7 @@ next_token:
 	//sortSkinGrid();
 
 	return;
+=======
+	free(heads);
+>>>>>>> Saturn-Next:src/r_things.cpp
 }
diff --git a/src/r_things.h b/src/r_things.h
index 3e2414da1..5eb383e93 100644
--- a/src/r_things.h
+++ b/src/r_things.h
@@ -1,4 +1,4 @@
-// SONIC ROBO BLAST 2
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
 // Copyright (C) 1993-1996 by id Software, Inc.
 // Copyright (C) 1998-2000 by DooM Legacy Team.
@@ -14,13 +14,12 @@
 #ifndef __R_THINGS__
 #define __R_THINGS__
 
-#include "sounds.h"
-#include "r_plane.h"
-#include "r_patch.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-// "Left" and "Right" character symbols for additional rotation functionality
-#define ROT_L ('L' - '0')
-#define ROT_R ('R' - '0')
+#include "r_plane.h"
+#include "r_portal.h"
 
 // number of sprite lumps for spritewidth,offset,topoffset lookup tables
 // Fab: this is a hack : should allocate the lookup tables per sprite
@@ -40,12 +39,17 @@
 // as an non-fixed-point integer.
 // It is very rough, tho it is used only for optimizing out unnecessary
 // interpolation, so it is kinda ok on big distances.
+
+#ifdef __cplusplus
+#define R_QuickCamDist(x, y) std::max(std::abs(((x)>>FRACBITS) - (viewx>>FRACBITS)), std::abs(((y)>>FRACBITS) - (viewy>>FRACBITS)))
+#else
 #define R_QuickCamDist(x, y) max(abs(((x)>>FRACBITS) - (viewx>>FRACBITS)), abs(((y)>>FRACBITS) - (viewy>>FRACBITS)))
+#endif
 
 // Constant arrays used for psprite clipping
 //  and initializing clipping.
-extern INT16 negonearray[MAXVIDWIDTH];
-extern INT16 screenheightarray[MAXVIDWIDTH];
+extern INT16 *negonearray;
+extern INT16 *screenheightarray;
 
 // vars for R_DrawMaskedColumn
 extern INT16 *mfloorclip;
@@ -55,64 +59,44 @@ extern fixed_t sprtopscreen;
 extern fixed_t sprbotscreen;
 extern fixed_t windowtop;
 extern fixed_t windowbottom;
+extern INT32 lengthcol;
+
+INT32 R_ThingLightLevel(mobj_t *thing);
+fixed_t R_GetSpriteDirectionalLighting(angle_t angle);
 
 fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope);
 
-void R_DrawMaskedColumn(column_t *column);
-void R_SortVisSprites(void);
-
-//faB: find sprites in wadfile, replace existing, add new ones
-//     (only sprites from namelist are added or replaced)
-void R_AddSpriteDefs(UINT16 wadnum);
-
 //SoM: 6/5/2000: Light sprites correctly!
+boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16 wadnum, UINT16 startlump, UINT16 endlump);
 void R_AddSprites(sector_t *sec, INT32 lightlevel);
 void R_AddPrecipitationSprites(void);
 void R_InitSprites(void);
 void R_ClearSprites(void);
-void R_DrawMasked(void);
-
-// -----------
-// SKINS STUFF
-// -----------
-#define SKINNAMESIZE 16
-// should be all lowercase!! S_SKIN processing does a strlwr
-#define DEFAULTSKIN "sonic"
-#define DEFAULTSKIN2 "tails" // secondary player
-#define DEFAULTSKIN3 "knuckles" // third player
-#define DEFAULTSKIN4 "eggman" // fourth player
 
+/** Used to count the amount of masked elements
+ * per portal to later group them in separate
+ * drawnode lists.
+ */
 typedef struct
 {
-	char name[SKINNAMESIZE+1]; // INT16 descriptive name of the skin
-	spritedef_t spritedef;
-	spriteinfo_t sprinfo;
-	UINT16 wadnum;
-	char sprite[4]; // Sprite name, if seperated from S_SKIN.
-	skinflags_t flags;
+	size_t drawsegs[2];
+	size_t vissprites[2];
+	fixed_t viewx, viewy, viewz;			/**< View z stored at the time of the BSP traversal for the view/portal. Masked sorting/drawing needs it. */
+	sector_t* viewsector;
+} maskcount_t;
 
-	char realname[SKINNAMESIZE+1]; // Display name for level completion.
-	char hudname[SKINNAMESIZE+1]; // HUD name to display (officially exactly 5 characters long)
-	char facerank[9], facewant[9], facemmap[9]; // Arbitrarily named patch lumps
+void R_DrawMasked(maskcount_t* masks, INT32 nummasks);
 
-	// SRB2kart
-	UINT8 kartspeed;
-	UINT8 kartweight;
-	//
+transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap);
 
-	// Definable color translation table
-	UINT8 starttranscolor;
-	UINT8 prefcolor;
-	fixed_t highresscale; // scale of highres, default is 0.5
+boolean R_ThingVisible(mobj_t *thing);
+boolean R_ThingWithinDist(mobj_t *thing, INT32 limit_dist);
+boolean R_CheckInterpDist(mobj_t *thing);
+fixed_t R_DoPlayerFade(mobj_t *thing);
 
-	// specific sounds per skin
-	sfxenum_t soundsid[NUMSKINSOUNDS]; // sound # in S_sfx table
-	
-	boolean localskin;
-	INT32 localnum;
-} skin_t;
-
-extern CV_PossibleValue_t Forceskin_cons_t[];
+boolean R_ThingIsFullBright(mobj_t *thing);
+boolean R_ThingIsSemiBright(mobj_t *thing);
+boolean R_ThingIsFullDark(mobj_t *thing);
 
 // -----------
 // NOT SKINS STUFF !
@@ -124,6 +108,9 @@ typedef enum
 	SC_BOTTOM = 2,
 	SC_VFLIP = 3,
 	SC_NOTVISIBLE = 4,
+	SC_FULLBRIGHT = 8,
+	SC_SEMIBRIGHT = 16,
+	SC_FULLDARK   = 32,
 	SC_CUTMASK    = SC_TOP|SC_BOTTOM|SC_NOTVISIBLE,
 	SC_FLAGMASK   = ~SC_CUTMASK
 } spritecut_e;
@@ -179,7 +166,7 @@ typedef struct vissprite_s
 	fixed_t spritexscale, spriteyscale;
 	fixed_t spritexoffset, spriteyoffset;
 
-	INT16 clipbot[MAXVIDWIDTH], cliptop[MAXVIDWIDTH];
+	INT16 *clipbot, *cliptop;
 
 	boolean precip;
 	boolean vflip; // Flip vertically
@@ -189,10 +176,14 @@ typedef struct vissprite_s
 
 extern UINT32 visspritecount, numvisiblesprites;
 
-void R_ClipSprites(void);
+void R_ClipSprites(drawseg_t* dsstart, portal_t* portal);
+
+void R_AllocVisSpriteMemory(void);
 
 UINT8 *R_GetSpriteTranslation(vissprite_t *vis);
 
+void R_InitDrawNodes(void);
+
 // ----------
 // DRAW NODES
 // ----------
@@ -211,69 +202,8 @@ typedef struct drawnode_s
 	struct drawnode_s *prev;
 } drawnode_t;
 
-extern INT32 numskins;
-extern INT32 numlocalskins;
-extern INT32 numallskins;
-extern skin_t skins[MAXSKINS];
-extern UINT8 skinstats[9][9][MAXSKINS];
-extern UINT8 skinstatscount[9][9];
-extern UINT8 skinsorted[MAXSKINS];
-
-void sortSkinGrid(void);
-extern skin_t localskins[MAXLOCALSKINS];
-extern skin_t allskins[MAXSKINS+MAXLOCALSKINS];
-
-boolean SetPlayerSkin(INT32 playernum,const char *skinname);
-void SetPlayerSkinByNum(INT32 playernum,INT32 skinnum); // Tails 03-16-2002
-void SetLocalPlayerSkin(INT32 playernum,const char *skinname, consvar_t *cvar);
-INT32 R_SkinAvailable(const char *name);
-INT32 R_AnySkinAvailable(const char *name);
-INT32 R_LocalSkinAvailable(const char *name, boolean local);
-void R_AddSkins(UINT16 wadnum, boolean local);
-
-void R_InitDrawNodes(void);
-
-char *GetPlayerFacePic(INT32 skinnum);
-
-// Functions to go from sprite character ID to frame number
-// for 2.1 compatibility this still uses the old 'A' + frame code
-// The use of symbols tends to be painful for wad editors though
-// So the future version of this tries to avoid using symbols
-// as much as possible while also defining all 64 slots in a sane manner
-// 2.1:    [[ ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~   ]]
-// Future: [[ ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz!@ ]]
-FUNCMATH FUNCINLINE static ATTRINLINE char R_Frame2Char(UINT8 frame)
-{
-#if 1 // 2.1 compat
-	return 'A' + frame;
-#else
-	if (frame < 26) return 'A' + frame;
-	if (frame < 36) return '0' + (frame - 26);
-	if (frame < 62) return 'a' + (frame - 36);
-	if (frame == 62) return '!';
-	if (frame == 63) return '@';
-	return '\xFF';
+#ifdef __cplusplus
+} // extern "C"
 #endif
-}
-
-FUNCMATH FUNCINLINE static ATTRINLINE UINT8 R_Char2Frame(char cn)
-{
-#if 1 // 2.1 compat
-	if (cn == '+') return '\\' - 'A'; // PK3 can't use backslash, so use + instead
-	return cn - 'A';
-#else
-	if (cn >= 'A' && cn <= 'Z') return cn - 'A';
-	if (cn >= '0' && cn <= '9') return (cn - '0') + 26;
-	if (cn >= 'a' && cn <= 'z') return (cn - 'a') + 36;
-	if (cn == '!') return 62;
-	if (cn == '@') return 63;
-	return 255;
-#endif
-}
-
-FUNCMATH FUNCINLINE static ATTRINLINE boolean R_ValidSpriteAngle(UINT8 rotation)
-{
-	return ((rotation <= 8) || (rotation == ROT_L) || (rotation == ROT_R));
-}
 
 #endif //__R_THINGS__
diff --git a/src/s_sound.c b/src/s_sound.c
index b6b7952da..e556b00ab 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -11,6 +11,7 @@
 /// \file  s_sound.c
 /// \brief System-independent sound and music routines
 
+#include "d_netcmd.h"
 #include "doomdef.h"
 #include "doomstat.h"
 #include "command.h"
@@ -31,14 +32,9 @@
 #include "m_menu.h" // bird music stuff
 
 #include "lua_hook.h" // MusicChange hook
+#include "lua_hud.h" // LUA_HudEnabled(hud_musiccredit)
 
-#ifdef HW3SOUND
-// 3D Sound Interface
-#include "hardware/hw3sound.h"
-#else
-static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, INT32 *pitch, sfxinfo_t *sfxinfo);
-#endif
-
+static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, sfxinfo_t *sfxinfo);
 static void SetChannelsNum(void);
 static void Command_Tunes_f(void);
 static void Command_RestartAudio_f(void);
@@ -63,10 +59,12 @@ static void AmigaType_OnChange(void);
 #endif
 #endif
 
+#if defined(HAVE_SDL) && SOUND==SOUND_SDL
 consvar_t cv_samplerate = {"samplerate", "44100", 0, CV_Unsigned, NULL, 22050, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking?
+#endif
 
-static CV_PossibleValue_t audbuffersize_cons_t[] = {{256, "256"}, {512, "512"}, {1024, "1024"}, {2048, "2048"}, {4096, "4096"}, {0, NULL}};
-consvar_t cv_audbuffersize = {"buffersize", "2048", CV_SAVE, audbuffersize_cons_t, BufferSize_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t audbuffersize_cons_t[] = {{128, "128"}, {256, "256"}, {512, "512"}, {1024, "1024"}, {2048, "2048"}, {4096, "4096"}, {0, NULL}};
+consvar_t cv_audbuffersize = {"audiobuffersize", "2048", CV_SAVE, audbuffersize_cons_t, BufferSize_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 // stereo reverse
 consvar_t stereoreverse = {"stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -83,9 +81,12 @@ consvar_t cv_midimusicvolume = {"midimusicvolume", "18", CV_SAVE, soundvolume_co
 #endif
 
 // number of channels available
-consvar_t cv_numChannels = {"snd_channels", "64", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t numChannels_cons_t[] = {{0, "MIN"}, {255, "MAX"}, {0, NULL}};
+consvar_t cv_numChannels = {"snd_channels", "64", CV_SAVE|CV_CALL, numChannels_cons_t, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t samesoundlimit_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}};
+consvar_t cv_samesoundlimit = {"samesoundlimit", "0", CV_SAVE, samesoundlimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 //consvar_t cv_resetmusic = {"resetmusic", "No", CV_SAVE|CV_NOSHOWHELP, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 // Sound system toggles, saved into the config
@@ -108,8 +109,7 @@ static CV_PossibleValue_t music_resync_threshold_cons_t[] = {
 	{0}
 };
 consvar_t cv_music_resync_threshold = {"music_resync_threshold", "0", CV_SAVE|CV_CALL, music_resync_threshold_cons_t, I_UpdateSongLagThreshold, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_music_resync_powerups_only = {"music_resync_powerups_only", "No", CV_SAVE|CV_CALL, CV_YesNo, I_UpdateSongLagConditions, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_music_resync_powerups_only = {"music_resync_powerups_only", "No", CV_SAVE|CV_CALL, CV_YesNo, I_UpdateSongLagThreshold, 0, NULL, NULL, 0, 0, NULL};
 
 consvar_t cv_invincmusicfade = {"invincmusicfade", "300", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_growmusicfade = {"growmusicfade", "500", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -120,6 +120,16 @@ consvar_t cv_resume = {"resume", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0
 consvar_t cv_fading = {"fading", "Off", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_birdmusic = {"birdmusicstuff", "No", CV_SAVE|CV_CALL, CV_YesNo, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_keepmusic = {"keepmusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_skipintromusic = {"skipintromusic", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+//consvar_t cv_ignoremusicchanges = {"ignoremusicchanges", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+boolean keepmapmusic = false; // keep the current music on map restart
+boolean skipintromus = false; // skip the intro fanfare
+static boolean resumekeepmusic = false;
+static music_t keepmusic;
+static void S_SetKeepMusResume(void);
+
 #ifdef HAVE_OPENMPT
 openmpt_module *openmpt_mhandle = NULL;
 
@@ -165,10 +175,6 @@ consvar_t cv_amigatype = {"amigatype", "0", CV_SAVE|CV_CALL|CV_NOINIT, amigatype
 #define S_PITCH_PERTURB 1
 #define S_STEREO_SWING (96*0x10000)
 
-#ifdef SURROUND
-#define SURROUND_SEP -128
-#endif
-
 // percent attenuation from front to back
 #define S_IFRACVOL 30
 
@@ -274,8 +280,9 @@ void S_RegisterSoundStuff(void)
 
 	CV_RegisterVar(&stereoreverse);
 	CV_RegisterVar(&precachesound);
-	CV_RegisterVar(&surround);
+#if defined(HAVE_SDL) && SOUND==SOUND_SDL
 	CV_RegisterVar(&cv_samplerate);
+#endif
 	//CV_RegisterVar(&cv_resetmusic);
 	CV_RegisterVar(&cv_gamesounds);
 	CV_RegisterVar(&cv_gamedigimusic);
@@ -283,14 +290,16 @@ void S_RegisterSoundStuff(void)
 	CV_RegisterVar(&cv_gamemidimusic);
 #endif
 
-	//bird music stuff
+	CV_RegisterVar(&cv_samesoundlimit);
+
+	// bird music stuff
 	CV_RegisterVar(&cv_playmusicifunfocused);
 	CV_RegisterVar(&cv_playsoundifunfocused);
 	CV_RegisterVar(&cv_pausemusic);
 
 	CV_RegisterVar(&cv_music_resync_threshold);
 	CV_RegisterVar(&cv_music_resync_powerups_only);
-	
+
 	CV_RegisterVar(&cv_invincmusicfade);
 	CV_RegisterVar(&cv_growmusicfade);
 
@@ -302,6 +311,11 @@ void S_RegisterSoundStuff(void)
 	CV_RegisterVar(&cv_resume);
 	CV_RegisterVar(&cv_fading);
 	CV_RegisterVar(&cv_birdmusic);
+	// bird music stuff end
+
+	CV_RegisterVar(&cv_keepmusic);
+	CV_RegisterVar(&cv_skipintromusic);
+	//CV_RegisterVar(&cv_ignoremusicchanges);
 
 	COM_AddCommand("tunes", Command_Tunes_f);
 	COM_AddCommand("restartaudio", Command_RestartAudio_f);
@@ -311,8 +325,6 @@ void S_RegisterSoundStuff(void)
 
 static void SetChannelsNum(void)
 {
-	INT32 i;
-
 	// Allocating the internal channels for mixing
 	// (the maximum number of sounds rendered
 	// simultaneously) within zone memory.
@@ -322,24 +334,9 @@ static void SetChannelsNum(void)
 	Z_Free(channels);
 	channels = NULL;
 
-
-	if (cv_numChannels.value == 999999999) //Alam_GBC: OH MY ROD!(ROD rimmiced with GOD!)
-		CV_StealthSet(&cv_numChannels,cv_numChannels.defaultvalue);
-
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		HW3S_SetSourcesNum();
-		return;
-	}
-#endif
 	if (cv_numChannels.value)
-		channels = (channel_t *)Z_Malloc(cv_numChannels.value * sizeof (channel_t), PU_STATIC, NULL);
-	numofchannels = cv_numChannels.value;
-
-	// Free all channels for use
-	for (i = 0; i < numofchannels; i++)
-		channels[i].sfxinfo = 0;
+		channels = (channel_t *)Z_Calloc(cv_numChannels.value * sizeof (channel_t), PU_STATIC, NULL);
+	numofchannels = (channels ? cv_numChannels.value : 0);
 }
 
 // Retrieve the lump number of sfx
@@ -355,7 +352,7 @@ lumpnum_t S_GetSfxLumpNum(sfxinfo_t *sfx)
 	if (sfxlump != LUMPERROR)
 		return sfxlump;
 
-	strlcpy(namebuf, sfx->name, sizeof namebuf);
+	strlcpy(namebuf, sfx->name, sizeof(namebuf));
 
 	sfxlump = W_CheckNumForName(namebuf);
 	if (sfxlump != LUMPERROR)
@@ -386,14 +383,6 @@ void S_StopSounds(void)
 {
 	INT32 cnum;
 
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		HW3S_StopSounds();
-		return;
-	}
-#endif
-
 	// kill all playing sounds at start of level
 	for (cnum = 0; cnum < numofchannels; cnum++)
 		if (channels[cnum].sfxinfo)
@@ -408,13 +397,7 @@ void S_StopSoundByID(void *origin, sfxenum_t sfx_id)
 	// be stopped by new sounds.
 	if (!origin)
 		return;
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		HW3S_StopSoundByID(origin, sfx_id);
-		return;
-	}
-#endif
+
 	for (cnum = 0; cnum < numofchannels; cnum++)
 	{
 		if (channels[cnum].sfxinfo == &S_sfx[sfx_id] && channels[cnum].origin == origin)
@@ -428,13 +411,6 @@ void S_StopSoundByNum(sfxenum_t sfxnum)
 {
 	INT32 cnum;
 
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		HW3S_StopSoundByNum(sfxnum);
-		return;
-	}
-#endif
 	for (cnum = 0; cnum < numofchannels; cnum++)
 	{
 		if (channels[cnum].sfxinfo == &S_sfx[sfxnum])
@@ -455,20 +431,36 @@ static INT32 S_ScaleVolumeWithSplitscreen(INT32 volume)
 
 	root = FixedSqrt((splitscreen + 1) * (FRACUNIT/3));
 
-	return FixedDiv(
-		volume * FRACUNIT,
-		root
-	) / FRACUNIT;
+	return FixedDiv(volume * FRACUNIT, root) / FRACUNIT;
+}
+
+static boolean S_CheckSameSoundLimit(sfxenum_t sfx_id)
+{
+	INT32 cnum, scount = 0;
+
+	if (!cv_samesoundlimit.value)
+		return true;
+
+	for (cnum = 0; cnum < numofchannels; cnum++)
+		if ((size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)sfx_id)
+			scount++;
+
+	//CONS_Printf("same sound count: %d for sfx: %d\n", scount, sfx_id);
+
+	if (scount >= cv_samesoundlimit.value)
+		return false;
+
+	return true;
 }
 
 void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 {
 	const mobj_t *origin = (const mobj_t *)origin_p;
 	const boolean reverse = (stereoreverse.value ^ encoremode);
-	const INT32 initial_volume = (origin ? S_ScaleVolumeWithSplitscreen(volume) : volume);
+	INT32 initial_volume;
 
 	sfxinfo_t *sfx;
-	INT32 sep, pitch, priority, cnum;
+	INT32 sep, cnum;
 	boolean anyListeners = false;
 	boolean itsUs = false;
 	INT32 i;
@@ -483,18 +475,19 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 	if (sfx_id == sfx_None)
 		return;
 
+	// reached same sound limit?
+	if (!S_CheckSameSoundLimit(sfx_id))
+		return;
+
+	memset(listener, 0, sizeof(listener));
+
 	for (i = 0; i <= splitscreen; i++)
 	{
 		player_t *player = &players[displayplayers[i]];
 
-		memset(&listener[i], 0, sizeof (listener[i]));
 		listenmobj[i] = NULL;
 
-		if (i == 0 && democam.soundmobj)
-		{
-			listenmobj[i] = democam.soundmobj;
-		}
-		else if (player->awayviewtics)
+		if (player->awayviewtics)
 		{
 			listenmobj[i] = player->awayviewmobj;
 		}
@@ -503,23 +496,10 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 			listenmobj[i] = player->mo;
 		}
 
-		if (origin && origin == listenmobj[i])
+		if (origin && origin == listenmobj[i] && !camera[i].freecam)
 		{
 			itsUs = true;
 		}
-	}
-
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		HW3S_StartSound(origin, sfx_id);
-		return;
-	};
-#endif
-
-	for (i = 0; i <= splitscreen; i++)
-	{
-		player_t *player = &players[displayplayers[i]];
 
 		if (camera[i].chase && !player->awayviewtics)
 		{
@@ -554,13 +534,13 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 	if (sfx->skinsound != -1 && origin && origin->skin)
 	{
 		// redirect player sound to the sound in the skin table
-		sfx_id = ((skin_t *)( (origin->localskin) ? origin->localskin : origin->skin ))->soundsid[sfx->skinsound];
+		sfx_id = K_GetMobjSkin(origin)->soundsid[sfx->skinsound];
 		sfx = &S_sfx[sfx_id];
 	}
 
+	initial_volume = (origin ? S_ScaleVolumeWithSplitscreen(volume) : volume);
+
 	// Initialize sound parameters
-	pitch = NORM_PITCH;
-	priority = NORM_PRIORITY;
 	sep = NORM_SEP;
 
 	i = 0; // sensible default
@@ -598,7 +578,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 
 			if (listenmobj[i])
 			{
-				audible = S_AdjustSoundParams(listenmobj[i], origin, &volume, &sep, &pitch, sfx);
+				audible = S_AdjustSoundParams(listenmobj[i], origin, &volume, &sep, sfx);
 			}
 
 			if (!audible)
@@ -618,18 +598,8 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 			sfx->data = I_GetSfx(sfx);
 		}
 
-		// increase the usefulness
-		if (sfx->usefulness++ < 0)
-		{
-			sfx->usefulness = -1;
-		}
-
 		// Avoid channel reverse if surround
-		if (reverse
-#ifdef SURROUND
-			&& sep != SURROUND_SEP
-#endif
-			)
+		if (reverse)
 		{
 			sep = (~sep) & 255;
 		}
@@ -646,7 +616,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
 		channels[cnum].sfxinfo = sfx;
 		channels[cnum].origin = origin;
 		channels[cnum].volume = initial_volume;
-		channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
+		channels[cnum].handle = I_StartSound(sfx_id, volume, sep, cnum);
 	}
 }
 
@@ -655,16 +625,10 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id)
 	if (S_SoundDisabled())
 		return;
 
-	if (mariomode) // Sounds change in Mario mode!
+	if (UNLIKELY(mariomode)) // Sounds change in Mario mode!
 	{
 		switch (sfx_id)
 		{
-//			case sfx_altow1:
-//			case sfx_altow2:
-//			case sfx_altow3:
-//			case sfx_altow4:
-//				sfx_id = sfx_mario8;
-//				break;
 			case sfx_thok:
 				sfx_id = sfx_mario7;
 				break;
@@ -680,20 +644,12 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id)
 			case sfx_itemup:
 				sfx_id = sfx_mario4;
 				break;
-//			case sfx_tink:
-//				sfx_id = sfx_mario1;
-//				break;
-//			case sfx_cgot:
-//				sfx_id = sfx_mario9;
-//				break;
-//			case sfx_lose:
-//				sfx_id = sfx_mario2;
-//				break;
 			default:
 				break;
 		}
 	}
-	if (maptol & TOL_XMAS) // Some sounds change for xmas
+
+	if (UNLIKELY(maptol & TOL_XMAS)) // Some sounds change for xmas
 	{
 		switch (sfx_id)
 		{
@@ -708,12 +664,7 @@ void S_StartSound(const void *origin, sfxenum_t sfx_id)
 	}
 
 	// the volume is handled 8 bits
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-		HW3S_StartSound(origin, sfx_id);
-	else
-#endif
-		S_StartSoundAtVolume(origin, sfx_id, 255);
+	S_StartSoundAtVolume(origin, sfx_id, 255);
 }
 
 void S_StopSound(void *origin)
@@ -725,13 +676,6 @@ void S_StopSound(void *origin)
 	if (!origin)
 		return;
 
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		HW3S_StopSound(origin);
-		return;
-	}
-#endif
 	for (cnum = 0; cnum < numofchannels; cnum++)
 	{
 		if (channels[cnum].sfxinfo && channels[cnum].origin == origin)
@@ -752,7 +696,7 @@ static INT32 actualmidimusicvolume;
 
 void S_UpdateSounds(void)
 {
-	INT32 cnum, volume, sep, pitch;
+	INT32 cnum, volume, sep;
 	boolean audible = false;
 	channel_t *c;
 	INT32 i;
@@ -762,14 +706,16 @@ void S_UpdateSounds(void)
 
 	// Update sound/music volumes, if changed manually at console
 	if (actualsfxvolume != cv_soundvolume.value)
-		S_SetSfxVolume (cv_soundvolume.value);
+		S_SetSfxVolume(cv_soundvolume.value);
 	if (actualdigmusicvolume != cv_digmusicvolume.value)
-		S_SetDigMusicVolume (cv_digmusicvolume.value);
+		S_SetDigMusicVolume(cv_digmusicvolume.value);
 #ifndef NO_MIDI
 	if (actualmidimusicvolume != cv_midimusicvolume.value)
-		S_SetMIDIMusicVolume (cv_midimusicvolume.value);
+		S_SetMIDIMusicVolume(cv_midimusicvolume.value);
 #endif
 
+	memset(listener, 0, sizeof(listener));
+
 	// We're done now, if we're not in a level.
 	if (gamestate != GS_LEVEL)
 	{
@@ -778,7 +724,6 @@ void S_UpdateSounds(void)
 		I_UpdateMumble(NULL, listener[0]);
 #endif
 
-		// Stop cutting FMOD out. WE'RE sick of it.
 		I_UpdateSound();
 		return;
 	}
@@ -790,15 +735,8 @@ void S_UpdateSounds(void)
 	{
 		player_t *player = &players[displayplayers[i]];
 
-		memset(&listener[i], 0, sizeof (listener[i]));
 		listenmobj[i] = NULL;
 
-		if (i == 0 && democam.soundmobj)
-		{
-			listenmobj[i] = democam.soundmobj;
-			continue;
-		}
-
 		if (player->awayviewtics)
 		{
 			listenmobj[i] = player->awayviewmobj;
@@ -807,24 +745,6 @@ void S_UpdateSounds(void)
 		{
 			listenmobj[i] = player->mo;
 		}
-	}
-
-#ifndef NOMUMBLE
-	I_UpdateMumble(players[consoleplayer].mo, listener[0]);
-#endif
-
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		HW3S_UpdateSources();
-		I_UpdateSound();
-		return;
-	}
-#endif
-
-	for (i = 0; i <= splitscreen; i++)
-	{
-		player_t *player = &players[displayplayers[i]];
 
 		if (camera[i].chase && !player->awayviewtics)
 		{
@@ -842,6 +762,10 @@ void S_UpdateSounds(void)
 		}
 	}
 
+#ifndef NOMUMBLE
+	I_UpdateMumble(players[consoleplayer].mo, listener[0]);
+#endif
+
 	for (cnum = 0; cnum < numofchannels; cnum++)
 	{
 		c = &channels[cnum];
@@ -852,7 +776,6 @@ void S_UpdateSounds(void)
 			{
 				// initialize parameters
 				volume = c->volume; // 8 bits internal volume precision
-				pitch = NORM_PITCH;
 				sep = NORM_SEP;
 
 				// check non-local sounds for distance clipping
@@ -863,6 +786,9 @@ void S_UpdateSounds(void)
 
 					for (i = splitscreen; i >= 0; i--)
 					{
+						if (camera[i].freecam)
+							continue;
+
 						if (c->origin != listenmobj[i])
 							continue;
 
@@ -905,13 +831,13 @@ void S_UpdateSounds(void)
 						{
 							audible = S_AdjustSoundParams(
 								listenmobj[i], c->origin,
-								&volume, &sep, &pitch,
+								&volume, &sep,
 								c->sfxinfo
 							);
 						}
 
 						if (audible)
-							I_UpdateSoundParams(c->handle, volume, sep, pitch);
+							I_UpdateSoundParams(c->handle, volume, sep);
 						else
 							S_StopChannel(cnum);
 					}
@@ -936,12 +862,8 @@ void S_SetSfxVolume(INT32 volume)
 	CV_SetValue(&cv_soundvolume, volume&0x1F);
 	actualsfxvolume = cv_soundvolume.value; // check for change of var
 
-#ifdef HW3SOUND
-	hws_mode == HWS_DEFAULT_MODE ? I_SetSfxVolume(volume&0x1F) : HW3S_SetSfxVolume(volume&0x1F);
-#else
 	// now hardware volume
 	I_SetSfxVolume(volume&0x1F);
-#endif
 }
 
 void S_ClearSfx(void)
@@ -961,8 +883,17 @@ static void S_StopChannel(INT32 cnum)
 		if (I_SoundIsPlaying(c->handle))
 			I_StopSound(c->handle);
 
+<<<<<<< HEAD
 		// degrade usefulness of sound data
 		c->sfxinfo->usefulness--;
+=======
+		// check to see
+		//  if other channels are playing the sound
+		for (i = 0; i < numofchannels; i++)
+			if (cnum != i && c->sfxinfo == channels[i].sfxinfo)
+				break;
+
+>>>>>>> Saturn-Next
 		c->sfxinfo = 0;
 	}
 
@@ -1003,8 +934,7 @@ fixed_t S_CalculateSoundDistance(fixed_t sx1, fixed_t sy1, fixed_t sz1, fixed_t
 // If the sound is not audible, returns a 0.
 // Otherwise, modifies parameters and returns 1.
 //
-boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, INT32 *pitch,
-	sfxinfo_t *sfxinfo)
+static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 *vol, INT32 *sep, sfxinfo_t *sfxinfo)
 {
 	const boolean reverse = (stereoreverse.value ^ encoremode);
 
@@ -1013,8 +943,6 @@ boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32
 	listener_t listensource;
 	INT32 i;
 
-	(void)pitch;
-
 	if (!listener)
 		return false;
 
@@ -1039,22 +967,26 @@ boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32
 
 	if (sfxinfo->pitch & SF_OUTSIDESOUND) // Rain special case
 	{
-		fixed_t x, y, yl, yh, xl, xh, newdist;
+		INT64 x, y, yl, yh, xl, xh;
+		fixed_t newdist;
 
-		if (R_PointInSubsector(listensource.x, listensource.y)->sector->ceilingpic == skyflatnum)
+		if (R_PointInSubsectorFast(listensource.x, listensource.y)->sector->ceilingpic == skyflatnum)
 			approx_dist = 0;
 		else
 		{
 			// Essentially check in a 1024 unit radius of the player for an outdoor area.
-			yl = listensource.y - 1024*FRACUNIT;
-			yh = listensource.y + 1024*FRACUNIT;
-			xl = listensource.x - 1024*FRACUNIT;
-			xh = listensource.x + 1024*FRACUNIT;
-			approx_dist = 1024*FRACUNIT;
-			for (y = yl; y <= yh; y += FRACUNIT*64)
-				for (x = xl; x <= xh; x += FRACUNIT*64)
+#define RADIUSSTEP (64*FRACUNIT)
+#define SEARCHRADIUS (16*RADIUSSTEP)
+			yl = listensource.y - SEARCHRADIUS;
+			yh = listensource.y + SEARCHRADIUS;
+			xl = listensource.x - SEARCHRADIUS;
+			xh = listensource.x + SEARCHRADIUS;
+			approx_dist = SEARCHRADIUS;
+#undef SEARCHRADIUS
+			for (y = yl; y <= yh; y += RADIUSSTEP)
+				for (x = xl; x <= xh; x += RADIUSSTEP)
 				{
-					if (R_PointInSubsector(x, y)->sector->ceilingpic == skyflatnum)
+					if (R_PointInSubsectorFast(x, y)->sector->ceilingpic == skyflatnum)
 					{
 						// Found the outdoors!
 						newdist = S_CalculateSoundDistance(listensource.x, listensource.y, 0, x, y, 0);
@@ -1064,6 +996,7 @@ boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32
 						}
 					}
 				}
+#undef RADIUSSTEP
 		}
 	}
 	else
@@ -1074,14 +1007,14 @@ boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32
 
 	// Ring loss, deaths, etc, should all be heard louder.
 	if (sfxinfo->pitch & SF_X8AWAYSOUND)
-		approx_dist = FixedDiv(approx_dist,8*FRACUNIT);
+		approx_dist = FixedDiv(approx_dist, 8*FRACUNIT);
 
 	// Combine 8XAWAYSOUND with 4XAWAYSOUND and get.... 32XAWAYSOUND?
 	if (sfxinfo->pitch & SF_X4AWAYSOUND)
-		approx_dist = FixedDiv(approx_dist,4*FRACUNIT);
+		approx_dist = FixedDiv(approx_dist, 4*FRACUNIT);
 
 	if (sfxinfo->pitch & SF_X2AWAYSOUND)
-		approx_dist = FixedDiv(approx_dist,2*FRACUNIT);
+		approx_dist = FixedDiv(approx_dist, 2*FRACUNIT);
 
 	if (approx_dist > S_CLIPPING_DIST)
 		return false;
@@ -1103,18 +1036,10 @@ boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32
 		if (reverse)
 			angle = InvAngle(angle);
 
-#ifdef SURROUND
-		// Produce a surround sound for angle from 105 till 255
-		if (surround.value == 1 && (angle > ANG105 && angle < ANG255 ))
-			*sep = SURROUND_SEP;
-		else
-#endif
-		{
-			angle >>= ANGLETOFINESHIFT;
+		angle >>= ANGLETOFINESHIFT;
 
-			// stereo separation
-			*sep = 128 - (FixedMul(S_STEREO_SWING, FINESINE(angle))>>FRACBITS);
-		}
+		// stereo separation
+		*sep = 128 - (FixedMul(S_STEREO_SWING, FINESINE(angle))>>FRACBITS);
 	}
 
 	// volume calculation
@@ -1122,7 +1047,7 @@ boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32
 	if (approx_dist >= S_CLOSE_DIST)
 	{
 		// distance effect
-		INT32 n = (15 * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS));
+		const INT32 n = (15 * ((S_CLIPPING_DIST - approx_dist)>>FRACBITS));
 		*vol = FixedMul(*vol * FRACUNIT / 255, n) / S_ATTENUATOR;
 	}
 
@@ -1137,11 +1062,6 @@ INT32 S_OriginPlaying(void *origin)
 	if (!origin)
 		return false;
 
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-		return HW3S_OriginPlaying(origin);
-#endif
-
 	for (cnum = 0; cnum < numofchannels; cnum++)
 		if (channels[cnum].origin == origin)
 			return 1;
@@ -1154,11 +1074,6 @@ INT32 S_IdPlaying(sfxenum_t id)
 {
 	INT32 cnum;
 
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-		return HW3S_IdPlaying(id);
-#endif
-
 	for (cnum = 0; cnum < numofchannels; cnum++)
 		if ((size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)id)
 			return 1;
@@ -1173,11 +1088,6 @@ INT32 S_SoundPlaying(void *origin, sfxenum_t id)
 	if (!origin)
 		return 0;
 
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-		return HW3S_SoundPlaying(origin, id);
-#endif
-
 	for (cnum = 0; cnum < numofchannels; cnum++)
 	{
 		if (channels[cnum].origin == origin
@@ -1253,7 +1163,6 @@ void S_InitSfxChannels(INT32 sfxVolume)
 	// Note that sounds have not been cached (yet).
 	for (i = 1; i < NUMSFX; i++)
 	{
-		S_sfx[i].usefulness = -1; // for I_GetSfx()
 		S_sfx[i].lumpnum = LUMPERROR;
 	}
 
@@ -1261,7 +1170,7 @@ void S_InitSfxChannels(INT32 sfxVolume)
 	if (S_PrecacheSound())
 	{
 		// Initialize external data (all sounds) at start, keep static.
-		CONS_Printf(M_GetText("Loading sounds... "));
+		CONS_Printf(M_GetText("Pre-caching sounds..."));
 
 			for (i = 1; i < sfx_freeslot0; i++)
 				if (S_sfx[i].name && !S_sfx[i].data)
@@ -1271,7 +1180,7 @@ void S_InitSfxChannels(INT32 sfxVolume)
 				if (S_sfx[i].priority && !S_sfx[i].data)
 					S_sfx[i].data = I_GetSfx(&S_sfx[i]);
 
-		CONS_Printf(M_GetText(" pre-cached all sound data\n"));
+		CONS_Printf(M_GetText("...pre-cached all sound data\n"));
 	}
 }
 
@@ -1301,196 +1210,259 @@ const char *compat_special_music_slots[16] =
 };
 #endif
 
-static char      music_name[7]; // up to 6-character name
-static void      *music_data;
-static UINT16    music_flags;
-static boolean   music_looping;
-static consvar_t *music_refade_cv;
-static int       music_usage;
+static music_t music;
+static music_t queue;
 
-static char      queue_name[7];
-static UINT16    queue_flags;
-static boolean   queue_looping;
-static UINT32    queue_position;
-static UINT32    queue_fadeinms;
+static consvar_t *music_refade_cv;
 
 /// ------------------------
 /// Music Definitions
 /// ------------------------
 
-musicdef_t *musicdefstart = NULL; // First music definition
-struct cursongcredit cursongcredit; // Currently displayed song credit info
+// Similar system to vissprite allocation. Exists so external pointers to musicdefs are not invalidated
+// when allocating more space for musicdefs
+#define MUSICDEFCHUNKBITS 6
+#define MUSICDEFSPERCHUNK (1 << MUSICDEFCHUNKBITS)
+#define MUSICDEFINDEXMASK (MUSICDEFSPERCHUNK - 1)
+static musicdef_t **musicdefs = NULL;
+static INT32 numchunks = 0;
+INT32 nummusicdefs = 0;
 
 //
-// search for music definition in wad
+// S_GetMusicCredit
 //
-static UINT16 W_CheckForMusicDefInPwad(UINT16 wadid)
+// Return music credit with given index.
+//
+musicdef_t *S_GetMusicCredit(INT32 i)
 {
-	UINT16 i;
-	lumpinfo_t *lump_p;
+	if (i < 0 || i >= nummusicdefs)
+		return NULL;
 
-	lump_p = wadfiles[wadid]->lumpinfo;
-	for (i = 0; i < wadfiles[wadid]->numlumps; i++, lump_p++)
-		if (memcmp(lump_p->name, "MUSICDEF", 8) == 0)
-			return i;
+	INT32 chunk = i >> MUSICDEFCHUNKBITS;
+	i &= MUSICDEFINDEXMASK;
 
-	return INT16_MAX; // not found
+	return &musicdefs[chunk][i];
 }
 
-void S_LoadMusicDefs(UINT16 wadnum)
+//
+// S_AddMusicCredit
+//
+// Return new music credit, allocates memory for it if needed.
+//
+static musicdef_t *S_AddMusicCredit(void)
 {
-	UINT16 lump;
-	char *buf;
-	char *buf2;
-	char *stoken;
-	char *value;
-	size_t size;
-	musicdef_t *def, *prev;
-	UINT16 line = 1; // for better error msgs
+	INT32 chunk = nummusicdefs >> MUSICDEFCHUNKBITS;
+	INT32 i = nummusicdefs & MUSICDEFINDEXMASK;
 
-	lump = W_CheckForMusicDefInPwad(wadnum);
-	if (lump == INT16_MAX)
-		return;
-
-	buf = W_CacheLumpNumPwad(wadnum, lump, PU_CACHE);
-	size = W_LumpLengthPwad(wadnum, lump);
-
-	// for strtok
-	buf2 = malloc(size+1);
-	if (!buf2)
-		I_Error("S_LoadMusicDefs: No more free memory\n");
-	M_Memcpy(buf2,buf,size);
-	buf2[size] = '\0';
-
-	def = prev = NULL;
-
-	stoken = strtok (buf2, "\r\n ");
-	// Find music def
-	while (stoken)
+	// Allocate new chunk if needed. Other chunks stay valid
+	if (chunk == numchunks)
 	{
-		/*if ((stoken[0] == '/' && stoken[1] == '/')
-			|| (stoken[0] == '#')) // skip comments
+		++numchunks;
+		musicdefs = (musicdef_t**)Z_Realloc(musicdefs, sizeof(musicdef_t*)*numchunks, PU_STATIC, NULL);
+		musicdefs[chunk] = Z_Calloc(sizeof(musicdef_t)*MUSICDEFSPERCHUNK, PU_STATIC, NULL);
+	}
+
+	// Store "id" of new musicdef (mostly exists only for lua)
+	musicdefs[chunk][i].num = nummusicdefs;
+
+	++nummusicdefs;
+
+	return &musicdefs[chunk][i];
+}
+
+struct cursongcredit cursongcredit = {0}; // Currently displayed song credit info
+
+static boolean
+ReadMusicDefFields (UINT16 wadnum, int line, char *stoken, musicdef_t **defp)
+{
+	musicdef_t *def;
+
+	char *value;
+	char *textline;
+
+	if (!stricmp(stoken, "lump"))
+	{
+		value = strtok(NULL, " ");
+
+		if (!value)
 		{
-			stoken = strtok(NULL, "\r\n"); // skip end of line
-			if (def)
-				stoken = strtok(NULL, "\r\n= ");
-			else
-				stoken = strtok(NULL, "\r\n ");
-			line++;
-		}
-		else*/ if (!stricmp(stoken, "lump"))
-		{
-			value = strtok(NULL, "\r\n ");
-
-			if (!value)
-			{
-				CONS_Alert(CONS_WARNING, "MUSICDEF: Lump '%s' is missing name. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
-				stoken = strtok(NULL, "\r\n"); // skip end of line
-				goto skip_lump;
-			}
-
-			// No existing musicdefs
-			if (!musicdefstart)
-			{
-				musicdefstart = Z_Calloc(sizeof (musicdef_t), PU_STATIC, NULL);
-				STRBUFCPY(musicdefstart->name, value);
-				strlwr(musicdefstart->name);
-				def = musicdefstart;
-				//CONS_Printf("S_LoadMusicDefs: Initialized musicdef w/ song '%s'\n", def->name);
-			}
-			else
-			{
-				def = musicdefstart;
-
-				// Search if this is a replacement
-				//CONS_Printf("S_LoadMusicDefs: Searching for song replacement...\n");
-				while (def)
-				{
-					if (!stricmp(def->name, value))
-					{
-						//CONS_Printf("S_LoadMusicDefs: Found song replacement '%s'\n", def->name);
-						break;
-					}
-
-					prev = def;
-					def = def->next;
-				}
-
-				// Nothing found, add to the end.
-				if (!def)
-				{
-					def = Z_Calloc(sizeof (musicdef_t), PU_STATIC, NULL);
-					STRBUFCPY(def->name, value);
-					strlwr(def->name);
-					if (prev != NULL)
-						prev->next = def;
-					//CONS_Printf("S_LoadMusicDefs: Added song '%s'\n", def->name);
-				}
-			}
-
-			strncpy(def->filename, wadfiles[wadnum]->filename, 256);
-			def->filename[256] = '\0';
-
-skip_lump:
-			stoken = strtok(NULL, "\r\n ");
-			line++;
+			CONS_Alert(CONS_WARNING,
+					"MUSICDEF: Field '%s' is missing name. (file %s, line %d)\n",
+					stoken, wadfiles[wadnum]->filename, line);
+			goto skip_lump;
 		}
 		else
 		{
-			value = strtok(NULL, "\r\n= ");
+			def = S_FindMusicCredit(value);
 
-			if (!value)
+			// Nothing found, add to the end.
+			if (!def)
 			{
-				CONS_Alert(CONS_WARNING, "MUSICDEF: Field '%s' is missing value. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
-				stoken = strtok(NULL, "\r\n"); // skip end of line
-				goto skip_field;
+				def = S_AddMusicCredit();
+
+				STRBUFCPY(def->name, value);
+				strlwr(def->name);
+				def->hash = quickncasehash (def->name, 6);
 			}
 
+			(*defp) = def;
+		}
+
+skip_lump:
+			stoken = strtok(NULL, " ");
+			line++;
+	}
+	else
+	{
+		value = strtok(NULL, "");
+
+		if (value)
+		{
+			// Find the equals sign.
+			value = strchr(value, '=');
+		}
+
+		if (!value)
+		{
+			CONS_Alert(CONS_WARNING,
+					"MUSICDEF: Field '%s' is missing value. (file %s, line %d)\n",
+					stoken, wadfiles[wadnum]->filename, line);
+			goto skip_field;
+		}
+		else
+		{
+			def = (*defp);
+
 			if (!def)
 			{
-				CONS_Alert(CONS_ERROR, "MUSICDEF: No music definition before field '%s'. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
-				free(buf2);
-				return;
-			}
-			
-			if (!stricmp(stoken, "usage")) {
-				STRBUFCPY(def->usage, value);
-				for (value = def->usage; *value; value++)
-					if (*value == '_') *value = ' '; // turn _ into spaces.
-				//CONS_Printf("S_LoadMusicDefs: Set usage to '%s'\n", def->usage);
-			} else if (!stricmp(stoken, "source")) {
-				STRBUFCPY(def->source, value);
-				for (value = def->source; *value; value++)
-					if (*value == '_') *value = ' '; // turn _ into spaces.
-				//CONS_Printf("S_LoadMusicDefs: Set source to '%s'\n", def->source);
-			} else if (!stricmp(stoken, "title")) {
-				def->use_info = true;
-				STRBUFCPY(def->title, value);
-				for (value = def->title; *value; value++)
-					if (*value == '_') *value = ' '; // turn _ into spaces.
-				//CONS_Printf("S_LoadMusicDefs: Set source to '%s'\n", def->source);
-			} else if (!stricmp(stoken, "alttitle")) {
-				STRBUFCPY(def->alttitle, value);
-				for (value = def->alttitle; *value; value++)
-					if (*value == '_') *value = ' '; // turn _ into spaces.
-				//CONS_Printf("S_LoadMusicDefs: Set source to '%s'\n", def->source);
-			} else if (!stricmp(stoken, "authors")) {
-				STRBUFCPY(def->authors, value);
-				for (value = def->authors; *value; value++)
-					if (*value == '_') *value = ' '; // turn _ into spaces.
-				//CONS_Printf("S_LoadMusicDefs: Set source to '%s'\n", def->source);
-			} else {
-				CONS_Alert(CONS_WARNING, "MUSICDEF: Invalid field '%s'. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
+				CONS_Alert(CONS_ERROR,
+						"MUSICDEF: No music definition before field '%s'. (file %s, line %d)\n",
+						stoken, wadfiles[wadnum]->filename, line);
+				return false;
 			}
 
+			// Skip the equals sign.
+			value++;
+
+			// Now skip funny whitespace.
+			value += strspn(value, "\t ");
+
+			textline = value;
+
+// turn _ into spaces.
+#define ADDDEF(field)\
+	STRBUFCPY(def->field, textline);\
+	for (textline = def->field; *textline; textline++)\
+		if (*textline == '_') *textline = ' ';
+
+			if (!stricmp(stoken, "usage"))
+			{
+				ADDDEF(usage);
+			}
+			else if (!stricmp(stoken, "source"))
+			{
+				ADDDEF(source);
+			}
+			else if (!stricmp(stoken, "title"))
+			{
+				def->use_info = true;
+				ADDDEF(title);
+			}
+			else if (!stricmp(stoken, "alttitle"))
+			{
+				ADDDEF(alttitle);
+			}
+			else if (!stricmp(stoken, "authors"))
+			{
+				ADDDEF(authors);
+			}
+			else
+				CONS_Alert(CONS_WARNING, "MUSICDEF: Invalid field '%s'. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
+#undef ADDDEF
+
 skip_field:
-			stoken = strtok(NULL, "\r\n= ");
+			stoken = strtok(NULL, "= ");
 			line++;
 		}
 	}
 
-	free(buf2);
-	return;
+	return true;
+}
+
+void S_LoadMusicDefs(UINT16 wadnum)
+{
+	UINT16 lumpnum;
+	char *lump;
+	char *musdeftext;
+	size_t size;
+
+	char *lf;
+	char *stoken;
+
+	size_t nlf;
+	size_t ncr;
+
+	musicdef_t *def = NULL;
+	int line = 1; // for better error msgs
+
+	for (int k = 0; k < 2; k++)
+	{
+		lumpnum = W_CheckNumForNamePwad((k == 1 ? "MUSCINFO" : "MUSICDEF") , wadnum, 0); //check for MUSCINFO lump on 2nd iteration
+
+		if (lumpnum == INT16_MAX)
+			continue;
+
+		lump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
+		size = W_LumpLengthPwad(wadnum, lumpnum);
+
+		// Null-terminated MUSICDEF lump.
+		musdeftext = malloc(size+1);
+		if (!musdeftext)
+			I_Error("S_LoadMusicDefs: No more free memory for the parser\n");
+		M_Memcpy(musdeftext, lump, size);
+		musdeftext[size] = '\0';
+
+		// Find music def
+		stoken = musdeftext;
+		for (;;)
+		{
+			lf = strpbrk(stoken, "\r\n");
+			if (lf)
+			{
+				if (*lf == '\n')
+					nlf = 1;
+				else
+					nlf = 0;
+				*lf++ = '\0';/* now we can delimit to here */
+			}
+
+			stoken = strtok(stoken, " ");
+			if (stoken)
+			{
+				if (! ReadMusicDefFields(wadnum, line, stoken, &def))
+					break;
+			}
+
+			if (lf)
+			{
+				do
+				{
+					line += nlf;
+					ncr = strspn(lf, "\r");/* skip CR */
+					lf += ncr;
+					nlf = strspn(lf, "\n");
+					lf += nlf;
+				}
+				while (nlf || ncr) ;
+
+				stoken = lf;/* now the next nonempty line */
+			}
+			else
+				break;/* EOF */
+		}
+
+		free(musdeftext);
+	}
 }
 
 //
@@ -1505,169 +1477,6 @@ void S_InitMusicDefs(void)
 		S_LoadMusicDefs(i);
 }
 
-//
-// search for music definition in wad
-//
-static UINT16 W_CheckForMusicInfoInPwad(UINT16 wadid)
-{
-	UINT16 i;
-	lumpinfo_t *lump_p;
-
-	lump_p = wadfiles[wadid]->lumpinfo;
-	for (i = 0; i < wadfiles[wadid]->numlumps; i++, lump_p++)
-		if (memcmp(lump_p->name, "MUSCINFO", 8) == 0)
-			return i;
-
-	return INT16_MAX; // not found
-}
-
-void S_LoadMTDefs(UINT16 wadnum)
-{
-	UINT16 lump;
-	char *buf;
-	char *buf2;
-	char *stoken;
-	char *value;
-	size_t size;
-	musicdef_t *def, *prev;
-	UINT16 line = 1; // for better error msgs
-
-	lump = W_CheckForMusicInfoInPwad(wadnum);
-	if (lump == INT16_MAX)
-		return;
-
-	buf = W_CacheLumpNumPwad(wadnum, lump, PU_CACHE);
-	size = W_LumpLengthPwad(wadnum, lump);
-
-	// for strtok
-	buf2 = malloc(size+1);
-	if (!buf2)
-		I_Error("S_LoadMTDefs: No more free memory\n");
-	M_Memcpy(buf2,buf,size);
-	buf2[size] = '\0';
-
-	def = prev = NULL;
-
-	stoken = strtok (buf2, "\r\n ");
-	// Find music def
-	while (stoken)
-	{
-		/*if ((stoken[0] == '/' && stoken[1] == '/')
-			|| (stoken[0] == '#')) // skip comments
-		{
-			stoken = strtok(NULL, "\r\n"); // skip end of line
-			if (def)
-				stoken = strtok(NULL, "\r\n= ");
-			else
-				stoken = strtok(NULL, "\r\n ");
-			line++;
-		}
-		else*/ if (!stricmp(stoken, "lump"))
-		{
-			value = strtok(NULL, "\r\n ");
-
-			if (!value)
-			{
-				CONS_Alert(CONS_WARNING, "MUSICDEF: Lump '%s' is missing name. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
-				stoken = strtok(NULL, "\r\n"); // skip end of line
-				goto skip_lump;
-			}
-
-			// No existing musicdefs
-			if (!musicdefstart)
-			{
-				musicdefstart = Z_Calloc(sizeof (musicdef_t), PU_STATIC, NULL);
-				STRBUFCPY(musicdefstart->name, value);
-				strlwr(musicdefstart->name);
-				def = musicdefstart;
-				//CONS_Printf("S_LoadMusicDefs: Initialized musicdef w/ song '%s'\n", def->name);
-			}
-			else
-			{
-				def = musicdefstart;
-
-				// Search if this is a replacement
-				//CONS_Printf("S_LoadMusicDefs: Searching for song replacement...\n");
-				while (def)
-				{
-					if (!stricmp(def->name, value))
-					{
-						//CONS_Printf("S_LoadMusicDefs: Found song replacement '%s'\n", def->name);
-						break;
-					}
-
-					prev = def;
-					def = def->next;
-				}
-
-				// Nothing found, abort.
-				if (!def)
-				{
-					CONS_Alert(CONS_WARNING, "MUSCINFO: Music def for '%s' does not exist. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
-					free(buf2);
-					return;
-				}
-			}
-
-skip_lump:
-			stoken = strtok(NULL, "\r\n ");
-			line++;
-		}
-		else
-		{
-			value = strtok(NULL, "\r\n= ");
-
-			if (!value)
-			{
-				CONS_Alert(CONS_WARNING, "MUSCINFO: Field '%s' is missing value. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
-				stoken = strtok(NULL, "\r\n"); // skip end of line
-				goto skip_field;
-			}
-
-			if (!def)
-			{
-				CONS_Alert(CONS_ERROR, "MUSCINFO: No music definition before field '%s'. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
-				free(buf2);
-				return;
-			}
-			
-			if (!stricmp(stoken, "title")) {
-				def->use_info = true;
-				STRBUFCPY(def->title, value);
-				for (value = def->title; *value; value++)
-					if (*value == '_') *value = ' '; // turn _ into spaces.
-				//CONS_Printf("S_LoadMusicDefs: Set source to '%s'\n", def->source);
-			} else if (!stricmp(stoken, "alttitle")) {
-				STRBUFCPY(def->alttitle, value);
-				for (value = def->alttitle; *value; value++)
-					if (*value == '_') *value = ' '; // turn _ into spaces.
-				//CONS_Printf("S_LoadMusicDefs: Set source to '%s'\n", def->source);
-			} else if (!stricmp(stoken, "authors")) {
-				STRBUFCPY(def->authors, value);
-				for (value = def->authors; *value; value++)
-					if (*value == '_') *value = ' '; // turn _ into spaces.
-				//CONS_Printf("S_LoadMusicDefs: Set source to '%s'\n", def->source);
-			} else {
-				CONS_Alert(CONS_WARNING, "MUSCINFO: Invalid field '%s'. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
-			}
-
-skip_field:
-			stoken = strtok(NULL, "\r\n= ");
-			line++;
-		}
-	}
-
-	free(buf2);
-	return;
-}
-
-void S_InitMTDefs(void)
-{
-	UINT16 i;
-	for (i = 0; i < numwadfiles; i++)
-		S_LoadMTDefs(i);
-}
-
 //
 // S_FindMusicCredit
 //
@@ -1675,24 +1484,29 @@ void S_InitMTDefs(void)
 //
 musicdef_t *S_FindMusicCredit(const char *musname)
 {
-	musicdef_t *def = musicdefstart;
+	UINT32 hash = quickncasehash (musname, 6);
+	musicdef_t *def;
 
-	if (!def) // No definitions
-		return NULL;
-
-	while (def)
+	for (INT32 i = 0; i < nummusicdefs; ++i)
 	{
-		if (!stricmp(def->name, musname))
-		{
-			return def;
-		}
-		else
-			def = def->next;
+		def = S_GetMusicCredit(i);
+
+		if (hash != def->hash)
+			continue;
+		if (stricmp(def->name, musname))
+			continue;
+
+		return def;
 	}
 
 	return NULL;
 }
 
+void S_ResetMusicCredit(void)
+{
+	memset(&cursongcredit, 0, sizeof(cursongcredit));
+}
+
 //
 // S_ShowSpecifiedMusicCredit
 //
@@ -1709,7 +1523,7 @@ void S_ShowSpecifiedMusicCredit(const char *musname)
 
 	def = S_FindMusicCredit(musname);
 
-	if (def)
+	if (def && !LUA_HookMusicCredit(def))
 	{
 		cursongcredit.def = def;
 		cursongcredit.anim = 5*TICRATE;
@@ -1725,42 +1539,7 @@ void S_ShowSpecifiedMusicCredit(const char *musname)
 //
 void S_ShowMusicCredit(void)
 {
-	S_ShowSpecifiedMusicCredit(music_name);
-}
-
-musicdef_t **soundtestdefs = NULL;
-INT32 numsoundtestdefs = 0;
-
-//
-// S_PrepareSoundTest
-//
-// Prepare sound test. What am I, your butler?
-//
-boolean S_PrepareSoundTest(void)
-{
-	musicdef_t *def;
-	INT32 pos = numsoundtestdefs = 0;
-
-	for (def = musicdefstart; def; def = def->next)
-	{
-		numsoundtestdefs++;
-	}
-
-	if (!numsoundtestdefs)
-		return false;
-
-	if (soundtestdefs)
-		Z_Free(soundtestdefs);
-
-	if (!(soundtestdefs = Z_Malloc(numsoundtestdefs*sizeof(musicdef_t *), PU_STATIC, NULL)))
-		I_Error("S_PrepareSoundTest(): could not allocate soundtestdefs.");
-
-	for (def = musicdefstart; def /*&& i < numsoundtestdefs*/; def = def->next)
-	{
-		soundtestdefs[pos++] = def;
-	}
-
-	return true;
+	S_ShowSpecifiedMusicCredit(music.name);
 }
 
 /// ------------------------
@@ -1794,9 +1573,7 @@ boolean S_MusicPaused(void)
 
 boolean S_MusicNotInFocus(void)
 {
-	return (
-			( window_notinfocus && ! cv_playmusicifunfocused.value )
-	);
+	return (window_notinfocus && !cv_playmusicifunfocused.value);
 }
 
 musictype_t S_MusicType(void)
@@ -1806,7 +1583,7 @@ musictype_t S_MusicType(void)
 
 const char *S_MusicName(void)
 {
-	return music_name;
+	return music.name;
 }
 
 boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping)
@@ -1814,20 +1591,18 @@ boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping)
 	if (!I_SongPlaying())
 		return false;
 
-	strncpy(mname, music_name, 7);
+	strncpy(mname, music.name, 7);
 	mname[6] = 0;
-	*mflags = music_flags;
-	*looping = music_looping;
+	*mflags = music.flags;
+	*looping = music.looping;
 
 	return (boolean)mname[0];
 }
 
 boolean S_MusicExists(const char *mname, boolean checkMIDI, boolean checkDigi)
 {
-	return (
-		(checkDigi ? W_CheckNumForName(va("O_%s", mname)) != LUMPERROR : false)
-		|| (checkMIDI ? W_CheckNumForName(va("D_%s", mname)) != LUMPERROR : false)
-	);
+	return (checkDigi ? W_CheckNumForName(va("O_%s", mname)) != LUMPERROR : false)
+		|| (checkMIDI ? W_CheckNumForName(va("D_%s", mname)) != LUMPERROR : false);
 }
 
 /// ------------------------
@@ -1909,9 +1684,9 @@ static boolean S_LoadMusic(const char *mname)
 
 	if (I_LoadSong(mdata, W_LumpLength(mlumpnum)))
 	{
-		strncpy(music_name, mname, 7);
-		music_name[6] = 0;
-		music_data = mdata;
+		strncpy(music.name, mname, 7);
+		music.name[6] = 0;
+		music.data = mdata;
 		return true;
 	}
 	else
@@ -1923,16 +1698,15 @@ static void S_UnloadMusic(void)
 	I_UnloadSong();
 
 #ifndef HAVE_SDL //SDL uses RWOPS
-	Z_ChangeTag(music_data, PU_CACHE);
+	Z_ChangeTag(music.data, PU_CACHE);
 #endif
-	music_data = NULL;
+	music.data = NULL;
 
-	music_name[0] = 0;
-	music_flags = 0;
-	music_looping = false;
+	music.name[0] = 0;
+	music.flags = 0;
+	music.looping = false;
 
 	music_refade_cv = 0;
-	music_usage = 0;
 }
 
 static boolean S_PlayMusic(boolean looping, UINT32 fadeinms)
@@ -1940,8 +1714,7 @@ static boolean S_PlayMusic(boolean looping, UINT32 fadeinms)
 	if (S_MusicDisabled())
 		return false;
 
-	if (cv_birdmusic.value)
-		I_UpdateSongLagConditions();
+	I_UpdateSongLagThreshold();
 
 	if ((!fadeinms && !I_PlaySong(looping)) ||
 		(fadeinms && !I_FadeInPlaySong(fadeinms, looping)))
@@ -1960,36 +1733,50 @@ static boolean S_PlayMusic(boolean looping, UINT32 fadeinms)
 
 static void S_QueueMusic(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 fadeinms)
 {
-	strncpy(queue_name, mmusic, 7);
-	queue_flags = mflags;
-	queue_looping = looping;
-	queue_position = position;
-	queue_fadeinms = fadeinms;
+	strncpy(queue.name, mmusic, 7);
+	queue.flags    = mflags;
+	queue.looping  = looping;
+	queue.position = position;
+	queue.fadeinms = fadeinms;
 }
 
 static void S_ClearQueue(void)
 {
-	queue_name[0] = queue_flags = queue_looping = queue_position = queue_fadeinms = 0;
+	memset(&queue, 0, sizeof(music_t));
 }
 
 static void S_ChangeMusicToQueue(void)
 {
-	S_ChangeMusicEx(queue_name, queue_flags, queue_looping, queue_position, 0, queue_fadeinms);
+	S_ChangeMusicEx(queue.name, queue.flags, queue.looping, queue.position, 0, queue.fadeinms);
 	S_ClearQueue();
 }
 
+// keep copy of music name before lua hook change
+// for custom vote music etc
+static char checkmusic[7] = {0};
+
 void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 position, UINT32 prefadems, UINT32 fadeinms)
 {
 	char newmusic[7] = {0};
 
+	struct MusicChange hook_param = {
+		newmusic,
+		&mflags,
+		&looping,
+		&position,
+		&prefadems,
+		&fadeinms
+	};
+
 	if (S_MusicDisabled()
 		|| demo.rewinding // Don't mess with music while rewinding!
 		|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
 		return;
 
-	strncpy(newmusic, mmusic, 6);
+	strncpy(newmusic,   mmusic, 6);
+	strncpy(checkmusic, mmusic, 6);
 
-	if (LUAh_MusicChange(music_name, newmusic, &mflags, &looping, &position, &prefadems, &fadeinms))
+	if (LUA_HookMusicChange(music.name, &hook_param))
 		return;
 
  	// No Music (empty string)
@@ -2004,12 +1791,12 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
 
 	if (prefadems && S_MusicPlaying()) // queue music change for after fade // allow even if the music is the same
 	{
-		CONS_Debug(DBG_DETAILED, "Now fading out song %s\n", music_name);
+		CONS_Debug(DBG_DETAILED, "Now fading out song %s\n", music.name);
 		S_QueueMusic(newmusic, mflags, looping, position, fadeinms);
 		I_FadeSong(0, prefadems, S_ChangeMusicToQueue);
 		return;
 	}
-	else if (strnicmp(music_name, newmusic, 6) || (mflags & MUSIC_FORCERESET))
+	else if (strnicmp(music.name, newmusic, 6) || (mflags & MUSIC_FORCERESET))
  	{
 		CONS_Debug(DBG_DETAILED, "Now playing song %s\n", newmusic);
 
@@ -2021,8 +1808,8 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
 			return;
 		}
 
-		music_flags = mflags;
-		music_looping = looping;
+		music.flags = mflags;
+		music.looping = looping;
 
 		if (!S_PlayMusic(looping, fadeinms))
  		{
@@ -2062,8 +1849,9 @@ void S_StopMusic(void)
 		|| demo.title) // SRB2Kart: Demos don't interrupt title screen music
 		return;
 
-	if ((cv_birdmusic.value) && (strcasecmp(music_name, mapmusname) == 0))
-		mapmusresume = I_GetSongPosition();
+	mapmusic.resume = (cv_birdmusic.value && (strcasecmp(music.name, mapmusic.name) == 0)) ? I_GetSongPosition() : 0;
+
+	S_SetKeepMusResume();
 
 	if (I_SongPaused())
 		I_ResumeSong();
@@ -2087,7 +1875,7 @@ void S_ResumeAudio(void)
 	if (S_MusicNotInFocus())
 		return;
 
-	if (I_SongPlaying() && I_SongPaused())
+	if (!paused && I_SongPlaying() && I_SongPaused())
 		I_ResumeSong();
 }
 
@@ -2134,12 +1922,12 @@ void S_SetMusicVolume(INT32 digvolume, INT32 seqvolume)
 	}
 }
 
-void S_SetRestoreMusicFadeInCvar (consvar_t *cv)
+void S_SetRestoreMusicFadeInCvar(consvar_t *cv)
 {
-	music_refade_cv = cv;
+	music_refade_cv = cv_birdmusic.value ? cv : 0;
 }
 
-int S_GetRestoreMusicFadeIn (void)
+int S_GetRestoreMusicFadeIn(void)
 {
 	if (music_refade_cv && cv_fading.value)
 		return music_refade_cv->value;
@@ -2147,17 +1935,6 @@ int S_GetRestoreMusicFadeIn (void)
 		return 0;
 }
 
-void S_SetMusicUsage (int type)
-{
-	music_usage = type;
-	I_UpdateSongLagConditions();
-}
-
-int S_MusicUsage (void)
-{
-	return music_usage;
-}
-
 /// ------------------------
 /// Music Fading
 /// ------------------------
@@ -2189,29 +1966,192 @@ boolean S_FadeOutStopMusic(UINT32 ms)
 /// Init & Others
 /// ------------------------
 
+static const char *musicexception_list[] = {
+	"vote", "voteea", "voteeb", "racent", "krwin",
+	"krok", "krlose", "krfail", "kbwin", "kbok",
+	"kblose", "kstart", "estart", "wait2j", "titles",
+	"kinvnc", "kgrow",  // grow and invinc
+	"SPBA_W", "SPBA_L", // SPB Attack music
+	"CHRSHF", "CHRSHP"  // no clue what those are tbh
+};
+
+// check if the current music is smth we dont want to keep (vote music, etc)
+static boolean S_CheckMusicException(void)
+{
+	if (stricmp(music.name, mapmusic.name))
+		return true;
+
+	// dumb hack but dont keepmusic music that is supposed to reset
+	if (music.flags & MUSIC_RELOADRESET)
+		return true;
+
+	// in case somehow the mapmusic was replaced with smth we dont want to keep
+	for (size_t i = 0; i < sizeof(musicexception_list)/sizeof(musicexception_list[0]); i++)
+	{
+		if (!stricmp(music.name, musicexception_list[i]) || !stricmp(checkmusic, musicexception_list[i]))
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void S_ResetKeepAndSpecialMus(void)
+{
+	keepmapmusic = skipintromus = false;
+}
+
+// saves the current song position everytime a song stops
+// so we can resume it in some cases
+static void S_SetKeepMusResume(void)
+{
+	keepmusic.resume = 0;
+
+	if (strcasecmp(music.name, mapmusic.name) == 0)
+	{
+		keepmusic.resume = I_GetSongPosition();
+	}
+}
+
+// determine if we should keep the music on a map restart
+// this gets called BEFORE the level gets loaded in G_DoLoadLevel
+void S_KeepMusic(void)
+{
+	static INT16 oldmap = -1;
+	static boolean oldencore = false;
+
+	keepmapmusic = resumekeepmusic = false;
+
+	if (!cv_keepmusic.value)
+	{
+		return;
+	}
+
+	// copy over mapmusicname stuff into temporary var
+	memset(keepmusic.name, 0, sizeof(keepmusic.name));
+	strlcpy(keepmusic.name, mapmusic.name, sizeof(keepmusic.name));
+	keepmusic.name[6] = 0;
+
+	if (oldmap == gamemap && oldencore == encoremode)
+	{
+		const boolean musicchanged = S_CheckMusicException();
+		resumekeepmusic = (musicchanged && keepmusic.resume);
+		keepmapmusic = (!musicchanged || resumekeepmusic);
+	}
+
+	oldencore = encoremode;
+	oldmap = gamemap;
+}
+
+// Sets up the map music in case it should be reloaded
+// Special case for keepmusic
+void S_HandleReloadResetMusic(void)
+{
+	if (!(mapmusic.flags & MUSIC_RELOADRESET))
+		return;
+
+	// replace mapmusic with our saved keepmusic stuff
+	if (keepmapmusic)
+	{
+		// this is horrible, but oh well
+		strlcpy(mapmusic.name, keepmusic.name, sizeof(mapmusic.name));
+	}
+	else
+	{
+		strlcpy(mapmusic.name, mapheaderinfo[gamemap-1]->musname, sizeof(mapmusic.name));
+	}
+
+	mapmusic.name[6] = 0;
+	mapmusic.flags = (mapheaderinfo[gamemap-1]->mustrack & MUSIC_TRACKMASK);
+	mapmusic.position = mapheaderinfo[gamemap-1]->muspos;
+	mapmusic.resume = 0;
+}
+
+static boolean S_SkipIntroMusic(void)
+{
+	if (!cv_skipintromusic.value)
+		return false;
+
+	// check if menu music is playing, otherwise it may continue playing
+	if (!stricmp(music.name, "titles"))
+		return false;
+
+	char *maptitle = G_BuildMapTitle(gamemap); // Zzz...
+
+	if (maptitle && !stricmp(maptitle, "Wandering Falls")) // wandering balls changes its song when the race starts Zzz...
+	{
+		Z_Free(maptitle);
+		return false;
+	}
+
+	Z_Free(maptitle);
+
+	return true;
+}
+
 //
 // Per level startup code.
 // Kills playing sounds at start of level,
 //  determines music if any, changes music.
 //
-void S_Start(void)
+void S_InitMapMusic(void)
 {
-	if (mapmusflags & MUSIC_RELOADRESET)
+	S_HandleReloadResetMusic();
+
+	if (keepmapmusic)
 	{
-		strncpy(mapmusname, mapheaderinfo[gamemap-1]->musname, 7);
-		mapmusname[6] = 0;
-		mapmusflags = (mapheaderinfo[gamemap-1]->mustrack & MUSIC_TRACKMASK);
-		mapmusposition = mapheaderinfo[gamemap-1]->muspos;
-		mapmusresume = 0;
+		// this is kinda silly, but we can use it to fade back into the map song at the saved point, should the current music be different from the map music
+		if (resumekeepmusic)
+		{
+			S_ChangeMusicEx(mapmusic.name, mapmusic.flags, true, keepmusic.resume, 0, 500);
+		}
+		return;
 	}
 
-	//if (cv_resetmusic.value) // Starting ambience should always be restarted
-		S_StopMusic();
+	// Starting ambience should always be restarted
+	// lug: but not when we keep the map music lol
+	S_StopMusic();
 
-	if (leveltime < (starttime + (TICRATE/2))) // SRB2Kart
-		S_ChangeMusicEx((encoremode ? "estart" : "kstart"), 0, false, mapmusposition, 0, 0);
-	else
-		S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
+	skipintromus = S_SkipIntroMusic();
+
+	if (skipintromus)
+		return;
+
+	if (leveltime < MUSICSTARTTIME) // SRB2Kart
+		S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); //S_StopMusic();
+}
+
+void S_StartMapMusic(void)
+{
+	// no need to constantly run this after race has started
+	if (leveltime > MUSICSTARTTIME)
+		return;
+
+	if (keepmapmusic)
+	{
+		return;
+	}
+
+	if (skipintromus)
+	{
+		if (leveltime < starttime)
+			S_ChangeMusicEx(mapmusic.name, mapmusic.flags, true, mapmusic.position, 0, 0);
+		else if (leveltime == MUSICSTARTTIME)
+			S_ShowMusicCredit();
+
+		return;
+	}
+
+	if (leveltime < starttime) // SRB2Kart
+		S_ChangeMusicInternal((encoremode ? "estart" : "kstart"), false); // yes this will be spammed otherwise encore and some stuff WILL overwrite it
+	else if (leveltime == starttime) // The GO! sound stops the level start ambience
+		S_StopMusic();
+	else if (leveltime == MUSICSTARTTIME) // Plays the music after the starting countdown.
+	{
+		S_ChangeMusicEx(mapmusic.name, mapmusic.flags, true, mapmusic.position, 0, 0);
+		S_ShowMusicCredit();
+	}
 }
 
 void S_RestartMusic(void)
@@ -2226,6 +2166,8 @@ void S_RestartMusic(void)
 	S_SetMusicVolume(cv_digmusicvolume.value, cv_midimusicvolume.value);
 #endif
 
+	S_ResetKeepAndSpecialMus();
+
 	if (Playing()) // Gotta make sure the player is in a level
 		P_RestoreMusic(&players[consoleplayer]);
 	else
@@ -2257,9 +2199,10 @@ static void Command_Tunes_f(void)
 	if (!strcasecmp(tunearg, "-show"))
 	{
 		CONS_Printf(M_GetText("The current tune is: %s [track %d]\n"),
-			mapmusname, (mapmusflags & MUSIC_TRACKMASK));
+			mapmusic.name, (mapmusic.flags & MUSIC_TRACKMASK));
 		return;
 	}
+
 	if (!strcasecmp(tunearg, "-none"))
 	{
 		S_StopMusic();
@@ -2278,6 +2221,7 @@ static void Command_Tunes_f(void)
 		CONS_Alert(CONS_NOTICE, M_GetText("Valid music slots are 1 to 1035.\n"));
 		return;
 	}
+
 	if (!tunenum && strlen(tunearg) > 6) // This is automatic -- just show the error just in case
 		CONS_Alert(CONS_NOTICE, M_GetText("Music name too long - truncated to six characters.\n"));
 
@@ -2285,19 +2229,18 @@ static void Command_Tunes_f(void)
 		track = (UINT16)atoi(COM_Argv(2))-1;
 
 	if (tunenum)
-		snprintf(mapmusname, 7, "%sM", G_BuildMapName(tunenum));
+		snprintf(mapmusic.name, 7, "%sM", G_BuildMapName(tunenum));
 	else
-		strncpy(mapmusname, tunearg, 7);
+		strlcpy(mapmusic.name, tunearg, sizeof(mapmusic.name));
 
 	if (argc > 4)
 		position = (UINT32)atoi(COM_Argv(4));
 
-	mapmusname[6] = 0;
-	mapmusflags = (track & MUSIC_TRACKMASK);
-	mapmusposition = position;
-	mapmusresume = 0;
+	mapmusic.flags = (track & MUSIC_TRACKMASK);
+	mapmusic.position = position;
+	mapmusic.resume = 0;
 
-	S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
+	S_ChangeMusicEx(mapmusic.name, mapmusic.flags, true, mapmusic.position, 0, 0);
 
 	if (argc > 3)
 	{
@@ -2319,7 +2262,7 @@ static void Command_RestartAudio_f(void)
 	I_StartupSound();
 	I_InitMusic();
 
-// These must be called or no sound and music until manually set.
+	// These must be called or no sound and music until manually set.
 
 	I_SetSfxVolume(cv_soundvolume.value);
 #ifdef NO_MIDI
@@ -2330,6 +2273,8 @@ static void Command_RestartAudio_f(void)
 
 	S_StartSound(NULL, sfx_strpst);
 
+	S_ResetKeepAndSpecialMus();
+
 	if (Playing()) // Gotta make sure the player is in a level
 		P_RestoreMusic(&players[consoleplayer]);
 	else
@@ -2343,7 +2288,7 @@ static void Command_RestartMusic_f(void) //same as RestartAudio but only music g
 
 static void Command_ShowMusicCredit_f(void)
 {
-	const char *musname = music_name;
+	const char *musname = music.name;
 
 	if (COM_Argc() > 1)
 	{
@@ -2356,9 +2301,8 @@ static void Command_ShowMusicCredit_f(void)
 
 	musicdef_t *def = S_FindMusicCredit(musname);
 
-	if (def) {
+	if (def)
 		CONS_Printf("%.6s - %.255s\n", musname, def->source);
-	}
 }
 
 static void GameSounds_OnChange(void)
@@ -2389,6 +2333,7 @@ static void SoundPrecache_OnChange(void)
 	else if (!S_PrecacheSound())
 	{
 		S_ClearSfx();
+
 		if (!sound_disabled)
 			S_InitSfxChannels(cv_soundvolume.value);
 	}
@@ -2406,7 +2351,9 @@ static void GameDigiMusic_OnChange(void)
 		digital_disabled = false;
 		I_StartupSound(); // will return early if initialised
 		I_InitMusic();
-		
+
+		S_ResetKeepAndSpecialMus();
+
 		if (Playing())
 			P_RestoreMusic(&players[consoleplayer]);
 		else
@@ -2443,14 +2390,12 @@ static void ModFilter_OnChange(void)
 {
 	if (openmpt_mhandle)
 		openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH, cv_modfilter.value);
-		
 }
 
 static void StereoSep_OnChange(void)
 {
 	if (openmpt_mhandle)
 		openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT, cv_stereosep.value);
-		
 }
 
 static void AmigaFilter_OnChange(void)
@@ -2494,6 +2439,9 @@ static void GameMIDIMusic_OnChange(void)
 	{
 		midi_disabled = false;
 		I_InitMusic();
+
+		S_ResetKeepAndSpecialMus();
+
 		if (Playing())
 			P_RestoreMusic(&players[consoleplayer]);
 		else
diff --git a/src/s_sound.h b/src/s_sound.h
index 538e8713e..924259a27 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -32,7 +32,8 @@ extern consvar_t stereoreverse;
 extern consvar_t cv_soundvolume, cv_digmusicvolume;//, cv_midimusicvolume;
 extern consvar_t cv_numChannels;
 
-extern consvar_t surround;
+extern consvar_t cv_samesoundlimit;
+
 extern consvar_t cv_audbuffersize;
 //extern consvar_t cv_resetmusic;
 extern consvar_t cv_gamedigimusic;
@@ -69,6 +70,13 @@ extern consvar_t cv_resume;
 extern consvar_t cv_fading;
 extern consvar_t cv_birdmusic;
 
+extern consvar_t cv_keepmusic;
+extern consvar_t cv_skipintromusic;
+//extern consvar_t cv_ignoremusicchanges;
+extern boolean keepmapmusic;
+extern boolean skipintromus;
+#define MUSICSTARTTIME (starttime + (TICRATE/2))
+
 extern consvar_t precachesound;
 
 typedef enum
@@ -102,7 +110,14 @@ void S_InitSfxChannels(INT32 sfxVolume);
 //
 void S_StopSounds(void);
 void S_ClearSfx(void);
-void S_Start(void);
+
+void S_ResetKeepAndSpecialMus(void);
+
+void S_InitMapMusic(void);
+void S_StartMapMusic(void);
+void S_HandleReloadResetMusic(void);
+
+void S_KeepMusic(void);
 
 // Stops music and restarts it from same position. Used for instant applying changes to amiga filters.
 void S_RestartMusic(void);
@@ -158,6 +173,7 @@ boolean S_SpeedMusic(float speed);
 typedef struct musicdef_s
 {
 	char name[7];
+	UINT32 hash;
 	char usage[256];
 	char source[256];
 	char filename[256+1];
@@ -168,14 +184,9 @@ typedef struct musicdef_s
 	char alttitle[256];
 	char authors[256];
 	boolean use_info;
-	struct musicdef_s *next;
+	size_t num;
 } musicdef_t;
 
-extern musicdef_t *musicdefstart;
-extern musicdef_t **soundtestdefs;
-extern INT32 numsoundtestdefs;
-extern UINT8 soundtestpage;
-
 extern struct cursongcredit
 {
 	musicdef_t *def;
@@ -184,16 +195,17 @@ extern struct cursongcredit
 	UINT8 trans;
 } cursongcredit;
 
+extern INT32 nummusicdefs;
 
 void S_LoadMusicDefs(UINT16 wadnum);
 void S_InitMusicDefs(void);
 void S_LoadMTDefs(UINT16 wadnum);
 void S_InitMTDefs(void);
+musicdef_t *S_GetMusicCredit(INT32 i);
 musicdef_t *S_FindMusicCredit(const char *musname);
 void S_ShowSpecifiedMusicCredit(const char *musname);
 void S_ShowMusicCredit(void);
-
-boolean S_PrepareSoundTest(void);
+void S_ResetMusicCredit(void);
 
 //
 // Music Seeking
@@ -218,9 +230,14 @@ UINT32 S_GetMusicPosition(void);
 // Music Playback
 //
 
-enum
-{
-	MUS_SPECIAL = 1,/* powerups--invincibility, grow */
+/* this is for the sake of the hook */
+struct MusicChange {
+	char    * newname;
+	UINT16  * mflags;
+	boolean * looping;
+	UINT32  * position;
+	UINT32  * prefadems;
+	UINT32  * fadeinms;
 };
 
 // Start music track, arbitrary, given its name, and set whether looping
@@ -238,9 +255,6 @@ void S_SetRestoreMusicFadeInCvar (consvar_t *cvar);
 	S_SetRestoreMusicFadeInCvar(0)
 int  S_GetRestoreMusicFadeIn (void);
 
-void S_SetMusicUsage (int type);
-int  S_MusicUsage (void);
-
 // Stops the music.
 void S_StopMusic(void);
 
@@ -281,10 +295,8 @@ void S_StartSoundName(void *mo, const  char *soundname);
 void S_StopSoundByID(void *origin, sfxenum_t sfx_id);
 void S_StopSoundByNum(sfxenum_t sfxnum);
 
-#ifndef HW3SOUND
 #define S_StartAttackSound S_StartSound
 #define S_StartScreamSound S_StartSound
-#endif
 
 #ifdef MUSICSLOT_COMPATIBILITY
 // For compatibility with code/scripts relying on older versions
diff --git a/src/screen.c b/src/screen.c
index 872a411ff..06581ec02 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -33,41 +33,27 @@
 // SRB2Kart
 #include "r_fps.h" // R_GetFramerateCap
 
-// --------------------------------------------
-// assembly or c drawer routines for 8bpp/16bpp
-// --------------------------------------------
-void (*wallcolfunc)(void); // new wall column drawer to draw posts >128 high
-void (*colfunc)(void); // standard column, up to 128 high posts
-
-void (*basecolfunc)(void);
-void (*fuzzcolfunc)(void); // standard fuzzy effect column drawer
-void (*transcolfunc)(void); // translation column drawer
-void (*shadecolfunc)(void); // smokie test..
-void (*spanfunc)(void); // span drawer, use a 64x64 tile
-void (*splatfunc)(void); // span drawer w/ transparency
-void (*basespanfunc)(void); // default span func for color mode
-void (*transtransfunc)(void); // translucent translated column drawer
-void (*twosmultipatchfunc)(void); // for cols with transparent pixels
-void (*twosmultipatchtransfunc)(void); // for cols with transparent pixels AND translucency
-
 // ------------------
 // global video state
 // ------------------
 viddef_t vid;
 INT32 setmodeneeded; //video mode change needed if > 0 (the mode number to set + 1)
 
-static CV_PossibleValue_t scr_depth_cons_t[] = {{8, "8 bits"}, {16, "16 bits"}, {24, "24 bits"}, {32, "32 bits"}, {0, NULL}};
-
 static CV_PossibleValue_t shittyscreen_cons_t[] = {{0, "Okay"}, {1, "Shitty"}, {2, "Extra Shitty"}, {0, NULL}};
 
 //added : 03-02-98: default screen mode, as loaded/saved in config
 consvar_t cv_scr_width = {"scr_width", "1280", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_scr_height = {"scr_height", "800", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_scr_depth = {"scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_vhseffect = {"vhspause", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_shittyscreen = {"televisionsignal", "Okay", CV_NOSHOWHELP, shittyscreen_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+consvar_t cv_parallelsoftware = {"parallelsoftware", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_paralleldrawmasked = {"paralleldrawmasked", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t votescale_cons_t[] = {{0, "Vanilla"}, {1, "Adaptive"}, {2, "VerticalFill"}, {3, "HorizontalFill"}, {0, NULL}};
+consvar_t cv_votebgscaling = {"votebgscaling", "Adaptive", CV_SAVE, votescale_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
 static void Highreshudscale_OnChange(void);
 static CV_PossibleValue_t highreshudscale_cons_t[] = {{4*FRACUNIT/5, "MIN"}, {4*FRACUNIT/3, "MAX"}, {0, NULL}};
 consvar_t cv_highreshudscale = {"highreshudscale", "1", CV_SAVE|CV_FLOAT|CV_CALL|CV_NOINIT|CV_NOSHOWHELP, highreshudscale_cons_t, Highreshudscale_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -80,21 +66,52 @@ static void Highreshudscale_OnChange(void)
 
 static void SCR_ChangeFullscreen (void);
 
-consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t fullscreen_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Borderless Window"}, {0, NULL}};
 
-consvar_t cv_accuratefps = {"accuratefpscounter", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, fullscreen_cons_t, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL};
+
+static CV_PossibleValue_t accuratefps_cons_t[] = {{0, "Inaccurate"}, {1, "Accurate"}, {0, NULL}};
+consvar_t cv_accuratefps = {"fpssampling", "1", CV_SAVE, accuratefps_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 // =========================================================================
 //                           SCREEN VARIABLES
 // =========================================================================
 
-INT32 scr_bpp; // current video mode bytes per pixel
 UINT8 *scr_borderpatch; // flat used to fill the reduced view borders set at ST_Init()
 
 // =========================================================================
 
-//  Short and Tall sky drawer, for the current color mode
-void (*walldrawerfunc)(void);
+static void SCR_SetDrawFuncs(void)
+{
+	//
+	//  setup the right draw routines
+	//
+
+	spanfuncs[BASEDRAWFUNC] = R_DrawSpan;
+	spanfuncs[SPANDRAWFUNC_TRANS] = R_DrawTranslucentSpan;
+	spanfuncs[SPANDRAWFUNC_TILTED] = R_DrawSpan_Tilted;
+	spanfuncs[SPANDRAWFUNC_TILTEDTRANS] = R_DrawTranslucentSpan_Tilted;
+	spanfuncs[SPANDRAWFUNC_SPLAT] = R_DrawSplat;
+	spanfuncs[SPANDRAWFUNC_TRANSSPLAT] = R_DrawTranslucentSplat;
+	spanfuncs[SPANDRAWFUNC_TILTEDSPLAT] = R_DrawSplat_Tilted;
+	spanfuncs[SPANDRAWFUNC_TILTEDTRANSSPLAT] = R_DrawTranslucentSpan_Tilted;
+	spanfuncs[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan;
+	spanfuncs[SPANDRAWFUNC_TILTEDWATER] = R_DrawTranslucentWaterSpan_Tilted;
+	spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan;
+	spanfuncs[SPANDRAWFUNC_TILTEDFOG] = R_DrawFogSpan_Tilted;
+
+	colfuncs[BASEDRAWFUNC] = R_DrawColumn;
+	colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn;
+	colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn;
+	colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed;
+	colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn;
+	colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn;
+	colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
+	colfuncs[COLDRAWFUNC_FOG] = R_DrawFogColumn;
+
+	R_SetColumnFunc(BASEDRAWFUNC);
+	R_SetSpanFunc(BASEDRAWFUNC);
+}
 
 void SCR_SetMode(void)
 {
@@ -108,45 +125,47 @@ void SCR_SetMode(void)
 
 	V_SetPalette(0);
 
-	//
-	//  setup the right draw routines for either 8bpp or 16bpp
-	//
-	if (true)//vid.bpp == 1) //Always run in 8bpp. todo: remove all 16bpp code?
-	{
-		spanfunc = basespanfunc = R_DrawSpan_8;
-		splatfunc = R_DrawSplat_8;
-		transcolfunc = R_DrawTranslatedColumn_8;
-		transtransfunc = R_DrawTranslatedTranslucentColumn_8;
+	SCR_SetDrawFuncs();
 
-		colfunc = basecolfunc = R_DrawColumn_8;
-		shadecolfunc = R_DrawShadeColumn_8;
-		fuzzcolfunc = R_DrawTranslucentColumn_8;
-		walldrawerfunc = R_DrawWallColumn_8;
-		twosmultipatchfunc = R_Draw2sMultiPatchColumn_8;
-		twosmultipatchtransfunc = R_Draw2sMultiPatchTranslucentColumn_8;
-	}
-/*	else if (vid.bpp > 1)
-	{
-		I_OutputMsg("using highcolor mode\n");
-		spanfunc = basespanfunc = R_DrawSpan_16;
-		transcolfunc = R_DrawTranslatedColumn_16;
-		transtransfunc = R_DrawTranslucentColumn_16; // No 16bit operation for this function
-
-		colfunc = basecolfunc = R_DrawColumn_16;
-		shadecolfunc = NULL; // detect error if used somewhere..
-		fuzzcolfunc = R_DrawTranslucentColumn_16;
-		walldrawerfunc = R_DrawWallColumn_16;
-	}*/
-	else
-		I_Error("unknown bytes per pixel mode %d\n", vid.bpp);
-/*
-	if (SCR_IsAspectCorrect(vid.width, vid.height))
-		CONS_Alert(CONS_WARNING, M_GetText("Resolution is not aspect-correct!\nUse a multiple of %dx%d\n"), BASEVIDWIDTH, BASEVIDHEIGHT);
-*/
 	// set the apprpriate drawer for the sky (tall or INT16)
 	setmodeneeded = 0;
 }
 
+void R_SetColumnFunc(size_t id)
+{
+	I_Assert(id < COLDRAWFUNC_MAX);
+
+	colfunctype = id;
+	colfunc = colfuncs[id];
+}
+
+void R_SetSpanFunc(size_t id)
+{
+	I_Assert(id < SPANDRAWFUNC_MAX);
+	spanfunc = spanfuncs[id];
+}
+
+boolean R_CheckColumnFunc(size_t id)
+{
+	size_t i;
+
+	if (colfunc == NULL)
+	{
+		// Shouldn't happen.
+		return false;
+	}
+
+	for (i = 0; i < COLDRAWFUNC_MAX; i++)
+	{
+		if (colfunc == colfuncs[id])
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
 // do some initial settings for the game loading screen
 //
 void SCR_Startup(void)
@@ -166,26 +185,13 @@ void SCR_Startup(void)
 	vid.fdupx = FixedDiv(vid.width*FRACUNIT, BASEVIDWIDTH*FRACUNIT);
 	vid.fdupy = FixedDiv(vid.height*FRACUNIT, BASEVIDHEIGHT*FRACUNIT);
 
-//#ifdef HWRENDER
-	//if (rendermode != render_opengl && rendermode != render_none) // This was just placing it incorrectly at non aspect correct resolutions in opengl
-//#endif
-		vid.fdupx = vid.fdupy = (vid.fdupx < vid.fdupy ? vid.fdupx : vid.fdupy);
+	vid.fdupx = vid.fdupy = (vid.fdupx < vid.fdupy ? vid.fdupx : vid.fdupy);
 
 	vid.meddupx = (UINT8)(vid.dupx >> 1) + 1;
 	vid.meddupy = (UINT8)(vid.dupy >> 1) + 1;
-#ifdef HWRENDER
-	vid.fmeddupx = vid.meddupx*FRACUNIT;
-	vid.fmeddupy = vid.meddupy*FRACUNIT;
-#endif
 
 	vid.smalldupx = (UINT8)(vid.dupx / 3) + 1;
 	vid.smalldupy = (UINT8)(vid.dupy / 3) + 1;
-#ifdef HWRENDER
-	vid.fsmalldupx = vid.smalldupx*FRACUNIT;
-	vid.fsmalldupy = vid.smalldupy*FRACUNIT;
-#endif
-
-	vid.baseratio = FRACUNIT;
 
 	V_Init();
 	CV_RegisterVar(&cv_highreshudscale);
@@ -218,6 +224,8 @@ void SCR_Startup(void)
 	CV_RegisterVar(&cv_bsaturation);
 	CV_RegisterVar(&cv_msaturation);
 
+	CV_RegisterVar(&cv_votebgscaling);
+
 	V_SetPalette(0);
 }
 
@@ -228,9 +236,6 @@ void SCR_Recalc(void)
 	if (dedicated)
 		return;
 
-	// bytes per pixel quick access
-	scr_bpp = vid.bpp;
-
 	// scale 1,2,3 times in x and y the patches for the menus and overlays...
 	// calculated once and for all, used by routines in v_video.c
 	vid.dupx = vid.width / BASEVIDWIDTH;
@@ -247,35 +252,21 @@ void SCR_Recalc(void)
 		vid.fdupy = FixedDiv(vid.fdupy, cv_highreshudscale.value);
 	}
 
-#ifdef HWRENDER
-	//if (rendermode != render_opengl && rendermode != render_none) // This was just placing it incorrectly at non aspect correct resolutions in opengl
-	// 13/11/18:
-	// The above is no longer necessary, since we want OpenGL to be just like software now
-	// -- Monster Iestyn
-#endif
-		vid.fdupx = vid.fdupy = (vid.fdupx < vid.fdupy ? vid.fdupx : vid.fdupy);
-
-	//vid.baseratio = FixedDiv(vid.height << FRACBITS, BASEVIDHEIGHT << FRACBITS);
-	vid.baseratio = FRACUNIT;
+	vid.fdupx = vid.fdupy = (vid.fdupx < vid.fdupy ? vid.fdupx : vid.fdupy);
 
 	vid.meddupx = (UINT8)(vid.dupx >> 1) + 1;
 	vid.meddupy = (UINT8)(vid.dupy >> 1) + 1;
-#ifdef HWRENDER
-	vid.fmeddupx = vid.meddupx*FRACUNIT;
-	vid.fmeddupy = vid.meddupy*FRACUNIT;
-#endif
 
 	vid.smalldupx = (UINT8)(vid.dupx / 3) + 1;
 	vid.smalldupy = (UINT8)(vid.dupy / 3) + 1;
-#ifdef HWRENDER
-	vid.fsmalldupx = vid.smalldupx*FRACUNIT;
-	vid.fsmalldupy = vid.smalldupy*FRACUNIT;
-#endif
 
-	// toggle off automap because some screensize-dependent values will
+	// toggle off (then back on) the automap because some screensize-dependent values will
 	// be calculated next time the automap is activated.
 	if (automapactive)
-		AM_Stop();
+	{
+		am_recalc = true;
+		AM_Start();
+	}
 
 	// set the screen[x] ptrs on the new vidbuffers
 	V_Init();
@@ -318,8 +309,7 @@ void SCR_CheckDefaultMode(void)
 	}
 	else
 	{
-		CONS_Printf(M_GetText("Default resolution: %d x %d (%d bits)\n"), cv_scr_width.value,
-			cv_scr_height.value, cv_scr_depth.value);
+		CONS_Printf(M_GetText("Default resolution: %d x %d\n"), cv_scr_width.value, cv_scr_height.value);
 		// see note above
 		setmodeneeded = VID_GetModeForSize(cv_scr_width.value, cv_scr_height.value) + 1;
 	}
@@ -331,13 +321,14 @@ void SCR_SetDefaultMode(void)
 	// remember the default screen size
 	CV_SetValue(&cv_scr_width, vid.width);
 	CV_SetValue(&cv_scr_height, vid.height);
-	CV_SetValue(&cv_scr_depth, vid.bpp*8);
 }
 
 // Change fullscreen on/off according to cv_fullscreen
 void SCR_ChangeFullscreen(void)
 {
 #ifdef DIRECTFULLSCREEN
+	I_SetBorderlessWindow(); // Running this here so we can have borderless window at startup
+
 	// allow_fullscreen is set by VID_PrepareModeList
 	// it is used to prevent switching to fullscreen during startup
 	if (!allow_fullscreen)
@@ -354,11 +345,7 @@ void SCR_ChangeFullscreen(void)
 
 boolean SCR_IsAspectCorrect(INT32 width, INT32 height)
 {
-	return
-	 (  width % BASEVIDWIDTH == 0
-	 && height % BASEVIDHEIGHT == 0
-	 && width / BASEVIDWIDTH == height / BASEVIDHEIGHT
-	 );
+	return (width % BASEVIDWIDTH == 0 && height % BASEVIDHEIGHT == 0 && width / BASEVIDWIDTH == height / BASEVIDHEIGHT);
 }
 
 double averageFPS = 0.0f;
@@ -366,15 +353,13 @@ double averageFPS = 0.0f;
 #define USE_FPS_SAMPLES
 
 #ifdef USE_FPS_SAMPLES
-#define MAX_FRAME_TIME 0.05
-#define NUM_FPS_SAMPLES (16) // Number of samples to store
-#define NUM_FPS_SAMPLES2 (32) // Number of samples to store for inaccurate counter
+#define MAX_FRAME_TIME (0.05)
+#define NUM_FPS_SAMPLES (32) // Number of samples to store
 
 static double total_frame_time = 0.0;
 static int frame_index;
 
-static double fps_samples[NUM_FPS_SAMPLES2];
-static int fps_index;
+static double fps_samples[NUM_FPS_SAMPLES];
 #endif
 
 static boolean fps_init = false;
@@ -383,7 +368,6 @@ static precise_t fps_enter = 0;
 void SCR_CalculateFPS(void)
 {
 	precise_t fps_finish = 0;
-	int i;
 
 	double frameElapsed = 0.0;
 
@@ -398,10 +382,10 @@ void SCR_CalculateFPS(void)
 	fps_enter = fps_finish;
 
 #ifdef USE_FPS_SAMPLES
+	total_frame_time += frameElapsed;
 
 	if (cv_accuratefps.value)
 	{
-		total_frame_time += frameElapsed;
 		if (frame_index++ >= NUM_FPS_SAMPLES || total_frame_time >= MAX_FRAME_TIME)
 		{
 			averageFPS = 1.0 / (total_frame_time / frame_index);
@@ -411,13 +395,32 @@ void SCR_CalculateFPS(void)
 	}
 	else
 	{
-		fps_samples[fps_index] = frameElapsed / NUM_FPS_SAMPLES2;
-		fps_index = (fps_index + 1) % NUM_FPS_SAMPLES2;
+		if (total_frame_time >= MAX_FRAME_TIME)
+		{
+			static int sampleIndex = 0;
 
-		averageFPS = 0.0;
-		for (i = 0; i < NUM_FPS_SAMPLES2; i++)
-			averageFPS += fps_samples[i];
-		averageFPS = 1.0 / averageFPS;
+			fps_samples[sampleIndex] = frameElapsed;
+
+			sampleIndex++;
+			if (sampleIndex >= NUM_FPS_SAMPLES)
+				sampleIndex = 0;
+
+			averageFPS = 0.0;
+			for (int i = 0; i < NUM_FPS_SAMPLES; i++)
+			{
+				averageFPS += fps_samples[i];
+			}
+
+			if (averageFPS > 0.0)
+			{
+				averageFPS = 1.0 / (averageFPS / NUM_FPS_SAMPLES);
+			}
+		}
+
+		while (total_frame_time >= MAX_FRAME_TIME)
+		{
+			total_frame_time -= MAX_FRAME_TIME;
+		}
 	}
 #else
 	// Direct, unsampled counter.
@@ -427,26 +430,24 @@ void SCR_CalculateFPS(void)
 
 void SCR_DisplayTicRate(void)
 {
-	const UINT8 *ticcntcolor = NULL;
 	UINT32 cap = R_GetFramerateCap();
 	UINT32 benchmark = (cap == 0) ? I_GetRefreshRate() : cap;
-	INT32 x = 318;
 	double fps = round(averageFPS);
 	INT32 fpsflags = V_LocalTransFlag()|V_SNAPTOBOTTOM|V_SNAPTORIGHT;
-	const char *fps_string;
-	
-	INT32 ticcntcolor2 = 0;
-	
+
 	if (gamestate == GS_NULL)
 		return;
 
 	// new kart counter
-	if ((cv_ticrate.value == 1) || (cv_ticrate.value == 2))
+	if (cv_ticrate.value == 1 || cv_ticrate.value == 2)
 	{
+		const UINT8 *ticcntcolor = NULL;
+		INT32 x = 318;
+
 		// draw "FPS"
 		if (cv_ticrate.value == 1)
 			V_DrawFixedPatch(306<<FRACBITS, 183<<FRACBITS, FRACUNIT, fpsflags, framecounter, R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE));
-			
+
 		if (fps > (benchmark - 5))
 			ticcntcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_MINT, GTC_CACHE);
 		else if (fps < 20)
@@ -465,18 +466,21 @@ void SCR_DisplayTicRate(void)
 
 			// draw total frame:
 			V_DrawPingNum(x, 190, fpsflags, cap, ticcntcolor);
-			
+
 			x -= digits * 4;
 
-			// draw "/"	
+			// draw "/"
 			V_DrawFixedPatch(x<<FRACBITS, 190<<FRACBITS, FRACUNIT, fpsflags, frameslash, ticcntcolor);
 		}
 
 		// draw our actual framerate
 		V_DrawPingNum(x, 190, fpsflags, fps, ticcntcolor);
 	}
-	else if ((cv_ticrate.value == 3)||(cv_ticrate.value == 4)) // kart v1.0/srb2 counter
+	else if (cv_ticrate.value == 3 || cv_ticrate.value == 4) // kart v1.0/srb2 counter
 	{
+		const char *fps_string;
+		INT32 ticcntcolor2 = 0;
+
 		if (fps > (benchmark - 5))
 			ticcntcolor2 = V_GREENMAP;
 		else if (fps < 20)
@@ -486,10 +490,11 @@ void SCR_DisplayTicRate(void)
 			fps_string = va("%d/%d\x82", (INT32)fps, cap);
 		else
 			fps_string = va("%d\x82", (INT32)fps);
-	
+
+		// draw "FPS"
 		if (cv_ticrate.value == 3)
 			V_DrawRightAlignedString(319, 181, V_YELLOWMAP|fpsflags, "FPS");
-			
+
 		V_DrawRightAlignedString(319, 190, ticcntcolor2|fpsflags, fps_string);
 	}
 }
@@ -499,13 +504,13 @@ void SCR_DisplayTicRate(void)
 
 void SCR_DisplayLocalPing(void)
 {
-	UINT32 ping = playerpingtable[consoleplayer];	// consoleplayer's ping is everyone's ping in a splitnetgame :P
+	UINT32 ping = playerpingtable[consoleplayer];
 	INT32 pingflags = V_LocalTransFlag()|V_SNAPTOBOTTOM|V_SNAPTORIGHT;
-	
-	if (cv_showping.value == 1 || (cv_showping.value == 2 && ping > servermaxping))	// only show 2 (warning) if our ping is at a bad level
+
+	if (cv_showping.value == 1 || (cv_showping.value == 2 && ping > servermaxping)) // only show 2 (warning) if our ping is at a bad level
 	{
 		INT32 dispy = (cv_ticrate.value == 1) ? 165 : ((cv_ticrate.value == 2 || cv_ticrate.value == 4) ? 172 : ((cv_ticrate.value == 3) ? 163 : 181)); // absolute buttpain
-		
-		HU_drawPing(308, dispy, ping, pingflags);
+
+		HU_drawPlayerPing(308, dispy, consoleplayer, pingflags); // consoleplayer's ping is everyone's ping in a splitnetgame :P
 	}
 }
diff --git a/src/screen.h b/src/screen.h
index a6a0eb477..38483b28d 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -39,119 +39,69 @@
 // we try to re-allocate a minimum of buffers for stability of the memory,
 // so all the small-enough tables based on screen size, are allocated once
 // and for all at the maximum size.
-#define MAXVIDWIDTH 2560 // don't set this too high because actually
-#define MAXVIDHEIGHT 1440 // lots of tables are allocated with the MAX size.
+#define MAXVIDWIDTH 8192 // don't set this too high because actually
+#define MAXVIDHEIGHT 8192 // lots of tables are allocated with the MAX size.
 #define BASEVIDWIDTH 320 // NEVER CHANGE THIS! This is the original
 #define BASEVIDHEIGHT 200 // resolution of the graphics.
 
-// max res for png capture; seperated it so both MAXVID values can be lower for software performance reasons; OpenGL does not care about those anyways
-#define MAXPNGWIDTH 3840
-#define MAXPNGHEIGHT 2160
-
 // global video state
 typedef struct viddef_s
 {
 	INT32 modenum; // vidmode num indexes videomodes list
 
+	// Each screen is [vid.width*vid.height];
+	UINT8 *screens[5];
+	// screens[0] = main display window
+	// screens[1] = back screen, alternative blitting
+	// screens[2] = screenshot buffer, gif movie buffer
+	// screens[3] = fade screen start
+	// screens[4] = fade screen end, postimage tempoarary buffer
+
 	UINT8 *buffer; // invisible screens buffer
 	size_t rowbytes; // bytes per scanline of the VIDEO mode
 	INT32 width; // PIXELS per scanline
 	INT32 height;
-	union { // don't need numpages for OpenGL, so we can use it for fullscreen/windowed mode
-		INT32 numpages; // always 1, page flipping todo
-		INT32 windowed; // windowed or fullscren mode?
-	} u;
-	INT32 recalc; // if true, recalc vid-based stuff
-	UINT8 *direct; // linear frame buffer, or vga base mem.
+	boolean recalc; // if true, recalc vid-based stuff
 	INT32 dupx, dupy; // scale 1, 2, 3 value for menus & overlays
 	INT32/*fixed_t*/ fdupx, fdupy; // same as dupx, dupy, but exact value when aspect ratio isn't 320/200
-	INT32 bpp; // BYTES per pixel: 1 = 256color, 2 = highcolor
 
-	INT32 baseratio; // Used to get the correct value for lighting walls
-
-	// for Win32 version
-	DNWH WndParent; // handle of the application's window
 	UINT8 smalldupx, smalldupy; // factor for a little bit of scaling
 	UINT8 meddupx, meddupy; // factor for moderate, but not full, scaling
 #ifdef HWRENDER
-	INT32/*fixed_t*/ fsmalldupx, fsmalldupy;
-	INT32/*fixed_t*/ fmeddupx, fmeddupy;
 	INT32 glstate;
 #endif
 } viddef_t;
-#define VIDWIDTH vid.width
-#define VIDHEIGHT vid.height
 
 enum
 {
-	VID_GL_LIBRARY_LOADED     = 1,
+	VID_GL_LIBRARY_LOADED     =  1,
 	VID_GL_LIBRARY_ERROR      = -1,
 };
 
-// internal additional info for vesa modes only
-typedef struct
-{
-	INT32 vesamode; // vesa mode number plus LINEAR_MODE bit
-	void *plinearmem; // linear address of start of frame buffer
-} vesa_extra_t;
-// a video modes from the video modes list,
-// note: video mode 0 is always standard VGA320x200.
-typedef struct vmode_s
-{
-	struct vmode_s *pnext;
-	char *name;
-	UINT32 width, height;
-	UINT32 rowbytes; // bytes per scanline
-	UINT32 bytesperpixel; // 1 for 256c, 2 for highcolor
-	INT32 windowed; // if true this is a windowed mode
-	INT32 numpages;
-	vesa_extra_t *pextradata; // vesa mode extra data
-#ifdef _WIN32
-	INT32 (WINAPI *setmode)(viddef_t *lvid, struct vmode_s *pcurrentmode);
-#else
-	INT32 (*setmode)(viddef_t *lvid, struct vmode_s *pcurrentmode);
-#endif
-	INT32 misc; // misc for display driver (r_opengl.dll etc)
-} vmode_t;
-
-#define NUMSPECIALMODES  4
-extern vmode_t specialmodes[NUMSPECIALMODES];
-
-// ---------------------------------------------
-// color mode dependent drawer function pointers
-// ---------------------------------------------
-
-extern void (*wallcolfunc)(void);
-extern void (*colfunc)(void);
-extern void (*basecolfunc)(void);
-extern void (*fuzzcolfunc)(void);
-extern void (*transcolfunc)(void);
-extern void (*shadecolfunc)(void);
-extern void (*spanfunc)(void);
-extern void (*basespanfunc)(void);
-extern void (*splatfunc)(void);
-extern void (*transtransfunc)(void);
-extern void (*twosmultipatchfunc)(void);
-extern void (*twosmultipatchtransfunc)(void);
-
 // ----------------
 // screen variables
 // ----------------
 extern viddef_t vid;
 extern INT32 setmodeneeded; // mode number to set if needed, or 0
-extern double averageFPS;
 
-extern INT32 scr_bpp;
 extern UINT8 *scr_borderpatch; // patch used to fill the view borders
 
-extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_fullscreen, cv_vhseffect, cv_shittyscreen;
+extern consvar_t cv_scr_width, cv_scr_height, cv_renderview, cv_fullscreen, cv_vhseffect, cv_shittyscreen;
+extern consvar_t cv_parallelsoftware;
+extern consvar_t cv_paralleldrawmasked;
+
 extern consvar_t cv_highreshudscale;
 // wait for page flipping to end or not
 extern consvar_t cv_vidwait;
 extern consvar_t cv_timescale;
 
-// quick fix for tall/short skies, depending on bytesperpixel
-extern void (*walldrawerfunc)(void);
+extern consvar_t cv_alwaysgrabmouse;
+
+extern consvar_t cv_votebgscaling;
+
+void R_SetColumnFunc(size_t id);
+void R_SetSpanFunc(size_t id);
+boolean R_CheckColumnFunc(size_t id);
 
 // Change video mode, only at the start of a refresh.
 void SCR_SetMode(void);
diff --git a/src/sdl/MakeCYG.cfg b/src/sdl/MakeCYG.cfg
deleted file mode 100644
index b78316b00..000000000
--- a/src/sdl/MakeCYG.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# sdl/makeCYG.cfg for SRB2/Cygwin
-#
-
-#
-#Cygwin, for debugging
-
-	NOHW=1
-	NOHS=1
-
-	OPTS+=-DLINUX
-
-	i_system_o+=$(OBJDIR)/SRB2.res
-
-	# name of the exefile
-	EXENAME?=lsdlsrb2.exe
diff --git a/src/sdl/MakeNIX.cfg b/src/sdl/MakeNIX.cfg
deleted file mode 100644
index 81991793e..000000000
--- a/src/sdl/MakeNIX.cfg
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# sdl/makeNIX.cfg for SRB2/?nix
-#
-
-#Valgrind support
-ifdef VALGRIND
-VALGRIND_PKGCONFIG?=valgrind
-VALGRIND_CFLAGS?=$(shell $(PKG_CONFIG) $(VALGRIND_PKGCONFIG) --cflags)
-VALGRIND_LDFLAGS?=$(shell $(PKG_CONFIG) $(VALGRIND_PKGCONFIG) --libs)
-ZDEBUG=1
-LIBS+=$(VALGRIND_LDFLAGS)
-ifdef GCC46
-WFLAGS+=-Wno-error=unused-but-set-variable
-WFLAGS+=-Wno-unused-but-set-variable
-endif
-endif
-
-#
-#here is GNU/Linux and other
-#
-
-	OPTS=-DUNIXCOMMON
-	
-#Use -rdynamic so a backtrace log shows function names instead of addresses
-	LDFLAGS+=-rdynamic
-
-	#LDFLAGS = -L/usr/local/lib
-	LIBS=-lm
-ifdef LINUX
-	LIBS+=-lrt
-ifdef NOTERMIOS
-	OPTS+=-DNOTERMIOS
-endif
-endif
-
-ifdef LINUX64
-	OPTS+=-DLINUX64
-endif
-
-#
-#here is Solaris
-#
-ifdef SOLARIS
-	NOIPX=1
-	OPTS+=-DSOLARIS -DINADDR_NONE=INADDR_ANY -DBSD_COMP
-	OPTS+=-I/usr/local/include -I/opt/sfw/include
-	LDFLAGS+=-L/opt/sfw/lib
-	LIBS+=-lsocket -lnsl
-endif
-
-#
-#here is FreeBSD
-#
-ifdef FREEBSD
-	OPTS+=-DLINUX -DFREEBSD -I/usr/X11R6/include
-	SDL_CONFIG?=sdl11-config
-	LDFLAGS+=-L/usr/X11R6/lib
-	LIBS+=-lkvm -lexecinfo
-endif
-
-#
-#here is Mac OS X
-#
-ifdef MACOSX
-	OBJS+=$(OBJDIR)/mac_resources.o
-	OBJS+=$(OBJDIR)/mac_alert.o
-	LIBS+=-framework CoreFoundation
-endif
-
-ifndef NOHW
-	OPTS+=-I/usr/X11R6/include
-	LDFLAGS+=-L/usr/X11R6/lib
-endif
-
-	# name of the exefile
-	EXENAME?=lsdl2srb2kart
diff --git a/src/sdl/Makefile.cfg b/src/sdl/Makefile.cfg
deleted file mode 100644
index 72a94dca8..000000000
--- a/src/sdl/Makefile.cfg
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# sdl/makefile.cfg for SRB2/SDL
-#
-
-#
-#SDL...., *looks at Alam*, THIS IS A MESS!
-#
-
-ifdef UNIXCOMMON
-include sdl/MakeNIX.cfg
-endif
-
-ifdef PANDORA
-include sdl/SRB2Pandora/Makefile.cfg
-endif #ifdef PANDORA
-
-ifdef CYGWIN32
-include sdl/MakeCYG.cfg
-endif #ifdef CYGWIN32
-
-ifdef SDL_PKGCONFIG
-SDL_CFLAGS?=$(shell $(PKG_CONFIG) $(SDL_PKGCONFIG) --cflags)
-SDL_LDFLAGS?=$(shell $(PKG_CONFIG) $(SDL_PKGCONFIG) --libs)
-else
-ifdef PREFIX
-	SDL_CONFIG?=$(PREFIX)-sdl2-config
-else
-	SDL_CONFIG?=sdl2-config
-endif
-
-ifdef STATIC
-	SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags)
-	SDL_LDFLAGS?=$(shell $(SDL_CONFIG) --static-libs)
-else
-	SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags)
-	SDL_LDFLAGS?=$(shell $(SDL_CONFIG) --libs)
-endif
-endif
-
-
-	OBJS+=$(OBJDIR)/i_video.o $(OBJDIR)/dosstr.o $(OBJDIR)/endtxt.o $(OBJDIR)/hwsym_sdl.o
-
-	OPTS+=-DDIRECTFULLSCREEN -DHAVE_SDL
-
-ifndef NOHW
-	OBJS+=$(OBJDIR)/r_opengl.o $(OBJDIR)/ogl_sdl.o
-endif
-
-ifdef NOMIXER
-	i_sound_o=$(OBJDIR)/sdl_sound.o
-else
-	i_sound_o=$(OBJDIR)/mixer_sound.o
-	OPTS+=-DHAVE_MIXER
-	SDL_LDFLAGS+=-lSDL2_mixer
-endif
-
-ifndef NOTHREADS
-	OPTS+=-DHAVE_THREADS
-	OBJS+=$(OBJDIR)/i_threads.o
-endif
-
-ifdef SDL_TTF
-	OPTS+=-DHAVE_TTF
-	SDL_LDFLAGS+=-lSDL2_ttf -lfreetype -lz
-	OBJS+=$(OBJDIR)/i_ttf.o
-endif
-
-ifdef SDL_IMAGE
-	OPTS+=-DHAVE_IMAGE
-	SDL_LDFLAGS+=-lSDL2_image
-endif
-
-ifdef SDL_NET
-	OPTS+=-DHAVE_SDLNET
-	SDL_LDFLAGS+=-lSDL2_net
-endif
-
-ifdef MINGW
-ifndef NOSDLMAIN
-	SDLMAIN=1
-endif
-endif
-
-ifdef SDLMAIN
-	OPTS+=-DSDLMAIN
-else
-ifdef MINGW
-	SDL_CFLAGS+=-Umain
-	SDL_LDFLAGS+=-mconsole
-endif
-endif
-
-ifndef NOHW
-ifdef OPENAL
-ifdef MINGW
-	LIBS:=-lopenal32 $(LIBS)
-else
-	LIBS:=-lopenal $(LIBS)
-endif
-else
-ifdef MINGW
-ifdef DS3D
-	LIBS:=-ldsound -luuid $(LIBS)
-endif
-endif
-endif
-endif
-
-ifndef NOLIBBACKTRACE
-	OPTS+=-DHAVE_LIBBACKTRACE
-ifdef MINGW64
-	CPPFLAGS+=-I../libs/libbacktrace/include
-	LDFLAGS+=-L../libs/libbacktrace/lib/x86_64
-endif
-	LIBS:=-lbacktrace $(LIBS)
-endif
-
-CFLAGS+=$(SDL_CFLAGS)
-LIBS:=$(SDL_LDFLAGS) $(LIBS)
-ifdef STATIC
-	LIBS+=$(shell $(SDL_CONFIG) --static-libs)
-endif
diff --git a/src/sdl/Sourcefile b/src/sdl/Sourcefile
new file mode 100644
index 000000000..82d5ce073
--- /dev/null
+++ b/src/sdl/Sourcefile
@@ -0,0 +1,7 @@
+i_net.c
+i_system.c
+i_main.c
+i_video.c
+dosstr.c
+endtxt.c
+hwsym_sdl.c
diff --git a/src/sdl/Srb2SDL.dsp b/src/sdl/Srb2SDL.dsp
index 92821295d..47ede4126 100644
--- a/src/sdl/Srb2SDL.dsp
+++ b/src/sdl/Srb2SDL.dsp
@@ -45,7 +45,7 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "SDLMAIN" /D "NO_STDIO_REDIRECT" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HW3SOUND" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /c
+# ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "SDLMAIN" /D "NO_STDIO_REDIRECT" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 # SUBTRACT RSC /x
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /W4 /WX /Gm /GX /ZI /Od /Op /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HW3SOUND" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GZ /c
+# ADD CPP /nologo /G6 /W4 /WX /Gm /GX /ZI /Od /Op /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -536,18 +536,6 @@ SOURCE=..\y_inter.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\hardware\hw3dsdrv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\hardware\hw3sound.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\hardware\hw3sound.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\hardware\hw_bsp.c
 # End Source File
 # Begin Source File
@@ -572,7 +560,7 @@ SOURCE=..\hardware\hw_draw.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\hardware\hw_drv.h
+SOURCE=..\hardware\hw_gl.h
 # End Source File
 # Begin Source File
 
@@ -580,14 +568,6 @@ SOURCE=..\hardware\hw_glob.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\hardware\hw_light.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\hardware\hw_light.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\hardware\hw_main.c
 # End Source File
 # Begin Source File
@@ -604,11 +584,6 @@ SOURCE=..\hardware\hw_md2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\hardware\hws_data.h
-# End Source File
-# End Group
-# Begin Group "I_Interface"
-
 # PROP Default_Filter ""
 # Begin Source File
 
@@ -892,11 +867,6 @@ SOURCE=..\r_draw.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\r_draw16.c
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
-
 SOURCE=..\r_draw8.c
 # PROP Exclude_From_Build 1
 # End Source File
@@ -922,6 +892,14 @@ SOURCE=..\r_patch.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\r_patchrotation.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\r_patchrotation.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\r_plane.c
 # End Source File
 # Begin Source File
diff --git a/src/sdl/Srb2SDL.dsw b/src/sdl/Srb2SDL.dsw
index 4f8f7bdce..888d2fcf3 100644
--- a/src/sdl/Srb2SDL.dsw
+++ b/src/sdl/Srb2SDL.dsw
@@ -36,18 +36,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "s_openal"=..\hardware\s_openal\s_openal.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "zlib"=..\..\libs\zlib\projects\visualc6\zlib.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/src/sdl/Srb2SDL.props b/src/sdl/Srb2SDL.props
index 75839a5b2..f02b9b35e 100644
--- a/src/sdl/Srb2SDL.props
+++ b/src/sdl/Srb2SDL.props
@@ -6,10 +6,10 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <!-- x86/x64 defines: has specific libraries that ARM does not -->
-      <PreprocessorDefinitions Condition="'$(Platform)' == 'Win32' OR '$(Platform)' == 'x64'">HAVE_ZLIB;HAVE_LIBGME;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)' == 'Win32' OR '$(Platform)' == 'x64'">HAVE_ZLIB;HAVE_LIBGME;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!-- ARM defines -->
-      <PreprocessorDefinitions Condition="'$(Platform)' != 'Win32' AND '$(Platform)' != 'x64'">USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)' != 'Win32' AND '$(Platform)' != 'x64'">USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/sdl/endtxt.h b/src/sdl/endtxt.h
index 41f8e51ad..5691312b4 100644
--- a/src/sdl/endtxt.h
+++ b/src/sdl/endtxt.h
@@ -19,6 +19,14 @@
 #ifndef __ENDTXT__
 #define __ENDTXT__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void ShowEndTxt (void);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/sdl/hwsym_sdl.c b/src/sdl/hwsym_sdl.c
index 23526a98f..4b1988c6f 100644
--- a/src/sdl/hwsym_sdl.c
+++ b/src/sdl/hwsym_sdl.c
@@ -43,18 +43,6 @@
 
 #define  _CREATE_DLL_  // necessary for Unix AND Windows
 
-#ifdef HWRENDER
-#include "../hardware/hw_drv.h"
-#include "ogl_sdl.h"
-#ifdef STATIC_OPENGL
-#include "../hardware/r_opengl/r_opengl.h"
-#endif
-#endif
-
-#ifdef HW3SOUND
-#include "../hardware/hw3dsdrv.h"
-#endif
-
 #define GETFUNC(func) \
 	else if (0 == strcmp(#func, funcName)) \
 		funcPointer = &func \
@@ -73,84 +61,17 @@
 void *hwSym(const char *funcName,void *handle)
 {
 	void *funcPointer = NULL;
-#ifdef HWRENDER
-	if (0 == strcmp("SetTexturePalette", funcName))
-		funcPointer = &OglSdlSetPalette;
-
-	GETFUNC(Init);
-	GETFUNC(SetupGLInfo);
-	GETFUNC(Draw2DLine);
-	GETFUNC(DrawPolygon);
-	GETFUNC(DrawIndexedTriangles);
-	GETFUNC(SetBlend);
-	GETFUNC(ClearBuffer);
-	GETFUNC(SetTexture);
-	GETFUNC(UpdateTexture);
-	GETFUNC(DeleteTexture);
-	GETFUNC(ReadScreenTexture);
-	GETFUNC(GClipRect);
-	GETFUNC(ClearMipMapCache);
-	GETFUNC(SetSpecialState);
-	GETFUNC(GetTextureUsed);
-	GETFUNC(DrawModel);
-	GETFUNC(CreateModelVBOs);
-	GETFUNC(SetTransform);
-	GETFUNC(PostImgRedraw);
-	GETFUNC(FlushScreenTextures);
-	GETFUNC(DoScreenWipe);
-	GETFUNC(DrawScreenTexture);
-	GETFUNC(MakeScreenTexture);
-	GETFUNC(RenderVhsEffect);
-	GETFUNC(DrawScreenFinalTexture);
-	
-	GETFUNC(RenderSkyDome);
-
-	GETFUNC(InitShaders);
-	GETFUNC(LoadShader);
-	GETFUNC(CompileShader);
-	GETFUNC(SetShader);
-	GETFUNC(UnSetShader);
-
-	GETFUNC(SetShaderInfo);
-	
-	GETFUNC(SetPaletteLookup);
-	GETFUNC(CreateLightTable);
-	GETFUNC(ClearLightTables);
-	GETFUNC(SetScreenPalette);
-
-#else //HWRENDER
-	if (0 == strcmp("FinishUpdate", funcName))
-		return funcPointer; //&FinishUpdate;
-#endif //!HWRENDER
-#ifdef STATIC3DS
-	GETFUNC(Startup);
-	GETFUNC(AddSfx);
-	GETFUNC(AddSource);
-	GETFUNC(StartSource);
-	GETFUNC(StopSource);
-	GETFUNC(GetHW3DSVersion);
-	GETFUNC(BeginFrameUpdate);
-	GETFUNC(EndFrameUpdate);
-	GETFUNC(IsPlaying);
-	GETFUNC(UpdateListener);
-	GETFUNC(UpdateSourceParms);
-	GETFUNC(SetGlobalSfxVolume);
-	GETFUNC(SetCone);
-	GETFUNC(Update3DSource);
-	GETFUNC(ReloadSource);
-	GETFUNC(KillSource);
-	GETFUNC(Shutdown);
-	GETFUNC(GetHW3DSTitle);
-#endif
+	if (0) ;
 #ifdef NOLOADSO
 	else
 		funcPointer = handle;
 #else
 	else if (handle)
-		funcPointer = SDL_LoadFunction(handle,funcName);
+		funcPointer = SDL_LoadFunction(handle, funcName);
 #endif
 	if (!funcPointer)
 		I_OutputMsg("hwSym for %s: %s\n", funcName, SDL_GetError());
+
 	return funcPointer;
 }
 
@@ -159,8 +80,6 @@ void *hwSym(const char *funcName,void *handle)
 	\param	hwfile	Open a handle to the SO
 
 	\return	Handle to SO
-
-
 */
 
 void *hwOpen(const char *hwfile)
@@ -181,8 +100,6 @@ void *hwOpen(const char *hwfile)
 	\param	handle	Close the handle of the SO
 
 	\return	void
-
-
 */
 
 void hwClose(void *handle)
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 1d2e2395f..9c14f7ed6 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -20,12 +20,19 @@
 #include "../doomdef.h"
 #include "../m_argv.h"
 #include "../d_main.h"
+#include "../m_misc.h" /* path shit */
 #include "../i_system.h"
 
-#ifdef __GNUC__
+#if defined (__GNUC__) || defined (__unix__)
 #include <unistd.h>
 #endif
 
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+#include <errno.h>
+#endif
+
+#include "time.h" // For log timestamps
+
 #ifdef HAVE_SDL
 
 #ifdef HAVE_TTF
@@ -89,6 +96,93 @@ ChDirToExe (void)
 }
 #endif
 
+#ifdef LOGMESSAGES
+static void InitLogging(void)
+{
+	const char *logdir = NULL;
+	time_t my_time;
+	struct tm * timeinfo;
+	const char *format;
+	const char *reldir;
+	int left;
+	boolean fileabs;
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+	const char *link;
+#endif
+
+	logdir = D_Home();
+
+	my_time = time(NULL);
+	timeinfo = localtime(&my_time);
+
+	if (M_CheckParm("-logfile") && M_IsNextParm())
+	{
+		format = M_GetNextParm();
+		fileabs = M_IsPathAbsolute(format);
+	}
+	else
+	{
+		format = "log-%Y-%m-%d_%H-%M-%S.txt";
+		fileabs = false;
+	}
+
+	if (fileabs)
+	{
+		strftime(logfilename, sizeof logfilename, format, timeinfo);
+	}
+	else
+	{
+		if (M_CheckParm("-logdir") && M_IsNextParm())
+			reldir = M_GetNextParm();
+		else
+			reldir = "logs";
+
+		if (M_IsPathAbsolute(reldir))
+		{
+			left = snprintf(logfilename, sizeof logfilename,
+					"%s"PATHSEP, reldir);
+		}
+		else
+#ifdef DEFAULTDIR
+		if (logdir)
+		{
+			left = snprintf(logfilename, sizeof logfilename,
+					"%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir);
+		}
+		else
+#endif/*DEFAULTDIR*/
+		{
+			left = snprintf(logfilename, sizeof logfilename,
+					"."PATHSEP"%s"PATHSEP, reldir);
+		}
+
+		strftime(&logfilename[left], sizeof logfilename - left,
+				format, timeinfo);
+	}
+
+	M_MkdirEachUntil(logfilename,
+			M_PathParts(logdir) - 1,
+			M_PathParts(logfilename) - 1, 0755);
+
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+	logstream = fopen(logfilename, "w");
+#ifdef DEFAULTDIR
+	if (logdir)
+		link = va("%s/"DEFAULTDIR"/latest-log.txt", logdir);
+	else
+#endif/*DEFAULTDIR*/
+		link = "latest-log.txt";
+	unlink(link);
+	if (symlink(logfilename, link) == -1)
+	{
+		I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno));
+	}
+#else/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/
+	logstream = fopen("latest-log.txt", "wt+");
+#endif/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/
+}
+#endif
+
 
 /**	\brief	The main function
 
@@ -107,7 +201,6 @@ int SDL_main(int argc, char **argv)
 int main(int argc, char **argv)
 #endif
 {
-	const char *logdir = NULL;
 	myargc = argc;
 	myargv = argv; /// \todo pull out path to exe from this string
 
@@ -136,36 +229,18 @@ int main(int argc, char **argv)
 	ChDirToExe();
 #endif
 
-	logdir = D_Home();
-
 #ifdef LOGMESSAGES
-#ifdef DEFAULTDIR
-	if (logdir)
-		strcpy(logfilename, va("%s/"DEFAULTDIR"/log.txt",logdir));
-	else
-#endif
-		strcpy(logfilename, "./log.txt");
-
-	logstream = fopen(logfilename, "wt");
-#endif
+	if (!M_CheckParm("-nolog"))
+		InitLogging();
+#endif/*LOGMESSAGES*/
 
 	//I_OutputMsg("I_StartupSystem() ...\n");
 	I_StartupSystem();
 #if defined (_WIN32)
 	{
-#if 0 // just load the DLL
-		p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsDebuggerPresent");
-		if ((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
-#ifdef BUGTRAP
-			&& !InitBugTrap()
-#endif
-			)
-#endif
-		{
 #ifdef DRMINGW
-			ExcHndlInit();
+		ExcHndlInit();
 #endif
-		}
 	}
 #endif
 
diff --git a/src/sdl/i_net.c b/src/sdl/i_net.c
index ee4a34c13..9fcc1fd38 100644
--- a/src/sdl/i_net.c
+++ b/src/sdl/i_net.c
@@ -436,6 +436,7 @@ boolean I_InitNetwork(void)
 		I_Error("-net not supported, use -server and -connect\n"
 			"see docs for more\n");
 	}
+
 	return false;
 #endif
 }
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.cpp
similarity index 51%
rename from src/sdl/i_system.c
rename to src/sdl/i_system.cpp
index a8af0bd54..b2bd5de25 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.cpp
@@ -42,11 +42,19 @@ typedef UINT (WINAPI *p_timeEndPeriod) (UINT);
 typedef HANDLE (WINAPI *p_OpenFileMappingA) (DWORD, BOOL, LPCSTR);
 typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 
+<<<<<<< HEAD:src/sdl/i_system.c
 // This is for RtlGenRandom.
 #define SystemFunction036 NTAPI SystemFunction036
 #include <ntsecapi.h>
 #undef SystemFunction036
 #endif
+=======
+// A little more than the minimum sleep duration on Windows.
+// May be incorrect for other platforms, but we don't currently have a way to
+// query the scheduler granularity. SDL will do what's needed to make this as
+// low as possible though.
+#define MIN_SLEEP_DURATION_MS 2.1
+>>>>>>> Saturn-Next:src/sdl/i_system.cpp
 
 #include <stdio.h>
 #include <time.h>
@@ -108,6 +116,10 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 #endif
 #endif
 
+#if defined(UNIXCOMMON)
+#include <poll.h>
+#endif
+
 #if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__))
 #include <errno.h>
 #include <sys/wait.h>
@@ -174,7 +186,9 @@ static char returnWadPath[256];
 #include "../screen.h" //vid.WndParent
 #include "../d_net.h"
 #include "../g_game.h"
+#include "../g_demo.h"
 #include "../filesrch.h"
+#include "../z_zone.h" // Z_Free
 #include "endtxt.h"
 #include "sdlmain.h"
 
@@ -185,6 +199,8 @@ static char returnWadPath[256];
 #include "../r_main.h" // Frame interpolation/uncapped
 #include "../r_fps.h"
 
+#include "../s_sound.h"
+
 #ifdef MAC_ALERT
 #include "macosx/mac_alert.h"
 #endif
@@ -197,6 +213,7 @@ static char returnWadPath[256];
 #include "../byteptr.h"
 #endif
 
+<<<<<<< HEAD:src/sdl/i_system.c
 // A little more than the minimum sleep duration on Windows.
 // May be incorrect for other platforms, but we don't currently have a way to
 // query the scheduler granularity. SDL will do what's needed to make this as
@@ -207,16 +224,27 @@ static char returnWadPath[256];
 #define MIN_SLEEP_DURATION_MS 2.1
 #endif
 
+=======
+#ifdef HAVE_THREADS
+#include "../core/thread_pool.h"
+static std::thread::id g_main_thread_id;
+#endif
+
+INT32 numcontrollers = 0;
+
+>>>>>>> Saturn-Next:src/sdl/i_system.cpp
 #ifdef HAVE_LIBBACKTRACE
 #include <backtrace.h>
 // TODO - move this to some header file instead
 extern struct backtrace_state *bt_state;
 
+typedef enum {
+	BTCRASH_SIGNAL,
+	BTCRASH_ERRORMSG,
+} bt_crash_type_t;
+
 typedef struct bt_crash_reason_s {
-	enum {
-		BTCRASH_SIGNAL,
-		BTCRASH_ERRORMSG,
-	} type;
+	bt_crash_type_t type;
 
 	union {
 		INT32 signal;
@@ -348,10 +376,20 @@ static void write_backtrace(bt_crash_reason_t reason)
 	fprintf(out, "Program name: %s %s\n", SRB2APPLICATION, VERSIONSTRING);
 
 	if (compdate && comptime && comprevision && compbranch)
-	fprintf(out, "Compiled: %s %s, commit %s, branch %s\n", compdate, comptime, comprevision, compbranch);
+		fprintf(out, "Compiled: %s %s, commit %s, branch %s\n", compdate, comptime, comprevision, compbranch);
 
 	if (gamestate == GS_LEVEL)
-		fprintf(out, "Game map: %s\n", G_BuildMapName(gamemap));
+	{
+		char *title = G_BuildMapTitle(gamemap);
+
+		if (title)
+		{
+			fprintf(out, "Game map: %s (%s)\n", title, G_BuildMapName(gamemap));
+			Z_Free(title);
+		}
+		else
+			fprintf(out, "Game map: %s\n", G_BuildMapName(gamemap));
+	}
 
 	fprintf(out, "Time of crash: %s\n", asctime(timeinfo));
 
@@ -408,48 +446,19 @@ static void JoyReset(SDLJoyInfo_t *JoySet)
 	//JoySet->scale
 }
 
-/**	\brief First joystick up and running
+/**	\brief joystick up and running
 */
-static INT32 joystick_started  = 0;
+static INT32 joystick_started[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0};
 
-/**	\brief SDL info about joystick 1
+/**	\brief SDL info about joystick
 */
-SDLJoyInfo_t JoyInfo;
-
-
-/**	\brief Second joystick up and running
-*/
-static INT32 joystick2_started = 0;
-
-/**	\brief SDL info about joystick 2
-*/
-SDLJoyInfo_t JoyInfo2;
-
-/**	\brief Third joystick up and running
-*/
-static INT32 joystick3_started = 0;
-
-/**	\brief SDL info about joystick 3
-*/
-SDLJoyInfo_t JoyInfo3;
-
-/**	\brief Fourth joystick up and running
-*/
-static INT32 joystick4_started = 0;
-
-/**	\brief SDL info about joystick 4
-*/
-SDLJoyInfo_t JoyInfo4;
-
-#ifdef HAVE_TERMIOS
-static INT32 fdmouse2 = -1;
-static INT32 mouse2_started = 0;
-#endif
+SDLJoyInfo_t JoyInfo[MAXSPLITSCREENPLAYERS];
 
 SDL_bool consolevent = SDL_FALSE;
 SDL_bool framebuffer = SDL_FALSE;
 
 UINT8 keyboard_started = false;
+boolean g_in_exiting_signal_handler = false;
 
 static void I_ReportSignal(int num, int coredumped)
 {
@@ -516,6 +525,18 @@ static void I_ReportSignal(int num, int coredumped)
 #ifndef NEWSIGNALHANDLER
 FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
 {
+#ifdef HAVE_THREADS
+	if (g_main_thread_id != std::this_thread::get_id())
+	{
+		// Do not attempt any sort of recovery if this signal triggers off the main thread
+		signal(num, SIG_DFL);
+		raise(num);
+		exit(-2);
+	}
+#endif
+
+	g_in_exiting_signal_handler = true;
+
 	D_QuitNetGame(); // Fix server freezes
 
 #ifdef HAVE_LIBBACKTRACE
@@ -532,6 +553,16 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
 
 FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
 {
+#ifdef HAVE_THREADS
+	if (g_main_thread_id != std::this_thread::get_id())
+	{
+		// Do not attempt any sort of recovery if this signal triggers off the main thread
+		signal(num, SIG_DFL);
+		raise(num);
+		exit(-2);
+	}
+#endif
+
 	signal(num, SIG_DFL); //default signal action
 	raise(num);
 	I_Quit();
@@ -549,10 +580,9 @@ typedef struct
 
 feild_t tty_con;
 
-// when printing general stuff to stdout stderr (Sys_Printf)
-//   we need to disable the tty console stuff
-// this increments so we can recursively disable
-static INT32 ttycon_hide = 0;
+// lock to prevent clearing partial lines, since not everything
+// printed ends on a newline.
+static boolean ttycon_ateol = true;
 // some key codes that the terminal may be using
 // TTimo NOTE: I'm not sure how relevant this is
 static INT32 tty_erase;
@@ -580,63 +610,31 @@ static inline void tty_FlushIn(void)
 // TTimo NOTE: it seems on some terminals just sending '\b' is not enough
 //   so for now, in any case we send "\b \b" .. yeah well ..
 //   (there may be a way to find out if '\b' alone would work though)
+// Hanicef NOTE: using \b this way is unreliable because of terminal state,
+//   it's better to use \r to reset the cursor to the beginning of the
+//   line and clear from there.
 static void tty_Back(void)
 {
-	char key;
-	ssize_t d;
-	key = '\b';
-	d = write(STDOUT_FILENO, &key, 1);
-	key = ' ';
-	d = write(STDOUT_FILENO, &key, 1);
-	key = '\b';
-	d = write(STDOUT_FILENO, &key, 1);
-	(void)d;
+	write(STDOUT_FILENO, "\r", 1);
+	if (tty_con.cursor>0)
+	{
+		write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor);
+	}
+	write(STDOUT_FILENO, " \b", 2);
 }
 
 static void tty_Clear(void)
 {
 	size_t i;
+	write(STDOUT_FILENO, "\r", 1);
 	if (tty_con.cursor>0)
 	{
 		for (i=0; i<tty_con.cursor; i++)
 		{
-			tty_Back();
+			write(STDOUT_FILENO, " ", 1);
 		}
+		write(STDOUT_FILENO, "\r", 1);
 	}
-
-}
-
-// clear the display of the line currently edited
-// bring cursor back to beginning of line
-static inline void tty_Hide(void)
-{
-	//I_Assert(consolevent);
-	if (ttycon_hide)
-	{
-		ttycon_hide++;
-		return;
-	}
-	tty_Clear();
-	ttycon_hide++;
-}
-
-// show the current line
-// FIXME TTimo need to position the cursor if needed??
-static inline void tty_Show(void)
-{
-	size_t i;
-	ssize_t d;
-	//I_Assert(consolevent);
-	I_Assert(ttycon_hide>0);
-	ttycon_hide--;
-	if (ttycon_hide == 0 && tty_con.cursor)
-	{
-		for (i=0; i<tty_con.cursor; i++)
-		{
-			d = write(STDOUT_FILENO, tty_con.buffer+i, 1);
-		}
-	}
-	(void)d;
 }
 
 // never exit without calling this, or your terminal will be left in a pretty bad state
@@ -660,8 +658,8 @@ static void I_StartupConsole(void)
 	signal(SIGTTIN, SIG_IGN);
 	signal(SIGTTOU, SIG_IGN);
 
-	consolevent = !M_CheckParm("-noconsole");
-	framebuffer = M_CheckParm("-framebuffer");
+	consolevent = static_cast<SDL_bool>(!M_CheckParm("-noconsole"));
+	framebuffer = static_cast<SDL_bool>( M_CheckParm("-framebuffer"));
 
 	if (framebuffer)
 		consolevent = SDL_FALSE;
@@ -701,52 +699,68 @@ static void I_StartupConsole(void)
 void I_GetConsoleEvents(void)
 {
 	// we use this when sending back commands
-	event_t ev = {0,0,0,0};
+	event_t ev = {};
 	char key = 0;
-	ssize_t d;
+
+	struct pollfd pfd =
+	{
+		.fd = STDIN_FILENO,
+		.events = POLLIN,
+		.revents = 0,
+	};
 
 	if (!consolevent)
 		return;
 
-	ev.type = ev_console;
-	ev.data1 = 0;
-	if (read(STDIN_FILENO, &key, 1) == -1 || !key)
-		return;
+	for (;;)
+	{
+		if (poll(&pfd, 1, 0) < 1 || !(pfd.revents & POLLIN))
+			return;
 
-	// we have something
-	// backspace?
-	// NOTE TTimo testing a lot of values .. seems it's the only way to get it to work everywhere
-	if ((key == tty_erase) || (key == 127) || (key == 8))
-	{
-		if (tty_con.cursor > 0)
+		ev.type = ev_console;
+		ev.data1 = 0;
+		if (read(STDIN_FILENO, &key, 1) == -1 || !key)
+			return;
+
+		// we have something
+		// backspace?
+		// NOTE TTimo testing a lot of values .. seems it's the only way to get it to work everywhere
+		if ((key == tty_erase) || (key == 127) || (key == 8))
 		{
-			tty_con.cursor--;
-			tty_con.buffer[tty_con.cursor] = '\0';
-			tty_Back();
+			if (tty_con.cursor > 0)
+			{
+				tty_con.cursor--;
+				tty_con.buffer[tty_con.cursor] = '\0';
+				tty_Back();
+			}
+			ev.data1 = KEY_BACKSPACE;
 		}
-		ev.data1 = KEY_BACKSPACE;
-	}
-	else if (key < ' ') // check if this is a control char
-	{
-		if (key == '\n')
+		else if (key < ' ') // check if this is a control char
 		{
-			tty_Clear();
-			tty_con.cursor = 0;
-			ev.data1 = KEY_ENTER;
+			if (key == '\n')
+			{
+				tty_Clear();
+				tty_con.cursor = 0;
+				ev.data1 = KEY_ENTER;
+			}
+			else if (key == 0x4) // ^D, aka EOF
+			{
+				// shut down, most unix programs behave this way
+				I_Quit();
+			}
+			else continue;
 		}
-		else return;
+		else if (tty_con.cursor < sizeof(tty_con.buffer))
+		{
+			// push regular character
+			ev.data1 = tty_con.buffer[tty_con.cursor] = key;
+			tty_con.cursor++;
+			// print the current line (this is differential)
+			write(STDOUT_FILENO, &key, 1);
+		}
+		if (ev.data1) D_PostEvent(&ev);
+		//tty_FlushIn();
 	}
-	else if (tty_con.cursor < sizeof (tty_con.buffer))
-	{
-		// push regular character
-		ev.data1 = tty_con.buffer[tty_con.cursor] = key;
-		tty_con.cursor++;
-		// print the current line (this is differential)
-		d = write(STDOUT_FILENO, &key, 1);
-	}
-	if (ev.data1) D_PostEvent(&ev);
-	//tty_FlushIn();
-	(void)d;
 }
 
 #elif defined (_WIN32)
@@ -782,7 +796,7 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co)
 				break;
 			case VK_RETURN:
 				entering_con_command = false;
-				// Fall through.
+				/* FALLTHRU */
 			default:
 				//event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char
 				event.data1 = evt.uChar.AsciiChar;
@@ -893,6 +907,10 @@ static inline void I_ShutdownConsole(void){}
 //
 static void I_RegisterSignals (void)
 {
+#ifdef HAVE_THREADS
+	g_main_thread_id = std::this_thread::get_id();
+#endif
+
 #ifdef SIGINT
 	signal(SIGINT , quit_handler);
 #endif
@@ -916,7 +934,6 @@ static void I_RegisterSignals (void)
 #ifdef NEWSIGNALHANDLER
 static void signal_handler_child(INT32 num)
 {
-
 #ifdef HAVE_LIBBACKTRACE
 	write_backtrace(BT_CRASH_REASON_SIGNAL(num));
 #endif
@@ -942,9 +959,16 @@ static void I_RegisterChildSignals(void)
 void I_OutputMsg(const char *fmt, ...)
 {
 	size_t len;
-	char txt[8192];
+	char *txt;
 	va_list  argptr;
 
+	va_start(argptr,fmt);
+	len = vsnprintf(NULL, 0, fmt, argptr);
+	va_end(argptr);
+	if (len == 0)
+		return;
+
+	txt = static_cast<char*>(malloc(len+1));
 	va_start(argptr,fmt);
 	vsprintf(txt, fmt, argptr);
 	va_end(argptr);
@@ -978,7 +1002,10 @@ void I_OutputMsg(const char *fmt, ...)
 		DWORD bytesWritten;
 
 		if (co == INVALID_HANDLE_VALUE)
+		{
+			free(txt);
 			return;
+		}
 
 		if (GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &bytesWritten))
 		{
@@ -994,16 +1021,21 @@ void I_OutputMsg(const char *fmt, ...)
 			if (oldLength > 0)
 			{
 				LPVOID blank = malloc(oldLength);
-				if (!blank) return;
+				if (!blank)
+				{
+					free(txt);
+					return;
+				}
 				memset(blank, ' ', oldLength); // Blank out.
 				oldLines = malloc(oldLength*sizeof(TCHAR));
 				if (!oldLines)
 				{
+					free(txt);
 					free(blank);
 					return;
 				}
 
-				ReadConsoleOutputCharacter(co, oldLines, oldLength, coordNextWrite, &bytesWritten);
+				ReadConsoleOutputCharacter(co, (LPSTR)oldLines, oldLength, coordNextWrite, &bytesWritten);
 
 				// Move to where we what to print - which is where we would've been,
 				// had console input not been in the way,
@@ -1033,18 +1065,20 @@ void I_OutputMsg(const char *fmt, ...)
 	}
 #else
 #ifdef HAVE_TERMIOS
-	if (consolevent)
+	if (consolevent && ttycon_ateol)
 	{
-		tty_Hide();
+		tty_Clear();
+		ttycon_ateol = false;
 	}
 #endif
 
 	if (!framebuffer)
 		fprintf(stderr, "%s", txt);
 #ifdef HAVE_TERMIOS
-	if (consolevent)
+	if (consolevent && txt[len-1] == '\n')
 	{
-		tty_Show();
+		write(STDOUT_FILENO, tty_con.buffer, tty_con.cursor);
+		ttycon_ateol = true;
 	}
 #endif
 
@@ -1053,6 +1087,7 @@ void I_OutputMsg(const char *fmt, ...)
 		fflush(stderr);
 
 #endif
+	free(txt);
 }
 
 //
@@ -1083,26 +1118,26 @@ INT32 I_GetKey (void)
 //
 void I_JoyScale(void)
 {
-	Joystick.bGamepadStyle = cv_joyscale.value==0;
-	JoyInfo.scale = Joystick.bGamepadStyle?1:cv_joyscale.value;
+	Joystick[0].bGamepadStyle = cv_joyscale[0].value==0;
+	JoyInfo[0].scale = Joystick[0].bGamepadStyle?1:cv_joyscale[0].value;
 }
 
 void I_JoyScale2(void)
 {
-	Joystick2.bGamepadStyle = cv_joyscale2.value==0;
-	JoyInfo2.scale = Joystick2.bGamepadStyle?1:cv_joyscale2.value;
+	Joystick[1].bGamepadStyle = cv_joyscale[1].value==0;
+	JoyInfo[1].scale = Joystick[1].bGamepadStyle?1:cv_joyscale[1].value;
 }
 
 void I_JoyScale3(void)
 {
-	Joystick3.bGamepadStyle = cv_joyscale3.value==0;
-	JoyInfo3.scale = Joystick3.bGamepadStyle?1:cv_joyscale3.value;
+	Joystick[2].bGamepadStyle = cv_joyscale[2].value==0;
+	JoyInfo[2].scale = Joystick[2].bGamepadStyle?1:cv_joyscale[2].value;
 }
 
 void I_JoyScale4(void)
 {
-	Joystick4.bGamepadStyle = cv_joyscale4.value==0;
-	JoyInfo4.scale = Joystick4.bGamepadStyle?1:cv_joyscale4.value;
+	Joystick[3].bGamepadStyle = cv_joyscale[3].value==0;
+	JoyInfo[3].scale = Joystick[3].bGamepadStyle?1:cv_joyscale[3].value;
 }
 
 // Cheat to get the device index for a joystick handle
@@ -1111,7 +1146,7 @@ INT32 I_GetJoystickDeviceIndex(SDL_GameController *dev)
 	SDL_Joystick *joystick = NULL;
 
 	joystick = SDL_GameControllerGetJoystick(dev);
-	
+
 	if (joystick)
 	{
 		return SDL_JoystickInstanceID(joystick);
@@ -1120,237 +1155,88 @@ INT32 I_GetJoystickDeviceIndex(SDL_GameController *dev)
 	return -1;
 }
 
-// Misleading function: updates device indices for all players BUT the one specified.
-// Necessary for SDL_JOYDEVICEADDED events
-void I_UpdateJoystickDeviceIndices(INT32 player)
+void I_UpdateJoystickDeviceIndex(UINT8 player)
 {
-	if (player != 1) // This is a fucking mess.
+	///////////////////////////////////////////////
+	// update this joystick's device index (wow) //
+	///////////////////////////////////////////////
+	if (JoyInfo[player].dev)
 	{
-		//////////////////////////////
-		// update joystick 1's device index
-		//////////////////////////////
-
-		if (JoyInfo.dev)
-			cv_usejoystick.value = I_GetJoystickDeviceIndex(JoyInfo.dev) + 1;
-		// is cv_usejoystick used?
-		else if (// don't check JoyInfo or cv_usejoystick; we're currently operating on those
-				atoi(cv_usejoystick.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick2.value
-				&& atoi(cv_usejoystick.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick3.value
-				&& atoi(cv_usejoystick.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick4.value)
-			cv_usejoystick.value = atoi(cv_usejoystick.string);
-		// is cv_usejoystick2 used?
-		else if ( // don't check JoyInfo or cv_usejoystick; we're currently operating on those
-				atoi(cv_usejoystick2.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick2.value
-				&& atoi(cv_usejoystick2.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick3.value
-				&& atoi(cv_usejoystick2.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick4.value)
-			cv_usejoystick.value = atoi(cv_usejoystick2.string);
-		// is cv_usejoystick3 used?
-		else if (// don't check JoyInfo or cv_usejoystick; we're currently operating on those
-				atoi(cv_usejoystick3.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick2.value
-				&& atoi(cv_usejoystick3.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick3.value
-				&& atoi(cv_usejoystick3.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick4.value)
-			cv_usejoystick.value = atoi(cv_usejoystick3.string);
-		// is cv_usejoystick4 used?
-		else if (// don't check JoyInfo or cv_usejoystick; we're currently operating on those
-				atoi(cv_usejoystick4.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick2.value
-				&& atoi(cv_usejoystick4.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick3.value
-				&& atoi(cv_usejoystick4.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick4.value)
-			cv_usejoystick.value = atoi(cv_usejoystick4.string);
-		else // we tried...
-			cv_usejoystick.value = 0;
+		cv_usejoystick[player].value = I_GetJoystickDeviceIndex(JoyInfo[player].dev) + 1;
 	}
-
-	if (player != 2)
+	else
 	{
-		//////////////////////////////
-		// update joystick 2's device index
-		//////////////////////////////
-
-		if (JoyInfo2.dev)
-			cv_usejoystick2.value = I_GetJoystickDeviceIndex(JoyInfo2.dev) + 1;
-		// is cv_usejoystick2 used?
-		else if (atoi(cv_usejoystick2.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick.value
-				// don't check JoyInfo2 or cv_usejoystick2; we're currently operating on those
-				&& atoi(cv_usejoystick2.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick3.value
-				&& atoi(cv_usejoystick2.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick4.value)
-			cv_usejoystick2.value = atoi(cv_usejoystick2.string);
-		// is cv_usejoystick used?
-		else if (atoi(cv_usejoystick.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick.value
-				// don't check JoyInfo2 or cv_usejoystick2; we're currently operating on those
-				&& atoi(cv_usejoystick.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick3.value
-				&& atoi(cv_usejoystick.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick4.value)
-			cv_usejoystick2.value = atoi(cv_usejoystick.string);
-		// is cv_usejoystick3 used?
-		else if (atoi(cv_usejoystick3.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick.value
-				// don't check JoyInfo2 or cv_usejoystick2; we're currently operating on those
-				&& atoi(cv_usejoystick3.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick3.value
-				&& atoi(cv_usejoystick3.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick4.value)
-			cv_usejoystick2.value = atoi(cv_usejoystick3.string);
-		// is cv_usejoystick4 used?
-		else if (atoi(cv_usejoystick4.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick.value
-				// don't check JoyInfo2 or cv_usejoystick2; we're currently operating on those
-				&& atoi(cv_usejoystick4.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick3.value
-				&& atoi(cv_usejoystick4.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick4.value)
-			cv_usejoystick2.value = atoi(cv_usejoystick4.string);
-		else // we tried...
-			cv_usejoystick2.value = 0;
-	}
-
-	if (player != 3)
-	{
-		//////////////////////////////
-		// update joystick 3's device index
-		//////////////////////////////
-
-		if (JoyInfo3.dev)
-			cv_usejoystick3.value = I_GetJoystickDeviceIndex(JoyInfo3.dev) + 1;
-		// is cv_usejoystick3 used?
-		else if (atoi(cv_usejoystick3.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick.value
-				&& atoi(cv_usejoystick3.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick2.value
-				// don't check JoyInfo3 or cv_usejoystick3; we're currently operating on those
-				&& atoi(cv_usejoystick3.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick4.value)
-			cv_usejoystick3.value = atoi(cv_usejoystick3.string);
-		// is cv_usejoystick used?
-		else if (atoi(cv_usejoystick.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick.value
-				&& atoi(cv_usejoystick.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick2.value
-				// don't check JoyInfo3 or cv_usejoystick3; we're currently operating on those
-				&& atoi(cv_usejoystick.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick4.value)
-			cv_usejoystick3.value = atoi(cv_usejoystick.string);
-		// is cv_usejoystick2 used?
-		else if (atoi(cv_usejoystick2.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick.value
-				&& atoi(cv_usejoystick2.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick2.value
-				// don't check JoyInfo3 or cv_usejoystick3; we're currently operating on those
-				&& atoi(cv_usejoystick2.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick4.value)
-			cv_usejoystick3.value = atoi(cv_usejoystick2.string);
-		// is cv_usejoystick4 used?
-		else if (atoi(cv_usejoystick4.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick.value
-				&& atoi(cv_usejoystick4.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick2.value
-				// don't check JoyInfo3 or cv_usejoystick3; we're currently operating on those
-				&& atoi(cv_usejoystick4.string) != JoyInfo4.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick4.value)
-			cv_usejoystick3.value = atoi(cv_usejoystick4.string);
-		else // we tried...
-			cv_usejoystick3.value = 0;
-	}
-
-	if (player != 4)
-	{
-		//////////////////////////////
-		// update joystick 4's device index
-		//////////////////////////////
-
-		if (JoyInfo4.dev)
-			cv_usejoystick4.value = I_GetJoystickDeviceIndex(JoyInfo4.dev) + 1;
-		// is cv_usejoystick4 used?
-		else if (atoi(cv_usejoystick4.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick.value
-				&& atoi(cv_usejoystick4.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick2.value
-				&& atoi(cv_usejoystick4.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick4.string) != cv_usejoystick3.value)
-				// don't check JoyInfo4 or cv_usejoystick4; we're currently operating on those
-			cv_usejoystick4.value = atoi(cv_usejoystick4.string);
-		// is cv_usejoystick used?
-		else if (atoi(cv_usejoystick.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick.value
-				&& atoi(cv_usejoystick.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick2.value
-				&& atoi(cv_usejoystick.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick.string) != cv_usejoystick3.value)
-				// don't check JoyInfo4 or cv_usejoystick4; we're currently operating on those
-			cv_usejoystick4.value = atoi(cv_usejoystick.string);
-		// is cv_usejoystick2 used?
-		else if (atoi(cv_usejoystick2.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick.value
-				&& atoi(cv_usejoystick2.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick2.value
-				&& atoi(cv_usejoystick2.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick2.string) != cv_usejoystick3.value)
-				// don't check JoyInfo4 or cv_usejoystick4; we're currently operating on those
-			cv_usejoystick4.value = atoi(cv_usejoystick2.string);
-		// is cv_usejoystick3 used?
-		else if (atoi(cv_usejoystick3.string) != JoyInfo.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick.value
-				&& atoi(cv_usejoystick3.string) != JoyInfo2.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick2.value
-				&& atoi(cv_usejoystick3.string) != JoyInfo3.oldjoy
-				&& atoi(cv_usejoystick3.string) != cv_usejoystick3.value)
-				// don't check JoyInfo4 or cv_usejoystick4; we're currently operating on those
-			cv_usejoystick4.value = atoi(cv_usejoystick3.string);
-		else // we tried...
-			cv_usejoystick4.value = 0;
+		UINT8 joystickID, compareJoystick;
+		for (joystickID = 0; joystickID < MAXSPLITSCREENPLAYERS; joystickID++)
+		{
+			// is this cv_usejoystick used?
+			const INT32 value = atoi(cv_usejoystick[joystickID].string);
+			for (compareJoystick = 0; compareJoystick < MAXSPLITSCREENPLAYERS; compareJoystick++)
+			{
+				if (compareJoystick == player)
+					continue;
+				if (value == JoyInfo[compareJoystick].oldjoy || value == cv_usejoystick[compareJoystick].value)
+					break;
+			}
+			if (compareJoystick == MAXSPLITSCREENPLAYERS)
+			{
+				// We DID make it through the whole loop, so we can use this one!
+				cv_usejoystick[player].value = value;
+				break;
+			}
+		}
+		if (joystickID == MAXSPLITSCREENPLAYERS)
+		{
+			// We DID NOT make it through the whole loop, so we can't assign this joystick to anything.
+			// When you try your best, but you don't succeed...
+			cv_usejoystick[player].value = 0;
+		}
 	}
 }
 
-/**	\brief Joystick 1 buttons states
+void I_UpdateJoystickDeviceIndices(UINT8 excludePlayer)
+{
+	UINT8 player;
+
+	for (player = 0; player < MAXSPLITSCREENPLAYERS; player++)
+	{
+		if (player == excludePlayer)
+			continue;
+
+		I_UpdateJoystickDeviceIndex(player);
+	}
+}
+
+/**	\brief Joystick buttons states
 */
-static UINT64 lastjoybuttons = 0;
+static UINT64 lastjoybuttons[MAXSPLITSCREENPLAYERS] = {0,0,0,0};
 
-/**	\brief Joystick 1 hats state
+/**	\brief Joystick hats state
 */
-static UINT64 lastjoyhats = 0;
-
-/**	\brief	Shuts down joystick 1
-
+static UINT64 lastjoyhats[MAXSPLITSCREENPLAYERS] = {0,0,0,0};
 
+/**	\brief	Shuts down joystick
 	\return void
-
-
 */
-void I_ShutdownJoystick(void)
+void I_ShutdownJoystick(UINT8 index)
 {
 	INT32 i;
 	event_t event;
-	event.type=ev_keyup;
+	event.type = ev_keyup;
 	event.data2 = 0;
 	event.data3 = 0;
 
-	lastjoybuttons = lastjoyhats = 0;
+	lastjoybuttons[index] = lastjoyhats[index] = 0;
 
 	// emulate the up of all joystick buttons
-	for (i=0;i<JOYBUTTONS;i++)
+	for (i = 0; i < JOYBUTTONS; i++)
 	{
-		event.data1=KEY_JOY1+i;
+		event.data1=KEY_JOY1 + i;
 		D_PostEvent(&event);
 	}
 
 	// emulate the up of all joystick hats
-	for (i=0;i<JOYHATS*4;i++)
+	for (i = 0; i < JOYHATS*4; i++)
 	{
 		event.data1=KEY_HAT1+i;
 		D_PostEvent(&event);
@@ -1358,75 +1244,40 @@ void I_ShutdownJoystick(void)
 
 	// reset joystick position
 	event.type = ev_joystick;
-	for (i=0;i<JOYAXISSET; i++)
+	for (i = 0; i < JOYAXISSET; i++)
 	{
 		event.data1 = i;
 		D_PostEvent(&event);
 	}
 
-	joystick_started = 0;
-	JoyReset(&JoyInfo);
+	joystick_started[index] = 0;
+	JoyReset(&JoyInfo[index]);
 
 	// don't shut down the subsystem here, because hotplugging
 }
 
-void I_GetJoystickEvents(void)
+void I_GetJoystickEvents(UINT8 index)
 {
-	static event_t event = {0,0,0,0};
+	static event_t event = {};
 	INT32 i = 0;
 	UINT64 joyhats = 0;
-#if 0
-	UINT64 joybuttons = 0;
-	UINT32 axisx, axisy;
-#endif
 
-	if (!joystick_started)
+	if (!joystick_started[index])
 		return;
 
-	if (!JoyInfo.dev) //I_ShutdownJoystick();
+	if (!JoyInfo[index].dev) //I_ShutdownJoystick();
 		return;
 
-#if 0
-	//faB: look for as much buttons as g_input code supports,
-	//  we don't use the others
-	for (i = JoyInfo.buttons - 1; i >= 0; i--)
-	{
-		joybuttons <<= 1;
-		if (SDL_JoystickGetButton(JoyInfo.dev,i))
-			joybuttons |= 1;
-	}
+	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_UP);
+	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_DOWN) << 1;
+	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_LEFT) << 2;
+	joyhats |= SDL_GameControllerGetButton(JoyInfo[index].dev, SDL_CONTROLLER_BUTTON_DPAD_RIGHT) << 3;
 
-	if (joybuttons != lastjoybuttons)
+	if (joyhats != lastjoyhats[index])
 	{
 		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newbuttons = joybuttons ^ lastjoybuttons;
-		lastjoybuttons = joybuttons;
-
-		for (i = 0; i < JOYBUTTONS; i++, j <<= 1)
-		{
-			if (newbuttons & j) // button changed state?
-			{
-				if (joybuttons & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_JOY1 + i;
-				D_PostEvent(&event);
-			}
-		}
-	}
-#endif
-
-	joyhats |= SDL_GameControllerGetButton(JoyInfo.dev, SDL_CONTROLLER_BUTTON_DPAD_UP);
-	joyhats |= SDL_GameControllerGetButton(JoyInfo.dev, SDL_CONTROLLER_BUTTON_DPAD_DOWN) << 1;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo.dev, SDL_CONTROLLER_BUTTON_DPAD_LEFT) << 2;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo.dev, SDL_CONTROLLER_BUTTON_DPAD_RIGHT) << 3;
-
-	if (joyhats != lastjoyhats)
-	{
-		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newhats = joyhats ^ lastjoyhats;
-		lastjoyhats = joyhats;
+		INT64 newhats = joyhats ^ lastjoyhats[index];
+		lastjoyhats[index] = joyhats;
 
 		for (i = 0; i < JOYHATS*4; i++, j <<= 1)
 		{
@@ -1441,59 +1292,6 @@ void I_GetJoystickEvents(void)
 			}
 		}
 	}
-
-#if 0
-	// send joystick axis positions
-	event.type = ev_joystick;
-
-	for (i = JOYAXISSET - 1; i >= 0; i--)
-	{
-		event.data1 = i;
-		if (i*2 + 1 <= JoyInfo.axises)
-			axisx = SDL_JoystickGetAxis(JoyInfo.dev, i*2 + 0);
-		else axisx = 0;
-		if (i*2 + 2 <= JoyInfo.axises)
-			axisy = SDL_JoystickGetAxis(JoyInfo.dev, i*2 + 1);
-		else axisy = 0;
-
-		// -32768 to 32767
-		axisx = axisx/32;
-		axisy = axisy/32;
-
-		if (Joystick.bGamepadStyle)
-		{
-			// gamepad control type, on or off, live or die
-			if (axisx < -(JOYAXISRANGE/2))
-				event.data2 = -1;
-			else if (axisx > (JOYAXISRANGE/2))
-				event.data2 = 1;
-			else
-				event.data2 = 0;
-			if (axisy < -(JOYAXISRANGE/2))
-				event.data3 = -1;
-			else if (axisy > (JOYAXISRANGE/2))
-				event.data3 = 1;
-			else
-				event.data3 = 0;
-		}
-		else
-		{
-
-			axisx = JoyInfo.scale?((axisx/JoyInfo.scale)*JoyInfo.scale):axisx;
-			axisy = JoyInfo.scale?((axisy/JoyInfo.scale)*JoyInfo.scale):axisy;
-
-#ifdef SDL_JDEADZONE
-			if (-SDL_JDEADZONE <= axisx && axisx <= SDL_JDEADZONE) axisx = 0;
-			if (-SDL_JDEADZONE <= axisy && axisy <= SDL_JDEADZONE) axisy = 0;
-#endif
-
-			// analog control style , just send the raw data
-			event.data2 = axisx; // x axis
-			event.data3 = axisy; // y axis
-		}
-		D_PostEvent(&event);
-	}
-#endif
 }
 
 /**	\brief	Open joystick handle
@@ -1501,10 +1299,8 @@ void I_GetJoystickEvents(void)
 	\param	fname	name of joystick
 
 	\return	axises
-
-
 */
-static int joy_open(int joyindex)
+static int joy_open(int playerIndex, int joyIndex)
 {
 	SDL_GameController *newdev = NULL;
 	int num_joy = 0;
@@ -1520,7 +1316,7 @@ static int joy_open(int joyindex)
 		return -1;
 	}
 
-	if (joyindex <= 0)
+	if (joyIndex <= 0)
 		return -1;
 
 	num_joy = SDL_NumJoysticks();
@@ -1531,7 +1327,7 @@ static int joy_open(int joyindex)
 		return -1;
 	}
 
-	newdev = SDL_GameControllerOpen(joyindex-1);
+	newdev = SDL_GameControllerOpen(joyIndex-1);
 
 	// Handle the edge case where the device <-> joystick index assignment can change due to hotplugging
 	// This indexing is SDL's responsibility and there's not much we can do about it.
@@ -1543,869 +1339,51 @@ static int joy_open(int joyindex)
 	// 4. Unplug Controller B -> Index 0 inactive, Index 1 closed
 	// 5. Plug Controller B   -> Index 0 opened
 	// 6. Plug Controller A   -> Index 0 REPLACED, opened as Controller A; Index 1 is now Controller B
-	if (JoyInfo.dev)
+	if (JoyInfo[playerIndex].dev)
 	{
-		if (JoyInfo.dev == newdev // same device, nothing to do
-			|| (newdev == NULL && SDL_GameControllerGetAttached(JoyInfo.dev))) // we failed, but already have a working device
+		if (JoyInfo[playerIndex].dev == newdev // same device, nothing to do
+			|| (newdev == NULL && SDL_GameControllerGetAttached(JoyInfo[playerIndex].dev))) // we failed, but already have a working device
 			return SDL_CONTROLLER_AXIS_MAX;
 		// Else, we're changing devices, so send neutral joy events
 		CONS_Debug(DBG_GAMELOGIC, "Joystick1 device is changing; resetting events...\n");
-		I_ShutdownJoystick();
+		I_ShutdownJoystick(playerIndex);
 	}
 
-	JoyInfo.dev = newdev;
+	JoyInfo[playerIndex].dev = newdev;
 
-	if (JoyInfo.dev == NULL)
+	if (JoyInfo[playerIndex].dev == NULL)
 	{
 		CONS_Debug(DBG_GAMELOGIC, M_GetText("Joystick1: Couldn't open device - %s\n"), SDL_GetError());
 		return -1;
 	}
 	else
 	{
-		CONS_Debug(DBG_GAMELOGIC, M_GetText("Joystick1: %s\n"), SDL_GameControllerName(JoyInfo.dev));
-		JoyInfo.axises = SDL_CONTROLLER_AXIS_MAX;
-		if (JoyInfo.axises > JOYAXISSET*2)
-			JoyInfo.axises = JOYAXISSET*2;
-	/*		if (joyaxes<2)
-		{
-			I_OutputMsg("Not enought axes?\n");
-			return 0;
-		}*/
+		CONS_Debug(DBG_GAMELOGIC, M_GetText("Joystick1: %s\n"), SDL_GameControllerName(JoyInfo[playerIndex].dev));
+		JoyInfo[playerIndex].axises = SDL_CONTROLLER_AXIS_MAX;
 
-		JoyInfo.buttons = SDL_CONTROLLER_BUTTON_MAX ; // dpad is 4 buttons
-		if (JoyInfo.buttons > JOYBUTTONS)
-			JoyInfo.buttons = JOYBUTTONS;
+		if (JoyInfo[playerIndex].axises > JOYAXISSET*2)
+			JoyInfo[playerIndex].axises = JOYAXISSET*2;
 
-		JoyInfo.hats = 4;
-		if (JoyInfo.hats > JOYHATS)
-			JoyInfo.hats = JOYHATS;
+		JoyInfo[playerIndex].buttons = SDL_CONTROLLER_BUTTON_MAX ; // dpad is 4 buttons
+		if (JoyInfo[playerIndex].buttons > JOYBUTTONS)
+			JoyInfo[playerIndex].buttons = JOYBUTTONS;
 
-		JoyInfo.balls = 0;
+		JoyInfo[playerIndex].hats = 4;
+		if (JoyInfo[playerIndex].hats > JOYHATS)
+			JoyInfo[playerIndex].hats = JOYHATS;
 
-		//Joystick.bGamepadStyle = !stricmp(SDL_JoystickName(JoyInfo.dev), "pad");
+		JoyInfo[playerIndex].balls = 0;
 
-		return JoyInfo.axises;
-	}
-}
-
-//Joystick2
-
-/**	\brief Joystick 2 buttons states
-*/
-static UINT64 lastjoy2buttons = 0;
-
-/**	\brief Joystick 2 hats state
-*/
-static UINT64 lastjoy2hats = 0;
-
-/**	\brief	Shuts down joystick 2
-
-
-	\return	void
-*/
-void I_ShutdownJoystick2(void)
-{
-	INT32 i;
-	event_t event;
-	event.type = ev_keyup;
-	event.data2 = 0;
-	event.data3 = 0;
-
-	lastjoy2buttons = lastjoy2hats = 0;
-
-	// emulate the up of all joystick buttons
-	for (i = 0; i < JOYBUTTONS; i++)
-	{
-		event.data1 = KEY_2JOY1 + i;
-		D_PostEvent(&event);
-	}
-
-	// emulate the up of all joystick hats
-	for (i = 0; i < JOYHATS*4; i++)
-	{
-		event.data1 = KEY_2HAT1 + i;
-		D_PostEvent(&event);
-	}
-
-	// reset joystick position
-	event.type = ev_joystick2;
-	for (i = 0; i < JOYAXISSET; i++)
-	{
-		event.data1 = i;
-		D_PostEvent(&event);
-	}
-
-	joystick2_started = 0;
-	JoyReset(&JoyInfo2);
-
-	// don't shut down the subsystem here, because hotplugging
-}
-
-void I_GetJoystick2Events(void)
-{
-	static event_t event = {0,0,0,0};
-	INT32 i = 0;
-	UINT64 joyhats = 0;
-#if 0
-	UINT64 joybuttons = 0;
-	UINT32 axisx, axisy;
-#endif
-
-	if (!joystick2_started)
-		return;
-
-	if (!JoyInfo2.dev) //I_ShutdownJoystick2();
-		return;
-
-#if 0
-	//faB: look for as much buttons as g_input code supports,
-	//  we don't use the others
-	for (i = JoyInfo2.buttons - 1; i >= 0; i--)
-	{
-		joybuttons <<= 1;
-		if (SDL_JoystickGetButton(JoyInfo2.dev,i))
-			joybuttons |= 1;
-	}
-
-	if (joybuttons != lastjoy2buttons)
-	{
-		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newbuttons = joybuttons ^ lastjoy2buttons;
-		lastjoy2buttons = joybuttons;
-
-		for (i = 0; i < JOYBUTTONS; i++, j <<= 1)
-		{
-			if (newbuttons & j) // button changed state?
-			{
-				if (joybuttons & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_2JOY1 + i;
-				D_PostEvent(&event);
-			}
-		}
-	}
-#endif
-
-	joyhats |= SDL_GameControllerGetButton(JoyInfo2.dev, SDL_CONTROLLER_BUTTON_DPAD_UP);
-	joyhats |= SDL_GameControllerGetButton(JoyInfo2.dev, SDL_CONTROLLER_BUTTON_DPAD_DOWN) << 1;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo2.dev, SDL_CONTROLLER_BUTTON_DPAD_LEFT) << 2;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo2.dev, SDL_CONTROLLER_BUTTON_DPAD_RIGHT) << 3;
-
-	if (joyhats != lastjoy2hats)
-	{
-		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newhats = joyhats ^ lastjoy2hats;
-		lastjoy2hats = joyhats;
-
-		for (i = 0; i < JOYHATS*4; i++, j <<= 1)
-		{
-			if (newhats & j) // hat changed state?
-			{
-				if (joyhats & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_2HAT1 + i;
-				D_PostEvent(&event);
-			}
-		}
-	}
-
-#if 0
-	// send joystick axis positions
-	event.type = ev_joystick2;
-
-	for (i = JOYAXISSET - 1; i >= 0; i--)
-	{
-		event.data1 = i;
-		if (i*2 + 1 <= JoyInfo2.axises)
-			axisx = SDL_JoystickGetAxis(JoyInfo2.dev, i*2 + 0);
-		else axisx = 0;
-		if (i*2 + 2 <= JoyInfo2.axises)
-			axisy = SDL_JoystickGetAxis(JoyInfo2.dev, i*2 + 1);
-		else axisy = 0;
-
-		// -32768 to 32767
-		axisx = axisx/32;
-		axisy = axisy/32;
-
-		if (Joystick2.bGamepadStyle)
-		{
-			// gamepad control type, on or off, live or die
-			if (axisx < -(JOYAXISRANGE/2))
-				event.data2 = -1;
-			else if (axisx > (JOYAXISRANGE/2))
-				event.data2 = 1;
-			else
-				event.data2 = 0;
-			if (axisy < -(JOYAXISRANGE/2))
-				event.data3 = -1;
-			else if (axisy > (JOYAXISRANGE/2))
-				event.data3 = 1;
-			else
-				event.data3 = 0;
-		}
-		else
-		{
-
-			axisx = JoyInfo2.scale?((axisx/JoyInfo2.scale)*JoyInfo2.scale):axisx;
-			axisy = JoyInfo2.scale?((axisy/JoyInfo2.scale)*JoyInfo2.scale):axisy;
-
-#ifdef SDL_JDEADZONE
-			if (-SDL_JDEADZONE <= axisx && axisx <= SDL_JDEADZONE) axisx = 0;
-			if (-SDL_JDEADZONE <= axisy && axisy <= SDL_JDEADZONE) axisy = 0;
-#endif
-
-			// analog control style , just send the raw data
-			event.data2 = axisx; // x axis
-			event.data3 = axisy; // y axis
-		}
-		D_PostEvent(&event);
-	}
-#endif
-}
-
-/**	\brief	Open joystick handle
-
-	\param	fname	name of joystick
-
-	\return	axises
-
-
-*/
-static int joy_open2(int joyindex)
-{
-	SDL_GameController *newdev = NULL;
-	int num_joy = 0;
-
-	if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
-	{
-		CONS_Printf(M_GetText("Joystick subsystem not started\n"));
-		return -1;
-	}
-	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) == 0)
-	{
-		CONS_Printf(M_GetText("Game Controller subsystem not started\n"));
-		return -1;
-	}
-
-	if (joyindex <= 0)
-		return -1;
-
-	num_joy = SDL_NumJoysticks();
-
-	if (num_joy == 0)
-	{
-		CONS_Printf("%s", M_GetText("Found no joysticks on this system\n"));
-		return -1;
-	}
-
-	newdev = SDL_GameControllerOpen(joyindex-1);
-
-	// Handle the edge case where the device <-> joystick index assignment can change due to hotplugging
-	// This indexing is SDL's responsibility and there's not much we can do about it.
-	//
-	// Example:
-	// 1. Plug Controller A   -> Index 0 opened
-	// 2. Plug Controller B   -> Index 1 opened
-	// 3. Unplug Controller A -> Index 0 closed, Index 1 active
-	// 4. Unplug Controller B -> Index 0 inactive, Index 1 closed
-	// 5. Plug Controller B   -> Index 0 opened
-	// 6. Plug Controller A   -> Index 0 REPLACED, opened as Controller A; Index 1 is now Controller B
-	if (JoyInfo2.dev)
-	{
-		if (JoyInfo2.dev == newdev // same device, nothing to do
-			|| (newdev == NULL && SDL_GameControllerGetAttached(JoyInfo2.dev))) // we failed, but already have a working device
-			return SDL_CONTROLLER_AXIS_MAX;
-		// Else, we're changing devices, so send neutral joy events
-		CONS_Debug(DBG_GAMELOGIC, "Joystick2 device is changing; resetting events...\n");
-		I_ShutdownJoystick2();
-	}
-
-	JoyInfo2.dev = newdev;
-
-	if (JoyInfo2.dev == NULL)
-	{
-		CONS_Debug(DBG_GAMELOGIC, M_GetText("Joystick2: couldn't open device - %s\n"), SDL_GetError());
-		return -1;
-	}
-	else
-	{
-		CONS_Debug(DBG_GAMELOGIC, M_GetText("Joystick2: %s\n"), SDL_GameControllerName(JoyInfo2.dev));
-		JoyInfo2.axises = SDL_CONTROLLER_AXIS_MAX;
-		if (JoyInfo2.axises > JOYAXISSET*2)
-			JoyInfo2.axises = JOYAXISSET*2;
-/*		if (joyaxes<2)
-		{
-			I_OutputMsg("Not enought axes?\n");
-			return 0;
-		}*/
-
-		JoyInfo2.buttons = SDL_CONTROLLER_BUTTON_MAX ; // dpad is 4 buttons
-		if (JoyInfo2.buttons > JOYBUTTONS)
-			JoyInfo2.buttons = JOYBUTTONS;
-
-		JoyInfo2.hats = 4;
-		if (JoyInfo2.hats > JOYHATS)
-			JoyInfo2.hats = JOYHATS;
-
-		JoyInfo2.balls = 0;
-
-		//Joystick.bGamepadStyle = !stricmp(SDL_JoystickName(JoyInfo2.dev), "pad");
-
-		return JoyInfo2.axises;
-	}
-}
-
-//Joystick3
-
-/**	\brief Joystick 3 buttons states
-*/
-static UINT64 lastjoy3buttons = 0;
-
-/**	\brief Joystick 3 hats state
-*/
-static UINT64 lastjoy3hats = 0;
-
-/**	\brief	Shuts down joystick 3
-
-
-\return	void
-*/
-void I_ShutdownJoystick3(void)
-{
-	INT32 i;
-	event_t event;
-	event.type = ev_keyup;
-	event.data2 = 0;
-	event.data3 = 0;
-
-	lastjoy3buttons = lastjoy3hats = 0;
-
-	// emulate the up of all joystick buttons
-	for (i = 0; i < JOYBUTTONS; i++)
-	{
-		event.data1 = KEY_3JOY1 + i;
-		D_PostEvent(&event);
-	}
-
-	// emulate the up of all joystick hats
-	for (i = 0; i < JOYHATS*4; i++)
-	{
-		event.data1 = KEY_3HAT1 + i;
-		D_PostEvent(&event);
-	}
-
-	// reset joystick position
-	event.type = ev_joystick3;
-	for (i = 0; i < JOYAXISSET; i++)
-	{
-		event.data1 = i;
-		D_PostEvent(&event);
-	}
-
-	joystick3_started = 0;
-	JoyReset(&JoyInfo3);
-
-	// don't shutdown the subsystem here, because hotplugging
-}
-
-void I_GetJoystick3Events(void)
-{
-	static event_t event = {0,0,0,0};
-	INT32 i = 0;
-	UINT64 joyhats = 0;
-#if 0
-	UINT64 joybuttons = 0;
-	UINT32 axisx, axisy;
-#endif
-
-	if (!joystick3_started)
-		return;
-
-	if (!JoyInfo3.dev) //I_ShutdownJoystick3();
-		return;
-
-#if 0
-	//faB: look for as much buttons as g_input code supports,
-	//  we don't use the others
-	for (i = JoyInfo3.buttons - 1; i >= 0; i--)
-	{
-		joybuttons <<= 1;
-		if (SDL_JoystickGetButton(JoyInfo3.dev,i))
-			joybuttons |= 1;
-	}
-
-	if (joybuttons != lastjoy3buttons)
-	{
-		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newbuttons = joybuttons ^ lastjoy3buttons;
-		lastjoy3buttons = joybuttons;
-
-		for (i = 0; i < JOYBUTTONS; i++, j <<= 1)
-		{
-			if (newbuttons & j) // button changed state?
-			{
-				if (joybuttons & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_3JOY1 + i;
-				D_PostEvent(&event);
-			}
-		}
-	}
-#endif
-
-	joyhats |= SDL_GameControllerGetButton(JoyInfo3.dev, SDL_CONTROLLER_BUTTON_DPAD_UP);
-	joyhats |= SDL_GameControllerGetButton(JoyInfo3.dev, SDL_CONTROLLER_BUTTON_DPAD_DOWN) << 1;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo3.dev, SDL_CONTROLLER_BUTTON_DPAD_LEFT) << 2;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo3.dev, SDL_CONTROLLER_BUTTON_DPAD_RIGHT) << 3;
-
-	if (joyhats != lastjoy3hats)
-	{
-		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newhats = joyhats ^ lastjoy3hats;
-		lastjoy3hats = joyhats;
-
-		for (i = 0; i < JOYHATS*4; i++, j <<= 1)
-		{
-			if (newhats & j) // hat changed state?
-			{
-				if (joyhats & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_3HAT1 + i;
-				D_PostEvent(&event);
-			}
-		}
-	}
-
-#if 0
-	// send joystick axis positions
-	event.type = ev_joystick3;
-
-	for (i = JOYAXISSET - 1; i >= 0; i--)
-	{
-		event.data1 = i;
-		if (i*2 + 1 <= JoyInfo3.axises)
-			axisx = SDL_JoystickGetAxis(JoyInfo3.dev, i*2 + 0);
-		else axisx = 0;
-		if (i*2 + 2 <= JoyInfo3.axises)
-			axisy = SDL_JoystickGetAxis(JoyInfo3.dev, i*2 + 1);
-		else axisy = 0;
-
-		// -32768 to 32767
-		axisx = axisx/32;
-		axisy = axisy/32;
-
-		if (Joystick3.bGamepadStyle)
-		{
-			// gamepad control type, on or off, live or die
-			if (axisx < -(JOYAXISRANGE/2))
-				event.data2 = -1;
-			else if (axisx > (JOYAXISRANGE/2))
-				event.data2 = 1;
-			else
-				event.data2 = 0;
-			if (axisy < -(JOYAXISRANGE/2))
-				event.data3 = -1;
-			else if (axisy > (JOYAXISRANGE/2))
-				event.data3 = 1;
-			else
-				event.data3 = 0;
-		}
-		else
-		{
-
-			axisx = JoyInfo3.scale?((axisx/JoyInfo3.scale)*JoyInfo3.scale):axisx;
-			axisy = JoyInfo3.scale?((axisy/JoyInfo3.scale)*JoyInfo3.scale):axisy;
-
-#ifdef SDL_JDEADZONE
-			if (-SDL_JDEADZONE <= axisx && axisx <= SDL_JDEADZONE) axisx = 0;
-			if (-SDL_JDEADZONE <= axisy && axisy <= SDL_JDEADZONE) axisy = 0;
-#endif
-
-			// analog control style , just send the raw data
-			event.data2 = axisx; // x axis
-			event.data3 = axisy; // y axis
-		}
-		D_PostEvent(&event);
-	}
-#endif
-}
-
-/**	\brief	Open joystick handle
-
-	\param	fname	name of joystick
-
-	\return	axises
-
-
-*/
-static int joy_open3(int joyindex)
-{
-	SDL_GameController *newdev = NULL;
-	int num_joy = 0;
-
-	if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
-	{
-		CONS_Printf(M_GetText("Joystick subsystem not started\n"));
-		return -1;
-	}
-	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) == 0)
-	{
-		CONS_Printf(M_GetText("Game Controller subsystem not started\n"));
-		return -1;
-	}
-
-	if (joyindex <= 0)
-		return -1;
-
-	num_joy = SDL_NumJoysticks();
-
-	if (num_joy == 0)
-	{
-		CONS_Printf("%s", M_GetText("Found no joysticks on this system\n"));
-		return -1;
-	}
-
-	newdev = SDL_GameControllerOpen(joyindex - 1);
-
-	// Handle the edge case where the device <-> joystick index assignment can change due to hotplugging
-	// This indexing is SDL's responsibility and there's not much we can do about it.
-	//
-	// Example:
-	// 1. Plug Controller A   -> Index 0 opened
-	// 2. Plug Controller B   -> Index 1 opened
-	// 3. Unplug Controller A -> Index 0 closed, Index 1 active
-	// 4. Unplug Controller B -> Index 0 inactive, Index 1 closed
-	// 5. Plug Controller B   -> Index 0 opened
-	// 6. Plug Controller A   -> Index 0 REPLACED, opened as Controller A; Index 1 is now Controller B
-	if (JoyInfo3.dev)
-	{
-		if (JoyInfo3.dev == newdev // same device, nothing to do
-			|| (newdev == NULL && SDL_GameControllerGetAttached(JoyInfo3.dev))) // we failed, but already have a working device
-			return SDL_CONTROLLER_AXIS_MAX;
-		// Else, we're changing devices, so send neutral joy events
-		CONS_Debug(DBG_GAMELOGIC, "Joystick3 device is changing; resetting events...\n");
-		I_ShutdownJoystick3();
-	}
-
-	JoyInfo3.dev = newdev;
-
-	if (JoyInfo3.dev == NULL)
-	{
-		CONS_Debug(DBG_GAMELOGIC, M_GetText("Joystick3: couldn't open device - %s\n"), SDL_GetError());
-		return -1;
-	}
-	else
-	{
-		CONS_Debug(DBG_GAMELOGIC, M_GetText("Joystick3: %s\n"), SDL_GameControllerName(JoyInfo3.dev));
-		JoyInfo3.axises = SDL_CONTROLLER_AXIS_MAX;
-		if (JoyInfo3.axises > JOYAXISSET * 2)
-			JoyInfo3.axises = JOYAXISSET * 2;
-		/*		if (joyaxes<2)
-		{
-		I_OutputMsg("Not enought axes?\n");
-		return 0;
-		}*/
-
-		JoyInfo3.buttons = SDL_CONTROLLER_BUTTON_MAX ; // dpad is 4 buttons
-		if (JoyInfo3.buttons > JOYBUTTONS)
-			JoyInfo3.buttons = JOYBUTTONS;
-
-		JoyInfo3.hats = 4;
-		if (JoyInfo3.hats > JOYHATS)
-			JoyInfo3.hats = JOYHATS;
-
-		JoyInfo3.balls = 0;
-
-		//Joystick.bGamepadStyle = !stricmp(SDL_JoystickName(JoyInfo3.dev), "pad");
-
-		return JoyInfo3.axises;
-	}
-}
-
-//Joystick4
-
-/**	\brief Joystick 4 buttons states
-*/
-static UINT64 lastjoy4buttons = 0;
-
-/**	\brief Joystick 4 hats state
-*/
-static UINT64 lastjoy4hats = 0;
-
-/**	\brief	Shuts down joystick 4
-
-
-\return	void
-*/
-void I_ShutdownJoystick4(void)
-{
-	INT32 i;
-	event_t event;
-	event.type = ev_keyup;
-	event.data2 = 0;
-	event.data3 = 0;
-
-	lastjoy4buttons = lastjoy4hats = 0;
-
-	// emulate the up of all joystick buttons
-	for (i = 0; i < JOYBUTTONS; i++)
-	{
-		event.data1 = KEY_4JOY1 + i;
-		D_PostEvent(&event);
-	}
-
-	// emulate the up of all joystick hats
-	for (i = 0; i < JOYHATS*4; i++)
-	{
-		event.data1 = KEY_4HAT1 + i;
-		D_PostEvent(&event);
-	}
-
-	// reset joystick position
-	event.type = ev_joystick4;
-	for (i = 0; i < JOYAXISSET; i++)
-	{
-		event.data1 = i;
-		D_PostEvent(&event);
-	}
-
-	joystick4_started = 0;
-	JoyReset(&JoyInfo4);
-
-	// don't shutdown the subsystem here, because hotplugging
-}
-
-void I_GetJoystick4Events(void)
-{
-	static event_t event = {0,0,0,0};
-	INT32 i = 0;
-	UINT64 joyhats = 0;
-#if 0
-	UINT64 joybuttons = 0;
-	UINT32 axisx, axisy;
-#endif
-
-	if (!joystick4_started)
-		return;
-
-	if (!JoyInfo4.dev) //I_ShutdownJoystick4();
-		return;
-
-#if 0
-	//faB: look for as much buttons as g_input code supports,
-	//  we don't use the others
-	for (i = JoyInfo4.buttons - 1; i >= 0; i--)
-	{
-		joybuttons <<= 1;
-		if (SDL_JoystickGetButton(JoyInfo4.dev,i))
-			joybuttons |= 1;
-	}
-
-	if (joybuttons != lastjoy4buttons)
-	{
-		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newbuttons = joybuttons ^ lastjoy4buttons;
-		lastjoy4buttons = joybuttons;
-
-		for (i = 0; i < JOYBUTTONS; i++, j <<= 1)
-		{
-			if (newbuttons & j) // button changed state?
-			{
-				if (joybuttons & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_4JOY1 + i;
-				D_PostEvent(&event);
-			}
-		}
-	}
-#endif
-
-	joyhats |= SDL_GameControllerGetButton(JoyInfo4.dev, SDL_CONTROLLER_BUTTON_DPAD_UP);
-	joyhats |= SDL_GameControllerGetButton(JoyInfo4.dev, SDL_CONTROLLER_BUTTON_DPAD_DOWN) << 1;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo4.dev, SDL_CONTROLLER_BUTTON_DPAD_LEFT) << 2;
-	joyhats |= SDL_GameControllerGetButton(JoyInfo4.dev, SDL_CONTROLLER_BUTTON_DPAD_RIGHT) << 3;
-
-	if (joyhats != lastjoy4hats)
-	{
-		INT64 j = 1; // keep only bits that changed since last time
-		INT64 newhats = joyhats ^ lastjoy4hats;
-		lastjoy4hats = joyhats;
-
-		for (i = 0; i < JOYHATS*4; i++, j <<= 1)
-		{
-			if (newhats & j) // hat changed state?
-			{
-				if (joyhats & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_4HAT1 + i;
-				D_PostEvent(&event);
-			}
-		}
-	}
-
-#if 0
-	// send joystick axis positions
-	event.type = ev_joystick4;
-
-	for (i = JOYAXISSET - 1; i >= 0; i--)
-	{
-		event.data1 = i;
-		if (i*2 + 1 <= JoyInfo4.axises)
-			axisx = SDL_JoystickGetAxis(JoyInfo4.dev, i*2 + 0);
-		else axisx = 0;
-		if (i*2 + 2 <= JoyInfo4.axises)
-			axisy = SDL_JoystickGetAxis(JoyInfo4.dev, i*2 + 1);
-		else axisy = 0;
-
-		// -32768 to 32767
-		axisx = axisx/32;
-		axisy = axisy/32;
-
-		if (Joystick4.bGamepadStyle)
-		{
-			// gamepad control type, on or off, live or die
-			if (axisx < -(JOYAXISRANGE/2))
-				event.data2 = -1;
-			else if (axisx > (JOYAXISRANGE/2))
-				event.data2 = 1;
-			else
-				event.data2 = 0;
-			if (axisy < -(JOYAXISRANGE/2))
-				event.data3 = -1;
-			else if (axisy > (JOYAXISRANGE/2))
-				event.data3 = 1;
-			else
-				event.data3 = 0;
-		}
-		else
-		{
-
-			axisx = JoyInfo4.scale?((axisx/JoyInfo4.scale)*JoyInfo4.scale):axisx;
-			axisy = JoyInfo4.scale?((axisy/JoyInfo4.scale)*JoyInfo4.scale):axisy;
-
-#ifdef SDL_JDEADZONE
-			if (-SDL_JDEADZONE <= axisx && axisx <= SDL_JDEADZONE) axisx = 0;
-			if (-SDL_JDEADZONE <= axisy && axisy <= SDL_JDEADZONE) axisy = 0;
-#endif
-
-			// analog control style , just send the raw data
-			event.data2 = axisx; // x axis
-			event.data3 = axisy; // y axis
-		}
-		D_PostEvent(&event);
-	}
-#endif
-}
-
-/**	\brief	Open joystick handle
-
-	\param	fname	name of joystick
-
-	\return	axises
-
-
-*/
-static int joy_open4(int joyindex)
-{
-	SDL_GameController *newdev = NULL;
-	int num_joy = 0;
-
-	if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
-	{
-		CONS_Printf(M_GetText("Joystick subsystem not started\n"));
-		return -1;
-	}
-	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) == 0)
-	{
-		CONS_Printf(M_GetText("Game Controller subsystem not started\n"));
-		return -1;
-	}
-
-	if (joyindex <= 0)
-		return -1;
-
-	num_joy = SDL_NumJoysticks();
-
-	if (num_joy == 0)
-	{
-		CONS_Printf("%s", M_GetText("Found no joysticks on this system\n"));
-		return -1;
-	}
-
-	newdev = SDL_GameControllerOpen(joyindex - 1);
-
-	// Handle the edge case where the device <-> joystick index assignment can change due to hotplugging
-	// This indexing is SDL's responsibility and there's not much we can do about it.
-	//
-	// Example:
-	// 1. Plug Controller A   -> Index 0 opened
-	// 2. Plug Controller B   -> Index 1 opened
-	// 3. Unplug Controller A -> Index 0 closed, Index 1 active
-	// 4. Unplug Controller B -> Index 0 inactive, Index 1 closed
-	// 5. Plug Controller B   -> Index 0 opened
-	// 6. Plug Controller A   -> Index 0 REPLACED, opened as Controller A; Index 1 is now Controller B
-	if (JoyInfo4.dev)
-	{
-		if (JoyInfo4.dev == newdev // same device, nothing to do
-			|| (newdev == NULL && SDL_GameControllerGetAttached(JoyInfo4.dev))) // we failed, but already have a working device
-			return SDL_CONTROLLER_AXIS_MAX;
-		// Else, we're changing devices, so send neutral joy events
-		CONS_Debug(DBG_GAMELOGIC, "Joystick4 device is changing; resetting events...\n");
-		I_ShutdownJoystick4();
-	}
-
-	JoyInfo4.dev = newdev;
-
-	if (JoyInfo4.dev == NULL)
-	{
-		CONS_Debug(DBG_GAMELOGIC, M_GetText("Joystick4: couldn't open device - %s\n"), SDL_GetError());
-		return -1;
-	}
-	else
-	{
-		CONS_Debug(DBG_GAMELOGIC, M_GetText("Joystick4: %s\n"), SDL_GameControllerName(JoyInfo4.dev));
-		JoyInfo4.axises = SDL_CONTROLLER_AXIS_MAX;
-		if (JoyInfo4.axises > JOYAXISSET * 2)
-			JoyInfo4.axises = JOYAXISSET * 2;
-		/*		if (joyaxes<2)
-		{
-		I_OutputMsg("Not enought axes?\n");
-		return 0;
-		}*/
-
-		JoyInfo4.buttons = SDL_CONTROLLER_BUTTON_MAX ; // dpad is 4 buttons
-		if (JoyInfo4.buttons > JOYBUTTONS)
-			JoyInfo4.buttons = JOYBUTTONS;
-
-		JoyInfo4.hats = 4;
-		if (JoyInfo4.hats > JOYHATS)
-			JoyInfo4.hats = JOYHATS;
-
-		JoyInfo4.balls = 0;
-
-		//Joystick.bGamepadStyle = !stricmp(SDL_JoystickName(JoyInfo4.dev), "pad");
-
-		return JoyInfo4.axises;
+		return JoyInfo[playerIndex].axises;
 	}
 }
 
 //
 // I_InitJoystick
 //
-void I_InitJoystick(void)
+void I_InitJoystick(UINT8 index)
 {
+	UINT8 i;
 	SDL_GameController *newcontroller = NULL;
 
 	//I_ShutdownJoystick();
@@ -2438,192 +1416,80 @@ void I_InitJoystick(void)
 		}
 	}
 
-	if (cv_usejoystick.value)
-		newcontroller = SDL_GameControllerOpen(cv_usejoystick.value-1);
+	if (cv_usejoystick[index].value)
+		newcontroller = SDL_GameControllerOpen(cv_usejoystick[index].value-1);
 
-	if (newcontroller && (JoyInfo2.dev == newcontroller || JoyInfo3.dev == newcontroller || JoyInfo4.dev == newcontroller)) // don't override an active device
-		cv_usejoystick.value = I_GetJoystickDeviceIndex(JoyInfo.dev) + 1;
-	else if (newcontroller && joy_open(cv_usejoystick.value) != -1)
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (i == index)
+			continue;
+
+		if (JoyInfo[i].dev == newcontroller)
+			break;
+	}
+
+	if (newcontroller && i < MAXSPLITSCREENPLAYERS) // don't override an active device
+	{
+		cv_usejoystick[index].value = I_GetJoystickDeviceIndex(JoyInfo[index].dev) + 1;
+	}
+	else if (newcontroller && joy_open(index, cv_usejoystick[index].value) != -1)
 	{
 		// SDL's device indexes are unstable, so cv_usejoystick may not match
 		// the actual device index. So let's cheat a bit and find the device's current index.
-		JoyInfo.oldjoy = I_GetJoystickDeviceIndex(JoyInfo.dev) + 1;
-		joystick_started = 1;
+		JoyInfo[index].oldjoy = I_GetJoystickDeviceIndex(JoyInfo[index].dev) + 1;
+		joystick_started[index] = 1;
 	}
 	else
 	{
-		if (JoyInfo.oldjoy)
-			I_ShutdownJoystick();
-		cv_usejoystick.value = 0;
-		joystick_started = 0;
+		if (JoyInfo[index].oldjoy)
+			I_ShutdownJoystick(index);
+		cv_usejoystick[index].value = 0;
+		joystick_started[index] = 0;
 	}
 
-	if (JoyInfo.dev != newcontroller && JoyInfo2.dev != newcontroller && JoyInfo3.dev != newcontroller && JoyInfo4.dev != newcontroller)
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (JoyInfo[i].dev == newcontroller)
+			break;
+	}
+
+	if (i == MAXSPLITSCREENPLAYERS)
+	{
+		// Joystick didn't end up being used
 		SDL_GameControllerClose(newcontroller);
+	}
+}
+
+void I_InitJoystick1(void)
+{
+	I_InitJoystick(0);
 }
 
 void I_InitJoystick2(void)
 {
-	SDL_GameController *newcontroller = NULL;
-
-	//I_ShutdownJoystick2();
-	//SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
-	if (M_CheckParm("-nojoy"))
-		return;
-
-	if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
-	{
-		CONS_Printf("I_InitJoystick2()...\n");
-		if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
-		{
-			CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError());
-			return;
-		}
-	}
-	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) == 0)
-	{
-		if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == -1)
-		{
-			CONS_Printf(M_GetText("Couldn't initialize gamepads: %s\n"), SDL_GetError());
-			return;
-		}
-	}
-
-	if (cv_usejoystick2.value)
-		newcontroller = SDL_GameControllerOpen(cv_usejoystick2.value-1);
-
-	if (newcontroller && (JoyInfo.dev == newcontroller || JoyInfo3.dev == newcontroller || JoyInfo4.dev == newcontroller)) // don't override an active device
-		cv_usejoystick2.value = I_GetJoystickDeviceIndex(JoyInfo2.dev) + 1;
-	else if (newcontroller && joy_open2(cv_usejoystick2.value) != -1)
-	{
-		// SDL's device indexes are unstable, so cv_usejoystick may not match
-		// the actual device index. So let's cheat a bit and find the device's current index.
-		JoyInfo2.oldjoy = I_GetJoystickDeviceIndex(JoyInfo2.dev) + 1;
-		joystick2_started = 1;
-	}
-	else
-	{
-		if (JoyInfo2.oldjoy)
-			I_ShutdownJoystick2();
-		cv_usejoystick2.value = 0;
-		joystick2_started = 0;
-	}
-
-	if (JoyInfo.dev != newcontroller && JoyInfo2.dev != newcontroller && JoyInfo3.dev != newcontroller && JoyInfo4.dev != newcontroller)
-		SDL_GameControllerClose(newcontroller);
+	I_InitJoystick(1);
 }
 
 void I_InitJoystick3(void)
 {
-	SDL_GameController *newcontroller = NULL;
-
-	//I_ShutdownJoystick3();
-	//SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
-	if (M_CheckParm("-nojoy"))
-		return;
-
-	if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
-	{
-		CONS_Printf("I_InitJoystick3()...\n");
-		if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
-		{
-			CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError());
-			return;
-		}
-	}
-	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) == 0)
-	{
-		if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == -1)
-		{
-			CONS_Printf(M_GetText("Couldn't initialize gamepads: %s\n"), SDL_GetError());
-			return;
-		}
-	}
-
-	if (cv_usejoystick3.value)
-		newcontroller = SDL_GameControllerOpen(cv_usejoystick3.value - 1);
-
-	if (newcontroller && (JoyInfo.dev == newcontroller || JoyInfo2.dev == newcontroller || JoyInfo4.dev == newcontroller)) // don't override an active device
-		cv_usejoystick3.value = I_GetJoystickDeviceIndex(JoyInfo3.dev) + 1;
-	else if (newcontroller && joy_open3(cv_usejoystick3.value) != -1)
-	{
-		// SDL's device indexes are unstable, so cv_usejoystick may not match
-		// the actual device index. So let's cheat a bit and find the device's current index.
-		JoyInfo3.oldjoy = I_GetJoystickDeviceIndex(JoyInfo3.dev) + 1;
-		joystick3_started = 1;
-	}
-	else
-	{
-		if (JoyInfo3.oldjoy)
-			I_ShutdownJoystick3();
-		cv_usejoystick3.value = 0;
-		joystick3_started = 0;
-	}
-
-	if (JoyInfo.dev != newcontroller && JoyInfo2.dev != newcontroller && JoyInfo3.dev != newcontroller && JoyInfo4.dev != newcontroller)
-		SDL_GameControllerClose(newcontroller);
+	I_InitJoystick(2);
 }
 
 void I_InitJoystick4(void)
 {
-	SDL_GameController *newcontroller = NULL;
-
-	//I_ShutdownJoystick4();
-	//SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
-	if (M_CheckParm("-nojoy"))
-		return;
-
-	if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
-	{
-		CONS_Printf("I_InitJoystick4()...\n");
-		if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
-		{
-			CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError());
-			return;
-		}
-	}
-	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) == 0)
-	{
-		if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == -1)
-		{
-			CONS_Printf(M_GetText("Couldn't initialize gamepads: %s\n"), SDL_GetError());
-			return;
-		}
-	}
-
-	if (cv_usejoystick4.value)
-		newcontroller = SDL_GameControllerOpen(cv_usejoystick4.value - 1);
-
-	if (newcontroller && (JoyInfo.dev == newcontroller || JoyInfo2.dev == newcontroller || JoyInfo4.dev == newcontroller)) // don't override an active device
-		cv_usejoystick4.value = I_GetJoystickDeviceIndex(JoyInfo4.dev) + 1;
-	else if (newcontroller && joy_open4(cv_usejoystick4.value) != -1)
-	{
-		// SDL's device indexes are unstable, so cv_usejoystick may not match
-		// the actual device index. So let's cheat a bit and find the device's current index.
-		JoyInfo4.oldjoy = I_GetJoystickDeviceIndex(JoyInfo4.dev) + 1;
-		joystick4_started = 1;
-	}
-	else
-	{
-		if (JoyInfo4.oldjoy)
-			I_ShutdownJoystick4();
-		cv_usejoystick4.value = 0;
-		joystick4_started = 0;
-	}
-
-	if (JoyInfo.dev != newcontroller && JoyInfo2.dev != newcontroller && JoyInfo3.dev != newcontroller && JoyInfo4.dev != newcontroller)
-		SDL_GameControllerClose(newcontroller);
+	I_InitJoystick(3);
 }
 
 static void I_ShutdownInput(void)
 {
+	UINT8 i;
+
 	// Yes, the name is misleading: these send neutral events to
 	// clean up the unplugged joystick's input
 	// Note these methods are internal to this file, not called elsewhere.
-	I_ShutdownJoystick();
-	I_ShutdownJoystick2();
-	I_ShutdownJoystick3();
-	I_ShutdownJoystick4();
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+		I_ShutdownJoystick(i);
 
 	if (SDL_WasInit(SDL_INIT_GAMECONTROLLER) == SDL_INIT_GAMECONTROLLER)
 	{
@@ -2667,6 +1533,44 @@ const char *I_GetJoyName(INT32 joyindex)
 	return joyname;
 }
 
+void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
+{
+#if !(SDL_VERSION_ATLEAST(2,0,14))
+	(void)playernum;
+	(void)low_strength;
+	(void)high_strength;
+	(void)duration;
+#else
+	SDL_GameController *controller = JoyInfo[playernum].dev;
+
+	if (controller == NULL)
+	{
+		return;
+	}
+
+	SDL_GameControllerRumble(controller, low_strength, high_strength, duration);
+#endif
+}
+
+void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 blue)
+{
+#if !(SDL_VERSION_ATLEAST(2,0,14))
+	(void)playernum;
+	(void)red;
+	(void)green;
+	(void)blue;
+#else
+	SDL_GameController *controller = JoyInfo[playernum].dev;
+
+	if (controller == NULL)
+	{
+		return;
+	}
+
+	SDL_GameControllerSetLED(controller, red, green, blue);
+#endif
+}
+
 #ifndef NOMUMBLE
 #ifdef HAVE_MUMBLE
 // Best Mumble positional audio settings:
@@ -2677,7 +1581,7 @@ const char *I_GetJoyName(INT32 joyindex)
 #define DEG2RAD (0.017453292519943295769236907684883l) // TAU/360 or PI/180
 #define MUMBLEUNIT (64.0f) // FRACUNITS in a Meter
 
-static struct {
+static struct mumble_s {
 #ifdef WINMUMBLE
 	UINT32 uiVersion;
 	DWORD uiTick;
@@ -2707,10 +1611,12 @@ static void I_SetupMumble(void)
 {
 #ifdef WINMUMBLE
 	HANDLE hMap = OpenFileMappingW(FILE_MAP_ALL_ACCESS, FALSE, L"MumbleLink");
+
 	if (!hMap)
 		return;
 
-	mumble = MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(*mumble));
+	mumble = static_cast<mumble_s*>(MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(*mumble)));
+
 	if (!mumble)
 		CloseHandle(hMap);
 #elif defined (HAVE_SHM)
@@ -2720,10 +1626,11 @@ static void I_SetupMumble(void)
 	snprintf(memname, 256, "/MumbleLink.%d", getuid());
 	shmfd = shm_open(memname, O_RDWR, S_IRUSR | S_IWUSR);
 
-	if(shmfd < 0)
+	if (shmfd < 0)
 		return;
 
-	mumble = mmap(NULL, sizeof(*mumble), PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, 0);
+	mumble = static_cast<mumble_s*>(mmap(NULL, sizeof(*mumble), PROT_READ | PROT_WRITE, MAP_SHARED, shmfd, 0));
+
 	if (mumble == MAP_FAILED)
 		mumble = NULL;
 #endif
@@ -2738,8 +1645,9 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 	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;
 	}
@@ -2758,11 +1666,12 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 	{
 		UINT8 *p = mumble->context;
 		WRITEMEM(p, server_context, 8);
-		WRITEINT16(p, gamemap);
+		WRITEINT16_2(p, gamemap);
 		mumble->context_len = (UINT32)(p - mumble->context);
 	}
 
-	if (mobj) {
+	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;
@@ -2795,368 +1704,6 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 #undef WINMUMBLE
 #endif // NOMUMBLE
 
-#ifdef HAVE_TERMIOS
-
-void I_GetMouseEvents(void)
-{
-	static UINT8 mdata[5];
-	static INT32 i = 0,om2b = 0;
-	INT32 di, j, mlp, button;
-	event_t event;
-	const INT32 mswap[8] = {0, 4, 1, 5, 2, 6, 3, 7};
-
-	if (!mouse2_started) return;
-	for (mlp = 0; mlp < 20; mlp++)
-	{
-		for (; i < 5; i++)
-		{
-			di = read(fdmouse2, mdata+i, 1);
-			if (di == -1) return;
-		}
-		if ((mdata[0] & 0xf8) != 0x80)
-		{
-			for (j = 1; j < 5; j++)
-				if ((mdata[j] & 0xf8) == 0x80)
-					for (i = 0; i < 5-j; i++) // shift
-						mdata[i] = mdata[i+j];
-			if (i < 5) continue;
-		}
-		else
-		{
-			button = mswap[~mdata[0] & 0x07];
-			for (j = 0; j < MOUSEBUTTONS; j++)
-			{
-				if (om2b & (1<<j))
-				{
-					if (!(button & (1<<j))) //keyup
-					{
-						event.type = ev_keyup;
-						event.data1 = KEY_2MOUSE1+j;
-						D_PostEvent(&event);
-						om2b ^= 1 << j;
-					}
-				}
-				else
-				{
-					if (button & (1<<j))
-					{
-						event.type = ev_keydown;
-						event.data1 = KEY_2MOUSE1+j;
-						D_PostEvent(&event);
-						om2b ^= 1 << j;
-					}
-				}
-			}
-			event.data2 = ((SINT8)mdata[1])+((SINT8)mdata[3]);
-			event.data3 = ((SINT8)mdata[2])+((SINT8)mdata[4]);
-			if (event.data2 && event.data3)
-			{
-				event.type = ev_mouse2;
-				event.data1 = 0;
-				D_PostEvent(&event);
-			}
-		}
-		i = 0;
-	}
-}
-
-//
-// I_ShutdownMouse2
-//
-static void I_ShutdownMouse2(void)
-{
-	if (fdmouse2 != -1) close(fdmouse2);
-	mouse2_started = 0;
-}
-#elif defined (_WIN32)
-
-static HANDLE mouse2filehandle = INVALID_HANDLE_VALUE;
-
-static void I_ShutdownMouse2(void)
-{
-	event_t event;
-	INT32 i;
-
-	if (mouse2filehandle == INVALID_HANDLE_VALUE)
-		return;
-
-	SetCommMask(mouse2filehandle, 0);
-
-	EscapeCommFunction(mouse2filehandle, CLRDTR);
-	EscapeCommFunction(mouse2filehandle, CLRRTS);
-
-	PurgeComm(mouse2filehandle, PURGE_TXABORT | PURGE_RXABORT |
-			  PURGE_TXCLEAR | PURGE_RXCLEAR);
-
-	CloseHandle(mouse2filehandle);
-
-	// emulate the up of all mouse buttons
-	for (i = 0; i < MOUSEBUTTONS; i++)
-	{
-		event.type = ev_keyup;
-		event.data1 = KEY_2MOUSE1+i;
-		D_PostEvent(&event);
-	}
-
-	mouse2filehandle = INVALID_HANDLE_VALUE;
-}
-
-#define MOUSECOMBUFFERSIZE 256
-static INT32 handlermouse2x,handlermouse2y,handlermouse2buttons;
-
-static void I_PoolMouse2(void)
-{
-	UINT8 buffer[MOUSECOMBUFFERSIZE];
-	COMSTAT ComStat;
-	DWORD dwErrorFlags;
-	DWORD dwLength;
-	char dx,dy;
-
-	static INT32 bytenum;
-	static UINT8 combytes[4];
-	DWORD i;
-
-	ClearCommError(mouse2filehandle, &dwErrorFlags, &ComStat);
-	dwLength = min(MOUSECOMBUFFERSIZE, ComStat.cbInQue);
-
-	if (dwLength <= 0)
-		return;
-
-	if (!ReadFile(mouse2filehandle, buffer, dwLength, &dwLength, NULL))
-	{
-		CONS_Alert(CONS_WARNING, "%s", M_GetText("Read Error on secondary mouse port\n"));
-		return;
-	}
-
-	// parse the mouse packets
-	for (i = 0; i < dwLength; i++)
-	{
-		if ((buffer[i] & 64)== 64)
-			bytenum = 0;
-
-		if (bytenum < 4)
-			combytes[bytenum] = buffer[i];
-		bytenum++;
-
-		if (bytenum == 1)
-		{
-			handlermouse2buttons &= ~3;
-			handlermouse2buttons |= ((combytes[0] & (32+16)) >> 4);
-		}
-		else if (bytenum == 3)
-		{
-			dx = (char)((combytes[0] &  3) << 6);
-			dy = (char)((combytes[0] & 12) << 4);
-			dx = (char)(dx + combytes[1]);
-			dy = (char)(dy + combytes[2]);
-			handlermouse2x+= dx;
-			handlermouse2y+= dy;
-		}
-		else if (bytenum == 4) // fourth UINT8 (logitech mouses)
-		{
-			if (buffer[i] & 32)
-				handlermouse2buttons |= 4;
-			else
-				handlermouse2buttons &= ~4;
-		}
-	}
-}
-
-void I_GetMouseEvents(void)
-{
-	static UINT8 lastbuttons2 = 0; //mouse movement
-	event_t event;
-
-	if (mouse2filehandle == INVALID_HANDLE_VALUE)
-		return;
-
-	I_PoolMouse2();
-	// post key event for buttons
-	if (handlermouse2buttons != lastbuttons2)
-	{
-		INT32 i, j = 1, k;
-		k = (handlermouse2buttons ^ lastbuttons2); // only changed bit to 1
-		lastbuttons2 = (UINT8)handlermouse2buttons;
-
-		for (i = 0; i < MOUSEBUTTONS; i++, j <<= 1)
-			if (k & j)
-			{
-				if (handlermouse2buttons & j)
-					event.type = ev_keydown;
-				else
-					event.type = ev_keyup;
-				event.data1 = KEY_2MOUSE1+i;
-				D_PostEvent(&event);
-			}
-	}
-
-	if (handlermouse2x != 0 || handlermouse2y != 0)
-	{
-		event.type = ev_mouse2;
-		event.data1 = 0;
-//		event.data1 = buttons; // not needed
-		event.data2 = handlermouse2x << 1;
-		event.data3 = -handlermouse2y << 1;
-		handlermouse2x = 0;
-		handlermouse2y = 0;
-
-		D_PostEvent(&event);
-	}
-}
-#else
-void I_GetMouseEvents(void){};
-#endif
-
-//
-// I_StartupMouse2
-//
-void I_StartupMouse2(void)
-{
-#ifdef HAVE_TERMIOS
-	struct termios m2tio;
-	size_t i;
-	INT32 dtr = -1, rts = -1;;
-	I_ShutdownMouse2();
-	if (cv_usemouse2.value == 0) return;
-	if ((fdmouse2 = open(cv_mouse2port.string, O_RDONLY|O_NONBLOCK|O_NOCTTY)) == -1)
-	{
-		CONS_Printf(M_GetText("Error opening %s!\n"), cv_mouse2port.string);
-		return;
-	}
-	tcflush(fdmouse2, TCIOFLUSH);
-	m2tio.c_iflag = IGNBRK;
-	m2tio.c_oflag = 0;
-	m2tio.c_cflag = CREAD|CLOCAL|HUPCL|CS8|CSTOPB|B1200;
-	m2tio.c_lflag = 0;
-	m2tio.c_cc[VTIME] = 0;
-	m2tio.c_cc[VMIN] = 1;
-	tcsetattr(fdmouse2, TCSANOW, &m2tio);
-	for (i = 0; i < strlen(cv_mouse2opt.string); i++)
-	{
-		if (toupper(cv_mouse2opt.string[i]) == 'D')
-		{
-			if (cv_mouse2opt.string[i+1] == '-')
-				dtr = 0;
-			else
-				dtr = 1;
-		}
-		if (toupper(cv_mouse2opt.string[i]) == 'R')
-		{
-			if (cv_mouse2opt.string[i+1] == '-')
-				rts = 0;
-			else
-				rts = 1;
-		}
-		if (dtr != -1 || rts != -1)
-		{
-			INT32 c;
-			if (!ioctl(fdmouse2, TIOCMGET, &c))
-			{
-				if (!dtr)
-					c &= ~TIOCM_DTR;
-				else if (dtr > 0)
-					c |= TIOCM_DTR;
-			}
-			if (!rts)
-				c &= ~TIOCM_RTS;
-			else if (rts > 0)
-				c |= TIOCM_RTS;
-			ioctl(fdmouse2, TIOCMSET, &c);
-		}
-	}
-	mouse2_started = 1;
-	I_AddExitFunc(I_ShutdownMouse2);
-#elif defined (_WIN32)
-	DCB dcb;
-
-	if (mouse2filehandle != INVALID_HANDLE_VALUE)
-		I_ShutdownMouse2();
-
-	if (cv_usemouse2.value == 0)
-		return;
-
-	if (mouse2filehandle == INVALID_HANDLE_VALUE)
-	{
-		// COM file handle
-		mouse2filehandle = CreateFileA(cv_mouse2port.string, GENERIC_READ | GENERIC_WRITE,
-									   0,                     // exclusive access
-									   NULL,                  // no security attrs
-									   OPEN_EXISTING,
-									   FILE_ATTRIBUTE_NORMAL,
-									   NULL);
-		if (mouse2filehandle == INVALID_HANDLE_VALUE)
-		{
-			INT32 e = GetLastError();
-			if (e == 5)
-				CONS_Alert(CONS_ERROR, M_GetText("Can't open %s: Access denied\n"), cv_mouse2port.string);
-			else
-				CONS_Alert(CONS_ERROR, M_GetText("Can't open %s: error %d\n"), cv_mouse2port.string, e);
-			return;
-		}
-	}
-
-	// getevent when somthing happens
-	//SetCommMask(mouse2filehandle, EV_RXCHAR);
-
-	// buffers
-	SetupComm(mouse2filehandle, MOUSECOMBUFFERSIZE, MOUSECOMBUFFERSIZE);
-
-	// purge buffers
-	PurgeComm(mouse2filehandle, PURGE_TXABORT | PURGE_RXABORT
-			  | PURGE_TXCLEAR | PURGE_RXCLEAR);
-
-	// setup port to 1200 7N1
-	dcb.DCBlength = sizeof (DCB);
-
-	GetCommState(mouse2filehandle, &dcb);
-
-	dcb.BaudRate = CBR_1200;
-	dcb.ByteSize = 7;
-	dcb.Parity = NOPARITY;
-	dcb.StopBits = ONESTOPBIT;
-
-	dcb.fDtrControl = DTR_CONTROL_ENABLE;
-	dcb.fRtsControl = RTS_CONTROL_ENABLE;
-
-	dcb.fBinary = TRUE;
-	dcb.fParity = TRUE;
-
-	SetCommState(mouse2filehandle, &dcb);
-	I_AddExitFunc(I_ShutdownMouse2);
-#endif
-}
-
-//
-// I_Tactile
-//
-void I_Tactile(FFType pFFType, const JoyFF_t *FFEffect)
-{
-	// UNUSED.
-	(void)pFFType;
-	(void)FFEffect;
-}
-
-void I_Tactile2(FFType pFFType, const JoyFF_t *FFEffect)
-{
-	// UNUSED.
-	(void)pFFType;
-	(void)FFEffect;
-}
-
-void I_Tactile3(FFType pFFType, const JoyFF_t *FFEffect)
-{
-	// UNUSED.
-	(void)pFFType;
-	(void)FFEffect;
-}
-
-void I_Tactile4(FFType pFFType, const JoyFF_t *FFEffect)
-{
-	// UNUSED.
-	(void)pFFType;
-	(void)FFEffect;
-}
-
 /**	\brief empty ticcmd for player 1
 */
 static ticcmd_t emptycmd;
@@ -3276,6 +1823,7 @@ void I_Sleep(UINT32 ms)
 
 void I_SleepDuration(precise_t duration)
 {
+<<<<<<< HEAD:src/sdl/i_system.c
 	#if defined(__linux__) || defined(__FreeBSD__)
 	UINT64 precision = I_GetPrecisePrecision();
 	struct timespec ts = {
@@ -3286,6 +1834,27 @@ void I_SleepDuration(precise_t duration)
 	do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
 	while (status == EINTR);
 	#else
+=======
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__)
+	UINT64 precision = I_GetPrecisePrecision();
+	precise_t dest = I_GetPreciseTime() + duration;
+	precise_t slack = (precision / 5000); // 0.2 ms slack
+	if (duration > slack)
+	{
+		duration -= slack;
+		struct timespec ts = {
+			.tv_sec = static_cast<__time_t>(duration / precision),
+			.tv_nsec = static_cast<__syscall_slong_t>(duration * 1000000000 / precision % 1000000000),
+		};
+		int status;
+		do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
+		while (status == EINTR);
+	}
+
+	// busy-wait the rest
+	while (((INT64)dest - (INT64)I_GetPreciseTime()) > 0);
+#elif defined (MIN_SLEEP_DURATION_MS)
+>>>>>>> Saturn-Next:src/sdl/i_system.cpp
 	UINT64 precision = I_GetPrecisePrecision();
 	INT32 sleepvalue = cv_sleep.value;
 	UINT64 delaygranularity;
@@ -3314,7 +1883,6 @@ void I_SleepDuration(precise_t duration)
 		}
 
 		// Otherwise, this is a spinloop.
-
 		cur = I_GetPreciseTime();
 	}
 	#endif
@@ -3406,13 +1974,18 @@ INT32 I_StartupSystem(void)
 	SDL_version SDLlinked;
 	SDL_VERSION(&SDLcompiled)
 	SDL_GetVersion(&SDLlinked);
+	I_StartupConsole();
+#ifdef NEWSIGNALHANDLER
+	// This is useful when debugging. It lets GDB attach to
+	// the correct process easily.
+	if (!M_CheckParm("-nofork"))
+		I_Fork();
+#endif
 #ifdef HAVE_THREADS
 	I_start_threads();
 	I_AddExitFunc(I_stop_threads);
-#endif
-	I_StartupConsole();
-#ifdef NEWSIGNALHANDLER
-	I_Fork();
+	I_ThreadPoolInit();
+	I_AddExitFunc(I_ThreadPoolShutdown);
 #endif
 	I_RegisterSignals();
 	I_OutputMsg("Compiled for SDL version: %d.%d.%d\n",
@@ -3503,6 +2076,14 @@ void I_Error(const char *error, ...)
 	va_list argptr;
 	char buffer[8192];
 
+#ifdef HAVE_THREADS
+	if (std::this_thread::get_id() != g_main_thread_id)
+	{
+		// Do not attempt a graceful shutdown. Errors off the main thread are unresolvable.
+		exit(-2);
+	}
+#endif
+
 	// recursive error detecting
 	if (shutdowning)
 	{
@@ -3536,7 +2117,7 @@ void I_Error(const char *error, ...)
 			// which should fail gracefully if it can't put a message box up
 			// on the target system
 			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
-				"SRB2Kart "VERSIONSTRING" Recursive Error",
+				"SRB2Kart " VERSIONSTRING " Recursive Error",
 				buffer, NULL);
 
 			W_Shutdown();
@@ -3585,7 +2166,7 @@ void I_Error(const char *error, ...)
 	// which should fail gracefully if it can't put a message box up
 	// on the target system
 	SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
-		"SRB2Kart "VERSIONSTRING" Error",
+		"SRB2Kart " VERSIONSTRING " Error",
 		buffer, NULL);
 	// Note that SDL_ShowSimpleMessageBox does *not* require SDL to be
 	// initialized at the time, so calling it after SDL_Quit() is
@@ -3623,7 +2204,6 @@ void I_AddExitFunc(void (*func)())
 	}
 }
 
-
 //
 //  Removes a function from the list that need to be called by
 //   I_SystemShutdown().
@@ -3647,6 +2227,48 @@ void I_RemoveExitFunc(void (*func)())
 	}
 }
 
+#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
+static void Shittycopyerror(const char *name)
+{
+	I_OutputMsg(
+			"Error copying log file: %s: %s\n",
+			name,
+			strerror(errno)
+	);
+}
+
+static void Shittylogcopy(void)
+{
+	char buf[8192];
+	FILE *fp;
+	size_t r;
+	if (fseek(logstream, 0, SEEK_SET) == -1)
+	{
+		Shittycopyerror("fseek");
+	}
+	else if (( fp = fopen(logfilename, "wt") ))
+	{
+		while (( r = fread(buf, 1, sizeof buf, logstream) ))
+		{
+			if (fwrite(buf, 1, r, fp) < r)
+			{
+				Shittycopyerror("fwrite");
+				break;
+			}
+		}
+		if (ferror(logstream))
+		{
+			Shittycopyerror("fread");
+		}
+		fclose(fp);
+	}
+	else
+	{
+		Shittycopyerror(logfilename);
+	}
+}
+#endif/*!(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))*/
+
 //
 //  Closes down everything. This includes restoring the initial
 //  palette and video mode, and removing whatever mouse, keyboard, and
@@ -3658,9 +2280,10 @@ void I_ShutdownSystem(void)
 {
 	INT32 c;
 
-#ifndef NEWSIGNALHANDLER
-	I_ShutdownConsole();
+#ifdef NEWSIGNALHANDLER
+	if (M_CheckParm("-nofork"))
 #endif
+		I_ShutdownConsole();
 
 	for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
 		if (quit_funcs[c])
@@ -3669,6 +2292,9 @@ void I_ShutdownSystem(void)
 	if (logstream)
 	{
 		I_OutputMsg("I_ShutdownSystem(): end of logstream.\n");
+#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
+		Shittylogcopy();
+#endif
 		fclose(logstream);
 		logstream = NULL;
 	}
@@ -3872,7 +2498,7 @@ const char *I_ClipboardPaste(void)
 */
 static boolean isWadPathOk(const char *path)
 {
-	char *wad3path = malloc(256);
+	char *wad3path = static_cast<char*>(malloc(256));
 
 	if (!wad3path)
 		return false;
@@ -3998,43 +2624,43 @@ static const char *locateWad(void)
 
 	// examine default dirs
 #ifdef DEFAULTWADLOCATION1
-	I_OutputMsg(","DEFAULTWADLOCATION1);
+	I_OutputMsg("," DEFAULTWADLOCATION1);
 	strcpy(returnWadPath, DEFAULTWADLOCATION1);
 	if (isWadPathOk(returnWadPath))
 		return returnWadPath;
 #endif
 #ifdef DEFAULTWADLOCATION2
-	I_OutputMsg(","DEFAULTWADLOCATION2);
+	I_OutputMsg("," DEFAULTWADLOCATION2);
 	strcpy(returnWadPath, DEFAULTWADLOCATION2);
 	if (isWadPathOk(returnWadPath))
 		return returnWadPath;
 #endif
 #ifdef DEFAULTWADLOCATION3
-	I_OutputMsg(","DEFAULTWADLOCATION3);
+	I_OutputMsg("," DEFAULTWADLOCATION3);
 	strcpy(returnWadPath, DEFAULTWADLOCATION3);
 	if (isWadPathOk(returnWadPath))
 		return returnWadPath;
 #endif
 #ifdef DEFAULTWADLOCATION4
-	I_OutputMsg(","DEFAULTWADLOCATION4);
+	I_OutputMsg("," DEFAULTWADLOCATION4);
 	strcpy(returnWadPath, DEFAULTWADLOCATION4);
 	if (isWadPathOk(returnWadPath))
 		return returnWadPath;
 #endif
 #ifdef DEFAULTWADLOCATION5
-	I_OutputMsg(","DEFAULTWADLOCATION5);
+	I_OutputMsg("," DEFAULTWADLOCATION5);
 	strcpy(returnWadPath, DEFAULTWADLOCATION5);
 	if (isWadPathOk(returnWadPath))
 		return returnWadPath;
 #endif
 #ifdef DEFAULTWADLOCATION6
-	I_OutputMsg(","DEFAULTWADLOCATION6);
+	I_OutputMsg("," DEFAULTWADLOCATION6);
 	strcpy(returnWadPath, DEFAULTWADLOCATION6);
 	if (isWadPathOk(returnWadPath))
 		return returnWadPath;
 #endif
 #ifdef DEFAULTWADLOCATION7
-	I_OutputMsg(","DEFAULTWADLOCATION7);
+	I_OutputMsg("," DEFAULTWADLOCATION7);
 	strcpy(returnWadPath, DEFAULTWADLOCATION7);
 	if (isWadPathOk(returnWadPath))
 		return returnWadPath;
@@ -4044,7 +2670,7 @@ static const char *locateWad(void)
 	I_OutputMsg(",HOME/" DEFAULTDIR);
 	if ((envstr = I_GetEnv("HOME")) != NULL)
 	{
-		char *tmp = malloc(strlen(envstr) + sizeof(PATHSEP) + sizeof(DEFAULTDIR));
+		char *tmp = static_cast<char*>(malloc(strlen(envstr) + sizeof(PATHSEP) + sizeof(DEFAULTDIR)));
 		strcpy(tmp, envstr);
 		strcat(tmp, PATHSEP);
 		strcat(tmp, DEFAULTDIR);
@@ -4056,21 +2682,21 @@ static const char *locateWad(void)
 #endif
 #ifdef DEFAULTSEARCHPATH1
 	// find in /usr/local
-	I_OutputMsg(", in:"DEFAULTSEARCHPATH1);
+	I_OutputMsg(", in:" DEFAULTSEARCHPATH1);
 	WadPath = searchWad(DEFAULTSEARCHPATH1);
 	if (WadPath)
 		return WadPath;
 #endif
 #ifdef DEFAULTSEARCHPATH2
 	// find in /usr/games
-	I_OutputMsg(", in:"DEFAULTSEARCHPATH2);
+	I_OutputMsg(", in:" DEFAULTSEARCHPATH2);
 	WadPath = searchWad(DEFAULTSEARCHPATH2);
 	if (WadPath)
 		return WadPath;
 #endif
 #ifdef DEFAULTSEARCHPATH3
 	// find in ???
-	I_OutputMsg(", in:"DEFAULTSEARCHPATH3);
+	I_OutputMsg(", in:" DEFAULTSEARCHPATH3);
 	WadPath = searchWad(DEFAULTSEARCHPATH3);
 	if (WadPath)
 		return WadPath;
@@ -4114,17 +2740,22 @@ const char *I_LocateWad(void)
 static long get_entry(const char* name, const char* buf)
 {
 	long val;
-	char* hit = strstr(buf, name);
-	if (hit == NULL) {
+	const char* hit = strstr(buf, name);
+
+	if (hit == NULL)
+	{
 		return -1;
 	}
 
 	errno = 0;
 	val = strtol(hit + strlen(name), NULL, 10);
-	if (errno != 0) {
+
+	if (errno != 0)
+	{
 		CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
 		return -1;
 	}
+
 	return val;
 }
 #endif
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index a8e00ca82..e2c208450 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -74,15 +74,17 @@
 #include "../i_video.h"
 #include "../console.h"
 #include "../command.h"
-#include "sdlmain.h"
 #include "../i_system.h"
 #include "../hu_stuff.h" // for chat_on
+
+#include "sdlmain.h"
+
 #ifdef HWRENDER
 #include "../hardware/hw_main.h"
-#include "../hardware/hw_drv.h"
+#include "../hardware/hw_gl.h"
 #include "../hardware/r_opengl/r_opengl.h" //for supportFBO
-// For dynamic referencing of HW rendering functions
-#include "hwsym_sdl.h"
+
+#include "hwsym_sdl.h" // For dynamic referencing of HW rendering functions
 #include "ogl_sdl.h"
 #endif
 
@@ -120,7 +122,7 @@ static void KeyboardLayout_OnChange(void)
 
 boolean I_UseNativeKeyboard(void)
 {
-	return cv_keyboardlayout.value == 2 && (chat_on || CON_Ready() || (menu_text_input && menuactive));
+	return (cv_keyboardlayout.value == 2) && (chat_on || CON_Ready() || (menu_text_input && menuactive));
 }
 
 static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {3, "AZERTY"}, {0, NULL}};
@@ -128,10 +130,17 @@ consvar_t cv_keyboardlayout = {"keyboardlayout", "Default US", CV_SAVE|CV_CALL,
 
 static void Impl_SetVsync(void);
 
+static INT32 desktopwidth = 0, desktopheight = 0;
+
+static void I_CheckDesktopRes(void);
+
 // synchronize page flipping with screen refresh
 consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Impl_SetVsync, 0, NULL, NULL, 0, 0, NULL};
 static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
+static void mousegrabOnChange(void);
+consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE|CV_CALL, CV_OnOff, mousegrabOnChange, 0, NULL, NULL, 0, 0, NULL};
+
 // these cant be used since config is read after window creation, so need to use command line parameter instead
 //static CV_PossibleValue_t msaa_cons_t[] = {{0, "Off"}, {2, "2X"}, {4, "4X"}, {8, "8X"}, {16, "16X"}, {0, NULL}};
 //consvar_t cv_msaa = {"msaa", "Off", CV_SAVE, msaa_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -141,7 +150,7 @@ UINT8 graphics_started = 0; // Is used in console.c and screen.c
 // To disable fullscreen at startup; is set in VID_PrepareModeList
 boolean allow_fullscreen = false;
 static SDL_bool disable_fullscreen = SDL_FALSE;
-#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)?0:cv_fullscreen.value
+#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)? 0: (cv_fullscreen.value == 1)
 static SDL_bool disable_mouse = SDL_FALSE;
 #define USE_MOUSEINPUT (!disable_mouse && cv_usemouse.value && havefocus)
 #define MOUSE_MENU false //(!disable_mouse && cv_usemouse.value && menuactive && !USE_FULLSCREEN)
@@ -213,9 +222,11 @@ static INT32 custom_height = 0;
 static void Impl_VideoSetupSDLBuffer(void);
 static void Impl_VideoSetupBuffer(void);
 static SDL_bool Impl_CreateWindow(SDL_bool fullscreen);
-//static void Impl_SetWindowName(const char *title);
 static void Impl_SetWindowIcon(void);
 
+static void SDLdoGrabMouse(void);
+static void SDLdoUngrabMouse(void);
+
 #ifdef USE_FBO_OGL
 boolean downsample = false;
 void RefreshOGLSDLSurface(void)
@@ -225,97 +236,21 @@ void RefreshOGLSDLSurface(void)
 }
 #endif
 
-static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
+static void mousegrabOnChange(void)
 {
-	static SDL_bool wasfullscreen = SDL_FALSE;
-	Uint32 rmask;
-	Uint32 gmask;
-	Uint32 bmask;
-	Uint32 amask;
-	int bpp = 16;
-	int sw_texture_format = SDL_PIXELFORMAT_ABGR8888;
+	static SDL_bool firsttimeonmouse = SDL_TRUE;
 
-	realwidth = vid.width;
-	realheight = vid.height;
-
-	if (window)
+	if (!firsttimeonmouse)
 	{
-		if (fullscreen)
-		{
-			wasfullscreen = SDL_TRUE;
-			SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
-		}
-		else // windowed mode
-		{
-			if (wasfullscreen)
-			{
-				wasfullscreen = SDL_FALSE;
-				SDL_SetWindowFullscreen(window, 0);
-			}
-			// Reposition window only in windowed mode
-			SDL_SetWindowSize(window, width, height);
-			SDL_SetWindowPosition(window,
-				SDL_WINDOWPOS_CENTERED_DISPLAY(SDL_GetWindowDisplayIndex(window)),
-				SDL_WINDOWPOS_CENTERED_DISPLAY(SDL_GetWindowDisplayIndex(window))
-			);
-		}
+		HalfWarpMouse(realwidth, realheight); // warp to center
 	}
 	else
-	{
-		Impl_CreateWindow(fullscreen);
-		Impl_SetWindowIcon();
-		wasfullscreen = fullscreen;
-		SDL_SetWindowSize(window, width, height);
-		if (fullscreen)
-		{
-			SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
-		}
-	}
+		firsttimeonmouse = SDL_FALSE;
 
-#ifdef HWRENDER
-	if (rendermode == render_opengl)
-	{
-		OglSdlSurface(vid.width, vid.height);
-	}
-#endif
-
-	if (rendermode == render_soft)
-	{
-		SDL_RenderClear(renderer);
-		SDL_RenderSetLogicalSize(renderer, width, height);
-		// Set up Texture
-		realwidth = width;
-		realheight = height;
-		if (texture != NULL)
-		{
-			SDL_DestroyTexture(texture);
-		}
-
-		if (!usesdl2soft)
-		{
-			sw_texture_format = SDL_PIXELFORMAT_RGB565;
-		}
-		else
-		{
-			bpp = 32;
-			sw_texture_format = SDL_PIXELFORMAT_RGBA8888;
-		}
-
-		texture = SDL_CreateTexture(renderer, sw_texture_format, SDL_TEXTUREACCESS_STREAMING, width, height);
-
-		// Set up SW surface
-		if (vidSurface != NULL)
-		{
-			SDL_FreeSurface(vidSurface);
-		}
-		if (vid.buffer)
-		{
-			free(vid.buffer);
-			vid.buffer = NULL;
-		}
-		SDL_PixelFormatEnumToMasks(sw_texture_format, &bpp, &rmask, &gmask, &bmask, &amask);
-		vidSurface = SDL_CreateRGBSurface(0, width, height, bpp, rmask, gmask, bmask, amask);
-	}
+	if (cv_usemouse.value || cv_alwaysgrabmouse.value)
+		SDLdoGrabMouse();
+	else
+		SDLdoUngrabMouse();
 }
 
 static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
@@ -325,6 +260,7 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
 		// get lowercase ASCII
 		return code - SDL_SCANCODE_A + 'a';
 	}
+
 	if (code >= SDL_SCANCODE_1 && code <= SDL_SCANCODE_9)
 	{
 		return code - SDL_SCANCODE_1 + '1';
@@ -333,10 +269,12 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
 	{
 		return '0';
 	}
+
 	if (code >= SDL_SCANCODE_F1 && code <= SDL_SCANCODE_F10)
 	{
 		return KEY_F1 + (code - SDL_SCANCODE_F1);
 	}
+
 	switch (code)
 	{
 		// F11 and F12 are separated from the rest of the function keys
@@ -404,26 +342,28 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
 		case SDL_SCANCODE_RGUI:   return KEY_RIGHTWIN;
 		default:                  break;
 	}
+
 	return 0;
 }
 
 // Get the equivalent ASCII (Unicode?) character for a keypress.
-static INT32 GetTypedChar(SDL_Scancode code, SDL_Keysym *sym)
+static INT32 GetTypedChar(SDL_Keysym keysym)
 {
 	SDL_Event next_event;
-	boolean Text_Input_Only = (chat_on || CON_Ready() || (menu_text_input && menuactive));  //only use this this if on chat or console or the current menu wants inputs from us (except if its the control setup menu ig)
+	SDL_Keycode keycode = keysym.sym;
+	SDL_Scancode scancode = keysym.scancode;
 
-	// Special cases, where we always return a fixed value.
-	switch (sym->sym)
+	if (I_UseNativeKeyboard()) // only use this this if on chat or console or the current menu wants inputs from us (except if its the control setup menu ig)
 	{
-		case SDLK_BACKSPACE: return KEY_BACKSPACE;
-		case SDLK_RETURN:    return KEY_ENTER;
-		default:
-			break;
-	}
+		// Special cases, where we always return a fixed value.
+		switch (keycode)
+		{
+			case SDLK_BACKSPACE: return KEY_BACKSPACE;
+			case SDLK_RETURN:    return KEY_ENTER;
+			default:
+				break;
+		}
 
-	if (Text_Input_Only)
-	{
 		if (SDL_PeepEvents(&next_event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT) == 1 && next_event.type == SDL_TEXTINPUT)
 		{
 			if (next_event.text.text[1] == '\0') // limit to ASCII
@@ -431,13 +371,13 @@ static INT32 GetTypedChar(SDL_Scancode code, SDL_Keysym *sym)
 		}
 	}
 
-	return Impl_SDL_Scancode_To_Keycode(code); //fallback
+	return Impl_SDL_Scancode_To_Keycode(scancode); // fallback to scancodes
 }
 
 static INT32 Impl_SDL_Keysym_To_Keycode(SDL_Keysym keysym)
 {
-	SDL_Keycode keycode= keysym.sym;
-	SDL_Scancode scancode= keysym.scancode;
+	SDL_Keycode keycode = keysym.sym;
+	SDL_Scancode scancode = keysym.scancode;
 
 	if (keycode >= SDLK_a && keycode <= SDLK_z)
 	{
@@ -448,15 +388,14 @@ static INT32 Impl_SDL_Keysym_To_Keycode(SDL_Keysym keysym)
 	{
 		return KEY_F1 + (keycode - SDLK_F1);
 	}
-	if(scancode == SDL_SCANCODE_APOSTROPHE)
+
+	switch (scancode)
 	{
-		return KEY_FR_U_GRAVE;
-	}
-	switch(scancode){
 		case SDL_SCANCODE_APOSTROPHE:    return KEY_FR_U_GRAVE;
 		case SDL_SCANCODE_LEFTBRACKET:   return '^';
 		default:               break;
 	}
+
 	switch (keycode)
 	{
 		// F11 and F12 are separated from the rest of the function keys
@@ -509,6 +448,7 @@ static INT32 Impl_SDL_Keysym_To_Keycode(SDL_Keysym keysym)
 
 		default:                  break;
 	}
+
 	return Impl_SDL_Scancode_To_Keycode(scancode);
 }
 
@@ -516,6 +456,7 @@ static void SDLdoGrabMouse(void)
 {
 	SDL_ShowCursor(SDL_DISABLE);
 	SDL_SetWindowGrab(window, SDL_TRUE);
+
 	if (SDL_SetRelativeMouseMode(SDL_TRUE) == 0) // already warps mouse if successful
 		wrapmouseok = SDL_TRUE; // TODO: is wrapmouseok or HalfWarpMouse needed anymore?
 }
@@ -570,65 +511,26 @@ static void SurfaceInfo(const SDL_Surface *infoSurface, const char *SurfaceText)
 
 static void VID_Command_Info_f (void)
 {
-#if 0
-	SDL2STUB();
-#else
-#if 0
-	const SDL_VideoInfo *videoInfo;
-	videoInfo = SDL_GetVideoInfo(); //Alam: Double-Check
-	if (videoInfo)
-	{
-		CONS_Printf("%s", M_GetText("Video Interface Capabilities:\n"));
-		if (videoInfo->hw_available)
-			CONS_Printf("%s", M_GetText(" Hardware surfaces\n"));
-		if (videoInfo->wm_available)
-			CONS_Printf("%s", M_GetText(" Window manager\n"));
-		//UnusedBits1  :6
-		//UnusedBits2  :1
-		if (videoInfo->blit_hw)
-			CONS_Printf("%s", M_GetText(" Accelerated blits HW-2-HW\n"));
-		if (videoInfo->blit_hw_CC)
-			CONS_Printf("%s", M_GetText(" Accelerated blits HW-2-HW with Colorkey\n"));
-		if (videoInfo->wm_available)
-			CONS_Printf("%s", M_GetText(" Accelerated blits HW-2-HW with Alpha\n"));
-		if (videoInfo->blit_sw)
-		{
-			CONS_Printf("%s", M_GetText(" Accelerated blits SW-2-HW\n"));
-			if (!M_CheckParm("-noblit")) videoblitok = SDL_TRUE;
-		}
-		if (videoInfo->blit_sw_CC)
-			CONS_Printf("%s", M_GetText(" Accelerated blits SW-2-HW with Colorkey\n"));
-		if (videoInfo->blit_sw_A)
-			CONS_Printf("%s", M_GetText(" Accelerated blits SW-2-HW with Alpha\n"));
-		if (videoInfo->blit_fill)
-			CONS_Printf("%s", M_GetText(" Accelerated Color filling\n"));
-		//UnusedBits3  :16
-		if (videoInfo->video_mem)
-			CONS_Printf(M_GetText(" There is %i KB of video memory\n"), videoInfo->video_mem);
-		else
-			CONS_Printf("%s", M_GetText(" There no video memory for SDL\n"));
-		//*vfmt
-	}
-#else
-	if (!M_CheckParm("-noblit")) videoblitok = SDL_TRUE;
-#endif
+	if (!M_CheckParm("-noblit"))
+		videoblitok = SDL_TRUE;
+
 	SurfaceInfo(bufSurface, M_GetText("Current Engine Mode"));
 	SurfaceInfo(vidSurface, M_GetText("Current Video Mode"));
-#endif
 }
 
 static void VID_Command_ModeList_f(void)
 {
 	// List windowed modes
 	INT32 i = 0;
+
 	CONS_Printf("NOTE: Under SDL2, all modes are supported on all platforms.\n");
 	CONS_Printf("Under opengl, fullscreen only supports native desktop resolution.\n");
 	CONS_Printf("Under software, the mode is stretched up to desktop resolution.\n");
+
 	for (i = 0; i < MAXWINMODES; i++)
 	{
 		CONS_Printf("%2d: %dx%d\n", i, windowedModes[i][0], windowedModes[i][1]);
 	}
-
 }
 
 static void VID_Command_Mode_f (void)
@@ -649,138 +551,131 @@ static void VID_Command_Mode_f (void)
 		setmodeneeded = modenum+1; // request vid mode change
 }
 
-static inline void SDLJoyRemap(event_t *event)
-{
-	(void)event;
-}
-
 static INT32 SDLJoyAxis(const Sint16 axis, evtype_t which)
 {
 	// -32768 to 32767
 	INT32 raxis = axis/32;
-	if (which == ev_joystick)
-	{
-		if (Joystick.bGamepadStyle)
-		{
-			// gamepad control type, on or off, live or die
-			if (raxis < -(JOYAXISRANGE/2))
-				raxis = -1;
-			else if (raxis > (JOYAXISRANGE/2))
-				raxis = 1;
-			else
-				raxis = 0;
-		}
-		else
-		{
-			raxis = JoyInfo.scale!=1?((raxis/JoyInfo.scale)*JoyInfo.scale):raxis;
+	UINT8 pid;
 
-#ifdef SDL_JDEADZONE
-			if (-SDL_JDEADZONE <= raxis && raxis <= SDL_JDEADZONE)
-				raxis = 0;
-#endif
-		}
+	switch (which)
+	{
+		case ev_joystick:
+			pid = 0;
+			break;
+		case ev_joystick2:
+			pid = 1;
+			break;
+		case ev_joystick3:
+			pid = 2;
+			break;
+		case ev_joystick4:
+			pid = 3;
+			break;
+		default:
+			return 0;
 	}
-	else if (which == ev_joystick2)
-	{
-		if (Joystick2.bGamepadStyle)
-		{
-			// gamepad control type, on or off, live or die
-			if (raxis < -(JOYAXISRANGE/2))
-				raxis = -1;
-			else if (raxis > (JOYAXISRANGE/2))
-				raxis = 1;
-			else raxis = 0;
-		}
-		else
-		{
-			raxis = JoyInfo2.scale!=1?((raxis/JoyInfo2.scale)*JoyInfo2.scale):raxis;
 
-#ifdef SDL_JDEADZONE
-			if (-SDL_JDEADZONE <= raxis && raxis <= SDL_JDEADZONE)
-				raxis = 0;
-#endif
-		}
+	if (Joystick[pid].bGamepadStyle)
+	{
+		// gamepad control type, on or off, live or die
+		if (raxis < -(JOYAXISRANGE/2))
+			raxis = -1;
+		else if (raxis > (JOYAXISRANGE/2))
+			raxis = 1;
+		else
+			raxis = 0;
 	}
-	else if (which == ev_joystick3)
+	else
 	{
-		if (Joystick3.bGamepadStyle)
-		{
-			// gamepad control type, on or off, live or die
-			if (raxis < -(JOYAXISRANGE/2))
-				raxis = -1;
-			else if (raxis > (JOYAXISRANGE/2))
-				raxis = 1;
-			else raxis = 0;
-		}
-		else
-		{
-			raxis = JoyInfo3.scale!=1?((raxis/JoyInfo3.scale)*JoyInfo3.scale):raxis;
+		raxis = JoyInfo[pid].scale!=1?((raxis/JoyInfo[pid].scale)*JoyInfo[pid].scale):raxis;
 
 #ifdef SDL_JDEADZONE
-			if (-SDL_JDEADZONE <= raxis && raxis <= SDL_JDEADZONE)
-				raxis = 0;
+		if (-SDL_JDEADZONE <= raxis && raxis <= SDL_JDEADZONE)
+			raxis = 0;
 #endif
-		}
-	}
-	else if (which == ev_joystick4)
-	{
-		if (Joystick4.bGamepadStyle)
-		{
-			// gamepad control type, on or off, live or die
-			if (raxis < -(JOYAXISRANGE/2))
-				raxis = -1;
-			else if (raxis > (JOYAXISRANGE/2))
-				raxis = 1;
-			else raxis = 0;
-		}
-		else
-		{
-			raxis = JoyInfo4.scale!=1?((raxis/JoyInfo4.scale)*JoyInfo4.scale):raxis;
-
-#ifdef SDL_JDEADZONE
-			if (-SDL_JDEADZONE <= raxis && raxis <= SDL_JDEADZONE)
-				raxis = 0;
-#endif
-		}
 	}
 	return raxis;
 }
 
+// Get the desktop resolution from the current display the gamewindow resides on
+static void I_CheckDesktopRes(void)
+{
+	int currentDisplayIndex = -1;
+	SDL_DisplayMode curmode;
+
+	desktopwidth = 0;
+	desktopheight = 0;
+
+	currentDisplayIndex = SDL_GetWindowDisplayIndex(window);
+
+	// No valid index
+	if (currentDisplayIndex < 0)
+	{
+		return;
+	}
+
+	if (SDL_GetCurrentDisplayMode(currentDisplayIndex, &curmode) != 0)
+	{
+		return;
+	}
+
+	desktopwidth = curmode.w;
+	desktopheight = curmode.h;
+}
+
+// Check if the game resolution matches the desktop resolution
+boolean I_CheckNativeRes(void)
+{
+	return (vid.width == desktopwidth && vid.height == desktopheight);
+}
+
 #ifdef USE_FBO_OGL
 void I_DownSample(void)
 {
-	if (!cv_grframebuffer.value || !(rendermode == render_opengl) || (!supportFBO)) //no sense to do this crap if we cant benefit from it
+	boolean needrefresh = false;
+
+	if (!cv_glframebuffer.value || !supportFBO || (cv_glscreentextures.value == 0)) // no sense to do this crap if we cant benefit from it
 	{
 		downsample = false;
 		return;
 	}
 
-	int currentDisplayIndex = SDL_GetWindowDisplayIndex(window);
-	SDL_DisplayMode curmode;
-
-	if (SDL_GetCurrentDisplayMode(currentDisplayIndex, &curmode) == 0)
+	if (I_CheckNativeRes() && (downsample == true))
 	{
-		if ((vid.width > curmode.w) || (vid.height > curmode.h)) //check if current resolution is higher than current display resolution
-		{
-			downsample = true;
-			RefreshOGLSDLSurface();
-		}
-		else
-			downsample = false; // its not so no need to do crap
+		downsample = false;
+		RefreshOGLSDLSurface();
+		return;
+	}
+
+	if ((vid.width > desktopwidth) || (vid.height > desktopheight)) //check if current resolution is higher than current display resolution
+	{
+		downsample = true;
+		needrefresh = true;
+	}
+	else if (downsample == true)
+	{
+		downsample = false;
+		needrefresh = true;
+	}
+
+	if (needrefresh)
+	{
+		RefreshOGLSDLSurface();
+		needrefresh = false;
 	}
-	else
-			downsample = false; // couldnt get display info so turn the thing off
 }
 #endif
 
 static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 {
+#define FOCUSUNION (mousefocus | (kbfocus << 1) | (windowmoved << 2))
+
 	static SDL_bool firsttimeonmouse = SDL_TRUE;
 	static SDL_bool mousefocus = SDL_TRUE;
 	static SDL_bool kbfocus = SDL_TRUE;
-#ifdef USE_FBO_OGL
 	static SDL_bool windowmoved = SDL_FALSE;
-#endif
+
+	const unsigned int oldfocus = FOCUSUNION;
 
 	switch (evt.event)
 	{
@@ -800,10 +695,21 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 			break;
 		case SDL_WINDOWEVENT_MAXIMIZED:
 			break;
-#ifdef USE_FBO_OGL
 		case SDL_WINDOWEVENT_MOVED:
 			windowmoved = SDL_TRUE;
             break;
+	}
+
+	if (FOCUSUNION == oldfocus) // No state change
+	{
+		return;
+	}
+
+	if (windowmoved && rendermode == render_opengl)
+	{
+		I_CheckDesktopRes();
+#ifdef USE_FBO_OGL
+		I_DownSample();
 #endif
 	}
 
@@ -821,21 +727,22 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 		{
 			if (cv_usemouse.value) I_StartupMouse();
 		}
-		//else firsttimeonmouse = SDL_FALSE;
 	}
 	else if (!mousefocus && !kbfocus)
 	{
 		// Tell game we lost focus, pause music
 		window_notinfocus = true;
-		if (! cv_playmusicifunfocused.value)
+
+		if (!cv_playmusicifunfocused.value)
 			I_SetMusicVolume(0);
-		if (! cv_playsoundifunfocused.value)
+		if (!cv_playsoundifunfocused.value)
 			S_StopSounds();
 
 		if (!disable_mouse)
 		{
 			SDLforceUngrabMouse();
 		}
+
 		memset(gamekeydown, 0, NUMKEYS); // TODO this is a scary memset
 
 		if (MOUSE_MENU)
@@ -843,46 +750,49 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 			SDLdoUngrabMouse();
 		}
 	}
-
-#ifdef USE_FBO_OGL
-	if (windowmoved && rendermode == render_opengl)
-	{
-		I_DownSample();
-	}
-#endif
+#undef FOCUSUNION
 }
 
 static void Impl_HandleKeyboardEvent(SDL_KeyboardEvent evt, Uint32 type)
 {
 	event_t event;
-	if (type == SDL_KEYUP)
+
+	switch (type)
 	{
-		event.type = ev_keyup;
-	}
-	else if (type == SDL_KEYDOWN)
-	{
-		event.type = ev_keydown;
-	}
-	else
-	{
-		return;
+		case SDL_KEYUP:
+			event.type = ev_keyup;
+			break;
+		case SDL_KEYDOWN:
+			event.type = ev_keydown;
+			break;
+		default:
+			return;
 	}
 
-	if (cv_keyboardlayout.value == 2)
-		event.data1 = GetTypedChar(evt.keysym.scancode, &evt.keysym);
-	else if (cv_keyboardlayout.value == 3)
-		event.data1 = Impl_SDL_Keysym_To_Keycode(evt.keysym);
-	else
-		event.data1 = Impl_SDL_Scancode_To_Keycode(evt.keysym.scancode);
+	switch (cv_keyboardlayout.value)
+	{
+		case 2: // "native"
+			event.data1 = GetTypedChar(evt.keysym);
+			break;
+		case 3: // AZERTY
+			event.data1 = Impl_SDL_Keysym_To_Keycode(evt.keysym);
+			break;
+		default:
+			event.data1 = Impl_SDL_Scancode_To_Keycode(evt.keysym.scancode);
+			break;
+	}
 
-	if (event.data1) D_PostEvent(&event);
+	if (event.data1)
+		D_PostEvent(&event);
 }
 
 static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
 {
 	if (USE_MOUSEINPUT)
 	{
-		if ((SDL_GetMouseFocus() != window && SDL_GetKeyboardFocus() != window))
+		const boolean windowinfocus = (SDL_GetMouseFocus() == window && SDL_GetKeyboardFocus() == window);
+
+		if (!windowinfocus)
 		{
 			SDLdoUngrabMouse();
 			return;
@@ -892,7 +802,7 @@ static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
 		// add on the offsets so we can make an overall event later.
 		if (SDL_GetRelativeMouseMode())
 		{
-			if (SDL_GetMouseFocus() == window && SDL_GetKeyboardFocus() == window)
+			if (windowinfocus)
 			{
 				mousemovex +=  evt.xrel;
 				mousemovey += -evt.yrel;
@@ -912,7 +822,21 @@ static void Impl_HandleMouseMotionEvent(SDL_MouseMotionEvent evt)
 		// just grab and set relative mode
 		// this fixes the stupid camera jerk on mouse entering bug
 		// -- Monster Iestyn
-		if (SDL_GetMouseFocus() == window && SDL_GetKeyboardFocus() == window)
+		if (windowinfocus)
+		{
+			SDLdoGrabMouse();
+		}
+	}
+	else if (cv_alwaysgrabmouse.value)
+	{
+		const boolean windowinfocus = (SDL_GetMouseFocus() == window && SDL_GetKeyboardFocus() == window);
+
+		if (!windowinfocus)
+		{
+			SDLdoUngrabMouse();
+			return;
+		}
+		else if (windowinfocus)
 		{
 			SDLdoGrabMouse();
 		}
@@ -923,8 +847,6 @@ static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
 {
 	event_t event;
 
-	SDL_memset(&event, 0, sizeof(event_t));
-
 	// Ignore the event if the mouse is not actually focused on the window.
 	// This can happen if you used the mouse to restore keyboard focus;
 	// this apparently makes a mouse button down event but not a mouse button up event,
@@ -936,25 +858,39 @@ static void Impl_HandleMouseButtonEvent(SDL_MouseButtonEvent evt, Uint32 type)
 	/// \todo inputEvent.button.which
 	if (USE_MOUSEINPUT)
 	{
-		if (type == SDL_MOUSEBUTTONUP)
+		SDL_memset(&event, 0, sizeof(event_t));
+
+		switch (type)
 		{
-			event.type = ev_keyup;
+			case SDL_MOUSEBUTTONUP:
+				event.type = ev_keyup;
+				break;
+			case SDL_MOUSEBUTTONDOWN:
+				event.type = ev_keydown;
+				break;
+			default:
+				return;
 		}
-		else if (type == SDL_MOUSEBUTTONDOWN)
+
+		switch (evt.button)
 		{
-			event.type = ev_keydown;
+			case SDL_BUTTON_MIDDLE:
+				event.data1 = KEY_MOUSE1+2;
+				break;
+			case SDL_BUTTON_RIGHT:
+				event.data1 = KEY_MOUSE1+1;
+				break;
+			case SDL_BUTTON_LEFT:
+				event.data1 = KEY_MOUSE1;
+				break;
+			case SDL_BUTTON_X1:
+				event.data1 = KEY_MOUSE1+3;
+				break;
+			case SDL_BUTTON_X2:
+				event.data1 = KEY_MOUSE1+4;
+				break;
 		}
-		else return;
-		if (evt.button == SDL_BUTTON_MIDDLE)
-			event.data1 = KEY_MOUSE1+2;
-		else if (evt.button == SDL_BUTTON_RIGHT)
-			event.data1 = KEY_MOUSE1+1;
-		else if (evt.button == SDL_BUTTON_LEFT)
-			event.data1 = KEY_MOUSE1;
-		else if (evt.button == SDL_BUTTON_X1)
-			event.data1 = KEY_MOUSE1+3;
-		else if (evt.button == SDL_BUTTON_X2)
-			event.data1 = KEY_MOUSE1+4;
+
 		if (event.type == ev_keyup || event.type == ev_keydown)
 		{
 			D_PostEvent(&event);
@@ -966,26 +902,29 @@ static void Impl_HandleMouseWheelEvent(SDL_MouseWheelEvent evt)
 {
 	event_t event;
 
-	SDL_memset(&event, 0, sizeof(event_t));
+	if (USE_MOUSEINPUT)
+	{
+		SDL_memset(&event, 0, sizeof(event_t));
 
-	if (evt.y > 0)
-	{
-		event.data1 = KEY_MOUSEWHEELUP;
-		event.type = ev_keydown;
-	}
-	if (evt.y < 0)
-	{
-		event.data1 = KEY_MOUSEWHEELDOWN;
-		event.type = ev_keydown;
-	}
-	if (evt.y == 0)
-	{
-		event.data1 = 0;
-		event.type = ev_keyup;
-	}
-	if (event.type == ev_keyup || event.type == ev_keydown)
-	{
-		D_PostEvent(&event);
+		if (evt.y > 0)
+		{
+			event.data1 = KEY_MOUSEWHEELUP;
+			event.type = ev_keydown;
+		}
+		if (evt.y < 0)
+		{
+			event.data1 = KEY_MOUSEWHEELDOWN;
+			event.type = ev_keydown;
+		}
+		if (evt.y == 0)
+		{
+			event.data1 = 0;
+			event.type = ev_keyup;
+		}
+		if (event.type == ev_keyup || event.type == ev_keydown)
+		{
+			D_PostEvent(&event);
+		}
 	}
 }
 
@@ -994,12 +933,13 @@ static void Impl_HandleControllerAxisEvent(SDL_ControllerAxisEvent evt)
 	event_t event;
 	SDL_JoystickID joyid[4];
 	INT32 value;
+	UINT8 i;
 
 	// Determine the Joystick IDs for each current open joystick
-	joyid[0] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo.dev));
-	joyid[1] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo2.dev));
-	joyid[2] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo3.dev));
-	joyid[3] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo4.dev));
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		joyid[i] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo[i].dev));
+	}
 
 	event.data1 = event.data2 = event.data3 = INT32_MAX;
 
@@ -1019,10 +959,13 @@ static void Impl_HandleControllerAxisEvent(SDL_ControllerAxisEvent evt)
 	{
 		event.type = ev_joystick4;
 	}
-	else return;
+	else
+		return;
+
 	//axis
 	if (evt.axis > JOYAXISSET*2)
 		return;
+
 	//vaule
 	value = SDLJoyAxis(evt.value, event.type);
 	switch (evt.axis)
@@ -1057,45 +1000,19 @@ static void Impl_HandleControllerAxisEvent(SDL_ControllerAxisEvent evt)
 	D_PostEvent(&event);
 }
 
-#if 0
-static void Impl_HandleJoystickHatEvent(SDL_JoyHatEvent evt)
-{
-	event_t event;
-	SDL_JoystickID joyid[2];
-
-	// Determine the Joystick IDs for each current open joystick
-	joyid[0] = SDL_JoystickInstanceID(JoyInfo.dev);
-	joyid[1] = SDL_JoystickInstanceID(JoyInfo2.dev);
-
-	if (evt.hat >= JOYHATS)
-		return; // ignore hats with too high an index
-
-	if (evt.which == joyid[0])
-	{
-		event.data1 = KEY_HAT1 + (evt.hat*4);
-	}
-	else if (evt.which == joyid[1])
-	{
-		event.data1 = KEY_2HAT1 + (evt.hat*4);
-	}
-	else return;
-
-	// NOTE: UNFINISHED
-}
-#endif
-
 static void Impl_HandleControllerButtonEvent(SDL_ControllerButtonEvent evt, Uint32 type)
 {
 	event_t event;
 	SDL_JoystickID joyid[4];
+	UINT8 i;
 
 	// Determine the Joystick IDs for each current open joystick
-	joyid[0] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo.dev));
-	joyid[1] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo2.dev));
-	joyid[2] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo3.dev));
-	joyid[3] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo4.dev));
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		joyid[i] = SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(JoyInfo[i].dev));
+	}
 
-	if (evt.button == SDL_CONTROLLER_BUTTON_DPAD_UP
+	if (   evt.button == SDL_CONTROLLER_BUTTON_DPAD_UP
 		|| evt.button == SDL_CONTROLLER_BUTTON_DPAD_DOWN
 		|| evt.button == SDL_CONTROLLER_BUTTON_DPAD_LEFT
 		|| evt.button == SDL_CONTROLLER_BUTTON_DPAD_RIGHT)
@@ -1120,35 +1037,180 @@ static void Impl_HandleControllerButtonEvent(SDL_ControllerButtonEvent evt, Uint
 	{
 		event.data1 = KEY_4JOY1;
 	}
-	else return;
-	if (type == SDL_CONTROLLERBUTTONUP)
+	else
+		return;
+
+	switch (type)
 	{
-		event.type = ev_keyup;
+		case SDL_CONTROLLERBUTTONUP:
+			event.type = ev_keyup;
+			break;
+		case SDL_CONTROLLERBUTTONDOWN:
+			event.type = ev_keydown;
+			break;
+		default:
+			return;
 	}
-	else if (type == SDL_CONTROLLERBUTTONDOWN)
-	{
-		event.type = ev_keydown;
-	}
-	else return;
+
 	if (evt.button < JOYBUTTONS)
 	{
 		event.data1 += evt.button;
 	}
-	else return;
+	else
+		return;
 
-	SDLJoyRemap(&event);
-	if (event.type != ev_console) D_PostEvent(&event);
+	if (event.type != ev_console)
+		D_PostEvent(&event);
 }
 
+static void Impl_HandleControllerAddedEvent(SDL_Event evt)
+{
+	INT32 i;
 
+	// OH BOY are you in for a good time! #abominationstation
+	SDL_GameController *newcontroller = SDL_GameControllerOpen(evt.cdevice.which);
+
+	CONS_Debug(DBG_GAMELOGIC, "Joystick device index %d added\n", evt.jdevice.which + 1);
+
+	////////////////////////////////////////////////////////////
+	// Because SDL's device index is unstable, we're going to cheat here a bit:
+	// For the first joystick setting that is NOT active:
+	//
+	// 1. Set cv_usejoystickX.value to the new device index (this does not change what is written to config.cfg)
+	//
+	// 2. Set OTHERS' cv_usejoystickX.value to THEIR new device index, because it likely changed
+	//    * If device doesn't exist, switch cv_usejoystick back to default value (.string)
+	//      * BUT: If that default index is being occupied, use ANOTHER cv_usejoystick's default value!
+	////////////////////////////////////////////////////////////
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (newcontroller && (!JoyInfo[i].dev || !SDL_GameControllerGetAttached(JoyInfo[i].dev)))
+		{
+			UINT8 j;
+
+			for (j = 0; j < MAXSPLITSCREENPLAYERS; j++)
+			{
+				if (i == j)
+					continue;
+
+				if (JoyInfo[j].dev == newcontroller)
+					break;
+			}
+
+			if (j == MAXSPLITSCREENPLAYERS)
+			{
+				// ensures we aren't overriding a currently active device
+				cv_usejoystick[i].value = evt.jdevice.which + 1;
+				I_UpdateJoystickDeviceIndices(0);
+			}
+		}
+	}
+
+	////////////////////////////////////////////////////////////
+	// Was cv_usejoystick disabled in settings?
+	////////////////////////////////////////////////////////////
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (!strcmp(cv_usejoystick[i].string, "0") || !cv_usejoystick[i].value)
+			cv_usejoystick[i].value = 0;
+		else if (atoi(cv_usejoystick[i].string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
+			&& cv_usejoystick[i].value) // update the cvar ONLY if a device exists
+		CV_SetValue(&cv_usejoystick[i], cv_usejoystick[i].value);
+	}
+
+	////////////////////////////////////////////////////////////
+	// Update all joysticks' init states
+	// This is a little wasteful since cv_usejoystick already calls this, but
+	// we need to do this in case CV_SetValue did nothing because the string was already same.
+	// if the device is already active, this should do nothing, effectively.
+	////////////////////////////////////////////////////////////
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		I_InitJoystick(i);
+		G_SetPlayerGamepadIndicatorColor(i, G_GetSkinColor(i)); // gotta update the controller led again on reconnect
+	}
+
+	////////////////////////////////////////////////////////////
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+		CONS_Debug(DBG_GAMELOGIC, "Joystick%d device index: %d\n", i+1, JoyInfo[i].oldjoy);
+
+	// update the menu
+	if (currentMenu == &OP_JoystickSetDef)
+		M_SetupJoystickMenu(0);
+
+	numcontrollers = I_NumJoys();
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (JoyInfo[i].dev == newcontroller)
+			break;
+	}
+
+	if (i == MAXSPLITSCREENPLAYERS)
+		SDL_GameControllerClose(newcontroller);
+}
+
+static void Impl_HandleControllerRemovedEvent(void)
+{
+	INT32 i;
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (JoyInfo[i].dev && !SDL_GameControllerGetAttached(JoyInfo[i].dev))
+		{
+			CONS_Debug(DBG_GAMELOGIC, "Joystick%d removed, device index: %d\n", i+1, JoyInfo[i].oldjoy);
+			I_ShutdownJoystick(i);
+		}
+	}
+
+	////////////////////////////////////////////////////////////
+	// Update the device indexes, because they likely changed
+	// * If device doesn't exist, switch cv_usejoystick back to default value (.string)
+	//   * BUT: If that default index is being occupied, use ANOTHER cv_usejoystick's default value!
+	////////////////////////////////////////////////////////////
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		I_UpdateJoystickDeviceIndex(i);
+	}
+
+	////////////////////////////////////////////////////////////
+	// Was cv_usejoystick disabled in settings?
+	////////////////////////////////////////////////////////////
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+	{
+		if (!strcmp(cv_usejoystick[i].string, "0"))
+		{
+			cv_usejoystick[i].value = 0;
+		}
+		else if (atoi(cv_usejoystick[i].string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
+			&& cv_usejoystick[i].value) // update the cvar ONLY if a device exists
+		{
+			CV_SetValue(&cv_usejoystick[i], cv_usejoystick[i].value);
+		}
+	}
+
+	////////////////////////////////////////////////////////////
+
+	for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+		CONS_Debug(DBG_GAMELOGIC, "Joystick%d device index: %d\n", i+1, JoyInfo[i].oldjoy);
+
+	// update the menu
+	if (currentMenu == &OP_JoystickSetDef)
+		M_SetupJoystickMenu(0);
+
+	numcontrollers = I_NumJoys();
+}
 
 void I_GetEvent(void)
 {
 	SDL_Event evt;
 	char* dropped_filedir;
-	// We only want the first motion event,
-	// otherwise we'll end up catching the warp back to center.
-	//int mouseMotionOnce = 0;
 
 	if (!graphics_started)
 	{
@@ -1169,9 +1231,7 @@ void I_GetEvent(void)
 				Impl_HandleKeyboardEvent(evt.key, evt.type);
 				break;
 			case SDL_MOUSEMOTION:
-				//if (!mouseMotionOnce)
 				Impl_HandleMouseMotionEvent(evt.motion);
-				//mouseMotionOnce = 1;
 				break;
 			case SDL_MOUSEBUTTONUP:
 			case SDL_MOUSEBUTTONDOWN:
@@ -1183,292 +1243,15 @@ void I_GetEvent(void)
 			case SDL_CONTROLLERAXISMOTION:
 				Impl_HandleControllerAxisEvent(evt.caxis);
 				break;
-#if 0
-			case SDL_JOYHATMOTION:
-				Impl_HandleJoystickHatEvent(evt.jhat)
-				break;
-#endif
 			case SDL_CONTROLLERBUTTONUP:
 			case SDL_CONTROLLERBUTTONDOWN:
 				Impl_HandleControllerButtonEvent(evt.cbutton, evt.type);
 				break;
-
-			////////////////////////////////////////////////////////////
-
 			case SDL_CONTROLLERDEVICEADDED:
-				{
-					// OH BOY are you in for a good time! #abominationstation
-
-					SDL_GameController *newcontroller = SDL_GameControllerOpen(evt.cdevice.which);
-
-					CONS_Debug(DBG_GAMELOGIC, "Joystick device index %d added\n", evt.jdevice.which + 1);
-
-					////////////////////////////////////////////////////////////
-					// Because SDL's device index is unstable, we're going to cheat here a bit:
-					// For the first joystick setting that is NOT active:
-					//
-					// 1. Set cv_usejoystickX.value to the new device index (this does not change what is written to config.cfg)
-					//
-					// 2. Set OTHERS' cv_usejoystickX.value to THEIR new device index, because it likely changed
-					//    * If device doesn't exist, switch cv_usejoystick back to default value (.string)
-					//      * BUT: If that default index is being occupied, use ANOTHER cv_usejoystick's default value!
-					////////////////////////////////////////////////////////////
-
-					//////////////////////////////
-					// PLAYER 1
-					//////////////////////////////
-
-					if (newcontroller && (!JoyInfo.dev || !SDL_GameControllerGetAttached(JoyInfo.dev))
-						&& JoyInfo2.dev != newcontroller && JoyInfo3.dev != newcontroller && JoyInfo4.dev != newcontroller) // don't override a currently active device
-					{
-						cv_usejoystick.value = evt.cdevice.which + 1;
-						I_UpdateJoystickDeviceIndices(1);
-					}
-
-					//////////////////////////////
-					// PLAYER 2
-					//////////////////////////////
-
-					else if (newcontroller && (!JoyInfo2.dev || !SDL_GameControllerGetAttached(JoyInfo2.dev))
-						&& JoyInfo.dev != newcontroller && JoyInfo3.dev != newcontroller && JoyInfo4.dev != newcontroller) // don't override a currently active device
-					{
-						cv_usejoystick2.value = evt.cdevice.which + 1;
-						I_UpdateJoystickDeviceIndices(2);
-					}
-
-					//////////////////////////////
-					// PLAYER 3
-					//////////////////////////////
-
-					else if (newcontroller && (!JoyInfo3.dev || !SDL_GameControllerGetAttached(JoyInfo3.dev))
-						&& JoyInfo.dev != newcontroller && JoyInfo2.dev != newcontroller && JoyInfo4.dev != newcontroller) // don't override a currently active device
-					{
-						cv_usejoystick3.value = evt.cdevice.which + 1;
-						I_UpdateJoystickDeviceIndices(3);
-					}
-
-					//////////////////////////////
-					// PLAYER 4
-					//////////////////////////////
-
-					else if (newcontroller && (!JoyInfo4.dev || !SDL_GameControllerGetAttached(JoyInfo4.dev))
-						&& JoyInfo.dev != newcontroller && JoyInfo2.dev != newcontroller && JoyInfo3.dev != newcontroller) // don't override a currently active device
-					{
-						cv_usejoystick4.value = evt.cdevice.which + 1;
-						I_UpdateJoystickDeviceIndices(4);
-					}
-
-					////////////////////////////////////////////////////////////
-					// Was cv_usejoystick disabled in settings?
-					////////////////////////////////////////////////////////////
-
-					if (!strcmp(cv_usejoystick.string, "0") || !cv_usejoystick.value)
-						cv_usejoystick.value = 0;
-					else if (atoi(cv_usejoystick.string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
-						     && cv_usejoystick.value) // update the cvar ONLY if a device exists
-						CV_SetValue(&cv_usejoystick, cv_usejoystick.value);
-
-					if (!strcmp(cv_usejoystick2.string, "0") || !cv_usejoystick2.value)
-						cv_usejoystick2.value = 0;
-					else if (atoi(cv_usejoystick2.string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
-					         && cv_usejoystick2.value) // update the cvar ONLY if a device exists
-						CV_SetValue(&cv_usejoystick2, cv_usejoystick2.value);
-
-					if (!strcmp(cv_usejoystick3.string, "0") || !cv_usejoystick3.value)
-						cv_usejoystick3.value = 0;
-					else if (atoi(cv_usejoystick3.string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
-						&& cv_usejoystick3.value) // update the cvar ONLY if a device exists
-						CV_SetValue(&cv_usejoystick3, cv_usejoystick3.value);
-
-					if (!strcmp(cv_usejoystick4.string, "0") || !cv_usejoystick4.value)
-						cv_usejoystick4.value = 0;
-					else if (atoi(cv_usejoystick4.string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
-						&& cv_usejoystick4.value) // update the cvar ONLY if a device exists
-						CV_SetValue(&cv_usejoystick4, cv_usejoystick4.value);
-
-					////////////////////////////////////////////////////////////
-					// Update all joysticks' init states
-					// This is a little wasteful since cv_usejoystick already calls this, but
-					// we need to do this in case CV_SetValue did nothing because the string was already same.
-					// if the device is already active, this should do nothing, effectively.
-					////////////////////////////////////////////////////////////
-
-					I_InitJoystick();
-					I_InitJoystick2();
-					I_InitJoystick3();
-					I_InitJoystick4();
-
-					////////////////////////////////////////////////////////////
-
-					CONS_Debug(DBG_GAMELOGIC, "Joystick1 device index: %d\n", JoyInfo.oldjoy);
-					CONS_Debug(DBG_GAMELOGIC, "Joystick2 device index: %d\n", JoyInfo2.oldjoy);
-					CONS_Debug(DBG_GAMELOGIC, "Joystick3 device index: %d\n", JoyInfo3.oldjoy);
-					CONS_Debug(DBG_GAMELOGIC, "Joystick4 device index: %d\n", JoyInfo4.oldjoy);
-
-					// update the menu
-					if (currentMenu == &OP_JoystickSetDef)
-						M_SetupJoystickMenu(0);
-
-					if (JoyInfo.dev != newcontroller && JoyInfo2.dev != newcontroller && JoyInfo3.dev != newcontroller && JoyInfo4.dev != newcontroller)
-						SDL_GameControllerClose(newcontroller);
-				}
+				Impl_HandleControllerAddedEvent(evt);
 				break;
-
-			////////////////////////////////////////////////////////////
-
 			case SDL_CONTROLLERDEVICEREMOVED:
-				if (JoyInfo.dev && !SDL_GameControllerGetAttached(JoyInfo.dev))
-				{
-					CONS_Debug(DBG_GAMELOGIC, "Joystick1 removed, device index: %d\n", JoyInfo.oldjoy);
-					I_ShutdownJoystick();
-				}
-
-				if (JoyInfo2.dev && !SDL_GameControllerGetAttached(JoyInfo2.dev))
-				{
-					CONS_Debug(DBG_GAMELOGIC, "Joystick2 removed, device index: %d\n", JoyInfo2.oldjoy);
-					I_ShutdownJoystick2();
-				}
-
-				if (JoyInfo3.dev && !SDL_GameControllerGetAttached(JoyInfo3.dev))
-				{
-					CONS_Debug(DBG_GAMELOGIC, "Joystick3 removed, device index: %d\n", JoyInfo3.oldjoy);
-					I_ShutdownJoystick3();
-				}
-
-				if (JoyInfo4.dev && !SDL_GameControllerGetAttached(JoyInfo4.dev))
-				{
-					CONS_Debug(DBG_GAMELOGIC, "Joystick4 removed, device index: %d\n", JoyInfo4.oldjoy);
-					I_ShutdownJoystick4();
-				}
-
-				////////////////////////////////////////////////////////////
-				// Update the device indexes, because they likely changed
-				// * If device doesn't exist, switch cv_usejoystick back to default value (.string)
-				//   * BUT: If that default index is being occupied, use ANOTHER cv_usejoystick's default value!
-				////////////////////////////////////////////////////////////
-
-				if (JoyInfo.dev)
-					cv_usejoystick.value = JoyInfo.oldjoy = I_GetJoystickDeviceIndex(JoyInfo.dev) + 1;
-				else if (atoi(cv_usejoystick.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick.string) != JoyInfo3.oldjoy
-					&& atoi(cv_usejoystick.string) != JoyInfo4.oldjoy)
-					cv_usejoystick.value = atoi(cv_usejoystick.string);
-				else if (atoi(cv_usejoystick2.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick2.string) != JoyInfo3.oldjoy
-					&& atoi(cv_usejoystick2.string) != JoyInfo4.oldjoy)
-					cv_usejoystick.value = atoi(cv_usejoystick2.string);
-				else if (atoi(cv_usejoystick3.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick3.string) != JoyInfo3.oldjoy
-					&& atoi(cv_usejoystick3.string) != JoyInfo4.oldjoy)
-					cv_usejoystick.value = atoi(cv_usejoystick3.string);
-				else if (atoi(cv_usejoystick4.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick4.string) != JoyInfo3.oldjoy
-					&& atoi(cv_usejoystick4.string) != JoyInfo4.oldjoy)
-					cv_usejoystick.value = atoi(cv_usejoystick4.string);
-				else // we tried...
-					cv_usejoystick.value = 0;
-
-				if (JoyInfo2.dev)
-					cv_usejoystick2.value = JoyInfo2.oldjoy = I_GetJoystickDeviceIndex(JoyInfo2.dev) + 1;
-				else if (atoi(cv_usejoystick.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick.string) != JoyInfo3.oldjoy
-					&& atoi(cv_usejoystick.string) != JoyInfo4.oldjoy)
-					cv_usejoystick2.value = atoi(cv_usejoystick.string);
-				else if (atoi(cv_usejoystick2.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick2.string) != JoyInfo3.oldjoy
-					&& atoi(cv_usejoystick2.string) != JoyInfo4.oldjoy)
-					cv_usejoystick2.value = atoi(cv_usejoystick2.string);
-				else if (atoi(cv_usejoystick3.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick3.string) != JoyInfo3.oldjoy
-					&& atoi(cv_usejoystick3.string) != JoyInfo4.oldjoy)
-					cv_usejoystick2.value = atoi(cv_usejoystick3.string);
-				else if (atoi(cv_usejoystick4.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick4.string) != JoyInfo3.oldjoy
-					&& atoi(cv_usejoystick4.string) != JoyInfo4.oldjoy)
-					cv_usejoystick2.value = atoi(cv_usejoystick4.string);
-				else // we tried...
-					cv_usejoystick2.value = 0;
-
-				if (JoyInfo3.dev)
-					cv_usejoystick3.value = JoyInfo3.oldjoy = I_GetJoystickDeviceIndex(JoyInfo3.dev) + 1;
-				else if (atoi(cv_usejoystick.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick.string) != JoyInfo4.oldjoy)
-					cv_usejoystick3.value = atoi(cv_usejoystick.string);
-				else if (atoi(cv_usejoystick2.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick2.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick2.string) != JoyInfo4.oldjoy)
-					cv_usejoystick3.value = atoi(cv_usejoystick2.string);
-				else if (atoi(cv_usejoystick3.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick3.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick3.string) != JoyInfo4.oldjoy)
-					cv_usejoystick3.value = atoi(cv_usejoystick3.string);
-				else if (atoi(cv_usejoystick4.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick4.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick4.string) != JoyInfo4.oldjoy)
-					cv_usejoystick3.value = atoi(cv_usejoystick4.string);
-				else // we tried...
-					cv_usejoystick3.value = 0;
-
-				if (JoyInfo4.dev)
-					cv_usejoystick4.value = JoyInfo4.oldjoy = I_GetJoystickDeviceIndex(JoyInfo4.dev) + 1;
-				else if (atoi(cv_usejoystick.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick.string) != JoyInfo3.oldjoy)
-					cv_usejoystick4.value = atoi(cv_usejoystick.string);
-				else if (atoi(cv_usejoystick2.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick2.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick2.string) != JoyInfo3.oldjoy)
-					cv_usejoystick4.value = atoi(cv_usejoystick2.string);
-				else if (atoi(cv_usejoystick3.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick3.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick3.string) != JoyInfo3.oldjoy)
-					cv_usejoystick4.value = atoi(cv_usejoystick3.string);
-				else if (atoi(cv_usejoystick4.string) != JoyInfo.oldjoy
-					&& atoi(cv_usejoystick4.string) != JoyInfo2.oldjoy
-					&& atoi(cv_usejoystick4.string) != JoyInfo3.oldjoy)
-					cv_usejoystick4.value = atoi(cv_usejoystick4.string);
-				else // we tried...
-					cv_usejoystick4.value = 0;
-
-				////////////////////////////////////////////////////////////
-				// Was cv_usejoystick disabled in settings?
-				////////////////////////////////////////////////////////////
-
-				if (!strcmp(cv_usejoystick.string, "0"))
-					cv_usejoystick.value = 0;
-				else if (atoi(cv_usejoystick.string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
-						 && cv_usejoystick.value) // update the cvar ONLY if a device exists
-					CV_SetValue(&cv_usejoystick, cv_usejoystick.value);
-
-				if (!strcmp(cv_usejoystick2.string, "0"))
-					cv_usejoystick2.value = 0;
-				else if (atoi(cv_usejoystick2.string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
-						 && cv_usejoystick2.value) // update the cvar ONLY if a device exists
-					CV_SetValue(&cv_usejoystick2, cv_usejoystick2.value);
-
-				if (!strcmp(cv_usejoystick3.string, "0"))
-					cv_usejoystick3.value = 0;
-				else if (atoi(cv_usejoystick3.string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
-					&& cv_usejoystick3.value) // update the cvar ONLY if a device exists
-					CV_SetValue(&cv_usejoystick3, cv_usejoystick3.value);
-
-				if (!strcmp(cv_usejoystick4.string, "0"))
-					cv_usejoystick4.value = 0;
-				else if (atoi(cv_usejoystick4.string) <= I_NumJoys() // don't mess if we intentionally set higher than NumJoys
-					&& cv_usejoystick4.value) // update the cvar ONLY if a device exists
-					CV_SetValue(&cv_usejoystick4, cv_usejoystick4.value);
-
-				////////////////////////////////////////////////////////////
-
-				CONS_Debug(DBG_GAMELOGIC, "Joystick1 device index: %d\n", JoyInfo.oldjoy);
-				CONS_Debug(DBG_GAMELOGIC, "Joystick2 device index: %d\n", JoyInfo2.oldjoy);
-				CONS_Debug(DBG_GAMELOGIC, "Joystick3 device index: %d\n", JoyInfo3.oldjoy);
-				CONS_Debug(DBG_GAMELOGIC, "Joystick4 device index: %d\n", JoyInfo4.oldjoy);
-
-				// update the menu
-				if (currentMenu == &OP_JoystickSetDef)
-					M_SetupJoystickMenu(0);
+				Impl_HandleControllerRemovedEvent();
 				break;
 			case SDL_DROPFILE:
 				dropped_filedir = evt.drop.file;
@@ -1488,7 +1271,6 @@ void I_GetEvent(void)
 		event_t event;
 		int wwidth, wheight;
 		SDL_GetWindowSize(window, &wwidth, &wheight);
-		//SDL_memset(&event, 0, sizeof(event_t));
 		event.type = ev_mouse;
 		event.data1 = 0;
 		event.data2 = (INT32)lround(mousemovex * ((float)wwidth / (float)realwidth));
@@ -1514,7 +1296,8 @@ void I_StartupMouse(void)
 	}
 	else
 		firsttimeonmouse = SDL_FALSE;
-	if (cv_usemouse.value)
+
+	if (cv_usemouse.value || cv_alwaysgrabmouse.value)
 		SDLdoGrabMouse();
 	else
 		SDLdoUngrabMouse();
@@ -1526,19 +1309,18 @@ void I_StartupMouse(void)
 void I_OsPolling(void)
 {
 	SDL_Keymod mod;
+	INT32 i;
 
 	if (consolevent)
 		I_GetConsoleEvents();
+
 	if (SDL_WasInit(SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) == (SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER))
 	{
 		SDL_GameControllerUpdate();
-		I_GetJoystickEvents();
-		I_GetJoystick2Events();
-		I_GetJoystick3Events();
-		I_GetJoystick4Events();
-	}
 
-	I_GetMouseEvents();
+		for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
+			I_GetJoystickEvents(i);
+	}
 
 	I_GetEvent();
 
@@ -1555,6 +1337,108 @@ void I_OsPolling(void)
 	if (mod & KMOD_CAPS) capslock = true;
 }
 
+static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
+{
+	static SDL_bool wasfullscreen = SDL_FALSE;
+	Uint32 rmask, gmask, bmask, amask;
+	int bpp = 16;
+	int sw_texture_format = SDL_PIXELFORMAT_ABGR8888;
+
+	realwidth = vid.width;
+	realheight = vid.height;
+
+	if (window)
+	{
+		if (fullscreen)
+		{
+			wasfullscreen = SDL_TRUE;
+			SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
+			I_SetBorderlessWindow();
+		}
+		else // windowed mode
+		{
+			if (wasfullscreen)
+			{
+				wasfullscreen = SDL_FALSE;
+				SDL_SetWindowFullscreen(window, 0);
+				I_SetBorderlessWindow();
+			}
+
+			// Reposition window only in windowed mode
+			SDL_SetWindowSize(window, width, height);
+			SDL_SetWindowPosition(window,
+				SDL_WINDOWPOS_CENTERED_DISPLAY(SDL_GetWindowDisplayIndex(window)),
+				SDL_WINDOWPOS_CENTERED_DISPLAY(SDL_GetWindowDisplayIndex(window))
+			);
+		}
+	}
+	else
+	{
+		Impl_CreateWindow(fullscreen);
+		wasfullscreen = fullscreen;
+		SDL_SetWindowSize(window, width, height);
+
+		if (fullscreen)
+		{
+			SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
+			I_SetBorderlessWindow();
+		}
+	}
+
+#ifdef HWRENDER
+	if (rendermode == render_opengl)
+	{
+		I_CheckDesktopRes();
+#ifdef USE_FBO_OGL
+		I_DownSample();
+#endif
+		OglSdlSurface(vid.width, vid.height);
+	}
+#endif
+
+	if (rendermode == render_soft)
+	{
+		SDL_RenderClear(renderer);
+		SDL_RenderSetLogicalSize(renderer, width, height);
+
+		// Set up Texture
+		realwidth = width;
+		realheight = height;
+
+		if (texture != NULL)
+		{
+			SDL_DestroyTexture(texture);
+		}
+
+		if (!usesdl2soft)
+		{
+			sw_texture_format = SDL_PIXELFORMAT_RGB565;
+		}
+		else
+		{
+			bpp = 32;
+			sw_texture_format = SDL_PIXELFORMAT_RGBA8888;
+		}
+
+		texture = SDL_CreateTexture(renderer, sw_texture_format, SDL_TEXTUREACCESS_STREAMING, width, height);
+
+		// Set up SW surface
+		if (vidSurface != NULL)
+		{
+			SDL_FreeSurface(vidSurface);
+		}
+
+		if (vid.buffer)
+		{
+			free(vid.buffer);
+			vid.buffer = NULL;
+		}
+
+		SDL_PixelFormatEnumToMasks(sw_texture_format, &bpp, &rmask, &gmask, &bmask, &amask);
+		vidSurface = SDL_CreateRGBSurface(0, width, height, bpp, rmask, gmask, bmask, amask);
+	}
+}
+
 //
 // I_UpdateNoBlit
 //
@@ -1562,6 +1446,7 @@ void I_UpdateNoBlit(void)
 {
 	if (rendermode == render_none)
 		return;
+
 	if (exposevideo)
 	{
 #ifdef HWRENDER
@@ -1577,40 +1462,10 @@ void I_UpdateNoBlit(void)
 			SDL_RenderPresent(renderer);
 		}
 	}
+
 	exposevideo = SDL_FALSE;
 }
 
-// I_SkipFrame
-//
-// Returns true if it thinks we can afford to skip this frame
-// from PrBoom's src/SDL/i_video.c
-static inline boolean I_SkipFrame(void)
-{
-#if 1
-	// While I fixed the FPS counter bugging out with this,
-	// I actually really like being able to pause and
-	// use perfstats to measure rendering performance
-	// without game logic changes.
-	return false;
-#else
-	static boolean skip = false;
-
-	skip = !skip;
-
-	switch (gamestate)
-	{
-		case GS_LEVEL:
-			if (!paused)
-				return false;
-			/* FALLTHRU */
-		case GS_WAITINGPLAYERS:
-			return skip; // Skip odd frames
-		default:
-			return false;
-	}
-#endif
-}
-
 //
 // I_FinishUpdate
 //
@@ -1623,21 +1478,21 @@ void I_FinishUpdate(void)
 
 	SCR_CalculateFPS();
 
-	if (I_SkipFrame())
-		return;
+	if (st_overlay)
+	{
+		if (cv_ticrate.value)
+			SCR_DisplayTicRate();
 
-	if (cv_ticrate.value && st_overlay)
-		SCR_DisplayTicRate();
-
-	if (cv_showping.value && netgame && consoleplayer != serverplayer && st_overlay)
-		SCR_DisplayLocalPing();
+		if (cv_showping.value && ((netgame && consoleplayer != serverplayer) || (simulated_lag != 0 && consoleplayer == serverplayer && Playing())))
+			SCR_DisplayLocalPing();
+	}
 
 #ifdef HAVE_DISCORDRPC
 	if (discordRequestList != NULL)
 		ST_AskToJoinEnvelope();
 #endif
 
-	if (rendermode == render_soft && screens[0])
+	if (rendermode == render_soft && vid.screens[0])
 	{
 		if (!bufSurface) //Double-Check
 		{
@@ -1657,7 +1512,6 @@ void I_FinishUpdate(void)
 		SDL_RenderCopy(renderer, texture, &src_rect, NULL);
 		SDL_RenderPresent(renderer);
 	}
-
 #ifdef HWRENDER
 	else if (rendermode == render_opengl)
 	{
@@ -1687,9 +1541,7 @@ void I_ReadScreen(UINT8 *scr)
 	if (rendermode != render_soft)
 		I_Error ("I_ReadScreen: called while in non-software mode");
 	else
-		VID_BlitLinearScreen(screens[0], scr,
-			vid.width*vid.bpp, vid.height,
-			vid.rowbytes, vid.rowbytes);
+		VID_BlitLinearScreen(vid.screens[0], scr, vid.width, vid.height, vid.rowbytes, vid.rowbytes);
 }
 
 //
@@ -1698,12 +1550,14 @@ void I_ReadScreen(UINT8 *scr)
 void I_SetPalette(RGBA_t *palette)
 {
 	size_t i;
-	for (i=0; i<256; i++)
+
+	for (i = 0; i < 256; i++)
 	{
 		localPalette[i].r = palette[i].s.red;
 		localPalette[i].g = palette[i].s.green;
 		localPalette[i].b = palette[i].s.blue;
 	}
+
 	//if (vidSurface) SDL_SetPaletteColors(vidSurface->format->palette, localPalette, 0, 256);
 	// Fury -- SDL2 vidSurface is a 32-bit surface buffer copied to the texture. It's not palletized, like bufSurface.
 	if (bufSurface) SDL_SetPaletteColors(bufSurface->format->palette, localPalette, 0, 256);
@@ -1720,37 +1574,25 @@ INT32 VID_NumModes(void)
 
 const char *VID_GetModeName(INT32 modeNum)
 {
-#if 0
-	if (USE_FULLSCREEN && numVidModes != -1) // fullscreen modes
-	{
-		modeNum += firstEntry;
-		if (modeNum >= numVidModes)
-			return NULL;
-
-		sprintf(&vidModeName[modeNum][0], "%dx%d",
-			modeList[modeNum]->w,
-			modeList[modeNum]->h);
-	}
-	else // windowed modes
-	{
-#endif
 	if (modeNum == -1)
 	{
 		return fallback_resolution_name;
 	}
-		if (modeNum > MAXWINMODES)
-			return NULL;
 
-		sprintf(&vidModeName[modeNum][0], "%dx%d",
-			windowedModes[modeNum][0],
-			windowedModes[modeNum][1]);
-	//}
+	if (modeNum > MAXWINMODES)
+		return NULL;
+
+	sprintf(&vidModeName[modeNum][0], "%dx%d",
+		windowedModes[modeNum][0],
+		windowedModes[modeNum][1]);
+
 	return &vidModeName[modeNum][0];
 }
 
 INT32 VID_GetModeForSize(INT32 w, INT32 h)
 {
 	int i;
+
 	for (i = 0; i < MAXWINMODES; i++)
 	{
 		if (windowedModes[i][0] == w && windowedModes[i][1] == h)
@@ -1758,6 +1600,7 @@ INT32 VID_GetModeForSize(INT32 w, INT32 h)
 			return i;
 		}
 	}
+
 	// did not find mode from list, make custom resolution if the values somewhat make sense
 	// opengl mode does not mind about max resolution defined in screen.h
 	// if not using opengl, check against the maximum as well
@@ -1768,104 +1611,14 @@ INT32 VID_GetModeForSize(INT32 w, INT32 h)
 		custom_height = h;
 		return CUSTOMMODENUM;
 	}
+
 	return -1;
-#if 0
-	INT32 matchMode = -1, i;
-	VID_PrepareModeList();
-	if (USE_FULLSCREEN && numVidModes != -1)
-	{
-		for (i=firstEntry; i<numVidModes; i++)
-		{
-			if (modeList[i]->w == w &&
-			    modeList[i]->h == h)
-			{
-				matchMode = i;
-				break;
-			}
-		}
-		if (-1 == matchMode) // use smaller mode
-		{
-			w -= w%BASEVIDWIDTH;
-			h -= h%BASEVIDHEIGHT;
-			for (i=firstEntry; i<numVidModes; i++)
-			{
-				if (modeList[i]->w == w &&
-				    modeList[i]->h == h)
-				{
-					matchMode = i;
-					break;
-				}
-			}
-			if (-1 == matchMode) // use smallest mode
-				matchMode = numVidModes-1;
-		}
-		matchMode -= firstEntry;
-	}
-	else
-	{
-		for (i=0; i<MAXWINMODES; i++)
-		{
-			if (windowedModes[i][0] == w &&
-			    windowedModes[i][1] == h)
-			{
-				matchMode = i;
-				break;
-			}
-		}
-		if (-1 == matchMode) // use smaller mode
-		{
-			w -= w%BASEVIDWIDTH;
-			h -= h%BASEVIDHEIGHT;
-			for (i=0; i<MAXWINMODES; i++)
-			{
-				if (windowedModes[i][0] == w &&
-				    windowedModes[i][1] == h)
-				{
-					matchMode = i;
-					break;
-				}
-			}
-			if (-1 == matchMode) // use smallest mode
-				matchMode = MAXWINMODES-1;
-		}
-	}
-	return matchMode;
-#endif
 }
 
 void VID_PrepareModeList(void)
 {
 	// Under SDL2, we just use the windowed modes list, and scale in windowed fullscreen.
 	allow_fullscreen = true;
-#if 0
-	INT32 i;
-
-	firstEntry = 0;
-
-#ifdef HWRENDER
-	if (rendermode == render_opengl)
-		modeList = SDL_ListModes(NULL, SDL_OPENGL|SDL_FULLSCREEN);
-	else
-#endif
-	modeList = SDL_ListModes(NULL, surfaceFlagsF|SDL_HWSURFACE); //Alam: At least hardware surface
-
-	if (disable_fullscreen?0:cv_fullscreen.value) // only fullscreen needs preparation
-	{
-		if (-1 != numVidModes)
-		{
-			for (i=0; i<numVidModes; i++)
-			{
-				if (modeList[i]->w <= MAXVIDWIDTH &&
-					modeList[i]->h <= MAXVIDHEIGHT)
-				{
-					firstEntry = i;
-					break;
-				}
-			}
-		}
-	}
-	allow_fullscreen = true;
-#endif
 }
 
 static UINT32 refresh_rate;
@@ -1893,8 +1646,7 @@ INT32 VID_SetMode(INT32 modeNum)
 {
 	SDLdoUngrabMouse();
 
-	vid.recalc = 1;
-	vid.bpp = 1;
+	vid.recalc = true;
 
 	if (modeNum >= 0 && modeNum < MAXWINMODES)
 	{
@@ -1926,12 +1678,6 @@ INT32 VID_SetMode(INT32 modeNum)
 		}
 		vid.modenum = -1;
 	}
-	//Impl_SetWindowName("SRB2Kart "VERSIONSTRING);
-
-#ifdef USE_FBO_OGL
-	if (rendermode == render_opengl)
-		I_DownSample();
-#endif
 
 	SDLSetMode(vid.width, vid.height, USE_FULLSCREEN);
 	Impl_VideoSetupBuffer();
@@ -1953,6 +1699,65 @@ INT32 VID_SetMode(INT32 modeNum)
 	return SDL_TRUE;
 }
 
+
+static SDL_bool Impl_CreateContext(void)
+{
+	// Renderer-specific stuff
+#ifdef HWRENDER
+	if ((rendermode == render_opengl)
+	&& (vid.glstate != VID_GL_LIBRARY_ERROR))
+	{
+		if (!sdlglcontext)
+			sdlglcontext = SDL_GL_CreateContext(window);
+
+		if (sdlglcontext == NULL)
+		{
+			SDL_DestroyWindow(window);
+			I_Error("Failed to create a GL context: %s\n", SDL_GetError());
+		}
+
+		SDL_GL_MakeCurrent(window, sdlglcontext);
+	}
+	else
+#endif
+	if (rendermode == render_soft)
+	{
+		int flags = 0; // Use this to set SDL_RENDERER_* flags now
+		if (usesdl2soft)
+			flags |= SDL_RENDERER_SOFTWARE;
+		else if (cv_vidwait.value)
+		{
+#if SDL_VERSION_ATLEAST(2, 0, 18)
+			// If SDL is new enough, we can turn off vsync later.
+			flags |= SDL_RENDERER_PRESENTVSYNC;
+#else
+			// However, if it isn't, we should just silently turn vid_wait off
+			// This is because the renderer will be created before the config
+			// is read and vid_wait is set from the user's preferences, and thus
+			// vid_wait will have no effect.
+			CV_StealthSetValue(&cv_vidwait, 0);
+#endif
+		}
+
+#ifdef _WIN32
+		SDL_SetHint(SDL_HINT_RENDER_DRIVER, "direct3d11");
+#else
+		SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl");
+#endif
+
+		if (!renderer)
+			renderer = SDL_CreateRenderer(window, -1, flags);
+		if (renderer == NULL)
+		{
+			CONS_Printf(M_GetText("Couldn't create rendering context: %s\n"), SDL_GetError());
+			return SDL_FALSE;
+		}
+		SDL_RenderSetLogicalSize(renderer, BASEVIDWIDTH, BASEVIDHEIGHT);
+	}
+
+	return SDL_TRUE;
+}
+
 static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
 {
 	int flags = SDL_WINDOW_ALLOW_HIGHDPI;
@@ -1983,7 +1788,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
 	// Some GPU drivers may give us a 16-bit depth buffer since the
 	// default value for SDL_GL_DEPTH_SIZE is 16.
 	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
-	
+
 	// request stencil buffer. If there are problems on weaker hw the bit count could be reduced
 	// If only something like 1-bit or 2-bit stencil is available on some gpus then should implement limit for maxportals based on that.
 	// 4 bits would be enough for current limit in maxportals (12)
@@ -2000,6 +1805,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
 		return SDL_FALSE;
 	}
 
+<<<<<<< HEAD
 	// Renderer-specific stuff
 #ifdef HWRENDER
 	if ((rendermode == render_opengl)
@@ -2039,26 +1845,18 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
 	}
 
 	return SDL_TRUE;
+=======
+	return Impl_CreateContext();
+>>>>>>> Saturn-Next
 }
 
-/*
-static void Impl_SetWindowName(const char *title)
-{
-	if (window == NULL)
-	{
-		return;
-	}
-	SDL_SetWindowTitle(window, title);
-}
-*/
-
 static void Impl_SetWindowIcon(void)
 {
 	if (window == NULL || icoSurface == NULL)
 	{
 		return;
 	}
-	//SDL2STUB(); // Monster Iestyn: why is this stubbed?
+
 	SDL_SetWindowIcon(window, icoSurface);
 }
 
@@ -2070,16 +1868,9 @@ static void Impl_VideoSetupSDLBuffer(void)
 		bufSurface = NULL;
 	}
 	// Set up the SDL palletized buffer (copied to vidbuffer before being rendered to texture)
-	if (vid.bpp == 1)
-	{
-		bufSurface = SDL_CreateRGBSurfaceFrom(screens[0],vid.width,vid.height,8,
-			(int)vid.rowbytes,0x00000000,0x00000000,0x00000000,0x00000000); // 256 mode
-	}
-	else if (vid.bpp == 2) // Fury -- don't think this is used at all anymore
-	{
-		bufSurface = SDL_CreateRGBSurfaceFrom(screens[0],vid.width,vid.height,15,
-			(int)vid.rowbytes,0x00007C00,0x000003E0,0x0000001F,0x00000000); // 555 mode
-	}
+	bufSurface = SDL_CreateRGBSurfaceFrom(vid.screens[0], vid.width, vid.height, 8,
+		(int)vid.rowbytes, 0x00000000, 0x00000000, 0x00000000, 0x00000000); // 256 mode
+
 	if (bufSurface)
 	{
 		SDL_SetPaletteColors(bufSurface->format->palette, localPalette, 0, 256);
@@ -2093,17 +1884,16 @@ static void Impl_VideoSetupSDLBuffer(void)
 static void Impl_VideoSetupBuffer(void)
 {
 	// Set up game's software render buffer
-	//if (rendermode == render_soft)
+	vid.rowbytes = vid.width;
+
+	if (vid.buffer)
+		free(vid.buffer);
+
+	vid.buffer = calloc(vid.rowbytes*vid.height, NUMSCREENS);
+
+	if (!vid.buffer)
 	{
-		vid.rowbytes = vid.width * vid.bpp;
-		vid.direct = NULL;
-		if (vid.buffer)
-			free(vid.buffer);
-		vid.buffer = calloc(vid.rowbytes*vid.height, NUMSCREENS);
-		if (!vid.buffer)
-		{
-			I_Error("%s", M_GetText("Not enough memory for video buffer\n"));
-		}
+		I_Error("%s", M_GetText("Not enough memory for video buffer\n"));
 	}
 }
 
@@ -2121,6 +1911,7 @@ void I_StartupGraphics(void)
 		rendermode = render_none;
 		return;
 	}
+
 	if (graphics_started)
 		return;
 
@@ -2130,6 +1921,7 @@ void I_StartupGraphics(void)
 	COM_AddCommand ("vid_mode", VID_Command_Mode_f);
 	CV_RegisterVar (&cv_vidwait);
 	CV_RegisterVar (&cv_stretch);
+	CV_RegisterVar (&cv_alwaysgrabmouse);
 	disable_mouse = M_CheckParm("-nomouse");
 	disable_fullscreen = M_CheckParm("-win") ? 1 : 0;
 
@@ -2160,82 +1952,83 @@ void I_StartupGraphics(void)
 	else if (M_CheckParm("-opengl"))
 		rendermode = render_opengl;
 
-    msaa = 0; boolean msaa_set = false;
-    a2c = false; boolean a2c_set = false;
+	msaa = 0; boolean msaa_set = false;
+	a2c = false; boolean a2c_set = false;
 
-    if (M_CheckParm("-msaa") && M_IsNextParm())
-    {
-        const char* str = M_GetNextParm();
-        if (sscanf(str, "%u", &msaa))
-        {
-            msaa_set = true;
-        }
-    }
+	if (M_CheckParm("-msaa") && M_IsNextParm())
+	{
+		const char* str = M_GetNextParm();
+		if (sscanf(str, "%u", &msaa))
+		{
+			msaa_set = true;
+		}
+	}
 
-    if (M_CheckParm("-a2c"))
-    {
-        a2c = true;
-        a2c_set = true;
-    }
-    else if (M_CheckParm("-noa2c"))
-    {
-        a2c_set = true;
-    }
+	if (M_CheckParm("-a2c"))
+	{
+		a2c = true;
+		a2c_set = true;
+	}
+	else if (M_CheckParm("-noa2c"))
+	{
+		a2c_set = true;
+	}
 
     {
 		char   line[16];
 		char * word;
 		FILE * file = OpenRendererFile("r");
+
 		if (file != NULL)
 		{
 			while (fgets(line, sizeof line, file) != NULL)
 			{
-                word = strtok(line, " \n");
+				word = strtok(line, " \n");
 
-                if (rendermode == render_none)
-                {
-                    if (strcasecmp(word, "software") == 0)
-                    {
-                        rendermode = render_soft;
-                    }
-                    else if (strcasecmp(word, "opengl") == 0)
-                    {
-                        rendermode = render_opengl;
-                    }
+				if (rendermode == render_none)
+				{
+					if (strcasecmp(word, "software") == 0)
+					{
+						rendermode = render_soft;
+					}
+					else if (strcasecmp(word, "opengl") == 0)
+					{
+						rendermode = render_opengl;
+					}
 
-                    if (rendermode != render_none)
-                    {
-                        CONS_Printf("Using last known renderer: %s\n", line);
-                    }
+					if (rendermode != render_none)
+					{
+						CONS_Printf("Using last known renderer: %s\n", line);
+					}
 			    }
 
-                if (!msaa_set)
-                {
-                    if (strcasecmp(word, "msaa") == 0)
-                    {
-                        const char *nextword = strtok(NULL, " \n");
+				if (!msaa_set)
+				{
+					if (strcasecmp(word, "msaa") == 0)
+					{
+						const char *nextword = strtok(NULL, " \n");
 
-                        if (!nextword || !sscanf(nextword, "%u", &msaa))
-                        {
-                            CONS_Alert(CONS_ERROR, "Malformed MSAA entry in renderer.txt\n");
-                        }
-                        else
-                        {
-                            CONS_Printf("Using last know MSAA value: %u\n", msaa);
-                        }
-                    }
-                }
+						if (!nextword || !sscanf(nextword, "%u", &msaa))
+						{
+							CONS_Alert(CONS_ERROR, "Malformed MSAA entry in renderer.txt\n");
+						}
+						else
+						{
+							CONS_Printf("Using last know MSAA value: %u\n", msaa);
+						}
+					}
+				}
 
-                if (!a2c_set)
-                {
-                    if (strcasecmp(word, "a2c") == 0)
-                    {
-                        a2c = true;
+				if (!a2c_set)
+				{
+					if (strcasecmp(word, "a2c") == 0)
+					{
+						a2c = true;
 
-                        CONS_Printf("Using a2c because it was specified to be used earlier\n");
-                    }
-                }
-            }
+						CONS_Printf("Using a2c because it was specified to be used earlier\n");
+					}
+				}
+			}
 
 			fclose(file);
 		}
@@ -2267,13 +2060,13 @@ void I_StartupGraphics(void)
 			}
 
 #ifdef HWRENDER
-            fprintf(file, "msaa %u\n", msaa);
+			fprintf(file, "msaa %u\n", msaa);
 
-            if (a2c)
-                fputs("a2c\n", file);
+			if (a2c)
+				fputs("a2c\n", file);
 #endif
 
-            fclose(file);
+			fclose(file);
 		}
 		else
 		{
@@ -2284,55 +2077,13 @@ void I_StartupGraphics(void)
 	usesdl2soft = M_CheckParm("-softblit");
 	borderlesswindow = M_CheckParm("-borderless");
 
-	//SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY>>1,SDL_DEFAULT_REPEAT_INTERVAL<<2);
 	VID_Command_ModeList_f();
+
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
 	{
-		HWD.pfnInit             = hwSym("Init",NULL);
-		HWD.pfnSetupGLInfo      = hwSym("SetupGLInfo",NULL);
-		HWD.pfnFinishUpdate     = NULL;
-		HWD.pfnDraw2DLine       = hwSym("Draw2DLine",NULL);
-		HWD.pfnDrawPolygon      = hwSym("DrawPolygon",NULL);
-		HWD.pfnDrawIndexedTriangles = hwSym("DrawIndexedTriangles",NULL);
-		HWD.pfnSetBlend         = hwSym("SetBlend",NULL);
-		HWD.pfnClearBuffer      = hwSym("ClearBuffer",NULL);
-		HWD.pfnSetTexture       = hwSym("SetTexture",NULL);
-		HWD.pfnUpdateTexture    = hwSym("UpdateTexture",NULL);
-		HWD.pfnDeleteTexture    = hwSym("DeleteTexture",NULL);
-		HWD.pfnReadScreenTexture= hwSym("ReadScreenTexture",NULL);
-		HWD.pfnGClipRect        = hwSym("GClipRect",NULL);
-		HWD.pfnClearMipMapCache = hwSym("ClearMipMapCache",NULL);
-		HWD.pfnSetSpecialState  = hwSym("SetSpecialState",NULL);
-		HWD.pfnSetTexturePalette= hwSym("SetTexturePalette",NULL);
-		HWD.pfnGetTextureUsed   = hwSym("GetTextureUsed",NULL);
-		HWD.pfnDrawModel        = hwSym("DrawModel",NULL);
-		HWD.pfnCreateModelVBOs  = hwSym("CreateModelVBOs",NULL);
-		HWD.pfnSetTransform     = hwSym("SetTransform",NULL);
-		HWD.pfnPostImgRedraw    = hwSym("PostImgRedraw",NULL);
-		HWD.pfnFlushScreenTextures=hwSym("FlushScreenTextures",NULL);
-		HWD.pfnDoScreenWipe     = hwSym("DoScreenWipe",NULL);
-		HWD.pfnDrawScreenTexture= hwSym("DrawScreenTexture",NULL);
-		HWD.pfnMakeScreenTexture= hwSym("MakeScreenTexture",NULL);
-		HWD.pfnRenderVhsEffect  = hwSym("RenderVhsEffect",NULL);
-		HWD.pfnDrawScreenFinalTexture=hwSym("DrawScreenFinalTexture",NULL);
+		vid.glstate = (VID_LoadOGLAPI() && GL_Init()) ? VID_GL_LIBRARY_LOADED : VID_GL_LIBRARY_ERROR;
 
-		HWD.pfnRenderSkyDome = hwSym("RenderSkyDome",NULL);
-
-		HWD.pfnInitShaders      = hwSym("InitShaders",NULL);
-		HWD.pfnLoadShader       = hwSym("LoadShader",NULL);
-		HWD.pfnCompileShader    = hwSym("CompileShader",NULL);
-		HWD.pfnSetShader 		= hwSym("SetShader",NULL);
-		HWD.pfnUnSetShader 		= hwSym("UnSetShader",NULL);
-
-		HWD.pfnSetShaderInfo    = hwSym("SetShaderInfo",NULL);
-
-		HWD.pfnSetPaletteLookup = hwSym("SetPaletteLookup",NULL);
-		HWD.pfnCreateLightTable = hwSym("CreateLightTable",NULL);
-		HWD.pfnClearLightTables = hwSym("ClearLightTables",NULL);
-		HWD.pfnSetScreenPalette = hwSym("SetScreenPalette",NULL);
-
-		vid.glstate = HWD.pfnInit() ? VID_GL_LIBRARY_LOADED : VID_GL_LIBRARY_ERROR; // let load the OpenGL library
 		if (vid.glstate == VID_GL_LIBRARY_ERROR)
 		{
 			rendermode = render_soft;
@@ -2344,16 +2095,11 @@ void I_StartupGraphics(void)
 	// SDL_GL_LoadLibrary to work well on Windows
 
 	// Create window
-	//Impl_CreateWindow(USE_FULLSCREEN);
-	//Impl_SetWindowName("SRB2Kart "VERSIONSTRING);
 	VID_SetMode(VID_GetModeForSize(BASEVIDWIDTH, BASEVIDHEIGHT));
 
 	vid.width = BASEVIDWIDTH; // Default size for startup
 	vid.height = BASEVIDHEIGHT; // BitsPerPixel is the SDL interface's
 	vid.recalc = true; // Set up the console stufff
-	vid.direct = NULL; // Maybe direct access?
-	vid.bpp = 1; // This is the game engine's Bpp
-	vid.WndParent = NULL; //For the window?
 
 #ifdef HAVE_TTF
 	I_ShutdownTTF();
@@ -2368,16 +2114,7 @@ void I_StartupGraphics(void)
 
 	if (M_CheckParm("-nomousegrab"))
 		mousegrabok = SDL_FALSE;
-#if 0 // defined (_DEBUG)
-	else
-	{
-		char videodriver[4] = {'S','D','L',0};
-		if (!M_CheckParm("-mousegrab") &&
-		    *strncpy(videodriver, SDL_GetCurrentVideoDriver(), 4) != '\0' &&
-		    strncasecmp("x11",videodriver,4) == 0)
-			mousegrabok = SDL_FALSE; //X11's XGrabPointer not good
-	}
-#endif
+
 	realwidth = (Uint16)vid.width;
 	realheight = (Uint16)vid.height;
 
@@ -2388,10 +2125,7 @@ void I_StartupGraphics(void)
 
 	if (mousegrabok && !disable_mouse)
 	{
-		SDL_ShowCursor(SDL_DISABLE);
-		SDL_SetRelativeMouseMode(SDL_TRUE);
-		wrapmouseok = SDL_TRUE;
-		SDL_SetWindowGrab(window, SDL_TRUE);
+		SDLdoGrabMouse();
 	}
 
 	graphics_started = true;
@@ -2402,15 +2136,23 @@ void I_ShutdownGraphics(void)
 	const rendermode_t oldrendermode = rendermode;
 
 	rendermode = render_none;
-	if (icoSurface) SDL_FreeSurface(icoSurface);
+
+	if (icoSurface)
+		SDL_FreeSurface(icoSurface);
 	icoSurface = NULL;
+
 	if (oldrendermode == render_soft)
 	{
-		if (vidSurface) SDL_FreeSurface(vidSurface);
+		if (vidSurface)
+			SDL_FreeSurface(vidSurface);
 		vidSurface = NULL;
-		if (vid.buffer) free(vid.buffer);
+
+		if (vid.buffer)
+			free(vid.buffer);
 		vid.buffer = NULL;
-		if (bufSurface) SDL_FreeSurface(bufSurface);
+
+		if (bufSurface)
+			SDL_FreeSurface(bufSurface);
 		bufSurface = NULL;
 	}
 
@@ -2422,6 +2164,7 @@ void I_ShutdownGraphics(void)
 		I_OutputMsg("graphics never started\n");
 		return;
 	}
+
 	graphics_started = false;
 	I_OutputMsg("shut down\n");
 
@@ -2452,7 +2195,22 @@ static void Impl_SetVsync(void)
 #if SDL_VERSION_ATLEAST(2, 0, 18)
 		SDL_RenderSetVSync(renderer, cv_vidwait.value ? 1 : 0);
 #endif
+<<<<<<< HEAD
 	}
+=======
+#ifdef HWRENDER
+	if (!renderer && rendermode == render_opengl && sdlglcontext != NULL && SDL_GL_GetCurrentContext() == sdlglcontext)
+	{
+		SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0);
+	}
+#endif
+}
+
+void I_SetBorderlessWindow(void)
+{
+	SDL_bool borderless = (cv_fullscreen.value == 2) ? SDL_FALSE : SDL_TRUE;
+	SDL_SetWindowBordered(window, borderless);
+>>>>>>> Saturn-Next
 }
 
 #endif
diff --git a/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj b/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj
index ee0bf4697..662885c1d 100644
--- a/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj
@@ -255,12 +255,6 @@
 			path = ../../../bin/Resources/drill.dta;
 			refType = 2;
 		};
-		6755C8BF101802C300A80195 = {
-			isa = PBXFileReference;
-			name = fmod.dll;
-			path = ../../../bin/Resources/fmod.dll;
-			refType = 2;
-		};
 		6755C8C0101802C300A80195 = {
 			isa = PBXFileReference;
 			name = knux.plr;
@@ -425,14 +419,6 @@
 			name = r_opengl;
 			refType = 4;
 		};
-		677B5ECA10180D7100A80195 = {
-			children = (
-				84F202CA08A92AA0000C01D8,
-			);
-			isa = PBXGroup;
-			name = s_openal;
-			refType = 4;
-		};
 		67B2D0C91018779900A80195 = {
 			fileRef = 84177748085A1097000C01D8;
 			isa = PBXBuildFile;
@@ -1060,8 +1046,8 @@
 		8417773A085A106C000C01D8 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			name = hw_drv.h;
-			path = ../../hardware/hw_drv.h;
+			name = hw_gl.h;
+			path = ../../hardware/hw_gl.h;
 			refType = 2;
 		};
 		8417773C085A106C000C01D8 = {
@@ -1071,20 +1057,6 @@
 			path = ../../hardware/hw_glob.h;
 			refType = 2;
 		};
-		8417773D085A106C000C01D8 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = hw_light.c;
-			path = ../../hardware/hw_light.c;
-			refType = 2;
-		};
-		8417773E085A106C000C01D8 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = hw_light.h;
-			path = ../../hardware/hw_light.h;
-			refType = 2;
-		};
 		8417773F085A106C000C01D8 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -1113,41 +1085,6 @@
 			path = ../../hardware/hw_md2.h;
 			refType = 2;
 		};
-		84177743085A106C000C01D8 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = hw_trick.c;
-			path = ../../hardware/hw_trick.c;
-			refType = 2;
-		};
-		84177744085A106C000C01D8 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = hw3dsdrv.h;
-			path = ../../hardware/hw3dsdrv.h;
-			refType = 2;
-		};
-		84177745085A106C000C01D8 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = hw3sound.c;
-			path = ../../hardware/hw3sound.c;
-			refType = 2;
-		};
-		84177746085A106C000C01D8 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = hw3sound.h;
-			path = ../../hardware/hw3sound.h;
-			refType = 2;
-		};
-		84177747085A106C000C01D8 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = hws_data.h;
-			path = ../../hardware/hws_data.h;
-			refType = 2;
-		};
 		84177748085A1097000C01D8 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -1603,13 +1540,6 @@
 			path = ../../r_draw8.c;
 			refType = 2;
 		};
-		84177789085A111B000C01D8 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = r_draw16.c;
-			path = ../../r_draw16.c;
-			refType = 2;
-		};
 		8417778A085A111B000C01D8 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -2136,7 +2066,7 @@
 			buildSettings = {
 				DEBUGGING_SYMBOLS = NO;
 				FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_mixer.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/OpenAL.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/libpng.framework/Headers\"";
+				HEADER_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_mixer.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/libpng.framework/Headers\"";
 				INSTALL_PATH = "$(HOME)/Applications";
 				JAVA_COMPILER_DEBUGGING_SYMBOLS = NO;
 				OPTIMIZATION_CFLAGS = "-O2";
@@ -2328,7 +2258,7 @@
 			);
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks\"";
-				HEADER_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_mixer.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/OpenAL.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/libpng.framework/Headers\"";
+				HEADER_SEARCH_PATHS = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_mixer.framework/Headers\" \"$(LOCAL_LIBRARY_DIR)/Frameworks/libpng.framework/Headers\"";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "-DMAC_ALERT -DUNIXCOMMON  -DSDLMAIN -DHAVE_MIXER -DHAVE_PNG -D_BIG_ENDIAN -DSTDC_HEADERS -DSDL -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -fno-exceptions -D_DEBUG";
@@ -3521,19 +3451,6 @@
 			settings = {
 			};
 		};
-		84F202C708A92A5D000C01D8 = {
-			isa = PBXFrameworkReference;
-			name = OpenAL.framework;
-			path = /Library/Frameworks/OpenAL.framework;
-			refType = 0;
-		};
-		84F202CA08A92AA0000C01D8 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = s_openal.c;
-			path = ../../hardware/s_openal/s_openal.c;
-			refType = 2;
-		};
 	};
 	rootObject = 84177702085A0C64000C01D8;
 }
diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
index 00930bfb3..bbdbff9ed 100644
--- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
@@ -13,13 +13,10 @@
 		1E32C4290B6E6D5D0029E058 /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E32C4140B6E6D5D0029E058 /* libpng.framework */; };
 		1E32C42B0B6E6D6E0029E058 /* libpng.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 1E32C4140B6E6D5D0029E058 /* libpng.framework */; };
 		1E44AE750B67CC2B00BAD059 /* hw_bsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE610B67CC2B00BAD059 /* hw_bsp.c */; };
-		1E44AE770B67CC2B00BAD059 /* hw3sound.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE630B67CC2B00BAD059 /* hw3sound.c */; };
 		1E44AE780B67CC2B00BAD059 /* hw_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE640B67CC2B00BAD059 /* hw_cache.c */; };
-		1E44AE7C0B67CC2B00BAD059 /* hw_light.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE680B67CC2B00BAD059 /* hw_light.c */; };
 		1E44AE800B67CC2B00BAD059 /* hw_draw.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE6C0B67CC2B00BAD059 /* hw_draw.c */; };
 		1E44AE820B67CC2B00BAD059 /* hw_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE6E0B67CC2B00BAD059 /* hw_main.c */; };
 		1E44AE840B67CC2B00BAD059 /* hw_md2.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE700B67CC2B00BAD059 /* hw_md2.c */; };
-		1E44AE860B67CC2B00BAD059 /* hw_trick.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE720B67CC2B00BAD059 /* hw_trick.c */; };
 		1E44AEA40B67CC8500BAD059 /* d_clisrv.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE8D0B67CC8400BAD059 /* d_clisrv.c */; };
 		1E44AEA70B67CC8500BAD059 /* d_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE900B67CC8400BAD059 /* d_main.c */; };
 		1E44AEA80B67CC8500BAD059 /* d_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 1E44AE910B67CC8500BAD059 /* d_net.c */; };
@@ -174,16 +171,11 @@
 		1E32C4140B6E6D5D0029E058 /* libpng.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpng.framework; path = /Library/Frameworks/libpng.framework; sourceTree = "<absolute>"; };
 		1E44AE440B67CBE800BAD059 /* music.dta */ = {isa = PBXFileReference; lastKnownFileType = text; name = music.dta; path = ../../../bin/Resources/music.dta; sourceTree = SOURCE_ROOT; };
 		1E44AE4B0B67CBE800BAD059 /* srb2.wad */ = {isa = PBXFileReference; lastKnownFileType = text; name = srb2.wad; path = ../../../bin/Resources/srb2.wad; sourceTree = SOURCE_ROOT; };
-		1E44AE600B67CC2B00BAD059 /* hw3dsdrv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw3dsdrv.h; path = ../../hardware/hw3dsdrv.h; sourceTree = SOURCE_ROOT; };
 		1E44AE610B67CC2B00BAD059 /* hw_bsp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hw_bsp.c; path = ../../hardware/hw_bsp.c; sourceTree = SOURCE_ROOT; };
 		1E44AE620B67CC2B00BAD059 /* hw_defs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_defs.h; path = ../../hardware/hw_defs.h; sourceTree = SOURCE_ROOT; };
-		1E44AE630B67CC2B00BAD059 /* hw3sound.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hw3sound.c; path = ../../hardware/hw3sound.c; sourceTree = SOURCE_ROOT; };
 		1E44AE640B67CC2B00BAD059 /* hw_cache.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hw_cache.c; path = ../../hardware/hw_cache.c; sourceTree = SOURCE_ROOT; };
 		1E44AE650B67CC2B00BAD059 /* hw_dll.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_dll.h; path = ../../hardware/hw_dll.h; sourceTree = SOURCE_ROOT; };
-		1E44AE660B67CC2B00BAD059 /* hw_drv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_drv.h; path = ../../hardware/hw_drv.h; sourceTree = SOURCE_ROOT; };
-		1E44AE680B67CC2B00BAD059 /* hw_light.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hw_light.c; path = ../../hardware/hw_light.c; sourceTree = SOURCE_ROOT; };
-		1E44AE690B67CC2B00BAD059 /* hw_light.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_light.h; path = ../../hardware/hw_light.h; sourceTree = SOURCE_ROOT; };
-		1E44AE6A0B67CC2B00BAD059 /* hw3sound.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw3sound.h; path = ../../hardware/hw3sound.h; sourceTree = SOURCE_ROOT; };
+		1E44AE660B67CC2B00BAD059 /* hw_gl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_gl.h; path = ../../hardware/hw_gl.h; sourceTree = SOURCE_ROOT; };
 		1E44AE6B0B67CC2B00BAD059 /* hw_data.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_data.h; path = ../../hardware/hw_data.h; sourceTree = SOURCE_ROOT; };
 		1E44AE6C0B67CC2B00BAD059 /* hw_draw.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hw_draw.c; path = ../../hardware/hw_draw.c; sourceTree = SOURCE_ROOT; };
 		1E44AE6D0B67CC2B00BAD059 /* hw_glob.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_glob.h; path = ../../hardware/hw_glob.h; sourceTree = SOURCE_ROOT; };
@@ -191,9 +183,6 @@
 		1E44AE6F0B67CC2B00BAD059 /* hw_main.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_main.h; path = ../../hardware/hw_main.h; sourceTree = SOURCE_ROOT; };
 		1E44AE700B67CC2B00BAD059 /* hw_md2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hw_md2.c; path = ../../hardware/hw_md2.c; sourceTree = SOURCE_ROOT; };
 		1E44AE710B67CC2B00BAD059 /* hw_md2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_md2.h; path = ../../hardware/hw_md2.h; sourceTree = SOURCE_ROOT; };
-		1E44AE720B67CC2B00BAD059 /* hw_trick.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hw_trick.c; path = ../../hardware/hw_trick.c; sourceTree = SOURCE_ROOT; };
-		1E44AE730B67CC2B00BAD059 /* hws_data.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hws_data.h; path = ../../hardware/hws_data.h; sourceTree = SOURCE_ROOT; };
-		1E44AE8A0B67CC6000BAD059 /* asm_defs.inc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.pascal; name = asm_defs.inc; path = ../../asm_defs.inc; sourceTree = SOURCE_ROOT; };
 		1E44AE8D0B67CC8400BAD059 /* d_clisrv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = d_clisrv.c; path = ../../d_clisrv.c; sourceTree = SOURCE_ROOT; };
 		1E44AE8E0B67CC8400BAD059 /* d_clisrv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = d_clisrv.h; path = ../../d_clisrv.h; sourceTree = SOURCE_ROOT; };
 		1E44AE8F0B67CC8400BAD059 /* d_event.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = d_event.h; path = ../../d_event.h; sourceTree = SOURCE_ROOT; };
@@ -294,7 +283,6 @@
 		1E44AF570B67CEC100BAD059 /* r_defs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = r_defs.h; path = ../../r_defs.h; sourceTree = SOURCE_ROOT; };
 		1E44AF580B67CEC100BAD059 /* r_data.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_data.c; path = ../../r_data.c; sourceTree = SOURCE_ROOT; };
 		1E44AF590B67CEC100BAD059 /* r_draw.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_draw.c; path = ../../r_draw.c; sourceTree = SOURCE_ROOT; };
-		1E44AF5A0B67CEC100BAD059 /* r_draw16.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_draw16.c; path = ../../r_draw16.c; sourceTree = SOURCE_ROOT; };
 		1E44AF5B0B67CEC100BAD059 /* r_draw8.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_draw8.c; path = ../../r_draw8.c; sourceTree = SOURCE_ROOT; };
 		1E44AF5C0B67CEC100BAD059 /* r_main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = r_main.c; path = ../../r_main.c; sourceTree = SOURCE_ROOT; };
 		1E44AF5D0B67CEC100BAD059 /* r_main.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = r_main.h; path = ../../r_main.h; sourceTree = SOURCE_ROOT; };
@@ -527,16 +515,11 @@
 		1E44AE5C0B67CC0F00BAD059 /* Hw_Hardware */ = {
 			isa = PBXGroup;
 			children = (
-				1E44AE600B67CC2B00BAD059 /* hw3dsdrv.h */,
 				1E44AE610B67CC2B00BAD059 /* hw_bsp.c */,
 				1E44AE620B67CC2B00BAD059 /* hw_defs.h */,
-				1E44AE630B67CC2B00BAD059 /* hw3sound.c */,
 				1E44AE640B67CC2B00BAD059 /* hw_cache.c */,
 				1E44AE650B67CC2B00BAD059 /* hw_dll.h */,
-				1E44AE660B67CC2B00BAD059 /* hw_drv.h */,
-				1E44AE680B67CC2B00BAD059 /* hw_light.c */,
-				1E44AE690B67CC2B00BAD059 /* hw_light.h */,
-				1E44AE6A0B67CC2B00BAD059 /* hw3sound.h */,
+				1E44AE660B67CC2B00BAD059 /* hw_gl.h */,
 				1E44AE6B0B67CC2B00BAD059 /* hw_data.h */,
 				1E44AE6C0B67CC2B00BAD059 /* hw_draw.c */,
 				1E44AE6D0B67CC2B00BAD059 /* hw_glob.h */,
@@ -544,8 +527,6 @@
 				1E44AE6F0B67CC2B00BAD059 /* hw_main.h */,
 				1E44AE700B67CC2B00BAD059 /* hw_md2.c */,
 				1E44AE710B67CC2B00BAD059 /* hw_md2.h */,
-				1E44AE720B67CC2B00BAD059 /* hw_trick.c */,
-				1E44AE730B67CC2B00BAD059 /* hws_data.h */,
 			);
 			name = Hw_Hardware;
 			sourceTree = "<group>";
@@ -750,7 +731,6 @@
 				1E44AF570B67CEC100BAD059 /* r_defs.h */,
 				1E44AF580B67CEC100BAD059 /* r_data.c */,
 				1E44AF590B67CEC100BAD059 /* r_draw.c */,
-				1E44AF5A0B67CEC100BAD059 /* r_draw16.c */,
 				1E44AF5B0B67CEC100BAD059 /* r_draw8.c */,
 				1E44AF5C0B67CEC100BAD059 /* r_main.c */,
 				1E44AF5D0B67CEC100BAD059 /* r_main.h */,
@@ -1072,13 +1052,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				1E44AE750B67CC2B00BAD059 /* hw_bsp.c in Sources */,
-				1E44AE770B67CC2B00BAD059 /* hw3sound.c in Sources */,
 				1E44AE780B67CC2B00BAD059 /* hw_cache.c in Sources */,
-				1E44AE7C0B67CC2B00BAD059 /* hw_light.c in Sources */,
 				1E44AE800B67CC2B00BAD059 /* hw_draw.c in Sources */,
 				1E44AE820B67CC2B00BAD059 /* hw_main.c in Sources */,
 				1E44AE840B67CC2B00BAD059 /* hw_md2.c in Sources */,
-				1E44AE860B67CC2B00BAD059 /* hw_trick.c in Sources */,
 				1E44AEA40B67CC8500BAD059 /* d_clisrv.c in Sources */,
 				1E44AEA70B67CC8500BAD059 /* d_main.c in Sources */,
 				1E44AEA80B67CC8500BAD059 /* d_net.c in Sources */,
@@ -1108,7 +1085,6 @@
 				1E44AF220B67CE4100BAD059 /* mserv.c in Sources */,
 				1E44AF3C0B67CE5F00BAD059 /* p_enemy.c in Sources */,
 				1E44AF3D0B67CE5F00BAD059 /* p_inter.c in Sources */,
-				1E44AF3E0B67CE5F00BAD059 /* p_fab.c in Sources */,
 				1E44AF3F0B67CE5F00BAD059 /* p_lights.c in Sources */,
 				1E44AF400B67CE5F00BAD059 /* p_map.c in Sources */,
 				1E44AF410B67CE5F00BAD059 /* p_maputl.c in Sources */,
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 64dc16a5a..34a6db9a1 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -80,7 +80,7 @@ write netcode into the sound code, OKAY?
 #define GME_BASS 1.0f
 #endif // HAVE_GME
 
- 
+
 //static UINT16 BUFFERSIZE = 2048;
 static UINT16 SAMPLERATE = 44100;
 
@@ -94,7 +94,6 @@ static UINT16 SAMPLERATE = 44100;
 
 UINT8 sound_started = false;
 
-static UINT32 stutter_threshold_user;
 static UINT32 stutter_threshold;
 
 static Mix_Music *music;
@@ -214,10 +213,20 @@ void I_StartupSound(void)
 		// call to start audio failed -- we do not have it
 		return;
 	}
-	
+
+	SDL_version SDLmixcompiled;
+	const SDL_version *SDLmixlinked;
+	SDL_MIXER_VERSION(&SDLmixcompiled)
+	SDLmixlinked = Mix_Linked_Version();
+
+	I_OutputMsg("Compiled for SDL_mixer version: %d.%d.%d\n",
+				SDLmixcompiled.major, SDLmixcompiled.minor, SDLmixcompiled.patch);
+	I_OutputMsg("Linked with SDL_mixer version: %d.%d.%d\n",
+				SDLmixlinked->major, SDLmixlinked->minor, SDLmixlinked->patch);
+
 #ifdef HAVE_OPENMPT
-	CONS_Printf("libopenmpt version: %s\n", openmpt_get_string("library_version"));
-	CONS_Printf("libopenmpt build date: %s\n", openmpt_get_string("build"));
+	I_OutputMsg("libopenmpt version: %s\n", openmpt_get_string("library_version"));
+	I_OutputMsg("libopenmpt build date: %s\n", openmpt_get_string("build"));
 #endif
 
 	sound_started = true;
@@ -267,7 +276,7 @@ void I_UpdateSound(void)
 // sorry. more asm needed.
 static Mix_Chunk *ds2chunk(void *stream)
 {
-	UINT16 ver,freq;
+	UINT16 ver, freq;
 	UINT32 samples, i, newsamples;
 	UINT8 *sound;
 
@@ -283,6 +292,9 @@ static Mix_Chunk *ds2chunk(void *stream)
 	freq = READUINT16(stream);
 	samples = READUINT32(stream);
 
+	if (freq == 0)
+		return NULL; // division by zero
+
 	// convert from signed 8bit ???hz to signed 16bit 44100hz.
 	switch(freq)
 	{
@@ -516,14 +528,12 @@ void I_FreeSfx(sfxinfo_t *sfx)
 	sfx->lumpnum = LUMPERROR;
 }
 
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, INT32 channel)
 {
 	UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
 	INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, 0);
 	Mix_Volume(handle, volume);
 	Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
-	(void)pitch; // Mixer can't handle pitch
-	(void)priority; // priority and channel management is handled by SRB2...
 	return handle;
 }
 
@@ -537,12 +547,11 @@ boolean I_SoundIsPlaying(INT32 handle)
 	return Mix_Playing(handle);
 }
 
-void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch)
+void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep)
 {
 	UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
 	Mix_Volume(handle, volume);
 	Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
-	(void)pitch;
 }
 
 void I_SetSfxVolume(UINT8 volume)
@@ -594,6 +603,9 @@ Countstutter (int len)
 {
 	UINT32 bytes;
 
+	if (!cv_birdmusic.value || gamestate != GS_LEVEL)
+		return;
+
 	if (hu_stopped)
 	{
 		music_stutter_bytes += len;
@@ -613,7 +625,8 @@ Countstutter (int len)
 			}
 			else
 				bytes = ( music_bytes - music_stutter_bytes );
-			I_SetSongPosition((int)( bytes/4/44100.0*1000 ));
+
+			I_SetSongPosition((int)( (float)bytes/4/44100.0*1000 ));
 		}
 	}
 }
@@ -626,10 +639,10 @@ static void count_music_bytes(int chan, void *stream, int len, void *udata)
 
 	if (!music || I_SongType() == MU_GME || I_SongType() == MU_MOD || I_SongType() == MU_MID)
 		return;
+
 	music_bytes += len;
 
-	if ((gamestate == GS_LEVEL) && (cv_birdmusic.value))
-		Countstutter(len);
+	Countstutter(len);
 }
 
 static void music_loop(void)
@@ -694,7 +707,7 @@ static void mix_gme(void *udata, Uint8 *stream, int len)
 
 	// play gme into stream
 	gme_play(gme, len/2, (short *)stream);
-	
+
 	// Limiter to prevent music from being disorted with some formats
 	if (music_volume >= 18)
 		music_volume = 18;
@@ -710,7 +723,7 @@ static void mix_openmpt(void *udata, Uint8 *stream, int len)
 {
 	int i;
 	short *p;
-	
+
 	(void)udata;
 
 	if (!openmpt_mhandle || songpaused)
@@ -718,7 +731,7 @@ static void mix_openmpt(void *udata, Uint8 *stream, int len)
 
 	// Play module into stream
 	openmpt_module_read_interleaved_stereo(openmpt_mhandle, SAMPLERATE, cv_audbuffersize.value, (short *)stream);
-	
+
 	// Limiter to prevent music from being disorted with some formats
 	if (music_volume >= 18)
 		music_volume = 18;
@@ -807,7 +820,7 @@ boolean I_SetSongSpeed(float speed)
 #endif
 #ifdef HAVE_OPENMPT
 	if (openmpt_mhandle)
-	{		
+	{
 		if (speed > 4.0f)
 			speed = 4.0f; // Limit this to 4x to prevent crashing, stupid fix but... ~SteelT 27/9/19
 #if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR < 5
@@ -1042,20 +1055,9 @@ UINT32 I_GetSongPosition(void)
 		// 8M: 1 | 8S: 2 | 16M: 2 | 16S: 4
 }
 
-void
-I_UpdateSongLagThreshold (void)
+void I_UpdateSongLagThreshold(void)
 {
-	stutter_threshold_user = cv_music_resync_threshold.value/1000.0*(4*44100);
-	I_UpdateSongLagConditions();
-}
-
-void
-I_UpdateSongLagConditions (void)
-{
-	if (! cv_music_resync_powerups_only.value || S_MusicUsage() == MUS_SPECIAL)
-		stutter_threshold = stutter_threshold_user;
-	else
-		stutter_threshold = 0;
+	stutter_threshold = cv_music_resync_powerups_only.value ? 0 : (cv_music_resync_threshold.value/1000.0*(4*44100));
 }
 
 /// ------------------------
diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c
index 114eb4b16..5867fa1e1 100644
--- a/src/sdl/ogl_sdl.c
+++ b/src/sdl/ogl_sdl.c
@@ -38,11 +38,13 @@
 #ifdef HWRENDER
 #include "../hardware/r_opengl/r_opengl.h"
 #include "../hardware/hw_main.h"
+#include "../hardware/hw_gl.h"
 #include "ogl_sdl.h"
 #include "../i_system.h"
 #include "hwsym_sdl.h"
 #include "../m_argv.h"
 #include "../i_video.h"
+#include "../f_finale.h"
 
 #ifdef DEBUG_TO_FILE
 #include <stdarg.h>
@@ -68,6 +70,22 @@ PFNglGetIntegerv pglGetIntegerv;
 PFNglGetString pglGetString;
 #endif
 
+#ifdef USE_FBO_OGL
+
+#if defined (__unix__)
+static boolean xwaylandcrap = false;
+#endif
+
+boolean UseScreenFBO(void)
+{
+	return ((supportFBO && cv_glframebuffer.value && downsample)
+#if defined (__unix__)
+	|| (supportFBO && xwaylandcrap)
+#endif
+	);
+}
+#endif
+
 /**	\brief SDL video display surface
 */
 INT32 oglflags = 0;
@@ -78,7 +96,7 @@ void *GetGLFunc(const char *proc)
 	return SDL_GL_GetProcAddress(proc);
 }
 
-boolean LoadGL(void)
+boolean VID_LoadOGLAPI(void)
 {
 #ifndef STATIC_OPENGL
 	const char *OGLLibname = NULL;
@@ -95,7 +113,7 @@ boolean LoadGL(void)
 		return 0;
 	}
 #endif
-	return SetupGLfunc();
+	return true;
 }
 
 /**	\brief	The OglSdlSurface function
@@ -106,17 +124,17 @@ boolean LoadGL(void)
 
 	\return	if true, changed video mode
 */
+static boolean first_init = false;
+
 boolean OglSdlSurface(INT32 w, INT32 h)
 {
-	INT32 cbpp = cv_scr_depth.value < 16 ? 16 : cv_scr_depth.value;
-	static boolean first_init = false;
 	const char *gllogdir = NULL;
 
 	oglflags = 0;
 
 	if (!first_init)
 	{
-		if (!gllogstream) 
+		if (!gllogstream)
 		{
 			gllogdir = D_Home();
 
@@ -129,14 +147,37 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 				gllogstream = fopen("./ogllog.txt", "wt");
 #endif
 		}
-			
+
 		gl_version = pglGetString(GL_VERSION);
 		gl_renderer = pglGetString(GL_RENDERER);
 		gl_extensions = pglGetString(GL_EXTENSIONS);
+		pglGetIntegerv(GL_NUM_EXTENSIONS, (GLint*)&gl_num_extensions);
+		gl_vendor = pglGetString(GL_VENDOR);
 
 		GL_DBG_Printf("OpenGL %s\n", gl_version);
 		GL_DBG_Printf("GPU: %s\n", gl_renderer);
-		GL_DBG_Printf("Extensions: %s\n", gl_extensions);
+		GL_DBG_Printf("Extensions:");
+
+		{
+			// Need to do it with strtok for same reason its done like that in gr_glinfo command
+
+			char *copy = strdup((const char*)gl_extensions);
+			char *ext = strtok(copy, " ");
+
+			if (copy == NULL)
+			{
+				GL_DBG_Printf("Ran out of memory listing extensions?!?!");
+			}
+			else
+			{
+				do
+				{
+					GL_DBG_Printf(" %s", ext);
+				} while ((ext = strtok(NULL, " ")) != NULL);
+
+				free(copy);
+			}
+		}
 
 		if (strcmp((const char*)gl_renderer, "GDI Generic") == 0 &&
 			strcmp((const char*)gl_version, "1.1.0") == 0)
@@ -160,18 +201,25 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 		else
 			supportMipMap = true;
 
-		if (isExtAvailable("GL_EXT_texture_filter_anisotropic", gl_extensions))
+		if (GL_isExtAvailable("GL_EXT_texture_filter_anisotropic", gl_extensions))
 			pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy);
 		else
 			maximumAnisotropy = 1;
 
-		granisotropicmode_cons_t[1].value = maximumAnisotropy;
+		glanisotropicmode_cons_t[1].value = maximumAnisotropy;
+
+#if defined (__unix__)
 #ifdef USE_FBO_OGL
-		I_DownSample();
+		char videodriver[4] = {'S','D','L',0};
+		if (supportFBO && strstr((const char*)gl_renderer, "NVIDIA")
+			&& (*strncpy(videodriver, SDL_GetCurrentVideoDriver(), sizeof(videodriver)-1) != '\0')
+			&& (strncasecmp("x11",videodriver,4) == 0))
+			xwaylandcrap = true;
+#endif
 #endif
 	}
-	first_init = true;
 
+<<<<<<< HEAD
 	if (cv_vidwait.value)
 	{
 		if (SDL_GL_SetSwapInterval(-1) != 0) // try async vsync
@@ -196,18 +244,25 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 
 	SetModelView(w, h);
 	SetStates();
+=======
+	SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0);
+
+	GL_SetModelView(w, h);
+	GL_SetStates();
+>>>>>>> Saturn-Next
 	pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT);
 
 #ifdef USE_FBO_OGL
-	RenderToFramebuffer = FrameBufferEnabled;
-	GLFramebuffer_Disable();
-
-	if (RenderToFramebuffer && downsample)
-		GLFramebuffer_Enable();
+	if (UseScreenFBO())
+		GL_Framebuffer_Enable();
+	else
+		GL_Framebuffer_Disable();
 #endif
 
-	HWR_Startup();
-	textureformatGL = cbpp > 16 ? GL_RGBA : GL_RGB5_A1;
+	if (!first_init)
+		HWR_Startup();
+
+	first_init = true;
 
 	return true;
 }
@@ -222,6 +277,11 @@ void OglSdlFinishUpdate(boolean waitvbl)
 {
 	static boolean oldwaitvbl = false;
 	int sdlw, sdlh;
+
+#ifdef USE_FBO_OGL
+	const boolean usefbo = UseScreenFBO();
+#endif
+
 	if (oldwaitvbl != waitvbl)
 	{
 		if (waitvbl)
@@ -241,38 +301,41 @@ void OglSdlFinishUpdate(boolean waitvbl)
 	HWR_MakeScreenFinalTexture();
 
 #ifdef USE_FBO_OGL
-	GLFramebuffer_Disable();
-	RenderToFramebuffer = FrameBufferEnabled;
+	if (usefbo)
+	{
+		GL_Framebuffer_Unbind();
+	}
 #endif
-	
-	HWR_DrawScreenFinalTexture(sdlw, sdlh);
+
+	HWR_DrawScreenFinalTexture(sdlw, sdlh, HWR_ShouldUsePaletteRendering());
 
 #ifdef USE_FBO_OGL
-	if (RenderToFramebuffer && downsample)
-		GLFramebuffer_Enable();
+	if (usefbo)
+	{
+		GL_Framebuffer_Enable();
+	}
 #endif
 
 	SDL_GL_SwapWindow(window);
 
-	GClipRect(0, 0, realwidth, realheight, NZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
+	GL_GClipRect(0, 0, realwidth, realheight, NZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
 
 	// Sryder:	We need to draw the final screen texture again into the other buffer in the original position so that
 	//			effects that want to take the old screen can do so after this
-	HWR_DrawScreenFinalTexture(realwidth, realheight);
-}
+	// well we dont need it on native res it seems
+#ifdef USE_FBO_OGL
+	if ((!I_CheckNativeRes() && !usefbo) || WipeInAction)
+#else
+	if (!I_CheckNativeRes() || WipeInAction)
+#endif
+		HWR_DrawScreenFinalTexture(realwidth, realheight, false);
 
-EXPORT void HWRAPI(OglSdlSetPalette) (RGBA_t *palette)
-{
-	INT32 i;
-
-	for (i = 0; i < 256; i++)
-	{
-		myPaletteData[i].s.red   = palette[i].s.red;
-		myPaletteData[i].s.green = palette[i].s.green;
-		myPaletteData[i].s.blue  = palette[i].s.blue;
-		myPaletteData[i].s.alpha = palette[i].s.alpha;
-	}
-	Flush();
+#if defined (__unix__)
+#ifdef USE_FBO_OGL
+	if (loaded_config)
+		xwaylandcrap = false;
+#endif
+#endif
 }
 
 #endif //HWRENDER
diff --git a/src/sdl/ogl_sdl.h b/src/sdl/ogl_sdl.h
index ad153da93..6d614cd22 100644
--- a/src/sdl/ogl_sdl.h
+++ b/src/sdl/ogl_sdl.h
@@ -21,12 +21,10 @@
 boolean OglSdlSurface(INT32 w, INT32 h);
 
 void OglSdlFinishUpdate(boolean vidwait);
+boolean VID_LoadOGLAPI(void);
 
 extern SDL_Renderer *renderer;
 extern SDL_GLContext sdlglcontext;
 extern Uint16      realwidth;
 extern Uint16      realheight;
 
-#ifdef _CREATE_DLL_
-EXPORT void HWRAPI( OglSdlSetPalette ) (RGBA_t *palette);
-#endif
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 503e7205a..07f81d7b7 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -69,12 +69,6 @@
 
 #include "../d_main.h"
 
-#ifdef HW3SOUND
-#include "../hardware/hw3dsdrv.h"
-#include "../hardware/hw3sound.h"
-#include "hwsym_sdl.h"
-#endif
-
 #ifdef HAVE_LIBGME
 #include "gme/gme.h"
 #endif
@@ -195,11 +189,7 @@ static void Snd_LockAudio(void) //Alam: Lock audio data and uninstall audio call
 {
 	if (Snd_Mutex) SDL_LockMutex(Snd_Mutex);
 	else if (sound_disabled) return;
-	else if (midi_disabled && digital_disabled
-#ifdef HW3SOUND
-	         && hws_mode == HWS_DEFAULT_MODE
-#endif
-	        ) SDL_LockAudio();
+	else if (midi_disabled && digital_disabled) SDL_LockAudio();
 #ifdef HAVE_MIXER
 	else if (musicStarted) Mix_SetPostMix(NULL, NULL);
 #endif
@@ -209,11 +199,7 @@ static void Snd_UnlockAudio(void) //Alam: Unlock audio data and reinstall audio
 {
 	if (Snd_Mutex) SDL_UnlockMutex(Snd_Mutex);
 	else if (sound_disabled) return;
-	else if (midi_disabled && digital_disabled
-#ifdef HW3SOUND
-	         && hws_mode == HWS_DEFAULT_MODE
-#endif
-	        ) SDL_UnlockAudio();
+	else if (midi_disabled && digital_disabled) SDL_UnlockAudio();
 #ifdef HAVE_MIXER
 	else if (musicStarted) Mix_SetPostMix(audio.callback, audio.userdata);
 #endif
@@ -536,11 +522,6 @@ void *I_GetSfx(sfxinfo_t *sfx)
 //	else if (sfx->lumpnum != S_GetSfxLumpNum(sfx))
 //		I_FreeSfx(sfx);
 
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-		return HW3S_GetSfx(sfx);
-#endif
-
 	if (sfx->data)
 		return sfx->data; //Alam: I have it done!
 
@@ -555,39 +536,31 @@ void I_FreeSfx(sfxinfo_t * sfx)
 //	if (sfx->lumpnum<0)
 //		return;
 
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		HW3S_FreeSfx(sfx);
-	}
-	else
-#endif
-	{
-		size_t i;
+	size_t i;
 
-		for (i = 1; i < NUMSFX; i++)
+	for (i = 1; i < NUMSFX; i++)
+	{
+		// Alias? Example is the chaingun sound linked to pistol.
+		if (S_sfx[i].data == sfx->data)
 		{
-			// Alias? Example is the chaingun sound linked to pistol.
-			if (S_sfx[i].data == sfx->data)
-			{
-				if (S_sfx+i != sfx) S_sfx[i].data = NULL;
-				S_sfx[i].lumpnum = LUMPERROR;
-				S_sfx[i].length = 0;
-			}
+			if (S_sfx+i != sfx) S_sfx[i].data = NULL;
+			S_sfx[i].lumpnum = LUMPERROR;
+			S_sfx[i].length = 0;
 		}
-		//Snd_LockAudio(); //Alam: too much?
-		// Loop all channels, check.
-		for (i = 0; i < NUM_CHANNELS; i++)
-		{
-			// Active, and using the same SFX?
-			if (channels[i].end && channels[i].id == sfx->data)
-			{
-				channels[i].end = NULL; // Reset.
-			}
-		}
-		//Snd_UnlockAudio(); //Alam: too much?
-		Z_Free(sfx->data);
 	}
+	//Snd_LockAudio(); //Alam: too much?
+	// Loop all channels, check.
+	for (i = 0; i < NUM_CHANNELS; i++)
+	{
+		// Active, and using the same SFX?
+		if (channels[i].end && channels[i].id == sfx->data)
+		{
+			channels[i].end = NULL; // Reset.
+		}
+	}
+	//Snd_UnlockAudio(); //Alam: too much?
+	Z_Free(sfx->data);
+
 	sfx->data = NULL;
 	sfx->lumpnum = LUMPERROR;
 }
@@ -1081,62 +1054,6 @@ void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch)
 
 }
 
-#ifdef HW3SOUND
-
-static void *soundso = NULL;
-
-static INT32 Init3DSDriver(const char *soName)
-{
-	if (soName) soundso = hwOpen(soName);
-#if defined (_WIN32) && defined (_X86_) && !defined (STATIC3DS)
-	HW3DS.pfnStartup            = hwSym("Startup@8",soundso);
-	HW3DS.pfnShutdown           = hwSym("Shutdown@0",soundso);
-	HW3DS.pfnAddSfx             = hwSym("AddSfx@4",soundso);
-	HW3DS.pfnAddSource          = hwSym("AddSource@8",soundso);
-	HW3DS.pfnStartSource        = hwSym("StartSource@4",soundso);
-	HW3DS.pfnStopSource         = hwSym("StopSource@4",soundso);
-	HW3DS.pfnGetHW3DSVersion    = hwSym("GetHW3DSVersion@0",soundso);
-	HW3DS.pfnBeginFrameUpdate   = hwSym("BeginFrameUpdate@0",soundso);
-	HW3DS.pfnEndFrameUpdate     = hwSym("EndFrameUpdate@0",soundso);
-	HW3DS.pfnIsPlaying          = hwSym("IsPlaying@4",soundso);
-	HW3DS.pfnUpdateListener     = hwSym("UpdateListener@8",soundso);
-	HW3DS.pfnUpdateSourceParms  = hwSym("UpdateSourceParms@12",soundso);
-	HW3DS.pfnSetCone            = hwSym("SetCone@8",soundso);
-	HW3DS.pfnSetGlobalSfxVolume = hwSym("SetGlobalSfxVolume@4",soundso);
-	HW3DS.pfnUpdate3DSource     = hwSym("Update3DSource@8",soundso);
-	HW3DS.pfnReloadSource       = hwSym("ReloadSource@8",soundso);
-	HW3DS.pfnKillSource         = hwSym("KillSource@4",soundso);
-	HW3DS.pfnKillSfx            = hwSym("KillSfx@4",soundso);
-	HW3DS.pfnGetHW3DSTitle      = hwSym("GetHW3DSTitle@8",soundso);
-#else
-	HW3DS.pfnStartup            = hwSym("Startup",soundso);
-	HW3DS.pfnShutdown           = hwSym("Shutdown",soundso);
-	HW3DS.pfnAddSfx             = hwSym("AddSfx",soundso);
-	HW3DS.pfnAddSource          = hwSym("AddSource",soundso);
-	HW3DS.pfnStartSource        = hwSym("StartSource",soundso);
-	HW3DS.pfnStopSource         = hwSym("StopSource",soundso);
-	HW3DS.pfnGetHW3DSVersion    = hwSym("GetHW3DSVersion",soundso);
-	HW3DS.pfnBeginFrameUpdate   = hwSym("BeginFrameUpdate",soundso);
-	HW3DS.pfnEndFrameUpdate     = hwSym("EndFrameUpdate",soundso);
-	HW3DS.pfnIsPlaying          = hwSym("IsPlaying",soundso);
-	HW3DS.pfnUpdateListener     = hwSym("UpdateListener",soundso);
-	HW3DS.pfnUpdateSourceParms  = hwSym("UpdateSourceParms",soundso);
-	HW3DS.pfnSetCone            = hwSym("SetCone",soundso);
-	HW3DS.pfnSetGlobalSfxVolume = hwSym("SetGlobalSfxVolume",soundso);
-	HW3DS.pfnUpdate3DSource     = hwSym("Update3DSource",soundso);
-	HW3DS.pfnReloadSource       = hwSym("ReloadSource",soundso);
-	HW3DS.pfnKillSource         = hwSym("KillSource",soundso);
-	HW3DS.pfnKillSfx            = hwSym("KillSfx",soundso);
-	HW3DS.pfnGetHW3DSTitle      = hwSym("GetHW3DSTitle",soundso);
-#endif
-
-//	if (HW3DS.pfnUpdateListener2 && HW3DS.pfnUpdateListener2 != soundso)
-		return true;
-//	else
-//		return false;
-}
-#endif
-
 void I_ShutdownSound(void)
 {
 	if (sound_disabled || !sound_started)
@@ -1144,15 +1061,6 @@ void I_ShutdownSound(void)
 
 	CONS_Printf("I_ShutdownSound: ");
 
-#ifdef HW3SOUND
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		HW3S_Shutdown();
-		hwClose(soundso);
-		return;
-	}
-#endif
-
 	if (midi_disabled && digital_disabled)
 		SDL_CloseAudio();
 	CONS_Printf("%s", M_GetText("shut down\n"));
@@ -1169,12 +1077,9 @@ void I_UpdateSound(void)
 
 void I_StartupSound(void)
 {
-#ifdef HW3SOUND
-	const char *sdrv_name = NULL;
-#endif
 #ifndef HAVE_MIXER
 #ifndef NO_MIDI
-	midi_disabled = 
+	midi_disabled =
 #endif
 	digital_disabled = true;
 #endif
@@ -1228,75 +1133,6 @@ void I_StartupSound(void)
 	if (sound_disabled)
 		return;
 
-#ifdef HW3SOUND
-#ifdef STATIC3DS
-	if (M_CheckParm("-3dsound") || M_CheckParm("-ds3d"))
-	{
-		hws_mode = HWS_OPENAL;
-	}
-#elif defined (_WIN32)
-	if (M_CheckParm("-ds3d"))
-	{
-		hws_mode = HWS_DS3D;
-		sdrv_name = "s_ds3d.dll";
-	}
-	else if (M_CheckParm("-fmod3d"))
-	{
-		hws_mode = HWS_FMOD3D;
-		sdrv_name = "s_fmod.dll";
-	}
-	else if (M_CheckParm("-openal"))
-	{
-		hws_mode = HWS_OPENAL;
-		sdrv_name = "s_openal.dll";
-	}
-#else
-	if (M_CheckParm("-fmod3d"))
-	{
-		hws_mode = HWS_FMOD3D;
-		sdrv_name = "./s_fmod.so";
-	}
-	else if (M_CheckParm("-openal"))
-	{
-		hws_mode = HWS_OPENAL;
-		sdrv_name = "./s_openal.so";
-	}
-#endif
-	else if (M_CheckParm("-sounddriver") &&  M_IsNextParm())
-	{
-		hws_mode = HWS_OTHER;
-		sdrv_name = M_GetNextParm();
-	}
-	if (hws_mode != HWS_DEFAULT_MODE)
-	{
-		if (Init3DSDriver(sdrv_name))
-		{
-			snddev_t            snddev;
-
-			//sound_disabled = true;
-			//I_AddExitFunc(I_ShutdownSound);
-			snddev.bps = 16;
-			snddev.sample_rate = audio.freq;
-			snddev.numsfxs = NUMSFX;
-#if defined (_WIN32)
-			snddev.cooplevel = 0x00000002;
-			snddev.hWnd = vid.WndParent;
-#endif
-			if (HW3S_Init(I_Error, &snddev))
-			{
-				audio.userdata = NULL;
-				CONS_Printf("%s", M_GetText(" Using 3D sound driver\n"));
-				return;
-			}
-			CONS_Printf("%s", M_GetText(" Failed loading 3D sound driver\n"));
-			// Falls back to default sound system
-			HW3S_Shutdown();
-			hwClose(soundso);
-		}
-		CONS_Printf("%s", M_GetText(" Failed loading 3D sound driver\n"));
-		hws_mode = HWS_DEFAULT_MODE;
-	}
-#endif
 	if (!musicStarted && SDL_OpenAudio(&audio, &audio) < 0)
 	{
 		CONS_Printf("%s", M_GetText(" couldn't open audio with desired format\n"));
@@ -1410,7 +1246,6 @@ UINT32 I_GetSongPosition(void)
 }
 
 void I_UpdateSongLagThreshold (void) {}
-void I_UpdateSongLagConditions (void) {}
 
 /// ------------------------
 //  MUSIC PLAYBACK
diff --git a/src/sdl/sdlmain.h b/src/sdl/sdlmain.h
index 01edd866a..0c5bfaeff 100644
--- a/src/sdl/sdlmain.h
+++ b/src/sdl/sdlmain.h
@@ -19,6 +19,10 @@
 #ifndef __sdlmain__
 #define __sdlmain__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern SDL_bool consolevent;
 extern SDL_bool framebuffer;
 
@@ -54,43 +58,28 @@ typedef struct SDLJoyInfo_s
 	int hats;
 	/// number of balls
 	int balls;
-
 } SDLJoyInfo_t;
 
 /**	\brief SDL info about controller 1
 */
-extern SDLJoyInfo_t JoyInfo;
+extern SDLJoyInfo_t JoyInfo[4]; //MAXSPLITSCREENPLAYERS
 
 /**	\brief joystick axis deadzone
 */
 #define SDL_JDEADZONE 153
 #undef SDL_JDEADZONE
 
-/**	\brief SDL inof about controller 2
-*/
-extern SDLJoyInfo_t JoyInfo2;
-
-/**	\brief SDL inof about controller 3
-*/
-extern SDLJoyInfo_t JoyInfo3;
-
-/**	\brief SDL inof about controller 4
-*/
-extern SDLJoyInfo_t JoyInfo4;
-
 void I_GetConsoleEvents(void);
 
 // So we can call this from i_video event loop
-void I_ShutdownJoystick(void);
-void I_ShutdownJoystick2(void);
-void I_ShutdownJoystick3(void);
-void I_ShutdownJoystick4(void);
+void I_ShutdownJoystick(UINT8 index);
 
 // Cheat to get the device index for a game controller handle
 INT32 I_GetJoystickDeviceIndex(SDL_GameController *dev);
 
 // Quick thing to make SDL_JOYDEVICEADDED events less of an abomination
-void I_UpdateJoystickDeviceIndices(INT32 player);
+void I_UpdateJoystickDeviceIndex(UINT8 player);
+void I_UpdateJoystickDeviceIndices(UINT8 excludePlayer);
 
 void I_GetConsoleEvents(void);
 
@@ -99,4 +88,8 @@ void SDLforceUngrabMouse(void);
 // Needed for some WIN32 functions
 extern SDL_Window *window;
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/sounds.c b/src/sounds.c
index 51961b906..02e02b08a 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -14,7 +14,7 @@
 #include "doomtype.h"
 #include "i_sound.h"
 #include "sounds.h"
-#include "s_sound.h" //for soundprecaching
+#include "s_sound.h" // for soundprecaching
 #include "m_argv.h"
 #include "r_defs.h"
 #include "r_things.h"
@@ -34,939 +34,939 @@ sfxinfo_t S_sfx[NUMSFX] =
 	various flags. See soundflags_t.
 *****/
   // S_sfx[0] needs to be a dummy for odd reasons. (don't modify this comment)
-//  name, singularity, priority, pitch, volume, data, length, skinsound, usefulness, lumpnum
-  {"none" ,  false,   0,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+//  name, singularity, priority, pitch, data, length, skinsound, lumpnum
+  {"none" ,  false,   0,  0, NULL, 0,        -1, LUMPERROR},
 
   // Skin Sounds
-  {"altdi1", false, 192, 16, -1, NULL, 0, SKSPLDET1,  -1, LUMPERROR},
-  {"altdi2", false, 192, 16, -1, NULL, 0, SKSPLDET2,  -1, LUMPERROR},
-  {"altdi3", false, 192, 16, -1, NULL, 0, SKSPLDET3,  -1, LUMPERROR},
-  {"altdi4", false, 192, 16, -1, NULL, 0, SKSPLDET4,  -1, LUMPERROR},
-  {"altow1", false, 192, 16, -1, NULL, 0, SKSPLPAN1,  -1, LUMPERROR},
-  {"altow2", false, 192, 16, -1, NULL, 0, SKSPLPAN2,  -1, LUMPERROR},
-  {"altow3", false, 192, 16, -1, NULL, 0, SKSPLPAN3,  -1, LUMPERROR},
-  {"altow4", false, 192, 16, -1, NULL, 0, SKSPLPAN4,  -1, LUMPERROR},
-  {"victr1", false,  64, 16, -1, NULL, 0, SKSPLVCT1,  -1, LUMPERROR},
-  {"victr2", false,  64, 16, -1, NULL, 0, SKSPLVCT2,  -1, LUMPERROR},
-  {"victr3", false,  64, 16, -1, NULL, 0, SKSPLVCT3,  -1, LUMPERROR},
-  {"victr4", false,  64, 16, -1, NULL, 0, SKSPLVCT4,  -1, LUMPERROR},
-  {"gasp" ,  false,  64,  0, -1, NULL, 0,   SKSGASP,  -1, LUMPERROR},
-  {"jump" ,  false, 140,  0, -1, NULL, 0,   SKSJUMP,  -1, LUMPERROR},
-  {"pudpud", false,  64,  0, -1, NULL, 0, SKSPUDPUD,  -1, LUMPERROR},
-  {"putput", false,  64,  0, -1, NULL, 0, SKSPUTPUT,  -1, LUMPERROR}, // not as high a priority
-  {"spin" ,  false, 100,  0, -1, NULL, 0,   SKSSPIN,  -1, LUMPERROR},
-  {"spndsh", false,  64,  1, -1, NULL, 0, SKSSPNDSH,  -1, LUMPERROR},
-  {"thok" ,  false,  96,  0, -1, NULL, 0,   SKSTHOK,  -1, LUMPERROR},
-  {"zoom" ,  false, 120,  1, -1, NULL, 0,   SKSZOOM,  -1, LUMPERROR},
-  {"skid",   false,  64, 32, -1, NULL, 0,   SKSSKID,  -1, LUMPERROR},
+  {"altdi1", false, 192, 16, NULL, 0, SKSPLDET1, LUMPERROR},
+  {"altdi2", false, 192, 16, NULL, 0, SKSPLDET2, LUMPERROR},
+  {"altdi3", false, 192, 16, NULL, 0, SKSPLDET3, LUMPERROR},
+  {"altdi4", false, 192, 16, NULL, 0, SKSPLDET4, LUMPERROR},
+  {"altow1", false, 192, 16, NULL, 0, SKSPLPAN1, LUMPERROR},
+  {"altow2", false, 192, 16, NULL, 0, SKSPLPAN2, LUMPERROR},
+  {"altow3", false, 192, 16, NULL, 0, SKSPLPAN3, LUMPERROR},
+  {"altow4", false, 192, 16, NULL, 0, SKSPLPAN4, LUMPERROR},
+  {"victr1", false,  64, 16, NULL, 0, SKSPLVCT1, LUMPERROR},
+  {"victr2", false,  64, 16, NULL, 0, SKSPLVCT2, LUMPERROR},
+  {"victr3", false,  64, 16, NULL, 0, SKSPLVCT3, LUMPERROR},
+  {"victr4", false,  64, 16, NULL, 0, SKSPLVCT4, LUMPERROR},
+  {"gasp" ,  false,  64,  0, NULL, 0,   SKSGASP, LUMPERROR},
+  {"jump" ,  false, 140,  0, NULL, 0,   SKSJUMP, LUMPERROR},
+  {"pudpud", false,  64,  0, NULL, 0, SKSPUDPUD, LUMPERROR},
+  {"putput", false,  64,  0, NULL, 0, SKSPUTPUT, LUMPERROR}, // not as high a priority
+  {"spin" ,  false, 100,  0, NULL, 0,   SKSSPIN, LUMPERROR},
+  {"spndsh", false,  64,  1, NULL, 0, SKSSPNDSH, LUMPERROR},
+  {"thok" ,  false,  96,  0, NULL, 0,   SKSTHOK, LUMPERROR},
+  {"zoom" ,  false, 120,  1, NULL, 0,   SKSZOOM, LUMPERROR},
+  {"skid",   false,  64, 32, NULL, 0,   SKSSKID, LUMPERROR},
 
   // Ambience/background objects/etc
-  {"ambint",  true,  32,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"ambint",  true,  32,  0, NULL, 0,        -1, LUMPERROR},
 
-  {"alarm",  false,  32,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"buzz1",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"buzz2",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"buzz3",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"buzz4",  false,   8,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"crumbl",  true, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Platform Crumble Tails 03-16-2001
-  {"fire",   false,   8, 32, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"grind",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"laser",   true,  16,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mswing", false,  16,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"pstart", false, 100,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"pstop",  false, 100,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"steam1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Tails 06-19-2001
-  {"steam2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Tails 06-19-2001
-  {"wbreak", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"alarm",  false,  32,  0, NULL, 0,        -1, LUMPERROR},
+  {"buzz1",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"buzz2",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"buzz3",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"buzz4",  false,   8,  0, NULL, 0,        -1, LUMPERROR},
+  {"crumbl",  true, 127,  0, NULL, 0,        -1, LUMPERROR}, // Platform Crumble Tails 03-16-2001
+  {"fire",   false,   8, 32, NULL, 0,        -1, LUMPERROR},
+  {"grind",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"laser",   true,  16,  2, NULL, 0,        -1, LUMPERROR},
+  {"mswing", false,  16,  0, NULL, 0,        -1, LUMPERROR},
+  {"pstart", false, 100,  0, NULL, 0,        -1, LUMPERROR},
+  {"pstop",  false, 100,  0, NULL, 0,        -1, LUMPERROR},
+  {"steam1", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Tails 06-19-2001
+  {"steam2", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Tails 06-19-2001
+  {"wbreak", false,  64,  0, NULL, 0,        -1, LUMPERROR},
 
-  {"rainin",  true,  24,  4, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"litng1", false,  16,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"litng2", false,  16,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"litng3", false,  16,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"litng4", false,  16,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"athun1", false,  16,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"athun2", false,  16,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"rainin",  true,  24,  4, NULL, 0,        -1, LUMPERROR},
+  {"litng1", false,  16,  2, NULL, 0,        -1, LUMPERROR},
+  {"litng2", false,  16,  2, NULL, 0,        -1, LUMPERROR},
+  {"litng3", false,  16,  2, NULL, 0,        -1, LUMPERROR},
+  {"litng4", false,  16,  2, NULL, 0,        -1, LUMPERROR},
+  {"athun1", false,  16,  2, NULL, 0,        -1, LUMPERROR},
+  {"athun2", false,  16,  2, NULL, 0,        -1, LUMPERROR},
 
-  {"amwtr1", false,  12,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"amwtr2", false,  12,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"amwtr3", false,  12,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"amwtr4", false,  12,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"amwtr5", false,  12,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"amwtr6", false,  12,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"amwtr7", false,  12,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"amwtr8", false,  12,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bubbl1", false,  11,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bubbl2", false,  11,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bubbl3", false,  11,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bubbl4", false,  11,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bubbl5", false,  11,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"floush", false,  16,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"splash", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"splish", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Splish Tails 12-08-2000
-  {"wdrip1", false,   8,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wdrip2", false,   8 , 0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wdrip3", false,   8,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wdrip4", false,   8,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wdrip5", false,   8,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wdrip6", false,   8,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wdrip7", false,   8,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wdrip8", false,   8,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wslap",  false,  32,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Water Slap Tails 12-13-2000
+  {"amwtr1", false,  12,  0, NULL, 0,        -1, LUMPERROR},
+  {"amwtr2", false,  12,  0, NULL, 0,        -1, LUMPERROR},
+  {"amwtr3", false,  12,  0, NULL, 0,        -1, LUMPERROR},
+  {"amwtr4", false,  12,  0, NULL, 0,        -1, LUMPERROR},
+  {"amwtr5", false,  12,  0, NULL, 0,        -1, LUMPERROR},
+  {"amwtr6", false,  12,  0, NULL, 0,        -1, LUMPERROR},
+  {"amwtr7", false,  12,  0, NULL, 0,        -1, LUMPERROR},
+  {"amwtr8", false,  12,  0, NULL, 0,        -1, LUMPERROR},
+  {"bubbl1", false,  11,  0, NULL, 0,        -1, LUMPERROR},
+  {"bubbl2", false,  11,  0, NULL, 0,        -1, LUMPERROR},
+  {"bubbl3", false,  11,  0, NULL, 0,        -1, LUMPERROR},
+  {"bubbl4", false,  11,  0, NULL, 0,        -1, LUMPERROR},
+  {"bubbl5", false,  11,  0, NULL, 0,        -1, LUMPERROR},
+  {"floush", false,  16,  0, NULL, 0,        -1, LUMPERROR},
+  {"splash", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"splish", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Splish Tails 12-08-2000
+  {"wdrip1", false,   8,  0, NULL, 0,        -1, LUMPERROR},
+  {"wdrip2", false,   8 , 0, NULL, 0,        -1, LUMPERROR},
+  {"wdrip3", false,   8,  0, NULL, 0,        -1, LUMPERROR},
+  {"wdrip4", false,   8,  0, NULL, 0,        -1, LUMPERROR},
+  {"wdrip5", false,   8,  0, NULL, 0,        -1, LUMPERROR},
+  {"wdrip6", false,   8,  0, NULL, 0,        -1, LUMPERROR},
+  {"wdrip7", false,   8,  0, NULL, 0,        -1, LUMPERROR},
+  {"wdrip8", false,   8,  0, NULL, 0,        -1, LUMPERROR},
+  {"wslap",  false,  32,  0, NULL, 0,        -1, LUMPERROR}, // Water Slap Tails 12-13-2000
 
-  {"doora1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"doorb1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"doorc1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"doorc2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"doord1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"doord2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"eleva1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"eleva2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"eleva3", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"elevb1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"elevb2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"elevb3", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"doora1", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"doorb1", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"doorc1", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"doorc2", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"doord1", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"doord2", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"eleva1", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"eleva2", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"eleva3", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"elevb1", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"elevb2", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"elevb3", false,  64,  0, NULL, 0,        -1, LUMPERROR},
 
-  {"ambin2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"lavbub", false,  64,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"rocks1", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"rocks2", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"rocks3", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"rocks4", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"rumbam", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"rumble", false,  64, 24, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"ambin2", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"lavbub", false,  64,  8, NULL, 0,        -1, LUMPERROR},
+  {"rocks1", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"rocks2", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"rocks3", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"rocks4", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"rumbam", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"rumble", false,  64, 24, NULL, 0,        -1, LUMPERROR},
 
   // Game objects, etc
-  {"appear", false, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bkpoof", false,  70,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bnce1",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Boing!
-  {"bnce2",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Boing!
-  {"cannon", false,  64,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cgot" ,   true, 120,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Got Emerald! Tails 09-02-2001
-  {"cybdth", false,  32,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"deton",   true,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"ding",   false, 127,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"dmpain", false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"drown",  false, 192,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"fizzle", false, 127,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"gbeep",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Grenade beep
-  {"ghit" ,  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"gloop",  false,  60,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"gspray", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"gravch", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"itemup",  true, 255,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"jet",    false,   8,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"jshard",  true, 167,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"lose" ,  false, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"lvpass", false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mindig", false,   8, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mixup",   true, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"pogo" ,  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"pop"  ,  false,  78,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"rail1",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"rail2",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"rlaunc", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"shield", false,  60,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"shldls", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"spdpad", false, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"spkdth", false, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"spring", false, 112,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"statu1",  true,  64,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"statu2",  true,  64,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"strpst",  true, 192,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Starpost Sound Tails 07-04-2002
-  {"supert",  true, 127,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"telept", false,  32,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"tink" ,  false,  60,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"token" ,  true, 224,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // SS token
-  {"trfire",  true,  60,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"trpowr",  true, 127,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"turhit", false,  40,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wdjump", false,  60,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mswarp", false,  60, 16, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mspogo", false,  60,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"appear", false, 127,  0, NULL, 0,        -1, LUMPERROR},
+  {"bkpoof", false,  70,  8, NULL, 0,        -1, LUMPERROR},
+  {"bnce1",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Boing!
+  {"bnce2",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Boing!
+  {"cannon", false,  64,  8, NULL, 0,        -1, LUMPERROR},
+  {"cgot" ,   true, 120,  0, NULL, 0,        -1, LUMPERROR}, // Got Emerald! Tails 09-02-2001
+  {"cybdth", false,  32,  0, NULL, 0,        -1, LUMPERROR},
+  {"deton",   true,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"ding",   false, 127,  8, NULL, 0,        -1, LUMPERROR},
+  {"dmpain", false,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"drown",  false, 192,  0, NULL, 0,        -1, LUMPERROR},
+  {"fizzle", false, 127,  8, NULL, 0,        -1, LUMPERROR},
+  {"gbeep",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Grenade beep
+  {"ghit" ,  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"gloop",  false,  60,  0, NULL, 0,        -1, LUMPERROR},
+  {"gspray", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"gravch", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"itemup",  true, 255,  0, NULL, 0,        -1, LUMPERROR},
+  {"jet",    false,   8,  0, NULL, 0,        -1, LUMPERROR},
+  {"jshard",  true, 167,  0, NULL, 0,        -1, LUMPERROR},
+  {"lose" ,  false, 127,  0, NULL, 0,        -1, LUMPERROR},
+  {"lvpass", false,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"mindig", false,   8, 64, NULL, 0,        -1, LUMPERROR},
+  {"mixup",   true, 127,  0, NULL, 0,        -1, LUMPERROR},
+  {"pogo" ,  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"pop"  ,  false,  78,  0, NULL, 0,        -1, LUMPERROR},
+  {"rail1",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"rail2",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"rlaunc", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"shield", false,  60,  0, NULL, 0,        -1, LUMPERROR},
+  {"shldls", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"spdpad", false, 127,  0, NULL, 0,        -1, LUMPERROR},
+  {"spkdth", false, 127,  0, NULL, 0,        -1, LUMPERROR},
+  {"spring", false, 112,  0, NULL, 0,        -1, LUMPERROR},
+  {"statu1",  true,  64,  2, NULL, 0,        -1, LUMPERROR},
+  {"statu2",  true,  64,  2, NULL, 0,        -1, LUMPERROR},
+  {"strpst",  true, 192,  0, NULL, 0,        -1, LUMPERROR}, // Starpost Sound Tails 07-04-2002
+  {"supert",  true, 127,  2, NULL, 0,        -1, LUMPERROR},
+  {"telept", false,  32,  0, NULL, 0,        -1, LUMPERROR},
+  {"tink" ,  false,  60,  0, NULL, 0,        -1, LUMPERROR},
+  {"token" ,  true, 224,  0, NULL, 0,        -1, LUMPERROR}, // SS token
+  {"trfire",  true,  60,  8, NULL, 0,        -1, LUMPERROR},
+  {"trpowr",  true, 127,  8, NULL, 0,        -1, LUMPERROR},
+  {"turhit", false,  40,  8, NULL, 0,        -1, LUMPERROR},
+  {"wdjump", false,  60,  0, NULL, 0,        -1, LUMPERROR},
+  {"mswarp", false,  60, 16, NULL, 0,        -1, LUMPERROR},
+  {"mspogo", false,  60,  8, NULL, 0,        -1, LUMPERROR},
 
   // Menu, interface
-  {"chchng", false, 120,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"dwnind", false, 212,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"emfind", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"flgcap", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"menu1",   true,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"oneup",   true, 192,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"ptally",  true,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Point tally is identical to menu for now
-  {"radio",  false,  60,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"wepchg",  true,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Weapon switch is identical to menu for now
-  {"wtrdng",  true, 212,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // make sure you can hear the DING DING! Tails 03-08-2000
-  {"zelda",  false, 120,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"chchng", false, 120,  0, NULL, 0,        -1, LUMPERROR},
+  {"dwnind", false, 212,  0, NULL, 0,        -1, LUMPERROR},
+  {"emfind", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"flgcap", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"menu1",   true,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"oneup",   true, 192,  0, NULL, 0,        -1, LUMPERROR},
+  {"ptally",  true,  64,  0, NULL, 0,        -1, LUMPERROR}, // Point tally is identical to menu for now
+  {"radio",  false,  60,  0, NULL, 0,        -1, LUMPERROR},
+  {"wepchg",  true,  64,  0, NULL, 0,        -1, LUMPERROR}, // Weapon switch is identical to menu for now
+  {"wtrdng",  true, 212,  0, NULL, 0,        -1, LUMPERROR}, // make sure you can hear the DING DING! Tails 03-08-2000
+  {"zelda",  false, 120,  0, NULL, 0,        -1, LUMPERROR},
 
   // NiGHTS
-  {"ideya",  false, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"xideya", false, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Xmas
-  {"nbmper", false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"nxbump", false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Xmas
-  {"ncitem", false, 204,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"nxitem", false, 204,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Xmas
-  {"ngdone",  true, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"nxdone",  true, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Xmas
-  {"drill1", false,  48,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"drill2", false,  48,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"ncspec", false, 204,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Tails 12-15-2003
-  {"nghurt", false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"ngskid", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"hoop1",  false, 192,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"hoop2",  false, 192,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"hoop3",  false, 192,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"hidden", false, 204,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"prloop", false, 104,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"timeup",  true, 256,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"ideya",  false, 127,  0, NULL, 0,        -1, LUMPERROR},
+  {"xideya", false, 127,  0, NULL, 0,        -1, LUMPERROR}, // Xmas
+  {"nbmper", false,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"nxbump", false,  96,  0, NULL, 0,        -1, LUMPERROR}, // Xmas
+  {"ncitem", false, 204,  0, NULL, 0,        -1, LUMPERROR},
+  {"nxitem", false, 204,  0, NULL, 0,        -1, LUMPERROR}, // Xmas
+  {"ngdone",  true, 127,  0, NULL, 0,        -1, LUMPERROR},
+  {"nxdone",  true, 127,  0, NULL, 0,        -1, LUMPERROR}, // Xmas
+  {"drill1", false,  48,  0, NULL, 0,        -1, LUMPERROR},
+  {"drill2", false,  48,  0, NULL, 0,        -1, LUMPERROR},
+  {"ncspec", false, 204,  0, NULL, 0,        -1, LUMPERROR}, // Tails 12-15-2003
+  {"nghurt", false,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"ngskid", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"hoop1",  false, 192,  0, NULL, 0,        -1, LUMPERROR},
+  {"hoop2",  false, 192,  0, NULL, 0,        -1, LUMPERROR},
+  {"hoop3",  false, 192,  0, NULL, 0,        -1, LUMPERROR},
+  {"hidden", false, 204,  0, NULL, 0,        -1, LUMPERROR},
+  {"prloop", false, 104,  0, NULL, 0,        -1, LUMPERROR},
+  {"timeup",  true, 256,  0, NULL, 0,        -1, LUMPERROR},
 
   // Mario
-  {"koopfr" , true, 127,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mario1", false,  60,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mario2", false, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mario3", false,  60,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mario4",  true,  78,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mario5", false,  78,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mario6", false,  60,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mario7", false,  32,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mario8", false,  48,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"mario9",  true, 120,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"marioa",  true, 127,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"thwomp",  true, 127,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"koopfr" , true, 127,  8, NULL, 0,        -1, LUMPERROR},
+  {"mario1", false,  60,  0, NULL, 0,        -1, LUMPERROR},
+  {"mario2", false, 127,  0, NULL, 0,        -1, LUMPERROR},
+  {"mario3", false,  60,  0, NULL, 0,        -1, LUMPERROR},
+  {"mario4",  true,  78,  0, NULL, 0,        -1, LUMPERROR},
+  {"mario5", false,  78,  0, NULL, 0,        -1, LUMPERROR},
+  {"mario6", false,  60,  0, NULL, 0,        -1, LUMPERROR},
+  {"mario7", false,  32,  0, NULL, 0,        -1, LUMPERROR},
+  {"mario8", false,  48,  8, NULL, 0,        -1, LUMPERROR},
+  {"mario9",  true, 120,  0, NULL, 0,        -1, LUMPERROR},
+  {"marioa",  true, 127,  0, NULL, 0,        -1, LUMPERROR},
+  {"thwomp",  true, 127,  8, NULL, 0,        -1, LUMPERROR},
 
   // Black Eggman
-  {"bebomb", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bechrg", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"becrsh", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bedeen", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bedie1", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bedie2", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"beeyow", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"befall", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"befire", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"beflap", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"begoop", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"begrnd", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"behurt", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bejet1", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"belnch", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"beoutb", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"beragh", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"beshot", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bestep", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bestp2", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bewar1", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bewar2", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bewar3", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bewar4", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bexpld", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"bgxpld", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"bebomb", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bechrg", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"becrsh", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bedeen", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bedie1", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bedie2", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"beeyow", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"befall", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"befire", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"beflap", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"begoop", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"begrnd", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"behurt", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bejet1", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"belnch", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"beoutb", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"beragh", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"beshot", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bestep", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bestp2", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bewar1", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bewar2", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bewar3", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bewar4", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bexpld", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"bgxpld", false,  64, 64, NULL, 0,        -1, LUMPERROR},
 
   // Cybrakdemon
-  {"beelec", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"brakrl", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"brakrx", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"beelec", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"brakrl", false,  64, 64, NULL, 0,        -1, LUMPERROR},
+  {"brakrx", false,  64, 64, NULL, 0,        -1, LUMPERROR},
 
   // Sonic 1 sounds
-  {"s1a0",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1a1",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1a2",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Monty Mole attach
-  {"s1a3",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1a4",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1a5",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1a6",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1a7",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1a8",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1a9",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1aa",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1ab",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Monty Mole twitch
-  {"s1ac",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Misc. obstacle destroyed
-  {"s1ad",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1ae",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1af",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1b0",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1b1",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1b2",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1b3",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1b4",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Toggle all items
-  {"s1b5",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1b6",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1b7",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1b8",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1b9",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1ba",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Toggle item
-  {"s1bb",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Thwomp drop
-  {"s1bc",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1bd",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Ballhog bounce
-  {"s1be",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1bf",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1c0",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1c1",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Monokuma death
-  {"s1c2",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1c3",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1c4",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1c5",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1c6",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1c7",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1c8",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1c9",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Item hit w/ voices off
-  {"s1ca",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1cb",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1cc",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1cd",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1ce",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s1cf",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"s1a0",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1a1",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1a2",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Monty Mole attach
+  {"s1a3",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1a4",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1a5",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1a6",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1a7",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1a8",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1a9",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1aa",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1ab",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Monty Mole twitch
+  {"s1ac",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Misc. obstacle destroyed
+  {"s1ad",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1ae",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1af",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1b0",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1b1",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1b2",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1b3",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1b4",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Toggle all items
+  {"s1b5",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1b6",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1b7",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1b8",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1b9",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1ba",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Toggle item
+  {"s1bb",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Thwomp drop
+  {"s1bc",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1bd",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Ballhog bounce
+  {"s1be",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1bf",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1c0",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1c1",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Monokuma death
+  {"s1c2",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1c3",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1c4",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1c5",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1c6",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1c7",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1c8",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1c9",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Item hit w/ voices off
+  {"s1ca",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1cb",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1cc",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1cd",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1ce",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s1cf",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
 
   // Sonic 2 sounds
-  {"s220",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s221",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Lap sound
-  {"s222",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s223",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s224",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s225",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s226",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s227",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s228",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s229",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s22a",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s22b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s22c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s22d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s22e",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s22f",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s230",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s231",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s232",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s233",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s234",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s235",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s236",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s237",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s238",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s239",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s23a",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s23b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s23c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Drift boost
-  {"s23d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s23e",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Title screen opening
-  {"s23f",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s240",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s241",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s242",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s243",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s244",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s245",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s246",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s247",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s248",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s249",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s24a",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s24b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s24c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s24d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s24e",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s24f",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s250",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s251",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s252",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s253",   false, 255,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // 1st place finish
-  {"s254",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s255",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s256",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s257",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s258",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s259",   false,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Item clashing
-  {"s25a",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s25b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s25c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s25d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s25e",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s25f",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Perfect start boost
-  {"s260",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s261",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s262",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s263",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s264",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s265",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s266",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s267",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s268",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s269",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s26a",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s26b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s26c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s26d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Missed checkpoint
-  {"s26e",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s26f",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s270",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"s220",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s221",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Lap sound
+  {"s222",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s223",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s224",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s225",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s226",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s227",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s228",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s229",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s22a",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s22b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s22c",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s22d",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s22e",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s22f",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s230",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s231",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s232",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s233",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s234",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s235",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s236",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s237",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s238",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s239",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s23a",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s23b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s23c",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Drift boost
+  {"s23d",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s23e",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Title screen opening
+  {"s23f",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s240",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s241",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s242",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s243",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s244",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s245",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s246",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s247",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s248",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s249",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s24a",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s24b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s24c",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s24d",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s24e",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s24f",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s250",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s251",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s252",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s253",   false, 255,  0, NULL, 0,        -1, LUMPERROR}, // 1st place finish
+  {"s254",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s255",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s256",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s257",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s258",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s259",   false,  96,  8, NULL, 0,        -1, LUMPERROR}, // Item clashing
+  {"s25a",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s25b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s25c",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s25d",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s25e",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s25f",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Perfect start boost
+  {"s260",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s261",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s262",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s263",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s264",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s265",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s266",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s267",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s268",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s269",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s26a",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s26b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s26c",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s26d",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Missed checkpoint
+  {"s26e",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s26f",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s270",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
 
   // S3&K sounds
-  {"s3k33",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k34",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k35",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k36",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k37",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k38",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k39",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k3a",  false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart item shield
-  {"s3k3b",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k3c",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k3d",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k3e",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k3f",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k40",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k41",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k42",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart Thunder Shield spawned
-  {"s3k43",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k44",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k45",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k46",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k47",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart AIZ dust
-  {"s3k48",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k49",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart bump sound
-  {"s3k4a",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k4b",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k4c",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k4d",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k4e",  false,  64,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart explosion
-  {"s3k4f",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k50",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k51",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k52",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k53",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k54",  false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR}, // MetalSonic shot fire
-  {"s3k55",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k56",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k57",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k58",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k59",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k5a",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k5b",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k5c",  false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart Mine tick
-  {"s3k5d",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k5e",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k5f",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k60",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k61",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k62",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k63",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k64",  false,  64,  2, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k65",  false, 255,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Blue Spheres
-  {"s3k66",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k67",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k68",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart final lap
-  {"s3k69",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k6a",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart finish
-  {"s3k6b",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k6c",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k6d",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k6e",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k6f",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k70",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k71",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k72",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k73",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k74",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k75",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k76",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k77",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k78",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k79",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k7a",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k7b",  false,  96, 16, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart successful hit
-  {"s3k7c",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k7d",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k7e",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k7f",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k80",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k81",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k82",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k83",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Overcharged start boost
-  {"s3k84",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k85",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k86",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k87",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k88",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k89",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart Jawz target
-  {"s3k8a",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k8b",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k8c",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k8d",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k8e",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k8f",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k90",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k91",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k92",  false,  64,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart Hyudoro use
-  {"s3k93",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k94",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k95",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k96",  false, 128,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart Orbinaut
-  {"s3k97",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k98",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k99",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k9a",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k9b",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k9c",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k9d",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k9e",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3k9f",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3ka0",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3ka1",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3ka2",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart drift spark gain
-  {"s3ka3",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3ka4",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3ka5",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3ka6",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3ka7",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart 3,2,1
-  {"s3ka8",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3ka9",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kaa",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kab",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kac",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kad",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart GO!
-  {"s3kae",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kaf",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb0",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb1",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb2",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb3",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb4",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb5",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb6",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb7",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb8",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kb9",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kba",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kbb",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kbcs", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kbcl", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kbds", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kbdl", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kbes", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kbel", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kbfs", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kbfl", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc0s", false, 192,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart Jawz
-  {"s3kc0l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc1s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc1l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc2s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc2l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc3s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc3l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc4s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc4l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc5s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc5l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc6s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc6l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc7s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc7l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc8s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc8l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc9s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kc9l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kcas", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart respawn
-  {"s3kcal", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kcbs", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kcbl", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kccs", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kccl", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kcds", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kcdl", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kces", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kcel", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kcfs", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kcfl", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd0s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd0l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd1s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd1l", false,  48,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd2s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd2l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd3s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd3l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd4s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd4l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd5s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd5l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd6s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd6l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd7s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd7l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd8s", false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Sharp Spin (maybe use the long/L version?)
-  {"s3kd8l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd9s", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kd9l", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kdas", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kdal", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kdbs", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"s3kdbl", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"s3k33",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k34",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k35",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k36",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k37",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k38",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k39",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k3a",  false,  96,  0, NULL, 0,        -1, LUMPERROR}, // Kart item shield
+  {"s3k3b",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k3c",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k3d",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k3e",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k3f",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k40",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k41",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k42",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart Thunder Shield spawned
+  {"s3k43",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k44",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k45",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k46",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k47",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart AIZ dust
+  {"s3k48",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k49",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart bump sound
+  {"s3k4a",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k4b",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k4c",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k4d",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k4e",  false,  64,  8, NULL, 0,        -1, LUMPERROR}, // Kart explosion
+  {"s3k4f",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k50",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k51",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k52",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k53",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k54",  false,  64, 64, NULL, 0,        -1, LUMPERROR}, // MetalSonic shot fire
+  {"s3k55",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k56",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k57",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k58",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k59",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k5a",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k5b",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k5c",  false,  96,  0, NULL, 0,        -1, LUMPERROR}, // Kart Mine tick
+  {"s3k5d",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k5e",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k5f",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k60",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k61",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k62",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k63",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k64",  false,  64,  2, NULL, 0,        -1, LUMPERROR},
+  {"s3k65",  false, 255,  0, NULL, 0,        -1, LUMPERROR}, // Blue Spheres
+  {"s3k66",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k67",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k68",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart final lap
+  {"s3k69",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k6a",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart finish
+  {"s3k6b",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k6c",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k6d",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k6e",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k6f",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k70",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k71",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k72",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k73",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k74",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k75",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k76",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k77",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k78",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k79",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k7a",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k7b",  false,  96, 16, NULL, 0,        -1, LUMPERROR}, // Kart successful hit
+  {"s3k7c",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k7d",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k7e",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k7f",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k80",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k81",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k82",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k83",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Overcharged start boost
+  {"s3k84",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k85",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k86",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k87",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k88",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k89",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart Jawz target
+  {"s3k8a",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k8b",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k8c",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k8d",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k8e",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k8f",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k90",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k91",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k92",  false,  64,  8, NULL, 0,        -1, LUMPERROR}, // Kart Hyudoro use
+  {"s3k93",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k94",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k95",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k96",  false, 128,  0, NULL, 0,        -1, LUMPERROR}, // Kart Orbinaut
+  {"s3k97",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k98",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k99",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k9a",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k9b",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k9c",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k9d",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k9e",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3k9f",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3ka0",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3ka1",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3ka2",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart drift spark gain
+  {"s3ka3",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3ka4",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3ka5",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3ka6",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3ka7",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart 3,2,1
+  {"s3ka8",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3ka9",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kaa",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kab",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kac",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kad",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart GO!
+  {"s3kae",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kaf",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb0",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb1",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb2",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb3",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb4",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb5",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb6",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb7",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb8",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kb9",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kba",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kbb",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kbcs", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kbcl", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kbds", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kbdl", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kbes", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kbel", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kbfs", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kbfl", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc0s", false, 192,  8, NULL, 0,        -1, LUMPERROR}, // Kart Jawz
+  {"s3kc0l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc1s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc1l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc2s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc2l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc3s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc3l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc4s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc4l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc5s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc5l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc6s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc6l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc7s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc7l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc8s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc8l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc9s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kc9l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kcas", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart respawn
+  {"s3kcal", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kcbs", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kcbl", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kccs", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kccl", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kcds", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kcdl", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kces", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kcel", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kcfs", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kcfl", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd0s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd0l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd1s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd1l", false,  48,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd2s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd2l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd3s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd3l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd4s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd4l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd5s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd5l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd6s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd6l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd7s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd7l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd8s", false,  64, 64, NULL, 0,        -1, LUMPERROR}, // Sharp Spin (maybe use the long/L version?)
+  {"s3kd8l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd9s", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kd9l", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kdas", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kdal", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kdbs", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"s3kdbl", false,  64,  0, NULL, 0,        -1, LUMPERROR},
 
   // 3D Blast sounds (the "missing" ones are direct copies of S3K's, no minor differences what-so-ever)
-  {"3db06",  false,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Bumper stolen
-  {"3db09",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"3db14",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"3db16",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"3db06",  false,  96,  8, NULL, 0,        -1, LUMPERROR}, // Bumper stolen
+  {"3db09",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"3db14",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"3db16",  false,  64,  0, NULL, 0,        -1, LUMPERROR},
 
   // Sonic CD sounds
-  {"cdfm00", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Undercharged start boost
-  {"cdfm01", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Sneaker boost
-  {"cdfm02", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm03", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm04", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm05", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm06", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm07", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm08", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm09", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm10", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm11", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm12", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm13", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm14", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm15", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm16", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm17", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Brake drift ambient
-  {"cdfm18", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm19", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // CD SS1 UFO death
-  {"cdfm20", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm21", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm22", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm23", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm24", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm25", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm26", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm27", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm28", false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Eggman item landing
-  {"cdfm29", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm30", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm31", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm32", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm33", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm34", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm35", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm36", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm37", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm38", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm39", false, 128,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Mine deployed
-  {"cdfm40", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm41", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm42", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm43", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm44", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm45", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm46", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm47", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm48", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm49", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm50", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm51", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm52", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm53", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm54", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm55", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm56", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm57", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm58", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm59", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm60", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm61", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm62", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm63", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm64", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm65", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm66", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm67", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm68", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm69", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm70", false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Trail item dragging
-  {"cdfm71", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm72", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm73", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // CD SS1 UFO hit
-  {"cdfm74", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm75", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm76", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm77", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm78", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdfm79", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm0", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm3", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm4", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm5", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm6", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm7", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm8", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"cdpcm9", false,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // No damage taken
+  {"cdfm00", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Undercharged start boost
+  {"cdfm01", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Sneaker boost
+  {"cdfm02", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm03", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm04", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm05", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm06", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm07", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm08", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm09", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm10", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm11", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm12", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm13", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm14", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm15", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm16", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm17", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Brake drift ambient
+  {"cdfm18", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm19", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // CD SS1 UFO death
+  {"cdfm20", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm21", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm22", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm23", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm24", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm25", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm26", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm27", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm28", false,  96,  0, NULL, 0,        -1, LUMPERROR}, // Eggman item landing
+  {"cdfm29", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm30", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm31", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm32", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm33", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm34", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm35", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm36", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm37", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm38", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm39", false, 128,  8, NULL, 0,        -1, LUMPERROR}, // Mine deployed
+  {"cdfm40", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm41", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm42", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm43", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm44", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm45", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm46", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm47", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm48", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm49", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm50", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm51", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm52", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm53", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm54", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm55", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm56", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm57", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm58", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm59", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm60", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm61", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm62", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm63", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm64", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm65", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm66", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm67", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm68", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm69", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm70", false,  96,  0, NULL, 0,        -1, LUMPERROR}, // Trail item dragging
+  {"cdfm71", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm72", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm73", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // CD SS1 UFO hit
+  {"cdfm74", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm75", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm76", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm77", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm78", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdfm79", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm0", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm1", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm2", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm3", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm4", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm5", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm6", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm7", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm8", false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"cdpcm9", false,  96,  8, NULL, 0,        -1, LUMPERROR}, // No damage taken
 
-  // Knuckles Chaotix sounds
-  {"kc2a",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc2b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc2c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc2d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc2e",   false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Item box gotten
-  {"kc2f",   false,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Spring pad
-  {"kc30",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc31",   false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR}, // NO CONTEST explosion
-  {"kc32",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc33",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc34",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc35",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc36",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc37",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc38",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc39",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Voting roulette
-  {"kc3a",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc3b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc3c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc3d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc3e",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc3f",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc40",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc41",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc42",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Unlock everything cheat
-  {"kc43",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc44",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc45",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc46",   false,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Shrink use
-  {"kc47",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc48",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Vote picked
-  {"kc49",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc4a",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Voting beep
-  {"kc4b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc4c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc4d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc4e",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc4f",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc50",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc51",   false,  64, 64, -1, NULL, 0,        -1,  -1, LUMPERROR}, // NO CONTEST debris ambience
-  {"kc52",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc53",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc54",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc55",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc56",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc57",   false, 128,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // SPB locked in
-  {"kc58",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc59",   false, 128,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Shrink
-  {"kc5a",   false, 128,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Grow
-  {"kc5b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc5c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc5d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc5e",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc5f",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc60",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc61",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc62",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc63",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc64",   false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // SPB ambient
-  {"kc65",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc66",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc67",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc68",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc69",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc6b",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc6c",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc6d",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"kc6e",   false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  // Knuckles Chaotix sound
+  {"kc2a",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc2b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc2c",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc2d",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc2e",   false,  96,  0, NULL, 0,        -1, LUMPERROR}, // Item box gotten
+  {"kc2f",   false,  96,  8, NULL, 0,        -1, LUMPERROR}, // Spring pad
+  {"kc30",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc31",   false,  64, 64, NULL, 0,        -1, LUMPERROR}, // NO CONTEST explosion
+  {"kc32",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc33",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc34",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc35",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc36",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc37",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc38",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc39",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Voting roulette
+  {"kc3a",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc3b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc3c",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc3d",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc3e",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc3f",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc40",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc41",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc42",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Unlock everything cheat
+  {"kc43",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc44",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc45",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc46",   false,  96,  8, NULL, 0,        -1, LUMPERROR}, // Shrink use
+  {"kc47",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc48",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Vote picked
+  {"kc49",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc4a",   false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Voting beep
+  {"kc4b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc4c",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc4d",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc4e",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc4f",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc50",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc51",   false,  64, 64, NULL, 0,        -1, LUMPERROR}, // NO CONTEST debris ambience
+  {"kc52",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc53",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc54",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc55",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc56",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc57",   false, 128,  8, NULL, 0,        -1, LUMPERROR}, // SPB locked in
+  {"kc58",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc59",   false, 128,  8, NULL, 0,        -1, LUMPERROR}, // Shrink
+  {"kc5a",   false, 128,  8, NULL, 0,        -1, LUMPERROR}, // Grow
+  {"kc5b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc5c",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc5d",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc5e",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc5f",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc60",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc61",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc62",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc63",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc64",   false,  96,  0, NULL, 0,        -1, LUMPERROR}, // SPB ambient
+  {"kc65",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc66",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc67",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc68",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc69",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc6b",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc6c",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc6d",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
+  {"kc6e",   false,  64,  0, NULL, 0,        -1, LUMPERROR},
 
   // SRB2kart
-  {"slip",   false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Spinout
-  {"screec", false,  48,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Tight turning screech
-  {"drift",  false,  48,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Drifting ambient
-  {"ruburn", false,  48,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Rubber-burn turn ambient
-  {"ddash",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Respawn Drop Dash
-  {"tossed", false, 192,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Item fired
-  {"itpick", false, 128,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Pick up HUD drop
-  {"peel",   false,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Edited S25A for banana landing
-  {"hogbom", false,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Ballhog explosions
-  {"zio3",   false, 128,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Thunder Shield use
-  {"kpogos", false,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Pogo Spring use
-  {"alarmi", false, 255,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Invincibility alarm
-  {"alarmg", false, 255,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Grow alarm
-  {"kinvnc", false, 255,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Invincibility music
-  {"kgrow",  false, 255,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Grow music
-  {"itrol1",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Roulette spinning
-  {"itrol2",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"itrol3",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"itrol4",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"itrol5",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"itrol6",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"itrol7",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"itrol8",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"itrolf",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Roulette end
-  {"itrolm",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Roulette end (mashed)
-  {"itrolk",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Roulette end (karma enhanced)
-  {"itrole",  true,  96,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Roulette end (Eggman)
-  {"vroom",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Kart Krew opening vroom
-  {"chaooo", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Chao audience cheer
-  {"yeeeah", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Voting picks you
-  {"noooo1", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Voting picks hell (by chance)
-  {"noooo2", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Voting picks hell (on purpose)
-  {"ruby1",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Phantom Ruby charge up
-  {"ruby2",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Phantom Ruby teleport
-  {"tcart",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Twinkle Cart
-  {"bfare",  false, 128,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Pleasure Castle fanfare
-  {"merry",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Pleasure Castle merry-go-round ambient
-  {"bowlh",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Pleasure Castle pins
-  {"tppop",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Pleasure Castle bombs
-  {"hsdoor", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Red Barrage Area door
-  {"hstrn",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Red Barrage Area train
-  {"aspkb",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Red Barrage Area spikeballs
-  {"wind1",  false,  64,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Midnight Channel monsters
-  {"fire2",  false,  64,  8, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"chain",  false, 255,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Mementos Reaper
-  {"mkuma",  false,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Trigger Happy Havoc Monokuma
-  {"toada",  false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Arid Sands Toad scream
-  {"gemhit", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Opulence gem/coin tumbling
-  {"wrink", false,  64,  0, -1, NULL, 0,         -1,  -1, LUMPERROR}, // Some sort of ghoulie?
-  {"bsnipe", false,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Banana sniping
-  {"join",    true,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Player joined server
-  {"leave",   true,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Player left server
-  {"requst",  true,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Got a Discord join request
-  {"syfail",  true,  96,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Funny sync failure
-  {"itfree", false,  64,  0, -1, NULL, 0,        -1,  -1, LUMPERROR}, // :shitsfree:
-  {"dbgsal", false, 255,  8, -1, NULL, 0,        -1,  -1, LUMPERROR}, // Debug notification
+  {"slip",   false,  96,  0, NULL, 0,        -1, LUMPERROR}, // Spinout
+  {"screec", false,  48,  0, NULL, 0,        -1, LUMPERROR}, // Tight turning screech
+  {"drift",  false,  48,  0, NULL, 0,        -1, LUMPERROR}, // Drifting ambient
+  {"ruburn", false,  48,  0, NULL, 0,        -1, LUMPERROR}, // Rubber-burn turn ambient
+  {"ddash",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Respawn Drop Dash
+  {"tossed", false, 192,  8, NULL, 0,        -1, LUMPERROR}, // Item fired
+  {"itpick", false, 128,  8, NULL, 0,        -1, LUMPERROR}, // Pick up HUD drop
+  {"peel",   false,  96,  0, NULL, 0,        -1, LUMPERROR}, // Edited S25A for banana landing
+  {"hogbom", false,  96,  8, NULL, 0,        -1, LUMPERROR}, // Ballhog explosions
+  {"zio3",   false, 128,  8, NULL, 0,        -1, LUMPERROR}, // Thunder Shield use
+  {"kpogos", false,  96,  8, NULL, 0,        -1, LUMPERROR}, // Pogo Spring use
+  {"alarmi", false, 255,  8, NULL, 0,        -1, LUMPERROR}, // Invincibility alarm
+  {"alarmg", false, 255,  8, NULL, 0,        -1, LUMPERROR}, // Grow alarm
+  {"kinvnc", false, 255,  8, NULL, 0,        -1, LUMPERROR}, // Invincibility music
+  {"kgrow",  false, 255,  8, NULL, 0,        -1, LUMPERROR}, // Grow music
+  {"itrol1",  true,  96,  0, NULL, 0,        -1, LUMPERROR}, // Roulette spinning
+  {"itrol2",  true,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"itrol3",  true,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"itrol4",  true,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"itrol5",  true,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"itrol6",  true,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"itrol7",  true,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"itrol8",  true,  96,  0, NULL, 0,        -1, LUMPERROR},
+  {"itrolf",  true,  96,  0, NULL, 0,        -1, LUMPERROR}, // Roulette end
+  {"itrolm",  true,  96,  0, NULL, 0,        -1, LUMPERROR}, // Roulette end (mashed)
+  {"itrolk",  true,  96,  0, NULL, 0,        -1, LUMPERROR}, // Roulette end (karma enhanced)
+  {"itrole",  true,  96,  0, NULL, 0,        -1, LUMPERROR}, // Roulette end (Eggman)
+  {"vroom",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Kart Krew opening vroom
+  {"chaooo", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Chao audience cheer
+  {"yeeeah", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Voting picks you
+  {"noooo1", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Voting picks hell (by chance)
+  {"noooo2", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Voting picks hell (on purpose)
+  {"ruby1",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Phantom Ruby charge up
+  {"ruby2",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Phantom Ruby teleport
+  {"tcart",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Twinkle Cart
+  {"bfare",  false, 128,  0, NULL, 0,        -1, LUMPERROR}, // Pleasure Castle fanfare
+  {"merry",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Pleasure Castle merry-go-round ambient
+  {"bowlh",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Pleasure Castle pins
+  {"tppop",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Pleasure Castle bombs
+  {"hsdoor", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Red Barrage Area door
+  {"hstrn",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Red Barrage Area train
+  {"aspkb",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Red Barrage Area spikeballs
+  {"wind1",  false,  64,  8, NULL, 0,        -1, LUMPERROR}, // Midnight Channel monsters
+  {"fire2",  false,  64,  8, NULL, 0,        -1, LUMPERROR},
+  {"chain",  false, 255,  8, NULL, 0,        -1, LUMPERROR}, // Mementos Reaper
+  {"mkuma",  false,  96,  8, NULL, 0,        -1, LUMPERROR}, // Trigger Happy Havoc Monokuma
+  {"toada",  false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Arid Sands Toad scream
+  {"gemhit", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // Opulence gem/coin tumbling
+  {"wrink",  false,  64,  0, NULL, 0,         -1, LUMPERROR}, // Some sort of ghoulie?
+  {"bsnipe", false,  96,  8, NULL, 0,        -1, LUMPERROR}, // Banana sniping
+  {"join",    true,  96,  8, NULL, 0,        -1, LUMPERROR}, // Player joined server
+  {"leave",   true,  96,  8, NULL, 0,        -1, LUMPERROR}, // Player left server
+  {"requst",  true,  96,  8, NULL, 0,        -1, LUMPERROR}, // Got a Discord join request
+  {"syfail",  true,  96,  8, NULL, 0,        -1, LUMPERROR}, // Funny sync failure
+  {"itfree", false,  64,  0, NULL, 0,        -1, LUMPERROR}, // :shitsfree:
+  {"dbgsal", false, 255,  8, NULL, 0,        -1, LUMPERROR}, // Debug notification
 
   // SRB2Kart - Engine sounds
   // Engine class A
-  {"krta00", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta01", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta02", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta03", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta04", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta05", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta06", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta07", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta08", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta09", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta10", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta11", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krta12", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"krta00", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta01", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta02", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta03", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta04", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta05", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta06", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta07", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta08", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta09", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta10", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta11", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krta12", false,  48, 65, NULL, 0,        -1, LUMPERROR},
   // Engine class B
-  {"krtb00", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb01", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb02", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb03", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb04", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb05", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb06", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb07", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb08", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb09", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb10", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb11", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtb12", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"krtb00", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb01", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb02", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb03", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb04", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb05", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb06", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb07", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb08", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb09", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb10", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb11", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtb12", false,  48, 65, NULL, 0,        -1, LUMPERROR},
   // Engine class C
-  {"krtc00", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc01", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc02", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc03", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc04", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc05", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc06", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc07", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc08", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc09", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc10", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc11", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtc12", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"krtc00", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc01", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc02", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc03", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc04", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc05", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc06", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc07", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc08", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc09", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc10", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc11", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtc12", false,  48, 65, NULL, 0,        -1, LUMPERROR},
   // Engine class D
-  {"krtd00", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd01", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd02", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd03", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd04", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd05", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd06", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd07", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd08", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd09", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd10", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd11", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtd12", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"krtd00", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd01", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd02", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd03", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd04", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd05", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd06", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd07", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd08", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd09", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd10", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd11", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtd12", false,  48, 65, NULL, 0,        -1, LUMPERROR},
   // Engine class E
-  {"krte00", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte01", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte02", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte03", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte04", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte05", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte06", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte07", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte08", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte09", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte10", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte11", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krte12", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"krte00", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte01", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte02", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte03", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte04", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte05", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte06", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte07", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte08", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte09", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte10", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte11", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krte12", false,  48, 65, NULL, 0,        -1, LUMPERROR},
   // Engine class F
-  {"krtf00", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf01", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf02", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf03", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf04", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf05", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf06", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf07", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf08", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf09", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf10", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf11", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtf12", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"krtf00", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf01", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf02", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf03", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf04", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf05", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf06", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf07", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf08", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf09", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf10", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf11", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtf12", false,  48, 65, NULL, 0,        -1, LUMPERROR},
   // Engine class G
-  {"krtg00", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg01", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg02", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg03", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg04", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg05", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg06", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg07", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg08", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg09", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg10", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg11", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krtg12", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"krtg00", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg01", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg02", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg03", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg04", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg05", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg06", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg07", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg08", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg09", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg10", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg11", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krtg12", false,  48, 65, NULL, 0,        -1, LUMPERROR},
   // Engine class H
-  {"krth00", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth01", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth02", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth03", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth04", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth05", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth06", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth07", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth08", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth09", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth10", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth11", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krth12", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"krth00", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth01", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth02", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth03", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth04", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth05", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth06", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth07", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth08", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth09", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth10", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth11", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krth12", false,  48, 65, NULL, 0,        -1, LUMPERROR},
   // Engine class I
-  {"krti00", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti01", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti02", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti03", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti04", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti05", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti06", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti07", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti08", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti09", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti10", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti11", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
-  {"krti12", false,  48, 65, -1, NULL, 0,        -1,  -1, LUMPERROR},
+  {"krti00", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti01", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti02", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti03", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti04", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti05", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti06", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti07", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti08", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti09", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti10", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti11", false,  48, 65, NULL, 0,        -1, LUMPERROR},
+  {"krti12", false,  48, 65, NULL, 0,        -1, LUMPERROR},
 
   // SRB2kart - Skin sounds
-  {"kwin",   false,  64, 96, -1, NULL, 0,   SKSKWIN,  -1, LUMPERROR},
-  {"klose",  false,  64, 96, -1, NULL, 0,  SKSKLOSE,  -1, LUMPERROR},
-  {"khurt1", false,  64, 96, -1, NULL, 0,  SKSKPAN1,  -1, LUMPERROR},
-  {"khurt2", false,  64, 96, -1, NULL, 0,  SKSKPAN2,  -1, LUMPERROR},
-  {"kattk1", false,  64, 96, -1, NULL, 0,  SKSKATK1,  -1, LUMPERROR},
-  {"kattk2", false,  64, 96, -1, NULL, 0,  SKSKATK2,  -1, LUMPERROR},
-  {"kbost1", false,  64, 96, -1, NULL, 0,  SKSKBST1,  -1, LUMPERROR},
-  {"kbost2", false,  64, 96, -1, NULL, 0,  SKSKBST2,  -1, LUMPERROR},
-  {"kslow",  false,  64, 32, -1, NULL, 0,  SKSKSLOW,  -1, LUMPERROR},
-  {"khitem", false, 128, 32, -1, NULL, 0,  SKSKHITM,  -1, LUMPERROR},
-  {"kgloat", false,  64, 48, -1, NULL, 0,  SKSKPOWR,  -1, LUMPERROR},
+  {"kwin",   false,  64, 96, NULL, 0,   SKSKWIN, LUMPERROR},
+  {"klose",  false,  64, 96, NULL, 0,  SKSKLOSE, LUMPERROR},
+  {"khurt1", false,  64, 96, NULL, 0,  SKSKPAN1, LUMPERROR},
+  {"khurt2", false,  64, 96, NULL, 0,  SKSKPAN2, LUMPERROR},
+  {"kattk1", false,  64, 96, NULL, 0,  SKSKATK1, LUMPERROR},
+  {"kattk2", false,  64, 96, NULL, 0,  SKSKATK2, LUMPERROR},
+  {"kbost1", false,  64, 96, NULL, 0,  SKSKBST1, LUMPERROR},
+  {"kbost2", false,  64, 96, NULL, 0,  SKSKBST2, LUMPERROR},
+  {"kslow",  false,  64, 32, NULL, 0,  SKSKSLOW, LUMPERROR},
+  {"khitem", false, 128, 32, NULL, 0,  SKSKHITM, LUMPERROR},
+  {"kgloat", false,  64, 48, NULL, 0,  SKSKPOWR, LUMPERROR},
 
   // skin sounds free slots to add sounds at run time (Boris HACK!!!)
   // initialized to NULL
@@ -1000,11 +1000,9 @@ void S_InitRuntimeSounds (void)
 		S_sfx[i].singularity = false;
 		S_sfx[i].priority = 0;
 		S_sfx[i].pitch = 0;
-		S_sfx[i].volume = -1;
 		S_sfx[i].data = NULL;
-		S_sfx[i].length = 0;
+        S_sfx[i].length = 0;
 		S_sfx[i].skinsound = -1;
-		S_sfx[i].usefulness = -1;
 		S_sfx[i].lumpnum = LUMPERROR;
 	}
 }
@@ -1028,15 +1026,15 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean
 			S_sfx[i].singularity = singular;
 			S_sfx[i].priority = 60;
 			S_sfx[i].pitch = flags;
-			S_sfx[i].volume = -1;
 			S_sfx[i].lumpnum = LUMPERROR;
+            S_sfx[i].length = 0;
 			S_sfx[i].skinsound = -1;
-			S_sfx[i].usefulness = -1;
 
 			if (S_PrecacheSound())
 				S_sfx[i].data = I_GetSfx(&S_sfx[i]);
 			else
 				S_sfx[i].data = NULL;
+
 			return i;
 		}
 	}
diff --git a/src/sounds.h b/src/sounds.h
index 6621dc6bf..ea530da05 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -14,6 +14,8 @@
 #ifndef __SOUNDS__
 #define __SOUNDS__
 
+#include "doomdef.h"
+
 // Customisable sounds for Skins
 typedef enum
 {
@@ -76,9 +78,6 @@ struct sfxinfo_struct
 	// pitch if a link
 	INT32 pitch;
 
-	// volume if a link
-	INT32 volume;
-
 	// sound data
 	void *data;
 
@@ -89,11 +88,6 @@ struct sfxinfo_struct
 	// 0 up to (NUMSKINSOUNDS-1), -1 = not skin specifc
 	INT32 skinsound;
 
-	// this is checked every second to see if sound
-	// can be thrown out (if 0, then decrement, if -1,
-	// then throw out, if > 0, then it is in use)
-	INT32 usefulness;
-
 	// lump number of sfx
 	lumpnum_t lumpnum;
 };
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 715ba53ae..574eead55 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -15,6 +15,8 @@
 
 #include "doomdef.h"
 #include "g_game.h"
+#include "g_input.h"
+#include "k_director.h"
 #include "r_local.h"
 #include "p_local.h"
 #include "f_finale.h"
@@ -28,7 +30,11 @@
 #include "m_menu.h"
 #include "m_cheat.h"
 #include "p_setup.h" // NiGHTS grading
+
+#include "i_time.h"
+
 #include "k_kart.h" // SRB2kart
+#include "k_hud.h"
 
 //random index
 #include "m_random.h"
@@ -48,6 +54,9 @@
 
 UINT16 objectsdrawn = 0;
 
+// dumb fade thing for director toggle
+tic_t directortoggletimer = 0;
+
 //
 // STATUS BAR DATA
 //
@@ -72,73 +81,6 @@ char *localfacemmapprefix_name[MAXLOCALSKINS]; // minimap*/
 //             status bar overlay
 // ------------------------------------------
 
-// icons for overlay
-patch_t *sboscore; // Score logo
-patch_t *sbotime; // Time logo
-patch_t *sbocolon; // Colon for time
-patch_t *sboperiod; // Period for time centiseconds
-patch_t *livesback; // Lives icon background
-static patch_t *nrec_timer; // Timer for NiGHTS records
-static patch_t *sborings;
-static patch_t *sboover;
-static patch_t *timeover;
-static patch_t *stlivex;
-static patch_t *rrings;
-static patch_t *getall; // Special Stage HUD
-static patch_t *timeup; // Special Stage HUD
-static patch_t *hunthoming[6];
-static patch_t *itemhoming[6];
-static patch_t *race1;
-static patch_t *race2;
-static patch_t *race3;
-static patch_t *racego;
-//static patch_t *ttlnum;
-static patch_t *nightslink;
-static patch_t *count5;
-static patch_t *count4;
-static patch_t *count3;
-static patch_t *count2;
-static patch_t *count1;
-static patch_t *count0;
-static patch_t *curweapon;
-static patch_t *normring;
-static patch_t *bouncering;
-static patch_t *infinityring;
-static patch_t *autoring;
-static patch_t *explosionring;
-static patch_t *scatterring;
-static patch_t *grenadering;
-static patch_t *railring;
-static patch_t *jumpshield;
-static patch_t *forceshield;
-static patch_t *ringshield;
-static patch_t *watershield;
-static patch_t *bombshield;
-static patch_t *pityshield;
-static patch_t *invincibility;
-static patch_t *sneakers;
-static patch_t *gravboots;
-static patch_t *nonicon;
-static patch_t *bluestat;
-static patch_t *byelstat;
-static patch_t *orngstat;
-static patch_t *redstat;
-static patch_t *yelstat;
-static patch_t *nbracket;
-static patch_t *nhud[12];
-static patch_t *nsshud;
-static patch_t *narrow[9];
-static patch_t *nredar[8]; // Red arrow
-static patch_t *drillbar;
-static patch_t *drillfill[3];
-static patch_t *capsulebar;
-static patch_t *capsulefill;
-patch_t *ngradeletters[7];
-static patch_t *minus5sec;
-static patch_t *minicaps;
-static patch_t *gotrflag;
-static patch_t *gotbflag;
-
 // Midnight Channel:
 static patch_t *hud_tv1;
 static patch_t *hud_tv2;
@@ -226,155 +168,71 @@ boolean ST_SameTeam(player_t *a, player_t *b)
 
 static boolean st_stopped = true;
 
-void ST_Ticker(void)
-{
-	if (st_stopped)
-		return;
-}
-
 // 0 is default, any others are special palettes.
 INT32 st_palette = 0;
 
-void ST_doPaletteStuff(void)
+void ST_ResetPaletteStuff(void)
 {
-	INT32 palette;
+	st_palette = 0;
+	V_SetPalette(0);
+}
 
-	if (stplyr && stplyr->flashcount)
-		palette = stplyr->flashpal;
-	else
-		palette = 0;
+static void ST_doPaletteStuff(void)
+{
+	INT32 palette = 0;
 
 #ifdef HWRENDER
 	if (rendermode == render_opengl && !HWR_PalRenderFlashpal())
-		palette = 0; // No flashpals here in OpenGL
+		return;
 #endif
 
-	palette = min(max(palette, 0), 13);
+	if (stplyr && stplyr->flashcount)
+		palette = CLAMP(stplyr->flashpal, 0, 13);
 
 	if (palette != st_palette)
 	{
 		st_palette = palette;
 
-#ifdef HWRENDER
-		if (rendermode == render_soft || (rendermode == render_opengl && HWR_PalRenderFlashpal()))
-#else
-		if (rendermode != render_none)
-#endif
+		if (!splitscreen)
 		{
-			//V_SetPaletteLump(GetPalette()); // Reset the palette -- is this needed?
-			if (!splitscreen)
-				V_SetPalette(palette);
+			V_SetPalette(palette);
 		}
 	}
 }
 
+void ST_Ticker(void)
+{
+	if (st_stopped)
+		return;
+
+	// Do red-/gold-shifts from damage/items
+	//25/08/99: Hurdler: palette changes is done for all players,
+	//                   not only player1! That's why this part
+	//                   of code is moved somewhere else.
+	ST_doPaletteStuff();
+}
+
 void ST_UnloadGraphics(void)
 {
-	Z_FreeTags(PU_HUDGFX, PU_HUDGFX);
+	Patch_FreeTag(PU_HUDGFX);
 }
 
 void ST_LoadGraphics(void)
 {
-	int i;
-
 	// SRB2 border patch
-	st_borderpatchnum = W_GetNumForName("GFZFLR01");
-	scr_borderpatch = W_CacheLumpNum(st_borderpatchnum, PU_HUDGFX);
+	//st_borderpatchnum = W_GetNumForName("GFZFLR01");
+	//scr_borderpatch = W_CacheLumpNum(st_borderpatchnum, PU_HUDGFX);
 
 	// the original Doom uses 'STF' as base name for all face graphics
 	// Graue 04-08-2004: face/name graphics are now indexed by skins
 	//                   but load them in R_AddSkins, that gets called
 	//                   first anyway
 	// cache the status bar overlay icons (fullscreen mode)
-	sborings = W_CachePatchName("SBORINGS", PU_HUDGFX);
-	sboscore = W_CachePatchName("SBOSCORE", PU_HUDGFX);
-	sboover = W_CachePatchName("SBOOVER", PU_HUDGFX);
-	timeover = W_CachePatchName("TIMEOVER", PU_HUDGFX);
-	stlivex = W_CachePatchName("STLIVEX", PU_HUDGFX);
-	livesback = W_CachePatchName("STLIVEBK", PU_HUDGFX);
-	rrings = W_CachePatchName("RRINGS", PU_HUDGFX);
-	sbotime = W_CachePatchName("SBOTIME", PU_HUDGFX); // Time logo
-	sbocolon = W_CachePatchName("SBOCOLON", PU_HUDGFX); // Colon for time
-	sboperiod = W_CachePatchName("SBOPERIO", PU_HUDGFX); // Period for time centiseconds
-	nrec_timer = W_CachePatchName("NGRTIMER", PU_HUDGFX); // Timer for NiGHTS
-	getall = W_CachePatchName("GETALL", PU_HUDGFX); // Special Stage HUD
-	timeup = W_CachePatchName("TIMEUP", PU_HUDGFX); // Special Stage HUD
-	race1 = W_CachePatchName("RACE1", PU_HUDGFX);
-	race2 = W_CachePatchName("RACE2", PU_HUDGFX);
-	race3 = W_CachePatchName("RACE3", PU_HUDGFX);
-	racego = W_CachePatchName("RACEGO", PU_HUDGFX);
-	nightslink = W_CachePatchName("NGHTLINK", PU_HUDGFX);
-	count5 = W_CachePatchName("DRWNF0", PU_HUDGFX);
-	count4 = W_CachePatchName("DRWNE0", PU_HUDGFX);
-	count3 = W_CachePatchName("DRWND0", PU_HUDGFX);
-	count2 = W_CachePatchName("DRWNC0", PU_HUDGFX);
-	count1 = W_CachePatchName("DRWNB0", PU_HUDGFX);
-	count0 = W_CachePatchName("DRWNA0", PU_HUDGFX);
 
-	for (i = 0; i < 6; ++i)
-	{
-		hunthoming[i] = W_CachePatchName(va("HOMING%d", i+1), PU_HUDGFX);
-		itemhoming[i] = W_CachePatchName(va("HOMITM%d", i+1), PU_HUDGFX);
-	}
-
-	curweapon = W_CachePatchName("CURWEAP", PU_HUDGFX);
-	normring = W_CachePatchName("RINGIND", PU_HUDGFX);
-	bouncering = W_CachePatchName("BNCEIND", PU_HUDGFX);
-	infinityring = W_CachePatchName("INFNIND", PU_HUDGFX);
-	autoring = W_CachePatchName("AUTOIND", PU_HUDGFX);
-	explosionring = W_CachePatchName("BOMBIND", PU_HUDGFX);
-	scatterring = W_CachePatchName("SCATIND", PU_HUDGFX);
-	grenadering = W_CachePatchName("GRENIND", PU_HUDGFX);
-	railring = W_CachePatchName("RAILIND", PU_HUDGFX);
-	jumpshield = W_CachePatchName("WHTVB0", PU_HUDGFX);
-	forceshield = W_CachePatchName("BLTVB0", PU_HUDGFX);
-	ringshield = W_CachePatchName("YLTVB0", PU_HUDGFX);
-	watershield = W_CachePatchName("ELTVB0", PU_HUDGFX);
-	bombshield = W_CachePatchName("BKTVB0", PU_HUDGFX);
-	pityshield = W_CachePatchName("GRTVB0", PU_HUDGFX);
-	invincibility = W_CachePatchName("PINVB0", PU_HUDGFX);
-	sneakers = W_CachePatchName("SHTVB0", PU_HUDGFX);
-	gravboots = W_CachePatchName("GBTVB0", PU_HUDGFX);
-
-	tagico = W_CachePatchName("TAGICO", PU_HUDGFX);
 	rflagico = W_CachePatchName("RFLAGICO", PU_HUDGFX);
 	bflagico = W_CachePatchName("BFLAGICO", PU_HUDGFX);
 	rmatcico = W_CachePatchName("RMATCICO", PU_HUDGFX);
 	bmatcico = W_CachePatchName("BMATCICO", PU_HUDGFX);
-	gotrflag = W_CachePatchName("GOTRFLAG", PU_HUDGFX);
-	gotbflag = W_CachePatchName("GOTBFLAG", PU_HUDGFX);
-	nonicon = W_CachePatchName("NONICON", PU_HUDGFX);
-
-	// NiGHTS HUD things
-	bluestat = W_CachePatchName("BLUESTAT", PU_HUDGFX);
-	byelstat = W_CachePatchName("BYELSTAT", PU_HUDGFX);
-	orngstat = W_CachePatchName("ORNGSTAT", PU_HUDGFX);
-	redstat = W_CachePatchName("REDSTAT", PU_HUDGFX);
-	yelstat = W_CachePatchName("YELSTAT", PU_HUDGFX);
-	nbracket = W_CachePatchName("NBRACKET", PU_HUDGFX);
-	for (i = 0; i < 12; ++i)
-		nhud[i] = W_CachePatchName(va("NHUD%d", i+1), PU_HUDGFX);
-	nsshud = W_CachePatchName("NSSHUD", PU_HUDGFX);
-	minicaps = W_CachePatchName("MINICAPS", PU_HUDGFX);
-
-	for (i = 0; i < 8; ++i)
-	{
-		narrow[i] = W_CachePatchName(va("NARROW%d", i+1), PU_HUDGFX);
-		nredar[i] = W_CachePatchName(va("NREDAR%d", i+1), PU_HUDGFX);
-	}
-
-	// non-animated version
-	narrow[8] = W_CachePatchName("NARROW9", PU_HUDGFX);
-
-	drillbar = W_CachePatchName("DRILLBAR", PU_HUDGFX);
-	for (i = 0; i < 3; ++i)
-		drillfill[i] = W_CachePatchName(va("DRILLFI%d", i+1), PU_HUDGFX);
-	capsulebar = W_CachePatchName("CAPSBAR", PU_HUDGFX);
-	capsulefill = W_CachePatchName("CAPSFILL", PU_HUDGFX);
-	minus5sec = W_CachePatchName("MINUS5", PU_HUDGFX);
-
-	for (i = 0; i < 7; ++i)
-		ngradeletters[i] = W_CachePatchName(va("GRADE%d", i), PU_HUDGFX);
 
 	K_LoadKartHUDGraphics();
 
@@ -394,7 +252,7 @@ void ST_LoadFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 skin
 	facerankprefix[skinnum] = W_CachePatchName(rankstr, PU_HUDGFX);
 	facewantprefix[skinnum] = W_CachePatchName(wantstr, PU_HUDGFX);
 	facemmapprefix[skinnum] = W_CachePatchName(mmapstr, PU_HUDGFX);
-	
+
 	/*facerankprefix_name[skinnum] = rankstr;
 	facewantprefix_name[skinnum] = wantstr;
 	facemmapprefix_name[skinnum] = mmapstr;*/
@@ -405,7 +263,7 @@ void ST_LoadLocalFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32
 	localfacerankprefix[skinnum] = W_CachePatchName(rankstr, PU_HUDGFX);
 	localfacewantprefix[skinnum] = W_CachePatchName(wantstr, PU_HUDGFX);
 	localfacemmapprefix[skinnum] = W_CachePatchName(mmapstr, PU_HUDGFX);
-	
+
 	/*localfacerankprefix_name[skinnum] = rankstr;
 	localfacewantprefix_name[skinnum] = wantstr;
 	localfacemmapprefix_name[skinnum] = mmapstr;*/
@@ -421,10 +279,9 @@ void ST_ReloadSkinFaceGraphics(void)
 
 	for (i = 0; i < numskins; i++)
 		ST_LoadFaceGraphics(skins[i].facerank, skins[i].facewant, skins[i].facemmap, i);
-	
-	for (i = 0; i < numlocalskins; i++) {
+
+	for (i = 0; i < numlocalskins; i++)
 		ST_LoadLocalFaceGraphics(localskins[i].facerank, localskins[i].facewant, localskins[i].facemmap, i);
-	}
 }
 
 static inline void ST_InitData(void)
@@ -452,11 +309,11 @@ static inline void ST_Stop(void)
 
 void ST_Start(void)
 {
-	if (!st_stopped)
-		ST_Stop();
-
+	ST_Stop();
 	ST_InitData();
-	st_stopped = false;
+
+	if (!dedicated)
+		st_stopped = false;
 }
 
 //
@@ -526,17 +383,7 @@ static void ST_drawDebugInfo(void)
 
 	if (cv_debug & DBG_DETAILED)
 	{
-		//V_DrawRightAlignedString(320, height - 104, V_MONOSPACE, va("SHIELD: %5x", stplyr->powers[pw_shield]));
 		V_DrawRightAlignedString(320, height - 96,  V_MONOSPACE, va("SCALE: %5d%%", (stplyr->mo->scale*100)/FRACUNIT));
-		//V_DrawRightAlignedString(320, height - 88,  V_MONOSPACE, va("DASH: %3d/%3d", stplyr->dashspeed>>FRACBITS, FixedMul(stplyr->maxdash,stplyr->mo->scale)>>FRACBITS));
-		//V_DrawRightAlignedString(320, height - 80,  V_MONOSPACE, va("AIR: %4d, %3d", stplyr->powers[pw_underwater], stplyr->powers[pw_spacetime]));
-
-		// Flags
-		//V_DrawRightAlignedString(304-64, height - 72, V_MONOSPACE, "Flags:");
-		//V_DrawString(304-60,             height - 72, (stplyr->jumping) ? V_GREENMAP : V_REDMAP, "JM");
-		//V_DrawString(304-40,             height - 72, (stplyr->pflags & PF_JUMPED) ? V_GREENMAP : V_REDMAP, "JD");
-		//V_DrawString(304-20,             height - 72, (stplyr->pflags & PF_SPINNING) ? V_GREENMAP : V_REDMAP, "SP");
-		//V_DrawString(304,                height - 72, (stplyr->pflags & PF_STARTDASH) ? V_GREENMAP : V_REDMAP, "ST");
 
 		V_DrawRightAlignedString(320, height - 64, V_MONOSPACE, va("CEILZ: %6d", stplyr->mo->ceilingz>>FRACBITS));
 		V_DrawRightAlignedString(320, height - 56, V_MONOSPACE, va("FLOORZ: %6d", stplyr->mo->floorz>>FRACBITS));
@@ -570,155 +417,30 @@ static void ST_drawDebugInfo(void)
 		V_DrawRightAlignedString(320, height,     V_MONOSPACE, va("Heap used: %7sKB", sizeu1(Z_TagsUsage(0, INT32_MAX)>>10)));
 }
 
-/*
-static void ST_drawScore(void)
-{
-	// SCORE:
-	ST_DrawPatchFromHud(HUD_SCORE, sboscore);
-	if (objectplacing)
-	{
-		if (op_displayflags > UINT16_MAX)
-			ST_DrawOverlayPatch(SCX(hudinfo[HUD_SCORENUM].x-tallminus->width), SCY(hudinfo[HUD_SCORENUM].y), tallminus);
-		else
-			ST_DrawNumFromHud(HUD_SCORENUM, op_displayflags);
-	}
-	else
-		ST_DrawNumFromHud(HUD_SCORENUM, stplyr->score);
-}
-*/
-
-/*
-static void ST_drawTime(void)
-{
-	INT32 seconds, minutes, tictrn, tics;
-
-	// TIME:
-	ST_DrawPatchFromHudWS(HUD_TIME, sbotime);
-
-	if (objectplacing)
-	{
-		tics    = objectsdrawn;
-		seconds = objectsdrawn%100;
-		minutes = objectsdrawn/100;
-		tictrn  = 0;
-	}
-	else
-	{
-		tics = stplyr->realtime;
-		seconds = G_TicsToSeconds(tics);
-		minutes = G_TicsToMinutes(tics, true);
-		tictrn  = G_TicsToCentiseconds(tics);
-	}
-
-	if (cv_timetic.value == 1) // Tics only -- how simple is this?
-		ST_DrawNumFromHudWS(HUD_SECONDS, tics);
-	else
-	{
-		ST_DrawNumFromHudWS(HUD_MINUTES, minutes); // Minutes
-		ST_DrawPatchFromHudWS(HUD_TIMECOLON, sbocolon); // Colon
-		ST_DrawPadNumFromHudWS(HUD_SECONDS, seconds, 2); // Seconds
-
-		if (!splitscreen && (cv_timetic.value == 2 || modeattacking)) // there's not enough room for tics in splitscreen, don't even bother trying!
-		{
-			ST_DrawPatchFromHud(HUD_TIMETICCOLON, sboperiod); // Period
-			ST_DrawPadNumFromHud(HUD_TICS, tictrn, 2); // Tics
-		}
-	}
-}
-*/
-
-/*
-static inline void ST_drawRings(void) // SRB2kart - unused.
-{
-	INT32 ringnum = max(stplyr->health-1, 0);
-
-	ST_DrawPatchFromHudWS(HUD_RINGS, ((stplyr->health <= 1 && leveltime/5 & 1) ? rrings : sborings));
-
-	if (objectplacing)
-		ringnum = op_currentdoomednum;
-	else if (!useNightsSS && G_IsSpecialStage(gamemap))
-	{
-		INT32 i;
-		ringnum = 0;
-		for (i = 0; i < MAXPLAYERS; i++)
-			if (playeringame[i] && players[i].mo && players[i].mo->health > 1)
-				ringnum += players[i].mo->health - 1;
-	}
-
-	ST_DrawNumFromHudWS(HUD_RINGSNUM, ringnum);
-}
-*/
-
-/*
-static void ST_drawLives(void) // SRB2kart - unused.
-{
-	const INT32 v_splitflag = (splitscreen && stplyr == &players[displayplayers[0]] ? V_SPLITSCREEN : 0);
-
-	if (!stplyr->skincolor)
-		return; // Just joined a server, skin isn't loaded yet!
-
-	// face background
-	V_DrawSmallScaledPatch(hudinfo[HUD_LIVESPIC].x, hudinfo[HUD_LIVESPIC].y + (v_splitflag ? -12 : 0),
-		V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_HUDTRANS|v_splitflag, livesback);
-
-	// face
-	if (stplyr->mo && stplyr->mo->color)
-	{
-		// skincolor face/super
-		UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, stplyr->mo->color, GTC_CACHE);
-		patch_t *face = facerankprefix[stplyr->skin];
-		if (stplyr->powers[pw_super] || stplyr->pflags & PF_NIGHTSMODE)
-			face = facewantprefix[stplyr->skin];
-		V_DrawSmallMappedPatch(hudinfo[HUD_LIVESPIC].x, hudinfo[HUD_LIVESPIC].y + (v_splitflag ? -12 : 0),
-			V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_HUDTRANS|v_splitflag,face, colormap);
-	}
-	else if (stplyr->skincolor)
-	{
-		// skincolor face
-		UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, stplyr->skincolor, GTC_CACHE);
-		V_DrawSmallMappedPatch(hudinfo[HUD_LIVESPIC].x, hudinfo[HUD_LIVESPIC].y + (v_splitflag ? -12 : 0),
-			V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_HUDTRANS|v_splitflag,facerankprefix[stplyr->skin], colormap);
-	}
-
-	// name
-	if (strlen(skins[stplyr->skin].hudname) > 8)
-		V_DrawThinString(hudinfo[HUD_LIVESNAME].x, hudinfo[HUD_LIVESNAME].y + (v_splitflag ? -12 : 0),
-			V_HUDTRANS|V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_MONOSPACE|V_YELLOWMAP|v_splitflag, skins[stplyr->skin].hudname);
-	else
-		V_DrawString(hudinfo[HUD_LIVESNAME].x, hudinfo[HUD_LIVESNAME].y + (v_splitflag ? -12 : 0),
-			V_HUDTRANS|V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_MONOSPACE|V_YELLOWMAP|v_splitflag, skins[stplyr->skin].hudname);
-	// x
-	V_DrawScaledPatch(hudinfo[HUD_LIVESX].x, hudinfo[HUD_LIVESX].y + (v_splitflag ? -4 : 0),
-		V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_HUDTRANS|v_splitflag, stlivex);
-	// lives
-	V_DrawRightAlignedString(hudinfo[HUD_LIVESNUM].x, hudinfo[HUD_LIVESNUM].y + (v_splitflag ? -4 : 0),
-		V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_HUDTRANS|v_splitflag, va("%d",stplyr->lives));
-}
-*/
-
 static void ST_drawLevelTitle(void)
 {
-	char *lvlttl = mapheaderinfo[gamemap-1]->lvlttl;
-	char *subttl = mapheaderinfo[gamemap-1]->subttl;
-	char *zonttl = mapheaderinfo[gamemap-1]->zonttl; // SRB2kart
-	char *actnum = mapheaderinfo[gamemap-1]->actnum;
-	INT32 lvlttlxpos;
-	INT32 ttlnumxpos;
-	INT32 zonexpos;
-	INT32 dupcalc = (vid.width/vid.dupx);
-	UINT8 gtc = G_GetGametypeColor(gametype);
+	char *lvlttl, *subttl, *zonttl, *actnum;
+	INT32 lvlttlxpos, ttlnumxpos, zonexpos;
+	INT32 dupcalc;
+	UINT8 gtc;
 	INT32 sub = 0;
-	INT32 bary = (splitscreen)
-		? BASEVIDHEIGHT/2
-		: 163;
+	INT32 bary;
 	INT32 lvlw;
-	
-	if (!cv_stagetitle.value)
+
+	if (!cv_stagetitle.value || (timeinmap > 113))
 		return;
 
-	if (timeinmap > 113)
+	if (*mapheaderinfo[gamemap-1]->lvlttl == '\0')
 		return;
 
+	lvlttl = mapheaderinfo[gamemap-1]->lvlttl;
+	subttl = mapheaderinfo[gamemap-1]->subttl;
+	zonttl = mapheaderinfo[gamemap-1]->zonttl; // SRB2kart
+	actnum = mapheaderinfo[gamemap-1]->actnum;
+	dupcalc = (vid.width/vid.dupx);
+	gtc = G_GetGametypeColor(gametype);
+	bary = (splitscreen) ? BASEVIDHEIGHT/2 : 163;
+
 	lvlw = V_LevelNameWidth(lvlttl);
 
 	if (actnum[0])
@@ -780,6 +502,25 @@ static void ST_drawLevelTitle(void)
 		V_DrawLevelTitle(ttlnumxpos+12, bary+6, V_SNAPTOBOTTOM, actnum);
 }
 
+// returns the actual button name for any gamecontrol
+// if unbound is set, it returns "Unbound" as a string should there be no button bound to a gamecontrol
+// if gamectrl is set, it adds an extra "-" for cases where theres also a hardcoded button like accelerate
+static const char *ST_GetButtonName(INT32 control, const char *inputtext, boolean unbound, boolean gamectrl)
+{
+	static char buttname[32] = "";
+	const char *butt1 = (gamecontrol[0][control][0] != 0 ? G_KeynumToString(gamecontrol[0][control][0]) : NULL);
+	const char *butt2 = (gamecontrol[0][control][1] != 0 ? G_KeynumToString(gamecontrol[0][control][1]) : NULL); // alternative bind
+
+	if (butt1 == NULL && butt2 == NULL) // not bound to a button
+		snprintf(buttname, 32, (unbound ? "%s - %s" : (gamectrl ? "-%s - %s" : "%s - %s")), (unbound ? "Unbound" : ""), inputtext);
+	else if (butt1 != NULL && butt2 != NULL) // bound to two buttons
+		snprintf(buttname, 32, "%s/%s - %s", butt1, butt2, inputtext);
+	else // bound to only one
+		snprintf(buttname, 32, (gamectrl ? "-%s - %s" : "%s - %s"), (butt1 != NULL ? butt1 : butt2 != NULL ? butt2 : ""), inputtext);
+
+	return buttname;
+}
+
 // Draw the status bar overlay, customisable: the user chooses which
 // kind of information to overlay
 //
@@ -793,8 +534,28 @@ static void ST_overlayDrawer(void)
 
 	if (!hu_showscores) // hide the following if TAB is held
 	{
-		// Countdown timer for Race Mode
-		// ...moved to k_kart.c so we can take advantage of the LAPS_Y value
+		// TODO: splitscreen support!
+		if (cv_showdirectorhud.value && !splitscreen && !P_IsLocalPlayer(stplyr) && K_DirectorIsAvailable())
+		{
+			char directortext[20] = {0};
+
+			snprintf(directortext, 20, "Director: %s", cv_director.value ? "On" : "Off");
+
+			if ((!demo.playback && directortoggletimer < 13*TICRATE) || (demo.playback && directortoggletimer < 4*TICRATE))
+			{
+				if (renderisnewtic)
+					directortoggletimer++;
+
+				if (directortoggletimer < 4*TICRATE)
+					V_DrawString(1, BASEVIDHEIGHT-8-1, V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_HUDTRANSHALF|V_ALLOWLOWERCASE, directortext);
+				else if (cv_translucenthud.value != 0)
+					V_DrawString(1, BASEVIDHEIGHT-8-1, V_SNAPTOLEFT|V_SNAPTOBOTTOM|V_80TRANS|V_ALLOWLOWERCASE, directortext); // idk if V_80TRANS is good?
+			}
+		}
+		else
+		{
+			directortoggletimer = 0;
+		}
 
 		if (demo.playback || !P_IsLocalPlayer(stplyr))
 		{
@@ -820,7 +581,7 @@ static void ST_overlayDrawer(void)
 					V_DrawCenteredString((BASEVIDWIDTH/2), BASEVIDHEIGHT-32, V_SNAPTOBOTTOM|V_HUDTRANS|V_ALLOWLOWERCASE, player_names[stplyr-players]);
 				}
 			}
-			else if (!demo.title)
+			else if (!demo.title && !camera[stplyrnum].freecam)
 			{
 				if (!splitscreen)
 				{
@@ -831,7 +592,7 @@ static void ST_overlayDrawer(void)
 				{
 					char name[MAXPLAYERNAME+12];
 
-					INT32 y = (stplyr == &players[displayplayers[0]]) ? 4 : BASEVIDHEIGHT/2-12;
+					INT32 y = (stplyrnum == 0) ? 4 : BASEVIDHEIGHT/2-12;
 					sprintf(name, "VIEWPOINT: %s", player_names[stplyr-players]);
 					V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_ALLOWLOWERCASE|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT), name);
 				}
@@ -841,27 +602,18 @@ static void ST_overlayDrawer(void)
 				}
 			}
 		}
-
-		// This is where we draw all the fun cheese if you have the chasecam off!
-		/*if ((stplyr == &players[displayplayers[0]] && !camera[0].chase)
-			|| ((splitscreen && stplyr == &players[displayplayers[1]]) && !camera[1].chase)
-			|| ((splitscreen > 1 && stplyr == &players[displayplayers[2]]) && !camera[2].chase)
-			|| ((splitscreen > 2 && stplyr == &players[displayplayers[3]]) && !camera[3].chase))
-		{
-			ST_drawFirstPersonHUD();
-		}*/
 	}
 
-	if (!(netgame || multiplayer) || !hu_showscores)
+	if ((!(netgame || multiplayer) || !hu_showscores) && !forceshowhud)
 	{
 		if (renderisnewtic)
 		{
-			LUAh_GameHUD(luahuddrawlist_game[stplyrnum]);
+			LUA_HUDHOOK(game, luahuddrawlist_game[stplyrnum]);
 		}
 	}
 
 	// draw level title Tails
-	if (*mapheaderinfo[gamemap-1]->lvlttl != '\0' && !(hu_showscores && (netgame || multiplayer) && !mapreset) && LUA_HudEnabled(hud_stagetitle))
+	if (!(hu_showscores && (netgame || multiplayer) && !mapreset) && LUA_HudEnabled(hud_stagetitle) && !forceshowhud)
 		ST_drawLevelTitle();
 
 	if (!hu_showscores && netgame && !mapreset)
@@ -898,10 +650,21 @@ static void ST_overlayDrawer(void)
 			}
 			else
 			{
-				V_DrawString(2, BASEVIDHEIGHT-40, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF|V_YELLOWMAP, M_GetText("- SPECTATING -"));
-				V_DrawString(2, BASEVIDHEIGHT-30, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, itemtxt);
-				V_DrawString(2, BASEVIDHEIGHT-20, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, M_GetText("Accelerate - Float"));
-				V_DrawString(2, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, M_GetText("Brake - Sink"));
+				if (cv_showdirectorhud.value)
+				{
+					V_DrawString(2, BASEVIDHEIGHT-50, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF|V_YELLOWMAP, M_GetText("- SPECTATING -"));
+					V_DrawString(2, BASEVIDHEIGHT-40, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, itemtxt);
+					V_DrawString(2, BASEVIDHEIGHT-30, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, va("Accelerate %s", ST_GetButtonName(gc_camfloat, "Float", false, true)));
+					V_DrawString(2, BASEVIDHEIGHT-20, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, va("Brake %s", ST_GetButtonName(gc_camsink, "Sink", false, true)));
+					V_DrawString(2, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, ST_GetButtonName(gc_director, "Toggle Director", true, false));
+				}
+				else
+				{
+					V_DrawString(2, BASEVIDHEIGHT-40, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF|V_YELLOWMAP, M_GetText("- SPECTATING -"));
+					V_DrawString(2, BASEVIDHEIGHT-30, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, itemtxt);
+					V_DrawString(2, BASEVIDHEIGHT-20, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, va("Accelerate %s", ST_GetButtonName(gc_camfloat, "Float", false, true)));
+					V_DrawString(2, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANSHALF, va("Brake %s", ST_GetButtonName(gc_camsink, "Sink", false, true)));
+				}
 			}
 		}
 	}
@@ -935,23 +698,11 @@ static void ST_overlayDrawer(void)
 
 void ST_DrawDemoTitleEntry(void)
 {
-	static UINT8 skullAnimCounter = 0;
-	char *nametodraw;
-
-	skullAnimCounter++;
-	skullAnimCounter %= 8;
-
-	nametodraw = demo.titlename;
-	while (V_StringWidth(nametodraw, 0) > MAXSTRINGLENGTH*8 - 8)
-		nametodraw++;
-
 #define x (BASEVIDWIDTH/2 - 139)
 #define y (BASEVIDHEIGHT/2)
 	M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1);
-	V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, nametodraw);
-	if (skullAnimCounter < 4)
-		V_DrawCharacter(x + 8 + V_StringWidth(nametodraw, 0), y + 12,
-			'_' | 0x80, false);
+
+	M_DrawTextInputScroll(x + 8, y + 12, &demo.titlenameinput, 0, (MAXSTRINGLENGTH-1)*8);
 
 	M_DrawTextBox(x + 30, y - 24, 26, 1);
 	V_DrawString(x + 38, y - 16, V_ALLOWLOWERCASE, "Enter the name of the replay.");
@@ -999,7 +750,7 @@ void ST_Drawer(void)
 	UINT8 i;
 
 #ifdef SEENAMES
-	if (cv_seenames.value && cv_allowseenames.value && displayplayers[0] == consoleplayer && seenplayer && seenplayer->mo && !mapreset)
+	if (UNLIKELY(cv_seenames.value && cv_allowseenames.value && displayplayers[0] == consoleplayer && seenplayer && seenplayer->mo && !mapreset))
 	{
 		if (cv_seenames.value == 1)
 			V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2 + 15, V_HUDTRANSHALF, player_names[seenplayer-players]);
@@ -1013,23 +764,10 @@ void ST_Drawer(void)
 	}
 #endif
 
-	// Doom's status bar only updated if necessary.
-	// However, ours updates every frame regardless, so the "refresh" param was removed
-	//(void)refresh;
-
 	// force a set of the palette by using doPaletteStuff()
 	if (vid.recalc)
 		st_palette = -1;
 
-	// Do red-/gold-shifts from damage/items
-#ifdef HWRENDER
-	//25/08/99: Hurdler: palette changes is done for all players,
-	//                   not only player1! That's why this part
-	//                   of code is moved somewhere else.
-	if (rendermode == render_soft || (rendermode == render_opengl && HWR_PalRenderFlashpal()))
-#endif
-	if (rendermode != render_none) ST_doPaletteStuff();
-
 	if (st_overlay)
 	{
 		if (renderisnewtic)
diff --git a/src/st_stuff.h b/src/st_stuff.h
index 250db1e7f..5ffb3334f 100644
--- a/src/st_stuff.h
+++ b/src/st_stuff.h
@@ -14,6 +14,10 @@
 #ifndef __STSTUFF_H__
 #define __STSTUFF_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomtype.h"
 #include "d_event.h"
 #include "d_player.h"
@@ -23,9 +27,13 @@
 // STATUS BAR
 //
 
+extern tic_t directortoggletimer;
+
 // Called by main loop.
 void ST_Ticker(void);
 
+void ST_ResetPaletteStuff(void);
+
 // Called when naming a replay.
 void ST_DrawDemoTitleEntry(void);
 
@@ -54,8 +62,6 @@ void ST_LoadFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 play
 void ST_LoadLocalFaceGraphics(char *rankstr, char *wantstr, char *mmapstr, INT32 playernum);
 void ST_ReloadSkinFaceGraphics(void);
 
-void ST_doPaletteStuff(void);
-
 // return if player a is in the same team as player b
 boolean ST_SameTeam(player_t *a, player_t *b);
 
@@ -71,10 +77,6 @@ extern UINT8 stplyrnum;
 extern lumpnum_t st_borderpatchnum;
 // patches, also used in intermission
 extern patch_t *tallnum[10];
-extern patch_t *sboscore;
-extern patch_t *sbotime;
-extern patch_t *sbocolon;
-extern patch_t *sboperiod;
 extern patch_t *facerankprefix[MAXSKINS]; // ranking
 extern patch_t *facewantprefix[MAXSKINS]; // wanted
 extern patch_t *facemmapprefix[MAXSKINS]; // minimap
@@ -87,8 +89,6 @@ extern char *facemmapprefix_name[MAXSKINS]; // minimap
 extern char *localfacerankprefix_name[MAXLOCALSKINS]; // ranking
 extern char *localfacewantprefix_name[MAXLOCALSKINS]; // wanted
 extern char *localfacemmapprefix_name[MAXLOCALSKINS]; // minimap*/
-extern patch_t *livesback;
-extern patch_t *ngradeletters[7];
 
 /** HUD location information (don't move this comment)
   */
@@ -146,4 +146,8 @@ extern UINT16 objectsdrawn;
 extern consvar_t cv_lessflicker;
 extern consvar_t cv_stagetitle;
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/tables.c b/src/tables.c
index bf5385db1..a36709654 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -176,13 +176,18 @@ fixed_t *finecosine = &finesine[FINEANGLES/4];
 
 #include "t_facon.c"
 
-
 FUNCMATH angle_t FixedAcos(fixed_t x)
 {
 	if (-FRACUNIT > x || x >= FRACUNIT) return 0;
 	return fineacon[((x<<(FINE_FRACBITS-FRACBITS)))+FRACUNIT];
 }
 
+INT32 AngleDeltaSigned(angle_t a1, angle_t a2)
+{
+	// Silly but easy way to do it through integer conversion.
+	return (INT32)(a1) - (INT32)(a2);
+}
+
 //
 // AngleBetweenVectors
 //
@@ -269,7 +274,7 @@ boolean FV2_InsidePolygon(const vector2_t *vIntersection, const vector2_t *Poly,
 	// with floating point numbers.  It usually won't always be perfectly 2 * PI, so we need
 	// to use a little twiddling.  I use .9999, but you can change this to fit your own desired accuracy.
 
-	if(Angle >= ANGLE_MAX)	// If the angle is greater than 2 PI, (360 degrees)
+	if (Angle >= ANGLE_MAX) // If the angle is greater than 2 PI, (360 degrees)
 		return 1; // The point is inside of the polygon
 
 	return 0; // If you get here, it obviously wasn't inside the polygon.
diff --git a/src/tables.h b/src/tables.h
index f643895a5..2f492bebb 100644
--- a/src/tables.h
+++ b/src/tables.h
@@ -14,6 +14,10 @@
 #ifndef __TABLES__
 #define __TABLES__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef LINUX
 #include <math.h>
 #endif
@@ -110,6 +114,8 @@ FUNCMATH angle_t FixedAngleC(fixed_t fa, fixed_t factor);
 /// The FixedAcos function
 FUNCMATH angle_t FixedAcos(fixed_t x);
 
+FUNCMATH INT32 AngleDeltaSigned(angle_t a1, angle_t a2);
+
 /// Fixed Point Vector functions
 angle_t FV2_AngleBetweenVectors(const vector2_t *Vector1, const vector2_t *Vector2);
 angle_t FV3_AngleBetweenVectors(const vector3_t *Vector1, const vector3_t *Vector2);
@@ -132,4 +138,8 @@ void FM_Rotate(matrix_t *dest, angle_t angle, fixed_t x, fixed_t y, fixed_t z);
 #define FSIN(n) FINESINE(ANGLETOFINE(n))
 #define FCOS(n) FINECOSINE(ANGLETOFINE(n))
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/v_video.c b/src/v_video.c
index 03ba1e079..2c412d3ca 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -14,7 +14,9 @@
 ///        Functions to blit a block to the screen.
 
 #include "doomdef.h"
+#include "d_main.h"
 #include "r_local.h"
+#include "p_local.h"
 #include "v_video.h"
 #include "hu_stuff.h"
 #include "r_draw.h"
@@ -33,19 +35,14 @@
 #include "hardware/r_opengl/r_opengl.h"
 #endif
 
-// Each screen is [vid.width*vid.height];
-UINT8 *screens[5];
-// screens[0] = main display window
-// screens[1] = back screen, alternative blitting
-// screens[2] = screenshot buffer, gif movie buffer
-// screens[3] = fade screen start
-// screens[4] = fade screen end, postimage tempoarary buffer
-
 static CV_PossibleValue_t fps_cons_t[] = {{0, "No"}, {1, "Normal"}, {2, "Compact"}, {3, "Old"}, {4, "Old Compact"}, {0, NULL}};
 consvar_t cv_ticrate = {"showfps", "No", CV_SAVE, fps_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 static void CV_palette_OnChange(void);
 
+consvar_t cv_palette = {"palette", "", CV_CALL|CV_NOINIT, NULL, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_palettenum = {"palettenum", "0", CV_CALL|CV_NOINIT, CV_Unsigned, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+
 static CV_PossibleValue_t gamma_cons_t[] = {{-15, "MIN"}, {4, "MAX"}, {0, NULL}};
 consvar_t cv_globalgamma = {"gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
@@ -89,6 +86,8 @@ consvar_t cv_menucaps = {"menucaps", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NUL
 // local copy of the palette for V_GetColor()
 RGBA_t *pLocalPalette = NULL;
 
+static size_t currentPaletteSize;
+
 /*
 The following was an extremely helpful resource when developing my Colour Cube LUT.
 http://http.developer.nvidia.com/GPUGems2/gpugems2_chapter24.html
@@ -127,13 +126,23 @@ static boolean InitCube(void)
 			}
 		}
 	};
+
 	float desatur[3]; // grey
 	float globalgammamul, globalgammaoffs;
 	boolean doinggamma;
 
-#define diffcons(cv) (cv.value != atoi(cv.defaultvalue))
+	if (!loaded_config)
+		return false;
 
+#define diffcons(cv) (strcmp(cv.string, cv.defaultvalue))
+#define diffconsgamma(cv) (cv.value != 0)
+#define diffconssat(cv) (cv.value != 10)
+
+#ifdef BACKWARDSCOMPATCORRECTION
+	doinggamma = (cv_globalgamma.value < 0); //dont mess up gamma when raising brightness pls
+#else
 	doinggamma = diffcons(cv_globalgamma);
+#endif
 
 #define gammascale 8
 	globalgammamul = (cv_globalgamma.value ? ((255 - (gammascale*abs(cv_globalgamma.value)))/255.0) : 1.0);
@@ -147,12 +156,12 @@ static boolean InitCube(void)
 		|| diffcons(cv_chue)
 		|| diffcons(cv_bhue)
 		|| diffcons(cv_mhue)
-		|| diffcons(cv_rgamma)
-		|| diffcons(cv_ygamma)
-		|| diffcons(cv_ggamma)
-		|| diffcons(cv_cgamma)
-		|| diffcons(cv_bgamma)
-		|| diffcons(cv_mgamma)) // set the gamma'd/hued positions (saturation is done later)
+		|| diffconsgamma(cv_rgamma)
+		|| diffconsgamma(cv_ygamma)
+		|| diffconsgamma(cv_ggamma)
+		|| diffconsgamma(cv_cgamma)
+		|| diffconsgamma(cv_bgamma)
+		|| diffconsgamma(cv_mgamma)) // set the gamma'd/hued positions (saturation is done later)
 	{
 		float mod, tempgammamul, tempgammaoffs;
 
@@ -210,7 +219,7 @@ static boolean InitCube(void)
 
 #define dosaturation(a, e) a = ((1 - work)*e + work*a)
 #define docvsat(cv_sat, hue, gamma, r, g, b) \
-	if diffcons(cv_sat)\
+	if diffconssat(cv_sat)\
 	{\
 		float work, mod, tempgammamul, tempgammaoffs;\
 		apply = true;\
@@ -235,7 +244,7 @@ static boolean InitCube(void)
 
 #undef gammascale
 
-	if diffcons(cv_globalsaturation)
+	if diffconssat(cv_globalsaturation)
 	{
 		float work = (cv_globalsaturation.value/10.0);
 
@@ -256,6 +265,8 @@ static boolean InitCube(void)
 #undef dosaturation
 
 #undef diffcons
+#undef diffconsgamma
+#undef diffconssat
 
 	if (!apply)
 		return false;
@@ -397,13 +408,19 @@ const UINT8 gammatable[5][256] =
 // keep a copy of the palette so that we can get the RGB value for a color index at any time.
 static void LoadPalette(const char *lumpname)
 {
+	UINT8 *pal;
+	size_t i, palsize;
+	lumpnum_t lumpnum;
+
 #ifdef BACKWARDSCOMPATCORRECTION
 	const UINT8 *usegamma = gammatable[min(max(cv_globalgamma.value, 0), 4)];
 #endif
 	Cubeapply = InitCube();
-	lumpnum_t lumpnum = W_GetNumForName(lumpname);
-	size_t i, palsize = W_LumpLength(lumpnum)/3;
-	UINT8 *pal;
+
+	lumpnum = W_GetNumForName(lumpname);
+
+	currentPaletteSize = W_LumpLength(lumpnum);
+	palsize = currentPaletteSize / 3;
 
 	Z_Free(pLocalPalette);
 
@@ -432,45 +449,21 @@ static void LoadPalette(const char *lumpname)
 #endif
 		pLocalPalette[i].s.alpha = 0xFF;
 
+		if (!Cubeapply)
+			continue;
+
 		// lerp of colour cubing! if you want, make it smoother yourself
-		if (Cubeapply)
-			V_CubeApply(&pLocalPalette[i].s.red, &pLocalPalette[i].s.green, &pLocalPalette[i].s.blue);
+		V_CubeApply(&pLocalPalette[i].s.red, &pLocalPalette[i].s.green, &pLocalPalette[i].s.blue);
 	}
 }
 
-#ifdef BACKWARDSCOMPATCORRECTION
-static boolean V_ShouldCube(void)
-{
-#define diffcons(cv) (cv.value != atoi(cv.defaultvalue))
-	return (diffcons(cv_globalsaturation)
-		|| diffcons(cv_rhue)
-		|| diffcons(cv_yhue)
-		|| diffcons(cv_ghue)
-		|| diffcons(cv_chue)
-		|| diffcons(cv_bhue)
-		|| diffcons(cv_mhue)
-		|| diffcons(cv_rgamma)
-		|| diffcons(cv_ygamma)
-		|| diffcons(cv_ggamma)
-		|| diffcons(cv_cgamma)
-		|| diffcons(cv_bgamma)
-		|| diffcons(cv_mgamma)
-		|| (cv_globalgamma.value <= 0));
-#undef diffcons
-}
-#endif
-
 void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue)
 {
 	float working[4][3];
 	float linear;
 	UINT8 q;
 
-	if (!Cubeapply
-#ifdef BACKWARDSCOMPATCORRECTION
-	|| !V_ShouldCube()
-#endif
-	)
+	if (!Cubeapply)
 		return;
 
 	linear = (*red/255.0);
@@ -518,12 +511,27 @@ const char *R_GetPalname(UINT16 num)
 
 const char *GetPalette(void)
 {
+	const char *user = cv_palette.string;
+
+	if (user && user[0])
+	{
+		if (W_CheckNumForName(user) == LUMPERROR)
+		{
+			CONS_Alert(CONS_WARNING, "cv_palette %s lump does not exist\n", user);
+		}
+		else
+		{
+			return cv_palette.string;
+		}
+	}
+
 	if (gamestate == GS_LEVEL)
 		return R_GetPalname((encoremode ? mapheaderinfo[gamemap-1]->encorepal : mapheaderinfo[gamemap-1]->palette));
+
 	return "PLAYPAL";
 }
 
-static void LoadMapPalette(void)
+void V_ReloadPalette(void)
 {
 	LoadPalette(GetPalette());
 }
@@ -535,7 +543,23 @@ static void LoadMapPalette(void)
 void V_SetPalette(INT32 palettenum)
 {
 	if (!pLocalPalette)
-		LoadMapPalette();
+		V_ReloadPalette();
+
+#ifdef HWRENDER
+	if (rendermode == render_soft || (rendermode == render_opengl && HWR_ShouldUsePaletteRendering())) // opengl without paletterendering hates subpalettes
+#endif
+	{
+		if (palettenum == 0)
+		{
+			palettenum = cv_palettenum.value;
+
+			if (palettenum * 256U > currentPaletteSize - 256)
+			{
+				CONS_Alert(CONS_WARNING, "cv_palettenum %d out of range\n", palettenum);
+				palettenum = 0;
+			}
+		}
+	}
 
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
@@ -551,15 +575,7 @@ void V_SetPalette(INT32 palettenum)
 void V_SetPaletteLump(const char *pal)
 {
 	LoadPalette(pal);
-#ifdef HWRENDER
-	if (rendermode == render_opengl)
-		HWR_SetPalette(pLocalPalette);
-#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
-	else
-#endif
-#endif
-	if (rendermode != render_none)
-		I_SetPalette(pLocalPalette);
+	V_SetPalette(0);
 #ifdef HASINVERT
 	R_MakeInvertmap();
 #endif
@@ -567,11 +583,27 @@ void V_SetPaletteLump(const char *pal)
 
 static void CV_palette_OnChange(void)
 {
+	if (!loaded_config)
+		return;
 	// reload palette
-	LoadMapPalette();
+	// recalculate Color Cube
+	V_ReloadPalette();
 	V_SetPalette(0);
 }
 
+void V_ResetPaletteCVars(void)
+{
+	if (!loaded_config)
+		return;
+
+#define diffcons(cv) (strcmp(cv.string, cv.defaultvalue))
+	if diffcons(cv_palette)
+		CV_StealthSetValue(&cv_palette, atoi(cv_palette.defaultvalue));
+	if diffcons(cv_palettenum)
+		CV_StealthSetValue(&cv_palettenum, atoi(cv_palettenum.defaultvalue));
+#undef diffcons
+}
+
 static void CV_constextsize_OnChange(void)
 {
 	con_recalc = true;
@@ -601,37 +633,20 @@ static UINT8 hudplusalpha[11]  = { 10,  8,  6,  4,  2,  0,  0,  0,  0,  0,  0};
 static UINT8 hudminusalpha[11] = { 10,  9,  9,  8,  8,  7,  7,  6,  6,  5,  5};
 UINT8 hudtrans = 0;
 
-// this is pretty dumb, but has to be done like this, otherwise the fps counter just disappears sometimes for no reason lol
-INT32 V_LocalTransFlag(void)
-{
-	return ((10-cv_translucenthud.value)*V_10TRANS);
-}
-
 static const UINT8 *v_colormap = NULL;
 static const UINT8 *v_translevel = NULL;
 
-static inline UINT8 standardpdraw(const UINT8 *dest, const UINT8 *source, fixed_t ofs)
-{
-	(void)dest; return source[ofs>>FRACBITS];
-}
-static inline UINT8 mappedpdraw(const UINT8 *dest, const UINT8 *source, fixed_t ofs)
-{
-	(void)dest; return *(v_colormap + source[ofs>>FRACBITS]);
-}
-static inline UINT8 translucentpdraw(const UINT8 *dest, const UINT8 *source, fixed_t ofs)
-{
-	return *(v_translevel + ((source[ofs>>FRACBITS]<<8)&0xff00) + (*dest&0xff));
-}
-static inline UINT8 transmappedpdraw(const UINT8 *dest, const UINT8 *source, fixed_t ofs)
-{
-	return *(v_translevel + (((*(v_colormap + source[ofs>>FRACBITS]))<<8)&0xff00) + (*dest&0xff));
-}
+#define STANDARDDRAW 1
+#define MAPPEDDRAW 2
+#define TRANSLUCENTDRAW 3
+#define TRANSMAPPEDDRAW 4
 
 // Draws a patch scaled to arbitrary size.
-void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap)
+void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap, INT32 bflags)
 {
-	UINT8 (*patchdrawfunc)(const UINT8*, const UINT8*, fixed_t);
-	UINT32 alphalevel = 0;
+	UINT8 patchdrawtype;
+	UINT32 alphalevel;
+	UINT32 blendmode;
 
 	fixed_t col, ofs, colfrac, rowfrac, fdup, vdup;
 	INT32 dupx, dupy;
@@ -641,64 +656,78 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 	fixed_t pwidth; // patch width
 	fixed_t offx = 0; // x offset
 
-	if (rendermode == render_none)
+	if (rendermode == render_none || !patch)
 		return;
 
 #ifdef HWRENDER
 	//if (rendermode != render_soft && !con_startup)		// Why?
 	if (rendermode == render_opengl)
 	{
-		HWR_DrawStretchyFixedPatch((GLPatch_t *)patch, x, y, pscale, vscale, scrn, colormap);
+		HWR_DrawStretchyFixedPatch(patch, x, y, pscale, vscale, scrn, colormap, bflags);
 		return;
 	}
 #endif
 
-	patchdrawfunc = standardpdraw;
+	alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT);
+	blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT);
+
+	patchdrawtype = STANDARDDRAW;
 
 	v_translevel = NULL;
-	if ((alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT)))
+	if (alphalevel || blendmode)
 	{
-		if (alphalevel == 13)
-			alphalevel = hudminusalpha[hudtrans];
-		else if (alphalevel == 14)
-			alphalevel = 10 - hudtrans;
-		else if (alphalevel == 15)
-			alphalevel = hudplusalpha[hudtrans];
+		switch (alphalevel)
+		{
+			case 13:
+				alphalevel = hudminusalpha[hudtrans];
+				break;
+			case 14:
+				alphalevel = (10 - hudtrans);
+				break;
+			case 15:
+				alphalevel = hudplusalpha[hudtrans];
+				break;
+		}
 
 		if (alphalevel >= 10)
 			return; // invis
 
-		if (alphalevel)
+		if (alphalevel || blendmode)
 		{
-			v_translevel = transtables + ((alphalevel-1)<<FF_TRANSSHIFT);
-			patchdrawfunc = translucentpdraw;
+			v_translevel = R_GetBlendTable(blendmode+1, alphalevel);
+			patchdrawtype = TRANSLUCENTDRAW;
 		}
 	}
 
 	v_colormap = NULL;
+
 	if (colormap)
 	{
 		v_colormap = colormap;
-		patchdrawfunc = (v_translevel) ? transmappedpdraw : mappedpdraw;
+		patchdrawtype = (v_translevel) ? TRANSMAPPEDDRAW : MAPPEDDRAW;
 	}
 
 	dupx = vid.dupx;
 	dupy = vid.dupy;
-	if (scrn & V_SCALEPATCHMASK) switch ((scrn & V_SCALEPATCHMASK) >> V_SCALEPATCHSHIFT)
+
+	if (scrn & V_SCALEPATCHMASK)
 	{
-		case 1: // V_NOSCALEPATCH
-			dupx = dupy = 1;
-			break;
-		case 2: // V_SMALLSCALEPATCH
-			dupx = vid.smalldupx;
-			dupy = vid.smalldupy;
-			break;
-		case 3: // V_MEDSCALEPATCH
-			dupx = vid.meddupx;
-			dupy = vid.meddupy;
-			break;
-		default:
-			break;
+		switch ((scrn & V_SCALEPATCHMASK) >> V_SCALEPATCHSHIFT)
+		{
+			case 1: // V_NOSCALEPATCH
+				dupx = dupy = 1;
+				break;
+			case 2: // V_SMALLSCALEPATCH
+				dupx = vid.smalldupx;
+				dupy = vid.smalldupy;
+				break;
+			case 3: // V_MEDSCALEPATCH
+				dupx = vid.meddupx;
+				dupy = vid.meddupy;
+				break;
+			default:
+				break;
+		}
 	}
 
 	// only use one dup, to avoid stretching (har har)
@@ -718,15 +747,15 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 
 		// left offset
 		if (scrn & V_FLIP)
-			offsetx = FixedMul((SHORT(patch->width) - SHORT(patch->leftoffset))<<FRACBITS, pscale) + 1;
+			offsetx = FixedMul((patch->width - patch->leftoffset)<<FRACBITS, pscale) + 1;
 		else
-			offsetx = FixedMul(SHORT(patch->leftoffset)<<FRACBITS, pscale);
+			offsetx = FixedMul(patch->leftoffset<<FRACBITS, pscale);
 
 		// top offset
 		// TODO: make some kind of vertical version of V_FLIP, maybe by deprecating V_OFFSET in future?!?
-		offsety = FixedMul(SHORT(patch->topoffset)<<FRACBITS, vscale);
+		offsety = FixedMul(patch->topoffset<<FRACBITS, vscale);
 
-		if ((scrn & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy for crosshairs
+		if ((scrn & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy
 		{
 			offsetx = FixedMul(offsetx, dupx<<FRACBITS);
 			offsety = FixedMul(offsety, dupy<<FRACBITS);
@@ -743,7 +772,7 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 	if (scrn & V_HORZSCREEN)
 		x += (BASEVIDWIDTH/2)<<FRACBITS;
 
-	desttop = screens[scrn&V_PARAMMASK];
+	desttop = vid.screens[scrn&V_PARAMMASK];
 
 	if (!desttop)
 		return;
@@ -767,9 +796,9 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 		if (!(scrn & V_SCALEPATCHMASK))
 		{
 			// if it's meant to cover the whole screen, black out the rest (ONLY IF TOP LEFT ISN'T TRANSPARENT)
-			if (x == 0 && SHORT(patch->width) == BASEVIDWIDTH && y == 0 && SHORT(patch->height) == BASEVIDHEIGHT)
+			if (x == 0 && patch->width == BASEVIDWIDTH && y == 0 && patch->height == BASEVIDHEIGHT)
 			{
-				column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[0]));
+				column = (const column_t *)((const UINT8 *)(patch->columns) + (patch->columnofs[0]));
 				if (!column->topdelta)
 				{
 					source = (const UINT8 *)(column) + 3;
@@ -805,55 +834,131 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 
 	if (pscale != FRACUNIT) // scale width properly
 	{
-		pwidth = SHORT(patch->width)<<FRACBITS;
+		pwidth = patch->width<<FRACBITS;
 		pwidth = FixedMul(pwidth, pscale);
 		pwidth = FixedMul(pwidth, dupx<<FRACBITS);
 		pwidth >>= FRACBITS;
 	}
 	else
-		pwidth = SHORT(patch->width) * dupx;
+		pwidth = patch->width * dupx;
 
 	deststart = desttop;
 	destend = desttop + pwidth;
 
-	for (col = 0; (col>>FRACBITS) < SHORT(patch->width); col += colfrac, ++offx, desttop++)
+	const INT32 stride = vid.width;
+
+	for (col = 0; (col>>FRACBITS) < patch->width; col += colfrac, ++offx, desttop++)
 	{
 		INT32 topdelta, prevdelta = -1;
 		if (scrn & V_FLIP) // offx is measured from right edge instead of left
 		{
 			if (x+pwidth-offx < 0) // don't draw off the left of the screen (WRAP PREVENTION)
 				break;
-			if (x+pwidth-offx >= vid.width) // don't draw off the right of the screen (WRAP PREVENTION)
+			if (x+pwidth-offx >= stride) // don't draw off the right of the screen (WRAP PREVENTION)
 				continue;
 		}
 		else
 		{
 			if (x+offx < 0) // don't draw off the left of the screen (WRAP PREVENTION)
 				continue;
-			if (x+offx >= vid.width) // don't draw off the right of the screen (WRAP PREVENTION)
+			if (x+offx >= stride) // don't draw off the right of the screen (WRAP PREVENTION)
 				break;
 		}
-		column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[col>>FRACBITS]));
+		column = (const column_t *)((const UINT8 *)(patch->columns) + (patch->columnofs[col>>FRACBITS]));
 
-		while (column->topdelta != 0xff)
+		switch (patchdrawtype)
 		{
-			topdelta = column->topdelta;
-			if (topdelta <= prevdelta)
-				topdelta += prevdelta;
-			prevdelta = topdelta;
-			source = (const UINT8 *)(column) + 3;
-			dest = desttop;
-			if (scrn & V_FLIP)
-				dest = deststart + (destend - desttop);
-			dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup))*vid.width;
+			case STANDARDDRAW:
+				while (column->topdelta != 0xff)
+				{
+					topdelta = column->topdelta;
+					if (topdelta <= prevdelta)
+						topdelta += prevdelta;
+					prevdelta = topdelta;
+					source = (const UINT8 *)(column) + 3;
+					dest = desttop;
+					if (scrn & V_FLIP)
+						dest = deststart + (destend - desttop);
+					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup))*stride;
 
-			for (ofs = 0; dest < deststop && (ofs>>FRACBITS) < column->length; ofs += rowfrac)
-			{
-				if (dest >= screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
-					*dest = patchdrawfunc(dest, source, ofs);
-				dest += vid.width;
-			}
-			column = (const column_t *)((const UINT8 *)column + column->length + 4);
+					for (ofs = 0; dest < deststop && (ofs>>FRACBITS) < column->length; ofs += rowfrac)
+					{
+						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+							*dest = source[ofs>>FRACBITS];
+						dest += stride;
+					}
+					column = (const column_t *)((const UINT8 *)column + column->length + 4);
+				}
+				break;
+
+			case MAPPEDDRAW:
+				while (column->topdelta != 0xff)
+				{
+					topdelta = column->topdelta;
+					if (topdelta <= prevdelta)
+						topdelta += prevdelta;
+					prevdelta = topdelta;
+					source = (const UINT8 *)(column) + 3;
+					dest = desttop;
+					if (scrn & V_FLIP)
+						dest = deststart + (destend - desttop);
+					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup))*stride;
+
+					for (ofs = 0; dest < deststop && (ofs>>FRACBITS) < column->length; ofs += rowfrac)
+					{
+						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+							*dest = *(v_colormap + source[ofs>>FRACBITS]);
+						dest += stride;
+					}
+					column = (const column_t *)((const UINT8 *)column + column->length + 4);
+				}
+				break;
+
+			case TRANSLUCENTDRAW:
+				while (column->topdelta != 0xff)
+				{
+					topdelta = column->topdelta;
+					if (topdelta <= prevdelta)
+						topdelta += prevdelta;
+					prevdelta = topdelta;
+					source = (const UINT8 *)(column) + 3;
+					dest = desttop;
+					if (scrn & V_FLIP)
+						dest = deststart + (destend - desttop);
+					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup))*stride;
+
+					for (ofs = 0; dest < deststop && (ofs>>FRACBITS) < column->length; ofs += rowfrac)
+					{
+						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+							*dest = *(v_translevel + ((source[ofs>>FRACBITS]<<8)&0xff00) + (*dest&0xff));
+						dest += stride;
+					}
+					column = (const column_t *)((const UINT8 *)column + column->length + 4);
+				}
+				break;
+
+			case TRANSMAPPEDDRAW:
+				while (column->topdelta != 0xff)
+				{
+					topdelta = column->topdelta;
+					if (topdelta <= prevdelta)
+						topdelta += prevdelta;
+					prevdelta = topdelta;
+					source = (const UINT8 *)(column) + 3;
+					dest = desttop;
+					if (scrn & V_FLIP)
+						dest = deststart + (destend - desttop);
+					dest += FixedInt(FixedMul(topdelta<<FRACBITS,vdup))*stride;
+
+					for (ofs = 0; dest < deststop && (ofs>>FRACBITS) < column->length; ofs += rowfrac)
+					{
+						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+							*dest = *(v_translevel + (((*(v_colormap + source[ofs>>FRACBITS]))<<8)&0xff00) + (*dest&0xff));
+						dest += stride;
+					}
+					column = (const column_t *)((const UINT8 *)column + column->length + 4);
+				}
+				break;
 		}
 	}
 }
@@ -861,9 +966,8 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
 // Draws a patch cropped and scaled to arbitrary size.
 void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_t *patch, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h)
 {
-	UINT8 (*patchdrawfunc)(const UINT8*, const UINT8*, fixed_t);
+	UINT8 patchdrawtype;
 	UINT32 alphalevel = 0;
-	// boolean flip = false;
 
 	fixed_t col, ofs, colfrac, rowfrac, fdup;
 	INT32 dupx, dupy;
@@ -871,28 +975,34 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 	UINT8 *desttop, *dest;
 	const UINT8 *source, *deststop;
 
-	if (rendermode == render_none)
+	if (rendermode == render_none || !patch)
 		return;
 
 #ifdef HWRENDER
 	if (rendermode == render_opengl)
 	{
-		HWR_DrawCroppedPatch((GLPatch_t*)patch,x,y,pscale,scrn,sx,sy,w,h);
+		HWR_DrawCroppedPatch(patch, x, y, pscale, scrn, sx, sy, w, h);
 		return;
 	}
 #endif
 
-	patchdrawfunc = standardpdraw;
+	patchdrawtype = STANDARDDRAW;
 
 	v_translevel = NULL;
 	if ((alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT)))
 	{
-		if (alphalevel == 13)
-			alphalevel = hudminusalpha[hudtrans];
-		else if (alphalevel == 14)
-			alphalevel = 10 - hudtrans;
-		else if (alphalevel == 15)
-			alphalevel = hudplusalpha[hudtrans];
+		switch (alphalevel)
+		{
+			case 13:
+				alphalevel = hudminusalpha[hudtrans];
+				break;
+			case 14:
+				alphalevel = (10 - hudtrans);
+				break;
+			case 15:
+				alphalevel = hudplusalpha[hudtrans];
+				break;
+		}
 
 		if (alphalevel >= 10)
 			return; // invis
@@ -900,7 +1010,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 		if (alphalevel)
 		{
 			v_translevel = transtables + ((alphalevel-1)<<FF_TRANSSHIFT);
-			patchdrawfunc = translucentpdraw;
+			patchdrawtype = TRANSLUCENTDRAW;
 		}
 	}
 
@@ -910,17 +1020,18 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 	colfrac = FixedDiv(FRACUNIT, fdup);
 	rowfrac = FixedDiv(FRACUNIT, fdup);
 
-	y -= FixedMul(SHORT(patch->topoffset)<<FRACBITS, pscale);
-	x -= FixedMul(SHORT(patch->leftoffset)<<FRACBITS, pscale);
+	y -= FixedMul(patch->topoffset<<FRACBITS, pscale);
+	x -= FixedMul(patch->leftoffset<<FRACBITS, pscale);
 
-	desttop = screens[scrn&V_PARAMMASK];
+	desttop = vid.screens[scrn&V_PARAMMASK];
 
 	if (!desttop)
 		return;
 
 	deststop = desttop + vid.rowbytes * vid.height;
 
-	if (scrn & V_NOSCALESTART) {
+	if (scrn & V_NOSCALESTART)
+	{
 		x >>= FRACBITS;
 		y >>= FRACBITS;
 		desttop += (y*vid.width) + x;
@@ -960,38 +1071,75 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 		desttop += (y*vid.width) + x;
 	}
 
-	for (col = sx<<FRACBITS; (col>>FRACBITS) < SHORT(patch->width) && ((col>>FRACBITS) - sx) < w; col += colfrac, ++x, desttop++)
+	const INT32 stride = vid.width;
+
+	for (col = sx<<FRACBITS; (col>>FRACBITS) < patch->width && ((col>>FRACBITS) - sx) < w; col += colfrac, ++x, desttop++)
 	{
 		INT32 topdelta, prevdelta = -1;
+
 		if (x < 0) // don't draw off the left of the screen (WRAP PREVENTION)
 			continue;
-		if (x >= vid.width) // don't draw off the right of the screen (WRAP PREVENTION)
+
+		if (x >= stride) // don't draw off the right of the screen (WRAP PREVENTION)
 			break;
-		column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[col>>FRACBITS]));
 
-		while (column->topdelta != 0xff)
+		column = (const column_t *)((const UINT8 *)(patch->columns) + (patch->columnofs[col>>FRACBITS]));
+
+		switch (patchdrawtype)
 		{
-			topdelta = column->topdelta;
-			if (topdelta <= prevdelta)
-				topdelta += prevdelta;
-			prevdelta = topdelta;
-			source = (const UINT8 *)(column) + 3;
-			dest = desttop;
-			if (topdelta-sy > 0)
-			{
-				dest += FixedInt(FixedMul((topdelta-sy)<<FRACBITS,fdup))*vid.width;
-				ofs = 0;
-			}
-			else
-				ofs = (sy-topdelta)<<FRACBITS;
+			case STANDARDDRAW:
+				while (column->topdelta != 0xff)
+				{
+					topdelta = column->topdelta;
+					if (topdelta <= prevdelta)
+						topdelta += prevdelta;
+					prevdelta = topdelta;
+					source = (const UINT8 *)(column) + 3;
+					dest = desttop;
+					if (topdelta-sy > 0)
+					{
+						dest += FixedInt(FixedMul((topdelta-sy)<<FRACBITS,fdup))*stride;
+						ofs = 0;
+					}
+					else
+						ofs = (sy-topdelta)<<FRACBITS;
 
-			for (; dest < deststop && (ofs>>FRACBITS) < column->length && (((ofs>>FRACBITS) - sy) + topdelta) < h; ofs += rowfrac)
-			{
-				if (dest >= screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
-					*dest = patchdrawfunc(dest, source, ofs);
-				dest += vid.width;
-			}
-			column = (const column_t *)((const UINT8 *)column + column->length + 4);
+					for (; dest < deststop && (ofs>>FRACBITS) < column->length && (((ofs>>FRACBITS) - sy) + topdelta) < h; ofs += rowfrac)
+					{
+						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+							*dest = source[ofs>>FRACBITS];
+						dest += stride;
+					}
+					column = (const column_t *)((const UINT8 *)column + column->length + 4);
+				}
+				break;
+
+			case TRANSLUCENTDRAW:
+				while (column->topdelta != 0xff)
+				{
+					topdelta = column->topdelta;
+					if (topdelta <= prevdelta)
+						topdelta += prevdelta;
+					prevdelta = topdelta;
+					source = (const UINT8 *)(column) + 3;
+					dest = desttop;
+					if (topdelta-sy > 0)
+					{
+						dest += FixedInt(FixedMul((topdelta-sy)<<FRACBITS,fdup))*stride;
+						ofs = 0;
+					}
+					else
+						ofs = (sy-topdelta)<<FRACBITS;
+
+					for (; dest < deststop && (ofs>>FRACBITS) < column->length && (((ofs>>FRACBITS) - sy) + topdelta) < h; ofs += rowfrac)
+					{
+						if (dest >= vid.screens[scrn&V_PARAMMASK]) // don't draw off the top of the screen (CRASH PREVENTION)
+							*dest = *(v_translevel + ((source[ofs>>FRACBITS]<<8)&0xff00) + (*dest&0xff));
+						dest += stride;
+					}
+					column = (const column_t *)((const UINT8 *)column + column->length + 4);
+				}
+				break;
 		}
 	}
 }
@@ -1003,11 +1151,11 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
 void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT8 skincolor)
 {
 	if (skinnum < 0 || skinnum >= numskins || (skins[skinnum].flags & SF_HIRES))
-		V_DrawScaledPatch(x - 10, y - 14, flags, W_CachePatchName("CONTINS", PU_CACHE)); // Draw a star
+		V_DrawScaledPatch(x - 10, y - 14, flags, W_CachePatchName("CONTINS", PU_PATCH)); // Draw a star
 	else
 	{ // Find front angle of the first waiting frame of the character's actual sprites
 		spriteframe_t *sprframe = &skins[skinnum].spritedef.spriteframes[2 & FF_FRAMEMASK];
-		patch_t *patch = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
+		patch_t *patch = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH);
 		const UINT8 *colormap = R_GetTranslationColormap(skinnum, skincolor, GTC_CACHE);
 
 		// No variant for translucency
@@ -1029,8 +1177,8 @@ void V_DrawBlock(INT32 x, INT32 y, INT32 scrn, INT32 width, INT32 height, const
 		I_Error("Bad V_DrawBlock");
 #endif
 
-	dest = screens[scrn] + y*vid.width + x;
-	deststop = screens[scrn] + vid.rowbytes * vid.height;
+	dest = vid.screens[scrn] + y*vid.width + x;
+	deststop = vid.screens[scrn] + vid.rowbytes * vid.height;
 
 	while (height--)
 	{
@@ -1070,7 +1218,7 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 
 		if (x == 0 && y == 0 && w == BASEVIDWIDTH && h == BASEVIDHEIGHT)
 		{ // Clear the entire screen, from dest to deststop. Yes, this really works.
-			memset(screens[0], (c&255), vid.width * vid.height * vid.bpp);
+			memset(vid.screens[0], (c&255), vid.width * vid.height);
 			return;
 		}
 
@@ -1097,6 +1245,7 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 			else if (!(c & V_SNAPTOTOP))
 				y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
 		}
+
 		if (c & V_SPLITSCREEN)
 			y += (BASEVIDHEIGHT * dupy)/2;
 		if (c & V_HORZSCREEN)
@@ -1105,7 +1254,7 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 
 	if (x >= vid.width || y >= vid.height)
 		return; // off the screen
-	
+
 	if (x < 0)
 	{
 		w += x;
@@ -1119,30 +1268,36 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 
 	if (w <= 0 || h <= 0)
 		return; // zero width/height wouldn't draw anything
-	
+
 	if (x + w > vid.width)
 		w = vid.width-x;
 	if (y + h > vid.height)
 		h = vid.height-y;
 
-	dest = screens[0] + y*vid.width + x;
-	deststop = screens[0] + vid.rowbytes * vid.height;
+	dest = vid.screens[0] + y*vid.width + x;
+	deststop = vid.screens[0] + vid.rowbytes * vid.height;
 
 	if (alphalevel)
 	{
-		if (alphalevel == 13)
-			alphalevel = hudminusalpha[hudtrans];
-		else if (alphalevel == 14)
-			alphalevel = 10 - hudtrans;
-		else if (alphalevel == 15)
-			alphalevel = hudplusalpha[hudtrans];
+		switch (alphalevel)
+		{
+			case 13:
+				alphalevel = hudminusalpha[hudtrans];
+				break;
+			case 14:
+				alphalevel = (10 - hudtrans);
+				break;
+			case 15:
+				alphalevel = hudplusalpha[hudtrans];
+				break;
+		}
 
 		if (alphalevel >= 10)
 			return; // invis
 	}
 
 	c &= 255;
-	
+
 	if (alphalevel)
 	{
 		const UINT8 *fadetable = ((UINT8 *)transtables + ((alphalevel-1)<<FF_TRANSSHIFT) + (c*256));
@@ -1155,7 +1310,7 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 	else
 	{
 		for (;(--h >= 0) && dest < deststop; dest += vid.width)
-			memset(dest, c, w * vid.bpp);
+			memset(dest, c, w);
 	}
 }
 
@@ -1163,32 +1318,37 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 // This is now a function since it's otherwise repeated 2 times and honestly looks retarded:
 static UINT32 V_GetHWConsBackColor(void)
 {
-	UINT32 hwcolor;
+	UINT8 r, g, b;
+
 	switch (cons_backcolor.value)
 	{
-		case 0:		hwcolor = 0xffffff00;	break; 	// White
-		case 1:		hwcolor = 0x80808000;	break; 	// Gray
-		case 2:		hwcolor = 0xdeb88700;	break;	// Sepia
-		case 3:		hwcolor = 0x40201000;	break; 	// Brown
-		case 4:		hwcolor = 0xfa807200;	break; 	// Pink
-		case 5:		hwcolor = 0xff69b400;	break; 	// Raspberry
-		case 6:		hwcolor = 0xff000000;	break; 	// Red
-		case 7:		hwcolor = 0xffd68300;	break;	// Creamsicle
-		case 8:		hwcolor = 0xff800000;	break; 	// Orange
-		case 9:		hwcolor = 0xdaa52000;	break; 	// Gold
-		case 10:	hwcolor = 0x80800000;	break; 	// Yellow
-		case 11:	hwcolor = 0x00ff0000;	break; 	// Emerald
-		case 12:	hwcolor = 0x00800000;	break; 	// Green
-		case 13:	hwcolor = 0x4080ff00;	break; 	// Cyan
-		case 14:	hwcolor = 0x4682b400;	break; 	// Steel
-		case 15:	hwcolor = 0x1e90ff00;	break;	// Periwinkle
-		case 16:	hwcolor = 0x0000ff00;	break; 	// Blue
-		case 17:	hwcolor = 0xff00ff00;	break; 	// Purple
-		case 18:	hwcolor = 0xee82ee00;	break; 	// Lavender
+		case 0:		r = 0xff; g = 0xff; b = 0xff;	break; 	// White
+		case 1:		r = 0x80; g = 0x80; b = 0x80;	break; 	// Black
+		case 2:		r = 0xde; g = 0xb8; b = 0x87;	break;	// Sepia
+		case 3:		r = 0x40; g = 0x20; b = 0x10;	break; 	// Brown
+		case 4:		r = 0xfa; g = 0x80; b = 0x72;	break; 	// Pink
+		case 5:		r = 0xff; g = 0x69; b = 0xb4;	break; 	// Raspberry
+		case 6:		r = 0xff; g = 0x00; b = 0x00;	break; 	// Red
+		case 7:		r = 0xff; g = 0xd6; b = 0x83;	break;	// Creamsicle
+		case 8:		r = 0xff; g = 0x80; b = 0x00;	break; 	// Orange
+		case 9:		r = 0xda; g = 0xa5; b = 0x20;	break; 	// Gold
+		case 10:	r = 0x80; g = 0x80; b = 0x00;	break; 	// Yellow
+		case 11:	r = 0x00; g = 0xff; b = 0x00;	break; 	// Emerald
+		case 12:	r = 0x00; g = 0x80; b = 0x00;	break; 	// Green
+		case 13:	r = 0x40; g = 0x80; b = 0xff;	break; 	// Cyan
+		case 14:	r = 0x46; g = 0x82; b = 0xb4;	break; 	// Steel
+		case 15:	r = 0x1e; g = 0x90; b = 0xff;	break;	// Periwinkle
+		case 16:	r = 0x00; g = 0x00; b = 0xff;	break; 	// Blue
+		case 17:	r = 0xff; g = 0x00; b = 0xff;	break; 	// Purple
+		case 18:	r = 0xee; g = 0x82; b = 0xee;	break; 	// Lavender
 		// Default green
-		default:	hwcolor = 0x00800000;	break;
+		default:	r = 0x00; g = 0x80; b = 0x00;	break;
 	}
-	return hwcolor;
+
+	if (!HWR_ShouldUsePaletteRendering())
+		V_CubeApply(&r, &g, &b);
+
+	return (r << 24) | (g << 16) | (b << 8);
 }
 #endif
 
@@ -1207,7 +1367,7 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 	if (rendermode == render_opengl)
 	{
 		UINT32 hwcolor = V_GetHWConsBackColor();
-		HWR_DrawConsoleFill(x, y, w, h, hwcolor, c);	// we still use the regular color stuff but only for flags. actual draw color is "hwcolor" for this.
+		HWR_DrawConsoleFill(x, y, w, h, hwcolor, c); // we still use the regular color stuff but only for flags. actual draw color is "hwcolor" for this.
 		return;
 	}
 #endif
@@ -1218,7 +1378,7 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 
 		if (x == 0 && y == 0 && w == BASEVIDWIDTH && h == BASEVIDHEIGHT)
 		{ // Clear the entire screen, from dest to deststop. Yes, this really works.
-			memset(screens[0], (UINT8)(c&255), vid.width * vid.height * vid.bpp);
+			memset(vid.screens[0], (UINT8)(c&255), vid.width * vid.height);
 			return;
 		}
 
@@ -1265,16 +1425,22 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 	if (y + h > vid.height)
 		h = vid.height-y;
 
-	dest = screens[0] + y*vid.width + x;
+	dest = vid.screens[0] + y*vid.width + x;
 
 	if ((alphalevel = ((c & V_ALPHAMASK) >> V_ALPHASHIFT)))
 	{
-		if (alphalevel == 13)
-			alphalevel = hudminusalpha[hudtrans];
-		else if (alphalevel == 14)
-			alphalevel = 10 - hudtrans;
-		else if (alphalevel == 15)
-			alphalevel = hudplusalpha[hudtrans];
+		switch (alphalevel)
+		{
+			case 13:
+				alphalevel = hudminusalpha[hudtrans];
+				break;
+			case 14:
+				alphalevel = (10 - hudtrans);
+				break;
+			case 15:
+				alphalevel = hudplusalpha[hudtrans];
+				break;
+		}
 
 		if (alphalevel >= 10)
 			return; // invis
@@ -1282,13 +1448,18 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
 
 	c &= 255;
 
-	if (!alphalevel) {
-		for (v = 0; v < h; v++, dest += vid.width) {
-			for (u = 0; u < w; u++) {
+	if (!alphalevel)
+	{
+		for (v = 0; v < h; v++, dest += vid.width)
+		{
+			for (u = 0; u < w; u++)
+			{
 				dest[u] = consolebgmap[dest[u]];
 			}
 		}
-	} else { // mpc 12-04-2018
+	}
+	else
+	{ // mpc 12-04-2018
 		const UINT8 *fadetable = ((UINT8 *)transtables + ((alphalevel-1)<<FF_TRANSSHIFT) + (c*256));
 #define clip(x,y) (x>y) ? y : x
 		w = clip(w,vid.width);
@@ -1388,14 +1559,14 @@ void V_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 c)
 	if (h > w)
 		h = w;
 
-	dest = screens[0] + y*vid.width + x;
-	deststop = screens[0] + vid.rowbytes * vid.height;
+	dest = vid.screens[0] + y*vid.width + x;
+	deststop = vid.screens[0] + vid.rowbytes * vid.height;
 
 	c &= 255;
 
 	for (;(--h >= 0) && dest < deststop; dest += vid.width)
 	{
-		memset(dest, c, w * vid.bpp);
+		memset(dest, c, w);
 		if (wait)
 			wait--;
 		else
@@ -1460,8 +1631,8 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum)
 
 	dupx = dupy = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
 
-	dest = screens[0] + y*dupy*vid.width + x*dupx;
-	deststop = screens[0] + vid.rowbytes * vid.height;
+	dest = vid.screens[0] + y*dupy*vid.width + x*dupx;
+	deststop = vid.screens[0] + vid.rowbytes * vid.height;
 
 	// from V_DrawScaledPatch
 	if (vid.width != BASEVIDWIDTH * dupx)
@@ -1504,7 +1675,7 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum)
 void V_DrawPatchFill(patch_t *pat)
 {
 	INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
-	INT32 x, y, pw = SHORT(pat->width) * dupz, ph = SHORT(pat->height) * dupz;
+	INT32 x, y, pw = pat->width * dupz, ph = pat->height * dupz;
 
 	for (x = 0; x < vid.width; x += pw)
 	{
@@ -1513,11 +1684,56 @@ void V_DrawPatchFill(patch_t *pat)
 	}
 }
 
+// Draws a patch and tries to always fill the screen with the patch
+void V_DrawAdaptiveScaledFullScreenPatch(patch_t *patch)
+{
+	fixed_t x = 0, y = 0;
+	fixed_t scale = ((vid.width * FRACUNIT) / patch->width); // fit the screen horizontally
+	fixed_t scaled_height = FixedMul(patch->height << FRACBITS, scale);
+
+	// however, if this means the patch doesent fill out the screen vertically then
+	if (scaled_height < (vid.height << FRACBITS))
+	{
+		scale = ((vid.height * FRACUNIT) / patch->height); // scale it to fit the screen vertically
+		x = ((vid.width << FRACBITS) - FixedMul(patch->width << FRACBITS, scale)) / 2;
+	}
+	else
+		y = (vid.height << FRACBITS) - scaled_height;
+
+	V_DrawFixedPatch(x, y, scale, V_NOSCALEPATCH, patch, NULL);
+}
+
+// Draws a patch and scales it to fill out the screen vertically while remaining centered
+void V_DrawVerticallyScaledFullScreenPatch(patch_t *patch)
+{
+	fixed_t scale = ((vid.height * FRACUNIT) / patch->height);
+	fixed_t x = ((vid.width << FRACBITS) - FixedMul(patch->width << FRACBITS, scale)) / 2; // i fucking hate maths
+
+	V_DrawFixedPatch(x, 0, scale, V_NOSCALEPATCH, patch, NULL);
+}
+
+// Draws a patch and scales it to fill out the screen horizontally
+// centers the patch when its too small to fit the screen vertically
+void V_DrawHorizontallyScaledFullScreenPatch(patch_t *patch)
+{
+	fixed_t scale = ((vid.width * FRACUNIT) / patch->width);
+	fixed_t scaled_height = FixedMul(patch->height << FRACBITS, scale);
+	fixed_t y = (vid.height << FRACBITS) - scaled_height;
+
+	// center it if it does not fit the screen vertically
+	if (scaled_height < (vid.height << FRACBITS))
+	{
+		y /= 2;
+	}
+
+	V_DrawFixedPatch(0, y, scale, V_NOSCALEPATCH, patch, NULL);
+}
+
 void V_DrawVhsEffect(boolean rewind)
 {
 	static fixed_t upbary = 100*FRACUNIT, downbary = 150*FRACUNIT;
 
-	UINT8 *buf = screens[0], *tmp = screens[4];
+	UINT8 *buf = vid.screens[0], *tmp = vid.screens[4];
 	UINT16 y;
 	UINT32 x, pos = 0;
 
@@ -1577,7 +1793,7 @@ void V_DrawVhsEffect(boolean rewind)
 		if (y == 0 && offs < 0) offs = 0;
 		else if (y >= vid.height-2 && offs > 0) offs = 0;
 
-		for (x = pos+vid.rowbytes*2; pos < x; pos++)
+		for (x = min(pos+vid.rowbytes*2, vid.rowbytes*vid.height); pos < x; pos++)
 		{
 			tmp[pos] = thismapstart[buf[pos+offs]];
 #ifdef HQ_VHS
@@ -1608,21 +1824,19 @@ void V_DrawFadeScreen(UINT16 color, UINT8 strength)
     }
 #endif
 
-    {
-        const UINT8 *fadetable =
-			(color > 0xFFF0) // Grab a specific colormap palette?
-			? R_GetTranslationColormap(color | 0xFFFF0000, strength, GTC_CACHE)
-			: ((color & 0xFF00) // Color is not palette index?
-			? ((UINT8 *)colormaps + strength*256) // Do COLORMAP fade.
-			: ((UINT8 *)transtables + ((9-strength)<<FF_TRANSSHIFT) + color*256)); // Else, do TRANSMAP** fade.
-        const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
-        UINT8 *buf = screens[0];
+	const UINT8 *fadetable =
+		(color > 0xFFF0) // Grab a specific colormap palette?
+		? R_GetTranslationColormap(color | 0xFFFF0000, strength, GTC_CACHE)
+		: ((color & 0xFF00) // Color is not palette index?
+		? ((UINT8 *)colormaps + strength*256) // Do COLORMAP fade.
+		: ((UINT8 *)transtables + ((9-strength)<<FF_TRANSSHIFT) + color*256)); // Else, do TRANSMAP** fade.
+	const UINT8 *deststop = vid.screens[0] + vid.rowbytes * vid.height;
+	UINT8 *buf = vid.screens[0];
 
-        // heavily simplified -- we don't need to know x or y
-        // position when we're doing a full screen fade
-        for (; buf < deststop; ++buf)
-            *buf = fadetable[*buf];
-    }
+	// heavily simplified -- we don't need to know x or y
+	// position when we're doing a full screen fade
+	for (; buf < deststop; ++buf)
+		*buf = fadetable[*buf];
 }
 
 // Simple translucency with one color, over a set number of lines starting from the top.
@@ -1641,8 +1855,8 @@ void V_DrawFadeConsBack(INT32 plines)
 
 	// heavily simplified -- we don't need to know x or y position,
 	// just the stop position
-	deststop = screens[0] + vid.rowbytes * min(plines, vid.height);
-	for (buf = screens[0]; buf < deststop; ++buf)
+	deststop = vid.screens[0] + vid.rowbytes * min(plines, vid.height);
+	for (buf = vid.screens[0]; buf < deststop; ++buf)
 		*buf = consolebgmap[*buf];
 }
 
@@ -1707,10 +1921,11 @@ void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed)
 		c -= HU_FONTSTART;
 	else
 		c = toupper(c) - HU_FONTSTART;
+
 	if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 		return;
 
-	w = SHORT(hu_font[c]->width);
+	w = hu_font[c]->width;
 	if (x + w > vid.width)
 		return;
 
@@ -1737,7 +1952,7 @@ void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed, UI
 	if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 		return;
 
-	w = SHORT(hu_font[c]->width)/2;
+	w = hu_font[c]->width/2;
 	if (x + w > vid.width)
 		return;
 
@@ -1903,10 +2118,10 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
 		if (charwidth)
 		{
 			w = charwidth * dupx;
-			center = w/2 - SHORT(hu_font[c]->width)*dupx/2;
+			center = w/2 - hu_font[c]->width*dupx/2;
 		}
 		else
-			w = SHORT(hu_font[c]->width) * dupx;
+			w = hu_font[c]->width * dupx;
 
 		if (cx > scrwidth)
 			break;
@@ -2005,10 +2220,10 @@ void V_DrawKartString(INT32 x, INT32 y, INT32 option, const char *string)
 		if (charwidth)
 		{
 			w = charwidth * dupx;
-			center = w/2 - SHORT(kart_font[c]->width)*dupx/2;
+			center = w/2 - kart_font[c]->width*dupx/2;
 		}
 		else
-			w = SHORT(kart_font[c]->width) * dupx;
+			w = kart_font[c]->width * dupx;
 
 		if (cx > scrwidth)
 			break;
@@ -2123,10 +2338,10 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
 		if (charwidth)
 		{
 			w = charwidth * dupx;
-			center = w/2 - SHORT(hu_font[c]->width)*dupx/4;
+			center = w/2 - hu_font[c]->width*dupx/4;
 		}
 		else
-			w = SHORT(hu_font[c]->width) * dupx / 2;
+			w = hu_font[c]->width * dupx / 2;
 		if (cx > scrwidth)
 			break;
 		if (cx+left + w < 0) //left boundary check
@@ -2240,8 +2455,8 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
 		if (charwidth)
 			w = charwidth * dupx;
 		else
-			w = ((option & V_6WIDTHSPACE ? max(1, SHORT(tny_font[c]->width)-1) // Reuse this flag for the alternate bunched-up spacing
-				: SHORT(tny_font[c]->width)) * dupx);
+			w = ((option & V_6WIDTHSPACE ? max(1, tny_font[c]->width-1) // Reuse this flag for the alternate bunched-up spacing
+				: tny_font[c]->width) * dupx);
 
 		if (cx > scrwidth)
 			break;
@@ -2341,10 +2556,10 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
 		if (charwidth)
 		{
 			w = charwidth * dupx;
-			center = w/2 - SHORT(hu_font[c]->width)*(dupx/2);
+			center = w/2 - hu_font[c]->width*(dupx/2);
 		}
 		else
-			w = SHORT(hu_font[c]->width) * dupx;
+			w = hu_font[c]->width * dupx;
 
 		if ((cx>>FRACBITS) > scrwidth)
 			break;
@@ -2494,7 +2709,7 @@ void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *str
 		default:
 			break;
 	}
-	
+
 	charflags = (option & V_CHARCOLORMASK);
 	colormap = V_GetStringColormap(charflags);
 
@@ -2539,10 +2754,10 @@ void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *str
 		if (charwidth)
 		{
 			w = charwidth * dupx;
-			center = w/2 - SHORT(tny_font[c]->width)*(dupx/2);
+			center = w/2 - tny_font[c]->width*(dupx/2);
 		}
 		else
-			w = SHORT(tny_font[c]->width) * dupx;
+			w = tny_font[c]->width * dupx;
 
 		if ((cx>>FRACBITS) > scrwidth)
 			break;
@@ -2562,7 +2777,7 @@ void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *str
 // Draws a tallnum.  Replaces two functions in y_inter and st_stuff
 void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num)
 {
-	INT32 w = SHORT(tallnum[0]->width);
+	INT32 w = tallnum[0]->width;
 	boolean neg;
 
 	if (flags & V_NOSCALESTART)
@@ -2588,7 +2803,7 @@ void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num)
 // Does not handle negative numbers in a special way, don't try to feed it any.
 void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits)
 {
-	INT32 w = SHORT(tallnum[0]->width);
+	INT32 w = tallnum[0]->width;
 
 	if (flags & V_NOSCALESTART)
 		w *= vid.dupx;
@@ -2609,7 +2824,7 @@ void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits)
 // Does not handle negative numbers in a special way, don't try to feed it any.
 void V_DrawPaddedTallColorNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits, const UINT8 *colormap)
 {
-	INT32 w = SHORT(tallnum[0]->width);
+	INT32 w = tallnum[0]->width;
 
 	if (flags & V_NOSCALESTART)
 		w *= vid.dupx;
@@ -2631,7 +2846,7 @@ void V_DrawPaddedTallColorNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 di
 
 INT32 V_DrawPingNum(INT32 x, INT32 y, INT32 flags, INT32 num, const UINT8 *colormap)
 {
-	INT32 w = SHORT(pingnum[0]->width);	// this SHOULD always be 5 but I guess custom graphics exist.
+	INT32 w = pingnum[0]->width;	// this SHOULD always be 5 but I guess custom graphics exist.
 
 	if (flags & V_NOSCALESTART)
 		w *= vid.dupx;
@@ -2654,7 +2869,7 @@ INT32 V_DrawPingNum(INT32 x, INT32 y, INT32 flags, INT32 num, const UINT8 *color
 //
 void V_DrawRankNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits, const UINT8 *colormap)
 {
-	INT32 w = SHORT(ranknum[0]->width) - 1;
+	INT32 w = ranknum[0]->width - 1;
 
 	if (flags & V_NOSCALESTART)
 		w *= vid.dupx;
@@ -2713,7 +2928,7 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string)
 			continue;
 		}
 
-		w = SHORT(cred_font[c]->width) * dupx;
+		w = cred_font[c]->width * dupx;
 		if ((cx>>FRACBITS) > scrwidth)
 			break;
 
@@ -2739,7 +2954,7 @@ INT32 V_CreditStringWidth(const char *string)
 		if (c < 0 || c >= CRED_FONTSIZE)
 			w += 16;
 		else
-			w += SHORT(cred_font[c]->width);
+			w += cred_font[c]->width;
 	}
 
 	return w;
@@ -2786,7 +3001,7 @@ void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string)
 			continue;
 		}
 
-		w = SHORT(lt_font[c]->width) * dupx;
+		w = lt_font[c]->width * dupx;
 		if (cx > scrwidth)
 			break;
 		if (cx+left + w < 0) //left boundary check
@@ -2813,7 +3028,7 @@ INT32 V_LevelNameWidth(const char *string)
 		if (c < 0 || c >= LT_FONTSIZE || !lt_font[c])
 			w += 12;
 		else
-			w += SHORT(lt_font[c]->width);
+			w += lt_font[c]->width;
 	}
 
 	return w;
@@ -2832,8 +3047,8 @@ INT32 V_LevelNameHeight(const char *string)
 		if (c < 0 || c >= LT_FONTSIZE || !lt_font[c])
 			continue;
 
-		if (SHORT(lt_font[c]->height) > w)
-			w = SHORT(lt_font[c]->height);
+		if (lt_font[c]->height > w)
+			w = lt_font[c]->height;
 	}
 
 	return w;
@@ -2842,11 +3057,14 @@ INT32 V_LevelNameHeight(const char *string)
 //
 // Find string width from hu_font chars
 //
-INT32 V_StringWidth(const char *string, INT32 option)
+INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option)
 {
 	INT32 c, w = 0;
 	INT32 spacewidth = 4, charwidth = 0;
-	size_t i;
+	ssize_t i;
+
+	if (length < 0)
+		length = strlen(string);
 
 	switch (option & V_SPACINGMASK)
 	{
@@ -2862,7 +3080,7 @@ INT32 V_StringWidth(const char *string, INT32 option)
 			break;
 	}
 
-	for (i = 0; i < strlen(string); i++)
+	for (i = 0; string[i] && i < length; i++)
 	{
 		c = string[i];
 		if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
@@ -2872,7 +3090,7 @@ INT32 V_StringWidth(const char *string, INT32 option)
 		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 			w += spacewidth;
 		else
-			w += (charwidth ? charwidth : SHORT(hu_font[c]->width));
+			w += (charwidth ? charwidth : hu_font[c]->width);
 	}
 
 	return w;
@@ -2881,11 +3099,14 @@ INT32 V_StringWidth(const char *string, INT32 option)
 //
 // Find string width from hu_font chars, 0.5x scale
 //
-INT32 V_SmallStringWidth(const char *string, INT32 option)
+INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option)
 {
 	INT32 c, w = 0;
 	INT32 spacewidth = 2, charwidth = 0;
-	size_t i;
+	ssize_t i;
+
+	if (length < 0)
+		length = strlen(string);
 
 	switch (option & V_SPACINGMASK)
 	{
@@ -2901,7 +3122,7 @@ INT32 V_SmallStringWidth(const char *string, INT32 option)
 			break;
 	}
 
-	for (i = 0; i < strlen(string); i++)
+	for (i = 0; string[i] && i < length; i++)
 	{
 		c = string[i];
 		if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
@@ -2911,7 +3132,7 @@ INT32 V_SmallStringWidth(const char *string, INT32 option)
 		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
 			w += spacewidth;
 		else
-			w += (charwidth ? charwidth : SHORT(hu_font[c]->width)/2);
+			w += (charwidth ? charwidth : hu_font[c]->width/2);
 	}
 
 	return w;
@@ -2920,12 +3141,15 @@ INT32 V_SmallStringWidth(const char *string, INT32 option)
 //
 // Find string width from tny_font chars
 //
-INT32 V_ThinStringWidth(const char *string, INT32 option)
+INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option)
 {
 	INT32 c, w = 0;
 	INT32 spacewidth = 2, charwidth = 0;
 	boolean lowercase = (option & V_ALLOWLOWERCASE);
-	size_t i;
+	ssize_t i;
+
+	if (length < 0)
+		length = strlen(string);
 
 	switch (option & V_SPACINGMASK)
 	{
@@ -2942,7 +3166,7 @@ INT32 V_ThinStringWidth(const char *string, INT32 option)
 			break;
 	}
 
-	for (i = 0; i < strlen(string); i++)
+	for (i = 0; string[i] && i < length; i++)
 	{
 		c = string[i];
 		if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
@@ -2960,8 +3184,8 @@ INT32 V_ThinStringWidth(const char *string, INT32 option)
 		else
 		{
 			w += (charwidth ? charwidth
-				: ((option & V_6WIDTHSPACE && i < strlen(string)-1) ? max(1, SHORT(tny_font[c]->width)-1) // Reuse this flag for the alternate bunched-up spacing
-				: SHORT(tny_font[c]->width)));
+				: ((option & V_6WIDTHSPACE && i < length-1) ? max(1, tny_font[c]->width-1) // Reuse this flag for the alternate bunched-up spacing
+				: tny_font[c]->width));
 		}
 	}
 
@@ -2969,6 +3193,45 @@ INT32 V_ThinStringWidth(const char *string, INT32 option)
 	return w;
 }
 
+//
+// Find maximum length for substring taken from current string to fit into given width
+//
+INT32 V_SubStringLengthToFit(const char *string, INT32 width, INT32 option)
+{
+	INT32 c, w = 0;
+	INT32 spacewidth = 4, charwidth = 0;
+	INT32 i;
+
+	switch (option & V_SPACINGMASK)
+	{
+		case V_MONOSPACE:
+			spacewidth = 8;
+			/* FALLTHRU */
+		case V_OLDSPACING:
+			charwidth = 8;
+			break;
+		case V_6WIDTHSPACE:
+			spacewidth = 6;
+		default:
+			break;
+	}
+
+	for (i = 0; string[i] && w < width; i++)
+	{
+		c = string[i];
+		if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
+			continue;
+
+		c = toupper(c) - HU_FONTSTART;
+		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
+			w += spacewidth;
+		else
+			w += (charwidth ? charwidth : hu_font[c]->width);
+	}
+
+	return max(i-1, 0);
+}
+
 char V_GetSkincolorChar(INT32 color)
 {
 	char cstart = 0x80;
@@ -3130,6 +3393,132 @@ char V_GetSkincolorChar(INT32 color)
 	return cstart;
 }
 
+INT32 V_SkinColorToHighlightcolor(skincolors_t color)
+{
+	switch (color)
+	{
+		case SKINCOLOR_WHITE:
+		case SKINCOLOR_SILVER:
+		case SKINCOLOR_SLATE:
+			return V_STEELMAP;
+		case SKINCOLOR_GREY:
+		case SKINCOLOR_NICKEL:
+		case SKINCOLOR_BLACK:
+		case SKINCOLOR_SKUNK:
+		case SKINCOLOR_JET:
+			return V_GRAYMAP;
+		case SKINCOLOR_SEPIA:
+		case SKINCOLOR_BEIGE:
+		case SKINCOLOR_WALNUT:
+		case SKINCOLOR_BROWN:
+		case SKINCOLOR_LEATHER:
+		case SKINCOLOR_RUST:
+		case SKINCOLOR_WRISTWATCH:
+			return V_BROWNMAP;
+		case SKINCOLOR_FAIRY:
+		case SKINCOLOR_SALMON:
+		case SKINCOLOR_PINK:
+		case SKINCOLOR_ROSE:
+		case SKINCOLOR_BRICK:
+		case SKINCOLOR_LEMONADE:
+		case SKINCOLOR_BUBBLEGUM:
+		case SKINCOLOR_LILAC:
+			return V_PINKMAP;
+		case SKINCOLOR_CINNAMON:
+		case SKINCOLOR_RUBY:
+		case SKINCOLOR_RASPBERRY:
+		case SKINCOLOR_CHERRY:
+		case SKINCOLOR_RED:
+		case SKINCOLOR_CRIMSON:
+		case SKINCOLOR_MAROON:
+		case SKINCOLOR_FLAME:
+		case SKINCOLOR_SCARLET:
+		case SKINCOLOR_KETCHUP:
+			return V_REDMAP;
+		case SKINCOLOR_DAWN:
+		case SKINCOLOR_SUNSET:
+		case SKINCOLOR_CREAMSICLE:
+		case SKINCOLOR_ORANGE:
+		case SKINCOLOR_PUMPKIN:
+		case SKINCOLOR_ROSEWOOD:
+		case SKINCOLOR_BURGUNDY:
+		case SKINCOLOR_TANGERINE:
+			return V_ORANGEMAP;
+		case SKINCOLOR_PEACH:
+		case SKINCOLOR_CARAMEL:
+		case SKINCOLOR_CREAM:
+			return V_PEACHMAP;
+		case SKINCOLOR_GOLD:
+		case SKINCOLOR_ROYAL:
+		case SKINCOLOR_BRONZE:
+		case SKINCOLOR_COPPER:
+		case SKINCOLOR_THUNDER:
+			return V_GOLDMAP;
+		case SKINCOLOR_POPCORN:
+		case SKINCOLOR_QUARRY:
+		case SKINCOLOR_YELLOW:
+		case SKINCOLOR_MUSTARD:
+		case SKINCOLOR_CROCODILE:
+		case SKINCOLOR_OLIVE:
+			return V_YELLOWMAP;
+		case SKINCOLOR_ARTICHOKE:
+		case SKINCOLOR_VOMIT:
+		case SKINCOLOR_GARDEN:
+		case SKINCOLOR_TEA:
+		case SKINCOLOR_PISTACHIO:
+			return V_TEAMAP;
+		case SKINCOLOR_LIME:
+		case SKINCOLOR_HANDHELD:
+		case SKINCOLOR_MOSS:
+		case SKINCOLOR_CAMOUFLAGE:
+		case SKINCOLOR_ROBOHOOD:
+		case SKINCOLOR_MINT:
+		case SKINCOLOR_GREEN:
+		case SKINCOLOR_PINETREE:
+		case SKINCOLOR_EMERALD:
+		case SKINCOLOR_SWAMP:
+		case SKINCOLOR_DREAM:
+		case SKINCOLOR_PLAGUE:
+		case SKINCOLOR_ALGAE:
+			return V_GREENMAP;
+		case SKINCOLOR_CARIBBEAN:
+		case SKINCOLOR_AZURE:
+		case SKINCOLOR_AQUA:
+		case SKINCOLOR_TEAL:
+		case SKINCOLOR_CYAN:
+		case SKINCOLOR_JAWZ:
+		case SKINCOLOR_CERULEAN:
+		case SKINCOLOR_NAVY:
+		case SKINCOLOR_SAPPHIRE:
+			return V_SKYMAP;
+		case SKINCOLOR_PIGEON:
+		case SKINCOLOR_PLATINUM:
+		case SKINCOLOR_STEEL:
+			return V_STEELMAP;
+		case SKINCOLOR_PERIWINKLE:
+		case SKINCOLOR_BLUE:
+		case SKINCOLOR_BLUEBERRY:
+		case SKINCOLOR_NOVA:
+			return V_BLUEMAP;
+		case SKINCOLOR_ULTRAVIOLET:
+		case SKINCOLOR_PURPLE:
+		case SKINCOLOR_FUCHSIA:
+			return V_PURPLEMAP;
+		case SKINCOLOR_PASTEL:
+		case SKINCOLOR_MOONSLAM:
+		case SKINCOLOR_DUSK:
+		case SKINCOLOR_TOXIC:
+		case SKINCOLOR_MAUVE:
+		case SKINCOLOR_LAVENDER:
+		case SKINCOLOR_BYZANTIUM:
+		case SKINCOLOR_POMEGRANATE:
+			return V_LAVENDERMAP;
+
+		default:
+			return 0;
+	}
+}
+
 boolean *heatshifter = NULL;
 INT32 lastheight = 0;
 INT32 heatindex[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0};
@@ -3139,8 +3528,8 @@ INT32 heatindex[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0};
 //
 // Perform a particular image postprocessing function.
 //
-#include "p_local.h"
-void V_DoPostProcessor(INT32 view, postimg_t type, INT32 param)
+
+void V_DoPostProcessor(INT32 view, INT32 param)
 {
 #if NUMSCREENS < 5
 	// do not enable image post processing for ARM, SH and MIPS CPUs
@@ -3148,6 +3537,7 @@ void V_DoPostProcessor(INT32 view, postimg_t type, INT32 param)
 	(void)type;
 	(void)param;
 #else
+	(void)param; // unused motion blur stuff
 	INT32 yoffset, xoffset;
 
 #ifdef HWRENDER
@@ -3158,6 +3548,11 @@ void V_DoPostProcessor(INT32 view, postimg_t type, INT32 param)
 	if (view < 0 || view > 3 || view > splitscreen)
 		return;
 
+	camera_t *thiscam = &camera[view];
+
+	if (!thiscam->postimg)
+		return;
+
 	if ((view == 1 && splitscreen == 1) || view >= 2)
 		yoffset = viewheight;
 	else
@@ -3168,10 +3563,11 @@ void V_DoPostProcessor(INT32 view, postimg_t type, INT32 param)
 	else
 		xoffset = 0;
 
-	if (type == postimg_water)
+	UINT8 *tmpscr = vid.screens[4];
+	UINT8 *srcscr = vid.screens[0];
+
+	if (thiscam->postimg & POSTIMG_WATER)
 	{
-		UINT8 *tmpscr = screens[4];
-		UINT8 *srcscr = screens[0];
 		INT32 y;
 		// Set disStart to a range from 0 to FINEANGLE, incrementing by 128 per tic
 		angle_t disStart = (((leveltime-1)*128) + (rendertimefrac / (FRACUNIT/128))) & FINEMASK;
@@ -3207,62 +3603,30 @@ void V_DoPostProcessor(INT32 view, postimg_t type, INT32 param)
 				}
 			}
 
-/*
-Unoptimized version
-			for (x = 0; x < vid.width*vid.bpp; x++)
-			{
-				newpix = (x + sine);
+			/*
+			 Unoptimized version
+			 for (x = 0; x < vid.width; x++)
+			 {
+			 	newpix = (x + sine);
 
-				if (newpix < 0)
-					newpix = 0;
-				else if (newpix >= vid.width)
-					newpix = vid.width-1;
+			 	if (newpix < 0)
+			 		newpix = 0;
+			 	else if (newpix >= vid.width)
+			 		newpix = vid.width-1;
+
+			 	tmpscr[y*vid.width + x] = srcscr[y*vid.width+newpix]; // *(transme + (srcscr[y*vid.width+x]<<8) + srcscr[y*vid.width+newpix]);
+			 }*/
 
-				tmpscr[y*vid.width + x] = srcscr[y*vid.width+newpix]; // *(transme + (srcscr[y*vid.width+x]<<8) + srcscr[y*vid.width+newpix]);
-			}*/
 			disStart += 22;//the offset into the displacement map, increment each game loop
 			disStart &= FINEMASK; //clip it to FINEMASK
 		}
 
-		VID_BlitLinearScreen(tmpscr+vid.width*vid.bpp*yoffset+xoffset, screens[0]+vid.width*vid.bpp*yoffset+xoffset,
-				viewwidth*vid.bpp, viewheight, vid.width*vid.bpp, vid.width);
+		UINT8 *tmp = tmpscr;
+		tmpscr = srcscr;
+		srcscr = tmp;
 	}
-	else if (type == postimg_motion) // Motion Blur!
+	else if (thiscam->postimg & POSTIMG_HEAT) // Heat wave
 	{
-		UINT8 *tmpscr = screens[4];
-		UINT8 *srcscr = screens[0];
-		INT32 x, y;
-
-		// TODO: Add a postimg_param so that we can pick the translucency level...
-		UINT8 *transme = transtables + ((param-1)<<FF_TRANSSHIFT);
-
-		for (y = yoffset; y < yoffset+viewheight; y++)
-		{
-			for (x = xoffset; x < xoffset+viewwidth; x++)
-			{
-				tmpscr[y*vid.width + x]
-					=     colormaps[*(transme     + (srcscr   [(y*vid.width)+x ] <<8) + (tmpscr[(y*vid.width)+x]))];
-			}
-		}
-		VID_BlitLinearScreen(tmpscr+vid.width*vid.bpp*yoffset+xoffset, screens[0]+vid.width*vid.bpp*yoffset+xoffset,
-				viewwidth*vid.bpp, viewheight, vid.width*vid.bpp, vid.width);
-	}
-	else if (type == postimg_flip) // Flip the screen upside-down
-	{
-		UINT8 *tmpscr = screens[4];
-		UINT8 *srcscr = screens[0];
-		INT32 y, y2;
-
-		for (y = yoffset, y2 = yoffset+viewheight - 1; y < yoffset+viewheight; y++, y2--)
-			M_Memcpy(&tmpscr[(y2*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
-
-		VID_BlitLinearScreen(tmpscr+vid.width*vid.bpp*yoffset+xoffset, screens[0]+vid.width*vid.bpp*yoffset+xoffset,
-				viewwidth*vid.bpp, viewheight, vid.width*vid.bpp, vid.width);
-	}
-	else if (type == postimg_heat) // Heat wave
-	{
-		UINT8 *tmpscr = screens[4];
-		UINT8 *srcscr = screens[0];
 		INT32 y;
 
 		// Make sure table is built
@@ -3303,63 +3667,111 @@ Unoptimized version
 			heatindex[view] %= vid.height;
 		}
 
-		VID_BlitLinearScreen(tmpscr+vid.width*vid.bpp*yoffset+xoffset, screens[0]+vid.width*vid.bpp*yoffset+xoffset,
-				viewwidth*vid.bpp, viewheight, vid.width*vid.bpp, vid.width);
+		UINT8 *tmp = tmpscr;
+		tmpscr = srcscr;
+		srcscr = tmp;
 	}
-	else if (type == postimg_mirror) // Flip the screen on the x axis
+
+	/*if (thiscam->postimg & POSTIMG_MOTION) // Motion Blur!
 	{
-		UINT8 *tmpscr = screens[4];
-		UINT8 *srcscr = screens[0];
-		INT32 y, x, x2;
+		INT32 x, y;
+
+		// TODO: Add a postimg_param so that we can pick the translucency level...
+		UINT8 *transme = transtables + ((param-1)<<FF_TRANSSHIFT);
 
 		for (y = yoffset; y < yoffset+viewheight; y++)
 		{
-			for (x = xoffset, x2 = xoffset+((viewwidth*vid.bpp)-1); x < xoffset+(viewwidth*vid.bpp); x++, x2--)
-				tmpscr[y*vid.width + x2] = srcscr[y*vid.width + x];
+			for (x = xoffset; x < xoffset+viewwidth; x++)
+				tmpscr[y*vid.width + x] =     colormaps[*(transme     + (srcscr   [(y*vid.width)+x ] <<8) + (tmpscr[(y*vid.width)+x]))];
 		}
+	}*/
 
-		VID_BlitLinearScreen(tmpscr+vid.width*vid.bpp*yoffset+xoffset, screens[0]+vid.width*vid.bpp*yoffset+xoffset,
-				viewwidth*vid.bpp, viewheight, vid.width*vid.bpp, vid.width);
+	if ((thiscam->postimg & POSTIMG_FLIP) && !(thiscam->postimg & POSTIMG_MIRROR)) // Flip the screen upside-down
+	{
+		INT32 y, y2;
+
+		for (y = yoffset, y2 = yoffset+viewheight - 1; y < yoffset+viewheight; y++, y2--)
+			M_Memcpy(&tmpscr[(y2*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
+
+		UINT8 *tmp = tmpscr;
+		tmpscr = srcscr;
+		srcscr = tmp;
 	}
-	else if (type == postimg_mirrorflip) // Flip the screen upside-down and on the x axis
+	else if ((thiscam->postimg & POSTIMG_MIRROR) && !(thiscam->postimg & POSTIMG_FLIP)) // Flip the screen on the x axis
+	{
+		INT32 y, x, x2;
+
+		for (y = yoffset; y < yoffset+viewheight; y++)
+			for (x = xoffset, x2 = xoffset+(viewwidth-1); x < xoffset+viewwidth; x++, x2--)
+				tmpscr[y*vid.width + x2] = srcscr[y*vid.width + x];
+
+		UINT8 *tmp = tmpscr;
+		tmpscr = srcscr;
+		srcscr = tmp;
+	}
+	else if ((thiscam->postimg & POSTIMG_MIRROR) && (thiscam->postimg & POSTIMG_FLIP)) // Flip the screen upside-down and on the x axis
 	{
-		UINT8 *tmpscr = screens[4];
-		UINT8 *srcscr = screens[0];
 		INT32 y, x;
 
 		for (y = yoffset; y < yoffset + viewheight; y++)
 			for (x = xoffset; x < xoffset + viewwidth; x++)
 				tmpscr[((yoffset + viewheight - 1 - y) * vid.width) + xoffset + viewwidth - (x - xoffset) - 1] = srcscr[(y * vid.width) + x];
 
-		VID_BlitLinearScreen(tmpscr+vid.width*vid.bpp*yoffset+xoffset, screens[0]+vid.width*vid.bpp*yoffset+xoffset,
-				viewwidth*vid.bpp, viewheight, vid.width*vid.bpp, vid.width);
+		UINT8 *tmp = tmpscr;
+		tmpscr = srcscr;
+		srcscr = tmp;
 	}
+
+	VID_BlitLinearScreen(srcscr+vid.width*yoffset+xoffset, tmpscr+vid.width*yoffset+xoffset,
+						 viewwidth, viewheight, vid.width, vid.width);
 #endif
 }
 
-// Taken from my videos-in-SRB2 project
-// Generates a color look-up table
-// which has up to 64 colors at each channel
-// (see the defines in v_video.h)
-
-UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
-
-void InitColorLUT(void)
+// Generates a RGB565 color look-up table
+void InitColorLUT(colorlookup_t *lut, RGBA_t *palette, boolean makecolors)
 {
-	UINT8 r, g, b;
-	static boolean clutinit = false;
-	static RGBA_t *lastpalette = NULL;
-	if ((!clutinit) || (lastpalette != pLocalPalette))
+	size_t palsize = (sizeof(RGBA_t) * 256);
+
+	if (!lut->init || memcmp(lut->palette, palette, palsize))
 	{
-		for (r = 0; r < CLUTSIZE; r++)
-			for (g = 0; g < CLUTSIZE; g++)
-				for (b = 0; b < CLUTSIZE; b++)
-					colorlookup[r][g][b] = NearestColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS);
-		clutinit = true;
-		lastpalette = pLocalPalette;
+		INT32 i;
+
+		lut->init = true;
+		memcpy(lut->palette, palette, palsize);
+
+		for (i = 0; i < 0xFFFF; i++)
+			lut->table[i] = 0xFFFF;
+
+		if (makecolors)
+		{
+			UINT8 r, g, b;
+
+			for (r = 0; r < 0xFF; r++)
+			for (g = 0; g < 0xFF; g++)
+			for (b = 0; b < 0xFF; b++)
+			{
+				i = CLUTINDEX(r, g, b);
+				if (lut->table[i] == 0xFFFF)
+					lut->table[i] = NearestPaletteColor(r, g, b, palette);
+			}
+		}
 	}
 }
 
+UINT8 GetColorLUT(colorlookup_t *lut, UINT8 r, UINT8 g, UINT8 b)
+{
+	INT32 i = CLUTINDEX(r, g, b);
+	if (lut->table[i] == 0xFFFF)
+		lut->table[i] = NearestPaletteColor(r, g, b, lut->palette);
+	return lut->table[i];
+}
+
+UINT8 GetColorLUTDirect(colorlookup_t *lut, UINT8 r, UINT8 g, UINT8 b)
+{
+	INT32 i = CLUTINDEX(r, g, b);
+	return lut->table[i];
+}
+
 // V_Init
 // old software stuff, buffers are allocated at video mode setup
 // here we set the screens[x] pointers accordingly
@@ -3370,21 +3782,16 @@ void V_Init(void)
 	UINT8 *base = vid.buffer;
 	const INT32 screensize = vid.rowbytes * vid.height;
 
-	LoadMapPalette();
-
 	for (i = 0; i < NUMSCREENS; i++)
-		screens[i] = NULL;
+		vid.screens[i] = NULL;
 
 	// start address of NUMSCREENS * width*height vidbuffers
 	if (base)
 	{
 		for (i = 0; i < NUMSCREENS; i++)
-			screens[i] = base + i*screensize;
+			vid.screens[i] = base + i*screensize;
 	}
 
-	if (vid.direct)
-		screens[0] = vid.direct;
-
 #ifdef DEBUG
 	CONS_Debug(DBG_RENDER, "V_Init done:\n");
 	for (i = 0; i < NUMSCREENS; i++)
diff --git a/src/v_video.h b/src/v_video.h
index 77f628efb..d5a4adf5e 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -14,46 +14,53 @@
 #ifndef __V_VIDEO__
 #define __V_VIDEO__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "doomdef.h"
 #include "doomtype.h"
 #include "r_defs.h"
+#include "r_main.h"
 
 //
 // VIDEO
 //
 
-// Screen 0 is the screen updated by I_Update screen.
-// Screen 1 is an extra buffer.
-
-extern UINT8 *screens[5];
-
-extern consvar_t cv_ticrate, cv_accuratefps, cv_allcaps, cv_constextsize, cv_menucaps,\
-cv_globalgamma, cv_globalsaturation,\
-cv_rhue, cv_yhue, cv_ghue, cv_chue, cv_bhue, cv_mhue,\
-cv_rgamma, cv_ygamma, cv_ggamma, cv_cgamma, cv_bgamma, cv_mgamma, \
-cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation, cv_msaturation;
-
+extern consvar_t cv_ticrate, cv_accuratefps, cv_allcaps, cv_constextsize, cv_menucaps,
+cv_globalgamma, cv_globalsaturation,
+cv_rhue, cv_yhue, cv_ghue, cv_chue, cv_bhue, cv_mhue,
+cv_rgamma, cv_ygamma, cv_ggamma, cv_cgamma, cv_bgamma, cv_mgamma,
+cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation, cv_msaturation,
+cv_palette, cv_palettenum;
 
 // Allocates buffer screens, call before R_Init.
 void V_Init(void);
 
-// Taken from my videos-in-SRB2 project
-// Generates a color look-up table
-// which has up to 64 colors at each channel
+// Color look-up table
+#define CLUTINDEX(r, g, b) (((r) >> 3) << 11) | (((g) >> 2) << 5) | ((b) >> 3)
 
-#define COLORBITS 6
-#define SHIFTCOLORBITS (8-COLORBITS)
-#define CLUTSIZE (1<<COLORBITS)
+typedef struct
+{
+	boolean init;
+	RGBA_t palette[256];
+	UINT16 table[0x10000];
+} colorlookup_t;
 
-extern UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
+void InitColorLUT(colorlookup_t *lut, RGBA_t *palette, boolean makecolors);
+UINT8 GetColorLUT(colorlookup_t *lut, UINT8 r, UINT8 g, UINT8 b);
+UINT8 GetColorLUTDirect(colorlookup_t *lut, UINT8 r, UINT8 g, UINT8 b);
 
-void InitColorLUT(void);
+// Loads the correct palette into memory
+void V_ReloadPalette(void);
 
 // Set the current RGB palette lookup to use for palettized graphics
 void V_SetPalette(INT32 palettenum);
 
 void V_SetPaletteLump(const char *pal);
 
+void V_ResetPaletteCVars(void);
+
 const char *R_GetPalname(UINT16 num);
 const char *GetPalette(void);
 
@@ -61,8 +68,6 @@ extern RGBA_t *pLocalPalette;
 
 extern UINT8 hudtrans;
 
-extern INT32 V_LocalTransFlag(void);
-
 void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
 
 // Retrieve the ARGB value from a palette color index
@@ -139,6 +144,17 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
 #define V_SPLITSCREEN        0x40000000
 #define V_HORZSCREEN         0x80000000
 
+// blendmodes are separated into their own category so as to allow older visflags to coexist
+// use bits 21-23 for blendmodes
+#define V_BLENDSHIFT         20
+#define V_BLENDMASK          0x00700000
+// preshifted blend flags minus 1 as effects don't distinguish between AST_COPY and AST_TRANSLUCENT
+#define B_ADD                ((AST_ADD-1)<<V_BLENDSHIFT) // Additive
+#define B_SUBTRACT           ((AST_SUBTRACT-1)<<V_BLENDSHIFT) // Subtractive
+#define B_REVERSESUBTRACT    ((AST_REVERSESUBTRACT-1)<<V_BLENDSHIFT) // Reverse subtractive
+#define B_MODULATE           ((AST_MODULATE-1)<<V_BLENDSHIFT) // Modulate
+
+
 // defines for old functions
 #define V_DrawPatch(x,y,s,p) V_DrawFixedPatch((x)<<FRACBITS, (y)<<FRACBITS, FRACUNIT, s|V_NOSCALESTART|V_NOSCALEPATCH, p, NULL)
 #define V_DrawTranslucentMappedPatch(x,y,s,p,c) V_DrawFixedPatch((x)<<FRACBITS, (y)<<FRACBITS, FRACUNIT, s, p, c)
@@ -154,8 +170,9 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
 #define V_DrawSmallTranslucentPatch(x,y,s,p) V_DrawFixedPatch((x)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/2, s, p, NULL)
 #define V_DrawTinyTranslucentPatch(x,y,s,p) V_DrawFixedPatch((x)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/4, s, p, NULL)
 #define V_DrawSciencePatch(x,y,s,p,sc) V_DrawFixedPatch(x,y,sc,s,p,NULL)
-#define V_DrawFixedPatch(x,y,sc,s,p,c) V_DrawStretchyFixedPatch(x,y,sc,sc,s,p,c)
-void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap);
+#define V_DrawFixedPatch(x,y,sc,s,p,c) V_DrawStretchyFixedPatch(x,y,sc,sc,s,p,c,0)
+#define V_DrawBlendingFixedPatch(x,y,sc,s,p,c,b) V_DrawStretchyFixedPatch(x,y,sc,sc,s,p,c,b)
+void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap, INT32 bflags);
 void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_t *patch, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
 
 void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT8 skincolor);
@@ -179,6 +196,9 @@ void V_DrawFadeScreen(UINT16 color, UINT8 strength);
 
 void V_DrawFadeConsBack(INT32 plines);
 
+// allow menu text to be displayed in lowercase
+#define MENUCAPS (!cv_menucaps.value ? V_ALLOWLOWERCASE : 0)
+
 // draw a single character
 void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed);
 // draw a single character, but for the chat
@@ -234,19 +254,43 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string);
 INT32 V_CreditStringWidth(const char *string);
 
 // Find string width from hu_font chars
-INT32 V_StringWidth(const char *string, INT32 option);
+INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option);
+#define V_StringWidth(string, option) V_SubStringWidth(string, -1, option)
 // Find string width from hu_font chars, 0.5x scale
-INT32 V_SmallStringWidth(const char *string, INT32 option);
+INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option);
+#define V_SmallStringWidth(string, option) V_SmallSubStringWidth(string, -1, option)
 // Find string width from tny_font chars
-INT32 V_ThinStringWidth(const char *string, INT32 option);
+INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option);
+#define V_ThinStringWidth(string, option) V_ThinSubStringWidth(string, -1, option)
+
+// Find maximum length for substring taken from current string to fit into given width
+INT32 V_SubStringLengthToFit(const char *string, INT32 width, INT32 option);
 
 char V_GetSkincolorChar(INT32 color);
 
-void V_DoPostProcessor(INT32 view, postimg_t type, INT32 param);
+INT32 V_SkinColorToHighlightcolor(skincolors_t color);
+
+// this is pretty dumb, but has to be done like this, otherwise the fps counter just disappears sometimes for no reason lol
+FUNCINLINE static ATTRINLINE INT32 V_LocalTransFlag(void)
+{
+	return ((10-cv_translucenthud.value)*V_10TRANS);
+}
+
+typedef struct player_s player_t;
+
+void V_DoPostProcessor(INT32 view, INT32 param);
 
 void V_DrawPatchFill(patch_t *pat);
 
+void V_DrawAdaptiveScaledFullScreenPatch(patch_t *patch);
+void V_DrawVerticallyScaledFullScreenPatch(patch_t *patch);
+void V_DrawHorizontallyScaledFullScreenPatch(patch_t *patch);
+
 void VID_BlitLinearScreen(const UINT8 *srcptr, UINT8 *destptr, INT32 width, INT32 height, size_t srcrowbytes,
 	size_t destrowbytes);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif
diff --git a/src/w_wad.c b/src/w_wad.c
index f14eba245..5c774aa60 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -58,15 +58,14 @@
 #include "dehacked.h"
 #include "d_clisrv.h"
 #include "r_defs.h"
+#include "r_patch.h"
 #include "i_system.h"
 #include "md5.h"
 #include "lua_script.h"
 #include "st_stuff.h"
-#ifdef SCANTHINGS
-#include "p_setup.h" // P_ScanThings
-#endif
 #include "m_misc.h" // M_MapNumber
 #include "p_setup.h" // P_PartialAddFile mayb
+#include "k_hud.h"
 
 #ifdef HWRENDER
 #include "r_data.h"
@@ -74,6 +73,10 @@
 #include "hardware/hw_glob.h"
 #endif
 
+#ifdef ROTSPRITE
+#include "r_patchrotation.h" // RotatedPatch_Create
+#endif
+
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
@@ -87,10 +90,11 @@ typedef struct
 
 // Must be a power of two
 #define LUMPNUMCACHESIZE 64
+#define LUMPNUMCACHENAME 32
 
 typedef struct lumpnum_cache_s
 {
-	char lumpname[32];
+	char lumpname[LUMPNUMCACHENAME];
 	lumpnum_t lumpnum;
 } lumpnum_cache_t;
 
@@ -117,10 +121,15 @@ void W_Shutdown(void)
 		if (wad->handle)
 			fclose(wad->handle);
 		Z_Free(wad->filename);
-		while (wad->numlumps--) {
+		while (wad->numlumps--)
+		{
 			Z_Free(wad->lumpinfo[wad->numlumps].longname);
 			Z_Free(wad->lumpinfo[wad->numlumps].fullname);
 		}
+
+		M_AATreeFree(wad->startfolders);
+		M_AATreeFree(wad->endfolders);
+
 		Z_Free(wad->lumpinfo);
 		Z_Free(wad);
 	}
@@ -290,22 +299,6 @@ static inline void W_LoadDehackedLumps(UINT16 wadnum)
 				DEH_LoadDehackedLumpPwad(wadnum, lump);
 			}
 	}
-
-#ifdef SCANTHINGS
-	// Scan maps for emblems 'n shit
-	{
-		lumpinfo_t *lump_p = wadfiles[wadnum]->lumpinfo;
-		for (lump = 0; lump < wadfiles[wadnum]->numlumps; lump++, lump_p++)
-		{
-			const char *name = lump_p->name;
-			if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P' && name[5]=='\0')
-			{
-				INT16 mapnum = (INT16)M_MapNumber(name[3], name[4]);
-				P_ScanThings(mapnum, wadnum, lump + ML_THINGS);
-			}
-		}
-	}
-#endif
 }
 
 /** Compute MD5 message digest for bytes read from STREAM of this filname.
@@ -349,6 +342,11 @@ static void W_InvalidateLumpnumCache(void)
 	memset(lumpnumcache, 0, sizeof (lumpnumcache));
 }
 
+UINT32 W_HashLumpName(const char *name)
+{
+	return FNV1a_HashLowercaseString(name);
+}
+
 /** Detect a file type.
  * \todo Actually detect the wad/pkzip headers and whatnot, instead of just checking the extensions.
  */
@@ -373,11 +371,24 @@ static lumpinfo_t* ResGetLumpsStandalone (FILE* handle, UINT16* numlumps, const
 	fseek(handle, 0, SEEK_END);
 	lumpinfo->size = ftell(handle);
 	fseek(handle, 0, SEEK_SET);
-	strlcpy(lumpinfo->name, lumpname, 9);
 
-	// Allocate the lump's full and long name.
-	lumpinfo->fullname = Z_StrDup(lumpname);
-	lumpinfo->longname = Z_StrDup(lumpname);
+	strlcpy(lumpinfo->name, lumpname, sizeof(lumpinfo->name));
+	lumpinfo->namelength = strlen(lumpinfo->name);
+	lumpinfo->hash.name = W_HashLumpName(lumpname);
+
+	// Allocate the lump's long name.
+	lumpinfo->longname = Z_Malloc((lumpinfo->namelength + 1) * sizeof(char), PU_STATIC, NULL);
+	strcpy(lumpinfo->longname, lumpname);
+	lumpinfo->longname[lumpinfo->namelength] = '\0';
+	lumpinfo->longnamelength = lumpinfo->namelength;
+	lumpinfo->hash.longname = lumpinfo->hash.name;
+
+	// Allocate the lump's full name.
+	lumpinfo->fullname = Z_Malloc((lumpinfo->namelength + 1) * sizeof(char), PU_STATIC, NULL);
+	strcpy(lumpinfo->fullname, lumpname);
+	lumpinfo->fullname[lumpinfo->namelength] = '\0';
+	lumpinfo->fullnamelength = lumpinfo->namelength;
+	lumpinfo->hash.fullname = lumpinfo->hash.name;
 
 	*numlumps = 1;
 	return lumpinfo;
@@ -465,16 +476,22 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
 			lump_p->compression = CM_NOCOMPRESSION;
 		memset(lump_p->name, 0x00, 9);
 		strncpy(lump_p->name, fileinfo->name, 8);
+		lump_p->namelength = strlen(lump_p->name);
+		lump_p->hash.name = W_HashLumpName(lump_p->name);
 
 		// Allocate the lump's long name.
 		lump_p->longname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
 		strncpy(lump_p->longname, fileinfo->name, 8);
 		lump_p->longname[8] = '\0';
+		lump_p->longnamelength = lump_p->namelength;
+		lump_p->hash.longname = lump_p->hash.name;
 
 		// Allocate the lump's full name.
 		lump_p->fullname = Z_Malloc(9 * sizeof(char), PU_STATIC, NULL);
 		strncpy(lump_p->fullname, fileinfo->name, 8);
 		lump_p->fullname[8] = '\0';
+		lump_p->fullnamelength = lump_p->namelength;
+		lump_p->hash.fullname = lump_p->hash.name;
 	}
 	free(fileinfov);
 	*nlmp = numlumps;
@@ -485,27 +502,53 @@ static lumpinfo_t* ResGetLumpsWad (FILE* handle, UINT16* nlmp, const char* filen
  */
 static boolean ResFindSignature (FILE* handle, char endPat[], UINT32 startpos)
 {
+	//the Wii U has rather slow filesystem access, and fgetc is *unbearable*
+	//so I reimplemented this function to buffer 128k chunks
 	char *s;
 	int c;
 
+	fseek(handle, 0, SEEK_END);
+	size_t len = ftell(handle);
+
 	fseek(handle, startpos, SEEK_SET);
+	size_t remaining = len - startpos;
+	size_t chunkpos = startpos;
+
 	s = endPat;
-	while((c = fgetc(handle)) != EOF)
-	{
-		if (*s != c && s > endPat) // No match?
-			s = endPat; // We "reset" the counter by sending the s pointer back to the start of the array.
-		if (*s == c)
-		{
-			s++;
-			if (*s == 0x00) // The array pointer has reached the key char which marks the end. It means we have matched the signature.
+
+	//128k buffers
+	size_t buffer_size = min(128 * 1024 * sizeof(char), remaining);
+	char* buffer = (char*)(malloc(buffer_size));
+
+	size_t bytes_read = 0;
+	while ((bytes_read = fread(buffer, 1, buffer_size, handle)) > 0) {
+		for (size_t i = 0; i < bytes_read; i++) {
+			c = (int)buffer[i];
+
+			if (*s != c && s > endPat) // No match?
+				s = endPat; // We "reset" the counter by sending the s pointer back to the start of the array.
+			if (*s == c)
 			{
-				return true;
+				s++;
+				if (*s == 0x00) // The array pointer has reached the key char which marks the end. It means we have matched the signature.
+				{
+					//the original function would leave the FILE* seeked to the end of the match
+					size_t foundpos = chunkpos + i + 1;
+					fseek(handle, foundpos, SEEK_SET);
+
+					free(buffer);
+					return true;
+				}
 			}
 		}
+		chunkpos += bytes_read;
 	}
+
+	free(buffer);
 	return false;
 }
 
+
 #if defined(_MSC_VER)
 #pragma pack(1)
 #endif
@@ -565,7 +608,6 @@ typedef struct zlentry_s
 static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
 {
     zend_t zend;
-    zentry_t zentry;
     zlentry_t zlentry;
 
 	UINT16 numlumps = *nlmp;
@@ -591,42 +633,45 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
 		CONS_Alert(CONS_ERROR, "Corrupt central directory (%s)\n", M_FileError(handle));
 		return NULL;
 	}
-	numlumps = zend.entries;
+	numlumps = SHORT(zend.entries);
 
 	lump_p = lumpinfo = Z_Malloc(numlumps * sizeof (*lumpinfo), PU_STATIC, NULL);
 
-	fseek(handle, zend.cdiroffset, SEEK_SET);
+	fseek(handle, LONG(zend.cdiroffset), SEEK_SET);
+
+	char *cdir = Z_Malloc(LONG(zend.cdirsize), PU_STATIC, &cdir);
+
+	if (fread(cdir, 1, LONG(zend.cdirsize), handle) < (UINT32)(LONG(zend.cdirsize)))
+	{
+		CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", M_FileError(handle));
+		Z_Free(cdir);
+		Z_Free(lumpinfo);
+		return NULL;
+	}
+
+	size_t offset = 0;
+
 	for (i = 0; i < numlumps; i++, lump_p++)
 	{
+		zentry_t *zentry = (zentry_t*)(cdir + offset);
 		char* fullname;
 		char* trimname;
 		char* dotpos;
 
-		if (fread(&zentry, 1, sizeof(zentry_t), handle) < sizeof(zentry_t))
-		{
-			CONS_Alert(CONS_ERROR, "Failed to read central directory (%s)\n", M_FileError(handle));
-			Z_Free(lumpinfo);
-			return NULL;
-		}
-		if (memcmp(zentry.signature, pat_central, 4))
+		if (memcmp(zentry->signature, pat_central, 4))
 		{
 			CONS_Alert(CONS_ERROR, "Central directory is corrupt\n");
+			Z_Free(cdir);
 			Z_Free(lumpinfo);
 			return NULL;
 		}
 
-		lump_p->position = zentry.offset; // NOT ACCURATE YET: we still need to read the local entry to find our true position
-		lump_p->disksize = zentry.compsize;
-		lump_p->size = zentry.size;
+		lump_p->position = LONG(zentry->offset); // NOT ACCURATE YET: we still need to read the local entry to find our true position
+		lump_p->disksize = LONG(zentry->compsize);
+		lump_p->size = LONG(zentry->size);
 
-		fullname = malloc(zentry.namelen + 1);
-		if (fgets(fullname, zentry.namelen + 1, handle) != fullname)
-		{
-			CONS_Alert(CONS_ERROR, "Unable to read lumpname (%s)\n", M_FileError(handle));
-			Z_Free(lumpinfo);
-			free(fullname);
-			return NULL;
-		}
+		fullname = (char*)(malloc(SHORT(zentry->namelen) + 1));
+		strlcpy(fullname, (char*)(zentry + 1), SHORT(zentry->namelen) + 1);
 
 		// Strip away file address and extension for the 8char name.
 		if ((trimname = strrchr(fullname, '/')) != 0)
@@ -639,14 +684,20 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
 
 		memset(lump_p->name, '\0', 9); // Making sure they're initialized to 0. Is it necessary?
 		strncpy(lump_p->name, trimname, min(8, dotpos - trimname));
+		lump_p->namelength = strlen(lump_p->name);
+		lump_p->hash.name = W_HashLumpName(lump_p->name);
 
 		lump_p->longname = Z_Calloc(dotpos - trimname + 1, PU_STATIC, NULL);
 		strlcpy(lump_p->longname, trimname, dotpos - trimname + 1);
+		lump_p->longnamelength = strlen(lump_p->longname);
+		lump_p->hash.longname = W_HashLumpName(lump_p->longname);
 
-		lump_p->fullname = Z_Calloc(zentry.namelen + 1, PU_STATIC, NULL);
-		strncpy(lump_p->fullname, fullname, zentry.namelen);
+		lump_p->fullname = (char*)(Z_Calloc(SHORT(zentry->namelen) + 1, PU_STATIC, NULL));
+		strncpy(lump_p->fullname, fullname, SHORT(zentry->namelen));
+		lump_p->fullnamelength = zentry->namelen;
+		lump_p->hash.fullname = W_HashLumpName(lump_p->fullname);
 
-		switch(zentry.compression)
+		switch(SHORT(zentry->compression))
 		{
 		case 0:
 			lump_p->compression = CM_NOCOMPRESSION;
@@ -667,14 +718,11 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
 		free(fullname);
 
 		// skip and ignore comments/extra fields
-		if (fseek(handle, zentry.xtralen + zentry.commlen, SEEK_CUR) != 0)
-		{
-			CONS_Alert(CONS_ERROR, "Central directory is corrupt\n");
-			Z_Free(lumpinfo);
-			return NULL;
-		}
+		offset += sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen);
 	}
 
+	Z_Free(cdir);
+
 	// Adjust lump position values properly
 	for (i = 0, lump_p = lumpinfo; i < numlumps; i++, lump_p++)
 	{
@@ -686,7 +734,7 @@ static lumpinfo_t* ResGetLumpsZip (FILE* handle, UINT16* nlmp)
 			return NULL;
 		}
 
-		lump_p->position += sizeof(zlentry_t) + zlentry.namelen + zlentry.xtralen;
+		lump_p->position += sizeof(zlentry_t) + SHORT(zlentry.namelen) + SHORT(zlentry.xtralen);
 	}
 
 	*nlmp = numlumps;
@@ -711,7 +759,9 @@ UINT16 W_InitFile(const char *filename, boolean local)
 	wadfile_t *wadfile;
 	restype_t type;
 	UINT16 numlumps = 0;
+#ifndef NOMD5
 	size_t i;
+#endif
 	UINT8 md5sum[16];
 	boolean important;
 
@@ -801,6 +851,8 @@ UINT16 W_InitFile(const char *filename, boolean local)
 	fseek(handle, 0, SEEK_END);
 	wadfile->filesize = (unsigned)ftell(handle);
 	wadfile->type = type;
+	wadfile->startfolders = M_AATreeAlloc(0);
+	wadfile->endfolders = M_AATreeAlloc(0);
 
 	// already generated, just copy it over
 	M_Memcpy(&wadfile->md5sum, &md5sum, 16);
@@ -809,10 +861,10 @@ UINT16 W_InitFile(const char *filename, boolean local)
 	// set up caching
 	//
 	Z_Calloc(numlumps * sizeof (*wadfile->lumpcache), PU_STATIC, &wadfile->lumpcache);
+	Z_Calloc(numlumps * sizeof (*wadfile->patchcache), PU_STATIC, &wadfile->patchcache);
 
-#ifdef HWRENDER
-	// allocates GLPatch info structures and store them in a tree
-	wadfile->hwrcache = M_AATreeAlloc(AATREE_ZUSER);
+#ifdef ROTSPRITE
+	Z_Calloc(numlumps * sizeof (*wadfile->rotcache), PU_STATIC, &wadfile->rotcache);
 #endif
 
 	//
@@ -856,7 +908,6 @@ UINT16 W_InitFile(const char *filename, boolean local)
 	return wadfile->numlumps;
 }
 
-
 /** Tries to load a series of files.
   * All files are wads unless they have an extension of ".soc" or ".lua".
   *
@@ -881,8 +932,10 @@ INT32 W_InitMultipleFiles(char **filenames, boolean addons)
 
 		//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
 		rc = W_InitFile(*filenames, false);
+
 		if (rc == INT16_MAX)
 			CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), *filenames);
+
 		overallrc &= (rc != INT16_MAX) ? 1 : 0;
 	}
 
@@ -901,8 +954,10 @@ INT32 W_AddAutoloadedLocalFiles(char **filenames)
 	for (; *filenames; filenames++)
 	{
 		rc = P_PartialAddWadFile(*filenames, true);
+
 		if (rc == UINT16_MAX)
 			CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), *filenames);
+
 		overallrc &= (rc != UINT16_MAX) ? 1 : 0;
 	}
 
@@ -911,6 +966,7 @@ INT32 W_AddAutoloadedLocalFiles(char **filenames)
 
 	if (P_PartialAddGetStage() >= 0)
 		P_MultiSetupWadFiles(true);
+
 	return overallrc;
 }
 
@@ -955,6 +1011,8 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 {
 	UINT16 i;
 	static char uname[9];
+	UINT32 hash;
+	size_t namelen;
 
 	if (!TestValidLump(wad,0))
 		return INT16_MAX;
@@ -962,6 +1020,8 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 	memset(uname, 0, sizeof uname);
 	strncpy(uname, name, sizeof(uname)-1);
 	strupr(uname);
+	namelen = strlen(uname);
+	hash = W_HashLumpName(uname);
 
 	//
 	// scan forward
@@ -972,7 +1032,9 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 	{
 		lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
 		for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
-			if (memcmp(lump_p->name, uname, sizeof(uname) - 1) == 0)
+			if (lump_p->namelength == namelen
+				&& lump_p->hash.name == hash
+				&& !memcmp(lump_p->name, uname, sizeof(uname) - 1))
 				return i;
 	}
 
@@ -989,13 +1051,12 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 {
 	UINT16 i;
-	static char uname[256 + 1];
 
 	if (!TestValidLump(wad,0))
 		return INT16_MAX;
 
-	strlcpy(uname, name, sizeof uname);
-	strupr(uname);
+	size_t namelen = strlen(name);
+	UINT32 hash = W_HashLumpName(name);
 
 	//
 	// scan forward
@@ -1006,7 +1067,9 @@ UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 	{
 		lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
 		for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
-			if (!strcmp(lump_p->longname, uname))
+			if (lump_p->longnamelength == namelen
+				&& lump_p->hash.longname == hash
+				&& !stricmp(lump_p->longname, name))
 				return i;
 	}
 
@@ -1014,8 +1077,7 @@ UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump)
 	return INT16_MAX;
 }
 
-UINT16
-W_CheckNumForMarkerStartPwad (const char *name, UINT16 wad, UINT16 startlump)
+UINT16 W_CheckNumForMarkerStartPwad (const char *name, UINT16 wad, UINT16 startlump)
 {
 	UINT16 marker;
 	marker = W_CheckNumForNamePwad(name, wad, startlump);
@@ -1031,6 +1093,12 @@ UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlum
 	INT32 i;
 	lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
 	name_length = strlen(name);
+	UINT32 hash = quickncasehash(name, name_length);
+
+	void *val = M_AATreeGet(wadfiles[wad]->startfolders, hash);
+	if (val != NULL)
+		return (uintptr_t)val;
+
 	for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
 	{
 		if (strnicmp(name, lump_p->fullname, name_length) == 0)
@@ -1038,10 +1106,16 @@ UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlum
 			/* SLADE is special and puts a single directory entry. Skip that. */
 			if (strlen(lump_p->fullname) == name_length)
 				i++;
-			break;
+
+			M_AATreeSet(wadfiles[wad]->startfolders, hash, (void *)(uintptr_t)i);
+
+			return i;
 		}
 	}
-	return i;
+
+	M_AATreeSet(wadfiles[wad]->startfolders, hash, (void *)INT16_MAX);
+
+	return INT16_MAX;
 }
 
 // In a PK3 type of resource file, it looks for the next lumpinfo entry that doesn't share the specified pathfile.
@@ -1052,11 +1126,20 @@ UINT16 W_CheckNumForFolderEndPK3(const char *name, UINT16 wad, UINT16 startlump)
 	INT32 i;
 	lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump;
 	size_t name_length = strlen(name);
+	UINT32 hash = quickncasehash(name, name_length);
+
+	void *val = M_AATreeGet(wadfiles[wad]->endfolders, hash);
+	if (val != NULL)
+		return (uintptr_t)val;
+
 	for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++)
 	{
 		if (strnicmp(name, lump_p->fullname, name_length))
 			break;
 	}
+
+	M_AATreeSet(wadfiles[wad]->endfolders, hash, (void *)(uintptr_t)i);
+
 	return i;
 }
 
@@ -1110,12 +1193,15 @@ lumpnum_t W_CheckNumForName(const char *name)
 			break; //found it
 	}
 
-	if (check == INT16_MAX) return LUMPERROR;
+	if (check == INT16_MAX)
+	{
+		return LUMPERROR;
+	}
 	else
 	{
 		// Update the cache.
 		lumpnumcacheindex = (lumpnumcacheindex + 1) & (LUMPNUMCACHESIZE - 1);
-		memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', 32);
+		memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', LUMPNUMCACHENAME);
 		strncpy(lumpnumcache[lumpnumcacheindex].lumpname, name, 8);
 		lumpnumcache[lumpnumcacheindex].lumpnum = (i<<16)+check;
 
@@ -1159,15 +1245,18 @@ lumpnum_t W_CheckNumForLongName(const char *name)
 		}
 	}
 
-	if (check == INT16_MAX) return LUMPERROR;
+	if (check == INT16_MAX)
+	{
+		return LUMPERROR;
+	}
 	else
 	{
-		if (strlen(name) < 32)
+		if (strlen(name) < LUMPNUMCACHENAME)
 		{
 			// Update the cache.
 			lumpnumcacheindex = (lumpnumcacheindex + 1) & (LUMPNUMCACHESIZE - 1);
-			memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', 32);
-			strlcpy(lumpnumcache[lumpnumcacheindex].lumpname, name, 32);
+			memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', LUMPNUMCACHENAME);
+			strlcpy(lumpnumcache[lumpnumcacheindex].lumpname, name, LUMPNUMCACHENAME);
 			lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) + check;
 		}
 
@@ -1175,41 +1264,6 @@ lumpnum_t W_CheckNumForLongName(const char *name)
 	}
 }
 
-// Look for valid map data through all added files in descendant order.
-// Get a map marker for WADs, and a standalone WAD file lump inside PK3s.
-// TODO: Make it search through cache first, maybe...?
-lumpnum_t W_CheckNumForMap(const char *name)
-{
-	UINT16 lumpNum, end;
-	UINT32 i;
-	for (i = numwadfiles - 1; i < numwadfiles; i--)
-	{
-		if (wadfiles[i]->type == RET_WAD)
-		{
-			for (lumpNum = 0; lumpNum < wadfiles[i]->numlumps; lumpNum++)
-				if (!strncmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8))
-					return (i<<16) + lumpNum;
-		}
-		else if (wadfiles[i]->type == RET_PK3)
-		{
-			lumpNum = W_CheckNumForFolderStartPK3("maps/", i, 0);
-			if (lumpNum != INT16_MAX)
-				end = W_CheckNumForFolderEndPK3("maps/", i, lumpNum);
-			else
-				continue;
-			// Now look for the specified map.
-			for (; lumpNum < end; lumpNum++)
-				if (!strnicmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8))
-				{
-					const char *extension = strrchr(wadfiles[i]->lumpinfo[lumpNum].fullname, '.');
-					if (!(extension && stricmp(extension, ".wad")))
-						return (i<<16) + lumpNum;
-				}
-		}
-	}
-	return LUMPERROR;
-}
-
 //
 // W_GetNumForName
 //
@@ -1290,15 +1344,15 @@ UINT8 W_LumpExists(const char *name)
 	return false;
 }
 
-UINT8 W_CheckMultipleLumps(const char* lump, ...) 
+UINT8 W_CheckMultipleLumps(const char* lump, ...)
 {
 	va_list lumps;
 	va_start(lumps, lump);
 	const char* lumpname = lump;
 
-	while (lumpname != NULL) 
+	while (lumpname != NULL)
 	{
-		if (!W_LumpExists(lumpname)) 
+		if (!W_LumpExists(lumpname))
 		{
 			va_end(lumps);
 			return false;
@@ -1607,7 +1661,6 @@ void *W_CacheLumpNumPwad(UINT16 wad, UINT16 lump, INT32 tag)
 
 void *W_CacheLumpNum(lumpnum_t lumpnum, INT32 tag)
 {
-
 	return W_CacheLumpNumPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum),tag);
 }
 
@@ -1665,6 +1718,39 @@ boolean W_IsLumpCached(lumpnum_t lumpnum, void *ptr)
 	return W_IsLumpCachedPWAD(WADFILENUM(lumpnum),LUMPNUM(lumpnum), ptr);
 }
 
+//
+// W_IsPatchCached
+//
+// If a patch is already cached return true, otherwise
+// return false.
+//
+// no outside code uses the PWAD form, for now
+static inline boolean W_IsPatchCachedPWAD(UINT16 wad, UINT16 lump, void *ptr)
+{
+	void *lcache;
+
+	if (!TestValidLump(wad, lump))
+		return false;
+
+	lcache = wadfiles[wad]->patchcache[lump];
+
+	if (ptr)
+	{
+		if (ptr == lcache)
+			return true;
+	}
+	else if (lcache)
+		return true;
+
+	return false;
+}
+
+boolean W_IsPatchCached(lumpnum_t lumpnum, void *ptr)
+{
+	return W_IsPatchCachedPWAD(WADFILENUM(lumpnum),LUMPNUM(lumpnum), ptr);
+}
+
+
 // ==========================================================================
 // W_CacheLumpName
 // ==========================================================================
@@ -1688,41 +1774,56 @@ void *W_CacheLumpName(const char *name, INT32 tag)
 // Cache a patch into heap memory, convert the patch format as necessary
 //
 
-// Software-only compile cache the data without conversion
-#ifdef HWRENDER
-FUNCINLINE static ATTRINLINE void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag)
+void *W_CacheSoftwarePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag)
 {
-	GLPatch_t *grPatch;
-
-	if (rendermode == render_soft || rendermode == render_none)
-		return W_CacheLumpNumPwad(wad, lump, tag);
+	lumpcache_t *lumpcache = NULL;
 
 	if (!TestValidLump(wad, lump))
 		return NULL;
 
-	grPatch = HWR_GetCachedGLPatchPwad(wad, lump);
+	lumpcache = wadfiles[wad]->patchcache;
 
-	if (grPatch->mipmap->data)
+	if (!lumpcache[lump])
 	{
-		if (tag == PU_CACHE)
-			tag = PU_HWRCACHE;
-		Z_ChangeTag(grPatch->mipmap->data, tag);
-	}
-	else
-	{
-		patch_t *ptr = NULL;
+		size_t len = W_LumpLengthPwad(wad, lump);
+		void *ptr, *dest, *lumpdata = Z_Malloc(len, PU_STATIC, NULL);
 
-		// Only load the patch if we haven't initialised the grPatch yet
-		if (grPatch->mipmap->width == 0)
-			ptr = W_CacheLumpNumPwad(grPatch->wadnum, grPatch->lumpnum, PU_STATIC);
+		// read the lump in full
+		W_ReadLumpHeaderPwad(wad, lump, lumpdata, 0, 0);
+		ptr = lumpdata;
+
+		dest = Z_Calloc(sizeof(patch_t), tag, &lumpcache[lump]);
+		Patch_Create(ptr, len, dest);
 
-		// Run HWR_MakePatch in all cases, to recalculate some things
-		HWR_MakePatch(ptr, grPatch, grPatch->mipmap, false);
 		Z_Free(ptr);
 	}
+	else
+		Z_ChangeTag(lumpcache[lump], tag);
 
-	// return GLPatch_t, which can be casted to (patch_t) with valid patch header info
-	return (void *)grPatch;
+	return lumpcache[lump];
+}
+
+void *W_CacheSoftwarePatchNum(lumpnum_t lumpnum, INT32 tag)
+{
+	return W_CacheSoftwarePatchNumPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum),tag);
+}
+
+void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag)
+{
+	patch_t *patch;
+
+	if (!TestValidLump(wad, lump))
+		return NULL;
+
+	patch = (patch_t *)W_CacheSoftwarePatchNumPwad(wad, lump, tag);
+
+#ifdef HWRENDER
+	// Software-only compile cache the data without conversion
+	if (rendermode == render_opengl)
+		Patch_CreateGL(patch);
+#endif
+
+	return (void *)patch;
 }
 
 void *W_CachePatchNum(lumpnum_t lumpnum, INT32 tag)
@@ -1730,7 +1831,29 @@ void *W_CachePatchNum(lumpnum_t lumpnum, INT32 tag)
 	return W_CachePatchNumPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum),tag);
 }
 
-#endif // HWRENDER
+void *W_GetCachedPatchNumPwad(UINT16 wad, UINT16 lump)
+{
+	if (!TestValidLump(wad, lump))
+		return NULL;
+
+	return wadfiles[wad]->patchcache[lump];
+}
+
+#ifdef ROTSPRITE
+// Caches a rotsprite for patch rotation.
+void *W_GetCachedRotPatchPwad(UINT16 wadnum, UINT16 lumpnum)
+{
+	lumpcache_t *rotcache = wadfiles[wadnum]->rotcache;
+
+	if (!rotcache[lumpnum])
+	{
+		rotsprite_t *rspr = RotatedPatch_Create(ROTANGLES);
+		Z_SetUser(rspr, (void **)(&rotcache[lumpnum]));
+	}
+
+	return (void *)(rotcache[lumpnum]);
+}
+#endif // ROTSPRITE
 
 void W_UnlockCachedPatch(void *patch)
 {
@@ -1740,26 +1863,63 @@ void W_UnlockCachedPatch(void *patch)
 	// The hardware code does its own memory management, as its patches
 	// have different lifetimes from software's.
 #ifdef HWRENDER
-	if (rendermode != render_soft && rendermode != render_none)
-		HWR_UnlockCachedPatch((GLPatch_t*)patch);
+	if (rendermode == render_opengl)
+		HWR_UnlockCachedPatch((GLPatch_t *)((patch_t *)patch)->hardware);
 	else
 #endif
-		Z_Unlock(patch);
+	Z_ChangeTag(patch, PU_PATCH);
 }
 
 void *W_CachePatchName(const char *name, INT32 tag)
 {
 	lumpnum_t num;
 
-	const char *finalname = name;
-
-	num = W_CheckNumForName(finalname);
+	num = W_CheckNumForName(name);
 
 	if (num == LUMPERROR)
 		return W_CachePatchNum(W_GetNumForName("MISSING"), tag);
 	return W_CachePatchNum(num, tag);
 }
 
+#ifdef ROTSPRITE
+// Caches a patch, and if needed, rotates said patch.
+void *W_CachePatchNameRotated(const char *name, INT32 rotationangle, INT32 tag)
+{
+	lumpnum_t num;
+	patch_t *ptr;
+	rotsprite_t *rspr;
+	INT32 idx = rotationangle;
+
+	num = W_CheckNumForName(name);
+
+	if (num == LUMPERROR)
+		num = W_GetNumForName("MISSING");
+
+	// No rotation? No need to do any of this nonsense.
+	if (rotationangle < 1 || rotationangle >= ROTANGLES)
+		return W_CachePatchNum(num, tag);
+
+	rspr = (rotsprite_t *)W_GetCachedRotPatchPwad(WADFILENUM(num),LUMPNUM(num));
+
+	if (rspr->patches[idx] == NULL)
+	{
+		INT32 xpivot = 0, ypivot = 0;
+
+		ptr = W_CachePatchNum(num, PU_PATCH);
+
+		// >y pivot centered
+		// >x pivot not centered
+		// Why?
+		xpivot = ptr->width / 2;
+		ypivot = ptr->height / 2;
+
+		RotatedPatch_DoRotation(rspr, ptr, rotationangle, xpivot, ypivot, false);
+	}
+
+	return rspr->patches[idx];
+}
+#endif
+
 #ifndef NOMD5
 
 /**
@@ -1910,20 +2070,16 @@ static lumpchecklist_t folderblacklist[] =
 	{NULL, 0},
 };
 
-static int
-W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
+static int W_VerifyPK3(FILE *fp, lumpchecklist_t *checklist, boolean status)
 {
 	int verified = true;
 
     zend_t zend;
-    zentry_t zentry;
     zlentry_t zlentry;
 
 	long file_size;/* size of zip file */
 	long data_size;/* size of data inside zip file */
 
-	long old_position;
-
 	UINT16 numlumps;
 	size_t i;
 
@@ -1949,28 +2105,37 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
 
 	data_size = sizeof zend;
 
-	numlumps = zend.entries;
+	numlumps = SHORT(zend.entries);
+
+	fseek(fp, LONG(zend.cdiroffset), SEEK_SET);
+
+	char *cdir = (char*)(malloc(LONG(zend.cdirsize)));
+
+	if (fread(cdir, 1, LONG(zend.cdirsize), fp) < (UINT32)(LONG(zend.cdirsize)))
+	{
+		free(cdir);
+		return true;
+	}
+
+	size_t offset = 0;
 
-	fseek(fp, zend.cdiroffset, SEEK_SET);
 	for (i = 0; i < numlumps; i++)
 	{
+		zentry_t *zentry = (zentry_t*)(cdir + offset);
 		char* fullname;
 		char* trimname;
 		char* dotpos;
 
-		if (fread(&zentry, 1, sizeof(zentry_t), fp) < sizeof(zentry_t))
-			return true;
-		if (memcmp(zentry.signature, pat_central, 4))
+		if (memcmp(zentry->signature, pat_central, 4) != 0)
+		{
+			free(cdir);
 			return true;
+		}
 
 		if (verified == true)
 		{
-			fullname = malloc(zentry.namelen + 1);
-			if (fgets(fullname, zentry.namelen + 1, fp) != fullname)
-			{
-				free(fullname);
-				return true;
-			}
+			fullname = (char*)(malloc(SHORT(zentry->namelen) + 1));
+			strlcpy(fullname, (char*)(zentry + 1), SHORT(zentry->namelen) + 1);
 
 			// Strip away file address and extension for the 8char name.
 			if ((trimname = strrchr(fullname, '/')) != 0)
@@ -1995,34 +2160,31 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
 			}
 
 			free(fullname);
+		}
 
-			// skip and ignore comments/extra fields
-			if (fseek(fp, zentry.xtralen + zentry.commlen, SEEK_CUR) != 0)
-				return true;
-		}
-		else
-		{
-			if (fseek(fp, zentry.namelen + zentry.xtralen + zentry.commlen, SEEK_CUR) != 0)
-				return true;
-		}
+		offset += sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen);
 
 		data_size +=
-			sizeof zentry + zentry.namelen + zentry.xtralen + zentry.commlen;
+			sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen);
 
-		old_position = ftell(fp);
-
-		if (fseek(fp, zentry.offset, SEEK_SET) != 0)
+		if (fseek(fp, LONG(zentry->offset), SEEK_SET) != 0)
+		{
+			free(cdir);
 			return true;
+		}
 
 		if (fread(&zlentry, 1, sizeof(zlentry_t), fp) < sizeof (zlentry_t))
+		{
+			free(cdir);
 			return true;
+		}
 
 		data_size +=
-			sizeof zlentry + zlentry.namelen + zlentry.xtralen + zlentry.compsize;
-
-		fseek(fp, old_position, SEEK_SET);
+			sizeof zlentry + SHORT(zlentry.namelen) + SHORT(zlentry.xtralen) + LONG(zlentry.compsize);
 	}
 
+	free(cdir);
+
 	if (data_size < file_size)
 	{
 		const char * error = "ZIP file has holes (%ld extra bytes)\n";
@@ -2066,7 +2228,9 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
 			goodfile = W_VerifyWAD(handle, checklist, status);
 		}
 	}
+
 	fclose(handle);
+
 	return goodfile;
 }
 
@@ -2122,6 +2286,245 @@ int W_VerifyNMUSlumps(const char *filename)
 	return W_VerifyFile(filename, NMUSlist, false);
 }
 
+static int W_NameStartsWith(const char *name, lumpchecklist_t *checklist)
+{
+	size_t j;
+	for (j = 0; checklist[j].len && checklist[j].name; ++j)
+	{
+		if (strncasecmp(name, checklist[j].name, checklist[j].len) == 0)
+			return true;
+	}
+	return false;
+}
+
+// Checks if file contains at least one lump which name starts with one of strings in checklist
+static int W_CheckWADContains(FILE *fp, lumpchecklist_t *checklist)
+{
+	size_t i, j;
+	// if we're here it's a WAD file
+	wadinfo_t header;
+	filelump_t lumpinfo;
+
+	// read the header
+	if (fread(&header, 1, sizeof header, fp) == sizeof header
+		&& header.numlumps < INT16_MAX
+		&& strncmp(header.identification, "ZWAD", 4)
+		&& strncmp(header.identification, "IWAD", 4)
+		&& strncmp(header.identification, "PWAD", 4)
+		&& strncmp(header.identification, "SDLL", 4))
+	{
+		return true;
+	}
+
+	header.numlumps = LONG(header.numlumps);
+	header.infotableofs = LONG(header.infotableofs);
+
+	// let seek to the lumpinfo list
+	if (fseek(fp, header.infotableofs, SEEK_SET) == -1)
+		return true;
+
+	for (i = 0; i < header.numlumps; i++)
+	{
+		// fill in lumpinfo for this wad file directory
+		if (fread(&lumpinfo, sizeof (lumpinfo), 1 , fp) != 1)
+			return -1;
+
+		lumpinfo.filepos = LONG(lumpinfo.filepos);
+		lumpinfo.size = LONG(lumpinfo.size);
+
+		if (lumpinfo.size == 0)
+			continue;
+
+		for (j = 0; j < NUMSPRITES; j++)
+			if (!strncmp(lumpinfo.name, sprnames[j], 4)) // Sprites
+				continue;
+
+		if (W_NameStartsWith(lumpinfo.name, checklist))
+			return true;
+	}
+	return false;
+}
+
+static int W_CheckPK3Contains(FILE *fp, lumpchecklist_t *checklist)
+{
+    zend_t zend;
+    zlentry_t zlentry;
+
+	long file_size;/* size of zip file */
+	long data_size;/* size of data inside zip file */
+
+	UINT16 numlumps;
+	size_t i;
+
+	char pat_central[] = {0x50, 0x4b, 0x01, 0x02, 0x00};
+	char pat_end[] = {0x50, 0x4b, 0x05, 0x06, 0x00};
+
+	char lumpname[9];
+
+	// Haha the ResGetLumpsZip function doesn't
+	// check for file errors, so neither will I.
+
+	// Central directory bullshit
+
+	fseek(fp, 0, SEEK_END);
+	file_size = ftell(fp);
+
+	if (!ResFindSignature(fp, pat_end, max(0, ftell(fp) - (22 + 65536))))
+		return true;
+
+	fseek(fp, -4, SEEK_CUR);
+	if (fread(&zend, 1, sizeof zend, fp) < sizeof zend)
+		return true;
+
+	data_size = sizeof zend;
+
+	numlumps = SHORT(zend.entries);
+
+	fseek(fp, LONG(zend.cdiroffset), SEEK_SET);
+
+	char *cdir = (char*)(malloc(LONG(zend.cdirsize)));
+
+	if (fread(cdir, 1, LONG(zend.cdirsize), fp) < (UINT32)(LONG(zend.cdirsize)))
+	{
+		free(cdir);
+		return true;
+	}
+
+	size_t offset = 0;
+
+	for (i = 0; i < numlumps; i++)
+	{
+		zentry_t *zentry = (zentry_t*)(cdir + offset);
+		char* fullname;
+		char* trimname;
+		char* dotpos;
+
+		if (memcmp(zentry->signature, pat_central, 4) != 0)
+		{
+			free(cdir);
+			return false;
+		}
+
+		fullname = (char*)(malloc(SHORT(zentry->namelen) + 1));
+		strlcpy(fullname, (char*)(zentry + 1), SHORT(zentry->namelen) + 1);
+
+		// Strip away file address and extension for the 8char name.
+		if ((trimname = strrchr(fullname, '/')) != 0)
+			trimname++;
+		else
+			trimname = fullname; // Care taken for root files.
+
+		if (*trimname) // Ignore directories, well kinda
+		{
+			if ((dotpos = strrchr(trimname, '.')) == 0)
+				dotpos = fullname + strlen(fullname); // Watch for files without extension.
+
+			memset(lumpname, '\0', 9); // Making sure they're initialized to 0. Is it necessary?
+			strncpy(lumpname, trimname, min(8, dotpos - trimname));
+
+			if (W_NameStartsWith(lumpname, checklist))
+			{
+				free(fullname);
+				free(cdir);
+				return true;
+			}
+		}
+
+		if (W_NameStartsWith(fullname, checklist))
+		{
+			free(fullname);
+			free(cdir);
+			return true;
+		}
+
+		free(fullname);
+
+		offset += sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen);
+
+		data_size +=
+			sizeof *zentry + SHORT(zentry->namelen) + SHORT(zentry->xtralen) + SHORT(zentry->commlen);
+
+		if (fseek(fp, LONG(zentry->offset), SEEK_SET) != 0)
+		{
+			free(cdir);
+			return false;
+		}
+
+		if (fread(&zlentry, 1, sizeof(zlentry_t), fp) < sizeof (zlentry_t))
+		{
+			free(cdir);
+			return false;
+		}
+
+		data_size +=
+			sizeof zlentry + SHORT(zlentry.namelen) + SHORT(zlentry.xtralen) + LONG(zlentry.compsize);
+	}
+
+	free(cdir);
+
+	if (data_size < file_size)
+	{
+		const char * error = "ZIP file has holes (%ld extra bytes)\n";
+		CONS_Alert(CONS_ERROR, error, (file_size - data_size));
+		return -1;
+	}
+	else if (data_size > file_size)
+	{
+		const char * error = "Reported size of ZIP file contents exceeds file size (%ld extra bytes)\n";
+		CONS_Alert(CONS_ERROR, error, (data_size - file_size));
+		return -1;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+static int W_CheckFileContains(const char *filename, lumpchecklist_t *checklist)
+{
+	FILE *handle;
+	int contains = false;
+
+	if (!checklist)
+		I_Error("No checklist for %s\n", filename);
+	// open wad file
+	if ((handle = W_OpenWadFile(&filename, false)) == NULL)
+		return -1;
+
+	if (stricmp(&filename[strlen(filename) - 4], ".pk3") == 0)
+		contains = W_CheckPK3Contains(handle, checklist);
+	else
+	{
+		// detect wad file by the absence of the other supported extensions
+		if (stricmp(&filename[strlen(filename) - 4], ".soc")
+		&& stricmp(&filename[strlen(filename) - 4], ".lua"))
+		{
+			contains = W_CheckWADContains(handle, checklist);
+		}
+	}
+	fclose(handle);
+	return contains;
+}
+
+int W_CheckPostLoadList(const char *filename)
+{
+	static lumpchecklist_t postloadlist[] =
+	{
+		{"Lua/",		4},
+		{"SOC/",		4},
+		{"Skins/",		6},
+		{"S_SKIN",		6},
+		{"LUA_",		4},
+		{"SOC_", 		4},
+		{"MAINCFG",		7},
+		{"OBJCTCFG", 	8},
+		{"MAP",			3},
+
+		{NULL, 0},
+	};
+	return W_CheckFileContains(filename, postloadlist);
+}
+
 /** \brief Generates a virtual resource used for level data loading.
  *
  * \param lumpnum_t reference
@@ -2147,15 +2550,15 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum)
 		size_t *vsizecache;
 
 		// Remember that we're assuming that the WAD will have a specific set of lumps in a specific order.
-		UINT8 *wadData = W_CacheLumpNum(lumpnum, PU_LEVEL);
-		filelump_t *fileinfo = (filelump_t *)(wadData + ((wadinfo_t *)wadData)->infotableofs);
+		UINT8 *wadData = (UINT8*)(W_CacheLumpNum(lumpnum, PU_LEVEL));
+		filelump_t *fileinfo = (filelump_t *)(wadData + LONG(((wadinfo_t *)wadData)->infotableofs));
 
-		i = ((wadinfo_t *)wadData)->numlumps;
-		vsizecache = Z_Malloc(sizeof(size_t)*i, PU_LEVEL, NULL);
+		i = LONG(((wadinfo_t *)wadData)->numlumps);
+		vsizecache = (size_t*)(Z_Malloc(sizeof(size_t)*i, PU_LEVEL, NULL));
 
 		for (realentry = 0; realentry < i; realentry++)
 		{
-			vsizecache[realentry] = (size_t)(((filelump_t *)(fileinfo + realentry))->size);
+			vsizecache[realentry] = (size_t)(LONG(((filelump_t *)(fileinfo + realentry))->size));
 
 			if (!vsizecache[realentry])
 				continue;
@@ -2163,7 +2566,7 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum)
 			numlumps++;
 		}
 
-		vlumps = Z_Malloc(sizeof(virtlump_t)*numlumps, PU_LEVEL, NULL);
+		vlumps = (virtlump_t*)(Z_Malloc(sizeof(virtlump_t)*numlumps, PU_LEVEL, NULL));
 
 		// Build the lumps, skipping over empty entries.
 		for (i = 0, realentry = 0; i < numlumps; realentry++)
@@ -2171,11 +2574,21 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum)
 			if (vsizecache[realentry] == 0)
 				continue;
 			vlumps[i].size = vsizecache[realentry];
+
+			const char *name = (fileinfo + realentry)->name;
+			if (strlen(name) == 5 && memcmp(name, "MAP", 3) == 0)
+			{
+				numlumps--; // We skip map marker, so 1 of entries becomes empty
+				continue; // This will skip i++ so we will write to same entry
+			}
+
 			// Play it safe with the name in this case.
-			memcpy(vlumps[i].name, (fileinfo + realentry)->name, 8);
+			memcpy(vlumps[i].name, name, 8);
 			vlumps[i].name[8] = '\0';
-			vlumps[i].data = Z_Malloc(vlumps[i].size, PU_LEVEL, NULL); // This is memory inefficient, sorry about that.
-			memcpy(vlumps[i].data, wadData + (fileinfo + realentry)->filepos, vlumps[i].size);
+			vlumps[i].data = (UINT8*)(
+				Z_Malloc(vlumps[i].size, PU_LEVEL, NULL) // This is memory inefficient, sorry about that.
+			);
+			memcpy(vlumps[i].data, wadData + LONG((fileinfo + realentry)->filepos), vlumps[i].size);
 			i++;
 		}
 
@@ -2195,16 +2608,25 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum)
 		}
 		numlumps++;
 
-		vlumps = Z_Malloc(sizeof(virtlump_t)*numlumps, PU_LEVEL, NULL);
+		vlumps = (virtlump_t*)(Z_Malloc(sizeof(virtlump_t)*numlumps, PU_LEVEL, NULL));
 		for (i = 0; i < numlumps; i++, lumpnum++)
 		{
+			// Check if it is map marker. It is not always first lump sadly, so we need to expect it anywhere
+			const char *name = W_CheckNameForNum(lumpnum);
+			if (strlen(name) == 5 && memcmp(name, "MAP", 3) == 0)
+			{
+				--i; // Decrement so on next iteration we write on same i, so we don't leave corrupted vlumps entry
+				numlumps--; // Just so we don't try to access the leftover vlumps entry
+				continue;
+			}
+
 			vlumps[i].size = W_LumpLength(lumpnum);
-			memcpy(vlumps[i].name, W_CheckNameForNum(lumpnum), 8);
+			memcpy(vlumps[i].name, name, 8);
 			vlumps[i].name[8] = '\0';
-			vlumps[i].data = W_CacheLumpNum(lumpnum, PU_LEVEL);
+			vlumps[i].data = (UINT8*)(W_CacheLumpNum(lumpnum, PU_LEVEL));
 		}
 	}
-	vres = Z_Malloc(sizeof(virtres_t), PU_LEVEL, NULL);
+	vres = (virtres_t*)(Z_Malloc(sizeof(virtres_t), PU_LEVEL, NULL));
 	vres->vlumps = vlumps;
 	vres->numlumps = numlumps;
 
@@ -2224,7 +2646,13 @@ void vres_Free(virtres_t* vres)
 	}
 
 	while (vres->numlumps--)
-		Z_Free(vres->vlumps[vres->numlumps].data);
+	{
+		if (vres->vlumps[vres->numlumps].data)
+		{
+			Z_Free(vres->vlumps[vres->numlumps].data);
+		}
+	}
+
 	Z_Free(vres->vlumps);
 	Z_Free(vres);
 }
diff --git a/src/w_wad.h b/src/w_wad.h
index 4e84ea0e4..196fd7893 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -14,10 +14,16 @@
 #ifndef __W_WAD__
 #define __W_WAD__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef HWRENDER
 #include "hardware/hw_data.h"
 #endif
 
+#include "m_aatree.h"
+
 #ifdef __GNUG__
 #pragma interface
 #endif
@@ -71,8 +77,19 @@ typedef struct
 	char name[9];           // filelump_t name[] e.g. "LongEntr"
 	char *longname;         //                   e.g. "LongEntryName"
 	char *fullname;         //                   e.g. "Folder/Subfolder/LongEntryName.extension"
+
+	size_t namelength;      // length of name
+	size_t longnamelength;  // length of longname
+	size_t fullnamelength;  // length of fullname
+
 	size_t size; // real (uncompressed) size
 	compmethod compression; // lump compression method
+
+	struct {
+		UINT32 name;        // hash of name
+		UINT32 longname;    // hash of longname
+		UINT32 fullname;    // hash of fullname
+	} hash;
 } lumpinfo_t;
 
 // =========================================================================
@@ -106,10 +123,6 @@ virtlump_t* vres_Find(const virtres_t*, const char*);
 
 #define lumpcache_t void *
 
-#ifdef HWRENDER
-#include "m_aatree.h"
-#endif
-
 // Resource type of the WAD. Yeah, I know this sounds dumb, but I'll leave it like this until I clean up the code further.
 typedef enum restype
 {
@@ -127,9 +140,12 @@ typedef struct wadfile_s
 	restype_t type;
 	lumpinfo_t *lumpinfo;
 	lumpcache_t *lumpcache;
-#ifdef HWRENDER
-	aatree_t *hwrcache; // patches are cached in renderer's native format
+	lumpcache_t *patchcache;
+#ifdef ROTSPRITE
+	lumpcache_t *rotcache; // Cache rotsprites for rotating patches.
 #endif
+	aatree_t *startfolders;
+	aatree_t *endfolders;
 	UINT16 numlumps; // this wad's number of resources
 	FILE *handle;
 	UINT32 filesize; // for network
@@ -166,6 +182,8 @@ INT32 W_AddAutoloadedLocalFiles(char **filenames);
 
 #define W_FileHasFolders(wadfile) ((wadfile)->type == RET_PK3)
 
+UINT32 W_HashLumpName(const char *name);
+
 const char *W_CheckNameForNumPwad(UINT16 wad, UINT16 lump);
 const char *W_CheckNameForNum(lumpnum_t lumpnum);
 
@@ -179,7 +197,6 @@ UINT16 W_CheckNumForFullNamePK3(const char *name, UINT16 wad, UINT16 startlump);
 UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlump);
 UINT16 W_CheckNumForFolderEndPK3(const char *name, UINT16 wad, UINT16 startlump);
 
-lumpnum_t W_CheckNumForMap(const char *name);
 lumpnum_t W_CheckNumForName(const char *name);
 lumpnum_t W_CheckNumForLongName(const char *name);
 lumpnum_t W_GetNumForName(const char *name); // like W_CheckNumForName but I_Error on LUMPERROR
@@ -207,17 +224,25 @@ void *W_CacheLumpNumPwad(UINT16 wad, UINT16 lump, INT32 tag);
 void *W_CacheLumpNum(lumpnum_t lump, INT32 tag);
 void *W_CacheLumpNumForce(lumpnum_t lumpnum, INT32 tag);
 
+boolean W_IsPatchCached(lumpnum_t lump, void *ptr);
 boolean W_IsLumpCached(lumpnum_t lump, void *ptr);
 
 void *W_CacheLumpName(const char *name, INT32 tag);
 void *W_CachePatchName(const char *name, INT32 tag);
 
-#ifdef HWRENDER
-//void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag); // return a patch_t
-void *W_CachePatchNum(lumpnum_t lumpnum, INT32 tag); // return a patch_t
-#else
-//#define W_CachePatchNumPwad(wad, lump, tag) W_CacheLumpNumPwad(wad, lump, tag)
-#define W_CachePatchNum(lumpnum, tag) W_CacheLumpNum(lumpnum, tag)
+// Returns either a Software patch, or an OpenGL patch.
+void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag);
+void *W_CachePatchNum(lumpnum_t lumpnum, INT32 tag);
+
+void *W_GetCachedPatchNumPwad(UINT16 wad, UINT16 lump);
+
+// Returns a Software patch.
+void *W_CacheSoftwarePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag);
+void *W_CacheSoftwarePatchNum(lumpnum_t lumpnum, INT32 tag);
+
+#ifdef ROTSPRITE
+void *W_GetCachedRotPatchPwad(UINT16 wadnum, UINT16 lumpnum); // Get patch-based rotsprites from the cache.
+void *W_CachePatchNameRotated(const char *name, INT32 rotationangle, INT32 tag);
 #endif
 
 void W_UnlockCachedPatch(void *patch);
@@ -226,4 +251,10 @@ void W_VerifyFileMD5(UINT16 wadfilenum, const char *matchmd5);
 
 int W_VerifyNMUSlumps(const char *filename);
 
+int W_CheckPostLoadList(const char *filename);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // __W_WAD__
diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg
deleted file mode 100644
index 4f8b39485..000000000
--- a/src/win32/Makefile.cfg
+++ /dev/null
@@ -1,154 +0,0 @@
-#
-# win32/Makefile.cfg for SRB2/Minwgw
-#
-
-#
-#Mingw, if you don't know, that's Win32/Win64
-#
-
-ifdef MINGW64
-	HAVE_LIBGME=1
-	LIBGME_CFLAGS=-I../libs/gme/include
-	LIBGME_LDFLAGS=-L../libs/gme/win64 -lgme
-ifdef HAVE_OPENMPT
-	LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
-	LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86_64 -lopenmpt
-endif
-
-	SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main
-	SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib -L../libs/SDL2_mixer/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
-else
-	HAVE_LIBGME=1
-	LIBGME_CFLAGS=-I../libs/gme/include
-	LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme
-ifdef HAVE_OPENMPT
-	LIBOPENMPT_CFLAGS?=-I../libs/libopenmpt/inc
-	LIBOPENMPT_LDFLAGS?=-L../libs/libopenmpt/lib/x86 -lopenmpt
-endif
-	SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main
-	SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib -L../libs/SDL2_mixer/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
-endif
-
-ifndef NONET
-ifndef MINGW64 #miniupnc is broken with MINGW64
-	HAVE_MINIUPNPC=1
-endif
-endif
-
-ifndef NO_DISCORDRPC
-	HAVE_DISCORDRPC=1
-endif
-
-	OPTS=-DSTDC_HEADERS
-
-ifndef GCC44
-	#OPTS+=-mms-bitfields
-endif
-
-	OPTS+=-D__USE_MINGW_ANSI_STDIO=0
-
-	LIBS+=-ladvapi32 -lkernel32 -lmsvcrt -luser32
-ifdef MINGW64
-	LIBS+=-lws2_32
-else
-ifdef NO_IPV6
-	LIBS+=-lwsock32
-else
-	LIBS+=-lws2_32
-endif
-endif
-
-ifndef MINGW64
-	CPPFLAGS+=-I../libs/drmingw/include
-	LDFLAGS+=-L../libs/drmingw/lib/win32
-	LIBS+=-lmgwhelp -lexchndl
-endif
-
-	# name of the exefile
-	EXENAME?=srb2kart-saturn.exe
-
-	i_system_o+=$(OBJDIR)/SRB2.res
-	#i_main_o+=$(OBJDIR)/win_dbg.o
-ifndef NOHW
-	OPTS+=-DUSE_WGL_SWAP
-endif
-
-ZLIB_CFLAGS?=-I../libs/zlib
-ifdef MINGW64
-ZLIB_LDFLAGS?=-L../libs/zlib/win32 -lz64
-else
-ZLIB_LDFLAGS?=-L../libs/zlib/win32 -lz32
-endif
-
-ifndef NOPNG
-ifndef PNG_CONFIG
-	PNG_CFLAGS?=-I../libs/libpng-src
-ifdef MINGW64
-	PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng64
-else
-	PNG_LDFLAGS?=-L../libs/libpng-src/projects -lpng32
-endif #MINGW64
-endif #PNG_CONFIG
-endif #NOPNG
-
-ifdef GETTEXT
-ifndef CCBS
-	MSGFMT?=../libs/gettext/bin32/msgfmt.exe
-endif
-ifdef MINGW64
-	CPPFLAGS+=-I../libs/gettext/include64
-	LDFLAGS+=-L../libs/gettext/lib64
-	LIBS+=-lmingwex
-else
-	CPPFLAGS+=-I../libs/gettext/include32
-	LDFLAGS+=-L../libs/gettext/lib32
-	STATIC_GETTEXT=1
-endif #MINGW64
-ifdef STATIC_GETTEXT
-	LIBS+=-lasprintf -lintl
-else
-	LIBS+=-lintl.dll
-endif #STATIC_GETTEXT
-endif #GETTEXT
-
-ifdef HAVE_MINIUPNPC
-	CPPFLAGS+=-I../libs/ -DSTATIC_MINIUPNPC
-ifdef MINGW64
-	LDFLAGS+=-L../libs/miniupnpc/mingw64
-else
-	LDFLAGS+=-L../libs/miniupnpc/mingw32
-endif #MINGW64
-endif
-
-ifndef NOCURL
-	CURL_CFLAGS+=-I../libs/curl/include
-ifdef MINGW64
-	CURL_LDFLAGS+=-L../libs/curl/lib64 -lcurl
-else
-	CURL_LDFLAGS+=-L../libs/curl/lib32 -lcurl
-endif #MINGW64
-endif
-
-ifdef HAVE_DISCORDRPC
-ifdef MINGW64
-	CPPFLAGS+=-I../libs/discord-rpc/win64-dynamic/include
-	LDFLAGS+=-L../libs/discord-rpc/win64-dynamic/lib
-else
-	CPPFLAGS+=-I../libs/discord-rpc/win32-dynamic/include
-	LDFLAGS+=-L../libs/discord-rpc/win32-dynamic/lib
-endif
-	LIBS+=-ldiscord-rpc
-endif
-
-ifndef MINGW64
-	LDFLAGS+=-Wl,--large-address-aware
-endif
-
-ifndef MINGW64
-	NOLIBBACKTRACE=1
-endif
-
-# disable dynamicbase if under msys2
-ifdef MSYSTEM
-	LDFLAGS+=-Wl,--disable-dynamicbase
-endif
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index d7a26dc85..da6c64d82 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -1,5 +1,3 @@
-#include <winuser.h>
-
 //Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
diff --git a/src/y_inter.c b/src/y_inter.c
index 5d292f36c..068115f4f 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -9,6 +9,7 @@
 /// \file  y_inter.c
 /// \brief Tally screens, or "Intermissions" as they were formally called in Doom
 
+#include "d_netcmd.h"
 #include "doomdef.h"
 #include "doomstat.h"
 #include "d_main.h"
@@ -39,6 +40,7 @@
 #include "m_random.h" // M_RandomKey
 #include "g_input.h" // PLAYER1INPUTDOWN
 #include "k_kart.h" // colortranslations
+#include "k_hud.h"
 #include "console.h" // cons_menuhighlight
 #include "lua_hook.h" // IntermissionThinker hook
 #include "lua_hud.h" // intermission hud hook
@@ -54,75 +56,17 @@ typedef struct
 	UINT8 display;
 } y_bonus_t;
 
-typedef union
-{
-	/*struct
-	{
-		char passed1[21]; // KNUCKLES GOT    / CRAWLA HONCHO
-		char passed2[16]; // THROUGH THE ACT / PASSED THE ACT
-		INT32 passedx1;
-		INT32 passedx2;
-
-		y_bonus_t bonuses[4];
-		patch_t *bonuspatches[4];
-
-		SINT8 gotperfbonus; // Used for visitation flags.
-
-		UINT32 score, total; // fake score, total
-		UINT32 tics; // time
-
-		patch_t *ttlnum; // act number being displayed
-		patch_t *ptotal; // TOTAL
-		UINT8 gotlife; // Number of extra lives obtained
-	} coop;*/
-
-	struct
-	{
-		UINT8 *color[MAXPLAYERS]; // Winner's color #
-		INT32 *character[MAXPLAYERS]; // Winner's character #
-		INT32 num[MAXPLAYERS]; // Winner's player #
-		char *name[MAXPLAYERS]; // Winner's name
-		INT32 numplayers; // Number of players being displayed
-		char levelstring[64]; // holds levelnames up to 64 characters
-		// SRB2kart
-		UINT8 increase[MAXPLAYERS]; // how much did the score increase by?
-		UINT8 jitter[MAXPLAYERS]; // wiggle
-		UINT32 val[MAXPLAYERS]; // Gametype-specific value
-		UINT8 pos[MAXPLAYERS]; // player positions. used for ties
-		boolean rankingsmode; // rankings mode
-		boolean encore; // encore mode
-	} match;
-} y_data;
-
-static y_data data;
+static y_data_t data;
 
 // graphics
-static patch_t *bgpatch = NULL;     // INTERSCR
-static patch_t *widebgpatch = NULL; // INTERSCW
 static patch_t *bgtile = NULL;      // SPECTILE/SRB2BACK
-//static patch_t *interpic = NULL;    // custom picture defined in map header
-//static boolean usetile;
-boolean usebuffer = false;
-//static boolean useinterpic;
+
 static INT32 timer;
 
 static INT32 intertic;
 static INT32 endtic = -1;
 static INT32 sorttic = -1;
 
-patch_t *animVoteFramesPatches = NULL;
-// VEXTRN - Vote (V) Extra (EXT) Race (R) Normal (N - Normal sized patch)
-// VEXTBN - Vote (V) Extra (EXT) Battle (B) Normal (N - Normal sized patch)
-// VEXTBW - Vote (V) Extra (EXT) Battle (B) Normal (W - Wide patch used in software)
-// VEXTRW - Vote (V) Extra (EXT) Race (R) Normal (W - Wide patch used in software)
-char animPrefix[] = "INTSC";
-char animWidePrefix[] = "INTSW";
-char *luaVoteScreen = NULL;
-
-INT32 currentAnimFrame = 0;
-static INT32 foundAnimVoteFrames = 0;
-static INT32 foundAnimVoteWideFrames = 0;
-
 intertype_t intertype = int_none;
 
 static huddrawlist_h luahuddrawlist_intermission = NULL;
@@ -160,17 +104,13 @@ typedef struct
 	boolean loaded;
 } y_voteclient;
 
+// votescreen stuff
+votescreen_t VoteScreen = {0};
+
 static y_votelvlinfo levelinfo[5];
 static y_voteclient voteclient;
 static INT32 votetic;
 static INT32 voteendtic = -1;
-static patch_t *cursor = NULL;
-static patch_t *cursor1 = NULL;
-static patch_t *cursor2 = NULL;
-static patch_t *cursor3 = NULL;
-static patch_t *cursor4 = NULL;
-static patch_t *randomlvl = NULL;
-static patch_t *rubyicon = NULL;
 
 static void Y_UnloadVoteData(void);
 
@@ -182,11 +122,11 @@ static void Y_CompareRace(INT32 i)
 	UINT32 val = ((players[i].pflags & PF_TIMEOVER || players[i].realtime == UINT32_MAX)
 		? (UINT32_MAX-1) : players[i].realtime);
 
-	if (!(val < data.match.val[data.match.numplayers]))
+	if (!(val < data.val[data.numplayers]))
 		return;
 
-	data.match.val[data.match.numplayers] = val;
-	data.match.num[data.match.numplayers] = i;
+	data.val[data.numplayers] = val;
+	data.num[data.numplayers] = i;
 }
 
 static void Y_CompareBattle(INT32 i)
@@ -194,22 +134,22 @@ static void Y_CompareBattle(INT32 i)
 	UINT32 val = ((players[i].pflags & PF_TIMEOVER)
 			? (UINT32_MAX-1) : players[i].marescore);
 
-	if (!(data.match.val[data.match.numplayers] == UINT32_MAX
-	|| (!(players[i].pflags & PF_TIMEOVER) && val > data.match.val[data.match.numplayers])))
+	if (!(data.val[data.numplayers] == UINT32_MAX
+	|| (!(players[i].pflags & PF_TIMEOVER) && val > data.val[data.numplayers])))
 		return;
 
-	data.match.val[data.match.numplayers] = val;
-	data.match.num[data.match.numplayers] = i;
+	data.val[data.numplayers] = val;
+	data.num[data.numplayers] = i;
 }
 
 static void Y_CompareRank(INT32 i)
 {
-	UINT8 increase = ((data.match.increase[i] == UINT8_MAX) ? 0 : data.match.increase[i]);
-	if (!(data.match.val[data.match.numplayers] == UINT32_MAX || (players[i].score - increase) > data.match.val[data.match.numplayers]))
+	UINT8 increase = ((data.increase[i] == UINT8_MAX) ? 0 : data.increase[i]);
+	if (!(data.val[data.numplayers] == UINT32_MAX || (players[i].score - increase) > data.val[data.numplayers]))
 		return;
 
-	data.match.val[data.match.numplayers] = (players[i].score - increase);
-	data.match.num[data.match.numplayers] = i;
+	data.val[data.numplayers] = (players[i].score - increase);
+	data.num[data.numplayers] = i;
 }
 
 static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
@@ -221,10 +161,10 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
 	// Initialize variables
 	if (rankingsmode > 1)
 		;
-	else if ((data.match.rankingsmode = (boolean)rankingsmode))
+	else if ((data.rankingsmode = (boolean)rankingsmode))
 	{
-		sprintf(data.match.levelstring, "* Total Rankings *");
-		data.match.encore = false;
+		sprintf(data.levelstring, "* Total Rankings *");
+		data.encore = false;
 	}
 	else
 	{
@@ -232,13 +172,13 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
 		if (mapheaderinfo[prevmap]->levelflags & LF_NOZONE)
 		{
 			if (mapheaderinfo[prevmap]->actnum[0])
-				snprintf(data.match.levelstring,
-					sizeof data.match.levelstring,
+				snprintf(data.levelstring,
+					sizeof data.levelstring,
 					"* %s %s *",
 					mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->actnum);
 			else
-				snprintf(data.match.levelstring,
-					sizeof data.match.levelstring,
+				snprintf(data.levelstring,
+					sizeof data.levelstring,
 					"* %s *",
 					mapheaderinfo[prevmap]->lvlttl);
 		}
@@ -246,44 +186,44 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
 		{
 			const char *zonttl = (mapheaderinfo[prevmap]->zonttl[0] ? mapheaderinfo[prevmap]->zonttl : "Zone");
 			if (mapheaderinfo[prevmap]->actnum[0])
-				snprintf(data.match.levelstring,
-					sizeof data.match.levelstring,
+				snprintf(data.levelstring,
+					sizeof data.levelstring,
 					"* %s %s %s *",
 					mapheaderinfo[prevmap]->lvlttl, zonttl, mapheaderinfo[prevmap]->actnum);
 			else
-				snprintf(data.match.levelstring,
-					sizeof data.match.levelstring,
+				snprintf(data.levelstring,
+					sizeof data.levelstring,
 					"* %s %s *",
 					mapheaderinfo[prevmap]->lvlttl, zonttl);
 		}
 
-		data.match.levelstring[sizeof data.match.levelstring - 1] = '\0';
+		data.levelstring[sizeof data.levelstring - 1] = '\0';
 
-		data.match.encore = encoremode;
+		data.encore = encoremode;
 
-		memset(data.match.jitter, 0, sizeof (data.match.jitter));
+		memset(data.jitter, 0, sizeof (data.jitter));
 	}
 
 	for (i = 0; i < MAXPLAYERS; i++)
 	{
-		data.match.val[i] = UINT32_MAX;
+		data.val[i] = UINT32_MAX;
 
 		if (!playeringame[i] || players[i].spectator)
 		{
-			data.match.increase[i] = UINT8_MAX;
+			data.increase[i] = UINT8_MAX;
 			continue;
 		}
 
 		if (!rankingsmode)
-			data.match.increase[i] = UINT8_MAX;
+			data.increase[i] = UINT8_MAX;
 
 		numplayersingame++;
 	}
 
-	memset(data.match.color, 0, sizeof (data.match.color));
-	memset(data.match.character, 0, sizeof (data.match.character));
+	memset(data.color, 0, sizeof (data.color));
+	memset(data.character, 0, sizeof (data.character));
 	memset(completed, 0, sizeof (completed));
-	data.match.numplayers = 0;
+	data.numplayers = 0;
 
 	for (j = 0; j < numplayersingame; j++)
 	{
@@ -297,82 +237,195 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
 			comparison(i);
 		}
 
-		i = data.match.num[data.match.numplayers];
+		i = data.num[data.numplayers];
 
 		completed[i] = true;
 
-		data.match.color[data.match.numplayers] = &players[i].skincolor;
-		data.match.character[data.match.numplayers] = &players[i].skin;
-		data.match.name[data.match.numplayers] = player_names[i];
+		data.color[data.numplayers] = &players[i].skincolor;
+		data.character[data.numplayers] = &players[i].skin;
+		data.name[data.numplayers] = player_names[i];
 
-		if (data.match.numplayers && (data.match.val[data.match.numplayers] == data.match.val[data.match.numplayers-1]))
-			data.match.pos[data.match.numplayers] = data.match.pos[data.match.numplayers-1];
+		if (data.numplayers && (data.val[data.numplayers] == data.val[data.numplayers-1]))
+			data.pos[data.numplayers] = data.pos[data.numplayers-1];
 		else
-			data.match.pos[data.match.numplayers] = data.match.numplayers+1;
+			data.pos[data.numplayers] = data.numplayers+1;
 
-		if (!rankingsmode && !(players[i].pflags & PF_TIMEOVER) && (data.match.pos[data.match.numplayers] < nump))
+		if (!rankingsmode && !(players[i].pflags & PF_TIMEOVER) && (data.pos[data.numplayers] < nump))
 		{
-			data.match.increase[i] = nump - data.match.pos[data.match.numplayers];
-			players[i].score += data.match.increase[i];
+			data.increase[i] = nump - data.pos[data.numplayers];
+			players[i].score += data.increase[i];
 		}
 
 		if (demo.recording && !rankingsmode)
 			G_WriteStanding(
-				data.match.pos[data.match.numplayers],
-				data.match.name[data.match.numplayers],
-				*data.match.character[data.match.numplayers],
-				*data.match.color[data.match.numplayers],
-				data.match.val[data.match.numplayers]
+				data.pos[data.numplayers],
+				data.name[data.numplayers],
+				*data.character[data.numplayers],
+				*data.color[data.numplayers],
+				data.val[data.numplayers]
 			);
 
-		data.match.numplayers++;
+		data.numplayers++;
 	}
 }
 
+// Y_PlayerStandingsDrawer
 //
-// Y_AnimatedVoteScreenCheck
+// Handles drawing the center-of-screen player standings.
 //
-// Check if the lumps exist (checking for VEXTR(N|W)xx for race and VEXTRB(N|W)xx for battle)
-static void Y_AnimatedVoteScreenCheck(void)
+static void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 x, INT32 hilicol)
 {
-	char tmpPrefix[] = "INTS";
-	boolean stopSearching = false;
-
-	if (luaVoteScreen)
-		strncpy(tmpPrefix, luaVoteScreen, 4);
-	else
+	if (standings->numplayers == 0)
 	{
-		if(G_BattleGametype())
-			strcpy(tmpPrefix, "BTLS");
+		return;
 	}
 
-	strncpy(animPrefix, tmpPrefix, 4);
-	animPrefix[4] = 'C';
-	strncpy(animWidePrefix, tmpPrefix, 4);
-	animWidePrefix[4] = 'W';
+	INT32 i;
 
-	foundAnimVoteFrames = 0;
-	foundAnimVoteWideFrames = 0;
-	currentAnimFrame = 0;
+#define NUMFORNEWCOLUMN 8
+	INT32 y = 41, gutter = ((standings->numplayers > NUMFORNEWCOLUMN) ? 0 : (BASEVIDWIDTH/2));
+	INT32 dupadjust = cv_betainterscreen.value ? 314 : (vid.width/vid.dupx), duptweak = cv_betainterscreen.value ? -3 : (dupadjust - BASEVIDWIDTH)/2;
+	const char *timeheader;
 
-	INT32 i = 1;
-	while(!stopSearching)
+	if (standings->rankingsmode)
+		timeheader = "RANK";
+	else
+		timeheader = (intertype == int_race ? "TIME" : "SCORE");
+
+	// draw the level name
+	V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 12, 0, standings->levelstring);
+	V_DrawFill((x-3) - duptweak, 34, dupadjust-2, 1, 0);
+
+	if (standings->encore)
+		V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 12-8, hilicol, "ENCORE MODE");
+
+	if (standings->numplayers > NUMFORNEWCOLUMN)
 	{
-		boolean normalLumpExists = W_LumpExists(va("%sC%d", tmpPrefix, i));
-		boolean wideLumpExists = W_LumpExists(va("%sW%d", tmpPrefix, i));
+		V_DrawFill(x+156, 24, 1, 158, 0);
+		V_DrawFill((x-3) - duptweak, 182, dupadjust-2, 1, 0);
 
-		if (normalLumpExists || wideLumpExists)
+		V_DrawCenteredString(x+6+(BASEVIDWIDTH/2), 24, hilicol, "#");
+		V_DrawString(x+36+(BASEVIDWIDTH/2), 24, hilicol, "NAME");
+
+		V_DrawRightAlignedString(x+152, 24, hilicol, timeheader);
+	}
+
+	V_DrawCenteredString(x+6, 24, hilicol, "#");
+	V_DrawString(x+36, 24, hilicol, "NAME");
+
+	V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+152, 24, hilicol, timeheader);
+
+	boolean (*_isHighlightedPlayer)(const player_t *) = (demo.playback ? P_IsDisplayPlayer : P_IsLocalPlayer);
+
+	for (i = 0; i < standings->numplayers; i++)
+	{
+		const UINT8 pnum = standings->num[i];
+		player_t *player = &players[pnum];
+
+		if (pnum == MAXPLAYERS)
+			;
+		else if (!playeringame[pnum] || player->spectator)
+			standings->num[i] = MAXPLAYERS; // this should be the only field setting in this function
+		else
 		{
-			if (normalLumpExists)
-				foundAnimVoteFrames++;
+			char strtime[MAXPLAYERNAME+1];
 
-			if (wideLumpExists)
-				foundAnimVoteWideFrames++;
+			const boolean whiteplayer = _isHighlightedPlayer(player);
+			const INT32 philicol = (whiteplayer ? V_SkinColorToHighlightcolor(player->skincolor) : 0);
+
+			// Apply the jitter offset (later reversed)
+			if (standings->jitter[pnum] > 0)
+				y--;
+
+			V_DrawCenteredString(x+6, y, 0, va("%d", standings->pos[i]));
+
+			// localskins are amazing
+			if (standings->color[i] != SKINCOLOR_NONE)
+			{
+				UINT8 *colormap = R_GetTranslationColormap(*standings->character[i], *standings->color[i], GTC_CACHE);
+				INT32 skinnum = (player->localskin ? (player->localskin - 1) : *standings->character[i]);
+				patch_t *faceprefix = K_GetFacePrefix(player, skinnum);
+
+				if (K_UseHighResPortraits())
+					V_DrawSmallMappedPatch(x + 16, y - 4, 0, faceprefix, colormap);
+				else
+					V_DrawMappedPatch(x + 16, y - 4, 0, faceprefix, colormap);
+			}
+
+			if (pnum == whiteplayer)
+			{
+				UINT8 cursorframe = (intertic / 4) % 8;
+				V_DrawScaledPatch(x+16, y-4, 0, W_CachePatchName(va("K_CHILI%d", cursorframe+1), PU_PATCH));
+			}
+
+			STRBUFCPY(strtime, standings->name[i]);
+
+			if (standings->numplayers > NUMFORNEWCOLUMN)
+				V_DrawThinString(x+36, y-1, philicol|V_ALLOWLOWERCASE|V_6WIDTHSPACE, strtime);
+			else
+				V_DrawString(x+36, y, philicol|V_ALLOWLOWERCASE, strtime);
+
+			if (standings->rankingsmode)
+			{
+				if (standings->increase[pnum] != UINT8_MAX)
+				{
+					if (standings->increase[pnum] > 9)
+						snprintf(strtime, sizeof strtime, "(+%02d)", standings->increase[pnum]);
+					else
+						snprintf(strtime, sizeof strtime, "(+  %d)", standings->increase[pnum]);
+
+					if (standings->numplayers > NUMFORNEWCOLUMN)
+						V_DrawRightAlignedThinString(x+135+gutter, y-1, V_6WIDTHSPACE, strtime);
+					else
+						V_DrawRightAlignedString(x+120+gutter, y, 0, strtime);
+				}
+
+				snprintf(strtime, sizeof strtime, "%d", standings->val[i]);
+
+				if (standings->numplayers > NUMFORNEWCOLUMN)
+					V_DrawRightAlignedThinString(x+152+gutter, y-1, V_6WIDTHSPACE, strtime);
+				else
+					V_DrawRightAlignedString(x+152+gutter, y, 0, strtime);
+			}
+			else
+			{
+				if (standings->val[i] == (UINT32_MAX-1))
+					V_DrawRightAlignedThinString(x+152+gutter, y-1, (standings->numplayers > NUMFORNEWCOLUMN ? V_6WIDTHSPACE : 0), "NO CONTEST.");
+				else
+				{
+					if (intertype == int_race)
+					{
+						snprintf(strtime, sizeof strtime, "%i'%02i\"%02i", G_TicsToMinutes(standings->val[i], true),
+						G_TicsToSeconds(standings->val[i]), G_TicsToCentiseconds(standings->val[i]));
+						strtime[sizeof strtime - 1] = '\0';
+
+						if (standings->numplayers > NUMFORNEWCOLUMN)
+							V_DrawRightAlignedThinString(x+152+gutter, y-1, V_6WIDTHSPACE, strtime);
+						else
+							V_DrawRightAlignedString(x+152+gutter, y, 0, strtime);
+					}
+					else
+					{
+						if (standings->numplayers > NUMFORNEWCOLUMN)
+							V_DrawRightAlignedThinString(x+152+gutter, y-1, V_6WIDTHSPACE, va("%i", standings->val[i]));
+						else
+							V_DrawRightAlignedString(x+152+gutter, y, 0, va("%i", standings->val[i]));
+					}
+				}
+			}
+
+			if (standings->jitter[pnum] > 0)
+				y++;
 		}
-		else // If we don't find at least frame 1 (e.g VEXTRN1), let's just stop looking
-			stopSearching = true;
 
-		i++;
+		y += 18;
+
+		if (i == NUMFORNEWCOLUMN-1)
+		{
+			y = 41;
+			x += BASEVIDWIDTH/2;
+		}
+#undef NUMFORNEWCOLUMN
 	}
 }
 
@@ -384,49 +437,29 @@ static void Y_AnimatedVoteScreenCheck(void)
 //
 void Y_IntermissionDrawer(void)
 {
-	INT32 i, whiteplayer = MAXPLAYERS, x = 4, hilicol = V_YELLOWMAP; // fallback
+	INT32 x = 4, hilicol = V_YELLOWMAP; // fallback
 
 	if (intertype == int_none || rendermode == render_none)
 		return;
 
-	if (!usebuffer)
-		V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
-
-	if (cv_betainterscreen.value 
-#ifdef HWRENDER	
-	|| (rendermode == render_opengl && cv_grscreentextures.value != 2) // use the neato kart bg for intermission on disabled screen textures
+	if (cv_betainterscreen.value == 1
+#ifdef HWRENDER
+	|| (rendermode == render_opengl && cv_glscreentextures.value != 2) // use the neato kart bg for intermission on disabled screen textures
 #endif
 	)
 		V_DrawPatchFill(bgtile); // use the neato kart bg for intermission on disabled screen textures
-	//else if (useinterpic)
-		//V_DrawScaledPatch(0, 0, 0, interpic);
-	//else if (!usetile)
 	else
 	{
-		if (rendermode == render_soft && usebuffer)
-			VID_BlitLinearScreen(screens[1], screens[0], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes);
+		if (rendermode == render_soft)
+			VID_BlitLinearScreen(vid.screens[1], vid.screens[0], vid.width, vid.height, vid.width, vid.rowbytes);
 #ifdef HWRENDER
-		else if(rendermode != render_soft && usebuffer)
-		{
+		else if (rendermode == render_opengl)
 			HWR_DrawIntermissionBG();
-		}
 #endif
-		else
-		{
-			if (widebgpatch && rendermode == render_soft && vid.width / vid.dupx == 400)
-				V_DrawScaledPatch(0, 0, V_SNAPTOLEFT, widebgpatch);
-			else if (bgpatch)
-				V_DrawScaledPatch(0, 0, 0, bgpatch);
-		}
 	}
-	//else if (bgtile)
-		//V_DrawPatchFill(bgtile);
 
-	if (usebuffer) // Fade everything out
-		V_DrawFadeScreen(0xFF00, 22);
-
-	if (!splitscreen)
-		whiteplayer = demo.playback ? displayplayers[0] : consoleplayer;
+	// Fade everything out
+	V_DrawFadeScreen(0xFF00, 22);
 
 	if (cons_menuhighlight.value)
 		hilicol = cons_menuhighlight.value;
@@ -437,6 +470,7 @@ void Y_IntermissionDrawer(void)
 
 	if (sorttic != -1 && intertic >= sorttic && !demo.playback)
 	{
+		// yes this may actually overflow
 		INT64 count = (intertic - sorttic);
 
 		if (count < 8)
@@ -445,196 +479,8 @@ void Y_IntermissionDrawer(void)
 			x += (((((16 - count)<<FRACBITS) - R_GetHudUncap()) * vid.width)>>FRACBITS) / (8 * vid.dupx);
 	}
 
-	// SRB2kart 290117 - compeltely replaced this block.
-	/*if (intertype == int_timeattack)
-	{
-		// draw time
-		ST_DrawPatchFromHud(HUD_TIME, sbotime);
-		if (cv_timetic.value)
-			ST_DrawNumFromHud(HUD_SECONDS, data.coop.tics);
-		else
-		{
-			INT32 seconds, minutes, tictrn;
-
-			seconds = G_TicsToSeconds(data.coop.tics);
-			minutes = G_TicsToMinutes(data.coop.tics, true);
-			tictrn  = G_TicsToCentiseconds(data.coop.tics);
-
-			ST_DrawNumFromHud(HUD_MINUTES, minutes); // Minutes
-			ST_DrawPatchFromHud(HUD_TIMECOLON, sbocolon); // Colon
-			ST_DrawPadNumFromHud(HUD_SECONDS, seconds, 2); // Seconds
-
-			// SRB2kart - pulled from old coop block, just in case we need it
-			// we should show centiseconds on the intermission screen too, if the conditions are right.
-			if (modeattacking || cv_timetic.value == 2)
-			{
-				ST_DrawPatchFromHud(HUD_TIMETICCOLON, sboperiod); // Period
-				ST_DrawPadNumFromHud(HUD_TICS, tictrn, 2); // Tics
-			}
-
-			ST_DrawPatchFromHud(HUD_TIMETICCOLON, sboperiod); // Period
-			ST_DrawPadNumFromHud(HUD_TICS, tictrn, 2); // Tics
-		}
-
-		// draw the "got through act" lines and act number
-		V_DrawLevelTitle(data.coop.passedx1, 49, 0, data.coop.passed1);
-		V_DrawLevelTitle(data.coop.passedx2, 49+V_LevelNameHeight(data.coop.passed2)+2, 0, data.coop.passed2);
-
-		if (strlen(mapheaderinfo[prevmap]->actnum) > 0)
-			V_DrawScaledPatch(244, 57, 0, data.coop.ttlnum);
-
-		//if (gottimebonus && endtic != -1)
-		//	V_DrawCenteredString(BASEVIDWIDTH/2, 172, V_YELLOWMAP, "TIME BONUS UNLOCKED!");
-	}
-	else*/ if (intertype == int_race || intertype == int_match)
-	{
-#define NUMFORNEWCOLUMN 8
-		INT32 y = 41, gutter = ((data.match.numplayers > NUMFORNEWCOLUMN) ? 0 : (BASEVIDWIDTH/2));
-		INT32 dupadjust = (vid.width/vid.dupx), duptweak = (dupadjust - BASEVIDWIDTH)/2;
-		const char *timeheader;
-
-		if (data.match.rankingsmode)
-			timeheader = "RANK";
-		else
-			timeheader = (intertype == int_race ? "TIME" : "SCORE");
-
-		// draw the level name
-		V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 12, 0, data.match.levelstring);
-		V_DrawFill((x-3) - duptweak, 34, dupadjust-2, 1, 0);
-
-		if (data.match.encore)
-			V_DrawCenteredString(-4 + x + BASEVIDWIDTH/2, 12-8, hilicol, "ENCORE MODE");
-
-		if (data.match.numplayers > NUMFORNEWCOLUMN)
-		{
-			V_DrawFill(x+156, 24, 1, 158, 0);
-			V_DrawFill((x-3) - duptweak, 182, dupadjust-2, 1, 0);
-
-			V_DrawCenteredString(x+6+(BASEVIDWIDTH/2), 24, hilicol, "#");
-			V_DrawString(x+36+(BASEVIDWIDTH/2), 24, hilicol, "NAME");
-
-			V_DrawRightAlignedString(x+152, 24, hilicol, timeheader);
-		}
-
-		V_DrawCenteredString(x+6, 24, hilicol, "#");
-		V_DrawString(x+36, 24, hilicol, "NAME");
-
-		V_DrawRightAlignedString(x+(BASEVIDWIDTH/2)+152, 24, hilicol, timeheader);
-
-		for (i = 0; i < data.match.numplayers; i++)
-		{
-			boolean dojitter = data.match.jitter[data.match.num[i]];
-			data.match.jitter[data.match.num[i]] = 0;
-
-			if (data.match.num[i] != MAXPLAYERS && playeringame[data.match.num[i]] && !players[data.match.num[i]].spectator)
-			{
-				char strtime[MAXPLAYERNAME+1];
-
-				if (dojitter)
-					y--;
-
-				V_DrawCenteredString(x+6, y, 0, va("%d", data.match.pos[i]));
-
-				if (data.match.color[i])
-				{
-					UINT8 *colormap = R_GetTranslationColormap(*data.match.character[i], *data.match.color[i], GTC_CACHE);
-					// i fucking hate this i fucking hate this i hate this so much
-					if (!players[data.match.num[i]].skinlocal)
-					{
-						int skinIndex = players[data.match.num[i]].localskin ? players[data.match.num[i]].localskin - 1 : *data.match.character[i];
-
-						if (cv_highresportrait.value)
-							V_DrawSmallMappedPatch(x + 16, y - 4, 0, facewantprefix[skinIndex], colormap);
-						else
-							V_DrawMappedPatch(x + 16, y - 4, 0, facerankprefix[skinIndex], colormap);
-					}
-					else
-					{
-						if (cv_highresportrait.value)
-							V_DrawSmallMappedPatch(x + 16, y - 4, 0, localfacewantprefix[players[data.match.num[i]].localskin - 1], colormap);
-						else
-							V_DrawMappedPatch(x + 16, y - 4, 0, localfacerankprefix[players[data.match.num[i]].localskin - 1], colormap);
-					}
-				}
-
-				if (data.match.num[i] == whiteplayer)
-				{
-					UINT8 cursorframe = (intertic / 4) % 8;
-					V_DrawScaledPatch(x+16, y-4, 0, W_CachePatchName(va("K_CHILI%d", cursorframe+1), PU_CACHE));
-				}
-
-				STRBUFCPY(strtime, data.match.name[i]);
-
-				if (data.match.numplayers > NUMFORNEWCOLUMN)
-					V_DrawThinString(x+36, y-1, ((data.match.num[i] == whiteplayer) ? hilicol : 0)|V_ALLOWLOWERCASE|V_6WIDTHSPACE, strtime);
-				else
-					V_DrawString(x+36, y, ((data.match.num[i] == whiteplayer) ? hilicol : 0)|V_ALLOWLOWERCASE, strtime);
-
-				if (data.match.rankingsmode)
-				{
-					if (data.match.increase[data.match.num[i]] != UINT8_MAX)
-					{
-						if (data.match.increase[data.match.num[i]] > 9)
-							snprintf(strtime, sizeof strtime, "(+%02d)", data.match.increase[data.match.num[i]]);
-						else
-							snprintf(strtime, sizeof strtime, "(+  %d)", data.match.increase[data.match.num[i]]);
-
-						if (data.match.numplayers > NUMFORNEWCOLUMN)
-							V_DrawRightAlignedThinString(x+135+gutter, y-1, V_6WIDTHSPACE, strtime);
-						else
-							V_DrawRightAlignedString(x+120+gutter, y, 0, strtime);
-					}
-
-					snprintf(strtime, sizeof strtime, "%d", data.match.val[i]);
-
-					if (data.match.numplayers > NUMFORNEWCOLUMN)
-						V_DrawRightAlignedThinString(x+152+gutter, y-1, V_6WIDTHSPACE, strtime);
-					else
-						V_DrawRightAlignedString(x+152+gutter, y, 0, strtime);
-				}
-				else
-				{
-					if (data.match.val[i] == (UINT32_MAX-1))
-						V_DrawRightAlignedThinString(x+152+gutter, y-1, (data.match.numplayers > NUMFORNEWCOLUMN ? V_6WIDTHSPACE : 0), "NO CONTEST.");
-					else
-					{
-						if (intertype == int_race)
-						{
-							snprintf(strtime, sizeof strtime, "%i'%02i\"%02i", G_TicsToMinutes(data.match.val[i], true),
-							G_TicsToSeconds(data.match.val[i]), G_TicsToCentiseconds(data.match.val[i]));
-							strtime[sizeof strtime - 1] = '\0';
-
-							if (data.match.numplayers > NUMFORNEWCOLUMN)
-								V_DrawRightAlignedThinString(x+152+gutter, y-1, V_6WIDTHSPACE, strtime);
-							else
-								V_DrawRightAlignedString(x+152+gutter, y, 0, strtime);
-						}
-						else
-						{
-							if (data.match.numplayers > NUMFORNEWCOLUMN)
-								V_DrawRightAlignedThinString(x+152+gutter, y-1, V_6WIDTHSPACE, va("%i", data.match.val[i]));
-							else
-								V_DrawRightAlignedString(x+152+gutter, y, 0, va("%i", data.match.val[i]));
-						}
-					}
-				}
-
-				if (dojitter)
-					y++;
-			}
-			else
-				data.match.num[i] = MAXPLAYERS; // this should be the only field setting in this function
-
-			y += 18;
-
-			if (i == NUMFORNEWCOLUMN-1)
-			{
-				y = 41;
-				x += BASEVIDWIDTH/2;
-			}
-#undef NUMFORNEWCOLUMN
-		}
-	}
+	if (intertype == int_race || intertype == int_match)
+		Y_PlayerStandingsDrawer(&data, x, hilicol);
 
 	if (timer)
 	{
@@ -646,11 +492,11 @@ void Y_IntermissionDrawer(void)
 		else
 			string = va("%s starts in %d", cv_advancemap.string, tickdown);
 
-		V_DrawCenteredString(BASEVIDWIDTH/2, 188, hilicol,
-			string);
+		V_DrawCenteredString(BASEVIDWIDTH/2, 188, hilicol, string);
 	}
 
 	if ((demo.recording || demo.savemode == DSM_SAVED) && !demo.playback)
+	{
 		switch (demo.savemode)
 		{
 		case DSM_NOTSAVING:
@@ -668,15 +514,12 @@ void Y_IntermissionDrawer(void)
 		default: // Don't render any text here
 			break;
 		}
-
-	// Make it obvious that scrambling is happening next round.
-	if (cv_scrambleonchange.value && cv_teamscramble.value && (intertic/TICRATE % 2 == 0))
-		V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2, hilicol, M_GetText("Teams will be scrambled next round!"));
+	}
 
 	if (renderisnewtic)
 	{
 		LUA_HUD_ClearDrawList(luahuddrawlist_intermission);
-		LUAh_IntermissionHUD(luahuddrawlist_intermission);
+		LUA_HUDHOOK(intermission, luahuddrawlist_intermission);
 	}
 	LUA_HUD_DrawList(luahuddrawlist_intermission);
 }
@@ -695,7 +538,7 @@ void Y_Ticker(void)
 	{
 		INT32 axis = JoyAxis(AXISLOOKBACK, 1);
 
-		if (demo.savemode == DSM_NOTSAVING && (InputDown(gc_lookback, 1) || (cv_usejoystick.value && axis > 0)))
+		if (demo.savemode == DSM_NOTSAVING && (InputDown(gc_lookback, 1) || (cv_usejoystick[0].value && axis > 0)))
 			demo.savemode = DSM_TITLEENTRY;
 
 		if (demo.savemode == DSM_WILLSAVE || demo.savemode == DSM_WILLAUTOSAVE)
@@ -706,7 +549,7 @@ void Y_Ticker(void)
 	if (paused || P_AutoPause())
 		return;
 
-	LUAh_IntermissionThinker();
+	LUA_HOOK(IntermissionThinker);
 
 	intertic++;
 
@@ -728,8 +571,16 @@ void Y_Ticker(void)
 		return;
 	}
 
-	if (intertic < TICRATE || intertic & 1 || endtic != -1)
+	if (intertic < TICRATE || endtic != -1)
+	{
 		return;
+	}
+
+	if (data.rankingsmode && intertic & 1)
+	{
+		memset(data.jitter, 0, sizeof (data.jitter));
+		return;
+	}
 
 	if (intertype == int_race || intertype == int_match)
 	{
@@ -739,24 +590,24 @@ void Y_Ticker(void)
 				sorttic = intertic + max((cv_inttime.value/2)-2, 2)*TICRATE; // 8 second pause after match results
 			else if (!(multiplayer && demo.playback)) // Don't advance to rankings in replays
 			{
-				if (!data.match.rankingsmode && (intertic >= sorttic + 8))
+				if (!data.rankingsmode && (intertic >= sorttic + 8))
 					Y_CalculateMatchData(1, Y_CompareRank);
 
-				if (data.match.rankingsmode && intertic > sorttic+16+(2*TICRATE))
+				if (data.rankingsmode && intertic > sorttic+16+(2*TICRATE))
 				{
 					INT32 q=0,r=0;
 					boolean kaching = true;
 
-					for (q = 0; q < data.match.numplayers; q++)
+					for (q = 0; q < data.numplayers; q++)
 					{
-						if (data.match.num[q] == MAXPLAYERS
-						|| !data.match.increase[data.match.num[q]]
-						|| data.match.increase[data.match.num[q]] == UINT8_MAX)
+						if (data.num[q] == MAXPLAYERS
+						|| !data.increase[data.num[q]]
+						|| data.increase[data.num[q]] == UINT8_MAX)
 							continue;
 
 						r++;
-						data.match.jitter[data.match.num[q]] = 1;
-						if (--data.match.increase[data.match.num[q]])
+						data.jitter[data.num[q]] = 1;
+						if (--data.increase[data.num[q]])
 							kaching = false;
 					}
 
@@ -795,13 +646,13 @@ static void Y_UpdateRecordReplays(void)
 	if ((mainrecords[gamemap-1]->time == 0) || (players[consoleplayer].realtime < mainrecords[gamemap-1]->time))
 		mainrecords[gamemap-1]->time = players[consoleplayer].realtime;
 
-	if ((mainrecords[gamemap-1]->lap == 0) || (bestlap < mainrecords[gamemap-1]->lap))
-		mainrecords[gamemap-1]->lap = bestlap;
+	if ((mainrecords[gamemap-1]->lap == 0) || (players[consoleplayer].laptime[LAP_BEST] < mainrecords[gamemap-1]->lap))
+		mainrecords[gamemap-1]->lap = players[consoleplayer].laptime[LAP_BEST];
 
 	// Save demo!
 	bestdemo[255] = '\0';
 	lastdemo[255] = '\0';
-	G_SetDemoTime(players[consoleplayer].realtime, bestlap);
+	G_SetDemoTime(players[consoleplayer].realtime, players[consoleplayer].laptime[LAP_BEST]);
 	G_CheckDemoStatus();
 
 	I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755);
@@ -898,14 +749,10 @@ void Y_StartIntermission(void)
 
 		if (gametype == GT_MATCH)
 			intertype = int_match;
-		else //if (gametype == GT_RACE)
+		else
 			intertype = int_race;
 	}
 
-	// We couldn't display the intermission even if we wanted to.
-	// But we still need to give the players their score bonuses, dummy.
-	//if (dedicated) return;
-
 	// This should always exist, but just in case...
 	if(!mapheaderinfo[prevmap])
 		P_AllocMapHeader(prevmap);
@@ -922,7 +769,7 @@ void Y_StartIntermission(void)
 		}
 		case int_race: // (time-only race)
 		{
-			if (!majormods && !multiplayer && !demo.playback) // remove this once we have a proper time attack screen
+			if (!multiplayer && !demo.playback) // remove this once we have a proper time attack screen
 			{
 				// Update visitation flags
 				mapvisited[gamemap-1] |= MV_BEATEN;
@@ -942,12 +789,7 @@ void Y_StartIntermission(void)
 			break;
 	}
 
-	//if (intertype == int_race || intertype == int_match)
-	{
-		bgtile = W_CachePatchName("SRB2BACK", PU_STATIC);
-		//usetile = useinterpic = false;
-		usebuffer = true;
-	}
+	bgtile = W_CachePatchName("SRB2BACK", PU_PATCH);
 
 	LUA_HUD_DestroyDrawList(luahuddrawlist_intermission);
 	luahuddrawlist_intermission = LUA_HUD_CreateDrawList();
@@ -960,12 +802,12 @@ void Y_StartIntermission(void)
 //
 void Y_EndIntermission(void)
 {
-	Y_UnloadData();
+	if (!dedicated)
+		Y_UnloadData();
 
 	endtic = -1;
 	sorttic = -1;
 	intertype = int_none;
-	usebuffer = false;
 }
 
 //
@@ -979,56 +821,161 @@ static void Y_FollowIntermission(void)
 	G_AfterIntermission();
 }
 
-#define UNLOAD(x) Z_ChangeTag(x, PU_CACHE); x = NULL
+#define UNLOAD(x) {if ((x) != NULL) {Patch_Free(x);} x = NULL;}
 
 //
 // Y_UnloadData
 //
 static void Y_UnloadData(void)
 {
-	// In hardware mode, don't Z_ChangeTag a pointer returned by W_CachePatchName().
-	// It doesn't work and is unnecessary.
-	if (rendermode != render_soft)
-		return;
-
 	// unload the background patches
-	UNLOAD(bgpatch);
-	UNLOAD(widebgpatch);
+	UNLOAD(VoteScreen.bgpatch);
+	UNLOAD(VoteScreen.widebgpatch);
 	UNLOAD(bgtile);
 	//UNLOAD(interpic);
 }
 
 // SRB2Kart: Voting!
 
-// Y_DrawAnimatedVoteScreenPatch
 //
-// Draw animated patch based on frame counter on vote screen
+// Y_VoteScreenCheck
 //
-static inline void Y_DrawAnimatedVoteScreenPatch(boolean widePatch)
+static void Y_VoteScreenCheck(void)
 {
-	char tempAnimPrefix[7];
-	(widePatch) ? strcpy(tempAnimPrefix, animWidePrefix) : strcpy(tempAnimPrefix, animPrefix);
-	INT32 tempFoundAnimVoteFrames = (widePatch) ? foundAnimVoteWideFrames : foundAnimVoteFrames;
+	strcpy(VoteScreen.Prefix, "INTS");
+
+	if (VoteScreen.luaPrefix[0] != 0)
+		strlcpy(VoteScreen.Prefix, VoteScreen.luaPrefix, sizeof(VoteScreen.Prefix));
+	else if (G_BattleGametype())
+		strcpy(VoteScreen.Prefix, "BTLS");
+
+	VoteScreen.foundLuaVoteFrames = VoteScreen.foundLuaVoteWideFrames = 0;
+	VoteScreen.currentAnimFrame = 0;
+
+	INT32 i = 1;
+
+	// check for lua vote background replacements
+	for (;;)
+	{
+		// Check if the lumps exist (checking for VEXTR(N|W)xx for race and VEXTRB(N|W)xx for battle)
+		boolean normalLumpExists = W_LumpExists(va("%sC%d", VoteScreen.Prefix, i));
+		boolean wideLumpExists = W_LumpExists(va("%sW%d", VoteScreen.Prefix, i));
+
+		if (normalLumpExists || wideLumpExists)
+		{
+			if (normalLumpExists)
+				VoteScreen.foundLuaVoteFrames++;
+
+			if (wideLumpExists)
+				VoteScreen.foundLuaVoteWideFrames++;
+		}
+		else // If we don't find at least frame 1 (e.g VEXTRN1), let's just stop looking
+			break;
+
+		i++;
+	}
+
+	// non lua vote background handling
+	boolean prefbattletype = ((votelevels[0][1] & ~0x80) == GT_MATCH);
+	VoteScreen.widebgpatch = W_CachePatchName((prefbattletype ? "BATTLSCW" : "INTERSCW"), PU_PATCH);
+	VoteScreen.bgpatch = W_CachePatchName((prefbattletype ? "BATTLSCR" : "INTERSCR"), PU_PATCH);
+}
+
+//
+// Y_VoteBackgroundDrawer
+//
+// Determines which patch drawer to use for scaling
+//
+static void Y_VoteBackgroundDrawer(patch_t *patch)
+{
+	switch (cv_votebgscaling.value)
+	{
+		case 1: // adaptive
+			V_DrawAdaptiveScaledFullScreenPatch(patch);
+			break;
+		case 2: // vertical-fill
+			V_DrawVerticallyScaledFullScreenPatch(patch);
+			break;
+		case 3: // horizontal-fill
+			V_DrawHorizontallyScaledFullScreenPatch(patch);
+			break;
+		case 0: // vanilla
+		default:
+			V_DrawScaledPatch(((vid.width/2) / vid.dupx) - (patch->width/2),
+							  (vid.height / vid.dupy) - patch->height,
+							  V_SNAPTOTOP|V_SNAPTOLEFT, patch);
+			break;
+	}
+}
+
+//
+// Y_DrawLuaVoteScreenPatch
+//
+// Handles votebackgrounds set by "setVoteBackground"
+// Aswell as animated patches
+//
+static void Y_DrawLuaVoteScreenPatch(boolean widePatch)
+{
+	INT32 nextframe = 0;
+	patch_t *votebg = NULL;
+	char tempPrefix[6];
+	const INT32 tempfoundAnimLuaVoteFrames = ((widePatch ? VoteScreen.foundLuaVoteWideFrames : VoteScreen.foundLuaVoteFrames) - 1);
+
+	strcpy(tempPrefix, va("%s%s", VoteScreen.Prefix, (widePatch ? "W" : "C")));
+
+	// Draw non animated patch
+	if (!tempfoundAnimLuaVoteFrames)
+	{
+		votebg = W_CachePatchName(va("%s1", tempPrefix), PU_PATCH);
+		Y_VoteBackgroundDrawer(votebg);
+		return;
+	}
+
+	// Draw animated patch based on frame counter on vote screen
 
 	// Just in case someone provides LESS widescreen frames than normal frames or vice versa, reset the frame counter to 0
-	if (widePatch)
+	if (VoteScreen.currentAnimFrame > tempfoundAnimLuaVoteFrames)
+		VoteScreen.currentAnimFrame = 0;
+
+	nextframe = (VoteScreen.currentAnimFrame + 1);
+
+	votebg = W_CachePatchName(va("%s%d", tempPrefix, nextframe), PU_PATCH);
+
+	Y_VoteBackgroundDrawer(votebg);
+
+	if (renderisnewtic && (votetic % 2 == 0) && !paused)
+		VoteScreen.currentAnimFrame = (nextframe > tempfoundAnimLuaVoteFrames) ? 0 : nextframe;
+}
+
+//
+// Y_DrawVoteScreenPatch
+//
+static void Y_DrawVoteScreenPatch(void)
+{
+	patch_t *votebg = NULL;
+	const boolean widescreen = (vid.width / vid.dupx > 320);
+
+	if (VoteScreen.foundLuaVoteWideFrames || VoteScreen.foundLuaVoteFrames)
 	{
-		if (currentAnimFrame > foundAnimVoteWideFrames-1)
-			currentAnimFrame = 0;
-	}
-	else
-	{
-		if (currentAnimFrame > foundAnimVoteFrames-1)
-			currentAnimFrame = 0;
+		Y_DrawLuaVoteScreenPatch(((widescreen && VoteScreen.foundLuaVoteWideFrames) || !VoteScreen.foundLuaVoteFrames));
+		return;
 	}
 
-	patch_t *background = W_CachePatchName(va("%s%d", tempAnimPrefix, currentAnimFrame + 1), PU_CACHE);
-	V_DrawScaledPatch(((vid.width/2) / vid.dupx) - (SHORT(background->width)/2), // Keep the width/height adjustments, for screens that are less wide than 320(?)
-				(vid.height / vid.dupy) - SHORT(background->height),
-				V_SNAPTOTOP|V_SNAPTOLEFT, background);
+	// non widescreen patch
+	votebg = VoteScreen.bgpatch;
 
-	if (renderisnewtic && votetic % 2 == 0 && !paused)
-		currentAnimFrame = (currentAnimFrame + 1 > tempFoundAnimVoteFrames - 1) ? 0 : currentAnimFrame + 1;
+	UINT8 prefgametype = (votelevels[0][1] & ~0x80);
+	const boolean widebgreplaced = (prefgametype == GT_MATCH) ? VoteScreen.replaced.widebattle : VoteScreen.replaced.widerace;
+	const boolean bgreplaced = (prefgametype == GT_MATCH) ? VoteScreen.replaced.battle : VoteScreen.replaced.race;
+
+	// we check a bunch of stuff to always have a "valid" fallback
+	if ((widescreen && (widebgreplaced || !bgreplaced))
+	|| (!widescreen && (widebgreplaced && !bgreplaced)))
+	{
+		votebg = VoteScreen.widebgpatch; // widescreen patch
+	}
+
+	Y_VoteBackgroundDrawer(votebg);
 }
 
 //
@@ -1057,24 +1004,8 @@ void Y_VoteDrawer(void)
 
 	V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
 
-	if (widebgpatch && vid.width / vid.dupx > 320)
-	{
-		if (foundAnimVoteWideFrames == 0)
-			V_DrawScaledPatch(((vid.width/2) / vid.dupx) - (SHORT(widebgpatch->width)/2),
-								(vid.height / vid.dupy) - SHORT(widebgpatch->height),
-								V_SNAPTOTOP|V_SNAPTOLEFT, widebgpatch);
-		else
-			Y_DrawAnimatedVoteScreenPatch(true);
-	}
-	else
-	{
-		if (foundAnimVoteFrames == 0)
-			V_DrawScaledPatch(((vid.width/2) / vid.dupx) - (SHORT(bgpatch->width)/2), // Keep the width/height adjustments, for screens that are less wide than 320(?)
-								(vid.height / vid.dupy) - SHORT(bgpatch->height),
-								V_SNAPTOTOP|V_SNAPTOLEFT, bgpatch);
-		else
-			Y_DrawAnimatedVoteScreenPatch(false);
-	}
+	// decides which votebg to draw and draws it
+	Y_DrawVoteScreenPatch();
 
 	for (i = 0; i < 4; i++) // First, we need to figure out the height of this thing...
 	{
@@ -1097,6 +1028,7 @@ void Y_VoteDrawer(void)
 	}
 
 	y = (200-height)/2;
+
 	for (i = 0; i < 4; i++)
 	{
 		const char *str;
@@ -1106,7 +1038,7 @@ void Y_VoteDrawer(void)
 		if (i == 3)
 		{
 			str = "RANDOM";
-			pic = randomlvl;
+			pic = VoteScreen.randomlvl;
 		}
 		else
 		{
@@ -1130,7 +1062,7 @@ void Y_VoteDrawer(void)
 
 				if (!splitscreen)
 				{
-					thiscurs = cursor;
+					thiscurs = VoteScreen.cursor[0];
 					p = consoleplayer;
 					color = levelinfo[i].gtc;
 					colormap = NULL;
@@ -1140,19 +1072,19 @@ void Y_VoteDrawer(void)
 					switch (j)
 					{
 						case 1:
-							thiscurs = cursor2;
+							thiscurs = VoteScreen.cursor[2];
 							p = displayplayers[1];
 							break;
 						case 2:
-							thiscurs = cursor3;
+							thiscurs = VoteScreen.cursor[3];
 							p = displayplayers[2];
 							break;
 						case 3:
-							thiscurs = cursor4;
+							thiscurs = VoteScreen.cursor[4];
 							p = displayplayers[3];
 							break;
 						default:
-							thiscurs = cursor1;
+							thiscurs = VoteScreen.cursor[1];
 							p = displayplayers[0];
 							break;
 					}
@@ -1180,7 +1112,7 @@ void Y_VoteDrawer(void)
 			else
 			{
 				V_DrawFixedPatch((BASEVIDWIDTH-20)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/2, V_FLIP|V_SNAPTORIGHT, pic, 0);
-				V_DrawFixedPatch((BASEVIDWIDTH-60)<<FRACBITS, ((y+25)<<FRACBITS) - (rubyheight<<1), FRACUNIT, V_SNAPTORIGHT, rubyicon, NULL);
+				V_DrawFixedPatch((BASEVIDWIDTH-60)<<FRACBITS, ((y+25)<<FRACBITS) - (rubyheight<<1), FRACUNIT, V_SNAPTORIGHT, VoteScreen.rubyicon, NULL);
 			}
 
 			V_DrawRightAlignedThinString(BASEVIDWIDTH-21, 40+y, V_SNAPTORIGHT|V_6WIDTHSPACE, str);
@@ -1204,7 +1136,7 @@ void Y_VoteDrawer(void)
 			else
 			{
 				V_DrawFixedPatch((BASEVIDWIDTH-20)<<FRACBITS, y<<FRACBITS, FRACUNIT/4, V_FLIP|V_SNAPTORIGHT, pic, 0);
-				V_DrawFixedPatch((BASEVIDWIDTH-40)<<FRACBITS, (y<<FRACBITS) + (25<<(FRACBITS-1)) - rubyheight, FRACUNIT/2, V_SNAPTORIGHT, rubyicon, NULL);
+				V_DrawFixedPatch((BASEVIDWIDTH-40)<<FRACBITS, (y<<FRACBITS) + (25<<(FRACBITS-1)) - rubyheight, FRACUNIT/2, V_SNAPTORIGHT, VoteScreen.rubyicon, NULL);
 			}
 
 			if (levelinfo[i].gts)
@@ -1226,18 +1158,20 @@ void Y_VoteDrawer(void)
 		if (dedicated && i == 0) // While leaving blank spots for non-existent players is largely intentional, the first spot *always* being blank looks a tad silly :V
 			continue;
 
-		if ((playeringame[i] && !players[i].spectator) && votes[i] != -1)
+		player_t *player = &players[i];
+
+		if ((playeringame[i] && !player->spectator) && votes[i] != -1)
 		{
 			patch_t *pic;
 
 			if (votes[i] >= 3 && (i != pickedvote || voteendtic == -1))
-				pic = randomlvl;
+				pic = VoteScreen.randomlvl;
 			else
 				pic = levelinfo[votes[i]].pic;
 
 			if (!timer && i == voteclient.ranim)
 			{
-				V_DrawScaledPatch(x-18, y+9, V_SNAPTOLEFT, cursor);
+				V_DrawScaledPatch(x-18, y+9, V_SNAPTOLEFT, VoteScreen.cursor[0]);
 				if (voteendtic != -1 && !(votetic % 4))
 					V_DrawFill(x-1, y-1, 42, 27, 120|V_SNAPTOLEFT);
 				else
@@ -1249,7 +1183,7 @@ void Y_VoteDrawer(void)
 			else
 			{
 				V_DrawFixedPatch((x+40)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/4, V_SNAPTOLEFT|V_FLIP, pic, 0);
-				V_DrawFixedPatch((x+20)<<FRACBITS, (y<<FRACBITS) + (25<<(FRACBITS-1)) - rubyheight, FRACUNIT/2, V_SNAPTOLEFT, rubyicon, NULL);
+				V_DrawFixedPatch((x+20)<<FRACBITS, (y<<FRACBITS) + (25<<(FRACBITS-1)) - rubyheight, FRACUNIT/2, V_SNAPTOLEFT, VoteScreen.rubyicon, NULL);
 			}
 
 			if (levelinfo[votes[i]].gts)
@@ -1258,19 +1192,22 @@ void Y_VoteDrawer(void)
 				V_DrawDiag(x, y, 6, V_SNAPTOLEFT|levelinfo[votes[i]].gtc);
 			}
 
-			if (players[i].skincolor)
+			if (player->skincolor)
 			{
-				UINT8 *colormap = R_GetTranslationColormap(players[i].skin, players[i].skincolor, GTC_CACHE);
-				if (cv_highresportrait.value)
-					V_DrawSmallMappedPatch(x+24, y+9, V_SNAPTOLEFT, (players[i].skinlocal ? localfacewantprefix : facewantprefix)[((players[i].localskin) ? players[i].localskin-1 : players[i].skin)], colormap);
+				UINT8 *colormap = R_GetTranslationColormap(player->skin, player->skincolor, GTC_CACHE);
+
+				patch_t *faceprefix = K_GetFacePrefix(player, K_GetSkinNum(player));
+
+				if (K_UseHighResPortraits())
+					V_DrawSmallMappedPatch(x+24, y+9, V_SNAPTOLEFT, faceprefix, colormap);
 				else
-					V_DrawMappedPatch(x+24, y+9, V_SNAPTOLEFT, (players[i].skinlocal ? localfacerankprefix : facerankprefix)[((players[i].localskin) ? players[i].localskin-1 : players[i].skin)], colormap);
+					V_DrawMappedPatch(x+24, y+9, V_SNAPTOLEFT, faceprefix, colormap);
 			}
 
 			if (!splitscreen && i == consoleplayer)
 			{
 				UINT8 cursorframe = (votetic / 4) % 8;
-				V_DrawScaledPatch(x+24, y+9, V_SNAPTOLEFT, W_CachePatchName(va("K_CHILI%d", cursorframe+1), PU_CACHE));
+				V_DrawScaledPatch(x+24, y+9, V_SNAPTOLEFT, W_CachePatchName(va("K_CHILI%d", cursorframe+1), PU_PATCH));
 			}
 		}
 
@@ -1299,7 +1236,7 @@ void Y_VoteDrawer(void)
 	if (renderisnewtic)
 	{
 		LUA_HUD_ClearDrawList(luahuddrawlist_vote);
-		LUAh_VoteHUD(luahuddrawlist_vote);
+		LUA_HUDHOOK(vote, luahuddrawlist_vote);
 	}
 	LUA_HUD_DrawList(luahuddrawlist_vote);
 }
@@ -1346,7 +1283,7 @@ void Y_VoteTicker(void)
 	if (paused || P_AutoPause() || !voteclient.loaded)
 		return;
 
-	LUAh_VoteThinker();
+	LUA_HOOK(VoteThinker);
 
 	votetic++;
 
@@ -1535,10 +1472,28 @@ void Y_VoteTicker(void)
 //
 // MK online style voting screen, appears after intermission
 //
+
+static void Y_InitVoteDrawing(void)
+{
+	if (dedicated)
+		return;
+
+	// setup the background patches
+	Y_VoteScreenCheck();
+
+	VoteScreen.cursor[0] = W_CachePatchName("M_CURSOR", PU_PATCH);
+	VoteScreen.cursor[1] = W_CachePatchName("P1CURSOR", PU_PATCH);
+	VoteScreen.cursor[2] = W_CachePatchName("P2CURSOR", PU_PATCH);
+	VoteScreen.cursor[3] = W_CachePatchName("P3CURSOR", PU_PATCH);
+	VoteScreen.cursor[4] = W_CachePatchName("P4CURSOR", PU_PATCH);
+
+	VoteScreen.randomlvl = W_CachePatchName("RANDOMLV", PU_PATCH);
+	VoteScreen.rubyicon  = W_CachePatchName("RUBYICON", PU_PATCH);
+}
+
 void Y_StartVote(void)
 {
 	INT32 i = 0;
-	UINT8 prefgametype = (votelevels[0][1] & ~0x80);
 
 	votetic = -1;
 
@@ -1547,17 +1502,8 @@ void Y_StartVote(void)
 		I_Error("voteendtic is dirty");
 #endif
 
-	Y_AnimatedVoteScreenCheck();
-
-	widebgpatch = W_CachePatchName(((prefgametype == GT_MATCH) ? "BATTLSCW" : "INTERSCW"), PU_STATIC);
-	bgpatch = W_CachePatchName(((prefgametype == GT_MATCH) ? "BATTLSCR" : "INTERSCR"), PU_STATIC);
-	cursor = W_CachePatchName("M_CURSOR", PU_STATIC);
-	cursor1 = W_CachePatchName("P1CURSOR", PU_STATIC);
-	cursor2 = W_CachePatchName("P2CURSOR", PU_STATIC);
-	cursor3 = W_CachePatchName("P3CURSOR", PU_STATIC);
-	cursor4 = W_CachePatchName("P4CURSOR", PU_STATIC);
-	randomlvl = W_CachePatchName("RANDOMLV", PU_STATIC);
-	rubyicon = W_CachePatchName("RUBYICON", PU_STATIC);
+	// cache vote patches
+	Y_InitVoteDrawing();
 
 	timer = cv_votetime.value*TICRATE;
 	pickedvote = -1;
@@ -1623,11 +1569,14 @@ void Y_StartVote(void)
 			levelinfo[i].gts = NULL;
 
 		// set up the pic
-		lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(votelevels[i][0]+1)));
-		if (lumpnum != LUMPERROR)
-			levelinfo[i].pic = W_CachePatchName(va("%sP", G_BuildMapName(votelevels[i][0]+1)), PU_STATIC);
-		else
-			levelinfo[i].pic = W_CachePatchName("BLANKLVL", PU_STATIC);
+		if (!dedicated)
+		{
+			lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(votelevels[i][0]+1)));
+			if (lumpnum != LUMPERROR)
+				levelinfo[i].pic = W_CachePatchName(va("%sP", G_BuildMapName(votelevels[i][0]+1)), PU_PATCH);
+			else
+				levelinfo[i].pic = W_CachePatchName("BLANKLVL", PU_PATCH);
+		}
 	}
 
 	voteclient.loaded = true;
@@ -1652,18 +1601,18 @@ static void Y_UnloadVoteData(void)
 {
 	voteclient.loaded = false;
 
-	if (rendermode != render_soft)
+	if (dedicated)
 		return;
 
-	UNLOAD(widebgpatch);
-	UNLOAD(bgpatch);
-	UNLOAD(cursor);
-	UNLOAD(cursor1);
-	UNLOAD(cursor2);
-	UNLOAD(cursor3);
-	UNLOAD(cursor4);
-	UNLOAD(randomlvl);
-	UNLOAD(rubyicon);
+	UNLOAD(VoteScreen.widebgpatch);
+	UNLOAD(VoteScreen.bgpatch);
+	UNLOAD(VoteScreen.cursor[0]);
+	UNLOAD(VoteScreen.cursor[1]);
+	UNLOAD(VoteScreen.cursor[2]);
+	UNLOAD(VoteScreen.cursor[3]);
+	UNLOAD(VoteScreen.cursor[4]);
+	UNLOAD(VoteScreen.randomlvl);
+	UNLOAD(VoteScreen.rubyicon);
 
 	UNLOAD(levelinfo[3].pic);
 	UNLOAD(levelinfo[2].pic);
diff --git a/src/y_inter.h b/src/y_inter.h
index ee320d474..be8592357 100644
--- a/src/y_inter.h
+++ b/src/y_inter.h
@@ -10,7 +10,6 @@
 /// \brief Tally screens, or "Intermissions" as they were formally called in Doom
 
 extern boolean usebuffer;
-extern char *luaVoteScreen;
 
 void Y_IntermissionDrawer(void);
 void Y_Ticker(void);
@@ -23,6 +22,23 @@ void Y_StartVote(void);
 void Y_EndVote(void);
 void Y_SetupVoteFinish(SINT8 pick, SINT8 level);
 
+typedef struct
+{
+	UINT8 *color[MAXPLAYERS]; // Winner's color #
+	INT32 *character[MAXPLAYERS]; // Winner's character #
+	INT32 num[MAXPLAYERS]; // Winner's player #
+	char *name[MAXPLAYERS]; // Winner's name
+	INT32 numplayers; // Number of players being displayed
+	char levelstring[64]; // holds levelnames up to 64 characters
+	// SRB2kart
+	UINT8 increase[MAXPLAYERS]; // how much did the score increase by?
+	UINT8 jitter[MAXPLAYERS]; // wiggle
+	UINT32 val[MAXPLAYERS]; // Gametype-specific value
+	UINT8 pos[MAXPLAYERS]; // player positions. used for ties
+	boolean rankingsmode; // rankings mode
+	boolean encore; // encore mode
+} y_data_t;
+
 typedef enum
 {
 	int_none,
@@ -38,3 +54,37 @@ typedef enum
 	int_classicrace, // Competition
 } intertype_t;
 extern intertype_t intertype;
+
+// Votescreen stuff
+typedef struct
+{
+	boolean race;       // non lua race patch replaced
+	boolean widerace;   // non lua widescreen race patch replaced
+	boolean battle;     // non lua battle patch replaced
+	boolean widebattle; // non lua widescreen battle patch replaced
+} votereplace_t;
+
+// VEXTRN - Vote (V) Extra (EXT) Race (R) Normal (N - Normal sized patch)
+// VEXTRW - Vote (V) Extra (EXT) Race (R) Normal (W - Wide patch)
+// VEXTBN - Vote (V) Extra (EXT) Battle (B) Normal (N - Normal sized patch)
+// VEXTBW - Vote (V) Extra (EXT) Battle (B) Normal (W - Wide patch)
+typedef struct
+{
+	char Prefix[5];                 // Race = INTSX, Battle = BTLSX
+	char luaPrefix[5];              // prefix for lua votescreens
+
+	INT32 currentAnimFrame;         // current animated background frame
+
+	INT32 foundLuaVoteFrames;       // normal lua patch frames
+	INT32 foundLuaVoteWideFrames;   // widescreen lua patch frames
+
+	votereplace_t replaced;         // checks which non lua patch has been replaced
+
+	patch_t *bgpatch;               // votebackground patch
+	patch_t *widebgpatch;           // wide votebackground patch
+
+	patch_t *cursor[5];             // cursor patches
+	patch_t *randomlvl;             // randomlevel patch
+	patch_t *rubyicon;              // encore ruby patch
+} votescreen_t;
+extern votescreen_t VoteScreen;
diff --git a/src/z_zone.c b/src/z_zone.c
index b0223460b..8647f91fa 100644
--- a/src/z_zone.c
+++ b/src/z_zone.c
@@ -25,6 +25,9 @@
 ///        allocator was fragmenting badly. Finally, this version is a bit
 ///        simpler (about half the lines of code).
 
+#include <stddef.h>
+#include <stdalign.h>
+
 #include "doomdef.h"
 #include "doomstat.h"
 #include "r_patch.h"
@@ -67,8 +70,9 @@ typedef struct memblock_s
 	struct memblock_s *next, *prev;
 } memblock_t;
 
-#define MEMORY(x) (void *)((uintptr_t)(x) + sizeof(memblock_t))
-#define MEMBLOCK(x) (memblock_t *)((uintptr_t)(x) - sizeof(memblock_t))
+#define ALIGNPAD (((sizeof (memblock_t) + (alignof (max_align_t) - 1)) & ~(alignof (max_align_t) - 1)) - sizeof (memblock_t))
+#define MEMORY(x) (void *)((uintptr_t)(x) + sizeof(memblock_t) + ALIGNPAD)
+#define MEMBLOCK(x) (memblock_t *)((uintptr_t)(x) - ALIGNPAD - sizeof(memblock_t))
 
 // both the head and tail of the zone memory block list
 static memblock_t head;
@@ -145,9 +149,12 @@ void Z_Free(void *ptr)
 #endif
 #endif
 
-#ifdef ZDEBUG
+#ifdef ZDEBUG2
 	// Write every Z_Free call to a debug file.
 	CONS_Debug(DBG_MEMORY, "Z_Free at %s:%d\n", file, line);
+#elif defined(ZDEBUG)
+	(void)file;
+	(void)line;
 #endif
 
 	// anything that isn't by lua gets passed to lua just in case.
@@ -198,7 +205,7 @@ static void *xm(size_t size)
 	return p;
 }
 
-/** The Z_MallocAlign function.
+/** The Z_Malloc function.
   * Allocates a block of memory, adds it to a linked list so we can keep track of it.
   *
   * \param size Amount of memory to be allocated, in bytes.
@@ -206,28 +213,26 @@ static void *xm(size_t size)
   * \param user The address of a pointer to the memory to be allocated.
   *             When the memory is freed by Z_Free later,
   *             the pointer at this address will then be automatically set to NULL.
-  * \param alignbits The alignment of the memory to be allocated, in bits. Can be 0.
   * \note You can pass Z_Malloc() a NULL user if the tag is less than PU_PURGELEVEL.
-  * \sa Z_CallocAlign, Z_ReallocAlign
+  * \sa Z_Calloc, Z_Realloc
   */
 #ifdef ZDEBUG
-void *Z_Malloc2(size_t size, INT32 tag, void *user, INT32 alignbits,
+void *Z_Malloc2(size_t size, INT32 tag, void *user,
 	const char *file, INT32 line)
 #else
-void *Z_MallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits)
+void *Z_Malloc(size_t size, INT32 tag, void *user)
 #endif
 {
 	memblock_t *block;
 	void *ptr;
-	(void)(alignbits); // no longer used, so silence warnings.
 
 #ifdef ZDEBUG2
 	CONS_Debug(DBG_MEMORY, "Z_Malloc %s:%d\n", file, line);
 #endif
 
-	block = xm(sizeof (memblock_t) + size);
+	block = xm(sizeof (memblock_t) + ALIGNPAD + size);
 	ptr = MEMORY(block);
-	I_Assert((intptr_t)ptr % sizeof (void *) == 0);
+	I_Assert((intptr_t)ptr % alignof (max_align_t) == 0);
 
 #ifdef HAVE_VALGRIND
 	Z_calloc = false;
@@ -265,55 +270,53 @@ void *Z_MallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits)
 	return ptr;
 }
 
-/** The Z_CallocAlign function.
+/** The Z_Calloc function.
   * Allocates a block of memory, adds it to a linked list so we can keep track of it.
-  * Unlike Z_MallocAlign, this also initialises the bytes to zero.
+  * Unlike Z_Malloc, this also initialises the bytes to zero.
   *
   * \param size Amount of memory to be allocated, in bytes.
   * \param tag Purge tag.
   * \param user The address of a pointer to the memory to be allocated.
   *             When the memory is freed by Z_Free later,
   *             the pointer at this address will then be automatically set to NULL.
-  * \param alignbits The alignment of the memory to be allocated, in bits. Can be 0.
   * \note You can pass Z_Calloc() a NULL user if the tag is less than PU_PURGELEVEL.
-  * \sa Z_MallocAlign, Z_ReallocAlign
+  * \sa Z_Malloc, Z_Realloc
   */
 #ifdef ZDEBUG
-void *Z_Calloc2(size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line)
+void *Z_Calloc2(size_t size, INT32 tag, void *user, const char *file, INT32 line)
 #else
-void *Z_CallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits)
+void *Z_Calloc(size_t size, INT32 tag, void *user)
 #endif
 {
 #ifdef VALGRIND_MEMPOOL_ALLOC
 	Z_calloc = true;
 #endif
 #ifdef ZDEBUG
-	return memset(Z_Malloc2    (size, tag, user, alignbits, file, line), 0, size);
+	return memset(Z_Malloc2(size, tag, user, file, line), 0, size);
 #else
-	return memset(Z_MallocAlign(size, tag, user, alignbits            ), 0, size);
+	return memset(Z_Malloc (size, tag, user            ), 0, size);
 #endif
 }
 
-/** The Z_ReallocAlign function.
+/** The Z_Realloc function.
   * Reallocates a block of memory with a new size.
   *
   * \param ptr A pointer to allocated memory,
   *             assumed to have been allocated with Z_Malloc/Z_Calloc.
-  *             If NULL, this function instead acts as a wrapper for Z_CallocAlign.
+  *             If NULL, this function instead acts as a wrapper for Z_Calloc.
   * \param size New size of memory block, in bytes.
   *             If zero, then the memory is freed and NULL is returned.
   * \param tag New purge tag.
   * \param user The address of a pointer to the memory to be reallocated.
   *             This can be a different user to the one originally assigned to the memory block.
-  * \param alignbits The alignment of the memory to be allocated, in bits. Can be 0.
   * \return A pointer to the reallocated memory. Can be NULL if memory was freed.
   * \note You can pass Z_Realloc() a NULL user if the tag is less than PU_PURGELEVEL.
-  * \sa Z_MallocAlign, Z_CallocAlign
+  * \sa Z_Malloc, Z_Calloc
   */
 #ifdef ZDEBUG
-void *Z_Realloc2(void *ptr, size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line)
+void *Z_Realloc2(void *ptr, size_t size, INT32 tag, void *user, const char *file, INT32 line)
 #else
-void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignbits)
+void *Z_Realloc(void *ptr, size_t size, INT32 tag, void *user)
 #endif
 {
 	void *rez;
@@ -333,9 +336,9 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb
 	if (!ptr)
 	{
 #ifdef ZDEBUG
-		return Z_Calloc2(size, tag, user, alignbits, file , line);
+		return Z_Calloc2(size, tag, user, file, line);
 #else
-		return Z_CallocAlign(size, tag, user, alignbits);
+		return Z_Calloc(size, tag, user);
 #endif
 	}
 
@@ -343,9 +346,9 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb
 #ifdef PARANOIA
 	if (block->id != ZONEID)
 #ifdef ZDEBUG
-		I_Error("Z_ReallocAlign at %s:%d: wrong id", file, line);
+		I_Error("Z_Realloc at %s:%d: wrong id", file, line);
 #else
-		I_Error("Z_ReallocAlign: wrong id");
+		I_Error("Z_Realloc: wrong id");
 #endif
 #endif
 
@@ -353,11 +356,13 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb
 		return NULL;
 
 #ifdef ZDEBUG
+#ifdef ZDEBUG2
 	// Write every Z_Realloc call to a debug file.
 	DEBFILE(va("Z_Realloc at %s:%d\n", file, line));
-	rez = Z_Malloc2(size, tag, user, alignbits, file, line);
+#endif
+	rez = Z_Malloc2(size, tag, user, file, line);
 #else
-	rez = Z_MallocAlign(size, tag, user, alignbits);
+	rez = Z_Malloc(size, tag, user);
 #endif
 
 	if (size < block->realsize)
@@ -389,11 +394,19 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb
   * \param lowtag The lowest tag to consider.
   * \param hightag The highest tag to consider.
   */
+#ifdef ZDEBUG
+void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line)
+#else
 void Z_FreeTags(INT32 lowtag, INT32 hightag)
+#endif
 {
 	memblock_t *block, *next;
 
+#ifdef ZDEBUG
+	Z_CheckHeap2(file, line);
+#else
 	Z_CheckHeap(420);
+#endif
 	for (block = head.next; block != &head; block = next)
 	{
 		next = block->next; // get link before freeing
@@ -463,12 +476,20 @@ void Z_CheckMemCleanup(void)
   * \param i Identifies from where in the code Z_CheckHeap was called.
   * \author Graue <graue@oceanbase.org>
   */
-void Z_CheckHeap(INT32 i)
+#ifdef ZDEBUG
+void Z_CheckHeap2(const char *file, INT32 line)
+#else
+void Z_CheckHeap(INT32 tag)
+#endif
 {
 	memblock_t *block;
 	UINT32 blocknumon = 0;
 	void *given;
 
+#ifndef ZDEBUG
+	(void)tag;
+#endif
+
 	for (block = head.next; block != &head; block = block->next)
 	{
 		blocknumon++;
@@ -493,11 +514,19 @@ void Z_CheckHeap(INT32 i)
 #endif
 		if (block->user != NULL && *(block->user) != given)
 		{
-			I_Error("Z_CheckHeap %d: block %u"
+			I_Error("Z_CheckHeap"
+#ifdef ZDEBUG
+				"at %s %d :"
+#endif
+				"block %u"
 #ifdef ZDEBUG
 				"(owned by %s:%d)"
 #endif
-				" doesn't have a proper user", i, blocknumon
+				" doesn't have a proper user"
+#ifdef ZDEBUG
+				, file, line
+#endif
+				, blocknumon
 #ifdef ZDEBUG
 				, block->ownerfile, block->ownerline
 #endif
@@ -505,11 +534,19 @@ void Z_CheckHeap(INT32 i)
 		}
 		if (block->next->prev != block)
 		{
-			I_Error("Z_CheckHeap %d: block %u"
+			I_Error("Z_CheckHeap"
+#ifdef ZDEBUG
+				"at %s %d :"
+#endif
+				"block %u"
 #ifdef ZDEBUG
 				"(owned by %s:%d)"
 #endif
-				" lacks proper backlink", i, blocknumon
+				" lacks proper backlink"
+#ifdef ZDEBUG
+				, file, line
+#endif
+				, blocknumon
 #ifdef ZDEBUG
 				, block->ownerfile, block->ownerline
 #endif
@@ -517,11 +554,19 @@ void Z_CheckHeap(INT32 i)
 		}
 		if (block->prev->next != block)
 		{
-			I_Error("Z_CheckHeap %d: block %u"
+			I_Error("Z_CheckHeap"
+#ifdef ZDEBUG
+				"at %s %d :"
+#endif
+				"block %u"
 #ifdef ZDEBUG
 				"(owned by %s:%d)"
 #endif
-				" lacks proper forward link", i, blocknumon
+				" lacks proper forward link"
+#ifdef ZDEBUG
+				, file, line
+#endif
+				, blocknumon
 #ifdef ZDEBUG
 				, block->ownerfile, block->ownerline
 #endif
@@ -529,11 +574,19 @@ void Z_CheckHeap(INT32 i)
 		}
 		if (block->id != ZONEID)
 		{
-			I_Error("Z_CheckHeap %d: block %u"
+			I_Error("Z_CheckHeap"
+#ifdef ZDEBUG
+				"at %s %d :"
+#endif
+				"block %u"
 #ifdef ZDEBUG
 				"(owned by %s:%d)"
 #endif
-				" have the wrong ID", i, blocknumon
+				" have the wrong ID"
+#ifdef ZDEBUG
+				, file, line
+#endif
+				, blocknumon
 #ifdef ZDEBUG
 				, block->ownerfile, block->ownerline
 #endif
@@ -651,24 +704,30 @@ static void Command_Memfree_f(void)
 
 	Z_CheckHeap(-1);
 	CONS_Printf("\x82%s", M_GetText("Memory Info\n"));
-	CONS_Printf(M_GetText("Total heap used   : %7s KB\n"), sizeu1(Z_TagsUsage(0, INT32_MAX)>>10));
-	CONS_Printf(M_GetText("Static            : %7s KB\n"), sizeu1(Z_TagUsage(PU_STATIC)>>10));
-	CONS_Printf(M_GetText("Lua               : %7s KB\n"), sizeu1(Z_TagUsage(PU_LUA)>>10));
-	CONS_Printf(M_GetText("Static (sound)    : %7s KB\n"), sizeu1(Z_TagUsage(PU_SOUND)>>10));
-	CONS_Printf(M_GetText("Static (music)    : %7s KB\n"), sizeu1(Z_TagUsage(PU_MUSIC)>>10));
-	CONS_Printf(M_GetText("Locked cache      : %7s KB\n"), sizeu1(Z_TagUsage(PU_CACHE)>>10));
-	CONS_Printf(M_GetText("Level             : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVEL)>>10));
-	CONS_Printf(M_GetText("Special thinker   : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVSPEC)>>10));
-	CONS_Printf(M_GetText("All purgable      : %7s KB\n"),
+	CONS_Printf(M_GetText("Total heap used        : %7s KB\n"), sizeu1(Z_TotalUsage()>>10));
+	CONS_Printf(M_GetText("Lua                    : %7s KB\n"), sizeu1(Z_TagUsage(PU_LUA)>>10));
+	CONS_Printf(M_GetText("Static                 : %7s KB\n"), sizeu1(Z_TagUsage(PU_STATIC)>>10));
+	CONS_Printf(M_GetText("Static (sound)         : %7s KB\n"), sizeu1(Z_TagUsage(PU_SOUND)>>10));
+	CONS_Printf(M_GetText("Static (music)         : %7s KB\n"), sizeu1(Z_TagUsage(PU_MUSIC)>>10));
+	CONS_Printf(M_GetText("Patches                : %7s KB\n"), sizeu1(Z_TagUsage(PU_PATCH)>>10));
+	CONS_Printf(M_GetText("Patches (low priority) : %7s KB\n"), sizeu1(Z_TagUsage(PU_PATCH_LOWPRIORITY)>>10));
+	CONS_Printf(M_GetText("Patches (rotated)      : %7s KB\n"), sizeu1(Z_TagUsage(PU_PATCH_ROTATED)>>10));
+	CONS_Printf(M_GetText("Sprites                : %7s KB\n"), sizeu1(Z_TagUsage(PU_SPRITE)>>10));
+	CONS_Printf(M_GetText("HUD graphics           : %7s KB\n"), sizeu1(Z_TagUsage(PU_HUDGFX)>>10));
+	CONS_Printf(M_GetText("Locked cache           : %7s KB\n"), sizeu1(Z_TagUsage(PU_CACHE)>>10));
+	CONS_Printf(M_GetText("Level                  : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVEL)>>10));
+	CONS_Printf(M_GetText("Special thinker        : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVSPEC)>>10));
+	CONS_Printf(M_GetText("All purgable           : %7s KB\n"),
 		sizeu1(Z_TagsUsage(PU_PURGELEVEL, INT32_MAX)>>10));
 
 #ifdef HWRENDER
-	if (rendermode != render_soft && rendermode != render_none)
+	if (rendermode == render_opengl)
 	{
-		CONS_Printf(M_GetText("Patch info headers: %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHINFO)>>10));
-		CONS_Printf(M_GetText("Mipmap patches    : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHCOLMIPMAP)>>10));
-		CONS_Printf(M_GetText("HW Texture cache  : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRCACHE)>>10));
-		CONS_Printf(M_GetText("Plane polygons    : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPLANE)>>10));
+		CONS_Printf(M_GetText("Patch info headers     : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHINFO)>>10));
+		CONS_Printf(M_GetText("Cached textures        : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRCACHE)>>10));
+		CONS_Printf(M_GetText("Texture colormaps      : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHCOLMIPMAP)>>10));
+		CONS_Printf(M_GetText("Model textures         : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRMODELTEXTURE)>>10));
+		CONS_Printf(M_GetText("Plane polygons         : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPLANE)>>10));
 		CONS_Printf(M_GetText("All GPU textures       : %7d KB\n"), HWR_GetTextureUsed()>>10);
 	}
 #endif
@@ -679,8 +738,6 @@ static void Command_Memfree_f(void)
 	CONS_Printf(M_GetText("Available physical memory: %s KB\n"), sizeu1(freebytes>>10));
 }
 
-
-
 #ifdef ZDEBUG
 /** The function called by the "memdump" console command.
   * Prints zone memory debugging information (i.e. tag, size, location in code allocated).
diff --git a/src/z_zone.h b/src/z_zone.h
index 6125f2b3f..adbabb37e 100644
--- a/src/z_zone.h
+++ b/src/z_zone.h
@@ -14,6 +14,10 @@
 #ifndef __Z_ZONE__
 #define __Z_ZONE__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdio.h>
 #include "doomdef.h"
 #include "doomtype.h"
@@ -28,7 +32,7 @@
 #define FUNCALLOC(x)
 #endif
 
-//#define ZDEBUG
+#define ZDEBUG
 
 //
 // Purge tags
@@ -44,10 +48,17 @@ enum
 
 	PU_SOUND                 = 11, // static while playing
 	PU_MUSIC                 = 12, // static while playing
-	PU_HUDGFX                = 13, // static until WAD added
+
+	PU_PATCH                 = 14, // static entire execution time
+	PU_PATCH_LOWPRIORITY     = 15, // lower priority patch, static until level exited
+	PU_PATCH_ROTATED         = 16, // rotated patch, static until level exited or WAD added
+	PU_PATCH_DATA            = 17, // patch data, lifetime depends on the patch that owns it
+	PU_SPRITE                = 18, // sprite patch, static until WAD added
+	PU_HUDGFX                = 19, // HUD patch, static until WAD added
 
 	PU_HWRPATCHINFO          = 21, // Hardware GLPatch_t struct for OpenGL texture cache
 	PU_HWRPATCHCOLMIPMAP     = 22, // Hardware GLMipmap_t struct colormap variation of patch
+	PU_HWRMODELTEXTURE       = 23, // Hardware model texture
 
 	PU_HWRCACHE              = 48, // static until unlocked
 	PU_CACHE                 = 49, // static until unlocked
@@ -63,6 +74,7 @@ enum
 	PU_HWRCACHE_UNLOCKED     = 102, // 'unlocked' PU_HWRCACHE memory:
 									// 'second-level' cache for graphics
                                     // stored in hardware format and downloaded as needed
+	PU_HWRMODELTEXTURE_UNLOCKED = 103, // 'unlocked' PU_HWRMODELTEXTURE memory
 };
 
 //
@@ -80,30 +92,31 @@ void Z_Init(void);
 // Z_Free and alloc with alignment
 #ifdef ZDEBUG
 #define Z_Free(p)                 Z_Free2(p, __FILE__, __LINE__)
-#define Z_MallocAlign(s,t,u,a)    Z_Malloc2(s, t, u, a, __FILE__, __LINE__)
-#define Z_CallocAlign(s,t,u,a)    Z_Calloc2(s, t, u, a, __FILE__, __LINE__)
-#define Z_ReallocAlign(p,s,t,u,a) Z_Realloc2(p,s, t, u, a, __FILE__, __LINE__)
+#define Z_Malloc(s,t,u)    Z_Malloc2(s, t, u, __FILE__, __LINE__)
+#define Z_Calloc(s,t,u)    Z_Calloc2(s, t, u, __FILE__, __LINE__)
+#define Z_Realloc(p,s,t,u) Z_Realloc2(p,s, t, u, __FILE__, __LINE__)
 void Z_Free2(void *ptr, const char *file, INT32 line);
-void *Z_Malloc2(size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line) FUNCALLOC(1);
-void *Z_Calloc2(size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line) FUNCALLOC(1);
-void *Z_Realloc2(void *ptr, size_t size, INT32 tag, void *user, INT32 alignbits, const char *file, INT32 line) FUNCALLOC(2);
+void *Z_Malloc2(size_t size, INT32 tag, void *user, const char *file, INT32 line) FUNCALLOC(1);
+void *Z_Calloc2(size_t size, INT32 tag, void *user, const char *file, INT32 line) FUNCALLOC(1);
+void *Z_Realloc2(void *ptr, size_t size, INT32 tag, void *user, const char *file, INT32 line) FUNCALLOC(2);
 #else
 void Z_Free(void *ptr);
-void *Z_MallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits) FUNCALLOC(1);
-void *Z_CallocAlign(size_t size, INT32 tag, void *user, INT32 alignbits) FUNCALLOC(1);
-void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignbits) FUNCALLOC(2);
+void *Z_Malloc(size_t size, INT32 tag, void *user) FUNCALLOC(1);
+void *Z_Calloc(size_t size, INT32 tag, void *user) FUNCALLOC(1);
+void *Z_Realloc(void *ptr, size_t size, INT32 tag, void *user) FUNCALLOC(2);
 #endif
 
-// Alloc with standard alignment
-#define Z_Malloc(s,t,u)    Z_MallocAlign(s, t, u, sizeof(void *))
-#define Z_Calloc(s,t,u)    Z_CallocAlign(s, t, u, sizeof(void *))
-#define Z_Realloc(p,s,t,u) Z_ReallocAlign(p, s, t, u, sizeof(void *))
-
 // Free all memory by tag
 // these don't give line numbers for ZDEBUG currently though
 // (perhaps this should be changed in future?)
+#ifdef ZDEBUG
+#define Z_FreeTag(tagnum) Z_FreeTags2(tagnum, tagnum, __FILE__, __LINE__)
+#define Z_FreeTags(tagnum, tagnum2) Z_FreeTags2(tagnum, tagnum2, __FILE__, __LINE__)
+void Z_FreeTags2(INT32 lowtag, INT32 hightag, const char *file, INT32 line);
+#else
 #define Z_FreeTag(tagnum) Z_FreeTags(tagnum, tagnum)
 void Z_FreeTags(INT32 lowtag, INT32 hightag);
+#endif
 
 // Iterate memory by tag
 #define Z_IterateTag(tagnum, func) Z_IterateTags(tagnum, tagnum, func)
@@ -113,7 +126,13 @@ void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *));
 // Utility functions
 //
 void Z_CheckMemCleanup(void);
-void Z_CheckHeap(INT32 i);
+
+#ifdef ZDEBUG
+#define Z_CheckHeap(tag) Z_CheckHeap2(__FILE__, __LINE__)
+void Z_CheckHeap2(const char *file, INT32 line);
+#else
+void Z_CheckHeap(INT32 tag);
+#endif
 
 //
 // Zone memory modification
@@ -144,6 +163,9 @@ size_t Z_TagsUsage(INT32 lowtag, INT32 hightag);
 // Miscellaneous functions
 //
 char *Z_StrDup(const char *in);
-#define Z_Unlock(p) (void)p // TODO: remove this now that NDS code has been removed
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
 #endif
diff --git a/tools/.gitignore b/tools/.gitignore
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tools/IRC_Bot/SRB2MS_Bot.php b/tools/IRC_Bot/SRB2MS_Bot.php
deleted file mode 100644
index 842083bf9..000000000
--- a/tools/IRC_Bot/SRB2MS_Bot.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/* Based on parts of Example.php from SmartIRC
- * Example.php Copyright (c) 2002-2003 Mirco "MEEBEY" Bauer <mail@meebey.net> <http://www.meebey.net>
- * SRB2MS.php Copyright (c) 2004 by Logan Arias of Sonic Team JR.
- *
- * the Rest is Copyright (c) 2004 Logan Arias <Logan.GBA@gmail.net>
- * This is LGPL! that means you can change and use as you like
- * 
- * Full LGPL License: <http://www.meebey.net/lgpl.txt>
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-include_once('./SmartIRC.php');
-
-class SRB2MS_BOT
-{
-
-	function ListGamesPM(&$irc, &$data)
-	{
-		$fd = fsockopen("srb2.servegame.org", 28900, $errno, $errstr, 5);
-		if ($fd)
-		{
-			$buff = "000012360000";
-			fwrite($fd, $buff);
-			$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, 'Running SRB2 NetGames ');
-			while (1)
-			{
-				$content=fgets($fd, 13); // skip 13 first bytes
-				$content=fgets($fd, 1024);
-				$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "$content");
-				//echo "$content";
-				if (feof($fd)) break;
-			}
-		}
-		else
-		{
-			$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, 'The SRB2 MasterServer is not up');
-		}
-	}
-
-	function ListGamesChan(&$irc, &$data)
-	{
-		$fd = fsockopen("192.168.0.2", 28900, $errno, $errstr, 5);
-		if ($fd)
-		{
-			$buff = "000012360000";
-			fwrite($fd, $buff);
-			$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, 'Running SRB2 NetGames ');
-			while (1)
-			{
-				$content=fgets($fd, 13); // skip 13 first bytes
-				$content=fgets($fd, 1024);
-				$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "$content");
-				//echo "$content";
-				if (feof($fd)) break;
-			}
-		}
-		else
-		{
-			$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, 'The SRB2 MasterServer is not up');
-		}
-	}
-
-	function BeenInvited(&$irc, &$data)
-	{
-		if ($data->message == '#srb2fun')
-			$irc->join($data->message);
-		
-		foreach ($irc->channel['#srb2fun']->ops as $invitenick => $key )
-		{
-			if ($data->nick == $invitenick)
-			{
-				$irc->join($data->message);
-				return;
-			}
-			if ($data->nick == 'Logan_GBA')
-			{
-				$irc->join($data->message);
-				return;
-			}
-		}
-		foreach ($irc->channel['#srb2fun']->users as $nick => $key ) 
-		{
-			if ($data->nick == $nick)
-			{
-				$irc->kick('#srb2fun', $data->nick, "Sorry, but I don't like you, or your channel, $data->message");
-				return;
-			}
-		}
-		//$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "Sorry, but I don't like you, or your channel, $data->message");
-	}
-	
-	function Talk(&$irc, &$data)
-	{
-		foreach ($irc->channel['#srb2fun']->ops as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$msg = str_replace("!talk ", '', "$data->message");
-				$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun', $msg);
-				return;
-			}
-		}
-		foreach ($irc->channel['#srb2fun']->users as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$irc->kick('#srb2fun', $data->nick, 'Stop talking to me!');
-				return;
-			}
-		}		
-	}
-	
-	function Action(&$irc, &$data)
-	{
-		foreach ($irc->channel['#srb2fun']->ops as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$msg = str_replace("!action ", '', "$data->message");
-				$irc->message(SMARTIRC_TYPE_ACTION, '#srb2fun', $msg);
-				return;
-			}
-		}
-		foreach ($irc->channel['#srb2fun']->users as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$irc->kick('#srb2fun', $data->nick, 'Stop talking to me!');
-				return;
-			}
-		}	
-	}
-	
-	function Kick(&$irc, &$data)
-	{
-		foreach ($irc->channel['#srb2fun']->ops as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$msg = str_replace("!kick ", '', "$data->message");
-				$irc->kick('#srb2fun', $msg);
-				return;
-			}
-		}
-		foreach ($irc->channel['#srb2fun']->users as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$irc->kick('#srb2fun', $data->nick, 'Stop talking to me!');
-				return;
-			}
-		}		
-	}
-
-	function DebugPM(&$irc, &$data)
-	{
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "from:");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->from");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "nick:");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->nick");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "ident:");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->ident");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "host:");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->host");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "channel:");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->channel");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "message:");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->message");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "type:");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->type");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "rawmessage:");
-		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->rawmessage");
-	}
-
-}
-
-// the Bot is the Class SRB2MS_BOT
-$bot = &new SRB2MS_BOT();
-// Create SmartIRC, and name it as <network>irc for use to, well, do irc stuff ^_^
-$esperirc = &new Net_SmartIRC();
-//no Excess Flood!
-//$esperirc->setSendDelay(300);
-// To Debug or Not
-//$esperirc->setDebug(SMARTIRC_DEBUG_IRCMESSAGES);
-// Do connect to the Internet
-$esperirc->setUseSockets(TRUE);
-// Register the trigger !listgames as to call ListGames with the class of SRB2MS_BOT
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!gamelist$', $bot, 'ListGamesPM');
-$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!gamelist$', $bot, 'ListGamesChan');
-$esperirc->registerActionhandler(SMARTIRC_TYPE_INVITE, '', $bot, 'BeenInvited');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_ALL, '', $bot, 'DebugPM');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!talk', $bot, 'Talk');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!action', $bot, 'Action');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!kick', $bot, 'Kick');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!ban', $bot, 'Ban');
-// If you fail once, try agian
-$esperirc->setAutoRetry(TRUE);
-// Connect to EsperNet
-$esperirc->connect('cosmos.esper.net', 6667);
-// kep a list of all the users in the channel
-$esperirc->setChannelSyncing(TRUE);
-// Reconnect as needed
-$esperirc->setAutoReconnect(TRUE);
-// Use the name SRB2MS, and set other stuff
-$esperirc->login('SRB2MS2', 'Net_SmartIRC Client '.SMARTIRC_VERSION.' (SRB2MS_Bot.php)', 0, 'Net_SmartIRC');
-// Join #srb2fun and #srb2general
-$esperirc->join((array('#srb2general,#srb2fun')));
-// SRB2MS_Pass.php have "$esperirc->message(SMARTIRC_TYPE_QUERY, 'nickserv', 'identify <password>');"
-include('./SRB2MS_Pass.php');
-// Idle
-$esperirc->listen();
-// Rejoin?
-$esperirc->reconnect();
-?>
diff --git a/tools/IRC_Bot/SRB2MS_Bot_beta.php b/tools/IRC_Bot/SRB2MS_Bot_beta.php
deleted file mode 100644
index 3933d5405..000000000
--- a/tools/IRC_Bot/SRB2MS_Bot_beta.php
+++ /dev/null
@@ -1,739 +0,0 @@
-<?php
-/* Based on parts of Example.php from SmartIRC
- * Example.php Copyright (c) 2002-2003 Mirco "MEEBEY" Bauer <mail@meebey.net> <http://www.meebey.net>
- * SRB2MS.php Copyright (c) 2004 by Logan Arias of Sonic Team JR.
- *
- * the Rest is Copyright (c) 2004 Logan Arias <Logan.GBA@gmail.net>
- * This is LGPL! that means you can change and use as you like
- * 
- * Full LGPL License: <http://www.meebey.net/lgpl.txt>
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-include_once('./SmartIRC.php');
-define('MAGPIE_DIR', './magpierss/');
-// define('MAGPIE_CACHE_AGE', 30); // half-min
-require_once(MAGPIE_DIR.'rss_fetch.inc');
-require_once(MAGPIE_DIR.'rss_utils.inc');
-$today = getdate();
-$lastupdatetime = mktime($today['hours'],$today['minutes']-6,0,$today['mon'], $today['mday'], $today['year']);
-$lastlisttime = mktime($today['hours'],$today['minutes']-1,0,$today['mon'], $today['mday'], $today['year']);
-
-class SRB2MS_BOT
-{
-
-	function ListUsersPM(&$irc, &$data)
-	{
-		global $rssdatabase;
-		if ($rssdatabase->users[0])
-		{
-			$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, 'List of RSS users');
-			foreach ($rssdatabase->users as $users) 
-			{
-				$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "$users");
-			}
-		}
-		else
-		{
-			$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, 'there are no RSS users');
-		}
-	}
-
-	function RSSupdateuser(&$irc, &$data)
-	{
-		global $rssdatabase;
-		if ($rssdatabase->OnList("$data->nick"))
-		{
-			$irc->message(SMARTIRC_TYPE_NOTICE, $data->message, "I am trying to update $data->nick to $data->message from the list");
-			if ($rssdatabase->ReplaceUser("$data->nick","$data->message"))
-			{
-				$irc->message(SMARTIRC_TYPE_NOTICE, $data->message, "I have changed $data->nick to $data->message on the list");
-			}
-			else
-			{
-				$irc->message(SMARTIRC_TYPE_NOTICE, $data->message, "$data->nick was not on the list");
-			}
-		}
-	}
-	
-	function RSScheckuser(&$irc, &$data)
-	{
-		$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "I going to check if you are on the list");
-		global $rssdatabase;
-		if ($rssdatabase->OnList("$data->nick"))
-		{
-		$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "you are on the list");
-		}
-		else
-		{
-		$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "you are not on the list");
-		}
-	}
-
-	function RSSremoveuser(&$irc, &$data)
-	{
-		$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "I am trying to remove $data->nick from the list");
-		global $rssdatabase;
-		if ($rssdatabase->DeleteUser("$data->nick"))
-		{
-		$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "I have removed $data->nick from the list");
-		}
-		else
-		{
-		$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "$data->nick is not on the list");
-		}
-	}
-
-	function RSSadduser(&$irc, &$data)
-	{
-		$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "I am trying to add you $data->nick to the list");
-		global $rssdatabase;
-		if ($rssdatabase->AddUser("$data->nick"))
-		{
-		$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "I have added $data->nick to the list");
-		}
-		else
-		{
-		$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "$data->nick is already on the list");
-		}
-	}
-/*
-	function RSSListGamesPM(&$irc, &$data)
-	{
-		$content = $this->GenFeed();
-		$SRB2MSRSS10 = new MagpieRSS( $content );
-		if ($SRB2MSRSS10)
-		{
-			$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, 'Running SRB2 netgames ');
-			foreach ($SRB2MSRSS10->items as $item) 
-			{
-				$description = $item['dc']['description'];
-				$title = $item['title'];
-				$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "Name: $title $description");
-			}
-		}
-		else
-		{
-			$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, '.magpie_error()');
-			$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, 'The SRB2 MasterServer RSS feed is not up');
-		}
-	}
-*/
-	function RSSListUpdate(&$irc)
-	{
-		global $lastupdatetime;
-		global $SRB2MS_mute;
-		if ($SRB2MS_mute)
-		{
-			return;
-		}
-		$RSS10content = $this->GenFeed();
-		$SRB2MSRSS10 = new MagpieRSS( $RSS10content );
-		if ($SRB2MSRSS10)
-		{
-			//$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun', 'Running SRB2 netgames ');
-			foreach ($SRB2MSRSS10->items as $item) 
-			{
-				if ( $item['title'] == "No servers" ) 
-				{
-					// NOP
-				}
-				elseif ( $item['title'] == "No master server" ) 
-				{
-					// NOP
-				}
-				else
-				{
-					$published = parse_w3cdtf($item['dc']['date']);
-					if ( $published >= $lastupdatetime ) 
-					{
-						$title = $item['title'];
-						$serveraddress = $item['srb2ms']['address'];
-						$serverport = $item['srb2ms']['port'];
-						$serverversion = $item['srb2ms']['version'];
-						//if ( $serverversion == "1.09.3" )
-						//{
-						//	$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun'    , "New Server, $serveraddress:$serverport Name: $title");
-						//}
-						//else
-						{
-							$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun'    , "New Server, $serveraddress:$serverport Name: $title Version: $serverversion");
-						}
-						//$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2general', "New Server, Name: $title $description");
-					}
-					else
-					{
-						// NOP
-					}
-				}
-				
-			}
-			$today = getdate();
-			// update time
-			$lastupdatetime = mktime($today['hours'],$today['minutes'],0,$today['mon'], $today['mday'], $today['year']);
-		}
-		else
-		{
-			$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun', '.magpie_error()');
-			$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun', 'The SRB2 MasterServer RSS feed is not up');
-		}
-	}
-	
-	function Mute(&$irc, &$data)
-	{		
-		foreach ($irc->channel['#srb2fun']->ops as $nick => $key )
-		{
-			if ($data->nick == $nick || $data->nick == 'Logan_GBA')
-			{
-				global $lastupdatetime;
-				$today = getdate();
-				// update time
-				$lastupdatetime = mktime($today['hours'],$today['minutes'],0,$today['mon'], $today['mday'], $today['year']);
-				$GLOBALS['SRB2MS_mute'] = TRUE;
-				return;
-			}
-		}
-	}
-	
-	function Unmute(&$irc, &$data)
-	{		
-		foreach ($irc->channel['#srb2fun']->ops as $nick => $key )
-		{
-			if ($data->nick == $nick || $data->nick == 'Logan_GBA')
-			{
-				$GLOBALS['SRB2MS_mute'] = FALSE;
-				return;
-			}
-		}
-	}
-
-
-	function Mute2(&$irc, &$data)
-	{		
-		if ($data->nick == 'Logan_GBA')
-		{
-			global $lastupdatetime;
-			$today = getdate();
-			// update time
-			$lastupdatetime = mktime($today['hours'],$today['minutes'],0,$today['mon'], $today['mday'], $today['year']);
-			$GLOBALS['SRB2MS_mute'] = TRUE;
-		}
-	}
-	
-	function Unmute2(&$irc, &$data)
-	{		
-		if ($data->nick == 'Logan_GBA')
-		{
-			$GLOBALS['SRB2MS_mute'] = FALSE;
-		}
-	}
-
-	function RSSListGames(&$irc, &$data)
-	{
-		global $lastlisttime;
-		$content = $this->GenFeed();
-		$today = getdate();
-		//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, 'testing feed');
-		//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "$content");
-		//$content1 = $this->Gettextfromserver();
-		//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "$content1");
-		$SRB2MSRSS10 = new MagpieRSS( $content );
-		if ($SRB2MSRSS10)
-		{
-			if ((mktime($today['hours'],$today['minutes']-2,0,$today['mon'], $today['mday'], $today['year'])) >= $lastlisttime)
-			{
-					//$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun', 'Running SRB2 netgames ');
-					foreach ($SRB2MSRSS10->items as $item) 
-					{
-						if ( $item['title'] == "No servers" ) 
-						{
-							//0$description = $item['dc']['description'];
-							$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "No SRB2 Games are running, so why don't you start one?");
-						}
-						elseif ( $item['title'] == "No master server" )
-						{
-							$description = $item['dc']['description'];
-							$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "$description");
-						}
-						else
-						{
-							$title = $item['title'];
-							$serveraddress = $item['srb2ms']['address'];
-							$serverport = $item['srb2ms']['port'];
-							$serverversion = $item['srb2ms']['version'];
-							//if ( $serverport == " 5029" )
-							//{
-							//	$serverport = "5029";
-							//}
-							//if ( $serverversion == "1.09.3" )
-							//{
-							//	$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun'    , "$serveraddress:$serverport Name: $title");
-							//}
-							//else
-							{
-								$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun'    , "$serveraddress:$serverport Name: $title  Version: $serverversion");
-							}
-							
-						}
-					
-				}
-				$today = getdate();
-				$lastlisttime = mktime($today['hours'],$today['minutes'],0,$today['mon'], $today['mday'], $today['year']);
-			}
-
-		}
-		else
-		{
-			$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, ".magpie_error()");
-			$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, 'The SRB2 MasterServer RSS feed is not up');
-		}
-	}
-	
-	function RSSListGamesPM(&$irc, &$data)
-	{
-		global $lastlisttime;
-		$content = $this->GenFeed();
-		$today = getdate();
-		//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, 'testing feed');
-		//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "$content");
-		//$content1 = $this->Gettextfromserver();
-		//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "$content1");
-		$SRB2MSRSS10 = new MagpieRSS( $content );
-		if ($SRB2MSRSS10)
-		{
-			//if ((mktime($today['hours'],$today['minutes']-2,0,$today['mon'], $today['mday'], $today['year'])) >= $lastlisttime)
-			{
-					//$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun', 'Running SRB2 netgames ');
-					$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "Running SRB2 netgames from http://srb2.servegame.org/");
-					foreach ($SRB2MSRSS10->items as $item) 
-					{
-						if ( $item['title'] == "No servers" ) 
-						{
-							//0$description = $item['dc']['description'];
-							//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "No SRB2 Games are running, so why don't you start one?");
-						}
-						elseif ( $item['title'] == "No master server" )
-						{
-							$description = $item['dc']['description'];
-							//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "$description");
-						}
-						else
-						{
-							$title = $item['title'];
-							$serveraddress = $item['srb2ms']['address'];
-							$serverport = $item['srb2ms']['port'];
-							$serverversion = $item['srb2ms']['version'];
-							//if ( $serverport == " 5029" )
-							//{
-							//	$serverport = "5029";
-							//}
-							//if ( $serverversion == "1.09.3" )
-							//{
-							//	$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun'    , "$serveraddress:$serverport Name: $title");
-							//}
-							//else
-							{
-								$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "$serveraddress:$serverport Name: $title  Version: $serverversion");
-							}
-							
-						}
-					
-				}
-				$today = getdate();
-				$lastlisttime = mktime($today['hours'],$today['minutes'],0,$today['mon'], $today['mday'], $today['year']);
-			}
-
-		}
-		else
-		{
-			//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, ".magpie_error()");
-			//$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, 'The SRB2 MasterServer RSS feed is not up');
-		}
-	}
-
-	function ListGamesPM(&$irc, &$data)
-	{
-		$fd = fsockopen("srb2.servegame.org", 28900, $errno, $errstr, 5);
-		if ($fd)
-		{
-			$buff = "000012360000";
-			fwrite($fd, $buff);
-			$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, 'Running SRB2 netgames ');
-			while (1)
-			{
-				$content=fgets($fd, 13); // skip 13 first bytes
-				$content=fgets($fd, 1024);
-				$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, "$content");
-				//echo "$content";
-				if (feof($fd)) break;
-			}
-		}
-		else
-		{
-			$irc->message(SMARTIRC_TYPE_NOTICE, $data->nick, 'The SRB2 MasterServer is not up');
-		}
-	}
-
-	function ListGamesChan(&$irc, &$data)
-	{
-		global $lastlisttime;
-		$today = getdate();
-		$fd = fsockopen("srb2.servegame.org", 28900, $errno, $errstr, 5);
-		if ($fd)
-		{
-			stream_set_timeout ($fd, 5);
-			$buff = "000012360000";
-			fwrite($fd, $buff);
-			if ( (mktime($today['hours'],$today['minutes']-5,0,$today['mon'], $today['mday'], $today['year'])) >= $lastlisttime )
-			{
-				$content = "";
-				while (1)
-				{	
-					fgets($fd, 13); // skip 13 first bytes
-					$content = fgets($fd, 1024);
-					$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, "$content");
-					$today = getdate();
-					$lastlisttime = mktime($today['hours'],$today['minutes'],0,$today['mon'], $today['mday'], $today['year']);
-					if (feof($fd)) break;
-				}
-			}
-		}
-		else
-		{
-			$irc->message(SMARTIRC_TYPE_CHANNEL, $data->channel, 'The SRB2 MasterServer is not up');
-		}
-	}
-	
-	function byebye(&$irc, &$data)
-	{
-		foreach ($irc->channel['#srb2fun']->ops as $quitnick => $key )
-		{
-			if ($data->nick == $quitnick)
-			{
-				$irc->setAutoReconnect(FALSE);
-				$irc->setAutoRetry(FALSE);
-				$irc->quit('This quit was done by' + "$data->nick");
-				return;
-			}
-		}
-	}
-
-	function BeenInvited(&$irc, &$data)
-	{
-		if ($data->message == '#srb2fun')
-			$irc->join($data->message);
-		
-		foreach ($irc->channel['#srb2fun']->ops as $invitenick => $key )
-		{
-			if ($data->nick == $invitenick)
-			{
-				$irc->join($data->message);
-				return;
-			}
-		}
-		foreach ($irc->channel['#srb2fun']->users as $nick => $key ) 
-		{
-			if ($data->nick == $nick)
-			{
-				$irc->kick('#srb2fun', $data->nick, "Sorry, but I don't like you, or your channel, $data->message");
-				return;
-			}
-		}
-		//$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "Sorry, but I don't like you, or your channel, $data->message");
-	}
-
-	function Talk(&$irc, &$data)
-	{
-		foreach ($irc->channel['#srb2fun']->ops as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$msg = str_replace("!talk ", '', "$data->message");
-				$irc->message(SMARTIRC_TYPE_CHANNEL, '#srb2fun', $msg);
-				return;
-			}
-		}
-		foreach ($irc->channel['#srb2fun']->users as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$irc->kick('#srb2fun', $data->nick, 'Stop talking to me!');
-				return;
-			}
-		}		
-	}
-
-	function Action(&$irc, &$data)
-	{
-		foreach ($irc->channel['#srb2fun']->ops as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$msg = str_replace("!action ", '', "$data->message");
-				$irc->message(SMARTIRC_TYPE_ACTION, '#srb2fun', $msg);
-				return;
-			}
-		}
-		foreach ($irc->channel['#srb2fun']->users as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$irc->kick('#srb2fun', $data->nick, 'Stop talking to me!');
-				return;
-			}
-		}	
-	}
-
-	function Kick(&$irc, &$data)
-	{
-		foreach ($irc->channel['#srb2fun']->ops as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$msg = str_replace("!kick ", '', "$data->message");
-				$irc->kick('#srb2fun', $msg);
-				return;
-			}
-		}
-		foreach ($irc->channel['#srb2fun']->users as $nick => $key) 
-		{
-			if ($data->nick == $nick)
-			{
-				$irc->kick('#srb2fun', $data->nick, 'Stop talking to me!');
-				return;
-			}
-		}		
-	}
-
-	function DebugPM(&$irc, &$data)
-	{
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "from:");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->from");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "nick:");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->nick");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "ident:");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->ident");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "host:");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->host");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "channel:");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->channel");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "message:");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->message");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "type:");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->type");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "rawmessage:");
-//		$irc->message(SMARTIRC_TYPE_QUERY, $data->nick, "$data->rawmessage");
-		
-		$irc->message(SMARTIRC_TYPE_QUERY, "Alam_GBC", "from: $data->from");
-		$irc->message(SMARTIRC_TYPE_QUERY, "Alam_GBC", "nick: $data->nick");
-		$irc->message(SMARTIRC_TYPE_QUERY, "Alam_GBC", "ident: $data->ident");
-		$irc->message(SMARTIRC_TYPE_QUERY, "Alam_GBC", "host: $data->host");
-		$irc->message(SMARTIRC_TYPE_QUERY, "Alam_GBC", "channel: $data->channel");
-		$irc->message(SMARTIRC_TYPE_QUERY, "Alam_GBC", "message: $data->message");
-		$irc->message(SMARTIRC_TYPE_QUERY, "Alam_GBC", "type: $data->type");
-		$irc->message(SMARTIRC_TYPE_QUERY, "Alam_GBC", "rawmessage: $data->rawmessage");
-	}
-
-	function GetRSS10datafromserver()
-	{
-		$content = "";
-		$fd = fsockopen("srb2.servegame.org", 28900, $errno, $errstr, 5);
-		if ($fd)
-		{
-			$buff = "000012400000";
-			fwrite($fd, $buff);
-			while (1)
-			{
-				fgets($fd, 13); // skip 13 first bytes
-				$content .= fgets($fd, 1024);
-				if (feof($fd)) break;
-			}
-			fclose($fd);
-		}
-		else
-		{
-			$content = '<items>';
-			$content .= '<rdf:Seq>';
-			$content .= '<rdf:li rdf:resource="http://srb2.servegame.org/" />';
-			$content .= '</rdf:Seq>';
-			$content .= '</items>';
-			$content .= '</channel>';
-			$content .= "\n";
-			$content .= '<item rdf:about="http://srb2.servegame.org/"> ';
-			$content .= '<title>No master server</title><dc:description>The master server is not running</dc:description></item>';
-		}
-		return "$content";
-	}
-
-	function GenFeed()
-	{
-		$content = '<?xml version="1.0" encoding="ISO-8859-1"?>';
-		$content .= "\n";
-		$content .= '<rdf:RDF';
-		$content .= '  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"';
-		$content .= "\n";
-		$content .= '  xmlns="http://purl.org/rss/1.0/"';
-		$content .= "\n";
-		$content .= '  xmlns:dc="http://purl.org/dc/elements/1.1/"';
-		$content .= "\n";
-		$content .= '  xmlns:srb2ms="http://srb2.servegame.org/SRB2MS/elements/"';
-		$content .= "\n";
-		$content .= '>';
-		$content .= "\n";
-		$content .= "\n";
-		$content .= '  <channel rdf:about="http://srb2.servegame.org/srb2ms_status.php">';
-		$content .= "\n";
-		$content .= '    <title>SRB2 Master Server RSS Feed</title>';
-		$content .= "\n";
-		$content .= '    <link>http://srb2.servegame.org/srb2ms_status.php</link>';
-		$content .= "\n";
-		$content .= '    <description>Playing around with RSS</description>';
-		$content .= "\n";
-		$content .= '    <language>en-us</language>';
-		$content .= "\n";
-		$feed = $this->GetRSS10datafromserver();
-		$content .= "$feed";
-		$content .= '</rdf:RDF>';
-		return $content;
-	}
-}
-
-class RSSDataBase_Class
-{
-	var $users = array();
-	
-	function OnList($User)
-	{
-		$userbeenfound = FALSE;
-		foreach ($this->users as $Userlist) 
-		{
-			if ($Userlist == $User) {
-			$userbeenfound = TRUE; }
-		}
-		return $userbeenfound;
-	}
-
-	function AddUser($User)
-	{
-		$userbeenfound = FALSE;
-		foreach ($this->users as $Userlist) 
-		{
-			if ($Userlist == $User) {
-			$userbeenfound = TRUE; }
-		}
-		if (!$userbeenfound) {
-		$this->users[] = $User; 
-		}
-		return !$userbeenfound;
-	}
-	
-	function DeleteUser($User)
-	{
-		$userbeenfound = FALSE;
-		foreach ($this->users as $index => $Userlist) 
-		{
-			if ($Userlist == $User)
-			{
-			$userbeenfound = TRUE;
-			$id = $index;
-			}
-		}
-		if ($userbeenfound)
-		{
-			unset($this->users[$id]); 
-			$this->users = array_values($this->users);
-		}
-		return $userbeenfound;
-	}
-	function ReplaceUser($oldUser,$newUser)
-	{
-		$userbeenfound = FALSE;
-		foreach ($this->users as $index => $Userlist) 
-		{
-			if ($Userlist == $oldUser)
-			{
-			$userbeenfound = TRUE;
-			$id = $index;
-			}
-		}
-		if ($userbeenfound)
-		{
-			$this->users[$id] = $newUser;
-		}
-		return $userbeenfound;
-	}
-}
-// gobal var for muting the Bot
-$SRB2MS_mute = FALSE;
-//$SRB2MSRSS10 = fetch_rss( 'http://srb2.servegame.org/RSS1.0.php' );
-// thing to hold RSS stuff
-$rssdatabase = &new RSSDataBase_Class();
-// PHP error reporting
-//error_reporting(E_ERROR);
-// the Bot is the Class SRB2MS_BOT
-$bot = &new SRB2MS_BOT();
-// Create SmartIRC, and name it as <network>irc for use to, well, do irc stuff ^_^
-$esperirc = &new Net_SmartIRC();
-// To Debug or Not
-//$esperirc->setDebug(SMARTIRC_DEBUG_ALL);
-// Do connect to the Internet
-$esperirc->setUseSockets(TRUE);
-// kep a list of all the users in the channel
-$esperirc->setChannelSyncing(TRUE);
-// Register the triggers with the class of SRB2MS_BOT
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!gamelist$', $bot, 'ListGamesChan');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!gamelist$', $bot, 'ListGamesPM');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!RSSgamelist$', $bot, 'RSSListGamesPM');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!gamelist0$', $bot, 'RSSListGames');
-$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!gamelist$', $bot, 'RSSListGamesPM');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!gamelist$', $bot, 'RSSListGamesPM');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!addme$', $bot, 'RSSadduser');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!removeme$', $bot, 'RSSremoveuser');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!listusers$', $bot, 'ListUsersPM');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_NICKCHANGE, '', $bot, 'RSSupdateuser');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!checkme$', $bot, 'RSScheckuser');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!shutdown$', $bot, 'byebye');
-$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!mute$', $bot, 'Mute');
-$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!unmute$', $bot, 'Unmute');
-$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!shutup$', $bot, 'Mute2');
-$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!talktome$', $bot, 'Unmute2');
-$esperirc->registerTimehandler(120000, $bot, 'RSSListUpdate');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_CHANNEL, '^!gamelist$', $bot, 'ListGamesChan');
-$esperirc->registerActionhandler(SMARTIRC_TYPE_INVITE, '', $bot, 'BeenInvited');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!talk', $bot, 'Talk');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!action', $bot, 'Action');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!kick', $bot, 'Kick');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_QUERY, '^!ban', $bot, 'Ban');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_ALL, '', $bot, 'DebugPM');
-//$esperirc->registerActionhandler(SMARTIRC_TYPE_KICK | SMARTIRC_TYPE_QUIT | SMARTIRC_TYPE_PART, '', $bot, 'DebugPM');
-// If you fail once, try agian
-$esperirc->setAutoRetry(TRUE);
-// Connect to EsperNet
-//$esperirc->connect('irc.esper.net', 6667);
-$esperirc->connect('excalibur.esper.net', 6667);
-// Reconnect as needed
-$esperirc->setAutoReconnect(TRUE);
-// Use the name SRB2MS, and set other stuff
-$esperirc->login('SRB2MS', 'Net_SmartIRC Client '.SMARTIRC_VERSION.' (SRB2MS_Bot.php)', 0, 'Net_SmartIRC');
-// Join #srb2fun
-$esperirc->join(array('#srb2fun'));
-// SRB2MS_Pass.php have "$esperirc->message(SMARTIRC_TYPE_QUERY, 'nickserv', 'identify <password>');"
-include('./SRB2MS_Pass.php');
-// Idle
-$esperirc->listen();
-// Rejoin?
-$esperirc->reconnect();
-
-?>
diff --git a/tools/IRC_Bot/SmartIRC.php b/tools/IRC_Bot/SmartIRC.php
deleted file mode 100644
index e0167a8e5..000000000
--- a/tools/IRC_Bot/SmartIRC.php
+++ /dev/null
@@ -1,2553 +0,0 @@
-<?php
-/**
- * $Id: SmartIRC.php,v 1.54.2.14 2005/05/27 23:40:09 meebey Exp $
- * $Revision: 1.54.2.14 $
- * $Author: meebey $
- * $Date: 2005/05/27 23:40:09 $
- *
- * Net_SmartIRC
- * This is a PHP class for communication with IRC networks,
- * which conforms to the RFC 2812 (IRC protocol).
- * It's an API that handles all IRC protocol messages.
- * This class is designed for creating IRC bots, chats and show irc related info on webpages.
- *
- * Documenation, a HOWTO and examples are in SmartIRC included.
- *
- * Here you will find a service bot which I am also developing
- * <http://cvs.meebey.net/atbs> and <http://cvs.meebey.net/phpbitch>
- * Latest versions of Net_SmartIRC you will find on the project homepage
- * or get it through PEAR since SmartIRC is an official PEAR package.
- * See <http://pear.php.net/Net_SmartIRC>.
- *
- * Official Projet Homepage: <http://sf.net/projects/phpsmartirc>
- *
- * Net_SmartIRC conforms to RFC 2812 (Internet Relay Chat: Client Protocol)
- * 
- * Copyright (c) 2002-2003 Mirco 'meebey' Bauer <meebey@meebey.net> <http://www.meebey.net>
- * 
- * Full LGPL License: <http://www.gnu.org/licenses/lgpl.txt>
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-// ------- PHP code ----------
-include_once('SmartIRC/defines.php');
-include_once('SmartIRC/irccommands.php');
-include_once('SmartIRC/messagehandler.php');
-define('SMARTIRC_VERSION', '1.0.0 ($Revision: 1.54.2.14 $)');
-define('SMARTIRC_VERSIONSTRING', 'Net_SmartIRC '.SMARTIRC_VERSION);
-
-/**
- * main SmartIRC class
- *
- * @package Net_SmartIRC
- * @version 0.5.5
- * @author Mirco 'meebey' Bauer <mail@meebey.net>
- * @access public
- */
-class Net_SmartIRC_base
-{
-    /**
-     * @var resource
-     * @access private
-     */
-    var $_socket;
-    
-    /**
-     * @var string
-     * @access private
-     */
-    var $_address;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_port;
-    
-    /**
-     * @var string
-     * @access private
-     */
-    var $_nick;
-    
-    /**
-     * @var string
-     * @access private
-     */
-    var $_username;
-    
-    /**
-     * @var string
-     * @access private
-     */
-    var $_realname;
-    
-    /**
-     * @var string
-     * @access private
-     */
-    var $_usermode;
-    
-    /**
-     * @var string
-     * @access private
-     */
-    var $_password;
-    
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_state = false;
-    
-    /**
-     * @var array
-     * @access private
-     */
-    var $_actionhandler = array();
-    
-    /**
-     * @var array
-     * @access private
-     */
-    var $_timehandler = array();
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_debug = SMARTIRC_DEBUG_NOTICE;
-    
-    /**
-     * @var array
-     * @access private
-     */
-    var $_messagebuffer = array();
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_messagebuffersize;
-    
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_usesockets = false;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_receivedelay = 100;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_senddelay = 250;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_logdestination = SMARTIRC_STDOUT;
-    
-    /**
-     * @var resource
-     * @access private
-     */
-    var $_logfilefp = 0;
-    
-    /**
-     * @var string
-     * @access private
-     */
-    var $_logfile = 'Net_SmartIRC.log';
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_disconnecttime = 1000;
-    
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_loggedin = false;
-    
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_benchmark = false;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_benchmark_starttime;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_benchmark_stoptime;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_actionhandlerid = 0;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_timehandlerid = 0;
-    
-    /**
-     * @var array
-     * @access private
-     */
-    var $_motd = array();
-    
-    /**
-     * @var array
-     * @access private
-     */
-    var $_channels = array();
-    
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_channelsyncing = false;
-    
-    /**
-     * @var string
-     * @access private
-     */
-    var $_ctcpversion;
-    
-    /**
-     * @var mixed
-     * @access private
-     */
-    var $_mintimer = false;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_maxtimer = 300000;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_txtimeout = 300;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_rxtimeout = 300;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_selecttimeout;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_lastrx;
-    
-    /**
-     * @var integer
-     * @access private
-     */
-    var $_lasttx;
-    
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_autoreconnect = false;
-    
-    /**
-     * @var boolean
-     * @access private
-     */
-    var $_autoretry = false;
-    
-    /**
-     * All IRC replycodes, the index is the replycode name.
-     *
-     * @see $SMARTIRC_replycodes
-     * @var array
-     * @access public
-     */
-    var $replycodes;
-    
-    /**
-     * All numeric IRC replycodes, the index is the numeric replycode.
-     *
-     * @see $SMARTIRC_nreplycodes
-     * @var array
-     * @access public
-     */
-    var $nreplycodes;
-    
-    /**
-     * Stores all channels in this array where we are joined, works only if channelsyncing is activated.
-     * Eg. for accessing a user, use it like this: (in this example the SmartIRC object is stored in $irc)
-     * $irc->channel['#test']->users['meebey']->nick;
-     *
-     * @see setChannelSyncing()
-     * @see Net_SmartIRC_channel
-     * @see Net_SmartIRC_channeluser
-     * @var array
-     * @access public
-     */
-    var $channel;
-    
-    /**
-     * Constructor. Initiales the messagebuffer and "links" the replycodes from
-     * global into properties. Also some PHP runtime settings are configured.
-     *
-     * @access public
-     * @return void
-     */
-    function Net_SmartIRC_base()
-    {
-        // precheck
-        $this->_checkPHPVersion();
-        
-        ob_implicit_flush(true);
-        @set_time_limit(0);
-        ignore_user_abort(true);
-        $this->_messagebuffer[SMARTIRC_CRITICAL] = array();
-        $this->_messagebuffer[SMARTIRC_HIGH] = array();
-        $this->_messagebuffer[SMARTIRC_MEDIUM] = array();
-        $this->_messagebuffer[SMARTIRC_LOW] = array();
-        $this->replycodes = &$GLOBALS['SMARTIRC_replycodes'];
-        $this->nreplycodes = &$GLOBALS['SMARTIRC_nreplycodes'];
-        
-        // hack till PHP allows (PHP5) $object->method($param)->$object
-        $this->channel = &$this->_channels;
-        // another hack
-        $this->user = &$this->_users;
-        
-        if (isset($_SERVER['REQUEST_METHOD'])) {
-            // the script is called from a browser, lets set default log destination
-            // to SMARTIRC_BROWSEROUT (makes browser friendly output)
-            $this->setLogdestination(SMARTIRC_BROWSEROUT);
-        }
-    }
-    
-    /**
-     * Enables/disables the usage of real sockets.
-     *
-     * Enables/disables the usage of real sockets instead of fsocks
-     * (works only if your PHP build has loaded the PHP socket extension)
-     * Default: false
-     *
-     * @param bool $boolean
-     * @return void
-     * @access public
-     */
-    function setUseSockets($boolean)
-    {
-        if ($boolean === true) {
-            if (@extension_loaded('sockets')) {
-                $this->_usesockets = true;
-            } else {
-                $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: socket extension not loaded, trying to load it...', __FILE__, __LINE__);
-                
-                if (strtoupper(substr(PHP_OS, 0,3) == 'WIN')) {
-                    $load_status = @dl('php_sockets.dll');
-                } else {
-                    $load_status = @dl('sockets.so');
-                }
- 
-                if ($load_status) {
-                    $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: socket extension succesfully loaded', __FILE__, __LINE__);
-                    $this->_usesockets = true;
-                } else {
-                    $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: couldn\'t load the socket extension', __FILE__, __LINE__);
-                    $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: your PHP build doesn\'t support real sockets, will use fsocks instead', __FILE__, __LINE__);
-                    $this->_usesockets = false;
-                }
-            }
-        } else {
-            $this->_usesockets = false;
-        }
-    }
-    
-    /**
-     * Sets the level of debug messages.
-     *
-     * Sets the debug level (bitwise), useful for testing/developing your code.
-     * Here the list of all possible debug levels:
-     * SMARTIRC_DEBUG_NONE
-     * SMARTIRC_DEBUG_NOTICE
-     * SMARTIRC_DEBUG_CONNECTION
-     * SMARTIRC_DEBUG_SOCKET
-     * SMARTIRC_DEBUG_IRCMESSAGES
-     * SMARTIRC_DEBUG_MESSAGETYPES
-     * SMARTIRC_DEBUG_ACTIONHANDLER
-     * SMARTIRC_DEBUG_TIMEHANDLER
-     * SMARTIRC_DEBUG_MESSAGEHANDLER
-     * SMARTIRC_DEBUG_CHANNELSYNCING
-     * SMARTIRC_DEBUG_MODULES
-     * SMARTIRC_DEBUG_USERSYNCING
-     * SMARTIRC_DEBUG_ALL
-     *
-     * Default: SMARTIRC_DEBUG_NOTICE
-     *
-     * @see DOCUMENTATION
-     * @see SMARTIRC_DEBUG_NOTICE
-     * @param integer $level
-     * @return void
-     * @access public
-     */
-    function setDebug($level)
-    {
-        $this->_debug = $level;
-    }
-    
-    /**
-     * Enables/disables the benchmark engine.
-     * 
-     * @param boolean $boolean
-     * @return void
-     * @access public
-     */
-    function setBenchmark($boolean)
-    {
-        if (is_bool($boolean)) {
-            $this->_benchmark = $boolean;
-        } else {
-            $this->_benchmark = false;
-        }
-    }
-    
-    /**
-     * Deprecated, use setChannelSyncing() instead!
-     *
-     * @deprecated
-     * @param boolean $boolean
-     * @return void
-     * @access public
-     */
-    function setChannelSynching($boolean)
-    {
-        $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: you are using setChannelSynching() which is a deprecated method, use setChannelSyncing() instead!', __FILE__, __LINE__);
-        $this->setChannelSyncing($boolean);
-    }
-    
-    /**
-     * Enables/disables channel syncing.
-     *
-     * Channel syncing means, all users on all channel we are joined are tracked in the
-     * channel array. This makes it very handy for botcoding.
-     * 
-     * @param boolean $boolean
-     * @return void
-     * @access public
-     */
-    function setChannelSyncing($boolean)
-    {
-        if (is_bool($boolean)) {
-            $this->_channelsyncing = $boolean;
-        } else {
-            $this->_channelsyncing = false;
-        }
-        
-        if ($this->_channelsyncing == true) {
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: Channel syncing enabled', __FILE__, __LINE__);
-        } else {
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: Channel syncing disabled', __FILE__, __LINE__);
-        }
-    }
-    
-    /**
-     * Sets the CTCP version reply string.
-     * 
-     * @param string $versionstring
-     * @return void
-     * @access public
-     */
-    function setCtcpVersion($versionstring)
-    {
-        $this->_ctcpversion = $versionstring;
-    }
-    
-    /**
-     * Sets the destination of all log messages.
-     *
-     * Sets the destination of log messages.
-     * $type can be:
-     * SMARTIRC_FILE for saving the log into a file
-     * SMARTIRC_STDOUT for echoing the log to stdout
-     * SMARTIRC_SYSLOG for sending the log to the syslog
-     * Default: SMARTIRC_STDOUT
-     *
-     * @see SMARTIRC_STDOUT
-     * @param integer $type must be on of the constants
-     * @return void
-     * @access public
-     */
-    function setLogdestination($type)
-    {
-        switch ($type) {
-            case (SMARTIRC_FILE ||
-                  SMARTIRC_STDOUT ||
-                  SMARTIRC_SYSLOG ||
-                  SMARTIRC_BROWSEROUT ||
-                  SMARTIRC_NONE):
-                $this->_logdestination = $type;
-            break;
-            default:
-                $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: unknown logdestination type ('.$type.'), will use STDOUT instead', __FILE__, __LINE__);
-                $this->_logdestination = SMARTIRC_STDOUT;
-        }
-    }
-    
-    /**
-     * Sets the file for the log if the destination is set to file.
-     *
-     * Sets the logfile, if {@link setLogdestination logdestination} is set to SMARTIRC_FILE.
-     * This should be only used with full path!
-     *
-     * @param string $file 
-     * @return void
-     * @access public
-     */
-    function setLogfile($file)
-    {
-        $this->_logfile = $file;
-    }
-    
-    /**
-     * Sets the delaytime before closing the socket when disconnect.
-     *
-     * @param integer $milliseconds
-     * @return void
-     * @access public
-     */
-    function setDisconnecttime($milliseconds)
-    {
-        if (is_integer($milliseconds) && $milliseconds >= 100) {
-            $this->_disconnecttime = $milliseconds;
-        } else {
-            $this->_disconnecttime = 100;
-        }
-    }
-    
-    /**
-     * Sets the delay for receiving data from the IRC server.
-     *
-     * Sets the delaytime between messages that are received, this reduces your CPU load.
-     * Don't set this too low (min 100ms).
-     * Default: 100
-     *
-     * @param integer $milliseconds
-     * @return void
-     * @access public
-     */
-    function setReceivedelay($milliseconds)
-    {
-        if (is_integer($milliseconds) && $milliseconds >= 100) {
-            $this->_receivedelay = $milliseconds;
-        } else {
-            $this->_receivedelay = 100;
-        }
-    }
-    
-    /**
-     * Sets the delay for sending data to the IRC server.
-     *
-     * Sets the delaytime between messages that are sent, because IRC servers doesn't like floods.
-     * This will avoid sending your messages too fast to the IRC server.
-     * Default: 250
-     *
-     * @param integer $milliseconds
-     * @return void
-     * @access public
-     */
-    function setSenddelay($milliseconds)
-    {
-        if (is_integer($milliseconds)) {
-            $this->_senddelay = $milliseconds;
-        } else {
-            $this->_senddelay = 250;
-        }
-    }
-    
-    /**
-     * Enables/disables autoreconnecting.
-     * 
-     * @param boolean $boolean
-     * @return void
-     * @access public
-     */
-    function setAutoReconnect($boolean)
-    {
-        if (is_bool($boolean)) {
-            $this->_autoreconnect = $boolean;
-        } else {
-            $this->_autoreconnect = false;
-        }
-    }
-    
-    /**
-     * Enables/disables autoretry for connecting to a server.
-     * 
-     * @param boolean $boolean
-     * @return void
-     * @access public
-     */
-    function setAutoRetry($boolean)
-    {
-        if (is_bool($boolean)) {
-            $this->_autoretry = $boolean;
-        } else {
-            $this->_autoretry = false;
-        }
-    }
-    
-    /**
-     * Sets the receive timeout.
-     *
-     * If the timeout occurs, the connection will be reinitialized
-     * Default: 300 seconds
-     *
-     * @param integer $seconds
-     * @return void
-     * @access public
-     */
-    function setReceiveTimeout($seconds)
-    {
-        if (is_integer($seconds)) {
-            $this->_rxtimeout = $seconds;
-        } else {
-            $this->_rxtimeout = 300;
-        }
-    }
-    
-    /**
-     * Sets the transmit timeout.
-     *
-     * If the timeout occurs, the connection will be reinitialized
-     * Default: 300 seconds
-     *
-     * @param integer $seconds
-     * @return void
-     * @access public
-     */
-    function setTransmitTimeout($seconds)
-    {
-        if (is_integer($seconds)) {
-            $this->_txtimeout = $seconds;
-        } else {
-            $this->_txtimeout = 300;
-        }
-    }
-    
-    /**
-     * Starts the benchmark (sets the counters).
-     *
-     * @return void
-     * @access public
-     */
-    function startBenchmark()
-    {
-        $this->_benchmark_starttime = $this->_microint();
-        $this->log(SMARTIRC_DEBUG_NOTICE, 'benchmark started', __FILE__, __LINE__);
-    }
-    
-    /**
-     * Stops the benchmark and displays the result.
-     *
-     * @return void
-     * @access public
-     */
-    function stopBenchmark()
-    {
-        $this->_benchmark_stoptime = $this->_microint();
-        $this->log(SMARTIRC_DEBUG_NOTICE, 'benchmark stopped', __FILE__, __LINE__);
-        
-        if ($this->_benchmark) {
-            $this->showBenchmark();
-        }
-    }
-    
-    /**
-     * Shows the benchmark result.
-     *
-     * @return void
-     * @access public
-     */
-    function showBenchmark()
-    {
-        $this->log(SMARTIRC_DEBUG_NOTICE, 'benchmark time: '.((float)$this->_benchmark_stoptime-(float)$this->_benchmark_starttime), __FILE__, __LINE__);
-    }
-    
-    /**
-     * Adds an entry to the log.
-     *
-     * Adds an entry to the log with Linux style log format.
-     * Possible $level constants (can also be combined with "|"s)
-     * SMARTIRC_DEBUG_NONE
-     * SMARTIRC_DEBUG_NOTICE
-     * SMARTIRC_DEBUG_CONNECTION
-     * SMARTIRC_DEBUG_SOCKET
-     * SMARTIRC_DEBUG_IRCMESSAGES
-     * SMARTIRC_DEBUG_MESSAGETYPES
-     * SMARTIRC_DEBUG_ACTIONHANDLER
-     * SMARTIRC_DEBUG_TIMEHANDLER
-     * SMARTIRC_DEBUG_MESSAGEHANDLER
-     * SMARTIRC_DEBUG_CHANNELSYNCING
-     * SMARTIRC_DEBUG_MODULES
-     * SMARTIRC_DEBUG_USERSYNCING
-     * SMARTIRC_DEBUG_ALL
-     *
-     * @see SMARTIRC_DEBUG_NOTICE
-     * @param integer $level bit constants (SMARTIRC_DEBUG_*)
-     * @param string $entry the new log entry
-     * @return void
-     * @access public
-     */
-    function log($level, $entry, $file = null, $line = null)
-    {
-        // prechecks
-        if (!(is_integer($level)) ||
-            !($level & SMARTIRC_DEBUG_ALL)) {
-            $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: invalid log level passed to log() ('.$level.')', __FILE__, __LINE__);
-            return;
-        }
-        
-        if (!($level & $this->_debug) ||
-             ($this->_logdestination == SMARTIRC_NONE)) {
-            return;
-        }
-        
-        if (substr($entry, -1) != "\n") {
-            $entry .= "\n";
-        }
-        
-        if ($file !== null &&
-            $line !== null) {
-            $file = basename($file);
-            $entry = $file.'('.$line.') '.$entry;
-        } else {
-            $entry = 'unknown(0) '.$entry;
-        }
-        
-        $formatedentry = date('M d H:i:s ').$entry;
-        switch ($this->_logdestination) {
-            case SMARTIRC_STDOUT:
-                echo $formatedentry;
-                flush();
-            break;
-            case SMARTIRC_BROWSEROUT:
-                echo '<pre>'.htmlentities($formatedentry).'</pre>';
-            break;
-            case SMARTIRC_FILE:
-                if (!is_resource($this->_logfilefp)) {
-                    if ($this->_logfilefp === null) {
-                        // we reconncted and don't want to destroy the old log entries
-                        $this->_logfilefp = @fopen($this->_logfile,'a');
-                    } else {
-                        $this->_logfilefp = @fopen($this->_logfile,'w');
-                    }
-                }
-                @fwrite($this->_logfilefp, $formatedentry);
-                fflush($this->_logfilefp);
-            break;
-            case SMARTIRC_SYSLOG:
-                define_syslog_variables();
-                if (!is_int($this->_logfilefp)) {
-                    $this->_logfilefp = openlog('Net_SmartIRC', LOG_NDELAY, LOG_DAEMON);
-                }
-                syslog(LOG_INFO, $entry);
-            break;
-        }
-    }
-    
-    /**
-     * Returns the full motd.
-     *
-     * @return array
-     * @access public
-     */
-    function getMotd()
-    {
-        return $this->_motd;
-    }
-    
-    /**
-     * Returns the usermode.
-     *
-     * @return string
-     * @access public
-     */
-    function getUsermode()
-    {
-        return $this->_usermode;
-    }
-    
-    /**
-     * Creates the sockets and connects to the IRC server on the given port.
-     *
-     * @param string $address 
-     * @param integer $port
-     * @return void
-     * @access public
-     */
-    function connect($address, $port)
-    {
-        $this->log(SMARTIRC_DEBUG_CONNECTION, 'DEBUG_CONNECTION: connecting', __FILE__, __LINE__);
-        $this->_address = $address;
-        $this->_port = $port;
-        
-        if ($this->_usesockets == true) {
-            $this->log(SMARTIRC_DEBUG_SOCKET, 'DEBUG_SOCKET: using real sockets', __FILE__, __LINE__);
-            $this->_socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-            $result = @socket_connect($this->_socket, $this->_address, $this->_port);
-        } else {
-            $this->log(SMARTIRC_DEBUG_SOCKET, 'DEBUG_SOCKET: using fsockets', __FILE__, __LINE__);
-            $result = @fsockopen($this->_address, $this->_port, $errno, $errstr);
-        }
-        
-        if ($result === false) {
-            if ($this->_usesockets == true) {
-                $error = socket_strerror(socket_last_error($this->_socket));
-            } else {
-                $error = $errstr.' ('.$errno.')';
-            }
-            
-            $error_msg = 'couldn\'t connect to "'.$address.'" reason: "'.$error.'"';
-            $this->log(SMARTIRC_DEBUG_NOTICE, 'DEBUG_NOTICE: '.$error_msg, __FILE__, __LINE__);
-            // TODO! muss return wert sein
-            $this->throwError($error_msg);
-            
-            // doesn't work somehow.... I only want to retry 4 times! no endless loop (causes segfault)
-            static $tries = 0;
-            if ($this->_autoretry == true && $tries < 5) {
-                $this->reconnect();
-                $tries++;
-            } else {
-                die();
-            }
-        } else {
-            $this->log(SMARTIRC_DEBUG_CONNECTION, 'DEBUG_CONNECTION: connected', __FILE__, __LINE__);
-            
-            if ($this->_usesockets != true) {
-                $this->_socket = $result;
-                $this->log(SMARTIRC_DEBUG_SOCKET, 'DEBUG_SOCKET: activating nonblocking fsocket mode', __FILE__, __LINE__);
-                socket_set_blocking($this->_socket, false);
-            }
-        }
-        
-        $this->_lastrx = time();
-        $this->_lasttx = $this->_lastrx;
-        $this->_updatestate();
-        
-        if ($result !== false) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-    
-    /**
-     * Disconnects from the IRC server nicely with a QUIT or just destroys the socket.
-     *
-     * Disconnects from the IRC server in the given quickness mode.
-     * $quickdisconnect:
-     * true, just close the socket
-     * false, send QUIT and wait {@link $_disconnectime $_disconnectime} before closing the socket
-     *
-     * @param boolean $quickdisconnect default: false
-     * @return boolean
-     * @access public
-     */
-    function disconnect($quickdisconnect = false)
-    {
-        if ($this->_state() == SMARTIRC_STATE_CONNECTED) {
-            if ($quickdisconnect == false) {
-                $this->_send('QUIT', SMARTIRC_CRITICAL);
-                usleep($this->_disconnecttime*1000);
-            }
-            
-            if ($this->_usesockets == true) {
-                @socket_shutdown($this->_socket);
-                @socket_close($this->_socket);
-            } else {
-                fclose($this->_socket);
-            }
-            
-            $this->_updatestate();
-            $this->log(SMARTIRC_DEBUG_CONNECTION, 'DEBUG_CONNECTION: disconnected', __FILE__, __LINE__);
-        } else {
-            return false;
-        }
-        
-        if ($this->_channelsyncing == true) {
-            // let's clean our channel array
-            $this->_channels = array();
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: cleaned channel array', __FILE__, __LINE__);
-        }
-        
-        if ($this->_logdestination == SMARTIRC_FILE) {
-            fclose($this->_logfilefp);
-            $this->_logfilefp = null;
-        } else if ($this->_logdestination == SMARTIRC_SYSLOG) {
-            closelog();
-        }
-        
-        return true;
-    }
-    
-    /**
-     * Reconnects to the IRC server with the same login info,
-     * it also rejoins the channels
-     *
-     * @return void
-     * @access public
-     */
-    function reconnect()
-    {
-        $this->log(SMARTIRC_DEBUG_CONNECTION, 'DEBUG_CONNECTION: reconnecting...', __FILE__, __LINE__);
-        
-        // remember in which channels we are joined
-        $channels = array();
-        foreach ($this->_channels as $value) {
-            if (empty($value->key)) {
-                $channels[] = array('name' => $value->name);
-            } else {
-                $channels[] = array('name' => $value->name, 'key' => $value->key);
-            }
-        }
-        
-        $this->disconnect(true);
-        $this->connect($this->_address, $this->_port);
-        $this->login($this->_nick, $this->_realname, $this->_usermode, $this->_username, $this->_password);
-        
-        // rejoin the channels
-        foreach ($channels as $value) {
-            if (isset($value['key'])) {
-                $this->join($value['name'], $value['key']);
-            } else {
-                $this->join($value['name']);
-            }
-        }
-    }
-    
-    /**
-     * login and register nickname on the IRC network
-     *
-     * Registers the nickname and user information on the IRC network.
-     *
-     * @param string $nick
-     * @param string $realname
-     * @param integer $usermode
-     * @param string $username
-     * @param string $password
-     * @return void
-     * @access public
-     */
-    function login($nick, $realname, $usermode = 0, $username = null, $password = null)
-    {
-        $this->log(SMARTIRC_DEBUG_CONNECTION, 'DEBUG_CONNECTION: logging in', __FILE__, __LINE__);
-        
-        $this->_nick = str_replace(' ', '', $nick);
-        $this->_realname = $realname;
-        
-        if ($username !== null) {
-            $this->_username = str_replace(' ', '', $username);
-        } else {
-            $this->_username = str_replace(' ', '', exec('whoami'));
-        }
-        
-        if ($password !== null) {
-            $this->_password = $password;
-            $this->_send('PASS '.$this->_password, SMARTIRC_CRITICAL);
-        }
-        
-        if (!is_numeric($usermode)) {
-            $this->log(SMARTIRC_DEBUG_NOTICE, 'DEBUG_NOTICE: login() usermode ('.$usermode.') is not valid, will use 0 instead', __FILE__, __LINE__);
-            $usermode = 0;
-        }
-        
-        $this->_send('NICK '.$this->_nick, SMARTIRC_CRITICAL);
-        $this->_send('USER '.$this->_username.' '.$usermode.' '.SMARTIRC_UNUSED.' :'.$this->_realname, SMARTIRC_CRITICAL);
-    }
-    
-    // </IRC methods>
-    
-    /**
-     * checks if we or the given user is joined to the specified channel and returns the result
-     * ChannelSyncing is required for this.
-     *
-     * @see setChannelSyncing
-     * @param string $channel
-     * @param string $nickname
-     * @return boolean
-     * @access public
-     */
-    function isJoined($channel, $nickname = null)
-    {
-        if ($this->_channelsyncing != true) {
-            $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: isJoined() is called and the required Channel Syncing is not activated!', __FILE__, __LINE__);
-            return false;
-        }
-        
-        if ($nickname === null) {
-            $nickname = $this->_nick;
-        }
-        
-        if (isset($this->_channels[strtolower($channel)]->users[strtolower($nickname)])) {
-            return true;
-        }
-        
-        return false;
-    }
-    
-    /**
-     * Checks if we or the given user is opped on the specified channel and returns the result.
-     * ChannelSyncing is required for this.
-     *
-     * @see setChannelSyncing
-     * @param string $channel
-     * @param string $nickname
-     * @return boolean
-     * @access public
-     */
-    function isOpped($channel, $nickname = null)
-    {
-        if ($this->_channelsyncing != true) {
-            $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: isOpped() is called and the required Channel Syncing is not activated!', __FILE__, __LINE__);
-            return false;
-        }
-        
-        if ($nickname === null) {
-            $nickname = $this->_nick;
-        }
-        
-        if ($this->isJoined($channel, $nickname)) {
-            if ($this->_channels[strtolower($channel)]->users[strtolower($nickname)]->op) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
-    
-    /**
-     * Checks if we or the given user is voiced on the specified channel and returns the result.
-     * ChannelSyncing is required for this.
-     *
-     * @see setChannelSyncing
-     * @param string $channel
-     * @param string $nickname
-     * @return boolean
-     * @access public
-     */
-    function isVoiced($channel, $nickname = null)
-    {
-        if ($this->_channelsyncing != true) {
-            $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: isVoiced() is called and the required Channel Syncing is not activated!', __FILE__, __LINE__);
-            return false;
-        }
-        
-        if ($nickname === null) {
-            $nickname = $this->_nick;
-        }
-        
-        if ($this->isJoined($channel, $nickname)) {
-            if ($this->_channels[strtolower($channel)]->users[strtolower($nickname)]->voice) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
-    
-    /**
-     * Checks if the hostmask is on the specified channel banned and returns the result.
-     * ChannelSyncing is required for this.
-     *
-     * @see setChannelSyncing
-     * @param string $channel
-     * @param string $hostmask
-     * @return boolean
-     * @access public
-     */
-    function isBanned($channel, $hostmask)
-    {
-        if ($this->_channelsyncing != true) {
-            $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: isBanned() is called and the required Channel Syncing is not activated!', __FILE__, __LINE__);
-            return false;
-        }
-        
-        if ($this->isJoined($channel)) {
-            $result = array_search($hostmask, $this->_channels[strtolower($channel)]->bans);
-            
-            if ($result !== false) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
-
-    /**
-     * goes into receive mode
-     *
-     * Goes into receive and idle mode. Only call this if you want to "spawn" the bot.
-     * No further lines of PHP code will be processed after this call, only the bot methods!
-     *
-     * @return boolean
-     * @access public
-     */
-    function listen()
-    {
-        if ($this->_state() == SMARTIRC_STATE_CONNECTED) {
-            $this->_rawreceive();
-            return true;
-        } else {
-            return false;
-        }
-    }
-    
-    /**
-     * waits for a special message type and puts the answer in $result
-     *
-     * Creates a special actionhandler for that given TYPE and returns the answer.
-     * This will only receive the requested type, immediately quit and disconnect from the IRC server.
-     * Made for showing IRC statistics on your homepage, or other IRC related information.
-     *
-     * @param integer $messagetype see in the documentation 'Message Types'
-     * @return array answer from the IRC server for this $messagetype
-     * @access public
-     */
-    function listenFor($messagetype)
-    {
-        $listenfor = &new Net_SmartIRC_listenfor();
-        $this->registerActionhandler($messagetype, '.*', $listenfor, 'handler');
-        $this->listen();
-        $result = $listenfor->result;
-        
-        if (isset($listenfor)) {
-            unset($listenfor);
-        }
-        
-        return $result;
-    }
-    
-    /**
-     * waits for a special message type and puts the answer in $result
-     *
-     * Creates a special actionhandler for that given TYPE and returns the answer.
-     * This will only receive the requested type, immediately quit and disconnect from the IRC server.
-     * Made for showing IRC statistics on your homepage, or other IRC related information.
-     * This special version of listenFor() stores the whole ircdata object, not just the message!
-     *
-     * @param integer $messagetype see in the documentation 'Message Types'
-     * @return array answer from the IRC server for this $messagetype
-     * @access public
-     */
-    function objListenFor($messagetype)
-    {
-        $objlistenfor = &new Net_SmartIRC_objListenFor();
-        $this->registerActionhandler($messagetype, '.*', $objlistenfor, 'handler');
-        $this->listen();
-        $result = $objlistenfor->result;
-        
-        if (isset($objlistenfor)) {
-            unset($objlistenfor);
-        }
-        
-        return $result;
-    }    
-    
-    /**
-     * registers a new actionhandler and returns the assigned id
-     *
-     * Registers an actionhandler in Net_SmartIRC for calling it later.
-     * The actionhandler id is needed for unregistering the actionhandler.
-     *
-     * @see example.php
-     * @param integer $handlertype bits constants, see in this documentation Message Types
-     * @param string $regexhandler the message that has to be in the IRC message in regex syntax
-     * @param object $object a reference to the objects of the method
-     * @param string $methodname the methodname that will be called when the handler happens
-     * @return integer assigned actionhandler id
-     * @access public
-     */
-    function registerActionhandler($handlertype, $regexhandler, &$object, $methodname)
-    {
-        // precheck
-        if (!$this->_isValidType($handlertype)) {
-            $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: passed invalid handlertype to registerActionhandler()', __FILE__, __LINE__);
-            return false;
-        }
-        
-        $id = $this->_actionhandlerid++;
-        $newactionhandler = &new Net_SmartIRC_actionhandler();
-        
-        $newactionhandler->id = $id;
-        $newactionhandler->type = $handlertype;
-        $newactionhandler->message = $regexhandler;
-        $newactionhandler->object = &$object;
-        $newactionhandler->method = $methodname;
-        
-        $this->_actionhandler[] = &$newactionhandler;
-        $this->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: actionhandler('.$id.') registered', __FILE__, __LINE__);
-        return $id;
-    }
-    
-    /**
-     * unregisters an existing actionhandler
-     *
-     * @param integer $handlertype
-     * @param string $regexhandler
-     * @param object $object
-     * @param string $methodname
-     * @return boolean
-     * @access public
-     */
-    function unregisterActionhandler($handlertype, $regexhandler, &$object, $methodname)
-    {
-        // precheck
-        if (!$this->_isValidType($handlertype)) {
-            $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: passed invalid handlertype to unregisterActionhandler()', __FILE__, __LINE__);
-            return false;
-        }
-        
-        $handler = &$this->_actionhandler;
-        $handlercount = count($handler);
-        
-        for ($i = 0; $i < $handlercount; $i++) {
-            $handlerobject = &$handler[$i];
-                        
-            if ($handlerobject->type == $handlertype &&
-                $handlerobject->message == $regexhandler &&
-                $handlerobject->method == $methodname) {
-                
-                $id = $handlerobject->id;
-                
-                if (isset($this->_actionhandler[$i])) {
-                    unset($this->_actionhandler[$i]);
-                }
-                
-                $this->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: actionhandler('.$id.') unregistered', __FILE__, __LINE__);
-                $this->_reorderactionhandler();
-                return true;
-            }
-        }
-        
-        $this->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: could not find actionhandler type: "'.$handlertype.'" message: "'.$regexhandler.'" method: "'.$methodname.'" from object "'.get_class($object).'" _not_ unregistered', __FILE__, __LINE__);
-        return false;
-    }
-    
-    /**
-     * unregisters an existing actionhandler via the id
-     *
-     * @param integer $id
-     * @return boolean
-     * @access public
-     */
-    function unregisterActionid($id)
-    {
-        $handler = &$this->_actionhandler;
-        $handlercount = count($handler);
-        for ($i = 0; $i < $handlercount; $i++) {
-            $handlerobject = &$handler[$i];
-                        
-            if ($handlerobject->id == $id) {
-                if (isset($this->_actionhandler[$i])) {
-                    unset($this->_actionhandler[$i]);
-                }
-                
-                $this->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: actionhandler('.$id.') unregistered', __FILE__, __LINE__);
-                $this->_reorderactionhandler();
-                return true;
-            }
-        }
-        
-        $this->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: could not find actionhandler id: '.$id.' _not_ unregistered', __FILE__, __LINE__);
-        return false;
-    }
-    
-    /**
-     * registers a timehandler and returns the assigned id
-     *
-     * Registers a timehandler in Net_SmartIRC, which will be called in the specified interval.
-     * The timehandler id is needed for unregistering the timehandler.
-     *
-     * @see example7.php
-     * @param integer $interval interval time in milliseconds
-     * @param object $object a reference to the objects of the method
-     * @param string $methodname the methodname that will be called when the handler happens
-     * @return integer assigned timehandler id
-     * @access public
-     */
-    function registerTimehandler($interval, &$object, $methodname)
-    {
-        $id = $this->_timehandlerid++;
-        $newtimehandler = &new Net_SmartIRC_timehandler();
-        
-        $newtimehandler->id = $id;
-        $newtimehandler->interval = $interval;
-        $newtimehandler->object = &$object;
-        $newtimehandler->method = $methodname;
-        $newtimehandler->lastmicrotimestamp = $this->_microint();
-        
-        $this->_timehandler[] = &$newtimehandler;
-        $this->log(SMARTIRC_DEBUG_TIMEHANDLER, 'DEBUG_TIMEHANDLER: timehandler('.$id.') registered', __FILE__, __LINE__);
-        
-        if (($interval < $this->_mintimer) || ($this->_mintimer == false)) {
-            $this->_mintimer = $interval;
-        }
-            
-        return $id;
-    }
-    
-    /**
-     * unregisters an existing timehandler via the id
-     *
-     * @see example7.php
-     * @param integer $id
-     * @return boolean
-     * @access public
-     */
-    function unregisterTimeid($id)
-    {
-        $handler = &$this->_timehandler;
-        $handlercount = count($handler);
-        for ($i = 0; $i < $handlercount; $i++) {
-            $handlerobject = &$handler[$i];
-            
-            if ($handlerobject->id == $id) {
-                if (isset($this->_timehandler[$i])) {
-                    unset($this->_timehandler[$i]);
-                }
-                
-                $this->log(SMARTIRC_DEBUG_TIMEHANDLER, 'DEBUG_TIMEHANDLER: timehandler('.$id.') unregistered', __FILE__, __LINE__);
-                $this->_reordertimehandler();
-                $this->_updatemintimer();
-                return true;
-            }
-        }
-        
-        $this->log(SMARTIRC_DEBUG_TIMEHANDLER, 'DEBUG_TIMEHANDLER: could not find timehandler id: '.$id.' _not_ unregistered', __FILE__, __LINE__);
-        return false;
-    }
-    
-    // <private methods>
-    /**
-     * changes a already used nickname to a new nickname plus 3 random digits
-     *
-     * @return void
-     * @access private
-     */
-    function _nicknameinuse()
-    {
-        $newnickname = substr($this->_nick, 0, 5).rand(0, 999);
-        $this->changeNick($newnickname, SMARTIRC_CRITICAL);
-    }
-    
-    /**
-     * sends an IRC message
-     *
-     * Adds a message to the messagequeue, with the optional priority.
-     * $priority:
-     * SMARTIRC_CRITICAL
-     * SMARTIRC_HIGH
-     * SMARTIRC_MEDIUM
-     * SMARTIRC_LOW
-     *
-     * @param string $data
-     * @param integer $priority must be one of the priority constants
-     * @return boolean
-     * @access private
-     */
-    function _send($data, $priority = SMARTIRC_MEDIUM)
-    {
-        switch ($priority) {
-            case SMARTIRC_CRITICAL:
-                $this->_rawsend($data);
-                return true;
-            break;
-            case (SMARTIRC_HIGH||
-                  SMARTIRC_MEDIUM||
-                  SMARTIRC_LOW):
-                $this->_messagebuffer[$priority][] = $data;
-                return true;
-            break;
-            default:
-                $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: message ('.$data.') with an invalid priority passed ('.$priority.'), message is ignored!', __FILE__, __LINE__);
-                return false;
-        }
-    }
-    
-    /**
-     * checks the buffer if there are messages to send
-     *
-     * @return void
-     * @access private
-     */
-    function _checkbuffer()
-    {
-        if (!$this->_loggedin) {
-            return;
-        }
-        
-        static $highsent = 0;
-        static $lastmicrotimestamp = 0;
-        
-        if ($lastmicrotimestamp == 0) {
-            $lastmicrotimestamp = $this->_microint();
-        }
-        
-        $highcount = count($this->_messagebuffer[SMARTIRC_HIGH]);
-        $mediumcount = count($this->_messagebuffer[SMARTIRC_MEDIUM]);
-        $lowcount = count($this->_messagebuffer[SMARTIRC_LOW]);
-        $this->_messagebuffersize = $highcount+$mediumcount+$lowcount;
-        
-        // don't send them too fast
-        if ($this->_microint() >= ($lastmicrotimestamp+($this->_senddelay/1000))) {
-            if ($highcount > 0 && $highsent <= 2) {
-                $this->_rawsend(array_shift($this->_messagebuffer[SMARTIRC_HIGH]));
-                $lastmicrotimestamp = $this->_microint();
-                $highsent++;
-            } else if ($mediumcount > 0) {
-                $this->_rawsend(array_shift($this->_messagebuffer[SMARTIRC_MEDIUM]));
-                $lastmicrotimestamp = $this->_microint();
-                $highsent = 0;
-            } else if ($lowcount > 0) {
-                $this->_rawsend(array_shift($this->_messagebuffer[SMARTIRC_LOW]));
-                $lastmicrotimestamp = $this->_microint();
-            }
-        }
-    }
-    
-    /**
-     * Checks the running timers and calls the registered timehandler,
-     * when the interval is reached.
-     *
-     * @return void
-     * @access private
-     */
-    function _checktimer()
-    {
-        if (!$this->_loggedin) {
-            return;
-        }
-        
-        // has to be count() because the array may change during the loop!
-        for ($i = 0; $i < count($this->_timehandler); $i++) {
-            $handlerobject = &$this->_timehandler[$i];
-            $microtimestamp = $this->_microint();
-            if ($microtimestamp >= ($handlerobject->lastmicrotimestamp+($handlerobject->interval/1000))) {
-                $methodobject = &$handlerobject->object;
-                $method = $handlerobject->method;
-                $handlerobject->lastmicrotimestamp = $microtimestamp;
-                
-                if (@method_exists($methodobject, $method)) {
-                    $this->log(SMARTIRC_DEBUG_TIMEHANDLER, 'DEBUG_TIMEHANDLER: calling method "'.get_class($methodobject).'->'.$method.'"', __FILE__, __LINE__);
-                    $methodobject->$method($this);
-                }
-            }
-        }
-    }
-    
-    /**
-     * Checks if a receive or transmit timeout occured and reconnects if configured
-     *
-     * @return void
-     * @access private
-     */
-    function _checktimeout()
-    {
-        if ($this->_autoreconnect == true) {
-            $timestamp = time();
-            if ($this->_lastrx < ($timestamp - $this->_rxtimeout)) {
-                $this->log(SMARTIRC_DEBUG_CONNECTION, 'DEBUG_CONNECTION: receive timeout detected, doing reconnect...', __FILE__, __LINE__);
-                $this->reconnect();
-            } else if ($this->_lasttx < ($timestamp - $this->_txtimeout)) {
-                $this->log(SMARTIRC_DEBUG_CONNECTION, 'DEBUG_CONNECTION: transmit timeout detected, doing reconnect...', __FILE__, __LINE__);
-                $this->reconnect();
-            }
-        }
-    }
-    
-    /**
-     * sends a raw message to the IRC server (don't use this!!)
-     *
-     * Use message() or _send() instead.
-     *
-     * @param string $data
-     * @return boolean
-     * @access private
-     */
-    function _rawsend($data)
-    {
-        if ($this->_state() == SMARTIRC_STATE_CONNECTED) {
-            $this->log(SMARTIRC_DEBUG_IRCMESSAGES, 'DEBUG_IRCMESSAGES: sent: "'.$data.'"', __FILE__, __LINE__);
-            
-            if ($this->_usesockets == true) {
-                $result = @socket_write($this->_socket, $data.SMARTIRC_CRLF);
-            } else {
-                $result = @fwrite($this->_socket, $data.SMARTIRC_CRLF);
-            }
-            
-            
-            if ($result === false) {
-                return false;
-            } else {
-                $this->_lasttx = time();
-                return true;
-            }
-        } else {
-            return false;
-        }
-    }
-    
-    /**
-     * goes into main idle loop for waiting messages from the IRC server
-     *
-     * @return void
-     * @access private
-     */
-    function _rawreceive()
-    {
-        $lastpart = '';
-        $rawdataar = array();
-        
-        while ($this->_state() == SMARTIRC_STATE_CONNECTED) {
-            $this->_checkbuffer();
-            
-            $timeout = $this->_selecttimeout();
-            if ($this->_usesockets == true) {
-                $sread = array($this->_socket);
-                $result = @socket_select($sread, $w = null, $e = null, 0, $timeout*1000);
-                
-                if ($result == 1) {
-                    // the socket got data to read
-                    $rawdata = @socket_read($this->_socket, 10240);
-                } else if ($result === false) {
-                    // panic! panic! something went wrong!
-                    $this->log(SMARTIRC_DEBUG_NOTICE, 'WARNING: socket_select() returned false, something went wrong! Reason: '.socket_strerror(socket_last_error()), __FILE__, __LINE__);
-                    exit;
-                } else {
-                    // no data
-                    $rawdata = null;
-                }
-            } else {
-                usleep($this->_receivedelay*1000);
-                $rawdata = @fread($this->_socket, 10240);
-            }
-            
-            $this->_checktimer();
-            $this->_checktimeout();
-            
-            if ($rawdata !== null && !empty($rawdata)) {
-                $this->_lastrx = time();
-                $rawdata = str_replace("\r", '', $rawdata);
-                $rawdata = $lastpart.$rawdata;
-                
-                $lastpart = substr($rawdata, strrpos($rawdata ,"\n")+1);
-                $rawdata = substr($rawdata, 0, strrpos($rawdata ,"\n"));
-                $rawdataar = explode("\n", $rawdata);
-            }
-            
-            // loop through our received messages
-            while (count($rawdataar) > 0) {
-                $rawline = array_shift($rawdataar);
-                $validmessage = false;
-                
-                $this->log(SMARTIRC_DEBUG_IRCMESSAGES, 'DEBUG_IRCMESSAGES: received: "'.$rawline.'"', __FILE__, __LINE__);
-                
-                // building our data packet
-                $ircdata = &new Net_SmartIRC_data();
-                $ircdata->rawmessage = $rawline;
-                $lineex = explode(' ', $rawline);
-                $ircdata->rawmessageex = $lineex;
-                $messagecode = $lineex[0];
-                
-                if (substr($rawline, 0, 1) == ':') {
-                    $validmessage = true;
-                    $line = substr($rawline, 1);
-                    $lineex = explode(' ', $line);
-                    
-                    // conform to RFC 2812
-                    $from = $lineex[0];
-                    $messagecode = $lineex[1];
-                    $exclamationpos = strpos($from, '!');
-                    $atpos = strpos($from, '@');
-                    $colonpos = strpos($line, ' :');
-                    if ($colonpos !== false) {
-                        // we want the exact position of ":" not beginning from the space
-                        $colonpos += 1;
-                    }
-                    $ircdata->nick = substr($from, 0, $exclamationpos);
-                    $ircdata->ident = substr($from, $exclamationpos+1, ($atpos-$exclamationpos)-1);
-                    $ircdata->host = substr($from, $atpos+1);
-                    $ircdata->type = $this->_gettype($rawline);
-                    $ircdata->from = $from;
-                    if ($colonpos !== false) {
-                        $ircdata->message = substr($line, $colonpos+1);
-                        $ircdata->messageex = explode(' ', $ircdata->message);
-                    }
-                    
-                    if ($ircdata->type & (SMARTIRC_TYPE_CHANNEL|
-                                 SMARTIRC_TYPE_ACTION|
-                                 SMARTIRC_TYPE_MODECHANGE|
-                                 SMARTIRC_TYPE_KICK|
-                                 SMARTIRC_TYPE_PART|
-                                 SMARTIRC_TYPE_JOIN)) {
-                        $ircdata->channel = $lineex[2];
-                    } else if ($ircdata->type & (SMARTIRC_TYPE_WHO|
-                                        SMARTIRC_TYPE_BANLIST|
-                                        SMARTIRC_TYPE_TOPIC|
-                                        SMARTIRC_TYPE_CHANNELMODE)) {
-                        $ircdata->channel = $lineex[3];
-                    } else if ($ircdata->type & SMARTIRC_TYPE_NAME) {
-                        $ircdata->channel = $lineex[4];
-                    }
-                    
-                    if ($ircdata->channel !== null) {
-                        if (substr($ircdata->channel, 0, 1) == ':') {
-                            $ircdata->channel = substr($ircdata->channel, 1);
-                        }
-                    }
-                    
-                    $this->log(SMARTIRC_DEBUG_MESSAGEPARSER, 'DEBUG_MESSAGEPARSER: ircdata nick: "'.$ircdata->nick.
-                                                                '" ident: "'.$ircdata->ident.
-                                                                '" host: "'.$ircdata->host.
-                                                                '" type: "'.$ircdata->type.
-                                                                '" from: "'.$ircdata->from.
-                                                                '" channel: "'.$ircdata->channel.
-                                                                '" message: "'.$ircdata->message.
-                                                                '"', __FILE__, __LINE__);
-                }
-                
-                // lets see if we have a messagehandler for it
-                $this->_handlemessage($messagecode, $ircdata);
-                    
-                if ($validmessage == true) {
-                    // now the actionhandlers are comming
-                    $this->_handleactionhandler($ircdata);
-                }
-                
-                if (isset($ircdata)) {
-                    unset($ircdata);
-                }
-            }
-        }
-    }
-    
-    /**
-     * sends the pong for keeping alive
-     *
-     * Sends the PONG signal as reply of the PING from the IRC server.
-     *
-     * @param string $data
-     * @return void
-     * @access private
-     */
-    function _pong($data)
-    {
-        $this->log(SMARTIRC_DEBUG_CONNECTION, 'DEBUG_CONNECTION: Ping? Pong!', __FILE__, __LINE__);
-        $this->_send('PONG '.$data, SMARTIRC_CRITICAL);
-    }
-    
-    /**
-     * returns the calculated selecttimeout value
-     *
-     * @return integer selecttimeout in microseconds
-     * @access private
-     */
-    function _selecttimeout() {
-        if ($this->_messagebuffersize == 0) {
-            $this->_selecttimeout = null;
-            
-            if ($this->_mintimer != false) {
-                $this->_calculateselecttimeout($this->_mintimer);
-            }
-            
-            if ($this->_autoreconnect == true) {
-                $this->_calculateselecttimeout($this->_rxtimeout*1000);
-            }
-            
-            $this->_calculateselecttimeout($this->_maxtimer);
-            return $this->_selecttimeout;
-        } else {
-            return $this->_senddelay;
-        }
-    }
-    
-    /**
-     * calculates the selecttimeout value
-     *
-     * @return void
-     * @access private
-     */
-    function _calculateselecttimeout($microseconds)
-    {
-        if (($this->_selecttimeout > $microseconds) || $this->_selecttimeout === null) {
-            $this->_selecttimeout = $microseconds;
-        }
-    }
-    
-    /**
-     * updates _mintimer to the smallest timer interval
-     *
-     * @return void
-     * @access private
-     */
-    function _updatemintimer()
-    {
-        $timerarray = array();
-        foreach ($this->_timehandler as $values) {
-            $timerarray[] = $values->interval;
-        }
-        
-        $result = array_multisort($timerarray, SORT_NUMERIC, SORT_ASC);
-        if ($result == true && isset($timerarray[0])) {
-            $this->_mintimer = $timerarray[0];
-        } else {
-            $this->_mintimer = false;
-        }
-    }
-    
-    /**
-     * reorders the actionhandler array, needed after removing one
-     *
-     * @return void
-     * @access private
-     */
-    function _reorderactionhandler()
-    {
-        $orderedactionhandler = array();
-        foreach ($this->_actionhandler as $value) {
-            $orderedactionhandler[] = $value;
-        }
-        $this->_actionhandler = &$orderedactionhandler;
-    }
-    
-    /**
-     * reorders the timehandler array, needed after removing one
-     *
-     * @return void
-     * @access private
-     */
-    function _reordertimehandler()
-    {
-        $orderedtimehandler = array();
-        foreach ($this->_timehandler as $value) {
-            $orderedtimehandler[] = $value;
-        }
-        $this->_timehandler = &$orderedtimehandler;
-    }
-    
-    /**
-     * reorders the modules array, needed after removing one
-     *
-     * @return void
-     * @access private
-     */
-    function _reordermodules()
-    {
-        $orderedmodules = array();
-        foreach ($this->_modules as $value) {
-            $orderedmodules[] = $value;
-        }
-        $this->_modules = &$orderedmodules;
-    }
-
-    /**
-     * determines the messagetype of $line
-     *
-     * Analyses the type of an IRC message and returns the type.
-     *
-     * @param string $line
-     * @return integer SMARTIRC_TYPE_* constant
-     * @access private
-     */
-    function _gettype($line)
-    {
-        if (preg_match('/^:[^ ]+? [0-9]{3} .+$/', $line) == 1) {
-            $lineex = explode(' ', $line);
-            $code = $lineex[1];
-                
-            switch ($code) {
-                case SMARTIRC_RPL_WELCOME:
-                case SMARTIRC_RPL_YOURHOST:
-                case SMARTIRC_RPL_CREATED:
-                case SMARTIRC_RPL_MYINFO:
-                case SMARTIRC_RPL_BOUNCE:
-                    return SMARTIRC_TYPE_LOGIN;
-                case SMARTIRC_RPL_LUSERCLIENT:
-                case SMARTIRC_RPL_LUSEROP:
-                case SMARTIRC_RPL_LUSERUNKNOWN:
-                case SMARTIRC_RPL_LUSERME:
-                case SMARTIRC_RPL_LUSERCHANNELS:
-                    return SMARTIRC_TYPE_INFO;
-                case SMARTIRC_RPL_MOTDSTART:
-                case SMARTIRC_RPL_MOTD:
-                case SMARTIRC_RPL_ENDOFMOTD:
-                    return SMARTIRC_TYPE_MOTD;
-                case SMARTIRC_RPL_NAMREPLY:
-                case SMARTIRC_RPL_ENDOFNAMES:
-                    return SMARTIRC_TYPE_NAME;
-                case SMARTIRC_RPL_WHOREPLY:
-                case SMARTIRC_RPL_ENDOFWHO:
-                    return SMARTIRC_TYPE_WHO;
-                case SMARTIRC_RPL_LISTSTART:
-                    return SMARTIRC_TYPE_NONRELEVANT;
-                case SMARTIRC_RPL_LIST:
-                case SMARTIRC_RPL_LISTEND:
-                    return SMARTIRC_TYPE_LIST;
-                case SMARTIRC_RPL_BANLIST:
-                case SMARTIRC_RPL_ENDOFBANLIST:
-                    return SMARTIRC_TYPE_BANLIST;
-                case SMARTIRC_RPL_TOPIC:
-                    return SMARTIRC_TYPE_TOPIC;
-                case SMARTIRC_RPL_WHOISUSER:
-                case SMARTIRC_RPL_WHOISSERVER:
-                case SMARTIRC_RPL_WHOISOPERATOR:
-                case SMARTIRC_RPL_WHOISIDLE:
-                case SMARTIRC_RPL_ENDOFWHOIS:
-                case SMARTIRC_RPL_WHOISCHANNELS:
-                    return SMARTIRC_TYPE_WHOIS;
-                case SMARTIRC_RPL_WHOWASUSER:
-                case SMARTIRC_RPL_ENDOFWHOWAS:
-                    return SMARTIRC_TYPE_WHOWAS;
-                case SMARTIRC_RPL_UMODEIS:
-                    return SMARTIRC_TYPE_USERMODE;
-                case SMARTIRC_RPL_CHANNELMODEIS:
-                    return SMARTIRC_TYPE_CHANNELMODE;
-                case SMARTIRC_ERR_NICKNAMEINUSE:
-                case SMARTIRC_ERR_NOTREGISTERED:
-                    return SMARTIRC_TYPE_ERROR;
-                default:
-                    $this->log(SMARTIRC_DEBUG_IRCMESSAGES, 'DEBUG_IRCMESSAGES: replycode UNKNOWN ('.$code.'): "'.$line.'"', __FILE__, __LINE__);
-            }
-        }
-        
-        if (preg_match('/^:.*? PRIVMSG .* :'.chr(1).'ACTION .*'.chr(1).'$/', $line) == 1) {
-            return SMARTIRC_TYPE_ACTION;
-        } else if (preg_match('/^:.*? PRIVMSG .* :'.chr(1).'.*'.chr(1).'$/', $line) == 1) {
-            return SMARTIRC_TYPE_CTCP;
-        } else if (preg_match('/^:.*? PRIVMSG (\&|\#|\+|\!).* :.*$/', $line) == 1) {
-            return SMARTIRC_TYPE_CHANNEL;
-        } else if (preg_match('/^:.*? PRIVMSG .*:.*$/', $line) == 1) {
-            return SMARTIRC_TYPE_QUERY;
-        } else if (preg_match('/^:.*? NOTICE .* :.*$/', $line) == 1) {
-            return SMARTIRC_TYPE_NOTICE;
-        } else if (preg_match('/^:.*? INVITE .* .*$/', $line) == 1) {
-            return SMARTIRC_TYPE_INVITE;
-        } else if (preg_match('/^:.*? JOIN .*$/', $line) == 1) {
-            return SMARTIRC_TYPE_JOIN;
-        } else if (preg_match('/^:.*? TOPIC .* :.*$/', $line) == 1) {
-            return SMARTIRC_TYPE_TOPICCHANGE;
-        } else if (preg_match('/^:.*? NICK .*$/', $line) == 1) {
-            return SMARTIRC_TYPE_NICKCHANGE;
-        } else if (preg_match('/^:.*? KICK .* .*$/', $line) == 1) {
-            return SMARTIRC_TYPE_KICK;
-        } else if (preg_match('/^:.*? PART .*$/', $line) == 1) {
-            return SMARTIRC_TYPE_PART;
-        } else if (preg_match('/^:.*? MODE .* .*$/', $line) == 1) {
-            return SMARTIRC_TYPE_MODECHANGE;
-        } else if (preg_match('/^:.*? QUIT :.*$/', $line) == 1) {
-            return SMARTIRC_TYPE_QUIT;
-        } else {
-            $this->log(SMARTIRC_DEBUG_MESSAGETYPES, 'DEBUG_MESSAGETYPES: SMARTIRC_TYPE_UNKNOWN!: "'.$line.'"', __FILE__, __LINE__);
-            return SMARTIRC_TYPE_UNKNOWN;
-        }
-    }
-    
-    /**
-     * updates the current connection state
-     *
-     * @return boolean
-     * @access private
-     */
-    function _updatestate()
-    {
-        $rtype = get_resource_type($this->_socket);
-        if ((is_resource($this->_socket)) &&
-            ($this->_socket !== false) &&
-            ($rtype == 'socket' || $rtype == 'Socket' || $rtype == 'stream')) {
-            
-            $this->_state = true;
-            return true;
-        } else {
-            $this->_state = false;
-            $this->_loggedin = false;
-            return false;
-        }
-    }
-    
-    /**
-     * returns the current connection state
-     *
-     * @return integer SMARTIRC_STATE_CONNECTED or SMARTIRC_STATE_DISCONNECTED
-     * @access private
-     */
-    function _state()
-    {
-        $result = $this->_updatestate();
-        
-        if ($result == true) {
-            return SMARTIRC_STATE_CONNECTED;
-        } else {
-            return SMARTIRC_STATE_DISCONNECTED;
-        }
-    }
-    
-    /**
-     * tries to find a messagehandler for the received message ($ircdata) and calls it
-     *
-     * @param string $messagecode
-     * @param object $ircdata
-     * @return void
-     * @access private
-     */
-    function _handlemessage($messagecode, &$ircdata)
-    {
-        $found = false;
-        
-        if (is_numeric($messagecode)) {
-            if (!array_key_exists($messagecode, $this->nreplycodes)) {
-                $this->log(SMARTIRC_DEBUG_MESSAGEHANDLER, 'DEBUG_MESSAGEHANDLER: ignoring unreconzied messagecode! "'.$messagecode.'"', __FILE__, __LINE__);
-                $this->log(SMARTIRC_DEBUG_MESSAGEHANDLER, 'DEBUG_MESSAGEHANDLER: this IRC server ('.$this->_address.') doesn\'t conform to the RFC 2812!', __FILE__, __LINE__);
-                return;
-            }
-            
-            $methodname = 'event_'.strtolower($this->nreplycodes[$messagecode]);
-            $_methodname = '_'.$methodname;
-            $_codetype = 'by numeric';
-        } else if (is_string($messagecode)) { // its not numericcode so already a name/string
-            $methodname = 'event_'.strtolower($messagecode);
-            $_methodname = '_'.$methodname;
-            $_codetype = 'by string';
-        }
-        
-        // if exists call internal method for the handling
-        if (@method_exists($this, $_methodname)) {
-           $this->log(SMARTIRC_DEBUG_MESSAGEHANDLER, 'DEBUG_MESSAGEHANDLER: calling internal method "'.get_class($this).'->'.$_methodname.'" ('.$_codetype.')', __FILE__, __LINE__);
-           $this->$_methodname($ircdata);
-           $found = true;
-        }
-        
-        // if exist, call user defined method for the handling
-        if (@method_exists($this, $methodname)) {
-           $this->log(SMARTIRC_DEBUG_MESSAGEHANDLER, 'DEBUG_MESSAGEHANDLER: calling user defined method "'.get_class($this).'->'.$methodname.'" ('.$_codetype.')', __FILE__, __LINE__);
-           $this->$methodname($ircdata);
-           $found = true;
-        }
-        
-        if ($found == false) {
-            $this->log(SMARTIRC_DEBUG_MESSAGEHANDLER, 'DEBUG_MESSAGEHANDLER: no method found for "'.$messagecode.'" ('.$methodname.')', __FILE__, __LINE__);
-        }
-    }
-    
-    /**
-     * tries to find a actionhandler for the received message ($ircdata) and calls it
-     *
-     * @param object $ircdata
-     * @return void
-     * @access private
-     */
-    function _handleactionhandler(&$ircdata)
-    {
-        $handler = &$this->_actionhandler;
-        $handlercount = count($handler);
-        for ($i = 0; $i < $handlercount; $i++) {
-            $handlerobject = &$handler[$i];
-            
-            if (substr($handlerobject->message, 0, 1) == '/') {
-                $regex = $handlerobject->message;
-            } else {
-                $regex = '/'.$handlerobject->message.'/';
-            }
-            
-            if (($handlerobject->type & $ircdata->type) &&
-                (preg_match($regex, $ircdata->message) == 1)) {
-                
-                $this->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: actionhandler match found for id: '.$i.' type: '.$ircdata->type.' message: "'.$ircdata->message.'" regex: "'.$regex.'"', __FILE__, __LINE__);
-                
-                $methodobject = &$handlerobject->object;
-                $method = $handlerobject->method;
-                
-                if (@method_exists($methodobject, $method)) {
-                    $this->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: calling method "'.get_class($methodobject).'->'.$method.'"', __FILE__, __LINE__);
-                    $methodobject->$method($this, $ircdata);
-                } else {
-                    $this->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: method doesn\'t exist! "'.get_class($methodobject).'->'.$method.'"', __FILE__, __LINE__);
-                }
-                
-                break;
-            }
-        }
-    }
-    
-    /**
-     * getting current microtime, needed for benchmarks
-     *
-     * @return float
-     * @access private
-     */
-    function _microint()
-    {
-        $tmp = microtime();
-        $parts = explode(' ', $tmp);
-        $floattime = (float)$parts[0] + (float)$parts[1];
-        return $floattime;
-    }
-    
-    /**
-     * adds an user to the channelobject or updates his info
-     *
-     * @param object $channel
-     * @param object $newuser
-     * @return void
-     * @access private
-     */
-    function _adduser(&$channel, &$newuser)
-    {
-        $lowerednick = strtolower($newuser->nick);
-        if (isset($channel->users[$lowerednick])) {
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: updating user: '.$newuser->nick.' on channel: '.$channel->name, __FILE__, __LINE__);
-            
-            // lets update the existing user
-            $currentuser = &$channel->users[$lowerednick];
-            
-            if ($newuser->ident !== null) {
-                $currentuser->ident = $newuser->ident;
-            }
-            if ($newuser->host !== null) {
-                $currentuser->host = $newuser->host;
-            }
-            if ($newuser->realname !== null) {
-                $currentuser->realname = $newuser->realname;
-            }
-            if ($newuser->op !== null) {
-                $currentuser->op = $newuser->op;
-            }
-            if ($newuser->voice !== null) {
-                $currentuser->voice = $newuser->voice;
-            }
-            if ($newuser->ircop !== null) {
-                $currentuser->ircop = $newuser->ircop;
-            }
-            if ($newuser->away !== null) {
-                $currentuser->away = $newuser->away;
-            }
-            if ($newuser->server !== null) {
-                $currentuser->server = $newuser->server;
-            }
-            if ($newuser->hopcount !== null) {
-                $currentuser->hopcount = $newuser->hopcount;
-            }
-        } else {
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: adding user: '.$newuser->nick.' to channel: '.$channel->name, __FILE__, __LINE__);
-            
-            // he is new just add the reference to him
-            $channel->users[$lowerednick] = &$newuser;
-        }
-        
-        $user = &$channel->users[$lowerednick];
-        if ($user->op) {
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: adding op: '.$user->nick.' to channel: '.$channel->name, __FILE__, __LINE__);
-            $channel->ops[$user->nick] = true;
-        }
-        if ($user->voice) {
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: adding voice: '.$user->nick.' to channel: '.$channel->name, __FILE__, __LINE__);
-            $channel->voices[$user->nick] = true;
-        }
-    }
-    
-    /**
-     * removes an user from one channel or all if he quits
-     *
-     * @param object $ircdata
-     * @return void
-     * @access private
-     */
-    function _removeuser(&$ircdata)
-    {
-        if ($ircdata->type & (SMARTIRC_TYPE_PART|SMARTIRC_TYPE_QUIT)) {
-            $nick = $ircdata->nick;
-        } else if ($ircdata->type & SMARTIRC_TYPE_KICK) {
-            $nick = $ircdata->rawmessageex[3];
-        } else {
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: unknown TYPE ('.$ircdata->type.') in _removeuser(), trying default', __FILE__, __LINE__);
-            $nick = $ircdata->nick;
-        }
-        
-        $lowerednick = strtolower($nick);
-        
-        if ($this->_nick == $nick) {
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: we left channel: '.$ircdata->channel.' destroying...', __FILE__, __LINE__);
-            unset($this->_channels[strtolower($ircdata->channel)]);
-        } else {
-            if ($ircdata->type & SMARTIRC_TYPE_QUIT) {
-                $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: user '.$nick.' quit, removing him from all channels', __FILE__, __LINE__);
-                // remove the user from all channels
-                foreach ($this->_channels as $channelkey => $channelvalue) {
-                    // loop through all channels
-                    $channel = &$this->_channels[$channelkey];
-                    foreach ($channel->users as $userkey => $uservalue) {
-                        // loop through all user in this channel
-                        
-                        if ($nick == $uservalue->nick) {
-                            // found him
-                            // kill him
-                            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: found him on channel: '.$channel->name.' destroying...', __FILE__, __LINE__);
-                            unset($channel->users[$lowerednick]);
-                            
-                            if (isset($channel->ops[$nick])) {
-                                // die!
-                                $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: removing him from op list', __FILE__, __LINE__);
-                                unset($channel->ops[$nick]);
-                            }
-                            
-                            if (isset($channel->voices[$nick])) {
-                                // die!!
-                                $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: removing him from voice list', __FILE__, __LINE__);
-                                unset($channel->voices[$nick]);
-                            }
-                            
-                            // ups this was not DukeNukem 3D
-                        }
-                    }
-                }
-            } else {
-                $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: removing user: '.$nick.' from channel: '.$ircdata->channel, __FILE__, __LINE__);
-                $channel = &$this->_channels[strtolower($ircdata->channel)];
-                unset($channel->users[$lowerednick]);
-                
-                if (isset($channel->ops[$nick])) {
-                    $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: removing him from op list', __FILE__, __LINE__);
-                    unset($channel->ops[$nick]);
-                }
-                
-                if (isset($channel->voices[$nick])) {
-                    $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: removing him from voice list', __FILE__, __LINE__);
-                    unset($channel->voices[$nick]);
-                }
-            }
-        }
-    }
-    
-    /**
-     * @return void
-     * @access private
-     */
-    function _checkPHPVersion()
-    {
-        // doing nothing at the moment
-    }
-    
-    /**
-     * checks if the passed handlertype is valid
-     *
-     * @param integer $handlertype
-     * @return boolean
-     * @access private
-     */
-    function _isValidType($handlertype) {
-        if ($handlertype & SMARTIRC_TYPE_ALL ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-    
-    // </private methods>
-    
-    function isError($object) {
-        return (bool)(is_object($object) && (strtolower(get_class($object)) == 'net_smartirc_error'));
-    }
-    
-    function &throwError($message) {
-        return new Net_SmartIRC_Error($message);
-    }
-}
-
-class Net_SmartIRC extends Net_SmartIRC_messagehandler
-{
-    // empty
-}
-
-/**
- * @access public
- */
-class Net_SmartIRC_data
-{
-    /**
-     * @var string
-     * @access public
-     */
-    var $from;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $nick;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $ident;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $host;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $channel;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $message;
-    
-    /**
-     * @var array
-     * @access public
-     */
-    var $messageex = array();
-    
-    /**
-     * @var integer
-     * @access public
-     */
-    var $type;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $rawmessage;
-    
-    /**
-     * @var array
-     * @access public
-     */
-    var $rawmessageex = array();
-}
-
-/**
- * @access public
- */
-class Net_SmartIRC_actionhandler
-{
-    /**
-     * @var integer
-     * @access public
-     */
-    var $id;
-    
-    /**
-     * @var integer
-     * @access public
-     */
-    var $type;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $message;
-    
-    /**
-     * @var object
-     * @access public
-     */
-    var $object;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $method;
-}
-
-/**
- * @access public
- */
-class Net_SmartIRC_timehandler
-{
-    /**
-     * @var integer
-     * @access public
-     */
-    var $id;
-    
-    /**
-     * @var integer
-     * @access public
-     */
-    var $interval;
-    
-    /**
-     * @var integer
-     * @access public
-     */
-    var $lastmicrotimestamp;
-    
-    /**
-     * @var object
-     * @access public
-     */
-    var $object;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $method;
-}
-
-/**
- * @access public
- */
-class Net_SmartIRC_channel
-{
-    /**
-     * @var string
-     * @access public
-     */
-    var $name;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $key;
-    
-    /**
-     * @var array
-     * @access public
-     */
-    var $users = array();
-    
-    /**
-     * @var array
-     * @access public
-     */
-    var $ops = array();
-    
-    /**
-     * @var array
-     * @access public
-     */
-    var $voices = array();
-    
-    /**
-     * @var array
-     * @access public
-     */
-    var $bans = array();
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $topic;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $mode;
-}
-
-/**
- * @access public
- */
-class Net_SmartIRC_user
-{
-    /**
-     * @var string
-     * @access public
-     */
-    var $nick;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $ident;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $host;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $realname;
-    
-    /**
-     * @var boolean
-     * @access public
-     */
-    var $ircop;
-    
-    /**
-     * @var boolean
-     * @access public
-     */
-    var $away;
-    
-    /**
-     * @var string
-     * @access public
-     */
-    var $server;
-    
-    /**
-     * @var integer
-     * @access public
-     */
-    var $hopcount;
-}
-
-/**
- * @access public
- */
-class Net_SmartIRC_channeluser extends Net_SmartIRC_user
-{
-    /**
-     * @var boolean
-     * @access public
-     */
-    var $op;
-    
-    /**
-     * @var boolean
-     * @access public
-     */
-    var $voice;
-}
-
-/**
- * @access public
- */
-class Net_SmartIRC_ircuser extends Net_SmartIRC_user
-{
-    /**
-     * @var array
-     * @access public
-     */
-    var $joinedchannels = array();
-}
-
-/**
- * @access public
- */
-class Net_SmartIRC_listenfor
-{
-    /**
-     * @var array
-     * @access public
-     */
-    var $result = array();
-    
-    /**
-     * stores the received answer into the result array
-     *
-     * @param object $irc
-     * @param object $ircdata
-     * @return void
-     */
-    function handler(&$irc, &$ircdata)
-    {
-        $irc->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: listenfor handler called', __FILE__, __LINE__);
-        $this->result[] = $ircdata->message;
-        $irc->disconnect(true);
-    }
-}
-
-// so we don't break BC!
-/**
- * @access public
- */
-class Net_SmartIRC_objListenFor
-{
-    /**
-     * @var array
-     * @access public
-     */
-    var $result = array();
-    
-    /**
-     * stores the received answer into the result array
-     *
-     * @param object $irc
-     * @param object $ircdata
-     * @return void
-     */
-    function handler(&$irc, &$ircdata)
-    {
-        $irc->log(SMARTIRC_DEBUG_ACTIONHANDLER, 'DEBUG_ACTIONHANDLER: objListenFor handler called', __FILE__, __LINE__);
-        $this->result[] = $ircdata;
-        $irc->disconnect(true);
-    }
-}
-
-class Net_SmartIRC_Error
-{
-    var $error_msg;
-    
-    function Net_SmartIRC_Error($message)
-    {
-        $this->error_msg = $message;
-    }
-    
-    function getMessage()
-    {
-        return $this->error_msg;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tools/IRC_Bot/SmartIRC/defines.php b/tools/IRC_Bot/SmartIRC/defines.php
deleted file mode 100644
index c095b13fc..000000000
--- a/tools/IRC_Bot/SmartIRC/defines.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/**
- * $Id: defines.php,v 1.9.2.1 2003/07/22 15:32:18 meebey Exp $
- * $Revision: 1.9.2.1 $
- * $Author: meebey $
- * $Date: 2003/07/22 15:32:18 $
- *
- * Copyright (c) 2002-2003 Mirco "MEEBEY" Bauer <mail@meebey.net> <http://www.meebey.net>
- * 
- * Full LGPL License: <http://www.meebey.net/lgpl.txt>
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-// don't change this! unless you know what you do
-define('SMARTIRC_CRLF',      "\r\n");
-define('SMARTIRC_UNUSED',    '*');
-define('SMARTIRC_STDOUT',        0);
-define('SMARTIRC_FILE',	         1);
-define('SMARTIRC_SYSLOG',        2);
-define('SMARTIRC_BROWSEROUT',    3);
-define('SMARTIRC_NONE',          4);
-define('SMARTIRC_LOW',         0);
-define('SMARTIRC_MEDIUM',      1);
-define('SMARTIRC_HIGH',        2);
-define('SMARTIRC_CRITICAL',    3);
-define('SMARTIRC_STATE_DISCONNECTED',    0);
-define('SMARTIRC_STATE_CONNECTING',      1);
-define('SMARTIRC_STATE_CONNECTED',       2);
-define('SMARTIRC_DEBUG_NONE',             0);
-define('SMARTIRC_DEBUG_NOTICE',           1);
-define('SMARTIRC_DEBUG_CONNECTION',       2);
-define('SMARTIRC_DEBUG_SOCKET',           4);
-define('SMARTIRC_DEBUG_IRCMESSAGES',      8);
-define('SMARTIRC_DEBUG_MESSAGETYPES',     16);
-define('SMARTIRC_DEBUG_ACTIONHANDLER',    32);
-define('SMARTIRC_DEBUG_TIMEHANDLER',      64);
-define('SMARTIRC_DEBUG_MESSAGEHANDLER',   128);
-define('SMARTIRC_DEBUG_CHANNELSYNCING',   256);
-define('SMARTIRC_DEBUG_MODULES',          512);
-define('SMARTIRC_DEBUG_USERSYNCING',      1024);
-define('SMARTIRC_DEBUG_MESSAGEPARSER',    2048);
-define('SMARTIRC_DEBUG_ALL',              4095);
-define('SMARTIRC_TYPE_UNKNOWN',        1);
-define('SMARTIRC_TYPE_CHANNEL',        2);
-define('SMARTIRC_TYPE_QUERY',          4);
-define('SMARTIRC_TYPE_CTCP',           8);
-define('SMARTIRC_TYPE_NOTICE',         16);
-define('SMARTIRC_TYPE_WHO',            32);
-define('SMARTIRC_TYPE_JOIN',           64);
-define('SMARTIRC_TYPE_INVITE',         128);
-define('SMARTIRC_TYPE_ACTION',         256);
-define('SMARTIRC_TYPE_TOPICCHANGE',    512);
-define('SMARTIRC_TYPE_NICKCHANGE',     1024);
-define('SMARTIRC_TYPE_KICK',           2048);
-define('SMARTIRC_TYPE_QUIT',           4096);
-define('SMARTIRC_TYPE_LOGIN',          8192);
-define('SMARTIRC_TYPE_INFO',           16384);
-define('SMARTIRC_TYPE_LIST',           32768);
-define('SMARTIRC_TYPE_NAME',           65536);
-define('SMARTIRC_TYPE_MOTD',           131072);
-define('SMARTIRC_TYPE_MODECHANGE',     262144);
-define('SMARTIRC_TYPE_PART',           524288);
-define('SMARTIRC_TYPE_ERROR',          1048576);
-define('SMARTIRC_TYPE_BANLIST',        2097152);
-define('SMARTIRC_TYPE_TOPIC',          4194304);
-define('SMARTIRC_TYPE_NONRELEVANT',    8388608);
-define('SMARTIRC_TYPE_WHOIS',          16777216);
-define('SMARTIRC_TYPE_WHOWAS',         33554432);
-define('SMARTIRC_TYPE_USERMODE',       67108864);
-define('SMARTIRC_TYPE_CHANNELMODE',    134217728);
-define('SMARTIRC_TYPE_CTCP_REQUEST',   268435456);
-define('SMARTIRC_TYPE_CTCP_REPLY',     536870912);
-define('SMARTIRC_TYPE_ALL',            1073741823);
-
-$SMARTIRC_replycodes = array(
-'RPL_WELCOME' =>              '001',
-'RPL_YOURHOST' =>             '002',
-'RPL_CREATED' =>              '003',
-'RPL_MYINFO' =>               '004',
-'RPL_BOUNCE' =>               '005',
-'RPL_TRACELINK' =>            '200',
-'RPL_TRACECONNECTING' =>      '201',
-'RPL_TRACEHANDSHAKE' =>       '202',
-'RPL_TRACEUNKNOWN' =>         '203',
-'RPL_TRACEOPERATOR' =>        '204',
-'RPL_TRACEUSER' =>            '205',
-'RPL_TRACESERVER' =>          '206',
-'RPL_TRACESERVICE' =>         '207',
-'RPL_TRACENEWTYPE' =>         '208',
-'RPL_TRACECLASS' =>           '209',
-'RPL_TRACERECONNECT' =>       '210',
-'RPL_STATSLINKINFO' =>        '211',
-'RPL_STATSCOMMANDS' =>        '212',
-'RPL_ENDOFSTATS' =>           '219',
-'RPL_UMODEIS' =>              '221',
-'RPL_SERVLIST' =>             '234',
-'RPL_SERVLISTEND' =>          '235',
-'RPL_STATSUPTIME' =>          '242',
-'RPL_STATSOLINE' =>           '243',
-'RPL_LUSERCLIENT' =>          '251',
-'RPL_LUSEROP' =>              '252',
-'RPL_LUSERUNKNOWN' =>         '253',
-'RPL_LUSERCHANNELS' =>        '254',
-'RPL_LUSERME' =>              '255',
-'RPL_ADMINME' =>              '256',
-'RPL_ADMINLOC1' =>            '257',
-'RPL_ADMINLOC2' =>            '258',
-'RPL_ADMINEMAIL' =>           '259',
-'RPL_TRACELOG' =>             '261',
-'RPL_TRACEEND' =>             '262',
-'RPL_TRYAGAIN' =>             '263',
-'RPL_AWAY' =>                 '301',
-'RPL_USERHOST' =>             '302',
-'RPL_ISON' =>                 '303',
-'RPL_UNAWAY' =>               '305',
-'RPL_NOWAWAY' =>              '306',
-'RPL_WHOISUSER' =>            '311',
-'RPL_WHOISSERVER' =>          '312',
-'RPL_WHOISOPERATOR' =>        '313',
-'RPL_WHOWASUSER' =>           '314',
-'RPL_ENDOFWHO' =>             '315',
-'RPL_WHOISIDLE' =>            '317',
-'RPL_ENDOFWHOIS' =>           '318',
-'RPL_WHOISCHANNELS' =>        '319',
-'RPL_LISTSTART' =>            '321',
-'RPL_LIST' =>                 '322',
-'RPL_LISTEND' =>              '323',
-'RPL_CHANNELMODEIS' =>        '324',
-'RPL_UNIQOPIS' =>             '325',
-'RPL_NOTOPIC' =>              '331',
-'RPL_TOPIC' =>                '332',
-'RPL_INVITING' =>             '341',
-'RPL_SUMMONING' =>            '342',
-'RPL_INVITELIST' =>           '346',
-'RPL_ENDOFINVITELIST' =>      '347',
-'RPL_EXCEPTLIST' =>           '348',
-'RPL_ENDOFEXCEPTLIST' =>      '349',
-'RPL_VERSION' =>              '351',
-'RPL_WHOREPLY' =>             '352',
-'RPL_NAMREPLY' =>             '353',
-'RPL_LINKS' =>                '364',
-'RPL_ENDOFLINKS' =>           '365',
-'RPL_ENDOFNAMES' =>           '366',
-'RPL_BANLIST' =>              '367',
-'RPL_ENDOFBANLIST' =>         '368',
-'RPL_ENDOFWHOWAS' =>          '369',
-'RPL_INFO' =>                 '371',
-'RPL_MOTD' =>                 '372',
-'RPL_ENDOFINFO' =>            '374',
-'RPL_MOTDSTART' =>            '375',
-'RPL_ENDOFMOTD' =>            '376',
-'RPL_YOUREOPER' =>            '381',
-'RPL_REHASHING' =>            '382',
-'RPL_YOURESERVICE' =>         '383',
-'RPL_TIME' =>                 '391',
-'RPL_USERSSTART' =>           '392',
-'RPL_USERS' =>                '393',
-'RPL_ENDOFUSERS' =>           '394',
-'RPL_NOUSERS' =>              '395',
-'ERR_NOSUCHNICK' =>           '401',
-'ERR_NOSUCHSERVER' =>         '402',
-'ERR_NOSUCHCHANNEL' =>        '403',
-'ERR_CANNOTSENDTOCHAN' =>     '404',
-'ERR_TOOMANYCHANNELS' =>      '405',
-'ERR_WASNOSUCHNICK' =>        '406',
-'ERR_TOOMANYTARGETS' =>       '407',
-'ERR_NOSUCHSERVICE' =>        '408',
-'ERR_NOORIGIN' =>             '409',
-'ERR_NORECIPIENT' =>          '411',
-'ERR_NOTEXTTOSEND' =>         '412',
-'ERR_NOTOPLEVEL' =>           '413',
-'ERR_WILDTOPLEVEL' =>         '414',
-'ERR_BADMASK' =>              '415',
-'ERR_UNKNOWNCOMMAND' =>       '421',
-'ERR_NOMOTD' =>               '422',
-'ERR_NOADMININFO' =>          '423',
-'ERR_FILEERROR' =>            '424',
-'ERR_NONICKNAMEGIVEN' =>      '431',
-'ERR_ERRONEUSNICKNAME' =>     '432',
-'ERR_NICKNAMEINUSE' =>        '433',
-'ERR_NICKCOLLISION' =>        '436',
-'ERR_UNAVAILRESOURCE' =>      '437',
-'ERR_USERNOTINCHANNEL' =>     '441',
-'ERR_NOTONCHANNEL' =>         '442',
-'ERR_USERONCHANNEL' =>        '443',
-'ERR_NOLOGIN' =>              '444',
-'ERR_SUMMONDISABLED' =>       '445',
-'ERR_USERSDISABLED' =>        '446',
-'ERR_NOTREGISTERED' =>        '451',
-'ERR_NEEDMOREPARAMS' =>       '461',
-'ERR_ALREADYREGISTRED' =>     '462',
-'ERR_NOPERMFORHOST' =>        '463',
-'ERR_PASSWDMISMATCH' =>       '464',
-'ERR_YOUREBANNEDCREEP' =>     '465',
-'ERR_YOUWILLBEBANNED' =>      '466',
-'ERR_KEYSET' =>               '467',
-'ERR_CHANNELISFULL' =>        '471',
-'ERR_UNKNOWNMODE' =>          '472',
-'ERR_INVITEONLYCHAN' =>       '473',
-'ERR_BANNEDFROMCHAN' =>       '474',
-'ERR_BADCHANNELKEY' =>        '475',
-'ERR_BADCHANMASK' =>          '476',
-'ERR_NOCHANMODES' =>          '477',
-'ERR_BANLISTFULL' =>          '478',
-'ERR_NOPRIVILEGES' =>         '481',
-'ERR_CHANOPRIVSNEEDED' =>     '482',
-'ERR_CANTKILLSERVER' =>       '483',
-'ERR_RESTRICTED' =>           '484',
-'ERR_UNIQOPPRIVSNEEDED' =>    '485',
-'ERR_NOOPERHOST' =>           '491',
-'ERR_UMODEUNKNOWNFLAG' =>     '501',
-'ERR_USERSDONTMATCH' =>       '502',
-);
-
-$SMARTIRC_nreplycodes = array();
-
-foreach ($SMARTIRC_replycodes as $key => $value) {
-    define('SMARTIRC_'.$key, $value);
-    $SMARTIRC_nreplycodes[$value] = $key;
-}
-?>
\ No newline at end of file
diff --git a/tools/IRC_Bot/SmartIRC/irccommands.php b/tools/IRC_Bot/SmartIRC/irccommands.php
deleted file mode 100644
index 3c7b76c13..000000000
--- a/tools/IRC_Bot/SmartIRC/irccommands.php
+++ /dev/null
@@ -1,433 +0,0 @@
-<?php
-/**
- * $Id: irccommands.php,v 1.1.2.1 2003/10/10 20:20:58 meebey Exp $
- * $Revision: 1.1.2.1 $
- * $Author: meebey $
- * $Date: 2003/10/10 20:20:58 $
- *
- * Copyright (c) 2002-2003 Mirco "MEEBEY" Bauer <mail@meebey.net> <http://www.meebey.net>
- * 
- * Full LGPL License: <http://www.meebey.net/lgpl.txt>
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-class Net_SmartIRC_irccommands extends Net_SmartIRC_base
-{
-    /**
-     * sends a new message
-     *
-     * Sends a message to a channel or user.
-     *
-     * @see DOCUMENTATION
-     * @param integer $type specifies the type, like QUERY/ACTION or CTCP see 'Message Types'
-     * @param string $destination can be a user or channel
-     * @param string $message the message
-     * @return boolean
-     * @access public
-     */
-    function message($type, $destination, $message, $priority = SMARTIRC_MEDIUM)
-    {
-        switch ($type) {
-            case SMARTIRC_TYPE_CHANNEL:
-            case SMARTIRC_TYPE_QUERY:
-                $this->_send('PRIVMSG '.$destination.' :'.$message, $priority);
-            break;
-            case SMARTIRC_TYPE_ACTION:
-                $this->_send('PRIVMSG '.$destination.' :'.chr(1).'ACTION '.$message.chr(1), $priority);
-            break;
-            case SMARTIRC_TYPE_NOTICE:
-                $this->_send('NOTICE '.$destination.' :'.$message, $priority);
-            break;
-            case SMARTIRC_TYPE_CTCP: // backwards compatibilty
-            case SMARTIRC_TYPE_CTCP_REPLY:
-                $this->_send('NOTICE '.$destination.' :'.chr(1).$message.chr(1), $priority);
-            break;
-            case SMARTIRC_TYPE_CTCP_REQUEST:
-                $this->_send('PRIVMSG '.$destination.' :'.chr(1).$message.chr(1), $priority);
-            break;
-            default:
-                return false;
-        }
-            
-        return true;
-    }
-    
-    /**
-     * returns an object reference to the specified channel
-     *
-     * If the channel does not exist (because not joint) false will be returned.
-     *
-     * @param string $channelname
-     * @return object reference to the channel object
-     * @access public
-     */
-    function &channel($channelname)
-    {
-        if (isset($this->_channels[strtolower($channelname)])) {
-            return $this->_channels[strtolower($channelname)];
-        } else {
-            return false;
-        }
-    }
-    
-    // <IRC methods>
-    /**
-     * Joins one or more IRC channels with an optional key.
-     *
-     * @param mixed $channelarray
-     * @param string $key 
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function join($channelarray, $key = null, $priority = SMARTIRC_MEDIUM)
-    {
-        if (!is_array($channelarray)) {
-            $channelarray = array($channelarray);
-        }
-        
-        $channellist = implode(',', $channelarray);
-        
-        if ($key !== null) {
-            $this->_send('JOIN '.$channellist.' '.$key, $priority);
-        } else {
-            $this->_send('JOIN '.$channellist, $priority);
-        }
-    }
-    
-    /**
-     * parts from one or more IRC channels with an optional reason
-     *
-     * @param mixed $channelarray 
-     * @param string $reason
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function part($channelarray, $reason = null, $priority = SMARTIRC_MEDIUM)
-    {
-        if (!is_array($channelarray)) {
-            $channelarray = array($channelarray);
-        }
-        
-        $channellist = implode(',', $channelarray);
-        
-        if ($reason !== null) {
-            $this->_send('PART '.$channellist.' :'.$reason, $priority);
-        } else {
-            $this->_send('PART '.$channellist, $priority);
-        }
-    }
-    
-    /**
-     * Kicks one or more user from an IRC channel with an optional reason.
-     *
-     * @param string $channel
-     * @param mixed $nicknamearray
-     * @param string $reason
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function kick($channel, $nicknamearray, $reason = null, $priority = SMARTIRC_MEDIUM)
-    {
-        if (!is_array($nicknamearray)) {
-            $nicknamearray = array($nicknamearray);
-        }
-        
-        $nicknamelist = implode(',', $nicknamearray);
-        
-        if ($reason !== null) {
-            $this->_send('KICK '.$channel.' '.$nicknamelist.' :'.$reason, $priority);
-        } else {
-            $this->_send('KICK '.$channel.' '.$nicknamelist, $priority);
-        }
-    }
-    
-    /**
-     * gets a list of one ore more channels
-     *
-     * Requests a full channellist if $channelarray is not given.
-     * (use it with care, usualy its a looooong list)
-     *
-     * @param mixed $channelarray
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function getList($channelarray = null, $priority = SMARTIRC_MEDIUM)
-    {
-        if ($channelarray !== null) {
-            if (!is_array($channelarray)) {
-                $channelarray = array($channelarray);
-            }
-            
-            $channellist = implode(',', $channelarray);
-            $this->_send('LIST '.$channellist, $priority);
-        } else {
-            $this->_send('LIST', $priority);
-        }
-    }
-
-    /**
-     * requests all nicknames of one or more channels
-     *
-     * The requested nickname list also includes op and voice state
-     *
-     * @param mixed $channelarray
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function names($channelarray = null, $priority = SMARTIRC_MEDIUM)
-    {
-        if ($channelarray !== null) {
-            if (!is_array($channelarray)) {
-                $channelarray = array($channelarray);
-            }
-            
-            $channellist = implode(',', $channelarray);
-            $this->_send('NAMES '.$channellist, $priority);
-        } else {
-            $this->_send('NAMES', $priority);
-        }
-    }
-    
-    /**
-     * sets a new topic of a channel
-     *
-     * @param string $channel
-     * @param string $newtopic
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function setTopic($channel, $newtopic, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->_send('TOPIC '.$channel.' :'.$newtopic, $priority);
-    }
-    
-    /**
-     * gets the topic of a channel
-     *
-     * @param string $channel
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function getTopic($channel, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->_send('TOPIC '.$channel, $priority);
-    }
-    
-    /**
-     * sets or gets the mode of an user or channel
-     *
-     * Changes/requests the mode of the given target.
-     *
-     * @param string $target the target, can be an user (only yourself) or a channel
-     * @param string $newmode the new mode like +mt
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function mode($target, $newmode = null, $priority = SMARTIRC_MEDIUM)
-    {
-        if ($newmode !== null) {
-            $this->_send('MODE '.$target.' '.$newmode, $priority);
-        } else {
-            $this->_send('MODE '.$target, $priority);
-        }
-    }
-    
-    /**
-     * ops an user in the given channel
-     *
-     * @param string $channel
-     * @param string $nickname
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function op($channel, $nickname, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->mode($channel, '+o '.$nickname, $priority);
-    }
-    
-    /**
-     * deops an user in the given channel
-     *
-     * @param string $channel
-     * @param string $nickname
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function deop($channel, $nickname, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->mode($channel, '-o '.$nickname, $priority);
-    }
-    
-    /**
-     * voice a user in the given channel
-     *
-     * @param string $channel
-     * @param string $nickname
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function voice($channel, $nickname, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->mode($channel, '+v '.$nickname, $priority);
-    }
-    
-    /**
-     * devoice a user in the given channel
-     *
-     * @param string $channel
-     * @param string $nickname
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function devoice($channel, $nickname, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->mode($channel, '-v '.$nickname, $priority);
-    }
-    
-    /**
-     * bans a hostmask for the given channel or requests the current banlist
-     *
-     * The banlist will be requested if no hostmask is specified
-     *
-     * @param string $channel
-     * @param string $hostmask
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function ban($channel, $hostmask = null, $priority = SMARTIRC_MEDIUM)
-    {
-        if ($hostmask !== null) {
-            $this->mode($channel, '+b '.$hostmask, $priority);
-        } else {
-            $this->mode($channel, 'b', $priority);
-        }
-    }
-    
-    /**
-     * unbans a hostmask on the given channel
-     *
-     * @param string $channel
-     * @param string $hostmask
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function unban($channel, $hostmask, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->mode($channel, '-b '.$hostmask, $priority);
-    }
-    
-    /**
-     * invites a user to the specified channel
-     *
-     * @param string $nickname
-     * @param string $channel
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function invite($nickname, $channel, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->_send('INVITE '.$nickname.' '.$channel, $priority);
-    }
-    
-    /**
-     * changes the own nickname
-     *
-     * Trys to set a new nickname, nickcollisions are handled.
-     *
-     * @param string $newnick
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function changeNick($newnick, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->_send('NICK '.$newnick, $priority);
-        $this->_nick = $newnick;
-    }
-    
-    /**
-     * requests a 'WHO' from the specified target
-     *
-     * @param string $target
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function who($target, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->_send('WHO '.$target, $priority);
-    }
-    
-    /**
-     * requests a 'WHOIS' from the specified target
-     *
-     * @param string $target
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function whois($target, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->_send('WHOIS '.$target, $priority);
-    }
-    
-    /**
-     * requests a 'WHOWAS' from the specified target
-     * (if he left the IRC network)
-     *
-     * @param string $target
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function whowas($target, $priority = SMARTIRC_MEDIUM)
-    {
-        $this->_send('WHOWAS '.$target, $priority);
-    }
-    
-    /**
-     * sends QUIT to IRC server and disconnects
-     *
-     * @param string $quitmessage optional quitmessage
-     * @param integer $priority message priority, default is SMARTIRC_MEDIUM
-     * @return void
-     * @access public
-     */
-    function quit($quitmessage = null, $priority = SMARTIRC_MEDIUM)
-    {
-        if ($quitmessage !== null) {
-            $this->_send('QUIT :'.$quitmessage, $priority);
-        } else {
-            $this->_send('QUIT', $priority);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tools/IRC_Bot/SmartIRC/messagehandler.php b/tools/IRC_Bot/SmartIRC/messagehandler.php
deleted file mode 100644
index 54c46169e..000000000
--- a/tools/IRC_Bot/SmartIRC/messagehandler.php
+++ /dev/null
@@ -1,411 +0,0 @@
-<?php
-/**
- * $Id: messagehandler.php,v 1.25.2.5 2004/09/23 23:24:22 meebey Exp $
- * $Revision: 1.25.2.5 $
- * $Author: meebey $
- * $Date: 2004/09/23 23:24:22 $
- *
- * Copyright (c) 2002-2003 Mirco "MEEBEY" Bauer <mail@meebey.net> <http://www.meebey.net>
- * 
- * Full LGPL License: <http://www.meebey.net/lgpl.txt>
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-class Net_SmartIRC_messagehandler extends Net_SmartIRC_irccommands
-{
-    /* misc */
-    function _event_ping(&$ircdata)
-    {
-        $this->_pong(substr($ircdata->rawmessage, 5));
-    }
-    
-    function _event_error(&$ircdata)
-    {
-        if ($this->_autoretry == true) {
-            $this->reconnect();
-        } else {
-            $this->disconnect(true);
-        }
-    }
-    
-    function _event_join(&$ircdata)
-    {
-        if ($this->_channelsyncing == true) {
-            if ($this->_nick == $ircdata->nick) {
-                $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: joining channel: '.$ircdata->channel, __FILE__, __LINE__);
-                $channel = &new Net_SmartIRC_channel();
-                $channel->name = $ircdata->channel;
-                $this->_channels[strtolower($channel->name)] = &$channel;
-                
-                $this->who($channel->name);
-                $this->mode($channel->name);
-                $this->ban($channel->name);
-            }
-            
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: '.$ircdata->nick.' joins channel: '.$ircdata->channel, __FILE__, __LINE__);
-            $channel = &$this->_channels[strtolower($ircdata->channel)];
-            $user = &new Net_SmartIRC_channeluser();
-            $user->nick = $ircdata->nick;
-            $user->ident = $ircdata->ident;
-            $user->host = $ircdata->host;
-            
-            $this->_adduser($channel, $user);
-            $this->who($user->nick);
-        }
-    }
-    
-    function _event_part(&$ircdata)
-    {
-        if ($this->_channelsyncing == true) {
-            $this->_removeuser($ircdata);
-        }
-    }
-    
-    function _event_kick(&$ircdata)
-    {
-        if ($this->_channelsyncing == true) {
-            $this->_removeuser($ircdata);
-        }
-    }
-    
-    function _event_quit(&$ircdata)
-    {
-        if ($this->_channelsyncing == true) {
-            $this->_removeuser($ircdata);
-        }
-    }
-    
-    function _event_nick(&$ircdata)
-    {
-        if ($this->_channelsyncing == true) {
-            $newnick = substr($ircdata->rawmessageex[2], 1);
-            $lowerednewnick = strtolower($newnick);
-            $lowerednick = strtolower($ircdata->nick);
-            
-            foreach ($this->_channels as $channelkey => $channelvalue) {
-                // loop through all channels
-                $channel = &$this->_channels[$channelkey];
-                foreach ($channel->users as $userkey => $uservalue) {
-                    // loop through all user in this channel
-                    
-                    if ($ircdata->nick == $uservalue->nick) {
-                        // found him
-                        // time for updating the object and his nickname
-                        $channel->users[$lowerednewnick] = $channel->users[$lowerednick];
-                        $channel->users[$lowerednewnick]->nick = $newnick;
-                        
-                        if ($lowerednewnick != $lowerednick) {
-                            unset($channel->users[$lowerednick]);
-                        }
-                        
-                        // he was maybe op or voice, update comming
-                        if (isset($channel->ops[$ircdata->nick])) {
-                            $channel->ops[$newnick] = $channel->ops[$ircdata->nick];
-                            unset($channel->ops[$ircdata->nick]);
-                        }
-                        if (isset($channel->voices[$ircdata->nick])) {
-                            $channel->voices[$newnick] = $channel->voices[$ircdata->nick];
-                            unset($channel->voices[$ircdata->nick]);
-                        }
-                        
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    
-    function _event_mode(&$ircdata)
-    {
-        // check if its own usermode
-        if ($ircdata->rawmessageex[2] == $this->_nick) {
-            $this->_usermode = substr($ircdata->rawmessageex[3], 1);
-        } else if ($this->_channelsyncing == true) {
-            // it's not, and we do channel syching
-            $channel = &$this->_channels[strtolower($ircdata->channel)];
-            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: updating channel mode for: '.$channel->name, __FILE__, __LINE__);
-            $mode = $ircdata->rawmessageex[3];
-            $parameters = array_slice($ircdata->rawmessageex, 4);
-            
-            $add = false;
-            $remove = false;
-            $channelmode = '';
-            $modelength = strlen($mode);
-            for ($i = 0; $i < $modelength; $i++) {
-                switch($mode[$i]) {
-                    case '-':
-                        $remove = true;
-                        $add = false;
-                    break;
-                    case '+':
-                        $add = true;
-                        $remove = false;
-                    break;
-                    // user modes
-                    case 'o':
-                        $nick = array_shift($parameters);
-                        $lowerednick = strtolower($nick);
-                        if ($add) {
-                            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: adding op: '.$nick.' to channel: '.$channel->name, __FILE__, __LINE__);
-                            $channel->ops[$nick] = true;
-                            $channel->users[$lowerednick]->op = true;
-                        }
-                        if ($remove) {
-                            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: removing op: '.$nick.' to channel: '.$channel->name, __FILE__, __LINE__);
-                            unset($channel->ops[$nick]);
-                            $channel->users[$lowerednick]->op = false;
-                        }
-                    break;
-                    case 'v':
-                        $nick = array_shift($parameters);
-                        $lowerednick = strtolower($nick);
-                        if ($add) {
-                            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: adding voice: '.$nick.' to channel: '.$channel->name, __FILE__, __LINE__);
-                            $channel->voices[$nick] = true;
-                            $channel->users[$lowerednick]->voice = true;
-                        }
-                        if ($remove) {
-                            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: removing voice: '.$nick.' to channel: '.$channel->name, __FILE__, __LINE__);
-                            unset($channel->voices[$nick]);
-                            $channel->users[$lowerednick]->voice = false;
-                        }
-                    break;
-                    case 'k':
-                        $key = array_shift($parameters);
-                        if ($add) {
-                            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: stored channel key for: '.$channel->name, __FILE__, __LINE__);
-                            $channel->key = $key;
-                        }
-                        if ($remove) {
-                            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: removed channel key for: '.$channel->name, __FILE__, __LINE__);
-                            $channel->key = '';
-                        }
-                    break;
-                    default:
-                        // channel modes
-                        if ($mode[$i] == 'b') {
-                            $hostmask = array_shift($parameters);
-                            if ($add) {
-                                $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: adding ban: '.$hostmask.' for: '.$channel->name, __FILE__, __LINE__);
-                                $channel->bans[$hostmask] = true;
-                            }
-                            if ($remove) {
-                                $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: removing ban: '.$hostmask.' for: '.$channel->name, __FILE__, __LINE__);
-                                unset($channel->bans[$hostmask]);
-                            }
-                        } else {
-                            $this->log(SMARTIRC_DEBUG_CHANNELSYNCING, 'DEBUG_CHANNELSYNCING: storing unknown channelmode ('.$mode.') in channel->mode for: '.$channel->name, __FILE__, __LINE__);
-                            if ($add) {
-                                $channel->mode .= $mode[$i];
-                            }
-                            if ($remove) {
-                                $channel->mode = str_replace($mode[$i], '', $channel->mode);
-                            }
-                        }
-                }
-            }
-        }
-    }
-    
-    function _event_topic(&$ircdata)
-    {
-        if ($this->_channelsyncing == true) {
-            $channel = &$this->_channels[strtolower($ircdata->rawmessageex[2])];
-            $channel->topic = $ircdata->message;
-        }
-    }
-    
-    function _event_privmsg(&$ircdata)
-    {
-        if ($ircdata->type == SMARTIRC_TYPE_CTCP) {
-            // substr must be 1,4 because of \001 in CTCP messages
-            if (substr($ircdata->message, 1, 4) == 'PING') {
-                $this->message(SMARTIRC_TYPE_CTCP, $ircdata->nick, 'PING '.substr($ircdata->message, 5, -1));
-            } elseif (substr($ircdata->message, 1, 7) == 'VERSION') {
-                if (!empty($this->_ctcpversion)) {
-                    $versionstring = $this->_ctcpversion.' | using '.SMARTIRC_VERSIONSTRING;
-                } else {
-                    $versionstring = SMARTIRC_VERSIONSTRING;
-                }
-                
-                $this->message(SMARTIRC_TYPE_CTCP, $ircdata->nick, 'VERSION '.$versionstring);
-            }
-        }
-    }
-    
-    /* rpl_ */
-    function _event_rpl_welcome(&$ircdata)
-    {
-        $this->_loggedin = true;
-        $this->log(SMARTIRC_DEBUG_CONNECTION, 'DEBUG_CONNECTION: logged in', __FILE__, __LINE__);
-        
-        // updating our nickname, that we got (maybe cutted...)
-        $this->_nick = $ircdata->rawmessageex[2];
-    }
-    
-    function _event_rpl_motdstart(&$ircdata)
-    {
-        $this->_motd[] = $ircdata->message;
-    }
-    
-    function _event_rpl_motd(&$ircdata)
-    {
-        $this->_motd[] = $ircdata->message;
-    }
-    
-    function _event_rpl_endofmotd(&$ircdata)
-    {
-        $this->_motd[] = $ircdata->message;
-    }
-    
-    function _event_rpl_umodeis(&$ircdata)
-    {
-        $this->_usermode = $ircdata->message;
-    }
-    
-    function _event_rpl_channelmodeis(&$ircdata) {
-        if ($this->_channelsyncing == true && $this->isJoined($ircdata->channel)) {
-            $mode = $ircdata->rawmessageex[4];
-            $parameters = array_slice($ircdata->rawmessageex, 5);
-            
-            $ircdata->rawmessageex = array( 0 => '',
-                                            1 => '',
-                                            2 => '',
-                                            3 => $mode);
-            
-            foreach ($parameters as $value) {
-                $ircdata->rawmessageex[] = $value;
-            }
-            
-            // let _mode() handle the received mode
-            $this->_event_mode($ircdata);
-        }
-    }
-    
-    function _event_rpl_whoreply(&$ircdata)
-    {
-        if ($this->_channelsyncing == true) {
-            $nick = $ircdata->rawmessageex[7];
-            if ($ircdata->channel == '*') {
-                // we got who info without channel info, so we need to search the user
-                // on all channels and update him
-                foreach ($this->_channels as $channel) {
-                    if ($this->isJoined($channel->name, $nick)) {
-                        $ircdata->channel = $channel->name;
-                        $this->_event_rpl_whoreply($ircdata);
-                    }
-                }
-            } else {
-                if (!$this->isJoined($ircdata->channel, $nick)) {
-                    return;
-                }
-                                
-                $channel = &$this->_channels[strtolower($ircdata->channel)];
-                
-                $user = &new Net_SmartIRC_channeluser();
-                $user->ident = $ircdata->rawmessageex[4];
-                $user->host = $ircdata->rawmessageex[5];
-                $user->server = $ircdata->rawmessageex[6];
-                $user->nick = $ircdata->rawmessageex[7];
-                
-                $user->op = false;
-                $user->voice = false;
-                $user->ircop = false;
-                
-                $usermode = $ircdata->rawmessageex[8];
-                $usermodelength = strlen($usermode);
-                for ($i = 0; $i < $usermodelength; $i++) {
-                    switch ($usermode[$i]) {
-                        case 'H':
-                            $user->away = false;
-                        break;
-                        case 'G':
-                            $user->away = true;
-                        break;
-                        case '@':
-                            $user->op = true;
-                        break;
-                        case '+':
-                            $user->voice = true;
-                        break;
-                        case '*':
-                            $user->ircop = true;
-                        break;
-                    }
-                }
-                 
-                $user->hopcount = substr($ircdata->rawmessageex[9], 1);
-                $user->realname = implode(array_slice($ircdata->rawmessageex, 10), ' ');
-                
-                $this->_adduser($channel, $user);
-            }
-        }
-    }
-    
-    function _event_rpl_namreply(&$ircdata)
-    {
-        if ($this->_channelsyncing == true) {
-            $channel = &$this->_channels[strtolower($ircdata->channel)];
-            
-            $userarray = explode(' ', rtrim($ircdata->message));
-            $userarraycount = count($userarray);
-            for ($i = 0; $i < $userarraycount; $i++) {
-                $user = &new Net_SmartIRC_channeluser();
-                
-                $usermode = substr($userarray[$i], 0, 1);
-                switch ($usermode) {
-                    case '@':
-                        $user->op = true;
-                        $user->nick = substr($userarray[$i], 1);
-                    break;
-                    case '+':
-                        $user->voice = true;
-                        $user->nick = substr($userarray[$i], 1);
-                    break;
-                    default:
-                        $user->nick = $userarray[$i];
-                }
-                
-                $this->_adduser($channel, $user);
-            }
-        }
-    }
-    
-    function _event_rpl_banlist(&$ircdata)
-    {
-        if ($this->_channelsyncing == true && $this->isJoined($ircdata->channel)) {
-            $channel = &$this->_channels[strtolower($ircdata->channel)];
-            $hostmask = $ircdata->rawmessageex[4];
-            $channel->bans[$hostmask] = true;
-        }
-    }
-    
-    function _event_rpl_topic(&$ircdata)
-    {
-        if ($this->_channelsyncing == true) {
-            $channel = &$this->_channels[strtolower($ircdata->channel)];
-            $topic = substr(implode(array_slice($ircdata->rawmessageex, 4), ' '), 1);
-            $channel->topic = $topic;
-        }
-    }
-    
-    /* err_ */
-    function _event_err_nicknameinuse(&$ircdata)
-    {
-        $this->_nicknameinuse();
-    }
-}
-?>
\ No newline at end of file
diff --git a/tools/IRC_Bot/magpierss/AUTHORS b/tools/IRC_Bot/magpierss/AUTHORS
deleted file mode 100644
index 7d7f3f53e..000000000
--- a/tools/IRC_Bot/magpierss/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-kellan <kellan@protest.net>
diff --git a/tools/IRC_Bot/magpierss/CHANGES b/tools/IRC_Bot/magpierss/CHANGES
deleted file mode 100644
index b186af5c9..000000000
--- a/tools/IRC_Bot/magpierss/CHANGES
+++ /dev/null
@@ -1,37 +0,0 @@
-Version 0.7
------------
-    - support for input and output charset encoding
-      based on the work in FoF, uses iconv or mbstring if available
-    -
-
-Version 0.6
------------
-    - basic support for Atom syndication format
-      including support for Atom content constructs
-    - fixed support for private feeds (HTTP Auth and SSL)
-      (thanks to silverorange.com for providing test feeds)
-	- support for some broken webservers
-
-Version 0.52
------------
-    - support GZIP content negoiation
-    - PHP 4.3.2 support
-
-Version 0.4
------------
-	- improved error handling, better access for script authors
-	- included example scripts of working with MagpieRSS
-	- new Smarty plugin for RSS date parsing
-
-Version 0.3
------------
-	- added support for conditional gets (Last-Modified, ETag)
-	- now use Snoopy to handle fetching RSS files
-	
-Version 0.2
------------
-	- MAJOR CLEAN UP
-	- removed kludgy $options array in favour of constants
-	- phased out returning arrays
-	- added better error handling
-	- re-worked comments
diff --git a/tools/IRC_Bot/magpierss/ChangeLog b/tools/IRC_Bot/magpierss/ChangeLog
deleted file mode 100644
index d52a58782..000000000
--- a/tools/IRC_Bot/magpierss/ChangeLog
+++ /dev/null
@@ -1,346 +0,0 @@
-2004-11-21 22:45  kellan
-
-	* rss_fetch.inc: detab, bump version
-
-2004-11-21 20:52  kellan
-
-	* rss_fetch.inc, rss_parse.inc: cache on $url . $output_encoding
-	  otherwise we can get munged output
-	* rss_parse.inc: don't set ERROR on notice or warning (rss_fetch
-	  dies on parse errors)
-	* rss_fetch.inc: add encoding defines (fix timeout error reporting)
-
-2004-11-21 17:21  kellan
-
-	* rss_parse.inc: incorporate steve's patch
-
-2004-11-21 16:26  kellan
-
-	* rss_parse.inc: remove old debugging functions, totally
-	  arbitrarily.	might break stuff.  can't really explain why i'm
-	  doing this.
-
-2004-10-28 12:52  kellan
-
-	* rss_parse.inc: fixed '=' instead of '=='
-
-2004-10-25 21:48  kellan
-
-	* rss_parse.inc: chance epoch to timestamp to conform w/ php naming
-	  conventions
-
-2004-06-15 09:00  kellan
-
-	* rss_parse.inc: [no log message]
-
-2004-04-26 11:16  kellan
-
-	* rss_fetch.inc: bump version
-
-2004-04-26 09:36  kellan
-
-	* rss_parse.inc: fix field doubling
-
-2004-04-24 14:47  kellan
-
-	* CHANGES, ChangeLog: updated
-
-2004-04-24 14:35  kellan
-
-	* rss_fetch.inc: bumped version
-
-2004-04-24 13:52  kellan
-
-	* rss_parse.inc: support arbitrary atom content constructs
-
-	  some refactoring
-
-2004-04-24 13:15  kellan
-
-	* rss_parse.inc: support summary content contstruct.  add normalize
-	  function
-
-2004-03-27 13:29  kellan
-
-	* extlib/Snoopy.class.inc: accept self-signed certs
-
-2004-03-27 09:53  kellan
-
-	* extlib/Snoopy.class.inc: fixed SSL support   * set status   * set
-	  error on bad curl
-
-	  (also ripped out big chunks of dead weight (submit_form) which
-	  were getting in my way
-
-2004-01-24 23:25  kellan
-
-	* rss_parse.inc: make RSS 1.0's rdf:about available
-
-2004-01-24 23:07  kellan
-
-	* rss_parse.inc: clean up text, and line formats.  add support item
-	  rdf:about
-
-2004-01-24 20:40  kellan
-
-	* CHANGES, ChangeLog: update changes
-
-2004-01-24 20:37  kellan
-
-	* rss_fetch.inc: updated version
-
-2004-01-24 20:35  kellan
-
-	* rss_parse.inc: whitespace
-
-2004-01-24 20:23  kellan
-
-	* extlib/Snoopy.class.inc: support badly formatted http headers
-
-2004-01-24 20:20  kellan
-
-	* rss_parse.inc: added alpha atom parsing support
-
-2003-06-25 19:34  kellan
-
-	* extlib/Snoopy.class.inc: fixed fread 4.3.2 compatibility problems
-
-2003-06-13 08:31  kellan
-
-	* rss_fetch.inc: reset cache on 304
-
-2003-06-12 18:37  kellan
-
-	* rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc:
-	  bumped up version numbers
-
-2003-06-12 18:32  kellan
-
-	* htdocs/index.html: updated news
-
-2003-06-12 18:27  kellan
-
-	* NEWS: a manual blog :)
-
-2003-06-12 18:22  kellan
-
-	* htdocs/index.html: fully qualified img
-
-2003-06-12 18:20  kellan
-
-	* htdocs/index.html: clean up.	added badge.
-
-2003-06-12 18:04  kellan
-
-	* rss_utils.inc: clean up regex
-
-2003-06-12 18:02  kellan
-
-	* rss_cache.inc: suppress some warnings
-
-2003-05-30 17:44  kellan
-
-	* extlib/Snoopy.class.inc: more comments, cleaned up notice
-
-2003-05-30 12:14  kellan
-
-	* extlib/Snoopy.class.inc: don't advertise gzip support if the user
-	  hasn't built php with gzinflate support
-
-2003-05-12 19:32  kellan
-
-	* ChangeLog: changes
-
-2003-05-12 19:11  kellan
-
-	* htdocs/index.html: announce 0.5
-
-2003-05-12 18:42  kellan
-
-	* htdocs/index.html: change
-
-2003-05-12 18:39  kellan
-
-	* rss_fetch.inc: use gzip
-
-2003-05-12 18:37  kellan
-
-	* extlib/Snoopy.class.inc: added support gzip encoded content
-	  negoiation
-
-2003-05-12 18:32  kellan
-
-	* rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc: fixed
-	  typoes
-
-2003-04-26 18:44  kellan
-
-	* rss_parse.inc: fix minor typo
-
-2003-04-18 05:19  kellan
-
-	* htdocs/cookbook.html: updated cookbook to show more code for
-	  limiting items
-
-2003-03-03 13:02  kellan
-
-	* rss_parse.inc, scripts/magpie_slashbox.php: committed (or
-	  adpated) patch from Nicola (www.technick.com) to quell 'Undefined
-	  Indexes' notices
-
-2003-03-03 12:59  kellan
-
-	* rss_fetch.inc: commited patch from nicola (www.technick.com) to
-	  quell 'undefined indexes' notices.
-
-	  * Magpie now automatically includes its version in the
-	  user-agent, & whether cacheing is turned on.
-
-2003-02-11 22:22  kellan
-
-	* CHANGES, ChangeLog: ChangeLog now auto-generated by cvs2cl
-
-2003-02-11 21:21  kellan
-
-	* rss_fetch.inc: better errors, hopefully stomped on pesky notices
-
-2003-02-11 21:19  kellan
-
-	* rss_parse.inc: check to see is xml is supported, if not die
-
-	  also throw better xml errors
-
-2003-02-11 21:18  kellan
-
-	* rss_cache.inc: hopefully cleared up some notices that were being
-	  thrown into the log
-
-	  fixed a debug statement that was being called as an error
-
-2003-02-11 21:15  kellan
-
-	* scripts/: magpie_simple.php, magpie_slashbox.php: moved
-	  magpie_simple to magpie_slashbox, and replaced it with a simpler
-	  demo.
-
-2003-02-11 21:02  kellan
-
-	* INSTALL, README, TROUBLESHOOTING: Improved documentation.  Better
-	  install instructions.
-
-	  TROUBLESHOOTING cover common installation and usage problems
-
-2003-01-22 11:40  kellan
-
-	* htdocs/cookbook.html: added cookbook.html
-
-2003-01-21 20:47  kellan
-
-	* cookbook: a magpie cookbook
-
-2003-01-20 07:09  kellan
-
-	* ChangeLog: updated
-
-2003-01-20 06:23  kellan
-
-	* scripts/simple_smarty.php: minor clean up
-
-2003-01-20 06:15  kellan
-
-	* scripts/README: added smarty url
-
-2003-01-20 06:14  kellan
-
-	* magpie_simple.php, htdocs/index.html, scripts/README,
-	  scripts/magpie_debug.php, scripts/magpie_simple.php,
-	  scripts/simple_smarty.php,
-	  scripts/smarty_plugin/modifier.rss_date_parse.php,
-	  scripts/templates/simple.smarty: Added scripts directory for
-	  examples on how to use MagpieRSS
-
-	  magpie_simple - is a simple example magpie_debug - spew all the
-	  information from a parsed RSS feed simple_smary - example of
-	  using magpie with Smarty template system
-	  smarty_plugin/modifier.rss_date_parse.php - support file for the
-	  smarty demo templates/simple.smary - template for the smarty demo
-
-2003-01-20 06:11  kellan
-
-	* rss_fetch.inc, rss_parse.inc: changes to error handling to give
-	  script authors more access to magpie's errors.
-
-	  added method magpie_error() to retrieve global MAGPIE_ERROR
-	  variable for when fetch_rss() returns false
-
-2002-10-26 16:02  kellan
-
-	* htdocs/index.html: putting the website under source control
-
-2002-10-26 15:43  kellan
-
-	* AUTHORS, ChangeLog, INSTALL, README: some documentation to make
-	  it all look official :)
-
-2002-10-25 20:04  kellan
-
-	* magpie_simple.php: quxx
-
-2002-10-25 20:04  kellan
-
-	* rss_parse.inc: added support for textinput and image
-
-2002-10-25 16:23  kellan
-
-	* magpie_simple.php, rss_cache.inc, rss_fetch.inc, rss_parse.inc,
-	  rss_utils.inc: switched to using Snoopy for fetching remote RSS
-	  files.
-
-	  added support for conditional gets
-
-2002-10-25 16:22  kellan
-
-	* rss_cache.inc, rss_fetch.inc, rss_parse.inc, rss_utils.inc:
-	  Change comment style to slavishly imitate the phpinsider style
-	  found in Smarty and Snoopy :)
-
-2002-10-25 16:18  kellan
-
-	* extlib/Snoopy.class.inc: added Snoopy in order to support
-	  conditional gets
-
-2002-10-23 20:19  kellan
-
-	* magpie_simple.php, rss_cache.inc, rss_fetch.inc, rss_parse.inc:
-	  MAJOR CLEANUP!
-
-	  * rss_fetch got rid of the options array, replaced it with a more
-	  PHP-like solution of using defines.  constants are setup, with
-	  defaults, in the function init()
-
-	  got rid of the idiom of passing back an array, its was awkward to
-	  deal with in PHP, and unusual (and consquently confusing to
-	  people).  now i return true/false values, and try to setup error
-	  string where appropiate (rss_cache has the most complete example
-	  of this)
-
-	  change the logic for interacting with the cache
-
-	  * rss_cache major re-working of how error are handled.  tried to
-	  make the code more resillient.  the cache is now much more aware
-	  of MAX_AGE, where before this was being driven out of rss_fetch
-	  (which was silly)
-
-	  * rss_parse properly handles xml parse errors.  used to sail
-	  along blithely unaware.
-
-2002-09-11 08:11  kellan
-
-	* rss_cache.inc, rss_parse.inc, magpie_simple.php, rss_fetch.inc,
-	  rss_utils.inc: Initial revision
-
-2002-09-11 08:11  kellan
-
-	* rss_cache.inc, rss_parse.inc, magpie_simple.php, rss_fetch.inc,
-	  rss_utils.inc: initial import
-
diff --git a/tools/IRC_Bot/magpierss/INSTALL b/tools/IRC_Bot/magpierss/INSTALL
deleted file mode 100644
index 640833d50..000000000
--- a/tools/IRC_Bot/magpierss/INSTALL
+++ /dev/null
@@ -1,143 +0,0 @@
-REQUIREMENTS
-
-    MapieRSS requires a recent PHP 4+ (developed with 4.2.0)
-    with xml (expat) support.
-    
-    Optionally:
-      * PHP5 with libxml2 support.
-      * cURL for SSL support
-      * iconv (preferred) or mb_string for expanded character set support
-    
-QUICK START
-
-    Magpie consists of 4 files (rss_fetch.inc, rss_parser.inc, rss_cache.inc, 
-    and rss_utils.inc), and the directory extlib (which contains a modified 
-    version of the Snoopy HTTP client)
-    
-    Copy these 5 resources to a directory named 'magpierss' in the same 
-    directory as your PHP script.
-    
-    At the top of your script add the following line:
-    
-        require_once('magpierss/rss_fetch.inc');
-    
-    Now you can use the fetch_rss() method:
-      
-        $rss = fetch_rss($url);
-        
-    Done.  That's it.   See README for more details on using MagpieRSS.
-
-NEXT STEPS
-
-    Important:  you'll probably want to get the cache directory working in 
-    order to speed up your application, and not abuse the webserver you're 
-    downloading the RSS from.
-    
-    Optionally you can install MagpieRSS in your PHP include path in order to 
-    make it available server wide.
-    
-    Lastly you might want to look through the constants in rss_fetch.inc see if 
-    there is anything you want to override (the defaults are pretty good)
-
-    For more info, or if you have trouble, see TROUBLESHOOTING
-
-SETTING UP CACHING
-
-    Magpie has built-in transparent caching.  With caching Magpie will only 
-    fetch and parse RSS feeds when there is new content.  Without this feature 
-    your pages will be slow, and the sites serving the RSS feed will be annoyed 
-    with you.
-    
-** Simple and Automatic **
-    
-    By default Magpie will try to create a cache directory named 'cache' in the
-    same directory as your PHP script.
-    
-** Creating a Local Cache Directory **
-    
-    Often this will fail, because your webserver doesn't have sufficient 
-    permissions to create the directory. 
-    
-    Exact instructions for how to do this will vary from install to install and 
-    platform to platform.  The steps are:
-    
-    1.  Make a directory named 'cache'
-    2.  Give the web server write access to that directory.
-    
-    An example of how to do this on Debian would be:
-    
-    1.  mkdir /path/to/script/cache
-    2.  chgrp www-data /path/to/script/cache
-    3.  chmod 775 /path/to/script/cache
-    
-    On other Unixes you'll need to change 'www-data' to what ever user Apache 
-    runs as. (on MacOS X the user would be 'www')
-    
-** Cache in /tmp **
-    
-    Sometimes you won't be able to create a local cache directory.  Some reasons 
-    might be:
-    
-    1.  No shell account
-    2.  Insufficient permissions to change ownership of a directory
-    3.  Webserver runs as 'nobody'
-    
-    In these situations using a cache directory in /tmp can often be a good 
-    option.
-    
-    The drawback is /tmp is public, so anyone on the box can read the cache 
-    files.  Usually RSS feeds are public information, so you'll have to decide 
-    how much of an issue that is.
-
-    To use /tmp as your cache directory you need to add the following line to 
-    your script:
-        
-        define('MAGPIE_CACHE_DIR', '/tmp/magpie_cache');
-        
-** Global Cache **
-
-    If you have several applications using Magpie, you can create a single 
-    shared cache directory, either using the /tmp cache, or somewhere else on 
-    the system.
-    
-    The upside is that you'll distribute fetching and parsing feeds across 
-    several applications.
-    
-INSTALLING MAGPIE SERVER WIDE
-
-    Rather then following the Quickstart instructions which requires you to have 
-    a copy of Magpie per application, alternately you can place it in some 
-    shared location.
-    
-** Adding Magpie to Your Include Path **
-
-    Copy the 5 resources (rss_fetch.inc, rss_parser.inc, rss_cache.inc,         
-    rss_utils.inc, and extlib) to a directory named 'magpierss' in your include 
-    path.  Now any PHP file on your system can use Magpie with:
-    
-        require_once('magpierss/rss_fetch.inc');
-
-    Different installs have different include paths, and you'll have to figure 
-    out what your include_path is.
-    
-    From shell you can try: 
-        
-        php -i | grep 'include_path'
-
-    Alternatley you can create a phpinfo.php file with contains:
-    
-        <?php phpinfo(); ?>
-    
-    Debian's default is:  
-        
-        /usr/share/php 
-        
-    (though more idealogically pure location would be /usr/local/share/php)
-    
-    Apple's default include path is:
-    
-        /usr/lib/php
-        
-    While the Entropy PHP build seems to use:
-    
-        /usr/local/php/lib/php
\ No newline at end of file
diff --git a/tools/IRC_Bot/magpierss/NEWS b/tools/IRC_Bot/magpierss/NEWS
deleted file mode 100644
index 5ac6b9788..000000000
--- a/tools/IRC_Bot/magpierss/NEWS
+++ /dev/null
@@ -1,53 +0,0 @@
-MagpieRSS News
-
-MAGPIERSS 0.51 RELEASED
-	* important bugfix!
-	* fix "silent failure" when PHP doesn't have zlib
-
-FEED ON FEEDS USES MAGPIE
-	* web-based RSS aggregator built with Magpie
-	* easy to install, easy to use.
-	http://minutillo.com/steve/feedonfeeds/
-	
-MAGPIERSS 0.5 RELEASED
-	* supports transparent HTTP gzip content negotiation for reduced bandwidth usage
-    * quashed some undefined index notices
-
-MAGPIERSS 0.46 RELEASED
-    * minor release, more error handling clean up
-    * documentation fixes, simpler example
-    * new trouble shooting guide for installation and usage problems 
-      http://magpierss.sourceforge.net/TROUBLESHOOTING
-
-MAGPIE NEWS AS RSS
-    * releases, bug fixes, releated stories in RSS
-    
-MAGPIERSS COOKBOOK: SIMPLE PHP RSS HOW TOS
-    * answers some of the most frequently asked Magpie questions
-    * feedback, suggestions, requests, recipes welcome
-      http://magpierss.sourceforge.net/cookbook.html
-
-MAGPIERSS 0.4 RELEASED!
-    * improved error handling, more flexibility for script authors, backwards compatible
-    * new and better examples! including using MagpieRSS and Smarty
-    * new Smarty plugin for RSS date parsing
-      http://smarty.php.net
-
-INFINITE PENGUIN NOW SUPPORTS MAGPIE 0.3
-    * simple, sophisticated RSS viewer
-    * includes auto-generated javascript ticker from RSS feed
-      http://www.infinitepenguins.net/rss/
-
-TRAUMWIND RELEASES REX BACKEND FOR MAGPIERSS
-    * drop in support using regex based XML parser
-    * parses improperly formed XML that chokes expat
-      http://traumwind.de/blog/magpie/magpie_alike.php
-
-MAGPIERSS 0.3 RELEASED!
-    * Support added for HTTP Conditional GETs.
-      http://fishbowl.pastiche.org/archives/001132.html
-
-MAGPIERSS 0.2!
-    * Major clean up of the code. Easier to use.
-    * Simpler install on shared hosts.
-    * Better documentation and comments.
diff --git a/tools/IRC_Bot/magpierss/README b/tools/IRC_Bot/magpierss/README
deleted file mode 100644
index 6af7edb07..000000000
--- a/tools/IRC_Bot/magpierss/README
+++ /dev/null
@@ -1,48 +0,0 @@
-NAME
-
-	MagpieRSS - a simple RSS integration tool
-
-SYNOPSIS
-
-	require_once(rss_fetch.inc);
-	$url = $_GET['url'];
-	$rss = fetch_rss( $url );
-	
-	echo "Channel Title: " . $rss->channel['title'] . "<p>";
-	echo "<ul>";
-	foreach ($rss->items as $item) {
-		$href = $item['link'];
-		$title = $item['title'];
-		echo "<li><a href=$href>$title</a></li>";
-	}
-	echo "</ul>";
-
-DESCRIPTION
-
-	MapieRSS is an XML-based RSS parser in PHP.  It attempts to be "PHP-like",
-	and simple to use.
-	
-	Some features include:
-	
-	* supports RSS 0.9 - 1.0, with limited RSS 2.0 support
-	* supports namespaces, and modules, including mod_content and mod_event
-	* open minded [1]
-	* simple, functional interface, to object oriented backend parser
-	* automatic caching of parsed RSS objects makes its easy to integrate
-	* supports conditional GET with Last-Modified, and ETag
-	* uses constants for easy override of default behaviour 
-	* heavily commented
-
-
-1. By open minded I mean Magpie will accept any tag it finds in good faith that
-   it was supposed to be here.  For strict validation, look elsewhere.
-
-
-GETTING STARTED
-
-	
-
-COPYRIGHT:
-	Copyright(c) 2002 kellan@protest.net. All rights reserved.
-	This software is released under the GNU General Public License.
-	Please read the disclaimer at the top of the Snoopy.class.inc file.
diff --git a/tools/IRC_Bot/magpierss/TROUBLESHOOTING b/tools/IRC_Bot/magpierss/TROUBLESHOOTING
deleted file mode 100644
index 89068d382..000000000
--- a/tools/IRC_Bot/magpierss/TROUBLESHOOTING
+++ /dev/null
@@ -1,152 +0,0 @@
-TROUBLESHOOTING
-
-
-Trouble Installing MagpieRSS:
-
-1.	Fatal error: Failed opening required '/path/to/script/rss_fetch.inc' 
-	(include_path='.:/usr/local/lib/php:/usr/local/lib/php/pear') 
-
-2.	Cache couldn't make dir './cache'.
-
-3.	Fatal error: Failed to load PHP's XML Extension. 
-	http://www.php.net/manual/en/ref.xml.php
-
-Trouble Using MagpieRSS
-
-4.	Warning: MagpieRSS: Failed to fetch example.com/index.rdf. 
-	(HTTP Error: Invalid protocol "")
-
-5.	Warning: MagpieRSS: Failed to parse RSS file. 
-	(not well-formed (invalid token) at line 19, column 98)
-
-6.	Warning: MagpieRSS: Failed to fetch http://localhost/rss/features.1-0.rss. 
-	(HTTP Response: HTTP/1.1 404 Not Found)
-
-If you would rather provide a custom error, see the COOKBOOK
-(http://magpierss.sf.net/cookbook.html) recipe 2.
-
-*************************************************************************
-1.	Fatal error: Failed opening required '/path/to/script/rss_fetch.inc' 
-	(include_path='.:/usr/local/lib/php:/usr/local/lib/php/pear') 
-	
-	This could mean that:
-	
-	a) PHP can't find the MagpieRSS files.
-	b) PHP found them the MagpieRSS files, but can't read them.
-	
-	a. Telling PHP where to look for MagpieRSS file.
-	
-	This might mean your PHP program can't find the MagpieRSS libraries. 
-	Magpie relies on 4 include files, rss_fetch.inc, rss_parse.inc,
-	rss_cache.inc, rss_util.inc, and for normal use you'll need all 4 (see the
-	cookbook for exceptions).
-
-	This can be fixed by making sure the MagpieRSS files are in your include
-	path.
-	
-	If you can edit your include path (for example your on a shared host) then
-	you need to replace:
-	
-	require_once('rss_fetch.inc');
-		
-	-with-
-		
-	define('MAGPIE_DIR', '/path/to/magpierss/');
-	require_once(MAGPIE_DIR.'rss_fetch.inc');
-
-	b.  PHP can't read the MagpieRSS files
-	
-	All PHP libraries need to be readable by your webserver.
-	
-	On Unix you can accomplish this with:
-	
-	chmod 755 rss_fetch.inc rss_parse.inc rss_cache.inc rss_util.inc
-	
-*************************************************************************
-2. Cache couldn't make dir './cache'.
-
-	MagpieRSS caches the results of fetched and parsed RSS to reduce the load on
-	both your server, and the remote server providing the RSS.  It does this by
-	writing files to a cache directory.
-
-	This error means the webserver doesn't have write access to the current
-	directory.
-	
-	a. Make a webserver writeable cache directory
-	
-	Find the webserver's group. (on my system it is 'www')
-	
-	mkdir ./cache
-	chgrp www directory_name
-	chmod g+w directory_name
-	
-	(this is the best, and desired solution)
-	
-	b. Tell MagpieRSS to create the cache directory somewhere the webserver can
-	write to.
-	
-	define('MAGPIE_CACHE_DIR', '/tmp/magpierss');
-
-	(this is not a great solution, and might have security considerations)
-		
-	c. Turn off cacheing.  
-	
-	Magpie can work fine with cacheing, but it will be slower, and you might
-	become a nuiance to the RSS provider, but it is an option.
-	
-	define('MAGPIE_CACHE_ON', 0);
-	
-	d. And lastly, do NOT
-	
-	chmod 777 ./cache
-	
-	Any of the above solutions are better then this.
-
-	NOTE: If none of this works for you, let me know.  I've got root, and a
-	custom compiled Apache on almost any box I ever touch, so I can be a little
-	out of touch with reality.  But I won't know that if I don't feedback.
-
-************************************************************************* 3.
-3.	Fatal error: Failed to load PHP's XML Extension. 
-	http://www.php.net/manual/en/ref.xml.php
-
-	-or-
-	
-	Fatal error: Failed to create an instance of PHP's XML parser.
-	http://www.php.net/manual/en/ref.xml.php
-	
-	Make sure your PHP was built with --with-xml
-	
-	This has been turned on by default for several versions of PHP, but it might
-	be turned off in your build.
-	
-	See php.net for details on building and configuring PHP.
-
-
-*************************************************************************
-4.	Warning: MagpieRSS: Failed to fetch index.rdf. 
-	(HTTP Error: Invalid protocol "")
-	
-	You need to put http:// in front of your the URL to your RSS feed
-
-*************************************************************************	
-5.	Warning: MagpieRSS: Failed to parse RSS file. 
-	(not well-formed (invalid token) at line 19, column 98)
-
-	There is a problem with the RSS feed you are trying to read. 
-	MagpieRSS is an XML parser, and therefore can't parse RSS feed with invalid
-	characters.  Some RSS parser are based on regular expressions, and can
-	parse invalid RSS but they have their own problems.
-
-	You could try contacting the author of the RSS feed, and pointing them to
-	the online RSS validator at:
-	
-	http://feeds.archive.org/validator/
-
-*************************************************************************	
-6.	Warning: MagpieRSS: Failed to fetch http://example.com/index.rdf 
-	(HTTP Response: HTTP/1.1 404 Not Found)
-
-	Its a 404!  The RSS file ain't there.
-	
-	
diff --git a/tools/IRC_Bot/magpierss/extlib/Snoopy.class.inc b/tools/IRC_Bot/magpierss/extlib/Snoopy.class.inc
deleted file mode 100644
index 532ecba10..000000000
--- a/tools/IRC_Bot/magpierss/extlib/Snoopy.class.inc
+++ /dev/null
@@ -1,899 +0,0 @@
-<?php
-
-/*************************************************
-
-Snoopy - the PHP net client
-Author: Monte Ohrt <monte@ispi.net>
-Copyright (c): 1999-2000 ispi, all rights reserved
-Version: 1.0
-
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-You may contact the author of Snoopy by e-mail at:
-monte@ispi.net
-
-Or, write to:
-Monte Ohrt
-CTO, ispi
-237 S. 70th suite 220
-Lincoln, NE 68510
-
-The latest version of Snoopy can be obtained from:
-http://snoopy.sourceforge.com
-
-*************************************************/
-
-class Snoopy
-{
-	/**** Public variables ****/
-	
-	/* user definable vars */
-
-	var $host			=	"www.php.net";		// host name we are connecting to
-	var $port			=	80;					// port we are connecting to
-	var $proxy_host		=	"";					// proxy host to use
-	var $proxy_port		=	"";					// proxy port to use
-	var $agent			=	"Snoopy v1.0";		// agent we masquerade as
-	var	$referer		=	"";					// referer info to pass
-	var $cookies		=	array();			// array of cookies to pass
-												// $cookies["username"]="joe";
-	var	$rawheaders		=	array();			// array of raw headers to send
-												// $rawheaders["Content-type"]="text/html";
-
-	var $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
-	var $lastredirectaddr	=	"";				// contains address of last redirected address
-	var	$offsiteok		=	true;				// allows redirection off-site
-	var $maxframes		=	0;					// frame content depth maximum. 0 = disallow
-	var $expandlinks	=	true;				// expand links to fully qualified URLs.
-												// this only applies to fetchlinks()
-												// or submitlinks()
-	var $passcookies	=	true;				// pass set cookies back through redirects
-												// NOTE: this currently does not respect
-												// dates, domains or paths.
-	
-	var	$user			=	"";					// user for http authentication
-	var	$pass			=	"";					// password for http authentication
-	
-	// http accept types
-	var $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
-	
-	var $results		=	"";					// where the content is put
-		
-	var $error			=	"";					// error messages sent here
-	var	$response_code	=	"";					// response code returned from server
-	var	$headers		=	array();			// headers returned from server sent here
-	var	$maxlength		=	500000;				// max return data length (body)
-	var $read_timeout	=	0;					// timeout on read operations, in seconds
-												// supported only since PHP 4 Beta 4
-												// set to 0 to disallow timeouts
-	var $timed_out		=	false;				// if a read operation timed out
-	var	$status			=	0;					// http request status
-	
-	var	$curl_path		=	"/usr/bin/curl";
-												// Snoopy will use cURL for fetching
-												// SSL content if a full system path to
-												// the cURL binary is supplied here.
-												// set to false if you do not have
-												// cURL installed. See http://curl.haxx.se
-												// for details on installing cURL.
-												// Snoopy does *not* use the cURL
-												// library functions built into php,
-												// as these functions are not stable
-												// as of this Snoopy release.
-	
-	// send Accept-encoding: gzip?
-	var $use_gzip		= true;	
-	
-	/**** Private variables ****/	
-	
-	var	$_maxlinelen	=	4096;				// max line length (headers)
-	
-	var $_httpmethod	=	"GET";				// default http request method
-	var $_httpversion	=	"HTTP/1.0";			// default http request version
-	var $_submit_method	=	"POST";				// default submit method
-	var $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
-	var $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
-	var $_redirectaddr	=	false;				// will be set if page fetched is a redirect
-	var $_redirectdepth	=	0;					// increments on an http redirect
-	var $_frameurls		= 	array();			// frame src urls
-	var $_framedepth	=	0;					// increments on frame depth
-	
-	var $_isproxy		=	false;				// set if using a proxy server
-	var $_fp_timeout	=	30;					// timeout for socket connection
-
-/*======================================================================*\
-	Function:	fetch
-	Purpose:	fetch the contents of a web page
-				(and possibly other protocols in the
-				future like ftp, nntp, gopher, etc.)
-	Input:		$URI	the location of the page to fetch
-	Output:		$this->results	the output text from the fetch
-\*======================================================================*/
-
-	function fetch($URI)
-	{
-	
-		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
-		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
-			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
-			$this->pass = $URI_PARTS["pass"];
-				
-		switch($URI_PARTS["scheme"])
-		{
-			case "http":
-				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
-				{
-					if($this->_isproxy)
-					{
-						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
-					}
-					else
-					{
-						$path = $URI_PARTS["path"].(isset($URI_PARTS["query"]) ? "?".$URI_PARTS["query"] : "");
-						// no proxy, send only the path
-						$this->_httprequest($path, $fp, $URI, $this->_httpmethod);
-					}
-					
-					$this->_disconnect($fp);
-
-					if($this->_redirectaddr)
-					{
-						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
-						{
-							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
-							{
-								/* follow the redirect */
-								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
-								$this->fetch($this->_redirectaddr);
-							}
-						}
-					}
-
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
-					{
-						$frameurls = $this->_frameurls;
-						$this->_frameurls = array();
-						
-						while(list(,$frameurl) = each($frameurls))
-						{
-							if($this->_framedepth < $this->maxframes)
-							{
-								$this->fetch($frameurl);
-								$this->_framedepth++;
-							}
-							else
-								break;
-						}
-					}					
-				}
-				else
-				{
-					return false;
-				}
-				return true;					
-				break;
-			case "https":
-				if(!$this->curl_path || (!is_executable($this->curl_path))) {
-					$this->error = "Bad curl ($this->curl_path), can't fetch HTTPS \n";
-					return false;
-				}
-				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
-					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
-				{
-					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
-				}
-				else
-				{
-					$path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
-					// no proxy, send only the path
-					$this->_httpsrequest($path, $URI, $this->_httpmethod);
-				}
-
-				if($this->_redirectaddr)
-				{
-					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
-					{
-						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
-						{
-							/* follow the redirect */
-							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
-							$this->fetch($this->_redirectaddr);
-						}
-					}
-				}
-
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
-				{
-					$frameurls = $this->_frameurls;
-					$this->_frameurls = array();
-
-					while(list(,$frameurl) = each($frameurls))
-					{
-						if($this->_framedepth < $this->maxframes)
-						{
-							$this->fetch($frameurl);
-							$this->_framedepth++;
-						}
-						else
-							break;
-					}
-				}					
-				return true;					
-				break;
-			default:
-				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
-				return false;
-				break;
-		}		
-		return true;
-	}
-
-
-
-/*======================================================================*\
-	Private functions
-\*======================================================================*/
-	
-	
-/*======================================================================*\
-	Function:	_striplinks
-	Purpose:	strip the hyperlinks from an html document
-	Input:		$document	document to strip.
-	Output:		$match		an array of the links
-\*======================================================================*/
-
-	function _striplinks($document)
-	{	
-		preg_match_all("'<\s*a\s+.*href\s*=\s*			# find <a href=
-						([\"\'])?					# find single or double quote
-						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
-													# quote, otherwise match up to next space
-						'isx",$document,$links);
-						
-
-		// catenate the non-empty matches from the conditional subpattern
-
-		while(list($key,$val) = each($links[2]))
-		{
-			if(!empty($val))
-				$match[] = $val;
-		}				
-		
-		while(list($key,$val) = each($links[3]))
-		{
-			if(!empty($val))
-				$match[] = $val;
-		}		
-		
-		// return the links
-		return $match;
-	}
-
-/*======================================================================*\
-	Function:	_stripform
-	Purpose:	strip the form elements from an html document
-	Input:		$document	document to strip.
-	Output:		$match		an array of the links
-\*======================================================================*/
-
-	function _stripform($document)
-	{	
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
-		
-		// catenate the matches
-		$match = implode("\r\n",$elements[0]);
-				
-		// return the links
-		return $match;
-	}
-
-	
-	
-/*======================================================================*\
-	Function:	_striptext
-	Purpose:	strip the text from an html document
-	Input:		$document	document to strip.
-	Output:		$text		the resulting text
-\*======================================================================*/
-
-	function _striptext($document)
-	{
-		
-		// I didn't use preg eval (//e) since that is only available in PHP 4.0.
-		// so, list your entities one by one here. I included some of the
-		// more common ones.
-								
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
-						"'([\r\n])[\s]+'",					// strip out white space
-						"'&(quote|#34);'i",					// replace html entities
-						"'&(amp|#38);'i",
-						"'&(lt|#60);'i",
-						"'&(gt|#62);'i",
-						"'&(nbsp|#160);'i",
-						"'&(iexcl|#161);'i",
-						"'&(cent|#162);'i",
-						"'&(pound|#163);'i",
-						"'&(copy|#169);'i"
-						);				
-		$replace = array(	"",
-							"",
-							"\\1",
-							"\"",
-							"&",
-							"<",
-							">",
-							" ",
-							chr(161),
-							chr(162),
-							chr(163),
-							chr(169));
-					
-		$text = preg_replace($search,$replace,$document);
-								
-		return $text;
-	}
-
-/*======================================================================*\
-	Function:	_expandlinks
-	Purpose:	expand each link into a fully qualified URL
-	Input:		$links			the links to qualify
-				$URI			the full URI to get the base from
-	Output:		$expandedLinks	the expanded links
-\*======================================================================*/
-
-	function _expandlinks($links,$URI)
-	{
-		
-		preg_match("/^[^\?]+/",$URI,$match);
-
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
-				
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
-							"|^(?!http://)(\/)?(?!mailto:)|i",
-							"|/\./|",
-							"|/[^\/]+/\.\./|"
-						);
-						
-		$replace = array(	"",
-							$match."/",
-							"/",
-							"/"
-						);			
-				
-		$expandedLinks = preg_replace($search,$replace,$links);
-
-		return $expandedLinks;
-	}
-
-/*======================================================================*\
-	Function:	_httprequest
-	Purpose:	go get the http data from the server
-	Input:		$url		the url to fetch
-				$fp			the current open file pointer
-				$URI		the full URI
-				$body		body contents to send if any (POST)
-	Output:		
-\*======================================================================*/
-	
-	function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
-	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
-			
-		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
-		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";		
-		if(!empty($this->agent))
-			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host']))
-			$headers .= "Host: ".$this->host."\r\n";
-		if(!empty($this->accept))
-			$headers .= "Accept: ".$this->accept."\r\n";
-		
-		if($this->use_gzip) {
-			// make sure PHP was built with --with-zlib
-			// and we can handle gzipp'ed data
-			if ( function_exists(gzinflate) ) {
-			   $headers .= "Accept-encoding: gzip\r\n";
-			}
-			else {
-			   trigger_error(
-			   	"use_gzip is on, but PHP was built without zlib support.".
-				"  Requesting file(s) without gzip encoding.", 
-				E_USER_NOTICE);
-			}
-		}
-		
-		if(!empty($this->referer))
-			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
-		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
-	
-			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
-				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
-				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
-				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
-			} 
-		}
-		if(!empty($this->rawheaders))
-		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers .= $headerKey.": ".$headerVal."\r\n";
-		}
-		if(!empty($content_type)) {
-			$headers .= "Content-type: $content_type";
-			if ($content_type == "multipart/form-data")
-				$headers .= "; boundary=".$this->_mime_boundary;
-			$headers .= "\r\n";
-		}
-		if(!empty($body))	
-			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers .= "Authorization: BASIC ".base64_encode($this->user.":".$this->pass)."\r\n";
-
-		$headers .= "\r\n";
-		
-		// set the read timeout if needed
-		if ($this->read_timeout > 0)
-			socket_set_timeout($fp, $this->read_timeout);
-		$this->timed_out = false;
-		
-		fwrite($fp,$headers.$body,strlen($headers.$body));
-		
-		$this->_redirectaddr = false;
-		unset($this->headers);
-		
-		// content was returned gzip encoded?
-		$is_gzipped = false;
-						
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
-		{
-			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
-			{
-				$this->status=-100;
-				return false;
-			}
-				
-		//	if($currentHeader == "\r\n")
-			if(preg_match("/^\r?\n$/", $currentHeader) )
-			      break;
-						
-			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
-			{
-				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)\s+(.*)/",chop($currentHeader),$matches);
-				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
-				{
-					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
-					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
-				}
-				else
-					$this->_redirectaddr = $matches[2];
-			}
-		
-			if(preg_match("|^HTTP/|",$currentHeader))
-			{
-                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
-				{
-					$this->status= $status[1];
-                }				
-				$this->response_code = $currentHeader;
-			}
-			
-			if (preg_match("/Content-Encoding: gzip/", $currentHeader) ) {
-				$is_gzipped = true;
-			}
-			
-			$this->headers[] = $currentHeader;
-		}
-
-		# $results = fread($fp, $this->maxlength);
-		$results = "";
-		while ( $data = fread($fp, $this->maxlength) ) {
-		    $results .= $data;
-		    if (
-		        strlen($results) > $this->maxlength ) {
-		        break;
-		    }
-		}
-		
-		// gunzip
-		if ( $is_gzipped ) {
-			// per http://www.php.net/manual/en/function.gzencode.php
-			$results = substr($results, 10);
-			$results = gzinflate($results);
-		}
-		
-		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
-		{
-			$this->status=-100;
-			return false;
-		}
-		
-		// check if there is a a redirect meta tag
-		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
-		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
-		}
-
-		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
-		{
-			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
-		}
-		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
-		// no framed content
-		else
-			$this->results = $results;
-		
-		return true;
-	}
-
-/*======================================================================*\
-	Function:	_httpsrequest
-	Purpose:	go get the https data from the server using curl
-	Input:		$url		the url to fetch
-				$URI		the full URI
-				$body		body contents to send if any (POST)
-	Output:		
-\*======================================================================*/
-	
-	function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
-	{
-		if($this->passcookies && $this->_redirectaddr)
-			$this->setcookies();
-
-		$headers = array();		
-					
-		$URI_PARTS = parse_url($URI);
-		if(empty($url))
-			$url = "/";
-		// GET ... header not needed for curl
-		//$headers[] = $http_method." ".$url." ".$this->_httpversion;		
-		if(!empty($this->agent))
-			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
-			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
-			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
-		{			
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
-	
-			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
-				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
-				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
-				}
-				$headers[] = substr($cookie_str,0,-2);
-			}
-		}
-		if(!empty($this->rawheaders))
-		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
-				$headers[] = $headerKey.": ".$headerVal;
-		}
-		if(!empty($content_type)) {
-			if ($content_type == "multipart/form-data")
-				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
-			else
-				$headers[] = "Content-type: $content_type";
-		}
-		if(!empty($body))	
-			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))	
-			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
-			
-		for($curr_header = 0; $curr_header < count($headers); $curr_header++)
-			$cmdline_params .= " -H \"".$headers[$curr_header]."\"";
-		
-		if(!empty($body))
-			$cmdline_params .= " -d \"$body\"";
-		
-		if($this->read_timeout > 0)
-			$cmdline_params .= " -m ".$this->read_timeout;
-		
-		$headerfile = uniqid(time());
-		
-		# accept self-signed certs
-		$cmdline_params .= " -k";
-		exec($this->curl_path." -D \"/tmp/$headerfile\"".$cmdline_params." ".$URI,$results,$return);
-		
-		if($return)
-		{
-			$this->error = "Error: cURL could not retrieve the document, error $return.";
-			return false;
-		}
-			
-			
-		$results = implode("\r\n",$results);
-		
-		$result_headers = file("/tmp/$headerfile");
-						
-		$this->_redirectaddr = false;
-		unset($this->headers);
-						
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
-		{
-			
-			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
-			{
-				// get URL portion of the redirect
-				preg_match("/^(Location: |URI:)(.*)/",chop($result_headers[$currentHeader]),$matches);
-				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
-				{
-					// no host in the path, so prepend
-					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
-					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
-							$this->_redirectaddr .= "/".$matches[2];
-					else
-							$this->_redirectaddr .= $matches[2];
-				}
-				else
-					$this->_redirectaddr = $matches[2];
-			}
-		
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
-			{
-			    $this->response_code = $result_headers[$currentHeader];
-			    if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$this->response_code, $match))
-			    {
-				$this->status= $match[1];
-                	    }
-			}
-			$this->headers[] = $result_headers[$currentHeader];
-		}
-
-		// check if there is a a redirect meta tag
-		
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]+URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
-		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);	
-		}
-
-		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
-		{
-			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
-		}
-		// have we already fetched framed content?
-		elseif(is_array($this->results))
-			$this->results[] = $results;
-		// no framed content
-		else
-			$this->results = $results;
-
-		unlink("/tmp/$headerfile");
-		
-		return true;
-	}
-
-/*======================================================================*\
-	Function:	setcookies()
-	Purpose:	set cookies for a redirection
-\*======================================================================*/
-	
-	function setcookies()
-	{
-		for($x=0; $x<count($this->headers); $x++)
-		{
-		if(preg_match("/^set-cookie:[\s]+([^=]+)=([^;]+)/i", $this->headers[$x],$match))
-			$this->cookies[$match[1]] = $match[2];
-		}
-	}
-
-	
-/*======================================================================*\
-	Function:	_check_timeout
-	Purpose:	checks whether timeout has occurred
-	Input:		$fp	file pointer
-\*======================================================================*/
-
-	function _check_timeout($fp)
-	{
-		if ($this->read_timeout > 0) {
-			$fp_status = socket_get_status($fp);
-			if ($fp_status["timed_out"]) {
-				$this->timed_out = true;
-				return true;
-			}
-		}
-		return false;
-	}
-
-/*======================================================================*\
-	Function:	_connect
-	Purpose:	make a socket connection
-	Input:		$fp	file pointer
-\*======================================================================*/
-	
-	function _connect(&$fp)
-	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
-			{
-				$this->_isproxy = true;
-				$host = $this->proxy_host;
-				$port = $this->proxy_port;
-			}
-		else
-		{
-			$host = $this->host;
-			$port = $this->port;
-		}
-	
-		$this->status = 0;
-		
-		if($fp = fsockopen(
-					$host,
-					$port,
-					$errno,
-					$errstr,
-					$this->_fp_timeout
-					))
-		{
-			// socket connection succeeded
-
-			return true;
-		}
-		else
-		{
-			// socket connection failed
-			$this->status = $errno;
-			switch($errno)
-			{
-				case -3:
-					$this->error="socket creation failed (-3)";
-				case -4:
-					$this->error="dns lookup failure (-4)";
-				case -5:
-					$this->error="connection refused or timed out (-5)";
-				default:
-					$this->error="connection failed (".$errno.")";
-			}
-			return false;
-		}
-	}
-/*======================================================================*\
-	Function:	_disconnect
-	Purpose:	disconnect a socket connection
-	Input:		$fp	file pointer
-\*======================================================================*/
-	
-	function _disconnect($fp)
-	{
-		return(fclose($fp));
-	}
-
-	
-/*======================================================================*\
-	Function:	_prepare_post_body
-	Purpose:	Prepare post body according to encoding type
-	Input:		$formvars  - form variables
-				$formfiles - form upload files
-	Output:		post body
-\*======================================================================*/
-	
-	function _prepare_post_body($formvars, $formfiles)
-	{
-		settype($formvars, "array");
-		settype($formfiles, "array");
-
-		if (count($formvars) == 0 && count($formfiles) == 0)
-			return;
-		
-		switch ($this->_submit_type) {
-			case "application/x-www-form-urlencoded":
-				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
-					if (is_array($val) || is_object($val)) {
-						while (list($cur_key, $cur_val) = each($val)) {
-							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
-						}
-					} else
-						$postdata .= urlencode($key)."=".urlencode($val)."&";
-				}
-				break;
-
-			case "multipart/form-data":
-				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
-				
-				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
-					if (is_array($val) || is_object($val)) {
-						while (list($cur_key, $cur_val) = each($val)) {
-							$postdata .= "--".$this->_mime_boundary."\r\n";
-							$postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
-							$postdata .= "$cur_val\r\n";
-						}
-					} else {
-						$postdata .= "--".$this->_mime_boundary."\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
-						$postdata .= "$val\r\n";
-					}
-				}
-				
-				reset($formfiles);
-				while (list($field_name, $file_names) = each($formfiles)) {
-					settype($file_names, "array");
-					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
-
-						$fp = fopen($file_name, "r");
-						$file_content = fread($fp, filesize($file_name));
-						fclose($fp);
-						$base_name = basename($file_name);
-
-						$postdata .= "--".$this->_mime_boundary."\r\n";
-						$postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
-						$postdata .= "$file_content\r\n";
-					}
-				}
-				$postdata .= "--".$this->_mime_boundary."--\r\n";
-				break;
-		}
-
-		return $postdata;
-	}
-}
-
-?>
diff --git a/tools/IRC_Bot/magpierss/rss_cache.inc b/tools/IRC_Bot/magpierss/rss_cache.inc
deleted file mode 100644
index fdfa5dd25..000000000
--- a/tools/IRC_Bot/magpierss/rss_cache.inc
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/*
- * Project:     MagpieRSS: a simple RSS integration tool
- * File:        rss_cache.inc, a simple, rolling(no GC), cache 
- *              for RSS objects, keyed on URL.
- * Author:      Kellan Elliott-McCrea <kellan@protest.net>
- * Version:     0.51
- * License:     GPL
- *
- * The lastest version of MagpieRSS can be obtained from:
- * http://magpierss.sourceforge.net
- *
- * For questions, help, comments, discussion, etc., please join the
- * Magpie mailing list:
- * http://lists.sourceforge.net/lists/listinfo/magpierss-general
- *
- */
-
-class RSSCache {
-    var $BASE_CACHE = './cache';    // where the cache files are stored
-    var $MAX_AGE    = 3600;         // when are files stale, default one hour
-    var $ERROR      = "";           // accumulate error messages
-    
-    function RSSCache ($base='', $age='') {
-        if ( $base ) {
-            $this->BASE_CACHE = $base;
-        }
-        if ( $age ) {
-            $this->MAX_AGE = $age;
-        }
-        
-        // attempt to make the cache directory
-        if ( ! file_exists( $this->BASE_CACHE ) ) {
-            $status = @mkdir( $this->BASE_CACHE, 0755 );
-            
-            // if make failed 
-            if ( ! $status ) {
-                $this->error(
-                    "Cache couldn't make dir '" . $this->BASE_CACHE . "'."
-                );
-            }
-        }
-    }
-    
-/*=======================================================================*\
-    Function:   set
-    Purpose:    add an item to the cache, keyed on url
-    Input:      url from wich the rss file was fetched
-    Output:     true on sucess  
-\*=======================================================================*/
-    function set ($url, $rss) {
-        $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
-        $fp = @fopen( $cache_file, 'w' );
-        
-        if ( ! $fp ) {
-            $this->error(
-                "Cache unable to open file for writing: $cache_file"
-            );
-            return 0;
-        }
-        
-        
-        $data = $this->serialize( $rss );
-        fwrite( $fp, $data );
-        fclose( $fp );
-        
-        return $cache_file;
-    }
-    
-/*=======================================================================*\
-    Function:   get
-    Purpose:    fetch an item from the cache
-    Input:      url from wich the rss file was fetched
-    Output:     cached object on HIT, false on MISS 
-\*=======================================================================*/ 
-    function get ($url) {
-        $this->ERROR = "";
-        $cache_file = $this->file_name( $url );
-        
-        if ( ! file_exists( $cache_file ) ) {
-            $this->debug( 
-                "Cache doesn't contain: $url (cache file: $cache_file)"
-            );
-            return 0;
-        }
-        
-        $fp = @fopen($cache_file, 'r');
-        if ( ! $fp ) {
-            $this->error(
-                "Failed to open cache file for reading: $cache_file"
-            );
-            return 0;
-        }
-        
-        $data = fread( $fp, filesize($cache_file) );
-        $rss = $this->unserialize( $data );
-        
-        return $rss;
-    }
-
-/*=======================================================================*\
-    Function:   check_cache
-    Purpose:    check a url for membership in the cache
-                and whether the object is older then MAX_AGE (ie. STALE)
-    Input:      url from wich the rss file was fetched
-    Output:     cached object on HIT, false on MISS 
-\*=======================================================================*/     
-    function check_cache ( $url ) {
-        $this->ERROR = "";
-        $filename = $this->file_name( $url );
-        
-        if ( file_exists( $filename ) ) {
-            // find how long ago the file was added to the cache
-            // and whether that is longer then MAX_AGE
-            $mtime = filemtime( $filename );
-            $age = time() - $mtime;
-            if ( $this->MAX_AGE > $age ) {
-                // object exists and is current
-                return 'HIT';
-            }
-            else {
-                // object exists but is old
-                return 'STALE';
-            }
-        }
-        else {
-            // object does not exist
-            return 'MISS';
-        }
-    }
-
-/*=======================================================================*\
-    Function:   serialize
-\*=======================================================================*/     
-    function serialize ( $rss ) {
-        return serialize( $rss );
-    }
-
-/*=======================================================================*\
-    Function:   unserialize
-\*=======================================================================*/     
-    function unserialize ( $data ) {
-        return unserialize( $data );
-    }
-    
-/*=======================================================================*\
-    Function:   file_name
-    Purpose:    map url to location in cache
-    Input:      url from wich the rss file was fetched
-    Output:     a file name
-\*=======================================================================*/     
-    function file_name ($url) {
-        $filename = md5( $url );
-        return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
-    }
-
-/*=======================================================================*\
-    Function:   error
-    Purpose:    register error
-\*=======================================================================*/         
-    function error ($errormsg, $lvl=E_USER_WARNING) {
-        // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
-            $errormsg .= " ($php_errormsg)";
-        }
-        $this->ERROR = $errormsg;
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);
-        }
-        else {
-            error_log( $errormsg, 0);
-        }
-    }
-    
-    function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-        if ( MAGPIE_DEBUG ) {
-            $this->error("MagpieRSS [debug] $debugmsg", $lvl);
-        }
-    }
-
-}
-
-?>
diff --git a/tools/IRC_Bot/magpierss/rss_fetch.inc b/tools/IRC_Bot/magpierss/rss_fetch.inc
deleted file mode 100644
index c1098d681..000000000
--- a/tools/IRC_Bot/magpierss/rss_fetch.inc
+++ /dev/null
@@ -1,458 +0,0 @@
-<?php
-/*
- * Project:     MagpieRSS: a simple RSS integration tool
- * File:        rss_fetch.inc, a simple functional interface
-                to fetching and parsing RSS files, via the
-                function fetch_rss()
- * Author:      Kellan Elliott-McCrea <kellan@protest.net>
- * License:     GPL
- *
- * The lastest version of MagpieRSS can be obtained from:
- * http://magpierss.sourceforge.net
- *
- * For questions, help, comments, discussion, etc., please join the
- * Magpie mailing list:
- * magpierss-general@lists.sourceforge.net
- *
- */
- 
-// Setup MAGPIE_DIR for use on hosts that don't include
-// the current path in include_path.
-// with thanks to rajiv and smarty
-if (!defined('DIR_SEP')) {
-    define('DIR_SEP', DIRECTORY_SEPARATOR);
-}
-
-if (!defined('MAGPIE_DIR')) {
-    define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP);
-}
-
-require_once( MAGPIE_DIR . 'rss_parse.inc' );
-require_once( MAGPIE_DIR . 'rss_cache.inc' );
-
-// for including 3rd party libraries
-define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP);
-require_once( MAGPIE_EXTLIB . 'Snoopy.class.inc');
-
-
-/* 
- * CONSTANTS - redefine these in your script to change the
- * behaviour of fetch_rss() currently, most options effect the cache
- *
- * MAGPIE_CACHE_ON - Should Magpie cache parsed RSS objects? 
- * For me a built in cache was essential to creating a "PHP-like" 
- * feel to Magpie, see rss_cache.inc for rationale
- *
- *
- * MAGPIE_CACHE_DIR - Where should Magpie cache parsed RSS objects?
- * This should be a location that the webserver can write to.   If this 
- * directory does not already exist Mapie will try to be smart and create 
- * it.  This will often fail for permissions reasons.
- *
- *
- * MAGPIE_CACHE_AGE - How long to store cached RSS objects? In seconds.
- *
- *
- * MAGPIE_CACHE_FRESH_ONLY - If remote fetch fails, throw error
- * instead of returning stale object?
- *
- * MAGPIE_DEBUG - Display debugging notices?
- *
-*/
-
-
-/*=======================================================================*\
-    Function: fetch_rss: 
-    Purpose:  return RSS object for the give url
-              maintain the cache
-    Input:    url of RSS file
-    Output:   parsed RSS object (see rss_parse.inc)
-
-    NOTES ON CACHEING:  
-    If caching is on (MAGPIE_CACHE_ON) fetch_rss will first check the cache.
-    
-    NOTES ON RETRIEVING REMOTE FILES:
-    If conditional gets are on (MAGPIE_CONDITIONAL_GET_ON) fetch_rss will
-    return a cached object, and touch the cache object upon recieving a
-    304.
-    
-    NOTES ON FAILED REQUESTS:
-    If there is an HTTP error while fetching an RSS object, the cached
-    version will be return, if it exists (and if MAGPIE_CACHE_FRESH_ONLY is off)
-\*=======================================================================*/
-
-define('MAGPIE_VERSION', '0.7');
-
-$MAGPIE_ERROR = "";
-
-function fetch_rss ($url) {
-    // initialize constants
-    init();
-    
-    if ( !isset($url) ) {
-        error("fetch_rss called without a url");
-        return false;
-    }
-    
-    // if cache is disabled
-    if ( !MAGPIE_CACHE_ON ) {
-        // fetch file, and parse it
-        $resp = _fetch_remote_file( $url );
-        if ( is_success( $resp->status ) ) {
-            return _response_to_rss( $resp );
-        }
-        else {
-            error("Failed to fetch $url and cache is off");
-            return false;
-        }
-    } 
-    // else cache is ON
-    else {
-        // Flow
-        // 1. check cache
-        // 2. if there is a hit, make sure its fresh
-        // 3. if cached obj fails freshness check, fetch remote
-        // 4. if remote fails, return stale object, or error
-        
-        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
-        
-        if (MAGPIE_DEBUG and $cache->ERROR) {
-            debug($cache->ERROR, E_USER_WARNING);
-        }
-        
-        
-        $cache_status    = 0;       // response of check_cache
-        $request_headers = array(); // HTTP headers to send with fetch
-        $rss             = 0;       // parsed RSS object
-        $errormsg        = 0;       // errors, if any
-        
-        // store parsed XML by desired output encoding
-        // as character munging happens at parse time
-        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
-        
-        if (!$cache->ERROR) {
-            // return cache HIT, MISS, or STALE
-            $cache_status = $cache->check_cache( $cache_key);
-        }
-        
-        // if object cached, and cache is fresh, return cached obj
-        if ( $cache_status == 'HIT' ) {
-            $rss = $cache->get( $cache_key );
-            if ( isset($rss) and $rss ) {
-                // should be cache age
-                $rss->from_cache = 1;
-                if ( MAGPIE_DEBUG > 1) {
-                debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
-            }
-                return $rss;
-            }
-        }
-        
-        // else attempt a conditional get
-        
-        // setup headers
-        if ( $cache_status == 'STALE' ) {
-            $rss = $cache->get( $cache_key );
-            if ( $rss and $rss->etag and $rss->last_modified ) {
-                $request_headers['If-None-Match'] = $rss->etag;
-                $request_headers['If-Last-Modified'] = $rss->last_modified;
-            }
-        }
-        
-        $resp = _fetch_remote_file( $url, $request_headers );
-        
-        if (isset($resp) and $resp) {
-            if ($resp->status == '304' ) {
-                // we have the most current copy
-                if ( MAGPIE_DEBUG > 1) {
-                    debug("Got 304 for $url");
-                }
-                // reset cache on 304 (at minutillo insistent prodding)
-                $cache->set($cache_key, $rss);
-                return $rss;
-            }
-            elseif ( is_success( $resp->status ) ) {
-                $rss = _response_to_rss( $resp );
-                if ( $rss ) {
-                    if (MAGPIE_DEBUG > 1) {
-                        debug("Fetch successful");
-                    }
-                    // add object to cache
-                    $cache->set( $cache_key, $rss );
-                    return $rss;
-                }
-            }
-            else {
-                $errormsg = "Failed to fetch $url ";
-                if ( $resp->status == '-100' ) {
-                    $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
-                }
-                elseif ( $resp->error ) {
-                    # compensate for Snoopy's annoying habbit to tacking
-                    # on '\n'
-                    $http_error = substr($resp->error, 0, -2); 
-                    $errormsg .= "(HTTP Error: $http_error)";
-                }
-                else {
-                    $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
-                }
-            }
-        }
-        else {
-            $errormsg = "Unable to retrieve RSS file for unknown reasons.";
-        }
-        
-        // else fetch failed
-        
-        // attempt to return cached object
-        if ($rss) {
-            if ( MAGPIE_DEBUG ) {
-                debug("Returning STALE object for $url");
-            }
-            return $rss;
-        }
-        
-        // else we totally failed
-        error( $errormsg ); 
-        
-        return false;
-        
-    } // end if ( !MAGPIE_CACHE_ON ) {
-} // end fetch_rss()
-
-/*=======================================================================*\
-    Function:   error
-    Purpose:    set MAGPIE_ERROR, and trigger error
-\*=======================================================================*/
-
-function error ($errormsg, $lvl=E_USER_WARNING) {
-        global $MAGPIE_ERROR;
-        
-        // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
-            $errormsg .= " ($php_errormsg)";
-        }
-        if ( $errormsg ) {
-            $errormsg = "MagpieRSS: $errormsg";
-            $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);                
-        }
-}
-
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-    trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
-}
-            
-/*=======================================================================*\
-    Function:   magpie_error
-    Purpose:    accessor for the magpie error variable
-\*=======================================================================*/
-function magpie_error ($errormsg="") {
-    global $MAGPIE_ERROR;
-    
-    if ( isset($errormsg) and $errormsg ) { 
-        $MAGPIE_ERROR = $errormsg;
-    }
-    
-    return $MAGPIE_ERROR;   
-}
-
-/*=======================================================================*\
-    Function:   _fetch_remote_file
-    Purpose:    retrieve an arbitrary remote file
-    Input:      url of the remote file
-                headers to send along with the request (optional)
-    Output:     an HTTP response object (see Snoopy.class.inc)  
-\*=======================================================================*/
-function _fetch_remote_file ($url, $headers = "" ) {
-    // Snoopy is an HTTP client in PHP
-    $client = new Snoopy();
-    $client->agent = MAGPIE_USER_AGENT;
-    $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
-    $client->use_gzip = MAGPIE_USE_GZIP;
-    if (is_array($headers) ) {
-        $client->rawheaders = $headers;
-    }
-    
-    @$client->fetch($url);
-    return $client;
-
-}
-
-/*=======================================================================*\
-    Function:   _response_to_rss
-    Purpose:    parse an HTTP response object into an RSS object
-    Input:      an HTTP response object (see Snoopy)
-    Output:     parsed RSS object (see rss_parse)
-\*=======================================================================*/
-function _response_to_rss ($resp) {
-    $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
-    
-    // if RSS parsed successfully       
-    if ( $rss and !$rss->ERROR) {
-        
-        // find Etag, and Last-Modified
-        foreach($resp->headers as $h) {
-            // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
-            if (strpos($h, ": ")) {
-                list($field, $val) = explode(": ", $h, 2);
-            }
-            else {
-                $field = $h;
-                $val = "";
-            }
-            
-            if ( $field == 'ETag' ) {
-                $rss->etag = $val;
-            }
-            
-            if ( $field == 'Last-Modified' ) {
-                $rss->last_modified = $val;
-            }
-        }
-        
-        return $rss;    
-    } // else construct error message
-    else {
-        $errormsg = "Failed to parse RSS file.";
-        
-        if ($rss) {
-            $errormsg .= " (" . $rss->ERROR . ")";
-        }
-        error($errormsg);
-        
-        return false;
-    } // end if ($rss and !$rss->error)
-}
-
-/*=======================================================================*\
-    Function:   init
-    Purpose:    setup constants with default values
-                check for user overrides
-\*=======================================================================*/
-function init () {
-    if ( defined('MAGPIE_INITALIZED') ) {
-        return;
-    }
-    else {
-        define('MAGPIE_INITALIZED', true);
-    }
-    
-    if ( !defined('MAGPIE_CACHE_ON') ) {
-        define('MAGPIE_CACHE_ON', true);
-    }
-
-    if ( !defined('MAGPIE_CACHE_DIR') ) {
-        define('MAGPIE_CACHE_DIR', './cache');
-    }
-
-    if ( !defined('MAGPIE_CACHE_AGE') ) {
-        define('MAGPIE_CACHE_AGE', 60*60); // one hour
-    }
-
-    if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
-        define('MAGPIE_CACHE_FRESH_ONLY', false);
-    }
-
-    if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
-        define('MAGPIE_OUTPUT_ENCODING', 'ISO-8859-1');
-    }
-    
-    if ( !defined('MAGPIE_INPUT_ENCODING') ) {
-        define('MAGPIE_INPUT_ENCODING', null);
-    }
-    
-    if ( !defined('MAGPIE_DETECT_ENCODING') ) {
-        define('MAGPIE_DETECT_ENCODING', true);
-    }
-    
-    if ( !defined('MAGPIE_DEBUG') ) {
-        define('MAGPIE_DEBUG', 0);
-    }
-    
-    if ( !defined('MAGPIE_USER_AGENT') ) {
-        $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net';
-        
-        if ( MAGPIE_CACHE_ON ) {
-            $ua = $ua . ')';
-        }
-        else {
-            $ua = $ua . '; No cache)';
-        }
-        
-        define('MAGPIE_USER_AGENT', $ua);
-    }
-    
-    if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
-        define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout
-    }
-    
-    // use gzip encoding to fetch rss files if supported?
-    if ( !defined('MAGPIE_USE_GZIP') ) {
-        define('MAGPIE_USE_GZIP', true);    
-    }
-}
-
-// NOTE: the following code should really be in Snoopy, or at least
-// somewhere other then rss_fetch!
-
-/*=======================================================================*\
-    HTTP STATUS CODE PREDICATES
-    These functions attempt to classify an HTTP status code
-    based on RFC 2616 and RFC 2518.
-    
-    All of them take an HTTP status code as input, and return true or false
-
-    All this code is adapted from LWP's HTTP::Status.
-\*=======================================================================*/
-
-
-/*=======================================================================*\
-    Function:   is_info
-    Purpose:    return true if Informational status code
-\*=======================================================================*/
-function is_info ($sc) { 
-    return $sc >= 100 && $sc < 200; 
-}
-
-/*=======================================================================*\
-    Function:   is_success
-    Purpose:    return true if Successful status code
-\*=======================================================================*/
-function is_success ($sc) { 
-    return $sc >= 200 && $sc < 300; 
-}
-
-/*=======================================================================*\
-    Function:   is_redirect
-    Purpose:    return true if Redirection status code
-\*=======================================================================*/
-function is_redirect ($sc) { 
-    return $sc >= 300 && $sc < 400; 
-}
-
-/*=======================================================================*\
-    Function:   is_error
-    Purpose:    return true if Error status code
-\*=======================================================================*/
-function is_error ($sc) { 
-    return $sc >= 400 && $sc < 600; 
-}
-
-/*=======================================================================*\
-    Function:   is_client_error
-    Purpose:    return true if Error status code, and its a client error
-\*=======================================================================*/
-function is_client_error ($sc) { 
-    return $sc >= 400 && $sc < 500; 
-}
-
-/*=======================================================================*\
-    Function:   is_client_error
-    Purpose:    return true if Error status code, and its a server error
-\*=======================================================================*/
-function is_server_error ($sc) { 
-    return $sc >= 500 && $sc < 600; 
-}
-
-?>
diff --git a/tools/IRC_Bot/magpierss/rss_parse.inc b/tools/IRC_Bot/magpierss/rss_parse.inc
deleted file mode 100644
index af4020ebf..000000000
--- a/tools/IRC_Bot/magpierss/rss_parse.inc
+++ /dev/null
@@ -1,589 +0,0 @@
-<?php
-
-/**
-* Project:     MagpieRSS: a simple RSS integration tool
-* File:        rss_parse.inc  - parse an RSS or Atom feed
-*               return as a simple object.
-*
-* Handles RSS 0.9x, RSS 2.0, RSS 1.0, and Atom 0.3
-*
-* The lastest version of MagpieRSS can be obtained from:
-* http://magpierss.sourceforge.net
-*
-* For questions, help, comments, discussion, etc., please join the
-* Magpie mailing list:
-* magpierss-general@lists.sourceforge.net
-*
-* @author           Kellan Elliott-McCrea <kellan@protest.net>
-* @version          0.7a
-* @license          GPL
-*
-*/
-
-define('RSS', 'RSS');
-define('ATOM', 'Atom');
-
-require_once (MAGPIE_DIR . 'rss_utils.inc');
-
-/**
-* Hybrid parser, and object, takes RSS as a string and returns a simple object.
-*
-* see: rss_fetch.inc for a simpler interface with integrated caching support
-*
-*/
-class MagpieRSS {
-    var $parser;
-    
-    var $current_item   = array();  // item currently being parsed
-    var $items          = array();  // collection of parsed items
-    var $channel        = array();  // hash of channel fields
-    var $textinput      = array();
-    var $image          = array();
-    var $feed_type;
-    var $feed_version;
-    var $encoding       = '';       // output encoding of parsed rss
-    
-    var $_source_encoding = '';     // only set if we have to parse xml prolog
-    
-    var $ERROR = "";
-    var $WARNING = "";
-    
-    // define some constants
-    
-    var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
-    var $_KNOWN_ENCODINGS    = array('UTF-8', 'US-ASCII', 'ISO-8859-1');
-
-    // parser variables, useless if you're not a parser, treat as private
-    var $stack              = array(); // parser stack
-    var $inchannel          = false;
-    var $initem             = false;
-    var $incontent          = false; // if in Atom <content mode="xml"> field 
-    var $intextinput        = false;
-    var $inimage            = false;
-    var $current_field      = '';
-    var $current_namespace  = false;
-    
-
-    /**
-     *  Set up XML parser, parse source, and return populated RSS object..
-     *   
-     *  @param string $source           string containing the RSS to be parsed
-     *
-     *  NOTE:  Probably a good idea to leave the encoding options alone unless
-     *         you know what you're doing as PHP's character set support is
-     *         a little weird.
-     *
-     *  NOTE:  A lot of this is unnecessary but harmless with PHP5 
-     *
-     *
-     *  @param string $output_encoding  output the parsed RSS in this character 
-     *                                  set defaults to ISO-8859-1 as this is PHP's
-     *                                  default.
-     *
-     *                                  NOTE: might be changed to UTF-8 in future
-     *                                  versions.
-     *                               
-     *  @param string $input_encoding   the character set of the incoming RSS source. 
-     *                                  Leave blank and Magpie will try to figure it
-     *                                  out.
-     *                                  
-     *                                   
-     *  @param bool   $detect_encoding  if false Magpie won't attempt to detect
-     *                                  source encoding. (caveat emptor)
-     *
-     */
-    function MagpieRSS ($source, $output_encoding='ISO-8859-1', 
-                        $input_encoding=null, $detect_encoding=true) 
-    {   
-        # if PHP xml isn't compiled in, die
-        #
-        if (!function_exists('xml_parser_create')) {
-            $this->error( "Failed to load PHP's XML Extension. " . 
-                          "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
-        }
-        
-        list($parser, $source) = $this->create_parser($source, 
-                $output_encoding, $input_encoding, $detect_encoding);
-        
-        
-        if (!is_resource($parser)) {
-            $this->error( "Failed to create an instance of PHP's XML parser. " .
-                          "http://www.php.net/manual/en/ref.xml.php",
-                          E_USER_ERROR );
-        }
-
-        
-        $this->parser = $parser;
-        
-        # pass in parser, and a reference to this object
-        # setup handlers
-        #
-        xml_set_object( $this->parser, $this );
-        xml_set_element_handler($this->parser, 
-                'feed_start_element', 'feed_end_element' );
-                        
-        xml_set_character_data_handler( $this->parser, 'feed_cdata' ); 
-    
-        $status = xml_parse( $this->parser, $source );
-        
-        if (! $status ) {
-            $errorcode = xml_get_error_code( $this->parser );
-            if ( $errorcode != XML_ERROR_NONE ) {
-                $xml_error = xml_error_string( $errorcode );
-                $error_line = xml_get_current_line_number($this->parser);
-                $error_col = xml_get_current_column_number($this->parser);
-                $errormsg = "$xml_error at line $error_line, column $error_col";
-
-                $this->error( $errormsg );
-            }
-        }
-        
-        xml_parser_free( $this->parser );
-
-        $this->normalize();
-    }
-    
-    function feed_start_element($p, $element, &$attrs) {
-        $el = $element = strtolower($element);
-        $attrs = array_change_key_case($attrs, CASE_LOWER);
-        
-        // check for a namespace, and split if found
-        $ns = false;
-        if ( strpos( $element, ':' ) ) {
-            list($ns, $el) = split( ':', $element, 2); 
-        }
-        if ( $ns and $ns != 'rdf' ) {
-            $this->current_namespace = $ns;
-        }
-            
-        # if feed type isn't set, then this is first element of feed
-        # identify feed from root element
-        #
-        if (!isset($this->feed_type) ) {
-            if ( $el == 'rdf' ) {
-                $this->feed_type = RSS;
-                $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
-                $this->feed_type = RSS;
-                $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
-                $this->feed_type = ATOM;
-                $this->feed_version = $attrs['version'];
-                $this->inchannel = true;
-            }
-            return;
-        }
-    
-        if ( $el == 'channel' ) 
-        {
-            $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' ) 
-        {
-            $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
-                $this->current_item['about'] = $attrs['rdf:about']; 
-            }
-        }
-        
-        // if we're in the default namespace of an RSS feed,
-        //  record textinput or image fields
-        elseif ( 
-            $this->feed_type == RSS and 
-            $this->current_namespace == '' and 
-            $el == 'textinput' ) 
-        {
-            $this->intextinput = true;
-        }
-        
-        elseif (
-            $this->feed_type == RSS and 
-            $this->current_namespace == '' and 
-            $el == 'image' ) 
-        {
-            $this->inimage = true;
-        }
-        
-        # handle atom content constructs
-        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {
-            // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
-                $el = 'atom_content';
-            }
-            
-            $this->incontent = $el;
-            
-            
-        }
-        
-        // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM and $this->incontent ) 
-        {
-            // if tags are inlined, then flatten
-            $attrs_str = join(' ', 
-                    array_map('map_attrs', 
-                    array_keys($attrs), 
-                    array_values($attrs) ) );
-            
-            $this->append_content( "<$element $attrs_str>"  );
-                    
-            array_unshift( $this->stack, $el );
-        }
-        
-        // Atom support many links per containging element.
-        // Magpie treats link elements of type rel='alternate'
-        // as being equivalent to RSS's simple link element.
-        //
-        elseif ($this->feed_type == ATOM and $el == 'link' ) 
-        {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
-            {
-                $link_el = 'link';
-            }
-            else {
-                $link_el = 'link_' . $attrs['rel'];
-            }
-            
-            $this->append($link_el, $attrs['href']);
-        }
-        // set stack[0] to current element
-        else {
-            array_unshift($this->stack, $el);
-        }
-    }
-    
-
-    
-    function feed_cdata ($p, $text) {
-        
-        if ($this->feed_type == ATOM and $this->incontent) 
-        {
-            $this->append_content( $text );
-        }
-        else {
-            $current_el = join('_', array_reverse($this->stack));
-            $this->append($current_el, $text);
-        }
-    }
-    
-    function feed_end_element ($p, $el) {
-        $el = strtolower($el);
-        
-        if ( $el == 'item' or $el == 'entry' ) 
-        {
-            $this->items[] = $this->current_item;
-            $this->current_item = array();
-            $this->initem = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
-        {
-            $this->intextinput = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
-        {
-            $this->inimage = false;
-        }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {   
-            $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' ) 
-        {
-            $this->inchannel = false;
-        }
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
-            // balance tags properly
-            // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el ) 
-            {
-                $this->append_content("</$el>");
-            }
-            else {
-                $this->append_content("<$el />");
-            }
-
-            array_shift( $this->stack );
-        }
-        else {
-            array_shift( $this->stack );
-        }
-        
-        $this->current_namespace = false;
-    }
-    
-    function concat (&$str1, $str2="") {
-        if (!isset($str1) ) {
-            $str1="";
-        }
-        $str1 .= $str2;
-    }
-    
-    
-    
-    function append_content($text) {
-        if ( $this->initem ) {
-            $this->concat( $this->current_item[ $this->incontent ], $text );
-        }
-        elseif ( $this->inchannel ) {
-            $this->concat( $this->channel[ $this->incontent ], $text );
-        }
-    }
-    
-    // smart append - field and namespace aware
-    function append($el, $text) {
-        if (!$el) {
-            return;
-        }
-        if ( $this->current_namespace ) 
-        {
-            if ( $this->initem ) {
-                $this->concat(
-                    $this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
-                $this->concat(
-                    $this->channel[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->intextinput) {
-                $this->concat(
-                    $this->textinput[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->inimage) {
-                $this->concat(
-                    $this->image[ $this->current_namespace ][ $el ], $text );
-            }
-        }
-        else {
-            if ( $this->initem ) {
-                $this->concat(
-                    $this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
-                $this->concat(
-                    $this->textinput[ $el ], $text );
-            }
-            elseif ($this->inimage) {
-                $this->concat(
-                    $this->image[ $el ], $text );
-            }
-            elseif ($this->inchannel) {
-                $this->concat(
-                    $this->channel[ $el ], $text );
-            }
-            
-        }
-    }
-    
-    function normalize () {
-        // if atom populate rss fields
-        if ( $this->is_atom() ) {
-            $this->channel['description'] = $this->channel['tagline'];
-            for ( $i = 0; $i < count($this->items); $i++) {
-                $item = $this->items[$i];
-                if ( isset($item['summary']) )
-                    $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
-                    $item['content']['encoded'] = $item['atom_content'];
-                
-                $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
-                if ( $atom_date ) {
-                    $epoch = @parse_w3cdtf($item['modified']);
-                    if ($epoch and $epoch > 0) {
-                        $item['date_timestamp'] = $epoch;
-                    }
-                }
-                
-                $this->items[$i] = $item;
-            }       
-        }
-        elseif ( $this->is_rss() ) {
-            $this->channel['tagline'] = $this->channel['description'];
-            for ( $i = 0; $i < count($this->items); $i++) {
-                $item = $this->items[$i];
-                if ( isset($item['description']))
-                    $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
-                    $item['atom_content'] = $item['content']['encoded'];
-                
-                if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
-                    $epoch = @parse_w3cdtf($item['dc']['date']);
-                    if ($epoch and $epoch > 0) {
-                        $item['date_timestamp'] = $epoch;
-                    }
-                }
-                elseif ( isset($item['pubdate']) ) {
-                    $epoch = @strtotime($item['pubdate']);
-                    if ($epoch > 0) {
-                        $item['date_timestamp'] = $epoch;
-                    }
-                }
-                
-                $this->items[$i] = $item;
-            }
-        }
-    }
-    
-    
-    function is_rss () {
-        if ( $this->feed_type == RSS ) {
-            return $this->feed_version; 
-        }
-        else {
-            return false;
-        }
-    }
-    
-    function is_atom() {
-        if ( $this->feed_type == ATOM ) {
-            return $this->feed_version;
-        }
-        else {
-            return false;
-        }
-    }
-
-    /**
-    * return XML parser, and possibly re-encoded source
-    *
-    */
-    function create_parser($source, $out_enc, $in_enc, $detect) {
-        if ( substr(phpversion(),0,1) == 5) {
-            $parser = $this->php5_create_parser($in_enc, $detect);
-        }
-        else {
-            list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect);
-        }
-        if ($out_enc) {
-            $this->encoding = $out_enc;
-            xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $out_enc);
-        }
-        
-        return array($parser, $source);
-    }
-    
-    /**
-    * Instantiate an XML parser under PHP5
-    *
-    * PHP5 will do a fine job of detecting input encoding
-    * if passed an empty string as the encoding. 
-    *
-    * All hail libxml2!
-    *
-    */
-    function php5_create_parser($in_enc, $detect) {
-        // by default php5 does a fine job of detecting input encodings
-        if(!$detect && $in_enc) {
-            return xml_parser_create($in_enc);
-        }
-        else {
-            return xml_parser_create('');
-        }
-    }
-    
-    /**
-    * Instaniate an XML parser under PHP4
-    *
-    * Unfortunately PHP4's support for character encodings
-    * and especially XML and character encodings sucks.  As
-    * long as the documents you parse only contain characters
-    * from the ISO-8859-1 character set (a superset of ASCII,
-    * and a subset of UTF-8) you're fine.  However once you
-    * step out of that comfy little world things get mad, bad,
-    * and dangerous to know.
-    *
-    * The following code is based on SJM's work with FoF
-    * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
-    *
-    */
-    function php4_create_parser($source, $in_enc, $detect) {
-        if ( !$detect ) {
-            return array(xml_parser_create($in_enc), $source);
-        }
-        
-        if (!$in_enc) {
-            if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
-                $in_enc = strtoupper($m[1]);
-                $this->source_encoding = $in_enc;
-            }
-            else {
-                $in_enc = 'UTF-8';
-            }
-        }
-        
-        if ($this->known_encoding($in_enc)) {
-            return array(xml_parser_create($in_enc), $source);
-        }
-        
-        // the dectected encoding is not one of the simple encodings PHP knows
-        
-        // attempt to use the iconv extension to
-        // cast the XML to a known encoding
-        // @see http://php.net/iconv
-       
-        if (function_exists('iconv'))  {
-            $encoded_source = iconv($in_enc,'UTF-8', $source);
-            if ($encoded_source) {
-                return array(xml_parser_create('UTF-8'), $encoded_source);
-            }
-        }
-        
-        // iconv didn't work, try mb_convert_encoding
-        // @see http://php.net/mbstring
-        if(function_exists('mb_convert_encoding')) {
-            $encoded_source = mb_convert_encoding($source, 'UTF-8', $in_enc );
-            if ($encoded_source) {
-                return array(xml_parser_create('UTF-8'), $encoded_source);
-            }
-        }
-        
-        // else 
-        $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
-                     "You may see strange artifacts, and mangled characters.",
-                     E_USER_NOTICE);
-            
-        return array(xml_parser_create(), $source);
-    }
-    
-    function known_encoding($enc) {
-        $enc = strtoupper($enc);
-        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
-            return $enc;
-        }
-        else {
-            return false;
-        }
-    }
-
-    function error ($errormsg, $lvl=E_USER_WARNING) {
-        // append PHP's error message if track_errors enabled
-        if ( $php_errormsg ) { 
-            $errormsg .= " ($php_errormsg)";
-        }
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);        
-        }
-        else {
-            error_log( $errormsg, 0);
-        }
-        
-        $notices = E_USER_NOTICE|E_NOTICE;
-        if ( $lvl&$notices ) {
-            $this->WARNING = $errormsg;
-        } else {
-            $this->ERROR = $errormsg;
-        }
-    }
-    
-    
-} // end class RSS
-
-function map_attrs($k, $v) {
-    return "$k=\"$v\"";
-}
-
-
-?>
diff --git a/tools/IRC_Bot/magpierss/rss_utils.inc b/tools/IRC_Bot/magpierss/rss_utils.inc
deleted file mode 100644
index 2a29e72a9..000000000
--- a/tools/IRC_Bot/magpierss/rss_utils.inc
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * Project:     MagpieRSS: a simple RSS integration tool
- * File:        rss_utils.inc, utility methods for working with RSS
- * Author:      Kellan Elliott-McCrea <kellan@protest.net>
- * Version:     0.51
- * License:     GPL
- *
- * The lastest version of MagpieRSS can be obtained from:
- * http://magpierss.sourceforge.net
- *
- * For questions, help, comments, discussion, etc., please join the
- * Magpie mailing list:
- * magpierss-general@lists.sourceforge.net
- */
-
-
-/*======================================================================*\
-    Function: parse_w3cdtf
-    Purpose:  parse a W3CDTF date into unix epoch
-
-    NOTE: http://www.w3.org/TR/NOTE-datetime
-\*======================================================================*/
-
-function parse_w3cdtf ( $date_str ) {
-    
-    # regex to match wc3dtf
-    $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
-    
-    if ( preg_match( $pat, $date_str, $match ) ) {
-        list( $year, $month, $day, $hours, $minutes, $seconds) = 
-            array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
-        
-        # calc epoch for current date assuming GMT
-        $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
-        
-        $offset = 0;
-        if ( $match[10] == 'Z' ) {
-            # zulu time, aka GMT
-        }
-        else {
-            list( $tz_mod, $tz_hour, $tz_min ) =
-                array( $match[8], $match[9], $match[10]);
-            
-            # zero out the variables
-            if ( ! $tz_hour ) { $tz_hour = 0; }
-            if ( ! $tz_min ) { $tz_min = 0; }
-        
-            $offset_secs = (($tz_hour*60)+$tz_min)*60;
-            
-            # is timezone ahead of GMT?  then subtract offset
-            #
-            if ( $tz_mod == '+' ) {
-                $offset_secs = $offset_secs * -1;
-            }
-            
-            $offset = $offset_secs; 
-        }
-        $epoch = $epoch + $offset;
-        return $epoch;
-    }
-    else {
-        return -1;
-    }
-}
-
-?>
diff --git a/tools/LevelConverter/Makefile b/tools/LevelConverter/Makefile
deleted file mode 100644
index 23b8a1106..000000000
--- a/tools/LevelConverter/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Makfile for SRB2 Level Converter
-# by Alam Arias et al.
-
-SRC=levelconverter.c
-OBJ=$(SRC:.c=.o)# replaces the .c from SRC with .o
-EXE=LevelConverter
-
-.PHONY : all     # .PHONY ignores files named all
-all: $(EXE)      # all is dependent on $(BIN) to be complete
-
-$(EXE): $(OBJ) # $(EXE) is dependent on all of the files in $(OBJ) to exist
-	$(CC) $(OBJ) $(LDFLAGS) -o $@
-
-.PHONY : clean   # .PHONY ignores files named clean
-clean:
-	-$(RM) $(OBJ) $(EXE)
diff --git a/tools/LevelConverter/levelconverter.c b/tools/LevelConverter/levelconverter.c
deleted file mode 100644
index 7c84ac510..000000000
--- a/tools/LevelConverter/levelconverter.c
+++ /dev/null
@@ -1,1061 +0,0 @@
-//
-// Level Converter
-//
-// Converts thing types from 1.09.4 to 1.1
-//
-// By A.J. Freda
-//
-// Modified from Graue's "Heightedit"
-// and uses Graue's "LumpMod" utility.
-//
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-//#define STARPOSTS_ONLY
-
-#define TABLE_SIZE 16384
-int conversion[TABLE_SIZE]; // Conversion table.
-FILE *lvlconvfile;
-
-static inline void InitializeThingConversionTable(void)
-{
-	memset(conversion, 0, sizeof(conversion));
-
-	// Player starts
-	conversion[1] = 1;
-	conversion[2] = 2;
-	conversion[3] = 3;
-	conversion[4] = 4;
-	conversion[4001] = 5;
-	conversion[4002] = 6;
-	conversion[4003] = 7;
-	conversion[4004] = 8;
-	conversion[4005] = 9;
-	conversion[4006] = 10;
-	conversion[4007] = 11;
-	conversion[4008] = 12;
-	conversion[4009] = 13;
-	conversion[4010] = 14;
-	conversion[4011] = 15;
-	conversion[4012] = 16;
-	conversion[4013] = 17;
-	conversion[4014] = 18;
-	conversion[4015] = 19;
-	conversion[4016] = 20;
-	conversion[4017] = 21;
-	conversion[4018] = 22;
-	conversion[4019] = 23;
-	conversion[4020] = 24;
-	conversion[4021] = 25;
-	conversion[4022] = 26;
-	conversion[4023] = 27;
-	conversion[4024] = 28;
-	conversion[4025] = 29;
-	conversion[4026] = 30;
-	conversion[4027] = 31;
-	conversion[4028] = 32;
-	conversion[11] = 33;
-	conversion[87] = 34;
-	conversion[89] = 35;
-
-	// Enemies
-	conversion[3004] = 100;
-	conversion[9] = 101;
-	conversion[58] = 102;
-	conversion[5005] = 103;
-	conversion[5006] = 104;
-	conversion[3005] = 105;
-	conversion[22] = 106;
-	conversion[21] = 107;
-	conversion[71] = 108;
-	conversion[56] = 109;
-	conversion[2004] = 110;
-	conversion[42] = 111;
-
-	// Bosses
-	conversion[16] = 200;
-	conversion[2008] = 201;
-	conversion[17] = 290;
-	conversion[2049] = 291;
-
-	// Collectibles
-	conversion[2014] = 300;
-	conversion[69] = 301;
-	conversion[3003] = 302;
-	conversion[80] = 303;
-	conversion[26] = 304;
-	conversion[54] = 305;
-	conversion[31] = 310;
-	conversion[34] = 311;
-	conversion[2013] = 312;
-	conversion[420] = 313;
-	conversion[421] = 314;
-	conversion[422] = 315;
-	conversion[423] = 316;
-	conversion[424] = 317;
-	conversion[425] = 318;
-	conversion[426] = 319;
-	conversion[64] = 320;
-	conversion[3002] = 320;
-	conversion[3001] = 320;
-
-	// Boxes
-	conversion[2011] = 400;
-	conversion[2012] = 400;
-	conversion[48] = 402;
-	conversion[2002] = 403;
-	conversion[2018] = 404;
-	conversion[35] = 405;
-	conversion[2028] = 406;
-	conversion[25] = 407;
-	conversion[2022] = 408;
-	conversion[41] = 409;
-	conversion[2005] = 410;
-	conversion[78] = 411;
-	conversion[3000] = 412;
-
-	// Interactive Objects
-	conversion[33] = 500;
-	conversion[86] = 501;
-	conversion[3006] = 502;
-//	conversion[?] = 520;
-	conversion[23] = 521;
-	conversion[67] = 522;
-	conversion[68] = 523;
-	conversion[32] = 540;
-	conversion[30] = 541;
-	conversion[28] = 550;
-	conversion[79] = 551;
-	conversion[5004] = 552;
-	conversion[65] = 553;
-	conversion[66] = 554;
-	conversion[2015] = 555;
-	conversion[38] = 556;
-	conversion[20] = 557;
-	conversion[39] = 558;
-
-	// Special Placement Patterns
-	conversion[84] = 600;
-	conversion[44] = 601;
-	conversion[76] = 602;
-	conversion[77] = 603;
-	conversion[47] = 604;
-	conversion[2007] = 605;
-	conversion[2048] = 606;
-	conversion[2010] = 607;
-	conversion[2046] = 608;
-	conversion[2047] = 609;
-
-	// Powerup Indicators/Environmental Effects/Miscellany
-	conversion[2026] = 700;
-	conversion[2024] = 701;
-	conversion[2023] = 702;
-	conversion[2045] = 703;
-	conversion[83] = 704;
-	conversion[2019] = 705;
-	conversion[2025] = 706;
-	conversion[27] = 707;
-	conversion[14] = 708;
-	conversion[43] = 709;
-	conversion[8] = 750;
-	conversion[5003] = 751;
-	conversion[5007] = 752;
-	conversion[18] = 753;
-	conversion[5001] = 754;
-	conversion[5002] = 755;
-	conversion[2003] = 756;
-
-	// Greenflower Scenery
-	conversion[36] = 800;
-	conversion[70] = 801;
-	conversion[73] = 802;
-	conversion[74] = 804;
-	conversion[75] = 805;
-
-	// Techno Hill Scenery
-	conversion[2035] = 900;
-	conversion[2006] = 901;
-
-	// Deep Sea Scenery
-	conversion[81] = 1000;
-
-	// Castle Eggman Scenery
-	conversion[49] = 1100;
-	conversion[24] = 1101;
-	conversion[52] = 1102;
-	conversion[2001] = 1103;
-
-	// NiGHTS Items
-	conversion[72] = 1700;
-	conversion[61] = 1701;
-	conversion[46] = 1702;
-	conversion[60] = 1703;
-	conversion[82] = 1704;
-	conversion[57] = 1705;
-	conversion[37] = 1706;
-	conversion[3007] = 1707;
-	conversion[3008] = 1708;
-	conversion[3009] = 1709;
-	conversion[40] = 1710;
-
-	// Mario Items
-	conversion[10005] = 1800;
-	conversion[10000] = 1801;
-	conversion[10001] = 1802;
-	conversion[50] = 1803;
-	conversion[10] = 1804;
-	conversion[29] = 1805;
-	conversion[19] = 1806;
-	conversion[12] = 1807;
-	conversion[10002] = 1808;
-	conversion[10003] = 1809;
-	conversion[10004] = 1810;
-
-	// Christmas Items
-	conversion[5] = 1850;
-	conversion[13] = 1851;
-	conversion[6] = 1852;
-}
-
-static inline void InitializeSectorConversionTable(void)
-{
-	memset(conversion, 0, sizeof(conversion));
-
-	// Player starts
-	conversion[690] = -1;
-	conversion[691] = -1;
-	conversion[692] = -1;
-	conversion[693] = -1;
-	conversion[694] = -1;
-	conversion[695] = -1;
-	conversion[696] = -1;
-	conversion[697] = -1;
-	conversion[698] = -1;
-	conversion[699] = -1;
-	conversion[700] = -1;
-	conversion[701] = -1;
-	conversion[702] = -1;
-	conversion[703] = -1;
-	conversion[704] = -1;
-	conversion[705] = -1;
-	conversion[706] = -1;
-	conversion[707] = -1;
-	conversion[708] = -1;
-	conversion[709] = -1;
-	conversion[710] = -1;
-	conversion[711] = -1;
-	conversion[981] = -1;
-	conversion[986] = -1;
-	conversion[8] = -1;
-	conversion[17] = -1;
-	conversion[519] = 3 + (512 << 8);
-	conversion[984] = 2 + (512 << 8);
-
-	// Section 1
-	conversion[11] = 1;
-	conversion[983] = 2;
-	conversion[7] = 3;
-	conversion[18] = 4;
-	conversion[4] = 5;
-	conversion[16] = 6;
-	conversion[5] = 7;
-	conversion[10] = 8;
-	conversion[978] = 9;
-	conversion[980] = 10;
-	conversion[9] = 11;
-	conversion[6] = 12;
-	conversion[992] = 13;
-	conversion[996] = 14;
-	conversion[14] = 15;
-
-	// Section 2
-	conversion[971] = 1 << 4;
-	conversion[972] = 2 << 4;
-	conversion[973] = 3 << 4;
-	conversion[974] = 4 << 4;
-	conversion[975] = 5 << 4;
-	conversion[967] = 6 << 4;
-	conversion[968] = 7 << 4;
-	conversion[970] = 8 << 4;
-	conversion[666] = 9 << 4;
-	conversion[990] = 10 << 4;
-	conversion[991] = 11 << 4;
-
-	// Section 3
-	conversion[256] = 1 << 8;
-	conversion[512] = 2 << 8;
-	conversion[768] = 3 << 8;
-	conversion[985] = 4 << 8;
-	conversion[976] = 5 << 8;
-	conversion[977] = 6 << 8;
-	conversion[1500] = 7 << 8;
-	conversion[1501] = 8 << 8;
-	conversion[1502] = 9 << 8;
-	conversion[1503] = 10 << 8;
-	conversion[1504] = 11 << 8;
-	conversion[1505] = 12 << 8;
-	conversion[1506] = 13 << 8;
-	conversion[1507] = 14 << 8;
-	conversion[1508] = 15 << 8;
-
-	// Section 4
-	conversion[993] = 1 << 12;
-	conversion[33] = 2 << 12;
-	conversion[982] = 2 << 12;
-	conversion[987] = 2 << 12;
-	conversion[995] = 2 << 12;
-	conversion[988] = 3 << 12;
-	conversion[989] = 4 << 12;
-	conversion[997] = 5 << 12;
-	conversion[969] = 6 << 12;
-	conversion[979] = 7 << 12;
-	conversion[998] = 8 << 12;
-	conversion[999] = 9 << 12;
-	conversion[994] = 10 << 12;
-}
-
-static inline void InitializeLinedefConversionTable(void)
-{
-	memset(conversion, 0, sizeof(conversion));
-
-	// Old Water Removed
-	conversion[14] = -1;
-
-	// Level Parameters/Misc:
-	conversion[64] = 1;
-	conversion[71] = 2;
-	conversion[18] = 3;
-	conversion[65] = 4;
-	conversion[63] = 5;
-	conversion[73] = 6;
-	conversion[66] = 7;
-
-	// Level-Load Effects:
-	conversion[26] = 50;
-	conversion[24] = 51;
-	conversion[88] = 52;
-	conversion[2] = 53;
-	conversion[3] = 54;
-	conversion[4] = 55;
-	conversion[6] = 56;
-	conversion[7] = 57;
-	conversion[8] = 58;
-	conversion[232] = 59;
-	conversion[233] = 60;
-	conversion[43] = 61;
-	conversion[50] = 62;
-	conversion[242] = 63;
-
-	// Floor-Over-Floors:
-	conversion[25] = 100;
-	conversion[33] = 101;
-	conversion[44] = 102;
-	conversion[69] = 103;
-	conversion[51] = 104;
-	conversion[57] = 105;
-	conversion[48] = 120;
-	conversion[45] = 121;
-	conversion[75] = 122;
-	conversion[74] = 123;
-	conversion[59] = 140;
-	conversion[81] = 141;
-	conversion[77] = 142;
-	conversion[38] = 150;
-	conversion[68] = 151;
-	conversion[72] = 152;
-	conversion[34] = 160;
-	conversion[36] = 170;
-	conversion[35] = 171;
-	conversion[79] = 172;
-	conversion[80] = 173;
-	conversion[82] = 174;
-	conversion[83] = 175;
-	conversion[39] = 176;
-	conversion[1] = 177;
-	conversion[37] = 178;
-	conversion[42] = 179;
-	conversion[40] = 180;
-	conversion[89] = 190;
-	conversion[90] = 191;
-	conversion[91] = 192;
-	conversion[94] = 193;
-	conversion[92] = 194;
-	conversion[93] = 195;
-	conversion[49] = 200;
-	conversion[47] = 201;
-	conversion[46] = 202;
-	conversion[62] = 220;
-	conversion[52] = 221;
-	conversion[67] = 222;
-	conversion[58] = 223;
-	conversion[41] = 250;
-	conversion[54] = 251;
-	conversion[76] = 252;
-	conversion[86] = 253;
-	conversion[55] = 254;
-	conversion[78] = 255;
-	conversion[84] = 256;
-	conversion[56] = 257;
-	conversion[53] = 258;
-	conversion[87] = 259;
-
-	// Linedef Executor Triggers:
-	conversion[96] = 300;
-	conversion[97] = 301;
-	conversion[98] = 302;
-	conversion[95] = 303;
-	conversion[99] = 304;
-	conversion[19] = 305;
-	conversion[20] = 306;
-	conversion[21] = 307;
-	conversion[9] = 308;
-	conversion[10] = 309;
-	conversion[11] = 310;
-	conversion[12] = 311;
-	conversion[13] = 312;
-	conversion[15] = 313;
-
-	// Linedef Executor Options:
-	conversion[101] = 400;
-	conversion[102] = 401;
-	conversion[103] = 402;
-	conversion[106] = 403;
-	conversion[107] = 404;
-	conversion[108] = 405;
-	conversion[109] = 406;
-	conversion[110] = 407;
-	conversion[111] = 408;
-	conversion[112] = 409;
-	conversion[114] = 410;
-	conversion[116] = 411;
-	conversion[104] = 412;
-	conversion[105] = 413;
-	conversion[115] = 414;
-	conversion[113] = 415;
-	conversion[119] = 416;
-	conversion[120] = 417;
-	conversion[117] = 420;
-	conversion[118] = 421;
-	conversion[121] = 422;
-	conversion[123] = 423;
-	conversion[124] = 424;
-	conversion[125] = 425;
-	conversion[122] = 426;
-	conversion[126] = 427;
-	conversion[127] = 428;
-
-	// Scrollers/Pushers
-	conversion[100] = 500;
-	conversion[85] = 501;
-	conversion[254] = 502;
-	conversion[218] = 503;
-	conversion[249] = 504;
-	conversion[255] = 505;
-	conversion[251] = 510;
-	conversion[215] = 511;
-	conversion[246] = 512;
-	conversion[250] = 513;
-	conversion[214] = 514;
-	conversion[245] = 515;
-	conversion[252] = 520;
-	conversion[216] = 521;
-	conversion[247] = 522;
-	conversion[203] = 523;
-	conversion[205] = 524;
-	conversion[201] = 525;
-	conversion[253] = 530;
-	conversion[217] = 531;
-	conversion[248] = 532;
-	conversion[202] = 533;
-	conversion[204] = 534;
-	conversion[200] = 535;
-	conversion[223] = 540;
-	conversion[224] = 541;
-	conversion[229] = 542;
-	conversion[230] = 543;
-	conversion[225] = 544;
-	conversion[227] = 545;
-	conversion[228] = 546;
-	conversion[226] = 547;
-
-	// Lighting
-	conversion[213] = 600;
-	
-	conversion[5] = 601;
-	conversion[60] = 602;
-	conversion[61] = 603;
-	conversion[16] = 606;
-
-	// Translucency
-	conversion[284] = 900;
-	conversion[285] = 901;
-	conversion[286] = 902;
-	conversion[287] = 903;
-	conversion[288] = 904;
-	conversion[283] = 905;
-
-	// Extended numbers
-	conversion[281] = conversion[25];
-	conversion[289] = conversion[33];
-	conversion[282] = conversion[26];
-}
-
-#ifndef _WIN32
-#include <ctype.h>
-static inline const char* _strupr(char *n)
-{
-	const char *m = n;
-        while (*n != '\0')
-        {
-                *n = toupper(*n);
-                n++;
-        }
-        return m;
-}
-#define strupr _strupr
-#endif
-
-static inline int ConvertStarposts(char *argv[])
-{
-	char syscmd[100];
-	InitializeThingConversionTable();
-
-	sprintf(syscmd, "lumpmod %s extract -s MAP%s THINGS lvlconv.tmp",
-		argv[1], strupr(argv[2]));
-	system(syscmd);
-
-	lvlconvfile = fopen("lvlconv.tmp", "r+b");
-	if(lvlconvfile == NULL) {
-		puts("Failed to open lvlconv.tmp.");
-		return EXIT_FAILURE;
-	}
-	for(;;) {
-		int c;
-		short x, y, angle, type, options;
-
-		fseek(lvlconvfile, 1, SEEK_CUR);
-		fseek(lvlconvfile, -1, SEEK_CUR);
-
-		c = fgetc(lvlconvfile);
-		if(c == EOF) break;
-
-		fseek(lvlconvfile, -1, SEEK_CUR);
-		if(fread(&x, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT READ THE X");
-			return EXIT_FAILURE;
-		}
-		if(fread(&y, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE Y");
-			return EXIT_FAILURE;
-		}
-		if(fread(&angle, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE ANGLE");
-			return EXIT_FAILURE;
-		}
-		if(fread(&type, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE TYPE");
-			return EXIT_FAILURE;
-		}
-		if(fread(&options, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE FLAGS");
-			return EXIT_FAILURE;
-		}
-
-		fseek(lvlconvfile, -6, SEEK_CUR);
-
-		/* CHECK FOR MATCH */
-		if(type == 502)
-		{
-			int numpost = options & 31;
-			angle %= 360;
-			angle += numpost * 360;
-			options = 0;
-		}
-
-		if(fwrite(&angle, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE ANGLE");
-			return EXIT_FAILURE;
-		}
-
-		if(fwrite(&type, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE TYPE");
-			return EXIT_FAILURE;
-		}
-
-		if (fwrite(&options, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE FLAGS");
-			return EXIT_FAILURE;
-		}
-	}
-	fclose(lvlconvfile);
-	puts("DONE, Man!.. Inserting into WAD.\n");
-	sprintf(syscmd, "lumpmod %s update -s MAP%s THINGS lvlconv.tmp",
-		argv[1], strupr(argv[2]));
-	system(syscmd);
-	remove("lvlconv.tmp");
-	return 1;
-}
-
-static inline int ConvertThings(char *argv[])
-{
-	char syscmd[100];
-	InitializeThingConversionTable();
-
-	printf("NOTE: Skill settings not supported in 1.1. All of your objects\nhave been converted to appear regardless of skill level.\n");
-
-	sprintf(syscmd, "lumpmod %s extract -s MAP%s THINGS lvlconv.tmp",
-		argv[1], strupr(argv[2]));
-	system(syscmd);
-
-	lvlconvfile = fopen("lvlconv.tmp", "r+b");
-	if(lvlconvfile == NULL) {
-		puts("Failed to open lvlconv.tmp.");
-		return EXIT_FAILURE;
-	}
-	for(;;) {
-		int c;
-		short x, y, angle, type, options;
-
-		fseek(lvlconvfile, 1, SEEK_CUR);
-		fseek(lvlconvfile, -1, SEEK_CUR);
-
-		c = fgetc(lvlconvfile);
-		if(c == EOF) break;
-
-		fseek(lvlconvfile, -1, SEEK_CUR);
-		if(fread(&x, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT READ THE X");
-			return EXIT_FAILURE;
-		}
-		if(fread(&y, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE Y");
-			return EXIT_FAILURE;
-		}
-		if(fread(&angle, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE ANGLE");
-			return EXIT_FAILURE;
-		}
-		if(fread(&type, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE TYPE");
-			return EXIT_FAILURE;
-		}
-		if(fread(&options, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE FLAGS");
-			return EXIT_FAILURE;
-		}
-
-		fseek(lvlconvfile, -6, SEEK_CUR);
-
-		/* CHECK FOR MATCH */
-		if(type != 32000 && type != 32001) // !@#$%^ Doom Builder...
-		{
-			if(type < TABLE_SIZE && conversion[type] < 0)
-				printf("\nThing type %d no longer supported. You will have to manually change this.", type);
-			else if(type < TABLE_SIZE && conversion[type] != 0)
-				type = conversion[type];
-			else
-				printf("\nUnknown thing type %d!", type);
-
-			if (type != 502 && type != 1700 && type != 1701 && type != 1702 && type != 1703 && type != 1704 && type != 1705)
-			{
-				if (options == 1 || options == 4)
-				{
-					printf("\nThing type %d on Easy or Hard only, renamed to thing type 4242.", type);
-					type = 4242;
-				}
-
-				options &= ~7; // Strip skill settings
-			}
-		}
-
-		if (type == 502)
-		{
-			int numpost = options & 31;
-			angle %= 360;
-			angle += numpost * 360;
-			options = 0;
-		}
-
-		if(fwrite(&angle, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE ANGLE");
-			return EXIT_FAILURE;
-		}
-
-		if(fwrite(&type, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE TYPE");
-			return EXIT_FAILURE;
-		}
-
-		if (fwrite(&options, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE FLAGS");
-			return EXIT_FAILURE;
-		}
-	}
-	fclose(lvlconvfile);
-	puts("DONE, Man!.. Inserting into WAD.\n");
-	sprintf(syscmd, "lumpmod %s update -s MAP%s THINGS lvlconv.tmp",
-		argv[1], strupr(argv[2]));
-	system(syscmd);
-	remove("lvlconv.tmp");
-	return 1;
-}
-
-static void ConvertFlat(char *garbage)
-{
-		/* CHECK FOR MATCH */
-		if(!memcmp(garbage, "FLOOR0_3\0\0\0\0", 8))
-			strncpy(garbage, "GFZFLR01\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLOOR0_6\0\0\0", 8))
-			strncpy(garbage, "GFZFLR02\0\0\0", 8);
-		else if(!memcmp(garbage, "CEIL3_3\0\0\0\0\0", 8) || !memcmp(garbage, "GATE1\0\0\0\0\0\0", 8))
-			strncpy(garbage, "GFZFLR03\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "CEIL3_4\0\0\0\0\0", 8))
-			strncpy(garbage, "GFZFLR04\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLOOR1_1\0\0\0\0\0", 8))
-			strncpy(garbage, "GFZFLR05\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLOOR1_7\0\0\0\0\0", 8))
-			strncpy(garbage, "GFZFLR06\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLOOR5_3\0\0\0\0\0", 8))
-			strncpy(garbage, "GFZFLR07\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "OLDROCK\0\0\0\0\0\0", 8))
-			strncpy(garbage, "GFZFLR08\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "SFLR5_0\0\0\0\0\0", 8))
-			strncpy(garbage, "GFZFLR09\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "SFLR6_1\0\0\0\0\0", 8)
-			|| !memcmp(garbage, "SFLR6_4\0\0\0\0\0", 8)
-			|| !memcmp(garbage, "SFLR7_1\0\0\0\0\0", 8)
-			|| !memcmp(garbage, "SFLR7_4\0\0\0\0\0", 8))
-		{
-			printf("Flat pic %s no longer supported. Use GFZFLR09 with\r\nlinedef special #7 to achieve same effect.\r\nFlat converted to GFZFLR09 for your convenience.\r\n", garbage);
-			strncpy(garbage, "GFZFLR09\0\0\0\0\0\0", 8);
-		}
-		else if(!memcmp(garbage, "DEM1_4\0\0\0\0\0\0", 8))
-			strncpy(garbage, "GFZFLR10\0\0\0\0", 8);
-
-		else if(!memcmp(garbage, "FLOOR3_3\0\0\0\0\0", 8))
-			strncpy(garbage, "THZFLR30\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLOOR4_5\0\0\0\0\0", 8))
-			strncpy(garbage, "THZFLR31\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "OTHZW1\0\0\0\0\0", 8))
-			strncpy(garbage, "THZFLR32\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "OTHZW2\0\0\0\0\0", 8))
-			strncpy(garbage, "THZFLR33\0\0\0\0\0\0\0", 8);
-
-		else if(!memcmp(garbage, "BLOOD1\0\0", 8))
-			strncpy(garbage, "LITER1\0\0", 8);
-		else if(!memcmp(garbage, "BLOOD2\0\0", 8))
-			strncpy(garbage, "LITER2\0\0", 8);
-		else if(!memcmp(garbage, "BLOOD3\0\0", 8))
-			strncpy(garbage, "LITER3\0\0", 8);
-
-		else if(!memcmp(garbage, "BLUE1\0\0\0", 8))
-			strncpy(garbage, "LITEB1\0\0", 8);
-		else if(!memcmp(garbage, "BLUE2\0\0\0", 8))
-			strncpy(garbage, "LITEB2\0\0", 8);
-		else if(!memcmp(garbage, "BLUE3\0\0\0", 8))
-			strncpy(garbage, "LITEB3\0\0", 8);
-
-		else if(!memcmp(garbage, "GREY1\0\0\0", 8))
-			strncpy(garbage, "LITEN1\0\0", 8);
-		else if(!memcmp(garbage, "GREY2\0\0\0", 8))
-			strncpy(garbage, "LITEN2\0\0", 8);
-		else if(!memcmp(garbage, "GREY3\0\0\0", 8))
-			strncpy(garbage, "LITEN3\0\0", 8);
-
-		else if(!memcmp(garbage, "NUKAGE1\0\0\0", 8))
-			strncpy(garbage, "LITEY1\0\0", 8);
-		else if(!memcmp(garbage, "NUKAGE2\0\0\0", 8))
-			strncpy(garbage, "LITEY2\0\0", 8);
-		else if(!memcmp(garbage, "NUKAGE3\0\0\0", 8))
-			strncpy(garbage, "LITEY3\0\0", 8);
-
-		else if(!memcmp(garbage, "CEIL1_3\0\0\0\0\0", 8))
-			strncpy(garbage, "CEZFLR09\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "CEIL1_1\0\0\0\0\0", 8))
-			strncpy(garbage, "CEZFLR10\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "CEIL1_2\0\0\0\0\0", 8))
-			strncpy(garbage, "CEZFLR11\0\0\0\0\0\0\0", 8);
-
-		else if(!memcmp(garbage, "CONS1_1\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR07\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "CONS1_5\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR08\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "CONS1_7\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR09\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLOOR0_5\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR10\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLOOR0_7\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR11\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLOOR1_6\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR12\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "SLIME01\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR13\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "SLIME02\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR14\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "SLIME03\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR15\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "SLIME04\0\0\0\0\0", 8))
-			strncpy(garbage, "SFLR12\0\0\0\0\0\0\0", 8);
-
-		else if(!memcmp(garbage, "DCFLR1\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR01\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DCCEIL1\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR02\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DCPAVE\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR03\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DCMANHO\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR04\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DCTEX1\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR05\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DCTEX2\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR06\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DCTEX3\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR07\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DCTEX4\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR08\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DCWHITE\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR09\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DCYELLOW\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR10\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DENTFLR\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR11\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DENTMETL\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR12\0\0\0\0\0\0\0", 8); // Intentionally
-		else if(!memcmp(garbage, "FLAT14\0\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR12\0\0\0\0\0", 8); // The same!
-		else if(!memcmp(garbage, "MFLR8_1\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR13\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "STEP2\0\0\0\0\0", 8))
-			strncpy(garbage, "DCZFLR14\0\0\0\0\0", 8);
-
-
-		else if(!memcmp(garbage, "DEEPSEA2\0\0\0\0\0", 8))
-			strncpy(garbage, "DSZFLR04\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DEEPSEA3\0\0\0\0\0", 8))
-			strncpy(garbage, "DSZFLR05\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "DEEPSEA4\0\0\0\0\0", 8))
-			strncpy(garbage, "DSZFLR06\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLOOR4_6\0\0\0\0\0", 8))
-			strncpy(garbage, "DSZFLR07\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "SLIME14\0\0\0\0\0", 8))
-			strncpy(garbage, "DSZFLR08\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "SLIME15\0\0\0\0\0", 8))
-			strncpy(garbage, "DSZFLR09\0\0\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "SLIME16\0\0\0\0\0", 8))
-			strncpy(garbage, "DSZFLR10\0\0\0\0\0\0\0", 8);
-
-		else if(!memcmp(garbage, "ERROCK\0\0\0\0\0\0", 8))
-			strncpy(garbage, "ERZFLR01\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLAT18\0\0\0\0\0\0", 8))
-			strncpy(garbage, "ERZFLR02\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLAT20\0\0\0\0\0\0", 8))
-			strncpy(garbage, "ERZFLR03\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLAT22\0\0\0\0\0\0", 8))
-			strncpy(garbage, "ERZFLR04\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLAT23\0\0\0\0\0\0", 8))
-			strncpy(garbage, "ERZFLR05\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLAT5_4\0\0\0\0", 8))
-			strncpy(garbage, "ERZFLR06\0\0\0\0\0", 8);
-
-		else if(!memcmp(garbage, "FLAT10\0\0\0\0\0\0", 8))
-			strncpy(garbage, "REDFLR\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "FLAT5\0\0\0\0\0\0", 8))
-			strncpy(garbage, "ORGFLR\0\0\0\0\0", 8);
-
-		else if(!memcmp(garbage, "MFLR8_2\0\0\0\0\0\0", 8))
-			strncpy(garbage, "GREYFLR\0\0\0\0\0", 8);
-		else if(!memcmp(garbage, "MFLR8_4\0\0\0\0\0\0", 8))
-			strncpy(garbage, "GREYFLR\0\0\0\0\0", 8);
-}
-
-static inline int ConvertSectors(char *argv[])
-{
-	char syscmd[100];
-	InitializeSectorConversionTable();
-
-	sprintf(syscmd, "lumpmod %s extract -s MAP%s SECTORS lvlconv.tmp",
-		argv[1], strupr(argv[2]));
-	system(syscmd);
-
-	lvlconvfile = fopen("lvlconv.tmp", "r+b");
-	if(lvlconvfile == NULL) {
-		puts("Failed to open lvlconv.tmp.");
-		return EXIT_FAILURE;
-	}
-	for(;;) {
-		int c;
-		char garbage[11];
-		short type;
-
-		c = fgetc(lvlconvfile);
-		if(c == EOF) break;
-
-		fseek(lvlconvfile, -1, SEEK_CUR);
-		if(fread(&garbage, sizeof(short)*2, 1, lvlconvfile) < 1) {
-			puts("I CANNOT READ THE DATA BEFORE SECTOR FLATS");
-			return EXIT_FAILURE;
-		}
-
-		// Read floor flat first.
-		if(fread(&garbage, 8, 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE SECTOR FLOOR FLAT");
-			return EXIT_FAILURE;
-		}
-
-		fseek(lvlconvfile, -8, SEEK_CUR);
-
-		garbage[8] = 0;
-
-		ConvertFlat(garbage);
-
-		if(fwrite(&garbage, 8, 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE FLOOR FLAT");
-			return EXIT_FAILURE;
-		}
-
-		fseek(lvlconvfile, 0, SEEK_CUR);
-
-		memset(garbage, 0, sizeof(garbage));
-
-		// Now do ceiling flat.
-		if(fread(&garbage, 8, 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE SECTOR CEILING FLAT");
-			return EXIT_FAILURE;
-		}
-
-		fseek(lvlconvfile, -8, SEEK_CUR);
-
-		garbage[8] = 0;
-		ConvertFlat(garbage);
-
-		if(fwrite(&garbage, 8, 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE CEILING FLAT");
-			return EXIT_FAILURE;
-		}
-
-		// Skip lightlevel
-		fseek(lvlconvfile, 1 * sizeof(short), SEEK_CUR);
-
-		// Now do sector special.
-		if(fread(&type, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE SECTOR SPECIAL");
-			return EXIT_FAILURE;
-		}
-
-		fseek(lvlconvfile, -1 * (int)sizeof(short), SEEK_CUR);
-
-		/* CHECK FOR MATCH */
-		if(conversion[type] < 0)
-			printf("\nSector type %d no longer supported. You will have to manually change this.", type);
-		else if(conversion[type] != 0)
-			type = conversion[type];
-		else if (type != 0)
-			printf("\nUnknown sector type %d!", type);
-
-		if(fwrite(&type, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE TYPE");
-			return EXIT_FAILURE;
-		}
-
-		/* skip 1 short of TOTAL CRAP */
-		fseek(lvlconvfile, 1 * sizeof(short), SEEK_CUR);
-	}
-	fclose(lvlconvfile);
-	puts("DONE, Man!.. Inserting back into WAD.\n");
-	sprintf(syscmd, "lumpmod %s update -s MAP%s SECTORS lvlconv.tmp",
-		argv[1], strupr(argv[2]));
-	system(syscmd);
-	remove("lvlconv.tmp");
-	return 1;
-}
-
-static inline int ConvertLinedefs(char *argv[])
-{
-	char syscmd[100];
-	InitializeLinedefConversionTable();
-
-	sprintf(syscmd, "lumpmod %s extract -s MAP%s LINEDEFS lvlconv.tmp",
-		argv[1], strupr(argv[2]));
-	system(syscmd);
-
-	lvlconvfile = fopen("lvlconv.tmp", "r+b");
-	if(lvlconvfile == NULL) {
-		puts("Failed to open lvlconv.tmp.");
-		return EXIT_FAILURE;
-	}
-	for(;;) {
-		int c;
-		short garbage[3], type;
-
-		c = fgetc(lvlconvfile);
-		if(c == EOF) break;
-
-		fseek(lvlconvfile, -1, SEEK_CUR);
-		if(fread(&garbage, sizeof(short)*3, 1, lvlconvfile) < 1) {
-			puts("I CANNOT READ THE DATA BEFORE THE LINEDEF SPECIAL");
-			return EXIT_FAILURE;
-		}
-		if(fread(&type, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CAN'T READ THE LINEDEF TYPE");
-			return EXIT_FAILURE;
-		}
-
-		fseek(lvlconvfile, -1 * (int)sizeof(short), SEEK_CUR);
-
-		/* CHECK FOR MATCH */
-		if(conversion[type] < 0)
-			printf("\nLinedef type %d no longer supported. You will have to manually change this.", type);
-		else if(conversion[type] != 0)
-		{
-			if(type == 65)
-				printf("\nThis level contains a speed pad linedef. You will have to flip the direction of the line for it to work properly.");
-
-			type = conversion[type];
-		}
-		else if (type != 0)
-			printf("\nUnknown linedef type %d!", type);
-
-		if(fwrite(&type, sizeof(short), 1, lvlconvfile) < 1) {
-			puts("I CANNOT WRITE THE TYPE");
-			return EXIT_FAILURE;
-		}
-
-		/* skip 3 shorts of TOTAL CRAP */
-		fseek(lvlconvfile, 3 * sizeof(short), SEEK_CUR);
-	}
-	fclose(lvlconvfile);
-	puts("DONE, Man!.. Inserting back into WAD.\n");
-	sprintf(syscmd, "lumpmod %s update -s MAP%s LINEDEFS lvlconv.tmp",
-		argv[1], strupr(argv[2]));
-	system(syscmd);
-	remove("lvlconv.tmp");
-	return 1;
-}
-
-int main(int argc, char *argv[]) {
-	if(argc != 3) {
-		puts("Usage: lvlconv [filename] [mapnumber]");
-		puts("Example: lvlconv wadfile.wad 01");
-		return EXIT_FAILURE; /* YOU FAIL IT! */
-	}
-
-	if(strlen(argv[2]) != 2 || strlen(argv[1]) > 32) {
-		puts("nonono you screwed it up");
-		return EXIT_FAILURE; /* YOU LIKEWISE FAIL IT! */
-	}
-#ifdef STARPOSTS_ONLY
-	ConvertStarposts(argv);
-#else
-	puts("\nConverting Things...");
-	ConvertThings(argv);
-	puts("\nConverting Sectors...");
-	ConvertSectors(argv);
-	puts("\nConverting Linedefs...");
-	ConvertLinedefs(argv);
-#endif
-
-	puts("\nOkay, DONE!! Enjoy the NEWLY MODIFIED WAD FILE!!! HAVE A GOOD DAY!");
-	return EXIT_SUCCESS; /* YOU SUCCEED AT IT! :) */
-}
diff --git a/tools/LevelConverter/levelconverter.dsp b/tools/LevelConverter/levelconverter.dsp
deleted file mode 100644
index 655cc3799..000000000
--- a/tools/LevelConverter/levelconverter.dsp
+++ /dev/null
@@ -1,88 +0,0 @@
-# Microsoft Developer Studio Project File - Name="levelconverter" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=levelconverter - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "levelconverter.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "levelconverter.mak" CFG="levelconverter - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "levelconverter - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "levelconverter - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "levelconverter - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "levelconverter - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "levelconverter - Win32 Release"
-# Name "levelconverter - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\levelconverter.c
-# End Source File
-# End Target
-# End Project
diff --git a/tools/LevelConverter/levelconverter.dsw b/tools/LevelConverter/levelconverter.dsw
deleted file mode 100644
index 51a840c28..000000000
--- a/tools/LevelConverter/levelconverter.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "levelconverter"=.\levelconverter.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/tools/MSDfile b/tools/MSDfile
deleted file mode 100644
index 287c31354..000000000
--- a/tools/MSDfile
+++ /dev/null
@@ -1,235 +0,0 @@
-# Doxyfile 1.4.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "SRB2 MasterServer"
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = ../doc/MasterServer
-CREATE_SUBDIRS         = YES
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = YES
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = NO
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = YES
-FILE_VERSION_FILTER    = 
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ./masterserver
-FILE_PATTERNS          = *.cpp \
-                         *.h
-RECURSIVE              = NO
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = *
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = YES
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = YES
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION    = NO
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = YES
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = YES
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = C:/Dev/include
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = HWRENDER \
-                         DIRECTFULLSCREEN \
-                         HW3SOUND
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 1000
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
diff --git a/tools/PHPD b/tools/PHPD
deleted file mode 100644
index d2877f4e3..000000000
--- a/tools/PHPD
+++ /dev/null
@@ -1,239 +0,0 @@
-# Doxyfile 1.4.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "SRB2 MasterServer IRC Bot and PHP stuff"
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = ../doc/IRC_Bot
-CREATE_SUBDIRS         = YES
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = YES
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = NO
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = YES
-FILE_VERSION_FILTER    = 
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ./
-FILE_PATTERNS          = *.php \
-                         *.php3 \
-                         *.inc \
-                         *.dox
-RECURSIVE              = YES
-EXCLUDE                = ./IRC_Bot/SmartIRC.php
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */IRC_Bot/magpierss/* \
-                         */IRC_Bot/SmartIRC/* \
-                         */IRC_Bot/*SRB2MS_Pass.php
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = *
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = YES
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
-INLINE_SOURCES         = YES
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION    = NO
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = YES
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = YES
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = C:/Dev/include
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = HWRENDER \
-                         DIRECTFULLSCREEN \
-                         HW3SOUND
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 1000
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
diff --git a/tools/anglechk.c b/tools/anglechk.c
deleted file mode 100644
index 7f56abff7..000000000
--- a/tools/anglechk.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- *      anglechk.c
- *
- *      Copyright 2007 Alam Arias <Alam.GBC@gmail.com>
- *
- *      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.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <stdio.h>
-#ifdef _MSC_VER
-#include <assert.h>
-#endif
-#include "../src/tables.h"
-#define NO_M
-#include "../src/m_fixed.c"
-#define FIXEDPOINTCONV
-
-// With angle_t,
-// 360 deg = 2^32
-// 45 deg = 2^29
-// 1 deg = 2^29 / 45
-// To convert an angle to a fixed-point number of degrees, then, use
-//   fixed = angle * FRACUNIT / ((1<<29) / 45)
-// But, done literally like that, this will overflow.
-// It's mathematically equivalent to
-//   fixed = angle * (1<<FRACBITS) / (1<<29) * 45
-//   fixed = 45 * angle * (1<<(FRACBITS-29))
-//   fixed = 45 * angle * (1>>(29-FRACBITS))
-//   fixed = (angle>>(29-FRACBITS)) * 45
-
-#define ANGLE_TO_FIXED(a) (fixed_t)(((a)>>(29-FRACBITS))*45)
-#define FIXED_TO_ANGLE(x) (angle_t)(((x)/45)<<(29-FRACBITS))
-
-/*
-Old code that failed if FRACBITS was not 16.
-In particular, the use of FRACUNIT in the definition of ANGLE_F is completely
-wrong. The value wanted actually happens to be 65536 due to the definition
-of angle_t (it's specified so that 360 degrees = 2^32, to take advantage of
-modular arithmetic). That 65536 has nothing whatsoever to do with the setting
-of FRACUNIT.
-
-#define ANGF_D 8192
-#define ANGF_N 45
-#define ANGLE_F (ANGF_N*FRACUNIT/ANGF_D)
-#define FIXED_TO_ANGLE(x) (angle_t)FixedDiv(x, ANGLE_F) // angle_t = FixedDiv(fixed_t, ANGLE_F)
-#define ANGLE_TO_FIXED(x) FixedMul((fixed_t)(x), ANGLE_F) // fixed_t = FixedMul(angle_t, ANGLE_F)
-*/
-
-static fixed_t AngleFixed204(angle_t af)
-{
-	const fixed_t cfn = 180*FRACUNIT;
-	if (af == 0)
-		return 0;
-	else if (af > ANGLE_180)
-		return cfn + ANGLE_TO_FIXED(af - ANGLE_180);
-	else if (af < ANGLE_180)
-		return ANGLE_TO_FIXED(af);
-	else return cfn;
-}
-
-static inline angle_t FixedAngleC204(fixed_t fa, fixed_t factor)
-{
-#if 0 //FixedMod off?
-	const boolean neqda = da < 0, neqfa = fa < 0;
-	const fixed_t afactor = abs(factor);
-	angle_t ra = ANGLE_180;
-
-	if (factor == 0)
-		return FixedAngle204(fa);
-	else if (fa == 0)
-		return 0;
-
-	if (neqfactor)
-	{
-		const fixed_t maf = FixedDiv(afactor, ANGLE_F);
-		const fixed_t cfn = FixedMul(360*FRACUNIT, afactor), hcfn = (cfn/2);
-		const fixed_t fam = FixedMod(fa, cfn);
-
-		if (fam > hcfn)
-			ra = ANGLE_180 + (angle_t)FixedMul(fam - hcfn, maf);
-		else if (fam < hcfn)
-			ra = (angle_t)FixedMul(fam, maf);
-	}
-	else
-	{
-		const fixed_t maf = FixedMul(afactor, ANGLE_F);
-		const fixed_t cfn = FixedDiv(360*FRACUNIT, afactor), hcfn = (cfn/2);
-		const fixed_t fam = FixedMod(fa, cfn);
-
-		if (fam > hcfn)
-			ra = ANGLE_180 + (angle_t)FixedDiv(fam - hcfn, maf);
-		else if (fam < hcfn)
-			ra = (angle_t)FixedDiv(fam, maf);
-	}
-
-	if (neqfa)
-		ra = ANGLE_MAX-ra;
-
-	return ra;
-#else
-	if (factor == 0)
-		return FixedAngle(fa);
-	else if (factor > 0)
-		return (angle_t)((FIXED_TO_FLOAT(fa)/FIXED_TO_FLOAT(factor))*(ANGLE_45/45));
-	else
-		return (angle_t)((FIXED_TO_FLOAT(fa)*FIXED_TO_FLOAT(-factor))*(ANGLE_45/45));
-#endif
-}
-
-angle_t FixedAngle(fixed_t fa)
-{
-#if 0 //FixedMod off?
-	const boolean neqfa = fa < 0;
-	const fixed_t cfn = 180*FRACUNIT;
-	const fixed_t fam = FixedMod(fa, 360*FRACUNIT);
-	angle_t ra = ANGLE_180;
-
-	if (fa == 0)
-		return 0;
-
-	if (fam > cfn)
-		ra = ANGLE_180+FIXED_TO_ANGLE(fam-cfn);
-	else if (fam < cfn)
-		ra = FIXED_TO_ANGLE(fam);
-
-	if (neqfa)
-		ra = ANGLE_MAX-ra;
-
-	return ra;
-#else
-	return (angle_t)(FIXED_TO_FLOAT(fa)*(ANGLE_45/45));
-#endif
-}
-
-fixed_t AngleFixed205(angle_t af)
-{
-#ifdef FIXEDPOINTCONV
-	angle_t wa = ANGLE_180;
-	fixed_t wf = 180*FRACUNIT;
-	fixed_t rf = 0*FRACUNIT;
-	//const angle_t adj = 0x2000;
-
-	//if (af < adj) // too small to notice
-		//return rf;
-
-	while (af)
-	{
-		while (af < wa)
-		{
-			wa /= 2;
-			wf /= 2;
-		}
-		rf += wf;
-		af -= wa;
-	}
-
-	return rf;
-#else
-	const fixed_t cfn = 180*FRACUNIT;
-	if (af == 0)
-		return 0;
-	else if (af > ANGLE_180)
-		return cfn + ANGLE_TO_FIXED(af - ANGLE_180);
-	else if (af < ANGLE_180)
-		return ANGLE_TO_FIXED(af);
-	else return cfn;
-#endif
-}
-
-#ifdef FIXEDPOINTCONV
-static FUNCMATH angle_t AngleAdj(const fixed_t fa, const fixed_t wf,
-                                 angle_t ra)
-{
-	const angle_t adj = 0x77;
-	const boolean fan = fa < 0;
-	const fixed_t sl = FixedDiv(fa, wf*2);
-	const fixed_t lb = FixedRem(fa, wf*2);
-	const fixed_t lo = (wf*2)-lb;
-
-	if (ra == 0)
-	{
-		if (lb == 0)
-		{
-			ra = FixedMul(FRACUNIT/512, sl);
-			if (ra > FRACUNIT/64)
-				return ANGLE_MAX-ra+1;
-			return ra;
-		}
-		else if (lb > 0)
-			return ANGLE_MAX-FixedMul(lo*FRACUNIT, adj)+1;
-		else
-			return ANGLE_MAX-FixedMul(lo*FRACUNIT, adj)+1;
-	}
-
-	if (fan)
-		return ANGLE_MAX-ra+1;
-	else
-		return ra;
-}
-#endif
-
-angle_t FixedAngleC205(fixed_t fa, fixed_t factor)
-{
-#ifdef FIXEDPOINTCONV
-	angle_t wa = ANGLE_180;
-	fixed_t wf = 180*FRACUNIT;
-	angle_t ra = 0;
-	const fixed_t cfa = fa;
-	fixed_t cwf = wf;
-
-	if (fa == 0)
-		return 0;
-
-	if (factor == 0)
-		return FixedAngle(fa);
-	else if (factor > 0)
-		cwf = wf = FixedMul(wf, factor);
-	else if (factor < 0)
-		cwf = wf = FixedDiv(wf, -factor);
-
-	fa = abs(fa);
-
-	while (fa)
-	{
-		while (fa < wf)
-		{
-			wa /= 2;
-			wf /= 2;
-		}
-		ra = ra + wa;
-		fa = fa - wf;
-	}
-
-	return AngleAdj(cfa, cwf, ra);
-#else
-	if (factor == 0)
-		return FixedAngle(fa);
-
-	//fa = FixedMod(fa, 360*FRACUNIT);
-
-	if (factor > 0)
-		return (angle_t)((FIXED_TO_FLOAT(fa)/FIXED_TO_FLOAT(factor))*(ANGLE_45/45));
-	else
-		return (angle_t)((FIXED_TO_FLOAT(fa)*FIXED_TO_FLOAT(-factor))*(ANGLE_45/45));
-#endif
-}
-
-angle_t FixedAngle205(fixed_t fa)
-{
-#ifdef FIXEDPOINTCONV
-	angle_t wa = ANGLE_180;
-	fixed_t wf = 180*FRACUNIT;
-	angle_t ra = 0;
-	const fixed_t cfa = fa;
-	const fixed_t cwf = wf;
-
-	if (fa == 0)
-		return 0;
-
-	fa = abs(fa);
-
-	while (fa)
-	{
-		while (fa < wf)
-		{
-			wa /= 2;
-			wf /= 2;
-		}
-		ra = ra + wa;
-		fa = fa - wf;
-	}
-
-	return AngleAdj(cfa, cwf, ra);
-#else
-	//fa = FixedMod(fa, 360*FRACUNIT);
-
-	if (fa == 0)
-		return 0;
-
-	return (angle_t)(FIXED_TO_FLOAT(fa)*(ANGLE_45/45));
-#endif
-}
-
-int main(int argc, char** argv)
-{
-	fixed_t f, f204, f205;
-	INT64 a;
-	angle_t a204, a205;
-	fixed_t CF = 40*FRACUNIT;
-	int err = 0;
-	(void)argc;
-	(void)argv;
-
-	err = 0x29; //41
-
-	if (1)
-	for (a = 0; a < ANGLE_MAX; a += 0x1)
-	{
-		f204 = AngleFixed204((angle_t)a);
-		f205 = AngleFixed205((angle_t)a);
-		if (f204 != f205 && (abs(f204-f205) > err || f204 == 0 || f205 == 0))
-		{
-			printf("Angle: %u, %d, %d, %d\n", (angle_t)a, f204, f205, f204-f205);
-			//err = abs(f204-f205);
-		}
-	}
-
-	//err = FixedDiv(FRACUNIT, 120*FRACUNIT); // 547
-	err = FixedDiv(FRACUNIT,  62*FRACUNIT); //1059
-
-	if (1)
-	for (f = FRACUNIT*-720; f < FRACUNIT*720; f += 1)
-	{
-		a204 = FixedAngle(f);
-		a205 = FixedAngle205(f);
-		if (a204 != a205 && (abs(a204-a205) > err || a204 == 0 || a205 == 0))
-		{
-			printf("Fixed: %f, %u, %u, %d\n", FIXED_TO_FLOAT(f), a204, a205, a204-a205);
-			err = abs(a204-a205);
-		}
-	}
-
-	//err = FixedDiv(FRACUNIT, 316*FRACUNIT); //207
-	err = FixedDiv(FRACUNIT, 125*FRACUNIT); //526
-
-	if (1)
-	for (f = FixedMul(FRACUNIT*-720, CF); f < FixedMul(FRACUNIT*720, CF); f += FRACUNIT/16)
-	{
-		a204 = FixedAngleC204(f, CF);
-		a205 = FixedAngleC205(f, CF);
-		if (a204 != a205 && (abs(a204-a205) > err || a204 == 0 || a205 == 0))
-		{
-			printf("FixedC: %f, %u, %u, %d\n", FIXED_TO_FLOAT(f), a204, a205, a204-a205);
-			//err = abs(a204-a205);
-		}
-	}
-
-	return 0;
-}
-
-static void *cpu_cpy(void *dest, const void *src, size_t n)
-{
-	return memcpy(dest, src, n);
-}
-
-void *(*M_Memcpy)(void* dest, const void* src, size_t n) = cpu_cpy;
-
-void I_Error(const char *error, ...)
-{
-	(void)error;
-	exit(-1);
-}
diff --git a/tools/convert.c b/tools/convert.c
deleted file mode 100644
index 0ab0cb132..000000000
--- a/tools/convert.c
+++ /dev/null
@@ -1,35 +0,0 @@
-// convert corona.raw in a pic_t as corona2.raw
-
-#include <stdio.h>
-
-typedef struct
-{
-	short width;
-	char reserved0; // set to 0
-	char mode; // see pic_mode_t above
-	short height;
-	short reserved1; // set to 0
-} pic_t;
-
-void main(int argc, char *argv[])
-{
-	int i, j, k;
-	char buf1[256][256], buf2[256][256][2];
-	pic_t pic = {256, 0, 2, 256, 0};
-	FILE *g;
-
-	FILE *f = fopen("corona.raw", "rb");
-	fread(buf1, 256*256, 1, f);
-	fclose(f);
-
-	g = fopen("corona2.raw", "wb");
-	for (i = 0; i < 256; i++)
-	for (j = 0; j < 256; j++)
-	{
-		buf2[i][j][0] = buf1[i][j];
-		buf2[i][j][1] = buf1[i][j];
-	}
-	fwrite(&pic, sizeof (pic_t), 1, g);
-	fwrite(buf2, sizeof (buf2), 1, g);
-	fclose(g);
-}
diff --git a/tools/dircomp2.c b/tools/dircomp2.c
deleted file mode 100644
index 96a55f36f..000000000
--- a/tools/dircomp2.c
+++ /dev/null
@@ -1,1028 +0,0 @@
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 1998-2000 by Boris Pereira.
-//
-// 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.
-//-----------------------------------------------------------------------------
-
-#include<stdlib.h>
-#include<stdio.h>
-#include<conio.h>
-#include<dir.h>
-#include<string.h>
-#include<stdarg.h>
-#include<unistd.h>
-#include<dpmi.h>
-#include<sys/stat.h>
-#include<utime.h>
-#include<time.h>
-#include<process.h>
-#include"keys.h"
-
-
-#define true    1
-#define false   0
-
-#define MAXLINE      32768
-#define MAXLENLINE    4096
-#define SCREENWIDTH     80
-
-typedef struct {
-    int lines;
-    char *line[MAXLINE];
-} textfile_t;
-
-char       tempfilename[255],editor[128]="c:\\program files\\ultraedit\\uedit32.exe";
-int        sameline=3,tab1=8,tab2=8;
-int        screenline=25;
-textfile_t f1,f2;
-int        nonewfile = false;
-int        compspace = false;
-
-unsigned short colornormal = (   BLACK<<4) + LIGHTGRAY;
-unsigned short colortitle  = (   BLACK<<4) +     WHITE;
-unsigned short colortext   = (   BLACK<<4) +  DARKGRAY;
-unsigned short colordiff   = (   BLACK<<4) +  LIGHTRED;
-unsigned short colorkeys   = (   BLACK<<4) + LIGHTCYAN;
-
-
-// compare directorys
-void CompareDir(char *dir1,char *dir2);
-
-// compare directorys this one check only for missing file
-void CompareDir2(char *dir1,char *dir2);
-
-// compare files
-void CompareFile(char *filename1,char *filename2);
-
-// copy a file
-void fcopy(char *filename1,char *filename2);
-
-// recursive delete a dir
-void dirunlink(char *dirname);
-
-// recursive copy a dir
-void copydir(char *dirname1,char *dirname2);
-
-void Quit(char *f,...)
-{
-    va_list     argptr;
-
-    // put message to stderr
-    va_start (argptr,f);
-    fprintf  (stderr, "Error: ");
-    vfprintf (stderr,f,argptr);
-    va_end   (argptr);
-
-    fflush( stderr );
-    exit(-1);
-}
-
-int CheckParm(int argc, char *argv[], char *param )
-{
-    int i;
-    for(i=1;i<argc;i++)
-    {
-        if(!stricmp(param,argv[i]))
-        {
-            return i;
-        }
-    }
-
-    return 0;
-}
-
-int main(int argc,char *argv[])
-{
-    struct ffblk dir;
-    char   *tmp;
-    int    i;
-
-    printf("Directory Comparator 1.3 (c) Copyright Boris Pereira\n\n");
-
-    if(argc<2)
-       Quit("Missing parameter\n"
-            "Syntax: filecomp <dirname1> <dirname2> [<options>]\n\n"
-            " Options\n"
-            " -------\n"
-            "   -t1 n : change tab size for directory 1  (default 8)\n"
-            "   -t2 n : change tab size for directory 2  (default 8)\n"
-            "   -l  n : use n same line to resynchronize (default 3)\n"
-            "   -e <editor> : use spesified editor\n"
-            "   -nonew: don't prompt to copy/delete file\n"
-            "   -w compress space and tab");
-
-    if(findfirst(argv[1],&dir,FA_DIREC))
-       Quit("Error can't find %s\n",argv[1]);
-
-    if(findfirst(argv[2],&dir,FA_DIREC))
-       Quit("Error can't find %s\n",argv[2]);
-
-    if(argc>2)
-    {
-       i=CheckParm(argc,argv,"-t1");
-       if(i) tab1=atoi(argv[i+1]);
-       i=CheckParm(argc,argv,"-t2");
-       if(i) tab2=atoi(argv[i+1]);
-       i=CheckParm(argc,argv,"-l");
-       if(i) sameline=atoi(argv[i+1]);
-       i=CheckParm(argc,argv,"-e");
-       if(i) strcpy(editor,argv[i+1]);
-       nonewfile=CheckParm(argc,argv,"-nonew");
-       compspace=CheckParm(argc,argv,"-w");
-    }
-
-    _set_screen_lines(50);
-    screenline=50;
-    // desable blink color so we can use darkcolor for background
-    //outportb(0x3b8,5);
-    intensevideo();
-
-    tmp=getenv("temp");
-    if(!tmp)
-        tmp=getenv("TEMP");
-    if(!tmp)
-        tmp=getenv("tmp");
-    if(!tmp)
-        tmp=getenv("TMP");
-    if(tmp)
-    {
-        strcpy(tempfilename,tmp);
-        if(tempfilename[strlen(tempfilename)]!='\\')
-            strcat(tempfilename,"\\");
-    }
-    else
-        tempfilename[0]='\0';
-    strcat(tempfilename,"dircmp$$.tmp");
-
-    CompareDir(argv[1],argv[2]);
-
-    if(!nonewfile)
-        // just for file in the directory 2 and not in the 1
-        CompareDir2(argv[1],argv[2]);
-
-    return 0;
-}
-
-char *fileextension(char *filename)
-{
-    static char nullextension=0;
-    int i;
-    i = strlen(filename)-1;
-    while(i>0 && filename[i]!='.') i--;
-    if( filename[i]=='.' )
-        return filename+i+1;
-    // else
-    return &nullextension;
-}
-
-void CompareDir(char *dirname1,char *dirname2)
-{
-    struct ffblk dir;
-    char   filter[20]="\\*.*";
-    char   tempstr[255];
-    int    finish;
-
-    strcpy(tempstr,dirname1);
-    strcat(tempstr,filter);
-
-    printf("Comparing %s and %s\n",dirname2,dirname1);
-
-    // enter in directorys first
-    finish=findfirst(tempstr,&dir,FA_DIREC);
-    while(!finish)
-    {
-        char tempstr2[255],tempstr3[255];
-
-        strcpy(tempstr2,dirname1);
-        strcat(tempstr2,"\\");
-        strcat(tempstr2,dir.ff_name);
-
-        strcpy(tempstr3,dirname2);
-        strcat(tempstr3,"\\");
-        strcat(tempstr3,dir.ff_name);
-
-
-        if(dir.ff_attrib & FA_DIREC)
-        {
-            if(dir.ff_name[0]!='.' && strcmp(dir.ff_name,"CVS")!=0)
-            {
-                int check,choice;
-                check=access(tempstr3,F_OK);
-                if( check )
-                {
-                    printf("\nDirectory missing : %s\n"
-                           "Delete %s ? (Y/N)\n",tempstr3,tempstr2);
-                    do {
-                        choice=getch();
-                    } while(choice!='y' && choice!='n'
-                         && choice!='Y' && choice!='N');
-
-                    if( choice=='y' || choice=='Y' )
-                        dirunlink(tempstr2);
-                }
-                else
-                    CompareDir(tempstr2,tempstr3);
-            }
-        }
-        finish=findnext(&dir);
-    }
-
-    finish=findfirst(tempstr,&dir,0);
-    while(!finish)
-    {
-        char tempstr2[255],tempstr3[255];
-
-        strcpy(tempstr2,dirname1);
-        strcat(tempstr2,"\\");
-        strcat(tempstr2,dir.ff_name);
-
-        strcpy(tempstr3,dirname2);
-        strcat(tempstr3,"\\");
-        strcat(tempstr3,dir.ff_name);
-
-        if((dir.ff_attrib & FA_DIREC)==0)
-        {
-            int check;
-            char *ext;
-
-            ext = fileextension(dir.ff_name);
-            if( !(stricmp(ext,"dsp")==0 ||
-                  stricmp(ext,"dep")==0 ||
-                  stricmp(ext,"dsw")==0 ||
-                  stricmp(ext,"ncb")==0 ||
-                  stricmp(ext,"bmp")==0 ||
-                  stricmp(ext,"opt")==0 ||
-                  stricmp(ext,"plg")==0 ||
-                  stricmp(ext,"ico")==0 ||
-                  stricmp(ext,"rc" )==0 ||
-                  stricmp(ext,"o"  )==0 ||
-                  stricmp(ext,"bat")==0 ||
-                  stricmp(ext,"obj")==0    ))
-            {
-                printf("Comparing %s and %s\n",tempstr2,tempstr3);
-                check=access(tempstr3,F_OK);
-
-                if(check)
-                {
-                    // seconde file not found
-                    int choice;
-                    if(!nonewfile)
-                    {
-                        printf("\nFile missing : %s\n"
-                               "Delete %s ? (Y/N)\n",tempstr3,tempstr2);
-                        do {
-                           choice=getch();
-                        } while(choice!='y' && choice!='n'
-                             && choice!='Y' && choice!='N');
-
-                        if(choice=='y' || choice=='Y')
-                            unlink(tempstr2);
-                    }
-                }
-                else
-                {
-                    struct stat fs1,fs2;
-                    stat(tempstr2,&fs1);
-                    stat(tempstr3,&fs2);
-
-                    if(fs1.st_atime!=fs2.st_atime || fs1.st_size!=fs2.st_size)
-                        CompareFile(tempstr2,tempstr3);
-                }
-                printf("\n");
-            }
-        }
-        finish=findnext(&dir);
-    }
-}
-
-// find file in dir2 but not in dir1
-void CompareDir2(char *dirname1,char *dirname2)
-{
-    struct ffblk dir;
-    char   filter[20]="\\*.*";
-    char   tempstr[255];
-    int    finish;
-
-    strcpy(tempstr,dirname2);
-    strcat(tempstr,filter);
-
-    printf("Comparing %s and %s\n",dirname1,dirname2);
-
-    finish=findfirst(tempstr,&dir,FA_DIREC);
-    while(!finish)
-    {
-        char tempstr2[255],tempstr3[255];
-
-        strcpy(tempstr2,dirname1);
-        strcat(tempstr2,"\\");
-        strcat(tempstr2,dir.ff_name);
-
-        strcpy(tempstr3,dirname2);
-        strcat(tempstr3,"\\");
-        strcat(tempstr3,dir.ff_name);
-
-
-        if(dir.ff_attrib & FA_DIREC)
-        {
-            if(dir.ff_name[0]!='.' && strcmp(dir.ff_name,"CVS")!=0)
-            {
-                int check,choice;
-                check=access(tempstr3,F_OK);
-                if( check )
-                {
-                    printf("\nDirectory missing : %s\n"
-                           "Copy %s ? (Y/N)\n",tempstr3,tempstr2);
-                    do {
-                        choice=getch();
-                    } while(choice!='y' && choice!='n'
-                         && choice!='Y' && choice!='N');
-
-                    if( choice=='y' || choice=='Y' )
-                        copydir(tempstr2,tempstr3);
-                }
-                else
-                    CompareDir2(tempstr2,tempstr3);
-            }
-        }
-        finish=findnext(&dir);
-    }
-
-    finish=findfirst(tempstr,&dir,FA_DIREC);
-    while(!finish)
-    {
-        char tempstr2[255],tempstr3[255];
-
-        strcpy(tempstr2,dirname1);
-        strcat(tempstr2,"\\");
-        strcat(tempstr2,dir.ff_name);
-
-        strcpy(tempstr3,dirname2);
-        strcat(tempstr3,"\\");
-        strcat(tempstr3,dir.ff_name);
-
-        if((dir.ff_attrib & FA_DIREC)==0)
-        {
-            char *ext = fileextension(dir.ff_name);
-            if( !(stricmp(ext,"dsp")==0 ||
-                  stricmp(ext,"dep")==0 ||
-                  stricmp(ext,"dsw")==0 ||
-                  stricmp(ext,"ncb")==0 ||
-                  stricmp(ext,"bmp")==0 ||
-                  stricmp(ext,"opt")==0 ||
-                  stricmp(ext,"plg")==0 ||
-                  stricmp(ext,"ico")==0 ||
-                  stricmp(ext,"rc" )==0 ||
-                  stricmp(ext,"o"  )==0 ||
-                  stricmp(ext,"bat")==0 ||
-                  stricmp(ext,"obj")==0    ) &&
-            // check if file exist in dir1
-                  access(tempstr2,F_OK))
-            {
-                int choice;
-
-                printf("File %s found in %s but not in %s\n"
-                       "Copy it ? (y/n)\n",tempstr3,dirname2,dirname1);
-                do {
-                   choice=getch();
-                } while(choice!='y' && choice!='n');
-
-                if(choice=='y')
-                    fcopy(tempstr2,tempstr3);
-
-                return;
-
-
-            }
-        }
-        finish=findnext(&dir);
-    }
-}
-
-// convert tab to space
-char *tabconv(char *c,int tabsize)
-{
-    static char buf[MAXLENLINE];
-    int i=0,j=0;
-
-    while(c[i])
-    {
-        if(c[i]=='\t')
-        {
-           do {
-               buf[j++]=' ';
-           } while(j % tabsize);
-        }
-        else
-           buf[j++]=c[i];
-        i++;
-    }
-
-/*
-    if(j>maxline)
-    {
-        buf[maxline-1]='\n';  // trunc
-        j=maxline;
-    }
-*/
-    buf[j]=0;
-
-    return buf;
-}
-
-void tabconv2(textfile_t *f,int start,int stop)
-{
-    static char buf[MAXLENLINE];
-    char *c;
-    int i,j,k;
-
-    for(k=start;k<=stop;k++)
-    {
-        c=f->line[k];
-        i=j=0;
-        while(c[i])
-        {
-            if(c[i]=='\t' && c[i+1]=='\t')
-            {
-               buf[j++]='\t';
-            }
-            else
-               if(c[i]=='\t')
-                   do { buf[j++]=' '; } while(j & 3);
-               else
-                   buf[j++]=c[i];
-            i++;
-        }
-        buf[j]=0;
-        free(f->line[k]);
-        f->line[k]=(char *)malloc(j);
-        strcpy(f->line[k],buf);
-    }
-}
-
-int c;
-
-void initmyfgets( FILE *stream )
-{
-    c = fgetc(stream);    
-}
-  
-// convert any f*** format to the good one
-char *myfgets( char *string, int n, FILE *stream )
-{
-    int i=0;
-    char *s=string;
-    if( c==EOF )
-        return NULL;
-    while( i<n-1 )
-    {
-        if( c==EOF )
-        {
-            *s++='\0';
-            break;
-        }
-        else    
-        if( c==10 )
-        {
-            c = fgetc(stream);
-            if( c==13 )
-                c = fgetc(stream);
-            *s++='\n'; // hope no overflow
-            *s++='\0';                            
-            break;    
-        }
-        else
-        if( c==13 )
-        {
-            c = fgetc(stream);
-            if( c==10 )
-                c = fgetc(stream);
-            *s++='\n'; // hope no overflow
-            *s++='\0';
-            break;    
-        }       
-        else
-        {
-            *s++=c;
-            c = fgetc(stream);
-        }
-    }
-
-    return string;
-}
-
-void LoadTextFile(char *filename,textfile_t *file,int tabsize)
-{
-    int     i;
-    FILE    *f;
-    char    buf[MAXLENLINE];
-    int     convtab=true;
-    static  char *eofline="\n";
-
-    if( strnicmp(filename,"makefile",8)==0 )
-        convtab = false;
-    f=fopen(filename,"rb");
-    if(!f)
-       Quit("Error : file %s don't exist",filename);
-    initmyfgets(f);
-    i=0;
-
-    while(!feof(f))
-    {
-        if(i>=MAXLINE)
-           Quit("File %s too big, more than %d lines\n",filename,MAXLINE);
-        if(!myfgets(buf,MAXLENLINE,f))
-            break;
-        if( convtab )
-            strcpy(buf,tabconv(buf,tabsize));
-        file->line[i]=(char *)malloc(strlen(buf)+1);
-        strcpy(file->line[i],buf);
-        i++;
-    }
-    fclose(f);
-
-    file->lines=i;
-
-    for(;i<MAXLINE;i++)
-        file->line[i]=eofline;
-}
-
-void FreeTextFile(textfile_t *file)
-{
-    int i;
-
-    for(i=0;i<file->lines;i++)
-        free(file->line[i]);
-        
-    file->lines = 0;   
-}
-
-// afficher une partie de fichier en partant de startline jusqu'a stop line
-// affiche les ligne redbeg   jusqua redstop en rouge
-// decale le text vers la droite de offset caractere
-void PrintfBlock(textfile_t *f,int start,int redbeg,int redstop,int stop, int offset)
-{
-    int i,l;
-    char save80,save81,*p;
-
-    if(start<0)
-       start=0;
-
-    for(i=start;i<=stop;i++)
-    {
-        if(i>=redbeg && i<=redstop)
-            textattr(colordiff);
-        else
-            textattr(colortext);
-        if( f->line[i] )
-            l=strlen(f->line[i]);
-        else
-            l=0;
-        if(l<=offset)
-        {
-            cprintf("\n\r");
-            continue;
-        }
-        p=&(f->line[i][offset]);
-        l-=offset;
-        if( l>SCREENWIDTH-1)
-        {
-            save80=p[SCREENWIDTH-2];
-            save81=p[SCREENWIDTH-1];
-            if( p[SCREENWIDTH-2]!='\0')
-                p[SCREENWIDTH-2]='\n';
-            p[SCREENWIDTH-1]='\0';
-            cprintf("%s\r",p);
-            p[SCREENWIDTH-2]=save80;
-            p[SCREENWIDTH-1]=save81;
-        }
-        else
-            cprintf("%s\r",p);
-    }
-}
-
-// copy only the syntax, compress all spacing in 1 space
-char *delspace(char *s)
-{
-static char buf[MAXLENLINE];
-    int i=0,j=0;
-
-    if( !compspace )
-    {
-        // remove just trailing space
-        strcpy(buf, s);
-        for(i = strlen(buf)-1;(buf[i]==' ' || buf[i]=='\n' || buf[i]=='\r') && i>=0;i--)
-            buf[i]='\0';
-        buf[i+1]='\n';
-        buf[i+2]='\0';
-        return buf;
-    }
-
-    while(s[i]!='\n' && s[i])
-    {
-       if(s[i]==' ')
-       {
-           while(s[i]==' ' && s[i]!='\n' && s[i]) { i++; }
-           if(s[i]!='\n' && s[i])
-              buf[j++]=' ';
-       }
-       else
-           buf[j++]=s[i++];
-    }
-    buf[j++]='\n';
-    buf[j]='\0';
-
-    return buf;
-}
-
-int LineCmp(char **a1,char **a2,int linetocmp)
-{
-    char buf[MAXLENLINE];
-    char buf2[MAXLENLINE];
-    int  i;
-
-    for(i=0;i<linetocmp;i++)
-    {
-        strcpy(buf,delspace(a1[i]));
-        strcpy(buf2,delspace(a2[i]));
-        if(strcmp(buf,buf2))
-            return false;
-    }
-    return true;
-}
-
-void Resynchronize(textfile_t *f1,int line1,
-                   textfile_t *f2,int line2,
-                   int *ri,int *rj,int maxlines,int sameline)
-{
-    int  i,j,animcount=0;
-    char anim[]="-\\|/";
-    // must compare line1+i and line2+j with all i and j
-    // insteed do a double for do fist the most probable
-    // therefore try first :
-    //  i = 0 1 0 2 1 0 3 2 1 0 4 ...
-    //  j = 0 0 1 0 1 2 0 1 2 3 0 ...
-    cprintf("Resynchronising %c",anim[animcount]);
-    for(i=1;i<maxlines;i++)
-    {
-        for(j=0;j<=i;j++)
-            if(LineCmp(&f1->line[line1+i-j]
-                      ,&f2->line[line2+j],sameline))
-            {
-                *ri=i-j;
-                *rj=j;
-
-                return;
-            }
-        animcount++;
-        animcount&=0xF;
-        // not to mush printf this slowdown a lot
-        if( (animcount&3)==0 )
-            cprintf("\b%c",anim[animcount>>2]);
-    }
-    Quit("Too mush difference between the files\n");
-}
-
-void cnprintf(char *s,int n)
-{
-    int i;
-    for(i=0;i<n;i++)
-        cputs(s);
-}
-
-void PrintVDiff(char *filename1,textfile_t *f1,int line1,
-                char *filename2,textfile_t *f2,int line2,
-                int i,int j,int l,int offset)
-{
-     int k;
-
-     clrscr();
-
-     textattr(colortitle);
-     k=(SCREENWIDTH-strlen(filename1)-2-15)/2-1;
-     cnprintf("=",k);
-     cprintf(" %s ",filename1);
-     cnprintf("=",k);
-     textattr(colorkeys);
-     cprintf(" [9]  All U[p]");
-     cprintf("\n\r");
-     k=((screenline-2)/2-2-i)/2;
-     PrintfBlock(f1,line1-k+l,line1,line1+i-1,line1+i+k+l,offset);
-
-     textattr(colortitle);
-     k=(SCREENWIDTH-strlen(filename2)-2-15)/2-1;
-     cnprintf("=",k);
-     cprintf(" %s ",filename2);
-     cnprintf("=",k);
-     textattr(colorkeys);
-     cprintf(" [3] All [D]own");
-     cprintf("\n\r");
-     k=((screenline-2)/2-2-j)/2;
-     PrintfBlock(f2,line2-k+l,line2,line2+j-1,line2+j+k+l,offset);
-
-     textattr(colorkeys);
-     cprintf("[<Pg Up><Pg Down>%c%c] [-]%d lines[+] [u]ndo [e]dit [c]ompress space",27,26,sameline);
-     fflush(stdout);
-     textattr(colornormal);
-}
-
-// copy file date of source to dest
-void CopyFileDate(char *dest,char *source)
-{
-    struct stat    fs1;
-    struct utimbuf fs2;
-
-    stat(source,&fs1);
-    fs2.actime  = fs1.st_mtime;
-    fs2.modtime = fs1.st_mtime;
-
-    utime(dest,&fs2);
-}
-
-void CompareFile(char *filename1,char *filename2)
-{
-    int  i,j,choice,k,l;
-    int  line1,line2;
-    FILE *outfile;
-    int  maxlines,always,enterline=0,column=0;
-    int  oneselected=false,twoselected=false;
-
-    LoadTextFile(filename1,&f1,tab1);
-    LoadTextFile(filename2,&f2,tab2);
-    outfile=fopen(tempfilename,"wt");
-    if( !outfile )
-         Quit("Error: No way to open %s\n",tempfilename);
-    line1=0;
-    line2=0;
-    always=0;
-    maxlines=f1.lines+f2.lines+1;
-
-//    if(maxlines<f2.lines+1)
-//        maxlines=f2.lines;
-
-    while(line1<maxlines && line2<maxlines)
-    {
-        if(!LineCmp(&f1.line[line1],&f2.line[line2],1))
-        {   // different
-            // resynchronisation
-            int oldcompspace = compspace;
-            l=0;column=0;
-            Resynchronize(&f1,line1,&f2,line2,&i,&j,maxlines,sameline);
-
-            if( strncmp(f1.line[line1],"// $",4)==0 &&
-                strncmp(f2.line[line2],"// $",4)==0)
-                choice = '9'; // skip stupid cvs changes
-            else
-            {
-                choice = 0;
-              // ask the possibility and write it to the file
-                do {
-                   PrintVDiff(filename1,&f1,line1,
-                              filename2,&f2,line2,i,j,l,column);
-
-                   if(always==0)
-                   {
-                       choice=getch();
-                       if(choice==0) choice=getch()+256;
-                   }
-
-                   switch(choice) {
-                      case KEY_PGUP   : l-=20;break;
-                      case KEY_PGDN   : l+=20;break;
-                      case KEY_CUP    : l--;break;
-                      case KEY_CDOWN  : l++;break;
-                      case KEY_CRIGHT : column++;break;
-                      case KEY_CLEFT  : if( column )
-                                            column--;
-                                        break;
-                      case KEY_HOME   : column=0;break;
-                      case KEY_END    : column+=20;break;
-
-                      case '+' :
-                          sameline++;
-                          Resynchronize(&f1,line1,&f2,line2,&i,&j,maxlines,sameline);
-                          break;
-                      case '-' :
-                          if( sameline>1 ) {
-                              sameline--;
-                              Resynchronize(&f1,line1,&f2,line2,&i,&j,maxlines,sameline);
-                          }
-                          break;
-                      case 'c' :
-                          compspace = !compspace;
-                          Resynchronize(&f1,line1,&f2,line2,&i,&j,maxlines,sameline);
-                          break;
-/*
-                      case 't' :
-                          tabconv2(&f1,line1,line1+i-1);
-                          Resynchronize(&f1,line1,&f2,line2,&i,&j,maxlines,sameline);
-                          break;
-*/
-                      case 'p' : always=1;break;
-                      case 'd' : always=2;break;
-                      case 'u' :
-                          fclose(outfile);
-                          FreeTextFile(&f1);
-                          FreeTextFile(&f2);
-
-                          // remove the temp file
-                          unlink(tempfilename);
-
-                          CompareFile(filename1,filename2);
-
-                          return;
-                      case 'e' :
-                      {
-                          char params[256];
-                          fclose(outfile);
-                          FreeTextFile(&f1);
-                          FreeTextFile(&f2);
-
-                          // remove the temp file
-                          unlink(tempfilename);
-
-                          sprintf(params,"\"%s/%d\" \"%s/%d\"",filename1,line1,filename2,line2);
-
-                          spawnlp(P_WAIT,editor,params,params,NULL);
-                          printf("\n\nHit Enter to continue\n");
-                          getchar();
-
-                          CompareFile(filename1,filename2);
-                          return;
-                      }
-                   }
-
-                } while(choice!='3' && choice!='9' && always==0);
-            }
-            printf("\n");
-
-            if(choice=='9'|| always==1)
-            {
-                int blankline;
-                for(blankline=0;blankline<enterline;blankline++)
-                    fputs("\n",outfile);
-                enterline=0;
-
-                for(k=0;k<i;k++)
-                    fputs(f1.line[line1+k],outfile);
-
-                oneselected=true;
-            }
-            else
-            if(choice=='3'|| always==2)
-            {
-                int blankline;
-                for(blankline=0;blankline<enterline;blankline++)
-                    fputs("\n",outfile);
-                enterline=0;
-
-                for(k=0;k<j;k++)
-                    fputs(f2.line[line2+k],outfile);
-
-                twoselected=true;
-            }
-          // resynchronize
-            line1+=i;
-            line2+=j;
-            compspace = oldcompspace;
-        }
-        // skip "\n" line at the end of the file
-        // it is added for more easy compare at load time
-        if(strcmp(f1.line[line1],"\n")==0)
-            enterline++;
-        else
-        {
-            int i;
-            for(i=0;i<enterline;i++)
-                fputs("\n",outfile);
-            enterline=0;
-            fputs(f1.line[line1],outfile);
-        }
-        line1++;
-        line2++;
-    }
-    fclose(outfile);
-    FreeTextFile(&f1);
-    FreeTextFile(&f2);
-
-    // now overwrite the source file
-    if( !twoselected )
-        // this is not necessarie but in futur version we can use trie directory
-        fcopy(filename1,filename1);
-    else
-    if( !oneselected )
-        fcopy(filename1,filename2);
-    else
-        // twoselected==true && oneselected==true
-        fcopy(filename1,tempfilename);
-
-    // remove the temp file
-    unlink(tempfilename);
-}
-
-void fcopy(char *dest,char *source)
-{
-    FILE *f1,*f2;
-    char buf[4096];
-    int  byteread;
-
-    if( stricmp(dest,source)==0 )
-        return;
-
-    f1=fopen(dest,"wb");
-    f2=fopen(source,"rb");
-
-    while(!feof(f2))
-    {
-        byteread=fread(&buf,1,4096,f2);
-        if(byteread!=fwrite(buf,1,byteread,f1))
-            Quit("Copying %s to %s : Write Error (disk full ?)\n",source,dest);
-    }
-
-    fclose(f1);
-    fclose(f2);
-
-    // copy too the file date
-    CopyFileDate(dest,source);
-}
-
-// recurisve remove dir
-void dirunlink(char *dirname)
-{
-    struct ffblk dir;
-    char   tempstr[255];
-    int    finish;
-
-    strcpy(tempstr,dirname);
-    strcat(tempstr,"\\*.*");
-
-    // remove all dirs and file inside
-    finish=findfirst(tempstr,&dir,0);
-    while(!finish)
-    {
-        char tempstr2[255];
-
-        strcpy(tempstr2,dirname);
-        strcat(tempstr2,"\\");
-        strcat(tempstr2,dir.ff_name);
-
-        if(dir.ff_attrib & FA_DIREC)
-        {
-            if( dir.ff_name[0]!='.' )
-                dirunlink( tempstr2 );
-        }
-        else
-            unlink( tempstr2 );
-
-        finish=findnext(&dir);
-    }
-
-    // remove dir (it is now empty)
-    unlink( dirname );
-}
-
-void copydir(char *destdirname,char *srcdirname)
-{
-    struct ffblk dir;
-    char   tempstr[255];
-    int    finish;
-
-    mkdir(destdirname, S_IWUSR);
-
-    strcpy(tempstr,srcdirname);
-    strcat(tempstr,"\\*.*");
-
-    // remove all dirs and file inside
-    finish=findfirst(tempstr,&dir,0);
-    while(!finish)
-    {
-        char tempstr2[255],tempstr3[255];
-
-        strcpy(tempstr2,srcdirname);
-        strcat(tempstr2,"\\");
-        strcat(tempstr2,dir.ff_name);
-
-        strcpy(tempstr3,destdirname);
-        strcat(tempstr3,"\\");
-        strcat(tempstr3,dir.ff_name);
-
-        if(dir.ff_attrib & FA_DIREC)
-        {
-            if( dir.ff_name[0]!='.' )
-                copydir( tempstr3, tempstr2 );
-        }
-        else
-            fcopy( tempstr3, tempstr2 );
-
-        finish=findnext(&dir);
-    }
-
-}
diff --git a/tools/keys.h b/tools/keys.h
deleted file mode 100644
index a03ae5acc..000000000
--- a/tools/keys.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-//  KEYS.H - header file.
-//
-//  Codes des touches tel que renvoy‚s par getch(), +256 si ‚tendus.
-//
-//  Author:  Denis F.
-//  Date:    June 16 1997.
-//
-
-// codes des touches (getch()) ajout‚ de 256 s'il s'agit d'un code ‚tendu.
-
-#define KEY_BACKSPACE 8
-#define KEY_TAB       9
-#define KEY_ENTER     13
-#define KEY_ESCAPE    27
-#define KEY_SPACE     32
-#define KEY_F1        315
-#define KEY_F2        316
-#define KEY_F3        317
-#define KEY_F4        318
-#define KEY_F5        319
-#define KEY_F10       324
-#define KEY_HOME      327
-#define KEY_END       335
-#define KEY_CUP       328
-#define KEY_PGUP      329
-#define KEY_CLEFT     331
-#define KEY_CRIGHT    333
-#define KEY_CDOWN     336
-#define KEY_PGDN      337
-#define KEY_INSERT    338
-#define KEY_DELETE    339
diff --git a/tools/libwad/Makefile b/tools/libwad/Makefile
deleted file mode 100644
index 3c93a2547..000000000
--- a/tools/libwad/Makefile
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env make -f
-
-## libwad: Doom WAD format interface library.
-## Copyright (C) 2011 by Callum Dickinson.
-#
-## 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.
-
-# Library name.
-LIBNAME = wad
-# Library version.
-LIBVERM = 1
-LIBVER	= $(LIBVERM).0.0
-
-# Library default options.
-CPPFLAGS	+= -DLIBNAME="$(LIBNAME)" -DLIBVER="$(LIBVER)"
-
-# Source files and directory.
-SRCDIR	= src
-SRC	= $(SRCDIR)/wad.c $(SRCDIR)/lump.c $(SRCDIR)/wad_static.c
-
-# Compiled files directory.
-BINDIR	= bin
-INCDIR	= include
-
-#
-## Variables that shouldn't be edited unless
-## you know what you are doing start here.
-#
-
-# Makefile pretty text output variables.
-PRAR     	= AR      
-PRCC     	= CC      
-PRINSTALL	= INSTALL 
-PRCLEAN  	= CLEAN   
-
-# Library name prefix.
-LIBPFX	= lib
-
-# Library installation directory.
-PREFIX	?= /usr/local
-LIBDIR	:= $(PREFIX)/lib
-INCLUDE := $(PREFIX)/include
-
-# Variables created during compilation.
-OBJ	= $(SRC:.c=.o)
-DEP	= $(BINDIR)/$(LIBPFX)$(LIBNAME).d
-ifdef MINGW
-DEFN	= $(LIBNAME).def
-LIBN	= $(LIBPFX)$(LIBNAME).lib
-BIN	= $(BINDIR)/$(LIBPFX)$(LIBNAME)-$(LIBVERM).dll
-else
-SONAME	= $(LIBPFX)$(LIBNAME).so.$(LIBVERM)
-BIN	= $(BINDIR)/$(LIBPFX)$(LIBNAME).so.$(LIBVER)
-endif
-STABIN	= $(BINDIR)/$(LIBPFX)$(LIBNAME).a
-
-# Compilation programs.
-ECHO	:= echo
-RM	:= $(RM) -r
-FIND	:= find
-GREP	:= grep
-INSTALL	:= install -m 644
-MKDIR	:= mkdir -p
-FOR	:= for
-SED	:= sed
-AR	:= $(CROSS_COMPILE)$(AR)
-CC	:= $(CROSS_COMPILE)$(CC)
-
-# Shell programs.
-SHECHO   	:= $(ECHO)
-SHFIND   	:= $(FIND)
-SHGREP   	:= $(GREP)
-SHINSTALL	:= $(INSTALL)
-SHSED    	:= $(SED)
-SHCC     	:= $(CC)
-
-# Quiet compiling programs during pretty text output.
-ECHO    	:= @$(ECHO)
-ifndef V
-RM      	:= @$(RM)
-LDCONFIG	:= @$(LDCONFIG)
-FIND    	:= @$(FIND)
-GREP    	:= @$(GREP)
-INSTALL 	:= @$(INSTALL)
-MKDIR   	:= @$(MKDIR)
-FOR     	:= @$(FOR)
-SED     	:= @$(SED)
-AR      	:= @$(AR)
-CC      	:= @$(CC)
-endif
-
-LIBS	= $(BIN) $(STABIN)
-HEADERS	= $(shell $(SHFIND) $(CURDIR) | $(SHGREP) -e "$(INCDIR)/.*.h" | $(SHGREP) -v ".svn" | $(SHSED) "s:$(CURDIR)/::")
-
-# Compiler default flags.
-ifndef MINGW
-CFLAGS	+= -fPIC
-LDFLAGS	+= -fPIC
-endif
-ifdef DEBUG
-CFLAGS	+= -g $(M5) -O0 -Wall
-endif
-
-# Linker flags.
-LDFLAGS	+= -shared
-ifdef MINGW
-LDFLAGS += -Wl,--output-def,$(DEFN),--out-implib,$(LIBN)
-else
-LDFLAGS += -Wl,-soname,$(SONAME)
-endif
-
-#
-## Makefile targets.
-#
-
-# all is dependent on $(BIN) to be complete
-all: $(DEP) $(BIN) $(STABIN)
-
-# $(EXE) is dependent on all of the files in $(OBJ) to exist
-$(DEP): $(SRC)
-ifndef V
-	$(ECHO) "  $(PRCC)$@"
-endif
-	-$(MKDIR) $(BINDIR) > /dev/null 2>&1
-	-$(RM) $@
-	$(FOR) f in $(SRC); do \
-		$(SHCC) $(CPPFLAGS) $(CFLAGS) -MM $$f >> $@; \
-	done
--include $@
-
-%.o: %.c
-ifndef V
-	$(ECHO) "  $(PRCC)$@"
-endif
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
-
-$(BIN): $(OBJ)
-ifndef V
-	$(ECHO) "  $(PRCC)$@"
-endif
-	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIB)
-
-$(STABIN): $(OBJ)
-ifndef V
-	$(ECHO) "  $(PRAR)$@"
-endif
-	$(AR) rcs $@ $(OBJ)
-
-install: all install-libs install-headers
-
-install-libs:
-	$(MKDIR) $(LIBDIR)
-ifndef V
-	$(FOR) f in $(LIBS); do \
-		$(SHECHO) "  $(PRINSTALL)$$f"; \
-		$(SHINSTALL) $$f $(LIBDIR); \
-	done
-else
-	$(FOR) f in $(LIBS); do \
-		$(SHINSTALL) $$f $(LIBDIR); \
-	done
-endif
-	$(LDCONFIG)
-
-install-headers:
-	$(MKDIR) $(INCLUDE)
-ifndef V
-	$(FOR) f in $(HEADERS); do \
-		$(SHECHO) "  $(PRINSTALL)$$f"; \
-		$(SHINSTALL) $$f $(INCLUDE); \
-	done
-else
-	$(FOR) f in $(HEADERS); do \
-		$(SHINSTALL) $$f $(INCLUDE); \
-	done
-endif
-
-clean:
-ifndef V
-	$(ECHO) "  $(PRCLEAN)$(OBJ) $(LIBS)"
-endif
-	-$(RM) $(OBJ) $(LIBS)
-
-distclean:
-ifndef V
-	$(ECHO) "  $(PRCLEAN)$(BINDIR)"
-endif
-	-$(RM) $(BINDIR)
-
-
-.PHONY : all install install-libs install-headers clean
diff --git a/tools/libwad/examples/wadexample/Makefile b/tools/libwad/examples/wadexample/Makefile
deleted file mode 100644
index 773733b06..000000000
--- a/tools/libwad/examples/wadexample/Makefile
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env make -f
-
-## wadexample: libwad example program.
-## Copyright (C) 2011 by Callum Dickinson.
-#
-## 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.
-
-# Program name.
-PRONAME = wadexample
-# Program version.
-PROVER	= 1.0.0
-
-# Program default options.
-CPPFLAGS	+= -DPRONAME="$(PRONAME)" -DPROVER="$(PROVER)"
-
-# Source files and directory.
-SRC	= wadexample.c
-
-# Required libraries.
-LIB	= -lwad
-
-#
-## Variables that shouldn't be edited unless
-## you know what you are doing start here.
-#
-
-# Makefile pretty text output variables.
-PRCC	= CC      
-PRINSTALL=INSTALL 
-PRCLEAN	= CLEAN   
-
-# Library name prefix.
-LIBPFX	= lib
-
-# Library installation directory.
-PREFIX	?= /usr/local
-LIBDIR	:= $(PREFIX)/lib
-INCLUDE := $(PREFIX)/include
-
-# Variables created during compilation.
-OBJ	= $(SRC:.c=.o)
-DEP	= $(PRONAME).d
-ifdef MINGW
-BIN	= $(PRONAME).exe
-else
-BIN	= $(PRONAME)
-endif
-
-# Compilation programs.
-ECHO	:= echo
-RM	:= $(RM) -r
-FIND	:= find
-GREP	:= grep
-INSTALLX:= install -m 755
-MKDIR	:= mkdir -p
-FOR	:= for
-SED	:= sed
-CC	:= $(CROSS_COMPILE)$(CC)
-
-# Shell programs.
-SHECHO	:= $(ECHO)
-SHFIND	:= $(FIND)
-SHGREP	:= $(GREP)
-SHINSTALL:= $(INSTALL)
-SHSED	:= $(SED)
-SHCC	:= $(CC)
-
-# Quiet compiling programs during pretty text output.
-NULL	:= /dev/null 2>&1
-ECHO	:= @$(ECHO)
-ifndef V
-RM	:= @$(RM)
-LDCONFIG:= @$(LDCONFIG)
-FIND	:= @$(FIND)
-GREP	:= @$(GREP)
-INSTALL	:= @$(INSTALL)
-MKDIR	:= @$(MKDIR)
-FOR	:= @$(FOR)
-SED	:= @$(SED)
-CC	:= @$(CC)
-endif
-
-# Compiler default flags.
-ifdef DEBUG
-CFLAGS	+= -g -O0 -Wall -W
-endif
-
-# Linker flags.
-#LDFLAGS +=
-
-#
-## Makefile targets.
-#
-
-all: $(DEP) $(BIN)
-
-$(DEP): $(SRC)
-ifndef V
-	$(ECHO) "  $(PRCC)$@"
-endif
-	-$(RM) $@
-	$(FOR) f in $(SRC); do \
-		$(SHCC) $(CPPFLAGS) $(CFLAGS) -MM $$f >> $@; \
-	done
--include $@
-
-%.o: %.c
-ifndef V
-	$(ECHO) "  $(PRCC)$@"
-endif
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
-
-$(BIN): $(OBJ)
-ifndef V
-	$(ECHO) "  $(PRCC)$@"
-endif
-	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIB)
-
-install: all
-ifndef V
-	$(SHECHO) "  $(PRINSTALL)$(BIN)"
-endif
-	$(INSTALLX) $(BIN) $(INSTALLDIR)
-
-clean:
-ifndef V
-	$(ECHO) "  $(PRCLEAN)$(OBJ) $(DEP)"
-endif
-	-$(RM) $(OBJ) $(DEP)
-
-.PHONY : all install clean
diff --git a/tools/libwad/examples/wadexample/wadexample.c b/tools/libwad/examples/wadexample/wadexample.c
deleted file mode 100644
index 5e35a1e4d..000000000
--- a/tools/libwad/examples/wadexample/wadexample.c
+++ /dev/null
@@ -1,64 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// wadexample: libwad example program.
-// Copyright (C) 2011 by Callum Dickinson.
-//
-// 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 wadconv.c
-/// \brief Converts wads made for version 2.0 to 2.1.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "wad.h"
-
-int main(int argc, char **argv)
-{
-	wad_uint32_t i;
-
-	wad_t *w;
-	lump_t *l;
-
-	if (argc < 2)
-	{
-		puts("Usage: wadexample [filename] [..]");
-		puts("Example: example wadfile.wad wadfile2.wad");
-		return EXIT_FAILURE;
-	}
-
-	// Open the WAD files.
-	puts("Opening WADs...");
-	for (i = 1; i < (unsigned)argc; i++)
-	{
-		if (!WAD_OpenWAD(argv[i]))
-		{
-			printf("Error opening WAD %s: %s\n", argv[i], WAD_Error());
-			return 1;
-		}
-	}
-
-	for (i = 0; i < wad_numwads; i = WAD_WADLoopAdvance(i))
-	{
-		w = WAD_WADByNum(i);
-		printf("List of lumps inside wad %s:\n", WAD_BaseName(w->filename));
-		for (l = w->lumps; l; l = l->next)
-			printf("Lump #%i: %s\n", l->num, l->name);
-	}
-
-	puts("Closing WADs...");
-	for (i = 0; i < wad_numwads; i++)
-		WAD_CloseWADByNum(i);
-
-	return EXIT_SUCCESS;
-}
diff --git a/tools/libwad/include/wad.h b/tools/libwad/include/wad.h
deleted file mode 100644
index 298a478b7..000000000
--- a/tools/libwad/include/wad.h
+++ /dev/null
@@ -1,227 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// libwad: Doom WAD format interface library.
-// Copyright (C) 2011 by Callum Dickinson.
-//
-// 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 wad.h
-/// \brief WAD file manipulation library.
-
-#ifndef __WAD_H__
-#define __WAD_H__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-//
-// Exact-width integer types.
-//
-#ifdef _MSC_VER
-typedef signed __int8 wad_int8_t;
-typedef unsigned __int8 wad_uint8_t;
-
-typedef __int16 wad_int16_t;
-typedef unsigned __int16 wad_uint16_t;
-
-typedef __int32 wad_int32_t;
-typedef unsigned __int32 wad_uint32_t;
-
-typedef __int64 wad_int64_t;
-typedef unsigned __int64 wad_uint64_t;
-
-// Older Visual C++ headers don't have the Win64-compatible typedefs...
-#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
-#define DWORD_PTR DWORD
-#endif
-
-#if ((_MSC_VER <= 1200) && (!defined(PDWORD_PTR)))
-#define PDWORD_PTR PDWORD
-#endif
-
-#elif defined (_arch_dreamcast)
-#include <arch/types.h>
-
-typedef signed char wad_int8_t;
-typedef unsigned char wad_uint8_t;
-
-typedef int16 wad_int16_t;
-typedef uint16 wad_uint16_t;
-
-typedef int wad_int32_t;
-typedef unsigned int wad_uint32_t;
-
-typedef int64 wad_int64_t;
-typedef uint64 wad_uint64_t;
-#elif defined (__DJGPP__)
-typedef signed char wad_int8_t;
-typedef unsigned char wad_uint8_t;
-
-typedef signed short int wad_int16_t;
-typedef unsigned short int wad_uint16_t;
-
-typedef signed long wad_int32_t;
-typedef unsigned long wad_uint32_t;
-
-typedef signed long long wad_int64_t;
-typedef unsigned long long wad_uint64_t;
-#else
-#define __STDC_LIMIT_MACROS
-#include <stdint.h>
-
-typedef int8_t wad_int8_t;
-typedef uint8_t wad_uint8_t;
-
-typedef int16_t wad_int16_t;
-typedef uint16_t wad_uint16_t;
-
-typedef int32_t wad_int32_t;
-typedef uint32_t wad_uint32_t;
-
-typedef int64_t wad_int64_t;
-typedef uint64_t wad_uint64_t;
-#endif
-
-typedef enum
-{
-	false,
-	true
-} wad_boolean_t;
-
-typedef struct
-{
-	char id[4];		// The WAD header's 4-character ID.
-	wad_uint32_t numlumps;	// The number of lumps the WAD has.
-	wad_uint32_t lumpdir;	// The pointer to the lump directory.
-} wadheader_t;
-
-typedef struct wad_s
-{
-	char *filename;		// The filename of the open WAD.
-
-	wadheader_t *header;	// The WAD's header.
-	wad_boolean_t compressed;
-
-	struct lump_s *lumps;	// The WAD's lumps buffer.
-} wad_t;
-
-typedef struct lump_s
-{
-	wad_t *wad;		// The WAD the lump belongs to.
-
-	char name[9];		// The name of the lump.
-
-	wad_uint64_t disksize;	// The size of the lump on disk.
-	size_t size;		// The real (uncompressed) size of the lump.
-
-	wad_boolean_t compressed;
-
-	void *data;		// The actual lump data.
-
-	wad_uint32_t num;	// The lump number in the WAD.
-	struct lump_s *prev; 	// The previous node in the tree.
-	struct lump_s *next;	// The next node in the tree.
-} lump_t;
-
-// a raw entry of the wad directory
-typedef struct
-{
-	wad_uint32_t position;		// The position of the lump in the WAD file.
-	wad_uint32_t size;		// Size of the lump.
-	char name[8];			// The lump's name.
-} lumpdir_t;
-
-//
-// wad_static.c
-// Static file for internal libwad operations.
-//
-extern char *WAD_Error(void);
-extern char *WAD_BaseName(char *path);
-extern char *WAD_VA(const char *format, ...);
-
-extern inline wad_int16_t WAD_INT16_Endianness(wad_int16_t x);
-extern inline wad_int32_t WAD_INT32_Endianness(wad_int32_t x);
-
-//
-// wad.c
-// WAD interface functionality.
-//
-extern wad_uint32_t wad_numwads;
-
-extern wad_uint32_t WAD_WADLoopAdvance(wad_uint32_t i);
-
-extern wad_t *WAD_WADByNum(wad_uint16_t num);
-extern wad_t *WAD_WADByFileName(const char *filename);
-
-extern wad_t *WAD_OpenWAD(const char *filename);
-
-extern wad_int32_t WAD_SaveWAD(wad_t *wad);
-extern inline wad_int32_t WAD_SaveWADByNum(wad_uint16_t num);
-extern inline wad_int32_t WAD_SaveWADByFileName(const char *filename);
-
-extern inline wad_int32_t WAD_SaveCloseWAD(wad_t *wad);
-extern inline wad_int32_t WAD_SaveCloseWADByNum(wad_uint16_t num);
-extern inline wad_int32_t WAD_SaveCloseWADByFileName(const char *filename);
-
-extern void WAD_CloseWAD(wad_t *wad);
-extern inline void WAD_CloseWADByNum(wad_uint16_t num);
-extern inline void WAD_CloseWADByFileName(const char *filename);
-
-//
-// lump.c
-// Lump interface functionality.
-//
-extern char *WAD_LumpNameFromFileName(char *path);
-extern lump_t *WAD_LumpInWADByNum(wad_t *wad, wad_uint32_t num);
-extern lump_t *WAD_LumpInWADByName(wad_t *wad, const char *name);
-extern lump_t *WAD_LumpByName(const char *name);
-
-extern inline wad_uint32_t WAD_LumpNum(lump_t *lump);
-extern inline wad_uint32_t WAD_LumpNumInWADByName(wad_t *wad, const char *name);
-extern inline wad_uint32_t WAD_LumpNumByName(const char *name);
-
-extern inline size_t WAD_LumpSize(lump_t *lump);
-extern inline size_t WAD_LumpSizeInWADByName(wad_t *wad, const char *name);
-extern inline size_t WAD_LumpSizeByName(const char *name);
-
-extern lump_t *WAD_AddLump(wad_t *wad, lump_t *destlump, const char *name, const char *filename);
-extern inline lump_t *WAD_AddLumpInWADByNum(wad_t *wad, wad_uint32_t num, const char *name, const char *filename);
-extern inline lump_t *WAD_AddLumpInWADByName(wad_t *wad, const char *destname, const char *name, const char *filename);
-extern inline lump_t *WAD_AddLumpByName(const char *destname, const char *name, const char *filename);
-
-extern lump_t *WAD_CacheLump(lump_t *lump);
-extern inline lump_t *WAD_CacheLumpInWADByNum(wad_t *wad, wad_uint32_t num);
-extern inline lump_t *WAD_CacheLumpInWADByName(wad_t *wad, const char *name);
-extern inline lump_t *WAD_CacheLumpByName(const char *name);
-
-extern lump_t *WAD_MoveLump(lump_t *lump, lump_t *destlump);
-extern inline lump_t *WAD_MoveLumpInWADByNum(wad_t *wad, wad_uint32_t num, wad_t *destwad, wad_uint32_t destnum);
-extern inline lump_t *WAD_MoveLumpInWADByName(wad_t *wad, const char *name, wad_t *destwad, const char *destname);
-extern inline lump_t *WAD_MoveLumpByName(const char *name, const char *destname);
-
-extern void WAD_UncacheLump(lump_t *lump);
-extern inline void WAD_UncacheLumpInWADByNum(wad_t *wad, wad_uint32_t num);
-extern inline void WAD_UncacheLumpInWADByName(wad_t *wad, const char *name);
-extern inline void WAD_UncacheLumpByName(const char *name);
-
-extern void WAD_RemoveLump(lump_t *lump);
-extern inline void WAD_RemoveLumpInWADByNum(wad_t *wad, wad_uint32_t num);
-extern inline void WAD_RemoveLumpInWADByName(wad_t *wad, const char *name);
-extern inline void WAD_RemoveLumpByName(const char *name);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif // __WAD_H__
diff --git a/tools/libwad/src/lump.c b/tools/libwad/src/lump.c
deleted file mode 100644
index a1f4c97fc..000000000
--- a/tools/libwad/src/lump.c
+++ /dev/null
@@ -1,392 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// libwad: Doom WAD format interface library.
-// Copyright (C) 2011 by Callum Dickinson.
-//
-// 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 lump.c
-/// \brief Lump interface functionality.
-
-#include "wad_static.h"
-
-//
-// Create a lump name from the file name
-// of a lump. Used for when no name for
-// a lump was given.
-//
-char *WAD_LumpNameFromFileName(char *path)
-{
-	wad_int32_t i;
-	char *name, *tempname, *file = WAD_BaseName(path);
-
-	if (!file)
-		return NULL;
-
-	//
-	// Process the filename for a suitable lump name.
-	//
-	// Get rid of any hidden file period.
-	if (file[0] == '.')
-	{
-		if (!(tempname = malloc(sizeof(*file) * strlen(&file[1]))))
-		{
-			free(file);
-			return NULL;
-		}
-		strcpy(tempname, &file[1]);
-		free(file);
-	}
-	else
-		tempname = file;
-
-	// Get rid of any extensions.
-	for (i = 0; tempname[i] != '.' && tempname[i] != '\0'; i++);
-
-	// Then, take the first eight characters of
-	// the resulting filename to get the lump name.
-	if (i > 8)
-		i = 8;
-
-	if (!(name = malloc(sizeof(*name) * (i+1))))
-	{
-		free(tempname);
-		return NULL;
-	}
-
-	strncpy(name, tempname, i);
-	name[i+1] = '\0';
-
-	//
-	// Done processing lump name.
-	//
-	free(tempname);
-	return name;
-}
-
-lump_t *WAD_LumpInWADByNum(wad_t *wad, wad_uint32_t num)
-{
-	lump_t *lump;
-
-	if (!wad || !num)
-		return NULL;
-
-	for (lump = wad->lumps; lump; lump = lump->next)
-		if (num == lump->num)
-			return lump;
-
-	return NULL;
-}
-
-lump_t *WAD_LumpInWADByName(wad_t *wad, const char *name)
-{
-	lump_t *lump;
-
-	if (!wad || !name)
-		return NULL;
-
-	for (lump = wad->lumps; lump; lump = lump->next)
-		if (!strcmp(name, lump->name))
-			return lump;
-
-	return NULL;
-}
-
-lump_t *WAD_LumpByName(const char *name)
-{
-	wad_uint32_t i;
-	lump_t *lump;
-
-	for (i = 0; i < wad_numwads; i = WAD_WADLoopAdvance(i))
-		if ((lump = WAD_LumpInWADByName(WAD_WADByNum(i), name)))
-			return lump;
-
-	return NULL;
-}
-
-inline wad_uint32_t WAD_LumpNum(lump_t *lump)
-{
-	return lump->num;
-}
-
-inline wad_uint32_t WAD_LumpNumInWADByName(wad_t *wad, const char *name)
-{
-	return WAD_LumpNum(WAD_LumpInWADByName(wad, name));
-}
-
-inline wad_uint32_t WAD_LumpNumByName(const char *name)
-{
-	return WAD_LumpNum(WAD_LumpByName(name));
-}
-
-inline size_t WAD_LumpSize(lump_t *lump)
-{
-	return lump->size;
-}
-
-inline size_t WAD_LumpSizeInWADByName(wad_t *wad, const char *name)
-{
-	return WAD_LumpSize(WAD_LumpInWADByName(wad, name));
-}
-
-inline size_t WAD_LumpSizeByName(const char *name)
-{
-	return WAD_LumpSize(WAD_LumpByName(name));
-}
-
-static void WAD_AddLumpToTree(lump_t *lump, lump_t *destlump)
-{
-	lump_t *l;
-
-	if (destlump)
-	{
-		lump->wad = destlump->wad;
-		lump->num = destlump->num;
-		for (l = destlump; l; l = l->next)
-			l->num++;
-		if (destlump->prev)
-			destlump->prev->next = lump;
-		lump->prev = destlump->prev;
-		destlump->prev = lump;
-		lump->next = destlump;
-	}
-	else
-	{
-		for (l = lump->wad->lumps; l; l = l->next)
-			if (!l->next)
-				break;
-		lump->num = lump->wad->header->numlumps;
-		l->next = lump;
-		lump->prev = l;
-		lump->next = NULL;
-	}
-	lump->wad->header->numlumps++;
-}
-
-lump_t *WAD_AddLump(wad_t *wad, lump_t *destlump, const char *name, const char *filename)
-{
-	// The open lump file.
-	FILE *file = NULL;
-	// Pointer to the lump.
-	lump_t *lump;
-	// Lump structure.
-	wad_uint64_t disksize;	// lump->disksize
-	size_t size;		// lump->size
-	wad_boolean_t compressed;// lump->compressed
-	void *data;		// lump->data
-
-	if (!wad)
-		return NULL;
-
-	if (!name && !filename)
-		return NULL;
-
-	if (filename)
-	{
-		if (!(file = fopen(filename, "rb")))
-			return NULL;
-
-		fseek(file, 0, SEEK_END);
-		disksize = size = (unsigned)ftell(file);
-		compressed = false;
-
-
-		if (!(data = malloc(size)))
-		{
-			fclose(file);
-			return NULL;
-		}
-
-		fseek(file, 0, SEEK_SET);
-		if (fread(data, disksize, 1, file) < 1)
-			return NULL;
-		fclose(file);
-	}
-	else
-	{
-		disksize = size = 0;
-		compressed = false;
-		data = NULL;
-	}
-
-
-	if (!(lump = malloc(sizeof(*lump))))
-	{
-		WAD_FreeMemory(NULL, NULL, NULL, lump, NULL);
-		return NULL;
-	}
-
-	lump->wad = wad;
-	if (!strcpy(lump->name, (name) ? name : WAD_LumpNameFromFileName((char *)filename)))
-	{
-		WAD_FreeMemory(NULL, NULL, NULL, lump, NULL);
-		return NULL;
-	}
-	lump->disksize = disksize;
-	lump->size = size;
-	lump->compressed = compressed;
-
-	lump->data = data;
-
-	WAD_AddLumpToTree(lump, destlump);
-
-	return lump;
-}
-
-inline lump_t *WAD_AddLumpInWADByNum(wad_t *wad, wad_uint32_t num, const char *name, const char *filename)
-{
-	return WAD_AddLump(wad, WAD_LumpInWADByNum(wad, num), name, filename);
-}
-
-inline lump_t *WAD_AddLumpInWADByName(wad_t *wad, const char *destname, const char *name, const char *filename)
-{
-	return WAD_AddLump(wad, WAD_LumpInWADByName(wad, destname), name, filename);
-}
-
-inline lump_t *WAD_AddLumpByName(const char *destname, const char *name, const char *filename)
-{
-	lump_t *l = WAD_LumpByName(destname);
-	return WAD_AddLump(l->wad, l, name, filename);
-}
-
-lump_t *WAD_CacheLump(lump_t *lump)
-{
-	return lump; // TODO: WAD_CacheLump, dynamic lump loading.
-}
-
-inline lump_t *WAD_CacheLumpInWADByNum(wad_t *wad, wad_uint32_t num)
-{
-	return WAD_CacheLump(WAD_LumpInWADByNum(wad, num));
-}
-
-inline lump_t *WAD_CacheLumpInWADByName(wad_t *wad, const char *name)
-{
-	return WAD_CacheLump(WAD_LumpInWADByName(wad, name));
-}
-
-inline lump_t *WAD_CacheLumpByName(const char *name)
-{
-	return WAD_CacheLump(WAD_LumpByName(name));
-}
-
-lump_t *WAD_MoveLump(lump_t *lump, lump_t *destlump)
-{
-	lump_t *l;
-
-	if (!destlump)
-		return NULL;
-
-	//
-	// Link the previous and next nodes in the WAD tree with each other.
-	//
-	if (lump->next)
-	{
-		lump->next->prev = lump->prev;
-		for (l = lump->next; l; l = l->next)
-			l->num--;
-	}
-	if (lump->prev)
-		lump->prev->next = lump->next;
-	lump->wad->header->numlumps--;
-
-	//
-	WAD_AddLumpToTree(lump, destlump);
-
-	return lump;
-}
-
-inline lump_t *WAD_MoveLumpInWADByNum(wad_t *wad, wad_uint32_t num, wad_t *destwad, wad_uint32_t destnum)
-{
-	return WAD_MoveLump(WAD_LumpInWADByNum(wad, num), WAD_LumpInWADByNum(destwad, destnum));
-}
-
-inline lump_t *WAD_MoveLumpInWADByName(wad_t *wad, const char *name, wad_t *destwad, const char *destname)
-{
-	return WAD_MoveLump(WAD_LumpInWADByName(wad, name), WAD_LumpInWADByName(destwad, destname));
-}
-
-inline lump_t *WAD_MoveLumpByName(const char *name, const char *destname)
-{
-	return WAD_MoveLump(WAD_LumpByName(name), WAD_LumpByName(destname));
-}
-
-void WAD_UncacheLump(lump_t *lump)
-{
-	(void)lump; // TODO: WAD_UncacheLump, dynamic lump loading.
-}
-
-inline void WAD_UncacheLumpInWADByNum(wad_t *wad, wad_uint32_t num)
-{
-	WAD_UncacheLump(WAD_LumpInWADByNum(wad, num));
-}
-
-inline void WAD_UncacheLumpInWADByName(wad_t *wad, const char *name)
-{
-	WAD_UncacheLump(WAD_LumpInWADByName(wad, name));
-}
-
-inline void WAD_UncacheLumpByName(const char *name)
-{
-	WAD_UncacheLump(WAD_LumpByName(name));
-}
-
-void WAD_RemoveLump(lump_t *lump)
-{
-	lump_t *l;
-
-	if (!lump)
-		return;
-
-	//
-	// Link the previous and next nodes in the WAD tree with each other.
-	//
-	lump->next->prev = lump->prev;
-	lump->prev->next = lump->next;
-
-	//
-	// Modify the lump numbers for all the subsequent lumps,
-	// and the total lumps in the WAD.
-	//
-	lump->wad->header->numlumps--;
-
-	if (lump->num == 0)
-		lump->wad->lumps = lump->next;
-
-	for (l = lump->next; l; l = l->next)
-		l->num--;
-
-	//
-	// While, at the same time, blanking the references
-	// to these nodes so they don't get removed.
-	//
-	lump->next = NULL;
-
-	//
-	// Free this lump's memory.
-	//
-	WAD_FreeMemory(NULL, NULL, NULL, lump, NULL);
-}
-
-inline void WAD_RemoveLumpInWADByNum(wad_t *wad, wad_uint32_t num)
-{
-	WAD_RemoveLump(WAD_LumpInWADByNum(wad, num));
-}
-
-inline void WAD_RemoveLumpInWADByName(wad_t *wad, const char *name)
-{
-	WAD_RemoveLump(WAD_LumpInWADByName(wad, name));
-}
-
-inline void WAD_RemoveLumpByName(const char *name)
-{
-	WAD_RemoveLump(WAD_LumpByName(name));
-}
diff --git a/tools/libwad/src/wad.c b/tools/libwad/src/wad.c
deleted file mode 100644
index ab8099b47..000000000
--- a/tools/libwad/src/wad.c
+++ /dev/null
@@ -1,412 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// libwad: Doom WAD format interface library.
-// Copyright (C) 2011 by Callum Dickinson.
-//
-// 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 wad.c
-/// \brief WAD interface functionality.
-
-#include "wad_static.h"
-
-//
-// Offset for the first lump's data is always 12 bytes.
-//
-#define LUMPOFFSET 12
-
-//
-// Maximum of wad files used at the same time.
-// (There is a max of simultaneous open files anyway, and this should be plenty.)
-//
-#define MAX_WADFILES 48
-
-wad_t *wads[MAX_WADFILES];
-wad_uint32_t wad_numwads;
-
-wad_uint32_t wad_oldnumwads;
-wad_uint32_t wad_removednum;
-
-static inline void WAD_ChangeWADNum(wad_int32_t i, wad_t *wad)
-{
-	wads[i] = wad;
-}
-
-static inline void WAD_CacheWAD(wad_t *wad)
-{
-	WAD_ChangeWADNum(wad_numwads, wad);
-	wad_oldnumwads = wad_numwads;
-	wad_numwads++;
-}
-
-static void WAD_UncacheWAD(wad_t *wad)
-{
-	wad_uint32_t i;
-
-	for (i = 0; i < wad_numwads; i++)
-		if (WAD_WADByNum(i) == wad)
-			break;
-
-	WAD_ChangeWADNum(i, NULL);
-	wad_removednum = i;
-
-	for (; i < wad_numwads; i++)
-	{
-		if (WAD_WADByNum(i+1))
-		{
-			WAD_ChangeWADNum(i, WAD_WADByNum(i+1));
-			WAD_ChangeWADNum(i+1, NULL);
-		}
-	}
-
-	wad_oldnumwads = wad_numwads;
-	wad_numwads--;
-}
-
-wad_uint32_t WAD_WADLoopAdvance(wad_uint32_t i)
-{
-	wad_uint32_t o;
-
-	o = wad_oldnumwads;
-	wad_oldnumwads = wad_numwads;
-
-	return (o > wad_numwads && i <= wad_removednum) ?  i : i + 1;
-}
-
-wad_t *WAD_WADByNum(wad_uint16_t num)
-{
-	return (wads[num]) ? (wad_t *)wads[num] : NULL;
-}
-
-wad_t *WAD_WADByFileName(const char *filename)
-{
-	wad_uint32_t i;
-	wad_t *w;
-
-	for (i = 0; i < wad_numwads; i = WAD_WADLoopAdvance(i))
-	{
-		w = WAD_WADByNum(i);
-		if (!strcmp(filename, w->filename))
-			return w;
-	}
-
-	return NULL;
-}
-
-//
-// Allocate a wadfile, setup the lumpinfo (directory) and
-// lumpcache, add the wadfile to the current active wadfiles
-//
-// 1: Reached the maximum WAD number.
-// 2: Cannot open the file.
-// 3: Cannot read the WAD file's header.
-// 4: Invalid WAD ID.
-// 5: WAD's lump directory is corrupt.
-// 6: Corrupt compressed WAD.
-//
-wad_t *WAD_OpenWAD(const char *filename)
-{
-	size_t i;
-	// Pointer to the WAD.
-	wad_t *wad = NULL;
-	// WAD file structure information.
-	// wad->filename is the function's argument.
-	FILE *file;			// wad->file
-	wadheader_t *header;		// wad->header
-	lump_t *l, *lumps = NULL;	// wad->lumps
-	// Temporary lump information.
-	wad_uint64_t position;
-	lumpdir_t *lumpdir;
-	lump_t *ln = NULL;
-
-	//
-	// Check if the limit of maximum WAD files has been
-	// reached or not.
-	//
-	if (wad_numwads >= MAX_WADFILES)
-		return NULL;
-
-	//
-	// Open the WAD file.
-	//
-	if (!(file = fopen(filename, "rb")))
-		return NULL;
-
-	//
-	// Read the WAD file's header.
-	//
-	header = malloc(sizeof(*header));
-	if (fread(header, 1, sizeof(*header), file) < sizeof(*header))
-		return NULL;
-
-	// Check if the ID is valid.
-	if (memcmp(header->id, "IWAD", 4) && memcmp(header->id, "PWAD", 4) && memcmp(header->id, "SDLL", 4))
-	{
-		WAD_FreeMemory(file, header, NULL, NULL, NULL);
-		return NULL;
-	}
-
-	// Check the rest of the header for type.
-	header->numlumps = WAD_INT32_Endianness(header->numlumps);
-	header->lumpdir = WAD_INT32_Endianness(header->lumpdir);
-
-	//
-	// Read the WAD file's lump directory.
-	//
-	i = header->numlumps * sizeof(*lumpdir);
-	lumpdir = malloc(i);
-
-	if (fseek(file, header->lumpdir, SEEK_SET) < 0 || fread(lumpdir, i, 1, file) < 1)
-	{
-		WAD_FreeMemory(file, header, lumpdir, NULL, NULL);
-		return NULL;
-	}
-
-	//
-	// Fill lump information structure.
-	//
-	for (i = 0; i < header->numlumps; i++, lumpdir++)
-	{
-		if (!(l = malloc(sizeof(*l))))
-		{
-			WAD_FreeMemory(file, header, lumpdir, lumps, NULL);
-			return NULL;
-		}
-
-		position = WAD_INT32_Endianness(lumpdir->position);
-
-		strncpy(l->name, lumpdir->name, 8);
-		l->size = l->disksize = WAD_INT32_Endianness(lumpdir->size);
-		l->compressed = false; // TODO: Compressed WAD support.
-
-		if (l->disksize)
-		{
-			fseek(file, position, SEEK_SET);
-			if (!(l->data = malloc(l->disksize)) || fread(l->data, l->disksize, 1, file) < 1)
-			{
-				WAD_FreeMemory(file, header, lumpdir, lumps, NULL);
-
-				if (!l->data)
-					return NULL;
-				else
-					return NULL;
-			}
-		}
-
-		l->num = i;
-		l->next = NULL;
-		if (!lumps)
-		{
-			l->prev = NULL;
-			ln = lumps = l;
-		}
-		else
-		{
-			l->prev = ln;
-			ln = ln->next = l;
-		}
-	}
-	//free(lumpdir);
-
-	//
-	// Allocate and fill WAD entry.
-	//
-	if (!(wad = malloc(sizeof(*wad))))
-	{
-		WAD_FreeMemory(file, header, NULL, lumps, NULL);
-		return NULL;
-	}
-	wad->filename = (char *)filename;
-
-	wad->header = header;
-	wad->compressed = false;
-
-	wad->lumps = lumps;
-
-	for (l = wad->lumps; l; l = l->next)
-		l->wad = wad;
-
-	fclose(file);
-
-	//
-	// Add the WAD to the wadfiles buffer and wad_numwads number.
-	//
-	WAD_CacheWAD(wad);
-
-	//
-	// Done, loaded the WAD file.
-	//
-	return wad;
-}
-
-// 1: Invalid wad number.
-// 2: Unable to open file for writing.
-// 3: Unable to write wad ID to the header.
-// 4: Unable to write number of lumps to the header.
-// 5: Unable to write temporary data to the header.
-// 6: Unable to write lump data.
-// 7: Unable to write position of lump data.
-// 8: Unable to Write size of lump data.
-// 9: Unable to write lump name.
-// 9: Unable to write directory position.
-wad_int32_t WAD_SaveWAD(wad_t *wad)
-{
-	lump_t *l;
-	FILE *file;
-	char *newfilename;
-	wad_int64_t diroffset, lumpoffset;
-
-	if (!wad)
-		return 1;
-
-	newfilename = WAD_VA("%s%s", wad->filename, ".bak");
-
-	remove(newfilename);
-	rename(wad->filename, newfilename);
-
-	if (!(file = fopen(wad->filename, "wb")))
-		return 2;
-
-	//
-	// Write four-character WAD ID.
-	//
-	if(fwrite(wad->header->id, 4, 1, file) < 1)
-		return 3;
-
-	//
-	// Write number of lumps.
-	//
-	if (fwrite(&wad->header->numlumps, 4, 1, file) < 1)
-		return 4;
-
-	//
-	// Offset of directory is not known yet. For now, write number of lumps
-	// again, just to fill the space.
-	//
-	if (fwrite(&wad->header->numlumps, 4, 1, file) < 1)
-		return 5;
-
-	//
-	// Loop through lump list, writing lump data.
-	//
-	for (l = wad->lumps; l; l = l->next)
-	{
-		// Don't write anything for the head of the lump list or for lumps of
-		// zero length.
-		if (!l->data)
-			continue;
-
-		// Write the data.
-		if (fwrite(l->data, l->disksize, 1, file) < 1)
-			return 6;
-	}
-
-	//
-	// Current position is where directory will start.
-	//
-	diroffset = ftell(file);
-
-	//
-	// Pointer to the offset for the first lump's data.
-	//
-	lumpoffset = LUMPOFFSET;
-
-	//
-	// Loop through lump list again, this time writing directory entries.
-	//
-	for (l = wad->lumps; l; l = l->next)
-	{
-		// Write position of lump data.
-		if (fwrite(&lumpoffset, 4, 1, file) < 1)
-			return 7;
-
-		// Write size of lump data.
-		if (fwrite(&(l->disksize), 4, 1, file) < 1)
-			return 8;
-
-		// Write lump name.
-		if (fwrite(&(l->name), 8, 1, file) < 1)
-			return 9;
-
-		// Increment lumpoffset variable as appropriate.
-		lumpoffset += l->disksize;
-	}
-
-	//
-	// Go back to header and write the proper directory position.
-	//
-	fseek(file, 8, SEEK_SET);
-	if (fwrite(&diroffset, 4, 1, file) < 1)
-		return 10;
-
-	//
-	// Done, saved the WAD file.
-	//
-	return 0;
-}
-
-inline wad_int32_t WAD_SaveWADByNum(wad_uint16_t num)
-{
-	return WAD_SaveWAD(WAD_WADByNum(num));
-}
-
-inline wad_int32_t WAD_SaveWADByFileName(const char *filename)
-{
-	return WAD_SaveWAD(WAD_WADByFileName(filename));
-}
-
-inline wad_int32_t WAD_SaveCloseWAD(wad_t *wad)
-{
-	wad_int32_t ret;
-
-	if (!(ret = WAD_SaveWAD(wad)))
-		return ret;
-
-	WAD_CloseWAD(wad);
-	return ret;
-}
-
-inline wad_int32_t WAD_SaveCloseWADByNum(wad_uint16_t num)
-{
-	return WAD_SaveCloseWAD(WAD_WADByNum(num));
-}
-
-inline wad_int32_t WAD_SaveCloseWADByFileName(const char *filename)
-{
-	return WAD_SaveCloseWAD(WAD_WADByFileName(filename));
-}
-
-void WAD_CloseWAD(wad_t *wad)
-{
-	if (!wad)
-		return;
-
-	//
-	// Free memory used by the WAD.
-	//
-	WAD_FreeMemory(NULL, wad->header, NULL, wad->lumps, wad);
-
-	//
-	// Remove references to the WAD.
-	//
-	WAD_UncacheWAD(wad);
-}
-
-inline void WAD_CloseWADByNum(wad_uint16_t num)
-{
-	WAD_CloseWAD(WAD_WADByNum(num));
-}
-
-inline void WAD_CloseWADByFileName(const char *name)
-{
-	WAD_CloseWAD(WAD_WADByFileName(name));
-}
diff --git a/tools/libwad/src/wad_static.c b/tools/libwad/src/wad_static.c
deleted file mode 100644
index dd631a5ba..000000000
--- a/tools/libwad/src/wad_static.c
+++ /dev/null
@@ -1,116 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// libwad: Doom WAD format interface library.
-// Copyright (C) 2011 by Callum Dickinson.
-//
-// 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 wad_static.c
-/// \brief Static functions for internal libwad operations.
-
-#include "wad_static.h"
-
-#define WAD_MAXERROR 1024
-static char wad_error[WAD_MAXERROR];
-
-void WAD_ErrorSet(const char *text)
-{
-	strncpy(wad_error, text, WAD_MAXERROR);
-	wad_error[WAD_MAXERROR] = '\0';
-}
-
-inline void WAD_FreeMemory(FILE *file, wadheader_t *header, void *lumpdir, lump_t *lumps, wad_t *wad)
-{
-	lump_t *l, *ln = NULL;
-
-	if (file)
-		fclose(file);
-	if (header)
-		free(header);
-	if (lumpdir)
-		free(lumpdir);
-
-	if (lumps)
-	{
-		for (l = lumps; l; l = ln)
-		{
-			ln = l->next;
-			free(l->data);
-			free(l);
-		}
-	}
-
-	if (wad)
-	{
-		if (wad->filename)
-			free(wad->filename);
-
-		free(wad);
-	}
-}
-
-char *WAD_Error(void)
-{
-	return wad_error;
-}
-
-char *WAD_BaseName(char *path)
-{
-	wad_int32_t i;
-
-	//
-	// Check if there is no text to check.
-	//
-	if (!path || path[0] == '\0')
-		return NULL;
-
-	//
-	// Find the buffer entry where the actual filename begins.
-	//
-	for (i = strlen(path) - 1; i >= 0 && path[i] != '/'; i--);
-
-	return (i >= 0) ? &path[i+1] : path;
-}
-
-char *WAD_VA(const char *format, ...)
-{
-	va_list argptr;
-	static char string[1024];
-
-	va_start(argptr, format);
-	vsprintf(string, format, argptr);
-	va_end(argptr);
-
-	return string;
-}
-
-inline wad_int16_t WAD_INT16_Endianness(wad_int16_t x)
-{
-#ifdef _BIG_ENDIAN
-	return ((wad_int16_t)((((wad_uint16_t)(x) & (wad_uint16_t)0x00ffU) << 8) | (((wad_uint16_t)(x) & (wad_uint16_t)0xff00U) >> 8)));
-#else
-	return (wad_int16_t)x;
-#endif
-}
-
-inline wad_int32_t WAD_INT32_Endianness(wad_int32_t x)
-{
-#ifdef _BIG_ENDIAN
-	return ((wad_int32_t)(\
-	(((wad_uint32_t)(x) & (wad_uint32_t)0x000000ffUL) << 24) |\
-	(((wad_uint32_t)(x) & (wad_uint32_t)0x0000ff00UL) <<  8) |\
-	(((wad_uint32_t)(x) & (wad_uint32_t)0x00ff0000UL) >>  8) |\
-	(((wad_uint32_t)(x) & (wad_uint32_t)0xff000000UL) >> 24)));
-#else
-	return (wad_int32_t)x;
-#endif
-}
diff --git a/tools/makefile b/tools/makefile
deleted file mode 100644
index f4b377a26..000000000
--- a/tools/makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-
-default:    dircomp2.c
-	gcc -O6 -mpentium -Wall -s dircomp2.c -o dircomp2.exe
-
-asm:
-	gcc -O6 -mpentium -Wall -g dircomp2.c -o tmp.exe
-	objdump  -dS tmp.exe --debugging --no-show-raw-insn > dircomp2.s
-	del tmp.exe
-
-h2d:	 h2d.c
-	gcc -O6 -mpentium -Wall -s h2d.c -o h2d.exe
-
-dckconv:     dckconv.c
-	gcc -O6 -mpentium -Wall -s dckconv.c -o dckconv.exe
-
-dckconv2:     dckconv2.c
-	gcc -O6 -mpentium -Wall -s dckconv2.c -o dckconv2.exe
-
-dckcomp:     dckcomp.c
-	gcc -O6 -mpentium -Wall -s dckcomp.c -o dckcomp.exe
-
-convert:    convert.c
-	gcc -O6 -mpentium -Wall -s convert.c -o convert.exe
-	
diff --git a/tools/masterserver/.gitignore b/tools/masterserver/.gitignore
deleted file mode 100644
index 9f45745a3..000000000
--- a/tools/masterserver/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/client
-/server
-/server.log
-/*.o
diff --git a/tools/masterserver/Makefile b/tools/masterserver/Makefile
deleted file mode 100644
index 7e66ab210..000000000
--- a/tools/masterserver/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (C) 2000 by DooM Legacy Team.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# DESCRIPTION:
-#   Makefile for DooM Legacy Master Server
-#   Created on 06/23/2000 by Thierry Van Elsuwe
-#   e-mail: hurdler@newdoom.com
-#
-#-----------------------------------------------------------------------------
-
-PORT=28900
-#PORT=7896
-
-#*******************************************************************#
-
-CCFILES=common.cpp ipcs.cpp crypt.cpp md5.cpp
-Main_CCFILES=server.cpp #client.cpp
-
-#******************************************************************#
-
-MYSQL_CONFIG?= mysql_config
-MYSQL_CFLAGS?=$(shell $(MYSQL_CONFIG) --cflags)
-MYSQL_LIBS?=$(shell $(MYSQL_CONFIG) --libs)
-
-CXXFLAGS+=-Wall -O3 -Wextra
-ifdef MINGW
-LIBS+=-lws2_32
-else
-LIBS+=-lm
-endif
-
-CXXFLAGS+=$(MYSQL_CFLAGS)
-LIBS+=$(MYSQL_LIBS)
-
-ifdef DEBUG
-CXXFLAGS+=-g -D__DEBUG__
-endif
-
-SRCS=$(CCFILES) $(Main_CCFILES)
-OFILES=$(CCFILES:.cpp=.o)
-Main_OFILES=$(Main_CCFILES:.cpp=.o)
-EXEFILE=$(Main_CCFILES:.cpp=)
-
-#####################################################################
-
-.SUFFIXES:	.cpp .h
-
-default:	init $(EXEFILE) end
-
-init:
-		@echo
-		@echo "Compiling options:"
-		@echo "  CXX     : $(CXX)"
-		@echo "  LDFLAGS : $(LDFLAGS)"
-		@echo "  LIBS    : $(LIBS)"
-		@echo "  CXXFLAGS: $(CXXFLAGS)"
-		@echo
-		@echo "Files:"
-		@echo "  SRCS    : $(SRCS)"
-		@echo "  OFILES  : $(OFILES) $(Main_OFILES)"
-		@echo "  EXEFILE : $(EXEFILE)"
-		@echo
-
-end:
-		@echo
-		@echo "*** Makefile ended successfully  ***"
-		@echo
-
-#####################################################################
-
-$(EXEFILE): $(OFILES) $(Main_OFILES)
-		@echo Linking ...
-		@$(CXX) $(LDFLAGS) $(OFILES) $@.o -o $@ $(LIBS)
-ifndef CYGWIN
-ifndef MINGW
-		@chmod 755 $@
-endif
-endif
-		@echo File $@ has been created
-
-#####################################################################
-
-.cpp.o:
-		@echo Compiling $< -\> $@
-		@$(CXX) $(CXXFLAGS) $(INCS) -c $< -o $@
-
-#####################################################################
-
-debug:		debug_
-debug_:
-		@make "CXXFLAGS = $(CXXFLAGS) -D__DEBUG__"
-		@echo
-
-clean:		clean_
-clean_:
-		@echo
-		@echo Removing obejcts files, executable files and eventually core file...
-		@rm -f $(OFILES) $(Main_OFILES) $(EXEFILE) core
-		@echo
-
-realclean:	clean
-		@echo Removing backup files...
-		@rm -f *~ *.bak
-		@echo
-
-depend:		dep
-dep:
-		@echo
-		@echo Make dependencies...
-		@makedepend  -- $(CXXFLAGS) -- $(Main_CCFILES) $(CCFILES) 2> /dev/null
-		@rm -f Makefile.bak
-		@echo
-
-BAKFILE = ../SRB2MasterServer
-backup:		bak
-bak:		clean
-		@echo Copy files to $(BAKFILE).tgz...
-		@tar cvf $(BAKFILE).tar * > /dev/null
-		@gzip $(BAKFILE).tar
-		@mv $(BAKFILE).tar.gz $(BAKFILE).tgz
-		@echo Removing backup files...
-		@rm -f *~ *.bak
-		@echo
-
-#mrproper:      dep clean default
-mrproper:       clean default
-
-install:	mrproper
-		@echo "Launching the server, port $(PORT)..."
-		@./server $(PORT)
-		@echo
diff --git a/tools/masterserver/Master.dsp b/tools/masterserver/Master.dsp
deleted file mode 100644
index 6bb0c13ed..000000000
--- a/tools/masterserver/Master.dsp
+++ /dev/null
@@ -1,230 +0,0 @@
-# Microsoft Developer Studio Project File - Name="MasterServer" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=MasterServer - Win32 Client Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Master.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Master.mak" CFG="MasterServer - Win32 Client Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "MasterServer - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MasterServer - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MasterServer - Win32 Client Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "MasterServer - Win32 Client Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "MasterServer - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../bin/VC/Release/MasterServer"
-# PROP Intermediate_Dir "../../objs/VC/Release/MasterServer"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W4 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /D "_POSIX_" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/VC/Release/MasterServer.exe"
-
-!ELSEIF  "$(CFG)" == "MasterServer - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../bin/VC/Debug/MasterServer"
-# PROP Intermediate_Dir "../../objs/VC/Debug/MasterServer"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "_WIN32" /D "__DEBUG__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /D "_POSIX_" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/VC/Debug/MasterServer.exe" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "MasterServer - Win32 Client Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "MasterServer___Win32_Client_Debug"
-# PROP BASE Intermediate_Dir "MasterServer___Win32_Client_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../../bin/VC/Debug/MasterClient"
-# PROP Intermediate_Dir "../../objs/VC/Debug/MasterClient"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W4 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WIN32" /D "__STDC__" /YX /FD /GZ /c
-# ADD CPP /nologo /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "_WIN32" /D "__DEBUG__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /D "_POSIX_" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/VC/Debug/MasterServer.exe" /pdbtype:sept
-# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/VC/Debug/MasterClient.exe" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "MasterServer - Win32 Client Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "MasterServer___Win32_Client_Release"
-# PROP BASE Intermediate_Dir "MasterServer___Win32_Client_Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../../bin/VC/Release/MasterClient"
-# PROP Intermediate_Dir "../../objs/VC/Release/MasterClient"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W4 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /D "_POSIX_" /FR /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/VC/Release/MasterServer.exe"
-# ADD LINK32 kernel32.lib wsock32.lib /nologo /subsystem:console /machine:I386 /out:"../../bin/VC/Release/MasterClient.exe"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "MasterServer - Win32 Release"
-# Name "MasterServer - Win32 Debug"
-# Name "MasterServer - Win32 Client Debug"
-# Name "MasterServer - Win32 Client Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\client.cpp
-
-!IF  "$(CFG)" == "MasterServer - Win32 Release"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "MasterServer - Win32 Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "MasterServer - Win32 Client Debug"
-
-# PROP BASE Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "MasterServer - Win32 Client Release"
-
-# PROP BASE Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\crypt.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\ipcs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.cpp
-
-!IF  "$(CFG)" == "MasterServer - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "MasterServer - Win32 Debug"
-
-!ELSEIF  "$(CFG)" == "MasterServer - Win32 Client Debug"
-
-# PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "MasterServer - Win32 Client Release"
-
-# PROP Exclude_From_Build 1
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\srvlist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\stats.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ipcs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\srvlist.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\stats.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
diff --git a/tools/masterserver/Master.sln b/tools/masterserver/Master.sln
deleted file mode 100644
index 129814c76..000000000
--- a/tools/masterserver/Master.sln
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MasterServer", "Master.vcproj", "{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Client Debug|Win32 = Client Debug|Win32
-		Client Debug|x64 = Client Debug|x64
-		Client Release|Win32 = Client Release|Win32
-		Client Release|x64 = Client Release|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Client Debug|Win32.ActiveCfg = Client Debug|Win32
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Client Debug|Win32.Build.0 = Client Debug|Win32
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Client Debug|x64.ActiveCfg = Client Debug|x64
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Client Debug|x64.Build.0 = Client Debug|x64
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Client Release|Win32.ActiveCfg = Client Release|Win32
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Client Release|Win32.Build.0 = Client Release|Win32
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Client Release|x64.ActiveCfg = Client Release|x64
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Client Release|x64.Build.0 = Client Release|x64
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Debug|Win32.Build.0 = Debug|Win32
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Debug|x64.ActiveCfg = Debug|x64
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Debug|x64.Build.0 = Debug|x64
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Release|Win32.ActiveCfg = Release|Win32
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Release|Win32.Build.0 = Release|Win32
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Release|x64.ActiveCfg = Release|x64
-		{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/tools/masterserver/Master.vcproj b/tools/masterserver/Master.vcproj
deleted file mode 100644
index 364094dd4..000000000
--- a/tools/masterserver/Master.vcproj
+++ /dev/null
@@ -1,1063 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="MasterServer"
-	ProjectGUID="{6AEBAD84-BCB1-4302-A453-7AAD1DF006DA}"
-	RootNamespace="MasterServer"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Client Release|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../bin/VC/Release/MasterClient/Master.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__STDC__;_POSIX_;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\../../objs/VC/Release/MasterClient/Master.pch"
-				AssemblerListingLocation=".\../../objs/VC/Release/MasterClient/"
-				ObjectFile=".\../../objs/VC/Release/MasterClient/"
-				ProgramDataBaseFileName=".\../../objs/VC/Release/MasterClient/"
-				BrowseInformation="1"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib"
-				OutputFile=".\bin\VC\$(PlatformName)\$(ConfigurationName)\MasterServer.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\../../bin/VC/Release/MasterClient/MasterClient.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\../../bin/VC/Release/MasterClient/Master.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Client Debug|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../bin/VC/Debug/MasterClient/Master.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_WIN32;__DEBUG__;WIN32;_CONSOLE;__STDC__;_POSIX_;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\../../objs/VC/Debug/MasterClient/Master.pch"
-				AssemblerListingLocation=".\../../objs/VC/Debug/MasterClient/"
-				ObjectFile=".\../../objs/VC/Debug/MasterClient/"
-				ProgramDataBaseFileName=".\../../objs/VC/Debug/MasterClient/"
-				BrowseInformation="1"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib"
-				OutputFile=".\bin\VC\$(PlatformName)\$(ConfigurationName)\MasterServer.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../bin/VC/Debug/MasterClient/MasterClient.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\../../bin/VC/Debug/MasterClient/Master.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../bin/VC/Debug/MasterServer/Master.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_WIN32;__DEBUG__;WIN32;_CONSOLE;__STDC__;_POSIX_;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\Master.pch"
-				AssemblerListingLocation=".\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				ObjectFile=".\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				ProgramDataBaseFileName=".\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				BrowseInformation="1"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib libmysql.lib"
-				OutputFile=".\bin\VC\$(PlatformName)\$(ConfigurationName)\MasterServer.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\bin/VC/Debug/MasterServer/MasterServer.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="./bin/VC/Debug/MasterServer/Master.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\../../bin/VC/Release/MasterServer/Master.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__STDC__;_POSIX_;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\Master.pch"
-				AssemblerListingLocation=".\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				ObjectFile=".\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				ProgramDataBaseFileName=".\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				BrowseInformation="1"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib libmysql.lib"
-				OutputFile=".\bin\VC\$(PlatformName)\$(ConfigurationName)\MasterServer.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile="./bin/VC/Release/MasterServer/MasterServer.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile="./bin/VC/Release/MasterServer/Master.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Client Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../bin/VC/Release/MasterClient/Master.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__STDC__;_POSIX_;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\../../objs/VC/Release/MasterClient/Master.pch"
-				AssemblerListingLocation=".\../../objs/VC/Release/MasterClient/"
-				ObjectFile=".\../../objs/VC/Release/MasterClient/"
-				ProgramDataBaseFileName=".\../../objs/VC/Release/MasterClient/"
-				BrowseInformation="1"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib"
-				OutputFile=".\bin\VC\$(PlatformName)\$(ConfigurationName)\MasterServer.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\../../bin/VC/Release/MasterClient/MasterClient.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\../../bin/VC/Release/MasterClient/Master.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Client Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../bin/VC/Debug/MasterClient/Master.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_WIN32;__DEBUG__;WIN32;_CONSOLE;__STDC__;_POSIX_;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\../../objs/VC/Debug/MasterClient/Master.pch"
-				AssemblerListingLocation=".\../../objs/VC/Debug/MasterClient/"
-				ObjectFile=".\../../objs/VC/Debug/MasterClient/"
-				ProgramDataBaseFileName=".\../../objs/VC/Debug/MasterClient/"
-				BrowseInformation="1"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib"
-				OutputFile=".\bin\VC\$(PlatformName)\$(ConfigurationName)\MasterServer.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../bin/VC/Debug/MasterClient/MasterClient.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\../../bin/VC/Debug/MasterClient/Master.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../bin/VC/Debug/MasterServer/Master.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;_WIN32;__DEBUG__;WIN32;_CONSOLE;__STDC__;_POSIX_;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\..\..\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\Master.pch"
-				AssemblerListingLocation=".\..\..\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				ObjectFile=".\..\..\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				ProgramDataBaseFileName=".\..\..\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				BrowseInformation="1"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib libmysql.lib"
-				OutputFile=".\bin\VC\$(PlatformName)\$(ConfigurationName)\MasterServer.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\../../bin/VC/Debug/MasterServer/MasterServer.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\../../bin/VC/Debug/MasterServer/Master.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-				TypeLibraryName=".\../../bin/VC/Release/MasterServer/Master.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__STDC__;_POSIX_;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\..\..\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\Master.pch"
-				AssemblerListingLocation=".\..\..\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				ObjectFile=".\..\..\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				ProgramDataBaseFileName=".\..\..\objs\VC9\$(PlatformName)\$(ConfigurationName)\MasterServer\"
-				BrowseInformation="1"
-				WarningLevel="4"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="wsock32.lib libmysql.lib"
-				OutputFile=".\bin\VC\$(PlatformName)\$(ConfigurationName)\MasterServer.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\../../bin/VC/Release/MasterServer/MasterServer.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\../../bin/VC/Release/MasterServer/Master.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="common.cpp"
-				>
-				<FileConfiguration
-					Name="Client Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="crypt.cpp"
-				>
-				<FileConfiguration
-					Name="Client Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="ipcs.cpp"
-				>
-				<FileConfiguration
-					Name="Client Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\md5.cpp"
-				>
-			</File>
-			<File
-				RelativePath="server.cpp"
-				>
-				<FileConfiguration
-					Name="Client Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Client Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="common.h"
-				>
-			</File>
-			<File
-				RelativePath="ipcs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\md5.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/tools/masterserver/MasterClient.dev b/tools/masterserver/MasterClient.dev
deleted file mode 100644
index 035bb0bff..000000000
--- a/tools/masterserver/MasterClient.dev
+++ /dev/null
@@ -1,159 +0,0 @@
-[Project]
-FileName=MasterClient.dev
-Name=MasterClient
-UnitCount=7
-Type=1
-Ver=1
-ObjFiles=
-Includes=
-Libs=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Compiler=-Wall_@@_
-CppCompiler=-Wall_@@_
-Linker=-lwsock32_@@_
-IsCpp=1
-Icon=
-ExeOutput=..\..\bin
-ObjectOutput=..\..\objs\MasterClient
-OverrideOutput=0
-OverrideOutputName=MasterServer.exe
-HostApplication=
-Folders=Client,Common
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000010001001001010
-
-[Unit1]
-FileName=common.cpp
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=1
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=ipcs.cpp
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=2
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit7]
-FileName=Makefile
-CompileCpp=1
-Folder=
-Compile=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit8]
-FileName=stats.h
-Folder=Server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-CompileCpp=1
-
-[Unit9]
-FileName=common.h
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=Makefile
-CompileCpp=1
-Folder=
-Compile=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit12]
-FileName=srvlist.h
-CompileCpp=1
-Folder=Server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-AutoIncBuildNr=0
-
-[Unit3]
-FileName=crypt.cpp
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=4
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=client.cpp
-CompileCpp=1
-Folder=Client
-Compile=1
-Link=1
-Priority=7
-OverrideBuildCmd=0
-BuildCmd=$(CPP) -c client.cpp -o ../../../objs/MasterServer/client.o $(CXXFLAGS)
-
-[Unit5]
-FileName=common.h
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=ipcs.h
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/tools/masterserver/MasterServer.dev b/tools/masterserver/MasterServer.dev
deleted file mode 100644
index bc089ccd5..000000000
--- a/tools/masterserver/MasterServer.dev
+++ /dev/null
@@ -1,169 +0,0 @@
-[Project]
-FileName=MasterServer.dev
-Name=MasterServer
-UnitCount=11
-Type=1
-Ver=1
-ObjFiles=
-Includes=
-Libs=
-PrivateResource=
-ResourceIncludes=
-MakeIncludes=
-Compiler=-Wall_@@_-DDEBUG_@@_
-CppCompiler=-Wall_@@_-DDEBUG_@@_
-Linker=-lwsock32_@@_-lmysql_@@_
-IsCpp=1
-Icon=
-ExeOutput=..\..\bin
-ObjectOutput=..\..\objs\MasterServer
-OverrideOutput=0
-OverrideOutputName=MasterServer.exe
-HostApplication=
-Folders=Common,Server
-CommandLine=28900
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=0
-CompilerSettings=0000000011001001001010
-
-[Unit1]
-FileName=common.cpp
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=1
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit2]
-FileName=ipcs.cpp
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=2
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit3]
-FileName=srvlist.cpp
-CompileCpp=1
-Folder=Server
-Compile=1
-Link=1
-Priority=3
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit4]
-FileName=crypt.cpp
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=4
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit5]
-FileName=stats.cpp
-CompileCpp=1
-Folder=Server
-Compile=1
-Link=1
-Priority=5
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit6]
-FileName=server.cpp
-CompileCpp=1
-Folder=Server
-Compile=1
-Link=1
-Priority=6
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit8]
-FileName=common.h
-Folder=Common
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-CompileCpp=1
-
-[Unit9]
-FileName=ipcs.h
-CompileCpp=1
-Folder=Common
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit10]
-FileName=Makefile
-CompileCpp=1
-Folder=
-Compile=0
-Link=0
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit11]
-FileName=srvlist.h
-CompileCpp=1
-Folder=Server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[VersionInfo]
-Major=0
-Minor=1
-Release=1
-Build=1
-LanguageID=1033
-CharsetID=1252
-CompanyName=
-FileVersion=
-FileDescription=Developed using the Dev-C++ IDE
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=
-AutoIncBuildNr=0
-
-[Unit7]
-FileName=stats.h
-CompileCpp=1
-Folder=Server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
-[Unit13]
-FileName=LIVE_MySQL.h
-CompileCpp=1
-Folder=Server
-Compile=1
-Link=1
-Priority=1000
-OverrideBuildCmd=0
-BuildCmd=
-
diff --git a/tools/masterserver/client.cpp b/tools/masterserver/client.cpp
deleted file mode 100644
index 8eba3f1a2..000000000
--- a/tools/masterserver/client.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-
-#include <time.h>
-#include <string.h>
-#include "ipcs.h"
-#include "common.h"
-
-//=============================================================================
-
-static CClientSocket client_socket;
-//static msg_t msg;
-FILE *logfile;
-
-//=============================================================================
-
-static msg_t *getData(int argc, char *argv[])
-{
-	static msg_t msg;
-	msg_server_t *info = (msg_server_t *)msg.buffer;
-
-#if defined (_WIN32)
-	strcpy(info->header.buffer, "");
-#else
-	strcpy(info->header.buffer, getpass("Enter password: "));
-#endif
-
-	// default values if one of the param is not entered
-	strcpy(info->ip,       "88.86.106.169");
-	strcpy(info->port,     "5029");
-	strcpy(info->name,     "Cueball's Dedicated Server");
-	strcpy(info->version,  "1.09.4");
-	msg.type = ADD_PSERVER_MSG;
-	msg.length = sizeof (msg_server_t);
-
-	for (int i = 0; i < argc; i++)
-	{
-		// first: extra parameters (must be after all -param)
-		if (!strcasecmp(argv[i], "get"))
-		{
-			msg.type = GET_SERVER_MSG;
-			msg.length = 0;
-		}
-		else if (!strcasecmp(argv[i], "log"))
-		{
-			msg.type = GET_LOGFILE_MSG;
-			msg.length = sizeof (msg_server_t);
-		}
-		else if (!strcasecmp(argv[i], "erase"))
-		{
-			msg.type = ERASE_LOGFILE_MSG;
-			msg.length = sizeof (msg_server_t);
-		}
-		else if (!strcasecmp(argv[i], "remove"))
-		{
-			msg.type = REMOVE_PSERVER_MSG;
-			msg.length = sizeof (msg_server_t);
-		}
-
-		if (i >= argc-1)
-			continue;
-
-		// second: parameter requiring extra parameters
-		if (strcasecmp(argv[i], "-ip") == 0)
-			strcpy(info->ip, argv[i+1]);
-		else if (strcasecmp(argv[i], "-port") == 0)
-			strcpy(info->port, argv[i+1]);
-		else if (strcasecmp(argv[i], "-hostname") == 0)
-			strcpy(info->name, argv[i+1]);
-		else if (strcasecmp(argv[i], "-version") == 0)
-			strcpy(info->version, argv[i+1]);
-		else if (strcasecmp(argv[i], "-pass") == 0)
-			strcpy(info->header.buffer, argv[i+1]);
-	}
-	return &msg;
-}
-
-int main(int argc, char *argv[])
-{
-	if (argc == 2)
-	{
-		printf("encrypt: %s\n", pCrypt(argv[1], "04"));
-		return 0;
-	}
-	else if (argc > 2)
-	{
-		if (client_socket.connect(argv[1], argv[2]) < 0)
-		{
-			conPrintf(RED, "Connect failed.\n");
-			return -1;
-		}
-
-		msg_t *msg = getData(argc, argv);
-
-		if (client_socket.write(msg) < 0)
-		{
-			dbgPrintf(RED, "Write failed.\n");
-			return -1;
-		}
-
-		switch (ntohl(msg->type))
-		{
-		case GET_SERVER_MSG:
-		case GET_LOGFILE_MSG:
-			while (client_socket.read(msg) >= 0)
-			{
-				if (ntohl(msg->length) == 0)
-					break;
-				printf("%s", msg->buffer);
-			}
-			break;
-
-		case REMOVE_PSERVER_MSG:
-		default:
-			break;
-		}
-	}
-	return 0;
-}
diff --git a/tools/masterserver/common.cpp b/tools/masterserver/common.cpp
deleted file mode 100644
index b9795bd0f..000000000
--- a/tools/masterserver/common.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-
-#include <time.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include "common.h"
-
-// ================================== GLOBALS =================================
-
-static const char *fatal_error_msg[NUM_FATAL_ERROR] =
-{
-	"Error: signal()",
-	"Error: select()",
-	"Error: read()",
-	"Error: write()",
-};
-
-// used by xxxPrintf() functions as temporary variable
-static char str[1024] ="";
-static va_list arglist;
-#ifdef _WIN32
-static size_t len = 0;
-static HANDLE co = INVALID_HANDLE_VALUE;
-static DWORD bytesWritten = 0;
-static CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo;
-#endif
-
-// ================================= FUNCTIONS ================================
-
-/*
- * clearScreen():
- */
-void clearScreen()
-{
-#ifdef _WIN32
-#else
-	printf("\033[0m \033[2J \033[0;0H");
-#endif
-}
-
-/*
- * fatalError():
- */
-void fatalError(fatal_error_t num)
-{
-	clearScreen();
-	printf("\n");
-	perror(fatal_error_msg[num]);
-	printf("\n");
-	exit(-1);
-}
-
-
-/*
- * dbgPrintf():
- */
-#ifdef _WIN32
-void dbgPrintf(DWORDLONG col, const char *lpFmt, ...)
-#else
-void dbgPrintf(const char *col, const char *lpFmt, ...)
-#endif
-{
-#if defined (__DEBUG__)
-	va_start(arglist, lpFmt);
-	vsnprintf(str, sizeof str, lpFmt, arglist);
-	va_end(arglist);
-
-#ifdef _WIN32
-	len = strlen(str);
-	co = GetStdHandle(STD_OUTPUT_HANDLE);
-
-	if (co == INVALID_HANDLE_VALUE)
-		return;
-
-	if (col == DEFCOL)
-	{
-		if (!GetConsoleScreenBufferInfo(co, &ConsoleScreenBufferInfo))
-			ConsoleScreenBufferInfo.wAttributes =
-				FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE;
-
-		SetConsoleTextAttribute(co, (WORD)col);
-	}
-
-	if (GetFileType(co) == FILE_TYPE_CHAR)
-		WriteConsoleA(co, str, (DWORD)len, &bytesWritten, NULL);
-	else
-		WriteFile(co, str, (DWORD)len, &bytesWritten, NULL);
-
-	if (col != DEFCOL)
-		SetConsoleTextAttribute(co,
-			ConsoleScreenBufferInfo.wAttributes);
-#else
-	printf("%s%s", col, str);
-	fflush(stdout);
-#endif
-#else
-	(void)col;
-	(void)lpFmt;
-#endif
-}
-
-/*
- * conPrintf()
- */
-#ifdef _WIN32
-void conPrintf(DWORDLONG col, const char *lpFmt, ...)
-#else
-void conPrintf(const char *col, const char *lpFmt, ...)
-#endif
-{
-	va_start(arglist, lpFmt);
-	vsnprintf(str, sizeof str, lpFmt, arglist);
-	va_end(arglist);
-
-#ifdef _WIN32
-	len = strlen(str);
-	co = GetStdHandle(STD_OUTPUT_HANDLE);
-
-	if (col == DEFCOL)
-	{
-		if (!GetConsoleScreenBufferInfo(co, &ConsoleScreenBufferInfo))
-			ConsoleScreenBufferInfo.wAttributes =
-				FOREGROUND_RED|FOREGROUND_GREEN|FOREGROUND_BLUE;
-
-		SetConsoleTextAttribute(co, (WORD)col);
-	}
-
-	if (co == INVALID_HANDLE_VALUE)
-		return;
-
-	if (GetFileType(co) == FILE_TYPE_CHAR)
-		WriteConsoleA(co, str, (DWORD)len, &bytesWritten, NULL);
-	else
-		WriteFile(co, str, (DWORD)len, &bytesWritten, NULL);
-
-	if (col != DEFCOL)
-		SetConsoleTextAttribute(co,
-			ConsoleScreenBufferInfo.wAttributes);
-#else
-	printf("%s%s", col, str);
-	fflush(stdout);
-#endif
-}
-
-/*
- * logPrintf():
- */
-void logPrintf(FILE *f, const char *lpFmt, ...)
-{
-	char *ct;
-	time_t t;
-
-	va_start(arglist, lpFmt);
-	vsnprintf(str, sizeof str, lpFmt, arglist);
-	va_end(arglist);
-
-	t = time(NULL);
-	ct = ctime(&t);
-	ct[strlen(ct)-1] = '\0';
-	fprintf(f, "%s: %s", ct, str);
-	fflush(f);
-#if defined (__DEBUG__)
-#ifdef _WIN32
-	len = strlen(str);
-	printf("%s", str);
-#else
-	printf("%s%s", DEFCOL, str);
-#endif
-	fflush(stdout);
-#endif
-}
-
-/*
- * openFile():
- */
-FILE *openFile(const char *filename)
-{
-	return fopen(filename, "a+t");
-}
-
-void strrand(char *s, const int len) {
-    static const char alphanum[] =
-        "0123456789"
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-        "abcdefghijklmnopqrstuvwxyz";
-
-    for (int i = 0; i < len; ++i) {
-        s[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
-    }
-
-    s[len] = 0;
-}
diff --git a/tools/masterserver/common.h b/tools/masterserver/common.h
deleted file mode 100644
index cb935572d..000000000
--- a/tools/masterserver/common.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-
-#ifndef _COMMON_H_
-#define _COMMON_H_
-
-#ifdef __GNUC__
-#include <unistd.h>
-#include <stdint.h>
-
-#define UINT8 uint8_t
-#define SINT8 int8_t
-
-#define UINT16 uint16_t
-#define INT16 int16_t
-
-#define INT32 int32_t
-#define UINT32 uint32_t
-#define INT64  int64_t
-#define UINT64 uint64_t
-#define ATTRPACK __attribute__ ((packed))
-#elif defined ( _MSC_VER)
-#include <wtypes.h>
-#define UINT8 unsigned __int8
-#define SINT8 signed __int8
-
-#define UINT16 unsigned __int16
-#define INT16 __int16
-
-#define INT32 __int32
-#define UINT32 unsigned __int32
-
-#define INT64  __int64
-#define UINT64 unsigned __int64
-
-typedef long ssize_t;
-#endif
-
-#ifndef ATTRPACK
-#define ATTRPACK
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-#if defined (_WIN32) || defined (__OS2__)
-#ifdef __GNUC__
-#define strcasecmp stricmp
-#elif defined (_MSC_VER)
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-#define strcasecmp _stricmp
-#pragma warning(disable :  4244)
-#endif
-#endif
-
-// ================================ DEFINITIONS ===============================
-
-
-#ifdef _WIN32
-#ifdef __GNUC__
-#include <windef.h>
-#include <stdarg.h>
-#include <winbase.h>
-#include <wincon.h>
-#endif
-#define DEFCOL     0xD0E0F0C0 // codes couleurs ANSI
-#define BLACK      0
-#define RED        FOREGROUND_RED
-#define GREEN      FOREGROUND_GREEN
-#define BROWN      FOREGROUND_GREEN|FOREGROUND_RED
-#define BLUE       FOREGROUND_BLUE
-#define PURPLE     FOREGROUND_RED|FOREGROUND_BLUE
-#define CYAN       FOREGROUND_BLUE|FOREGROUND_GREEN
-#define LIGHTGRAY  FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED
-#define DARKGRAY   FOREGROUND_INTENSITY
-#define LIGHTRED   FOREGROUND_RED|FOREGROUND_INTENSITY
-#define LIGHTGREEN FOREGROUND_GREEN|FOREGROUND_INTENSITY
-#define YELLOW     FOREGROUND_GREEN|FOREGROUND_RED|FOREGROUND_INTENSITY
-#define LIGHTBLUE  FOREGROUND_BLUE|FOREGROUND_INTENSITY
-#define MAGENTA    FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_INTENSITY
-#define LIGHTCYAN  FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_INTENSITY
-#define WHITE      FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED|FOREGROUND_INTENSITY
-
-#else
-
-#define DEFCOL     "\033[0m"   // codes couleurs ANSI
-#define BLACK      "\033[0;30m"
-#define RED        "\033[0;31m"
-#define GREEN      "\033[0;32m"
-#define BROWN      "\033[0;33m"
-#define BLUE       "\033[0;34m"
-#define PURPLE     "\033[0;35m"
-#define CYAN       "\033[0;36m"
-#define LIGHTGRAY  "\033[0;37m"
-#define DARKGRAY   "\033[1;30m"
-#define LIGHTRED   "\033[1;31m"
-#define LIGHTGREEN "\033[1;32m"
-#define YELLOW     "\033[1;33m"
-#define LIGHTBLUE  "\033[1;34m"
-#define MAGENTA    "\033[1;35m"
-#define LIGHTCYAN  "\033[1;36m"
-#define WHITE      "\033[1;37m"
-
-#endif
-
-typedef enum
-{
-	FE_SIGNAL_ERR,
-	FE_SELECT_ERR,
-	FE_READ_ERR,
-	FE_WRITE_ERR,
-	NUM_FATAL_ERROR
-} fatal_error_t;
-
-// ================================== PROTOS ==================================
-
-void clearScreen();
-void fatalError(fatal_error_t);
-void logPrintf(FILE *, const char *, ...);
-#ifdef _WIN32
-void dbgPrintf(DWORDLONG col, const char *lpFmt, ...);
-void conPrintf(DWORDLONG col, const char *lpFmt, ...);
-#else
-void dbgPrintf(const char *col, const char *lpFmt, ...);
-void conPrintf(const char *col, const char *lpFmt, ...);
-#endif
-FILE *openFile(const char *filename);
-const char *pCrypt(const char *pw, const char *salt);
-
-// ================================== STRINGS =================================
-void strrand(char *s, const int len);
-
-// ================================== EXTERNS =================================
-#endif
diff --git a/tools/masterserver/crypt.cpp b/tools/masterserver/crypt.cpp
deleted file mode 100644
index 4f15d3c89..000000000
--- a/tools/masterserver/crypt.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-#include "common.h"
-
-static SINT8 IP[] =
-{
-	58,50,42,34,26,18,10, 2,
-	60,52,44,36,28,20,12, 4,
-	62,54,46,38,30,22,14, 6,
-	64,56,48,40,32,24,16, 8,
-	57,49,41,33,25,17, 9, 1,
-	59,51,43,35,27,19,11, 3,
-	61,53,45,37,29,21,13, 5,
-	63,55,47,39,31,23,15, 7,
-};
-static SINT8 FP[] =
-{
-	40, 8,48,16,56,24,64,32,
-	39, 7,47,15,55,23,63,31,
-	38, 6,46,14,54,22,62,30,
-	37, 5,45,13,53,21,61,29,
-	36, 4,44,12,52,20,60,28,
-	35, 3,43,11,51,19,59,27,
-	34, 2,42,10,50,18,58,26,
-	33, 1,41, 9,49,17,57,25,
-};
-static SINT8 PC1_C[] =
-{
-	57,49,41,33,25,17, 9,
-	 1,58,50,42,34,26,18,
-	10, 2,59,51,43,35,27,
-	19,11, 3,60,52,44,36,
-};
-static SINT8 PC1_D[] =
-{
-	63,55,47,39,31,23,15,
-	 7,62,54,46,38,30,22,
-	14, 6,61,53,45,37,29,
-	21,13, 5,28,20,12, 4,
-};
-static SINT8 shifts[] = {1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1};
-static SINT8 PC2_C[] =
-{
-	14,17,11,24, 1, 5,
-	 3,28,15, 6,21,10,
-	23,19,12, 4,26, 8,
-	16, 7,27,20,13, 2,
-};
-static SINT8 PC2_D[] =
-{
-	41,52,31,37,47,55,
-	30,40,51,45,33,48,
-	44,49,39,56,34,53,
-	46,42,50,36,29,32,
-};
-static SINT8 C[28];
-static SINT8 D[28];
-static SINT8 KS[16][48];
-static SINT8 E[48];
-static SINT8 e2[] =
-{
-	32, 1, 2, 3, 4, 5,
-	 4, 5, 6, 7, 8, 9,
-	 8, 9,10,11,12,13,
-	12,13,14,15,16,17,
-	16,17,18,19,20,21,
-	20,21,22,23,24,25,
-	24,25,26,27,28,29,
-	28,29,30,31,32, 1,
-};
-static SINT8 S[8][64] =
-{
-	{
-		14, 4,13, 1, 2,15,11, 8, 3,10, 6,12, 5, 9, 0, 7,
-		 0,15, 7, 4,14, 2,13, 1,10, 6,12,11, 9, 5, 3, 8,
-		 4, 1,14, 8,13, 6, 2,11,15,12, 9, 7, 3,10, 5, 0,
-		15,12, 8, 2, 4, 9, 1, 7, 5,11, 3,14,10, 0, 6,13,
-	},
-	{
-		15, 1, 8,14, 6,11, 3, 4, 9, 7, 2,13,12, 0, 5,10,
-		 3,13, 4, 7,15, 2, 8,14,12, 0, 1,10, 6, 9,11, 5,
-		 0,14, 7,11,10, 4,13, 1, 5, 8,12, 6, 9, 3, 2,15,
-		13, 8,10, 1, 3,15, 4, 2,11, 6, 7,12, 0, 5,14, 9,
-	},
-	{
-		10, 0, 9,14, 6, 3,15, 5, 1,13,12, 7,11, 4, 2, 8,
-		13, 7, 0, 9, 3, 4, 6,10, 2, 8, 5,14,12,11,15, 1,
-		13, 6, 4, 9, 8,15, 3, 0,11, 1, 2,12, 5,10,14, 7,
-		 1,10,13, 0, 6, 9, 8, 7, 4,15,14, 3,11, 5, 2,12,
-	},
-	{
-		 7,13,14, 3, 0, 6, 9,10, 1, 2, 8, 5,11,12, 4,15,
-		13, 8,11, 5, 6,15, 0, 3, 4, 7, 2,12, 1,10,14, 9,
-		10, 6, 9, 0,12,11, 7,13,15, 1, 3,14, 5, 2, 8, 4,
-		 3,15, 0, 6,10, 1,13, 8, 9, 4, 5,11,12, 7, 2,14,
-	},
-	{
-		 2,12, 4, 1, 7,10,11, 6, 8, 5, 3,15,13, 0,14, 9,
-		14,11, 2,12, 4, 7,13, 1, 5, 0,15,10, 3, 9, 8, 6,
-		 4, 2, 1,11,10,13, 7, 8,15, 9,12, 5, 6, 3, 0,14,
-		11, 8,12, 7, 1,14, 2,13, 6,15, 0, 9,10, 4, 5, 3,
-	},
-	{
-		12, 1,10,15, 9, 2, 6, 8, 0,13, 3, 4,14, 7, 5,11,
-		10,15, 4, 2, 7,12, 9, 5, 6, 1,13,14, 0,11, 3, 8,
-		 9,14,15, 5, 2, 8,12, 3, 7, 0, 4,10, 1,13,11, 6,
-		 4, 3, 2,12, 9, 5,15,10,11,14, 1, 7, 6, 0, 8,13,
-	},
-	{
-		 4,11, 2,14,15, 0, 8,13, 3,12, 9, 7, 5,10, 6, 1,
-		13, 0,11, 7, 4, 9, 1,10,14, 3, 5,12, 2,15, 8, 6,
-		 1, 4,11,13,12, 3, 7,14,10,15, 6, 8, 0, 5, 9, 2,
-		 6,11,13, 8, 1, 4,10, 7, 9, 5, 0,15,14, 2, 3,12,
-	},
-	{
-		13, 2, 8, 4, 6,15,11, 1,10, 9, 3,14, 5, 0,12, 7,
-		 1,15,13, 8,10, 3, 7, 4,12, 5, 6,11, 0,14, 9, 2,
-		 7,11, 4, 1, 9,12,14, 2, 0, 6,10,13,15, 3, 5, 8,
-		 2, 1,14, 7, 4,10, 8,13,15,12, 9, 0, 3, 5, 6,11,
-	}
-};
-static SINT8 P[] =
-{
-	16, 7,20,21,
-	29,12,28,17,
-	 1,15,23,26,
-	 5,18,31,10,
-	 2, 8,24,14,
-	32,27, 3, 9,
-	19,13,30, 6,
-	22,11, 4,25,
-};
-static SINT8 L[64], *R = L + 32;
-static SINT8 tempL[32];
-static SINT8 f[32];
-static SINT8 preS[48];
-
-//=======================================================================
-
-static void setKey(const SINT8 *key)
-{
-	register INT32 i, j, k;
-	INT32 t;
-
-	for (i = 0; i < 28; i++)
-	{
-		C[i] = key[PC1_C[i]-1];
-		D[i] = key[PC1_D[i]-1];
-	}
-	for (i = 0; i < 16; i++)
-	{
-		for (k = 0; k < shifts[i]; k++)
-		{
-			t = C[0];
-			for (j = 0; j < 28-1; j++)
-				C[j] = C[j+1];
-			C[27] = t;
-			t = D[0];
-			for (j = 0; j < 28-1; j++)
-				D[j] = D[j+1];
-			D[27] = t;
-		}
-		for (j = 0; j < 24; j++)
-		{
-			KS[i][j] = C[PC2_C[j]-1];
-			KS[i][j+24] = D[PC2_D[j]-28-1];
-		}
-	}
-	for (i = 0; i < 48; i++)
-		E[i] = e2[i];
-}
-
-void enCrypt(SINT8 *block)
-{
-	INT32 i, ii;
-	register INT32 t, j, k;
-
-	for (j = 0; j < 64; j++)
-		L[j] = block[IP[j]-1];
-	for (ii = 0; ii < 16; ii++)
-	{
-		i = ii;
-		for (j = 0; j < 32; j++)
-			tempL[j] = R[j];
-		for (j = 0; j < 48; j++)
-			preS[j] = R[E[j]-1] ^ KS[i][j];
-		for (j = 0; j < 8; j++)
-		{
-			t = 6*j;
-			k = S[j][(preS[t+0]<<5)+
-			(preS[t+1]<<3)+
-			(preS[t+2]<<2)+
-			(preS[t+3]<<1)+
-			(preS[t+4]<<0)+
-			(preS[t+5]<<4)];
-			t = 4*j;
-			f[t+0] = (k>>3)&01;
-			f[t+1] = (k>>2)&01;
-			f[t+2] = (k>>1)&01;
-			f[t+3] = (k>>0)&01;
-		}
-		for (j = 0; j < 32; j++)
-			R[j] = L[j] ^ f[P[j]-1];
-		for (j = 0; j < 32; j++)
-			L[j] = tempL[j];
-	}
-	for (j = 0; j < 32; j++)
-	{
-		t = L[j];
-		L[j] = R[j];
-		R[j] = t;
-	}
-	for (j = 0; j < 64; j++)
-		block[j] = L[FP[j]-1];
-}
-
-const char *pCrypt(const char *pw, const char *salt)
-{
-	register INT32 i, j, c;
-	INT32 temp;
-	static SINT8 block[66];
-	static char iobuf[16];
-
-	for (i = 0; i < 66; i++)
-		block[i] = 0;
-	for (i = 0; (c = *pw) != '\0' && i < 64; pw++)
-	{
-		for (j = 0; j < 7; j++, i++)
-			block[i] = (c>>(6-j)) & 01;
-		i++;
-	}
-
-	setKey(block);
-
-	for (i = 0; i < 66; i++)
-		block[i] = 0;
-
-	for (i = 0; i < 2; i++)
-	{
-		c = *salt++;
-		iobuf[i] = c;
-		if (c > 'Z')
-			c -= 6;
-		if (c > '9')
-			c -= 7;
-		c -= '.';
-		for (j = 0; j < 6; j++)
-		{
-			if ((c>>j) & 01)
-			{
-				temp = E[6*i+j];
-				E[6*i+j] = E[6*i+j+24];
-				E[6*i+j+24] = temp;
-			}
-		}
-	}
-
-	for (i = 0; i < 25; i++)
-		enCrypt(block);
-
-	for (i = 0; i < 11; i++)
-	{
-		c = 0;
-		for (j = 0; j < 6; j++)
-		{
-			c <<= 1;
-			c |= block[6*i+j];
-		}
-		c += '.';
-		if (c > '9')
-			c += 7;
-		if (c > 'Z')
-			c += 6;
-		iobuf[i+2] = c;
-	}
-	iobuf[i+2] = 0;
-	if (iobuf[1] == 0)
-		iobuf[1] = iobuf[0];
-	return(iobuf);
-}
diff --git a/tools/masterserver/ipcs.cpp b/tools/masterserver/ipcs.cpp
deleted file mode 100644
index 4c3c6de74..000000000
--- a/tools/masterserver/ipcs.cpp
+++ /dev/null
@@ -1,595 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-
-#ifdef __GNUC__
-#include <unistd.h>
-#endif
-
-#ifdef _WIN32
-//#include <winsock.h>
-#else
-#include <sys/types.h>   // socket(),...
-#include <sys/socket.h>  // socket(),...
-#endif
-#include <stdlib.h>      // atoi(),...
-#include <signal.h>      // signal(),...
-#ifndef _WIN32
-#include <netdb.h>       // gethostbyname(),...
-#endif
-#ifdef _WIN32
-#include <time.h>
-#else
-#include <sys/time.h>    // timeval,... (TIMEOUT)
-#endif
-#include <string.h>      // memset(),...
-#include "ipcs.h"
-#include "common.h"
-
-typedef void Sigfunc(int);
-
-#ifndef _WIN32
-static void sigHandler(int signr);
-static Sigfunc *mySignal(int signo, Sigfunc *func);
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(disable :  4127)
-#endif
-//=============================================================================
-
-#if defined (_WIN32) || defined (__OS2__)
-// it seems windows doesn't define that... maybe some other OS? OS/2
-static int inet_aton(const char *hostname, struct in_addr *addr)
-{
-	return ((addr->s_addr=inet_addr(hostname)) != INADDR_NONE);
-}
-#endif
-
-/*
-** CSocket()
-*/
-CSocket::CSocket()
-{
-	dbgPrintf(DEFCOL, "Initializing socket... ");
-#ifdef _WIN32
-//#warning SIGPIPE needed
-	WSADATA winsockdata;
-	if (WSAStartup(MAKEWORD(1, 1), &winsockdata))
-		conPrintf(RED,"No TCP/IP driver detected");
-#else
-	signal(SIGPIPE, sigHandler);
-#endif
-	FD_ZERO(&rset);
-	memset(&addr, 0, sizeof (addr));
-	addr.sin_family = AF_INET;
-	dbgPrintf(DEFCOL, "DONE1.\n");
-}
-
-/*
-** ~CSocket()
-*/
-CSocket::~CSocket()
-{
-	dbgPrintf(DEFCOL, "Freeing socket... ");
-#ifdef _WIN32
-	WSACleanup();
-#endif
-	dbgPrintf(DEFCOL, "DONE2.\n");
-}
-
-/*
-** getIP()
-*/
-int CSocket::getIP(const char *ip_addr)
-{
-	struct hostent *host_ent;
-
-	dbgPrintf(DEFCOL, "get IP for %s... ", ip_addr);
-	if (!inet_aton(ip_addr, &addr.sin_addr))
-	{
-		host_ent = gethostbyname(ip_addr);
-		if (host_ent == NULL)
-			return GETHOSTBYNAME_ERROR;
-		memcpy(&addr.sin_addr, host_ent->h_addr_list[0],
-			sizeof (struct in_addr));
-	}
-	dbgPrintf(DEFCOL, "got %s. ", inet_ntoa(addr.sin_addr));
-	dbgPrintf(DEFCOL, "DONE3.\n");
-	return 0;
-}
-
-/*
-** CClientSocket()
-*/
-CClientSocket::CClientSocket()
-{
-	dbgPrintf(DEFCOL, "Initializing client socket... ");
-	socket_fd = (SOCKET)-1;
-	dbgPrintf(DEFCOL, "DONE4.\n");
-}
-
-/*
-** ~CClientSocket()
-*/
-CClientSocket::~CClientSocket()
-{
-	dbgPrintf(DEFCOL, "Freeing client socket... ");
-	if (socket_fd != (SOCKET)-1)
-		close(socket_fd);
-	dbgPrintf(DEFCOL, "DONE5.\n");
-}
-
-/*
-** connect()
-*/
-int CClientSocket::connect(const char *ip_addr, const char *str_port)
-{
-	dbgPrintf(DEFCOL, "Connect to %s %s...\n", ip_addr, str_port);
-
-	// put that in the constructor?
-	if ((socket_fd = socket(AF_INET, SOCK_STREAM, 0)) == (SOCKET)-1)
-		return SOCKET_ERROR;
-
-	if (getIP(ip_addr) == GETHOSTBYNAME_ERROR)
-		return GETHOSTBYNAME_ERROR;
-	addr.sin_port = htons(atoi(str_port));
-
-	if (::connect(socket_fd, (struct sockaddr *) &addr, sizeof (addr)) < 0)
-		return CONNECT_ERROR;
-
-	FD_SET(socket_fd, &rset);
-
-	dbgPrintf(DEFCOL, "DONE6.\n");
-
-	return 0;
-}
-
-/*
- * write()
- */
-int CClientSocket::write(msg_t *msg)
-{
-	int len;
-
-	if (msg->length < 0)
-		msg->length = (INT32)strlen(msg->buffer);
-	if (msg->length > PACKET_SIZE)
-		return WRITE_ERROR; // too big
-	len = msg->length + HEADER_SIZE;
-
-	msg->id = htonl(msg->id);
-	msg->type = htonl(msg->type);
-	msg->length = htonl(msg->length);
-	msg->room = htonl(msg->room);
-
-	dbgPrintf(DEFCOL, "Write a message %d (%s)... ", len, msg->buffer);
-
-	if (send(socket_fd, (const char *)msg, len, 0) != len)
-		return WRITE_ERROR;
-
-	dbgPrintf(DEFCOL, "DONE7.\n");
-
-	return 0;
-}
-
-/*
- * read()
- */
-int CClientSocket::read(msg_t *msg)
-{
-	struct timeval timeout;
-	fd_set tset;
-
-	dbgPrintf(DEFCOL, "Waiting a message... ");
-
-	timeout.tv_sec = 60, timeout.tv_usec = 0;
-	memcpy(&tset, &rset, sizeof (tset));
-	if ((select(255, &tset, NULL, NULL, &timeout)) <= 0)
-		return TIMEOUT_ERROR;
-
-	if (!FD_ISSET(socket_fd, &tset))
-		return READ_ERROR;
-
-	dbgPrintf(DEFCOL, "Reading a message.\n");
-
-	if (recv(socket_fd, (char *)msg, HEADER_SIZE, 0) != HEADER_SIZE)
-		return READ_ERROR;
-
-	msg->id = ntohl(msg->id);
-	msg->type = ntohl(msg->type);
-	msg->length = ntohl(msg->length);
-	msg->room = ntohl(msg->room);
-
-	if (!msg->length) // work around a bug in Windows 2000
-		return 0;
-
-	if (msg->length > PACKET_SIZE)
-		return READ_ERROR; // packet too big
-
-	if (recv(socket_fd, msg->buffer, msg->length, 0) != msg->length)
-		return READ_ERROR;
-
-	dbgPrintf(DEFCOL, "DONE8.\n");
-
-	return 0;
-}
-
-/*
-** CServerSocket()
-*/
-CServerSocket::CServerSocket()
-{
-	size_t id;
-	dbgPrintf(DEFCOL, "Initializing server socket... ");
-	num_clients = 0;
-	accept_fd = udp_fd = (SOCKET)-1;
-	for (id = 0; id < MAX_CLIENT; id++)
-		client_fd[id] = (SOCKET)-1;
-	udp_addr.sin_family = AF_INET;
-	dbgPrintf(DEFCOL, "DONE9.\n");
-}
-
-/*
-** ~CServerSocket()
-*/
-CServerSocket::~CServerSocket()
-{
-	size_t id;
-	dbgPrintf(DEFCOL, "Freeing server socket... ");
-	if (udp_fd != (SOCKET)-1)
-		close(udp_fd);
-	if (accept_fd != (SOCKET)-1)
-		close(accept_fd);
-	for (id = 0; id < num_clients || id < MAX_CLIENT; id++)
-		if (client_fd[id] != (SOCKET)-1)
-			close(client_fd[id]);
-	dbgPrintf(DEFCOL, "DONE10.\n");
-}
-
-/*
-** listen()
-*/
-int CServerSocket::listen(const char *str_port)
-{
-	dbgPrintf(DEFCOL, "Listen on %s... ", str_port);
-	// Init TCP socket
-	if ((accept_fd = socket(AF_INET, SOCK_STREAM, 0)) == (SOCKET)-1)
-		return SOCKET_ERROR;
-	int one = 1; setsockopt(accept_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&one, sizeof(int));
-
-	addr.sin_addr.s_addr = htonl(INADDR_ANY);
-	addr.sin_port = htons(atoi(str_port));
-
-	if (bind(accept_fd, (struct sockaddr *) &addr, sizeof (addr)) < 0)
-		return BIND_ERROR;
-
-	if (::listen(accept_fd, 5) < 0)
-		return LISTEN_ERROR;
-
-	FD_SET(accept_fd, &rset);
-
-	// Init UDP socket
-	if ((udp_fd = socket(AF_INET, SOCK_DGRAM, 0)) == (SOCKET)-1)
-		return SOCKET_ERROR;
-
-	udp_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-	udp_addr.sin_port = htons(atoi(str_port)+1);
-
-	if (bind(udp_fd, (struct sockaddr *) &udp_addr, sizeof (udp_addr)) < 0)
-	return BIND_ERROR;
-
-	FD_SET(udp_fd, &rset);
-
-	dbgPrintf(DEFCOL, "DONE11.\n");
-
-	return 0;
-}
-
-/*
- * deleteClient():
- */
-int CServerSocket::deleteClient(size_t id)
-{
-	dbgPrintf(DEFCOL, "Deleting (client %u) of %u... ", id+1, num_clients);
-	FD_CLR(client_fd[id], &rset);
-	close(client_fd[id]);
-	if (num_clients != 0)
-		num_clients--;
-	client_fd[id] = client_fd[num_clients]; // move the top socket into this now empty space
-	memmove(&client_addr[id], &client_addr[num_clients], sizeof (client_addr[num_clients]));
-	client_fd[num_clients] = (SOCKET)-1; // now empty the top socket
-	memset(&client_addr[num_clients], 0 , sizeof (client_addr[num_clients]));
-
-	dbgPrintf(DEFCOL, "DONE12.\n");
-
-	return 0;
-}
-
-/*
- * getUdpIP()
- */
-const char *CServerSocket::getUdpIP(void)
-{
-	return inet_ntoa(udp_in_addr.sin_addr);
-}
-
-/*
- * getUdpPort()
- */
-const char *CServerSocket::getUdpPort(bool offset)
-{
-	static char buffer[8];
-	UINT16 port = htons(udp_in_addr.sin_port);
-	if (offset)
-		port--;
-	snprintf(buffer, sizeof buffer, "%d", port);
-	return buffer;
-}
-
-/*
- * read(): wait message on a socket, if it's an accept, call the accept method,
- *         otherwise read the message and update msg->id to the right value
- *         (client cannot put valid entry in msg->id)
- */
-int CServerSocket::read(msg_t *msg)
-{
-	struct timeval timeout;
-	fd_set tset;
-	UINT32 id;
-	socklen_t lg = sizeof (addr);
-
-	timeout.tv_sec = 20, timeout.tv_usec = 0;
-	memcpy(&tset, &rset, sizeof (tset));
-	if ((select(255, &tset, NULL, NULL, &timeout)) <= 0)
-	{
-		msg->type = TIMEOUT_MSG;
-		return TIMEOUT_ERROR;
-	}
-
-	if (FD_ISSET(udp_fd, &tset))
-	{
-		msg->type = UDP_RECV_MSG; // This is a UDP packet
-		msg->length = recvfrom(udp_fd, msg->buffer, PACKET_SIZE, 0, (struct sockaddr *)&udp_in_addr, &lg);
-		return 0;
-	}
-
-	if (FD_ISSET(accept_fd, &tset))
-	{
-		msg->type = ACCEPT_MSG;
-		return this->accept();
-	}
-
-	id = 0;
-	while (!FD_ISSET(client_fd[id], &tset) && id < MAX_CLIENT)
-		id++;
-
-	// paranoia
-	if ( (id >= num_clients) || (id >= MAX_CLIENT) )
-	{
-		dbgPrintf(DEFCOL, "This should never happen\n");
-		return READ_ERROR;
-	}
-
-	dbgPrintf(DEFCOL, "Reading a message from (socket %u) for (client %u)... ", client_fd[id], id+1);
-
-	if (recv(client_fd[id], (char *)msg, HEADER_SIZE, 0) != HEADER_SIZE)
-	{
-		deleteClient(id); // the connection is not good with the client, kick him
-		return READ_ERROR;
-	}
-
-	//msg->id = ntohl(msg->id); // see comment above
-	msg->type = ntohl(msg->type);
-	msg->length = ntohl(msg->length);
-	msg->room = ntohl(msg->room);
-
-	if ((0 < msg->length) && (msg->length < PACKET_SIZE))
-	{
-		timeout.tv_sec = 0, timeout.tv_usec = 0; // the info should be already in the socket, so don't wait
-		memcpy(&tset, &rset, sizeof (tset));
-		if ((select(255, &tset, NULL, NULL, &timeout)) <= 0)
-		{
-			deleteClient(id);
-			return READ_ERROR;
-		}
-
-		if (!FD_ISSET(client_fd[id], &tset))
-		{
-			deleteClient(id);
-			return READ_ERROR;
-		}
-		if (recv(client_fd[id], msg->buffer, msg->length, 0) != msg->length)
-		{
-			deleteClient(id);
-			return READ_ERROR;
-		}
-	}
-
-	msg->id = id;
-
-	dbgPrintf(DEFCOL, "DONE13.\n");
-
-	return 0;
-}
-
-/*
- * write():
- */
-int CServerSocket::write(msg_t *msg)
-{
-	struct timeval timeout;
-	fd_set tset;
-	int len;
-
-	dbgPrintf(DEFCOL, "Write a message... ");
-	FD_ZERO(&tset);
-	/*
-	 * Be sure the msg->id is still valid; we cannot do
-	 * a delete between a read and a write. Should we
-	 * use a readpending set in read method, so we know
-	 * that we are still waiting for writing? For now,
-	 * it's the responsibility of server code.
-	 */
-	FD_SET(client_fd[msg->id], &tset);
-	timeout.tv_sec = 0, timeout.tv_usec = 0;
-	if ((select(255, NULL, &tset, NULL, &timeout)) <= 0)
-	{
-		deleteClient(msg->id); // this shouldn't happen if the net connection is good
-		return TIMEOUT_ERROR;
-	}
-	if (msg->length < 0)
-		msg->length = (INT32)strlen(msg->buffer);
-	if (msg->length > PACKET_SIZE)
-		return WRITE_ERROR; // too big
-	len = msg->length+HEADER_SIZE;
-	//msg->id = htonl(msg->id);  // same comment as for read
-	msg->type = htonl(msg->type);
-	msg->length = htonl(msg->length);
-	if (send(client_fd[msg->id], (const char *)msg, len, 0) != len)
-	{
-		deleteClient(msg->id);
-		return WRITE_ERROR;
-	}
-
-	dbgPrintf(DEFCOL, "DONE14.\n");
-
-	return 0;
-}
-
-/*
- * writeUDP()
- */
-int CServerSocket::writeUDP(const char *data, size_t length, const char *ip, UINT16 port)
-{
-	sockaddr_in sin;
-	struct timeval timeout;
-	fd_set tset;
-
-	FD_ZERO(&tset);
-	FD_SET(udp_fd, &tset);
-
-	if ((select(255, NULL, &tset, NULL, &timeout)) <= 0)
-	{
-		return TIMEOUT_ERROR;
-	}
-
-	sin.sin_family = AF_INET;
-	inet_aton(ip, &sin.sin_addr);
-	sin.sin_port = htons(port);
-
-	sendto(udp_fd, data, (int)length, 0, (sockaddr*)&sin, sizeof(sin));
-
-	return 0;
-}
-
-
-/*
- * accept()
- */
-int CServerSocket::accept()
-{
-	socklen_t lg = sizeof (addr);
-
-	dbgPrintf(DEFCOL, "Accepting on (socket %u)... ", accept_fd);
-
-	if ((client_fd[num_clients] = ::accept(accept_fd, (struct sockaddr *) &addr, &lg)) == (SOCKET)-1)
-	{
-		//client_fd[num_clients] = (SOCKET)-1; // we haven't accepted the client, so set it at default value
-		return ACCEPT_ERROR;
-	}
-
-	if (num_clients < MAX_CLIENT-1)
-	{
-		extern FILE *sockfile;
-
-		logPrintf(sockfile, "Accepting on socket %u for client %u (%s:%i)\n",
-		client_fd[num_clients], num_clients+1, inet_ntoa(addr.sin_addr), htons(addr.sin_port));
-		memcpy(&client_addr[num_clients], &addr, sizeof (addr));
-		FD_SET(client_fd[num_clients], &rset);
-		num_clients++;
-	}
-	else // we have reached the maximum number of clients
-	{
-		// close the connection (meaning "try again" for the client)
-		close(client_fd[num_clients]);
-		client_fd[num_clients] = (SOCKET)-1;
-		return ACCEPT_ERROR;
-	}
-
-	//dbgPrintf(DEFCOL, "DONE15.\n");
-
-	return 0;
-}
-
-/*
- * getClientIP()
- */
-const char *CServerSocket::getClientIP(size_t id)
-{
-	dbgPrintf(DEFCOL, "getClientIP: %u\n", id);
-	return inet_ntoa(client_addr[id].sin_addr);
-}
-
-/*
- * getClientPort()
- */
-const char *CServerSocket::getClientPort(size_t id)
-{
-	static char buffer[8];
-
-	dbgPrintf(DEFCOL, "getClientPort: %u\n", id);
-	UINT16 port = htons(client_addr[id].sin_port);
-	snprintf(buffer, sizeof buffer, "%d", port);
-	return buffer;
-}
-
-/*
- * mySignal()
- */
-#ifndef _WIN32
-static Sigfunc *mySignal(int signo, Sigfunc *func)
-{
-	struct sigaction act, oact;
-
-	act.sa_handler = func;
-	sigemptyset(&act.sa_mask);
-#if defined (SA_RESTART)
-	act.sa_flags = SA_RESTART;
-#else
-	act.sa_flags = 0;
-#endif
-	if (sigaction(signo, &act, &oact) < 0)
-		return SIG_ERR;
-	return oact.sa_handler;
-}
-
-/*
- * sigHandler()
- */
-static void sigHandler(int signr)
-{
-	mySignal(signr, sigHandler);
-	switch (signr)
-	{
-	case SIGPIPE:
-		dbgPrintf(DEFCOL, "Catch SIG_PIPE\n");
-		/// TODO be sure the socket is closed if the client
-		/// didn't quit properly
-		break;
-	}
-}
-#endif
diff --git a/tools/masterserver/ipcs.h b/tools/masterserver/ipcs.h
deleted file mode 100644
index b9dc52fdf..000000000
--- a/tools/masterserver/ipcs.h
+++ /dev/null
@@ -1,281 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-
-#ifndef _IPCS_H_
-#define _IPCS_H_
-
-#include "common.h"
-
-#if defined (_WIN32) || defined ( __OS2__)
-#include <io.h>
-#include <sys/types.h>
-typedef int socklen_t;
-#if defined (__OS2__)
-#include <netinet/in.h>
-#endif
-#endif
-#ifdef _WIN32
-#include <winsock.h>
-#define close closesocket
-#else
-#include <arpa/inet.h>   // inet_addr(),...
-#endif
-
-#ifndef SOCKET
-#define SOCKET u_int
-#endif
-
-// ================================ DEFINITIONS ===============================
-
-#define PACKET_SIZE 1024
-#define MAX_CLIENT    512
-
-#ifndef _WIN32
-#define NO_ERROR                      0
-#define SOCKET_ERROR               -201
-#endif
-#define BIND_ERROR                 -202
-#define CONNECT_ERROR              -203
-#define LISTEN_ERROR               -204
-#define ACCEPT_ERROR               -205
-#define WRITE_ERROR                -210
-#define READ_ERROR                 -211
-#define CLOSE_ERROR                -212
-#define GETHOSTBYNAME_ERROR        -220
-#define SELECT_ERROR               -230
-#define TIMEOUT_ERROR              -231
-#define MALLOC_ERROR               -301
-
-#define INVALID_MSG                   -1
-#define ACCEPT_MSG                   100
-#define ADD_SERVER_MSG               101
-#define ADD_CLIENT_MSG               102
-#define REMOVE_SERVER_MSG            103
-#define ADD_SERVERv2_MSG             104
-#define GET_SERVER_MSG               200
-#define SEND_SERVER_MSG              201
-#define GET_LOGFILE_MSG              202
-#define SEND_FILE_MSG                203
-#define ERASE_LOGFILE_MSG            204
-#define GET_SHORT_SERVER_MSG         205
-#define SEND_SHORT_SERVER_MSG        206
-#define ASK_SERVER_MSG               206
-#define ANSWER_ASK_SERVER_MSG        207
-#define GET_MOTD_MSG                 208
-#define SEND_MOTD_MSG                209
-#define GET_ROOMS_MSG				 210
-#define SEND_ROOMS_MSG				 211
-#define GET_ROOMS_HOST_MSG			 212
-#define GET_VERSION_MSG				 213
-#define SEND_VERSION_MSG			 214
-#define GET_BANNED_MSG				 215
-#define PING_SERVER_MSG				 216
-
-#define UDP_RECV_MSG                 300
-#define TIMEOUT_MSG                  301
-#define HTTP_REQUEST_MSG       875770417    // "4321"
-#define SEND_HTTP_REQUEST_MSG  875770418    // "4322"
-#define TEXT_REQUEST_MSG       825373494    // "1236"
-#define SEND_TEXT_REQUEST_MSG  825373495    // "1237"
-#define RSS92_REQUEST_MSG      825373496    // "1238"
-#define SEND_RSS92_REQUEST_MSG 825373497    // "1239"
-#define RSS10_REQUEST_MSG      825373744    // "1240"
-#define SEND_RSS10_REQUEST_MSG 825373745    // "1241"
-#define ADD_PSERVER_MSG        0xabacab81    // this number just need to be different than the others
-#define REMOVE_PSERVER_MSG     0xabacab82
-
-// Sent FROM Client
-#define LIVE_AUTH_USER				 600
-#define LIVE_AUTH_KEY				 601
-#define LIVE_GET_USER				 602
-#define LIVE_UPDATE_LOCATION		 603
-#define LIVE_UPDATE_PUBLIC_KEY		 604
-#define LIVE_AUTH_PUBLIC_KEY		 605
-
-// Sent TO Client
-#define LIVE_INVALID_KEY			 800
-#define LIVE_INVALID_USER			 801
-#define LIVE_AUTHORISED_KEY			 802
-#define	LIVE_SEND_USER				 803
-#define LIVE_VALIDATED_USER			 804
-
-// Location Types
-#define LIVE_LOCATION_SP			 100
-#define LIVE_LOCATION_MENU			 101
-#define LIVE_LOCATION_MP_JOIN		 102
-#define LIVE_LOCATION_MP_HOST		 103
-#define LIVE_LOCATION_MP_LOCAL		 104
-#define LIVE_LOCATION_MP_PRIVATE	 105
-
-#define HEADER_SIZE ((UINT32)sizeof (UINT32)*4)
-
-#define HEADER_MSG_POS      0
-#define IP_MSG_POS         16
-#define PORT_MSG_POS       32
-#define HOSTNAME_MSG_POS   40
-
-#if defined(_MSC_VER)
-#pragma pack(1)
-#endif
-
-// Keep this structure 8 bytes aligned (current size is 80)
-typedef struct
-{
-	char header[16]; // information such as password
-	char ip[16];
-	char port[8];
-	char name[32];
-	INT32 room;
-	char key[32]; // Secret key for linking dedicated servers to accounts
-	char version[8]; // format is: x.yy.z (like 1.30.2 or 1.31)
-} ATTRPACK msg_server_t;
-
-typedef struct
-{
-	char header[16];
-	UINT32 id;
-	char name[32];
-	char motd[256];
-} ATTRPACK msg_rooms_t;
-
-typedef struct
-{
-	char header[16];
-	char ipstart[16];
-	char ipend[16];
-	char endstamp[32];
-	char reason[256];
-	UINT8 hostonly;
-} ATTRPACK msg_ban_t;
-
-typedef struct
-{
-	char header[16];
-	INT32 id;
-	char username[100];
-	char password[32];
-} ATTRPACK msg_live_auth_t;
-
-typedef struct
-{
-	char header[16];
-	INT32 uid;
-	char username[100];
-	INT32 location_type;
-	char location_ip[32];
-	INT32 location_port;
-	INT32 lastseen_type;
-	char lastseen_data1[256];
-	char lastseen_data2[256];
-	char lastseen_data3[256];
-} ATTRPACK msg_live_user_t;
-
-typedef struct
-{
-	char header[16];
-	UINT8 location_type;
-	char location_ip[32];
-	INT32 location_port;
-	char location_data1[256];
-	char location_data2[256];
-	char location_data3[256];
-} ATTRPACK msg_live_updatelocation_t;
-
-typedef struct
-{
-	char header[16];
-	char publickey[256];
-	char username[256];
-} ATTRPACK msg_live_validateuser_t;
-
-typedef struct
-{
-	char header[16];
-	char username[256];
-	UINT8 keytype;
-	char keydata[256];
-} ATTRPACK msg_live_update_key_t;
-
-
-typedef struct
-{
-	UINT32 id;
-	INT32 type;
-	INT32 room;
-	INT32 length;
-	char buffer[PACKET_SIZE];
-} ATTRPACK msg_t;
-
-#if defined(_MSC_VER)
-#pragma pack()
-#endif
-
-class CSocket
-{
-protected:
-	sockaddr_in addr;
-	msg_t msg;
-	fd_set rset;
-public:
-	int getIP(const char *);
-	CSocket();
-	~CSocket();
-};
-
-class CServerSocket : public CSocket
-{
-private:
-	sockaddr_in udp_addr;
-	sockaddr_in udp_in_addr;
-	SOCKET udp_fd;
-	SOCKET accept_fd;
-	size_t num_clients;
-	SOCKET client_fd[MAX_CLIENT];
-	sockaddr_in client_addr[MAX_CLIENT];
-
-public:
-	int deleteClient(size_t id);
-	int listen(const char *str_port);
-	int accept(void);
-	int read(msg_t *msg);
-	const char *getUdpIP(void);
-	const char *getUdpPort(bool);
-	int write(msg_t *msg);
-	int writeUDP(const char *data, size_t length, const char *ip, UINT16 port);
-	const char *getClientIP(size_t id);
-	const char *getClientPort(size_t id);
-	CServerSocket(void);
-	~CServerSocket(void);
-};
-
-class CClientSocket : public CSocket
-{
-private:
-	SOCKET socket_fd;
-public:
-	int connect(const char *ip_addr, const char *str_port);
-	int read(msg_t *msg);
-	int write(msg_t *msg);
-	CClientSocket(void);
-	~CClientSocket(void);
-};
-
-// ================================== PROTOS ==================================
-
-// ================================== EXTERNS =================================
-
-#endif
diff --git a/tools/masterserver/masterserver.sh b/tools/masterserver/masterserver.sh
deleted file mode 100755
index 9b1adb128..000000000
--- a/tools/masterserver/masterserver.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh -e
-#
-# SRB2 MasterServer - start up the masterserver
-#
-
-# Get LSB functions
-. /lib/lsb/init-functions
-. /etc/default/rcS
-
-SRB2MS=/usr/local/bin/masterserver
-SRB2MS_PORT=28900
-
-# Check that the package is still installed
-[ -x $SRB2MS ] || exit 0;
-
-case "$1" in
-	start)
-		log_begin_msg "Starting SRB2MS..."
-		umask 002
-		if start-stop-daemon --start \
-		--exec $SRB2MS \
-		-- $SRB2MS_PORT; then
-			log_end_msg 0
-		else
-			log_end_msg $?
-		fi
-	;;
-
-	stop)
-		log_begin_msg "Stopping SRB2MS..."
-		if start-stop-daemon --stop --exec $SRB2MS; then
-		log_end_msg 0
-		else
-		log_end_msg $?
-		fi
-	;;
-
-	restart|force-reload)
-		"$0" stop && "$0" start
-	;;
-
-	*)
-	e	cho "Usage: /etc/init.d/masterserver {start|stop|restart|force-reload}"
-		exit 1
-	;;
-esac
-
-exit 0
diff --git a/tools/masterserver/md5.cpp b/tools/masterserver/md5.cpp
deleted file mode 100644
index 4f4ff2292..000000000
--- a/tools/masterserver/md5.cpp
+++ /dev/null
@@ -1,363 +0,0 @@
-/* MD5
- converted to C++ class by Frank Thilo (thilo@unix-ag.org)
- for bzflag (http://www.bzflag.org)
-
-   based on:
-
-   md5.h and md5.c
-   reference implemantion of RFC 1321
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
-*/
-
-/* interface header */
-#include "md5.h"
-
-/* system implementation headers */
-#include <stdio.h>
-#include <string.h>
-
-
-// Constants for MD5Transform routine.
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-///////////////////////////////////////////////
-
-// F, G, H and I are basic MD5 functions.
-inline MD5::uint4 MD5::F(uint4 x, uint4 y, uint4 z) {
-  return (x&y) | (~x&z);
-}
-
-inline MD5::uint4 MD5::G(uint4 x, uint4 y, uint4 z) {
-  return (x&z) | (y&~z);
-}
-
-inline MD5::uint4 MD5::H(uint4 x, uint4 y, uint4 z) {
-  return x^y^z;
-}
-
-inline MD5::uint4 MD5::I(uint4 x, uint4 y, uint4 z) {
-  return y ^ (x | ~z);
-}
-
-// rotate_left rotates x left n bits.
-inline MD5::uint4 MD5::rotate_left(uint4 x, int n) {
-  return (x << n) | (x >> (32-n));
-}
-
-// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-// Rotation is separate from addition to prevent recomputation.
-inline void MD5::FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-  a = rotate_left(a+ F(b,c,d) + x + ac, s) + b;
-}
-
-inline void MD5::GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-  a = rotate_left(a + G(b,c,d) + x + ac, s) + b;
-}
-
-inline void MD5::HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-  a = rotate_left(a + H(b,c,d) + x + ac, s) + b;
-}
-
-inline void MD5::II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac) {
-  a = rotate_left(a + I(b,c,d) + x + ac, s) + b;
-}
-
-//////////////////////////////////////////////
-
-// default ctor, just initailize
-MD5::MD5()
-{
-  init();
-}
-
-//////////////////////////////////////////////
-
-// nifty shortcut ctor, compute MD5 for string and finalize it right away
-MD5::MD5(const std::string &text)
-{
-  init();
-  update(text.c_str(), text.length());
-  finalize();
-}
-
-//////////////////////////////
-
-void MD5::init()
-{
-  finalized=false;
-
-  count[0] = 0;
-  count[1] = 0;
-
-  // load magic initialization constants.
-  state[0] = 0x67452301;
-  state[1] = 0xefcdab89;
-  state[2] = 0x98badcfe;
-  state[3] = 0x10325476;
-}
-
-//////////////////////////////
-
-// decodes input (unsigned char) into output (uint4). Assumes len is a multiple of 4.
-void MD5::decode(uint4 output[], const uint1 input[], size_type len)
-{
-  for (unsigned int i = 0, j = 0; j < len; i++, j += 4)
-    output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) |
-      (((uint4)input[j+2]) << 16) | (((uint4)input[j+3]) << 24);
-}
-
-//////////////////////////////
-
-// encodes input (uint4) into output (unsigned char). Assumes len is
-// a multiple of 4.
-void MD5::encode(uint1 output[], const uint4 input[], size_type len)
-{
-  for (size_type i = 0, j = 0; j < len; i++, j += 4) {
-    output[j] = input[i] & 0xff;
-    output[j+1] = (input[i] >> 8) & 0xff;
-    output[j+2] = (input[i] >> 16) & 0xff;
-    output[j+3] = (input[i] >> 24) & 0xff;
-  }
-}
-
-//////////////////////////////
-
-// apply MD5 algo on a block
-void MD5::transform(const uint1 block[blocksize])
-{
-  uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-  decode (x, block, blocksize);
-
-  /* Round 1 */
-  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
-  /* Round 2 */
-  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-  state[0] += a;
-  state[1] += b;
-  state[2] += c;
-  state[3] += d;
-
-  // Zeroize sensitive information.
-  memset(x, 0, sizeof x);
-}
-
-//////////////////////////////
-
-// MD5 block update operation. Continues an MD5 message-digest
-// operation, processing another message block
-void MD5::update(const unsigned char input[], size_type length)
-{
-  // compute number of bytes mod 64
-  size_type index = count[0] / 8 % blocksize;
-
-  // Update number of bits
-  if ((count[0] += (length << 3)) < (length << 3))
-    count[1]++;
-  count[1] += (length >> 29);
-
-  // number of bytes we need to fill in buffer
-  size_type firstpart = 64 - index;
-
-  size_type i;
-
-  // transform as many times as possible.
-  if (length >= firstpart)
-  {
-    // fill buffer first, transform
-    memcpy(&buffer[index], input, firstpart);
-    transform(buffer);
-
-    // transform chunks of blocksize (64 bytes)
-    for (i = firstpart; i + blocksize <= length; i += blocksize)
-      transform(&input[i]);
-
-    index = 0;
-  }
-  else
-    i = 0;
-
-  // buffer remaining input
-  memcpy(&buffer[index], &input[i], length-i);
-}
-
-//////////////////////////////
-
-// for convenience provide a verson with signed char
-void MD5::update(const char input[], size_type length)
-{
-  update((const unsigned char*)input, length);
-}
-
-//////////////////////////////
-
-// MD5 finalization. Ends an MD5 message-digest operation, writing the
-// the message digest and zeroizing the context.
-MD5& MD5::finalize()
-{
-  static unsigned char padding[64] = {
-    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-  };
-
-  if (!finalized) {
-    // Save number of bits
-    unsigned char bits[8];
-    encode(bits, count, 8);
-
-    // pad out to 56 mod 64.
-    size_type index = count[0] / 8 % 64;
-    size_type padLen = (index < 56) ? (56 - index) : (120 - index);
-    update(padding, padLen);
-
-    // Append length (before padding)
-    update(bits, 8);
-
-    // Store state in digest
-    encode(digest, state, 16);
-
-    // Zeroize sensitive information.
-    memset(buffer, 0, sizeof buffer);
-    memset(count, 0, sizeof count);
-
-    finalized=true;
-  }
-
-  return *this;
-}
-
-//////////////////////////////
-
-// return hex representation of digest as string
-std::string MD5::hexdigest() const
-{
-  if (!finalized)
-    return "";
-
-  char buf[33];
-  for (int i=0; i<16; i++)
-    sprintf(buf+i*2, "%02x", digest[i]);
-  buf[32]=0;
-
-  return std::string(buf);
-}
-
-//////////////////////////////
-
-std::ostream& operator<<(std::ostream& out, MD5 md5)
-{
-  return out << md5.hexdigest();
-}
-
-//////////////////////////////
-
-std::string md5(const std::string str)
-{
-    MD5 md5 = MD5(str);
-
-    return md5.hexdigest();
-}
diff --git a/tools/masterserver/md5.h b/tools/masterserver/md5.h
deleted file mode 100644
index 55a90c4cb..000000000
--- a/tools/masterserver/md5.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* MD5
- converted to C++ class by Frank Thilo (thilo@unix-ag.org)
- for bzflag (http://www.bzflag.org)
-
-   based on:
-
-   md5.h and md5.c
-   reference implementation of RFC 1321
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
-*/
-
-#ifndef BZF_MD5_H
-#define BZF_MD5_H
-
-#include <string>
-#include <iostream>
-
-
-// a small class for calculating MD5 hashes of strings or byte arrays
-// it is not meant to be fast or secure
-//
-// usage: 1) feed it blocks of uchars with update()
-//      2) finalize()
-//      3) get hexdigest() string
-//      or
-//      MD5(std::string).hexdigest()
-//
-// assumes that char is 8 bit and int is 32 bit
-class MD5
-{
-public:
-  typedef unsigned int size_type; // must be 32bit
-
-  MD5();
-  MD5(const std::string& text);
-  void update(const unsigned char *buf, size_type length);
-  void update(const char *buf, size_type length);
-  MD5& finalize();
-  std::string hexdigest() const;
-  friend std::ostream& operator<<(std::ostream&, MD5 md5);
-
-private:
-  void init();
-  typedef unsigned char uint1; //  8bit
-  typedef unsigned int uint4;  // 32bit
-  enum {blocksize = 64}; // VC6 won't eat a const static int here
-
-  void transform(const uint1 block[blocksize]);
-  static void decode(uint4 output[], const uint1 input[], size_type len);
-  static void encode(uint1 output[], const uint4 input[], size_type len);
-
-  bool finalized;
-  uint1 buffer[blocksize]; // bytes that didn't fit in last 64 byte chunk
-  uint4 count[2];   // 64bit counter for number of bits (lo, hi)
-  uint4 state[4];   // digest so far
-  uint1 digest[16]; // the result
-
-  // low level logic operations
-  static inline uint4 F(uint4 x, uint4 y, uint4 z);
-  static inline uint4 G(uint4 x, uint4 y, uint4 z);
-  static inline uint4 H(uint4 x, uint4 y, uint4 z);
-  static inline uint4 I(uint4 x, uint4 y, uint4 z);
-  static inline uint4 rotate_left(uint4 x, int n);
-  static inline void FF(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-  static inline void GG(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-  static inline void HH(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-  static inline void II(uint4 &a, uint4 b, uint4 c, uint4 d, uint4 x, uint4 s, uint4 ac);
-};
-
-std::string md5(const std::string str);
-
-#endif
diff --git a/tools/masterserver/server.cpp b/tools/masterserver/server.cpp
deleted file mode 100644
index b7ed0d6b4..000000000
--- a/tools/masterserver/server.cpp
+++ /dev/null
@@ -1,1037 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-#ifdef __GNUC__
-#include <unistd.h>
-#include <sys/types.h>
-#endif
-#include <typeinfo>
-#include <string.h>
-#include <stdarg.h>
-#include "ipcs.h"
-#include "common.h"
-#include "mysql.h"
-#include "md5.h"
-#include <time.h>
-//#include <netdb.h>
-
-//=============================================================================
-
-#ifdef __GNUC__
-#define ATTRPACK __attribute__ ((packed))
-#else
-#define ATTRPACK
-#endif
-
-#define PT_ASKINFOVIAMS 15
-
-static CServerSocket server_socket;
-
-FILE *logfile;
-FILE *errorfile;
-FILE *mysqlfile;
-FILE *sockfile;
-FILE *pidfile;
-
-#if defined(_MSC_VER)
-#pragma pack(1)
-#endif
-
-typedef struct
-{
-	char ip[16];			// Big enough to hold a full address.
-	UINT16 port;
-	UINT8 padding1[2];
-	UINT32 time;
-} ATTRPACK ms_holepunch_packet_t;
-
-typedef struct
-{
-	char clientaddr[22];
-	UINT8 padding1[2];
-	UINT32 time;
-} ATTRPACK msaskinfo_pak;
-
-//
-// SRB2 network packet data.
-//
-typedef struct
-{
-	UINT32 checksum;
-	UINT8 ack; // if not null the node asks for acknowledgement, the receiver must resend the ack
-	UINT8 ackreturn; // the return of the ack number
-
-	UINT8 packettype;
-	UINT8 reserved; // padding
-
-	msaskinfo_pak msaskinfo;
-} ATTRPACK doomdata_t;
-
-#if defined(_MSC_VER)
-#pragma pack()
-#endif
-
-//=============================================================================
-
-#define HOSTNAME "loopback"
-#define USER "srb2_ms"
-#define PASSWORD "gLRDRb7WgLRDRb7W"
-#define DATABASE "srb2_ms"
-
-// MySQL Stuff :D
-
-   const char *server = HOSTNAME;
-   const char *user = USER;
-   const char *password = PASSWORD;
-   const char *database = DATABASE;
-   time_t lastupdate;
-
-   MYSQL *conn;
-   MYSQL_RES *res;
-   MYSQL_ROW row;
-   int mysqlconnected = 0;
-/*
-char *str_replace(char * t1, char * t2, char * t6)
-{
-	char*t4;
-	char*t5=new(0);
-
-	while(strstr(t6,t1)){
-        t4=strstr(t6,t1);
-        strncpy(t5+strlen(t5),t6,t4-t6);
-		strcat(t5,t2);
-		t4+=strlen(t1);
-		t6=t4;
-	}
-	return strcat(t5,t4);
-}
-*/
-/*
-// Cue was here
-char *str_quakeformat(char *msg)
-{
-    char *quakemsg , *quakemsg1, *quakemsg2;
-    char *quakemsg3, *quakemsg4, *quakemsg5;
-    char *quakemsg6, *quakemsg7, *quakemsg8;
-
-    quakemsg1 = new(sizeof(char) * (strlen(msg) + 1));
-    strcpy(quakemsg1, msg);
-    quakemsg2 = str_replace("^1", "\x81",quakemsg1);
-    quakemsg3 = str_replace("^2", "\x82",quakemsg2);
-    quakemsg4 = str_replace("^3", "\x83",quakemsg3);
-    quakemsg5 = str_replace("^4", "\x84",quakemsg4);
-    quakemsg6 = str_replace("^5", "\x85",quakemsg5);
-    quakemsg7 = str_replace("^6", "\x86",quakemsg6);
-    quakemsg8 = str_replace("^7", "\x87",quakemsg7);
-    quakemsg = str_replace("^0", "\x80",quakemsg8);
-    delete(quakemsg1);
-    delete(quakemsg2);
-    delete(quakemsg3);
-    delete(quakemsg4);
-    delete(quakemsg5);
-    delete(quakemsg6);
-    delete(quakemsg7);
-    delete(quakemsg8);
-
-    return quakemsg;
-}
-  */
-void MySQL_Conn(bool force) {
-	//if(mysql_ping(conn))
-		//mysqlconnected = 0;
-	logPrintf(mysqlfile, "Trying to connect to MySQL...\n");
-	if(mysqlconnected != 1 || force) {
-		if(force)
-			mysql_close(conn);
-		const char *server = HOSTNAME;
-		const char *user = USER;
-		const char *password = PASSWORD;
-		const char *database = DATABASE;
-
-		conn = mysql_init(NULL);
-
-		/* Connect to database */
-		if (!mysql_real_connect(conn, server,
-			user, password, database, 8219, NULL, 0)) {
-			logPrintf(errorfile, "%s\n", mysql_error(conn));
-		}
-		conn = mysql_init(NULL);
-
-		/* Connect to database */
-		if (!mysql_real_connect(conn, server, user, password, database, 0, NULL, 0)) {
-			logPrintf(errorfile, "%s\n", mysql_error(conn));
-			mysqlconnected = 0;
-		} else {
-			logPrintf(mysqlfile, "Connection to MySQL Database successful!\n");
-			mysqlconnected = 1;
-		}
-	}
-}
-
-static int MySQL_CheckBan(const char *ip, UINT32 id, bool sendinfo, bool type) {
-	msg_t msg;
-	int writecode;
-	MySQL_Conn(false);
-	msg.id = id;
-    char banqueryp1[500] = "SELECT bid,INET_NTOA(ipstart),INET_NTOA(ipend),DATE_FORMAT(FROM_UNIXTIME(full_endtime),'%%a %%b %%e %%Y at %%k:%%i (CDT)'),reason,hostonly,permanent FROM ms_bans WHERE INET_ATON('%s') BETWEEN `ipstart` AND `ipend` AND (`full_endtime` > %ld OR `permanent` = '1') LIMIT 1";
-//    char exqueryp1[500] = "SELECT * FROM ms_exceptions WHERE `ip` = '%s' AND `bid` = '%s' LIMIT 1";
-//    char exquery[500];
-    char banquery[500];
-//    char bid[5];
-
-    time_t current_time = time (NULL);
-    sprintf(banquery, banqueryp1, ip, current_time);
-    logPrintf(mysqlfile, "Executing MySQL Query: %s\n", banquery);
-    if(mysql_query(conn, banquery)) {
-      logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-	  MySQL_Conn(true);
-      return false;
-    } else {
-		res = mysql_store_result(conn);
-		if(mysql_num_rows(res) >= 1) {
-			logPrintf(logfile, "We got a ban coming on!\n");
-			row = mysql_fetch_row(res);
-			if(!type && strcmp(row[5],"1") == 0)
-				return false;
-			if(sendinfo)
-			{
-				logPrintf(logfile, "And we're meant to tell them some more!\n");
-				msg_ban_t *info = (msg_ban_t *) msg.buffer;
-				info->header[0] = '\0';
-
-				logPrintf(logfile, "Got Ban: %s - %s, ends %s, for %s\n", row[1], row[2], row[3], row[4]);
-				logPrintf(logfile, "COPY: ipstart\n");
-				strcpy(info->ipstart, row[1]);
-				logPrintf(logfile, "COPY: ipend\n");
-				strcpy(info->ipend, row[2]);
-				logPrintf(logfile, "COPY: endtime\n");
-				if(strcmp(row[6], "0") == 0)
-				{
-					logPrintf(logfile, "COPY: It's not permanent.\n");
-					strcpy(info->endstamp, row[3]);
-				}
-				else
-				{
-					logPrintf(logfile, "COPY: It's permanent.\n");
-					strcpy(info->endstamp, "Never");
-				}
-				logPrintf(logfile, "COPY: reason\n");
-				strcpy(info->reason, row[4]);
-				logPrintf(logfile, "COPY: hostonly\n");
-				if(strcmp(row[5],"0") == 0)
-					info->hostonly = false;
-				else
-					info->hostonly = true;
-
-				if(info->hostonly)
-					logPrintf(logfile, "BAN HAMMER: %s - %s || Reason: %s || Endstamp: %s || HOSTONLY\n", info->ipstart, info->ipend, info->reason, info->endstamp);
-				else
-					logPrintf(logfile, "BAN HAMMER: %s - %s || Reason: %s || Endstamp: %s || NOTHOSTONLY\n", info->ipstart, info->ipend, info->reason, info->endstamp);
-				mysql_free_result(res);
-				msg.type = GET_BANNED_MSG;
-				msg.length = sizeof (msg_ban_t);
-				msg.room = 0;
-				logPrintf(logfile, "Sending message?\n");
-				writecode = server_socket.write(&msg);
-				logPrintf(logfile, "Message sent! :D\n");
-				if (writecode < 0)
-				{
-					dbgPrintf(LIGHTRED, "Write error... %d client %d "
-										"deleted\n", writecode, id);
-					return true;
-				}
-			}
-			return true;
-		} else {
-			mysql_free_result(res);
-			return false;
-		}
-	}
-}
-
-int MySQL_CheckRoom(UINT32 room)
-{
-	MySQL_Conn(false);
-	char checkqueryp1[500] = "SELECT private FROM `ms_rooms` WHERE `room_id` = '%d' AND `private` = '1' LIMIT 1";
-	char checkquery[500];
-	sprintf(checkquery, checkqueryp1, room);
-    logPrintf(mysqlfile, "Executing MySQL Query: %s\n", checkquery);
-    if(mysql_query(conn, checkquery)) {
-      logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-	  MySQL_Conn(true);
-	  return false;
-    } else {
-      res = mysql_store_result(conn);
-	  if(mysql_num_rows(res) < 1)
-		return true;
-	  else
-		return false;
-	}
-}
-
-void MySQL_AddServer(const char *ip, const char *port, const char *name, const char *version, UINT32 room, bool firstadd, const char *key) {
-        char escapedName[255];
-        char escapedPort[10];
-        char escapedVersion[10];
-		char escapedKey[32];
-        char insertquery[5000];
-        char checkquery[500];
-        char updatequery[5000];
-        char queryp1[5000] = "INSERT INTO `ms_servers` (`name`,`ip`,`port`,`version`,`timestamp`,`room`,`key`) VALUES ('%s','%s','%s','%s','%ld','%d','%s')";
-        char checkqueryp1[500] = "SELECT room_override FROM `ms_servers` WHERE `ip` = '%s'";
-		char updatequeryp1[5000];
-		if(firstadd)
-		{
-			logPrintf(logfile, "First add.\n");
-			strcpy(updatequeryp1, "UPDATE `ms_servers` SET `name` = '%s', `port` = '%s', `version` = '%s', timestamp = '%ld', upnow = '1', `room` = '%d', `delisted` = '0', `key` = '%s' WHERE `ip` = '%s'");
-		}
-		else
-		{
-			logPrintf(logfile, "Update ping.\n");
-			strcpy(updatequeryp1, "UPDATE `ms_servers` SET `name` = '%s', `port` = '%s', `version` = '%s', timestamp = '%ld', upnow = '1', `room` = '%d', `key` = '%s' WHERE `ip` = '%s' AND `delisted` = '0'");
-		}
-        MySQL_Conn(false);
-        mysql_real_escape_string(conn, escapedName, name, (unsigned long)strlen(name));
-        mysql_real_escape_string(conn, escapedPort, port, (unsigned long)strlen(port));
-        mysql_real_escape_string(conn, escapedVersion, version, (unsigned long)strlen(version));
-		mysql_real_escape_string(conn, escapedKey, key, (unsigned long)strlen(key));
-     if(!MySQL_CheckBan(ip,0,false,1)) {
-		if(!MySQL_CheckRoom(room))
-		{
-			logPrintf(errorfile, "IP %s tried to use the private room %d! THIS SHOULD NOT HAPPEN\n", ip, room);
-			return;
-		}
-        sprintf(checkquery, checkqueryp1, ip);
-        time_t timestamp;
-        timestamp = time (NULL);
-        logPrintf(logfile, "Checking for existing servers in table with the same IP...\n");
-        logPrintf(mysqlfile, "Executing MySQL Query: %s\n", checkquery);
-        if(mysql_query(conn, checkquery)) {
-          logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-		  MySQL_Conn(true);
-        } else {
-          res = mysql_store_result(conn);
-          logPrintf(logfile, "Found %d rows...\n", mysql_num_rows(res));
-          if(mysql_num_rows(res) < 1) {
-             mysql_free_result(res);
-			 logPrintf(logfile, "Adding the temporary server: %s:%s || Name: %s || Version: %s || Time: %ld || Room: %d || Key: %s\n", ip, port, name, version, timestamp, room, key);
-             sprintf(insertquery, queryp1, escapedName, ip, escapedPort, escapedVersion, timestamp, room, escapedKey);
-             logPrintf(mysqlfile, "Executing MySQL Query: %s\n", insertquery);
-	     if(mysql_query(conn, insertquery)) {
-                logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-				MySQL_Conn(true);
-             } else {
-                logPrintf(logfile, "Server added successfully!\n");
-             }
-          } else {
-			row = mysql_fetch_row(res);
-			if(atoi(row[0]) != 0)
-				room = atoi(row[0]);
-            mysql_free_result(res);
-            logPrintf(logfile, "Server's IP already exists, so let's just update it instead...\n");
-            logPrintf(logfile, "Updating Server Data for %s\n", ip);
-            sprintf(updatequery, updatequeryp1, escapedName, escapedPort, escapedVersion, timestamp, room, escapedKey, ip);
-            logPrintf(mysqlfile, "Executing MySQL Query: %s\n", updatequery);
-            if(mysql_query(conn, updatequery)) {
-               logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-			   MySQL_Conn(true);
-            } else {
-				logPrintf(logfile, "Server status for Server: %s:%s || Name: %s || Version: %s || Time: %ld || Room: %d || Key: %s set successfully.\n", ip, port, name, version, timestamp, room, key);
-            }
-          }
-        }
-     } else {
-            logPrintf(logfile, "IP %s is banned so do nothing.\n", ip);
-     }
-}
-
-void MySQL_ListServers(UINT32 id, UINT32 type, const char *ip, UINT32 room) {
-       msg_t msg;
-       int writecode;
-       MySQL_Conn(false);
-       msg.id = id;
-       msg.type = type;
-	   char servquery[1000];
-	   if(room == 0)
-		sprintf(servquery, "SELECT ip, port, name, version FROM ( SELECT * FROM `ms_servers` WHERE `upnow` = '1' ORDER BY `sid` ASC) as t2 ORDER BY `sticky` DESC");
-	   else
-	   {
-		char servqueryp1[1000] = "SELECT ip, port, name, version FROM ( SELECT * FROM `ms_servers` WHERE `upnow` = '1' AND `room` = '%d' ORDER BY `sid` ASC) as t2 ORDER BY `sticky` DESC";
-		sprintf(servquery, servqueryp1, room);
-	   }
-     if(!MySQL_CheckBan(ip,0,false,0)) {
-       logPrintf(mysqlfile, "Executing MySQL Query: %s\n", servquery);
-       if(mysql_query(conn, servquery)) {
-          logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-		  MySQL_Conn(true);
-       } else {
-          res = mysql_store_result(conn);
-          logPrintf(logfile, "Found %d servers...\n", mysql_num_rows(res));
-          while ((row = mysql_fetch_row(res)) != NULL)
-          {
-		msg_server_t *info = (msg_server_t *) msg.buffer;
-
-		info->header[0] = '\0'; // nothing interresting in it (for now)
-		strcpy(info->ip,      row[0]);
-		strcpy(info->port,    row[1]);
-		strcpy(info->name,    row[2]);
-		strcpy(info->version, row[3]);
-
-            msg.length = sizeof (msg_server_t);
-			msg.room = 0;
-            logPrintf(logfile, "Sending message?\n");
-            writecode = server_socket.write(&msg);
-            logPrintf(logfile, "Message sent! :D\n");
-            if (writecode < 0)
-            {
-		dbgPrintf(LIGHTRED, "Write error... %d client %d "
-		"deleted\n", writecode, id);
-		return;
-            }
-       }
-         mysql_free_result(res);
-       }
-     } else {
-            logPrintf(logfile, "IP %s is banned so do nothing.\n", ip);
-     }
-}
-
-void MySQL_ListRooms(UINT32 id, UINT32 type, const char *ip, bool sendtype) {
-	msg_t msg;
-	int writecode;
-	//(void)ip;
-	MySQL_Conn(false);
-	msg.id = id;
-	msg.type = type;
-	char roomquery[1000];
-	logPrintf(logfile, "Check their ban status first... (ID %d)\n",id);
-	if(MySQL_CheckBan(ip,id,true,sendtype))
-		return;
-
-	//Hmph!  I suppose it'll be up to me to handle this. ~Inuyasha
-	if (sendtype)
-	{
-		char overridequery[500];
-
-		sprintf(overridequery, "SELECT room_override FROM `ms_servers` WHERE `ip` = '%s' AND `room_override` > 0", ip);
-		logPrintf(mysqlfile, "Checking for room overrides! Executing MySQL Query: %s\n", overridequery);
-		if (mysql_query(conn, overridequery))
-		{
-			logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-			MySQL_Conn(true);
-			return;
-		}
-
-		res = mysql_store_result(conn);
-		if (mysql_num_rows(res) >= 1)
-		{
-			int overriddenRoom;
-
-			row = mysql_fetch_row(res);
-			overriddenRoom = atoi(row[0]);
-			mysql_free_result(res);
-
-			sprintf(roomquery, "SELECT room_id, title, motd FROM `ms_rooms` WHERE `room_id` = '%d' LIMIT 1", overriddenRoom);
-			if (mysql_query(conn, roomquery))
-			{
-				logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-				MySQL_Conn(true);
-				return;
-			}
-			res = mysql_store_result(conn);
-			if (mysql_num_rows(res) >= 1)
-			{
-				msg_rooms_t *info = (msg_rooms_t *) msg.buffer;
-				char roommotd[300];
-
-				row = mysql_fetch_row(res);
-
-				info->header[0] = '\0'; // nothing interesting in it (for now)
-				strcpy(info->name, row[1]);
-
-				// Just in case, let's make sure we don't overflow.
-				sprintf(roommotd, "\x85Your server has had a room override applied to it, so this is the only room you may host in.\x80\n\n%s", row[2]);
-				strncpy(info->motd, roommotd, 255);
-				info->motd[255] = '\0';
-
-				info->id = atoi(row[0]);
-
-				logPrintf(logfile, "Sending Room %s with ID %d and MOTD %s\n", info->name, info->id, info->motd);
-
-				msg.length = sizeof (msg_rooms_t);
-				msg.room = 0;
-				logPrintf(logfile, "Sending message?\n");
-				writecode = server_socket.write(&msg);
-				logPrintf(logfile, "Message sent! :D\n");
-				if (writecode < 0)
-				{
-					dbgPrintf(LIGHTRED, "Write error... %d client %d "
-					                    "deleted\n", writecode, id);
-				}
-				mysql_free_result(res);
-				return;
-			}
-			else
-			{
-				logPrintf(errorfile, "Someone's room override isn't set correctly! Room %d doesn't exist!", overriddenRoom);
-				mysql_free_result(res);
-			}
-		}
-	}
-
-	if(sendtype)
-		sprintf(roomquery, "SELECT room_id, title, motd FROM `ms_rooms` WHERE `private` = '0' AND `visible` = '1' ORDER BY `order` ASC");
-	 else
-		sprintf(roomquery, "SELECT room_id, title, motd FROM `ms_rooms` WHERE `visible` = '1' ORDER BY `order` ASC");
-	if(mysql_query(conn, roomquery)) {
-		logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-		MySQL_Conn(true);
-	} else
-	{
-		res = mysql_store_result(conn);
-		logPrintf(logfile, "Found %d rooms...\n", mysql_num_rows(res));
-		while ((row = mysql_fetch_row(res)) != NULL)
-		{
-			msg_rooms_t *info = (msg_rooms_t *) msg.buffer;
-
-			info->header[0] = '\0'; // nothing interresting in it (for now)
-			strcpy(info->name,	row[1]);
-			strcpy(info->motd,	row[2]);
-			info->id = atoi(row[0]);
-
-			logPrintf(logfile, "Sending Room %s with ID %d and MOTD %s\n", info->name, info->id, info->motd);
-
-			msg.length = sizeof (msg_rooms_t);
-			msg.room = 0;
-			logPrintf(logfile, "Sending message?\n");
-			writecode = server_socket.write(&msg);
-			logPrintf(logfile, "Message sent! :D\n");
-			if (writecode < 0)
-			{
-				dbgPrintf(LIGHTRED, "Write error... %d client %d "
-				                    "deleted\n", writecode, id);
-				return;
-			}
-		   }
-		 mysql_free_result(res);
-	}
-}
-
-void MySQL_CheckVersion(UINT32 id, UINT32 type, const char *ip, UINT32 modid, const char *modversion) {
-	msg_t msg;
-	int writecode;
-	(void)ip;
-	MySQL_Conn(false);
-	msg.id = id;
-	msg.type = type;
-	char versionquery[1000];
-	sprintf(versionquery, "SELECT * FROM `ms_versions` WHERE `mod_id` = '%d' AND `mod_version` > %s LIMIT 1",modid, modversion);
-	logPrintf(mysqlfile, "Executing MySQL Query: %s\n", versionquery);
-	if(mysql_query(conn, versionquery)) {
-		logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-		MySQL_Conn(true);
-	} else
-	{
-		res = mysql_store_result(conn);
-		if(mysql_num_rows(res) < 1)
-		{
-			logPrintf(logfile, "Buffer to NULL\n");
-			strcpy(msg.buffer,"NULL");
-		}
-		else
-		{
-			row = mysql_fetch_row(res);
-			logPrintf(logfile, "Version found: %s || Codebase: %s || Version: %s || Version String: %s || Mod ID: %s\n", row[4], row[3], row[1], row[2], row[0]);
-			strcpy(msg.buffer,row[2]);
-		}
-		msg.length = sizeof msg.buffer;
-		msg.room = 0;
-		logPrintf(logfile, "Sending message?\n");
-		writecode = server_socket.write(&msg);
-		logPrintf(logfile, "Message sent! :D\n");
-		if (writecode < 0)
-		{
-			dbgPrintf(LIGHTRED, "Write error... %d client %d "
-			                    "deleted\n", writecode, id);
-			return;
-		}
-		mysql_free_result(res);
-	}
-}
-
-void MySQL_ListServServers(UINT32 id, UINT32 type, const char *ip) {
-       msg_t msg;
-       int writecode;
-       static char str[1024];
-       //char banqueryp1[500] = "SELECT reason,name,FROM_UNIXTIME(endtime) FROM ms_bans WHERE INET_ATON('%s') BETWEEN `ipstart` AND `ipend` AND `endtime` < %ld LIMIT 1";
-       //char banquery[500];
-       //time_t current_time = time (NULL);
-       char servquery[1000] = "SELECT ip, port, name, version, permanent FROM ( SELECT * FROM `ms_servers` WHERE `upnow` = '1' OR `permanent` = '1' ORDER BY `sid` ASC) as ms_servers ORDER BY `sticky` DESC";
-       MySQL_Conn(false);
-     if(!MySQL_CheckBan(ip,0,false,0)) {
-       msg.id = id;
-       msg.type = type;
-	   msg.room = 0;
-       logPrintf(mysqlfile, "Executing MySQL Query: %s\n", servquery);
-       if(mysql_query(conn, servquery)) {
-          logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-		  MySQL_Conn(true);
-       } else {
-          res = mysql_store_result(conn);
-          logPrintf(logfile, "Found %d servers...\n", mysql_num_rows(res));
-          while ((row = mysql_fetch_row(res)) != NULL)
-	  {
-                if(strcmp(row[4], "0") == 1)
-                snprintf(str, sizeof str, "IP\t\t: %s\nPort\t\t: %s\nHostname\t: %s\nVersion\t\t: %s\nPermanent\t: %s\n", row[0], row[1], row[2], row[3], "Yes");
-		else
-                snprintf(str, sizeof str, "IP\t\t: %s\nPort\t\t: %s\nHostname\t: %s\nVersion\t\t: %s\nPermanent\t: %s\n", row[0], row[1], row[2], row[3], "No");
-
-        msg.length = (INT32)(strlen(str)+1); // send also the '\0'
-		strcpy(msg.buffer, str);
-		dbgPrintf(CYAN, "Writing: (%d)\n%s\n", msg.length, msg.buffer);
-		writecode = server_socket.write(&msg);
-		if (writecode < 0)
-		{
-			dbgPrintf(LIGHTRED, "Write error... %d client %d deleted\n", writecode, id);
-			return;
-		}
-	 }
-         mysql_free_result(res);
-       }
-     } else {
-            logPrintf(logfile, "IP %s is banned so do nothing! Let them find out for themselves.\n", ip);
-     }
-}
-
-void MySQL_RemoveServer(char *ip, char *port, char *name, char *version) {
-        char escapedName[255];
-        char updatequery[5000];
-        char updatequeryp1[5000] = "UPDATE `ms_servers` SET upnow = '0' WHERE `ip` = '%s' AND `permanent` = '0'";
-        MySQL_Conn(false);
-        mysql_real_escape_string(conn, escapedName, name, (unsigned long)strlen(name));
-        sprintf(updatequery, updatequeryp1, ip);
-        logPrintf(mysqlfile, "Executing MySQL Query: %s\n", updatequery);
-        if(mysql_query(conn, updatequery)) {
-           logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-		   MySQL_Conn(true);
-        } else {
-           logPrintf(logfile, "Server: %s:%s || Name: %s || Version: %s removed successfully.\n", ip, port, name, version);
-        }
-}
-
-/* LIVE FUNCTIONS */
-void LIVE_AuthUser(UINT32 id, char *buffer)
-{
-	msg_live_auth_t *auth;
-	char escapedName[255];
-	char saltedPassword[62];
-	char hashedPassword[34];
-	char namequery[1000];
-	char namequeryp1[1000] = "SELECT username,userid,salt,password FROM `user` WHERE `username` = '%s' LIMIT 1";
-	char userquery[1000];
-	char userqueryp1[1000] = "SELECT userid,username,live_authkey,live_publickey FROM `user` WHERE `userid` = '%s' LIMIT 1";
-	msg_t msg2;
-	char ip[32];
-	int writecode;
-	msg2.type = LIVE_INVALID_USER;
-
-	auth = (msg_live_auth_t *)buffer;
-
-	logPrintf(logfile, "Got User %s Pass %s\n", auth->username, auth->password);
-	// retrieve the true ip of the server
-	strcpy(ip, server_socket.getClientIP(id));
-	MySQL_Conn(false);
-	msg2.id = id;
-	logPrintf(logfile, "Check their ban status first... (ID %d)\n",id);
-	if(MySQL_CheckBan(ip,0,false,0))
-		return;
-	mysql_real_escape_string(conn, escapedName, auth->username, (unsigned long)strlen(auth->username));
-	sprintf(namequery, namequeryp1, escapedName);
-	logPrintf(mysqlfile, "Executing MySQL Query: %s\n", namequery);
-    if(mysql_query(conn, namequery)) {
-		logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-		MySQL_Conn(true);
-	} else {
-		res = mysql_store_result(conn);
-		if(mysql_num_rows(res) < 1)
-		{
-			logPrintf(logfile, "Invalid user: %s\n", auth->username);
-			msg2.type = LIVE_INVALID_USER;
-		}
-		else
-		{
-			row = mysql_fetch_row(res);
-			sprintf(saltedPassword, "%s%s", auth->password, row[2]);
-			logPrintf(logfile, "Pre-hash: %s (Salt is %s)\n", saltedPassword, row[2]);
-			sprintf(hashedPassword, md5(saltedPassword).c_str());
-			logPrintf(logfile, "Got Hashed Password: %s\n", hashedPassword);
-			if(strcmp(hashedPassword, row[3]) != 0)
-			{
-				msg2.type = LIVE_INVALID_USER;
-				logPrintf(logfile, "INVALID USER!\n");
-			} else {
-				msg2.type = LIVE_SEND_USER;
-				sprintf(userquery, userqueryp1, row[1]);
-				mysql_free_result(res);
-				logPrintf(mysqlfile, "Executing MySQL Query: %s\n", userquery);
-			    if(mysql_query(conn, userquery)) {
-					logPrintf(errorfile, "MYSQL ERROR: %s\n", mysql_error(conn));
-					MySQL_Conn(true);
-				} else {
-					res = mysql_store_result(conn);
-					if(mysql_num_rows(res) < 1)
-					{
-						logPrintf(errorfile, "User Information Error, invalid USER ID!\n");
-						msg2.type = LIVE_INVALID_USER;
-					} else {
-						row = mysql_fetch_row(res);
-						msg_live_user_t *user = (msg_live_user_t *) msg2.buffer;
-
-						user->header[0] = '\0'; // nothing interresting in it (for now)
-						user->uid = atoi(row[0]);
-						strcpy(user->username,	row[1]);
-						logPrintf(logfile, "Found user: %s, id %s\n", row[1], row[0]);
-						logPrintf(logfile, "Sending User %s with ID %d\n", user->username, user->uid);
-
-						msg2.length = sizeof (msg_live_user_t);
-					}
-				}
-			}
-		}
-	}
-	msg2.length = sizeof msg2.buffer;
-	msg2.room = 0;
-	logPrintf(logfile, "Sending message?\n");
-	writecode = server_socket.write(&msg2);
-	logPrintf(logfile, "Message sent! :D\n");
-	if (writecode < 0)
-	{
-		dbgPrintf(LIGHTRED, "Write error... %d client %d "
-		                    "deleted\n", writecode, id);
-		return;
-	}
-	mysql_free_result(res);
-}
-
-/*
-** sendServersInformations()
-*/
-static void sendServersInformations(UINT32 id, UINT32 room)
-{
-	msg_t msg;
-	int writecode;
-	char ip[16];
-        strcpy(ip, server_socket.getClientIP(id));
-	(void)room;
-	logPrintf(logfile, "Sending servers informations\n");
-	msg.id = id;
-	msg.type = SEND_SERVER_MSG;
-	msg.room = 0;
-	MySQL_ListServServers(id, SEND_SERVER_MSG, ip); // Awesome new MySQL Code!
-	msg.length = 0;
-	//dbgPrintf(CYAN, "Writing: (%d) %s\n", msg.length, "");
-	writecode = server_socket.write(&msg);
-	if (writecode < 0)
-	{
-		dbgPrintf(LIGHTRED, "Write error... %d client %d deleted\n",
-			writecode, id);
-	}
-}
-
-/*
-** sendShortServersInformations()
-*/
-static void sendShortServersInformations(UINT32 id, UINT32 room)
-{
-	msg_t msg;
-	int writecode;
-	char ip[16];
-        strcpy(ip, server_socket.getClientIP(id));
-
-	logPrintf(logfile, "Sending short servers informations\n");
-	msg.id = id;
-	msg.type = SEND_SHORT_SERVER_MSG;
-	MySQL_ListServers(id, SEND_SHORT_SERVER_MSG, ip, room); // New code that's full of win!
-	logPrintf(logfile, "Packet Room: %d\n", room);
-	msg.length = 0;
-	writecode = server_socket.write(&msg);
-	if (writecode < 0)
-	{
-		dbgPrintf(LIGHTRED, "Write error... %d client %d deleted\n",
-			writecode, id);
-	}
-}
-
-/*
-** sendRoomInformations()
-*/
-static void sendRoomInformations(UINT32 id, UINT32 room, bool type)
-{
-	msg_t msg;
-	int writecode;
-	char ip[16];
-        strcpy(ip, server_socket.getClientIP(id));
-	(void)room;
-	logPrintf(logfile, "Sending room information\n");
-	msg.id = id;
-	msg.type = SEND_ROOMS_MSG;
-	msg.room = 0;
-	MySQL_ListRooms(id, SEND_ROOMS_MSG, ip, type); // New code that's full of win!
-	msg.length = 0;
-	writecode = server_socket.write(&msg);
-	if (writecode < 0)
-	{
-		dbgPrintf(LIGHTRED, "Write error... %d client %d deleted\n",
-			writecode, id);
-	}
-}
-
-/*
-** sendVersionInformations()
-*/
-static void sendVersionInformations(UINT32 id, UINT32 modid, char *modversion)
-{
-	msg_t msg;
-	int writecode;
-	char ip[16];
-        strcpy(ip, server_socket.getClientIP(id));
-
-	logPrintf(logfile, "Sending version information\n");
-	msg.id = id;
-	msg.type = SEND_VERSION_MSG;
-	msg.room = 0;
-	MySQL_CheckVersion(id, SEND_VERSION_MSG, ip, modid, modversion); // New code that's full of win!
-	msg.length = sizeof msg.buffer;
-	writecode = server_socket.write(&msg);
-	if (writecode < 0)
-	{
-		dbgPrintf(LIGHTRED, "Write error... %d client %d deleted\n",
-			writecode, id);
-	}
-}
-
-/*
-** addServer()
-*/
-static void addServer(int id, char *buffer, bool firstadd)
-{
-	msg_server_t *info;
-	char oldversion = 0;
-
-	//TODO: Be sure there is no flood from a given IP:
-	//      If a host need more than 2 servers, then it should be registrated
-	//      manually
-
-	info = (msg_server_t *)buffer;
-
-	// I want to be sure the informations are correct, of course!
-	info->port[sizeof (info->port)-1] = '\0';
-	info->name[sizeof (info->name)-1] = '\0';
-	info->version[sizeof (info->version)-1] = '\0';
-	// retrieve the true ip of the server
-	strcpy(info->ip, server_socket.getClientIP(id));
-	//strcpy(info->port, server_socket.getClientPort(id));
-
-	if (info->version[0] == '1' &&
-		info->version[1] == '.' &&
-		info->version[2] == '0' &&
-		info->version[3] == '9' &&
-		info->version[4] == '.')
-		{
-			if ((info->version[5] == '2') || (info->version[5] == '3'))
-			{
-					oldversion = 1;
-			}
-		}
-
-	if (info->version[0] == '1' &&
-		info->version[1] == '.' &&
-		info->version[2] == '6' &&
-		info->version[3] == '9' &&
-		info->version[4] == '.' &&
-		info->version[5] == '6')
-		{
-					oldversion = 1;
-		}
-
-	if (!oldversion)
-	{
-		MySQL_AddServer(info->ip, info->port, info->name, info->version, info->room, firstadd, info->key);
-	}
-	else
-	{
-		logPrintf(logfile, "Not adding the temporary server: %s %s %s %s\n", info->ip, info->port, info->name, info->version);
-	}
-}
-
-/*
-** removeServer()
-*/
-static void removeServer(int id, char *buffer)
-{
-	msg_server_t *info;
-
-	info = (msg_server_t *)buffer;
-
-	// I want to be sure the informations are correct, of course!
-	info->port[sizeof (info->port)-1] = '\0';
-	info->name[sizeof (info->name)-1] = '\0';
-	info->version[sizeof (info->version)-1] = '\0';
-
-	// retrieve the true ip of the server
-	strcpy(info->ip, server_socket.getClientIP(id));
-
-	logPrintf(logfile, "Removing the temporary server: %s %s %s %s\n", info->ip, info->port, info->name, info->version);
-	MySQL_RemoveServer(info->ip, info->port, info->name, info->version); // New and win.
-}
-
-/*
-** analyseUDP()
-*/
-static int analyseUDP(size_t size, const char *buffer)
-{
-	// this would be the part of reading the PT_SERVERINFO packet,
-	// but i'm not about to backport that sloppy code
-	(void)size;
-	(void)buffer;
-	return INVALID_MSG;
-}
-
-/*
-** UDPMessage()
-*/
-static int UDPMessage(size_t size, const char *buffer)
-{
-	if (size == 4)
-	{
-		return 0;
-	}
-	else if (size == sizeof(ms_holepunch_packet_t))
-	{
-		return 0;
-	}
-	else if (size > 58)
-	{
-		dbgPrintf(LIGHTGREEN, "Got a UDP %d byte long message\n", size);
-		return analyseUDP(size, buffer);
-	}
-	else
-		return INVALID_MSG;
-}
-
-/*
-** analyseMessage()
-*/
-static int analyseMessage(msg_t *msg)
-{
-	switch (msg->type)
-	{
-	case UDP_RECV_MSG:
-		return UDPMessage(msg->length, msg->buffer);
-	case ACCEPT_MSG:
-		break;
-	case ADD_SERVER_MSG:
-		addServer(msg->id, msg->buffer, true);
-		break;
-	case PING_SERVER_MSG:
-		addServer(msg->id, msg->buffer, false);
-		break;
-	case REMOVE_SERVER_MSG:
-		removeServer(msg->id, msg->buffer);
-		break;
-	case GET_SERVER_MSG:
-		sendServersInformations(msg->id, msg->room);
-		break;
-	case GET_SHORT_SERVER_MSG:
-		sendShortServersInformations(msg->id, msg->room);
-		break;
-	case GET_ROOMS_MSG:
-		sendRoomInformations(msg->id, msg->room, 0);
-		break;
-	case GET_ROOMS_HOST_MSG:
-		sendRoomInformations(msg->id, msg->room, 1);
-		break;
-	case GET_VERSION_MSG:
-		sendVersionInformations(msg->id, msg->room, msg->buffer);
-		break;
-	case LIVE_AUTH_USER:
-		LIVE_AuthUser(msg->id, msg->buffer);
-		break;
-	default:
-		return INVALID_MSG;
-	}
-	return 0;
-}
-
-/*
-** main()
-*/
-int main(int argc, char *argv[])
-{
-	msg_t msg;
-#ifdef __unix__
-	pid_t pid;
-	char pidstr[12];
-#endif
-
-	if (argc <= 1)
-	{
-		fprintf(stderr, "usage: %s port\n", argv[0]);
-		exit(1);
-	}
-
-	if (server_socket.listen(argv[1]) < 0)
-	{
-		fprintf(stderr, "Error while initializing the server\n");
-		exit(2);
-	}
-
-	logfile = openFile("server.log");
-	errorfile = openFile("error.log");
-	mysqlfile = openFile("mysql.log");
-	sockfile = openFile("sockets.log");
-	MySQL_Conn(false);
-#if !defined (DEBUG) && defined (__unix__)
-	pid = fork();
-	switch (pid)
-	{
-	case 0: break;  // child
-	case -1: printf("Error while launching the server in background\n"); return -1;
-	default:
-		pidfile = fopen("msd.pid", "w+");
-		sprintf(pidstr, "%d", pid);
-		fputs(pidstr, pidfile);
-		fclose(pidfile);
-		return 0; // parent: keep child in background
-	}
-#endif
-	srand((unsigned)time(NULL)); // Alam: GUIDs
-	for (;;)
-	{
-		memset(&msg, 0, sizeof (msg)); // remove previous message
-		if (!server_socket.read(&msg))
-		{
-			// valid message: header message seems ok
-			analyseMessage(&msg);
-			//servers_list.show(); // for debug purpose
-		}
-	}
-
-#ifndef _MSC_VER
-	/* NOTREACHED */
-	return 0;
-#endif
-}
diff --git a/tools/masterserver/srvlist.cpp b/tools/masterserver/srvlist.cpp
deleted file mode 100644
index c9a6feea9..000000000
--- a/tools/masterserver/srvlist.cpp
+++ /dev/null
@@ -1,405 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-
-#ifdef __GNUC__
-#include <unistd.h>
-#endif
-#include <typeinfo>
-#include "common.h"
-#include "srvlist.h"
-
-//=============================================================================
-
-/*
-**
-*/
-CList::CList()
-{
-	list = NULL;
-	current = NULL;
-}
-
-/*
-**
-*/
-CList::~CList()
-{
-	CItem *p;
-
-	while (list)
-	{
-		p = list;
-		list = list->next;
-		delete(p);
-	}
-}
-
-/*
-**
-*/
-int CList::insert(CItem *item)
-{
-	item->next = list;
-	list = item;
-	return 0;
-}
-
-/*
-**
-*/
-int CList::remove(CItem *item)
-{
-	CItem *position, *q;
-
-	q = NULL;
-	position = list;
-
-	while (position && (position != item))
-	{
-		q = position;
-		position = position->next;
-	}
-	if (position)
-	{
-		if (q)
-			q->next = position->next;
-		else
-			list = position->next;
-		delete position;
-
-		return 1;
-	}
-
-	return 0;
-}
-
-/*
-**
-*/
-CItem *CList::getFirst()
-{
-	current = list;
-	return current;
-}
-
-/*
-**
-*/
-CItem *CList::getNext()
-{
-	if (current)
-		current = current->next;
-	return current;
-}
-
-/*
-**
-*/
-void CList::show()
-{
-	CItem *p;
-
-	p = list;
-	while (p)
-	{
-		p->print();
-		p = p->next;
-	}
-}
-
-//=============================================================================
-
-/*
-**
-*/
-CItem::CItem()
-{
-	next = NULL;
-}
-
-//=============================================================================
-
-/*
-**
-*/
-CInetAddr::CInetAddr(const char *ip, const char *port)
-{
-	strcpy(this->ip, ip);
-	strcpy(this->port, port);
-	PortNotChanged = true;
-}
-
-/*
-**
-*/
-const char *CInetAddr::getIP()
-{
-	return ip;
-}
-
-/*
-**
-*/
-const char *CInetAddr::getPort()
-{
-	return port;
-}
-
-/*
-**
-*/
-bool CInetAddr::setPort(const char *port)
-{
-	if (PortNotChanged)
-	{
-		strcpy(this->port, port);
-		PortNotChanged = false;
-	}
-	return !PortNotChanged;
-}
-
-//=============================================================================
-
-/*
-**
-*/
-CPlayerItem::CPlayerItem(const char *ip, const char *port,
-	const char *nickname) : CInetAddr(ip, port)
-{
-	strcpy(this->nickname, nickname);
-}
-
-/*
-**
-*/
-void CPlayerItem::print()
-{
-	dbgPrintf(GREEN, "\tIP\t\t: %s\n\tPort\t\t: %s\n\tNickname\t: %s\n",
-		ip, port, nickname);
-}
-
-/*
-**
-*/
-char *CPlayerItem::getString()
-{
-	static char tmpbuf[1024];
-
-	snprintf(tmpbuf, sizeof tmpbuf,
-		"\tIP\t\t: %s\n\tPort\t\t: %s\n\tNickname\t: %s\n",
-		ip, port, nickname);
-	return tmpbuf;
-}
-
-//=============================================================================
-
-/*
-**
-*/
-CServerItem::CServerItem(const char *ip, const char *port, const char *hostname, const char *version, ServerType type) : CInetAddr(ip, port)
-{
-	time_t timenow = time(NULL);
-	const tm *timeGMT = gmtime(&timenow);
-	// check name of server here
-	strcpy(this->hostname, hostname);
-	strcpy(this->version, version);
-	this->type = type;
-	strftime(reg_time, REG_TIME_SIZE+1, "%Y-%m-%dT%H:%MZ",timeGMT);
-	{
-		int i;
-		memset(guid,'\0',GUID_SIZE);
-		strcpy(&guid[0], ip);
-		strcpy(&guid[15], port); // GenUID
-		for (i = 0; i <= GUID_SIZE-1; i++)
-		{
-			if (guid[i] == '\0' || guid[i] == '.')
-				guid[i] = '0' + (rand()/(RAND_MAX/15));
-			if (guid[i] > '9')
-				guid[i] += 'A'-'9';
-		}
-		guid[GUID_SIZE] = '\0';
-	}
-
-	HeartBeat = time(NULL);
-}
-
-/*
-**
-*/
-void CServerItem::print()
-{
-	dbgPrintf(GREEN, "IP\t\t: %s\nPort\t\t: %s\nHostname\t: %s\nVersion\t: %s\nPermanent\t: %s\n",
-		ip, port, hostname, version, (type == ST_PERMANENT) ? "Yes" : "No");
-}
-
-/*
-**
-*/
-const char *CServerItem::getString()
-{
-	static char tmpbuf[1024];
-
-	snprintf(tmpbuf, sizeof tmpbuf,
-		"IP\t\t: %s\nPort\t\t: %s\nHostname\t: %s\nVersion\t\t: %s\nPermanent\t: %s\n",
-		ip, port, hostname, version, (type==ST_PERMANENT) ? "Yes" : "No");
-	return tmpbuf;
-}
-
-/*
-**
-*/
-const char *CServerItem::getName()
-{
-	return hostname;
-}
-
-/*
-**
-*/
-const char *CServerItem::getVersion()
-{
-	return version;
-}
-
-/*
-**
-*/
-const char *CServerItem::getGuid()
-{
-	return guid;
-}
-
-/*
-**
-*/
-const char *CServerItem::getRegtime()
-{
-	return reg_time;
-}
-
-/*
-**
-*/
-//=============================================================================
-
-/*
-**
-*/
-void CServerList::insertPlayer(CServerItem *server, CPlayerItem *player)
-{
-	server->players_list.insert(player);
-}
-
-/*
-**
-*/
-void CServerList::removePlayer(CServerItem *server, CPlayerItem *player)
-{
-	server->players_list.remove(player);
-}
-
-/*
-**
-*/
-int CServerList::insert(CServerItem *server)
-{
-	CList::insert((CItem *)server);
-	return 0;
-}
-
-/*
-**
-*/
-int CServerList::insert(const char *ip, const char *port,
-	const char *hostname, const char *version, ServerType type)
-{
-	CServerItem *server;
-
-	server = new CServerItem(ip, port, hostname, version, type);
-	CList::insert(server);
-	return 0;
-}
-
-/*
-**
-*/
-int CServerList::remove(CServerItem *server)
-{
-	return CList::remove((CItem *)server);
-}
-
-/*
-**
-*/
-int CServerList::remove(const char *ip, const char *port,
-	const char *hostname, const char *version, ServerType type)
-{
-	// TODO
-	CServerItem *position, *q;
-	bool match;
-
-	(void)hostname;
-	(void)port;
-
-	match = false;
-	position = (CServerItem *)list;
-	q = NULL;
-
-	while (position && !match)
-	{
-		if (strcmp(position->ip, ip) == 0
-			&& strcmp(position->version, version) == 0
-			&& strcmp(position->port, port) == 0
-			&& position->type == type)
-		{
-			match = true;
-		}
-		else
-		{
-			q = position;
-			position = (CServerItem *)position->next;
-		}
-	}
-	if (position && match)
-	{
-		if (q)
-			q->next = position->next;
-		else
-			list = position->next;
-		delete position;
-
-		return 1;
-	}
-
-	return 0;
-}
-
-/*
-**
-*/
-void CServerList::show()
-{
-	CServerItem *p;
-
-	p = (CServerItem *)list;
-	while (p)
-	{
-		p->print();
-		p->players_list.show();
-		p = (CServerItem *)p->next;
-	}
-}
diff --git a/tools/masterserver/srvlist.h b/tools/masterserver/srvlist.h
deleted file mode 100644
index aa582ff8b..000000000
--- a/tools/masterserver/srvlist.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-
-#ifndef SRVLIST_H
-#define SRVLIST_H
-
-#include <time.h>
-
-enum ServerType
-{
-	ST_PERMANENT = 0,
-	ST_TEMPORARY,
-};
-
-//=============================================================================
-
-class CItem
-{
-	friend class CList;
-protected:
-	CItem *next;
-public:
-	CItem();
-	virtual ~CItem() {}; // destructor must exist and be virtual
-	virtual void print() = 0;
-};
-
-//=============================================================================
-
-class CList
-{
-protected:
-	CItem *list;
-	CItem *current; // the current item we are pointing on (for getfirst/getnext)
-public:
-	CList();
-	virtual ~CList();
-	int insert(CItem *);
-	int remove(CItem *);
-	CItem *getFirst();
-	CItem *getNext();
-	void show();
-};
-
-//=============================================================================
-
-class CInetAddr
-{
-protected:
-	char ip[16];
-	char port[8];
-	bool PortNotChanged;
-public:
-	CInetAddr(const char *ip, const char *port);
-	const char *getIP();
-	bool setPort(const char *port);
-	const char *getPort();
-};
-
-//=============================================================================
-
-class CPlayerItem : public CItem, public CInetAddr
-{
-friend class CPlayerList;
-private:
-	char nickname[32];
-public:
-	CPlayerItem(const char *ip, const char *port, const char *nickname);
-	void print();
-	char *getString();
-};
-
-//=============================================================================
-
-class CPlayerList : public CList
-{
-};
-
-//=============================================================================
-
-#define REG_TIME_SIZE 24   //1970-00-00T00:00:00.0+00:00
-#define GUID_SIZE 24-1 // format is 12700000000105000
-
-class CServerItem : public CItem, public CInetAddr
-{
-	friend class CServerList;
-
-private:
-	char hostname[32];
-	char version[8]; // format is: x.yy.z (like 1.30.2 or 1.31)
-	CPlayerList players_list;
-	char reg_time[REG_TIME_SIZE];
-	char guid[GUID_SIZE+1];
-
-public:
-	ServerType type;
-	time_t HeartBeat;
-
-	CServerItem(const char *ip, const char *port, const char *hostname, const char *version, ServerType type);
-	void print();
-	const char *getString();
-	const char *getName();
-	const char *getVersion();
-	const char *getRegtime();
-	const char *getGuid();
-};
-
-//=============================================================================
-
-class CServerList : public CList
-{
-public:
-	void insertPlayer(CServerItem *server, CPlayerItem *player);
-	void removePlayer(CServerItem *server, CPlayerItem *player);
-	int insert(const char *ip, const char *port, const char *hostname, const char *version, ServerType type);
-	int insert(CServerItem *server);
-	int remove(const char *ip, const char *port, const char *hostname, const char *version, ServerType type);
-	int remove(CServerItem *server);
-	void show();
-};
-
-#endif
diff --git a/tools/masterserver/stats.cpp b/tools/masterserver/stats.cpp
deleted file mode 100644
index 741d82699..000000000
--- a/tools/masterserver/stats.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-
-#ifdef __GNUC__
-#include <unistd.h>
-#endif
-#include <string.h>      // strcat(),...
-#include "common.h"
-#include "ipcs.h"
-#include "stats.h"
-
-//=============================================================================
-
-/*
-** CServerStats()
-*/
-CServerStats::CServerStats()
-{
-	uptime = time(NULL);
-	num_connections = 0;
-	num_http_con = 0;
-	num_servers = 0;
-	snprintf(motd, sizeof motd, "%s%s", "Welcome to the SRB2 Master Server!<br>", SERVERMOTDTEXT);
-	num_add = 0;
-	num_removal = 0;
-	num_retrieval = 0;
-	num_autoremoval = 0;
-	num_badconnection = 0;
-	for (int i = 0; i < NUMLASTSERVERS; i++)
-	{
-		strcpy(last_server[i].ip, "0.0.0.0");
-		strcpy(last_server[i].name, "Non-Existing SRB2 server");
-		strcpy(last_server[i].version, "0.0.0");
-	}
-	snprintf(version, sizeof version, "%s %s", __DATE__, __TIME__);
-}
-
-/*
-** ~CServerStats()
-*/
-CServerStats::~CServerStats()
-{
-}
-
-/*
-** getUptime()
-*/
-const char *CServerStats::getUptime()
-{
-	char *res = ctime(&uptime);
-	res[strlen(res)-1] = '\0'; // remove the '\n' at the end
-	return res;
-}
-
-/*
-** getHours()
-*/
-int CServerStats::getHours()
-{
-	return (int)(((time(NULL) - uptime)/(60*60))%24);
-}
-
-/*
-** getDays()
-*/
-int CServerStats::getDays()
-{
-	return (int)((time(NULL) - uptime)/(60*60*24));
-}
-
-/*
-** getMotd()
-*/
-const char *CServerStats::getMotd()
-{
-	return motd;
-}
-
-/*
-** getLastServers()
-*/
-const char *CServerStats::getLastServers()
-{
-	static char res[170*NUMLASTSERVERS];
-
-	tzset();
-	res[0] = '\0';
-	for (int i = 0; i < NUMLASTSERVERS; i++)
-	{
-		char str[170];
-		char *ct;
-
-		ct = ctime(&last_time[i]);
-		ct[strlen(ct)-1] = '\0'; // replace \n with a \0
-		snprintf(str, sizeof str,
-			"Address: %15s   Name: %-31s   v%-7s   (%s %s)\n000043210000",
-			last_server[i].ip, last_server[i].name, last_server[i].version, ct, tzname[0]);
-		strcat(res, str);
-	}
-
-	return res;
-}
-
-/*
-** getVersion()
-*/
-const char *CServerStats::getVersion()
-{
-	return version;
-}
-
-/*
-** putMotd()
-*/
-void CServerStats::putMotd(char *motd)
-{
-	strcpy(this->motd, motd);
-}
-
-/*
-** putLastServer():
-*/
-void CServerStats::putLastServer(msg_server_t *server)
-{
-	for (int i = NUMLASTSERVERS-1; i > 0; i--)
-	{
-		memcpy(&last_server[i], &last_server[i-1],
-			sizeof (msg_server_t));
-		last_time[i] = last_time[i-1];
-	}
-	memcpy(&last_server[0], server, sizeof (msg_server_t));
-	last_time[0] = time(NULL);
-}
diff --git a/tools/masterserver/stats.h b/tools/masterserver/stats.h
deleted file mode 100644
index 4494a76f9..000000000
--- a/tools/masterserver/stats.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// Copyright (C) 2000 by DooM Legacy Team.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-//-----------------------------------------------------------------------------
-
-#ifndef _STATS_H_
-#define _STATS_H_
-#ifndef _IPCS_H_
-#error "You forget to include ipcs.h"
-#endif
-#include <time.h>
-
-#define NUMLASTSERVERS 6
-#define SERVERMOTDTEXT "No Clans, advertising websites, Chat, Hangout, Hacked, or Role Playing Servers Allowed"
-
-
-// ================================ DEFINITIONS ===============================
-
-class CServerStats
-{
-	time_t uptime; // master server uptime
-	char motd[2048]; // increase that if not enough
-	msg_server_t last_server[NUMLASTSERVERS]; // keep last 6 named registered servers
-	time_t last_time[NUMLASTSERVERS]; // keep date/time of registration of those servers
-	char version[32]; // master server version
-
-public:
-	int num_connections;
-	int num_http_con;
-	int num_text_con;
-	int num_RSS92_con;
-	int num_RSS10_con;
-	int num_servers;
-	int num_add;
-	int num_removal;
-	int num_retrieval;
-	int num_autoremoval;
-	int num_badconnection;
-
-	CServerStats();
-	~CServerStats();
-	const char *getUptime();
-	int getHours();
-	int getDays();
-	const char *getMotd();
-	const char *getLastServers();
-	const char *getVersion();
-	void putMotd(char *);
-	void putLastServer(msg_server_t *);
-};
-
-// ================================== PROTOS ==================================
-
-// ================================== EXTERNS =================================
-
-#endif
diff --git a/tools/masterserver/structure.sql b/tools/masterserver/structure.sql
deleted file mode 100644
index 3cc2cb15b..000000000
--- a/tools/masterserver/structure.sql
+++ /dev/null
@@ -1,117 +0,0 @@
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-SET AUTOCOMMIT = 0;
-START TRANSACTION;
-SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8mb4 */;
-
---
--- Database: `srb2ms`
---
-
-CREATE DATABASE IF NOT EXISTS `srb2ms` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-USE `srb2ms`;
-
-
--- --------------------------------------------------------
-
---
--- Table structure for table `ms_bans`
---
-
-CREATE TABLE `ms_bans` (
-  `bid` int(11) DEFAULT NULL,
-  `ipstart` int(11) DEFAULT NULL,
-  `ipend` int(11) DEFAULT NULL,
-  `full_endtime` int(11) DEFAULT NULL,
-  `permanent` tinyint(1) DEFAULT NULL,
-  `hostonly` tinyint(1) DEFAULT NULL,
-  `reason` text COLLATE utf8mb4_unicode_ci
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `ms_rooms`
---
-
-CREATE TABLE `ms_rooms` (
-  `room_id` int(11) NOT NULL,
-  `title` text COLLATE utf8mb4_unicode_ci NOT NULL,
-  `motd` text COLLATE utf8mb4_unicode_ci NOT NULL,
-  `visible` tinyint(1) NOT NULL,
-  `order` int(11) NOT NULL,
-  `private` tinyint(1) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
---
--- Dumping data for table `ms_rooms`
---
-
-INSERT INTO `ms_rooms` (`room_id`, `title`, `motd`, `visible`, `order`, `private`) VALUES
-(10, 'Example', 'Example Room', 1, 0, 0),
-(0, 'All', 'View all of the servers currently being hosted.', 1, 1, 1);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `ms_servers`
---
-
-CREATE TABLE `ms_servers` (
-  `sid` int(11) NOT NULL,
-  `name` text COLLATE utf8mb4_unicode_ci NOT NULL,
-  `ip` text COLLATE utf8mb4_unicode_ci NOT NULL,
-  `port` int(11) NOT NULL,
-  `version` text COLLATE utf8mb4_unicode_ci NOT NULL,
-  `timestamp` int(11) NOT NULL,
-  `room` int(11) NOT NULL,
-  `key` text COLLATE utf8mb4_unicode_ci NOT NULL,
-  `room_override` int(11) NOT NULL,
-  `upnow` tinyint(1) NOT NULL,
-  `permanent` tinyint(1) NOT NULL,
-  `delisted` tinyint(1) NOT NULL,
-  `sticky` int(11) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
--- --------------------------------------------------------
-
---
--- Table structure for table `ms_versions`
---
-
-CREATE TABLE `ms_versions` (
-  `mod_id` int(11) NOT NULL,
-  `mod_version` int(11) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
---
--- Dumping data for table `ms_versions`
---
-
-INSERT INTO `ms_versions` (`mod_id`, `mod_version`) VALUES
-(12, 25);
-
--- --------------------------------------------------------
-
---
--- Table structure for table `user`
---
-
-CREATE TABLE `user` (
-  `userid` int(11) NOT NULL,
-  `username` text COLLATE utf8mb4_unicode_ci NOT NULL,
-  `live_authkey` blob NOT NULL,
-  `live_publickey` blob NOT NULL,
-  `salt` blob NOT NULL,
-  `password` blob NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-COMMIT;
-
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/tools/srb2msns/elements/srb2ms.RDF b/tools/srb2msns/elements/srb2ms.RDF
deleted file mode 100644
index 46b3c81f0..000000000
--- a/tools/srb2msns/elements/srb2ms.RDF
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE rdf:RDF [
-    <!ENTITY rdfns 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
-    <!ENTITY rdfsns 'http://www.w3.org/2000/01/rdf-schema#'>
-    <!ENTITY srb2msns 'http://srb2.servegame.org/srb2ms/elements/'>
-    <!ENTITY srb2mstypens 'http://srb2.servegame.org/srb2ms/srb2msmitype/'>
-]>
-<rdf:RDF xmlns:srb2ms="http://srb2.servegame.org/srb2ms/elements/" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-<rdf:Description rdf:about="http://srb2.servegame.org/srb2ms/elements/">
-<srb2ms:title xml:lang="en-US">The SRB2MS Element Set namespace providing access 
-to its content by means of an RDF Schema</srb2ms:title>
-<srb2ms:publisher xml:lang="en-US">Logan Arias</srb2ms:publisher>
-<srb2ms:description xml:lang="en-US">The SRB2MS Element Set namespace provides 
-URIs for the SRB2MS Elements. Entries are declared using RDF Schema language 
-to support RDF applications.</srb2ms:description>
-<srb2ms:language xml:lang="en-US">English</srb2ms:language>
-</rdf:Description>
-<rdf:Property rdf:about="http://srb2.servegame.org/srb2ms/elements/#Address">
-<rdfs:label xml:lang="en-US">Address</rdfs:label>
-<rdfs:comment xml:lang="en-US">The IPv4 address of the server item.</rdfs:comment>
-<rdfs:isDefinedBy rdf:resource="http://srb2.servegame.org/srb2ms/elements/"/>
-<srb2ms:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
-</rdf:Property>
-<rdf:Property rdf:about="http://srb2.servegame.org/srb2ms/elements/#creator">
-<rdfs:label xml:lang="en-US">Port</rdfs:label>
-<rdfs:comment xml:lang="en-US">The Port number of the server item.</rdfs:comment>
-<rdfs:isDefinedBy rdf:resource="http://srb2.servegame.org/srb2ms/elements/"/>
-<srb2ms:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
-</rdf:Property>
-<rdf:Property rdf:about="http://srb2.servegame.org/srb2ms/elements/#subject">
-<rdfs:label xml:lang="en-US">Version</rdfs:label>
-<rdfs:comment xml:lang="en-US">Version number of the server item.</rdfs:comment>
-<rdfs:isDefinedBy rdf:resource="http://srb2.servegame.org/srb2ms/elements/"/>
-<srb2ms:type rdf:resource="http://dublincore.org/usage/documents/principles/#element"/>
-</rdf:Property>
-</rdf:RDF>
diff --git a/tools/wadconv/Makefile b/tools/wadconv/Makefile
deleted file mode 100644
index d11fbf6ce..000000000
--- a/tools/wadconv/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/env make -f
-
-## wadconv: SRB2 WAD Converter.
-## Copyright (C) 2011 by Callum Dickinson.
-#
-## 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.
-
-# Program name.
-PRONAME = wadconv
-# Program version.
-PROVER	= 1.0.0
-
-# Program default options.
-CPPFLAGS	+= -DPRONAME="$(PRONAME)" -DPROVER="$(PROVER)"
-
-# Source files and directory.
-SRC	= wadconv.c
-
-# Required libraries.
-LIB	= -lwad
-
-#
-## Variables that shouldn't be edited unless
-## you know what you are doing start here.
-#
-
-# Makefile pretty text output variables.
-PRCC	= CC      
-PRINSTALL=INSTALL 
-PRCLEAN	= CLEAN   
-
-# Library name prefix.
-LIBPFX	= lib
-
-# Library installation directory.
-PREFIX	?= /usr/local
-LIBDIR	:= $(PREFIX)/lib
-INCLUDE := $(PREFIX)/include
-
-# Variables created during compilation.
-OBJ	= $(SRC:.c=.o)
-DEP	= $(PRONAME).d
-ifdef MINGW
-BIN     = $(PRONAME).exe
-else
-BIN	= $(PRONAME)
-endif
-
-# Compilation programs.
-ECHO	:= echo
-RM	:= rm -rf
-FIND	:= find
-GREP	:= grep
-INSTALLX:= install -m 755
-FOR	:= for
-SED	:= sed
-CC	:= $(CROSS_COMPILE)$(CC)
-
-# Shell programs.
-SHECHO	:= $(ECHO)
-SHFIND	:= $(FIND)
-SHGREP	:= $(GREP)
-SHINSTALL:= $(INSTALL)
-SHSED	:= $(SED)
-SHCC	:= $(CC)
-
-# Quiet compiling programs during pretty text output.
-NULL	:= /dev/null 2>&1
-ECHO	:= @$(ECHO)
-ifndef V
-RM	:= @$(RM)
-LDCONFIG:= @$(LDCONFIG)
-FIND	:= @$(FIND)
-GREP	:= @$(GREP)
-INSTALL	:= @$(INSTALL)
-MKDIR	:= @$(MKDIR)
-FOR	:= @$(FOR)
-SED	:= @$(SED)
-CC	:= @$(CC)
-endif
-
-# Compiler default flags.
-ifdef DEBUG
-CFLAGS	+= -g -O0 -Wall
-else
-CFLAGS	+= -O3
-endif
-
-# Linker flags.
-#LDFLAGS +=
-
-#
-## Makefile targets.
-#
-
-all: $(DEP) $(BIN)
-
-$(DEP): $(SRC)
-ifndef V
-	$(ECHO) "  $(PRCC)$@"
-endif
-	-$(RM) $@
-	$(FOR) f in $(SRC); do \
-		$(SHCC) $(CPPFLAGS) $(CFLAGS) -MM $$f >> $@; \
-	done
--include $@
-
-%.o: %.c
-ifndef V
-	$(ECHO) "  $(PRCC)$@"
-endif
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
-
-$(BIN): $(OBJ)
-ifndef V
-	$(ECHO) "  $(PRCC)$@"
-endif
-	$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIB)
-
-install: all
-ifndef V
-	$(SHECHO) "  $(PRINSTALL)$(BIN)"
-endif
-	$(INSTALLX) $(BIN) $(INSTALLDIR)
-
-clean:
-ifndef V
-	$(ECHO) "  $(PRCLEAN)$(BIN) $(OBJ) $(DEP)"
-endif
-	-$(RM) $(BIN) $(OBJ) $(DEP)
-
-.PHONY : all install clean
diff --git a/tools/wadconv/wadconv.c b/tools/wadconv/wadconv.c
deleted file mode 100644
index 4e9565118..000000000
--- a/tools/wadconv/wadconv.c
+++ /dev/null
@@ -1,282 +0,0 @@
-// Emacs style mode select   -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// SRB2 WAD Converter
-//
-// 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 wadconv.c
-/// \brief Converts wads made for version 2.0 to 2.1.
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "wad.h"
-
-//
-// Texture definition.
-// Each texture is composed of one or more patches,
-// with patches being lumps stored in the WAD.
-// The lumps are referenced by number, and patched
-// into the rectangular texture space using origin
-// and possibly other attributes.
-//
-typedef struct
-{
-	wad_int16_t originx, originy;
-	wad_int16_t patch, stepdir, colormap;
-} mappatch_t;
-
-//
-// Texture definition.
-// An SRB2 wall texture is a list of patches
-// which are to be combined in a predefined order.
-//
-typedef struct
-{
-	char name[8];
-	wad_int32_t masked;
-	wad_int16_t width;
-	wad_int16_t height;
-	wad_int32_t columndirectory; // FIXTHIS: OBSOLETE
-	wad_int16_t patchcount;
-	mappatch_t patches[1];
-} maptexture_t;
-
-// A single patch from a texture definition,
-//  basically a rectangular area within
-//  the texture rectangle.
-typedef struct
-{
-	// Block origin (always UL), which has already accounted for the internal origin of the patch.
-	wad_uint16_t originx, originy;
-	lump_t *patch;
-} texpatch_t;
-
-// A maptexturedef_t describes a rectangular texture,
-//  which is composed of one or more mappatch_t structures
-//  that arrange graphic patches.
-typedef struct
-{
-	// Keep name for switch changing, etc.
-	char name[8];
-	wad_int16_t width, height;
-
-	// All the patches[patchcount] are drawn back to front into the cached texture.
-	wad_uint16_t patchcount;
-	texpatch_t patches[1];
-} texture_t;
-
-static void ConvertTextures(wad_t *wad)
-{
-	wad_uint32_t i, j;
-	lump_t *l;
-	// PNAMES lump.
-	char pname[9];
-	char *pnamesdata;
-	lump_t *pnames, **patchlookup;
-	wad_uint32_t numpatches;
-	// TEXTURE lump.
-	lump_t *texturex = NULL;
-	texture_t **textures;
-	texpatch_t *patch;
-	maptexture_t *mtexture;
-	mappatch_t *mpatch;
-	wad_uint32_t *directory, *maptex, numtextures, offset;
-	size_t maxoffset;
-	// TX_START.
-	lump_t *tx_start;
-
-	// PNAMES.
-	if (!(pnames = WAD_CacheLumpInWADByName(wad, "PNAMES")))
-	{
-		printf("error caching lump: %s\n", WAD_Error());
-		exit(EXIT_FAILURE);
-	}
-
-	pnamesdata = pnames->data + 4;
-
-	memcpy(&numpatches, pnames->data, sizeof(wad_uint32_t));
-	numpatches = WAD_INT32_Endianness(numpatches);
-
-	if (!(patchlookup = malloc(sizeof(*patchlookup) * numpatches)))
-	{
-		printf("unable to allocate patchlookup array for wad %s\n", WAD_BaseName(wad->filename));
-		exit(EXIT_FAILURE);
-	}
-
-	pname[8] = '\0';
-	for (i = 0; i < numpatches; i++)
-	{
-		strncpy(pname, pnamesdata+i*8, 8);
-		patchlookup[i] = WAD_LumpInWADByName(wad, pname);
-	}
-
-	WAD_UncacheLump(pnames);
-
-	// TEXTURE.
-
-	for (i = 1; (texturex = WAD_LumpInWADByName(wad, WAD_VA("TEXTURE%i", i))); i++)
-		if (texturex)
-			break;
-
-	texturex = WAD_CacheLump(texturex);
-	maptex = (wad_uint32_t *)texturex->data;
-	numtextures = WAD_INT32_Endianness(*maptex);
-	maxoffset = WAD_LumpSize(texturex);
-	directory = maptex + 1;
-	textures = malloc(sizeof(*textures) * numtextures);
-
-	for (i = 0; i < numtextures; i++, directory++)
-	{
-		memcpy(&offset, directory, sizeof(wad_uint32_t));
-		offset = WAD_INT32_Endianness(offset);
-
-		if (offset > maxoffset)
-		{
-			printf("bad texture directory for wad %s\n", WAD_BaseName(wad->filename));
-			exit(EXIT_FAILURE);
-		}
-
-		mtexture = (maptexture_t *)((wad_uint8_t *)maptex + offset);
-		textures[i] = malloc(sizeof(texture_t) + (sizeof(texpatch_t) * (WAD_INT16_Endianness(mtexture->patchcount) - 1)));
-
-		memcpy(textures[i]->name, mtexture->name, sizeof(textures[i]->name));
-		textures[i]->width = WAD_INT16_Endianness(mtexture->width);
-		textures[i]->height = WAD_INT16_Endianness(mtexture->height);
-		textures[i]->patchcount = WAD_INT16_Endianness(mtexture->patchcount);
-
-		mpatch = &mtexture->patches[0];
-		patch = &textures[i]->patches[0];
-
-		for (j = 0; j < textures[i]->patchcount; j++, mpatch++, patch++)
-		{
-			patch->originx = WAD_INT16_Endianness(mpatch->originx);
-			patch->originy = WAD_INT16_Endianness(mpatch->originy);
-			patch->patch = patchlookup[WAD_INT16_Endianness(mpatch->patch)];
-			if (!patch->patch)
-				printf("missing patch in texture %s in wad %s\n", textures[i]->name, wad->filename);
-		}
-	}
-
-	WAD_UncacheLump(texturex);
-
-	if (!(tx_start = WAD_LumpInWADByName(wad, "TX_START")))
-	{
-		if (WAD_LumpInWADByName(wad, "P_END"))
-			tx_start = WAD_AddLumpInWADByNum(wad, WAD_LumpNumByName("P_END") + 1, "TX_START", NULL);
-		else
-			tx_start = WAD_AddLump(wad, NULL, "TX_START", NULL);
-
-		if (!tx_start)
-		{
-			printf("unable to find TX_START in %s\n", wad->filename);
-			exit(EXIT_FAILURE);
-		}
-	}
-	WAD_RemoveLumpInWADByName(wad, "TX_END");
-
-	for (i = 0, l = WAD_LumpInWADByNum(wad, WAD_LumpNum(tx_start) + 1); i < numtextures; i++, directory++)
-	{
-		if (textures[i]->patchcount == 1 && !strncmp(textures[i]->name, textures[i]->patches[0].patch->name, 8))
-			WAD_MoveLump(textures[i]->patches[0].patch, l);
-		else
-		{
-			FILE *socfile;
-			char *soc, *socname = textures[i]->name;
-
-			for (j = 0; j < textures[i]->patchcount; j++)
-			{
-				if (!strncmp(textures[i]->name, textures[i]->patches[j].patch->name, 8))
-				{
-					wad_int32_t k;
-					char socname1[5];
-
-					socname = malloc(sizeof(*socname) * 9);
-
-					socname1[4] = '\0';
-					strncpy(socname1, textures[i]->name, 4);
-
-					for (k = 0 ;; k++)
-						if (!WAD_LumpInWADByName(wad, WAD_VA((k > 9) ? "%sSC%i" : "%sSC0%i", socname1, k)))
-							break;
-
-					sprintf(socname, (k > 9) ? "%sSC%i" : "%sSC0%i", socname1, k);
-					break;
-				}
-			}
-
-			soc = WAD_VA("%s%s", socname, ".lmp");
-
-			remove(soc);
-			socfile = fopen(soc, "wb");
-
-			fprintf(socfile, "TEXTURE %s\n", textures[i]->name);
-			fprintf(socfile, "WIDTH = %i\n", textures[i]->width);
-			fprintf(socfile, "HEIGHT = %i\n", textures[i]->height);
-			fprintf(socfile, "NUMPATCHES = %i\n\n", textures[i]->patchcount);
-
-			for (j = 0; j < textures[i]->patchcount; j++)
-			{
-				fprintf(socfile, "PATCH %s\n", textures[i]->patches[j].patch->name);
-				fprintf(socfile, "X = %i\n", textures[i]->patches[j].originx);
-				fprintf(socfile, "Y = %i\n\n", textures[i]->patches[j].originy);
-			}
-
-			fclose(socfile);
-
-			WAD_AddLump(wad, l, socname, soc);
-			remove(soc);
-		}
-	}
-	WAD_AddLump(wad, l, "TX_END", NULL);
-
-	WAD_RemoveLump(pnames);
-	WAD_RemoveLump(texturex);
-}
-
-int main(int argc, char **argv)
-{
-	wad_t *w;
-	wad_uint32_t i;
-
-	if (argc < 2)
-	{
-		puts("Usage: wadconv [filename]");
-		puts("Example: wadconv wadfile.wad");
-		return EXIT_FAILURE;
-	}
-
-	// Open the WAD files.
-	for (i = 1; i < (unsigned)argc; i++)
-	{
-		if (!WAD_OpenWAD(argv[i]))
-		{
-			printf("Loading WAD failed: %s\n", WAD_Error());
-			return EXIT_FAILURE;
-		}
-	}
-
-	for (i = 0; i < wad_numwads; i = WAD_WADLoopAdvance(i))
-	{
-		w = WAD_WADByNum(i);
-		// Convert textures.
-		printf("Converting textures for wad %s...\n", WAD_BaseName(w->filename));
-		ConvertTextures(w);
-	}
-
-	for (i = 0; i < wad_numwads; i = WAD_WADLoopAdvance(i))
-		WAD_SaveCloseWADByNum(i);
-
-	puts("Finished.");
-	return EXIT_SUCCESS;
-}
diff --git a/tools/wadzip/err.c b/tools/wadzip/err.c
deleted file mode 100644
index 37393bfcb..000000000
--- a/tools/wadzip/err.c
+++ /dev/null
@@ -1,121 +0,0 @@
-#if defined (__WIN32) || defined (WIN32)
-#define NEED_ERR
-#define LACK_PROGNAME
-#define NEED_ENDIAN_STUBS
-#define LACK_SYSTYPES
-#endif
-
-#ifdef NEED_ERR
-
-/*
- * Implementation of the err/errx/verr/verrx/warn/warnx/vwarn/vwarnx
- * functions from BSD.
- *
- * This file is public-domain; anyone may deal in it without restriction.
- *
- * Written by Graue <graue@oceanbase.org> on January 16, 2006.
- */
-
-/*
-err/warn family of functions cheat sheet:
-
-Print:
-    last component of program name
-    [ if fmt is non-NULL
-        ": "
-        the formatted error message
-    ]
-    [ if function name does not end in x
-        ": "
-        strerror(errno)
-    ]
-    newline
-
-Then if function name has "err" in it, quit with exit code `eval'.
-
-BSD's -x versions actually print ": " at the end if passed NULL, so I
-duplicate that behavior. Passing these functions NULL is kind of useless
-though.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef LACK_PROGNAME
-char *__progname = "wadzip";
-#else
-extern char *__progname;
-#endif
-
-#define progname __progname
-
-void vwarn(const char *fmt, va_list args)
-{
-	fputs(progname, stderr);
-	if (fmt != NULL)
-	{
-		fputs(": ", stderr);
-		vfprintf(stderr, fmt, args);
-	}
-	fputs(": ", stderr);
-	fputs(strerror(errno), stderr);
-	putc('\n', stderr);
-}
-
-void vwarnx(const char *fmt, va_list args)
-{
-	fputs(progname, stderr);
-	fputs(": ", stderr);
-	if (fmt != NULL)
-		vfprintf(stderr, fmt, args);
-	putc('\n', stderr);
-}
-
-void verr(int eval, const char *fmt, va_list args)
-{
-	vwarn(fmt, args);
-	exit(eval);
-}
-
-void verrx(int eval, const char *fmt, va_list args)
-{
-	vwarnx(fmt, args);
-	exit(eval);
-}
-
-void warn(const char *fmt, ...)
-{
-	va_list argptr;
-	va_start(argptr, fmt);
-	vwarn(fmt, argptr);
-	va_end(argptr);
-}
-
-void warnx(const char *fmt, ...)
-{
-	va_list argptr;
-	va_start(argptr, fmt);
-	vwarnx(fmt, argptr);
-	va_end(argptr);
-}
-
-void err(int eval, const char *fmt, ...)
-{
-	va_list argptr;
-	va_start(argptr, fmt);
-	verr(eval, fmt, argptr);
-	/* NOTREACHED, so don't worry about va_end() */
-}
-
-void errx(int eval, const char *fmt, ...)
-{
-	va_list argptr;
-	va_start(argptr, fmt);
-	verrx(eval, fmt, argptr);
-	/* NOTREACHED, so don't worry about va_end() */
-}
-
-#endif
diff --git a/tools/wadzip/err.h b/tools/wadzip/err.h
deleted file mode 100644
index 5b9380379..000000000
--- a/tools/wadzip/err.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#if defined (__WIN32) || defined (WIN32)
-#define NEED_ERR
-#endif
-
-#ifndef NEED_ERR
-#include <err.h> /* system version of this file */
-#else
-
-#ifndef _ERR_H
-#define _ERR_H
-
-#include <stdarg.h>
-
-void  err  (int eval, const char *fmt, ...);
-void  errx (int eval, const char *fmt, ...);
-void verr  (int eval, const char *fmt, va_list args);
-void verrx (int eval, const char *fmt, va_list args);
-
-void  warn (          const char *fmt, ...);
-void  warnx(          const char *fmt, ...);
-void vwarn (          const char *fmt, va_list args);
-void vwarnx(          const char *fmt, va_list args);
-
-#endif
-
-#endif
diff --git a/tools/wadzip/lzf.h b/tools/wadzip/lzf.h
deleted file mode 100644
index 8538609ab..000000000
--- a/tools/wadzip/lzf.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Marc Alexander Lehmann <schmorp@schmorp.de>
- * 
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- * 
- *   1.  Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- * 
- *   2.  Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- * 
- *   3.  The name of the author may not be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
- * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
- * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * the GNU General Public License version 2 (the "GPL"), in which case the
- * provisions of the GPL are applicable instead of the above. If you wish to
- * allow the use of your version of this file only under the terms of the
- * GPL and not to allow others to use your version of this file under the
- * BSD license, indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by the GPL. If
- * you do not delete the provisions above, a recipient may use your version
- * of this file under either the BSD or the GPL.
- */
-
-#ifndef LZF_H
-#define LZF_H
-
-/***********************************************************************
-**
-**	lzf -- an extremely fast/free compression/decompression-method
-**	http://liblzf.plan9.de/
-**
-**	This algorithm is believed to be patent-free.
-**
-***********************************************************************/
-
-#define LZF_VERSION 0x0105 /* 1.5 */
-
-/*
- * Compress in_len bytes stored at the memory block starting at
- * in_data and write the result to out_data, up to a maximum length
- * of out_len bytes.
- *
- * If the output buffer is not large enough or any error occurs
- * return 0, otherwise return the number of bytes used (which might
- * be considerably larger than in_len, so it makes sense to always
- * use out_len == in_len - 1), to ensure _some_ compression, and store
- * the data uncompressed otherwise.
- *
- * lzf_compress might use different algorithms on different systems and
- * even diferent runs, thus might result in different compressed strings
- * depending on the phase of the moon or similar factors. However, all
- * these strings are architecture-independent and will result in the
- * original data when decompressed using lzf_decompress.
- *
- * The buffers must not be overlapping.
- *
- * If the option LZF_STATE_ARG is enabled, an extra argument must be
- * supplied which is not reflected in this header file. Refer to lzfP.h
- * and lzf_c.c.
- *
- */
-unsigned int 
-lzf_compress (const void *const in_data,  unsigned int in_len,
-              void             *out_data, unsigned int out_len);
-
-/*
- * Decompress data compressed with some version of the lzf_compress
- * function and stored at location in_data and length in_len. The result
- * will be stored at out_data up to a maximum of out_len characters.
- *
- * If the output buffer is not large enough to hold the decompressed
- * data, a 0 is returned and errno is set to E2BIG. Otherwise the number
- * of decompressed bytes (i.e. the original length of the data) is
- * returned.
- *
- * If an error in the compressed data is detected, a zero is returned and
- * errno is set to EINVAL.
- *
- * This function is very fast, about as fast as a copying loop.
- */
-unsigned int 
-lzf_decompress (const void *const in_data,  unsigned int in_len,
-                void             *out_data, unsigned int out_len);
-
-#endif
-
diff --git a/tools/wadzip/lzfP.h b/tools/wadzip/lzfP.h
deleted file mode 100644
index 4d5a21e3c..000000000
--- a/tools/wadzip/lzfP.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Marc Alexander Lehmann <schmorp@schmorp.de>
- * 
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- * 
- *   1.  Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- * 
- *   2.  Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- * 
- *   3.  The name of the author may not be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
- * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
- * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * the GNU General Public License version 2 (the "GPL"), in which case the
- * provisions of the GPL are applicable instead of the above. If you wish to
- * allow the use of your version of this file only under the terms of the
- * GPL and not to allow others to use your version of this file under the
- * BSD license, indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by the GPL. If
- * you do not delete the provisions above, a recipient may use your version
- * of this file under either the BSD or the GPL.
- */
-
-#ifndef LZFP_h
-#define LZFP_h
-
-#define STANDALONE 1 /* at the moment, this is ok. */
-
-#ifndef STANDALONE
-# include "lzf.h"
-#endif
-
-/*
- * Size of hashtable is (1 << HLOG) * sizeof (char *)
- * decompression is independent of the hash table size
- * the difference between 15 and 14 is very small
- * for small blocks (and 14 is usually a bit faster).
- * For a low-memory/faster configuration, use HLOG == 13;
- * For best compression, use 15 or 16 (or more).
- */
-#ifndef HLOG
-# define HLOG 15
-#endif
-
-/*
- * Sacrifice very little compression quality in favour of compression speed.
- * This gives almost the same compression as the default code, and is
- * (very roughly) 15% faster. This is the preferable mode of operation.
- */
-
-#ifndef VERY_FAST
-# define VERY_FAST 1
-#endif
-
-/*
- * Sacrifice some more compression quality in favour of compression speed.
- * (roughly 1-2% worse compression for large blocks and
- * 9-10% for small, redundant, blocks and >>20% better speed in both cases)
- * In short: when in need for speed, enable this for binary data,
- * possibly disable this for text data.
- */
-#ifndef ULTRA_FAST
-# define ULTRA_FAST 0
-#endif
-
-/*
- * Unconditionally aligning does not cost very much, so do it if unsure
- */
-#ifndef STRICT_ALIGN
-# define STRICT_ALIGN !(defined(__i386) || defined (__amd64))
-#endif
-
-/*
- * Use string functions to copy memory.
- * this is usually a loss, even with glibc's optimized memcpy
- */
-#ifndef USE_MEMCPY
-# define USE_MEMCPY 0
-#endif
-
-/*
- * You may choose to pre-set the hash table (might be faster on some
- * modern cpus and large (>>64k) blocks)
- */
-#ifndef INIT_HTAB
-# define INIT_HTAB 0
-#endif
-
-/*
- * Avoid assigning values to errno variable? for some embedding purposes
- * (linux kernel for example), this is neccessary. NOTE: this breaks
- * the documentation in lzf.h.
- */
-#ifndef AVOID_ERRNO
-# define AVOID_ERRNO 0
-#endif
-
-/*
- * Wether to pass the LZF_STATE variable as argument, or allocate it
- * on the stack. For small-stack environments, define this to 1.
- * NOTE: this breaks the prototype in lzf.h.
- */
-#ifndef LZF_STATE_ARG
-# define LZF_STATE_ARG 0
-#endif
-
-/*
- * Wether to add extra checks for input validity in lzf_decompress
- * and return EINVAL if the input stream has been corrupted. This
- * only shields against overflowing the input buffer and will not
- * detect most corrupted streams.
- * This check is not normally noticable on modern hardware
- * (<1% slowdown), but might slow down older cpus considerably.
- */
-#ifndef CHECK_INPUT
-# define CHECK_INPUT 1
-#endif
-
-/*****************************************************************************/
-/* nothing should be changed below */
-
-typedef unsigned char u8;
-
-typedef const u8 *LZF_STATE[1 << (HLOG)];
-
-#if !STRICT_ALIGN
-/* for unaligned accesses we need a 16 bit datatype. */
-# include <limits.h>
-# if USHRT_MAX == 65535
-    typedef unsigned short u16;
-# elif UINT_MAX == 65535
-    typedef unsigned int u16;
-# else
-#  undef STRICT_ALIGN
-#  define STRICT_ALIGN 1
-# endif
-#endif
-
-#if ULTRA_FAST
-# if defined(VERY_FAST)
-#  undef VERY_FAST
-# endif
-#endif
-
-#if USE_MEMCPY || INIT_HTAB
-# ifdef __cplusplus
-#  include <cstring>
-# else
-#  include <string.h>
-# endif
-#endif
-
-#endif
-
diff --git a/tools/wadzip/lzf_c.c b/tools/wadzip/lzf_c.c
deleted file mode 100644
index b9b9ef991..000000000
--- a/tools/wadzip/lzf_c.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Marc Alexander Lehmann <schmorp@schmorp.de>
- * 
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- * 
- *   1.  Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- * 
- *   2.  Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- * 
- *   3.  The name of the author may not be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
- * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
- * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * the GNU General Public License version 2 (the "GPL"), in which case the
- * provisions of the GPL are applicable instead of the above. If you wish to
- * allow the use of your version of this file only under the terms of the
- * GPL and not to allow others to use your version of this file under the
- * BSD license, indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by the GPL. If
- * you do not delete the provisions above, a recipient may use your version
- * of this file under either the BSD or the GPL.
- */
-
-#include "lzfP.h"
-
-#define HSIZE (1 << (HLOG))
-
-/*
- * don't play with this unless you benchmark!
- * decompression is not dependent on the hash function
- * the hashing function might seem strange, just believe me
- * it works ;)
- */
-#ifndef FRST
-# define FRST(p) (((p[0]) << 8) | p[1])
-# define NEXT(v,p) (((v) << 8) | p[2])
-# define IDX(h) ((((h ^ (h << 5)) >> (3*8 - HLOG)) - h*5) & (HSIZE - 1))
-#endif
-/*
- * IDX works because it is very similar to a multiplicative hash, e.g.
- * ((h * 57321 >> (3*8 - HLOG)) & (HSIZE - 1))
- * the latter is also quite fast on newer CPUs, and sligthly better
- *
- * the next one is also quite good, albeit slow ;)
- * (int)(cos(h & 0xffffff) * 1e6)
- */
-
-#if 0
-/* original lzv-like hash function, much worse and thus slower */
-# define FRST(p) (p[0] << 5) ^ p[1]
-# define NEXT(v,p) ((v) << 5) ^ p[2]
-# define IDX(h) ((h) & (HSIZE - 1))
-#endif
-
-#define        MAX_LIT        (1 <<  5)
-#define        MAX_OFF        (1 << 13)
-#define        MAX_REF        ((1 <<  8) + (1 << 3))
-
-/*
- * compressed format
- *
- * 000LLLLL <L+1>    ; literal
- * LLLooooo oooooooo ; backref L
- * 111ooooo LLLLLLLL oooooooo ; backref L+7
- *
- */
-
-unsigned int
-lzf_compress (const void *const in_data, unsigned int in_len,
-	      void *out_data, unsigned int out_len
-#if LZF_STATE_ARG
-              , LZF_STATE *htab
-#endif
-              )
-{
-#if !LZF_STATE_ARG
-  LZF_STATE htab;
-#endif
-  const u8 **hslot;
-  const u8 *ip = (const u8 *)in_data;
-        u8 *op = (u8 *)out_data;
-  const u8 *in_end  = ip + in_len;
-        u8 *out_end = op + out_len;
-  const u8 *ref;
-
-  unsigned int hval = FRST (ip);
-  unsigned long off;
-           int lit = 0;
-
-#if INIT_HTAB
-# if USE_MEMCPY
-    memset (htab, 0, sizeof (htab));
-# else
-    for (hslot = htab; hslot < htab + HSIZE; hslot++)
-      *hslot++ = ip;
-# endif
-#endif
-
-  for (;;)
-    {
-      if (ip < in_end - 2)
-        {
-          hval = NEXT (hval, ip);
-          hslot = htab + IDX (hval);
-          ref = *hslot; *hslot = ip;
-
-          if (1
-#if INIT_HTAB && !USE_MEMCPY
-              && ref < ip /* the next test will actually take care of this, but this is faster */
-#endif
-              && (off = ip - ref - 1) < MAX_OFF
-              && ip + 4 < in_end
-              && ref > (u8 *)in_data
-#if STRICT_ALIGN
-              && ref[0] == ip[0]
-              && ref[1] == ip[1]
-              && ref[2] == ip[2]
-#else
-              && *(u16 *)ref == *(u16 *)ip
-              && ref[2] == ip[2]
-#endif
-            )
-            {
-              /* match found at *ref++ */
-              unsigned int len = 2;
-              unsigned int maxlen = in_end - ip - len;
-              maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
-
-              if (op + lit + 1 + 3 >= out_end)
-                return 0;
-
-              do
-                len++;
-              while (len < maxlen && ref[len] == ip[len]);
-
-              if (lit)
-                {
-                  *op++ = lit - 1;
-                  lit = -lit;
-                  do
-                    *op++ = ip[lit];
-                  while (++lit);
-                }
-
-              len -= 2;
-              ip++;
-
-              if (len < 7)
-                {
-                  *op++ = (off >> 8) + (len << 5);
-                }
-              else
-                {
-                  *op++ = (off >> 8) + (  7 << 5);
-                  *op++ = len - 7;
-                }
-
-              *op++ = off;
-
-#if ULTRA_FAST || VERY_FAST
-              ip += len;
-#if VERY_FAST && !ULTRA_FAST
-              --ip;
-#endif
-              hval = FRST (ip);
-
-              hval = NEXT (hval, ip);
-              htab[IDX (hval)] = ip;
-              ip++;
-
-#if VERY_FAST && !ULTRA_FAST
-              hval = NEXT (hval, ip);
-              htab[IDX (hval)] = ip;
-              ip++;
-#endif
-#else
-              do
-                {
-                  hval = NEXT (hval, ip);
-                  htab[IDX (hval)] = ip;
-                  ip++;
-                }
-              while (len--);
-#endif
-              continue;
-            }
-        }
-      else if (ip == in_end)
-        break;
-
-      /* one more literal byte we must copy */
-      lit++;
-      ip++;
-
-      if (lit == MAX_LIT)
-        {
-          if (op + 1 + MAX_LIT >= out_end)
-            return 0;
-
-          *op++ = MAX_LIT - 1;
-#if USE_MEMCPY
-          memcpy (op, ip - MAX_LIT, MAX_LIT);
-          op += MAX_LIT;
-          lit = 0;
-#else
-          lit = -lit;
-          do
-            *op++ = ip[lit];
-          while (++lit);
-#endif
-        }
-    }
-
-  if (lit)
-    {
-      if (op + lit + 1 >= out_end)
-	return 0;
-
-      *op++ = lit - 1;
-      lit = -lit;
-      do
-	*op++ = ip[lit];
-      while (++lit);
-    }
-
-  return op - (u8 *) out_data;
-}
diff --git a/tools/wadzip/lzf_d.c b/tools/wadzip/lzf_d.c
deleted file mode 100644
index 73a1a80b6..000000000
--- a/tools/wadzip/lzf_d.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2000-2005 Marc Alexander Lehmann <schmorp@schmorp.de>
- * 
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- * 
- *   1.  Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- * 
- *   2.  Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- * 
- *   3.  The name of the author may not be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
- * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
- * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
- * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * the GNU General Public License version 2 (the "GPL"), in which case the
- * provisions of the GPL are applicable instead of the above. If you wish to
- * allow the use of your version of this file only under the terms of the
- * GPL and not to allow others to use your version of this file under the
- * BSD license, indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by the GPL. If
- * you do not delete the provisions above, a recipient may use your version
- * of this file under either the BSD or the GPL.
- */
-
-#include "lzfP.h"
-
-#if AVOID_ERRNO
-# define SET_ERRNO(n)
-#else
-# include <errno.h>
-# define SET_ERRNO(n) errno = (n)
-#endif
-
-unsigned int 
-lzf_decompress (const void *const in_data,  unsigned int in_len,
-                void             *out_data, unsigned int out_len)
-{
-  u8 const *ip = (const u8 *)in_data;
-  u8       *op = (u8 *)out_data;
-  u8 const *const in_end  = ip + in_len;
-  u8       *const out_end = op + out_len;
-
-  do
-    {
-      unsigned int ctrl = *ip++;
-
-      if (ctrl < (1 << 5)) /* literal run */
-        {
-          ctrl++;
-
-          if (op + ctrl > out_end)
-            {
-              SET_ERRNO (E2BIG);
-              return 0;
-            }
-
-#if CHECK_INPUT
-          if (ip + ctrl > in_end)
-            {
-              SET_ERRNO (EINVAL);
-              return 0;
-            }
-#endif
-
-#if USE_MEMCPY
-          memcpy (op, ip, ctrl);
-          op += ctrl;
-          ip += ctrl;
-#else
-          do
-            *op++ = *ip++;
-          while (--ctrl);
-#endif
-        }
-      else /* back reference */
-        {
-          unsigned int len = ctrl >> 5;
-
-          u8 *ref = op - ((ctrl & 0x1f) << 8) - 1;
-
-#if CHECK_INPUT
-          if (ip >= in_end)
-            {
-              SET_ERRNO (EINVAL);
-              return 0;
-            }
-#endif
-          if (len == 7)
-            {
-              len += *ip++;
-#if CHECK_INPUT
-              if (ip >= in_end)
-                {
-                  SET_ERRNO (EINVAL);
-                  return 0;
-                }
-#endif
-            }
-
-          ref -= *ip++;
-
-          if (op + len + 2 > out_end)
-            {
-              SET_ERRNO (E2BIG);
-              return 0;
-            }
-
-          if (ref < (u8 *)out_data)
-            {
-              SET_ERRNO (EINVAL);
-              return 0;
-            }
-
-          *op++ = *ref++;
-          *op++ = *ref++;
-
-          do
-            *op++ = *ref++;
-          while (--len);
-        }
-    }
-  while (ip < in_end);
-
-  return op - (u8 *)out_data;
-}
-
diff --git a/tools/wadzip/wadzip.c b/tools/wadzip/wadzip.c
deleted file mode 100644
index c8dae9b61..000000000
--- a/tools/wadzip/wadzip.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Wad compressor/decompressor by Graue <graue@oceanbase.org>
- * Written January 23, 2007
- *
- * This file is in the public domain; use it without any restrictions.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef _MSC_VER
-#include <stdint.h>
-#else
-typedef unsigned int uint32_t;
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-#endif
-#include <errno.h>
-#include <string.h>
-#include "err.h"
-#include "lzf.h"
-#include "xm.h"
-
-/* Note: Define WORDS_BIGENDIAN if that is the case on the target CPU. */
-
-#define MINCOMPRESS 1024 // Don't bother compressing lumps smaller than this.
-
-#define SWAP16(n) ((((n)&0xff)<<8) | ((n)>>8))
-#define SWAP32(n)                                                       \
-(                                                                       \
-        ((((n)&0xff) <<24)                                              \
-        | ((((n)>>8)&0xff)<<16)                                         \
-        | ((((n)>>16)&0xff)<<8)                                         \
-        | ((n)>>24)                                                     \
-)
-#ifdef WORDS_BIGENDIAN
-#define conv16le SWAP16
-#define conv32le SWAP32
-#else
-#define conv16le(n) (n)
-#define conv32le(n) (n)
-#endif
-#define READFUNC(name, type, conv)					\
-static type name(FILE *fp)						\
-{									\
-	type val;							\
-	if (fread(&val, sizeof val, 1, fp) < 1)				\
-	{								\
-		if (ferror(fp))						\
-			err(1, "error reading input file");		\
-		errx(1, "premature end of input file");			\
-	}								\
-	val = conv(val);						\
-	return val;							\
-}
-READFUNC(read32le, uint32_t, conv32le)
-
-#define WRITEFUNC(name, type, conv)					\
-static void name(FILE *fp, type val)					\
-{									\
-	val = conv(val);						\
-	if (fwrite(&val, sizeof (type), 1, fp) < 1)			\
-		err(1, "error writing output file");			\
-}
-WRITEFUNC(write32le, uint32_t, conv32le)
-
-#define ID_IWAD 0x44415749
-#define ID_PWAD 0x44415750
-#define ID_ZWAD 0x4441575a // 'ZWAD' for lzf-compressed wad
-
-typedef struct
-{
-	char name[8];
-	uint32_t len;
-	void *data;
-} lump_t;
-
-typedef struct
-{
-	uint32_t id;
-	uint32_t numlumps;
-	lump_t *lumps;
-} wad_t;
-
-extern char *__progname;
-
-static void usage(void)
-{
-	fprintf(stderr, "usage: %s [cd] infile outfile\n", __progname);
-	exit(EXIT_FAILURE);
-}
-
-#define fileoffset_t long
-#define myseek fseek
-#define mytell ftell
-
-static void readlumpdata(lump_t *lump, uint32_t csize, int compressed, FILE *fp)
-{
-	uint8_t *cbuf;
-	uint8_t *ubuf;
-	uint32_t usize;
-	unsigned int retval;
-
-	cbuf = xm(1, csize);
-	if (fread(cbuf, csize, 1, fp) < 1)
-		err(1, "cannot read lump from input file");
-
-	if (!compressed)
-	{
-		lump->len = csize;
-		lump->data = cbuf;
-		return;
-	}
-
-	usize = conv32le(*(uint32_t *)cbuf);
-	if (usize == 0)
-	{
-		lump->len = csize - 4;
-		lump->data = cbuf + 4; // XXX cannot be freed later
-		return;
-	}
-
-	ubuf = xm(1, usize);
-	retval = lzf_decompress(cbuf + 4, csize - 4, ubuf, usize);
-	if (retval == 0)
-	{
-		if (errno == E2BIG)
-			errx(1, "decompressed data bigger than advertised");
-		if (errno == EINVAL)
-			errx(1, "invalid compressed (lzf) data");
-		else
-			err(1, "unknown error from lzf");
-	}
-	else if (retval < usize)
-		errx(1, "decompressed data smaller than advertised");
-	lump->len = usize;
-	lump->data = ubuf;
-	free(cbuf);
-	return;
-}
-
-static wad_t *readwad(const char *fname)
-{
-	wad_t *wad;
-	FILE *fp;
-	int inputcompressed;
-	fileoffset_t dirstart;
-	uint32_t ix;
-
-	fp = fopen(fname, "rb");
-	if (fp == NULL) err(1, "%s", fname);
-
-	wad = xm(sizeof *wad, 1);
-
-	// Read wad id. If it is ZWAD, prepare to read compressed lumps.
-	wad->id = read32le(fp);
-	inputcompressed = wad->id == ID_ZWAD;
-
-	// Read number of lumps, and prepare space for that many.
-	wad->numlumps = read32le(fp);
-	wad->lumps = xm(sizeof wad->lumps[0], wad->numlumps);
-
-	// Read offset to directory.
-	dirstart = (fileoffset_t)read32le(fp);
-
-	for (ix = 0; ix < wad->numlumps; ix++)
-	{
-		fileoffset_t lumpofs;
-		uint32_t lumpsize; // The compressed size, if it is compressed.
-
-		if (myseek(fp, dirstart + (16*ix), SEEK_SET) == -1)
-		{
-			err(1, "cannot seek input file to dir entry %lu",
-				(unsigned long)ix);
-		}
-		lumpofs = (fileoffset_t)read32le(fp);
-		lumpsize = read32le(fp);
-		if (fread(wad->lumps[ix].name, 1, 8, fp) < 8)
-			err(1, "cannot read lump %lu name", (unsigned long)ix);
-
-		// Don't try to seek to zero-length lumps.
-		// Their offset is meaningless.
-		if (lumpsize == 0)
-		{
-			wad->lumps[ix].len = 0;
-			continue;
-		}
-
-		if (myseek(fp, lumpofs, SEEK_SET) == -1)
-			err(1, "cannot seek to lump %lu", (unsigned long)ix);
-		readlumpdata(&wad->lumps[ix], lumpsize, inputcompressed, fp);
-	}
-
-	if (fclose(fp) == EOF)
-		warn("error closing input file %s", fname);
-	return wad;
-}
-
-void writewad(const wad_t *wad, const char *fname, int compress)
-{
-	uint32_t *lumpofs; // Each lump's offset in the file.
-	uint32_t *disksize; // Each lump's disk size (compressed if applicable).
-	uint32_t dirstart;
-	uint32_t ix;
-	FILE *fp;
-
-	lumpofs = xm(sizeof lumpofs[0], wad->numlumps);
-	disksize = xm(sizeof disksize[0], wad->numlumps);
-
-	fp = fopen(fname, "wb");
-	if (fp == NULL) err(1, "%s", fname);
-
-	// Write header.
-	write32le(fp, compress ? ID_ZWAD : ID_PWAD);
-	write32le(fp, wad->numlumps);
-	write32le(fp, 0); // Directory table comes later.
-
-	for (ix = 0; ix < wad->numlumps; ix++)
-	{
-		uint8_t *cbuf;
-		uint32_t csize;
-
-		lumpofs[ix] = (uint32_t)mytell(fp);
-		if (!compress)
-		{
-			cbuf = wad->lumps[ix].data;
-			csize = wad->lumps[ix].len;
-		}
-		else
-		{
-			unsigned int retval;
-
-			csize = wad->lumps[ix].len + 4;
-			cbuf = xm(1, csize);
-			if (wad->lumps[ix].len < MINCOMPRESS
-				|| (retval = lzf_compress(wad->lumps[ix].data,
-					wad->lumps[ix].len, cbuf + 4,
-					csize - 5)) == 0)
-			{
-				// Store uncompressed.
-				memcpy(cbuf + 4, wad->lumps[ix].data,
-					wad->lumps[ix].len);
-				*(uint32_t *)cbuf = 0;
-			}
-			else
-			{
-				// Compression succeeded.
-				// Store uncompressed size, and set compressed
-				// size properly.
-				*(uint32_t *)cbuf =
-					conv32le(wad->lumps[ix].len);
-				csize = retval + 4;
-			}
-		}
-
-		if (!csize)
-			; // inu: 0 length markers aren't to be written
-		else if (fwrite(cbuf, csize, 1, fp) < 1)
-		{
-			err(1, "cannot write lump %lu to %s", (unsigned long)ix,
-				fname);
-		}
-
-		if (compress)
-			free(cbuf);
-		disksize[ix] = csize;
-	}
-
-	dirstart = (uint32_t)mytell(fp);
-	if (myseek(fp, 8L, SEEK_SET) == -1)
-		err(1, "cannot reseek %s to write directory start", fname);
-	write32le(fp, dirstart);
-	if (myseek(fp, dirstart, SEEK_SET) == -1)
-		err(1, "cannot reseek %s to write actual directory", fname);
-
-	for (ix = 0; ix < wad->numlumps; ix++)
-	{
-		// Write the lump's directory entry.
-		write32le(fp, lumpofs[ix]);
-		write32le(fp, disksize[ix]);
-		if (fwrite(wad->lumps[ix].name, 1, 8, fp) < 8)
-		{
-			err(1, "cannot write lump %lu's name",
-				(unsigned long)ix);
-		}
-	}
-
-	if (fclose(fp) == EOF)
-		warn("error closing output file %s", fname);
-}
-
-int main(int argc, char *argv[])
-{
-	const char *infile, *outfile;
-	wad_t *wad;
-	int compress;
-
-	if (argc != 4 || strlen(argv[1]) != 1)
-		usage();
-
-	/* c to compress, d to decompress */
-	if (argv[1][0] == 'c') compress = 1;
-	else if (argv[1][0] == 'd') compress = 0;
-	else usage();
-
-	infile = argv[2];
-	outfile = argv[3];
-
-	wad = readwad(infile);
-	writewad(wad, outfile, compress);
-	return 0;
-}
diff --git a/tools/wadzip/wadzip.dsp b/tools/wadzip/wadzip.dsp
deleted file mode 100644
index 85f1f99ad..000000000
--- a/tools/wadzip/wadzip.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="wadzip" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=wadzip - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wadzip.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wadzip.mak" CFG="wadzip - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "wadzip - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "wadzip - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "wadzip - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-
-!ELSEIF  "$(CFG)" == "wadzip - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "wadzip - Win32 Release"
-# Name "wadzip - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\err.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\lzf_c.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\lzf_d.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\wadzip.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\xm.c
-# End Source File
-# End Target
-# End Project
diff --git a/tools/wadzip/wadzip.dsw b/tools/wadzip/wadzip.dsw
deleted file mode 100644
index c4bd785a2..000000000
--- a/tools/wadzip/wadzip.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "wadzip"=.\wadzip.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/tools/wadzip/wadzip.txt b/tools/wadzip/wadzip.txt
deleted file mode 100644
index 24d05d0f0..000000000
--- a/tools/wadzip/wadzip.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Compressed wad format:
-
-Just like a normal wad, except:
-
-1. The header id at the very beginning says "ZWAD"
-instead of PWAD or IWAD.
-
-2. The first four bytes of each lump are (little
-endian) the uncompressed size. If this is zero,
-the lump is not compressed, and you can subtract
-four from the size given in the wadfile directory.
-
-3. Unless those first four bytes give a value of
-0, the lump is compressed with liblzf after that.
-
-
-
-To compile this program, just compiling all its
-source files should work, that is:
-    gcc *.c -o wadzip
-
-[On a big-endian CPU, add "-DWORDS_BIGENDIAN" to
-that command line.]
-
-Visual C++ should also work, as well as gcc.
-
-Compress a wad:
-    wadzip c original.wad compressed.wad
-Decompress a wad (restoring the original):
-    wadzip d compressed.wad original.wad
diff --git a/tools/wadzip/xm.c b/tools/wadzip/xm.c
deleted file mode 100644
index f388bab9e..000000000
--- a/tools/wadzip/xm.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Fail-proof memory allocation by Graue <graue@oceanbase.org>; public domain */
-
-#include <stdlib.h>
-#include <limits.h>
-#include "err.h"
-
-/* MinGW (for example) appears to lack SIZE_T_MAX. */
-#ifndef SIZE_T_MAX
-#define SIZE_T_MAX ULONG_MAX
-#endif
-
-/*
- * The usual xmalloc and xrealloc type routines, for allocating memory
- * and bombing out if it fails.
- *
- * xm and xr here take two values: size and nmemb, like fread/fwrite.
- * The idea is to be able to check for overflow, to prevent some weird
- * crashes and security problems that can arise if you multiply size
- * and nmemb and they overflow.
- */
-
-/* FIXME: use %zu (size_t) in these format arguments if library is C99 */
-
-/*
- * Multiply size and number of elements, bombing out if overflow would
- * occur.
-
- * Note: In the case where size*nmemb is exactly equal to SIZE_T_MAX,
- * this function considers that an overflow, even though it isn't
- * really. But it's not likely the program will get that much memory,
- * anyway.
- */
-static size_t sizmul(size_t size, size_t nmemb)
-{
-	if (SIZE_T_MAX / size <= nmemb)
-	{
-		errx(1, "allocating %lu objects of size %lu "
-			"would overflow", (unsigned long)nmemb,
-			(unsigned long)size);
-	}
-	return size * nmemb; /* won't overflow */
-}
-
-static void nomem(size_t size, size_t nmemb)
-{
-	err(1, "cannot allocate %lu objects of size %lu "
-		"(total %lu bytes)", (unsigned long)nmemb,
-		(unsigned long)size, (unsigned long)(nmemb*size));
-}
-
-void *xm(size_t size, size_t nmemb)
-{
-	const size_t bytes = sizmul(size, nmemb);
-	void *p;
-
-	p = malloc(bytes);
-	if (p == NULL) nomem(size, nmemb);
-	return p;
-}
-
-void *xr(void *p, size_t size, size_t nmemb)
-{
-	const size_t bytes = sizmul(size, nmemb);
-
-	p = realloc(p, bytes);
-	if (p == NULL) nomem(size, nmemb);
-	return p;
-}
-
-/* expand array */
-void *xpnd(void *p, int nit, int *sit, size_t sz)
-{
-	if (nit < *sit) return p;
-	else if (*sit > 0) return xr(p, sz, (*sit *= 2));
-	else return xm(sz, (*sit = 10));
-}
diff --git a/tools/wadzip/xm.h b/tools/wadzip/xm.h
deleted file mode 100644
index d57f8479b..000000000
--- a/tools/wadzip/xm.h
+++ /dev/null
@@ -1,4 +0,0 @@
-void *xm(size_t size, size_t nmemb);
-void *xr(void *p, size_t size, size_t nmemb);
-void *xpnd(void *p, int nit, int *sit, size_t sz);
-#define XPND(p, num, spc) (p = xpnd(p, num, &spc, sizeof *p))