Merge master

2026-01-10 08:44:25 +00:00 · 2020-11-08 02:34:24 -05:00 · 2020-11-08 02:34:24 -05:00 · 0e28470228
commit 0e28470228
parent d8bcc13fec d79c719ad9
1517 changed files with 258006 additions and 164020 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -25,6 +25,13 @@ jobs:
      - run:
          name: Add i386 arch
          command: dpkg --add-architecture i386
+      - run:
+          name: Add STJr PPA
+          command: |
+            apt-get -qq update
+            apt-get -qq -y install dirmngr
+            apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0B1702D71499D9C25F986507F240F4449D3B0EC6
+            echo "deb http://ppa.launchpad.net/stjr/srb2/ubuntu trusty main" >> /etc/apt/sources.list
      - run:
          name: Update APT listing
          command: apt-get -qq update
@ -36,15 +43,15 @@ jobs:
            - v1-SRB2-APT
      - run:
          name: Install SDK
-          command: apt-get -qq -y --no-install-recommends install git build-essential nasm libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
+          command: apt-get -qq -y --no-install-recommends install git build-essential nasm libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
      - save_cache:
          key: v1-SRB2-APT
          paths:
            - /var/cache/apt/archives
      - checkout
      - run:
-          name: Compile without network support and BLUA
-          command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1 NO_LUA=1
+          name: Compile without network support
+          command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1
      - run:
          name: wipe build
          command: make -C src LINUX=1 cleandep
