Add system for reading flags from stdin

This adds support for reading flags from the standard input stream instead of from the command line. This allows more complex formats to be used such as JSON which is implemented in this first version. This can be used for implementing much more sophisticated ways of expressing complex data structures such as the mod command line.
2026-11-09 04:49:39 -10:00 · 2019-06-07 18:31:33 +02:00
418 changed files with 9594 additions and 43169 deletions
@@ -4,16 +4,13 @@ modernize-*,\
 -modernize-raw-string-literal,\
 -modernize-use-using,\
 -modernize-make-unique,\
-modernize-use-trailing-return-type,\
-modernize-avoid-c-arrays,\
 performance-*,\
 -performance-type-promotion-in-math-fn,\
 misc-*,\
 -misc-macro-parentheses,\
 -misc-misplaced-widening-cast,\
 -misc-static-assert,\
-misc-unused-parameters,\
-misc-non-private-member-variables-in-classes,\
+-modernize-make-unique,\
 "
 WarningsAsErrors: ''
 HeaderFilterRegex: 'code/.*$|freespace2/.*$|qtfred/.*$|test/src/.*$|build/.*$'
@@ -1,7 +0,0 @@
-# Default for everything
-# * text=auto
-
-# For the test data and built-in files to make them consistent on all platforms
-*.tbl text eol=lf
-*.tbm text eol=lf
-*.sdr text eol=lf
@@ -1,137 +0,0 @@
-name: Check a pull request
-
-on: [pull_request]
-
-jobs:
-  build_linux:
-    strategy:
-      matrix:
-        configuration: [Debug, Release]
-        compiler: [gcc-5, gcc-9, clang-4.0]
-    name: Linux
-    runs-on: ubuntu-16.04
-    steps:
-      - name: Prepare Environment
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: |
-          sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-          sudo add-apt-repository ppa:beineri/opt-qt571-xenial
-          sudo add-apt-repository ppa:msulikowski/valgrind # For fixing a bug with valgrind 3.11 which does not recognize the rdrand instruction
-          sudo apt-get -yq update
-          sudo apt-get -yq install cmake ninja-build libopenal-dev libreadline6-dev libpng12-dev libjpeg62-dev liblua5.1-0-dev libjansson-dev libsdl2-dev libfreetype6-dev valgrind qt57base g++-5 g++-9 clang-4.0 clang-tidy-4.0 libc++-dev libc++abi-dev
-          # Fix a header bug present in ubuntu...
-          sudo ln -s /usr/include/libcxxabi/__cxxabi_config.h /usr/include/c++/v1/__cxxabi_config.h
-      - uses: actions/checkout@v1
-        name: Checkout
-        with:
-          submodules: true
-      - name: Configure CMake
-        env:
-          CONFIGURATION: ${{ matrix.configuration }}
-          COMPILER: ${{ matrix.compiler }}
-        run: |
-          if [ "$COMPILER" = "gcc-5" ]; then
-            export CC=gcc-5
-            export CXX=g++-5
-          fi
-          if [ "$COMPILER" = "gcc-9" ]; then
-            export CC=gcc-9
-            export CXX=g++-9
-          fi
-          if [ "$COMPILER" = "clang-4.0" ]; then
-            export CC=clang-4.0
-            export CXX=clang++-4.0
-          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"
-
-          if [[ "$CC" =~ ^clang.*$ ]]; then
-              CXXFLAGS="$CXXFLAGS -stdlib=libc++"
-          fi
-
-          mkdir build
-          cd build
-
-          export CXXFLAGS
-          export CFLAGS
-          CMAKE="cmake -G Ninja -DFSO_FATAL_WARNINGS=ON $CMAKE_OPTIONS"
-          eval $CMAKE -DCMAKE_BUILD_TYPE=$CONFIGURATION -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFSO_BUILD_QTFRED=ON ..
-      - name: Compile
-        working-directory: ./build
-        run: ninja -k 20 all
-      - name: Run Tests
-        working-directory: ./build
-        env:
-          CONFIGURATION: ${{ matrix.configuration }}
-        run: |
-          if [ "$CONFIGURATION" = "Debug" ]; then
-              valgrind --leak-check=full --error-exitcode=1 --gen-suppressions=all \
-                  --suppressions="$GITHUB_WORKSPACE/ci/travis/valgrind.supp" ./bin/unittests --gtest_shuffle
-          else
-              ./bin/unittests --gtest_shuffle
-          fi
-  build_windows:
-    strategy:
-      matrix:
-        configuration: [Debug, Release]
-        compiler: [MSVC, MinGW]
-        arch: [Win32, x64]
-        exclude:
-          - configuration: Debug
-            compiler: MinGW
-            arch: x64
-          - configuration: Release
-            compiler: MinGW
-            arch: x64
-    name: Windows
-    runs-on: windows-2019
-    steps:
-      - name: Prepare Environment
-        run: choco install ninja
-      - uses: actions/checkout@v1
-        name: Checkout
-        with:
-          submodules: true
-      - name: Configure CMake
-        env:
-          CONFIGURATION: ${{ matrix.configuration }}
-          COMPILER: ${{ matrix.compiler }}
-          ARCHITECTURE: ${{ matrix.arch }}
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-
-          if [ "$COMPILER" = "MinGW" ]; then
-              cmake -DFSO_USE_SPEECH="OFF" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-                  -DFSO_BUILD_FRED2="OFF" -DCMAKE_BUILD_TYPE=$CONFIGURATION -G "Ninja" ..
-          else
-              cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-                  -DMSVC_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "Visual Studio 16 2019" -T "v142" -A "$ARCHITECTURE" ..
-          fi
-      - name: Compile
-        working-directory: ./build
-        env:
-          CONFIGURATION: ${{ matrix.configuration }}
-          COMPILER: ${{ matrix.compiler }}
-        shell: bash
-        run: |
-          if [ "$COMPILER" = "MinGW" ]; then
-              cmake --build . --config "$CONFIGURATION"
-          else
-              cmake --build . --config "$CONFIGURATION" -- /verbosity:minimal
-          fi
-      - name: Run Tests
-        working-directory: ./build
-        env:
-          CONFIGURATION: ${{ matrix.configuration }}
-          COMPILER: ${{ matrix.compiler }}
-        shell: bash
-        run: |
-          if [ "$COMPILER" = "MinGW" ]; then
-             ./bin/unittests --gtest_shuffle
-          else
-              "./bin/$CONFIGURATION/unittests" --gtest_shuffle
-          fi
@@ -1,6 +1,6 @@
 language: bash
 sudo: required
-dist: xenial
+dist: trusty
 cache:
  directories:
    - $HOME/cmake-3.8
@@ -18,6 +18,7 @@ addons:
      - libjansson-dev
      - libsdl2-dev
      - libfreetype6-dev
+      - valgrind
      - qt57base
  coverity_scan:
    project:
@@ -42,7 +43,7 @@ env:
 deploy:
  - provider: releases
    api_key:
-      secure: "q619+eQTe7lv8UVphK4OIzU8Jw84KBbVkuprN2sWIubRcV3IbZr2+WahJoUMt+nyhiy3YjDYtstO2ZgkxupwnZgwGUBVIiD1c4SPuyy+HTjNMOtiVsEUHT2hf+xPAemWpTlK5HcwhMmHAOh6rt6dEj57QOg0gcmGiwD/tCbEriA="
+      secure: "Wdt4Ccefo7a0ZDjEJQJgpghh7n72FtNJuKSAPUvoz4gtEX6Ct9J8yJI1t9V3jE3CTbbLJ21/Q6eZRDfT7UfNJe5DdepoJsP9DeFhKMWqQCq+AChqQWlm0KeZAffJoJreL8vXYhnRYcLT9ceZHEH6AqwN9TPV+xJziGPISAkYNZ8="
    skip_cleanup: true
    file_glob: true
    file: "/tmp/builds/*"
@@ -72,43 +73,33 @@ matrix:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+            - sourceline: 'ppa:beineri/opt-qt571-trusty'
          packages:
            - *global_deps
            - g++-5
    - os: linux
-      env: CONFIGURATION="Debug" CC=gcc-9 CXX=g++-9
+      env: CONFIGURATION="Debug" CC=gcc-8 CXX=g++-8
      addons:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+            - sourceline: 'ppa:beineri/opt-qt571-trusty'
          packages:
-            - g++-9
+            - g++-8
            - *global_deps
    - os: linux
-      env: CONFIGURATION="Debug" CC=clang-4.0 CXX=clang++-4.0 CMAKE_OPTIONS="-DCLANG_USE_LIBCXX=ON"
+      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-xenial-8
-            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+            - llvm-toolchain-trusty-4.0
+            - sourceline: 'ppa:beineri/opt-qt571-trusty'
          packages:
            - *global_deps
            - clang-4.0
+            - clang-tidy-4.0
            - libc++-dev
-            - libc++abi-dev
-    - os: linux
-      env: CONFIGURATION="Debug" CC=clang-9 CXX=clang++-9 CMAKE_OPTIONS="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-xenial'
-          packages:
-            - *global_deps
-            - g++-9
      script:
        - ./ci/travis/script.sh
        - ./ci/travis/clang_tidy.sh
@@ -126,46 +117,32 @@ matrix:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+            - sourceline: 'ppa:beineri/opt-qt571-trusty'
          packages:
            - *global_deps
            - g++-5
    - os: linux
-      env: CONFIGURATION="Release" CC=gcc-9 CXX=g++-9
+      env: CONFIGURATION="Release" CC=gcc-8 CXX=g++-8
      addons:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+            - sourceline: 'ppa:beineri/opt-qt571-trusty'
          packages:
-            - g++-9
+            - g++-8
            - *global_deps
    - os: linux
-      env: CONFIGURATION="Release" CC=clang-4.0 CXX=clang++-4.0 CMAKE_OPTIONS="-DCLANG_USE_LIBCXX=ON"
+      env: CONFIGURATION="Release" CC=clang-4.0 CXX=clang++-4.0
      addons:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-8
-            - sourceline: 'ppa:beineri/opt-qt571-xenial'
+            - llvm-toolchain-trusty-4.0
+            - sourceline: 'ppa:beineri/opt-qt571-trusty'
          packages:
            - *global_deps
            - clang-4.0
            - libc++-dev
-            - libc++abi-dev
-    - os: linux
-      env: CONFIGURATION="Release" CC=clang-9 CXX=clang++-9 CMAKE_OPTIONS="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-xenial'
-          packages:
-            - *global_deps
-            - g++-9
-      script:
-        - ./ci/travis/script.sh
-        - ./ci/travis/clang_tidy.sh
    - os: osx
      env: CONFIGURATION="Release"

@@ -173,10 +150,14 @@ matrix:
      env: CONFIGURATION="Release" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
    - os: windows
      env: CONFIGURATION="Release" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
-  # There is a GCC compiler bug with MinGW that causes compilation failures on Windows at the moment
+  # As long as Windows is still experimental on Travis CI, allow failures
  allow_failures:
+    - os: windows
+      env: CONFIGURATION="Debug" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
    - os: windows
      env: CONFIGURATION="Debug" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
+    - os: windows
+      env: CONFIGURATION="Release" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
    - os: windows
      env: CONFIGURATION="Release" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
  fast_finish: true
