fix windows compile

currently to hide the commit string from titlescreen on release builds
could be used for other crap
wish could use comptime to autogenerate this, but it runs after compile & linking

.circleci/config.yml

@@ -1,73 +0,0 @@
-version: 2
-jobs:
-  build:
-    working_directory: /root/SRB2
-    docker:
-      - image: debian:stretch
-        environment:
-          CC: ccache gcc -m32
-          PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig
-          LIBGME_CFLAGS: -I/usr/include
-          LIBGME_LDFLAGS: -lgme
-          CCACHE_COMPRESS: true
-          WFLAGS: -Wno-unsuffixed-float-constants
-          GCC49: true
-      #- image: ubuntu:trusty
-      #  environment:
-      #    CC: ccache gcc -m32
-      #    PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig
-      #    LIBGME_CFLAGS: -I/usr/include
-      #    LIBGME_LDFLAGS: -lgme
-      #    CCACHE_COMPRESS: true
-      #    WFLAGS: -Wno-unsuffixed-float-constants
-      #    GCC48: true
-    steps:
-      - 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
-      - run:
-          name: Support S3 upload
-          command: apt-get -qq -y install ca-certificates
-      - restore_cache:
-          keys:
-            - v1-SRB2-APT
-      - run:
-          name: Install SDK
-          command: apt-get -qq -y --no-install-recommends install git build-essential 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
-      #- run:
-      #    name: wipe build
-      #    command: make -C src LINUX=1 cleandep
-      - run:
-          name: rebuild depend
-          command: make -C src LINUX=1 clean
-      - restore_cache:
-          keys:
-            - v1-SRB2-{{ .Branch }}-{{ checksum "objs/Linux/SDL/Release/depend.dep" }}
-      - run:
-          name: Compile
-          command: make -C src LINUX=1 ERRORMODE=1 -k
-      - store_artifacts:
-          path: /root/SRB2/bin/Linux/Release/
-          destination: bin
-      - save_cache:
-          key: v1-SRB2-{{ .Branch }}-{{ checksum "objs/Linux/SDL/Release/depend.dep" }}
-          paths:
-            - /root/.ccache

.gitignore

@@ -4,6 +4,7 @@
 *.plg
 *.suo
 *.vcproj.*.*.user
+*.kate-swp
 Win32_LIB_ASM_Debug
 Win32_LIB_ASM_Release
 *.bsc

.gitlab-ci.yml

@@ -1,436 +0,0 @@
-default:
-  image: debian:stable-slim
-
-stages:          # List of stages for jobs, and their order of execution
-  - build
-
-variables:
-  GIT_STRATEGY: clone
-  GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
-
-.job_template: &job_build # This job runs in the build stage, which runs first.
-
-  stage: build
-
-  cache:
-    - key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
-      fallback_keys:
-        - cache-$CI_PROJECT_PATH_SLUG-$CI_DEFAULT_BRANCH
-        - cache-$CI_PROJECT_PATH_SLUG-default
-      paths:
-        - ccache
-        - ccache_statslog
-
-    - key: apt-$CI_JOB_IMAGE
-      paths:
-        - apt-cache
-      unprotect: true
-
-  before_script:
-    - - |
-         # debconf
-         echo -e "\e[0Ksection_start:`date +%s`:debconf[collapsed=true]\r\e[0KSetup debconf's environment"
-      - export DEBIAN_FRONTEND="noninteractive"
-      - export DEBIAN_PRIORITY="low"
-      - export DEBCONF_NONINTERACTIVE_SEEN="true"
-      - |
-          # debconf
-          echo -e "\e[0Ksection_end:`date +%s`:debconf\r\e[0K"
-    - - |
-          # dpkg_aa
-          echo -e "\e[0Ksection_start:`date +%s`:dpkg_aa[collapsed=true]\r\e[0KAdding architectures to dpkg"
-      - dpkg --add-architecture i386
-      - dpkg --add-architecture amd64
-      - dpkg --add-architecture arm64
-      - |
-          # dpkg_aa
-          echo -e "\e[0Ksection_end:`date +%s`:dpkg_aa\r\e[0K"
-    - - |
-          # apt_conf
-          echo -e "\e[0Ksection_start:`date +%s`:apt_conf[collapsed=true]\r\e[0KSetting up APT conf"
-      - export APT_CACHE_DIR=`pwd`/apt-cache
-      - mkdir --parents --verbose $APT_CACHE_DIR/partial/
-      - touch /etc/apt/apt.conf.d/99build
-      - |
-          # apt.conf
-          echo Adding options to apt.conf':'
-      - |
-          # APT::Install-Recommends
-          echo APT::Install-Recommends "false"\;       | tee --append /etc/apt/apt.conf.d/99build
-      - |
-          # quit
-          echo quiet "1"\;                             | tee --append /etc/apt/apt.conf.d/99build
-      - |
-          # APT::Get::Assume-Yes
-          echo APT::Get::Assume-Yes "true"\;           | tee --append /etc/apt/apt.conf.d/99build
-      - |
-          # Dir::Cache::Archives
-          echo Dir::Cache::Archives "$APT_CACHE_DIR"\; | tee --append /etc/apt/apt.conf.d/99build
-      - |
-          # apt_conf
-          echo -e "\e[0Ksection_end:`date +%s`:apt_conf\r\e[0K"
-    - - |
-          # apt_update
-          echo -e "\e[0Ksection_start:`date +%s`:apt_update[collapsed=true]\r\e[0KUpdating APT listing"
-      - apt-get update
-      - |
-          # apt_update
-          echo -e "\e[0Ksection_end:`date +%s`:apt_update\r\e[0K"
-
-    - - |
-          # apt_pre
-          echo -e "\e[0Ksection_start:`date +%s`:apt_pre[collapsed=true]\r\e[0KInstalling pre packages"
-      - apt-get install apt-utils
-      - |
-          # apt_pre
-          echo -e "\e[0Ksection_end:`date +%s`:apt_pre\r\e[0K"
-
-    - - |
-          # apt_upgrade
-          echo -e "\e[0Ksection_start:`date +%s`:apt_upgrade[collapsed=true]\r\e[0KUpdating existing packages"
-      - apt-get upgrade
-      - |
-          # apt_update
-          echo -e "\e[0Ksection_end:`date +%s`:apt_upgrade\r\e[0K"
-
-    - - |
-          # apt_common
-          echo -e "\e[0Ksection_start:`date +%s`:apt_common[collapsed=true]\r\e[0KInstalling common packages"
-      - apt-get install make git ccache
-      - |
-          # apt_common
-          echo -e "\e[0Ksection_end:`date +%s`:apt_common\r\e[0K"
-
-    - - |
-          # ccache_config
-          echo -e "\e[0Ksection_start:`date +%s`:ccache_config[collapsed=true]\r\e[0KSetting up ccache config"
-      - mkdir --parents --verbose ~/.ccache/
-      - touch ~/.ccache/ccache.conf
-      - |
-          # cache.conf
-          echo Adding ccache configution option
-      - |
-          # base_dir
-          echo base_dir = $PWD                  | tee --append ~/.ccache/ccache.conf
-      - |
-          # cache_dir
-          echo cache_dir = $PWD/ccache          | tee --append ~/.ccache/ccache.conf
-      - |
-          # compiler_check
-          echo compiler_check = content         | tee --append ~/.ccache/ccache.conf
-      - |
-          # stats_log
-          echo stats_log = $PWD/ccache_statslog | tee --append ~/.ccache/ccache.conf
-      - |
-          # max_size
-          echo max_size = 50M                   | tee --append ~/.ccache/ccache.conf
-      - |
-          # ccache_config
-          echo -e "\e[0Ksection_end:`date +%s`:ccache_config\r\e[0K"
-
-    - - |
-          # cache_reset
-          echo -e "\e[0Ksection_start:`date +%s`:ccache_reset[collapsed=true]\r\e[0KResetting ccache statistics"
-      - ccache --zero-stats
-      - ccache --show-stats
-      - |
-          # ccache_reset
-          echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
-
-  after_script:
-    - - |
-           # apt_clean
-           echo -e "\e[0Ksection_start:`date +%s`:apt_clean[collapsed=true]\r\e[0KCleaning of unneeded APT packages"
-      - apt-get autoclean
-      - |
-          # apt_clean
-          echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
-
-    - - |
-          # ccache_stats
-          echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"
-      - ccache --show-stats --verbose
-      - ccache --show-log-stats --verbose
-      - |
-          # ccahe_stats
-          echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
-
-Debian testing GCC:
-  <<: *job_build
-  image: debian:testing-slim
-
-  allow_failure: true
-
-  artifacts:
-    paths:
-      - "bin/"
-      - "src/comptime.h"
-    expose_as: "Debian GCC testing"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-gcc"
-
-  variables:
-    CC: gcc
-
-  script:
-    - - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
-      - apt-get install gcc
-      - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
-
-    - - |
-          # apt_development
-          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
-      - apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
-      - |
-          # apt_development
-          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
-
-    - - |
-          # make
-          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
-      - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
-      - |
-          # make
-          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-
-Windows x86:
-  <<: *job_build
-
-  artifacts:
-    paths:
-      - "bin/"
-      - "src/comptime.h"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win32"
-
-  variables:
-    PREFIX: i686-w64-mingw32
-
-  script:
-    - - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
-      - apt-get install gcc-mingw-w64-i686-win32
-      - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
-
-    - - |
-          # make
-          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
-      - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 SDL=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW=1 SDL=1
-      - |
-          # make
-          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-
-Debian stable:amd64:
-  <<: *job_build
-
-  artifacts:
-    paths:
-      - "bin/"
-      - "src/comptime.h"
-    expose_as: "Debian amd64"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86-64"
-
-  variables:
-    CC: x86_64-linux-gnu-gcc
-    OBJCOPY: x86_64-linux-gnu-objcopy
-    OBJDUMP: x86_64-linux-gnu-objdump
-    PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig
-
-  script:
-    - - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
-      - apt-get install gcc-x86-64-linux-gnu || apt-get install gcc
-      - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
-
-    - - |
-          # apt_development
-          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
-      - apt-get install libsdl2-mixer-dev:amd64 libpng-dev:amd64 libcurl4-openssl-dev:amd64 libgme-dev:amd64 libopenmpt-dev:amd64
-      - |
-          # apt_development
-          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
-
-    - - |
-          # make
-          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
-      - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1
-      - |
-          # make
-          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-
-Debian stable:i386:
-  <<: *job_build
-
-  artifacts:
-    paths:
-      - "bin/"
-      - "src/comptime.h"
-    expose_as: "Debian i386"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
-
-  variables:
-    CC: i686-linux-gnu-gcc
-    OBJCOPY: i686-linux-gnu-objcopy
-    OBJDUMP: i686-linux-gnu-objdump
-    PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
-
-  script:
-    - - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
-      - apt-get install gcc-i686-linux-gnu || apt-get install gcc
-      - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
-
-    - - |
-          # apt_development
-          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
-      - apt-get install libsdl2-mixer-dev:i386 libpng-dev:i386 libcurl4-openssl-dev:i386 libgme-dev:i386 libopenmpt-dev:i386
-      - |
-          # apt_development
-          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
-
-    - - |
-          # make
-          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
-      - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX=1
-      - |
-          # make
-          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-
-Debian stable:arm64:
-  <<: *job_build
-
-  artifacts:
-    paths:
-      - "bin/"
-      - "src/comptime.h"
-    expose_as: "Debian arm64"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-aarch64"
-
-  variables:
-    CC: aarch64-linux-gnu-gcc
-    OBJCOPY: aarch64-linux-gnu-objcopy
-    OBJDUMP: aarch64-linux-gnu-objdump
-    PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
-
-  script:
-    - - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
-      - apt-get install gcc-aarch64-linux-gnu || apt-get install gcc
-      - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
-
-    - - |
-          # apt_development
-          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
-      - apt-get install libsdl2-mixer-dev:arm64 libpng-dev:arm64 libcurl4-openssl-dev:arm64 libgme-dev:arm64 libopenmpt-dev:arm64
-      - |
-          # apt_development
-          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
-
-    - - |
-          # make
-          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
-      - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 LINUX64=1 NONX86=1
-      - |
-          # make
-          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-
-Windows x64:
-  <<: *job_build
-
-  artifacts:
-    paths:
-      - "bin/"
-      - "src/comptime.h"
-    expose_as: "Win64"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-Win64"
-
-  variables:
-    PREFIX: x86_64-w64-mingw32
-
-  script:
-    - - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
-      - apt-get install gcc-mingw-w64-x86-64-win32
-      - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
-
-    - - |
-          # make
-          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
-      - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 SDL=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 MINGW64=1 SDL=1
-      - |
-          # make
-          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-
-Debian stable Clang:
-  <<: *job_build
-
-  allow_failure: true
-
-  artifacts:
-    paths:
-      - "bin/"
-      - "src/comptime.h"
-    expose_as: "Debian Clang"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang"
-
-  variables:
-    CC: clang
-    WFLAGS: -Wno-cast-align
-
-  script:
-    - - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_start:`date +%s`:apt_toolchain[collapsed=true]\r\e[0KInstalling toolchain packages"
-      - apt-get install clang
-      - |
-          # apt_toolchain
-          echo -e "\e[0Ksection_end:`date +%s`:apt_toolchain\r\e[0K"
-
-    - - |
-          # apt_development
-          echo -e "\e[0Ksection_start:`date +%s`:apt_development[collapsed=true]\r\e[0KInstalling development packages"
-      - apt-get install libsdl2-mixer-dev libpng-dev libcurl4-openssl-dev libgme-dev libopenmpt-dev
-      - |
-          # apt_development
-          echo -e "\e[0Ksection_end:`date +%s`:apt_development\r\e[0K"
-
-    - - |
-          # make
-          echo -e "\e[0Ksection_start:`date +%s`:make[collapsed=false]\r\e[0KCompiling SRB2"
-      - make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1 || make --directory=src --keep-going CCACHE=1 ERRORMODE=1 NONX86=1
-      - |
-          # make
-          echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
-
-Debian testing Clang:
-  extends: Debian stable Clang
-
-  image: debian:testing-slim
-
-  artifacts:
-    paths:
-      - "bin/"
-      - "src/comptime.h"
-    expose_as: "Debina Clang testing"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-clang"
-
-  variables:
-    CC: clang
-    WFLAGS: -Wno-cast-align -Wno-deprecated-non-prototype

.travis.yml

@@ -1,712 +0,0 @@
-# Travis-CI Config
-#
-# You may use the Deployer to upload packages and builds to external servers.
-# See deployer/travis/deployer_defaults.sh for environment variables to configure.
-
-language: c
-sudo: required
-dist: trusty
-
-matrix:
-    include:
-################################
-# Test Buildbots
-# Deployer does not operate on these. See Deployer Buildbots, below.
-# These bots are disabled when a deployment is triggered by 'deployer' branch name AND DPL_TERMINATE_TESTS=1.
-# These bots remain enabled when a deployment is triggered by release tag.
-################################
-        - os: linux
-          addons:
-            apt:
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - gcc-4.4
-          compiler: gcc-4.4
-          env: GCC44=1
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #gcc-4.4 (Ubuntu/Linaro 4.4.7-8ubuntu1) 4.4.7
-        - os: linux
-          addons:
-            apt:
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - gcc-4.6
-          compiler: gcc-4.6
-          env: GCC46=1
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #gcc-4.6 (Ubuntu/Linaro 4.6.4-6ubuntu2) 4.6.4
-        - os: linux
-          addons:
-            apt:
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - gcc-4.7
-          compiler: gcc-4.7
-          env: GCC47=1
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #gcc-4.7
-        - os: linux
-          compiler: gcc
-          env: GCC48=1
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #gcc (Ubuntu 4.8.4-2ubuntu1~14.04) 4.8.4
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - ubuntu-toolchain-r-test
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - gcc-4.8
-          compiler: gcc-4.8
-          env: GCC48=1
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - ubuntu-toolchain-r-test
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - gcc-7
-          compiler: gcc-7
-          env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough" GCC72=1
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #gcc-7 (Ubuntu 7.2.0-1ubuntu1~14.04) 7.2.0 20170802
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - ubuntu-toolchain-r-test
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - gcc-8
-          compiler: gcc-8
-          env: WFLAGS="-Wno-tautological-compare -Wno-error=implicit-fallthrough -Wno-implicit-fallthrough -Wno-error=format-overflow -Wno-error=format-truncation" GCC81=1
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #gcc-8 (Ubuntu 7.2.0-1ubuntu1~14.04) 8.1.0
-        - os: linux
-          compiler: clang
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #clang version 3.5.0 (tags/RELEASE_350/final)
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - llvm-toolchain-precise-3.5
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - clang-3.5
-          compiler: clang-3.5
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #Ubuntu clang version 3.5.0-4ubuntu2~trusty2 (tags/RELEASE_350/final) (based on LLVM 3.5.0)
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - llvm-toolchain-precise-3.6
-              - ubuntu-toolchain-r-test
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - clang-3.6
-          compiler: clang-3.6
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #Ubuntu clang version 3.6.2-svn240577-1~exp1 (branches/release_36) (based on LLVM 3.6.2)
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - llvm-toolchain-precise-3.7
-              - ubuntu-toolchain-r-test
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - clang-3.7
-          compiler: clang-3.7
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #Ubuntu clang version 3.7.1-svn253571-1~exp1 (branches/release_37) (based on LLVM 3.7.1)
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - llvm-toolchain-precise-3.8
-              - ubuntu-toolchain-r-test
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - clang-3.8
-          compiler: clang-3.8
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #clang version 3.8.1-svn271127-1~exp1 (branches/release_38)
-        - os: linux
-          addons:
-            apt:
-              sources:
-              - llvm-toolchain-precise-3.9
-              - ubuntu-toolchain-r-test
-              packages:
-              - libsdl2-mixer-dev
-              - libpng-dev
-              - libgl1-mesa-dev
-              - libgme-dev
-              - libcurl4-openssl-dev
-              - p7zip-full
-              - clang-3.9
-          compiler: clang-3.9
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #clang version 3.9.X
-#        - os: linux
-#          addons:
-#            apt:
-#              sources:
-#              - llvm-toolchain-precise-4.0
-#              - ubuntu-toolchain-r-test
-#              packages:
-#              - libsdl2-mixer-dev
-#              - libpng-dev
-#              - libgl1-mesa-dev
-#              - libgme-dev
-#              - p7zip-full
-#              - clang-4.0
-#          compiler: clang-4.0
-#          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-#          #clang version 4.0.X
-#        - os: linux
-#          addons:
-#            apt:
-#              sources:
-#              - llvm-toolchain-precise-5.0
-#              - ubuntu-toolchain-r-test
-#              packages:
-#              - libsdl2-mixer-dev
-#              - libpng-dev
-#              - libgl1-mesa-dev
-#              - libgme-dev
-#              - p7zip-full
-#              - clang-5.0
-#          compiler: clang-5.0
-#          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-#          #clang version 5.0.X
-#        - os: osx
-#          osx_image: beta-xcode6.1
-#          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-#          #Apple LLVM version 6.0 (clang-600.0.54) (based on LLVM 3.5svn)
-#        - os: osx
-#          osx_image: beta-xcode6.2
-#          compiler: gcc
-#          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-#          #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
-##        - os: osx
-##          osx_image: beta-xcode6.3
-##          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-##          #I think xcode.6.3 VM is broken, it does not boot
-#        - os: osx
-#          osx_image: xcode6.4
-#          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-#          #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
-#        - os: osx
-#          osx_image: xcode7
-#          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-#          #Apple LLVM version 7.0.0 (clang-700.0.72)
-#        - os: osx
-#          osx_image: xcode7.1
-#          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-#          #Apple LLVM version 7.0.0 (clang-700.1.76)
-#        - os: osx
-#          osx_image: xcode7.2
-#          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-#          #Apple LLVM version 7.0.2 (clang-700.1.81)
-#        - os: osx
-#          osx_image: xcode7.3
-#          #Apple LLVM version 7.3.0 (clang-703.0.31)
-#        - os: osx
-#          osx_image: xcode7.3
-#          #Apple LLVM version 7.3.0 (clang-703.0.31)
-        - os: osx
-          if: env(DPL_ENABLED) != "1" OR env(DPL_TERMINATE_TESTS) != "1" OR NOT branch =~ /^.*deployer.*$/
-          #Default: macOS 10.13 and Xcode 9.4.1
-
-
-################################
-# Deployer Buildbots - OSX
-################################
-        - os: osx
-          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=osx
-          - _DPL_FTP_TARGET=1
-          - _DPL_PACKAGE_BINARY=1
-          #Apple LLVM version 7.3.0 (clang-703.0.31)
-
-
-################################
-# Deployer Buildbots - Linux assets
-# Set DPL_TERMINATE_ASSETS to disable all of these
-# List Ubuntu LTS next, newest to oldest
-# Then list non-LTS, newest to oldest
-################################
-        - 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_ASSETS) != "1"
-          env:
-          - _DPL_JOB_ENABLED=1
-          - _DPL_JOB_NAME=bionic-asset
-          - _DPL_DPUT_TARGET=1
-          - _DPL_PACKAGE_SOURCE=1
-          - _DPL_PACKAGE_MAIN=0
-          - _DPL_PACKAGE_ASSET=1
-          - PACKAGE_DISTRO=bionic
-          #- PACKAGE_SUBVERSION=~18.04bionic
-          #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5
-
-        ################################
-        # The below asset bots produce packages that occupy too much space.
-        # It would be nice if the asset files were not included in the source package itself,
-        # so these can deploy to each Ubuntu target without manual intervention.
-        #
-        # Currently, to get around Launchpad's space limitation,
-        # copy the packages from *one* bot and the space usage is not increased.
-        ################################
-        # - os: linux
-        #   addons:
-        #     apt:
-        #       packages:
-        #       - libsdl2-mixer-dev
-        #       - libpng-dev
-        #       - libgl1-mesa-dev
-        #       - libgme-dev
-        #       - p7zip-full
-        #       - gcc-4.8
-        #   compiler: gcc-4.8
-        #   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_ASSETS) != "1"
-        #   env:
-        #   - _DPL_JOB_ENABLED=1
-        #   - _DPL_JOB_NAME=trusty-asset
-        #   - _DPL_DPUT_TARGET=1
-        #   - _DPL_PACKAGE_SOURCE=1
-        #   - _DPL_PACKAGE_MAIN=0
-        #   - _DPL_PACKAGE_ASSET=1
-        #   - 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
-        #       - 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_ASSETS) != "1"
-        #   env:
-        #   - _DPL_JOB_ENABLED=1
-        #   - _DPL_JOB_NAME=disco-asset
-        #   - _DPL_DPUT_TARGET=1
-        #   - _DPL_PACKAGE_SOURCE=1
-        #   - _DPL_PACKAGE_MAIN=0
-        #   - _DPL_PACKAGE_ASSET=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:
-        #       packages:
-        #       - libsdl2-mixer-dev
-        #       - libpng-dev
-        #       - libgl1-mesa-dev
-        #       - libgme-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_ASSETS) != "1"
-        #   env:
-        #   - _DPL_JOB_ENABLED=1
-        #   - _DPL_JOB_NAME=cosmic-asset
-        #   - _DPL_DPUT_TARGET=1
-        #   - _DPL_PACKAGE_SOURCE=1
-        #   - _DPL_PACKAGE_MAIN=0
-        #   - _DPL_PACKAGE_ASSET=1
-        #   - PACKAGE_DISTRO=cosmic
-        #   #- PACKAGE_SUBVERSION=~18.10cosmic
-        #   #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
-        #       - 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_ASSETS) != "1"
-        #   env:
-        #   - _DPL_JOB_ENABLED=1
-        #   - _DPL_JOB_NAME=xenial-asset
-        #   - _DPL_DPUT_TARGET=1
-        #   - _DPL_PACKAGE_SOURCE=1
-        #   - _DPL_PACKAGE_MAIN=0
-        #   - _DPL_PACKAGE_ASSET=1
-        #   - PACKAGE_DISTRO=xenial
-        #   #- PACKAGE_SUBVERSION=~16.04xenial
-        #   #gcc-4.8 (Ubuntu 4.8.5-2ubuntu1~14.04.1) 4.8.5
-
-
-################################
-# Deployer Buildbots - Linux binaries
-# List Ubuntu LTS, newest to oldest
-# Then list non-LTS, newest to oldest
-################################
-        - 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=focal
-          - _DPL_DPUT_TARGET=1
-          - _DPL_PACKAGE_SOURCE=1
-          - PACKAGE_DISTRO=focal
-          - PACKAGE_SUBVERSION=~20.04focal
-          #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=bionic
-          - _DPL_DPUT_TARGET=1
-          - _DPL_PACKAGE_SOURCE=1
-          - PACKAGE_DISTRO=bionic
-          - PACKAGE_SUBVERSION=~18.04bionic
-          #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=xenial
-          - _DPL_DPUT_TARGET=1
-          - _DPL_PACKAGE_SOURCE=1
-          - PACKAGE_DISTRO=xenial
-          - PACKAGE_SUBVERSION=~16.04xenial
-          #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: 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"
-          env:
-          - _DPL_JOB_ENABLED=1
-          - _DPL_JOB_NAME=trusty
-          - _DPL_DPUT_TARGET=1
-          - _DPL_PACKAGE_SOURCE=1
-          - 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
-      - compiler: clang-3.7
-      - compiler: clang-3.8
-      - compiler: clang-3.9
-      - compiler: clang-4.0
-      - compiler: clang-5.0
-
-
-cache:
-  apt: true
-  ccache: true
-  directories:
-  - $HOME/srb2_cache
-
-
-addons:
-  apt:
-    packages:
-    - libsdl2-mixer-dev
-    - libpng-dev
-    - libgl1-mesa-dev
-    - libgme-dev
-    - zlib1g-dev
-    - libcurl4-openssl-dev
-    - p7zip-full
-  homebrew:
-    taps:
-    - mazmazz/srb2
-    packages:
-    - sdl2_mixer
-    - game-music-emu
-    - p7zip
-    - cmake
-    - curl
-    update: true
-
-
-
-before_install:
-  # Initialize Deployer defaults
-  - . ./deployer/travis/deployer_defaults.sh
-
-  # Initialize Deployer; check if Deployer is enabled
-  # This needs to be run in the current shell so that $__DPL_ACTIVE is set for this session
-  - . ./deployer/travis/deployer.sh
-
-  # Also check if we should now terminate -- see `deployer.sh` for conditions.
-  # This should never happen on non-release buildbots when Deployer is not triggered.
-  - if [[ "$__DPL_TRY_TERMINATE_EARLY" == "1" ]]; then
-      if [[ "$__DPL_ACTIVE" != "1" ]]; then
-        echo "Exiting early because this job is not deploying.";
-        exit;
-      fi;
-    fi
-
-  # If we're triggered by release tag, force ASSET_FILES_OPTIONAL_GET=1
-  - if [[ "$__DPL_TAG_ELIGIBLE" = "1" ]]; then
-      ASSET_FILES_OPTIONAL_GET=1;
-    fi;
-
-
-install:
-  # Install OS X library dependencies via Homebrew
-  # Do this differently for release buildbots:
-  #     * `brew install --build-bottle` builds libraries for x86_64's lowest common denominator CPU, core2
-  #     * `sdl2_mixer` requires options from the formula tap https://github.com/mazmazz/homebrew-srb2
-  #     * `brew postinstall` runs post-install scripts after building a bottle
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      if [[ "$__DPL_ACTIVE" == "1" ]]; then
-        brew install --build-bottle sdl2 game-music-emu;
-        brew install --build-bottle mazmazz/srb2/sdl2_mixer --with-flac --with-mpg123;
-        brew postinstall sdl2 game-music-emu mazmazz/srb2/sdl2_mixer;
-      fi;
-    fi
-  - mkdir -p $HOME/srb2_cache
-
-
-before_script:
-  # OLDPWD is root repo folder
-  - OLDPWD=$PWD
-  - __ASSET_DIRECTORY="$OLDPWD/assets/installer"
-  - mkdir -p "$__ASSET_DIRECTORY"
-  - cd "$HOME/srb2_cache"
-
-  # Get stat command so we know what the cached archive date is.
-  # stat is different for OSX
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      STATCMD="stat -f %m";
-    else
-      STATCMD="stat -c %y";
-    fi
-
-  # Get asset files (required for MD5)
-  # See `deployer_defaults.sh` for asset download path
-  - if [[ "$ASSET_ARCHIVE_PATH" != "" ]]; then
-      if [ -f "$(basename $ASSET_ARCHIVE_PATH)" ]; then
-        echo "$(basename $ASSET_ARCHIVE_PATH) cache date -- $($STATCMD $(basename $ASSET_ARCHIVE_PATH))";
-      fi;
-      wget --verbose --server-response -N "$ASSET_ARCHIVE_PATH";
-      7z x "$(basename $ASSET_ARCHIVE_PATH)" -o"$__ASSET_DIRECTORY" -aos;
-    fi;
-
-  # Get optional files too
-  - if [[ "$__DPL_ACTIVE" == "1" ]] && [[ "$ASSET_FILES_OPTIONAL_GET" == "1" ]] && [[ "$ASSET_ARCHIVE_OPTIONAL_PATH" != "" ]]; then
-      if [ -f "$(basename $ASSET_ARCHIVE_OPTIONAL_PATH)" ]; then
-        echo "$(basename $ASSET_ARCHIVE_OPTIONAL_PATH) cache date -- $($STATCMD $(basename $ASSET_ARCHIVE_OPTIONAL_PATH))";
-      fi;
-      wget --verbose --server-response -N "$ASSET_ARCHIVE_OPTIONAL_PATH";
-      7z x "$(basename $ASSET_ARCHIVE_OPTIONAL_PATH)" -o"$__ASSET_DIRECTORY" -aos;
-    fi;
-
-  # Go back to root repo folder
-  - cd "$OLDPWD"
-
-  # Prepare CMake asset lists
-  - SRB2_ASSET_HASHED=$(echo ${ASSET_FILES_HASHED// /\;})
-  - SRB2_ASSET_DOCS=$(echo ${ASSET_FILES_DOCS// /\;})
-  - SRB2_ASSET_DIRECTORY="$__ASSET_DIRECTORY"
-
-  # Prepare CMake
-  - mkdir build
-  - cd build
-  - mkdir package
-  - export CFLAGS="-Wall -W -Werror $WFLAGS"
-  - export CCACHE_COMPRESS=true
-  # If OS X, set -march=core2 to build compatible binaries with old Macs
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      export CFLAGS="${CFLAGS} -march=core2";
-    fi;
-  - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/bin -DCPACK_PACKAGE_DIRECTORY=$PWD/package
-      -DSRB2_ASSET_HASHED="${SRB2_ASSET_HASHED}" -DSRB2_ASSET_DOCS="${SRB2_ASSET_DOCS}"
-      -DSRB2_ASSET_DIRECTORY="${SRB2_ASSET_DIRECTORY}"
-      -DCPACK_PACKAGE_DESCRIPTION_SUMMARY="${PROGRAM_NAME}"
-      -DCPACK_PACKAGE_VENDOR="${PROGRAM_VENDOR}"
-      -DSRB2_SDL2_EXE_NAME="${PROGRAM_FILENAME}"
-
-script:
-  # Build our Makefile from Cmake!
-  - if [[ "$__DPL_ACTIVE" == "1" ]]; then
-      . ../deployer/travis/deployer_build.sh;
-    else
-      make -k;
-    fi;
-
-after_success:
-  # Run the upload scripts
-  # These do nothing if Deployer is not triggered
-  - . ../deployer/travis/deployer_ftp.sh
-  - . ../deployer/travis/deployer_dput.sh

Doxyfile

@@ -1,269 +0,0 @@
-# Doxyfile 1.4.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = SRB2
-PROJECT_NUMBER         = 1.09
-OUTPUT_DIRECTORY       = ./doc/SRB2
-CREATE_SUBDIRS         = YES
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = YES
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = NO
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-SHOW_DIRECTORIES       = YES
-FILE_VERSION_FILTER    = 
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ./src
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.d \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.idl \
-                         *.odl \
-                         *.cs \
-                         *.php \
-                         *.php3 \
-                         *.inc \
-                         *.m \
-                         *.mm \
-                         *.dox
-RECURSIVE              = YES
-EXCLUDE                = ./src/sdl/IMG_xpm.c \
-                         ./src/sdl/SRB2DC/scramble.c
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = */src/hardware/*/* \
-                         */src/sdl/SDL_main/* \
-                         */src/*/*_private.h \
-                         */src/sdl/*/*help.? \
-                         */src/md5.? \
-                         */src/sdl/filter/*
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = *
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = YES
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION    = NO
-#USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = YES
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = YES
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = DOXYGEN \
-                         HWRENDER \
-                         DIRECTFULLSCREEN \
-                         HW3SOUND \
-                         LOGMESSAGES \
-                         WALLSPLATS \
-                         FLOORSPLATS
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-GROUP_GRAPHS           = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 1000
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO

LUASTUFF.md

@@ -192,6 +192,18 @@ from `0` to `#musicdefs-1`, or string indices (which is equal to calling `S_Find
 Hook is called whenever `S_ShowMusicCredit` (either from game or mod) is called. Takes musicdef as only argument, returning true
 will overwrite vanilla behavior (not show music credit), can be used to implement custom music credit pop-ups.
 
+## addHook("SetupVote", function(result, gt, secondgt, prevmap))
+
+Hook is called whenever server sets up options for vote screen. `result` is table where lua can store options to,
+(for example, `result[1] = 1` will force green hills as first option), gt is current gametype, secondgt is
+alternative gametype picked for 3rd entry (for example, gt can be `GT_RACE`, and secondgt can be `GT_MATCH`)
+prevmap is the previous map that was played (small note - in game code, it is offset by -1, but for lua its offset back,
+so if previous gamemap was 1, prevmap would also be 1. Which means you can safely do mapheaderinfo[prevmap] to get info on previous map)
+
+Limitations: currently, game can only change gametype for 3rd option in map (meaning for example, if current gametype is race, and you
+put battle map in first option, when it gets picked that map will be still run in race gametype). That means, game will only handle maps with
+different gametype if it is put in 3rd vote option.
+
 # Other changes
 
 ## P_PlayRinglossSound(source, damager)

README.md

@@ -1,103 +1,35 @@
-# SRB2Kart: Saturn
+# SRB2Kart-Saturn
+
+SRB2Kart-Saturn is a modification of SRB2Kart with a focus on new Features, Fixes, Optimizations and general Improvements, all while retaining 100% compatibility with vanilla SRB2Kart.
 
 [SRB2Kart](https://srb2.org/mods/) is a kart racing mod based on the 3D Sonic the Hedgehog fangame [Sonic Robo Blast 2](https://srb2.org/), based on a modified version of [Doom Legacy](http://doomlegacy.sourceforge.net/).
 
-## Saturn Features (Take a look at the "Saturn Options" menu c;)
+For more information on Saturn´s features check out the changelogs on the [Releases](https://github.com/Indev450/SRB2Kart-Saturn/releases) page and the ingame "Saturn Options" menu.
 
-- Sprites player rotation on slopes; going on hills, levitate, going down, and so on alters your sprites (configurable)
-- You can alter all the base kart HUD element offsets on the fly in the Saturn Options settings menu
-- `addfilelocal` Command, for those who want to use things like their custom hud in netgames (Same as addfile but completely client sided)
-- Palette rendering, make the OpenGL renderer (almost) look like software mode!
-- OpenMPT for Tracker module playback instead of GME
-  - Fixes looping and sounds better
-  - Allows filter configuration
-- Colourize your Kart HUD, to either your player color or whichever colour you like! (optional / requieres extra2.kart file)
-- The minimal brightness with Shaders can be configured, now you can seeeee in dark areas (0-255 , uses Sector brightness values)
-- Lua HUD hooks for Intermission (ex: You can make hostmod votes still visible during intermission!)
-- Lua HUD hooks for Vote Screen (ex: You can make hostmod votes still visible during map vote screen!)
-- Saltyhop! do a funny hop
-- Smaller Speedometer (optional / requieres extra.kart file)
-- Record Attack input display can now be used everywhere
-- Smaller minimap icons and also show player names on the minimap (toggable)
-- Support for animated votescreens!
-- `showmusiccredit` command, shows you the current music track again
-- `listskins` show a list of all skins currently loaded
-- Visual Portals from Haya's HEP Client
-- Horizonline effect in OpenGL (watch the endless bricks on SNES Bowsers Castle!)
-- Localskins! use whatever skin you like!
-- Toggable lowercase menu's also from Haya's HEP client
-- Everything that Galaxy has
+Also be sure to check the LUASTUFF file for more information on all the extra lua features Saturn has.
 
-## Improvements / Bug fixes
-
-- Replay size has been increased to 10MiB minimum, to make replay overflows very unlikely to happen
-  - can be set to 100MiB max with `maxdemosize` command in console
-- Music changes now properly show the music credits (ex: Kart maps with easter eggs that alter the music)
- - The mapper still has to provide a MusicDEF for this to work.
-- Configurable chatlog length (yay can read those messages from 30 mins ago without opening log.txt)
-- Configurable timeout for waiting to join a full server (in vanilla this is capped to 5 minutes before it boots you out)
-- Characters now spin in skin selection menu (configurable)
-- HTTP Addon download speed has been raised dramatically
-  - configurable with `downloadspeed` command
-- HWR Drawnodes have been refactored, this should fix a few rare crashes esp in regards to OpenGL Visportals
-- The Position Number in the corner is alot smaller now (half the size!)
-- Toggable Lap animation
-- Main menu shows the current renderer being used
-- MSAA and A2C Antialiasing support (Configurable in renderer.txt file)
-- A simple button to rejoin your last visited server
-- Ability to show ALL maps in the mapselect screen, this includes hidden or hellmaps "showallmaps yes/no"
-- Ability to toggle the Stagetitlecard "maptitles on/off"
-
-## Performance / Debugging
-
-- Access for `mobj_t` and `player_t` fields from Lua has been completely rewritten, for much better performance with many Lua scripts
-- Lua shows Tracebacks whenever an error occurs
-- The Lua Perfstats page now has multiple pages and is more organized (ps_thinkframe_page X in console)
-- People with lower end hardware can disable "screen textures" with "gr_screentextures" command, huge performance gain with minimal visual loss
-  - Intermission backgrounds, heat wave effects and etc are broken with this
-- `ffloorclip`, exclusive to Software, which boosts performance on maps with many Floor over Floor sectors
-
-## Technical fixes
-
-- ZFigthing Textures in Opengl mode have been fixed in engine (well almost all of it)
-- FOFs intersecting with slopes have less issues and now render correctly in Opengl
-- Midtextures on slopes in Opengl are fixed, many weird guardrails and fences, aswell as some of those sticking out textures from the ground on some maps should be gone
-- The annoying depraction messages for `P_TeleportMove` and `P_AproxDistance` have been silenced
-- Silenced the annoying "cant find next map..." messages as theyre super useless and annoying anyways
-- Added a small cooldown on `map` command due to spamming causing a SIGSEGV
-- Many bugfixes to the Software renderer, so its much less prone to crashing
-- Many bugfixes to the OpenGL renderer (too many too list all of them here; check the changelogs for more information)
-- Bugfixes to the soundsystem, mainly regarding Sound muting
-- Refactored Zone Memory Allocations (helps a bit with large maps)
-- Many many more crash fixes and other bugfixes to the basegame (too many too list all of them here; check the changelogs for more information)
-
-- Crash Backtraces have been replaced by libbacktrace (except for 32bit Windows builds)
-Crashlogs now contain alot more informations. and even more if your build has debug symbols
-Also allows 64bit Windows builds to produce Crashlogs!
-
-## MISC
-- Bird's Camera Tilting feature is no longer turned on by default
-- Bird's warning on the title screen has been removed
-
-## Bugs
-- On maps which change the song multiple times on map start (exp: Wandering Falls) may show multiple music credits appearing
-- A2C antialiasing makes transparent surfaces even more transparent
-- You tell us! c:
-
-## Note
-Check the LUASTUFF file for more information on all the lua things Saturn has.
+We also have a Flatpak available on [Flathub](https://flathub.org/en/apps/org.srb2.SRB2Kart-Saturn)! (many thanks to riomccloud!)
 
 ## Dependencies
 - SDL2 (Linux/OS X only)
 - SDL2-Mixer (Linux/OS X only)
-- libupnp (Linux/OS X only)
 - libgme (Linux/OS X only)
 - libopenmpt (Linux/OS X only)
-- libbacktrace (Linux/OS X only)
+- libbacktrace (Linux/OS X only, optional, disable support with NOLIBBACKTRACE)
+- libupnp (Linux/OS X only, optional, enable support with HAVE_MINIUPNPC)
 
 ## Compiling
 
 See [SRB2 Wiki/Source code compiling](http://wiki.srb2.org/wiki/Source_code_compiling). The compiling process for SRB2Kart is largely identical to SRB2.
 
+Currently only the Makefile build system with GCC or Clang compiler is supported.
+
+Visual C++ (MSVC) is unsupported.
+
+64-bit Windows builds are supported and recommended over 32-bit builds, they will build automatically when using the MSYS2 MinGW 64-bit executable (requires the mingw-w64-x86_64-gcc package), no extra flags needed!
+The specific DLLs can be found under /libs/dll-binaries/(i686 for 32bit/x86_64 for 64-bit)/ or in the Release packages
+
+Alternatively the [srb2bld](https://github.com/Bijman/srb2bld) script by Bijman can be used aswell!
+
 ## Disclaimer
 Kart Krew is in no way affiliated with SEGA or Sonic Team. We do not claim ownership of any of SEGA's intellectual property used in SRB2.

appveyor.yml

@@ -1,133 +0,0 @@
-version: 1.3.{branch}-{build}
-os: MinGW
-
-environment:
- CC: ccache
- CCACHE_CC: i686-w64-mingw32-gcc
- CCACHE_CC_64: x86_64-w64-mingw32-gcc
- WINDRES: windres
- # c:\mingw-w64 i686 has gcc 6.3.0, so use c:\msys64 7.3.0 instead
- MINGW_SDK: c:\msys64\mingw32
- # c:\msys64 x86_64 has gcc 8.2.0, so use c:\mingw-w64 7.3.0 instead
- MINGW_SDK_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
- CFLAGS: -Wall -W -Werror -Wno-error=implicit-fallthrough -Wimplicit-fallthrough=3 -Wno-tautological-compare -Wno-error=suggest-attribute=noreturn
- UPX_ZIP: upx391w
- UPX_URL: http://upx.sourceforge.net/download/upx391w.zip
- CCACHE_EXE: ccache.exe
- CCACHE_URL: http://alam.srb2.org/ccache.exe
- CCACHE_COMPRESS: true
- CCACHE_DIR: C:\Users\appveyor\.ccache
- # Disable UPX by default. The user can override this in their Appveyor project settings
- NOUPX: 1
- ##############################
- # DEPLOYER VARIABLES
- # DPL_ENABLED=1 builds installers for branch names starting with `deployer`.
- # DPL_TAG_ENABLED=1 will also build installers for release tags. DPL_ENABLED=1 must also be set.
- # Set these in the Appveyor project settings
- ##############################
- DPL_ENABLED: 0
- DPL_TAG_ENABLED: 0
- DPL_INSTALLER_NAME: srb2kart-v13
- # Asset handling is barebones vs. Travis Deployer. We operate on 7z only.
- # Include the README files and the OpenGL batch in the main and patch archives.
- # The x86/x64 archives contain the DLL binaries.
- ASSET_ARCHIVE_PATH: https://github.com/mazmazz/Kart-Public/releases/download/kart_assets/srb2kart-v102-assets.7z
- ASSET_ARCHIVE_PATCH_PATH: https://github.com/mazmazz/Kart-Public/releases/download/kart_assets/srb2kart-v102-patch-assets.7z
- ASSET_ARCHIVE_X86_PATH: https://github.com/mazmazz/Kart-Public/releases/download/kart_assets/srb2kart-v102-x86-assets.7z
- ASSET_ARCHIVE_X64_PATH: https://github.com/mazmazz/Kart-Public/releases/download/kart_assets/srb2kart-v102-x64-assets.7z
- ASSET_ARCHIVE_OPTIONAL_PATH: https://github.com/mazmazz/Kart-Public/releases/download/kart_assets/srb2kart-v102-optional-assets.7z
- # This is overridden to 1 for release tag builds
- ASSET_FILES_OPTIONAL_GET: 0
- # For patches, also include the X86/X64 DLLs.
- PACKAGE_PATCH_DLL_GET: 0
- # Delete all asset downloads so they can be redownloaded
- ASSET_CLEAN: 0
-
-cache:
-- upx391w.zip
-- ccache.exe
-- C:\Users\appveyor\.ccache
-- C:\Users\appveyor\srb2_cache
-
-install:
-- if [%CONFIGURATION%] == [SDL64] ( set "X86_64=1" )
-- if [%CONFIGURATION%] == [SDL64] ( set "CONFIGURATION=SDL" )
-- if [%X86_64%] == [1] ( set "MINGW_SDK=%MINGW_SDK_64%" )
-- if [%X86_64%] == [1] ( set "CCACHE_CC=%CCACHE_CC_64%" )
-
-- if not exist "%UPX_ZIP%.zip" appveyor DownloadFile "%UPX_URL%" -FileName "%UPX_ZIP%.zip"
-- 7z x -y "%UPX_ZIP%.zip" -o%TMP% >null
-- robocopy /S /xx /ns /nc /nfl /ndl /np /njh /njs "%TMP%\%UPX_ZIP%" "%MINGW_SDK%\bin" upx.exe || exit 0
-
-- if not exist "%CCACHE_EXE%" appveyor DownloadFile "%CCACHE_URL%" -FileName "%CCACHE_EXE%"
-- ccache -M 99M
-- xcopy /Y /V /I ccache.exe "%MINGW_SDK%\bin"
-
-configuration:
-- SDL
-#- SDL64
-
-before_build:
-- set "Path=%MINGW_SDK%\bin;%Path%"
-- if [%X86_64%] == [1] ( x86_64-w64-mingw32-gcc --version ) else ( i686-w64-mingw32-gcc --version )
-- mingw32-make --version
-- if not [%NOUPX%] == [1] ( upx -V )
-- ccache -V
-- ccache -s
-- if [%NOUPX%] == [1] ( set "NOUPX=NOUPX=1" ) else ( set "NOUPX=" )
-- if defined [%APPVEYOR_PULL_REQUEST_HEAD_COMMIT%] ( set "COMMIT=%APPVEYOR_PULL_REQUEST_HEAD_COMMIT%" ) else ( set "COMMIT=%APPVEYOR_REPO_COMMIT%" )
-- cmd: git rev-parse --short %COMMIT%>%TMP%/gitshort.txt
-- cmd: set /P GITSHORT=<%TMP%/gitshort.txt
-# for pull requests, take the owner's name only, if this isn't the same repo of course
-- set "REPO=%APPVEYOR_REPO_BRANCH%"
-- if not [%APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME%] == [] ( if not [%APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME%] == [%APPVEYOR_REPO_NAME%] (  for /f "delims=/" %%a in ("%APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME%") do set "REPO=%%a-%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%" ) )
-- set "EXENAME=EXENAME=srb2win-%REPO%-%GITSHORT%.exe"
-- set "SRB2_MFLAGS=-C src WARNINGMODE=1 CCACHE=1 NOOBJDUMP=1 %NOUPX% %EXENAME%"
-- if [%X86_64%] == [1] ( set "MINGW_FLAGS=MINGW64=1 X86_64=1 GCC81=1" ) else ( set "MINGW_FLAGS=MINGW=1 GCC91=1" )
-- set "SRB2_MFLAGS=%SRB2_MFLAGS% %MINGW_FLAGS% %CONFIGURATION%=1"
-
-build_script:
-- cmd: mingw32-make.exe %SRB2_MFLAGS% clean
-- cmd: mingw32-make.exe %SRB2_MFLAGS% ERRORMODE=1 -k
-
-after_build:
-- if [%X86_64%] == [1] (
-    set "BUILD_PATH=bin\Mingw64\Release"
-  ) else (
-    set "BUILD_PATH=bin\Mingw\Release"
-  )
-- if [%X86_64%] == [1] ( set "CONFIGURATION=%CONFIGURATION%64" )
-- ccache -s
-- set BUILD_ARCHIVE=%REPO%-%GITSHORT%-%CONFIGURATION%.7z
-- 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%
-##############################
-# DEPLOYER SCRIPT
-##############################
-- if [%DPL_ENABLED%] == [1] ( call "deployer\appveyor\deployer.bat" )
-
-test: off
-
-#deploy:
-#  - provider: FTP
-#    protocol: ftps
-#    host:
-#      secure: NsLJEPIBvmwCOj8Tg8RoRQ==
-#    username:
-#      secure: ejxi5mvk7oLYu7QtbYojajEPigMy0mokaKhuEVuDZcA=
-#    password:
-#      secure: Hbn6Uy3lT0YZ88yFJ3aW4w==
-#    folder: appveyor
-#    application:
-#    active_mode: false
-#    on:
-#      branch: master
-#      appveyor_repo_tag: true
-
-
-on_finish:
-#- cmd: echo xfreerdp /u:appveyor /cert-ignore +clipboard /v:<ip>:<port>
-#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

assets/LICENSE-3RD-PARTY.txt

@@ -30,6 +30,24 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
+--------------------------------------------------------------------------------
+                        0-Clause BSD License
+        applies to:
+        - qs22k
+          Copyright (c) 2022, Raymond Gardner
+--------------------------------------------------------------------------------
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 --------------------------------------------------------------------------------
                         curl License
         applies to:

debian-template/README.Debian

@@ -1,70 +0,0 @@
-srb2 for Debian
----------------
-
-SRB2 Debian package!
-Hi there, to rebuild these packages just use debuild in the root source directory (not /src!).
-You can build these with or without a key if you want, but if you want to put these on a repo,
-generate your own GnuPG key as per the https://help.ubuntu.com/community/GnuPrivacyGuardHowto
-instructions and pass the -k<keyid> command to debuild. Make sure you export the key footprint
-and give them to your users to install with apt-key add. Thanks!
-
- -- Callum Dickinson <gcfreak_ag20@hotmail.com>  Fri, 26 Nov 2010 18:25:31 +1300
-
----------------
-
-
-Templating
-
-Note that you MUST run [repo-root]/debian_template.sh before running debuild
-on these scripts! debian_template.sh fills these template files with working values.
-
-You should also set PACKAGE_NAME_EMAIL="John Doe <jdoe@example.com>" to match
-the identity of the key you will use to sign the package.
-
-
-Building for Launchpad PPA
-
-Use these steps to prepare building a source package for Launchpad:
-
-    1. cd [repo-root]
-    2. git reset --hard; git clean -fd; git clean -fx;
-       * Resets your repo folder to a committed state and removes untracked files
-       * If you built srb2-data in the assets/ folder, MAKE SURE THAT FOLDER DOES NOT HAVE ASSETS,
-         OR THEY MAY BE INCLUDED IN THE MAIN SOURCE PACKAGE!
-
-Build the source package:
-
-    1. source [repo-root]/debian_template.sh
-       * Initializes defaults for the package variables and fills in templates.
-    2. debuild -S (builds the source package for Launchpad)
-
-
-Signing for Launchpad PPA
-
-First, follow Callum's instructions to generate a GnuPG key with your identity. You will need
-to publish the fingerprint of that key to Ubuntu's key server.
-
-    https://help.ubuntu.com/community/GnuPrivacyGuardHowto#Uploading_the_key_to_Ubuntu_keyserver
-
-Next, you will have to add that key fingerprint to your Launchpad account. Go to your Launchpad
-profile and click the yellow Edit button next to "OpenPGP keys". Once you add the key, you can
-upload signed source packages and publish them onto your PPA.
-
-IF YOU UPLOAD A PACKAGE and Launchpad does NOT send you a confirmation or rejection email, that
-means your key is not set up correctly with your Launchpad account.
-
-Finally, if your packages have not already been signed, follow these steps:
-
-    1. cd ..
-       * Packages are located in the parent folder of where debuild was called
-    2. debsign "srb2_[version]_source.changes"
-       * You may need to specify -k [key-fingerprint]
-
-
-Uploading for Launchpad PPA
-
-Follow the instructions at <https://help.launchpad.net/Packaging/PPA/Uploading> to upload
-to your PPA and have Launchpad build your binary deb packages.
-
-
- -- Marco Zafra <marco.a.zafra@gmail.com>  Mon, 26 Nov 2018 21:13:00 -0500

debian-template/README.source

@@ -1,46 +0,0 @@
-srb2 for Debian
----------------
-
-Here it is! SRB2 v2.1.2 source code!
-
-GNU/Linux
-~~~
-
-Dependencies:
-  SDL 1.2.7 or better (from libsdl.org)
-  SDL_Mixer 1.2.2(.7 for file-less music playback) (from libsdl.org)
-  Nasm (use NOASM=1 if you don't have it or have an non-i386 system, I think)
-  libPNG 1.2.7
-  Zlib 1.2.3
-  The Xiph.org libogg and libvorbis libraries
-  The OpenGL headers (from Mesa, usually shipped with your X.org or XFree
-    installation, so you needn't worry, most likely)
-  GCC 3.x toolchain and binutils
-  GNU Make
-
-Build instructions:
-
-make -C src LINUX=1
-
-Build instructions for non-X86 devices (such as X64):
-
-make -C src LINUX=1 NONX86=1
-
-Build instructions to build for Wii Linux/SRB2Wii on a PowerPC system,
-follow cross-compiling instructions for cross-compiling on a x86 system:
-
-make -C src LINUX=1 WIILINUX=1
-
-Build instructions to build for Pandora (Linux) on a ARM system,
-follow cross-compiling instructions for cross-compiling on a x86 system:
-
-make -C src PANDORA=1
-
--------------------------------------------------------------------------------
-
-binaries will turn in up in bin/
-
-note: read the src/makefile for more options
-
-- Sonic Team Junior
-http://www.srb2.org

debian-template/changelog

@@ -1,5 +0,0 @@
-${PACKAGE_NAME} (${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION}) ${PACKAGE_DISTRO}; urgency=${PACKAGE_URGENCY}
-
-  * ${PROGRAM_NAME} v${PROGRAM_VERSION} program build
-
- -- ${PACKAGE_NAME_EMAIL}  ${__PACKAGE_DATETIME}

debian-template/compat

@@ -1 +0,0 @@
-7

debian-template/control

@@ -1,51 +0,0 @@
-# SRB2 Debian package control file.
-
-Source: ${PACKAGE_NAME}
-Section: games
-Priority: extra
-Maintainer: ${PACKAGE_GROUP_NAME_EMAIL}
-Build-Depends: debhelper (>= 7.0.50~),
- libsdl2-dev,
- libsdl2-mixer-dev,
- libpng-dev | libpng16-dev | libpng12-dev (>= 1.2.7),
- zlib1g-dev,
- libgme-dev,
- libcurl4-openssl-dev,
- libglu1-dev | libglu-dev,
- libosmesa6-dev | libgl-dev,
- nasm [i386]
-Standards-Version: 3.8.4
-Homepage: ${PACKAGE_WEBSITE}
-
-Package: ${PACKAGE_NAME}
-Architecture: any
-Depends: ${SHLIBS_DEPENDS}, ${MISC_DEPENDS},
- ${PACKAGE_NAME}-data (>> ${PACKAGE_ASSET_MINVERSION}), ${PACKAGE_NAME}-data (<< ${PACKAGE_ASSET_MAXVERSION}),
- libsdl2-2.0-0,
- libsdl2-mixer-2.0-0,
- zlib1g,
- libgme0,
- libcurl4,
- libpng | libpng16-16 | libpng12-0
-Description: A cross-platform 3D Sonic fangame
- Sonic Robo Blast 2 is a 3D open-source Sonic the Hedgehog
- fangame built using a modified version of the Doom Legacy
- port of Doom. SRB2 is closely inspired by the original
- Sonic games from the Sega Genesis, and attempts to recreate
- the design in 3D. It features tons of levels, enemies, speed,
- and quite a lot of the fun that the original Sonic games provided.
-
-
-Package: ${PACKAGE_NAME}-dbg
-Architecture: any
-# FIXME: should be Depends: ${SHLIBS_DEPENDS}, ${MISC_DEPENDS}, srb2-data (= 2.1.14), srb2 but dh_shlibdeps is being an asshat
-Depends: libc6, ${MISC_DEPENDS}, ${PACKAGE_NAME}-data (>> ${PACKAGE_ASSET_MINVERSION}), ${PACKAGE_NAME}-data (<< ${PACKAGE_ASSET_MAXVERSION}), ${PACKAGE_NAME}
-Description: A cross-platform 3D Sonic fangame
- Sonic Robo Blast 2 is a 3D open-source Sonic the Hedgehog
- fangame built using a modified version of the Doom Legacy
- port of Doom. SRB2 is closely inspired by the original
- Sonic games from the Sega Genesis, and attempts to recreate
- the design in 3D. It features tons of levels, enemies, speed,
- and quite a lot of the fun that the original Sonic games provided.
- This is a debug binary; its symbols will be loaded by gdb
- when the user starts the game with gdb for debugging.

debian-template/copyright

@@ -1,27 +0,0 @@
-This work was packaged for Debian by:
-
-    ${PACKAGE_NAME_EMAIL}  ${__PACKAGE_DATETIME}
-
-It was downloaded from:
-
-    ${PACKAGE_WEBSITE}
-
-Upstream Author(s):
-
-    ${PACKAGE_GROUP_NAME_EMAIL}
-
-Copyright:
-
-    Copyright (C) 1998-2018 by Sonic Team Junior
-
-License:
-
-    GNU General Public License, version 2
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Callum Dickinson <gcfreak_ag20@hotmail.com>
-    Copyright (C) 2010-2018 by Sonic Team Junior <stjr@srb2.org>
-
-and is licensed under the GPL version 2,
-see "/usr/share/common-licenses/GPL-2".

debian-template/docs

@@ -1,4 +0,0 @@
-README.md
-assets/README.txt
-assets/LICENSE.txt
-assets/LICENSE-3RD-PARTY.txt

debian-template/rules

@@ -1,172 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-#############################################################################
-#
-#     GNU Make Debian package makefile for SRB2
-#
-# Copyright (C) 1998-2010 by Callum Dickinson
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU General Public License for more details.
-#
-# This file most likely will not need to be modified to make
-# branches of SRB2 capable of making their own Debian packages,
-# instead look at the /debian/control file for configuration.
-#
-#############################################################################
-
-#############################################################################
-#
-# !!!!!!!!!! DEPLOYER NOTE !!!!!!!!!!
-#
-# Variables to be templated are curly-braced ${PACKAGE_INSTALL_PATH}
-# Variables used by the rules script are parenthese'd $(PKGDIR)
-# See [repo-root]/debian_template.sh
-#
-#############################################################################
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# user/group of to-be-installed files
-ROOT_USER  := 0
-ROOT_GROUP := 0
-
-# determine cross-compile (may need some work)
-CROSS_COMPILE_BUILD    := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CROSS_COMPILE_HOST     := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-CROSS_COMPILE 	       := $(shell test "$(CROSS_COMPILE_BUILD)" != "$(CROSS_COMPILE_HOST)" && echo "$(CROSS_COMPILE_HOST)")
-
-MKDIR = mkdir -p
-MAKE = make
-INSTALL = install -o $(ROOT_USER) -g $(ROOT_GROUP) -m 644
-MV	= mv
-RM	= rm -rf
-STRIPARGS = --strip-unneeded
-ifdef CROSS_COMPILE
-STRIP = $(CROSS_COMPILE_HOST)-strip $(STRIPARGS)
-else
-STRIP = strip $(STRIPARGS)
-endif
-DIR	:= $(shell pwd)
-
-# FIXME: hate hate hate head/tail hack :(
-CONTROLF = $(DIR)/debian/control
-PACKAGE  = ${PACKAGE_NAME}
-DBGPKG   = ${PACKAGE}-dbg
-TITLE	= ${PROGRAM_NAME}
-SECTION = Games/Action
-EXENAME = ${PROGRAM_FILENAME}
-DBGNAME	= debug/$(EXENAME)
-
-PKGDIR	= $(shell echo "${PACKAGE_INSTALL_PATH}" | sed -e 's/^\///')
-DBGDIR	= usr/lib/debug/$(PKGDIR)
-LINKDIR = $(shell echo "${PACKAGE_LINK_PATH}" | sed -e 's/^\///')
-PIXMAPS_DIR = usr/share/pixmaps
-DESKTOP_DIR = usr/share/applications
-PREFIX	= $(shell test "$(CROSS_COMPILE_BUILD)" != "$(CROSS_COMPILE_HOST)" && echo "PREFIX=$(CROSS_COMPILE_HOST)")
-OS	= LINUX=1
-NONX86	= $(shell test "`echo $(CROSS_COMPILE_HOST) | grep 'i[3-6]86'`" || echo "NONX86=1")
-MAKEARGS = $(OS) $(NONX86) $(PREFIX) EXENAME=$(EXENAME) DBGNAME=$(DBGNAME) NOOBJDUMP=1 # SDL_PKGCONFIG=sdl2 PNG_PKGCONFIG=libpng
-MENUFILE1 = ?package($(PACKAGE)):needs="X11" section="$(SECTION)"
-MENUFILE2 = title="$(TITLE)" command="/$(PKGDIR)/$(PACKAGE)"
-BINDIR :=  $(DIR)/bin/Linux/Release
-
-# FIXME pkg-config dir hacks
-# Launchpad doesn't need this; it actually makes i386 builds fail due to cross-compile
-# export PKG_CONFIG_LIBDIR = /usr/lib/$(CROSS_COMPILE_HOST)/pkgconfig
-LDFLAGS += "-Wl,-rpath=/usr/lib/$(CROSS_COMPILE_HOST)"
-
-# Some libgme-dev packages don't use pkg-config yet, so include the linker flag ourselves
-PKG_CONFIG?=pkg-config
-LIBGME_PKGCONFIG?=libgme
-LIBGME_LDFLAGS?=$(shell $(PKG_CONFIG) $(LIBGME_PKGCONFIG) --libs)
-
-ifeq ($(LIBGME_LDFLAGS),)
-MAKEARGS += LIBGME_LDFLAGS=-lgme
-endif
-
-build:
-	$(MKDIR) $(BINDIR)/debug
-	$(MAKE) -C $(DIR)/src $(MAKEARGS)
-	$(STRIP) $(BINDIR)/$(EXENAME)
-
-binary-indep:
-	# only here to kill Lintian warning
-	echo "no need to do any arch-independent stuff"
-
-binary-arch:
-	# create ddirs
-	$(MKDIR) $(DIR)/debian/tmp/$(PKGDIR) $(DIR)/debian/tmp/$(DBGDIR)
-	$(MKDIR) $(DIR)/debian/tmp/$(PKGDIR) $(DIR)/debian/tmp/$(DESKTOP_DIR)
-	$(MKDIR) $(DIR)/debian/tmp/$(PKGDIR) $(DIR)/debian/tmp/$(PIXMAPS_DIR)
-	# install main binaries
-	$(INSTALL) $(BINDIR)/$(EXENAME) $(DIR)/debian/tmp/$(PKGDIR)/$(PACKAGE)
-	$(INSTALL) $(BINDIR)/$(DBGNAME) $(DIR)/debian/tmp/$(DBGDIR)/$(PACKAGE)
-	# Install desktop file and banner image
-	$(INSTALL) $(DIR)/srb2.png $(DIR)/debian/tmp/usr/share/pixmaps/${PROGRAM_FILENAME}.png
-	$(INSTALL) $(DIR)/debian/srb2.desktop $(DIR)/debian/tmp/usr/share/applications/${PROGRAM_FILENAME}.desktop
-	# add compiled binaries to include-binaries
-	echo $(BINDIR)/$(EXENAME) >> $(DIR)/debian/source/include-binaries
-	echo $(BINDIR)/$(EXENAME) >> $(DIR)/debian/source/include-binaries
-	# Generate install folder files
-	echo $(PKGDIR) > $(DIR)/debian/$(PACKAGE).install
-	echo $(DESKTOP_DIR) >> $(DIR)/debian/$(PACKAGE).install
-	echo $(PIXMAPS_DIR) >> $(DIR)/debian/$(PACKAGE).install
-	echo $(DBGDIR) > $(DIR)/debian/$(DBGPKG).install
-# Launchpad only calls binary-arch, so just move everything up
-#binary: binary-arch
-	# Generate .desktop specifications
-	echo "`echo '$(MENUFILE1)\\'`" > $(DIR)/debian/menu
-	echo " `echo '$(MENUFILE2)'`" >> $(DIR)/debian/menu
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	# dh_installexamples
-	dh_install --sourcedir=$(DIR)/debian/tmp
-	dh_installmenu
-	# dh_installdebconf
-	# dh_installlogrotate
-	# dh_installemacsen
-	# dh_installpam
-	# dh_installmime
-	# dh_python
-	# dh_installinit
-	# dh_installcron
-	# dh_installinfo
-	# dh_installman
-	dh_link $(PKGDIR)/$(EXENAME) $(LINKDIR)/$(EXENAME)
-	dh_compress
-	dh_fixperms
-	# dh_perl
-	# dh_makeshlibs
-	dh_installdeb
-	-dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-
-clean:
-	$(MAKE) -C $(DIR)/src $(MAKEARGS) clean cleandep
-	$(RM) $(BINDIR)/*
-	$(RM) $(DIR)/debian/$(PACKAGE)/*
-	$(RM) $(DIR)/debian/$(DBGPKG)/*
-	$(RM) $(DIR)/debian/tmp/*
-	$(RM) $(DIR)/debian/$(PACKAGE).install
-	$(RM) $(DIR)/debian/$(DBGPKG).install
-	$(RM) $(DIR)/debian/menu
-	$(RM) $(DIR)/debian/files
-	$(RM) $(DIR)/debian/source/include-binaries
-
-.PHONY: all clean binary binary-indep build

debian-template/source/format

@@ -1 +0,0 @@
-3.0 (native)

debian-template/source/options

@@ -1,11 +0,0 @@
-tar-ignore = "assets/*.srb"
-tar-ignore = "assets/*.pk3"
-tar-ignore = "assets/*.dta"
-tar-ignore = "assets/*.wad"
-tar-ignore = "assets/*.kart"
-tar-ignore = "assets/debian/${PACKAGE_NAME}-data/*"
-tar-ignore = "assets/debian/tmp/*"
-tar-ignore = "*.obj"
-tar-ignore = "*.dep"
-tar-ignore = ".git/*"
-tar-ignore = ".git*"

debian-template/srb2.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=${PROGRAM_NAME}
-Comment=${PROGRAM_DESCRIPTION}
-Encoding=UTF-8
-Exec=${PACKAGE_INSTALL_PATH}/${PROGRAM_FILENAME}
-Icon=/usr/share/pixmaps/${PROGRAM_FILENAME}.png
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=Application;Game;

debian_template.sh

@@ -1,166 +0,0 @@
-#!/bin/bash
-
-# Deployer for Travis-CI
-# Debian package templating
-#
-# Call this script BEFORE running debuild!
-# source ./debian_template.sh [clean] [main/asset]
-#
-# Before running this script,
-# you should also set PACKAGE_NAME_EMAIL="John Doe <jdoe@example.com>" to match
-# the identity of the key you will use to sign the package.
-#
-
-# Get script's actual path
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-
-# Recursive function for directory crawling
-# $1 = Directory root to crawl
-# $2 = Code to eval on file
-# $3 = Code to eval on directory
-# Exposes $dirtails, $dirlevel, and $dirtailname
-dirlevel=0 # initialize
-dirtails=()
-
-# Utility function to make dira/dirb/dirc string
-makedirtailname () {
-	dirtailname=""
-	for tail in $dirtails; do
-		if [[ "$dirtailname" == "" ]]; then
-			dirtailname="/$tail";
-		else
-			dirtailname="$dirtailname/$tail";
-		fi;
-	done;
-}
-
-evaldirectory () {
-	if [ -d "$1" ]; then
-		# Set contextual variables
-		# dirtails is an array of directory basenames after the crawl root
-		if (( $dirlevel > 0 )); then
-			dirtails+=( "$(basename $1)" );
-		else
-			dirtails=();
-		fi;
-		dirlevel=$((dirlevel+1));
-
-		# Generate directory path after the crawl root
-		makedirtailname;
-
-		# Eval our directory with the latest contextual info
-		# Don't eval on root
-		if (( $dirlevel > 1 )) && [[ "$3" != "" ]]; then
-			eval "$3";
-		fi;
-
-		# Iterate entries
-		for name in $1/*; do
-			if [ -d "$name" ]; then
-				# Name is a directory, but don't eval yet
-				# Recurse so our vars are updated
-				evaldirectory "$name" "$2" "$3";
-
-				# Decrement our directory level and remove a dirtail
-				unset 'dirtails[ ${#dirtails[@]}-1 ]';
-				dirlevel=$((dirlevel-1));
-				makedirtailname;
-			else
-				# Name is a file
-				if [ -f "$name" ] && [[ "$2" != "" ]]; then
-					eval "$2";
-				fi;
-			fi;
-		done;
-
-		# Reset our variables; we're done iterating
-		if (( $dirlevel == 1 )); then
-			dirlevel=0;
-		fi;
-	fi;
-}
-
-#
-# Initialize package parameter defaults
-#
-if [[ "$__DEBIAN_PARAMETERS_INITIALIZED" != "1" ]]; then
-	. ${DIR}/deployer/travis/deployer_defaults.sh;
-fi;
-
-# Clean up after ourselves; we only expect to run this script once
-# during buildboting
-__DEBIAN_PARAMETERS_INITIALIZED=0
-
-# for envsubst
-export __PACKAGE_DATETIME="$(date '+%a, %d %b %Y %H:%M:%S %z')"
-export __PACKAGE_DATETIME_DIGIT="$(date -u '+%Y%m%d%H%M%S')"
-
-if [[ "$PACKAGE_REVISION" == "" ]]; then
-	PACKAGE_REVISION="-$__PACKAGE_DATETIME_DIGIT";
-	__PACKAGE_REVISION_BY_DATE=1;
-	export PACKAGE_REVISION=${PACKAGE_REVISION}; # for envsubst
-fi;
-
-#
-# Clean the old debian/ directories
-#
-if [[ "$1" == "clean" ]]; then
-	toclean=$2;
-else
-	toclean=$1;
-fi;
-
-if [[ "$toclean" == "" ]] || [[ "$toclean" == "main" ]]; then
-	echo "Cleaning main package scripts";
-	if [[ ! -f ${DIR}/debian ]]; then
-		rm -rf ${DIR}/debian;
-	fi;
-fi;
-if [[ "$toclean" == "" ]] || [[ "$toclean" == "asset" ]]; then
-	echo "Cleaning asset package scripts";
-	if [[ ! -f ${DIR}/assets/debian ]]; then
-		rm -rf ${DIR}/assets/debian;
-	fi;
-fi;
-
-#
-# Make new templates
-#
-if [[ "$1" != "clean" ]]; then
-	totemplate=$1;
-
-	# HACK: ${shlibs:Depends} in the templates make the templating fail
-	# So just define replacemment variables
-	export SHLIBS_DEPENDS=${SHLIBS_DEPENDS};
-	export MISC_DEPENDS=${MISC_DEPENDS};
-	export DEBFILEVAR='$$file'; # used in assets/debian/rules
-
-	# Package parameters are exported for envsubst in deployer_defaults.sh
-
-	if [[ "$totemplate" == "" ]] || [[ "$totemplate" == "main" ]]; then
-		echo "Generating main package scripts";
-		fromroot=${DIR}/debian-template;
-		toroot=${DIR}/debian;
-		mkdir ${toroot};
-
-		evaldirectory ${fromroot} \
-			"cat \$name | envsubst > ${toroot}\${dirtailname}/\$( basename \$name )" \
-			"mkdir \"${toroot}\${dirtailname}\"";
-	fi;
-
-	if [[ "$totemplate" == "" ]] || [[ "$totemplate" == "asset" ]]; then
-		echo "Generating asset package scripts";
-		fromroot=${DIR}/assets/debian-template;
-		toroot=${DIR}/assets/debian;
-		mkdir ${toroot};
-
-		# Root dir to crawl; file eval; directory eval
-		evaldirectory ${fromroot} \
-			"cat \$name | envsubst > ${toroot}\${dirtailname}/\$( basename \$name )" \
-			"mkdir \"${toroot}\${dirtailname}\"";
-	fi;
-fi;
-
-if [[ "$__DPL_ACTIVE" != "1" ]] && [[ "$__PACKAGE_REVISION_BY_DATE" == "1" ]]; then
-	unset PACKAGE_REVISION; # so we can reset the date on subsequent runs
-fi;

deployer/appveyor/deployer.bat

@@ -1,195 +0,0 @@
-@setlocal enableextensions enabledelayedexpansion
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Appveyor Deployer
-: See appveyor.yml for default variables
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Evaluate whether we should be deploying
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-if not [%DPL_ENABLED%] == [1] (
-    echo Deployer is not enabled...
-    exit /b
-)
-
-: Don't do DD installs because fmodex DLL handling is not implemented.
-if [%CONFIGURATION%] == [DD] (
-    echo Deployer does not support DD builds...
-    exit /b
-)
-
-if [%CONFIGURATION%] == [DD64] (
-    echo Deployer does not support DD builds...
-    exit /b
-)
-
-: Substring match from https://stackoverflow.com/questions/7005951/batch-file-find-if-substring-is-in-string-not-in-a-file
-: The below line says "if deployer is NOT in string"
-: Note that APPVEYOR_REPO_BRANCH for pull request builds is the BASE branch that PR is merging INTO
-if x%APPVEYOR_REPO_BRANCH:deployer=%==x%APPVEYOR_REPO_BRANCH% (
-    if not [%APPVEYOR_REPO_TAG%] == [true] (
-        echo Deployer is enabled but we are not in a release tag or a 'deployer' branch...
-        exit /b
-    ) else (
-        if not [%DPL_TAG_ENABLED%] == [1] (
-            echo Deployer is not enabled for release tags...
-            exit /b
-        )
-    )
-)
-
-: Release tags always get optional assets (music.dta)
-if [%APPVEYOR_REPO_TAG%] == [true] (
-    set "ASSET_FILES_OPTIONAL_GET=1"
-)
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Get asset archives
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-if exist "C:\Users\appveyor\srb2_cache\archives\" (
-    if [%ASSET_CLEAN%] == [1] (
-        echo Cleaning asset archives...
-        rmdir /s /q "C:\Users\appveyor\srb2_cache\archives"
-    )
-)
-
-if not exist "C:\Users\appveyor\srb2_cache\archives\" mkdir "C:\Users\appveyor\srb2_cache\archives"
-
-goto EXTRACT_ARCHIVES
-
-::::::::::::::::::::::::::::::::
-: ARCHIVE_NAME_PARTS
-: Call this like a function. %archivepath% is the path to extract parts from.
-::::::::::::::::::::::::::::::::
-
-for %%a in (%archivepath%) do (
-    set "file=%%~fa"
-    set "filepath=%%~dpa"
-    set "filename=%%~nxa"
-)
-
-set "localarchivepath=C:\Users\appveyor\srb2_cache\archives\%filename%"
-
-goto EOF
-
-::::::::::::::::::::::::::::::::
-: EXTRACT_ARCHIVES
-::::::::::::::::::::::::::::::::
-
-set "archivepath=%ASSET_ARCHIVE_PATH%"
-call :ARCHIVE_NAME_PARTS
-set "ASSET_ARCHIVE_PATH_LOCAL=%localarchivepath%"
-if not exist "%localarchivepath%" appveyor DownloadFile "%ASSET_ARCHIVE_PATH%" -FileName "%localarchivepath%"
-
-set "archivepath=%ASSET_ARCHIVE_PATCH_PATH%"
-call :ARCHIVE_NAME_PARTS
-set "ASSET_ARCHIVE_PATCH_PATH_LOCAL=%localarchivepath%"
-if not exist "%localarchivepath%" appveyor DownloadFile "%ASSET_ARCHIVE_PATCH_PATH%" -FileName "%localarchivepath%"
-
-if not [%X86_64%] == [1] (
-    set "archivepath=%ASSET_ARCHIVE_X86_PATH%"
-    call :ARCHIVE_NAME_PARTS
-    set "ASSET_ARCHIVE_X86_PATH_LOCAL=!localarchivepath!"
-    if not exist "!localarchivepath!" appveyor DownloadFile "%ASSET_ARCHIVE_X86_PATH%" -FileName "!localarchivepath!"
-)
-
-if [%X86_64%] == [1] (
-    set "archivepath=%ASSET_ARCHIVE_X64_PATH%"
-    call :ARCHIVE_NAME_PARTS
-    set "ASSET_ARCHIVE_X64_PATH_LOCAL=!localarchivepath!"
-    if not exist "!localarchivepath!" appveyor DownloadFile "%ASSET_ARCHIVE_X64_PATH%" -FileName "!localarchivepath!"
-)
-
-if [%ASSET_FILES_OPTIONAL_GET%] == [1] (
-    set "archivepath=%ASSET_ARCHIVE_OPTIONAL_PATH%"
-    call :ARCHIVE_NAME_PARTS
-    set "ASSET_ARCHIVE_OPTIONAL_PATH_LOCAL=!localarchivepath!"
-    if not exist "!localarchivepath!" appveyor DownloadFile "%ASSET_ARCHIVE_OPTIONAL_PATH%" -FileName "!localarchivepath!"
-)
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Build the installers
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-mkdir "assets\installer"
-mkdir "assets\patch"
-
-7z x -y "%ASSET_ARCHIVE_PATH_LOCAL%" -o"assets\installer" >null
-7z x -y "%ASSET_ARCHIVE_PATCH_PATH_LOCAL%" -o"assets\patch" >null
-
-: Copy optional files to full installer (music.dta)
-if [%ASSET_FILES_OPTIONAL_GET%] == [1] (
-    7z x -y "%ASSET_ARCHIVE_OPTIONAL_PATH_LOCAL%" -o"assets\installer" >null
-)
-
-: Copy EXE -- BUILD_PATH is from appveyor.yml
-robocopy /S /ns /nc /nfl /ndl /np /njh /njs "%BUILD_PATH%" "assets\installer" /XF "*.debug" ".gitignore"
-robocopy /S /ns /nc /nfl /ndl /np /njh /njs "%BUILD_PATH%" "assets\patch" /XF "*.debug" ".gitignore"
-
-: Are we building DD? (we were supposed to exit earlier!)
-if [%CONFIGURATION%] == [DD] ( set "DPL_INSTALLER_NAME=%DPL_INSTALLER_NAME%-DD" )
-if [%CONFIGURATION%] == [DD64] ( set "DPL_INSTALLER_NAME=%DPL_INSTALLER_NAME%-DD" )
-
-: If we are not a release tag, suffix the filename
-if not [%APPVEYOR_REPO_TAG%] == [true] (
-    set "INSTALLER_SUFFIX=-%APPVEYOR_REPO_BRANCH%-%GITSHORT%-%CONFIGURATION%"
-) else (
-    set "INSTALLER_SUFFIX="
-)
-
-if not [%X86_64%] == [1] ( goto X86_INSTALL )
-
-::::::::::::::::::::::::::::::::
-: X64_INSTALL
-::::::::::::::::::::::::::::::::
-
-: Extract DLL binaries
-7z x -y "%ASSET_ARCHIVE_X64_PATH_LOCAL%" -o"assets\installer" >null
-if [%PACKAGE_PATCH_DLL_GET%] == [1] (
-    7z x -y "!ASSET_ARCHIVE_X64_PATH_LOCAL!" -o"assets\patch" >null
-)
-
-: Build the installer
-7z a -sfx7z.sfx "%DPL_INSTALLER_NAME%-x64-Installer%INSTALLER_SUFFIX%.exe" .\assets\installer\*
-
-: Build the patch
-7z a "%DPL_INSTALLER_NAME%-x64-Patch%INSTALLER_SUFFIX%.zip" .\assets\patch\*
-
-: Upload artifacts
-appveyor PushArtifact "%DPL_INSTALLER_NAME%-x64-Installer%INSTALLER_SUFFIX%.exe"
-appveyor PushArtifact "%DPL_INSTALLER_NAME%-x64-Patch%INSTALLER_SUFFIX%.zip"
-
-: We only do x86 OR x64, one at a time, so exit now.
-goto EOF
-
-::::::::::::::::::::::::::::::::
-: X86_INSTALL
-::::::::::::::::::::::::::::::::
-
-: Extract DLL binaries
-7z x -y "%ASSET_ARCHIVE_X86_PATH_LOCAL%" -o"assets\installer" >null
-if [%PACKAGE_PATCH_DLL_GET%] == [1] (
-    7z x -y "!ASSET_ARCHIVE_X86_PATH_LOCAL!" -o"assets\patch" >null
-)
-
-: Build the installer
-7z a -sfx7z.sfx "%DPL_INSTALLER_NAME%-Installer%INSTALLER_SUFFIX%.exe" .\assets\installer\*
-
-: Build the patch
-7z a "%DPL_INSTALLER_NAME%-Patch%INSTALLER_SUFFIX%.zip" .\assets\patch\*
-
-: Upload artifacts
-appveyor PushArtifact "%DPL_INSTALLER_NAME%-Installer%INSTALLER_SUFFIX%.exe"
-appveyor PushArtifact "%DPL_INSTALLER_NAME%-Patch%INSTALLER_SUFFIX%.zip"
-
-: We only do x86 OR x64, one at a time, so exit now
-goto EOF
-
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: EOF
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-endlocal

deployer/travis/deployer.sh

@@ -1,157 +0,0 @@
-#!/bin/bash
-
-# Deployer for Travis-CI
-# Initialization
-#
-# Performs validity checks to ensure that Deployer is allowed to run
-# e.g., is an FTP hostname specified? Are we whitelisted by OSNAMES and BRANCHES?
-#
-# Set these environment variables in your Travis-CI settings, where they are stored securely.
-# See other shell scripts for more options.
-#
-# DPL_ENABLED = 1                       (leave blank to disable)
-# DPL_TAG_ENABLED = 1                   (run Deployer on all tags)
-# DPL_JOB_ENABLE_ALL = 1                (run Deployer on all jobs; leave blank to act on specific jobs, see below)
-# DPL_JOBNAMES = name1,name2            (whitelist of job names to allow uploading; leave blank to upload from all jobs)
-# DPL_OSNAMES = osx                     (whitelist of OS names to allow uploading; leave blank to upload from all OSes)
-# DPL_BRANCHES = master,branch1,branch2 (whitelist of branches to upload; leave blank to upload all branches)
-#
-# To enable Deployer on specific jobs, set _DPL_JOB_ENABLED=1 for that job. Example:
-# - matrix:
-#   - os: osx
-#     env:
-#     - _DPL_JOB_ENABLED=1
-#
-# DO NOT set __DPL_ACTIVE, because that would bypass these validity checks.
-
-# Validate Deployer state
-if [[ "$DPL_ENABLED" == "1" ]] && [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then
-    # Test for base eligibility:
-    # Are we in a deployer branch? Or
-    # Are we in a release tag AND DPL_TAG_ENABLED=1?
-    if [[ $TRAVIS_BRANCH == *"deployer"* ]]; then
-        __DPL_BASE_ELIGIBLE=1;
-        __DPL_TERMINATE_EARLY_ELIGIBLE=1;
-    fi;
-
-    if [[ "$TRAVIS_TAG" != "" ]] && [[ "$DPL_TAG_ENABLED" == "1" ]]; then
-        __DPL_BASE_ELIGIBLE=1;
-        __DPL_TAG_ELIGIBLE=1;
-        __DPL_TERMINATE_EARLY_ELIGIBLE=1;
-    fi;
-
-    # Logging message for trigger word
-    if [[ "$__DPL_TAG_ELIGIBLE" != "1" ]] && [[ "$DPL_TRIGGER" != "" ]]; then
-        echo "Testing for trigger $DPL_TRIGGER, commit message: $TRAVIS_COMMIT_MESSAGE";
-        echo "[${DPL_TRIGGER}]";
-        echo "[${DPL_TRIGGER}-${_DPL_JOB_NAME}]";
-        echo "[${DPL_TRIGGER}-${TRAVIS_OS_NAME}]";
-    fi;
-
-    #
-    # Search for the trigger word
-    # Force enable if release tags are eligible
-    #
-    if [[ "$__DPL_TAG_ELIGIBLE" == "1" ]] || [[ "$DPL_TRIGGER" == "" ]] \
-    || [[ $TRAVIS_COMMIT_MESSAGE == *"[$DPL_TRIGGER]"* ]] \
-    || [[ $TRAVIS_COMMIT_MESSAGE == *"[${DPL_TRIGGER}-${_DPL_JOB_NAME}]"* ]] \
-    || [[ $TRAVIS_COMMIT_MESSAGE == *"[${DPL_TRIGGER}-${TRAVIS_OS_NAME}]"* ]]; then
-        #
-        # Whitelist by branch name
-        # Force enable if release tags are eligible
-        #
-        if [[ "$__DPL_TAG_ELIGIBLE" == "1" ]] || [[ "$DPL_BRANCHES" == "" ]] || [[ $DPL_BRANCHES == *"$TRAVIS_BRANCH"* ]]; then
-            # Set this so we only early-terminate builds when we are specifically deploying
-            # Trigger string and branch are encompassing conditions; the rest are job-specific
-            # This check only matters for deployer branches and when DPL_TERMINATE_TESTS=1,
-            # because we're filtering non-deployer jobs.
-            #
-            # __DPL_TRY_TERMINATE_EARLY is invalidated in .travis.yml if __DPL_ACTIVE=1
-            if [[ "$__DPL_TERMINATE_EARLY_ELIGIBLE" == "1" ]] && [[ "$DPL_TERMINATE_TESTS" == "1" ]]; then
-                __DPL_TRY_TERMINATE_EARLY=1;
-            fi;
-
-            #
-            # Is the job enabled for deployment?
-            #
-            if [[ "$DPL_JOB_ENABLE_ALL" == "1" ]] || [[ "$_DPL_JOB_ENABLED" == "1" ]]; then
-                #
-                # Whitelist by job names
-                #
-                if [[ "$DPL_JOBNAMES" == "" ]] || [[ "$_DPL_JOB_NAME" == "" ]] || [[ $DPL_JOBNAMES == *"$_DPL_JOB_NAME"* ]]; then
-                    #
-                    # Whitelist by OS names
-                    #
-                    if [[ "$DPL_OSNAMES" == "" ]] || [[ $DPL_OSNAMES == *"$TRAVIS_OS_NAME"* ]]; then
-                        # Base Deployer is eligible for becoming active
-
-                        # Are we building for Linux?
-                        if [[ "$_DPL_PACKAGE_BINARY" == "1" ]] || [[ "$_DPL_PACKAGE_SOURCE" == "1" ]]; then
-                            if [[ "$_DPL_PACKAGE_MAIN" == "1" ]] || [[ "$_DPL_PACKAGE_ASSET" == "1" ]]; then
-                                if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-                                    __DPL_DEBIAN_ACTIVE=1;
-                                fi;
-                            fi;
-                        fi;
-
-                        # Now check for deployment targets
-                        if [[ "$_DPL_FTP_TARGET" == "1" ]] && [[ "$DPL_FTP_HOSTNAME" != "" ]]; then
-                            if [[ "$TRAVIS_OS_HOST" == "linux" ]] && [[ "$DPL_FTP_PROTOCOL" == "ftp" ]]; then
-                                echo "Non-secure FTP will not work on Linux Travis-CI jobs!";
-                                echo "Try SFTP or another target. Details:";
-                                echo "https://blog.travis-ci.com/2018-07-23-the-tale-of-ftp-at-travis-ci";
-                            else
-                                if [[ "$__DPL_DEBIAN_ACTIVE" == "1" ]] || [[ "$_DPL_PACKAGE_BINARY" == "1" ]] || [[ "$_DPL_BINARY" == "1" ]]; then
-                                    echo "Deployer FTP target is enabled";
-                                    __DPL_FTP_ACTIVE=1;
-                                else
-                                    echo "Deployer FTP target cannot be enabled: You must specify _DPL_PACKAGE_BINARY=1,";
-                                    echo "and/or _DPL_BINARY=1 in your job's environment variables.";
-                                fi;
-                            fi;
-                        fi;
-
-                        if [[ "$_DPL_DPUT_TARGET" == "1" ]] && [[ "$__DPL_DEBIAN_ACTIVE" == "1" ]] \
-                        && [[ "$DPL_DPUT_INCOMING" != "" ]]; then
-                            if [[ "$DPL_DPUT_METHOD" == "ftp" ]]; then
-                                echo "DPUT will not work with non-secure FTP on Linux Travis-CI jobs!";
-                                echo "Try SFTP or another method for DPUT. Details:";
-                                echo "https://blog.travis-ci.com/2018-07-23-the-tale-of-ftp-at-travis-ci";
-                            else
-                                echo "Deployer DPUT target is enabled";
-                                __DPL_DPUT_ACTIVE=1;
-                            fi;
-                        fi;
-
-                        # If any deployment targets are active, then so is the Deployer at large
-                        if [[ "$__DPL_FTP_ACTIVE" == "1" ]] || [[ "$__DPL_DPUT_ACTIVE" == "1" ]]; then
-                            __DPL_ACTIVE=1;
-                        fi;
-                    fi;
-                fi;
-            fi;
-        fi;
-    else
-        if [[ "$DPL_TRIGGER" != "" ]]; then
-            echo "Testing for global trigger [$DPL_TRIGGER, commit message: $TRAVIS_COMMIT_MESSAGE";
-        fi;
-        if [[ "$DPL_TRIGGER" != "" ]] && [[ $TRAVIS_COMMIT_MESSAGE == *"[$DPL_TRIGGER"* ]]; then
-            if [[ "$__DPL_TAG_ELIGIBLE" == "1" ]] || [[ "$DPL_BRANCHES" == "" ]] || [[ $DPL_BRANCHES == *"$TRAVIS_BRANCH"* ]]; then
-                # This check only matters for deployer branches and when DPL_TERMINATE_TESTS=1,
-                # because we're filtering non-deployer jobs.
-                if [[ "$__DPL_TERMINATE_EARLY_ELIGIBLE" == "1" ]] && [[ "$DPL_TERMINATE_TESTS" == "1" ]]; then
-                    # Assume that some job received the trigger, so mark this for early termination
-                    __DPL_TRY_TERMINATE_EARLY=1;
-                fi;
-            fi;
-        fi;
-    fi;
-fi;
-
-if [[ "$__DPL_TRY_TERMINATE_EARLY" == "1" ]] && [[ "$__DPL_ACTIVE" != "1" ]]; then
-    echo "Deployer is active in another job";
-fi;
-
-if [[ "$__DPL_TRY_TERMINATE_EARLY" != "1" ]] && [[ "$__DPL_ACTIVE" != "1" ]]; then
-    echo "Deployer is not active";
-fi;

deployer/travis/deployer_build.sh

@@ -1,190 +0,0 @@
-#!/bin/bash
-
-# Deployer for Travis-CI
-# Build Script
-#
-# Builds the required targets depending on which sub-modules are enabled
-
-if [[ "$__DPL_FTP_ACTIVE" == "1" ]] || [[ "$__DPL_DPUT_ACTIVE" == "1" ]]; then
-	if [[ "$__DPL_DEBIAN_ACTIVE" == "1" ]]; then
-		echo "Building Debian package(s)"
-
-		sudo apt-get install devscripts debhelper fakeroot secure-delete expect;
-
-		# Build source packages first, since they zip up the entire source folder,
-		# binaries and all
-		if [[ "$_DPL_PACKAGE_MAIN" == "1" ]]; then
-			. ../debian_template.sh main;
-			OLDPWD=$PWD; # [repo]/build
-			cd ..; # repo root
-
-			if [[ "$_DPL_PACKAGE_SOURCE" == "1" ]]; then
-				echo "Building main source Debian package";
-				expect <(cat <<EOD
-spawn debuild -S -us -uc;
-expect "continue anyway? (y/n)"
-send "y\r"
-interact
-EOD
-);
-			fi;
-
-			if [[ "$_DPL_PACKAGE_BINARY" == "1" ]]; then
-				echo "Building main binary Debian package";
-				expect <(cat <<EOD
-spawn debuild -us -uc;
-expect "continue anyway? (y/n)"
-send "y\r"
-interact
-EOD
-);
-			fi;
-
-			cd $OLDPWD;
-		fi;
-
-		# Also an asset package
-		if [[ "$_DPL_PACKAGE_ASSET" == "1" ]]; then
-			. ../debian_template.sh asset;
-			OLDPWD=$PWD; # [repo]/build
-			cd ../assets;
-
-			# make sure the asset files exist, download them if they don't
-			#echo "Checking asset files for asset Debian package";
-			#debuild -T build;
-
-			if [[ "$_DPL_PACKAGE_SOURCE" == "1" ]]; then
-				echo "Building asset source Debian package";
-				expect <(cat <<EOD
-spawn debuild -S -us -uc;
-expect "continue anyway? (y/n)"
-send "y\r"
-interact
-EOD
-);
-			fi;
-
-			if [[ "$_DPL_PACKAGE_BINARY" == "1" ]]; then
-				echo "Building asset binary Debian package";
-				expect <(cat <<EOD
-spawn debuild -us -uc;
-expect "continue anyway? (y/n)"
-send "y\r"
-interact
-EOD
-);
-			fi;
-
-			cd $OLDPWD;
-		fi;
-
-		# Now sign our packages
-		if [[ "$DPL_PGP_KEY_PRIVATE" != "" ]] && [[ "$DPL_PGP_KEY_PASSPHRASE" != "" ]]; then
-			# Get the key to sign
-			# Do this AFTER debuild so that we can specify the passphrase in command line
-			echo "$DPL_PGP_KEY_PRIVATE" | base64 --decode > key.asc;
-			echo "$DPL_PGP_KEY_PASSPHRASE" > phrase.txt;
-			gpg --import key.asc;
-
-			if [[ "$_DPL_PACKAGE_MAIN" == "1" ]]; then
-				echo "Signing main package(s)";
-
-				PACKAGEFILENAME=${PACKAGE_NAME}_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				PACKAGEDBGFILENAME=${PACKAGE_NAME}-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				#PACKAGENIGHTLYFILENAME=${PACKAGE_NAME}-nightly_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				#PACKAGENIGHTLYDBGFILENAME=${PACKAGE_NAME}-nightly-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				#PACKAGEPATCHFILENAME=${PACKAGE_NAME}-patch_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				#PACKAGEPATCHDBGFILENAME=${PACKAGE_NAME}-patch-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				#PACKAGEPATCHNIGHTLYFILENAME=${PACKAGE_NAME}-patch-nightly_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				#PACKAGEPATCHNIGHTLYDBGFILENAME=${PACKAGE_NAME}-patch-nightly-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-
-				PACKAGEFILENAMES=(
-					$PACKAGEFILENAME
-					$PACKAGEDBGFILENAME
-					#$PACKAGENIGHTLYFILENAME
-					#$PACKAGENIGHTLYDBGFILENAME
-					#$PACKAGEPATCHFILENAME
-					#$PACKAGEPATCHDBGFILENAME
-					#$PACKAGEPATCHNIGHTLYFILENAME
-					#$PACKAGEPATCHNIGHTLYDBGFILENAME
-				);
-
-				# Main packages are in parent of root repo folder
-				OLDPWD=$PWD; # [repo]/build
-				cd ../..; # parent of repo root
-
-				for n in ${PACKAGEFILENAMES}; do
-					for f in ./$n*.changes; do
-						debsign --no-re-sign -p"gpg --passphrase-file $OLDPWD/phrase.txt --batch" "$f";
-					done;
-				done;
-
-				cd $OLDPWD;
-			fi;
-
-			if [[ "$_DPL_PACKAGE_ASSET" == "1" ]]; then
-				echo "Signing asset package(s)";
-
-				PACKAGEFILENAME=${PACKAGE_NAME}-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				#PACKAGENIGHTLYFILENAME=${PACKAGE_NAME}-nightly-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				#PACKAGEPATCHFILENAME=${PACKAGE_NAME}-patch-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-				#PACKAGEPATCHNIGHTLYFILENAME=${PACKAGE_NAME}-patch-nightly-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-
-				PACKAGEFILENAMES=(
-					$PACKAGEFILENAME
-					#$PACKAGENIGHTLYFILENAME
-					#$PACKAGEPATCHFILENAME
-					#$PACKAGEPATCHNIGHTLYFILENAME
-				)
-
-				# Asset packages are in root repo folder
-				OLDPWD=$PWD; # [repo]/build
-				cd ..; # repo root
-
-				for n in ${PACKAGEFILENAMES}; do
-					for f in ./$n*.changes; do
-						debsign --no-re-sign -p"gpg --passphrase-file $OLDPWD/phrase.txt --batch" "$f";
-					done;
-				done;
-
-				cd $OLDPWD;
-			fi;
-
-			# Delete the keys :eyes:
-			srm key.asc;
-			srm phrase.txt;
-		fi;
-	fi;
-
-	# all other OSes
-	if [[ "$TRAVIS_OS_NAME" != "linux" ]]; then
-		#
-		# Check for binary building
-		#
-		if [[ "$_DPL_BINARY" == "1" ]]; then
-			echo "Building a Binary";
-			make -k;
-		fi;
-
-		#
-		# Check for package building
-		#
-		if [[ "$_DPL_PACKAGE_BINARY" == "1" ]]; then
-			echo "Building a Package";
-
-			# Make an OSX package; superuser is required for library bundling
-			#
-			# HACK: OSX packaging can't write libraries to .app package unless we're superuser
-			# because the original library files don't have WRITE permission
-			# Bug may be sidestepped by using CHMOD_BUNDLE_ITEMS=TRUE
-			# But I don't know where this is set. Not `cmake -D...` because this var is ignored.
-			# https://cmake.org/Bug/view.php?id=9284
-			if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-				sudo make -k package;
-			else
-				# Some day, when Windows is supported, we'll just make a standard package
-				make -k package;
-			fi;
-		fi;
-	fi;
-fi;

deployer/travis/deployer_defaults.sh

@@ -1,105 +0,0 @@
-#!/bin/bash
-
-# Deployer for Travis-CI
-# Default Variables
-#
-# Here are all of the user-set variables used by Deployer.
-# See the "Cross-platform deployment" page on SRB2 Wiki for documentation.
-
-# Core Parameters
-: ${DPL_ENABLED}                # Enable Deployer behavior; must be set for any deployment activity
-: ${DPL_TAG_ENABLED}            # Trigger Deployer for all tag releases
-: ${DPL_JOB_ENABLE_ALL}         # Enable all jobs for deployment
-: ${DPL_TERMINATE_TESTS}        # Terminate all build test jobs (used in .travis.yml)
-: ${DPL_TRIGGER}                # Use a [word] in the commit message to trigger Deployer
-: ${DPL_JOBNAMES}               # Trigger Deployer by job name
-: ${DPL_OSNAMES}                # Trigger Deployer by OS name (osx,linux)
-: ${DPL_BRANCHES}               # Trigger Deployer by git branch name
-
-# Job Parameters
-: ${_DPL_JOB_ENABLED}           # Enable Deployer for this specific job. DPL_ENABLED must be set too.
-: ${_DPL_JOB_NAME}              # Identifier for the job, used for logging and trigger word matching
-: ${_DPL_FTP_TARGET}            # Deploy to FTP
-: ${_DPL_DPUT_TARGET}           # Deploy to DPUT
-: ${_DPL_PACKAGE_SOURCE}        # Build packages into a Source distribution. Linux only.
-: ${_DPL_PACKAGE_BINARY}        # Build packages into a Binary distribution.
-: ${_DPL_PACKAGE_MAIN:=1}       # Build main installation package. Linux only; OS X assumes this.
-: ${_DPL_PACKAGE_ASSET}         # Build asset installation package. Linux only.
-
-# 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_OPTIONAL_GET:=0}
-
-# FTP Parameters
-: ${DPL_FTP_PROTOCOL}
-: ${DPL_FTP_USER}
-: ${DPL_FTP_PASS}
-: ${DPL_FTP_HOSTNAME}
-: ${DPL_FTP_PORT}
-: ${DPL_FTP_PATH}
-
-# DPUT Parameters
-: ${DPL_DPUT_DOMAIN:=ppa.launchpad.net}
-: ${DPL_DPUT_METHOD:=sftp}
-: ${DPL_DPUT_INCOMING}
-: ${DPL_DPUT_LOGIN:=anonymous}
-: ${DPL_SSH_KEY_PRIVATE}        # Base64-encoded private key file. Used to sign repository uploads
-: ${DPL_SSH_KEY_PASSPHRASE}     # Decodes the private key file.
-
-# Package Parameters
-: ${PACKAGE_NAME:=srb2kart}
-: ${PACKAGE_VERSION:=1.0.2}
-: ${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_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
-
-: ${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_FILENAME:=srb2kart}
-
-: ${DPL_PGP_KEY_PRIVATE}        # Base64-encoded private key file. Used to sign Debian packages
-: ${DPL_PGP_KEY_PASSPHRASE}     # Decodes the private key file.
-
-# Export Asset and Package Parameters for envsubst templating
-
-export ASSET_ARCHIVE_PATH="${ASSET_ARCHIVE_PATH}"
-export ASSET_ARCHIVE_OPTIONAL_PATH="${ASSET_ARCHIVE_OPTIONAL_PATH}"
-export ASSET_FILES_HASHED="${ASSET_FILES_HASHED}"
-export ASSET_FILES_DOCS="${ASSET_FILES_DOCS}"
-export ASSET_FILES_OPTIONAL_GET="${ASSET_FILES_OPTIONAL_GET}"
-
-export PACKAGE_NAME="${PACKAGE_NAME}"
-export PACKAGE_VERSION="${PACKAGE_VERSION}"
-export PACKAGE_SUBVERSION="${PACKAGE_SUBVERSION}" # in case we have this
-export PACKAGE_REVISION="${PACKAGE_REVISION}"
-export PACKAGE_ASSET_MINVERSION="${PACKAGE_ASSET_MINVERSION}"
-export PACKAGE_ASSET_MAXVERSION="${PACKAGE_ASSET_MAXVERSION}"
-export PACKAGE_INSTALL_PATH="${PACKAGE_INSTALL_PATH}"
-export PACKAGE_LINK_PATH="${PACKAGE_LINK_PATH}"
-export PACKAGE_DISTRO="${PACKAGE_DISTRO}"
-export PACKAGE_URGENCY="${PACKAGE_URGENCY}"
-export PACKAGE_NAME_EMAIL="${PACKAGE_NAME_EMAIL}"
-export PACKAGE_GROUP_NAME_EMAIL="${PACKAGE_GROUP_NAME_EMAIL}"
-export PACKAGE_WEBSITE="${PACKAGE_WEBSITE}"
-
-export PROGRAM_NAME="${PROGRAM_NAME}"
-export PROGRAM_VERSION="${PROGRAM_VERSION}"
-export PROGRAM_DESCRIPTION="${PROGRAM_DESCRIPTION}"
-export PROGRAM_FILENAME="${PROGRAM_FILENAME}"
-
-# This file is called in debian_template.sh, so mark our completion so we don't run it again
-__DEBIAN_PARAMETERS_INITIALIZED=1

deployer/travis/deployer_dput.sh

@@ -1,133 +0,0 @@
-#!/bin/bash
-
-# Deployer for Travis-CI
-# DPUT uploader (e.g., Launchpad PPA)
-#
-
-if [[ "$__DPL_DPUT_ACTIVE" == "1" ]]; then
-    # Install APT dependencies
-    # paramiko required for ssh
-    sudo apt-get install python-paramiko expect dput; # python-pip
-    #pip install paramiko;
-
-    # Output the DPUT config
-    # Dput only works if you're using secure FTP, so that's what we default to.
-    cat > "./dput.cf" << EOM
-[deployer]
-fqdn = ${DPL_DPUT_DOMAIN}
-method = ${DPL_DPUT_METHOD}
-incoming = ${DPL_DPUT_INCOMING}
-login = ${DPL_DPUT_LOGIN}
-allow_unsigned_uploads = 0
-EOM
-
-    # Output SSH config
-    # Don't let SSH prompt us for untrusted hosts
-    cat >> "./ssh_config" << EOM
-
-Host *
-    StrictHostKeyChecking no
-    UserKnownHostsFile=/dev/null
-    PubKeyAuthentication yes
-    IdentityFile ${PWD}/key.private
-    IdentitiesOnly yes
-EOM
-    sudo sh -c "cat < ${PWD}/ssh_config >> /etc/ssh/ssh_config";
-
-    # Get the private key
-    echo "$DPL_SSH_KEY_PRIVATE" | base64 --decode > key.private;
-    chmod 700 ./key.private;
-
-    if [[ "$_DPL_PACKAGE_MAIN" == "1" ]]; then
-        PACKAGEFILENAME=${PACKAGE_NAME}_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-        PACKAGEDBGFILENAME=${PACKAGE_NAME}-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-		#PACKAGENIGHTLYFILENAME=${PACKAGE_NAME}-nightly_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-		#PACKAGENIGHTLYDBGFILENAME=${PACKAGE_NAME}-nightly-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-        #PACKAGEPATCHFILENAME=${PACKAGE_NAME}-patch_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-		#PACKAGEPATCHDBGFILENAME=${PACKAGE_NAME}-patch-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-        #PACKAGEPATCHNIGHTLYFILENAME=${PACKAGE_NAME}-patch-nightly_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-		#PACKAGEPATCHNIGHTLYDBGFILENAME=${PACKAGE_NAME}-patch-nightly-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-
-        PACKAGEFILENAMES=(
-            $PACKAGEFILENAME
-            $PACKAGEDBGFILENAME
-            #$PACKAGENIGHTLYFILENAME
-            #$PACKAGENIGHTLYDBGFILENAME
-            #$PACKAGEPATCHFILENAME
-            #$PACKAGEPATCHDBGFILENAME
-            #$PACKAGEPATCHNIGHTLYFILENAME
-            #$PACKAGEPATCHNIGHTLYDBGFILENAME
-        );
-
-        # Main packages are in parent of root repo folder
-        OLDPWD=$PWD; # [repo]/build
-        cd ../..;
-
-        # Enter passphrase if required
-        for n in ${PACKAGEFILENAMES}; do
-            for f in $n*.changes; do
-                # Binary builds also generate source builds, so exclude the source
-                # builds if desired
-                if [[ "$_DPL_PACKAGE_SOURCE" != "1" ]]; then
-                    if [[ "$f" == *"_source"* ]] || [[ "$f" == *".tar.xz"* ]]; then
-                        continue;
-                    fi;
-                fi;
-
-                expect <(cat <<EOD
-spawn dput -c "${OLDPWD}/dput.cf" deployer "$f";
-expect "Enter passphrase for key"
-send "${DPL_SSH_KEY_PASSPHRASE}\r"
-interact
-EOD
-);
-            done;
-        done;
-
-        # Go back to [repo]/build folder
-        cd $OLDPWD;
-    fi;
-
-    if [[ "$_DPL_PACKAGE_ASSET" == "1" ]]; then
-        PACKAGEFILENAME=${PACKAGE_NAME}-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-        #PACKAGENIGHTLYFILENAME=${PACKAGE_NAME}-nightly-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-        #PACKAGEPATCHFILENAME=${PACKAGE_NAME}-patch-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-        #PACKAGEPATCHNIGHTLYFILENAME=${PACKAGE_NAME}-patch-nightly-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-
-        PACKAGEFILENAMES=(
-            $PACKAGEFILENAME
-            #$PACKAGENIGHTLYFILENAME
-            #$PACKAGEPATCHFILENAME
-            #$PACKAGEPATCHNIGHTLYFILENAME
-        )
-
-        # Asset packages are in root repo folder
-        OLDPWD=$PWD; # [repo]/build
-        cd ..;
-
-        # Enter passphrase if required
-        for n in ${PACKAGEFILENAMES}; do
-            for f in $n*.changes; do
-                # Binary builds also generate source builds, so exclude the source
-                # builds if desired
-                if [[ "$_DPL_PACKAGE_SOURCE" != "1" ]]; then
-                    if [[ "$f" == *"_source"* ]] || [[ "$f" == *".tar.xz"* ]]; then
-                        continue;
-                    fi;
-                fi;
-                expect <(cat <<EOD
-spawn dput -c "${OLDPWD}/dput.cf" deployer "$f";
-expect "Enter passphrase for key"
-send "${DPL_SSH_KEY_PASSPHRASE}\r"
-interact
-EOD
-);
-            done;
-        done;
-
-        # Go back to [repo]/build folder
-        cd $OLDPWD;
-    fi;
-
-    srm ./key.private;
-fi;

deployer/travis/deployer_ftp.sh

@@ -1,137 +0,0 @@
-#!/bin/bash
-
-# Deployer for Travis-CI
-# FTP Uploader
-#
-# Package files are uploaded to, e.g., ftp://username:password@example.com:21/path/to/upload/STJr/SRB2/master/460873812-151.1
-# With file `commit.txt` and folder(s) `bin` and `package`
-#
-# Set these environment variables in your Travis-CI settings, where they are stored securely.
-# See other shell scripts for more options.
-#
-# DPL_FTP_PROTOCOL = ftp                    (ftp or sftp or ftps or however your FTP URI begins)
-# DPL_FTP_USER = username
-# DPL_FTP_PASS = password
-# DPL_FTP_HOSTNAME = example.com
-# DPL_FTP_PORT = 21
-# DPL_FTP_PATH = path/to/upload             (do not add trailing slash)
-
-if [[ "$__DPL_FTP_ACTIVE" == "1" ]]; then
-	if [[ "$TRAVIS_JOB_NAME" != "" ]]; then
-		JOBNAME=$TRAVIS_JOB_NAME;
-	else
-		if [[ "$_DPL_JOB_NAME" != "" ]]; then
-			JOBNAME=$_DPL_JOB_NAME;
-		else
-			JOBNAME=$TRAVIS_OS_NAME;
-		fi;
-	fi;
-
-	# Generate commit.txt file
-	echo "Travis-CI Build $TRAVIS_OS_NAME - $TRAVIS_REPO_SLUG/$TRAVIS_BRANCH - $TRAVIS_JOB_NUMBER - $JOBNAME" > "commit.txt";
-	echo "Job ID $TRAVIS_JOB_ID" >> "commit.txt";
-	echo "" >> "commit.txt";
-	echo "Commit $TRAVIS_COMMIT" >> "commit.txt";
-	echo "$TRAVIS_COMMIT_MESSAGE" >> "commit.txt";
-	echo "" >> "commit.txt";
-
-	# Initialize FTP parameters
-	if [[ "$DPL_FTP_PORT" == "" ]]; then
-		DPL_FTP_PORT=21;
-	fi;
-	if [[ "$DPL_FTP_PROTOCOL" == "" ]]; then
-		DPL_FTP_PROTOCOL=ftp;
-	fi;
-	__DPL_FTP_LOCATION=$DPL_FTP_PROTOCOL://$DPL_FTP_HOSTNAME:$DPL_FTP_PORT/$DPL_FTP_PATH/$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/$TRAVIS_JOB_ID-$TRAVIS_JOB_NUMBER-$JOBNAME;
-
-	# Upload to FTP!
-	echo "Uploading to FTP...";
-	curl --ftp-create-dirs -T "commit.txt" -u $DPL_FTP_USER:$DPL_FTP_PASS "$__DPL_FTP_LOCATION/commit.txt";
-
-	if [[ "$__DPL_DEBIAN_ACTIVE" == "1" ]]; then
-		if [[ "$_DPL_PACKAGE_MAIN" == "1" ]]; then
-			PACKAGEFILENAME=${PACKAGE_NAME}_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			PACKAGEDBGFILENAME=${PACKAGE_NAME}-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			#PACKAGENIGHTLYFILENAME=${PACKAGE_NAME}-nightly_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			#PACKAGENIGHTLYDBGFILENAME=${PACKAGE_NAME}-nightly-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			#PACKAGEPATCHFILENAME=${PACKAGE_NAME}-patch_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			#PACKAGEPATCHDBGFILENAME=${PACKAGE_NAME}-patch-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			#PACKAGEPATCHNIGHTLYFILENAME=${PACKAGE_NAME}-patch-nightly_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			#PACKAGEPATCHNIGHTLYDBGFILENAME=${PACKAGE_NAME}-patch-nightly-dbg_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-
-			PACKAGEFILENAMES=(
-				$PACKAGEFILENAME
-				$PACKAGEDBGFILENAME
-				#$PACKAGENIGHTLYFILENAME
-				#$PACKAGENIGHTLYDBGFILENAME
-				#$PACKAGEPATCHFILENAME
-				#$PACKAGEPATCHDBGFILENAME
-				#$PACKAGEPATCHNIGHTLYFILENAME
-				#$PACKAGEPATCHNIGHTLYDBGFILENAME
-			);
-
-			# Main packages are in parent of root repo folder
-			OLDPWD=$PWD; # [repo]/build
-			cd ../..;
-
-			for n in ${PACKAGEFILENAMES}; do
-				for f in ./$n*; do
-					# Binary builds also generate source builds, so exclude the source
-					# builds if desired
-					if [[ "$_DPL_PACKAGE_SOURCE" != "1" ]]; then
-						if [[ "$f" == *"_source"* ]] || [[ "$f" == *".tar.xz"* ]]; then
-							continue;
-						fi;
-					fi;
-					curl --ftp-create-dirs -T "$f" -u $DPL_FTP_USER:$DPL_FTP_PASS  "$__DPL_FTP_LOCATION/package/main/$f";
-				done;
-			done;
-
-			# Go back to [repo]/build folder
-			cd $OLDPWD;
-		fi;
-
-		if [[ "$_DPL_PACKAGE_ASSET" == "1" ]]; then
-			PACKAGEFILENAME=${PACKAGE_NAME}-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			#PACKAGENIGHTLYFILENAME=${PACKAGE_NAME}-nightly-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			#PACKAGEPATCHFILENAME=${PACKAGE_NAME}-patch-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-			#PACKAGEPATCHNIGHTLYFILENAME=${PACKAGE_NAME}-patch-nightly-data_${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION};
-
-			PACKAGEFILENAMES=(
-				$PACKAGEFILENAME
-				#$PACKAGENIGHTLYFILENAME
-				#$PACKAGEPATCHFILENAME
-				#$PACKAGEPATCHNIGHTLYFILENAME
-			)
-
-			# Asset packages are in root repo folder
-			OLDPWD=$PWD; # [repo]/build
-			cd ..;
-
-			for n in ${PACKAGEFILENAMES}; do
-				for f in ./$n*; do
-					# Binary builds also generate source builds, so exclude the source
-					# builds if desired
-					if [[ "$_DPL_PACKAGE_SOURCE" != "1" ]]; then
-						if [[ "$f" == *"_source"* ]] || [[ "$f" == *".tar.xz"* ]]; then
-							continue;
-						fi;
-					fi;
-					curl --ftp-create-dirs -T "$f" -u $DPL_FTP_USER:$DPL_FTP_PASS  "$__DPL_FTP_LOCATION/package/asset/$f";
-				done;
-			done;
-
-			# Go back to [repo]/build folder
-			cd $OLDPWD;
-		fi;
-	else
-		if [[ "$_DPL_BINARY" == "1" ]]; then
-			find bin -type f -exec curl -u $DPL_FTP_USER:$DPL_FTP_PASS --ftp-create-dirs -T {} $__DPL_FTP_LOCATION/{} \;;
-		fi;
-
-		if [[ "$_DPL_PACKAGE_BINARY" == "1" ]]; then
-			sudo rm -r package/_CPack_Packages
-			find package -type f -exec curl -u $DPL_FTP_USER:$DPL_FTP_PASS --ftp-create-dirs -T {} $__DPL_FTP_LOCATION/{} \;;
-		fi;
-	fi;
-fi

doc/Doublescan.txt

@@ -1,93 +0,0 @@
-   ================================================================
-   How to add Low-res modes to your XF86Config under Linux MANUALLY
-   ================================================================
-
-   I TAKE NO RESPONSIBILITY FOR ANY DAMAGE DONE TO YOUR EQUIPMENT!!!
-
-   This document explains how to add low-res modes like 320x200 to your
-   X-Server configuration, because some new setup tools for the X-Server
-   do not support this. ONLY RECOMMENDED FOR USERS WHO KNOW WHAT THEY DO!
-
-   I do not take any responsibility for damage done to your monitor, your
-   videocard, your harddisk, your cat, your dog or anything else!!!
-   IMPORTANT IS, THAT YOUR "HorizSync" AND "VertRefresh" VALUES REALLY
-   MATCH YOUR MONITOR! OTHERWISE YOUR MONITOR CAN BLOW UP!!!
-
-   OK, if you have read up to here, you either know what you do or really
-   die-hard want those low-res modes. Here is what to do:
-   Look up your XF86Config. Is is either in /etc or in /etc/X11. Here is
-   what you have to add to the definition of your modeslines:
-
-# Low-res Doublescan modes
-# If your chipset does not support doublescan, you get a 'squashed'
-# resolution like 320x400.
-
-# 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio
-Modeline "320x200"     12.588 320  336  384  400   200  204  205  225 Doublescan
-# 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio
-Modeline "320x240"     12.588 320  336  384  400   240  245  246  262 Doublescan
-# 320x240 @ 72 Hz, 36.5 kHz hsync
-Modeline "320x240"     15.750 320  336  384  400   240  244  246  262 Doublescan
-# 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio
-ModeLine "400x300"     18     400  416  448  512   300  301  302  312 Doublescan
-# 400x300 @ 60 Hz, 37.8 kHz hsync
-Modeline "400x300"     20     400  416  480  528   300  301  303  314 Doublescan
-# 400x300 @ 72 Hz, 48.0 kHz hsync
-Modeline "400x300"     25     400  424  488  520   300  319  322  333 Doublescan
-
-   If your video card only supports a specific set of discrete dotclocks
-   (RAMDAC) you may have to replace the dotclocks given here by one of the
-   specified (e.g in the first modeline the dotclock is 12.588 MHz). I believe
-   that nowadays all cards and monitors should work with these settings, but
-   if you have outdated hardware you better check the frequencies yourself. If
-   there is any uncertainty, please check the "XFree86 Video Timings HOWTO".
-
-
-   Then have a look at the section "Screen" with the appropriate driver
-   (usually either "svga" or "accel"). Under Subsection "Display" there
-   are modes for the given color depth. Add the desired modes. As an
-   example I give you my screens definition here with low-res modes in
-   16 bit color depth:
-
-Section "Screen"
-    Driver      "accel"
-    Device      "3D Charger"
-    Monitor     "Iiyama Pro 450"
-    DefaultColorDepth 16
-
-    Subsection "Display"
-        Depth       8
-        Modes       "1280x1024" "1024x768" "800x600" "640x480"
-        ViewPort    0 0
-        Virtual     1280 1024
-    EndSubsection
-    Subsection "Display"
-        Depth       16
-        Modes       "1152x864" "1024x768" "800x600" "640x480" "400x300" "320x200" <- THIS IS ACTUALLY WHAT YOU WANT!!!
-        ViewPort    0 0                                       ^^^^^^^^^^^^^^^^^^^
-        Virtual     1152 864
-    EndSubsection
-    Subsection "Display"
-        Depth       24
-        Modes       "800x600" "640x480"
-        ViewPort    0 0
-        Virtual     800 600
-    EndSubsection
-    Subsection "Display"
-        Depth       32
-        Modes       "800x600" "640x480"
-        ViewPort    0 0
-        Virtual     800 600
-    EndSubsection
-EndSection
-
-   Once again: important is, that you edit the correct Screen section.
-   If you use the SVGA Server and edit the ACCEL Server, you might
-   wonder where your new modes have gone.
-
-   If everything went fine and you want to say thank you, just write
-   to "metzgermeister@users.sourceforge.net". If your monitor blew
-   up and you want to kill me, find me playing Legacy or Q3A on the net
-   and frag me (with your second monitor, hehe).
-
-   - metzgermeister

doc/Item Ranges.txt

@@ -1,212 +0,0 @@
-1-99 : Player Starts
-	1 - Player 1 Start		1
-	2 - Player 2 Start		2
-	3 - Player 3 Start		3
-	4 - Player 4 Start		4
-	5 - Player 5 Start 		4001
-	6 - Player 6 Start 		4002
-	7 - Player 7 Start 		4003
-	8 - Player 8 Start 		4004
-	9 - Player 9 Start 		4005
-	10 - Player 10 Start 		4006
-	11 - Player 11 Start 		4007
-	12 - Player 12 Start 		4008
-	13 - Player 13 Start 		4009
-	14 - Player 14 Start 		4010
-	15 - Player 15 Start 		4011
-	16 - Player 16 Start 		4012
-	17 - Player 17 Start 		4013
-	18 - Player 18 Start 		4014
-	19 - Player 19 Start 		4015
-	20 - Player 20 Start 		4016
-	21 - Player 21 Start 		4017
-	22 - Player 22 Start 		4018
-	23 - Player 23 Start 		4019
-	24 - Player 24 Start 		4020
-	25 - Player 25 Start 		4021
-	26 - Player 26 Start 		4022
-	27 - Player 27 Start 		4023
-	28 - Player 28 Start 		4024
-	29 - Player 29 Start 		4025
-	30 - Player 30 Start 		4026
-	31 - Player 31 Start 		4027
-	32 - Player 32 Start 		4028
-	33 - Player Match Start 	11
-	34 - Red Team Start 		87
-	35 - Blue Team Start 		89
-	36 - Tag start			New
-
-100 - 199 : Enemies
-	100 - Blue Crawla		3004
-	101 - Red Crawla		9
-	102 - GFZ Fish			58
-	103 - Gold Buzz			5005
-	104 - Red Buzz			5006
-	105 - Jetty-Syn Bomber		3005
-	106 - Jetty-Syn Gunner		22
-	107 - Crawla Commander		21
-	108 - Deton			71
-	109 - Skim			56
-	110 - THZ Turret		2004
-	111 - Pop-up Turret		42
-
-200 - 299 : Bosses and their associated items (if any)
-	200 - Boss 1			16
-	201 - Boss 2			2008
-	290 - Boss Fly Point		17
-	291 - EggTrap Center		2049
-
-300 - 399 : Collectibles
-	300 - Ring			2014
-	301 - Homing Ring		69
-	302 - Rail Ring			3003
-	303 - Infinity Ring		80
-	304 - Automatic Ring		26
-	305 - Explosion Ring		54
-	306 - Red CTF Flag		31
-	307 - Blue CTF Flag		34
-	308 - Special Stage Token	2013
-	309 - Emerald 1			420
-	310 - Emerald 2			421
-	311 - Emerald 3			422
-	312 - Emerald 4			423
-	313 - Emerald 5			424
-	314 - Emerald 6			425
-	315 - Emerald 7			426
-	316 - Hunting Emerald 1		64
-	317 - Hunting Emerald 2		3002
-	318 - Hunting Emerald 3		3001
-
-400 - 499 : Boxes
-	400 - Super Ring Box		2011
-	401 - Grey Ring Box		2012
-	402 - Ring Shield Box		48
-	403 - Fire Shield Box		2002
-	404 - Bomb Shield Box		2018
-	405 - Jump Shield Box		35
-	406 - Water Shield Box		2028
-	407 - Sneaker Box		25
-	408 - Invincibility Box		2022
-	409 - 1-Up Box			41
-	410 - Eggman Box		2005
-	411 - Mixup Box			78
-	412 - Question Box		3000
-
-500 - 599 : Interactive Objects (friendly or otherwise - includes springs)
-	500 - Bubble Patch		33
-	501 - Level End Sign		86
-	502 - Starpost			3006
-	520 - Spike Ball		-1
-	521 - Special Stage Spike Ball	23
-	522 - Ceiling Spike		67
-	523 - Floor Spike		68
-	540 - Fan			32
-	541 - Steam Riser		30
-	550 - Yellow Spring		28
-	551 - Red Spring		79
-	552 - Blue Spring		5004
-	553 - Yellow Spring Down	65
-	554 - Red Spring Down		66
-	555 - Yellow Diagonal Spring	2015
-	556 - Red Diagonal Spring	38
-	557 - Yellow Diag Spring Down	20
-	558 - Red Diag Spring Down	39
-
-600 - 699 : Special placement patterns
-	600 - Vertical Rigns - Stack of 5 (suitable for Yellow Spring)	84
-	601 - Vertical Rings - Stack of 5 (suitable for Red Spring)	44
-	602 - Diagonal rings (5)					76
-	603 - Diagonal rings (10)					77
-	604 - A ring of rings						47
-	605 - A BIGGER ring of rings					2007
-	606 - A ring of wing items					2048
-	607 - A BIGGER ring of wing items				2010
-	608 - A ring of rings and wings (alternating)			2046
-	609 - A BIGGER ring of rings and wings (alternating)		2047
-
-700 - 799 : Powerup indicators/environmental effects/miscellany
-	700 - Ambient Water 1a (S)	2026
-	701 - Ambient Water 1b (S)	2024
-	702 - Ambient Water 2a (M)	2023
-	703 - Ambient Water 2b (M)	2045
-	704 - Ambient Water 3a (L)	83
-	705 - Ambient Water 3b (L)	2019
-	706 - Ambient Water 4a (XL)	2025
-	707 - Ambient Water 4b (XL)	27
-	708 - Random Ambient 1		14
-	709 - Random Ambient 2		43
-	750 - Chaos Spawner		8
-	751 - Teleport Point		5003
-	752 - Alternate View Point	5007
-	753 - Zoom Tube Waypoint	18
-	754 - Pusher			5001
-	755 - Puller			5002
-	756 - Street Light		2003
-	
-800 - 899 : Greenflower Scenery
-	800 - Flower 1			36
-	801 - Flower 2			70
-	802 - Flower 3			73
-	804 - Berry Bush		74
-	805 - Bush			75
-
-900 - 999 : Techno Hill Scenery
-	900 - THZ Plant			2035
-	901 - Alarm			2006
-
-1000 - 1099 : Deep Sea Scenery
-	1000 - Gargoyle			81
-
-1100 - 1199 : Castle Eggman Scenery
-	1100 - Ceiling Chain		49
-	1101 - Torch Flame		24
-	1102 - Eggman Statue		52
-	1103 - CEZ Flower		2001
-
-1200 - 1299 : Arid Canyon Scenery
-1300 - 1399 : Red Volcano Scenery
-1400 - 1499 : Dark City Scenery
-1500 - 1599 : Doom Ship Scenery
-1600 - 1699 : Egg Rock/Final Fight Scenery
-1700 - 1799 : NiGHTS Items
-	1700 - Axis			72
-	1701 - Axis Transfer (Normal)	61
-	1702 - Axis Transfer (Line)	46
-	1703 - Nights Drone		60
-	1704 - Nights Bumper		82
-	1705 - Hoop			57
-	1706 - Nights Wing		37
-	1707 - Super Loop Powerup	3007
-	1708 - Drill Refill Powerup	3008
-	1709 - Helper Powerup		3009
-	1710 - Egg Capsule		40
-
-1800 - 1849 : Mario Items
-	1800 - Coin			10005
-	1801 - Goomba			10000
-	1802 - Blue Goomba		10001
-	1803 - FireFlower		50
-	1804 - Shell			10
-	1805 - Puma			29
-	1806 - Koopa			19
-	1807 - Axe			12
-	1808 - Mario Bush 1		10002
-	1809 - Mario Bush 2		10003
-	1810 - Toad			10004
-
-1850 - 1899 : Christmas Items
-	1850 - Xmas Pole		5
-	1851 - Candy Cane		13
-	1852 - Snowman			6
-
-1900 - 1999 : Misc Scenery
-	1900 - Stalagmite 0
-	1901 - Stalagmite 1
-	1902 - Stalagmite 2
-	1903 - Stalagmite 3
-	1904 - Stalagmite 4
-	1905 - Stalagmite 5
-	1906 - Stalagmite 6
-	1907 - Stalagmite 7
-	1908 - Stalagmite 8
-	1909 - Stalagmite 9

doc/Linedef Ranges.txt

@@ -1,223 +0,0 @@
-	Description	OldNum	NewNum	Description
-	Old Water 	14	Removed	
-
-	Level Parameters/Misc:			
-	Per-Sector Gravity 	64	1	
-	Custom Exit 	71	2	
-	Zoom Tube Parameters 	18	3	
-	Speed Pad 	65	4	
-	Camera Scanner 	63	5	
-	Disable Linedef 	73	6	
-	Flat Alignment 	66	7	
-	Sector Special Parameters	New	8	
-	Mace Parameters	New	9	
-	Sprite Cull Height	New	10	
-	Rope Hang Parameters	New	11
-	Rock Spawner Parameters	New	12
-
-	PolyObjects
-	Marks first line in PolyObject	New	20
-	Explicitly includes a PolyObject line	New	21
-	PolyObject: Parameters	New	22
-	PolyObject: Waving Flag	New	31
-
-	Level-Load Effects:		
-	Instant Floor Lower 	26	50
-	Instant Ceiling Raise 	24	51
-	Continuously Falling Sector 	88	52
-	Continuous Floor/Ceiling Mover 	2	53
-	Continuous Floor Mover 	3	54
-	Continuous Ceiling Mover 	4	55
-	Continuous Two-Speed Floor/Ceiling Mover 	6	56
-	Continuous Two-Speed Floor Mover 	7	57
-	Continuous Two-Speed Ceiling Mover 	8	58
-	Activate Floating Platform 	232	59
-	Activate Floating Platform (Adjustable Speed) 	233	60
-	Crusher 1 (Ceiling to Floor) 	43	61
-	Crusher 2 (Floor to Ceiling) 	50	62
-	Fake Floor/Ceiling	242	63
-	Appearing/Disappearing FOF	New	64
-	Bridge Thinker	New	65
-
-	Floor Over Floors:		
-	"Floor Over Floor: Solid, Opaque, Shadowcasting "	25	100
-	"Floor Over Floor: Solid, Opaque, Non-Shadowcasting "	33	101
-	"Floor Over Floor: Solid, Translucent "	44	102
-	"Floor Over Floor: Solid, Sides Only "	69	103
-	"Floor Over Floor: Solid, No Sides "	51	104
-	"Floor Over Floor: Solid, Invisible "	57	105
-
-	"Floor Over Floor: Water, Opaque "	48	120
-	"Floor Over Floor: Water, Translucent "	45	121
-	"Floor Over Floor: Water, Opaque, No Sides "	75	122
-	"Floor Over Floor: Water, Translucent, No Sides "	74	123
-
-	"Floor Over Floor: Platform, Opaque "	59	140
-	"Floor Over Floor: Platform, Translucent "	81	141
-	"Floor Over Floor: Platform, Translucent, No Sides "	77	142
-
-	Floor Over Floor: Bobbing (Air) 	38	150
-	Floor Over Floor: Adjustable Bobbing (Air) 	68	151
-	Floor Over Floor: Reverse Adjustable Bobbing (Air) 	72	152
-
-	"Floor Over Floor: Floating, Bobbing "	34	160
-
-	Floor Over Floor: Crumbling (Respawn) 	36	170
-	Floor Over Floor: Crumbling (No Respawn) 	35	171
-	"Floor Over Floor: Crumbling (Respawn), Platform  "	79	172
-	"Floor Over Floor: Crumbling (No Respawn), Platform  "	80	173
-	"Floor Over Floor: Crumbling (Respawn), Platform, Translucent "	82	174
-	"Floor Over Floor: Crumbling (No Respawn), Platform, Translucent "	83	175
-	"Floor Over Floor: Crumbling (Respawn), Floating, Bobbing "	39	176
-	"Floor Over Floor: Crumbling (No Respawn), Floating, Bobbing "	1	177
-	"Floor Over Floor: Crumbling (Respawn), Floating "	37	178
-	"Floor Over Floor: Crumbling (No Respawn), Floating "	42	179
-	"Floor Over Floor: Crumbling (Respawn), Bobbing (Air) "	40	180
-
-	"Floor Over Floor: Rising Platform, Solid, Opaque, Shadowcasting "	89	190
-	"Floor Over Floor: Rising Platform, Solid, Opaque, Non-Shadowcasting "	90	191
-	"Floor Over Floor: Rising Platform, Solid, Translucent "	91	192
-	"Floor Over Floor: Rising Platform, Solid, Invisible "	94	193
-	"Floor Over Floor: Rising Platform, Platform, Opaque "	92	194
-	"Floor Over Floor: Rising Platform, Platform, Translucent "	93	195
-
-	Floor Over Floor: Light Block 	49	200
-	Floor Over Floor: Half Light Block 	47	201
-	Floor Over Floor: Fog Block 	46	202
-
-	"Floor Over Floor: Intangible, Opaque "	62	220
-	"Floor Over Floor: Intangible, Translucent "	52	221
-	"Floor Over Floor: Intangible, Sides Only "	67	222
-	"Floor Over Floor: Intangible, Invisible "	58	223
-
-	Floor Over Floor: Mario Block 	41	250
-	Floor Over Floor: Thwomp Block 	54	251
-	Floor Over Floor: Shatter Block 	76	252
-	"Floor Over Floor: Shatter Block, Translucent "	86	253
-	Floor Over Floor: Bustable Block 	55	254
-	Floor Over Floor: Spin Bust Block 	78	255
-	"Floor Over Floor: Spin Bust Block, Translucent "	84	256
-	Floor Over Floor: Quicksand Block 	56	257
-	Floor Over Floor: Laser Block 	53	258
-	Floor Over Floor: Custom 	87	259
-
-	Linedef Executor Triggers:		
-	Trigger Linedef Executor (Continuous) 	96	300
-	Trigger Linedef Executor (Each Time) 	97	301
-	Trigger Linedef Executor (Once) 	98	302
-	Trigger Linedef Executor (Ring Count - Continuous) 	95	303
-	Trigger Linedef Executor (Ring Count - Once) 	99	304
-	Trigger Linedef Executor (Character Ability - Continuous) 	19	305
-	Trigger Linedef Executor (Character Ability - Each Time) 	20	306
-	Trigger Linedef Executor (Character Ability - Once) 	21	307
-	"Trigger Linedef Executor (Race Only, Once) "	9	308
-	Trigger Linedef Executor (CTF Red Team - Continuous) 	10	309
-	Trigger Linedef Executor (CTF Red Team - Each Time) 	11	310
-	Trigger Linedef Executor (CTF Blue Team - Continuous) 	12	311
-	Trigger Linedef Executor (CTF Blue Team - Each Time) 	13	312
-	Trigger Linedef Executor (No More Enemies - Once) 	15	313
-	Trigger Linedef Executor (# of Pushables - Continuous)	New	314
-	Trigger Linedef Executor (# of Pushables - Once)	New	315
-	Trigger Linedef Executors (PolyObject - Land On)	New	316
-	Trigger Linedef Executor (Level Load)	New	399
-
-	Linedef Executor Options:		
-	Linedef Executor: Set Tagged Sector's Floor Height/Pic 	101	400
-	Linedef Executor: Set Tagged Sector's Ceiling Height/Pic 	102	401
-	Linedef Executor: Set Tagged Sector's Light Level 	103	402
-	Linedef Executor: Move Tagged Sector's Floor 	106	403
-	Linedef Executor: Move Tagged Sector's Ceiling 	107	404
-	Linedef Executor: Lower Floor by Line 	108	405
-	Linedef Executor: Raise Floor by Line 	109	406
-	Linedef Executor: Lower Ceiling by Line 	110	407
-	Linedef Executor: Raise Ceiling by Line 	111	408
-	Linedef Executor: Change Calling Sector's Tag 	112	409
-	Linedef Executor: Change Front Sector's Tag 	114	410
-	Linedef Executor: Stop Plane Movement 	116	411
-	Linedef Executor: Teleport Player to Tagged Sector 	104	412
-	Linedef Executor: Change Music 	105	413
-	Linedef Executor: Play SFX 	115	414
-	Linedef Executor: Run Script 	113	415
-	Linedef Executor: Start Adjustable Fire Flicker 	119	416
-	Linedef Executor: Start Adjustable Glowing Light 	120	417
-	Linedef Executor: Start Adjustable Strobe Flash (unsynchronized)	New	418
-	Linedef Executor: Start Adjustable Strobe Flash (synchronized)	New	419
-	Linedef Executor: Fade Light Level 	117	420
-	Linedef Executor: Stop Lighting Effect 	118	421
-	Linedef Executor: Cut-Away View 	121	422
-	Linedef Executor: Change Sky 	123	423
-	Linedef Executor: Change Weather 	124	424
-	Linedef Executor: Change Object State 	125	425
-	Linedef Executor: Stop Object 	122	426
-	Linedef Executor: Award Score 	126	427
-	Linedef Executor: Start Platform Movement 	127	428
-	Linedef Executor: Crush Ceiling Once	New	429
-	Linedef Executor: Crush Floor Once	New	430
-	Linedef Executor: Crush Floor & Ceiling Once	New	431
-	Linedef Executor: Enable 2D Mode	New	432
-	Linedef Executor: Disable 2D Mode	New	433
-	Linedef Executor: Award Custom Power	New	434
-	Linedef Executor: Stop Conveyor	New	435
-	Linedef Executor: Start Conveyor	New	436
-	Linedef Executor: Disable Player Movement	New	437
-
-	Linedef Executor: Execute Linedef Executor	New	450
-
-	Linedef Executor: PolyObject: Door Slide	New	480
-	Linedef Executor: PolyObject: Door Swing	New	481
-	Linedef Executor: PolyObject: Move XY	New	482
-	Linedef Executor: PolyObject: Move XY w/ override	New	483
-	Linedef Executor: PolyObject: Rotate Right	New	484
-	Linedef Executor: PolyObject: Rotate Right w/ override	New	485
-	Linedef Executor: PolyObject: Rotate Left	New	486
-	Linedef Executor: PolyObject: Rotate Left w/ override	New	487
-	Linedef Executor: PolyObject: Start waypoint movement	New	488
-	Linedef Executor: PolyObject: Make Invisible	New	489
-	Linedef Executor: PolyObject: Make Visible	New	490
-
-	Scrollers/Pushers:		
-	Scroll Wall First Side Left 	100	500
-	Scroll Wall First Side Opposite Direction 	85	501
-	Scroll Wall According to Linedef 	254	502
-	Acc Scroll Wall According to Linedef 	218	503
-	Disp Scroll Wall According to Linedef 	249	504
-	Scroll Texture by Offsets 	255	505
-
-	Scroll Floor Texture 	251	510
-	Acc Scroll Floor Texture 	215	511
-	Disp Scroll Floor Texture 	246	512
-	Scroll Ceiling Texture 	250	513
-	Acc Scroll Ceiling Texture 	214	514
-	Disp Scroll Ceiling Texture 	245	515
-
-	Carry Objects on Floor (no scroll)	252	520
-	Acc Carry Objects on Floor 	216	521
-	Disp Carry Objects on Floor 	247	522
-	Carry Objects on Ceiling 	203	523
-	Acc Carry Objects on Ceiling 	205	524
-	Disp Carry Objects on Ceiling 	201	525
-
-	Scroll Floor Texture and Carry Objects 	253	530
-	Acc Scroll Floor Texture and Carry Objects 	217	531
-	Disp Scroll Floor Texture and Carry Objects 	248	532
-	Scroll Ceiling Texture and Carry Objects 	202	533
-	Acc Scroll Ceiling Texture and Carry Objects 	204	534
-	Disp Scroll Ceiling Texture and Carry Objects 	200	535
-
-	Friction 	223	540
-	Horizontal Wind 	224	541
-	Upwards Wind 	229	542
-	Downwards Wind 	230	543
-	Horizontal Current 	225	544
-	Upwards Current 	227	545
-	Downwards Current 	228	546
-	Boom Push/Pull Thing 	226	547
-
-	Lighting:		
-	Floor Lighting 	213	600
-	Ceiling Lighting 	5	601
-	Adjustable Pulsating Light 	60	602
-	Adjustable Flickering Light 	61	603
-	Adjustable Blinking Light (unsynchronized)	New	604
-	Adjustable Blinking Light (synchronized)	New	605
-	Colormap 	16	606

doc/Sector Ranges.txt

@@ -1,78 +0,0 @@
-Removed:
-	- Buttons 1-20					690-709
-	- Button 21 (THZ2 A/740 B/741 D/742 E/745	710
-	- Close Door Blazing (Tag 743)			711
-	- Raise Ceiling to Highest (Tag 744)		981
-	- THZ2 Slime Raise (B/712 W713 P714 D715 S716)	986
-
-Stuff to Remove/Change:
-	- Light Blinks On Every 0.5 Seconds		2 Add Linedef Combine
-	- Light Blinks On Every 1 Second		3 Add Linedef Combine
-	- Light Pulses Smoothly			8 Remove
-	- Light Blinks On Every 0.5 Seconds (Sync)	12 Add Linedef Combine
-	- Lights Blinks On Every 1 Second (Sync)	13 Add Linedef Combine
-	- Light Flickers Like Fire			17 Remove
-	? - Damage (Fire) and Current			519 Remove (convert to combination)
-	? - Damage (Water) and Current			984 Remove (convert to combination)
-
-Section 1:
-	1 - Damage (Generic)				11
-	2 - Damage (Water)				983
-	3 - Damage (Fire)				7
-	4 - Damage (Electrical)				18
-	5 - Spikes					4
-	6 - Death Pit (Camera Mod)			16
-	7 - Death Pit (No Camera Mod)			5
-	8 - Instant Kill				10
-	9 - Ring Drainer (Floor Touch)			978
-	10 - Ring Drainer (No Floor Touch)		980
-	11 - Special Stage Damage			9
-	12 - Space Countdown				6
-	13 - Ramp Sector (Increase step-up)		992
-	14 - Non-Ramp Sector (Don't step-down)		996
-	15 - Bouncy Sector (FOF Control Only)		14
-
-Section 2:		<< 4
-	1 - Trigger Linedef Exec (Pushable Objects)	971
-	2 - Trigger LD Exec (Anywhere in Sec/All Pls)	972
-	3 - Trigger Linedef Exec (Floor Touch/All Pls)	973
-	4 - Trigger Linedef Exec (Anywhere in Sec)	974
-	5 - Trigger Linedef Exec (Floor Touch)		975
-	6 - Trigger Linedef Exec (Emerald Check)	967
-	7 - Trigger Linedef Exec (NiGHTS Mare)		968
-	8 - Check for linedef executor on FOFs (ANY)	970
-	9 - Egg Trap Capsule				666
-	10 - Special Stage Time/Rings, Par		990
-	11 - Custom Global Gravity			991
-
-Section 3:		<< 8
-	1 - Ice/Sludge (required?!)			256
-	2 - Wind/Current (required?!)			512
-	3 - Ice/Sludge and Wind/Current			768
-	4 - Conveyor Belt				985
-	5 - Speed Pad (No Spin)				976
-	6 - Speed Pad (Spin)				977
-	7 - Bustable Block Sprite Parameter		1500-1515
-	8 - "
-	9 - "
-	10 - "
-	11 - "
-	12 - "
-	13 - "
-	14 - "
-	15 - "
-
-Section 4:		<< 12
-	1 - Starpost Activator				993
-	2 - Special Stage Goal	Combine			33
-	2 - Exit Sector		Combine			982
-	2 - No Tag Zone		Combine			987
-	2 - CTF: Flag Return	Combine			995
-	3 - CTF: Red Team Base				988
-	4 - CTF: Blue Team Base				989
-	5 - Fan Sector					997
-	6 - Super Sonic Transform			969
-	7 - Spinner					979
-	8 - Zoom Tube Start				998
-	9 - Zoom Tube End				999
-	10 - Finish Line				994

doc/faq.txt

@@ -1,307 +0,0 @@
- SRB2
- Release v1.09, ? 2005.
-
- Last Updated: June 2005
-
- Original game & sources by: Id Software.
- Additions: (c)1998 by: Fabrice Denis & Boris Pereira
-            (c)1999 by: Fabrice Denis, Boris Pereira & Thierry Van Elsuwe
-            (c)2000 by: Boris Pereira & Thierry Van Elsuwe
-            (c)2004 By: AJ, Graue, Alam Arias, Logan Arias & Andrew Clunis
-
- Special thanks to Steven McGranahan,  Lee Killough, Robert Bäuml and Bell Kin for
- their large contribution and to other DooM LEGACY & SRB2 Team members.
-
- Web site: http://www.SRB2.org/
-   e-mail: none@none.com
-
- OpenGL specific:
- Web site: http://legacy.newdoom.com/gl
-
-
- -----------------------------------------------------------------------
- F.A.Q.
- -----------------------------------------------------------------------
-
-
- If you have any trouble with SRB2, you might find a solution
- here.
-
- If you find a solution to a problem that was not listed here,
- please tell us so that we can update the FAQ and help other people!
-
- Mail your hardware/software problems to:
-
- None@none.com subject: FAQ
-
-
- --------
- CONTENTS
- --------
-
- [0] Miscellaneous
- [1] Mouse/Joystick/Keyboard
- [2] Video
- [3] Sound
- [4] Network
- [5] Troubleshooting
-
-
- -----------------
- [0] MISCELLANEOUS
- -----------------
-
- * under win95 or OS/2, I don't have enough memory. How can i handle with ?
-
-   Tell win95 to put more dpmi memory for your dos box.
-   Or use the -mb option.
-
-
-
- ---------------------------
- [1] MOUSE/JOYSTICK/KEYBOARD
- ---------------------------
-
- * My mouse/joystick does not work in SRB2.
-
-   First, check that the mouse/joystick is activated : go at the
-   console and type either 'use_mouse' (or use the respective
-   menuitem) or 'use_joystick'.
-
-   If it tells '0' or off than the mouse/joystick is not used,
-   set the variable to 1. eg: 'use_mouse 1'.
-
-   For the joystick, different values will support different
-   types of joystick, check the console documentation for the
-   command 'use_joystick' for more.
-
-   Even if the mouse or joystick is activated, you have to
-   set up the contols into the Setup Controls menu. That is:
-   tell what use you will make of the mouse/joystick buttons.
-
-
- ---------
- [2] VIDEO
- ---------
-
-
- * Where are the other video modes ? I have only '320x200' in the
-   Video Modes menu.
-
-   DOS
-   ---
-
-   SRB2 adds new video modes only if a VESA2 (or better) driver
-   is present. The VESA2 driver is a standard of 'talking' between a
-   program and the huge amount of different graphics cards
-   available today.
-
-   If you don't have a VESA2 driver, you can download UNIVBE, or
-   SMART DISPLAY DOCTOR from
-
-   http://www.scitechsoft.com/products/ent/free_titles.html
-
-   or if you have an S3 based card, you can download the free
-   software called 'S3VBE'.
-
-   ftp://ftp.externet.hu/pub/mirror/sac/graph/s3vbe318.zip
-   ftp://ftp.digsys.bg/pub/simtelnet/msdos/graphics/s3vbe318.zip
-   http://www.filesearching.com/cgi-bin/s?q=s3vbe318.zip
-   http://www.google.com/search?q=s3vbe318.zip
-
- * The game doesn't restore the video mode I have chosen the last time
-   I played SRB2.
-
-   The current video mode has to be made the 'default' so that it is
-   saved to the config : press the key 'D' on the Video Options menu
-   to set the current video mode the default.
-
-  * I have some problems with OpenGL mode
-
-   Have a look at the FAQ for OpenGL on the glLegacy web site:
-
-   http://www.doomnation.com/gllegacy/faqe.htm
-
- # Linux: I only have a 1024x768 (or 800x600, 1280x1024, ...) resolution
-   in fullscreen mode under X and SRB2 is really really slow. Can I
-   have lower resolutions like 320x200 in fullscreen mode as well?
-
-   Probably yes. SRB2 can only use the resolutions offered by the
-   X-Server. So if all fullscreen modes have a very high resolution you
-   have to modify /etc/XF86Config (or /etc/X11/XF86Config). Use XF86Setup
-   (or the appropriate tool coming with your distribution - sax,
-   xf86config, ...) to do this.
-   If you do not succeed there, you can enter them manually into your
-   XF86Config file. ONLY RECOMMENDED FOR USERS WHO KNOW WHAT THEY DO!
-   For a short guide on how to do this, have a look at the file
-   "Doublescan.txt".
-   In case of doubt consult the XFree86-HOWTO (or ask your system
-   administrator :).
-
- # Linux: I cannot have any fullscreen modes at all!
-
-   You have only modes above 1024x768 in your XF86Config. Proceed as
-   described above.
-
- # Linux: After a certain idle time my screensaver jams the display of
-   SRB2. I can still operate SRB2, but I do not see what's happening
-   and the screensaver won't go away.
-
-   You probably have KDE. The KDE screensaver does not obey the screensaver
-   rules (at least mine, version 1.1). The solution is to deactivate the
-   KDE screensaver and use another screensaver (like the xscreensaver,
-   e.g.). But the hell, when you started SRB2 you should have played it
-   as well and not left it alone!!!
-
- ---------
- [3] SOUND
- ---------
-
- + DOS:I can't have CD audio music, why ?
-
-   Make sure that the MSCDEX driver version 2.0 or later is loaded.
-   If it says 'MSCDEX version xxx' at game startup, and you still
-   don't hear the cd music, then probably your card doesn't respond
-   when SRB2 tries to set the cd volume. If so, make sure your sound
-   card's mixer have the cd volume set up so that you can hear something.
-
- + When the CD plays, the game is very 'jerky'. It doesn't do that when
-   I type 'cd off' in the console.
-
-   You have an old/bad cd driver, that can take up to a second to
-   respond to cd driver commands. Either get the latest version of
-   your driver, or turn cd update off. Check 'cd_udpate' in the
-   console documentation for more.
-
- * DOS:How can I *ALWAYS* disable the sounds or music of the game ?
-
-   Edit the allegro.cfg file and set digicard/midicard to 0 (none)
-
- * DOS:My sterero sound is reversed, how can I set it the right way ?
-
-   Change the console variable 'stereoreverse' to either 1 or 0.
-   Or, you can edit the allegro.cfg file, and set the 'flip_pan' variable.
-
-
- * DOS:The sounds are too 'slow', or 'low-pitched'
-
-   It seems to be a problem of the auto-detection of some 8bit sound
-   cards. You will have to set manually the 'sb_freq' value in the
-   allegro.cfg file to a lower value : 11906, 16129.
-
- * DOS:SRB2 doesn't play any sound/music, but I have a sound
-   blaster genuine/compatible card.
-
-   If you have a genuine or compatible SoundBlaster card, it is very
-   important that you set the BLASTER environment variable.
-
-   If you are playing under DOS, and never installed your sound card
-   under DOS, run the setup of your sound card for DOS.
-
-   Check if the BLASTER variable was set: type 'SET' under dos
-   (or DOSbox)
-
-   Do you see something like 'BLASTER=A220 I5 D1 ...' ?
-
-   Yes? If you don't hear sounds/music, then tweak the settings in the
-   allegro.cfg file until you get something, first try changing the
-   type of the sound card, it is not always properly detected.
-
-   No? You have to set this variable in order that your sound card is
-   detected. Run the setup that was shipped with your sound card, and
-   make sure you run the setup for DOS too, it will usually add a
-   line of the type 'SET BLASTER=... ...' in the autoexec.bat file.
-
-
- * DOS:How can I have better midi music on my 8bit sound card ?
-
-   Use the DIGMID driver, it is supported in SRB2.
-
-   What the hell is this? Well, the Gravis Ultrasound uses digital
-   samples to play midi music. On a simple 8bit card, you can use digital
-   samples too, which will sound usually better than what is output
-   by the poor fm synthesis chip of 8bit cards.
-
-   You will need to get a Gravis Ultrasound patch set, you can find
-   several ones for free on internet, it consists of a bunch of '.pat'
-   files which are the digital samples to play the midi instruments
-   (eg: piano, conga, guitar, ect.).
-
-   Check the Allegro homepage for some links to GUS patches:
-   http://alleg.sourceforge.net/digmid.html
-   http://alleg.sourceforge.net/
-   http://www.talula.demon.co.uk/allegro/digmid.html
-   http://www.talula.demon.co.uk/allegro/
-
-   Now to activate the DIGMID driver:
-
-   Set the 'midi_card' value to 8 (DIGMID) in the allegro.cfg file.
-   Make sure you leave the 'digi_voices' blank, or set it to a low
-   value, because the midi music will use digital voices.
-   At the end of the allegro.cfg file, set the 'patches' value
-   to the path, where you have installed a Gravis Ultrasound midi
-   patch set. eg: patches = d:\music\midipat\
-
- # Linux: CD music does not work or only works when run as root.
-
-   We do not encourage you to run SRB2 as root (you never know
-   what SRB2 can do to your system - it's a mighty piece of code :).
-   There is a common problem with ATAPI CD-rom drives, which are
-   treated as harddisks. Usually there is a link /dev/cdrom pointing to
-   device hd[b,c,d]. As harddisks are not supposed to be read directly
-   via this device (especially not by a common user), there are no read
-   permissions for "all". For CD-roms you can savely set read permissions
-   unless you are very paranoid. Assuming your CD-rom drive is /dev/hdc,
-   set permissions with "chmod +r /dev/hdc" (as root). SCSI CD-rom drives
-   should not have this problem. But if they do, proceed as described
-   with ATAPI drives.
-
- # Linux: The CD music volume is not set properly.
-
-   Go to the console and type "jigglecdvolume 1".
-
- -----------
- [4] NETWORK
- -----------
-
- * Where can I find Internet servers ?
-
-   For the moment there is one public server.
-   http://srb2.servegame.org/ Master server web page
-   srb2.servegame.org:28910 current Master Server
-
- * When I start SRB2 with -server or -connect it say :
-    "BinToPort: Address already in use (EADDRINUSE)"
-
-   It appears only when SRB2 crashes or when you leave with ctrl-break.
-   use -udpport 12345 (or any other free slot) on both sides (client and
-   server).
-
-   This can also happens when there is already a SRB2 running on your
-   computer if you whant to try two SRB2 running on the same computer
-   use -clientport 12345 (or any other free slot). Then the second will
-   connect to the first one.
-
- * Do you use the tcp protocol ?
-
-   No, we use the udp protocol which is faster, but don't worry udp is a
-   part of the internet protocol.
-
-
- -------------------
- [5] Troubleshooting
- -------------------
-
- # Linux: SRB2 is hung in fullscreen mode and won´t let me leave.
-   What shall I do?
-
-   Some people press the reset button, but hey, we are not in the
-   stoneage of operating systems! There are two "proper" ways to
-   get out: kill your X-Server. You can usually do this by pressing
-   "CTRL-ALT-BACKSPACE". But if you have other open applications with
-   important data (probably hacked away on your diploma thesis for 3
-   weeks without saving once) you can also kill SRB2 directly. Press
-   "CTRL-ALT-F2" and you will get to a console. Log in, type
-   "killall llxSRB2" and switch back to the X-Server with "CTRL-ALT-F7".
-   Some X-Server crash on this procedure - blame the X-Server for the
-   loss of 3 weeks work on your diploma thesis :)

doc/manual/manual.htm

@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<title>
-		Sonic Robo Blast 2 Manual
-	</title>
-	<link rel="stylesheet" type="text/css" href="srb2manstyle.css">
-	<!-- Borrowed some javascript code so the height of the iframe is equal to the size of the document - Sonict -->
-	<script type="text/javascript">
-	/* free code from dyn-web.com */
-
-	function getDocHeight(doc) {
-		doc = doc || document;
-		// from http://stackoverflow.com/questions/1145850/get-height-of-entire-document-with-javascript
-		var body = doc.body, html = doc.documentElement;
-		var height = Math.max( body.scrollHeight, body.offsetHeight,
-			html.clientHeight, html.scrollHeight, html.offsetHeight );
-		return height;
-}
-
-	function setIframeHeight(id) {
-		var ifrm = document.getElementById(id);
-		var doc = ifrm.contentDocument? ifrm.contentDocument: ifrm.contentWindow.document;
-		ifrm.style.visibility = 'hidden';
-		ifrm.style.height = "10px"; // reset to minimal height in case going from longer to shorter doc
-		ifrm.style.height = getDocHeight( doc ) + "px";
-		ifrm.style.visibility = 'visible';
-	}
-	</script>
-	<meta http-equiv="Content-type" content="text/html; charset=UTF-8">
-</head>
-<body>
-	<p class="c1">
-		<img src="manual_img/sonicname2.png" alt="SONIC" width="136" height="36">
-		<br>
-		<img src="manual_img/srb2banner.png" alt="ROBO BLAST 2" width="224" height="43">
-	</p>
-	<p class="c1">
-		<big><big><strong>Manual</strong></big></big>
-	</p>
-	<table class="cf" align="center">
-		<tr><td class="c">
-		<ul class="hmenu">
-			<li class="hmenu"><a class="hmenu" href="intro.htm" target="ifrm">Main</a></li>
-			<li class="hmenu"><a class="hmenu" href="items.htm" target="ifrm">Items</a></li>
-			<li class="hmenu"><a class="hmenu" href="playerabilities.htm" target="ifrm">Player Abilities</a></li>
-			<li class="hmenu"><a class="hmenu" href="basicplay.htm" target="ifrm">Gameplay</a></li>
-			<li class="hmenu"><a class="hmenu" href="surroundings.htm" target="ifrm">Surroundings</a></li>
-		</ul>
-		</td></tr>
-		<tr><td class="c">
-		<ul class="hmenu">
-			<li class="hmenu"><a class="hmenu" href="multiplayer.htm" target="ifrm">Multiplayer</a></li>
-			<li class="hmenu"><a class="hmenu" href="zones.htm" target="ifrm">Zones</a></li>
-			<li class="hmenu"><a class="hmenu" href="controls.htm" target="ifrm">Controls</a></li>
-			<li class="hmenu"><a class="hmenu" href="consolecommands.htm" target="ifrm">Console Commands</a></li>
-			<li class="hmenu"><a class="hmenu" href="misc.htm" target="ifrm">Misc</a></li>
-		</ul>
-		</td></tr>
-	</table>
-	<hr>
-	<p class="c1">
-		<!-- The "onload" property of the iframe makes an error when validated through the W3C validation checker. -->
-		<!-- This will not be fixed as it isn't worth the time to fix it up properly. - Sonict -->
-		<iframe id="ifrm" name="ifrm" src="intro.htm" onload="setIframeHeight(this.id)"> </iframe>
-	</p>
-</body>
-</html>

doc/rules.txt

@@ -1,39 +0,0 @@
-SVN-RULES
-
-- As you can see, there is sub-directory in the repository, one for eatch
-  platform (djgpp (dos),win32,SDL) the root directory is for all platform,
-  so take care of the order we have put in.
-- do not commit/upload tests of bugged code, try to fix a maximum of know
-  bugs and update know bugs list in source.txt. If you must commit your source
-  make your code in #ifdef so we can disable it
-- SRB2 is a modification of doom/Doom Legacy source. We allow additionnal feature
-  and visual addition.
-- Maximize communications between members, do not impose your changes, if your
-  are not sure about a feature/change, talk about it in irc://irc.esper.net/srb2 chat room.
-
-CODE-RULES
-
-- We use no tab, 4 space indent, and tab size 8 (in case some tab have filtred
-  and for makefile)
-- Self documented code, variable and function must have a name that help
-  understand the code, so do not call variable and function a,b, a2, ...
-- the usage of extern in a c file is prohibited, except for declaration of a
-  function with body (so it is like public keyword in c++)
-  Also function protos haren't allowed for external function, put it un the
-  corresponding h file.
-- Try to minimize #ifdef usage for :
-  - code readability
-  - the main code is for all port so if something is good for a platform all
-    platform can benefit by this feature
-- Take care of platform dependent code, we would like to have code that work
-  on Dos, Win32, SDL, ... little and big endian, software/Glide/OpenGl.
-
-GOOD PRACTICE
-
-- Try to put as mush static variable and function on module so it help to
-  understand the role of the varaible/function in the module also this
-  help the compiler to optimize
-- minimise global variable
-- make a log of your work, so you don't need to put a lot of comment in
-  the code, this will also help us to update the what's new section of doc
-  when doing final release

doc/source.txt

@@ -1,240 +0,0 @@
-
-1. Compile SRB2
-2. Explanation of the code
- 2.1 The memory model
- 2.2 Hardware Texture model
-
-1. Compile SRB2
-=================
-
-DOS
----
-
-need:
-- djgpp 2.03     (http://www.delorie.com/djgpp/)
-- allegro 3.12   (http://alleg.sourceforge.net/index.html)
-(
-- libsocket 0.7.4 (beta 4) or better
-   for use with Winsock 1.1 (example Windows 3.1)
-  (http://www.phekda.freeserve.co.uk/richdawe/lsck/lsck.htm)
-   OR
-- Wattcp-32 v2.2 dev.rel 6 or better
-   For use with a packet driver
-  (http://www.bgnett.no/~giva/)
-  (http://groups.yahoo.com/group/watt-32/)
-  (http://groups.yahoo.com/group/watt-32/files/v2.2/)
-)
-- bcd 1.03 (inlcude in this package)
-- gcc 2.95.2 is recommended
-- nasm 0.98 (or better)     (http://nasm.sourceforge.net/)
-
-compile:
-make
-make WATTCP=1 (to make a Wattcp-32 version)
-
-debug:
-when craching SRB2 will return eip
-type make asm, then you will have a 8 megs srb2.s (a assembler file)
-the you can find the faulting instruction and function
-
-------------------------------------------------------------------------
-
-Linux/SDL
------
-
-need:
-- tested with gcc 2.95 and 3.X.
-- SDL 1.2
-- SDL_mixer 1.2
-- ibogg and libvorbis (http://Xiph.org/)
-- nasm 0.98 (or better)(http://nasm.sourceforge.net/) only with 2.95, else add CC30=1
-
-compile
-make LINUX=1
-
-debug:
-gdb ?
-
-------------------------------------------------------------------------
-
-Win32
------
-
-need :
-- glide 3.x sdk (optional)  (http://www.3dfx.com)
-- directx6 sdk (or higher)  (http://www.micosoft.com/directx)
-- nasm 0.98 (or better)     (http://nasm.sourceforge.net/)
-- use src\win32\wLegacy.dsp
-- VC6 should also work with VC5, and VS.NET 200X
-
-debug:
-press on "step over" with the release version (there is some debug info
-on it). Then change the eip in the regster window when you will type
-enter the edi will go to the faulting instruction. don't forget that
-you can follow the stack for calls.
-You can also use trace with the debug version but add -win and -nomouse.
-
-------------------------------------------------------------------------
-
-Win32/minGW/SDL
------
-
-need:
-- tested with gcc 2.95 and 3.X.
-- can also use Dev-C++ 5.0 beta 9 (4.9.9.0) from http://www.bloodshed.net/dev/devcpp.html
-- SDL 1.2
-- SDL_mixer 1.2
-
-compile
-make minGW=1 SDL=1
-or use src\SDL\Win32SDL.dev with Dev-C++ 4.9.9.0 or later
-
-debug:
-gdb ?
-
-------------------------------------------------------------------------
-
-WinCE/SDL WIP
------
-
-need:
-- ActiveSync 3.8
- http://www.microsoft.com/windowsmobile/downloads/activesync38.mspx
-
-- ActiveSync 3.7.1, if 3.8 isn't available for your language
- http://www.microsoft.com/windowsmobile/downloads/activesync37.mspx
-
-- eMbedded Visual Tools 3.0 - 2002 Edition
- http://www.microsoft.com/downloads/details.aspx?FamilyID=f663bf48-31ee-4cbe-aac5-0affd5fb27dd
-
-- Pocket PC 2000 SDK
- http://www.microsoft.com/downloads/details.aspx?FamilyID=bb3f4d7b-de2a-4e1a-a175-26a68c301ac4
-
-- Pocket PC 2002 SDK (eMVT 3.0 2002 Ed. comes with this)
- http://www.microsoft.com/downloads/details.aspx?FamilyID=2dbee84a-bd94-4167-b817-2b2e548b2e92
-
-- Pocket PC 2002 SDK Emulator Images (eMVT 3.0 2002 Ed. comes with this)
- http://www.microsoft.com/downloads/details.aspx?FamilyID=25f4de97-ae80-477a-9df1-496b85b3d3e3
-
-- eMbedded Visual C++ 4.0
- http://www.microsoft.com/downloads/details.aspx?familyid=1DACDB3D-50D1-41B2-A107-FA75AE960856
-
-- eMbedded Visual C++ 4.0 SP3 (Win CE 4.0-4.2)
- http://www.microsoft.com/downloads/details.aspx?FamilyID=5bb36f3e-5b3d-419a-9610-2fe53815ae3b
-
-  OR
-
-- eMbedded Visual C++ 4.0 SP4 (No SH3 support,Win CE 4.0-5.0 support)
- http://www.microsoft.com/downloads/details.aspx?FamilyID=4a4ed1f4-91d3-4dbe-986e-a812984318e5
-
-- eMbedded Visual C++ 4.0 Update 5625 (SP4 only)
- http://www.microsoft.com/downloads/details.aspx?FamilyID=aa282a6d-6f57-436d-8c10-0ec02d94f5b1
-
-- Windows CE: Standard Software Development Kit
- http://www.microsoft.com/downloads/details.aspx?familyid=a08f6991-16b0-4019-a174-0c40e6d25fe7
-
-- SDK for Windows Mobile 2003-based Pocket PCs
- http://www.microsoft.com/downloads/details.aspx?FamilyId=9996B314-0364-4623-9EDE-0B5FBB133652
-
-- Emulator Images for Windows Mobile 2003 Second Edition software for Pocket PC
- http://www.microsoft.com/downloads/details.aspx?familyid=5C53E3B5-F2A2-47D7-A41D-825FD68EBB6C
-
-- Microsoft Device Emulator 1.0 Community Preview
- http://beta.microsoft.com Use Guest ID "MSDEVICE" to access the Community Preview website
-
-- Windows CE Utilities for Visual Studio .NET 2003 Add-on Pack 1.1
-  (if you also have VS 2003 installed, you need this to install Win CE 5.0 SDK, else no need)
- http://www.microsoft.com/downloads/details.aspx?FamilyId=7EC99CA6-2095-4086-B0CC-7C6C39B28762
-
-- Windows CE 5.0: Standard Software Development Kit (eMC++ 4 SP4 only)
- http://www.microsoft.com/downloads/details.aspx?FamilyID=fa1a3d66-3f61-4ddc-9510-ae450e2318c3
-
-- SDL 1.27 (use patch and zip in tools\SDL1.2.7_CE)
-
-compile
-use src\SDL\WinCE\SRB2CE.vcw
-
-debug:
-?
-
-
-2. Explanation of the code
-==========================
-
- 2.1 The memory model (original) (z_zone.c) (by BP)
- --------------------
-
- SRB2 allocate a heap of 6/32/48 megs at begining and provide a Z_Malloc function
- to allocate in this heap.
-
-   Z_Malloc( int size,int tag,void* user )
-
-    size is the size in byte
-    tag can be : PU_STATIC   allocated static (like malloc do)
-                             call Z_Free to free it
-                 PU_LEVEL    same as static but the zone is "tagged" with the
-                             tag PU_LEVEL, when calling
-                             Z_FreeTag (PU_LEVEL, PU_LEVEL) all zone tagged
-                             with PU_LEVEL are freed (at the end of the level)
-                 PU_CACHE    this one _can_ be freed automatiquely by one other
-                             call to Z_Malloc. the *user point to a pointer
-                             to this zone so when freed automatiquely the
-                             pointer is set to NULL so eatch time you use it
-                             you must check if the pointer is not NULL and
-                             reload it.
-
- (...)
-
- 2.2 Hardware Texture model (by BP)
- --------------------------
-
- Eatch texture/patch/flats/pic in SRB2 are converted to hardware texture at
- runtime (the GlideMipmap_s structure (hw_data.h)). I will call hardware
- texture a gr_texture so there is no confusion.
-
- To remind you :
-  - Texture are set of patch and are associate to linedefs (walls) can be
-    upper, lower or middle texture. It can have hole on it.
-  - patch are sprites (the doom patch are run of vertical lines)
-  - flats are used for floors and ceiling of sectors and have size of 64x64
-    it can't have hole on it
-  - pic are new legacy format for picture, it can only handle plain texture
-    like flats it is now used for hud in full screen for the main picture
-    of legacy and for coronas (the format was extended to handle 32 bit color
-    or intensity + alpha, not all are implemented at this time)
-
- Since patch, flat and pic are basic structure represented by only one lump in
- the wad, the wad loader allocate for eatch lump a GlideMipmap_s (cache3Dfx)
- and init data field to NULL. Since the data structure is allocated in
- PU_3DFXCACHE (like PU_CACHE) the data will be initilised when needed
- (hw_cache.c).
-
- The GlideMipmap_s structures for textures are initialized on
- HWR_PrepLevelCache (hw_cache.c) it is called in P_SetupLevel (load level)
- the number of textures is computed with TEXTURE1, TEXTURE2 lumps since this
- can be changed in runtime in SRB2 (load a wad while runing) it must be
- reallocated. Well, at this time it is realloceted at eatch level start. We
- can do better, since numtextures change only when a wad is loaded.
-
- The 3dfx driver use glide3, it load gr_texture in gr_texture memory of the
- card in fifo order when there is no more place it remove the first gr_texture,
- the downloaded field of GlideMipmap_s go to false and when needed it is
- reloaded in gr_texture memory. In OpenGl, since OpenGl keep texture in there
- own memory and handle gr_texture memory of the card we no more need to
- redownload it but if we not free time to time gr_texture memory in opengl,
- it will get alot of memory, so the gr_texture memory is cleared at eatch
- new level (same time of texture reallocation). Opengl and 3dfx link the
- loaded gr_texture with the nextmipmap field of GlideMipmap_s so before clear
- textures of the heap we MUST free gr_texture memory of OpenGl or 3dfx !
-
- SRB2 can also draw patch with a differant colormap (thanks to Hurdler).
- When needed it create the same gr_texture but just with a differant colormap.
- This one is linked with the original in the GlideMipmap_s with the
- nextcolormap field.
-
- So when a polygone with a gr_texture must be drawn, first we check if the
- gr_textures is not allready loaded in hadware memory (downloaded field) if
- not then we check if gr_texture data is there (not grabbed by z_malloc
- function) if not we must recompute it eatch type of gr_texture (texture,
- patch, flat, pic have there own methode) the we can send the gr_texture
- to 3dfx or OpenGl.

libs/libbacktrace/LICENSE.txt

@@ -5,13 +5,13 @@
 # met:
 
 #     (1) Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer. 
+#     notice, this list of conditions and the following disclaimer.
 
 #     (2) Redistributions in binary form must reproduce the above copyright
 #     notice, this list of conditions and the following disclaimer in
 #     the documentation and/or other materials provided with the
-#     distribution.  
-    
+#     distribution.
+
 #     (3) The name of the author may not be used to
 #     endorse or promote products derived from this software without
 #     specific prior written permission.
@@ -26,4 +26,4 @@
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# POSSIBILITY OF SUCH DAMAGE.

libs/libbacktrace/README.md

@@ -10,8 +10,18 @@ The libbacktrace library may be linked into a program or library and
 used to produce symbolic backtraces.
 Sample uses would be to print a detailed backtrace when an error
 occurs or to gather detailed profiling information.
+
 In general the functions provided by this library are async-signal-safe,
 meaning that they may be safely called from a signal handler.
+That said, on systems that use `dl_iterate_phdr`, such as GNU/Linux,
+the first call to a libbacktrace function will call `dl_iterate_phdr`,
+which is not in general async-signal-safe.  Therefore, programs
+that call libbacktrace from a signal handler should ensure that they
+make an initial call from outside of a signal handler.
+Similar considerations apply when arranging to call libbacktrace
+from within malloc; `dl_iterate_phdr` can also call malloc,
+so make an initial call to a libbacktrace function outside of
+malloc before trying to call libbacktrace functions within malloc.
 
 The libbacktrace library is provided under a BSD license.
 See the source files for the exact license text.
@@ -25,7 +35,7 @@ will work.
 See the source file backtrace-supported.h.in for the macros that it
 defines.
 
-As of October 2020, libbacktrace supports ELF, PE/COFF, Mach-O, and
+As of July 2024, libbacktrace supports ELF, PE/COFF, Mach-O, and
 XCOFF executables with DWARF debugging information.
 In other words, it supports GNU/Linux, *BSD, macOS, Windows, and AIX.
 The library is written to make it straightforward to add support for

libs/libbacktrace/lib/x86_64/libbacktrace.la

@@ -0,0 +1,41 @@
+# libbacktrace.la - a libtool library file
+# Generated by libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libbacktrace.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=''
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libbacktrace.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=no
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/mingw64/lib'

libs/libbacktrace/lib/x86_64/libbacktrace.lai

@@ -0,0 +1,41 @@
+# libbacktrace.la - a libtool library file
+# Generated by libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libbacktrace.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=''
+
+# Libraries that this one depends upon.
+dependency_libs=''
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libbacktrace.
+current=0
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/mingw64/lib'

src/CMakeLists.txt

@@ -442,12 +442,7 @@ if(${SRB2_CONFIG_HAVE_PNG} AND ${SRB2_CONFIG_HAVE_ZLIB})
 			set(SRB2_HAVE_PNG ON)
 			add_definitions(-DHAVE_PNG)
 			add_definitions(-D_LARGEFILE64_SOURCE)
-			set(SRB2_PNG_SOURCES apng.c)
-			set(SRB2_PNG_HEADERS apng.h)
-			prepend_sources(SRB2_PNG_SOURCES)
-			prepend_sources(SRB2_PNG_HEADERS)
-			source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS}
-				${SRB2_PNG_SOURCES} ${SRB2_PNG_HEADERS})
+			source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS})
 		else()
 			message(WARNING "You have specified that PNG is available but it was not found. SRB2Kart may not compile correctly.")
 		endif()

src/Makefile

@@ -49,7 +49,7 @@
 #                    Already enabled by default for 32-bit
 #                    Windows.
 # NOCURL=1 - Disable libcurl--HTTP capability.
-# NOGME=1 - Disable game music emu, retro VGM support.
+# NOLIBGME=1 - Disable game music emu, retro VGM support.
 # NOOPENMPT=1 - Disable module (tracker) music support.
 # NOMIXER=1 - Disable SDL Mixer (audio playback).
 # NOTHREADS=1 - Disable multithreading.
@@ -131,9 +131,19 @@ endif
 include Makefile.d/util.mk
 
 ifdef PREFIX
+ifdef USECLANG
+CC:=$(PREFIX)-clang
+CXX:=$(PREFIX)-clang++
+else
 CC:=$(PREFIX)-gcc
 CXX:=$(PREFIX)-g++
 endif
+endif
+
+ifdef USECLANG
+CC=clang
+CXX=clang++
+endif
 
 OBJDUMP_OPTS?=--wide --source --line-numbers
 
@@ -161,7 +171,7 @@ sources:=
 makedir:=../make
 
 # -DCOMPVERSION: flag to use comptime.h
-opts:=-DCOMPVERSION -g
+opts:=-DCOMPVERSION -g -fwrapv
 libs:=
 
 # This is a list of variables names, of which if defined,
@@ -236,7 +246,7 @@ endif
 # build with profiling information
 ifdef PROFILEMODE
 opts+=-pg
-libs+=-pg
+LDFLAGS+=-pg
 endif
 
 ifdef DEBUGMODE
@@ -248,10 +258,10 @@ ifdef USELTO
 # compile with LTO
 ifdef MINGW
 opts+=-flto=auto -g
-libs+=-flto=auto -g
+LDFLAGS+=-flto=auto -g
 else
 opts+=-flto=auto
-libs+=-flto=auto
+LDFLAGS+=-flto=auto
 endif
 endif
 endif
@@ -265,8 +275,10 @@ else
 opts+=-fsanitize=address
 libs+=-fsanitize=address
 endif
-opts+=-fsanitize=address
-libs+=-fsanitize=address
+endif
+
+ifeq ($(CC),clang)
+ LDFLAGS+= -fuse-ld=lld
 endif
 
 # debug_opts also get passed to windres
@@ -281,6 +293,7 @@ cxxopts:=$(opts) $(CXXFLAGS)
 opts+=$(CWFLAGS) # warning flags that shouldnt be passed to c++ compiler
 
 libs+=$(LDFLAGS) -lstdc++ -lpthread
+
 asflags:=$(ASFLAGS) -x assembler-with-cpp
 
 cc=$(CC)

src/Makefile.d/dedicated.mk

@@ -14,6 +14,6 @@ sources+=dedicated/i_threads.c
 endif
 
 NOOPENMPT=1
-NOGME=1
+NOLIBGME=1
 NOHW=1
 NOUPNP=1

src/Makefile.d/dummy.mk

@@ -0,0 +1,5 @@
+makedir:=$(makedir)/Dummy
+
+sources+=$(call List,dummy/Sourcefile)
+
+NOHW=1

src/Makefile.d/features.mk

@@ -18,8 +18,10 @@ ifndef NOHW
 opts+=-DHWRENDER
 
 ifndef NOSCREENFBO
+ifndef STATIC_OPENGL
 opts+=-DUSE_FBO_OGL
 endif
+endif
 
 sources+=$(call List,hardware/Sourcefile)
 endif
@@ -28,14 +30,12 @@ ifndef NOMD5
 sources+=md5.c
 endif
 
-ifndef NONET
 ifndef NOSATURNJOIN
 opts+=-DDOSATURNJOIN
 endif
 ifndef NOSATURNPAK
 opts+=-DDOSATURNPAK
 endif
-endif
 
 ifndef NOZLIB
 ifndef NOPNG
@@ -50,7 +50,6 @@ ifdef LINUX
 opts+=-D_LARGEFILE64_SOURCE
 endif
 opts+=-DHAVE_PNG
-sources+=apng.c
 endif
 endif
 
@@ -73,13 +72,6 @@ libs+=-lbacktrace
 opts+=-DHAVE_LIBBACKTRACE
 endif
 
-#windoze hack
-ifdef MINGW
-ifndef NODISCORDRPC
-HAVE_DISCORDRPC=1
-endif
-endif
-
 ifdef HAVE_DISCORDRPC
 $(eval $(call Propogate_flags,DISCORDRPC))
 libs+=-ldiscord-rpc

src/Makefile.d/haiku.mk

@@ -19,9 +19,7 @@ else ifeq (${DEDICATED},1)
 EXENAME?=srb2haikud
 endif
 
-ifndef NONET
 libs+=-lnetwork
-endif
 
 define _set =
 $(1)_CFLAGS?=$($(1)_opts)

src/Makefile.d/versions.mk

@@ -144,9 +144,13 @@ ifdef GCC81
  WFLAGS+=-Wno-error=multistatement-macros
 endif
 
+ifeq ($(CC),clang)
+ WFLAGS+= -Wno-unknown-pragmas -Wno-cast-align
+endif
+
 ifdef NONX86
   ifdef X86_64 # yeah that SEEMS contradictory
-  opts+=-march=nocona
+  opts+=-march=x86-64-v2
   endif
 else
   ifndef GCC29

src/Makefile.d/win32.mk

@@ -15,6 +15,7 @@ endif
 
 sources+=win32/Srb2win.rc
 opts+=-DSTDC_HEADERS
+libs+=-Wl,-Bstatic -lstdc++ -lpthread -lgcc -Wl,-Bdynamic
 libs+=-ladvapi32 -lkernel32 -lmsvcrt -luser32
 
 ifndef DEDICATED
@@ -42,6 +43,10 @@ libs+=-Wl,--large-address-aware
 NOLIBBACKTRACE=1
 endif
 
+ifndef NODISCORDRPC
+HAVE_DISCORDRPC=1
+endif
+
 ifndef MINGW64
 32=32
 x86=x86

src/Sourcefile

@@ -34,6 +34,7 @@ m_misc.c
 m_perfstats.c
 m_queue.c
 m_random.c
+m_curl.c
 mserv.c
 http-mserv.c
 qs22j.c
@@ -46,11 +47,11 @@ tables.c
 v_video.c
 w_wad.c
 y_inter.c
-z_zone.c
+z_zone.cpp
 r_bsp.c
 r_data.c
 r_draw.c
-r_fps.c
+r_fps.cpp
 r_main.cpp
 r_patch.c
 r_patchrotation.c
@@ -67,7 +68,7 @@ p_floor.c
 p_inter.c
 p_lights.c
 p_map.c
-p_maputl.c
+p_maputl.cpp
 p_mobj.c
 p_polyobj.c
 p_saveg.c

src/am_map.c

@@ -265,6 +265,11 @@ static void AM_findMinMaxBoundaries(void)
 	max_w = minimapinfo.map_w << MAPBITS;
 	max_h = minimapinfo.map_h << MAPBITS;
 
+	if (max_w == 0)
+		max_w = 1;
+	if (max_h == 0)
+		max_h = 1;
+
 	a = FixedDiv(f_w<<FRACBITS, max_w);
 	b = FixedDiv(f_h<<FRACBITS, max_h);
 
@@ -354,7 +359,9 @@ static void AM_LevelInit(void)
 	AM_findMinMaxBoundaries();
 	scale_mtof = FixedDiv(min_scale_mtof*10, 7*FRACUNIT);
 	if (scale_mtof > max_scale_mtof)
-		scale_mtof = min_scale_mtof;
+		scale_mtof = max_scale_mtof;
+	if (scale_mtof == 0)
+		scale_mtof = 1;
 	scale_ftom = FixedDiv(FRACUNIT, scale_mtof);
 }
 

src/android/i_system.c

@@ -89,7 +89,7 @@ precise_t I_GetPreciseTime(void)
 	return 0;
 }
 
-UINT64 I_GetPrecisePrecision(void) 
+UINT64 I_GetPrecisePrecision(void)
 {
 	return 1000000;
 }
@@ -98,16 +98,6 @@ void I_GetEvent(void){}
 
 void I_OsPolling(void){}
 
-ticcmd_t *I_BaseTiccmd(void)
-{
-  return NULL;
-}
-
-ticcmd_t *I_BaseTiccmd2(void)
-{
-  return NULL;
-}
-
 void I_Quit(void)
 {
   LOGD("SRB2Kart quitting!");

src/android/i_video.c

@@ -10,12 +10,8 @@
 
 rendermode_t rendermode = render_soft;
 
-boolean highcolor = false;
-
 boolean allow_fullscreen = false;
 
-
-
 consvar_t cv_vidwait = {"vid_wait", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 void I_StartupGraphics(void){}
@@ -46,7 +42,6 @@ INT32 VID_SetMode(INT32 modenum)
   vid.modenum = 0;
   vid.width = 320;
   vid.height = 240;
-  vid.buffer = android_surface;
   return 0;
 }
 
@@ -69,7 +64,7 @@ void I_WaitVBL(INT32 count)
   (void)count;
 }
 
-void I_ReadScreen(UINT8 *scr)
+void I_ReadScreen(UINT8 * restrict scr, INT32 scale)
 {
   (void)scr;
 }

src/apng.c

@@ -1,289 +0,0 @@
-/*
-Copyright 2019, James R.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "apng.h"
-
-#define APNG_INFO_acTL 0x20000U
-
-#define APNG_WROTE_acTL 0x10000U
-
-struct apng_info_def
-{
-	png_uint_32 mode;
-	png_uint_32 valid;
-
-	png_uint_32 num_frames;
-	png_uint_32 num_plays;
-
-	long start_acTL;/* acTL is written here */
-
-	png_flush_ptr output_flush_fn;
-	apng_seek_ptr output_seek_fn;
-	apng_tell_ptr output_tell_fn;
-
-	apng_set_acTL_ptr set_acTL_fn;
-};
-
-/* PROTOS (FUCK COMPILER) */
-void   apng_seek  (png_structp, apng_const_infop, size_t);
-size_t apng_tell  (png_structp, apng_const_infop);
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-void   apng_flush (png_structp, apng_infop);
-#ifdef PNG_STDIO_SUPPORTED
-void   apng_default_flush (png_structp);
-#endif/* PNG_STDIO_SUPPORTED */
-#endif/* PNG_WRITE_FLUSH_SUPPORTED */
-#ifdef PNG_STDIO_SUPPORTED
-void   apng_default_seek  (png_structp, size_t);
-size_t apng_default_tell  (png_structp);
-#endif/* PNG_STDIO_SUPPORTED */
-void   apng_write_IEND (png_structp);
-void   apng_write_acTL (png_structp, png_uint_32, png_uint_32);
-#ifndef PNG_WRITE_APNG_SUPPORTED
-png_uint_32 apng_set_acTL_dummy (png_structp, png_infop,
-		png_uint_32, png_uint_32);
-#endif/* PNG_WRITE_APNG_SUPPORTED */
-
-apng_infop
-apng_create_info_struct (png_structp pngp)
-{
-	apng_infop ainfop;
-	(void)pngp;
-	if (( ainfop = calloc(1, sizeof (apng_info)) ))
-	{
-		apng_set_write_fn(pngp, ainfop, 0, 0, 0, 0, 0);
-		apng_set_set_acTL_fn(pngp, ainfop, 0);
-	}
-	return ainfop;
-}
-
-void
-apng_destroy_info_struct (png_structp pngp, apng_infopp ainfopp)
-{
-	(void)pngp;
-	if (!( pngp && ainfopp ))
-		return;
-
-	free((*ainfopp));
-}
-
-void
-apng_seek (png_structp pngp, apng_const_infop ainfop, size_t l)
-{
-	(*(ainfop->output_seek_fn))(pngp, l);
-}
-
-size_t
-apng_tell (png_structp pngp, apng_const_infop ainfop)
-{
-	return (*(ainfop->output_tell_fn))(pngp);
-}
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-void
-apng_flush (png_structp pngp, apng_infop ainfop)
-{
-	if (ainfop->output_flush_fn)
-		(*(ainfop->output_flush_fn))(pngp);
-}
-
-#ifdef PNG_STDIO_SUPPORTED
-void
-apng_default_flush (png_structp pngp)
-{
-	if (!( pngp ))
-		return;
-
-	fflush((png_FILE_p)png_get_io_ptr);
-}
-#endif/* PNG_STDIO_SUPPORTED */
-#endif/* PNG_WRITE_FLUSH_SUPPORTED */
-
-#ifdef PNG_STDIO_SUPPORTED
-void
-apng_default_seek (png_structp pngp, size_t l)
-{
-	if (!( pngp ))
-		return;
-
-	if (fseek((png_FILE_p)png_get_io_ptr(pngp), (long)l, SEEK_SET) == -1)
-		png_error(pngp, "Seek Error");
-}
-
-size_t
-apng_default_tell (png_structp pngp)
-{
-	long l;
-
-	if (!( pngp ))
-	{
-		png_error(pngp, "Call to apng_default_tell with NULL pngp failed");
-	}
-
-	if (( l = ftell((png_FILE_p)png_get_io_ptr(pngp)) ) == -1)
-		png_error(pngp, "Tell Error");
-
-	return (size_t)l;
-}
-#endif/* PNG_STDIO_SUPPORTED */
-
-void
-apng_set_write_fn (png_structp pngp, apng_infop ainfop, png_voidp iop,
-		png_rw_ptr write_f, png_flush_ptr flush_f,
-		apng_seek_ptr seek_f, apng_tell_ptr tell_f)
-{
-	if (!( pngp && ainfop ))
-		return;
-
-	png_set_write_fn(pngp, iop, write_f, flush_f);
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#ifdef PNG_STDIO_SUPPORTED
-	if (!flush_f)
-		ainfop->output_flush_fn = &apng_default_flush;
-	else
-#endif/* PNG_STDIO_SUPPORTED */
-		ainfop->output_flush_fn = flush_f;
-#endif/* PNG_WRITE_FLUSH_SUPPORTED */
-#ifdef PNG_STDIO_SUPPORTED
-	if (!seek_f)
-		ainfop->output_seek_fn = &apng_default_seek;
-	else
-#endif/* PNG_STDIO_SUPPORTED */
-		ainfop->output_seek_fn  = seek_f;
-#ifdef PNG_STDIO_SUPPORTED
-	if (!seek_f)
-		ainfop->output_tell_fn  = apng_default_tell;
-	else
-#endif/* PNG_STDIO_SUPPORTED */
-		ainfop->output_tell_fn  = tell_f;
-}
-
-void
-apng_write_IEND (png_structp pngp)
-{
-	png_byte chunkc[] = "IEND";
-	png_write_chunk(pngp, chunkc, 0, 0);
-}
-
-void
-apng_write_acTL (png_structp pngp, png_uint_32 frames, png_uint_32 plays)
-{
-	png_byte chunkc[] = "acTL";
-	png_byte buf[8];
-	png_save_uint_32(buf, frames);
-	png_save_uint_32(buf + 4, plays);
-	png_write_chunk(pngp, chunkc, buf, 8);
-}
-
-png_uint_32
-apng_set_acTL (png_structp pngp, png_infop infop, apng_infop ainfop,
-		png_uint_32 frames, png_uint_32 plays)
-{
-	(void)pngp;
-	(void)infop;
-	if (!( pngp && infop && ainfop ))
-		return 0;
-
-	ainfop->num_frames = frames;
-	ainfop->num_plays  = plays;
-
-	ainfop->valid |= APNG_INFO_acTL;
-
-	return 1;
-}
-
-void
-apng_write_info_before_PLTE (png_structp pngp, png_infop infop,
-		apng_infop ainfop)
-{
-	if (!( pngp && infop && ainfop ))
-		return;
-
-	png_write_info_before_PLTE(pngp, infop);
-
-	if (( ainfop->valid & APNG_INFO_acTL )&&!( ainfop->mode & APNG_WROTE_acTL ))
-	{
-		ainfop->start_acTL = apng_tell(pngp, ainfop);
-
-		apng_write_acTL(pngp, 0, 0);
-		/* modified for runtime dynamic linking */
-		(*(ainfop->set_acTL_fn))(pngp, infop, PNG_UINT_31_MAX, 0);
-
-		ainfop->mode |= APNG_WROTE_acTL;
-	}
-}
-
-void
-apng_write_info (png_structp pngp, png_infop infop,
-		apng_infop ainfop)
-{
-	apng_write_info_before_PLTE(pngp, infop, ainfop);
-	png_write_info(pngp, infop);
-}
-
-void
-apng_write_end (png_structp pngp, png_infop infop, apng_infop ainfop)
-{
-	(void)infop;
-	apng_write_IEND(pngp);
-	apng_seek(pngp, ainfop, ainfop->start_acTL);
-	apng_write_acTL(pngp, ainfop->num_frames, ainfop->num_plays);
-
-#ifdef PNG_WRITE_FLUSH_SUPPORTED
-#ifdef PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED
-	apng_flush(pngp, infop);
-#endif/* PNG_WRITE_FLUSH_SUPPORTED */
-#endif/* PNG_WRITE_FLUSH_AFTER_IEND_SUPPORTED */
-}
-
-#ifndef PNG_WRITE_APNG_SUPPORTED
-png_uint_32
-apng_set_acTL_dummy (png_structp pngp, png_infop infop,
-		png_uint_32 frames, png_uint_32 plays)
-{
-	(void)pngp;
-	(void)infop;
-	(void)frames;
-	(void)plays;
-	return 0;
-}
-#endif/* PNG_WRITE_APNG_SUPPORTED */
-
-/* Dynamic runtime linking capable! (Hopefully.) */
-void
-apng_set_set_acTL_fn (png_structp pngp, apng_infop ainfop,
-		apng_set_acTL_ptr set_acTL_f)
-{
-	(void)pngp;
-	if (!ainfop->set_acTL_fn)
-#ifndef PNG_WRITE_APNG_SUPPORTED
-		ainfop->set_acTL_fn = &apng_set_acTL_dummy;
-#else
-		ainfop->set_acTL_fn = &png_set_acTL;
-#endif/* PNG_WRITE_APNG_SUPPORTED */
-	else
-		ainfop->set_acTL_fn = set_acTL_f;
-}

src/apng.h

@@ -1,80 +0,0 @@
-/*
-Copyright 2019, James R.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef APNG_H
-#define APNG_H
-
-#ifndef _MSC_VER
-#ifndef _LARGEFILE64_SOURCE
-#define _LARGEFILE64_SOURCE
-#endif
-#endif
-
-#ifndef _LFS64_LARGEFILE
-#define _LFS64_LARGEFILE
-#endif
-
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 0
-#endif
-
-#include <png.h>
-
-typedef struct apng_info_def apng_info;
-typedef apng_info * apng_infop;
-typedef const apng_info * apng_const_infop;
-typedef apng_info * * apng_infopp;
-
-typedef void   (*apng_seek_ptr)(png_structp, size_t);
-typedef size_t (*apng_tell_ptr)(png_structp);
-
-typedef png_uint_32 (*apng_set_acTL_ptr)(png_structp, png_infop,
-		png_uint_32, png_uint_32);
-
-apng_infop apng_create_info_struct (png_structp png_ptr);
-
-void apng_destroy_info_struct (png_structp png_ptr,
-		apng_infopp info_ptr_ptr);
-
-/* Call the following functions in place of the libpng counterparts. */
-
-png_uint_32 apng_set_acTL (png_structp png_ptr, png_infop info_ptr,
-		apng_infop ainfo_ptr,
-		png_uint_32 num_frames, png_uint_32 num_plays);
-
-void apng_write_info_before_PLTE (png_structp png_ptr, png_infop info_ptr,
-		apng_infop ainfo_ptr);
-void apng_write_info (png_structp png_ptr, png_infop info_ptr,
-		apng_infop ainfo_ptr);
-
-void apng_write_end (png_structp png_ptr, png_infop info_ptr,
-		apng_infop ainfo_ptr);
-
-void apng_set_write_fn (png_structp png_ptr, apng_infop ainfo_ptr,
-		png_voidp io_ptr,
-		png_rw_ptr write_data_fn, png_flush_ptr output_flush_fn,
-		apng_seek_ptr output_seek_fn, apng_tell_ptr output_tell_fn);
-
-void apng_set_set_acTL_fn (png_structp png_ptr, apng_infop ainfo_ptr,
-		apng_set_acTL_ptr set_acTL_fn);
-
-#endif/* APNG_H */

src/b_bot.h

@@ -10,8 +10,13 @@
 /// \file  b_bot.h
 /// \brief Basic bot handling
 
+#ifndef __B_BOT__
+#define __B_BOT__
+
 void B_BuildTiccmd(player_t *player, ticcmd_t *cmd);
 void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward, boolean left, boolean right, boolean strafeleft, boolean straferight, boolean jump, boolean spin);
 boolean B_CheckRespawn(player_t *player);
 void B_MoveBlocked(player_t *player);
 void B_RespawnBot(INT32 playernum);
+
+#endif

src/blua/ldo.c

@@ -46,10 +46,6 @@
 ** =======================================================
 */
 
-#ifdef _MSC_VER
-#pragma warning(disable : 4324)
-#endif
-
 /* chain list of long jump buffers */
 struct lua_longjmp {
   struct lua_longjmp *previous;
@@ -57,10 +53,6 @@ struct lua_longjmp {
   volatile int status;  /* error code */
 };
 
-#ifdef _MSC_VER
-#pragma warning(default :  4324)
-#endif
-
 void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
   switch (lerrcode) {
     case LUA_ERRMEM: {

src/blua/ldo.h

@@ -48,12 +48,6 @@ LUAI_FUNC void luaD_reallocCI (lua_State *L, int newsize);
 LUAI_FUNC void luaD_reallocstack (lua_State *L, int newsize);
 LUAI_FUNC void luaD_growstack (lua_State *L, int n);
 
-#ifdef _MSC_VER
- #ifndef  ATTRNORETURN
-  #define ATTRNORETURN __declspec(noreturn)
- #endif
-#endif
-
 #ifndef ATTRNORETURN
 #define ATTRNORETURN
 #endif

src/blua/luaconf.h

@@ -11,13 +11,17 @@
 #include <limits.h>
 #include <stddef.h>
 
-#ifdef _MSC_VER
-#define INT32 __int32
-#else
 #include <stdint.h>
 #define INT32 int32_t
-#endif
 
+#ifndef __cplusplus
+#ifndef min // Double-Check with WATTCP-32's cdefs.h
+#define min(x, y) (((x) < (y)) ? (x) : (y))
+#endif
+#ifndef max // Double-Check with WATTCP-32's cdefs.h
+#define max(x, y) (((x) > (y)) ? (x) : (y))
+#endif
+#endif
 
 /*
 ** ==================================================================
@@ -534,8 +538,11 @@
 #endif
 #define lua_number2str(s,n)	sprintf((s), LUA_NUMBER_FMT, (n))
 #define LUAI_MAXNUMBER2STR	12 /* 10 digits, sign, and \0 */
-#define lua_str2number(s,p)	strtol((s), (p), 10)
-
+#define lua_str2number(s,p) ({ \
+		long nmr = strtol((s), (p), 10); \
+		nmr = max(INT32_MIN, min((nmr), INT32_MAX)); \
+		nmr; \
+	})
 
 /*
 @@ The luai_num* macros define the primitive operations over numbers.
@@ -559,9 +566,6 @@
 #define luai_numshl(a,b)	((unsigned)(a)<<(unsigned)(b))
 #define luai_numshr(a,b)	((unsigned)(a)>>(unsigned)(b))
 #define	luai_numnot(a)		(~((unsigned)(a)))
-#ifdef _MSC_VER
-#pragma warning(disable : 4244)
-#endif
 #endif
 
 
@@ -578,24 +582,11 @@
 #if defined(LUA_NUMBER_DOUBLE) && !defined(LUA_ANSI) && !defined(__SSE2__) && \
     (defined(__i386) || defined (_M_IX86) || defined(__i386__))
 
-/* On a Microsoft compiler, use assembler */
-#if defined(_MSC_VER)
-
-#define lua_number2int(i,d)   __asm fld d   __asm fistp i
-#define lua_number2integer(i,n)		lua_number2int(i, n)
-
-/* the next trick should work on any Pentium, but sometimes clashes
-   with a DirectX idiosyncrasy */
-#else
-
 union luai_Cast { double l_d; long l_l; };
 #define lua_number2int(i,d) \
   { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
 #define lua_number2integer(i,n)		lua_number2int(i, n)
 
-#endif
-
-
 /* this option always works, but may be slow */
 #else
 #define lua_number2int(i,d)	((i)=(int)(d))

src/byteptr.h

@@ -1,7 +1,7 @@
 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
 // Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2024 by Sonic Team Junior.
+// Copyright (C) 1999-2025 by Sonic Team Junior.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -14,72 +14,47 @@
 #ifndef __BYTEPTR_H__
 #define __BYTEPTR_H__
 
-#if defined (__alpha__) || defined (__arm__) || defined (__mips__) || defined (__ia64__) || defined (__clang__)
-#define DEALIGNED
-#endif
-
 #include "endian.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef SRB2_BIG_ENDIAN
 //
 // Little-endian machines
 //
-#ifdef DEALIGNED
-#define WRITEUINT8(p,b)     do {   UINT8 *p_tmp = (void *)p; const   UINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (void *)p; const   SINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEINT16(p,b)     do {   INT16 *p_tmp = (void *)p; const   INT16 tv = (  INT16)(b); memcpy(p, &tv, sizeof(  INT16)); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEINT16_2(p,b)     do {   INT16 *p_tmp = (  INT16 *)p; const   INT16 tv = (  INT16)(b); memcpy(p, &tv, sizeof(  INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0) // dumb hack for mumble
-#define WRITEUINT16(p,b)    do {  UINT16 *p_tmp = (void *)p; const  UINT16 tv = ( UINT16)(b); memcpy(p, &tv, sizeof( UINT16)); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEINT32(p,b)     do {   INT32 *p_tmp = (void *)p; const   INT32 tv = (  INT32)(b); memcpy(p, &tv, sizeof(  INT32)); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEUINT32(p,b)    do {  UINT32 *p_tmp = (void *)p; const  UINT32 tv = ( UINT32)(b); memcpy(p, &tv, sizeof( UINT32)); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITECHAR(p,b)      do {    char *p_tmp = (void *)p; const    char tv = (   char)(b); memcpy(p, &tv, sizeof(   char)); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEFIXED(p,b)     do { fixed_t *p_tmp = (void *)p; const fixed_t tv = (fixed_t)(b); memcpy(p, &tv, sizeof(fixed_t)); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEANGLE(p,b)     do { angle_t *p_tmp = (void *)p; const angle_t tv = (angle_t)(b); memcpy(p, &tv, sizeof(angle_t)); p_tmp++; p = (void *)p_tmp; } while (0)
-#else
-#define WRITEUINT8(p,b)     do {   UINT8 *p_tmp = (  UINT8 *)p; *p_tmp = (  UINT8)(b); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (  SINT8 *)p; *p_tmp = (  SINT8)(b); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEINT16(p,b)     do {   INT16 *p_tmp = (  INT16 *)p; *p_tmp = (  INT16)(b); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEINT16_2(p,b)     do {   INT16 *p_tmp = (  INT16 *)p; *p_tmp = (  INT16)(b); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0) // dumb hack for mumble
-#define WRITEUINT16(p,b)    do {  UINT16 *p_tmp = ( UINT16 *)p; *p_tmp = ( UINT16)(b); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEINT32(p,b)     do {   INT32 *p_tmp = (  INT32 *)p; *p_tmp = (  INT32)(b); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEUINT32(p,b)    do {  UINT32 *p_tmp = ( UINT32 *)p; *p_tmp = ( UINT32)(b); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITECHAR(p,b)      do {    char *p_tmp = (   char *)p; *p_tmp = (   char)(b); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEFIXED(p,b)     do { fixed_t *p_tmp = (fixed_t *)p; *p_tmp = (fixed_t)(b); p_tmp++; p = (void *)p_tmp; } while (0)
-#define WRITEANGLE(p,b)     do { angle_t *p_tmp = (angle_t *)p; *p_tmp = (angle_t)(b); p_tmp++; p = (void *)p_tmp; } while (0)
-#endif
+#define WRITEUINT8(p,b)     do {   UINT8 *p_tmp = (  UINT8 *)p; const   UINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITESINT8(p,b)     do {   SINT8 *p_tmp = (  SINT8 *)p; const   SINT8 tv = (  UINT8)(b); memcpy(p, &tv, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITEINT16(p,b)     do {   INT16 *p_tmp = (  INT16 *)p; const   INT16 tv = (  INT16)(b); memcpy(p, &tv, sizeof(  INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITEUINT16(p,b)    do {  UINT16 *p_tmp = ( UINT16 *)p; const  UINT16 tv = ( UINT16)(b); memcpy(p, &tv, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITEINT32(p,b)     do {   INT32 *p_tmp = (  INT32 *)p; const   INT32 tv = (  INT32)(b); memcpy(p, &tv, sizeof(  INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITEUINT32(p,b)    do {  UINT32 *p_tmp = ( UINT32 *)p; const  UINT32 tv = ( UINT32)(b); memcpy(p, &tv, sizeof( UINT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITECHAR(p,b)      do {    char *p_tmp = (   char *)p; const    char tv = (   char)(b); memcpy(p, &tv, sizeof(   char)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITEFIXED(p,b)     do { fixed_t *p_tmp = (fixed_t *)p; const fixed_t tv = (fixed_t)(b); memcpy(p, &tv, sizeof(fixed_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
+#define WRITEANGLE(p,b)     do { angle_t *p_tmp = (angle_t *)p; const angle_t tv = (angle_t)(b); memcpy(p, &tv, sizeof(angle_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
 
-#ifdef __GNUC__
-#ifdef DEALIGNED
-#define READUINT8(p)        ({   UINT8 *p_tmp = (void *)p;   UINT8 b; memcpy(&b, p, sizeof(  UINT8)); p_tmp++; p = (void *)p_tmp; b; })
-#define READSINT8(p)        ({   SINT8 *p_tmp = (void *)p;   SINT8 b; memcpy(&b, p, sizeof(  SINT8)); p_tmp++; p = (void *)p_tmp; b; })
-#define READINT16(p)        ({   INT16 *p_tmp = (void *)p;   INT16 b; memcpy(&b, p, sizeof(  INT16)); p_tmp++; p = (void *)p_tmp; b; })
-#define READUINT16(p)       ({  UINT16 *p_tmp = (void *)p;  UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; p = (void *)p_tmp; b; })
-#define READINT32(p)        ({   INT32 *p_tmp = (void *)p;   INT32 b; memcpy(&b, p, sizeof(  INT32)); p_tmp++; p = (void *)p_tmp; b; })
-#define READUINT32(p)       ({  UINT32 *p_tmp = (void *)p;  UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; p = (void *)p_tmp; b; })
-#define READCHAR(p)         ({    char *p_tmp = (void *)p;    char b; memcpy(&b, p, sizeof(   char)); p_tmp++; p = (void *)p_tmp; b; })
-#define READFIXED(p)        ({ fixed_t *p_tmp = (void *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; p = (void *)p_tmp; b; })
-#define READANGLE(p)        ({ angle_t *p_tmp = (void *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; p = (void *)p_tmp; b; })
+// what is this?
+#if defined (__GNUC__)
+#define READUINT8(p)        ({   UINT8 *p_tmp = (UINT8   *)p;   UINT8 b; memcpy(&b, p, sizeof(  UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READSINT8(p)        ({   SINT8 *p_tmp = (SINT8   *)p;   SINT8 b; memcpy(&b, p, sizeof(  SINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READINT16(p)        ({   INT16 *p_tmp = (INT16   *)p;   INT16 b; memcpy(&b, p, sizeof(  INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READUINT16(p)       ({  UINT16 *p_tmp = (UINT16  *)p;  UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READINT32(p)        ({   INT32 *p_tmp = (INT32   *)p;   INT32 b; memcpy(&b, p, sizeof(  INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READUINT32(p)       ({  UINT32 *p_tmp = (UINT32  *)p;  UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READCHAR(p)         ({    char *p_tmp = (char    *)p;    char b; memcpy(&b, p, sizeof(   char)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READFIXED(p)        ({ fixed_t *p_tmp = (fixed_t *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
+#define READANGLE(p)        ({ angle_t *p_tmp = (angle_t *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
 #else
-#define READUINT8(p)        ({   UINT8 *p_tmp = (  UINT8 *)p;   UINT8 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READSINT8(p)        ({   SINT8 *p_tmp = (  SINT8 *)p;   SINT8 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READINT16(p)        ({   INT16 *p_tmp = (  INT16 *)p;   INT16 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READUINT16(p)       ({  UINT16 *p_tmp = ( UINT16 *)p;  UINT16 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READINT32(p)        ({   INT32 *p_tmp = (  INT32 *)p;   INT32 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READUINT32(p)       ({  UINT32 *p_tmp = ( UINT32 *)p;  UINT32 b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READCHAR(p)         ({    char *p_tmp = (   char *)p;    char b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READFIXED(p)        ({ fixed_t *p_tmp = (fixed_t *)p; fixed_t b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READANGLE(p)        ({ angle_t *p_tmp = (angle_t *)p; angle_t b = *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#endif
-#else
-#define READUINT8(p)        *((  UINT8 *)p)++
-#define READSINT8(p)        *((  SINT8 *)p)++
-#define READINT16(p)        *((  INT16 *)p)++
-#define READUINT16(p)       *(( UINT16 *)p)++
-#define READINT32(p)        *((  INT32 *)p)++
-#define READUINT32(p)       *(( UINT32 *)p)++
-#define READCHAR(p)         *((   char *)p)++
-#define READFIXED(p)        *((fixed_t *)p)++
-#define READANGLE(p)        *((angle_t *)p)++
+#define READUINT8(p)        ((UINT8*)(*(void**)(&(p)) = (void*)&((UINT8*)(p))[1]))[-1]
+#define READSINT8(p)        ((SINT8*)(*(void**)(&(p)) = (void*)&((SINT8*)(p))[1]))[-1]
+#define READINT16(p)        ((INT16*)(*(void**)(&(p)) = (void*)&((INT16*)(p))[1]))[-1]
+#define READUINT16(p)       ((UINT16*)(*(void**)(&(p)) = (void*)&((UINT16*)(p))[1]))[-1]
+#define READINT32(p)        ((INT32*)(*(void**)(&(p)) = (void*)&((INT32*)(p))[1]))[-1]
+#define READUINT32(p)       ((UINT32*)(*(void**)(&(p)) = (void*)&((UINT32*)(p))[1]))[-1]
+#define READCHAR(p)         ((char*)(*(void**)(&(p)) = (void*)&((char*)(p))[1]))[-1]
+#define READFIXED(p)        ((fixed_t*)(*(void**)(&(p)) = (void*)&((fixed_t*)(p))[1]))[-1]
+#define READANGLE(p)        ((angle_t*)(*(void**)(&(p)) = (void*)&((angle_t*)(p))[1]))[-1]
 #endif
 
 #else //SRB2_BIG_ENDIAN
@@ -142,19 +117,17 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
 	return (ucp[3] << 24) | (ucp[2] << 16) | (ucp[1] << 8) | ucp[0];
 }
 
-#define READUINT8(p)        ({   UINT8 *p_tmp = (  UINT8 *)p;   UINT8 b =        *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READSINT8(p)        ({   SINT8 *p_tmp = (  SINT8 *)p;   SINT8 b =        *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READINT16(p)        ({   INT16 *p_tmp = (  INT16 *)p;   INT16 b =  readshort(p); p_tmp++; p = (void *)p_tmp; b; })
-#define READUINT16(p)       ({  UINT16 *p_tmp = ( UINT16 *)p;  UINT16 b = readushort(p); p_tmp++; p = (void *)p_tmp; b; })
-#define READINT32(p)        ({   INT32 *p_tmp = (  INT32 *)p;   INT32 b =   readlong(p); p_tmp++; p = (void *)p_tmp; b; })
-#define READUINT32(p)       ({  UINT32 *p_tmp = ( UINT32 *)p;  UINT32 b =  readulong(p); p_tmp++; p = (void *)p_tmp; b; })
-#define READCHAR(p)         ({    char *p_tmp = (   char *)p;    char b =        *p_tmp; p_tmp++; p = (void *)p_tmp; b; })
-#define READFIXED(p)        ({ fixed_t *p_tmp = (fixed_t *)p; fixed_t b =   readlong(p); p_tmp++; p = (void *)p_tmp; b; })
-#define READANGLE(p)        ({ angle_t *p_tmp = (angle_t *)p; angle_t b =  readulong(p); p_tmp++; p = (void *)p_tmp; b; })
+#define READUINT8(p)        ((UINT8*)(p = (void*)&((UINT8*)p)[1]))[-1]
+#define READSINT8(p)        ((SINT8*)(p = (void*)&((SINT8*)p)[1]))[-1]
+#define READINT16(p)        readshort(&((INT16*)(p = (void*)&((INT16*)p)[1]))[-1])
+#define READUINT16(p)       readushort(&((UINT16*)(p = (void*)&((UINT16*)p)[1]))[-1])
+#define READINT32(p)        readlong(&((INT32*)(p = (void*)&((INT32*)p)[1]))[-1])
+#define READUINT32(p)       readulong(&((UINT32*)(p = (void*)&((UINT32*)p)[1]))
+#define READCHAR(p)         ((char*)(p = (void*)&((char*)p)[1]))[-1]
+#define READFIXED(p)        readlong(&((fixed_t*)(p = (void*)&((fixed_t*)p)[1]))[-1])
+#define READANGLE(p)        readulong(&((angle_t*)(p = (void*)&((angle_t*)p)[1]))[-1])
 #endif //SRB2_BIG_ENDIAN
 
-#undef DEALIGNED
-
 #define WRITESTRINGN(p, s, n) do {                          \
 	size_t tmp_i;                                           \
                                                             \
@@ -231,4 +204,8 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
 	p += n;                   \
 } while (0)
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // __BYTEPTR_H__

src/command.c

@@ -712,12 +712,10 @@ static void COM_CEcho_f(void)
 
 	for (i = 1; i < COM_Argc(); i++)
 	{
-		strncat(cechotext, COM_Argv(i), sizeof(cechotext)-1);
-		strncat(cechotext, " ", sizeof(cechotext)-1);
+		strlcpy(cechotext, COM_Argv(i), sizeof(cechotext)-1);
+		strlcat(cechotext, " ", sizeof(cechotext)-1);
 	}
 
-	cechotext[sizeof(cechotext) - 1] = '\0';
-
 	HU_DoCEcho(cechotext);
 }
 
@@ -838,7 +836,7 @@ static void COM_Help_f(void)
 			{
 				{
 					if (!stricmp(cvar->PossibleValue[0].strvalue, "MIN") && !stricmp(cvar->PossibleValue[1].strvalue, "MAX"))
-					{	
+					{
 						if (floatmode)
 						{
 							float fu = FIXED_TO_FLOAT(cvar->PossibleValue[0].value);
@@ -1044,7 +1042,7 @@ static void COM_Add_f(void)
 
 	if (( cvar->flags & CV_FLOAT ))
 	{
-		float n =FIXED_TO_FLOAT (cvar->value) + atof(COM_Argv(2));
+		float n = FIXED_TO_FLOAT(cvar->value) + (float)atof(COM_Argv(2));
 		CV_Set(cvar, va("%ld%s", (long)n, M_Ftrim(n)));
 	}
 	else

src/console.c

@@ -479,18 +479,18 @@ static void CON_RecalcSize(void)
 
 	switch (cv_constextsize.value)
 	{
-	case V_NOSCALEPATCH:
-		con_scalefactor = 1;
-		break;
-	case V_SMALLSCALEPATCH:
-		con_scalefactor = vid.smalldupx;
-		break;
-	case V_MEDSCALEPATCH:
-		con_scalefactor = vid.meddupx;
-		break;
-	default:	// Full scaling
-		con_scalefactor = vid.dupx;
-		break;
+		case V_NOSCALEPATCH:
+			con_scalefactor = 1;
+			break;
+		case V_SMALLSCALEPATCH:
+			con_scalefactor = vid.smalldup;
+			break;
+		case V_MEDSCALEPATCH:
+			con_scalefactor = vid.meddup;
+			break;
+		default:	// Full scaling
+			con_scalefactor = vid.dup;
+			break;
 	}
 
 	con_recalc = false;
@@ -607,7 +607,7 @@ static void CON_MoveConsole(void)
 	}
 
 	// Not instant - Increment fracmovement fractionally
-	fracmovement += FixedMul(cons_speed.value*vid.fdupy, (cv_uncappedhud.value ? renderdeltatics : FRACUNIT));
+	fracmovement += FixedMul(cons_speed.value*vid.fdup, (cv_uncappedhud.value ? renderdeltatics : FRACUNIT));
 
 	if (con_curlines < con_destlines) // Move the console downwards
 	{
@@ -729,6 +729,8 @@ void CON_ToggleOff(void)
 	con_forcepic = 0;
 	con_clipviewtop = -1; // remove console clipping of view
 
+	I_SetTextInput(false);
+
 	Unlock_state();
 }
 
@@ -768,9 +770,13 @@ void CON_Ticker(void)
 		{
 			con_destlines = 0;
 			CON_ClearHUD();
+			I_SetTextInput(false);
 		}
 		else
+		{
 			CON_ChangeHeight();
+			I_SetTextInput(true);
+		}
 	}
 
 	// clip the view, so that the part under the console is not drawn
@@ -787,9 +793,13 @@ void CON_Ticker(void)
 
 	// check if console ready for prompt
 	if (con_destlines >= minheight)
+	{
 		consoleready = true;
+	}
 	else
+	{
 		consoleready = false;
+	}
 
 	// make overlay messages disappear after a while
 	for (i = 0; i < con_hudlines; i++)
@@ -836,7 +846,7 @@ boolean CON_Responder(event_t *ev)
 	// check for console toggle key
 	if (ev->type != ev_console)
 	{
-		if (modeattacking || metalrecording)
+		if (modeattacking)
 			return false;
 
 		if (ev->data1 >= KEY_MOUSE1) // See also: HUD_Responder

src/console.h

@@ -10,6 +10,9 @@
 /// \file  console.h
 /// \brief Console drawing and input
 
+#ifndef __CONSOLE__
+#define __CONSOLE__
+
 #include "d_event.h"
 #include "command.h"
 #include "i_threads.h"
@@ -62,3 +65,5 @@ void CON_ToggleOff(void);
 boolean CON_Ready(void);
 
 void CON_LogMessage(const char *msg);
+
+#endif

src/core/memory.cpp

@@ -10,10 +10,14 @@
 
 #include "memory.h"
 
-#include <array>
 #include <new>
+#include <cstdint>
 
+#include "../cxxutil.hpp"
 #include "../z_zone.h"
+#include "../lua_script.h"
+
+using namespace srb2;
 
 namespace
 {
@@ -58,6 +62,90 @@ void LinearMemory::reset() noexcept
 
 } // namespace
 
+PoolAllocator::~PoolAllocator()
+{
+	release();
+}
+
+constexpr static size_t nearest_multiple(size_t v, size_t divisor)
+{
+	return (v + (divisor - 1)) & ~(divisor - 1);
+}
+
+PoolAllocator::ChunkFooter* PoolAllocator::allocate_chunk()
+{
+	uint8_t* chunk = (uint8_t*)Z_Malloc(nearest_multiple(blocks_ * block_size_, alignof(ChunkFooter)) + sizeof(ChunkFooter), tag_, nullptr);
+	ChunkFooter* footer = (ChunkFooter*)(chunk + (blocks_ * block_size_));
+	footer->next = nullptr;
+	footer->start = (void*)chunk;
+	for (size_t i = 0; i < blocks_; i++)
+	{
+		FreeBlock* cur = (FreeBlock*)(chunk + (i * block_size_));
+		FreeBlock* next = (FreeBlock*)(chunk + ((i + 1) * block_size_));
+		cur->next = next;
+	}
+	((FreeBlock*)(chunk + ((blocks_ - 1) * block_size_)))->next = nullptr;
+	return footer;
+}
+
+void* PoolAllocator::allocate()
+{
+	if (first_chunk_ == nullptr)
+	{
+		SRB2_ASSERT(head_ == nullptr);
+
+		// No chunks allocated yet
+		first_chunk_ = allocate_chunk();
+		head_ = (FreeBlock*)first_chunk_->start;
+	}
+
+	if (head_->next == nullptr)
+	{
+		// Current chunk will be full; allocate another at the end of the list
+		ChunkFooter* last_chunk = first_chunk_;
+		while (last_chunk->next != nullptr)
+		{
+			last_chunk = last_chunk->next;
+		}
+		ChunkFooter* new_chunk = allocate_chunk();
+		last_chunk->next = new_chunk;
+		head_->next = (FreeBlock*)new_chunk->start;
+	}
+
+	FreeBlock* ret = head_;
+	head_ = head_->next;
+	return ret;
+}
+
+void PoolAllocator::deallocate(void* p)
+{
+	// Required in case this block is reused
+	LUA_InvalidateUserdata(p);
+
+	FreeBlock* block = reinterpret_cast<FreeBlock*>(p);
+	block->next = head_;
+	head_ = block;
+}
+
+void PoolAllocator::release()
+{
+	ChunkFooter* next = nullptr;
+	for (ChunkFooter* i = first_chunk_; i != nullptr; i = next)
+	{
+		uint8_t *chunk = (uint8_t*)i->start;
+		for (size_t j = 0; j < blocks_; j++)
+		{
+			// Invalidate all blocks that possibly weren't passed to deallocate
+			LUA_InvalidateUserdata(chunk + (j * block_size_));
+		}
+		next = i->next;
+		Z_Free(i->start);
+	}
+
+	first_chunk_ = nullptr;
+	head_ = nullptr;
+}
+
 static LinearMemory g_frame_memory {4 * 1024 * 1024};
 
 void* Z_Frame_Alloc(size_t size)

src/core/memory.h

@@ -1,4 +1,4 @@
-// BLANKART
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Ronald "Eidolon" Kinard
 // Copyright (C) 2024 by Kart Krew
@@ -14,6 +14,58 @@
 #include <stddef.h>
 
 #ifdef __cplusplus
+
+#include <cstdint>
+
+namespace srb2
+{
+
+/// Pool allocator; manages bulk allocations of same-size block. If the pool is full,
+/// allocations will fail by returning nullptr.
+class PoolAllocator final
+{
+	struct FreeBlock
+	{
+		FreeBlock* next;
+	};
+	struct ChunkFooter
+	{
+		ChunkFooter* next;
+		void* start;
+	};
+	ChunkFooter* first_chunk_;
+	FreeBlock* head_;
+	size_t block_size_;
+	size_t blocks_;
+	int32_t tag_;
+
+	ChunkFooter* allocate_chunk();
+
+public:
+	constexpr PoolAllocator(size_t block_size, size_t blocks, int32_t tag)
+		: first_chunk_(nullptr)
+		, head_(nullptr)
+		, block_size_(block_size)
+		, blocks_(blocks)
+		, tag_(tag)
+	{}
+	PoolAllocator(const PoolAllocator&) = delete;
+	PoolAllocator(PoolAllocator&&) noexcept = default;
+	~PoolAllocator();
+
+	PoolAllocator& operator=(const PoolAllocator&) = delete;
+	PoolAllocator& operator=(PoolAllocator&&) noexcept = default;
+
+	void* allocate();
+	void deallocate(void* p);
+	constexpr size_t block_size() const noexcept { return block_size_; };
+
+	void release();
+};
+
+} // namespace srb2
+
+
 extern "C" {
 #endif // __cpluspplus
 

src/core/static_vec.hpp

@@ -1,4 +1,4 @@
-// BLANKART
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Ronald "Eidolon" Kinard
 // Copyright (C) 2024 by Kart Krew

src/core/thread_pool.h

@@ -1,4 +1,4 @@
-// BLANKART
+// SONIC ROBO BLAST 2 KART
 //-----------------------------------------------------------------------------
 // Copyright (C) 2024 by Ronald "Eidolon" Kinard
 // Copyright (C) 2024 by Kart Krew

src/cxxutil.hpp

@@ -61,7 +61,7 @@ struct SourceLocation {
 
 class IErrorAssertHandler {
 public:
-	static void handle(const SourceLocation& source_location, const char* expression) {
+	[[ noreturn ]] static void handle(const SourceLocation& source_location, const char* expression) {
 		I_Error("Assertion failed at %s:%u: %s != true",
 				source_location.file_name,
 				source_location.line_number,

src/d_clisrv.h

@@ -120,6 +120,8 @@ typedef enum
 	PT_ISSATURN, 			// Saturn specific identifier packet
 #endif
 
+	PT_MAPICON,       // Send map image icon (gamespy).
+	PT_NEEDMAPICON,   // Request missed map icon (gamespy).
 	NUMPACKETTYPE
 } packettype_t;
 
@@ -131,10 +133,6 @@ void Command_Droprate(void);
 void Command_Numnodes(void);
 #endif
 
-#if defined(_MSC_VER)
-#pragma pack(1)
-#endif
-
 // Client to server packet
 typedef struct
 {
@@ -174,10 +172,6 @@ typedef struct
 	ticcmd_t cmd, cmd2, cmd3, cmd4;
 } ATTRPACK client4cmd_pak;
 
-#ifdef _MSC_VER
-#pragma warning(disable :  4200)
-#endif
-
 // Server to client packet
 // this packet is too large
 typedef struct
@@ -370,10 +364,6 @@ typedef struct {
 	UINT8 data[0]; // Size is variable using hardware_MAXPACKETLENGTH
 } ATTRPACK filetx_pak;
 
-#ifdef _MSC_VER
-#pragma warning(default : 4200)
-#endif
-
 #define MAXAPPLICATION 16
 
 typedef struct
@@ -513,13 +503,10 @@ typedef struct
 		INT32 filesneedednum;               //           4 bytes
 		filesneededconfig_pak filesneededcfg; //       ??? bytes
 		UINT32 pingtable[MAXPLAYERS+1];     //          68 bytes
+		UINT8 mapicondata[0];
 	} u; // This is needed to pack diff packet types data together
 } ATTRPACK doomdata_t;
 
-#if defined(_MSC_VER)
-#pragma pack()
-#endif
-
 #define MAXSERVERLIST (MAXNETNODES-1)
 typedef struct
 {
@@ -564,7 +551,6 @@ typedef enum
 	KR_TIMEOUT, //Connection Timeout
 	KR_BAN, //Banned by server
 	KR_LEAVE, //Quit the game
-
 } kickreason_t;
 
 /* the max number of name changes in some time period */
@@ -597,9 +583,6 @@ extern tic_t lowest_lag;
 extern consvar_t cv_mindelay, cv_gentlemens;
 
 extern consvar_t
-#ifdef VANILLAJOINNEXTROUND
-	cv_joinnextround,
-#endif
 	cv_netticbuffer, cv_allownewplayer,
 #ifdef SATURNJOIN
 	cv_allownewsaturnplayer,
@@ -656,16 +639,9 @@ void D_QuitNetGame(void);
 //? How many ticks to run?
 boolean TryRunTics(tic_t realtic);
 
-// extra data for lmps
-// these functions scare me. they contain magic.
-/*boolean AddLmpExtradata(UINT8 **demo_p, INT32 playernum);
-void ReadLmpExtraData(UINT8 **demo_pointer, INT32 playernum);*/
-
-#ifndef NONET
 // translate a playername in a player number return -1 if not found and
 // print a error message in the console
 SINT8 nametonum(const char *name);
-#endif
 
 extern char motd[254], server_context[8];
 extern UINT8 playernode[MAXPLAYERS];
@@ -677,7 +653,6 @@ INT32 D_NumPlayers(void);
 void D_ResetTiccmds(void);
 
 tic_t GetLag(INT32 node);
-//UINT8 GetFreeXCmdSize(UINT8 playerid);
 
 extern UINT8 hu_resynching;
 #ifdef SATURNPAK
@@ -685,7 +660,8 @@ extern UINT8 hu_redownloadinggamestate;
 #endif
 extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
 
-typedef struct rewind_s {
+typedef struct rewind_s
+{
 	UINT8 savebuffer[(768*1024)];
 	tic_t leveltime;
 	size_t demopos;

src/d_main.c

@@ -96,20 +96,17 @@
 // platform independant focus loss
 UINT8 window_notinfocus = false;
 
-//
-// DEMO LOOP
-//
-//static INT32 demosequence;
-static char *startupwadfiles[MAX_WADFILES];
+static char *startupiwadfiles[MAX_WADFILES];
 static char *startuppwads[MAX_WADFILES];
 
 // autoloading
-char *autoloadwadfiles[MAX_WADFILES];
-char *autoloadwadfilespost[MAX_WADFILES];
+static char *autoloadwadfiles[MAX_WADFILES];
+static char *autoloadwadfilespost[MAX_WADFILES];
 boolean autoloading;
 boolean autoloaded;
 boolean postautoloaded = false;
 boolean wasautoloaded = false;
+//
 
 boolean devparm = false; // started game with -devparm
 
@@ -121,11 +118,8 @@ INT32 postimgparam[MAXSPLITSCREENPLAYERS];
 // These variables are only true if
 // whether the respective sound system is disabled
 // or they're init'ed, but the player just toggled them
-#ifndef NO_MIDI
-boolean midi_disabled = false;
-#endif
 boolean sound_disabled = false;
-boolean digital_disabled = false;
+boolean music_disabled = false;
 
 #ifdef DEBUGFILE
 INT32 debugload = 0;
@@ -153,8 +147,6 @@ boolean dedicated = false;
 
 boolean loaded_config = false; // true once config.cfg loaded AND executed
 
-static void D_CleanFile(char **filearray);
-
 //
 // D_PostEvent
 // Called by the I/O functions when input is detected
@@ -223,11 +215,12 @@ static void D_GamePadMenuScrollTicker(void)
 }
 #undef SCROLLDELAY
 
+static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {0};
+
 static void D_DeviceLEDTick(void)
 {
 	UINT8 i;
 	static UINT16 color[MAXSPLITSCREENPLAYERS] = {0};
-	static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {0};
 
 	if (numcontrollers == 0)
 	{
@@ -249,6 +242,11 @@ static void D_DeviceLEDTick(void)
 	}
 }
 
+void D_ResetDeviceLED(void)
+{
+	memset(curcolor, 0, sizeof(curcolor));
+}
+
 //
 // D_ProcessEvents
 // Send all the events of the given timestamp down the responder chain
@@ -329,7 +327,7 @@ static void D_Renderview(void)
 	if (automapactive)
 		return;
 
-	R_ApplyLevelInterpolators(rendertimefrac);
+	R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL));
 
 	if (rendermode == render_soft)
 	{
@@ -354,8 +352,7 @@ static void D_Renderview(void)
 	{
 		// V_DrawPatchFill, but for the fourth screen only
 		patch_t *pat = W_CachePatchName("SRB2BACK", PU_CACHE);
-		INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
-		INT32 x, y, pw = SHORT(pat->width) * dupz, ph = SHORT(pat->height) * dupz;
+		INT32 x, y, pw = SHORT(pat->width) * vid.dup, ph = SHORT(pat->height) * vid.dup;
 
 		for (x = vid.width>>1; x < vid.width; x += pw)
 		{
@@ -451,7 +448,7 @@ static boolean D_Display(void)
 
 		if (rendermode == render_soft && !splitscreen)
 		{
-			R_InterpolateViewRollAngle(rendertimefrac_unpaused);
+			R_InterpolateViewRollAngle(R_GetTimeFrac(RTF_CAMERA));
 			R_CheckViewMorph();
 		}
 
@@ -612,7 +609,7 @@ static boolean D_Display(void)
 		{
 			if (rendermode == render_soft)
 			{
-				VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.rowbytes);
+				VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
 			}
 
 			lastdraw = false;
@@ -776,7 +773,6 @@ void D_SRB2Loop(void)
 		// capbudget is the minimum precise_t duration of a single loop iteration
 		precise_t capbudget;
 		precise_t enterprecise = I_GetPreciseTime();
-		precise_t finishprecise = enterprecise;
 
 		Z_Frame_Reset();
 
@@ -811,7 +807,7 @@ void D_SRB2Loop(void)
 				debugload--;
 #endif
 
-		interp = (R_UsingFrameInterpolation() && !dedicated);
+		interp = !dedicated && R_UsingFrameInterpolation();
 		doDisplay = false;
 
 		renderisnewtic = (realtics > 0 || singletics);
@@ -870,33 +866,16 @@ void D_SRB2Loop(void)
 			// I looked at the possibility of putting in a float drawer for
 			// perfstats and it's very complicated, so we'll just do this instead...
 			ps_interp_frac.value.p = (precise_t)((FIXED_TO_FLOAT(g_time.timefrac)) * 1000.0f);
-			ps_interp_lag.value.p = (precise_t)((deltasecs) * 1000.0f);
+			ps_interp_lag.value.p = (precise_t)((deltasecs) * 1000.0);
 
 			const boolean lagging = ((deltatics >= 1.0) || hu_stopped);
 
-			if (!(paused || P_AutoPause()) && !lagging)
-			{
-				rendertimefrac = g_time.timefrac;
-			}
-			else
-			{
-				rendertimefrac = FRACUNIT;
-			}
-
-			if (!lagging)
-			{
-				rendertimefrac_unpaused = g_time.timefrac;
-			}
-			else
-			{
-				rendertimefrac_unpaused = FRACUNIT;
-			}
+			R_SetTimeFrac(lagging ? FRACUNIT : g_time.timefrac);
 		}
 		else
 		{
 			renderdeltatics = realtics * FRACUNIT;
-			rendertimefrac = FRACUNIT;
-			rendertimefrac_unpaused = FRACUNIT;
+			R_SetTimeFrac(FRACUNIT);
 		}
 
 		if (interp || doDisplay)
@@ -936,9 +915,8 @@ void D_SRB2Loop(void)
 			Discord_RunCallbacks();
 		}
 #endif
-
 		// Fully completed frame made.
-		finishprecise = I_GetPreciseTime();
+		precise_t finishprecise = I_GetPreciseTime();
 
 		// Use the time before sleep for frameskip calculations:
 		// post-sleep time is literally being intentionally wasted
@@ -953,9 +931,16 @@ void D_SRB2Loop(void)
 		//
 		// Wipes run an inner loop and artificially increase
 		// the measured time.
-		if (!ranwipe && (frameskip < 3) && (deltatics > 1.0))
+		if (cv_frameskip.value)
 		{
-			frameskip++;
+			if (!ranwipe && (frameskip < 3) && (deltatics > 1.0))
+			{
+				frameskip++;
+			}
+			else
+			{
+				frameskip = 0;
+			}
 		}
 		else
 		{
@@ -974,6 +959,7 @@ void D_SRB2Loop(void)
 				I_SleepDuration(capbudget - elapsed);
 			}
 		}
+
 		// Capture the time once more to get the real delta time.
 		finishprecise = I_GetPreciseTime();
 		deltasecs = (double)((INT64)(finishprecise - enterprecise)) / I_GetPrecisePrecision();
@@ -986,39 +972,17 @@ void D_SRB2Loop(void)
 // =========================================================================
 
 //
-// D_StartTitle
+// D_ClearState
 //
-void D_StartTitle(void)
+void D_ClearState(void)
 {
 	INT32 i;
 
-	if (netgame)
-	{
-		if (gametype == GT_RACE) // SRB2kart
-		{
-			G_SetGamestate(GS_WAITINGPLAYERS); // hack to prevent a command repeat
-
-			if (server)
-			{
-				char mapname[6];
-
-				strlcpy(mapname, G_BuildMapName(spstage_start), sizeof (mapname));
-				strlwr(mapname);
-				mapname[5] = '\0';
-
-				COM_BufAddText(va("map %s\n", mapname));
-			}
-		}
-
-		return;
-	}
-
-	M_ClearMenus(true);
-
 	// okay, stop now
 	// (otherwise the game still thinks we're playing!)
 	SV_StopServer();
 	SV_ResetServer();
+	serverlistultimatecount = 0;
 
 	for (i = 0; i < MAXPLAYERS; i++)
 		CL_ClearPlayer(i);
@@ -1034,8 +998,11 @@ void D_StartTitle(void)
 	// reset modeattacking
 	modeattacking = ATTACKING_NONE;
 
-	// empty maptol so mario/etc sounds don't play in sound test when they shouldn't
+	// empty some other semi-important state
 	maptol = 0;
+	nextmapoverride = 0;
+	skipstats = 0;
+	gamemap = 1;
 
 	gameaction = ga_nothing;
 	memset(displayplayers, 0, sizeof(displayplayers));
@@ -1044,9 +1011,38 @@ void D_StartTitle(void)
 	gametype = GT_RACE; // SRB2kart
 	paused = false;
 
+	// clear cmd building stuff
+	memset(gamekeydown, 0, sizeof(gamekeydown));
+	memset(joyxmove, 0, sizeof(joyxmove));
+	memset(joyymove, 0, sizeof(joyymove));
+	mousex = mousey = 0;
+
+	// Reset the palette
+	if (rendermode != render_none)
+		V_SetPaletteLump("PLAYPAL");
+
+	G_ResetAllDeviceRumbles();
+
+	S_StopSounds();
 	S_ResetKeepAndSpecialMus(); // just in case
 
+	P_FreeLevelState();
+
+	G_SetGamestate(GS_NULL);
+	wipegamestate = GS_NULL;
+}
+
+//
+// D_StartTitle
+//
+void D_StartTitle(void)
+{
+	demo.title = false;
+	D_ClearState();
+	netgame = false; // title menu shouldnt be a netgame lmao
+	M_ClearMenus(true);
 	F_StartTitleScreen();
+	D_ResetDeviceLED();
 }
 
 //
@@ -1070,31 +1066,39 @@ static void D_AddFile(const char *file, char **filearray)
 	filearray[pnumwadfiles] = newfile;
 }
 
+static void D_CleanFile(char **filearray)
+{
+	size_t pnumwadfiles;
+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
+	{
+		free(filearray[pnumwadfiles]);
+		filearray[pnumwadfiles] = NULL;
+	}
+}
+
 // Taken from TSoURDt3rd
 // https://github.com/StarManiaKG/The-Story-of-Uncapped-Revengence-Discord-the-3rd/blob/main/src/STAR/star_functions.c
 static INT32 D_DetectFileType(const char* filename)
 {
 	if (pathisdirectory(filename) == 1)
 		return 1;
-	else
-	{
-		if (!stricmp(&filename[strlen(filename) - 4], ".wad"))
-			return 2;
-		else if (!stricmp(&filename[strlen(filename) - 4], ".pk3"))
-			return 3;
-		else if (!stricmp(&filename[strlen(filename) - 5], ".kart"))
-			return 4;
 
-		else if (!stricmp(&filename[strlen(filename) - 4], ".lua"))
-			return 5;
-		else if (!stricmp(&filename[strlen(filename) - 4], ".soc"))
-			return 6;
+	const size_t len = strlen(filename);
 
-		else if (!stricmp(&filename[strlen(filename) - 4], ".cfg"))
-			return 7;
-		else if (!stricmp(&filename[strlen(filename) - 4], ".txt"))
-			return 8;
-	}
+	if (!stricmp(&filename[len - 4], ".wad"))
+		return 2;
+	else if (!stricmp(&filename[len - 4], ".pk3"))
+		return 3;
+	else if (!stricmp(&filename[len - 5], ".kart"))
+		return 4;
+	else if (!stricmp(&filename[len - 4], ".lua"))
+		return 5;
+	else if (!stricmp(&filename[len - 4], ".soc"))
+		return 6;
+	else if (!stricmp(&filename[len - 4], ".cfg"))
+		return 7;
+	else if (!stricmp(&filename[len - 4], ".txt"))
+		return 8;
 
 	return 0;
 }
@@ -1106,25 +1110,28 @@ static void D_AutoloadFile(const char *file, char **filearray)
 	char *newfile;
 	INT32 fileType = D_DetectFileType(file);
 
-	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
-		;
-
-	newfile = malloc(strlen(file) + 1);
-	if (!newfile)
-		I_Error("No more free memory to AutoloadFile %s",file);
-
 	if (!fileType)
 	{
 		CONS_Printf("D_AutoloadFile: File %s is unknown or invalid\n", file);
 		return;
 	}
 
-	strcpy(newfile, file);
+	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
+		;
 
 	if (fileType <= 6)
+	{
+		newfile = malloc(strlen(file) + 1);
+		if (!newfile)
+			I_Error("No more free memory to AutoloadFile %s",file);
+
+		strcpy(newfile, file);
 		filearray[pnumwadfiles] = newfile;
+	}
 	else
-		COM_BufAddText(va("exec %s\n", newfile));
+	{
+		COM_BufAddText(va("exec %s\n", file));
+	}
 }
 
 static char *strremove(char *str, const char *sub)
@@ -1233,16 +1240,6 @@ void D_AddPostloadFiles(void)
 	postautoloaded = true;
 }
 
-static void D_CleanFile(char **filearray)
-{
-	size_t pnumwadfiles;
-	for (pnumwadfiles = 0; filearray[pnumwadfiles]; pnumwadfiles++)
-	{
-		free(filearray[pnumwadfiles]);
-		filearray[pnumwadfiles] = NULL;
-	}
-}
-
 // ==========================================================================
 // Identify the SRB2 version, and IWAD file to use.
 // ==========================================================================
@@ -1253,18 +1250,176 @@ static boolean AddIWAD(void)
 
 	if (FIL_ReadFileOK(path))
 	{
-		D_AddFile(path, startupwadfiles);
+		D_AddFile(path, startupiwadfiles);
 		return true;
 	}
 
 	return false;
 }
 
-// extra graphic patches for saturn specific thingies
+// Optional saturn extra files
 boolean found_extra_kart  = false;
 boolean found_extra2_kart = false;
 boolean found_extra3_kart = false;
 
+static void IdentifyVersion(void)
+{
+	const char *srb2waddir = NULL;
+
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+	// change to the directory where 'srb2.srb' is found
+	srb2waddir = I_LocateWad();
+#endif
+
+	char tempsrb2path[256] = ".";
+	getcwd(tempsrb2path, 256);
+
+	// get the current directory (possible problem on NT with "." as current dir)
+	if (!srb2waddir)
+	{
+		if (tempsrb2path[0])
+			srb2waddir = tempsrb2path;
+		else
+		{
+			srb2waddir = ".";
+		}
+	}
+
+#if (1) // reduce the amount of findfile by only using full cwd in this func
+	if (strcmp(tempsrb2path, srb2waddir))
+#endif
+	{
+		strlcpy(srb2path, srb2waddir, sizeof (srb2path));
+	}
+
+	// Load the IWAD
+	if (!AddIWAD())
+	{
+		I_Error("SRB2.SRB not found! Expected in %s\n", srb2waddir);
+	}
+
+	// will be overwritten in case of -cdrom or unix/win home
+	snprintf(configfile, sizeof configfile, "%s" PATHSEP CONFIGFILENAME, srb2waddir);
+	configfile[sizeof configfile - 1] = '\0';
+
+	// if you change the ordering of this or add/remove a file, be sure to update the md5
+	// checking in D_SRB2Main
+
+#ifdef USE_PATCH_DTA
+	// Add our crappy patches to fix our bugs
+	D_AddFile(va(pandf,srb2waddir,"patch.dta"));
+#endif
+
+	D_AddFile(va(pandf, srb2waddir, "gfx.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "textures.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "chars.kart"), startupiwadfiles);
+	D_AddFile(va(pandf, srb2waddir, "maps.kart"), startupiwadfiles);
+#ifdef USE_PATCH_KART
+	D_AddFile(va(pandf,srb2waddir,"patch.kart"), startupiwadfiles);
+#endif
+
+	const char *path = NULL;
+
+	path = va(pandf, srb2waddir, "extra.kart");
+
+	// completely optional
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
+		found_extra_kart = true;
+	}
+
+	path = va(pandf, srb2waddir, "extra2.kart");
+
+	// completely optional 2: Back with a vengence
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
+		found_extra2_kart = true;
+	}
+
+	path = va(pandf, srb2waddir, "extra3.kart");
+
+	if (FIL_ReadFileOK(path))
+	{
+		D_AddFile(path, startupiwadfiles);
+		found_extra3_kart = true;
+	}
+
+#if !defined (HAVE_SDL) || defined (HAVE_MIXER)
+#define MUSICTEST(str) \
+	musicpath = va(pandf,srb2waddir,str);\
+	handle = W_OpenWadFile(&musicpath, false); \
+	if (handle) \
+	{\
+		int ms = W_VerifyNMUSlumps(musicpath, handle, false); \
+		fclose(handle); \
+		if (ms == 0) \
+			I_Error("File " str " has been modified with non-music/sound lumps"); \
+		if (ms == 1) \
+			D_AddFile(musicpath, startupiwadfiles); \
+	}
+	{
+		const char *musicpath;
+		FILE *handle;
+
+		MUSICTEST("sounds.kart")
+		MUSICTEST("music.kart")
+	}
+#undef MUSICTEST
+#endif
+}
+
+//
+// search for maps
+//
+static void D_CheckMaps(boolean checkreplaced)
+{
+	INT32 i;
+	char *name;
+	UINT16 wadnum;
+	lumpinfo_t *lumpinfo;
+
+	for (wadnum = 0; wadnum < mainwads; wadnum++)
+	{
+		lumpinfo = wadfiles[wadnum]->lumpinfo;
+		for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)
+		{
+			name = lumpinfo->name;
+			P_CheckMapReplacements(name, checkreplaced);
+		}
+	}
+}
+
+//
+// Center the title string, then add the date and time of compilation.
+//
+static inline void D_MakeTitleString(char *s)
+{
+	char temp[82];
+	char *t;
+	const char *u;
+	INT32 i;
+	const size_t len = (80-strlen(s))/2;
+
+	for (i = 0, t = temp; i < 82; i++)
+		*t++=' ';
+
+	for (t = temp + len, u = s; *u != '\0' ;)
+		*t++ = *u++;
+
+	u = compdate;
+	for (t = temp + 1, i = 11; i-- ;)
+		*t++ = *u++;
+	u = comptime;
+	for (t = temp + 71, i = 8; i-- ;)
+		*t++ = *u++;
+
+	temp[80] = '\0';
+	strcpy(s, temp);
+}
+
+// extra graphic patches for saturn specific thingies
 boolean xtra_speedo       = false; // extra speedometer check
 boolean xtra_speedo_clr   = false; // extra speedometer colour check
 boolean xtra_speedo3      = false; // 80x 11 extra speedometer check
@@ -1289,118 +1444,6 @@ boolean minidoticon       = false; // Dot graphic for minimap player angle displ
 boolean minilighticon     = false; // mkwii-style minimap headlight
 //
 
-static void IdentifyVersion(void)
-{
-	const char *srb2waddir = NULL;
-
-#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
-	// change to the directory where 'srb2.srb' is found
-	srb2waddir = I_LocateWad();
-#endif
-
-	// get the current directory (possible problem on NT with "." as current dir)
-	if (srb2waddir)
-	{
-		strlcpy(srb2path, srb2waddir, sizeof(srb2path));
-	}
-	else
-	{
-		if (getcwd(srb2path, sizeof(srb2path)))
-			srb2waddir = srb2path;
-		else
-		{
-			srb2waddir = srb2path;
-		}
-	}
-
-	// Load the IWAD
-	if (!AddIWAD())
-	{
-		I_Error("SRB2.SRB not found! Expected in %s\n", srb2waddir);
-	}
-
-	// will be overwritten in case of -cdrom or unix/win home
-	snprintf(configfile, sizeof configfile, "%s" PATHSEP CONFIGFILENAME, srb2waddir);
-	configfile[sizeof configfile - 1] = '\0';
-
-	// if you change the ordering of this or add/remove a file, be sure to update the md5
-	// checking in D_SRB2Main
-
-#ifdef USE_PATCH_DTA
-	// Add our crappy patches to fix our bugs
-	D_AddFile(va(pandf,srb2waddir,"patch.dta"));
-#endif
-
-	D_AddFile(va(pandf,srb2waddir,"gfx.kart"), startupwadfiles);
-	D_AddFile(va(pandf,srb2waddir,"textures.kart"), startupwadfiles);
-	D_AddFile(va(pandf,srb2waddir,"chars.kart"), startupwadfiles);
-	D_AddFile(va(pandf,srb2waddir,"maps.kart"), startupwadfiles);
-#ifdef USE_PATCH_KART
-	D_AddFile(va(pandf,srb2waddir,"patch.kart"), startupwadfiles);
-#endif
-	// completely optional
-	if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra.kart")))
-	{
-		D_AddFile(va(pandf,srb2waddir,"extra.kart"), startupwadfiles);
-		found_extra_kart = true;
-	}
-
-	// completely optional 2: Back with a vengence
-	if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra2.kart")))
-	{
-		D_AddFile(va(pandf,srb2waddir,"extra2.kart"), startupwadfiles);
-		found_extra2_kart = true;
-	}
-
-	if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra3.kart")))
-	{
-		D_AddFile(va(pandf,srb2waddir,"extra3.kart"), startupwadfiles);
-		found_extra3_kart = true;
-	}
-
-#if !defined (HAVE_SDL) || defined (HAVE_MIXER)
-#define MUSICTEST(str) \
-	{\
-		const char *musicpath = va(pandf,srb2waddir,str);\
-		int ms = W_VerifyNMUSlumps(musicpath); \
-		if (ms == 1) \
-			D_AddFile(musicpath, startupwadfiles); \
-		else if (ms == 0) \
-			I_Error("File "str" has been modified with non-music/sound lumps"); \
-	}
-	MUSICTEST("sounds.kart")
-	MUSICTEST("music.kart")
-#undef MUSICTEST
-#endif
-}
-
-//
-// Center the title string, then add the date and time of compilation.
-//
-static inline void D_MakeTitleString(char *s)
-{
-	char temp[82];
-	char *t;
-	const char *u;
-	INT32 i;
-
-	for (i = 0, t = temp; i < 82; i++)
-		*t++=' ';
-
-	for (t = temp + (80-strlen(s))/2, u = s; *u != '\0' ;)
-		*t++ = *u++;
-
-	u = compdate;
-	for (t = temp + 1, i = 11; i-- ;)
-		*t++ = *u++;
-	u = comptime;
-	for (t = temp + 71, i = 8; i-- ;)
-		*t++ = *u++;
-
-	temp[80] = '\0';
-	strcpy(s, temp);
-}
-
 static void D_CheckSaturnExtraFiles(void)
 {
 	// Possible value that changes depending on whether required files for speedometer are found or not
@@ -1502,12 +1545,14 @@ static void D_CheckSaturnExtraFiles(void)
 			PUSHCONS(inputdisplay_cons_temp, last_inputdisplay_i, 3, "StickGFX");
 		}
 
+		// minimap dot
 		if (W_LumpExists("MMAPDOT"))
 		{
 			minidoticon = true;
 			PUSHCONS(minimapdot_cons_temp, last_minimapdot_i, 1, "Dot");
 		}
 
+		// minimap headlight
 		if (W_LumpExists("MMAPHDLT"))
 		{
 			minilighticon = true;
@@ -1597,12 +1642,9 @@ static void D_CheckSaturnExtraFiles(void)
 //
 void D_SRB2Main(void)
 {
-	INT32 p, i;
+	INT32 p;
 	char srb2[82]; // srb2 title banner
 	char title[82];
-	lumpinfo_t *lumpinfo;
-	UINT16 wadnum;
-	char *name;
 
 	INT32 pstartmap = 1;
 	boolean autostart = false;
@@ -1660,9 +1702,7 @@ void D_SRB2Main(void)
 
 #if defined (__OS2__) && !defined (HAVE_SDL)
 	// set PM window title
-	snprintf(pmData->title, sizeof (pmData->title),
-		"SRB2Kart" VERSIONSTRING ": %s",
-		title);
+	snprintf(pmData->title, sizeof (pmData->title), "SRB2Kart" VERSIONSTRING ": %s", title);
 	pmData->title[sizeof (pmData->title) - 1] = '\0';
 #endif
 
@@ -1788,9 +1828,6 @@ void D_SRB2Main(void)
 	I_InitializeTime();
 	setlocale(LC_TIME, "");
 
-	// Make backups of some SOCcable tables.
-	P_BackupTables();
-
 	// Setup default unlockable conditions
 	M_SetupDefaultConditionSets();
 
@@ -1800,14 +1837,9 @@ void D_SRB2Main(void)
 
 	// load wad, including the main wad file
 	CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
-	if (!W_InitMultipleFiles(startupwadfiles, false))
-#ifdef _DEBUG
-		CONS_Error("A WAD file was not found or not valid.\nCheck the log to see which ones.\n");
-#else
-		I_Error("A WAD file was not found or not valid.\nCheck the log to see which ones.\n");
-#endif
-	D_CleanFile(startupwadfiles);
 
+	W_InitMultipleFiles(startupiwadfiles, false);
+	D_CleanFile(startupiwadfiles);
 	mainwads = 0;
 
 #ifndef DEVELOP
@@ -1844,66 +1876,18 @@ void D_SRB2Main(void)
 	// conversion sometimes needs the palette
 	V_ReloadPalette();
 
-	//
-	// search for maps
-	//
-	for (wadnum = 0; wadnum < mainwads; wadnum++)
+	D_CheckMaps(false);
+
+	W_InitMultipleFiles(startuppwads, true);
+
+	// Only search for pwad maps if we actually have a pwad added
+	if (startuppwads[0] != NULL)
 	{
-		lumpinfo = wadfiles[wadnum]->lumpinfo;
-		for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)
-		{
-			name = lumpinfo->name;
-
-			if (memcmp(name, "MAP", 3) == 0) // Ignore the headers
-			{
-				INT16 num;
-				if (name[5] != '\0')
-					continue;
-				num = (INT16)M_MapNumber(name[3], name[4]);
-
-				// we want to record whether this map exists. if it doesn't have a header, we can assume it's not relephant
-				if (num <= NUMMAPS && mapheaderinfo[num - 1])
-				{
-					mapheaderinfo[num - 1]->menuflags |= LF2_EXISTSHACK;
-				}
-			}
-		}
+		D_CheckMaps(true);
 	}
 
-	if (!W_InitMultipleFiles(startuppwads, true))
-		CONS_Error("A PWAD file was not found or not valid.\nCheck the log to see which ones.\n");
 	D_CleanFile(startuppwads);
 
-	//
-	// search for maps... again.
-	//
-	for (wadnum = mainwads+1; wadnum < numwadfiles; wadnum++)
-	{
-		lumpinfo = wadfiles[wadnum]->lumpinfo;
-		for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)
-		{
-			name = lumpinfo->name;
-
-			if (memcmp(name, "MAP", 3) == 0) // Ignore the headers
-			{
-				INT16 num;
-				if (name[5] != '\0')
-					continue;
-				num = (INT16)M_MapNumber(name[3], name[4]);
-
-				// we want to record whether this map exists. if it doesn't have a header, we can assume it's not relephant
-				if (num <= NUMMAPS && mapheaderinfo[num - 1])
-				{
-					if (mapheaderinfo[num - 1]->menuflags & LF2_EXISTSHACK)
-						G_SetGameModified(multiplayer, true); // oops, double-defined - no record attack privileges for you
-					mapheaderinfo[num - 1]->menuflags |= LF2_EXISTSHACK;
-				}
-
-				CONS_Printf("%s\n", name);
-			}
-		}
-	}
-
 	cht_Init();
 
 	//---------------------------------------------------- READY SCREEN
@@ -1923,8 +1907,12 @@ void D_SRB2Main(void)
 	// setup loading screen
 	SCR_Startup();
 
+	// Do this in background; lots of number crunching
+	R_InitTranslucencyTables();
+
 	// we need the font of the console
 	CONS_Printf("HU_Init(): Setting up heads up display.\n");
+
 	HU_Init();
 
 	COM_Init();
@@ -1986,48 +1974,20 @@ void D_SRB2Main(void)
 	R_Init();
 
 	// setting up sound
-	if (dedicated)
+	if (dedicated || M_CheckParm("-noaudio")) // combines -nosound and -nomusic
 	{
 		sound_disabled = true;
-		digital_disabled = true;
-#ifndef NO_MIDI
-		midi_disabled = true;
-#endif
-	}
-	if (M_CheckParm("-noaudio")) // combines -nosound and -nomusic
-	{
-		sound_disabled = true;
-		digital_disabled = true;
-#ifndef NO_MIDI
-		midi_disabled = true;
-#endif
+		music_disabled = true;
 	}
 	else
 	{
 		if (M_CheckParm("-nosound"))
 			sound_disabled = true;
-		if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
-		{
-			digital_disabled = true;
-#ifndef NO_MIDI
-			midi_disabled = true;
-#endif
-		}
-		else
-		{
-#ifndef NO_MIDI
-			if (M_CheckParm("-nomidimusic"))
-				midi_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
-#endif
-			if (M_CheckParm("-nodigmusic"))
-				digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
-		}
+		if (M_CheckParm("-nomusic"))
+			music_disabled = true;
 	}
-	if (!( sound_disabled && digital_disabled
-#ifndef NO_MIDI
-				&& midi_disabled
-#endif
-	 ))
+
+	if (!(sound_disabled && music_disabled))
 	{
 		CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n");
 		I_StartupSound();
@@ -2066,12 +2026,7 @@ void D_SRB2Main(void)
 
 	// check for a driver that wants intermission stats
 	// start the apropriate game based on parms
-	if (M_CheckParm("-metal"))
-	{
-		G_RecordMetal();
-		autostart = true;
-	}
-	else if (M_CheckParm("-record") && M_IsNextParm())
+	if (M_CheckParm("-record") && M_IsNextParm())
 	{
 		G_RecordDemo(M_GetNextParm());
 		autostart = true;
@@ -2152,12 +2107,6 @@ void D_SRB2Main(void)
 	}
 #endif
 
-	/*if (M_CheckParm("-ultimatemode"))
-	{
-		autostart = true;
-		ultimatemode = true;
-	}*/
-
 	if (autostart || netgame)
 	{
 		gameaction = ga_nothing;
@@ -2302,6 +2251,9 @@ const char *D_Home(void)
 	}
 #endif// !__CYGWIN__
 #endif// _WIN32
-	if (usehome) return userhome;
-	else return NULL;
+
+	if (usehome)
+		return userhome;
+	else
+		return NULL;
 }

src/d_main.h

@@ -64,12 +64,8 @@ extern boolean minilighticon;     // mkwii-style minimap headlight
 extern boolean autoloading;
 extern boolean autoloaded;
 extern boolean postautoloaded;
-
 void D_AddPostloadFiles(void);
 
-extern char *autoloadwadfilespost[MAX_WADFILES];
-extern char *autoloadwadfiles[MAX_WADFILES];
-
 // the infinite loop of D_SRB2Loop() called from win_main for windows version
 void D_SRB2Loop(void) FUNCNORETURN;
 
@@ -87,9 +83,12 @@ void D_ProcessEvents(void);
 
 const char *D_Home(void);
 
+void D_ResetDeviceLED(void);
+
 //
 // BASE LEVEL
 //
+void D_ClearState(void);
 void D_StartTitle(void);
 
 #ifdef __cplusplus

src/d_net.c

@@ -145,7 +145,6 @@ boolean Net_GetNetStat(void)
 #define URGENTFREESLOTNUM 10
 #define ACKTOSENDTIMEOUT (TICRATE/11)
 
-#ifndef NONET
 typedef struct
 {
 	UINT8 acknum;
@@ -159,7 +158,6 @@ typedef struct
 		doomdata_t data;
 	} pak;
 } ackpak_t;
-#endif
 
 typedef enum
 {
@@ -167,10 +165,8 @@ typedef enum
 	NF_TIMEOUT = 2, // Flag is set when the node got a timeout
 } node_flags_t;
 
-#ifndef NONET
 // Table of packets that were not acknowleged can be resent (the sender window)
 static ackpak_t ackpak[MAXACKPACKETS];
-#endif
 
 typedef struct
 {
@@ -198,7 +194,6 @@ typedef struct
 static node_t nodes[MAXNETNODES];
 #define NODETIMEOUT 14
 
-#ifndef NONET
 // return <0 if a < b (mod 256)
 //         0 if a = n (mod 256)
 //        >0 if a > b (mod 256)
@@ -219,14 +214,14 @@ static boolean GetFreeAcknum(UINT8 *freeack)
 	node_t *node = &nodes[doomcom->remotenode];
 	INT32 i, numfreeslot = 0;
 
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-
 	if (cmpack((UINT8)((node->remotefirstack + MAXACKTOSEND) % 256), node->nextacknum) < 0)
 	{
 		DEBFILE(va("too fast %d %d\n",node->remotefirstack,node->nextacknum));
 		return false;
 	}
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	for (i = 0; i < MAXACKPACKETS; i++)
 	{
 		if (!ackpak[i].acknum)
@@ -262,7 +257,10 @@ static boolean GetFreeAcknum(UINT8 *freeack)
 	CONS_Debug(DBG_NETPLAY, "No more free ackpacket\n");
 #endif
 	if (netbuffer->packettype < PT_CANFAIL)
-		I_Error("Connection lost\n");
+	{
+		CONS_Alert(CONS_WARNING, "Connection from %s is not acknowledging packets, killing connection\n", I_GetNodeAddress(doomcom->remotenode));
+		Net_CloseConnection(doomcom->remotenode | FORCECLOSE);
+	}
 
 	return false;
 }
@@ -408,22 +406,16 @@ static boolean Processackpak(void)
 	}
 	return goodpacket;
 }
-#endif
 
 // send special packet with only ack on it
 void Net_SendAcks(INT32 node)
 {
-#ifdef NONET
-	(void)node;
-#else
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_NOTHING;
 	M_Memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
 	HSendPacket(node, false, 0, MAXACKTOSEND);
-#endif
 }
 
-#ifndef NONET
 static void GotAcks(void)
 {
 	INT32 i, j;
@@ -454,13 +446,13 @@ static void GotAcks(void)
 		}
 	}
 }
-#endif
 
 void Net_ConnectionTimeout(INT32 node)
 {
 	// Don't timeout several times
 	if (nodes[node].flags & NF_TIMEOUT)
 		return;
+
 	nodes[node].flags |= NF_TIMEOUT;
 
 	// Send a very special packet to self (hack the reboundstore queue)
@@ -480,18 +472,17 @@ void Net_ConnectionTimeout(INT32 node)
 // Resend the data if needed
 void Net_AckTicker(void)
 {
-#ifndef NONET
 	INT32 i;
 
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	for (i = 0; i < MAXACKPACKETS; i++)
 	{
-		const INT32 nodei = ackpak[i].destinationnode;
-		node_t *node = &nodes[nodei];
-
 		if (ackpak[i].acknum && ackpak[i].senttime + NODETIMEOUT < I_GetTime())
 		{
+			const INT32 nodei = ackpak[i].destinationnode;
+			node_t *node = &nodes[nodei];
+
 			if (ackpak[i].resentnum > 10 && (node->flags & NF_CLOSE))
 			{
 				DEBFILE(va("ack %d sent 10 times so connection is supposed lost: node %d\n",
@@ -530,23 +521,20 @@ void Net_AckTicker(void)
 			}
 		}
 	}
-#endif
 }
 
 // Remove last packet received ack before resending the ackreturn
 // (the higher layer doesn't have room, or something else ....)
 void Net_UnAcknowledgePacket(INT32 node)
 {
-#ifdef NONET
-	(void)node;
-#else
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	INT32 hm1 = (nodes[node].acktosend_head-1+MAXACKTOSEND) % MAXACKTOSEND;
 	DEBFILE(va("UnAcknowledge node %d\n", node));
 
 	if (!node)
 		return;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	if (nodes[node].acktosend[hm1] == netbuffer->ack)
 	{
 		nodes[node].acktosend[hm1] = 0;
@@ -575,10 +563,8 @@ void Net_UnAcknowledgePacket(INT32 node)
 		if (!nodes[node].firstacktosend)
 			nodes[node].firstacktosend = 1;
 	}
-#endif
 }
 
-#ifndef NONET
 /** Checks if all acks have been received
   *
   * \return True if all acks have been received
@@ -596,7 +582,6 @@ static boolean Net_AllAcksReceived(void)
 
 	return true;
 }
-#endif
 
 /** Waits for all ackreturns
   *
@@ -605,9 +590,6 @@ static boolean Net_AllAcksReceived(void)
   */
 void Net_WaitAllAckReceived(UINT32 timeout)
 {
-#ifdef NONET
-	(void)timeout;
-#else
 	tic_t tictac = I_GetTime();
 	timeout = tictac + timeout*NEWTICRATE;
 
@@ -625,7 +607,6 @@ void Net_WaitAllAckReceived(UINT32 timeout)
 		HGetPacket();
 		Net_AckTicker();
 	}
-#endif
 }
 
 static void InitNode(node_t *node)
@@ -642,10 +623,8 @@ static void InitAck(void)
 {
 	INT32 i;
 
-#ifndef NONET
 	for (i = 0; i < MAXACKPACKETS; i++)
 		ackpak[i].acknum = 0;
-#endif
 
 	for (i = 0; i < MAXNETNODES; i++)
 		InitNode(&nodes[i]);
@@ -658,9 +637,6 @@ static void InitAck(void)
   */
 void Net_AbortPacketType(UINT8 packettype)
 {
-#ifdef NONET
-	(void)packettype;
-#else
 	for (INT32 i = 0; i < MAXACKPACKETS; i++)
 	{
 		if (ackpak[i].acknum && (ackpak[i].pak.data.packettype == packettype
@@ -669,7 +645,6 @@ void Net_AbortPacketType(UINT8 packettype)
 			ackpak[i].acknum = 0;
 		}
 	}
-#endif
 }
 
 // -----------------------------------------------------------------
@@ -679,11 +654,7 @@ void Net_AbortPacketType(UINT8 packettype)
 // remove a node, clear all ack from this node and reset askret
 void Net_CloseConnection(INT32 node)
 {
-#ifdef NONET
-	(void)node;
-#else
 	INT32 i;
-	boolean forceclose = (node & FORCECLOSE) != 0;
 
 	if (node == -1)
 	{
@@ -691,6 +662,8 @@ void Net_CloseConnection(INT32 node)
 		return; // nope, just ignore it
 	}
 
+	boolean forceclose = (node & FORCECLOSE) != 0;
+
 	node &= ~FORCECLOSE;
 
 	if (!node)
@@ -710,6 +683,12 @@ void Net_CloseConnection(INT32 node)
 		Net_SendAcks(node);
 		Net_SendAcks(node);
 	}
+	else
+	{
+		// if the connection hasn't acknowledged anything, it's possible for it to permanently occupy the node.
+		// to prevent this, drop the connection.
+		forceclose = true;
+ 	}
 
 	// check if we are waiting for an ack from this node
 	for (i = 0; i < MAXACKPACKETS; i++)
@@ -726,10 +705,8 @@ void Net_CloseConnection(INT32 node)
 	InitNode(&nodes[node]);
 	SV_AbortSendFiles(node);
 	I_NetFreeNodenum(node);
-#endif
 }
 
-#ifndef NONET
 //
 // Checksum
 //
@@ -745,10 +722,8 @@ static UINT32 NetbufferChecksum(void)
 
 	return LONG(c);
 }
-#endif
 
 #ifdef DEBUGFILE
-
 static void fprintfstring(char *s, size_t len)
 {
 	INT32 mode = 0;
@@ -1020,7 +995,6 @@ void Command_Droprate(void)
 	packetdroprate = droprate;
 }
 
-#ifndef NONET
 static boolean ShouldDropPacket(void)
 {
 	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
@@ -1028,7 +1002,6 @@ static boolean ShouldDropPacket(void)
 		|| (packetdroprate != 0 && rand() < (((double)RAND_MAX) * (packetdroprate / 100.f))) || packetdroprate == 100;
 }
 #endif
-#endif
 
 //
 // HSendPacket
@@ -1065,11 +1038,6 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 	if (!netgame)
 		I_Error("Tried to transmit to another node");
 
-#ifdef NONET
-	(void)node;
-	(void)reliable;
-	(void)acknum;
-#else
 	// do this before GetFreeAcknum because this function backups
 	// the current packet
 	doomcom->remotenode = (INT16)node;
@@ -1124,8 +1092,6 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 	}
 #endif
 
-#endif // ndef NONET
-
 	return true;
 }
 
@@ -1159,9 +1125,7 @@ boolean HGetPacket(void)
 	if (!netgame)
 		return false;
 
-#ifndef NONET
-
-	while(true)
+	while (true)
 	{
 		I_NetGet();
 
@@ -1201,9 +1165,9 @@ boolean HGetPacket(void)
 			GotAcks();
 			continue;
 		}
+		doomcom->datalength -= BASEPACKETSIZE;
 		break;
 	}
-#endif // ifndef NONET
 
 	return true;
 }
@@ -1258,13 +1222,12 @@ SINT8 I_NetMakeNode(const char *hostname)
 
 void D_SetDoomcom(void)
 {
-	if (doomcom) return;
+	if (doomcom)
+		return;
+
 	doomcom = Z_Calloc(sizeof (doomcom_t), PU_STATIC, NULL);
 	doomcom->id = DOOMCOM_ID;
 	doomcom->numslots = doomcom->numnodes = 1;
-	doomcom->gametype = 0;
-	doomcom->consoleplayer = 0;
-	doomcom->extratics = 0;
 }
 
 //

src/d_net.h

@@ -53,10 +53,8 @@ void Net_AckTicker(void);
 boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlength);
 boolean HGetPacket(void);
 void D_SetDoomcom(void);
-#ifndef NONET
 void D_SaveBan(void);
 void D_LoadBan(boolean warning);
-#endif
 boolean D_CheckNetGame(void);
 void D_CloseConnection(void);
 void Net_UnAcknowledgePacket(INT32 node);

src/d_netcmd.c

@@ -277,7 +277,8 @@ consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0,
 INT32 cv_debug;
 
 static void UseMouse_OnChange(void);
-consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, UseMouse_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL, usemouse_cons_t, UseMouse_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mousevisible = {"mousevisible", "Off", CV_SAVE|CV_CALL, CV_OnOff, UseMouse_OnChange, 0, NULL, NULL, 0, 0, NULL};
 
 static void UseMouse_OnChange(void)
 {
@@ -720,10 +721,8 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_killingdead);
 
 	// d_clisrv
-#ifndef NONET
 #ifdef SATURNJOIN
 	CV_RegisterVar(&cv_allownewsaturnplayer); // need to register it before cv_maxplayers && cv_allownewplayer
-#endif
 #endif
 	CV_RegisterVar(&cv_maxplayers);
 	CV_RegisterVar(&cv_resynchattempts);
@@ -736,18 +735,15 @@ void D_RegisterServerCommands(void)
 	CV_RegisterVar(&cv_downloadspeed);
     CV_RegisterVar(&cv_connectawaittime);
 	CV_RegisterVar(&cv_httpsource);
-#ifndef NONET
 	CV_RegisterVar(&cv_allownewplayer);
 
 	CV_RegisterVar(&cv_joinrefusemessage);
+
 	CV_RegisterVar(&cv_chatlogsize);
-#ifdef VANILLAJOINNEXTROUND
-	CV_RegisterVar(&cv_joinnextround);
-#endif
+
 	CV_RegisterVar(&cv_showjoinaddress);
 	CV_RegisterVar(&cv_shownodeip);
 	CV_RegisterVar(&cv_blamecfail);
-#endif
 
 	COM_AddCommand("ping", Command_Ping_f);
 	CV_RegisterVar(&cv_nettimeout);
@@ -849,15 +845,10 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_zlib_memory);
 	CV_RegisterVar(&cv_zlib_strategy);
 	CV_RegisterVar(&cv_zlib_window_bits);
-	// APNG variables
-	CV_RegisterVar(&cv_zlib_levela);
-	CV_RegisterVar(&cv_zlib_memorya);
-	CV_RegisterVar(&cv_zlib_strategya);
-	CV_RegisterVar(&cv_zlib_window_bitsa);
-	CV_RegisterVar(&cv_apng_delay);
 	// GIF variables
 	CV_RegisterVar(&cv_gif_optimize);
 	CV_RegisterVar(&cv_gif_downscale);
+	CV_RegisterVar(&cv_gif_dynamicdelay);
 
 #ifdef WALLSPLATS
 	CV_RegisterVar(&cv_splats);
@@ -937,6 +928,7 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_consolechat);
 	CV_RegisterVar(&cv_chatnotifications);
 	CV_RegisterVar(&cv_chatbacktint);
+	CV_RegisterVar(&cv_chatcentertext);
 	CV_RegisterVar(&cv_songcredits);
 	CV_RegisterVar(&cv_showfreeplay);
 	CV_RegisterVar(&cv_skinselectspin);
@@ -1002,6 +994,7 @@ void D_RegisterClientCommands(void)
 	CV_RegisterVar(&cv_invertmouse);
 	CV_RegisterVar(&cv_mousesens);
 	CV_RegisterVar(&cv_mouseysens);
+	CV_RegisterVar(&cv_mousevisible);
 
 	// s_sound.c
 	CV_RegisterVar(&cv_soundvolume);
@@ -1023,6 +1016,7 @@ void D_RegisterClientCommands(void)
 	// screen.c
 	CV_RegisterVar(&cv_fullscreen);
 	CV_RegisterVar(&cv_renderview);
+	CV_RegisterVar(&cv_frameskip);
 	CV_RegisterVar(&cv_vhseffect);
 	CV_RegisterVar(&cv_shittyscreen);
 	CV_RegisterVar(&cv_scr_width);
@@ -1528,12 +1522,7 @@ static void SendNameAndColor(void)
 		if (players[consoleplayer].mo)
 			players[consoleplayer].mo->color = players[consoleplayer].skincolor;
 
-		if (metalrecording)
-		{ // Metal Sonic is Sonic, obviously.
-			SetPlayerSkinByNum(consoleplayer, 0);
-			CV_StealthSet(&cv_skin, skins[0].name);
-		}
-		else if ((foundskin = R_SkinAvailable(cv_skin.string)) != -1)
+		if ((foundskin = R_SkinAvailable(cv_skin.string)) != -1)
 		{
 			cv_skin.value = foundskin;
 			SetPlayerSkin(consoleplayer, cv_skin.string);
@@ -2323,8 +2312,6 @@ static void Command_Playdemo_f(void)
 	// disconnect from server here?
 	if (demo.playback)
 		G_StopDemo();
-	if (metalplayback)
-		G_StopMetalDemo();
 
 	// open the demo file
 	strcpy(name, COM_Argv(1));
@@ -2371,8 +2358,6 @@ static void Command_Timedemo_f(void)
 	// disconnect from server here?
 	if (demo.playback)
 		G_StopDemo();
-	if (metalplayback)
-		G_StopMetalDemo();
 
 	// open the demo file
 	strcpy (name, COM_Argv(1));
@@ -2505,6 +2490,14 @@ void D_SetupVote(void)
 	UINT8 gt = (cv_kartgametypepreference.value == -1) ? gametype : cv_kartgametypepreference.value;
 	UINT8 secondgt = G_SometimesGetDifferentGametype(gt);
 	INT16 votebuffer[4] = {-1,-1,-1,0};
+	INT16 luamaps[4] = {0, 0, 0, 0};
+
+	LUA_HookSetupVote(luamaps, sizeof(luamaps)/sizeof(luamaps[0]), gt, secondgt);
+
+	// Correct secondgt if needed
+	UINT8 typeoflevel = mapheaderinfo[luamaps[2]-1]->typeoflevel;
+	if (luamaps[2] && (typeoflevel & G_TOLFlag(secondgt&(~0x80))) == 0)
+		secondgt = ((typeoflevel & TOL_RACE) ? GT_RACE : GT_MATCH)|(secondgt&0x80);
 
 	if (cv_kartencore.value && gt == GT_RACE)
 		WRITEUINT8(p, (gt|0x80));
@@ -2513,10 +2506,13 @@ void D_SetupVote(void)
 	WRITEUINT8(p, secondgt);
 	secondgt &= ~0x80;
 
+
 	for (i = 0; i < 4; i++)
 	{
 		UINT16 m;
-		if (i == 2) // sometimes a different gametype
+		if (luamaps[i])
+			m = luamaps[i]-1;
+		else if (i == 2) // sometimes a different gametype
 			m = G_RandMap(G_TOLFlag(secondgt), prevmap, false, 0, true, votebuffer);
 		else if (i >= 3) // unknown-random and force-unknown MAP HELL
 			m = G_RandMap(G_TOLFlag(gt), prevmap, false, (i-2), (i < 4), votebuffer);
@@ -2918,8 +2914,6 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
 	if (demo.timing)
 		G_DoneLevelLoad();
 
-	if (metalrecording)
-		G_BeginMetal();
 	if (demo.recording) // Okay, level loaded, character spawned and skinned,
 		G_BeginRecording(); // I AM NOW READY TO RECORD.
 	demo.deferstart = true;
@@ -4382,6 +4376,14 @@ static void Command_Addfilelocal(void)
 	P_AddWadFile(fn, true);
 }
 
+static void CloseFileHandle(FILE **fhandle)
+{
+	if (*fhandle)
+	{
+		fclose(*fhandle);
+		*fhandle = NULL;
+	}
+}
 
 /** Adds a pwad at runtime.
   * Searches for sounds, maps, music, new images.
@@ -4392,7 +4394,9 @@ static void Command_Addfile(void)
 	char buf[256];
 	char *buf_p = buf;
 	INT32 i;
-	int musiconly; // W_VerifyNMUSlumps isn't boolean
+	int musiconly = -1; // W_VerifyNMUSlumps isn't boolean
+
+	CLEANUP(CloseFileHandle) FILE *fhandle = NULL;
 
 	if (COM_Argc() != 2)
 	{
@@ -4407,7 +4411,13 @@ static void Command_Addfile(void)
 		if (!isprint(fn[i]) || fn[i] == ';')
 			return;
 
-	musiconly = W_VerifyNMUSlumps(fn);
+	if ((fhandle = W_OpenWadFile(&fn, true)) != NULL)
+	{
+		musiconly = W_VerifyNMUSlumps(fn, fhandle, false);
+	}
+
+	if (fhandle == NULL || musiconly == -1)
+		return; // file not found
 
 	if (!musiconly)
 	{
@@ -4433,26 +4443,19 @@ static void Command_Addfile(void)
 			break;
 	++p;
 
-	WRITESTRINGN(buf_p,p,240);
-
 	// calculate and check md5
 	{
 		UINT8 md5sum[16];
 #ifdef NOMD5
-		memset(md5sum,0,16);
+		memset(md5sum, 0, 16);
 #else
-		FILE *fhandle;
 
-		if ((fhandle = W_OpenWadFile(&fn, true)) != NULL)
 		{
 			tic_t t = I_GetTime();
 			CONS_Debug(DBG_SETUP, "Making MD5 for %s\n",fn);
 			md5_stream(fhandle, md5sum);
 			CONS_Debug(DBG_SETUP, "MD5 calc for %s took %f second\n", fn, (float)(I_GetTime() - t)/TICRATE);
-			fclose(fhandle);
 		}
-		else // file not found
-			return;
 
 		for (i = 0; i < numwadfiles; i++)
 		{
@@ -4463,13 +4466,15 @@ static void Command_Addfile(void)
 			}
 		}
 #endif
+		// Finally okay to write this important data
+		WRITESTRINGN(buf_p, p, 240);
 		WRITEMEM(buf_p, md5sum, 16);
 	}
 
 	if (IsPlayerAdmin(consoleplayer) && (!server)) // Request to add file
 		SendNetXCmd(XD_REQADDFILE, buf, buf_p - buf);
 	else
-		SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
+		SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);;
 }
 
 /** Adds something at runtime.
@@ -4660,7 +4665,7 @@ static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
 		return;
 	}
 
-	ncs = findfile(filename,md5sum,true);
+	ncs = findfile(filename, md5sum, true);
 
 	if (ncs != FS_FOUND || !P_AddWadFile(filename, false))
 	{
@@ -4873,18 +4878,7 @@ static void Command_Version_f(void)
 #endif
 
 	// OS
-	// Would be nice to use SDL_GetPlatform for this
-#if defined (_WIN32) || defined (_WIN64)
-	CONS_Printf("Windows ");
-#elif defined(__linux__)
-	CONS_Printf("Linux ");
-#elif defined(MACOSX)
-	CONS_Printf("macOS ");
-#elif defined(UNIXCOMMON)
-	CONS_Printf("Unix (Common) ");
-#else
-	CONS_Printf("Other OS ");
-#endif
+	CONS_Printf("%s ", I_GetSysName());
 
 	// Bitness
 	if (sizeof(void*) == 4)
@@ -5272,7 +5266,7 @@ retryscramble:
 	memset(&scrambleplayers, 0, sizeof(scrambleplayers));
 	memset(&scrambleteams, 0, sizeof(scrambleplayers));
 	scrambletotal = scramblecount = 0;
-	blue = red = maxcomposition = newteam = playercount = 0;
+	blue = red = newteam = playercount = 0;
 	repick = true;
 
 	// Put each player's node in the array.
@@ -5593,7 +5587,9 @@ void Command_ExitGame_f(void)
 		closefilemenu(true);
 
 	if (!modeattacking)
+	{
 		D_StartTitle();
+	}
 }
 
 void Command_Retry_f(void)

src/d_netcmd.h

@@ -50,6 +50,7 @@ extern consvar_t cv_splitplayers;
 extern consvar_t cv_seenames, cv_allowseenames;
 #endif
 extern consvar_t cv_usemouse;
+extern consvar_t cv_mousevisible;
 //WTF
 extern consvar_t cv_mouseturn;
 extern consvar_t cv_usejoystick[4]; //MAXSPLITSCREENPLAYERS
@@ -265,14 +266,6 @@ typedef enum
 
 extern const char *netxcmdnames[MAXNETXCMD - 1];
 
-#if defined(_MSC_VER)
-#pragma pack(1)
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(disable :  4214)
-#endif
-
 //Packet composition for Command_TeamChange_f() ServerTeamChange, etc.
 //bitwise structs make packing bits a little easier, but byte alignment harder?
 //todo: decide whether to make the other netcommands conform, or just get rid of this experiment.
@@ -284,10 +277,6 @@ typedef struct {
 	UINT32 scrambled    : 1;  // value 0 to 1
 } ATTRPACK changeteam_packet_t;
 
-#ifdef _MSC_VER
-#pragma warning(default : 4214)
-#endif
-
 typedef struct {
 	UINT16 l; // liitle endian
 	UINT16 b; // big enian
@@ -301,10 +290,6 @@ typedef union {
 	changeteam_value_t value;
 } ATTRPACK changeteam_union;
 
-#if defined(_MSC_VER)
-#pragma pack()
-#endif
-
 // add game commands, needs cleanup
 void D_RegisterServerCommands(void);
 void D_RegisterClientCommands(void);

src/d_netfil.c

@@ -35,7 +35,8 @@
 #endif
 
 #ifdef HAVE_CURL
-#include "curl/curl.h"
+#include <curl/curl.h>
+#include "m_curl.h"
 #endif
 
 #include "doomdef.h"
@@ -120,6 +121,7 @@ file_download_t filedownload;
 
 #ifdef HAVE_CURL
 static CURL *http_handle;
+static char curl_errbuf[CURL_ERROR_SIZE];
 static CURLM *multi_handle;
 static UINT32 curl_dlnow;
 static UINT32 curl_dltotal;
@@ -163,7 +165,8 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
 		nameonly(strcpy(wadfilename, wadfiles[i]->filename));
 
 		// Look below at the WRITE macros to understand what these numbers mean.
-		if (p + 1 + 4 + min(strlen(wadfilename) + 1, MAX_WADPATH) + 16 > p_start + MAXFILENEEDED)
+		const size_t len = strlen(wadfilename) + 1;
+		if (p + 1 + 4 + min(len, MAX_WADPATH) + 16 > p_start + MAXFILENEEDED)
 		{
 			// Too many files to send all at once
 			if (netbuffer->packettype == PT_MOREFILESNEEDED)
@@ -178,7 +181,7 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
 		// Store in the upper four bits
 		if (!cv_downloading.value)
 			filestatus += (2 << 4); // Won't send
-		else if ((wadfiles[i]->filesize <= (UINT32)cv_maxsend.value * 1024))
+		else if (cv_maxsend.value == -1 || wadfiles[i]->filesize <= (UINT32)cv_maxsend.value * 1024)
 			filestatus += (1 << 4); // Will send if requested
 		// else
 			// filestatus += (0 << 4); -- Won't send, too big
@@ -212,6 +215,7 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
 
 	fileneedednum = firstfile + fileneedednum_parm;
 	p = (UINT8 *)fileneededstr;
+
 	for (i = firstfile; i < fileneedednum; i++)
 	{
 		fileneeded[i].status = FS_NOTCHECKED; // We haven't even started looking for the file yet
@@ -227,9 +231,7 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
 
 void CL_PrepareDownloadSaveGame(const char *tmpsave)
 {
-#ifdef CLIENT_LOADINGSCREEN
 	filedownload.current = -1;
-#endif
 	fileneedednum = 1;
 	fileneeded[0].status = FS_REQUESTED;
 	fileneeded[0].justdownloaded = false;
@@ -491,9 +493,6 @@ INT32 CL_CheckFiles(void)
 	size_t filestoload = 0;
 	boolean downloadrequired = false;
 
-//	if (M_CheckParm("-nofiles"))
-//		return 1;
-
 	// the first is the iwad (the main wad file)
 	// we don't care if it's called srb2.srb or srb2.wad.
 	// Never download the IWAD, just assume it's there and identical
@@ -507,11 +506,9 @@ INT32 CL_CheckFiles(void)
 	{
 		CONS_Debug(DBG_NETPLAY, "game is modified; only doing basic checks\n");
 
-		boolean have_important = false;
-
 		for (i = 0, j = mainwads+1; i < fileneedednum || j < numwadfiles;)
 		{
-			if (j < numwadfiles && (!wadfiles[j]->important || wadfiles[j]->localfile))
+			if (j < numwadfiles && !wadfiles[j]->important) // TODO: add checks for localfiles that dont contain anything "allowed" (maps and stuff like that)
 			{
 				// Unimportant on our side. still don't care.
 				++j;
@@ -520,15 +517,7 @@ INT32 CL_CheckFiles(void)
 
 			// If this test is true, we've reached the end of one file list.
 			if (i >= fileneedednum || j >= numwadfiles)
-			{
-				// We are missing some of important files, or have too much
-				// important files.
-				if (have_important)
-					return 2;
-
-				// All checked files weren't important, don't care about them.
-				break;
-			}
+				return 2;
 
 			// For the sake of speed, only bother with a md5 check
 			if (memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
@@ -536,14 +525,12 @@ INT32 CL_CheckFiles(void)
 
 			// It's accounted for! let's keep going.
 			CONS_Debug(DBG_NETPLAY, "'%s' accounted for\n", fileneeded[i].filename);
-			have_important = true;
 			fileneeded[i].status = FS_OPEN;
 			++i;
 			++j;
 		}
 
-		if (have_important)
-			return 1;
+		return 1;
 	}
 
 	for (i = 0; i < fileneedednum; i++)
@@ -591,9 +578,6 @@ boolean CL_LoadServerFiles(void)
 {
 	INT32 i;
 
-//	if (M_CheckParm("-nofiles"))
-//		return;
-
 	for (i = 0; i < fileneedednum; i++)
 	{
 		if (fileneeded[i].status == FS_OPEN)
@@ -629,6 +613,7 @@ boolean CL_LoadServerFiles(void)
 				fileneeded[i].status, s);
 		}
 	}
+
 	return true;
 }
 
@@ -648,7 +633,8 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 {
 	filetx_t **q; // A pointer to the "next" field of the last file in the list
 	filetx_t *p; // The new file request
-	INT32 i;
+	UINT16 wadnum;
+
 	char wadfilename[MAX_WADPATH];
 
 	if (cv_noticedownload.value)
@@ -674,20 +660,21 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 	nameonly(p->id.filename);
 
 	// Look for the requested file through all loaded files
-	for (i = 0; wadfiles[i]; i++)
+	for (wadnum = 0; wadfiles[wadnum]; wadnum++)
 	{
-		strlcpy(wadfilename, wadfiles[i]->filename, MAX_WADPATH);
+		strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
 		nameonly(wadfilename);
+
 		if (!stricmp(wadfilename, p->id.filename))
 		{
 			// Copy file name with full path
-			strlcpy(p->id.filename, wadfiles[i]->filename, MAX_WADPATH);
+			strlcpy(p->id.filename, wadfiles[wadnum]->filename, MAX_WADPATH);
 			break;
 		}
 	}
 
 	// Handle non-loaded file requests
-	if (!wadfiles[i])
+	if (!wadfiles[wadnum])
 	{
 		DEBFILE(va("%s not found in wadfiles\n", filename));
 		// This formerly checked if (!findfile(p->id.filename, NULL, true))
@@ -702,7 +689,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
 	}
 
 	// Handle huge file requests (i.e. bigger than cv_maxsend.value KB)
-	if (wadfiles[i]->filesize > (UINT32)cv_maxsend.value * 1024)
+	if (cv_maxsend.value != -1 && wadfiles[wadnum]->filesize > (UINT32)cv_maxsend.value * 1024)
 	{
 		// Too big
 		// Don't inform client (client sucks, man)
@@ -773,6 +760,7 @@ static void SV_EndFileSend(INT32 node)
 		case SF_FILE: // It's a file, close it and free its filename
 			if (cv_noticedownload.value)
 				CONS_Printf("Ending file transfer (id %d) for node %d\n", p->fileid, node);
+
 			if (transferFiles[p->fileid].file)
 			{
 				if (transferFiles[p->fileid].count > 0)
@@ -786,6 +774,7 @@ static void SV_EndFileSend(INT32 node)
 					transferFiles[p->fileid].file = NULL;
 				}
 			}
+
 			free(p->id.filename);
 			break;
 		case SF_Z_RAM: // It's a memory block allocated with Z_Alloc or the likes, use Z_Free
@@ -821,11 +810,12 @@ void SV_FileSendTicker(void)
 	size_t size;
 	filetx_t *f;
 	INT32 packetsent, ram, i, j;
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	if (!filestosend) // No file to send
 		return;
 
+	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+
 	packetsent = cv_downloadspeed.value;
 
 	netbuffer->packettype = PT_FILEFRAGMENT;
@@ -957,8 +947,8 @@ void Got_Filetxpak(void)
 	static INT32 filetime = 0;
 
 	if (!(strcmp(filename, "srb2.srb")
-		&& strcmp(filename, "srb2.wad")
-		&& strcmp(filename, "patch.dta")
+		//&& strcmp(filename, "srb2.wad")
+		//&& strcmp(filename, "patch.dta")
 		//&& strcmp(filename, "music.dta")
 		&& strcmp(filename, "gfx.kart")
 		&& strcmp(filename, "textures.kart")
@@ -1001,6 +991,7 @@ void Got_Filetxpak(void)
 			pos &= ~0x80000000;
 			file->totalsize = pos + size;
 		}
+
 		// We can receive packet in the wrong order, anyway all os support gaped file
 		fseek(file->file, pos, SEEK_SET);
 		if (fwrite(netbuffer->u.filetxpak.data,size,1,file->file) != 1)
@@ -1014,17 +1005,16 @@ void Got_Filetxpak(void)
 			file->file = NULL;
 			file->status = FS_FOUND;
 			file->justdownloaded = true;
-			CONS_Printf(M_GetText("Downloading %s...(done)\n"),
-				filename);
-#ifndef NONET
+			CONS_Printf(M_GetText("Downloading %s...(done)\n"), filename);
+
 			filedownload.completednum++;
 			filedownload.completedsize += file->totalsize;
-#endif
 		}
 	}
 	else if (!file->justdownloaded)
 	{
 		const char *s;
+
 		switch(file->status)
 		{
 		case FS_NOTFOUND:
@@ -1043,6 +1033,7 @@ void Got_Filetxpak(void)
 			s = "unknown";
 			break;
 		}
+
 		I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
 	}
 
@@ -1053,9 +1044,7 @@ void Got_Filetxpak(void)
 		filetime = 0;
 	}
 
-#ifdef CLIENT_LOADINGSCREEN
 	filedownload.current = filenum;
-#endif
 }
 
 /** \brief Checks if a node is downloading a file
@@ -1173,28 +1162,56 @@ filestatus_t findfile(char *filename, const UINT8 *wantedmd5sum, boolean complet
 	filestatus_t homecheck; // store result of last file search
 	boolean badmd5 = false; // store whether md5 was bad from either of the first two searches (if nothing was found in the third)
 
-	// first, check SRB2's "home" directory
-	homecheck = filesearch(filename, srb2home, wantedmd5sum, completepath, 10);
-
-	if (homecheck == FS_FOUND) // we found the file, so return that we have :)
-		return FS_FOUND;
-	else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5
-		badmd5 = true;
-	// if not found at all, just move on without doing anything
-
-	// next, check SRB2's "path" directory
-	homecheck = filesearch(filename, srb2path, wantedmd5sum, completepath, 10);
-
-	if (homecheck == FS_FOUND) // we found the file, so return that we have :)
-		return FS_FOUND;
-	else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5
-		badmd5 = true;
-	// if not found at all, just move on without doing anything
-
-	if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
+	// skip for startup, our mainwads wont be in there
+	if (loaded_config)
 	{
-		// next, check any custom directory if specified
-		homecheck = filesearch(filename, cv_addons_folder.string, wantedmd5sum, completepath, 10);
+		if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0')
+		{
+			// first, check any custom directory if specified
+			homecheck = filesearch(filename, cv_addons_folder.string, wantedmd5sum, completepath, 10);
+
+			if (homecheck == FS_FOUND) // we found the file, so return that we have :)
+				return FS_FOUND;
+			else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5
+				badmd5 = true;
+			// if not found at all, just move on without doing anything
+		}
+
+		// next, check "DOWNLOAD" directory
+		homecheck = filesearch(filename, "DOWNLOAD", wantedmd5sum, completepath, 10);
+
+		if (homecheck == FS_FOUND) // we found the file, so return that we have :)
+			return FS_FOUND;
+		else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5
+			badmd5 = true;
+		// if not found at all, just move on without doing anything
+
+		// next, check "addons" directory
+		homecheck = filesearch(filename, "addons", wantedmd5sum, completepath, 10);
+
+		if (homecheck == FS_FOUND) // we found the file, so return that we have :)
+			return FS_FOUND;
+		else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5
+			badmd5 = true;
+		// if not found at all, just move on without doing anything
+	}
+
+	// next, check SRB2's "home" directory (if non-'.')
+	if (strcmp(srb2home, "."))
+	{
+		homecheck = filesearch(filename, srb2home, wantedmd5sum, completepath, 10);
+
+		if (homecheck == FS_FOUND) // we found the file, so return that we have :)
+			return FS_FOUND;
+		else if (homecheck == FS_MD5SUMBAD) // file has a bad md5; move on and look for a file with the right md5
+			badmd5 = true;
+		// if not found at all, just move on without doing anything
+	}
+
+	// next, check SRB2's "path" directory (also if non-'.')
+	if (strcmp(srb2path, "."))
+	{
+		homecheck = filesearch(filename, srb2path, wantedmd5sum, completepath, 10);
 
 		if (homecheck == FS_FOUND) // we found the file, so return that we have :)
 			return FS_FOUND;
@@ -1273,6 +1290,7 @@ static int curlprogress_callback(void *clientp, double dltotal, double dlnow, do
 void CURLPrepareFile(const char* url, int dfilenum)
 {
 	HTTP_login *login;
+	CURLcode cc;
 
 #ifdef PARANOIA
 	if (M_CheckParm("-nodownload"))
@@ -1281,14 +1299,33 @@ void CURLPrepareFile(const char* url, int dfilenum)
 
 	if (!multi_handle)
 	{
-		curl_global_init(CURL_GLOBAL_ALL);
-		multi_handle = curl_multi_init();
+		cc = curl_global_init(CURL_GLOBAL_ALL);
+		if (cc < 0)
+		{
+			I_OutputMsg("libcurl: curl_global_init() returned %d\n", cc);
+		}
+		else
+		{
+			multi_handle = curl_multi_init();
+		}
+		if (!multi_handle)
+		{
+			I_OutputMsg("libcurl: curl_multi_init() failed\n");
+			curl_global_cleanup();
+			return;
+		}
 	}
 
 	http_handle = curl_easy_init();
 
-	if (http_handle && multi_handle)
+	if (http_handle)
 	{
+		CURLMcode mc;
+
+		cc = curl_easy_setopt(http_handle, CURLOPT_ERRORBUFFER, curl_errbuf);
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: CURLOPT_ERRORBUFFER failed\n");
+		curl_errbuf[0] = 0x00;
+
 		I_mkdir(downloaddir, 0755);
 
 		curl_curfile = &fileneeded[dfilenum];
@@ -1298,31 +1335,38 @@ void CURLPrepareFile(const char* url, int dfilenum)
 		curl_origfilesize = curl_curfile->currentsize;
 		curl_origtotalfilesize = curl_curfile->totalsize;
 
-		curl_easy_setopt(http_handle, CURLOPT_URL, va("%s/%s", url, curl_realname));
+		cc = curl_easy_setopt(http_handle, CURLOPT_URL, va("%s/%s", url, curl_realname));
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
 
 		// Only allow HTTP and HTTPS
 #if (LIBCURL_VERSION_MAJOR <= 7) && (LIBCURL_VERSION_MINOR < 85)
-		curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
+		cc = curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
 #else
-		curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS_STR, "http,https");
+		cc = curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS_STR, "http,https");
 #endif
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
 
-		curl_easy_setopt(http_handle, CURLOPT_USERAGENT, va("SRB2Kart/v%d.%d", VERSION, SUBVERSION)); // Set user agent as some servers won't accept invalid user agents.
+		// Set user agent, as some servers won't accept invalid user agents.
+		cc = curl_easy_setopt(http_handle, CURLOPT_USERAGENT, va("SRB2Kart/v%d.%d", VERSION, SUBVERSION));
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
 
 		// Authenticate if the user so wishes
 		login = CURLGetLogin(url, NULL);
 
 		if (login)
 		{
-			curl_easy_setopt(http_handle, CURLOPT_USERPWD, login->auth);
+			cc = curl_easy_setopt(http_handle, CURLOPT_USERPWD, login->auth);
+			if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
 		}
 
 		// Follow a redirect request, if sent by the server.
-		curl_easy_setopt(http_handle, CURLOPT_FOLLOWLOCATION, 1L);
+		cc = curl_easy_setopt(http_handle, CURLOPT_FOLLOWLOCATION, 1L);
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
 
-		curl_easy_setopt(http_handle, CURLOPT_FAILONERROR, 1L);
+		cc = curl_easy_setopt(http_handle, CURLOPT_FAILONERROR, 1L);
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
 
-		CONS_Printf("Downloading %s from %s\n", curl_realname, url);
+		CONS_Printf("Downloading addon \"%s\" from %s\n", curl_realname, url);
 
 		strcatbf(curl_curfile->filename, downloaddir, "/");
 		curl_curfile->file = fopen(curl_curfile->filename, "wb");
@@ -1341,19 +1385,33 @@ void CURLPrepareFile(const char* url, int dfilenum)
 			return;
 		}
 
-		curl_easy_setopt(http_handle, CURLOPT_WRITEDATA, curl_curfile->file);
-		curl_easy_setopt(http_handle, CURLOPT_WRITEFUNCTION, curlwrite_data);
-		curl_easy_setopt(http_handle, CURLOPT_NOPROGRESS, 0L);
+		cc = curl_easy_setopt(http_handle, CURLOPT_WRITEDATA, curl_curfile->file);
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
+
+		cc = curl_easy_setopt(http_handle, CURLOPT_WRITEFUNCTION, curlwrite_data);
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
+
+		cc = curl_easy_setopt(http_handle, CURLOPT_NOPROGRESS, 0L);
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
+
 #ifdef XFERINFOFUNCTION
-		curl_easy_setopt(http_handle, CURLOPT_XFERINFOFUNCTION, curlprogress_callbackx);
+		cc = curl_easy_setopt(http_handle, CURLOPT_XFERINFOFUNCTION, curlprogress_callbackx);
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
 #else
-		curl_easy_setopt(http_handle, CURLOPT_PROGRESSFUNCTION, curlprogress_callback);
+		cc = curl_easy_setopt(http_handle, CURLOPT_PROGRESSFUNCTION, curlprogress_callback);
+		if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
 #endif
 
+		M_SetCURLArgs(http_handle, curl_errbuf);
+
 		curl_curfile->status = FS_DOWNLOADING;
-		curl_multi_add_handle(multi_handle, http_handle);
+
+		mc = curl_multi_add_handle(multi_handle, http_handle);
+		if (mc != CURLM_OK) I_OutputMsg("libcurl: %s\n", curl_multi_strerror(mc));
+
+		mc = curl_multi_perform(multi_handle, &curl_runninghandles);
+		if (mc != CURLM_OK) I_OutputMsg("libcurl: %s\n", curl_multi_strerror(mc));
 
-		curl_multi_perform(multi_handle, &curl_runninghandles);
 		curl_starttime = time(NULL);
 
 		filedownload.current = dfilenum;
@@ -1395,14 +1453,15 @@ void CURLGetFile(void)
     {
     	if (curl_runninghandles)
 		{
-			curl_multi_perform(multi_handle, &curl_runninghandles);
+			mc = curl_multi_perform(multi_handle, &curl_runninghandles);
+			if (mc != CURLM_OK) I_OutputMsg("libcurl: %s\n", curl_multi_strerror(mc));
 
 			/* wait for activity, timeout or "nothing" */
 			mc = curl_multi_wait(multi_handle, NULL, 0, 1000, NULL);
 
 			if (mc != CURLM_OK)
 			{
-				CONS_Alert(CONS_WARNING, "curl_multi_wait() failed, code %d.\n", mc);
+				CONS_Alert(CONS_WARNING, "curl_multi_wait() failed: %s.\n", curl_multi_strerror(mc));
 				continue;
 			}
 
@@ -1460,7 +1519,8 @@ void CURLGetFile(void)
 				Z_Free(filename);
 				curl_curfile->file = NULL;
 				filedownload.remaining--;
-				curl_multi_remove_handle(multi_handle, e);
+				mc = curl_multi_remove_handle(multi_handle, e);
+				if (mc != CURLM_OK) I_OutputMsg("libcurl: %s\n", curl_multi_strerror(mc));
 				curl_easy_cleanup(e);
 
 				if (!filedownload.remaining)
@@ -1471,7 +1531,8 @@ void CURLGetFile(void)
 
     if (!filedownload.remaining || !filedownload.http_running)
     {
-		curl_multi_cleanup(multi_handle);
+		mc = curl_multi_cleanup(multi_handle);
+		if (mc != CURLM_OK) I_OutputMsg("libcurl: %s\n", curl_multi_strerror(mc));
 		curl_global_cleanup();
 		multi_handle = NULL;
     }

src/d_netfil.h

@@ -59,19 +59,15 @@ extern char downloaddir[512];
 
 typedef struct
 {
-#ifdef CLIENT_LOADINGSCREEN
 	INT32 current;
 	INT32 completednum;
 	UINT32 completedsize;
 	INT32 totalnum;
 	UINT32 totalsize;
-#endif
-
 #ifdef HAVE_CURL
 	INT32 remaining;
 	boolean http_failed;
 	boolean http_running;
-
 	char http_source[MAX_MIRROR_LENGTH+1];
 #endif
 } file_download_t;
@@ -79,7 +75,6 @@ typedef struct
 extern file_download_t filedownload;
 
 #ifdef HAVE_CURL
-
 typedef struct HTTP_login HTTP_login;
 
 extern struct HTTP_login

src/d_player.h

@@ -383,10 +383,6 @@ typedef struct player_s
 	fixed_t viewz;
 	// Base height above floor for viewz.
 	fixed_t viewheight;
-	// Bob/squat speed.
-	//fixed_t deltaviewheight;
-	// bounded/scaled total momentum.
-	//fixed_t bob;
 
 	angle_t viewrollangle;
 	angle_t tilt;
@@ -568,6 +564,8 @@ typedef struct player_s
 	squishdance_t squishdance;
 
 	fixed_t fovadd; // adjust FOV for hw rendering
+
+	SINT8 driftlevel; // just for controller rumble for now
 } player_t;
 
 #endif

src/d_protocol.c

@@ -22,6 +22,7 @@
 
 #ifdef HAVE_CURL
 #include <curl/curl.h>
+#include "m_curl.h"
 #endif
 
 #include "doomdef.h"
@@ -60,7 +61,7 @@ static boolean RegisterProtocols(const char *path)
 	HKEY hKey = OpenKey(HKEY_CURRENT_USER,"Software\\Classes\\srb2kart");
 	SetStringValue(hKey, "URL Protocol", "");
 	RegCloseKey(hKey);
-	hKey = OpenKey(HKEY_CURRENT_USER,"Software\\Classes\\srb2kart\\shell\\open\\command");	
+	hKey = OpenKey(HKEY_CURRENT_USER,"Software\\Classes\\srb2kart\\shell\\open\\command");
 	SetStringValue(hKey, "", va("\"%s\" \"%%1\"", path));
 	RegCloseKey(hKey);
 #elif defined (__unix__) || defined (UNIXCOMMON)
@@ -76,12 +77,12 @@ static boolean RegisterProtocols(const char *path)
 
 	if (system("which update-desktop-database > /dev/null 2>&1"))
 	{
-		// command not found, probably doesn't have freedesktop, so let's ignore		
+		// command not found, probably doesn't have freedesktop, so let's ignore
 		CONS_Alert(CONS_ERROR, "Unable to register protocols. Your system doesn't seem to have freedesktop.\n");
 		return false;
 	}
 
-	if (stat(applicationsfolder, &sb) == -1) 
+	if (stat(applicationsfolder, &sb) == -1)
 	{
 		// location doesn't exist, so let's actually create it
 		newfolder = true;
@@ -119,12 +120,13 @@ static boolean RegisterProtocols(const char *path)
 
 	if (!alreadyexists)
 		fprintf(mimefile, "x-scheme-handler/srb2kart=srb2kart-handler.desktop;\n");
-	
+
 	if (newfolder)
 	{
 		if (system(va("update-desktop-database %s/.local/share/applications/", homedir)) == -1)
 		{
 			CONS_Alert(CONS_ERROR, "Unable to register protocols. Could not run call to run update-desktop-database sucessfully.\n");
+			fclose(mimefile);
 			return false;
 		}
 	}
@@ -206,13 +208,14 @@ void D_SetupProtocol(void)
 
 	fp = fopen(protocolfile, "a+");
 	result = fgets(buffer, PATH_MAX, fp);
-	if (result) 
+
+	if (result)
 	{
 		if (strcmp(buffer, "no") == 0)
-        {
-            fclose(fp);
-            return;
-        }
+		{
+			fclose(fp);
+			return;
+		}
 		else if (strcmp(buffer, exe_path) != 0)
 		{
 			// overwrite
@@ -231,6 +234,7 @@ void D_SetupProtocol(void)
 		else
 			fprintf(fp, "no");
 	}
+
 	fclose(fp);
 }
 
@@ -254,8 +258,10 @@ void D_CreateProtocol(void)
 }
 
 #ifdef HAVE_CURL
+static char curl_errbuf[CURL_ERROR_SIZE];
 void D_DownloadReplay(const char *url, const char *path)
 {
+
 	FILE *fp = NULL;
 	CURL *curl;
 	CURLcode cc;
@@ -263,17 +269,29 @@ void D_DownloadReplay(const char *url, const char *path)
 	if (!curl)
 		I_Error("Unable to download replay. Error initializing CURL.");
 
+	cc = curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_errbuf);
+	if (cc != CURLE_OK) I_OutputMsg("libcurl: CURLOPT_ERRORBUFFER failed\n");
+	curl_errbuf[0] = 0x00;
+
 	fp = fopen(path, "wb");
 	CONS_Printf("REPLAY: URL: %s\n", url);
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-       	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlwrite_data);
-       	curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
 
-       	cc = curl_easy_perform(curl);
+	cc = curl_easy_setopt(curl, CURLOPT_URL, url);
+	if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
+
+	cc = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlwrite_data);
+	if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
+
+	cc = curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
+	if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", curl_errbuf);
+
+	M_SetCURLArgs(curl, curl_errbuf);
+
+	cc = curl_easy_perform(curl);
 	if (cc != CURLE_OK)
-		I_Error("Unable to download replay. URL gave response code %u.", cc);
+		I_Error("Unable to download replay. libcurl: %s.", curl_errbuf);
 
-       	curl_easy_cleanup(curl);
-       	fclose(fp);
+	curl_easy_cleanup(curl);
+	fclose(fp);
 }
 #endif

src/d_protocol.h

@@ -9,6 +9,9 @@
 /// \file  d_protocol.h
 /// \brief srb2kart:// protocol stuff
 
+#ifndef __D_PROTOCOL__
+#define __D_PROTOCOL__
+
 void D_SetupProtocol(void);
 
 void D_CreateProtocol(void);
@@ -16,3 +19,5 @@ void D_DeleteProtocol(void);
 #ifdef HAVE_CURL
 void D_DownloadReplay(const char *url, const char *path);
 #endif
+
+#endif //__D_PROTOCOL__

src/d_think.h

@@ -30,6 +30,15 @@
 //
 typedef void (*actionf_p1)(void *);
 
+typedef enum
+{
+	/// The allocation is standard e.g. Z_Malloc
+	TAT_MALLOC,
+
+	/// The allocation is in the pool allocator (e.g. Z_LevelPoolCalloc)
+	TAT_LEVELPOOL
+} thinker_alloc_type_e;
+
 // Historically, "think_t" is yet another function pointer to a routine
 // to handle an actor.
 typedef actionf_p1 think_t;
@@ -44,7 +53,9 @@ typedef struct thinker_s
 	// killough 11/98: count of how many other objects reference
 	// this one using pointers. Used for garbage collection.
 	INT32 references;
-	boolean cachable;
+	INT32 alloctype;
+	size_t size;
+
 #ifdef PARANOIA
 	INT32 debug_mobjtype;
 	tic_t debug_time;

src/d_ticcmd.h

@@ -50,10 +50,6 @@ typedef enum
 #define TICCMD_RECEIVED 1
 #define TICCMD_XY 2
 
-#if defined(_MSC_VER)
-#pragma pack(1)
-#endif
-
 typedef struct
 {
 	SINT8 forwardmove; // -MAXPLMOVE to MAXPLMOVE (50)
@@ -65,8 +61,4 @@ typedef struct
 	UINT8 latency; // Netgames: how many tics ago was this ticcmd generated from this player's end?
 } ATTRPACK ticcmd_t;
 
-#if defined(_MSC_VER)
-#pragma pack()
-#endif
-
 #endif

src/dedicated/i_main.c

@@ -138,8 +138,7 @@ static void InitLogging(void)
 
 		if (M_IsPathAbsolute(reldir))
 		{
-			left = snprintf(logfilename, sizeof logfilename,
-					"%s"PATHSEP, reldir);
+			left = snprintf(logfilename, sizeof logfilename, "%s"PATHSEP, reldir);
 		}
 		else
 #ifdef DEFAULTDIR
@@ -155,13 +154,10 @@ static void InitLogging(void)
 					"."PATHSEP"%s"PATHSEP, reldir);
 		}
 
-		strftime(&logfilename[left], sizeof logfilename - left,
-				format, timeinfo);
+		strftime(&logfilename[left], sizeof logfilename - left, format, timeinfo);
 	}
 
-	M_MkdirEachUntil(logfilename,
-			M_PathParts(logdir) - 1,
-			M_PathParts(logfilename) - 1, 0755);
+	M_MkdirEachUntil(logfilename, M_PathParts(logdir) - 1, M_PathParts(logfilename) - 1, 0755);
 
 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
 	logstream = fopen(logfilename, "w");
@@ -213,12 +209,9 @@ int main(int argc, char **argv)
 
 	//I_OutputMsg("I_StartupSystem() ...\n");
 	I_StartupSystem();
-#if defined (_WIN32)
-	{
-#ifdef DRMINGW
-		ExcHndlInit();
-#endif
-	}
+
+#ifdef HAVE_DRMINGW
+	InitDrMingw();
 #endif
 
 	// startup SRB2
@@ -228,11 +221,6 @@ int main(int argc, char **argv)
 	// never return
 	D_SRB2Loop();
 
-#ifdef BUGTRAP
-	// This is safe even if BT didn't start.
-	ShutdownBugTrap();
-#endif
-
 	// return to OS
 	return 0;
 }

src/dedicated/i_sound.c

@@ -69,13 +69,11 @@ void I_ShutdownSound(void){}
 
 	\return	sfx handle
 */
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, INT32 channel)
 {
 	(void)id;
 	(void)vol;
 	(void)sep;
-	(void)pitch;
-	(void)priority;
 	(void)channel;
 	return 0;
 }
@@ -116,12 +114,11 @@ boolean I_SoundIsPlaying(INT32 handle)
 
 	\return	void
 */
-void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch)
+void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep)
 {
 	(void)handle;
 	(void)vol;
 	(void)sep;
-	(void)pitch;
 }
 
 /**	\brief	The I_SetSfxVolume function

src/dedicated/i_system.c

@@ -54,8 +54,6 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 #include <string.h>
 #ifdef __GNUC__
 #include <unistd.h>
-#elif defined (_MSC_VER)
-#include <direct.h>
 #endif
 #if defined (__unix__) || defined (UNIXCOMMON)
 #include <fcntl.h>
@@ -66,10 +64,6 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 #include <conio.h>
 #endif
 
-#ifdef _MSC_VER
-#pragma warning(disable : 4214 4244)
-#endif
-
 #if defined (__unix__) || defined(__APPLE__) || (defined (UNIXCOMMON) && !defined (__HAIKU__))
 #include <time.h>
 #if defined (__linux__)
@@ -180,293 +174,10 @@ static char returnWadPath[256];
 #include "../byteptr.h"
 #endif
 
-#ifdef HAVE_LIBBACKTRACE
-#include <backtrace.h>
-// TODO - move this to some header file instead
-extern struct backtrace_state *bt_state;
-
-typedef struct bt_crash_reason_s {
-	enum {
-		BTCRASH_SIGNAL,
-		BTCRASH_ERRORMSG,
-	} type;
-
-	union {
-		INT32 signal;
-		const char *errormsg;
-	} value;
-} bt_crash_reason_t;
-
-#define BT_CRASH_REASON_SIGNAL(num) (bt_crash_reason_t){ .type = BTCRASH_SIGNAL, .value = { .signal = num } }
-#define BT_CRASH_REASON_ERRORMSG(msg) (bt_crash_reason_t){ .type = BTCRASH_ERRORMSG, .value = { .errormsg = msg } }
-
-static void printsignal(FILE *fp, INT32 num)
-{
-	switch (num)
-		{
-		case SIGILL:
-			fprintf(fp, "SIGILL - illegal instruction - invalid function image");
-			break;
-		case SIGFPE:
-			fprintf(fp, "SIGFPE - mathematical exception");
-			break;
-		case SIGSEGV:
-			fprintf(fp, "SIGSEGV - segment violation");
-			break;
-		case SIGABRT:
-			fprintf(fp, "SIGABRT - abnormal termination triggered by abort call");
-			break;
-		default:
-			fprintf(fp, "Signal number %d", num);
-		}
-}
-
-typedef struct bt_out_buf_s {
-	boolean error;
-	char *pos;
-	size_t size;
-} bt_out_buf_t;
-
-static void bt_syminfo_cb(void *data, uintptr_t pc, const char *symname, uintptr_t symval, uintptr_t symsize)
-{
-	(void)symval;
-	(void)symsize;
-
-	bt_out_buf_t *buf = (bt_out_buf_t*)data;
-
-	if (!symname)
-		symname = "???";
-
-	int n = snprintf(buf->pos, buf->size, "%p %s\n", (void*)pc, symname);
-
-	if (n <= 0)
-	{
-		buf->size = 0;
-		return;
-	}
-
-	buf->pos += n;
-	buf->size -= n;
-}
-
-static int bt_simple_cb(void *data, uintptr_t pc)
-{
-	bt_out_buf_t *buf = (bt_out_buf_t*)data;
-
-	backtrace_syminfo(bt_state, pc, bt_syminfo_cb, NULL, data);
-
-	if (!buf->size) return 1;
-
-	return 0;
-}
-
-static int bt_full_cb(void *data, uintptr_t pc, const char *filename, int lineno, const char *function)
-{
-	bt_out_buf_t *buf = (bt_out_buf_t*)data;
-
-	if (!filename) filename = "???";
-	if (!function) function = "???";
-
-	int n = snprintf(buf->pos, buf->size, "%p %s\n\t%s:%d\n", (void*)pc, function, filename, lineno);
-
-	if (n <= 0) return 1;
-
-	buf->pos += n;
-	buf->size -= n;
-
-	if (!buf->size) return 1;
-
-	return 0;
-}
-
-static void bt_error_cb(void *data, const char *msg, int errnum)
-{
-	(void)msg; // We don't need this
-
-	bt_out_buf_t *buf = (bt_out_buf_t*)data;
-
-	// No debug info
-	if (errnum == -1)
-		buf->error = true;
-}
-
-static void write_backtrace(bt_crash_reason_t reason)
-{
-	FILE *out = fopen(va("%s" PATHSEP "%s", srb2home, "srb2kart-crash-log.txt"), "a");
-
-	time_t rawtime;
-	struct tm *timeinfo;
-
-	const size_t BUFSIZE = 8192;
-	char backtrace[BUFSIZE];
-
-	bt_out_buf_t buf;
-	buf.error = false;
-	buf.pos = backtrace;
-	buf.size = BUFSIZE;
-
-
-	if (!out)
-	{
-		fprintf(stderr, "\nWARNING: Couldn't open crash log for writing! Make sure your permissions are correct. Please save the below report!\n");
-		out = stderr;
-	}
-
-	// Get the current time as a string.
-	time(&rawtime);
-	timeinfo = localtime(&rawtime);
-
-	fprintf(out, "------------------------\n\n");
-
-	fprintf(out, "Program name: %s %s\n", SRB2APPLICATION, VERSIONSTRING);
-
-	if (compdate && comptime && comprevision && compbranch)
-		fprintf(out, "Compiled: %s %s, commit %s, branch %s\n", compdate, comptime, comprevision, compbranch);
-
-	if (gamestate == GS_LEVEL)
-	{
-		char *title = G_BuildMapTitle(gamemap);
-
-		if (title)
-		{
-			fprintf(out, "Game map: %s (%s)\n", title, G_BuildMapName(gamemap));
-			Z_Free(title);
-		}
-		else
-			fprintf(out, "Game map: %s\n", G_BuildMapName(gamemap));
-	}
-
-	fprintf(out, "Time of crash: %s\n", asctime(timeinfo));
-
-	fprintf(out, "Caused by: ");
-
-	switch (reason.type)
-	{
-		case BTCRASH_SIGNAL:
-			printsignal(out, reason.value.signal);
-		break;
-
-		case BTCRASH_ERRORMSG:
-			fprintf(out, "%s", reason.value.errormsg);
-		break;
-	}
-
-	fprintf(out, "\nBacktrace:\n");
-
-	// Try to get full backtrace, it will print files and line numbers
-	backtrace_full(bt_state, 2, bt_full_cb, bt_error_cb, (void*)&buf);
-
-	if (buf.error)
-	{
-		// Fall back to simple backtrace, only prints function names
-		backtrace_simple(bt_state, 2, bt_simple_cb, NULL, (void*)&buf);
-	}
-
-	fputs(backtrace, out);
-
-	if (out != stderr)
-	{
-		fclose(out);
-		fprintf(stderr, "Crash report created, find srb2kart-crash-log.txt in your SRB2Kart directory\n");
-	}
-}
-
-#endif
-
 boolean consolevent = false;
 boolean framebuffer = false;
-
-boolean g_in_exiting_signal_handler = false;
-
 UINT8 keyboard_started = false;
 
-static void I_ReportSignal(int num, int coredumped)
-{
-	//static char msg[] = "oh no! back to reality!\r\n";
-	const char *      sigmsg;
-	char msg[256];
-
-	switch (num)
-	{
-//	case SIGINT:
-//		sigmsg = "SIGINT - interrupted";
-//		break;
-	case SIGILL:
-		sigmsg = "SIGILL - illegal instruction - invalid function image";
-		break;
-	case SIGFPE:
-		sigmsg = "SIGFPE - mathematical exception";
-		break;
-	case SIGSEGV:
-		sigmsg = "SIGSEGV - segment violation";
-		break;
-//	case SIGTERM:
-//		sigmsg = "SIGTERM - Software termination signal from kill";
-//		break;
-//	case SIGBREAK:
-//		sigmsg = "SIGBREAK - Ctrl-Break sequence";
-//		break;
-	case SIGABRT:
-		sigmsg = "SIGABRT - abnormal termination triggered by abort call";
-		break;
-	default:
-		sprintf(msg,"signal number %d", num);
-		if (coredumped)
-			sigmsg = 0;
-		else
-			sigmsg = msg;
-	}
-
-	if (coredumped)
-	{
-		if (sigmsg)
-			sprintf(msg, "%s (core dumped)", sigmsg);
-		else
-			strcat(msg, " (core dumped)");
-	}
-	else
-	{
-		sprintf(msg, "%s", sigmsg);
-	}
-
-#ifdef HAVE_LIBBACKTRACE
-	strncat(msg, "\n\nCrash report has been saved into srb2kart-crash-log.txt", 255);
-#elif defined(_WIN32) && !defined(__MINGW64__)
-	strncat(msg, "\n\nCrash report has been saved into srb2kart.rpt", 255);
-#endif
-
-	I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
-}
-
-#ifndef NEWSIGNALHANDLER
-FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
-{
-	g_in_exiting_signal_handler = true;
-
-	D_QuitNetGame(); // Fix server freezes
-
-#ifdef HAVE_LIBBACKTRACE
-	write_backtrace(BT_CRASH_REASON_SIGNAL(num));
-#endif
-
-	if (demo.recording)
-		G_SaveDemo();
-
-	I_ReportSignal(num, 0);
-	I_ShutdownSystem();
-	signal(num, SIG_DFL);               //default signal action
-	raise(num);
-	I_Quit();
-}
-#endif
-
-FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
-{
-	signal(num, SIG_DFL); //default signal action
-	raise(num);
-	I_Quit();
-}
-
 #ifdef HAVE_TERMIOS
 // TERMIOS console code from Quake3: thank you!
 boolean stdin_active = true;
@@ -495,16 +206,6 @@ static struct termios tty_tc;
 //   so we provide tty_Clear and tty_Show to be called before and after a stdout or stderr output
 // =============================================================
 
-// flush stdin, I suspect some terminals are sending a LOT of garbage
-// FIXME TTimo relevant?
-#if 0
-static inline void tty_FlushIn(void)
-{
-	char key;
-	while (read(STDIN_FILENO, &key, 1)!=-1);
-}
-#endif
-
 // do a backspace
 // TTimo NOTE: it seems on some terminals just sending '\b' is not enough
 //   so for now, in any case we send "\b \b" .. yeah well ..
@@ -799,55 +500,6 @@ static inline void I_StartupConsole(void)
 static inline void I_ShutdownConsole(void){}
 #endif
 
-//
-// StartupKeyboard
-//
-static void I_RegisterSignals (void)
-{
-#ifdef SIGINT
-	signal(SIGINT , quit_handler);
-#endif
-#ifdef SIGBREAK
-	signal(SIGBREAK , quit_handler);
-#endif
-#ifdef SIGTERM
-	signal(SIGTERM , quit_handler);
-#endif
-
-	// If these defines don't exist,
-	// then compilation would have failed above us...
-#ifndef NEWSIGNALHANDLER
-	signal(SIGILL , signal_handler);
-	signal(SIGSEGV , signal_handler);
-	signal(SIGABRT , signal_handler);
-	signal(SIGFPE , signal_handler);
-#endif
-}
-
-#ifdef NEWSIGNALHANDLER
-static void signal_handler_child(INT32 num)
-{
-#ifdef HAVE_LIBBACKTRACE
-	write_backtrace(BT_CRASH_REASON_SIGNAL(num));
-#endif
-
-	if (demo.recording)
-		G_SaveDemo();
-
-	signal(num, SIG_DFL);               //default signal action
-	raise(num);
-}
-
-static void I_RegisterChildSignals(void)
-{
-	// If these defines don't exist,
-	// then compilation would have failed above us...
-	signal(SIGILL , signal_handler_child);
-	signal(SIGSEGV , signal_handler_child);
-	signal(SIGABRT , signal_handler_child);
-	signal(SIGFPE , signal_handler_child);
-}
-#endif
 
 //
 //I_OutputMsg
@@ -874,10 +526,6 @@ void I_OutputMsg(const char *fmt, ...)
 	DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt);
 #endif
 
-#if defined (_WIN32) && defined (_MSC_VER)
-	OutputDebugStringA(txt);
-#endif
-
 	len = strlen(txt);
 
 #ifdef LOGMESSAGES
@@ -1223,43 +871,6 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
 #undef WINMUMBLE
 #endif // NOMUMBLE
 
-
-/**	\brief empty ticcmd for player 1
-*/
-static ticcmd_t emptycmd;
-
-ticcmd_t *I_BaseTiccmd(void)
-{
-	return &emptycmd;
-}
-
-/**	\brief empty ticcmd for player 2
-*/
-static ticcmd_t emptycmd2;
-
-ticcmd_t *I_BaseTiccmd2(void)
-{
-	return &emptycmd2;
-}
-
-/**	\brief empty ticcmd for player 3
- */
-static ticcmd_t emptycmd3;
-
-ticcmd_t *I_BaseTiccmd3(void)
-{
-	return &emptycmd3;
-}
-
-/**	\brief empty ticcmd for player 4
- */
-static ticcmd_t emptycmd4;
-
-ticcmd_t *I_BaseTiccmd4(void)
-{
-	return &emptycmd4;
-}
-
 //
 // I_GetTime
 // returns time in 1/TICRATE second tics
@@ -1359,6 +970,317 @@ void I_SleepDuration(precise_t duration)
 #endif
 }
 
+boolean g_in_exiting_signal_handler = false;
+
+static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg)
+{
+	const char *sigmsg;
+
+	switch (signal_num)
+	{
+#ifdef SIGINT
+		case SIGINT:
+			sigmsg = ("SIGINT - SRB2Kart-Saturn was interrupted prematurely by the user.");
+			break;
+#endif
+		case SIGILL: // illegal instruction - invalid function image
+			sigmsg = ("SIGILL - SRB2Kart-Saturn has attempted to execute an illegal instruction and needs to close.");
+			break;
+		case SIGFPE: // mathematical exception
+			sigmsg = ("SIGFPE - SRB2Kart-Saturn has encountered a mathematical exception and needs to close.");
+			break;
+		case SIGSEGV: // segment violation
+			sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close.");
+			break;
+#ifdef SIGTERM
+		case SIGTERM: // Software termination signal from kill
+			sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a kill signal.");
+			break;
+#endif
+#ifdef SIGBREAK
+		case SIGBREAK: // Ctrl-Break sequence
+			sigmsg =("SIGBREAK - SRB2Kart-Saturn was terminated by a Ctrl-Break sequence.")
+			break;
+#endif
+		case SIGABRT: // abnormal termination triggered by abort call
+			sigmsg = ("SIGABRT - SRB2Kart-Saturn was terminated by an abort signal.");
+			break;
+		default:
+			sprintf(signal_msg, "Signal number %d", signal_num);
+			sigmsg = (core_dumped ? "Unknown signal" : signal_msg);
+			break;
+	}
+
+	if (core_dumped)
+	{
+		if (sigmsg)
+			sprintf(signal_msg, "%s (core dumped)", sigmsg);
+		else
+			strcat(signal_msg, " (core dumped)");
+	}
+	else
+	{
+		sprintf(signal_msg, "%s", sigmsg);
+	}
+}
+
+static void I_ReportSignal(int num, int coredumped)
+{
+	char sigmsg[512];
+
+	I_PrintSignal(num, coredumped, sigmsg);
+	size_t len = strlen(sigmsg);
+	snprintf(sigmsg + len, sizeof(sigmsg) - len, "\n\nCrash report has been saved into %s", CRASH_LOGFILE_NAME);
+	I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
+}
+
+#ifndef NEWSIGNALHANDLER
+FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
+{
+	g_in_exiting_signal_handler = true;
+
+	D_QuitNetGame(); // Fix server freezes
+
+#ifdef HAVE_LIBBACKTRACE
+	write_backtrace(BT_CRASH_REASON_SIGNAL(num));
+#endif
+
+	I_ReportSignal(num, 0);
+	I_ShutdownSystem();
+	signal(num, SIG_DFL);               //default signal action
+	raise(num);
+	I_Quit();
+}
+#endif
+
+FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
+{
+	signal(num, SIG_DFL); //default signal action
+	raise(num);
+	I_Quit();
+}
+
+#ifdef HAVE_LIBBACKTRACE
+#include <backtrace.h>
+// TODO - move this to some header file instead
+extern struct backtrace_state *bt_state;
+
+typedef struct bt_crash_reason_s {
+	enum {
+		BTCRASH_SIGNAL,
+		BTCRASH_ERRORMSG,
+	} type;
+
+	union {
+		INT32 signal;
+		const char *errormsg;
+	} value;
+} bt_crash_reason_t;
+
+#define BT_CRASH_REASON_SIGNAL(num) (bt_crash_reason_t){ .type = BTCRASH_SIGNAL, .value = { .signal = num } }
+#define BT_CRASH_REASON_ERRORMSG(msg) (bt_crash_reason_t){ .type = BTCRASH_ERRORMSG, .value = { .errormsg = msg } }
+
+typedef struct bt_out_buf_s {
+	boolean error;
+	char *pos;
+	size_t size;
+} bt_out_buf_t;
+
+static void bt_syminfo_cb(void *data, uintptr_t pc, const char *symname, uintptr_t symval, uintptr_t symsize)
+{
+	(void)symval;
+	(void)symsize;
+
+	bt_out_buf_t *buf = (bt_out_buf_t*)data;
+
+	if (!symname)
+		symname = "???";
+
+	int n = snprintf(buf->pos, buf->size, "%p %s\n", (void*)pc, symname);
+
+	if (n <= 0)
+	{
+		buf->size = 0;
+		return;
+	}
+
+	buf->pos += n;
+	buf->size -= n;
+}
+
+static int bt_simple_cb(void *data, uintptr_t pc)
+{
+	bt_out_buf_t *buf = (bt_out_buf_t*)data;
+
+	backtrace_syminfo(bt_state, pc, bt_syminfo_cb, NULL, data);
+
+	if (!buf->size) return 1;
+
+	return 0;
+}
+
+static int bt_full_cb(void *data, uintptr_t pc, const char *filename, int lineno, const char *function)
+{
+	bt_out_buf_t *buf = (bt_out_buf_t*)data;
+
+	if (!filename) filename = "???";
+	if (!function) function = "???";
+
+	int n = snprintf(buf->pos, buf->size, "%p %s\n\t%s:%d\n", (void*)pc, function, filename, lineno);
+
+	if (n <= 0) return 1;
+
+	buf->pos += n;
+	buf->size -= n;
+
+	if (!buf->size) return 1;
+
+	return 0;
+}
+
+static void bt_error_cb(void *data, const char *msg, int errnum)
+{
+	(void)msg; // We don't need this
+
+	bt_out_buf_t *buf = (bt_out_buf_t*)data;
+
+	// No debug info
+	if (errnum == -1)
+		buf->error = true;
+}
+
+static void write_backtrace(bt_crash_reason_t reason)
+{
+	char sig_msg[512];
+	const char *filename = va("%s" PATHSEP CRASH_LOGFILE_NAME, srb2home);
+	FILE *out = fopen(filename, "a+");
+
+	time_t rawtime;
+	struct tm *timeinfo;
+
+	const size_t BUFSIZE = 8192;
+	char backtrace[BUFSIZE];
+
+	bt_out_buf_t buf;
+	buf.error = false;
+	buf.pos = backtrace;
+	buf.size = BUFSIZE;
+
+	if (!out)
+	{
+		fprintf(stderr, "\nWARNING: Couldn't open crash log for writing! Make sure your permissions are correct. Please save the below report!\n");
+		out = stderr;
+	}
+
+	// Get the current time as a string.
+	time(&rawtime);
+	timeinfo = localtime(&rawtime);
+
+	fprintf(out, "------------------------\n\n");
+
+	fprintf(out, "Program name: %s %s\n", SRB2APPLICATION, VERSIONSTRING);
+
+	fprintf(out, "Dedicated build\n");
+	fprintf(out, "Platform: %s\n", I_GetSysName());
+
+	if (compdate && comptime && comprevision && compbranch)
+		fprintf(out, "Compiled: %s %s, commit %s, branch %s\n", compdate, comptime, comprevision, compbranch);
+
+	if (gamestate == GS_LEVEL && gamemap)
+	{
+		char *title = G_BuildMapTitle(gamemap);
+
+		if (title)
+		{
+			fprintf(out, "Game map: %s (%s)\n", title, G_BuildMapName(gamemap));
+			Z_Free(title);
+		}
+		else
+			fprintf(out, "Game map: %s\n", G_BuildMapName(gamemap));
+	}
+
+	fprintf(out, "Time of crash: %s\n", asctime(timeinfo));
+
+	fprintf(out, "Caused by: ");
+
+	switch (reason.type)
+	{
+		case BTCRASH_SIGNAL:
+			I_PrintSignal(reason.value.signal, false, sig_msg);
+			fprintf(out, "%s", sig_msg);
+		break;
+
+		case BTCRASH_ERRORMSG:
+			fprintf(out, "%s", reason.value.errormsg);
+		break;
+	}
+
+	fprintf(out, "\nBacktrace:\n");
+
+	// Try to get full backtrace, it will print files and line numbers
+	backtrace_full(bt_state, 2, bt_full_cb, bt_error_cb, (void*)&buf);
+
+	if (buf.error)
+	{
+		// Fall back to simple backtrace, only prints function names
+		backtrace_simple(bt_state, 2, bt_simple_cb, NULL, (void*)&buf);
+	}
+
+	fputs(backtrace, out);
+
+	if (out != stderr)
+	{
+		fclose(out);
+		fprintf(stderr, "Crash report created, find %s in your SRB2Kart directory\n", CRASH_LOGFILE_NAME);
+	}
+}
+#endif
+
+static void I_RegisterSignals(void)
+{
+#ifdef SIGINT
+	signal(SIGINT,   quit_handler);
+#endif
+#ifdef SIGBREAK
+	signal(SIGBREAK, quit_handler);
+#endif
+#ifdef SIGTERM
+	signal(SIGTERM,  quit_handler);
+#endif
+#ifndef NEWSIGNALHANDLER
+	// If these defines don't exist,
+	// then compilation would have failed above us...
+	signal(SIGILL,  signal_handler);
+	signal(SIGSEGV, signal_handler);
+	signal(SIGABRT, signal_handler);
+	signal(SIGFPE,  signal_handler);
+#endif
+}
+
+#ifdef NEWSIGNALHANDLER
+static void signal_handler_child(INT32 num)
+{
+	g_in_exiting_signal_handler = true;
+
+#ifdef HAVE_LIBBACKTRACE
+	write_backtrace(BT_CRASH_REASON_SIGNAL(num));
+#endif
+
+	signal(num, SIG_DFL); // default signal action
+	raise(num);
+}
+
+static void I_RegisterChildSignals(void)
+{
+	// If these defines don't exist,
+	// then compilation would have failed above us...
+	signal(SIGILL,  signal_handler_child);
+	signal(SIGSEGV, signal_handler_child);
+	signal(SIGABRT, signal_handler_child);
+	signal(SIGFPE,  signal_handler_child);
+}
+#endif
+
 #ifdef NEWSIGNALHANDLER
 FUNCNORETURN static ATTRNORETURN void newsignalhandler_Warn(const char *pr)
 {
@@ -1463,21 +1385,18 @@ void I_Quit(void)
 	static boolean quiting = false;
 
 	/* prevent recursive I_Quit() */
-	if (quiting) goto death;
+	if (quiting)
+		goto death;
 	quiting = false;
 	I_ShutdownConsole();
 	M_SaveConfig(NULL); //save game config, cvars..
-#ifndef NONET
 	D_SaveBan(); // save the ban list
-#endif
 	G_SaveGameData(false); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
 
 	if (demo.recording)
 		G_CheckDemoStatus();
-	if (metalrecording)
-		G_StopMetalRecording();
 
 	D_QuitNetGame();
 	I_ShutdownMusic();
@@ -1575,16 +1494,12 @@ void I_Error(const char *error, ...)
 	I_ShutdownConsole();
 
 	M_SaveConfig(NULL); // save game config, cvars..
-#ifndef NONET
 	D_SaveBan(); // save the ban list
-#endif
 	G_SaveGameData(false); // Tails 12-08-2002
 
 	// Shutdown. Here might be other errors.
 	if (demo.recording)
 		G_CheckDemoStatus();
-	if (metalrecording)
-		G_StopMetalRecording();
 
 	D_QuitNetGame();
 	I_ShutdownMusic();
@@ -1899,7 +1814,7 @@ static const char *searchWad(const char *searchDir)
 	filestatus_t fstemp;
 
 	strcpy(tempsw, WADKEYWORD1);
-	fstemp = filesearch(tempsw,searchDir,NULL,true,20);
+	fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
 	if (fstemp == FS_FOUND)
 	{
 		pathonly(tempsw);
@@ -2068,7 +1983,7 @@ const char *I_LocateWad(void)
 #if defined (_WIN32)
 		SetCurrentDirectoryA(waddir);
 #else
-		if (chdir(waddir) == -1)
+		if (waddir == NULL || chdir(waddir) == -1)
 			I_OutputMsg("Couldn't change working directory\n");
 #endif
 	}
@@ -2216,6 +2131,50 @@ size_t I_GetFreeMem(size_t *total)
 // note CPUAFFINITY code used to reside here
 void I_RegisterSysCommands(void) {}
 
+const char *I_GetSysName(void)
+{
+	// reference: https://sourceforge.net/p/predef/wiki/OperatingSystems/
+#if defined(_WIN32) || defined(__CYGWIN__)
+	return "Windows";
+#elif defined(__APPLE__)
+	return "Mac OS";
+#elif defined(__linux__)
+	return "Linux";
+#elif defined(__FreeBSD__)
+	return "FreeBSD";
+#elif defined(__OpenBSD__)
+	return "OpenBSD";
+#elif defined(__NetBSD__)
+	return "NetBSD";
+#elif defined(__DragonFly__)
+	return "DragonFly BSD";
+#elif defined(__gnu_hurd__)
+	return "GNU Hurd"; // for anyone mental enough to set up an SRB2 server on GNU Hurd
+#elif defined(__hpux)
+	return "HP-UX";
+#elif defined(EPLAN9)
+	return "Plan 9";
+#elif defined(__HAIKU__)
+	return "Haiku";
+#elif defined(__BEOS__)
+	return "BeOS";
+#elif defined(__minix)
+	return "Minix";
+#elif defined(__sun)
+#if defined(__SVR4) || defined(__srv4__)
+	return "Solaris"; // this would be so cursed...
+#else
+	return "SunOS";
+#endif
+#elif defined(_AIX)
+	return "AIX";
+#elif defined(__SYLLABLE__)
+	return "SyllableOS"; // RIP SyllableOS, i still miss you ;-;
+#else
+	return "Unknown";
+#endif
+}
+
 boolean I_InitNetwork(void)
 {
 	// this must exist, but this is actually handled in i_tcp.c

src/dedicated/i_video.c

@@ -29,16 +29,12 @@
 
 rendermode_t rendermode = render_none;
 
-boolean highcolor = false;
-
 // synchronize page flipping with screen refresh
 consvar_t cv_vidwait = {"vid_wait", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {3, "AZERTY"}, {0, NULL}};
 consvar_t cv_keyboardlayout = {"keyboardlayout", "Default US", CV_SAVE, keyboardlayout_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
 
-consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
 INT32 numcontrollers = 0;
 
 UINT8 graphics_started = 0; // Is used in console.c and screen.c
@@ -93,9 +89,10 @@ void I_UpdateNoVsync(void)
 //
 // I_ReadScreen
 //
-void I_ReadScreen(UINT8 *scr)
+void I_ReadScreen(UINT8 * restrict scr, INT32 scale)
 {
 	(void)scr;
+	(void)scale;
 }
 
 //
@@ -148,12 +145,17 @@ UINT32 I_GetRefreshRate(void)
 	return 0;
 }
 
+void I_SetTextInput(boolean enable)
+{
+	(void)enable;
+}
+
 boolean I_UseNativeKeyboard(void)
 {
 	return false;
 }
 
-void I_SetBorderlessWindow(void) 
+void I_SetBorderlessWindow(void)
 {
 
 }

src/dehacked.c

@@ -178,6 +178,9 @@ FUNCPRINTF static void deh_warning(const char *first, ...)
 	else
 		CONS_Alert(CONS_WARNING, "Line %u: %s\n", dbg_line, buf);
 
+	if (dbg_line != -1 && (M_CheckParm("-strict") || M_CheckParm("-strict-soc")))
+		I_Error("deh_warning: %s", buf);
+
 	deh_num_warning++;
 
 	Z_Free(buf);
@@ -751,7 +754,7 @@ static void readlevelheader(MYFILE *f, INT32 num, INT32 wadnum)
 			strupr(word);
 
 			// Now get the part after
-			word2 = tmp += 2;
+			word2 = tmp + 2;
 			i = atoi(word2); // used for numerical settings
 
 			// CHEAP HACK: move this over here for lowercase subtitles
@@ -1390,7 +1393,7 @@ static void readhuditem(MYFILE *f, INT32 num)
 			strupr(word);
 
 			// Now get the part after
-			word2 = tmp += 2;
+			word2 = tmp + 2;
 			strupr(word2);
 
 			i = atoi(word2); // used for numerical settings
@@ -1859,7 +1862,7 @@ static void reademblemdata(MYFILE *f, INT32 num)
 			strupr(word);
 
 			// Now get the part after
-			word2 = tmp += 2;
+			word2 = tmp + 2;
 			value = atoi(word2); // used for numerical settings
 
 			// Up here to allow lowercase in hints
@@ -1986,7 +1989,7 @@ static void readextraemblemdata(MYFILE *f, INT32 num)
 			strupr(word);
 
 			// Now get the part after
-			word2 = tmp += 2;
+			word2 = tmp + 2;
 			strupr(word2);
 
 			value = atoi(word2); // used for numerical settings
@@ -2064,7 +2067,7 @@ static void readunlockable(MYFILE *f, INT32 num)
 			strupr(word);
 
 			// Now get the part after
-			word2 = tmp += 2;
+			word2 = tmp + 2;
 			strupr(word2);
 
 			i = atoi(word2); // used for numerical settings
@@ -2333,7 +2336,7 @@ static void readconditionset(MYFILE *f, UINT8 setnum)
 			strupr(word);
 
 			// Now get the part after
-			word2 = tmp += 2;
+			word2 = tmp + 2;
 			strupr(word2);
 
 			if (fastncmp(word, "CONDITION", 9))
@@ -2467,7 +2470,7 @@ static void readmaincfg(MYFILE *f)
 			strupr(word);
 
 			// Now get the part after
-			word2 = tmp += 2;
+			word2 = tmp + 2;
 			strupr(word2);
 
 			value = atoi(word2); // used for numerical settings
@@ -2628,7 +2631,7 @@ static void readmaincfg(MYFILE *f)
 			}
 			else if (fastcmp(word, "RESETDATA"))
 			{
-				P_ResetData(value);
+				CONS_Alert(CONS_WARNING, M_GetText("RESETDATA is obsolete and no longer has any effect.\n"));
 			}
 			else if (fastcmp(word, "CUSTOMVERSION"))
 			{
@@ -2646,7 +2649,7 @@ static void readwipes(MYFILE *f)
 {
 	char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
 	char *word = s;
-	char *pword = word;
+	char *pword;
 	char *word2;
 	char *tmp;
 	INT32 value;
@@ -2679,7 +2682,7 @@ static void readwipes(MYFILE *f)
 			strupr(word);
 
 			// Now get the part after
-			word2 = tmp += 2;
+			word2 = tmp + 2;
 			value = atoi(word2); // used for numerical settings
 
 			if (value < -1 || value > 99)
@@ -2855,7 +2858,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 	dbg_line = -1; // start at -1 so the first line is 0.
 	while (!myfeof(f))
 	{
-		char origpos[128];
+		char origpos[256];
 		INT32 size = 0;
 		char *traverse;
 
@@ -2871,6 +2874,12 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
 			size++;
 		}
 
+		if (size > (int)sizeof(origpos))
+		{
+			deh_warning("Line is too long");
+			size = sizeof(origpos)-1;
+		}
+
 		strncpy(origpos, s, size);
 		origpos[size] = '\0';
 

src/doomdata.h

@@ -57,10 +57,6 @@ enum
 
 // Do not use bit five or after, as they are used for object z-offsets.
 
-#if defined(_MSC_VER)
-#pragma pack(1)
-#endif
-
 // A single Vertex.
 typedef struct
 {
@@ -188,10 +184,6 @@ typedef struct
 	UINT16 children[2];
 } ATTRPACK mapnode_t;
 
-#if defined(_MSC_VER)
-#pragma pack()
-#endif
-
 // Thing definition, position, orientation and type,
 // plus visibility flags and attributes.
 typedef struct

src/doomdef.h

@@ -47,17 +47,6 @@
 #define ASMCALL
 #endif
 
-#ifdef _MSC_VER
-#pragma warning(disable : 4127 4152 4213 4514)
-#ifdef _WIN64
-#pragma warning(disable : 4306)
-#endif
-#endif
-// warning level 4
-// warning C4127: conditional expression is constant
-// warning C4152: nonstandard extension, function/data pointer conversion in expression
-// warning C4213: nonstandard extension used : cast on l-value
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -101,6 +90,20 @@ extern FILE *logstream;
 extern char  logfilename[1024];
 #endif
 
+// not sure if this belongs here lul
+// TODO: figure out whats preventing 32bit windows from working with libbacktrace
+#if defined(_WIN32) && !defined(__MINGW64__)
+#define HAVE_DRMINGW
+#endif
+
+#if defined (HAVE_LIBBACKTRACE)
+#define CRASH_LOGFILE_NAME "srb2kart-crash-log.txt"
+#elif defined (HAVE_DRMINGW)
+#define CRASH_LOGFILE_NAME "srb2kart-crash-log.RPT"
+#else
+#define CRASH_LOGFILE_NAME "(unknown crash log)"
+#endif
+
 /* A mod name to further distinguish versions. */
 #define SRB2APPLICATION "SRB2Kart"
 
@@ -115,11 +118,13 @@ extern char  logfilename[1024];
 #else
 #define VERSION    1 // Game version
 #define SUBVERSION 6 // more precise version number
-#define VERSIONSTRING "Saturn v8.3"
-#define VERSIONSTRINGW L"Saturn v8.3"
+#define VERSIONSTRING "Saturn v9"
+#define VERSIONSTRINGW L"Saturn v9"
+
+#define SATURN_TESTING // comment out for saturn release builds!
+
 // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
 // And change CMakeLists.txt (not src/, but in root), for CMake users!
-// AND appveyor.yml, for the build bots!
 #endif
 
 // Maintain compatibility with 1.0.x record attack replays?
@@ -416,7 +421,7 @@ enum {
 
 
 */
-void I_Error(const char *error, ...) FUNCIERROR;
+FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...);
 
 /**	\brief	write a message to stderr (use before I_Quit) for when you need to quit with a msg, but need
  the return code 0 of I_Quit();
@@ -560,13 +565,19 @@ UINT32 quickncasehash (const char *p, size_t n)
 #endif
 
 #ifdef __cplusplus
-#if defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER)
+#if defined(__GNUC__) || defined(__clang__)
 	#define restrict __restrict
 #else
 	#define restrict
 #endif
 #endif
 
+// the GNU cleanup attribute: plugging memory leaks since 2003!
+// on scope exit, the cleanup function is called with a pointer to the declared variable,
+// essentially behaving like a C++ destructor
+// NOTE: you WILL have nasal troubles if the variable is not initialized
+#define CLEANUP(f) __attribute__((__cleanup__(f)))
+
 // An assert-type mechanism.
 #ifdef PARANOIA
 #define I_Assert(e) ((e) ? (void)0 : I_Error("assert failed: %s, file %s, line %d", #e, __FILE__, __LINE__))
@@ -589,7 +600,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 // None of these that are disabled in the normal build are guaranteed to work perfectly
 // Compile them at your own risk!
 
-#ifndef NONET
 //-- SATURN __
 /// Detect if a client is on Saturn in the clientconfig.
 /// To seperately allow them to join or block joining from vanilla clients.
@@ -604,7 +614,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 #define SATURNPAK
 #endif
 //-- <(￣︶￣)> __
-#endif
 
 /// Undefine to use the new method of Gamma correction see colour cube in v_video.c
 #define BACKWARDSCOMPATCORRECTION
@@ -626,18 +635,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 ///	    	Most modifications should probably enable this.
 //#define SAVEGAME_OTHERVERSIONS
 
-///	Allow the use of the SOC RESETINFO command.
-///	\note	Builds that are tight on memory should disable this.
-///	    	This stops the game from storing backups of the states, sprites, and mobjinfo tables.
-///	    	Though this info is compressed under normal circumstances, it's still a lot of extra
-///	    	memory that never gets touched.
-#define ALLOW_RESETDATA
-
-#ifndef NONET
-///	Display a connection screen on join attempts.
-#define CLIENT_LOADINGSCREEN
-#endif
-
 /// Backwards compatibility with musicslots.
 /// \note	You should leave this enabled unless you're working with a future SRB2 version.
 #define MUSICSLOT_COMPATIBILITY
@@ -650,14 +647,15 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 #define NOCLIPCAM
 
 /// SRB2Kart: MIDI support is shitty and busted and we don't want it, lets throw it behind a define
-#define NO_MIDI
+// yall didnt properly disable it so it always worked lol (:
+//#define NO_MIDI
 
 /// Sprite rotation
 #define ROTSPRITE
 #define ROTANGLES 72 // Needs to be a divisor of 360 (45, 60, 90, 120...)
 #define ROTANGDIFF (360 / ROTANGLES)
 
-#if defined (HAVE_CURL) && ! defined (NONET)
+#if defined (HAVE_CURL)
 #define MASTERSERVER
 #define HOLEPUNCH
 #else

src/doomstat.h

@@ -71,7 +71,6 @@ extern boolean majormods;
 extern UINT16 mainwads;
 extern boolean savemoddata; // This mod saves time/emblem data.
 extern boolean imcontinuing; // Temporary flag while continuing
-extern boolean metalrecording;
 
 #define ATTACKING_NONE   0
 #define ATTACKING_RECORD 1
@@ -102,13 +101,8 @@ extern boolean forceresetplayers, deferencoremode;
 // Internal parameters for sound rendering.
 // ========================================
 
-#ifdef NO_MIDI
-#define midi_disabled true
-#else
-extern boolean midi_disabled;
-#endif
 extern boolean sound_disabled;
-extern boolean digital_disabled;
+extern boolean music_disabled;
 
 // =========================
 // Status flags for refresh.
@@ -574,7 +568,6 @@ extern consvar_t cv_forceskin; // force clients to use the server's skin
 extern consvar_t cv_downloading; // allow clients to downloading WADs.
 extern consvar_t cv_nettimeout; // SRB2Kart: Advanced server options menu
 extern consvar_t cv_jointimeout;
-extern consvar_t cv_maxping;
 extern ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
 extern INT32 serverplayer;
 extern INT32 adminplayers[MAXPLAYERS];

src/doomtype.h

@@ -28,31 +28,6 @@ extern "C" {
 #endif
 
 /* 7.18.1.1  Exact-width integer types */
-#ifdef _MSC_VER
-#define UINT8 unsigned __int8
-#define SINT8 signed __int8
-
-#define UINT16 unsigned __int16
-#define INT16 __int16
-
-#define INT32 __int32
-#define UINT32 unsigned __int32
-
-#define INT64  __int64
-#define UINT64 unsigned __int64
-
-typedef long ssize_t;
-
-/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
-#if (_MSC_VER <= 1200)
-	#ifndef DWORD_PTR
-		#define DWORD_PTR DWORD
-	#endif
-	#ifndef PDWORD_PTR
-		#define PDWORD_PTR PDWORD
-	#endif
-#endif
-#else
 #define __STDC_LIMIT_MACROS
 #include <stdint.h>
 
@@ -66,7 +41,6 @@ typedef long ssize_t;
 #define UINT32 uint32_t
 #define INT64  int64_t
 #define UINT64 uint64_t
-#endif
 
 #ifdef __APPLE_CC__
 #define DIRECTFULLSCREEN 1
@@ -76,16 +50,7 @@ typedef long ssize_t;
 
 /* Strings and some misc platform specific stuff */
 
-#if defined (_MSC_VER) || defined (__OS2__)
-	// Microsoft VisualC++
-#ifdef _MSC_VER
-#if (_MSC_VER <= 1800) // MSVC 2013 and back
-	#define snprintf                _snprintf
-#if (_MSC_VER <= 1200) // MSVC 6.0 and back
-	#define vsnprintf               _vsnprintf
-#endif
-#endif
-#endif
+#if defined (__OS2__)
 	#define strncasecmp             strnicmp
 	#define strcasecmp              stricmp
 	#define inline                  __inline
@@ -148,8 +113,8 @@ int strlwr(char *n); // from dosstr.c
 #include <stddef.h> // for size_t
 
 #ifndef SRB2_HAVE_STRLCPY
-size_t strlcat(char *dst, const char *src, size_t siz);
-size_t strlcpy(char *dst, const char *src, size_t siz);
+size_t strlcat(char *dst, const char *src, size_t dsize);
+size_t strlcpy(char *dst, const char *src, size_t dsize);
 #endif
 
 // Macro for use with char foo[FOOSIZE+1] type buffers.
@@ -270,13 +235,6 @@ typedef int32_t boolean;
 	#endif
 
 	#define ATTRUNUSED __attribute__((unused))
-
-#elif defined (_MSC_VER)
-	#define ATTRNORETURN __declspec(noreturn)
-	#define ATTRINLINE __forceinline
-	#if _MSC_VER > 1200 // >= MSVC 6.0
-		#define ATTRNOINLINE __declspec(noinline)
-	#endif
 #endif
 
 #ifndef FUNCPRINTF
@@ -368,7 +326,7 @@ typedef UINT8 bitarray_t;
 static inline int
 in_bit_array (const bitarray_t * const array, const int value)
 {
-	return (array[value >> 3] & (1<<(value & 7)));
+	return(array[value >> 3] & (1<<(value & 7)));
 }
 
 static inline void

src/f_finale.c

@@ -34,6 +34,8 @@
 #include "y_inter.h"
 #include "m_cond.h"
 
+#include "r_fps.h" // R_GetTimeFrac
+
 // Stage of animation:
 // 0 = text, 1 = art screen
 static INT32 finalecount;
@@ -167,11 +169,11 @@ static void F_SkyScroll(INT32 scrollspeed)
 	pat = W_CachePatchName("TITLEBG1", PU_PATCH_LOWPRIORITY);
 	pat2 = W_CachePatchName("TITLEBG2", PU_PATCH_LOWPRIORITY);
 
-	w = (vid.width / vid.dupx)<<FRACBITS;
+	w = (vid.scaledwidth << FRACBITS);
 
 	// The scroll offset MUST be clamped before shifting by FRACBITS, or else it'll overflow in about 3 minutes
-	animtimer = ((((finalecount * scrollspeed) % (pat->width*16))<<FRACBITS) + (R_GetMenuUncap() * scrollspeed))/16;
-	anim2 = (pat2->width<<FRACBITS) - ((((finalecount * scrollspeed) % (pat2->width*16))<<FRACBITS) + (R_GetMenuUncap() * scrollspeed))/16;
+	animtimer = ((((finalecount * scrollspeed) % (pat->width*16))<<FRACBITS) + (R_GetTimeFrac(RTF_MENU) * scrollspeed))/16;
+	anim2 = (pat2->width<<FRACBITS) - ((((finalecount * scrollspeed) % (pat2->width*16))<<FRACBITS) + (R_GetTimeFrac(RTF_MENU) * scrollspeed))/16;
 
 	// SRB2Kart: F_DrawPatchCol is over-engineered; recoded to be less shitty and error-prone
 	if (rendermode != render_none)
@@ -675,7 +677,7 @@ void F_CreditDrawer(void)
 			y += 12<<FRACBITS;
 			break;
 		}
-		if (((y>>FRACBITS) * vid.dupy) > vid.height)
+		if (((y>>FRACBITS) * vid.dup) > vid.height)
 			break;
 	}
 
@@ -683,8 +685,8 @@ void F_CreditDrawer(void)
 	if (finalecount)
 	{
 		const char *goodbyefornow = "See you in ""\x82""Dr. Robotnik's Ring Racers""\x80""!";
-		fixed_t lpad = ((vid.width/vid.dupx) - BASEVIDWIDTH)<<FRACBITS;
-		fixed_t w = V_StringWidth(goodbyefornow, V_ALLOWLOWERCASE)<<FRACBITS;
+		fixed_t lpad = (vid.scaledwidth - BASEVIDWIDTH) << FRACBITS;
+		fixed_t w = V_StringWidth(goodbyefornow, V_ALLOWLOWERCASE) << FRACBITS;
 		fixed_t x = FixedMul(((BASEVIDWIDTH<<FRACBITS)+w+lpad), ((finalecount-1)<<FRACBITS)/(5*TICRATE)) - w - (lpad/2);
 		V_DrawString(x>>FRACBITS, y>>FRACBITS, V_ALLOWLOWERCASE, goodbyefornow); // for some reason DrawStringAtFixed can't tolerate colour codes
 	}
@@ -705,7 +707,8 @@ void F_CreditTicker(void)
 			case 1: y += 30<<FRACBITS; break;
 			default: y += 12<<FRACBITS; break;
 		}
-		if (FixedMul(y,vid.dupy) > vid.height)
+
+		if (FixedMul(y, vid.dup) > vid.height)
 			break;
 	}
 
@@ -948,7 +951,7 @@ void F_GameEndTicker(void)
 	if (timetonext > 0)
 		timetonext--;
 	else
-		D_StartTitle();
+		G_EndGame();
 }
 
 // ==============
@@ -1003,7 +1006,7 @@ void F_TitleScreenDrawer(void)
 		if (finalecount >= 20)
 			V_DrawSmallScaledPatch(84, 87, 0, ttkart);
 		else if (finalecount >= 10)
-			V_DrawSciencePatch((84<<FRACBITS) - 18*(((20 - finalecount)<<FRACBITS) - R_GetMenuUncap()), 87<<FRACBITS, 0, ttkart, FRACUNIT/2);
+			V_DrawSciencePatch((84<<FRACBITS) - 18*(((20 - finalecount)<<FRACBITS) - R_GetTimeFrac(RTF_MENU)), 87<<FRACBITS, 0, ttkart, FRACUNIT/2);
 	}
 	else if (finalecount < 52)
 	{
@@ -1019,8 +1022,8 @@ void F_TitleScreenDrawer(void)
 
 		F_SkyScroll(titlescrollspeed);
 
-		V_DrawSciencePatch(0, -40*FixedDiv(((finalecount % 70)<<FRACBITS) + R_GetMenuUncap(), 70<<FRACBITS), V_SNAPTOTOP|V_SNAPTOLEFT, ttcheckers, FRACUNIT);
-		V_DrawSciencePatch(280<<FRACBITS, -(40<<FRACBITS) + 40*FixedDiv(((finalecount % 70)<<FRACBITS) + R_GetMenuUncap(), 70<<FRACBITS), V_SNAPTOTOP|V_SNAPTORIGHT, ttcheckers, FRACUNIT);
+		V_DrawSciencePatch(0, -40*FixedDiv(((finalecount % 70)<<FRACBITS) + R_GetTimeFrac(RTF_MENU), 70<<FRACBITS), V_SNAPTOTOP|V_SNAPTOLEFT, ttcheckers, FRACUNIT);
+		V_DrawSciencePatch(280<<FRACBITS, -(40<<FRACBITS) + 40*FixedDiv(((finalecount % 70)<<FRACBITS) + R_GetTimeFrac(RTF_MENU), 70<<FRACBITS), V_SNAPTOTOP|V_SNAPTORIGHT, ttcheckers, FRACUNIT);
 
 		if (transval)
 			V_DrawFadeScreen(120, 10 - transval);
@@ -1147,13 +1150,6 @@ void F_TitleScreenTicker(boolean run)
 		// Setup demo name
 		snprintf(dname, 9, "%sS%02u", mapname, numstaff);
 
-		/*if ((l = W_CheckNumForName(dname)) == LUMPERROR) -- we KNOW it exists now
-		{
-			CONS_Alert(CONS_ERROR, M_GetText("Demo lump \"%s\" doesn't exist\n"), dname);
-			F_StartIntro();
-			return;
-		}*/
-
 loadreplay:
 		demo.title = demo.fromtitle = true;
 		demo.ignorefiles = true;

src/f_wipe.c

@@ -314,7 +314,7 @@ void F_WipeStartScreen(void)
 	}
 #endif
 	wipe_scr_start = vid.screens[3];
-	I_ReadScreen(wipe_scr_start);
+	I_ReadScreen(wipe_scr_start, 1);
 #endif
 }
 
@@ -331,7 +331,7 @@ void F_WipeEndScreen(void)
 	}
 #endif
 	wipe_scr_end = vid.screens[4];
-	I_ReadScreen(wipe_scr_end);
+	I_ReadScreen(wipe_scr_end, 1);
 	V_DrawBlock(0, 0, 0, vid.width, vid.height, wipe_scr_start);
 #endif
 }

src/filesrch.c

@@ -30,286 +30,7 @@
 #include "z_zone.h"
 #include "m_menu.h" // Addons_option_Onchange
 
-#if defined (_WIN32) && defined (_MSC_VER)
-
-#include <errno.h>
-#include <io.h>
-#include <tchar.h>
-
-#define SUFFIX	"*"
-#define	S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
-
-#ifndef INVALID_FILE_ATTRIBUTES
-#define INVALID_FILE_ATTRIBUTES	((DWORD)-1)
-#endif
-
-struct dirent
-{
-	long		d_ino;		/* Always zero. */
-	unsigned short	d_reclen;	/* Always zero. */
-	unsigned short	d_namlen;	/* Length of name in d_name. */
-	char		d_name[FILENAME_MAX]; /* File name. */
-};
-
-/*
- * This is an internal data structure. Good programmers will not use it
- * except as an argument to one of the functions below.
- * dd_stat field is now int (was short in older versions).
- */
-typedef struct
-{
-	/* disk transfer area for this dir */
-	struct _finddata_t	dd_dta;
-
-	/* dirent struct to return from dir (NOTE: this makes this thread
-	 * safe as long as only one thread uses a particular DIR struct at
-	 * a time) */
-	struct dirent		dd_dir;
-
-	/* _findnext handle */
-#if _MSC_VER > 1200
-	intptr_t    dd_handle;
-#else
-	long        dd_handle;
-#endif
-
-	/*
-	 * Status of search:
-	 *   0 = not started yet (next entry to read is first entry)
-	 *  -1 = off the end
-	 *   positive = 0 based index of next entry
-	 */
-	int			dd_stat;
-
-	/* given path for dir with search pattern (struct is extended) */
-	CHAR			dd_name[1];
-} DIR;
-
-/*
- * opendir
- *
- * Returns a pointer to a DIR structure appropriately filled in to begin
- * searching a directory.
- */
-
-DIR *
-opendir (const CHAR *szPath)
-{
-  DIR *nd;
-  DWORD rc;
-  CHAR szFullPath[MAX_PATH];
-
-  errno = 0;
-
-  if (!szPath)
-    {
-      errno = EFAULT;
-      return (DIR *) 0;
-    }
-
-  if (szPath[0] == '\0')
-    {
-      errno = ENOTDIR;
-      return (DIR *) 0;
-    }
-
-  /* Attempt to determine if the given path really is a directory. */
-  rc = GetFileAttributesA(szPath);
-  if (rc == INVALID_FILE_ATTRIBUTES)
-    {
-      /* call GetLastError for more error info */
-      errno = ENOENT;
-      return (DIR *) 0;
-    }
-  if (!(rc & FILE_ATTRIBUTE_DIRECTORY))
-    {
-      /* Error, entry exists but not a directory. */
-      errno = ENOTDIR;
-      return (DIR *) 0;
-    }
-
-  /* Make an absolute pathname.  */
-  _fullpath (szFullPath, szPath, MAX_PATH);
-
-  /* Allocate enough space to store DIR structure and the complete
-   * directory path given. */
-  nd = (DIR *) malloc (sizeof (DIR) + (strlen(szFullPath) + strlen (SLASH) +
-			strlen(PATHSEP) + 1) * sizeof (CHAR));
-
-  if (!nd)
-    {
-      /* Error, out of memory. */
-      errno = ENOMEM;
-      return (DIR *) 0;
-    }
-
-  /* Create the search expression. */
-  strcpy (nd->dd_name, szFullPath);
-
-  /* Add on a slash if the path does not end with one. */
-  if (nd->dd_name[0] != '\0' &&
-	  nd->dd_name[strlen (nd->dd_name) - 1] != PATHSEP[0])
-    {
-      strcat (nd->dd_name, PATHSEP);
-    }
-
-  /* Add on the search pattern */
-  strcat (nd->dd_name, SUFFIX);
-
-  /* Initialize handle to -1 so that a premature closedir doesn't try
-   * to call _findclose on it. */
-  nd->dd_handle = -1;
-
-  /* Initialize the status. */
-  nd->dd_stat = 0;
-
-  /* Initialize the dirent structure. ino and reclen are invalid under
-   * Win32, and name simply points at the appropriate part of the
-   * findfirst_t structure. */
-  nd->dd_dir.d_ino = 0;
-  nd->dd_dir.d_reclen = 0;
-  nd->dd_dir.d_namlen = 0;
-  ZeroMemory(nd->dd_dir.d_name, FILENAME_MAX);
-
-  return nd;
-}
-
-/*
- * readdir
- *
- * Return a pointer to a dirent structure filled with the information on the
- * next entry in the directory.
- */
-struct dirent *
-readdir (DIR * dirp)
-{
-  errno = 0;
-
-  /* Check for valid DIR struct. */
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return (struct dirent *) 0;
-    }
-
-  if (dirp->dd_stat < 0)
-    {
-      /* We have already returned all files in the directory
-       * (or the structure has an invalid dd_stat). */
-      return (struct dirent *) 0;
-    }
-  else if (dirp->dd_stat == 0)
-    {
-      /* We haven't started the search yet. */
-      /* Start the search */
-      dirp->dd_handle = _findfirst (dirp->dd_name, &(dirp->dd_dta));
-
-	  if (dirp->dd_handle == -1)
-	{
-	  /* Whoops! Seems there are no files in that
-	   * directory. */
-	  dirp->dd_stat = -1;
-	}
-      else
-	{
-	  dirp->dd_stat = 1;
-	}
-    }
-  else
-    {
-      /* Get the next search entry. */
-      if (_findnext (dirp->dd_handle, &(dirp->dd_dta)))
-	{
-	  /* We are off the end or otherwise error.
-	     _findnext sets errno to ENOENT if no more file
-	     Undo this. */
-	  DWORD winerr = GetLastError();
-	  if (winerr == ERROR_NO_MORE_FILES)
-	    errno = 0;
-	  _findclose (dirp->dd_handle);
-	  dirp->dd_handle = -1;
-	  dirp->dd_stat = -1;
-	}
-      else
-	{
-	  /* Update the status to indicate the correct
-	   * number. */
-	  dirp->dd_stat++;
-	}
-    }
-
-  if (dirp->dd_stat > 0)
-    {
-      /* Successfully got an entry. Everything about the file is
-       * already appropriately filled in except the length of the
-       * file name. */
-      dirp->dd_dir.d_namlen = (unsigned short)strlen (dirp->dd_dta.name);
-      strcpy (dirp->dd_dir.d_name, dirp->dd_dta.name);
-      return &dirp->dd_dir;
-    }
-
-  return (struct dirent *) 0;
-}
-
-/*
- * rewinddir
- *
- * Makes the next readdir start from the beginning.
- */
-int
-rewinddir (DIR * dirp)
-{
-  errno = 0;
-
-  /* Check for valid DIR struct. */
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return -1;
-    }
-
-  dirp->dd_stat = 0;
-
-  return 0;
-}
-
-/*
- * closedir
- *
- * Frees up resources allocated by opendir.
- */
-int
-closedir (DIR * dirp)
-{
-  int rc;
-
-  errno = 0;
-  rc = 0;
-
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return -1;
-    }
-
-  if (dirp->dd_handle != -1)
-    {
-      rc = _findclose (dirp->dd_handle);
-    }
-
-  /* Delete the dir structure. */
-  free (dirp);
-
-  return rc;
-}
-#endif
-
-static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"},
-#if 1
-												{1, "HOME"}, {2, "SRB2"},
-#endif
-													{3, "CUSTOM"}, {0, NULL}};
-
+static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"}, {1, "HOME"}, {2, "SRB2"},  {3, "CUSTOM"}, {0, NULL}};
 consvar_t cv_addons_option = {"addons_option", "Default", CV_SAVE|CV_CALL, addons_cons_t, Addons_option_Onchange, 0, NULL, NULL, 0, 0, NULL};
 consvar_t cv_addons_folder = {"addons_folder", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
 
@@ -341,6 +62,7 @@ char *refreshdirname = NULL;
 // direrror is set if there was an error.
 INT32 pathisdirectory(const char *path)
 {
+#ifndef _WIN32
 	struct stat fsstat;
 
 	if (stat(path, &fsstat) < 0)
@@ -348,39 +70,67 @@ INT32 pathisdirectory(const char *path)
 		return -1;
 	}
 	else if (S_ISDIR(fsstat.st_mode))
+	{
 		return 1;
+	}
+
+#else
+	DWORD fileattr = GetFileAttributes(path);
+	if (fileattr == INVALID_FILE_ATTRIBUTES)
+	{
+		return -1;
+	}
+	else if (fileattr & FILE_ATTRIBUTE_DIRECTORY)
+	{
+		return 1;
+	}
+#endif
 
 	return 0;
 }
 
+// skip those folders, they will not have any addons
+static const char *exclude_paths[] = {
+	"logs",
+	"luafiles",
+	"replay",
+	"mdls",
+	"gifs",
+	"screenshots",
+	NULL
+};
+
 filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum, boolean completepath, int maxsearchdepth)
 {
 	filestatus_t retval = FS_NOTFOUND;
 	DIR **dirhandle;
 	struct dirent *dent;
+#ifndef _WIN32
 	struct stat fsstat;
+#endif
 	int found = 0;
-	char *searchname = strdup(filename);
+	char *searchname;
 	int depthleft = maxsearchdepth;
 	char searchpath[1024];
 	size_t *searchpathindex;
 
-	dirhandle = (DIR**) malloc(maxsearchdepth * sizeof(DIR*));
-	searchpathindex = (size_t *) malloc(maxsearchdepth * sizeof(size_t));
+	dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
+	searchpathindex = (size_t *)malloc(maxsearchdepth * sizeof(size_t));
 
-	strcpy(searchpath,startpath);
+	strcpy(searchpath, startpath);
 	searchpathindex[--depthleft] = strlen(searchpath) + 1;
 
 	dirhandle[depthleft] = opendir(searchpath);
 
 	if (dirhandle[depthleft] == NULL)
 	{
-		free(searchname);
 		free(dirhandle);
 		free(searchpathindex);
 		return FS_NOTFOUND;
 	}
 
+	searchname = strdup(filename);
+
 	if (searchpath[searchpathindex[depthleft]-2] != PATHSEP[0])
 	{
 		searchpath[searchpathindex[depthleft]-1] = PATHSEP[0];
@@ -412,62 +162,89 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
 		// okay, now we actually want searchpath to incorporate d_name
 		strcpy(&searchpath[searchpathindex[depthleft]], dent->d_name);
 
-#if defined(__linux__) || defined(__FreeBSD__)
-		if (dent->d_type == DT_UNKNOWN && lstat(searchpath, &fsstat) == 0)
-		{
-			if (S_ISDIR(fsstat.st_mode))
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+		if (dent->d_type == DT_UNKNOWN || dent->d_type == DT_LNK)
+			if (stat(searchpath, &fsstat) == 0 && S_ISDIR(fsstat.st_mode))
 				dent->d_type = DT_DIR;
-			else if (S_ISLNK(fsstat.st_mode))
-				dent->d_type = DT_LNK;
-		}
-
-		// Symlinks aren't always directory symlinks. Dunno if this would resolve recursive
-		// symlinks, but i think stat already does that
-		if (dent->d_type == DT_LNK && stat(searchpath,&fsstat) == 0 && !S_ISDIR(fsstat.st_mode))
-		{
-			dent->d_type = DT_UNKNOWN;
-		}
 
 		// Linux and FreeBSD has a special field for file type on dirent, so use that to speed up lookups.
-		// FIXME: should we also follow symlinks?
-		if ((dent->d_type == DT_DIR && depthleft) || (dent->d_type == DT_LNK && depthleft))
+		if (dent->d_type == DT_DIR)
+#elif defined (_WIN32)
+		// if we wanna follow symlinks we can check with FILE_ATTRIBUTE_REPARSE_POINT
+		DWORD fileattr = GetFileAttributes(searchpath);
+		if (fileattr == INVALID_FILE_ATTRIBUTES)
+			continue; // was the file (re)moved? can't stat it
+
+		if (fileattr & FILE_ATTRIBUTE_DIRECTORY)
 #else
 		if (stat(searchpath,&fsstat) < 0) // do we want to follow symlinks? if not: change it to lstat
-			; // was the file (re)moved? can't stat it
-		else if (S_ISDIR(fsstat.st_mode) && depthleft)
+			continue; // was the file (re)moved? can't stat it
+
+		if (S_ISDIR(fsstat.st_mode))
 #endif
 		{
-			searchpathindex[--depthleft] = strlen(searchpath) + 1;
-			dirhandle[depthleft] = opendir(searchpath);
+			// I am a folder!
 
-			if (!dirhandle[depthleft])
+			if (!depthleft)
+				continue; // No additional folder delving permitted...
+
+			const char **path = exclude_paths;
+
+			if (depthleft == maxsearchdepth-1)
 			{
-				// can't open it... maybe no read-permissions
-				// go back to previous dir
-				depthleft++;
+				// When we're at the root of the search, we exclude certain folders.
+
+				boolean skipfolder = false;
+
+				for (; *path != NULL; path++)
+				{
+					if (strcasecmp(*path, dent->d_name) == 0)
+					{
+						skipfolder = true;
+						break;
+					}
+				}
+
+				// This folder is excluded
+				if (skipfolder)
+				{
+					continue;
+				}
 			}
 
-			searchpath[searchpathindex[depthleft]-1] = PATHSEP[0];
-			searchpath[searchpathindex[depthleft]] = 0;
+			if (strcasecmp(".git", dent->d_name) // sanity if you're weird like me
+				&& (dirhandle[depthleft-1] = opendir(searchpath)) != NULL)
+			{
+				// Got read permissions!
+				searchpathindex[--depthleft] = strlen(searchpath) + 1;
+
+				searchpath[searchpathindex[depthleft]-1] = PATHSEP[0];
+				searchpath[searchpathindex[depthleft]] = 0;
+			}
+
+			continue;
 		}
-		else if (!strcasecmp(searchname, dent->d_name))
+
+		// I am a file!
+
+		if (strcasecmp(searchname, dent->d_name))
+			continue; // Not what we're looking for!
+
+		switch (checkfilemd5(searchpath, wantedmd5sum))
 		{
-			switch (checkfilemd5(searchpath, wantedmd5sum))
-			{
-				case FS_FOUND:
-					if (completepath)
-						strcpy(filename, searchpath);
-					else
-						strcpy(filename, dent->d_name);
-					retval = FS_FOUND;
-					found = 1;
-					break;
-				case FS_MD5SUMBAD:
-					retval = FS_MD5SUMBAD;
-					break;
-				default: // prevent some compiler warnings
-					break;
-			}
+			case FS_FOUND:
+				if (completepath)
+					strcpy(filename, searchpath);
+				else
+					strcpy(filename, dent->d_name);
+				retval = FS_FOUND;
+				found = 1;
+				break;
+			case FS_MD5SUMBAD:
+				retval = FS_MD5SUMBAD;
+				break;
+			default: // prevent some compiler warnings
+				break;
 		}
 	}
 
@@ -644,7 +421,6 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 {
 	DIR *dirhandle;
 	struct dirent *dent;
-	struct stat fsstat;
 	size_t pos = 0, folderpos = 0, numfolders = 0;
 	char *tempname = NULL;
 
@@ -666,10 +442,13 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 		Z_Free(dirmenu);
 	dirmenu = NULL;
 
-	for (; sizecoredirmenu > 0; sizecoredirmenu--) // clear out existing items
+	if (coredirmenu != NULL)
 	{
-		Z_Free(coredirmenu[sizecoredirmenu-1]);
-		coredirmenu[sizecoredirmenu-1] = NULL;
+		for (; sizecoredirmenu > 0; sizecoredirmenu--) // clear out existing items
+		{
+			Z_Free(coredirmenu[sizecoredirmenu-1]);
+			coredirmenu[sizecoredirmenu-1] = NULL;
+		}
 	}
 
 	while (true)
@@ -680,30 +459,37 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 		if (!dent)
 			break;
 		else if (dent->d_name[0]=='.' &&
-				(dent->d_name[1]=='\0' ||
-					(dent->d_name[1]=='.' &&
-						dent->d_name[2]=='\0')))
+					(dent->d_name[1]=='\0' ||
+						(dent->d_name[1]=='.' &&
+							dent->d_name[2]=='\0')))
 			continue; // we don't want to scan uptree
 
 		strcpy(&menupath[menupathindex[menudepthleft]],dent->d_name);
 
-		if (stat(menupath,&fsstat) < 0) // do we want to follow symlinks? if not: change it to lstat
+		INT32 isdir = pathisdirectory(menupath);
+
+		if (isdir == -1)
 			; // was the file (re)moved? can't stat it
 		else // is a file or directory
 		{
-			if (!S_ISDIR(fsstat.st_mode)) // file
+			if (isdir == 0) // file
 			{
 				size_t len = strlen(dent->d_name)+1;
+
 				if (replayhut)
 				{
-					if (strcasecmp(".lmp", dent->d_name+len-5)) continue; // Not a replay
+					if (strcasecmp(".lmp", dent->d_name+len-5))
+						continue; // Not a replay
 				}
 				else if (!cv_addons_showall.value)
 				{
 					UINT8 ext;
 					for (ext = 0; ext < NUM_EXT_TABLE; ext++)
-						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0]))) break; // extension comparison
-					if (ext == NUM_EXT_TABLE) continue; // not an addfile-able (or exec-able) file
+						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+							break; // extension comparison
+
+					if (ext == NUM_EXT_TABLE)
+						continue; // not an addfile-able (or exec-able) file
 				}
 			}
 			else // directory
@@ -748,14 +534,16 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 		if (!dent)
 			break;
 		else if (dent->d_name[0]=='.' &&
-				(dent->d_name[1]=='\0' ||
-					(dent->d_name[1]=='.' &&
-						dent->d_name[2]=='\0')))
+					(dent->d_name[1]=='\0' ||
+						(dent->d_name[1]=='.' &&
+							dent->d_name[2]=='\0')))
 			continue; // we don't want to scan uptree
 
 		strcpy(&menupath[menupathindex[menudepthleft]],dent->d_name);
 
-		if (stat(menupath,&fsstat) < 0) // do we want to follow symlinks? if not: change it to lstat
+		INT32 isdir = pathisdirectory(menupath);
+
+		if (isdir == -1)
 			; // was the file (re)moved? can't stat it
 		else // is a file or directory
 		{
@@ -764,20 +552,27 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 			UINT8 ext = EXT_FOLDER;
 			UINT8 folder;
 
-			if (!S_ISDIR(fsstat.st_mode)) // file
+			if (isdir == 0) // file
 			{
-				if (!((numfolders+pos) < sizecoredirmenu)) continue; // crash prevention
+				if (!((numfolders+pos) < sizecoredirmenu))
+					continue; // crash prevention
 
 				if (replayhut)
 				{
-					if (strcasecmp(".lmp", dent->d_name+len-5)) continue; // Not a replay
+					if (strcasecmp(".lmp", dent->d_name+len-5))
+						continue; // Not a replay
+
 					ext = EXT_TXT; // This isn't used anywhere but better safe than sorry for messing with this...
 				}
 				else
 				{
 					for (; ext < NUM_EXT_TABLE; ext++)
-						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0]))) break; // extension comparison
-					if (ext == NUM_EXT_TABLE && !cv_addons_showall.value) continue; // not an addfile-able (or exec-able) file
+						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0])))
+							break; // extension comparison
+
+					if (ext == NUM_EXT_TABLE && !cv_addons_showall.value)
+						continue; // not an addfile-able (or exec-able) file
+
 					ext += EXT_START; // moving to be appropriate position
 
 					if (ext >= EXT_LOADSTART)
@@ -794,6 +589,7 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 
 							if (strcmp(dent->d_name, filenamebuf[i]))
 								continue;
+
 							if (cv_addons_md5.value && !checkfilemd5(menupath, wadfiles[i]->md5sum))
 								continue;
 
@@ -820,9 +616,11 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
 
 			if (!(temp = Z_Malloc((len+DIR_STRING+folder) * sizeof (char), PU_STATIC, NULL)))
 				I_Error("preparefilemenu(): could not create file entry.");
+
 			temp[DIR_TYPE] = ext;
 			temp[DIR_LEN] = (UINT8)(len);
 			strlcpy(temp+DIR_STRING, dent->d_name, len);
+
 			if (folder)
 			{
 				strcpy(temp+len, PATHSEP);

src/filesrch.h

@@ -30,8 +30,7 @@ extern consvar_t cv_addons_option, cv_addons_folder, cv_addons_md5, cv_addons_sh
 
 */
 
-filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum,
-	boolean completepath, int maxsearchdepth);
+filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum, boolean completepath, int maxsearchdepth);
 
 #define menudepth 20