--- a/.gitattributes
+++ b/.gitattributes
@ -1,3 +1,12 @@
+#Source code
+/src/*.c text=auto
+/src/*.h text=auto
+/src/*.s text=auto
+/src/*.m text=auto
+/src/*.xpm text=auto
+/src/Makefile text=auto
+/src/Make*.cfg text=auto
+/src/CMakeLists.txt text=auto
 # Windows EOL
 *.cs -crlf -whitespace
 *.mk -crlf -whitespace
--- a/.travis.yml
+++ b/.travis.yml
@ -18,11 +18,14 @@ matrix:
        - os: linux
          addons:
            apt:
+              sources:
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-4.4
@ -33,11 +36,14 @@ matrix:
        - os: linux
          addons:
            apt:
+              sources:
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-4.6
@ -48,11 +54,14 @@ matrix:
        - os: linux
          addons:
            apt:
+              sources:
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-4.7
@ -70,11 +79,13 @@ matrix:
            apt:
              sources:
              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-4.8
@ -87,11 +98,13 @@ matrix:
            apt:
              sources:
              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-7
@ -104,11 +117,13 @@ matrix:
            apt:
              sources:
              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-8
@ -125,11 +140,13 @@ matrix:
            apt:
              sources:
              - llvm-toolchain-precise-3.5
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - clang-3.5
@ -142,11 +159,13 @@ matrix:
              sources:
              - llvm-toolchain-precise-3.6
              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - clang-3.6
@ -159,11 +178,13 @@ matrix:
              sources:
              - llvm-toolchain-precise-3.7
              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - clang-3.7
@ -176,11 +197,13 @@ matrix:
              sources:
              - llvm-toolchain-precise-3.8
              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - clang-3.8
@ -193,11 +216,13 @@ matrix:
              sources:
              - llvm-toolchain-precise-3.9
              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - clang-3.9
@ -210,11 +235,13 @@ matrix:
 #              sources:
 #              - llvm-toolchain-precise-4.0
 #              - ubuntu-toolchain-r-test
+#              - sourceline: 'ppa:stjr/srb2'
 #              packages:
 #              - libsdl2-mixer-dev
 #              - libpng-dev
 #              - libgl1-mesa-dev
 #              - libgme-dev
+#              - libopenmpt-dev
 #              - p7zip-full
 #              - clang-4.0
 #          compiler: clang-4.0
@ -226,11 +253,13 @@ matrix:
 #              sources:
 #              - llvm-toolchain-precise-5.0
 #              - ubuntu-toolchain-r-test
+#              - sourceline: 'ppa:stjr/srb2'
 #              packages:
 #              - libsdl2-mixer-dev
 #              - libpng-dev
 #              - libgl1-mesa-dev
 #              - libgme-dev
+#              - libopenmpt-dev
 #              - p7zip-full
 #              - clang-5.0
 #          compiler: clang-5.0
@ -442,11 +471,15 @@ matrix:
        - os: linux
          addons:
            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-4.8
@ -457,20 +490,52 @@ matrix:
              AND env(DPL_TERMINATE_MAIN) != "1"
          env:
          - _DPL_JOB_ENABLED=1
-          - _DPL_JOB_NAME=focal
+          - _DPL_JOB_NAME=eoan
          - _DPL_DPUT_TARGET=1
          - _DPL_PACKAGE_SOURCE=1
-          - PACKAGE_DISTRO=focal
-          - PACKAGE_SUBVERSION=~20.04focal
+          - PACKAGE_DISTRO=eoan
+          - PACKAGE_SUBVERSION=~19.10eoan
          #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5
        - os: linux
          addons:
            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
+              - libcurl4-openssl-dev
+              - p7zip-full
+              - gcc-4.8
+          compiler: gcc-4.8
+          dist: xenial
+          if: env(DPL_ENABLED) = "1" AND (env(_DPL_JOB_ENABLED) = "1" OR env(DPL_JOB_ENABLE_ALL) = "1")
+              AND (branch =~ /^.*deployer.*$/ OR (tag IS present AND env(DPL_TAG_ENABLED) = "1"))
+              AND env(DPL_TERMINATE_MAIN) != "1"
+          env:
+          - _DPL_JOB_ENABLED=1
+          - _DPL_JOB_NAME=disco
+          - _DPL_DPUT_TARGET=1
+          - _DPL_PACKAGE_SOURCE=1
+          - PACKAGE_DISTRO=disco
+          - PACKAGE_SUBVERSION=~19.04disco
+          #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5
+        - os: linux
+          addons:
+            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
+              packages:
+              - libsdl2-mixer-dev
+              - libpng-dev
+              - libgl1-mesa-dev
+              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-4.8
@ -490,16 +555,20 @@ matrix:
        - os: linux
          addons:
            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-4.8
          compiler: gcc-4.8
-          dist: xenial
+          dist: trusty
          if: env(DPL_ENABLED) = "1" AND (env(_DPL_JOB_ENABLED) = "1" OR env(DPL_JOB_ENABLE_ALL) = "1")
              AND (branch =~ /^.*deployer.*$/ OR (tag IS present AND env(DPL_TAG_ENABLED) = "1"))
              AND env(DPL_TERMINATE_MAIN) != "1"
@ -514,11 +583,15 @@ matrix:
        - os: linux
          addons:
            apt:
+              sources:
+              - ubuntu-toolchain-r-test
+              - sourceline: 'ppa:stjr/srb2'
              packages:
              - libsdl2-mixer-dev
              - libpng-dev
              - libgl1-mesa-dev
              - libgme-dev
+              - libopenmpt-dev
              - libcurl4-openssl-dev
              - p7zip-full
              - gcc-4.8
@ -535,30 +608,6 @@ matrix:
          - PACKAGE_DISTRO=trusty
          - PACKAGE_SUBVERSION=~14.04trusty
          #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5
-        - os: linux
-          addons:
-            apt:
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - gcc-4.8
-          compiler: gcc-4.8
-          dist: xenial
-          if: env(DPL_ENABLED) = "1" AND (env(_DPL_JOB_ENABLED) = "1" OR env(DPL_JOB_ENABLE_ALL) = "1")
-              AND (branch =~ /^.*deployer.*$/ OR (tag IS present AND env(DPL_TAG_ENABLED) = "1"))
-              AND env(DPL_TERMINATE_MAIN) != "1"
-          env:
-          - _DPL_JOB_ENABLED=1
-          - _DPL_JOB_NAME=eoan
-          - _DPL_DPUT_TARGET=1
-          - _DPL_PACKAGE_SOURCE=1
-          - PACKAGE_DISTRO=eoan
-          - PACKAGE_SUBVERSION=~19.10eoan
-          #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5
    allow_failures:
      - compiler: clang-3.5
      - compiler: clang-3.6
@ -578,12 +627,15 @@ cache:

 addons:
  apt:
+    sources:
+    - sourceline: 'ppa:stjr/srb2'
    packages:
    - libsdl2-mixer-dev
    - libpng-dev
    - libgl1-mesa-dev
    - libgme-dev
    - zlib1g-dev
+    - libopenmpt-dev
    - libcurl4-openssl-dev
    - p7zip-full
  homebrew:
@ -593,6 +645,7 @@ addons:
    - sdl2_mixer
    - game-music-emu
    - p7zip
+    - libopenmpt
    - cmake
    - curl
    update: true
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,14 +1,34 @@
 cmake_minimum_required(VERSION 3.0)
+
+# Enable CCache early
+set(SRB2_USE_CCACHE OFF CACHE BOOL "Use CCache")
+if (${SRB2_USE_CCACHE})
+	find_program(CCACHE_PROGRAM ccache)
+	if(CCACHE_PROGRAM)
+		message(STATUS "Found CCache: ${CCACHE_PROGRAM}")
+		set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+	else()
+		message(WARNING "You have specified to use CCACHE but it was not found. Object files will not be cached.")
+	endif()
+endif()
+
+file(STRINGS src/version.h SRB2_VERSION)
+string(REGEX MATCH "[0-9]+\\.[0-9.]+" SRB2_VERSION ${SRB2_VERSION})
+
 # DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
 # Version change is fine.
 project(SRB2
-	VERSION 2.0
+	VERSION ${SRB2_VERSION}
 	LANGUAGES C)

 if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
 	message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
 endif()

+if ((${SRB2_USE_CCACHE}) AND (${CMAKE_C_COMPILER} MATCHES "clang"))
+	message(WARNING "Using clang and CCache: You may want to set environment variable CCACHE_CPP2=yes to prevent include errors during compile.")
+endif()
+
 # Set up CMAKE path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")

@ -95,7 +115,6 @@ set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")

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

 include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)

@ -114,16 +133,19 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINAR

 ##### PACKAGE CONFIGURATION #####

-if(${CMAKE_SYSTEM} MATCHES "Windows")
-	set(CPACK_GENERATOR "ZIP")
-endif()
-if(${CMAKE_SYSTEM} MATCHES "Linux")
-	set(CPACK_GENERATOR "TGZ")
-endif()
-if(${CMAKE_SYSTEM} MATCHES "Darwin")
-	set(CPACK_GENERATOR "DragNDrop")
+set(SRB2_CPACK_GENERATOR "" CACHE STRING "Generator to use for making a package. E.g., ZIP, TGZ, DragNDrop (OSX only). Leave blank for default generator.")
+
+if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
+	if(${CMAKE_SYSTEM} MATCHES "Windows")
+		set(SRB2_CPACK_GENERATOR "ZIP")
+	elseif(${CMAKE_SYSTEM} MATCHES "Linux")
+		set(SRB2_CPACK_GENERATOR "TGZ")
+	elseif(${CMAKE_SYSTEM} MATCHES "Darwin")
+		set(SRB2_CPACK_GENERATOR "TGZ")
+	endif()
 endif()

+set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart" CACHE STRING "Program name for display purposes")
 set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
 #set(CPACK_PACKAGE_DESCRIPTION_FILE )
@ -132,4 +154,5 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${SRB2_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${SRB2_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${SRB2_VERSION_PATCH})
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}")
+SET(CPACK_OUTPUT_FILE_PREFIX package)
 include(CPack)
--- a/5
+++ b/5
@ -109,13 +109,10 @@ FILE_PATTERNS          = *.c \
                         *.mm \
                         *.dox
 RECURSIVE              = YES
-EXCLUDE                = ./src/djgppdos/internal.h \
-                         ./src/djgppdos/setup.c \
-                         ./src/sdl/IMG_xpm.c \
+EXCLUDE                = ./src/sdl/IMG_xpm.c \
                         ./src/sdl/SRB2DC/scramble.c
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = */src/hardware/*/* \
-                         */src/djgppdos/bcd.? \
                         */src/sdl/SDL_main/* \
                         */src/*/*_private.h \
                         */src/sdl/*/*help.? \
--- a/README.md
+++ b/README.md
@ -8,6 +8,7 @@
 - SDL2-Mixer (Linux/OS X only)
 - libupnp (Linux/OS X only)
 - libgme (Linux/OS X only)
+- libopenmpt (Linux/OS X only)

 ## Compiling

--- a/appveyor.yml
+++ b/appveyor.yml
@ -72,7 +72,7 @@ install:

 configuration:
 - SDL
-#- SDL64
+- SDL64

 before_build:
 - set "Path=%MINGW_SDK%\bin;%Path%"
@ -110,8 +110,8 @@ after_build:
 - set BUILDSARCHIVE=%REPO%-%CONFIGURATION%.7z
 - cmd: 7z a %BUILD_ARCHIVE% %BUILD_PATH% -xr!.gitignore
 - appveyor PushArtifact %BUILD_ARCHIVE%
- cmd: copy %BUILD_ARCHIVE% %BUILDSARCHIVE%
- appveyor PushArtifact %BUILDSARCHIVE%
+#- cmd: copy %BUILD_ARCHIVE% %BUILDSARCHIVE%
+#- appveyor PushArtifact %BUILDSARCHIVE%
 ##############################
 # DEPLOYER SCRIPT
 ##############################
--- a/assets/CMakeLists.txt
+++ b/assets/CMakeLists.txt
@ -12,6 +12,13 @@ ENDFUNCTION(PREPEND)
 set(SRB2_ASSET_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer"
 	CACHE STRING "Path to directory that contains all asset files for the installer.")

+set(SRB2_ASSET_INSTALL ON
+	CACHE BOOL "Insert asset files into the install directory or package.")
+
+####################
+# POST-V2.2 NOTE: Do not forget to add patch.pk3 to the end of this list!
+####################
+
 set(SRB2_ASSET_HASHED
 "main.kart;\
 gfx.pk3;\
@ -26,7 +33,8 @@ set(SRB2_ASSET_DOCS
 "README.txt;\
 HISTORY.txt;\
 LICENSE.txt;\
-LICENSE-3RD-PARTY.txt"
+LICENSE-3RD-PARTY.txt;\
+README-SDL.txt"
 	CACHE STRING "Documentation filenames. In OS X, these are packaged separately from other assets. No spaces between entries!"
 )

@ -41,20 +49,27 @@ endforeach()

 if(${CMAKE_SYSTEM} MATCHES Darwin)
 	get_target_property(outname SRB2SDL2 OUTPUT_NAME)
-	install(DIRECTORY "${SRB2_ASSET_DIRECTORY}/"
-		DESTINATION "${outname}.app/Contents/Resources"
-	)
+	if(${SRB2_ASSET_INSTALL})
+		install(DIRECTORY "${SRB2_ASSET_DIRECTORY}/"
+			DESTINATION "${outname}.app/Contents/Resources"
+		)
+	endif()
+	# Always install the doc files, even in non-asset packages.
 	install(FILES ${SRB2_ASSET_DOCS}
 		DESTINATION .
 		OPTIONAL
 	)
 else()
-	install(DIRECTORY "${SRB2_ASSET_DIRECTORY}/"
-		DESTINATION .
-	)
-	# Docs are assumed to be located in SRB2_ASSET_DIRECTORY, so don't install again
-	#install(FILES ${SRB2_ASSET_DOCS}
-	#	DESTINATION .
-	#	OPTIONAL
-	#)
+	if(${SRB2_ASSET_INSTALL})
+		install(DIRECTORY "${SRB2_ASSET_DIRECTORY}/"
+			DESTINATION .
+		)
+		# Docs are assumed to be located in SRB2_ASSET_DIRECTORY, so don't install them in their own call.
+	else()
+		# Always install the doc files, even in non-asset packages.
+		install(FILES ${SRB2_ASSET_DOCS}
+			DESTINATION .
+			OPTIONAL
+		)
+	endif()
 endif()
--- a/assets/README.txt
+++ b/assets/README.txt
@ -46,12 +46,12 @@ SRB2 Message Board:
 https://mb.srb2.org

 SRB2 Official Discord:
-https://discord.gg/pYDXzpX
+https://discord.gg/pYDXzpX (13+)

 COPYRIGHT AND DISCLAIMER

-Design and content on SRB2Kart is copyright 2018 by Kart Krew.
-Design and content on SRB2 is copyright 1998-2018 by Sonic Team Junior.
+Design and content on SRB2Kart is copyright 2020 by Kart Krew.
+Design and content on SRB2 is copyright 1998-2020 by Sonic Team Junior.
 All non-original material on SRB2.ORG is copyrighted by their
 respective owners, and no copyright infringement is intended. The owner
 of the SRB2.ORG domain is only acting as an ISP, and is therefore not
--- a/bin/DC/.gitignore
+++ b/bin/DC/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/Dos/Debug/.gitignore
+++ b/bin/Dos/Debug/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/Dos/Release/.gitignore
+++ b/bin/Dos/Release/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/PS3/Debug/.gitignore
+++ b/bin/PS3/Debug/.gitignore
@ -1,5 +0,0 @@
-/*.elf
-/*.self
-/*.pkg
-/*.BIN
-/pkg
--- a/bin/PS3/Release/.gitignore
+++ b/bin/PS3/Release/.gitignore
@ -1,5 +0,0 @@
-/*.elf
-/*.self
-/*.pkg
-/*.BIN
-/pkg
--- a/bin/PSP/Release/.gitignore
+++ b/bin/PSP/Release/.gitignore
@ -1,4 +0,0 @@
-/EBOOT.PBP
-/PARAM.SFO
-/SRB2PSP.PBP
-/SRB2PSP.elf
--- a/bin/Wii/Debug/.gitignore
+++ b/bin/Wii/Debug/.gitignore
@ -1,3 +0,0 @@
-/*.elf
-/*.dol
-/apps
--- a/bin/Wii/Release/.gitignore
+++ b/bin/Wii/Release/.gitignore
@ -1,3 +0,0 @@
-/*.elf
-/*.dol
-/apps
--- a/bin/WinCE/ARMV4Dbg/.gitignore
+++ b/bin/WinCE/ARMV4Dbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4IDbg/.gitignore
+++ b/bin/WinCE/ARMV4IDbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4IRel/.gitignore
+++ b/bin/WinCE/ARMV4IRel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4Rel/.gitignore
+++ b/bin/WinCE/ARMV4Rel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4TDbg/.gitignore
+++ b/bin/WinCE/ARMV4TDbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/ARMV4TRel/.gitignore
+++ b/bin/WinCE/ARMV4TRel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPS16Dbg/.gitignore
+++ b/bin/WinCE/MIPS16Dbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPS16Rel/.gitignore
+++ b/bin/WinCE/MIPS16Rel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIIDbg/.gitignore
+++ b/bin/WinCE/MIPSIIDbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIIRel/.gitignore
+++ b/bin/WinCE/MIPSIIRel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSII_FPDbg/.gitignore
+++ b/bin/WinCE/MIPSII_FPDbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSII_FPRel/.gitignore
+++ b/bin/WinCE/MIPSII_FPRel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIVDbg/.gitignore
+++ b/bin/WinCE/MIPSIVDbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIVRel/.gitignore
+++ b/bin/WinCE/MIPSIVRel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIV_FPDbg/.gitignore
+++ b/bin/WinCE/MIPSIV_FPDbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/MIPSIV_FPRel/.gitignore
+++ b/bin/WinCE/MIPSIV_FPRel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/Release/.gitignore
+++ b/bin/WinCE/Release/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/SH3Dbg/.gitignore
+++ b/bin/WinCE/SH3Dbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/SH3Rel/.gitignore
+++ b/bin/WinCE/SH3Rel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/SH4Dbg/.gitignore
+++ b/bin/WinCE/SH4Dbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/SH4Rel/.gitignore
+++ b/bin/WinCE/SH4Rel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/X86Dbg/.gitignore
+++ b/bin/WinCE/X86Dbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/X86Rel/.gitignore
+++ b/bin/WinCE/X86Rel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/emulatorDbg/.gitignore
+++ b/bin/WinCE/emulatorDbg/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/WinCE/emulatorRel/.gitignore
+++ b/bin/WinCE/emulatorRel/.gitignore
@ -1,2 +0,0 @@
-# DON'T REMOVE
-# This keeps the folder from disappearing
--- a/bin/nds/Debug/.gitignore
+++ b/bin/nds/Debug/.gitignore
@ -1,3 +0,0 @@
-*.arm9
-*.elf*
-*.nds
--- a/bin/nds/Release/.gitignore
+++ b/bin/nds/Release/.gitignore
@ -1,3 +0,0 @@
-*.arm9
-*.elf*
-*.nds
--- a/cmake/Modules/FindDiscordRPC.cmake
+++ b/cmake/Modules/FindDiscordRPC.cmake
@ -0,0 +1,23 @@
+include(LibFindMacros)
+
+libfind_pkg_check_modules(DISCORDRPC_PKGCONF DISCORDRPC)
+
+find_path(DISCORDRPC_INCLUDE_DIR
+	NAMES discord_rpc.h
+	PATHS
+		${DISCORDRPC_PKGCONF_INCLUDE_DIRS}
+		"/usr/include"
+		"/usr/local/include"
+)
+
+find_library(DISCORDRPC_LIBRARY
+	NAMES discord-rpc
+	PATHS
+		${DISCORDRPC_PKGCONF_LIBRARY_DIRS}
+		"/usr/lib"
+		"/usr/local/lib"
+)
+
+set(DISCORDRPC_PROCESS_INCLUDES DISCORDRPC_INCLUDE_DIR)
+set(DISCORDRPC_PROCESS_LIBS DISCORDRPC_LIBRARY)
+libfind_process(DISCORDRPC)
--- a/cmake/Modules/FindOPENMPT.cmake
+++ b/cmake/Modules/FindOPENMPT.cmake
@ -0,0 +1,23 @@
+include(LibFindMacros)
+
+libfind_pkg_check_modules(OPENMPT_PKGCONF OPENMPT)
+
+find_path(OPENMPT_INCLUDE_DIR
+	NAMES libopenmpt.h
+	PATHS
+		${OPENMPT_PKGCONF_INCLUDE_DIRS}
+		"/usr/include/libopenmpt"
+		"/usr/local/include/libopenmpt"
+)
+
+find_library(OPENMPT_LIBRARY
+	NAMES openmpt
+	PATHS
+		${OPENMPT_PKGCONF_LIBRARY_DIRS}
+		"/usr/lib"
+		"/usr/local/lib"
+)
+
+set(OPENMPT_PROCESS_INCLUDES OPENMPT_INCLUDE_DIR)
+set(OPENMPT_PROCESS_LIBS OPENMPT_LIBRARY)
+libfind_process(OPENMPT)
--- a/cmake/launch-c.in
+++ b/cmake/launch-c.in
@ -0,0 +1,3 @@
+#!/bin/sh
+export CCACHE_CPP2=true
+exec "${RULE_LAUNCH_COMPILE}" "${CMAKE_C_COMPILER}" "$@"
--- a/cmake/launch-cxx.in
+++ b/cmake/launch-cxx.in
@ -0,0 +1,3 @@
+#!/bin/sh
+export CCACHE_CPP2=true
+exec "${RULE_LAUNCH_COMPILE}" "${CMAKE_C_COMPILER}" "$@"
--- a/debian-template/control
+++ b/debian-template/control
@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 7.0.50~),
 zlib1g-dev,
 libgme-dev,
 libcurl4-openssl-dev,
+ libopenmpt-dev,
 libglu1-dev | libglu-dev,
 libosmesa6-dev | libgl-dev,
 nasm [i386]
@ -26,6 +27,7 @@ Depends: ${SHLIBS_DEPENDS}, ${MISC_DEPENDS},
 zlib1g,
 libgme0,
 libcurl4,
+ libopenmpt | libopenmpt0,
 libpng | libpng16-16 | libpng12-0
 Description: A cross-platform 3D Sonic fangame
 Sonic Robo Blast 2 is a 3D open-source Sonic the Hedgehog
--- a/deployer/travis/deployer_defaults.sh
+++ b/deployer/travis/deployer_defaults.sh
@ -29,8 +29,8 @@
 # Asset File Parameters
 : ${ASSET_ARCHIVE_PATH:=https://github.com/mazmazz/Kart-Public/releases/download/kart_assets/srb2kart-v102-assets.7z}
 : ${ASSET_ARCHIVE_OPTIONAL_PATH:=https://github.com/mazmazz/Kart-Public/releases/download/kart_assets/srb2kart-v102-optional-assets.7z}
-: ${ASSET_FILES_HASHED:=srb2.srb patch.kart gfx.kart textures.kart chars.kart maps.kart}
-: ${ASSET_FILES_DOCS:=README.txt HISTORY.txt LICENSE.txt LICENSE-3RD-PARTY.txt}
+: ${ASSET_FILES_HASHED:=main.kart chars.pk3 gfx.pk3 maps.pk3 textures.pk3 patch.pk3}
+: ${ASSET_FILES_DOCS:=README.txt HISTORY.txt LICENSE.txt LICENSE-3RD-PARTY.txt README-SDL.txt}
 : ${ASSET_FILES_OPTIONAL_GET:=0}

 # FTP Parameters
@ -51,24 +51,24 @@

 # Package Parameters
 : ${PACKAGE_NAME:=srb2kart}
-: ${PACKAGE_VERSION:=1.0.2}
+: ${PACKAGE_VERSION:=2.0}
 : ${PACKAGE_SUBVERSION}         # Highly recommended to set this to reflect the distro series target (e.g., ~18.04bionic)
 : ${PACKAGE_REVISION}           # Defaults to UTC timestamp
 : ${PACKAGE_INSTALL_PATH:=/usr/games/SRB2Kart}
 : ${PACKAGE_LINK_PATH:=/usr/games}
 : ${PACKAGE_DISTRO:=trusty}
 : ${PACKAGE_URGENCY:=high}
-: ${PACKAGE_NAME_EMAIL:=Kart Krew <stjr@srb2.org>}
-: ${PACKAGE_GROUP_NAME_EMAIL:=Kart Krew <stjr@srb2.org>}
+: ${PACKAGE_NAME_EMAIL:=Kart Krew <kartkrewdev@gmail.com>}
+: ${PACKAGE_GROUP_NAME_EMAIL:=Kart Krew <kartkrewdev@gmail.com>}
 : ${PACKAGE_WEBSITE:=<https://mb.srb2.org/showthread.php?p=802695>}

-: ${PACKAGE_ASSET_MINVERSION:=1.0.1} # Number this the version BEFORE the actual required version, because we do a > check
-: ${PACKAGE_ASSET_MAXVERSION:=1.0.3}  # Number this the version AFTER the actual required version, because we do a < check
+: ${PACKAGE_ASSET_MINVERSION:=1.2} # Number this the version BEFORE the actual required version, because we do a > check
+: ${PACKAGE_ASSET_MAXVERSION:=2.1}  # Number this the version AFTER the actual required version, because we do a < check

 : ${PROGRAM_NAME:=Sonic Robo Blast 2 Kart}
 : ${PROGRAM_VENDOR:=Kart Krew}
-: ${PROGRAM_VERSION:=1.0.2}
-: ${PROGRAM_DESCRIPTION:=A kart racing mod based on the 3D Sonic the Hedgehog fangame Sonic Robo Blast 2.}
+: ${PROGRAM_VERSION:=2.0}
+: ${PROGRAM_DESCRIPTION:=Go go-karting with Dr. Eggman!}
 : ${PROGRAM_FILENAME:=srb2kart}

 : ${DPL_PGP_KEY_PRIVATE}        # Base64-encoded private key file. Used to sign Debian packages
--- a/extras/conf/SRB2Kart2.cfg
+++ b/extras/conf/SRB2Kart2.cfg
--- a/extras/conf/Srb2-20db.cfg
+++ b/extras/conf/Srb2-20db.cfg
--- a/extras/conf/Srb2-20wb.cfg
+++ b/extras/conf/Srb2-20wb.cfg
--- a/extras/conf/Srb2-21db.cfg
+++ b/extras/conf/Srb2-21db.cfg
--- a/extras/conf/Srb2-21wb.cfg
+++ b/extras/conf/Srb2-21wb.cfg
--- a/extras/conf/srb2-21db2.cfg
+++ b/extras/conf/srb2-21db2.cfg
--- a/extras/conf/srb2.wcf
+++ b/extras/conf/srb2.wcf
@ -1,576 +0,0 @@
-
-; Defines general parameters of the game for which wadfiles are intended.
-;
-;	Name		textual name for internal use
-;	IWAD		standard 8.3 base name and extension of main wadfile
-;	NewMap		default name for new map -- dictates format for all maps
-;	Directory	directory in which main wadfile (and game files) reside
-;	Run			command to execute (from the directory) for running a map
-
-[WadGame]
-Name=Sonic Robo Blast 2
-IWAD=srb2.srb
-NewMap=MAP01
-Directory=C:\Documents and Settings\Ben\My Documents\srb2
-Run=fd\srb2win.exe -file $_Wadfile -warp $_Wadmap
-
-; Defines parameters of the default sector motif created when no motif
-; file can be located at startup.
-
-[Default.Sector]
-Above=GFZROCK
-Main=GFZROCK
-Below=GFZROCK
-Ceiling=F_SKY1
-Floor=FLOOR0_6
-CeilingHeight=4096
-FloorHeight=0
-Lighting=255
-
-; Defines parameters of the default door motif created when no motif
-; file can be located at startup.
-
-[Default.Door]
-Base=FLAT1
-Door=BIGDOOR2
-Track=DOORTRAK
-Type=1
-
-; Defines parameters of the default stair motif created when no motif
-; file can be located at startup.
-
-[Default.Stair]
-FloorRunner=GFZROCK
-CeilingRunner=GFZROCK
-Stairwell=GFZROCK
-FloorInc=8
-CeilingInc=0
-LightingInc=0
-
-;	ID				used to classify things
-;	Flags			supplies some additional information:
-;						0x0001 - indicate thing facing angle
-;	Red				red value for drawing things of said class
-;	Green			green value for drawing things of said class
-;	Blue			blue value for drawing things of said class
-;	Name			textual description of class
-
-[Things.Classes]
-0x001   0x0001  255 255 255 Starts
-0x002   0x0000  192 0   224 Emeralds
-0x003   0x0001  255 0   0   Enemies
-0x004   0x0000  255 192 0   Nights Things
-0x005   0x0000  0   192 192 Power-Up Monitors
-0x006   0x0000  192 0   224 Misc.
-0x007   0x0000  192 192 192 Scenery
-0x008   0x0000  255 255 0   Mario
-0x009   0x0000  255 192 224 Christmas
-0x00b   0x0000  0   0   255 Rings
-0x00c   0x0000  0   224 0   Springs and Such
-
-;	ID				used to uniquely identify things in a map
-;	Class			classification (defined above section)
-;	Size			approximate thing size (in map units)
-;	Sprite			name of the sprite to use for display purposes
-;	Name			textual description of thing
-
-[Things.Types]
-0x001   1   32  suptd0      Player 01 Start
-0x002   1   32  suptd0      Player 02 Start
-0x003   1   32  suptd0      Player 03 Start
-0x004   1   32  suptd0      Player 04 Start
-0xfa1   1   32  suptd0      Player 05 Start
-0xfa2   1   32  suptd0      Player 06 Start
-0xfa3   1   32  suptd0      Player 07 Start
-0xfa4   1   32  suptd0      Player 08 Start
-0xfa5   1   32  suptd0      Player 09 Start
-0xfa6   1   32  suptd0      Player 10 Start
-0xfa7   1   32  suptd0      Player 11 Start
-0xfa8   1   32  suptd0      Player 12 Start
-0xfa9   1   32  suptd0      Player 13 Start
-0xfaa   1   32  suptd0      Player 14 Start
-0xfab   1   32  suptd0      Player 15 Start
-0xfac   1   32  suptd0      Player 16 Start
-0xfad   1   32  suptd0      Player 17 Start
-0xfae   1   32  suptd0      Player 18 Start
-0xfaf   1   32  suptd0      Player 19 Start
-0xfb0   1   32  suptd0      Player 20 Start
-0xfb1   1   32  suptd0      Player 21 Start
-0xfb2   1   32  suptd0      Player 22 Start
-0xfb3   1   32  suptd0      Player 23 Start
-0xfb4   1   32  suptd0      Player 24 Start
-0xfb5   1   32  suptd0      Player 25 Start
-0xfb6   1   32  suptd0      Player 26 Start
-0xfb7   1   32  suptd0      Player 27 Start
-0xfb8   1   32  suptd0      Player 28 Start
-0xfb9   1   32  suptd0      Player 29 Start
-0xfba   1   32  suptd0      Player 30 Start
-0xfbb   1   32  suptd0      Player 31 Start
-0xfbc   1   32  suptd0      Player 32 Start
-0x057   1   32  suptd0      CTF Team Start (Red)
-0x059   1   32  suptd0      CTF Team Start (Blue)
-0x00b   1   32  suptd0      Deathmatch Start
-0x1a4   2   20  cemga0      Emerald 1 (Green)
-0x1a5   2   20  cemoa0      Emerald 2 (Orange)
-0x1a6   2   20  cempa0      Emerald 3 (Pink)
-0x1a7   2   20  cemba0      Emerald 4 (Blue)
-0x1a8   2   20  cemra0      Emerald 5 (Red)
-0x1a9   2   20  cemla0      Emerald 6 (Light Blue)
-0x1aa   2   20  cemga0      Emerald 7 (Grey)
-0x1ab   2   20  cemka0      Emerald 8 (Master)
-0x009   3   40  sposa1      Crawla (Red)
-0xbbc   3   40  possa1      Crawla (Blue)
-0x02a   3   40  tfogi0      Pop-up Turret
-0xbbd   3   40  jetba1      Jetty-Syn Bomber
-0x016   3   40  jetga1      Jetty-Syn Gunner
-0x03a   3   40  fisha0      Stupid Dumb Unnamed Robofish (tm)
-0x047   3   40  detna1      Deton
-0x038   3   40  skima0      Skim
-0x7d4   3   40  treta1      THZ Turret
-0x010   3   80  eggma1      Egg Mobile (Boss 1)
-0x7d8   3   80  eggna1      Egg Slimer (Boss 2)
-0x015   3   40  ccoma1      Crawla Commander
-0x008   3   40  tfogi0      Chaos Mode Enemy Spawn
-0x138d  3   40  buzza0      Gold Buzz
-0x138e  3   40  rbuza0      Red Buzz
-0x034   4   20  dissa0      1024 Axis
-0x035   4   20  dissa0      512 Axis
-0x03b   4   20  dissa0      2048 Axis
-0x03e   4   20  dissa0      1024 Axis (Inverted)
-0x00f   4   20  dissa0      512 Axis (Inverted)
-0x02d   4   20  dissa0      2048 Axis (Inverted)
-0x03d   4   20  dissa0      Axis Transfer
-0x02e   4   20  dissa0      Axis Transfer Closest
-0x037   4   20  dissa0      Axis Transfer LastToFirst
-0x03c   4   20  ndrna1      Ideya Drone
-0x039   4   20  hoopa0      Hoop
-0x02f   4   20  bon1a0      Circle of Rings
-0x7d7   4   20  bon1a0      Circle of Rings (Big)
-0x800   4   20  nwnga0      Circle of Wing Logos
-0x7da   4   20  nwnga0      Circle of Wing Logos (Big)
-0x7fe   4   20  nwnga0      Circle of Rings and Wings
-0x7ff   4   20  nwnga0      Circle of Rings and Wings (Big)
-0x025   4   20  nwnga0      Wing Logo
-0x052   4   20  dissa0      Axis Transfer Condition
-0x055   4   20  dissa0      Axis Transfer Condition 2
-0xbbf   4   20  npraa0      Super Loop
-0xbc0   4   20  nprba0      Drill Refill
-0xbc1   4   20  nprca0      Helper
-0x019   5   20  shtva0      Super Sneakers
-0x023   5   20  whtva0      Whirlwind Shield
-0x029   5   20  prupa0      Extra Life
-0x030   5   20  yltva0      Attraction Shield
-0x7d2   5   20  rdtva0      Inferno Shield
-0x7e2   5   20  bktva0      Armageddon Shield
-0x7e6   5   20  pinva0      Invincibility
-0x7ec   5   20  bltva0      Liquid Shield
-0x7db   5   20  srbxa0      Super Ring (10 Rings)
-0x7dc   5   20  grbxa0      Silver Ring (25 Rings)
-0x04e   5   20  mixua0      Teleporter
-0x7d5   5   20  eggba0      Eggman
-0xbb8   5   20  quesa0      Random
-0x01f   6   20  rflga0      CTF Flag (Red)
-0x022   6   20  bflga0      CTF Flag (Blue)
-0x7dd   6   20  tokea0      Special Stage Token
-0x056   6   20  signd0      End Level Sign
-0x021   6   20  bubla0      Air Bubble Patch
-0x040   6   20  emera0      Emerald Hunt Location 1
-0xbba   6   20  emera0      Emerald Hunt Location 2
-0xbb9   6   20  emera0      Emerald Hunt Location 3
-0xbbe   6   20  stpta0      Star Post
-0x1389  6   20  ppsha0      Push
-0x138a  6   20  pplla0      Pull
-0x138b  6   20  dissa0      Teleport Destination
-0x138f  6   20  dissa0      Cut-Away View
-0x043   6   20  dspka0      Ceiling Spike
-0x044   6   20  uspka0      Floor Spike
-0x017   6   20  spika0      Spikeball (Special Stage)
-0x011   6   20  dissa0      Boss Flypoint
-0x012   6   20  dissa0      Zoom Tube Waypoint
-0x801   6   20  dissa0      Egg Capsule Center
-0x033   6   20  lasra0      Laser
-0x024   7   20  fwr1b0      GFZ Flower (Normal)
-0x046   7   20  fwr2a0      GFZ Sunflower
-0x049   7   20  fwr3a0      GFZ Budding Flower
-0x04a   7   20  bus1a0      Berry Bush
-0x04b   7   20  bus2a0      Bush
-0x7f3   7   20  thzpa0      THZ Flower
-0x00d   7   20  xms2a0      Palm Tree
-0x051   7   20  garga1      Gargoyle
-;wtraa0 through wtrha0 are empty sprites, formerly used for the below
-0x7ea   7   20  dumba0      Ambient Water SFX 1A (Large)
-0x7e8   7   20  dumba0      Ambient Water SFX 1B (Large)
-0x7e7   7   20  dumba0      Ambient Water SFX 2A (Medium)
-0x7fd   7   20  dumba0      Ambient Water SFX 2B (Medium)
-0x053   7   20  dumba0      Ambient Water SFX 3A (Small)
-0x7e3   7   20  dumba0      Ambient Water SFX 3B (Small)
-0x7e9   7   20  dumba0      Ambient Water SFX 4A (Extra Large)
-0x01b   7   20  dumba0      Ambient Water SFX 4B (Extra Large)
-0x00e   7   20  dumba0      Random Ambience 1
-0x02b   7   20  dumba0      Random Ambience 2
-0x031   7   20  chana0      Hanging Chain
-0x7d6   7   20  alrma0      THZ Alarm
-0x7d1   7   20  fwr4a0      CEZ Flower
-0x018   7   20  flama0      CEZ Torch
-0x7d3   7   20  dissa0      Light Source (MAP92)
-0x2710  8   20  gooma0      Overworld Goomba
-0x2711  8   20  bgoma0      Underworld Goomba
-0x2712  8   20  mus1a0      Bush (Short)
-0x2713  8   20  mus2a0      Bush (Tall)
-0x2714  8   20  toada0      Toad
-0x2715  8   20  coina0      Coin
-0x013   8   20  koopa0      King Bowser
-0x00a   8   20  shlla0      Koopa Shell
-0x00c   8   20  maxea0      Axe
-0x032   8   20  ffwra0      Fire Flower
-0x01d   8   20  pumaa0      Puma (Mario Fireball)
-0x005   9   20  xms1a0      Pole
-0x006   9   20  xms3a0      Snowman
-0x00d   9   20  xms2a0      Candy Cane
-0x054   11  20  bon1a0      5 Vertical Rings (Yellow Spring)
-0x02c   11  20  bon1a0      5 Vertical Rings (Red Spring)
-0x04c   11  20  bon1a0      5 Diagonal Rings (Yellow Spring)
-0x04d   11  20  bon1a0      10 Diagonal Rings (Red Spring)
-0x7de   11  20  bon1a0      Ring
-0x045   11  20  homra0      Homing Ring
-0xbbb   11  20  raila0      Rail Ring
-0x01a   11  20  autra0      Automatic Ring
-0x036   11  20  bomra0      Explosion Ring
-0x050   11  20  infra0      Infinity Ring
-0x138c  12  20  sprba0      Blue Spring
-0x01c   12  20  sprya0      Yellow Spring (Up)
-0x04f   12  20  sprra0      Red Spring (Up)
-0x7df   12  20  yspra1      Yellow Spring (Diagonal Up)
-0x026   12  20  rspra1      Red Spring (Diagonal Up)
-0x014   12  20  ysuda1      Yellow Spring (Diagonal Down)
-0x027   12  20  rsuda1      Red Spring (Diagonal Down)
-0x041   12  20  sudya0      Yellow Spring (Down)
-0x042   12  20  sudra0      Red Spring (Down)
-0x01e   12  20  stemd0      THZ Gas Jet
-0x020   12  20  fansa0      THZ Fan
-
-;	ID				used to classify linedefs
-;	Name			textual description of class
-;
-;	Note:	When converting a sector to a door, the linedef types
-;			available are those in class number two.
-
-[LineDefs.Classes]
-0x001   *Important
-0x002   Floor Over Floor
-0x003   Linedef Executor
-0x004   Plane Movement
-0x005   Lighting
-0x006	Scroll Effects
-0x007   Pushers
-0x008   Miscellaneous
-
-;	ID
-;	class
-;	codes
-;		n       does NOT require a tag number
-;		W       walk-over activation
-;		S       switch (triggered by player use)
-;		G       gunfire (pistol, shotgun, chaingun) cross or hit line
-;		1       the line may be activated once only
-;		R       potentially repeatable activation
-;		&       affected sectors locked out from further changes
-;		m       monster actions can activate the line's effect
-;	speed
-;		(slow=1, medium = 2, fast = 3, turbo = 4)
-;	time
-;	texture changes
-;	description
-
-[LineDefs.Types]
-; Commonly used types
-0x019 1 - - - - Floor Over Floor: Solid, Opaque, Shadowcasting
-0x02d 1 - - - - Floor Over Floor: Water, Translucent
-0x010 1 - - - - Colormap
-
-0x001 2 - - - - Crumbling (No Respawn), Floating, Bobbing
-0x002 4 - - - - Continuous Floor/Ceiling Mover
-0x003 4 - - - - Continuous Floor Mover
-0x004 4 - - - - Continuous Ceiling Mover
-0x005 5 - - - - Ceiling Lighting
-0x006 4 - - - - Continuous Two-Speed Floor/Ceiling Mover
-0x007 4 - - - - Continuous Two-Speed Floor Mover
-0x008 4 - - - - Continuous Two-Speed Ceiling Mover
-0x009 3 - - - - Trigger Linedef Executor (Race Only, Once)
-0x00a 3 - - - - Trigger Linedef Executor (CTF Red Team, Continuous)
-0x00b 3 - - - - Trigger Linedef Executor (CTF Red Team, Each Time)
-0x00c 3 - - - - Trigger Linedef Executor (CTF Blue Team, Continuous)
-0x00d 3 - - - - Trigger Linedef Executor (CTF Blue Team, Each Time)
-
-0x00f 3 - - - - Trigger Linedef Executor (No More Enemies, Once)
-0x010 5 - - - - Colormap
-
-0x012 8 - - - - Zoom Tube Parameters
-0x013 3 - - - - Trigger Linedef Executor (Character Ability, Continuous)
-0x014 3 - - - - Trigger Linedef Executor (Character Ability, Each Time)
-0x015 3 - - - - Trigger Linedef Executor (Character Ability, Once)
-
-0x018 4 - - - - Instant Ceiling Raise
-0x019 2 - - - - Solid, Opaque, Shadowcasting
-0x01a 4 - - - - Instant Floor Lower
-
-0x021 2 - - - - Solid, Opaque, Non-Shadowcasting
-0x022 2 - - - - Floating, Bobbing
-0x023 2 - - - - Crumbling (No Respawn)
-0x024 2 - - - - Crumbling (Respawn)
-0x025 2 - - - - Crumbling (Respawn), Floating
-0x026 2 - - - - Bobbing (Air)
-0x027 2 - - - - Crumbling (Respawn), Floating, Bobbing
-0x028 2 - - - - Crumbling (Respawn), Bobbing (Air)
-0x029 2 - - - - Mario Block
-0x02a 2 - - - - Crumbling (No Respawn), Floating
-0x02b 4 - - - - Crusher 1 (Ceiling to Floor)
-0x02c 2 - - - - Solid, Translucent
-0x02d 2 - - - - Water, Translucent
-0x02e 2 - - - - Fog Block
-0x02f 2 - - - - Half Light Block
-0x030 2 - - - - Water, Opaque
-0x031 2 - - - - Light Block
-0x032 4 - - - - Crusher 2 (Floor to Ceiling)
-0x033 2 - - - - Solid, No Sides
-0x034 2 - - - - Intangible, Translucent
-0x035 2 - - - - Laser Block
-0x036 2 - - - - Thwomp Block
-0x037 2 - - - - Bustable Block
-0x038 2 - - - - Quicksand Block
-0x039 2 - - - - Solid, Invisible
-0x03a 2 - - - - Intangible, Invisible
-0x03b 2 - - - - Intangible from Bottom, Opaque
-0x03c 5 - - - - Adjustable Pulsating Light
-0x03d 5 - - - - Adjustable Flickering Light
-0x03e 2 - - - - Intangible, Opaque
-0x03f 8 - - - - Camera Scanner
-0x040 8 - - - - Per-Sector Gravity
-0x041 8 - - - - Speed Pad
-0x042 8 - - - - Flat Alignment
-0x043 2 - - - - Intangible, Sides Only
-0x044 2 - - - - Adjustable Bobbing (Air)
-0x045 2 - - - - Solid, Sides Only
-0x046 8 - - - - Ideya Time Modifier
-0x047 8 - - - - Custom Exit
-0x048 2 - - - - Reverse Adjustable Bobbing (Air)
-0x049 8 - - - - Disable Linedef
-0x04a 2 - - - - Water, Translucent, No Sides
-0x04b 2 - - - - Water, Opaque, No Sides
-0x04c 2 - - - - Shatter Block
-0x04d 2 - - - - Intangible from Bottom, Translucent, No Sides
-0x04e 2 - - - - Spin Bust Block
-0x04f 2 - - - - Crumbling (Respawn)
-0x050 2 - - - - Crumbling (No Respawn)
-0x051 2 - - - - Intangible from Bottom, Translucent
-0x052 2 - - - - Intangible from Bottom, Crumbling (Respawn), Translucent
-0x053 2 - - - - Intangible from Bottom, Crumbling (No Respawn), Translucent
-0x054 2 - - - - Spin Bust Block, Translucent
-0x055 6 - - - - Scroll Wall First Side Opposite Direction
-0x056 2 - - - - Shatter Block, Translucent
-0x057 2 - - - - Custom
-0x058 4 - - - - Continuously Falling Sector
-0x059 2 - - - - Rising, Solid, Opaque, Shadowcasting
-0x05a 2 - - - - Rising, Solid, Opaque, Non-shadowcasting
-0x05b 2 - - - - Rising, Solid, Translucent
-0x05c 2 - - - - Rising, Intangible from Bottom, Opaque
-0x05d 2 - - - - Rising, Intangible from Bottom, Translucent
-0x05e 2 - - - - Rising, Solid, Invisible
-0x05f 3 - - - - Trigger Linedef Executor (Ring Count, Continuous)
-0x060 3 - - - - Trigger Linedef Executor (Continuous)
-0x061 3 - - - - Trigger Linedef Executor (Each Time)
-0x062 3 - - - - Trigger Linedef Executor (Once)
-0x063 3 - - - - Trigger Linedef Executor (Ring Count, Once)
-0x064 6 - - - - Scroll Wall First Side Left
-0x065 3 - - - - Set Tagged Sector's Floor Height/Pic
-0x066 3 - - - - Set Tagged Sector's Ceiling Height/Pic
-0x067 3 - - - - Set Tagged Sector's Light Level
-0x068 3 - - - - Teleport Player to Tagged Sector
-0x069 3 - - - - Change Music
-0x06a 3 - - - - Move Tagged Sector's Floor
-0x06b 3 - - - - Move Tagged Sector's Ceiling
-0x06c 3 - - - - Lower Floor by Line
-0x06d 3 - - - - Raise Floor by Line
-0x06e 3 - - - - Lower Ceiling by Line
-0x06f 3 - - - - Raise Ceiling by Line
-0x070 3 - - - - Change Tagged Sector's Tag
-0x071 3 - - - - Run Script
-0x072 3 - - - - Change Front Sector's Tag
-0x073 3 - - - - Play SFX
-0x074 3 - - - - Stop Plane Movement
-0x075 3 - - - - Fade Light Level
-0x076 3 - - - - Stop Lighting Effect
-0x077 3 - - - - Start Adjustable Fire Flicker
-0x078 3 - - - - Start Adjustable Glowing Light
-0x079 3 - - - - Cut-Away View
-0x07a 3 - - - - Stop Object
-0x07b 3 - - - - Change Sky
-0x07c 3 - - - - Change Weather
-0x07d 3 - - - - Change Object State
-0x07e 3 - - - - Stop Object
-0x07f 3 - - - - Award Score
-0x080 3 - - - - Start Platform Movement
-0x081 3 - - - - Crush Ceiling Once
-0x082 3 - - - - Crush Floor Once
-0x083 3 - - - - Crush Floor And Ceiling Once
-0x084 3 - - - - Enable/Disable 2D Mode
-0x085 3 - - - - Enable/Disable Gravity Flip
-0x086 3 - - - - Award Power-Up
-0x087 3 - - - - Change Plane Scroller Direction
-0x088 3 - - - - Shatter FOF
-0x089 3 - - - - Disable Player Control
-0x08a 3 - - - - Change Object Size
-0x08b 3 - - - - Change Tagged Linedef Textures
-0x08c 3 - - - - Start Metal Sonic Race
-0x08d 3 - - - - Unlockable Trigger
-0x08e 3 - - - - Change Object Type State
-0x08f 3 - - - - Call Lua Function
-0x090 3 - - - - Earthquake
-0x096 3 - - - - Execute Linedef Executor (from tag)
-0x097 3 - - - - Execute Linedef Executor (random range)
-
-0x0c8 6 - - - - Disp Scroll Ceiling Texture and Carry Objects
-0x0c9 6 - - - - Disp Carry Objects on Ceiling
-0x0ca 6 - - - - Scroll Ceiling Texture and Carry Objects
-0x0cb 6 - - - - Carry Objects on Ceiling
-0x0cc 6 - - - - Acc Scroll Ceiling Texture and Carry Objects
-0x0cd 6 - - - - Acc Carry Objects on Ceiling
-
-0x0d5 5 - - - - Floor Lighting
-0x0d6 6 - - - - Acc Scroll Ceiling Texture
-0x0d7 6 - - - - Acc Scroll Floor Texture
-0x0d8 6 - - - - Acc Carry Objects on Floor
-0x0d9 6 - - - - Acc Scroll Floor Texture and Carry Objects
-0x0da 6 - - - - Acc Scroll Wall According to Linedef
-
-0x0df 8 - - - - Friction
-0x0e0 7 - - - - Wind
-0x0e1 7 - - - - Current
-0x0e2 7 - - - - Boom Push/Pull Thing
-0x0e3 7 - - - - Upwards Current
-0x0e4 7 - - - - Downwards Current
-0x0e5 7 - - - - Upwards Wind
-0x0e6 7 - - - - Downwards Wind
-
-0x0e8 4 - - - - Activate Floating Platform
-0x0e9 4 - - - - Activate Floating Platform (Adjustable Speed)
-
-0x0f2 8 - - - - Fake Floor
-
-0x0f5 6 - - - - Disp Scroll Ceiling Texture
-0x0f6 6 - - - - Disp Scroll Floor Texture
-0x0f7 6 - - - - Disp Carry Objects on Floor
-0x0f8 6 - - - - Disp Scroll Floor Texture and Carry Objects
-0x0f9 6 - - - - Disp Scroll Wall According to Linedef
-0x0fa 6 - - - - Scroll Ceiling Texture
-0x0fb 6 - - - - Scroll Floor Texture
-0x0fc 6 - - - - Carry Objects on Floor
-0x0fd 6 - - - - Scroll Floor Texture and Carry Objects
-0x0fe 6 - - - - Scroll Wall According to Linedef
-0x0ff 6 - - - - Scroll Texture by Offsets
-
-[Sectors.Types]
-0x001 Blink (random)
-0x002 Blink (1/2 second)
-0x003 Blink (1 second)
-0x004 Spikes
-0x005 Death Pit (no camera modifications)
-0x006 Space Countdown
-0x007 Damage (Fire)
-0x008 Light oscillates
-0x009 Damage (Special Stage)
-0x00a Instant Kill
-0x00b Damage (Non-Elemental)
-0x00c Blink (1 second synch)
-0x00d Blink (1/2 second synch)
-0x00e Bouncy Sector (FOF Control Only)
-
-0x010 Death Pit (camera modifications)
-0x011 Light flickers like fire
-0x012 Damage (Electrical)
-
-0x021 Special Stage Goal
-
-0x100 Ice/Sludge
-
-0x200 Wind/Current
-
-0x207 Damage (Fire) and Current
-
-0x29a Egg Trap Capsule
-
-0x2b2 Button 1 (Open Door A/700 B/701)
-0x2b3 Button 2 (Open Door A/702 B/703)
-0x2b4 Button 3 (Open Door A/704 B/705)
-0x2b5 Button 4 (Open Door A/706 B/707)
-0x2b6 Button 5 (Open Door A/708 B/709)
-0x2b7 Button 6 (Open Door A/710 B/711)
-0x2b8 Button 7 (Open Door A/712 B/713)
-0x2b9 Button 8 (Open Door A/714 B/715)
-0x2ba Button 9 (Open Door A/716 B/717)
-0x2bb Button 10 (Open Door A/718 B/719)
-0x2bc Button 11 (Open Door A/720 B/721)
-0x2bd Button 12 (Open Door A/722 B/723)
-0x2be Button 13 (Open Door A/724 B/725)
-0x2bf Button 14 (Open Door A/726 B/727)
-0x2c0 Button 15 (Open Door A/728 B/729)
-0x2c1 Button 16 (Open Door A/730 B/731)
-0x2c2 Button 17 (Open Door A/732 B/733)
-0x2c3 Button 18 (Open Door A/734 B/735)
-0x2c4 Button 19 (Open Door A/736 B/737)
-0x2c5 Button 20 (Open Door A/738 B/739)
-0x2c6 Button 21 (THZ2 A/740 B/741 D/742)
-0x2c7 Close Door Blazing (Tag 743)
-
-0x300 Ice/Sludge and Wind/Current
-
-0x3c7 Linedef Executor (Emerald Check)
-0x3c8 Linedef Executor (NiGHTS Mare)
-0x3c9 Super Sonic Transform
-0x3ca Check 3DFloors for Linedef Executor
-0x3cb Linedef Executor (Pushable Objects)
-0x3cc Linedef Executor (No Floor Touch, All Players)
-0x3cd Linedef Executor (Floor Touch, All Players)
-0x3ce Linedef Executor (No Floor Touch)
-0x3cf Linedef Executor (Floor Touch)
-0x3d0 Speed Pad (No Spin)
-0x3d1 Speed Pad (Spin)
-0x3d2 Ring Drainer (Floor Touch)
-0x3d3 Spinner
-0x3d4 Ring Drainer (No Floor Touch)
-0x3d5 Raise Ceiling to Highest (Tag 744)
-0x3d6 Exit Sector
-0x3d7 Damage (Water)
-0x3d8 Damage (Water) and Current
-0x3d9 Conveyor Belt
-0x3da THZ2 Slime Raise (B/712 S/713 P/714 D/715 S/716)
-0x3db No Tag Zone
-0x3dc CTF - Red Team Base
-0x3dd CTF - Blue Team Base
-0x3de Special Stage (Floor=Time) (Ceiling=Rings)
-0x3df Custom Gravity
-0x3e0 Ramp Sector
-0x3e1 Starpost Activator
-0x3e2 Finish Line
-
-0x3e4 Non-Ramp Sector
-0x3e5 Fan Sector
-0x3e6 Zoom Tube Start
-0x3e7 Zoom Tube End
-
-0x5dc Bustable Block Sprite ROIA
-0x5dd Bustable Block Sprite ROIB
-0x5de Bustable Block Sprite ROIC
-0x5df Bustable Block Sprite ROID
-0x5e0 Bustable Block Sprite ROIE
-0x5e1 Bustable Block Sprite ROIF
-0x5e2 Bustable Block Sprite ROIG
-0x5e3 Bustable Block Sprite ROIH
-0x5e4 Bustable Block Sprite ROII
-0x5e5 Bustable Block Sprite ROIJ
-0x5e6 Bustable Block Sprite ROIK
-0x5e7 Bustable Block Sprite ROIL
-0x5e8 Bustable Block Sprite ROIM
-0x5e9 Bustable Block Sprite ROIN
-0x5ea Bustable Block Sprite ROIO
-0x5eb Bustable Block Sprite ROIP
--- a/extras/conf/srb2.ygd
+++ b/extras/conf/srb2.ygd
@ -1,539 +0,0 @@
-# Yadex game definition file version 4
-#
-#	srb2.ygd
-#	Yadex Game Definitions for Sonic Robo Blast 2
-#	See Yadex's doc/ygd.html for the specs.
-#
-
-# File made by Alam_GBC.
-# Updated by Graue, 2006-06-19
-
-# Yadex has only a few games like "doom2", etc. hardcoded into it.
-# Rather than hack the code, since I don't expect to ever edit Doom 2,
-# I went into /usr/local/share/games/yadex/1.7.0/ and renamed
-# doom2.ygd to doom2_real.ygd, then installed this file as srb2.ygd,
-# then made a hard link from doom2.ygd to srb2.ygd; that is:
-#   ln srb2.ygd /usr/local/share/games/yadex/1.7.0/doom2.ygd
-
-# If you do that, change "iwad2" in yadex.cfg to point to your copy of
-# srb2.srb.
-
-# It's not the most beautiful thing to do, but it works. Also, Doom 2
-# is the default game, so this way you don't have to do anything
-# special when starting Yadex.
-
-# I claim no copyright on this file. -- Graue <graue@oceanbase.org>
-
-level_format    doom
-level_name      map01
-picture_format  normal
-sky_flat        sky1
-texture_format  normal
-texture_lumps   normal
-
-#
-#	Definition of linedef type groups
-#	Format is : ldtgroup <ldtgroup> <description>
-#
-
-ldtgroup e "Linedef Executor"
-ldtgroup E "3D Floors"
-ldtgroup A "Water"
-ldtgroup t "Scroll Effects"
-ldtgroup x "Misc."
-ldtgroup L "Lighting"
-ldtgroup l "Pushers"
-ldtgroup P "Plane Movement"
-
-#
-#	Definition of linedef types
-#	Format is : ldt <number> <ldtgroup> <shortdesc> <longdesc>
-#	<shortdesc> must not exceed 16 characters.
-#
-
-# Linedef Executor
-ldt 00009   e "Trigger(Race1)"   "Trigger (Race, Once) (1.09)"
-ldt 00010   e "Trigger(RedCont)" "Trigger (CTF Red Team, Continuous) (1.09)"
-ldt 00011   e "Trigger(RedEach)" "Trigger (CTF Red Team, Once per Floor Touch) (1.09)"
-ldt 00012   e "Trigger(BluCont)" "Trigger (CTF Blue Team, Continuous) (1.09)"
-ldt 00013   e "Trigger(BluEach)" "Trigger (CTF Blue Team, Once per Floor Touch) (1.09)"
-ldt 00015   e "Trigger(NoEnemy)" "Trigger (Once when no more enemies) (1.09)"
-ldt 00019   e "Trigger(ChrCont)" "Trigger (Character Ability, Continuous) (1.09)"
-ldt 00020   e "Trigger(ChrEach)" "Trigger (Character Ability, Once per Floor Touch) (1.09)"
-ldt 00021   e "Trigger(Chr1)"    "Trigger (Character Ability, Once) (1.09)"
-ldt 00095   e "Trigger(RngCont)" "Trigger (Ring Count, Continuous) (1.09)"
-ldt 00096   e "Trigger (Cont)"   "Trigger (Continuous)"
-ldt 00097   e "Trigger (Each)"   "Trigger (Once per Floor Touch)"
-ldt 00098   e "Trigger (1)"      "Trigger (Once)"
-ldt 00099   e "Trigger (Rng1)"   "Trigger (Ring Count, Once) (1.09)"
-ldt 00101   e "Set Floor"        "Set Tagged Sector's Floor Height/Flat"
-ldt 00102   e "Set Ceiling"      "Set Tagged Sector's Ceiling Height/Flat"
-ldt 00103   e "Set Light Level"  "Set Tagged Sector's Light Level"
-ldt 00104   e "Teleport to"      "Teleport to Tagged Sector"
-ldt 00105   e "Music Change"     "Music Change"
-ldt 00106   e "Move Floor by FS" "Move Floor by Front Sector (Length=Speed)"
-ldt 00107   e "Move Ceil. by FS" "Move Ceiling by Front Sector (Length=Speed)"
-ldt 00108   e "Lower Flr by Ld"  "Lower Floor by Line (dx=speed, dy=amount)"
-ldt 00109   e "Raise Flr by Ld"  "Raise Floor by Line (dx=speed, dy=amount)"
-ldt 00110   e "Lower Ceil by Ld" "Lower Ceiling by Line (dx=speed, dy=amount)"
-ldt 00111   e "Raise Ceil by Ld" "Raise Ceiling by Line (dx=speed, dy=amount)"
-ldt 00112   e "Change Clg/T Tag" "Change Calling Sector's Tag (Change Tagged Sector's Tag in 1.09)"
-ldt 00113   e "Run Script"       "Run Script"
-ldt 00114   e "Change FS Tag"    "Change Front Sector's Tag"
-ldt 00115   e "Play SFX"         "Play SFX"
-ldt 00116   e "Stop Plane Move"  "Stop Plane Movement"
-ldt 00117   e "Fade Light to FS" "Fade Light Level to Front Sector (Length=Speed)"
-ldt 00118   e "Stop Light FX"    "Stop Lighting Effect"
-ldt 00119   e "Start Fire Flckr" "Start Adjustable Fire Flicker"
-ldt 00120   e "Start Pulsate"    "Start Adjustable Pulsating Light"
-ldt 00121   e "Cut-Away View"    "Cut-Away View"
-ldt 00122   e "Stop Object"      "Stop Object"
-ldt 00123   e "Change Sky"       "Change Sky (1.09)"
-ldt 00124   e "Change Weather"   "Change Weather (1.09)"
-ldt 00125   e "Change Obj State" "Change Object State (1.09)"
-ldt 00126   e "Award Score"      "Award Score (1.09)"
-ldt 00127   e "Start Platf Mvmt" "Start Platform Movement"
-
-# 3D Floors/Blocks
-ldt 00001   E "CrumBobFlt NoRet" "Crumbling Floating Bobbing FOF (Never Reappears)"
-ldt 00025   E "FOFSoliOpaquShad" "FOF (Solid, Opaque, Shadows)"
-ldt 00033   E "FOFSolOpaqNShado" "FOF (Solid, Opaque, No Shadows)"
-ldt 00034   E "BobbingFOFWater"  "Bobbing Platform (Water)"
-ldt 00035   E "CrumblingFOFNRea" "Crumbling FOF (Never Reappears)"
-ldt 00036   E "CrumblingFOFReap" "Crumbling FOF (Reappears)"
-ldt 00037   E "CrumblingFOFRaps" "Crumbling Floating FOF (Reappears)"
-ldt 00038   E "BobbingFOF(Air)"  "Bobbing FOF (Air)"
-ldt 00039   E "CrumBobbFOF(Rep)" "Crumbling Floating Bobbing FOF (Reappears)"
-ldt 00040   E "CrumBobbFOF(Air)" "Crumbling Bobbing FOF (Air)"
-ldt 00041   E "Mario Block"      "Mario Block"
-ldt 00042   E "CrumblingFOF(NR)" "Crumbling Floating FOF (Never Reappears)"
-ldt 00044   E "FOFSolidTransluc" "FOF (Solid, Translucent)"
-ldt 00046   E "Fog Block"        "Fog Block"
-ldt 00047   E "Light Block"      "Light Block"
-ldt 00049   E "2x Light Block"   "Double Light Block"
-ldt 00051   E "FOFSolid,NoSides" "FOF (Solid, No Sides)"
-ldt 00052   E "FOFIntangTranslu" "FOF (Intangible, Translucent)"
-ldt 00053   E "Laser Block"      "Laser Block"
-ldt 00054   E "Thwomp Block"     "Thwomp Block"
-ldt 00055   E "Bustable Block"   "Bustable Block"
-ldt 00056   E "Quicksand Block"  "Quicksand Block"
-ldt 00057   E "FOFSolidInv"      "FOF (Solid, Invisible)"
-ldt 00058   E "FOFIntangiInvisi" "FOF (Intangible, Invisible)"
-ldt 00059   E "Platform"         "Platform"
-ldt 00062   E "FOFIntangibOpaqu" "FOF (Intangible, Opaque)"
-ldt 00067   E "FOFIntaSidesOnly" "FOF (Intangible, Sides Only)"
-#removed: ldt 00068  E "AdjBobbFOF(Air)" "Adjustable Bobbing FOF (Air)"
-ldt 00069   E "FOFSoliSidesOnly" "FOF (Solid, Sides Only)"
-#removed: ldt 00072  E "RevAdjBobFOFAir" "Reverse Adjustable Bobbing FOF (Air)"
-ldt 00076   E "Shatter Block"    "Shatter Block"
-ldt 00077   E "Platf (Trnsl-NS)" "Platform (Translucent, No Sides)"
-ldt 00078   E "Spin Bust Block"  "Spin Bust Block"
-ldt 00079   E "CrumblPlatf(Rep)" "Crumbling Platform (Reappears)"
-ldt 00080   E "CrumblPlat(NRep)" "Crumbling Platform (Never Reappears)"
-ldt 00081   E "Platform (Trnsl)" "Platform (Translucent)"
-ldt 00082   E "CrmPlt(Trns,Rep)" "Crumbling Platform (Translucent, Reappears)"
-ldt 00083   E "CrmPlt(Trs,NRep)" "Crumbling Platform (Translucent, Never Reappears)"
-ldt 00084   E "SpinBust (Trnsl)" "Spin Bust Block (Translucent)"
-ldt 00086   E "Shatter (Trnsl.)" "Shatter Block (Translucent)"
-ldt 00087   E "Custom FOF"       "Custom FOF (1.09)"
-ldt 00089   E "Rising FOF Shado" "Rising FOF (Solid, Opaque, Shadows) (1.09)"
-ldt 00090   E "Rising FOF NShad" "Rising FOF (Solid, Opaque, No Shadows) (1.09)"
-ldt 00091   E "Rising FOF Trnsl" "Rising FOF (Translucent) (1.09)"
-ldt 00092   E "Rising Plat Opaq" "Rising Platform (Opaque) (1.09)"
-ldt 00093   E "Rising Plat Trsl" "Rising Platform (Translucent) (1.09)"
-ldt 00094   E "Rising FOF SlInv" "Rising FOF (Solid, Invisible) (1.09)"
-
-# Water
-ldt 00045   A "Water (Transl.)"  "Water (Translucent)"
-ldt 00048   A "Water (Opaque)"   "Water (Opaque)"
-ldt 00074   A "Water (Trnsl-NS)" "Water (Translucent, No Sides)"
-ldt 00075   A "Water (Opaq-NS)"  "Water (Opaque, No Sides)"
-
-# Scroll Effects
-ldt 00085   t "Scr Wl Front Opp" "Scroll Wall First Side Opposite Direction"
-ldt 00100   t "Scr Wl FrontLeft" "Scroll Wall First Side Left"
-ldt 00202   t "Scr&Carry Ceil"   "Scroll&Carry Things Sector Ceiling (FOF Conveyor)"
-ldt 00203   t "Carry Ceiling"    "Carry Things on Sector Ceiling (FOF Conveyor)"
-ldt 00214   t "AccScr Ceiling"   "Accel Scroll Sector's Ceiling"
-ldt 00215   t "AccScr Floor"     "Accel Scroll Sector's Floor"
-ldt 00216   t "AccCarry Floor"   "Accel Carry Things on Floor"
-ldt 00217   t "AccScr&Carry Flr" "Accel Scroll Floor & Carry Things"
-ldt 00218   t "AccScr Front"     "Accel Scroll 1st Side Tagged Line"
-ldt 00245   t "RemScr Ceiling"   "Remote Scroll Sector's Ceiling"
-ldt 00246   t "RemScr Floor"     "Remote Scroll Sector's Floor"
-ldt 00247   t "RemCarry Floor"   "Remote Carry Things on Floor"
-ldt 00248   t "RemScr&Carry Flr" "Remote Scroll Floor & Carry Things"
-ldt 00249   t "RemScr Front"     "Remote Scroll 1st Side Tagged Line"
-ldt 00250   t "Scroll Ceiling"   "Scroll Sector's Ceiling"
-ldt 00251   t "Scroll Floor"     "Scroll Sector's Floor"
-ldt 00252   t "Carry on Floor"   "Carry Things On Sector Floor"
-ldt 00253   t "Scroll&Carry Flr" "Scroll&Carry Things Sector Floor"
-ldt 00254   t "Scroll Front"     "Scroll First Side of Tagged Line"
-ldt 00255   t "Scroll by Offset" "Effect Scrolling From XY Offsets"
-
-# Misc.
-ldt 00018   x "Zoom Tube Params" "Zoom Tube Parameters (1.09)"
-ldt 00063   x "Camera Scanner"   "Camera Scanner"
-ldt 00064   x "Sector Gravity"   "Per-Sector Gravity"
-ldt 00065   x "Speed Pad"        "Speed Pad"
-ldt 00066   x "Flat Alignment"   "Flat Alignment"
-ldt 00070   x "IdeyaTimeModify " "Ideya Time Modifier"
-ldt 00071   x "Custom Exit"      "Custom Exit"
-ldt 00073   x "Disable Linedef"  "Disable Linedef (main game only)"
-ldt 00223   x "Friction"         "Friction (Ice>100, Sludge<100)"
-ldt 00242   x "Fake Floor"       "Fake Floor"
-
-# Lighting
-ldt 00005   L "Ceiling Lighting" "Ceiling Lighting"
-ldt 00016   L "Colormap"         "Colormap"
-ldt 00060   L "AdjPulsLight"     "Adjustable Pulsating Light"
-ldt 00061   L "AdjFlickLight"    "Adjustable Flickering Light"
-ldt 00213   L "Floor Lighting"   "Floor Lighting"
-
-# Plane Movement
-ldt 00002   P "ContMover F/C"    "Continuous Floor/Ceiling Mover"
-ldt 00003   P "ContMover Floor"  "Continuous Floor Mover"
-ldt 00004   P "ContMover Ceilng" "Continuous Ceiling Mover"
-ldt 00006   P "Cont2Mover F/C"   "Continuous 2-Speed Floor/Ceiling Mover"
-ldt 00007   P "Cont2Mover Floor" "Continuous 2-Speed Floor Mover"
-ldt 00008   P "Cont2Mover Ceilg" "Continuous 2-Speed Ceiling Mover"
-ldt 00024   P "InstCeilingRaise" "Instant Ceiling Raise"
-ldt 00026   P "InstFloorLower"   "Instant Floor Lower"
-ldt 00043   P "Crusher 1 (C2F)"  "Crusher 1 (Ceiling to Floor)"
-ldt 00050   P "Crusher 2 (F2C)"  "Crusher 2 (Floor to Ceiling)"
-ldt 00088   P "Continuous Fall"  "Continuously Falling Sector (1.09)"
-ldt 00232   P "FloatingPlatform" "Floating Platform"
-ldt 00233   P "FloatPFAdjuSpeed" "Floating Platform Adjustable Speed"
-
-# Pushers
-ldt 00224   l "Wind Force/Dir"   "Wind Force/Direction"
-ldt 00225   l "Water Force/Dir"  "Water Current Force/Direction"
-ldt 00226   l "Boom Push/Pull"   "Boom Push/Pull Thing"
-ldt 00227   l "Upwards Current"  "Upwards Current"
-ldt 00228   l "DownwardsCurrent" "Downwards Current"
-ldt 00229   l "Upwards Wind"     "Upwards Wind"
-ldt 00230   l "Downwards Wind"   "Downwards Wind"
-
-#
-#	Definition of sector types
-#	Format is : st <number> <shortdesc> <longdesc>
-#	<shortdesc> must not exceed 14 characters.
-#
-
-st 00000 "X Normal"       "X Normal"
-st 00001 "Blink random"   "Blink (random)"
-st 00002 "Blink halfsec"  "Blink (1/2 second)"
-st 00003 "Blink oneasec"  "Blink (1 second)"
-st 00004 "Spikes of Doom" "Spikes"
-st 00005 "DeathPit (ncm)" "Death Pit (no camera modifications)"
-st 00006 "SpaceCountdown" "Space Countdown"
-st 00007 "Fire Damage"    "Damage (Fire)"
-st 00008 "Lightoscilates" "Light oscillates"
-st 00009 "SS Damage"      "Damage (Special Stage)"
-st 00010 "Instant Kill"   "Instant Kill"
-st 00011 "Normal Damage"  "Damage (Non-elemental)"
-st 00012 "Blinks oneasec" "Blink (1 second synch)"
-st 00013 "Blinks hafasec" "Blink (1/2 second synch)"
-st 00014 "FOF Bouncy Con" "Bouncy Sector (FOF Control Only)"
-st 00016 "DeathPit (wcm)" "Death Pit (camera modifications)"
-st 00017 "Lightslikefire" "Light flickers like fire"
-
-st 00018 "Elec Damage"    "Damage (Electrical)"
-
-st 00256 "Ice/Sludge"     "Ice/Sludge"
-
-st 00512 "Wind/Current"   "Wind/Current"
-
-st 00680 "EggCapsule But" "Egg Capsule (Button)"
-st 00681 "EggCapsule Top" "Egg Capsule (Top)"
-st 00682 "EggCapsule Bot" "Egg Capsule (Bottom)"
-st 00683 "EggCapsule Cen" "Egg Capsule (Center)"
-
-st 00690 "Button 01"      "Button 1 (Open Door A/700 B/701)"
-st 00691 "Button 02"      "Button 2 (Open Door A/702 B/703)"
-st 00692 "Button 03"      "Button 3 (Open Door A/704 B/705)"
-st 00693 "Button 04"      "Button 4 (Open Door A/706 B/707)"
-st 00694 "Button 05"      "Button 5 (Open Door A/708 B/709)"
-st 00695 "Button 06"      "Button 6 (Open Door A/710 B/711)"
-st 00696 "Button 07"      "Button 7 (Open Door A/712 B/713)"
-st 00697 "Button 08"      "Button 8 (Open Door A/714 B/715)"
-st 00698 "Button 09"      "Button 9 (Open Door A/716 B/717)"
-st 00699 "Button 10"      "Button 10 (Open Door A/718 B/719)"
-st 00700 "Button 11"      "Button 11 (Open Door A/720 B/721)"
-st 00701 "Button 12"      "Button 12 (Open Door A/722 B/723)"
-st 00702 "Button 13"      "Button 13 (Open Door A/724 B/725)"
-st 00703 "Button 14"      "Button 14 (Open Door A/726 B/727)"
-st 00704 "Button 15"      "Button 15 (Open Door A/728 B/729)"
-st 00705 "Button 16"      "Button 16 (Open Door A/730 B/731)"
-st 00706 "Button 17"      "Button 17 (Open Door A/732 B/733)"
-st 00707 "Button 18"      "Button 18 (Open Door A/734 B/735)"
-st 00708 "Button 19"      "Button 19 (Open Door A/736 B/737)"
-st 00709 "Button 20"      "Button 20 (Open Door A/738 B/739)"
-st 00710 "Button 21"      "Button 21 (THZ2 A/740 B/741 D/742)"
-
-st 00768 "IceSluWindCurr" "Ice/Sludge and Wind/Current"
-
-st 00974 "Linedefx (NFT)" "Linedef Executor (No Floor Touch)"
-st 00975 "Linedefx (WFT)" "Linedef Executor (Floor Touch)"
-st 00976 "Speed Pad (NS)" "Speed Pad (No Spin)"
-st 00977 "Speed Pad (WS)" "Speed Pad (Spin)"
-st 00978 "Ring Drainer"   "Ring Drainer"
-st 00979 "Spinner"        "Spinner"
-st 00980 "Ring Drain NFT" "Ring Drainer (No Floor Touch)" # 1.09?
-st 00981 "RaiseCeilHghst" "Raise Ceiling to Highest (tag 744) (obsolete)"
-st 00982 "Exit"           "Exit Sector"
-st 00983 "Water Damage"   "Damage (Water)"
-st 00984 "WaterDm&Curent" "Damage (Water) and Current"
-st 00985 "ConveyorBelt"   "Conveyor Belt"
-st 00986 "Slime Raise"    "THZ2 Slime Raise (B/712 W/713 P/714 D/715 S/716)"
-st 00987 "No Tag Zone"    "No Tag Zone"
-st 00988 "CTF - Red"      "CTF - Red Team Base"
-st 00989 "CTF - Bule"     "CTF - Blue Team Base"
-st 00990 "SS Control"     "Special Stage (Floor=Time) (Ceiling=Rings)"
-st 00991 "Custom Gravity" "Custom Gravity"
-st 00992 "Ramp"           "Ramp Sector (Stairs)"
-st 00993 "Starpost Actor" "Starpost Activator"
-st 00994 "Hockey - Red"   "Hockey - Red Team Goal (Finish Line in 1.09)"
-st 00995 "Hockey - Blue"  "Hockey - Blue Team Goal (not in 1.09)"
-st 00996 "Non-Ramp"       "Non-Ramp Sector"
-st 00997 "Fan Sector"     "Fan Sector"
-st 00998 "Zoom Tube Strt" "Zoom Tube Start (1.09)"
-st 00999 "Zoom Tube End"  "Zoom Tube End (1.09)"
-st 01500 "BustSprt ROIA"  "Bustable Block Sprite ROIA (1.09)"
-st 01501 "BustSprt ROIB"  "Bustable Block Sprite ROIB (1.09)"
-st 01502 "BustSprt ROIC"  "Bustable Block Sprite ROIC (1.09)"
-st 01503 "BustSprt ROID"  "Bustable Block Sprite ROID (1.09)"
-st 01504 "BustSprt ROIE"  "Bustable Block Sprite ROIE (1.09)"
-st 01505 "BustSprt ROIF"  "Bustable Block Sprite ROIF (1.09)"
-st 01506 "BustSprt ROIG"  "Bustable Block Sprite ROIG (1.09)"
-st 01507 "BustSprt ROIH"  "Bustable Block Sprite ROIH (1.09)"
-st 01508 "BustSprt ROII"  "Bustable Block Sprite ROII (1.09)"
-st 01509 "BustSprt ROIJ"  "Bustable Block Sprite ROIJ (1.09)"
-st 01510 "BustSprt ROIK"  "Bustable Block Sprite ROIK (1.09)"
-st 01511 "BustSprt ROIL"  "Bustable Block Sprite ROIL (1.09)"
-st 01512 "BustSprt ROIM"  "Bustable Block Sprite ROIM (1.09)"
-st 01513 "BustSprt ROIN"  "Bustable Block Sprite ROIN (1.09)"
-st 01514 "BustSprt ROIO"  "Bustable Block Sprite ROIO (1.09)"
-st 01515 "BustSprt ROIP"  "Bustable Block Sprite ROIP (1.09)"
-
-#
-#	Definition of thing groups
-#	Format is : thinggroup <thinggroup> <colour> <description>
-#
-
-thinggroup b rgb:f/f/f "Starts"
-thinggroup e rgb:f/0/0 "Enemies"
-thinggroup n rgb:f/b/0 "Nights Things"
-thinggroup p rgb:0/b/b "Power-Up Monitors"
-thinggroup o rgb:b/0/c "Misc."
-thinggroup d rgb:b/b/b "Scenery"
-thinggroup m rgb:f/f/0 "Mario"
-thinggroup c rgb:f/b/c "Christmas"
-thinggroup r rgb:0/0/f "Rings"
-thinggroup s rgb:0/c/0 "Springs and Such"
-
-#
-#	Definition of things
-#	Format is :
-#	thing <number> <thinggroup> <flags> <radius> <desc> [<sprite>]
-#	<desc> must not exceed 19 characters. <flags> s for see-thur
-#
-
-# FIXME: replace dissa0 and dumba0 with sprites that are really there
-
-# FIXME: replace start images of ndrna1 with something better.
-# ndrna1 is really the nights drone
-#thig 00000   g  s   ##      "                   "  ?????#
-thing 00001   b  -   32      "Player 01 Start"  ndrna1
-thing 00002   b  -   32      "Player 02 Start"  ndrna1
-thing 00003   b  -   32      "Player 03 Start"  ndrna1
-thing 00004   b  -   32      "Player 04 Start"  ndrna1
-thing 04001   b  -   32      "Player 05 Start"  ndrna1
-thing 04002   b  -   32      "Player 06 Start"  ndrna1
-thing 04003   b  -   32      "Player 07 Start"  ndrna1
-thing 04004   b  -   32      "Player 08 Start"  ndrna1
-thing 04005   b  -   32      "Player 09 Start"  ndrna1
-thing 04006   b  -   32      "Player 10 Start"  ndrna1
-thing 04007   b  -   32      "Player 11 Start"  ndrna1
-thing 04008   b  -   32      "Player 12 Start"  ndrna1
-thing 04009   b  -   32      "Player 13 Start"  ndrna1
-thing 04010   b  -   32      "Player 14 Start"  ndrna1
-thing 04011   b  -   32      "Player 15 Start"  ndrna1
-thing 04012   b  -   32      "Player 16 Start"  ndrna1
-thing 04013   b  -   32      "Player 17 Start"  ndrna1
-thing 04014   b  -   32      "Player 18 Start"  ndrna1
-thing 04015   b  -   32      "Player 19 Start"  ndrna1
-thing 04016   b  -   32      "Player 20 Start"  ndrna1
-thing 04017   b  -   32      "Player 21 Start"  ndrna1
-thing 04018   b  -   32      "Player 22 Start"  ndrna1
-thing 04019   b  -   32      "Player 23 Start"  ndrna1
-thing 04020   b  -   32      "Player 24 Start"  ndrna1
-thing 04021   b  -   32      "Player 25 Start"  ndrna1
-thing 04022   b  -   32      "Player 26 Start"  ndrna1
-thing 04023   b  -   32      "Player 27 Start"  ndrna1
-thing 04024   b  -   32      "Player 28 Start"  ndrna1
-thing 04025   b  -   32      "Player 29 Start"  ndrna1
-thing 04026   b  -   32      "Player 30 Start"  ndrna1
-thing 04027   b  -   32      "Player 31 Start"  ndrna1
-thing 04028   b  -   32      "Player 32 Start"  ndrna1
-thing 00087   b  -   32      "CTF Red Team Start"  ndrna1
-thing 00089   b  -   32      "CTF Blue Team Start"  ndrna1
-thing 00011   b  -   32      "Deathmatch Start"  ndrna1
-#thig 00000   g  s   ##      "                   "  ?????#
-
-#thig 00000   g  s   ##      "                   "  ?????#
-thing 00009   e  -   40      "Crawla (Red)"  sposa1
-thing 03004   e  -   40      "Crawla (Blue)"  possa1
-thing 03005   e  -   40      "Jetty-Syn Bomber"  jetba1
-thing 00022   e  -   40      "Jetty-Syn Gunner"  jetga1
-thing 00058   e  -   40      "Robofish (tm)"  fisha0
-thing 00071   e  -   40      "Deton"  detna1
-thing 00056   e  -   40      "Skim"  skima0
-thing 05005   e  -   40      "Buzz (Yellow)"  buzza0
-thing 05006   e  -   40      "Buzz (Red)"  rbuza0
-thing 02004   e  -   40      "THZ Turret"  treta1
-thing 00042   e  -   40      "Popup Turret" turre1
-thing 00016   e  -   80      "Egg Mobile (Boss 1)"  eggma1
-thing 01008   e  -   80      "Egg Slimer (Boss 2)"  eggna1
-thing 00021   e  -   40      "Crawla Commander"  ccoma1
-thing 00008   e  s   20      "ChaosModeEnemySpawn"  tfogi0
-#thig 00000   g  s   ##      "                   "  ?????#
-
-#thig 00000   g  s   ##      "                   "  ?????#
-thing 00052   n  s   20      "1024 Axis"  dissa0
-thing 00053   n  s   20      "512 Axis"  dissa0
-thing 00059   n  s   20      "2048 Axis"  dissa0
-thing 00062   n  s   20      "1024 Axis(Inverted)"  dissa0
-thing 00015   n  s   20      "512 Axis (Inverted)"  dissa0
-thing 00045   n  s   20      "2048 Axis(Inverted)"  dissa0
-thing 00061   n  s   20      "Axis Transfer"  dissa0
-thing 00046   n  s   20      "Axis Transfer Closest"  dissa0
-thing 00055   n  s   20      "Axis Transfer LastToFirst"  dissa0
-thing 00060   n  -   20      "Ideya Drone"  ndrna1
-thing 00057   n  -   20      "Hoop"  hoopa0
-thing 00047   n  -   20      "Circle of Rings"  bon1a0
-thing 02007   n  -   20      "Circle ofRings(Big)"  bon1a0
-thing 02048   n  -   20      "Circle ofWing Logos"  nwnga0
-thing 02010   n  -   20      "CircleofWingLogos-B"  nwnga0
-thing 02046   n  -   20      "CircleofRings&Wings"  nwnga0
-thing 02047   n  -   20      "CirleofRngs&Wings-B"  nwnga0
-thing 00037   n  -   20      "Wing Logo"  nwnga0
-thing 00082   n  s   20      "AxisTrnsferCodtion"  dissa0
-thing 00085   n  s   20      "AxisTrnsferCodtion2"  dissa0
-thing 03007   n  -   20      "Super Loop"  npraa0
-thing 03008   n  -   20      "Drill Refill"  nprba0
-thing 03009   n  -   20      "Helper"  nprca0
-#thig 00000   g  s   ##      "                   "  ?????#
-
-#thig 00000   g  s   ##      "                   "  ?????#
-thing 00025   p  -   20      "Super Sneakers"  shtva0
-thing 00035   p  -   20      "Basic/WhirlShield"  bltva0
-thing 00041   p  -   20      "Extra Life"  prupa0
-thing 00048   p  -   20      "Attraction Shield"  yltva0
-thing 02002   p  -   20      "Inferno Shield"  rdtva0
-thing 02018   p  -   20      "Armageddon Shield"  bktva0
-thing 02022   p  -   20      "Invincibility"  pinva0
-thing 02028   p  -   20      "Liquid Shield"  grtva0
-thing 02011   p  -   20      "SuperRing(10 Rings)"  srbxa0
-thing 02012   p  -   20      "SilverRing(25Rings)"  grbxa0
-thing 00078   p  -   20      "Teleporter"  mixua0
-thing 02005   p  -   20      "Eggman"  eggba0
-thing 03000   p  -   20      "Random"  quesa0
-#thig 00000   g  s   ##      "                   "  ?????#
-
-#thig 00000   g  s   ##      "                   "  ?????#
-thing 00031   o  -   20      "CTF Flag (Red)"  rflga0
-thing 00034   o  -   20      "CTF Flag (Blue)"  bflga0
-thing 02013   o  -   20      "Special Stage Token"  tokea0
-thing 00086   o  -   20      "End Level Sign"  signd0
-thing 00033   o  -   20      "Air Bubble Patch"  bubla0
-thing 00064   o  -   20      "Emerald Hunt Place1"  emera0
-thing 03002   o  -   20      "Emerald Hunt Place2"  emera0
-thing 03001   o  -   20      "Emerald Hunt Place3"  emera0
-thing 03006   o  -   20      "Star Post"  stpta0
-thing 05001   o  s   20      "Push"  ppsha0
-thing 05002   o  s   20      "Pull"  pplla0
-thing 05003   o  s   20      "TeleportDestination"  dissa0
-thing 05007   o  s   20      "Cut-Away View Thing"  dissa0
-thing 00067   o  -   20      "Ceiling Spike"  dspka0
-thing 00068   o  -   20      "Floor Spike"  uspka0
-thing 00023   o  -   20      "Spikeball"  spika0
-thing 00017   o  s   20      "Boss Flypoint"  dissa0
-thing 02049   o  s   20      "Egg Capsule Center"  dissa0
-thing 00051   o  -   20      "Laser"  lasra0
-thing 00018   o  -   20      "ZoomTubeWaypoint109"  dissa0
-thing 00420   o  -   20      "Emerald 1 (Green)"  emmya0
-thing 00421   o  -   20      "Emerald 2 (Orange)"  emmyb0
-thing 00422   o  -   20      "Emerald 3 (Pink)"  emmyc0
-thing 00423   o  -   20      "Emerald 4 (Blue)"  emmyd0
-thing 00424   o  -   20      "Emerald 5 (Red)"  emmye0
-thing 00425   o  -   20      "Emerald 6 (LtBlue)"  emmyf0
-thing 00426   o  -   20      "Emerald 7 (Gray)"  emmyg0
-# FIXME: add correct sprite for this emerald
-thing 00427   o  -   20      "Emerald 8 (Master)"  dissa0
-
-#thig 00000   g  s   ##      "                   "  ?????#
-thing 00036   d  -   20      "GFZ Flower (Normal)"  fwr1b0
-thing 00070   d  -   20      "GFZ Sunflower"  fwr2a0
-thing 00073   d  -   20      "GFZ Budding Flower"  fwr3a0
-thing 00074   d  -   20      "Berry Bush"  bus1a0
-thing 00075   d  -   20      "Bush"  bus2a0
-thing 02035   d  -   20      "THZ Flower"  thzpa0
-thing 00081   d  -   20      "Gargoyle"  garga1
-thing 02026   d  s   20      "AmbientWaterSFX1A-L"  dumba0
-thing 02024   d  s   20      "AmbientWaterSFX1B-L"  dumba0
-thing 02025   d  s   20      "AmbientWaterSFX2A-M"  dumba0
-thing 02045   d  s   20      "AmbientWaterSFX2B-M"  dumba0
-thing 00083   d  s   20      "AmbientWaterSFX3A-S"  dumba0
-thing 02019   d  s   20      "AmbientWaterSFX3B-S"  dumba0
-thing 02025   d  s   20      "AmbientWaterSFX4A-E"  dumba0
-thing 00027   d  s   20      "AmbientWaterSFX4B-E"  dumba0
-thing 00014   d  s   20      "Random Ambience 1"  dumba0
-thing 00043   d  s   20      "Random Ambience 2" dumba0
-thing 00049   d  -   20      "Hanging Chain"  chana0
-thing 02006   d  -   20      "THZ Alarm"  alrma0
-thing 02001   d  -   20      "CEZ Flower"  fwr4a0
-thing 00024   d  -   20      "CEZ Torch"  flama0
-thing 02003   d  s   20      "LightSource (MAP92)"  dissa0
-#thig 00000   g  s   ##      "                   "  ?????#
-
-#thig 00000   g  s   ##      "                   "  ?????#
-thing 100000  m  -   20      "Overworld Goomba"  gooma0
-thing 100001  m  -   20      "Underworld Goomba"  bgoma0
-thing 100002  m  -   20      "Bush (Short)"  mus1a0
-thing 100003  m  -   20      "Bush (Tall)"  mus2a0
-thing 100004  m  -   20      "Toad"  toada0
-thing 100005  m  -   20      "Coin"  coina0
-thing 00019   m  -   20      "King Bowser"  koopa0
-thing 00010   m  -   20      "Koopa Shell"  shlla0
-thing 00012   m  -   20      "Axe"  maxea0
-thing 00050   m  -   20      "Fire Flower"  ffwra0
-thing 00029   m  -   20      "Puma(MarioFireball)"  pumaa0
-#thig 00000   g  s   ##      "                   "  ?????#
-
-#thig 00000   g  s   ##      "                   "  ?????#
-thing 00005   c  -   20      "Pole"  xms1a0
-thing 00006   c  -   20      "Snowman"  xms3a0
-thing 00013   c  -   20      "Candy Cane"  xms2a0
-thing 00084   r  -   20      "5VerticalRings-YwSg"  bon1a0
-thing 00044   r  -   20      "5VerticalRings-RdSg"  bon1a0
-thing 00076   r  -   20      "5DiagonalRings-YwSg"  bon1a0
-thing 00077   r  -   20      "10DiagonalRings-RSg"  bon1a0
-thing 02014   r  -   20      "Ring"  bon1a0
-thing 00069   r  -   20      "Homing Ring"  homra0
-thing 03003   r  -   20      "Rail Ring"  raila0
-thing 00026   r  -   20      "Automatic Ring"  autra0
-thing 00054   r  -   20      "Explosion Ring"  bomra0
-thing 00080   r  -   20      "Infinity Ring"  infra0
-thing 00028   s  -   20      "Yellow Spring (Up)"  sprya0
-thing 00079   s  -   20      "Red Spring (Up)"  sprra0
-thing 02015   s  -   20      "Yellow Spring (DU)"  yspra1
-thing 00038   s  -   20      "Red Spring (DU)"  rspra1
-thing 00020   s  -   20      "Yellow Spring (DD)"  ysuda1
-thing 00039   s  -   20      "Red Spring (DD)"  rsuda1
-thing 00065   s  -   20      "Yellow Spring (Dn)"  sudya0
-thing 00066   s  -   20      "Red Spring (Dn)"  sudra0
-thing 05004   s  -   20      "Blue Spring"  sprba0
-thing 00030   s  -   20      "THZ Gas Jet"  stemd0
-thing 00032   s  -   20      "THZ Fan"  fansa0
-#thig 00000   g  s   ##      "                   "  ?????#
--- a/extras/conf/srb2_db.cfg
+++ b/extras/conf/srb2_db.cfg
--- a/extras/conf/udb/Kart2_UDMF.cfg
+++ b/extras/conf/udb/Kart2_UDMF.cfg
@ -0,0 +1,47 @@
+/************************************************************************\
+	Ultimate Doom Builder Game Configuration for SRB2Kart
+\************************************************************************/
+
+// This is required to prevent accidental use of a different configuration
+type = "Doom Builder 2 Game Configuration";
+
+// This is the title to show for this game
+game = "SRB2Kart v2.0 (UDMF)";
+
+// This is the simplified game engine/sourceport name
+engine = "zdoom";
+
+// Settings common to all games and all map formats
+include("Includes\\Kart2_common.cfg", "common");
+
+// Settings common to text map format
+include("Includes\\Kart2_common.cfg", "mapformat_udmf");
+
+include("Includes\\Game_Kart2.cfg");
+
+// Script lumps detection
+scriptlumpnames
+{
+	include("Includes\\Kart2_misc.cfg", "scriptlumpnames");
+}
+
+// THING TYPES
+thingtypes
+{
+	include("Includes\\Kart2_things.cfg");
+}
+
+//Default things filters
+thingsfilters
+{
+	include("Includes\\Kart2_misc.cfg", "thingsfilters");
+}
+
+// ENUMERATIONS
+// Each engine has its own additional thing types
+// These are enumerated lists for linedef types and UDMF fields.
+enums
+{
+	// Basic game enums
+	include("Includes\\Kart2_misc.cfg", "enums");
+}
--- a/extras/conf/udb/includes/Game_Kart2.cfg
+++ b/extras/conf/udb/includes/Game_Kart2.cfg
@ -0,0 +1,77 @@
+// Default lump name for new map
+defaultlumpname = "MAP01";
+//GZDB specific. Don't try to load lumps that don't exist.
+basegame = "Doom";
+
+//Sky textures for vanilla maps
+defaultskytextures
+{
+	SKY1 = "MAP01,MAP02,MAP03,MAP33,MAP50,MAP60,MAPF0,MAPM0";
+	SKY2 = "MAPM7,MAPMB";
+	SKY4 = "MAP04,MAP06,MAP61,MAPF6,MAPM1";
+	SKY6 = "MAP05,MAP51,MAPMA";
+	SKY7 = "MAPM2,MAPM5";
+	SKY8 = "MAP07,MAP08,MAP09,MAP52,MAP62,MAPF1";
+	SKY10 = "MAP10,MAP12,MAP53,MAP63,MAPM3";
+	SKY11 = "MAP11,MAPF7";
+	SKY13 = "MAP13,MAP64";
+	SKY14 = "MAP14";
+	SKY15 = "MAP15,MAP54";
+	SKY17 = "MAP70";
+	SKY20 = "MAP32,MAP55,MAP65,MAPF2,MAPF5";
+	SKY21 = "MAPM4";
+	SKY22 = "MAP22,MAP23,MAP25,MAP26,MAP27,MAP56,MAP66,MAPF4,MAPM6";
+	SKY30 = "MAP30";
+	SKY31 = "MAP31";
+	SKY35 = "MAP42";
+	SKY40 = "MAP41,MAP71,MAPM9";
+	SKY55 = "MAPF3,MAPM8";
+	SKY68 = "MAPF8";
+	SKY99 = "MAP57,MAPZ0";
+	SKY159 = "MAP16";
+	SKY172 = "MAP40";
+	SKY300 = "MAP72";
+	SKY301 = "MAP73";
+}
+
+// Skill levels
+skills
+{
+	0 = "Easy";
+	1 = "Normal";
+	2 = "Hard";
+	3 = "Master";
+}
+
+// Skins
+skins
+{
+	sonic;
+	tails;
+	knuckles;
+	amy;
+	mighty;
+	fang;
+	eggman;
+	metalsonic;
+	motobug;
+}
+
+// Gametypes
+gametypes
+{
+	-1 = "Single Player";
+	0 = "Race";
+	1 = "Battle";
+}
+
+// Texture loading options
+defaultwalltexture = "GFZROCK";
+defaultfloortexture = "GFZFLR01";
+defaultceilingtexture = "F_SKY1";
+
+// Default texture sets
+// (these are not required, but useful for new users)
+texturesets
+{
+}
--- a/extras/conf/udb/includes/Kart2_common.cfg
+++ b/extras/conf/udb/includes/Kart2_common.cfg
@ -0,0 +1,172 @@
+common
+{
+	// Simulate Doom brightness levels (turn this off for linear lighting)
+	doomlightlevels = true;
+
+	// Enables support for long (> 8 chars) texture names
+	// WARNING: this should only be enabled for UDMF game configurations!
+	// WARNING: enabling this will make maps incompatible with Doom Builder 2 and can lead to problems in Slade 3!
+	longtexturenames = true;
+
+	// These directory names are ignored when loading PK3/PK7/Directory resources
+	ignoreddirectories = ".svn .git";
+
+	// Files with these extensions are ignored when loading PK3/PK7/Directory resources
+	ignoredextensions = "wad pk3 pk7 bak backup1 backup2 backup3 zip rar 7z";
+
+	// Default testing parameters
+	testparameters = "-file \"%AP\" \"%F\" -warp %L";
+	testshortpaths = true;
+
+	// Action special help
+	actionspecialhelp = "https://wiki.srb2.org/wiki/Linedef_type_%K";
+
+	// Generalized actions
+	generalizedlinedefs = false;
+	generalizedsectors = true;
+
+	// Maximum safe map size check (0 means skip check)
+	safeboundary = 1;
+
+	// Map boundaries. Map objects can only be placed within these boundaries
+	leftboundary = -32768;
+	rightboundary = 32767;
+	topboundary = 32767;
+	bottomboundary = -32768;
+
+	// Texture loading options
+	mixtexturesflats = true;
+	defaulttexturescale = 1.0f;
+	defaultflatscale = 1.0f;
+	scaledtextureoffsets = true;
+
+	// Thing number for start position in 3D Mode
+	start3dmode = 3328;
+
+	// Texture sources
+	textures
+	{
+		include("Kart2_misc.cfg", "textures");
+	}
+
+	// Patch sources
+	patches
+	{
+		include("Kart2_misc.cfg", "patches");
+	}
+
+	// Sprite sources
+	sprites
+	{
+		include("Kart2_misc.cfg", "sprites");
+	}
+
+	// Flat sources
+	flats
+	{
+		include("Kart2_misc.cfg", "flats");
+	}
+}
+
+mapformat_udmf
+{
+	// The format interface handles the map data format
+	formatinterface = "UniversalMapSetIO";
+
+	// Default nodebuilder configurations
+	defaultsavecompiler = "zdbsp_udmf_normal";
+	defaulttestcompiler = "zdbsp_udmf_fast";
+
+	// Determines the textmap namespace
+	engine = "srb2kart";
+
+	maplumpnames
+	{
+		include("UDMF_misc.cfg", "udmfmaplumpnames_begin");
+		include("Kart2_misc.cfg", "udmfmaplumpnames");
+		include("UDMF_misc.cfg", "udmfmaplumpnames_end");
+	}
+
+	universalfields
+	{
+		include("Kart2_misc.cfg", "universalfields");
+	}
+
+	// When this is set to true, sectors with the same tag will light up when a line is highlighted
+	linetagindicatesectors = false;
+
+	// Special linedefs
+	include("Kart2_misc.cfg", "speciallinedefs_udmf");
+
+	// Default flags for first new thing
+	defaultthingflags
+	{
+	}
+
+	// SECTOR FLAGS
+	sectorflags
+	{
+		include("Kart2_misc.cfg", "sectorflags");
+	}
+
+	// DEFAULT SECTOR BRIGHTNESS LEVELS
+	sectorbrightness
+	{
+		include("Kart2_misc.cfg", "sectorbrightness");
+	}
+
+	// SECTOR TYPES
+	sectortypes
+	{
+		include("Kart2_sectors.cfg", "sectortypes");
+	}
+
+	// GENERALISED SECTOR TYPES
+	gen_sectortypes
+	{
+		include("Kart2_sectors.cfg", "gen_sectortypes");
+	}
+
+	// LINEDEF FLAGS
+	linedefflags
+	{
+		include("Kart2_misc.cfg", "linedefflags_udmf");
+	}
+
+	linedefflagstranslation
+	{
+		include("Kart2_misc.cfg", "linedefflagstranslation");
+	}
+
+	// LINEDEF RENDERSTYLES
+	/*linedefrenderstyles
+	{
+		include("Kart2_misc.cfg", "linedefrenderstyles");
+	}*/
+
+	// THING FLAGS
+	thingflags
+	{
+		include("Kart2_misc.cfg", "thingflags_udmf");
+	}
+
+	// Thing flags UDMF translation table
+	// This is needed for copy/paste and prefabs to work properly
+	// When the UDMF field name is prefixed with ! it is inverted
+	thingflagstranslation
+	{
+		include("Kart2_misc.cfg", "thingflagstranslation");
+	}
+
+	// How to compare thing flags (for the stuck things error checker)
+	thingflagscompare
+	{
+		include("UDMF_misc.cfg", "thingflagscompare");
+	}
+
+	// LINEDEF TYPES
+	linedeftypes
+	{
+		include("Kart2_linedefs.cfg", "udmf");
+	}
+}
--- a/extras/conf/udb/includes/Kart2_linedefs.cfg
+++ b/extras/conf/udb/includes/Kart2_linedefs.cfg
--- a/extras/conf/udb/includes/Kart2_misc.cfg
+++ b/extras/conf/udb/includes/Kart2_misc.cfg
@ -0,0 +1,638 @@
+linedefflags
+{
+	1 = "[0] Impassable";
+	2 = "[1] Block Enemies";
+	4 = "[2] Double-Sided";
+	8 = "[3] Upper Unpegged";
+	16 = "[4] Lower Unpegged";
+	32 = "[5] Slope Skew (E1)";
+	64 = "[6] Not Climbable";
+	128 = "[7] No Midtexture Skew (E2)";
+	256 = "[8] Peg Midtexture (E3)";
+	512 = "[9] Solid Midtexture (E4)";
+	1024 = "[10] Repeat Midtexture (E5)";
+	2048 = "[11] Netgame Only";
+	4096 = "[12] No Netgame";
+	8192 = "[13] Effect 6";
+	16384 = "[14] Bouncy Wall";
+	32768 = "[15] Transfer Line";
+}
+
+
+// Linedef flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+linedefflagstranslation
+{
+	1 = "blocking";
+	2 = "blockmonsters";
+	4 = "twosided";
+	8 = "dontpegtop";
+	16 = "dontpegbottom";
+	32 = "skewtd";
+	64 = "noclimb";
+	128 = "noskew";
+	256 = "midpeg";
+	512 = "midsolid";
+	1024 = "wrapmidtex";
+	2048 = "netonly";
+	4096 = "nonet";
+	8192 = "effect6";
+	16384 = "bouncy";
+	32768 = "transfer";
+}
+
+
+linedefflags_udmf
+{
+	blocking = "Impassable";
+	blockmonsters = "Block Enemies";
+	twosided = "Double-Sided";
+	dontpegtop = "Upper Unpegged";
+	dontpegbottom = "Lower Unpegged";
+	skewtd = "Slope Skew";
+	noclimb = "Not Climbable";
+	noskew = "No Midtexture Skew";
+	midpeg = "Peg Midtexture";
+	midsolid = "Solid Midtexture";
+	wrapmidtex = "Repeat Midtexture";
+//	effect6 = "Effect 6";
+	bouncy = "Bouncy Wall";
+	transfer = "Transfer Line";
+}
+
+linedefactivations_udmf
+{
+	netonly = "Netgame Only";
+	nonet = "No Netgame";
+}
+
+/*linedefrenderstyles
+{
+	translucent = "Translucent";
+	fog = "Fog";
+}*/
+
+sectorflags
+{
+	colormapfog = "Fog Planes in Colormap";
+	colormapfadesprites = "Fade Fullbright in Colormap";
+	colormapprotected = "Protected Colormap";
+}
+
+thingflags
+{
+	1 = "[1] Extra";
+	2 = "[2] Flip";
+	4 = "[4] Special";
+	8 = "[8] Ambush";
+}
+
+// THING FLAGS
+thingflags_udmf
+{
+	extra = "Extra";
+	flip = "Flip";
+	special = "Special";
+	ambush = "Ambush";
+}
+
+
+// Thing flags UDMF translation table
+// This is needed for copy/paste and prefabs to work properly
+// When the UDMF field name is prefixed with ! it is inverted
+thingflagstranslation
+{
+	1 = "extra";
+	2 = "flip";
+	4 = "special";
+	8 = "ambush";
+}
+
+
+// DEFAULT SECTOR BRIGHTNESS LEVELS
+sectorbrightness
+{
+	255;
+	248;
+	240;
+	232;
+	224;
+	216;
+	208;
+	200;
+	192;
+	184;
+	176;
+	168;
+	160;
+	152;
+	144;
+	136;
+	128;
+	120;
+	112;
+	104;
+	96;
+	88;
+	80;
+	72;
+	64;
+	56;
+	48;
+	40;
+	32;
+	24;
+	16;
+	8;
+	0;
+}
+
+/*
+TEXTURES AND FLAT SOURCES
+This tells Doom Builder where to find the information for textures
+and flats in the IWAD file, Addition WAD file and Map WAD file.
+
+Start and end lumps must be given in a structure (of which the
+key name doesnt matter) and any textures or flats in between them
+are loaded in either the textures category or flats category.
+
+For textures: PNAMES, TEXTURE1 and TEXTURE2 are loaded by default.
+*/
+textures
+{
+	zdoom1
+	{
+		start = "TX_START";
+		end = "TX_END";
+	}
+}
+
+/*
+ADDITIONAL UNIVERSAL DOOM MAP FORMAT FIELD DEFINITIONS
+Only add fields here that Doom Builder does not edit with its own user-interface!
+The "default" field must match the UDMF specifications!
+
+Field data types:
+0 = integer *
+1 = float
+2 = string
+3 = bool
+4 = linedef action (integer) *
+5 = sector effect (integer) *
+6 = texture (string)
+7 = flat (string)
+8 = angle in degrees (integer)
+9 = angle in radians (float)
+10 = XXRRGGBB color (integer)
+11 = enum option (integer) *
+12 = enum bits (integer) *
+13 = sector tag (integer) *
+14 = thing tag (integer) *
+15 = linedef tag (integer) *
+16 = enum option (string)
+17 = angle in degrees (float)
+22 = byte angle (integer)
+*/
+universalfields
+{
+	sector
+	{
+		lightalpha
+		{
+			type = 0;
+			default = 25;
+		}
+
+		fadealpha
+		{
+			type = 0;
+			default = 25;
+		}
+
+		fadestart
+		{
+			type = 0;
+			default = 0;
+		}
+
+		fadeend
+		{
+			type = 0;
+			default = 33;
+		}
+
+		foglighting
+		{
+			type = 3;
+			default = false;
+		}
+	}
+
+	linedef
+	{
+		arg5
+		{
+			type = 0;
+			default = 0;
+		}
+		stringarg0
+		{
+			type = 2;
+			default = "";
+		}
+		stringarg1
+		{
+			type = 2;
+			default = "";
+		}
+		executordelay
+		{
+			type = 0;
+			default = 0;
+		}
+	}
+
+	sidedef
+	{
+		repeatcnt
+		{
+			type = 0;
+			default = 0;
+		}
+	}
+
+	thing
+	{
+	}
+}
+
+/*
+MAP LUMP NAMES
+Map lumps are loaded with the map as long as they are right after each other. When the editor
+meets a lump which is not defined in this list it will ignore the map if not satisfied.
+The order of items defines the order in which lumps will be written to WAD file on save.
+To indicate the map header lump, use ~MAP
+
+Legenda:
+required = Lump is required to exist.
+blindcopy = Lump will be copied along with the map blindly. (useful for lumps Doom Builder doesn't use)
+nodebuild = The nodebuilder generates this lump.
+allowempty = The nodebuilder is allowed to leave this lump empty.
+scriptbuild = This lump is a text-based script, which should be compiled using current script compiler;
+script = This lump is a text-based script. Specify the filename of the script configuration to use.
+*/
+
+doommaplumpnames
+{
+	~MAP
+	{
+		required = true;
+		blindcopy = true;
+		nodebuild = false;
+	}
+
+	THINGS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = true;
+	}
+
+	LINEDEFS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	SIDEDEFS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	VERTEXES
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	SEGS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	SSECTORS
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	NODES
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	SECTORS
+	{
+		required = true;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	REJECT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	BLOCKMAP
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = true;
+	}
+}
+
+udmfmaplumpnames
+{
+	ZNODES
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	REJECT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	BLOCKMAP
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = true;
+	}
+}
+
+// ENUMERATIONS
+// These are enumerated lists for linedef types and UDMF fields.
+// Reserved names are: angledeg, anglerad, color, texture, flat
+enums
+{
+	falsetrue
+	{
+		0 = "False";
+		1 = "True";
+	}
+
+	yesno
+	{
+		0 = "Yes";
+		1 = "No";
+	}
+
+	noyes
+	{
+		0 = "No";
+		1 = "Yes";
+	}
+
+	onoff
+	{
+		0 = "On";
+		1 = "Off";
+	}
+
+	offon
+	{
+		0 = "Off";
+		1 = "On";
+	}
+
+	updown
+	{
+		0 = "Up";
+		1 = "Down";
+	}
+
+	downup
+	{
+		0 = "Down";
+		1 = "Up";
+	}
+
+	frontback
+	{
+		0 = "None";
+		1 = "Front";
+		2 = "Back";
+	}
+
+	tangibility
+	{
+		1 = "Intangible from top";
+		2 = "Intangible from bottom";
+		4 = "Don't block players";
+		8 = "Don't block non-players";
+	}
+}
+
+//Default things filters
+thingsfilters
+{
+
+	filter0
+	{
+		name = "Player starts";
+		category = "starts";
+		type = -1;
+	}
+
+
+	filter1
+	{
+		name = "Enemies";
+		category = "enemies";
+		type = -1;
+
+	}
+
+
+	filter2
+	{
+		name = "Normal Gravity";
+		category = "";
+		type = -1;
+
+		fields
+		{
+			2 = false;
+		}
+
+	}
+
+
+	filter3
+	{
+		name = "Reverse Gravity";
+		category = "";
+		type = -1;
+
+		fields
+		{
+			2 = true;
+		}
+
+	}
+
+
+	filter4
+	{
+		name = "Rings";
+		category = "";
+		type = 300;
+
+	}
+
+
+	filter5
+	{
+		name = "Waypoints";
+		category = "";
+		type = 2001;
+
+	}
+}
+
+// Special linedefs
+speciallinedefs
+{
+	soundlinedefflag = 64;	// See linedefflags
+	singlesidedflag = 1;	// See linedefflags
+	doublesidedflag = 4;	// See linedefflags
+	impassableflag = 1;
+	upperunpeggedflag = 8;
+	lowerunpeggedflag = 16;
+	repeatmidtextureflag = 1024;
+	pegmidtextureflag = 256;
+}
+
+speciallinedefs_udmf
+{
+	soundlinedefflag = "noclimb";
+	singlesidedflag = "blocking";
+	doublesidedflag = "twosided";
+	impassableflag = "blocking";
+	upperunpeggedflag = "dontpegtop";
+	lowerunpeggedflag = "dontpegbottom";
+	repeatmidtextureflag = "wrapmidtex";
+	pegmidtextureflag = "midpeg";
+}
+
+scriptlumpnames
+{
+	MAINCFG
+	{
+		script = "SOC.cfg";
+	}
+
+	OBJCTCFG
+	{
+		script = "SOC.cfg";
+	}
+
+	SOC_
+	{
+		script = "SOC.cfg";
+		isprefix = true;
+	}
+
+	LUA_
+	{
+		script = "Lua.cfg";
+		isprefix = true;
+	}
+}
+
+// Texture sources
+textures
+{
+	zdoom1
+	{
+		start = "TX_START";
+		end = "TX_END";
+	}
+}
+
+// Patch sources
+patches
+{
+	standard1
+	{
+		start = "P_START";
+		end = "P_END";
+	}
+
+	standard2
+	{
+		start = "PP_START";
+		end = "PP_END";
+	}
+}
+
+// Sprite sources
+sprites
+{
+	standard1
+	{
+		start = "S_START";
+		end = "S_END";
+	}
+
+	standard2
+	{
+		start = "SS_START";
+		end = "SS_END";
+	}
+}
+
+// Flat sources
+flats
+{
+	standard1
+	{
+		start = "F_START";
+		end = "F_END";
+	}
+
+	standard2
+	{
+		start = "FF_START";
+		end = "FF_END";
+	}
+
+	standard3
+	{
+		start = "FF_START";
+		end = "F_END";
+	}
+
+	standard4
+	{
+		start = "F_START";
+		end = "FF_END";
+	}
+}
--- a/extras/conf/udb/includes/Kart2_sectors.cfg
+++ b/extras/conf/udb/includes/Kart2_sectors.cfg
@ -0,0 +1,107 @@
+sectortypes
+{
+	0 = "Normal";
+	1 = "Damage";
+	2 = "Damage (Water)";
+	3 = "Damage (Fire)";
+	4 = "Damage (Electrical)";
+	5 = "Spikes";
+	6 = "Death Pit (Camera Tilt)";
+	7 = "Death Pit (No Camera Tilt)";
+	8 = "Instant Kill";
+	9 = "Ring Drainer (Floor Touch)";
+	10 = "Ring Drainer (Anywhere in Sector)";
+	11 = "Special Stage Damage";
+	12 = "Space Countdown";
+	13 = "Ramp Sector (double step-up/down)";
+	14 = "Non-Ramp Sector (no step-down)";
+	16 = "Trigger Line Ex. (Pushable Objects)";
+	32 = "Trigger Line Ex. (Anywhere, All Players)";
+	48 = "Trigger Line Ex. (Floor Touch, All Players)";
+	64 = "Trigger Line Ex. (Anywhere in Sector)";
+	80 = "Trigger Line Ex. (Floor Touch)";
+	96 = "Trigger Line Ex. (Emerald Check)";
+	112 = "Trigger Line Ex. (NiGHTS Mare)";
+	128 = "Check for Linedef Executor on FOFs";
+	144 = "Egg Capsule";
+	160 = "Special Stage Time/Spheres Parameters";
+	176 = "Custom Global Gravity";
+	512 = "Wind/Current";
+	1024 = "Conveyor Belt";
+	1280 = "Speed Pad";
+	4096 = "Star Post Activator";
+	8192 = "Exit/Special Stage Pit/Return Flag";
+	12288 = "CTF Red Team Base";
+	16384 = "CTF Blue Team Base";
+	20480 = "Fan Sector";
+	24576 = "Super Sonic Transform";
+	28672 = "Force Spin";
+	32768 = "Zoom Tube Start";
+	36864 = "Zoom Tube End";
+	40960 = "Circuit Finish Line";
+	45056 = "Rope Hang";
+	49152 = "Intangible to the Camera";
+}
+
+gen_sectortypes
+{
+	first
+	{
+		0 = "Normal";
+		1 = "Damage";
+		2 = "Damage (Water)";
+		3 = "Damage (Fire)";
+		4 = "Damage (Electrical)";
+		5 = "Spikes";
+		6 = "Death Pit (Camera Tilt)";
+		7 = "Death Pit (No Camera Tilt)";
+		8 = "Instant Kill";
+		9 = "Ring Drainer (Floor Touch)";
+		10 = "Ring Drainer (Anywhere in Sector)";
+		11 = "Special Stage Damage";
+		12 = "Space Countdown";
+		13 = "Ramp Sector (double step-up/down)";
+		14 = "Non-Ramp Sector (no step-down)";
+	}
+
+	second
+	{
+		0 = "Normal";
+		16 = "Trigger Line Ex. (Pushable Objects)";
+		32 = "Trigger Line Ex. (Anywhere, All Players)";
+		48 = "Trigger Line Ex. (Floor Touch, All Players)";
+		64 = "Trigger Line Ex. (Anywhere in Sector)";
+		80 = "Trigger Line Ex. (Floor Touch)";
+		96 = "Trigger Line Ex. (Emerald Check)";
+		112 = "Trigger Line Ex. (NiGHTS Mare)";
+		128 = "Check for Linedef Executor on FOFs";
+		144 = "Egg Capsule";
+		160 = "Special Stage Time/Spheres Parameters";
+		176 = "Custom Global Gravity";
+	}
+
+	third
+	{
+		0 = "Normal";
+		512 = "Wind/Current";
+		1024 = "Conveyor Belt";
+		1280 = "Speed Pad";
+	}
+
+	fourth
+	{
+		0 = "Normal";
+		4096 = "Star Post Activator";
+		8192 = "Exit/Special Stage Pit/Return Flag";
+		12288 = "CTF Red Team Base";
+		16384 = "CTF Blue Team Base";
+		20480 = "Fan Sector";
+		24576 = "Super Sonic Transform";
+		28672 = "Force Spin";
+		32768 = "Zoom Tube Start";
+		36864 = "Zoom Tube End";
+		40960 = "Circuit Finish Line";
+		45056 = "Rope Hang";
+		49152 = "Intangible to the Camera";
+	}
+}
--- a/extras/conf/udb/includes/Kart2_things.cfg
+++ b/extras/conf/udb/includes/Kart2_things.cfg
--- a/libs/DLL-README.txt
+++ b/libs/DLL-README.txt
@ -1,12 +1,13 @@
 # SRB2Kart - Which DLLs do I need to bundle?

