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.
Merge pull request #1670 from asarium/feature/bitmapBlocks
2026-11-07 22:56:30 -10:00 · 2018-06-06 19:55:28 +02:00 · 2018-06-02 12:08:22 +02:00 · 2018-06-01 17:24:04 -04:00 · 2018-05-31 15:52:46 -04:00 · 2018-05-30 10:00:42 +02:00
898 changed files with 85354 additions and 21975 deletions
@@ -0,0 +1,22 @@
+---
+Checks: "-*,\
+modernize-*,\
+-modernize-raw-string-literal,\
+-modernize-use-using,\
+performance-*,\
+-performance-type-promotion-in-math-fn,\
+misc-*,\
+-misc-macro-parentheses,\
+-misc-misplaced-widening-cast,\
+-misc-static-assert,\
+"
+WarningsAsErrors: ''
+HeaderFilterRegex: 'code/.*$|freespace2/.*$|qtfred/.*$|test/src/.*$|build/.*$'
+AnalyzeTemporaryDtors: false
+CheckOptions:
+  - key:          'misc-assert-side-effect.AssertMacros'
+    value:        'assert,Assert,Assertion'
+  - key:          'modernize-use-emplace.ContainersWithPushBack'
+    value:        'std::vector;std::deque;std::list;SCP_vector;SCP_deque;SCP_list'
+...
+
@@ -0,0 +1,21 @@
+
+build:
+  image: teaci/msys$$arch
+  pull: true
+  shell: mingw$$arch
+  commands:
+    - git submodule update --init --recursive
+    - if [ $$arch = 32 ]; then target=i686; fi
+    - if [ $$arch = 64 ]; then target=x86_64; fi
+    - pacman -S --needed --noconfirm --noprogressbar mingw-w64-${target}-pkg-config mingw-w64-${target}-cmake
+    - mkdir build && cd build
+    - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=$$CONFIGURATION -DFSO_USE_SPEECH=OFF -DFSO_USE_VOICEREC=OFF -DFSO_FATAL_WARNINGS=ON -DFSO_BUILD_FRED2=OFF ..
+    - make -j$(nproc) all
+
+matrix:
+  arch:
+    - 64
+    - 32
+  CONFIGURATION:
+    - Debug
+    - Release
@@ -1,33 +1,3 @@
-*.o
-*.a
-.dirstamp
-libtool
-ltmain.sh
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-compile
-.deps/
-code/.deps/
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache/
-config.*
-code/fs2_open_*
-code/wxFRED2_*
-configure
-depcomp
-install-sh
-missing
-.svn
-*.layout
-projects/Xcode/Frameworks/
-
-#========
-
 #OS junk files
 [Tt]humbs.db
 *.DS_Store
@@ -286,3 +256,7 @@ CMakeSettings.json

 # Weird files created by Linux
 .fuse_hidden*
+
+# This gets ignored by one of the rules above for some reason...
+!/code/scripting/lua/LuaConvert.h
+!/code/debugconsole/
@@ -1,6 +1,3 @@
-[submodule "cmake/external/cotire"]
-	path = cmake/external/cotire
-	url = https://github.com/sakra/cotire.git
 [submodule "cmake/external/rpavlik-cmake-modules"]
 	path = cmake/external/rpavlik-cmake-modules
 	url = https://github.com/asarium/cmake-modules.git
@@ -3,7 +3,8 @@ sudo: required
 dist: trusty
 cache:
    directories:
-    - $HOME/cmake
+    - $HOME/cmake-3.8
+    - $HOME/.ccache
 addons:
    apt:
        packages: &global_deps
@@ -16,6 +17,7 @@ addons:
            - libjansson-dev
            - libsdl2-dev
            - valgrind
+            - qt57base
    coverity_scan:
        project:
            name: "scp-fs2open/fs2open.github.com"
@@ -69,19 +71,36 @@ matrix:
              apt:
                  sources:
                      - ubuntu-toolchain-r-test
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
                  packages:
-                      - g++-5
                      - *global_deps
+                      - g++-5
        - os: linux
-          env: CONFIGURATION="Debug" CC=clang-3.6 CXX=clang++-3.6
+          env: CONFIGURATION="Debug" CC=gcc-7 CXX=g++-7
          addons:
              apt:
                  sources:
-                      - llvm-toolchain-precise
+                      - ubuntu-toolchain-r-test
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
                  packages:
-                      - clang-3.6
-                      - libc++-dev
+                      - 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"

@@ -91,19 +110,32 @@ matrix:
              apt:
                  sources:
                      - ubuntu-toolchain-r-test
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
                  packages:
-                      - g++-5
                      - *global_deps
+                      - g++-5
        - os: linux
-          env: CONFIGURATION="Release" CC=clang-3.6 CXX=clang++-3.6
+          env: CONFIGURATION="Release" CC=gcc-7 CXX=g++-7
          addons:
              apt:
                  sources:
-                      - llvm-toolchain-precise
+                      - ubuntu-toolchain-r-test
+                      - sourceline: 'ppa:beineri/opt-qt571-trusty'
                  packages:
-                      - clang-3.6
-                      - libc++-dev
+                      - 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:
@@ -117,8 +149,9 @@ before_install:
    - "./ci/travis/before_install.sh"
 install:
    - "./ci/travis/install.sh"
-    - export PATH=$HOME/cmake/bin:$PATH
+    - 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"
 script:
    - if [ "$BUILD_DEPLOYMENT" = true ] ; then ./ci/travis/release.sh ; else ./ci/travis/script.sh ; fi
