Add support for external subtitle files

This allows to use external subtile files (currently only SRT is configured) for providing subtitles for movie files. This should be more universal since it also supports container formats with no support for subtitle streams. To use this code the srt file needs to be named "<movie name>-<language code>.srt" where the language code is the file extension name specified in the localization table. For english the "-..." part can be omitted.
2026-11-07 22:56:30 -10:00 · 2018-06-06 19:55:28 +02:00
531 changed files with 15473 additions and 40724 deletions
@@ -1,99 +0,0 @@
---
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: false
-AlignOperands:   true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:   
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   true
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     120
-CommentPragmas:  '^ IWYU pragma:'
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
-  - Regex:           '^(<.*\.(h|hh|hpp)>)$' # Includes of external libraries
-    Priority:        4
-  - Regex:           '^(<.*>)$' # standard library includes (won't match deprecated C headers)
-    Priority:        5
-  - Regex:           '^"[^/]*\.(h)"$' # Local includes
-    Priority:        1
-  - Regex:           '^".*\.(h)"$' # standard engine includes
-    Priority:        2
-  - Regex:           '.*' # Catch all in case something is unhandled above
-    Priority:        3
-IncludeIsMainRegex: '$'
-IndentCaseLabels: false
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Left
-ReflowComments:  true
-SortIncludes:    true
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-TabWidth:        4
-UseTab:          ForIndentation
-...
-
@@ -3,14 +3,12 @@ Checks: "-*,\
 modernize-*,\
 -modernize-raw-string-literal,\
 -modernize-use-using,\
-modernize-make-unique,\
 performance-*,\
 -performance-type-promotion-in-math-fn,\
 misc-*,\
 -misc-macro-parentheses,\
 -misc-misplaced-widening-cast,\
 -misc-static-assert,\
-modernize-make-unique,\
 "
 WarningsAsErrors: ''
 HeaderFilterRegex: 'code/.*$|freespace2/.*$|qtfred/.*$|test/src/.*$|build/.*$'
@@ -26,6 +26,9 @@
 *.unsuccessfulbuild
 ipch/
 [Oo]bj/
+[Bb]in
+[Dd]ebug*/
+[Rr]elease*/
 Ankh.NoLoad
 *.VC.db
 *.VC.VC.opendb
@@ -1,6 +1,3 @@
 [submodule "cmake/external/rpavlik-cmake-modules"]
 	path = cmake/external/rpavlik-cmake-modules
 	url = https://github.com/asarium/cmake-modules.git
-[submodule "lib/libRocket"]
-	path = lib/libRocket
-	url = https://github.com/asarium/libRocket.git
@@ -1,181 +1,157 @@
-language: bash
+language: generic
 sudo: required
 dist: trusty
 cache:
-  directories:
+    directories:
    - $HOME/cmake-3.8
    - $HOME/.ccache
 addons:
-  apt:
-    packages: &global_deps
-      - ninja-build
-      - libopenal-dev
-      - libreadline6-dev
-      - libpng12-dev
-      - libjpeg62-dev
-      - liblua5.1-0-dev
-      - libjansson-dev
-      - libsdl2-dev
-      - libfreetype6-dev
-      - valgrind
-      - qt57base
-  coverity_scan:
-    project:
-      name: "scp-fs2open/fs2open.github.com"
-    notification_email: [email protected]
-    build_command:   "ci/travis/script.sh"
-    # must match TRAVIS_BRANCH check below
-    branch_pattern: coverity_scan
+    apt:
+        packages: &global_deps
+            - ninja-build
+            - libopenal-dev
+            - libreadline6-dev
+            - libpng12-dev
+            - libjpeg62-dev
+            - liblua5.1-0-dev
+            - libjansson-dev
+            - libsdl2-dev
+            - valgrind
+            - qt57base
+    coverity_scan:
+        project:
+            name: "scp-fs2open/fs2open.github.com"
+        notification_email: niffiwan.scp@gmail.com
+        build_command:   "ci/travis/script.sh"
+        # must match TRAVIS_BRANCH check below
+        branch_pattern: coverity_scan
 env:
-  global:
-    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-    #   via the "travis encrypt" command using the project repo's public key
-    #   also note that fork's don't get access to secure keys
-    #   you have to test using a branch in the main repo
-    - secure: "C3wF967ZeliwwP1vC12EMIBOaC568n26Z/cPnwzn317ve59DWH3YSfPZVgvt08GzmaXITGGsJvPB+qxfGoKvQzYE4O1B73q81RpUe5pB3IhF+ThQ91VfQZIRJR5xEGJaLINUlHTTZGX5jxlkVO9wAcauVj/s3b8sQ3dvUZauPvk="
-    # These declarations set INDIEGAMES_USER and INDIEGAMES_PASSWORD for uploading nightly builds to the indiegames server
-    - secure: "lUuRu8XIi8MKNf1ebOfyC4iVEpPyASojJIDWXRo2bNqEF4ILAljXdkVeXeN6H5yKCHD52cxCNTtyePIG/o3p3QEuGSVud9bDS3D7LaQicLETGGrsw3l07U49gF2OKHXGopg0MzBbZUU9QmhoFTAe8t6PV9NDuEayYCheqvTqjZg="
-    - secure: "E/DHLYcPK/hBUqxBYYlUqp5sjgvIqY5A0qRHyQ4bmjsB+WB/Xx71bGCSiF7hk6lTxar1ZI1i5RAXXh9AIvNVaYAIdEOlCP+q3gvwCYuc5naZEKmkxlUCf0oEL4O9Fye93A/3VkFHuBdC1TGPYYf69m4W5r4367wWO9dPRIdWpJA="
-    # These declarations set FS2DOWNLOADS_USER and FS2DOWNLOADS_PASSWORD
-    - secure: "h6GbMX2jLsW1bS9fCM9fthOSJ1nfQQIRWi6EUH2p8u4NFLD5Bfi/C8JhQPKHUzyo3wvKkSHl+PsW7bgr1oXLusRwAur/dtv2N3imqvtbfIz305b00hZlsvbcYmQmUzQFSAdOGShK57JJ5aKQKccaUBP25KqB7Q+JaqBRdaMBS54="
-    - secure: "fUDAPAUUaaYZy8I4zU3SJ0JcK7aw4eb6eTdaEr7LyNyTMSfPgwY6P1MrbSQC0lJNQIUQ5ffjdxE5g7D7OYpoJF9L14ni4UY8t2QASt7kmpgcYihmjeuYy8FQXgmFG8CTxiWBPKTybZJ7voQcvIvRaNG7b2wM9PMfc5lRIondB6c="
+    global:
+     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+     #   via the "travis encrypt" command using the project repo's public key
+     #   also note that fork's don't get access to secure keys
+     #   you have to test using a branch in the main repo
+     - secure: "C3wF967ZeliwwP1vC12EMIBOaC568n26Z/cPnwzn317ve59DWH3YSfPZVgvt08GzmaXITGGsJvPB+qxfGoKvQzYE4O1B73q81RpUe5pB3IhF+ThQ91VfQZIRJR5xEGJaLINUlHTTZGX5jxlkVO9wAcauVj/s3b8sQ3dvUZauPvk="
+     # These declarations set INDIEGAMES_USER and INDIEGAMES_PASSWORD for uploading nightly builds to the indiegames server
+     - secure: "lUuRu8XIi8MKNf1ebOfyC4iVEpPyASojJIDWXRo2bNqEF4ILAljXdkVeXeN6H5yKCHD52cxCNTtyePIG/o3p3QEuGSVud9bDS3D7LaQicLETGGrsw3l07U49gF2OKHXGopg0MzBbZUU9QmhoFTAe8t6PV9NDuEayYCheqvTqjZg="
+     - secure: "E/DHLYcPK/hBUqxBYYlUqp5sjgvIqY5A0qRHyQ4bmjsB+WB/Xx71bGCSiF7hk6lTxar1ZI1i5RAXXh9AIvNVaYAIdEOlCP+q3gvwCYuc5naZEKmkxlUCf0oEL4O9Fye93A/3VkFHuBdC1TGPYYf69m4W5r4367wWO9dPRIdWpJA="
+     # These declarations set FS2DOWNLOADS_USER and FS2DOWNLOADS_PASSWORD
+     - secure: "h6GbMX2jLsW1bS9fCM9fthOSJ1nfQQIRWi6EUH2p8u4NFLD5Bfi/C8JhQPKHUzyo3wvKkSHl+PsW7bgr1oXLusRwAur/dtv2N3imqvtbfIz305b00hZlsvbcYmQmUzQFSAdOGShK57JJ5aKQKccaUBP25KqB7Q+JaqBRdaMBS54="
+     - secure: "fUDAPAUUaaYZy8I4zU3SJ0JcK7aw4eb6eTdaEr7LyNyTMSfPgwY6P1MrbSQC0lJNQIUQ5ffjdxE5g7D7OYpoJF9L14ni4UY8t2QASt7kmpgcYihmjeuYy8FQXgmFG8CTxiWBPKTybZJ7voQcvIvRaNG7b2wM9PMfc5lRIondB6c="
 deploy:
-  - provider: releases
-    api_key:
-      secure: "Wdt4Ccefo7a0ZDjEJQJgpghh7n72FtNJuKSAPUvoz4gtEX6Ct9J8yJI1t9V3jE3CTbbLJ21/Q6eZRDfT7UfNJe5DdepoJsP9DeFhKMWqQCq+AChqQWlm0KeZAffJoJreL8vXYhnRYcLT9ceZHEH6AqwN9TPV+xJziGPISAkYNZ8="
-    skip_cleanup: true
-    file_glob: true
-    file: "/tmp/builds/*"
-    on:
-      condition: '"$RELEASE_BUILD" == true'
-      tags: true
+    - provider: releases
+      api_key:
+          secure: "Wdt4Ccefo7a0ZDjEJQJgpghh7n72FtNJuKSAPUvoz4gtEX6Ct9J8yJI1t9V3jE3CTbbLJ21/Q6eZRDfT7UfNJe5DdepoJsP9DeFhKMWqQCq+AChqQWlm0KeZAffJoJreL8vXYhnRYcLT9ceZHEH6AqwN9TPV+xJziGPISAkYNZ8="
+      skip_cleanup: true
+      file_glob: true
+      file: "/tmp/builds/*"
+      on:
+          condition: '"$RELEASE_BUILD" == true'
+          tags: true

-  - provider: script
-    script: bash ci/travis/ftp_deploy.sh
-    on:
-      condition: '"$NIGHTLY_BUILD" == true'
-      tags: true
+    - provider: script
+      script: bash ci/travis/ftp_deploy.sh
+      on:
+          condition: '"$NIGHTLY_BUILD" == true'
+          tags: true

-  - provider: script
-    skip_cleanup: true
-    script: bash ci/travis/ftp_deploy.sh
-    on:
-      condition: $TEST_BUILD = true
-      all_branches: true
+    - provider: script
+      skip_cleanup: true
+      script: bash ci/travis/ftp_deploy.sh
+      on:
+          condition: $TEST_BUILD = true
+          all_branches: true

 matrix:
-  include:
-    # note that gcc Debug MUST be 1st for Coverity
-    - os: linux
-      env: CONFIGURATION="Debug" CC=gcc-5 CXX=g++-5
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - *global_deps
-            - g++-5
-    - os: linux
-      env: CONFIGURATION="Debug" CC=gcc-8 CXX=g++-8
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - g++-8
-            - *global_deps
-    - os: linux
-      env: CONFIGURATION="Debug" CC=clang-4.0 CXX=clang++-4.0 CMAKE_OPTIONS="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - *global_deps
-            - clang-4.0
-            - clang-tidy-4.0
-            - libc++-dev
-      script:
-        - ./ci/travis/script.sh
-        - ./ci/travis/clang_tidy.sh
-    - os: osx
-      env: CONFIGURATION="Debug"
-
-    - os: windows
-      env: CONFIGURATION="Debug" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
-    - os: windows
-      env: CONFIGURATION="Debug" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
-
-    - os: linux
-      env: CONFIGURATION="Release" CC=gcc-5 CXX=g++-5
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - *global_deps
-            - g++-5
-    - os: linux
-      env: CONFIGURATION="Release" CC=gcc-8 CXX=g++-8
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - g++-8
-            - *global_deps
-    - os: linux
-      env: CONFIGURATION="Release" CC=clang-4.0 CXX=clang++-4.0
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - *global_deps
-            - clang-4.0
-            - libc++-dev
-    - os: osx
-      env: CONFIGURATION="Release"
-
-    - os: windows
-      env: CONFIGURATION="Release" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
-    - os: windows
-      env: CONFIGURATION="Release" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
-  # As long as Windows is still experimental on Travis CI, allow failures
-  allow_failures:
-    - os: windows
-      env: CONFIGURATION="Debug" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
-    - os: windows
-      env: CONFIGURATION="Debug" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
-    - os: windows
-      env: CONFIGURATION="Release" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
-    - os: windows
-      env: CONFIGURATION="Release" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
-  fast_finish: true
+    include:
+        # note that gcc Debug MUST be 1st for Coverity
+        - os: linux
+          env: CONFIGURATION="Debug" CC=gcc-5 CXX=g++-5
+          addons:
+              apt:
+                  sources:
+                      - ubuntu-toolchain-r-test
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
+                  packages:
+                      - *global_deps
+                      - g++-5
+        - os: linux
+          env: CONFIGURATION="Debug" CC=gcc-7 CXX=g++-7
+          addons:
+              apt:
+                  sources:
+                      - ubuntu-toolchain-r-test
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
+                  packages:
+                      - g++-7
+                      - *global_deps
+        - os: linux
+          env: CONFIGURATION="Debug" CC=clang-4.0 CXX=clang++-4.0 CMAKE_OPTIONS="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
+          addons:
+              apt:
+                  sources:
+                      - ubuntu-toolchain-r-test
+                      - llvm-toolchain-trusty-4.0
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
+                  packages:
+                      - *global_deps
+                      - clang-4.0
+                      - clang-tidy-4.0
+                      - libc++-dev
+          script:
+            - ./ci/travis/script.sh
+            - ./ci/travis/clang_tidy.sh
+        - os: osx
+          env: CONFIGURATION="Debug"

+        - os: linux
+          env: CONFIGURATION="Release" CC=gcc-5 CXX=g++-5
+          addons:
+              apt:
+                  sources:
+                      - ubuntu-toolchain-r-test
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
+                  packages:
+                      - *global_deps
+                      - g++-5
+        - os: linux
+          env: CONFIGURATION="Release" CC=gcc-7 CXX=g++-7
+          addons:
+              apt:
+                  sources:
+                      - ubuntu-toolchain-r-test
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
+                  packages:
+                      - g++-7
+                      - *global_deps
+        - os: linux
+          env: CONFIGURATION="Release" CC=clang-4.0 CXX=clang++-4.0
+          addons:
+              apt:
+                  sources:
+                      - ubuntu-toolchain-r-test
+                      - llvm-toolchain-trusty-4.0
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
+                  packages:
+                      - *global_deps
+                      - clang-4.0
+                      - libc++-dev
+        - os: osx
+          env: CONFIGURATION="Release"
 before_install:
-  # ugly hack; if running a coverity scan abort all except the 1st build
-  # see note re gcc compiler above needing to be 1st
-  # also note that branch_pattern & the TRAVIS_BRANCH check must match
-  # unfortunately COVERITY_SCAN_BRANCH isn't defined until later in the
-  # build process
-  - if ([[ "${TRAVIS_JOB_NUMBER##*.}" != "1" ]] && [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]); then false ; fi
-  - source "./ci/travis/check_release.sh"
-  - "./ci/travis/before_install.sh"
+    # ugly hack; if running a coverity scan abort all except the 1st build
+    # see note re gcc compiler above needing to be 1st
+    # also note that branch_pattern & the TRAVIS_BRANCH check must match
+    # unfortunately COVERITY_SCAN_BRANCH isn't defined until later in the
+    # build process
+    - if ([[ "${TRAVIS_JOB_NUMBER##*.}" != "1" ]] && [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]); then false ; fi
+    - source "./ci/travis/check_release.sh"
+    - "./ci/travis/before_install.sh"
 install:
-  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH="/c/Program Files/CMake/bin":$PATH; fi
-  - "./ci/travis/install.sh"
-  - export PATH=$HOME/cmake-3.6/bin:$PATH
+    - "./ci/travis/install.sh"
+    - export PATH=$HOME/cmake-3.6/bin:$PATH
 before_script:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then QT_ENV_SCRIPT=$(find /opt -name 'qt*-env.sh'); source $QT_ENV_SCRIPT; fi
-  - "./ci/travis/before_script.sh"
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then QT_ENV_SCRIPT=$(find /opt -name 'qt*-env.sh'); source $QT_ENV_SCRIPT; fi
+    - "./ci/travis/before_script.sh"
 script:
-  - if [ "$BUILD_DEPLOYMENT" = true ] ; then ./ci/travis/release.sh ; else ./ci/travis/script.sh ; fi
+    - if [ "$BUILD_DEPLOYMENT" = true ] ; then ./ci/travis/release.sh ; else ./ci/travis/script.sh ; fi
@@ -84,6 +84,7 @@ IF (WIN32)
 	OPTION(FSO_BUILD_FRED2 "Build FRED2 binary" ON)
 elseif(UNIX)
 	option(FSO_BUILD_APPIMAGE "Build an AppImage package" OFF)
+	set(APPIMAGE_ASSISTANT "" CACHE STRING "The root directory of an AppImage clone.")
 ENDIF(WIN32)

 OPTION(FSO_BUILD_TOOLS "Build tools related to FSO" OFF)
@@ -133,7 +133,6 @@ if ($DeployBuild) {
 	
 	cmake -DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/../install" -DFSO_USE_SPEECH="ON" `
 		-DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$($buildConfig.SimdType)" `
-		-DQT5_INSTALL_ROOT="$($buildConfig.QtDir)" -DFSO_BUILD_QTFRED=ON `
 		-G "$($buildConfig.Generator)" -T "$($buildConfig.Toolset)" ..

 	$Configs = @("Release", "FastDebug")
@@ -8,7 +8,4 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
    # Nothing to do here
    :
-elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
-    # Nothing to do here
-    :
 fi
@@ -2,19 +2,15 @@

 set -ex

-if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    mkdir -p /tmp/builds
-    if [ "$RELEASE_BUILD" = true ]; then
-        # Package the source code in release builds
-        PARENT_DIR="$(basename "$PWD")"
-        (cd .. && tar -czvf /tmp/builds/$PACKAGE_NAME-source-Unix.tar.gz --exclude-vcs "$PARENT_DIR")
-    fi
-fi
-
 mkdir -p build
 cd build

 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    if [ "$RELEASE_BUILD" = true ]; then
+        PARENT_DIR="$(basename $PWD)"
+        (cd .. && tar -czvf /tmp/builds/$PACKAGE_NAME-source-Unix.tar.gz --exclude-vcs "$PARENT_DIR")
+    fi
+    
    CXXFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"
    CFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"

@@ -31,7 +27,8 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
            mkdir -p $config
            cd $config
            eval $CMAKE -DFSO_INSTALL_DEBUG_FILES=ON -DCMAKE_BUILD_TYPE=$config -DCMAKE_INSTALL_PREFIX="/tmp/release/$config" \
-                -DFSO_BUILD_APPIMAGE=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFFMPEG_USE_PRECOMPILED=ON -DFSO_BUILD_QTFRED=OFF ../..
+                -DFSO_BUILD_APPIMAGE=ON -DAPPIMAGE_ASSISTANT="$HOME/AppImageAssistant" \
+                -DFSO_BUILD_INCLUDED_LIBS=ON -DFFMPEG_USE_PRECOMPILED=ON ../..
            cd ..
        done
    else
@@ -43,12 +40,4 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
    else
        cmake -G "Xcode" $CMAKE_OPTIONS ..
    fi
-elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
-    if [ "$CMAKE_GENERATOR" = "Ninja" ]; then
-        cmake -DFSO_USE_SPEECH="OFF" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-            -DFSO_BUILD_FRED2="OFF" -G "$CMAKE_GENERATOR" ..
-    else
-        cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-            -DMSVC_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "$CMAKE_GENERATOR" -T "$CMAKE_TOOLSET" ..
-    fi
 fi
@@ -58,11 +58,6 @@ if [ "$BUILD_DEPLOYMENT" = true ]; then
        echo "Skipping non-release configuration";
        exit 0;
    fi
-
-    if [ "$TRAVIS_OS_NAME" = "windows" ]; then
-        echo "Skipping non-release platform"
-        exit 0
-    fi
 fi

 export RELEASE_BUILD
@@ -16,19 +16,14 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
    cd $HOME
    
    if [ "${BUILD_DEPLOYMENT}" = true ]; then
-        wget -O appimagetool -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" # (64-bit)
-        chmod a+x ./appimagetool
-
-        wget -O linuxdeployqt -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" # (64-bit)
-        chmod a+x ./linuxdeployqt
+        wget -c "https://github.com/probonopd/AppImageKit/releases/download/5/AppImageAssistant" # (64-bit)
+        chmod a+x ./AppImageAssistant
    fi
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
    gem install xcpretty
    
    brew update
    brew outdated cmake || brew upgrade cmake
-elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
-    choco install mingw ninja
 fi

 cmake --version
@@ -8,40 +8,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
    for config in $BUILD_CONFIGS
    do
        cd "$config"
-
-        # Compile all targets
-        ninja all
-
-        # Install Freespace2 targets
-        cmake -DCMAKE_INSTALL_PREFIX=/tmp/release/$config/fso -DCOMPONENT=Unspecified -P cmake_install.cmake
-        cmake -DCMAKE_INSTALL_PREFIX=/tmp/release/$config/fso -DCOMPONENT=Freespace2 -P cmake_install.cmake
-
-        # We need to be a bit creative for determining the AppImage name since we don't want to hard-code the name
-        FILENAME="$(find /tmp/release/$config/fso/bin -name 'fs2_open_*' -type f -printf "%f\n").AppImage"
-        $HOME/appimagetool -n /tmp/release/$config/fso "/tmp/release/$config/fso/$FILENAME"
-
-: <<'END'
-        # Install qtFRED targets
-        cmake -DCMAKE_INSTALL_PREFIX=/tmp/release/$config/qtfred/usr -DCOMPONENT=Unspecified -P cmake_install.cmake
-        cmake -DCMAKE_INSTALL_PREFIX=/tmp/release/$config/qtfred/usr -DCOMPONENT=qtFRED -P cmake_install.cmake
-
-        PREV="$(pwd)"
-        cd /tmp/release/$config/qtfred
-
-        unset QTDIR; unset QT_PLUGIN_PATH; unset LD_LIBRARY_PATH
-        $HOME/linuxdeployqt usr/qtfred.desktop -bundle-non-qt-libs
-        # Move our AppRun script to the right location
-        mv usr/AppRun AppRun
-
-        echo "Embed newer libstdc++ for distros that don't come with it (ubuntu 14.04)";
-        mkdir -p usr/optional/; mkdir -p usr/optional/libstdc++/;
-        cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./usr/optional/libstdc++/;
-
-        $HOME/appimagetool -n . "$(find /tmp/release/$config/qtfred/usr/bin -name 'qtfred_*' -type f -printf "%f\n").AppImage"
-
-        cd "$PREV"
-END
-
+        ninja appimage
        cd ..
    done

@@ -7,13 +7,8 @@ cd build
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
    ninja -k 20 all

-
-    if [ "$CONFIGURATION" = "Debug" ]; then
-        valgrind --leak-check=full --error-exitcode=1 --gen-suppressions=all \
-            --suppressions="$TRAVIS_BUILD_DIR/ci/travis/valgrind.supp" ./bin/unittests --gtest_shuffle
-    else
-        ./bin/unittests --gtest_shuffle
-    fi
+    valgrind --leak-check=full --error-exitcode=1 --gen-suppressions=all \
+        --suppressions="$TRAVIS_BUILD_DIR/ci/travis/valgrind.supp" ./bin/unittests --gtest_shuffle
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
    cmake --build . --config "$CONFIGURATION" | tee build.log | xcpretty
    XCODE_RET=${PIPESTATUS[0]}
@@ -22,10 +17,4 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
        curl --upload-file build.log.tar.gz "https://transfer.sh/build.log.tar.gz"
        exit $XCODE_RET
    fi
-elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
-    if [ "$CMAKE_GENERATOR" = "Ninja" ]; then
-        cmake --build . --config "$CONFIGURATION"
-    else
-        cmake --build . --config "$CONFIGURATION" -- /verbosity:minimal
-    fi
 fi
@@ -25,19 +25,4 @@
    fun:_dl_init
    fun:dl_open_worker
    fun:_dl_catch_error
-}
-{
-   CLang Lua unitialized value error
-   Memcheck:Cond
-   ...
-   fun:luaH_get
-   fun:lua_rawget
-   fun:_ZN12_GLOBAL__N_117ade_index_handlerEP9lua_State
-}
-{
-   False-positive uninitialized variable warning
-   Memcheck:Cond
-   fun:_Z23cf_check_location_flagsjj
-   fun:_Z29cf_create_default_path_stringPcjiPKcbj
-   ...
-}
+}
@@ -1,6 +1,4 @@
 [Desktop Entry]
-Type=Application
 Name=FreeSpace Open
 Exec=$<TARGET_FILE_NAME:Freespace2>
-Icon=app_icon
-Categories=Game;
+Icon=app_icon.png
@@ -6,16 +6,18 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/AppRun.in" "${CMAKE_CURRENT_BINARY_DIR
 file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AppRun-$<CONFIG>"
    INPUT "${CMAKE_CURRENT_BINARY_DIR}/AppRun.gen")

-install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/AppRun-$<CONFIG>" DESTINATION "." RENAME "AppRun"
-        COMPONENT "Freespace2")
+install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/AppRun-$<CONFIG>" DESTINATION "." RENAME "AppRun")


 configure_file("${CMAKE_CURRENT_LIST_DIR}/AppImage.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/AppImage.desktop.gen" @ONLY)
 file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AppImage-$<CONFIG>.desktop"
    INPUT "${CMAKE_CURRENT_BINARY_DIR}/AppImage.desktop.gen")

-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AppImage-$<CONFIG>.desktop" DESTINATION "." RENAME "fso.desktop"
-        COMPONENT "Freespace2")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AppImage-$<CONFIG>.desktop" DESTINATION "." RENAME "fso.desktop")

-install(FILES "${CMAKE_SOURCE_DIR}/freespace2/resources/app_icon.png" DESTINATION "."
-        COMPONENT "Freespace2")
+install(FILES "${CMAKE_SOURCE_DIR}/freespace2/resources/app_icon.png" DESTINATION ".")
+
+add_custom_target(appimage
+COMMAND "${APPIMAGE_ASSISTANT}" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/fs2_open_${FSO_BINARY_SUFFIX}.AppImage")
+    
+add_dependencies(appimage install)
@@ -85,17 +85,6 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wreturn-type")

 set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-deprecated -Wno-char-subscripts")

-# These two warnings cause a lot of false-positives in the FSO code base
-check_cxx_compiler_flag(-Wstringop-truncation SUPPORTS_STRINGOP_TRUNCATION)
-if(SUPPORTS_STRINGOP_TRUNCATION)
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-stringop-truncation")
-endif()
-
-check_cxx_compiler_flag(-Wstringop-overflow SUPPORTS_STRINGOP_OVERFLOW)
-if(SUPPORTS_STRINGOP_TRUNCATION)
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-stringop-overflow")
-endif()
-
 set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered  -Wno-unused-parameter")

 set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")
@@ -36,7 +36,6 @@ set(WARNING_FLAGS
 	/wd4592 # "symbol will be dynamically initialized" is being generated by a compiler bug, see https://stackoverflow.com/a/34027257 for an explanation - m!m
 	$<$<CONFIG:Release>:/wd4101> # In release mode there are unreferenced variables because debug needs them
 	/wd4995 # "'vsprintf': name was marked as #pragma deprecated" is being caused by our custom definition of vsprintf. I have no idea what causes this or how to fix it - m!m
-	/wd4723 # "potential divide by 0" is caused by some code that definitely will not divide by zero - m!m
 )

 target_compile_options(compiler INTERFACE ${WARNING_FLAGS})
@@ -136,9 +135,9 @@ else()
 	ENDIF()
 endif()

-target_compile_definitions(compiler INTERFACE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _SECURE_SCL=0 NOMINMAX
-		"$<$<CONFIG:FastDebug>:_ITERATOR_DEBUG_LEVEL=0>" _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-
+target_compile_definitions(compiler INTERFACE _CRT_SECURE_NO_DEPRECATE
+_CRT_SECURE_NO_WARNINGS _SECURE_SCL=0 NOMINMAX "$<$<CONFIG:FastDebug>:_ITERATOR_DEBUG_LEVEL=0>")
+	
 if (FSO_FATAL_WARNINGS)
 	# Make warnings fatal if the right variable is set
 	target_compile_options(compiler INTERFACE "/WX")
@@ -225,13 +225,3 @@ function(list_target_dependencies _target _out_var)
 	list(REMOVE_DUPLICATES out_list)
 	set(${_out_var} ${out_list} PARENT_SCOPE)
 endfunction(list_target_dependencies)
-
-macro(add_file_folder FOLDER_NAME)
-	string(MAKE_C_IDENTIFIER "${FOLDER_NAME}" VARIABLE_NAME)
-	set(files_${VARIABLE_NAME} ${files_${VARIABLE_NAME}} ${ARGN})
-
-	string(REPLACE "/" "\\" FIXED_FOLDER_FILE "${FOLDER_NAME}")
-
-	source_group("${FIXED_FOLDER_FILE}" FILES ${ARGN})
-	set(source_files ${source_files} ${ARGN})
-endmacro(add_file_folder)
@@ -3,7 +3,7 @@ INCLUDE(source_groups.cmake)

 INCLUDE(voice_rec.cmake)

-ADD_LIBRARY(code STATIC ${source_files} ${VOICE_REC_FILES})
+ADD_LIBRARY(code STATIC ${file_root} ${VOICE_REC_FILES})

 target_compile_features(code PUBLIC ${REQUIRED_CXX_FEATURES})

@@ -37,10 +37,6 @@ TARGET_LINK_LIBRARIES(code PUBLIC compiler)

 target_link_libraries(code PUBLIC md5)

-target_link_libraries(code PUBLIC discord-rpc)
-
-target_link_libraries(code PUBLIC libRocket)
-
 enable_clang_tidy(code)

 IF (FSO_USE_SPEECH)
@@ -567,9 +567,9 @@ extern void ai_dock_with_object(object *docker, int docker_index, object *dockee
 extern void ai_stay_still(object *still_objp, vec3d *view_pos);
 extern void ai_do_default_behavior(object *obj);
 extern void ai_start_waypoints(object *objp, waypoint_list *wp_list, int wp_flags);
-extern void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hit_normal);
-extern void ai_ship_destroy(int shipnum);
-extern void ai_turn_towards_vector(vec3d *dest, object *objp, float turn_time, vec3d *slide_vec, vec3d *rel_pos, float bank_override, int flags, vec3d *rvec = nullptr, int sexp_flags = 0);
+extern void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hitpos, int shield_quadrant, vec3d *hit_normal);
+extern void ai_ship_destroy(int shipnum, Ship::Exit_Flags method);
+extern void ai_turn_towards_vector(vec3d *dest, object *objp, float frametime, float turn_time, vec3d *slide_vec, vec3d *rel_pos, float bank_override, int flags, vec3d *rvec = NULL, int sexp_flags = 0);
 extern void init_ai_object(int objnum);
 extern void ai_init(void);				//	Call this one to parse ai.tbl.
 extern void ai_level_init(void);		//	Call before each level to reset AI
@@ -622,7 +622,7 @@ extern float ai_path();
 extern void evade_weapon();
 extern int might_collide_with_ship(object *obj1, object *obj2, float dot_to_enemy, float dist_to_enemy, float duration);
 extern int ai_fire_primary_weapon(object *objp);	//changed to return weather it fired-Bobboau
-extern int ai_fire_secondary_weapon(object *objp);
+extern int ai_fire_secondary_weapon(object *objp, int priority1 = -1, int priority2 = -1);
 extern float ai_get_weapon_dist(ship_weapon *swp);
 extern void turn_towards_point(object *objp, vec3d *point, vec3d *slide_vec, float bank_override);
 extern int ai_maybe_fire_afterburner(object *objp, ai_info *aip);
@@ -87,7 +87,6 @@ namespace AI {
        Fix_heat_seeker_stealth_bug,
        Fix_linked_primary_bug,
        Force_beam_turret_fov,
-		Free_afterburner_use,
        Glide_decay_requires_thrust,
        Hack_improve_non_homing_swarm_turret_fire_accuracy,
        Huge_turret_weapons_ignore_bombs,
@@ -111,7 +110,6 @@ namespace AI {
        Smart_subsystem_targeting_for_turrets,
        Strict_turred_tagged_only_targeting,
        Turrets_ignore_target_radius,
-        Use_actual_primary_range,
        Use_additive_weapon_velocity,
        Use_newtonian_dampening,
        Use_only_single_fov_for_turrets,
@@ -357,8 +357,6 @@ void parse_ai_profiles_tbl(const char *filename)

 				set_flag(profile, "$smart afterburner management:", AI::Profile_Flags::Smart_afterburner_management);

-				set_flag(profile, "$free afterburner use:", AI::Profile_Flags::Free_afterburner_use);
-
 				set_flag(profile, "$allow rapid secondary dumbfire:", AI::Profile_Flags::Allow_rapid_secondary_dumbfire);

 				set_flag(profile, "$huge turret weapons ignore bombs:", AI::Profile_Flags::Huge_turret_weapons_ignore_bombs);
@@ -460,8 +458,6 @@ void parse_ai_profiles_tbl(const char *filename)

 				set_flag(profile, "$ai can slow down when attacking big ships:", AI::Profile_Flags::Ai_can_slow_down_attacking_big_ships);

-				set_flag(profile, "$use actual primary range:", AI::Profile_Flags::Use_actual_primary_range);
-
 				profile->bay_arrive_speed_mult = 1.0f;
 				profile->bay_depart_speed_mult = 1.0f;
 				if (optional_string("$bay arrive speed multiplier:")) {
@@ -64,11 +64,10 @@ void	ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 void	ai_big_avoid_ship();
 int	ai_big_maybe_follow_subsys_path(int do_dot_check=1);
 void ai_big_strafe_position();
-static int ai_big_strafe_maybe_retreat(const vec3d *target_pos);

 extern int model_which_octant_distant_many( vec3d *pnt, int model_num,matrix *model_orient, vec3d * model_pos, polymodel **pm, int *octs);
 extern void compute_desired_rvec(vec3d *rvec, vec3d *goal_pos, vec3d *cur_pos);
-extern void big_ship_collide_recover_start(object *objp, object *big_objp, vec3d *collision_normal);
+extern void big_ship_collide_recover_start(object *objp, object *big_objp, vec3d *collide_pos, vec3d *collision_normal);


 //	Called by ai_big_pick_attack_point.
@@ -632,7 +631,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 		else
 			rvec = NULL;

-		ai_turn_towards_vector(enemy_pos, Pl_objp, sip->srotation_time, nullptr, rel_pos, 0.0f, 0, rvec);
+		ai_turn_towards_vector(enemy_pos, Pl_objp, flFrametime, sip->srotation_time, NULL, rel_pos, 0.0f, 0, rvec);

 		// calc range of primary weapon
 		weapon_travel_dist = ai_get_weapon_dist(&Ships[Pl_objp->instance].weapons);
@@ -642,7 +641,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 				accelerate_ship(aip, 1.0f);
 				
 				ship	*shipp = &Ships[Pl_objp->instance];
-				if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (dot_to_enemy > 0.75f)) {
+				if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (dot_to_enemy > 0.75f)) {
 					if (ai_maybe_fire_afterburner(Pl_objp, aip)) {
 						afterburners_start(Pl_objp);
 						aip->afterburner_stop_time = Missiontime + 3*F1_0;
@@ -684,7 +683,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 				accelerate_ship(aip, accel);

 				ship	*shipp = &Ships[Pl_objp->instance];
-				if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (accel > 0.95f)) {
+				if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (accel > 0.95f)) {
 					if (ai_maybe_fire_afterburner(Pl_objp, aip)) {
 						afterburners_start(Pl_objp);
 						aip->afterburner_stop_time = Missiontime + 3*F1_0;
@@ -708,14 +707,14 @@ extern float set_secondary_fire_delay(ai_info *aip, ship *shipp, weapon_info *sw
 extern void ai_choose_secondary_weapon(object *objp, ai_info *aip, object *en_objp);
 extern int maybe_avoid_big_ship(object *objp, object *ignore_objp, ai_info *aip, vec3d *goal_point, float delta_time);

-extern void maybe_cheat_fire_synaptic(object *objp);
+extern void maybe_cheat_fire_synaptic(object *objp, ai_info *aip);

 // Determine if Pl_objp should fire weapons at current target, based on input parameters
 //
 // dist_to_enemy	=>		distance (in m) to attack point on current target
 // dot_to_enemy	=>		dot product between fvec of Pl_objp and vector from Pl_objp to attack point
 //
-static void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy)
+void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vec3d * /*firing_pos*/, vec3d * /*enemy_pos*/, vec3d * /*enemy_vel*/)
 {
 	ai_info		*aip;
 	ship_weapon	*swp;
@@ -846,6 +845,8 @@ void ai_big_switch_to_chase_mode(ai_info *aip)
 	aip->submode_start_time = Missiontime;
 }

+extern int ai_big_strafe_maybe_retreat(float dist, vec3d *target_pos);
+
 // Make object Pl_objp chase object En_objp, which is a big ship, not a small ship.
 void ai_big_chase()
 {
@@ -858,7 +859,7 @@ void ai_big_chase()

 	Assert(aip->mode == AIM_CHASE);

-	maybe_cheat_fire_synaptic(Pl_objp);
+	maybe_cheat_fire_synaptic(Pl_objp, aip);

 	ai_set_positions(Pl_objp, En_objp, aip, &player_pos, &enemy_pos);

@@ -881,7 +882,7 @@ void ai_big_chase()
 	dot_to_enemy = vm_vec_dot(&vec_to_enemy, &Pl_objp->orient.vec.fvec);

 	if (aip->ai_flags[AI::AI_Flags::Target_collision]) {
-		if ( ai_big_strafe_maybe_retreat(&enemy_pos) ) {
+		if ( ai_big_strafe_maybe_retreat(dist_to_enemy, &enemy_pos) ) {
 			aip->mode = AIM_STRAFE;
 			aip->submode_parm0 = Missiontime;	// use parm0 as time strafe mode entered (i.e. MODE start time)
 			aip->submode = AIS_STRAFE_AVOID;
@@ -1044,7 +1045,7 @@ void ai_big_chase()
 			if ((dist_normal_to_enemy < ATTACK_COLLIDE_AVOID_DIST + speed_dist) || (time_to_enemy < ATTACK_COLLIDE_AVOID_TIME) ) {
 				// get away, simulate crsh recovery (don't use avoid)
 //				accelerate_ship(aip, -1.0f);
-				big_ship_collide_recover_start(Pl_objp, En_objp, nullptr);
+				big_ship_collide_recover_start(Pl_objp, En_objp, &Pl_objp->pos, NULL);
 //				aip->submode = SM_AVOID;
 //				aip->submode_start_time = Missiontime;
 			} else if ((dist_normal_to_enemy < ATTACK_COLLIDE_SLOW_DIST) || (time_to_enemy < ATTACK_COLLIDE_SLOW_TIME) ) {
@@ -1143,7 +1144,7 @@ void ai_big_chase()
 	//		 TODO: investigate why ships fire (and aren't close to hitting ship) when following a path near
 	//				 a big ship
 	if (aip->mode != AIM_EVADE && aip->path_start == -1 ) {
-		ai_big_maybe_fire_weapons(dist_to_enemy, dot_to_enemy);
+		ai_big_maybe_fire_weapons(dist_to_enemy, dot_to_enemy, &player_pos, &predicted_enemy_pos, &En_objp->phys_info.vel);
 	} else {
 		if (flFrametime < 1.0f)
 			aip->time_enemy_in_range *= (1.0f - flFrametime);
@@ -1152,6 +1153,11 @@ void ai_big_chase()
 	}
 }

+void ai_big_ship(object * /*objp*/)
+{
+	// do nothing
+}
+
 // all three parms are output parameters
 //	Enemy object is En_objp
 // pos	=>		world pos of attack point
@@ -1222,7 +1228,7 @@ void ai_big_attack_get_data(vec3d *enemy_pos, float *dist_to_enemy, float *dot_t

 // check to see if Pl_objp has gotten too close to attacking point.. if so, break off by entering
 // AIS_STRAFE_RETREAT
-static int ai_big_strafe_maybe_retreat(const vec3d *target_pos)
+int ai_big_strafe_maybe_retreat(float  /*dist*/, vec3d *target_pos)
 {
 	ai_info	*aip;
 	aip = &Ai_info[Ships[Pl_objp->instance].ai_index];
@@ -1252,7 +1258,7 @@ static int ai_big_strafe_maybe_retreat(const vec3d *target_pos)
 		if (aip->ai_flags[AI::AI_Flags::Target_collision]) {
 			// use standard collision resolution
 			aip->ai_flags.remove(AI::AI_Flags::Target_collision);
-			big_ship_collide_recover_start(Pl_objp, En_objp, nullptr);
+			big_ship_collide_recover_start(Pl_objp, En_objp, &Pl_objp->pos, NULL);
 		} else {
 			// too close for comfort so fly to box point + 300
 			aip->submode = AIS_STRAFE_RETREAT1;
@@ -1292,12 +1298,12 @@ void ai_big_strafe_attack()
 	}

 	ai_big_attack_get_data(&target_pos, &target_dist, &target_dot);
-	if ( ai_big_strafe_maybe_retreat(&target_pos) )
+	if ( ai_big_strafe_maybe_retreat(target_dist, &target_pos) )
 		return;

 	if (aip->ai_flags[AI::AI_Flags::Kamikaze]) {
 		if (target_dist < 1200.0f) {
-			ai_turn_towards_vector(&target_pos, Pl_objp, Ship_info[Ships[Pl_objp->instance].ship_info_index].srotation_time, nullptr, nullptr, 0.0f, 0);
+			ai_turn_towards_vector(&target_pos, Pl_objp, flFrametime, Ship_info[Ships[Pl_objp->instance].ship_info_index].srotation_time, NULL, NULL, 0.0f, 0);
 			accelerate_ship(aip, 1.0f);
 			if ((target_dist < 400.0f) && ai_maybe_fire_afterburner(Pl_objp, aip)) {
 				afterburners_start(Pl_objp);
@@ -1341,7 +1347,7 @@ void ai_big_strafe_attack()
 	}

 	// maybe fire weapons at target
-	ai_big_maybe_fire_weapons(target_dist, target_dot);
+	ai_big_maybe_fire_weapons(target_dist, target_dot, &Pl_objp->pos, &En_objp->pos, &En_objp->phys_info.vel);
 	turn_towards_point(Pl_objp, &target_pos, NULL, 0.0f);

 	fix last_hit = Missiontime - aip->last_hit_time;
@@ -1487,7 +1493,7 @@ void ai_big_strafe_glide_attack()
 		vm_vec_sub2(&target_pos, &En_objp->pos);

 		turn_towards_point(Pl_objp, &target_pos, NULL, 0.0f);
-		ai_big_maybe_fire_weapons(target_dist, target_dot);
+		ai_big_maybe_fire_weapons(target_dist, target_dot, &Pl_objp->pos, &En_objp->pos, &En_objp->phys_info.vel);
 	}

 	// if haven't been hit in quite a while, leave strafe mode
@@ -1511,7 +1517,7 @@ void ai_big_strafe_avoid()
 	mode_time = Missiontime - aip->submode_start_time;

 	ai_big_attack_get_data(&target_pos, &target_dist, &target_dot);
-	if ( ai_big_strafe_maybe_retreat(&target_pos) )
+	if ( ai_big_strafe_maybe_retreat(target_dist, &target_pos) )
 		return;

 	if ( mode_time > fl2f(0.5)) {
@@ -1698,7 +1704,7 @@ void ai_big_strafe()
 //
 // Check if weapon_objnum was fired by Pl_objp's target, and whether Pl_objp's target is a big ship, if
 // so, enter AIM_STRAFE
-int ai_big_maybe_enter_strafe_mode(const object *pl_objp, int weapon_objnum)
+int ai_big_maybe_enter_strafe_mode(object *pl_objp, int weapon_objnum, int  /*consider_target_only*/)
 {
 	ai_info		*aip;
 	ship_info	*sip;
@@ -1772,7 +1778,7 @@ int ai_big_maybe_enter_strafe_mode(const object *pl_objp, int weapon_objnum)
 // Consider attacking a turret, if a turret actually fired the weapon
 // input:	ship_objp	=>	ship that will attack the turret
 //				weapon_objp	=>	
-void ai_big_strafe_maybe_attack_turret(const object *ship_objp, const object *weapon_objp)
+void ai_big_strafe_maybe_attack_turret(object *ship_objp, object *weapon_objp)
 {
 	ai_info	*aip;
 	object	*parent_objp;
@@ -17,13 +17,14 @@ struct ai_info;
 struct vec3d;
 class ship_subsys;

+void	ai_big_ship(object *objp);
 void	ai_big_chase();
 void	ai_big_subsys_path_cleanup(ai_info *aip);

 // strafe functions
 void	ai_big_strafe();
-int	ai_big_maybe_enter_strafe_mode(const object *objp, int weapon_objnum);
-void	ai_big_strafe_maybe_attack_turret(const object *ship_objp, const object *weapon_objp);
+int	ai_big_maybe_enter_strafe_mode(object *objp, int weapon_objnum, int consider_target_only=0);
+void	ai_big_strafe_maybe_attack_turret(object *ship_objp, object *weapon_objp);
 void ai_big_pick_attack_point(object *objp, object *attacker_objp, vec3d *attack_point, float fov=1.0f);
 void ai_big_pick_attack_point_turret(object *objp, ship_subsys *ssp, vec3d *gpos, vec3d *gvec, vec3d *attack_point, float weapon_travel_dist, float fov=1.0f);

@@ -745,8 +745,6 @@ void parse_ai_class()

 	set_aic_flag(aicp, "$smart afterburner management:", AI::Profile_Flags::Smart_afterburner_management);

-	set_aic_flag(aicp, "$free afterburner use:", AI::Profile_Flags::Free_afterburner_use);
-
 	set_aic_flag(aicp, "$allow rapid secondary dumbfire:", AI::Profile_Flags::Allow_rapid_secondary_dumbfire);
 	
 	set_aic_flag(aicp, "$huge turret weapons ignore bombs:", AI::Profile_Flags::Huge_turret_weapons_ignore_bombs);
@@ -766,8 +764,6 @@ void parse_ai_class()
 	set_aic_flag(aicp, "$all ships manage shields:", AI::Profile_Flags::All_ships_manage_shields);

 	set_aic_flag(aicp, "$ai can slow down when attacking big ships:", AI::Profile_Flags::Ai_can_slow_down_attacking_big_ships);
-
-	set_aic_flag(aicp, "$use actual primary range:", AI::Profile_Flags::Use_actual_primary_range);
 }

 void reset_ai_class_names()
@@ -1136,7 +1132,7 @@ void ai_update_danger_weapon(int attacked_objnum, int weapon_objnum)

 //	If rvec != NULL, use it to match bank by calling vm_matrix_interpolate.
 //	(rvec defaults to NULL)
-void ai_turn_towards_vector(vec3d *dest, object *objp, float turn_time, vec3d *slide_vec, vec3d *rel_pos, float bank_override, int flags, vec3d *rvec, int sexp_flags)
+void ai_turn_towards_vector(vec3d *dest, object *objp, float  /*frametime*/, float turn_time, vec3d *slide_vec, vec3d *rel_pos, float bank_override, int flags, vec3d *rvec, int sexp_flags)
 {
 	matrix	curr_orient;
 	vec3d	vel_in, vel_out, desired_fvec, src;
@@ -1504,12 +1500,12 @@ void turn_towards_point(object *objp, vec3d *point, vec3d *slide_vec, float bank
 	if (aip->ai_flags[AI::AI_Flags::Formation_object, AI::AI_Flags::Formation_wing]) {
 		if (&Objects[aip->goal_objnum] != objp) {
 			float rotvel_z = objp->phys_info.rotvel.xyz.z;
-			ai_turn_towards_vector(point, objp, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, slide_vec, nullptr, bank_override, 0);
+			ai_turn_towards_vector(point, objp, flFrametime, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, slide_vec, NULL, bank_override, 0);
 			objp->phys_info.rotvel.xyz.z = rotvel_z;
 		}
 	} else {
 		// normal turn
-		ai_turn_towards_vector(point, objp, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, slide_vec, nullptr, bank_override, 0);
+		ai_turn_towards_vector(point, objp, flFrametime, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, slide_vec, NULL, bank_override, 0);
 	}
 }

@@ -1524,7 +1520,7 @@ void turn_away_from_point(object *objp, vec3d *point, float bank_override)
 	vm_vec_sub(&opposite_point, &objp->pos, point);
 	vm_vec_add2(&opposite_point, &objp->pos);

-	ai_turn_towards_vector(&opposite_point, objp, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, nullptr, nullptr, bank_override, AITTV_FAST);
+	ai_turn_towards_vector(&opposite_point, objp, flFrametime, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, NULL, NULL, bank_override, AITTV_FAST);
 }


@@ -1793,7 +1789,7 @@ float get_wing_lowest_av_ab_speed(object *objp)

 	wingnum = aip->wing;

-	if (((shipp->flags[Ship::Ship_Flags::Afterburner_locked]) || !(sip->flags[Ship::Info_Flags::Afterburner])) || (shipp->current_max_speed < 5.0f) || (objp->phys_info.afterburner_max_vel.xyz.z <= shipp->current_max_speed) || !(aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use]))	{
+	if (((shipp->flags[Ship::Ship_Flags::Afterburner_locked]) || !(sip->flags[Ship::Info_Flags::Afterburner])) || (shipp->current_max_speed < 5.0f) || (objp->phys_info.afterburner_max_vel.xyz.z <= shipp->current_max_speed) || !(aip->ai_flags[AI::AI_Flags::Free_afterburner_use]))	{
 		lowest_max_av_ab_speed = shipp->current_max_speed;
 	}
 	else
@@ -1818,7 +1814,7 @@ float get_wing_lowest_av_ab_speed(object *objp)
 		if ((oaip->mode == AIM_WAYPOINTS) && (oaip->wing == wingnum) && (oaip->ai_flags[AI::AI_Flags::Formation_object, AI::AI_Flags::Formation_wing])) {
 			
 			float cur_max;
-			if ((oshipp->flags[Ship::Ship_Flags::Afterburner_locked]) || !(osip->flags[Ship::Info_Flags::Afterburner]) || (o->phys_info.afterburner_max_vel.xyz.z <= oshipp->current_max_speed) || !(oaip->ai_flags[AI::AI_Flags::Free_afterburner_use] || oaip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use])) {
+			if ((oshipp->flags[Ship::Ship_Flags::Afterburner_locked]) || !(osip->flags[Ship::Info_Flags::Afterburner]) || (o->phys_info.afterburner_max_vel.xyz.z <= oshipp->current_max_speed) || !(oaip->ai_flags[AI::AI_Flags::Free_afterburner_use])) {
 				cur_max = oshipp->current_max_speed;
 			}
 			else
@@ -3452,6 +3448,35 @@ float compute_time_to_enemy(float dist_to_enemy, object *pobjp)
 	return time_to_enemy + flFrametime;
 }

+//	Stuff *dot and *tts.
+//	*dot is always computed.  If dot is less than zero, the magnitude is
+//	incorrect, not having been divided by distance.
+//	If *dot is > 0.0f, then tts is computed.  This is the time it will take object
+//	*objp to get to *pos, assuming it moves right at it.
+void fds_aux(float *dot, float *tts, vec3d *pos, float  /*dtime*/, object *objp)
+{
+	vec3d	v2s;
+
+	vm_vec_sub(&v2s, pos, &objp->pos);
+	*dot = vm_vec_dot(&v2s, &objp->orient.vec.fvec);
+
+	if (*dot > 0.0f) {
+		float	dist;
+
+		dist = vm_vec_dist(&objp->pos, pos);
+
+		if (dist > 0.1f)
+			*dot /= dist;
+		else
+			*dot = 1.0f;
+
+		if (objp->phys_info.speed > 0.1f)
+			*tts = dist / objp->phys_info.speed;
+		else
+			*tts = dist * 100.0f;
+	}
+}
+
 //	--------------------------------------------------------------------------
 void ai_set_positions(object *pl_objp, object *en_objp, ai_info *aip, vec3d *player_pos, vec3d *enemy_pos)
 {
@@ -3867,7 +3892,7 @@ float ai_path_0()
 	}

 	if (dist_to_goal > 0.1f)
-		ai_turn_towards_vector(&gcvp, Pl_objp, sip->srotation_time, slop_vec, nullptr, 0.0f, 0);
+		ai_turn_towards_vector(&gcvp, Pl_objp, flFrametime, sip->srotation_time, slop_vec, NULL, 0.0f, 0);

 	//	Code to control speed is MUCH less forgiving in path following than in waypoint
 	//	following.  Must be very close to path or might hit objects.
@@ -4009,10 +4034,10 @@ float ai_path_1()
 		if (r <= 1.0f) {
 			vec3d midpoint;
 			vm_vec_avg3(&midpoint, &gcvp, &closest_point, &closest_point);
-			ai_turn_towards_vector(&midpoint, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0, prvec);
+			ai_turn_towards_vector(&midpoint, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0, prvec);
 		}
 		else {
-			ai_turn_towards_vector(&gcvp, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0, prvec);
+			ai_turn_towards_vector(&gcvp, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0, prvec);
 		}
 	}

@@ -4357,11 +4382,11 @@ void ai_fly_to_target_position(vec3d* target_pos, bool* pl_done_p=NULL, bool* pl
 			vm_vector_2_matrix(&Pl_objp->orient, &perp, NULL, NULL);
 		} else {
 			vm_vec_scale_add(&perp, &Pl_objp->pos, &Autopilot_flight_leader->phys_info.vel, 1000.0f);
-			ai_turn_towards_vector(&perp, Pl_objp, sip->srotation_time*3.0f*scale, slop_vec, nullptr, 0.0f, 0);
+			ai_turn_towards_vector(&perp, Pl_objp, flFrametime, sip->srotation_time*3.0f*scale, slop_vec, NULL, 0.0f, 0);
 		}
 	} else {
 		if (dist_to_goal > 0.1f) {
-			ai_turn_towards_vector(target_pos, Pl_objp, sip->srotation_time*3.0f*scale, slop_vec, nullptr, 0.0f, 0);
+			ai_turn_towards_vector(target_pos, Pl_objp, flFrametime, sip->srotation_time*3.0f*scale, slop_vec, NULL, 0.0f, 0);
 		}
 	}

@@ -4415,7 +4440,7 @@ void ai_fly_to_target_position(vec3d* target_pos, bool* pl_done_p=NULL, bool* pl
 			ab_allowed = false;
 	}

-	if (!(sip->flags[Ship::Info_Flags::Afterburner]) || (shipp->flags[Ship::Ship_Flags::Afterburner_locked]) || !(aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use])) {
+	if (!(sip->flags[Ship::Info_Flags::Afterburner]) || (shipp->flags[Ship::Ship_Flags::Afterburner_locked]) || !(aip->ai_flags[AI::AI_Flags::Free_afterburner_use])) {
 		ab_allowed = false;
 	}

@@ -5026,7 +5051,7 @@ void slide_face_ship()

 	dist = vm_vec_normalized_dir(&vec_from_enemy, &Pl_objp->pos, &En_objp->pos);

-	ai_turn_towards_vector(&En_objp->pos, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0);
+	ai_turn_towards_vector(&En_objp->pos, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0);

 	dot_from_enemy = vm_vec_dot(&vec_from_enemy, &En_objp->orient.vec.fvec);

@@ -5209,7 +5234,7 @@ vec3d	G_predicted_pos, G_fire_pos;
 //	Else
 //		Select Any ol' weapon.
 //	Returns primary_bank index.
-static int ai_select_primary_weapon_OLD(const object *objp, Weapon::Info_Flags flags)
+int ai_select_primary_weapon_OLD(object *objp, object * /*other_objp*/, Weapon::Info_Flags flags)
 {
 	ship	*shipp = &Ships[objp->instance];
 	ship_weapon *swp = &shipp->weapons;
@@ -5300,7 +5325,7 @@ int ai_select_primary_weapon(object *objp, object *other_objp, Weapon::Info_Flag
 	//not using the new AI, use the old version of this function instead.
 	if (!(Ai_info[shipp->ai_index].ai_profile_flags[AI::Profile_Flags::Smart_primary_weapon_selection]))
 	{
-		return ai_select_primary_weapon_OLD(objp, flags);
+		return ai_select_primary_weapon_OLD(objp, other_objp, flags);
 	}

 	Assert( shipp->ship_info_index >= 0 && shipp->ship_info_index < static_cast<int>(Ship_info.size()));
@@ -6026,7 +6051,8 @@ int check_ok_to_fire(int objnum, int target_objnum, weapon_info *wip)
 //	--------------------------------------------------------------------------
 //	Fire a secondary weapon.
 //	Maybe choose to fire a different one.
-int ai_fire_secondary_weapon(object *objp)
+//	priority1 and priority2 are optional parameters with defaults = -1
+int ai_fire_secondary_weapon(object *objp, int  /*priority1*/, int  /*priority2*/)
 {
 	ship_weapon *swp;
 	ship	*shipp;
@@ -6046,7 +6072,7 @@ int ai_fire_secondary_weapon(object *objp)
 	Assert( shipp->ship_info_index >= 0 && shipp->ship_info_index < static_cast<int>(Ship_info.size()));

 	//	Select secondary weapon.
-	current_bank = swp->current_secondary_bank;
+	current_bank = swp->current_secondary_bank; //ai_select_secondary_weapon(objp, swp, priority1, priority2);

 	if (current_bank == -1) {
 		return rval;
@@ -6513,14 +6539,14 @@ void ai_chase_ct()
 		vm_vec_add2(&tvec, &Pl_objp->orient.vec.rvec);
 	}

-	ai_turn_towards_vector(&tvec, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0);
+	ai_turn_towards_vector(&tvec, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0);
 	accelerate_ship(aip, 1.0f);
 }

 /**
 * ATTACK submode handler for chase mode.
 */
-static void ai_chase_eb(ai_info *aip, ship_info *sip, vec3d *predicted_enemy_pos)
+void ai_chase_eb(ai_info *aip, ship_info *sip, vec3d *predicted_enemy_pos, float  /*dist_to_enemy*/)
 {
 	vec3d	_pep;
 	float		dot_to_enemy, dot_from_enemy;
@@ -6532,7 +6558,7 @@ static void ai_chase_eb(ai_info *aip, ship_info *sip, vec3d *predicted_enemy_pos
 	if ((dot_to_enemy > dot_from_enemy + 0.1f) || (dot_to_enemy > 0.9f))
 		vm_vec_scale_add(&_pep, &Pl_objp->pos, &En_objp->orient.vec.fvec, 100.0f);

-	ai_turn_towards_vector(&_pep, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0);
+	ai_turn_towards_vector(&_pep, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0);

 	accelerate_ship(aip, 0.0f);
 }
@@ -6729,7 +6755,7 @@ void attack_set_accel(ai_info *aip, ship_info *sip, float dist_to_enemy, float d

 //	Pl_objp (aip) tries to get behind En_objp.
 //	New on 2/21/98: If this ship can move backwards and slide, maybe do that to get behind.
-static void get_behind_ship(ai_info *aip, ship_info *sip)
+void get_behind_ship(ai_info *aip, ship_info *sip, float  /*dist_to_enemy*/)
 {
 	vec3d	new_pos;
 	float	dot;
@@ -6738,7 +6764,7 @@ static void get_behind_ship(ai_info *aip, ship_info *sip)
 	vm_vec_normalized_dir(&vec_from_enemy, &Pl_objp->pos, &En_objp->pos);

 	vm_vec_scale_add(&new_pos, &En_objp->pos, &En_objp->orient.vec.fvec, -100.0f);		//	Pick point 100 units behind.
-	ai_turn_towards_vector(&new_pos, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0);
+	ai_turn_towards_vector(&new_pos, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0);

 	dot = vm_vec_dot(&vec_from_enemy, &En_objp->orient.vec.fvec);

@@ -6757,7 +6783,7 @@ int avoid_player(object *objp, vec3d *goal_pos)
 	if (aip->ai_flags[AI::AI_Flags::Avoiding_small_ship]) {
 		ship_info *sip = &Ship_info[Ships[objp->instance].ship_info_index];
 		
-		ai_turn_towards_vector(&aip->avoid_goal_point, objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0);
+		ai_turn_towards_vector(&aip->avoid_goal_point, objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0);
 		accelerate_ship(aip, 0.5f);
 		return 1;
 	}
@@ -6955,7 +6981,7 @@ int maybe_avoid_big_ship(object *objp, object *ignore_objp, ai_info *aip, vec3d

 		vec3d	v2g;

-		ai_turn_towards_vector(&aip->avoid_goal_point, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0);
+		ai_turn_towards_vector(&aip->avoid_goal_point, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0);
 		vm_vec_normalized_dir(&v2g, &aip->avoid_goal_point, &Pl_objp->pos);
 		float dot = vm_vec_dot(&objp->orient.vec.fvec, &v2g);
 		float d2 = (1.0f + dot) * (1.0f + dot);
@@ -7047,7 +7073,7 @@ void ai_stealth_find()
 			}
 		}

-		ai_turn_towards_vector(&new_pos, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0);
+		ai_turn_towards_vector(&new_pos, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0);
 		return;
 	}

@@ -7057,9 +7083,9 @@ void ai_stealth_find()
 	if (dist_to_enemy > 500.0f) {
 		vec3d	rvec;
 		compute_desired_rvec(&rvec, &new_pos, &Pl_objp->pos);
-		ai_turn_towards_vector(&new_pos, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0, &rvec);
+		ai_turn_towards_vector(&new_pos, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0, &rvec);
 	} else {
-		ai_turn_towards_vector(&new_pos, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0);
+		ai_turn_towards_vector(&new_pos, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0);
 	}

 	dot_from_enemy = -vm_vec_dot(&vec_to_enemy, &En_objp->orient.vec.fvec);
@@ -7187,7 +7213,7 @@ void ai_stealth_sweep()
 		return;
 	}

-	ai_turn_towards_vector(&goal_pt, Pl_objp, sip->srotation_time, nullptr, nullptr, 0.0f, 0);
+	ai_turn_towards_vector(&goal_pt, Pl_objp, flFrametime, sip->srotation_time, NULL, NULL, 0.0f, 0);

 	float dot = 1.0f;
 	if (dist_to_goal < 100) {
@@ -7247,9 +7273,9 @@ void ai_chase_attack(ai_info *aip, ship_info *sip, vec3d *predicted_enemy_pos, f
 	if (dist_to_enemy > 500.0f) {
 		vec3d	rvec;
 		compute_desired_rvec(&rvec, predicted_enemy_pos, &Pl_objp->pos);
-		ai_turn_towards_vector(&new_pos, Pl_objp, sip->srotation_time, nullptr, rel_pos, bank_override, 0, &rvec);
+		ai_turn_towards_vector(&new_pos, Pl_objp, flFrametime, sip->srotation_time, NULL, rel_pos, bank_override, 0, &rvec);
 	} else {
-		ai_turn_towards_vector(&new_pos, Pl_objp, sip->srotation_time, nullptr, rel_pos, bank_override, 0);
+		ai_turn_towards_vector(&new_pos, Pl_objp, flFrametime, sip->srotation_time, NULL, rel_pos, bank_override, 0);
 	}

 	attack_set_accel(aip, sip, dist_to_enemy, dot_to_enemy, dot_from_enemy);
@@ -7287,7 +7313,7 @@ void ai_chase_es(ai_info *aip, ship_info *sip)

 	float bank_override = Pl_objp->phys_info.speed;

-	ai_turn_towards_vector(&tvec, Pl_objp, sip->srotation_time, nullptr, nullptr, bank_override, 0);
+	ai_turn_towards_vector(&tvec, Pl_objp, flFrametime/2, sip->srotation_time, NULL, NULL, bank_override, 0);
 	accelerate_ship(aip, 1.0f);
 }

@@ -7313,7 +7339,7 @@ void ai_chase_ga(ai_info *aip, ship_info *sip)

 	bank_override = Pl_objp->phys_info.speed;

-	ai_turn_towards_vector(&tvec, Pl_objp, sip->srotation_time, nullptr, nullptr, bank_override, 0);
+	ai_turn_towards_vector(&tvec, Pl_objp, flFrametime/2, sip->srotation_time, NULL, NULL, bank_override, 0);

 	accelerate_ship(aip, 2.0f);

@@ -7975,7 +8001,7 @@ void ai_cruiser_chase()

 	// kamikaze - ram and explode
 	if (aip->ai_flags[AI::AI_Flags::Kamikaze]) {
-		ai_turn_towards_vector(&En_objp->pos, Pl_objp, turn_time, nullptr, nullptr, 0.0f, 0);
+		ai_turn_towards_vector(&En_objp->pos, Pl_objp, flFrametime, turn_time, NULL, NULL, 0.0f, 0);
 		accelerate_ship(aip, 1.0f);
 	} 
 	
@@ -8015,7 +8041,7 @@ void ai_cruiser_chase()
 		}

 		// now move as desired
-		ai_turn_towards_vector(&goal_pos, Pl_objp, turn_time, nullptr, nullptr, 0.0f, 0, rvecp);
+		ai_turn_towards_vector(&goal_pos, Pl_objp, flFrametime, turn_time, NULL, NULL, 0.0f, 0, rvecp);
 		accelerate_ship(aip, accel);

 		// maybe switch to new mode
@@ -8296,7 +8322,7 @@ void ai_chase()
 		break;

 	case SM_EVADE_BRAKE:
-		ai_chase_eb(aip, sip, &predicted_enemy_pos);
+		ai_chase_eb(aip, sip, &predicted_enemy_pos, dist_to_enemy);
 		break;

 	case SM_EVADE:
@@ -8308,7 +8334,7 @@ void ai_chase()
 		break;

 	case SM_GET_BEHIND:
-		get_behind_ship(aip, sip);
+		get_behind_ship(aip, sip, dist_to_enemy);
 		break;

 	case SM_GET_AWAY:		//	Used to get away from opponent to prevent endless circling.
@@ -8742,11 +8768,7 @@ void ai_chase()
 						scale = (scale - 0.6f) * 1.5f;
 					else
 						scale = 0.0f;
-					float range = pwip->max_speed * (1.0f + scale);
-					if (aip->ai_profile_flags[AI::Profile_Flags::Use_actual_primary_range]) {
-						range = std::min( {range, pwip->max_speed * pwip->lifetime, pwip->weapon_range} );
-					}
-					if (dist_to_enemy < range) {
+					if (dist_to_enemy < pwip->max_speed * (1.0f + scale)) {
 						if(ai_fire_primary_weapon(Pl_objp) == 1){
 							has_fired = 1;
 						}else{
@@ -9307,7 +9329,7 @@ float dock_orient_and_approach(object *docker_objp, int docker_index, object *do
 		{
 			float	dot, accel;
 			float turn_time = Ship_info[Ships[docker_objp->instance].ship_info_index].srotation_time;
-			ai_turn_towards_vector(&goal_point, docker_objp, turn_time, nullptr, nullptr, 0.0f, 0);
+			ai_turn_towards_vector(&goal_point, docker_objp, flFrametime, turn_time, NULL, NULL, 0.0f, 0);

 			dot = vm_vec_dot(&docker_objp->orient.vec.fvec, &away_vec);
 			accel = 0.1f;
@@ -9942,10 +9964,10 @@ void ai_big_guard()
 		}

 		// got the point, now let's go there
-		ai_turn_towards_vector(&goal_pt, Pl_objp, Ship_info[Ships[Pl_objp->instance].ship_info_index].srotation_time, nullptr, nullptr, 0.0f, 0);
+		ai_turn_towards_vector(&goal_pt, Pl_objp, flFrametime, Ship_info[Ships[Pl_objp->instance].ship_info_index].srotation_time, NULL, NULL, 0.0f, 0);
 		accelerate_ship(aip, 1.0f);

-		if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (cur_guard_rad > 1.1f * max_guard_dist)) {
+		if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (cur_guard_rad > 1.1f * max_guard_dist)) {
 			vec3d	v2g;
 			float	dot_to_goal_point;

@@ -10066,9 +10088,9 @@ void ai_guard()

 			// quite far away, so try to go straight to 
 			compute_desired_rvec(&rvec, &goal_point, &Pl_objp->pos);
-			ai_turn_towards_vector(&goal_point, Pl_objp, Ship_info[shipp->ship_info_index].srotation_time, nullptr, nullptr, 0.0f, 0, &rvec);
+			ai_turn_towards_vector(&goal_point, Pl_objp, flFrametime, Ship_info[shipp->ship_info_index].srotation_time, NULL, NULL, 0.0f, 0, &rvec);

-			if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (accel_scale * (0.25f + dist_to_goal_point/700.0f) > 0.8f)) {
+			if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (accel_scale * (0.25f + dist_to_goal_point/700.0f) > 0.8f)) {
 				if (ai_maybe_fire_afterburner(Pl_objp, aip)) {
 					afterburners_start(Pl_objp);
 					aip->afterburner_stop_time = Missiontime + 3*F1_0;
@@ -10691,8 +10713,8 @@ void ai_dock()
 			char *goal_ship_class_name = goal_sip->name;
 			char *goal_dock_path_name = model_get(goal_sip->model_num)->paths[aip->mp_index].name;

-			mprintf(("Ship class %s has only %i points on dock path \"%s\".  Recommended minimum number of points is 4.  "\
-				"Docking along that path will look strange.  You may wish to edit the model.", goal_ship_class_name, aip->path_length, goal_dock_path_name));
+			Warning(LOCATION, "Ship class %s has only %i points on dock path \"%s\".  Recommended minimum number of points is 4.  "\
+				"Docking along that path will look strange.  You may wish to edit the model.", goal_ship_class_name, aip->path_length, goal_dock_path_name);
 		}

 		aip->submode = AIS_DOCK_1;
@@ -11363,7 +11385,7 @@ float gwlr_1(object *objp, ai_info *aip)
 /**
 * Compute the largest radius of a ship forming on *objp's wing.
 */
-static float gwlr_object_1(object *objp)
+float gwlr_object_1(object *objp, ai_info * /*aip*/)
 {
 	float		max_radius;
 	object	*o;
@@ -11396,7 +11418,7 @@ float get_wing_largest_radius(object *objp, int formation_object_flag)
 	aip = &Ai_info[shipp->ai_index];

 	if (formation_object_flag) {
-		return gwlr_object_1(objp);
+		return gwlr_object_1(objp, aip);
 	} else {
 		return gwlr_1(objp, aip);
 	}
@@ -11786,7 +11808,7 @@ int ai_formation()

 	ship_info *sip = &Ship_info[shipp->ship_info_index];
 	bool ab_allowed = false;
-	if ((sip->flags[Ship::Info_Flags::Afterburner]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use])) {
+	if ((sip->flags[Ship::Info_Flags::Afterburner]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (aip->ai_flags[AI::AI_Flags::Free_afterburner_use])) {
 		ab_allowed = true;
 	} else {
 		if (Pl_objp->phys_info.flags & PF_AFTERBURNER_ON)
@@ -12169,7 +12191,7 @@ void ai_maybe_launch_cmeasure(object *objp, ai_info *aip)
 }

 //	--------------------------------------------------------------------------
-static void ai_preprocess_ignore_objnum(ai_info *aip)
+void ai_preprocess_ignore_objnum(object * /*objp*/, ai_info *aip)
 {
 	if (aip->ai_flags[AI::AI_Flags::Temporary_ignore])
 	{
@@ -13042,6 +13064,7 @@ void ai_execute_behavior(ai_info *aip)
 	case AIM_NONE:
 		break;
 	case AIM_BIGSHIP:
+		ai_big_ship(Pl_objp);
 		break;
 	case AIM_PATH: {
 		int path_num;
@@ -13418,7 +13441,7 @@ void ai_warp_out(object *objp)

 //	Return object index of weapon that could produce a shockwave that should be known about to *objp.
 //	Return nearest one.
-static int ai_find_shockwave_weapon(const object *objp)
+int ai_find_shockwave_weapon(object *objp, ai_info * /*aip*/)
 {
 	missile_obj	*mo;
 	float	nearest_dist = 999999.9f;
@@ -13484,7 +13507,7 @@ void ai_announce_ship_dying(object *dying_objp)

 //	Return object index of weapon that could produce a shockwave that should be known about to *objp.
 //	Return nearest one.
-static int ai_find_shockwave_ship(object *objp)
+int ai_find_shockwave_ship(object *objp, ai_info * /*aip*/)
 {
 	ship_obj	*so;
 	float	nearest_dist = 999999.9f;
@@ -13527,7 +13550,7 @@ int aas_1(object *objp, ai_info *aip, vec3d *safe_pos)
 		//	If we don't currently know of a weapon to avoid, try to find one.
 		//	If we can't find one, then clear the bit so we don't keep coming here.
 		if (aip->shockwave_object == -1) {
-			int shockwave_weapon = ai_find_shockwave_weapon(objp);
+			int shockwave_weapon = ai_find_shockwave_weapon(objp, aip);
 			if (shockwave_weapon == -1) {
 				aip->ai_flags.remove(AI::AI_Flags::Avoid_shockwave_weapon);
 				return 0;
@@ -13616,7 +13639,7 @@ int aas_1(object *objp, ai_info *aip, vec3d *safe_pos)
 		}
 	} else if (aip->ai_flags[AI::AI_Flags::Avoid_shockwave_ship]) {
 		if (aip->shockwave_object == -1) {
-			int shockwave_ship = ai_find_shockwave_ship(objp);
+			int shockwave_ship = ai_find_shockwave_ship(objp, aip);
 			if (shockwave_ship == -1) {
 				aip->ai_flags.remove(AI::AI_Flags::Avoid_shockwave_ship);
 				return 0;
@@ -13846,7 +13869,7 @@ int maybe_big_ship_collide_recover_frame(object *objp, ai_info *aip)
 	vec3d	v2g;
 	
 	if (aip->ai_flags[AI::AI_Flags::Big_ship_collide_recover_1]) {
-		ai_turn_towards_vector(&aip->big_recover_pos_1, objp, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, nullptr, nullptr, 0.0f, 0, nullptr);
+		ai_turn_towards_vector(&aip->big_recover_pos_1, objp, flFrametime, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, NULL, NULL, 0.0f, 0, NULL);
 		dist = vm_vec_normalized_dir(&v2g, &aip->big_recover_pos_1, &objp->pos);
 		dot = vm_vec_dot(&objp->orient.vec.fvec, &v2g);
 		accelerate_ship(aip, dot);
@@ -13860,7 +13883,7 @@ int maybe_big_ship_collide_recover_frame(object *objp, ai_info *aip)
 		return 1;

 	} else if (aip->ai_flags[AI::AI_Flags::Big_ship_collide_recover_2]) {
-		ai_turn_towards_vector(&aip->big_recover_pos_2, objp, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, nullptr, nullptr, 0.0f, 0, nullptr);
+		ai_turn_towards_vector(&aip->big_recover_pos_2, objp, flFrametime, Ship_info[Ships[objp->instance].ship_info_index].srotation_time, NULL, NULL, 0.0f, 0, NULL);
 		dist = vm_vec_normalized_dir(&v2g, &aip->big_recover_pos_2, &objp->pos);
 		dot = vm_vec_dot(&objp->orient.vec.fvec, &v2g);
 		accelerate_ship(aip, dot);
@@ -13980,7 +14003,7 @@ void ai_frame(int objnum)
 	if (maybe_big_ship_collide_recover_frame(Pl_objp, aip))
 		return;

-	ai_preprocess_ignore_objnum(aip);
+	ai_preprocess_ignore_objnum(Pl_objp, aip);
 	target_objnum = set_target_objnum(aip, aip->target_objnum);

 	Assert(objnum != target_objnum);
@@ -14135,7 +14158,7 @@ void ai_frame(int objnum)
 	}
 }

-static void ai_control_info_check(ai_info *aip)
+void ai_control_info_check( object * /*obj*/, ai_info *aip )
 {
 	if(aip->ai_override_flags.none_set())
 		return;
@@ -14236,7 +14259,7 @@ void ai_process( object * obj, int ai_index, float frametime )

 	if (rfc == 1) {
 		// Wanderer - sexp based override goes here - only if rfc is valid though
-		ai_control_info_check(aip);
+		ai_control_info_check(obj, aip);
 		vec3d copy_desired_rotvel = obj->phys_info.rotvel;
 		physics_read_flying_controls( &obj->orient, &obj->phys_info, &AI_ci, frametime);
 		// if obj is in formation and not flight leader, don't update rotvel
@@ -14771,10 +14794,10 @@ int firing_aspect_seeking_bomb(object *objp)
 	return 0;
 }

-// *objp collided with big ship *big_objp at some global point.
-// Make it fly away from the collision point.
+//	*objp collided with big ship *big_objp at global point *collide_pos
+//	Make it fly away from the collision point.
 // collision_normal is NULL, when a collision is imminent and we just want to bug out.
-void big_ship_collide_recover_start(object *objp, object *big_objp, vec3d *collision_normal)
+void big_ship_collide_recover_start(object *objp, object *big_objp, vec3d * /*collide_pos*/, vec3d *collision_normal)
 {
 	ai_info	*aip;

@@ -14863,9 +14886,9 @@ void ai_update_lethality(object *pship_obj, object *other_obj, float damage)


 /**
- * Object *objp_ship was hit by either weapon *objp_weapon or collided into by ship hit_objp
+ * Object *objp_ship was hit by either weapon *objp_weapon or collided into by ship hit_objp at point *hitpos.
 */
-void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hit_normal)
+void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hitpos, int  /*shield_quadrant*/, vec3d *hit_normal)
 {
 	int		hitter_objnum = -2;
 	object	*objp_hitter = NULL;
@@ -14907,7 +14930,7 @@ void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hit_normal)
 			//	And the current object is _not_ a big ship
 			if (!Ship_info[Ships[objp_ship->instance].ship_info_index].is_big_or_huge()) {
 				//	Recover from hitting a big ship.  Note, if two big ships collide, they just pound away at each other.  Oh well.  Recovery looks dumb and it's very late.
-				big_ship_collide_recover_start(objp_ship, hit_objp, hit_normal);
+				big_ship_collide_recover_start(objp_ship, hit_objp, hitpos, hit_normal);
 			}
 		}
 	}
@@ -15044,7 +15067,7 @@ void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hit_normal)
 			return;

 		if ( (hit_objp->type == OBJ_WEAPON) && !(aip->ai_flags[AI::AI_Flags::No_dynamic]) ) {
-			if ( ai_big_maybe_enter_strafe_mode(objp_ship, OBJ_INDEX(hit_objp)) )
+			if ( ai_big_maybe_enter_strafe_mode(objp_ship, OBJ_INDEX(hit_objp), 1) )
 				return;
 		}
 		break;
@@ -15164,7 +15187,10 @@ void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hit_normal)

 //	Ship shipnum has been destroyed.
 //	Cleanup.
-void ai_ship_destroy(int shipnum)
+// the parameter 'method' is used to tell is this ship was destroyed or it departed normally.
+// This function will get called in either case, and there are things that should be done if
+// the ship actually gets destroyed which shouldn't get done if it departed.
+void ai_ship_destroy(int shipnum, Ship::Exit_Flags  /*method*/)
 {
 	int		objnum;
 	object	*other_objp;
@@ -15415,7 +15441,7 @@ int ai_issue_rearm_request(object *requester_objp)
 	// we aren't able to do anything!
 	else {
 		Assert(result == 4);
-		UNREACHABLE("This case should have already been caught by the is_support_allowed precheck!");
+		Assertion(false, "This case should have already been caught by the is_support_allowed precheck!");
 		return -1;
 	}
 }
@@ -15484,7 +15510,7 @@ int ai_return_path_num_from_dockbay(object *dockee_objp, int dockbay_index)
 /**
 * Actually go ahead and fire the synaptics.
 */
-static void cheat_fire_synaptic(object *objp, ship *shipp)
+void cheat_fire_synaptic(object *objp, ship *shipp, ai_info * /*aip*/)
 {
 	ship_weapon	*swp;
 	swp = &shipp->weapons;
@@ -15506,7 +15532,7 @@ static void cheat_fire_synaptic(object *objp, ship *shipp)
 //				if they're near one or more enemies
 //					every so often
 //						fire a synaptic if they have one.
-void maybe_cheat_fire_synaptic(object *objp)
+void maybe_cheat_fire_synaptic(object *objp, ai_info *aip)
 {
 	//	Only do in subspace missions.
 	if (!(The_mission.flags[Mission::Mission_Flags::Subspace]))
@@ -15538,7 +15564,7 @@ void maybe_cheat_fire_synaptic(object *objp)
 						int count = num_nearby_fighters(iff_get_attackee_mask(obj_team(objp)), &objp->pos, 1500.0f);

 						if (count > 0)
-							cheat_fire_synaptic(objp, shipp);
+							cheat_fire_synaptic(objp, shipp, aip);
 					}
 				}
 			}
@@ -125,7 +125,7 @@ const char *Ai_goal_text(int goal)
 	case AI_GOAL_REARM_REPAIR:
 		return XSTR( "rearm ", 484);
 	case AI_GOAL_FLY_TO_SHIP:
-		return XSTR( "rendezvous with ", 1597);
+		return XSTR( "rendezvous with ", -1);
 	}

 	// Avoid compiler warning
@@ -1874,7 +1874,7 @@ bool turret_fire_weapon(int weapon_num, ship_subsys *turret, int parent_objnum,
 				turret->last_fired_weapon_info_index = turret_weapon_class;

 				Script_system.SetHookObjects(4, "Ship", &Objects[parent_objnum], "Weapon", nullptr, "Beam", objp, "Target", &Objects[turret->turret_enemy_objnum]);
-				Script_system.RunCondition(CHA_ONTURRETFIRED, &Objects[parent_objnum]);
+				Script_system.RunCondition(CHA_ONTURRETFIRED, 0, NULL, &Objects[parent_objnum]);
 				Script_system.RemHookVars(4, "Ship", "Weapon", "Beam", "Target");
 			}

@@ -2009,7 +2009,7 @@ bool turret_fire_weapon(int weapon_num, ship_subsys *turret, int parent_objnum,
 					wp->turret_subsys = turret;	

 					Script_system.SetHookObjects(4, "Ship", &Objects[parent_objnum], "Weapon", objp, "Beam", nullptr, "Target", &Objects[turret->turret_enemy_objnum]);
-					Script_system.RunCondition(CHA_ONTURRETFIRED, &Objects[parent_objnum]);
+					Script_system.RunCondition(CHA_ONTURRETFIRED, 0, NULL, &Objects[parent_objnum]);
 					Script_system.RemHookVars(4, "Ship", "Weapon", "Beam", "Target");

 					// if the gun is a flak gun
@@ -2126,7 +2126,7 @@ void turret_swarm_fire_from_turret(turret_swarm_info *tsi)
 		tsi->turret->last_fired_weapon_info_index = tsi->weapon_class;

 		Script_system.SetHookObjects(4, "Ship", &Objects[tsi->parent_objnum], "Weapon", &Objects[weapon_objnum], "Beam", nullptr, "Target", &Objects[tsi->turret->turret_enemy_objnum]);
-		Script_system.RunCondition(CHA_ONTURRETFIRED, &Objects[tsi->parent_objnum]);
+		Script_system.RunCondition(CHA_ONTURRETFIRED, 0, NULL, &Objects[tsi->parent_objnum]);
 		Script_system.RemHookVars(4, "Ship", "Weapon", "Beam", "Target");

 		// muzzle flash?
@@ -1387,7 +1387,7 @@ void asteroid_hit( object * pasteroid_obj, object * other_obj, vec3d * hitpos, f
 			weapon_info *wip;
 			wip = &Weapon_info[Weapons[other_obj->instance].weapon_info_index];
 			// If the weapon didn't play any impact animation, play custom asteroid impact animation
-			if (!wip->impact_weapon_expl_effect.isValid()) {
+			if ( wip->impact_weapon_expl_effect < 0 ) {
 				particle::create( hitpos, &vmd_zero_vector, 0.0f, Asteroid_impact_explosion_radius, particle::PARTICLE_BITMAP, Asteroid_impact_explosion_ani );
 			}
 		}
@@ -1547,7 +1547,7 @@ static void asteroid_maybe_break_up(object *pasteroid_obj)
 			}
 			asp->final_death_time = timestamp(-1);
 		}
-		Script_system.RunCondition(CHA_DEATH, pasteroid_obj);
+		Script_system.RunCondition(CHA_DEATH, '\0', NULL, pasteroid_obj);
 		Script_system.RemHookVar("Self");
 	}
 }
@@ -591,7 +591,7 @@ int bm_create(int bpp, int w, int h, void *data, int flags) {

 	memset(entry, 0, sizeof(bitmap_entry));

-	sprintf_safe(entry->filename, "TMP%dx%d+%d", w, h, bpp);
+	sprintf(entry->filename, "TMP%dx%d+%d", w, h, bpp);
 	entry->type = BM_TYPE_USER;
 	entry->comp_type = BM_TYPE_NONE;
 	entry->palette_checksum = 0;
@@ -1155,7 +1155,7 @@ static int bm_load_info(BM_TYPE type, const char *filename, CFILE *img_cfp, int
 		}
 	}
 	else {
-		UNREACHABLE("Unknown file type specified! This is probably a coding error.");
+		Assertion(false, "Unknown file type specified! This is probably a coding error.");

 		return -1;
 	}
@@ -1253,7 +1253,7 @@ int bm_load(const char *real_filename) {

 	// Mark the slot as filled, because cf_read might load a new bitmap
 	// into this slot.
-	strcpy_s(entry->filename, filename);
+	strncpy(entry->filename, filename, MAX_FILENAME_LEN - 1);
 	entry->type = type;
 	entry->comp_type = c_type;
 	entry->signature = Bm_next_signature++;
@@ -1681,7 +1681,7 @@ int bm_load_animation(const char *real_filename, int *nframes, int *fps, int *ke

 		if (type == BM_TYPE_EFF) {
 			entry->info.ani.eff.type = eff_type;
-			sprintf_safe(entry->info.ani.eff.filename, "%s_%.4d", clean_name, i);
+			sprintf(entry->info.ani.eff.filename, "%s_%.4d", clean_name, i);

 			// bm_load_info() returns non-0 on failure
 			if (bm_load_info(eff_type, entry->info.ani.eff.filename,
@@ -1744,13 +1744,13 @@ int bm_load_animation(const char *real_filename, int *nframes, int *fps, int *ke
 		entry->load_count++;

 		if (i == 0) {
-			sprintf_safe(entry->filename, "%s", filename);
+			sprintf(entry->filename, "%s", filename);
 		} else {
 			if (type == BM_TYPE_PNG) {
-				sprintf_safe(entry->filename, "%s_%04d", filename, i);
+				sprintf(entry->filename, "%s_%04d", filename, i);
 			}
 			else {
-				sprintf_safe(entry->filename, "%s[%d]", filename, i);
+				sprintf(entry->filename, "%s[%d]", filename, i);
 			}
 		}

@@ -1876,23 +1876,27 @@ int bm_load_sub_fast(const char *real_filename, int *handle, int dir_type, bool
 }

 int bm_load_sub_slow(const char *real_filename, const int num_ext, const char **ext_list, CFILE **img_cfp, int dir_type) {
-	auto res = cf_find_file_location_ext(real_filename, num_ext, ext_list, dir_type, false);
+	char full_path[MAX_PATH];
+	size_t size = 0, offset = 0;
+	int rval = -1;
+	const void* file_data = nullptr;
+
+	rval = cf_find_file_location_ext(real_filename, num_ext, ext_list, dir_type, sizeof(full_path) - 1, full_path, &size, &offset, 0, &file_data);

 	// could not be found, or is invalid for some reason
-	if (!res.found)
+	if ((rval < 0) || (rval >= num_ext))
 		return -1;

-	CFILE *test = cfopen_special(res.full_name.c_str(), "rb", res.size, res.offset, res.data_ptr, dir_type);
+	CFILE *test = cfopen_special(full_path, "rb", size, offset, file_data, dir_type);

 	if (test != NULL) {
 		if (img_cfp != NULL)
 			*img_cfp = test;

-		return res.extension_index;
+		return rval;
 	}

 	// umm, that's not good...
-	Warning(LOCATION, "Could not open file %s!", res.full_name.c_str());
 	return -1;
 }

@@ -2381,7 +2385,7 @@ void bm_lock_png(int handle, bitmap_slot *bs, bitmap *bmp, int /*bpp*/, ubyte /*

 void bm_lock_tga(int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags) {
 	ubyte *data = NULL;
-	int byte_size;
+	int d_size, byte_size;
 	char filename[MAX_FILENAME_LEN];

 	auto be = &bs->entry;
@@ -2389,8 +2393,6 @@ void bm_lock_tga(int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags)
 	// Unload any existing data
 	bm_free_data(bs);

-	bpp = be->bm.true_bpp;
-
 	if (Is_standalone) {
 		Assert(bpp == 8);
 	} else {
@@ -2407,6 +2409,7 @@ void bm_lock_tga(int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags)

 	if (data) {
 		memset(data, 0, be->mem_taken);
+		d_size = byte_size;
 	} else {
 		return;
 	}
@@ -2426,7 +2429,7 @@ void bm_lock_tga(int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags)
 	// this will populate filename[] whether it's EFF or not
 	EFF_FILENAME_CHECK;

-	tga_error = targa_read_bitmap(filename, data, nullptr, byte_size, be->dir_type);
+	tga_error = targa_read_bitmap(filename, data, NULL, d_size, be->dir_type);

 	if (tga_error != TARGA_ERROR_NONE) {
 		bm_free_data(bs);
@@ -2523,7 +2526,7 @@ int bm_make_render_target(int width, int height, int flags) {

 	entry->type = (flags & BMP_FLAG_RENDER_TARGET_STATIC) ? BM_TYPE_RENDER_TARGET_STATIC : BM_TYPE_RENDER_TARGET_DYNAMIC;
 	entry->signature = Bm_next_signature++;
-	sprintf_safe(entry->filename, "RT_%dx%d+%d", w, h, bpp);
+	sprintf(entry->filename, "RT_%dx%d+%d", w, h, bpp);
 	entry->bm.w = (short)w;
 	entry->bm.h = (short)h;
 	entry->bm.rowsize = (short)w;
@@ -2586,6 +2589,9 @@ void bm_page_in_start() {
 		for (auto& slot : block) {
 			auto& entry = slot.entry;

+			if (!Cmdline_cache_bitmaps && (entry.type != BM_TYPE_NONE)) {
+				bm_unload_fast(entry.handle);
+			}
 			entry.preloaded = 0;
 			entry.preload_count = 0;
 #ifdef BMPMAN_NDEBUG
@@ -962,7 +962,7 @@ size_t cam_get_num()
 /**
 * Looks up camera by name, returns -1 on failure
 */
-camid cam_lookup(const char* name)
+camid cam_lookup(char *name)
 {
 	size_t i, size=Cameras.size();
 	for(i = 0; i < size; i++)
@@ -68,7 +68,7 @@ public:
 	void set_rotation_velocity(angles *in_rotation_rate, float in_acceleration_time = 0.0f);

 	//Get
-	const char* get_name() { return name; }
+	char *get_name() {return name;}
 	int get_signature() {return sig;}
 	object *get_object_host();
 	int get_object_host_submodel();
@@ -163,7 +163,7 @@ camid cam_create(const char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_obje
 void cam_delete(camid cid);
 bool cam_set_camera(camid cid);
 void cam_reset_camera();
-camid cam_lookup(const char* name);
+camid cam_lookup(char *name);
 camid cam_get_camera(uint index);
 camid cam_get_current();
 size_t cam_get_num();
@@ -33,66 +33,70 @@
 #include "cfile/cfilesystem.h"
 #include "osapi/osapi.h"
 #include "parse/encrypt.h"
-#include "cfilesystem.h"
-

 #include <limits>

 char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
 char Cfile_user_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
+#ifdef SCP_UNIX
+char Cfile_user_dir_legacy[CFILE_ROOT_DIRECTORY_LEN] = "";
+#endif

 // During cfile_init, verify that Pathtypes[n].index == n for each item
-// Each path must have a valid parent that can be tracable all the way back to the root
+// Each path must have a valid parent that can be tracable all the way back to the root 
 // so that we can create directories when we need to.
 //
 // Please make sure extensions are all lower-case, or we'll break unix compatibility
 //
-// clang-format off
-cf_pathtype Pathtypes[CF_MAX_PATH_TYPES]  = {
-	// What type this is          Path																			Extensions        					Parent type
-	{ CF_TYPE_INVALID,				NULL,																		NULL,								CF_TYPE_INVALID },
-	// Root must be index 1!!
-	{ CF_TYPE_ROOT,					"",																			".mve .ogg",						CF_TYPE_ROOT	},
-	{ CF_TYPE_DATA,					"data",																		".cfg .txt",						CF_TYPE_ROOT	},
-	{ CF_TYPE_MAPS,					"data" DIR_SEPARATOR_STR "maps",											".pcx .ani .eff .tga .jpg .png .dds",	CF_TYPE_DATA	},
-	{ CF_TYPE_TEXT,					"data" DIR_SEPARATOR_STR "text",											".txt .net",						CF_TYPE_DATA	},
-	{ CF_TYPE_MODELS,				"data" DIR_SEPARATOR_STR "models",											".pof",								CF_TYPE_DATA	},
-	{ CF_TYPE_TABLES,				"data" DIR_SEPARATOR_STR "tables",											".tbl .tbm",						CF_TYPE_DATA	},
-	{ CF_TYPE_SOUNDS,				"data" DIR_SEPARATOR_STR "sounds",											".wav .ogg",						CF_TYPE_DATA	},
-	{ CF_TYPE_SOUNDS_8B22K,			"data" DIR_SEPARATOR_STR "sounds" DIR_SEPARATOR_STR "8b22k",				".wav .ogg",						CF_TYPE_SOUNDS	},
-	{ CF_TYPE_SOUNDS_16B11K,		"data" DIR_SEPARATOR_STR "sounds" DIR_SEPARATOR_STR "16b11k",				".wav .ogg",						CF_TYPE_SOUNDS	},
-	{ CF_TYPE_VOICE,				"data" DIR_SEPARATOR_STR "voice",											"",									CF_TYPE_DATA	},
-	{ CF_TYPE_VOICE_BRIEFINGS,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "briefing",				".wav .ogg",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_CMD_BRIEF,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "command_briefings",		".wav .ogg",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_DEBRIEFINGS,	"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "debriefing",			".wav .ogg",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_PERSONAS,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "personas",				".wav .ogg",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_SPECIAL,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "special",				".wav .ogg",						CF_TYPE_VOICE	},
-	{ CF_TYPE_VOICE_TRAINING,		"data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "training",				".wav .ogg",						CF_TYPE_VOICE	},
-	{ CF_TYPE_MUSIC,				"data" DIR_SEPARATOR_STR "music",											".wav .ogg",						CF_TYPE_DATA	},
-	{ CF_TYPE_MOVIES,				"data" DIR_SEPARATOR_STR "movies",											".mve .msb .ogg .mp4 .srt .webm .png",CF_TYPE_DATA	},
-	{ CF_TYPE_INTERFACE,			"data" DIR_SEPARATOR_STR "interface",										".pcx .ani .dds .tga .eff .png .jpg",	CF_TYPE_DATA	},
-	{ CF_TYPE_FONT,					"data" DIR_SEPARATOR_STR "fonts",											".vf .ttf",							CF_TYPE_DATA	},
-	{ CF_TYPE_EFFECTS,				"data" DIR_SEPARATOR_STR "effects",											".ani .eff .pcx .neb .tga .jpg .png .dds .sdr",	CF_TYPE_DATA	},
-	{ CF_TYPE_HUD,					"data" DIR_SEPARATOR_STR "hud",												".pcx .ani .eff .tga .jpg .png .dds",	CF_TYPE_DATA	},
-	{ CF_TYPE_PLAYERS,				"data" DIR_SEPARATOR_STR "players",											".hcf",								CF_TYPE_DATA	},
-	{ CF_TYPE_PLAYER_IMAGES,		"data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "images",				".pcx .png .dds",						CF_TYPE_PLAYERS	},
-	{ CF_TYPE_SQUAD_IMAGES,			"data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "squads",				".pcx .png .dds",						CF_TYPE_PLAYERS	},
-	{ CF_TYPE_SINGLE_PLAYERS,		"data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "single",				".pl2 .cs2 .plr .csg .css .json",	CF_TYPE_PLAYERS	},
-	{ CF_TYPE_MULTI_PLAYERS,		"data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "multi",				".plr .json",						CF_TYPE_PLAYERS	},
-	{ CF_TYPE_CACHE,				"data" DIR_SEPARATOR_STR "cache",											".clr .tmp .bx",					CF_TYPE_DATA	}, 	//clr=cached color
-	{ CF_TYPE_MULTI_CACHE,			"data" DIR_SEPARATOR_STR "multidata",										".pcx .png .dds .fs2 .txt",				CF_TYPE_DATA	},
-	{ CF_TYPE_MISSIONS,				"data" DIR_SEPARATOR_STR "missions",										".fs2 .fc2 .ntl .ssv",				CF_TYPE_DATA	},
-	{ CF_TYPE_CONFIG,				"data" DIR_SEPARATOR_STR "config",											".cfg .tbl .tbm .xml .csv",			CF_TYPE_DATA	},
-	{ CF_TYPE_DEMOS,				"data" DIR_SEPARATOR_STR "demos",											".fsd",								CF_TYPE_DATA	},
-	{ CF_TYPE_CBANIMS,				"data" DIR_SEPARATOR_STR "cbanims",											".pcx .ani .eff .tga .jpg .png .dds",	CF_TYPE_DATA	},
-	{ CF_TYPE_INTEL_ANIMS,			"data" DIR_SEPARATOR_STR "intelanims",										".pcx .ani .eff .tga .jpg .png .dds",	CF_TYPE_DATA	},
-	{ CF_TYPE_SCRIPTS,				"data" DIR_SEPARATOR_STR "scripts",											".lua .lc",							CF_TYPE_DATA	},
-	{ CF_TYPE_FICTION,				"data" DIR_SEPARATOR_STR "fiction",											".txt",								CF_TYPE_DATA	}, 
-	{ CF_TYPE_FREDDOCS,				"data" DIR_SEPARATOR_STR "freddocs",										".html",							CF_TYPE_DATA	},
-	{ CF_TYPE_INTERFACE_MARKUP,		"data" DIR_SEPARATOR_STR "interface" DIR_SEPARATOR_STR "markup",			".rml",								CF_TYPE_INTERFACE	},
-	{ CF_TYPE_INTERFACE_CSS,		"data" DIR_SEPARATOR_STR "interface" DIR_SEPARATOR_STR "css",				".rcss",							CF_TYPE_INTERFACE	},
+cf_pathtype Pathtypes[CF_MAX_PATH_TYPES] = {
+    // What type this is          Path																			Extensions        					Parent
+    // type
+    {CF_TYPE_INVALID, NULL, NULL, CF_TYPE_INVALID},
+    // Root must be index 1!!
+    {CF_TYPE_ROOT, "", ".mve .ogg", CF_TYPE_ROOT},
+    {CF_TYPE_DATA, "data", ".cfg .txt", CF_TYPE_ROOT},
+    {CF_TYPE_MAPS, "data" DIR_SEPARATOR_STR "maps", ".pcx .ani .eff .tga .jpg .png .dds", CF_TYPE_DATA},
+    {CF_TYPE_TEXT, "data" DIR_SEPARATOR_STR "text", ".txt .net", CF_TYPE_DATA},
+    {CF_TYPE_MODELS, "data" DIR_SEPARATOR_STR "models", ".pof", CF_TYPE_DATA},
+    {CF_TYPE_TABLES, "data" DIR_SEPARATOR_STR "tables", ".tbl .tbm", CF_TYPE_DATA},
+    {CF_TYPE_SOUNDS, "data" DIR_SEPARATOR_STR "sounds", ".wav .ogg", CF_TYPE_DATA},
+    {CF_TYPE_SOUNDS_8B22K, "data" DIR_SEPARATOR_STR "sounds" DIR_SEPARATOR_STR "8b22k", ".wav .ogg", CF_TYPE_SOUNDS},
+    {CF_TYPE_SOUNDS_16B11K, "data" DIR_SEPARATOR_STR "sounds" DIR_SEPARATOR_STR "16b11k", ".wav .ogg", CF_TYPE_SOUNDS},
+    {CF_TYPE_VOICE, "data" DIR_SEPARATOR_STR "voice", "", CF_TYPE_DATA},
+    {CF_TYPE_VOICE_BRIEFINGS, "data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "briefing", ".wav .ogg",
+     CF_TYPE_VOICE},
+    {CF_TYPE_VOICE_CMD_BRIEF, "data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "command_briefings", ".wav .ogg",
+     CF_TYPE_VOICE},
+    {CF_TYPE_VOICE_DEBRIEFINGS, "data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "debriefing", ".wav .ogg",
+     CF_TYPE_VOICE},
+    {CF_TYPE_VOICE_PERSONAS, "data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "personas", ".wav .ogg", CF_TYPE_VOICE},
+    {CF_TYPE_VOICE_SPECIAL, "data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "special", ".wav .ogg", CF_TYPE_VOICE},
+    {CF_TYPE_VOICE_TRAINING, "data" DIR_SEPARATOR_STR "voice" DIR_SEPARATOR_STR "training", ".wav .ogg", CF_TYPE_VOICE},
+    {CF_TYPE_MUSIC, "data" DIR_SEPARATOR_STR "music", ".wav .ogg", CF_TYPE_DATA},
+    {CF_TYPE_MOVIES, "data" DIR_SEPARATOR_STR "movies", ".mve .msb .ogg .mp4 .srt", CF_TYPE_DATA},
+    {CF_TYPE_INTERFACE, "data" DIR_SEPARATOR_STR "interface", ".pcx .ani .dds .tga .eff .png .jpg", CF_TYPE_DATA},
+    {CF_TYPE_FONT, "data" DIR_SEPARATOR_STR "fonts", ".vf .ttf", CF_TYPE_DATA},
+    {CF_TYPE_EFFECTS, "data" DIR_SEPARATOR_STR "effects", ".ani .eff .pcx .neb .tga .jpg .png .dds .sdr", CF_TYPE_DATA},
+    {CF_TYPE_HUD, "data" DIR_SEPARATOR_STR "hud", ".pcx .ani .eff .tga .jpg .png .dds", CF_TYPE_DATA},
+    {CF_TYPE_PLAYERS, "data" DIR_SEPARATOR_STR "players", ".hcf", CF_TYPE_DATA},
+    {CF_TYPE_PLAYER_IMAGES, "data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "images", ".pcx .png .dds",
+     CF_TYPE_PLAYERS},
+    {CF_TYPE_SQUAD_IMAGES, "data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "squads", ".pcx .png .dds",
+     CF_TYPE_PLAYERS},
+    {CF_TYPE_SINGLE_PLAYERS, "data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "single", ".pl2 .cs2 .plr .csg .css",
+     CF_TYPE_PLAYERS},
+    {CF_TYPE_MULTI_PLAYERS, "data" DIR_SEPARATOR_STR "players" DIR_SEPARATOR_STR "multi", ".plr", CF_TYPE_PLAYERS},
+    {CF_TYPE_CACHE, "data" DIR_SEPARATOR_STR "cache", ".clr .tmp .bx", CF_TYPE_DATA}, // clr=cached color
+    {CF_TYPE_MULTI_CACHE, "data" DIR_SEPARATOR_STR "multidata", ".pcx .png .dds .fs2 .txt", CF_TYPE_DATA},
+    {CF_TYPE_MISSIONS, "data" DIR_SEPARATOR_STR "missions", ".fs2 .fc2 .ntl .ssv", CF_TYPE_DATA},
+    {CF_TYPE_CONFIG, "data" DIR_SEPARATOR_STR "config", ".cfg .tbl .tbm .xml .csv", CF_TYPE_DATA},
+    {CF_TYPE_DEMOS, "data" DIR_SEPARATOR_STR "demos", ".fsd", CF_TYPE_DATA},
+    {CF_TYPE_CBANIMS, "data" DIR_SEPARATOR_STR "cbanims", ".pcx .ani .eff .tga .jpg .png .dds", CF_TYPE_DATA},
+    {CF_TYPE_INTEL_ANIMS, "data" DIR_SEPARATOR_STR "intelanims", ".pcx .ani .eff .tga .jpg .png .dds", CF_TYPE_DATA},
+    {CF_TYPE_SCRIPTS, "data" DIR_SEPARATOR_STR "scripts", ".lua .lc", CF_TYPE_DATA},
+    {CF_TYPE_FICTION, "data" DIR_SEPARATOR_STR "fiction", ".txt", CF_TYPE_DATA},
+    {CF_TYPE_FREDDOCS, "data" DIR_SEPARATOR_STR "freddocs", ".html", CF_TYPE_DATA},
 };
-// clang-format on

 #define CFILE_STACK_MAX	8

@@ -226,8 +230,14 @@ int cfile_init(const char *exe_dir, const char *cdrom_dir)
 	cfile_chdir(buf);

 	// set root directory
-	strcpy_s(Cfile_root_dir, buf);
-	strcpy_s(Cfile_user_dir, os_get_config_path().c_str());
+	strncpy(Cfile_root_dir, buf, CFILE_ROOT_DIRECTORY_LEN-1);
+	strncpy(Cfile_user_dir, os_get_config_path().c_str(), CFILE_ROOT_DIRECTORY_LEN-1);
+	
+#ifdef SCP_UNIX
+	// Initialize path of old pilot files
+	extern const char* Osreg_user_dir_legacy;
+	snprintf(Cfile_user_dir_legacy, CFILE_ROOT_DIRECTORY_LEN-1, "%s/%s/", getenv("HOME"), Osreg_user_dir_legacy);
+#endif

 	for (i = 0; i < MAX_CFILE_BLOCKS; i++) {
 		Cfile_block_list[i].type = CFILE_BLOCK_UNUSED;
@@ -352,7 +362,8 @@ int cfile_push_chdir(int type)
 		return -1;
 	}

-	strcpy_s(Cfile_stack[Cfile_stack_pos++], OriginalDirectory);
+	strncpy(Cfile_stack[Cfile_stack_pos++], OriginalDirectory,
+	        CFILE_ROOT_DIRECTORY_LEN - 1);

 	cf_create_default_path_string(dir, sizeof(dir) - 1, type, NULL);

@@ -475,17 +486,17 @@ char *cf_add_ext(const char *filename, const char *ext)
 *
 * @param filename Name of file to delete
 * @param path_type Path type (CF_TYPE_xxx)
- * @param location_flags Where to search for the location of the file to delete
 *
 * @return 0 on failure, 1 on success
 */
-int cf_delete(const char *filename, int path_type, uint32_t location_flags)
+int cf_delete(const char *filename, int path_type)
 {
 	char longname[MAX_PATH_LEN];

 	Assert(CF_TYPE_SPECIFIED(path_type));

-	cf_create_default_path_string(longname, sizeof(longname) - 1, path_type, filename, false, location_flags);
+	cf_create_default_path_string(longname, sizeof(longname) - 1,
+	                              path_type, filename);

 	return (_unlink(longname) != -1);
 }
@@ -511,12 +522,12 @@ int cf_access(const char *filename, int dir_type, int mode)
 // If offset equates to boolean true, it was found in a VP and the logic will negate the function return
 int cf_exists(const char *filename, int dir_type)
 {
+	size_t offset = 1;
+
 	if ( (filename == NULL) || !strlen(filename) )
 		return 0;

-	auto find_res = cf_find_file_location(filename, dir_type);
-
-	return find_res.found && !find_res.offset;
+	return (cf_find_file_location(filename, dir_type, 0, NULL, NULL, &offset) && !offset);
 }

 // Goober5000
@@ -527,7 +538,7 @@ int cf_exists_full(const char *filename, int dir_type)
 	if ( (filename == NULL) || !strlen(filename) )
 		return 0;

-	return cf_find_file_location(filename, dir_type).found;
+	return cf_find_file_location(filename, dir_type, 0, NULL, NULL, NULL);
 }

 // same as the above, but with extension check
@@ -539,7 +550,7 @@ int cf_exists_full_ext(const char *filename, int dir_type, const int num_ext, co
 	if ( (num_ext <= 0) || (ext_list == NULL) )
 		return 0;

-	return cf_find_file_location_ext(filename, num_ext, ext_list, dir_type).found;
+	return (cf_find_file_location_ext(filename, num_ext, ext_list, dir_type, 0, NULL, NULL, NULL) != -1);
 }

 #ifdef _WIN32
@@ -613,7 +624,7 @@ static void mkdir_recursive(const char *path) {

 // Creates the directory path if it doesn't exist. Even creates all its
 // parent paths.
-void cf_create_directory(int dir_type, uint32_t location_flags)
+void cf_create_directory( int dir_type )
 {
 	int num_dirs = 0;
 	int dir_tree[CF_MAX_PATH_TYPES];
@@ -635,7 +646,7 @@ void cf_create_directory(int dir_type, uint32_t location_flags)
 	int i;

 	for (i=num_dirs-1; i>=0; i-- )	{
-		cf_create_default_path_string(longname, sizeof(longname) - 1, dir_tree[i], nullptr, false, location_flags);
+		cf_create_default_path_string( longname, sizeof(longname)-1, dir_tree[i], NULL );
 		if (stat(longname, &statbuf) != 0) {
 			mprintf(( "CFILE: Creating new directory '%s'\n", longname ));
 			mkdir_recursive(longname);
@@ -662,13 +673,14 @@ extern int game_cd_changed();
 //					error   ==> NULL
 //

-CFILE* _cfopen(const char* source, int line, const char* file_path, const char* mode, int type, int dir_type,
-               bool localize, uint32_t location_flags)
+CFILE *_cfopen(const char* source, int line, const char *file_path, const char *mode, int type, int dir_type, bool localize)
 {
 	/* Bobboau, what is this doing here? 31 is way too short... - Goober5000
 	if( strlen(file_path) > 31 )
 		Error(LOCATION, "file name %s too long, \nmust be less than 31 charicters", file_path);*/

+	char longname[_MAX_PATH];
+
 	if ( !cfile_inited ) {
 		Int3();
 		return NULL;
@@ -690,8 +702,6 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 	// the harddisk.  No fancy packfile stuff here!
 	
 	if ( strchr(mode,'w') || strchr(mode,'+') || strchr(mode,'a') )	{
-		char longname[_MAX_PATH];
-
 		// For write-only files, require a full path or a path type
 #ifdef SCP_UNIX
 		if ( strpbrk(file_path, "/") ) {
@@ -705,9 +715,9 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 			Assert( dir_type != CF_TYPE_ANY );

 			// Create the directory if necessary
-			cf_create_directory(dir_type, location_flags);
+			cf_create_directory( dir_type );

-			cf_create_default_path_string(longname, sizeof(longname) - 1, dir_type, file_path, false, location_flags);
+			cf_create_default_path_string( longname, sizeof(longname)-1, dir_type, file_path );
 		}
 		Assert( !(type & CFILE_MEMORY_MAPPED) );

@@ -757,29 +767,30 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 	//================================================
 	// Search for file on disk, on cdrom, or in a packfile

+	size_t offset, size;
 	char copy_file_path[MAX_PATH_LEN];  // FIX change in memory from cf_find_file_location
 	strcpy_s(copy_file_path, file_path);

-	auto find_res = cf_find_file_location( copy_file_path, dir_type, localize, location_flags );
-	if ( find_res.found ) {
+	const void* file_data = nullptr;
+	if ( cf_find_file_location( copy_file_path, dir_type, sizeof(longname) - 1, longname, &size, &offset, localize, &file_data ) )	{

 		// Fount it, now create a cfile out of it
-		nprintf(("CFileDebug", "Requested file %s found at: %s\n", file_path, find_res.full_name.c_str()));
-
+		nprintf(("CFileDebug", "Requested file %s found at: %s\n", file_path, longname));
+		
 		if ( type & CFILE_MEMORY_MAPPED ) {
 		
 			// Can't open memory mapped files out of pack or memory files
-			if ( find_res.offset == 0 && find_res.data_ptr != nullptr )	{
+			if ( offset == 0 && file_data != nullptr )	{
 #if defined _WIN32
 				HANDLE hFile;

-				hFile = CreateFile(find_res.full_name.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+				hFile = CreateFile(longname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

 				if (hFile != INVALID_HANDLE_VALUE)	{
 					return cf_open_mapped_fill_cfblock(source, line, hFile, dir_type);
 				}
 #elif defined SCP_UNIX
-				FILE* fp = fopen(find_res.full_name.c_str(), "rb");
+				FILE *fp = fopen( longname, "rb" );
 				if (fp) {
 					return cf_open_mapped_fill_cfblock(source, line, fp, dir_type);
 				}
@@ -788,8 +799,7 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*

 		} else {
 			// since cfopen_special already has all the code to handle the opening we can just use that here
-			return _cfopen_special(source, line, find_res.full_name.c_str(), mode, find_res.size, find_res.offset,
-			                       find_res.data_ptr, dir_type);
+			return _cfopen_special(source, line, longname, mode, size, offset, file_data, dir_type);
 		}

 	}
@@ -897,7 +907,7 @@ static int cfget_cfile_block()
 	mprintf(("Out of cfile blocks! Currently opened files:\n"));
 	dump_opened_files();

-	UNREACHABLE("There are no more free cfile blocks. This means that there are too many files opened by FSO.\n"
+	Assertion(false, "There are no more free cfile blocks. This means that there are too many files opened by FSO.\n"
 		"This is probably caused by a programming or scripting error where a file does not get closed."); // out of free cfile blocks
 	return -1;			
 }
@@ -1350,19 +1360,6 @@ void cfread_string_len(char *buf,int n, CFILE *file)
 	buf[len] = 0;
 }

-SCP_string cfread_string_len(CFILE *file)
-{
-	int len = cfread_int(file);
-
-	SCP_string str;
-	str.resize(len);
-
-	if (len)
-		cfread(&str[0], len, 1, file);
-
-	return str;
-}
-
 // equivalent write functions of above read functions follow

 int cfwrite_float(float f, CFILE *file)
@@ -1976,33 +1973,3 @@ int cflush(CFILE *cfile)

 	return result;
 }
-
-int cfile_get_path_type(const SCP_string& dir)
-{
-	SCP_string buf = dir;
-
-	// Remove trailing slashes; avoid buffer overflow on 1-char strings
-	while (buf.size() > 0 && (buf[buf.size() - 1] == '\\' || buf[buf.size() - 1] == '/')) {
-		buf.resize(buf.size() - 1);
-	}
-
-	// Remove leading slashes
-	while (buf.size() > 0 && (buf[0] == '\\' || buf[0] == '/')) {
-		buf = buf.substr(1);
-	}
-
-	// Use official DIR_SEPARATOR_CHAR
-	for (char& c : buf) {
-		if (c == '\\' || c == '/') {
-			c = DIR_SEPARATOR_CHAR;
-		}
-	}
-
-	for (auto& Pathtype : Pathtypes) {
-		if (Pathtype.path != nullptr && buf == Pathtype.path) {
-			return Pathtype.index;
-		}
-	}
-
-	return CF_TYPE_INVALID;
-}
@@ -79,11 +79,9 @@ typedef struct {
 #define CF_TYPE_SCRIPTS				35
 #define CF_TYPE_FICTION				36
 #define CF_TYPE_FREDDOCS			37
-#define CF_TYPE_INTERFACE_MARKUP 38
-#define CF_TYPE_INTERFACE_CSS 39

-#define CF_MAX_PATH_TYPES                                                                                              \
-	40 // Can be as high as you'd like //DTP; yeah but beware alot of things uses CF_MAX_PATH_TYPES
+#define CF_MAX_PATH_TYPES			38			// Can be as high as you'd like //DTP; yeah but beware alot of things uses CF_MAX_PATH_TYPES
+

 // TRUE if type is specified and valid
 #define CF_TYPE_SPECIFIED(path_type) (((path_type)>CF_TYPE_INVALID) && ((path_type)<CF_MAX_PATH_TYPES))
@@ -97,64 +95,6 @@ typedef struct {
 #define CF_SORT_TIME 2
 #define CF_SORT_REVERSE 3

-/**
- * @brief Contains a collection of flags for specifying from where a CFILE should be opened
- *
- * There are two types of flags. CF_LOCATION_GAME_ROOT and CF_LOCATION_USER_ROOT specify in which basic root directory
- * CFile should search for files.
- *
- * The remaining flags control what type of location may be used for the operation. It's possible to restrict the
- * location to the primary mod, the remaining mods or the top-level root directory.
- */
-enum CFileLocationFlags {
-	CF_LOCATION_ROOT_GAME = 1 << 0, //!< The game root location. This is the location of the game data (e.g. FS2 retail)
-	/**
-	 * @brief The user directories.
-	 *
-	 * If the engine is in portable mode then using this flag exclusively will result in a failure to open files!
-	 */
-	CF_LOCATION_ROOT_USER = 1 << 1,
-
-	/**
-	 * @brief The memory root
-	 *
-	 * This contains all the built-in files available to the engine.
-	 */
-	CF_LOCATION_ROOT_MEMORY = 1 << 2,
-
-	/**
-	 * @brief Mask for extracting root type from a location bit field
-	 */
-	CF_LOCATION_ROOT_MASK = 0xFFFF,
-
-	CF_LOCATION_TYPE_ROOT = 1 << 16, //!< The basic, top-level root location
-	/**
-	 * @brief The primary mod location.
-	 *
-	 * This is the mod that appears first on the command line. If there are no mods then the root location is considered
-	 * to be the primary mod
-	 */
-	CF_LOCATION_TYPE_PRIMARY_MOD = 1 << 17,
-	/**
-	 * @brief The remaining mods.
-	 *
-	 * If there are no mods on the command line then this might not include any valid location.
-	 */
-	CF_LOCATION_TYPE_SECONDARY_MODS = 1 << 18,
-
-	/**
-	 * @brief Bitmask for extracting the type from a location bit field
-	 */
-	CF_LOCATION_TYPE_MASK = 0xFFFF0000,
-
-	/**
-	 * @brief A combination of all flags
-	 *
-	 * This should be used when the default behavior without any location filtering is desired.
-	 */
-	CF_LOCATION_ALL = CF_LOCATION_ROOT_MASK | CF_LOCATION_TYPE_MASK
-};
-
 #define cfread_fix(file) (fix)cfread_int(file)
 #define cfwrite_fix(i,file) cfwrite_int(i,file)

@@ -171,6 +111,9 @@ extern const char *Get_file_list_child;
 #define CFILE_ROOT_DIRECTORY_LEN			256
 extern char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN];
 extern char Cfile_user_dir[CFILE_ROOT_DIRECTORY_LEN];
+#ifdef SCP_UNIX
+extern char Cfile_user_dir_legacy[CFILE_ROOT_DIRECTORY_LEN];
+#endif

 //================= LOW-LEVEL FUNCTIONS ==================
 int cfile_init(const char *exe_dir, const char *cdrom_dir=NULL);
@@ -187,10 +130,11 @@ char *cf_add_ext(const char *filename, const char *ext);
 // return CF_TYPE (directory location type) of a CFILE you called cfopen() successfully on.
 int cf_get_dir_type(CFILE *cfile);

+
 // Opens the file.  If no path is given, use the extension to look into the
-// default path.  If mode is NULL, delete the file.
-CFILE* _cfopen(const char* source_file, int line, const char* filename, const char* mode, int type = CFILE_NORMAL,
-               int dir_type = CF_TYPE_ANY, bool localize = false, uint32_t location_flags = CF_LOCATION_ALL);
+// default path.  If mode is NULL, delete the file.  
+CFILE *_cfopen(const char* source_file, int line, const char *filename, const char *mode,
+	int type = CFILE_NORMAL, int dir_type = CF_TYPE_ANY, bool localize = false);
 #define cfopen(...) _cfopen(LOCATION, __VA_ARGS__) // Pass source location to the function

 // like cfopen(), but it accepts a fully qualified path only (ie, the result of a cf_find_file_location() call)
@@ -212,7 +156,7 @@ void cf_set_version( CFILE * cfile, int version );
 void cf_set_max_read_len(CFILE *cfile, size_t len);

 // Deletes a file. Returns 0 on error, 1 if successful
-int cf_delete(const char *filename, int dir_type, uint32_t location_flags = CF_LOCATION_ALL);
+int cf_delete(const char *filename, int dir_type);

 // Same as _access function to read a file's access bits
 int cf_access(const char *filename, int dir_type, int mode);
@@ -345,13 +289,6 @@ void cfread_string(char *buf,int n, CFILE *file);
 */
 void cfread_string_len(char *buf,int n, CFILE *file);

-/**
- * @brief Read a string from the file where the length is stored in the file
- * @param file The file to read the string from
- * @return The string that was read
- */
-SCP_string cfread_string_len(CFILE *file);
-
 // functions for writing cfiles
 int cfwrite_char(char c, CFILE *file);
 int cfwrite_float(float f, CFILE *file);
@@ -374,26 +311,12 @@ int cfwrite_string(const char *buf, CFILE *file);
 */
 int cfwrite_string_len(const char *buf, CFILE *file);

-int cf_get_file_list(SCP_vector<SCP_string>& list, int pathtype, const char* filter, int sort = CF_SORT_NONE,
-                     SCP_vector<file_list_info>* info = nullptr, uint32_t location_flags = CF_LOCATION_ALL);
-int cf_get_file_list(int max, char** list, int type, const char* filter, int sort = CF_SORT_NONE,
-                     file_list_info* info = nullptr, uint32_t location_flags = CF_LOCATION_ALL);
-int cf_get_file_list_preallocated(int max, char arr[][MAX_FILENAME_LEN], char** list, int type, const char* filter,
-                                  int sort = CF_SORT_NONE, file_list_info* info = nullptr,
-                                  uint32_t location_flags = CF_LOCATION_ALL);
+int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *filter, int sort = CF_SORT_NONE, SCP_vector<file_list_info> *info = NULL );
+int cf_get_file_list( int max, char **list, int type, const char *filter, int sort = CF_SORT_NONE, file_list_info *info = NULL );
+int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char **list, int type, const char *filter, int sort = CF_SORT_NONE, file_list_info *info = NULL );
 void cf_sort_filenames( int n, char **list, int sort, file_list_info *info = NULL );
 void cf_sort_filenames( SCP_vector<SCP_string> &list, int sort, SCP_vector<file_list_info> *info = NULL );

-struct CFileLocation {
-	bool found = false;
-	SCP_string full_name;
-	size_t size          = 0;
-	size_t offset        = 0;
-	const void* data_ptr = nullptr;
-
-	explicit CFileLocation(bool found_in = false) : found(found_in) {}
-};
-
 // Searches for a file.   Follows all rules and precedence and searches
 // CD's and pack files.
 // Input:  filespace   - Filename & extension
@@ -403,17 +326,7 @@ struct CFileLocation {
 //         size        - File size
 //         offset      - Offset into pack file.  0 if not a packfile.
 // Returns: If not found returns 0.
-CFileLocation cf_find_file_location(const char* filespec, int pathtype, bool localize = false,
-                                    uint32_t location_flags = CF_LOCATION_ALL);
-
-struct CFileLocationExt : public CFileLocation {
-	int extension_index = -1;
-
-	explicit CFileLocationExt(int extension_index_in = -1)
-	    : CFileLocation(extension_index_in >= 0), extension_index(extension_index_in)
-	{
-	}
-};
+int cf_find_file_location( const char *filespec, int pathtype, int max_out, char *pack_filename, size_t *size, size_t *offset, bool localize = false, const void** data_out = nullptr);

 // Searches for a file.   Follows all rules and precedence and searches
 // CD's and pack files.  Searches all locations in order for first filename using ext filter list.
@@ -427,8 +340,7 @@ struct CFileLocationExt : public CFileLocation {
 //         offset      - Offset into pack file.  0 if not a packfile.
 // Returns: If not found returns -1, else returns offset into ext_list.
 // (NOTE: This function is exponentially slow, so don't use it unless truely needed!!)
-CFileLocationExt cf_find_file_location_ext(const char* filename, const int ext_num, const char** ext_list, int pathtype,
-                                           bool localize = false);
+int cf_find_file_location_ext(const char *filename, const int ext_num, const char **ext_list, int pathtype, int max_out = 0, char *pack_filename = NULL, size_t *size = NULL, size_t *offset = NULL, bool localize = false, const void** data_out = nullptr);

 // Functions to change directories
 int cfile_chdir(const char *dir);
@@ -443,8 +355,6 @@ int cfile_push_chdir(int type);
 // restore directory on top of the stack
 int cfile_pop_dir();

-int cfile_get_path_type(const SCP_string& dir);
-
 namespace cfile
 {
 	// exceptions and other errors
@@ -48,6 +48,9 @@ enum CfileRootType {
 	CF_ROOTTYPE_MEMORY = 2,
 };

+// for a defined and specifically set location to get/send pilot/campaign files
+SCP_string Pilot_file_path;
+
 //  Created by:
 //    specifying hard drive tree
 //    searching for pack files on hard drive		// Found by searching all known paths
@@ -56,7 +59,6 @@ enum CfileRootType {
 typedef struct cf_root {
 	char	path[CF_MAX_PATHNAME_LENGTH];	// Contains something like c:\projects\freespace or c:\projects\freespace\freespace.vp
 	int		roottype;						// CF_ROOTTYPE_PATH  = Path, CF_ROOTTYPE_PACK =Pack file, CF_ROOTTYPE_MEMORY=In memory
-	uint32_t location_flags;
 } cf_root;

 // convenient type for sorting (see cf_build_pack_list())
@@ -345,9 +347,9 @@ void cf_build_pack_list( cf_root *root )
 	std::sort(temp_roots_sort, temp_roots_sort + temp_root_count, cf_packfile_sort_func);

 	// now insert them all into the real root list properly
+	cf_root *new_root;
 	for (i = 0; i < temp_root_count; i++) {
-		auto new_root            = cf_create_root();
-		new_root->location_flags = root->location_flags;
+		new_root = cf_create_root();
 		strcpy_s( new_root->path, root->path );

 #ifndef NDEBUG
@@ -376,11 +378,10 @@ static char normalize_directory_separator(char in)
 	return in;
 }

-static void cf_add_mod_roots(const char* rootDirectory, uint32_t basic_location)
+static void cf_add_mod_roots(const char* rootDirectory)
 {
 	if (Cmdline_mod)
 	{
-		bool primary = true;
 		for (const char* cur_pos=Cmdline_mod; strlen(cur_pos) != 0; cur_pos+= (strlen(cur_pos)+1))
 		{
 			SCP_stringstream ss;
@@ -404,16 +405,9 @@ static void cf_add_mod_roots(const char* rootDirectory, uint32_t basic_location)
 			cf_root* root = cf_create_root();

 			strncpy(root->path, rootPath.c_str(),  CF_MAX_PATHNAME_LENGTH-1);
-			if (primary) {
-				root->location_flags = basic_location | CF_LOCATION_TYPE_PRIMARY_MOD;
-			} else {
-				root->location_flags = basic_location | CF_LOCATION_TYPE_SECONDARY_MODS;
-			}

 			root->roottype = CF_ROOTTYPE_PATH;
 			cf_build_pack_list(root);
-
-			primary = false;
 		}
 	}
 }
@@ -431,16 +425,10 @@ void cf_build_root_list(const char *cdrom_dir)
 #ifdef WIN32
 		// Nothing to do here, Windows uses the current directory as the base
 #else
-		cf_add_mod_roots(os_get_legacy_user_dir(), CF_LOCATION_ROOT_USER);
+		cf_add_mod_roots(Cfile_user_dir_legacy);

 		root = cf_create_root();
-		strncpy(root->path, os_get_legacy_user_dir(), CF_MAX_PATHNAME_LENGTH - 1);
-
-		root->location_flags |= CF_LOCATION_ROOT_USER | CF_LOCATION_TYPE_ROOT;
-		if (Cmdline_mod == nullptr || strlen(Cmdline_mod) <= 0) {
-			// If there are no mods then the root is the primary mod
-			root->location_flags |= CF_LOCATION_TYPE_PRIMARY_MOD;
-		}
+		strncpy(root->path, Cfile_user_dir_legacy, CF_MAX_PATHNAME_LENGTH - 1);

 		// do we already have a slash? as in the case of a root directory install
 		if ((strlen(root->path) < (CF_MAX_PATHNAME_LENGTH - 1)) && (root->path[strlen(root->path) - 1] != DIR_SEPARATOR_CHAR)) {
@@ -448,6 +436,10 @@ void cf_build_root_list(const char *cdrom_dir)
 		}
 		root->roottype = CF_ROOTTYPE_PATH;

+		// If it wasn't set before, set the pilot path
+		if (Pilot_file_path.empty())
+			Pilot_file_path = root->path;
+
 		// Next, check any VP files under the current directory.
 		cf_build_pack_list(root);
 #endif
@@ -457,19 +449,13 @@ void cf_build_root_list(const char *cdrom_dir)
 	{
 		// =========================================================================
 		// now look for mods under the users HOME directory to use before system ones
-		cf_add_mod_roots(Cfile_user_dir, CF_LOCATION_ROOT_USER);
+		cf_add_mod_roots(Cfile_user_dir);
 		// =========================================================================

 		// =========================================================================
 		// set users HOME directory as default for loading and saving files
 		root = cf_create_root();
-		strcpy_s(root->path, Cfile_user_dir);
-
-		root->location_flags |= CF_LOCATION_ROOT_USER | CF_LOCATION_TYPE_ROOT;
-		if (Cmdline_mod == nullptr || strlen(Cmdline_mod) <= 0) {
-			// If there are no mods then the root is the primary mod
-			root->location_flags |= CF_LOCATION_TYPE_PRIMARY_MOD;
-		}
+		strncpy(root->path, Cfile_user_dir, CF_MAX_PATHNAME_LENGTH - 1);

 		// do we already have a slash? as in the case of a root directory install
 		if ((strlen(root->path) < (CF_MAX_PATHNAME_LENGTH - 1)) && (root->path[strlen(root->path) - 1] != DIR_SEPARATOR_CHAR)) {
@@ -477,6 +463,10 @@ void cf_build_root_list(const char *cdrom_dir)
 		}
 		root->roottype = CF_ROOTTYPE_PATH;

+		// set the default player location to here
+		if (Pilot_file_path.empty())
+			Pilot_file_path = root->path;
+
 		// Next, check any VP files under the current directory.
 		cf_build_pack_list(root);
 		// =========================================================================
@@ -487,17 +477,11 @@ void cf_build_root_list(const char *cdrom_dir)
 	if ( !_getcwd(working_directory, CF_MAX_PATHNAME_LENGTH ) ) {
 		Error(LOCATION, "Can't get current working directory -- %d", errno );
 	}
-
-	cf_add_mod_roots(working_directory, CF_LOCATION_ROOT_GAME);
+	
+	cf_add_mod_roots(working_directory);

 	root = cf_create_root();
-
-	root->location_flags |= CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT;
-	if (Cmdline_mod == nullptr || strlen(Cmdline_mod) <= 0) {
-		// If there are no mods then the root is the primary mod
-		root->location_flags |= CF_LOCATION_TYPE_PRIMARY_MOD;
-	}
-
+	
 	strcpy_s(root->path, working_directory);

 	size_t path_len = strlen(root->path);
@@ -509,6 +493,10 @@ void cf_build_root_list(const char *cdrom_dir)

 	root->roottype = CF_ROOTTYPE_PATH;

+	// If the path wasn't set before use the working directory
+	if ( Pilot_file_path.empty() )
+		Pilot_file_path = root->path;
+
   //======================================================
 	// Next, check any VP files under the current directory.
 	cf_build_pack_list(root);
@@ -529,7 +517,6 @@ void cf_build_root_list(const char *cdrom_dir)

 	// The final root is the in-memory root
 	root = cf_create_root();
-	root->location_flags = CF_LOCATION_ROOT_MEMORY | CF_LOCATION_TYPE_ROOT;
 	memset(root->path, 0, sizeof(root->path));
 	root->roottype = CF_ROOTTYPE_MEMORY;

@@ -990,12 +977,15 @@ void cf_free_secondary_filelist()
 *
 * @param filespec      Filename & extension
 * @param pathtype      See CF_TYPE_ defines in CFILE.H
+ * @param max_out       Maximum string length that should be stuffed into pack_filename
+ * @param pack_filename OUTPUT: Absolute path and filename of this file.   Could be a packfile or the actual file.
+ * @param size          OUTPUT: File size
+ * @param offset        OUTPUT: Offset into pack file.  0 if not a packfile.
 * @param localize      Undertake localization
- * @param location_flags Specifies where to search for the specified flag
 *
- * @return A structure which describes the found file
+ * @return If not found returns 0.
 */
-CFileLocation cf_find_file_location(const char* filespec, int pathtype, bool localize, uint32_t location_flags)
+int cf_find_file_location( const char *filespec, int pathtype, int max_out, char *pack_filename, size_t *size, size_t *offset, bool localize, const void** data_out )
 {
 	int i;
    uint ui;
@@ -1003,6 +993,7 @@ CFileLocation cf_find_file_location(const char* filespec, int pathtype, bool loc
 	char longname[MAX_PATH_LEN];

 	Assert( (filespec != NULL) && (strlen(filespec) > 0) ); //-V805
+	Assert( (pack_filename == NULL) || (max_out > 1) );

 	// see if we have something other than just a filename
 	// our current rules say that any file that specifies a direct
@@ -1018,15 +1009,16 @@ CFileLocation cf_find_file_location(const char* filespec, int pathtype, bool loc
 #endif
 		FILE *fp = fopen(filespec, "rb" );
 		if (fp)	{
-			CFileLocation res(true);
-			res.size = static_cast<size_t>(filelength(fileno(fp)));
-			res.offset = 0;
-			res.full_name = filespec;
+			if ( size ) *size = filelength(fileno(fp));
+			if ( offset ) *offset = 0;
+			if ( pack_filename ) {
+				strncpy( pack_filename, filespec, max_out );
+			}				
 			fclose(fp);
-			return res;
+			return 1;		
 		}

-		return CFileLocation();		// If they give a full path, fail if not found.
+		return 0;		// If they give a full path, fail if not found.
 	}

 	// Search the hard drive for files first.
@@ -1065,39 +1057,43 @@ CFileLocation cf_find_file_location(const char* filespec, int pathtype, bool loc
 		}
 
 		if (cfs_slow_search) {
-			cf_create_default_path_string(longname, sizeof(longname) - 1, search_order[ui], filespec, localize,
-			                              location_flags);
+			cf_create_default_path_string( longname, sizeof(longname)-1, search_order[ui], filespec, localize );

 #if defined _WIN32
 			_finddata_t findstruct;

 			intptr_t findhandle = _findfirst(longname, &findstruct);
 			if (findhandle != -1) {
-				CFileLocation res;
-				res.found = true;
-				res.size = static_cast<size_t>(findstruct.size);
+				if (size)
+					*size = findstruct.size;

 				_findclose(findhandle);

-				res.offset = 0;
-				res.full_name = longname;
+				if (offset)
+					*offset = 0;

-				return res;
+				if (pack_filename)
+					strncpy( pack_filename, longname, max_out );
+
+				return 1;
 			}
 #endif
 			{
 				FILE *fp = fopen(longname, "rb" );

 				if (fp) {
-					CFileLocation res(true);
-					res.size = static_cast<size_t>(filelength( fileno(fp) ));
+					if (size)
+						*size = filelength( fileno(fp) );

 					fclose(fp);

-					res.offset = 0;
-					res.full_name = longname;
+					if (offset)
+						*offset = 0;

-					return res;
+					if (pack_filename)
+						strncpy(pack_filename, longname, max_out);
+
+					return 1;
 				}
 			}
 		}
@@ -1111,15 +1107,6 @@ CFileLocation cf_find_file_location(const char* filespec, int pathtype, bool loc
 		if ( (pathtype != CF_TYPE_ANY) && (pathtype != f->pathtype_index) )
 			continue;

-		if (location_flags != CF_LOCATION_ALL) {
-			// If a location flag was specified we need to check if the root of this file satisfies the request
-			auto root = cf_get_root(f->root_index);
-
-			if (!cf_check_location_flags(root->location_flags, location_flags)) {
-				// Root does not satisfy location flags
-				continue;
-			}
-		}

 		if (localize) {
 			// create localized filespec
@@ -1127,58 +1114,70 @@ CFileLocation cf_find_file_location(const char* filespec, int pathtype, bool loc

 			if ( lcl_add_dir_to_path_with_filename(longname, MAX_PATH_LEN - 1) ) {
 				if ( !stricmp(longname, f->name_ext) ) {
-					CFileLocation res(true);
-					res.size = static_cast<size_t>(f->size);
-					res.offset = (size_t)f->pack_offset;
-					res.data_ptr = f->data;
+					if (size)
+						*size = f->size;

-					if (f->data != nullptr) {
-						// This is an in-memory file so we just copy the pathtype name + file name
-						res.full_name = Pathtypes[f->pathtype_index].path;
-						res.full_name += DIR_SEPARATOR_STR;
-						res.full_name += f->name_ext;
-					} else if (f->pack_offset < 1) {
-						// This is a real file, return the actual file path
-						res.full_name = f->real_name;
-					} else {
-						// File is in a pack file
-						cf_root *r = cf_get_root(f->root_index);
+					if (offset)
+						*offset = (size_t)f->pack_offset;

-						res.full_name = r->path;
+					if (data_out)
+						*data_out = f->data;
+
+					if (pack_filename) {
+						if (f->data != nullptr) {
+							// This is an in-memory file so we just copy the pathtype name + file name
+							strncpy(pack_filename, Pathtypes[f->pathtype_index].path, max_out);
+							strncat(pack_filename, DIR_SEPARATOR_STR, max_out);
+							strncat(pack_filename, f->name_ext, max_out);
+						} else if (f->pack_offset < 1) {
+							// This is a real file, return the actual file path
+							strncpy( pack_filename, f->real_name, max_out );
+						} else {
+							// File is in a pack file
+							cf_root *r = cf_get_root(f->root_index);
+
+							strncpy( pack_filename, r->path, max_out );
+						}
 					}

-					return res;
+					return 1;
 				}
 			}
 		}

 		// file either not localized or localized version not found
 		if ( !stricmp(filespec, f->name_ext) ) {
-			CFileLocation res(true);
-			res.size = static_cast<size_t>(f->size);
-			res.offset = (size_t)f->pack_offset;
-			res.data_ptr = f->data;
+			if (size)
+				*size = f->size;

-			if (f->data != nullptr) {
-				// This is an in-memory file so we just copy the pathtype name + file name
-				res.full_name = Pathtypes[f->pathtype_index].path;
-				res.full_name += DIR_SEPARATOR_STR;
-				res.full_name += f->name_ext;
-			} else if (f->pack_offset < 1) {
-				// This is a real file, return the actual file path
-				res.full_name = f->real_name;
-			} else {
-				// File is in a pack file
-				cf_root *r = cf_get_root(f->root_index);
+			if (offset)
+				*offset = (size_t)f->pack_offset;

-				res.full_name = r->path;
+			if (data_out)
+				*data_out = f->data;
+
+			if (pack_filename) {
+				if (f->data != nullptr) {
+					// This is an in-memory file so we just copy the pathtype name + file name
+					strncpy(pack_filename, Pathtypes[f->pathtype_index].path, max_out);
+					strncat(pack_filename, DIR_SEPARATOR_STR, max_out);
+					strncat(pack_filename, f->name_ext, max_out);
+				} else if (f->pack_offset < 1) {
+					// This is a real file, return the actual file path
+					strncpy( pack_filename, f->real_name, max_out );
+				} else {
+					// File is in a pack file
+					cf_root *r = cf_get_root(f->root_index);
+
+					strncpy( pack_filename, r->path, max_out );
+				}
 			}

-			return res;
+			return 1;
 		}
 	}
 		
-	return CFileLocation();
+	return 0;
 }

 // -- from parselo.cpp --
@@ -1195,11 +1194,14 @@ extern char *stristr(char *str, const char *substr);
 * @param ext_list      Extension filter list
 * @param pathtype      See CF_TYPE_ defines in CFILE.H
 * @param max_out       Maximum string length that should be stuffed into pack_filename
+ * @param pack_filename OUTPUT: Absolute path and filename of this file.   Could be a packfile or the actual file.
+ * @param size          OUTPUT: File size
+ * @param offset        OUTPUT: Offset into pack file.  0 if not a packfile.
 * @param localize      Undertake localization
 *
- * @return A structure containing information about the found file
+ * @return If not found returns -1, else returns offset into ext_list.
 */
-CFileLocationExt cf_find_file_location_ext( const char *filename, const int ext_num, const char **ext_list, int pathtype, bool localize)
+int cf_find_file_location_ext( const char *filename, const int ext_num, const char **ext_list, int pathtype, int max_out, char *pack_filename, size_t *size, size_t *offset, bool localize, const void** data_out)
 {
 	int cur_ext, i;
    uint ui;
@@ -1211,6 +1213,7 @@ CFileLocationExt cf_find_file_location_ext( const char *filename, const int ext_
 	Assert( (filename != NULL) && (strlen(filename) < MAX_FILENAME_LEN) );
 	Assert( (ext_list != NULL) && (ext_num > 1) );	// if we are searching for just one ext
 													// then this is the wrong function to use
+	Assert( (pack_filename == NULL) || (max_out > 1) );


 	// if we have a full path already then fail.  this function if for searching via filter only!
@@ -1220,7 +1223,7 @@ CFileLocationExt cf_find_file_location_ext( const char *filename, const int ext_
 	if ( strpbrk(filename,"/\\:")  ) {		// do we have a full path already?
 #endif
 		Int3();
-		return CFileLocationExt();
+		return 0;
 	}

 	// Search the hard drive for files first.
@@ -1278,35 +1281,44 @@ CFileLocationExt cf_find_file_location_ext( const char *filename, const int ext_

 #if defined _WIN32
 			_finddata_t findstruct;
-
 			intptr_t findhandle = _findfirst(longname, &findstruct);
 			if (findhandle != -1) {
-				CFileLocationExt res(cur_ext);
-				res.found = true;
-				res.size = static_cast<size_t>(findstruct.size);
+				if (size)
+					*size = findstruct.size;
+
+				if (data_out)
+					*data_out = nullptr;

 				_findclose(findhandle);

-				res.offset = 0;
-				res.full_name = longname;
+				if (offset)
+					*offset = 0;

-				return res;
+				if (pack_filename)
+					strncpy( pack_filename, longname, max_out );
+
+				return cur_ext;
 			}
 #endif
 			{
 				FILE *fp = fopen(longname, "rb" );

 				if (fp) {
-					CFileLocationExt res(cur_ext);
-					res.found = true;
-					res.size = static_cast<size_t>(filelength( fileno(fp) ));
+					if (size)
+						*size = filelength( fileno(fp) );
+
+					if (data_out)
+						*data_out = nullptr;

 					fclose(fp);

-					res.offset = 0;
-					res.full_name = longname;
+					if (offset)
+						*offset = 0;

-					return res;
+					if (pack_filename)
+						strncpy(pack_filename, longname, max_out);
+
+					return cur_ext;
 				}
 			}
 		}
@@ -1391,62 +1403,76 @@ CFileLocationExt cf_find_file_location_ext( const char *filename, const int ext_

 				if ( lcl_add_dir_to_path_with_filename(longname, MAX_PATH_LEN - 1) ) {
 					if ( !stricmp(longname, f->name_ext) ) {
-						CFileLocationExt res(cur_ext);
-						res.found = true;
-						res.size = static_cast<size_t>(f->size);
-						res.offset = (size_t)f->pack_offset;
-						res.data_ptr = f->data;
+						if (size)
+							*size = f->size;

-						if (f->data != nullptr) {
-							// This is an in-memory file so we just copy the pathtype name + file name
-							res.full_name = Pathtypes[f->pathtype_index].path;
-							res.full_name += DIR_SEPARATOR_STR;
-							res.full_name += f->name_ext;
-						} else if (f->pack_offset < 1) {
-							// This is a real file, return the actual file path
-							res.full_name = f->real_name;
-						} else {
-							// File is in a pack file
-							cf_root *r = cf_get_root(f->root_index);
+						if (offset)
+							*offset = f->pack_offset;

-							res.full_name = r->path;
+						if (data_out)
+							*data_out = f->data;
+
+						if (pack_filename) {
+							if (f->data != nullptr) {
+								// This is an in-memory file so we just copy the pathtype name + file name
+								strncpy(pack_filename, Pathtypes[f->pathtype_index].path, max_out);
+								strncat(pack_filename, DIR_SEPARATOR_STR, max_out);
+								strncat(pack_filename, f->name_ext, max_out);
+							}
+							else if (f->pack_offset < 1) {
+								// This is a real file, return the actual file path
+								strncpy(pack_filename, f->real_name, max_out);
+							}
+							else {
+								// File is in a pack file
+								cf_root *r = cf_get_root(f->root_index);
+
+								strncpy(pack_filename, r->path, max_out);
+							}
 						}

 						// found it, so cleanup and return
 						file_list_index.clear();

-						return res;
+						return cur_ext;
 					}
 				}
 			}

 			// file either not localized or localized version not found
 			if ( !stricmp(filespec, f->name_ext) ) {
-				CFileLocationExt res(cur_ext);
-				res.found = true;
-				res.size = static_cast<size_t>(f->size);
-				res.offset = (size_t)f->pack_offset;
-				res.data_ptr = f->data;
+				if (size)
+					*size = f->size;

-				if (f->data != nullptr) {
-					// This is an in-memory file so we just copy the pathtype name + file name
-					res.full_name = Pathtypes[f->pathtype_index].path;
-					res.full_name += DIR_SEPARATOR_STR;
-					res.full_name += f->name_ext;
-				} else if (f->pack_offset < 1) {
-					// This is a real file, return the actual file path
-					res.full_name = f->real_name;
-				} else {
-					// File is in a pack file
-					cf_root *r = cf_get_root(f->root_index);
+				if (offset)
+					*offset = f->pack_offset;

-					res.full_name = r->path;
+				if (data_out)
+					*data_out = f->data;
+
+				if (pack_filename) {
+					if (f->data != nullptr) {
+						// This is an in-memory file so we just copy the pathtype name + file name
+						strncpy(pack_filename, Pathtypes[f->pathtype_index].path, max_out);
+						strncat(pack_filename, DIR_SEPARATOR_STR, max_out);
+						strncat(pack_filename, f->name_ext, max_out);
+					}
+					else if (f->pack_offset < 1) {
+						// This is a real file, return the actual file path
+						strncpy(pack_filename, f->real_name, max_out);
+					}
+					else {
+						// File is in a pack file
+						cf_root *r = cf_get_root(f->root_index);
+
+						strncpy(pack_filename, r->path, max_out);
+					}
 				}

 				// found it, so cleanup and return
 				file_list_index.clear();

-				return res;
+				return cur_ext;
 			}

 			// ok, we're still here, so strip off the extension again in order to
@@ -1457,7 +1483,7 @@ CFileLocationExt cf_find_file_location_ext( const char *filename, const int ext_
 		}
 	}

-	return CFileLocationExt();
+	return -1;
 }


@@ -1556,8 +1582,7 @@ static int cf_file_already_in_list( SCP_vector<SCP_string> &list, const char *fi
 // This one has a 'type', which is a CF_TYPE_* value.  Because this specifies the directory
 // location, 'filter' only needs to be the filter itself, with no path information.
 // See above descriptions of cf_get_file_list() for more information about how it all works.
-int cf_get_file_list(SCP_vector<SCP_string>& list, int pathtype, const char* filter, int sort,
-                     SCP_vector<file_list_info>* info, uint32_t location_flags)
+int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *filter, int sort, SCP_vector<file_list_info> *info )
 {
 	char *ptr;
 	uint i;
@@ -1585,8 +1610,7 @@ int cf_get_file_list(SCP_vector<SCP_string>& list, int pathtype, const char* fil
 	}

 #if defined _WIN32
-	cf_create_default_path_string(filespec, sizeof(filespec) - 1, pathtype, (char*)Get_file_list_child, false,
-	                              location_flags);
+	cf_create_default_path_string( filespec, sizeof(filespec)-1, pathtype, (char*)Get_file_list_child );
 	strcat_s(filespec, DIR_SEPARATOR_STR);
 	strcat_s(filespec, filter);

@@ -1626,8 +1650,7 @@ int cf_get_file_list(SCP_vector<SCP_string>& list, int pathtype, const char* fil
 	}

 #elif defined SCP_UNIX
-	cf_create_default_path_string(filespec, sizeof(filespec) - 1, pathtype, (char*)Get_file_list_child, false,
-	                              location_flags);
+	cf_create_default_path_string( filespec, sizeof(filespec)-1, pathtype, (char*)Get_file_list_child );

 	DIR *dirp;
 	struct dirent *dir;
@@ -1695,16 +1718,6 @@ int cf_get_file_list(SCP_vector<SCP_string>& list, int pathtype, const char* fil
 				continue;
 			}

-			if (location_flags != CF_LOCATION_ALL) {
-				// If a location flag was specified we need to check if the root of this file satisfies the request
-				auto root = cf_get_root(f->root_index);
-
-				if (!cf_check_location_flags(root->location_flags, location_flags)) {
-					// Root does not satisfy location flags
-					continue;
-				}
-			}
-
 			if ( !cf_matches_spec( filter,f->name_ext))	{
 				continue;
 			}
@@ -1782,8 +1795,7 @@ int cf_file_already_in_list( int num_files, char **list, const char *filename )
 // This one has a 'type', which is a CF_TYPE_* value.  Because this specifies the directory
 // location, 'filter' only needs to be the filter itself, with no path information.
 // See above descriptions of cf_get_file_list() for more information about how it all works.
-int cf_get_file_list(int max, char** list, int pathtype, const char* filter, int sort, file_list_info* info,
-                     uint32_t location_flags)
+int cf_get_file_list( int max, char **list, int pathtype, const char *filter, int sort, file_list_info *info )
 {
 	char *ptr;
 	uint i;
@@ -1806,7 +1818,7 @@ int cf_get_file_list(int max, char** list, int pathtype, const char* filter, int
 	char filespec[MAX_PATH_LEN];

 #if defined _WIN32
-	cf_create_default_path_string(filespec, sizeof(filespec) - 1, pathtype, filter, false, location_flags);
+	cf_create_default_path_string( filespec, sizeof(filespec)-1, pathtype, filter );

 	_finddata_t find;
 	intptr_t find_handle;
@@ -1847,7 +1859,7 @@ int cf_get_file_list(int max, char** list, int pathtype, const char* filter, int
 	}

 #elif defined SCP_UNIX
-	cf_create_default_path_string(filespec, sizeof(filespec) - 1, pathtype, nullptr, false, location_flags);
+	cf_create_default_path_string( filespec, sizeof(filespec)-1, pathtype, NULL );

 	DIR *dirp;
 	struct dirent *dir;
@@ -1920,16 +1932,6 @@ int cf_get_file_list(int max, char** list, int pathtype, const char* filter, int
 				continue;
 			}

-			if (location_flags != CF_LOCATION_ALL) {
-				// If a location flag was specified we need to check if the root of this file satisfies the request
-				auto root = cf_get_root(f->root_index);
-
-				if (!cf_check_location_flags(root->location_flags, location_flags)) {
-					// Root does not satisfy location flags
-					continue;
-				}
-			}
-
 			if (num_files >= max)
 				break;
 			
@@ -2013,8 +2015,7 @@ int cf_file_already_in_list_preallocated( int num_files, char arr[][MAX_FILENAME
 // This one has a 'type', which is a CF_TYPE_* value.  Because this specifies the directory
 // location, 'filter' only needs to be the filter itself, with no path information.
 // See above descriptions of cf_get_file_list() for more information about how it all works.
-int cf_get_file_list_preallocated(int max, char arr[][MAX_FILENAME_LEN], char** list, int pathtype, const char* filter,
-                                  int sort, file_list_info* info, uint32_t location_flags)
+int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char **list, int pathtype, const char *filter, int sort, file_list_info *info )
 {
 	int num_files = 0, own_flag = 0;

@@ -2043,7 +2044,7 @@ int cf_get_file_list_preallocated(int max, char arr[][MAX_FILENAME_LEN], char**

 	// Search the default directories
 #if defined _WIN32
-	cf_create_default_path_string(filespec, sizeof(filespec) - 1, pathtype, filter, false, location_flags);
+	cf_create_default_path_string( filespec, sizeof(filespec)-1, pathtype, filter );

 	intptr_t find_handle;
 	_finddata_t find;
@@ -2084,7 +2085,7 @@ int cf_get_file_list_preallocated(int max, char arr[][MAX_FILENAME_LEN], char**
 	}

 #elif defined SCP_UNIX
-	cf_create_default_path_string(filespec, sizeof(filespec) - 1, pathtype, nullptr, false, location_flags);
+	cf_create_default_path_string( filespec, sizeof(filespec)-1, pathtype, NULL );

 	DIR *dirp;
 	struct dirent *dir;
@@ -2120,7 +2121,7 @@ int cf_get_file_list_preallocated(int max, char arr[][MAX_FILENAME_LEN], char**

 			if ( !Get_file_list_filter || (*Get_file_list_filter)(dir->d_name) ) {

-				strcpy_s(arr[num_files], dir->d_name );
+				strncpy(arr[num_files], dir->d_name, MAX_FILENAME_LEN - 1 );
 				char *ptr = strrchr(arr[num_files], '.');
 				if ( ptr ) {
 					*ptr = 0;
@@ -2155,16 +2156,6 @@ int cf_get_file_list_preallocated(int max, char arr[][MAX_FILENAME_LEN], char**
 				continue;
 			}

-			if (location_flags != CF_LOCATION_ALL) {
-				// If a location flag was specified we need to check if the root of this file satisfies the request
-				auto root = cf_get_root(f->root_index);
-
-				if (!cf_check_location_flags(root->location_flags, location_flags)) {
-					// Root does not satisfy location flags
-					continue;
-				}
-			}
-
 			if (num_files >= max)
 						
 				break;
@@ -2231,8 +2222,7 @@ int cf_get_file_list_preallocated(int max, char arr[][MAX_FILENAME_LEN], char**
 //          filename  - optional, if set, tacks the filename onto end of path.
 // Output:  path      - Fully qualified pathname.
 //Returns 0 if the result would be too long (invalid result)
-int cf_create_default_path_string(char* path, uint path_max, int pathtype, const char* filename, bool localize,
-                                  uint32_t location_flags)
+int cf_create_default_path_string(char *path, uint path_max, int pathtype, const char *filename, bool localize )
 {
 #ifdef SCP_UNIX
 	if ( filename && strpbrk(filename,"/")  ) {
@@ -2243,22 +2233,7 @@ int cf_create_default_path_string(char* path, uint path_max, int pathtype, const
 		strncpy( path, filename, path_max );

 	} else {
-		cf_root* root = nullptr;
-
-		for (auto i = 0; i < Num_roots; ++i) {
-			auto current_root = cf_get_root(i);
-
-			if (current_root->roottype != CF_ROOTTYPE_PATH) {
-				// We want a "real" path here so only path roots are valid
-				continue;
-			}
-
-			if (cf_check_location_flags(current_root->location_flags, location_flags)) {
-				// We found a valid root
-				root = current_root;
-				break;
-			}
-		}
+		cf_root *root = cf_get_root(0);

 		if (!root) {
 			Assert( filename != NULL );
@@ -2268,7 +2243,12 @@ int cf_create_default_path_string(char* path, uint path_max, int pathtype, const

 		Assert(CF_TYPE_SPECIFIED(pathtype));

-		strncpy(path, root->path, path_max);
+		// force a specific directory to search for player files
+		if ( (pathtype == CF_TYPE_PLAYERS) || (pathtype == CF_TYPE_SINGLE_PLAYERS) || (pathtype == CF_TYPE_MULTI_PLAYERS) ) {
+			strncpy(path, Pilot_file_path.c_str(), path_max);
+		} else {
+			strncpy(path, root->path, path_max);
+		}

 		strcat_s(path, path_max, Pathtypes[pathtype].path);

@@ -2314,8 +2294,7 @@ int cf_create_default_path_string(char* path, uint path_max, int pathtype, const
 //          filename  - optional, if set, tacks the filename onto end of path.
 // Output:  path      - Fully qualified pathname.
 //Returns 0 if the result would be too long (invalid result)
-int cf_create_default_path_string(SCP_string& path, int pathtype, const char* filename, bool /*localize*/,
-                                  uint32_t location_flags)
+int cf_create_default_path_string( SCP_string &path, int pathtype, const char *filename, bool  /*localize*/ )
 {
 #ifdef SCP_UNIX
 	if ( filename && strpbrk(filename,"/")  ) {
@@ -2326,22 +2305,7 @@ int cf_create_default_path_string(SCP_string& path, int pathtype, const char* fi
 		path.assign(filename);

 	} else {
-		cf_root* root = nullptr;
-
-		for (auto i = 0; i < Num_roots; ++i) {
-			auto current_root = cf_get_root(i);
-
-			if (current_root->roottype != CF_ROOTTYPE_PATH) {
-				// We want a "real" path here so only path roots are valid
-				continue;
-			}
-
-			if (cf_check_location_flags(current_root->location_flags, location_flags)) {
-				// We found a valid root
-				root = current_root;
-				break;
-			}
-		}
+		cf_root *root = cf_get_root(0);

 		if (!root) {
 			Assert( filename != NULL );
@@ -2352,7 +2316,12 @@ int cf_create_default_path_string(SCP_string& path, int pathtype, const char* fi
 		Assert(CF_TYPE_SPECIFIED(pathtype));
 		std::ostringstream s_path;

-		s_path << root->path;
+		// force a specific directory to search for player files
+		if ( (pathtype == CF_TYPE_PLAYERS) || (pathtype == CF_TYPE_SINGLE_PLAYERS) || (pathtype == CF_TYPE_MULTI_PLAYERS) ) {
+			s_path << Pilot_file_path;
+		} else {
+			s_path << root->path;
+		}

 		s_path << Pathtypes[pathtype].path;

@@ -2417,26 +2386,3 @@ void cfile_spew_pack_file_crcs()

 	fclose(out);
 }
-
-bool cf_check_location_flags(uint32_t check_flags, uint32_t desired_flags)
-{
-	Assertion((check_flags & CF_LOCATION_ROOT_MASK) != 0, "check_flags must have a valid root value");
-	Assertion((check_flags & CF_LOCATION_TYPE_MASK) != 0, "check_flags must have a valid type value");
-
-	auto check_root         = check_flags & CF_LOCATION_ROOT_MASK;
-	auto desired_root_flags = desired_flags & CF_LOCATION_ROOT_MASK;
-
-	// If the root part is not set then assume that every root matches
-	if (desired_root_flags != 0 && (check_root & desired_root_flags) == 0) {
-		return false;
-	}
-
-	auto check_type         = check_flags & CF_LOCATION_TYPE_MASK;
-	auto desired_type_flags = desired_flags & CF_LOCATION_TYPE_MASK;
-
-	if (desired_type_flags != 0 && (check_type & desired_type_flags) == 0) {
-		return false;
-	}
-
-	return true;
-}
@@ -29,8 +29,6 @@ typedef struct cf_pathtype {
 // During cfile_init, verify that Pathtypes[n].index == n for each item
 extern cf_pathtype Pathtypes[CF_MAX_PATH_TYPES];

-bool cf_check_location_flags(uint32_t check_flags, uint32_t desired_flags);
-
 // Returns the default storage path for files given a 
 // particular pathtype.   In other words, the path to 
 // the unpacked, non-cd'd, stored on hard drive path.
@@ -41,9 +39,7 @@ bool cf_check_location_flags(uint32_t check_flags, uint32_t desired_flags);
 //          filename  - optional, if set, tacks the filename onto end of path.
 // Output:  path      - Fully qualified pathname.
 //Returns 0 if result would be too long (invalid result)
-int cf_create_default_path_string(char* path, uint path_max, int pathtype, const char* filename = nullptr,
-                                  bool localize = false, uint32_t location_flags = CF_LOCATION_ALL);
-int cf_create_default_path_string(SCP_string& path, int pathtype, const char* filename = nullptr, bool localize = false,
-                                  uint32_t location_flags = CF_LOCATION_ALL);
+int cf_create_default_path_string( char *path, uint path_max, int pathtype, const char *filename=NULL, bool localize = false);
+int cf_create_default_path_string( SCP_string &path, int pathtype, const char *filename=NULL, bool localize = false );

 #endif	//_CFILESYSTEM_H
@@ -173,6 +173,7 @@ Flag exe_params[] =
 	{ "-no_deferred",		"Disable Deferred Lighting",				true,	EASY_DEFAULT_MEM,	EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_deferred"},
 	{ "-enable_shadows",	"Enable Shadows",							true,	EASY_MEM_ALL_ON,	EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_shadows"},
 	{ "-no_vsync",			"Disable vertical sync",					true,	0,					EASY_DEFAULT,		"Game Speed",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_vsync", },
+	{ "-cache_bitmaps",		"Cache bitmaps between missions",			true,	0,					EASY_DEFAULT_MEM,	"Game Speed",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-cache_bitmaps", },

 	{ "-dualscanlines",		"Add another pair of scanning lines",		true,	0,					EASY_DEFAULT,		"HUD",			"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-dualscanlines", },
 	{ "-targetinfo",		"Enable info next to target",				true,	0,					EASY_DEFAULT,		"HUD",			"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-targetinfo", },
@@ -232,6 +233,7 @@ Flag exe_params[] =
 	{ "-fullscreen_window",	"Run in fullscreen window",					false,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fullscreen_window", },
 	{ "-stats",				"Show statistics",							true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-stats", },
 	{ "-coords",			"Show coordinates",							false,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-coords", },
+	{ "-show_mem_usage",	"Show memory usage",						true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-show_mem_usage", },
 	{ "-pofspew",			"Generate all ibx files immediately",		false,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-pofspew", },
 	{ "-tablecrcs",			"Dump table CRCs for multi validation",		true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-tablecrcs", },
 	{ "-missioncrcs",		"Dump mission CRCs for multi validation",	true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-missioncrcs", },
@@ -246,6 +248,7 @@ Flag exe_params[] =
 	{ "-no_unfocused_pause","Don't pause if the window isn't focused",	true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_unfocused_pause", },
 	{ "-benchmark_mode",	"Puts the game into benchmark mode",		true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-benchmark_mode", },
 	{ "-noninteractive",	"Disables interactive dialogs",				true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noninteractive", },
+	{ "-json_pilot",		"Dump pilot files in JSON format",			true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-json_pilot", },
 	{ "-json_profiling",	"Generate JSON profiling output",			true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-json_profiling", },
 	{ "-profile_frame_time","Profile engine subsystems",				true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-profile_frame_timings", },
 	{ "-debug_window",		"Enable the debug window",					true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-debug_window", },
@@ -360,9 +363,11 @@ int Cmdline_no_deferred_lighting = 0;
 int Cmdline_aniso_level = 0;

 // Game Speed related
+cmdline_parm cache_bitmaps_arg("-cache_bitmaps", NULL, AT_NONE);	// Cmdline_cache_bitmaps
 cmdline_parm no_fpscap("-no_fps_capping", "Don't limit frames-per-second", AT_NONE);	// Cmdline_NoFPSCap
 cmdline_parm no_vsync_arg("-no_vsync", NULL, AT_NONE);		// Cmdline_no_vsync

+int Cmdline_cache_bitmaps = 0;	// caching of bitmaps between missions (faster loads, can hit swap on reload with <512 Meg RAM though) - taylor
 int Cmdline_NoFPSCap = 0; // Disable FPS capping - kazan
 int Cmdline_no_vsync = 0;

@@ -488,6 +493,7 @@ cmdline_parm frame_profile_write_file("-profile_write_file", NULL, AT_NONE); //
 cmdline_parm no_unfocused_pause_arg("-no_unfocused_pause", NULL, AT_NONE); //Cmdline_no_unfocus_pause
 cmdline_parm benchmark_mode_arg("-benchmark_mode", NULL, AT_NONE); //Cmdline_benchmark_mode
 cmdline_parm noninteractive_arg("-noninteractive", NULL, AT_NONE); //Cmdline_noninteractive
+cmdline_parm json_pilot("-json_pilot", NULL, AT_NONE); //Cmdline_json_pilot
 cmdline_parm json_profiling("-json_profiling", NULL, AT_NONE); //Cmdline_json_profiling
 cmdline_parm show_video_info("-show_video_info", NULL, AT_NONE); //Cmdline_show_video_info
 cmdline_parm frame_profile_arg("-profile_frame_time", NULL, AT_NONE); //Cmdline_frame_profile
@@ -518,6 +524,7 @@ bool Cmdline_profile_write_file = false;
 bool Cmdline_no_unfocus_pause = false;
 bool Cmdline_benchmark_mode = false;
 bool Cmdline_noninteractive = false;
+bool Cmdline_json_pilot = false;
 bool Cmdline_json_profiling = false;
 bool Cmdline_frame_profile = false;
 bool Cmdline_show_video_info = false;
@@ -539,7 +546,6 @@ cmdline_parm deprecated_htl_arg("-nohtl", "Deprecated", AT_NONE);
 cmdline_parm deprecated_brieflighting_arg("-brief_lighting", "Deprecated", AT_NONE);
 cmdline_parm deprecated_sndpreload_arg("-snd_preload", "Deprecated", AT_NONE);
 cmdline_parm deprecated_missile_lighting_arg("-missile_lighting", "Deprecated", AT_NONE);
-cmdline_parm deprecated_cache_bitmaps_arg("-cache_bitmaps", "Deprecated", AT_NONE);

 int Cmdline_deprecated_spec = 0;
 int Cmdline_deprecated_glow = 0;
@@ -550,7 +556,6 @@ int Cmdline_deprecated_jpgtga = 0;
 int Cmdline_deprecated_nohtl = 0;
 bool Cmdline_deprecated_brief_lighting = 0;
 bool Cmdline_deprecated_missile_lighting = false;
-bool Cmdline_deprecated_cache_bitmaps = false;

 #ifndef NDEBUG
 // NOTE: this assumes that os_init() has already been called but isn't a fatal error if it hasn't
@@ -621,10 +626,6 @@ void cmdline_debug_print_cmdline()
 	{
 		mprintf(("Deprecated flag '-missile_lighting' found. Please remove from your cmdline.\n"));
 	}
-
-	if (Cmdline_deprecated_cache_bitmaps) {
-		mprintf(("Deprecated flag '-cache_bitmaps' found. Please remove from your cmdline.\n"));
-	}
 }
 #endif

@@ -1964,6 +1965,10 @@ bool SetCmdlineParams()
 		Cmdline_ballistic_gauge = 1;
 	}

+	if ( cache_bitmaps_arg.found() ) {
+		Cmdline_cache_bitmaps = 1;
+	}
+
 	if(old_collision_system.found())
 		Cmdline_old_collision_sys = 1;

@@ -2084,6 +2089,11 @@ bool SetCmdlineParams()
 		Cmdline_noninteractive = true;
 	}

+	if (json_pilot.found())
+	{
+		Cmdline_json_pilot = true;
+	}
+
 	if (json_profiling.found())
 	{
 		Cmdline_json_profiling = true;
@@ -2149,10 +2159,6 @@ bool SetCmdlineParams()
 		Cmdline_deprecated_missile_lighting = true;
 	}

-	if (deprecated_cache_bitmaps_arg.found()) {
-		Cmdline_deprecated_cache_bitmaps = true;
-	}
-
 	return true; 
 }

@@ -82,6 +82,7 @@ extern int Cmdline_no_emissive;
 extern int Cmdline_aniso_level;

 // Game Speed related
+extern int Cmdline_cache_bitmaps;
 extern int Cmdline_NoFPSCap;
 extern int Cmdline_no_vsync;

@@ -156,6 +157,7 @@ extern bool Cmdline_profile_write_file;
 extern bool Cmdline_no_unfocus_pause;
 extern bool Cmdline_benchmark_mode;
 extern bool Cmdline_noninteractive;
+extern bool Cmdline_json_pilot;
 extern bool Cmdline_json_profiling;
 extern bool Cmdline_frame_profile;
 extern bool Cmdline_show_video_info;
@@ -2345,7 +2345,7 @@ int check_control(int id, int key)
 		// which has just been released

 		Script_system.SetHookVar("Action", 's', Control_config[id].text);
-		Script_system.RunCondition(CHA_ONACTIONSTOPPED, nullptr, id);
+		Script_system.RunCondition(CHA_ONACTIONSTOPPED, '\0', NULL, NULL, id);
 		Script_system.RemHookVar("Action");

 		Control_config[id].continuous_ongoing = false;
@@ -2419,7 +2419,7 @@ void control_used(int id)
 	if (Control_config[id].used < Last_frame_timestamp) {
 		if (!Control_config[id].continuous_ongoing) {
 			Script_system.SetHookVar("Action", 's', Control_config[id].text);
-			Script_system.RunCondition(CHA_ONACTION, nullptr, id);
+			Script_system.RunCondition(CHA_ONACTION, '\0', NULL, NULL, id);
 			Script_system.RemHookVar("Action");

 			if (Control_config[id].type == CC_TYPE_CONTINUOUS)
@@ -3,12 +3,6 @@
 #include <memory>

 namespace cutscene {
-FrameSize::FrameSize(size_t in_width, size_t in_height, size_t in_stride)
-    : width(in_width), height(in_height), stride(in_stride)
-{
-}
-FrameSize::FrameSize() = default;
-
 Decoder::Decoder() : m_decoding(true) {
 }

@@ -10,26 +10,28 @@ struct FrameSize {
 	size_t width = 0;
 	size_t height = 0;
 	size_t stride = 0;
-
-	FrameSize(size_t width, size_t in_height, size_t in_stride);
-	FrameSize();
 };

 class VideoFrame {
 protected:
-	VideoFrame() = default;
+	VideoFrame() {}

-  public:
-	virtual ~VideoFrame() = default;
+ public:
+	virtual ~VideoFrame() {}

 	double frameTime = -1.0;
 	int id = -1;

-	virtual size_t getPlaneNumber() = 0;
+	FrameSize ySize;
+	FrameSize uvSize;

-	virtual FrameSize getPlaneSize(size_t plane) = 0;
+	struct DataPointers {
+		ubyte* y;
+		ubyte* u;
+		ubyte* v;
+	};

-	virtual void* getPlaneData(size_t plane) = 0;
+	virtual DataPointers getDataPointers() = 0;
 };

 /**
@@ -41,19 +43,10 @@ using FramePtr = std::unique_ptr<T>;

 typedef std::unique_ptr<VideoFrame> VideoFramePtr;

-enum class FramePixelFormat {
-	Invalid,
-	YUV420,
-	BGR,
-	BGRA
-};
-
 struct MovieProperties {
 	FrameSize size;

 	float fps = -1.0f;
-
-	FramePixelFormat pixelFormat = FramePixelFormat::Invalid;
 };

 struct AudioFrame {
@@ -73,11 +66,6 @@ struct SubtitleFrame {
 };
 typedef std::unique_ptr<SubtitleFrame> SubtitleFramePtr;

-struct PlaybackProperties {
-	bool with_audio = true;
-	bool looping = false;
-};
-
 /**
 * @brief Abstract class for decoding a video or audio stream
 *
@@ -111,7 +99,7 @@ class Decoder {
 	 * @param fileName The name of the file that should be opened
 	 * @return @c true if the initialization was successfull, @c false otherwise
 	 */
-	virtual bool initialize(const SCP_string& fileName, const PlaybackProperties& properties) = 0;
+	virtual bool initialize(const SCP_string& fileName) = 0;

 	/**
 	 * @brief Returns the properties of the video
@@ -14,85 +14,46 @@ struct movie_vertex {

 namespace cutscene {
 namespace player {
-VideoPresenter::VideoPresenter(const MovieProperties& props) : _properties(props)
-{
+VideoPresenter::VideoPresenter(const MovieProperties& props) {
 	GR_DEBUG_SCOPE("Init video");

-	_planeTextureHandles.fill(-1);
-
 	auto w = static_cast<int>(props.size.width);
 	auto h = static_cast<int>(props.size.height);

-	switch (props.pixelFormat) {
-	case FramePixelFormat::YUV420:
-		_planeTextureBuffers[0].reset(new uint8_t[w * h]);
-		_planeTextureHandles[0] = bm_create(8, w, h, _planeTextureBuffers[0].get(), BMP_AABITMAP);
+	// Create buffer textures
+	_yTexBuffer.reset(new uint8_t[w * h]);
+	_ytex = bm_create(8, w, h, _yTexBuffer.get(), BMP_AABITMAP);

-		_planeTextureBuffers[1].reset(new uint8_t[w / 2 * h / 2]);
-		_planeTextureHandles[1] = bm_create(8, w / 2, h / 2, _planeTextureBuffers[1].get(), BMP_AABITMAP);
+	_uTexBuffer.reset(new uint8_t[w / 2 * h / 2]);
+	_utex = bm_create(8, w / 2, h / 2, _uTexBuffer.get(), BMP_AABITMAP);

-		_planeTextureBuffers[2].reset(new uint8_t[w / 2 * h / 2]);
-		_planeTextureHandles[2] = bm_create(8, w / 2, h / 2, _planeTextureBuffers[2].get(), BMP_AABITMAP);
+	_vTexBuffer.reset(new uint8_t[w / 2 * h / 2]);
+	_vtex = bm_create(8, w / 2, h / 2, _vTexBuffer.get(), BMP_AABITMAP);

-		material_set_movie(&_movie_material, _planeTextureHandles[0], _planeTextureHandles[1], _planeTextureHandles[2]);
-		break;
-	case FramePixelFormat::BGR:
-		_planeTextureBuffers[0].reset(new uint8_t[w * h * 3]);
-		_planeTextureHandles[0] = bm_create(24, w, h, _planeTextureBuffers[0].get(), 0);
-
-		material_set_unlit(&_rgb_material, _planeTextureHandles[0], 1.0f, false, false);
-		break;
-	case FramePixelFormat::BGRA:
-		_planeTextureBuffers[0].reset(new uint8_t[w * h * 4]);
-		_planeTextureHandles[0] = bm_create(32, w, h, _planeTextureBuffers[0].get(), 0);
-
-		material_set_unlit(&_rgb_material, _planeTextureHandles[0], 1.0f, true, false);
-		break;
-	default:
-		UNREACHABLE("Unhandled enum value!");
-		break;
-	}
+	material_set_movie(&_render_material, _ytex, _utex, _vtex);
 }

 VideoPresenter::~VideoPresenter() {
 	GR_DEBUG_SCOPE("Deinit video");

-	for (auto& handle : _planeTextureHandles) {
-		if (handle > 0) {
-			bm_release(handle);
-			handle = -1;
-		}
-	}
+	bm_release(_ytex);
+	bm_release(_utex);
+	bm_release(_vtex);
+
+	_ytex = _utex = _vtex = -1;
 }

 void VideoPresenter::uploadVideoFrame(const VideoFramePtr& frame) {
 	GR_DEBUG_SCOPE("Update video frame");
+	auto ptrs = frame->getDataPointers();

-	for (size_t i = 0; i < frame->getPlaneNumber(); ++i) {
-		auto size = frame->getPlaneSize(i);
-		auto data = frame->getPlaneData(i);
+	memcpy(_yTexBuffer.get(), ptrs.y, frame->ySize.stride * frame->ySize.height);
+	memcpy(_uTexBuffer.get(), ptrs.u, frame->uvSize.stride * frame->uvSize.height);
+	memcpy(_vTexBuffer.get(), ptrs.v, frame->uvSize.stride * frame->uvSize.height);

-		memcpy(_planeTextureBuffers[i].get(), data, size.stride * size.height);
-
-		int bpp = 0;
-		switch (_properties.pixelFormat) {
-		case FramePixelFormat::YUV420:
-			bpp = 8;
-			break;
-		case FramePixelFormat::BGR:
-			bpp = 24;
-			break;
-		case FramePixelFormat::BGRA:
-			bpp = 32;
-			break;
-		default:
-			UNREACHABLE("Unhandled enum value!");
-			break;
-		}
-
-		gr_update_texture(_planeTextureHandles[i], bpp, _planeTextureBuffers[i].get(), static_cast<int>(size.width),
-		                  static_cast<int>(size.height));
-	}
+	gr_update_texture(_ytex, 8, _yTexBuffer.get(), (int) frame->ySize.width, (int) frame->ySize.height);
+	gr_update_texture(_utex, 8, _uTexBuffer.get(), (int) frame->uvSize.width, (int) frame->uvSize.height);
+	gr_update_texture(_vtex, 8, _vTexBuffer.get(), (int) frame->uvSize.width, (int) frame->uvSize.height);
 }

 void VideoPresenter::displayFrame(float x1, float y1, float x2, float y2) {
@@ -124,14 +85,10 @@ void VideoPresenter::displayFrame(float x1, float y1, float x2, float y2) {
 	auto offset = gr_add_to_immediate_buffer(sizeof(vertex_data), vertex_data);

 	vertex_layout layout;
-	layout.add_vertex_component(vertex_format_data::POSITION2, sizeof(vertex_data[0]), offsetof(movie_vertex, pos));
-	layout.add_vertex_component(vertex_format_data::TEX_COORD2, sizeof(vertex_data[0]), offsetof(movie_vertex, uv));
+	layout.add_vertex_component(vertex_format_data::POSITION2, sizeof(vertex_data[0]), offset + offsetof(movie_vertex, pos));
+	layout.add_vertex_component(vertex_format_data::TEX_COORD2, sizeof(vertex_data[0]), offset + offsetof(movie_vertex, uv));

-	if (_properties.pixelFormat == FramePixelFormat::YUV420) {
-		gr_render_movie(&_movie_material, PRIM_TYPE_TRISTRIP, &layout, 4, gr_immediate_buffer_handle, offset);
-	} else {
-		gr_render_primitives(&_rgb_material, PRIM_TYPE_TRISTRIP, &layout, 0, 4, gr_immediate_buffer_handle, offset);
-	}
+	gr_render_movie(&_render_material, PRIM_TYPE_TRISTRIP, &layout, 4, gr_immediate_buffer_handle);
 }

 }
@@ -12,13 +12,16 @@ namespace cutscene {
 namespace player {

 class VideoPresenter {
-	MovieProperties _properties;
+	int _ytex = -1;
+	std::unique_ptr<uint8_t[]> _yTexBuffer;

-	std::array<int, 3> _planeTextureHandles;
-	std::array<std::unique_ptr<uint8_t[]>, 3> _planeTextureBuffers;
+	int _utex = -1;
+	std::unique_ptr<uint8_t[]> _uTexBuffer;

-	movie_material _movie_material;
-	material _rgb_material; // Material used when a RGB/RGBA movie is played
+	int _vtex = -1;
+	std::unique_ptr<uint8_t[]> _vTexBuffer;
+
+	movie_material _render_material;
 public:
 	explicit VideoPresenter(const MovieProperties& props);

@@ -223,8 +223,5 @@ void AudioDecoder::finishDecoding() {
 	// Push the last bits of audio data into the queue
 	flushAudioBuffer();
 }
-void AudioDecoder::flushBuffers() {
-	avcodec_flush_buffers(m_status->audioCodecCtx);
-}
 }
 }
@@ -30,8 +30,6 @@ class AudioDecoder: public FFMPEGStreamDecoder<AudioFrame> {
 	void decodePacket(AVPacket* packet) override;

 	void finishDecoding() override;
-
-	void flushBuffers() override;
 };
 }
 }
@@ -28,26 +28,22 @@ class AVPacketScope
 		: _packet(av_packet) {
 	}

-	AVPacketScope(const AVPacketScope&) = delete;
-	AVPacketScope& operator=(const AVPacketScope&) = delete;
-
 	~AVPacketScope() {
 		av_packet_unref(_packet);
 	}
 };

-const char* CHECKED_EXTENSIONS[] = {"webm", "mp4", "ogg",
-                                    "png", // This is designed to be used with APNG animations
-                                    "mve"};
+const char* CHECKED_EXTENSIONS[] = {
+	"webm",
+	"mp4",
+	"ogg",
+	"mve"
+};

-const char* CHECKED_SUBT_EXTENSIONS[] = {"srt"};
+const char *CHECKED_SUBT_EXTENSIONS[] = {"srt"};

 double getFrameRate(AVStream* stream, AVCodecContext* codecCtx) {
-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(58, 3, 102)
-	auto fps = av_q2d(stream->r_frame_rate);
-#else
 	auto fps = av_q2d(av_stream_get_r_frame_rate(stream));
-#endif

 	if (fps < 0.000001)
 	{
@@ -62,7 +58,7 @@ double getFrameRate(AVStream* stream, AVCodecContext* codecCtx) {
 	return fps;
 }

-CodecContextParameters getCodecParameters(AVStream* stream) {
+CodecContextParameters getCodecParameters(AVStream *stream) {
 	CodecContextParameters paras;
 #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
 	paras.width        = stream->codecpar->width;
@@ -88,7 +84,7 @@ CodecContextParameters getCodecParameters(AVStream* stream) {
 	return paras;
 }

-SCP_string normalizeLanguage(const char* langauge_name) {
+SCP_string normalizeLanguage(const char *langauge_name) {
 	if (!stricmp(langauge_name, "eng")) {
 		return "English";
 	}
@@ -105,72 +101,6 @@ SCP_string normalizeLanguage(const char* langauge_name) {
 	// Default to english for everything else
 	return "English";
 }
-
-/**
- * @brief Given a FFmpeg pixel format returns the format it should be converted to
- * @param in_fmt The input format
- * @return The output format
- */
-AVPixelFormat getConversionFormat(AVPixelFormat in_fmt)
-{
-	switch (in_fmt) {
-	case AV_PIX_FMT_RGB24:
-	case AV_PIX_FMT_BGR24:
-	case AV_PIX_FMT_BGR8:
-	case AV_PIX_FMT_BGR4:
-	case AV_PIX_FMT_BGR4_BYTE:
-	case AV_PIX_FMT_RGB8:
-	case AV_PIX_FMT_RGB4:
-	case AV_PIX_FMT_RGB4_BYTE:
-	case AV_PIX_FMT_RGB48BE:
-	case AV_PIX_FMT_RGB48LE:
-	case AV_PIX_FMT_RGB565BE:
-	case AV_PIX_FMT_RGB565LE:
-	case AV_PIX_FMT_RGB555BE:
-	case AV_PIX_FMT_RGB555LE:
-	case AV_PIX_FMT_BGR565BE:
-	case AV_PIX_FMT_BGR565LE:
-	case AV_PIX_FMT_BGR555BE:
-	case AV_PIX_FMT_BGR555LE:
-	case AV_PIX_FMT_RGB444LE:
-	case AV_PIX_FMT_RGB444BE:
-	case AV_PIX_FMT_BGR444LE:
-	case AV_PIX_FMT_BGR444BE:
-	case AV_PIX_FMT_BGR48BE:
-	case AV_PIX_FMT_BGR48LE:
-	case AV_PIX_FMT_0RGB:
-	case AV_PIX_FMT_RGB0:
-	case AV_PIX_FMT_0BGR:
-	case AV_PIX_FMT_BGR0:
-		return AV_PIX_FMT_BGR24;
-
-	case AV_PIX_FMT_RGBA64BE:
-	case AV_PIX_FMT_RGBA64LE:
-	case AV_PIX_FMT_BGRA64BE:
-	case AV_PIX_FMT_BGRA64LE:
-	case AV_PIX_FMT_ARGB:
-	case AV_PIX_FMT_RGBA:
-	case AV_PIX_FMT_ABGR:
-	case AV_PIX_FMT_BGRA:
-		return AV_PIX_FMT_BGRA;
-
-	default:
-		// Assume that everything else is converted to YUV 420
-		return AV_PIX_FMT_YUV420P;
-	}
-}
-
-FramePixelFormat getPixelFormat(AVPixelFormat fmt)
-{
-	switch (fmt) {
-	case AV_PIX_FMT_BGR24:
-		return FramePixelFormat::BGR;
-	case AV_PIX_FMT_BGRA:
-		return FramePixelFormat::BGRA;
-	default:
-		return FramePixelFormat::YUV420;
-	}
-}
 }

 namespace cutscene {
@@ -216,15 +146,8 @@ std::unique_ptr<InputStream> openStream(const SCP_string& name) {
 	return input;
 }

-std::unique_ptr<DecoderStatus> initializeStatus(std::unique_ptr<InputStream>& stream,
-                                                std::unique_ptr<InputStream>& subt,
-                                                const PlaybackProperties& properties)
-{
-	if (subt && properties.looping) {
-		mprintf(("FFmpeg: External subtitles and looping movies are not supported!\n"));
-		return nullptr;
-	}
-
+std::unique_ptr<DecoderStatus> initializeStatus(std::unique_ptr<InputStream> &stream,
+                                                std::unique_ptr<InputStream> &subt) {
 	std::unique_ptr<DecoderStatus> status(new DecoderStatus());

 	auto ctx = stream->m_ctx->ctx();
@@ -242,18 +165,14 @@ std::unique_ptr<DecoderStatus> initializeStatus(std::unique_ptr<InputStream>& st
 		return nullptr;
 	}

-	int audioStream = -1;
-
-	if (properties.with_audio) {
-		audioStream = av_find_best_stream(ctx, AVMEDIA_TYPE_AUDIO, -1, videoStream, &status->audioCodec, 0);
-		if (audioStream < 0) {
-			if (audioStream == AVERROR_STREAM_NOT_FOUND) {
-				mprintf(("FFmpeg: No audio stream found in file!\n"));
-			} else if (audioStream == AVERROR_DECODER_NOT_FOUND) {
-				mprintf(("FFmpeg: Codec for audio stream could not be found!\n"));
-			} else {
-				mprintf(("FFmpeg: Unknown error while finding audio stream!\n"));
-			}
+	auto audioStream = av_find_best_stream(ctx, AVMEDIA_TYPE_AUDIO, -1, videoStream, &status->audioCodec, 0);
+	if (audioStream < 0) {
+		if (audioStream == AVERROR_STREAM_NOT_FOUND) {
+			mprintf(("FFmpeg: No audio stream found in file!\n"));
+		} else if (audioStream == AVERROR_DECODER_NOT_FOUND) {
+			mprintf(("FFmpeg: Codec for audio stream could not be found!\n"));
+		} else {
+			mprintf(("FFmpeg: Unknown error while finding audio stream!\n"));
 		}
 	}

@@ -286,18 +205,18 @@ std::unique_ptr<DecoderStatus> initializeStatus(std::unique_ptr<InputStream>& st

 	if (status->subtitleStream == nullptr) {
 		// We don't have an external subtitle stream or loading from that file has failed
-		auto& current_language = Lcl_languages[Lcl_current_lang];
+		auto &current_language = Lcl_languages[Lcl_current_lang];
 		for (uint32_t i = 0; i < ctx->nb_streams; ++i) {
 			auto test_stream = ctx->streams[i];

 #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
-			auto& pars = test_stream->codecpar;
+			auto &pars = test_stream->codecpar;

 			if (!(pars->codec_type == AVMEDIA_TYPE_SUBTITLE)) {
 				continue;
 			}
 #endif
-			AVDictionaryEntry* tag = nullptr;
+			AVDictionaryEntry *tag = nullptr;
 			if ((tag = av_dict_get(test_stream->metadata, "language", nullptr, 0)) == nullptr) {
 				continue;
 			}
@@ -314,11 +233,6 @@ std::unique_ptr<DecoderStatus> initializeStatus(std::unique_ptr<InputStream>& st

    status->videoCodecPars = getCodecParameters(status->videoStream);

-	if (properties.looping && status->videoCodecPars.codec_id == AV_CODEC_ID_INTERPLAY_VIDEO) {
-		mprintf(("FFmpeg: Looping is not supported for inteplay (MVE) movies!\n"));
-		return nullptr;
-	}
-
 	int err;
 #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
 	status->videoCodecCtx = avcodec_alloc_context3(status->videoCodec);
@@ -426,9 +340,8 @@ std::unique_ptr<InputStream> openInputStream(const SCP_string& name) {
 	return nullptr;
 }

-std::unique_ptr<InputStream> openSubtitleStream(const SCP_string& name)
-{
-	auto& current_language = Lcl_languages[Lcl_current_lang];
+std::unique_ptr<InputStream> openSubtitleStream(const SCP_string &name) {
+	auto &current_language = Lcl_languages[Lcl_current_lang];

 	for (auto ext : CHECKED_SUBT_EXTENSIONS) {
 		SCP_string fileName;
@@ -449,11 +362,10 @@ std::unique_ptr<InputStream> openSubtitleStream(const SCP_string& name)
 }
 }

-bool FFMPEGDecoder::initialize(const SCP_string& fileName, const PlaybackProperties& properties)
-{
+bool FFMPEGDecoder::initialize(const SCP_string& fileName) {
 	SCP_string movieName = fileName;
 	// First make the file name lower case
-	std::transform(movieName.begin(), movieName.end(), movieName.begin(), [](char c) { return (char)::tolower(c); });
+	std::transform(movieName.begin(), movieName.end(), movieName.begin(), ::tolower);

 	// Then remove the extension
 	size_t dotPos = movieName.find('.');
@@ -470,7 +382,7 @@ bool FFMPEGDecoder::initialize(const SCP_string& fileName, const PlaybackPropert
 	auto subt = openSubtitleStream(movieName);

 	// We now have a valid input stream, try to find the correct streams
-	auto status = initializeStatus(input, subt, properties);
+	auto status = initializeStatus(input, subt);
 	if (!status) {
 		return false;
 	}
@@ -482,25 +394,21 @@ bool FFMPEGDecoder::initialize(const SCP_string& fileName, const PlaybackPropert
 	std::swap(m_input, input);
 	std::swap(m_subtitleInput, subt);
 	std::swap(m_status, status);
-	m_properties = properties;
 	return true;
 }

-MovieProperties FFMPEGDecoder::getProperties() const
-{
+MovieProperties FFMPEGDecoder::getProperties() const {
 	MovieProperties props;
 	props.size.width = static_cast<size_t>(m_status->videoCodecPars.width);
 	props.size.height = static_cast<size_t>(m_status->videoCodecPars.height);

 	props.fps = static_cast<float>(getFrameRate(m_status->videoStream, m_status->videoCodecCtx));

-	props.pixelFormat = getPixelFormat(getConversionFormat(m_status->videoCodecPars.pixel_format));
-
 	return props;
 }

 void FFMPEGDecoder::startDecoding() {
-	std::unique_ptr<VideoDecoder> videoDecoder(new VideoDecoder(m_status.get(), getConversionFormat(m_status->videoCodecPars.pixel_format)));
+	std::unique_ptr<VideoDecoder> videoDecoder(new VideoDecoder(m_status.get()));

 	std::unique_ptr<AudioDecoder> audioDecoder;
 	std::unique_ptr<SubtitleDecoder> subtitleDecoder;
@@ -522,98 +430,74 @@ void FFMPEGDecoder::startDecoding() {

 	auto ctx = m_input->m_ctx->ctx();
 	AVPacket packet;
-	do {
-		if (m_properties.looping) {
-			// Only seek if we are looping the movie. The MVE code doesn't support seeking to this function may not be
-			// called there
-			auto seek_err = av_seek_frame(ctx, -1, 0, AVSEEK_FLAG_BACKWARD);
-			if (seek_err < 0) {
-				char errorStr[512];
-				av_strerror(seek_err, errorStr, sizeof(errorStr));
-				mprintf(("FFMPEG: Failed to seek to start of movie file! Error: %s\n", errorStr));
+	while (isDecoding()) {
+		auto read_err = av_read_frame(ctx, &packet);
+		AVPacketScope scope(&packet);
+
+		if (read_err < 0) {
+			if (read_err == AVERROR_EOF) {
+				// Finished reading -> break out of loop
 				break;
+			} else if (avio_feof(ctx->pb) != 0) {
+				// Also EOF!
+				break;
+			} else {
+				// Some kind of other error, try to continue reading
+				char errorStr[512];
+				av_strerror(read_err, errorStr, sizeof(errorStr));
+				mprintf(("FFMPEG: Failed to read frame! Error: %s\n", errorStr));
+
+				// Skip packet
+				continue;
 			}
 		}

-		videoDecoder->flushBuffers();
+		if (packet.stream_index == m_status->videoStreamIndex) {
+			videoDecoder->decodePacket(&packet);
+
+			VideoFramePtr ptr;
+			while((ptr = videoDecoder->getFrame()) != nullptr) {
+				pushFrameData(std::move(ptr));
+			}
+		} else if (audioDecoder && packet.stream_index == m_status->audioStreamIndex) {
+			audioDecoder->decodePacket(&packet);
+
+			AudioFramePtr ptr;
+			while ((ptr = audioDecoder->getFrame()) != nullptr) {
+				pushAudioData(std::move(ptr));
+			}
+		} else if (subtitleDecoder && packet.stream_index == m_status->subtitleStreamIndex) {
+			subtitleDecoder->decodePacket(&packet);
+
+			SubtitleFramePtr ptr;
+			while ((ptr = subtitleDecoder->getFrame()) != nullptr) {
+				pushSubtitleData(std::move(ptr));
+			}
+		}
+	}
+
+	if (isDecoding()) {
+		// If we are still alive then read the last frames from the decoders
+		videoDecoder->finishDecoding();
+		VideoFramePtr video_ptr;
+		while ((video_ptr = videoDecoder->getFrame()) != nullptr) {
+			pushFrameData(std::move(video_ptr));
+		}
+
 		if (audioDecoder) {
-			audioDecoder->flushBuffers();
-		}
-		if (subtitleDecoder) {
-			subtitleDecoder->flushBuffers();
-		}
-
-		while (isDecoding()) {
-			auto read_err = av_read_frame(ctx, &packet);
-			AVPacketScope scope(&packet);
-
-			if (read_err < 0) {
-				if (read_err == AVERROR_EOF) {
-					// Finished reading -> break out of loop
-					break;
-				} else if (avio_feof(ctx->pb) != 0) {
-					// Also EOF!
-					break;
-				} else {
-					// Some kind of other error, try to continue reading
-					char errorStr[512];
-					av_strerror(read_err, errorStr, sizeof(errorStr));
-					mprintf(("FFMPEG: Failed to read frame! Error: %s\n", errorStr));
-
-					// Skip packet
-					continue;
-				}
-			}
-
-			if (packet.stream_index == m_status->videoStreamIndex) {
-				videoDecoder->decodePacket(&packet);
-
-				VideoFramePtr ptr;
-				while ((ptr = videoDecoder->getFrame()) != nullptr) {
-					pushFrameData(std::move(ptr));
-				}
-			} else if (audioDecoder && packet.stream_index == m_status->audioStreamIndex) {
-				audioDecoder->decodePacket(&packet);
-
-				AudioFramePtr ptr;
-				while ((ptr = audioDecoder->getFrame()) != nullptr) {
-					pushAudioData(std::move(ptr));
-				}
-			} else if (subtitleDecoder && packet.stream_index == m_status->subtitleStreamIndex) {
-				subtitleDecoder->decodePacket(&packet);
-
-				SubtitleFramePtr ptr;
-				while ((ptr = subtitleDecoder->getFrame()) != nullptr) {
-					pushSubtitleData(std::move(ptr));
-				}
+			audioDecoder->finishDecoding();
+			AudioFramePtr audio_frame;
+			while ((audio_frame = audioDecoder->getFrame()) != nullptr) {
+				pushAudioData(std::move(audio_frame));
 			}
 		}
-
-		if (isDecoding()) {
-			// If we are still alive then read the last frames from the decoders
-			videoDecoder->finishDecoding();
-			VideoFramePtr video_ptr;
-			while ((video_ptr = videoDecoder->getFrame()) != nullptr) {
-				pushFrameData(std::move(video_ptr));
-			}
-
-			if (audioDecoder) {
-				audioDecoder->finishDecoding();
-				AudioFramePtr audio_frame;
-				while ((audio_frame = audioDecoder->getFrame()) != nullptr) {
-					pushAudioData(std::move(audio_frame));
-				}
-			}
-		}
-		// If the video is being looped then we start again from the beginning
-	} while (m_properties.looping && isDecoding());
-
-	// Stop the decoder first to let the subtitle thread know that it shouldn't continue
-	stopDecoder();
+	}

 	if (subtitle_thread) {
 		subtitle_thread->join();
 	}
+
+	stopDecoder();
 }

 bool FFMPEGDecoder::hasAudio() const { return m_status->audioStreamIndex >= 0; }
@@ -636,8 +520,7 @@ void FFMPEGDecoder::close() {
 		m_subtitleInput = nullptr;
 	}
 }
-void FFMPEGDecoder::runSubtitleDecoder(SubtitleDecoder* decoder)
-{
+void FFMPEGDecoder::runSubtitleDecoder(SubtitleDecoder *decoder) {
 	auto ctx = m_subtitleInput->m_ctx->ctx();
 	AVPacket packet;

@@ -18,18 +18,16 @@ class FFMPEGDecoder: public Decoder {

 	std::unique_ptr<DecoderStatus> m_status;

-	PlaybackProperties m_properties;
-
 	bool hasExternalSubtitle() const;

-	void runSubtitleDecoder(SubtitleDecoder* decoder);
+	void runSubtitleDecoder(SubtitleDecoder *decoder);

  public:
 	FFMPEGDecoder();

 	~FFMPEGDecoder() override;

-	bool initialize(const SCP_string& fileName, const PlaybackProperties& properties) override;
+	bool initialize(const SCP_string& fileName) override;

 	MovieProperties getProperties() const override;

@@ -129,9 +129,6 @@ void SubtitleDecoder::pushSubtitleFrame(AVPacket* packet, AVSubtitle* subtitle)

 	pushFrame(std::move(frame));
 }
-void SubtitleDecoder::flushBuffers() {
-	avcodec_flush_buffers(m_status->subtitleCodecCtx);
-}

 }
 }
@@ -16,7 +16,6 @@ class SubtitleDecoder: public FFMPEGStreamDecoder<SubtitleFrame> {

 	void finishDecoding() override;
    void pushSubtitleFrame(AVPacket* subtitle, AVSubtitle* pSubtitle);
-	void flushBuffers() override;
 };

 }
@@ -3,9 +3,11 @@
 #include "tracing/tracing.h"

 namespace {
-SwsContext* getSWSContext(int width, int height, AVPixelFormat fmt, AVPixelFormat destination_fmt)
-{
-	return sws_getContext(width, height, fmt, width, height, destination_fmt, SWS_BILINEAR, nullptr, nullptr, nullptr);
+const AVPixelFormat DESTINATION_FORMAT = AV_PIX_FMT_YUV420P;
+
+SwsContext* getSWSContext(int width, int height, AVPixelFormat fmt) {
+	return sws_getContext(width, height, fmt, width, height, DESTINATION_FORMAT,
+						  SWS_BILINEAR, nullptr, nullptr, nullptr);
 }

 double getFrameTime(int64_t pts, AVRational time_base) {
@@ -16,53 +18,34 @@ double getFrameTime(int64_t pts, AVRational time_base) {
 namespace cutscene {
 namespace ffmpeg {
 class FFMPEGVideoFrame: public VideoFrame {
-	size_t _width;
-	size_t _height;
-	AVFrame* _frame;
-
-  public:
-	FFMPEGVideoFrame(size_t width, size_t height, AVFrame* frame) : _width(width), _height(height), _frame(frame) {}
+ public:
+	FFMPEGVideoFrame() : frame(nullptr) {
+	}

 	~FFMPEGVideoFrame() override {
-		if (_frame != nullptr) {
-			av_freep(&_frame->data[0]);
-			av_frame_free(&_frame);
+		if (frame != nullptr) {
+			av_freep(&frame->data[0]);
+			av_frame_free(&frame);
 		}
 	}
-	size_t getPlaneNumber() override
-	{
-		switch (_frame->format) {
-		case AV_PIX_FMT_YUV420P:
-			// YUV data is planar
-			return 3;
-		default:
-			// Everything else is packed
-			return 1;
-		}
-	}
-	FrameSize getPlaneSize(size_t plane) override
-	{
-		switch (_frame->format) {
-		case AV_PIX_FMT_YUV420P: {
-			// YUV data is planar
-			auto width  = plane > 0 ? _width / 2 : _width;
-			auto height = plane > 0 ? _height / 2 : _height;

-			return {width, height, (size_t)_frame->linesize[plane]};
-		}
-		default:
-			// Everything else is packed
-			return {_width, _height, (size_t)_frame->linesize[plane]};
-		}
+	DataPointers getDataPointers() override {
+		DataPointers ptrs;
+		ptrs.y = frame->data[0];
+		ptrs.u = frame->data[1];
+		ptrs.v = frame->data[2];
+
+		return ptrs;
 	}
-	void* getPlaneData(size_t plane) override { return _frame->data[plane]; }
+
+	AVFrame* frame;
 };

-VideoDecoder::VideoDecoder(DecoderStatus* status, AVPixelFormat destination_fmt)
-    : FFMPEGStreamDecoder(status), m_frameId(0), m_destinationFormat(destination_fmt)
-{
+VideoDecoder::VideoDecoder(DecoderStatus* status)
+	: FFMPEGStreamDecoder(status),
+	  m_frameId(0) {
 	m_swsCtx = getSWSContext(m_status->videoCodecPars.width, m_status->videoCodecPars.height,
-	                         m_status->videoCodecPars.pixel_format, destination_fmt);
+							 m_status->videoCodecPars.pixel_format);
 }

 VideoDecoder::~VideoDecoder() {
@@ -70,32 +53,53 @@ VideoDecoder::~VideoDecoder() {
 }

 void VideoDecoder::convertAndPushPicture(const AVFrame* frame) {
-	// Allocate a picture to hold the destination data
+	// Allocate a picture to hold the YUV data
 	AVFrame* yuvFrame = av_frame_alloc();
 	av_frame_copy(yuvFrame, frame);
-	yuvFrame->format = m_destinationFormat;
+	yuvFrame->format = DESTINATION_FORMAT;

-	av_image_alloc(yuvFrame->data, yuvFrame->linesize, m_status->videoCodecPars.width, m_status->videoCodecPars.height,
-	               m_destinationFormat, 1);
+	av_image_alloc(yuvFrame->data,
+				   yuvFrame->linesize,
+				   m_status->videoCodecPars.width,
+				   m_status->videoCodecPars.height,
+				   DESTINATION_FORMAT,
+				   1);

-	if (m_status->videoCodecPars.pixel_format == m_destinationFormat) {
-		av_image_copy(yuvFrame->data, yuvFrame->linesize, (const uint8_t**)(frame->data), frame->linesize,
-		              m_destinationFormat, m_status->videoCodecPars.width, m_status->videoCodecPars.height);
+	std::unique_ptr<FFMPEGVideoFrame> videoFramePtr(new FFMPEGVideoFrame());
+
+	if (m_status->videoCodecPars.pixel_format == DESTINATION_FORMAT) {
+		av_image_copy(yuvFrame->data,
+					  yuvFrame->linesize,
+					  (const uint8_t**) (frame->data),
+					  frame->linesize,
+					  DESTINATION_FORMAT,
+					  m_status->videoCodecPars.width,
+					  m_status->videoCodecPars.height);
 	} else {
-		// Convert frame to destination format
-		sws_scale(m_swsCtx, (uint8_t const* const*)frame->data, frame->linesize, 0, m_status->videoCodecPars.height,
-		          yuvFrame->data, yuvFrame->linesize);
+		// Convert frame to YUV
+		sws_scale(
+			m_swsCtx,
+			(uint8_t const* const*) frame->data,
+			frame->linesize,
+			0,
+			m_status->videoCodecPars.height,
+			yuvFrame->data,
+			yuvFrame->linesize
+		);
 	}

-	std::unique_ptr<FFMPEGVideoFrame> videoFramePtr(
-	    new FFMPEGVideoFrame(static_cast<size_t>(m_status->videoCodecPars.width),
-	                         static_cast<size_t>(m_status->videoCodecPars.height), yuvFrame));
 	videoFramePtr->id = ++m_frameId;
-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(58, 3, 102)
-	videoFramePtr->frameTime = getFrameTime(frame->best_effort_timestamp, m_status->videoStream->time_base);
-#else
 	videoFramePtr->frameTime = getFrameTime(av_frame_get_best_effort_timestamp(frame), m_status->videoStream->time_base);
-#endif
+	videoFramePtr->frame = yuvFrame;
+
+	videoFramePtr->ySize.height = static_cast<size_t>(m_status->videoCodecPars.height);
+	videoFramePtr->ySize.width = static_cast<size_t>(m_status->videoCodecPars.width);
+	videoFramePtr->ySize.stride = static_cast<size_t>(yuvFrame->linesize[0]);
+
+	// 420P means that the UV channels have half the width and height
+	videoFramePtr->uvSize.height = static_cast<size_t>(m_status->videoCodecPars.height / 2);
+	videoFramePtr->uvSize.width = static_cast<size_t>(m_status->videoCodecPars.width / 2);
+	videoFramePtr->uvSize.stride = static_cast<size_t>(yuvFrame->linesize[1]);

 	pushFrame(VideoFramePtr(videoFramePtr.release()));
 }
@@ -158,8 +162,5 @@ void VideoDecoder::finishDecoding() {
 	}
 #endif
 }
-void VideoDecoder::flushBuffers() {
-	avcodec_flush_buffers(m_status->videoCodecCtx);
-}
 }
 }
@@ -9,20 +9,17 @@ class VideoDecoder: public FFMPEGStreamDecoder<VideoFrame> {
 private:
 	int m_frameId;
 	SwsContext* m_swsCtx;
-	AVPixelFormat m_destinationFormat;

 	void convertAndPushPicture(const AVFrame* frame);

 public:
-	explicit VideoDecoder(DecoderStatus* status, AVPixelFormat destination_fmt);
+	explicit VideoDecoder(DecoderStatus* status);

 	~VideoDecoder() override;

 	void decodePacket(AVPacket* packet) override;

 	void finishDecoding() override;
-
-	void flushBuffers() override;
 };
 }
 }
@@ -74,8 +74,6 @@ class FFMPEGStreamDecoder {

 	virtual void finishDecoding() = 0;

-	virtual void flushBuffers() = 0;
-
 	virtual FramePtr<frame_type> getFrame();
 };

@@ -44,11 +44,21 @@ struct PlaybackState {
 	int subtitle_font = -1;
 };

-void processEvents()
-{
+void processEvents(PlaybackState* state) {
 	io::mouse::CursorManager::get()->showCursor(false);

 	os_poll();
+
+	int k = key_inkey();
+	switch (k) {
+	case KEY_ESC:
+	case KEY_ENTER:
+	case KEY_SPACEBAR:
+		state->playing = false;
+		break;
+	default:
+		break;
+	}
 }

 template<typename... Args>
@@ -183,21 +193,6 @@ void movie_display_loop(Player* player, PlaybackState* state) {
 	// We will sleep at most half the time a frame would be displayed
 	auto sleepTime = static_cast<std::uint64_t>((1. / (4. * player->getMovieProperties().fps)) * 1000.);

-	auto listener = [state](const SDL_Event& event) {
-		switch (event.key.keysym.sym) {
-		case SDLK_ESCAPE:
-		case SDLK_KP_ENTER:
-		case SDLK_RETURN:
-		case SDLK_SPACE:
-			state->playing = false;
-			return true;
-		default:
-			return false;
-		}
-	};
-	// Use a dedicated listener here since we want to listen for the KEYUP event
-	auto key_handle = os::events::addEventListener(SDL_KEYUP, os::events::DEFAULT_LISTENER_WEIGHT - 10, listener);
-
 	auto lastDisplayTimestamp = timer_get_microseconds();
 	while (state->playing) {
 		TRACE_SCOPE(tracing::CutsceneStep);
@@ -207,14 +202,12 @@ void movie_display_loop(Player* player, PlaybackState* state) {
 		auto passed = timestamp - lastDisplayTimestamp;
 		lastDisplayTimestamp = timestamp;

-		if (player->isPlaybackReady()) {
-			// Play as long as the player reports that there is more to display
-			state->playing = player->update(passed);
+		// Play as long as the player reports that there is more to display
+		state->playing = player->update(passed);

-			displayVideo(player, state);
-		}
+		displayVideo(player, state);

-		processEvents();
+		processEvents(state);

 		if (passed < sleepTime) {
 			auto sleep = sleepTime - passed;
@@ -222,8 +215,6 @@ void movie_display_loop(Player* player, PlaybackState* state) {
 			os_sleep(static_cast<uint>(sleep));
 		}
 	}
-
-	os::events::removeEventListener(key_handle);
 }

 }
@@ -17,7 +17,6 @@
 #include "io/key.h"
 #include "io/timer.h"

-#include "player.h"
 #include "parse/parselo.h"

 using namespace cutscene::player;
@@ -27,10 +26,10 @@ using namespace cutscene;

 const int MAX_AUDIO_BUFFERS = 15;

-std::unique_ptr<Decoder> findDecoder(const SCP_string& name, const PlaybackProperties& properties) {
+std::unique_ptr<Decoder> findDecoder(const SCP_string& name) {
 	{
-		std::unique_ptr<Decoder> ffmpeg(new ::cutscene::ffmpeg::FFMPEGDecoder());
-		if (ffmpeg->initialize(name, properties)) {
+		std::unique_ptr<Decoder> ffmpeg(new ffmpeg::FFMPEGDecoder());
+		if (ffmpeg->initialize(name)) {
 			return ffmpeg;
 		}
 	}
@@ -50,8 +49,7 @@ void videoPlaybackInit(PlayerState* state) {

 	Assert(state != NULL);

-	if (gr_screen.mode != GR_STUB) {
-		// The video presenter is independent of the underlying graphics API
+	if (gr_screen.mode == GR_OPENGL) {
 		state->videoPresenter.reset(new VideoPresenter(state->props));
 	}

@@ -123,15 +121,6 @@ void processVideoData(PlayerState* state) {
 	}

 	while (currentTime >= state->nextFrame->frameTime) {
-		if (state->currentFrame) {
-			if (state->nextFrame->frameTime < state->currentFrame->frameTime) {
-				// We reached the end of the movie and just looped to the beginning. Now we need to reset the playback
-				// time
-				state->playback_time = 0;
-				currentTime = playbackGetTime(state);
-			}
-		}
-
 		// Move the next frame to the current frame slot
 		state->currentFrame = std::move(state->nextFrame);

@@ -283,22 +272,8 @@ bool shouldBeginPlayback(Decoder* decoder) {
 }

 namespace cutscene {
-Player::Player(std::unique_ptr<Decoder>&& decoder, const PlaybackProperties& properties)
-    : m_decoder(std::move(decoder))
-{
-	Assertion(!m_state.videoInited,
-	          "Internal State has been initialized before! Create a new player for replaying a movie.");
-
-	m_decoderThread.reset(new std::thread(std::bind(&Player::decoderThread, this)));
-
-	m_state.props   = m_decoder->getProperties();
-	m_state.decoder = m_decoder.get();
-
-	videoPlaybackInit(&m_state);
-
-	if (properties.with_audio) {
-		audioPlaybackInit(&m_state);
-	}
+Player::Player(std::unique_ptr<Decoder>&& decoder) : m_decoder(std::move(decoder)) {
+	initPlayback();
 }

 Player::~Player() {
@@ -340,6 +315,19 @@ bool Player::processDecoderData() {

 	return decoding || pendingAudio || pendingVideo;
 }
+
+void Player::initPlayback() {
+	Assertion(!m_state.videoInited, "Internal State has been initialized before! Create a new player for replaying a movie.");
+
+	m_decoderThread.reset(new std::thread(std::bind(&Player::decoderThread, this)));
+
+	m_state.props = m_decoder->getProperties();
+	m_state.decoder = m_decoder.get();
+
+	videoPlaybackInit(&m_state);
+
+	audioPlaybackInit(&m_state);
+}
 bool Player::update(uint64_t diff_time_micro) {
 	if (m_state.playbackHasBegun) {
 		m_state.playback_time += diff_time_micro;
@@ -366,16 +354,15 @@ void Player::decoderThread() {
 	}
 }

-std::unique_ptr<Player> Player::newPlayer(const SCP_string& name, const PlaybackProperties& properties)
-{
+std::unique_ptr<Player> Player::newPlayer(const SCP_string& name) {
 	mprintf(("Creating player for movie '%s'.\n", name.c_str()));

-	auto decoder = findDecoder(name, properties);
+	auto decoder = findDecoder(name);

 	if (decoder == nullptr) {
 		return nullptr;
 	}
-	return std::unique_ptr<Player>(new Player(std::move(decoder), properties));
+	return std::unique_ptr<Player>(new Player(std::move(decoder)));
 }
 const PlayerState& Player::getInternalState() const {
 	return m_state;
@@ -399,5 +386,4 @@ SCP_string Player::getCurrentSubtitle() {
 		return m_state.currentSubtitle->text;
 	}
 }
-bool Player::isPlaybackReady() const { return m_state.playbackHasBegun || shouldBeginPlayback(m_decoder.get()); }
 }
@@ -52,7 +52,7 @@ struct PlayerState {
 * @brief A movie player
 */
 class Player {
-  private:
+ private:
 	std::unique_ptr<Decoder> m_decoder;

 	std::unique_ptr<std::thread> m_decoderThread;
@@ -61,11 +61,14 @@ class Player {

 	bool processDecoderData();

-  private:
+ private:
 	void decoderThread();

-	Player(std::unique_ptr<Decoder>&& decoder, const PlaybackProperties& properties);
-  public:
+	void initPlayback();
+
+ public:
+	explicit Player(std::unique_ptr<Decoder>&& decoder);
+
 	~Player();

 	Player(const Player&) = delete;
@@ -94,12 +97,6 @@ class Player {
 	 */
 	const MovieProperties& getMovieProperties() const;

-	/**
-	 * @brief Determines if this player can start displaying video.
-	 * @return true if the cutscene is ready, false otherwise
-	 */
-	bool isPlaybackReady() const;
-
 	/**
 	 * @brief Draws the current movie frame at the specified coordinates.
 	 *
@@ -112,10 +109,6 @@ class Player {
 	 */
 	void draw(float x1, float y1, float x2, float y2);

-	/**
-	 * @brief Gets the subtitle text that should be displayed now
-	 * @return The text, encoded in UTF-8
-	 */
 	SCP_string getCurrentSubtitle();

 	/**
@@ -126,12 +119,11 @@ class Player {
 	void stopPlayback();

 	/**
-	 * @brief Creates a player
-	 * The player is configured to play the movie with the specified name
-	 * @param name The movie to play
-	 * @param properties A structure describing how the movie will be used
-	 * @return @c nullptr if the specified movie could not be opened, a valid Player pointer otherwise
-	 */
-	static std::unique_ptr<Player> newPlayer(const SCP_string& name, const PlaybackProperties& properties = PlaybackProperties());
+     * @brief Creates a player
+     * The player is configured to play the movie with the specified name
+     * @param name The movie to play
+     * @return @c nullptr if the specified movie could not be opened, a valid Player pointer otherwise
+     */
+	static std::unique_ptr<Player> newPlayer(const SCP_string& name);
 };
 }
@@ -24,15 +24,11 @@ void main()
 	// Now we compute the depth value in projection space using the clipping plane information
 	float view_depth = 2.0 * zNear * zFar / (zFar + zNear - depth_normalized * (zFar - zNear));

-	if (isinf(view_depth)) {
-		fragOut0.rgb = color_in.rgb;
-	} else {
-		// This is the same formula that is also used by the main shader
-		float fog_dist = clamp((view_depth - fog_start) * 0.75 * fog_scale, 0.0, 1.0);
+	// This is the same formula that is also used by the main shader
+	float fog_dist = isinf(view_depth) ? 1.0 : clamp((view_depth - fog_start) * 0.75 * fog_scale, 0.0, 1.0);

-		vec3 finalFogColor = srgb_to_linear(fog_color);
+	vec3 finalFogColor = srgb_to_linear(fog_color);

-		fragOut0.rgb = mix(color_in.rgb, finalFogColor, fog_dist);
-	}
+	fragOut0.rgb = mix(color_in.rgb, finalFogColor, fog_dist);
 	fragOut0.a = 1.0;
 }
@@ -33,7 +33,7 @@ layout (std140) uniform modelData {

 	model_light lights[MAX_LIGHTS];

-	float outlineWidth;
+	float extrudeWidth;
 	float fogStart;
 	float fogScale;
 	int buffer_matrix_offset;
@@ -105,6 +105,11 @@ in VertexOutput {
 #endif
 #ifdef FLAG_FOG
 	float fogDist;
+#endif
+#ifdef WORKAROUND_CLIPPING_PLANES
+ #ifdef FLAG_TRANSFORM
+	float notVisible;
+ #endif
 #endif
 	vec4 position;
 	vec3 normal;
@@ -210,6 +215,11 @@ vec3 CalculateLighting(vec3 normal, vec3 diffuseMaterial, vec3 specularMaterial,

 void main()
 {
+#ifdef WORKAROUND_CLIPPING_PLANES
+ #ifdef FLAG_TRANSFORM
+	if(vertIn.notVisible >= 0.9) { discard; }
+ #endif
+#endif
 #ifdef FLAG_SHADOW_MAP
 	// need depth and depth squared for variance shadow maps
 	fragOut0 = vec4(vertIn.position.z, vertIn.position.z * vertIn.position.z * VARIANCE_SHADOW_SCALE_INV, 0.0, 1.0);
@@ -280,11 +290,11 @@ void main()
 	}
 	if(gammaSpec) {
 		specColor.rgb = max(specColor.rgb, vec3(0.03f)); // hardcoded minimum specular value. read John Hable's blog post titled 'Everything Is Shiny'. 
+ #ifdef FLAG_HDR
+		specColor.rgb = srgb_to_linear(specColor.rgb);
+ #endif
 		fresnelFactor = 1.0;
 	}
-   #ifdef FLAG_HDR
-	specColor.rgb = srgb_to_linear(specColor.rgb);
-   #endif
 #endif
 	baseColor.rgb *= aoFactors.y;
 	specColor.rgb *= aoFactors.y;
@@ -292,29 +302,20 @@ void main()
 #ifdef FLAG_TEAMCOLOR
 	vec4 teamMask = vec4(0.0, 0.0, 0.0, 0.0);
 	teamMask = texture(sMiscmap, vec3(texCoord, float(sMiscmapIndex)));
-
 	//For team colors applied to a diffuse or spec map, we assume that the base color of the diffuse 
 	//at this point is vec3(0.5). To get accurate results, we subtract 0.5 from the team colors
-	vec3 color_offset = vec3(-0.5) * (teamMask.x + teamMask.y);
-
-	vec3 team_color = base_color * teamMask.x + stripe_color * teamMask.y + color_offset;
+	vec3 team_color = ((base_color - vec3(0.5)) * teamMask.x) + ((stripe_color - vec3(0.5)) * teamMask.y);
 	vec3 team_color_glow = (base_color * teamMask.b) + (stripe_color * teamMask.a);

 	#ifdef FLAG_HDR
-	baseColor.rgb = linear_to_srgb(baseColor.rgb);
-	specColor.rgb = linear_to_srgb(specColor.rgb);
+	team_color = srgb_to_linear(team_color);
+	team_color_glow = srgb_to_linear(team_color_glow) * GLOW_MAP_SRGB_MULTIPLIER;
 	#endif

 	baseColor.rgb += team_color;					
 	baseColor.rgb = max(baseColor.rgb, vec3(0.0));	// We need to make sure that nothing here ever goes negative
 	specColor.rgb += team_color;
 	specColor.rgb = max(specColor.rgb, vec3(0.03));
-
-	#ifdef FLAG_HDR
-	baseColor.rgb = srgb_to_linear(baseColor.rgb);
-	specColor.rgb = srgb_to_linear(specColor.rgb);
-	#endif
-
 #endif
 #endif
 	// Lights aren't applied when we are rendering to the G-buffers since that gets handled later
@@ -425,7 +426,6 @@ void main()
 	// emissive colors won't be added later when we are using forward rendering so we need to do that here
 	baseColor.rgb += emissiveColor.rgb;
 #endif
-
 	fragOut0 = baseColor;
 #ifdef FLAG_DEFERRED
 	fragOut1 = vec4(vertIn.position.xyz, 1.0);
@@ -1,18 +1,9 @@
 #extension GL_ARB_gpu_shader5: enable

-#ifdef FLAG_THICK_OUTLINE
-layout (triangles) in;
-// For every triangle line we generate 2 triangles which can be done with 4 vertices so in total we will need 12 vertices
-layout (triangle_strip, max_vertices = 12) out;
-#else
 layout (triangles) in;
 layout (triangle_strip, max_vertices = 3) out;
-#endif
-
-#ifdef FLAG_SHADOW_MAP
- #ifdef GL_ARB_gpu_shader5
+#ifdef GL_ARB_gpu_shader5
 layout(invocations = 4) in;
- #endif
 #endif

 #define MAX_LIGHTS 8
@@ -42,7 +33,7 @@ layout (std140) uniform modelData {

 	model_light lights[MAX_LIGHTS];

-	float outlineWidth;
+	float extrudeWidth;
 	float fogStart;
 	float fogScale;
 	int buffer_matrix_offset;
@@ -115,13 +106,15 @@ in VertexOutput {
 #ifdef FLAG_FOG
 	float fogDist;
 #endif
+#ifdef WORKAROUND_CLIPPING_PLANES
+ #ifdef FLAG_TRANSFORM
+	float notVisible;
+ #endif
+#endif
 #ifdef FLAG_SHADOW_MAP
 #if !defined(GL_ARB_gpu_shader5)
 	float instance;
 #endif
- #ifdef FLAG_TRANSFORM
-	float clipModel;
- #endif
 #else
 	vec4 position;
 #endif
@@ -142,6 +135,11 @@ out VertexOutput {
 #endif
 #ifdef FLAG_FOG
 	float fogDist;
+#endif
+#ifdef WORKAROUND_CLIPPING_PLANES
+ #ifdef FLAG_TRANSFORM
+	float notVisible;
+ #endif
 #endif
 	vec4 position;
 	vec3 normal;
@@ -152,7 +150,6 @@ out VertexOutput {
 #endif
 } vertOut;

-#ifdef FLAG_SHADOW_MAP
 void main(void)
 {
 #ifdef GL_ARB_gpu_shader5
@@ -162,25 +159,14 @@ void main(void)
 #endif
 	for(int vert = 0; vert < gl_in.length(); vert++)
 	{
-#ifdef FLAG_TRANSFORM
-		if (vertIn[vert].clipModel > 0.9) {
-			// If the model was clipped in the vertex shader then we do not apply the shadow projection matrix here
-			gl_Position = gl_in[vert].gl_Position;
-		} else {
-			gl_Position = shadow_proj_matrix[instanceID] * gl_in[vert].gl_Position;
-		}
-#else
 		gl_Position = shadow_proj_matrix[instanceID] * gl_in[vert].gl_Position;
-#endif
 		if(gl_Position.z < -1.0)
 			gl_Position.z = -1.0;
-
 		vertOut.position = gl_in[vert].gl_Position;
 		vertOut.normal = vertIn[vert].normal;
 		vertOut.texCoord = vertIn[vert].texCoord;

 		gl_Layer = instanceID;
-
 #ifdef FLAG_ENV_MAP
 		vertOut.envReflect = vertIn[vert].envReflect;
 #endif
@@ -197,66 +183,19 @@ void main(void)
 		vertOut.shadowUV[3] = vertIn[vert].shadowUV[3];
 		vertOut.shadowPos = vertIn[vert].shadowPos;
 #endif
-#if defined(FLAG_CLIP)
+#ifdef WORKAROUND_CLIPPING_PLANES
+ #ifdef FLAG_TRANSFORM
+		vertOut.notVisible = vertIn[vert].notVisible;
+ #endif
+ #ifdef FLAG_CLIP
 		gl_ClipDistance[0] = gl_in[vert].gl_ClipDistance[0];
+ #endif
+#else
+ #if defined(FLAG_CLIP) || defined(FLAG_TRANSFORM)
+		gl_ClipDistance[0] = gl_in[vert].gl_ClipDistance[0];
+ #endif
 #endif
 		EmitVertex();
 	}
 	EndPrimitive();
 }
-#elif defined(FLAG_THICK_OUTLINE)
-const vec2 pixelOffsetDir[4] = vec2[](
-	vec2(0.0, 1.0),
-	vec2(1.0, 1.0),
-	vec2(1.0, -1.0),
-	vec2(0.0, -1.0)
-);
-void main(void)
-{
-	for(int vert = 0; vert < gl_in.length(); vert++)
-	{
-		int nextVert = (vert + 1) % gl_in.length();
-		vec4 clip = gl_in[vert].gl_Position;
-		vec4 diff = gl_in[nextVert].gl_Position - clip; // vector from vert to the next vertex in the list
-		vec2 normal = normalize(vec2(diff.y, -diff.x)); // Computing the normal of a 2D vector is actually rather simple...
-		for (int lineVert = 0; lineVert < 4; ++lineVert)
-		{
-			// This is the pixel offset along the normal axis
-			vec2 yOffPixel = pixelOffsetDir[lineVert].y * normal * (outlineWidth / 2.0);
-			// This is the offset of the vertex along the vector between this vertex and the next one in the triangle
-			vec2 xOff = pixelOffsetDir[lineVert].x * diff.xy;
-
-			// This is the final offset in clip space
-			vec2 finalOffset = xOff + yOffPixel * vec2(vpwidth, vpheight) * clip.w;
-
-			gl_Position = vec4(clip.xyz + vec3(finalOffset, 0.0), clip.w);
-			vertOut.position = vertIn[vert].position;
-			vertOut.normal = vertIn[vert].normal;
-			vertOut.texCoord = vertIn[vert].texCoord;
-
-#ifdef FLAG_ENV_MAP
-			vertOut.envReflect = vertIn[vert].envReflect;
-#endif
-#ifdef FLAG_NORMAL_MAP
-			vertOut.tangentMatrix = vertIn[vert].tangentMatrix;
-#endif
-#ifdef FLAG_FOG
-			vertOut.fogDist = vertIn[vert].fogDist;
-#endif
-#ifdef FLAG_SHADOWS
-			vertOut.shadowUV[0] = vertIn[vert].shadowUV[0];
-			vertOut.shadowUV[1] = vertIn[vert].shadowUV[1];
-			vertOut.shadowUV[2] = vertIn[vert].shadowUV[2];
-			vertOut.shadowUV[3] = vertIn[vert].shadowUV[3];
-			vertOut.shadowPos = vertIn[vert].shadowPos;
-#endif
-#if defined(FLAG_CLIP)
-			gl_ClipDistance[0] = gl_in[vert].gl_ClipDistance[0];
-#endif
-			EmitVertex();
-		}
-
-		EndPrimitive();
-	}
-}
-#endif
@@ -36,7 +36,7 @@ layout (std140) uniform modelData {

 	model_light lights[MAX_LIGHTS];

-	float outlineWidth;
+	float extrudeWidth;
 	float fogStart;
 	float fogScale;
 	int buffer_matrix_offset;
@@ -113,15 +113,15 @@ out VertexOutput {
 #ifdef FLAG_FOG
 	float fogDist;
 #endif
+#ifdef WORKAROUND_CLIPPING_PLANES
+ #ifdef FLAG_TRANSFORM
+	float notVisible;
+ #endif
+#endif
 #ifdef FLAG_SHADOW_MAP
 #if !defined(GL_ARB_gpu_shader5)
 	float instance;
 #endif
- #ifdef FLAG_TRANSFORM
-	// This flag is needed to let the geometry shader know that it doesn't need to apply the
-	// shadow projection to gl_Position
-	float clipModel;
- #endif
 #else
 	vec4 position;
 #endif
@@ -152,9 +152,19 @@ void main()
 	vec4 texCoord;
 	mat4 orient = mat4(1.0);
 	mat4 scale = mat4(1.0);
-#ifdef FLAG_TRANSFORM
+#ifdef WORKAROUND_CLIPPING_PLANES
+ #ifdef FLAG_TRANSFORM
 	bool clipModel;
 	getModelTransform(orient, clipModel, int(vertModelID), buffer_matrix_offset);
+	vertOut.notVisible = clipModel ? 1.0 : 0.0;
+ #endif
+#else
+ #ifdef FLAG_TRANSFORM
+	bool clipModel;
+	getModelTransform(orient, clipModel, int(vertModelID), buffer_matrix_offset);
+ #else
+	bool clipModel = false;
+ #endif
 #endif
 	texCoord = textureMatrix * vertTexCoord;
 	vec4 vertex = vertPosition;
@@ -178,6 +188,9 @@ void main()
 #else
 	gl_Position = projMatrix * position;
 #endif
+ #ifdef FLAG_NORMAL_EXTRUDE
+	gl_Position.xy += (mat3(projMatrix) * normal.xyz).xy * gl_Position.z * extrudeWidth;
+ #endif
 #ifdef FLAG_SHADOWS
 	vec4 shadowPos = shadow_mv_matrix * modelMatrix * orient * vertPosition;
 	vertOut.shadowPos = shadow_mv_matrix * modelMatrix * orient * vertPosition;
@@ -200,28 +213,31 @@ void main()
 #ifdef FLAG_FOG
 	vertOut.fogDist = clamp((gl_Position.z - fogStart) * 0.75 * fogScale, 0.0, 1.0);
 #endif
-#ifdef FLAG_TRANSFORM
-	if (clipModel) {
-		// Clip this model by moving all vertices outside the clip volume
-		gl_Position = vec4(vec3(-2.0), 1.0);
-	}
- #ifdef FLAG_SHADOW_MAP
-	vertOut.clipModel = clipModel ? 1.0 : 0.0;
- #endif
-#endif
-#ifdef FLAG_CLIP
+#ifdef WORKAROUND_CLIPPING_PLANES
 	if(use_clip_plane) {
+ 		gl_ClipDistance[0] = dot(clip_equation, modelMatrix * orient * vertex);
+ 	} else {
+		gl_ClipDistance[0] = 1.0;
+ 	}
+#else
+ #ifdef FLAG_CLIP
+	if (clipModel) {
+		gl_ClipDistance[0] = -1.0;
+	} else if(use_clip_plane) {
 		gl_ClipDistance[0] = dot(clip_equation, modelMatrix * orient * vertex);
 	} else {
 		gl_ClipDistance[0] = 1.0;
 	}
+ #elif defined(FLAG_TRANSFORM)
+	gl_ClipDistance[0] = clipModel ? -1.0 : 1.0;
+ #endif
 #endif
-#ifndef FLAG_SHADOW_MAP
+ #ifndef FLAG_SHADOW_MAP
 	vertOut.position = position;
 	vertOut.normal = normal;
 	vertOut.texCoord = texCoord;
-#else
+ #else
 	vertOut.normal = normal;
 	vertOut.texCoord = texCoord;
-#endif
+ #endif
 }
@@ -1,17 +0,0 @@
-
-in vec2 fragTexCoord;
-in vec4 fragColor;
-
-out vec4 fragOut0;
-
-uniform bool textured;
-uniform sampler2DArray baseMap;
-uniform int baseMapIndex;
-
-void main() {
-    if (textured) {
-        fragOut0 = texture(baseMap, vec3(fragTexCoord, float(baseMapIndex))) * fragColor;
-    } else {
-        fragOut0 = fragColor;
-    }
-}
@@ -1,18 +0,0 @@
-
-in vec2 vertPosition;
-in vec4 vertColor;
-in vec2 vertTexCoord;
-
-out vec2 fragTexCoord;
-out vec4 fragColor;
-
-uniform mat4 modelViewMatrix;
-uniform mat4 projMatrix;
-
-void main()
-{
-	fragTexCoord = vertTexCoord;
-	fragColor = vertColor;
-
-	gl_Position = projMatrix * modelViewMatrix * vec4(vertPosition, 0.0, 1.0);
-}
@@ -1,36 +0,0 @@
-local exts = {
-    "",
-    ".lua",
-    ".lc"
-}
-
-local function cfileLoader(name)
-    local file = nil
-
-    for i,v in ipairs(exts) do
-        local real_name = name .. v
-        file = cf.openFile(real_name, "r", "data/scripts")
-
-        if (file:isValid()) then
-            name = real_name
-            break;
-        end
-    end
-
-    if (file == nil or not file:isValid()) then
-        return "Module '" .. name .. "' is not known by the CFile system"
-    end
-
-    local content = file:read("*a")
-    file:close()
-
-    local func, err = loadstring(content, name)
-
-    if err then
-        return err
-    end
-
-    return func
-end
-
-table.insert(package.loaders, 2, cfileLoader)
@@ -5,7 +5,7 @@ IF(MSVC)
 	set(RES_CONTENT)
 	set(ARRAY_ELEMENTS)

-	FOREACH(file ${default_files_files})
+	FOREACH(file ${file_root_def_files_files})
 		set(INPUT_NAME "${CMAKE_CURRENT_SOURCE_DIR}/${file}")
 		SET(OUTPUT "${GENERATED_SOURCE_DIR}/code/${file}")
 		file(RELATIVE_PATH RELATIVE_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/def_files" "${INPUT_NAME}")
@@ -39,7 +39,7 @@ else()
 	set(INCLUDE_LIST)
 	set(ARRAY_ELEMENTS)

-	FOREACH(file ${default_files_files})
+	FOREACH(file ${file_root_def_files_files})
 		set(INPUT_NAME "${CMAKE_CURRENT_SOURCE_DIR}/${file}")
 		SET(OUTPUT "${GENERATED_SOURCE_DIR}/code/${file}")
 		file(RELATIVE_PATH RELATIVE_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/def_files" "${INPUT_NAME}")
@@ -53,11 +53,8 @@ else()
 		file(TO_NATIVE_PATH "${PATH_TYPE}" PATH_TYPE)
 		if (MINGW)
 			# There is a bug in CMake where it thinks MinGW uses forward slashes for paths but we need backslashes for Windows builds
-			string(REPLACE "/" "\\" PATH_TYPE "${PATH_TYPE}")
+			string(REPLACE "/" "\\\\" PATH_TYPE "${PATH_TYPE}")
 		endif()
-		# Properly escape back slashes in strings
-		string(REPLACE "\\" "\\\\" PATH_TYPE "${PATH_TYPE}")
-
 		GET_FILENAME_COMPONENT(FILE_NAME "${RELATIVE_FILE_PATH}" NAME)

 		string(MAKE_C_IDENTIFIER "${RELATIVE_FILE_PATH}" FIELD_NAME)
@@ -1,15 +0,0 @@
-
-#include "events.h"
-
-namespace events {
-
-util::event<void> EngineUpdate;
-
-util::event<void> EngineShutdown;
-
-util::event<void, int, int> GameLeaveState;
-
-util::event<void, int, int> GameEnterState;
-
-util::event<void, const char*> GameMissionLoad;
-}
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "utils/event.h"
-
-namespace events {
-
-extern util::event<void> EngineUpdate;
-
-extern util::event<void> EngineShutdown;
-
-extern util::event<void, int, int> GameLeaveState;
-
-extern util::event<void, int, int> GameEnterState;
-
-extern util::event<void, const char*> GameMissionLoad;
-}
@@ -26,10 +26,18 @@
 #include <cstdlib>


+// make use of the LOD checker for tbl/tbm parsing (from weapons.cpp)
+extern SCP_vector<lod_checker> LOD_checker;
+
+static SCP_vector<color> LOD_color;
+
+int Warp_model;
 int Knossos_warp_ani_used;

 #define WARPHOLE_GROW_TIME		(2.35f)	// time for warphole to reach max size (also time to shrink to nothing once it begins to shrink)

+#define MAX_FIREBALL_LOD						4
+
 #define MAX_FIREBALLS	200

 #define MAX_WARP_LOD	0
@@ -43,8 +51,10 @@ int fireball_used[MAX_FIREBALL_TYPES];
 int Num_fireballs = 0;
 int Num_fireball_types = 0;

-bool fireballs_inited = false;
-bool fireballs_parsed = false;
+int fireballs_inited = 0;
+
+int Warp_glow_bitmap = -1;
+int Warp_ball_bitmap = -1;

 #define FB_INDEX(fb)	(fb-Fireballs)

@@ -104,53 +114,12 @@ void fireball_play_warphole_close_sound(fireball *fb)
 	snd_play_3d(gamesnd_get_game_sound(sound_index), &fireball_objp->pos, &Eye_position, fireball_objp->radius); // play warp sound effect
 }

-static void fireball_generate_unique_id(char *unique_id, int buffer_len, int fireball_index)
-{
-	Assert((fireball_index >= 0) && (fireball_index < MAX_FIREBALL_TYPES));
-
-	switch (fireball_index)
-	{
-		// use sensible names for the fireball.tbl default entries
-		case FIREBALL_EXPLOSION_MEDIUM:
-			strncpy(unique_id, "Medium Explosion", buffer_len);
-			break;
-
-		case FIREBALL_WARP:
-			strncpy(unique_id, "Warp Effect", buffer_len);
-			break;
-
-		case FIREBALL_KNOSSOS:
-			strncpy(unique_id, "Knossos Effect", buffer_len);
-			break;
-
-		case FIREBALL_ASTEROID:
-			strncpy(unique_id, "Asteroid Explosion", buffer_len);
-			break;
-
-		case FIREBALL_EXPLOSION_LARGE1:
-			strncpy(unique_id, "Large Explosion 1", buffer_len);
-			break;
-
-		case FIREBALL_EXPLOSION_LARGE2:
-			strncpy(unique_id, "Large Explosion 2", buffer_len);
-			break;
-
-		// base the id on the index
-		default:
-			snprintf(unique_id, buffer_len, "Custom Fireball %d", fireball_index - NUM_DEFAULT_FIREBALLS + 1);
-			break;
-	}
-
-	// null-terminate
-	unique_id[buffer_len - 1] = '\0';
-}
-
 /**
 * Set default colors for each explosion type (original values from object.cpp)
 */
 static void fireball_set_default_color(int idx)
 {
-	Assert((idx >= 0) && (idx < MAX_FIREBALL_TYPES));
+	Assert( (idx >= 0) && (idx < MAX_FIREBALL_TYPES) );

 	switch (idx)
 	{
@@ -184,148 +153,71 @@ static void fireball_set_default_color(int idx)
 	}
 }

-static void fireball_set_default_warp_attributes(int idx)
-{
-	Assert((idx >= 0) && (idx < MAX_FIREBALL_TYPES));
-
-	switch (idx)
-	{
-		case FIREBALL_WARP:
-		case FIREBALL_KNOSSOS:
-			strcpy_s(Fireball_info[idx].warp_glow, "warpglow01");
-			strcpy_s(Fireball_info[idx].warp_ball, "warpball01");
-			strcpy_s(Fireball_info[idx].warp_model, "warp.pof");
-			break;
-	}
-}
-
-void fireball_info_clear(fireball_info *fb)
-{
-	Assert(fb != nullptr);
-	memset(fb, 0, sizeof(fireball_info));
-
-	for (int i = 0; i < MAX_FIREBALL_LOD; ++i)
-		fb->lod[i].bitmap_id = -1;
-
-	fb->warp_glow_bitmap = -1;
-	fb->warp_ball_bitmap = -1;
-	fb->warp_model_id = -1;
-}
-
-int fireball_info_lookup(const char *unique_id)
-{
-	for (int i = 0; i < Num_fireball_types; ++i)
-		if (!stricmp(Fireball_info[i].unique_id, unique_id))
-			return i;
-
-	return -1;
-}
-
 /**
 * Parse fireball tbl
+ *
+ * NOTE: we can't be too trusting here so a tbm will only modify the LOD count, not add an entry
 */
-static void parse_fireball_tbl(const char *table_filename)
+void parse_fireball_tbl(const char *filename)
 {
+	lod_checker lod_check;
+	color fb_color;
+
 	try
 	{
-		read_file_text(table_filename, CF_TYPE_TABLES);
+		read_file_text(filename, CF_TYPE_TABLES);
 		reset_parse();

 		required_string("#Start");

-		while (required_string_one_of(3, "#End", "$Name:", "$Unique ID:"))
-		{
-			fireball_info *fi;
-			int existing_idx = -1;
-			char unique_id[NAME_LENGTH];
-			char fireball_filename[MAX_FILENAME_LEN];
-
-			// unique ID, because indexes are unpredictable
-			memset(unique_id, 0, NAME_LENGTH);
-			if (optional_string("$Unique ID:"))
-				stuff_string(unique_id, F_NAME, NAME_LENGTH);
+		while (required_string_either("#End", "$Name:")) {
+			memset(&lod_check, 0, sizeof(lod_checker));

 			// base filename
 			required_string("$Name:");
-			stuff_string(fireball_filename, F_NAME, MAX_FILENAME_LEN);
+			stuff_string(lod_check.filename, F_NAME, MAX_FILENAME_LEN);

-			// find out if we are overriding a previous entry;
-			// per precedent, these strings should only be in TBMs
-			// UNLIKE precedent, we can now add fireballs in modular tables, not just replace them
-			if (Parsing_modular_table)
-			{
-				if (optional_string("+Explosion_Medium"))
-					existing_idx = FIREBALL_EXPLOSION_MEDIUM;
-				else if (optional_string("+Warp_Effect"))
-					existing_idx = FIREBALL_WARP;
-				else if (optional_string("+Knossos_Effect"))
-					existing_idx = FIREBALL_KNOSSOS;
-				else if (optional_string("+Asteroid"))
-					existing_idx = FIREBALL_ASTEROID;
-				else if (optional_string("+Explosion_Large1"))
-					existing_idx = FIREBALL_EXPLOSION_LARGE1;
-				else if (optional_string("+Explosion_Large2"))
-					existing_idx = FIREBALL_EXPLOSION_LARGE2;
-				else if (optional_string("+Custom_Fireball"))
-					stuff_int(&existing_idx);
+			lod_check.override = -1;

-				// we can ALSO override a previous entry by specifying a previously used unique ID
-				// either way will work, but if both are specified, unique ID takes precedence
-				if (strlen(unique_id) > 0)
-				{
-					int temp_idx = fireball_info_lookup(unique_id);
-					if (temp_idx >= 0)
-						existing_idx = temp_idx;
+			// these entries should only be in TBMs, and it has to include at least one
+			if (Parsing_modular_table) {
+				if (optional_string("+Explosion_Medium")) {
+					lod_check.override = FIREBALL_EXPLOSION_MEDIUM;
+				}
+				else if (optional_string("+Warp_Effect")) {
+					lod_check.override = FIREBALL_WARP;
+				}
+				else if (optional_string("+Knossos_Effect")) {
+					lod_check.override = FIREBALL_KNOSSOS;
+				}
+				else if (optional_string("+Asteroid")) {
+					lod_check.override = FIREBALL_ASTEROID;
+				}
+				else if (optional_string("+Explosion_Large1")) {
+					lod_check.override = FIREBALL_EXPLOSION_LARGE1;
+				}
+				else if (optional_string("+Explosion_Large2")){
+					lod_check.override = FIREBALL_EXPLOSION_LARGE2;
+				}
+				else {
+					required_string("+Custom_Fireball");
+					stuff_int(&lod_check.override);
 				}
 			}

-			// now select our entry accordingly...
-			// are we using a previous entry?
-			if (existing_idx >= 0)
-			{
-				fi = &Fireball_info[existing_idx];
-			}
-			// we are creating a new entry, so set some defaults
-			else
-			{
-				// make sure we don't exceed the max
-				if (Num_fireball_types >= MAX_FIREBALL_TYPES)
-				{
-					error_display(0, "Too many fireball entries!  Max is %d", MAX_FIREBALL_TYPES);
-					return;
-				}
+			lod_check.num_lods = 1;

-				fi = &Fireball_info[Num_fireball_types];
-				fireball_info_clear(fi);
-
-				// If the table didn't specify a unique ID, generate one.  This will be assigned a few lines later.
-				if (strlen(unique_id) == 0)
-					fireball_generate_unique_id(unique_id, NAME_LENGTH, Num_fireball_types);
-
-				// Set remaining fireball defaults
-				fireball_set_default_color(Num_fireball_types);
-				fireball_set_default_warp_attributes(Num_fireball_types);
-
-				Num_fireball_types++;
+			// Do we have an LOD num
+			if (optional_string("$LOD:")) {
+				stuff_int(&lod_check.num_lods);
 			}

-			// copy over what we already parsed
-			if (strlen(unique_id) > 0)
-				strcpy_s(fi->unique_id, unique_id);
-			strcpy_s(fi->lod[0].filename, fireball_filename);
-
-			// Do we have a LOD num?
-			if (optional_string("$LOD:"))
-			{
-				stuff_int(&fi->lod_count);
-
-				if (fi->lod_count > MAX_FIREBALL_LOD)
-					fi->lod_count = MAX_FIREBALL_LOD;
+			if (lod_check.num_lods > MAX_FIREBALL_LOD) {
+				lod_check.num_lods = MAX_FIREBALL_LOD;
 			}

 			// check for particular lighting color
-			if (optional_string("$Light color:"))
-			{
+			if (optional_string("$Light color:")) {
 				int r, g, b;

 				stuff_int(&r);
@@ -336,57 +228,90 @@ static void parse_fireball_tbl(const char *table_filename)
 				CLAMP(g, 0, 255);
 				CLAMP(b, 0, 255);

-				fi->exp_color[0] = (r / 255.0f);
-				fi->exp_color[1] = (g / 255.0f);
-				fi->exp_color[2] = (b / 255.0f);
+				gr_init_color(&fb_color, r, g, b);
+			}
+			else {
+				// to keep things simple, we just use 0 alpha to indicate that a default value should be used
+				memset(&fb_color, 0, sizeof(color));
 			}

-			// check for custom warp glow
-			if (optional_string("$Warp glow:"))
-				stuff_string(fi->warp_glow, F_NAME, NAME_LENGTH);
-
-			// check for custom warp ball
-			if (optional_string("$Warp ball:"))
-				stuff_string(fi->warp_ball, F_NAME, NAME_LENGTH);
-
-			// check for custom warp model
-			if (optional_string("$Warp model:"))
-				stuff_string(fi->warp_model, F_NAME, NAME_LENGTH);
+			// we may use one filename for multiple entries so we'll have to handle dupes post parse
+			LOD_checker.push_back(lod_check);
+			LOD_color.push_back(fb_color);
 		}

 		required_string("#End");
 	}
 	catch (const parse::ParseException& e)
 	{
-		mprintf(("TABLES: Unable to parse '%s'!  Error message = %s.\n", table_filename, e.what()));
+		mprintf(("TABLES: Unable to parse '%s'!  Error message = %s.\n", filename, e.what()));
 		return;
 	}
 }

 void fireball_parse_tbl()
 {
-	if (fireballs_parsed)
-		return;
+	int i = 0, j;
+	SCP_vector<lod_checker>::iterator lod;
+
+	memset( &Fireball_info, 0, sizeof(fireball_info) * MAX_FIREBALL_TYPES );

-	// every newly parsed fireball_info will get cleared before being added
-	// must do this outside of parse_fireball_tbl because it's called twice
-	Num_fireball_types = 0;

 	parse_fireball_tbl("fireball.tbl");

 	// look for any modular tables
 	parse_modular_table(NOX("*-fbl.tbm"), parse_fireball_tbl);

-	// fill in extra LOD filenames
-	for (int i = 0; i < Num_fireball_types; i++)
-	{
-		for (int j = 1; j < Fireball_info[i].lod_count; j++)
-			sprintf( Fireball_info[i].lod[j].filename, "%s_%d", Fireball_info[i].lod[0].filename, j);
+	// we've got our list so pass it off for final checking and loading.
+	// we assume that entries in fireball.tbl are in the correct order
+	for (lod = LOD_checker.begin(); lod != LOD_checker.end(); ++lod) {
+		if ( (i < MAX_FIREBALL_TYPES) && (lod->override < 0) ) {
+			strcpy_s( Fireball_info[i].lod[0].filename, lod->filename );
+			Fireball_info[i].lod_count = lod->num_lods;
+			Num_fireball_types++;
+
+			if (LOD_color[i].alpha == 255) {
+				Fireball_info[i].exp_color[0] = (LOD_color[i].red / 255.0f);
+				Fireball_info[i].exp_color[1] = (LOD_color[i].green / 255.0f);
+				Fireball_info[i].exp_color[2] = (LOD_color[i].blue / 255.0f);
+			} else {
+				fireball_set_default_color(i);
+			}
+		}
+		i++;
 	}

-	fireballs_parsed = true;
+	// having to do this twice is less than optimal, but less error prone too.
+	// this handles (and should only have to handle) TBM related entries
+	i = 0;
+	for (lod = LOD_checker.begin(); lod != LOD_checker.end(); ++lod) {
+		// try entry replacement
+		if ( (lod->override >= 0) && (lod->override < Num_fireball_types) ) {
+			strcpy_s( Fireball_info[lod->override].lod[0].filename, lod->filename );
+			Fireball_info[lod->override].lod_count = lod->num_lods;
+
+			if (LOD_color[i].alpha == 255) {
+				Fireball_info[lod->override].exp_color[0] = (LOD_color[i].red / 255.0f);
+				Fireball_info[lod->override].exp_color[1] = (LOD_color[i].green / 255.0f);
+				Fireball_info[lod->override].exp_color[2] = (LOD_color[i].blue / 255.0f);
+			} else {
+				fireball_set_default_color(lod->override);
+			}
+		}
+	}
+
+	// fill in extra LOD filenames
+	for (i = 0; i < Num_fireball_types; i++) {
+		for (j = 1; j < Fireball_info[i].lod_count; j++) {
+			sprintf( Fireball_info[i].lod[j].filename, "%s_%d", Fireball_info[i].lod[0].filename, j);
+		}
+	}
+
+	// done
+	LOD_checker.clear();
 }

+
 void fireball_load_data()
 {
 	int				i, idx;
@@ -405,20 +330,13 @@ void fireball_load_data()
 				Error(LOCATION, "Could not load %s anim file\n", fd->lod[idx].filename);
 			}
 		}
+	} 

-		if (strlen(fd->warp_glow) > 0) {
-			mprintf(("Loading warp glow '%s'\n", fd->warp_glow));
-			fd->warp_glow_bitmap = bm_load(fd->warp_glow);
-		} else {
-			fd->warp_glow_bitmap = -1;
-		}
-
-		if (strlen(fd->warp_ball) > 0) {
-			mprintf(("Loading warp ball '%s'\n", fd->warp_ball));
-			fd->warp_ball_bitmap = bm_load(fd->warp_ball);
-		} else {
-			fd->warp_ball_bitmap = -1;
-		}
+	if ( Warp_glow_bitmap == -1 )	{
+		Warp_glow_bitmap = bm_load( NOX("warpglow01") );
+	}
+	if ( Warp_ball_bitmap == -1 )	{
+		Warp_ball_bitmap = bm_load( NOX("warpball01") );
 	}
 }

@@ -428,11 +346,11 @@ void fireball_init()
 	int i;

 	if ( !fireballs_inited ) {
+		fireballs_inited = 1;
+
 		// Do all the processing that happens only once
 		fireball_parse_tbl();
 		fireball_load_data();
-
-		fireballs_inited = true;
 	}
 	
 	// Reset everything between levels
@@ -443,6 +361,17 @@ void fireball_init()

 	// Goober5000 - reset Knossos warp flag
 	Knossos_warp_ani_used = 0;
+
+	mprintf(("Loading warp model\n"));
+	Warp_model = -1;
+
+	// Goober5000 - check for existence of file before trying to load it
+	if (cf_exists_full("warp.pof", CF_TYPE_MODELS))
+	{
+		Warp_model = model_load("warp.pof", 0, NULL, 0);
+	}
+
+	mprintf((" %d\n", Warp_model));
 }

 MONITOR( NumFireballsRend )
@@ -614,7 +543,7 @@ void fireball_maybe_play_warp_close_sound(fireball *fb)

 	life_left = fb->total_time - fb->time_elapsed;

-	if ( life_left < fb->warp_close_duration ) {
+	if ( life_left < WARPHOLE_GROW_TIME ) {
 		fireball_play_warphole_close_sound(fb);
 		fb->flags |= FBF_WARP_CLOSE_SOUND_PLAYED;
 	}
@@ -767,7 +696,7 @@ int fireball_get_lod(vec3d *pos, fireball_info *fd, float size)
 /**
 * Create a fireball, return object index.
 */
-int fireball_create(vec3d *pos, int fireball_type, int render_type, int parent_obj, float size, int reverse, vec3d *velocity, float warp_lifetime, int ship_class, matrix *orient_override, int low_res, int extra_flags, gamesnd_id warp_open_sound, gamesnd_id warp_close_sound, float warp_open_duration, float warp_close_duration)
+int fireball_create( vec3d * pos, int fireball_type, int render_type, int parent_obj, float size, int reverse, vec3d *velocity, float warp_lifetime, int ship_class, matrix *orient_override, int low_res, int extra_flags, gamesnd_id warp_open_sound, gamesnd_id warp_close_sound)
 {
 	int				n, objnum, fb_lod;
 	object			*obj;
@@ -828,8 +757,6 @@ int fireball_create(vec3d *pos, int fireball_type, int render_type, int parent_o
 	fb->flags = extra_flags;
 	fb->warp_open_sound_index = warp_open_sound;
 	fb->warp_close_sound_index = warp_close_sound;
-	fb->warp_open_duration = (warp_open_duration < 0.0f) ? WARPHOLE_GROW_TIME : warp_open_duration;
-	fb->warp_close_duration = (warp_close_duration < 0.0f) ? WARPHOLE_GROW_TIME : warp_close_duration;

 	matrix orient;
 	if(orient_override != NULL){
@@ -934,9 +861,9 @@ void fireballs_page_in()
 	fireball_info	*fd;

 	for ( i = 0; i < Num_fireball_types; i++ ) {
-		fd = &Fireball_info[i];
+		if((i < NUM_DEFAULT_FIREBALLS) || fireball_used[i]){
+			fd = &Fireball_info[i];

-		if((i < NUM_DEFAULT_FIREBALLS) || fireball_used[i]) {
 			// if this is a Knossos ani, only load if Knossos_warp_ani_used is true
 			if ( (i == FIREBALL_KNOSSOS) && !Knossos_warp_ani_used)
 				continue;
@@ -949,19 +876,10 @@ void fireballs_page_in()
 				bm_page_in_texture( fd->lod[idx].bitmap_id, fd->lod[idx].num_frames );
 			}
 		}
-
-		// page in glow and ball bitmaps, if we have any
-		bm_page_in_texture(fd->warp_glow_bitmap);
-		bm_page_in_texture(fd->warp_ball_bitmap);
-
-		// load the warp model, if we have one
-		if (strlen(fd->warp_model) > 0 && cf_exists_full(fd->warp_model, CF_TYPE_MODELS)) {
-			mprintf(("Loading warp model '%s'\n", fd->warp_model));
-			fd->warp_model_id = model_load(fd->warp_model, 0, nullptr, 0);
-		} else {
-			fd->warp_model_id = -1;
-		}
 	}
+
+	bm_page_in_texture( Warp_glow_bitmap );
+	bm_page_in_texture( Warp_ball_bitmap );
 }

 void fireball_get_color(int idx, float *red, float *green, float *blue)
@@ -1023,23 +941,30 @@ int fireball_asteroid_explosion_type(asteroid_info *aip)
 	return index;
 }

-float fireball_wormhole_intensity(fireball *fb)
+float fireball_wormhole_intensity( object *obj )
 {
+	int			num, objnum;
+	fireball		*fb;
+
+	num = obj->instance;
+	objnum = OBJ_INDEX(obj);
+	Assertion( Fireballs[num].objnum == objnum, "Basic sanity check. Fireballs[num].objnum (%d) should == objnum (%d)", Fireballs[num].objnum, objnum );
+
+	fb = &Fireballs[num];
+
 	float t = fb->time_elapsed;
 	float rad;

-	if ( t < fb->warp_open_duration )	{
-		rad = (float)pow(t / fb->warp_open_duration, 0.4f);
-	} else if ( t < fb->total_time - fb->warp_close_duration )	{
-		rad = 1.0f;
+	if ( t < WARPHOLE_GROW_TIME )	{
+		rad = (float)pow(t/WARPHOLE_GROW_TIME,0.4f);
+	} else if ( t < fb->total_time - WARPHOLE_GROW_TIME )	{
+		rad = 1;
 	} else {
-		rad = (float)pow((fb->total_time - t) / fb->warp_close_duration, 0.4f);
+		rad = (float)pow((fb->total_time - t)/WARPHOLE_GROW_TIME,0.4f);
 	}
 	return rad;
 } 

-extern void warpin_queue_render(model_draw_list *scene, object *obj, matrix *orient, vec3d *pos, int texture_bitmap_num, float radius, float life_percent, float max_radius, bool warp_3d, int warp_glow_bitmap, int warp_ball_bitmap, int warp_model_id);
-
 void fireball_render(object* obj, model_draw_list *scene)
 {
 	int		num;
@@ -1071,10 +996,21 @@ void fireball_render(object* obj, model_draw_list *scene)

 		case FIREBALL_WARP_EFFECT: {
 			float percent_life = fb->time_elapsed / fb->total_time;
-			float rad = obj->radius * fireball_wormhole_intensity(fb);

-			fireball_info *fi = &Fireball_info[fb->fireball_info_index];
-			warpin_queue_render(scene, obj, &obj->orient, &obj->pos, fb->current_bitmap, rad, percent_life, obj->radius, (fb->flags & FBF_WARP_3D) != 0, fi->warp_glow_bitmap, fi->warp_ball_bitmap, fi->warp_model_id);
+			float rad;
+
+			// Code to make effect grow/shrink. 
+			float t = fb->time_elapsed;
+
+			if ( t < WARPHOLE_GROW_TIME )	{
+				rad = (float)pow(t/WARPHOLE_GROW_TIME,0.4f)*obj->radius;
+			} else if ( t < fb->total_time - WARPHOLE_GROW_TIME )	{
+				rad = obj->radius;
+			} else {
+				rad = (float)pow((fb->total_time - t)/WARPHOLE_GROW_TIME,0.4f)*obj->radius;
+			}
+
+			warpin_queue_render(scene, obj, &obj->orient, &obj->pos, Fireballs[num].current_bitmap, rad, percent_life, obj->radius, (Fireballs[num].flags & FBF_WARP_3D) );
 		}
 		break;

@@ -36,11 +36,10 @@ class asteroid_info;
 #define MAX_FIREBALL_TYPES			32		// The maximum number of fireballs that can be defined
 #define NUM_DEFAULT_FIREBALLS		6

-#define MAX_FIREBALL_LOD						4
-
 #define FIREBALL_NUM_LARGE_EXPLOSIONS 2

 extern int fireball_used[MAX_FIREBALL_TYPES];
+extern int Num_fireball_types;

 // all this moved here by Goober5000 because it makes more sense in the H file
 typedef struct fireball_lod {
@@ -51,22 +50,11 @@ typedef struct fireball_lod {
 } fireball_lod;

 typedef struct fireball_info {
-	char				unique_id[NAME_LENGTH];
 	int					lod_count;
-	fireball_lod		lod[MAX_FIREBALL_LOD];
-	float				exp_color[3];	// red, green, blue
-
-	char	warp_glow[NAME_LENGTH];
-	int		warp_glow_bitmap;
-	char	warp_ball[NAME_LENGTH];
-	int		warp_ball_bitmap;
-	char	warp_model[NAME_LENGTH];
-	int		warp_model_id;
+	float				exp_color[3];
+	fireball_lod		lod[4];
 } fireball_info;

-extern fireball_info Fireball_info[MAX_FIREBALL_TYPES];
-extern int Num_fireball_types;
-
 // flag values for fireball struct flags member
 #define	FBF_WARP_CLOSE_SOUND_PLAYED		(1<<0)
 #define	FBF_WARP_CAPITAL_SIZE			(1<<1)
@@ -84,12 +72,8 @@ typedef struct fireball {
 	char	lod;					// current LOD
 	float	time_elapsed;			// in seconds
 	float	total_time;				// total lifetime of animation in seconds
-
-	// for warp-effect - Goober5000
-	gamesnd_id warp_open_sound_index;		
-	gamesnd_id warp_close_sound_index;
-	float	warp_open_duration;
-	float	warp_close_duration;
+	gamesnd_id warp_open_sound_index;		// for warp-effect - Goober5000
+	gamesnd_id warp_close_sound_index;		// for warp-effect - Goober5000
 } fireball;
 // end move

@@ -98,15 +82,10 @@ void fireball_render(object* obj, model_draw_list *scene);
 void fireball_delete( object * obj );
 void fireball_process_post(object * obj, float frame_time);

-// This does not load all the data, just the filenames and such.  Only used by FRED.
-void fireball_parse_tbl();
-
-int fireball_info_lookup(const char *unique_id);
-
 // reversed is for warp_in/out effects
 // Velocity: If not NULL, the fireball will move at a constant velocity.
 // warp_lifetime: If warp_lifetime > 0.0f then makes the explosion loop so it lasts this long.  Only works for warp effect
-int fireball_create(vec3d *pos, int fireball_type, int render_type, int parent_obj, float size, int reversed=0, vec3d *velocity=nullptr, float warp_lifetime=0.0f, int ship_class=-1, matrix *orient=nullptr, int low_res=0, int extra_flags=0, gamesnd_id warp_open_sound=gamesnd_id(), gamesnd_id warp_close_sound=gamesnd_id(), float warp_open_duration=-1.0f, float warp_close_duration=-1.0f);
+int fireball_create(vec3d *pos, int fireball_type, int render_type, int parent_obj, float size, int reversed=0, vec3d *velocity=NULL, float warp_lifetime=0.0f, int ship_class=-1, matrix *orient=NULL, int low_res=0, int extra_flags=0, gamesnd_id warp_open_sound=gamesnd_id(), gamesnd_id warp_close_sound=gamesnd_id());
 void fireball_render_plane(int plane);
 void fireball_close();

@@ -132,7 +111,14 @@ int fireball_ship_explosion_type(ship_info *sip);
 int fireball_asteroid_explosion_type(asteroid_info *aip);

 // returns the intensity of a wormhole
-float fireball_wormhole_intensity( fireball *fb );
+float fireball_wormhole_intensity( object *obj );
+
+// internal function to draw warp grid.
+extern void warpin_render(object *obj, matrix *orient, vec3d *pos, int texture_bitmap_num, float radius, float life_percent, float max_radius, int warp_3d = 0 );
+
+extern void warpin_queue_render(model_draw_list *scene, object *obj, matrix *orient, vec3d *pos, int texture_bitmap_num, float radius, float life_percent, float max_radius, int warp_3d);
+
+extern int Warp_model;

 // Goober5000
 extern int Knossos_warp_ani_used;
@@ -21,6 +21,10 @@
 #include "render/batching.h"
 #include "ship/ship.h"

+extern int Warp_model;
+extern int Warp_glow_bitmap;
+extern int Warp_ball_bitmap;
+
 void warpin_batch_draw_face( int texture, vertex *v1, vertex *v2, vertex *v3 )
 {
 	vec3d norm;
@@ -41,7 +45,7 @@ void warpin_batch_draw_face( int texture, vertex *v1, vertex *v2, vertex *v3 )
 	batching_add_tri(texture, vertlist); // TODO render as emissive
 }

-void warpin_queue_render(model_draw_list *scene, object *obj, matrix *orient, vec3d *pos, int texture_bitmap_num, float radius, float life_percent, float max_radius, bool warp_3d, int warp_glow_bitmap, int warp_ball_bitmap, int warp_model_id)
+void warpin_queue_render(model_draw_list *scene, object *obj, matrix *orient, vec3d *pos, int texture_bitmap_num, float radius, float life_percent, float max_radius, int warp_3d)
 {
 	vec3d center;
 	vec3d vecs[5];
@@ -56,7 +60,7 @@ void warpin_queue_render(model_draw_list *scene, object *obj, matrix *orient, ve

 	verts[1] = verts[2] = verts[3] = verts[4] = verts[0];

-	if (warp_glow_bitmap >= 0) {
+	if (Warp_glow_bitmap >= 0) {
 		float r = radius;
 		bool render_it = true;

@@ -95,12 +99,12 @@ void warpin_queue_render(model_draw_list *scene, object *obj, matrix *orient, ve

 			float alpha = (The_mission.flags[Mission::Mission_Flags::Fullneb]) ? (1.0f - neb2_get_fog_intensity(obj)) : 1.0f;

-			//batch_add_bitmap(warp_glow_bitmap, TMAP_FLAG_TEXTURED | TMAP_HTL_3D_UNLIT, &verts[4], 0, r, alpha);
-			batching_add_bitmap(warp_glow_bitmap, &verts[4], 0, r, alpha);
+			//batch_add_bitmap(Warp_glow_bitmap, TMAP_FLAG_TEXTURED | TMAP_HTL_3D_UNLIT, &verts[4], 0, r, alpha);
+			batching_add_bitmap(Warp_glow_bitmap, &verts[4], 0, r, alpha);
 		}
 	}

-	if ( (warp_model_id >= 0) && (warp_3d || Cmdline_3dwarp) ) {
+	if ( (Warp_model >= 0) && (warp_3d || Cmdline_3dwarp) ) {
 		model_render_params render_info;

 		float scale = radius / 25.0f;
@@ -115,7 +119,7 @@ void warpin_queue_render(model_draw_list *scene, object *obj, matrix *orient, ve
 		render_info.set_detail_level_lock((int)(dist / (radius * 10.0f)));
 		render_info.set_flags(MR_NO_LIGHTING | MR_NORMAL | MR_NO_FOGGING | MR_NO_CULL | MR_NO_BATCH);

-		model_render_queue( &render_info, scene, warp_model_id, orient, pos);
+		model_render_queue( &render_info, scene, Warp_model, orient, pos);
 	} else {
 		float Grid_depth = radius/2.5f;

@@ -167,14 +171,14 @@ void warpin_queue_render(model_draw_list *scene, object *obj, matrix *orient, ve
 		warpin_batch_draw_face( texture_bitmap_num, &verts[0], &verts[3], &verts[4] );
 	}

-	if (warp_ball_bitmap >= 0 && Cmdline_warp_flash) {
+	if (Warp_ball_bitmap > -1 && Cmdline_warp_flash == 1) {
 		flash_ball warp_ball(20, .1f,.25f, &orient->vec.fvec, pos, 4.0f, 0.5f);

 		float adg = (2.0f * life_percent) - 1.0f;
 		float pct = (powf(adg, 4.0f) - powf(adg, 128.0f)) * 4.0f;

 		if (pct > 0.00001f) {
-			warp_ball.render(warp_ball_bitmap, max_radius * pct * 0.5f, adg * adg, adg * adg * 6.0f);
+			warp_ball.render(Warp_ball_bitmap, max_radius * pct * 0.5f, adg * adg, adg * adg * 6.0f);
 		}
 	}
 }
@@ -1101,7 +1101,7 @@ void fs2netd_store_stats()
 	if (Duplicate_login_detected) {
 		Duplicate_login_detected = false;
 		multi_display_chat_msg( XSTR("<Duplicate login detected - stats have been tossed>", 1582), 0, 0 );
-		ml_string( XSTR("<Duplicate login detected - stats have been tossed>", 1582) );
+		ml_string( XSTR("<Duplicate login detected - stats have been tossed>", 1583) );
 		fs2netd_store_stats_results();
 		return;
 	}
@@ -483,7 +483,7 @@ void parse_helptbl(const char *filename)
 					break;
 				case 4: // $end
 				default:
-					UNREACHABLE("This should never happen.\n");
+					Assertion(false, "This should never happen.\n");
 					break;
 				}
 			}		// end while
@@ -404,9 +404,9 @@ int gameseq_process_events()
 	state_reentry--;

 	return gs[gs_current_stack].current_state;
-}
+} 

-int gameseq_get_event_idx(const char* s)
+int gameseq_get_event_idx(char *s)
 {
 	for(int i = 0; i < Num_gs_event_text; i++)
 	{
@@ -418,7 +418,7 @@ int gameseq_get_event_idx(const char* s)
 	return -1;
 }

-int gameseq_get_state_idx(const char* s)
+int gameseq_get_state_idx(char *s)
 {
 	for(int i = 0; i < Num_gs_state_text; i++)
 	{
@@ -197,8 +197,8 @@ void game_do_state(int current_state);
 bool GameState_Stack_Valid();

 //WMC
-int gameseq_get_event_idx(const char* s);
-int gameseq_get_state_idx(const char* s);
+int gameseq_get_event_idx(char *s);
+int gameseq_get_state_idx(char *s);

 //zookeeper
 int gameseq_get_state_idx(int state);
@@ -19,7 +19,7 @@

 SCP_vector<game_snd>	Snds;
 SCP_vector<game_snd>	Snds_iface;
-SCP_vector<sound_handle> Snds_iface_handle;
+SCP_vector<int>			Snds_iface_handle;

 // jg18 - default priorities and limits for retail gameplay sounds
 static const int NUM_RETAIL_GAMEPLAY_SOUNDS = 192; // indices 0-191, from retail sounds.tbl
@@ -260,7 +260,7 @@ void gamesnd_add_retail_default_enhanced_sound_data()

 void gamesnd_play_iface(interface_snd_id n)
 {
-	if (Snds_iface_handle[n.value()].isValid())
+	if (Snds_iface_handle[n.value()] >= 0)
 		snd_stop(Snds_iface_handle[n.value()]);

 	Snds_iface_handle[n.value()] = snd_play(gamesnd_get_interface_sound(n));
@@ -565,9 +565,9 @@ void gamesnd_unload_gameplay_sounds()
 	Assert( Snds.size() <= INT_MAX );
 	for (SCP_vector<game_snd>::iterator gs = Snds.begin(); gs != Snds.end(); ++gs) {
 		for (auto& entry : gs->sound_entries) {
-			if (entry.id.isValid()) {
+			if (entry.id != -1) {
 				snd_unload(entry.id);
-				entry.id = sound_load_id::invalid();
+				entry.id = -1;
 			}
 		}
 	}
@@ -599,9 +599,9 @@ void gamesnd_unload_interface_sounds()
 	Assert( Snds_iface.size() < INT_MAX );
 	for (SCP_vector<game_snd>::iterator si = Snds_iface.begin(); si != Snds_iface.end(); ++si) {
 		for (auto& entry : si->sound_entries) {
-			if (entry.id.isValid()) {
+			if ( entry.id != -1 ) {
 				snd_unload( entry.id );
-				entry.id     = sound_load_id::invalid();
+				entry.id = -1;
 				entry.id_sig = -1;
 			}
 		}
@@ -617,9 +617,6 @@ void parse_gamesnd_old(game_snd* gs)
 	gs->sound_entries.resize(1);
 	auto& entry = gs->sound_entries.back();

-	// Default pitch is 1.0. This is set here in case we don't have a valid file name
-	gs->pitch_range = util::UniformFloatRange(1.0f);
-
 	stuff_string(entry.filename, F_NAME, MAX_FILENAME_LEN, ",");

 	if (!stricmp(entry.filename, NOX("empty")))
@@ -676,6 +673,9 @@ void parse_gamesnd_old(game_snd* gs)
 		}
 	}

+	// Default pitch is 1.0
+	gs->pitch_range = util::UniformFloatRange(1.0f);
+
 	// check for extra values per Mantis #2408
 	ignore_gray_space();
 	if (stuff_int_optional(&temp, true) == 2)
@@ -840,9 +840,6 @@ void parse_gamesnd_new(game_snd* gs, bool no_create)
 	// New extended format found
 	stuff_string(name, F_NAME, MAX_FILENAME_LEN);

-	// Default pitch is 1.0. This is set here in case we don't have a valid file name
-	gs->pitch_range = util::UniformFloatRange(1.0f);
-
 	if (!stricmp(name, NOX("empty")))
 	{
 		entry->filename[0] = 0;
@@ -917,6 +914,9 @@ void parse_gamesnd_new(game_snd* gs, bool no_create)
 			error_display(1, "Invalid enhanced sound limit: %d\n", temp_limit);
 		}
 	}
+
+	// Default pitch is 1.0
+	gs->pitch_range = util::UniformFloatRange(1.0f);
 }

 void gamesnd_parse_entry(game_snd *gs, bool no_create, SCP_vector<game_snd> *lookupVector)
@@ -1197,7 +1197,7 @@ void parse_sound_table(const char* filename)
 				if (gamesnd_parse_line(&tempSound, "$Name:", &Snds_iface))
 				{
 					Snds_iface.push_back(game_snd(tempSound));
-					Snds_iface_handle.push_back(sound_handle::invalid());
+					Snds_iface_handle.push_back(-1);
 				}
 			}

@@ -1322,7 +1322,7 @@ float gamesnd_get_max_duration(game_snd* gs) {
 	int max_length = 0;

 	for (auto& entry : gs->sound_entries) {
-		if (!entry.id.isValid()) {
+		if (entry.id < 0) {
 			// Lazily load unloaded sound entries when required
 			entry.id = snd_load(&entry, gs->flags);
 		}
@@ -578,7 +578,7 @@ void parse_everything_else(const char *filename)
 					}
 					break;
 				default:
-					UNREACHABLE("MageKing17 made a coding error somewhere, and you should laugh at him (and report this error).\n");
+					Assertion(false, "MageKing17 made a coding error somewhere, and you should laugh at him (and report this error).\n");
 					break;
 				}
 			}
@@ -28,7 +28,7 @@
 #define MISSION_DESC_LENGTH		512

 // from player.h
-#define CALLSIGN_LEN					(MAX_FILENAME_LEN - 4 - 1)		//	shortened from 32 to allow .json to be attached without exceeding MAX_FILENAME_LEN
+#define CALLSIGN_LEN					28		//	shortened from 32 to allow .plr to be attached without exceeding MAX_FILENAME_LEN
 #define SHORT_CALLSIGN_PIXEL_W	80		// max width of short_callsign[] in pixels

 #define MAX_IFFS		10
@@ -103,6 +103,20 @@ typedef struct vec3d {
 	};
 } vec3d;

+/** Compares two vec3ds */
+inline bool operator==(const vec3d &self, const vec3d &other)
+{
+	return (self.xyz.x == other.xyz.x
+		&& self.xyz.y == other.xyz.y
+		&& self.xyz.z == other.xyz.z
+	);
+}
+
+inline bool operator!=(const vec3d &self, const vec3d &other)
+{
+	return !(self == other);
+}
+
 typedef struct vec2d {
 	float x, y;
 } vec2d;
@@ -389,7 +403,7 @@ template <class T> void CAP( T& v, T mn, T mx )
 }

 // faster version of CAP()
-#define CLAMP(x, min, max) do { if ( (x) < (min) ) (x) = (min); else if ((x) > (max)) (x) = (max); } while(false)
+#define CLAMP(x, min, max) do { if ( (x) < (min) ) (x) = (min); else if ((x) > (max)) (x) = (max); } while(0)

 //=========================================================
 // Memory management functions
@@ -81,12 +81,3 @@
 #define CLANG_ANALYZER_NORETURN
 #endif
 #endif
-
-#ifndef NDEBUG
-#define UNREACHABLE(msg, ...)                                                                                          \
-	do {                                                                                                               \
-		os::dialogs::Error(__FILE__, __LINE__, msg, ##__VA_ARGS__);                                                    \
-	} while (false)
-#else
-#define UNREACHABLE(msg, ...) __builtin_unreachable()
-#endif
@@ -63,10 +63,3 @@
 * @brief Specifies that an analyzer should consider this function as no-return
 */
 #define CLANG_ANALYZER_NORETURN
-
-/**
- * @brief Specifies that the code at which point this macro appears at is unreachable
- * @param msg The message to display in debug mode
- * @param ... Format arguments for the message
- */
-#define UNREACHABLE(msg, ...)
@@ -72,12 +72,3 @@
 #endif

 #define CLANG_ANALYZER_NORETURN
-
-#ifndef NDEBUG
-#define UNREACHABLE(msg, ...)                                                                                          \
-	do {                                                                                                               \
-		os::dialogs::Error(__FILE__, __LINE__, msg, ##__VA_ARGS__);                                                    \
-	} while (false)
-#else
-#define UNREACHABLE(msg, ...) __builtin_unreachable()
-#endif
@@ -69,12 +69,3 @@
 #endif

 #define CLANG_ANALYZER_NORETURN
-
-#ifndef NDEBUG
-#define UNREACHABLE(msg, ...)                                                                                          \
-	do {                                                                                                               \
-		os::dialogs::Error(__FILE__, __LINE__, msg, ##__VA_ARGS__);                                                    \
-	} while (false)
-#else
-#define UNREACHABLE(msg, ...) __builtin_unreachable()
-#endif
@@ -74,21 +74,11 @@
 #define SIZE_T_ARG    "%Iu"
 #define PTRDIFF_T_ARG "%Id"

-#define likely(x) (x)
-#define unlikely(x) (x)
+#define likely(x)
+#define unlikely(x)

 #define USED_VARIABLE

 #define FALLTHROUGH

 #define CLANG_ANALYZER_NORETURN
-
-
-#ifndef NDEBUG
-#define UNREACHABLE(msg, ...)                                                                                          \
-	do {                                                                                                               \
-		os::dialogs::Error(__FILE__, __LINE__, msg, ##__VA_ARGS__);                                                    \
-	} while (false)
-#else
-#define UNREACHABLE(msg, ...) __assume(false)
-#endif
@@ -7,9 +7,8 @@
 *
 */

-#include "globalincs/version.h"
 #include "globalincs/pstypes.h"
-#include "graphics/2d.h"
+#include "globalincs/version.h"

 #include "parse/parselo.h"

@@ -131,24 +130,5 @@ bool version::operator!=(const version& other) const {
 	return !(*this == other);
 }

-SCP_string get_version_string()
-{
-	SCP_string str;
-
-	sprintf(str, "FreeSpace 2 Open v%s", FS_VERSION_FULL);
-
-#ifndef NDEBUG
-	str += " Debug";
-#endif
-
-	// Lets get some more info in here
-	switch (gr_screen.mode) {
-	case GR_OPENGL:
-		str += " OpenGL";
-		break;
-	}
-
-	return str;
-}
 }

@@ -85,13 +85,6 @@ bool check_at_least(const version& v);
 */
 SCP_string format_version(const version& v);

-/**
- * @brief
- * @return
- */
-SCP_string get_version_string();
-
 }

-
 #endif
@@ -19,17 +19,17 @@

 #include "cmdline/cmdline.h"
 #include "debugconsole/console.h"
-#include "gamesequence/gamesequence.h" //WMC - for scripting hooks in gr_flip()
+#include "gamesequence/gamesequence.h"	//WMC - for scripting hooks in gr_flip()
 #include "globalincs/systemvars.h"
 #include "graphics/2d.h"
+#include "graphics/matrix.h"
+#include "graphics/light.h"
 #include "graphics/font.h"
 #include "graphics/grbatch.h"
 #include "graphics/grinternal.h"
-#include "graphics/grstub.h"
-#include "graphics/light.h"
-#include "graphics/matrix.h"
 #include "graphics/opengl/gropengl.h"
 #include "graphics/opengl/gropengldraw.h"
+#include "graphics/grstub.h"
 #include "graphics/paths/PathRenderer.h"
 #include "graphics/util/GPUMemoryHeap.h"
 #include "graphics/util/UniformBuffer.h"
@@ -37,10 +37,9 @@
 #include "io/keycontrol.h" // m!m
 #include "io/timer.h"
 #include "osapi/osapi.h"
-#include "parse/parselo.h"
-#include "popup/popup.h"
-#include "render/3d.h"
 #include "scripting/scripting.h"
+#include "parse/parselo.h"
+#include "render/3d.h"
 #include "tracing/tracing.h"
 #include "utils/boost/hash_combine.h"

@@ -2153,7 +2152,8 @@ void gr_set_bitmap(int bitmap_num, int alphablend_mode, int bitblt_mode, float a
 void gr_flip(bool execute_scripting)
 {
 	// m!m avoid running CHA_ONFRAME when the "Quit mission" popup is shown. See mantis 2446 for reference
-	if (execute_scripting && !popup_active()) {
+	if (execute_scripting && !quit_mission_popup_shown)
+	{
 		TRACE_SCOPE(tracing::LuaOnFrame);

 		//WMC - Do conditional hooks. Yippee!
@@ -49,7 +49,6 @@ class movie_material;
 class batched_bitmap_material;
 class nanovg_material;
 class decal_material;
-class interface_material;

 class transform_stack {

@@ -155,15 +154,13 @@ enum shader_type {
 	SDR_TYPE_DEFERRED_LIGHTING,
 	SDR_TYPE_DEFERRED_CLEAR,
 	SDR_TYPE_VIDEO_PROCESS,
-	SDR_TYPE_PASSTHROUGH_RENDER, //!< Shader for doing the old style fixed-function rendering. Only used internally, use
-	                             //!< SDR_TYPE_DEFAULT_MATERIAL.
+	SDR_TYPE_PASSTHROUGH_RENDER, //!< Shader for doing the old style fixed-function rendering. Only used internally, use SDR_TYPE_DEFAULT_MATERIAL.
 	SDR_TYPE_SHIELD_DECAL,
 	SDR_TYPE_BATCHED_BITMAP,
 	SDR_TYPE_DEFAULT_MATERIAL,
 	SDR_TYPE_NANOVG,
 	SDR_TYPE_DECAL,
 	SDR_TYPE_SCENE_FOG,
-	SDR_TYPE_ROCKET_UI,
 	NUM_SHADER_TYPES
 };

@@ -189,7 +186,7 @@ enum shader_type {
 #define SDR_FLAG_MODEL_HDR			(1<<18)
 #define SDR_FLAG_MODEL_AMBIENT_MAP	(1<<19)
 #define SDR_FLAG_MODEL_NORMAL_ALPHA	(1<<20)
-#define SDR_FLAG_MODEL_THICK_OUTLINES (1<<21) // Renders the model geometry as an outline with configurable line width
+#define SDR_FLAG_MODEL_NORMAL_EXTRUDE (1<<21)

 #define SDR_FLAG_PARTICLE_POINT_GEN			(1<<0)

@@ -779,12 +776,10 @@ typedef struct screen {
 	void (*gf_render_primitives)(material* material_info, primitive_type prim_type, vertex_layout* layout, int offset, int n_verts, int buffer_handle, size_t buffer_offset);
 	void (*gf_render_primitives_particle)(particle_material* material_info, primitive_type prim_type, vertex_layout* layout, int offset, int n_verts, int buffer_handle);
 	void (*gf_render_primitives_distortion)(distortion_material* material_info, primitive_type prim_type, vertex_layout* layout, int offset, int n_verts, int buffer_handle);
-	void (*gf_render_movie)(movie_material* material_info, primitive_type prim_type, vertex_layout* layout, int n_verts, int buffer, size_t buffer_offset);
+	void (*gf_render_movie)(movie_material* material_info, primitive_type prim_type, vertex_layout* layout, int n_verts, int buffer);
 	void (*gf_render_primitives_batched)(batched_bitmap_material* material_info, primitive_type prim_type, vertex_layout* layout, int offset, int n_verts, int buffer_handle);
 	void (*gf_render_nanovg)(nanovg_material* material_info, primitive_type prim_type, vertex_layout* layout, int offset, int n_verts, int buffer_handle);
 	void (*gf_render_decals)(decal_material* material_info, primitive_type prim_type, vertex_layout* layout, int num_elements, const indexed_vertex_source& buffers);
-	void (*gf_render_rocket_primitives)(interface_material* material_info, primitive_type prim_type,
-	                                    vertex_layout* layout, int n_indices, int vertex_buffer, int index_buffer);

 	bool (*gf_is_capable)(gr_capability capability);
 	bool (*gf_get_property)(gr_property property, void* destination);
@@ -947,67 +942,67 @@ void gr_shield_icon(coord2d coords[6], const int resize_mode = GR_RESIZE_FULL);


 // Here be the bitmap functions
-#define gr_bm_free_data				GR_CALL(gr_screen.gf_bm_free_data)
-#define gr_bm_create				GR_CALL(gr_screen.gf_bm_create)
-#define gr_bm_init					GR_CALL(gr_screen.gf_bm_init)
-#define gr_bm_page_in_start			GR_CALL(gr_screen.gf_bm_page_in_start)
-#define gr_bm_data					GR_CALL(gr_screen.gf_bm_data)
+#define gr_bm_free_data				GR_CALL(*gr_screen.gf_bm_free_data)
+#define gr_bm_create				GR_CALL(*gr_screen.gf_bm_create)
+#define gr_bm_init					GR_CALL(*gr_screen.gf_bm_init)
+#define gr_bm_page_in_start			GR_CALL(*gr_screen.gf_bm_page_in_start)
+#define gr_bm_data					GR_CALL(*gr_screen.gf_bm_data)

-#define gr_bm_make_render_target					GR_CALL(gr_screen.gf_bm_make_render_target)
+#define gr_bm_make_render_target					GR_CALL(*gr_screen.gf_bm_make_render_target)

 __inline int gr_bm_set_render_target(int n, int face = -1)
 {
 	return (*gr_screen.gf_bm_set_render_target)(n, face);
 }

-#define gr_set_texture_addressing					 GR_CALL(gr_screen.gf_set_texture_addressing)
+#define gr_set_texture_addressing					 GR_CALL(*gr_screen.gf_set_texture_addressing)

 inline int gr_create_buffer(BufferType type, BufferUsageHint usage)
 {
 	return (*gr_screen.gf_create_buffer)(type, usage);
 }

-#define gr_delete_buffer				GR_CALL(gr_screen.gf_delete_buffer)
-#define gr_update_buffer_data			GR_CALL(gr_screen.gf_update_buffer_data)
-#define gr_update_buffer_data_offset	GR_CALL(gr_screen.gf_update_buffer_data_offset)
-#define gr_update_transform_buffer		GR_CALL(gr_screen.gf_update_transform_buffer)
+#define gr_delete_buffer				GR_CALL(*gr_screen.gf_delete_buffer)
+#define gr_update_buffer_data			GR_CALL(*gr_screen.gf_update_buffer_data)
+#define gr_update_buffer_data_offset	GR_CALL(*gr_screen.gf_update_buffer_data_offset)
+#define gr_update_transform_buffer		GR_CALL(*gr_screen.gf_update_transform_buffer)

-#define gr_scene_texture_begin			GR_CALL(gr_screen.gf_scene_texture_begin)
-#define gr_scene_texture_end			GR_CALL(gr_screen.gf_scene_texture_end)
-#define gr_copy_effect_texture			GR_CALL(gr_screen.gf_copy_effect_texture)
+#define gr_scene_texture_begin			GR_CALL(*gr_screen.gf_scene_texture_begin)
+#define gr_scene_texture_end			GR_CALL(*gr_screen.gf_scene_texture_end)
+#define gr_copy_effect_texture			GR_CALL(*gr_screen.gf_copy_effect_texture)

-#define gr_post_process_set_effect		GR_CALL(gr_screen.gf_post_process_set_effect)
-#define gr_post_process_set_defaults	GR_CALL(gr_screen.gf_post_process_set_defaults)
-#define gr_post_process_begin			GR_CALL(gr_screen.gf_post_process_begin)
-#define gr_post_process_end				GR_CALL(gr_screen.gf_post_process_end)
-#define gr_post_process_save_zbuffer	GR_CALL(gr_screen.gf_post_process_save_zbuffer)
+#define gr_post_process_set_effect		GR_CALL(*gr_screen.gf_post_process_set_effect)
+#define gr_post_process_set_defaults	GR_CALL(*gr_screen.gf_post_process_set_defaults)
+#define gr_post_process_begin			GR_CALL(*gr_screen.gf_post_process_begin)
+#define gr_post_process_end				GR_CALL(*gr_screen.gf_post_process_end)
+#define gr_post_process_save_zbuffer	GR_CALL(*gr_screen.gf_post_process_save_zbuffer)
 inline void gr_post_process_restore_zbuffer() {
 	gr_screen.gf_post_process_restore_zbuffer();
 }

-#define gr_deferred_lighting_begin		GR_CALL(gr_screen.gf_deferred_lighting_begin)
-#define gr_deferred_lighting_end		GR_CALL(gr_screen.gf_deferred_lighting_end)
-#define gr_deferred_lighting_finish		GR_CALL(gr_screen.gf_deferred_lighting_finish)
+#define gr_deferred_lighting_begin		GR_CALL(*gr_screen.gf_deferred_lighting_begin)
+#define gr_deferred_lighting_end		GR_CALL(*gr_screen.gf_deferred_lighting_end)
+#define gr_deferred_lighting_finish		GR_CALL(*gr_screen.gf_deferred_lighting_finish)

-#define	gr_zbias						GR_CALL(gr_screen.gf_zbias)
-#define	gr_set_fill_mode				GR_CALL(gr_screen.gf_set_fill_mode)
+#define	gr_zbias						GR_CALL(*gr_screen.gf_zbias)
+#define	gr_set_fill_mode				GR_CALL(*gr_screen.gf_set_fill_mode)

-#define gr_set_line_width				GR_CALL(gr_screen.gf_set_line_width)
+#define gr_set_line_width				GR_CALL(*gr_screen.gf_set_line_width)

-#define gr_sphere						GR_CALL(gr_screen.gf_sphere)
+#define gr_sphere						GR_CALL(*gr_screen.gf_sphere)

-#define gr_maybe_create_shader			GR_CALL(gr_screen.gf_maybe_create_shader)
-#define gr_recompile_all_shaders		GR_CALL(gr_screen.gf_recompile_all_shaders)
-#define gr_set_animated_effect			GR_CALL(gr_screen.gf_set_animated_effect)
+#define gr_maybe_create_shader			GR_CALL(*gr_screen.gf_maybe_create_shader)
+#define gr_recompile_all_shaders		GR_CALL(*gr_screen.gf_recompile_all_shaders)
+#define gr_set_animated_effect			GR_CALL(*gr_screen.gf_set_animated_effect)

-#define gr_clear_states					GR_CALL(gr_screen.gf_clear_states)
+#define gr_clear_states					GR_CALL(*gr_screen.gf_clear_states)

-#define gr_update_texture				GR_CALL(gr_screen.gf_update_texture)
-#define gr_get_bitmap_from_texture		GR_CALL(gr_screen.gf_get_bitmap_from_texture)
+#define gr_update_texture				GR_CALL(*gr_screen.gf_update_texture)
+#define gr_get_bitmap_from_texture		GR_CALL(*gr_screen.gf_get_bitmap_from_texture)

-#define gr_shadow_map_start				GR_CALL(gr_screen.gf_shadow_map_start)
-#define gr_shadow_map_end				GR_CALL(gr_screen.gf_shadow_map_end)
-#define gr_render_shield_impact			GR_CALL(gr_screen.gf_render_shield_impact)
+#define gr_shadow_map_start				GR_CALL(*gr_screen.gf_shadow_map_start)
+#define gr_shadow_map_end				GR_CALL(*gr_screen.gf_shadow_map_end)
+#define gr_render_shield_impact			GR_CALL(*gr_screen.gf_render_shield_impact)

 __inline void gr_render_primitives(material* material_info, primitive_type prim_type, vertex_layout* layout, int vert_offset, int n_verts, int buffer_handle = -1, size_t buffer_offset = 0)
 {
@@ -1034,9 +1029,9 @@ __inline void gr_render_primitives_distortion(distortion_material* material_info
 	(*gr_screen.gf_render_primitives_distortion)(material_info, prim_type, layout, offset, n_verts, buffer_handle);
 }

-inline void gr_render_movie(movie_material* material_info, primitive_type prim_type, vertex_layout* layout, int n_verts, int buffer, size_t buffer_offset = 0)
+inline void gr_render_movie(movie_material* material_info, primitive_type prim_type, vertex_layout* layout, int n_verts, int buffer)
 {
-	(*gr_screen.gf_render_movie)(material_info, prim_type, layout, n_verts, buffer, buffer_offset);
+	(*gr_screen.gf_render_movie)(material_info, prim_type, layout, n_verts, buffer);
 }

 __inline void gr_render_model(model_material* material_info, indexed_vertex_source *vert_source, vertex_buffer* bufferp, size_t texi)
@@ -1044,12 +1039,6 @@ __inline void gr_render_model(model_material* material_info, indexed_vertex_sour
 	(*gr_screen.gf_render_model)(material_info, vert_source, bufferp, texi);
 }

-__inline void gr_render_rocket_primitives(interface_material* material_info, primitive_type prim_type,
-                                          vertex_layout* layout, int n_indices, int vertex_buffer, int index_buffer)
-{
-	(*gr_screen.gf_render_rocket_primitives)(material_info, prim_type, layout, n_indices, vertex_buffer, index_buffer);
-}
-
 __inline bool gr_is_capable(gr_capability capability)
 {
 	return (*gr_screen.gf_is_capable)(capability);
@@ -158,28 +158,32 @@ int generic_anim_stream(generic_anim *ga, const bool cache)
 {
 	CFILE *img_cfp = NULL;
 	int anim_fps = 0;
+	char full_path[MAX_PATH];
+	size_t size = 0, offset = 0;
+	const void* file_data = nullptr;
 	const int NUM_TYPES = 3;
 	const ubyte type_list[NUM_TYPES] = {BM_TYPE_EFF, BM_TYPE_ANI, BM_TYPE_PNG};
 	const char *ext_list[NUM_TYPES] = {".eff", ".ani", ".png"};
+	int rval = -1;
 	int bpp;

 	ga->type = BM_TYPE_NONE;

-	auto res = cf_find_file_location_ext(ga->filename, NUM_TYPES, ext_list, CF_TYPE_ANY, false);
+	rval = cf_find_file_location_ext(ga->filename, NUM_TYPES, ext_list, CF_TYPE_ANY, sizeof(full_path) - 1, full_path, &size, &offset, 0, &file_data);

 	// could not be found, or is invalid for some reason
-	if ( !res.found )
+	if ( (rval < 0) || (rval >= NUM_TYPES) )
 		return -1;

 	//make sure we can open it
-	img_cfp = cfopen_special(res.full_name.c_str(), "rb", res.size, res.offset, res.data_ptr, CF_TYPE_ANY);
+	img_cfp = cfopen_special(full_path, "rb", size, offset, file_data, CF_TYPE_ANY);

 	if (img_cfp == NULL) {
 		return -1;
 	}

-	strcat_s(ga->filename, ext_list[res.extension_index]);
-	ga->type = type_list[res.extension_index];
+	strcat_s(ga->filename, ext_list[rval]);
+	ga->type = type_list[rval];
 	//seek to the end
 	cfseek(img_cfp, 0, CF_SEEK_END);

@@ -335,7 +335,7 @@ void gr_stub_render_primitives_distortion(distortion_material*  /*material_info*
 {

 }
-void gr_stub_render_movie(movie_material*  /*material_info*/, primitive_type  /*prim_type*/, vertex_layout*  /*layout*/, int  /*n_verts*/, int  /*buffer*/, size_t /*buffer_offset*/)
+void gr_stub_render_movie(movie_material*  /*material_info*/, primitive_type  /*prim_type*/, vertex_layout*  /*layout*/, int  /*n_verts*/, int  /*buffer*/)
 {
 }

@@ -351,12 +351,6 @@ void gr_stub_render_primitives_batched(batched_bitmap_material*  /*material_info
 {
 }

-void gr_stub_render_rocket_primitives(interface_material* /*material_info*/, primitive_type /*prim_type*/,
-                                      vertex_layout* /*layout*/, int /*n_indices*/, int /*vertex_buffer*/,
-                                      int /*index_buffer*/)
-{
-}
-
 bool gr_stub_is_capable(gr_capability  /*capability*/)
 {
 	return false;
@@ -517,7 +511,6 @@ bool gr_stub_init()
 	gr_screen.gf_render_movie = gr_stub_render_movie;
 	gr_screen.gf_render_nanovg = gr_stub_render_nanovg;
 	gr_screen.gf_render_primitives_batched = gr_stub_render_primitives_batched;
-	gr_screen.gf_render_rocket_primitives     = gr_stub_render_rocket_primitives;

 	gr_screen.gf_is_capable = gr_stub_is_capable;
 	gr_screen.gf_get_property = [](gr_property,void*) { return false; };
@@ -55,18 +55,7 @@ void line_draw_list::add_vertex(int x, int y, int resize_mode, const color* colo
 	vtx.position.x = i2fl(x);
 	vtx.position.y = i2fl(y);

-	float w_scale = 1.0f;
-	float h_scale = 1.0f;
-
-	bool do_resize = gr_resize_screen_posf(&vtx.position.x, &vtx.position.y, &w_scale, &h_scale, resize_mode);
-
-	int offset_x = ((do_resize) ? gr_screen.offset_x_unscaled : gr_screen.offset_x);
-	int offset_y = ((do_resize) ? gr_screen.offset_y_unscaled : gr_screen.offset_y);
-
-	// m!m - This is silly but there is no better solution at the moment...
-	vtx.position.x += i2fl(offset_x) * w_scale;
-	vtx.position.y += i2fl(offset_y) * h_scale;
-
+	gr_resize_screen_posf(&vtx.position.x, &vtx.position.y, nullptr, nullptr, resize_mode);
 	vtx.color.xyzw.x = color->red / 255.f;
 	vtx.color.xyzw.y = color->green / 255.f;
 	vtx.color.xyzw.z = color->blue / 255.f;
@@ -123,18 +123,6 @@ void material_set_distortion(distortion_material *mat_info, int texture, bool th
 	mat_info->set_cull_mode(false);
 	mat_info->set_color(1.0f, 1.0f, 1.0f, 1.0f);
 }
-void material_set_rocket_interface(interface_material* mat_info, int texture, const vec2d& offset)
-{
-	mat_info->set_texture_map(TM_BASE_TYPE, texture);
-	mat_info->set_offset(offset);
-
-	mat_info->set_cull_mode(false);
-	mat_info->set_color(1.0f, 1.0f, 1.0f, 1.0f);
-
-	mat_info->set_depth_mode(ZBUFFER_TYPE_NONE);
-
-	mat_info->set_blend_mode(ALPHA_BLEND_ALPHA_BLEND_ALPHA);
-}

 void material_set_movie(movie_material* mat_info, int y_bm, int u_bm, int v_bm) {
 	mat_info->set_depth_mode(ZBUFFER_TYPE_NONE);
@@ -647,6 +635,27 @@ float model_material::get_normal_alpha_max() const
 	return Normal_alpha_max;
 }

+void model_material::set_normal_extrude(float width)
+{
+	Normal_extrude = true;
+	Normal_extrude_width = width;
+}
+
+void model_material::set_normal_extrude()
+{
+	Normal_extrude = false;
+}
+
+bool model_material::is_normal_extrude_active() const
+{
+	return Normal_extrude;
+}
+
+float model_material::get_normal_extrude_width() const
+{
+	return Normal_extrude_width;
+}
+
 void model_material::set_fog(int r, int g, int b, float _near, float _far)
 {
 	Fog_params.enabled = true;
@@ -672,16 +681,6 @@ const model_material::fog& model_material::get_fog() const
 	return Fog_params;
 }

-void model_material::set_outline_thickness(float thickness) {
-	Outline_thickness = thickness;
-}
-float model_material::get_outline_thickness() const {
-	return Outline_thickness;
-}
-bool model_material::uses_thick_outlines() const {
-	return Outline_thickness > 0.0f;
-}
-
 uint model_material::get_shader_flags() const
 {
 	uint Shader_flags = 0;
@@ -769,8 +768,8 @@ uint model_material::get_shader_flags() const
 		Shader_flags |= SDR_FLAG_MODEL_NORMAL_ALPHA;
 	}

-	if ( uses_thick_outlines() ) {
-		Shader_flags |= SDR_FLAG_MODEL_THICK_OUTLINES;
+	if ( Normal_extrude ) {
+		Shader_flags |= SDR_FLAG_MODEL_NORMAL_EXTRUDE;
 	}

 	return Shader_flags;
@@ -902,13 +901,3 @@ uint decal_material::get_shader_flags() const {

 	return flags;
 }
-
-interface_material::interface_material()
-{
-	set_shader_type(SDR_TYPE_ROCKET_UI);
-
-	offset.x = 0;
-	offset.y = 0;
-}
-void interface_material::set_offset(const vec2d& new_offset) { this->offset = new_offset; }
-vec2d interface_material::get_offset() { return offset; }
@@ -200,10 +200,10 @@ class model_material : public material
 	float Normal_alpha_min = 0.0f;
 	float Normal_alpha_max = 1.0f;

+	bool Normal_extrude = false;
+	float Normal_extrude_width = -1.0f;
+
 	fog Fog_params;
-
-	float Outline_thickness = -1.0f;
-
 public:
 	model_material();

@@ -246,9 +246,10 @@ public:
 	float get_normal_alpha_min() const;
 	float get_normal_alpha_max() const;

-	void set_outline_thickness(float thickness = -1.0f);
-	float get_outline_thickness() const;
-	bool uses_thick_outlines() const;
+	void set_normal_extrude(float width);
+	void set_normal_extrude();
+	bool is_normal_extrude_active() const;
+	float get_normal_extrude_width() const;

 	void set_batching(bool enabled);
 	bool is_batched() const;
@@ -315,8 +316,9 @@ class movie_material : public material {
 	void setVtex(int _Vtex);
 };

-class batched_bitmap_material : public material {
-  public:
+class batched_bitmap_material : public material
+{
+ public:
 	batched_bitmap_material();
 };

@@ -325,29 +327,19 @@ class nanovg_material : public material {
 	nanovg_material();
 };

-class decal_material : public material {
-  public:
+class decal_material : public material
+{
+ public:
 	decal_material();

 	uint get_shader_flags() const override;
 };

-class interface_material : public material {
-	vec2d offset;
-
-  public:
-	interface_material();
-
-	void set_offset(const vec2d& new_offset);
-	vec2d get_offset();
-};
-
 gr_alpha_blend material_determine_blend_mode(int base_bitmap, bool is_transparent);

 gr_zbuffer_type material_determine_depth_mode(bool depth_testing, bool is_transparent);

 void material_set_interface(material* mat_info, int texture, bool blended, float alpha);
-void material_set_rocket_interface(interface_material* mat_info, int texture, const vec2d& offset);
 void material_set_unlit(material* mat_info, int texture, float alpha, bool blending, bool depth_testing);
 void material_set_unlit_emissive(material* mat_info, int texture, float alpha, float color_scale);
 void material_set_unlit_color(material* mat_info, int texture, color *clr, bool blending, bool depth_testing);
@@ -137,7 +137,7 @@ GLenum get_gl_shader_stage(opengl::ShaderStage stage) {
 		case opengl::STAGE_FRAGMENT:
 			return GL_FRAGMENT_SHADER;
 		default:
-			UNREACHABLE("Unhandled shader type found!");
+			Assertion(false, "Unhandled shader type found!");
 			return GL_NONE;
 	}
 }
@@ -29,7 +29,6 @@
 #include "math/floating.h"
 #include "model/model.h"
 #include "nebula/neb.h"
-#include "libs/renderdoc/renderdoc.h"
 #include "osapi/osapi.h"
 #include "osapi/osregistry.h"
 #include "render/3d.h"
@@ -91,8 +90,7 @@ static GLenum GL_read_format = GL_BGRA;

 GLuint GL_vao = 0;

-SCP_string GL_implementation_id;
-SCP_vector<GLint> GL_binary_formats;
+bool GL_workaround_clipping_planes = false;

 static std::unique_ptr<os::OpenGLContext> GL_context = nullptr;

@@ -1174,7 +1172,6 @@ void opengl_setup_function_pointers()
 	gr_screen.gf_render_movie = gr_opengl_render_movie;
 	gr_screen.gf_render_nanovg = gr_opengl_render_nanovg;
 	gr_screen.gf_render_decals = gr_opengl_render_decals;
-	gr_screen.gf_render_rocket_primitives     = gr_opengl_render_rocket_primitives;

 	gr_screen.gf_is_capable = gr_opengl_is_capable;
 	gr_screen.gf_get_property = gr_opengl_get_property;
@@ -1368,6 +1365,19 @@ static void init_extensions() {
 	}
 }

+static void opengl_do_workaround_checks() {
+	auto vendor = glGetString(GL_VENDOR);
+
+	if (strstr((const char*) vendor, "NVIDIA")) {
+		// Nvidia has some weird issues with clipping planes. Check #1579 for more information.
+		GL_workaround_clipping_planes = true;
+		mprintf(("  Applying clipping plane workaround for NVIDIA hardware.\n"));
+	} else {
+		// Assume everone else has proper support for this
+		GL_workaround_clipping_planes = false;
+	}
+}
+
 bool gr_opengl_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps)
 {
 	if (GL_initted) {
@@ -1380,9 +1390,6 @@ bool gr_opengl_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps)
 		  gr_screen.max_h,
 		  gr_screen.bits_per_pixel ));

-	// Load the RenderDoc API if available before doing anything with OpenGL
-	renderdoc::loadApi();
-
 	graphic_operations = std::move(graphicsOps);

 	if ( opengl_init_display_device() ) {
@@ -1439,20 +1446,7 @@ bool gr_opengl_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps)
 	mprintf(( "  OpenGL Version   : %s\n", glGetString(GL_VERSION) ));
 	mprintf(( "\n" ));

-	// Build a string identifier for this OpenGL implementation
-	GL_implementation_id.clear();
-	GL_implementation_id += reinterpret_cast<const char*>(glGetString(GL_VENDOR));
-	GL_implementation_id += "\n";
-	GL_implementation_id += reinterpret_cast<const char*>(glGetString(GL_RENDERER));
-	GL_implementation_id += "\n";
-	GL_implementation_id += reinterpret_cast<const char*>(glGetString(GL_VERSION));
-	GL_implementation_id += "\n";
-	GL_implementation_id += reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
-
-	GLint formats = 0;
-	glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &formats);
-	GL_binary_formats.resize(formats);
-	glGetIntegerv(GL_PROGRAM_BINARY_FORMATS, GL_binary_formats.data());
+	opengl_do_workaround_checks();

 	if (Cmdline_fullscreen_window || Cmdline_window) {
 		opengl_go_windowed();
@@ -58,7 +58,6 @@ extern GLuint GL_vao;

 extern float GL_alpha_threshold;

-extern SCP_string GL_implementation_id;
-extern SCP_vector<GLint> GL_binary_formats;
+extern bool GL_workaround_clipping_planes; //!< If set then clipping planes can not be used for batched model rendering

 #endif
@@ -188,9 +188,6 @@ void gr_opengl_deferred_lighting_finish()
 				light_data->lightDir.xyz.x = view_dir.xyzw.x;
 				light_data->lightDir.xyz.y = view_dir.xyzw.y;
 				light_data->lightDir.xyz.z = view_dir.xyzw.z;
-
-				vm_vec_scale(&light_data->specLightColor, static_light_factor);
-
 				first_directional = false;
 				break;
 			case Light_Type::Cone:
@@ -202,9 +199,6 @@ void gr_opengl_deferred_lighting_finish()
 			case Light_Type::Point:
 				light_data->diffuseLightColor = diffuse;
 				light_data->specLightColor = spec;
-
-				vm_vec_scale(&light_data->specLightColor, static_point_factor);
-
 				light_data->lightRadius = MAX(l.rada, l.radb) * 1.25f;
 				light_data->scale.xyz.x = MAX(l.rada, l.radb) * 1.28f;
 				light_data->scale.xyz.y = MAX(l.rada, l.radb) * 1.28f;
@@ -223,15 +217,10 @@ void gr_opengl_deferred_lighting_finish()
 				light_data->scale.xyz.y = l.radb * 1.53f;
 				light_data->scale.xyz.z = length;

-				vm_vec_scale(&light_data->specLightColor, static_tube_factor);
-
 				// Tube lights consist of two different types of lights with almost the same properties
 				light_data = uniformAligner.addTypedElement<deferred_light_data>();
 				light_data->diffuseLightColor = diffuse;
 				light_data->specLightColor = spec;
-
-				vm_vec_scale(&light_data->specLightColor, static_tube_factor);
-
 				light_data->lightRadius = l.radb * 1.5f;
 				light_data->lightType = LT_POINT;

@@ -786,16 +786,18 @@ void gr_opengl_render_primitives_distortion(distortion_material* material_info,
 	GL_CHECK_FOR_ERRORS("start of gr_opengl_render_primitives_distortion()");
 }

-void gr_opengl_render_movie(movie_material* material_info, primitive_type prim_type, vertex_layout* layout, int n_verts,
-                            int buffer, size_t buffer_offset)
-{
+void gr_opengl_render_movie(movie_material* material_info,
+							primitive_type prim_type,
+							vertex_layout* layout,
+							int n_verts,
+							int buffer) {
 	GR_DEBUG_SCOPE("Render movie frame");

 	gr_set_2d_matrix();

 	opengl_tnl_set_material_movie(material_info);

-	opengl_render_primitives(prim_type, layout, n_verts, buffer, 0, buffer_offset);
+	opengl_render_primitives(prim_type, layout, n_verts, buffer, 0, 0);

 	gr_end_2d_matrix();
 }
@@ -825,22 +827,6 @@ void gr_opengl_render_primitives_batched(batched_bitmap_material* material_info,

 	opengl_render_primitives(prim_type, layout, n_verts, buffer_handle, offset, 0);
 }
-void gr_opengl_render_rocket_primitives(interface_material* material_info, primitive_type prim_type,
-                                        vertex_layout* layout, int n_indices, int vertex_buffer, int index_buffer)
-{
-	GR_DEBUG_SCOPE("Render rocket ui primitives");
-
-	gr_set_2d_matrix();
-
-	opengl_tnl_set_rocketui_material(material_info);
-
-	opengl_bind_vertex_layout(*layout, opengl_buffer_get_id(GL_ARRAY_BUFFER, vertex_buffer),
-	                          opengl_buffer_get_id(GL_ELEMENT_ARRAY_BUFFER, index_buffer));
-
-	glDrawElements(opengl_primitive_type(prim_type), n_indices, GL_UNSIGNED_INT, nullptr);
-
-	gr_end_2d_matrix();
-}

 void opengl_draw_textured_quad(GLfloat x1,
 							   GLfloat y1,
@@ -55,11 +55,9 @@ void gr_opengl_render_primitives(material* material_info, primitive_type prim_ty
 void gr_opengl_render_primitives_particle(particle_material* material_info, primitive_type prim_type, vertex_layout* layout, int offset, int n_verts, int buffer_handle);
 void gr_opengl_render_primitives_batched(batched_bitmap_material* material_info, primitive_type prim_type, vertex_layout* layout, int offset, int n_verts, int buffer_handle);
 void gr_opengl_render_primitives_distortion(distortion_material* material_info, primitive_type prim_type, vertex_layout* layout, int offset, int n_verts, int buffer_handle);
-void gr_opengl_render_movie(movie_material* material_info, primitive_type prim_type, vertex_layout* layout, int n_verts, int buffer, size_t buffer_offset);
+void gr_opengl_render_movie(movie_material* material_info, primitive_type prim_type, vertex_layout* layout, int n_verts, int buffer);
 void gr_opengl_render_nanovg(nanovg_material* material_info, primitive_type prim_type, vertex_layout* layout, int offset, int n_verts, int buffer_handle);
 void gr_opengl_render_decals(decal_material* material_info, primitive_type prim_type, vertex_layout* layout, int num_elements, const indexed_vertex_source& binding);
-void gr_opengl_render_rocket_primitives(interface_material* material_info, primitive_type prim_type,
-                                        vertex_layout* layout, int n_indices, int vertex_buffer, int index_buffer);

 void opengl_draw_textured_quad(GLfloat x1, GLfloat y1, GLfloat u1, GLfloat v1,
 							   GLfloat x2, GLfloat y2, GLfloat u2, GLfloat v2 );
@@ -73,6 +73,9 @@ static GLuint Bloom_framebuffer = 0;
 static GLuint Bloom_textures[2] = { 0 };

 static GLuint Post_framebuffer_id[2] = { 0 };
+static GLuint Post_shadow_framebuffer_id = 0;
+static GLuint Post_shadow_texture_id = 0;
+static GLuint Post_shadow_depth_texture_id = 0;

 static int Post_texture_width = 0;
 static int Post_texture_height = 0;
@@ -861,6 +864,76 @@ void opengl_setup_bloom_textures()
 	GL_state.BindFrameBuffer(0);
 }

+static bool opengl_init_shadow_framebuffer(int size, GLenum color_format) {
+	mprintf(("Trying to create %dx%d %d-bit shadow framebuffer\n", size, size, color_format == GL_RGBA32F ? 32 : 16));
+
+	glGenFramebuffers(1, &Post_shadow_framebuffer_id);
+	GL_state.BindFrameBuffer(Post_shadow_framebuffer_id);
+
+	glGenTextures(1, &Post_shadow_texture_id);
+
+	GL_state.Texture.SetActiveUnit(0);
+	GL_state.Texture.SetTarget(GL_TEXTURE_2D_ARRAY);
+	GL_state.Texture.Enable(Post_shadow_texture_id);
+
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+	glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, color_format, size, size, 4, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+
+	glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, Post_shadow_texture_id, 0);
+
+	glGenTextures(1, &Post_shadow_depth_texture_id);
+
+	GL_state.Texture.Enable(Post_shadow_depth_texture_id);
+
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+	glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH_COMPONENT32, size, size, 4, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
+
+	glFramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, Post_shadow_depth_texture_id, 0);
+
+	auto status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+	if (status == GL_FRAMEBUFFER_COMPLETE) {
+		// Everything is fine
+		mprintf(("Shadow framebuffer created successfully.\n"));
+		return true;
+	}
+
+	// Clean up resources
+	glDeleteTextures(1, &Post_shadow_texture_id);
+	glDeleteTextures(1, &Post_shadow_depth_texture_id);
+	glDeleteFramebuffers(1, &Post_shadow_framebuffer_id);
+
+	Post_shadow_texture_id = 0;
+	Post_shadow_depth_texture_id = 0;
+	Post_shadow_framebuffer_id = 0;
+
+	const char* error;
+	switch (status) {
+	case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+		error = "Incomplete framebuffer attachment";
+		break;
+	case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+		error = "Framebuffer is missing an attachment";
+		break;
+	case GL_FRAMEBUFFER_UNSUPPORTED:
+		error = "Framebuffer configuration is unsupported";
+		break;
+	default:
+		error = "Unknown framebuffer status";
+		break;
+	}
+
+	mprintf(("Failed to create framebuffer: %s\n", error));
+	return false;
+}
+
 // generate and test the framebuffer and textures that we are going to use
 static bool opengl_post_init_framebuffer()
 {
@@ -880,6 +953,17 @@ static bool opengl_post_init_framebuffer()

 	opengl_setup_bloom_textures();

+	if ( Cmdline_shadow_quality ) {
+		int size = (Cmdline_shadow_quality == 2 ? 1024 : 512);
+
+		if (!opengl_init_shadow_framebuffer(size, GL_RGBA32F)) {
+			if (!opengl_init_shadow_framebuffer(size, GL_RGBA16F)) {
+				mprintf(("Failed to create either 32 or 16-bit color shadow framebuffer. Disabling shadow support.\n"));
+				Cmdline_shadow_quality = 0;
+			}
+		}
+	}
+
 	GL_state.BindFrameBuffer(0);

 	rval = true;
@@ -50,7 +50,7 @@ void gr_opengl_query_value(int obj, QueryType type) {
 			glQueryCounter(slot.name, GL_TIMESTAMP);
 			break;
 		default:
-			UNREACHABLE("Unhandled enum value!");
+			Assertion(false, "Unhandled enum value!");
 			break;
 	}
 }
@@ -8,7 +8,6 @@
 */


-#include "cfile/cfile.h"
 #include "cmdline/cmdline.h"
 #include "def_files/def_files.h"
 #include "graphics/2d.h"
@@ -64,7 +63,6 @@ opengl_uniform_block_binding GL_uniform_blocks[] = {
 * Static lookup reference for shader uniforms
 * When adding a new shader, list all associated uniforms and attributes here
 */
-// clang-format off
 static opengl_shader_type_t GL_shader_types[] = {
 	{ SDR_TYPE_MODEL, "main-v.sdr", "main-f.sdr", "main-g.sdr",
 		{ opengl_vert_attrib::POSITION, opengl_vert_attrib::TEXCOORD, opengl_vert_attrib::NORMAL, opengl_vert_attrib::TANGENT, opengl_vert_attrib::MODEL_ID }, "Model Rendering" },
@@ -101,7 +99,7 @@ static opengl_shader_type_t GL_shader_types[] = {

 	{ SDR_TYPE_DEFERRED_LIGHTING, "deferred-v.sdr", "deferred-f.sdr", 0,
 		{ opengl_vert_attrib::POSITION }, "Deferred Lighting" },
-
+	
 	{ SDR_TYPE_DEFERRED_CLEAR, "deferred-clear-v.sdr", "deferred-clear-f.sdr", 0,
 		{ opengl_vert_attrib::POSITION }, "Clear Deferred Lighting Buffer" },

@@ -128,11 +126,7 @@ static opengl_shader_type_t GL_shader_types[] = {

 	{ SDR_TYPE_SCENE_FOG, "post-v.sdr", "fog-f.sdr", nullptr,
 		{ opengl_vert_attrib::POSITION, opengl_vert_attrib::TEXCOORD }, "Scene fogging" },
-
-	{ SDR_TYPE_ROCKET_UI, "rocketui-v.sdr",	"rocketui-f.sdr", nullptr,
-		{ opengl_vert_attrib::POSITION, opengl_vert_attrib::COLOR, opengl_vert_attrib::TEXCOORD }, "libRocket UI" },
 };
-// clang-format on

 /**
 * Static lookup reference for shader variant uniforms
@@ -219,9 +213,9 @@ static opengl_shader_variant_t GL_shader_variants[] = {
 		{ },
 		"Normal Alpha" },

-	{ SDR_TYPE_MODEL, true, SDR_FLAG_MODEL_THICK_OUTLINES, "FLAG_THICK_OUTLINE",
+	{ SDR_TYPE_MODEL, false, SDR_FLAG_MODEL_NORMAL_EXTRUDE, "FLAG_NORMAL_EXTRUDE",
 		{ },
-		"Thick outlines" },
+		"Normal Extrusion" },

 	{ SDR_TYPE_EFFECT_PARTICLE, true, SDR_FLAG_PARTICLE_POINT_GEN, "FLAG_EFFECT_GEOMETRY", 
 		{ opengl_vert_attrib::UVEC },
@@ -343,18 +337,17 @@ void opengl_shader_shutdown()
 	GL_shader.clear();
 }

-static SCP_string opengl_shader_get_header(shader_type type_id, int flags, bool has_geo_shader) {
+static SCP_string opengl_shader_get_header(shader_type type_id, int flags) {
 	SCP_stringstream sflags;

 	sflags << "#version " << GLSL_version << " core\n";

-	if (Detail.lighting < 3) {
-		sflags << "#define FLAG_LIGHT_MODEL_BLINN_PHONG\n";
+	if (GL_workaround_clipping_planes) {
+		sflags << "#define WORKAROUND_CLIPPING_PLANES\n";
 	}

-	if (has_geo_shader) {
-		// If there is a geometry shader then we define a special preprocessor symbol to make writing shaders easier
-		sflags << "#define HAS_GEOMETRY_SHADER\n";
+	if (Detail.lighting < 3) {
+		sflags << "#define FLAG_LIGHT_MODEL_BLINN_PHONG\n";
 	}

 	if (type_id == SDR_TYPE_POST_PROCESS_MAIN || type_id == SDR_TYPE_POST_PROCESS_LIGHTSHAFTS || type_id == SDR_TYPE_POST_PROCESS_FXAA) {
@@ -483,9 +476,9 @@ static SCP_string handle_includes(const char* filename, const SCP_string& origin
 	return output.str();
 }

-static SCP_vector<SCP_string> opengl_get_shader_content(shader_type type_id, const char* filename, int flags, bool has_geo_shader) {
+static SCP_vector<SCP_string> opengl_get_shader_content(shader_type type_id, const char* filename, int flags, shader_stage) {
 	SCP_vector<SCP_string> parts;
-	parts.push_back(opengl_shader_get_header(type_id, flags, has_geo_shader));
+	parts.push_back(opengl_shader_get_header(type_id, flags));

 	parts.push_back(handle_includes(filename, opengl_load_shader(filename)));

@@ -512,9 +505,6 @@ static SCP_string get_shader_hash(const SCP_vector<SCP_string>& vert,
 		md5.update(reinterpret_cast<const char*>(&i), sizeof(i));
 	}

-	md5.update(GL_implementation_id.data(),
-	           (MD5::size_type)GL_implementation_id.size() * sizeof(SCP_string::value_type));
-
 	md5.finalize();

 	return md5.hexdigest();
@@ -542,8 +532,7 @@ static bool load_cached_shader_binary(opengl::ShaderProgram* program, const SCP_
 	auto metadata = base_filename + ".json";
 	auto binary = base_filename + ".bin";

-	auto metadata_fp = cfopen(metadata.c_str(), "rb", CFILE_NORMAL, CF_TYPE_CACHE, false,
-	                          CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);
+	auto metadata_fp = cfopen(metadata.c_str(), "rb", CFILE_NORMAL, CF_TYPE_CACHE);
 	if (!metadata_fp) {
 		nprintf(("ShaderCache", "Metadata file does not exist.\n"));
 		return false;
@@ -570,22 +559,7 @@ static bool load_cached_shader_binary(opengl::ShaderProgram* program, const SCP_
 	auto binary_format = (GLenum) format;
 	json_decref(metadata_root);

-	bool supported = false;
-	for (auto supported_fmt : GL_binary_formats) {
-		if ((GLenum)supported_fmt == binary_format) {
-			supported = true;
-			break;
-		}
-	}
-
-	if (!supported) {
-		// This can happen in case an implementation stops supporting a particular binary format
-		nprintf(("ShaderCache", "Unsupported binary format %d encountered in shader cache.\n", binary_format));
-		return false;
-	}
-
-	auto binary_fp = cfopen(binary.c_str(), "rb", CFILE_NORMAL, CF_TYPE_CACHE, false,
-	                        CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);
+	auto binary_fp = cfopen(binary.c_str(), "rb", CFILE_NORMAL, CF_TYPE_CACHE);
 	if (!binary_fp) {
 		nprintf(("ShaderCache", "Binary file does not exist.\n"));
 		return false;
@@ -648,8 +622,7 @@ static void cache_program_binary(GLuint program, const SCP_string& hash) {
 	auto metadata_name = base_filename + ".json";
 	auto binary_name = base_filename + ".bin";

-	auto metadata_fp = cfopen(metadata_name.c_str(), "wb", CFILE_NORMAL, CF_TYPE_CACHE, false,
-	                          CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);
+	auto metadata_fp = cfopen(metadata_name.c_str(), "wb", CFILE_NORMAL, CF_TYPE_CACHE);
 	if (!metadata_fp) {
 		mprintf(("Could not open shader cache metadata file!\n"));
 		return;
@@ -664,8 +637,7 @@ static void cache_program_binary(GLuint program, const SCP_string& hash) {
 	cfclose(metadata_fp);
 	json_decref(metadata);

-	auto binary_fp = cfopen(binary_name.c_str(), "wb", CFILE_NORMAL, CF_TYPE_CACHE, false,
-	                        CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);
+	auto binary_fp = cfopen(binary_name.c_str(), "wb", CFILE_NORMAL, CF_TYPE_CACHE);
 	if (!binary_fp) {
 		mprintf(("Could not open shader cache binary file!\n"));
 		return;
@@ -718,13 +690,13 @@ void opengl_compile_shader_actual(shader_type sdr, const uint &flags, opengl_sha
 		}
 	}

-	auto vert_content = opengl_get_shader_content(sdr_info->type_id, sdr_info->vert, flags, use_geo_sdr);
-	auto frag_content = opengl_get_shader_content(sdr_info->type_id, sdr_info->frag, flags, use_geo_sdr);
+	auto vert_content = opengl_get_shader_content(sdr_info->type_id, sdr_info->vert, flags, SDR_STAGE_VERTEX);
+	auto frag_content = opengl_get_shader_content(sdr_info->type_id, sdr_info->frag, flags, SDR_STAGE_FRAGMENT);
 	SCP_vector<SCP_string> geom_content;

 	if (use_geo_sdr) {
 		// read geometry shader
-		geom_content = opengl_get_shader_content(sdr_info->type_id, sdr_info->geo, flags, use_geo_sdr);
+		geom_content = opengl_get_shader_content(sdr_info->type_id, sdr_info->geo, flags, SDR_STAGE_GEOMETRY);
 	}

 	auto shader_hash = get_shader_hash(vert_content, geom_content, frag_content);
@@ -863,62 +835,6 @@ void gr_opengl_recompile_all_shaders(const std::function<void(size_t, size_t)>&
 	}
 }

-static void opengl_purge_shader_cache_type(const char* ext) {
-
-	SCP_string filter("*.");
-	filter += ext;
-
-	// Previously the cache files were stored in the mod directory. Since we have a better system now, those files
-	// should be cleaned out. This is only needed if we have a mod directory since otherwise we would delete the actual
-	// cache files
-	if (Cmdline_mod != nullptr && strlen(Cmdline_mod) > 0) {
-		SCP_vector<SCP_string> cache_files;
-		cf_get_file_list(cache_files, CF_TYPE_CACHE, filter.c_str(), CF_SORT_NONE, nullptr,
-		                 CF_LOCATION_TYPE_PRIMARY_MOD | CF_LOCATION_TYPE_SECONDARY_MODS);
-
-		for (auto& file : cache_files) {
-			cf_delete((file + "." + ext).c_str(), CF_TYPE_CACHE,
-			          CF_LOCATION_TYPE_PRIMARY_MOD | CF_LOCATION_TYPE_SECONDARY_MODS);
-		}
-	}
-
-	SCP_vector<SCP_string> cache_files;
-	SCP_vector<file_list_info> file_info;
-	cf_get_file_list(cache_files, CF_TYPE_CACHE, filter.c_str(), CF_SORT_NONE, &file_info,
-	                 CF_LOCATION_ROOT_USER | CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT);
-
-	Assertion(cache_files.size() == file_info.size(),
-			  "cf_get_file_list returned different sizes for file names and file informations!");
-
-	const auto TIMEOUT = 2.0 * 30.0 * 24.0 * 60.0 * 60.0; // purge timeout in seconds which is ~2 months
-	const SCP_string PREFIX = "ogl_shader-";
-
-	auto now = std::time(nullptr);
-	for (size_t i = 0; i < cache_files.size(); ++i) {
-		auto& name = cache_files[i];
-		auto write_time = file_info[i].write_time;
-
-		if (name.compare(0, PREFIX.size(), PREFIX) != 0) {
-			// Not an OpenGL cache file
-			continue;
-		}
-
-		auto diff = std::difftime(now, write_time);
-
-		if (diff > TIMEOUT) {
-			auto full_name = name + "." + ext;
-
-			cf_delete(full_name.c_str(), CF_TYPE_CACHE);
-		}
-	}
-}
-
-static void opengl_purge_old_shader_cache()
-{
-	opengl_purge_shader_cache_type("json");
-	opengl_purge_shader_cache_type("bin");
-}
-
 /**
 * Initializes the shader system. Creates a 1x1 texture that can be used as a fallback texture when framebuffer support is missing.
 * Also compiles the shaders used for particle rendering.
@@ -943,8 +859,6 @@ void opengl_shader_init()
 	// Reserve 32 shader slots. This should cover most use cases in real life.
 	GL_shader.reserve(32);

-	opengl_purge_old_shader_cache();
-
 	// compile effect shaders
 	gr_opengl_maybe_create_shader(SDR_TYPE_EFFECT_PARTICLE, 0);
 	gr_opengl_maybe_create_shader(SDR_TYPE_EFFECT_PARTICLE, SDR_FLAG_PARTICLE_POINT_GEN);
@@ -106,7 +106,7 @@ static GLenum convertBufferType(BufferType type) {
 		case BufferType::Uniform:
 			return GL_UNIFORM_BUFFER;
 		default:
-			UNREACHABLE("Unhandled enum value!");
+			Assertion(false, "Unhandled enum value!");
 			return GL_INVALID_ENUM;
 	}
 }
@@ -120,7 +120,7 @@ static GLenum convertUsageHint(BufferUsageHint usage) {
 		case BufferUsageHint::Streaming:
 			return GL_STREAM_DRAW;
 		default:
-			UNREACHABLE("Unhandled enum value!");
+			Assertion(false, "Unhandled enum value!");
 			return GL_INVALID_ENUM;
 	}
 }
@@ -144,7 +144,7 @@ static GLenum convertStencilOp(const StencilOperation stencil_op) {
 	case StencilOperation::Invert:
 		return GL_INVERT;
 	default:
-		UNREACHABLE("Unhandled enum value encountered!");
+		Assertion(false, "Unhandled enum value encountered!");
 		return GL_NONE;
 	}
 }
@@ -177,7 +177,7 @@ static GLenum convertComparisionFunction(ComparisionFunction func) {
 		mode = GL_NOTEQUAL;
 		break;
 	default:
-		UNREACHABLE("Unhandled comparision function value!");
+		Assertion(false, "Unhandled comparision function value!");
 		mode = GL_ALWAYS;
 		break;
 	}
@@ -412,92 +412,70 @@ void opengl_destroy_all_buffers()
 	GL_vertex_buffers_in_use = 0;
 }

-static bool opengl_init_shadow_framebuffer(int size, GLenum color_format)
-{
-	mprintf(("Trying to create %dx%d %d-bit shadow framebuffer\n", size, size, color_format == GL_RGBA32F ? 32 : 16));
-
-	glGenFramebuffers(1, &shadow_fbo);
-	GL_state.BindFrameBuffer(shadow_fbo);
-
-	glGenTextures(1, &Shadow_map_depth_texture);
-
-	GL_state.Texture.Enable(Shadow_map_depth_texture);
-
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-	glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH_COMPONENT32, size, size, 4, 0, GL_DEPTH_COMPONENT, GL_FLOAT, nullptr);
-
-	glFramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, Shadow_map_depth_texture, 0);
-
-	glGenTextures(1, &Shadow_map_texture);
-
-	GL_state.Texture.SetActiveUnit(0);
-	GL_state.Texture.SetTarget(GL_TEXTURE_2D_ARRAY);
-	GL_state.Texture.Enable(Shadow_map_texture);
-
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-	glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, color_format, size, size, 4, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr);
-
-	glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, Shadow_map_texture, 0);
-
-	auto status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-	GL_state.BindFrameBuffer(0);
-
-	if (status == GL_FRAMEBUFFER_COMPLETE) {
-		// Everything is fine
-		mprintf(("Shadow framebuffer created successfully.\n"));
-		return true;
-	}
-
-	// Clean up resources
-	glDeleteTextures(1, &Shadow_map_texture);
-	glDeleteTextures(1, &Shadow_map_depth_texture);
-	glDeleteFramebuffers(1, &shadow_fbo);
-
-	Shadow_map_texture       = 0;
-	Shadow_map_depth_texture = 0;
-	shadow_fbo               = 0;
-
-	const char* error;
-	switch (status) {
-	case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
-		error = "Incomplete framebuffer attachment";
-		break;
-	case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
-		error = "Framebuffer is missing an attachment";
-		break;
-	case GL_FRAMEBUFFER_UNSUPPORTED:
-		error = "Framebuffer configuration is unsupported";
-		break;
-	default:
-		error = "Unknown framebuffer status";
-		break;
-	}
-
-	mprintf(("Failed to create framebuffer: %s\n", error));
-	return false;
-}
-
 void opengl_tnl_init()
 {
 	Transform_buffer_handle = opengl_create_texture_buffer_object();

-	if (Cmdline_shadow_quality) {
-		int size = (Cmdline_shadow_quality == 2 ? 1024 : 512);
+	if(Cmdline_shadow_quality)
+	{
+		//Setup shadow map framebuffer
+		glGenFramebuffers(1, &shadow_fbo);
+		GL_state.BindFrameBuffer(shadow_fbo);

-		if (!opengl_init_shadow_framebuffer(size, GL_RGBA32F)) {
-			if (!opengl_init_shadow_framebuffer(size, GL_RGBA16F)) {
-				mprintf(("Failed to create either 32 or 16-bit color shadow framebuffer. Disabling shadow support.\n"));
-				Cmdline_shadow_quality = 0;
-			}
-		}
+		glGenTextures(1, &Shadow_map_depth_texture);
+
+		GL_state.Texture.SetActiveUnit(0);
+		GL_state.Texture.SetTarget(GL_TEXTURE_2D_ARRAY);
+		GL_state.Texture.Enable(Shadow_map_depth_texture);
+		opengl_set_object_label(GL_TEXTURE, Shadow_map_depth_texture, "Scene shadow depth map");
+
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+		//glTexParameteri(GL_TEXTURE_2D_ARRAY_EXT, GL_TEXTURE_COMPARE_MODE_ARB, GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT);
+		//glTexParameteri(GL_TEXTURE_2D_ARRAY_EXT, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL);
+		//glTexParameteri(GL_TEXTURE_2D_ARRAY_EXT, GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY);
+		int size = (Cmdline_shadow_quality == 2 ? 1024 : 512);
+		glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_DEPTH_COMPONENT32, size, size, 4, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
+		//glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32, size, size, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
+
+		glFramebufferTexture(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, Shadow_map_depth_texture, 0);
+		//glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, Shadow_map_depth_texture, 0);
+
+		glGenTextures(1, &Shadow_map_texture);
+
+		GL_state.Texture.SetActiveUnit(0);
+		GL_state.Texture.SetTarget(GL_TEXTURE_2D_ARRAY);
+		GL_state.Texture.Enable(Shadow_map_texture);
+		opengl_set_object_label(GL_TEXTURE, Shadow_map_texture, "Scene shadow map");
+
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+// 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+		glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGB32F, size, size, 4, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+		//glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F_ARB, size, size, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+
+		glFramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, Shadow_map_texture, 0);
+		//glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, Shadow_map_texture, 0);
+
+		GL_state.BindFrameBuffer(0);
+
+		opengl_check_for_errors("post_init_framebuffer()");
 	}

 	gr_opengl_deferred_init();
@@ -780,10 +758,18 @@ void opengl_tnl_set_model_material(model_material *material_info)

 	GL_state.Texture.SetShaderMode(GL_TRUE);

-	if (Current_shader->flags & SDR_FLAG_MODEL_CLIP) {
-		GL_state.ClipDistance(0, true);
+	if (GL_workaround_clipping_planes) {
+		if (Current_shader->flags & SDR_FLAG_MODEL_CLIP) {
+			GL_state.ClipDistance(0, true);
+		} else {
+			GL_state.ClipDistance(0, false);
+		}
 	} else {
-		GL_state.ClipDistance(0, false);
+		if (Current_shader->flags & SDR_FLAG_MODEL_CLIP || Current_shader->flags & SDR_FLAG_MODEL_TRANSFORM) {
+			GL_state.ClipDistance(0, true);
+		} else {
+			GL_state.ClipDistance(0, false);
+		}
 	}

 	uint32_t array_index;
@@ -996,7 +982,6 @@ void opengl_tnl_set_material_nanovg(nanovg_material* material_info) {

 	Current_shader->program->Uniforms.setUniformi("nvg_tex", 0);
 }
-
 void opengl_tnl_set_material_decal(decal_material* material_info) {
 	opengl_tnl_set_material(material_info, false);

@@ -1039,34 +1024,6 @@ void opengl_tnl_set_material_decal(decal_material* material_info) {
 	}
 }

-void opengl_tnl_set_rocketui_material(interface_material* material_info)
-{
-	vec3d offset = vmd_zero_vector;
-	offset.xyz.x = material_info->get_offset().x;
-	offset.xyz.y = material_info->get_offset().y;
-
-	matrix4 modelViewMatrix;
-	vm_matrix4_set_transform(&modelViewMatrix, &vmd_identity_matrix, &offset);
-
-	opengl_tnl_set_material(material_info, false);
-
-	Current_shader->program->Uniforms.setUniformMatrix4f("modelViewMatrix", modelViewMatrix);
-	Current_shader->program->Uniforms.setUniformMatrix4f("projMatrix", gr_projection_matrix);
-
-	Current_shader->program->Uniforms.setUniformi("textured", material_info->is_textured() ? GL_TRUE : GL_FALSE);
-	Current_shader->program->Uniforms.setUniformi("baseMap", 0);
-
-	if (material_info->is_textured()) {
-		float u_scale, v_scale;
-		uint32_t array_index;
-		if (!gr_opengl_tcache_set(material_info->get_texture_map(TM_BASE_TYPE), material_info->get_texture_type(),
-		                          &u_scale, &v_scale, &array_index)) {
-			mprintf(("WARNING: Error setting bitmap texture (%i)!\n", material_info->get_texture_map(TM_BASE_TYPE)));
-		}
-		Current_shader->program->Uniforms.setUniformi("baseMapIndex", array_index);
-	}
-}
-
 void gr_opengl_set_viewport(int x, int y, int width, int height) {
 	glViewport(x, y, width, height);
 }