-Updated 12/4/2018 (v2.1.21)
+Updated 8/23/2020 (v1.3)

 Here are the required DLLs, per build. For each architecture, copy all the binaries from these folders:

 * libs\dll-binaries\[i686/x86_64]
 * libs\SDL2\[i686/x86_64]...\bin
-* libs\SDL2_mixer\[i686/x86_64]...\bin
+* libs\SDL2mixerX\[i686/x86_64]...\bin
+* libs\libopenmpt\[x86/x86_64]...\bin\mingw

 and don't forget to build r_opengl.dll for srb2dd.

@ -14,30 +15,18 @@ and don't forget to build r_opengl.dll for srb2dd.

 * libs\dll-binaries\i686\exchndl.dll
 * libs\dll-binaries\i686\libgme.dll
+* libs\dll-binaries\i686\discord-rpc.dll
 * libs\dll-binaries\i686\mgwhelp.dll (depend for exchndl.dll)
 * libs\SDL2\i686-w64-mingw32\bin\SDL2.dll
-* libs\SDL2_mixer\i686-w64-mingw32\bin\*.dll (get everything)
+* libs\SDL2mixerX\i686-w64-mingw32\bin\*.dll (get everything)
+* libs\libopenmpt\x86\bin\mingw\libopenmpt.dll

 ## srb2kart, 64-bit

 * libs\dll-binaries\x86_64\exchndl.dll
 * libs\dll-binaries\x86_64\libgme.dll