@@ -0,0 +1,29 @@
+Original source (Freespace 2) by Volition, Inc.; see "credits.tbl"
+
+Modifications by the FreeSpace Source Code Project (FSSCP)
+http://fs2source.warpcore.org
+
+FS2_OPEN STAFF:
+
+Project leader:
+Edward "Inquisitor" Gardner
+
+Programmers:
+"Bobboau"
+Dennis "DTP" Pedersen
+Ian "Goober5000" Warfield
+Joe "Righteous1" Dowd
+Mike "penguin" Harris
+"Mysterial"
+"PhReAk"
+Thomas "Random Tiger" Whittaker
+Will "Unknown PLayer" Rousnel
+"WMCoolmon"
+
+Web support:
+Icefire and the staff at Volitionwatch.com
+Alex "Thunder" Avery and the staff at Hard Light Productions
+
+Special thanks to:
+Volition for making FS2 such a great game
+Dave Baranec for giving us the code and keeping us sanity checked
@@ -1,41 +0,0 @@
-## FreeSpace
-FreeSpace: The Great War (Released 1998) and FreeSpace 2 (1999) are mission-based space combat simulators, like X-Wing/TIE Fighter and Wing Commander. Among the greatest games of the genre, they were also effectively the last.
-
-The FreeSpace series follows humanity and their Vasudan allies as they fight to withstand the xenocidal, enigmatic Shivans, a species of unknown origin, vast technological capability, and seemingly limitless malice.
-
-## FreeSpace Open
-Thanks to Volition's generosity, we've continued development of FreeSpace 2 as FreeSpace Open, building graphical enhancements to bring the original games up to modern standards, telling new stories set in the FreeSpace universe and original worlds, and creating spectacular total conversions that let players fly in the beloved universes of Babylon 5, Battlestar Galactica, Wing Commander, and Star Wars.
-
-## Hard-Light Productions
-HLP is a fan community built on love and open-source code. We're dedicated to bringing modders together and giving them a place to share their own hard work and draw inspiration from the work of others. Thanks to Volition's generosity, we've continued development of FreeSpace 2 as FreeSpace Open, building graphical enhancements to bring the original games up to modern standards, telling new stories set in the FreeSpace universe and original worlds, and creating spectacular total conversions that let players fly in the beloved universes of Babylon 5, Battlestar Galactica, Wing Commander, and Star Wars.
-Find us at:
- - Our [website](http://www.hard-light.net/) and [forums](http://www.hard-light.net/forums/)
- - [Discord](https://discord.gg/YNVP3WR)
- - [Facebook](https://www.facebook.com/groups/Hardlightproductions/)
- - [Youtube](https://www.youtube.com/channel/UCxKkd609hDtY6yNetR1iT4w)
- - [Reddit](https://www.reddit.com/r/freespace/)
- - [Twitter](https://twitter.com/hardlightpro)
- - [IRC](irc://irc.esper.net/hard-light)
-
-
-## How to get the game
-FreeSpace Open requires a retail installation of FreeSpace 2, which is available at the following stores: 
- - [GOG.com](https://www.gog.com/game/freespace_2)
- - [Steam](https://store.steampowered.com/app/273620/Freespace_2/)  
-After installing retail FS2, use [Knossos](https://fsnebula.org/knossos/) to upgrade to the most recent release of FSO. Knossos is an advanced mod manager and launcher for FSO.
-
-## Improvements
-The new open source game engine has several distingushing features including:
- - Linux and Mac OS X support
- - OpenGL support
- - OpenAL audio support
- - Easy mod installation
- - OGG support
- - Hardware transform, clipping, and lighting
-
-## The FreeSpace Upgrade Project
-While the SCP improves the code of the game engine to enable new and exciting features, the FreeSpace Upgrade Project (FSU) creates material that takes advantage of the improved game engine.  
-The FSU improves the ships, effects, and background elements of FreeSpace 2. Every now and then these improvements are released as a pack called MediaVPs. These assorted improvements enhance the graphics of the game.  
-While the best way to experience the FSU is by playing the game with it, you can watch this [comparison video](https://www.youtube.com/watch?v=RM1YC_gK-qo) between 1999 and 2019 to have an idea of how much more beautiful FSU makes the game.
-
-^(Much of this content was pulled from existing sources, such as InsaneBaron's "What Is Hard Light Productions" [thread](https://www.hard-light.net/forums/index.php?topic=86650.0), the Wiki's [Getting Started article](https://wiki.hard-light.net/index.php/Getting_started) and more.) 
@@ -1,8 +0,0 @@
-Original source (Freespace 2) by Volition, Inc.; see "`credits.tbl`"
-
-Modifications by the FreeSpace 2 Source Code Project [(FSO SCP)](https://www.hard-light.net/forums/index.php?board=50.0)   
-[Project Contributors](https://github.com/scp-fs2open/fs2open.github.com/graphs/contributors)
-
-Special thanks to:
-Volition for making FS2 such a great game
-Dave Baranec for giving us the code and keeping us sanity checked
@@ -10,7 +10,7 @@ endif()
 include(cmake/util.cmake)

 # Set a few policies
-set_policy(CMP0051 NEW)
+set_policy(CMP0051 OLD)
 set_policy(CMP0053 NEW)
 set_policy(CMP0054 NEW)

@@ -1,15 +1,14 @@
 Volition Copyright (applies to original FreeSpace2 source code
 developed and released by Volition):

->Copyright (C) Volition, Inc. 1999.  All rights reserved.
->
->All source code herein is the property of Volition, Inc. You may not
+"Copyright (C) Volition, Inc. 1999.  All rights reserved.
+
+All source code herein is the property of Volition, Inc. You may not
 sell or otherwise commercially exploit the source or things you
-created based on the source.
+created based on the source."


 Modifications by members of the FreeSpace Source Code Project are
 released under whatever terms the individual authors choose, but the
 above notice continues to apply to all fs2_open code.

-See [**Licensing**](https://github.com/scp-fs2open/fs2open.github.com/wiki/Licensing) for more information.
@@ -1,130 +1,23 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
-## [19.0.0-RC1] - 2019-08-29 ([Thread](https://www.hard-light.net/forums/index.php?topic=95868.0))
-### Meta
- With this release we decided to drop the "`3.Major_revision.Minor_revision`" versioning scheme in favor of a year based scheme since the Major and Minor versions did not have much meaning anymore. Instead the scheme will now be "`<year>.<number that is incremented every release>.0`". The last 0 is still there because some of our systems expect that. It will be gone at some point.
-### Added
- Full Unicode text support: You can now use non-ASCII characters without having to worry about special fonts and special characters. This is an opt-in mod flag.
- Translation features for making it easier to only distribute one version of a mod which includes all languages.
- OpenAL Soft is included by default in binary distributions of FSO now.
- System for dynamically adding new SEXPs. With this a Lua script can expose functionality to the mission which can be used exactly the same as a standard SEXP with all the usual editing features in FRED.   
- Support for displaying decals on the surface of an object.
- Integrated support for the [Discord Rich Presence API](https://discordapp.com/rich-presence). 
- New markup based user interface system using [libRocket](https://github.com/libRocket/libRocket).
-### Changed
- Exposed the movie player to the scripting API for advanced display features
- Various OpenGL optimizations for better graphics performance:
-  - Animations now use texture arrays
-  - Model uniforms get sent to the GPU using uniform buffers for less overhead
-  - Various other minor changes
- Converted pilot files from custom binary format to JSON
-### Fixed
- Refactored bitmap slot handling and removed the fixed upper limit on the number of bitmaps. No more bmpman corruption!
-
-## [3.8.0] - 2017-08-22 ([Release Thread](https://www.hard-light.net/forums/index.php?topic=93812.0))
-### Added
- Support for APNG animations: [APNG](https://en.wikipedia.org/wiki/APNG) is a variant of the established PNG format which allows to store animations instead of single frames in a PNG file. This change allows to use these animation files in FSO which significantly improves usability for modders since they no longer have to store all individual frames as separate images.
- Physically-Based Rendering (PBR): This upgrade of our rendering engine allows to use [PBR](https://en.wikipedia.org/wiki/Physically_based_rendering) assets to make models look more realistic and allow more artistic freedom for modders since they have more control over how a model looks. This also added support for HDR lighting which should improve the overall graphics experience.
- Native particle systems: Particles have always been supported by FSO but the effects that could be created by them were very limited. There were some attempts to fix this by using Lua scripting for more advanced features but that suffered from performance issues. With these new particle systems that feature has been integrated directly into the engine which should improve performance and allow for better effects in the future.
- TrueType Font support: [TrueType](https://en.wikipedia.org/wiki/TrueType) fonts improve the text rendering capabilities of FSO by allowing to use freely scaleable font faces instead of the previous bitmap fonts.
-### Changed
- We now use SDL2 on all platforms: SDL is a library for abstracting away the differences between different platforms. We now use SDL2 for all platforms which reduces the amount of platform-specific code tremendously and should result in better usability on all platforms. This was a major change that has been in development for several years. Here are a few key features that were added:
-  - Pilot and configuration data is now stored in the correct location across all platforms (this allows to run FSO on Windows from the Program Files directory without administrator rights)
-  - All platforms now use the ini files for storing settings. This fixes a lot of issues with the registry on Windows.
-  - Better support for input devices. Since SDL handles keyboard, mouse and joystick input we now have better support on newer OS versions. Note: This does not mean that we support multiple joysticks (yet). There is ongoing development effort to support this but this release does not have that yet.
- CMake build system generation: This isn't relevant for players but we are now using [CMake](https://en.wikipedia.org/wiki/CMake) for handling compiling our builds. This improves cross-platform support and allows to implement advanced compilation features across multiple platforms. Modders will like the new "FastDebug" builds which are like the previous "Debug" builds but are compiled with all the optimizations of normal Release builds. That should make modding a lot easier since you can now debug your mod with almost the same performance as a Release build.
- Improved shield effects: Rendering of the shields is now handled by special shaders which improves the overall quality of the effects and allows more freedom for future effects.
- Use OpenGL Core Profile for rendering: This is another major graphical upgrade which adds support for the OpenGL Core profile across all platforms (this was also made possible by the SDL2 integration). This upgrade allows us to use more modern rendering techniques and is especially useful for our Linux users who use the open-source Mesa drivers since our shaders failed to compile with those drivers. Now everyone will be able to enjoy the new graphical features added in this and previous releases. This also made some internal changes to how we handle rendering which improves the usability of our rendering engine within our code.
- Use FFmpeg for video & audio decoding: [FFmpeg](https://www.ffmpeg.org/) is a multi-media library which exposes functionality for decoding video and audio files to their raw form so that we can use that data. Thanks to this library we can now play 1080p cutscenes without any stuttering or frame-timing issues. It also allows to use more advanced audio and video codecs such as H.264 for video or Opus for audio.
-
-
-## [3.7.4] - 2016-07-04 ([Release thread](http://www.hard-light.net/forums/index.php?topic=92181.0))
-### Changed
- Major graphics update including deferred lighting and shadows
- Enhanced sound (up to 128 channels)
-### Fixed
- "Tons" of bugfixes
-
-## [3.7.2] - 2015-04-23 ([Release thread](http://www.hard-light.net/forums/index.php?topic=89597.0))
-### Added
- MediaVPS 2014 Support
- Autospread on model point shields
- WebUI based multiplayer standalone server (for non-Windows platforms)
- Toggle subsytem scanning, scannable, cargo revealed, hidden from sensors, stealth and friendly stealth added to the `alter-ship-flag` SEXP
- Support added to add more languages besides English, French, German and Polish, leading the way to better localization!
- `player-is-cheating` SEXP
- New ship flag to enable smarter AI use of afterburners. Now it can use them while flying waypoints or attacking capital ships (use the `free-afterburner-use` flag with `alter-ship-flag`)
- Experimental configurations to make AVX builds (see [this post](http://www.hard-light.net/forums/index.php?topic=85566.0) for more explanations)
- Frame profiling code, see what exactly is slowing down FreeSpace. (Mostly for devs or coders)
-### Changed
- Unstretched interface screens
- Automatically non stretched HUD gauges and simpler modder options for placing HUD gauges
- `show-subtitle-text` can now display messages as well as raw text
- Allow a user-specified number of credit images
- event.log can now snapshot events checked in a frame and record the status of an event the previous time it was checked as well as the current state
- Allow the specification of the positions of medals, callsigns and labels on the medal screen. 
- The number of medals is now dynamic!
- `is-facing` now works for things that aren't ships (like waypoints!) 
- allowing `fade-in` and `fade-out` sexps to use any color, not just black, white and red.
-
-
-## [3.7.0] - 2013-08-31 ([Release thread](http://www.hard-light.net/forums/index.php?topic=85435.0))
-### Major Change
- New Flexible Pilot Save File Code (combines single/multi pilots & allows safe switching between unfinished campaigns)
-### Changed
- Raised the per-model debris limit to 48 (previously 32).
- Increased the per-frame debris limit to 96 (previously 64)
-
-## [3.6.18] - 2013-03-01 ([Release thread](http://www.hard-light.net/forums/index.php?topic=83889.0))
-### Fixed
- Critical damage bug which caused heavy balance issues in the game
-
-## [3.6.16] - 2013-01-31 ([Release thread](http://www.hard-light.net/forums/index.php?topic=83577.0))
-### Added
- Diaspora TC support
-### Changed
- Performance Improvements
-
-## [3.6.14] - 2012-10-23 - ([Release thread](https://www.hard-light.net/forums/index.php?topic=82648.0))
-### Added
- Objecttype tables support for deciding how enemies respond to ship classes when disabled
- Allow modders to set a [mood](http://www.hard-light.net/forums/index.php?topic=81991.msg1639770#msg1639770) for builtin messages and then switch the mood for the mission on the fly using a SEXP
- Allow modders to set the chance of builtin messages being sent, how many will be sent per mission and how long is the delay between two messages
- Allow campaigns to be hidden in the campaign and tech rooms ([Game settings.tbl](https://wiki.hard-light.net/index.php/Game_settings.tbl#.23Ignored_Campaign_File_Names))
- Allow mods to set a default campaign ([Game settings.tbl](https://wiki.hard-light.net/index.php/Game_settings.tbl#.24Default_Campaign_File_Name:))
- New SEXPs
-  - `set-player-orders`
-  - `is-event\goal-true\false-msecs-delay`
-  - `get\set-num-countermeasures`
-  - `directive-value`
-  - `invalidate-all-arguments`
-  - `validate-all-arguments`
-  - `has-primary-weapon`
-  - `has-secondary-weapon`
-  - [`hud-display-gauge`](http://www.hard-light.net/forums/index.php?topic=68837.msg1361711#msg1361711)
-  - `get-object-speed-x`
-  - `get-object-speed-y`
-  - `get-object-speed-z`
-### Changed
- Major HUD gauges overhaul
- Split the Locked flag so that you can lock Ships or Weapons on the game loadout screen independently
- Mixed ammo for primary and secondary weapons - [`$Substitute`](http://www.hard-light.net/wiki/index.php/Weapons.tbl#.24Substitute:) - Allows you to have a weapon that fires other weapon ammo in a specific pattern (say a Gatling gun with tracers).
- [`show-subtitle`](https://wiki.hard-light.net/index.php/SCP_SEXPs#show-subtitle) SEXP supports custom fonts
- The active support ship limit per side is now dynamic.  See [`set-support-ship`](https://wiki.hard-light.net/index.php/SCP_SEXPs#set-support-ship) for more info.
-### Fixed
- Various multiplayer SEXP fixes
- `rotating-subsys-set-time` now accelerates properly
- [Fixed a whole heap of memory, logic and coding errors](http://www.hard-light.net/forums/index.php?topic=78044.0) -- using PVS-Studio: C/C++ source code analysis and checking tool
-
----
-
-## [Older Changes] - Unformatted
-```
 ChangeLog for fs2_open.  All times are UTC.  

+Features: September 2013
+http://www.hard-light.net/forums/index.php?topic=85700.0
+
+- show-subtitle-text can now display messages as well as raw text - Goober5000
+- toggle subsytem scanning, scannable, cargo revealed, hidden from sensors, stealth and friendly stealth added to the alter-ship-flag sexp - karajorma
+- Support added to add more languages besides English, French, German and Polish, leading the way to better localization! - karajorma
+- event.log can now snapshot events checked in a frame and record the status of an event the previous time it was checked as well as the current state - karajorma
+- added a player-is-cheating sexp - The E
+- allow a user-specified number of credit images - Goober5000
+- allow the specification of the positions of medals, callsigns and labels on the medal screen. - Goober5000
+- lua function to check if a ship is warp capable, and access to a ship's auto-aim FOV - zookeeper
+- is-facing now works for things that aren't ships (like waypoints!) - zookeeper
+- experimental configurations to make AVX builds (see this post for more explainations) - The E
+- new ship flag to enable smarter AI use of afterburners. Now it can use them while flying waypoints or attacking capital ships (use the free-afterburner-use flag with alter-ship-flag) - Admiral MS
+- the number of medals is now dynamic! - Goober5000
+- frame profiling code, see what exactly is slowing down FreeSpace. (Mostly for devs or coders) - Swifty + The E
+- allowing fade-in and fade-out sexps to use any color, not just black, white and red. - Goober5000
+
 ==================================================================
 ( massive gap in updates, maybe this will be filled in someday...)
 ==================================================================
@@ -458,7 +351,7 @@ ChangeLog for fs2_open.  All times are UTC.
 	(2.1.2.4), weapon/weapons.cpp (2.1.2.2):
 	
 	Sorted out some bits and pieces. The background nebula blends now
-	which is nice. – RT
+	which is nice. – RT

 2002-09-28 12:20  randomtiger

@@ -1993,4 +1886,3 @@ NOTE:

 # generated by cvs2cl.pl
 # cvs2cl.pl -r -S --utc -f ChangeLog2
-```
@@ -0,0 +1,29 @@
+This is still in pretty rough form.
+
+
+=== for people building fs2_open:
+
+Win32-MSVC:
+Use the Freespace2.dsw workspace and build within the IDE.
+
+
+Win32-MinGW:
+  make
+
+
+Linux and other unix variants (NOT YET COMPLETE)
+  ./configure [options]
+  make
+
+
+
+=== for the project maintainers (people who need to 
+=== keep the makefiles up to date) and those building
+=== from CVS:
+
+./autogen.sh (should only has to be done once)
+./configure [options]
+make
+
+automake v1.6.1+ and
+autoconf v2.54+ are required
@@ -7,5 +7,36 @@ FreeSpace2 *S*ource *C*ode *P*roject
 Building
 --
 Before you do anything, make sure you have updated your git submodules, either by running `git submodule update --init --recursive` or by cloning the repository with the `--recursive` flag.<br/>
+<br/>
+For building you will need [CMake](http://www.cmake.org/cmake/resources/software.html). Version 3.4 is required. Once you have installed CMake you should create a build directory where the project/make files should be created, **do not create them inside the source tree!**<br>
+<br>
+On Windows you can use the `cmake-gui` executable to get a nice GUI, on Unix just use `cmake`. Use the newly created directory as build directory (change to this directory on Unix) and run cmake. On Windows this can be done by clicking the `Configure` button. Choose your compiler version and hit `Generate` when configuring is done. <br>
+Depending on the makefile generator used build the `all` or `ALL_BUILD` target to compile the project.<br>

-The main instructions for building can be found at our github wiki, on the [Building](https://github.com/scp-fs2open/fs2open.github.com/wiki/Building) page.
+### Available variables to control the build
+* `FSO_BUILD_WXFRED2`: Build the wxfred2 project, requires wxWidgets
+* `FSO_FREESPACE_PATH`: Sets the path of your FreeSpace install, can be used to automatically run the generated executables with the correct working directory, this is an optional variable. By default this will use the value of the `FS2PATH` environment variable.
+* `FSO_BUILD_TOOLS`: Build some tools related to FSO
+* `CMAKE_BUILD_TYPE`: Sets the binary build type between `Debug` and `Release` (default)
+
+#### Windows only variables
+* `FSO_BUILD_FRED2`: Build FRED2, requires a Visual Studio version that ships with MFC
+* `FSO_USE_SPEECH`: Build a binary with text-to-speech support
+* `FSO_USE_VOICEREC`: Build a binary with voice recognition support
+
+#### Advanced variables
+You should only use these variables if you know what you're doing
+* `FSO_CMAKE_DEBUG`: Print CMake debugging informations
+* `FSO_BUILD_INCLUDED_LIBS`: Build libraries from the included source
+* `FSO_USE_OPENALSOFT`: Use [OpenALSoft](http://kcat.strangesoft.net/openal.html) for OpenAL support
+* `FSO_USE_LUAJIT`: Use [luajit](http://luajit.org/) as a replacement for lua
+* `FSO_DEVELOPMENT_MODE`: Toggles some development behavior, only use if you really need it.
+* `FSO_RUN_ARGUMENTS`: If you run an executable from within the project, these arguments will also be passed to the executable
+* `FSO_BUILD_POSTFIX`: Sets a postfix to be added to the executable name, may be useful for release candidates.
+
+#### Visual Studio specific variables
+* `MSVC_USE_RUNTIME_DLL`: Use the DLL version of the runtime, experimental and not well tested.
+* `MSVC_SIMD_INSTRUCTIONS`: The instruction set the executables will be optimized for.
+
+### Generating an installation package
+CMake can automatically generate installation packages of the project. To do this you will just need to run the `package` target of the build system and the package will be placed inside your build directory. On Windows you will have to install [NSIS](http://nsis.sourceforge.net/Main_Page) to use this.
@@ -1,18 +0,0 @@
-#Updating Documentation
-####The goal of this file is simply to offer a comprehensive checklist of things we must check when updating the documentation.
-
-1. Changelog: 
- - Is [Changelog.md](https://github.com/scp-fs2open/fs2open.github.com/blob/master/Changelog.md) up-to-date with the latest release?
- - Is it in the proper [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format? 
-2. Build instructions:  
- - If a programmer who never built FSO before read the build instruction at [Readme.md](https://github.com/scp-fs2open/fs2open.github.com/blob/master/Readme.md), would they manage to build FSO? 
- - Is the information in the file up-to-date regarding other matters (such as versions of tools mentioned, links to other guides, etc.)?
- - Is the information in the [Building](https://github.com/scp-fs2open/fs2open.github.com/wiki/Building) article, and its sub-articles, still up-to-date?
-3. Forums: 
- - Does the [Forum](https://www.hard-light.net/forums/index.php?board=50.0) contain enough clear information to help a new developer find their way into the up-to-date instructions?
- - Is there anything that might mislead a new developer to stumble onto old tools, dead links and/or old versions of the project?
-4. General documentation files: 
- - Is the information in the following files up-to-date? 
-   - [About.md](https://github.com/scp-fs2open/fs2open.github.com/blob/master/About.md) (Should contain general information about FS, FS2, HLP, FSO and FSU)
-   - [Authors.md](https://github.com/scp-fs2open/fs2open.github.com/blob/master/Authors.md) (Should contain information about the original developers, a way to see FSO's contributors, and special thanks to Volition and Dave Baranec)
-   - [Copying.md](https://github.com/scp-fs2open/fs2open.github.com/blob/master/Copying.md) (Should contain Volition's Copyright terms and a way to check FSO's Licensing info)
@@ -24,7 +24,7 @@ test_script:
 deploy:
    - provider: GitHub
      auth_token:
-          secure: h55Scpy+3vmo1Yb7WlSIGA4d9DRnsbzUYc2LYsQdByQHZHbqrqjBpicH0D2FFLEO
+          secure: 3kV4efHXwRnfXzmJPRAOs8D7+MhwXUXYeayI/P5y114L09kJa6b6L70beXdW7yYr
      on:
          ReleaseBuild: true        # deploy on release push only

@@ -134,7 +134,6 @@ if ($DeployBuild) {
 	cmake -DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/../install" -DFSO_USE_SPEECH="ON" `
 		-DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$($buildConfig.SimdType)" `
 		-DQT5_INSTALL_ROOT="$($buildConfig.QtDir)" -DFSO_BUILD_QTFRED=ON `
-		-DFSO_INSTALL_DEBUG_FILES="ON" `
 		-G "$($buildConfig.Generator)" -T "$($buildConfig.Toolset)" ..

 	$Configs = @("Release", "FastDebug")
@@ -146,11 +145,8 @@ if ($DeployBuild) {
    	}
 	}

-    7z a -xr'!*.pdb' "$($PackageName)-builds-$($buildConfig.PackageType).zip" "$env:APPVEYOR_BUILD_FOLDER/../install/*"
+    7z a "$($PackageName)-builds-$($buildConfig.PackageType).zip" "$env:APPVEYOR_BUILD_FOLDER/../install/*"
    Push-AppveyorArtifact "$($PackageName)-builds-$($buildConfig.PackageType).zip"
-
-	7z a "$($PackageName)-debug-$($buildConfig.PackageType).7z" "$env:APPVEYOR_BUILD_FOLDER/../install/*.pdb"
-	Push-AppveyorArtifact "$($PackageName)-debug-$($buildConfig.PackageType).7z"
 } 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" `
@@ -3,14 +3,8 @@
 set -ex

 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    export DEBIAN_FRONTEND=noninteractive
-
-    sudo add-apt-repository -y "ppa:msulikowski/valgrind" # For fixing a bug with valgrind 3.11 which does not recognize the rdrand instruction
-
-    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
-    sudo add-apt-repository -y 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
-
-    sudo apt-get -yq update
+    # Nothing to do here
+    :
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
    # Nothing to do here
    :
@@ -18,6 +18,10 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
    CXXFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"
    CFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"

+    if [[ "$CC" =~ ^clang.*$ ]]; then
+        CXXFLAGS="$CXXFLAGS -stdlib=libc++"
+    fi
+
    export CXXFLAGS
    export CFLAGS
    CMAKE="cmake -G Ninja -DFSO_FATAL_WARNINGS=ON $CMAKE_OPTIONS"
@@ -2,9 +2,10 @@
 #
 #===- clang-tidy-diff.py - ClangTidy Diff Checker ------------*- python -*--===#
 #
-# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 #
 #===------------------------------------------------------------------------===#

@@ -24,245 +25,117 @@ Example usage for git/svn users:
 """

 import argparse
-import glob
 import json
-import multiprocessing
-import os
 import re
-import shutil
 import subprocess
 import sys
-import tempfile
-import threading
-import traceback
-
-try:
-    import yaml
-except ImportError:
-    yaml = None
-
-is_py2 = sys.version[0] == '2'
-
-if is_py2:
-    import Queue as queue
-else:
-    import queue as queue
-
-
-def run_tidy(task_queue, lock, timeout):
-    watchdog = None
-    while True:
-        command = task_queue.get()
-        try:
-            proc = subprocess.Popen(command,
-                                    stdout=subprocess.PIPE,
-                                    stderr=subprocess.PIPE)
-
-            if timeout is not None:
-                watchdog = threading.Timer(timeout, proc.kill)
-                watchdog.start()
-
-            stdout, stderr = proc.communicate()
-
-            with lock:
-                sys.stdout.write(stdout.decode('utf-8'))
-                sys.stdout.flush()
-                if stderr:
-                    sys.stderr.write(stderr.decode('utf-8'))
-                    sys.stderr.flush()
-        except Exception as e:
-            with lock:
-                sys.stderr.write('Failed: ' + str(e) + ': '.join(command) + '\n')
-        finally:
-            with lock:
-                if (not timeout is None) and (not watchdog is None):
-                    if not watchdog.is_alive():
-                        sys.stderr.write('Terminated by timeout: ' +
-                                         ' '.join(command) + '\n')
-                    watchdog.cancel()
-            task_queue.task_done()
-
-
-def start_workers(max_tasks, tidy_caller, task_queue, lock, timeout):
-    for _ in range(max_tasks):
-        t = threading.Thread(target=tidy_caller, args=(task_queue, lock, timeout))
-        t.daemon = True
-        t.start()
-
-def merge_replacement_files(tmpdir, mergefile):
-    """Merge all replacement files in a directory into a single file"""
-    # The fixes suggested by clang-tidy >= 4.0.0 are given under
-    # the top level key 'Diagnostics' in the output yaml files
-    mergekey = "Diagnostics"
-    merged = []
-    for replacefile in glob.iglob(os.path.join(tmpdir, '*.yaml')):
-        content = yaml.safe_load(open(replacefile, 'r'))
-        if not content:
-            continue # Skip empty files.
-        merged.extend(content.get(mergekey, []))
-
-    if merged:
-        # MainSourceFile: The key is required by the definition inside
-        # include/clang/Tooling/ReplacementsYaml.h, but the value
-        # is actually never used inside clang-apply-replacements,
-        # so we set it to '' here.
-        output = { 'MainSourceFile': '', mergekey: merged }
-        with open(mergefile, 'w') as out:
-            yaml.safe_dump(output, out)
-    else:
-        # Empty the file:
-        open(mergefile, 'w').close()


 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('-j', type=int, default=1,
-                        help='number of tidy instances to be run in parallel.')
-    parser.add_argument('-timeout', type=int, default=None,
-                        help='timeout per each file in seconds.')
-    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.')
-    if yaml:
-        parser.add_argument('-export-fixes', metavar='FILE', dest='export_fixes',
-                            help='Create a yaml file to store suggested fixes in, '
-                                 'which can be applied with clang-apply-replacements.')
-    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('--')]
+  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)')

-    args = parser.parse_args(argv)
+  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('--')]

-    # 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 is None:
-            continue
+  args = parser.parse_args(argv)

-        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
+  # 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

-        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 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

-    if not any(lines_by_file):
-        print("No relevant changes found.")
-        sys.exit(0)
+    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])

-    max_task_count = args.j
-    if max_task_count == 0:
-        max_task_count = multiprocessing.cpu_count()
-    max_task_count = min(len(lines_by_file), max_task_count)
+  if len(lines_by_file) == 0:
+    print("No relevant changes found.")
+    sys.exit(0)

-    tmpdir = None
-    if yaml and args.export_fixes:
-        tmpdir = tempfile.mkdtemp()
+  line_filter_json = json.dumps(
+    [{"name" : name, "lines" : lines_by_file[name]} for name in lines_by_file],
+    separators = (',', ':'))

-    # Tasks for clang-tidy.
-    task_queue = queue.Queue(max_task_count)
-    # A lock for console output.
-    lock = threading.Lock()
+  quote = "";
+  if sys.platform == 'win32':
+    line_filter_json=re.sub(r'"', r'"""', line_filter_json)
+  else:
+    quote = "'";

-    # Run a pool of clang-tidy workers.
-    start_workers(max_task_count, run_tidy, task_queue, lock, args.timeout)
-
-    # Form the common args list.
-    common_clang_tidy_args = []
-    if args.fix:
-        common_clang_tidy_args.append('-fix')
-    if args.checks != '':
-        common_clang_tidy_args.append('-checks=' + args.checks)
-    if args.quiet:
-        common_clang_tidy_args.append('-quiet')
-    if args.build_path is not None:
-        common_clang_tidy_args.append('-p=%s' % args.build_path)
-    for arg in args.extra_arg:
-        common_clang_tidy_args.append('-extra-arg=%s' % arg)
-    for arg in args.extra_arg_before:
-        common_clang_tidy_args.append('-extra-arg-before=%s' % arg)
-
-    for name in lines_by_file:
-        line_filter_json = json.dumps(
-            [{"name": name, "lines": lines_by_file[name]}],
-            separators=(',', ':'))
-
-        # Run clang-tidy on files containing changes.
-        command = [args.clang_tidy_binary]
-        command.append('-line-filter=' + line_filter_json)
-        if yaml and args.export_fixes:
-            # Get a temporary file. We immediately close the handle so clang-tidy can
-            # overwrite it.
-            (handle, tmp_name) = tempfile.mkstemp(suffix='.yaml', dir=tmpdir)
-            os.close(handle)
-            command.append('-export-fixes=' + tmp_name)
-        command.extend(common_clang_tidy_args)
-        command.append(name)
-        command.extend(clang_tidy_args)
-
-        task_queue.put(command)
-
-    # Wait for all threads to be done.
-    task_queue.join()
-
-    if yaml and args.export_fixes:
-        print('Writing fixes to ' + args.export_fixes + ' ...')
-        try:
-            merge_replacement_files(tmpdir, args.export_fixes)
-        except:
-            sys.stderr.write('Error exporting fixes.\n')
-            traceback.print_exc()
-
-    if tmpdir:
-        shutil.rmtree(tmpdir)
+  # 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()
+  main()
@@ -12,8 +12,8 @@ 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|testsrc|build|tools)\/.*\.(cpp|h)' \
-    -clang-tidy-binary /usr/bin/clang-tidy-9 -j$(nproc) -quiet 2>/dev/null | \
+    -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
@@ -1,11 +1,9 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh

 set -ex

 FILENAME=
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    export DEBIAN_FRONTEND=noninteractive
-
    if [ ! -d "$HOME/cmake-3.8/bin" ]; then
        # If the cache does not currently contain CMake then download and install it
    	mkdir -p $HOME/cmake-3.8/
@@ -13,7 +11,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
    	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-3.8/bin:$PATH
+	export PATH=$HOME/cmake-3.8/bin:$PATH
    
    cd $HOME
    
@@ -24,17 +22,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
        wget -O linuxdeployqt -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" # (64-bit)
        chmod a+x ./linuxdeployqt
    fi
-
-    sudo apt-get -yq install valgrind
-
-    if [[ "$CC" = "clang-9" ]]; then
-      sudo apt-get -yq install clang-9 clang-tidy-9
-    fi
-
-    if [[ "$CC" = "clang-4.0" ]]; then
-      # Fix a header bug present in ubuntu...
-      sudo ln -s /usr/include/libcxxabi/__cxxabi_config.h /usr/include/c++/v1/__cxxabi_config.h
-    fi
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
    gem install xcpretty
    
@@ -7,6 +7,7 @@ cd build
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
    ninja -k 20 all

+
    if [ "$CONFIGURATION" = "Debug" ]; then
        valgrind --leak-check=full --error-exitcode=1 --gen-suppressions=all \
            --suppressions="$TRAVIS_BUILD_DIR/ci/travis/valgrind.supp" ./bin/unittests --gtest_shuffle
@@ -41,124 +41,3 @@
   fun:_Z29cf_create_default_path_stringPcjiPKcbj
   ...
 }
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:_Znwm
-   obj:*
-   obj:*
-   obj:*
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   fun:_Z7gr_initOSt10unique_ptrIN2os18GraphicsOperationsESt14default_deleteIS1_EEiiii
-   fun:_ZN4test13FSTestFixture5SetUpEv
-   fun:_ZN7testing8internal38HandleSehExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-   fun:_ZN7testing8internal35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-   fun:_ZN7testing4Test3RunEv
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:_Znwm
-   obj:*
-   obj:*
-   obj:*
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   fun:_Z7gr_initOSt10unique_ptrIN2os18GraphicsOperationsESt14default_deleteIS1_EEiiii
-   fun:_ZN4test13FSTestFixture5SetUpEv
-   fun:_ZN8FontTest5SetUpEv
-   fun:_ZN7testing8internal38HandleSehExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-   fun:_ZN7testing8internal35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:_Znwm
-   obj:*
-   obj:*
-   obj:*
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   fun:_Z7gr_initONSt3__110unique_ptrIN2os18GraphicsOperationsENS_14default_deleteIS2_EEEEiiii
-   fun:_ZN4test13FSTestFixture5SetUpEv
-   fun:_ZN8FontTest5SetUpEv
-   fun:_ZN7testing8internal38HandleSehExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:_Znwm
-   obj:*
-   obj:*
-   obj:*
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   fun:_Z7gr_initONSt3__110unique_ptrIN2os18GraphicsOperationsENS_14default_deleteIS2_EEEEiiii
-   fun:_ZN4test13FSTestFixture5SetUpEv
-   fun:_ZN8FontTest5SetUpEv
-   fun:_ZN7testing8internal38HandleSehExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:_Znwm
-   obj:*
-   obj:*
-   obj:*
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   obj:/usr/lib/x86_64-linux-gnu/libSDL2-2.0.so.0.4.0
-   fun:_Z7gr_initONSt3__110unique_ptrIN2os18GraphicsOperationsENS_14default_deleteIS2_EEEEiiii
-   fun:_ZN4test13FSTestFixture5SetUpEv
-   fun:_ZN7testing8internal38HandleSehExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-   fun:_ZN7testing8internal35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:_dl_signal_error
-   fun:_dl_open
-   fun:dlopen_doit
-   fun:_dl_catch_error
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.2.5
-   obj:*
-   obj:*
-   fun:call_init.part.0
-   fun:call_init
-   fun:_dl_init
-   fun:dl_open_worker
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
-   fun:malloc
-   fun:_dl_signal_error
-   fun:_dl_open
-   fun:dlopen_doit
-   fun:_dl_catch_error
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.2.5
-   obj:*
-   obj:*
-   fun:call_init.part.0
-   fun:call_init
-   fun:_dl_init
-   fun:dl_open_worker
-}
@@ -3,7 +3,7 @@ INCLUDE(util)

 MESSAGE(STATUS "Configuring UNIX specific things and stuff...")

-target_compile_definitions(platform INTERFACE SCP_UNIX USE_OPENAL _REENTRANT)
+target_compile_definitions(platform INTERFACE SCP_UNIX USE_OPENAL)

 # Set RPATH
 set(CMAKE_SKIP_BUILD_RPATH TRUE)
@@ -8,7 +8,7 @@ SET(WIN32_LIBS
 	odbccp32
 	vfw32
 	winmm
-	ws2_32
+	wsock32
 	psapi
 )

@@ -10,8 +10,8 @@ include(CheckSymbolExists)
 include(CheckCXXSymbolExists)
 include(CheckTypeSize)

-CHECK_INCLUDE_FILE("execinfo.h" SCP_HAVE_EXECINFO_H)
-CHECK_INCLUDE_FILE_CXX("cxxabi.h" SCP_HAVE_CXXAPI_H)
+CHECK_INCLUDE_FILE("execinfo.h" HAVE_EXECINFO_H)
+CHECK_INCLUDE_FILE_CXX("cxxabi.h" HAVE_CXXAPI_H)

 CHECK_TYPE_SIZE("max_align_t" MAX_ALIGN_T)

@@ -31,18 +31,18 @@ CHECK_TYPE_SIZE("U'b'" UNICODE_CHAR_LITERAL LANGUAGE CXX)
 set(CMAKE_REQUIRED_FLAGS)


-CHECK_FUNCTION_EXISTS(strcasecmp SCP_HAVE_STRCASECMP)
-CHECK_FUNCTION_EXISTS(strncasecmp SCP_HAVE_STRNCASECMP)
+CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP)
+CHECK_FUNCTION_EXISTS(strncasecmp HAVE_STRNCASECMP)

-CHECK_FUNCTION_EXISTS(_stricmp SCP_HAVE__STRICMP)
-CHECK_FUNCTION_EXISTS(_strnicmp SCP_HAVE__STRNICMP)
+CHECK_FUNCTION_EXISTS(_stricmp HAVE__STRICMP)
+CHECK_FUNCTION_EXISTS(_strnicmp HAVE__STRNICMP)

-CHECK_FUNCTION_EXISTS(strlwr SCP_HAVE_STRLWR)
+CHECK_FUNCTION_EXISTS(strlwr HAVE_STRLWR)

-CHECK_INCLUDE_FILE("strings.h" SCP_HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)

-check_symbol_exists(snprintf "stdio.h" SCP_HAVE_SNPRINTF)
-check_symbol_exists(_snprintf "stdio.h" SCP_HAVE__SNPRINTF)
+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}")
@@ -3,29 +3,29 @@
 #define __PLATFORM_CHECKS_H__
 #pragma once

-#cmakedefine SCP_HAVE_EXECINFO_H
-#cmakedefine SCP_HAVE_CXXAPI_H
-#cmakedefine SCP_HAVE_MAX_ALIGN_T
-#cmakedefine SCP_HAVE_STD_MAX_ALIGN_T
+#cmakedefine HAVE_EXECINFO_H
+#cmakedefine HAVE_CXXAPI_H
+#cmakedefine HAVE_MAX_ALIGN_T
+#cmakedefine HAVE_STD_MAX_ALIGN_T

-#cmakedefine SCP_HAVE_STD_IS_TRIVIALLY_COPYABLE
-#cmakedefine SCP_HAVE_STD_IS_TRIVIALLY_COPYABLE_ARRAY
+#cmakedefine HAVE_STD_IS_TRIVIALLY_COPYABLE
+#cmakedefine HAVE_STD_IS_TRIVIALLY_COPYABLE_ARRAY

 #cmakedefine01 IS_64BIT

-#cmakedefine01 SCP_HAVE_STRCASECMP
-#cmakedefine01 SCP_HAVE_STRNCASECMP
-#cmakedefine01 SCP_HAVE__STRICMP
-#cmakedefine01 SCP_HAVE__STRNICMP
+#cmakedefine01 HAVE_STRCASECMP
+#cmakedefine01 HAVE_STRNCASECMP
+#cmakedefine01 HAVE__STRICMP
+#cmakedefine01 HAVE__STRNICMP

-#cmakedefine01 SCP_HAVE_STRLWR
+#cmakedefine01 HAVE_STRLWR

-#cmakedefine01 SCP_HAVE_STRINGS_H
+#cmakedefine01 HAVE_STRINGS_H

 #cmakedefine01 HAVE_CHAR32_T
 #cmakedefine01 HAVE_UNICODE_CHAR_LITERAL

-#cmakedefine01 SCP_HAVE_SNPRINTF
-#cmakedefine01 SCP_HAVE__SNPRINTF
+#cmakedefine01 HAVE_SNPRINTF
+#cmakedefine01 HAVE__SNPRINTF

 #endif // __PLATFORM_CHECKS_H__
@@ -7,8 +7,6 @@ MESSAGE(STATUS "Doing configuration specific to clang...")
 option(CLANG_ENABLE_LEAK_CHECK "Enable -fsanitize=leak" OFF)
 option(CLANG_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize=address" OFF)

-option(CLANG_USE_LIBCXX "Use libc++" OFF)
-
 # These are the default values
 set(C_BASE_FLAGS "-march=native -pipe")
 set(CXX_BASE_FLAGS "-march=native -pipe")
@@ -21,10 +19,6 @@ if(DEFINED ENV{CFLAGS})
 	set(C_BASE_FLAGS $ENV{CFLAGS})
 endif()

-if (CLANG_USE_LIBCXX)
-	set(CXX_BASE_FLAGS "${CXX_BASE_FLAGS} -stdlib=libc++")
-endif()
-
 # Initialize with an empty string to make sure we always get a clean start
 set(COMPILER_FLAGS "")

@@ -99,10 +93,6 @@ set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})

 set(CMAKE_EXE_LINKER_FLAGS "")

-if (CLANG_USE_LIBCXX)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++abi")
-endif()
-
 if (SANITIZE_FLAGS)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZE_FLAGS}")
 endif()
@@ -37,23 +37,21 @@ set(WARNING_FLAGS
 	$<$<CONFIG:Release>:/wd4101> # In release mode there are unreferenced variables because debug needs them
 	/wd4995 # "'vsprintf': name was marked as #pragma deprecated" is being caused by our custom definition of vsprintf. I have no idea what causes this or how to fix it - m!m
 	/wd4723 # "potential divide by 0" is caused by some code that definitely will not divide by zero - m!m
-	/wd4121 # "alignment of a member was sensitive to packing" happens in a Windows header - m!m
 )

 target_compile_options(compiler INTERFACE ${WARNING_FLAGS})

 # Base
-set(CMAKE_C_FLAGS "/MP /GS- /analyze- /Zc:wchar_t /errorReport:prompt /Zc:forScope /Gd /EHsc /nologo /Zm200")
-set(CMAKE_CXX_FLAGS "/MP /GS- /analyze- /Zc:wchar_t /errorReport:prompt /Zc:forScope /Gd /EHsc /nologo /Zm200")
+set(CMAKE_C_FLAGS "/MP /GS- /analyze- /Zc:wchar_t /errorReport:prompt /WX- /Zc:forScope /Gd /EHsc /nologo /Zm200")
+set(CMAKE_CXX_FLAGS "/MP /GS- /analyze- /Zc:wchar_t /errorReport:prompt /WX- /Zc:forScope /Gd /EHsc /nologo /Zm200")

 set(CMAKE_EXE_LINKER_FLAGS "/MANIFEST /DYNAMICBASE:NO /SAFESEH:NO /ERRORREPORT:PROMPT /NOLOGO")
 set(CMAKE_STATIC_LINKER_FLAGS "")

 # Release
-set(CMAKE_C_FLAGS_RELEASE "/GL /Gy- /Ox /Ot /Ob2 /fp:precise /GF /Oy /Oi /Zi /W3")
-set(CMAKE_CXX_FLAGS_RELEASE "/GL /Gy- /Ox /Ot /Ob2 /fp:precise /GF /Oy /Oi /Zi /W3")
-# /DEBUG:FULL so that we get PDBs which is needed for debugging crashdumps
-set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/OPT:REF /LTCG /INCREMENTAL:NO /DEBUG:FULL")
+set(CMAKE_C_FLAGS_RELEASE "/GL /W2 /Gy- /Ox /Ot /Ob2 /fp:precise /GF /Oy /Oi /Zi /W3")
+set(CMAKE_CXX_FLAGS_RELEASE "/GL /W2 /Gy- /Ox /Ot /Ob2 /fp:precise /GF /Oy /Oi /Zi /W3")
+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/OPT:REF /LTCG /INCREMENTAL:NO")
 set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/LTCG")

 globally_enable_extra_compiler_warnings()
@@ -65,6 +63,8 @@ if (MSVC_RELEASE_DEBUGGING)
 		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zo")
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zo")
 	endif()
+	
+	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG")
 endif()

 IF(MSVC_USE_RUNTIME_DLL)
@@ -41,8 +41,6 @@ target_link_libraries(code PUBLIC discord-rpc)

 target_link_libraries(code PUBLIC libRocket)

-target_link_libraries(code PUBLIC pcp)
-
 enable_clang_tidy(code)

 IF (FSO_USE_SPEECH)
@@ -51,19 +51,14 @@ namespace AI {
 	};

 	FLAG_LIST(Maneuver_Override_Flags) {
-		Full_rot,	//	full sexp control over pitch/bank/heading rotation
+		Full,		//	Full sexp control
 		Roll,		//	Sexp forced roll maneuver
 		Pitch,		//	Sexp forced pitch change
 		Heading,	//	Sexp forced heading change
 		Full_lat,	//  full control over up/side/forward movement
-		Up,			//	Sexp forced vertical movement
-		Sideways,	//	Sexp forced horizontal movement
-		Forward,	//	Sexp forced forward movement
-
-		Dont_bank_when_turning,		// maps to CIF_DONT_BANK_WHEN_TURNING
-		Dont_clamp_max_velocity,	// maps to CIF_DONT_CLAMP_MAX_VELOCITY
-		Instantaneous_acceleration,	// maps to CIF_INSTANTANEOUS_ACCELERATION
-		Never_expire,				// don't clear the maneuver when the timestamp is up
+		Up,			//	vertical movement
+		Sideways,	//	horizontal movement
+		Forward,	//	forward movement

 		NUM_VALUES
 	};
@@ -517,6 +517,10 @@ void parse_ai_profiles_tbl(const char *filename)
 		mprintf(("TABLES: Unable to parse '%s'!  Error message = %s.\n", (filename) ? filename : "<default ai_profiles.tbl>", e.what()));
 		return;
 	}
+
+	// add tbl/tbm to multiplayer validation list
+	extern void fs2netd_add_table_validation(const char *tblname);
+	fs2netd_add_table_validation(filename);
 }

 void ai_profiles_init()
@@ -58,7 +58,6 @@
 #include "physics/physics.h"
 #include "playerman/player.h"
 #include "render/3d.h"
-#include "scripting/api/objs/waypoint.h"
 #include "scripting/api/objs/wing.h"
 #include "scripting/scripting.h"
 #include "ship/afterburner.h"
@@ -1315,9 +1314,7 @@ ship_subsys *set_targeted_subsys(ai_info *aip, ship_subsys *new_subsys, int pare
 		}

 		if ( aip == Player_ai ) {
-			if (aip->last_subsys_target != aip->targeted_subsys) {
-				hud_lock_reset(0.5f);
-			}
+			hud_lock_reset(0.5f);
 		}

 	} else {
@@ -4595,9 +4592,8 @@ void ai_waypoints()
 				// adds scripting hook for 'On Waypoints Done' --wookieejedi
 				Script_system.SetHookObject("Ship", &Objects[Ships[Pl_objp->instance].objnum]);
 				Script_system.SetHookVar("Wing", 'o', scripting::api::l_Wing.Set(Ships[Pl_objp->instance].wingnum));
-				Script_system.SetHookVar("Waypointlist", 'o', scripting::api::l_WaypointList.Set(scripting::api::waypointlist_h(aip->wp_list)));
 				Script_system.RunCondition(CHA_ONWAYPOINTSDONE);
-				Script_system.RemHookVars(3, "Ship", "Wing", "Waypointlist");
+				Script_system.RemHookVars(2, "Ship", "Wing");
 			}
 		}
 	}
@@ -5322,7 +5318,9 @@ int ai_select_primary_weapon(object *objp, object *other_objp, Weapon::Info_Flag
 	{
 		if (swp->current_primary_bank >= 0) 
 		{
-			int	bank_index = swp->current_primary_bank;
+			int	bank_index;
+
+			bank_index = swp->current_primary_bank;

 			if (Weapon_info[swp->primary_bank_weapons[bank_index]].wi_flags[Weapon::Info_Flags::Puncture]) 
 			{
@@ -5331,9 +5329,11 @@ int ai_select_primary_weapon(object *objp, object *other_objp, Weapon::Info_Flag
 		}
 		for (int i=0; i<swp->num_primary_banks; i++) 
 		{
-			int	weapon_info_index = swp->primary_bank_weapons[i];
+			int	weapon_info_index;

-			if (weapon_info_index >= 0)
+			weapon_info_index = swp->primary_bank_weapons[i];
+
+			if (weapon_info_index > -1)
 			{
 				if (Weapon_info[weapon_info_index].wi_flags[Weapon::Info_Flags::Puncture]) 
 				{
@@ -5344,51 +5344,44 @@ int ai_select_primary_weapon(object *objp, object *other_objp, Weapon::Info_Flag
 		}
 	}

-	auto other_is_ship = (other_objp->type == OBJ_SHIP);
-	float enemy_remaining_shield = get_shield_pct(other_objp);
-
-	if ( other_is_ship && (Ship_info[Ships[other_objp->instance].ship_info_index].is_big_or_huge() ) )
+	if ( (other_objp->type == OBJ_SHIP) && (Ship_info[Ships[other_objp->instance].ship_info_index].is_big_or_huge() ) ) 
 	{
 		//Check if we have a capital+ weapon on board
 		for (int i = 0; i < swp->num_primary_banks; i++)
 		{
-			if (swp->primary_bank_weapons[i] >= 0)		// Make sure there is a weapon in the bank
+			if (swp->primary_bank_weapons[i] > -1)		// Make sure there is a weapon in the bank
 			{
-				auto wip = &Weapon_info[swp->primary_bank_weapons[i]];
-				if (wip->wi_flags[Weapon::Info_Flags::Capital_plus])
+				if (Weapon_info[swp->primary_bank_weapons[i]].wi_flags[Weapon::Info_Flags::Capital_plus])
 				{
-					// handle shielded big/huge ships (non FS-verse)
-					// only pick capital+ if the target has no shields; or the weapon is an ok shield-breaker anyway
-					if (enemy_remaining_shield <= 0.05f || (wip->shield_factor * 1.33f > wip->armor_factor))
-					{
-						swp->current_primary_bank = i;
-						nprintf(("AI", "%i: Ship %s selecting weapon %s (capital+) vs target %s\n", Framecount, Ships[objp->instance].ship_name, wip->name, Ships[other_objp->instance].ship_name));
-						return i;
-					}
+					swp->current_primary_bank = i;
+					nprintf(("AI", "%i: Ship %s selecting weapon %s (capital+) vs target %s\n", Framecount, Ships[objp->instance].ship_name, Weapon_info[swp->primary_bank_weapons[i]].name, Ships[other_objp->instance].ship_name));
+					return i;
 				}
 			}
 		}
 	}

+	float enemy_remaining_shield = get_shield_pct(other_objp);
+
 	// Is the target shielded by say only 5%?
 	if (enemy_remaining_shield <= 0.05f)	
 	{
 		// Then it is safe to start using a heavy hull damage weapon such as the maxim
+		int i;
 		float i_hullfactor_prev = 0;		// Previous weapon bank hull factor (this is the safe way to do it)
 		int i_hullfactor_prev_bank = -1;	// Bank which gave us this hull factor

 		// Find the weapon with the highest hull * damage / fire delay factor
-		for (int i = 0; i < swp->num_primary_banks; i++)
+		for (i = 0; i < swp->num_primary_banks; i++)
 		{
-			if (swp->primary_bank_weapons[i] >= 0)		// Make sure there is a weapon in the bank
+			if (swp->primary_bank_weapons[i] > -1)		// Make sure there is a weapon in the bank
 			{
-				auto wip = &Weapon_info[swp->primary_bank_weapons[i]];
-				if ((((wip->armor_factor) * (wip->damage)) / wip->fire_wait) > i_hullfactor_prev)
+				if ((((Weapon_info[swp->primary_bank_weapons[i]].armor_factor) * (Weapon_info[swp->primary_bank_weapons[i]].damage)) / Weapon_info[swp->primary_bank_weapons[i]].fire_wait) > i_hullfactor_prev)
 				{
-					if ( !(wip->wi_flags[Weapon::Info_Flags::Capital_plus]) )
+					if ( !(Weapon_info[swp->primary_bank_weapons[i]].wi_flags[Weapon::Info_Flags::Capital_plus]) )
 					{
 						// This weapon is the new candidate
-						i_hullfactor_prev = ( ((wip->armor_factor) * (wip->damage)) / wip->fire_wait );
+						i_hullfactor_prev = ( ((Weapon_info[swp->primary_bank_weapons[i]].armor_factor) * (Weapon_info[swp->primary_bank_weapons[i]].damage)) / Weapon_info[swp->primary_bank_weapons[i]].fire_wait );
 						i_hullfactor_prev_bank = i;
 					}
 				}
@@ -5399,7 +5392,7 @@ int ai_select_primary_weapon(object *objp, object *other_objp, Weapon::Info_Flag
 			i_hullfactor_prev_bank = 0;		// Just switch to the first one
 		}
 		swp->current_primary_bank = i_hullfactor_prev_bank;		// Select the best weapon
-		nprintf(("AI", "%i: Ship %s selecting weapon %s (no shields) vs target %s\n", Framecount, shipp->ship_name, Weapon_info[swp->primary_bank_weapons[i_hullfactor_prev_bank]].name, (other_is_ship ? Ships[other_objp->instance].ship_name : "non-ship") ));
+		nprintf(("AI", "%i: Ship %s selecting weapon %s (no shields) vs target %s\n", Framecount, Ships[objp->instance].ship_name, Weapon_info[swp->primary_bank_weapons[i_hullfactor_prev_bank]].name, (other_objp->type == OBJ_SHIP ? Ships[other_objp->instance].ship_name : "non-ship") ));
 		return i_hullfactor_prev_bank;							// Return
 	}

@@ -5408,23 +5401,28 @@ int ai_select_primary_weapon(object *objp, object *other_objp, Weapon::Info_Flag
 	{
 		if (swp->current_primary_bank >= 0) 
 		{
-			auto wip = &Weapon_info[swp->primary_bank_weapons[swp->current_primary_bank]];
+			int	bank_index;

-			if ((wip->wi_flags[Weapon::Info_Flags::Pierce_shields]) && !(wip->wi_flags[Weapon::Info_Flags::Capital_plus]))
+			bank_index = swp->current_primary_bank;
+
+			if ((Weapon_info[swp->primary_bank_weapons[bank_index]].wi_flags[Weapon::Info_Flags::Pierce_shields]) && !(Weapon_info[swp->primary_bank_weapons[bank_index]].wi_flags[Weapon::Info_Flags::Capital_plus]))
 			{
-				nprintf(("AI", "%i: Ship %s selecting weapon %s (>10%% shields)\n", Framecount, shipp->ship_name, wip->name));
+				nprintf(("AI", "%i: Ship %s selecting weapon %s (>10%% shields)\n", Framecount, Ships[objp->instance].ship_name, Weapon_info[swp->primary_bank_weapons[bank_index]].name));
 				return swp->current_primary_bank;
 			}
 		}
 		for (int i=0; i<swp->num_primary_banks; i++) 
 		{
-			if (swp->primary_bank_weapons[i] >= 0)
+			int	weapon_info_index;
+
+			weapon_info_index = swp->primary_bank_weapons[i];
+
+			if (weapon_info_index > -1)
 			{
-				auto wip = &Weapon_info[swp->primary_bank_weapons[i]];
-				if ((wip->wi_flags[Weapon::Info_Flags::Pierce_shields]) && !(wip->wi_flags[Weapon::Info_Flags::Capital_plus]))
+				if ((Weapon_info[weapon_info_index].wi_flags[Weapon::Info_Flags::Pierce_shields]) && !(Weapon_info[swp->primary_bank_weapons[i]].wi_flags[Weapon::Info_Flags::Capital_plus])) 
 				{
 					swp->current_primary_bank = i;
-					nprintf(("AI", "%i: Ship %s selecting weapon %s (>10%% shields)\n", Framecount, shipp->ship_name, wip->name));
+					nprintf(("AI", "%i: Ship %s selecting weapon %s (>10%% shields)\n", Framecount, Ships[objp->instance].ship_name, Weapon_info[swp->primary_bank_weapons[i]].name));
 					return i;
 				}
 			}
@@ -5434,63 +5432,63 @@ int ai_select_primary_weapon(object *objp, object *other_objp, Weapon::Info_Flag
 	// Is the target shielded by less then 50%?
 	if (enemy_remaining_shield <= 0.50f)	
 	{
-		// Should be using best balanced shield/hull gun
-		float i_balancedfactor_prev = 0;	// Previous weapon bank "balanced" factor (this is the safe way to do it)
-		int i_balancedfactor_prev_bank = -1;	// Bank which gave us this "balanced" factor
+		// Should be using best balanced shield gun
+		int i;
+		float i_hullfactor_prev = 0;		// Previous weapon bank hull factor (this is the safe way to do it)
+		int i_hullfactor_prev_bank = -1;	// Bank which gave us this hull factor
 		// Find the weapon with the highest average hull and shield * damage / fire delay factor
-		for (int i = 0; i < swp->num_primary_banks; i++)
+		for (i = 0; i < swp->num_primary_banks; i++)
 		{
-			if (swp->primary_bank_weapons[i] >= 0)		// Make sure there is a weapon in the bank
+			if (swp->primary_bank_weapons[i] > -1)		// Make sure there is a weapon in the bank
 			{
-				auto wip = &Weapon_info[swp->primary_bank_weapons[i]];
-				if ((((wip->armor_factor + wip->shield_factor) * wip->damage) / wip->fire_wait) > i_balancedfactor_prev)
+				if ((((Weapon_info[swp->primary_bank_weapons[i]].armor_factor + Weapon_info[swp->primary_bank_weapons[i]].shield_factor) * Weapon_info[swp->primary_bank_weapons[i]].damage) / Weapon_info[swp->primary_bank_weapons[i]].fire_wait) > i_hullfactor_prev)
 				{
-					if ( !(wip->wi_flags[Weapon::Info_Flags::Capital_plus]) )
+					if ( !(Weapon_info[swp->primary_bank_weapons[i]].wi_flags[Weapon::Info_Flags::Capital_plus]) )
 					{
 						// This weapon is the new candidate
-						i_balancedfactor_prev = ((((wip->armor_factor + wip->shield_factor) * wip->damage) / wip->fire_wait));
-						i_balancedfactor_prev_bank = i;
+						i_hullfactor_prev = ((((Weapon_info[swp->primary_bank_weapons[i]].armor_factor + Weapon_info[swp->primary_bank_weapons[i]].shield_factor) * Weapon_info[swp->primary_bank_weapons[i]].damage) / Weapon_info[swp->primary_bank_weapons[i]].fire_wait));
+						i_hullfactor_prev_bank = i;
 					}
 				}
 			}
 		}
-		if (i_balancedfactor_prev_bank == -1)		// In the unlikely instance we don't find at least 1 candidate weapon
+		if (i_hullfactor_prev_bank == -1)		// In the unlikely instance we don't find at least 1 candidate weapon
 		{
-			i_balancedfactor_prev_bank = 0;		// Just switch to the first one
+			i_hullfactor_prev_bank = 0;		// Just switch to the first one
 		}
-		swp->current_primary_bank = i_balancedfactor_prev_bank;		// Select the best weapon
-		nprintf(("AI", "%i: Ship %s selecting weapon %s (<50%% shields)\n", Framecount, shipp->ship_name, Weapon_info[swp->primary_bank_weapons[i_balancedfactor_prev_bank]].name));
-		return i_balancedfactor_prev_bank;							// Return
+		swp->current_primary_bank = i_hullfactor_prev_bank;		// Select the best weapon
+		nprintf(("AI", "%i: Ship %s selecting weapon %s (<50%% shields)\n", Framecount, Ships[objp->instance].ship_name, Weapon_info[swp->primary_bank_weapons[i_hullfactor_prev_bank]].name));
+		return i_hullfactor_prev_bank;							// Return
 	}
 	else
 	{
 		// Should be using best shield destroying gun
-		float i_shieldfactor_prev = 0;		// Previous weapon bank shield factor (this is the safe way to do it)
-		int i_shieldfactor_prev_bank = -1;	// Bank which gave us this shield factor
+		int i;
+		float i_hullfactor_prev = 0;		// Previous weapon bank hull factor (this is the safe way to do it)
+		int i_hullfactor_prev_bank = -1;	// Bank which gave us this hull factor
 		// Find the weapon with the highest average hull and shield * damage / fire delay factor
-		for (int i = 0; i < swp->num_primary_banks; i++)
+		for (i = 0; i < swp->num_primary_banks; i++)
 		{
-			if (swp->primary_bank_weapons[i] >= 0)		// Make sure there is a weapon in the bank
+			if (swp->primary_bank_weapons[i] > -1)		// Make sure there is a weapon in the bank
 			{
-				auto wip = &Weapon_info[swp->primary_bank_weapons[i]];
-				if ((((wip->shield_factor) * wip->damage) / wip->fire_wait) > i_shieldfactor_prev)
+				if ((((Weapon_info[swp->primary_bank_weapons[i]].shield_factor) * Weapon_info[swp->primary_bank_weapons[i]].damage) / Weapon_info[swp->primary_bank_weapons[i]].fire_wait) > i_hullfactor_prev)
 				{
-					if ( !(wip->wi_flags[Weapon::Info_Flags::Capital_plus]) )
+					if ( !(Weapon_info[swp->primary_bank_weapons[i]].wi_flags[Weapon::Info_Flags::Capital_plus]) )
 					{
 						// This weapon is the new candidate
-						i_shieldfactor_prev = ( ((wip->shield_factor) * (wip->damage)) / wip->fire_wait );
-						i_shieldfactor_prev_bank = i;
+						i_hullfactor_prev = ( ((Weapon_info[swp->primary_bank_weapons[i]].shield_factor) * (Weapon_info[swp->primary_bank_weapons[i]].damage)) / Weapon_info[swp->primary_bank_weapons[i]].fire_wait );
+						i_hullfactor_prev_bank = i;
 					}
 				}
 			}
 		}
-		if (i_shieldfactor_prev_bank == -1)		// In the unlikely instance we don't find at least 1 candidate weapon
+		if (i_hullfactor_prev_bank == -1)		// In the unlikely instance we don't find at least 1 candidate weapon
 		{
-			i_shieldfactor_prev_bank = 0;		// Just switch to the first one
+			i_hullfactor_prev_bank = 0;		// Just switch to the first one
 		}
-		swp->current_primary_bank = i_shieldfactor_prev_bank;		// Select the best weapon
-		nprintf(("AI", "%i: Ship %s selecting weapon %s (>50%% shields)\n", Framecount, shipp->ship_name, Weapon_info[swp->primary_bank_weapons[i_shieldfactor_prev_bank]].name));
-		return i_shieldfactor_prev_bank;							// Return
+		swp->current_primary_bank = i_hullfactor_prev_bank;		// Select the best weapon
+		nprintf(("AI", "%i: Ship %s selecting weapon %s (>50%% shields)\n", Framecount, Ships[objp->instance].ship_name, Weapon_info[swp->primary_bank_weapons[i_hullfactor_prev_bank]].name));
+		return i_hullfactor_prev_bank;							// Return
 	}
 }

@@ -14079,74 +14077,53 @@ void ai_frame(int objnum)
 	}
 }

-static void ai_control_info_check(ai_info *aip, physics_info *pi)
+static void ai_control_info_check(ai_info *aip)
 {
-	if (aip->ai_override_flags.none_set())
+	if(aip->ai_override_flags.none_set())
 		return;

-	if (!aip->ai_override_flags[AI::Maneuver_Override_Flags::Never_expire] && timestamp_elapsed(aip->ai_override_timestamp))
-	{
+	if(timestamp_elapsed(aip->ai_override_timestamp)) {
 		aip->ai_override_flags.reset();
-	}
-	else
-	{
-		if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Full_rot])
+	} else {
+		if(aip->ai_override_flags[AI::Maneuver_Override_Flags::Full])
 		{
 			AI_ci.pitch = aip->ai_override_ci.pitch;
 			AI_ci.heading = aip->ai_override_ci.heading;
 			AI_ci.bank = aip->ai_override_ci.bank;
-		}
-		else
-		{
-			if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Pitch])
+		} else {
+			if(aip->ai_override_flags[AI::Maneuver_Override_Flags::Pitch])
 			{
 				AI_ci.pitch = aip->ai_override_ci.pitch;
 			}
-			if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Heading])
+			if(aip->ai_override_flags[AI::Maneuver_Override_Flags::Heading])
 			{
 				AI_ci.heading = aip->ai_override_ci.heading;
 			}
-			if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Roll])
+			if(aip->ai_override_flags[AI::Maneuver_Override_Flags::Roll])
 			{
 				AI_ci.bank = aip->ai_override_ci.bank;
 			}
 		}
-
-		if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Full_lat])
+		if(aip->ai_override_flags[AI::Maneuver_Override_Flags::Full_lat])
 		{
 			AI_ci.vertical = aip->ai_override_ci.vertical;
 			AI_ci.sideways = aip->ai_override_ci.sideways;
 			AI_ci.forward = aip->ai_override_ci.forward;
-		}
-		else
-		{
-			if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Up])
+		} else {
+			if(aip->ai_override_flags[AI::Maneuver_Override_Flags::Up])
 			{
 				AI_ci.vertical = aip->ai_override_ci.vertical;
 			}
-			if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Sideways])
+			if(aip->ai_override_flags[AI::Maneuver_Override_Flags::Sideways])
 			{
 				AI_ci.sideways = aip->ai_override_ci.sideways;
 			}
-			if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Forward])
+			if(aip->ai_override_flags[AI::Maneuver_Override_Flags::Forward])
 			{
 				AI_ci.forward = aip->ai_override_ci.forward;
 			}
 		}
-
-		if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Dont_bank_when_turning])
-			AI_ci.control_flags |= CIF_DONT_BANK_WHEN_TURNING;
-		if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Dont_clamp_max_velocity])
-			AI_ci.control_flags |= CIF_DONT_CLAMP_MAX_VELOCITY;
-		if (aip->ai_override_flags[AI::Maneuver_Override_Flags::Instantaneous_acceleration])
-			AI_ci.control_flags |= CIF_INSTANTANEOUS_ACCELERATION;
 	}
-
-	// set physics flag according to whether we are instantaneously accelerating
-	if (AI_ci.control_flags & CIF_INSTANTANEOUS_ACCELERATION)
-		pi->flags |= PF_NO_DAMP;
-	else
-		pi->flags &= ~PF_NO_DAMP;
 }

 int Last_ai_obj = -1;
@@ -14201,7 +14178,7 @@ void ai_process( object * obj, int ai_index, float frametime )

 	if (rfc == 1) {
 		// Wanderer - sexp based override goes here - only if rfc is valid though
-		ai_control_info_check(aip, &obj->phys_info);
+		ai_control_info_check(aip);
 		vec3d copy_desired_rotvel = obj->phys_info.rotvel;
 		physics_read_flying_controls( &obj->orient, &obj->phys_info, &AI_ci, frametime);
 		// if obj is in formation and not flight leader, don't update rotvel
@@ -21,7 +21,6 @@
 #include "object/waypoint.h"
 #include "parse/sexp.h"
 #include "playerman/player.h"
-#include "scripting/scripting.h"
 #include "ship/ship.h"
 #include "weapon/weapon.h"

@@ -269,12 +268,6 @@ void ai_clear_ship_goals( ai_info *aip )
 	{
 		ai_do_default_behavior( &Objects[Ships[aip->shipnum].objnum] );
 	}
-
-	// add scripting hook for 'On Goals Cleared' --wookieejedi
-	Script_system.SetHookObject("Ship", &Objects[Ships[aip->shipnum].objnum]);
-	Script_system.RunCondition(CHA_ONGOALSCLEARED);
-	Script_system.RemHookVars(1, "Ship");
-
 }

 void ai_clear_wing_goals( int wingnum )
@@ -1506,8 +1499,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 			Assert ( aigp->ai_submode >= 0 );
 			ssp = ship_get_indexed_subsys( &Ships[sindex], aigp->ai_submode );
 			if (ssp != NULL) {
-				// see MWA 3/20/97 comment above - instead of checking the mission log, check the current hits
-				status = (ssp->current_hits <= 0.0f) ? 1 : 0;
+				status = mission_log_get_time( LOG_SHIP_SUBSYS_DESTROYED, aigp->target_name, ssp->system_info->subobj_name, NULL );
 			} else {
 				// not supposed to ever happen, but could if there is a mismatch between the table and model subsystems
 				nprintf(("AI", "Couldn't find subsystem %d for ship %s\n", aigp->ai_submode, Ships[sindex].ship_name));
@@ -1517,36 +1509,12 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 		}

 		case AI_GOAL_DISABLE_SHIP:
-		{
-			// shipnum could be -1 depending on if the ship hasn't arrived or died.  only look for subsystem
-			// destroyed when shipnum is valid
-			sindex = ship_name_lookup(aigp->target_name);
-
-			// can't determine the status of this goal if ship not valid
-			if (sindex < 0) {
-				status = 0;
-			} else {
-				// see MWA 3/20/97 comment above - instead of checking the mission log, check the current hits
-				status = (Ships[sindex].subsys_info[SUBSYSTEM_ENGINE].aggregate_current_hits <= 0.0f) ? 1 : 0;
-			}
+			status = mission_log_get_time( LOG_SHIP_DISABLED, aigp->target_name, NULL, NULL );
 			break;
-		}

 		case AI_GOAL_DISARM_SHIP:
-		{
-			// shipnum could be -1 depending on if the ship hasn't arrived or died.  only look for subsystem
-			// destroyed when shipnum is valid
-			sindex = ship_name_lookup(aigp->target_name);
-
-			// can't determine the status of this goal if ship not valid
-			if (sindex < 0) {
-				status = 0;
-			} else {
-				// see MWA 3/20/97 comment above - instead of checking the mission log, check the current hits
-				status = (Ships[sindex].subsys_info[SUBSYSTEM_TURRET].aggregate_current_hits <= 0.0f) ? 1 : 0;
-			}
+			status = mission_log_get_time( LOG_SHIP_DISARMED, aigp->target_name, NULL, NULL );
 			break;
-		}

 		// to guard or ignore a ship, the goal cannot continue if the ship being guarded is either destroyed
 		// or has departed.
@@ -1658,7 +1626,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 			status = SHIP_STATUS_ARRIVED;
 		}
 		// goal ship is still on the arrival list
-		else if ( mission_check_ship_yet_to_arrive(aigp->target_name) )
+		else if ( mission_parse_get_arrival_ship(aigp->target_name) )
 		{
 			status = SHIP_STATUS_NOT_ARRIVED;
 		}
@@ -856,11 +856,11 @@ int get_nearest_turret_objnum(int turret_parent_objnum, ship_subsys *turret_subs
 	// flags for weapon types
 	if (beam_flag)
 		eeo.eeo_flags |= EEOF_BEAM;
-	if (flak_flag)
+	else if (flak_flag)
 		eeo.eeo_flags |= EEOF_FLAK;
-	if (laser_flag)
+	else if (laser_flag)
 		eeo.eeo_flags |= EEOF_LASER;
-	if (missile_flag)
+	else if (missile_flag)
 		eeo.eeo_flags |= EEOF_MISSILE;

 	eeo.enemy_team_mask = enemy_team_mask;
@@ -1678,12 +1678,7 @@ void turret_set_next_fire_timestamp(int weapon_num, weapon_info *wip, ship_subsy
 		wait *= wip->burst_delay;
 		turret->weapons.burst_counter[weapon_num]++;
 	} else {
-		// Random fire delay (DahBlount) used in ship_fire_primary(), added here by wookieejedi to correct oversight
-		if (wip->max_delay != 0.0f && wip->min_delay != 0.0f) {
-			wait *= frand_range(wip->min_delay, wip->max_delay);
-		} else {
-			wait *= wip->fire_wait;
-		}
+		wait *= wip->fire_wait;
 		if ((wip->burst_shots > 0) && (wip->burst_flags[Weapon::Burst_Flags::Random_length])) {
 			turret->weapons.burst_counter[weapon_num] = (myrand() % wip->burst_shots);
 		} else {
@@ -2731,6 +2726,8 @@ void ai_fire_from_turret(ship *shipp, ship_subsys *ss, int parent_objnum)

 		if(!something_was_ok_to_fire)
 		{
+			mprintf(("nothing ok to fire\n"));
+            
 			if (ss->turret_best_weapon >= 0) {
 				//Impose a penalty on turret accuracy for losing site of its goal, or just not being able to fire.
 				turret_update_enemy_in_range(ss, -4*Weapon_info[ss->turret_best_weapon].fire_wait);
@@ -10,9 +10,12 @@
 #define BMPMAN_NDEBUG
 #endif

-#define WIN32_LEAN_AND_MEAN
 #define BMPMAN_INTERNAL

+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 #include "anim/animplay.h"
 #include "anim/packunpack.h"
 #include "bmpman/bm_internal.h"
@@ -38,9 +38,6 @@

 #include <limits>

-char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
-char Cfile_user_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
-
 // During cfile_init, verify that Pathtypes[n].index == n for each item
 // Each path must have a valid parent that can be tracable all the way back to the root
 // so that we can create directories when we need to.
@@ -103,8 +100,6 @@ static char Cfile_stack[CFILE_STACK_MAX][CFILE_ROOT_DIRECTORY_LEN];

 std::array<CFILE, MAX_CFILE_BLOCKS> Cfile_block_list;

-static const char *Cfile_cdrom_dir = NULL;
-
 //
 // Function prototypes for internally-called functions
 //
@@ -147,47 +142,15 @@ void cfile_close()
 	#define MIN_NUM_PATH_COMPONENTS 3     /* Drive + directory + file */
 #endif

-/**
- * @brief Determine if the given path is in the root directory
- *
- * @param exe_path Path to executable
- *
- * @return true if root directory, false if not
- */
-static bool cfile_in_root_dir(const char *exe_path)
-{
-	int new_token;
-	int token_count = 0;
-	const char *p = exe_path;
-
-	Assert(exe_path != NULL);
-
-	do {
-		new_token = 0;
-		while (*p == DIR_SEPARATOR_CHAR) {
-			p++;
-		}
-
-		while ((*p != '\0') && (*p != DIR_SEPARATOR_CHAR)) {
-			new_token = 1;
-			p++;
-		}
-		token_count += new_token;
-	} while (*p != '\0');
-
-	return (token_count < MIN_NUM_PATH_COMPONENTS);
-}
-
 /**
 * @brief Initialize the cfile system. Called once at application start.
 *
 * @param exe_dir Path to a file (not a directory)
- * @param cdrom_dir Path to a CD drive mount point (may be NULL)
 *
 * @return 0 On success
 * @return 1 On error
 */
-int cfile_init(const char *exe_dir, const char *cdrom_dir)
+int cfile_init(const SCP_vector<cfile::ModRoot>& modRoots)
 {
 	// initialize encryption
 	encrypt_init();	
@@ -196,36 +159,8 @@ int cfile_init(const char *exe_dir, const char *cdrom_dir)
 		return 0;
 	}

-	char buf[CFILE_ROOT_DIRECTORY_LEN];
-
-	strncpy(buf, exe_dir, CFILE_ROOT_DIRECTORY_LEN - 1);
-	buf[CFILE_ROOT_DIRECTORY_LEN - 1] = '\0';
-
-	// are we in a root directory?		
-	if(cfile_in_root_dir(buf)){
-		os::dialogs::Message(os::dialogs::MESSAGEBOX_ERROR, "FreeSpace2/Fred2 cannot be run from a drive root directory!");
-		return 1;
-	}		
-
 	// This needs to be set here because cf_build_secondary_filelist assumes it to be true
 	cfile_inited = 1;
-	
-	/*
-	 * Determine the executable's directory.  Note that DIR_SEPARATOR_CHAR
-	 * is guaranteed to be found in the string else cfile_in_root_dir()
-	 * would have failed.
-	 */
-
-	char *p;
-
-	p = strrchr(buf, DIR_SEPARATOR_CHAR);
-	*p = '\0';
-
-	cfile_chdir(buf);
-
-	// set root directory
-	strcpy_s(Cfile_root_dir, buf);
-	strcpy_s(Cfile_user_dir, os_get_config_path().c_str());

 	// Initialize the block list with proper data
 	Cfile_block_list.fill({});
@@ -233,8 +168,7 @@ int cfile_init(const char *exe_dir, const char *cdrom_dir)
 	// 32 bit CRC table init
 	cf_chksum_long_init();

-	Cfile_cdrom_dir = cdrom_dir;
-	cf_build_secondary_filelist(Cfile_cdrom_dir);
+	cf_build_secondary_filelist(modRoots);

 	return 0;
 }
@@ -165,11 +165,22 @@ extern const char *Get_file_list_child;

 // cfile directory. valid after cfile_init() returns successfully
 #define CFILE_ROOT_DIRECTORY_LEN			256
-extern char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN];
-extern char Cfile_user_dir[CFILE_ROOT_DIRECTORY_LEN];
+
+namespace cfile {
+enum class ModRootType { Unknown, Folder, Package };
+
+enum class LocationType { Unknown, SecondaryMod, PrimaryMod, GameRoot };
+
+struct ModRoot {
+	ModRootType type = ModRootType::Unknown;
+	SCP_string path;
+	LocationType location_type = LocationType::Unknown;
+	bool user_location         = false;
+};
+} // namespace cfile

 //================= LOW-LEVEL FUNCTIONS ==================
-int cfile_init(const char *exe_dir, const char *cdrom_dir=NULL);
+int cfile_init(const SCP_vector<cfile::ModRoot>& modRoots);
 void cfile_close();

 // add an extension to a filename if it doesn't already have it
@@ -291,10 +302,6 @@ uint cf_add_chksum_long(uint seed, ubyte *buffer, size_t size);
 #define CF_RENAME_FAIL_EXIST			2					// old name does not exist
 int cf_rename(const char *old_name, const char *name, int type = CF_TYPE_ANY );

-// Creates the directory path if it doesn't exist. Even creates all its
-// parent paths.
-void cf_create_directory(int dir_type, uint32_t location_flags = CF_LOCATION_ALL);
-
 // changes the attributes of a file
 void cf_attrib(const char *name, int set, int clear, int type);

@@ -0,0 +1,266 @@
+#define _CFILE_INTERNAL
+
+#include "cfilemod.h"
+#include "cfile.h"
+#include "cmdline/cmdline.h"
+#include "osapi/osapi.h"
+#include "cfilesystem.h"
+
+#ifdef SCP_UNIX
+#include <glob.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <fnmatch.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <libgen.h>
+#endif
+
+namespace cfile {
+
+namespace {
+
+typedef struct cf_root_sort {
+	SCP_string path;
+	int cf_type;
+} cf_root_sort;
+
+// packfile sort function
+bool cf_packfile_sort_func(const cf_root_sort& r1, const cf_root_sort& r2) {
+	// if the 2 directory types are the same, do a string compare
+	if (r1.cf_type == r2.cf_type) {
+		return (stricmp(r1.path.c_str(), r2.path.c_str()) < 0);
+	}
+
+	// otherwise return them in order of CF_TYPE_* precedence
+	return (r1.cf_type < r2.cf_type);
+}
+
+// Go through a root and look for pack files
+void build_pack_list(SCP_vector<ModRoot>& mod_roots,
+                     const SCP_string& search_path,
+                     LocationType location_type,
+                     bool user_location) {
+	char filespec[MAX_PATH_LEN];
+
+	// allocate a temporary array of temporary roots so we can easily sort them
+	SCP_vector<cf_root_sort> temp_roots_sort;
+
+	// now just setup all the root info
+	for (int i = CF_TYPE_ROOT; i < CF_MAX_PATH_TYPES; i++) {
+		strcpy_s(filespec, search_path.c_str());
+
+		if (strlen(Pathtypes[i].path)) {
+			strcat_s(filespec, Pathtypes[i].path);
+
+			if (filespec[strlen(filespec) - 1] != DIR_SEPARATOR_CHAR)
+				strcat_s(filespec, DIR_SEPARATOR_STR);
+		}
+
+#if defined _WIN32
+			strcat_s( filespec, "*.vp" );
+
+		intptr_t find_handle;
+		_finddata_t find;
+
+		find_handle = _findfirst( filespec, &find );
+
+		 if (find_handle != -1) {
+			do {
+				// add the new item
+				if (!(find.attrib & _A_SUBDIR)) {
+
+					// get a temp pointer
+					rptr_sort = &temp_roots_sort[root_index++];
+
+					// fill in all the proper info
+					strcpy_s(rptr_sort->path, root->path);
+
+					if(strlen(Pathtypes[i].path)) {
+
+						strcat_s(rptr_sort->path, Pathtypes[i].path );
+						strcat_s(rptr_sort->path, DIR_SEPARATOR_STR);
+					}
+
+					strcat_s(rptr_sort->path, find.name );
+					rptr_sort->roottype = CF_ROOTTYPE_PACK;
+					rptr_sort->cf_type = i;
+				}
+
+			} while (!_findnext(find_handle, &find));
+
+			_findclose( find_handle );
+		}
+#elif defined SCP_UNIX
+		strcat_s(filespec, "*.[vV][pP]");
+		glob_t globinfo;
+
+		memset(&globinfo, 0, sizeof(globinfo));
+
+		int status = glob(filespec, 0, NULL, &globinfo);
+
+		if (status == 0) {
+			for (uint j = 0; j < globinfo.gl_pathc; j++) {
+				// Determine if this is a regular file
+				struct stat statbuf;
+				memset(&statbuf, 0, sizeof(statbuf));
+				stat(globinfo.gl_pathv[j], &statbuf);
+
+				if (S_ISREG(statbuf.st_mode)) {
+
+					cf_root_sort sort;
+
+					// fill in all the proper info
+					sort.path = globinfo.gl_pathv[j];
+					sort.cf_type = i;
+					temp_roots_sort.push_back(sort);
+				}
+			}
+
+			globfree(&globinfo);
+		}
+#endif
+	}
+
+	// sort the roots
+	std::sort(temp_roots_sort.begin(), temp_roots_sort.end(), cf_packfile_sort_func);
+
+	// now insert them all into the real root list properly
+	for (const auto& pack_root : temp_roots_sort) {
+		ModRoot root;
+		root.type = ModRootType::Package;
+		root.path = pack_root.path;
+		root.user_location = user_location;
+		root.location_type = location_type;
+
+		mod_roots.push_back(root);
+	}
+}
+
+char normalize_directory_separator(char in) {
+	if (in == '/') {
+		return DIR_SEPARATOR_CHAR;
+	}
+
+	return in;
+}
+
+void
+add_mod_roots(SCP_vector<ModRoot>& mod_roots, const char* mod_cmdline, const SCP_string& rootDirectory, bool user_location) {
+	if (mod_cmdline) {
+		bool primary = true;
+		for (const char* cur_pos = mod_cmdline; strlen(cur_pos) != 0; cur_pos += (strlen(cur_pos) + 1)) {
+			SCP_stringstream ss;
+			ss << rootDirectory;
+
+			if (rootDirectory.back() != DIR_SEPARATOR_CHAR) {
+				ss << DIR_SEPARATOR_CHAR;
+			}
+
+			ss << cur_pos << DIR_SEPARATOR_STR;
+
+			SCP_string rootPath = ss.str();
+
+			// normalize the path to the native path format
+			std::transform(rootPath.begin(), rootPath.end(), rootPath.begin(), normalize_directory_separator);
+
+			ModRoot root;
+			root.type = ModRootType::Folder;
+			root.path = rootPath;
+			root.user_location = user_location;
+
+			if (primary) {
+				root.location_type = LocationType::PrimaryMod;
+			} else {
+				root.location_type = LocationType::SecondaryMod;
+			}
+
+			mod_roots.push_back(root);
+
+			build_pack_list(mod_roots, rootPath, root.location_type, user_location);
+
+			primary = false;
+		}
+	}
+}
+
+}
+
+SCP_vector<ModRoot> getModRootsFromModCmdline(const SCP_string& content_root, const char* mod_cmdline) {
+	SCP_vector<ModRoot> mod_roots;
+
+	if (os_is_legacy_mode()) {
+		// =========================================================================
+#ifdef WIN32
+		// Nothing to do here, Windows uses the current directory as the base
+#else
+		add_mod_roots(mod_roots, mod_cmdline, os_get_legacy_user_dir(), true);
+
+		ModRoot root;
+		root.type = ModRootType::Folder;
+		root.path = os_get_legacy_user_dir();
+		root.user_location = true;
+		root.location_type = LocationType::GameRoot;
+
+		// do we already have a slash? as in the case of a root directory install
+		if (root.path.back() != DIR_SEPARATOR_CHAR) {
+			root.path += DIR_SEPARATOR_STR;        // put trailing backslash on for easier path construction
+		}
+
+		mod_roots.push_back(root);
+
+		// Next, check any VP files under the current directory.
+		build_pack_list(mod_roots, root.path, root.location_type, root.user_location);
+#endif
+		// =========================================================================
+	} else if (!Cmdline_portable_mode) {
+		// =========================================================================
+		// now look for mods under the users HOME directory to use before system ones
+		add_mod_roots(mod_roots, mod_cmdline, os_get_config_path(), true);
+		// =========================================================================
+
+		// =========================================================================
+		// set users HOME directory as default for loading and saving files
+		ModRoot root;
+		root.type = ModRootType::Folder;
+		root.path = os_get_config_path();
+		root.user_location = true;
+		root.location_type = LocationType::GameRoot;
+
+		// do we already have a slash? as in the case of a root directory install
+		if (root.path.back() != DIR_SEPARATOR_CHAR) {
+			root.path += DIR_SEPARATOR_STR;        // put trailing backslash on for easier path construction
+		}
+
+		mod_roots.push_back(root);
+
+		// Next, check any VP files under the current directory.
+		build_pack_list(mod_roots, root.path, root.location_type, root.user_location);
+		// =========================================================================
+	}
+
+	add_mod_roots(mod_roots, mod_cmdline, content_root, false);
+
+	ModRoot root;
+	root.type = ModRootType::Folder;
+	root.path = content_root;
+	root.user_location = false;
+	root.location_type = LocationType::GameRoot;
+
+	// do we already have a slash? as in the case of a root directory install
+	if (root.path.back() != DIR_SEPARATOR_CHAR) {
+		root.path += DIR_SEPARATOR_STR;        // put trailing backslash on for easier path construction
+	}
+
+	mod_roots.push_back(root);
+
+	//======================================================
+	// Next, check any VP files under the current directory.
+	build_pack_list(mod_roots, root.path, root.location_type, root.user_location);
+
+	return mod_roots;
+}
+
+}
+
+
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "globalincs/pstypes.h"
+#include "cfile/cfile.h"
+
+namespace cfile {
+
+SCP_vector<ModRoot> getModRootsFromModCmdline(const SCP_string& content_root, const char* mod_cmdline);
+
+}
@@ -160,379 +160,113 @@ cf_root *cf_create_root()
 	return &Root_blocks[block]->roots[offset];
 }

-// return the # of packfiles which exist
-int cf_get_packfile_count(cf_root *root)
+static bool has_mod_location(const SCP_vector<cfile::ModRoot>& modRoots)
 {
-	SCP_string filespec;
-	int i;
-	int packfile_count;
-
-	// count up how many packfiles we're gonna have
-	packfile_count = 0;
-	for (i=CF_TYPE_ROOT; i<CF_MAX_PATH_TYPES; i++ )
+	for (const auto& root : modRoots)
 	{
-		filespec = root->path;
-		
-		if(strlen(Pathtypes[i].path))
+		if (root.location_type == cfile::LocationType::PrimaryMod)
 		{
-			filespec += Pathtypes[ i ].path;
-			if ( filespec[ filespec.length( ) - 1 ] != DIR_SEPARATOR_CHAR )
-			{
-				filespec += DIR_SEPARATOR_STR;
-			}
-		}
-
-#if defined _WIN32
-		filespec += "*.vp";
-
-		intptr_t find_handle;
-		_finddata_t find;
-		
-		find_handle = _findfirst( filespec.c_str( ), &find );
-
- 		if (find_handle != -1) {
-			do {
-				if (!(find.attrib & _A_SUBDIR)) {
-					packfile_count++;
-				}
-
-			} while (!_findnext(find_handle, &find));
-
-			_findclose( find_handle );
-		}	
-#elif defined SCP_UNIX
-		filespec += "*.[vV][pP]";
-
-		glob_t globinfo;
-		memset(&globinfo, 0, sizeof(globinfo));
-		int status = glob(filespec.c_str( ), 0, NULL, &globinfo);
-		if (status == 0) {
-			for (unsigned int j = 0;  j < globinfo.gl_pathc;  j++) {
-				// Determine if this is a regular file
-				struct stat statbuf;
-				memset(&statbuf, 0, sizeof(statbuf));
-				stat(globinfo.gl_pathv[j], &statbuf);
-				if (S_ISREG(statbuf.st_mode)) {
-					packfile_count++;
-				}
-			}
-			globfree(&globinfo);
-		}
-#endif
-	}
-
-	return packfile_count;
-}
-
-// packfile sort function
-bool cf_packfile_sort_func(const cf_root_sort &r1, const cf_root_sort &r2)
-{
-	// if the 2 directory types are the same, do a string compare
-	if (r1.cf_type == r2.cf_type) {
-		return (stricmp(r1.path, r2.path) < 0);
-	}
-
-	// otherwise return them in order of CF_TYPE_* precedence
-	return (r1.cf_type < r2.cf_type);
-}
-
-// Go through a root and look for pack files
-void cf_build_pack_list( cf_root *root )
-{
-	char filespec[MAX_PATH_LEN];
-	int i;
-	cf_root_sort *temp_roots_sort, *rptr_sort;
-	int temp_root_count, root_index;
-
-	// determine how many packfiles there are
-	temp_root_count = cf_get_packfile_count(root);
-
-	if (temp_root_count <= 0)
-		return;
-
-	// allocate a temporary array of temporary roots so we can easily sort them
-	temp_roots_sort = (cf_root_sort*)vm_malloc(sizeof(cf_root_sort) * temp_root_count);
-
-	if (temp_roots_sort == NULL) {
-		Int3();
-		return;
-	}
-
-	// now just setup all the root info
-	root_index = 0;
-	for (i = CF_TYPE_ROOT; i < CF_MAX_PATH_TYPES; i++) {
-		strcpy_s( filespec, root->path );
-		
-		if ( strlen(Pathtypes[i].path) ) {
-			strcat_s( filespec, Pathtypes[i].path );
-
-			if ( filespec[strlen(filespec)-1] != DIR_SEPARATOR_CHAR )
-				strcat_s( filespec, DIR_SEPARATOR_STR );
-		}
-
-#if defined _WIN32
-		strcat_s( filespec, "*.vp" );
-
-		intptr_t find_handle;
-		_finddata_t find;
-		
-		find_handle = _findfirst( filespec, &find );
-
- 		if (find_handle != -1) {
-			do {
-				// add the new item
-				if (!(find.attrib & _A_SUBDIR)) {					
-					Assert(root_index < temp_root_count);
-
-					// get a temp pointer
-					rptr_sort = &temp_roots_sort[root_index++];
-
-					// fill in all the proper info
-					strcpy_s(rptr_sort->path, root->path);
-					
-					if(strlen(Pathtypes[i].path)) {
-
-						strcat_s(rptr_sort->path, Pathtypes[i].path );
-						strcat_s(rptr_sort->path, DIR_SEPARATOR_STR);
-					}
-					
-					strcat_s(rptr_sort->path, find.name );
-					rptr_sort->roottype = CF_ROOTTYPE_PACK;
-					rptr_sort->cf_type = i;
-				}
-
-			} while (!_findnext(find_handle, &find));
-
-			_findclose( find_handle );
-		}	
-#elif defined SCP_UNIX
-		strcat_s( filespec, "*.[vV][pP]" );
-		glob_t globinfo;
-
-		memset(&globinfo, 0, sizeof(globinfo));
-
-		int status = glob(filespec, 0, NULL, &globinfo);
-
-		if (status == 0) {
-			for (uint j = 0;  j < globinfo.gl_pathc;  j++) {
-				// Determine if this is a regular file
-				struct stat statbuf;
-				memset(&statbuf, 0, sizeof(statbuf));
-				stat(globinfo.gl_pathv[j], &statbuf);
-
-				if ( S_ISREG(statbuf.st_mode) ) {
-					Assert(root_index < temp_root_count);
-
-					// get a temp pointer
-					rptr_sort = &temp_roots_sort[root_index++];
-
-					// fill in all the proper info
-					strcpy_s(rptr_sort->path, globinfo.gl_pathv[j] );
-					rptr_sort->roottype = CF_ROOTTYPE_PACK;
-					rptr_sort->cf_type = i;
-				}
-			}
-
-			globfree(&globinfo);
-		}
-#endif
-	}
-
-	// these should always be the same
-	Assert(root_index == temp_root_count);
-
-	// sort the roots
-	std::sort(temp_roots_sort, temp_roots_sort + temp_root_count, cf_packfile_sort_func);
-
-	// now insert them all into the real root list properly
-	for (i = 0; i < temp_root_count; i++) {
-		auto new_root            = cf_create_root();
-		new_root->location_flags = root->location_flags;
-		strcpy_s( new_root->path, root->path );
-
-#ifndef NDEBUG
-		uint chksum = 0;
-		cf_chksum_pack(temp_roots_sort[i].path, &chksum);
-		mprintf(("Found root pack '%s' with a checksum of 0x%08x\n", temp_roots_sort[i].path, chksum));
-#endif
-
-		// mwa -- 4/2/98 put in the next 2 lines because the path name needs to be there
-		// to find the files.
-		strcpy_s(new_root->path, temp_roots_sort[i].path);		
-		new_root->roottype = CF_ROOTTYPE_PACK;		
-	}
-
-	// free up the temp list
-	vm_free(temp_roots_sort);
-}
-
-static char normalize_directory_separator(char in)
-{
-	if (in == '/')
-	{
-		return DIR_SEPARATOR_CHAR;
-	}
-
-	return in;
-}
-
-static void cf_add_mod_roots(const char* rootDirectory, uint32_t basic_location)
-{
-	if (Cmdline_mod)
-	{
-		bool primary = true;
-		for (const char* cur_pos=Cmdline_mod; strlen(cur_pos) != 0; cur_pos+= (strlen(cur_pos)+1))
-		{
-			SCP_stringstream ss;
-			ss << rootDirectory;
-
-			if (rootDirectory[strlen(rootDirectory) - 1] != DIR_SEPARATOR_CHAR)
-			{
-				ss << DIR_SEPARATOR_CHAR;
-			}
-
-			ss << cur_pos << DIR_SEPARATOR_STR;
-
-			SCP_string rootPath = ss.str();
-			if (rootPath.size() + 1 >= CF_MAX_PATHNAME_LENGTH) {
-				Error(LOCATION, "The length of mod directory path '%s' exceeds the maximum of %d!\n", rootPath.c_str(), CF_MAX_PATHNAME_LENGTH);
-			}
-
-			// normalize the path to the native path format
-			std::transform(rootPath.begin(), rootPath.end(), rootPath.begin(), normalize_directory_separator);
-
-			cf_root* root = cf_create_root();
-
-			strncpy(root->path, rootPath.c_str(),  CF_MAX_PATHNAME_LENGTH-1);
-			if (primary) {
-				root->location_flags = basic_location | CF_LOCATION_TYPE_PRIMARY_MOD;
-			} else {
-				root->location_flags = basic_location | CF_LOCATION_TYPE_SECONDARY_MODS;
-			}
-
-			root->roottype = CF_ROOTTYPE_PATH;
-			cf_build_pack_list(root);
-
-			primary = false;
+			return true;
 		}
 	}
+
+	return false;
 }

-void cf_build_root_list(const char *cdrom_dir)
+void cf_build_root_list(const SCP_vector<cfile::ModRoot>& modRoots)
 {
 	Num_roots = 0;
 	Num_path_roots = 0;

-	cf_root	*root = nullptr;
+	auto has_mod = has_mod_location(modRoots);

-	if (os_is_legacy_mode())
+	mprintf(("CFile root configuration:\n"));
+	// Go through the roots specified and convert them to the internal data structure
+	for (const auto& root : modRoots)
 	{
-		// =========================================================================
-#ifdef WIN32
-		// Nothing to do here, Windows uses the current directory as the base
-#else
-		cf_add_mod_roots(os_get_legacy_user_dir(), CF_LOCATION_ROOT_USER);
-
-		root = cf_create_root();
-		strncpy(root->path, os_get_legacy_user_dir(), CF_MAX_PATHNAME_LENGTH - 1);
-
-		root->location_flags |= CF_LOCATION_ROOT_USER | CF_LOCATION_TYPE_ROOT;
-		if (Cmdline_mod == nullptr || strlen(Cmdline_mod) <= 0) {
-			// If there are no mods then the root is the primary mod
-			root->location_flags |= CF_LOCATION_TYPE_PRIMARY_MOD;
+		if (root.path.size() >= CF_MAX_PATHNAME_LENGTH - 1)
+		{
+			Error(LOCATION, "Mod root path '%s' is longer than the maximum %d!", root.path.c_str(), CF_MAX_PATHNAME_LENGTH - 1);
+			return;
 		}

-		// do we already have a slash? as in the case of a root directory install
-		if ((strlen(root->path) < (CF_MAX_PATHNAME_LENGTH - 1)) && (root->path[strlen(root->path) - 1] != DIR_SEPARATOR_CHAR)) {
-			strcat_s(root->path, DIR_SEPARATOR_STR);		// put trailing backslash on for easier path construction
-		}
-		root->roottype = CF_ROOTTYPE_PATH;
+		auto cfile_root = cf_create_root();
+		memset(cfile_root, 0, sizeof(*cfile_root));

-		// Next, check any VP files under the current directory.
-		cf_build_pack_list(root);
+		strcpy_s(cfile_root->path, root.path.c_str());
+
+		if (root.user_location)
+		{
+			cfile_root->location_flags |= CF_LOCATION_ROOT_USER;
+		} else {
+			cfile_root->location_flags |= CF_LOCATION_ROOT_GAME;
+		}
+
+		if (root.location_type == cfile::LocationType::SecondaryMod)
+		{
+			cfile_root->location_flags |= CF_LOCATION_TYPE_SECONDARY_MODS;
+		} else if (root.location_type == cfile::LocationType::PrimaryMod)
+		{
+			cfile_root->location_flags |= CF_LOCATION_TYPE_PRIMARY_MOD;
+		} else if (root.location_type == cfile::LocationType::GameRoot)
+		{
+			cfile_root->location_flags |= CF_LOCATION_TYPE_ROOT;
+			if (!has_mod)
+			{
+				// If we do not have a mod then game roots are also primary mods
+				cfile_root->location_flags |= CF_LOCATION_TYPE_PRIMARY_MOD;
+			}
+		} else {
+			UNREACHABLE("Unknown root location type!");
+		}
+
+		switch (root.type)
+		{
+		case cfile::ModRootType::Folder:
+			cfile_root->roottype = CF_ROOTTYPE_PATH;
+			break;
+		case cfile::ModRootType::Package:
+			cfile_root->roottype = CF_ROOTTYPE_PACK;
+			break;
+		default:
+			UNREACHABLE("Unknown root type!");
+			break;
+		}
+
+		if (root.type == cfile::ModRootType::Folder)
+		{
+			size_t path_len = strlen(cfile_root->path);
+
+			// do we already have a slash? as in the case of a root directory install
+			if ( (path_len < (CF_MAX_PATHNAME_LENGTH-1)) && (cfile_root->path[path_len-1] != DIR_SEPARATOR_CHAR) ) {
+				strcat_s(cfile_root->path, DIR_SEPARATOR_STR);		// put trailing backslash on for easier path construction
+			}
+		}
+
+#ifndef NDEBUG
+		switch (root.type)
+		{
+		case cfile::ModRootType::Folder:
+			mprintf(("  Found root folder '%s'\n", root.path.c_str()));
+			break;
+		case cfile::ModRootType::Package: {
+			uint chksum = 0;
+			cf_chksum_pack(root.path.c_str(), &chksum);
+			mprintf(("  Found root pack '%s' with a checksum of 0x%08x\n", root.path.c_str(), chksum));
+			break;
+		}
+		default:
+			UNREACHABLE("Unknown root type!");
+			break;
+		}
 #endif
-		// =========================================================================
-	}
-	else if (!Cmdline_portable_mode)
-	{
-		// =========================================================================
-		// now look for mods under the users HOME directory to use before system ones
-		cf_add_mod_roots(Cfile_user_dir, CF_LOCATION_ROOT_USER);
-		// =========================================================================
-
-		// =========================================================================
-		// set users HOME directory as default for loading and saving files
-		root = cf_create_root();
-		strcpy_s(root->path, Cfile_user_dir);
-
-		root->location_flags |= CF_LOCATION_ROOT_USER | CF_LOCATION_TYPE_ROOT;
-		if (Cmdline_mod == nullptr || strlen(Cmdline_mod) <= 0) {
-			// If there are no mods then the root is the primary mod
-			root->location_flags |= CF_LOCATION_TYPE_PRIMARY_MOD;
-		}
-
-		// do we already have a slash? as in the case of a root directory install
-		if ((strlen(root->path) < (CF_MAX_PATHNAME_LENGTH - 1)) && (root->path[strlen(root->path) - 1] != DIR_SEPARATOR_CHAR)) {
-			strcat_s(root->path, DIR_SEPARATOR_STR);		// put trailing backslash on for easier path construction
-		}
-		root->roottype = CF_ROOTTYPE_PATH;
-
-		// Next, check any VP files under the current directory.
-		cf_build_pack_list(root);
-		// =========================================================================
-	}
-
-	char working_directory[CF_MAX_PATHNAME_LENGTH];
-	
-	if ( !_getcwd(working_directory, CF_MAX_PATHNAME_LENGTH ) ) {
-		Error(LOCATION, "Can't get current working directory -- %d", errno );
-	}
-
-	cf_add_mod_roots(working_directory, CF_LOCATION_ROOT_GAME);
-
-	root = cf_create_root();
-
-	root->location_flags |= CF_LOCATION_ROOT_GAME | CF_LOCATION_TYPE_ROOT;
-	if (Cmdline_mod == nullptr || strlen(Cmdline_mod) <= 0) {
-		// If there are no mods then the root is the primary mod
-		root->location_flags |= CF_LOCATION_TYPE_PRIMARY_MOD;
-	}
-
-	strcpy_s(root->path, working_directory);
-
-	size_t path_len = strlen(root->path);
-
-	// do we already have a slash? as in the case of a root directory install
-	if ( (path_len < (CF_MAX_PATHNAME_LENGTH-1)) && (root->path[path_len-1] != DIR_SEPARATOR_CHAR) ) {
-		strcat_s(root->path, DIR_SEPARATOR_STR);		// put trailing backslash on for easier path construction
-	}
-
-	root->roottype = CF_ROOTTYPE_PATH;
-
-   //======================================================
-	// Next, check any VP files under the current directory.
-	cf_build_pack_list(root);
-
-
-   //======================================================
-	// Check the real CD if one...
-	if ( cdrom_dir && (strlen(cdrom_dir) < CF_MAX_PATHNAME_LENGTH) )	{
-		root = cf_create_root();
-		strcpy_s( root->path, cdrom_dir );
-		root->roottype = CF_ROOTTYPE_PATH;
-
-		//======================================================
-		// Next, check any VP files in the CD-ROM directory.
-		cf_build_pack_list(root);
-
 	}

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

 // Given a lower case list of file extensions 
@@ -556,40 +290,17 @@ void cf_search_root_path(int root_index)
 	int i;
 	int num_files = 0;

-	cf_root* root = cf_get_root(root_index);
+	cf_root *root = cf_get_root(root_index);

-	mprintf(("Searching root '%s' ... ", root->path));
-
-#ifndef WIN32
-	try {
-		auto current           = root->path;
-		const auto prefPathEnd = root->path + strlen(root->path);
-		while (current != prefPathEnd) {
-			const auto cp = utf8::next(current, prefPathEnd);
-			if (cp > 127) {
-				// On Windows, we currently do not support Unicode paths so catch this early and let the user
-				// know
-				const auto invalid_end = current;
-				utf8::prior(current, root->path);
-				Error(LOCATION,
-				      "Trying to use path \"%s\" as a data root. That path is not supported since it "
-				      "contains a Unicode character (%s). If possible, change this path to something that only uses "
-				      "ASCII characters.",
-				      root->path, std::string(current, invalid_end).c_str());
-			}
-		}
-	} catch (const std::exception& e) {
-		Error(LOCATION, "UTF-8 error while checking the root path \"%s\": %s", root->path, e.what());
-	}
-#endif
+	mprintf(( "Searching root '%s' ... ", root->path ));

 	char search_path[CF_MAX_PATHNAME_LENGTH];
 #ifdef SCP_UNIX
-	// This map stores the mapping between a specific path type and the actual path that we use for it
+    // This map stores the mapping between a specific path type and the actual path that we use for it
 	SCP_unordered_map<int, SCP_string> pathTypeToRealPath;
 #endif

-	for (i = CF_TYPE_ROOT; i < CF_MAX_PATH_TYPES; i++) {
+	for (i=CF_TYPE_ROOT; i<CF_MAX_PATH_TYPES; i++ )	{

 		// we don't want to add player files to the cache - taylor
 		if ( (i == CF_TYPE_SINGLE_PLAYERS) || (i == CF_TYPE_MULTI_PLAYERS) ) {
@@ -946,7 +657,7 @@ void cf_build_file_list()
 }


-void cf_build_secondary_filelist(const char *cdrom_dir)
+void cf_build_secondary_filelist(const SCP_vector<cfile::ModRoot>& modRoots)
 {
 	int i;

@@ -967,7 +678,7 @@ void cf_build_secondary_filelist(const char *cdrom_dir)
 	mprintf(( "Building file index...\n" ));
 	
 	// build the list of searchable roots
-	cf_build_root_list(cdrom_dir);	
+	cf_build_root_list(modRoots);

 	// build the list of files themselves
 	cf_build_file_list();
@@ -1579,9 +1290,6 @@ static int cf_file_already_in_list( SCP_vector<SCP_string> &list, const char *fi
 // This one has a 'type', which is a CF_TYPE_* value.  Because this specifies the directory
 // location, 'filter' only needs to be the filter itself, with no path information.
 // See above descriptions of cf_get_file_list() for more information about how it all works.
-// Note that filesystem listing is always sorted by name *before* sorting by the
-// provided sort order. This isn't strictly needed on NTFS, which always provides the list
-// sorted by name. But on mac/linux it's always needed.
 int cf_get_file_list(SCP_vector<SCP_string>& list, int pathtype, const char* filter, int sort,
                     SCP_vector<file_list_info>* info, uint32_t location_flags)
 {
@@ -1704,10 +1412,6 @@ int cf_get_file_list(SCP_vector<SCP_string>& list, int pathtype, const char* fil
 	}
 #endif

-	// tcrayford: sort the filesystem listing by name by default to ensure
-	// a stable order across filesystems
-	cf_sort_filenames( list, CF_SORT_NAME, info );
-
 	bool skip_packfiles = false;
 	if ( (pathtype == CF_TYPE_PLAYERS) || (pathtype == CF_TYPE_SINGLE_PLAYERS) || (pathtype == CF_TYPE_MULTI_PLAYERS) ) {
 		skip_packfiles = true;
@@ -1773,6 +1477,7 @@ int cf_get_file_list(SCP_vector<SCP_string>& list, int pathtype, const char* fil
 		}
 	}

+
 	if (sort != CF_SORT_NONE)	{
 		cf_sort_filenames( list, sort, info );
 	}
@@ -15,7 +15,7 @@
 #include "cfile/cfile.h"

 // Builds a list of all the files
-void cf_build_secondary_filelist( const char *cdrom_path );
+void cf_build_secondary_filelist(const SCP_vector<cfile::ModRoot>& modRoots);
 void cf_free_secondary_filelist();

 // Internal stuff
@@ -12,6 +12,7 @@
 #ifndef FS_CMDLINE_HEADER_FILE
 #define FS_CMDLINE_HEADER_FILE

+#include "globalincs/pstypes.h"

 int parse_cmdline(int argc, char *argv[]);

@@ -24,11 +25,11 @@ int parse_cmdline(int argc, char *argv[]);


 // RETAIL OPTIONS ----------------------------------------------
-extern char *Cmdline_connect_addr;
-extern char *Cmdline_game_name;
-extern char *Cmdline_game_password;
-extern char *Cmdline_rank_above;
-extern char *Cmdline_rank_below;
+extern SCP_string Cmdline_connect_addr;
+extern SCP_string Cmdline_game_name;
+extern SCP_string Cmdline_game_password;
+extern SCP_string Cmdline_rank_above;
+extern SCP_string Cmdline_rank_below;
 extern int Cmdline_cd_check;
 extern int Cmdline_client_dodamage;
 extern int Cmdline_closed_game;
@@ -46,14 +47,16 @@ extern int Cmdline_timeout;
 extern int Cmdline_use_last_pilot;
 extern int Cmdline_window;
 extern int Cmdline_fullscreen_window;
-extern char *Cmdline_res;
-extern char *Cmdline_center_res;
+extern SCP_string Cmdline_res;
+extern SCP_string Cmdline_center_res;


 // FSO OPTIONS -------------------------------------------------

 // Graphics related
+extern double specular_exponent_value;
 extern float Cmdline_clip_dist;
+extern float Cmdline_ogl_spec;
 extern float static_light_factor;
 extern float static_point_factor;
 extern float static_tube_factor;
@@ -68,7 +71,7 @@ extern int Cmdline_enable_3d_shockwave;
 extern int Cmdline_softparticles;
 extern int Cmdline_bloom_intensity;
 extern int Cmdline_no_deferred_lighting;
-extern int Cmdline_emissive;
+extern int Cmdline_no_emissive;
 extern int Cmdline_aniso_level;

 // Game Speed related
@@ -94,14 +97,19 @@ extern int Cmdline_stretch_menu;
 extern int Cmdline_voice_recognition;
 extern int Cmdline_no_enhanced_sound;

+namespace cfile {
+struct ModRoot;
+} // namespace cfile
+
 // MOD related
-extern char *Cmdline_mod;	 // DTP for mod support
+extern SCP_vector<cfile::ModRoot> Cmdline_mod;	 // DTP for mod support
 // Multiplayer/Network related
-extern char *Cmdline_almission;	// DTP for autoload mission (for multi only)
+extern SCP_string Cmdline_almission;	// DTP for autoload mission (for multi only)
 extern int Cmdline_ingamejoin;
 extern int Cmdline_mpnoreturn;
+extern SCP_string Cmdline_spew_mission_crcs;
+extern SCP_string Cmdline_spew_table_crcs;
 extern int Cmdline_objupd;
-extern char *Cmdline_gateway_ip;

 // Launcher related options
 extern bool Cmdline_portable_mode;
@@ -116,7 +124,7 @@ extern int Cmdline_mipmap;
 extern int Cmdline_ati_color_swap;
 extern int Cmdline_no_3d_sound;
 extern int Cmdline_drawelements;
-extern char* Cmdline_keyboard_layout;
+extern SCP_string Cmdline_keyboard_layout;
 extern bool Cmdline_gl_finish;
 extern bool Cmdline_no_geo_sdr_effects;
 extern bool Cmdline_set_cpu_affinity;
@@ -127,7 +135,7 @@ extern bool Cmdline_alternate_registry_path;
 #endif

 // Developer/Testing related
-extern char *Cmdline_start_mission;
+extern SCP_string Cmdline_start_mission;
 extern int Cmdline_dis_collisions;
 extern int Cmdline_dis_weapons;
 extern bool Cmdline_output_sexp_info;
@@ -0,0 +1,48 @@
+{
+  "version": 1,
+  "flags": {
+    "-bool_option": false,
+    "-number_option": 5.8,
+    "-string_option": "asdf",
+    "-mod": [
+      {
+        "type": "folder",
+        "path": "/home/fso/mediavps",
+        "user": true,
+        "location_type": "primary_mod"
+      },
+      {
+        "type": "folder",
+        "path": "/home/fso",
+        "user": true,
+        "location_type": "game_root"
+      },
+      {
+        "type": "folder",
+        "path": "/path/to/fso/mediavps",
+        "user": false,
+        "location_type": "primary_mod"
+      },
+      {
+        "type": "package",
+        "path": "/path/to/fso/mediavps/MVPS-Z.vp",
+        "location_type": "primary_mod"
+      },
+      {
+        "type": "package",
+        "path": "/path/to/fso/mediavps/MVPS-X.vp",
+        "location_type": "primary_mod"
+      },
+      {
+        "type": "folder",
+        "path": "/path/to/fso",
+        "location_type": "game_root"
+      },
+      {
+        "type": "package",
+        "path": "/path/to/fso/retail.vp",
+        "location_type": "game_root"
+      }
+    ]
+  }
+}
@@ -516,9 +516,7 @@ void control_config_list_prepare()
 	Num_cc_lines = y = z = 0;
 	while (z < CCFG_MAX) {
 		if (Control_config[z].tab == Tab && !Control_config[z].disabled) {
-			if (Control_config[z].indexXSTR > 1) {
-				Cc_lines[Num_cc_lines].label = XSTR(Control_config[z].text, Control_config[z].indexXSTR);
-			} else if (Control_config[z].indexXSTR == 1) {
+			if (Control_config[z].hasXSTR) {
 				Cc_lines[Num_cc_lines].label = XSTR(Control_config[z].text, CONTROL_CONFIG_XSTR + z);
 			} else {
 				Cc_lines[Num_cc_lines].label = Control_config[z].text;
@@ -1001,7 +999,7 @@ void control_config_reset_defaults(int presetnum)
 		Control_config[i].key_id = preset[i].key_default;
 		Control_config[i].joy_id = preset[i].joy_default;
 		Control_config[i].tab = preset[i].tab;
-		Control_config[i].indexXSTR = preset[i].indexXSTR;
+		Control_config[i].hasXSTR = preset[i].hasXSTR;
 		Control_config[i].type = preset[i].type;
 		Control_config[i].disabled = preset[i].disabled;
 	}
@@ -1984,9 +1982,7 @@ void control_config_do_frame(float frametime)
 		gr_get_string_size(&w, NULL, str);
 		gr_printf_menu(x - w / 2, y - font_height, "%s", str);

-		if (Control_config[i].indexXSTR > 1) {
-			strcpy_s(buf, XSTR(Control_config[i].text, Control_config[i].indexXSTR));
-		} else if (Control_config[i].indexXSTR == 1) {
+		if (Control_config[i].hasXSTR) {
 			strcpy_s(buf, XSTR(Control_config[i].text, CONTROL_CONFIG_XSTR + i));
 		} else {
 			strcpy_s(buf, Control_config[i].text);
@@ -62,7 +62,7 @@ typedef struct config_item {
 	short key_default;		//!< default key bound to action
 	short joy_default;		//!< default joystick button bound to action
 	char tab;				//!< what tab (category) it belongs in
-	int indexXSTR;			//!< what string index we should use to translate this with an XSTR
+	bool hasXSTR;			//!< whether we should translate this with an XSTR
 	const char *text;		//!< describes the action in the config screen
 	char type;				//!< manner control should be checked in
 	short key_id;			//!< actual key bound to action
@@ -270,15 +270,6 @@ enum IoActionId  {
 	//!< ----------------------------
 	CYCLE_PRIMARY_WEAPON_SEQUENCE					=118,	//!< cycle num primaries to fire at once

-	//!< @n
-	//!< Custom control slots
-	//!< ----------------------------
-	CUSTOM_CONTROL_1								= 119,
-	CUSTOM_CONTROL_2								= 120,
-	CUSTOM_CONTROL_3								= 121,
-	CUSTOM_CONTROL_4								= 122,
-	CUSTOM_CONTROL_5								= 123,
-
 	/*!
 	 * This must always be below the last defined item
 	 */
@@ -42,159 +42,154 @@ int Invert_axis_defaults[JOY_NUM_AXES] = { 0, 0, 0, 0, 0, 0 };
 //XSTR:OFF
 config_item Control_config[CCFG_MAX + 1] = {
 	// targeting a ship
-	{                           KEY_T,              -1, TARGET_TAB,   1,  "Target Next Ship",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_T,              -1, TARGET_TAB,   1,  "Target Previous Ship",                   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_H,               2, TARGET_TAB,   1,  "Target Next Closest Hostile Ship",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_H,              -1, TARGET_TAB,   1,  "Target Previous Closest Hostile Ship",   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_H,              -1, TARGET_TAB,   1,  "Toggle Auto Targeting",                  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_F,              -1, TARGET_TAB,   1,  "Target Next Closest Friendly Ship",      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_F,              -1, TARGET_TAB,   1,  "Target Previous Closest Friendly Ship",  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_Y,               4, TARGET_TAB,   1,  "Target Ship in Reticle",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_G,              -1, TARGET_TAB,   1,  "Target Target's Nearest Attacker",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_Y,              -1, TARGET_TAB,   1,  "Target Last Ship to Send Transmission",  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_T,              -1, TARGET_TAB,   1,  "Turn Off Targeting",                     CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_T,              -1, TARGET_TAB,   true,  "Target Next Ship",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_T,              -1, TARGET_TAB,   true,  "Target Previous Ship",                   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_H,               2, TARGET_TAB,   true,  "Target Next Closest Hostile Ship",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_H,              -1, TARGET_TAB,   true,  "Target Previous Closest Hostile Ship",   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_H,              -1, TARGET_TAB,   true,  "Toggle Auto Targeting",                  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_F,              -1, TARGET_TAB,   true,  "Target Next Closest Friendly Ship",      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_F,              -1, TARGET_TAB,   true,  "Target Previous Closest Friendly Ship",  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_Y,               4, TARGET_TAB,   true,  "Target Ship in Reticle",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_G,              -1, TARGET_TAB,   true,  "Target Target's Nearest Attacker",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_Y,              -1, TARGET_TAB,   true,  "Target Last Ship to Send Transmission",  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_T,              -1, TARGET_TAB,   true,  "Turn Off Targeting",                     CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

 	// targeting a ship's subsystem
-	{                           KEY_V,              -1, TARGET_TAB,   1,  "Target Subsystem in Reticle",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_S,              -1, TARGET_TAB,   1,  "Target Next Subsystem",                  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_S,              -1, TARGET_TAB,   1,  "Target Previous Subsystem",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_S,              -1, TARGET_TAB,   1,  "Turn Off Targeting of Subsystems",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_V,              -1, TARGET_TAB,   true,  "Target Subsystem in Reticle",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_S,              -1, TARGET_TAB,   true,  "Target Next Subsystem",                  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_S,              -1, TARGET_TAB,   true,  "Target Previous Subsystem",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_S,              -1, TARGET_TAB,   true,  "Turn Off Targeting of Subsystems",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

 	// matching speed
-	{                           KEY_M,              -1, COMPUTER_TAB, 1,  "Match Target Speed",                     CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_M,              -1, COMPUTER_TAB, 1,  "Toggle Auto Speed Matching",             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_M,              -1, COMPUTER_TAB, true,  "Match Target Speed",                     CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_M,              -1, COMPUTER_TAB, true,  "Toggle Auto Speed Matching",             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

 	// weapons
-	{                           KEY_LCTRL,           0, WEAPON_TAB,   1,  "Fire Primary Weapon",                    CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_SPACEBAR,        1, WEAPON_TAB,   1,  "Fire Secondary Weapon",                  CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PERIOD,         -1, WEAPON_TAB,   1,  "Cycle Forward Primary Weapon",           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_COMMA,          -1, WEAPON_TAB,   1,  "Cycle Backward Primary Weapon",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_DIVIDE,         -1, WEAPON_TAB,   1,  "Cycle Secondary Weapon Bank",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_DIVIDE,         -1, WEAPON_TAB,   1,  "Cycle Secondary Weapon Firing Rate",     CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_X,               3, WEAPON_TAB,   1,  "Launch Countermeasure",                  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_LCTRL,           0, WEAPON_TAB,   true,  "Fire Primary Weapon",                    CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_SPACEBAR,        1, WEAPON_TAB,   true,  "Fire Secondary Weapon",                  CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PERIOD,         -1, WEAPON_TAB,   true,  "Cycle Forward Primary Weapon",           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_COMMA,          -1, WEAPON_TAB,   true,  "Cycle Backward Primary Weapon",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_DIVIDE,         -1, WEAPON_TAB,   true,  "Cycle Secondary Weapon Bank",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_DIVIDE,         -1, WEAPON_TAB,   true,  "Cycle Secondary Weapon Firing Rate",     CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_X,               3, WEAPON_TAB,   true,  "Launch Countermeasure",                  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

 	// controls
-	{                           KEY_A,              -1, SHIP_TAB,     1,  "Forward Thrust",                         CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_Z,              -1, SHIP_TAB,     1,  "Reverse Thrust",                         CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PAD7,           -1, SHIP_TAB,     1,  "Bank Left",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PAD9,           -1, SHIP_TAB,     1,  "Bank Right",                             CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PAD8,           -1, SHIP_TAB,     1,  "Pitch Forward",                          CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PAD2,           -1, SHIP_TAB,     1,  "Pitch Backward",                         CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PAD4,           -1, SHIP_TAB,     1,  "Turn Left",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PAD6,           -1, SHIP_TAB,     1,  "Turn Right",                             CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_A,              -1, SHIP_TAB,     true,  "Forward Thrust",                         CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_Z,              -1, SHIP_TAB,     true,  "Reverse Thrust",                         CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PAD7,           -1, SHIP_TAB,     true,  "Bank Left",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PAD9,           -1, SHIP_TAB,     true,  "Bank Right",                             CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PAD8,           -1, SHIP_TAB,     true,  "Pitch Forward",                          CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PAD2,           -1, SHIP_TAB,     true,  "Pitch Backward",                         CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PAD4,           -1, SHIP_TAB,     true,  "Turn Left",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PAD6,           -1, SHIP_TAB,     true,  "Turn Right",                             CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },

 	// throttle controls
-	{                           KEY_BACKSP,         -1, SHIP_TAB,     1,  "Set Throttle to Zero",                   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_SLASH,          -1, SHIP_TAB,     1,  "Set Throttle to Max",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_LBRACKET,       -1, SHIP_TAB,     1,  "Set Throttle to One-Third",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_RBRACKET,       -1, SHIP_TAB,     1,  "Set Throttle to Two-Thirds",             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_EQUAL,          -1, SHIP_TAB,     1,  "Increase Throttle 5 Percent",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_MINUS,          -1, SHIP_TAB,     1,  "Decrease Throttle 5 Percent",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_BACKSP,         -1, SHIP_TAB,     true,  "Set Throttle to Zero",                   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_SLASH,          -1, SHIP_TAB,     true,  "Set Throttle to Max",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_LBRACKET,       -1, SHIP_TAB,     true,  "Set Throttle to One-Third",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_RBRACKET,       -1, SHIP_TAB,     true,  "Set Throttle to Two-Thirds",             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_EQUAL,          -1, SHIP_TAB,     true,  "Increase Throttle 5 Percent",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_MINUS,          -1, SHIP_TAB,     true,  "Decrease Throttle 5 Percent",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

 	// squadmate messaging
-	{             KEY_SHIFTED | KEY_A,              -1, COMPUTER_TAB, 1,  "Attack My Target",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_Z,              -1, COMPUTER_TAB, 1,  "Disarm My Target",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_D,              -1, COMPUTER_TAB, 1,  "Disable My Target",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_V,              -1, COMPUTER_TAB, 1,  "Attack My Subsystem",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_X,              -1, COMPUTER_TAB, 1,  "Capture My Target",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_E,              -1, COMPUTER_TAB, 1,  "Engage Enemy",                           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_W,              -1, COMPUTER_TAB, 1,  "Form on My Wing",                        CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_I,              -1, COMPUTER_TAB, 1,  "Ignore My Target",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_P,              -1, COMPUTER_TAB, 1,  "Protect My Target",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_C,              -1, COMPUTER_TAB, 1,  "Cover Me",                               CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_J,              -1, COMPUTER_TAB, 1,  "Return to Base",                         CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_R,              -1, COMPUTER_TAB, 1,  "Rearm Me",                               CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_A,              -1, COMPUTER_TAB, true,  "Attack My Target",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_Z,              -1, COMPUTER_TAB, true,  "Disarm My Target",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_D,              -1, COMPUTER_TAB, true,  "Disable My Target",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_V,              -1, COMPUTER_TAB, true,  "Attack My Subsystem",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_X,              -1, COMPUTER_TAB, true,  "Capture My Target",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_E,              -1, COMPUTER_TAB, true,  "Engage Enemy",                           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_W,              -1, COMPUTER_TAB, true,  "Form on My Wing",                        CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_I,              -1, COMPUTER_TAB, true,  "Ignore My Target",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_P,              -1, COMPUTER_TAB, true,  "Protect My Target",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_C,              -1, COMPUTER_TAB, true,  "Cover Me",                               CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_J,              -1, COMPUTER_TAB, true,  "Return to Base",                         CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_R,              -1, COMPUTER_TAB, true,  "Rearm Me",                               CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

-	{                           KEY_R,               6, TARGET_TAB,   1,  "Target Closest Attacking Ship",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_R,               6, TARGET_TAB,   true,  "Target Closest Attacking Ship",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

 	// Views
-	{                           KEY_PADMULTIPLY,    -1, COMPUTER_TAB, 1,  "Chase View",                             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_PADPERIOD,      -1, COMPUTER_TAB, 1,  "External View",                          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_PADENTER,       -1, COMPUTER_TAB, 1,  "Toggle External Camera Lock",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_PAD0,           -1, COMPUTER_TAB, 1,  "Free Look View",                         CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PADDIVIDE,      -1, COMPUTER_TAB, 1,  "Current Target View",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_PADPLUS,        -1, COMPUTER_TAB, 1,  "Increase View Distance",                 CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PADMINUS,       -1, COMPUTER_TAB, 1,  "Decrease View Distance",                 CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           KEY_PAD5,           -1, COMPUTER_TAB, 1,  "Center View",                            CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           -1,                 33, COMPUTER_TAB, 1,  "View Up",                                CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           -1,                 32, COMPUTER_TAB, 1,  "View Rear",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           -1,                 34, COMPUTER_TAB, 1,  "View Left",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           -1,                 35, COMPUTER_TAB, 1,  "View Right",                             CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PADMULTIPLY,    -1, COMPUTER_TAB, true,  "Chase View",                             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_PADPERIOD,      -1, COMPUTER_TAB, true,  "External View",                          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_PADENTER,       -1, COMPUTER_TAB, true,  "Toggle External Camera Lock",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_PAD0,           -1, COMPUTER_TAB, true,  "Free Look View",                         CC_TYPE_CONTINUOUS, -1, -1, 0, false, false }, // Not in use anymore (Swifty)
+	{                           KEY_PADDIVIDE,      -1, COMPUTER_TAB, true,  "Current Target View",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_PADPLUS,        -1, COMPUTER_TAB, true,  "Increase View Distance",                 CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PADMINUS,       -1, COMPUTER_TAB, true,  "Decrease View Distance",                 CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_PAD5,           -1, COMPUTER_TAB, true,  "Center View",                            CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           -1,                 33, COMPUTER_TAB, true,  "View Up",                                CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           -1,                 32, COMPUTER_TAB, true,  "View Rear",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           -1,                 34, COMPUTER_TAB, true,  "View Left",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           -1,                 35, COMPUTER_TAB, true,  "View Right",                             CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },

-	{                           KEY_RAPOSTRO,       -1, COMPUTER_TAB, 1,  "Cycle Radar Range",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_C,              -1, COMPUTER_TAB, 1,  "Communications Menu",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           -1,                 -1, -1,           1,  "Show Objectives",                        CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_J,              -1, COMPUTER_TAB, 1,  "Enter Subspace (End Mission)",           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_J,              -1, TARGET_TAB,   1,  "Target Target's Target",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_TAB,             5, SHIP_TAB,     1,  "Afterburner",                            CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           KEY_RAPOSTRO,       -1, COMPUTER_TAB, true,  "Cycle Radar Range",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_C,              -1, COMPUTER_TAB, true,  "Communications Menu",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           -1,                 -1, -1,           true,  "Show Objectives",                        CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_J,              -1, COMPUTER_TAB, true,  "Enter Subspace (End Mission)",           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_J,              -1, TARGET_TAB,   true,  "Target Target's Target",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_TAB,             5, SHIP_TAB,     true,  "Afterburner",                            CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
 	
-	{                           KEY_INSERT,         -1, COMPUTER_TAB, 1,  "Increase Weapon Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_DELETE,         -1, COMPUTER_TAB, 1,  "Decrease Weapon Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_HOME,           -1, COMPUTER_TAB, 1,  "Increase Shield Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_END,            -1, COMPUTER_TAB, 1,  "Decrease Shield Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_PAGEUP,         -1, COMPUTER_TAB, 1,  "Increase Engine Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_PAGEDOWN,       -1, COMPUTER_TAB, 1,  "Decrease Engine Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_D,              -1, COMPUTER_TAB, 1,  "Equalize Energy Settings",               CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_INSERT,         -1, COMPUTER_TAB, true,  "Increase Weapon Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_DELETE,         -1, COMPUTER_TAB, true,  "Decrease Weapon Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_HOME,           -1, COMPUTER_TAB, true,  "Increase Shield Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_END,            -1, COMPUTER_TAB, true,  "Decrease Shield Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_PAGEUP,         -1, COMPUTER_TAB, true,  "Increase Engine Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_PAGEDOWN,       -1, COMPUTER_TAB, true,  "Decrease Engine Energy",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_D,              -1, COMPUTER_TAB, true,  "Equalize Energy Settings",               CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

-	{                           KEY_Q,               7, COMPUTER_TAB, 1,  "Equalize Shields",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_UP,             -1, COMPUTER_TAB, 1,  "Augment Forward Shield",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_DOWN,           -1, COMPUTER_TAB, 1,  "Augment Rear Shield",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_LEFT,           -1, COMPUTER_TAB, 1,  "Augment Left Shield",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_RIGHT,          -1, COMPUTER_TAB, 1,  "Augment Right Shield",                   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_SCROLLOCK,      -1, COMPUTER_TAB, 1,  "Transfer Energy Laser->Shield",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_SCROLLOCK,      -1, COMPUTER_TAB, 1,  "Transfer Energy Shield->Laser",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_Q,               7, COMPUTER_TAB, true,  "Equalize Shields",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_UP,             -1, COMPUTER_TAB, true,  "Augment Forward Shield",                 CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_DOWN,           -1, COMPUTER_TAB, true,  "Augment Rear Shield",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_LEFT,           -1, COMPUTER_TAB, true,  "Augment Left Shield",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_RIGHT,          -1, COMPUTER_TAB, true,  "Augment Right Shield",                   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_SCROLLOCK,      -1, COMPUTER_TAB, true,  "Transfer Energy Laser->Shield",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_SCROLLOCK,      -1, COMPUTER_TAB, true,  "Transfer Energy Shield->Laser",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
 //	{                           -1,                 -1, -1,           true,  "Show Damage Popup Window" },

-	{                           -1,                 -1, SHIP_TAB,     0, "Glide When Pressed",                     CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           -1,                 -1, SHIP_TAB,     false, "Glide When Pressed",                     CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
 //Backslash -- this was a convenient place for Glide When Pressed, as Show Damage Popup isn't used
-	{                           -1,                 -1, SHIP_TAB,     1,  "Bank When Pressed",                      CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{                           -1,                 -1, -1,           1,  "Show Nav Map",                           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_E,              -1, COMPUTER_TAB, 1,  "Add or Remove Escort",                   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED | KEY_SHIFTED | KEY_E,              -1, COMPUTER_TAB, 1,  "Clear Escort List",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_E,              -1, TARGET_TAB,   1,  "Target Next Escort Ship",                CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_R,              -1, TARGET_TAB,   1,  "Target Closest Repair Ship",             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           -1,                 -1, SHIP_TAB,     true,  "Bank When Pressed",                      CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{                           -1,                 -1, -1,           true,  "Show Nav Map",                           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_E,              -1, COMPUTER_TAB, true,  "Add or Remove Escort",                   CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED | KEY_SHIFTED | KEY_E,              -1, COMPUTER_TAB, true,  "Clear Escort List",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_E,              -1, TARGET_TAB,   true,  "Target Next Escort Ship",                CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_R,              -1, TARGET_TAB,   true,  "Target Closest Repair Ship",             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

-	{                           KEY_U,              -1, TARGET_TAB,   1,  "Target Next Uninspected Cargo",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_U,              -1, TARGET_TAB,   1,  "Target Previous Uninspected Cargo",      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_N,              -1, TARGET_TAB,   1,  "Target Newest Ship in Area",             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_K,              -1, TARGET_TAB,   1,  "Target Next Live Turret",                CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_K,              -1, TARGET_TAB,   1,  "Target Previous Live Turret",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_U,              -1, TARGET_TAB,   true,  "Target Next Uninspected Cargo",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_U,              -1, TARGET_TAB,   true,  "Target Previous Uninspected Cargo",      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_N,              -1, TARGET_TAB,   true,  "Target Newest Ship in Area",             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_K,              -1, TARGET_TAB,   true,  "Target Next Live Turret",                CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_K,              -1, TARGET_TAB,   true,  "Target Previous Live Turret",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

-	{                           KEY_B,              -1, TARGET_TAB,   1,  "Target Next Hostile Bomb or Bomber",     CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_B,              -1, TARGET_TAB,   1,  "Target Previous Hostile Bomb or Bomber", CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_B,              -1, TARGET_TAB,   true,  "Target Next Hostile Bomb or Bomber",     CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_B,              -1, TARGET_TAB,   true,  "Target Previous Hostile Bomb or Bomber", CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

 	// multiplayer messaging keys
-	{                           KEY_1,              -1, COMPUTER_TAB, 1,  "(Multiplayer) Message All",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_2,              -1, COMPUTER_TAB, 1,  "(Multiplayer) Message Friendly",         CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_3,              -1, COMPUTER_TAB, 1,  "(Multiplayer) Message Hostile",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_4,              -1, COMPUTER_TAB, 1,  "(Multiplayer) Message Target",           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_X,              -1, COMPUTER_TAB, 1,  "(Multiplayer) Observer Zoom to Target",  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_PERIOD,         -1, COMPUTER_TAB, 1,  "Increase Time Compression",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_COMMA,          -1, COMPUTER_TAB, 1,  "Decrease Time Compression",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_L,              -1, COMPUTER_TAB, 1,  "Toggle High HUD Contrast",               CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_N,              -1, COMPUTER_TAB, 1,  "(Multiplayer) Toggle Network Info",      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_END,            -1, COMPUTER_TAB, 1,  "(Multiplayer) Self Destruct",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_1,              -1, COMPUTER_TAB, true,  "(Multiplayer) Message All",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_2,              -1, COMPUTER_TAB, true,  "(Multiplayer) Message Friendly",         CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_3,              -1, COMPUTER_TAB, true,  "(Multiplayer) Message Hostile",          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_4,              -1, COMPUTER_TAB, true,  "(Multiplayer) Message Target",           CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_X,              -1, COMPUTER_TAB, true,  "(Multiplayer) Observer Zoom to Target",  CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_PERIOD,         -1, COMPUTER_TAB, true,  "Increase Time Compression",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_COMMA,          -1, COMPUTER_TAB, true,  "Decrease Time Compression",              CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_L,              -1, COMPUTER_TAB, true,  "Toggle High HUD Contrast",               CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_N,              -1, COMPUTER_TAB, true,  "(Multiplayer) Toggle Network Info",      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_END,            -1, COMPUTER_TAB, true,  "(Multiplayer) Self Destruct",            CC_TYPE_TRIGGER,    -1, -1, 0, false, false },

 	// Misc
-	{             KEY_SHIFTED | KEY_O,              -1, COMPUTER_TAB, 1,  "Toggle HUD",                             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_3,              -1, SHIP_TAB,     1,  "Right Thrust",                           CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_1,              -1, SHIP_TAB,     1,  "Left Thrust",                            CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_PADPLUS,        -1, SHIP_TAB,     1,  "Up Thrust",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{             KEY_SHIFTED | KEY_PADENTER,       -1, SHIP_TAB,     1,  "Down Thrust",                            CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
-	{ KEY_ALTED | KEY_SHIFTED | KEY_Q,              -1, COMPUTER_TAB, 1,  "Toggle HUD Wireframe Target View",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           -1,                 -1, COMPUTER_TAB, 0, "Top-Down View",                          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           -1,                 -1, COMPUTER_TAB, 0, "Target Padlock View",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false }, // (Swifty) Toggle for VM_TRACK
+	{             KEY_SHIFTED | KEY_O,              -1, COMPUTER_TAB, true,  "Toggle HUD",                             CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_3,              -1, SHIP_TAB,     true,  "Right Thrust",                           CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_1,              -1, SHIP_TAB,     true,  "Left Thrust",                            CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_PADPLUS,        -1, SHIP_TAB,     true,  "Up Thrust",                              CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{             KEY_SHIFTED | KEY_PADENTER,       -1, SHIP_TAB,     true,  "Down Thrust",                            CC_TYPE_CONTINUOUS, -1, -1, 0, false, false },
+	{ KEY_ALTED | KEY_SHIFTED | KEY_Q,              -1, COMPUTER_TAB, true,  "Toggle HUD Wireframe Target View",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           -1,                 -1, COMPUTER_TAB, false, "Top-Down View",                          CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           -1,                 -1, COMPUTER_TAB, false, "Target Padlock View",                    CC_TYPE_TRIGGER,    -1, -1, 0, false, false }, // (Swifty) Toggle for VM_TRACK
 	// Auto Navigation Systen
-	{ KEY_ALTED |               KEY_A,              -1, COMPUTER_TAB, 0, "Toggle Auto Pilot",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_N,              -1, COMPUTER_TAB, 0, "Cycle Nav Points",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED |               KEY_G,              -1, SHIP_TAB,     0, "Toggle Gliding",                         CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{                           KEY_O,              -1, WEAPON_TAB,   0, "Cycle Primary Weapon Firing Rate",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
-	{ KEY_ALTED | KEY_SHIFTED | KEY_1,              -1, COMPUTER_TAB, 0, "Custom Control 1",                       CC_TYPE_TRIGGER,    -1, -1, 0, true,  false },
-	{ KEY_ALTED | KEY_SHIFTED | KEY_2,              -1, COMPUTER_TAB, 0, "Custom Control 2",                       CC_TYPE_TRIGGER,    -1, -1, 0, true,  false },
-	{ KEY_ALTED | KEY_SHIFTED | KEY_3,              -1, COMPUTER_TAB, 0, "Custom Control 3",                       CC_TYPE_TRIGGER,    -1, -1, 0, true,  false },
-	{ KEY_ALTED | KEY_SHIFTED | KEY_4,              -1, COMPUTER_TAB, 0, "Custom Control 4",                       CC_TYPE_TRIGGER,    -1, -1, 0, true,  false },
-	{ KEY_ALTED | KEY_SHIFTED | KEY_5,              -1, COMPUTER_TAB, 0, "Custom Control 5",                       CC_TYPE_TRIGGER,    -1, -1, 0, true,  false },
-	{                           -1,                 -1, -1,           0, "",                                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false }
+	{ KEY_ALTED |               KEY_A,              -1, COMPUTER_TAB, false, "Toggle Auto Pilot",                      CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_N,              -1, COMPUTER_TAB, false, "Cycle Nav Points",                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{ KEY_ALTED |               KEY_G,              -1, SHIP_TAB,     false, "Toggle Gliding",                         CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           KEY_O,              -1, WEAPON_TAB,   false, "Cycle Primary Weapon Firing Rate",       CC_TYPE_TRIGGER,    -1, -1, 0, false, false },
+	{                           -1,                 -1, -1,           false, "",                                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false }
 };

 const char *Scan_code_text_german[] = {
@@ -591,6 +586,7 @@ void control_config_common_load_overrides();
 void control_config_common_init()
 {
 	for (int i=0; i<CCFG_MAX; i++) {
+		Control_config[i].disabled = false;
 		Control_config[i].continuous_ongoing = false;
 	}

@@ -847,7 +843,7 @@ void control_config_common_load_overrides()
                        * short key_default;
                        * short joy_default;
                        * char tab;
-                        * int indexXSTR;
+                        * bool hasXSTR;
                        * char type;
                        */

@@ -889,7 +885,7 @@ void control_config_common_load_overrides()

 						if (optional_string("$Has XStr:")) {
 							stuff_int(&iTemp);
-							r_ccConfig.indexXSTR = iTemp;
+							r_ccConfig.hasXSTR = (iTemp == 1);
 						}

 						if (optional_string("$Type:")) {
@@ -83,33 +83,24 @@ void cutscene_init()

 			if (optional_string("$cd:"))
 			{
-				// CD option isn't needed anymore. Consume the token and ignore it
+				// Option isn't needed anymore. Consume the token and ignore it
+
 				int junk;
 				stuff_int(&junk);
 			}

-			cutinfo.flags.reset();
+			cutinfo.viewable = false;

 			if (isFirstCutscene)
 			{
 				isFirstCutscene = false;
-				// The original code assumes the first movie is the intro, so make it viewable
-				cutinfo.flags.set(Cutscene::Cutscene_Flags::Viewable);
+				// The original code assumes the first movie is the intro, so always viewable
+				cutinfo.viewable = true;
 			}

 			if (optional_string("$Always Viewable:"))
 			{
-				bool flag;
-				stuff_boolean(&flag);
-				if (flag)
-					cutinfo.flags.set(Cutscene::Cutscene_Flags::Always_viewable);
-			}
-			if (optional_string("$Never Viewable:"))
-			{
-				bool flag;
-				stuff_boolean(&flag);
-				if (flag)
-					cutinfo.flags.set(Cutscene::Cutscene_Flags::Never_viewable);
+				stuff_boolean(&cutinfo.viewable);
 			}

 			Cutscenes.push_back(cutinfo);
@@ -152,7 +143,7 @@ void cutscene_mark_viewable(const char* filename)
 		// see if the stripped filename matches the cutscene filename
 		if (strstr(cut_file, file) != NULL)
 		{
-			cut->flags.set(Cutscene::Cutscene_Flags::Viewable);
+			cut->viewable = true;
 			return;
 		}
 		i++;
@@ -450,9 +441,9 @@ void cutscenes_screen_init()
 	Cutscene_list.clear();

 	int u = 0;
-	for (auto cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut, ++u)
+	for (SCP_vector<cutscene_info>::iterator cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut, u++)
 	{
-		if (cut->flags[Cutscene::Cutscene_Flags::Viewable, Cutscene::Cutscene_Flags::Always_viewable] && !cut->flags[Cutscene::Cutscene_Flags::Never_viewable])
+		if ((*cut).viewable)
 		{
 			Cutscene_list.push_back(u);
 		}
@@ -10,28 +10,15 @@
 #ifndef _FREESPACE_CUTSCENES_SCREEN_HEADER_FILE
 #define _FREESPACE_CUTSCENES_SCREEN_HEADER_FILE

-#include "globalincs/flagset.h"
 #include "globalincs/globals.h"
 #include "globalincs/pstypes.h"

-namespace Cutscene
-{
-	FLAG_LIST(Cutscene_Flags)
-	{
-		Viewable = 0,
-		Always_viewable,
-		Never_viewable,
-
-		NUM_VALUES
-	};
-}
-
 typedef struct cutscene_info
 {
 	char filename[MAX_FILENAME_LEN];
 	char name[NAME_LENGTH];
 	char* description;
-	flagset<Cutscene::Cutscene_Flags> flags;
+	bool viewable;
 } cutscene_info;

 extern SCP_vector<cutscene_info> Cutscenes;
@@ -24,6 +24,7 @@ layout (std140) uniform globalDeferredData {
 	float middist;
 	float fardist;

+	float specFactor;
 	float invScreenWidth;
 	float invScreenHeight;
 };
@@ -20,7 +20,7 @@ void main()
 	// If the scene is in fog then we change the color we operate on based on the depth of the pixel
 	float depth_val = texture(depth_tex, fragTexCoord.xy).x;
 	// Transform depth value from [-1, 1] to [0, 1]
-	float depth_normalized = fma(depth_val, 0.5, 0.5);
+	float depth_normalized = 2.0 * depth_val - 1.0;
 	// Now we compute the depth value in projection space using the clipping plane information
 	float view_depth = 2.0 * zNear * zFar / (zFar + zNear - depth_normalized * (zFar - zNear));

@@ -8,7 +8,7 @@ const float SPEC_INTENSITY_POINT		= 5.3 ;// Point light
 const float SPEC_INTENSITY_DIRECTIONAL	= 3.0 ;// Directional light
 const float SPECULAR_FACTOR				= 1.75;
 const float SPECULAR_ALPHA				= 0.1;
-const float SPEC_FACTOR_NO_SPEC_MAP		= 0.1;
+const float SPEC_FACTOR_NO_SPEC_MAP		= 0.6;
 const float ENV_ALPHA_FACTOR			= 0.3;
 const float GLOW_MAP_INTENSITY			= 1.5;
 const float AMBIENT_LIGHT_BOOST			= 1.0;
@@ -55,4 +55,4 @@ vec3 computeLighting(vec3 specColor, vec3 light, vec3 normal, vec3 halfVec, vec3
 	#else
 	return SpecularGGX(specColor, light, normal, halfVec, view, gloss, fresnelFactor, dotNL);
 	#endif
-}
+}
@@ -1,23 +0,0 @@
-
-uniform vec2 smaa_rt_metrics;
-
-#define SMAA_RT_METRICS vec4(1.0 / smaa_rt_metrics, smaa_rt_metrics)
-
-#define SMAA_INCLUDE_VS 0
-#define SMAA_INCLUDE_PS 1
-
-#include "SMAA.sdr"
-
-in vec2 fragTexCoord;
-in vec2 fragPixcoord;
-in vec4 fragOffset[3];
-
-out vec4 fragOut0;
-
-uniform sampler2D edgesTex;
-uniform sampler2D areaTex;
-uniform sampler2D searchTex;
-
-void main() {
-	fragOut0 = SMAABlendingWeightCalculationPS(fragTexCoord, fragPixcoord, fragOffset, edgesTex, areaTex, searchTex, vec4(0.0));
-}
@@ -1,22 +0,0 @@
-
-uniform vec2 smaa_rt_metrics;
-
-#define SMAA_RT_METRICS vec4(1.0 / smaa_rt_metrics, smaa_rt_metrics)
-
-#define SMAA_INCLUDE_VS 1
-#define SMAA_INCLUDE_PS 0
-
-#include "SMAA.sdr"
-
-in vec4 vertPosition;
-in vec2 vertTexCoord;
-
-out vec2 fragTexCoord;
-out vec2 fragPixcoord;
-out vec4 fragOffset[3];
-
-void main() {
-	gl_Position = vertPosition;
-	fragTexCoord = vertTexCoord;
-	SMAABlendingWeightCalculationVS(vertTexCoord, fragPixcoord, fragOffset);
-}
@@ -1,20 +0,0 @@
-
-uniform vec2 smaa_rt_metrics;
-
-#define SMAA_RT_METRICS vec4(1.0 / smaa_rt_metrics, smaa_rt_metrics)
-
-#define SMAA_INCLUDE_VS 0
-#define SMAA_INCLUDE_PS 1
-
-#include "SMAA.sdr"
-
-in vec2 fragTexCoord;
-in vec4 fragOffset[3];
-
-out vec4 fragOut0;
-
-uniform sampler2D colorTex;
-
-void main() {
-	fragOut0 = vec4(SMAALumaEdgeDetectionPS(fragTexCoord, fragOffset, colorTex), 0.0, 1.0);
-}
@@ -1,21 +0,0 @@
-
-uniform vec2 smaa_rt_metrics;
-
-#define SMAA_RT_METRICS vec4(1.0 / smaa_rt_metrics, smaa_rt_metrics)
-
-#define SMAA_INCLUDE_VS 1
-#define SMAA_INCLUDE_PS 0
-
-#include "SMAA.sdr"
-
-in vec4 vertPosition;
-in vec2 vertTexCoord;
-
-out vec2 fragTexCoord;
-out vec4 fragOffset[3];
-
-void main() {
-	gl_Position = vertPosition;
-	fragTexCoord = vertTexCoord;
-	SMAAEdgeDetectionVS(vertTexCoord, fragOffset);
-}
@@ -1,21 +0,0 @@
-
-uniform vec2 smaa_rt_metrics;
-
-#define SMAA_RT_METRICS vec4(1.0 / smaa_rt_metrics, smaa_rt_metrics)
-
-#define SMAA_INCLUDE_VS 0
-#define SMAA_INCLUDE_PS 1
-
-#include "SMAA.sdr"
-
-in vec2 fragTexCoord;
-in vec4 fragOffset;
-
-out vec4 fragOut0;
-
-uniform sampler2D colorTex;
-uniform sampler2D blendTex;
-
-void main() {
-	fragOut0 = SMAANeighborhoodBlendingPS(fragTexCoord, fragOffset, colorTex, blendTex);
-}
@@ -1,21 +0,0 @@
-
-uniform vec2 smaa_rt_metrics;
-
-#define SMAA_RT_METRICS vec4(1.0 / smaa_rt_metrics, smaa_rt_metrics)
-
-#define SMAA_INCLUDE_VS 1
-#define SMAA_INCLUDE_PS 0
-
-#include "SMAA.sdr"
-
-in vec4 vertPosition;
-in vec2 vertTexCoord;
-
-out vec2 fragTexCoord;
-out vec4 fragOffset;
-
-void main() {
-	gl_Position = vertPosition;
-	fragTexCoord = vertTexCoord;
-	SMAANeighborhoodBlendingVS(vertTexCoord, fragOffset);
-}
@@ -49,9 +49,11 @@ void warpin_queue_render(model_draw_list *scene, object *obj, matrix *orient, ve

 	vm_vec_scale_add( &center, pos, &orient->vec.fvec, -(max_radius/2.5f)/3.0f );

-	// Cyborg17, Initialize the *whole* struct, set some starting values and share with the rest of the array.
-	verts[0] = {};
-	verts[0].r = verts[0].g = verts[0].b = verts[0].a = 255;
+	verts[0].r = 255;
+	verts[0].g = 255;
+	verts[0].b = 255;
+	verts[0].a = 255;
+
 	verts[1] = verts[2] = verts[3] = verts[4] = verts[0];

 	if (warp_glow_bitmap >= 0) {
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) Volition, Inc. 1999.  All rights reserved.
+ *
+ * All source code herein is the property of Volition, Inc. You may not sell 
+ * or otherwise commercially exploit the source or things you created based on the 
+ * source.
+ *
+*/
+
+
+
+#ifndef _FS2NETD_CLIENT_H
+#define _FS2NETD_CLIENT_H
+
+#include "network/multi.h"
+
+struct net_addr;
+class player;
+
+// channel to associate when creating a server
+extern char Multi_fs_tracker_channel[];
+
+// channel to use when polling the tracker for games
+extern char Multi_fs_tracker_filter[];
+
+typedef struct tracker_game_data {
+	char name[MAX_GAMENAME_LEN+1];
+	char mission_name[MAX_GAMENAME_LEN+1];
+	char title[NAME_LENGTH+1];
+	char campaign_name[NAME_LENGTH+1];
+	char chat_channel[MAX_PATH+1];
+
+	ubyte campaign_mode;
+	int flags;
+	int type_flags;
+	short players;
+	short max_players;
+	ubyte mode;
+	ubyte rank_base;
+	ubyte game_state;
+	ubyte speed;
+} tracker_game_data;
+
+extern tracker_game_data Multi_tracker_game_data;
+
+
+bool fs2netd_is_online();
+
+void fs2netd_reset_connection();
+void fs2netd_disconnect();
+
+void fs2netd_close();
+
+bool fs2netd_login();
+
+void fs2netd_maybe_init();
+
+void fs2netd_do_frame();
+
+void fs2netd_gameserver_start();
+void fs2netd_gameserver_update(bool force = false);
+void fs2netd_gameserver_disconnect();
+
+void fs2netd_send_game_request();
+
+void fs2netd_store_stats();
+
+bool fs2netd_player_banned(net_addr *addr);
+
+void fs2netd_update_ban_list();
+
+bool fs2netd_get_valid_missions();
+
+int fs2netd_update_valid_tables();
+
+int fs2netd_get_pilot_info(const char *callsign, player *out_plr, bool first_call);
+
+void fs2netd_options_config_init();
+
+void fs2netd_add_table_validation(const char *tblname);
+
+void fs2netd_update_game_count(const char *chan_name);
+
+#endif // _FS2NETD_CLIENT_H
@@ -0,0 +1,89 @@
+// Protocol.h
+// Protocol Definitions for FS2Open PXO
+// Derek Meek
+// 2-14-2003
+
+// ############## ATTENTION ##########
+// Licensed under the Academic Free License version 2.0
+// View License at http://www.opensource.org/licenses/afl-2.0.php
+// ###################################
+
+
+
+#if !defined(__pxo_protocol_h_)
+#define __pxo_protocol_h_
+
+
+#include "globalincs/globals.h"
+#include "globalincs/pstypes.h"
+
+
+#define PXO_PROTO_VER "2.0"
+
+
+// Packet IDs
+#define PCKT_ID_FIRST				0x00
+
+#define PCKT_SLIST_REQUEST			0x01
+#define PCKT_SLIST_REPLY			0x02
+#define PCKT_SLIST_HB				0x03
+#define PCKT_LOGIN_AUTH				0x04
+#define PCKT_LOGIN_REPLY			0x05
+#define PCKT_MISSIONS_RQST			0x06
+#define PCKT_MISSIONS_REPLY			0x07
+#define PCKT_TABLES_RQST			0x08
+#define PCKT_TABLES_REPLY			0x09
+#define PCKT_PILOT_GET				0x0a
+#define PCKT_PILOT_REPLY			0x0b
+#define PCKT_PILOT_UPDATE			0x0c
+#define PCKT_PILOT_UREPLY			0x0d
+#define PCKT_PING					0x0e
+#define PCKT_PONG					0x0f
+
+#define PCKT_MISSION_CHECK			0x10
+#define PCKT_MCHECK_REPLY			0x11
+#define PCKT_BANLIST_RQST			0x12
+#define PCKT_BANLIST_RPLY			0x13
+#define PCKT_NETOWRK_WALL			0x14
+#define PCKT_VALID_SID_RQST			0x15
+#define PCKT_VALID_SID_REPLY		0x16
+#define PCKT_CHAT_CHANNEL_UPD		0x17
+#define PCKT_CHAT_CHAN_COUNT_RQST	0x18
+#define PCKT_CHAT_CHAN_COUNT_REPLY	0x19
+#define PCKT_SLIST_HB_2				0x1a
+#define PCKT_SERVER_DISCONNECT		0x1b
+#define PCKT_DUP_LOGIN_RQST			0x1c
+#define PCKT_DUP_LOGIN_REPLY		0x1d
+#define PCKT_SLIST_REQUEST_FILTER	0x1e
+#define PCKT_SERVER_START			0x1f
+
+#define PCKT_SERVER_UPDATE			0x20
+
+#define PCKT_ID_LAST				0x21
+
+#define PCKT_INVALID				0xff
+
+#define VALID_PACKET_ID(p)			(((p) > PCKT_ID_FIRST) && ((p) < PCKT_ID_LAST))
+
+
+
+struct crc_valid_status {
+	char name[NAME_LENGTH];
+	uint crc32;
+	ubyte valid;
+};
+
+struct file_record
+{
+	char name[33];
+	uint crc32;
+};
+
+struct fs2open_ship_typekill
+{
+	char name[NAME_LENGTH];
+	ushort kills;
+};
+
+
+#endif
@@ -0,0 +1,848 @@
+// TCP_Client.cpp
+// TCP Client Functions for FS2Open PXO
+// Derek Meek
+// 2-14-2003
+
+// ############## ATTENTION ##########
+// Licensed under the Academic Free License version 2.0
+// View License at http://www.opensource.org/licenses/afl-2.0.php
+// ###################################
+
+
+
+
+
+
+#include "fs2netd/fs2netd_client.h"
+#include "fs2netd/protocol.h"
+#include "fs2netd/tcp_client.h"
+#include "fs2netd/tcp_socket.h"
+#include "globalincs/pstypes.h"
+#include "io/timer.h"
+#include "network/multi.h"
+#include "network/multi_log.h"
+#include "network/multiutil.h"
+#include "playerman/player.h"
+#include "ship/ship.h"
+#include "io/timer.h"
+#include "globalincs/pstypes.h"
+#include "osapi/osapi.h"
+
+#include <iostream>
+#include <string>
+#include <climits>
+
+
+extern SCP_vector<crc_valid_status> Table_valid_status;
+ 
+
+int FS2NetD_CheckSingleMission(const char *m_name, uint crc32, bool do_send)
+{
+	int buffer_size, buffer_offset;
+	bool my_packet = false;
+	char buffer[100];
+
+	if (do_send) {
+		INIT_PACKET( PCKT_MISSION_CHECK );
+
+		PXO_ADD_STRING( m_name );
+		PXO_ADD_UINT( crc32 );
+
+		DONE_PACKET();
+
+		if ( FS2NetD_SendData(buffer, buffer_size) == -1 ) {
+			return 3;
+		}
+	} else if ( FS2NetD_DataReady() ) {
+		int rc;
+		uint rc_total = 0;
+
+		do {
+			rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer)-rc_total);
+
+			if (rc <= 0) {
+				break;
+			}
+
+			rc_total += rc;
+
+			os_sleep(20);
+		} while ( FS2NetD_DataReady() && (rc_total < (int)sizeof(buffer)) );
+
+		if (rc < BASE_PACKET_SIZE) {
+			return 0;
+		}
+
+		VRFY_PACKET2( PCKT_MCHECK_REPLY );
+
+		if ( !my_packet ) {
+			return 0;
+		}
+
+		ubyte status = 0;
+		PXO_GET_DATA( status );
+		Assert( (status == 0) || (status == 1) );
+
+		// anything beyond 'true' is considered a failure of some kind
+		if (status > 1) {
+			status = 0;
+		}
+
+		return status+1;
+	}
+
+	return 0;
+}
+
+int FS2NetD_SendPlayerData(const char *player_name, player *pl, bool do_send)
+{
+	int buffer_size, buffer_offset;
+	bool my_packet = false;
+	char buffer[16384];
+
+	if (do_send) {
+		int i, num_type_kills = 0;
+
+		// send packet...  (fs2open_pilot_update)
+		INIT_PACKET( PCKT_PILOT_UPDATE );
+
+		PXO_ADD_INT( Multi_tracker_id );
+
+		PXO_ADD_STRING( player_name );				// name
+		PXO_ADD_STRING( Multi_tracker_login );		// user
+
+		PXO_ADD_INT( pl->stats.score );				// points
+		PXO_ADD_UINT( pl->stats.missions_flown );	// missions
+		PXO_ADD_UINT( pl->stats.flight_time );		// flighttime
+		PXO_ADD_INT( pl->stats.last_flown );		// LastFlight
+		PXO_ADD_INT( pl->stats.kill_count );		// Kills
+		PXO_ADD_INT( pl->stats.kill_count_ok );		// NonFriendlyKills
+		PXO_ADD_INT( pl->stats.assists );			// Assists
+		PXO_ADD_UINT( pl->stats.p_shots_fired );	// PriShots
+		PXO_ADD_UINT( pl->stats.p_shots_hit );		// PriHits
+		PXO_ADD_UINT( pl->stats.p_bonehead_hits );	// PriFHits
+		PXO_ADD_UINT( pl->stats.s_shots_fired );	// SecShots
+		PXO_ADD_UINT( pl->stats.s_shots_hit );		// SecHits
+		PXO_ADD_UINT( pl->stats.s_bonehead_hits );	// SecFHits
+		PXO_ADD_INT( pl->stats.rank );				// rank
+
+		for (i = 0; i < MAX_SHIP_CLASSES; i++) {
+			if (pl->stats.kills[i] > 0) {
+				Assert( (pl->stats.kills[i] >= 0) && (pl->stats.kills[i] < USHRT_MAX) );
+				num_type_kills++;
+			}
+		}
+
+		Assert( (num_type_kills >= 0) && (num_type_kills < USHRT_MAX) );
+		PXO_ADD_USHORT( (ushort)num_type_kills );
+
+		for (i = 0; i < MAX_SHIP_CLASSES; i++) {
+			if (pl->stats.kills[i] > 0) {
+				PXO_ADD_STRING( Ship_info[i].name );
+				PXO_ADD_USHORT( (ushort)pl->stats.kills[i] );
+			}
+		}
+
+		Assert( (Num_medals >= 0) && (Num_medals < USHRT_MAX) );
+		PXO_ADD_USHORT( (ushort)Num_medals );
+
+		for (i = 0; i < Num_medals; i++) {
+			PXO_ADD_INT( pl->stats.medal_counts[i] );
+		}
+
+		DONE_PACKET();
+
+		if ( FS2NetD_SendData(buffer, buffer_size) == -1 ) {
+			return -1;
+		}
+	} else if ( FS2NetD_DataReady() ) {
+		int rc;
+		uint rc_total = 0;
+
+		do {
+			rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer)-rc_total);
+
+			if (rc <= 0) {
+				break;
+			}
+
+			rc_total += rc;
+
+			os_sleep(20);
+		} while ( FS2NetD_DataReady() && (rc_total < (int)sizeof(buffer)) );
+
+		if (rc < BASE_PACKET_SIZE) {
+			return -1;
+		}
+
+		VRFY_PACKET2( PCKT_PILOT_UREPLY );
+
+		if ( !my_packet ) {
+			return -1;
+		}
+
+		ubyte status;
+		PXO_GET_DATA( status );
+		Assert( (status == 0) || (status == 1) || (status == 2) );
+
+		if (status > 2) {
+			status = 2;
+		}
+
+		return (int)status;
+	}
+
+	return -1;
+}
+
+int FS2NetD_GetPlayerData(const char *player_name, player *pl, bool can_create, bool do_send)
+{
+	int buffer_size, buffer_offset;
+	bool my_packet = false;
+	char buffer[16384];
+
+	if (do_send) {
+		ubyte create = (ubyte)can_create;
+
+		INIT_PACKET( PCKT_PILOT_GET );
+
+		PXO_ADD_INT( (can_create) ? Multi_tracker_id : -2 );
+		PXO_ADD_STRING( player_name );
+		PXO_ADD_DATA( create );
+
+		DONE_PACKET();
+
+		if ( FS2NetD_SendData(buffer, buffer_size) == -1 ) {
+			return -1;
+		}
+	} else if ( FS2NetD_DataReady() ) {
+		const fix end_time = timer_get_fixed_seconds() + (15 * F1_0);
+		int rc;
+		uint rc_total = 0;
+		ubyte reply_type = 0;
+		int si_index = 0;
+		ushort bogus __UNUSED;
+		ushort num_type_kills = 0, num_medals = 0;
+		char ship_name[NAME_LENGTH];
+		int idx;
+
+		do {
+			rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer)-rc_total);
+
+			if (rc <= 0) {
+				break;
+			}
+
+			rc_total += rc;
+
+			os_sleep(20);
+		} while ( FS2NetD_DataReady() && (rc_total < (int)sizeof(buffer)) );
+
+		if (rc < BASE_PACKET_SIZE) {
+			return -1;
+		}
+
+		VRFY_PACKET2( PCKT_PILOT_REPLY );
+
+		if ( !my_packet ) {
+			return -1;
+		}
+
+		if ( buffer_size > (int)sizeof(buffer) ) {
+			ml_printf("FS2NetD WARNING: Pilot update data is larger than receive buffer!  Some data will be lost!");
+		}
+
+		// make sure that we get the entire packet
+		while ( (rc_total < (uint)buffer_size) && (rc_total < sizeof(buffer)) && (timer_get_fixed_seconds() <= end_time) ) {
+			if ( FS2NetD_DataReady() ) {
+				rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer) - rc_total);
+
+				if (rc <= 0) {
+					continue;
+				}
+
+				rc_total += rc;
+			}
+
+			os_sleep(20);
+		}
+
+		PXO_GET_DATA( reply_type );
+
+		// if we weren't retrieved then bail out now
+		if (reply_type != 0) {
+			return (int)reply_type;
+		}
+
+		PXO_GET_INT( pl->stats.score );				// points
+		PXO_GET_UINT( pl->stats.missions_flown );	// missions
+		PXO_GET_UINT( pl->stats.flight_time );		// flighttime
+		PXO_GET_INT( pl->stats.last_flown );		// LastFlight
+		PXO_GET_INT( pl->stats.kill_count );		// Kills
+		PXO_GET_INT( pl->stats.kill_count_ok  );	// NonFriendlyKills
+		PXO_GET_INT( pl->stats.assists );			// Assists
+		PXO_GET_UINT( pl->stats.p_shots_fired );	// PriShots
+		PXO_GET_UINT( pl->stats.p_shots_hit );		// PriHits
+		PXO_GET_UINT( pl->stats.p_bonehead_hits );	// PriFHits
+		PXO_GET_UINT( pl->stats.s_shots_fired );	// SecShots
+		PXO_GET_UINT( pl->stats.s_shots_hit );		// SecHits
+		PXO_GET_UINT( pl->stats.s_bonehead_hits );	// SecFHits
+		PXO_GET_INT( pl->stats.rank );				// rank
+
+		PXO_GET_USHORT( num_type_kills );
+
+		for (idx = 0; idx < (int)num_type_kills; idx++) {
+			memset( ship_name, 0, sizeof(ship_name) );
+
+			PXO_GET_STRING( ship_name );
+
+			si_index = ship_info_lookup( ship_name );
+
+			if (si_index == -1) {
+				PXO_GET_USHORT( bogus );
+			} else {
+				PXO_GET_USHORT( pl->stats.kills[si_index] );
+			}
+		}
+
+		PXO_GET_USHORT( num_medals );
+
+		for (idx = 0; (idx < Num_medals) && (idx < num_medals); idx++) {
+			PXO_GET_INT( pl->stats.medal_counts[idx] );
+		}
+
+		return (int)reply_type;
+	}
+
+	return -1;
+}
+
+int FS2NetD_GetBanList(SCP_vector<SCP_string> &mask_list, bool do_send)
+{
+	int buffer_size, buffer_offset;
+	bool my_packet = false;
+	char buffer[16384];
+
+	if (do_send) {
+		INIT_PACKET( PCKT_BANLIST_RQST );
+		DONE_PACKET();
+
+		if ( FS2NetD_SendData(buffer, buffer_size) == -1 ) {
+			return -1;
+		}
+	} else if ( FS2NetD_DataReady() ) {
+		const fix end_time = timer_get_fixed_seconds() + (15 * F1_0);
+		int rc;
+		uint rc_total = 0;
+		int num_files = 0;
+		char ip_mask[32];
+		int idx;
+
+		do {
+			rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer)-rc_total);
+
+			if (rc <= 0) {
+				break;
+			}
+
+			rc_total += rc;
+
+			os_sleep(20);
+		} while ( FS2NetD_DataReady() && (rc_total < (int)sizeof(buffer)) );
+
+		if (rc < BASE_PACKET_SIZE) {
+			return -1;
+		}
+
+		VRFY_PACKET2( PCKT_BANLIST_RPLY );
+
+		if ( !my_packet ) {
+			return 0;
+		}
+
+		if ( buffer_size > (int)sizeof(buffer) ) {
+			ml_printf("FS2NetD WARNING: Banned user list data is larger than receive buffer!  Some data will be lost!");
+		}
+
+		// make sure that we get the entire packet
+		while ( (rc_total < (uint)buffer_size) && (rc_total < sizeof(buffer)) && (timer_get_fixed_seconds() <= end_time) ) {
+			if ( FS2NetD_DataReady() ) {
+				rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer) - rc_total);
+
+				if (rc <= 0) {
+					continue;
+				}
+
+				rc_total += rc;
+			}
+
+			os_sleep(20);
+		}
+
+		PXO_GET_INT( num_files );
+
+		for (idx = 0; idx < num_files; idx++) {
+			PXO_GET_STRING( ip_mask );
+			mask_list.push_back( ip_mask );
+		}
+	
+		return 1;
+	}
+
+	return 0;
+}
+
+int FS2NetD_GetMissionsList(SCP_vector<file_record> &m_list, bool do_send)
+{
+	int buffer_size, buffer_offset;
+	bool my_packet = false;
+	char buffer[16384];
+
+	if (do_send) {
+		INIT_PACKET( PCKT_MISSIONS_RQST );
+		DONE_PACKET();
+
+		if ( FS2NetD_SendData(buffer, buffer_size) == -1 ) {
+			return -1;
+		}
+	} else if ( FS2NetD_DataReady() ) {
+		const fix end_time = timer_get_fixed_seconds() + (15 * F1_0);
+		int rc;
+		uint rc_total = 0;
+		int i, num_files = 0;
+		file_record nrec;
+
+		do {
+			rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer)-rc_total);
+
+			if (rc <= 0) {
+				break;
+			}
+
+			rc_total += rc;
+
+			os_sleep(20);
+		} while ( FS2NetD_DataReady() && (rc_total < (int)sizeof(buffer)) );
+
+		if (rc < BASE_PACKET_SIZE) {
+			return 0;
+		}
+
+		VRFY_PACKET2( PCKT_MISSIONS_REPLY );
+
+		if ( !my_packet ) {
+			return 0;
+		}
+
+		if ( buffer_size > (int)sizeof(buffer) ) {
+			ml_printf("FS2NetD WARNING: Mission list data is larger than receive buffer!  Some data will be lost!");
+		}
+
+		// make sure that we get the entire packet
+		while ( (rc_total < (uint)buffer_size) && (rc_total < sizeof(buffer)) && (timer_get_fixed_seconds() <= end_time) ) {
+			if ( FS2NetD_DataReady() ) {
+				rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer) - rc_total);
+
+				if (rc <= 0) {
+					continue;
+				}
+
+				rc_total += rc;
+			}
+
+			os_sleep(20);
+		}
+
+		PXO_GET_INT( num_files );
+
+		for (i = 0; i < num_files; i++) {
+			memset(&nrec, 0, sizeof(file_record));
+
+			PXO_GET_STRING( nrec.name );
+			PXO_GET_UINT( nrec.crc32 );
+
+			m_list.push_back( nrec );
+		}
+
+		return 1;
+	}
+
+	return 0;
+}
+
+int FS2NetD_Login(const char *username, const char *password, bool do_send)
+{
+	int buffer_size, buffer_offset;
+	bool my_packet = false;
+	char buffer[150];
+
+	if (do_send) {
+		INIT_PACKET( PCKT_LOGIN_AUTH );
+
+		PXO_ADD_STRING( username );
+		PXO_ADD_STRING( password );
+		PXO_ADD_USHORT( Multi_options_g.port );
+
+		DONE_PACKET();
+
+		if (FS2NetD_SendData(buffer, buffer_size) == -1) {
+			return -1;
+		}
+	} else if ( FS2NetD_DataReady() ) {
+		int rc;
+		uint rc_total = 0;
+		ubyte login_status = 0;
+		int sid __UNUSED;
+		short pilots __UNUSED;
+
+		do {
+			rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer)-rc_total);
+
+			if (rc <= 0) {
+				break;
+			}
+
+			rc_total += rc;
+
+			os_sleep(20);
+		} while ( FS2NetD_DataReady() && (rc_total < (int)sizeof(buffer)) );
+
+		if (rc < BASE_PACKET_SIZE) {
+			return -1;
+		}
+
+		VRFY_PACKET2( PCKT_LOGIN_REPLY );
+
+		if ( !my_packet ) {
+			return -1;
+		}
+			
+		PXO_GET_DATA( login_status );
+
+		if ( !login_status ) {
+			return -2;
+		}
+
+		PXO_GET_INT( sid );
+
+		PXO_GET_SHORT( pilots );
+
+		return sid;
+	}
+
+	return -1;
+}
+
+void FS2NetD_SendServerStart()
+{
+	int buffer_size;
+	char buffer[550];
+	ubyte tvar;
+
+	INIT_PACKET( PCKT_SERVER_START );
+
+	PXO_ADD_STRING( Netgame.name );
+	PXO_ADD_STRING( Netgame.mission_name );
+	PXO_ADD_STRING( Netgame.title );
+	PXO_ADD_STRING( Netgame.campaign_name );
+
+	tvar = (ubyte)Netgame.campaign_mode;
+	PXO_ADD_DATA( tvar );
+
+	PXO_ADD_INT( Netgame.flags );
+	PXO_ADD_INT( Netgame.type_flags );
+
+	PXO_ADD_SHORT( (short)multi_num_players() );
+	PXO_ADD_SHORT( (short)Netgame.max_players );
+
+	tvar = (ubyte)Netgame.mode;
+	PXO_ADD_DATA( tvar );
+
+	tvar = (ubyte)Netgame.rank_base;
+	PXO_ADD_DATA( tvar );
+
+	tvar = (ubyte)Netgame.game_state;
+	PXO_ADD_DATA( tvar );
+
+	tvar = (ubyte)multi_get_connection_speed();
+	PXO_ADD_DATA( tvar );
+
+	PXO_ADD_STRING(Multi_fs_tracker_channel);
+
+	DONE_PACKET();
+
+	if (FS2NetD_SendData(buffer, buffer_size) < 0) {
+		ml_printf("FS2NetD WARNING: Failed to send server start packet!");
+	}
+}
+
+void FS2NetD_SendServerUpdate()
+{
+	int buffer_size;
+	char buffer[550];
+	ubyte tvar;
+
+	INIT_PACKET( PCKT_SERVER_UPDATE );
+
+	PXO_ADD_STRING( Netgame.mission_name );
+	PXO_ADD_STRING( Netgame.title );
+	PXO_ADD_STRING( Netgame.campaign_name );
+
+	tvar = (ubyte)Netgame.campaign_mode;
+	PXO_ADD_DATA( tvar );
+
+	PXO_ADD_SHORT( (short)multi_num_players() );
+
+	tvar = (ubyte)Netgame.game_state;
+	PXO_ADD_DATA( tvar );
+
+	DONE_PACKET();
+
+	if (FS2NetD_SendData(buffer, buffer_size) < 0) {
+		ml_printf("FS2NetD WARNING: Failed to send server update packet!");
+	}
+}
+
+void FS2NetD_SendServerDisconnect()
+{
+	int buffer_size;
+	char buffer[BASE_PACKET_SIZE];
+
+	INIT_PACKET( PCKT_SERVER_DISCONNECT );
+
+	DONE_PACKET();
+
+	if (FS2NetD_SendData(buffer, buffer_size) < 0) {
+		ml_printf("FS2NetD WARNING: Failed to send server disconnect packet!");
+	}
+}
+
+void FS2NetD_RequestServerList()
+{
+	int buffer_size;
+	char buffer[BASE_PACKET_SIZE+sizeof(int)+sizeof(int)+sizeof(int)+MAX_PATH];
+	int all = 0xFFFFFFFF;
+	bool filtered = false;
+
+	if ( strlen(Multi_fs_tracker_filter) ) {
+		filtered = true;
+	}
+
+	// send request packet
+	INIT_PACKET( (filtered) ? PCKT_SLIST_REQUEST_FILTER : PCKT_SLIST_REQUEST );
+
+	PXO_ADD_INT( all );	// type
+	PXO_ADD_INT( all );	// status
+
+	if (filtered) {
+		PXO_ADD_STRING(Multi_fs_tracker_filter);
+	}
+
+	DONE_PACKET();
+
+	FS2NetD_SendData(buffer, buffer_size);
+}
+
+void FS2NetD_Ping()
+{
+	int buffer_size;
+	char buffer[BASE_PACKET_SIZE+sizeof(int)];
+
+	INIT_PACKET( PCKT_PING );
+
+	int time = timer_get_milliseconds();
+	PXO_ADD_INT( time );
+
+	DONE_PACKET();
+
+	if (FS2NetD_SendData(buffer, buffer_size) < 0) {
+		ml_printf("Failed to send PING packet!");
+	}
+}
+
+void FS2NetD_Pong(int tstamp)
+{
+	int buffer_size;
+	char buffer[BASE_PACKET_SIZE+sizeof(int)];
+
+	INIT_PACKET( PCKT_PONG );
+
+	PXO_ADD_INT( tstamp );
+
+	DONE_PACKET();
+
+	FS2NetD_SendData(buffer, buffer_size);
+}
+
+int FS2NetD_CheckValidID()
+{
+	int buffer_size;
+	char buffer[BASE_PACKET_SIZE+sizeof(int)];
+
+	// create and send request packet
+	INIT_PACKET( PCKT_VALID_SID_RQST );
+
+	PXO_ADD_INT( Multi_tracker_id );
+
+	DONE_PACKET();
+
+	if (FS2NetD_SendData(buffer, buffer_size) == -1) {
+		return -1;
+	}
+
+	return 0;
+}
+
+int FS2NetD_ValidateTableList(bool do_send)
+{
+	int buffer_size, buffer_offset;
+	bool my_packet = false;
+	char buffer[4096];
+	ushort num_tables = 0;
+
+	if (do_send) {
+		// create and send the request packet
+		INIT_PACKET( PCKT_TABLES_RQST );
+
+		num_tables = (ushort)Table_valid_status.size();
+
+		PXO_ADD_USHORT( num_tables );
+
+		for (SCP_vector<crc_valid_status>::iterator tvs = Table_valid_status.begin(); tvs != Table_valid_status.end(); ++tvs) {
+			PXO_ADD_STRING(tvs->name );
+			PXO_ADD_UINT( tvs->crc32 );
+		}
+
+		DONE_PACKET();
+
+		if (FS2NetD_SendData(buffer, buffer_size) == -1) {
+			return -1;
+		}
+	} else if ( FS2NetD_DataReady() ) {
+		int rc;
+		const fix end_time = timer_get_fixed_seconds() + (15 * F1_0);
+		ubyte tbl_valid_status = 0;
+		uint rc_total = 0;
+
+		do {
+			rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer)-rc_total);
+
+			if (rc <= 0) {
+				break;
+			}
+
+			rc_total += rc;
+
+			os_sleep(20);
+		} while ( FS2NetD_DataReady() && (rc_total < (int)sizeof(buffer)) );
+
+		if (rc < BASE_PACKET_SIZE) {
+			return -1;
+		}
+
+		VRFY_PACKET2( PCKT_TABLES_REPLY );
+
+		if ( !my_packet ) {
+			return -1;
+		}
+
+		// make sure that we get the entire packet
+		while ( (rc_total < (uint)buffer_size) && (rc_total < sizeof(buffer)) && (timer_get_fixed_seconds() <= end_time) ) {
+			if ( FS2NetD_DataReady() ) {
+				rc = FS2NetD_GetData(buffer+rc_total, sizeof(buffer) - rc_total);
+
+				if (rc <= 0) {
+					continue;
+				}
+
+				rc_total += rc;
+			}
+
+			os_sleep(20);
+		}
+
+		PXO_GET_USHORT( num_tables );
+
+		if ( !num_tables ) {
+			return -1;
+		}
+
+		if ( num_tables > (int)Table_valid_status.size() ) {
+			ml_printf("FS2NetD WARNING: Table list contains %i tables, but we only requested " SIZE_T_ARG "!  Invalid data!", num_tables, Table_valid_status.size());
+			return -1;
+		}
+
+		for (SCP_vector<crc_valid_status>::iterator tvs = Table_valid_status.begin(); tvs != Table_valid_status.end(); ++tvs) {
+			PXO_GET_DATA( tbl_valid_status );
+			Assert( (tbl_valid_status == 0) || (tbl_valid_status == 1) );
+
+			tvs->valid = tbl_valid_status;
+		}
+
+		return 2;
+	}
+
+	return 0;
+}
+
+void FS2NetD_GameCountUpdate(const char *chan_name)
+{
+	int buffer_size;
+	char buffer[MAX_PATH+BASE_PACKET_SIZE+10];
+
+	INIT_PACKET( PCKT_CHAT_CHAN_COUNT_RQST );
+
+	PXO_ADD_STRING( chan_name );
+
+	DONE_PACKET();
+
+	FS2NetD_SendData(buffer, buffer_size);
+}
+
+void FS2NetD_CheckDuplicateLogin()
+{
+	int buffer_size;
+	char buffer[BASE_PACKET_SIZE + sizeof(int) + sizeof(ubyte) + (MAX_PLAYERS * sizeof(int)) + 10];
+	int ids_count = 0;
+	int *ids = new int[MAX_PLAYERS];
+	int idx;
+
+	if ( !ids ) {
+		return;
+	}
+
+	for (idx = 0; idx < MAX_PLAYERS; idx++) {
+		if ( MULTI_CONNECTED(Net_players[idx]) && !MULTI_STANDALONE(Net_players[idx]) && !MULTI_PERM_OBSERVER(Net_players[idx]) ) {      
+			if ( (Net_players[idx].tracker_player_id >= 0) && (Net_players[idx].tracker_player_id != Multi_tracker_id) ) {
+				ids[ids_count] = Net_players[idx].tracker_player_id;
+				ids_count++;
+			}
+		}
+	}
+
+	if ( !ids_count ) {
+		delete [] ids;
+		return;
+	}
+
+	INIT_PACKET( PCKT_DUP_LOGIN_RQST );
+
+	PXO_ADD_INT( Multi_tracker_id );
+
+	Assert( MAX_PLAYERS <= 255 );
+
+	ubyte tvar = (ubyte)ids_count;
+	PXO_ADD_DATA( tvar );
+
+	for (idx = 0; idx < ids_count; idx++) {
+		PXO_ADD_INT( ids[idx] );
+	}
+
+	DONE_PACKET();
+
+	if (FS2NetD_SendData(buffer, buffer_size) < 0) {
+		ml_printf("FS2NetD WARNING: Failed to send data packet to server!");
+	}
+
+	delete [] ids;
+}
@@ -0,0 +1,82 @@
+// Client.h
+// Client Functions for FS2Open PXO
+// Derek Meek
+// 2-14-2003
+
+// ############## ATTENTION ##########
+// Licensed under the Academic Free License version 2.0
+// View License at http://www.opensource.org/licenses/afl-2.0.php
+// ###################################
+
+
+
+
+#if !defined(__pxo_client_h_)
+#define __pxo_client_h_
+
+
+#include "fs2netd/protocol.h"
+#include "fs2netd/tcp_socket.h"
+#include "globalincs/pstypes.h"
+
+#include <string>
+
+class player;
+struct netgame_info;
+
+
+int FS2NetD_CheckSingleMission(const char *m_name, uint crc32, bool do_send);
+
+int FS2NetD_SendPlayerData(const char *player_name, player *pl, bool do_send);
+int FS2NetD_GetPlayerData(const char *player_name, player *pl, bool can_create, bool do_send);
+
+int FS2NetD_GetBanList(SCP_vector<SCP_string> &mask_list, bool do_send);
+
+int FS2NetD_GetMissionsList(SCP_vector<file_record> &m_list, bool do_send);
+
+int FS2NetD_ValidateTableList(bool do_send);
+
+int FS2NetD_Login(const char *username, const char *password, bool do_send);
+int FS2NetD_CheckValidID();
+void FS2NetD_CheckDuplicateLogin();
+
+void FS2NetD_SendServerStart();
+void FS2NetD_SendServerUpdate();
+void FS2NetD_SendServerDisconnect();
+
+void FS2NetD_RequestServerList();
+
+void FS2NetD_GameCountUpdate(const char *chan_name);
+
+void FS2NetD_Ping();
+void FS2NetD_Pong(int tstamp);
+
+
+
+// Some easy to use macros for handling the packet data
+#define BASE_PACKET_SIZE	(int)(sizeof(ubyte) + sizeof(int))
+
+#define PXO_ADD_DATA(d) do { Assert(buffer_size+sizeof(d) <= sizeof(buffer)); memcpy(buffer+buffer_size, &d, sizeof(d)); buffer_size += sizeof(d); } while (0)
+#define PXO_ADD_SHORT(d) do { Assert(buffer_size+sizeof(short) <= sizeof(buffer)); short swap = INTEL_SHORT(d); memcpy(buffer+buffer_size, &swap, sizeof(short)); buffer_size += sizeof(short); } while (0)
+#define PXO_ADD_USHORT(d) do { Assert(buffer_size+sizeof(ushort) <= sizeof(buffer)); ushort swap = INTEL_SHORT(d); memcpy(buffer+buffer_size, &swap, sizeof(ushort)); buffer_size += sizeof(ushort); } while (0)
+#define PXO_ADD_INT(d) do { Assert(buffer_size+sizeof(int) <= sizeof(buffer)); int swap = INTEL_INT(d); memcpy(buffer+buffer_size, &swap, sizeof(int)); buffer_size += sizeof(int); } while (0)
+#define PXO_ADD_UINT(d) do { Assert(buffer_size+sizeof(uint) <= sizeof(buffer)); uint swap = INTEL_INT(d); memcpy(buffer+buffer_size, &swap, sizeof(uint)); buffer_size += sizeof(uint); } while (0)
+#define PXO_ADD_STRING(s) do { Assert(buffer_size+strlen(s)+sizeof(int) <= sizeof(buffer)); int len = (int)strlen(s); PXO_ADD_INT(len); if (len > 0) { memcpy(buffer+buffer_size, s, len ); buffer_size += len; } } while(0)
+
+#define PXO_GET_DATA(d) do { Assert(buffer_offset+sizeof(d) <= sizeof(buffer)); memcpy(&d, buffer+buffer_offset, sizeof(d) ); buffer_offset += sizeof(d); } while(0)
+#define PXO_GET_SHORT(d) do { Assert(buffer_offset+sizeof(short) <= sizeof(buffer)); short swap; memcpy(&swap, buffer+buffer_offset, sizeof(short) ); d = INTEL_SHORT(swap); buffer_offset += sizeof(short); } while(0)
+#define PXO_GET_USHORT(d) do { Assert(buffer_offset+sizeof(ushort) <= sizeof(buffer)); ushort swap; memcpy(&swap, buffer+buffer_offset, sizeof(ushort) ); d = INTEL_SHORT(swap); buffer_offset += sizeof(ushort); } while(0)
+#define PXO_GET_INT(d) do { Assert(buffer_offset+sizeof(int) <= sizeof(buffer)); int swap; memcpy(&swap, buffer+buffer_offset, sizeof(int) ); d = INTEL_INT(swap); buffer_offset += sizeof(int); } while(0)
+#define PXO_GET_UINT(d) do { Assert(buffer_offset+sizeof(uint) <= sizeof(buffer)); uint swap; memcpy(&swap, buffer+buffer_offset, sizeof(uint) ); d = INTEL_INT(swap); buffer_offset += sizeof(uint); } while(0)
+#define PXO_GET_STRING(s) do { Assert(buffer_offset+sizeof(int) <= sizeof(buffer)); s[0] = '\0'; int len; memcpy(&len, buffer+buffer_offset, sizeof(int)); len = INTEL_INT(len); buffer_offset += sizeof(int); if (len > 0) { memcpy(s, buffer+buffer_offset, len); buffer_offset += len; s[len] = '\0'; } } while(0)
+
+// initialize a packet
+#define INIT_PACKET(x) { memset(buffer, 0, sizeof(buffer)); buffer_size = 0; ubyte pckt = (x); PXO_ADD_DATA(pckt); PXO_ADD_INT(buffer_size); }
+// we are done with a new packet, so update the final packet size
+#define DONE_PACKET() { int swap = INTEL_INT(buffer_size); memcpy(buffer+sizeof(ubyte), &swap, sizeof(buffer_size)); }
+// verify received packet
+#define VRFY_PACKET(x) { buffer_offset = 0; ubyte pckt; PXO_GET_DATA(pckt); if (pckt != (x)) break; my_packet = true; PXO_GET_INT(buffer_size); }
+#define VRFY_PACKET2(x) { buffer_offset = 0; ubyte pckt; PXO_GET_DATA(pckt); if (pckt == (x)) my_packet = true; PXO_GET_INT(buffer_size); }
+
+
+#endif
@@ -0,0 +1,349 @@
+// TCP_Socket.cpp
+// TCP_Socket for FS2Open PXO
+// Derek Meek
+// 2-14-2003
+
+// ############## ATTENTION ##########
+// Licensed under the Academic Free License version 2.0
+// View License at http://www.opensource.org/licenses/afl-2.0.php
+// ###################################
+
+
+
+
+#include "fs2netd/tcp_socket.h"
+#include "globalincs/pstypes.h"
+#include "network/multi_log.h"
+
+
+#ifdef SCP_UNIX
+#include <sys/time.h>	// The OS X 10.3 SDK appears to need this for some reason (for timeval struct)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <cstdlib>
+#include <unistd.h>
+#include <cerrno>
+#include <sys/ioctl.h>
+#include <csignal>
+#ifdef SCP_SOLARIS
+#include <sys/filio.h>
+#endif
+#include <cctype>
+
+#define WSAGetLastError()  (errno)
+#define RESTART(syscall)                        \
+  ({                                            \
+    __typeof__(syscall) _res;                   \
+    do                                          \
+      _res = syscall;                           \
+    while (_res == -1 && errno == EINTR);       \
+    _res;                                       \
+})
+#else
+#include <windows.h>
+#include <process.h>
+typedef int socklen_t;
+#endif
+
+
+static bool Connecting = false;
+static bool Connected = false;
+static SOCKET mySocket = INVALID_SOCKET;
+
+static sockaddr_in FS2NetD_addr;
+
+
+void FS2NetD_Disconnect()
+{
+	if (mySocket != INVALID_SOCKET) {
+		shutdown(mySocket, 2);
+		closesocket(mySocket);
+		mySocket = INVALID_SOCKET;
+	}
+
+	Connected = false;
+	Connecting = false;
+}
+
+int FS2NetD_ConnectToServer(const char *host, const char *port)
+{
+	struct hostent *my_host = NULL;
+	char host_str[254]; // 253 is max domain name length: http://en.wikipedia.org/wiki/Domain_Name_System#Domain_name_syntax
+#ifdef SCP_UNIX
+	int my_error = 0;
+#endif
+
+	if ( !Connecting ) {
+#ifdef WIN32
+		WSADATA wsa;
+		int rc = WSAStartup(MAKEWORD(2,0), &wsa);
+
+		if (rc != 0) {
+			ml_printf("FS2NetD ERROR:  Failed to start WinSock!");
+			return -1;
+		}
+#endif
+
+		memset(&FS2NetD_addr, 0, sizeof(sockaddr_in));
+		FS2NetD_addr.sin_family = AF_INET;
+		FS2NetD_addr.sin_addr.s_addr = INADDR_ANY;
+		FS2NetD_addr.sin_port = 0;
+
+		mySocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+
+		if (mySocket == (SOCKET)SOCKET_ERROR) {
+#ifdef SCP_UNIX
+			my_error = errno;
+			ml_printf("FS2NetD ERROR: Couldn't get socket (\"%s\")!", strerror(my_error));
+#else
+			ml_printf("FS2NetD ERROR: Couldn't get socket!");
+#endif
+			return -1;
+		}
+
+		if ( bind(mySocket, (sockaddr *)&FS2NetD_addr, sizeof(sockaddr)) == SOCKET_ERROR ) {
+#ifdef SCP_UNIX
+			my_error = errno;
+			ml_printf("FS2NetD ERROR: Couldn't bind socket (\"%s\")!", strerror(my_error));
+#else
+			ml_printf("FS2NetD ERROR: Couldn't bind socket!");
+#endif
+			return -1;
+		}
+
+		// set to non-blocking mode
+		ulong arg = 1;
+		ioctlsocket(mySocket, FIONBIO, &arg);
+
+		// Where SO_NOSIGPIPE is defined (currently OS X):
+		// prevent SIGPIPE, which is generated when sending after receiver disconnected
+		// on other *nix use MSG_NOSIGNAL flag when sending data, or, failing that, use signal masking
+		// see FS2NetD_SendData()
+#if defined(SCP_UNIX) && defined(SO_NOSIGPIPE)
+		int nosigpipe = 1;
+		if (setsockopt(mySocket, SOL_SOCKET, SO_NOSIGPIPE, (void*)&nosigpipe, sizeof(nosigpipe)) == -1) {
+			my_error = errno;
+			ml_printf("FS2NetD ERROR: Couldn't set SO_NOSIGPIPE on socket (\"%s\")!", strerror(my_error));
+		}
+#endif // SCP_UNIX && SO_NOSIGPIPE
+
+		// blasted MS, probably need to use getaddrinfo() here for Win32, but I
+		// want to keep this as clean and simple as possible and that means
+		// using an actual standard :)
+
+		strcpy_s( host_str, host );
+
+		// check that we aren't in a dotted format, some gethostbyname() implementations don't like that
+		// (NOTE: Yes, I'm aware that this is problematic if a host name uses an initial digit)
+		if ( !isdigit(host_str[0]) ) {
+			my_host = gethostbyname( host );
+
+			if (my_host == NULL) {
+				// NOTE: that we don't do specific error reporting here since it's totally different
+				//       on Win32, compared to everything else that is actually standard
+				ml_printf("Failure from gethostbyname() for host '%s'", host);
+				return -1;
+			} else if (my_host->h_addrtype != AF_INET) {
+				ml_printf("Invalid address type returned by gethostbyname()!");
+				return -1;
+			} else if (my_host->h_addr_list[0] == NULL) {
+				ml_printf("Unable to determine IP from host name '%s'", host);
+				return -1;
+			}
+
+			FS2NetD_addr.sin_addr.s_addr = ((in_addr *)(my_host->h_addr_list[0]))->s_addr;
+		}
+		// we might be in dotted format so try using it as such
+		else {
+			FS2NetD_addr.sin_addr.s_addr = inet_addr( host );
+		}
+
+		if (FS2NetD_addr.sin_addr.s_addr == INADDR_ANY) {
+			ml_printf("No valid server address to connect with!");
+			return -1;
+		}
+
+		// we need to set the correct port before moving on
+		long m_port = strtol(port, (char**)NULL, 10);
+		FS2NetD_addr.sin_port = htons( (ushort)m_port );
+
+
+		if ( connect(mySocket, (sockaddr *)&FS2NetD_addr, sizeof(sockaddr)) == SOCKET_ERROR ) {
+			if ( WSAGetLastError() == WSAEWOULDBLOCK ) {
+				Connecting = true;
+				return 0;
+			} else {
+#ifdef SCP_UNIX
+				int errv = errno;
+				ml_printf("FS2NetD ERROR: Couldn't connect to remote system at %s (\"%s\")!", inet_ntoa(FS2NetD_addr.sin_addr), strerror(errv));
+#else
+				ml_printf("FS2NetD ERROR: Couldn't connect to remote system at %s!", inet_ntoa(FS2NetD_addr.sin_addr));
+#endif
+			}
+
+			return -1;
+		}
+		// technically there should always be an error since we should be non-blocking
+		else {
+			Connecting = true;
+			Connected = true;
+
+			return 1;
+		}
+	}
+	// done starting the connection, so lets see if we are actually connected yet
+	else {
+		if (Connected) {
+			Int3();
+			return 1;
+		}
+	
+		fd_set write_fds, error_fds;	           
+		timeval timeout;
+
+		timeout.tv_sec = 0;            
+		timeout.tv_usec = 1;
+
+		FD_ZERO(&write_fds);
+		FD_SET(mySocket, &write_fds);   
+
+		// if it's writeable then we are fully connected
+		if ( select(static_cast<int>(mySocket + 1), NULL, &write_fds, NULL, &timeout) > 0 ) {
+			// make sure that we don't have any connect() errors (since it's non-blocking)
+			int err_val = 0;
+			size_t err_val_size = sizeof(err_val);
+			getsockopt(mySocket, SOL_SOCKET, SO_ERROR, (char*)&err_val, (socklen_t*)&err_val_size);
+
+			if (err_val) {
+				// if we aren't still in blocking mode then we can't connect
+				if (err_val != WSAEWOULDBLOCK) {
+					return -1;
+				}
+
+				return 0;
+			}
+
+			Connected = true;
+			return 1;
+		}
+
+		FD_ZERO(&error_fds);
+		FD_SET(mySocket, &error_fds);
+
+		// if it's in error then it has failed to connect
+		if ( select(static_cast<int>(mySocket + 1), NULL, NULL, &error_fds, &timeout) )
+			return -1;
+
+		// not connected, and haven't failed to connect, so keep in the loop
+		return 0;
+	}
+}
+
+int FS2NetD_GetData(char *buffer, int blen)
+{
+	int flags = 0;
+
+	// clear the buffer
+	memset(buffer, 0, blen);
+
+	socklen_t from_len = sizeof(sockaddr);
+
+	return recvfrom(mySocket, buffer, blen, flags, (sockaddr*)&FS2NetD_addr, &from_len);
+}
+
+int FS2NetD_SendData(char *buffer, int blen)
+{
+	int flags = 0;
+
+	// on Unix with MSG_NOSIGNAL, prevent SIGPIPE, which is generated if receiver has disconnected
+	// the MSG_NOSIGNAL flag doesn't work on OS X or Solaris
+	// on OS X, use setsockopt() with SO_NOSIGPIPE instead, see above
+#if defined(SCP_UNIX) && defined(MSG_NOSIGNAL)
+	flags |= MSG_NOSIGNAL;
+#endif // SCP_UNIX && MSG_NOSIGNAL
+
+	socklen_t to_len = sizeof(sockaddr);
+
+	// Borrowed from Kroki:
+	// https://github.com/kroki/XProbes/blob/1447f3d93b6dbf273919af15e59f35cca58fcc23/src/libxprobes.c#L156
+#if defined(SCP_UNIX) && !defined(MSG_NOSIGNAL) && !defined(SO_NOSIGPIPE)
+	/*
+		We want to ignore possible SIGPIPE that we can generate on write.
+		SIGPIPE is delivered *synchronously* and *only* to the thread
+		doing the write.  So if it is reported as already pending (which
+		means the thread blocks it), then we do nothing: if we generate
+		SIGPIPE, it will be merged with the pending one (there's no
+		queuing), and that suits us well.  If it is not pending, we block
+		it in this thread (and we avoid changing signal action, because it
+		is per-process).
+	*/
+	sigset_t pending;
+	sigset_t sigpipe_mask;
+	bool sigpipe_pending;
+	bool sigpipe_unblock;
+	sigemptyset(&pending);
+	sigpending(&pending);
+	sigpipe_pending = sigismember(&pending, SIGPIPE);
+	if (!sigpipe_pending) {
+		sigset_t blocked;
+		sigemptyset(&blocked);
+		pthread_sigmask(SIG_BLOCK, &sigpipe_mask, &blocked);
+
+		/* Maybe is was blocked already?  */
+		sigpipe_unblock = ! sigismember(&blocked, SIGPIPE);
+	}
+#endif  /* defined(SCP_UNIX) && ! defined(MSG_NOSIGNAL) && ! defined(SO_NOSIGPIPE) */
+
+	auto sent_chars = sendto(mySocket, buffer, blen, flags, (sockaddr*)&FS2NetD_addr, to_len);
+
+#if defined(SCP_UNIX) && !defined(MSG_NOSIGNAL) && !defined(SO_NOSIGPIPE)
+	/*
+		If SIGPIPE was pending already we do nothing.  Otherwise, if it
+		become pending (i.e., we generated it), then we sigwait() it (thus
+		clearing pending status).  Then we unblock SIGPIPE, but only if it
+		were us who blocked it.
+	*/
+	if (!sigpipe_pending) {
+		sigemptyset(&pending);
+		sigpending(&pending);
+		if (sigismember(&pending, SIGPIPE)) {
+			/*
+				Protect ourselves from a situation when SIGPIPE was sent
+				by the user to the whole process, and was delivered to
+				other thread before we had a chance to wait for it.
+			*/
+			static const struct timespec nowait = { 0, 0 };
+			RESTART(sigtimedwait(&sigpipe_mask, NULL, &nowait));
+		}
+
+		if (sigpipe_unblock) {
+			pthread_sigmask(SIG_UNBLOCK, &sigpipe_mask, NULL);
+		}
+	}
+#endif  /* defined(SCP_UNIX) && ! defined(MSG_NOSIGNAL) && ! defined(SO_NOSIGPIPE) */
+
+	return sent_chars;
+}
+
+bool FS2NetD_DataReady()
+{
+	timeval wait;
+	wait.tv_sec = 0;
+	wait.tv_usec = 1;
+
+	fd_set recvs;
+
+	FD_ZERO(&recvs);
+	FD_SET(mySocket, &recvs);
+
+#ifndef SCP_UNIX
+	int status = select(1, &recvs, NULL, NULL, &wait);
+#else
+	int status = select(mySocket+1, &recvs, NULL, NULL, &wait);
+#endif
+
+	return ( (status != 0) && (status != -1) && FD_ISSET(mySocket, &recvs) );
+}
@@ -0,0 +1,28 @@
+// TCP_Socket.h
+// TCP_Socket for FS2Open PXO
+// Derek Meek
+// 2-14-2003
+
+// ############## ATTENTION ##########
+// Licensed under the Academic Free License version 2.0
+// View License at http://www.opensource.org/licenses/afl-2.0.php
+// ###################################
+
+
+
+
+#if !defined(__TCP_SOCKET_H_)
+#define __TCP_SOCKET_H_
+
+#include "globalincs/pstypes.h" // make sure _cdecl is defined correctly on *nix
+
+
+int FS2NetD_ConnectToServer(const char *host, const char *port);
+void FS2NetD_Disconnect();
+
+int FS2NetD_GetData(char *buffer, int blen);
+int FS2NetD_SendData(char *buffer, int blen);
+bool FS2NetD_DataReady();
+
+
+#endif // __TCP_SOCKET_H_
@@ -1,75 +0,0 @@
-#include "crashdump.h"
-
-#ifdef WIN32
-
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable:4091) // a microsoft header has warnings. Very nice.
-#endif
-
-// clang-format off
-#include <windows.h>
-#include <dbghelp.h>
-// clang-format on
-
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
-
-#include "globalincs/pstypes.h"
-
-void make_minidump(EXCEPTION_POINTERS* e)
-{
-	const auto hDbgHelp = LoadLibraryA("dbghelp");
-	if (hDbgHelp == nullptr)
-		return;
-	const auto pMiniDumpWriteDump = reinterpret_cast<decltype(&MiniDumpWriteDump)>(
-	    reinterpret_cast<void*>(GetProcAddress(hDbgHelp, "MiniDumpWriteDump")));
-	if (pMiniDumpWriteDump == nullptr)
-		return;
-
-	char name[MAX_PATH];
-	{
-		const auto nameEnd = name + GetModuleFileNameA(GetModuleHandleA(nullptr), name, MAX_PATH);
-		SYSTEMTIME t;
-		GetSystemTime(&t);
-		wsprintfA(nameEnd - strlen(".exe"), "_%4d%02d%02d_%02d%02d%02d.mdmp", t.wYear, t.wMonth, t.wDay, t.wHour,
-		          t.wMinute, t.wSecond);
-	}
-
-	const auto hFile = CreateFileA(name, GENERIC_WRITE, FILE_SHARE_READ, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
-	if (hFile == INVALID_HANDLE_VALUE)
-		return;
-
-	MINIDUMP_EXCEPTION_INFORMATION exceptionInfo;
-	exceptionInfo.ThreadId          = GetCurrentThreadId();
-	exceptionInfo.ExceptionPointers = e;
-	exceptionInfo.ClientPointers    = FALSE;
-
-	pMiniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), hFile,
-	                   MINIDUMP_TYPE(MiniDumpWithIndirectlyReferencedMemory | MiniDumpScanMemory),
-	                   e ? &exceptionInfo : nullptr, nullptr, nullptr);
-
-	CloseHandle(hFile);
-
-	mprintf(("CRASH DETECTED!!! Wrote crash dump to %s\n", name));
-}
-
-LONG CALLBACK unhandled_handler(EXCEPTION_POINTERS* e)
-{
-	make_minidump(e);
-	return EXCEPTION_CONTINUE_SEARCH;
-}
-
-#endif
-
-namespace crashdump {
-
-void installCrashHandler()
-{
-#ifdef WIN32
-	SetUnhandledExceptionFilter(unhandled_handler);
-#endif
-}
-
-} // namespace crashdump
@@ -1,7 +0,0 @@
-#pragma once
-
-namespace crashdump {
-
-void installCrashHandler();
-
-}
@@ -62,7 +62,7 @@ do {												\
 	(elem)->next->prev = (elem)->prev;	\
 	(elem)->next = NULL;						\
 	(elem)->prev = NULL;						\
-} while(false)
+} while(0)

 // Moves elem to be after head
 #define list_move_append(head, elem)		\
@@ -240,11 +240,11 @@ extern int Global_error_count;
 // or,
 // Error( LOCATION, "Error opening %s", filename );

-/*******************NEVER COMMENT Assert ************************************************/
-// Please never comment the functionality of Assert in debug
+/*******************NEVER UNCOMMENT Assert ************************************************/
+// Please never uncomment the functionality of Assert in debug
 // The code, as with all development like this is littered with Asserts which are designed to throw
 // up an error message if variables are out of range.
-// Disabling this functionality is dangerous, crazy values can run rampant unchecked, and the longer it's disabled
+// Disabling this functionality is dangerous, crazy values can run rampent unchecked and the longer its disabled
 // the more likely you are to have problems getting it working again.
 #if defined(NDEBUG)
 #	define Assert(expr) do { ASSUME(expr); } while (false)
@@ -259,18 +259,22 @@ extern int Global_error_count;
 /*******************NEVER COMMENT Assert ************************************************/

 // Goober5000 - define Verify for use in both release and debug mode
-#define Verify(x) do { if (!(x)){ Error(LOCATION, "Verify failure: %s\n", #x); } ASSUME(x); } while(false)
+#define Verify(x) do { if (!(x)){ Error(LOCATION, "Verify failure: %s\n", #x); } ASSUME(x); } while(0)

-// Verification (like Assertion)
+// VerifyEx
 #ifndef _MSC_VER   // non MS compilers
-#	define Verification(x, y, ...) do { if (!(x)) { Error(LOCATION, "Verify failure: %s with help text " #y "\n", #x, ##__VA_ARGS__); } ASSUME(x); } while(false)
+#	define VerifyEx(x, y, ...) do { if (!(x)) { Error(LOCATION, "Verify failure: %s with help text " #y "\n", #x, ##__VA_ARGS__); } ASSUME(x); } while(0)
 #else
-#	define Verification(x, y, ...) do { if (!(x)) { Error(LOCATION, "Verify failure: %s with help text " #y "\n", #x, __VA_ARGS__); } ASSUME(x); } while(false)
+#	if _MSC_VER >= 1400	// VC 2005 or greater
+#		define VerifyEx(x, y, ...) do { if (!(x)) { Error(LOCATION, "Verify failure: %s with help text " #y "\n", #x, __VA_ARGS__); } ASSUME(x); } while(0)
+#	else // everything else
+#		define VerifyEx(x, y) Verify(x)
+#	endif
 #endif

 #if defined(NDEBUG)
 	// No debug version of Int3
-	#define Int3() do { } while (false)
+	#define Int3() do { } while (0)
 #else
 	void debug_int3(const char *file, int line);

@@ -446,7 +450,7 @@ SCP_string dump_stacktrace();
 // DEBUG compile time catch for dangerous uses of memset/memcpy/memmove
 // This is disabled for VS2013 and lower since that doesn't support the necessary features
 #if !defined(NDEBUG) && !defined(USING_THIRD_PARTY_LIBS) && (!defined(_MSC_VER) || _MSC_VER >= 1900)
-	#if SCP_COMPILER_CXX_AUTO_TYPE && SCP_COMPILER_CXX_STATIC_ASSERT && defined(SCP_HAVE_STD_IS_TRIVIALLY_COPYABLE)
+	#if SCP_COMPILER_CXX_AUTO_TYPE && SCP_COMPILER_CXX_STATIC_ASSERT && defined(HAVE_STD_IS_TRIVIALLY_COPYABLE)
 	// feature support seems to be: gcc   clang   msvc
 	// auto                         4.4   2.9     2010
 	// std::is_trivial              4.5   ?       2012 (2010 only duplicates std::is_pod)
@@ -4,6 +4,7 @@
 #pragma once

 #include "scp_compiler_detection.h"
+#include "platformChecks.h"

 #define SCP_TOKEN_CONCAT1(x, y) x ## y
 #define SCP_TOKEN_CONCAT(x, y) SCP_TOKEN_CONCAT1(x, y)
@@ -37,14 +37,30 @@
 #define ASSUME(x)

 #if defined(NDEBUG)
-#	define Assertion(expr, msg, ...)  do { ASSUME(expr); } while (false)
+#	if _MSC_VER >= 1400  /* MSVC 2005 or newer */
+#		define Assertion(expr, msg, ...)  do { ASSUME(expr); } while (false)
+#	else
+#		define Assertion(expr, msg)  do {} while (false)
+#	endif
 #else
-#	define Assertion(expr, msg, ...)                                    \
-		do {                                                            \
-			if (!(expr)) {                                              \
-				os::dialogs::AssertMessage(#expr, __FILE__, __LINE__, msg, __VA_ARGS__); \
-			}                                                           \
-		} while (false)
+	/*
+	 * NOTE: Assertion() can only use its proper functionality in compilers
+	 * that support variadic macros.
+	 */
+#	if _MSC_VER >= 1400  /* MSVC 2005 or newer */
+#		define Assertion(expr, msg, ...)                                    \
+			do {                                                            \
+				if (!(expr)) {                                              \
+					os::dialogs::AssertMessage(#expr, __FILE__, __LINE__, msg, __VA_ARGS__); \
+				}                                                           \
+			} while (false)
+#	else                 /* Older MSVC compilers */
+#		define Assertion(expr, msg)                        \
+			do {                                           \
+				if (!(expr)) {                             \
+					os::dialogs::AssertMessage(#expr, __FILE__, __LINE__);  \
+			} while (false)
+#	endif
 #endif

 /* C++11 Standard Detection */
@@ -61,7 +61,6 @@ version get_executable_version() {
 version::version(int major_in, int minor_in, int build_in, int revision_in) :
 	major(major_in), minor(minor_in), build(build_in), revision(revision_in) {
 }
-bool version::isValid() const { return major != 0 || minor != 0 || build != 0 || revision != 0; }
 bool version::operator<(const version& v) const {

 	if (major < v.major) {
@@ -57,8 +57,6 @@ struct version {

 	version(int major, int minor, int build, int revision);

-	bool isValid() const;
-
 	bool operator<(const version& other) const;
 	bool operator==(const version& other) const;
 	bool operator!=(const version& other) const;
@@ -29,6 +29,7 @@
 #include "graphics/light.h"
 #include "graphics/matrix.h"
 #include "graphics/opengl/gropengl.h"
+#include "graphics/opengl/gropengldraw.h"
 #include "graphics/paths/PathRenderer.h"
 #include "graphics/util/GPUMemoryHeap.h"
 #include "graphics/util/UniformBuffer.h"
@@ -50,7 +51,6 @@
 #endif

 #include "SDL_surface.h"
-#include "material.h"

 const char *Resolution_prefixes[GR_NUM_RESOLUTIONS] = { "", "2_" };

@@ -105,9 +105,6 @@ float Gr_save_menu_zoomed_offset_X = 0.0f, Gr_save_menu_zoomed_offset_Y = 0.0f;

 bool Save_custom_screen_size;

-bool Deferred_lighting = false;
-bool High_dynamic_range = false;
-
 static int videodisplay_deserializer(const json_t* value)
 {
 	int id;
@@ -307,11 +304,7 @@ static auto AAOption = options::OptionBuilder<AntiAliasMode>("Graphics.AAMode",
                           .values({{AntiAliasMode::None, "None"},
                                    {AntiAliasMode::FXAA_Low, "FXAA Low"},
                                    {AntiAliasMode::FXAA_Medium, "FXAA Medium"},
-                                    {AntiAliasMode::FXAA_High, "FXAA High"},
-                                    {AntiAliasMode::SMAA_Low, "SMAA Low"},
-                                    {AntiAliasMode::SMAA_Medium, "SMAA Medium"},
-                                    {AntiAliasMode::SMAA_High, "SMAA High"},
-                                    {AntiAliasMode::SMAA_Ultra, "SMAA Ultra"}})
+                                    {AntiAliasMode::FXAA_High, "FXAA High"}})
                           .default_val(AntiAliasMode::None)
                           .bind_to(&Gr_aa_mode)
                           .importance(79)
@@ -321,11 +314,8 @@ bool gr_is_fxaa_mode(AntiAliasMode mode)
 {
 	return mode == AntiAliasMode::FXAA_Low || mode == AntiAliasMode::FXAA_Medium || mode == AntiAliasMode::FXAA_High;
 }
-bool gr_is_smaa_mode(AntiAliasMode mode) {
-	return mode == AntiAliasMode::SMAA_Low || mode == AntiAliasMode::SMAA_Medium || mode == AntiAliasMode::SMAA_High || mode == AntiAliasMode::SMAA_Ultra;
-}

-bool Gr_post_processing_enabled = true;
+bool Gr_post_processing_enabled = false;

 static auto PostProcessOption =
    options::OptionBuilder<bool>("Graphis.PostProcessing", "Post processing",
@@ -974,6 +964,17 @@ void gr_set_palette_internal( const char * /*name*/, ubyte * palette, int  /*res
 	}
 }

+
+void gr_set_palette( const char *name, ubyte * palette, int restrict_font_to_128 )
+{
+	char *p;
+	strcpy_s( Gr_current_palette_name, name );
+	p = strchr( Gr_current_palette_name, '.' );
+	if ( p ) *p = 0;
+	gr_screen.signature = Gr_signature++;
+	gr_set_palette_internal( name, palette, restrict_font_to_128 );
+}
+
 void gr_screen_resize(int width, int height)
 {
 	gr_screen.save_center_w = gr_screen.center_w = gr_screen.save_max_w = gr_screen.max_w = gr_screen.max_w_unscaled = gr_screen.max_w_unscaled_zoomed = width;
@@ -1247,11 +1248,11 @@ bool gr_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps, int d_mode,
 			}
 		}

-		if (Cmdline_res != nullptr) {
+		if (!Cmdline_res.empty()) {
 			int tmp_width = 0;
 			int tmp_height = 0;

-			if ( sscanf(Cmdline_res, "%dx%d", &tmp_width, &tmp_height) == 2 ) {
+			if ( sscanf(Cmdline_res.c_str(), "%dx%d", &tmp_width, &tmp_height) == 2 ) {
 				width = tmp_width;
 				height = tmp_height;
 			}
@@ -1259,11 +1260,11 @@ bool gr_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps, int d_mode,

 		Gr_enable_soft_particles = Cmdline_softparticles != 0;
 	}
-	if (Cmdline_center_res != NULL) {
+	if (!Cmdline_center_res.empty()) {
 		int tmp_center_width = 0;
 		int tmp_center_height = 0;

-		if ( (sscanf(Cmdline_center_res, "%dx%d", &tmp_center_width, &tmp_center_height) == 2) && (tmp_center_width > 0) && (tmp_center_height > 0) ) {
+		if ( (sscanf(Cmdline_center_res.c_str(), "%dx%d", &tmp_center_width, &tmp_center_height) == 2) && (tmp_center_width > 0) && (tmp_center_height > 0) ) {
 			center_aspect_ratio = (float)tmp_center_width / (float)tmp_center_height;
 		}
 	}
@@ -2375,6 +2376,15 @@ bool poly_list::finder::operator()(const uint a, const uint b)
 	}
 }

+void gr_shield_icon(coord2d coords[6], int resize_mode)
+{
+	if (gr_screen.mode == GR_STUB) {
+		return;
+	}
+	
+	g3_render_shield_icon(&gr_screen.current_color, coords, resize_mode);
+}
+
 void gr_set_bitmap(int bitmap_num, int alphablend_mode, int bitblt_mode, float alpha)
 {
 	gr_screen.current_alpha = alpha;
@@ -47,29 +47,19 @@ extern flagset<FramebufferEffects> Gr_framebuffer_effects;

 enum class AntiAliasMode {
 	None,
-
 	FXAA_Low,
 	FXAA_Medium,
-	FXAA_High,
-
-	SMAA_Low,
-	SMAA_Medium,
-	SMAA_High,
-	SMAA_Ultra,
+	FXAA_High
 };
 extern AntiAliasMode Gr_aa_mode;
 extern AntiAliasMode Gr_aa_mode_last_frame;

 bool gr_is_fxaa_mode(AntiAliasMode mode);
-bool gr_is_smaa_mode(AntiAliasMode mode);

 extern bool Gr_post_processing_enabled;

 extern bool Gr_enable_vsync;

-extern bool Deferred_lighting;
-extern bool High_dynamic_range;
-
 class material;
 class model_material;
 class particle_material;
@@ -165,6 +155,8 @@ enum primitive_type {
 	PRIM_TYPE_TRIS,
 	PRIM_TYPE_TRISTRIP,
 	PRIM_TYPE_TRIFAN,
+	PRIM_TYPE_QUADS,
+	PRIM_TYPE_QUADSTRIP
 };

 enum shader_type {
@@ -192,11 +184,6 @@ enum shader_type {
 	SDR_TYPE_DECAL,
 	SDR_TYPE_SCENE_FOG,
 	SDR_TYPE_ROCKET_UI,
-
-	SDR_TYPE_POST_PROCESS_SMAA_EDGE,
-	SDR_TYPE_POST_PROCESS_SMAA_BLENDING_WEIGHT,
-	SDR_TYPE_POST_PROCESS_SMAA_NEIGHBORHOOD_BLENDING,
-
 	NUM_SHADER_TYPES
 };

@@ -261,6 +248,7 @@ struct vertex_format_data
 		MODEL_ID,
 		RADIUS,
 		UVEC,
+		WORLD_MATRIX,
 	};

 	vertex_format format_type;
@@ -754,6 +742,10 @@ typedef struct screen {
 	int (*gf_bm_make_render_target)(int handle, int *width, int *height, int *bpp, int *mm_lvl, int flags );
 	int (*gf_bm_set_render_target)(int handle, int face);

+	void (*gf_translate_texture_matrix)(int unit, const vec3d *shift);
+	void (*gf_push_texture_matrix)(int unit);
+	void (*gf_pop_texture_matrix)(int unit);
+
 	void (*gf_set_texture_addressing)(int);

 	int (*gf_create_buffer)(BufferType type, BufferUsageHint usage);
@@ -840,7 +832,7 @@ typedef struct screen {
 } screen;

 // handy macro
-#define GR_MAYBE_CLEAR_RES(bmap)		do  { int bmw = -1; int bmh = -1; if(bmap != -1){ bm_get_info( bmap, &bmw, &bmh, NULL, NULL, NULL); if((bmw != gr_screen.max_w) || (bmh != gr_screen.max_h)){gr_clear();} } else {gr_clear();} } while(false);
+#define GR_MAYBE_CLEAR_RES(bmap)		do  { int bmw = -1; int bmh = -1; if(bmap != -1){ bm_get_info( bmap, &bmw, &bmh, NULL, NULL, NULL); if((bmw != gr_screen.max_w) || (bmh != gr_screen.max_h)){gr_clear();} } else {gr_clear();} } while(0);

 //Window's interface to set up graphics:
 //--------------------------------------
@@ -915,6 +907,8 @@ extern void gr_get_string_size( int *w, int *h, const char * text, int len = 999
 // Returns the height of the current font
 extern int gr_get_font_height();

+extern void gr_set_palette(const char *name, ubyte *palette, int restrict_to_128 = 0);
+
 extern io::mouse::Cursor* Web_cursor;

 // Called by OS when application gets/looses focus
@@ -941,6 +935,8 @@ void gr_set_bitmap(int bitmap_num, int alphablend = GR_ALPHABLEND_NONE, int bitb

 #define gr_clear				GR_CALL(gr_screen.gf_clear)

+void gr_shield_icon(coord2d coords[6], const int resize_mode = GR_RESIZE_FULL);
+
 #define gr_zbuffer_get		GR_CALL(gr_screen.gf_zbuffer_get)
 #define gr_zbuffer_set		GR_CALL(gr_screen.gf_zbuffer_set)
 #define gr_zbuffer_clear	GR_CALL(gr_screen.gf_zbuffer_clear)
@@ -966,6 +962,11 @@ void gr_set_bitmap(int bitmap_num, int alphablend = GR_ALPHABLEND_NONE, int bitb

 #define gr_set_clear_color	GR_CALL(gr_screen.gf_set_clear_color)

+#define gr_translate_texture_matrix		GR_CALL(gr_screen.gf_translate_texture_matrix)
+#define gr_push_texture_matrix			GR_CALL(gr_screen.gf_push_texture_matrix)
+#define gr_pop_texture_matrix			GR_CALL(gr_screen.gf_pop_texture_matrix)
+
+
 // Here be the bitmap functions
 #define gr_bm_free_data				GR_CALL(gr_screen.gf_bm_free_data)
 #define gr_bm_create				GR_CALL(gr_screen.gf_bm_create)
@@ -1018,6 +1019,7 @@ inline void gr_post_process_restore_zbuffer() {

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

 #define gr_clear_states					GR_CALL(gr_screen.gf_clear_states)

@@ -1139,6 +1141,7 @@ inline void gr_sync_delete(gr_sync sync) {
 }

 // color functions
+void gr_get_color( int *r, int *g, int  b );
 void gr_init_color(color *c, int r, int g, int b);
 void gr_init_alphacolor( color *clr, int r, int g, int b, int alpha, int type = AC_TYPE_HUD );
 void gr_set_color( int r, int g, int b );
@@ -1148,11 +1151,34 @@ void gr_set_color_fast(color *dst);
 void gr_create_shader(shader *shade, ubyte r, ubyte g, ubyte b, ubyte c);
 void gr_set_shader(shader *shade);

+uint gr_determine_model_shader_flags(
+	bool lighting,
+	bool fog,
+	bool textured,
+	bool in_shadow_map,
+	bool thruster_scale,
+	bool transform,
+	bool team_color_set,
+	int tmap_flags,
+	int spec_map,
+	int glow_map,
+	int normal_map,
+	int height_map,
+	int ambient_map,
+	int env_map,
+	int misc_map
+);
+
 // new bitmap functions
 void gr_bitmap(int x, int y, int resize_mode = GR_RESIZE_FULL);
 void gr_bitmap_uv(int _x, int _y, int _w, int _h, float _u0, float _v0, float _u1, float _v1, int resize_mode = GR_RESIZE_FULL);
+void gr_bitmap_list(bitmap_2d_list* list, int n_bm, int resize_mode);
 void gr_bitmap_list(bitmap_rect_list* list, int n_bm, int resize_mode);

+// texture update functions
+ubyte* gr_opengl_get_texture_update_pointer(int bitmap_handle);
+void gr_opengl_update_texture(int bitmap_handle, int bpp, const ubyte* data, int width, int height);
+
 // special function for drawing polylines. this function is specifically intended for
 // polylines where each section is no more than 90 degrees away from a previous section.
 // Moreover, it is _really_ intended for use with 45 degree angles. 
@@ -1199,7 +1225,7 @@ class DebugScope {
 #ifndef NDEBUG
 #define GR_DEBUG_SCOPE(name) ::graphics::DebugScope SCP_TOKEN_CONCAT(gr_scope, __LINE__)(name)
 #else
-#define GR_DEBUG_SCOPE(name) do {} while(false)
+#define GR_DEBUG_SCOPE(name) do {} while(0)
 #endif

 enum AnimatedShader {
@@ -86,6 +86,10 @@ void gr_stub_get_region(int  /*front*/, int  /*w*/, int  /*h*/, ubyte * /*data*/
 {
 }

+void gr_stub_pop_texture_matrix(int  /*unit*/)
+{
+}
+
 void gr_stub_preload_init()
 {
 }
@@ -94,6 +98,10 @@ void gr_stub_print_screen(const char * /*filename*/)
 {
 }

+void gr_stub_push_texture_matrix(int  /*unit*/)
+{
+}
+
 void gr_stub_rect(int  /*x*/, int  /*y*/, int  /*w*/, int  /*h*/, int  /*resize_mode*/)
 {
 }
@@ -161,6 +169,10 @@ void gr_stub_stuff_secondary_color(vertex * /*v*/, ubyte  /*fr*/, ubyte  /*fg*/,
 {
 }

+void gr_stub_translate_texture_matrix(int  /*unit*/, const vec3d * /*shift*/)
+{
+}
+
 void gr_stub_zbias_stub(int  /*bias*/)
 {
 }
@@ -451,6 +463,10 @@ bool gr_stub_init()

 	gr_screen.gf_preload			= gr_stub_preload;

+	gr_screen.gf_push_texture_matrix		= gr_stub_push_texture_matrix;
+	gr_screen.gf_pop_texture_matrix			= gr_stub_pop_texture_matrix;
+	gr_screen.gf_translate_texture_matrix	= gr_stub_translate_texture_matrix;
+
 	gr_screen.gf_set_texture_addressing	= gr_stub_set_texture_addressing;
 	gr_screen.gf_zbias					= gr_stub_zbias_stub;
 	gr_screen.gf_set_fill_mode			= gr_set_fill_mode_stub;
@@ -28,7 +28,7 @@ struct gr_light
 	// spotlight direction (for tube lights)
 	vec3d SpotDir;

-	float SpotCutOff;
+	float SpotExp, SpotCutOff;
 	float ConstantAtten, LinearAtten, QuadraticAtten;

 	int type;
@@ -70,6 +70,8 @@ void FSLight2GLLight(light* FSLight, gr_light* GLLight) {
 	GLLight->SpotDir.xyz.x = 0.0f;
 	GLLight->SpotDir.xyz.y = 0.0f;
 	GLLight->SpotDir.xyz.z = -1.0f;
+	// spot exponent
+	GLLight->SpotExp = Cmdline_ogl_spec * 0.5f;
 	// spot cutoff
 	GLLight->SpotCutOff = 180.0f; // special value, light in all directions
 	// defaults to disable attenuation
@@ -254,6 +256,7 @@ void gr_set_center_alpha(int type) {
 	glight.SpotDir.xyz.x = 0.0f;
 	glight.SpotDir.xyz.y = 0.0f;
 	glight.SpotDir.xyz.z = -1.0f;
+	glight.SpotExp = Cmdline_ogl_spec * 0.5f;
 	glight.SpotCutOff = 180.0f;
 	glight.ConstantAtten = 1.0f;
 	glight.LinearAtten = 0.0f;
@@ -20,7 +20,7 @@
    int __temp__ = (a);                                                 \
    (a) = (b);                                                          \
    (b) = __temp__;                                                     \
-} while(false)
+} while(0)

 //#define INT_SCALE(var,arg,num,den) ((var) = ((arg) * (num)) / (den))
 #define INT_SCALE(var,arg,num,den) ((var) = MulDiv(arg, num, den))
@@ -90,13 +90,13 @@
            WHEN_CLIPPED;                                               \
        }                                                               \
    }                                                                   \
-} while(false)
+} while(0)

 #define FL_EXCHG(a,b) do {                                                 \
    float __temp__ = (a);                                                 \
    (a) = (b);                                                          \
    (b) = __temp__;                                                     \
-} while(false)
+} while(0)

 #define FL_SCALE(var,arg,num,den) ((var) = ((arg) * (num)) / (den))

@@ -165,6 +165,6 @@
            WHEN_CLIPPED;                                               \
        }                                                               \
    }                                                                   \
-} while(false)
+} while(0)

 #endif
@@ -1,134 +0,0 @@
-/**
- * Copyright (C) 2013 Jorge Jimenez (jorge@iryoku.com)
- * Copyright (C) 2013 Jose I. Echevarria (joseignacioechevarria@gmail.com)
- * Copyright (C) 2013 Belen Masia (bmasia@unizar.es)
- * Copyright (C) 2013 Fernando Navarro (fernandn@microsoft.com)
- * Copyright (C) 2013 Diego Gutierrez (diegog@unizar.es)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to
- * do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software. As clarification, there
- * is no requirement that the copyright notice and permission be included in
- * binary distributions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-
-#ifndef SEARCHTEX_H
-#define SEARCHTEX_H
-
-#define SEARCHTEX_WIDTH 64
-#define SEARCHTEX_HEIGHT 16
-#define SEARCHTEX_PITCH SEARCHTEX_WIDTH
-#define SEARCHTEX_SIZE (SEARCHTEX_HEIGHT * SEARCHTEX_PITCH)
-
-// clang-format off
-/**
- * Stored in R8 format. Load it in the following format:
- *  - DX9:  D3DFMT_L8 
- *  - DX10: DXGI_FORMAT_R8_UNORM
- */
-static const unsigned char searchTexBytes[] = {
-    0xfe, 0xfe, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x7f, 0x7f, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 
-    0x7f, 0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0xfe, 0x7f, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0xfe, 
-    0xfe, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 
-    0x7f, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0xfe, 0xfe, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x7f, 0x7f, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 
-    0x7f, 0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0xfe, 0x7f, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0xfe, 
-    0xfe, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 
-    0x7f, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x7f, 
-    0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 
-    0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 
-    0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 
-    0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x7f, 
-    0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 
-    0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 
-    0x7f, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x00, 0x00, 
-    0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-    0x00, 0x00, 0x00, 0x00,
-};
-// clang-format on
-
-#endif
@@ -834,6 +834,21 @@ void gr_opengl_zbias(int bias)
 	}
 }

+void gr_opengl_push_texture_matrix(int  /*unit*/)
+{
+
+}
+
+void gr_opengl_pop_texture_matrix(int  /*unit*/)
+{
+
+}
+
+void gr_opengl_translate_texture_matrix(int  /*unit*/, const vec3d * /*shift*/)
+{
+
+}
+
 void gr_opengl_set_line_width(float width)
 {
 	if (width <= 1.0f) {
@@ -1139,6 +1154,10 @@ void opengl_setup_function_pointers()

 	gr_screen.gf_preload			= gr_opengl_preload;

+	gr_screen.gf_push_texture_matrix		= gr_opengl_push_texture_matrix;
+	gr_screen.gf_pop_texture_matrix			= gr_opengl_pop_texture_matrix;
+	gr_screen.gf_translate_texture_matrix	= gr_opengl_translate_texture_matrix;
+
 	gr_screen.gf_set_texture_addressing	= gr_opengl_set_texture_addressing;
 	gr_screen.gf_zbias					= gr_opengl_zbias;
 	gr_screen.gf_set_fill_mode			= gr_opengl_set_fill_mode;
@@ -16,6 +16,8 @@
 #include "globalincs/pstypes.h"
 #include "graphics/grinternal.h"

+const ubyte GL_zero_3ub[3] = { 0, 0, 0 };
+
 bool gr_opengl_init(std::unique_ptr<os::GraphicsOperations>&& graphicsOps);
 void gr_opengl_cleanup(bool closing, int minimize=1);
 int opengl_check_for_errors(const char *err_at = NULL);
@@ -37,7 +37,7 @@ void opengl_clear_deferred_buffers()

 	opengl_shader_set_current( gr_opengl_maybe_create_shader(SDR_TYPE_DEFERRED_CLEAR, 0) );

-	opengl_draw_full_screen_textured(0.0f, 0.0f, 1.0f, 1.0f);
+	opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f);

 	opengl_shader_set_current();

@@ -149,6 +149,7 @@ void gr_opengl_deferred_lighting_finish()

 		header->invScreenWidth = 1.0f / gr_screen.max_w;
 		header->invScreenHeight = 1.0f / gr_screen.max_h;
+		header->specFactor = Cmdline_ogl_spec;

 		// Only the first directional light uses shaders so we need to know when we already saw that light
 		bool first_directional = true;
@@ -262,7 +263,7 @@ void gr_opengl_deferred_lighting_finish()
 									   uniformAligner.getOffset(element_index),
 									   sizeof(graphics::deferred_light_data),
 									   buffer->bufferHandle());
-				opengl_draw_full_screen_textured(0.0f, 0.0f, 1.0f, 1.0f);
+				opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f);
 				++element_index;
 				break;
 			case Light_Type::Cone:
@@ -334,7 +335,7 @@ void gr_opengl_deferred_lighting_finish()
 		Current_shader->program->Uniforms.setUniformf("zNear", Min_draw_distance);
 		Current_shader->program->Uniforms.setUniformf("zFar", Max_draw_distance);

-		opengl_draw_full_screen_textured(0.0f, 0.0f, 1.0f, 1.0f);
+		opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f);
 	} else {
 		// Transfer the resolved lighting back to the color texture
 		// TODO: Maybe this could be improved so that it doesn't require the copy back operation?
@@ -46,6 +46,9 @@ int Distortion_switch = 0;
 int Scene_texture_initialized;
 bool Scene_framebuffer_in_frame;

+bool Deferred_lighting = false;
+bool High_dynamic_range = false;
+
 int Scene_texture_width;
 int Scene_texture_height;

@@ -531,7 +534,7 @@ void gr_opengl_scene_texture_end()
 	}

 	if ( Gr_post_processing_enabled && !PostProcessing_override ) {
-		gr_opengl_post_process_end();
+		gr_post_process_end();
 	} else {
 		GR_DEBUG_SCOPE("Draw scene texture");
 		TRACE_SCOPE(tracing::DrawSceneTexture);
@@ -548,7 +551,7 @@ void gr_opengl_scene_texture_end()
 		glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
 		glClear(GL_COLOR_BUFFER_BIT);

-		opengl_shader_set_passthrough(true, High_dynamic_range);
+		opengl_shader_set_passthrough(true);

 		GL_state.Array.BindArrayBuffer(0);

@@ -647,7 +650,7 @@ void gr_opengl_update_distortion()
 	GLboolean blend = GL_state.Blend(GL_FALSE);
 	GLboolean cull = GL_state.CullFace(GL_FALSE);

-	opengl_shader_set_passthrough(true, High_dynamic_range);
+	opengl_shader_set_passthrough(true);

 	GL_state.PushFramebufferState();
 	GL_state.BindFrameBuffer(Distortion_framebuffer);
@@ -692,7 +695,7 @@ void gr_opengl_update_distortion()

 	opengl_render_primitives_immediate(PRIM_TYPE_TRISTRIP, &vert_def, 4, vertices, sizeof(vertex) * 4);

-	opengl_shader_set_passthrough(false, High_dynamic_range);
+	opengl_shader_set_passthrough(false);

 	vertex distortion_verts[33];

@@ -861,25 +864,7 @@ void opengl_draw_textured_quad(GLfloat x1,
 	vert_def.add_vertex_component(vertex_format_data::POSITION2, sizeof(GLfloat) * 4, 0);
 	vert_def.add_vertex_component(vertex_format_data::TEX_COORD2, sizeof(GLfloat) * 4, sizeof(GLfloat) * 2);

-	opengl_render_primitives_immediate(PRIM_TYPE_TRISTRIP, &vert_def, 4, glVertices, sizeof(glVertices));
-}
-
-void opengl_draw_full_screen_textured(GLfloat u1, GLfloat v1, GLfloat u2, GLfloat v2)
-{
-	GR_DEBUG_SCOPE("Draw full screen triangle");
-
-	GLfloat glVertices[3][4] = {
-	    {-1.f, -1.f, u1, v1},
-	    {3.f, -1.f, u2 * 2.f, v1},
-	    {-1.f, 3.f, u1, v2 * 2.f},
-	};
-
-	vertex_layout vert_def;
-
-	vert_def.add_vertex_component(vertex_format_data::POSITION2, sizeof(GLfloat) * 4, 0);
-	vert_def.add_vertex_component(vertex_format_data::TEX_COORD2, sizeof(GLfloat) * 4, sizeof(GLfloat) * 2);
-
-	opengl_render_primitives_immediate(PRIM_TYPE_TRIS, &vert_def, 3, glVertices, sizeof(glVertices));
+	opengl_render_primitives_immediate(PRIM_TYPE_TRISTRIP, &vert_def, 4, glVertices, sizeof(GLfloat) * 4 * 4);
 }

 void gr_opengl_render_decals(decal_material* material_info,
@@ -32,6 +32,9 @@ extern GLuint Scene_stencil_buffer;

 void gr_opengl_update_distortion();

+void opengl_set_spec_mapping(int tmap_type, float *u_scale, float *v_scale, int stage = 0);
+void opengl_reset_spec_mapping();
+
 void gr_opengl_sphere(material *material_def, float rad);

 void gr_opengl_shadow_map_start(matrix4 *shadow_view_matrix, const matrix *light_orient);
@@ -61,20 +64,6 @@ void gr_opengl_render_rocket_primitives(interface_material* material_info, primi
 void opengl_draw_textured_quad(GLfloat x1, GLfloat y1, GLfloat u1, GLfloat v1,
 							   GLfloat x2, GLfloat y2, GLfloat u2, GLfloat v2 );

-/**
- * @brief Draw "something" so that the entire screen is covered and the corners use the UV values that are provided.
- *
- * @details This actually draws a a single oversized triangle that covers the screen in such a way so that the provided
- * UV values are generated by the GPU in the corners of the screen. This is better than drawing two triangles since then
- * the diagonal would be shaded differently for the two triangles causing visual differences.
- *
- * @param u1 The U value of the lower left corner.
- * @param v1 The V value of the lower left corner.
- * @param u2 The U value of the upper right corner.
- * @param v2 The V value of the upper right corner.
- */
-void opengl_draw_full_screen_textured(GLfloat u1, GLfloat v1, GLfloat u2, GLfloat v2);
-
 inline GLenum opengl_primitive_type(primitive_type prim_type);

 void gr_opengl_start_decal_pass();
@@ -93,4 +82,9 @@ extern int Scene_texture_height;
 extern float Scene_texture_u_scale;
 extern float Scene_texture_v_scale;

+extern bool Deferred_lighting;
+extern bool High_dynamic_range;
+
+extern bool Use_Shaders_for_effect_rendering;
+
 #endif	// !GR_OPENGLDRAW_H
@@ -1,17 +1,12 @@

-#include "gropenglpostprocessing.h"
-
-#include "ShaderProgram.h"
-#include "SmaaAreaTex.h"
-#include "SmaaSearchTex.h"
-#include "freespace.h"
-#include "gropengl.h"
-#include "gropengldraw.h"
-#include "gropenglshader.h"
-#include "gropenglstate.h"
-
 #include "cmdline/cmdline.h"
+#include "freespace.h"
 #include "def_files/def_files.h"
+#include "gropengl.h"
+#include "gropengldraw.h"
+#include "gropenglpostprocessing.h"
+#include "gropenglshader.h"
+#include "gropenglstate.h"
 #include "io/timer.h"
 #include "lighting/lighting.h"
 #include "mod_table/mod_table.h"
@@ -19,6 +14,8 @@
 #include "parse/parselo.h"
 #include "ship/ship.h"
 #include "tracing/tracing.h"
+#include "ShaderProgram.h"
+

 extern bool PostProcessing_override;
 extern int opengl_check_framebuffer();
@@ -78,18 +75,6 @@ static GLuint Post_framebuffer_id[2] = { 0 };
 static int Post_texture_width = 0;
 static int Post_texture_height = 0;

-static GLuint Smaa_edge_detection_fb = 0;
-static GLuint Smaa_edges_tex         = 0;
-
-static GLuint Smaa_blending_weight_fb = 0;
-static GLuint Smaa_blend_tex          = 0;
-
-static GLuint Smaa_neighborhood_blending_fb = 0;
-static GLuint Smaa_output_tex               = 0;
-
-static GLuint Smaa_search_tex = 0;
-static GLuint Smaa_area_tex   = 0;
-
 void opengl_post_pass_tonemap()
 {
 	GR_DEBUG_SCOPE("Tonemapping");
@@ -104,7 +89,7 @@ void opengl_post_pass_tonemap()

 	GL_state.Texture.Enable(0, GL_TEXTURE_2D, Scene_color_texture);

-	opengl_draw_full_screen_textured(0.0f, 0.0f, Scene_texture_u_scale, Scene_texture_u_scale);
+	opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, Scene_texture_u_scale, Scene_texture_u_scale);
 }

 void opengl_post_pass_bloom()
@@ -139,7 +124,7 @@ void opengl_post_pass_bloom()

 		GL_state.Texture.Enable(0, GL_TEXTURE_2D, Scene_color_texture);

-		opengl_draw_full_screen_textured(0.0f, 0.0f, 1.0f, 1.0f);
+		opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f);
 	}
 	// ------ end bright pass ------

@@ -179,7 +164,7 @@ void opengl_post_pass_bloom()

 				glViewport(0, 0, bloom_width, bloom_height);

-				opengl_draw_full_screen_textured(0.0f, 0.0f, 1.0f, 1.0f);
+				opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f);
 			}
 		}
 	}
@@ -203,7 +188,7 @@ void opengl_post_pass_bloom()

 		glViewport(0, 0, gr_screen.max_w, gr_screen.max_h);

-		opengl_draw_full_screen_textured(0.0f, 0.0f, 1.0f, 1.0f);
+		opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f);

 		GL_state.SetAlphaBlendMode(ALPHA_BLEND_NONE);
 	}
@@ -278,7 +263,7 @@ void opengl_post_pass_fxaa() {

 	GL_state.Texture.Enable(0, GL_TEXTURE_2D, Scene_ldr_texture);

-	opengl_draw_full_screen_textured(0.0f, 0.0f, Scene_texture_u_scale, Scene_texture_u_scale);
+	opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, Scene_texture_u_scale, Scene_texture_u_scale);

 	// set and configure post shader ..
 	opengl_shader_set_current( gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_FXAA, 0) );
@@ -292,124 +277,11 @@ void opengl_post_pass_fxaa() {

 	GL_state.Texture.Enable(0, GL_TEXTURE_2D, Scene_luminance_texture);

-	opengl_draw_full_screen_textured(0.0f, 0.0f, Scene_texture_u_scale, Scene_texture_u_scale);
+	opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, Scene_texture_u_scale, Scene_texture_u_scale);

 	opengl_shader_set_current();
 }

-static void smaa_detect_edges()
-{
-	GR_DEBUG_SCOPE("SMAA Detect Edges");
-	TRACE_SCOPE(tracing::SMAAEdgeDetection);
-
-	GL_state.BindFrameBuffer(Smaa_edge_detection_fb);
-
-	GLfloat clearValues[] = {0.0f, 0.0f, 0.0f, 1.0f};
-	glClearBufferfv(GL_COLOR, 0, clearValues);
-
-	// Do the edge detection step
-	opengl_shader_set_current(gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_SMAA_EDGE, 0));
-
-	// basic/default uniforms
-	Current_shader->program->Uniforms.setUniformi("colorTex", 0);
-	Current_shader->program->Uniforms.setUniform2f("smaa_rt_metrics", i2fl(Post_texture_width),
-	                                               i2fl(Post_texture_height));
-
-	GL_state.Texture.Enable(0, GL_TEXTURE_2D, Scene_ldr_texture);
-
-	opengl_draw_full_screen_textured(0.0f, 0.0f, Scene_texture_u_scale, Scene_texture_u_scale);
-}
-
-static void smaa_calculate_blending_weights()
-{
-	GR_DEBUG_SCOPE("SMAA Blending Weights calculation");
-	TRACE_SCOPE(tracing::SMAACalculateBlendingWeights);
-
-	GL_state.BindFrameBuffer(Smaa_blending_weight_fb);
-
-	GLfloat clearValues[] = {0.0f, 0.0f, 0.0f, 1.0f};
-	glClearBufferfv(GL_COLOR, 0, clearValues);
-
-	// Do the edge detection step
-	opengl_shader_set_current(gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_SMAA_BLENDING_WEIGHT, 0));
-
-	// basic/default uniforms
-	Current_shader->program->Uniforms.setUniformi("edgesTex", 0);
-	Current_shader->program->Uniforms.setUniformi("areaTex", 1);
-	Current_shader->program->Uniforms.setUniformi("searchTex", 2);
-	Current_shader->program->Uniforms.setUniform2f("smaa_rt_metrics", i2fl(Post_texture_width),
-	                                               i2fl(Post_texture_height));
-
-	GL_state.Texture.Enable(0, GL_TEXTURE_2D, Smaa_edges_tex);
-	GL_state.Texture.Enable(1, GL_TEXTURE_2D, Smaa_area_tex);
-	GL_state.Texture.Enable(2, GL_TEXTURE_2D, Smaa_search_tex);
-
-	opengl_draw_full_screen_textured(0.0f, 0.0f, Scene_texture_u_scale, Scene_texture_u_scale);
-}
-
-static void smaa_neighborhood_blending()
-{
-	GR_DEBUG_SCOPE("SMAA Neighborhood Blending");
-	TRACE_SCOPE(tracing::SMAANeighborhoodBlending);
-
-	GL_state.BindFrameBuffer(Smaa_neighborhood_blending_fb);
-
-	GLfloat clearValues[] = {0.0f, 0.0f, 0.0f, 1.0f};
-	glClearBufferfv(GL_COLOR, 0, clearValues);
-
-	// Do the edge detection step
-	opengl_shader_set_current(gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_SMAA_NEIGHBORHOOD_BLENDING, 0));
-
-	// basic/default uniforms
-	Current_shader->program->Uniforms.setUniformi("colorTex", 0);
-	Current_shader->program->Uniforms.setUniformi("blendTex", 1);
-	Current_shader->program->Uniforms.setUniform2f("smaa_rt_metrics", i2fl(Post_texture_width),
-	                                               i2fl(Post_texture_height));
-
-	GL_state.Texture.Enable(0, GL_TEXTURE_2D, Scene_ldr_texture);
-	GL_state.Texture.Enable(1, GL_TEXTURE_2D, Smaa_blend_tex);
-
-	opengl_draw_full_screen_textured(0.0f, 0.0f, Scene_texture_u_scale, Scene_texture_u_scale);
-}
-
-void smaa_resolve()
-{
-	GR_DEBUG_SCOPE("SMAA Resolve");
-	TRACE_SCOPE(tracing::SMAAResolve);
-
-	opengl_shader_set_passthrough(true, false);
-	GL_state.Texture.Enable(0, GL_TEXTURE_2D, Smaa_output_tex);
-
-	// Copy SMAA output back to the original framebuffer
-	if (GL_rendering_to_texture) {
-		opengl_draw_textured_quad(0.0f, 0.0f, 0.0f, 0.0f, (float)gr_screen.max_w, (float)gr_screen.max_h,
-		                          Scene_texture_u_scale, Scene_texture_v_scale);
-	} else {
-		opengl_draw_textured_quad(0.0f, 0.0f, 0.0f, Scene_texture_v_scale, (float)gr_screen.max_w,
-		                          (float)gr_screen.max_h, Scene_texture_u_scale, 0.0f);
-	}
-}
-
-void opengl_post_pass_smaa()
-{
-	GR_DEBUG_SCOPE("SMAA");
-	TRACE_SCOPE(tracing::SMAA);
-
-	GL_state.PushFramebufferState();
-
-	GL_state.ColorMask(true, true, true, true);
-
-	smaa_detect_edges();
-
-	smaa_calculate_blending_weights();
-
-	smaa_neighborhood_blending();
-
-	GL_state.PopFramebufferState();
-
-	smaa_resolve();
-}
-
 extern GLuint Shadow_map_depth_texture;
 extern GLuint Scene_depth_texture;
 extern GLuint Cockpit_depth_texture;
@@ -460,7 +332,7 @@ void opengl_post_lightshafts()
 				GL_state.Blend(GL_TRUE);
 				GL_state.SetAlphaBlendMode(ALPHA_BLEND_ADDITIVE);

-				opengl_draw_full_screen_textured(0.0f, 0.0f, Scene_texture_u_scale, Scene_texture_u_scale);
+				opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, Scene_texture_u_scale, Scene_texture_u_scale);

 				GL_state.Blend(GL_FALSE);
 				break;
@@ -490,14 +362,10 @@ void gr_opengl_post_process_end()
 	// do tone mapping
 	opengl_post_pass_tonemap();

-	// Do Post processing AA
-	if (!GL_rendering_to_texture) {
-		if (gr_is_smaa_mode(Gr_aa_mode)) {
-			opengl_post_pass_smaa();
-		} else if (gr_is_fxaa_mode(Gr_aa_mode) && !fxaa_unavailable) {
-			opengl_post_pass_fxaa();
-		}
-	}
+    // Do FXAA
+    if (gr_is_fxaa_mode(Gr_aa_mode) && !fxaa_unavailable && !GL_rendering_to_texture) {
+        opengl_post_pass_fxaa();
+    }

 	// render lightshafts
 	opengl_post_lightshafts();
@@ -554,7 +422,7 @@ void gr_opengl_post_process_end()

 	GL_state.Texture.Enable(1, GL_TEXTURE_2D, Scene_depth_texture);

-	opengl_draw_full_screen_textured(0.0f, 0.0f, Scene_texture_u_scale, Scene_texture_u_scale);
+	opengl_draw_textured_quad(-1.0f, -1.0f, 0.0f, 0.0f, 1.0f, 1.0f, Scene_texture_u_scale, Scene_texture_u_scale);

 	//Shadow Map debug window
 //#define SHADOW_DEBUG
@@ -837,58 +705,9 @@ static bool opengl_post_init_table()
 	}
 }

-static void set_fxaa_defines(SCP_stringstream& sflags)
+void opengl_post_shader_header(SCP_stringstream &sflags, shader_type shader_t, int flags)
 {
-	// Since we require OpenGL 3.2 we always have support for GLSL 130
-	sflags << "#define FXAA_GLSL_120 0\n";
-	sflags << "#define FXAA_GLSL_130 1\n";
-
-	if (GLSL_version >= 400) {
-		// The gather function became part of the standard with GLSL 4.00
-		sflags << "#define FXAA_GATHER4_ALPHA 1\n";
-	}
-
-	switch (Gr_aa_mode) {
-	case AntiAliasMode::None:
-		sflags << "#define FXAA_QUALITY_PRESET 10\n";
-		sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD (1.0/6.0)\n";
-		sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD_MIN (1.0/12.0)\n";
-		sflags << "#define FXAA_QUALITY_SUBPIX 0.33\n";
-		break;
-	case AntiAliasMode::FXAA_Low:
-		sflags << "#define FXAA_QUALITY_PRESET 12\n";
-		sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD (1.0/8.0)\n";
-		sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD_MIN (1.0/16.0)\n";
-		sflags << "#define FXAA_QUALITY_SUBPIX 0.33\n";
-		break;
-	case AntiAliasMode::FXAA_Medium:
-		sflags << "#define FXAA_QUALITY_PRESET 26\n";
-		sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD (1.0/12.0)\n";
-		sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD_MIN (1.0/24.0)\n";
-		sflags << "#define FXAA_QUALITY_SUBPIX 0.33\n";
-		break;
-	case AntiAliasMode::FXAA_High:
-		sflags << "#define FXAA_QUALITY_PRESET 39\n";
-		sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD (1.0/15.0)\n";
-		sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD_MIN (1.0/32.0)\n";
-		sflags << "#define FXAA_QUALITY_SUBPIX 0.33\n";
-		break;
-	default:
-		UNREACHABLE("Unhandled FXAA mode!");
-	}
-}
-void set_smaa_defines(SCP_stringstream& sflags)
-{
-	// Define what GLSL version we use
-	if (GLSL_version >= 400) {
-		sflags << "#define SMAA_GLSL_4\n";
-	} else {
-		sflags << "#define SMAA_GLSL_3\n";
-	}
-}
-void opengl_post_shader_header(SCP_stringstream& sflags, shader_type shader_t, int flags)
-{
-	if (shader_t == SDR_TYPE_POST_PROCESS_MAIN) {
+	if ( shader_t == SDR_TYPE_POST_PROCESS_MAIN ) {
 		for (size_t idx = 0; idx < Post_effects.size(); idx++) {
 			if (flags & (1 << idx)) {
 				sflags << "#define ";
@@ -896,15 +715,46 @@ void opengl_post_shader_header(SCP_stringstream& sflags, shader_type shader_t, i
 				sflags << "\n";
 			}
 		}
-	} else if (shader_t == SDR_TYPE_POST_PROCESS_LIGHTSHAFTS) {
+	} else if ( shader_t == SDR_TYPE_POST_PROCESS_LIGHTSHAFTS ) {
 		char temp[64];
 		sprintf(temp, "#define SAMPLE_NUM %d\n", ls_samplenum);
 		sflags << temp;
-	} else if (shader_t == SDR_TYPE_POST_PROCESS_FXAA) {
-		set_fxaa_defines(sflags);
-	} else if (shader_t == SDR_TYPE_POST_PROCESS_SMAA_EDGE || shader_t == SDR_TYPE_POST_PROCESS_SMAA_BLENDING_WEIGHT ||
-	           shader_t == SDR_TYPE_POST_PROCESS_SMAA_NEIGHBORHOOD_BLENDING) {
-		set_smaa_defines(sflags);
+	} else if ( shader_t == SDR_TYPE_POST_PROCESS_FXAA ) {
+		// Since we require OpenGL 3.2 we always have support for GLSL 130
+		sflags << "#define FXAA_GLSL_120 0\n";
+		sflags << "#define FXAA_GLSL_130 1\n";
+
+		if (GLSL_version >= 400) {
+			// The gather function became part of the standard with GLSL 4.00
+			sflags << "#define FXAA_GATHER4_ALPHA 1\n";
+		}
+
+		switch (Gr_aa_mode) {
+		case AntiAliasMode::None:
+			sflags << "#define FXAA_QUALITY_PRESET 10\n";
+			sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD (1.0/6.0)\n";
+			sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD_MIN (1.0/12.0)\n";
+			sflags << "#define FXAA_QUALITY_SUBPIX 0.33\n";
+			break;
+		case AntiAliasMode::FXAA_Low:
+			sflags << "#define FXAA_QUALITY_PRESET 12\n";
+			sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD (1.0/8.0)\n";
+			sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD_MIN (1.0/16.0)\n";
+			sflags << "#define FXAA_QUALITY_SUBPIX 0.33\n";
+			break;
+		case AntiAliasMode::FXAA_Medium:
+			sflags << "#define FXAA_QUALITY_PRESET 26\n";
+			sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD (1.0/12.0)\n";
+			sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD_MIN (1.0/24.0)\n";
+			sflags << "#define FXAA_QUALITY_SUBPIX 0.33\n";
+			break;
+		case AntiAliasMode::FXAA_High:
+			sflags << "#define FXAA_QUALITY_PRESET 39\n";
+			sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD (1.0/15.0)\n";
+			sflags << "#define FXAA_QUALITY_EDGE_THRESHOLD_MIN (1.0/32.0)\n";
+			sflags << "#define FXAA_QUALITY_SUBPIX 0.33\n";
+			break;
+		}
 	}
 }

@@ -933,17 +783,11 @@ bool opengl_post_init_shaders()
 		Cmdline_bloom_intensity = 0;
 	}

-	if (gr_is_fxaa_mode(Gr_aa_mode))
-	{
-		gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_FXAA, 0);
-		gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_FXAA_PREPASS, 0);
-	}
-
-	if (gr_is_smaa_mode(Gr_aa_mode)) {
-		// Precompile the SMAA shaders if enabled
-		gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_SMAA_EDGE, 0);
-		gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_SMAA_BLENDING_WEIGHT, 0);
-		gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_SMAA_NEIGHBORHOOD_BLENDING, 0);
+	if ( gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_FXAA, 0) < 0 ||
+		gr_opengl_maybe_create_shader(SDR_TYPE_POST_PROCESS_FXAA_PREPASS, 0) < 0 ) {
+		Gr_aa_mode = AntiAliasMode::None;
+		fxaa_unavailable = true;
+		mprintf(("Error while compiling FXAA shaders. FXAA will be unavailable.\n"));
 	}

 	return true;
@@ -981,148 +825,6 @@ void opengl_setup_bloom_textures()
 	GL_state.BindFrameBuffer(0);
 }

-void setup_smaa_edges_resources()
-{
-	glGenTextures(1, &Smaa_edges_tex);
-
-	GL_state.Texture.SetActiveUnit(0);
-	GL_state.Texture.SetTarget(GL_TEXTURE_2D);
-	GL_state.Texture.Enable(Smaa_edges_tex);
-
-	opengl_set_object_label(GL_TEXTURE, Smaa_edges_tex, "SMAA Edge detection texture");
-
-	if (GLAD_GL_ARB_texture_storage) {
-		glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, Post_texture_width, Post_texture_height);
-	} else {
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, Post_texture_width, Post_texture_height, 0, GL_BGRA, GL_UNSIGNED_BYTE,
-		             nullptr);
-	}
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-	glGenFramebuffers(1, &Smaa_edge_detection_fb);
-	GL_state.BindFrameBuffer(Smaa_edge_detection_fb);
-	opengl_set_object_label(GL_FRAMEBUFFER, Smaa_edge_detection_fb, "SMAA Edge detection framebuffer");
-
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, Smaa_edges_tex, 0);
-
-	glDrawBuffer(GL_COLOR_ATTACHMENT0);
-}
-
-void setup_smaa_blending_weight_resources()
-{
-	glGenTextures(1, &Smaa_blend_tex);
-
-	GL_state.Texture.SetActiveUnit(0);
-	GL_state.Texture.SetTarget(GL_TEXTURE_2D);
-	GL_state.Texture.Enable(Smaa_blend_tex);
-
-	opengl_set_object_label(GL_TEXTURE, Smaa_blend_tex, "SMAA Blending weight calculation texture");
-
-	if (GLAD_GL_ARB_texture_storage) {
-		glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, Post_texture_width, Post_texture_height);
-	} else {
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, Post_texture_width, Post_texture_height, 0, GL_BGRA, GL_UNSIGNED_BYTE,
-		             nullptr);
-	}
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-	glGenFramebuffers(1, &Smaa_blending_weight_fb);
-	GL_state.BindFrameBuffer(Smaa_blending_weight_fb);
-	opengl_set_object_label(GL_FRAMEBUFFER, Smaa_blending_weight_fb, "SMAA Blending widght calculation framebuffer");
-
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, Smaa_blend_tex, 0);
-
-	glDrawBuffer(GL_COLOR_ATTACHMENT0);
-}
-
-void setup_smaa_neighborhood_blending_resources()
-{
-	glGenTextures(1, &Smaa_output_tex);
-
-	GL_state.Texture.SetActiveUnit(0);
-	GL_state.Texture.SetTarget(GL_TEXTURE_2D);
-	GL_state.Texture.Enable(Smaa_output_tex);
-
-	opengl_set_object_label(GL_TEXTURE, Smaa_output_tex, "SMAA output texture");
-
-	if (GLAD_GL_ARB_texture_storage) {
-		glTexStorage2D(GL_TEXTURE_2D, 1, GL_RGBA8, Post_texture_width, Post_texture_height);
-	} else {
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, Post_texture_width, Post_texture_height, 0, GL_BGRA, GL_UNSIGNED_BYTE,
-		             nullptr);
-	}
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-	glGenFramebuffers(1, &Smaa_neighborhood_blending_fb);
-	GL_state.BindFrameBuffer(Smaa_neighborhood_blending_fb);
-	opengl_set_object_label(GL_FRAMEBUFFER, Smaa_neighborhood_blending_fb, "SMAA neighborhood blending framebuffer");
-
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, Smaa_output_tex, 0);
-
-	glDrawBuffer(GL_COLOR_ATTACHMENT0);
-}
-
-static GLuint load_smaa_texture(GLsizei width, GLsizei height, GLenum format, const uint8_t* pixels, const char* name)
-{
-	GLuint tex;
-	glGenTextures(1, &tex);
-
-	GL_state.Texture.SetActiveUnit(0);
-	GL_state.Texture.SetTarget(GL_TEXTURE_2D);
-	GL_state.Texture.Enable(tex);
-
-	opengl_set_object_label(GL_TEXTURE, tex, name);
-
-	if (GLAD_GL_ARB_texture_storage) {
-		glTexStorage2D(GL_TEXTURE_2D, 1, format, width, height);
-	} else {
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
-		glTexImage2D(GL_TEXTURE_2D, 0, format, Post_texture_width, Post_texture_height, 0, GL_BGRA, GL_UNSIGNED_BYTE,
-		             nullptr);
-	}
-	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, format == GL_RG8 ? GL_RG : GL_RED, GL_UNSIGNED_BYTE, pixels);
-
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
-	return tex;
-}
-
-static void setup_smaa_resources()
-{
-	GL_state.PushFramebufferState();
-
-	Smaa_area_tex = load_smaa_texture(AREATEX_WIDTH, AREATEX_HEIGHT, GL_RG8, areaTexBytes, "SMAA Area Texture");
-	Smaa_search_tex =
-	    load_smaa_texture(SEARCHTEX_WIDTH, SEARCHTEX_HEIGHT, GL_R8, searchTexBytes, "SMAA Search Texture");
-
-	setup_smaa_edges_resources();
-
-	setup_smaa_blending_weight_resources();
-
-	setup_smaa_neighborhood_blending_resources();
-
-	GL_state.PopFramebufferState();
-}
-
 // generate and test the framebuffer and textures that we are going to use
 static bool opengl_post_init_framebuffer()
 {
@@ -1142,10 +844,6 @@ static bool opengl_post_init_framebuffer()

 	opengl_setup_bloom_textures();

-	if (gr_is_smaa_mode(Gr_aa_mode)) {
-		setup_smaa_resources();
-	}
-
 	GL_state.BindFrameBuffer(0);

 	rval = true;
@@ -2,9 +2,6 @@
 #ifndef _GROPENGLPOSTPROCESSING_H
 #define _GROPENGLPOSTPROCESSING_H

-#include "globalincs/pstypes.h"
-#include "graphics/opengl/gropenglshader.h"
-
 void opengl_post_process_init();
 void opengl_post_process_shutdown();

@@ -143,15 +143,6 @@ static opengl_shader_type_t GL_shader_types[] = {

 	{ SDR_TYPE_ROCKET_UI, "rocketui-v.sdr",	"rocketui-f.sdr", nullptr,
 		{ opengl_vert_attrib::POSITION, opengl_vert_attrib::COLOR, opengl_vert_attrib::TEXCOORD }, "libRocket UI" },
-
-	{ SDR_TYPE_POST_PROCESS_SMAA_EDGE, "smaa-edge-v.sdr", "smaa-edge-f.sdr", nullptr,
-		{ opengl_vert_attrib::POSITION, opengl_vert_attrib::TEXCOORD }, "SMAA Edge detection" },
-
-	{ SDR_TYPE_POST_PROCESS_SMAA_BLENDING_WEIGHT, "smaa-blend-v.sdr", "smaa-blend-f.sdr", nullptr,
-		{ opengl_vert_attrib::POSITION, opengl_vert_attrib::TEXCOORD }, "SMAA Blending weight calculation" },
-
-	{ SDR_TYPE_POST_PROCESS_SMAA_NEIGHBORHOOD_BLENDING, "smaa-neighbour-v.sdr", "smaa-neighbour-f.sdr", nullptr,
-		{ opengl_vert_attrib::POSITION, opengl_vert_attrib::TEXCOORD }, "SMAA Neighborhood Blending" },
 };
 // clang-format on

@@ -379,13 +370,11 @@ static SCP_string opengl_shader_get_header(shader_type type_id, int flags, bool
 		sflags << "#define HAS_GEOMETRY_SHADER\n";
 	}

-	if (type_id == SDR_TYPE_POST_PROCESS_MAIN || type_id == SDR_TYPE_POST_PROCESS_LIGHTSHAFTS ||
-	    type_id == SDR_TYPE_POST_PROCESS_FXAA || type_id == SDR_TYPE_POST_PROCESS_SMAA_EDGE ||
-	    type_id == SDR_TYPE_POST_PROCESS_SMAA_BLENDING_WEIGHT ||
-	    type_id == SDR_TYPE_POST_PROCESS_SMAA_NEIGHBORHOOD_BLENDING) {
+	if (type_id == SDR_TYPE_POST_PROCESS_MAIN || type_id == SDR_TYPE_POST_PROCESS_LIGHTSHAFTS || type_id == SDR_TYPE_POST_PROCESS_FXAA) {
 		// ignore looking for variants. main post process, lightshafts, and FXAA shaders need special headers to be hacked in
 		opengl_post_shader_header(sflags, type_id, flags);
-	} else {
+	}
+	else {
 		for (int i = 0; i < GL_num_shader_variants; ++i) {
 			opengl_shader_variant_t &variant = GL_shader_variants[i];

@@ -894,20 +883,6 @@ static void opengl_purge_shader_cache_type(const char* ext) {
 	SCP_string filter("*.");
 	filter += ext;

-	// Previously the cache files were stored in the mod directory. Since we have a better system now, those files
-	// should be cleaned out. This is only needed if we have a mod directory since otherwise we would delete the actual
-	// cache files
-	if (Cmdline_mod != nullptr && strlen(Cmdline_mod) > 0) {
-		SCP_vector<SCP_string> cache_files;
-		cf_get_file_list(cache_files, CF_TYPE_CACHE, filter.c_str(), CF_SORT_NONE, nullptr,
-		                 CF_LOCATION_TYPE_PRIMARY_MOD | CF_LOCATION_TYPE_SECONDARY_MODS);
-
-		for (auto& file : cache_files) {
-			cf_delete((file + "." + ext).c_str(), CF_TYPE_CACHE,
-			          CF_LOCATION_TYPE_PRIMARY_MOD | CF_LOCATION_TYPE_SECONDARY_MODS);
-		}
-	}
-
 	SCP_vector<SCP_string> cache_files;
 	SCP_vector<file_list_info> file_info;
 	cf_get_file_list(cache_files, CF_TYPE_CACHE, filter.c_str(), CF_SORT_NONE, &file_info,
@@ -1003,7 +978,7 @@ GLint opengl_shader_get_attribute(opengl_vert_attrib::attrib_id attribute)
 	return Current_shader->program->getAttributeLocation(attribute);
 }

-void opengl_shader_set_passthrough(bool textured, bool hdr)
+void opengl_shader_set_passthrough(bool textured)
 {
 	opengl_shader_set_current(gr_opengl_maybe_create_shader(SDR_TYPE_PASSTHROUGH_RENDER, 0));

@@ -1015,7 +990,7 @@ void opengl_shader_set_passthrough(bool textured, bool hdr)

 	Current_shader->program->Uniforms.setUniformi("alphaTexture", 0);

-	Current_shader->program->Uniforms.setUniformi("srgb", hdr ? 1 : 0);
+	Current_shader->program->Uniforms.setUniformi("srgb", High_dynamic_range ? 1 : 0);
 	Current_shader->program->Uniforms.setUniformf("intensity", 1.0f);

 	Current_shader->program->Uniforms.setUniformf("alphaThreshold", GL_alpha_threshold);
@@ -156,7 +156,15 @@ int opengl_compile_shader(shader_type sdr, uint flags);

 GLint opengl_shader_get_attribute(opengl_vert_attrib::attrib_id attribute);

-void opengl_shader_set_passthrough(bool textured, bool hdr);
+void opengl_program_check_info_log(GLuint program_object);
+void opengl_shader_check_info_log(GLuint shader_object);
+
+void opengl_shader_compile_deferred_light_shader();
+void opengl_shader_compile_deferred_light_clear_shader();
+
+void opengl_shader_compile_passthrough_shader();
+
+void opengl_shader_set_passthrough(bool textured = true);

 void opengl_shader_set_default_material(bool textured, bool alpha, vec4* clr, float color_scale, uint32_t array_index, const material::clip_plane& clip_plane);

@@ -199,6 +199,7 @@ void opengl_tcache_flush()

 extern void opengl_kill_all_render_targets();

+void opengl_tex_array_storage(GLenum target, GLint levels, GLenum format, GLint width, GLint height, GLint frames);
 void opengl_tcache_shutdown()
 {
 	opengl_kill_all_render_targets();
@@ -87,7 +87,6 @@ void gr_opengl_get_bitmap_from_texture(void* data_out, int bitmap_num);
 size_t opengl_export_render_target( int slot, int width, int height, int alpha, int num_mipmaps, ubyte *image_data );
 void opengl_set_texture_target(GLenum target = GL_TEXTURE_2D);
 void opengl_set_texture_face(GLenum face = GL_TEXTURE_2D);
-void opengl_tex_array_storage(GLenum target, GLint levels, GLenum format, GLint width, GLint height, GLint frames);

 int gr_opengl_tcache_set(int bitmap_handle, int bitmap_type, float *u_scale, float *v_scale, uint32_t *array_index, int stage = 0);
 int gr_opengl_preload(int bitmap_num, int is_aabitmap);
@@ -97,6 +96,4 @@ GLuint opengl_get_rtt_framebuffer();
 void gr_opengl_bm_generate_mip_maps(int slot);
 void gr_opengl_get_texture_scale(int bitmap_handle, float *u_scale, float *v_scale);

-void gr_opengl_update_texture(int bitmap_handle, int bpp, const ubyte* data, int width, int height);
-
 #endif	//_GROPENGLTEXTURE_H
@@ -28,7 +28,7 @@ float Shadow_cascade_distances[MAX_SHADOW_CASCADES];

 light_frustum_info Shadow_frustums[MAX_SHADOW_CASCADES];

-ShadowQuality Shadow_quality = ShadowQuality::Disabled;
+ShadowQuality Shadow_quality;

 auto ShadowQualityOption =
    options::OptionBuilder<ShadowQuality>("Graphics.Shadows", "Shadow Quality", "The quality of the shadows")
@@ -89,7 +89,7 @@ void convert_model_material(model_uniform_data* data_out,
 		CLAMP(data_out->ambientFactor.xyz.y, 0.02f, 1.0f);
 		CLAMP(data_out->ambientFactor.xyz.z, 0.02f, 1.0f);

-		if (material.get_light_factor() > 0.25f && Cmdline_emissive) {
+		if (material.get_light_factor() > 0.25f && !Cmdline_no_emissive) {
 			data_out->emissionFactor.xyz.x = gr_light_emission[0];
 			data_out->emissionFactor.xyz.y = gr_light_emission[1];
 			data_out->emissionFactor.xyz.z = gr_light_emission[2];
@@ -22,6 +22,7 @@ struct deferred_global_data {
 	float middist;
 	float fardist;

+	float specFactor;
 	float invScreenWidth;
 	float invScreenHeight;

@@ -31,7 +31,6 @@
 #include "parse/parselo.h"
 #include "radar/radar.h"
 #include "radar/radardradis.h"
-#include "radar/radarngon.h"
 #include "radar/radarorb.h"
 #include "radar/radarsetup.h"
 #include "ship/ship.h" //for ship struct
@@ -2679,35 +2678,7 @@ void load_gauge_radar_std(gauge_settings* settings)
 		strcpy_s(fname, "2_radar1");
 	}

-	// Ngon radar -- Cyborg17 - to fit this into gauge_load_common, we have to have this right before origin and Offset
-	int num_sides = 0;
-	float offset  = 0.0f;
-
-	if (optional_string("Ngon Sides:")) {
-		stuff_int(&num_sides);
-		if ((num_sides < RADAR_NGON_MIN_SIDES)) {
-			Warning(LOCATION,
-			        "Invalid value for 'Ngon Sides'! Value must be greater than %i.\n Using standard radar instead.\n",
-			        RADAR_NGON_MIN_SIDES);
-			num_sides = 0;
-		}
-
-		if (optional_string("Ngon Offset:")) {
-			stuff_float(&offset);
-		}
-	}
-
-	//=======================================================================================================
-	// Cyborg17 - not using auto here is a huge pain to get exactly right and to read. If we put this in a
-	// normal if block, either auto will break or hud_gauge will go out of scope before the last block below.
-	// The ternery operator lets us circumvent this problem by allowing us to use auto, while also loading
-	// the radar, creating the unique_ptr, and staying in scope.
-
-	// did we have a normal radar? If so, load the regular radar.
-	auto hud_gauge = (num_sides == 0)
-	                     ? gauge_load_common<HudGaugeRadarStd>(settings)
-	                     // if not *construct* and then load the ngon radar
-	                     : gauge_load_common<HudGaugeRadarNgon>(settings, new HudGaugeRadarNgon(num_sides, offset));
+	auto hud_gauge = gauge_load_common<HudGaugeRadarStd>(settings);

 	if(optional_string("Filename:")) {
 		stuff_string(fname, F_NAME, MAX_FILENAME_LEN);
@@ -2727,7 +2698,7 @@ void load_gauge_radar_std(gauge_settings* settings)
 	if(optional_string("Short Distance Offsets:")) {
 		stuff_int_list(Radar_dist_offsets[0], 2);
 	}
-	
+
 	// Only load this if the user hasn't specified a preference
 	if (Cmdline_orb_radar == 0) {
 		hud_gauge->initBitmaps(fname);
@@ -647,12 +647,7 @@ void HudGaugeTargetBox::renderTargetShip(object *target_objp)
 		if ( Player_ai->targeted_subsys == Player_ai->last_subsys_target ) {
 			vec3d save_pos;

-			if (gr_screen.rendering_to_texture != -1) {
-				gr_set_screen_scale(canvas_w, canvas_h, -1, -1, target_w, target_h, target_w, target_h, true);
-			} else {
-				gr_set_screen_scale(base_w, base_h);
-			}
-			
+			gr_set_screen_scale(base_w, base_h);
 			save_pos = target_objp->pos;
 			target_objp->pos = obj_pos;
 			subsys_in_view = hud_targetbox_subsystem_in_view(target_objp, &sx, &sy);
@@ -484,6 +484,10 @@ void iff_init()
 				}
 			}
 		}
+
+		// add tbl/tbm to multiplayer validation list
+		extern void fs2netd_add_table_validation(const char *tblname);
+		fs2netd_add_table_validation("iff_defs.tbl");
 	}
 	catch (const parse::ParseException& e)
 	{