@@ -40,6 +40,14 @@ set(CMAKE_CONFIGURATION_TYPES Debug Release FastDebug CACHE STRING "Available co

 PROJECT(FS2_Open)

+find_program(CCACHE_PROGRAM ccache)
+# Currently only GCC support ccache properly without generating additional warnings
+if(CCACHE_PROGRAM AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	message(STATUS "Using ccache for compilation: ${CCACHE_PROGRAM}")
+	set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+	set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}")
+endif()
+
 IF(CMAKE_CROSSCOMPILING)
 	SET(IMPORT_EXE_DIR "IMPORT_EXE_DIR-NOTFOUND" CACHE FILEPATH "Required for a cross compiling build, point to binary directory of a cmake build for the real OS")
 	INCLUDE(${IMPORT_EXE_DIR}/ImportExecutables.cmake)
@@ -53,7 +61,7 @@ endif()
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/finder")
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/rpavlik-cmake-modules")
-LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/cotire/CMake")
+LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/cotire")

 IF(RESET_INSTALL_PREFIX)
 	IF(NOT $ENV{FS2PATH} STREQUAL "")
@@ -85,7 +93,7 @@ OPTION(FSO_BUILD_TESTS "Build unit tests" OFF)

 OPTION(FSO_DEVELOPMENT_MODE "Generate binaries in development mode, only use if you know what you're doing!" OFF)

-OPTION(FSO_BUILD_WXFRED2 "Build wxFRED2 binary" OFF)
+OPTION(FSO_BUILD_QTFRED "Build qtFRED2 binary" OFF)

 IF(WIN32 OR APPLE)
 	# On windows and mac the default should be to always build the included libraries
@@ -108,6 +116,8 @@ SET(FSO_RUN_ARGUMENTS "" CACHE STRING "Additional arguments passed to a generate

 option(FSO_INSTALL_DEBUG_FILES "Install some debug files (currently only PDB files on windows)" OFF)

+option(ENABLE_COTIRE "Enable cotire for faster compilation. Enabled by default." ON)
+
 MARK_AS_ADVANCED(FORCE FSO_CMAKE_DEBUG)
 MARK_AS_ADVANCED(FORCE FSO_BUILD_INCLUDED_LIBS)
 MARK_AS_ADVANCED(FORCE FSO_USE_OPENALSOFT)
@@ -115,6 +125,7 @@ MARK_AS_ADVANCED(FORCE FSO_USE_LUAJIT)
 MARK_AS_ADVANCED(FORCE FSO_DEVELOPMENT_MODE)
 MARK_AS_ADVANCED(FORCE FSO_FATAL_WARNINGS)
 mark_as_advanced(FORCE FSO_INSTALL_DEBUG_FILES)
+mark_as_advanced(FORCE ENABLE_COTIRE)

 # Include cotire file from https://github.com/sakra/cotire/
 include(cotire)
@@ -134,6 +145,8 @@ if(FSO_BUILD_APPIMAGE)
 	include(appimage)
 endif()

+include(clang-tidy)
+
 # This includes source code for some tools, either used in the build or also for something else
 ADD_SUBDIRECTORY(tools)

@@ -147,9 +160,9 @@ IF(FSO_BUILD_FRED2)
 	ADD_SUBDIRECTORY(fred2)
 ENDIF(FSO_BUILD_FRED2)

-IF(FSO_BUILD_WXFRED2)
-	ADD_SUBDIRECTORY(wxfred2)
-ENDIF(FSO_BUILD_WXFRED2)
+IF(FSO_BUILD_QTFRED)
+	ADD_SUBDIRECTORY(qtfred)
+ENDIF()

 if(FSO_BUILD_TESTS)
 	add_subdirectory(test)
@@ -176,12 +189,12 @@ include(doxygen)

 # Print used options to log
 IF (WIN32)
-	message(STATUS "Building FRED2: ${FSO_BUILD_FRED2}")
 	message(STATUS "Using text to speech: ${FSO_USE_SPEECH}")
 	message(STATUS "Using voice recogition: ${FSO_USE_VOICEREC}")
+	message(STATUS "Building FRED2: ${FSO_BUILD_FRED2}")
 elseif(UNIX)
 	message(STATUS "Building AppImage: ${FSO_BUILD_APPIMAGE}")
 ENDIF()
 message(STATUS "Building FSO tools: ${FSO_BUILD_TOOLS}")
-message(STATUS "Building wxFRED: ${FSO_BUILD_WXFRED2}")
+message(STATUS "Building qtFRED: ${FSO_BUILD_QTFRED}")
 message(STATUS "Fatal warnings: ${FSO_FATAL_WARNINGS}")
@@ -1,4 +1,5 @@
 version: 1.0.0.{build}
+image: Visual Studio 2015
 configuration:
  - Debug
  - Release
@@ -6,11 +7,13 @@ clone_depth: 10
 environment:
  matrix:
    - BuildID: 0
-      CMAKE_GENERATOR: Visual Studio 12 2013
-      PlatformToolset: v120_xp
+      CMAKE_GENERATOR: Visual Studio 14 2015
+      PlatformToolset: v140_xp
+      QT_DIR: C:\Qt\5.9.5\msvc2015
    - BuildID: 1
      CMAKE_GENERATOR: Visual Studio 14 2015 Win64
      PlatformToolset: v140_xp
+      QT_DIR: C:\Qt\5.9.5\msvc2015_64
 before_build:
  - git submodule update --init --recursive
 build_script:
@@ -4,6 +4,7 @@ class BuildConfig {
 	[string]$PackageType
 	[string]$Toolset
 	[string]$SimdType
+	[string]$QtDir
 	[Bool]$SourcePackage
 }

@@ -13,6 +14,7 @@ $NightlyConfigurations = @(
 		PackageType="Win64";
 		Toolset="v140_xp";
 		SimdType="SSE2";
+		QtDir="C:\Qt\5.9.5\msvc2015_64";
 		SourcePackage=$false;
 	},
 	[BuildConfig]@{ 
@@ -20,6 +22,7 @@ $NightlyConfigurations = @(
 		PackageType="Win32";
 		Toolset="v140_xp";
 		SimdType="SSE2";
+		QtDir="C:\Qt\5.9.5\msvc2015";
 		SourcePackage=$false;
 	}
 )
@@ -29,6 +32,7 @@ $ReleaseConfigurations = @(
 		PackageType="Win32";
 		Toolset="v140_xp";
 		SimdType="SSE2";
+		QtDir="C:\Qt\5.9.5\msvc2015";
 		SourcePackage=$true;
 	}
 	[BuildConfig]@{
@@ -36,6 +40,7 @@ $ReleaseConfigurations = @(
 		PackageType="Win32-AVX";
 		Toolset="v140_xp";
 		SimdType="AVX";
+		QtDir="C:\Qt\5.9.5\msvc2015";
 		SourcePackage=$false;
 	}
 	[BuildConfig]@{
@@ -43,6 +48,7 @@ $ReleaseConfigurations = @(
 		PackageType="Win64";
 		Toolset="v140_xp";
 		SimdType="SSE2";
+		QtDir="C:\Qt\5.9.5\msvc2015_64";
 		SourcePackage=$false;
 	}
 	[BuildConfig]@{
@@ -50,6 +56,7 @@ $ReleaseConfigurations = @(
 		PackageType="Win64-AVX";
 		Toolset="v140_xp";
 		SimdType="AVX";
+		QtDir="C:\Qt\5.9.5\msvc2015_64";
 		SourcePackage=$false;
 	}
 )
@@ -141,6 +148,7 @@ if ($DeployBuild) {
    Push-AppveyorArtifact "$($PackageName)-builds-$($buildConfig.PackageType).zip"
 } else {
 	cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="ON" -DFSO_BUILD_TESTS="ON" -DMSVC_SIMD_INSTRUCTIONS=SSE2 `
+	-DFSO_BUILD_QTFRED=ON -DQT5_INSTALL_ROOT="$env:QT_DIR" -DFSO_BUILD_FRED2="ON" `
 	-G "$Env:CMAKE_GENERATOR" -T "$Env:PlatformToolset" ..

    cmake --build . --config "$Env:CONFIGURATION" -- /verbosity:minimal
@@ -2,20 +2,7 @@
 if ([System.Convert]::ToBoolean($env:ReleaseBuild) -Or [System.Convert]::ToBoolean($env:NightlyBuild) -Or [System.Convert]::ToBoolean($env:TestBuild)) {
    # Skip tests for deployment
    exit 0
-} else {
-    # Appveyor doesn't have OpenAL so copy our DLLs to the output FOLDER
-    $arch=""
-    if ($Env:CMAKE_GENERATOR -Match "Win64") {
-        $arch="win64"
-    } else {
-        $arch="win32"
-    }
-    $dllPath = "$Env:APPVEYOR_BUILD_FOLDER\lib\openal\libs\$arch\OpenAL32.dll"
-    $copyDestination = "$pwd\bin\$Env:CONFIGURATION\"
-    
-    write "Copying OpenAL DLL..."
-    Copy-Item "$dllPath" "$copyDestination"
-    
+} else {    
    write "Running unit tests..."
    # Run unit tests
    &"$pwd\bin\$Env:CONFIGURATION\unittests.exe" --gtest_shuffle 2>&1
@@ -6,6 +6,11 @@ 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"

@@ -15,7 +20,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then

    export CXXFLAGS
    export CFLAGS
-    CMAKE="cmake -G Ninja -DFSO_FATAL_WARNINGS=ON"
+    CMAKE="cmake -G Ninja -DFSO_FATAL_WARNINGS=ON $CMAKE_OPTIONS"
    if [ "$BUILD_DEPLOYMENT" = true ]; then
        for config in $BUILD_CONFIGS
        do
@@ -27,12 +32,12 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
            cd ..
        done
    else
-        eval $CMAKE -DCMAKE_BUILD_TYPE=$CONFIGURATION -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON ..
+        eval $CMAKE -DCMAKE_BUILD_TYPE=$CONFIGURATION -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFSO_BUILD_QTFRED=ON ..
    fi
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
    if [ "$BUILD_DEPLOYMENT" = true ]; then
        cmake -G "Xcode" -DFSO_FATAL_WARNINGS=ON -DFSO_INSTALL_DEBUG_FILES=ON -DCMAKE_INSTALL_PREFIX="/tmp/release" ..
    else
-        cmake -G "Xcode" ..
+        cmake -G "Xcode" $CMAKE_OPTIONS ..
    fi
 fi
@@ -49,7 +49,7 @@ if ([ "$RELEASE_BUILD" = true ] || [ "$NIGHTLY_BUILD" = true ] || [ "$TEST_BUILD
 fi

 if [ "$BUILD_DEPLOYMENT" = true ]; then
-    if ([ "$TRAVIS_OS_NAME" = "linux" ] && (! [[ "$CC" =~ ^gcc.*$ ]])); then
+    if ([ "$TRAVIS_OS_NAME" = "linux" ] && (! [[ "$CC" =~ ^gcc-5.*$ ]])); then
        echo "Skipping non-release compiler";
        exit 0;
    fi
@@ -0,0 +1,141 @@
+#!/usr/bin/env python
+#
+#===- clang-tidy-diff.py - ClangTidy Diff Checker ------------*- python -*--===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+#===------------------------------------------------------------------------===#
+
+r"""
+ClangTidy Diff Checker
+======================
+
+This script reads input from a unified diff, runs clang-tidy on all changed
+files and outputs clang-tidy warnings in changed lines only. This is useful to
+detect clang-tidy regressions in the lines touched by a specific patch.
+Example usage for git/svn users:
+
+  git diff -U0 HEAD^ | clang-tidy-diff.py -p1
+  svn diff --diff-cmd=diff -x-U0 | \
+      clang-tidy-diff.py -fix -checks=-*,modernize-use-override
+
+"""
+
+import argparse
+import json
+import re
+import subprocess
+import sys
+
+
+def main():
+  parser = argparse.ArgumentParser(description=
+                                   'Run clang-tidy against changed files, and '
+                                   'output diagnostics only for modified '
+                                   'lines.')
+  parser.add_argument('-clang-tidy-binary', metavar='PATH',
+                      default='clang-tidy',
+                      help='path to clang-tidy binary')
+  parser.add_argument('-p', metavar='NUM', default=0,
+                      help='strip the smallest prefix containing P slashes')
+  parser.add_argument('-regex', metavar='PATTERN', default=None,
+                      help='custom pattern selecting file paths to check '
+                      '(case sensitive, overrides -iregex)')
+  parser.add_argument('-iregex', metavar='PATTERN', default=
+                      r'.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hpp|m|mm|inc)',
+                      help='custom pattern selecting file paths to check '
+                      '(case insensitive, overridden by -regex)')
+
+  parser.add_argument('-fix', action='store_true', default=False,
+                      help='apply suggested fixes')
+  parser.add_argument('-checks',
+                      help='checks filter, when not specified, use clang-tidy '
+                      'default',
+                      default='')
+  parser.add_argument('-path', dest='build_path',
+                      help='Path used to read a compile command database.')
+  parser.add_argument('-extra-arg', dest='extra_arg',
+                      action='append', default=[],
+                      help='Additional argument to append to the compiler '
+                      'command line.')
+  parser.add_argument('-extra-arg-before', dest='extra_arg_before',
+                      action='append', default=[],
+                      help='Additional argument to prepend to the compiler '
+                      'command line.')
+  parser.add_argument('-quiet', action='store_true', default=False,
+                      help='Run clang-tidy in quiet mode')
+  clang_tidy_args = []
+  argv = sys.argv[1:]
+  if '--' in argv:
+    clang_tidy_args.extend(argv[argv.index('--'):])
+    argv = argv[:argv.index('--')]
+
+  args = parser.parse_args(argv)
+
+  # Extract changed lines for each file.
+  filename = None
+  lines_by_file = {}
+  for line in sys.stdin:
+    match = re.search('^\+\+\+\ \"?(.*?/){%s}([^ \t\n\"]*)' % args.p, line)
+    if match:
+      filename = match.group(2)
+    if filename == None:
+      continue
+
+    if args.regex is not None:
+      if not re.match('^%s$' % args.regex, filename):
+        continue
+    else:
+      if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
+        continue
+
+    match = re.search('^@@.*\+(\d+)(,(\d+))?', line)
+    if match:
+      start_line = int(match.group(1))
+      line_count = 1
+      if match.group(3):
+        line_count = int(match.group(3))
+      if line_count == 0:
+        continue
+      end_line = start_line + line_count - 1;
+      lines_by_file.setdefault(filename, []).append([start_line, end_line])
+
+  if len(lines_by_file) == 0:
+    print("No relevant changes found.")
+    sys.exit(0)
+
+  line_filter_json = json.dumps(
+    [{"name" : name, "lines" : lines_by_file[name]} for name in lines_by_file],
+    separators = (',', ':'))
+
+  quote = "";
+  if sys.platform == 'win32':
+    line_filter_json=re.sub(r'"', r'"""', line_filter_json)
+  else:
+    quote = "'";
+
+  # Run clang-tidy on files containing changes.
+  command = [args.clang_tidy_binary]
+  command.append('-line-filter=' + quote + line_filter_json + quote)
+  if args.fix:
+    command.append('-fix')
+  if args.checks != '':
+    command.append('-checks=' + quote + args.checks + quote)
+  if args.quiet:
+    command.append('-quiet')
+  if args.build_path is not None:
+    command.append('-p=%s' % args.build_path)
+  command.extend(lines_by_file.keys())
+  for arg in args.extra_arg:
+      command.append('-extra-arg=%s' % arg)
+  for arg in args.extra_arg_before:
+      command.append('-extra-arg-before=%s' % arg)
+  command.extend(clang_tidy_args)
+
+  sys.exit(subprocess.call(' '.join(command), shell=True))
+
+if __name__ == '__main__':
+  main()
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+set -e
+
+if ! git rev-list $TRAVIS_COMMIT_RANGE 2>1 >/dev/null; then
+    echo "\$TRAVIS_COMMIT_RANGE ($TRAVIS_COMMIT_RANGE) is not valid for this build (probably caused by a rebase)."
+    exit 0
+fi
+
+cd "$TRAVIS_BUILD_DIR"
+
+echo "Running clang-tidy on changed files"
+git diff -U0 --no-color $TRAVIS_COMMIT_RANGE | \
+    $TRAVIS_BUILD_DIR/ci/travis/clang-tidy-diff.py -path "$TRAVIS_BUILD_DIR/build" -p1 \
+    -regex 'code/.*$|freespace2/.*$|qtfred/.*$|test/src/.*$|build/.*$|tools/.*' \
+    -clang-tidy-binary /usr/bin/clang-tidy-4.0 2>/dev/null | \
+    tee clang-tidy-output.txt
+
+if [[ -n $(grep "warning: " clang-tidy-output.txt) ]] || [[ -n $(grep "error: " clang-tidy-output.txt) ]]; then
+    echo "Errors or warnings were detected in the clang-tidy output!"
+    exit 1
+else
+    echo -e "\033[1;32m\xE2\x9C\x93 passed:\033[0m clang-tidy test succeeded";
+fi
@@ -26,8 +26,8 @@ if [[ ! "$(curl -V)" == *"sftp"* ]]; then
        cd ..
        dpkg -l | grep curl
        ls -al
-        sudo dpkg -i curl*.deb
        sudo dpkg -i libcurl3*.deb
+        sudo dpkg -i curl*.deb
    elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
        brew install curl --with-libssh2
        export PATH="/usr/local/opt/curl/bin:$PATH"
@@ -4,16 +4,14 @@ set -ex

 FILENAME=
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    if [ ! -d "$HOME/cmake/bin" ]; then
+    if [ ! -d "$HOME/cmake-3.8/bin" ]; then
        # If the cache does not currently contain CMake then download and install it
-        FILENAME=cmake-3.4.3-Linux-x86_64
+    	mkdir -p $HOME/cmake-3.8/

-    	mkdir -p $HOME/cmake/
-
-    	wget -O /tmp/cmake.tar.gz --no-check-certificate https://www.cmake.org/files/v3.4/$FILENAME.tar.gz
-    	tar -xzf /tmp/cmake.tar.gz -C $HOME/cmake/ --strip-components=1
+    	wget -O /tmp/cmake.tar.gz --no-check-certificate https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.tar.gz
+    	tar -xzf /tmp/cmake.tar.gz -C $HOME/cmake-3.8/ --strip-components=1
    fi
-	export PATH=$HOME/cmake/bin:$PATH
+	export PATH=$HOME/cmake-3.8/bin:$PATH
    
    cd $HOME
    
@@ -4,11 +4,6 @@ set -ex
 mkdir -p /tmp/builds

 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    if [ "$RELEASE_BUILD" = true ]; then
-        PARENT_DIR="$(basename $PWD)"
-        (cd .. && tar cvf /tmp/builds/$PACKAGE_NAME-source-Unix.tar.gz --exclude-vcs "$PARENT_DIR")
-    fi
-
 	cd build
    for config in $BUILD_CONFIGS
    do
@@ -5,7 +5,7 @@ set -e
 cd build

 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    ninja all
+    ninja -k 20 all

    valgrind --leak-check=full --error-exitcode=1 --gen-suppressions=all \
        --suppressions="$TRAVIS_BUILD_DIR/ci/travis/valgrind.supp" ./bin/unittests --gtest_shuffle
@@ -1,4 +1,4 @@
 #!/bin/sh
 HERE=$(dirname $(readlink -f "${0}"))
-export LD_LIBRARY_PATH="${HERE}"/lib:$PATH
+export LD_LIBRARY_PATH="${HERE}"/lib:"$LD_LIBRARY_PATH"
 "${HERE}"/bin/$<TARGET_FILE_NAME:Freespace2> $@
@@ -1,6 +1,9 @@

 include(WriteCompilerDetectionHeader)

+set(CMAKE_CXX_STANDARD_REQUIRED 11)
+set(CMAKE_CXX_STANDARD 11)
+
 set(REQUIRED_CXX_FEATURES cxx_rvalue_references cxx_nullptr)

 get_property(CMAKE_CXX_KNOWN_FEATURES GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
@@ -0,0 +1,37 @@
+option(ENABLE_CLANG_TIDY "Enable source code checking using clang-tidy" OFF)
+
+find_program(
+    CLANG_TIDY_EXE
+    NAMES "clang-tidy"
+    DOC "Path to clang-tidy executable"
+)
+
+function(enable_clang_tidy target)
+    # Not enabled in this configuration
+endfunction()
+
+if(NOT ENABLE_CLANG_TIDY)
+    return()
+endif()
+
+if(NOT EXISTS "${CLANG_TIDY_EXE}")
+    message(SEND_ERROR "clang-tidy: Could not find clang-tidy executable (value of variable is \"${CLANG_TIDY_EXE}\".")
+    return()
+endif()
+
+if(CMAKE_VERSION VERSION_LESS "3.6.0")
+    message(SEND_ERROR "Clang-tidy support requires CMake 3.6")
+    return()
+endif()
+
+message(STATUS "clang-tidy: Using \"${CLANG_TIDY_EXE}\"")
+
+function(enable_clang_tidy target)
+    SET(TIDY_OPTIONS "${CLANG_TIDY_EXE}")
+    if(FSO_FATAL_WARNINGS)
+        set(TIDY_OPTIONS "${TIDY_OPTIONS};-warnings-as-errors=*")
+    endif()
+
+    set_target_properties(${target} PROPERTIES CXX_CLANG_TIDY "${TIDY_OPTIONS}")
+endfunction()
+
@@ -27,6 +27,7 @@ int main( int argc, char* argv[] )
 	int SSE     = false;
 	int SSE2    = false;
 	int AVX     = false;
+	int AVX2    = false;

 	int info[4];
 	cpuid(info, 0);
@@ -40,8 +41,14 @@ int main( int argc, char* argv[] )

 		AVX   = (info[2] & ((int)1 << 28)) != 0;
 	}
+	if (nIds >= 7){
+		cpuid(info,0x00000007);
+		AVX2  = (info[1] & ((int)1 <<  5)) != 0;
+	}

-	if(AVX)
+	if (AVX2)
+		std::cout << "AVX2";
+	else if(AVX)
 		std::cout << "AVX";
 	else if(SSE2)
 		std::cout << "SSE2";
@@ -0,0 +1,9 @@
+
+
+#ifndef __FREDRC_H
+#define __FREDRC_H
+
+#define ABOUT_LINE_1 "FRED2_OPEN - FreeSpace Editor, Version @FSO_PRODUCT_VERSION_STRING@ OpenGL"
+#define MAINFRAME_CONTENTS "FRED2_OPEN @FSO_PRODUCT_VERSION_STRING@ - FreeSpace2 Mission Editor\nUntitled\nFRED2\nFreeSpace2 Missions (*.fs2)\n.fs2\nFreeSpace2Mission\nFreeSpace2 Mission"
+
+#endif // __FREDRC_H
@@ -1,5 +1,7 @@

-include(platformChecks)
+
 include(Cxx11)
+include(platformChecks)

 CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/project.h.in ${GENERATED_SOURCE_DIR}/project.h)
+CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/fred_rc.h.in ${GENERATED_SOURCE_DIR}/fred_rc.h)
@@ -15,9 +15,9 @@ CHECK_INCLUDE_FILE_CXX("cxxabi.h" HAVE_CXXAPI_H)

 CHECK_TYPE_SIZE("max_align_t" MAX_ALIGN_T)

-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
    set(CMAKE_REQUIRED_FLAGS "-std=c++11") # required for g++ <= 5
-endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+endif()

 set(CMAKE_EXTRA_INCLUDE_FILES "cstddef")
 CHECK_TYPE_SIZE("std::max_align_t" STD_MAX_ALIGN_T LANGUAGE CXX)
@@ -25,6 +25,9 @@ set(CMAKE_EXTRA_INCLUDE_FILES "type_traits")
 CHECK_TYPE_SIZE("std::is_trivially_copyable<int>" STD_IS_TRIVIALLY_COPYABLE LANGUAGE CXX)
 set(CMAKE_EXTRA_INCLUDE_FILES)

+CHECK_TYPE_SIZE("char32_t" CHAR32_T LANGUAGE CXX)
+CHECK_TYPE_SIZE("U'b'" UNICODE_CHAR_LITERAL LANGUAGE CXX)
+
 set(CMAKE_REQUIRED_FLAGS)


@@ -38,5 +41,8 @@ CHECK_FUNCTION_EXISTS(strlwr HAVE_STRLWR)

 CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)

+check_symbol_exists(snprintf "stdio.h" HAVE_SNPRINTF)
+check_symbol_exists(_snprintf "stdio.h" HAVE__SNPRINTF)
+
 set(PLATFORM_CHECK_HEADER "${GENERATED_SOURCE_DIR}/platformChecks.h")
 CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/platformChecks.h.in "${PLATFORM_CHECK_HEADER}")
@@ -9,6 +9,7 @@
 #cmakedefine HAVE_STD_MAX_ALIGN_T

 #cmakedefine HAVE_STD_IS_TRIVIALLY_COPYABLE
+#cmakedefine HAVE_STD_IS_TRIVIALLY_COPYABLE_ARRAY

 #cmakedefine01 IS_64BIT

@@ -21,4 +22,10 @@

 #cmakedefine01 HAVE_STRINGS_H

+#cmakedefine01 HAVE_CHAR32_T
+#cmakedefine01 HAVE_UNICODE_CHAR_LITERAL
+
+#cmakedefine01 HAVE_SNPRINTF
+#cmakedefine01 HAVE__SNPRINTF
+
 #endif // __PLATFORM_CHECKS_H__
@@ -73,14 +73,12 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wreturn-type")

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

-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-parameter")
-
 check_cxx_compiler_flag(-Wshift-negative-value SUPPORTS_SHIFT_NEGATIVE_VALUE)
 if(SUPPORTS_SHIFT_NEGATIVE_VALUE)
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-shift-negative-value")
 endif()

-set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable")
+set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-parameter")

 set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")

@@ -85,9 +85,7 @@ set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wreturn-type")

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

-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-parameter")
-
-set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered")
+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")

@@ -105,6 +103,7 @@ set(CMAKE_EXE_LINKER_FLAGS "")

 IF (MINGW)
 	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++ -Wl,--enable-auto-import")
+	target_compile_definitions(compiler INTERFACE __USE_MINGW_ANSI_STDIO=1)
 ENDIF(MINGW)

 if (SANITIZE_FLAGS)
@@ -131,4 +130,4 @@ if (FSO_FATAL_WARNINGS)
 endif()

 # Always define this to make sure that the fixed width format macros are available
-target_compile_definitions(compiler INTERFACE __STDC_FORMAT_MACROS)
+target_compile_definitions(compiler INTERFACE __STDC_FORMAT_MACROS=1)
@@ -33,7 +33,9 @@ set(WARNING_FLAGS
 	/wd4311 # Disables warnings about casting pointer types to ints. The funny thing is these warnings can't be resolved, just disabled... - m!m
 	/wd4302 # Same as above - m!m
 	/wd4366 # The result of the unary '&' operator may be unaligned - m!m
+	/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
 )

 target_compile_options(compiler INTERFACE ${WARNING_FLAGS})
@@ -88,7 +90,7 @@ ENDIF(MSVC_USE_RUNTIME_DLL)
 INCLUDE(MSVCMultipleProcessCompile)

 # Visual Studio supports compiling for multiple vector instruction sets
-SET(POSSIBLE_INSTUCTION_SETS "" SSE SSE2 AVX)
+SET(POSSIBLE_INSTUCTION_SETS "" SSE SSE2 AVX AVX2)

 if (NOT DEFINED MSVC_SIMD_INSTRUCTIONS)
 	detect_simd_instructions(MSVC_DETECTED_SIMD_INSTRUCTIONS)
@@ -10,7 +10,7 @@ FUNCTION(ADD_IMPORTED_LIB NAME INCLUDES LIBS)

 	target_link_libraries(${NAME} INTERFACE "${LIBS}")

-	target_include_directories(${NAME} INTERFACE "${INCLUDES}")
+	target_include_directories(${NAME} SYSTEM INTERFACE "${INCLUDES}")
 ENDFUNCTION(ADD_IMPORTED_LIB)

 MACRO(PKG_CONFIG_LIB_RESOLVE NAME OUTVAR)
@@ -141,10 +141,12 @@ macro(set_if_not_defined VAR VALUE)
 endmacro(set_if_not_defined)

 macro(configure_cotire target)
-	# Disable unity build as it doesn't work well for us
-	set_target_properties(${target} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
+	if(ENABLE_COTIRE)
+		# Disable unity build as it doesn't work well for us
+		set_target_properties(${target} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)

-	cotire(${target})
+		cotire(${target})
+	endif()
 endmacro(configure_cotire)

 macro(add_target_copy_files)
@@ -195,3 +197,31 @@ function(suppress_warnings _target)
 		target_compile_options(${_target} PRIVATE "-w")
    endif()
 endfunction(suppress_warnings)
+
+
+function(list_target_dependencies _target _out_var)
+	set(out_list)
+	set(work_libs ${_target})
+	list(LENGTH work_libs libs_length)
+
+	while(libs_length GREATER 0)
+		list(GET work_libs 0 current)
+		list(REMOVE_AT work_libs 0)
+		list(APPEND out_list ${current})
+
+		get_target_property(current_libs ${current} INTERFACE_LINK_LIBRARIES)
+
+		if(current_libs)
+			foreach(lib ${current_libs})
+				if (TARGET ${lib})
+					list(APPEND work_libs ${lib})
+				endif (TARGET ${lib})
+			endforeach(lib)
+		endif(current_libs)
+
+		list(LENGTH work_libs libs_length)
+	endwhile(libs_length GREATER 0)
+
+	list(REMOVE_DUPLICATES out_list)
+	set(${_out_var} ${out_list} PARENT_SCOPE)
+endfunction(list_target_dependencies)
@@ -7,8 +7,8 @@ if (EXISTS "${PROJECT_SOURCE_DIR}/version_override.cmake")
 endif()

 set_if_not_defined(FSO_VERSION_MAJOR 3)
-set_if_not_defined(FSO_VERSION_MINOR 7)
-set_if_not_defined(FSO_VERSION_BUILD 5)
+set_if_not_defined(FSO_VERSION_MINOR 8)
+set_if_not_defined(FSO_VERSION_BUILD 1)

 # A numeric revision e.g. the CI build number
 set_if_not_defined(FSO_VERSION_REVISION 0)
@@ -21,7 +21,7 @@ TARGET_INCLUDE_DIRECTORIES(code PUBLIC ${GENERATED_SOURCE_DIR}/code)

 target_link_libraries(code PUBLIC OpenGL)

-TARGET_LINK_LIBRARIES(code PUBLIC ${OPENAL_LIBS})
+TARGET_LINK_LIBRARIES(code PUBLIC openal)
 TARGET_LINK_LIBRARIES(code PUBLIC ${LUA_LIBS})
 TARGET_LINK_LIBRARIES(code PUBLIC ${PNG_LIBS})
 TARGET_LINK_LIBRARIES(code PUBLIC ${JPEG_LIBS})
@@ -30,11 +30,15 @@ TARGET_LINK_LIBRARIES(code PUBLIC sdl2)

 TARGET_LINK_LIBRARIES(code PUBLIC ffmpeg)

+TARGET_LINK_LIBRARIES(code PUBLIC utfcpp)
+
 TARGET_LINK_LIBRARIES(code PUBLIC platform)
 TARGET_LINK_LIBRARIES(code PUBLIC compiler)

 target_link_libraries(code PUBLIC md5)

+enable_clang_tidy(code)
+
 IF (FSO_USE_SPEECH)
 	find_package(Speech REQUIRED)
 	target_link_libraries(code PUBLIC speech)
@@ -53,13 +57,25 @@ IF(FSO_BUILD_TOOLS)
 	ADD_SUBDIRECTORY(cfileextractor)
 ENDIF(FSO_BUILD_TOOLS)

-set_target_properties(code PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "prefix_header.h")
+if (ENABLE_COTIRE)
+	set_target_properties(code PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${CMAKE_CURRENT_SOURCE_DIR}/prefix_header.h")
+else()
+	if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+		target_compile_options(code PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:-include${CMAKE_CURRENT_SOURCE_DIR}/prefix_header.h>")
+	elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+		target_compile_options(code PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:/FI ${CMAKE_CURRENT_SOURCE_DIR}/prefix_header.h>")
+	elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+		target_compile_options(code PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:-include${CMAKE_CURRENT_SOURCE_DIR}/prefix_header.h>")
+	elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+		target_compile_options(code PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:-include${CMAKE_CURRENT_SOURCE_DIR}/prefix_header.h>")
+	ELSE()
+		MESSAGE("Unknown compiler for global includes. This will probably break the build.")
+	ENDIF()
+endif()

 include(util)
 configure_cotire(code)

-include(../cmake/Cxx11.cmake)
-
 # Ensure that Xcode generates debug symbols on macOS for Debug builds
 set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS[variant=Debug] "YES")
 set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_COPY_PHASE_STRIP[variant=Debug] "NO")
@@ -498,7 +498,8 @@ void parse_ai_profiles_tbl(const char *filename)
 				}

 				// find next valid option
-				skip_to_start_of_string_either("$", "#");
+				if (!skip_to_start_of_string_either("$", "#"))
+					break;
 				saved_Mp = Mp;
 			}
 		}
@@ -714,7 +714,7 @@ extern void maybe_cheat_fire_synaptic(object *objp, ai_info *aip);
 // 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
 //
-void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vec3d *firing_pos, vec3d *enemy_pos, vec3d *enemy_vel)
+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;
@@ -1153,7 +1153,7 @@ void ai_big_chase()
 	}
 }

-void ai_big_ship(object *objp)
+void ai_big_ship(object * /*objp*/)
 {
 	// do nothing
 }
@@ -1228,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
-int ai_big_strafe_maybe_retreat(float dist, 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];
@@ -1704,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(object *pl_objp, int weapon_objnum, int consider_target_only)
+int ai_big_maybe_enter_strafe_mode(object *pl_objp, int weapon_objnum, int  /*consider_target_only*/)
 {
 	ai_info		*aip;
 	ship_info	*sip;
@@ -68,7 +68,7 @@
 #include "weapon/swarm.h"
 #include "weapon/weapon.h"
 #include <map>
-#include <limits.h>
+#include <climits>


 #ifdef _MSC_VER
@@ -1132,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 frametime, 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;
@@ -3453,7 +3453,7 @@ float compute_time_to_enemy(float dist_to_enemy, object *pobjp)
 //	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)
+void fds_aux(float *dot, float *tts, vec3d *pos, float  /*dtime*/, object *objp)
 {
 	vec3d	v2s;

@@ -5234,7 +5234,7 @@ vec3d	G_predicted_pos, G_fire_pos;
 //	Else
 //		Select Any ol' weapon.
 //	Returns primary_bank index.
-int ai_select_primary_weapon_OLD(object *objp, object *other_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;
@@ -6052,7 +6052,7 @@ int check_ok_to_fire(int objnum, int target_objnum, weapon_info *wip)
 //	Fire a secondary weapon.
 //	Maybe choose to fire a different one.
 //	priority1 and priority2 are optional parameters with defaults = -1
-int ai_fire_secondary_weapon(object *objp, int priority1, int priority2)
+int ai_fire_secondary_weapon(object *objp, int  /*priority1*/, int  /*priority2*/)
 {
 	ship_weapon *swp;
 	ship	*shipp;
@@ -6546,7 +6546,7 @@ void ai_chase_ct()
 /**
 * ATTACK submode handler for chase mode.
 */
-void ai_chase_eb(ai_info *aip, ship_info *sip, vec3d *predicted_enemy_pos, float dist_to_enemy)
+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;
@@ -6755,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.
-void get_behind_ship(ai_info *aip, ship_info *sip, float dist_to_enemy)
+void get_behind_ship(ai_info *aip, ship_info *sip, float  /*dist_to_enemy*/)
 {
 	vec3d	new_pos;
 	float	dot;
@@ -10395,6 +10395,7 @@ void ai_get_dock_goal_indexes(object *objp, ai_info *aip, ai_goal *aigp, object
 		case AIS_DOCK_2:
 		case AIS_DOCK_3:
 			Warning(LOCATION, "Normally dock indexes should be calculated for only AIS_DOCK_0 and AIS_UNDOCK_0.  Trace out and debug.");
+			FALLTHROUGH;
 		case AIS_DOCK_0:
 		{
 			// get them from the active goal
@@ -10412,6 +10413,7 @@ void ai_get_dock_goal_indexes(object *objp, ai_info *aip, ai_goal *aigp, object
 		case AIS_UNDOCK_1:
 		case AIS_UNDOCK_2:
 			Warning(LOCATION, "Normally dock indexes should be calculated for only AIS_DOCK_0 and AIS_UNDOCK_0.  Trace out and debug.");
+			FALLTHROUGH;
 		case AIS_UNDOCK_0:
 		{
 			// get them from the guy I'm docked to
@@ -10478,9 +10480,11 @@ void ai_cleanup_dock_mode_subjective(object *objp)
 			case AIS_UNDOCK_0:
 				model_anim_start_type(shipp, TRIGGER_TYPE_DOCKED, docker_index, -1);
 				model_anim_start_type(goal_shipp, TRIGGER_TYPE_DOCKED, dockee_index, -1);
+				FALLTHROUGH;
 			case AIS_UNDOCK_1:
 				model_anim_start_type(shipp, TRIGGER_TYPE_DOCKING_STAGE_3, docker_index, -1);
 				model_anim_start_type(goal_shipp, TRIGGER_TYPE_DOCKING_STAGE_3, dockee_index, -1);
+				FALLTHROUGH;
 			case AIS_UNDOCK_2:
 				model_anim_start_type(shipp, TRIGGER_TYPE_DOCKING_STAGE_2, docker_index, -1);
 				model_anim_start_type(goal_shipp, TRIGGER_TYPE_DOCKING_STAGE_2, dockee_index, -1);
@@ -10490,9 +10494,11 @@ void ai_cleanup_dock_mode_subjective(object *objp)
 			case AIS_DOCK_4A:
 				model_anim_start_type(shipp, TRIGGER_TYPE_DOCKED, docker_index, -1);
 				model_anim_start_type(goal_shipp, TRIGGER_TYPE_DOCKED, dockee_index, -1);
+				FALLTHROUGH;
 			case AIS_DOCK_3:
 				model_anim_start_type(shipp, TRIGGER_TYPE_DOCKING_STAGE_3, docker_index, -1);
 				model_anim_start_type(goal_shipp, TRIGGER_TYPE_DOCKING_STAGE_3, dockee_index, -1);
+				FALLTHROUGH;
 			case AIS_DOCK_2:
 				model_anim_start_type(shipp, TRIGGER_TYPE_DOCKING_STAGE_2, docker_index, -1);
 				model_anim_start_type(goal_shipp, TRIGGER_TYPE_DOCKING_STAGE_2, dockee_index, -1);
@@ -10833,7 +10839,7 @@ void ai_dock()

 				if (aip->submode == AIS_DOCK_3) {
 					// Play a ship docking attach sound
-					snd_play_3d( &Snds[SND_DOCK_ATTACH], &Pl_objp->pos, &View_position );
+					snd_play_3d( gamesnd_get_game_sound(GameSounds::DOCK_ATTACH), &Pl_objp->pos, &View_position );

 					// start the dock animation
 					model_anim_start_type(shipp, TRIGGER_TYPE_DOCKED, docker_index, 1);
@@ -10960,7 +10966,7 @@ void ai_dock()
 		ai_find_path(Pl_objp, OBJ_INDEX(goal_objp), path_num, 0);

 		// Play a ship docking detach sound
-		snd_play_3d( &Snds[SND_DOCK_DETACH], &Pl_objp->pos, &View_position );
+		snd_play_3d( gamesnd_get_game_sound(GameSounds::DOCK_DETACH), &Pl_objp->pos, &View_position );

 		aip->submode = AIS_UNDOCK_1;
 		aip->submode_start_time = Missiontime;
@@ -10980,7 +10986,7 @@ void ai_dock()
 		// play the depart sound, but only once, since this mode is called multiple times per frame
 		if ( !(aigp->flags[AI::Goal_Flags::Depart_sound_played]))
 		{
-			snd_play_3d( &Snds[SND_DOCK_DEPART], &Pl_objp->pos, &View_position );
+			snd_play_3d( gamesnd_get_game_sound(GameSounds::DOCK_DEPART), &Pl_objp->pos, &View_position );
 			aigp->flags.set(AI::Goal_Flags::Depart_sound_played);
 		}

@@ -11379,7 +11385,7 @@ float gwlr_1(object *objp, ai_info *aip)
 /**
 * Compute the largest radius of a ship forming on *objp's wing.
 */
-float gwlr_object_1(object *objp, ai_info *aip)
+float gwlr_object_1(object *objp, ai_info * /*aip*/)
 {
 	float		max_radius;
 	object	*o;
@@ -12185,7 +12191,7 @@ void ai_maybe_launch_cmeasure(object *objp, ai_info *aip)
 }

 //	--------------------------------------------------------------------------
-void ai_preprocess_ignore_objnum(object *objp, ai_info *aip)
+void ai_preprocess_ignore_objnum(object * /*objp*/, ai_info *aip)
 {
 	if (aip->ai_flags[AI::AI_Flags::Temporary_ignore])
 	{
@@ -12376,6 +12382,7 @@ void ai_maybe_evade_locked_missile(object *objp, ai_info *aip)
 				case AIM_DOCK:	//	Ships in dock mode can evade iif they are not currently repairing or docked.
 					if (object_is_docked(objp) || (aip->ai_flags[AI::AI_Flags::Repairing, AI::AI_Flags::Being_repaired]))
 						break;
+					FALLTHROUGH;
 				case AIM_GUARD:
 					//	If in guard mode and far away from guard object, don't pursue guy that hit me.
 					if ((aip->guard_objnum != -1) && (aip->guard_signature == Objects[aip->guard_objnum].signature)) {
@@ -12383,6 +12390,7 @@ void ai_maybe_evade_locked_missile(object *objp, ai_info *aip)
 							return;
 						}
 					}
+					FALLTHROUGH;
 				case AIM_EVADE:
 				case AIM_GET_BEHIND:
 				case AIM_STAY_NEAR:
@@ -13016,7 +13024,7 @@ void ai_execute_behavior(ai_info *aip)
 			ship	*shipp = &Ships[aip->shipnum];
 			ship_info	*sip = &Ship_info[shipp->ship_info_index];

-			if (strnicmp(shipp->ship_name, INSTRUCTOR_SHIP_NAME, strlen(INSTRUCTOR_SHIP_NAME))) {
+			if (strnicmp(shipp->ship_name, INSTRUCTOR_SHIP_NAME, strlen(INSTRUCTOR_SHIP_NAME)) != 0) {
 				if (sip->is_big_or_huge()) {
 					aip->mode = AIM_NONE;
 				} else {
@@ -13433,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.
-int ai_find_shockwave_weapon(object *objp, ai_info *aip)
+int ai_find_shockwave_weapon(object *objp, ai_info * /*aip*/)
 {
 	missile_obj	*mo;
 	float	nearest_dist = 999999.9f;
@@ -13499,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.
-int ai_find_shockwave_ship(object *objp, ai_info *aip)
+int ai_find_shockwave_ship(object *objp, ai_info * /*aip*/)
 {
 	ship_obj	*so;
 	float	nearest_dist = 999999.9f;
@@ -14150,7 +14158,7 @@ void ai_frame(int objnum)
 	}
 }

-void ai_control_info_check( object *obj, ai_info *aip )
+void ai_control_info_check( object * /*obj*/, ai_info *aip )
 {
 	if(aip->ai_override_flags.none_set())
 		return;
@@ -14789,7 +14797,7 @@ int firing_aspect_seeking_bomb(object *objp)
 //	*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 *collide_pos, vec3d *collision_normal)
+void big_ship_collide_recover_start(object *objp, object *big_objp, vec3d * /*collide_pos*/, vec3d *collision_normal)
 {
 	ai_info	*aip;

@@ -14880,7 +14888,7 @@ 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 at point *hitpos.
 */
-void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hitpos, int shield_quadrant, 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;
@@ -15182,7 +15190,7 @@ void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hitpos, int shield_
 // 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)
+void ai_ship_destroy(int shipnum, Ship::Exit_Flags  /*method*/)
 {
 	int		objnum;
 	object	*other_objp;
@@ -15502,7 +15510,7 @@ int ai_return_path_num_from_dockbay(object *dockee_objp, int dockbay_index)
 /**
 * Actually go ahead and fire the synaptics.
 */
-void cheat_fire_synaptic(object *objp, ship *shipp, ai_info *aip)
+void cheat_fire_synaptic(object *objp, ship *shipp, ai_info * /*aip*/)
 {
 	ship_weapon	*swp;
 	swp = &shipp->weapons;
@@ -414,7 +414,7 @@ void ai_goal_purge_invalid_goals( ai_goal *aigp, ai_goal *goal_list, ai_info *ai
 		if ( purge_ai_mode == AI_GOAL_CHASE_SHIP_CLASS ) {
 			// if the target of the purge goal is the same class of ship we are concerned about, then we have a match;
 			// if it is not, then we can continue (see standard ship check below)
-			if ( stricmp(purge_goal->target_name, Ship_info[Ships[ship_index].ship_info_index].name) )
+			if ( stricmp(purge_goal->target_name, Ship_info[Ships[ship_index].ship_info_index].name) != 0 )
 				continue;
 		}
 		// standard goals operating on either wings or ships
@@ -426,7 +426,7 @@ void ai_goal_purge_invalid_goals( ai_goal *aigp, ai_goal *goal_list, ai_info *ai
 			// don't match, we can continue;  if the wing is valid, don't process if the wing numbers
 			// are different.
 			if ( purge_wing == -1 ) {
-				if ( stricmp(purge_goal->target_name, name ) )
+				if ( stricmp(purge_goal->target_name, name ) != 0 )
 					continue;
 			} else if ( purge_wing != wingnum )
 				continue;
@@ -1263,7 +1263,7 @@ void ai_add_wing_goal_sexp(int sexp, int type, int wingnum)
 // this name can be a shipname or a wingname)
 // docker_point and dockee_point are used for the AI_GOAL_DOCK command to tell two ships where to dock
 // immediate means to process this order right away
-void ai_add_goal_ship_internal( ai_info *aip, int goal_type, char *name, int docker_point, int dockee_point, int immediate )
+void ai_add_goal_ship_internal( ai_info *aip, int goal_type, char *name, int  /*docker_point*/, int  /*dockee_point*/, int immediate )
 {
 	int gindex;
 	ai_goal *aigp;
@@ -24,7 +24,7 @@
 #include "weapon/swarm.h"
 #include "weapon/weapon.h"

-#include <limits.h>
+#include <climits>


 // How close a turret has to be point at its target before it
@@ -243,7 +243,7 @@ int bomb_headed_towards_ship(object *bomb_objp, object *ship_objp)
 * @note All non-negative return values are expressed in what I like to call "widx"s.
 * @return -1 if unable to find a weapon for the target at all.
 */
-int turret_select_best_weapon(ship_subsys *turret, object *target)
+int turret_select_best_weapon(ship_subsys *turret, object * /*target*/)
 {
 	//TODO: Fill this out with extraodinary gun-picking algorithms
 	if(turret->weapons.num_primary_banks > 0)
@@ -2048,10 +2048,10 @@ bool turret_fire_weapon(int weapon_num, ship_subsys *turret, int parent_objnum,
 						}
 					}

-					if ( wip->launch_snd != -1 ) {
+					if ( wip->launch_snd.isValid() ) {
 						// Don't play turret firing sound if turret sits on player ship... it gets annoying.
 						if ( parent_objnum != OBJ_INDEX(Player_obj) || (turret->flags[Ship::Subsystem_Flags::Play_sound_for_player]) ) {						
-							snd_play_3d( &Snds[wip->launch_snd], turret_pos, &View_position );						
+							snd_play_3d( gamesnd_get_game_sound(wip->launch_snd), turret_pos, &View_position );
 						}
 					}
 				}
@@ -2135,10 +2135,10 @@ void turret_swarm_fire_from_turret(turret_swarm_info *tsi)
 		}

 		// maybe sound
-		if ( Weapon_info[tsi->weapon_class].launch_snd != -1 ) {
+		if ( Weapon_info[tsi->weapon_class].launch_snd.isValid() ) {
 			// Don't play turret firing sound if turret sits on player ship... it gets annoying.
 			if ( tsi->parent_objnum != OBJ_INDEX(Player_obj) ) {
-				snd_play_3d( &Snds[Weapon_info[tsi->weapon_class].launch_snd], &turret_pos, &View_position );
+				snd_play_3d( gamesnd_get_game_sound(Weapon_info[tsi->weapon_class].launch_snd), &turret_pos, &View_position );
 			}
 		}

@@ -274,9 +274,9 @@ int anim_show_next_frame(anim_instance *instance, float frametime)
 	percent_through = instance->time_elapsed / time;

 	if(instance->direction == ANIM_DIRECT_FORWARD)
-		new_frame_num = instance->start_at - 1 + fl2i(percent_through * n_frames + 0.5f);
+		new_frame_num = instance->start_at - 1 + (int) lround(percent_through * n_frames);
 	else
-		new_frame_num = instance->start_at - 1 - fl2i(percent_through * n_frames + 0.5f);
+		new_frame_num = instance->start_at - 1 - (int) lround(percent_through * n_frames);

 	frame_save = instance->frame_num;

@@ -512,7 +512,14 @@ int unpack_pixel(anim_instance *ai, ubyte *data, ubyte pix, int aabitmap, int bp
 			bit_16 = (ushort)pix;
 			break;
 		case 8:
-			bit_8 = pix;
+			// 8 bit-per-pixel aa bitmaps are a bit special since they only use value in the range [0, 15] where 15 wraps
+			// around back to 0. Since the rest of the code expects the value to be in the range [0, 255] the pixel value
+			// needs to be adjusted here. By muliplying the value with 17 the original range [0, 15] is mapped to [0, 255]
+			if (pix >= 15) {
+				bit_8 = 0;
+			} else {
+				bit_8 = (ubyte)(pix * 17);
+			}
 			break;
 		default:
 			Int3();
@@ -596,7 +603,14 @@ int unpack_pixel_count(anim_instance *ai, ubyte *data, ubyte pix, int count = 0,
 			bit_16 = (ushort)pix;
 			break;
 		case 8 :
-			bit_8 = pix;
+			// 8 bit-per-pixel aa bitmaps are a bit special since they only use value in the range [0, 15] where 15 wraps
+			// around back to 0. Since the rest of the code expects the value to be in the range [0, 255] the pixel value
+			// needs to be adjusted here. By muliplying the value with 17 the original range [0, 15] is mapped to [0, 255]
+			if (pix >= 15) {
+				bit_8 = 0;
+			} else {
+				bit_8 = (ubyte)(pix * 17);
+			}
 			break;
 		default :
 			Int3();			
@@ -76,7 +76,7 @@ float	Asteroid_icon_closeup_zoom;
 /**
 * Force updating of pair stuff for asteroid *objp.
 */
-void asteroid_update_collide(object *objp)
+static void asteroid_update_collide(object *objp)
 {
 	// Asteroid has wrapped, update collide objnum and flags
 	Asteroids[objp->instance].collide_objnum = -1;
@@ -87,7 +87,7 @@ void asteroid_update_collide(object *objp)
 /**
 * Clear out the ::Asteroid_obj_list
 */
-void asteroid_obj_list_init()
+static void asteroid_obj_list_init()
 {
 	int i;

@@ -101,7 +101,7 @@ void asteroid_obj_list_init()
 * Add a node from the Asteroid_obj_list.  
 * Only called from ::weapon_create()
 */
-int asteroid_obj_list_add(int objnum)
+static int asteroid_obj_list_add(int objnum)
 {
 	int index;

@@ -123,7 +123,7 @@ int asteroid_obj_list_add(int objnum)
 * Remove a node from the Asteroid_obj_list.  
 * Only called from ::weapon_delete()
 */
-void asteroid_obj_list_remove(object * obj)
+static void asteroid_obj_list_remove(object * obj)
 {
 	int index = obj->instance;

@@ -138,7 +138,7 @@ void asteroid_obj_list_remove(object * obj)
 /**
 * Prevent speed from getting too huge so it's hard to catch up to an asteroid.
 */
-float asteroid_cap_speed(int asteroid_info_index, float speed)
+static float asteroid_cap_speed(int asteroid_info_index, float speed)
 {
 	float max, double_max;

@@ -164,7 +164,7 @@ float asteroid_cap_speed(int asteroid_info_index, float speed)
 * Sum together the following: 1 inside x, 2 inside y, 4 inside z
 * inside only when sum = 7
 */
-int asteroid_in_inner_bound_with_axes(asteroid_field *asfieldp, vec3d *pos, float delta)
+static int asteroid_in_inner_bound_with_axes(asteroid_field *asfieldp, vec3d *pos, float delta)
 {
 	Assert(asfieldp->has_inner_bound);

@@ -188,7 +188,7 @@ int asteroid_in_inner_bound_with_axes(asteroid_field *asfieldp, vec3d *pos, floa
 * Check if asteroid is within inner bound
 * @return 0 if not inside or no inner bound, 1 if inside inner bound
 */
-int asteroid_in_inner_bound(asteroid_field *asfieldp, vec3d *pos, float delta) {
+static int asteroid_in_inner_bound(asteroid_field *asfieldp, vec3d *pos, float delta) {

 	if (!asfieldp->has_inner_bound) {
 		return 0;
@@ -202,7 +202,7 @@ int asteroid_in_inner_bound(asteroid_field *asfieldp, vec3d *pos, float delta) {
 *
 * Moves to the other side of the inner box a distance delta from edge of box
 */
-void inner_bound_pos_fixup(asteroid_field *asfieldp, vec3d *pos)
+static void inner_bound_pos_fixup(asteroid_field *asfieldp, vec3d *pos)
 {
 	if (!asteroid_in_inner_bound(asfieldp, pos, 0)) {
 		return;
@@ -446,7 +446,7 @@ void asteroid_sub_create(object *parent_objp, int asteroid_type, vec3d *relvec)
 /**
 * Load in an asteroid model
 */
-void asteroid_load(int asteroid_info_index, int asteroid_subtype)
+static void asteroid_load(int asteroid_info_index, int asteroid_subtype)
 {
 	int i;
 	asteroid_info	*asip;
@@ -487,26 +487,12 @@ void asteroid_load(int asteroid_info_index, int asteroid_subtype)
 	}
 }

-/**
- * Randomly choose a debris model within the current group
- */
-int get_debris_from_same_group(int index) {
-	int group_base, group_offset;
-
-	group_base = (index / NUM_DEBRIS_SIZES) * NUM_DEBRIS_SIZES;
-	group_offset = index - group_base;
-
-	// group base + offset
-	// offset is formed by adding 1 or 2 (since 3 in model group) and mapping back in the 0-2 range
-	return group_base + ((group_offset + rand()%(NUM_DEBRIS_SIZES-1) + 1) % NUM_DEBRIS_SIZES);
-}
-
 /**
 * Returns a weight that depends on asteroid size.
 *
 * The weight is then used to determine the frequencty of different sizes of ship debris
 */
-int get_debris_weight(int ship_debris_index)
+static int get_debris_weight(int ship_debris_index)
 {
 	int size = ship_debris_index % NUM_DEBRIS_SIZES;
 	switch (size)
@@ -626,7 +612,7 @@ void asteroid_create_all()
 }

 /**
- * Init asteriod system for the level, called from ::game_level_init()
+ * Init asteroid system for the level, called from ::game_level_init()
 */
 void asteroid_level_init()
 {
@@ -645,7 +631,7 @@ void asteroid_level_init()
 *
 * @return !0 if asteroid should be wrapped, 0 otherwise.  
 */
-int asteroid_should_wrap(object *objp, asteroid_field *asfieldp)
+static int asteroid_should_wrap(object *objp, asteroid_field *asfieldp)
 {
 	if ( MULTIPLAYER_CLIENT )
 		return 0;
@@ -690,7 +676,7 @@ int asteroid_should_wrap(object *objp, asteroid_field *asfieldp)
 /**
 * Wrap an asteroid from one end of the asteroid field to the other
 */
-void asteroid_wrap_pos(object *objp, asteroid_field *asfieldp)
+static void asteroid_wrap_pos(object *objp, asteroid_field *asfieldp)
 {
 	if (objp->pos.xyz.x < asfieldp->min_bound.xyz.x) {
 		objp->pos.xyz.x = asfieldp->max_bound.xyz.x + (objp->pos.xyz.x - asfieldp->min_bound.xyz.x);
@@ -727,7 +713,7 @@ void asteroid_wrap_pos(object *objp, asteroid_field *asfieldp)
 *
 * @return !0 if this asteroid is a target for any ship, otherwise return 0
 */
-int asteroid_is_targeted(object *objp)
+static int asteroid_is_targeted(object *objp)
 {
 	ship_obj	*so;
 	object	*ship_objp;
@@ -748,7 +734,7 @@ int asteroid_is_targeted(object *objp)
 /**
 * Create an asteroid that will hit object *objp in delta_time seconds
 */
-void asteroid_aim_at_target(object *objp, object *asteroid_objp, float delta_time)
+static void asteroid_aim_at_target(object *objp, object *asteroid_objp, float delta_time)
 {
 	vec3d	predicted_center_pos;
 	vec3d	rand_vec;
@@ -776,7 +762,7 @@ void asteroid_aim_at_target(object *objp, object *asteroid_objp, float delta_tim
 *
 * @param count asteroids already targeted on
 */
-void maybe_throw_asteroid(int count)
+static void maybe_throw_asteroid(int count)
 {
 	if (!timestamp_elapsed(Next_asteroid_throw)) {
 		return;
@@ -850,7 +836,7 @@ void asteroid_delete( object * obj )
 * See if we should reposition the asteroid.  
 * Only reposition if oustide the bounding volume and the player isn't looking towards the asteroid.
 */
-void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
+static void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
 {
 	// passive field does not wrap
 	if (asfieldp->field_type == FT_PASSIVE) {
@@ -903,7 +889,7 @@ void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
 	}
 }

-void lerp(float *goal, float f1, float f2, float scale)
+static void lerp(float *goal, float f1, float f2, float scale)
 {
 	*goal = (f2 - f1) * scale + f1;
 }
@@ -1207,7 +1193,7 @@ void asteroid_render(object * obj, model_draw_list *scene)
 /**
 * Create a normalized vector generally in the direction from *hitpos to other_obj->pos
 */
-void asc_get_relvec(vec3d *relvec, object *other_obj, vec3d *hitpos)
+static void asc_get_relvec(vec3d *relvec, object *other_obj, vec3d *hitpos)
 {
 	vec3d	tvec, rand_vec;
 	int		count = 0;
@@ -1229,7 +1215,7 @@ void asc_get_relvec(vec3d *relvec, object *other_obj, vec3d *hitpos)
 /**
 * Return multiplier on asteroid radius for fireball
 */
-float asteroid_get_fireball_scale_multiplier(int num)
+static float asteroid_get_fireball_scale_multiplier(int num)
 {
 	if (Asteroids[num].flags & AF_USED) {
 		asteroid_info *asip = &Asteroid_info[Asteroids[num].asteroid_type];
@@ -1258,7 +1244,7 @@ float asteroid_get_fireball_scale_multiplier(int num)
 * Create asteroid explosion
 * @return expected time for explosion anim to last, in seconds
 */
-float asteroid_create_explosion(object *objp)
+static float asteroid_create_explosion(object *objp)
 {
 	int	fireball_objnum;
 	float	explosion_life, fireball_scale_multiplier;
@@ -1290,37 +1276,37 @@ float asteroid_create_explosion(object *objp)
 /**
 * Play sound when asteroid explodes
 */
-void asteriod_explode_sound(object *objp, int type, int play_loud)
+static void asteroid_explode_sound(object *objp, int type, int play_loud)
 {
-	int	sound_index = -1;
+	gamesnd_id sound_index;
 	float range_factor = 1.0f;		// how many times sound should traver farther than normal

 	if (type % NUM_DEBRIS_SIZES <= 1)
 	{
-		sound_index = SND_ASTEROID_EXPLODE_SMALL;
+		sound_index = gamesnd_id(GameSounds::ASTEROID_EXPLODE_SMALL);
 		range_factor = 5.0;
 	}
 	else
 	{
-		sound_index = SND_ASTEROID_EXPLODE_LARGE;
+		sound_index = gamesnd_id(GameSounds::ASTEROID_EXPLODE_LARGE);
 		range_factor = 10.0f;
 	}

-	Assert(sound_index != -1);
+	Assert(sound_index.isValid());

 	if ( !play_loud ) {
 		range_factor = 1.0f;
 	}

-	snd_play_3d( &Snds[sound_index], &objp->pos, &Eye_position, objp->radius, NULL, 0, 1.0f, SND_PRIORITY_MUST_PLAY, NULL, range_factor );
+	snd_play_3d( gamesnd_get_game_sound(sound_index), &objp->pos, &Eye_position, objp->radius, NULL, 0, 1.0f, SND_PRIORITY_MUST_PLAY, NULL, range_factor );
 }

 /**
 * Do the area effect for an asteroid exploding
 *
- * @param asteroid_objp	object pointer to asteriod causing explosion
+ * @param asteroid_objp	object pointer to asteroid causing explosion
 */
-void asteroid_do_area_effect(object *asteroid_objp)
+static void asteroid_do_area_effect(object *asteroid_objp)
 {
 	object			*ship_objp;
 	float				damage, blast;
@@ -1382,7 +1368,7 @@ void asteroid_hit( object * pasteroid_obj, object * other_obj, vec3d * hitpos, f

 			explosion_life = asteroid_create_explosion(pasteroid_obj);

-			asteriod_explode_sound(pasteroid_obj, asp->asteroid_type, play_loud_collision);
+			asteroid_explode_sound(pasteroid_obj, asp->asteroid_type, play_loud_collision);
 			asteroid_do_area_effect(pasteroid_obj);

 			asp->final_death_time = timestamp( fl2i(explosion_life*1000.0f)/5 );	// Wait till 30% of vclip time before breaking the asteroid up.
@@ -1432,35 +1418,6 @@ void asteroid_level_close()
 DCF_BOOL2(asteroids, Asteroids_enabled, "enables or disables asteroids", "Usage: asteroids [bool]\nTurns asteroid system on/off.  If nothing passed, then toggles it.\n");


-void hud_target_asteroid()
-{
-	int	i;
-	int	start_index = 0, end_index = MAX_ASTEROIDS;
-
-	if (Player_ai->target_objnum != -1) {
-		if (Objects[Player_ai->target_objnum].type == OBJ_ASTEROID) {
-			start_index = Objects[Player_ai->target_objnum].instance+1;
-			end_index = start_index-1;
-			if (end_index < 0)
-				end_index = MAX_ASTEROIDS;
-		}
-	}
-
-	i = start_index;
-	while (i != end_index) {
-		if (i == MAX_ASTEROIDS)
-			i = 0;
-
-		if (Asteroids[i].flags & AF_USED) {
-			Assert(Objects[Asteroids[i].objnum].type == OBJ_ASTEROID);
-			set_target_objnum( Player_ai, Asteroids[i].objnum);
-			break;
-		}
-
-		i++;
-	}
-}
-
 /**
 * Return the number of active asteroids
 */
@@ -1473,7 +1430,7 @@ int asteroid_count()
 * See if asteroid should split up.  
 * We delay splitting up to allow the explosion animation to play for a bit.
 */
-void asteroid_maybe_break_up(object *pasteroid_obj)
+static void asteroid_maybe_break_up(object *pasteroid_obj)
 {
 	asteroid *asp;
 	asteroid_info *asip;
@@ -1595,26 +1552,7 @@ void asteroid_maybe_break_up(object *pasteroid_obj)
 	}
 }

-int asteroid_get_random_in_cone(vec3d *pos, vec3d *dir, float ang, int danger)
-{
-	int idx;
-	vec3d asteroid_dir;
-
-	// just pick the first asteroid which satisfies our condition
-	for(idx=0; idx<Num_asteroids; idx++){
-		vm_vec_sub(&asteroid_dir, &Objects[Asteroids[idx].objnum].pos, pos);
-		vm_vec_normalize_quick(&asteroid_dir);
-
-		// if it satisfies the condition
-		if(vm_vec_dot(dir, &asteroid_dir) >= ang){
-			return idx;
-		}
-	}
-
-	return -1;
-}
-
-void asteroid_test_collide(object *pasteroid_obj, object *pship_obj, mc_info *mc, bool lazy = false)
+static void asteroid_test_collide(object *pasteroid_obj, object *pship_obj, mc_info *mc, bool lazy = false)
 {
 	float		asteroid_ray_dist;
 	vec3d	asteroid_fvec, terminus;
@@ -1656,7 +1594,7 @@ void asteroid_test_collide(object *pasteroid_obj, object *pship_obj, mc_info *mc
 *
 * @return !0 if the asteroid will collide with the escort
 */
-int asteroid_will_collide(object *pasteroid_obj, object *escort_objp)
+static int asteroid_will_collide(object *pasteroid_obj, object *escort_objp)
 {
 	mc_info	mc;
 	mc_info_init(&mc);
@@ -1674,7 +1612,7 @@ int asteroid_will_collide(object *pasteroid_obj, object *escort_objp)
 * Warn if asteroid on collision path with ship
 * @return !0 if we should warn about asteroid hitting ship, otherwise return 0
 */
-int asteroid_valid_ship_to_warn_collide(ship *shipp)
+static int asteroid_valid_ship_to_warn_collide(ship *shipp)
 {
 	if ( !(Ship_info[shipp->ship_info_index].is_big_or_huge()) ) {
 		return 0;
@@ -1696,7 +1634,7 @@ int asteroid_valid_ship_to_warn_collide(ship *shipp)
 * See if asteroid will collide with a large ship on the escort list in the next
 * ASTEROID_MIN_COLLIDE_TIME seconds.
 */
-void asteroid_update_collide_flag(object *asteroid_objp)
+static void asteroid_update_collide_flag(object *asteroid_objp)
 {
 	int		i, num_escorts, escort_objnum, will_collide=0;
 	ship		*escort_shipp;
@@ -1735,7 +1673,7 @@ void asteroid_update_collide_flag(object *asteroid_objp)
 /**
 * Ensure that the collide objnum for the asteroid is still valid
 */
-void asteroid_verify_collide_objnum(asteroid *asp)
+static void asteroid_verify_collide_objnum(asteroid *asp)
 {
 	if ( asp->collide_objnum >= 0 ) {
 		if ( Objects[asp->collide_objnum].signature != asp->collide_objsig ) {
@@ -1815,7 +1753,7 @@ float asteroid_time_to_impact(object *asteroid_objp)
 /**
 * Read in a single asteroid section from asteroid.tbl
 */
-void asteroid_parse_section(asteroid_info *asip)
+static void asteroid_parse_section(asteroid_info *asip)
 {
 	required_string("$Name:");
 	stuff_string(asip->name, F_NAME, NAME_LENGTH);
@@ -1915,7 +1853,7 @@ to do with the debris of ships that explode, however these
 are the same debris and asteroids that get flung at a ship
 that is being protected.
 */
-void asteroid_parse_tbl()
+static void asteroid_parse_tbl()
 {
 	char impact_ani_file[MAX_FILENAME_LEN];

@@ -2066,7 +2004,7 @@ void asteroid_parse_tbl()
 /**
 * Return number of asteroids expected to collide with a ship.
 */
-int count_incident_asteroids()
+static int count_incident_asteroids()
 {
 	object	*asteroid_objp;
 	int		count;
@@ -2090,7 +2028,7 @@ int count_incident_asteroids()
 * Pick object to throw asteroids at.
 * Pick any capital or big ship inside the bounds of the asteroid field.
 */
-int set_asteroid_throw_objnum()
+static int set_asteroid_throw_objnum()
 {
 	if (Asteroid_field.num_initial_asteroids < 1)
 		return -1;
@@ -163,7 +163,6 @@ int	asteroid_collide_objnum(object *asteroid_objp);
 float asteroid_time_to_impact(object *asteroid_objp);
 void	asteroid_show_brackets();
 void	asteroid_target_closest_danger();
-int	asteroid_get_random_in_cone(vec3d *pos, vec3d *dir, float ang, int danger = 0);

 // need to extern for multiplayer
 void asteroid_sub_create(object *parent_objp, int asteroid_type, vec3d *relvec);
@@ -1231,7 +1231,7 @@ void send_autopilot_msg(char *msg, char *snd)
 		audio_handle = -1;
 	}

-	if (msg[0] != '\0' && strcmp(msg, "none"))
+	if (msg[0] != '\0' && strcmp(msg, "none") != 0)
 		change_message("autopilot builtin message", msg, -1, 0);

 	// load sound
@@ -1246,7 +1246,7 @@ void send_autopilot_msg(char *msg, char *snd)
 		audiostream_play(audio_handle, (Master_event_music_volume * aav_music_volume), 0);
 	}

-	if (msg[0] != '\0' && strcmp(msg, "none"))
+	if (msg[0] != '\0' && strcmp(msg, "none") != 0)
 		message_training_queue("autopilot builtin message", timestamp(0), 5); // display message for five seconds
 }

@@ -23,6 +23,16 @@

 #include "bmpman/bmpman.h"

+#include <array>
+
+/**
+ * @brief Container class for graphics API specific bitmap data
+ */
+class gr_bitmap_info {
+ public:
+	virtual ~gr_bitmap_info() = 0;
+};
+
 union bm_extra_info {
 	struct {
 		// Stuff needed for animations
@@ -31,6 +41,7 @@ union bm_extra_info {
 		int keyframe;       //!< used for animations -- keyframe info
 		float total_time;   //!< used for animations -- total animation time (not always derived from num_frames/fps)
 		ubyte fps;          //!< used for animations -- frames per second
+		bool is_array;      //!< Flag for if all frames of an animation have the same size which means that it can be put into a texture array

 		struct {
 			// stuff for static animations
@@ -89,17 +100,35 @@ struct bitmap_entry {
 #endif
 };

-extern bitmap_entry bm_bitmaps[MAX_BITMAPS];
+struct bitmap_slot {
+	bitmap_entry entry;
+
+	gr_bitmap_info* gr_info = nullptr;
+};

 // image specific lock functions
-void bm_lock_ani( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int bpp, ubyte flags );
-void bm_lock_dds( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int bpp, ubyte flags );
-void bm_lock_png( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int bpp, ubyte flags );
-void bm_lock_apng( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int bpp, ubyte flags );
-void bm_lock_jpg( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int bpp, ubyte flags );
-void bm_lock_pcx( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int bpp, ubyte flags );
-void bm_lock_tga( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int bpp, ubyte flags );
-void bm_lock_user( int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int bpp, ubyte flags );
+void bm_lock_ani( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags );
+void bm_lock_dds( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags );
+void bm_lock_png( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags );
+void bm_lock_apng( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags );
+void bm_lock_jpg( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags );
+void bm_lock_pcx( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags );
+void bm_lock_tga( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags );
+void bm_lock_user( int handle, bitmap_slot *bs, bitmap *bmp, int bpp, ubyte flags );

+const size_t BM_BLOCK_SIZE = 4096;
+
+extern SCP_vector<std::array<bitmap_slot, BM_BLOCK_SIZE>> bm_blocks;
+
+bitmap_slot* bm_get_slot(int handle, bool separate_ani_frames = true);
+
+inline bitmap_entry* bm_get_entry(int handle, bool separate_ani_frames = true) {
+	return &bm_get_slot(handle, separate_ani_frames)->entry;
+}
+
+template<typename T>
+T* bm_get_gr_info(int handle, bool separate_ani_frames = true) {
+	return static_cast<T*>(bm_get_slot(handle, separate_ani_frames)->gr_info);
+}

 #endif // __BM_INTERNAL_H__
@@ -32,21 +32,6 @@
 * @{
 */

-/**
- * @brief How many bitmaps the game can handle
- *
- * @attention  MAX_BITMAPS shouldn't need to be bumped again.  With the fixed bm_release() and it's proper use even the
- *   largest missions should stay under this number.  With the largest retail missions and wasteful content we should
- *   still have about 20% of the slots free.  If it still goes over then it's something the artists need to fix.
- *   For instance the Terran Mara fighter, with -spec and -glow and using the Shinepack, needs 117 bitmap slots alone.
- *   111 of those is just for the glowmaps.  This number can be greatly reduced if the number of ani frames for another
- *   LOD than LOD0 has fewer or no ani frames.  A 37 frame glow ani for LOD2 is little more than a waste of resources.
- *   Future reports of texture corruption should be initially approached with content as the cause and not code.
- *   If anything we could/should reduce MAX_BITMAPS in the future.  Where it's at now should accomidate even the
- *   largest mods.  --  Taylor
- */
-#define MAX_BITMAPS 4750
-
 // Flag positions for bitmap.flags
 // ***** NOTE:  bitmap.flags is an 8-bit value, no more BMP_TEX_* flags can be added unless the type is changed!! ******
 #define	BMP_AABITMAP        (1<<0)      //!< antialiased bitmap
@@ -56,6 +41,7 @@
 #define BMP_TEX_DXT3        (1<<4)      //!< dxt3 compressed 8r8g8b4a (32bit)
 #define BMP_TEX_DXT5        (1<<5)      //!< dxt5 compressed 8r8g8b8a (32bit)
 #define BMP_TEX_CUBEMAP     (1<<6)      //!< a texture made for cubic environment map
+#define BMP_MASK_BITMAP     (1<<7)      //!< a bitmap that will be used for masking mouse interaction. Typically not used in render operations

 // Combined flags
 #define BMP_TEX_COMP        ( BMP_TEX_DXT1 | BMP_TEX_DXT3 | BMP_TEX_DXT5 )  //!< Compressed textures
@@ -112,6 +98,10 @@ struct bitmap
 	                     */
 };

+// Forward definition for the graphics API
+struct bitmap_entry;
+struct bitmap_slot;
+
 extern size_t bm_texture_ram;  //!< how many bytes of textures are used.

 extern int Bm_paging;   //!< Bool type that indicates if BMPMAN is currently paging.
@@ -140,22 +130,6 @@ void bm_init();
 */
 void bm_close();

-/**
- * Gets the cache slot of the bitmap indexed by handle.
- *
- * @details if the bitmap is an ani, gets the first frame
- *
- * @returns The cache slot index of the bitmap if handle is valid
- *
- * @note If the handle is invalid, an Assert() fails
- */
-int bm_get_cache_slot(int bitmap_id, int separate_ani_frames);
-
-/**
- * @brief Gets the next available bitmap slot.
- */
-int bm_get_next_handle();
-
 #define BMP_FLAG_RENDER_TARGET_STATIC		(1<<0)
 #define BMP_FLAG_RENDER_TARGET_DYNAMIC		(1<<1)
 #define BMP_FLAG_CUBEMAP					(1<<2)
@@ -409,13 +383,6 @@ void bm_get_filename(int bitmapnum, char *filename);
 */
 const char *bm_get_filename(int handle);

-/**
- * @brief Loads all data for all bitmaps that have been requested to be loaded
- *
- * @note This function is not defined.
- */
-void bm_gfx_load_all();
-
 /**
 * @brief Unloads all used bitmaps, should only ever be called by game_shutdown()
 *
@@ -434,15 +401,6 @@ void bm_unload_all();
 */
 void bm_get_palette(int handle, ubyte *pal, char *name);

-/**
- * @brief Hack to get a pixel from a bitmap
- *
- * @details only works good in 8bpp mode
- *
- * @note This function is not defined.
- */
-void bm_gfx_get_pixel(int bitmap, float u, float v, ubyte *r, ubyte *g, ubyte *b);
-
 /**
 * @brief (DEBUG) Gets memory size, in bytes, of the locked bitmaps
 *
@@ -698,4 +656,73 @@ bool bm_load_and_parse_eff(const char *filename, int dir_type, int *nframes, int
 */
 int bm_get_anim_frame(const int frame1_handle, float elapsed_time, const float divisor = 0.0f, const bool loop = false);

+/**
+ * @brief Determines if the given handle could be used in a texture array
+ *
+ * @param handle The handle to query the value for
+ * @return @c true if all frames have the same size, @c false otherwise. Always returns @c true for single images
+ */
+bool bm_is_texture_array(const int handle);
+
+/**
+ * @brief Gets the base frame of the specified animation
+ *
+ * @details The base frame is the frame of the animation that should be used to determine if two animation frames can be
+ * used in the same draw call. Use this if you want to optimize your draw calls to make use of texture arrays.
+ *
+ * @param handle The handle of the animation to check. This may also be a single frame bitmap
+ * @param num_frames Optionally return the number of frames in the animation
+ * @return The bitmap handle of the base frame or -1 on error
+ */
+int bm_get_base_frame(const int handle, int* num_frames = nullptr);
+
+/**
+ * @brief Get the array index of the specified bitmap
+ *
+ * This should be used when passing the array index to the GPU (e.g. when building uniform structs or streaming particle
+ * data)
+ *
+ * @param handle The handle of the bitmap
+ * @return The index into the array
+ */
+int bm_get_array_index(const int handle);
+
+/**
+ * @brief Counts how many slots are used in bm_bitmaps
+ *
+ * This needs to iterate through all the slots in order to determine whether or not they're used, so shouldn't be used frivolously.
+ *
+ * @return The number of used slots
+ */
+int bmpman_count_bitmaps();
+
+/**
+ * @brief Counts how many slots are available to the bmpman system
+ *
+ * Since the number of slots is dynamic now, this should be used for determining the total amount of available slots at
+ * the moment.
+ *
+ * @warning This is entirely for debugging and logging purposes. It should not be used in actual engine code.
+ *
+ * @return The number of available slots
+ */
+int bmpman_count_available_slots();
+
+/**
+ * @brief Checks if the given filename is a valid effect or texture file name
+ *
+ * @note At least one of @c single_frame or @c animation must be true since the result would make no sense otherwise. It
+ * is also valid to set both parmeters to @c true.
+ *
+ * @todo This currently just tries to load the file but could be improved by not actually loading the file in the future.
+ *
+ * @param file The file name to check
+ * @param single_frame If set to @c true then single frames are valid files
+ * @param animation If set to @c true then animations are valid files
+ * @return @c true if the file name is valid, @c false otherwise
+ */
+bool bm_validate_filename(const SCP_string& file, bool single_frame, bool animation);
+
+SDL_Surface* bm_to_sdl_surface(int handle);
+
 #endif
@@ -2,7 +2,7 @@
 #include "globalincs/alphacolors.h"
 #include "globalincs/linklist.h"
 #include "globalincs/systemvars.h" //VM_FREECAMERA etc
-#include "graphics/font.h"
+#include "graphics/matrix.h"
 #include "hud/hud.h" //hud_get_draw
 #include "math/vecmat.h"
 #include "mod_table/mod_table.h"
@@ -245,12 +245,12 @@ void camera::set_rotation_facing(vec3d *in_target, float in_rotation_time, float
 	set_rotation(&temp_matrix, in_rotation_time, in_rotation_acceleration_time, in_rotation_deceleration_time);
 }

-void camera::set_rotation_velocity(angles *in_rotation_rate, float in_acceleration_time)
+void camera::set_rotation_velocity(angles * /*in_rotation_rate*/, float  /*in_acceleration_time*/)
 {
 	Error(LOCATION, "This function is disabled until further notice.");
 }

-void camera::do_frame(float in_frametime)
+void camera::do_frame(float  /*in_frametime*/)
 {

 }
@@ -802,7 +802,7 @@ void subtitle::clone(const subtitle &sub)
 	post_shaded = sub.post_shaded;
 }

-const subtitle &subtitle::operator=(const subtitle &sub)
+subtitle& subtitle::operator=(const subtitle &sub)
 {
 	if (this != &sub) {
 		if (image_id != -1) {
@@ -143,7 +143,7 @@ public:
 	~subtitle();

    subtitle(const subtitle &sub) { clone(sub); }
-    const subtitle &operator=(const subtitle &sub);
+    subtitle& operator=(const subtitle &sub);

 	void do_frame(float frametime);
 	bool is_post_shaded( ) { return post_shaded; }
@@ -10,10 +10,10 @@

 #define _CFILE_INTERNAL 

-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cerrno>
 #include <sys/stat.h>

 #ifdef _WIN32
@@ -48,49 +48,56 @@ char Cfile_user_dir_legacy[CFILE_ROOT_DIRECTORY_LEN] = "";
 //
 // Please make sure extensions are all lower-case, or we'll break unix compatibility
 //
-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",				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_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},
 };

-
 #define CFILE_STACK_MAX	8

 int cfile_inited = 0;
@@ -109,6 +116,7 @@ static const char *Cfile_cdrom_dir = NULL;
 static int cfget_cfile_block();
 static CFILE *cf_open_fill_cfblock(const char* source, int line, FILE * fp, int type);
 static CFILE *cf_open_packed_cfblock(const char* source, int line, FILE *fp, int type, size_t offset, size_t size);
+static CFILE *cf_open_memory_fill_cfblock(const char* source, int line, const void* data, size_t size, int dir_type);

 #if defined _WIN32
 static CFILE *cf_open_mapped_fill_cfblock(const char* source, int line, HANDLE hFile, int type);
@@ -465,7 +473,7 @@ char *cf_add_ext(const char *filename, const char *ext)
 	size_t elen = strlen(ext);
 	Assert(flen < MAX_PATH_LEN);
 	strcpy_s(path, filename);
-	if ((flen < 4) || stricmp(path + flen - elen, ext)) {
+	if ((flen < 4) || stricmp(path + flen - elen, ext) != 0) {
 		Assert(flen + elen < MAX_PATH_LEN);
 		strcat_s(path, ext);
 	}
@@ -559,7 +567,7 @@ void cf_attrib(const char *filename, int set, int clear, int dir_type)
 		fclose(fp);

 		DWORD z = GetFileAttributes(longname);
-		SetFileAttributes(longname, z | set & ~clear);
+		SetFileAttributes(longname, z | (set & ~clear));
 	}

 }
@@ -684,7 +692,7 @@ CFILE *_cfopen(const char* source, int line, const char *file_path, const char *
 	Assert( mode != NULL );
 	
 	// Can only open read-only binary files in memory mapped mode.
-	if ( (type & CFILE_MEMORY_MAPPED) && strcmp(mode,"rb") ) {
+	if ( (type & CFILE_MEMORY_MAPPED) && strcmp(mode,"rb") != 0 ) {
 		Int3();				
 		return NULL;
 	}
@@ -763,16 +771,16 @@ CFILE *_cfopen(const char* source, int line, const char *file_path, const char *
 	char copy_file_path[MAX_PATH_LEN];  // FIX change in memory from cf_find_file_location
 	strcpy_s(copy_file_path, file_path);

-
-	if ( cf_find_file_location( copy_file_path, dir_type, sizeof(longname) - 1, longname, &size, &offset, localize ) )	{
+	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, longname));
 		
 		if ( type & CFILE_MEMORY_MAPPED ) {
 		
-			// Can't open memory mapped files out of pack files
-			if ( offset == 0 )	{
+			// Can't open memory mapped files out of pack or memory files
+			if ( offset == 0 && file_data != nullptr )	{
 #if defined _WIN32
 				HANDLE hFile;

@@ -790,18 +798,8 @@ CFILE *_cfopen(const char* source, int line, const char *file_path, const char *
 			} 

 		} else {
-
-			FILE *fp = fopen( longname, "rb" );
-
-			if ( fp )	{
-				if ( offset )	{
-					// Found it in a pack file
-					return cf_open_packed_cfblock(source, line, fp, dir_type, offset, size );
-				} else {
-					// Found it in a normal file
-					return cf_open_fill_cfblock(source, line, fp, dir_type);
-				} 
-			}
+			// since cfopen_special already has all the code to handle the opening we can just use that here
+			return _cfopen_special(source, line, longname, mode, size, offset, file_data, dir_type);
 		}

 	}
@@ -820,7 +818,7 @@ CFILE *_cfopen(const char* source, int line, const char *file_path, const char *
 // returns:		success	==> address of CFILE structure
 //				error	==> NULL
 //
-CFILE *_cfopen_special(const char* source, int line, const char *file_path, const char *mode, const size_t size, const size_t offset, int dir_type)
+CFILE *_cfopen_special(const char* source, int line, const char *file_path, const char *mode, const size_t size, const size_t offset, const void* data, int dir_type)
 {
 	if ( !cfile_inited) {
 		Int3();
@@ -836,19 +834,27 @@ CFILE *_cfopen_special(const char* source, int line, const char *file_path, cons
 		return NULL;
 	}

-	// "file_path" should already be a fully qualified path, so just try to open it
-	FILE *fp = fopen( file_path, "rb" );
-
-	if ( !fp )
-		return NULL;
-
-	if ( offset ) {
-		// it's in a pack file
-		return cf_open_packed_cfblock(source, line, fp, dir_type, offset, size);
-	} else {
-		// it's a normal file
-		return cf_open_fill_cfblock(source, line, fp, dir_type);
+	// In-Memory files are a bit different from normal files so we need to handle them separately
+	if (data != nullptr) {
+		return cf_open_memory_fill_cfblock(source, line, data, size, dir_type);
 	}
+	else {
+		// "file_path" should already be a fully qualified path, so just try to open it
+		FILE *fp = fopen(file_path, "rb");
+
+		if (fp) {
+			if (offset) {
+				// Found it in a pack file
+				return cf_open_packed_cfblock(source, line, fp, dir_type, offset, size);
+			}
+			else {
+				// Found it in a normal file
+				return cf_open_fill_cfblock(source, line, fp, dir_type);
+			}
+		}
+	}
+
+	return NULL;
 }


@@ -922,7 +928,7 @@ int cfclose( CFILE * cfile )
 	cb = &Cfile_block_list[cfile->id];	

 	result = 0;
-	if ( cb->data ) {
+	if ( cb->data && cb->mem_mapped ) {
 		// close memory mapped file
 #if defined _WIN32
 		result = UnmapViewOfFile((void*)cb->data);
@@ -936,7 +942,8 @@ int cfclose( CFILE * cfile )
 		// FIXME: result is wrong after munmap() but it is successful
 		//result = munmap(cb->data, cb->data_length);
 		//Assert(result);
-		munmap(cb->data, cb->data_length);
+		// This const_cast is safe since the pointer returned by mmap was also non-const
+		munmap(const_cast<void*>(cb->data), cb->data_length);
 		if ( cb->fp != NULL)
 			result = fclose(cb->fp);
 #endif
@@ -996,6 +1003,7 @@ static CFILE *cf_open_fill_cfblock(const char* source, int line, FILE *fp, int t
 		cfp->id = cfile_block_index;
 		cfp->version = 0;
 		cfbp->data = NULL;
+		cfbp->mem_mapped = false;
 		cfbp->fp = fp;
 		cfbp->dir_type = type;
 		cfbp->max_read_len = 0;
@@ -1038,6 +1046,7 @@ static CFILE *cf_open_packed_cfblock(const char* source, int line, FILE *fp, int
 		cfp->version = 0;
 		cfbp->data = NULL;
 		cfbp->fp = fp;
+		cfbp->mem_mapped = false;
 		cfbp->dir_type = type;
 		cfbp->max_read_len = 0;

@@ -1083,6 +1092,7 @@ static CFILE *cf_open_mapped_fill_cfblock(const char* source, int line, FILE *fp
 		cfp->version = 0;
 		cfbp->max_read_len = 0;
 		cfbp->fp = NULL;
+		cfbp->mem_mapped = true;
 #if defined _WIN32
 		cfbp->hInFile = hFile;
 #endif
@@ -1117,6 +1127,37 @@ static CFILE *cf_open_mapped_fill_cfblock(const char* source, int line, FILE *fp
 	}
 }

+static CFILE *cf_open_memory_fill_cfblock(const char* source, int line, const void* data, size_t size, int dir_type)
+{
+	int cfile_block_index;
+
+	cfile_block_index = cfget_cfile_block();
+	if ( cfile_block_index == -1 ) {
+		return NULL;
+	}
+	else {
+		CFILE *cfp;
+		Cfile_block *cfbp;
+		cfbp = &Cfile_block_list[cfile_block_index];
+
+		cfp = &Cfile_list[cfile_block_index];
+		cfp->id = cfile_block_index;
+		cfp->version = 0;
+		cfbp->max_read_len = 0;
+		cfbp->fp = NULL;
+		cfbp->mem_mapped = false;
+		cfbp->dir_type = dir_type;
+
+		cfbp->source_file = source;
+		cfbp->line_num = line;
+
+		cf_init_lowlevel_read_code(cfp, 0, size, 0 );
+		cfbp->data = data;
+
+		return cfp;
+	}
+}
+
 int cf_get_dir_type(CFILE *cfile)
 {
 	return Cfile_block_list[cfile->id].dir_type;
@@ -1127,7 +1168,7 @@ int cf_get_dir_type(CFILE *cfile)
 //
 // 

-void *cf_returndata(CFILE *cfile)
+const void *cf_returndata(CFILE *cfile)
 {
 	Assert(cfile != NULL);
 	Cfile_block *cb;
@@ -1418,9 +1459,7 @@ int cfilelength( CFILE * cfile )
 	cb = &Cfile_block_list[cfile->id];	

 	// TODO: return length of memory mapped file
-	Assert( !cb->data );
-
-	Assert(cb->fp != NULL);
+	Assert( !cb->mem_mapped );

 	// cb->size gets set at cfopen
 	
@@ -1519,7 +1558,6 @@ int cfputc(int c, CFILE *cfile)
 	return result;	
 }

-
 // cfputs() writes a string to a file
 //
 // returns:   success ==> non-negative value
@@ -13,7 +13,7 @@
 #define __CFILE_H__


-#include <time.h>
+#include <ctime>
 #include "globalincs/pstypes.h"

 #include <stdexcept>
@@ -78,8 +78,9 @@ typedef struct {
 #define CF_TYPE_INTEL_ANIMS			34
 #define CF_TYPE_SCRIPTS				35
 #define CF_TYPE_FICTION				36
+#define CF_TYPE_FREDDOCS			37

-#define CF_MAX_PATH_TYPES			37			// 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
@@ -139,7 +140,7 @@ CFILE *_cfopen(const char* source_file, int line, const char *filename, const ch
 // like cfopen(), but it accepts a fully qualified path only (ie, the result of a cf_find_file_location() call)
 // NOTE: only supports reading files!!
 CFILE *_cfopen_special(const char* source_file, int line, const char *file_path, const char *mode,
-	const size_t size, const size_t offset, int dir_type = CF_TYPE_ANY);
+	const size_t size, const size_t offset, const void* data, int dir_type = CF_TYPE_ANY);
 #define cfopen_special(...) _cfopen_special(LOCATION, __VA_ARGS__) // Pass source location to the function

 // Flush the open file buffer
@@ -215,7 +216,7 @@ char *cfgets(char *buf, int n, CFILE *cfile);
 int cfeof(CFILE *cfile);

 // Return the data pointer associated with the CFILE structure (for memory mapped files)
-void *cf_returndata(CFILE *cfile);
+const void *cf_returndata(CFILE *cfile);

 // get the 2 byte checksum of the passed filename - return 0 if operation failed, 1 if succeeded
 int cf_chksum_short(const char *filename, ushort *chksum, int max_size = -1, int cf_type = CF_TYPE_ANY );
@@ -325,7 +326,7 @@ void cf_sort_filenames( SCP_vector<SCP_string> &list, int sort, SCP_vector<file_
 //         size        - File size
 //         offset      - Offset into pack file.  0 if not a packfile.
 // Returns: If not found returns 0.
-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);
+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.
@@ -339,7 +340,7 @@ int cf_find_file_location( const char *filespec, int pathtype, int max_out, char
 //         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!!)
-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);
+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);
@@ -364,16 +365,13 @@ namespace cfile
 			{
 			}

-		cfile_error(const std::string &excuse) : m_excuse(excuse)
+			explicit cfile_error(const std::string &excuse) : m_excuse(excuse)
 			{
 			}

-			~cfile_error() throw()
-			{
-			}
+			~cfile_error() SCP_NOEXCEPT override {}

-			virtual const char *what() const throw()
-			{
+			const char *what() const SCP_NOEXCEPT override {
 				return m_excuse.c_str();
 			}

@@ -384,7 +382,7 @@ namespace cfile
 	class max_read_length : public cfile_error
 	{
 		public:
-		max_read_length(const std::string &excuse) : cfile_error(excuse)
+		explicit max_read_length(const std::string &excuse) : cfile_error(excuse)
 			{
 			}

@@ -11,9 +11,9 @@

 #define _CFILE_INTERNAL 

-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>

 #ifdef _WIN32
 #include <io.h>
@@ -74,18 +74,13 @@ int cfeof(CFILE *cfile)
 	Assert(cfile->id >= 0 && cfile->id < MAX_CFILE_BLOCKS);
 	cb = &Cfile_block_list[cfile->id];	

-	int result;
-
-	result = 0;
-
-	// cfeof() not supported for memory-mapped files
-	Assert( !cb->data );
-
-	Assert(cb->fp != NULL);
+	int result = 0;

 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-	auto raw_position = ftell(cb->fp) - cb->lib_offset;
-	Assert(raw_position == cb->raw_position);
+    if (cb->fp) {
+		auto raw_position = ftell(cb->fp) - cb->lib_offset;
+		Assert(raw_position == cb->raw_position);
+	}
 	#endif
 		
 	if (cb->raw_position >= cb->size ) {
@@ -109,14 +104,11 @@ int cftell( CFILE * cfile )
 	Assert(cfile->id >= 0 && cfile->id < MAX_CFILE_BLOCKS);
 	cb = &Cfile_block_list[cfile->id];	

-	// Doesn't work for memory mapped files
-	Assert( !cb->data );
-
-	Assert(cb->fp != NULL);
-
 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-	auto raw_position = ftell(cb->fp) - cb->lib_offset;
-	Assert(raw_position == cb->raw_position);
+    if (cb->fp) {
+		auto raw_position = ftell(cb->fp) - cb->lib_offset;
+		Assert(raw_position == cb->raw_position);
+	}
 	#endif

 	// The rest of the code still uses ints, do an overflow check to detect cases where this fails
@@ -141,8 +133,7 @@ int cfseek( CFILE *cfile, int offset, int where )


 	// TODO: seek to offset in memory mapped file
-	Assert( !cb->data );
-	Assert( cb->fp != NULL );
+	Assert( !cb->mem_mapped );
 	
 	size_t goal_position;

@@ -166,14 +157,22 @@ int cfseek( CFILE *cfile, int offset, int where )
 	// Make sure we don't seek beyond the end of the file
 	CAP(goal_position, cb->lib_offset, cb->lib_offset + cb->size);

-	int result = fseek(cb->fp, (long)goal_position, SEEK_SET );
-	Assertion(goal_position >= cb->lib_offset, "Invalid offset values detected while seeking! Goal was " SIZE_T_ARG ", lib_offset is " SIZE_T_ARG ".", goal_position, cb->lib_offset);
+	int result = 0;
+
+	if (cb->fp) {
+		// If we have a file pointer we can also seek in that file
+		result = fseek(cb->fp, (long)goal_position, SEEK_SET );
+		Assertion(goal_position >= cb->lib_offset, "Invalid offset values detected while seeking! Goal was " SIZE_T_ARG ", lib_offset is " SIZE_T_ARG ".", goal_position, cb->lib_offset);
+	}
+	// If we only have a data pointer this will do all the work
 	cb->raw_position = goal_position - cb->lib_offset;
 	Assertion(cb->raw_position <= cb->size, "Invalid raw_position value detected!");

 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-	auto tmp_offset = ftell(cb->fp) - cb->lib_offset;
-	Assert(tmp_offset==cb->raw_position);
+	if (cb->fp) {
+		auto tmp_offset = ftell(cb->fp) - cb->lib_offset;
+		Assert(tmp_offset == cb->raw_position);
+	}
 	#endif

 	return result;	
@@ -197,13 +196,6 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)

 	Cfile_block *cb = &Cfile_block_list[cfile->id];	

-	// cfread() not supported for memory-mapped files
-	if(cb->data != NULL)
-	{
-		Warning(LOCATION, "Writing is not supported for mem-mapped files");
-		return 0;
-	}
-
 	if ( (cb->raw_position+size) > cb->size ) {
 		Assertion(cb->raw_position <= cb->size, "Invalid raw_position value detected!");
 		size = cb->size - cb->raw_position;
@@ -222,15 +214,24 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 		}
 	}

-	size_t bytes_read = fread( buf, 1, size, cb->fp );
+	size_t bytes_read;
+	if (cb->data != nullptr) {
+		// This is a file from memory
+		bytes_read = size;
+		memcpy(buf, reinterpret_cast<const char*>(cb->data) + cb->raw_position, size);
+	} else {
+		bytes_read = fread( buf, 1, size, cb->fp );
+	}
 	if ( bytes_read > 0 )	{
 		cb->raw_position += bytes_read;
 		Assertion(cb->raw_position <= cb->size, "Invalid raw_position value detected!");
 	}		

 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-	auto tmp_offset = ftell(cb->fp) - cb->lib_offset;
-	Assert(tmp_offset==cb->raw_position);
+    if (cb->fp) {
+		auto tmp_offset = ftell(cb->fp) - cb->lib_offset;
+		Assert(tmp_offset==cb->raw_position);
+	}
 	#endif

 	return (int)(bytes_read / elsize);
@@ -254,14 +255,31 @@ int cfread_lua_number(double *buf, CFILE *cfile)
 		return 0;
 	}

-	long orig_pos = ftell(cb->fp);
-	int items_read = fscanf(cb->fp, LUA_NUMBER_SCAN, buf);
-	cb->raw_position += ftell(cb->fp)-orig_pos;
+	size_t advance = 0;
+	int items_read;
+	if (cb->fp) {
+		long orig_pos = ftell(cb->fp);
+		items_read = fscanf(cb->fp, LUA_NUMBER_SCAN, buf);
+		advance = (size_t) (ftell(cb->fp)-orig_pos);
+	} else {
+		int read;
+		// %n returns the number of bytes currently read so we append that to the scan format at the end so it will return
+		// how many bytes we have consumed
+		items_read = sscanf(reinterpret_cast<const char*>(cb->data), LUA_NUMBER_SCAN "%n", buf, &read);
+		if (items_read == 2) {
+			// We need to correct the items read counter since we read one additional item
+			items_read = 1;
+		}
+		advance = (size_t) read;
+	}
+	cb->raw_position += advance;
 	Assertion(cb->raw_position <= cb->size, "Invalid raw_position value detected!");

 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-	auto tmp_offset = ftell(cb->fp) - cb->lib_offset;
-	Assert(tmp_offset==cb->raw_position);
+    if (cb->fp) {
+		auto tmp_offset = ftell(cb->fp) - cb->lib_offset;
+		Assert(tmp_offset==cb->raw_position);
+	}
 	#endif

 	return items_read;
@@ -26,7 +26,8 @@ typedef struct Cfile_block {
 	int		type;				// CFILE_BLOCK_UNUSED, CFILE_BLOCK_USED
 	int		dir_type;		// directory location
 	FILE		*fp;				// File pointer if opening an individual file
-	void		*data;			// Pointer for memory-mapped file access.  NULL if not mem-mapped.
+	const void	*data;			// Pointer for memory-mapped file access.  NULL if not mem-mapped.
+	bool 	mem_mapped;		// Flag for memory mapped files (if data is not null and this is false it means that it's an embedded file)
 #ifdef _WIN32
 	HANDLE	hInFile;			// Handle from CreateFile()
 	HANDLE	hMapFile;		// Handle from CreateFileMapping()
@@ -9,9 +9,9 @@



-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include <string>
 #include <algorithm>

@@ -9,10 +9,10 @@



-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+#include <cerrno>
 #include <sstream>
 #include <algorithm>

@@ -37,12 +37,16 @@
 #include "cfile/cfilesystem.h"
 #include "cmdline/cmdline.h"
 #include "globalincs/pstypes.h"
+#include "def_files/def_files.h"
 #include "localization/localize.h"
 #include "osapi/osapi.h"
 #include "parse/parselo.h"

-#define CF_ROOTTYPE_PATH 0
-#define CF_ROOTTYPE_PACK 1
+enum CfileRootType {
+	CF_ROOTTYPE_PATH = 0,
+	CF_ROOTTYPE_PACK = 1,
+	CF_ROOTTYPE_MEMORY = 2,
+};

 // for a defined and specifically set location to get/send pilot/campaign files
 SCP_string Pilot_file_path;
@@ -53,8 +57,8 @@ SCP_string Pilot_file_path;
 //    specifying cd-rom tree
 //    searching for pack files on CD-rom tree
 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
+	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
 } cf_root;

 // convenient type for sorting (see cf_build_pack_list())
@@ -79,13 +83,14 @@ static int Num_path_roots = 0;

 // Created by searching all roots in order.   This means Files is then sorted by precedence.
 typedef struct cf_file {
-	char	name_ext[CF_MAX_FILENAME_LENGTH];	// Filename and extension
-	int		root_index;							// Where in Roots this is located
-	int		pathtype_index;						// Where in Paths this is located
-	time_t	write_time;							// When it was last written
-	int		size;								// How big it is in bytes
-	int		pack_offset;						// For pack files, where it is at.   0 if not in a pack file.  This can be used to tell if in a pack file.
-	char*	real_name;							// For real files, the full path
+	char		name_ext[CF_MAX_FILENAME_LENGTH];	// Filename and extension
+	int			root_index;							// Where in Roots this is located
+	int			pathtype_index;						// Where in Paths this is located
+	time_t		write_time;							// When it was last written
+	int			size;								// How big it is in bytes
+	int			pack_offset;						// For pack files, where it is at.   0 if not in a pack file.  This can be used to tell if in a pack file.
+	char*		real_name;							// For real files, the full path
+	const void*	data;								// For in-memory files, the data pointer
 } cf_file;

 #define CF_NUM_FILES_PER_BLOCK   512
@@ -510,6 +515,11 @@ void cf_build_root_list(const char *cdrom_dir)

 	}

+	// The final root is the in-memory root
+	root = cf_create_root();
+	memset(root->path, 0, sizeof(root->path));
+	root->roottype = CF_ROOTTYPE_MEMORY;
+
 }

 // Given a lower case list of file extensions 
@@ -639,7 +649,7 @@ void cf_search_root_path(int root_index)
 					struct dirent *dir = nullptr;
 					while ((dir = readdir (parentDirP)) != nullptr) {

-						if (stricmp(search_name, dir->d_name)) {
+						if (stricmp(search_name, dir->d_name) != 0) {
 							continue;
 						}

@@ -836,7 +846,48 @@ void cf_search_root_pack(int root_index)
 	mprintf(( "%i files\n", num_files ));
 }

+void cf_search_memory_root(int root_index) {
+	int num_files = 0;
+	mprintf(( "Searching memory root ... " ));

+	auto default_files = defaults_get_all();
+	for (auto& default_file : default_files) {
+		// Pure built in files have an empty path_type string
+		if (strlen(default_file.path_type) <= 0) {
+			// Ignore pure builtin files. They should only be accessible with defaults_get_file
+			continue;
+		}
+
+		int pathtype = -1;
+		for (int i = 0; i < CF_MAX_PATH_TYPES; ++i) {
+			if (Pathtypes[i].path == nullptr) {
+				continue;
+			}
+
+			if (!strcmp(Pathtypes[i].path, default_file.path_type)) {
+				pathtype = i;
+				break;
+			}
+		}
+		Assertion(pathtype != -1, "Default file '%s%s%s' does not use a valid path type!",
+				  default_file.path_type,
+				  DIR_SEPARATOR_STR,
+				  default_file.filename);
+
+		cf_file *file = cf_create_file();
+
+		strcpy_s( file->name_ext, default_file.filename );
+		file->root_index = root_index;
+		file->pathtype_index = pathtype;
+		file->write_time = time(nullptr); // Just assume that memory files were last written to just now
+		file->size = (int)default_file.size;
+		file->data = default_file.data;
+
+		num_files++;
+	}
+
+	mprintf(( "%i files\n", num_files ));
+}

 void cf_build_file_list()
 {
@@ -851,6 +902,8 @@ void cf_build_file_list()
 			cf_search_root_path(i);
 		} else if ( root->roottype == CF_ROOTTYPE_PACK )	{
 			cf_search_root_pack(i);
+		} else if (root->roottype == CF_ROOTTYPE_MEMORY) {
+			cf_search_memory_root(i);
 		}
 	}

@@ -932,7 +985,7 @@ void cf_free_secondary_filelist()
 *
 * @return If not found returns 0.
 */
-int cf_find_file_location( const char *filespec, int pathtype, int max_out, char *pack_filename, size_t *size, size_t *offset, bool localize )
+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;
@@ -1067,8 +1120,16 @@ int cf_find_file_location( const char *filespec, int pathtype, int max_out, char
 					if (offset)
 						*offset = (size_t)f->pack_offset;

+					if (data_out)
+						*data_out = f->data;
+
 					if (pack_filename) {
-						if (f->pack_offset < 1) {
+						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 {
@@ -1092,8 +1153,16 @@ int cf_find_file_location( const char *filespec, int pathtype, int max_out, char
 			if (offset)
 				*offset = (size_t)f->pack_offset;

+			if (data_out)
+				*data_out = f->data;
+
 			if (pack_filename) {
-				if (f->pack_offset < 1) {
+				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 {
@@ -1132,7 +1201,7 @@ extern char *stristr(char *str, const char *substr);
 *
 * @return If not found returns -1, else returns offset into ext_list.
 */
-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 )
+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;
@@ -1217,6 +1286,9 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 				if (size)
 					*size = findstruct.size;

+				if (data_out)
+					*data_out = nullptr;
+
 				_findclose(findhandle);

 				if (offset)
@@ -1235,6 +1307,9 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 					if (size)
 						*size = filelength( fileno(fp) );

+					if (data_out)
+						*data_out = nullptr;
+
 					fclose(fp);

 					if (offset)
@@ -1284,7 +1359,7 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 			continue;

 		// ... check that we match the base filename
-		if ( strnicmp(f->name_ext, filespec, filespec_len) )
+		if ( strnicmp(f->name_ext, filespec, filespec_len) != 0 )
 			continue;

 		// ... make sure that it's one of our supported types
@@ -1334,15 +1409,25 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 						if (offset)
 							*offset = f->pack_offset;

+						if (data_out)
+							*data_out = f->data;
+
 						if (pack_filename) {
-							if (f->pack_offset < 1) {
+							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 {
+								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 );
+								strncpy(pack_filename, r->path, max_out);
 							}
 						}

@@ -1362,15 +1447,25 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 				if (offset)
 					*offset = f->pack_offset;

+				if (data_out)
+					*data_out = f->data;
+
 				if (pack_filename) {
-					if (f->pack_offset < 1) {
+					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 {
+						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 );
+						strncpy(pack_filename, r->path, max_out);
 					}
 				}

@@ -1432,6 +1527,7 @@ int cf_matches_spec(const char *filespec, const char *filename)
 int (*Get_file_list_filter)(const char *filename) = NULL;
 const char *Get_file_list_child = NULL;
 int Skip_packfile_search = 0;
+bool Skip_memory_files = false;

 static bool verify_file_list_child()
 {
@@ -1567,8 +1663,10 @@ int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *fi
 				continue;

 			char fn[MAX_PATH];
-			snprintf(fn, MAX_PATH-1, "%s/%s", filespec, dir->d_name);
-			fn[MAX_PATH-1] = 0;
+			if (snprintf(fn, MAX_PATH, "%s/%s", filespec, dir->d_name) >= MAX_PATH) {
+				// Make sure the string is null terminated
+				fn[MAX_PATH-1] = 0;
+			}

 			struct stat buf;
 			if (stat(fn, &buf) == -1) {
@@ -1633,6 +1731,11 @@ int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *fi
 				continue;
 			}

+			if (Skip_memory_files && f->data != nullptr) {
+				// If we want to skip memory files and this is a memory file then ignore it
+				continue;
+			}
+
 			if ( !Get_file_list_filter || (*Get_file_list_filter)(f->name_ext) ) {
 				//mprintf(( "Found '%s' in root %d path %d\n", f->name_ext, f->root_index, f->pathtype_index ));

@@ -1776,8 +1879,10 @@ int cf_get_file_list( int max, char **list, int pathtype, const char *filter, in
 				continue;

 			char fn[MAX_PATH];
-			snprintf(fn, MAX_PATH-1, "%s/%s", filespec, dir->d_name);
-			fn[MAX_PATH-1] = 0;
+			if (snprintf(fn, MAX_PATH, "%s/%s", filespec, dir->d_name) >= MAX_PATH) {
+				// Make sure the string is null terminated
+				fn[MAX_PATH-1] = 0;
+			}

 			struct stat buf;
 			if (stat(fn, &buf) == -1) {
@@ -1843,6 +1948,11 @@ int cf_get_file_list( int max, char **list, int pathtype, const char *filter, in
 				continue;
 			}

+			if (Skip_memory_files && f->data != nullptr) {
+				// If we want to skip memory files and this is a memory file then ignore it
+				continue;
+			}
+
 			if ( !Get_file_list_filter || (*Get_file_list_filter)(f->name_ext) ) {

 				//mprintf(( "Found '%s' in root %d path %d\n", f->name_ext, f->root_index, f->pathtype_index ));
@@ -1991,8 +2101,10 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 				continue;

 			char fn[MAX_PATH];
-			snprintf(fn, MAX_PATH-1, "%s/%s", filespec, dir->d_name);
-			fn[MAX_PATH-1] = 0;
+			if (snprintf(fn, MAX_PATH, "%s/%s", filespec, dir->d_name) >= MAX_PATH) {
+				// Make sure the string is null terminated
+				fn[MAX_PATH-1] = 0;
+			}

 			struct stat buf;
 			if (stat(fn, &buf) == -1) {
@@ -2061,6 +2173,11 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 				continue;
 			}

+			if (Skip_memory_files && f->data != nullptr) {
+				// If we want to skip memory files and this is a memory file then ignore it
+				continue;
+			}
+
 			if ( !Get_file_list_filter || (*Get_file_list_filter)(f->name_ext) ) {

 				//mprintf(( "Found '%s' in root %d path %d\n", f->name_ext, f->root_index, f->pathtype_index ));
@@ -2177,7 +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 )
+int cf_create_default_path_string( SCP_string &path, int pathtype, const char *filename, bool  /*localize*/ )
 {
 #ifdef SCP_UNIX
 	if ( filename && strpbrk(filename,"/")  ) {
@@ -23,6 +23,9 @@
 #include "globalincs/pstypes.h"
 #include "osapi/osapi.h"
 #include "cfile/cfilesystem.h"
+#include "sound/speech.h"
+#include "sound/openal.h"
+#include "io/joy.h"

 #ifdef _WIN32
 #include <io.h>
@@ -36,8 +39,11 @@
 #include <dirent.h>
 #endif

-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
+
+#include <jansson.h>

 // Stupid windows workaround...
 #ifdef MessageBox
@@ -60,6 +66,11 @@ const char *cmdline_arg_types[] =
 	"STRING",
 };

+enum class flag_output_type {
+	Binary,
+	Json_V1,
+};
+
 // variables
 class cmdline_parm {
 public:
@@ -78,6 +89,7 @@ public:
 	float get_float();
 	char *str();
 	bool check_if_args_is_valid();
+	bool has_param();
 };

 static cmdline_parm Parm_list(NULL, NULL, AT_NONE);
@@ -148,7 +160,6 @@ Flag exe_params[] =
 	{ "-noenv",				"Disable environment maps",					true,	EASY_DEFAULT_MEM,	EASY_MEM_ALL_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-env", },
 	{ "-nomotiondebris",	"Disable motion debris",					true,	EASY_ALL_ON,		EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nomotiondebris",},
 	{ "-noscalevid",		"Disable scale-to-window for movies",		true,	0,					EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noscalevid", },
-	{ "-missile_lighting",	"Apply lighting to missiles"	,			true,	EASY_ALL_ON,		EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-missile_lighting", },
 	{ "-nonormal",			"Disable normal maps",						true,	EASY_DEFAULT_MEM,	EASY_MEM_ALL_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-normal" },
 	{ "-no_emissive_light",	"Disable emissive light from ships",		true,	0,					EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_emissive_light" },
 	{ "-noheight",			"Disable height/parallax maps",				true,	EASY_DEFAULT_MEM,	EASY_MEM_ALL_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-height" },
@@ -177,7 +188,6 @@ Flag exe_params[] =
 	{ "-no_ap_interrupt",	"Disable interrupting autopilot",			true,	0,					EASY_DEFAULT,		"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_ap_interrupt", },
 	{ "-stretch_menu",		"Stretch interface to fill screen",			true,	0,					EASY_DEFAULT,		"Gameplay",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-stretch_menu", },

-	{ "-snd_preload",		"Preload mission game sounds",				true,	EASY_MEM_ALL_ON,	EASY_DEFAULT_MEM,	"Audio",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-snd_preload", },
 	{ "-nosound",			"Disable all sound",						false,	0,					EASY_DEFAULT,		"Audio",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nosound", },
 	{ "-nomusic",			"Disable music",							false,	0,					EASY_DEFAULT,		"Audio",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nomusic", },
 	{ "-no_enhanced_sound",	"Disable enhanced sound",					false,	0,					EASY_DEFAULT,		"Audio",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_enhanced_sound", },
@@ -205,7 +215,6 @@ Flag exe_params[] =
 	{ "-use_gldrawelements","Don't use glDrawRangeElements",			true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-use_gldrawelements", },
 	{ "-old_collision",		"Use old collision detection system",		true,	EASY_DEFAULT,		EASY_ALL_ON,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-old_collision", },
 	{ "-gl_finish",			"Fix input lag on some ATI+Linux systems",	true,	0,					EASY_DEFAULT,		"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-gl_finish", },
-	{ "-no_batching",		"Disable batched model rendering",			true,	0,					EASY_DEFAULT,		"Troubleshoot", "", },
 	{ "-no_geo_effects",	"Disable geometry shader for effects",		true,	0,					EASY_DEFAULT,		"Troubleshoot", "", },
 	{ "-set_cpu_affinity",	"Sets processor affinity to config value",	true,	0,					EASY_DEFAULT,		"Troubleshoot", "", },
 	{ "-nograb",			"Disables mouse grabbing",					true,	0,					EASY_DEFAULT,		"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nograb", },
@@ -218,6 +227,7 @@ Flag exe_params[] =
 	{ "-voicer",			"Enable voice recognition",					true,	0,					EASY_DEFAULT,		"Experimental",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-voicer", },

 	{ "-fps",				"Show frames per second on HUD",			false,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fps", },
+	{ "-bmpmanusage",		"Show how many BMPMAN slots are in use",	false,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-bmpmanusage", },
 	{ "-pos",				"Show position of camera",					false,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-pos", },
 	{ "-window",			"Run in window",							true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-window", },
 	{ "-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", },
@@ -303,7 +313,6 @@ cmdline_parm spec_static_arg("-spec_static", "Adjusts suns contribution to specu
 cmdline_parm spec_point_arg("-spec_point", "Adjusts laser weapons contribution to specular highlights", AT_FLOAT);
 cmdline_parm spec_tube_arg("-spec_tube", "Adjusts beam weapons contribution to specular highlights", AT_FLOAT);
 cmdline_parm ambient_factor_arg("-ambient_factor", "Adjusts ambient light applied to all parts of a ship", AT_INT);		// Cmdline_ambient_factor
-cmdline_parm missile_lighting_arg("-missile_lighting", NULL, AT_NONE);	// Cmdline_missile_lighting
 cmdline_parm env("-noenv", NULL, AT_NONE);								// Cmdline_env
 cmdline_parm glow_arg("-noglow", NULL, AT_NONE); 						// Cmdline_glow  -- use Bobs glow code
 cmdline_parm nomotiondebris_arg("-nomotiondebris", NULL, AT_NONE);		// Cmdline_nomotiondebris  -- Removes those ugly floating rocks -C
@@ -321,10 +330,10 @@ cmdline_parm fxaa_preset_arg("-fxaa_preset", "FXAA quality (0-9), requires -post
 cmdline_parm fb_explosions_arg("-fb_explosions", NULL, AT_NONE);
 cmdline_parm fb_thrusters_arg("-fb_thrusters", NULL, AT_NONE);
 cmdline_parm flightshaftsoff_arg("-nolightshafts", NULL, AT_NONE);
-cmdline_parm no_batching("-no_batching", NULL, AT_NONE);
 cmdline_parm shadow_quality_arg("-shadow_quality", NULL, AT_INT);
 cmdline_parm enable_shadows_arg("-enable_shadows", NULL, AT_NONE);
 cmdline_parm no_deferred_lighting_arg("-no_deferred", NULL, AT_NONE);	// Cmdline_no_deferred
+cmdline_parm anisotropy_level_arg("-anisotropic_filter", NULL, AT_INT);

 float Cmdline_clip_dist = Default_min_draw_distance;
 float Cmdline_fov = 0.75f;
@@ -332,7 +341,6 @@ float Cmdline_ogl_spec = 80.0f;
 int Cmdline_ambient_factor = 128;
 int Cmdline_env = 1;
 int Cmdline_mipmap = 0;
-int Cmdline_missile_lighting = 0;
 int Cmdline_glow = 1;
 int Cmdline_nomotiondebris = 0;
 int Cmdline_noscalevid = 0;
@@ -349,10 +357,10 @@ int Cmdline_fxaa_preset = 6;
 extern int Fxaa_preset_last_frame;
 bool Cmdline_fb_explosions = 0;
 bool Cmdline_fb_thrusters = false;
-bool Cmdline_no_batching = false;
 extern bool ls_force_off;
 int Cmdline_shadow_quality = 0;
 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
@@ -393,11 +401,9 @@ int Cmdline_stretch_menu = 0;

 // Audio related
 cmdline_parm query_speech_arg("-query_speech", NULL, AT_NONE);	// Cmdline_query_speech
-cmdline_parm snd_preload_arg("-snd_preload", NULL, AT_NONE);		// Cmdline_snd_preload
 cmdline_parm voice_recognition_arg("-voicer", NULL, AT_NONE);	// Cmdline_voice_recognition

 int Cmdline_query_speech = 0;
-int Cmdline_snd_preload = 0; // preload game sounds during mission load
 int Cmdline_voice_recognition = 0;
 int Cmdline_no_enhanced_sound = 0;

@@ -472,6 +478,7 @@ cmdline_parm dis_weapons("-dis_weapons", NULL, AT_NONE);		// Cmdline_dis_weapons
 cmdline_parm noparseerrors_arg("-noparseerrors", NULL, AT_NONE);	// Cmdline_noparseerrors  -- turns off parsing errors -C
 cmdline_parm extra_warn_arg("-extra_warn", "Enable 'extra' warnings", AT_NONE);	// Cmdline_extra_warn
 cmdline_parm fps_arg("-fps", NULL, AT_NONE);					// Cmdline_show_fps
+cmdline_parm bmpmanusage_arg("-bmpmanusage", NULL, AT_NONE);	// Cmdline_bmpman_usage
 cmdline_parm pos_arg("-pos", NULL, AT_NONE);					// Cmdline_show_pos
 cmdline_parm stats_arg("-stats", NULL, AT_NONE);				// Cmdline_show_stats
 cmdline_parm save_render_targets_arg("-save_render_target", NULL, AT_NONE);	// Cmdline_save_render_targets
@@ -497,11 +504,13 @@ char *Cmdline_start_mission = NULL;
 int Cmdline_old_collision_sys = 0;
 int Cmdline_dis_collisions = 0;
 int Cmdline_dis_weapons = 0;
+bool Cmdline_output_sexp_info = false;
 int Cmdline_noparseerrors = 0;
 #ifdef Allow_NoWarn
 int Cmdline_nowarn = 0; // turn warnings off in FRED
 #endif
 int Cmdline_extra_warn = 0;
+int Cmdline_bmpman_usage = 0;
 int Cmdline_show_pos = 0;
 int Cmdline_show_stats = 0;
 int Cmdline_save_render_targets = 0;
@@ -522,7 +531,7 @@ bool Cmdline_show_video_info = false;
 bool Cmdline_debug_window = false;

 // Other
-cmdline_parm get_flags_arg("-get_flags", "Output the launcher flags file", AT_NONE);
+cmdline_parm get_flags_arg("-get_flags", "Output the launcher flags file", AT_STRING);
 cmdline_parm output_sexp_arg("-output_sexps", NULL, AT_NONE); //WMC - outputs all SEXPs to sexps.html
 cmdline_parm output_scripting_arg("-output_scripting", NULL, AT_NONE);	//WMC

@@ -535,6 +544,8 @@ cmdline_parm deprecated_tbp_arg("-tbp", "Deprecated", AT_NONE);
 cmdline_parm deprecated_jpgtga_arg("-jpgtga", "Deprecated", AT_NONE);
 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);

 int Cmdline_deprecated_spec = 0;
 int Cmdline_deprecated_glow = 0;
@@ -544,6 +555,7 @@ int Cmdline_deprecated_tbp = 0;
 int Cmdline_deprecated_jpgtga = 0;
 int Cmdline_deprecated_nohtl = 0;
 bool Cmdline_deprecated_brief_lighting = 0;
+bool Cmdline_deprecated_missile_lighting = false;

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

@@ -801,7 +818,7 @@ void os_validate_parms(int argc, char *argv[])
 					size_t sp = 0;
 					for (parmp = GET_FIRST(&Parm_list); parmp !=END_OF_LIST(&Parm_list); parmp = GET_NEXT(parmp) ) {
 						// don't output deprecated flags
-						if (stricmp("deprecated", parmp->help)) {
+						if (stricmp("deprecated", parmp->help) != 0) {
 							sp = strlen(parmp->name);
 							if (parmp->arg_type != AT_NONE) {
 								atp = strlen(cmdline_arg_types[parmp->arg_type]);
@@ -1143,11 +1160,14 @@ char *cmdline_parm::str()

 	return args;
 }
+bool cmdline_parm::has_param() {
+	return args != nullptr;
+}

 #ifdef SCP_UNIX
 // Return a vector with all filesystem names of "parent/dir" relative to parent.
 // dir must not contain a slash.
-static SCP_vector<SCP_string> unix_get_single_dir_names(SCP_string parent, SCP_string dir)
+static SCP_vector<SCP_string> unix_get_single_dir_names(const SCP_string& parent, const SCP_string& dir)
 {
 	SCP_vector<SCP_string> ret;

@@ -1170,7 +1190,7 @@ static SCP_vector<SCP_string> unix_get_single_dir_names(SCP_string parent, SCP_s

 // Return a vector with all filesystem names of "parent/dir" relative to parent.
 // Recurses to deal with slashes in dir.
-static SCP_vector<SCP_string> unix_get_dir_names(SCP_string parent, SCP_string dir)
+static SCP_vector<SCP_string> unix_get_dir_names(const SCP_string& parent, const SCP_string& dir)
 {
 	size_t slash = dir.find_first_of("/\\");

@@ -1241,6 +1261,257 @@ static void handle_unix_modlist(char **modlist, size_t *len)

 // external entry point into this modules

+static json_t* json_get_v1() {
+	auto root = json_object();
+
+	{
+		auto version_obj = json_object();
+
+		json_object_set_new(version_obj, "full", json_string(FS_VERSION_FULL));
+		json_object_set_new(version_obj, "major", json_integer(FS_VERSION_MAJOR));
+		json_object_set_new(version_obj, "minor", json_integer(FS_VERSION_MINOR));
+		json_object_set_new(version_obj, "build", json_integer(FS_VERSION_BUILD));
+
+		json_object_set_new(version_obj, "has_revision", json_boolean(FS_VERSION_HAS_REVIS));
+		json_object_set_new(version_obj, "revision", json_integer(FS_VERSION_REVIS));
+		json_object_set_new(version_obj, "revision_str", json_string(FS_VERSION_REVIS_STR));
+
+		json_object_set_new(root, "version", version_obj);
+	}
+	{
+		auto easy_array = json_array();
+
+		for (auto& easy_flag : easy_flags) {
+			json_array_append_new(easy_array, json_string(easy_flag.name));
+		}
+
+		json_object_set_new(root, "easy_flags", easy_array);
+	}
+	{
+		auto flags_array = json_array();
+
+		for (auto& flag : exe_params) {
+			auto flag_obj = json_object();
+
+			json_object_set_new(flag_obj, "name", json_string(flag.name));
+			json_object_set_new(flag_obj, "description", json_string(flag.desc));
+			json_object_set_new(flag_obj, "fso_only", json_boolean(flag.fso_only));
+			json_object_set_new(flag_obj, "on_flags", json_integer(flag.on_flags));
+			json_object_set_new(flag_obj, "off_flags", json_integer(flag.off_flags));
+			json_object_set_new(flag_obj, "type", json_string(flag.type));
+			json_object_set_new(flag_obj, "web_url", json_string(flag.web_url));
+
+			json_array_append_new(flags_array, flag_obj);
+		}
+
+		json_object_set_new(root, "flags", flags_array);
+	}
+	{
+		auto caps_array = json_array();
+
+		json_array_append_new(caps_array, json_string("OpenAL"));
+		json_array_append_new(caps_array, json_string("No D3D"));
+		json_array_append_new(caps_array, json_string("New Sound"));
+		json_array_append_new(caps_array, json_string("SDL"));
+
+		json_object_set_new(root, "caps", caps_array);
+	}
+	{
+		auto voices_array = json_array();
+
+		auto voices = speech_enumerate_voices();
+
+		for (auto& voice : voices) {
+			json_array_append_new(voices_array, json_string(voice.c_str()));
+		}
+
+		json_object_set_new(root, "voices", voices_array);
+	}
+	{
+		auto resolution_array = json_array();
+
+		auto displays = gr_enumerate_displays();
+
+		for (auto& display : displays) {
+			auto display_obj = json_object();
+
+			json_object_set_new(display_obj, "index", json_integer(display.index));
+			json_object_set_new(display_obj, "name", json_string(display.name.c_str()));
+
+			json_object_set_new(display_obj, "x", json_integer(display.x));
+			json_object_set_new(display_obj, "y", json_integer(display.y));
+			json_object_set_new(display_obj, "width", json_integer(display.width));
+			json_object_set_new(display_obj, "height", json_integer(display.height));
+
+			auto modes_array = json_array();
+
+			for (auto& mode : display.video_modes) {
+				auto mode_obj = json_object();
+
+				json_object_set_new(mode_obj, "x", json_integer(mode.width));
+				json_object_set_new(mode_obj, "y", json_integer(mode.height));
+				json_object_set_new(mode_obj, "bits", json_integer(mode.bit_depth));
+
+				json_array_append_new(modes_array, mode_obj);
+			}
+
+			json_object_set_new(display_obj, "modes", modes_array);
+
+			json_array_append_new(resolution_array, display_obj);
+		}
+
+		json_object_set_new(root, "displays", resolution_array);
+	}
+	{
+		auto openal_obj = json_object();
+
+		auto openal_info = openal_get_platform_information();
+
+		json_object_set_new(openal_obj, "version_major", json_integer(openal_info.version_major));
+		json_object_set_new(openal_obj, "version_minor", json_integer(openal_info.version_minor));
+
+		json_object_set(openal_obj, "default_playback", json_string(openal_info.default_playback_device.c_str()));
+		json_object_set(openal_obj, "default_capture", json_string(openal_info.default_capture_device.c_str()));
+
+		{
+			auto playback_array = json_array();
+
+			for (auto& device : openal_info.playback_devices) {
+				json_array_append_new(playback_array, json_string(device.c_str()));
+			}
+
+			json_object_set_new(openal_obj, "playback_devices", playback_array);
+		}
+		{
+			auto capture_array = json_array();
+
+			for (auto& device : openal_info.capture_devices) {
+				json_array_append_new(capture_array, json_string(device.c_str()));
+			}
+
+			json_object_set_new(openal_obj, "capture_devices", capture_array);
+		}
+		{
+			auto efx_support_obj = json_object();
+
+			for (auto& pair : openal_info.efx_support) {
+				json_object_set_new(efx_support_obj, pair.first.c_str(), json_boolean(pair.second));
+			}
+
+			json_object_set_new(openal_obj, "efx_support", efx_support_obj);
+		}
+
+		json_object_set_new(root, "openal", openal_obj);
+	}
+	{
+		auto joystick_array = json_array();
+
+		auto joysticks = io::joystick::getJoystickInformations();
+		for (auto& info : joysticks) {
+			auto joystick_obj = json_object();
+
+			json_object_set_new(joystick_obj, "name", json_string(info.name.c_str()));
+			json_object_set_new(joystick_obj, "guid", json_string(info.guid.c_str()));
+
+			json_object_set_new(joystick_obj, "num_axes", json_integer(info.num_axes));
+			json_object_set_new(joystick_obj, "num_balls", json_integer(info.num_balls));
+			json_object_set_new(joystick_obj, "num_buttons", json_integer(info.num_buttons));
+			json_object_set_new(joystick_obj, "num_hats", json_integer(info.num_hats));
+
+			json_object_set_new(joystick_obj, "is_haptic", json_boolean(info.is_haptic));
+
+			json_array_append_new(joystick_array, joystick_obj);
+		}
+
+		json_object_set_new(root, "joysticks", joystick_array);
+	}
+	{
+		json_object_set_new(root, "pref_path", json_string(os_get_config_path().c_str()));
+	}
+
+	return root;
+}
+
+static void write_flags_file() {
+	FILE *fp = fopen("flags.lch","w");
+
+	if (fp == NULL) {
+		os::dialogs::Message(os::dialogs::MESSAGEBOX_ERROR, "Error creating flag list for launcher");
+		return;
+	}
+
+	int easy_flag_size	= sizeof(EasyFlag);
+	int flag_size		= sizeof(Flag);
+
+	int num_easy_flags	= sizeof(easy_flags) / easy_flag_size;
+	int num_flags		= sizeof(exe_params) / flag_size;
+
+	// Launcher will check its using structures of the same size
+	fwrite(&easy_flag_size, sizeof(int), 1, fp);
+	fwrite(&flag_size, sizeof(int), 1, fp);
+
+	fwrite(&num_easy_flags, sizeof(int), 1, fp);
+	fwrite(&easy_flags, sizeof(easy_flags), 1, fp);
+
+	fwrite(&num_flags, sizeof(int), 1, fp);
+	fwrite(&exe_params, sizeof(exe_params), 1, fp);
+
+	{
+		// cheap and bastardly cap check for builds
+		// (needs to be compatible with older Launchers, which means having
+		//  this implies an OpenAL build for old Launchers)
+		ubyte build_caps = 0;
+
+		/* portej05 defined this always */
+		build_caps |= BUILD_CAPS_OPENAL;
+		build_caps |= BUILD_CAPS_NO_D3D;
+		build_caps |= BUILD_CAPS_NEW_SND;
+		build_caps |= BUILD_CAPS_SDL;
+
+		fwrite(&build_caps, 1, 1, fp);
+	}
+
+	fflush(fp);
+	fclose(fp);
+}
+
+static flag_output_type get_flags_output_type() {
+	Assertion(get_flags_arg.found(), "This function is only valid if -get_flags is present!");
+
+	if (!get_flags_arg.has_param()) {
+		// Default to binary mode
+		return flag_output_type::Binary;
+	}
+
+	SCP_string type(get_flags_arg.str());
+
+	if (type == "binary") {
+		return flag_output_type::Binary;
+	} else if (type == "json_v1") {
+		return flag_output_type::Json_V1;
+	} else {
+		// This is supposed to make it easy for the launcher to recognize an unsupported type
+		printf("OUTPUT TYPE NOT SUPPORTED!\n");
+		// Default to json in this case so that no flags.lch file is created
+		return flag_output_type::Json_V1;
+	}
+}
+
+static void write_flags() {
+	auto type = get_flags_output_type();
+	switch(type) {
+	case flag_output_type::Binary:
+		write_flags_file();
+		break;
+	case flag_output_type::Json_V1:
+		json_t* root = json_get_v1();
+
+		json_dumpf(root, stdout, JSON_INDENT(4));
+		json_decref(root);
+		break;
+	}
+}
+
 bool SetCmdlineParams()
 // Sets externed variables used for communication cmdline information
 {
@@ -1248,47 +1519,7 @@ bool SetCmdlineParams()

 	// DO THIS FIRST to avoid unrecognized flag warnings when just getting flag file
 	if ( get_flags_arg.found() ) {
-		FILE *fp = fopen("flags.lch","w");
-		
-		if (fp == NULL) {
-			os::dialogs::Message(os::dialogs::MESSAGEBOX_ERROR, "Error creating flag list for launcher");
-			return false; 
-		}
-		
-		int easy_flag_size	= sizeof(EasyFlag);
-		int flag_size		= sizeof(Flag);
-		
-		int num_easy_flags	= sizeof(easy_flags) / easy_flag_size;
-		int num_flags		= sizeof(exe_params) / flag_size;
-		
-		// Launcher will check its using structures of the same size
-		fwrite(&easy_flag_size, sizeof(int), 1, fp);
-		fwrite(&flag_size, sizeof(int), 1, fp);
-		
-		fwrite(&num_easy_flags, sizeof(int), 1, fp);
-		fwrite(&easy_flags, sizeof(easy_flags), 1, fp);
-		
-		fwrite(&num_flags, sizeof(int), 1, fp);
-		fwrite(&exe_params, sizeof(exe_params), 1, fp);
-		
-		{
-			// cheap and bastardly cap check for builds
-			// (needs to be compatible with older Launchers, which means having
-			//  this implies an OpenAL build for old Launchers)
-			ubyte build_caps = 0;
-			
-			/* portej05 defined this always */
-			build_caps |= BUILD_CAPS_OPENAL;
-			build_caps |= BUILD_CAPS_NO_D3D;
-			build_caps |= BUILD_CAPS_NEW_SND;
-			build_caps |= BUILD_CAPS_SDL;
-			
-			
-			fwrite(&build_caps, 1, 1, fp);
-		}
-		
-		fflush(fp);
-		fclose(fp);
+		write_flags();
 		
 		return false; 
 	}
@@ -1541,6 +1772,11 @@ bool SetCmdlineParams()
 		Show_framerate = 1;
 	}

+	if (bmpmanusage_arg.found())
+	{
+		Cmdline_bmpman_usage = 1;
+	}
+
 	if(pos_arg.found())
 	{
 		Cmdline_show_pos = 1;
@@ -1667,7 +1903,7 @@ bool SetCmdlineParams()
 		Output_scripting_meta = true;

 	if (output_sexp_arg.found() ) {
-		output_sexps("sexps.html");
+		Cmdline_output_sexp_info = true;
 	}

 	if ( no_pbo_arg.found() )
@@ -1721,11 +1957,6 @@ bool SetCmdlineParams()
 	}
 #endif

-	if ( snd_preload_arg.found() )
-	{
-		Cmdline_snd_preload = 1;
-	}
-
 	if ( env.found() ) {
 		Cmdline_env = 0;
 	}
@@ -1764,9 +1995,6 @@ bool SetCmdlineParams()
 	if ( rearm_timer_arg.found() )
 		Cmdline_rearm_timer = 1;

-	if ( missile_lighting_arg.found() )
-		Cmdline_missile_lighting = 1;
-
 	if ( save_render_targets_arg.found() )
 		Cmdline_save_render_targets = 1;
 	
@@ -1801,11 +2029,6 @@ bool SetCmdlineParams()
        Cmdline_fb_thrusters = true;
    }

-	if ( no_batching.found() ) 
-	{
-		Cmdline_no_batching = true;
-	}
-
 	if ( postprocess_arg.found() )
 	{
 		Cmdline_postprocess = 1;
@@ -1841,6 +2064,11 @@ bool SetCmdlineParams()
 		Cmdline_no_deferred_lighting = 1;
 	}

+	if (anisotropy_level_arg.found()) 
+	{
+		Cmdline_aniso_level = anisotropy_level_arg.get_int();
+	}
+
 	if (frame_profile_write_file.found())
 	{
 		Cmdline_profile_write_file = true;
@@ -1926,6 +2154,11 @@ bool SetCmdlineParams()
 		Cmdline_deprecated_brief_lighting = 1;
 	}

+	if (deprecated_missile_lighting_arg.found())
+	{
+		Cmdline_deprecated_missile_lighting = true;
+	}
+
 	return true; 
 }

@@ -62,7 +62,6 @@ extern float static_point_factor;
 extern float static_tube_factor;
 extern int Cmdline_ambient_factor;
 extern int Cmdline_env;
-extern int Cmdline_missile_lighting;
 extern int Cmdline_glow;
 extern int Cmdline_nomotiondebris;
 extern int Cmdline_noscalevid;	// disables fit-to-window for movies - taylor
@@ -77,10 +76,10 @@ extern bool Cmdline_fxaa;
 extern int Cmdline_fxaa_preset;
 extern bool Cmdline_fb_explosions;
 extern bool Cmdline_fb_thrusters;
-extern bool Cmdline_no_batching;
 extern int Cmdline_shadow_quality;
 extern int Cmdline_no_deferred_lighting;
 extern int Cmdline_no_emissive;
+extern int Cmdline_aniso_level;

 // Game Speed related
 extern int Cmdline_cache_bitmaps;
@@ -104,7 +103,6 @@ extern int Cmdline_stretch_menu;

 // Audio related
 extern int Cmdline_query_speech;
-extern int Cmdline_snd_preload;
 extern int Cmdline_voice_recognition;
 extern int Cmdline_no_enhanced_sound;

@@ -146,8 +144,10 @@ extern char *Cmdline_start_mission;
 extern int Cmdline_old_collision_sys;
 extern int Cmdline_dis_collisions;
 extern int Cmdline_dis_weapons;
+extern bool Cmdline_output_sexp_info;
 extern int Cmdline_noparseerrors;
 extern int Cmdline_extra_warn;
+extern int Cmdline_bmpman_usage;
 extern int Cmdline_show_pos;
 extern int Cmdline_show_stats;
 extern int Cmdline_save_render_targets;
@@ -92,7 +92,7 @@ void cmeasure_maybe_alert_success(object *objp)

 	if ( objp->parent == OBJ_INDEX(Player_obj) ) {
 		hud_start_text_flash(XSTR("Evaded", 1430), 800);
-		snd_play(&Snds[ship_get_sound(Player_obj, SND_MISSILE_EVADED_POPUP)]);
+		snd_play(gamesnd_get_game_sound(ship_get_sound(Player_obj, GameSounds::MISSILE_EVADED_POPUP)));
 	} else if ( Objects[objp->parent].flags[Object::Object_Flags::Player_ship] ) {
 		send_countermeasure_success_packet( objp->parent );
 	}
@@ -356,7 +356,7 @@ DCF_BOOL(show_controls_info, Show_controls_info);

 static int Axes_origin[JOY_NUM_AXES];

-static int joy_get_unscaled_reading(int raw, int axn)
+static int joy_get_unscaled_reading(int raw)
 {
 	int rng;

@@ -615,7 +615,7 @@ int control_config_undo_last()
 	int i, z, tab;

 	if (!Config_item_undo) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return -1;
 	}

@@ -664,7 +664,7 @@ int control_config_undo_last()
 	free_undo_block();
 	control_config_conflict_check();
 	control_config_list_prepare();
-	gamesnd_play_iface(SND_USER_SELECT);
+	gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 	return 0;
 }

@@ -715,7 +715,7 @@ int control_config_remove_binding()
 	config_item_undo *ptr;

 	if (Selected_line < 0) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return -1;
 	}

@@ -723,7 +723,7 @@ int control_config_remove_binding()
 	if (z & JOY_AXIS) {
 		z &= ~JOY_AXIS;
 		if (Axis_map_to[z] < 0) {
-			gamesnd_play_iface(SND_GENERAL_FAIL);
+			gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 			return -1;
 		}

@@ -731,13 +731,13 @@ int control_config_remove_binding()
 		Axis_map_to[z] = -1;
 		control_config_conflict_check();
 		control_config_list_prepare();
-		gamesnd_play_iface(SND_USER_SELECT);
+		gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 		Selected_item = -1;
 		return 0;
 	}

 	if ((Control_config[z].joy_id < 0) && (Control_config[z].key_id < 0)) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return -1;
 	}

@@ -755,7 +755,7 @@ int control_config_remove_binding()

 	control_config_conflict_check();
 	control_config_list_prepare();
-	gamesnd_play_iface(SND_USER_SELECT);
+	gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 	Selected_item = -1;
 	return 0;
 }
@@ -766,7 +766,7 @@ int control_config_clear_other()
 	config_item_undo *ptr;

 	if (Selected_line < 0) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return -1;
 	}

@@ -776,7 +776,7 @@ int control_config_clear_other()

 		z &= ~JOY_AXIS;
 		if (Axis_map_to[z] < 0) {
-			gamesnd_play_iface(SND_GENERAL_FAIL);
+			gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 			return -1;
 		}

@@ -787,7 +787,7 @@ int control_config_clear_other()
 		}

 		if (!total) {
-			gamesnd_play_iface(SND_GENERAL_FAIL);
+			gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 			return -1;
 		}

@@ -808,7 +808,7 @@ int control_config_clear_other()
 		}
 		control_config_conflict_check();
 		control_config_list_prepare();
-		gamesnd_play_iface(SND_USER_SELECT);
+		gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 		return 0;
 	}

@@ -820,12 +820,12 @@ int control_config_clear_other()
 		}
 	}
 	if (!total) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return -1;
 	}

 	if ((Control_config[z].joy_id < 0) && (Control_config[z].key_id < 0)) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return -1;
 	}

@@ -850,7 +850,7 @@ int control_config_clear_other()
 	}
 	control_config_conflict_check();
 	control_config_list_prepare();
-	gamesnd_play_iface(SND_USER_SELECT);
+	gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 	return 0;
 }

@@ -867,7 +867,7 @@ int control_config_clear_all()
 	}

 	if (!total) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return -1;
 	}

@@ -888,7 +888,7 @@ int control_config_clear_all()

 	control_config_conflict_check();
 	control_config_list_prepare();
-	gamesnd_play_iface(SND_RESET_PRESSED);
+	gamesnd_play_iface(InterfaceSounds::RESET_PRESSED);
 	return 0;
 }

@@ -945,7 +945,7 @@ int control_config_do_reset()
 	}

 	if (!total && !cycling_presets) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return -1;
 	}

@@ -981,7 +981,7 @@ int control_config_do_reset()

 	control_config_conflict_check();
 	control_config_list_prepare();
-	gamesnd_play_iface(SND_RESET_PRESSED);
+	gamesnd_play_iface(InterfaceSounds::RESET_PRESSED);
 	return 0;
 }

@@ -1026,10 +1026,10 @@ void control_config_scroll_screen_up()
 		}

 		Selected_item = -1;
-		gamesnd_play_iface(SND_SCROLL);
+		gamesnd_play_iface(InterfaceSounds::SCROLL);

 	} else {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 	}
 }

@@ -1042,10 +1042,10 @@ void control_config_scroll_line_up()
 		}

 		Selected_item = -1;
-		gamesnd_play_iface(SND_SCROLL);
+		gamesnd_play_iface(InterfaceSounds::SCROLL);

 	} else {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 	}
 }

@@ -1059,10 +1059,10 @@ void control_config_scroll_screen_down()
 		}

 		Selected_item = -1;
-		gamesnd_play_iface(SND_SCROLL);
+		gamesnd_play_iface(InterfaceSounds::SCROLL);

 	} else {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 	}
 }

@@ -1076,10 +1076,10 @@ void control_config_scroll_line_down()
 		}

 		Selected_item = -1;
-		gamesnd_play_iface(SND_SCROLL);
+		gamesnd_play_iface(InterfaceSounds::SCROLL);

 	} else {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 	}
 }

@@ -1091,13 +1091,13 @@ void control_config_toggle_modifier(int bit)
 	Assert(!(z & JOY_AXIS));
 	k = Control_config[z].key_id;
 	if (k < 0) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return;
 	}

 	control_config_bind_key(z, k ^ bit);
 	control_config_conflict_check();
-	gamesnd_play_iface(SND_USER_SELECT);
+	gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 }

 void control_config_toggle_invert()
@@ -1118,7 +1118,7 @@ void control_config_do_bind()
 	game_flush();
 //	if ((Selected_line < 0) || (Cc_lines[Selected_line].cc_index & JOY_AXIS)) {
 	if (Selected_line < 0) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return;
 	}

@@ -1142,7 +1142,7 @@ void control_config_do_bind()
 	Search_mode = 0;
 	Last_key = -1;
 	Axis_override = -1;
-	gamesnd_play_iface(SND_USER_SELECT);
+	gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 }

 void control_config_do_search()
@@ -1166,7 +1166,7 @@ void control_config_do_search()
 	Binding_mode = 0;
 	Search_mode = 1;
 	Last_key = -1;
-	gamesnd_play_iface(SND_USER_SELECT);
+	gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 }

 void control_config_do_cancel(int fail = 0)
@@ -1189,9 +1189,9 @@ void control_config_do_cancel(int fail = 0)

 	Binding_mode = Search_mode = 0;
 	if (fail){
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 	} else {
-		gamesnd_play_iface(SND_USER_SELECT);
+		gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 	}
 }

@@ -1206,13 +1206,13 @@ int control_config_accept()
 	}

 	if (i < NUM_TABS) {
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 		return -1;
 	}

 	hud_squadmsg_save_keys();  // rebuild map for saving/restoring keys in squadmsg mode
 	gameseq_post_event(GS_EVENT_PREVIOUS_STATE);
-	gamesnd_play_iface(SND_COMMIT_PRESSED);
+	gamesnd_play_iface(InterfaceSounds::COMMIT_PRESSED);
 	return 0;
 }

@@ -1237,7 +1237,7 @@ void control_config_button_pressed(int n)
 			Tab = n;
 			Scroll_offset = Selected_line = 0;
 			control_config_list_prepare();
-			gamesnd_play_iface(SND_SCREEN_MODE_PRESSED);
+			gamesnd_play_iface(InterfaceSounds::SCREEN_MODE_PRESSED);
 			break;

 		case BIND_BUTTON:
@@ -1250,17 +1250,17 @@ void control_config_button_pressed(int n)

 		case SHIFT_TOGGLE:
 			control_config_toggle_modifier(KEY_SHIFTED);
-			gamesnd_play_iface(SND_USER_SELECT);
+			gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 			break;

 		case ALT_TOGGLE:
 			control_config_toggle_modifier(KEY_ALTED);
-			gamesnd_play_iface(SND_USER_SELECT);
+			gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 			break;

 		case INVERT_AXIS:
 			control_config_toggle_invert();
-			gamesnd_play_iface(SND_USER_SELECT);
+			gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 			break;

 		case SCROLL_UP_BUTTON:
@@ -1281,7 +1281,7 @@ void control_config_button_pressed(int n)

 		case HELP_BUTTON:
 			launch_context_help();
-			gamesnd_play_iface(SND_HELP_PRESSED);
+			gamesnd_play_iface(InterfaceSounds::HELP_PRESSED);
 			break;

 		case RESET_BUTTON:
@@ -1799,7 +1799,7 @@ void control_config_do_frame(float frametime)

 				Scroll_offset = Selected_line = 0;
 				control_config_list_prepare();
-				gamesnd_play_iface(SND_SCREEN_MODE_PRESSED);
+				gamesnd_play_iface(InterfaceSounds::SCREEN_MODE_PRESSED);
 				break;

 			case KEY_TAB:  // activate next tab
@@ -1810,7 +1810,7 @@ void control_config_do_frame(float frametime)

 				Scroll_offset = Selected_line = 0;
 				control_config_list_prepare();
-				gamesnd_play_iface(SND_SCREEN_MODE_PRESSED);
+				gamesnd_play_iface(InterfaceSounds::SCREEN_MODE_PRESSED);
 				break;

 			case KEY_LEFT:
@@ -1825,7 +1825,7 @@ void control_config_do_frame(float frametime)
 					}
 				}

-				gamesnd_play_iface(SND_SCROLL);
+				gamesnd_play_iface(InterfaceSounds::SCROLL);
 				break;

 			case KEY_RIGHT:
@@ -1837,7 +1837,7 @@ void control_config_do_frame(float frametime)
 				} else if (Selected_item > 1) {
 					Selected_item = -1;
 				}
-				gamesnd_play_iface(SND_SCROLL);
+				gamesnd_play_iface(InterfaceSounds::SCROLL);
 				break;

 			case KEY_BACKSP:  // undo
@@ -1873,7 +1873,7 @@ void control_config_do_frame(float frametime)
 				Selected_item = 1;
 			}

-			gamesnd_play_iface(SND_USER_SELECT);
+			gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 		}

 		if (List_buttons[i].double_clicked()) {
@@ -2379,7 +2379,7 @@ void control_get_axes_readings(int *h, int *p, int *b, int *ta, int *tr)

 	*ta = 0;
 	if (Axis_map_to[3] >= 0) {
-		*ta = joy_get_unscaled_reading(axes_values[Axis_map_to[3]], Axis_map_to[3]);
+		*ta = joy_get_unscaled_reading(axes_values[Axis_map_to[3]]);
 	}

 	*tr = 0;
@@ -7,8 +7,8 @@
 *
 */ 

-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>

 #include "cfile/cfile.h"
 #include "controlconfig/controlsconfig.h"
@@ -201,7 +201,7 @@ config_item Control_config[CCFG_MAX + 1] = {

 const char *Scan_code_text_german[] = {
 	"",				"Esc",				"1",				"2",				"3",				"4",				"5",				"6",
-	"7",				"8",				"9",				"0",				"Akzent '",				"Eszett",				"R\x81""cktaste",		"Tab",
+	"7",				"8",				"9",				"0",				"Akzent '",				"Eszett",				"R\x81""cktaste",		"Tab", // NOLINT
 	"Q",				"W",				"E",				"R",				"T",				"Z",				"U",				"I",
 	"O",				"P",				"\x9A",				"+",				"Eingabe",			"Strg Links",			"A",				"S",

@@ -251,8 +251,8 @@ const char *Joy_button_text_german[] = {
 };

 const char *Scan_code_text_french[] = {
-	"",				"\x90""chap",			"1",				"2",				"3",				"4",				"5",				"6",
-	"7",				"8",				"9",				"0",				"-",				"=",				"Fl\x82""che Ret.",			"Tab",
+	"",				"\x90""chap",			"1",				"2",				"3",				"4",				"5",				"6", // NOLINT
+	"7",				"8",				"9",				"0",				"-",				"=",				"Fl\x82""che Ret.",			"Tab",  // NOLINT
 	"Q",				"W",				"E",				"R",				"T",				"Y",				"U",				"I",
 	"O",				"P",				"[",				"]",				"Entr\x82""e",			"Ctrl Gauche",			"A",				"S",

@@ -14,6 +14,11 @@ bool Decoder::tryPopAudioData(AudioFramePtr& out) {
 	return res == queue_op_status::success;
 }

+bool Decoder::tryPopSubtitleData(SubtitleFramePtr& out) {
+	auto res = m_subtitleQueue->try_pull_front(out);
+	return res == queue_op_status::success;
+}
+
 bool Decoder::tryPopVideoFrame(VideoFramePtr& out) {
 	auto res = m_videoQueue->try_pull_front(out);
 	return res == queue_op_status::success;
@@ -24,6 +29,7 @@ void Decoder::initializeQueues(size_t queueSize) {

 	m_videoQueue.reset(new sync_bounded_queue<VideoFramePtr>(m_queueSize));
 	m_audioQueue.reset(new sync_bounded_queue<AudioFramePtr>(m_queueSize));
+	m_subtitleQueue.reset(new sync_bounded_queue<SubtitleFramePtr>(m_queueSize));
 }

 void Decoder::stopDecoder() {
@@ -31,6 +37,7 @@ void Decoder::stopDecoder() {

 	m_videoQueue->close();
 	m_audioQueue->close();
+	m_subtitleQueue->close();
 }

 bool Decoder::canPushAudioData() {
@@ -48,6 +55,20 @@ void Decoder::pushAudioData(AudioFramePtr&& data) {
 	}
 }

+bool Decoder::canPushSubtitleData() {
+	return !isSubtitleQueueFull();
+}
+void Decoder::pushSubtitleData(SubtitleFramePtr&& data) {
+	Assertion(data, "Invalid audio data passed!");
+
+	try {
+		m_subtitleQueue->push_back(std::move(data));
+	}
+	catch (sync_queue_is_closed&) {
+		// Ignore
+	}
+}
+
 bool Decoder::canPushVideoData() {
 	return !isVideoQueueFull();
 }
@@ -58,6 +58,14 @@ struct AudioFrame {
 };
 typedef std::unique_ptr<AudioFrame> AudioFramePtr;

+struct SubtitleFrame {
+    double displayStartTime = -1.0;
+    double displayEndTime = -1.0;
+
+	SCP_string text;
+};
+typedef std::unique_ptr<SubtitleFrame> SubtitleFramePtr;
+
 /**
 * @brief Abstract class for decoding a video or audio stream
 *
@@ -68,6 +76,7 @@ class Decoder {
 private:
 	std::unique_ptr<sync_bounded_queue<VideoFramePtr>> m_videoQueue;
 	std::unique_ptr<sync_bounded_queue<AudioFramePtr>> m_audioQueue;
+	std::unique_ptr<sync_bounded_queue<SubtitleFramePtr>> m_subtitleQueue;

 	bool m_decoding;
 	size_t m_queueSize = 0;
@@ -96,7 +105,7 @@ class Decoder {
 	 * @brief Returns the properties of the video
 	 * @return The properties
 	 */
-	virtual MovieProperties getProperties() = 0;
+	virtual MovieProperties getProperties() const = 0;

 	/**
 	 * @brief Starts decoding the video
@@ -107,7 +116,9 @@ class Decoder {
 	 * @brief Determines if the video has audio
 	 * @return @c true if audio is included in the video
 	 */
-	virtual bool hasAudio() = 0;
+	virtual bool hasAudio() const = 0;
+
+	virtual bool hasSubtitles() const = 0;

 	/**
 	 * @brief Ends decoding of the video file
@@ -122,6 +133,14 @@ class Decoder {

 	bool tryPopAudioData(AudioFramePtr&);

+	bool isSubtitleQueueFull() { return m_subtitleQueue->size() == m_queueSize; }
+
+	bool isSubtitleFrameAvailable() { return !m_subtitleQueue->empty(); }
+
+	size_t getSubtitleQueueSize() { return m_subtitleQueue->size(); }
+
+	bool tryPopSubtitleData(SubtitleFramePtr&);
+
 	bool isVideoQueueFull() { return m_videoQueue->size() == m_queueSize; }

 	bool isVideoFrameAvailable() { return !m_videoQueue->empty(); }
@@ -141,6 +160,10 @@ class Decoder {

 	void pushAudioData(AudioFramePtr&& data);

+	bool canPushSubtitleData();
+
+	void pushSubtitleData(SubtitleFramePtr&& data);
+
 	bool canPushVideoData();

 	void pushFrameData(VideoFramePtr&& frame);
@@ -0,0 +1,95 @@
+#include "VideoPresenter.h"
+
+#include "graphics/matrix.h"
+
+using namespace cutscene;
+using namespace cutscene::player;
+
+namespace {
+struct movie_vertex {
+	vec2d pos;
+	vec2d uv;
+};
+}
+
+namespace cutscene {
+namespace player {
+VideoPresenter::VideoPresenter(const MovieProperties& props) {
+	GR_DEBUG_SCOPE("Init video");
+
+	auto w = static_cast<int>(props.size.width);
+	auto h = static_cast<int>(props.size.height);
+
+	// Create buffer textures
+	_yTexBuffer.reset(new uint8_t[w * h]);
+	_ytex = bm_create(8, w, h, _yTexBuffer.get(), BMP_AABITMAP);
+
+	_uTexBuffer.reset(new uint8_t[w / 2 * h / 2]);
+	_utex = bm_create(8, w / 2, h / 2, _uTexBuffer.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(&_render_material, _ytex, _utex, _vtex);
+}
+
+VideoPresenter::~VideoPresenter() {
+	GR_DEBUG_SCOPE("Deinit video");
+
+	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();
+
+	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);
+
+	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) {
+	GR_DEBUG_SCOPE("Draw video frame");
+
+	movie_vertex vertex_data[4];
+
+	vertex_data[0].pos.x = x1;
+	vertex_data[0].pos.y = y1;
+	vertex_data[0].uv.x = 0.0f;
+	vertex_data[0].uv.y = 0.0f;
+
+	vertex_data[1].pos.x = x1;
+	vertex_data[1].pos.y = y2;
+	vertex_data[1].uv.x = 0.0f;
+	vertex_data[1].uv.y = 1.0f;
+
+	vertex_data[2].pos.x = x2;
+	vertex_data[2].pos.y = y1;
+	vertex_data[2].uv.x = 1.0f;
+	vertex_data[2].uv.y = 0.0f;
+
+	vertex_data[3].pos.x = x2;
+	vertex_data[3].pos.y = y2;
+	vertex_data[3].uv.x = 1.0f;
+	vertex_data[3].uv.y = 1.0f;
+
+	// Use the immediate buffer for storing our data since that is exactly what we need
+	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]), offset + offsetof(movie_vertex, pos));
+	layout.add_vertex_component(vertex_format_data::TEX_COORD2, sizeof(vertex_data[0]), offset + offsetof(movie_vertex, uv));
+
+	gr_render_movie(&_render_material, PRIM_TYPE_TRISTRIP, &layout, 4, gr_immediate_buffer_handle);
+}
+
+}
+}
@@ -0,0 +1,42 @@
+#ifndef FS2_OPEN_OPENGLVIDEOPRESENTER_H
+#define FS2_OPEN_OPENGLVIDEOPRESENTER_H
+
+#include "globalincs/pstypes.h"
+#include "graphics/2d.h"
+#include "graphics/material.h"
+#include "cutscene/Decoder.h"
+
+#include <memory>
+
+namespace cutscene {
+namespace player {
+
+class VideoPresenter {
+	int _ytex = -1;
+	std::unique_ptr<uint8_t[]> _yTexBuffer;
+
+	int _utex = -1;
+	std::unique_ptr<uint8_t[]> _uTexBuffer;
+
+	int _vtex = -1;
+	std::unique_ptr<uint8_t[]> _vTexBuffer;
+
+	movie_material _render_material;
+ public:
+	explicit VideoPresenter(const MovieProperties& props);
+
+	// Disallow copying
+	VideoPresenter(const VideoPresenter&) = delete;
+	VideoPresenter& operator=(const VideoPresenter&) = delete;
+
+	virtual ~VideoPresenter();
+
+	void uploadVideoFrame(const VideoFramePtr& frame);
+
+	void displayFrame(float x1, float y1, float x2, float y2);
+};
+}
+}
+
+
+#endif //FS2_OPEN_OPENGLVIDEOPRESENTER_H
@@ -286,10 +286,10 @@ void cutscenes_screen_scroll_line_up()
 	if (Selected_line)
 	{
 		Selected_line--;
-		gamesnd_play_iface(SND_SCROLL);
+		gamesnd_play_iface(InterfaceSounds::SCROLL);

 	} else
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);

 	if (Selected_line < Scroll_offset)
 		Scroll_offset = Selected_line;
@@ -302,10 +302,10 @@ void cutscenes_screen_scroll_line_down()
 	if (Selected_line < (int) Cutscene_list.size() - 1)
 	{
 		Selected_line++;
-		gamesnd_play_iface(SND_SCROLL);
+		gamesnd_play_iface(InterfaceSounds::SCROLL);

 	} else
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);

 	h = Cutscene_list_coords[gr_screen.res][3] / gr_get_font_height();
 	if (Selected_line >= Scroll_offset + h)
@@ -328,11 +328,11 @@ void cutscenes_screen_scroll_screen_up()
 			Selected_line--;
 		}

-		gamesnd_play_iface(SND_SCROLL);
+		gamesnd_play_iface(InterfaceSounds::SCROLL);

 	} else
 	{
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 	}
 }

@@ -349,10 +349,10 @@ void cutscenes_screen_scroll_screen_down()
 			Selected_line = Scroll_offset;
 		}

-		gamesnd_play_iface(SND_SCROLL);
+		gamesnd_play_iface(InterfaceSounds::SCROLL);
 	} else
 	{
-		gamesnd_play_iface(SND_GENERAL_FAIL);
+		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
 	}
 }

@@ -361,17 +361,17 @@ int cutscenes_screen_button_pressed(int n)
 	switch (n)
 	{
 		case TECH_DATABASE_BUTTON:
-			gamesnd_play_iface(SND_SWITCH_SCREENS);
+			gamesnd_play_iface(InterfaceSounds::SWITCH_SCREENS);
 			gameseq_post_event(GS_EVENT_TECH_MENU);
 			return 1;

 		case SIMULATOR_BUTTON:
-			gamesnd_play_iface(SND_SWITCH_SCREENS);
+			gamesnd_play_iface(InterfaceSounds::SWITCH_SCREENS);
 			gameseq_post_event(GS_EVENT_SIMULATOR_ROOM);
 			return 1;

 		case CREDITS_BUTTON:
-			gamesnd_play_iface(SND_SWITCH_SCREENS);
+			gamesnd_play_iface(InterfaceSounds::SWITCH_SCREENS);
 			gameseq_post_event(GS_EVENT_CREDITS);
 			return 1;

@@ -388,7 +388,7 @@ int cutscenes_screen_button_pressed(int n)
 			break;

 		case EXIT_BUTTON:
-			gamesnd_play_iface(SND_COMMIT_PRESSED);
+			gamesnd_play_iface(InterfaceSounds::COMMIT_PRESSED);
 			gameseq_post_event(GS_EVENT_MAIN_MENU);
 			game_flush();
 			break;
@@ -55,6 +55,9 @@ int resample_convert(SwrContext* ctx, uint8_t** output,
 #ifdef WITH_LIBAV
 	return avresample_convert(ctx, output, out_plane_size, out_samples, input, in_plane_size, in_samples);
 #else
+	(void)out_plane_size;
+	(void)in_plane_size;
+
 	return swr_convert(ctx, output, out_samples, (const uint8_t**) input, in_samples);
 #endif
 }
@@ -25,11 +25,11 @@ class AudioDecoder: public FFMPEGStreamDecoder<AudioFrame> {
 public:
 	explicit AudioDecoder(DecoderStatus* status);

-	virtual ~AudioDecoder();
+	~AudioDecoder() override;

-	virtual void decodePacket(AVPacket* packet) SCP_OVERRIDE;
+	void decodePacket(AVPacket* packet) override;

-	virtual void finishDecoding() SCP_OVERRIDE;
+	void finishDecoding() override;
 };
 }
 }
@@ -9,6 +9,10 @@

 #include "cutscene/ffmpeg/AudioDecoder.h"
 #include "cutscene/ffmpeg/VideoDecoder.h"
+#include "cutscene/ffmpeg/SubtitleDecoder.h"
+
+#include "FFMPEGDecoder.h"
+#include "localization/localize.h"

 using namespace libs::ffmpeg;

@@ -36,6 +40,8 @@ const char* CHECKED_EXTENSIONS[] = {
 	"mve"
 };

+const char *CHECKED_SUBT_EXTENSIONS[] = {"srt"};
+
 double getFrameRate(AVStream* stream, AVCodecContext* codecCtx) {
 	auto fps = av_q2d(av_stream_get_r_frame_rate(stream));

@@ -52,26 +58,48 @@ 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;
-	paras.height = stream->codecpar->height;
+	paras.width        = stream->codecpar->width;
+	paras.height       = stream->codecpar->height;
 	paras.pixel_format = (AVPixelFormat)stream->codecpar->format;

 	paras.channel_layout = stream->codecpar->channel_layout;
-	paras.sample_rate = stream->codecpar->sample_rate;
-	paras.audio_format = (AVSampleFormat)stream->codecpar->format;
+	paras.sample_rate    = stream->codecpar->sample_rate;
+	paras.audio_format   = (AVSampleFormat)stream->codecpar->format;
+
+	paras.codec_id = stream->codecpar->codec_id;
 #else
-    paras.width = stream->codec->width;
-	paras.height = stream->codec->height;
+	paras.width        = stream->codec->width;
+	paras.height       = stream->codec->height;
 	paras.pixel_format = stream->codec->pix_fmt;

 	paras.channel_layout = stream->codec->channel_layout;
-	paras.sample_rate = stream->codec->sample_rate;
-	paras.audio_format = stream->codec->sample_fmt;
+	paras.sample_rate    = stream->codec->sample_rate;
+	paras.audio_format   = stream->codec->sample_fmt;
+
+	paras.codec_id = stream->codec->codec_id;
 #endif
-    return paras;
+	return paras;
+}
+
+SCP_string normalizeLanguage(const char *langauge_name) {
+	if (!stricmp(langauge_name, "eng")) {
+		return "English";
+	}
+	if (!stricmp(langauge_name, "ger")) {
+		return "German";
+	}
+	if (!stricmp(langauge_name, "spa")) {
+		return "Spanish";
+	}
+
+	// Print to log so that we can find the actual value more easily later
+	mprintf(("FFmpeg log: Found unknown language value '%s'!\n", langauge_name));
+
+	// Default to english for everything else
+	return "English";
 }
 }

@@ -118,7 +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<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();
@@ -140,7 +169,7 @@ std::unique_ptr<DecoderStatus> initializeStatus(std::unique_ptr<InputStream>& st
 	if (audioStream < 0) {
 		if (audioStream == AVERROR_STREAM_NOT_FOUND) {
 			mprintf(("FFmpeg: No audio stream found in file!\n"));
-		} else if (videoStream == AVERROR_DECODER_NOT_FOUND) {
+		} 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"));
@@ -155,7 +184,54 @@ std::unique_ptr<DecoderStatus> initializeStatus(std::unique_ptr<InputStream>& st
 		status->audioStream = ctx->streams[audioStream];
 	}

-	status->videoCodecPars = getCodecParameters(status->videoStream);
+	if (subt) {
+		auto subtCtx = subt->m_ctx->ctx();
+
+		auto subtStream = av_find_best_stream(subtCtx, AVMEDIA_TYPE_SUBTITLE, -1, -1, nullptr, 0);
+		if (subtStream < 0) {
+			if (subtStream == AVERROR_STREAM_NOT_FOUND) {
+				mprintf(("FFmpeg: No subtitle stream found in subtitle file!\n"));
+			} else if (subtStream == AVERROR_DECODER_NOT_FOUND) {
+				mprintf(("FFmpeg: Codec for subtitle stream could not be found!\n"));
+			} else {
+				mprintf(("FFmpeg: Unknown error while finding subtitle stream!\n"));
+			}
+		} else {
+			status->subtitleStream      = subtCtx->streams[subtStream];
+			status->externalSubtitles   = true;
+			status->subtitleStreamIndex = subtStream;
+		}
+	}
+
+	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];
+		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;
+
+			if (!(pars->codec_type == AVMEDIA_TYPE_SUBTITLE)) {
+				continue;
+			}
+#endif
+			AVDictionaryEntry *tag = nullptr;
+			if ((tag = av_dict_get(test_stream->metadata, "language", nullptr, 0)) == nullptr) {
+				continue;
+			}
+
+			auto normalized_language = normalizeLanguage(tag->value);
+
+			if (!stricmp(normalized_language.c_str(), current_language.lang_name)) {
+				status->subtitleStreamIndex = i;
+				status->subtitleStream      = test_stream;
+				break;
+			}
+		}
+	}
+
+    status->videoCodecPars = getCodecParameters(status->videoStream);

 	int err;
 #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
@@ -213,6 +289,38 @@ std::unique_ptr<DecoderStatus> initializeStatus(std::unique_ptr<InputStream>& st
 			status->audioCodec->name ? status->audioCodec->name : "<Unknown>"));
 	}

+	if (status->subtitleStream != nullptr) {
+		// Not really sure if this makes sense for subtitles but it shouldn't break anything...
+		status->subtitleCodecPars = getCodecParameters(status->subtitleStream);
+
+		status->subtitleCodec = avcodec_find_decoder(status->subtitleCodecPars.codec_id);
+
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+		status->subtitleCodecCtx = avcodec_alloc_context3(status->subtitleCodec);
+
+		err = avcodec_parameters_to_context(status->subtitleCodecCtx, status->subtitleStream->codecpar);
+		if (err < 0) {
+			char errorStr[512];
+			av_strerror(err, errorStr, sizeof(errorStr));
+			mprintf(("FFMPEG: Failed to copy context parameters! Error: %s\n", errorStr));
+			return nullptr;
+		}
+#else
+		status->subtitleCodecCtx = status->subtitleStream->codec;
+#endif
+
+		err = avcodec_open2(status->subtitleCodecCtx, status->subtitleCodec, nullptr);
+		if (err < 0) {
+			char errorStr[512];
+			av_strerror(err, errorStr, sizeof(errorStr));
+			mprintf(("FFMPEG: Failed to open subtitle codec! Error: %s\n", errorStr));
+		}
+
+		mprintf(("FFmpeg: Using subtitle codec %s (%s).\n",
+		         status->subtitleCodec->long_name ? status->subtitleCodec->long_name : "<Unknown>",
+		         status->subtitleCodec->name ? status->subtitleCodec->name : "<Unknown>"));
+	}
+
 	return status;
 }

@@ -231,6 +339,27 @@ 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];
+
+	for (auto ext : CHECKED_SUBT_EXTENSIONS) {
+		SCP_string fileName;
+		if (strlen(current_language.lang_ext) == 0) {
+			fileName = name + "." + ext;
+		} else {
+			fileName = name + "-" + current_language.lang_ext + "." + ext;
+		}
+
+		auto input = openStream(fileName);
+
+		if (input) {
+			return input;
+		}
+	}
+
+	return nullptr;
+}
 }

 bool FFMPEGDecoder::initialize(const SCP_string& fileName) {
@@ -250,8 +379,10 @@ bool FFMPEGDecoder::initialize(const SCP_string& fileName) {
 		return false;
 	}

+	auto subt = openSubtitleStream(movieName);
+
 	// We now have a valid input stream, try to find the correct streams
-	auto status = initializeStatus(input);
+	auto status = initializeStatus(input, subt);
 	if (!status) {
 		return false;
 	}
@@ -261,11 +392,12 @@ bool FFMPEGDecoder::initialize(const SCP_string& fileName) {

 	// We're done, now just put the pointer into this
 	std::swap(m_input, input);
+	std::swap(m_subtitleInput, subt);
 	std::swap(m_status, status);
 	return true;
 }

-MovieProperties FFMPEGDecoder::getProperties() {
+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);
@@ -279,10 +411,22 @@ void FFMPEGDecoder::startDecoding() {
 	std::unique_ptr<VideoDecoder> videoDecoder(new VideoDecoder(m_status.get()));

 	std::unique_ptr<AudioDecoder> audioDecoder;
+	std::unique_ptr<SubtitleDecoder> subtitleDecoder;

 	if (hasAudio()) {
 		audioDecoder.reset(new AudioDecoder(m_status.get()));
 	}
+	if (hasSubtitles()) {
+		subtitleDecoder.reset(new SubtitleDecoder(m_status.get()));
+	}
+
+	std::unique_ptr<std::thread> subtitle_thread;
+	if (hasExternalSubtitle()) {
+		// Start a new thread for the subtitles since otherwise we would need to make sure that neither of the input
+		// streames starves while the other waits for more space in the queues
+		subtitle_thread.reset(
+		    new std::thread([this, &subtitleDecoder]() { runSubtitleDecoder(subtitleDecoder.get()); }));
+	}

 	auto ctx = m_input->m_ctx->ctx();
 	AVPacket packet;
@@ -290,13 +434,13 @@ void FFMPEGDecoder::startDecoding() {
 		auto read_err = av_read_frame(ctx, &packet);
 		AVPacketScope scope(&packet);

-		if (avio_feof(ctx->pb) != 0) {
-			// EOF!!
-			break;
-		} else if (read_err < 0) {
+		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];
@@ -322,6 +466,13 @@ void FFMPEGDecoder::startDecoding() {
 			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));
+			}
 		}
 	}

@@ -342,12 +493,18 @@ void FFMPEGDecoder::startDecoding() {
 		}
 	}

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

-bool FFMPEGDecoder::hasAudio() {
-	return m_status->audioStreamIndex >= 0;
-}
+bool FFMPEGDecoder::hasAudio() const { return m_status->audioStreamIndex >= 0; }
+
+bool FFMPEGDecoder::hasSubtitles() const { return m_status->subtitleStream != nullptr; }
+
+bool FFMPEGDecoder::hasExternalSubtitle() const { return m_status->externalSubtitles; }

 void FFMPEGDecoder::close() {
 	if (m_status) {
@@ -358,6 +515,55 @@ void FFMPEGDecoder::close() {
 		// This will delete the InputStream pointer and free all data
 		m_input = nullptr;
 	}
+
+	if (m_subtitleInput) {
+		m_subtitleInput = nullptr;
+	}
+}
+void FFMPEGDecoder::runSubtitleDecoder(SubtitleDecoder *decoder) {
+	auto ctx = m_subtitleInput->m_ctx->ctx();
+	AVPacket packet;
+
+	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->subtitleStreamIndex) {
+			decoder->decodePacket(&packet);
+
+			SubtitleFramePtr ptr;
+			while ((ptr = decoder->getFrame()) != nullptr) {
+				pushSubtitleData(std::move(ptr));
+			}
+		}
+	}
+	if (isDecoding()) {
+		// If we are still alive then read the last frames from the decoders
+		decoder->finishDecoding();
+
+		SubtitleFramePtr ptr;
+		while ((ptr = decoder->getFrame()) != nullptr) {
+			pushSubtitleData(std::move(ptr));
+		}
+	}
 }
 }
 }
@@ -8,26 +8,36 @@ struct InputStream;

 struct DecoderStatus;

+class SubtitleDecoder;
+
 class FFMPEGDecoder: public Decoder {
 private:
 	std::unique_ptr<InputStream> m_input;

+	std::unique_ptr<InputStream> m_subtitleInput;
+
 	std::unique_ptr<DecoderStatus> m_status;

- public:
+	bool hasExternalSubtitle() const;
+
+	void runSubtitleDecoder(SubtitleDecoder *decoder);
+
+  public:
 	FFMPEGDecoder();

-	virtual ~FFMPEGDecoder();
+	~FFMPEGDecoder() override;

-	bool initialize(const SCP_string& fileName) SCP_OVERRIDE;
+	bool initialize(const SCP_string& fileName) override;

-	MovieProperties getProperties() SCP_OVERRIDE;
+	MovieProperties getProperties() const override;

-	void startDecoding() SCP_OVERRIDE;
+	void startDecoding() override;

-	bool hasAudio() SCP_OVERRIDE;
+	bool hasAudio() const override;

-	void close() SCP_OVERRIDE;
+	bool hasSubtitles() const override;
+
+	void close() override;
 };
 }
 }
@@ -0,0 +1,135 @@
+//
+//
+
+#include "SubtitleDecoder.h"
+
+namespace {
+
+double getFrameTime(int64_t pts, AVRational time_base) {
+	return pts * av_q2d(time_base);
+}
+
+}
+
+namespace cutscene {
+namespace ffmpeg {
+
+SubtitleDecoder::SubtitleDecoder(cutscene::ffmpeg::DecoderStatus* status) : FFMPEGStreamDecoder(status) {
+}
+SubtitleDecoder::~SubtitleDecoder() {
+
+}
+void SubtitleDecoder::decodePacket(AVPacket* packet) {
+	int finishedFrame = 0;
+	AVSubtitle subtitle;
+	auto result = avcodec_decode_subtitle2(m_status->subtitleCodecCtx, &subtitle, &finishedFrame, packet);
+
+	if (result >= 0 && finishedFrame) {
+		pushSubtitleFrame(packet, &subtitle);
+
+		avsubtitle_free(&subtitle);
+	}
+}
+void SubtitleDecoder::finishDecoding() {
+	// Handle those decoders that have a delay
+	AVPacket nullPacket;
+	memset(&nullPacket, 0, sizeof(nullPacket));
+	nullPacket.data = nullptr;
+	nullPacket.size = 0;
+
+	AVSubtitle subtitle;
+	while (true) {
+		int finishedFrame = 1;
+		auto err = avcodec_decode_subtitle2(m_status->subtitleCodecCtx, &subtitle, &finishedFrame, &nullPacket);
+
+		if (err < 0 || !finishedFrame) {
+			break;
+		}
+
+		pushSubtitleFrame(&nullPacket, &subtitle);
+
+		avsubtitle_free(&subtitle);
+	}
+}
+void SubtitleDecoder::pushSubtitleFrame(AVPacket* packet, AVSubtitle* subtitle) {
+	if (subtitle->format != 1) {
+		// Non-text subtitles are not supported yet.
+		mprintf(("FFmpeg: Detected a non-text subtitle! This is not supported yet!\n"));
+		return;
+	}
+	if (subtitle->num_rects < 1) {
+		return;
+	}
+
+	int64_t pts = subtitle->pts;
+	if (pts == AV_NOPTS_VALUE) {
+		pts = packet->pts;
+	}
+	if (pts == AV_NOPTS_VALUE) {
+		// Still no valid timestamp...
+		return;
+	}
+	auto packet_time = getFrameTime(pts, m_status->subtitleStream->time_base);
+
+	auto start_time = packet_time + (subtitle->start_display_time / 1000.0);
+	auto end_time = packet_time + (subtitle->end_display_time / 1000.0);
+	if (subtitle->end_display_time == 0 && m_status->subtitleStream->time_base.num != 0) {
+		end_time = packet_time + getFrameTime(packet->duration, m_status->subtitleStream->time_base);
+	}
+
+	SCP_string processed_text;
+	// For now we only use the first subtitle rectangle
+	auto subtitle_rect = subtitle->rects[0];
+	if (subtitle_rect->type == SUBTITLE_BITMAP) {
+		// Same as above, non-text subtitles are not supported yet.
+		mprintf(("FFmpeg: Detected a non-text subtitle! This is not supported yet!\n"));
+		return;
+	} else if (subtitle_rect->type == SUBTITLE_TEXT) {
+		// Subtitle does not need to be processed any further
+		processed_text = subtitle_rect->text;
+	} else if (subtitle_rect->type == SUBTITLE_ASS) {
+		SCP_string ass_text = subtitle_rect->ass;
+		
+		// We are not interested in any of the other information contained in the ASS line but we still need to figure
+		// out where our text starts
+		auto comma_pos = ass_text.find(',');
+		for (auto i = 0; i < 8 && comma_pos != SCP_string::npos; ++i) {
+			comma_pos = ass_text.find(',', comma_pos + 1);
+		}
+		Assertion(comma_pos != SCP_string::npos, "Received an ill-formed ASS line from FFmpeg! Text was '%s'.", subtitle_rect->ass);
+
+		// This + 1 is safe since comma_pos points to a valid character so the next character is at worst the end of the string
+		processed_text = ass_text.substr(comma_pos + 1);
+
+		// ASS has a special sequence for new lines that needs to be converted to an actual new line
+		auto newline_pos = processed_text.find("\\N");
+		while(newline_pos != SCP_string::npos) {
+			processed_text.replace(newline_pos, 2, "\n");
+
+			newline_pos = processed_text.find("\\N");
+		}
+	} else {
+		mprintf(("FFmpeg: Detected unknown subtitle name in movie!\n"));
+		return;
+	}
+
+	// Remove \r from string. Some subtitles use \r\n for line breaks and we only support \n
+	auto ret_pos = processed_text.find('\r');
+	while(ret_pos != SCP_string::npos) {
+		processed_text.erase(ret_pos, 1);
+
+		ret_pos = processed_text.find('\r');
+	}
+
+	SubtitleFramePtr frame(new SubtitleFrame());
+	frame->text = processed_text;
+
+	frame->displayStartTime = start_time;
+	frame->displayEndTime = end_time;
+
+	pushFrame(std::move(frame));
+}
+
+}
+}
+
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "cutscene/ffmpeg/internal.h"
+#include "cutscene/ffmpeg/FFMPEGDecoder.h"
+
+namespace cutscene {
+namespace ffmpeg {
+
+class SubtitleDecoder: public FFMPEGStreamDecoder<SubtitleFrame> {
+ public:
+    explicit SubtitleDecoder(DecoderStatus* status);
+
+	~SubtitleDecoder() override;
+
+	void decodePacket(AVPacket* packet) override;
+
+	void finishDecoding() override;
+    void pushSubtitleFrame(AVPacket* subtitle, AVSubtitle* pSubtitle);
+};
+
+}
+}
+
+
@@ -22,14 +22,14 @@ class FFMPEGVideoFrame: public VideoFrame {
 	FFMPEGVideoFrame() : frame(nullptr) {
 	}

-	virtual ~FFMPEGVideoFrame() {
+	~FFMPEGVideoFrame() override {
 		if (frame != nullptr) {
 			av_freep(&frame->data[0]);
 			av_frame_free(&frame);
 		}
 	}

-	virtual DataPointers getDataPointers() {
+	DataPointers getDataPointers() override {
 		DataPointers ptrs;
 		ptrs.y = frame->data[0];
 		ptrs.u = frame->data[1];
@@ -15,11 +15,11 @@ class VideoDecoder: public FFMPEGStreamDecoder<VideoFrame> {
 public:
 	explicit VideoDecoder(DecoderStatus* status);

-	virtual ~VideoDecoder();
+	~VideoDecoder() override;

-	virtual void decodePacket(AVPacket* packet) SCP_OVERRIDE;
+	void decodePacket(AVPacket* packet) override;

-	virtual void finishDecoding() SCP_OVERRIDE;
+	void finishDecoding() override;
 };
 }
 }
@@ -30,6 +30,18 @@ DecoderStatus::~DecoderStatus() {
 #endif
 		audioCodecCtx = nullptr;
 	}
+
+	subtitleStreamIndex = -1;
+	subtitleStream = nullptr;
+	subtitleCodec = nullptr;
+
+	if (subtitleCodecCtx != nullptr) {
+		avcodec_close(subtitleCodecCtx);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+		avcodec_free_context(&subtitleCodecCtx);
+#endif
+		subtitleCodecCtx = nullptr;
+	}
 }

 } // namespace ffmpeg
@@ -16,6 +16,8 @@ struct CodecContextParameters {
 	uint64_t channel_layout = 0;
 	int sample_rate = -1;
 	AVSampleFormat audio_format = AV_SAMPLE_FMT_NONE;
+
+	AVCodecID codec_id = AV_CODEC_ID_NONE;
 };

 struct DecoderStatus {
@@ -31,6 +33,14 @@ struct DecoderStatus {
 	AVCodec* audioCodec = nullptr;
 	AVCodecContext* audioCodecCtx = nullptr;

+	// Subtitles are a bit different since they max come from a different file
+	bool externalSubtitles   = false;
+	int subtitleStreamIndex = -1;
+	AVStream* subtitleStream = nullptr;
+	CodecContextParameters subtitleCodecPars;
+	AVCodec* subtitleCodec = nullptr;
+	AVCodecContext* subtitleCodecCtx = nullptr;
+
 	DecoderStatus();

 	~DecoderStatus();
@@ -14,6 +14,7 @@
 #endif

 #include "globalincs/pstypes.h"
+#include "globalincs/alphacolors.h"
 #include "globalincs/systemvars.h"
 #include "io/cursor.h"
 #include "graphics/2d.h"
@@ -21,10 +22,203 @@
 #include "cmdline/cmdline.h"	
 #include "cutscene/cutscenes.h" // cutscene_mark_viewable()
 #include "cutscene/player.h" // cutscene_mark_viewable()
+#include "tracing/categories.h"
+#include "tracing/tracing.h"
+#include "io/timer.h"
+#include "io/key.h"
+#include "mod_table/mod_table.h"

 extern int Game_mode;
 extern int Is_standalone;

+namespace {
+
+using namespace cutscene;
+
+struct PlaybackState {
+	bool playing = true;
+
+	vec2d posTopLeft;
+	vec2d posBottomRight;
+
+	int subtitle_font = -1;
+};
+
+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>
+float print_string(float x, float y, const char* fmt, Args... params) {
+	SCP_string text;
+	sprintf(text, fmt, params...);
+
+	gr_string(x, y, text.c_str(), GR_RESIZE_NONE);
+
+	return y + font::get_current_font()->getHeight();
+}
+
+void showVideoInfo(const PlayerState& state) {
+	gr_set_color_fast(&Color_white);
+	font::set_font(font::FONT1);
+
+	float y = 200.f;
+	float x = 100.f;
+	y = print_string(x, y, "Movie FPS: %f", state.props.fps);
+	y = print_string(x, y, "Size: %dx%d", state.props.size.width, state.props.size.height);
+
+	y = gr_screen.max_h - 200.f;
+
+	size_t audio_queue_size = state.decoder->getAudioQueueSize();
+	if (state.hasAudio) {
+		ALint queued;
+		OpenAL_ErrorPrint(alGetSourcei(state.audioSid, AL_BUFFERS_QUEUED, &queued));
+		audio_queue_size += queued;
+	}
+
+	y = print_string(x, y, "Audio Queue size: " SIZE_T_ARG, audio_queue_size);
+	y = print_string(x, y, "Video Queue size: " SIZE_T_ARG, state.decoder->getVideoQueueSize());
+	y += font::get_current_font()->getHeight();
+	// Estimate the size of the video buffer
+	// We use YUV420p frames so one pixel uses 1.5 bytes of storage
+	size_t single_frame_size = (size_t) (state.props.size.width * state.props.size.height * 1.5);
+	size_t total_size = single_frame_size * state.decoder->getVideoQueueSize();
+	print_string(x, y, "Video buffer size: " SIZE_T_ARG "B", total_size);
+}
+
+void displayVideo(Player* player, PlaybackState* state) {
+	TRACE_SCOPE(tracing::CutsceneDrawVideoFrame);
+	GR_DEBUG_SCOPE("Display Video");
+
+	gr_clear();
+	player->draw(state->posTopLeft.x, state->posTopLeft.y, state->posBottomRight.x, state->posBottomRight.y);
+
+	auto subtitle = player->getCurrentSubtitle();
+	if (!subtitle.empty() && state->subtitle_font >= 0) {
+		gr_set_color_fast(&Color_bright_white);
+		font::set_font(state->subtitle_font);
+
+		int width;
+		int height;
+		gr_get_string_size(&width, &height, subtitle.c_str());
+
+		// Offset the subtitle by 20% of the viewport size from the bottom
+		auto y_offset = static_cast<int>((state->posBottomRight.y - state->posTopLeft.y) * 0.1);
+
+		auto center_x = (state->posBottomRight.x - state->posTopLeft.x) / 2;
+
+		auto text_x = center_x - width / 2;
+		auto text_y = state->posBottomRight.y - y_offset - height;
+
+		gr_string(text_x, text_y, subtitle.c_str(), GR_RESIZE_NONE);
+	}
+
+	if (Cmdline_show_video_info) {
+		showVideoInfo(player->getInternalState());
+	}
+
+	gr_flip();
+}
+void determine_display_positions(Player* player, PlaybackState* state) {
+	auto& props = player->getMovieProperties();
+
+	float screen_ratio = (float) gr_screen.center_w / (float) gr_screen.center_h;
+	float movie_ratio = (float) props.size.width / (float) props.size.height;
+
+	float scale_by;
+	if (screen_ratio > movie_ratio) {
+		scale_by = (float) gr_screen.center_h / (float) props.size.height;
+	} else {
+		scale_by = (float) gr_screen.center_w / (float) props.size.width;
+	}
+
+	float screenX;
+	float screenY;
+
+	if (!Cmdline_noscalevid && (scale_by != 1.0f)) {
+		screenX = ((gr_screen.center_w / 2.0f + gr_screen.center_offset_x) / scale_by) - (static_cast<int>(props.size.width) / 2.0f) + 0.5f;
+		screenY = ((gr_screen.center_h / 2.0f + gr_screen.center_offset_y) / scale_by) - (static_cast<int>(props.size.height) / 2.0f) + 0.5f;
+	} else {
+		// centers on 1024x768, fills on 640x480
+		screenX = i2fl(((gr_screen.center_w - static_cast<int>(props.size.width)) / 2) + gr_screen.center_offset_x);
+		screenY = i2fl(((gr_screen.center_h - static_cast<int>(props.size.height)) / 2) + gr_screen.center_offset_y);
+	}
+
+	// set additional values for screen width/height and UV coords
+	float screenXW = screenX + static_cast<int>(props.size.width);
+	float screenYH = screenY + static_cast<int>(props.size.height);
+
+	if (!Cmdline_noscalevid && (scale_by != 1.0f)) {
+		// Apply scaling
+		screenX *= scale_by;
+		screenY *= scale_by;
+
+		screenXW *= scale_by;
+		screenYH *= scale_by;
+	}
+
+	state->posTopLeft.x = screenX;
+	state->posTopLeft.y = screenY;
+
+	state->posBottomRight.x = screenXW;
+	state->posBottomRight.y = screenYH;
+}
+
+void initialize_player_state(Player* player, PlaybackState* state) {
+	determine_display_positions(player, state);
+
+	state->subtitle_font = font::FontManager::getFontIndex(Movie_subtitle_font);
+
+	if (state->subtitle_font < 0) {
+		Warning(LOCATION, "Failed to load subtitle font '%s'! Subtitles will be disabled.", Movie_subtitle_font.c_str());
+	}
+}
+
+void movie_display_loop(Player* player, PlaybackState* state) {
+	// Compute the maximum time we will sleep to make sure we can still maintain the movie FPS
+	// and not waste too much CPU time
+	// 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 lastDisplayTimestamp = timer_get_microseconds();
+	while (state->playing) {
+		TRACE_SCOPE(tracing::CutsceneStep);
+
+		auto timestamp = timer_get_microseconds();
+
+		auto passed = timestamp - lastDisplayTimestamp;
+		lastDisplayTimestamp = timestamp;
+
+		// Play as long as the player reports that there is more to display
+		state->playing = player->update(passed);
+
+		displayVideo(player, state);
+
+		processEvents(state);
+
+		if (passed < sleepTime) {
+			auto sleep = sleepTime - passed;
+
+			os_sleep(static_cast<uint>(sleep));
+		}
+	}
+}
+
+}
+
 namespace movie {
 // Play one movie
 bool play(const char* name) {
@@ -57,7 +251,12 @@ bool play(const char* name) {

 	auto player = cutscene::Player::newPlayer(name);
 	if (player) {
-		player->startPlayback();
+		PlaybackState state;
+		initialize_player_state(player.get(), &state);
+
+		movie_display_loop(player.get(), &state);
+
+		player->stopPlayback();
 	} else {
 		// uh-oh, movie is invalid... Abory, Retry, Fail?
 		mprintf(("MOVIE ERROR: Found invalid movie! (%s)\n", name));
@@ -1,7 +1,7 @@
 #include "cutscene/player.h"

 #include "cutscene/Decoder.h"
-#include "cutscene/player/VideoPresenter.h"
+#include "cutscene/VideoPresenter.h"
 #include "cutscene/ffmpeg/FFMPEGDecoder.h"

 #include "graphics/2d.h"
@@ -19,62 +19,19 @@

 #include "parse/parselo.h"

-#include "cutscene/player/OpenGLVideoPresenter.h"
-
 using namespace cutscene::player;

-namespace cutscene {
-struct PlayerState {
-	MovieProperties props;
-	Decoder* decoder = nullptr;
-
-	bool playing = true;
-
-	bool playbackHasBegun = false;
-
-	// Timing state
-	std::uint64_t playback_time = 0;
-
-	// Audio state
-	bool audioInited = false;
-	bool hasAudio = false;
-	ALuint audioSid = 0;
-	SCP_vector<ALuint> audioBuffers;
-	SCP_queue<ALuint> unqueuedAudioBuffers;
-
-	// Graphics state following
-	bool videoInited = false;
-
-	VideoFramePtr currentFrame;
-	VideoFramePtr nextFrame;
-	bool newFrameAdded = false;
-
-	std::unique_ptr<VideoPresenter> videoPresenter;
-
-	PlayerState() : decoder(nullptr), playing(true), playbackHasBegun(false),
-					playback_time(0),
-					audioInited(0), hasAudio(false), audioSid(0),
-					videoInited(false), newFrameAdded(false) {}
-
- private:
-	PlayerState(const PlayerState&) SCP_DELETED_FUNCTION;
-
-	PlayerState& operator=(const PlayerState&) SCP_DELETED_FUNCTION;
-};
-}
-
 namespace {
 using namespace cutscene;

 const int MAX_AUDIO_BUFFERS = 15;

-Decoder* findDecoder(const SCP_string& name) {
+std::unique_ptr<Decoder> findDecoder(const SCP_string& name) {
 	{
-		auto ffmpeg = new ffmpeg::FFMPEGDecoder();
+		std::unique_ptr<Decoder> ffmpeg(new ffmpeg::FFMPEGDecoder());
 		if (ffmpeg->initialize(name)) {
 			return ffmpeg;
 		}
-		delete ffmpeg;
 	}

 	return nullptr;
@@ -93,7 +50,7 @@ void videoPlaybackInit(PlayerState* state) {
 	Assert(state != NULL);

 	if (gr_screen.mode == GR_OPENGL) {
-		state->videoPresenter.reset(new OpenGLVideoPresenter(state->props));
+		state->videoPresenter.reset(new VideoPresenter(state->props));
 	}

 	state->videoInited = true;
@@ -163,7 +120,7 @@ void processVideoData(PlayerState* state) {
 		return;
 	}

-	while(currentTime >= state->nextFrame->frameTime) {
+	while (currentTime >= state->nextFrame->frameTime) {
 		// Move the next frame to the current frame slot
 		state->currentFrame = std::move(state->nextFrame);

@@ -184,6 +141,34 @@ void processVideoData(PlayerState* state) {
 	}
 }

+void processSubtitleData(PlayerState* state) {
+	SubtitleFramePtr ptr;
+	while (state->decoder->tryPopSubtitleData(ptr)) {
+		// Take all subtitle frames from our queue
+		state->queued_subtitles.push(std::move(ptr));
+	}
+
+	if (state->currentSubtitle && playbackGetTime(state) <= state->currentSubtitle->displayEndTime) {
+		// We currently have a frame and it it still being displayed so there is nothing for us to do here
+		return;
+	}
+
+	// Subtitle has expired so we don't need it anymore
+	state->currentSubtitle = nullptr;
+
+	while(!state->queued_subtitles.empty()) {
+		// Take a look at the first entry and check if it's time to display it yet
+		auto& nextSubtitle = state->queued_subtitles.front();
+		if (playbackGetTime(state) >= nextSubtitle->displayStartTime) {
+			state->currentSubtitle = std::move(nextSubtitle);
+			state->queued_subtitles.pop();
+		} else {
+			// The next subtitle should not be displayed yet so we are done here
+			break;
+		}
+	}
+}
+
 bool processAudioData(PlayerState* state) {
 	TRACE_SCOPE(tracing::CutsceneProcessAudioData);

@@ -191,7 +176,7 @@ bool processAudioData(PlayerState* state) {
 		if (state->decoder->hasAudio()) {
 			// Even if we don't play the sound we still need to remove it from the queue
 			AudioFramePtr audioData;
-			while(state->decoder->tryPopAudioData(audioData)) {
+			while (state->decoder->tryPopAudioData(audioData)) {
 				// Intentionally left empty
 			}
 		}
@@ -216,7 +201,9 @@ bool processAudioData(PlayerState* state) {

 		ALenum format = (audioData->channels == 2) ? AL_FORMAT_STEREO16 : AL_FORMAT_MONO16;

-		OpenAL_ErrorCheck(alBufferData(buffer, format, audioData->audioData.data(),
+		OpenAL_ErrorCheck(alBufferData(buffer,
+									   format,
+									   audioData->audioData.data(),
 									   static_cast<ALsizei>(audioData->audioData.size() * sizeof(short)),
 									   static_cast<ALsizei>(audioData->rate)), return false);

@@ -269,82 +256,10 @@ void videoPlaybackClose(PlayerState* state) {
 	state->videoInited = false;
 }

-template<typename... Args>
-float print_string(float x, float y, const char* fmt, Args... params) {
-	SCP_string text;
-	sprintf(text, fmt, params...);
-
-	gr_string(x, y, text.c_str(), GR_RESIZE_NONE);
-
-	return y + font::get_current_font()->getHeight();
-}
-
-void showVideoInfo(PlayerState* state) {
-	gr_set_color_fast(&Color_white);
-
-	float y = 200.f;
-	float x = 100.f;
-	y = print_string(x, y, "Movie FPS: %f", state->props.fps);
-	y = print_string(x, y, "Size: %dx%d", state->props.size.width, state->props.size.height);
-
-	y = gr_screen.max_h - 200.f;
-
-	size_t audio_queue_size = state->decoder->getAudioQueueSize();
-	if (state->hasAudio) {
-		ALint queued;
-		OpenAL_ErrorPrint(alGetSourcei(state->audioSid, AL_BUFFERS_QUEUED, &queued));
-		audio_queue_size += queued;
-	}
-
-	y = print_string(x, y, "Audio Queue size: " SIZE_T_ARG, audio_queue_size);
-	y = print_string(x, y, "Video Queue size: " SIZE_T_ARG, state->decoder->getVideoQueueSize());
-	y += font::get_current_font()->getHeight();
-	// Estimate the size of the video buffer
-	// We use YUV420p frames so one pixel uses 1.5 bytes of storage
-	size_t single_frame_size = (size_t) (state->props.size.width * state->props.size.height * 1.5);
-	size_t total_size = single_frame_size * state->decoder->getVideoQueueSize();
-	print_string(x, y, "Video buffer size: " SIZE_T_ARG "B", total_size);
-}
-
-void displayVideo(PlayerState* state) {
-	if (!state->currentFrame) {
-		return;
-	}
-
-	TRACE_SCOPE(tracing::CutsceneDrawVideoFrame);
-
-	gr_clear();
-	if (state->videoPresenter) {
-		state->videoPresenter->displayFrame();
-	}
-
-	if (Cmdline_show_video_info) {
-		showVideoInfo(state);
-	}
-
-	gr_flip();
-}
-
-void processEvents(PlayerState* 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;
-	}
-}
-
 bool shouldBeginPlayback(Decoder* decoder) {
 	auto video = decoder->isVideoQueueFull();
 	auto audio = decoder->isAudioQueueFull();
+	auto subtitles = decoder->isSubtitleQueueFull();

 	// Wait until one of the queues is full, that should make sure
 	// that we have enough frames at the beginning of playback and that
@@ -352,92 +267,79 @@ bool shouldBeginPlayback(Decoder* decoder) {
 	// or video at the beginning
 	// Also only wait while the decoder is still working. Otherwise we will wait indefinitely if the video
 	// is very short.
-	return (audio || video) || !decoder->isDecoding();
+	return (audio || video || subtitles) || !decoder->isDecoding();
 }
 }

 namespace cutscene {
-Player::Player() {
+Player::Player(std::unique_ptr<Decoder>&& decoder) : m_decoder(std::move(decoder)) {
+	initPlayback();
 }

 Player::~Player() {
+	// If video is initialized it means that stopPlayback has not been called yet
+	if (m_state.videoInited) {
+		stopPlayback();
+	}
+
 	if (m_decoder) {
 		m_decoder->close();
 	}
 }

-void Player::processDecoderData(PlayerState* state) {
-	if (!state->playbackHasBegun) {
+bool Player::processDecoderData() {
+	if (!m_state.playbackHasBegun) {
 		// Wait until video and audio are available
 		// If we don't have audio, don't wait for it (obviously...)
-		if (!shouldBeginPlayback(state->decoder)) {
-			return;
+		if (!shouldBeginPlayback(m_state.decoder)) {
+			return true;
 		}

-		state->playbackHasBegun = true;
+		m_state.playbackHasBegun = true;
 	}

 	TRACE_SCOPE(tracing::CutsceneProcessDecoder);

-	processVideoData(state);
+	processVideoData(&m_state);

-	auto audioPlaying = processAudioData(state);
+	processSubtitleData(&m_state);
+
+	auto audioPlaying = processAudioData(&m_state);

 	// Set the playing flag if the decoder is still active or there is still data available
 	auto decoding = m_decoder->isDecoding();

-	// Audio is pending if there is data left in the queue or of OpenAL is still playing audio
+	// Audio is pending if there is data left in the queue or if OpenAL is still playing audio
 	auto pendingAudio = (m_decoder->isAudioFrameAvailable() && m_decoder->hasAudio()) || audioPlaying;
 	auto pendingVideo = m_decoder->isVideoFrameAvailable();

-	state->playing = decoding || pendingAudio || pendingVideo;
+	return decoding || pendingAudio || pendingVideo;
 }

-void Player::startPlayback() {
+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)));

-	PlayerState state;
-	state.props = m_decoder->getProperties();
-	state.decoder = m_decoder.get();
+	m_state.props = m_decoder->getProperties();
+	m_state.decoder = m_decoder.get();

-	// Compute the maximum time we will sleep to make sure we can still maintain the movie FPS
-	// and not waste too much CPU time
-	// We will sleep at most half the time a frame would be displayed
-	auto sleepTime = static_cast<std::uint64_t>((1. / (4. * state.props.fps)) * 1000.);
+	videoPlaybackInit(&m_state);

-	videoPlaybackInit(&state);
-
-	audioPlaybackInit(&state);
-
-	auto lastDisplayTimestamp = timer_get_microseconds();
-	while (state.playing) {
-		TRACE_SCOPE(tracing::CutsceneStep);
-
-		processDecoderData(&state);
-
-		displayVideo(&state);
-
-		processEvents(&state);
-
-		auto timestamp = timer_get_microseconds();
-
-		auto passed = timestamp - lastDisplayTimestamp;
-		lastDisplayTimestamp = timestamp;
-
-		if (state.playbackHasBegun) {
-			state.playback_time += passed;
-		}
-
-		if (passed < sleepTime) {
-			auto sleep = sleepTime - passed;
-
-			os_sleep(static_cast<uint>(sleep));
-		}
+	audioPlaybackInit(&m_state);
+}
+bool Player::update(uint64_t diff_time_micro) {
+	if (m_state.playbackHasBegun) {
+		m_state.playback_time += diff_time_micro;
 	}
+
+	return processDecoderData();
+}
+void Player::stopPlayback() {
 	m_decoder->stopDecoder();

-	audioPlaybackClose(&state);
-	videoPlaybackClose(&state);
+	audioPlaybackClose(&m_state);
+	videoPlaybackClose(&m_state);

 	m_decoderThread->join();
 }
@@ -460,10 +362,28 @@ std::unique_ptr<Player> Player::newPlayer(const SCP_string& name) {
 	if (decoder == nullptr) {
 		return nullptr;
 	}
+	return std::unique_ptr<Player>(new Player(std::move(decoder)));
+}
+const PlayerState& Player::getInternalState() const {
+	return m_state;
+}
+const MovieProperties& Player::getMovieProperties() const {
+	return m_state.props;
+}
+void Player::draw(float x1, float y1, float x2, float y2) {
+	if (!m_state.currentFrame) {
+		return;
+	}

-	std::unique_ptr<Player> player(new Player());
-	player->m_decoder.reset(decoder);
-
-	return player;
+	if (m_state.videoPresenter) {
+		m_state.videoPresenter->displayFrame(x1, y1, x2, y2);
+	}
+}
+SCP_string Player::getCurrentSubtitle() {
+	if (!m_state.currentSubtitle) {
+		return "";
+	} else {
+		return m_state.currentSubtitle->text;
+	}
 }
 }
@@ -5,11 +5,48 @@
 #include <thread>

 #include "globalincs/pstypes.h"
+#include "sound/openal.h"
+
+#include "Decoder.h"
+#include "VideoPresenter.h"

 namespace cutscene {
 class Decoder;

-struct PlayerState;
+struct PlayerState {
+	MovieProperties props;
+	Decoder* decoder = nullptr;
+
+	bool playbackHasBegun = false;
+
+	// Timing state
+	std::uint64_t playback_time = 0;
+
+	// Audio state
+	bool audioInited = false;
+	bool hasAudio = false;
+	ALuint audioSid = 0;
+	SCP_vector<ALuint> audioBuffers;
+	SCP_queue<ALuint> unqueuedAudioBuffers;
+
+	// Graphics state following
+	bool videoInited = false;
+
+	VideoFramePtr currentFrame;
+	VideoFramePtr nextFrame;
+	bool newFrameAdded = false;
+
+	std::unique_ptr<player::VideoPresenter> videoPresenter;
+
+	SCP_queue<SubtitleFramePtr> queued_subtitles;
+	SubtitleFramePtr currentSubtitle;
+
+	PlayerState() {
+	}
+
+	PlayerState(const PlayerState&) = delete;
+	PlayerState& operator=(const PlayerState&) = delete;
+};

 /**
 * @brief A movie player
@@ -20,22 +57,66 @@ class Player {

 	std::unique_ptr<std::thread> m_decoderThread;

-	void processDecoderData(PlayerState* state);
+	PlayerState m_state;
+
+	bool processDecoderData();

 private:
-	Player(const Player&) = delete;
-
 	void decoderThread();

+	void initPlayback();
+
 public:
-	Player();
+	explicit Player(std::unique_ptr<Decoder>&& decoder);

 	~Player();

+	Player(const Player&) = delete;
+	Player& operator=(const Player&) = delete;
+
 	/**
-     * @brief Begin playing the previously selected movie
-     */
-	void startPlayback();
+	 * @brief Update the player and increase display timestamp by specified delta time
+	 * @param diff_time_micro The time to increase the display timestamp in microseconds (not milliseconds!)
+	 * @return @c true if there is more content to display. @c false if the player reached the end of the movie and has
+	 * 			displayed the last frame.
+	 */
+	bool update(uint64_t diff_time_micro);
+
+	/**
+	 * @brief Gives access to the internal state of the player
+	 *
+	 * @warning This should only be used for debugging purposed!
+	 *
+	 * @return A reference to the internal state
+	 */
+	const PlayerState& getInternalState() const;
+
+	/**
+	 * @brief Gets the properties of the movie that this player is displaying
+	 * @return A reference to the movie properties
+	 */
+	const MovieProperties& getMovieProperties() const;
+
+	/**
+	 * @brief Draws the current movie frame at the specified coordinates.
+	 *
+	 * This may not draw anything if there is currently not a frame to display.
+	 *
+	 * @param x1 The X coordinate of the top left corner
+	 * @param y1 The Y coordinate of the top left corner
+	 * @param x2 The X coordinate of the bottom right corner
+	 * @param y2 The Y coordinate of the bottom right corner
+	 */
+	void draw(float x1, float y1, float x2, float y2);
+
+	SCP_string getCurrentSubtitle();
+
+	/**
+	 * @brief Stops playback
+	 *
+	 * This is also automatically called when this instance is destroyed.
+	 */
+	void stopPlayback();

 	/**
     * @brief Creates a player
@@ -1,223 +0,0 @@
-
-#include "OpenGLVideoPresenter.h"
-
-#include "graphics/opengl/gropenglstate.h"
-#include "graphics/opengl/gropengltnl.h"
-#include "graphics/opengl/gropengldraw.h"
-
-
-using namespace cutscene;
-using namespace cutscene::player;
-
-namespace cutscene {
-namespace player {
-OpenGLVideoPresenter::OpenGLVideoPresenter(const MovieProperties& props) : _scaleVideo(false),
-																		   _ytex(0), _utex(0), _vtex(0) {
-	GR_DEBUG_SCOPE("Init video");
-
-	opengl_set_texture_target(GL_TEXTURE_2D);
-
-	_vertexBuffer = gr_create_vertex_buffer(true);
-
-	auto w = static_cast<int>(props.size.width);
-	auto h = static_cast<int>(props.size.height);
-
-	_sdr_handle = gr_maybe_create_shader(SDR_TYPE_VIDEO_PROCESS, 0);
-
-	glGenTextures(1, &_ytex);
-	glGenTextures(1, &_utex);
-	glGenTextures(1, &_vtex);
-
-	if (_ytex + _utex + _vtex == 0) {
-		throw std::runtime_error("Can't create a GL texture");
-	}
-	opengl_shader_set_current(_sdr_handle);
-
-	gr_set_lighting(false, false);
-
-	GL_state.SetAlphaBlendMode(ALPHA_BLEND_NONE);
-	GL_state.SetZbufferType(ZBUFFER_TYPE_NONE);
-
-	GL_state.Texture.SetActiveUnit(0);
-	GL_state.Texture.SetTarget(GL_texture_target);
-	GL_state.Texture.Enable(_ytex);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-	// NOTE: using NULL instead of pixelbuf crashes some drivers, but then so does pixelbuf
-	glTexImage2D(GL_state.Texture.GetTarget(), 0, GL_RED, w, h, 0, GL_RED,
-				 GL_UNSIGNED_BYTE, NULL);
-
-	GL_state.Texture.SetActiveUnit(1);
-	GL_state.Texture.SetTarget(GL_texture_target);
-	GL_state.Texture.Enable(_utex);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-	// NOTE: using NULL instead of pixelbuf crashes some drivers, but then so does pixelbuf
-	glTexImage2D(GL_state.Texture.GetTarget(), 0, GL_RED, w / 2, h / 2, 0, GL_RED,
-				 GL_UNSIGNED_BYTE, NULL);
-
-	GL_state.Texture.SetActiveUnit(2);
-	GL_state.Texture.SetTarget(GL_texture_target);
-	GL_state.Texture.Enable(_vtex);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-	// NOTE: using NULL instead of pixelbuf crashes some drivers, but then so does pixelbuf
-	glTexImage2D(GL_state.Texture.GetTarget(), 0, GL_RED, w / 2, h / 2, 0, GL_RED,
-				 GL_UNSIGNED_BYTE, NULL);
-
-	float screen_ratio = (float) gr_screen.center_w / (float) gr_screen.center_h;
-	float movie_ratio = (float) props.size.width / (float) props.size.height;
-
-	float scale_by;
-	if (screen_ratio > movie_ratio) {
-		scale_by = (float) gr_screen.center_h / (float) props.size.height;
-	} else {
-		scale_by = (float) gr_screen.center_w / (float) props.size.width;
-	}
-
-	// don't bother setting anything if we aren't going to need it
-	if (!Cmdline_noscalevid && (scale_by != 1.0f)) {
-		vec3d scale;
-
-		scale.xyz.x = scale_by;
-		scale.xyz.y = scale_by;
-		scale.xyz.z = -1.0f;
-
-		gr_push_scale_matrix(&scale);
-		_scaleVideo = true;
-	}
-
-	int screenX;
-	int screenY;
-
-	if (_scaleVideo) {
-		screenX = fl2i(((gr_screen.center_w / 2.0f + gr_screen.center_offset_x) / scale_by) - (static_cast<int>(props.size.width) / 2.0f) + 0.5f);
-		screenY = fl2i(((gr_screen.center_h / 2.0f + gr_screen.center_offset_y) / scale_by) - (static_cast<int>(props.size.height) / 2.0f) + 0.5f);
-	} else {
-		// centers on 1024x768, fills on 640x480
-		screenX = ((gr_screen.center_w - static_cast<int>(props.size.width)) / 2) + gr_screen.center_offset_x;
-		screenY = ((gr_screen.center_h - static_cast<int>(props.size.height)) / 2) + gr_screen.center_offset_y;
-	}
-
-	// set additional values for screen width/height and UV coords
-	int screenXW = screenX + static_cast<int>(props.size.width);
-	int screenYH = screenY + static_cast<int>(props.size.height);
-
-	Current_shader->program->Uniforms.setUniformi("ytex", 0);
-	Current_shader->program->Uniforms.setUniformi("utex", 1);
-	Current_shader->program->Uniforms.setUniformi("vtex", 2);
-
-	Current_shader->program->Uniforms.setUniformMatrix4f("projMatrix", GL_projection_matrix);
-	Current_shader->program->Uniforms.setUniformMatrix4f("modelViewMatrix", GL_model_view_matrix);
-
-	GLfloat glVertices[4][4] = {{0}};
-	glVertices[0][0] = (GLfloat)screenX;
-	glVertices[0][1] = (GLfloat)screenY;
-	glVertices[0][2] = 0.0f;
-	glVertices[0][3] = 0.0f;
-
-	glVertices[1][0] = (GLfloat)screenX;
-	glVertices[1][1] = (GLfloat)screenYH;
-	glVertices[1][2] = 0.0f;
-	glVertices[1][3] = 1.0f;
-
-	glVertices[2][0] = (GLfloat)screenXW;
-	glVertices[2][1] = (GLfloat)screenY;
-	glVertices[2][2] = 1.0f;
-	glVertices[2][3] = 0.0f;
-
-	glVertices[3][0] = (GLfloat)screenXW;
-	glVertices[3][1] = (GLfloat)screenYH;
-	glVertices[3][2] = 1.0f;
-	glVertices[3][3] = 1.0f;
-
-	_vertexLayout.add_vertex_component(vertex_format_data::POSITION2, sizeof(glVertices[0]), 0);
-	_vertexLayout.add_vertex_component(vertex_format_data::TEX_COORD, sizeof(glVertices[0]), sizeof(GLfloat) * 2);
-
-	gr_update_buffer_data(_vertexBuffer, sizeof(glVertices[0]) * 4, glVertices);
-}
-
-OpenGLVideoPresenter::~OpenGLVideoPresenter() {
-	GR_DEBUG_SCOPE("Deinit video");
-
-	if (_scaleVideo) {
-		gr_pop_scale_matrix();
-	}
-
-	gr_delete_buffer(_vertexBuffer);
-	_vertexBuffer = -1;
-
-	GL_state.Texture.Delete(_ytex);
-	GL_state.Texture.Delete(_utex);
-	GL_state.Texture.Delete(_vtex);
-	glDeleteTextures(1, &_ytex);
-	glDeleteTextures(1, &_utex);
-	glDeleteTextures(1, &_vtex);
-
-	opengl_set_texture_target();
-
-	_ytex = _utex = _vtex = 0;
-	opengl_shader_set_current();
-}
-
-void OpenGLVideoPresenter::uploadVideoFrame(const VideoFramePtr& frame) {
-	GR_DEBUG_SCOPE("Update video frame");
-	auto ptrs = frame->getDataPointers();
-
-	auto stride = static_cast<GLint>(frame->ySize.stride);
-	auto width = static_cast<GLint>(frame->ySize.width);
-	auto height = static_cast<GLint>(frame->ySize.height);
-
-	GL_state.Texture.SetActiveUnit(0);
-	GL_state.Texture.Enable(_ytex);
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
-	glTexSubImage2D(GL_state.Texture.GetTarget(), 0, 0, 0, width, height, GL_RED, GL_UNSIGNED_BYTE,
-					ptrs.y);
-
-	stride = static_cast<int>(frame->uvSize.stride);
-	width = static_cast<int>(frame->uvSize.width);
-	height = static_cast<int>(frame->uvSize.height);
-
-	GL_state.Texture.SetActiveUnit(1);
-	GL_state.Texture.Enable(_utex);
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
-	glTexSubImage2D(GL_state.Texture.GetTarget(), 0, 0, 0, width, height, GL_RED, GL_UNSIGNED_BYTE,
-					ptrs.u);
-
-	GL_state.Texture.SetActiveUnit(2);
-	GL_state.Texture.Enable(_vtex);
-	glTexSubImage2D(GL_state.Texture.GetTarget(), 0, 0, 0, width, height, GL_RED, GL_UNSIGNED_BYTE,
-					ptrs.v);
-
-	// Reset this back to default
-	glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-}
-
-void OpenGLVideoPresenter::displayFrame() {
-	opengl_shader_set_current(_sdr_handle);
-
-	opengl_bind_buffer_object(_vertexBuffer);
-	opengl_bind_vertex_layout(_vertexLayout);
-
-	// Bind textures
-	GL_state.Texture.SetActiveUnit(0);
-	GL_state.Texture.Enable(_ytex);
-	GL_state.Texture.SetActiveUnit(1);
-	GL_state.Texture.Enable(_utex);
-	GL_state.Texture.SetActiveUnit(2);
-	GL_state.Texture.Enable(_vtex);
-
-	GR_DEBUG_SCOPE("Draw video frame");
-	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-}
-}
-}
@@ -1,38 +0,0 @@
-
-#ifndef FS2_OPEN_OPENGLVIDEOPRESENTER_H
-#define FS2_OPEN_OPENGLVIDEOPRESENTER_H
-
-#include "globalincs/pstypes.h"
-#include "cutscene/player/VideoPresenter.h"
-
-#include <glad/glad.h>
-
-#include <memory>
-#include <graphics/2d.h>
-
-namespace cutscene {
-namespace player {
-class OpenGLVideoPresenter: public VideoPresenter {
-	int _vertexBuffer = -1;
-	vertex_layout _vertexLayout;
-	int _sdr_handle = -1;
-
-	bool _scaleVideo = false;
-
-	GLuint _ytex = 0;
-	GLuint _utex = 0;
-	GLuint _vtex = 0;
- public:
-	OpenGLVideoPresenter(const MovieProperties& props);
-
-	virtual ~OpenGLVideoPresenter();
-
-	virtual void uploadVideoFrame(const VideoFramePtr& frame) SCP_OVERRIDE;
-
-	virtual void displayFrame() SCP_OVERRIDE;
-};
-}
-}
-
-
-#endif //FS2_OPEN_OPENGLVIDEOPRESENTER_H
@@ -1,21 +0,0 @@
-
-#ifndef FS2_OPEN_VIDEOPRESENTER_H
-#define FS2_OPEN_VIDEOPRESENTER_H
-
-#include "globalincs/pstypes.h"
-#include "cutscene/Decoder.h"
-
-namespace cutscene {
-namespace player {
-class VideoPresenter {
- public:
-	virtual ~VideoPresenter() {}
-
-	virtual void uploadVideoFrame(const VideoFramePtr& frame) = 0;
-
-	virtual void displayFrame() = 0;
-};
-}
-}
-
-#endif //FS2_OPEN_VIDEOPRESENTER_H
@@ -74,7 +74,7 @@ static void debris_start_death_roll(object *debris_obj, debris *debris_p)

 		// only play debris destroy sound if hull piece and it has been around for at least 2 seconds
 		if ( Missiontime > debris_p->time_started + 2*F1_0 ) {
-			snd_play_3d( &Snds[SND_MISSILE_IMPACT1], &debris_obj->pos, &View_position, debris_obj->radius );
+			snd_play_3d( gamesnd_get_game_sound(gamesnd_id(GameSounds::MISSILE_IMPACT1)), &debris_obj->pos, &View_position, debris_obj->radius );
 			
 		}
 	}
@@ -238,7 +238,7 @@ void debris_process_post(object * obj, float frame_time)
 		radar_plot_object( obj );

 		if ( timestamp_elapsed(db->sound_delay) ) {
-			obj_snd_assign(objnum, SND_DEBRIS, &vmd_zero_vector, 0);
+			obj_snd_assign(objnum, GameSounds::DEBRIS, &vmd_zero_vector, 0);
 			db->sound_delay = 0;
 		}
 	} else {
@@ -324,19 +324,19 @@ void debris_process_post(object * obj, float frame_time)
 			//Play a sound effect
 			if ( lifetime > 750 )	{
 				// 1.00 second effect
-				snd_play_3d( &Snds[SND_DEBRIS_ARC_05], &snd_pos, &View_position, obj->radius );
+				snd_play_3d( gamesnd_get_game_sound(GameSounds::DEBRIS_ARC_05), &snd_pos, &View_position, obj->radius );
 			} else if ( lifetime >  500 )	{
 				// 0.75 second effect
-				snd_play_3d( &Snds[SND_DEBRIS_ARC_04], &snd_pos, &View_position, obj->radius );
+				snd_play_3d( gamesnd_get_game_sound(GameSounds::DEBRIS_ARC_04), &snd_pos, &View_position, obj->radius );
 			} else if ( lifetime >  250 )	{
 				// 0.50 second effect
-				snd_play_3d( &Snds[SND_DEBRIS_ARC_03], &snd_pos, &View_position, obj->radius );
+				snd_play_3d( gamesnd_get_game_sound(GameSounds::DEBRIS_ARC_03), &snd_pos, &View_position, obj->radius );
 			} else if ( lifetime >  100 )	{
 				// 0.25 second effect
-				snd_play_3d( &Snds[SND_DEBRIS_ARC_02], &snd_pos, &View_position, obj->radius );
+				snd_play_3d( gamesnd_get_game_sound(GameSounds::DEBRIS_ARC_02), &snd_pos, &View_position, obj->radius );
 			} else {
 				// 0.10 second effect
-				snd_play_3d( &Snds[SND_DEBRIS_ARC_01], &snd_pos, &View_position, obj->radius );
+				snd_play_3d( gamesnd_get_game_sound(GameSounds::DEBRIS_ARC_01), &snd_pos, &View_position, obj->radius );
 			}
 		}
 	}
@@ -693,7 +693,7 @@ object *debris_create(object *source_obj, int model_num, int submodel_num, vec3d
 * Alas, poor debris_obj got whacked.  Fortunately, we know who did it, where and how hard, so we
 * can do something about it.
 */
-void debris_hit(object *debris_obj, object *other_obj, vec3d *hitpos, float damage)
+void debris_hit(object *debris_obj, object * /*other_obj*/, vec3d *hitpos, float damage)
 {
 	debris	*debris_p = &Debris[debris_obj->instance];

@@ -162,7 +162,7 @@ void dc_do_command(SCP_string *cmd_str)
 	try {
 		dc_commands[i]->func();	// Run the command!
 	
-	} catch (errParseString err) {
+	} catch (const errParseString& err) {
 		dc_printf("Require string(s) not found: \n");
 		for (uint j = 0; j < err.expected_tokens.size(); ++j) {
 			dc_printf("%i: %s\n", j, err.expected_tokens[j].c_str());
@@ -170,7 +170,7 @@ void dc_do_command(SCP_string *cmd_str)

 		dc_printf("Found '%s' instead\n", err.found_token.c_str());
 	
-	} catch (errParse err) {
+	} catch (const errParse& err) {
 		dc_printf("Invalid argument. Expected %s, found '%s'\n", token_str[err.expected_type], err.found_token.c_str());

 	}
@@ -20,7 +20,7 @@
 #include <cmath>
 #include <cstdarg>
 #include <cstring>
-#include <limits.h>
+#include <climits>


 // ========================= LOCALS =========================
@@ -0,0 +1,541 @@
+#include <nebula/neb.h>
+#include <utility>
+#include "decals/decals.h"
+
+#include "graphics/2d.h"
+#include "graphics/decal_draw_list.h"
+#include "graphics/util/uniform_structs.h"
+#include "parse/parselo.h"
+#include "tracing/tracing.h"
+#include "ship/ship.h"
+
+namespace {
+
+class DecalDefinition {
+	SCP_string _name;
+
+	SCP_string _diffuseFilename;
+	bool _loopDiffuse = true;
+
+	SCP_string _glowFilename;
+	bool _loopGlow = true;
+
+	SCP_string _normalMapFilename;
+	bool _loopNormal = true;
+
+	int _diffuseBitmap = -1;
+	int _glowBitmap = -1;
+	int _normalBitmap = -1;
+
+ public:
+	explicit DecalDefinition(SCP_string name) : _name(std::move(name)) {
+	}
+
+	~DecalDefinition() {
+		if (_diffuseBitmap >= 0) {
+			bm_release(_diffuseBitmap);
+		}
+		if (_glowBitmap >= 0) {
+			bm_release(_glowBitmap);
+		}
+		if (_normalBitmap >= 0) {
+			bm_release(_normalBitmap);
+		}
+	}
+
+	// Disallow copying
+	DecalDefinition(const DecalDefinition&) = delete;
+	DecalDefinition& operator=(const DecalDefinition&) = delete;
+
+	// Move constructor and operator
+	DecalDefinition(DecalDefinition&& other) SCP_NOEXCEPT {
+		*this = std::move(other); // Use operator implementation
+	}
+	DecalDefinition& operator=(DecalDefinition&& other) SCP_NOEXCEPT {
+		std::swap(_name, other._name);
+
+		std::swap(_diffuseFilename, other._diffuseFilename);
+		std::swap(_glowFilename, other._glowFilename);
+		std::swap(_normalMapFilename, other._normalMapFilename);
+
+		std::swap(_diffuseBitmap, other._diffuseBitmap);
+		std::swap(_glowBitmap, other._glowBitmap);
+		std::swap(_normalBitmap, other._normalBitmap);
+
+		std::swap(_loopDiffuse, other._loopDiffuse);
+		std::swap(_loopGlow, other._loopGlow);
+		std::swap(_loopNormal, other._loopNormal);
+
+		return *this;
+	}
+
+	void parse() {
+		if (optional_string("+Diffuse:")) {
+			stuff_string(_diffuseFilename, F_FILESPEC);
+
+			if (!bm_validate_filename(_diffuseFilename, true, true)) {
+				error_display(0, "Animation '%s' is not valid!", _diffuseFilename.c_str());
+				_diffuseFilename = "";
+			}
+
+			if (optional_string("+Loop:")) {
+				stuff_boolean(&_loopDiffuse);
+			}
+		}
+		if (optional_string("+Glow:")) {
+			stuff_string(_glowFilename, F_FILESPEC);
+
+			if (!bm_validate_filename(_glowFilename, true, true)) {
+				error_display(0, "Animation '%s' is not valid!", _glowFilename.c_str());
+				_glowFilename = "";
+			}
+
+			if (optional_string("+Loop:")) {
+				stuff_boolean(&_loopGlow);
+			}
+		}
+		if (optional_string("+Normal:")) {
+			stuff_string(_normalMapFilename, F_FILESPEC);
+
+			if (!bm_validate_filename(_normalMapFilename, true, true)) {
+				error_display(0, "Animation '%s' is not valid!", _normalMapFilename.c_str());
+				_normalMapFilename = "";
+			}
+
+			if (optional_string("+Loop:")) {
+				stuff_boolean(&_loopNormal);
+			}
+		}
+	}
+
+	void loadBitmaps() {
+		if (_diffuseBitmap == -1 && VALID_FNAME(_diffuseFilename)) {
+			_diffuseBitmap = bm_load_either(_diffuseFilename.c_str());
+			if (_diffuseBitmap == -1) {
+				Warning(LOCATION,
+						"Bitmap '%s' failed to load for decal definition %s!",
+						_diffuseFilename.c_str(),
+						_name.c_str());
+			}
+		}
+		if (_glowBitmap == -1 && VALID_FNAME(_glowFilename)) {
+			_glowBitmap = bm_load_either(_glowFilename.c_str());
+			if (_glowBitmap == -1) {
+				Warning(LOCATION,
+						"Bitmap '%s' failed to load for decal definition %s!",
+						_glowFilename.c_str(),
+						_name.c_str());
+			}
+		}
+		if (_normalBitmap == -1 && VALID_FNAME(_normalMapFilename)) {
+			_normalBitmap = bm_load_either(_normalMapFilename.c_str());
+			if (_normalBitmap == -1) {
+				Warning(LOCATION,
+						"Bitmap '%s' failed to load for decal definition %s!",
+						_normalMapFilename.c_str(),
+						_name.c_str());
+			}
+		}
+	}
+
+	void pageIn() {
+		if (_diffuseBitmap >= 0) {
+			bm_page_in_texture(_diffuseBitmap);
+		}
+		if (_glowBitmap >= 0) {
+			bm_page_in_texture(_glowBitmap);
+		}
+		if (_normalBitmap >= 0) {
+			bm_page_in_texture(_normalBitmap);
+		}
+	}
+
+	bool bitmapsLoaded() {
+		// Since both bitmap types are optional we need to check if either is loaded to determine if any bitmap is loaded
+		return _diffuseBitmap >= 0 || _glowBitmap >= 0 || _normalBitmap >= 0;
+	}
+
+	const SCP_string& getName() const {
+		return _name;
+	}
+	int getDiffuseBitmap() const {
+		return _diffuseBitmap;
+	}
+	int getGlowBitmap() const {
+		return _glowBitmap;
+	}
+	int getNormalBitmap() const {
+		return _normalBitmap;
+	}
+	bool isDiffuseLooping() const {
+		return _loopDiffuse;
+	}
+	bool isGlowLooping() const {
+		return _loopGlow;
+	}
+	bool isNormalLooping() const {
+		return _loopNormal;
+	}
+};
+
+SCP_vector<DecalDefinition> decalDefinitions;
+
+// Variable to indicate if the system is able to work correctly on the current system
+bool decal_system_active = true;
+
+void parse_decals_table(const char* filename) {
+	try {
+		read_file_text(filename, CF_TYPE_TABLES);
+		reset_parse();
+
+		required_string("#Decals");
+
+		while (optional_string("$Decal:")) {
+			SCP_string name;
+			stuff_string(name, F_NAME);
+
+			DecalDefinition def(name);
+			def.parse();
+
+			decalDefinitions.push_back(std::move(def));
+		}
+
+		required_string("#End");
+	} catch (const parse::ParseException& e) {
+		mprintf(("TABLES: Unable to parse '%s'!  Error message = %s.\n", filename, e.what()));
+		return;
+	}
+
+	if (!gr_is_capable(CAPABILITY_DEFERRED_LIGHTING)) {
+		// we need deferred lighting
+		decal_system_active = false;
+		mprintf(("Note: Decal system has been disabled due to lack of deferred lighting.\n"));
+	}
+	if (!gr_is_capable(CAPABILITY_NORMAL_MAP)) {
+		// We need normal mapping for the full feature range
+		decal_system_active = false;
+		mprintf(("Note: Decal system has been disabled due to lack of normal mapping.\n"));
+	}
+	if (!gr_is_capable(CAPABILITY_SEPARATE_BLEND_FUNCTIONS)) {
+		// WWe need separate blending functions for different color buffers
+		decal_system_active = false;
+		mprintf(("Note: Decal system has been disabled due to lack of separate color buffer blend functions.\n"));
+	}
+}
+
+struct Decal {
+	int definition_handle = -1;
+	object_h object;
+	int submodel = -1;
+
+	float creation_time = -1.0f; //!< The mission time at which this decal was created
+	float lifetime = -1.0f; //!< The time this decal is active. When negative it never expires
+
+	vec3d position = vmd_zero_vector;
+	vec3d scale;
+	matrix orientation = vmd_identity_matrix;
+
+	Decal() {
+		vm_vec_make(&scale, 1.f, 1.f, 1.f);
+	}
+
+	bool isValid() {
+		if (!object.IsValid()) {
+			return false;
+		}
+
+		if (lifetime > 0.0f) {
+			if (f2fl(Missiontime) >= creation_time + lifetime) {
+				// Decal has expired
+				return false;
+			}
+		}
+
+		auto objp = object.objp;
+		if (objp->type == OBJ_SHIP) {
+			auto shipp = &Ships[objp->instance];
+			auto model_instance = model_get_instance(shipp->model_instance_num);
+
+			Assertion(submodel >= 0 && submodel < model_get(object_get_model(objp))->n_models,
+					  "Invalid submodel number detected!");
+			auto smi = &model_instance->submodel[submodel];
+
+			if (smi->blown_off) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+};
+
+SCP_vector<Decal> active_decals;
+
+bool required_string_if_new(const char* token, bool new_entry) {
+	if (!new_entry) {
+		return optional_string(token) == 1;
+	}
+
+	required_string(token);
+	return true;
+}
+
+float clamp(float x, float min, float max) {
+	return std::min(std::max(x, min), max);
+}
+
+/**
+ * @brief Produces a smoothstep value as specified by the GLSL specification
+ * @param edge0
+ * @param edge1
+ * @param x
+ * @return
+ */
+float smoothstep(float edge0, float edge1, float x) {
+	auto t = clamp((x - edge0) / (edge1 - edge0), 0.0f, 1.0f);
+	return t * t * (3.0f - 2.0f * t);
+}
+
+}
+
+namespace decals {
+
+void initialize() {
+	decalDefinitions.clear();
+	graphics::decal_draw_list::globalInit();
+
+	parse_modular_table(NOX("*-dcl.tbm"), parse_decals_table);
+}
+void shutdown() {
+	graphics::decal_draw_list::globalShutdown();
+
+	// Free allocated resources
+	decalDefinitions.clear();
+}
+
+int getDecalConfig(const SCP_string& name) {
+	int index = 0;
+	for (auto& def : decalDefinitions) {
+		if (!stricmp(def.getName().c_str(), name.c_str())) {
+			return index;
+		}
+		++index;
+	}
+
+	return -1;
+}
+
+void parseDecalReference(creation_info& dest_info, bool is_new_entry) {
+	SCP_string name;
+	stuff_string(name, F_NAME);
+
+	auto decalRef = getDecalConfig(name);
+
+	if (decalRef < 0) {
+		error_display(0, "Decal definition '%s' is unknown!", name.c_str());
+	}
+	dest_info.definition_handle = decalRef;
+
+	if (required_string_if_new("+Radius:", is_new_entry)) {
+		stuff_float(&dest_info.radius);
+
+		if (dest_info.radius <= 0.0f) {
+			error_display(0, "Invalid radius of %f! Must be a positive number.", dest_info.radius);
+			dest_info.radius = 1.0f;
+		}
+	}
+
+	if (required_string_if_new("+Lifetime:", is_new_entry)) {
+		if (optional_string("Eternal")) {
+			dest_info.lifetime = util::UniformFloatRange(-1.0f);
+		} else {
+			// Require at least a small lifetime so that the calculations don't have to deal with div-by-zero
+			dest_info.lifetime = util::parseUniformRange(0.0001f);
+		}
+	}
+}
+void loadBitmaps(const creation_info& info) {
+	if (!decal_system_active) {
+		return;
+	}
+	// Silently ignore invalid definition handle since weapons use the default values if the decal option is not present
+	if (info.definition_handle < 0) {
+		return;
+	}
+
+	Assertion(info.definition_handle >= 0 && info.definition_handle < (int) decalDefinitions.size(),
+			  "Invalid decal handle detected!");
+
+	auto& def = decalDefinitions[info.definition_handle];
+
+	def.loadBitmaps();
+}
+void pageInDecal(const creation_info& info) {
+	if (!decal_system_active) {
+		return;
+	}
+	// Silently ignore invalid definition handle since weapons use the default values if the decal option is not present
+	if (info.definition_handle < 0) {
+		return;
+	}
+
+	Assertion(info.definition_handle >= 0 && info.definition_handle < (int) decalDefinitions.size(),
+			  "Invalid decal handle detected!");
+
+	decalDefinitions[info.definition_handle].pageIn();
+}
+
+void initializeMission() {
+	active_decals.clear();
+}
+
+matrix4 getDecalTransform(Decal& decal) {
+	Assertion(decal.object.objp->type == OBJ_SHIP, "Only ships are currently supported for decals!");
+
+	auto objp = decal.object.objp;
+	auto ship = &Ships[objp->instance];
+
+	vec3d worldPos;
+	model_instance_find_world_point(&worldPos,
+									&decal.position,
+									ship->model_instance_num,
+									decal.submodel,
+									&objp->orient,
+									&objp->pos);
+
+	vec3d worldDir;
+	model_instance_find_world_dir(&worldDir,
+								  &decal.orientation.vec.fvec,
+								  ship->model_instance_num,
+								  decal.submodel,
+								  &objp->orient);
+
+	vec3d worldUp;
+	model_instance_find_world_dir(&worldUp,
+								  &decal.orientation.vec.fvec,
+								  ship->model_instance_num,
+								  decal.submodel,
+								  &objp->orient);
+
+	matrix worldOrient;
+	vm_vector_2_matrix(&worldOrient, &worldDir, &worldUp);
+
+	// Apply scaling
+	worldOrient.a2d[0][0] *= decal.scale.xyz.x;
+	worldOrient.a2d[0][1] *= decal.scale.xyz.x;
+	worldOrient.a2d[0][2] *= decal.scale.xyz.x;
+	worldOrient.a2d[1][0] *= decal.scale.xyz.y;
+	worldOrient.a2d[1][1] *= decal.scale.xyz.y;
+	worldOrient.a2d[1][2] *= decal.scale.xyz.y;
+	worldOrient.a2d[2][0] *= decal.scale.xyz.z;
+	worldOrient.a2d[2][1] *= decal.scale.xyz.z;
+	worldOrient.a2d[2][2] *= decal.scale.xyz.z;
+
+	matrix4 mat4;
+	vm_matrix4_set_transform(&mat4, &worldOrient, &worldPos);
+
+	return mat4;
+}
+
+void renderAll() {
+	if (!decal_system_active) {
+		return;
+	}
+
+	// Clear out any invalid decals
+	for (auto iter = active_decals.begin(); iter != active_decals.end(); ++iter) {
+		if (!iter->isValid()) {
+			// if we're sitting on the very last element, popping-back will invalidate the iterator!
+			if (iter + 1 == active_decals.end()) {
+				active_decals.pop_back();
+				break;
+			}
+
+			*iter = active_decals.back();
+			active_decals.pop_back();
+			continue;
+		}
+	}
+
+	if (active_decals.empty()) {
+		return;
+	}
+
+
+	graphics::decal_draw_list draw_list;
+	auto mission_time = f2fl(Missiontime);
+
+	for (auto& decal : active_decals) {
+		int diffuse_bm = -1;
+		int glow_bm = -1;
+		int normal_bm = -1;
+
+		Assertion(decal.definition_handle >= 0 && decal.definition_handle < (int) decalDefinitions.size(),
+				  "Invalid decal handle detected!");
+		auto& decalDef = decalDefinitions[decal.definition_handle];
+
+		auto decal_time = mission_time - decal.creation_time;
+		auto progress = decal_time / decal.lifetime;
+
+		float alpha = 1.0f;
+		if (progress > 0.8) {
+			// Fade the decal out for the last 20% of its lifetime
+			alpha = 1.0f - smoothstep(0.8f, 1.0f, progress);
+		}
+
+		if (decalDef.getDiffuseBitmap() >= 0) {
+			diffuse_bm = decalDef.getDiffuseBitmap()
+				+ bm_get_anim_frame(decalDef.getDiffuseBitmap(), decal_time, 0.0f, decalDef.isDiffuseLooping());
+		}
+
+		if (decalDef.getGlowBitmap() >= 0) {
+			glow_bm = decalDef.getGlowBitmap()
+				+ bm_get_anim_frame(decalDef.getGlowBitmap(), decal_time, 0.0f, decalDef.isGlowLooping());
+		}
+
+		if (decalDef.getNormalBitmap() >= 0) {
+			normal_bm = decalDef.getNormalBitmap()
+				+ bm_get_anim_frame(decalDef.getNormalBitmap(), decal_time, 0.0f, decalDef.isNormalLooping());
+		}
+
+		draw_list.add_decal(diffuse_bm, glow_bm, normal_bm, decal_time, getDecalTransform(decal), alpha);
+	}
+
+	draw_list.render();
+}
+void
+addDecal(creation_info& info, object* host, int submodel, const vec3d& local_pos, const matrix& local_orient) {
+	if (!decal_system_active) {
+		return;
+	}
+	// Silently ignore invalid definition handle since weapons use the default values if the decal option is not present
+	if (info.definition_handle < 0) {
+		return;
+	}
+
+	Assertion(info.definition_handle >= 0 && info.definition_handle < (int) decalDefinitions.size(),
+			  "Invalid decal handle detected!");
+	auto& def = decalDefinitions[info.definition_handle];
+
+	if (!def.bitmapsLoaded()) {
+		// If this decal was never used before then the bitmaps are not loaded so we need to do that here.
+		def.loadBitmaps();
+	}
+
+	Decal newDecal;
+	newDecal.definition_handle = info.definition_handle;
+	newDecal.object = object_h(host);
+	newDecal.submodel = submodel;
+	newDecal.creation_time = f2fl(Missiontime);
+	newDecal.lifetime = info.lifetime.next();
+
+	newDecal.position = local_pos;
+	newDecal.orientation = local_orient;
+	newDecal.scale.xyz.x = info.radius;
+	newDecal.scale.xyz.y = info.radius;
+	newDecal.scale.xyz.z = info.radius;
+
+	active_decals.push_back(newDecal);
+}
+
+}
@@ -0,0 +1,87 @@
+#pragma once
+
+#include "globalincs/pstypes.h"
+
+#include "object/object.h"
+
+#include "utils/RandomRange.h"
+
+namespace decals {
+
+/**
+ * @brief A reference to a decal definition
+ */
+typedef int DecalReference;
+
+/**
+ * @brief A structure containing all information for creating a decal
+ */
+struct creation_info {
+	DecalReference definition_handle = -1;
+	float radius = -1.0f;
+	util::UniformFloatRange lifetime = ::util::UniformFloatRange(-1.0f);
+};
+
+/**
+ * @brief Initializes the global state of the decal system. Call once at game init.
+ */
+void initialize();
+
+
+/**
+ * @brief Parses the information for a decal reference
+ *
+ * @details This function expects that the initial token has already been consumed by the parse system.
+ *
+ * @param dest_info The creation information struct to parse the information into
+ * @param is_new_entry Set to @c false if the currently parsed object used +nocreate
+ */
+void parseDecalReference(creation_info& dest_info, bool is_new_entry = true);
+
+/**
+ * @brief Loads the bitmaps specified by the creation info into texture memory
+ *
+ * This should be called when the bitmaps of the object using this decal are loaded.
+ *
+ * @param info The creation information containing the decal definition handle
+ */
+void loadBitmaps(const creation_info& info);
+
+/**
+ * @brief Page in the bitmap data of the specified creation information. Needs to be called after loadBitmaps
+ * @param info The information to page in
+ */
+void pageInDecal(const creation_info& info);
+
+/**
+ * @brief Shut down the decal system. Must be called from game_shutdown
+ */
+void shutdown();
+
+/**
+ * @brief Initialize the decal system for the mission. Must be called before every mission is started
+ */
+void initializeMission();
+
+/**
+ * @brief Renders all currently active decals and removes invalid decals from the active list.
+ */
+void renderAll();
+
+/**
+ * @brief Creates a new decal on the specified object at the specified location
+ *
+ * @param info The decal to create
+ * @param host The object host on which to create this decal. Must be a ship.
+ * @param submodel The submodel of the object model on which to create the decal.
+ * @param local_pos The position in the frame of reference of the submodel at which the decal should be created.
+ * @param local_orient The orientation of the decal in the frame of reference of the submodel. The forward vector of the
+ * orientation should look along the direction
+ */
+void addDecal(creation_info& info,
+			  object* host,
+			  int submodel,
+			  const vec3d& local_pos,
+			  const matrix& local_orient);
+
+}
@@ -1,3 +0,0 @@
-                                    #ControlConfigOverride 
-                                                                        #End
-                                    
@@ -0,0 +1,18 @@
+
+#include "gamma.sdr"
+
+in vec4 fragTexCoord;
+in vec4 fragColor;
+out vec4 fragOut0;
+uniform sampler2DArray baseMap;
+uniform float intensity;
+
+void main()
+{
+	vec4 baseColor = texture(baseMap, fragTexCoord.xyz);
+
+	baseColor.rgb = srgb_to_linear(baseColor.rgb);
+	vec4 blendColor = vec4(srgb_to_linear(fragColor.rgb), fragColor.a);
+
+	fragOut0 = baseColor * blendColor * intensity;
+}
@@ -0,0 +1,14 @@
+in vec4 vertPosition;
+in vec4 vertTexCoord;
+in vec4 vertColor;
+out vec4 fragTexCoord;
+out vec4 fragColor;
+uniform mat4 modelViewMatrix;
+uniform mat4 projMatrix;
+uniform vec4 color;
+void main()
+{
+	fragTexCoord = vec4(vertTexCoord.xyz, 0.0);
+	fragColor = vertColor * color;
+	gl_Position = projMatrix * modelViewMatrix * vertPosition;
+}
@@ -0,0 +1,180 @@
+
+// NOTE: The technique and some of this code is based on this tutorial:
+// http://martindevans.me/game-development/2015/02/27/Drawing-Stuff-On-Other-Stuff-With-Deferred-Screenspace-Decals/
+
+#include "lighting.sdr"
+#include "normals.sdr"
+#include "gamma.sdr"
+
+out vec4 fragOut0; // Diffuse buffer
+out vec4 fragOut1; // Normal buffer
+out vec4 fragOut2; // Emissive buffer
+
+uniform sampler2D gDepthBuffer;
+uniform sampler2D gNormalBuffer;
+
+uniform sampler2DArray diffuseMap;
+uniform sampler2DArray glowMap;
+uniform sampler2DArray normalMap;
+
+layout (std140) uniform decalGlobalData {
+	mat4 viewMatrix;
+	mat4 projMatrix;
+	mat4 invViewMatrix;
+	mat4 invProjMatrix;
+
+	vec3 ambientLight;
+
+	vec2 viewportSize;
+};
+layout (std140) uniform decalInfoData {
+	mat4 model_matrix;
+	mat4 inv_model_matrix;
+
+	vec3 decal_direction;
+	float normal_angle_cutoff;
+
+	int diffuse_index;
+	int glow_index;
+	int normal_index;
+	float angle_fade_start;
+
+	float alpha_scale;
+	int diffuse_blend_mode;
+	int glow_blend_mode;
+};
+
+vec3 computeViewPosition(vec2 textureCoord) {
+	vec4 clipSpaceLocation;
+	vec2 normalizedCoord = textureCoord / viewportSize;
+
+	clipSpaceLocation.xy = normalizedCoord * 2.0f - 1.0f;
+	clipSpaceLocation.z = texelFetch(gDepthBuffer, ivec2(textureCoord), 0).r * 2.0f - 1.0f;
+	clipSpaceLocation.w = 1.0f;
+
+	vec4 homogenousLocation = invProjMatrix * clipSpaceLocation;
+
+	return homogenousLocation.xyz / homogenousLocation.w;
+}
+
+vec3 getPixelNormal(vec3 frag_position, vec2 tex_coord, inout float alpha, out vec3 binormal, out vec3 tangent) {
+#ifdef USE_NORMAL_MAP
+	// If we can then we just use the existing normal buffer
+    vec3 normal = texelFetch(gNormalBuffer, ivec2(tex_coord), 0).xyz;
+
+	// If we use the normal map then we don't really need these values so we don't need to compute them here
+    binormal = vec3(0.0);
+    tangent = vec3(0.0);
+#else
+	// Use some fancy screen-space derivates to determine the normal of the current pixel by looking at the surrounding pixels
+	vec3 pos_dx = dFdx(frag_position);
+	vec3 pos_dy = dFdy(frag_position);
+
+    vec3 normal = normalize(cross(pos_dx, pos_dy));
+
+    binormal = normalize(pos_dx);
+    tangent = normalize(pos_dy);
+#endif
+
+	//Calculate angle between surface normal and decal direction
+	float angle = acos(dot(normal, decal_direction));
+
+	if (angle > normal_angle_cutoff) {
+		// The angle between surface normal and decal direction is too big
+		discard;
+	}
+
+	// Make a smooth alpha transition leading up to an edge
+	alpha = alpha * (1 - smoothstep(angle_fade_start, normal_angle_cutoff, angle));
+
+	return normal;
+}
+
+vec2 getDecalTexCoord(vec3 view_pos, inout float alpha) {
+	vec4 object_pos = inv_model_matrix * invViewMatrix * vec4(view_pos, 1.0);
+
+	bvec3 invalidComponents = greaterThan(abs(object_pos.xyz), vec3(0.5));
+	bvec4 nanComponents = isnan(object_pos); // nan can happen some times if we have an infinite depth value
+
+	if (any(invalidComponents) || any(nanComponents)) {
+		// Fragment is out of the box
+		discard;
+	}
+
+	// Fade out the texture when it gets close to the top or bottom of the decal box
+	alpha = alpha * (1.0 - smoothstep(0.4, 0.5, abs(object_pos.z)));
+
+	return object_pos.xy + 0.5;
+}
+
+void main() {
+	vec3 frag_position = computeViewPosition(gl_FragCoord.xy);
+
+	float alpha = alpha_scale;
+	vec2 tex_coord = getDecalTexCoord(frag_position, alpha);
+
+	vec3 binormal;
+	vec3 tangent;
+	vec3 normal = getPixelNormal(frag_position, gl_FragCoord.xy, alpha, binormal, tangent);
+
+	vec4 diffuse_out = vec4(0.0);
+	vec4 emissive_out = vec4(0.0, 0.0, 0.0, 0.0);
+	vec3 normal_out = vec3(0.0);
+
+	if (diffuse_index >= 0) {
+		// We have a valid diffuse map
+		vec4 color = texture(diffuseMap, vec3(tex_coord, float(diffuse_index)));
+
+		color.rgb = srgb_to_linear(color.rgb);
+
+		if (diffuse_blend_mode == 0) {
+			// Normal alpha blending
+			diffuse_out = vec4(color.rgb, color.a * alpha);
+		} else {
+			// Additive blending
+			diffuse_out = vec4(color.rgb * alpha, 1.0);
+		}
+
+		// The main model shader applies ambient lighting by drawing the ambient part of the texture into the emissive
+		// texture. We do the same here to make sure the decal material is applied correctly
+		if (glow_blend_mode == 0) {
+			// Normal alpha blending
+			emissive_out = vec4(color.rgb * ambientLight, color.a * alpha);
+		} else {
+			// Additive blending
+			emissive_out = vec4(alpha * color.rgb * ambientLight, 1.0);
+		}
+	}
+
+	if (glow_index >= 0) {
+		// We have a valid diffuse map
+		vec4 color = texture(glowMap, vec3(tex_coord, float(glow_index)));
+
+		color.rgb = srgb_to_linear(color.rgb) * GLOW_MAP_SRGB_MULTIPLIER;
+
+		color.rgb *= GLOW_MAP_INTENSITY;
+
+		if (glow_blend_mode == 0) {
+			// Normal alpha blending
+			emissive_out = vec4(color.rgb + emissive_out.rgb * emissive_out.a, color.a * alpha);
+		} else {
+			// Additive blending
+			emissive_out.rgb += color.rgb * alpha;
+		}
+	}
+
+	if (normal_index >= 0) {
+		vec3 decalNormal = unpackNormal(texture(normalMap, vec3(tex_coord, float(normal_index))).ag);
+
+		mat3 tangentToView;
+		tangentToView[0] = tangent;
+		tangentToView[1] = binormal;
+		tangentToView[2] = normal;
+
+		normal_out = tangentToView * decalNormal * alpha;
+	}
+
+	fragOut0 = diffuse_out;
+	fragOut1 = vec4(normal_out, 0.0);
+	fragOut2 = emissive_out;
+}
@@ -0,0 +1,33 @@
+
+in vec4 vertPosition;
+
+layout (std140) uniform decalGlobalData {
+	mat4 viewMatrix;
+	mat4 projMatrix;
+	mat4 invViewMatrix;
+	mat4 invProjMatrix;
+
+	vec3 ambientLight;
+
+	vec2 viewportSize;
+};
+layout (std140) uniform decalInfoData {
+	mat4 model_matrix;
+	mat4 inv_model_matrix;
+
+	vec3 decal_direction;
+	float normal_angle_cutoff;
+
+	int diffuse_index;
+	int glow_index;
+	int normal_index;
+	float angle_fade_start;
+
+	float alpha_scale;
+	int diffuse_blend_mode;
+	int glow_blend_mode;
+};
+
+void main() {
+	gl_Position = projMatrix * viewMatrix * model_matrix * vertPosition;
+}
@@ -1,18 +1,23 @@
+
+#include "gamma.sdr"
+
 in vec4 fragTexCoord;
 in vec4 fragColor;
 out vec4 fragOut0;
-uniform sampler2D baseMap;
+
+uniform sampler2DArray baseMap;
+uniform int baseMapIndex;
 uniform int alphaTexture;
 uniform int noTexturing;
 uniform int srgb;
 uniform float intensity;
 uniform float alphaThreshold;
-#define SRGB_GAMMA 2.2
+
 void main()
 {
-	vec4 baseColor = texture(baseMap, fragTexCoord.xy);
+	vec4 baseColor = texture(baseMap, vec3(fragTexCoord.xy, float(baseMapIndex)));
 	if(alphaThreshold > baseColor.a) discard;
-	baseColor.rgb = (srgb == 1) ? pow(baseColor.rgb, vec3(SRGB_GAMMA)) : baseColor.rgb;
-	vec4 blendColor = (srgb == 1) ? vec4(pow(fragColor.rgb, vec3(SRGB_GAMMA)), fragColor.a) : fragColor;
+	baseColor.rgb = (srgb == 1) ? srgb_to_linear(baseColor.rgb) : baseColor.rgb;
+	vec4 blendColor = (srgb == 1) ? vec4(srgb_to_linear(fragColor.rgb), fragColor.a) : fragColor;
 	fragOut0 = mix(mix(baseColor * blendColor, vec4(blendColor.rgb, baseColor.r * blendColor.a), float(alphaTexture)), blendColor, float(noTexturing)) * intensity;
-}
+}
@@ -2,10 +2,12 @@ out vec4 fragOut0;
 out vec4 fragOut1;
 out vec4 fragOut2;
 out vec4 fragOut3;
+out vec4 fragOut4;
 void main()
 {
 	fragOut0 = vec4(0.0, 0.0, 0.0, 1.0); // color
 	fragOut1 = vec4(0.0, 0.0, -1000000.0, 1.0); // position
 	fragOut2 = vec4(0.0, 0.0, 0.0, 1.0); // normal
 	fragOut3 = vec4(0.0, 0.0, 0.0, 0.0); // specular
-}
+	fragOut4 = vec4(0.0, 0.0, 0.0, 1.0); // emissive
+}
@@ -0,0 +1,138 @@
+
+#include "lighting.sdr"
+
+#include "shadows.sdr"
+
+in vec3 beamVec;
+in vec3 lightPosition;
+out vec4 fragOut0;
+
+uniform sampler2D ColorBuffer;
+uniform sampler2D NormalBuffer;
+uniform sampler2D PositionBuffer;
+uniform sampler2D SpecBuffer;
+uniform sampler2DArray shadow_map;
+
+layout (std140) uniform globalDeferredData {
+	mat4 shadow_mv_matrix;
+	mat4 shadow_proj_matrix[4];
+
+	mat4 inv_view_matrix;
+
+	float veryneardist;
+	float neardist;
+	float middist;
+	float fardist;
+
+	float specFactor;
+	float invScreenWidth;
+	float invScreenHeight;
+};
+
+layout (std140) uniform lightData {
+	vec3 diffuseLightColor;
+	float coneAngle;
+
+	vec3 specLightColor;
+	float coneInnerAngle;
+
+	vec3 coneDir;
+	bool dualCone;
+
+	vec3 scale;
+	float lightRadius;
+
+	vec3 lightDir;
+	int lightType;
+
+	bool enable_shadows;
+};
+
+void GetLightInfo(vec3 position, out vec3 lightDir, out float attenuation)
+{
+	if (lightType == LT_DIRECTIONAL) {
+		lightDir = normalize(lightPosition);
+		attenuation = 1.0;
+	} else {
+		// Positional light source
+		lightDir = lightPosition - position.xyz;
+		float dist = length(lightDir);
+		attenuation = 1.0 - clamp(dist / lightRadius, 0.0, 1.0);
+
+		if(dist > lightRadius && lightType != LT_TUBE) {
+			discard;
+		}
+
+		if (lightType == LT_TUBE) {  // Tube light
+			float beamLength = length(beamVec);
+			vec3 beamDir = beamVec / beamLength;
+			// Get nearest point on line
+			float neardist = clamp(dot(lightDir, beamDir), 0.0, beamLength);
+			// Move back from the endpoint of the beam along the beam by the distance we calculated
+			vec3 nearest = lightPosition - beamDir * neardist;
+			lightDir = nearest - position.xyz;
+			dist = length(lightDir);
+			if(dist > lightRadius) {
+				discard;
+			}
+		} else if (lightType == LT_CONE) {
+			float coneDot = dot(normalize(-lightDir), coneDir);
+			if(dualCone) {
+				if(abs(coneDot) < coneAngle) {
+					discard;
+				} else {
+					attenuation *= smoothstep(coneAngle, coneInnerAngle, abs(coneDot));
+				}
+			} else {
+				if (coneDot < coneAngle) {
+					discard;
+				} else {
+					attenuation *= smoothstep(coneAngle, coneInnerAngle, coneDot);
+				}
+			}
+		}
+
+		lightDir = normalize(lightDir);
+	}
+}
+
+void main()
+{
+	vec2 screenPos = gl_FragCoord.xy * vec2(invScreenWidth, invScreenHeight);
+	vec3 position = texture(PositionBuffer, screenPos).xyz;
+
+	if(abs(dot(position, position)) < 0.1)
+		discard;
+
+	vec3 color = texture(ColorBuffer, screenPos).rgb;
+	vec4 normalData = texture(NormalBuffer, screenPos);
+	vec4 specColor = texture(SpecBuffer, screenPos);
+	// The vector in the normal buffer could be longer than the unit vector since decal rendering only adds to the normal buffer
+	vec3 normal = normalize(normalData.xyz);
+	float gloss = normalData.a;
+	float fresnel = specColor.a;
+	vec3 eyeDir = normalize(-position);
+
+	vec3 lightDir;
+	float attenuation;
+
+	GetLightInfo(position, lightDir, attenuation);
+
+	if (enable_shadows) {
+		vec4 fragShadowPos = shadow_mv_matrix * inv_view_matrix * vec4(position, 1.0);
+		vec4 fragShadowUV[4];
+		fragShadowUV[0] = transformToShadowMap(shadow_proj_matrix[0], 0, fragShadowPos);
+		fragShadowUV[1] = transformToShadowMap(shadow_proj_matrix[1], 1, fragShadowPos);
+		fragShadowUV[2] = transformToShadowMap(shadow_proj_matrix[2], 2, fragShadowPos);
+		fragShadowUV[3] = transformToShadowMap(shadow_proj_matrix[3], 3, fragShadowPos);
+
+		attenuation *= getShadowValue(shadow_map, -position.z, fragShadowPos.z, fragShadowUV, fardist, middist,
+								neardist, veryneardist);
+	}
+
+	vec3 halfVec = normalize(lightDir + eyeDir);
+	float NdotL = clamp(dot(normal, lightDir), 0.0, 1.0);
+	vec4 fragmentColor = vec4(color * (diffuseLightColor * NdotL * attenuation), 1.0);
+	fragmentColor.rgb += computeLighting(specColor.rgb, lightDir, normal.xyz, halfVec, eyeDir, gloss, fresnel, NdotL).rgb * specLightColor * attenuation;
+	fragOut0 = max(fragmentColor, vec4(0.0));
+}
@@ -0,0 +1,40 @@
+
+#include "lighting.sdr"
+
+in vec4 vertPosition;
+uniform mat4 modelViewMatrix;
+uniform mat4 projMatrix;
+
+layout (std140) uniform lightData {
+	vec3 diffuseLightColor;
+	float coneAngle;
+
+	vec3 specLightColor;
+	float coneInnerAngle;
+
+	vec3 coneDir;
+	bool dualCone;
+
+	vec3 scale;
+	float lightRadius;
+
+	vec3 lightDir;
+	int lightType;
+
+	bool enable_shadows;
+};
+
+out vec3 lightPosition;
+out vec3 beamVec;
+void main()
+{
+	if (lightType == LT_DIRECTIONAL) {
+		gl_Position = vec4(vertPosition.xyz, 1.0);
+		lightPosition = lightDir;
+	} else {
+		gl_Position = projMatrix * modelViewMatrix * vec4(vertPosition.xyz * scale, 1.0);
+		lightPosition = modelViewMatrix[3].xyz;
+		if(lightType == LT_TUBE)
+			beamVec = vec3(modelViewMatrix * vec4(0.0, 0.0, -scale.z, 0.0));
+	}
+}
@@ -2,7 +2,7 @@ in vec4 fragTexCoord;
 in vec4 fragColor;
 in float fragOffset;
 out vec4 fragOut0;
-uniform sampler2D baseMap;
+uniform sampler2DArray baseMap;
 uniform sampler2D depthMap;
 uniform float window_width;
 uniform float window_height;
@@ -11,10 +11,10 @@ uniform sampler2D frameBuffer;
 void main()
 {
 	vec2 depthCoord = vec2(gl_FragCoord.x / window_width, gl_FragCoord.y / window_height);
-	vec4 fragmentColor = texture(baseMap, fragTexCoord.xy) * fragColor.a;
+	vec4 fragmentColor = texture(baseMap, fragTexCoord.xyz) * fragColor.a;
 	vec2 distortion = texture(distMap, fragTexCoord.xy+vec2(0.0, fragOffset)).rg;
 	float alpha = clamp(dot(fragmentColor.rgb,vec3(0.3333))*10.0,0.0,1.0);
 	distortion = ((distortion - 0.5) * 0.01) * alpha;
 	fragOut0 = texture(frameBuffer,depthCoord+distortion);
 	fragOut0.a = alpha;
-}
+}
@@ -12,6 +12,6 @@ void main()
 {
 	gl_Position = projMatrix * modelViewMatrix * vertPosition;
 	fragOffset = vertRadius * use_offset;
-	fragTexCoord = vertTexCoord;
+	fragTexCoord = vec4(vertTexCoord.xyz, 0.0);
 	fragColor = vertColor;
-}
+}