+* libs\dll-binaries\x86_64\discord-rpc.dll
 * libs\dll-binaries\x86_64\mgwhelp.dll (depend for exchndl.dll)
 * libs\SDL2\x86_64-w64-mingw32\bin\SDL2.dll
-* libs\SDL2_mixer\x86_64-w64-mingw32\bin\*.dll (get everything)
-
-## srb2kartdd, 32-bit
-
-* libs\dll-binaries\i686\exchndl.dll
-* libs\dll-binaries\i686\fmodex.dll
-* libs\dll-binaries\i686\libgme.dll
-* libs\dll-binaries\i686\mgwhelp.dll (depend for exchndl.dll)
-* r_opengl.dll (build this from make)
-
-## srb2kartdd, 64-bit
-
-* libs\dll-binaries\x86_64\exchndl.dll
-* libs\dll-binaries\x86_64\fmodex.dll
-* libs\dll-binaries\x86_64\libgme.dll
-* libs\dll-binaries\x86_64\mgwhelp.dll (depend for exchndl.dll)
-* r_opengl.dll (build this from make)
+* libs\SDL2mixerX\x86_64-w64-mingw32\bin\*.dll (get everything)
+* libs\libopenmpt\x86_64\bin\mingw\libopenmpt.dll
--- a/libs/SDL2/COPYING.txt
+++ b/libs/SDL2/COPYING.txt
@ -1,6 +1,6 @@

 Simple DirectMedia Layer
-Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
  
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/WhatsNew.txt
+++ b/libs/SDL2/WhatsNew.txt
@ -1,6 +1,38 @@

 This is a list of major changes in SDL's version history.

+---------------------------------------------------------------------------
+2.0.10:
+---------------------------------------------------------------------------
+
+General:
+* The SDL_RW* macros have been turned into functions that are available only in 2.0.10 and onward
+* Added SDL_SIMDGetAlignment(), SDL_SIMDAlloc(), and SDL_SIMDFree(), to allocate memory aligned for SIMD operations for the current CPU
+* Added SDL_RenderDrawPointF(), SDL_RenderDrawPointsF(), SDL_RenderDrawLineF(), SDL_RenderDrawLinesF(), SDL_RenderDrawRectF(), SDL_RenderDrawRectsF(), SDL_RenderFillRectF(), SDL_RenderFillRectsF(), SDL_RenderCopyF(), SDL_RenderCopyExF(), to allow floating point precision in the SDL rendering API.
+* Added SDL_GetTouchDeviceType() to get the type of a touch device, which can be a touch screen or a trackpad in relative or absolute coordinate mode.
+* The SDL rendering API now uses batched rendering by default, for improved performance
+* Added SDL_RenderFlush() to force batched render commands to execute, if you're going to mix SDL rendering with native rendering
+* Added the hint SDL_HINT_RENDER_BATCHING to control whether batching should be used for the rendering API. This defaults to "1" if you don't specify what rendering driver to use when creating the renderer.
+* Added the hint SDL_HINT_EVENT_LOGGING to enable logging of SDL events for debugging purposes
+* Added the hint SDL_HINT_GAMECONTROLLERCONFIG_FILE to specify a file that will be loaded at joystick initialization with game controller bindings
+* Added the hint SDL_HINT_MOUSE_TOUCH_EVENTS to control whether SDL will synthesize touch events from mouse events
+* Improved handling of malformed WAVE and BMP files, fixing potential security exploits
+
+Linux:
+* Removed the Mir video driver in favor of Wayland
+
+iOS / tvOS:
+* Added support for Xbox and PS4 wireless controllers in iOS 13 and tvOS 13
+* Added support for text input using Bluetooth keyboards
+
+Android:
+* Added low latency audio using OpenSL ES
+* Removed SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH (replaced by SDL_HINT_MOUSE_TOUCH_EVENTS and SDL_HINT_TOUCH_MOUSE_EVENTS)
+  SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH=1, should be replaced by setting both previous hints to 0.
+  SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH=0, should be replaced by setting both previous hints to 1.
+* Added the hint SDL_HINT_ANDROID_BLOCK_ON_PAUSE to set whether the event loop will block itself when the app is paused.
+
+
 ---------------------------------------------------------------------------
 2.0.9:
 ---------------------------------------------------------------------------
--- a/libs/SDL2/docs/README-android.md
+++ b/libs/SDL2/docs/README-android.md
@ -20,7 +20,7 @@ https://developer.android.com/sdk/index.html
 Android NDK r15c or later
 https://developer.android.com/tools/sdk/ndk/index.html

-Minimum API level supported by SDL: 14 (Android 4.0.1)
+Minimum API level supported by SDL: 16 (Android 4.1)


 ================================================================================
@ -174,7 +174,7 @@ http://ponystyle.com/blog/2010/03/26/dealing-with-asset-compression-in-android-a
 Pause / Resume behaviour
 ================================================================================

-If SDL is compiled with SDL_ANDROID_BLOCK_ON_PAUSE defined (the default),
+If SDL_HINT_ANDROID_BLOCK_ON_PAUSE hint is set (the default),
 the event loop will block itself when the app is paused (ie, when the user
 returns to the main Android dashboard). Blocking is better in terms of battery
 use, and it allows your app to spring back to life instantaneously after resume
@ -380,13 +380,13 @@ https://developer.nvidia.com/tegra-graphics-debugger


 ================================================================================
- Why is API level 14 the minimum required?
+ Why is API level 16 the minimum required?
 ================================================================================

-The latest NDK toolchain doesn't support targeting earlier than API level 14.
+The latest NDK toolchain doesn't support targeting earlier than API level 16.
 As of this writing, according to https://developer.android.com/about/dashboards/index.html
-about 99% of the Android devices accessing Google Play support API level 14 or
-higher (October 2017).
+about 99% of the Android devices accessing Google Play support API level 16 or
+higher (January 2018).


 ================================================================================
@ -408,6 +408,24 @@ screen each frame.
 Reference: http://www.khronos.org/registry/egl/specs/EGLTechNote0001.html


+================================================================================
+ Ending your application
+================================================================================
+
+Two legitimate ways:
+
+- return from your main() function. Java side will automatically terminate the
+Activity by calling Activity.finish().
+
+- Android OS can decide to terminate your application by calling onDestroy()
+(see Activity life cycle). Your application will receive a SDL_QUIT event you 
+can handle to save things and quit.
+
+Don't call exit() as it stops the activity badly.
+
+NB: "Back button" can be handled as a SDL_KEYDOWN/UP events, with Keycode
+SDLK_AC_BACK, for any purpose.
+
 ================================================================================
 Known issues
 ================================================================================
--- a/libs/SDL2/docs/README-linux.md
+++ b/libs/SDL2/docs/README-linux.md
@ -25,9 +25,6 @@ fcitx-libs-dev libsamplerate0-dev libsndio-dev
 Ubuntu 16.04+ can also add "libwayland-dev libxkbcommon-dev wayland-protocols"
 to that command line for Wayland support.

-Ubuntu 16.10 can also add "libmirclient-dev libxkbcommon-dev" to that command
-line for Mir support.
-
 NOTES:
 - This includes all the audio targets except arts, because Ubuntu pulled the 
  artsc0-dev package, but in theory SDL still supports it.
--- a/libs/SDL2/docs/README-macosx.md
+++ b/libs/SDL2/docs/README-macosx.md
@ -100,7 +100,7 @@ You should replace EXE_NAME with the name of the executable. APP_NAME is what
 will be visible to the user in the Finder. Usually it will be the same
 as EXE_NAME but capitalized. E.g. if EXE_NAME is "testgame" then APP_NAME 
 usually is "TestGame". You might also want to use `@PACKAGE@` to use the package
-name as specified in your configure.in file.
+name as specified in your configure.ac file.

 If your project builds more than one application, you will have to do a bit
 more. For each of your target applications, you need a separate rule.
--- a/libs/SDL2/docs/README-porting.md
+++ b/libs/SDL2/docs/README-porting.md
@ -13,7 +13,7 @@ There are two basic ways of building SDL at the moment:

 1. The "UNIX" way:  ./configure; make; make install

-   If you have a GNUish system, then you might try this.  Edit configure.in,
+   If you have a GNUish system, then you might try this.  Edit configure.ac,
   take a look at the large section labelled:

 	"Set up the configuration based on the host platform!"
--- a/libs/SDL2/docs/README-winrt.md
+++ b/libs/SDL2/docs/README-winrt.md
@ -296,7 +296,7 @@ A few files should be included directly in your app's MSVC project, specifically
   included, mouse-position reporting may fail if and when the cursor is
   hidden, due to possible bugs/design-oddities in Windows itself.*

-To include these files:
+To include these files for C/C++ projects:

 1. right-click on your project (again, in Visual C++'s Solution Explorer), 
   navigate to "Add", then choose "Existing Item...".
@ -313,11 +313,14 @@ To include these files:
 7. change the setting for "Consume Windows Runtime Extension" to "Yes (/ZW)".
 8. click the OK button.  This will close the dialog.

-
 **NOTE: C++/CX compilation is currently required in at least one file of your 
 app's project.  This is to make sure that Visual C++'s linker builds a 'Windows 
 Metadata' file (.winmd) for your app.  Not doing so can lead to build errors.**

+For non-C++ projects, you will need to call SDL_WinRTRunApp from your language's
+main function, and generate SDL2-WinRTResources.res manually by using `rc` via
+the Developer Command Prompt and including it as a <Win32Resource> within the
+first <PropertyGroup> block in your Visual Studio project file.

 ### 6. Add app code and assets ###

--- a/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll
+++ b/libs/SDL2/i686-w64-mingw32/bin/SDL2.dll
--- a/libs/SDL2/i686-w64-mingw32/bin/sdl2-config
+++ b/libs/SDL2/i686-w64-mingw32/bin/sdl2-config
@ -39,7 +39,7 @@ while test $# -gt 0; do
      echo $exec_prefix
      ;;
    --version)
-      echo 2.0.9
+      echo 2.0.10
      ;;
    --cflags)
      echo -I${prefix}/include/SDL2  -Dmain=SDL_main
@ -49,7 +49,7 @@ while test $# -gt 0; do
      ;;
    --static-libs)
 #    --libs|--static-libs)
-      echo -L${exec_prefix}/lib  -lmingw32 -lSDL2main -lSDL2 -mwindows  -Wl,--no-undefined -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -static-libgcc
+      echo -L${exec_prefix}/lib  -lmingw32 -lSDL2main -lSDL2 -mwindows  -Wl,--no-undefined -Wl,--dynamicbase -Wl,--nxcompat -lm -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid -static-libgcc
      ;;
    *)
      echo "${usage}" 1>&2
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_assert.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_assert.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_atomic.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_atomic.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -162,12 +162,29 @@ extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void);
 #define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("dmb ish" : : : "memory")
 #define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("dmb ish" : : : "memory")
 #elif defined(__GNUC__) && defined(__arm__)
-#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__)
+#if 0 /* defined(__LINUX__) || defined(__ANDROID__) */
+/* Information from:
+   https://chromium.googlesource.com/chromium/chromium/+/trunk/base/atomicops_internals_arm_gcc.h#19
+
+   The Linux kernel provides a helper function which provides the right code for a memory barrier,
+   hard-coded at address 0xffff0fa0
+*/
+typedef void (*SDL_KernelMemoryBarrierFunc)();
+#define SDL_MemoryBarrierRelease()	((SDL_KernelMemoryBarrierFunc)0xffff0fa0)()
+#define SDL_MemoryBarrierAcquire()	((SDL_KernelMemoryBarrierFunc)0xffff0fa0)()
+#elif 0 /* defined(__QNXNTO__) */
+#include <sys/cpuinline.h>
+
+#define SDL_MemoryBarrierRelease()   __cpu_membarrier()
+#define SDL_MemoryBarrierAcquire()   __cpu_membarrier()
+#else
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) || defined(__ARM_ARCH_8A__)
 #define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("dmb ish" : : : "memory")
 #define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("dmb ish" : : : "memory")
 #elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_5TE__)
 #ifdef __thumb__
 /* The mcr instruction isn't available in thumb mode, use real functions */
+#define SDL_MEMORY_BARRIER_USES_FUNCTION
 #define SDL_MemoryBarrierRelease()   SDL_MemoryBarrierReleaseFunction()
 #define SDL_MemoryBarrierAcquire()   SDL_MemoryBarrierAcquireFunction()
 #else
@ -177,6 +194,7 @@ extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void);
 #else
 #define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("" : : : "memory")
 #define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("" : : : "memory")
+#endif /* __LINUX__ || __ANDROID__ */
 #endif /* __GNUC__ && __arm__ */
 #else
 #if (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5120))
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_audio.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_audio.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -420,23 +420,56 @@ extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev,
 /* @} *//* Pause audio functions */

 /**
- *  This function loads a WAVE from the data source, automatically freeing
- *  that source if \c freesrc is non-zero.  For example, to load a WAVE file,
- *  you could do:
+ *  \brief Load the audio data of a WAVE file into memory
+ *
+ *  Loading a WAVE file requires \c src, \c spec, \c audio_buf and \c audio_len
+ *  to be valid pointers. The entire data portion of the file is then loaded
+ *  into memory and decoded if necessary.
+ *
+ *  If \c freesrc is non-zero, the data source gets automatically closed and
+ *  freed before the function returns.
+ *
+ *  Supported are RIFF WAVE files with the formats PCM (8, 16, 24, and 32 bits),
+ *  IEEE Float (32 bits), Microsoft ADPCM and IMA ADPCM (4 bits), and A-law and
+ *  µ-law (8 bits). Other formats are currently unsupported and cause an error.
+ *
+ *  If this function succeeds, the pointer returned by it is equal to \c spec
+ *  and the pointer to the audio data allocated by the function is written to
+ *  \c audio_buf and its length in bytes to \c audio_len. The \ref SDL_AudioSpec
+ *  members \c freq, \c channels, and \c format are set to the values of the
+ *  audio data in the buffer. The \c samples member is set to a sane default and
+ *  all others are set to zero.
+ *
+ *  It's necessary to use SDL_FreeWAV() to free the audio data returned in
+ *  \c audio_buf when it is no longer used.
+ *
+ *  Because of the underspecification of the Waveform format, there are many
+ *  problematic files in the wild that cause issues with strict decoders. To
+ *  provide compatibility with these files, this decoder is lenient in regards
+ *  to the truncation of the file, the fact chunk, and the size of the RIFF
+ *  chunk. The hints SDL_HINT_WAVE_RIFF_CHUNK_SIZE, SDL_HINT_WAVE_TRUNCATION,
+ *  and SDL_HINT_WAVE_FACT_CHUNK can be used to tune the behavior of the
+ *  loading process.
+ *
+ *  Any file that is invalid (due to truncation, corruption, or wrong values in
+ *  the headers), too big, or unsupported causes an error. Additionally, any
+ *  critical I/O error from the data source will terminate the loading process
+ *  with an error. The function returns NULL on error and in all cases (with the
+ *  exception of \c src being NULL), an appropriate error message will be set.
+ *
+ *  It is required that the data source supports seeking.
+ *
+ *  Example:
 *  \code
 *      SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
 *  \endcode
 *
- *  If this function succeeds, it returns the given SDL_AudioSpec,
- *  filled with the audio data format of the wave data, and sets
- *  \c *audio_buf to a malloc()'d buffer containing the audio data,
- *  and sets \c *audio_len to the length of that audio buffer, in bytes.
- *  You need to free the audio buffer with SDL_FreeWAV() when you are
- *  done with it.
- *
- *  This function returns NULL and sets the SDL error message if the
- *  wave file cannot be opened, uses an unknown data format, or is
- *  corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
+ *  \param src The data source with the WAVE data
+ *  \param freesrc A integer value that makes the function close the data source if non-zero
+ *  \param spec A pointer filled with the audio format of the audio data
+ *  \param audio_buf A pointer filled with the audio data allocated by the function
+ *  \param audio_len A pointer filled with the length of the audio data buffer in bytes
+ *  \return NULL on error, or non-NULL on success.
 */
 extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src,
                                                      int freesrc,
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_bits.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_bits.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -101,6 +101,15 @@ SDL_MostSignificantBitIndex32(Uint32 x)
 #endif
 }

+SDL_FORCE_INLINE SDL_bool
+SDL_HasExactlyOneBitSet32(Uint32 x)
+{
+    if (x && !(x & (x - 1))) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
 }
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_blendmode.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_blendmode.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -90,12 +90,12 @@ typedef enum
 /**
 *  \brief Create a custom blend mode, which may or may not be supported by a given renderer
 *
- *  \param srcColorFactor
- *  \param dstColorFactor
- *  \param colorOperation
- *  \param srcAlphaFactor
- *  \param dstAlphaFactor
- *  \param alphaOperation
+ *  \param srcColorFactor source color factor
+ *  \param dstColorFactor destination color factor
+ *  \param colorOperation color operation
+ *  \param srcAlphaFactor source alpha factor
+ *  \param dstAlphaFactor destination alpha factor
+ *  \param alphaOperation alpha operation
 *
 *  The result of the blend mode operation will be:
 *      dstRGB = dstRGB * dstColorFactor colorOperation srcRGB * srcColorFactor
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_clipboard.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_clipboard.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_config.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_config.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_cpuinfo.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_cpuinfo.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -41,24 +41,43 @@
 #else
 #include <intrin.h>
 #ifndef _WIN64
+#ifndef __MMX__
 #define __MMX__
+#endif
+#ifndef __3dNOW__
 #define __3dNOW__
 #endif
+#endif
+#ifndef __SSE__
 #define __SSE__
+#endif
+#ifndef __SSE2__
 #define __SSE2__
+#endif
 #endif /* __clang__ */
 #elif defined(__MINGW64_VERSION_MAJOR)
 #include <intrin.h>
 #else
-#ifdef __ALTIVEC__
-#if defined(HAVE_ALTIVEC_H) && !defined(__APPLE_ALTIVEC__) && !defined(SDL_DISABLE_ALTIVEC_H)
+/* altivec.h redefining bool causes a number of problems, see bugs 3993 and 4392, so you need to explicitly define SDL_ENABLE_ALTIVEC_H to have it included. */
+#if defined(HAVE_ALTIVEC_H) && defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__) && defined(SDL_ENABLE_ALTIVEC_H)
 #include <altivec.h>
-#undef pixel
-#undef bool
 #endif
-#endif
-#if defined(__ARM_NEON__) && !defined(SDL_DISABLE_ARM_NEON_H)
-#include <arm_neon.h>
+#if !defined(SDL_DISABLE_ARM_NEON_H)
+#  if defined(__ARM_NEON)
+#    include <arm_neon.h>
+#  elif defined(__WINDOWS__) || defined(__WINRT__)
+/* Visual Studio doesn't define __ARM_ARCH, but _M_ARM (if set, always 7), and _M_ARM64 (if set, always 1). */
+#    if defined(_M_ARM)
+#      include <armintr.h>
+#      include <arm_neon.h>
+#      define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */
+#    endif
+#    if defined (_M_ARM64)
+#      include <armintr.h>
+#      include <arm_neon.h>
+#      define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */
+#    endif
+#  endif
 #endif
 #if defined(__3dNOW__) && !defined(SDL_DISABLE_MM3DNOW_H)
 #include <mm3dnow.h>
@ -177,6 +196,69 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void);
 */
 extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void);

+/**
+ * \brief Report the alignment this system needs for SIMD allocations.
+ *
+ * This will return the minimum number of bytes to which a pointer must be
+ *  aligned to be compatible with SIMD instructions on the current machine.
+ *  For example, if the machine supports SSE only, it will return 16, but if
+ *  it supports AVX-512F, it'll return 64 (etc). This only reports values for
+ *  instruction sets SDL knows about, so if your SDL build doesn't have
+ *  SDL_HasAVX512F(), then it might return 16 for the SSE support it sees and
+ *  not 64 for the AVX-512 instructions that exist but SDL doesn't know about.
+ *  Plan accordingly.
+ */
+extern DECLSPEC size_t SDLCALL SDL_SIMDGetAlignment(void);
+
+/**
+ * \brief Allocate memory in a SIMD-friendly way.
+ *
+ * This will allocate a block of memory that is suitable for use with SIMD
+ *  instructions. Specifically, it will be properly aligned and padded for
+ *  the system's supported vector instructions.
+ *
+ * The memory returned will be padded such that it is safe to read or write
+ *  an incomplete vector at the end of the memory block. This can be useful
+ *  so you don't have to drop back to a scalar fallback at the end of your
+ *  SIMD processing loop to deal with the final elements without overflowing
+ *  the allocated buffer.
+ *
+ * You must free this memory with SDL_FreeSIMD(), not free() or SDL_free()
+ *  or delete[], etc.
+ *
+ * Note that SDL will only deal with SIMD instruction sets it is aware of;
+ *  for example, SDL 2.0.8 knows that SSE wants 16-byte vectors
+ *  (SDL_HasSSE()), and AVX2 wants 32 bytes (SDL_HasAVX2()), but doesn't
+ *  know that AVX-512 wants 64. To be clear: if you can't decide to use an
+ *  instruction set with an SDL_Has*() function, don't use that instruction
+ *  set with memory allocated through here.
+ *
+ * SDL_AllocSIMD(0) will return a non-NULL pointer, assuming the system isn't
+ *  out of memory.
+ *
+ *  \param len The length, in bytes, of the block to allocated. The actual
+ *             allocated block might be larger due to padding, etc.
+ * \return Pointer to newly-allocated block, NULL if out of memory.
+ *
+ * \sa SDL_SIMDAlignment
+ * \sa SDL_SIMDFree
+ */
+extern DECLSPEC void * SDLCALL SDL_SIMDAlloc(const size_t len);
+
+/**
+ * \brief Deallocate memory obtained from SDL_SIMDAlloc
+ *
+ * It is not valid to use this function on a pointer from anything but
+ *  SDL_SIMDAlloc(). It can't be used on pointers from malloc, realloc,
+ *  SDL_malloc, memalign, new[], etc.
+ *
+ * However, SDL_SIMDFree(NULL) is a legal no-op.
+ *
+ * \sa SDL_SIMDAlloc
+ */
+extern DECLSPEC void SDLCALL SDL_SIMDFree(void *ptr);
+
+/* vi: set ts=4 sw=4 expandtab: */
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
 }
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_egl.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_egl.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_endian.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_endian.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_error.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_error.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_events.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_events.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -594,6 +594,9 @@ typedef union SDL_Event
    Uint8 padding[56];
 } SDL_Event;

+/* Make sure we haven't broken binary compatibility */
+SDL_COMPILE_TIME_ASSERT(SDL_Event, sizeof(SDL_Event) == 56);
+

 /* Function prototypes */

--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_filesystem.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_filesystem.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gamecontroller.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gamecontroller.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gesture.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_gesture.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_haptic.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_haptic.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hints.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_hints.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -315,6 +315,16 @@ extern "C" {
 */
 #define SDL_HINT_TOUCH_MOUSE_EVENTS    "SDL_TOUCH_MOUSE_EVENTS"

+/**
+ *  \brief  A variable controlling whether mouse events should generate synthetic touch events
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Mouse events will not generate touch events (default for desktop platforms)
+ *    "1"       - Mouse events will generate touch events (default for mobile platforms, such as Android and iOS)
+ */
+
+#define SDL_HINT_MOUSE_TOUCH_EVENTS    "SDL_MOUSE_TOUCH_EVENTS"
+
 /**
 *  \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true.
 *
@ -436,6 +446,16 @@ extern "C" {
 */
 #define SDL_HINT_GAMECONTROLLERCONFIG "SDL_GAMECONTROLLERCONFIG"

+/**
+ *  \brief  A variable that lets you provide a file with extra gamecontroller db entries.
+ *
+ *  The file should contain lines of gamecontroller config data, see SDL_gamecontroller.h
+ *
+ *  This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER)
+ *  You can update mappings after the system is initialized with SDL_GameControllerMappingForGUID() and SDL_GameControllerAddMapping()
+ */
+#define SDL_HINT_GAMECONTROLLERCONFIG_FILE "SDL_GAMECONTROLLERCONFIG_FILE"
+
 /**
 *  \brief  A variable containing a list of devices to skip when scanning for game controllers.
 *
@ -836,19 +856,7 @@ extern "C" {
 */
 #define SDL_HINT_IME_INTERNAL_EDITING "SDL_IME_INTERNAL_EDITING"

- /**
- * \brief A variable to control whether mouse and touch events are to be treated together or separately
- *
- * The variable can be set to the following values:
- *   "0"       - Mouse events will be handled as touch events, and touch will raise fake mouse
- *               events. This is the behaviour of SDL <= 2.0.3. (default)
- *   "1"       - Mouse events will be handled separately from pure touch events.
- *
- * The value of this hint is used at runtime, so it can be changed at any time.
- */
-#define SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH "SDL_ANDROID_SEPARATE_MOUSE_AND_TOUCH"
-
- /**
+/**
 * \brief A variable to control whether we trap the Android back button to handle it manually.
 *        This is necessary for the right mouse button to work on some Android devices, or
 *        to be able to trap the back button for use in your code reliably.  If set to true,
@ -865,6 +873,17 @@ extern "C" {
 */
 #define SDL_HINT_ANDROID_TRAP_BACK_BUTTON "SDL_ANDROID_TRAP_BACK_BUTTON"

+/**
+ * \brief A variable to control whether the event loop will block itself when the app is paused.
+ *
+ * The variable can be set to the following values:
+ *   "0"       - Non blocking.
+ *   "1"       - Blocking. (default)
+ *
+ * The value should be set before SDL is initialized.
+ */
+#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE "SDL_ANDROID_BLOCK_ON_PAUSE"
+
 /**
 * \brief A variable to control whether the return key on the soft keyboard
 *        should hide the soft keyboard on Android and iOS.
@ -1043,6 +1062,118 @@ extern "C" {
 */
 #define SDL_HINT_AUDIO_CATEGORY   "SDL_AUDIO_CATEGORY"

+/**
+ *  \brief  A variable controlling whether the 2D render API is compatible or efficient.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "0"     - Don't use batching to make rendering more efficient.
+ *    "1"     - Use batching, but might cause problems if app makes its own direct OpenGL calls.
+ *
+ *  Up to SDL 2.0.9, the render API would draw immediately when requested. Now
+ *  it batches up draw requests and sends them all to the GPU only when forced
+ *  to (during SDL_RenderPresent, when changing render targets, by updating a
+ *  texture that the batch needs, etc). This is significantly more efficient,
+ *  but it can cause problems for apps that expect to render on top of the
+ *  render API's output. As such, SDL will disable batching if a specific
+ *  render backend is requested (since this might indicate that the app is
+ *  planning to use the underlying graphics API directly). This hint can
+ *  be used to explicitly request batching in this instance. It is a contract
+ *  that you will either never use the underlying graphics API directly, or
+ *  if you do, you will call SDL_RenderFlush() before you do so any current
+ *  batch goes to the GPU before your work begins. Not following this contract
+ *  will result in undefined behavior.
+ */
+#define SDL_HINT_RENDER_BATCHING  "SDL_RENDER_BATCHING"
+
+
+/**
+ *  \brief  A variable controlling whether SDL logs all events pushed onto its internal queue.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "0"     - Don't log any events (default)
+ *    "1"     - Log all events except mouse and finger motion, which are pretty spammy.
+ *    "2"     - Log all events.
+ *
+ *  This is generally meant to be used to debug SDL itself, but can be useful
+ *  for application developers that need better visibility into what is going
+ *  on in the event queue. Logged events are sent through SDL_Log(), which
+ *  means by default they appear on stdout on most platforms or maybe
+ *  OutputDebugString() on Windows, and can be funneled by the app with
+ *  SDL_LogSetOutputFunction(), etc.
+ *
+ *  This hint can be toggled on and off at runtime, if you only need to log
+ *  events for a small subset of program execution.
+ */
+#define SDL_HINT_EVENT_LOGGING   "SDL_EVENT_LOGGING"
+
+
+
+/**
+ *  \brief  Controls how the size of the RIFF chunk affects the loading of a WAVE file.
+ *
+ *  The size of the RIFF chunk (which includes all the sub-chunks of the WAVE
+ *  file) is not always reliable. In case the size is wrong, it's possible to
+ *  just ignore it and step through the chunks until a fixed limit is reached.
+ *
+ *  Note that files that have trailing data unrelated to the WAVE file or
+ *  corrupt files may slow down the loading process without a reliable boundary.
+ *  By default, SDL stops after 10000 chunks to prevent wasting time. Use the
+ *  environment variable SDL_WAVE_CHUNK_LIMIT to adjust this value.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "force"        - Always use the RIFF chunk size as a boundary for the chunk search
+ *    "ignorezero"   - Like "force", but a zero size searches up to 4 GiB (default)
+ *    "ignore"       - Ignore the RIFF chunk size and always search up to 4 GiB
+ *    "maximum"      - Search for chunks until the end of file (not recommended)
+ */
+#define SDL_HINT_WAVE_RIFF_CHUNK_SIZE   "SDL_WAVE_RIFF_CHUNK_SIZE"
+
+/**
+ *  \brief  Controls how a truncated WAVE file is handled.
+ *
+ *  A WAVE file is considered truncated if any of the chunks are incomplete or
+ *  the data chunk size is not a multiple of the block size. By default, SDL
+ *  decodes until the first incomplete block, as most applications seem to do.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "verystrict" - Raise an error if the file is truncated
+ *    "strict"     - Like "verystrict", but the size of the RIFF chunk is ignored
+ *    "dropframe"  - Decode until the first incomplete sample frame
+ *    "dropblock"  - Decode until the first incomplete block (default)
+ */
+#define SDL_HINT_WAVE_TRUNCATION   "SDL_WAVE_TRUNCATION"
+
+/**
+ *  \brief  Controls how the fact chunk affects the loading of a WAVE file.
+ *
+ *  The fact chunk stores information about the number of samples of a WAVE
+ *  file. The Standards Update from Microsoft notes that this value can be used
+ *  to 'determine the length of the data in seconds'. This is especially useful
+ *  for compressed formats (for which this is a mandatory chunk) if they produce
+ *  multiple sample frames per block and truncating the block is not allowed.
+ *  The fact chunk can exactly specify how many sample frames there should be
+ *  in this case.
+ *
+ *  Unfortunately, most application seem to ignore the fact chunk and so SDL
+ *  ignores it by default as well.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "truncate"    - Use the number of samples to truncate the wave data if
+ *                    the fact chunk is present and valid
+ *    "strict"      - Like "truncate", but raise an error if the fact chunk
+ *                    is invalid, not present for non-PCM formats, or if the
+ *                    data chunk doesn't have that many samples
+ *    "ignorezero"  - Like "truncate", but ignore fact chunk if the number of
+ *                    samples is zero
+ *    "ignore"      - Ignore fact chunk entirely (default)
+ */
+#define SDL_HINT_WAVE_FACT_CHUNK   "SDL_WAVE_FACT_CHUNK"
+
 /**
 *  \brief  An enumeration of hint priorities
 */
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_joystick.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_joystick.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keyboard.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keyboard.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keycode.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_keycode.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_loadso.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_loadso.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_log.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_log.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
--- a/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_main.h
+++ b/libs/SDL2/i686-w64-mingw32/include/SDL2/SDL_main.h
@ -1,6 +1,6 @@
 /*
  Simple DirectMedia Layer
-  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>

  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
@ -55,6 +55,10 @@
 /* On iOS SDL provides a main function that creates an application delegate
   and starts the iOS application run loop.

+   If you link with SDL dynamically on iOS, the main function can't be in a
+   shared library, so you need to link with libSDLmain.a, which includes a
+   stub main function that calls into the shared library to start execution.
+
   See src/video/uikit/SDL_uikitappdelegate.m for more details.
 */
 #define SDL_MAIN_NEEDED
@ -82,12 +86,6 @@
 #endif
 #endif /* SDL_MAIN_HANDLED */

-#ifdef __cplusplus
-#define C_LINKAGE   "C"
-#else
-#define C_LINKAGE
-#endif /* __cplusplus */
-
 #ifndef SDLMAIN_DECLSPEC
 #define SDLMAIN_DECLSPEC
 #endif
@ -111,17 +109,18 @@
 #define main    SDL_main
 #endif

-/**
- *  The prototype for the application's main() function
- */
-extern C_LINKAGE SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]);
-
-
 #include "begin_code.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

+/**
+ *  The prototype for the application's main() function
+ */
+typedef int (*SDL_main_func)(int argc, char *argv[]);
+extern SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]);
+
+
 /**
 *  This is called by the real SDL main function to let the rest of the
 *  library know that initialization was done properly.
@ -136,8 +135,7 @@ extern DECLSPEC void SDLCALL SDL_SetMainReady(void);
 /**
 *  This can be called to set the application class at startup
 */
-extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style,
-                                            void *hInst);
+extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst);
 extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);

 #endif /* __WIN32__ */
@ -153,10 +151,24 @@ extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
 *  \return 0 on success, -1 on failure.  On failure, use SDL_GetError to retrieve more
 *      information on the failure.
 */
-extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), void * reserved);
+extern DECLSPEC int SDLCALL SDL_WinRTRunApp(SDL_main_func mainFunction, void * reserved);

 #endif /* __WINRT__ */

+#if defined(__IPHONEOS__)
+
+/**
+ *  \brief Initializes and launches an SDL application.
+ *
+ *  \param argc The argc parameter from the application's main() function
+ *  \param argv The argv parameter from the application's main() function
+ *  \param mainFunction The SDL app's C-style main().
+ *  \return the return value from mainFunction
+ */
+extern DECLSPEC int SDLCALL SDL_UIKitRunApp(int argc, char *argv[], SDL_main_func mainFunction);
+
+#endif /* __IPHONEOS__ */
+

 #ifdef __cplusplus
 }
--- a/Show more
+++ b/Show more