Automated build commit

Move build system to CMake
2026-11-09 04:49:39 -10:00 · 2016-07-22 11:58:40 +02:00 · 2016-07-21 22:35:17 +02:00
1580 changed files with 118602 additions and 249359 deletions
@@ -1,99 +0,0 @@
---
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: false
-AlignOperands:   true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:   
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   true
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     120
-CommentPragmas:  '^ IWYU pragma:'
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
-  - Regex:           '^(<.*\.(h|hh|hpp)>)$' # Includes of external libraries
-    Priority:        4
-  - Regex:           '^(<.*>)$' # standard library includes (won't match deprecated C headers)
-    Priority:        5
-  - Regex:           '^"[^/]*\.(h)"$' # Local includes
-    Priority:        1
-  - Regex:           '^".*\.(h)"$' # standard engine includes
-    Priority:        2
-  - Regex:           '.*' # Catch all in case something is unhandled above
-    Priority:        3
-IncludeIsMainRegex: '$'
-IndentCaseLabels: false
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Left
-ReflowComments:  true
-SortIncludes:    true
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Cpp11
-TabWidth:        4
-UseTab:          ForIndentation
-...
-
@@ -1,24 +0,0 @@
---
-Checks: "-*,\
-modernize-*,\
-modernize-raw-string-literal,\
-modernize-use-using,\
-modernize-make-unique,\
-performance-*,\
-performance-type-promotion-in-math-fn,\
-misc-*,\
-misc-macro-parentheses,\
-misc-misplaced-widening-cast,\
-misc-static-assert,\
-modernize-make-unique,\
-"
-WarningsAsErrors: ''
-HeaderFilterRegex: 'code/.*$|freespace2/.*$|qtfred/.*$|test/src/.*$|build/.*$'
-AnalyzeTemporaryDtors: false
-CheckOptions:
-  - key:          'misc-assert-side-effect.AssertMacros'
-    value:        'assert,Assert,Assertion'
-  - key:          'modernize-use-emplace.ContainersWithPushBack'
-    value:        'std::vector;std::deque;std::list;SCP_vector;SCP_deque;SCP_list'
-...
-
@@ -1,21 +0,0 @@
-
-build:
-  image: teaci/msys$$arch
-  pull: true
-  shell: mingw$$arch
-  commands:
-    - git submodule update --init --recursive
-    - if [ $$arch = 32 ]; then target=i686; fi
-    - if [ $$arch = 64 ]; then target=x86_64; fi
-    - pacman -S --needed --noconfirm --noprogressbar mingw-w64-${target}-pkg-config mingw-w64-${target}-cmake
-    - mkdir build && cd build
-    - cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=$$CONFIGURATION -DFSO_USE_SPEECH=OFF -DFSO_USE_VOICEREC=OFF -DFSO_FATAL_WARNINGS=ON -DFSO_BUILD_FRED2=OFF ..
-    - make -j$(nproc) all
-
-matrix:
-  arch:
-    - 64
-    - 32
-  CONFIGURATION:
-    - Debug
-    - Release
@@ -2,6 +2,3 @@ root = true

 [*.{h,cpp}]
 indent_style = tab
-
-[*.sdr]
-indent_style = tab
@@ -1,3 +1,33 @@
+*.o
+*.a
+.dirstamp
+libtool
+ltmain.sh
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+compile
+.deps/
+code/.deps/
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.*
+code/fs2_open_*
+code/wxFRED2_*
+configure
+depcomp
+install-sh
+missing
+.svn
+*.layout
+projects/Xcode/Frameworks/
+
+#========
+
 #OS junk files
 [Tt]humbs.db
 *.DS_Store
@@ -26,6 +56,9 @@
 *.unsuccessfulbuild
 ipch/
 [Oo]bj/
+[Bb]in
+[Dd]ebug*/
+[Rr]elease*/
 Ankh.NoLoad
 *.VC.db
 *.VC.VC.opendb
@@ -248,12 +281,3 @@ documentation/doxygen/*

 .idea/*
 projects/*
-/.vs
-CMakeSettings.json
-
-# Weird files created by Linux
-.fuse_hidden*
-
-# This gets ignored by one of the rules above for some reason...
-!/code/scripting/lua/LuaConvert.h
-!/code/debugconsole/
@@ -1,6 +1,6 @@
+[submodule "cmake/external/cotire"]
+	path = cmake/external/cotire
+	url = https://github.com/sakra/cotire.git
 [submodule "cmake/external/rpavlik-cmake-modules"]
 	path = cmake/external/rpavlik-cmake-modules
 	url = https://github.com/asarium/cmake-modules.git
-[submodule "lib/libRocket"]
-	path = lib/libRocket
-	url = https://github.com/asarium/libRocket.git
@@ -1,181 +1,93 @@
-language: bash
+language: generic
 sudo: required
 dist: trusty
 cache:
-  directories:
-    - $HOME/cmake-3.8
-    - $HOME/.ccache
+    directories:
+    - $HOME/cmake
 addons:
-  apt:
-    packages: &global_deps
-      - ninja-build
-      - libopenal-dev
-      - libreadline6-dev
-      - libpng12-dev
-      - libjpeg62-dev
-      - liblua5.1-0-dev
-      - libjansson-dev
-      - libsdl2-dev
-      - libfreetype6-dev
-      - valgrind
-      - qt57base
-  coverity_scan:
-    project:
-      name: "scp-fs2open/fs2open.github.com"
-    notification_email: [email protected]
-    build_command:   "ci/travis/script.sh"
-    # must match TRAVIS_BRANCH check below
-    branch_pattern: coverity_scan
-env:
-  global:
-    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-    #   via the "travis encrypt" command using the project repo's public key
-    #   also note that fork's don't get access to secure keys
-    #   you have to test using a branch in the main repo
-    - secure: "C3wF967ZeliwwP1vC12EMIBOaC568n26Z/cPnwzn317ve59DWH3YSfPZVgvt08GzmaXITGGsJvPB+qxfGoKvQzYE4O1B73q81RpUe5pB3IhF+ThQ91VfQZIRJR5xEGJaLINUlHTTZGX5jxlkVO9wAcauVj/s3b8sQ3dvUZauPvk="
-    # These declarations set INDIEGAMES_USER and INDIEGAMES_PASSWORD for uploading nightly builds to the indiegames server
-    - secure: "lUuRu8XIi8MKNf1ebOfyC4iVEpPyASojJIDWXRo2bNqEF4ILAljXdkVeXeN6H5yKCHD52cxCNTtyePIG/o3p3QEuGSVud9bDS3D7LaQicLETGGrsw3l07U49gF2OKHXGopg0MzBbZUU9QmhoFTAe8t6PV9NDuEayYCheqvTqjZg="
-    - secure: "E/DHLYcPK/hBUqxBYYlUqp5sjgvIqY5A0qRHyQ4bmjsB+WB/Xx71bGCSiF7hk6lTxar1ZI1i5RAXXh9AIvNVaYAIdEOlCP+q3gvwCYuc5naZEKmkxlUCf0oEL4O9Fye93A/3VkFHuBdC1TGPYYf69m4W5r4367wWO9dPRIdWpJA="
-    # These declarations set FS2DOWNLOADS_USER and FS2DOWNLOADS_PASSWORD
-    - secure: "h6GbMX2jLsW1bS9fCM9fthOSJ1nfQQIRWi6EUH2p8u4NFLD5Bfi/C8JhQPKHUzyo3wvKkSHl+PsW7bgr1oXLusRwAur/dtv2N3imqvtbfIz305b00hZlsvbcYmQmUzQFSAdOGShK57JJ5aKQKccaUBP25KqB7Q+JaqBRdaMBS54="
-    - secure: "fUDAPAUUaaYZy8I4zU3SJ0JcK7aw4eb6eTdaEr7LyNyTMSfPgwY6P1MrbSQC0lJNQIUQ5ffjdxE5g7D7OYpoJF9L14ni4UY8t2QASt7kmpgcYihmjeuYy8FQXgmFG8CTxiWBPKTybZJ7voQcvIvRaNG7b2wM9PMfc5lRIondB6c="
+    apt:
+        packages:
+            - ninja-build
+            - libopenal-dev
+            - libogg-dev
+            - libvorbis-dev
+            - libtheora-dev
+            - libreadline6-dev
+            - libpng12-dev
+            - libjpeg62-dev
+            - liblua5.1-0-dev
+            - libjansson-dev
+            - libsdl2-dev
+    coverity_scan:
+        project:
+            name: "scp-fs2open/fs2open.github.com"
+            description: "Coverity via Travis CI"
+        notification_email: [email protected]
+        build_command_prepend: "./autogen.sh --enable-debug"
+        build_command:   "make -j2"
+        # must match TRAVIS_BRANCH check below
+        branch_pattern: coverity_scan
 deploy:
-  - provider: releases
-    api_key:
-      secure: "Wdt4Ccefo7a0ZDjEJQJgpghh7n72FtNJuKSAPUvoz4gtEX6Ct9J8yJI1t9V3jE3CTbbLJ21/Q6eZRDfT7UfNJe5DdepoJsP9DeFhKMWqQCq+AChqQWlm0KeZAffJoJreL8vXYhnRYcLT9ceZHEH6AqwN9TPV+xJziGPISAkYNZ8="
-    skip_cleanup: true
-    file_glob: true
-    file: "/tmp/builds/*"
-    on:
-      condition: '"$RELEASE_BUILD" == true'
-      tags: true
-
-  - provider: script
-    script: bash ci/travis/ftp_deploy.sh
-    on:
-      condition: '"$NIGHTLY_BUILD" == true'
-      tags: true
-
-  - provider: script
-    skip_cleanup: true
-    script: bash ci/travis/ftp_deploy.sh
-    on:
-      condition: $TEST_BUILD = true
-      all_branches: true
-
+    - provider: releases
+      api_key:
+          secure: "bBWEBF+r4p7kea+Lj/vHD0CCW4AsxqlLri8gT3HbsdPuKwdSNU4QLLFk9yAXmmBF2T/fe45Zk+WQrdQJjSydkpG06M7sFD22RKOYv3cLF0Bq0nEG4CpuXoGqo77oFGkA5hdU6D8W2nQTMhPuiqlvhgt3zeD/6fiyfdAztbtKNRs="
+      skip_cleanup: true 
+      file_glob: true
+      file: "/tmp/builds/*"
+      on:
+          condition: '"$RELEASE_BUILD" == true'
+          tags: true
+        
+    - provider: bintray
+      user: asarium
+      key:
+          secure: "JyJIsJFxCvNjmdyG9eDIvkzXFqsJQVzXKp5BeJcn5WSdMA2Vs7dCvarJXomdwe3F3RCrdmrFYCaimiCDD6LqImrcDLzxlevzGlNUv381iFna612SJj672d8iQCgtMibIJ3HzYmgZlsaJ9YcaOuccRyQIV/TNUcwgzbsW27CPEcM="
+      file: ci/bintray.json
+      on:
+          condition: '"$NIGHTLY_BUILD" == true'
+          tags: true
+env:
+    global:
+     # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+     #   via the "travis encrypt" command using the project repo's public key
+     - secure: "C3wF967ZeliwwP1vC12EMIBOaC568n26Z/cPnwzn317ve59DWH3YSfPZVgvt08GzmaXITGGsJvPB+qxfGoKvQzYE4O1B73q81RpUe5pB3IhF+ThQ91VfQZIRJR5xEGJaLINUlHTTZGX5jxlkVO9wAcauVj/s3b8sQ3dvUZauPvk="
 matrix:
-  include:
-    # note that gcc Debug MUST be 1st for Coverity
-    - os: linux
-      env: CONFIGURATION="Debug" CC=gcc-5 CXX=g++-5
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - *global_deps
-            - g++-5
-    - os: linux
-      env: CONFIGURATION="Debug" CC=gcc-8 CXX=g++-8
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - g++-8
-            - *global_deps
-    - os: linux
-      env: CONFIGURATION="Debug" CC=clang-4.0 CXX=clang++-4.0 CMAKE_OPTIONS="-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - *global_deps
-            - clang-4.0
-            - clang-tidy-4.0
-            - libc++-dev
-      script:
-        - ./ci/travis/script.sh
-        - ./ci/travis/clang_tidy.sh
-    - os: osx
-      env: CONFIGURATION="Debug"
-
-    - os: windows
-      env: CONFIGURATION="Debug" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
-    - os: windows
-      env: CONFIGURATION="Debug" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
-
-    - os: linux
-      env: CONFIGURATION="Release" CC=gcc-5 CXX=g++-5
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - *global_deps
-            - g++-5
-    - os: linux
-      env: CONFIGURATION="Release" CC=gcc-8 CXX=g++-8
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - g++-8
-            - *global_deps
-    - os: linux
-      env: CONFIGURATION="Release" CC=clang-4.0 CXX=clang++-4.0
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
-            - sourceline: 'ppa:beineri/opt-qt571-trusty'
-          packages:
-            - *global_deps
-            - clang-4.0
-            - libc++-dev
-    - os: osx
-      env: CONFIGURATION="Release"
-
-    - os: windows
-      env: CONFIGURATION="Release" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
-    - os: windows
-      env: CONFIGURATION="Release" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
-  # As long as Windows is still experimental on Travis CI, allow failures
-  allow_failures:
-    - os: windows
-      env: CONFIGURATION="Debug" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
-    - os: windows
-      env: CONFIGURATION="Debug" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
-    - os: windows
-      env: CONFIGURATION="Release" CMAKE_TOOLSET=v141_xp CMAKE_GENERATOR="Visual Studio 15 2017"
-    - os: windows
-      env: CONFIGURATION="Release" CMAKE_TOOLSET="" CMAKE_GENERATOR="Ninja"
-  fast_finish: true
+    include:
+        # note that gcc Debug MUST be 1st for Coverity
+        - os: linux
+          compiler: gcc
+          env: CONFIGURATION="Debug"
+        - os: linux
+          compiler: clang
+          env: CONFIGURATION="Debug" CC=clang CXX=clang++
+        - os: osx
+          compiler: clang
+          env: CONFIGURATION="Debug"

+        - os: linux
+          compiler: gcc
+          env: CONFIGURATION="Release"
+        - os: linux
+          compiler: clang
+          env: CONFIGURATION="Release" CC=clang CXX=clang++
+        - os: osx
+          compiler: clang
+          env: CONFIGURATION="Release"
 before_install:
-  # ugly hack; if running a coverity scan abort all except the 1st build
-  # see note re gcc compiler above needing to be 1st
-  # also note that branch_pattern & the TRAVIS_BRANCH check must match
-  # unfortunately COVERITY_SCAN_BRANCH isn't defined until later in the
-  # build process
-  - if ([[ "${TRAVIS_JOB_NUMBER##*.}" != "1" ]] && [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]); then false ; fi
-  - source "./ci/travis/check_release.sh"
-  - "./ci/travis/before_install.sh"
+    # ugly hack; if running a coverity scan abort all except the 1st build
+    # see note re gcc compiler above needing to be 1st
+    # also note that branch_pattern & the TRAVIS_BRANCH check must match
+    # unfortunately COVERITY_SCAN_BRANCH isn't defined until later in the
+    # build process
+    - if ([[ "${TRAVIS_JOB_NUMBER##*.}" != "1" ]] && [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]); then false ; fi
+    - source "./ci/travis/check_release.sh"
+    - "./ci/travis/before_install.sh"
 install:
-  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then export PATH="/c/Program Files/CMake/bin":$PATH; fi
-  - "./ci/travis/install.sh"
-  - export PATH=$HOME/cmake-3.6/bin:$PATH
+    - "./ci/travis/install.sh"
+    - export PATH=$HOME/cmake/bin:$PATH
 before_script:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then QT_ENV_SCRIPT=$(find /opt -name 'qt*-env.sh'); source $QT_ENV_SCRIPT; fi
-  - "./ci/travis/before_script.sh"
+    - "./ci/travis/before_script.sh"
 script:
-  - if [ "$BUILD_DEPLOYMENT" = true ] ; then ./ci/travis/release.sh ; else ./ci/travis/script.sh ; fi
+    - if [ "$BUILD_DEPLOYMENT" = true ] ; then ./ci/travis/release.sh ; else ./ci/travis/script.sh ; fi
+before_deploy:
+    - "./ci/travis/before_deploy.sh"
@@ -2,11 +2,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.4)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

-# Make sure the source and binary directory are not the sample
-if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-	message(FATAL_ERROR "Binary and source directory can not be the same! Choose another build directory.")
-endif()
-
 include(cmake/util.cmake)

 # Set a few policies
@@ -28,40 +23,20 @@ ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
 SET(TARGET_COPY_FILES "" CACHE INTERNAL "" FORCE)
 SET(TARGET_COPY_DIRS "" CACHE INTERNAL "" FORCE)

-### Define options and editable variables in the section below:
-# This is only needed for single configuration generators so don't annoy others
-if(NOT CMAKE_BUILD_TYPE AND NOT DEFINED CMAKE_CONFIGURATION_TYPES)
-	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Default build configuration used." FORCE)
-	message(WARNING "CMAKE_BUILD_TYPE was not specified, defaulting to Release configuration.")
-endif(NOT CMAKE_BUILD_TYPE AND NOT DEFINED CMAKE_CONFIGURATION_TYPES)
-
 # Override standard CMake configurations
 set(CMAKE_CONFIGURATION_TYPES Debug Release FastDebug CACHE STRING "Available configurations" FORCE)

 PROJECT(FS2_Open)

-find_program(CCACHE_PROGRAM ccache)
-# Currently only GCC support ccache properly without generating additional warnings
-if(CCACHE_PROGRAM AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-	message(STATUS "Using ccache for compilation: ${CCACHE_PROGRAM}")
-	set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-	set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CCACHE_PROGRAM}")
-endif()
-
 IF(CMAKE_CROSSCOMPILING)
 	SET(IMPORT_EXE_DIR "IMPORT_EXE_DIR-NOTFOUND" CACHE FILEPATH "Required for a cross compiling build, point to binary directory of a cmake build for the real OS")
 	INCLUDE(${IMPORT_EXE_DIR}/ImportExecutables.cmake)
 ENDIF(CMAKE_CROSSCOMPILING)

-# Check if the external modules exists
-IF(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/rpavlik-cmake-modules/launcher-templates")
-	message(FATAL_ERROR "External submodules could not be found. Please make sure you have updated your submodules.")
-endif()
-
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/finder")
 LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/rpavlik-cmake-modules")
-LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/cotire")
+LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/cotire/CMake")

 IF(RESET_INSTALL_PREFIX)
 	IF(NOT $ENV{FS2PATH} STREQUAL "")
@@ -76,23 +51,26 @@ IF(RESET_INSTALL_PREFIX)
 	ENDIF(NOT $ENV{FS2PATH} STREQUAL "")
 ENDIF(RESET_INSTALL_PREFIX)

+### Define options and editable variables in the section below:
+# This is only needed for single configuration generators so don't annoy others
+if(NOT CMAKE_BUILD_TYPE AND NOT DEFINED CMAKE_CONFIGURATION_TYPES)
+	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Default build configuration used." FORCE)
+	message(WARNING "CMAKE_BUILD_TYPE was not specified, defaulting to Release configuration.")
+endif(NOT CMAKE_BUILD_TYPE AND NOT DEFINED CMAKE_CONFIGURATION_TYPES)
+
 IF (WIN32)
 	OPTION(FSO_USE_SPEECH "Use Windows specific text-to-speach libraries" ON)

 	OPTION(FSO_USE_VOICEREC "Enable voice recognition support" ON)

-	OPTION(FSO_BUILD_FRED2 "Build FRED2 binary" ON)
-elseif(UNIX)
-	option(FSO_BUILD_APPIMAGE "Build an AppImage package" OFF)
+	OPTION(FSO_BUILD_FRED2 "Build FRED2 binary" OFF)
 ENDIF(WIN32)

 OPTION(FSO_BUILD_TOOLS "Build tools related to FSO" OFF)

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

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

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

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

-option(ENABLE_COTIRE "Enable cotire for faster compilation. Enabled by default." ON)
+OPTION(COTIRE_ENABLE "Enable cotire, this speeds up builds but may cause issues while developing (default = OFF)" OFF)

 MARK_AS_ADVANCED(FORCE FSO_CMAKE_DEBUG)
 MARK_AS_ADVANCED(FORCE FSO_BUILD_INCLUDED_LIBS)
@@ -123,11 +101,13 @@ MARK_AS_ADVANCED(FORCE FSO_USE_OPENALSOFT)
 MARK_AS_ADVANCED(FORCE FSO_USE_LUAJIT)
 MARK_AS_ADVANCED(FORCE FSO_DEVELOPMENT_MODE)
 MARK_AS_ADVANCED(FORCE FSO_FATAL_WARNINGS)
+MARK_AS_ADVANCED(FORCE COTIRE_ENABLE)
 mark_as_advanced(FORCE FSO_INSTALL_DEBUG_FILES)
-mark_as_advanced(FORCE ENABLE_COTIRE)

-# Include cotire file from https://github.com/sakra/cotire/
-include(cotire)
+IF(COTIRE_ENABLE)
+	# Include cotire file from https://github.com/sakra/cotire/
+	include(cotire)
+ENDIF(COTIRE_ENABLE)

 INCLUDE(globals)
 INCLUDE(toolchain)
@@ -140,12 +120,6 @@ SET(GENERATED_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated_source)

 include(generateHeaders)

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

@@ -159,18 +133,9 @@ IF(FSO_BUILD_FRED2)
 	ADD_SUBDIRECTORY(fred2)
 ENDIF(FSO_BUILD_FRED2)

-IF(FSO_BUILD_QTFRED)
-	ADD_SUBDIRECTORY(qtfred)
-ENDIF()
-
-if(FSO_BUILD_TESTS)
-	add_subdirectory(test)
-endif()
-
-if ("${CMAKE_VERSION}" VERSION_GREATER "3.5")
-	# Default to using Freespace2 as startup project if CMake supports it.
-	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Freespace2)
-endif()
+IF(FSO_BUILD_WXFRED2)
+	ADD_SUBDIRECTORY(wxfred2)
+ENDIF(FSO_BUILD_WXFRED2)

 IF(MSVC_USE_RUNTIME_DLL)
 	SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "${BINARY_DESTINATION}")
@@ -188,12 +153,10 @@ include(doxygen)

 # Print used options to log
 IF (WIN32)
+	message(STATUS "Building FRED2: ${FSO_BUILD_FRED2}")
 	message(STATUS "Using text to speech: ${FSO_USE_SPEECH}")
 	message(STATUS "Using voice recogition: ${FSO_USE_VOICEREC}")
-	message(STATUS "Building FRED2: ${FSO_BUILD_FRED2}")
-elseif(UNIX)
-	message(STATUS "Building AppImage: ${FSO_BUILD_APPIMAGE}")
-ENDIF()
+ENDIF(WIN32)
 message(STATUS "Building FSO tools: ${FSO_BUILD_TOOLS}")
-message(STATUS "Building qtFRED: ${FSO_BUILD_QTFRED}")
-message(STATUS "Fatal warnings: ${FSO_FATAL_WARNINGS}")
+message(STATUS "Building wxFRED: ${FSO_BUILD_WXFRED2}")
+message(STATUS "Fatal warnings: ${FSO_FATAL_WARNINGS}")
@@ -1,14 +1,8 @@
 FreeSpace2 *S*ource *C*ode *P*roject
 ==
-[![Travis-CI Build Status](https://travis-ci.org/scp-fs2open/fs2open.github.com.svg?branch=master)](https://travis-ci.org/scp-fs2open/fs2open.github.com)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/scp-fs2open/fs2open.github.com?branch=master&svg=true)](https://ci.appveyor.com/project/SirKnightly/fs2open-github-com/branch/master)
-[![Coverity](https://img.shields.io/coverity/scan/870.svg)](https://scan.coverity.com/projects/870)
-
 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>
+For building you will need [CMake](http://www.cmake.org/cmake/resources/software.html). Only version 2.8.12 has been tested extensively but older version may still work. 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>
@@ -17,7 +11,6 @@ Depending on the makefile generator used build the `all` or `ALL_BUILD` target t
 * `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
@@ -39,4 +32,4 @@ You should only use these variables if you know what you're doing
 * `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.
+CMake can automaticall 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,64 +1,40 @@
 version: 1.0.0.{build}
-image: Visual Studio 2015
 configuration:
  - Debug
  - Release
 clone_depth: 10
 environment:
  matrix:
-    - BuildID: 0
+    - VS_VERSION: 10
+      CMAKE_GENERATOR: Visual Studio 10 2010
+      PlatformToolset: v100
+    - VS_VERSION: 14
      CMAKE_GENERATOR: Visual Studio 14 2015
      PlatformToolset: v140_xp
-      QT_DIR: C:\Qt\5.9.5\msvc2015
-    - BuildID: 1
-      CMAKE_GENERATOR: Visual Studio 14 2015 Win64
-      PlatformToolset: v140_xp
-      QT_DIR: C:\Qt\5.9.5\msvc2015_64
 before_build:
  - git submodule update --init --recursive
+  - ps: . $Env:APPVEYOR_BUILD_FOLDER/ci/appveyor/check_release.ps1
+  - ps: . $Env:APPVEYOR_BUILD_FOLDER/ci/appveyor/before_build.ps1
 build_script:
  - ps: . $Env:APPVEYOR_BUILD_FOLDER/ci/appveyor/build.ps1
-test_script:
-  - ps: . $Env:APPVEYOR_BUILD_FOLDER/ci/appveyor/test.ps1
+

 deploy:
    - provider: GitHub
      auth_token:
-          secure: 3kV4efHXwRnfXzmJPRAOs8D7+MhwXUXYeayI/P5y114L09kJa6b6L70beXdW7yYr
+          secure: RWe6hwCcgBdklaYvjB62kzhKn7yDBJdqoDDKYViShaEV9HkJ75HbawsBcGBimRUu
      on:
          ReleaseBuild: true        # deploy on release push only

-    - provider: FTP
-      protocol: sftp
-      host: scp.indiegames.us
-      username:
-        secure: SFivQZfatqWHXK1ijYK3GQ==
-      password:
-        secure: q6Zk/412o1ri+NEya1dl1Q==
-      folder: public_html/builds/nightly/$(VersionName)
+    - provider: BinTray
+      username: asarium
+      api_key:
+          secure: 2lHma1ZreuB4CCE5hSdp+gqFjCMzUDj3tVJhP+D6EyF5wIVMLlwXFrISwnYu1kJi
+      subject: scp-fs2open
+      repo: FSO
+      package: nightly
+      version: $(VersionName)
+      publish: true
+      override: true
      on:
-          NightlyBuild: true        # deploy on nightly push only
-
-    - provider: FTP
-      protocol: ftp
-      host: swc.fs2downloads.com
-      username: 
-        secure: EXg2ADoKzMduZF90ip2Q0g==
-      password:
-        secure: x0LL0uY9yBAQ7JTARhQ6AA==
-      folder: swc.fs2downloads.com/builds/nightly/$(VersionName)
-      beta: true
-      on:
-          NightlyBuild: true        # deploy on nightly push only
-
-    - provider: FTP
-      protocol: ftp
-      host: swc.fs2downloads.com
-      username: 
-        secure: EXg2ADoKzMduZF90ip2Q0g==
-      password:
-        secure: x0LL0uY9yBAQ7JTARhQ6AA==
-      folder: swc.fs2downloads.com/builds/test/$(VersionName)
-      beta: true
-      on:
-          TestBuild: true        # deploy on test build push only
+          NightlyBuild: true        # deploy on nightly push only
@@ -0,0 +1,11 @@
+New-Item build -type directory
+Set-Location -Path build
+
+$AdditionalFeatures="ON"
+if ($Env:VS_VERSION -eq "10") {
+    $AdditionalFeatures="OFF"
+}
+
+cmake -DFSO_BUILD_FRED2="${AdditionalFeatures}" -DFSO_USE_SPEECH="${AdditionalFeatures}" `
+	-DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/../install" `
+	-DFSO_USE_VOICEREC="${AdditionalFeatures}" -DMSVC_SIMD_INSTRUCTIONS=SSE2 -G "$Env:CMAKE_GENERATOR" -T "$Env:PlatformToolset" ..
@@ -1,141 +1,13 @@

-class BuildConfig {
-	[string]$Generator
-	[string]$PackageType
-	[string]$Toolset
-	[string]$SimdType
-	[string]$QtDir
-	[Bool]$SourcePackage
-}
+write "$env:DeployBuild"
+write "$env:DeployConfig"

-$NightlyConfigurations = @(
-	[BuildConfig]@{ 
-		Generator="Visual Studio 14 2015 Win64";
-		PackageType="Win64";
-		Toolset="v140_xp";
-		SimdType="SSE2";
-		QtDir="C:\Qt\5.9.5\msvc2015_64";
-		SourcePackage=$false;
-	},
-	[BuildConfig]@{ 
-		Generator="Visual Studio 14 2015";
-		PackageType="Win32";
-		Toolset="v140_xp";
-		SimdType="SSE2";
-		QtDir="C:\Qt\5.9.5\msvc2015";
-		SourcePackage=$false;
-	}
-)
-$ReleaseConfigurations = @(
-	[BuildConfig]@{
-		Generator="Visual Studio 14 2015";
-		PackageType="Win32";
-		Toolset="v140_xp";
-		SimdType="SSE2";
-		QtDir="C:\Qt\5.9.5\msvc2015";
-		SourcePackage=$true;
-	}
-	[BuildConfig]@{
-		Generator="Visual Studio 14 2015";
-		PackageType="Win32-AVX";
-		Toolset="v140_xp";
-		SimdType="AVX";
-		QtDir="C:\Qt\5.9.5\msvc2015";
-		SourcePackage=$false;
-	}
-	[BuildConfig]@{
-		Generator="Visual Studio 14 2015 Win64";
-		PackageType="Win64";
-		Toolset="v140_xp";
-		SimdType="SSE2";
-		QtDir="C:\Qt\5.9.5\msvc2015_64";
-		SourcePackage=$false;
-	}
-	[BuildConfig]@{
-		Generator="Visual Studio 14 2015 Win64";
-		PackageType="Win64-AVX";
-		Toolset="v140_xp";
-		SimdType="AVX";
-		QtDir="C:\Qt\5.9.5\msvc2015_64";
-		SourcePackage=$false;
-	}
-)
-
-$BuildConfigurations = $null
-
-# Default values
-$ReleaseBuild = $false
-$NightlyBuild = $false
-$TestBuild = $false
-
-# Set to true to test either the release or the nightly part of this script
-$ReleaseTest = $false
-$NightlyTest = $false
-$TestBuildTest = $false
-
-if ($ReleaseTest -Or ([System.Convert]::ToBoolean($env:APPVEYOR_REPO_TAG) -And ("$env:APPVEYOR_REPO_TAG_NAME" -match "^release_(.*)"))) {
-    # Tag matches
-    $ReleaseBuild = $true
-    $PackageName = "fs2_open_$($matches[1])"
-	$BuildConfigurations = $ReleaseConfigurations
-}
-
-if ($NightlyTest -Or ([System.Convert]::ToBoolean($env:APPVEYOR_REPO_TAG) -And ("$env:APPVEYOR_REPO_TAG_NAME" -match "^nightly_(.*)"))) {
-    # Tag matches
-    $NightlyBuild = $true
-    $PackageName = "nightly_$($matches[1])"
-	Set-AppveyorBuildVariable 'VersionName' "$($matches[1])"
-	$BuildConfigurations = $NightlyConfigurations
-}
-
-if ($TestBuildTest -Or ([System.Convert]::ToInt32($env:APPVEYOR_PULL_REQUEST_NUMBER) -le 0 -And ("$env:APPVEYOR_REPO_BRANCH" -match "^test\/(.*)"))) {
-    # Tag matches
-    $TestBuild = $true
-    $PackageName = "test_$($matches[1])"
-	Set-AppveyorBuildVariable 'VersionName' "$($matches[1])"
-	$BuildConfigurations = $NightlyConfigurations
-
-    # Override the revision string so that the builds are named correctly
-	[System.IO.File]::WriteAllLines("$env:APPVEYOR_BUILD_FOLDER/version_override.cmake", "set(FSO_VERSION_REVISION_STR $env:VersionName)")
-}
-
-# Multiply by 2 so that we can add 0 or 1 for debug or release Configs
-$buildID = [convert]::ToInt32($env:BuildID) * 2
-if ($Env:Configuration -eq "Release") {
-    $buildID = $buildID + 1
-}
-
-$DeployBuild = $false
-if ($ReleaseBuild -Or $NightlyBuild -Or $TestBuild) {
-    $DeployBuild = $true
-}
-
-Set-AppveyorBuildVariable 'ReleaseBuild' "$ReleaseBuild"
-Set-AppveyorBuildVariable 'NightlyBuild' "$NightlyBuild"
-Set-AppveyorBuildVariable 'TestBuild' "$TestBuild"
-
-New-Item build -type directory
-Set-Location -Path build
-
-if ($DeployBuild) {
+if ([System.Convert]::ToBoolean($env:DeployBuild)) {
 	# Release build
-	if ($buildID -ge $BuildConfigurations.Length) {
-		# Not needed
-        exit 0
+	if (![System.Convert]::ToBoolean($env:DeployConfig)) {
+        exit 0 # End the build
 	}

-	$buildConfig = $BuildConfigurations[$buildID]
-
-	if ($buildConfig.SourcePackage -eq $True) {
-		7z a -xr'!.git' "$($PackageName)-source-Win.zip" "$env:APPVEYOR_BUILD_FOLDER"
-		Push-AppveyorArtifact "$($PackageName)-source-Win.zip"
-	}
-	
-	cmake -DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/../install" -DFSO_USE_SPEECH="ON" `
-		-DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$($buildConfig.SimdType)" `
-		-DQT5_INSTALL_ROOT="$($buildConfig.QtDir)" -DFSO_BUILD_QTFRED=ON `
-		-G "$($buildConfig.Generator)" -T "$($buildConfig.Toolset)" ..
-
 	$Configs = @("Release", "FastDebug")
 	foreach ($config in $Configs) {
 		cmake --build . --config "$config" --target INSTALL -- /verbosity:minimal
@@ -145,13 +17,9 @@ if ($DeployBuild) {
    	}
 	}

-    7z a "$($PackageName)-builds-$($buildConfig.PackageType).zip" "$env:APPVEYOR_BUILD_FOLDER/../install/*"
-    Push-AppveyorArtifact "$($PackageName)-builds-$($buildConfig.PackageType).zip"
+    7z a "$($env:PackageName)-builds-Win32.zip" "$env:APPVEYOR_BUILD_FOLDER/../install/*"
+    Push-AppveyorArtifact "$($env:PackageName)-builds-Win32.zip"
 } else {
-	cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="ON" -DFSO_BUILD_TESTS="ON" -DMSVC_SIMD_INSTRUCTIONS=SSE2 `
-	-DFSO_BUILD_QTFRED=ON -DQT5_INSTALL_ROOT="$env:QT_DIR" -DFSO_BUILD_FRED2="ON" `
-	-G "$Env:CMAKE_GENERATOR" -T "$Env:PlatformToolset" ..
-
    cmake --build . --config "$Env:CONFIGURATION" -- /verbosity:minimal

    if (! ($?)) {
@@ -0,0 +1,30 @@
+
+# Default values
+Set-AppveyorBuildVariable 'ReleaseBuild' 'false'
+Set-AppveyorBuildVariable 'NightlyBuild' 'false'
+Set-AppveyorBuildVariable 'DeployBuild' 'false'
+Set-AppveyorBuildVariable 'PackagePrefix' ''
+Set-AppveyorBuildVariable 'VersionName' ''
+
+if ([System.Convert]::ToBoolean($env:APPVEYOR_REPO_TAG) -And ("$env:APPVEYOR_REPO_TAG_NAME" -match "^release_(.*)")) {
+    # Tag matches
+    Set-AppveyorBuildVariable 'ReleaseBuild' 'true'
+    Set-AppveyorBuildVariable 'PackageName' "fs2_open_$($matches[1])"
+}
+
+if ([System.Convert]::ToBoolean($env:APPVEYOR_REPO_TAG) -And ("$env:APPVEYOR_REPO_TAG_NAME" -match "^nightly_(.*)")) {
+    # Tag matches
+    Set-AppveyorBuildVariable 'NightlyBuild' 'true'
+    Set-AppveyorBuildVariable 'PackageName' "nightly_$($matches[1])"
+	Set-AppveyorBuildVariable 'VersionName' "$($matches[1])"
+}
+
+if (($Env:Configuration -eq "Release") -And ($Env:VS_VERSION -eq "14")) {
+    Set-AppveyorBuildVariable 'DeployConfig' 'true'
+} else {
+    Set-AppveyorBuildVariable 'DeployConfig' 'false'
+}
+
+if ([System.Convert]::ToBoolean($env:ReleaseBuild) -Or [System.Convert]::ToBoolean($env:NightlyBuild)) {
+    Set-AppveyorBuildVariable 'DeployBuild' 'true'
+}
@@ -1,13 +0,0 @@
-
-if ([System.Convert]::ToBoolean($env:ReleaseBuild) -Or [System.Convert]::ToBoolean($env:NightlyBuild) -Or [System.Convert]::ToBoolean($env:TestBuild)) {
-    # Skip tests for deployment
-    exit 0
-} else {    
-    write "Running unit tests..."
-    # Run unit tests
-    &"$pwd\bin\$Env:CONFIGURATION\unittests.exe" --gtest_shuffle 2>&1
-
-    if (! ($?)) {
-        exit 1
-    }
-}
@@ -8,7 +8,4 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
    # Nothing to do here
    :
-elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
-    # Nothing to do here
-    :
 fi
@@ -1,54 +1,24 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh

 set -ex

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

 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    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"
+    export CXXFLAGS="-m64 -mtune=generic -mfpmath=sse -msse -msse2 -pipe -Wno-unknown-pragmas"
+    CMAKE="cmake -G Ninja -DFSO_FATAL_WARNINGS=ON"
    if [ "$BUILD_DEPLOYMENT" = true ]; then
        for config in $BUILD_CONFIGS
        do
            mkdir -p $config
            cd $config
-            eval $CMAKE -DFSO_INSTALL_DEBUG_FILES=ON -DCMAKE_BUILD_TYPE=$config -DCMAKE_INSTALL_PREFIX="/tmp/release/$config" \
-                -DFSO_BUILD_APPIMAGE=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFFMPEG_USE_PRECOMPILED=ON -DFSO_BUILD_QTFRED=OFF ../..
+            eval $CMAKE -DFSO_INSTALL_DEBUG_FILES=ON -DCMAKE_BUILD_TYPE=$config -DCMAKE_INSTALL_PREFIX="/tmp/release" ../..
            cd ..
        done
    else
-        eval $CMAKE -DCMAKE_BUILD_TYPE=$CONFIGURATION -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON -DFSO_BUILD_QTFRED=ON ..
+        eval $CMAKE -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
    fi
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    if [ "$BUILD_DEPLOYMENT" = true ]; then
-        cmake -G "Xcode" -DFSO_FATAL_WARNINGS=ON -DFSO_INSTALL_DEBUG_FILES=ON -DCMAKE_INSTALL_PREFIX="/tmp/release" ..
-    else
-        cmake -G "Xcode" $CMAKE_OPTIONS ..
-    fi
-elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
-    if [ "$CMAKE_GENERATOR" = "Ninja" ]; then
-        cmake -DFSO_USE_SPEECH="OFF" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-            -DFSO_BUILD_FRED2="OFF" -G "$CMAKE_GENERATOR" ..
-    else
-        cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
-            -DMSVC_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "$CMAKE_GENERATOR" -T "$CMAKE_TOOLSET" ..
-    fi
+    cmake -G "Xcode" -DFSO_FATAL_WARNINGS=ON -DFSO_INSTALL_DEBUG_FILES=ON -DCMAKE_INSTALL_PREFIX="/tmp/release" ..
 fi
@@ -2,8 +2,6 @@

 RELEASE_BUILD=false
 NIGHTLY_BUILD=false
-TEST_BUILD=false
-
 BUILD_DEPLOYMENT=false
 BUILD_CONFIGS="Release FastDebug"
 VERSION_NAME=""
@@ -11,45 +9,25 @@ PACKAGE_NAME=""

 RELEASE_PATTERN="^release_(.*)$"
 NIGHTLY_PATTERN="^nightly_(.*)$"
-TEST_BUILD_PATTERN="^test\/(.*)$"

-# These are for testing
-NIGHTLY_TEST=false
-RELEASE_TEST=false
-TEST_BUILD_TEST=false
-
-if [ "$RELEASE_TEST" = true ] || [[ "$TRAVIS_TAG" =~ $RELEASE_PATTERN ]]; then
+if [[ "$TRAVIS_TAG" =~ $RELEASE_PATTERN ]]; then
    echo "This is a release tag!";
    RELEASE_BUILD=true;
 	PACKAGE_NAME="fs2_open_${BASH_REMATCH[1]}";
 fi
-if [ "$NIGHTLY_TEST" = true ] || [[ "$TRAVIS_TAG" =~ $NIGHTLY_PATTERN ]]; then
+if [[ "$TRAVIS_TAG" =~ $NIGHTLY_PATTERN ]]; then
    echo "This is a nightly tag!";
    NIGHTLY_BUILD=true;
-    VERSION_NAME="${BASH_REMATCH[1]}";
+    VERSION_NAME="${BASH_REMATCH[1]}"
 	PACKAGE_NAME="nightly_${BASH_REMATCH[1]}";
 fi
-if [ "$TEST_BUILD_TEST" = true ] || [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_BRANCH" =~ $TEST_BUILD_PATTERN ]]; then
-    echo "This is a test build branch!";
-    TEST_BUILD=true;
-    if [ "$TEST_BUILD_TEST" = true ]; then
-        VERSION_NAME="test";
-        PACKAGE_NAME="test_test";
-    else
-        VERSION_NAME="${BASH_REMATCH[1]}";
-        PACKAGE_NAME="test_${BASH_REMATCH[1]}";
-    fi

-    # Override the revision string so that the builds are named correctly
-    echo "set(FSO_VERSION_REVISION_STR $VERSION_NAME)" > "$TRAVIS_BUILD_DIR/version_override.cmake"
-fi
-
-if ([ "$RELEASE_BUILD" = true ] || [ "$NIGHTLY_BUILD" = true ] || [ "$TEST_BUILD" = true ]); then
+if ([ "$RELEASE_BUILD" = true ] || [ "$NIGHTLY_BUILD" = true ]); then
    BUILD_DEPLOYMENT=true;
 fi

 if [ "$BUILD_DEPLOYMENT" = true ]; then
-    if ([ "$TRAVIS_OS_NAME" = "linux" ] && (! [[ "$CC" =~ ^gcc-5.*$ ]])); then
+    if ([ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" = "clang" ]); then
        echo "Skipping non-release compiler";
        exit 0;
    fi
@@ -58,17 +36,11 @@ if [ "$BUILD_DEPLOYMENT" = true ]; then
        echo "Skipping non-release configuration";
        exit 0;
    fi
-
-    if [ "$TRAVIS_OS_NAME" = "windows" ]; then
-        echo "Skipping non-release platform"
-        exit 0
-    fi
 fi

 export RELEASE_BUILD
 export NIGHTLY_BUILD
-export TEST_BUILD
 export BUILD_DEPLOYMENT
 export BUILD_CONFIGS
 export VERSION_NAME
-export PACKAGE_NAME
+export PACKAGE_NAME
@@ -1,141 +0,0 @@
-#!/usr/bin/env python
-#
-#===- clang-tidy-diff.py - ClangTidy Diff Checker ------------*- python -*--===#
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-#===------------------------------------------------------------------------===#
-
-r"""
-ClangTidy Diff Checker
-======================
-
-This script reads input from a unified diff, runs clang-tidy on all changed
-files and outputs clang-tidy warnings in changed lines only. This is useful to
-detect clang-tidy regressions in the lines touched by a specific patch.
-Example usage for git/svn users:
-
-  git diff -U0 HEAD^ | clang-tidy-diff.py -p1
-  svn diff --diff-cmd=diff -x-U0 | \
-      clang-tidy-diff.py -fix -checks=-*,modernize-use-override
-
-"""
-
-import argparse
-import json
-import re
-import subprocess
-import sys
-
-
-def main():
-  parser = argparse.ArgumentParser(description=
-                                   'Run clang-tidy against changed files, and '
-                                   'output diagnostics only for modified '
-                                   'lines.')
-  parser.add_argument('-clang-tidy-binary', metavar='PATH',
-                      default='clang-tidy',
-                      help='path to clang-tidy binary')
-  parser.add_argument('-p', metavar='NUM', default=0,
-                      help='strip the smallest prefix containing P slashes')
-  parser.add_argument('-regex', metavar='PATTERN', default=None,
-                      help='custom pattern selecting file paths to check '
-                      '(case sensitive, overrides -iregex)')
-  parser.add_argument('-iregex', metavar='PATTERN', default=
-                      r'.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hpp|m|mm|inc)',
-                      help='custom pattern selecting file paths to check '
-                      '(case insensitive, overridden by -regex)')
-
-  parser.add_argument('-fix', action='store_true', default=False,
-                      help='apply suggested fixes')
-  parser.add_argument('-checks',
-                      help='checks filter, when not specified, use clang-tidy '
-                      'default',
-                      default='')
-  parser.add_argument('-path', dest='build_path',
-                      help='Path used to read a compile command database.')
-  parser.add_argument('-extra-arg', dest='extra_arg',
-                      action='append', default=[],
-                      help='Additional argument to append to the compiler '
-                      'command line.')
-  parser.add_argument('-extra-arg-before', dest='extra_arg_before',
-                      action='append', default=[],
-                      help='Additional argument to prepend to the compiler '
-                      'command line.')
-  parser.add_argument('-quiet', action='store_true', default=False,
-                      help='Run clang-tidy in quiet mode')
-  clang_tidy_args = []
-  argv = sys.argv[1:]
-  if '--' in argv:
-    clang_tidy_args.extend(argv[argv.index('--'):])
-    argv = argv[:argv.index('--')]
-
-  args = parser.parse_args(argv)
-
-  # Extract changed lines for each file.
-  filename = None
-  lines_by_file = {}
-  for line in sys.stdin:
-    match = re.search('^\+\+\+\ \"?(.*?/){%s}([^ \t\n\"]*)' % args.p, line)
-    if match:
-      filename = match.group(2)
-    if filename == None:
-      continue
-
-    if args.regex is not None:
-      if not re.match('^%s$' % args.regex, filename):
-        continue
-    else:
-      if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
-        continue
-
-    match = re.search('^@@.*\+(\d+)(,(\d+))?', line)
-    if match:
-      start_line = int(match.group(1))
-      line_count = 1
-      if match.group(3):
-        line_count = int(match.group(3))
-      if line_count == 0:
-        continue
-      end_line = start_line + line_count - 1;
-      lines_by_file.setdefault(filename, []).append([start_line, end_line])
-
-  if len(lines_by_file) == 0:
-    print("No relevant changes found.")
-    sys.exit(0)
-
-  line_filter_json = json.dumps(
-    [{"name" : name, "lines" : lines_by_file[name]} for name in lines_by_file],
-    separators = (',', ':'))
-
-  quote = "";
-  if sys.platform == 'win32':
-    line_filter_json=re.sub(r'"', r'"""', line_filter_json)
-  else:
-    quote = "'";
-
-  # Run clang-tidy on files containing changes.
-  command = [args.clang_tidy_binary]
-  command.append('-line-filter=' + quote + line_filter_json + quote)
-  if args.fix:
-    command.append('-fix')
-  if args.checks != '':
-    command.append('-checks=' + quote + args.checks + quote)
-  if args.quiet:
-    command.append('-quiet')
-  if args.build_path is not None:
-    command.append('-p=%s' % args.build_path)
-  command.extend(lines_by_file.keys())
-  for arg in args.extra_arg:
-      command.append('-extra-arg=%s' % arg)
-  for arg in args.extra_arg_before:
-      command.append('-extra-arg-before=%s' % arg)
-  command.extend(clang_tidy_args)
-
-  sys.exit(subprocess.call(' '.join(command), shell=True))
-
-if __name__ == '__main__':
-  main()
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if ! git rev-list $TRAVIS_COMMIT_RANGE 2>1 >/dev/null; then
-    echo "\$TRAVIS_COMMIT_RANGE ($TRAVIS_COMMIT_RANGE) is not valid for this build (probably caused by a rebase)."
-    exit 0
-fi
-
-cd "$TRAVIS_BUILD_DIR"
-
-echo "Running clang-tidy on changed files"
-git diff -U0 --no-color $TRAVIS_COMMIT_RANGE | \
-    $TRAVIS_BUILD_DIR/ci/travis/clang-tidy-diff.py -path "$TRAVIS_BUILD_DIR/build" -p1 \
-    -regex 'code/.*$|freespace2/.*$|qtfred/.*$|test/src/.*$|build/.*$|tools/.*' \
-    -clang-tidy-binary /usr/bin/clang-tidy-4.0 2>/dev/null | \
-    tee clang-tidy-output.txt
-
-if [[ -n $(grep "warning: " clang-tidy-output.txt) ]] || [[ -n $(grep "error: " clang-tidy-output.txt) ]]; then
-    echo "Errors or warnings were detected in the clang-tidy output!"
-    exit 1
-else
-    echo -e "\033[1;32m\xE2\x9C\x93 passed:\033[0m clang-tidy test succeeded";
-fi
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -u
-
-if [[ ! "$(curl -V)" == *"sftp"* ]]; then
-    # Before
-    echo "Before:"
-    curl -V
-
-    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-
-        # Since the Travis CI people are not capable of enabling SSH/SCP support for their libcurl we need to build that manually...
-        # These commands are based on the tutorial from here: http://zeroset.mnim.org/2013/03/14/sftp-support-for-curl-in-ubuntu-12-10-quantal-quetzal-and-later/
-        mkdir /tmp/curl
-        cd /tmp/curl
-        sudo apt-get update
-        sudo apt-get install build-essential debhelper libssh2-1-dev libgnutls-dev libidn11-dev libkrb5-dev libldap2-dev libnss3-dev librtmp-dev libtool openssh-server quilt
-        apt-get source curl
-        sudo apt-get build-dep curl
-
-        cd curl-*
-        export DEB_BUILD_OPTIONS="nocheck"
-        sudo dpkg-buildpackage -uc -us -j"$(grep -c ^processor /proc/cpuinfo)"
-
-        cd ..
-        dpkg -l | grep curl
-        ls -al
-        sudo dpkg -i libcurl3*.deb
-        sudo dpkg -i curl*.deb
-    elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-        brew install curl --with-libssh2
-        export PATH="/usr/local/opt/curl/bin:$PATH"
-    fi
-
-    # After
-    echo "After:"
-    curl -V
-fi
-
-cd /tmp/builds
-
-for file in *; do
-    if [ "$TEST_BUILD" = true ]; then
-        # Upload to fs2downloads
-        curl -k "ftp://swc.fs2downloads.com/swc.fs2downloads.com/builds/test/$VERSION_NAME/" --user "$FS2DOWNLOADS_USER:$FS2DOWNLOADS_PASSWORD" -T "$file" --ftp-create-dirs
-    else
-        # Upload to indiegames
-        curl -k "sftp://scp.indiegames.us/~/public_html/builds/nightly/$VERSION_NAME/" --user "$INDIEGAMES_USER:$INDIEGAMES_PASSWORD" -T "$file" --ftp-create-dirs
-
-        # Upload to fs2downloads
-        curl -k "ftp://swc.fs2downloads.com/swc.fs2downloads.com/builds/nightly/$VERSION_NAME/" --user "$FS2DOWNLOADS_USER:$FS2DOWNLOADS_PASSWORD" -T "$file" --ftp-create-dirs
-    fi
-done
@@ -4,31 +4,21 @@ set -ex

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

-    	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
-    
-    cd $HOME
-    
-    if [ "${BUILD_DEPLOYMENT}" = true ]; then
-        wget -O appimagetool -c "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" # (64-bit)
-        chmod a+x ./appimagetool
+    	mkdir -p $HOME/cmake/

-        wget -O linuxdeployqt -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" # (64-bit)
-        chmod a+x ./linuxdeployqt
+    	wget -O /tmp/cmake.tar.gz --no-check-certificate https://www.cmake.org/files/v3.4/$FILENAME.tar.gz
+    	tar -xzf /tmp/cmake.tar.gz -C $HOME/cmake/ --strip-components=1
    fi
+	export PATH=$HOME/cmake/bin:$PATH
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    gem install xcpretty
+    gem install xcpretty xcpretty-travis-formatter thefox-pastebin
    
    brew update
    brew outdated cmake || brew upgrade cmake
-elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
-    choco install mingw ninja
 fi

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

-    cp `find /tmp/release -name '*.AppImage' -print` /tmp/release
-    (cd /tmp/release && tar -cvzf /tmp/builds/$PACKAGE_NAME-builds-Linux.tar.gz *.AppImage)
+    ls -al /tmp/release
+    (cd /tmp/release && tar -cvzf /tmp/builds/$PACKAGE_NAME-builds-Linux.tar.gz *)
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
    cd build
    
    for config in $BUILD_CONFIGS
    do
        cmake --build . --config "$config" --target install | tee build.log \
-            | xcpretty
+            | xcpretty -f `xcpretty-travis-formatter`
        XCODE_RET=${PIPESTATUS[0]}
        if [ "$XCODE_RET" -ne "0" ]; then
-            tar -cvzf build.log.tar.gz build.log
-            curl --upload-file build.log.tar.gz "https://transfer.sh/build.log.tar.gz"
+            pastebin -e 1d -f build.log
            exit $XCODE_RET
        fi
    done
@@ -5,27 +5,12 @@ set -e
 cd build

 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    ninja -k 20 all
-
-
-    if [ "$CONFIGURATION" = "Debug" ]; then
-        valgrind --leak-check=full --error-exitcode=1 --gen-suppressions=all \
-            --suppressions="$TRAVIS_BUILD_DIR/ci/travis/valgrind.supp" ./bin/unittests --gtest_shuffle
-    else
-        ./bin/unittests --gtest_shuffle
-    fi
+    ninja
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    cmake --build . --config "$CONFIGURATION" | tee build.log | xcpretty
+    cmake --build . --config "$CONFIGURATION" | tee build.log | xcpretty -f `xcpretty-travis-formatter`
    XCODE_RET=${PIPESTATUS[0]}
    if [ "$XCODE_RET" -ne "0" ]; then
-        tar -cvzf build.log.tar.gz build.log
-        curl --upload-file build.log.tar.gz "https://transfer.sh/build.log.tar.gz"
+        pastebin -e 1d -f build.log
        exit $XCODE_RET
-    fi
-elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
-    if [ "$CMAKE_GENERATOR" = "Ninja" ]; then
-        cmake --build . --config "$CONFIGURATION"
-    else
-        cmake --build . --config "$CONFIGURATION" -- /verbosity:minimal
-    fi
+   fi
 fi
@@ -1,43 +0,0 @@
-{
-   liblsan Invalid read
-   Memcheck:Addr8
-   obj:/usr/lib64/liblsan.so.0.0.0
-   obj:/usr/lib64/liblsan.so.0.0.0
-   obj:/usr/lib64/liblsan.so.0.0.0
-   obj:*
-   obj:*
-   obj:*
-}
-{
-    Travis memleak
-    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:/usr/lib/x86_64-linux-gnu/libmirclient.so.7
-    fun:call_init.part.0
-    fun:call_init
-    fun:_dl_init
-    fun:dl_open_worker
-    fun:_dl_catch_error
-}
-{
-   CLang Lua unitialized value error
-   Memcheck:Cond
-   ...
-   fun:luaH_get
-   fun:lua_rawget
-   fun:_ZN12_GLOBAL__N_117ade_index_handlerEP9lua_State
-}
-{
-   False-positive uninitialized variable warning
-   Memcheck:Cond
-   fun:_Z23cf_check_location_flagsjj
-   fun:_Z29cf_create_default_path_stringPcjiPKcbj
-   ...
-}
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=FreeSpace Open
-Exec=$<TARGET_FILE_NAME:Freespace2>
-Icon=app_icon
-Categories=Game;
@@ -1,4 +0,0 @@
-#!/bin/sh
-HERE=$(dirname $(readlink -f "${0}"))
-export LD_LIBRARY_PATH="${HERE}"/lib:"$LD_LIBRARY_PATH"
-"${HERE}"/bin/$<TARGET_FILE_NAME:Freespace2> $@
@@ -1,9 +1,6 @@

 include(WriteCompilerDetectionHeader)

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

 get_property(CMAKE_CXX_KNOWN_FEATURES GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
@@ -1,21 +0,0 @@
-
-SET(BINARY_DESTINATION "bin")
-SET(LIBRAY_DESTINATION "lib")
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/AppRun.in" "${CMAKE_CURRENT_BINARY_DIR}/AppRun.gen" @ONLY)
-file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AppRun-$<CONFIG>"
-    INPUT "${CMAKE_CURRENT_BINARY_DIR}/AppRun.gen")
-
-install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/AppRun-$<CONFIG>" DESTINATION "." RENAME "AppRun"
-        COMPONENT "Freespace2")
-
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/AppImage.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/AppImage.desktop.gen" @ONLY)
-file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AppImage-$<CONFIG>.desktop"
-    INPUT "${CMAKE_CURRENT_BINARY_DIR}/AppImage.desktop.gen")
-
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/AppImage-$<CONFIG>.desktop" DESTINATION "." RENAME "fso.desktop"
-        COMPONENT "Freespace2")
-
-install(FILES "${CMAKE_SOURCE_DIR}/freespace2/resources/app_icon.png" DESTINATION "."
-        COMPONENT "Freespace2")
@@ -1,37 +0,0 @@
-option(ENABLE_CLANG_TIDY "Enable source code checking using clang-tidy" OFF)
-
-find_program(
-    CLANG_TIDY_EXE
-    NAMES "clang-tidy"
-    DOC "Path to clang-tidy executable"
-)
-
-function(enable_clang_tidy target)
-    # Not enabled in this configuration
-endfunction()
-
-if(NOT ENABLE_CLANG_TIDY)
-    return()
-endif()
-
-if(NOT EXISTS "${CLANG_TIDY_EXE}")
-    message(SEND_ERROR "clang-tidy: Could not find clang-tidy executable (value of variable is \"${CLANG_TIDY_EXE}\".")
-    return()
-endif()
-
-if(CMAKE_VERSION VERSION_LESS "3.6.0")
-    message(SEND_ERROR "Clang-tidy support requires CMake 3.6")
-    return()
-endif()
-
-message(STATUS "clang-tidy: Using \"${CLANG_TIDY_EXE}\"")
-
-function(enable_clang_tidy target)
-    SET(TIDY_OPTIONS "${CLANG_TIDY_EXE}")
-    if(FSO_FATAL_WARNINGS)
-        set(TIDY_OPTIONS "${TIDY_OPTIONS};-warnings-as-errors=*")
-    endif()
-
-    set_target_properties(${target} PROPERTIES CXX_CLANG_TIDY "${TIDY_OPTIONS}")
-endfunction()
-
@@ -27,7 +27,6 @@ int main( int argc, char* argv[] )
 	int SSE     = false;
 	int SSE2    = false;
 	int AVX     = false;
-	int AVX2    = false;

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

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

-	if (AVX2)
-		std::cout << "AVX2";
-	else if(AVX)
+	if(AVX)
 		std::cout << "AVX";
 	else if(SSE2)
 		std::cout << "SSE2";
@@ -1,26 +0,0 @@
-
-# Sample toolchain file for building for Windows from a Linux system.
-#
-# Typical usage:
-#    *) install cross compiler: `sudo apt-get install mingw-w64 g++-mingw-w64`
-#    *) cd build
-#    *) cmake -DCMAKE_TOOLCHAIN_FILE=~/Toolchain-Ubuntu-mingw64.cmake ..
-
-set(CMAKE_SYSTEM_NAME Windows)
-set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
-
-# cross compilers to use for C and C++
-set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
-set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
-set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
-
-# target environment on the build host system
-#   set 1st to dir with the cross compiler's C/C++ headers/libs
-set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
-
-# modify default behavior of FIND_XXX() commands to
-# search for headers/libs in the target environment and
-# don't search for programs in the build host environment
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -1,16 +1,34 @@

-include(CheckIncludeFile)
-
 add_library(speech INTERFACE)

 if (WIN32)
-	CHECK_INCLUDE_FILE_CXX("sapi.h" HAVE_SAPI_H)
+	find_package(WindowsSDK REQUIRED)
+
+	foreach(dir ${WINDOWSSDK_DIRS})
+		get_windowssdk_library_dirs("${dir}" LIB_DIRS)
 	
-	if (NOT HAVE_SAPI_H)
-		message(SEND_ERROR "sapi.h could not be found on your platform. Please disable speech support.")
+		find_library(SPEECH_LIBRARY
+			NAMES sapi
+			PATHS ${LIB_DIRS}
+			NO_DEFAULT_PATH)
+
+		if (SPEECH_LIBRARY)
+			set(SDK_DIR "${dir}")
+			break()
+		endif()
+	endforeach()
+
+	if (NOT SPEECH_LIBRARY)
+		message(SEND_ERROR "Text to speech library could not be found! Either install it or disable the speech option.")
+		return()
 	endif()
+	
+	get_windowssdk_include_dirs("${SDK_DIR}" INCLUDE_DIRS)
+	
+	target_link_libraries(speech INTERFACE ${SPEECH_LIBRARY})
+	target_include_directories(speech INTERFACE ${INCLUDE_DIRS})
 else()
 	message(SEND_ERROR "Text to Speech is not supported on this platform!")
 endif()

-target_compile_definitions(speech INTERFACE -DFS2_SPEECH)
+target_compile_definitions(speech INTERFACE -DFS2_SPEECH)
@@ -1,9 +0,0 @@
-
-
-#ifndef __FREDRC_H
-#define __FREDRC_H
-
-#define ABOUT_LINE_1 "FRED2_OPEN - FreeSpace Editor, Version @FSO_PRODUCT_VERSION_STRING@ OpenGL"
-#define MAINFRAME_CONTENTS "FRED2_OPEN @FSO_PRODUCT_VERSION_STRING@ - FreeSpace2 Mission Editor\nUntitled\nFRED2\nFreeSpace2 Missions (*.fs2)\n.fs2\nFreeSpace2Mission\nFreeSpace2 Mission"
-
-#endif // __FREDRC_H
@@ -1,7 +1,5 @@

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

 CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/project.h.in ${GENERATED_SOURCE_DIR}/project.h)
-CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/fred_rc.h.in ${GENERATED_SOURCE_DIR}/fred_rc.h)
@@ -1,9 +1,2 @@

 SET(BINARY_DESTINATION ".")
-SET(LIBRAY_DESTINATION "${BINARY_DESTINATION}")
-
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(IS_64BIT TRUE)
-else()
-    set(IS_64BIT FALSE)
-endif()
@@ -1,6 +1,5 @@

 MESSAGE(STATUS "Doing Mac OSX specific things...")
-target_compile_definitions(platform INTERFACE APPLE_APP)
 SET(EXE_GUI_TYPE MACOSX_BUNDLE)

 FIND_LIBRARY(COCOA_LIBRARY Cocoa)
@@ -10,25 +9,3 @@ if (NOT COCOA_LIBRARY)
 endif()

 target_link_libraries(platform INTERFACE ${COCOA_LIBRARY})
-
-SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
-
-SET(CMAKE_SKIP_RPATH FALSE)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-SET(CMAKE_INSTALL_RPATH @loader_path/../Frameworks/)
-
-# Set the path where library dependencies are copied to
-SET(LIBRAY_DESTINATION "../Frameworks")
-
-set(PLATFORM_MAC TRUE CACHE INTERNAL "" FORCE)
-
-# Generate and don't strip debug symbols
-# These settings don't seem to generate debug symbols for code and Freespace2
-# so those settings are set manually in code and Freespace2's CMakeLists.txt files
-set(CMAKE_XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS "YES")
-set(CMAKE_XCODE_ATTRIBUTE_COPY_PHASE_STRIP "NO")
-set(CMAKE_XCODE_ATTRIBUTE_STRIP_INSTALLED_PRODUCT "NO")
-set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN "NO")
-
-# Generate .dSYM file
-set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf-with-dsym")
@@ -1,10 +1,2 @@

 target_compile_definitions(platform INTERFACE SCP_BSD)
-
-find_library(EXECINFO_LIB execinfo)
-
-if (NOT EXECINFO_LIB)
-    message(FATAL_ERROR "Couldn't find libexecinfo! Please install it and rerun the configuration.")
-else()
-    target_link_libraries(platform INTERFACE "${EXECINFO_LIB}")
-endif()
@@ -1,18 +1,2 @@

 target_compile_definitions(platform INTERFACE SCP_SOLARIS)
-
-find_library(SOCKET_LIB socket)
-
-if (NOT SOCKET_LIB)
-    message(FATAL_ERROR "Couldn't find libsocket! Please install it and rerun the configuration.")
-else()
-    target_link_libraries(platform INTERFACE "${SOCKET_LIB}")
-endif()
-
-find_library(NSL_LIB nsl)
-
-if (NOT NSL_LIB)
-    message(FATAL_ERROR "Couldn't find libnsl! Please install it and rerun the configuration.")
-else()
-    target_link_libraries(platform INTERFACE "${NSL_LIB}")
-endif()
@@ -4,10 +4,3 @@ INCLUDE(util)
 MESSAGE(STATUS "Configuring UNIX specific things and stuff...")

 target_compile_definitions(platform INTERFACE SCP_UNIX USE_OPENAL)
-
-# Set RPATH
-set(CMAKE_SKIP_BUILD_RPATH TRUE)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH "\$ORIGIN")
-
-set(PLATFORM_UNIX TRUE CACHE INTERNAL "" FORCE)
@@ -1,22 +1,13 @@

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

-SET(WIN32_LIBS
-	comctl32
-	msacm32
-	odbc32
-	odbccp32
-	vfw32
-	winmm
-	wsock32
-	psapi
-)
-
-IF (MINGW)
-	SET(WIN32_LIBS ${WIN32_LIBS} mingw32)
-ENDIF (MINGW)
-
-target_link_libraries(platform INTERFACE ${WIN32_LIBS})
+target_link_libraries(platform INTERFACE comctl32.lib
+	msacm32.lib
+	odbc32.lib
+	odbccp32.lib
+	vfw32.lib
+	winmm.lib
+	wsock32.lib)

 target_compile_definitions(platform INTERFACE WIN32 USE_OPENAL _WINDOWS)

@@ -24,4 +15,3 @@ target_compile_definitions(platform INTERFACE WIN32 USE_OPENAL _WINDOWS)
 target_compile_definitions(platform INTERFACE NTDDI_VERSION=0x05010000 _WIN32_WINNT=0x0501)

 SET(EXE_GUI_TYPE WIN32)
-set(PLATFORM_WINDOWS TRUE CACHE INTERNAL "" FORCE)
@@ -1,48 +1,12 @@

 include(CheckFunctionExists)
-include(CheckIncludeFiles)
 include(CheckIncludeFile)
 include(CheckIncludeFileCXX)
 include(CheckLibraryExists)
 include(CheckPrototypeDefinition)
 include(CheckStructHasMember)
 include(CheckSymbolExists)
-include(CheckCXXSymbolExists)
 include(CheckTypeSize)

-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)
-
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    set(CMAKE_REQUIRED_FLAGS "-std=c++11") # required for g++ <= 5
-endif()
-
-set(CMAKE_EXTRA_INCLUDE_FILES "cstddef")
-CHECK_TYPE_SIZE("std::max_align_t" STD_MAX_ALIGN_T LANGUAGE CXX)
-set(CMAKE_EXTRA_INCLUDE_FILES "type_traits")
-CHECK_TYPE_SIZE("std::is_trivially_copyable<int>" STD_IS_TRIVIALLY_COPYABLE LANGUAGE CXX)
-set(CMAKE_EXTRA_INCLUDE_FILES)
-
-CHECK_TYPE_SIZE("char32_t" CHAR32_T LANGUAGE CXX)
-CHECK_TYPE_SIZE("U'b'" UNICODE_CHAR_LITERAL LANGUAGE CXX)
-
-set(CMAKE_REQUIRED_FLAGS)
-
-
-CHECK_FUNCTION_EXISTS(strcasecmp HAVE_STRCASECMP)
-CHECK_FUNCTION_EXISTS(strncasecmp HAVE_STRNCASECMP)
-
-CHECK_FUNCTION_EXISTS(_stricmp HAVE__STRICMP)
-CHECK_FUNCTION_EXISTS(_strnicmp HAVE__STRNICMP)
-
-CHECK_FUNCTION_EXISTS(strlwr HAVE_STRLWR)
-
-CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
-
-check_symbol_exists(snprintf "stdio.h" HAVE_SNPRINTF)
-check_symbol_exists(_snprintf "stdio.h" HAVE__SNPRINTF)
-
 set(PLATFORM_CHECK_HEADER "${GENERATED_SOURCE_DIR}/platformChecks.h")
 CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/platformChecks.h.in "${PLATFORM_CHECK_HEADER}")
@@ -3,29 +3,4 @@
 #define __PLATFORM_CHECKS_H__
 #pragma once

-#cmakedefine HAVE_EXECINFO_H
-#cmakedefine HAVE_CXXAPI_H
-#cmakedefine HAVE_MAX_ALIGN_T
-#cmakedefine HAVE_STD_MAX_ALIGN_T
-
-#cmakedefine HAVE_STD_IS_TRIVIALLY_COPYABLE
-#cmakedefine HAVE_STD_IS_TRIVIALLY_COPYABLE_ARRAY
-
-#cmakedefine01 IS_64BIT
-
-#cmakedefine01 HAVE_STRCASECMP
-#cmakedefine01 HAVE_STRNCASECMP
-#cmakedefine01 HAVE__STRICMP
-#cmakedefine01 HAVE__STRNICMP
-
-#cmakedefine01 HAVE_STRLWR
-
-#cmakedefine01 HAVE_STRINGS_H
-
-#cmakedefine01 HAVE_CHAR32_T
-#cmakedefine01 HAVE_UNICODE_CHAR_LITERAL
-
-#cmakedefine01 HAVE_SNPRINTF
-#cmakedefine01 HAVE__SNPRINTF
-
 #endif // __PLATFORM_CHECKS_H__
@@ -5,11 +5,6 @@ IF(FSO_CMAKE_DEBUG)
 	INCLUDE(debug-vars)
 ENDIF(FSO_CMAKE_DEBUG)

-set(PLATFORM_WINDOWS FALSE CACHE INTERNAL "" FORCE)
-set(PLATFORM_UNIX FALSE CACHE INTERNAL "" FORCE)
-set(PLATFORM_LINUX FALSE CACHE INTERNAL "" FORCE)
-set(PLATFORM_MAC FALSE CACHE INTERNAL "" FORCE)
-
 IF(WIN32)
 	INCLUDE(platform-win32)
 ELSEIF(UNIX)
@@ -21,9 +16,7 @@ ELSEIF(UNIX)
 		INCLUDE(platform-solaris)
 	ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 		include(platform-darwin)
-	elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-		set(PLATFORM_LINUX TRUE CACHE INTERNAL "" FORCE)
-	ENDIF()
+	ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 ELSE(WIN32)
 	MESSAGE(STATUS "This platform is not supported, good luck!")
 ENDIF(WIN32)
@@ -4,108 +4,51 @@ include(CheckCXXCompilerFlag)

 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)
-
-# These are the default values
-set(C_BASE_FLAGS "-march=native -pipe")
-set(CXX_BASE_FLAGS "-march=native -pipe")
-
-# For C and C++, the values can be overwritten independently
+unset(CMAKE_CXX_FLAGS)
+	message(STATUS "$ENV{CXXFLAGS}")
 if(DEFINED ENV{CXXFLAGS})
-	set(CXX_BASE_FLAGS $ENV{CXXFLAGS})
-endif()
-if(DEFINED ENV{CFLAGS})
-	set(C_BASE_FLAGS $ENV{CFLAGS})
+	message(STATUS "$ENV{CXXFLAGS}")
+	set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS})
 endif()

-# Initialize with an empty string to make sure we always get a clean start
-set(COMPILER_FLAGS "")
+if(NOT CMAKE_CXX_FLAGS)
+	set(CMAKE_CXX_FLAGS "-march=native -pipe")
+endif(NOT CMAKE_CXX_FLAGS)

-# This is a slight hack since our flag setup is a bit more complicated
-_enable_extra_compiler_warnings_flags()
-set(COMPILER_FLAGS "${COMPILER_FLAGS} ${_flags}")
+globally_enable_extra_compiler_warnings()

-set(COMPILER_FLAGS "${COMPILER_FLAGS} -funroll-loops -fsigned-char -Wno-unknown-pragmas")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funroll-loops -fsigned-char -Wno-unknown-pragmas")

 # Omit "argument unused during compilation" when clang is used with ccache.
 if(${CMAKE_CXX_COMPILER} MATCHES "ccache")
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Qunused-arguments")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
 endif()
+# Omit "conversion from string literal to 'char *' is deprecated" warnings.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")

-if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
-	# Force color diagnostics for Ninja generator
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -fdiagnostics-color")
-endif()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")

-# Start with an empty list
-set(SANITIZE_FLAGS)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-char-subscripts")

-if(CLANG_ENABLE_ADDRESS_SANITIZER)
-	set(CMAKE_REQUIRED_FLAGS "-fsanitize=address")
-	CHECK_C_COMPILER_FLAG("-fsanitize=address" SUPPORTS_SANITIZE_ADDRESS)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")

-	if (SUPPORTS_SANITIZE_ADDRESS)
-		set(SANITIZE_FLAGS ${SANITIZE_FLAGS} "address")
-	endif()
-endif()
-if (CLANG_ENABLE_LEAK_CHECK)
-	check_linker_flag("-fsanitize=leak" SUPPORTS_FSANITIZE_LEAK)
-
-	if (SUPPORTS_FSANITIZE_LEAK)
-		set(SANITIZE_FLAGS ${SANITIZE_FLAGS} "leak")
-	endif()
-endif()
-
-string(REPLACE ";" "," SANITIZE_FLAGS "${SANITIZE_FLAGS}")
-if (NOT "${SANITIZE_FLAGS}" STREQUAL "")
-	set(SANITIZE_FLAGS "-fsanitize=${SANITIZE_FLAGS}")
-endif()
-
-set(COMPILER_FLAGS "${COMPILER_FLAGS} ${SANITIZE_FLAGS}")
-
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wformat-security")
-
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-function")
-
-# Dear Clang, please tell us if a function does not return a value since that part of the standard is stupid!
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wreturn-type")
-
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-char-subscripts")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")

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

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

-set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")
-
-# Always use the base flags and add our compiler flags at the bacl
-set(CMAKE_CXX_FLAGS "${CXX_BASE_FLAGS} ${COMPILER_FLAGS}")
-set(CMAKE_C_FLAGS "${C_BASE_FLAGS} ${COMPILER_FLAGS}")
-
-set(CMAKE_CXX_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
-set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
-
-set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
-set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
-
-
-set(CMAKE_EXE_LINKER_FLAGS "")
-
-if (SANITIZE_FLAGS)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZE_FLAGS}")
-endif()
-
-set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g -rdynamic")
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wshadow")

 if (FSO_FATAL_WARNINGS)
 	# Make warnings fatal if the right variable is set
-	target_compile_options(compiler INTERFACE "-Werror")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 endif()

-# Always define this to make sure that the fixed width format macros are available
-target_compile_definitions(compiler INTERFACE __STDC_FORMAT_MACROS)
+set(CMAKE_EXE_LINKER_FLAGS "")
+
+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g -rdynamic")
@@ -1,144 +1,44 @@

 include(EnableExtraCompilerWarnings)
-include(CheckCCompilerFlag)
-include(util)

 MESSAGE(STATUS "Doing configuration specific to gcc...")

-option(GCC_ENABLE_LEAK_CHECK "Enable -fsanitize=leak" OFF)
-option(GCC_ENABLE_ADDRESS_SANITIZER "Enable -fsanitize=address" OFF)
-option(GCC_ENABLE_SANITIZE_UNDEFINED "Enable -fsanitize=undefined" OFF)
-
-# These are the default values
-set(C_BASE_FLAGS "-march=native -pipe")
-set(CXX_BASE_FLAGS "-march=native -pipe")
-
-# For C and C++, the values can be overwritten independently
-if(DEFINED ENV{CFLAGS})
-	set(C_BASE_FLAGS $ENV{CFLAGS})
-endif()
+unset(CMAKE_CXX_FLAGS)
 if(DEFINED ENV{CXXFLAGS})
-	set(CXX_BASE_FLAGS $ENV{CXXFLAGS})
+	set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS})
+	message("${CMAKE_CXX_FLAGS}")
 endif()

-# Initialize with an empty string to make sure we always get a clean start
-set(COMPILER_FLAGS "")
+if(NOT CMAKE_CXX_FLAGS)
+	set(CMAKE_CXX_FLAGS "-march=native -pipe")
+endif(NOT CMAKE_CXX_FLAGS)

-# This is a slight hack since our flag setup is a bit more complicated
-_enable_extra_compiler_warnings_flags()
-set(COMPILER_FLAGS "${COMPILER_FLAGS} ${_flags}")
+globally_enable_extra_compiler_warnings()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funroll-loops -fsigned-char -Wno-unknown-pragmas")

-set(COMPILER_FLAGS "${COMPILER_FLAGS} -funroll-loops -fsigned-char -Wno-unknown-pragmas")
+# Omit "deprecated conversion from string constant to 'char*'" warnings.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")

-# Place each function and data in its own section so the linker can
-# perform dead code elimination
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -fdata-sections -ffunction-sections")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")

-if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
-	# Force color diagnostics for Ninja generator
-	CHECK_C_COMPILER_FLAG(-fdiagnostics-color SUPPORTS_DIAGNOSTIC_COLOR)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-char-subscripts")

-	if(SUPPORTS_DIAGNOSTIC_COLOR)
-		set(COMPILER_FLAGS "${COMPILER_FLAGS} -fdiagnostics-color")
-	endif()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
+
+set(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered")
+
+set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wshadow")
+
+if (FSO_FATAL_WARNINGS)
+	# Make warnings fatal if the right variable is set
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 endif()

-# Start with an empty list
-set(SANITIZE_FLAGS)
-
-if(GCC_ENABLE_ADDRESS_SANITIZER)
-	set(CMAKE_REQUIRED_FLAGS "-fsanitize=address")
-	CHECK_C_COMPILER_FLAG("-fsanitize=address" SUPPORTS_SANITIZE_ADDRESS)
-
-	if (SUPPORTS_SANITIZE_ADDRESS)
-		set(SANITIZE_FLAGS ${SANITIZE_FLAGS} "address")
-	endif()
-endif()
-if (GCC_ENABLE_LEAK_CHECK)
-	check_linker_flag("-fsanitize=leak" SUPPORTS_FSANITIZE_LEAK)
-
-	if (SUPPORTS_FSANITIZE_LEAK)
-		set(SANITIZE_FLAGS ${SANITIZE_FLAGS} "leak")
-	endif()
-endif()
-if (GCC_ENABLE_SANITIZE_UNDEFINED)
-	check_linker_flag("-fsanitize=undefined" SUPPORTS_SANITIZE_UNDEFINED)
-
-	if (SUPPORTS_SANITIZE_UNDEFINED)
-		set(SANITIZE_FLAGS ${SANITIZE_FLAGS} "undefined")
-	endif()
-endif()
-
-string(REPLACE ";" "," SANITIZE_FLAGS "${SANITIZE_FLAGS}")
-if (NOT "${SANITIZE_FLAGS}" STREQUAL "")
-	set(SANITIZE_FLAGS "-fsanitize=${SANITIZE_FLAGS}")
-endif()
-
-set(COMPILER_FLAGS "${COMPILER_FLAGS} ${SANITIZE_FLAGS}")
-
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wformat-security")
-
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-function")
-
-# Dear GCC, please tell us if a function does not return a value since that part of the standard is stupid!
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wreturn-type")
-
-set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-deprecated -Wno-char-subscripts")
-
-# These two warnings cause a lot of false-positives in the FSO code base
-check_cxx_compiler_flag(-Wstringop-truncation SUPPORTS_STRINGOP_TRUNCATION)
-if(SUPPORTS_STRINGOP_TRUNCATION)
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-stringop-truncation")
-endif()
-
-check_cxx_compiler_flag(-Wstringop-overflow SUPPORTS_STRINGOP_OVERFLOW)
-if(SUPPORTS_STRINGOP_TRUNCATION)
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-stringop-overflow")
-endif()
-
-set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered  -Wno-unused-parameter")
-
-set(COMPILER_FLAGS_DEBUG "-O0 -g -Wshadow")
-
-# Always use the base flags and add our compiler flags at the bacl
-set(CMAKE_CXX_FLAGS "${CXX_BASE_FLAGS} ${COMPILER_FLAGS}")
-set(CMAKE_C_FLAGS "${C_BASE_FLAGS} ${COMPILER_FLAGS}")
-
-set(CMAKE_CXX_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
-set(CMAKE_C_FLAGS_RELEASE ${COMPILER_FLAGS_RELEASE})
-
-set(CMAKE_CXX_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
-set(CMAKE_C_FLAGS_DEBUG ${COMPILER_FLAGS_DEBUG})
-
 set(CMAKE_EXE_LINKER_FLAGS "")

-IF (MINGW)
-	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -static-libgcc -static-libstdc++ -Wl,--enable-auto-import")
-	target_compile_definitions(compiler INTERFACE __USE_MINGW_ANSI_STDIO=1)
-ENDIF(MINGW)
-
-if (SANITIZE_FLAGS)
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZE_FLAGS}")
-endif()
-
 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "")
-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g")
-IF(NOT MINGW)
-	SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic")
-	# Allow the linker to perform dead code elimination; this is considered
-	# experimental for COFF and PE formats and thus disabled for Windows builds
-	# (https://sourceware.org/binutils/docs/ld/Options.html)
-	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections")
-ENDIF(NOT MINGW)
+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-g -rdynamic")

 IF(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
 	SET(CMAKE_EXE_LINKER_FLAGS "-Wl,-zignore")
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-
-if (FSO_FATAL_WARNINGS)
-	# Make warnings fatal if the right variable is set
-	target_compile_options(compiler INTERFACE "-Werror")
-endif()
-
-# Always define this to make sure that the fixed width format macros are available
-target_compile_definitions(compiler INTERFACE __STDC_FORMAT_MACROS=1)
@@ -8,42 +8,11 @@ MESSAGE(STATUS "Doing configuration specific to visual studio...")
 set_property(GLOBAL PROPERTY DEBUG_CONFIGURATIONS Debug)

 option(MSVC_USE_RUNTIME_DLL "Use the dynamically linked version of the runtime" OFF)
-option(MSVC_RELEASE_DEBUGGING "Set options that allow to debug release builds" OFF)
-
 MARK_AS_ADVANCED(FORCE MSVC_USE_RUNTIME_DLL)
-MARK_AS_ADVANCED(FORCE MSVC_RELEASE_DEBUGGING)
-
-# These are the warnings we disable
-set(WARNING_FLAGS
-	/wd4100 # unreferenced formal parameters
-	/wd4127 # constant conditional (assert)
-	/wd4201 # nonstandard extension used: nameless struct/union (happens a lot in Windows include headers)
-	/wd4290 # C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
-	/wd4390 # empty control statement (triggered by nprintf and mprintf's inside of one-line if's, etc)
-	/wd4410 # illegal size for operand... ie... 	fxch st(1)
-	/wd4511 # copy constructor could not be generated (happens a lot in Windows include headers)
-	/wd4512 # assignment operator could not be generated (happens a lot in Windows include headers)
-	/wd4514 # unreferenced inline function removed
-	/wd4611 # _setjmp warning.  Since we use setjmp alot, and we don't really use constructors or destructors, this warning doesn't really apply to us.
-	/wd4663 # C++ language change (template specification)
-	/wd4710 # is inline function not expanded (who cares?)
-	/wd4711 # tells us an inline function was expanded (who cares?)
-	/wd4786 # is identifier truncated to 255 characters (happens all the time in Microsoft #includes) -- Goober5000"
-	/wd4996 # deprecated strcpy, strcat, sprintf, etc. (from MSVC 2005) - taylor
-	/wd4311 # Disables warnings about casting pointer types to ints. The funny thing is these warnings can't be resolved, just disabled... - m!m
-	/wd4302 # Same as above - m!m
-	/wd4366 # The result of the unary '&' operator may be unaligned - m!m
-	/wd4592 # "symbol will be dynamically initialized" is being generated by a compiler bug, see https://stackoverflow.com/a/34027257 for an explanation - m!m
-	$<$<CONFIG:Release>:/wd4101> # In release mode there are unreferenced variables because debug needs them
-	/wd4995 # "'vsprintf': name was marked as #pragma deprecated" is being caused by our custom definition of vsprintf. I have no idea what causes this or how to fix it - m!m
-	/wd4723 # "potential divide by 0" is caused by some code that definitely will not divide by zero - m!m
-)
-
-target_compile_options(compiler INTERFACE ${WARNING_FLAGS})

 # Base
-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_C_FLAGS "/MP /GS- /analyze- /Zc:wchar_t /errorReport:prompt /WX- /Zc:forScope /Gd /EHsc /nologo")
+set(CMAKE_CXX_FLAGS "/MP /GS- /analyze- /Zc:wchar_t /errorReport:prompt /WX- /Zc:forScope /Gd /EHsc /nologo")

 set(CMAKE_EXE_LINKER_FLAGS "/MANIFEST /DYNAMICBASE:NO /SAFESEH:NO /ERRORREPORT:PROMPT /NOLOGO")
 set(CMAKE_STATIC_LINKER_FLAGS "")
@@ -56,15 +25,11 @@ set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/LTCG")

 globally_enable_extra_compiler_warnings()

-if (MSVC_RELEASE_DEBUGGING)
-	CHECK_CXX_COMPILER_FLAG("/Zo" MSVC_COMPILER_SUPPORTS_ARCH_ZO)
+CHECK_CXX_COMPILER_FLAG("/Zo" MSVC_COMPILER_SUPPORTS_ARCH_ZO)

-	if (MSVC_COMPILER_SUPPORTS_ARCH_ZO)
-		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")
+if (MSVC_COMPILER_SUPPORTS_ARCH_ZO)
+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zo")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zo")
 endif()

 IF(MSVC_USE_RUNTIME_DLL)
@@ -91,7 +56,7 @@ ENDIF(MSVC_USE_RUNTIME_DLL)
 INCLUDE(MSVCMultipleProcessCompile)

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

 if (NOT DEFINED MSVC_SIMD_INSTRUCTIONS)
 	detect_simd_instructions(MSVC_DETECTED_SIMD_INSTRUCTIONS)
@@ -136,10 +101,5 @@ else()
 	ENDIF()
 endif()

-target_compile_definitions(compiler INTERFACE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _SECURE_SCL=0 NOMINMAX
-		"$<$<CONFIG:FastDebug>:_ITERATOR_DEBUG_LEVEL=0>" _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
-
-if (FSO_FATAL_WARNINGS)
-	# Make warnings fatal if the right variable is set
-	target_compile_options(compiler INTERFACE "/WX")
-endif()
+target_compile_definitions(compiler INTERFACE _CRT_SECURE_NO_DEPRECATE
+	_CRT_SECURE_NO_WARNINGS _SECURE_SCL=0 NOMINMAX)
@@ -20,7 +20,7 @@ ENDIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 # Copy release settings to FastDebug
 set(CMAKE_C_FLAGS_FASTDEBUG "${CMAKE_C_FLAGS_RELEASE}")
 set(CMAKE_CXX_FLAGS_FASTDEBUG "${CMAKE_CXX_FLAGS_RELEASE}")
-set(CMAKE_EXE_LINKER_FLAGS_FASTDEBUG "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
+set(CMAKE_EXE_LINKER_FLAGS_FASTDEBUG "${CMAKE_EXE_LINKER_RELEASE}")
 set(CMAKE_STATIC_LINKER_FLAGS_FASTDEBUG "${CMAKE_STATIC_LINKER_FLAGS_RELEASE}")

 if (MSVC)
@@ -30,4 +30,4 @@ if (MSVC)
 	
 	string(REPLACE "/MD" "/MDd" CMAKE_CXX_FLAGS_FASTDEBUG "${CMAKE_CXX_FLAGS_FASTDEBUG}")
 	string(REPLACE "/MT" "/MTd" CMAKE_CXX_FLAGS_FASTDEBUG "${CMAKE_CXX_FLAGS_FASTDEBUG}")
-endif()
+endif()
@@ -1,6 +1,4 @@

-include(CheckCCompilerFlag)
-
 FUNCTION(MAKE_CACHE_INTERNAL VARIABLE)
 	SET(${VARIABLE} ${${VARIABLE}} CACHE INTERNAL "Internal cache variable")
 ENDFUNCTION(MAKE_CACHE_INTERNAL)
@@ -10,7 +8,7 @@ FUNCTION(ADD_IMPORTED_LIB NAME INCLUDES LIBS)

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

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

 MACRO(PKG_CONFIG_LIB_RESOLVE NAME OUTVAR)
@@ -66,68 +64,16 @@ ENDIF(EXISTS \"${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${FILE}\")
 	SET(${OUTVAR} "${CMAKE_COMMAND}" -P ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${NAME} PARENT_SCOPE)
 ENDFUNCTION(EP_CHECK_FILE_EXISTS)

-MACRO(COPY_FILE_TO_TARGET _target _file)
-	if(UNIX)
-		ADD_CUSTOM_COMMAND(
-			TARGET ${_target} POST_BUILD
-			COMMAND cp -a "${_file}"  "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
-			COMMENT "copying '${_file}'..."
-		)
-	else()
-		ADD_CUSTOM_COMMAND(
-			TARGET ${_target} POST_BUILD
-			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_file}"  "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
-			COMMENT "copying '${_file}'..."
-		)
-	endif()
-endmacro(COPY_FILE_TO_TARGET)
-
 MACRO(COPY_FILES_TO_TARGET _target)
-	if(UNIX)
+	FOREACH(file IN LISTS TARGET_COPY_FILES)
 		ADD_CUSTOM_COMMAND(
 			TARGET ${_target} POST_BUILD
-			COMMAND mkdir -p "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
-			COMMENT "Creating '$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/'..."
+			COMMAND ${CMAKE_COMMAND} -E copy_if_different "${file}"  "$<TARGET_FILE_DIR:${_target}>"
+			COMMENT "copying '${file}'..."
 		)
-	endif()
-	
-	FOREACH(file IN LISTS TARGET_COPY_FILES)
-		COPY_FILE_TO_TARGET("${_target}" "${file}")
 	ENDFOREACH(file)
 ENDMACRO(COPY_FILES_TO_TARGET)

-macro(_clear_old_libraries_state)
-	set(is_debug FALSE)
-	set(is_optimized FALSE)
-endmacro(_clear_old_libraries_state)
-
-function(CONVERT_OLD_LIBRARIES)
-	_clear_old_libraries_state()
-	set(out_list)
-	foreach(lib ${ARGV})
-		if ("${lib}" STREQUAL "debug")
-			_clear_old_libraries_state()
-			set(is_debug TRUE)
-		elseif("${lib}" STREQUAL "optimized")
-			_clear_old_libraries_state()
-			set(is_optimized TRUE)
-		elseif("${lib}" STREQUAL "general")
-			_clear_old_libraries_state()
-		else("${lib}" STREQUAL "debug")
-			# Expecting normal library
-			if(is_debug)
-				list(APPEND out_list "$<$<CONFIG:Debug>:${lib}>" "$<$<CONFIG:FastDebug>:${lib}>")
-			elseif(is_optimized)
-				list(APPEND out_list "$<$<CONFIG:Release>:${lib}>")
-			else(is_debug)
-				list(APPEND out_list "${lib}")
-			endif(is_debug)
-		endif("${lib}" STREQUAL "debug")
-	endforeach(lib)
-
-	set(CONVERTED_LIBRARIES ${out_list} PARENT_SCOPE)
-endfunction(CONVERT_OLD_LIBRARIES)
-
 macro(set_policy policy value)
 	if (POLICY ${policy})
 		cmake_policy(SET ${policy} ${value})
@@ -141,28 +87,28 @@ macro(set_if_not_defined VAR VALUE)
 endmacro(set_if_not_defined)

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

-		cotire(${target})
-	endif()
+		# add ignored paths for the precompiled header here
+		set_target_properties(code PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH
+			"${CMAKE_SOURCE_DIR};${CMAKE_BINARY_DIR}")
+
+		IF(DEFINED CMAKE_CONFIGURATION_TYPES)
+			cotire(${target} CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
+		ELSE(DEFINED CMAKE_CONFIGURATION_TYPES)
+			cotire(${target})
+		ENDIF(DEFINED CMAKE_CONFIGURATION_TYPES)
+	ENDIF(COTIRE_ENABLE)
 endmacro(configure_cotire)

 macro(add_target_copy_files)
-	foreach(file ${ARGN})
-		if (IS_DIRECTORY "${file}")
-			INSTALL(DIRECTORY ${file}
-					DESTINATION ${LIBRAY_DESTINATION}
-					)
-		else()
-			INSTALL(FILES ${file}
-					DESTINATION ${LIBRAY_DESTINATION}
-					)
-		endif()
+	INSTALL(FILES ${ARGN}
+			DESTINATION ${BINARY_DESTINATION}
+	)

-		SET(TARGET_COPY_FILES ${TARGET_COPY_FILES} ${file} CACHE INTERNAL "" FORCE)
-	endforeach()
+	SET(TARGET_COPY_FILES ${TARGET_COPY_FILES} ${ARGN} CACHE INTERNAL "" FORCE)
 endmacro(add_target_copy_files)

 function(detect_simd_instructions _out_var)
@@ -182,56 +128,3 @@ function(detect_simd_instructions _out_var)
 		ENDIF(COMPILE_RESULT)
 	endif()
 endfunction()
-
-function (check_linker_flag _flag _out_var)
-	SET(CMAKE_REQUIRED_FLAGS "${_flag}")
-	CHECK_C_COMPILER_FLAG("" ${_out_var})
-endfunction(check_linker_flag)
-
-# Suppresses warnings for the specified target
-function(suppress_warnings _target)
-    if (MSVC)
-        target_compile_options(${_target} PRIVATE "/W0")
-	else()
-        # Assume everything else uses GCC style options
-		target_compile_options(${_target} PRIVATE "-w")
-    endif()
-endfunction(suppress_warnings)
-
-
-function(list_target_dependencies _target _out_var)
-	set(out_list)
-	set(work_libs ${_target})
-	list(LENGTH work_libs libs_length)
-
-	while(libs_length GREATER 0)
-		list(GET work_libs 0 current)
-		list(REMOVE_AT work_libs 0)
-		list(APPEND out_list ${current})
-
-		get_target_property(current_libs ${current} INTERFACE_LINK_LIBRARIES)
-
-		if(current_libs)
-			foreach(lib ${current_libs})
-				if (TARGET ${lib})
-					list(APPEND work_libs ${lib})
-				endif (TARGET ${lib})
-			endforeach(lib)
-		endif(current_libs)
-
-		list(LENGTH work_libs libs_length)
-	endwhile(libs_length GREATER 0)
-
-	list(REMOVE_DUPLICATES out_list)
-	set(${_out_var} ${out_list} PARENT_SCOPE)
-endfunction(list_target_dependencies)
-
-macro(add_file_folder FOLDER_NAME)
-	string(MAKE_C_IDENTIFIER "${FOLDER_NAME}" VARIABLE_NAME)
-	set(files_${VARIABLE_NAME} ${files_${VARIABLE_NAME}} ${ARGN})
-
-	string(REPLACE "/" "\\" FIXED_FOLDER_FILE "${FOLDER_NAME}")
-
-	source_group("${FIXED_FOLDER_FILE}" FILES ${ARGN})
-	set(source_files ${source_files} ${ARGN})
-endmacro(add_file_folder)
@@ -7,8 +7,8 @@ if (EXISTS "${PROJECT_SOURCE_DIR}/version_override.cmake")
 endif()

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

 # A numeric revision e.g. the CI build number
 set_if_not_defined(FSO_VERSION_REVISION 0)
@@ -16,7 +16,7 @@ set_if_not_defined(FSO_VERSION_REVISION 0)
 # A generic revision string, can be anything
 set_if_not_defined(FSO_VERSION_REVISION_STR "${FSO_VERSION_REVISION}")

-if("${FSO_VERSION_REVISION}" STREQUAL "0" AND "${FSO_VERSION_REVISION_STR}" STREQUAL "${FSO_VERSION_REVISION}")
+if("${FSO_VERSION_REVISION}" STREQUAL "0")
    set(FSO_VERSION_HAS_REVISION 0)
 else()
    set(FSO_VERSION_HAS_REVISION 1)
@@ -25,17 +25,17 @@ endif()
 set(FSO_FULL_VERSION_STRING "${FSO_VERSION_MAJOR}.${FSO_VERSION_MINOR}.${FSO_VERSION_BUILD}")
 set(FSO_PRODUCT_VERSION_STRING "${FSO_FULL_VERSION_STRING}")

-if (FSO_VERSION_HAS_REVISION)
+if (NOT "${FSO_VERSION_REVISION}" STREQUAL "0")
    set(FSO_FULL_VERSION_STRING "${FSO_FULL_VERSION_STRING}.${FSO_VERSION_REVISION_STR}")
 endif()

-IF(NOT FSO_VERSION_HAS_REVISION)
+IF("${FSO_VERSION_REVISION}" STREQUAL "0")
    SET(FSO_BINARY_SUFFIX "${FSO_VERSION_MAJOR}_${FSO_VERSION_MINOR}_${FSO_VERSION_BUILD}")
 ELSE()
    SET(FSO_BINARY_SUFFIX "${FSO_VERSION_MAJOR}_${FSO_VERSION_MINOR}_${FSO_VERSION_BUILD}_${FSO_VERSION_REVISION_STR}")
 ENDIF()

-IF(IS_64BIT)
+IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	# This is a 64-bit builds
    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_x64")
 ENDIF()
@@ -3,7 +3,7 @@ INCLUDE(source_groups.cmake)

 INCLUDE(voice_rec.cmake)

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

 target_compile_features(code PUBLIC ${REQUIRED_CXX_FEATURES})

@@ -21,37 +21,26 @@ TARGET_INCLUDE_DIRECTORIES(code PUBLIC ${GENERATED_SOURCE_DIR}/code)

 target_link_libraries(code PUBLIC OpenGL)

-TARGET_LINK_LIBRARIES(code PUBLIC openal)
+TARGET_LINK_LIBRARIES(code PUBLIC ${OPENAL_LIBS})
 TARGET_LINK_LIBRARIES(code PUBLIC ${LUA_LIBS})
 TARGET_LINK_LIBRARIES(code PUBLIC ${PNG_LIBS})
 TARGET_LINK_LIBRARIES(code PUBLIC ${JPEG_LIBS})

-TARGET_LINK_LIBRARIES(code PUBLIC sdl2)
+TARGET_LINK_LIBRARIES(code PUBLIC oggvorbis)

-TARGET_LINK_LIBRARIES(code PUBLIC ffmpeg)
-
-TARGET_LINK_LIBRARIES(code PUBLIC utfcpp)
+TARGET_LINK_LIBRARIES(code PUBLIC ${SDL_LIBS})

 TARGET_LINK_LIBRARIES(code PUBLIC platform)
 TARGET_LINK_LIBRARIES(code PUBLIC compiler)

-target_link_libraries(code PUBLIC md5)
-
-target_link_libraries(code PUBLIC discord-rpc)
-
-target_link_libraries(code PUBLIC libRocket)
-
-enable_clang_tidy(code)
-
 IF (FSO_USE_SPEECH)
 	find_package(Speech REQUIRED)
 	target_link_libraries(code PUBLIC speech)
 ENDIF(FSO_USE_SPEECH)

-TARGET_LINK_LIBRARIES(code PUBLIC jansson)
-
 # Headers for standalone "gui" on UNIX
 IF(UNIX)
+	TARGET_LINK_LIBRARIES(code PUBLIC jansson)
 	TARGET_LINK_LIBRARIES(code PUBLIC ${MONGOOSE_LIBS})
 ENDIF(UNIX)

@@ -61,27 +50,7 @@ IF(FSO_BUILD_TOOLS)
 	ADD_SUBDIRECTORY(cfileextractor)
 ENDIF(FSO_BUILD_TOOLS)

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

-# Ensure that Xcode generates debug symbols on macOS for Debug builds
-set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS[variant=Debug] "YES")
-set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_COPY_PHASE_STRIP[variant=Debug] "NO")
-set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_STRIP_INSTALLED_PRODUCT[variant=Debug] "NO")
-set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN[variant=Debug] "NO")
+include(../cmake/Cxx11.cmake)
@@ -18,9 +18,8 @@
 #include "globalincs/systemvars.h"
 #include "object/waypoint.h"
 #include "physics/physics.h"
-#include "ship/ship_flags.h"

-class ship_weapon;
+struct ship_weapon;
 class ship_subsys;
 class object;
 class ship_info;
@@ -28,13 +27,48 @@ class ship_info;
 #define	AI_DEFAULT_CLASS 3  // default AI class for new ships (Fred)

 typedef struct ai_flag_name {
-	AI::AI_Flags flag;
+	int flag;
 	char flag_name[TOKEN_LENGTH];
+	int flag_list;
 } ai_flag_name;

 #define MAX_AI_FLAG_NAMES			2
 extern ai_flag_name Ai_flag_names[];

+#define	AIF_FORMATION_WING					(1 << 0)	//	Fly in formation as part of wing.
+#define	AIF_AWAITING_REPAIR					(1 << 1)	//	Awaiting a repair ship.
+#define	AIF_BEING_REPAIRED					(1 << 2)	//	Currently docked with repair ship.
+#define	AIF_REPAIRING						(1 << 3)	//	Repairing a ship (or going to repair a ship)
+#define	AIF_SEEK_LOCK						(1 << 4)	//	set if should focus on gaining aspect lock, not hitting with lasers
+#define	AIF_FORMATION_OBJECT				(1 << 5)	//	Fly in formation off a specific object.
+#define	AIF_TEMPORARY_IGNORE				(1 << 6)	//	Means current ignore_objnum is only temporary, not an order from the player.
+#define	AIF_USE_EXIT_PATH					(1 << 7)	//  Used by path code, to flag path as an exit path
+#define	AIF_USE_STATIC_PATH					(1 << 8)	//  Used by path code, use fixed path, don't try to recreate
+#define	AIF_TARGET_COLLISION				(1 << 9)	//	Collided with aip->target_objnum last frame.  Avoid that ship for half a second or so.
+#define	AIF_UNLOAD_SECONDARIES				(1 << 10)	//	Fire secondaries as fast as possible!
+#define	AIF_ON_SUBSYS_PATH					(1 << 11)	//  Current path leads to a subsystem
+#define	AIF_AVOID_SHOCKWAVE_SHIP			(1 << 12)	//	Avoid an existing shockwave from a ship.
+#define	AIF_AVOID_SHOCKWAVE_WEAPON			(1 << 13)	//	Avoid an expected shockwave from a weapon.  shockwave_object field contains object index.
+#define	AIF_AVOID_SHOCKWAVE_STARTED			(1 << 14)	//	Already started avoiding shockwave, don't keep deciding whether to avoid.
+#define	AIF_ATTACK_SLOWLY					(1 << 15)	//	Move slowly while attacking.
+#define	AIF_REPAIR_OBSTRUCTED				(1 << 16)	//	Ship wants to be repaired, but path is obstructed.
+#define	AIF_KAMIKAZE						(1 << 17)	//	Crash into target
+#define	AIF_NO_DYNAMIC						(1 << 18)	//	Not allowed to get dynamic goals
+#define	AIF_AVOIDING_SMALL_SHIP				(1 << 19)	//	Avoiding a player ship.
+#define	AIF_AVOIDING_BIG_SHIP				(1 << 20)	//	Avoiding a large ship.
+#define	AIF_BIG_SHIP_COLLIDE_RECOVER_1		(1 << 21)	//	Collided into a big ship.  Recovering by flying away.
+#define	AIF_BIG_SHIP_COLLIDE_RECOVER_2		(1 << 22)	//	Collided into a big ship.  Fly towards big ship sphere perimeter.
+#define	AIF_STEALTH_PURSUIT					(1 << 23)	//  AI is trying to fight stealth ship
+
+// Goober5000
+#define	AIF_UNLOAD_PRIMARIES				(1 << 24)	//	Fire primaries as fast as possible!
+#define AIF_TRYING_UNSUCCESSFULLY_TO_WARP	(1 << 25)	// Trying to warp, but can't warp at the moment
+
+#define AIF_FREE_AFTERBURNER_USE			(1 << 26)	// Use afterburners while following waypoints or flying towards objects
+
+#define	AIF_AVOID_SHOCKWAVE		(AIF_AVOID_SHOCKWAVE_SHIP | AIF_AVOID_SHOCKWAVE_WEAPON)
+#define	AIF_FORMATION			(AIF_FORMATION_WING | AIF_FORMATION_OBJECT)
+
 //	dock_orient_and_approach() modes.
 #define	DOA_APPROACH	1		//	Approach the current point on the path (aip->path_cur)
 #define	DOA_DOCK		2		//	Dock with goal object.
@@ -66,6 +100,19 @@ extern ai_flag_name Ai_flag_names[];
 #define AIG_TYPE_PLAYER_WING		4		// from player direct to wing
 #define AIG_TYPE_DYNAMIC			5		// created on the fly

+// flags for AI_GOALS
+#define AIGF_DOCKER_INDEX_VALID		(1<<0)	// when set, index field for docker is valid
+#define AIGF_DOCKEE_INDEX_VALID		(1<<1)	// when set, index field for dockee is valid
+#define AIGF_GOAL_ON_HOLD			(1<<2)	// when set, this goal cannot currently be satisfied, although it could be in the future
+#define AIGF_SUBSYS_NEEDS_FIXUP		(1<<3)	// when set, the subsystem index (for a destroy subsystem goal) is invalid and must be gotten from the subsys name stored in docker.name field!!
+#define AIGF_GOAL_OVERRIDE			(1<<4)	// paired with AIG_TYPE_DYNAMIC to mean this goal overrides any other goal
+#define AIGF_PURGE					(1<<5)	// purge this goal next time we process
+#define AIGF_GOALS_PURGED			(1<<6)	// this goal has already caused other goals to get purged
+#define AIGF_DEPART_SOUND_PLAYED	(1<<7)	// Goober5000 - replacement for AL's hack ;)
+#define AIGF_TARGET_OWN_TEAM		(1<<8)	// Goober5000 - removes standard precautions against AI ships taking traitorous actions
+
+#define AIGF_DOCK_INDEXES_VALID		(AIGF_DOCKER_INDEX_VALID|AIGF_DOCKEE_INDEX_VALID)
+
 //	Flags to ai_turn_towards_vector().
 #define	AITTV_FAST					(1<<0)	//	Turn fast, not slowed down based on skill level.
 #define AITTV_VIA_SEXP				(1<<1)	//	Goober5000 - via sexp
@@ -73,13 +120,23 @@ extern ai_flag_name Ai_flag_names[];

 #define	KAMIKAZE_HULL_ON_DEATH	-1000.0f	//	Hull strength ship gets set to if it crash-dies.

+// flags for possible ai overrides
+#define AIORF_FULL					(1<<0)	//	Full sexp control
+#define AIORF_ROLL					(1<<1)	//	Sexp forced roll maneuver
+#define AIORF_PITCH					(1<<2)	//	Sexp forced pitch change
+#define AIORF_HEADING				(1<<3)	//	Sexp forced heading change
+#define AIORF_FULL_LAT				(1<<4)	//  full control over up/side/forward movement
+#define AIORF_UP					(1<<5)	//	vertical movement
+#define AIORF_SIDEWAYS				(1<<6)	//	horizontal movement
+#define AIORF_FORWARD				(1<<7)	//	forward movement
+
 // structure for AI goals
 typedef struct ai_goal {
 	int	signature;			//	Unique identifier.  All goals ever created (per mission) have a unique signature.
 	int	ai_mode;				// one of the AIM_* modes for this goal
 	int	ai_submode;			// maybe need a submode
 	int	type;					// one of the AIG_TYPE_* values above
-	flagset<AI::Goal_Flags>	flags;				// one of the AIGF_* values above
+	int	flags;				// one of the AIGF_* values above
 	fix	time;					// time at which this goal was issued.
 	int	priority;			// how important is this goal -- number 0 - 100

@@ -170,8 +227,10 @@ typedef struct ai_class {
 	int		ai_chance_to_use_missiles_on_plr[NUM_SKILL_LEVELS];
 	float	ai_max_aim_update_delay[NUM_SKILL_LEVELS];
 	float	ai_turret_max_aim_update_delay[NUM_SKILL_LEVELS];
-	flagset<AI::Profile_Flags>		ai_profile_flags;		//Holds the state of flags that are set
-	flagset<AI::Profile_Flags>		ai_profile_flags_set;	//Holds which flags are set and which are just left alone
+	int		ai_profile_flags;		//Holds the state of flags that are set
+	int		ai_profile_flags_set;	//Holds which flags are set and which are just left alone
+	int		ai_profile_flags2;		
+	int		ai_profile_flags2_set;	

 	//SUSHI: These are optional overrides to an AI class to prevent the automatic scaling based on AI class index
 	int		ai_aburn_use_factor[NUM_SKILL_LEVELS];		
@@ -268,7 +327,7 @@ extern pnode	*Ppfp;			//	Free pointer in path points.
 #define MAX_IGNORE_NEW_OBJECTS	7

 typedef struct ai_info {
-	flagset<AI::AI_Flags> ai_flags;				//	Special flags for AI behavior.
+	int		ai_flags;				//	Special flags for AI behavior.
 	int		shipnum;					// Ship using this slot, -1 means none.
 	int		type;						//	
 	int		wing;						//	Member of what wing? -1 means none. 
@@ -401,7 +460,8 @@ typedef struct ai_info {
 	int		ai_chance_to_use_missiles_on_plr;
 	float	ai_max_aim_update_delay;
 	float	ai_turret_max_aim_update_delay;
-	flagset<AI::Profile_Flags> ai_profile_flags;	//Holds AI_Profiles flags (possibly overriden by AI class) that actually apply to AI
+	int		ai_profile_flags;	//Holds AI_Profiles flags (possibly overriden by AI class) that actually apply to AI
+	int		ai_profile_flags2;	


 	union {
@@ -485,7 +545,7 @@ typedef struct ai_info {
 	vec3d	artillery_lock_pos;				// base position of the lock point on (in model's frame of reference)
 	float		lethality;							// measure of how dangerous ship is to enemy BIG|HUGE ships (likelyhood of targeting)

-	flagset<AI::Maneuver_Override_Flags>	ai_override_flags;			// flags for marking ai overrides from sexp or lua systems
+	int		ai_override_flags;			// flags for marking ai overrides from sexp or lua systems
 	control_info	ai_override_ci;		// ai override control info
 	int		ai_override_timestamp;		// mark for when to end the current override
 } ai_info;
@@ -559,7 +619,7 @@ void set_wingnum(int objnum, int wingnum);
 char *ai_get_goal_target_name(const char *name, int *index);

 extern void init_ai_system(void);
-extern void ai_attack_object(object *attacker, object *attacked, ship_subsys *ssp, int ship_info_index = -1);
+extern void ai_attack_object(object *attacker, object *attacked, ship_subsys *ssp);
 extern void ai_evade_object(object *evader, object *evaded);
 extern void ai_ignore_object(object *ignorer, object *ignored, int ignore_new);
 extern void ai_ignore_wing(object *ignorer, int wingnum);
@@ -567,9 +627,9 @@ extern void ai_dock_with_object(object *docker, int docker_index, object *dockee
 extern void ai_stay_still(object *still_objp, vec3d *view_pos);
 extern void ai_do_default_behavior(object *obj);
 extern void ai_start_waypoints(object *objp, waypoint_list *wp_list, int wp_flags);
-extern void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hit_normal);
-extern void ai_ship_destroy(int shipnum);
-extern void ai_turn_towards_vector(vec3d *dest, object *objp, float turn_time, vec3d *slide_vec, vec3d *rel_pos, float bank_override, int flags, vec3d *rvec = nullptr, int sexp_flags = 0);
+extern void ai_ship_hit(object *objp_ship, object *hit_objp, vec3d *hitpos, int shield_quadrant, vec3d *hit_normal);
+extern void ai_ship_destroy(int shipnum, int method);
+extern void ai_turn_towards_vector(vec3d *dest, object *objp, float frametime, float turn_time, vec3d *slide_vec, vec3d *rel_pos, float bank_override, int flags, vec3d *rvec = NULL, int sexp_flags = 0);
 extern void init_ai_object(int objnum);
 extern void ai_init(void);				//	Call this one to parse ai.tbl.
 extern void ai_level_init(void);		//	Call before each level to reset AI
@@ -622,14 +682,14 @@ extern float ai_path();
 extern void evade_weapon();
 extern int might_collide_with_ship(object *obj1, object *obj2, float dot_to_enemy, float dist_to_enemy, float duration);
 extern int ai_fire_primary_weapon(object *objp);	//changed to return weather it fired-Bobboau
-extern int ai_fire_secondary_weapon(object *objp);
+extern int ai_fire_secondary_weapon(object *objp, int priority1 = -1, int priority2 = -1);
 extern float ai_get_weapon_dist(ship_weapon *swp);
 extern void turn_towards_point(object *objp, vec3d *point, vec3d *slide_vec, float bank_override);
 extern int ai_maybe_fire_afterburner(object *objp, ai_info *aip);
 extern void set_predicted_enemy_pos(vec3d *predicted_enemy_pos, object *pobjp, vec3d *enemy_pos, vec3d *enemy_vel, ai_info *aip);

 extern int is_instructor(object *objp);
-extern int find_enemy(int objnum, float range, int max_attackers, int ship_info_index = -1);
+extern int find_enemy(int objnum, float range, int max_attackers);

 float ai_get_weapon_speed(ship_weapon *swp);
 void set_predicted_enemy_pos_turret(vec3d *predicted_enemy_pos, vec3d *gun_pos, object *pobjp, vec3d *enemy_pos, vec3d *enemy_vel, float weapon_speed, float time_enemy_in_range);
@@ -651,7 +711,7 @@ extern int find_danger_weapon(object *sobjp, float dtime, float *atime, float do
 void ai_set_mode_warp_out(object *objp, ai_info *aip);

 // prototyped by Goober5000
-int get_nearest_objnum(int objnum, int enemy_team_mask, int enemy_wing, float range, int max_attackers, int ship_info_index);
+int get_nearest_objnum(int objnum, int enemy_team_mask, int enemy_wing, float range, int max_attackers);

 // moved to header file by Goober5000
 void ai_announce_ship_dying(object *dying_objp);
@@ -1,123 +0,0 @@
-#ifndef AI_FLAGS_H
-#define AI_FLAGS_H
-
-#include "globalincs/flagset.h"
-
-namespace AI {
-	FLAG_LIST(AI_Flags) {
-		Formation_wing,				//	Fly in formation as part of wing.
-		Awaiting_repair,			//	Awaiting a repair ship.
-		Being_repaired,				//	Currently docked with repair ship.
-		Repairing,					//	Repairing a ship (or going to repair a ship)
-		Seek_lock,					//	set if should focus on gaining aspect lock, not hitting with lasers
-		Formation_object,			//	Fly in formation off a specific object.
-		Temporary_ignore,			//	Means current ignore_objnum is only temporary, not an order from the player.
-		Use_exit_path,				//  Used by path code, to flag path as an exit path
-		Use_static_path,			//  Used by path code, use fixed path, don't try to recreate
-		Target_collision,			//	Collided with aip->target_objnum last frame.  Avoid that ship for half a second or so.
-		Unload_secondaries,			//	Fire secondaries as fast as possible!
-		On_subsys_path,				//  Current path leads to a subsystem
-		Avoid_shockwave_ship,		//	Avoid an existing shockwave from a ship.
-		Avoid_shockwave_weapon,		//	Avoid an expected shockwave from a weapon.  shockwave_object field contains object index.
-		Avoid_shockwave_started,	//	Already started avoiding shockwave, don't keep deciding whether to avoid.
-		Attack_slowly,				//	Move slowly while attacking.
-		Repair_obstructed,			//	Ship wants to be repaired, but path is obstructed.
-		Kamikaze,					//	Crash into target
-		No_dynamic,					//	Not allowed to get dynamic goals
-		Avoiding_small_ship,		//	Avoiding a player ship.
-		Avoiding_big_ship,			//	Avoiding a large ship.
-		Big_ship_collide_recover_1,	//	Collided into a big ship.  Recovering by flying away.
-		Big_ship_collide_recover_2,	//	Collided into a big ship.  Fly towards big ship sphere perimeter.
-		Stealth_pursuit,			//  AI is trying to fight stealth ship
-		Unload_primaries,			//	Fire primaries as fast as possible!
-		Trying_unsuccessfully_to_warp,	// Trying to warp, but can't warp at the moment
-		Free_afterburner_use,		// Use afterburners while following waypoints or flying towards objects
-
-		NUM_VALUES
-	};
-
-	FLAG_LIST(Goal_Flags) {
-		Docker_index_valid,	// when set, index field for docker is valid
-		Dockee_index_valid,	// when set, index field for dockee is valid
-		Goal_on_hold,		// when set, this goal cannot currently be satisfied, although it could be in the future
-		Subsys_needs_fixup,	// when set, the subsystem index (for a destroy subsystem goal) is invalid and must be gotten from the subsys name stored in docker.name field!!
-		Goal_override,		// paired with AIG_TYPE_DYNAMIC to mean this goal overrides any other goal
-		Purge,				// purge this goal next time we process
-		Goals_purged,		// this goal has already caused other goals to get purged
-		Depart_sound_played,// Goober5000 - replacement for AL's hack ;)
-		Target_own_team,
-
-		NUM_VALUES
-	};
-
-	FLAG_LIST(Maneuver_Override_Flags) {
-		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,			//	vertical movement
-		Sideways,	//	horizontal movement
-		Forward,	//	forward movement
-
-		NUM_VALUES
-	};
-
-	FLAG_LIST(Profile_Flags) {
-        Advanced_turret_fov_edge_checks,
-        Ai_aims_from_ship_center,
-        Ai_can_slow_down_attacking_big_ships,
-        Ai_guards_specific_ship_in_wing,
-        All_ships_manage_shields,
-        Allow_multi_event_scoring,
-        Allow_primary_link_at_start,
-        Allow_rapid_secondary_dumbfire,
-        Allow_turrets_target_weapons_freely,
-        Allow_vertical_dodge,
-        Aspect_invulnerability_fix,
-        Aspect_lock_countermeasure,
-        Assist_scoring_scales_with_damage,
-        Beams_damage_weapons,
-        Big_ships_can_attack_beam_turrets_on_untargeted_ships,
-        Disable_linked_fire_penalty,
-        Disable_weapon_damage_scaling,
-        Dont_insert_random_turret_fire_delay,
-        Fix_ai_class_bug,
-        Fix_ai_path_order_bug,
-        Fix_heat_seeker_stealth_bug,
-        Fix_linked_primary_bug,
-        Force_beam_turret_fov,
-		Free_afterburner_use,
-        Glide_decay_requires_thrust,
-        Hack_improve_non_homing_swarm_turret_fire_accuracy,
-        Huge_turret_weapons_ignore_bombs,
-        Include_beams_in_stat_calcs,
-        Kill_scoring_scales_with_damage,
-        Multi_allow_empty_primaries,
-        Multi_allow_empty_secondaries,
-        Navigation_subsys_governs_warp,
-        No_min_dock_speed_cap,
-        No_special_player_avoid,
-        No_warp_camera,
-        Perform_fewer_scream_checks,
-        Player_weapon_scale_fix,
-        Prevent_targeting_bombs_beyond_range,
-        Require_turret_to_have_target_in_fov,
-        Shockwaves_damage_small_ship_subsystems,
-        Smart_afterburner_management,
-        Smart_primary_weapon_selection,
-        Smart_secondary_weapon_selection,
-        Smart_shield_management,
-        Smart_subsystem_targeting_for_turrets,
-        Strict_turred_tagged_only_targeting,
-        Turrets_ignore_target_radius,
-        Use_actual_primary_range,
-        Use_additive_weapon_velocity,
-        Use_newtonian_dampening,
-        Use_only_single_fov_for_turrets,
-
-		NUM_VALUES
-	};
-}
-
-#endif
@@ -10,6 +10,7 @@
 #include "globalincs/pstypes.h"
 #include "def_files/def_files.h"
 #include "ai/ai_profiles.h"
+#include "def_files/def_files.h"
 #include "globalincs/pstypes.h"
 #include "localization/localize.h"
 #include "parse/parselo.h"
@@ -28,17 +29,28 @@ static char Default_profile_name[NAME_LENGTH];


 // utility
-void set_flag(ai_profile_t *profile, const char *name, AI::Profile_Flags flag)
+void set_flag(ai_profile_t *profile, char *name, int flag, int type)
 {
 	if (optional_string(name))
 	{
 		bool val;
 		stuff_boolean(&val);
-        profile->flags.set(flag, val);
+
+		if (type == AIP_FLAG) {
+			if (val)
+				profile->flags |= flag;
+			else
+				profile->flags &= ~flag;
+		} else {
+			if (val)
+				profile->flags2 |= flag;
+			else
+				profile->flags2 &= ~flag;
+		}
 	}
 }

-const char *AI_path_types[] = {
+char *AI_path_types[] = {
 	"normal",
 	"alt1",
 };
@@ -141,12 +153,12 @@ void parse_ai_profiles_tbl(const char *filename)
 				// base profile, so zero it out
 				if (profile == &Ai_profiles[0])
 				{
-                    profile->reset();
+					memset(profile, 0, sizeof(ai_profile_t));
 				}
 				// brand new profile, so set it to the base defaults
 				else
 				{
-                    *profile = Ai_profiles[0];
+					memcpy(profile, &Ai_profiles[0], sizeof(ai_profile_t));
 				}
 			}

@@ -345,95 +357,93 @@ void parse_ai_profiles_tbl(const char *filename)
 				}

 				if (optional_string("$Detail Distance Multiplier:"))
-					parse_float_list(profile->detail_distance_mult, MAX_DETAIL_LEVEL + 1);
+					parse_float_list(profile->detail_distance_mult, NUM_SKILL_LEVELS);

-				set_flag(profile, "$big ships can attack beam turrets on untargeted ships:", AI::Profile_Flags::Big_ships_can_attack_beam_turrets_on_untargeted_ships);
+				set_flag(profile, "$big ships can attack beam turrets on untargeted ships:", AIPF_BIG_SHIPS_CAN_ATTACK_BEAM_TURRETS_ON_UNTARGETED_SHIPS, AIP_FLAG);

-				set_flag(profile, "$smart primary weapon selection:", AI::Profile_Flags::Smart_primary_weapon_selection);
+				set_flag(profile, "$smart primary weapon selection:", AIPF_SMART_PRIMARY_WEAPON_SELECTION, AIP_FLAG);

-				set_flag(profile, "$smart secondary weapon selection:", AI::Profile_Flags::Smart_secondary_weapon_selection);
+				set_flag(profile, "$smart secondary weapon selection:", AIPF_SMART_SECONDARY_WEAPON_SELECTION, AIP_FLAG);

-				set_flag(profile, "$smart shield management:", AI::Profile_Flags::Smart_shield_management);
+				set_flag(profile, "$smart shield management:", AIPF_SMART_SHIELD_MANAGEMENT, AIP_FLAG);

-				set_flag(profile, "$smart afterburner management:", AI::Profile_Flags::Smart_afterburner_management);
+				set_flag(profile, "$smart afterburner management:", AIPF_SMART_AFTERBURNER_MANAGEMENT, AIP_FLAG);

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

-				set_flag(profile, "$allow rapid secondary dumbfire:", AI::Profile_Flags::Allow_rapid_secondary_dumbfire);
+				set_flag(profile, "$huge turret weapons ignore bombs:", AIPF_HUGE_TURRET_WEAPONS_IGNORE_BOMBS, AIP_FLAG);

-				set_flag(profile, "$huge turret weapons ignore bombs:", AI::Profile_Flags::Huge_turret_weapons_ignore_bombs);
+				set_flag(profile, "$don't insert random turret fire delay:", AIPF_DONT_INSERT_RANDOM_TURRET_FIRE_DELAY, AIP_FLAG);

-				set_flag(profile, "$don't insert random turret fire delay:", AI::Profile_Flags::Dont_insert_random_turret_fire_delay);
+				set_flag(profile, "$hack improve non-homing swarm turret fire accuracy:", AIPF_HACK_IMPROVE_NON_HOMING_SWARM_TURRET_FIRE_ACCURACY, AIP_FLAG);

-				set_flag(profile, "$hack improve non-homing swarm turret fire accuracy:", AI::Profile_Flags::Hack_improve_non_homing_swarm_turret_fire_accuracy);
+				set_flag(profile, "$shockwaves damage small ship subsystems:", AIPF_SHOCKWAVES_DAMAGE_SMALL_SHIP_SUBSYSTEMS, AIP_FLAG);

-				set_flag(profile, "$shockwaves damage small ship subsystems:", AI::Profile_Flags::Shockwaves_damage_small_ship_subsystems);
+				set_flag(profile, "$navigation subsystem governs warpout capability:", AIPF_NAVIGATION_SUBSYS_GOVERNS_WARP, AIP_FLAG);

-				set_flag(profile, "$navigation subsystem governs warpout capability:", AI::Profile_Flags::Navigation_subsys_governs_warp);
+				set_flag(profile, "$ignore lower bound for minimum speed of docked ship:", AIPF_NO_MIN_DOCK_SPEED_CAP, AIP_FLAG);

-				set_flag(profile, "$ignore lower bound for minimum speed of docked ship:", AI::Profile_Flags::No_min_dock_speed_cap);
+				set_flag(profile, "$disable linked fire penalty:", AIPF_DISABLE_LINKED_FIRE_PENALTY, AIP_FLAG);

-				set_flag(profile, "$disable linked fire penalty:", AI::Profile_Flags::Disable_linked_fire_penalty);
+				set_flag(profile, "$disable weapon damage scaling:", AIPF_DISABLE_WEAPON_DAMAGE_SCALING, AIP_FLAG);

-				set_flag(profile, "$disable weapon damage scaling:", AI::Profile_Flags::Disable_weapon_damage_scaling);
+				set_flag(profile, "$use additive weapon velocity:", AIPF_USE_ADDITIVE_WEAPON_VELOCITY, AIP_FLAG);

-				set_flag(profile, "$use additive weapon velocity:", AI::Profile_Flags::Use_additive_weapon_velocity);
+				set_flag(profile, "$use newtonian dampening:", AIPF_USE_NEWTONIAN_DAMPENING, AIP_FLAG);

-				set_flag(profile, "$use newtonian dampening:", AI::Profile_Flags::Use_newtonian_dampening);
+				set_flag(profile, "$include beams for kills and assists:", AIPF_INCLUDE_BEAMS_IN_STAT_CALCS, AIP_FLAG);

-				set_flag(profile, "$include beams for kills and assists:", AI::Profile_Flags::Include_beams_in_stat_calcs);
+				set_flag(profile, "$score kills based on damage caused:", AIPF_KILL_SCORING_SCALES_WITH_DAMAGE, AIP_FLAG);

-				set_flag(profile, "$score kills based on damage caused:", AI::Profile_Flags::Kill_scoring_scales_with_damage);
+				set_flag(profile, "$score assists based on damage caused:", AIPF_ASSIST_SCORING_SCALES_WITH_DAMAGE, AIP_FLAG);

-				set_flag(profile, "$score assists based on damage caused:", AI::Profile_Flags::Assist_scoring_scales_with_damage);
+				set_flag(profile, "$allow event and goal scoring in multiplayer:", AIPF_ALLOW_MULTI_EVENT_SCORING, AIP_FLAG);

-				set_flag(profile, "$allow event and goal scoring in multiplayer:", AI::Profile_Flags::Allow_multi_event_scoring);
+				set_flag(profile, "$fix linked primary weapon decision bug:", AIPF_FIX_LINKED_PRIMARY_BUG, AIP_FLAG);

-				set_flag(profile, "$fix linked primary weapon decision bug:", AI::Profile_Flags::Fix_linked_primary_bug);
+				set_flag(profile, "$prevent turrets targeting too distant bombs:", AIPF_PREVENT_TARGETING_BOMBS_BEYOND_RANGE, AIP_FLAG);

-				set_flag(profile, "$prevent turrets targeting too distant bombs:", AI::Profile_Flags::Prevent_targeting_bombs_beyond_range);
+				set_flag(profile, "$smart subsystem targeting for turrets:", AIPF_SMART_SUBSYSTEM_TARGETING_FOR_TURRETS, AIP_FLAG);

-				set_flag(profile, "$smart subsystem targeting for turrets:", AI::Profile_Flags::Smart_subsystem_targeting_for_turrets);
+				set_flag(profile, "$fix heat seekers homing on stealth ships bug:", AIPF_FIX_HEAT_SEEKER_STEALTH_BUG, AIP_FLAG);

-				set_flag(profile, "$fix heat seekers homing on stealth ships bug:", AI::Profile_Flags::Fix_heat_seeker_stealth_bug);
+				set_flag(profile, "$multi allow empty primaries:", AIPF_MULTI_ALLOW_EMPTY_PRIMARIES, AIP_FLAG);

-				set_flag(profile, "$multi allow empty primaries:", AI::Profile_Flags::Multi_allow_empty_primaries);
+				set_flag(profile, "$multi allow empty secondaries:", AIPF_MULTI_ALLOW_EMPTY_SECONDARIES, AIP_FLAG);

-				set_flag(profile, "$multi allow empty secondaries:", AI::Profile_Flags::Multi_allow_empty_secondaries);
+				set_flag(profile, "$allow turrets target weapons freely:", AIPF_ALLOW_TURRETS_TARGET_WEAPONS_FREELY, AIP_FLAG);

-				set_flag(profile, "$allow turrets target weapons freely:", AI::Profile_Flags::Allow_turrets_target_weapons_freely);
+				set_flag(profile, "$use only single fov for turrets:", AIPF_USE_ONLY_SINGLE_FOV_FOR_TURRETS, AIP_FLAG);

-				set_flag(profile, "$use only single fov for turrets:", AI::Profile_Flags::Use_only_single_fov_for_turrets);
+				set_flag(profile, "$allow vertical dodge:", AIPF_ALLOW_VERTICAL_DODGE, AIP_FLAG);

-				set_flag(profile, "$allow vertical dodge:", AI::Profile_Flags::Allow_vertical_dodge);
+				set_flag(profile, "$force beam turrets to use normal fov:", AIPF_FORCE_BEAM_TURRET_FOV, AIP_FLAG);

-				set_flag(profile, "$force beam turrets to use normal fov:", AI::Profile_Flags::Force_beam_turret_fov);
+				set_flag(profile, "$fix ai class bug:", AIPF_FIX_AI_CLASS_BUG, AIP_FLAG);

-				set_flag(profile, "$fix ai class bug:", AI::Profile_Flags::Fix_ai_class_bug);
+				set_flag(profile, "$turrets ignore targets radius in range checks:", AIPF2_TURRETS_IGNORE_TARGET_RADIUS, AIP_FLAG2);

-				set_flag(profile, "$turrets ignore targets radius in range checks:", AI::Profile_Flags::Turrets_ignore_target_radius);
+				set_flag(profile, "$no extra collision avoidance vs player:", AIPF2_NO_SPECIAL_PLAYER_AVOID, AIP_FLAG2);

-				set_flag(profile, "$no extra collision avoidance vs player:", AI::Profile_Flags::No_special_player_avoid);
+				set_flag(profile, "$perform fewer checks for death screams:", AIPF2_PERFORM_FEWER_SCREAM_CHECKS, AIP_FLAG2);

-				set_flag(profile, "$perform fewer checks for death screams:", AI::Profile_Flags::Perform_fewer_scream_checks);
+				set_flag(profile, "$advanced turret fov edge checks:", AIPF2_ADVANCED_TURRET_FOV_EDGE_CHECKS, AIP_FLAG2);

-				set_flag(profile, "$advanced turret fov edge checks:", AI::Profile_Flags::Advanced_turret_fov_edge_checks);
+				set_flag(profile, "$require turrets to have target in fov:", AIPF2_REQUIRE_TURRET_TO_HAVE_TARGET_IN_FOV, AIP_FLAG2);

-				set_flag(profile, "$require turrets to have target in fov:", AI::Profile_Flags::Require_turret_to_have_target_in_fov);
+				set_flag(profile, "$all ships manage shields:", AIPF2_ALL_SHIPS_MANAGE_SHIELDS, AIP_FLAG2);

-				set_flag(profile, "$all ships manage shields:", AI::Profile_Flags::All_ships_manage_shields);
+				set_flag(profile, "$ai aims from ship center:", AIPF2_AI_AIMS_FROM_SHIP_CENTER, AIP_FLAG2);

-				set_flag(profile, "$ai aims from ship center:", AI::Profile_Flags::Ai_aims_from_ship_center);
+				set_flag(profile, "$allow primary link at mission start:", AIPF2_ALLOW_PRIMARY_LINK_AT_START, AIP_FLAG2);

-				set_flag(profile, "$allow primary link at mission start:", AI::Profile_Flags::Allow_primary_link_at_start);
+				set_flag(profile, "$allow beams to damage bombs:", AIPF2_BEAMS_DAMAGE_WEAPONS, AIP_FLAG2);

-				set_flag(profile, "$allow beams to damage bombs:", AI::Profile_Flags::Beams_damage_weapons);
+				set_flag(profile, "$disable weapon damage scaling for player:", AIPF2_PLAYER_WEAPON_SCALE_FIX, AIP_FLAG2);

-				set_flag(profile, "$disable weapon damage scaling for player:", AI::Profile_Flags::Player_weapon_scale_fix);
+				set_flag(profile, "$countermeasures affect aspect seekers:", AIPF2_ASPECT_LOCK_COUNTERMEASURE, AIP_FLAG2);

-				set_flag(profile, "$countermeasures affect aspect seekers:", AI::Profile_Flags::Aspect_lock_countermeasure);
-
-				set_flag(profile, "$ai guards specific ship in wing:", AI::Profile_Flags::Ai_guards_specific_ship_in_wing);
+				set_flag(profile, "$ai guards specific ship in wing:", AIPF2_AI_GUARDS_SPECIFIC_SHIP_IN_WING, AIP_FLAG2);

 				profile->ai_path_mode = AI_PATH_MODE_NORMAL;
 				if (optional_string("$ai path mode:"))
@@ -448,19 +458,15 @@ void parse_ai_profiles_tbl(const char *filename)
 					}
 				}

-				set_flag(profile, "$no warp camera:", AI::Profile_Flags::No_warp_camera);
+				set_flag(profile, "$no warp camera:", AIPF2_NO_WARP_CAMERA, AIP_FLAG2);

-				set_flag(profile, "$fix ai path order bug:", AI::Profile_Flags::Fix_ai_path_order_bug);
+				set_flag(profile, "$fix ai path order bug:", AIPF2_FIX_AI_PATH_ORDER_BUG, AIP_FLAG2);

-				set_flag(profile, "$strict turret-tagged-only targeting:", AI::Profile_Flags::Strict_turred_tagged_only_targeting);
+				set_flag(profile, "$strict turret-tagged-only targeting:", AIPF2_STRICT_TURRET_TAGGED_ONLY_TARGETING, AIP_FLAG2);

-				set_flag(profile, "$aspect bomb invulnerability fix:", AI::Profile_Flags::Aspect_invulnerability_fix);
+				set_flag(profile, "$aspect bomb invulnerability fix:", AIPF2_ASPECT_INVULNERABILITY_FIX, AIP_FLAG2);

-				set_flag(profile, "$glide decay requires thrust:", AI::Profile_Flags::Glide_decay_requires_thrust);
-
-				set_flag(profile, "$ai can slow down when attacking big ships:", AI::Profile_Flags::Ai_can_slow_down_attacking_big_ships);
-
-				set_flag(profile, "$use actual primary range:", AI::Profile_Flags::Use_actual_primary_range);
+				set_flag(profile, "$glide decay requires thrust:", AIPF2_GLIDE_DECAY_REQUIRES_THRUST, AIP_FLAG2);

 				profile->bay_arrive_speed_mult = 1.0f;
 				profile->bay_depart_speed_mult = 1.0f;
@@ -479,14 +485,20 @@ void parse_ai_profiles_tbl(const char *filename)
 					mprintf(("Warning: \"$perform less checks for death screams\" flag is deprecated in favor of \"$perform fewer checks for death screams\"\n"));
 					bool temp;
 					stuff_boolean(&temp);
-                    profile->flags.set(AI::Profile_Flags::Perform_fewer_scream_checks, temp);
+					if (temp)
+						profile->flags2 |= AIPF2_PERFORM_FEWER_SCREAM_CHECKS;
+					else
+						profile->flags2 &= ~AIPF2_PERFORM_FEWER_SCREAM_CHECKS;
 				}
 				if (optional_string("$allow primary link delay:"))
 				{
 					mprintf(("Warning: \"$allow primary link delay\" flag is deprecated in favor of \"$allow primary link at mission start\"\n"));
 					bool temp;
 					stuff_boolean(&temp);
-                    profile->flags.set(AI::Profile_Flags::Allow_primary_link_at_start, !temp);
+					if (temp)
+						profile->flags2 &= ~AIPF2_ALLOW_PRIMARY_LINK_AT_START;
+					else
+						profile->flags2 |= AIPF2_ALLOW_PRIMARY_LINK_AT_START;
 				}


@@ -502,8 +514,7 @@ void parse_ai_profiles_tbl(const char *filename)
 				}

 				// find next valid option
-				if (!skip_to_start_of_string_either("$", "#"))
-					break;
+				skip_to_start_of_string_either("$", "#");
 				saved_Mp = Mp;
 			}
 		}
@@ -558,72 +569,3 @@ int ai_profile_lookup(char *name)

 	return -1;
 }
-
-void ai_profile_t::reset()
-{
-    memset(profile_name, 0, sizeof(profile_name));
-
-    flags.reset();
-
-    ai_path_mode = 0;
-    bay_arrive_speed_mult = 0;
-    bay_depart_speed_mult = 0;
-
-    for (int i = 0; i < NUM_SKILL_LEVELS; ++i) {
-        max_incoming_asteroids[i] = 0;
-        max_allowed_player_homers[i] = 0;
-        max_attackers[i] = 0;
-        predict_position_delay[i] = 0;
-        in_range_time[i] = 0;
-        shield_manage_delay[i] = 0;
-
-        link_energy_levels_always[i] = 0;
-        link_energy_levels_maybe[i] = 0;
-
-        link_ammo_levels_always[i] = 0;
-        link_ammo_levels_maybe[i] = 0;
-        primary_ammo_burst_mult[i] = 0;
-
-        cmeasure_life_scale[i] = 0;
-        cmeasure_fire_chance[i] = 0;
-        weapon_energy_scale[i] = 0;
-        shield_energy_scale[i] = 0;
-        afterburner_recharge_scale[i] = 0;
-        player_damage_scale[i] = 0;
-
-        subsys_damage_scale[i] = 0;
-        beam_friendly_damage_cap[i] = 0;
-        turn_time_scale[i] = 0;
-        glide_attack_percent[i] = 0;
-        circle_strafe_percent[i] = 0;
-        glide_strafe_percent[i] = 0;
-        random_sidethrust_percent[i] = 0;
-        stalemate_time_thresh[i] = 0;
-        stalemate_dist_thresh[i] = 0;
-        max_aim_update_delay[i] = 0;
-        turret_max_aim_update_delay[i] = 0;
-
-        ship_fire_delay_scale_hostile[i] = 0;
-        ship_fire_delay_scale_friendly[i] = 0;
-
-        ship_fire_secondary_delay_scale_hostile[i] = 0;
-        ship_fire_secondary_delay_scale_friendly[i] = 0;
-
-        max_turret_ownage_target[i] = 0;
-        max_turret_ownage_player[i] = 0;
-
-        kill_percentage_scale[i] = 0;
-        assist_percentage_scale[i] = 0;
-
-        assist_award_percentage_scale[i] = 0;
-
-        repair_penalty[i] = 0;
-        delay_bomb_arm_timer[i] = 0;
-        chance_to_use_missiles_on_plr[i] = 0;
-        player_autoaim_fov[i] = 0;
-    }
-
-    for (int i = 0; i <= MAX_DETAIL_LEVEL; ++i) {
-        detail_distance_mult[i] = 0;
-    }
-}
@@ -12,7 +12,62 @@
 #include "globalincs/globals.h"
 #include "globalincs/pstypes.h"
 #include "globalincs/systemvars.h"
-#include "ai/ai_flags.h"
+
+// flag int defines
+#define AIP_FLAG		1
+#define AIP_FLAG2		2
+
+// flags
+#define AIPF_SMART_SHIELD_MANAGEMENT								(1 << 0)
+#define AIPF_BIG_SHIPS_CAN_ATTACK_BEAM_TURRETS_ON_UNTARGETED_SHIPS	(1 << 1)
+#define AIPF_SMART_PRIMARY_WEAPON_SELECTION							(1 << 2)
+#define AIPF_SMART_SECONDARY_WEAPON_SELECTION						(1 << 3)
+#define AIPF_ALLOW_RAPID_SECONDARY_DUMBFIRE							(1 << 4)
+#define AIPF_HUGE_TURRET_WEAPONS_IGNORE_BOMBS						(1 << 5)
+#define AIPF_DONT_INSERT_RANDOM_TURRET_FIRE_DELAY					(1 << 6)
+#define AIPF_HACK_IMPROVE_NON_HOMING_SWARM_TURRET_FIRE_ACCURACY		(1 << 7)
+#define AIPF_SHOCKWAVES_DAMAGE_SMALL_SHIP_SUBSYSTEMS				(1 << 8)
+#define AIPF_NAVIGATION_SUBSYS_GOVERNS_WARP							(1 << 9)
+#define AIPF_NO_MIN_DOCK_SPEED_CAP									(1 << 10)
+#define AIPF_DISABLE_LINKED_FIRE_PENALTY							(1 << 11)
+#define AIPF_DISABLE_WEAPON_DAMAGE_SCALING							(1 << 12)
+#define AIPF_USE_ADDITIVE_WEAPON_VELOCITY							(1 << 13)
+#define AIPF_USE_NEWTONIAN_DAMPENING								(1 << 14)
+#define AIPF_INCLUDE_BEAMS_IN_STAT_CALCS							(1 << 15)
+#define AIPF_KILL_SCORING_SCALES_WITH_DAMAGE						(1 << 16)
+#define AIPF_ASSIST_SCORING_SCALES_WITH_DAMAGE						(1 << 17)
+#define AIPF_ALLOW_MULTI_EVENT_SCORING								(1 << 18)
+#define AIPF_SMART_AFTERBURNER_MANAGEMENT							(1 << 19)
+#define AIPF_FIX_LINKED_PRIMARY_BUG									(1 << 20)
+#define AIPF_PREVENT_TARGETING_BOMBS_BEYOND_RANGE					(1 << 21)
+#define AIPF_SMART_SUBSYSTEM_TARGETING_FOR_TURRETS					(1 << 22)
+#define AIPF_FIX_HEAT_SEEKER_STEALTH_BUG							(1 << 23)
+#define AIPF_MULTI_ALLOW_EMPTY_PRIMARIES							(1 << 24)
+#define AIPF_MULTI_ALLOW_EMPTY_SECONDARIES							(1 << 25)
+#define AIPF_ALLOW_TURRETS_TARGET_WEAPONS_FREELY                    (1 << 26)
+#define AIPF_USE_ONLY_SINGLE_FOV_FOR_TURRETS						(1 << 27)
+#define AIPF_ALLOW_VERTICAL_DODGE									(1 << 28)	//Allows AI ships to evade weapons vertically as well as horizontally
+#define AIPF_FORCE_BEAM_TURRET_FOV									(1 << 29)
+#define AIPF_FIX_AI_CLASS_BUG										(1 << 30)
+
+// flags2
+#define AIPF2_TURRETS_IGNORE_TARGET_RADIUS							(1 << 0)
+#define AIPF2_NO_SPECIAL_PLAYER_AVOID								(1 << 1)
+#define AIPF2_PERFORM_FEWER_SCREAM_CHECKS							(1 << 2)
+#define AIPF2_ALL_SHIPS_MANAGE_SHIELDS								(1 << 3)
+#define AIPF2_ADVANCED_TURRET_FOV_EDGE_CHECKS						(1 << 4)
+#define AIPF2_REQUIRE_TURRET_TO_HAVE_TARGET_IN_FOV					(1 << 5)
+#define AIPF2_AI_AIMS_FROM_SHIP_CENTER								(1 << 6)
+#define AIPF2_ALLOW_PRIMARY_LINK_AT_START							(1 << 7)
+#define	AIPF2_BEAMS_DAMAGE_WEAPONS									(1 << 8)
+#define AIPF2_PLAYER_WEAPON_SCALE_FIX								(1 << 9)
+#define AIPF2_NO_WARP_CAMERA										(1 << 10)
+#define AIPF2_ASPECT_LOCK_COUNTERMEASURE							(1 << 11)
+#define AIPF2_AI_GUARDS_SPECIFIC_SHIP_IN_WING						(1 << 12)
+#define AIPF2_FIX_AI_PATH_ORDER_BUG									(1 << 13)
+#define AIPF2_STRICT_TURRET_TAGGED_ONLY_TARGETING					(1 << 14)
+#define AIPF2_ASPECT_INVULNERABILITY_FIX							(1 << 15)
+#define AIPF2_GLIDE_DECAY_REQUIRES_THRUST							(1 << 16)

 // AI Path types
 #define	AI_PATH_MODE_NORMAL 0
@@ -20,11 +75,12 @@
 	
 #define MAX_AI_PROFILES	5

-class ai_profile_t {
-public:
+typedef struct ai_profile_t {
+
 	char profile_name[NAME_LENGTH];

-    flagset<AI::Profile_Flags> flags;
+	int flags;
+	int flags2;

 	// difficulty-related values
 	int max_incoming_asteroids[NUM_SKILL_LEVELS];			// max number of asteroids thrown at friendlies
@@ -102,15 +158,13 @@ public:
 	float bay_arrive_speed_mult;
 	float bay_depart_speed_mult;

-    void reset();
-};
+} ai_profile_t;


 extern int Num_ai_profiles;
 extern int Default_ai_profile;
 extern ai_profile_t Ai_profiles[MAX_AI_PROFILES];

-#define AI_PROFILES_INDEX(ai_p) ((int)((ai_p) - Ai_profiles))

 void ai_profiles_init();

@@ -64,11 +64,10 @@ void	ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 void	ai_big_avoid_ship();
 int	ai_big_maybe_follow_subsys_path(int do_dot_check=1);
 void ai_big_strafe_position();
-static int ai_big_strafe_maybe_retreat(const vec3d *target_pos);

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


 //	Called by ai_big_pick_attack_point.
@@ -351,8 +350,8 @@ void ai_big_avoid_ship()
 // reset path following information
 void ai_big_subsys_path_cleanup(ai_info *aip)
 {
-	if ( aip->ai_flags[AI::AI_Flags::On_subsys_path] ) {
-		aip->ai_flags.remove(AI::AI_Flags::On_subsys_path);
+	if ( aip->ai_flags & AIF_ON_SUBSYS_PATH ) {
+		aip->ai_flags &= ~AIF_ON_SUBSYS_PATH;
 		aip->path_goal_dist = -1;
 		aip->path_start = -1;
 		aip->path_cur = -1;
@@ -439,7 +438,7 @@ int ai_big_maybe_follow_subsys_path(int do_dot_check)
 					Assert(aip->target_objnum >= 0);
 					ai_find_path(Pl_objp, aip->target_objnum, subsys_path_num, 0, 1);
 					if ( aip->path_start >= 0 ) {
-						aip->ai_flags.set(AI::AI_Flags::On_subsys_path);
+						aip->ai_flags |= AIF_ON_SUBSYS_PATH;
 					}
 				}
 			}
@@ -511,7 +510,7 @@ int ai_big_maybe_start_strafe(ai_info *aip, ship_info *sip)
 {
 	// if moving slowly (or stopped), and SIF_SMALL_SHIP, then enter STRAFE mode if enemy fighter/bombers
 	// are near
-	if ( sip->is_small_ship() ) {
+	if ( sip->flags & SIF_SMALL_SHIP ) {
 		if ( timestamp_elapsed(aip->scan_for_enemy_timestamp) ) {
 			ship_obj	*so;
 			object	*test_objp;
@@ -526,7 +525,7 @@ int ai_big_maybe_start_strafe(ai_info *aip, ship_info *sip)
 				test_sp = &Ships[test_objp->instance];

 				if ( iff_x_attacks_y(Ships[Pl_objp->instance].team, test_sp->team) ) {
-					if ( Ship_info[test_sp->ship_info_index].is_small_ship() ) {
+					if ( Ship_info[test_sp->ship_info_index].flags & SIF_SMALL_SHIP ) {
 						dist_squared = vm_vec_dist_squared(&Pl_objp->pos, &test_objp->pos);
 						if ( dist_squared < ENTER_STRAFE_THREAT_DIST_SQUARED ) {
 							return 1;
@@ -594,7 +593,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 		} // end if ( Pl_objp->phys_info.speed < 3.0f ) 

 		//Maybe enter glide strafe (check every 8 seconds, on a different schedule for each ship)
-		if ((sip->can_glide == true) && !(aip->ai_flags[AI::AI_Flags::Kamikaze]) && static_randf((Missiontime + static_rand(aip->shipnum)) >> 19) < aip->ai_glide_strafe_percent) {
+		if ((sip->can_glide == true) && !(aip->ai_flags & AIF_KAMIKAZE) && static_randf((Missiontime + static_rand(aip->shipnum)) >> 19) < aip->ai_glide_strafe_percent) {
 			aip->previous_mode = aip->mode;
 			aip->mode = AIM_STRAFE;
 			aip->submode_parm0 = Missiontime;	// use parm0 as time strafe mode entered (i.e. MODE start time)
@@ -605,7 +604,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d

 		// see if Pl_objp needs to reposition to get a good shot at subsystem which is being attacked
 		if ( ai_big_maybe_follow_subsys_path() ) {
-			if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
+			if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags & AIF_KAMIKAZE)) {
 				afterburners_stop(Pl_objp);
 			}
 			return;
@@ -632,7 +631,7 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 		else
 			rvec = NULL;

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

 		// calc range of primary weapon
 		weapon_travel_dist = ai_get_weapon_dist(&Ships[Pl_objp->instance].weapons);
@@ -642,19 +641,19 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 				accelerate_ship(aip, 1.0f);
 				
 				ship	*shipp = &Ships[Pl_objp->instance];
-				if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use] || aip->ai_profile_flags[AI::Profile_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (dot_to_enemy > 0.75f)) {
+				if ((aip->ai_flags & AIF_FREE_AFTERBURNER_USE) && !(shipp->flags2 & SF2_AFTERBURNER_LOCKED) && (dot_to_enemy > 0.75f)) {
 					if (ai_maybe_fire_afterburner(Pl_objp, aip)) {
 						afterburners_start(Pl_objp);
 						aip->afterburner_stop_time = Missiontime + 3*F1_0;
 					}
-				} else if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
+				} else if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags & AIF_KAMIKAZE)) {
 					afterburners_stop(Pl_objp);
 				}
 			} else {
 				// AL 12-31-97: Move at least as quickly as your target is moving...
 				accelerate_ship(aip, MAX(1.0f - dot_to_enemy, Objects[aip->target_objnum].phys_info.fspeed/sip->max_speed));

-				if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
+				if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags & AIF_KAMIKAZE)) {
 					afterburners_stop(Pl_objp);
 				}
 			}
@@ -677,19 +676,19 @@ void ai_big_chase_attack(ai_info *aip, ship_info *sip, vec3d *enemy_pos, float d
 			if (dist_to_enemy < ATTACK_STOP_DISTANCE) {
 //				accelerate_ship(aip, accel * 0.5f);
 				accelerate_ship(aip, -1.0f);
-				if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
+				if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags & AIF_KAMIKAZE)) {
 					afterburners_stop(Pl_objp);
 				}
 			} else {
 				accelerate_ship(aip, accel);

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

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

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

 			if (tswp->num_secondary_banks > 0) {
-				if (!(En_objp->flags[Object::Object_Flags::Protected]) || (aip->goals[0].ai_mode & (AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP))) {
+				if (!(En_objp->flags & OF_PROTECTED) || (aip->goals[0].ai_mode & (AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP))) {
 					ai_choose_secondary_weapon(Pl_objp, aip, En_objp);
 					int current_bank = tswp->current_secondary_bank;
 					if (current_bank > -1) {
 						weapon_info	*swip = &Weapon_info[tswp->secondary_bank_weapons[current_bank]];

-						if(!(En_objp->flags[Object::Object_Flags::Protected]) || ((aip->goals[0].ai_mode & (AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP)) && swip->wi_flags[Weapon::Info_Flags::Puncture] )) { //override lockdown on protected ships when using anti subsystem weapons - Valathil
+						if(!(En_objp->flags & OF_PROTECTED) || ((aip->goals[0].ai_mode & (AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP)) && swip->wi_flags & WIF_PUNCTURE )) { //override lockdown on protected ships when using anti subsystem weapons - Valathil
 							//	If ship is protected and very low on hits, don't fire missiles.
-							if (!(En_objp->flags[Object::Object_Flags::Protected]) || (En_objp->hull_strength > 10*swip->damage)) {
-								if (aip->ai_flags[AI::AI_Flags::Unload_secondaries]) {
+							if (!(En_objp->flags & OF_PROTECTED) || (En_objp->hull_strength > 10*swip->damage)) {
+								if (aip->ai_flags & AIF_UNLOAD_SECONDARIES) {
 									if (timestamp_until(swp->next_secondary_fire_stamp[current_bank]) > swip->fire_wait*1000.0f) {
 										swp->next_secondary_fire_stamp[current_bank] = timestamp((int) (swip->fire_wait*1000.0f));
 									}
@@ -766,13 +765,13 @@ static void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy)

 								if (timestamp_elapsed(swp->next_secondary_fire_stamp[current_bank])) {
 									float firing_range;
-									if (swip->wi_flags[Weapon::Info_Flags::Local_ssm])
+									if (swip->wi_flags2 & WIF2_LOCAL_SSM)
 										firing_range=swip->lssm_lock_range;
 									else
 										firing_range = MIN((swip->max_speed * swip->lifetime), swip->weapon_range);
 									// reduce firing range of secondaries in nebula
 									extern int Nebula_sec_range;
-									if ((The_mission.flags[Mission::Mission_Flags::Fullneb]) && Nebula_sec_range) {
+									if ((The_mission.flags & MISSION_FLAG_FULLNEB) && Nebula_sec_range) {
 										firing_range *= 0.8f;
 									}

@@ -787,13 +786,13 @@ static void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy)

 												int current_bank_adjusted = MAX_SHIP_PRIMARY_BANKS + current_bank;

-												if ((aip->ai_flags[AI::AI_Flags::Unload_secondaries]) || (swip->burst_flags[Weapon::Burst_Flags::Fast_firing])) {
+												if ((aip->ai_flags & AIF_UNLOAD_SECONDARIES) || (swip->burst_flags & WBF_FAST_FIRING)) {
 													if (swip->burst_shots > swp->burst_counter[current_bank_adjusted]) {
 														t = swip->burst_delay;
 														swp->burst_counter[current_bank_adjusted]++;
 													} else {
 														t = swip->fire_wait;
-														if ((swip->burst_shots > 0) && (swip->burst_flags[Weapon::Burst_Flags::Random_length])) {
+														if ((swip->burst_shots > 0) && (swip->burst_flags & WBF_RANDOM_LENGTH)) {
 															swp->burst_counter[current_bank_adjusted] = myrand() % swip->burst_shots;
 														} else {
 															swp->burst_counter[current_bank_adjusted] = 0;
@@ -805,7 +804,7 @@ static void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy)
 														swp->burst_counter[current_bank_adjusted]++;
 													} else {
 														t = set_secondary_fire_delay(aip, temp_shipp, swip, false);
-														if ((swip->burst_shots > 0) && (swip->burst_flags[Weapon::Burst_Flags::Random_length])) {
+														if ((swip->burst_shots > 0) && (swip->burst_flags & WBF_RANDOM_LENGTH)) {
 															swp->burst_counter[current_bank_adjusted] = myrand() % swip->burst_shots;
 														} else {
 															swp->burst_counter[current_bank_adjusted] = 0;
@@ -846,6 +845,8 @@ void ai_big_switch_to_chase_mode(ai_info *aip)
 	aip->submode_start_time = Missiontime;
 }

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

 	Assert(aip->mode == AIM_CHASE);

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

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

@@ -880,8 +881,8 @@ void ai_big_chase()
 	dist_to_enemy = vm_vec_normalized_dir(&vec_to_enemy, &enemy_pos, &player_pos); // - En_objp->radius;
 	dot_to_enemy = vm_vec_dot(&vec_to_enemy, &Pl_objp->orient.vec.fvec);

-	if (aip->ai_flags[AI::AI_Flags::Target_collision]) {
-		if ( ai_big_strafe_maybe_retreat(&enemy_pos) ) {
+	if (aip->ai_flags & AIF_TARGET_COLLISION) {
+		if ( ai_big_strafe_maybe_retreat(dist_to_enemy, &enemy_pos) ) {
 			aip->mode = AIM_STRAFE;
 			aip->submode_parm0 = Missiontime;	// use parm0 as time strafe mode entered (i.e. MODE start time)
 			aip->submode = AIS_STRAFE_AVOID;
@@ -893,7 +894,7 @@ void ai_big_chase()
 		}
 	}

-	if (aip->ai_flags[AI::AI_Flags::Kamikaze]) {
+	if (aip->ai_flags & AIF_KAMIKAZE) {
 		//nprintf(("AI", "Kamikaze: %7.3f %7.3f\n", dot_to_enemy, dist_to_enemy));
 		accelerate_ship(aip, 1.0f);
 		if ((dist_to_enemy < 400.0f) && ai_maybe_fire_afterburner(Pl_objp, aip)) {
@@ -903,7 +904,7 @@ void ai_big_chase()
 	}

 	//	If just acquired target, or target is not in reasonable cone, don't refine believed enemy position.
-	if ((dot_to_enemy < 0.25f) || (aip->target_time < 1.0f) || (aip->ai_flags[AI::AI_Flags::Seek_lock])) {
+	if ((dot_to_enemy < 0.25f) || (aip->target_time < 1.0f) || (aip->ai_flags & AIF_SEEK_LOCK)) {
 		update_aspect_lock_information(aip, &vec_to_enemy, dist_to_enemy - En_objp->radius, En_objp->radius);
 	} else if (aip->targeted_subsys != NULL) {		
 		Assert(aip->targeted_subsys != NULL);
@@ -913,10 +914,10 @@ void ai_big_chase()
 		dist_to_enemy = vm_vec_normalized_dir(&vec_to_enemy, &enemy_pos, &player_pos); // - En_objp->radius;
 		dot_to_enemy = vm_vec_dot(&vec_to_enemy, &Pl_objp->orient.vec.fvec);
 		update_aspect_lock_information(aip, &vec_to_enemy, dist_to_enemy, En_objp->radius);
-	} else if (En_objp->flags[Object::Object_Flags::Protected]) {	//	If protected and we're not attacking a subsystem, stop attacking!
+	} else if (En_objp->flags & OF_PROTECTED) {	//	If protected and we're not attacking a subsystem, stop attacking!
 		update_aspect_lock_information(aip, &vec_to_enemy, dist_to_enemy - En_objp->radius, En_objp->radius);
 		aip->target_objnum = -1;
-		if (find_enemy(OBJ_INDEX(Pl_objp), MAX_ENEMY_DISTANCE, The_mission.ai_profile->max_attackers[Game_skill_level]) == -1) {
+		if (find_enemy(Pl_objp-Objects, MAX_ENEMY_DISTANCE, The_mission.ai_profile->max_attackers[Game_skill_level]) == -1) {
 			ai_do_default_behavior(Pl_objp);
 			return;
 		}
@@ -930,7 +931,7 @@ void ai_big_chase()
 	case SM_SUPER_ATTACK:
 		if (vm_vec_dist_quick(&Pl_objp->pos, &predicted_enemy_pos) > 100.0f + En_objp->radius * 2.0f) {
 			if (maybe_avoid_big_ship(Pl_objp, En_objp, aip, &predicted_enemy_pos, 10.0f)) {
-				if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
+				if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags & AIF_KAMIKAZE)) {
 					afterburners_stop(Pl_objp);
 				}
 				return;
@@ -952,7 +953,7 @@ void ai_big_chase()
 	//

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

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

 	// ensure that Pl_objp is still targeting a big ship
-	if ( !(esip->is_big_or_huge()) ) {
+	if ( !(esip->flags & (SIF_BIG_SHIP | SIF_HUGE_SHIP)) ) {
 		ai_big_switch_to_chase_mode(aip);
 		return;
 	}
@@ -1192,7 +1198,7 @@ void ai_big_attack_get_data(vec3d *enemy_pos, float *dist_to_enemy, float *dot_t
 	//	If just acquired target, or target is not in reasonable cone, don't refine believed enemy position.
 	vm_vec_normalized_dir(&vec_to_enemy, enemy_pos, &player_pos);
 	*dot_to_enemy=vm_vec_dot(&vec_to_enemy, &Pl_objp->orient.vec.fvec);
-	if ((*dot_to_enemy < 0.25f) || (aip->target_time < 1.0f) || (aip->ai_flags[AI::AI_Flags::Seek_lock])) {
+	if ((*dot_to_enemy < 0.25f) || (aip->target_time < 1.0f) || (aip->ai_flags & AIF_SEEK_LOCK)) {
 		predicted_enemy_pos=*enemy_pos;
 	} else {
 		vec3d	gun_pos, pnt;
@@ -1200,7 +1206,7 @@ void ai_big_attack_get_data(vec3d *enemy_pos, float *dist_to_enemy, float *dot_t
 		float		weapon_speed;

 		//	Compute position of gun in absolute space and use that as fire position.
-		if (po->n_guns > 0 && !(The_mission.ai_profile->flags[AI::Profile_Flags::Ai_aims_from_ship_center])) {
+		if (po->n_guns > 0 && !(The_mission.ai_profile->flags2 & AIPF2_AI_AIMS_FROM_SHIP_CENTER)) {
 			pnt = po->gun_banks[0].pnt[0];
 			vm_vec_unrotate(&gun_pos, &pnt, &Pl_objp->orient);
 			vm_vec_add2(&gun_pos, &Pl_objp->pos);
@@ -1222,7 +1228,7 @@ void ai_big_attack_get_data(vec3d *enemy_pos, float *dist_to_enemy, float *dot_t

 // check to see if Pl_objp has gotten too close to attacking point.. if so, break off by entering
 // AIS_STRAFE_RETREAT
-static int ai_big_strafe_maybe_retreat(const vec3d *target_pos)
+int ai_big_strafe_maybe_retreat(float dist, vec3d *target_pos)
 {
 	ai_info	*aip;
 	aip = &Ai_info[Ships[Pl_objp->instance].ai_index];
@@ -1248,11 +1254,11 @@ static int ai_big_strafe_maybe_retreat(const vec3d *target_pos)

 	// Inside 2 sec retreat, setting goal point to box point + 300m
 	// If collision, use std collision resolution.
-	if ( !(aip->ai_flags[AI::AI_Flags::Kamikaze]) && ((aip->ai_flags[AI::AI_Flags::Target_collision]) || (time_to_target < STRAFE_RETREAT_COLLIDE_TIME) || (dist_normal_to_target < STRAFE_RETREAT_COLLIDE_DIST + speed_to_dist_penalty)) ) {
-		if (aip->ai_flags[AI::AI_Flags::Target_collision]) {
+	if ( !(aip->ai_flags & AIF_KAMIKAZE) && ((aip->ai_flags & AIF_TARGET_COLLISION) || (time_to_target < STRAFE_RETREAT_COLLIDE_TIME) || (dist_normal_to_target < STRAFE_RETREAT_COLLIDE_DIST + speed_to_dist_penalty)) ) {
+		if (aip->ai_flags & AIF_TARGET_COLLISION) {
 			// use standard collision resolution
-			aip->ai_flags.remove(AI::AI_Flags::Target_collision);
-			big_ship_collide_recover_start(Pl_objp, En_objp, nullptr);
+			aip->ai_flags &= ~AIF_TARGET_COLLISION;
+			big_ship_collide_recover_start(Pl_objp, En_objp, &Pl_objp->pos, NULL);
 		} else {
 			// too close for comfort so fly to box point + 300
 			aip->submode = AIS_STRAFE_RETREAT1;
@@ -1292,12 +1298,12 @@ void ai_big_strafe_attack()
 	}

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

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

-	if (!(aip->ai_flags[AI::AI_Flags::Seek_lock]) || (aip->aspect_locked_time < 2.0f)) {
+	if (!(aip->ai_flags & AIF_SEEK_LOCK) || (aip->aspect_locked_time < 2.0f)) {
 		t  = ai_endangered_by_weapon(aip);
 		if ( t > 0.0f && t < 1.5f ) {
 			// set up goal_point for avoid path to turn towards
@@ -1341,33 +1347,30 @@ void ai_big_strafe_attack()
 	}

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

+	// Slow down if we've not been hit for a while
 	fix last_hit = Missiontime - aip->last_hit_time;
-	if ( aip->ai_profile_flags[AI::Profile_Flags::Ai_can_slow_down_attacking_big_ships] ) {
-		// Slow down if we've not been hit for a while
-		if ( target_dist > 1200 || last_hit < F1_0*6) {
-			accel = 1.0f;
-		} else {
-			float attack_time;
-			attack_time = f2fl(Missiontime - aip->submode_start_time);
-			if ( attack_time > 15 ) {
-				accel = 0.2f;
-			} else if ( attack_time > 10 ) {
-				accel = 0.4f;
-			} else if ( attack_time > 8 ) {
-				accel = 0.6f;
-			} else if ( attack_time > 5 ) {
-				accel = 0.8f;
-			} else {
-				accel = 1.0f;
-			}
-		}
-	} else {
+	if ( target_dist > 1200 || last_hit < F1_0*6) {
 		accel = 1.0f;
+	} else {
+		float attack_time;
+		attack_time = f2fl(Missiontime - aip->submode_start_time);
+		if ( attack_time > 15 ) {
+			accel = 0.2f;
+		} else if ( attack_time > 10 ) {
+			accel = 0.4f;
+		} else if ( attack_time > 8 ) {
+			accel = 0.6f;
+		} else if ( attack_time > 5 ) {
+			accel = 0.8f;
+		} else {
+			accel = 1.0f;
+		}
 	}

+	accel = 1.0f;
 	accelerate_ship(aip, accel);

 	// if haven't been hit in quite a while, leave strafe mode
@@ -1487,7 +1490,7 @@ void ai_big_strafe_glide_attack()
 		vm_vec_sub2(&target_pos, &En_objp->pos);

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

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

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

 	if ( mode_time > fl2f(0.5)) {
@@ -1616,7 +1619,7 @@ void ai_big_strafe_position()
 	aip = &Ai_info[Ships[Pl_objp->instance].ai_index];

 	//Maybe use AIS_STRAFE_GLIDE_ATTACK
-	if ((sip->can_glide == true) && !(aip->ai_flags[AI::AI_Flags::Kamikaze]) && (frand() < aip->ai_glide_strafe_percent)) {
+	if ((sip->can_glide == true) && !(aip->ai_flags & AIF_KAMIKAZE) && (frand() < aip->ai_glide_strafe_percent)) {
 		aip->submode = AIS_STRAFE_GLIDE_ATTACK;
 		aip->submode_parm1 = 0;
 	} else {
@@ -1648,7 +1651,7 @@ void ai_big_strafe()
 	}
 */
 	// check if target is still a big ship... if not enter chase mode
-	if ( !(Ship_info[Ships[En_objp->instance].ship_info_index].is_big_or_huge()) ) {
+	if ( !(Ship_info[Ships[En_objp->instance].ship_info_index].flags & (SIF_BIG_SHIP|SIF_HUGE_SHIP)) ) {
 		ai_big_switch_to_chase_mode(aip);
 		return;
 	}
@@ -1698,7 +1701,7 @@ void ai_big_strafe()
 //
 // Check if weapon_objnum was fired by Pl_objp's target, and whether Pl_objp's target is a big ship, if
 // so, enter AIM_STRAFE
-int ai_big_maybe_enter_strafe_mode(const object *pl_objp, int weapon_objnum)
+int ai_big_maybe_enter_strafe_mode(object *pl_objp, int weapon_objnum, int consider_target_only)
 {
 	ai_info		*aip;
 	ship_info	*sip;
@@ -1721,12 +1724,12 @@ int ai_big_maybe_enter_strafe_mode(const object *pl_objp, int weapon_objnum)

 	// if Pl_objp's target is not a big/capital ship, then cannot enter strafe mode
 	// AL 12-31-97: Even though transports are considered big ships, don't enter strafe mode on them
-	if ( !(sip->is_big_or_huge()) || (sip->flags[Ship::Info_Flags::Transport]) ) {
+	if ( !(sip->flags & (SIF_BIG_SHIP | SIF_HUGE_SHIP)) || (sip->flags & SIF_TRANSPORT) ) {
 		return 0;
 	}

 	//	If Pl_objp not a fighter or bomber, don't enter strafe mode. -- MK, 11/11/97.
-	if ( !(Ship_info[Ships[pl_objp->instance].ship_info_index].is_fighter_bomber()) ) {
+	if ( !(Ship_info[Ships[pl_objp->instance].ship_info_index].flags & (SIF_FIGHTER | SIF_BOMBER)) ) {
 		return 0;
 	}

@@ -1748,7 +1751,7 @@ int ai_big_maybe_enter_strafe_mode(const object *pl_objp, int weapon_objnum)
 //JAS IMPOSSIBLE		} else {
 			// switch targets
 			sip = &Ship_info[Ships[parent_objp->instance].ship_info_index];
-			if ( !(sip->is_big_or_huge()) || (sip->flags[Ship::Info_Flags::Transport]) ) {
+			if ( !(sip->flags & (SIF_BIG_SHIP | SIF_HUGE_SHIP)) || (sip->flags & SIF_TRANSPORT) ) {
 				return 0;
 			}
 			set_target_objnum(aip, OBJ_INDEX(parent_objp));
@@ -1772,7 +1775,7 @@ int ai_big_maybe_enter_strafe_mode(const object *pl_objp, int weapon_objnum)
 // Consider attacking a turret, if a turret actually fired the weapon
 // input:	ship_objp	=>	ship that will attack the turret
 //				weapon_objp	=>	
-void ai_big_strafe_maybe_attack_turret(const object *ship_objp, const object *weapon_objp)
+void ai_big_strafe_maybe_attack_turret(object *ship_objp, object *weapon_objp)
 {
 	ai_info	*aip;
 	object	*parent_objp;
@@ -1803,8 +1806,8 @@ void ai_big_strafe_maybe_attack_turret(const object *ship_objp, const object *we
 	// the ai will not always go after different ships firing beams at them.
 	// Approx 1/4 chance we'll go after the other ship's beam.

-	bool attack_turret_on_different_ship = (aip->ai_profile_flags[AI::Profile_Flags::Big_ships_can_attack_beam_turrets_on_untargeted_ships])
-		&& (Weapon_info[Weapons[weapon_objp->instance].weapon_info_index].wi_flags[Weapon::Info_Flags::Beam]) && (frand()*100 < 25.0f);
+	bool attack_turret_on_different_ship = (aip->ai_profile_flags & AIPF_BIG_SHIPS_CAN_ATTACK_BEAM_TURRETS_ON_UNTARGETED_SHIPS)
+		&& (Weapon_info[Weapons[weapon_objp->instance].weapon_info_index].wi_flags & WIF_BEAM) && (frand()*100 < 25.0f);

 	// unless we're making an exception, we should only attack a turret if it sits on the current target
 	if ( !attack_turret_on_different_ship )
@@ -17,13 +17,14 @@ struct ai_info;
 struct vec3d;
 class ship_subsys;

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

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

@@ -59,7 +59,6 @@ int	Ai_goal_signature;
 int	Num_ai_dock_names = 0;
 char	Ai_dock_names[MAX_AI_DOCK_NAMES][NAME_LENGTH];

-// Used in objecttypes.tbl to define custom ship types
 ai_goal_list Ai_goal_names[] =
 {
 	{ "Attack ship",			AI_GOAL_CHASE,			0 },
@@ -86,7 +85,6 @@ ai_goal_list Ai_goal_names[] =
 	{ "Play dead",				AI_GOAL_PLAY_DEAD,		0 },
 	{ "Attack weapon",			AI_GOAL_CHASE_WEAPON,	0 },
 	{ "Fly to ship",			AI_GOAL_FLY_TO_SHIP,	0 },
-	{ "Attack ship class",		AI_GOAL_CHASE_SHIP_CLASS, 0 },
 };

 int Num_ai_goals = sizeof(Ai_goal_names) / sizeof(ai_goal_list);
@@ -98,34 +96,34 @@ int Num_ai_goals = sizeof(Ai_goal_names) / sizeof(ai_goal_list);
 const char *Ai_goal_text(int goal)
 {
 	switch(goal)	{
-	case AI_GOAL_CHASE:
-	case AI_GOAL_CHASE_WING:
-	case AI_GOAL_CHASE_SHIP_CLASS:
+	case 1:
 		return XSTR( "attack ", 474);
-	case AI_GOAL_DOCK:
+	case 2:
 		return XSTR( "dock ", 475);
-	case AI_GOAL_WAYPOINTS:
-	case AI_GOAL_WAYPOINTS_ONCE:
+	case 3:
 		return XSTR( "waypoints", 476);
-	case AI_GOAL_DESTROY_SUBSYSTEM:
+	case 4:
+		return XSTR( "waypoints", 476);
+	case 6:
 		return XSTR( "destroy ", 477);
-	case AI_GOAL_FORM_ON_WING:
+	case 7:
 		return XSTR( "form on ", 478);
-	case AI_GOAL_UNDOCK:
+	case 8:
 		return XSTR( "undock ", 479);
-	case AI_GOAL_GUARD:
-	case AI_GOAL_GUARD_WING:
+	case 9:
+		return XSTR( "attack ", 474);
+	case 10:
 		return XSTR( "guard ", 480);
-	case AI_GOAL_DISABLE_SHIP:
+	case 11:
 		return XSTR( "disable ", 481);
-	case AI_GOAL_DISARM_SHIP:
+	case 12:
 		return XSTR( "disarm ", 482);
-	case AI_GOAL_EVADE_SHIP:
+	case 15:
+		return XSTR( "guard ", 480);
+	case 16:
 		return XSTR( "evade ", 483);
-	case AI_GOAL_REARM_REPAIR:
+	case 19:
 		return XSTR( "rearm ", 484);
-	case AI_GOAL_FLY_TO_SHIP:
-		return XSTR( "rendezvous with ", 1597);
 	}

 	// Avoid compiler warning
@@ -240,7 +238,7 @@ void ai_remove_ship_goal( ai_info *aip, int index )
 	aip->goals[index].ai_mode = AI_GOAL_NONE;
 	aip->goals[index].signature = -1;
 	aip->goals[index].priority = -1;
-	aip->goals[index].flags.reset(); // must reset the flags since not doing so will screw up goal sorting.
+	aip->goals[index].flags = 0;				// must reset the flags since not doing so will screw up goal sorting.

 	if ( index == aip->active_goal )
 		aip->active_goal = AI_GOAL_NONE;
@@ -289,7 +287,7 @@ void ai_clear_wing_goals( int wingnum )
 		wingp->ai_goals[i].ai_mode = AI_GOAL_NONE;
 		wingp->ai_goals[i].signature = -1;
 		wingp->ai_goals[i].priority = -1;
-		wingp->ai_goals[i].flags.reset();
+		wingp->ai_goals[i].flags = 0;
 	}


@@ -349,7 +347,7 @@ void ai_mission_wing_goal_complete( int wingnum, ai_goal *remove_goalp )
 			wingp->ai_goals[i].ai_mode = AI_GOAL_NONE;
 			wingp->ai_goals[i].signature = -1;
 			wingp->ai_goals[i].priority = -1;
-			wingp->ai_goals[i].flags.reset();
+			wingp->ai_goals[i].flags = 0;
 			break;
 		}
 	}
@@ -410,41 +408,31 @@ void ai_goal_purge_invalid_goals( ai_goal *aigp, ai_goal *goal_list, ai_info *ai
 		if ( purge_goal->target_name == NULL )
 			continue;

-		// goals operating on ship classes are handled slightly differently
-		if ( purge_ai_mode == AI_GOAL_CHASE_SHIP_CLASS ) {
-			// if the target of the purge goal is the same class of ship we are concerned about, then we have a match;
-			// if it is not, then we can continue (see standard ship check below)
-			if ( stricmp(purge_goal->target_name, Ship_info[Ships[ship_index].ship_info_index].name) != 0 )
-				continue;
-		}
-		// standard goals operating on either wings or ships
-		else {
-			// determine if the purge goal is acting either on the ship or the ship's wing.
-			purge_wing = wing_name_lookup( purge_goal->target_name, 1 );
+		// determine if the purge goal is acting either on the ship or the ship's wing.
+		purge_wing = wing_name_lookup( purge_goal->target_name, 1 );

-			// if the target of the purge goal is a ship (purge_wing will be -1), then if the names
-			// don't match, we can continue;  if the wing is valid, don't process if the wing numbers
-			// are different.
-			if ( purge_wing == -1 ) {
-				if ( stricmp(purge_goal->target_name, name ) != 0 )
-					continue;
-			} else if ( purge_wing != wingnum )
+		// if the target of the purge goal is a ship (purge_wing will be -1), then if the names
+		// don't match, we can continue;  if the wing is valid, don't process if the wing numbers
+		// are different.
+		if ( purge_wing == -1 ) {
+			if ( stricmp(purge_goal->target_name, name ) )
 				continue;
-		}
+		} else if ( purge_wing != wingnum )
+			continue;

 		switch (mode)
 		{
 			// ignore goals should get rid of any kind of attack goal
 			case AI_GOAL_IGNORE:
 			case AI_GOAL_IGNORE_NEW:
-				if ( purge_ai_mode & (AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP | AI_GOAL_CHASE | AI_GOAL_CHASE_WING | AI_GOAL_CHASE_SHIP_CLASS | AI_GOAL_DESTROY_SUBSYSTEM) )
-					purge_goal->flags.set(AI::Goal_Flags::Purge);
+				if ( purge_ai_mode & (AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP | AI_GOAL_CHASE | AI_GOAL_CHASE_WING | AI_GOAL_DESTROY_SUBSYSTEM) )
+					purge_goal->flags |= AIGF_PURGE;
 				break;

 			// disarm/disable goals should remove attacks from certain ships types
 			case AI_GOAL_DISARM_SHIP:
 			case AI_GOAL_DISABLE_SHIP:
-				if ( purge_ai_mode & (AI_GOAL_CHASE | AI_GOAL_CHASE_WING | AI_GOAL_CHASE_SHIP_CLASS) ) {
+				if ( purge_ai_mode & (AI_GOAL_CHASE | AI_GOAL_CHASE_WING) ) {
 					int ai_ship_type;

 					// for wings we grab the ship type of the wing leader
@@ -464,7 +452,7 @@ void ai_goal_purge_invalid_goals( ai_goal *aigp, ai_goal *goal_list, ai_info *ai
 					// being disarmed/disabled
 					for ( j=0 ; j < (int)crippled_ships_type->ai_cripple_ignores.size(); j++) {
 						if (crippled_ships_type->ai_cripple_ignores[j] == ai_ship_type) {
-							purge_goal->flags.set(AI::Goal_Flags::Purge);
+								purge_goal->flags |= AIGF_PURGE;
 						}
 					}
 				}	
@@ -596,10 +584,10 @@ void ai_goal_fixup_dockpoints(ai_info *aip, ai_goal *aigp)

 	// look for docking points of the appriopriate type.  Use cargo docks for cargo ships.
 	/*
-	if (Ship_info[Ships[shipnum].ship_info_index].flags[Ship::Info_Flags::Cargo]) {
+	if (Ship_info[Ships[shipnum].ship_info_index].flags & SIF_CARGO) {
 		docker_index = ai_goal_find_dockpoint(aip->shipnum, DOCK_TYPE_CARGO);
 		dockee_index = ai_goal_find_dockpoint(shipnum, DOCK_TYPE_CARGO);
-	} else if (Ship_info[Ships[aip->shipnum].ship_info_index].flags[Ship::Info_Flags::Support]) {
+	} else if (Ship_info[Ships[aip->shipnum].ship_info_index].flags & SIF_SUPPORT) {
 		docker_index = ai_goal_find_dockpoint(aip->shipnum, DOCK_TYPE_REARM);
 		dockee_index = ai_goal_find_dockpoint(shipnum, DOCK_TYPE_REARM);
 	}
@@ -613,8 +601,7 @@ void ai_goal_fixup_dockpoints(ai_info *aip, ai_goal *aigp)
 		
 	aigp->docker.index = docker_index;
 	aigp->dockee.index = dockee_index;
-	aigp->flags.set(AI::Goal_Flags::Dockee_index_valid);
-	aigp->flags.set(AI::Goal_Flags::Docker_index_valid);
+	aigp->flags |= AIGF_DOCK_INDEXES_VALID;
 }

 // these functions deal with adding goals sent from the player.  They are slightly different
@@ -752,8 +739,7 @@ void ai_add_ship_goal_scripting(int mode, int submode, int priority, char *shipn
 	if ( mode == AI_GOAL_DOCK ) {
 		aigp->docker.name = Ships[aip->shipnum].ship_name;
 		aigp->dockee.name = shipname;
-		aigp->flags.remove(AI::Goal_Flags::Dockee_index_valid);
-		aigp->flags.remove(AI::Goal_Flags::Docker_index_valid);
+		aigp->flags &= ~AIGF_DOCK_INDEXES_VALID;
 	}
 	ai_add_goal_sub_scripting(AIG_TYPE_PLAYER_SHIP, mode, submode, priority, shipname, aigp);

@@ -832,7 +818,7 @@ void ai_add_goal_sub_sexp( int sexp, int type, ai_goal *aigp, char *actor_name )
 	aigp->target_name = NULL;
 	aigp->time = Missiontime;
 	aigp->type = type;
-	aigp->flags.reset();
+	aigp->flags = 0;

 	op = get_operator_const( text );

@@ -865,7 +851,7 @@ void ai_add_goal_sub_sexp( int sexp, int type, ai_goal *aigp, char *actor_name )
 		// store the name of the subsystem in the docker.name field for now -- this field must get
 		// fixed up when the goal is valid since we need to locate the subsystem on the ship's model
 		aigp->docker.name = ai_get_goal_target_name(CTEXT(CDR(CDR(node))), &dummy);
-		aigp->flags.set(AI::Goal_Flags::Subsys_needs_fixup);
+		aigp->flags |= AIGF_SUBSYS_NEEDS_FIXUP;
 		aigp->priority = atoi( CTEXT(CDR(CDR(CDR(node)))) );
 		break;

@@ -919,8 +905,7 @@ void ai_add_goal_sub_sexp( int sexp, int type, ai_goal *aigp, char *actor_name )
 		aigp->target_name = ai_get_goal_target_name( CTEXT(CDR(node)), &aigp->target_name_index );
 		aigp->docker.name = ai_add_dock_name(CTEXT(CDR(CDR(node))));
 		aigp->dockee.name = ai_add_dock_name(CTEXT(CDR(CDR(CDR(node)))));
-		aigp->flags.remove(AI::Goal_Flags::Dockee_index_valid);
-		aigp->flags.remove(AI::Goal_Flags::Docker_index_valid);
+		aigp->flags &= ~AIGF_DOCK_INDEXES_VALID;
 		aigp->priority = atoi( CTEXT(CDR(CDR(CDR(CDR(node))))) );

 		aigp->ai_mode = AI_GOAL_DOCK;
@@ -949,10 +934,9 @@ void ai_add_goal_sub_sexp( int sexp, int type, ai_goal *aigp, char *actor_name )
 		break;

 	case OP_AI_CHASE:
-	case OP_AI_CHASE_WING:
-	case OP_AI_CHASE_SHIP_CLASS:
 	case OP_AI_GUARD:
 	case OP_AI_GUARD_WING:
+	case OP_AI_CHASE_WING:
 	case OP_AI_EVADE_SHIP:
 	case OP_AI_STAY_NEAR_SHIP:
 	case OP_AI_IGNORE:
@@ -981,8 +965,6 @@ void ai_add_goal_sub_sexp( int sexp, int type, ai_goal *aigp, char *actor_name )
 			aigp->ai_mode = AI_GOAL_GUARD_WING;
 		} else if ( op == OP_AI_CHASE_WING ) {
 			aigp->ai_mode = AI_GOAL_CHASE_WING;
-		} else if (op == OP_AI_CHASE_SHIP_CLASS) {
-			aigp->ai_mode = AI_GOAL_CHASE_SHIP_CLASS;
 		} else if ( op == OP_AI_STAY_NEAR_SHIP ) {
 			aigp->ai_mode = AI_GOAL_STAY_NEAR_SHIP;
 		} else if ( op == OP_AI_IGNORE ) {
@@ -1004,13 +986,13 @@ void ai_add_goal_sub_sexp( int sexp, int type, ai_goal *aigp, char *actor_name )
 	}

 	// Goober5000 - we now have an extra optional chase argument to allow chasing our own team
-	if ( op == OP_AI_CHASE || op == OP_AI_CHASE_WING || op == OP_AI_CHASE_SHIP_CLASS || op == OP_AI_DISABLE_SHIP || op == OP_AI_DISARM_SHIP ) {
+	if ( op == OP_AI_CHASE || op == OP_AI_CHASE_WING || op == OP_AI_DISABLE_SHIP || op == OP_AI_DISARM_SHIP ) {
 		if ((CDDDR(node) != -1) && is_sexp_true(CDDDR(node)))
-			aigp->flags.set(AI::Goal_Flags::Target_own_team);
+			aigp->flags |= AIGF_TARGET_OWN_TEAM;
 	}
 	if ( op == OP_AI_DESTROY_SUBSYS ) {
 		if ((CDDDDR(node) != -1) && is_sexp_true(CDDDDR(node)))
-			aigp->flags.set(AI::Goal_Flags::Target_own_team);
+			aigp->flags |= AIGF_TARGET_OWN_TEAM;
 	}

 	// Goober5000 - since none of the goals act on the actor,
@@ -1022,7 +1004,7 @@ void ai_add_goal_sub_sexp( int sexp, int type, ai_goal *aigp, char *actor_name )
 		aigp->ai_mode = AI_GOAL_NONE;
 		aigp->signature = -1;
 		aigp->priority = -1;
-		aigp->flags.reset();
+		aigp->flags = 0;
 	}
 }

@@ -1050,7 +1032,7 @@ int ai_find_goal_index( ai_goal* aigp, int mode, int submode, int priority )

 /* Remove a goal from the given goals structure
 * Returns the index of the goal that it clears out.
- * This is important so that if active_goal == index you can set AI_GOAL_NONE
+ * This is importnat so that if active_goal == index you can set AI_GOAL_NONE
 */
 int ai_remove_goal_sexp_sub( int sexp, ai_goal* aigp )
 {
@@ -1152,10 +1134,6 @@ int ai_remove_goal_sexp_sub( int sexp, ai_goal* aigp )
 		priority = ( CDR( CDR(node) ) >= 0 ) ? atoi( CTEXT( CDR( CDR( node ) ) ) ) : -1;
 		goalmode = AI_GOAL_CHASE_WING;
 		break;
-	case OP_AI_CHASE_SHIP_CLASS:
-		priority = ( CDR( CDR(node) ) >= 0 ) ? atoi( CTEXT( CDR( CDR( node ) ) ) ) : -1;
-		goalmode = AI_GOAL_CHASE_SHIP_CLASS;
-		break;
 	case OP_AI_EVADE_SHIP:
 		priority = ( CDR( CDR(node) ) >= 0 ) ? atoi( CTEXT( CDR( CDR( node ) ) ) ) : -1;
 		goalmode = AI_GOAL_EVADE_SHIP;
@@ -1188,7 +1166,7 @@ int ai_remove_goal_sexp_sub( int sexp, ai_goal* aigp )
 	aigp[goalindex].ai_mode = AI_GOAL_NONE;
 	aigp[goalindex].signature = -1;
 	aigp[goalindex].priority = -1;
-	aigp[goalindex].flags.reset();				// must reset the flags since not doing so will screw up goal sorting.
+	aigp[goalindex].flags = 0;				// must reset the flags since not doing so will screw up goal sorting.

 	return goalindex;
 }
@@ -1263,7 +1241,7 @@ void ai_add_wing_goal_sexp(int sexp, int type, int wingnum)
 // this name can be a shipname or a wingname)
 // docker_point and dockee_point are used for the AI_GOAL_DOCK command to tell two ships where to dock
 // immediate means to process this order right away
-void ai_add_goal_ship_internal( ai_info *aip, int goal_type, char *name, int  /*docker_point*/, int  /*dockee_point*/, int immediate )
+void ai_add_goal_ship_internal( ai_info *aip, int goal_type, char *name, int docker_point, int dockee_point, int immediate )
 {
 	int gindex;
 	ai_goal *aigp;
@@ -1286,8 +1264,7 @@ void ai_add_goal_ship_internal( ai_info *aip, int goal_type, char *name, int  /*

 	aigp->time = Missiontime;
 	aigp->type = AIG_TYPE_DYNAMIC;
-	aigp->flags.reset();
-	aigp->flags.set(AI::Goal_Flags::Goal_override);
+	aigp->flags = AIGF_GOAL_OVERRIDE;

 	switch ( goal_type ) {

@@ -1325,7 +1302,7 @@ void ai_add_goal_ship_internal( ai_info *aip, int goal_type, char *name, int  /*
 		aigp->ai_submode = 0;
 		aigp->target_name = name;
 		aigp->priority = PLAYER_PRIORITY_MIN-1;		// make the priority always less than what the player's is
-		aigp->flags.remove(AI::Goal_Flags::Goal_override);	// don't override this goal.  rearm repair requests should happen in order
+		aigp->flags &= ~AIGF_GOAL_OVERRIDE;				// don't override this goal.  rearm repair requests should happen in order
 		ai_goal_fixup_dockpoints( aip, aigp );
 		break;

@@ -1410,7 +1387,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 		ship *shipp = &Ships[objp->instance];

 		// always valid if has subspace drive
-		if (!(shipp->flags[Ship::Ship_Flags::No_subspace_drive]))
+		if (!(shipp->flags2 & SF2_NO_SUBSPACE_DRIVE))
 			return AI_GOAL_ACHIEVABLE;

 		// if no subspace drive, only valid if our mothership is present
@@ -1436,7 +1413,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 		if (sindex < 0)
 			return AI_GOAL_NOT_ACHIEVABLE;

-		aigp->flags.set(AI::Goal_Flags::Goal_override);
+		aigp->flags |= AIGF_GOAL_OVERRIDE;
 		return AI_GOAL_ACHIEVABLE;
 	}

@@ -1454,18 +1431,6 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 		return AI_GOAL_ACHIEVABLE;
 	}

-	// chasing all ships of a certain ship class is achievable if there are ships of that class present;
-	// if not, the status is not known because more ships of that class could arrive in the future
-	// (c.f. AI_GOAL_CHASE_WING subsequent to the next switch statement)
-	if ( aigp->ai_mode == AI_GOAL_CHASE_SHIP_CLASS ) {
-		for (objp = GET_FIRST(&obj_used_list); objp != END_OF_LIST(&obj_used_list); objp = GET_NEXT(objp)) {
-			if ((objp->type == OBJ_SHIP) && !strcmp(aigp->target_name, Ship_info[Ships[objp->instance].ship_info_index].name)) {
-				return AI_GOAL_ACHIEVABLE;
-			}
-		}
-		return AI_GOAL_NOT_KNOWN;
-	}
-

 	return_val = AI_GOAL_SATISFIED;

@@ -1491,7 +1456,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )

 			// can't determine the status of this goal if ship not valid
 			// or we haven't found a valid subsystem index yet
-			if ( (sindex == -1) || (aigp->flags[AI::Goal_Flags::Subsys_needs_fixup]) ) {
+			if ( (sindex == -1) || (aigp->flags & AIGF_SUBSYS_NEEDS_FIXUP) ) {
 				status = 0;
 				break;
 			}
@@ -1608,7 +1573,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )

 		wing *wingp = &Wings[sindex];

-		if ( wingp->flags[Ship::Wing_Flags::Gone] )
+		if ( wingp->flags & WF_WING_GONE )
 			return AI_GOAL_NOT_ACHIEVABLE;
 		else if ( wingp->total_arrived_count == 0 )
 			return AI_GOAL_NOT_KNOWN;
@@ -1640,7 +1605,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 		}
 		else
 		{
-			mprintf(("Potentially incorrect behaviour in AI goal for ship %s: Ship %s could not be found among currently active, departed, or yet-to-arrive ships.\nPlease check the mission file.\n", Ships[objp->instance].ship_name, aigp->target_name));
+			Int3();		// get ALLENDER
 			status = SHIP_STATUS_UNKNOWN;
 		}
 	}
@@ -1655,15 +1620,15 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )

 	// if the goal is an ignore/disable/disarm goal, then 
 	// Goober5000 - see note at PURGE_GOALS_ALL_SHIPS... this is bizarre
-	if ((status == SHIP_STATUS_ARRIVED) && !(aigp->flags[AI::Goal_Flags::Goals_purged]))
+	if ((status == SHIP_STATUS_ARRIVED) && !(aigp->flags & AIGF_GOALS_PURGED))
 	{
 		if (aigp->ai_mode & PURGE_GOALS_ALL_SHIPS) {
 			ai_goal_purge_all_invalid_goals(aigp);
-			aigp->flags.set(AI::Goal_Flags::Goals_purged);
+			aigp->flags |= AIGF_GOALS_PURGED;
 		}
 		else if (aigp->ai_mode & PURGE_GOALS_ONE_SHIP) {
 			ai_goal_purge_invalid_goals(aigp, aip->goals, aip, -1);
-			aigp->flags.set(AI::Goal_Flags::Goals_purged);
+			aigp->flags |= AIGF_GOALS_PURGED;
 		}
 	}	

@@ -1671,21 +1636,21 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 	// only enter this calculation if the ship we are docking with has arrived.  If the ship is gone, then
 	// this goal will get removed.
 	if ( (aigp->ai_mode == AI_GOAL_DOCK) && (status == SHIP_STATUS_ARRIVED) ) {
-		if (!(aigp->flags[AI::Goal_Flags::Docker_index_valid])) {
+		if (!(aigp->flags & AIGF_DOCKER_INDEX_VALID)) {
 			modelnum = Ship_info[Ships[objp->instance].ship_info_index].model_num;
 			Assert( modelnum >= 0 );
 			index = model_find_dock_name_index(modelnum, aigp->docker.name);
 			aigp->docker.index = index;
-			aigp->flags.set(AI::Goal_Flags::Docker_index_valid);
+			aigp->flags |= AIGF_DOCKER_INDEX_VALID;
 		}

-		if (!(aigp->flags[AI::Goal_Flags::Dockee_index_valid])) {
+		if (!(aigp->flags & AIGF_DOCKEE_INDEX_VALID)) {
 			sindex = ship_name_lookup(aigp->target_name);
 			if ( sindex != -1 ) {
 				modelnum = Ship_info[Ships[sindex].ship_info_index].model_num;
 				index = model_find_dock_name_index(modelnum, aigp->dockee.name);
 				aigp->dockee.index = index;
-				aigp->flags.set(AI::Goal_Flags::Dockee_index_valid);
+				aigp->flags |= AIGF_DOCKEE_INDEX_VALID;
 			} else
 				aigp->dockee.index = -1;		// this will force code into if statement below making goal not achievable.
 		}
@@ -1696,7 +1661,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 		}

 		// if ship is disabled, don't know if it can dock or not
-		if ( Ships[objp->instance].flags[Ship::Ship_Flags::Disabled] )
+		if ( Ships[objp->instance].flags & SF_DISABLED )
 			return AI_GOAL_NOT_KNOWN;

 		// we must also determine if we're prevented from docking for any reason
@@ -1735,7 +1700,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 			else if (obstacle_objp != goal_objp)
 			{
 				// if this goal isn't on hold yet, then issue the undock goal
-				if ( !(aigp->flags[AI::Goal_Flags::Goal_on_hold]) )
+				if ( !(aigp->flags & AIGF_GOAL_ON_HOLD) )
 					ai_add_goal_ship_internal( aip, AI_GOAL_UNDOCK, Ships[obstacle_objp->instance].ship_name, -1, -1, 0 );

 				// return NOT_KNOWN which will place the goal on hold until the undocking is complete.
@@ -1760,12 +1725,12 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 		// if the ship has arrived, and the goal is destroy subsystem, then check to see that we
 		// have fixed up the subsystem name (of the subsystem to destroy) into an index into
 		// the ship's subsystem list
-		if ( aigp->flags[AI::Goal_Flags::Subsys_needs_fixup] ) {
+		if ( aigp->flags & AIGF_SUBSYS_NEEDS_FIXUP ) {
 			sindex = ship_name_lookup( aigp->target_name );

 			if ( sindex != -1 ) {
 				aigp->ai_submode = ship_get_subsys_index( &Ships[sindex], aigp->docker.name );
-				aigp->flags.remove(AI::Goal_Flags::Subsys_needs_fixup);
+				aigp->flags &= ~AIGF_SUBSYS_NEEDS_FIXUP;
 			} else {
 				Int3();
 				return AI_GOAL_NOT_ACHIEVABLE;			// force this goal to be invalid
@@ -1837,20 +1802,20 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 			}

 			// if desitnation currently being repaired, then goal is stil active
-			if ( Ai_info[Ships[sindex].ai_index].ai_flags[AI::AI_Flags::Being_repaired] )
+			if ( Ai_info[Ships[sindex].ai_index].ai_flags & AIF_BEING_REPAIRED )
 				return AI_GOAL_ACHIEVABLE;

 			// if the destination ship is dying or departing (but not completed yet), the mark goal as
 			// not achievable.
-			if ( Ships[sindex].is_dying_or_departing())
+			if ( Ships[sindex].flags & (SF_DYING | SF_DEPARTING) )
 				return AI_GOAL_NOT_ACHIEVABLE;

 			// if the destination object is no longer awaiting repair, then remove the item
-			if ( !(Ai_info[Ships[sindex].ai_index].ai_flags[AI::AI_Flags::Awaiting_repair]) )
+			if ( !(Ai_info[Ships[sindex].ai_index].ai_flags & AIF_AWAITING_REPAIR) )
 				return AI_GOAL_NOT_ACHIEVABLE;

 			// not repairing anything means that he can do this goal!!!
-			if ( !(aip->ai_flags[AI::AI_Flags::Repairing]) )
+			if ( !(aip->ai_flags  & AIF_REPAIRING) )
 				return AI_GOAL_ACHIEVABLE;

 			// test code!!!
@@ -1887,17 +1852,17 @@ int ai_goal_priority_compare(const void *a, const void *b)
 	// If the flag is set, don't push the goal higher in the list even if priority
 	// is higher since goal cannot currently be achieved.

-	if ( (ga->flags[AI::Goal_Flags::Goal_on_hold]) && !(gb->flags[AI::Goal_Flags::Goal_on_hold]) )
+	if ( (ga->flags & AIGF_GOAL_ON_HOLD) && !(gb->flags & AIGF_GOAL_ON_HOLD) )
 		return 1;
-	else if ( !(ga->flags[AI::Goal_Flags::Goal_on_hold]) && (gb->flags[AI::Goal_Flags::Goal_on_hold]) )
+	else if ( !(ga->flags & AIGF_GOAL_ON_HOLD) && (gb->flags & AIGF_GOAL_ON_HOLD) )
 		return -1;

 	// check whether or not the goal override flag is set.  If it is set, then push this goal higher
 	// in the list

-	else if ( (ga->flags[AI::Goal_Flags::Goal_override]) && !(gb->flags[AI::Goal_Flags::Goal_override]) )
+	else if ( (ga->flags & AIGF_GOAL_OVERRIDE) && !(gb->flags & AIGF_GOAL_OVERRIDE) )
 		return -1;
-	else if ( !(ga->flags[AI::Goal_Flags::Goal_override]) && (gb->flags[AI::Goal_Flags::Goal_override]) )
+	else if ( !(ga->flags & AIGF_GOAL_OVERRIDE) && (gb->flags & AIGF_GOAL_OVERRIDE) )
 		return 1;

 	// now normal priority processing
@@ -1952,7 +1917,7 @@ void validate_mission_goals(int objnum, ai_info *aip)
 			continue;

 		// purge any goals which should get purged
-		if ( aigp->flags[AI::Goal_Flags::Purge] ) {
+		if ( aigp->flags & AIGF_PURGE ) {
 			ai_remove_ship_goal( aip, i );
 			continue;
 		}
@@ -1966,19 +1931,19 @@ void validate_mission_goals(int objnum, ai_info *aip)
 		}

 		// if the status is achievable, and the on_hold flag is set, clear the flagb
-		if ( (state == AI_GOAL_ACHIEVABLE) && (aigp->flags[AI::Goal_Flags::Goal_on_hold]) )
-			aigp->flags.remove(AI::Goal_Flags::Goal_on_hold);
+		if ( (state == AI_GOAL_ACHIEVABLE) && (aigp->flags & AIGF_GOAL_ON_HOLD) )
+			aigp->flags &= ~AIGF_GOAL_ON_HOLD;

 		// if the goal is not known, then set the ON_HOLD flag so that it doesn't get counted as
 		// a goal to be pursued
-		if (state == AI_GOAL_NOT_KNOWN)
-			aigp->flags.set(AI::Goal_Flags::Goal_on_hold);		// put this goal on hold until it becomes true
+		if ( state == AI_GOAL_NOT_KNOWN )
+			aigp->flags |= AIGF_GOAL_ON_HOLD;		// put this goal on hold until it becomes true
 	}

 	// if we had an active goal, and that goal is now in hold, make the mode AIM_NONE.  If a new valid
 	// goal is produced after prioritizing, then the mode will get reset immediately.  Otherwise, setting
 	// the mode to none will force ship to do default behavior.
-	if ( (aip->goals[0].ai_mode != AI_GOAL_NONE) && (aip->goals[0].flags[AI::Goal_Flags::Goal_on_hold]) )
+	if ( (aip->goals[0].ai_mode != AI_GOAL_NONE) && (aip->goals[0].flags & AIGF_GOAL_ON_HOLD) )
 		aip->mode = AIM_NONE;

 	// if the active goal is a rearm/repair goal, the put all other valid goals (which are not repair goals)
@@ -1987,7 +1952,7 @@ void validate_mission_goals(int objnum, ai_info *aip)
 		for ( i = 1; i < MAX_AI_GOALS; i++ ) {
 			if ( (aip->goals[i].ai_mode == AI_GOAL_NONE) || (aip->goals[i].ai_mode == AI_GOAL_REARM_REPAIR) )
 				continue;
-			aip->goals[i].flags.set(AI::Goal_Flags::Goal_on_hold);
+			aip->goals[i].flags |= AIGF_GOAL_ON_HOLD;
 		}
 	}
 }
@@ -2055,7 +2020,7 @@ void ai_process_mission_orders( int objnum, ai_info *aip )

 	// if the first goal in the list has the ON_HOLD flag, set, there is no current valid goal
 	// to pursue.
-	if ( aip->goals[0].flags[AI::Goal_Flags::Goal_on_hold] )
+	if ( aip->goals[0].flags & AIGF_GOAL_ON_HOLD )
 		return;

 	//	Kind of a hack for now.  active_goal means the goal currently being pursued.
@@ -2073,11 +2038,11 @@ void ai_process_mission_orders( int objnum, ai_info *aip )
 	// if this object was flying in formation off of another object, remove the flag that tells him
 	// to do this.  The form-on-my-wing command is removed from the goal list as soon as it is called, so
 	// we are safe removing this bit here.
-	aip->ai_flags.remove(AI::AI_Flags::Formation_object);
+	aip->ai_flags &= ~AIF_FORMATION_OBJECT;

 	// Goober5000 - we may want to use AI for the player
 	// AL 3-7-98: If this is a player ship, and the goal is not a formation goal, then do a quick out
-	if ( !(Player_use_ai) && (objp->flags[Object::Object_Flags::Player_ship]) && (current_goal->ai_mode != AI_GOAL_FORM_ON_WING) )
+	if ( !(Player_use_ai) && (objp->flags & OF_PLAYER_SHIP) && (current_goal->ai_mode != AI_GOAL_FORM_ON_WING) )
 	{
 		return;
 	}	
@@ -2151,7 +2116,7 @@ void ai_process_mission_orders( int objnum, ai_info *aip )

 		// be sure that we have indices for docking points here!  If we ever had names, they should
 		// get fixed up in goal_achievable so that the points can be checked there for validity
-		Assert (current_goal->flags[AI::Goal_Flags::Dockee_index_valid] && current_goal->flags[AI::Goal_Flags::Docker_index_valid]);
+		Assert (current_goal->flags & AIGF_DOCK_INDEXES_VALID);
 		ai_dock_with_object( objp, current_goal->docker.index, other_obj, current_goal->dockee.index, AIDO_DOCK );
 		break;
 	}
@@ -2233,19 +2198,19 @@ void ai_process_mission_orders( int objnum, ai_info *aip )
 		if (current_goal->ai_mode != AI_GOAL_DESTROY_SUBSYSTEM) {
 			if (aip->target_objnum != -1) {
 				//	Only protect if _not_ a capital ship.  We don't want the Lucifer accidentally getting protected.
-				if (Ship_types[Ship_info[Ships[shipnum].ship_info_index].class_type].flags[Ship::Type_Info_Flags::AI_protected_on_cripple])
-					Objects[aip->target_objnum].flags.set(Object::Object_Flags::Protected);
+				if (Ship_types[Ship_info[Ships[shipnum].ship_info_index].class_type].ai_bools & STI_AI_PROTECTED_ON_CRIPPLE)
+					Objects[aip->target_objnum].flags |= OF_PROTECTED;
 			}
 		} else	//	Just in case this ship had been protected, unprotect it.
 			if (aip->target_objnum != -1)
-				Objects[aip->target_objnum].flags.remove(Object::Object_Flags::Protected);
+				Objects[aip->target_objnum].flags &= ~OF_PROTECTED;

 		break;
 	}

 	case AI_GOAL_CHASE_WING:
 		wingnum = wing_name_lookup( current_goal->target_name );
-		Assertion( wingnum >= 0, "The target of AI_GOAL_CHASE_WING must refer to a valid wing!" );
+		Assert( wingnum >= 0 );
 		ai_attack_wing(objp, wingnum);
 		break;

@@ -2253,13 +2218,6 @@ void ai_process_mission_orders( int objnum, ai_info *aip )
 		ai_attack_object( objp, NULL, NULL );
 		break;

-	// chase-ship-class is chase-any but restricted to a subset of ships
-	case AI_GOAL_CHASE_SHIP_CLASS:
-		shipnum = ship_info_lookup( current_goal->target_name );
-		Assertion( shipnum >= 0, "The target of AI_GOAL_CHASE_SHIP_CLASS must refer to a valid ship class!" );
-		ai_attack_object( objp, NULL, NULL, shipnum );
-		break;
-
 	case AI_GOAL_WARP: {
 		mission_do_departure( objp, true );
 		break;
@@ -2389,22 +2347,15 @@ void ai_update_goal_references(ai_goal *goals, int type, const char *old_name, c
 						flag = 1;
 				}
 				break;
-
-			default:
-				Warning(LOCATION, "unhandled FRED reference type %d in ai_update_goal_references", type);
-				break;
 		}

 		if (flag)  // is this a valid goal to parse for this conversion?
-		{
-			if (!stricmp(goals[i].target_name, old_name))
-			{
+			if (!stricmp(goals[i].target_name, old_name)) {
 				if (*new_name == '<')  // target was just deleted..
 					goals[i].ai_mode = AI_GOAL_NONE;
 				else
 					goals[i].target_name = ai_get_goal_target_name(new_name, &dummy);
 			}
-		}
 	}
 }

@@ -26,7 +26,6 @@ struct ai_goal;
 // Fred.  If the goal you add doesn't have a target (such as chase_any), then you don't have
 // to worry about doing this.  Also add it to list in Fred\Management.cpp, and let Hoffoss know!
 // WMC - Oh and add them to Ai_goal_names plz. TY! :)
-// Goober5000 - As well as Ai_goal_text and Ai_goal_list, if appropriate
 #define AI_GOAL_CHASE					(1<<1)	// 0x00000002
 #define AI_GOAL_DOCK					(1<<2)	// 0x00000004	// used for undocking as well
 #define AI_GOAL_WAYPOINTS				(1<<3)	// 0x00000008
@@ -52,12 +51,10 @@ struct ai_goal;
 // resume regular goals
 #define AI_GOAL_STAY_STILL				(1<<20)	// 0x00100000
 #define AI_GOAL_PLAY_DEAD				(1<<21)	// 0x00200000
-
-// added by SCP
 #define AI_GOAL_CHASE_WEAPON			(1<<22)	// 0x00400000
+
 #define AI_GOAL_FLY_TO_SHIP				(1<<23) // 0x00800000
 #define AI_GOAL_IGNORE_NEW				(1<<24)	// 0x01000000
-#define AI_GOAL_CHASE_SHIP_CLASS		(1<<25)	// 0x02000000

 // now the masks for ship types

@@ -19,8 +19,8 @@
 #include "io/timer.h"
 #include "pcxutils/pcxutils.h"
 #include "render/3d.h"
-#include "graphics/material.h"
-#include "tracing/Monitor.h"
+
+

 static color Color_xparent;

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

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

 	frame_save = instance->frame_num;

@@ -505,10 +505,7 @@ int anim_show_next_frame(anim_instance *instance, float frametime)
 		else {
 			g3_rotate_vertex(&image_vertex,instance->world_pos);
 			Assert(instance->radius != 0.0f);
-			//g3_draw_bitmap(&image_vertex, 0, instance->radius*1.5f, TMAP_FLAG_TEXTURED | TMAP_HTL_2D);
-			material mat_params;
-			material_set_unlit(&mat_params, bitmap_id, 1.0f, false, false);
-			g3_render_rect_screen_aligned_2d(&mat_params, &image_vertex, 0, instance->radius*1.5f);
+			g3_draw_bitmap(&image_vertex, 0, instance->radius*1.5f, TMAP_FLAG_TEXTURED | TMAP_HTL_2D);
 		}
 									  
 		instance->last_bitmap = bitmap_id;
@@ -687,7 +684,7 @@ void anim_read_header(anim *ptr, CFILE *fp)
 * @details Memory-mapped files will page in the animation from disk as it is needed, but performance is not as good.
 * @return Pointer to anim that is loaded if sucess, NULL if failure.
 */
-anim *anim_load(const char *real_filename, int cf_dir_type, int file_mapped)
+anim *anim_load(char *real_filename, int cf_dir_type, int file_mapped)
 {
 	anim			*ptr;
 	CFILE			*fp;
@@ -733,10 +730,6 @@ anim *anim_load(const char *real_filename, int cf_dir_type, int file_mapped)

 		anim_read_header(ptr, fp);

-		if (ptr->width < 0 || ptr->height < 0) {
-			Error(LOCATION, "Ani file %s has a faulty header and cannot be loaded.", name);
-		}
-
 		if(ptr->num_keys > 0){
 			ptr->keys = (key_frame*)vm_malloc(sizeof(key_frame) * ptr->num_keys);
 			Assert(ptr->keys != NULL);
@@ -765,7 +758,7 @@ anim *anim_load(const char *real_filename, int cf_dir_type, int file_mapped)
 		}

 		// couldn't memory-map file... must be in a packfile, so stream manually
-		if ( file_mapped == PAGE_FROM_MEM && !ptr->cfile_ptr ) {
+		if ( file_mapped && !ptr->cfile_ptr ) {
 			ptr->flags &= ~ANF_MEM_MAPPED;
 			ptr->flags |= ANF_STREAMED;
 			ptr->cfile_ptr = cfopen(name, "rb", CFILE_NORMAL, cf_dir_type);
@@ -973,11 +966,6 @@ void anim_display_info(char *real_filename)
 	}

 	anim_read_header(&A, fp);
-
-	if (A.width < 0 || A.height < 0) {
-		Error(LOCATION, "Ani file %s has a faulty header and cannot be loaded.", filename);
-	}
-
 	// read the keyframe frame nums and offsets
 	key_frame_nums = (int*)vm_malloc(sizeof(int)*A.num_keys);
 	Assert(key_frame_nums != NULL);
@@ -40,8 +40,9 @@ typedef struct {

 enum
 {
-	PAGE_FROM_DISK		  = 0,
-	PAGE_FROM_MEM		  = 1
+	PAGE_FROM_MEM		  = 0,
+	PAGE_FROM_DISK		  = 1,
+	PAGE_FROM_DISK_FORCED = 2
 };

 extern int Anim_paused;
@@ -58,7 +59,7 @@ int				anim_stop_playing(anim_instance* anim_instance);
 int				anim_show_next_frame(anim_instance *instance, float frametime);
 void				anim_release_all_instances(int screen_id = 0);
 void				anim_release_render_instance(anim_instance* instance);
-anim			  *anim_load(const char *name, int cf_dir_type = CF_TYPE_ANY, int file_mapped = PAGE_FROM_DISK);
+anim			  *anim_load(char *name, int cf_dir_type = CF_TYPE_ANY, int file_mapped = PAGE_FROM_MEM);
 int				anim_free(anim *ptr);
 int				anim_playing(anim_instance *ai);
 int				anim_write_frames_out(char *filename);
@@ -512,14 +512,7 @@ int unpack_pixel(anim_instance *ai, ubyte *data, ubyte pix, int aabitmap, int bp
 			bit_16 = (ushort)pix;
 			break;
 		case 8:
-			// 8 bit-per-pixel aa bitmaps are a bit special since they only use value in the range [0, 15] where 15 wraps
-			// around back to 0. Since the rest of the code expects the value to be in the range [0, 255] the pixel value
-			// needs to be adjusted here. By muliplying the value with 17 the original range [0, 15] is mapped to [0, 255]
-			if (pix >= 15) {
-				bit_8 = 0;
-			} else {
-				bit_8 = (ubyte)(pix * 17);
-			}
+			bit_8 = pix;
 			break;
 		default:
 			Int3();
@@ -603,14 +596,7 @@ int unpack_pixel_count(anim_instance *ai, ubyte *data, ubyte pix, int count = 0,
 			bit_16 = (ushort)pix;
 			break;
 		case 8 :
-			// 8 bit-per-pixel aa bitmaps are a bit special since they only use value in the range [0, 15] where 15 wraps
-			// around back to 0. Since the rest of the code expects the value to be in the range [0, 255] the pixel value
-			// needs to be adjusted here. By muliplying the value with 17 the original range [0, 15] is mapped to [0, 255]
-			if (pix >= 15) {
-				bit_8 = 0;
-			} else {
-				bit_8 = (ubyte)(pix * 17);
-			}
+			bit_8 = pix;
 			break;
 		default :
 			Int3();			
@@ -14,6 +14,7 @@
 #include "fireball/fireballs.h"
 #include "freespace.h"
 #include "gamesnd/gamesnd.h"
+#include "globalincs/compatibility.h"
 #include "globalincs/linklist.h"
 #include "globalincs/systemvars.h"
 #include "hud/hud.h"
@@ -32,7 +33,7 @@
 #include "object/objcollide.h"
 #include "object/object.h"
 #include "parse/parselo.h"
-#include "scripting/scripting.h"
+#include "parse/scripting.h"
 #include "particle/particle.h"
 #include "render/3d.h"
 #include "ship/ship.h"
@@ -76,7 +77,7 @@ float	Asteroid_icon_closeup_zoom;
 /**
 * Force updating of pair stuff for asteroid *objp.
 */
-static void asteroid_update_collide(object *objp)
+void asteroid_update_collide(object *objp)
 {
 	// Asteroid has wrapped, update collide objnum and flags
 	Asteroids[objp->instance].collide_objnum = -1;
@@ -87,7 +88,7 @@ static void asteroid_update_collide(object *objp)
 /**
 * Clear out the ::Asteroid_obj_list
 */
-static void asteroid_obj_list_init()
+void asteroid_obj_list_init()
 {
 	int i;

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

 	asteroid *cur_asteroid = &Asteroids[Objects[objnum].instance];
-	index = (int)(cur_asteroid - Asteroids);
+	index = cur_asteroid - Asteroids;

 	Assert(index >= 0 && index < MAX_ASTEROID_OBJS);
 	Assert(!(Asteroid_objs[index].flags & ASTEROID_OBJ_USED));
@@ -123,7 +124,7 @@ static int asteroid_obj_list_add(int objnum)
 * Remove a node from the Asteroid_obj_list.  
 * Only called from ::weapon_delete()
 */
-static void asteroid_obj_list_remove(object * obj)
+void asteroid_obj_list_remove(object * obj)
 {
 	int index = obj->instance;

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

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

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

 	if (!asfieldp->has_inner_bound) {
 		return 0;
@@ -202,7 +203,7 @@ static int asteroid_in_inner_bound(asteroid_field *asfieldp, vec3d *pos, float d
 *
 * Moves to the other side of the inner box a distance delta from edge of box
 */
-static void inner_bound_pos_fixup(asteroid_field *asfieldp, vec3d *pos)
+void inner_bound_pos_fixup(asteroid_field *asfieldp, vec3d *pos)
 {
 	if (!asteroid_in_inner_bound(asfieldp, pos, 0)) {
 		return;
@@ -319,12 +320,8 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi
 	}

 	vm_angles_2_matrix(&orient, &angs);
-    flagset<Object::Object_Flags> asteroid_default_flagset;
-    asteroid_default_flagset += Object::Object_Flags::Renders;
-    asteroid_default_flagset += Object::Object_Flags::Physics;
-    asteroid_default_flagset += Object::Object_Flags::Collides;
-    
-    objnum = obj_create(OBJ_ASTEROID, -1, n, &orient, &pos, radius, asteroid_default_flagset);
+
+	objnum = obj_create( OBJ_ASTEROID, -1, n, &orient, &pos, radius, OF_RENDERS | OF_PHYSICS | OF_COLLIDES);
 	
 	if ( (objnum == -1) || (objnum >= MAX_OBJECTS) ) {
 		mprintf(("Couldn't create asteroid -- out of object slots\n"));
@@ -446,7 +443,7 @@ void asteroid_sub_create(object *parent_objp, int asteroid_type, vec3d *relvec)
 /**
 * Load in an asteroid model
 */
-static void asteroid_load(int asteroid_info_index, int asteroid_subtype)
+void asteroid_load(int asteroid_info_index, int asteroid_subtype)
 {
 	int i;
 	asteroid_info	*asip;
@@ -487,12 +484,26 @@ static void asteroid_load(int asteroid_info_index, int asteroid_subtype)
 	}
 }

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

 /**
- * Init asteroid system for the level, called from ::game_level_init()
+ * Init asteriod system for the level, called from ::game_level_init()
 */
 void asteroid_level_init()
 {
@@ -631,7 +642,7 @@ void asteroid_level_init()
 *
 * @return !0 if asteroid should be wrapped, 0 otherwise.  
 */
-static int asteroid_should_wrap(object *objp, asteroid_field *asfieldp)
+int asteroid_should_wrap(object *objp, asteroid_field *asfieldp)
 {
 	if ( MULTIPLAYER_CLIENT )
 		return 0;
@@ -676,7 +687,7 @@ static int asteroid_should_wrap(object *objp, asteroid_field *asfieldp)
 /**
 * Wrap an asteroid from one end of the asteroid field to the other
 */
-static void asteroid_wrap_pos(object *objp, asteroid_field *asfieldp)
+void asteroid_wrap_pos(object *objp, asteroid_field *asfieldp)
 {
 	if (objp->pos.xyz.x < asfieldp->min_bound.xyz.x) {
 		objp->pos.xyz.x = asfieldp->max_bound.xyz.x + (objp->pos.xyz.x - asfieldp->min_bound.xyz.x);
@@ -713,7 +724,7 @@ static void asteroid_wrap_pos(object *objp, asteroid_field *asfieldp)
 *
 * @return !0 if this asteroid is a target for any ship, otherwise return 0
 */
-static int asteroid_is_targeted(object *objp)
+int asteroid_is_targeted(object *objp)
 {
 	ship_obj	*so;
 	object	*ship_objp;
@@ -734,7 +745,7 @@ static int asteroid_is_targeted(object *objp)
 /**
 * Create an asteroid that will hit object *objp in delta_time seconds
 */
-static void asteroid_aim_at_target(object *objp, object *asteroid_objp, float delta_time)
+void asteroid_aim_at_target(object *objp, object *asteroid_objp, float delta_time)
 {
 	vec3d	predicted_center_pos;
 	vec3d	rand_vec;
@@ -762,7 +773,7 @@ static void asteroid_aim_at_target(object *objp, object *asteroid_objp, float de
 *
 * @param count asteroids already targeted on
 */
-static void maybe_throw_asteroid(int count)
+void maybe_throw_asteroid(int count)
 {
 	if (!timestamp_elapsed(Next_asteroid_throw)) {
 		return;
@@ -793,7 +804,7 @@ static void maybe_throw_asteroid(int count)

 				// if asteroid is inside inner bound, kill it
 				if (asteroid_in_inner_bound(&Asteroid_field, &objp->pos, 0.0f)) {
-					objp->flags.set(Object::Object_Flags::Should_be_dead);
+					objp->flags |= OF_SHOULD_BE_DEAD;
 				} else {
 					Asteroids[objp->instance].target_objnum = so->objnum;

@@ -836,7 +847,7 @@ void asteroid_delete( object * obj )
 * See if we should reposition the asteroid.  
 * Only reposition if oustide the bounding volume and the player isn't looking towards the asteroid.
 */
-static void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
+void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
 {
 	// passive field does not wrap
 	if (asfieldp->field_type == FT_PASSIVE) {
@@ -859,7 +870,7 @@ static void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
 			
 			if ( (dot < 0.7f) || (dist > asfieldp->bound_rad) ) {
 				if (Num_asteroids > MAX_ASTEROIDS-10) {
-					objp->flags.set(Object::Object_Flags::Should_be_dead);
+					objp->flags |= OF_SHOULD_BE_DEAD;
 				} else {
 					// check to ensure player won't see asteroid appear either
 					asteroid_wrap_pos(objp, asfieldp);
@@ -889,7 +900,7 @@ static void asteroid_maybe_reposition(object *objp, asteroid_field *asfieldp)
 	}
 }

-static void lerp(float *goal, float f1, float f2, float scale)
+void lerp(float *goal, float f1, float f2, float scale)
 {
 	*goal = (f2 - f1) * scale + f1;
 }
@@ -904,7 +915,7 @@ void asteroid_process_pre( object *objp )
 	}
 }

-int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos, collision_info_struct *asteroid_hit_info, vec3d* hitnormal)
+int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos, collision_info_struct *asteroid_hit_info)
 {
 	if (!Asteroids_enabled) {
 		return 0;
@@ -936,18 +947,8 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos
 		mc.flags = (MC_CHECK_MODEL);

 		if (model_collide(&mc))
-		{
 			*hitpos = mc.hit_point_world;

-			if (hitnormal)
-			{
-				vec3d normal;
-				model_find_world_dir(&normal, &mc.hit_normal, mc.model_num, mc.hit_submodel, mc.orient);
-
-				*hitnormal = normal;
-			}
-		}
-
 		return mc.num_hits;
 	}

@@ -1166,7 +1167,7 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos
 	}
 }

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

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

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

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

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

 /**
 * Do the area effect for an asteroid exploding
 *
- * @param asteroid_objp	object pointer to asteroid causing explosion
+ * @param asteroid_objp	object pointer to asteriod causing explosion
 */
-static void asteroid_do_area_effect(object *asteroid_objp)
+void asteroid_do_area_effect(object *asteroid_objp)
 {
 	object			*ship_objp;
 	float				damage, blast;
@@ -1325,7 +1326,7 @@ static void asteroid_do_area_effect(object *asteroid_objp)
 		ship_objp = &Objects[so->objnum];
 	
 		// don't blast navbuoys
-		if ( ship_get_SIF(ship_objp->instance)[Ship::Info_Flags::Navbuoy] ) {
+		if ( ship_get_SIF(ship_objp->instance) & SIF_NAVBUOY ) {
 			continue;
 		}

@@ -1352,7 +1353,7 @@ void asteroid_hit( object * pasteroid_obj, object * other_obj, vec3d * hitpos, f

 	asp = &Asteroids[pasteroid_obj->instance];

-	if (pasteroid_obj->flags[Object::Object_Flags::Should_be_dead]){
+	if (pasteroid_obj->flags & OF_SHOULD_BE_DEAD){
 		return;
 	}

@@ -1368,7 +1369,7 @@ void asteroid_hit( object * pasteroid_obj, object * other_obj, vec3d * hitpos, f

 			explosion_life = asteroid_create_explosion(pasteroid_obj);

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

 			asp->final_death_time = timestamp( fl2i(explosion_life*1000.0f)/5 );	// Wait till 30% of vclip time before breaking the asteroid up.
@@ -1387,8 +1388,8 @@ void asteroid_hit( object * pasteroid_obj, object * other_obj, vec3d * hitpos, f
 			weapon_info *wip;
 			wip = &Weapon_info[Weapons[other_obj->instance].weapon_info_index];
 			// If the weapon didn't play any impact animation, play custom asteroid impact animation
-			if (!wip->impact_weapon_expl_effect.isValid()) {
-				particle::create( hitpos, &vmd_zero_vector, 0.0f, Asteroid_impact_explosion_radius, particle::PARTICLE_BITMAP, Asteroid_impact_explosion_ani );
+			if ( wip->impact_weapon_expl_index < 0 ) {
+				particle_create( hitpos, &vmd_zero_vector, 0.0f, Asteroid_impact_explosion_radius, PARTICLE_BITMAP, Asteroid_impact_explosion_ani );
 			}
 		}
 	}
@@ -1408,7 +1409,7 @@ void asteroid_level_close()
 		if (Asteroids[i].flags & AF_USED) {
 			Asteroids[i].flags &= ~AF_USED;
 			Assert(Asteroids[i].objnum >=0 && Asteroids[i].objnum < MAX_OBJECTS);
-			Objects[Asteroids[i].objnum].flags.set(Object::Object_Flags::Should_be_dead);
+			Objects[Asteroids[i].objnum].flags |= OF_SHOULD_BE_DEAD;
 		}
 	}

@@ -1418,6 +1419,35 @@ void asteroid_level_close()
 DCF_BOOL2(asteroids, Asteroids_enabled, "enables or disables asteroids", "Usage: asteroids [bool]\nTurns asteroid system on/off.  If nothing passed, then toggles it.\n");


+void hud_target_asteroid()
+{
+	int	i;
+	int	start_index = 0, end_index = MAX_ASTEROIDS;
+
+	if (Player_ai->target_objnum != -1) {
+		if (Objects[Player_ai->target_objnum].type == OBJ_ASTEROID) {
+			start_index = Objects[Player_ai->target_objnum].instance+1;
+			end_index = start_index-1;
+			if (end_index < 0)
+				end_index = MAX_ASTEROIDS;
+		}
+	}
+
+	i = start_index;
+	while (i != end_index) {
+		if (i == MAX_ASTEROIDS)
+			i = 0;
+
+		if (Asteroids[i].flags & AF_USED) {
+			Assert(Objects[Asteroids[i].objnum].type == OBJ_ASTEROID);
+			set_target_objnum( Player_ai, Asteroids[i].objnum);
+			break;
+		}
+
+		i++;
+	}
+}
+
 /**
 * Return the number of active asteroids
 */
@@ -1430,7 +1460,7 @@ int asteroid_count()
 * See if asteroid should split up.  
 * We delay splitting up to allow the explosion animation to play for a bit.
 */
-static void asteroid_maybe_break_up(object *pasteroid_obj)
+void asteroid_maybe_break_up(object *pasteroid_obj)
 {
 	asteroid *asp;
 	asteroid_info *asip;
@@ -1444,7 +1474,7 @@ static void asteroid_maybe_break_up(object *pasteroid_obj)
 		Script_system.SetHookObject("Self", pasteroid_obj);
 		if(!Script_system.IsConditionOverride(CHA_DEATH, pasteroid_obj))
 		{
-			pasteroid_obj->flags.set(Object::Object_Flags::Should_be_dead);
+			pasteroid_obj->flags |= OF_SHOULD_BE_DEAD;

 			// multiplayer clients won't go through the following code.  asteroid_sub_create will send
 			// a create packet to the client in the above named function
@@ -1501,8 +1531,8 @@ static void asteroid_maybe_break_up(object *pasteroid_obj)

 					random_shuffle(roids_to_create.begin(), roids_to_create.end());

-					size_t total_roids = roids_to_create.size();
-					for (size_t i = 0; i < total_roids; i++) {
+					int total_roids = roids_to_create.size();
+					for (int i = 0; i < total_roids; i++) {
 						vec3d dir_vec,final_vec;
 						vec3d parent_vel,hit_rel_vec;

@@ -1525,12 +1555,8 @@ static void asteroid_maybe_break_up(object *pasteroid_obj)
 						vec3d tempv = dir_vec;
 						vm_vec_random_cone(&dir_vec, &tempv, (360.0f / total_roids / 2));

-						// Make the roid inherit half of parent's directional movement
-						if (!IS_VEC_NULL(&pasteroid_obj->phys_info.vel)) {
-							vm_vec_copy_normalize(&parent_vel, &pasteroid_obj->phys_info.vel);
-						} else {
-							vm_vec_rand_vec_quick(&parent_vel);
-						}
+						// Make the roid inherit half of the parent's velocity
+						vm_vec_copy_normalize(&parent_vel, &pasteroid_obj->phys_info.vel);
 						vm_vec_scale(&parent_vel, 0.5f);

 						// Make the hit position affect the direction, but only a little
@@ -1547,12 +1573,31 @@ static void asteroid_maybe_break_up(object *pasteroid_obj)
 			}
 			asp->final_death_time = timestamp(-1);
 		}
-		Script_system.RunCondition(CHA_DEATH, pasteroid_obj);
+		Script_system.RunCondition(CHA_DEATH, '\0', NULL, pasteroid_obj);
 		Script_system.RemHookVar("Self");
 	}
 }

-static void asteroid_test_collide(object *pasteroid_obj, object *pship_obj, mc_info *mc, bool lazy = false)
+int asteroid_get_random_in_cone(vec3d *pos, vec3d *dir, float ang, int danger)
+{
+	int idx;
+	vec3d asteroid_dir;
+
+	// just pick the first asteroid which satisfies our condition
+	for(idx=0; idx<Num_asteroids; idx++){
+		vm_vec_sub(&asteroid_dir, &Objects[Asteroids[idx].objnum].pos, pos);
+		vm_vec_normalize_quick(&asteroid_dir);
+
+		// if it satisfies the condition
+		if(vm_vec_dot(dir, &asteroid_dir) >= ang){
+			return idx;
+		}
+	}
+
+	return -1;
+}
+
+void asteroid_test_collide(object *pasteroid_obj, object *pship_obj, mc_info *mc, bool lazy = false)
 {
 	float		asteroid_ray_dist;
 	vec3d	asteroid_fvec, terminus;
@@ -1594,7 +1639,7 @@ static void asteroid_test_collide(object *pasteroid_obj, object *pship_obj, mc_i
 *
 * @return !0 if the asteroid will collide with the escort
 */
-static int asteroid_will_collide(object *pasteroid_obj, object *escort_objp)
+int asteroid_will_collide(object *pasteroid_obj, object *escort_objp)
 {
 	mc_info	mc;
 	mc_info_init(&mc);
@@ -1612,13 +1657,13 @@ static int asteroid_will_collide(object *pasteroid_obj, object *escort_objp)
 * Warn if asteroid on collision path with ship
 * @return !0 if we should warn about asteroid hitting ship, otherwise return 0
 */
-static int asteroid_valid_ship_to_warn_collide(ship *shipp)
+int asteroid_valid_ship_to_warn_collide(ship *shipp)
 {
-	if ( !(Ship_info[shipp->ship_info_index].is_big_or_huge()) ) {
+	if ( !(Ship_info[shipp->ship_info_index].flags & (SIF_BIG_SHIP | SIF_HUGE_SHIP)) ) {
 		return 0;
 	}

-	if ( shipp->flags[Ship::Ship_Flags::Dying] || shipp->flags[Ship::Ship_Flags::Depart_warp] ) {
+	if ( shipp->flags & (SF_DYING|SF_DEPART_WARP) ) {
 		return 0;
 	}

@@ -1634,7 +1679,7 @@ static int asteroid_valid_ship_to_warn_collide(ship *shipp)
 * See if asteroid will collide with a large ship on the escort list in the next
 * ASTEROID_MIN_COLLIDE_TIME seconds.
 */
-static void asteroid_update_collide_flag(object *asteroid_objp)
+void asteroid_update_collide_flag(object *asteroid_objp)
 {
 	int		i, num_escorts, escort_objnum, will_collide=0;
 	ship		*escort_shipp;
@@ -1673,7 +1718,7 @@ static void asteroid_update_collide_flag(object *asteroid_objp)
 /**
 * Ensure that the collide objnum for the asteroid is still valid
 */
-static void asteroid_verify_collide_objnum(asteroid *asp)
+void asteroid_verify_collide_objnum(asteroid *asp)
 {
 	if ( asp->collide_objnum >= 0 ) {
 		if ( Objects[asp->collide_objnum].signature != asp->collide_objsig ) {
@@ -1753,7 +1798,7 @@ float asteroid_time_to_impact(object *asteroid_objp)
 /**
 * Read in a single asteroid section from asteroid.tbl
 */
-static void asteroid_parse_section(asteroid_info *asip)
+void asteroid_parse_section(asteroid_info *asip)
 {
 	required_string("$Name:");
 	stuff_string(asip->name, F_NAME, NAME_LENGTH);
@@ -1853,12 +1898,12 @@ to do with the debris of ships that explode, however these
 are the same debris and asteroids that get flung at a ship
 that is being protected.
 */
-static void asteroid_parse_tbl()
+void asteroid_parse_tbl()
 {
 	char impact_ani_file[MAX_FILENAME_LEN];

 	// How did we get here without having any species defined?
-	Assertion(!Species_info.empty(),
+	Assertion(Species_info.size() > 0,
 		"Cannot parse asteroids/debris if there "
 		"are no species for them to belong to."
 		);
@@ -1870,8 +1915,8 @@ static void asteroid_parse_tbl()

 		required_string("#Asteroid Types");

-		size_t tally = 0;
-		size_t max_asteroids =
+		int tally = 0;
+		int max_asteroids =
 			NUM_DEBRIS_SIZES + Species_info.size() * NUM_DEBRIS_SIZES;

 #ifndef NDEBUG
@@ -1885,7 +1930,7 @@ static void asteroid_parse_tbl()

 			asteroid_parse_section(&new_asteroid);

-			size_t species = tally / NUM_DEBRIS_SIZES;
+			int species = tally / NUM_DEBRIS_SIZES;
 			if (tally >= max_asteroids)
 			{
 #ifdef NDEBUG
@@ -1922,7 +1967,7 @@ static void asteroid_parse_tbl()
 				default:
 					Error(LOCATION, "Get a coder! Math has broken!\n"
 						"Important numbers:\n"
-						"\ttally: " SIZE_T_ARG "\n"
+						"\ttally: %d\n"
 						"\tNUM_DEBRIS_SIZES: %d\n",
 						tally, NUM_DEBRIS_SIZES
 						);
@@ -1947,9 +1992,9 @@ static void asteroid_parse_tbl()
 			}
 #endif
 			Error(LOCATION,
-				"Found " SIZE_T_ARG " asteroids/debris when " SIZE_T_ARG " expected\n\n"
+				"Found %d asteroids/debris when %d expected\n\n"
 				"<Number expected> = <Number of species> * %d + %d generic asteroids\n"
-				SIZE_T_ARG " = " SIZE_T_ARG "*%d + %d\n\n"
+				"%d = " SIZE_T_ARG "*%d + %d\n\n"
 #ifdef NDEBUG
 				"Run a debug build to see a list of all parsed asteroids\n",
 #else
@@ -2004,7 +2049,7 @@ static void asteroid_parse_tbl()
 /**
 * Return number of asteroids expected to collide with a ship.
 */
-static int count_incident_asteroids()
+int count_incident_asteroids()
 {
 	object	*asteroid_objp;
 	int		count;
@@ -2028,7 +2073,7 @@ static int count_incident_asteroids()
 * Pick object to throw asteroids at.
 * Pick any capital or big ship inside the bounds of the asteroid field.
 */
-static int set_asteroid_throw_objnum()
+int set_asteroid_throw_objnum()
 {
 	if (Asteroid_field.num_initial_asteroids < 1)
 		return -1;
@@ -2040,7 +2085,7 @@ static int set_asteroid_throw_objnum()
 		ship_objp = &Objects[so->objnum];
 		float		radius = ship_objp->radius*2.0f;

-		if (Ship_info[Ships[ship_objp->instance].ship_info_index].is_big_or_huge()) {
+		if (Ship_info[Ships[ship_objp->instance].ship_info_index].flags & (SIF_HUGE_SHIP | SIF_BIG_SHIP)) {
 			if (ship_objp->pos.xyz.x + radius > Asteroid_field.min_bound.xyz.x)
 				if (ship_objp->pos.xyz.y + radius > Asteroid_field.min_bound.xyz.y)
 				if (ship_objp->pos.xyz.z + radius > Asteroid_field.min_bound.xyz.z)
@@ -19,7 +19,7 @@
 class object;
 class polymodel;
 struct collision_info_struct;
-class model_draw_list;
+class draw_list;

 #define	MAX_ASTEROIDS			512

@@ -152,17 +152,18 @@ void	asteroid_init();
 void	asteroid_level_init();
 void	asteroid_level_close();
 void	asteroid_create_all();
-void	asteroid_render(object * obj, model_draw_list *scene);
+void	asteroid_render(object * obj, draw_list *scene);
 void	asteroid_delete( object *asteroid_objp );
 void	asteroid_process_pre( object *asteroid_objp );
 void	asteroid_process_post( object *asteroid_objp);
-int	asteroid_check_collision( object *asteroid_objp, object * other_obj, vec3d * hitpos, collision_info_struct *asteroid_hit_info=NULL, vec3d* hitnormal=NULL );
+int	asteroid_check_collision( object *asteroid_objp, object * other_obj, vec3d * hitpos, collision_info_struct *asteroid_hit_info=NULL );
 void	asteroid_hit( object *pasteroid_objp, object *other_objp, vec3d *hitpos, float damage );
 int	asteroid_count();
 int	asteroid_collide_objnum(object *asteroid_objp);
 float asteroid_time_to_impact(object *asteroid_objp);
 void	asteroid_show_brackets();
 void	asteroid_target_closest_danger();
+int	asteroid_get_random_in_cone(vec3d *pos, vec3d *dir, float ang, int danger = 0);

 // need to extern for multiplayer
 void asteroid_sub_create(object *parent_objp, int asteroid_type, vec3d *relvec);
@@ -178,7 +178,7 @@ bool CanAutopilot(vec3d targetPos, bool send_msg)
 			object *other_objp = &Objects[so->objnum];
 			// attacks player?
 			if (iff_x_attacks_y(obj_team(other_objp), obj_team(Player_obj)) 
-				&& !(Ship_info[Ships[other_objp->instance].ship_info_index].flags[Ship::Info_Flags::Cargo])) // ignore cargo
+				&& !(Ship_info[Ships[other_objp->instance].ship_info_index].flags & SIF_CARGO)) // ignore cargo
 			{
 				// Cannot autopilot if enemy within AutopilotMinEnemyDistance meters
 				if (vm_vec_dist_quick(&targetPos, &other_objp->pos) < AutopilotMinEnemyDistance) {
@@ -233,7 +233,7 @@ bool StartAutopilot()
 	// If the support ship is doing something then tell the user such.
 	for ( object *objp = GET_FIRST(&obj_used_list); objp !=END_OF_LIST(&obj_used_list); objp = GET_NEXT(objp) )
 	{
-		if ((objp->type == OBJ_SHIP) && !(objp->flags[Object::Object_Flags::Should_be_dead]))
+		if ((objp->type == OBJ_SHIP) && !(objp->flags & OF_SHOULD_BE_DEAD))
 		{
 			Assertion((objp->instance >= 0) && (objp->instance < MAX_SHIPS),
 				"objp does not have a valid pointer to a ship. Pointer is %d, which is smaller than 0 or bigger than %d",
@@ -248,11 +248,11 @@ bool StartAutopilot()
 				shipp->ship_name, shipp->ship_info_index, static_cast<int>(Ship_info.size()));
 			ship_info *sip = &Ship_info[shipp->ship_info_index];

-			if ( !(sip->flags[Ship::Info_Flags::Support]) )
+			if ( !(sip->flags & SIF_SUPPORT) )
 				continue;

 			// don't deal with dying or departing support ships
-			if ( shipp->is_dying_or_departing() )
+			if ( shipp->flags & (SF_DYING | SF_DEPARTING) )
 				continue;

 			Assert(shipp->ai_index != -1);
@@ -286,7 +286,7 @@ bool StartAutopilot()
 		Autopilot_flight_leader = Player_obj;
 	}

-	if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
+	if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
 		LockAPConv = timestamp(); // lock convergence instantly
 	else
 		LockAPConv = timestamp(3000); // 3 seconds before we lock convergence
@@ -325,7 +325,7 @@ bool StartAutopilot()


 	// instantly turn player toward tpos
-	if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
+	if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
 	{
 		vm_vec_sub(&norm1, Navs[CurrentNav].GetPosition(), &Player_obj->pos);
 		vm_vector_2_matrix(&Player_obj->orient, &norm1, NULL, NULL);
@@ -334,8 +334,8 @@ bool StartAutopilot()
 	for (i = 0; i < MAX_SHIPS; i++)
 	{
 		if (Ships[i].objnum != -1 && 
-				(Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] || 
-					(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::Nav_carry])
+				(Ships[i].flags2 & SF2_NAVPOINT_CARRY || 
+					(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY)
 				)
 			)
 		{
@@ -345,7 +345,7 @@ bool StartAutopilot()
 	}

 	// damp speed_cap to 90% of actual -- to make sure ships stay in formation
-	if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
+	if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
 		speed_cap = 0.90f * speed_cap;

 	if ( speed_cap < 1.0f ) {
@@ -367,27 +367,28 @@ bool StartAutopilot()
 	for (i = 0; i < MAX_SHIPS; i++)
 	{
 		if (Ships[i].objnum != -1 && 
-				(Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] || 
-					(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::Nav_carry])
+				(Ships[i].flags2 & SF2_NAVPOINT_CARRY || 
+					(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY)
 				)
 			)
 		{
 			// do we have capital ships in the area?
-            if (Ship_info[Ships[i].ship_info_index].is_big_ship() || Ship_info[Ships[i].ship_info_index].flags[Ship::Info_Flags::Capital] || Ship_info[Ships[i].ship_info_index].flags[Ship::Info_Flags::Supercap])
+			if (Ship_info[Ships[i].ship_info_index].flags 
+				& ( SIF_CRUISER | SIF_CAPITAL | SIF_SUPERCAP | SIF_CORVETTE | SIF_AWACS | SIF_GAS_MINER | SIF_FREIGHTER | SIF_TRANSPORT))
 			{
 				capshipPresent = true;

 				capIndexes.push_back(i);
 				// ok.. what size class

-                if (Ship_info[Ships[i].ship_info_index].flags[Ship::Info_Flags::Capital] || Ship_info[Ships[i].ship_info_index].flags[Ship::Info_Flags::Supercap])
-                {
-                    capship_counts[0]++;
-                    if (capship_spreads[0] < Objects[Ships[i].objnum].radius)
-                        capship_spreads[0] = Objects[Ships[i].objnum].radius;
-                }
-                else if (Ship_info[Ships[i].ship_info_index].flags[Ship::Info_Flags::Corvette])
-                {
+				if (Ship_info[Ships[i].ship_info_index].flags & (SIF_CAPITAL | SIF_SUPERCAP))
+				{
+					capship_counts[0]++;
+					if (capship_spreads[0] < Objects[Ships[i].objnum].radius)
+						capship_spreads[0] = Objects[Ships[i].objnum].radius;
+				}
+				else if (Ship_info[Ships[i].ship_info_index].flags & (SIF_CORVETTE))
+				{
 					capship_counts[1]++;
 					if (capship_spreads[1] < Objects[Ships[i].objnum].radius)
 						capship_spreads[1] = Objects[Ships[i].objnum].radius;
@@ -415,15 +416,15 @@ bool StartAutopilot()
 				radius = Objects[Ships[i].objnum].radius;
 			}

-			if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
+			if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
 			{// instantly turn the ship to match the direction player is looking
 				//vm_vec_sub(&norm1, Navs[CurrentNav].GetPosition(), &Player_obj->pos);
 				vm_vector_2_matrix(&Objects[Ships[i].objnum].orient, &norm1, NULL, NULL);
 			}

 			// snap wings into formation
-			if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics] &&  // only if using cinematics 
-				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::Nav_carry]) // only if in a wing
+			if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS &&  // only if using cinematics 
+				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY) // only if in a wing
 				&& Autopilot_flight_leader != &Objects[Ships[i].objnum]) //only if not flight leader's object
 			{	
 				ai_info	*aip = &Ai_info[Ships[i].ai_index];
@@ -434,7 +435,7 @@ bool StartAutopilot()
 				if (leader_objp != &Objects[Ships[i].objnum])
 				{
 					// not leader.. get our position relative to leader
-					get_absolute_wing_pos_autopilot(&goal_point, leader_objp, wing_index, aip->ai_flags[AI::AI_Flags::Formation_object]);
+					get_absolute_wing_pos_autopilot(&goal_point, leader_objp, wing_index, aip->ai_flags & AIF_FORMATION_OBJECT);
 				}
 				else
 				{
@@ -469,10 +470,8 @@ bool StartAutopilot()
 				}
 			}
 			// lock primary and secondary weapons
-            if (LockWeaponsDuringAutopilot) { 
-                Ships[i].flags.set(Ship::Ship_Flags::Primaries_locked);
-                Ships[i].flags.set(Ship::Ship_Flags::Secondaries_locked);
-            }
+			if ( LockWeaponsDuringAutopilot )
+				Ships[i].flags2 |= (SF2_PRIMARIES_LOCKED | SF2_SECONDARIES_LOCKED);

 			// clear the ship goals and cap the waypoint speed
 			ai_clear_ship_goals(&Ai_info[Ships[i].ai_index]);
@@ -480,7 +479,7 @@ bool StartAutopilot()

 			
 			// if they're not part of a wing set their goal
-			if (Ships[i].wingnum == -1 || The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
+			if (Ships[i].wingnum == -1 || The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
 			{ 
 				if (Navs[CurrentNav].flags & NP_WAYPOINT)
 				{
@@ -497,11 +496,11 @@ bool StartAutopilot()
 	}

 	// assign wing goals
-	if (!(The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics]))
+	if (!(The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS))
 	{
 		for (i = 0; i < MAX_WINGS; i++)
 		{
-			if (Wings[i].flags[Ship::Wing_Flags::Nav_carry] )
+			if (Wings[i].flags & WF_NAV_CARRY )
 			{	
 				//ai_add_ship_goal_player( int type, int mode, int submode, char *shipname, ai_info *aip );

@@ -539,8 +538,8 @@ bool StartAutopilot()
 	{
 		if (Ships[i].objnum != -1)
 		{
-			if (Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] || 
-				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::Nav_carry]))
+			if (Ships[i].flags2 & SF2_NAVPOINT_CARRY || 
+				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY))
 				for (j = 0; j < MAX_AI_GOALS; j++)
 				{
 					if (Ai_info[Ships[i].ai_index].goals[j].ai_mode == AI_GOAL_WAYPOINTS_ONCE ||
@@ -558,7 +557,7 @@ bool StartAutopilot()
 	start_dist = DistanceTo(CurrentNav);

 	// ----------------------------- setup cinematic -----------------------------
-	if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
+	if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
 	{	
 		if (capshipPresent)
 		{
@@ -571,7 +570,7 @@ bool StartAutopilot()
 				vm_vec_add(&front, &Autopilot_flight_leader->orient.vec.fvec, &zero);
 				vm_vec_add(&up, &Autopilot_flight_leader->orient.vec.uvec, &zero);
 				vm_vec_add(&offset, &zero, &zero);
-                if (Ship_info[Ships[*idx].ship_info_index].flags[Ship::Info_Flags::Capital] || Ship_info[Ships[*idx].ship_info_index].flags[Ship::Info_Flags::Supercap])
+				if (Ship_info[Ships[*idx].ship_info_index].flags & (SIF_CAPITAL | SIF_SUPERCAP))
 				{
 					//0 - below - three lines of position

@@ -605,7 +604,7 @@ bool StartAutopilot()

 					capship_placed[0]++;
 				}
-                else if (Ship_info[Ships[*idx].ship_info_index].flags[Ship::Info_Flags::Corvette])
+				else if (Ship_info[Ships[*idx].ship_info_index].flags & SIF_CORVETTE)
 				{
 					//1 above - 3 lines of position
 					// front/back to zero
@@ -914,16 +913,14 @@ void EndAutoPilot()
 	{
 		if (Ships[i].objnum != -1 && 
 			(
-				Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] || 
-				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::Nav_carry] )
+				Ships[i].flags2 & SF2_NAVPOINT_CARRY || 
+				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY )
 			 )
 		   )
 		{
 			//unlock their weaponry
-            if (LockWeaponsDuringAutopilot) {
-                Ships[i].flags.remove(Ship::Ship_Flags::Primaries_locked);
-                Ships[i].flags.remove(Ship::Ship_Flags::Secondaries_locked);
-            }
+			if ( LockWeaponsDuringAutopilot )
+				Ships[i].flags2 &= ~(SF2_PRIMARIES_LOCKED | SF2_SECONDARIES_LOCKED);
 			Ai_info[Ships[i].ai_index].waypoint_speed_cap = -1; // uncap their speed
 			Ai_info[Ships[i].ai_index].mode = AIM_NONE; // make AI re-evaluate current ship mode

@@ -950,7 +947,7 @@ void EndAutoPilot()
 						aigp->ai_mode = AI_GOAL_NONE;
 						aigp->signature = -1;
 						aigp->priority = -1;
-						aigp->flags.reset();
+						aigp->flags = 0;
 					}
 				}
 			}
@@ -958,11 +955,11 @@ void EndAutoPilot()
 	}

 	// un-assign wing goals
-	if ( !(The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics]) )
+	if ( !(The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS) )
 	{
 		for (i = 0; i < MAX_WINGS; i++)
 		{
-			if (Wings[i].flags[Ship::Wing_Flags::Nav_carry] )
+			if (Wings[i].flags & WF_NAV_CARRY )
 			{
 				for (j = 0; j < MAX_AI_GOALS; j++)
 				{
@@ -974,7 +971,7 @@ void EndAutoPilot()
 						aigp->ai_mode = AI_GOAL_NONE;
 						aigp->signature = -1;
 						aigp->priority = -1;
-						aigp->flags.reset();
+						aigp->flags = 0;
 					}
 				}
 			}
@@ -1044,8 +1041,8 @@ void nav_warp(bool prewarp=false)
 	for (int i = 0; i < MAX_SHIPS; i++)
 	{
 		if (Ships[i].objnum != -1
-			&& (Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] 
-				|| (Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::Nav_carry])))
+			&& (Ships[i].flags2 & SF2_NAVPOINT_CARRY 
+				|| (Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY)))
 		{
 				vm_vec_add(&Objects[Ships[i].objnum].pos, &Objects[Ships[i].objnum].pos, &targetPos);
 				Objects[Ships[i].objnum].phys_info.vel = velocity;
@@ -1072,7 +1069,7 @@ void NavSystem_Do()
 	{
 		if (AutoPilotEngaged)
 		{
-			if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
+			if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
 			{
 				camera *cam = nav_get_set_camera();
 				if (CinematicStarted)
@@ -1151,7 +1148,7 @@ void NavSystem_Do()
 	}

 	// ramp time compression - only if not using cinematics
-	if (AutoPilotEngaged && !(The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics]))
+	if (AutoPilotEngaged && !(The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS))
 	{
 		int dstfrm_start = start_dist - DistanceTo(CurrentNav);

@@ -1196,14 +1193,14 @@ void NavSystem_Do()
 	*/
 	for (int i = 0; i < MAX_SHIPS; i++)
 	{
-		if (Ships[i].objnum != -1 && Ships[i].flags[Ship::Ship_Flags::Navpoint_needslink])
+		if (Ships[i].objnum != -1 && Ships[i].flags2 & SF2_NAVPOINT_NEEDSLINK)
 		{
 			object *other_objp = &Objects[Ships[i].objnum];

 			if (vm_vec_dist_quick(&Player_obj->pos, &other_objp->pos) < (NavLinkDistance + other_objp->radius))
 			{
-                Ships[i].flags.remove(Ship::Ship_Flags::Navpoint_needslink);
-                Ships[i].flags.set(Ship::Ship_Flags::Navpoint_carry);
+				Ships[i].flags2 &= ~SF2_NAVPOINT_NEEDSLINK;
+				Ships[i].flags2 |= SF2_NAVPOINT_CARRY;
 				
 				send_autopilot_msgID(NP_MSG_MISC_LINKED);
 			}
@@ -1231,7 +1228,7 @@ void send_autopilot_msg(char *msg, char *snd)
 		audio_handle = -1;
 	}

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

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

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

@@ -1272,7 +1269,7 @@ void NavSystem_Init()

 // ********************************************************************************************

-void parse_autopilot_table(const char *filename)
+void parse_autopilot_table(char *filename)
 {
 	SCP_vector<SCP_string> lines;

@@ -1315,7 +1312,7 @@ void parse_autopilot_table(const char *filename)
 			Cmdline_autopilot_interruptable = 0;

 		// No Nav selected message
-		const char *msg_tags[] = { "$No Nav Selected:", "$Gliding:",
+		char *msg_tags[] = { "$No Nav Selected:", "$Gliding:",
 			"$Too Close:", "$Hostiles:", "$Linked:", "$Hazard:",
 			"$Support Present:", "$Support Working:" };
 		for (int i = 0; i < NP_NUM_MESSAGES; i++)
@@ -118,7 +118,7 @@ void NavSystem_Do();
 void NavSystem_Init();

 // parse autopilot.tbl
-void parse_autopilot_table(const char *filename);
+void parse_autopilot_table(char *filename);

 // Finds a Nav point by name
 int FindNav(char *Nav);
@@ -23,16 +23,6 @@

 #include "bmpman/bmpman.h"

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

 		struct {
 			// stuff for static animations
@@ -95,40 +84,22 @@ struct bitmap_entry {
 	// bookeeping
 	ubyte used_last_frame;  // If set, then it was used last frame
 	ubyte used_this_frame;  // If set, then it was used this frame
-	size_t data_size;        // How much data this bitmap uses
+	int   data_size;        // How much data this bitmap uses
 	int   used_count;       // How many times it was accessed
 #endif
 };

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

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

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

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

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

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

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

 extern int Bm_paging;   //!< Bool type that indicates if BMPMAN is currently paging.

@@ -130,6 +140,22 @@ void bm_init();
 */
 void bm_close();

+/**
+ * Gets the cache slot of the bitmap indexed by handle.
+ *
+ * @details if the bitmap is an ani, gets the first frame
+ *
+ * @returns The cache slot index of the bitmap if handle is valid
+ *
+ * @note If the handle is invalid, an Assert() fails
+ */
+int bm_get_cache_slot(int bitmap_id, int separate_ani_frames);
+
+/**
+ * @brief Gets the next available bitmap slot.
+ */
+int bm_get_next_handle();
+
 #define BMP_FLAG_RENDER_TARGET_STATIC		(1<<0)
 #define BMP_FLAG_RENDER_TARGET_DYNAMIC		(1<<1)
 #define BMP_FLAG_CUBEMAP					(1<<2)
@@ -144,14 +170,14 @@ void bm_close();
 * @note z64 - This function looks fishy. Not only is handle not used in release builds, but bm_bitmaps[handle].size
 *   and bm_texture_size aren't modified unless this is a debug build
 */
-void *bm_malloc(int handle, size_t size);
+void *bm_malloc(int handle, int size);

 /**
 * @brief (DEBUG) Similar to bm_malloc, but only updates how much memory is used
 *
 * @note z64 - Also fishy (see bm_malloc)
 */
-void bm_update_memory_used(int n, size_t size);
+void bm_update_memory_used(int n, int size);

 class bitmap_lookup {
 	ubyte *Bitmap_data;
@@ -383,6 +409,13 @@ void bm_get_filename(int bitmapnum, char *filename);
 */
 const char *bm_get_filename(int handle);

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

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

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

 //*************************CLASS: camera*************************
 //This is where the camera class beings! :D
-camera::camera(const char *in_name, int in_signature)
+camera::camera(char *in_name, int in_signature)
 {
 	set_name(in_name);
 	sig = in_signature;
@@ -78,7 +78,7 @@ void camera::reset()
 	}
 }

-void camera::set_name(const char *in_name)
+void camera::set_name(char *in_name)
 {
 	if(in_name != NULL)
 		strncpy(name, in_name, NAME_LENGTH-1);
@@ -245,12 +245,12 @@ void camera::set_rotation_facing(vec3d *in_target, float in_rotation_time, float
 	set_rotation(&temp_matrix, in_rotation_time, in_rotation_acceleration_time, in_rotation_deceleration_time);
 }

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

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

 }
@@ -612,8 +612,8 @@ subtitle::subtitle(int in_x_pos, int in_y_pos, const char* in_text, const char*
 		int old_fontnum;
 		if (text_fontnum >= 0)
 		{
-			old_fontnum = font::get_current_fontnum();
-			font::set_font(text_fontnum);
+			old_fontnum = gr_get_current_fontnum();
+			gr_set_font(text_fontnum);
 		}
 		else
 		{
@@ -634,7 +634,7 @@ subtitle::subtitle(int in_x_pos, int in_y_pos, const char* in_text, const char*
 		// restore old font
 		if (old_fontnum >= 0)
 		{
-			font::set_font(old_fontnum);
+			gr_set_font(old_fontnum);
 		}

 		//Get image size
@@ -710,8 +710,8 @@ void subtitle::do_frame(float frametime)
 	int old_fontnum;
 	if (text_fontnum >= 0)
 	{
-		old_fontnum = font::get_current_fontnum();
-		font::set_font(text_fontnum);
+		old_fontnum = gr_get_current_fontnum();
+		gr_set_font(text_fontnum);
 	}
 	else
 	{
@@ -732,7 +732,7 @@ void subtitle::do_frame(float frametime)
 	// restore old font
 	if (old_fontnum >= 0)
 	{
-		font::set_font(old_fontnum);
+		gr_set_font(old_fontnum);
 	}

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

-subtitle& subtitle::operator=(const subtitle &sub)
+const subtitle &subtitle::operator=(const subtitle &sub)
 {
 	if (this != &sub) {
 		if (image_id != -1) {
@@ -824,7 +824,7 @@ camid::camid()
 	sig = -1;
 }

-camid::camid(size_t n_idx, int n_sig)
+camid::camid(int n_idx, int n_sig)
 {
 	idx = n_idx;
 	sig = n_sig;
@@ -838,7 +838,7 @@ camera* camid::getCamera()
 	return Cameras[idx];
 }

-size_t camid::getIndex()
+uint camid::getIndex()
 {
 	return idx;
 }
@@ -885,14 +885,14 @@ int cam_get_next_sig()
 	return next_sig++;
 }

-camid cam_create(const char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_object, int n_object_host_submodel)
+camid cam_create(char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_object, int n_object_host_submodel)
 {
 	matrix ori;
 	vm_vector_2_matrix_norm(&ori, n_norm);
 	return cam_create(n_name, n_pos, &ori, n_object, n_object_host_submodel);
 }

-camid cam_create(const char *n_name, vec3d *n_pos, matrix *n_ori, object *n_object, int n_object_host_submodel)
+camid cam_create(char *n_name, vec3d *n_pos, matrix *n_ori, object *n_object, int n_object_host_submodel)
 {
 	camera *cam = NULL;
 	camid cid;
@@ -954,7 +954,7 @@ camid cam_get_current()
 	return Current_camera;
 }

-size_t cam_get_num()
+uint cam_get_num()
 {
 	return Cameras.size();
 }
@@ -962,7 +962,7 @@ size_t cam_get_num()
 /**
 * Looks up camera by name, returns -1 on failure
 */
-camid cam_lookup(const char* name)
+camid cam_lookup(char *name)
 {
 	size_t i, size=Cameras.size();
 	for(i = 0; i < size; i++)
@@ -43,13 +43,13 @@ protected:
 	vec3d c_pos;
 	matrix c_ori;
 public:
-	camera(const char *in_name=NULL, int in_signature=-1);
+	camera(char *in_name=NULL, int in_signature=-1);
 	~camera();
 	void clear();
 	void reset();

 	//Set
-	void set_name(const char *in_name);
+	void set_name(char *in_name);

 	void set_object_host(object *objp, int n_object_host_submodel = -1);
 	void set_object_target(object *objp, int n_object_target_submodel = -1);
@@ -68,7 +68,7 @@ public:
 	void set_rotation_velocity(angles *in_rotation_rate, float in_acceleration_time = 0.0f);

 	//Get
-	const char* get_name() { return name; }
+	char *get_name() {return name;}
 	int get_signature() {return sig;}
 	object *get_object_host();
 	int get_object_host_submodel();
@@ -143,7 +143,7 @@ public:
 	~subtitle();

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

 	void do_frame(float frametime);
 	bool is_post_shaded( ) { return post_shaded; }
@@ -158,15 +158,15 @@ extern float Sexp_fov;
 void cam_init();
 void cam_close();
 void cam_do_frame(float frametime);
-camid cam_create(const char *n_name=NULL, vec3d *n_pos=NULL, matrix *n_ori=NULL, object *n_object=NULL, int n_submodel_parent=-1);
-camid cam_create(const char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_object=NULL, int n_submodel_parent=-1);
+camid cam_create(char *n_name=NULL, vec3d *n_pos=NULL, matrix *n_ori=NULL, object *n_object=NULL, int n_submodel_parent=-1);
+camid cam_create(char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_object=NULL, int n_submodel_parent=-1);
 void cam_delete(camid cid);
 bool cam_set_camera(camid cid);
 void cam_reset_camera();
-camid cam_lookup(const char* name);
+camid cam_lookup(char *name);
 camid cam_get_camera(uint index);
 camid cam_get_current();
-size_t cam_get_num();
+uint cam_get_num();

 void get_turret_cam_pos(camera *cam, vec3d *pos);
 void get_turret_cam_orient(camera *cam, matrix *ori);
@@ -10,11 +10,10 @@

 #define _CFILE_INTERNAL 

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

 #ifdef _WIN32
 #include <io.h>
@@ -24,6 +23,7 @@
 #endif

 #ifdef SCP_UNIX
+#include <sys/stat.h>
 #include <glob.h>
 #include <sys/mman.h>
 #endif
@@ -33,21 +33,20 @@
 #include "cfile/cfilesystem.h"
 #include "osapi/osapi.h"
 #include "parse/encrypt.h"
-#include "cfilesystem.h"


-#include <limits>
-
 char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
 char Cfile_user_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
+#ifdef SCP_UNIX
+char Cfile_user_dir_legacy[CFILE_ROOT_DIRECTORY_LEN] = "";
+#endif

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

 #define CFILE_STACK_MAX	8

@@ -111,8 +107,7 @@ static const char *Cfile_cdrom_dir = NULL;
 //
 static int cfget_cfile_block();
 static CFILE *cf_open_fill_cfblock(const char* source, int line, FILE * fp, int type);
-static CFILE *cf_open_packed_cfblock(const char* source, int line, FILE *fp, int type, size_t offset, size_t size);
-static CFILE *cf_open_memory_fill_cfblock(const char* source, int line, const void* data, size_t size, int dir_type);
+static CFILE *cf_open_packed_cfblock(const char* source, int line, FILE *fp, int type, int offset, int size);

 #if defined _WIN32
 static CFILE *cf_open_mapped_fill_cfblock(const char* source, int line, HANDLE hFile, int type);
@@ -132,14 +127,12 @@ static void dump_opened_files()
 	}
 }

-void cfile_close()
+static void cfile_close()
 {
 	mprintf(("Still opened files:\n"));
 	dump_opened_files();

 	cf_free_secondary_filelist();
-
-	cfile_inited = 0;
 }

 #ifdef SCP_UNIX
@@ -190,8 +183,9 @@ static bool cfile_in_root_dir(const char *exe_path)
 */
 int cfile_init(const char *exe_dir, const char *cdrom_dir)
 {
-	// initialize encryption
-	encrypt_init();	
+	int i;
+
+	encrypt_init();	  /* initialize encryption */

 	if (cfile_inited) {
 		return 0;
@@ -201,7 +195,7 @@ int cfile_init(const char *exe_dir, const char *cdrom_dir)

 	strncpy(buf, exe_dir, CFILE_ROOT_DIRECTORY_LEN - 1);
 	buf[CFILE_ROOT_DIRECTORY_LEN - 1] = '\0';
-	size_t i = strlen(buf);
+	i = strlen(buf);

 	// are we in a root directory?		
 	if(cfile_in_root_dir(buf)){
@@ -226,8 +220,14 @@ int cfile_init(const char *exe_dir, const char *cdrom_dir)
 	cfile_chdir(buf);

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

 	for (i = 0; i < MAX_CFILE_BLOCKS; i++) {
 		Cfile_block_list[i].type = CFILE_BLOCK_UNUSED;
@@ -239,6 +239,8 @@ int cfile_init(const char *exe_dir, const char *cdrom_dir)
 	Cfile_cdrom_dir = cdrom_dir;
 	cf_build_secondary_filelist(Cfile_cdrom_dir);

+	atexit(cfile_close);
+
 	return 0;
 }

@@ -352,7 +354,8 @@ int cfile_push_chdir(int type)
 		return -1;
 	}

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

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

@@ -404,7 +407,7 @@ int cfile_flush_dir(int dir_type)
 	// proceed to delete the files
 	del_count = 0;
 #if defined _WIN32
-	intptr_t find_handle;
+	int find_handle;
 	_finddata_t find;
 	find_handle = _findfirst( "*", &find );
 	if (find_handle != -1) {
@@ -456,13 +459,14 @@ int cfile_flush_dir(int dir_type)
 //    Returns: new filename or filepath with extension.
 char *cf_add_ext(const char *filename, const char *ext)
 {
+	int flen, elen;
 	static char path[MAX_PATH_LEN];

-	size_t flen = strlen(filename);
-	size_t elen = strlen(ext);
+	flen = strlen(filename);
+	elen = strlen(ext);
 	Assert(flen < MAX_PATH_LEN);
 	strcpy_s(path, filename);
-	if ((flen < 4) || stricmp(path + flen - elen, ext) != 0) {
+	if ((flen < 4) || stricmp(path + flen - elen, ext)) {
 		Assert(flen + elen < MAX_PATH_LEN);
 		strcat_s(path, ext);
 	}
@@ -475,17 +479,17 @@ char *cf_add_ext(const char *filename, const char *ext)
 *
 * @param filename Name of file to delete
 * @param path_type Path type (CF_TYPE_xxx)
- * @param location_flags Where to search for the location of the file to delete
 *
 * @return 0 on failure, 1 on success
 */
-int cf_delete(const char *filename, int path_type, uint32_t location_flags)
+int cf_delete(const char *filename, int path_type)
 {
 	char longname[MAX_PATH_LEN];

 	Assert(CF_TYPE_SPECIFIED(path_type));

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

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

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

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

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

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

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

 #ifdef _WIN32
@@ -556,7 +560,7 @@ void cf_attrib(const char *filename, int set, int clear, int dir_type)
 		fclose(fp);

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

 }
@@ -589,38 +593,15 @@ int cf_rename(const char *old_name, const char *name, int dir_type)

 }

-
-// This takes a path (e.g. "C:\Games\FreeSpace2\Lots\More\Directories") and creates it in its entirety.
-// Do note that this requires the path to have normalized directory separators as defined by DIR_SEPARATOR_CHAR
-static void mkdir_recursive(const char *path) {
-    size_t pre = 0, pos;
-    SCP_string tmp(path);
-    SCP_string dir;
-
-    if (tmp[tmp.size() - 1] != DIR_SEPARATOR_CHAR) {
-        // force trailing / so we can handle everything in loop
-        tmp += DIR_SEPARATOR_CHAR;
-    }
-
-    while ((pos = tmp.find_first_of(DIR_SEPARATOR_CHAR, pre)) != std::string::npos) {
-        dir = tmp.substr(0, pos++);
-        pre = pos;
-        if (dir.empty()) continue; // if leading / first time is 0 length
-        
-        _mkdir(dir.c_str());
-    }
-}
-
 // Creates the directory path if it doesn't exist. Even creates all its
 // parent paths.
-void cf_create_directory(int dir_type, uint32_t location_flags)
+void cf_create_directory( int dir_type )
 {
 	int num_dirs = 0;
 	int dir_tree[CF_MAX_PATH_TYPES];
 	char longname[MAX_PATH_LEN];
-	struct stat statbuf;

-	Assertion( CF_TYPE_SPECIFIED(dir_type), "Invalid dir_type passed to cf_create_directory." );
+	Assert( CF_TYPE_SPECIFIED(dir_type) );

 	int current_dir = dir_type;

@@ -632,15 +613,18 @@ void cf_create_directory(int dir_type, uint32_t location_flags)

 	} while( current_dir != CF_TYPE_ROOT );

+	
 	int i;

 	for (i=num_dirs-1; i>=0; i-- )	{
-		cf_create_default_path_string(longname, sizeof(longname) - 1, dir_tree[i], nullptr, false, location_flags);
-		if (stat(longname, &statbuf) != 0) {
-			mprintf(( "CFILE: Creating new directory '%s'\n", longname ));
-			mkdir_recursive(longname);
+		cf_create_default_path_string( longname, sizeof(longname)-1, dir_tree[i], NULL );
+
+		if ( _mkdir(longname)==0 )	{
+			mprintf(( "CFILE: Created new directory '%s'\n", longname ));
 		}
 	}
+
+
 }


@@ -662,13 +646,14 @@ extern int game_cd_changed();
 //					error   ==> NULL
 //

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

+	char longname[_MAX_PATH];
+
 	if ( !cfile_inited ) {
 		Int3();
 		return NULL;
@@ -680,7 +665,7 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 	Assert( mode != NULL );
 	
 	// Can only open read-only binary files in memory mapped mode.
-	if ( (type & CFILE_MEMORY_MAPPED) && strcmp(mode,"rb") != 0 ) {
+	if ( (type & CFILE_MEMORY_MAPPED) && strcmp(mode,"rb") ) {
 		Int3();				
 		return NULL;
 	}
@@ -690,8 +675,6 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 	// the harddisk.  No fancy packfile stuff here!
 	
 	if ( strchr(mode,'w') || strchr(mode,'+') || strchr(mode,'a') )	{
-		char longname[_MAX_PATH];
-
 		// For write-only files, require a full path or a path type
 #ifdef SCP_UNIX
 		if ( strpbrk(file_path, "/") ) {
@@ -705,9 +688,9 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 			Assert( dir_type != CF_TYPE_ANY );

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

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

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

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

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

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

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

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

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

 	}
@@ -808,7 +801,7 @@ CFILE* _cfopen(const char* source, int line, const char* file_path, const char*
 // returns:		success	==> address of CFILE structure
 //				error	==> NULL
 //
-CFILE *_cfopen_special(const char* source, int line, const char *file_path, const char *mode, const size_t size, const size_t offset, const void* data, int dir_type)
+CFILE *_cfopen_special(const char* source, int line, const char *file_path, const char *mode, const int size, const int offset, int dir_type)
 {
 	if ( !cfile_inited) {
 		Int3();
@@ -817,6 +810,7 @@ CFILE *_cfopen_special(const char* source, int line, const char *file_path, cons

 	Assert( file_path && strlen(file_path) );
 	Assert( mode != NULL );
+	Assert( offset >= 0 );

 	// cfopen_special() only supports reading files, not creating them
 	if ( strchr(mode, 'w') ) {
@@ -824,27 +818,19 @@ CFILE *_cfopen_special(const char* source, int line, const char *file_path, cons
 		return NULL;
 	}

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

-		if (fp) {
-			if (offset) {
-				// Found it in a pack file
-				return cf_open_packed_cfblock(source, line, fp, dir_type, offset, size);
-			}
-			else {
-				// Found it in a normal file
-				return cf_open_fill_cfblock(source, line, fp, dir_type);
-			}
-		}
-	}
+	if ( !fp )
+		return NULL;

-	return NULL;
+	if ( offset ) {
+		// it's in a pack file
+		return cf_open_packed_cfblock(source, line, fp, dir_type, offset, size);
+	} else {
+		// it's a normal file
+		return cf_open_fill_cfblock(source, line, fp, dir_type);
+	}
 }


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

-	UNREACHABLE("There are no more free cfile blocks. This means that there are too many files opened by FSO.\n"
+	Assertion(false, "There are no more free cfile blocks. This means that there are too many files opened by FSO.\n"
 		"This is probably caused by a programming or scripting error where a file does not get closed."); // out of free cfile blocks
 	return -1;			
 }
@@ -918,7 +904,7 @@ int cfclose( CFILE * cfile )
 	cb = &Cfile_block_list[cfile->id];	

 	result = 0;
-	if ( cb->data && cb->mem_mapped ) {
+	if ( cb->data ) {
 		// close memory mapped file
 #if defined _WIN32
 		result = UnmapViewOfFile((void*)cb->data);
@@ -932,8 +918,7 @@ int cfclose( CFILE * cfile )
 		// FIXME: result is wrong after munmap() but it is successful
 		//result = munmap(cb->data, cb->data_length);
 		//Assert(result);
-		// This const_cast is safe since the pointer returned by mmap was also non-const
-		munmap(const_cast<void*>(cb->data), cb->data_length);
+		munmap(cb->data, cb->data_length);
 		if ( cb->fp != NULL)
 			result = fclose(cb->fp);
 #endif
@@ -993,7 +978,6 @@ static CFILE *cf_open_fill_cfblock(const char* source, int line, FILE *fp, int t
 		cfp->id = cfile_block_index;
 		cfp->version = 0;
 		cfbp->data = NULL;
-		cfbp->mem_mapped = false;
 		cfbp->fp = fp;
 		cfbp->dir_type = type;
 		cfbp->max_read_len = 0;
@@ -1017,7 +1001,7 @@ static CFILE *cf_open_fill_cfblock(const char* source, int line, FILE *fp, int t
 // returns:   success ==> ptr to CFILE structure.  
 //            error   ==> NULL
 //
-static CFILE *cf_open_packed_cfblock(const char* source, int line, FILE *fp, int type, size_t offset, size_t size)
+static CFILE *cf_open_packed_cfblock(const char* source, int line, FILE *fp, int type, int offset, int size)
 {
 	// Found it in a pack file
 	int cfile_block_index;
@@ -1036,7 +1020,6 @@ static CFILE *cf_open_packed_cfblock(const char* source, int line, FILE *fp, int
 		cfp->version = 0;
 		cfbp->data = NULL;
 		cfbp->fp = fp;
-		cfbp->mem_mapped = false;
 		cfbp->dir_type = type;
 		cfbp->max_read_len = 0;

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

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

-const void *cf_returndata(CFILE *cfile)
+void *cf_returndata(CFILE *cfile)
 {
 	Assert(cfile != NULL);
 	Cfile_block *cb;
@@ -1350,19 +1301,6 @@ void cfread_string_len(char *buf,int n, CFILE *file)
 	buf[len] = 0;
 }

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

 int cfwrite_float(float f, CFILE *file)
@@ -1432,7 +1370,7 @@ int cfwrite_string(const char *buf, CFILE *file)
 	if ( (!buf) || (buf && !buf[0]) ) {
 		return cfwrite_char(0, file);
 	} 
-	int len = (int)strlen(buf);
+	int len = strlen(buf);
 	if(!cfwrite(buf, len, 1, file)){
 		return 0;
 	}
@@ -1441,7 +1379,7 @@ int cfwrite_string(const char *buf, CFILE *file)

 int cfwrite_string_len(const char *buf, CFILE *file)
 {
-	int len = (int)strlen(buf);
+	int len = strlen(buf);

 	if(!cfwrite_int(len, file)){
 		return 0;
@@ -1462,14 +1400,12 @@ int cfilelength( CFILE * cfile )
 	cb = &Cfile_block_list[cfile->id];	

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

 	// cb->size gets set at cfopen
-	
-	// The rest of the code still uses ints, do an overflow check to detect cases where this fails
-	Assertion(cb->size <= static_cast<size_t>(std::numeric_limits<int>::max()),
-		"Integer overflow in cfilelength! A file is too large (but I don't know which...).");
-	return (int) cb->size;
+	return cb->size;
 }

 // cfwrite() writes to the file
@@ -1514,7 +1450,7 @@ int cfwrite(const void *buf, int elsize, int nelem, CFILE *cfile)
 	Assert( cb->size == filelength(fileno(cb->fp)) );
 #endif

-	return (int)(bytes_written / elsize);
+	return ((int)bytes_written / elsize);
 }


@@ -1561,6 +1497,7 @@ int cfputc(int c, CFILE *cfile)
 	return result;	
 }

+
 // cfputs() writes a string to a file
 //
 // returns:   success ==> non-negative value
@@ -1694,7 +1631,7 @@ ushort cf_add_chksum_short(ushort seed, ubyte *buffer, int size)
 }

 // update cur_chksum with the chksum of the new_data of size new_data_size
-uint cf_add_chksum_long(uint seed, ubyte *buffer, size_t size)
+uint cf_add_chksum_long(uint seed, ubyte *buffer, int size)
 {
 	uint crc;
 	ubyte *p;
@@ -1786,12 +1723,14 @@ static int cf_chksum_do(CFILE *cfile, ushort *chk_short, uint *chk_long, int max
 // get the chksum of a pack file (VP)
 int cf_chksum_pack(const char *filename, uint *chk_long, bool full)
 {
-	const size_t safe_size = 2097152; // 2 Meg
+	const int safe_size = 2097152; // 2 Meg
 	const int header_offset = 32;  // skip 32bytes for header (header is currently smaller than this though)

 	ubyte cf_buffer[CF_CHKSUM_SAMPLE_SIZE];
-	size_t read_size;
-	size_t max_size;
+	int cf_len = 0;
+	int cf_total;
+	int read_size;
+	int max_size;

 	if (chk_long == NULL) {
 		Int3();
@@ -1809,7 +1748,7 @@ int cf_chksum_pack(const char *filename, uint *chk_long, bool full)

 	// get the max size
 	fseek(fp, 0, SEEK_END);
-	max_size = (size_t)ftell(fp);
+	max_size = ftell(fp);

 	// maybe do a chksum of the entire file
 	if (full) {
@@ -1817,19 +1756,17 @@ int cf_chksum_pack(const char *filename, uint *chk_long, bool full)
 	}
 	// othewise it's only a partial check
 	else {
-		if (max_size > safe_size) {
-			max_size = safe_size;
-		}
+		CLAMP(max_size, 0, safe_size);

 		Assertion(max_size > header_offset,
-			"max_size (" SIZE_T_ARG ") > header_offset in packfile %s", max_size, filename);
+			"max_size (%d) > header_offset in packfile %s", max_size, filename);
 		max_size -= header_offset;

-		fseek(fp, -((long)max_size), SEEK_END);
+		fseek(fp, -(max_size), SEEK_END);
 	}

-	size_t cf_total = 0;
-	size_t cf_len = 0;
+	cf_total = 0;
+
 	do {
 		// determine how much we want to read
 		if ( (max_size - cf_total) >= CF_CHKSUM_SAMPLE_SIZE )
@@ -1976,33 +1913,3 @@ int cflush(CFILE *cfile)

 	return result;
 }
-
-int cfile_get_path_type(const SCP_string& dir)
-{
-	SCP_string buf = dir;
-
-	// Remove trailing slashes; avoid buffer overflow on 1-char strings
-	while (buf.size() > 0 && (buf[buf.size() - 1] == '\\' || buf[buf.size() - 1] == '/')) {
-		buf.resize(buf.size() - 1);
-	}
-
-	// Remove leading slashes
-	while (buf.size() > 0 && (buf[0] == '\\' || buf[0] == '/')) {
-		buf = buf.substr(1);
-	}
-
-	// Use official DIR_SEPARATOR_CHAR
-	for (char& c : buf) {
-		if (c == '\\' || c == '/') {
-			c = DIR_SEPARATOR_CHAR;
-		}
-	}
-
-	for (auto& Pathtype : Pathtypes) {
-		if (Pathtype.path != nullptr && buf == Pathtype.path) {
-			return Pathtype.index;
-		}
-	}
-
-	return CF_TYPE_INVALID;
-}
@@ -13,7 +13,7 @@
 #define __CFILE_H__


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

 #include <stdexcept>
@@ -78,12 +78,9 @@ typedef struct {
 #define CF_TYPE_INTEL_ANIMS			34
 #define CF_TYPE_SCRIPTS				35
 #define CF_TYPE_FICTION				36
-#define CF_TYPE_FREDDOCS			37
-#define CF_TYPE_INTERFACE_MARKUP 38
-#define CF_TYPE_INTERFACE_CSS 39

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

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

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

@@ -171,10 +110,12 @@ extern const char *Get_file_list_child;
 #define CFILE_ROOT_DIRECTORY_LEN			256
 extern char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN];
 extern char Cfile_user_dir[CFILE_ROOT_DIRECTORY_LEN];
+#ifdef SCP_UNIX
+extern char Cfile_user_dir_legacy[CFILE_ROOT_DIRECTORY_LEN];
+#endif

 //================= LOW-LEVEL FUNCTIONS ==================
 int cfile_init(const char *exe_dir, const char *cdrom_dir=NULL);
-void cfile_close();

 // Call this if pack files got added or removed or the
 // cdrom changed.  This will refresh the list of filenames 
@@ -188,15 +129,15 @@ char *cf_add_ext(const char *filename, const char *ext);
 int cf_get_dir_type(CFILE *cfile);

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

 // like cfopen(), but it accepts a fully qualified path only (ie, the result of a cf_find_file_location() call)
 // NOTE: only supports reading files!!
 CFILE *_cfopen_special(const char* source_file, int line, const char *file_path, const char *mode,
-	const size_t size, const size_t offset, const void* data, int dir_type = CF_TYPE_ANY);
+	const int size, const int offset, int dir_type = CF_TYPE_ANY);
 #define cfopen_special(...) _cfopen_special(LOCATION, __VA_ARGS__) // Pass source location to the function

 // Flush the open file buffer
@@ -212,7 +153,7 @@ void cf_set_version( CFILE * cfile, int version );
 void cf_set_max_read_len(CFILE *cfile, size_t len);

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

 // Same as _access function to read a file's access bits
 int cf_access(const char *filename, int dir_type, int mode);
@@ -272,7 +213,7 @@ char *cfgets(char *buf, int n, CFILE *cfile);
 int cfeof(CFILE *cfile);

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

 // get the 2 byte checksum of the passed filename - return 0 if operation failed, 1 if succeeded
 int cf_chksum_short(const char *filename, ushort *chksum, int max_size = -1, int cf_type = CF_TYPE_ANY );
@@ -296,7 +237,7 @@ int cf_chksum_pack(const char *filename, uint *chk_long, bool full = false);
 ushort cf_add_chksum_short(ushort seed, ubyte *buffer, int size);

 // update cur_chksum with the chksum of the new_data of size new_data_size
-uint cf_add_chksum_long(uint seed, ubyte *buffer, size_t size);
+uint cf_add_chksum_long(uint seed, ubyte *buffer, int size);

 // convenient for misc checksumming purposes ------------------------------------------

@@ -345,13 +286,6 @@ void cfread_string(char *buf,int n, CFILE *file);
 */
 void cfread_string_len(char *buf,int n, CFILE *file);

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

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

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

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

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

-int cfile_get_path_type(const SCP_string& dir);
-
 namespace cfile
 {
 	// exceptions and other errors
@@ -455,13 +362,16 @@ namespace cfile
 			{
 			}

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

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

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

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

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

 #define _CFILE_INTERNAL 

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

 #ifdef _WIN32
 #include <io.h>
@@ -27,14 +27,13 @@
 #include "luaconf.h"

 #include <sstream>
-#include <limits>


 #define CHECK_POSITION

 // Called once to setup the low-level reading code.

-void cf_init_lowlevel_read_code( CFILE * cfile, size_t lib_offset, size_t size, size_t pos )
+void cf_init_lowlevel_read_code( CFILE * cfile, int lib_offset, int size, int pos )
 {
 	Assert(cfile != NULL);

@@ -48,12 +47,13 @@ void cf_init_lowlevel_read_code( CFILE * cfile, size_t lib_offset, size_t size,

 	if ( cb->fp )	{
 		if ( cb->lib_offset )	{
-			fseek( cb->fp, (long)cb->lib_offset, SEEK_SET );
+			fseek( cb->fp, cb->lib_offset, SEEK_SET );
 		}

 		#if defined(CHECK_POSITION) && !defined(NDEBUG)
-		auto raw_position = ftell(cb->fp) - cb->lib_offset;
-		Assert(raw_position == cb->raw_position);
+			int raw_position;
+			raw_position = ftell(cb->fp) - cb->lib_offset;
+			Assert(raw_position == cb->raw_position);
 		#endif
 	}
 }
@@ -74,13 +74,19 @@ int cfeof(CFILE *cfile)
 	Assert(cfile->id >= 0 && cfile->id < MAX_CFILE_BLOCKS);
 	cb = &Cfile_block_list[cfile->id];	

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

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

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

-	// The rest of the code still uses ints, do an overflow check to detect cases where this fails
-	Assertion(cb->raw_position <= static_cast<size_t>(std::numeric_limits<int>::max()),
-		"Integer overflow in cftell, a file is probably too large (but I don't know which one).");
-	return (int) cb->raw_position;
+	return cb->raw_position;
 }


@@ -133,9 +140,10 @@ int cfseek( CFILE *cfile, int offset, int where )


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

 	switch( where )	{
 	case CF_SEEK_SET:
@@ -152,27 +160,15 @@ int cfseek( CFILE *cfile, int offset, int where )
 	default:
 		Int3();
 		return 1;
-	}
+	}	

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

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

 	return result;	
@@ -189,15 +185,21 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 	if(!cf_is_valid(cfile))
 		return 0;

-	size_t size = elsize*nelem;
+	int size = elsize*nelem;

 	if(buf == NULL || size <= 0)
 		return 0;

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

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

 	if (cb->max_read_len) {
-		if ( cb->raw_position+size > cb->max_read_len ) {
+		if ( (size_t)(cb->raw_position+size) > cb->max_read_len ) {
 			std::ostringstream s_buf;
 			s_buf << "Attempted to read " << size << "-byte(s) beyond length limit";

@@ -214,27 +216,18 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 		}
 	}

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

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

-	return (int)(bytes_read / elsize);
+	return bytes_read / elsize;

 }

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

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

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

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

 	size_t	max_read_len;	// max read offset, for special error handling
 	
@@ -49,6 +48,6 @@ typedef struct Cfile_block {
 extern Cfile_block Cfile_block_list[MAX_CFILE_BLOCKS];

 // Called once to setup the low-level reading code.
-void cf_init_lowlevel_read_code( CFILE * cfile, size_t lib_offset, size_t size, size_t pos );
+void cf_init_lowlevel_read_code( CFILE * cfile, int lib_offset, int size, int pos );

 #endif
@@ -9,9 +9,9 @@



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

@@ -420,7 +420,7 @@ int cfread_compressed(void *buf, int elsize, int nelem, CFILE *cfile)
 		}
 	}

-	return (int)((out - (char *)buf)/elsize);
+	return (out - (char *)buf)/elsize;
 }

 int cfwrite_compressed(void *param_buf, int param_elsize, int param_nelem, CFILE *cfile)
@@ -20,17 +20,15 @@ void cf_free_secondary_filelist();

 // Internal stuff
 typedef struct cf_pathtype {
-	int			index;					// To verify that the CF_TYPE define is correctly indexed into this array
-	const char*	path;					// Path relative to FreeSpace root, has ending backslash.
-	const char*	extensions;				// Extensions used in this pathtype, separated by spaces
-	int			parent_index;			// Index of this directory's parent.  Used for creating directories when writing.
+	int		index;					// To verify that the CF_TYPE define is correctly indexed into this array
+	char		*path;					// Path relative to FreeSpace root, has ending backslash.
+	char		*extensions;			// Extensions used in this pathtype, separated by spaces
+	int		parent_index;			// Index of this directory's parent.  Used for creating directories when writing.
 } cf_pathtype;

 // During cfile_init, verify that Pathtypes[n].index == n for each item
 extern cf_pathtype Pathtypes[CF_MAX_PATH_TYPES];

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

 #endif	//_CFILESYSTEM_H
@@ -8,9 +8,6 @@ set_target_properties(cfilearchiver
 	PROPERTIES
 		FOLDER "FSOTools"
 )
-TARGET_LINK_LIBRARIES(cfilearchiver PUBLIC sdl2)
-TARGET_INCLUDE_DIRECTORIES(cfilearchiver PUBLIC ${GENERATED_SOURCE_DIR})
-TARGET_INCLUDE_DIRECTORIES(cfilearchiver PUBLIC ${GENERATED_SOURCE_DIR}/code)

 IF(MSVC)
 	set_target_properties(cfilearchiver PROPERTIES
@@ -315,16 +315,28 @@ int verify_directory( char *filespec )

 void print_instructions()
 {
-	printf("Creates a vp archive out of a FreeSpace data tree.\n\n");
-	printf("Usage:     cfilearchiver archive_name src_dir\n");
-#ifdef _WIN32
-	printf("Example:   cfilearchiver freespace c:\\freespace\\data\n");
-#else
-	printf("Example:   cfilearchiver freespace /tmp/freespace/data\n\n");
-#endif
-	printf("Creates an archive named freespace out of the freespace data tree\n");
-	printf("For information about the FS2 directory structure, please consult\n");
-	printf("http://www.hard-light.net/wiki/index.php/FS2_Data_Structure\n");
+	printf( "Creates a vp archive out of a FreeSpace data tree.\n\n" );
+	printf( "Usage:     cfilearchiver archive_name src_dir\n");
+	printf( "Example:   cfilearchiver freespace /tmp/freespace/data\n\n");
+	printf( "Directory structure options:\n" );
+	printf( "   Effects                   (.ani .pcx .neb .tga)\n" );
+	printf( "   Fonts                     (.vf)\n" );
+	printf( "   Hud                       (.ani .pcx .tga\n" );
+	printf( "   Interface                 (.pcx .ani .tga)\n" );
+	printf( "   Maps                      (.pcx .ani .tga)\n" );
+	printf( "   Missions                  (.ntl .ssv), FS1(.fsm .fsc), FS2(.fs2 .fc2)\n" );
+	printf( "   Models                    (.pof)\n" );
+	printf( "   Music                     (.wav)\n" );
+	printf( "   Sounds/8b22k              (.wav)\n" );
+	printf( "   Sounds/16b11k             (.wav)\n" );
+	printf( "   Tables                    (.tbl)\n" );
+	printf( "   Voice/Briefing            (.wav)\n" );
+	printf( "   Voice/Command briefings   (.wav)\n" );
+	printf( "   Voice/Debriefing          (.wav)\n" );
+	printf( "   Voice/Personas            (.wav)\n" );
+	printf( "   Voice/Special             (.wav)\n" );
+	printf( "   Voice/Training            (.wav)\n" );
+
 	exit(0);
 }

@@ -340,7 +352,16 @@ int main(int argc, char *argv[] )
 	char *p;

 	if ( argc < 3 )	{
+#ifdef _WIN32
+		printf( "Usage: %s archive_name src_dir\n", argv[0] );
+		printf( "Example: %s freespace c:\\freespace\\data\n", argv[0] );
+		printf( "Creates an archive named freespace out of the\nfreespace data tree\n" );
+		printf( "Press any key to exit...\n" );
+		getch();
+		return 1;
+#else
 		print_instructions();
+#endif
 	}

 	strcpy_s( archive, argv[1] );
@@ -8,9 +8,6 @@ set_target_properties(cfileextractor
 	PROPERTIES
 		FOLDER "FSOTools"
 )
-TARGET_LINK_LIBRARIES(cfileextractor PUBLIC sdl2)
-TARGET_INCLUDE_DIRECTORIES(cfileextractor PUBLIC ${GENERATED_SOURCE_DIR})
-TARGET_INCLUDE_DIRECTORIES(cfileextractor PUBLIC ${GENERATED_SOURCE_DIR}/code)

 IF(MSVC)
 	set_target_properties(cfileextractor PROPERTIES
@@ -62,6 +62,7 @@ extern float static_point_factor;
 extern float static_tube_factor;
 extern int Cmdline_ambient_factor;
 extern int Cmdline_env;
+extern int Cmdline_missile_lighting;
 extern int Cmdline_glow;
 extern int Cmdline_nomotiondebris;
 extern int Cmdline_noscalevid;	// disables fit-to-window for movies - taylor
@@ -75,13 +76,12 @@ extern int Cmdline_bloom_intensity;
 extern bool Cmdline_fxaa;
 extern int Cmdline_fxaa_preset;
 extern bool Cmdline_fb_explosions;
-extern bool Cmdline_fb_thrusters;
+extern bool Cmdline_no_batching;
 extern int Cmdline_shadow_quality;
 extern int Cmdline_no_deferred_lighting;
-extern int Cmdline_no_emissive;
-extern int Cmdline_aniso_level;

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

@@ -102,6 +102,7 @@ extern int Cmdline_stretch_menu;

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

@@ -122,8 +123,10 @@ extern bool Cmdline_portable_mode;
 extern int Cmdline_load_all_weapons;
 extern int Cmdline_nomovies;	// WMC Toggles movie playing support
 extern int Cmdline_no_set_gamma;
+extern int Cmdline_novbo;
 extern int Cmdline_no_fbo;
 extern int Cmdline_no_pbo;
+extern int Cmdline_noglsl;
 extern int Cmdline_mipmap;
 extern int Cmdline_ati_color_swap;
 extern int Cmdline_no_3d_sound;
@@ -132,8 +135,6 @@ extern char* Cmdline_keyboard_layout;
 extern bool Cmdline_gl_finish;
 extern bool Cmdline_no_geo_sdr_effects;
 extern bool Cmdline_set_cpu_affinity;
-extern bool Cmdline_nograb;
-extern bool Cmdline_noshadercache;
 #ifdef WIN32
 extern bool Cmdline_alternate_registry_path;
 #endif
@@ -143,22 +144,20 @@ extern char *Cmdline_start_mission;
 extern int Cmdline_old_collision_sys;
 extern int Cmdline_dis_collisions;
 extern int Cmdline_dis_weapons;
-extern bool Cmdline_output_sexp_info;
 extern int Cmdline_noparseerrors;
+#ifdef Allow_NoWarn
+extern int Cmdline_nowarn;
+#endif
 extern int Cmdline_extra_warn;
-extern int Cmdline_bmpman_usage;
+extern int Cmdline_show_mem_usage;
 extern int Cmdline_show_pos;
 extern int Cmdline_show_stats;
 extern int Cmdline_save_render_targets;
 extern int Cmdline_verify_vps;
 extern int Cmdline_reparse_mainhall;
+extern bool Cmdline_frame_profile;
 extern bool Cmdline_profile_write_file;
 extern bool Cmdline_no_unfocus_pause;
 extern bool Cmdline_benchmark_mode;
-extern bool Cmdline_noninteractive;
-extern bool Cmdline_json_profiling;
-extern bool Cmdline_frame_profile;
-extern bool Cmdline_show_video_info;
-extern bool Cmdline_debug_window;

 #endif
@@ -62,7 +62,7 @@ void cmeasure_select_next(ship *shipp)
 	{
 		new_index = (shipp->current_cmeasure + i) % Num_weapon_types;

-		if(Weapon_info[new_index].wi_flags[Weapon::Info_Flags::Cmeasure])
+		if(Weapon_info[new_index].wi_flags & WIF_CMEASURE)
 		{
 			shipp->current_cmeasure = new_index;
 			return;
@@ -88,12 +88,12 @@ void cmeasure_maybe_alert_success(object *objp)
 		return;
 	}

-	Assert(Weapon_info[Weapons[objp->instance].weapon_info_index].wi_flags[Weapon::Info_Flags::Cmeasure]);
+	Assert(Weapon_info[Weapons[objp->instance].weapon_info_index].wi_flags & WIF_CMEASURE);

 	if ( objp->parent == OBJ_INDEX(Player_obj) ) {
 		hud_start_text_flash(XSTR("Evaded", 1430), 800);
-		snd_play(gamesnd_get_game_sound(ship_get_sound(Player_obj, GameSounds::MISSILE_EVADED_POPUP)));
-	} else if ( Objects[objp->parent].flags[Object::Object_Flags::Player_ship] ) {
+		snd_play(&Snds[ship_get_sound(Player_obj, SND_MISSILE_EVADED_POPUP)]);
+	} else if ( Objects[objp->parent].flags & OF_PLAYER_SHIP ) {
 		send_countermeasure_success_packet( objp->parent );
 	}
 }
@@ -25,7 +25,7 @@
 #include "missionui/missionscreencommon.h"
 #include "network/multi_pmsg.h"
 #include "network/multiutil.h"
-#include "scripting/scripting.h"
+#include "parse/scripting.h"
 #include "pilotfile/pilotfile.h"
 #include "popup/popup.h"
 #include "ui/ui.h"
@@ -48,12 +48,12 @@
 #define CONTROL_W_COORD 2
 #define CONTROL_H_COORD 3

-const char* Conflict_background_bitmap_fname[GR_NUM_RESOLUTIONS] = {
+char* Conflict_background_bitmap_fname[GR_NUM_RESOLUTIONS] = {
 	"ControlConfig",		// GR_640
 	"2_ControlConfig"		// GR_1024
 };

-const char* Conflict_background_bitmap_mask_fname[GR_NUM_RESOLUTIONS] = {
+char* Conflict_background_bitmap_mask_fname[GR_NUM_RESOLUTIONS] = {
 	"ControlConfig-m",		// GR_640
 	"2_ControlConfig-m"		// GR_1024
 };
@@ -356,65 +356,6 @@ DCF_BOOL(show_controls_info, Show_controls_info);

 static int Axes_origin[JOY_NUM_AXES];

-static int joy_get_unscaled_reading(int raw)
-{
-	int rng;
-
-	rng = JOY_AXIS_MAX - JOY_AXIS_MIN;
-	raw -= JOY_AXIS_MIN;  // adjust for linear range starting at 0
-
-	// cap at limits
-	if (raw < 0)
-		raw = 0;
-	if (raw > rng)
-		raw = rng;
-
-	return (int) ((std::uint64_t) raw * (std::uint64_t) F1_0 / (std::uint64_t) rng);  // convert to 0 - F1_0 range, 64bit ints used to avoid uint overflow
-}
-
-int joy_get_scaled_reading(int raw)
-{
-	int x, d, dead_zone, rng;
-	float percent, sensitivity_percent, non_sensitivity_percent;
-
-	raw -= JOY_AXIS_CENTER;
-
-	dead_zone = (JOY_AXIS_MAX - JOY_AXIS_MIN) * Joy_dead_zone_size / 100;
-
-	if (raw < -dead_zone) {
-		rng = JOY_AXIS_CENTER - JOY_AXIS_MIN - dead_zone;
-		d = -raw - dead_zone;
-	} else if (raw > dead_zone) {
-		rng = JOY_AXIS_MAX - JOY_AXIS_CENTER - dead_zone;
-		d = raw - dead_zone;
-	} else
-		return 0;
-
-	if (d > rng)
-		d = rng;
-
-	Assert(Joy_sensitivity >= 0 && Joy_sensitivity <= 9);
-
-	// compute percentages as a range between 0 and 1
-	sensitivity_percent = (float) Joy_sensitivity / 9.0f;
-	non_sensitivity_percent = (float) (9 - Joy_sensitivity) / 9.0f;
-
-	// find percent of max axis is at
-	percent = (float) d / (float) rng;
-
-	// work sensitivity on axis value
-	percent = (percent * sensitivity_percent + percent * percent * percent * percent * percent * non_sensitivity_percent);
-
-	x = (int) ((float) F1_0 * percent);
-
-	//nprintf(("AI", "d=%6i, sens=%3i, percent=%6.3f, val=%6i, ratio=%6.3f\n", d, Joy_sensitivity, percent, (raw<0) ? -x : x, (float) d/x));
-
-	if (raw < 0)
-		return -x;
-
-	return x;
-}
-
 void control_config_detect_axis_reset()
 {
 	joystick_read_raw_axis(JOY_NUM_AXES, Axes_origin);
@@ -615,7 +556,7 @@ int control_config_undo_last()
 	int i, z, tab;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -888,10 +829,12 @@ int control_config_clear_all()

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

+extern Joy_info joystick;
+
 int control_config_axis_default(int axis)
 {
 	Assert(axis >= 0);
@@ -901,8 +844,7 @@ int control_config_axis_default(int axis)
 			return -1;
 		}

-		auto joystick = io::joystick::getCurrentJoystick();
-		if (joystick == nullptr || Axis_map_to_defaults[axis] >= joystick->numAxes()) {
+		if (!joystick.axis_valid[Axis_map_to_defaults[axis]]) {
 			return -1;
 		}
 	}
@@ -919,7 +861,7 @@ int control_config_do_reset()
 	bool cycling_presets = false;
 	
 	// If there are presets, then we'll cycle to the next preset and reset to that
-	if (!Control_config_presets.empty()) {
+	if (Control_config_presets.size() >= 1) {
 		cycling_presets = true;
 		
 		if (++Defaults_cycle_pos >= Control_config_presets.size())
@@ -945,7 +887,7 @@ int control_config_do_reset()
 	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 		case RESET_BUTTON:
@@ -1528,7 +1470,7 @@ void control_config_do_frame(float frametime)
 					if (Axis_override >= 0) {
 						control_config_bind_axis(z, Axis_override);
 						strcpy_s(bound_string, Joy_axis_text[Axis_override]);
-						font::force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+						gr_force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
 						bound_timestamp = timestamp(2500);
 						control_config_conflict_check();
 						control_config_list_prepare();
@@ -1596,7 +1538,7 @@ void control_config_do_frame(float frametime)
 					control_config_bind_key(z, k);

 					strcpy_s(bound_string, textify_scancode(k));
-					font::force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+					gr_force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
 					bound_timestamp = timestamp(2500);
 					control_config_conflict_check();
 					control_config_list_prepare();
@@ -1610,7 +1552,7 @@ void control_config_do_frame(float frametime)
 						control_config_bind_joy(z, i);

 						strcpy_s(bound_string, Joy_button_text[i]);
-						font::force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+						gr_force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
 						bound_timestamp = timestamp(2500);
 						control_config_conflict_check();
 						control_config_list_prepare();
@@ -1634,7 +1576,7 @@ void control_config_do_frame(float frametime)
 								control_config_bind_joy(z, i);

 								strcpy_s(bound_string, Joy_button_text[i]);
-								font::force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+								gr_force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
 								bound_timestamp = timestamp(2500);
 								control_config_conflict_check();
 								control_config_list_prepare();
@@ -1799,7 +1741,7 @@ void control_config_do_frame(float frametime)

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

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

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

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

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

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

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

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

 		if (List_buttons[i].double_clicked()) {
@@ -1905,7 +1847,7 @@ void control_config_do_frame(float frametime)
 		}

 		// set color and font
-		font::set_font(font::FONT2);
+		gr_set_font(FONT2);
 		if(Conflict_bright){
 			gr_set_color_fast(&Color_bright_red);
 		} else {
@@ -1920,7 +1862,7 @@ void control_config_do_frame(float frametime)

 		gr_string((gr_screen.max_w / 2) - (sw / 2), Conflict_warning_coords[gr_screen.res][1], conflict_str, GR_RESIZE_MENU);

-		font::set_font(font::FONT1);
+		gr_set_font(FONT1);
 	} else {
 		// might as well always reset the conflict stamp
 		Conflict_stamp = -1;
@@ -1974,7 +1916,7 @@ void control_config_do_frame(float frametime)
 		if (t % 2) {
 			gr_set_color_fast(&Color_text_normal);
 			gr_get_string_size(&w, NULL, XSTR( "?", 208));
-			gr_printf_menu(x - w / 2, y - font_height / 2, "%s", XSTR( "?", 208));
+			gr_printf_menu(x - w / 2, y - font_height / 2, XSTR( "?", 208));
 		}

 	} else if (!(z & JOY_AXIS) && ((Conflicts[z].key >= 0) || (Conflicts[z].joy >= 0))) {
@@ -1986,7 +1928,7 @@ void control_config_do_frame(float frametime)
 		gr_set_color_fast(&Color_text_normal);
 		str = XSTR( "Control conflicts with:", 209);
 		gr_get_string_size(&w, NULL, str);
-		gr_printf_menu(x - w / 2, y - font_height, "%s", str);
+		gr_printf_menu(x - w / 2, y - font_height, str);

 		if (Control_config[i].hasXSTR) {
 			strcpy_s(buf, XSTR(Control_config[i].text, CONTROL_CONFIG_XSTR + i));
@@ -1994,14 +1936,14 @@ void control_config_do_frame(float frametime)
 			strcpy_s(buf, Control_config[i].text);
 		}

-		font::force_fit_string(buf, 255, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+		gr_force_fit_string(buf, 255, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
 		gr_get_string_size(&w, NULL, buf);
-		gr_printf_menu(x - w / 2, y, "%s", buf);
+		gr_printf_menu(x - w / 2, y, buf);

 	} else if (*bound_string) {
 		gr_set_color_fast(&Color_text_normal);
 		gr_get_string_size(&w, NULL, bound_string);
-		gr_printf_menu(x - w / 2, y - font_height / 2, "%s", bound_string);
+		gr_printf_menu(x - w / 2, y - font_height / 2, bound_string);
 		if (timestamp_elapsed(bound_timestamp)) {
 			*bound_string = 0;
 		}
@@ -2009,7 +1951,7 @@ void control_config_do_frame(float frametime)

 	if (Cc_lines[Num_cc_lines - 1].y + font_height > Cc_lines[Scroll_offset].y + Control_list_coords[gr_screen.res][CONTROL_H_COORD]) {
 		gr_set_color_fast(&Color_white);
-		gr_printf_menu(Control_more_coords[gr_screen.res][CONTROL_X_COORD], Control_more_coords[gr_screen.res][CONTROL_Y_COORD], "%s", XSTR( "More...", 210));
+		gr_printf_menu(Control_more_coords[gr_screen.res][CONTROL_X_COORD], Control_more_coords[gr_screen.res][CONTROL_Y_COORD], XSTR( "More...", 210));
 	}

 	conflict = 0;
@@ -2034,8 +1976,8 @@ void control_config_do_frame(float frametime)
 		gr_set_color_fast(c);
 		if (Cc_lines[line].label) {
 			strcpy_s(buf, Cc_lines[line].label);
-			font::force_fit_string(buf, 255, Control_list_ctrl_w[gr_screen.res]);
-			gr_printf_menu(Control_list_coords[gr_screen.res][CONTROL_X_COORD], y, "%s", buf);
+			gr_force_fit_string(buf, 255, Control_list_ctrl_w[gr_screen.res]);
+			gr_printf_menu(Control_list_coords[gr_screen.res][CONTROL_X_COORD], y, buf);
 		}

 		if (!(z & JOY_AXIS)) {
@@ -2046,7 +1988,7 @@ void control_config_do_frame(float frametime)

 			if ((k < 0) && (j < 0)) {
 				gr_set_color_fast(&Color_grey);
-				gr_printf_menu(x, y, "%s", XSTR( "None", 211));
+				gr_printf_menu(x, y, XSTR( "None", 211));

 			} else {
 				if (k >= 0) {
@@ -2066,7 +2008,7 @@ void control_config_do_frame(float frametime)
 						gr_set_color_fast(c);
 					}

-					gr_printf_menu(x, y, "%s", buf);
+					gr_printf_menu(x, y, buf);

 					Cc_lines[line].kx = x - Control_list_coords[gr_screen.res][CONTROL_X_COORD];
 					gr_get_string_size(&w, NULL, buf);
@@ -2075,7 +2017,7 @@ void control_config_do_frame(float frametime)

 					if (j >= 0) {
 						gr_set_color_fast(&Color_text_normal);
-						gr_printf_menu(x, y, "%s", XSTR( ", ", 212));
+						gr_printf_menu(x, y, XSTR( ", ", 212));
 						gr_get_string_size(&w, NULL, XSTR( ", ", 212));
 						x += w;
 					}
@@ -2098,8 +2040,8 @@ void control_config_do_frame(float frametime)
 						gr_set_color_fast(c);
 					}

-					font::force_fit_string(buf, 255, Control_list_key_w[gr_screen.res] + Control_list_key_x[gr_screen.res] - x);
-					gr_printf_menu(x, y, "%s", buf);
+					gr_force_fit_string(buf, 255, Control_list_key_w[gr_screen.res] + Control_list_key_x[gr_screen.res] - x);
+					gr_printf_menu(x, y, buf);

 					Cc_lines[line].jx = x - Control_list_coords[gr_screen.res][CONTROL_X_COORD];
 					gr_get_string_size(&Cc_lines[line].jw, NULL, buf);
@@ -2115,7 +2057,7 @@ void control_config_do_frame(float frametime)

 			if (j < 0) {
 				gr_set_color_fast(&Color_grey);
-				gr_printf_menu(x, y, "%s", XSTR( "None", 211));
+				gr_printf_menu(x, y, XSTR( "None", 211));

 			} else {
 				if (Conflicts_axes[z & ~JOY_AXIS] >= 0) {
@@ -2345,7 +2287,7 @@ int check_control(int id, int key)
 		// which has just been released

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

 		Control_config[id].continuous_ongoing = false;
@@ -2364,27 +2306,27 @@ void control_get_axes_readings(int *h, int *p, int *b, int *ta, int *tr)
 	//	joy_get_scaled_reading will return a value represents the joystick pos from -1 to +1 (fixed point)
 	*h = 0;
 	if (Axis_map_to[0] >= 0) {
-		*h = joy_get_scaled_reading(axes_values[Axis_map_to[0]]);
+		*h = joy_get_scaled_reading(axes_values[Axis_map_to[0]], Axis_map_to[0]);
 	}

 	*p = 0;
 	if (Axis_map_to[1] >= 0) {
-		*p = joy_get_scaled_reading(axes_values[Axis_map_to[1]]);
+		*p = joy_get_scaled_reading(axes_values[Axis_map_to[1]], Axis_map_to[1]);
 	}

 	*b = 0;
 	if (Axis_map_to[2] >= 0) {
-		*b = joy_get_scaled_reading(axes_values[Axis_map_to[2]]);
+		*b = joy_get_scaled_reading(axes_values[Axis_map_to[2]], Axis_map_to[2]);
 	}

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

 	*tr = 0;
 	if (Axis_map_to[4] >= 0) {
-		*tr = joy_get_scaled_reading(axes_values[Axis_map_to[4]]);
+		*tr = joy_get_scaled_reading(axes_values[Axis_map_to[4]], Axis_map_to[4]);
 	}

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

 			if (Control_config[id].type == CC_TYPE_CONTINUOUS)
@@ -63,7 +63,7 @@ typedef struct config_item {
 	short joy_default;		//!< default joystick button bound to action
 	char tab;				//!< what tab (category) it belongs in
 	bool hasXSTR;			//!< whether we should translate this with an XSTR
-	const char *text;		//!< describes the action in the config screen
+	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
 	short joy_id;			//!< joystick button bound to action
@@ -288,16 +288,13 @@ extern int Axis_map_to[];
 extern int Invert_axis[];
 extern int Invert_axis_defaults[];

-extern int Joy_dead_zone_size;
-extern int Joy_sensitivity;
-
 extern int Control_config_overlay_id;

 extern config_item Control_config[];		//!< Stores the keyboard configuration
 extern SCP_vector<config_item*> Control_config_presets; // tabled control presets; pointers to config_item arrays
 extern SCP_vector<SCP_string> Control_config_preset_names; // names for Control_config_presets (identical order of items)
-extern const char **Scan_code_text;
-extern const char **Joy_button_text;
+extern char **Scan_code_text;
+extern char **Joy_button_text;

 void control_config_common_init();			//!< initialize common control config stuff - call at game startup after localization has been initialized
 void control_config_common_close();			//!< close common control config stuff - call at game shutdown
@@ -311,26 +308,7 @@ void control_config_cancel_exit();
 void control_config_reset_defaults(int presetnum=-1);
 int translate_key_to_index(const char *key, bool find_override=true);
 char *translate_key(char *key);
-
-/**
- * @brief Converts the specified key code to a human readable string
- *
- * @note The returned value is localized to the current language
- *
- * @param code The key code to convert
- * @return The text representation of the code. The returned value is stored in a temporary location, copy it to your
- * own buffer if you want to continue using it.
- */
-const char *textify_scancode(int code);
-
-/**
- * @note Same as textify_scancode but always returns the same value regardless of current language
- * @param code The key code to convert
- * @return The name of the key
- * @see textify_scancode
- */
-const char *textify_scancode_universal(int code);
-
+char *textify_scancode(int code);
 float check_control_timef(int id);
 int check_control(int id, int key = -1);
 void control_get_axes_readings(int *h, int *p, int *b, int *ta, int *tr);
@@ -340,6 +318,4 @@ void clear_key_binding(short key);
 void control_check_indicate();
 void control_config_clear_used_status();

-int joy_get_scaled_reading(int raw);
-
 #endif
@@ -7,8 +7,8 @@
 *
 */ 

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

 #include "cfile/cfile.h"
 #include "controlconfig/controlsconfig.h"
@@ -18,6 +18,7 @@
 #include "io/key.h"
 #include "localization/localize.h"
 #include "parse/parselo.h"
+#include "def_files/def_files.h"

 // z64: These enumerations MUST equal to those in controlsconfig.cpp...
 // z64: Really need a better way than this.
@@ -30,10 +31,6 @@ enum CC_tab {

 int Failed_key_index;

-// Joystick configuration
-int Joy_dead_zone_size = 10;
-int Joy_sensitivity = 9;
-
 // assume control keys are used as modifiers until we find out 
 int Shift_is_modifier;
 int Ctrl_is_modifier;
@@ -199,9 +196,9 @@ config_item Control_config[CCFG_MAX + 1] = {
 	{                           -1,                 -1, -1,           false, "",                                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false }
 };

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

@@ -241,7 +238,7 @@ const char *Scan_code_text_german[] = {
 	"",				"",				"",				"",				"",				"",				"",				"",
 };

-const char *Joy_button_text_german[] = {
+char *Joy_button_text_german[] = {
 	"Knopf 1",		"Knopf 2",		"Knopf 3",		"Knopf 4",		"Knopf 5",		"Knopf 6",
 	"Knopf 7",		"Knopf 8",		"Knopf 9",		"Knopf 10",		"Knopf 11",		"Knopf 12",
 	"Knopf 13",		"Knopf 14",		"Knopf 15",		"Knopf 16",		"Knopf 17",		"Knopf 18",
@@ -250,9 +247,9 @@ const char *Joy_button_text_german[] = {
 	"Knopf 31",		"Knopf 32",		"Hut Hinten",	"Hut Vorne",	"Hut Links",	"Hut Rechts"
 };

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

@@ -292,7 +289,7 @@ const char *Scan_code_text_french[] = {
 	"",				"",				"",				"",				"",				"",				"",				"",
 };

-const char *Joy_button_text_french[] = {
+char *Joy_button_text_french[] = {
 	"Bouton 1",		"Bouton 2",		"Bouton 3",		"Bouton 4",		"Bouton 5",		"Bouton 6",
 	"Bouton 7",		"Bouton 8",		"Bouton 9",		"Bouton 10",		"Bouton 11",		"Bouton 12",
 	"Bouton 13",		"Bouton 14",		"Bouton 15",		"Bouton 16",		"Bouton 17",		"Bouton 18",
@@ -301,7 +298,7 @@ const char *Joy_button_text_french[] = {
 	"Bouton 31",		"Bouton 32",		"Chapeau Arri\x8Are",		"Chapeau Avant",		"Chapeau Gauche",		"Chapeau Droite"
 };

-const char *Scan_code_text_polish[] = {
+char *Scan_code_text_polish[] = {
 	"",				"Esc",			"1",				"2",				"3",				"4",				"5",				"6",
 	"7",				"8",				"9",				"0",				"-",				"=",				"Backspace",	"Tab",
 	"Q",				"W",				"E",				"R",				"T",				"Y",				"U",				"I",
@@ -343,7 +340,7 @@ const char *Scan_code_text_polish[] = {
 	"",				"",				"",				"",				"",				"",				"",				"",
 };

-const char *Joy_button_text_polish[] = {
+char *Joy_button_text_polish[] = {
 	"Przyc.1",		"Przyc.2",		"Przyc.3",		"Przyc.4",		"Przyc.5",		"Przyc.6",
 	"Przyc.7",		"Przyc.8",		"Przyc.9",		"Przyc.10",	"Przyc.11",	"Przyc.12",
 	"Przyc.13",	"Przyc.14",	"Przyc.15",	"Przyc.16",	"Przyc.17",	"Przyc.18",
@@ -353,7 +350,7 @@ const char *Joy_button_text_polish[] = {
 };

 //!	This is the text that is displayed on the screen for the keys a player selects
-const char *Scan_code_text_english[] = {
+char *Scan_code_text_english[] = {
 	"",				"Esc",			"1",				"2",				"3",				"4",				"5",				"6",
 	"7",				"8",				"9",				"0",				"-",				"=",				"Backspace",	"Tab",
 	"Q",				"W",				"E",				"R",				"T",				"Y",				"U",				"I",
@@ -395,7 +392,7 @@ const char *Scan_code_text_english[] = {
 	"",				"",				"",				"",				"",				"",				"",				"",
 };

-const char *Joy_button_text_english[] = {
+char *Joy_button_text_english[] = {
 	"Button 1",		"Button 2",		"Button 3",		"Button 4",		"Button 5",		"Button 6",
 	"Button 7",		"Button 8",		"Button 9",		"Button 10",	"Button 11",	"Button 12",
 	"Button 13",	"Button 14",	"Button 15",	"Button 16",	"Button 17",	"Button 18",
@@ -404,8 +401,8 @@ const char *Joy_button_text_english[] = {
 	"Button 31",	"Button 32",	"Hat Back",		"Hat Forward",	"Hat Left",		"Hat Right"
 };

-const char **Scan_code_text = Scan_code_text_english;
-const char **Joy_button_text = Joy_button_text_english;
+char **Scan_code_text = Scan_code_text_english;
+char **Joy_button_text = Joy_button_text_english;

 SCP_vector<config_item*> Control_config_presets;
 SCP_vector<SCP_string> Control_config_preset_names;
@@ -510,8 +507,8 @@ int translate_key_to_index(const char *key, bool find_override)
 char *translate_key(char *key)
 {
 	int index = -1, key_code = -1, joy_code = -1;
-	const char *key_text = NULL;
-	const char *joy_text = NULL;
+	char *key_text = NULL;
+	char *joy_text = NULL;

 	static char text[40] = {"None"};

@@ -553,7 +550,7 @@ char *translate_key(char *key)
 	return text;
 }

-const char *textify_scancode(int code)
+char *textify_scancode(int code)
 {
 	static char text[40];

@@ -586,28 +583,6 @@ const char *textify_scancode(int code)
 	strcat_s(text, Scan_code_text[keycode]);
 	return text;
 }
-
-const char *textify_scancode_universal(int code)
-{
-	if (code < 0)
-		return "None";
-
-	int keycode = code & KEY_MASK;
-
-	static char text[40];
-	*text = 0;
-	if (code & KEY_ALTED && !(keycode == KEY_LALT || keycode == KEY_RALT)) {
-		strcat_s(text, "Alt-");
-	}
-
-	if (code & KEY_SHIFTED && !(keycode == KEY_LSHIFT || keycode == KEY_RSHIFT)) {
-		strcat_s(text, "Shift-");
-	}
-
-	// Always use the english version here
-	strcat_s(text, Scan_code_text_english[keycode]);
-	return text;
-}
 //XSTR:ON

 void control_config_common_load_overrides();
@@ -833,125 +808,118 @@ void control_config_common_load_overrides()
 {
 	LoadEnumsIntoMaps();

-	try {
-		if (cf_exists_full("controlconfigdefaults.tbl", CF_TYPE_TABLES)) {
-			read_file_text("controlconfigdefaults.tbl", CF_TYPE_TABLES);
+	if (cf_exists_full("controlconfigdefaults.tbl", CF_TYPE_TABLES)) {
+		read_file_text("controlconfigdefaults.tbl", CF_TYPE_TABLES);
+	} else {
+		read_file_text_from_default(defaults_get_file("controlconfigdefaults.tbl"));
+	}
+
+	reset_parse();
+
+	// start parsing
+	// TODO: Split this out into more helps. Too many tabs!
+	while(optional_string("#ControlConfigOverride")) {
+		config_item *cfg_preset = new config_item[CCFG_MAX + 1];
+		std::copy(Control_config, Control_config + CCFG_MAX + 1, cfg_preset);
+		Control_config_presets.push_back(cfg_preset);
+
+		SCP_string preset_name;
+		if (optional_string("$Name:")) {
+			stuff_string_line(preset_name);
 		} else {
-			read_file_text_from_default(defaults_get_file("controlconfigdefaults.tbl"));
+			preset_name = "<unnamed preset>";
 		}
+		Control_config_preset_names.push_back(preset_name);

-		reset_parse();
+		while (required_string_either("#End","$Bind Name:")) {
+			const int iBufferLength = 64;
+			char szTempBuffer[iBufferLength];

-		// start parsing
-		// TODO: Split this out into more helps. Too many tabs!
-		while(optional_string("#ControlConfigOverride")) {
-			config_item *cfg_preset = new config_item[CCFG_MAX + 1];
-			std::copy(Control_config, Control_config + CCFG_MAX + 1, cfg_preset);
-			Control_config_presets.push_back(cfg_preset);
+			required_string("$Bind Name:");
+			stuff_string(szTempBuffer, F_NAME, iBufferLength);

-			SCP_string preset_name;
-			if (optional_string("$Name:")) {
-				stuff_string_line(preset_name);
-			} else {
-				preset_name = "<unnamed preset>";
-			}
-			Control_config_preset_names.push_back(preset_name);
+			const size_t cCntrlAryLength = sizeof(Control_config) / sizeof(Control_config[0]);
+			for (size_t i = 0; i < cCntrlAryLength; ++i) {
+				config_item& r_ccConfig = cfg_preset[i];

-			while (required_string_either("#End","$Bind Name:")) {
-				const int iBufferLength = 64;
-				char szTempBuffer[iBufferLength];
+				if (!strcmp(szTempBuffer, r_ccConfig.text)) {
+					/**
+					* short key_default;
+					* short joy_default;
+					* char tab;
+					* bool hasXSTR;
+					* char type;
+					*/

-				required_string("$Bind Name:");
-				stuff_string(szTempBuffer, F_NAME, iBufferLength);
+					int iTemp;

-				const size_t cCntrlAryLength = sizeof(Control_config) / sizeof(Control_config[0]);
-				for (size_t i = 0; i < cCntrlAryLength; ++i) {
-					config_item& r_ccConfig = cfg_preset[i];
-
-					if (!strcmp(szTempBuffer, r_ccConfig.text)) {
-						/**
-                        * short key_default;
-                        * short joy_default;
-                        * char tab;
-                        * bool hasXSTR;
-                        * char type;
-                        */
-
-						int iTemp;
-
-						if (optional_string("$Key Default:")) {
-							if (optional_string("NONE")) {
-								r_ccConfig.key_default = (short)-1;
-							} else {
-								stuff_string(szTempBuffer, F_NAME, iBufferLength);
-								r_ccConfig.key_default = (short)mKeyNameToVal[szTempBuffer];
-							}
-						}
-
-						if (optional_string("$Joy Default:")) {
-							stuff_int(&iTemp);
-							r_ccConfig.joy_default = (short)iTemp;
-						}
-
-						if (optional_string("$Key Mod Shift:")) {
-							stuff_int(&iTemp);
-							r_ccConfig.key_default |= (iTemp == 1) ? KEY_SHIFTED : 0;
-						}
-
-						if (optional_string("$Key Mod Alt:")) {
-							stuff_int(&iTemp);
-							r_ccConfig.key_default |= (iTemp == 1) ? KEY_ALTED : 0;
-						}
-
-						if (optional_string("$Key Mod Ctrl:")) {
-							stuff_int(&iTemp);
-							r_ccConfig.key_default |= (iTemp == 1) ? KEY_CTRLED : 0;
-						}
-
-						if (optional_string("$Category:")) {
+					if (optional_string("$Key Default:")) {
+						if (optional_string("NONE")) {
+							r_ccConfig.key_default = (short)-1;
+						} else {
 							stuff_string(szTempBuffer, F_NAME, iBufferLength);
-							r_ccConfig.tab = (char)mCCTabNameToVal[szTempBuffer];
+							r_ccConfig.key_default = (short)mKeyNameToVal[szTempBuffer];
 						}
-
-						if (optional_string("$Has XStr:")) {
-							stuff_int(&iTemp);
-							r_ccConfig.hasXSTR = (iTemp == 1);
-						}
-
-						if (optional_string("$Type:")) {
-							stuff_string(szTempBuffer, F_NAME, iBufferLength);
-							r_ccConfig.type = (char)mCCTypeNameToVal[szTempBuffer];
-						}
-
-						if (optional_string("+Disable")) {
-							r_ccConfig.disabled = true;
-						}
-						if (optional_string("$Disable:")) {
-							stuff_boolean(&r_ccConfig.disabled);
-						}
-
-						// Nerf the buffer now.
-						szTempBuffer[0] = '\0';
-					} else if ((i + 1) == cCntrlAryLength) {
-						error_display(1, "Bind Name not found: %s\n", szTempBuffer);
-						advance_to_eoln(NULL);
-						ignore_white_space();
-						return;
 					}
+
+					if (optional_string("$Joy Default:")) {
+						stuff_int(&iTemp);
+						r_ccConfig.joy_default = (short)iTemp;
+					}
+
+					if (optional_string("$Key Mod Shift:")) {
+						stuff_int(&iTemp);
+						r_ccConfig.key_default |= (iTemp == 1) ? KEY_SHIFTED : 0;
+					}
+
+					if (optional_string("$Key Mod Alt:")) {
+						stuff_int(&iTemp);
+						r_ccConfig.key_default |= (iTemp == 1) ? KEY_ALTED : 0;
+					}
+
+					if (optional_string("$Key Mod Ctrl:")) {
+						stuff_int(&iTemp);
+						r_ccConfig.key_default |= (iTemp == 1) ? KEY_CTRLED : 0;
+					}
+
+					if (optional_string("$Category:")) {
+						stuff_string(szTempBuffer, F_NAME, iBufferLength);
+						r_ccConfig.tab = (char)mCCTabNameToVal[szTempBuffer];
+					}
+
+					if (optional_string("$Has XStr:")) {
+						stuff_int(&iTemp);
+						r_ccConfig.hasXSTR = (iTemp == 1);
+					}
+
+					if (optional_string("$Type:")) {
+						stuff_string(szTempBuffer, F_NAME, iBufferLength);
+						r_ccConfig.type = (char)mCCTypeNameToVal[szTempBuffer];
+					}
+
+					if (optional_string("+Disable")) {
+						r_ccConfig.disabled = true;
+					}
+					if (optional_string("$Disable:")) {
+						stuff_boolean(&r_ccConfig.disabled);
+					}
+					
+					// Nerf the buffer now.
+					szTempBuffer[0] = '\0';
+				} else if ((i + 1) == cCntrlAryLength) {
+					error_display(1, "Bind Name not found: %s\n", szTempBuffer);
+					advance_to_eoln(NULL);
+					ignore_white_space();
+					return;
 				}
 			}
-
-			required_string("#End");
 		}
-	}
-	catch (const parse::ParseException& e)
-	{
-		mprintf(("TABLES: Unable to parse 'controlconfigdefaults.tbl'!  Error message = %s.\n", e.what()));
-		return;
-	}

+		required_string("#End");
+	}
+	
 	// Overwrite the control config with the first preset that was found
-	if (!Control_config_presets.empty()) {
+	if (Control_config_presets.size() > 0) {
 		std::copy(Control_config_presets[0], Control_config_presets[0] + CCFG_MAX + 1, Control_config);
 	}
 }
@@ -1,92 +0,0 @@
-#include "cutscene/Decoder.h"
-
-#include <memory>
-
-namespace cutscene {
-FrameSize::FrameSize(size_t in_width, size_t in_height, size_t in_stride)
-    : width(in_width), height(in_height), stride(in_stride)
-{
-}
-FrameSize::FrameSize() = default;
-
-Decoder::Decoder() : m_decoding(true) {
-}
-
-Decoder::~Decoder() {
-}
-
-bool Decoder::tryPopAudioData(AudioFramePtr& out) {
-	auto res = m_audioQueue->try_pull_front(out);
-	return res == queue_op_status::success;
-}
-
-bool Decoder::tryPopSubtitleData(SubtitleFramePtr& out) {
-	auto res = m_subtitleQueue->try_pull_front(out);
-	return res == queue_op_status::success;
-}
-
-bool Decoder::tryPopVideoFrame(VideoFramePtr& out) {
-	auto res = m_videoQueue->try_pull_front(out);
-	return res == queue_op_status::success;
-}
-
-void Decoder::initializeQueues(size_t queueSize) {
-	m_queueSize = queueSize;
-
-	m_videoQueue.reset(new sync_bounded_queue<VideoFramePtr>(m_queueSize));
-	m_audioQueue.reset(new sync_bounded_queue<AudioFramePtr>(m_queueSize));
-	m_subtitleQueue.reset(new sync_bounded_queue<SubtitleFramePtr>(m_queueSize));
-}
-
-void Decoder::stopDecoder() {
-	m_decoding = false;
-
-	m_videoQueue->close();
-	m_audioQueue->close();
-	m_subtitleQueue->close();
-}
-
-bool Decoder::canPushAudioData() {
-	return !isAudioQueueFull();
-}
-
-void Decoder::pushAudioData(AudioFramePtr&& data) {
-	Assertion(data, "Invalid audio data passed!");
-
-	try {
-		m_audioQueue->push_back(std::move(data));
-	}
-	catch (sync_queue_is_closed&) {
-		// Ignore
-	}
-}
-
-bool Decoder::canPushSubtitleData() {
-	return !isSubtitleQueueFull();
-}
-void Decoder::pushSubtitleData(SubtitleFramePtr&& data) {
-	Assertion(data, "Invalid audio data passed!");
-
-	try {
-		m_subtitleQueue->push_back(std::move(data));
-	}
-	catch (sync_queue_is_closed&) {
-		// Ignore
-	}
-}
-
-bool Decoder::canPushVideoData() {
-	return !isVideoQueueFull();
-}
-
-void Decoder::pushFrameData(VideoFramePtr&& frame) {
-	Assertion(frame, "Invalid video data passed!");
-
-	try {
-		m_videoQueue->push_back(std::move(frame));
-	}
-	catch (sync_queue_is_closed&) {
-		// Ignore
-	}
-}
-}
@@ -1,183 +0,0 @@
-#pragma once
-
-#include <memory>
-
-#include "globalincs/pstypes.h"
-#include "utils/boost/syncboundedqueue.h"
-
-namespace cutscene {
-struct FrameSize {
-	size_t width = 0;
-	size_t height = 0;
-	size_t stride = 0;
-
-	FrameSize(size_t width, size_t in_height, size_t in_stride);
-	FrameSize();
-};
-
-class VideoFrame {
- protected:
-	VideoFrame() = default;
-
-  public:
-	virtual ~VideoFrame() = default;
-
-	double frameTime = -1.0;
-	int id = -1;
-
-	virtual size_t getPlaneNumber() = 0;
-
-	virtual FrameSize getPlaneSize(size_t plane) = 0;
-
-	virtual void* getPlaneData(size_t plane) = 0;
-};
-
-/**
- * @brief Pointer type for passing frame data between threads
- *
- */
-template<typename T>
-using FramePtr = std::unique_ptr<T>;
-
-typedef std::unique_ptr<VideoFrame> VideoFramePtr;
-
-enum class FramePixelFormat {
-	Invalid,
-	YUV420,
-	BGR,
-	BGRA
-};
-
-struct MovieProperties {
-	FrameSize size;
-
-	float fps = -1.0f;
-
-	FramePixelFormat pixelFormat = FramePixelFormat::Invalid;
-};
-
-struct AudioFrame {
-	SCP_vector<short> audioData;
-
-	int channels = -1;
-
-	int rate = -1;
-};
-typedef std::unique_ptr<AudioFrame> AudioFramePtr;
-
-struct SubtitleFrame {
-    double displayStartTime = -1.0;
-    double displayEndTime = -1.0;
-
-	SCP_string text;
-};
-typedef std::unique_ptr<SubtitleFrame> SubtitleFramePtr;
-
-struct PlaybackProperties {
-	bool with_audio = true;
-	bool looping = false;
-};
-
-/**
- * @brief Abstract class for decoding a video or audio stream
- *
- * A decoder maintaines two queues of decoded audio and video frames which are filled from a background thread and
- * retrieved by the main thread.
- */
-class Decoder {
- private:
-	std::unique_ptr<sync_bounded_queue<VideoFramePtr>> m_videoQueue;
-	std::unique_ptr<sync_bounded_queue<AudioFramePtr>> m_audioQueue;
-	std::unique_ptr<sync_bounded_queue<SubtitleFramePtr>> m_subtitleQueue;
-
-	bool m_decoding;
-	size_t m_queueSize = 0;
-
-	Decoder(const Decoder&) SCP_DELETED_FUNCTION;
-
-	Decoder& operator=(const Decoder&) SCP_DELETED_FUNCTION;
- protected:
-	Decoder();
-
- public:
-
-	virtual ~Decoder();
-
-	/**
-	 * @brief Initializes the decoder
-	 *
-	 * @note A implementation should initialize the datastructures required for decoding here.
-	 *
-	 * @param fileName The name of the file that should be opened
-	 * @return @c true if the initialization was successfull, @c false otherwise
-	 */
-	virtual bool initialize(const SCP_string& fileName, const PlaybackProperties& properties) = 0;
-
-	/**
-	 * @brief Returns the properties of the video
-	 * @return The properties
-	 */
-	virtual MovieProperties getProperties() const = 0;
-
-	/**
-	 * @brief Starts decoding the video
-	 */
-	virtual void startDecoding() = 0;
-
-	/**
-	 * @brief Determines if the video has audio
-	 * @return @c true if audio is included in the video
-	 */
-	virtual bool hasAudio() const = 0;
-
-	virtual bool hasSubtitles() const = 0;
-
-	/**
-	 * @brief Ends decoding of the video file
-	 */
-	virtual void close() = 0;
-
-	bool isAudioQueueFull() { return m_audioQueue->size() == m_queueSize; }
-
-	bool isAudioFrameAvailable() { return !m_audioQueue->empty(); }
-
-	size_t getAudioQueueSize() { return m_audioQueue->size(); }
-
-	bool tryPopAudioData(AudioFramePtr&);
-
-	bool isSubtitleQueueFull() { return m_subtitleQueue->size() == m_queueSize; }
-
-	bool isSubtitleFrameAvailable() { return !m_subtitleQueue->empty(); }
-
-	size_t getSubtitleQueueSize() { return m_subtitleQueue->size(); }
-
-	bool tryPopSubtitleData(SubtitleFramePtr&);
-
-	bool isVideoQueueFull() { return m_videoQueue->size() == m_queueSize; }
-
-	bool isVideoFrameAvailable() { return !m_videoQueue->empty(); }
-
-	size_t getVideoQueueSize() { return m_videoQueue->size(); }
-
-	bool tryPopVideoFrame(VideoFramePtr&);
-
-	void stopDecoder();
-
-	bool isDecoding() { return m_decoding; }
-
- protected:
-	void initializeQueues(size_t queueSize);
-
-	bool canPushAudioData();
-
-	void pushAudioData(AudioFramePtr&& data);
-
-	bool canPushSubtitleData();
-
-	void pushSubtitleData(SubtitleFramePtr&& data);
-
-	bool canPushVideoData();
-
-	void pushFrameData(VideoFramePtr&& frame);
-};
-}
@@ -1,138 +0,0 @@
-#include "VideoPresenter.h"
-
-#include "graphics/matrix.h"
-
-using namespace cutscene;
-using namespace cutscene::player;
-
-namespace {
-struct movie_vertex {
-	vec2d pos;
-	vec2d uv;
-};
-}
-
-namespace cutscene {
-namespace player {
-VideoPresenter::VideoPresenter(const MovieProperties& props) : _properties(props)
-{
-	GR_DEBUG_SCOPE("Init video");
-
-	_planeTextureHandles.fill(-1);
-
-	auto w = static_cast<int>(props.size.width);
-	auto h = static_cast<int>(props.size.height);
-
-	switch (props.pixelFormat) {
-	case FramePixelFormat::YUV420:
-		_planeTextureBuffers[0].reset(new uint8_t[w * h]);
-		_planeTextureHandles[0] = bm_create(8, w, h, _planeTextureBuffers[0].get(), BMP_AABITMAP);
-
-		_planeTextureBuffers[1].reset(new uint8_t[w / 2 * h / 2]);
-		_planeTextureHandles[1] = bm_create(8, w / 2, h / 2, _planeTextureBuffers[1].get(), BMP_AABITMAP);
-
-		_planeTextureBuffers[2].reset(new uint8_t[w / 2 * h / 2]);
-		_planeTextureHandles[2] = bm_create(8, w / 2, h / 2, _planeTextureBuffers[2].get(), BMP_AABITMAP);
-
-		material_set_movie(&_movie_material, _planeTextureHandles[0], _planeTextureHandles[1], _planeTextureHandles[2]);
-		break;
-	case FramePixelFormat::BGR:
-		_planeTextureBuffers[0].reset(new uint8_t[w * h * 3]);
-		_planeTextureHandles[0] = bm_create(24, w, h, _planeTextureBuffers[0].get(), 0);
-
-		material_set_unlit(&_rgb_material, _planeTextureHandles[0], 1.0f, false, false);
-		break;
-	case FramePixelFormat::BGRA:
-		_planeTextureBuffers[0].reset(new uint8_t[w * h * 4]);
-		_planeTextureHandles[0] = bm_create(32, w, h, _planeTextureBuffers[0].get(), 0);
-
-		material_set_unlit(&_rgb_material, _planeTextureHandles[0], 1.0f, true, false);
-		break;
-	default:
-		UNREACHABLE("Unhandled enum value!");
-		break;
-	}
-}
-
-VideoPresenter::~VideoPresenter() {
-	GR_DEBUG_SCOPE("Deinit video");
-
-	for (auto& handle : _planeTextureHandles) {
-		if (handle > 0) {
-			bm_release(handle);
-			handle = -1;
-		}
-	}
-}
-
-void VideoPresenter::uploadVideoFrame(const VideoFramePtr& frame) {
-	GR_DEBUG_SCOPE("Update video frame");
-
-	for (size_t i = 0; i < frame->getPlaneNumber(); ++i) {
-		auto size = frame->getPlaneSize(i);
-		auto data = frame->getPlaneData(i);
-
-		memcpy(_planeTextureBuffers[i].get(), data, size.stride * size.height);
-
-		int bpp = 0;
-		switch (_properties.pixelFormat) {
-		case FramePixelFormat::YUV420:
-			bpp = 8;
-			break;
-		case FramePixelFormat::BGR:
-			bpp = 24;
-			break;
-		case FramePixelFormat::BGRA:
-			bpp = 32;
-			break;
-		default:
-			UNREACHABLE("Unhandled enum value!");
-			break;
-		}
-
-		gr_update_texture(_planeTextureHandles[i], bpp, _planeTextureBuffers[i].get(), static_cast<int>(size.width),
-		                  static_cast<int>(size.height));
-	}
-}
-
-void VideoPresenter::displayFrame(float x1, float y1, float x2, float y2) {
-	GR_DEBUG_SCOPE("Draw video frame");
-
-	movie_vertex vertex_data[4];
-
-	vertex_data[0].pos.x = x1;
-	vertex_data[0].pos.y = y1;
-	vertex_data[0].uv.x = 0.0f;
-	vertex_data[0].uv.y = 0.0f;
-
-	vertex_data[1].pos.x = x1;
-	vertex_data[1].pos.y = y2;
-	vertex_data[1].uv.x = 0.0f;
-	vertex_data[1].uv.y = 1.0f;
-
-	vertex_data[2].pos.x = x2;
-	vertex_data[2].pos.y = y1;
-	vertex_data[2].uv.x = 1.0f;
-	vertex_data[2].uv.y = 0.0f;
-
-	vertex_data[3].pos.x = x2;
-	vertex_data[3].pos.y = y2;
-	vertex_data[3].uv.x = 1.0f;
-	vertex_data[3].uv.y = 1.0f;
-
-	// Use the immediate buffer for storing our data since that is exactly what we need
-	auto offset = gr_add_to_immediate_buffer(sizeof(vertex_data), vertex_data);
-
-	vertex_layout layout;
-	layout.add_vertex_component(vertex_format_data::POSITION2, sizeof(vertex_data[0]), offsetof(movie_vertex, pos));
-	layout.add_vertex_component(vertex_format_data::TEX_COORD2, sizeof(vertex_data[0]), offsetof(movie_vertex, uv));
-
-	if (_properties.pixelFormat == FramePixelFormat::YUV420) {
-		gr_render_movie(&_movie_material, PRIM_TYPE_TRISTRIP, &layout, 4, gr_immediate_buffer_handle, offset);
-	} else {
-		gr_render_primitives(&_rgb_material, PRIM_TYPE_TRISTRIP, &layout, 0, 4, gr_immediate_buffer_handle, offset);
-	}
-}
-
-}
-}
@@ -1,39 +0,0 @@
-#ifndef FS2_OPEN_OPENGLVIDEOPRESENTER_H
-#define FS2_OPEN_OPENGLVIDEOPRESENTER_H
-
-#include "globalincs/pstypes.h"
-#include "graphics/2d.h"
-#include "graphics/material.h"
-#include "cutscene/Decoder.h"
-
-#include <memory>
-
-namespace cutscene {
-namespace player {
-
-class VideoPresenter {
-	MovieProperties _properties;
-
-	std::array<int, 3> _planeTextureHandles;
-	std::array<std::unique_ptr<uint8_t[]>, 3> _planeTextureBuffers;
-
-	movie_material _movie_material;
-	material _rgb_material; // Material used when a RGB/RGBA movie is played
- public:
-	explicit VideoPresenter(const MovieProperties& props);
-
-	// Disallow copying
-	VideoPresenter(const VideoPresenter&) = delete;
-	VideoPresenter& operator=(const VideoPresenter&) = delete;
-
-	virtual ~VideoPresenter();
-
-	void uploadVideoFrame(const VideoFramePtr& frame);
-
-	void displayFrame(float x1, float y1, float x2, float y2);
-};
-}
-}
-
-
-#endif //FS2_OPEN_OPENGLVIDEOPRESENTER_H
@@ -5,7 +5,7 @@
 * or otherwise commercially exploit the source or things you created based on the 
 * source.
 *
-*/
+*/ 



@@ -26,13 +26,13 @@
 extern int Cmdline_nomovies;


-const char* Cutscene_bitmap_name[GR_NUM_RESOLUTIONS] = {
-		"ViewFootage",
-		"2_ViewFootage"
+char *Cutscene_bitmap_name[GR_NUM_RESOLUTIONS] = {
+	"ViewFootage",
+	"2_ViewFootage"
 };
-const char* Cutscene_mask_name[GR_NUM_RESOLUTIONS] = {
-		"ViewFootage-m",
-		"2_ViewFootage-m"
+char *Cutscene_mask_name[GR_NUM_RESOLUTIONS] = {
+	"ViewFootage-m",
+	"2_ViewFootage-m"
 };

 int Description_index;
@@ -40,9 +40,8 @@ SCP_vector<cutscene_info> Cutscenes;

 void cutscene_close()
 {
-	for (SCP_vector<cutscene_info>::iterator cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut)
-		if (cut->description != NULL)
-		{
+	for(SCP_vector<cutscene_info>::iterator cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut)
+		if(cut->description != NULL) {
 			vm_free(cut->description);
 			cut->description = NULL;
 		}
@@ -82,24 +81,19 @@ void cutscene_init()
 			cutinfo.description = vm_strdup(buf);

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

 			cutinfo.viewable = false;

-			if (isFirstCutscene)
-			{
+			if (isFirstCutscene) {
 				isFirstCutscene = false;
 				// The original code assumes the first movie is the intro, so always viewable
 				cutinfo.viewable = true;
 			}

-			if (optional_string("$Always Viewable:"))
-			{
+			if (optional_string("$Always Viewable:")) {
 				stuff_boolean(&cutinfo.viewable);
 			}

@@ -115,34 +109,44 @@ void cutscene_init()
 	}
 }

+// function to return 0 based index of which CD a particular movie is on
+// returns -1 on failure.
+int cutscenes_get_cd_num( char *filename )
+{
+	for (SCP_vector<cutscene_info>::iterator cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut) {
+		if ( !stricmp(cut->filename, filename) ) {
+			return (cut->cd - 1);
+		}
+	}
+
+	return -1;
+}
+
 // marks a cutscene as viewable
-void cutscene_mark_viewable(const char* filename)
+void cutscene_mark_viewable(char *filename)
 {
 	char cut_file[MAX_FILENAME_LEN];
 	char file[MAX_FILENAME_LEN];

-	Assert(filename != NULL);
+	Assert(filename!=NULL);

 	// strip off extension
-	strcpy_s(file, filename);
-	char* p = strchr(file, '.');
-	if (p)
-	{
+	strcpy_s( file, filename );
+	char *p = strchr( file, '.' );
+	if ( p ) {
 		*p = 0;
 	}

 	// change to lower case
 	strlwr(file);
 	int i = 0;
-	for (SCP_vector<cutscene_info>::iterator cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut)
-	{
+	for (SCP_vector<cutscene_info>::iterator cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut) {
 		// change the cutscene file name to lower case
 		strcpy_s(cut_file, cut->filename);
 		strlwr(cut_file);

 		// see if the stripped filename matches the cutscene filename
-		if (strstr(cut_file, file) != NULL)
-		{
+		if ( strstr(cut_file, file) != NULL ) {
 			cut->viewable = true;
 			return;
 		}
@@ -152,17 +156,17 @@ void cutscene_mark_viewable(const char* filename)
 	Warning(LOCATION, "Could not find cutscene '%s' in listing; cannot mark it viewable...", filename);
 }

-#define NUM_BUTTONS                8
+#define NUM_BUTTONS				8

-#define TECH_DATABASE_BUTTON    0
-#define SIMULATOR_BUTTON        1
-#define CUTSCENES_BUTTON        2
-#define CREDITS_BUTTON            3
+#define TECH_DATABASE_BUTTON	0
+#define SIMULATOR_BUTTON		1
+#define CUTSCENES_BUTTON		2
+#define CREDITS_BUTTON			3

-#define SCROLL_UP_BUTTON        4
-#define SCROLL_DOWN_BUTTON        5
-#define PLAY_BUTTON                6
-#define EXIT_BUTTON                7
+#define SCROLL_UP_BUTTON		4
+#define SCROLL_DOWN_BUTTON		5
+#define PLAY_BUTTON				6
+#define EXIT_BUTTON				7

 static SCP_vector<int> Cutscene_list;
 //static int Stats_scroll_offset;  // not used - taylor
@@ -173,102 +177,155 @@ static UI_BUTTON List_region;
 static UI_WINDOW Ui_window;

 static ui_button_info Buttons[GR_NUM_RESOLUTIONS][NUM_BUTTONS] = {
-		{ // GR_640
-				ui_button_info("TDB_00", 7, 3, 37, 7, 0),            // tech database 1
-				ui_button_info("TDB_01", 7, 18, 37, 23, 1),            // tech database 2
-				ui_button_info("TDB_02", 7, 34, 37, 38, 2),            // tech database 3
-				ui_button_info("TDB_03", 7, 49, 37, 54, 3),            // tech database 4
+	{ // GR_640
+		ui_button_info("TDB_00",	7,		3,		37,	7,		0),			// tech database 1
+		ui_button_info("TDB_01",	7,		18,	37,	23,	1),			// tech database 2
+		ui_button_info("TDB_02",	7,		34,	37,	38,	2),			// tech database 3
+		ui_button_info("TDB_03",	7,		49,	37,	54,	3),			// tech database 4

-				ui_button_info("VFB_04", 6, 318, -1, -1, 4),            // scroll up
-				ui_button_info("VFB_05", 36, 318, -1, -1, 5),            // scroll down
-				ui_button_info("VFB_06", 578, 319, 587, 366, 6),            // play
-				ui_button_info("VFB_07", 574, 431, 587, 413, 7),            // exit
-		},
-		{ // GR_1024
-				ui_button_info("2_TDB_00", 12, 5, 59, 12, 0),            // tech database 1
-				ui_button_info("2_TDB_01", 12, 31, 59, 37, 1),            // tech database 2
-				ui_button_info("2_TDB_02", 12, 56, 59, 62, 2),            // tech database 3
-				ui_button_info("2_TDB_03", 12, 81, 59, 88, 3),            // tech database 4
+		ui_button_info("VFB_04",	6,		318,	-1,	-1,	4),			// scroll up
+		ui_button_info("VFB_05",	36,	318,	-1,	-1,	5),			// scroll down
+		ui_button_info("VFB_06",	578,	319,	587,	366,	6),			// play
+		ui_button_info("VFB_07",	574,	431,	587,	413,	7),			// exit
+	},
+	{ // GR_1024
+		ui_button_info("2_TDB_00",	12,	5,		59,	12,	0),			// tech database 1
+		ui_button_info("2_TDB_01",	12,	31,	59,	37,	1),			// tech database 2
+		ui_button_info("2_TDB_02",	12,	56,	59,	62,	2),			// tech database 3
+		ui_button_info("2_TDB_03",	12,	81,	59,	88,	3),			// tech database 4

-				ui_button_info("2_VFB_04", 9, 509, -1, -1, 4),            // scroll up
-				ui_button_info("2_VFB_05", 58, 509, -1, -1, 5),            // scroll down
-				ui_button_info("2_VFB_06", 925, 511, 940, 586, 6),            // play
-				ui_button_info("2_VFB_07", 918, 689, 940, 661, 7),            // exit
-		}
+		ui_button_info("2_VFB_04",	9,		509,	-1,	-1,	4),			// scroll up
+		ui_button_info("2_VFB_05",	58,	509,	-1,	-1,	5),			// scroll down
+		ui_button_info("2_VFB_06",	925,	511,	940,	586,	6),			// play
+		ui_button_info("2_VFB_07",	918,	689,	940,	661,	7),			// exit
+	}
 };

 // text
-#define NUM_CUTSCENE_TEXT            6
+#define NUM_CUTSCENE_TEXT			6
 UI_XSTR Cutscene_text[GR_NUM_RESOLUTIONS][NUM_CUTSCENE_TEXT] = {
-		{ // GR_640
-				{"Technical Database", 1055, 37, 7,  UI_XSTR_COLOR_GREEN, -1, &Buttons[0][TECH_DATABASE_BUTTON].button},
-				{"Mission Simulator", 1056, 37, 23, UI_XSTR_COLOR_GREEN, -1, &Buttons[0][SIMULATOR_BUTTON].button},
-				{"Cutscenes", 1057, 37, 38, UI_XSTR_COLOR_GREEN, -1, &Buttons[0][CUTSCENES_BUTTON].button},
-				{"Credits", 1058, 37, 54, UI_XSTR_COLOR_GREEN, -1, &Buttons[0][CREDITS_BUTTON].button},
-
-				{"Play", 1335, 587, 366, UI_XSTR_COLOR_GREEN, -1, &Buttons[0][PLAY_BUTTON].button},
-				{"Exit", 1419, 587, 413, UI_XSTR_COLOR_PINK, -1, &Buttons[0][EXIT_BUTTON].button},
-		},
-		{ // GR_1024
-				{"Technical Database", 1055, 59, 12, UI_XSTR_COLOR_GREEN, -1, &Buttons[1][TECH_DATABASE_BUTTON].button},
-				{"Mission Simulator", 1056, 59, 37, UI_XSTR_COLOR_GREEN, -1, &Buttons[1][SIMULATOR_BUTTON].button},
-				{"Cutscenes", 1057, 59, 62, UI_XSTR_COLOR_GREEN, -1, &Buttons[1][CUTSCENES_BUTTON].button},
-				{"Credits", 1058, 59, 88, UI_XSTR_COLOR_GREEN, -1, &Buttons[1][CREDITS_BUTTON].button},
-
-				{"Play", 1335, 940, 586, UI_XSTR_COLOR_GREEN, -1, &Buttons[1][PLAY_BUTTON].button},
-				{"Exit", 1419, 940, 661, UI_XSTR_COLOR_PINK, -1, &Buttons[1][EXIT_BUTTON].button},
-		}
+	{ // GR_640
+		{"Technical Database",		1055,		37,	7,		UI_XSTR_COLOR_GREEN, -1, &Buttons[0][TECH_DATABASE_BUTTON].button },
+		{"Mission Simulator",		1056,		37,	23,	UI_XSTR_COLOR_GREEN, -1, &Buttons[0][SIMULATOR_BUTTON].button },
+		{"Cutscenes",					1057,		37,	38,	UI_XSTR_COLOR_GREEN, -1, &Buttons[0][CUTSCENES_BUTTON].button },
+		{"Credits",						1058,		37,	54,	UI_XSTR_COLOR_GREEN, -1, &Buttons[0][CREDITS_BUTTON].button },
+		
+		{"Play",							1335,		587,	366,	UI_XSTR_COLOR_GREEN, -1, &Buttons[0][PLAY_BUTTON].button },
+		{"Exit",							1419,		587,	413,	UI_XSTR_COLOR_PINK, -1, &Buttons[0][EXIT_BUTTON].button },			
+	},
+	{ // GR_1024
+		{"Technical Database",		1055,		59,	12,	UI_XSTR_COLOR_GREEN, -1, &Buttons[1][TECH_DATABASE_BUTTON].button },
+		{"Mission Simulator",		1056,		59,	37,	UI_XSTR_COLOR_GREEN, -1, &Buttons[1][SIMULATOR_BUTTON].button },
+		{"Cutscenes",					1057,		59,	62,	UI_XSTR_COLOR_GREEN, -1, &Buttons[1][CUTSCENES_BUTTON].button },
+		{"Credits",						1058,		59,	88,	UI_XSTR_COLOR_GREEN, -1, &Buttons[1][CREDITS_BUTTON].button },
+		
+		{"Play",							1335,		940,	586,	UI_XSTR_COLOR_GREEN, -1, &Buttons[1][PLAY_BUTTON].button },
+		{"Exit",							1419,		940,	661,	UI_XSTR_COLOR_PINK, -1, &Buttons[1][EXIT_BUTTON].button },			
+	}
 };

 int Cutscene_list_coords[GR_NUM_RESOLUTIONS][4] = {
-		{ // GR_640
-				9,  117, 621, 198
-		},
-		{ // GR_1024
-				14, 188, 994, 316
-		}
+	{ // GR_640
+		9,	117,	621,	198
+	},
+	{ // GR_1024
+		14,	188,	994,	316
+	}
 };

 int Cutscene_desc_coords[GR_NUM_RESOLUTIONS][4] = {
-		{ // GR_640
-				9,  378, 484, 73
-		},
-		{ // GR_1024
-				14, 605, 775, 117
-		}
+	{ // GR_640
+		9,	378, 484, 73
+	},
+	{ // GR_1024
+		14, 605, 775, 117
+	}
 };

-#define MAX_TEXT_LINES        20
+#define MAX_TEXT_LINES		20
 int Cutscene_max_text_lines[GR_NUM_RESOLUTIONS] = {
-		10,
-		MAX_TEXT_LINES
+	10,
+	MAX_TEXT_LINES
 };
-#define MAX_TEXT_LINE_LEN    256
+#define MAX_TEXT_LINE_LEN	256

 static int Text_size;
 static int Text_offset = 0;
 static int Text_line_size[MAX_TEXT_LINES];
-static const char* Text_lines[MAX_TEXT_LINES];
+static const char *Text_lines[MAX_TEXT_LINES];


+int cutscenes_validate_cd(char *mve_name, int prompt_for_cd)
+{
+	int cd_present = 0;
+	int cd_drive_num;
+	int cd_mve_is_on;
+	char volume_name[MAX_PATH_LEN];
+
+	int num_attempts = 0;
+
+	while(1) {
+		int path_set_ok;
+
+		cd_mve_is_on = cutscenes_get_cd_num(mve_name);
+		if ((cd_mve_is_on != 0) && (cd_mve_is_on != 1) && (cd_mve_is_on != 2)) {
+			cd_present = 0;
+			break;
+		}
+
+		sprintf(volume_name, NOX("FREESPACE2_%c"), '1' + cd_mve_is_on);
+
+		cd_drive_num = find_freespace_cd(volume_name);
+		path_set_ok = set_cdrom_path(cd_drive_num);
+
+		if ( path_set_ok ) {
+			cd_present = 1;
+			break;
+		}
+
+		if ( !prompt_for_cd ) {
+			cd_present = 0;
+			break;
+		}
+
+		// no CD found, so prompt user
+		char popup_msg[256];
+		int popup_rval;
+
+		sprintf(popup_msg, XSTR( "Movie not found\n\nInsert FreeSpace CD #%d to continue", 203), cd_mve_is_on+1);
+
+		popup_rval = popup(PF_BODY_BIG, 2, POPUP_CANCEL, POPUP_OK, popup_msg);
+		if ( popup_rval != 1 ) {
+			cd_present = 0;
+			break;
+		}
+
+		if ( num_attempts++ > 5 ) {
+			cd_present = 0;
+			break;
+		}													   
+	}
+
+	return cd_present;   
+}
+
 void cutscenes_screen_play()
 {
 	char name[MAX_FILENAME_LEN]; // *full_name 
 	int which_cutscene;

-	Assert((Selected_line >= 0) && (Selected_line < (int) Cutscene_list.size()));
+	Assert( (Selected_line >= 0) && (Selected_line < (int)Cutscene_list.size()) );
 	which_cutscene = Cutscene_list[Selected_line];

-	strcpy_s(name, Cutscenes[which_cutscene].filename);
+	strcpy_s(name, Cutscenes[which_cutscene].filename );
 //	full_name = cf_add_ext(name, NOX(".mve"));

 	main_hall_stop_music(true);
 	main_hall_stop_ambient();
-	auto rval = movie::play(name);
+	int rval = movie_play(name);
 	main_hall_start_music();

-	if (!rval)
-	{
+	if ( !rval ) {
 		char str[256];

 		if (Cmdline_nomovies)
@@ -276,21 +333,20 @@ void cutscenes_screen_play()
 		else
 			sprintf(str, XSTR("Unable to play movie %s.", 204), Cutscenes[which_cutscene].name);

-		popup(PF_USE_AFFIRMATIVE_ICON, 1, POPUP_OK, str);
+		popup(PF_USE_AFFIRMATIVE_ICON, 1, POPUP_OK, str );
 	}
-
+	
 }

 void cutscenes_screen_scroll_line_up()
 {
-	if (Selected_line)
-	{
+	if (Selected_line) {
 		Selected_line--;
-		gamesnd_play_iface(InterfaceSounds::SCROLL);
+		gamesnd_play_iface(SND_SCROLL);

 	} else
-		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
-
+		gamesnd_play_iface(SND_GENERAL_FAIL);
+	
 	if (Selected_line < Scroll_offset)
 		Scroll_offset = Selected_line;
 }
@@ -299,17 +355,15 @@ void cutscenes_screen_scroll_line_down()
 {
 	int h;

-	if (Selected_line < (int) Cutscene_list.size() - 1)
-	{
+	if (Selected_line < (int)Cutscene_list.size() - 1) {
 		Selected_line++;
-		gamesnd_play_iface(InterfaceSounds::SCROLL);
+		gamesnd_play_iface(SND_SCROLL);

 	} else
-		gamesnd_play_iface(InterfaceSounds::GENERAL_FAIL);
-
+		gamesnd_play_iface(SND_GENERAL_FAIL);
+	
 	h = Cutscene_list_coords[gr_screen.res][3] / gr_get_font_height();
-	if (Selected_line >= Scroll_offset + h)
-	{
+	if (Selected_line >= Scroll_offset + h){
 		Scroll_offset++;
 	}
 }
@@ -318,21 +372,18 @@ void cutscenes_screen_scroll_screen_up()
 {
 	int h;

-	if (Scroll_offset)
-	{
+	if (Scroll_offset) {
 		Scroll_offset--;
 		Assert(Selected_line > Scroll_offset);
 		h = Cutscene_list_coords[gr_screen.res][3] / gr_get_font_height();
-		while (Selected_line >= Scroll_offset + h)
-		{
+		while (Selected_line >= Scroll_offset + h){
 			Selected_line--;
 		}

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

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

@@ -341,37 +392,33 @@ void cutscenes_screen_scroll_screen_down()
 	int h;

 	h = Cutscene_list_coords[gr_screen.res][3] / gr_get_font_height();
-	if (Scroll_offset + h < (int) Cutscene_list.size())
-	{
+	if (Scroll_offset + h < (int)Cutscene_list.size()) {
 		Scroll_offset++;
-		if (Selected_line < Scroll_offset)
-		{
+		if (Selected_line < Scroll_offset){
 			Selected_line = Scroll_offset;
 		}

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

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

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

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

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

 		case EXIT_BUTTON:
-			gamesnd_play_iface(InterfaceSounds::COMMIT_PRESSED);
+			gamesnd_play_iface(SND_COMMIT_PRESSED);
 			gameseq_post_event(GS_EVENT_MAIN_MENU);
 			game_flush();
 			break;
@@ -400,13 +447,12 @@ int cutscenes_screen_button_pressed(int n)
 void cutscenes_screen_init()
 {
 	int i;
-	ui_button_info* b;
+	ui_button_info *b;

 	Ui_window.create(0, 0, gr_screen.max_w_unscaled, gr_screen.max_h_unscaled, 0);
 	Ui_window.set_mask_bmap(Cutscene_mask_name[gr_screen.res]);

-	for (i = 0; i < NUM_BUTTONS; i++)
-	{
+	for (i=0; i<NUM_BUTTONS; i++) {
 		b = &Buttons[gr_screen.res][i];

 		b->button.create(&Ui_window, "", b->x, b->y, 60, 30, (i < 2), 1);
@@ -417,17 +463,15 @@ void cutscenes_screen_init()
 	}

 	// add xstrs
-	for (i = 0; i < NUM_CUTSCENE_TEXT; i++)
-	{
+	for(i=0; i<NUM_CUTSCENE_TEXT; i++){
 		Ui_window.add_XSTR(&Cutscene_text[gr_screen.res][i]);
 	}

 	Buttons[gr_screen.res][EXIT_BUTTON].button.set_hotkey(KEY_CTRLED | KEY_ENTER);
 	Buttons[gr_screen.res][SCROLL_UP_BUTTON].button.set_hotkey(KEY_PAGEUP);
-	Buttons[gr_screen.res][SCROLL_DOWN_BUTTON].button.set_hotkey(KEY_PAGEDOWN);
+	Buttons[gr_screen.res][SCROLL_DOWN_BUTTON].button.set_hotkey(KEY_PAGEDOWN);	

-	List_region.create(&Ui_window, "", Cutscene_list_coords[gr_screen.res][0], Cutscene_list_coords[gr_screen.res][1],
-					   Cutscene_list_coords[gr_screen.res][2], Cutscene_list_coords[gr_screen.res][3], 0, 1);
+	List_region.create(&Ui_window, "", Cutscene_list_coords[gr_screen.res][0], Cutscene_list_coords[gr_screen.res][1], Cutscene_list_coords[gr_screen.res][2], Cutscene_list_coords[gr_screen.res][3], 0, 1);
 	List_region.hide();

 	// set up hotkeys for buttons so we draw the correct animation frame when a key is pressed
@@ -438,13 +482,11 @@ void cutscenes_screen_init()
 	Scroll_offset = Selected_line = 0;
 	Description_index = -1;

-	Cutscene_list.clear();
-
+    Cutscene_list.clear();
+	
 	int u = 0;
-	for (SCP_vector<cutscene_info>::iterator cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut, u++)
-	{
-		if ((*cut).viewable)
-		{
+	for (SCP_vector<cutscene_info>::iterator cut = Cutscenes.begin(); cut != Cutscenes.end(); ++cut, u++) {
+		if ( (*cut).viewable ) {
 			Cutscene_list.push_back(u);
 		}
 	}
@@ -465,8 +507,7 @@ void cutscenes_screen_do_frame()
 	int select_tease_line = -1;

 	k = Ui_window.process();
-	switch (k)
-	{
+	switch (k) {
 		case KEY_DOWN:  // select next line
 			cutscenes_screen_scroll_line_down();
 			break;
@@ -501,117 +542,96 @@ void cutscenes_screen_do_frame()
 			gameseq_post_event(GS_EVENT_OPTIONS_MENU);
 			break;

-			// the "show-all" hotkey
+		// the "show-all" hotkey
 		case KEY_CTRLED | KEY_SHIFTED | KEY_S:
 		{
-			Cutscene_list.clear();
+            Cutscene_list.clear();
 			size_t size = Cutscenes.size();
-			for (size_t t = 0; t < size; t++)
-			{
-				Cutscene_list.push_back((int) t);
+			for (size_t t = 0; t < size; t++) {
+                Cutscene_list.push_back((int)t);
 			}

 			break;
 		}
-	}    // end switch
+	}	// end switch

-	for (i = 0; i < NUM_BUTTONS; i++)
-	{
-		if (Buttons[gr_screen.res][i].button.pressed())
-		{
-			if (cutscenes_screen_button_pressed(i))
-			{
+	for (i=0; i<NUM_BUTTONS; i++){
+		if (Buttons[gr_screen.res][i].button.pressed()){
+			if (cutscenes_screen_button_pressed(i)){
 				return;
 			}
 		}
 	}

-	if (List_region.button_down())
-	{
+	if (List_region.button_down()) {
 		List_region.get_mouse_pos(NULL, &y);
 		z = Scroll_offset + y / font_height;
-		if ((z >= 0) && (z < (int) Cutscene_list.size()))
+		if ((z >= 0) && (z < (int)Cutscene_list.size()))
 			select_tease_line = z;
 	}
-
-	if (List_region.pressed())
-	{
+	
+	if (List_region.pressed()) {
 		List_region.get_mouse_pos(NULL, &y);
 		z = Scroll_offset + y / font_height;
-		if ((z >= 0) && (z < (int) Cutscene_list.size()))
+		if ((z >= 0) && (z < (int)Cutscene_list.size()))
 			Selected_line = z;
 	}

 	GR_MAYBE_CLEAR_RES(Background_bitmap);
-	if (Background_bitmap >= 0)
-	{
+	if (Background_bitmap >= 0) {
 		gr_set_bitmap(Background_bitmap);
 		gr_bitmap(0, 0, GR_RESIZE_MENU);
-	}
+	} 

 	Ui_window.draw();

-	for (i = TECH_DATABASE_BUTTON; i <= CREDITS_BUTTON; i++)
-	{
-		if (Buttons[gr_screen.res][i].button.button_down())
-		{
+	for (i=TECH_DATABASE_BUTTON; i<=CREDITS_BUTTON; i++){
+		if (Buttons[gr_screen.res][i].button.button_down()){
 			break;
 		}
 	}

-	if (i > CREDITS_BUTTON)
-	{
+	if (i > CREDITS_BUTTON){
 		Buttons[gr_screen.res][CUTSCENES_BUTTON].button.draw_forced(2);
 	}

 	y = 0;
 	z = Scroll_offset;
-	while (y + font_height <= Cutscene_list_coords[gr_screen.res][3])
-	{
-		if (z >= (int) Cutscene_list.size())
-		{
+	while (y + font_height <= Cutscene_list_coords[gr_screen.res][3]) {
+		if (z >= (int)Cutscene_list.size()){
 			break;
 		}

-		if (z == Selected_line)
-		{
+		if (z == Selected_line){
 			gr_set_color_fast(&Color_text_selected);
-		} else if (z == select_tease_line)
-		{
+		} else if (z == select_tease_line) {
 			gr_set_color_fast(&Color_text_subselected);
-		} else
-		{
+		} else {
 			gr_set_color_fast(&Color_text_normal);
 		}

-		gr_printf_menu(Cutscene_list_coords[gr_screen.res][0], Cutscene_list_coords[gr_screen.res][1] + y,
-					   "%s", Cutscenes[Cutscene_list[z]].name);
+		gr_printf_menu(Cutscene_list_coords[gr_screen.res][0], Cutscene_list_coords[gr_screen.res][1] + y, Cutscenes[Cutscene_list[z]].name);

 		y += font_height;
 		z++;
 	}

-	if (Description_index != Selected_line)
-	{
-		char* src = NULL;
+	if (Description_index != Selected_line) {
+		char *src = NULL;

 		Description_index = Selected_line;
 		Text_size = 0;
-		if (Description_index < (int) Cutscene_list.size() &&
-			(int) Cutscene_list[Description_index] < (int) Cutscenes.size())
-		{
+		if ( Description_index < (int)Cutscene_list.size( ) &&
+			 (int)Cutscene_list[ Description_index ] < (int)Cutscenes.size( ) ) {
 			src = Cutscenes[Cutscene_list[Description_index]].description;
-			if (src)
-			{
-				Text_size = split_str(src, Cutscene_desc_coords[gr_screen.res][2], Text_line_size, Text_lines,
-									  Cutscene_max_text_lines[gr_screen.res]);
+			if (src) {
+				Text_size = split_str(src, Cutscene_desc_coords[gr_screen.res][2], Text_line_size, Text_lines, Cutscene_max_text_lines[gr_screen.res]);
 				Assert(Text_size >= 0 && Text_size < Cutscene_max_text_lines[gr_screen.res]);
 			}
 		}
 	}

-	if (Description_index >= 0)
-	{
+	if (Description_index >= 0) {
 		int len;
 		char line[MAX_TEXT_LINE_LEN + 1];

@@ -619,9 +639,8 @@ void cutscenes_screen_do_frame()

 		y = 0;
 		z = Text_offset;
-		while (y + font_height <= Cutscene_desc_coords[gr_screen.res][3])
-		{
-			if (z >= Text_size || z >= MAX_TEXT_LINES - 1)
+		while (y + font_height <= Cutscene_desc_coords[gr_screen.res][3]) {
+			if (z >= Text_size || z >= MAX_TEXT_LINES-1)
 				break;

 			len = Text_line_size[z];
@@ -630,8 +649,7 @@ void cutscenes_screen_do_frame()

 			strncpy(line, Text_lines[z], len);
 			line[len] = 0;
-			gr_string(Cutscene_desc_coords[gr_screen.res][0], Cutscene_desc_coords[gr_screen.res][1] + y, line,
-					  GR_RESIZE_MENU);
+			gr_string(Cutscene_desc_coords[gr_screen.res][0], Cutscene_desc_coords[gr_screen.res][1] + y, line, GR_RESIZE_MENU);

 			y += font_height;
 			z++;
@@ -13,33 +13,25 @@
 #include "globalincs/globals.h"
 #include "globalincs/pstypes.h"

-typedef struct cutscene_info
-{
-	char filename[MAX_FILENAME_LEN];
-	char name[NAME_LENGTH];
-	char* description;
-	bool viewable;
+typedef struct cutscene_info {
+	char	filename[MAX_FILENAME_LEN];
+	char	name[NAME_LENGTH];
+	char	*description;
+	int		cd;
+	bool	viewable;
 } cutscene_info;

-#if SCP_COMPILER_IS_GNU
-#pragma GCC diagnostic push
-// This suppresses a GCC bug where it thinks that the Cutscenes from the enum class below shadows a global variable
-#pragma GCC diagnostic ignored "-Wshadow"
-#endif
 extern SCP_vector<cutscene_info> Cutscenes;
-#if SCP_COMPILER_IS_GNU
-#pragma GCC diagnostic pop
-#endif

 // initializa table data
 void cutscene_init();
+int cutscene_get_cd_num(char *filename);

 void cutscenes_screen_init();
-
 void cutscenes_screen_close();
-
 void cutscenes_screen_do_frame();

-void cutscene_mark_viewable(const char* filename);
+int cutscenes_validate_cd(char *mve_name, int prompt_for_cd = 1);
+void cutscene_mark_viewable(char *filename);

 #endif
@@ -0,0 +1,570 @@
+
+
+#include "globalincs/pstypes.h"
+
+extern int g_width, g_height;
+extern void *g_vBackBuf1, *g_vBackBuf2;
+
+/* 16 bit decoding routines */
+
+static ushort *backBuf1, *backBuf2;
+static int lookup_initialized;
+
+static void dispatchDecoder16(ushort **pFrame, ubyte codeType, ubyte **pData, ubyte **pOffData, int *pDataRemain, int *curXb, int *curYb);
+static void genLoopkupTable();
+
+void decodeFrame16(ubyte *pFrame, ubyte *pMap, int mapRemain, unsigned char *pData, int dataRemain)
+{
+	ubyte *pOrig, *pOffData, op;
+	ushort offset;
+	int length = 0, i, j, xb, yb;
+
+	if (!lookup_initialized) {
+		genLoopkupTable();
+	}
+
+	backBuf1 = (ushort *)g_vBackBuf1;
+	backBuf2 = (ushort *)g_vBackBuf2;
+
+	xb = g_width >> 3;
+	yb = g_height >> 3;
+
+	offset = pData[0]|(pData[1]<<8);
+
+	pOffData = pData + offset;
+
+	pData += 2;
+
+	pOrig = pData;
+	length = offset - 2; /*dataRemain-2;*/
+
+	for (j=0; j<yb; j++) {
+		for (i=0; i<xb/2; i++) {
+			op = (*pMap) & 0xf;
+			dispatchDecoder16((ushort **)&pFrame, op, &pData, &pOffData, &dataRemain, &i, &j);
+
+			op = ((*pMap) >> 4) & 0xf;
+			dispatchDecoder16((ushort **)&pFrame, op, &pData, &pOffData, &dataRemain, &i, &j);
+
+			pMap++;
+			mapRemain--;
+		}
+
+		pFrame += 7*g_width*2;
+	}
+
+	if ((length-(pData-pOrig)) != 0) {
+		nprintf(("MVE", "DEBUG: junk left over: " PTRDIFF_T_ARG ",%d," PTRDIFF_T_ARG "\n",
+			(pData-pOrig), length, (length-(pData-pOrig))));
+	}
+}
+
+static ushort GETPIXEL(unsigned char **buf, int off)
+{
+	ushort val = (*buf)[0+off] | ((*buf)[1+off] << 8);
+	return val;
+}
+
+static ushort GETPIXELI(unsigned char **buf, int off)
+{
+	ushort val = (*buf)[0+off] | ((*buf)[1+off] << 8);
+	(*buf) += 2;
+	return val;
+}
+
+static void relClose(int i, int *x, int *y)
+{
+	int ma, mi;
+
+	ma = i >> 4;
+	mi = i & 0xf;
+
+	*x = mi - 8;
+	*y = ma - 8;
+}
+
+static void relFar(int i, int sign, int *x, int *y)
+{
+	if (i < 56) {
+		*x = sign * (8 + (i % 7));
+		*y = sign *	  (i / 7);
+	} else {
+		*x = sign * (-14 + (i - 56) % 29);
+		*y = sign *   (8 + (i - 56) / 29);
+	}
+}
+
+static int close_table[512];
+static int far_p_table[512];
+static int far_n_table[512];
+
+static void genLoopkupTable()
+{
+	int i;
+	int x, y;
+
+	for (i = 0; i < 256; i++) {
+		relClose(i, &x, &y);
+
+		close_table[i*2+0] = x;
+		close_table[i*2+1] = y;
+
+		relFar(i, 1, &x, &y);
+
+		far_p_table[i*2+0] = x;
+		far_p_table[i*2+1] = y;
+
+		relFar(i, -1, &x, &y);
+
+		far_n_table[i*2+0] = x;
+		far_n_table[i*2+1] = y;
+	}
+
+	lookup_initialized = 1;
+}
+
+static void copyFrame(ushort *pDest, ushort *pSrc)
+{
+	int i;
+
+	for (i=0; i<8; i++) {
+		memcpy(pDest, pSrc, 16);
+		pDest += g_width;
+		pSrc += g_width;
+	}
+}
+
+static void patternRow4Pixels(ushort *pFrame, unsigned char pat0, unsigned char pat1, ushort *p)
+{
+	ushort mask=0x0003;
+	ushort shift=0;
+	ushort pattern = (pat1 << 8) | pat0;
+
+	while (mask != 0) {
+		*pFrame++ = p[(mask & pattern) >> shift];
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+static void patternRow4Pixels2(ushort *pFrame, unsigned char pat0, ushort *p)
+{
+	unsigned char mask=0x03;
+	unsigned char shift=0;
+	ushort pel;
+
+	while (mask != 0) {
+		pel = p[(mask & pat0) >> shift];
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame[g_width + 0] = pel;
+		pFrame[g_width + 1] = pel;
+		pFrame += 2;
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+static void patternRow4Pixels2x1(ushort *pFrame, unsigned char pat, ushort *p)
+{
+	unsigned char mask=0x03;
+	unsigned char shift=0;
+	ushort pel;
+
+	while (mask != 0) {
+		pel = p[(mask & pat) >> shift];
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame += 2;
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+static void patternQuadrant4Pixels(ushort *pFrame, unsigned char pat0, unsigned char pat1, unsigned char pat2, unsigned char pat3, ushort *p)
+{
+	unsigned long mask = 0x00000003UL;
+	int shift=0;
+	int i;
+	unsigned long pat = (pat3 << 24) | (pat2 << 16) | (pat1 << 8) | pat0;
+
+	for (i=0; i<16; i++) {
+		pFrame[i&3] = p[(pat & mask) >> shift];
+		if ((i&3) == 3) {
+			pFrame += g_width;
+		}
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+static void patternRow2Pixels(ushort *pFrame, unsigned char pat, ushort *p)
+{
+	unsigned char mask=0x01;
+
+	while (mask != 0) {
+		*pFrame++ = p[(mask & pat) ? 1 : 0];
+		mask <<= 1;
+	}
+}
+
+static void patternRow2Pixels2(ushort *pFrame, unsigned char pat, ushort *p)
+{
+	ushort pel;
+	unsigned char mask=0x1;
+
+	while (mask != 0x10) {
+		pel = p[(mask & pat) ? 1 : 0];
+
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame[g_width + 0] = pel;
+		pFrame[g_width + 1] = pel;
+		pFrame += 2;
+
+		mask <<= 1;
+	}
+}
+
+static void patternQuadrant2Pixels(ushort *pFrame, unsigned char pat0, unsigned char pat1, ushort *p)
+{
+	ushort mask = 0x0001;
+	int i;
+	ushort pat = (pat1 << 8) | pat0;
+
+	for (i=0; i<16; i++) {
+		pFrame[i&3] = p[(pat & mask) ? 1 : 0];
+		if ((i&3) == 3) {
+			pFrame += g_width;
+		}
+		mask <<= 1;
+	}
+
+}
+
+static void dispatchDecoder16(ushort **pFrame, unsigned char codeType, unsigned char **pData, unsigned char **pOffData, int *pDataRemain, int *curXb, int *curYb)
+{
+	ushort p[4];
+	unsigned char pat[16];
+	int i, j, k;
+	int x, y;
+	ushort *pDstBak;
+
+	pDstBak = *pFrame;
+
+	switch(codeType) {
+		case 0x0:
+			copyFrame(*pFrame, *pFrame + (backBuf2 - backBuf1));
+		break; // ADDED
+
+		case 0x1:
+		break;
+
+		case 0x2:
+			k = *(*pOffData)++;
+			x = far_p_table[k*2+0];
+			y = far_p_table[k*2+1];
+			copyFrame(*pFrame, *pFrame + x + y*g_width);
+			(*pDataRemain)--;
+		break;
+
+		case 0x3:
+			k = *(*pOffData)++;
+			x = far_n_table[k*2+0];
+			y = far_n_table[k*2+1];
+			copyFrame(*pFrame, *pFrame + x + y*g_width);
+			(*pDataRemain)--;
+		break;
+
+		case 0x4:
+			k = *(*pOffData)++;
+			x = close_table[k*2+0];
+			y = close_table[k*2+1];
+			copyFrame(*pFrame, *pFrame + (backBuf2 - backBuf1) + x + y*g_width);
+			(*pDataRemain)--;
+		break;
+
+		case 0x5:
+			x = (char)*(*pData)++;
+			y = (char)*(*pData)++;
+			copyFrame(*pFrame, *pFrame + (backBuf2 - backBuf1) + x + y*g_width);
+			*pDataRemain -= 2;
+		break;
+
+		case 0x6:
+			nprintf(("MVE", "STUB: encoding 6 not tested\n"));
+			for (i=0; i<2; i++) {
+				*pFrame += 16;
+				if (++*curXb == (g_width >> 3)) {
+					*pFrame += 7*g_width;
+					*curXb = 0;
+					if (++*curYb == (g_height >> 3)) {
+						return;
+					}
+				}
+			}
+		break;
+
+		case 0x7:
+			p[0] = GETPIXELI(pData, 0);
+			p[1] = GETPIXELI(pData, 0);
+			if (!((p[0]/*|p[1]*/)&0x8000)) {
+				for (i=0; i<8; i++) {
+					patternRow2Pixels(*pFrame, *(*pData), p);
+					(*pData)++;
+					*pFrame += g_width;
+				}
+			} else {
+				for (i=0; i<2; i++) {
+					patternRow2Pixels2(*pFrame, *(*pData) & 0xf, p);
+					*pFrame += 2*g_width;
+					patternRow2Pixels2(*pFrame, *(*pData) >> 4, p);
+					(*pData)++;
+					*pFrame += 2*g_width;
+				}
+			}
+		break;
+
+		case 0x8:
+			p[0] = GETPIXEL(pData, 0);
+			if (!(p[0] & 0x8000)) {
+				for (i=0; i<4; i++) {
+					p[0] = GETPIXELI(pData, 0);
+					p[1] = GETPIXELI(pData, 0);
+					pat[0] = (*pData)[0];
+					pat[1] = (*pData)[1];
+					(*pData) += 2;
+					patternQuadrant2Pixels(*pFrame, pat[0], pat[1], p);
+					if (i & 1) {
+						*pFrame -= (4*g_width - 4);
+					} else {
+						*pFrame += 4*g_width;
+					}
+				}
+			} else {
+				p[2] = GETPIXEL(pData, 8);
+				if (!(p[2]&0x8000)) {
+					for (i=0; i<4; i++) {
+						if ((i & 1) == 0) {
+							p[0] = GETPIXELI(pData, 0);
+							p[1] = GETPIXELI(pData, 0);
+						}
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+						patternQuadrant2Pixels(*pFrame, pat[0], pat[1], p);
+						if (i & 1) {
+							*pFrame -= (4*g_width - 4);
+						} else {
+							*pFrame += 4*g_width;
+						}
+					}
+				} else {
+					for (i=0; i<8; i++) {
+						if ((i & 3) == 0) {
+							p[0] = GETPIXELI(pData, 0);
+							p[1] = GETPIXELI(pData, 0);
+						}
+						patternRow2Pixels(*pFrame, *(*pData), p);
+						(*pData)++;
+						*pFrame += g_width;
+					}
+				}
+			}
+		break;
+
+		case 0x9:
+			p[0] = GETPIXELI(pData, 0);
+			p[1] = GETPIXELI(pData, 0);
+			p[2] = GETPIXELI(pData, 0);
+			p[3] = GETPIXELI(pData, 0);
+			*pDataRemain -= 8;
+			if (!(p[0] & 0x8000)) {
+				if (!(p[2] & 0x8000)) {
+					for (i=0; i<8; i++) {
+						pat[0] = (*pData)[0];
+						pat[1] = (*pData)[1];
+						(*pData) += 2;
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+					*pDataRemain -= 16;
+				} else {
+					patternRow4Pixels2(*pFrame, (*pData)[0], p);
+					*pFrame += 2*g_width;
+					patternRow4Pixels2(*pFrame, (*pData)[1], p);
+					*pFrame += 2*g_width;
+					patternRow4Pixels2(*pFrame, (*pData)[2], p);
+					*pFrame += 2*g_width;
+					patternRow4Pixels2(*pFrame, (*pData)[3], p);
+					(*pData) += 4;
+					*pDataRemain -= 4;
+				}
+			} else {
+				if (!(p[2] & 0x8000))  {
+					for (i=0; i<8; i++) {
+						pat[0] = (*pData)[0];
+						(*pData) += 1;
+						patternRow4Pixels2x1(*pFrame, pat[0], p);
+						*pFrame += g_width;
+					}
+					*pDataRemain -= 8;
+				} else {
+					for (i=0; i<4; i++) {
+						pat[0] = (*pData)[0];
+						pat[1] = (*pData)[1];
+						(*pData) += 2;
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+					*pDataRemain -= 8;
+				}
+			}
+		break;
+
+		case 0xa:
+			p[0] = GETPIXEL(pData, 0);
+			if (!(p[0] & 0x8000)) {
+				for (i=0; i<4; i++) {
+					p[0] = GETPIXELI(pData, 0);
+					p[1] = GETPIXELI(pData, 0);
+					p[2] = GETPIXELI(pData, 0);
+					p[3] = GETPIXELI(pData, 0);
+					pat[0] = (*pData)[0];
+					pat[1] = (*pData)[1];
+					pat[2] = (*pData)[2];
+					pat[3] = (*pData)[3];
+					(*pData) += 4;
+					patternQuadrant4Pixels(*pFrame, pat[0], pat[1], pat[2], pat[3], p);
+					if (i & 1) {
+						*pFrame -= (4*g_width - 4);
+					} else {
+						*pFrame += 4*g_width;
+					}
+				}
+			} else {
+				p[0] = GETPIXEL(pData, 16);
+				if (!(p[0] & 0x8000)) {
+					for (i=0; i<4; i++) {
+						if ((i&1) == 0) {
+							p[0] = GETPIXELI(pData, 0); 
+							p[1] = GETPIXELI(pData, 0);
+							p[2] = GETPIXELI(pData, 0);
+							p[3] = GETPIXELI(pData, 0);
+						}
+						pat[0] = (*pData)[0];
+						pat[1] = (*pData)[1];
+						pat[2] = (*pData)[2];
+						pat[3] = (*pData)[3];
+						(*pData) += 4;
+						patternQuadrant4Pixels(*pFrame, pat[0], pat[1], pat[2], pat[3], p);
+						if (i & 1) {
+							*pFrame -= (4*g_width - 4);
+						} else {
+							*pFrame += 4*g_width;
+						}
+					}
+				} else {
+					for (i=0; i<8; i++) {
+						if ((i&3) == 0) {
+							p[0] = GETPIXELI(pData, 0);
+							p[1] = GETPIXELI(pData, 0);
+							p[2] = GETPIXELI(pData, 0);
+							p[3] = GETPIXELI(pData, 0);
+						}
+						pat[0] = (*pData)[0];
+						pat[1] = (*pData)[1];
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+						(*pData) += 2;
+					}
+				}
+			}
+		break;
+
+		case 0xb:
+			for (i=0; i<8; i++) {
+#if BYTE_ORDER == BIG_ENDIAN
+				ubyte frame_tmp[16];
+				memcpy(&frame_tmp, *pData, 16);
+				ushort *swap_tmp;
+				for (j = 0; j < 16; j += 2) {
+					swap_tmp = (ushort*)(frame_tmp + j);
+					*swap_tmp = INTEL_SHORT(*swap_tmp);
+				}
+				memcpy(*pFrame, &frame_tmp, 16);
+#else
+				memcpy(*pFrame, *pData, 16);
+#endif
+				*pFrame += g_width;
+				*pData += 16;
+				*pDataRemain -= 16;
+			}
+		break;
+
+		case 0xc:
+			for (i=0; i<4; i++) {
+				p[0] = GETPIXEL(pData, 0);
+				p[1] = GETPIXEL(pData, 2);
+				p[2] = GETPIXEL(pData, 4);
+				p[3] = GETPIXEL(pData, 6);
+				for (j=0; j<2; j++) {
+					for (k=0; k<4; k++) {
+						(*pFrame)[2*k] = p[k];
+						(*pFrame)[2*k+1] = p[k];
+					}
+					*pFrame += g_width;
+				}
+				*pData += 8;
+				*pDataRemain -= 8;
+			}
+		break;
+
+		case 0xd:
+			for (i=0; i<2; i++) {
+				p[0] = GETPIXEL(pData, 0);
+				p[1] = GETPIXEL(pData, 2);
+				for (j=0; j<4; j++) {
+					for (k=0; k<4; k++) {
+						(*pFrame)[k*g_width+j] = p[0];
+						(*pFrame)[k*g_width+j+4] = p[1];
+					}
+				}
+				*pFrame += 4*g_width;
+				*pData += 4;
+				*pDataRemain -= 4;
+			}
+		break;
+
+		case 0xe:
+			p[0] = GETPIXEL(pData, 0);
+			for (i = 0; i < 8; i++) {
+				for (j = 0; j < 8; j++) {
+					(*pFrame)[j] = p[0];
+				}
+				*pFrame += g_width;
+			}
+			*pData += 2;
+			*pDataRemain -= 2;
+		break;
+
+		case 0xf:
+			p[0] = GETPIXEL(pData, 0);
+			p[1] = GETPIXEL(pData, 1);
+			for (i=0; i<8; i++) {
+				for (j=0; j<8; j++) {
+					(*pFrame)[j] = p[(i+j)&1];
+				}
+				*pFrame += g_width;
+			}
+			*pData += 4;
+			*pDataRemain -= 4;
+		break;
+
+		default:
+	break;
+	}
+
+	*pFrame = pDstBak+8;
+}
@@ -0,0 +1,533 @@
+
+
+#include "globalincs/pstypes.h"
+
+
+extern int g_width, g_height;
+extern void *g_vBackBuf1, *g_vBackBuf2;
+
+static void dispatchDecoder8(ubyte **pFrame, ubyte codeType, ubyte **pData, int *pDataRemain, int *curXb, int *curYb);
+
+void decodeFrame8(ubyte *pFrame, ubyte *pMap, int mapRemain, ubyte *pData, int dataRemain)
+{
+	int i, j;
+	int xb, yb;
+
+	xb = g_width >> 3;
+	yb = g_height >> 3;
+
+	for (j = 0; j < yb; j++) {
+		for (i = 0; i < (xb / 2); i++) {
+			dispatchDecoder8(&pFrame, (*pMap) & 0xf, &pData, &dataRemain, &i, &j);
+
+			dispatchDecoder8(&pFrame, (*pMap) >> 4, &pData, &dataRemain, &i, &j);
+
+			pMap++;
+			mapRemain--;
+		}
+
+		pFrame += 7*g_width;
+	}
+}
+
+static void relClose(int i, int *x, int *y)
+{
+	int ma, mi;
+
+	ma = i >> 4;
+	mi = i & 0xf;
+
+	*x = mi - 8;
+	*y = ma - 8;
+}
+
+static void relFar(int i, int sign, int *x, int *y)
+{
+	if (i < 56) {
+		*x = sign * (8 + (i % 7));
+		*y = sign *      (i / 7);
+	} else {
+		*x = sign * (-14 + (i - 56) % 29);
+		*y = sign *   (8 + (i - 56) / 29);
+	}
+}
+
+/* copies an 8x8 block from pSrc to pDest.
+   pDest and pSrc are both g_width bytes wide */
+static void copyFrame(ubyte *pDest, ubyte *pSrc)
+{
+	int i;
+
+	for (i = 0; i < 8; i++) {
+		memcpy(pDest, pSrc, 8);
+		pDest += g_width;
+		pSrc += g_width;
+	}
+}
+
+// Fill in the next eight bytes with p[0], p[1], p[2], or p[3],
+// depending on the corresponding two-bit value in pat0 and pat1
+static void patternRow4Pixels(ubyte *pFrame, ubyte pat0, ubyte pat1, ubyte *p)
+{
+	ushort mask = 0x0003;
+	ushort shift = 0;
+	ushort pattern = (pat1 << 8) | pat0;
+
+	while (mask != 0) {
+		*pFrame++ = p[(mask & pattern) >> shift];
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+// Fill in the next four 2x2 pixel blocks with p[0], p[1], p[2], or p[3],
+// depending on the corresponding two-bit value in pat0.
+static void patternRow4Pixels2(ubyte *pFrame, ubyte pat0, ubyte *p)
+{
+	ubyte mask = 0x03;
+	ubyte shift = 0;
+	ubyte pel;
+
+	while (mask != 0) {
+		pel = p[(mask & pat0) >> shift];
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame[g_width + 0] = pel;
+		pFrame[g_width + 1] = pel;
+		pFrame += 2;
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+// Fill in the next four 2x1 pixel blocks with p[0], p[1], p[2], or p[3],
+// depending on the corresponding two-bit value in pat.
+static void patternRow4Pixels2x1(ubyte *pFrame, ubyte pat, ubyte *p)
+{
+	ubyte mask = 0x03;
+	ubyte shift = 0;
+	ubyte pel;
+
+	while (mask != 0) {
+		pel = p[(mask & pat) >> shift];
+		pFrame[0] = pel;
+		pFrame[1] = pel;
+		pFrame += 2;
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+// Fill in the next 4x4 pixel block with p[0], p[1], p[2], or p[3],
+// depending on the corresponding two-bit value in pat0, pat1, pat2, and pat3.
+static void patternQuadrant4Pixels(ubyte *pFrame, ubyte pat0, ubyte pat1, ubyte pat2, ubyte pat3, ubyte *p)
+{
+	unsigned long mask = 0x00000003UL;
+	int shift=0;
+	int i;
+	unsigned long pat = (pat3 << 24) | (pat2 << 16) | (pat1 << 8) | pat0;
+
+	for (i = 0; i < 16; i++) {
+		pFrame[i&3] = p[(pat & mask) >> shift];
+
+		if ( (i & 3) == 3 )
+			pFrame += g_width;
+
+		mask <<= 2;
+		shift += 2;
+	}
+}
+
+// fills the next 8 pixels with either p[0] or p[1], depending on pattern
+static void patternRow2Pixels(ubyte *pFrame, ubyte pat, ubyte *p)
+{
+	ubyte mask=0x01;
+
+	while (mask != 0) {
+		*pFrame++ = p[(mask & pat) ? 1 : 0];
+		mask <<= 1;
+	}
+}
+
+// fills the next four 2 x 2 pixel boxes with either p[0] or p[1], depending on pattern
+static void patternRow2Pixels2(ubyte *pFrame, ubyte pat, ubyte *p)
+{
+	ubyte pel;
+	ubyte mask=0x1;
+
+	while (mask != 0x10) {
+		pel = p[(mask & pat) ? 1 : 0];
+
+		pFrame[0] = pel;              // upper-left
+		pFrame[1] = pel;              // upper-right
+		pFrame[g_width + 0] = pel;    // lower-left
+		pFrame[g_width + 1] = pel;    // lower-right
+		pFrame += 2;
+
+		mask <<= 1;
+	}
+}
+
+// fills pixels in the next 4 x 4 pixel boxes with either p[0] or p[1], depending on pat0 and pat1.
+static void patternQuadrant2Pixels(ubyte *pFrame, ubyte pat0, ubyte pat1, ubyte *p)
+{
+	ubyte pel;
+	ushort mask = 0x0001;
+	int i, j;
+	ushort pat = (pat1 << 8) | pat0;
+
+	for (i = 0; i < 4; i++) {
+		for (j = 0; j < 4; j++) {
+			pel = p[(pat & mask) ? 1 : 0];
+
+			pFrame[j + i * g_width] = pel;
+
+			mask <<= 1;
+		}
+	}
+}
+
+static void dispatchDecoder8(ubyte **pFrame, ubyte codeType, ubyte **pData, int *pDataRemain, int *curXb, int *curYb)
+{
+	ubyte p[4];
+	ubyte pat[16];
+	int i, j, k;
+	int x, y;
+
+	switch(codeType) {
+		case 0x0:
+			copyFrame(*pFrame, *pFrame + ((ubyte *)g_vBackBuf2 - (ubyte *)g_vBackBuf1));
+			*pFrame += 8;
+			break;
+
+		case 0x1:
+			*pFrame += 8;
+			break;
+
+		case 0x2:
+			relFar(*(*pData)++, 1, &x, &y);
+			copyFrame(*pFrame, *pFrame + x + y*g_width);
+			*pFrame += 8;
+			(*pDataRemain)--;
+			break;
+
+		case 0x3:
+			relFar(*(*pData)++, -1, &x, &y);
+			copyFrame(*pFrame, *pFrame + x + y*g_width);
+			*pFrame += 8;
+			(*pDataRemain)--;
+			break;
+
+		case 0x4:
+			relClose(*(*pData)++, &x, &y);
+			copyFrame(*pFrame, *pFrame + ((ubyte *)g_vBackBuf2 - (ubyte *)g_vBackBuf1) + x + y*g_width);
+			*pFrame += 8;
+			(*pDataRemain)--;
+			break;
+
+		case 0x5:
+			x = (signed char)*(*pData)++;
+			y = (signed char)*(*pData)++;
+			copyFrame(*pFrame, *pFrame + ((ubyte *)g_vBackBuf2 - (ubyte *)g_vBackBuf1) + x + y*g_width);
+			*pFrame += 8;
+			*pDataRemain -= 2;
+			break;
+
+		case 0x6:
+			for (i = 0; i < 2; i++) {
+				*pFrame += 16;
+
+				if (++*curXb == (g_width >> 3)) {
+					*pFrame += 7*g_width;
+					*curXb = 0;
+
+					if (++*curYb == (g_height >> 3))
+						return;
+				}
+			}
+			break;
+
+		case 0x7:
+			p[0] = *(*pData)++;
+			p[1] = *(*pData)++;
+
+			if (p[0] <= p[1]) {
+				for (i = 0; i < 8; i++) {
+					patternRow2Pixels(*pFrame, *(*pData)++, p);
+					*pFrame += g_width;
+				}
+			} else {
+				for (i = 0; i < 2; i++) {
+					patternRow2Pixels2(*pFrame, *(*pData) & 0xf, p);
+					*pFrame += 2*g_width;
+
+					patternRow2Pixels2(*pFrame, *(*pData)++ >> 4, p);
+					*pFrame += 2*g_width;
+				}
+			}
+
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0x8:
+			if ( (*pData)[0] <= (*pData)[1] ) {
+				// four quadrant case
+				for (i = 0; i < 4; i++) {
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					pat[0] = *(*pData)++;
+					pat[1] = *(*pData)++;
+					patternQuadrant2Pixels(*pFrame, pat[0], pat[1], p);
+
+					// alternate between moving down and moving up and right
+					if (i & 1)
+						*pFrame += 4 - 4*g_width; // up and right
+					else
+						*pFrame += 4*g_width;     // down
+				}
+			} else if ( (*pData)[6] <= (*pData)[7] ) {
+				// split horizontal
+				for (i = 0; i < 4; i++) {
+					if ((i & 1) == 0) {
+						p[0] = *(*pData)++;
+						p[1] = *(*pData)++;
+					}
+
+					pat[0] = *(*pData)++;
+					pat[1] = *(*pData)++;
+					patternQuadrant2Pixels(*pFrame, pat[0], pat[1], p);
+
+					if (i & 1)
+						*pFrame -= (4*g_width - 4);
+					else
+						*pFrame += 4*g_width;
+				}
+			} else {
+				// split vertical
+				for (i = 0; i < 8; i++) {
+					if ((i & 3) == 0) {
+						p[0] = *(*pData)++;
+						p[1] = *(*pData)++;
+					}
+
+					patternRow2Pixels(*pFrame, *(*pData)++, p);
+					*pFrame += g_width;
+				}
+
+				*pFrame -= (8*g_width - 8);
+			}
+			break;
+
+		case 0x9:
+			if ( (*pData)[0] <= (*pData)[1] ) {
+				if ( (*pData)[2] <= (*pData)[3] ) {
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+
+					for (i = 0; i < 8; i++) {
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+
+					*pFrame -= (8*g_width - 8);
+				} else {
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+
+					patternRow4Pixels2(*pFrame, *(*pData)++, p);
+					*pFrame += 2*g_width;
+
+					patternRow4Pixels2(*pFrame, *(*pData)++, p);
+					*pFrame += 2*g_width;
+
+					patternRow4Pixels2(*pFrame, *(*pData)++, p);
+					*pFrame += 2*g_width;
+
+					patternRow4Pixels2(*pFrame, *(*pData)++, p);
+					*pFrame -= (6*g_width - 8);
+				}
+			} else {
+				if ( (*pData)[2] <= (*pData)[3] ) {
+					// draw 2x1 strips
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+
+					for (i = 0; i < 8; i++) {
+						pat[0] = *(*pData)++;
+
+						patternRow4Pixels2x1(*pFrame, pat[0], p);
+						*pFrame += g_width;
+					}
+
+					*pFrame -= (8*g_width - 8);
+				} else {
+					// draw 1x2 strips
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+
+					for (i = 0; i < 4; i++) {
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+
+					*pFrame -= (8*g_width - 8);
+				}
+			}
+			break;
+
+		case 0xa:
+			if ( (*pData)[0] <= (*pData)[1] ) {
+				for (i = 0; i < 4; i++) {
+					p[0] = *(*pData)++;
+					p[1] = *(*pData)++;
+					p[2] = *(*pData)++;
+					p[3] = *(*pData)++;
+					pat[0] = *(*pData)++;
+					pat[1] = *(*pData)++;
+					pat[2] = *(*pData)++;
+					pat[3] = *(*pData)++;
+
+					patternQuadrant4Pixels(*pFrame, pat[0], pat[1], pat[2], pat[3], p);
+
+					if (i & 1)
+						*pFrame -= (4*g_width - 4);
+					else
+						*pFrame += 4*g_width;
+				}
+			} else {
+				if ( (*pData)[12] <= (*pData)[13] ) {
+					// split vertical
+					for (i = 0; i < 4; i++) {
+						if ((i&1) == 0) {
+							p[0] = *(*pData)++;
+							p[1] = *(*pData)++;
+							p[2] = *(*pData)++;
+							p[3] = *(*pData)++;
+						}
+
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+						pat[2] = *(*pData)++;
+						pat[3] = *(*pData)++;
+
+						patternQuadrant4Pixels(*pFrame, pat[0], pat[1], pat[2], pat[3], p);
+
+						if (i & 1)
+							*pFrame -= (4*g_width - 4);
+						else
+							*pFrame += 4*g_width;
+					}
+				} else {
+					// split horizontal
+					for (i = 0; i < 8; i++) {
+						if ((i&3) == 0) {
+							p[0] = *(*pData)++;
+							p[1] = *(*pData)++;
+							p[2] = *(*pData)++;
+							p[3] = *(*pData)++;
+						}
+
+						pat[0] = *(*pData)++;
+						pat[1] = *(*pData)++;
+
+						patternRow4Pixels(*pFrame, pat[0], pat[1], p);
+						*pFrame += g_width;
+					}
+
+					*pFrame -= (8*g_width - 8);
+				}
+			}
+			break;
+
+		case 0xb:
+			for (i = 0; i < 8; i++) {
+				memcpy(*pFrame, *pData, 8);
+				*pFrame += g_width;
+				*pData += 8;
+				*pDataRemain -= 8;
+			}
+
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0xc:
+			for (i = 0; i < 4; i++) {
+				for (j = 0; j < 2; j++) {
+					for (k = 0; k < 4; k++) {
+						(*pFrame)[2*k]   = (*pData)[k];
+						(*pFrame)[2*k+1] = (*pData)[k];
+					}
+
+					*pFrame += g_width;
+				}
+
+				*pData += 4;
+				*pDataRemain -= 4;
+			}
+
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0xd:
+			for (i = 0; i < 2; i++) {
+				for (j = 0; j < 4; j++) {
+					for (k = 0; k < 4; k++) {
+						(*pFrame)[k*g_width+j] = (*pData)[0];
+						(*pFrame)[k*g_width+j+4] = (*pData)[1];
+					}
+				}
+
+				*pFrame += 4*g_width;
+				*pData += 2;
+				*pDataRemain -= 2;
+			}
+
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0xe:
+			for (i = 0; i < 8; i++) {
+				memset(*pFrame, **pData, 8);
+				*pFrame += g_width;
+			}
+
+			(*pData)++;
+			(*pDataRemain)--;
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		case 0xf:
+			for (i = 0; i < 8; i++) {
+				for (j = 0; j < 8; j++) {
+					(*pFrame)[j] = (*pData)[(i+j)&1];
+				}
+
+				*pFrame += g_width;
+			}
+
+			*pData += 2;
+			*pDataRemain -= 2;
+			*pFrame -= (8*g_width - 8);
+			break;
+
+		default:
+			break;
+	}
+}
@@ -1,230 +0,0 @@
-#include "cutscene/ffmpeg/AudioDecoder.h"
-
-#include "tracing/tracing.h"
-
-namespace {
-const int OUT_CH_LAYOUT = AV_CH_LAYOUT_STEREO;
-const int OUT_SAMPLE_RATE = 48000;
-const AVSampleFormat OUT_SAMPLE_FORMAT = AV_SAMPLE_FMT_S16;
-const int OUT_NUM_CHANNELS = av_get_channel_layout_nb_channels(OUT_CH_LAYOUT);
-
-const int DEFAULT_SRC_NUM_SAMPLES = 1024;
-
-SwrContext* getSWRContext(uint64_t layout, int rate, AVSampleFormat inFmt) {
-	auto swr = swr_alloc();
-
-	av_opt_set_int(swr, "in_channel_layout", layout, 0);
-	av_opt_set_int(swr, "in_sample_rate", rate, 0);
-	av_opt_set_int(swr, "in_sample_fmt", inFmt, 0);
-
-	av_opt_set_int(swr, "out_channel_layout", OUT_CH_LAYOUT, 0);
-	av_opt_set_int(swr, "out_sample_rate", OUT_SAMPLE_RATE, 0);
-	av_opt_set_int(swr, "out_sample_fmt", OUT_SAMPLE_FORMAT, 0);
-
-	swr_init(swr);
-
-	return swr;
-}
-
-int alloc_array_and_samples(uint8_t*** outData, int* linesize, int channels, int samples, AVSampleFormat format) {
-	auto planes = av_sample_fmt_is_planar(format) ? channels : 1;
-
-	*outData = reinterpret_cast<uint8_t**>(av_mallocz(planes * sizeof(**outData)));
-
-
-	auto ret = av_samples_alloc(*outData, linesize, channels, samples, format, 0);
-
-	if (ret < 0) {
-		av_freep(outData);
-	}
-
-	return ret;
-}
-
-int64_t getDelay(SwrContext* ctx, int64_t sampleRate) {
-#ifdef WITH_LIBAV
-	return avresample_get_delay(ctx);
-#else
-	return swr_get_delay(ctx, sampleRate);
-#endif
-}
-
-int resample_convert(SwrContext* ctx, uint8_t** output,
-					 int out_plane_size, int out_samples, uint8_t** input,
-					 int in_plane_size, int in_samples) {
-#ifdef WITH_LIBAV
-	return avresample_convert(ctx, output, out_plane_size, out_samples, input, in_plane_size, in_samples);
-#else
-	(void)out_plane_size;
-	(void)in_plane_size;
-
-	return swr_convert(ctx, output, out_samples, (const uint8_t**) input, in_samples);
-#endif
-}
-}
-
-namespace cutscene {
-namespace ffmpeg {
-AudioDecoder::AudioDecoder(DecoderStatus* status)
-	: FFMPEGStreamDecoder(status) {
-	m_audioBuffer.reserve(static_cast<size_t>(OUT_SAMPLE_RATE * OUT_NUM_CHANNELS / 2));
-
-	m_resampleCtx = getSWRContext(m_status->audioCodecPars.channel_layout, m_status->audioCodecPars.sample_rate,
-								  m_status->audioCodecPars.audio_format);
-
-	/*
-    * compute the number of converted samples: buffering is avoided
-    * ensuring that the output buffer will contain at least all the
-    * converted input samples
-    */
-	m_maxOutNumSamples = m_outNumSamples = static_cast<int>(av_rescale_rnd(DEFAULT_SRC_NUM_SAMPLES,
-																		   OUT_SAMPLE_RATE,
-																		   m_status->audioCodecPars.sample_rate,
-																		   AV_ROUND_UP));
-
-	auto ret = alloc_array_and_samples(&m_outData, &m_outLinesize, OUT_NUM_CHANNELS,
-									   m_outNumSamples, OUT_SAMPLE_FORMAT);
-
-	if (ret < 0) {
-		mprintf(("FFMPEG: Failed to allocate samples array!\n"));
-	}
-}
-
-AudioDecoder::~AudioDecoder() {
-	if (m_outData) {
-		av_freep(&m_outData[0]);
-	}
-	av_freep(&m_outData);
-
-	swr_free(&m_resampleCtx);
-}
-
-void AudioDecoder::flushAudioBuffer() {
-	if (m_audioBuffer.empty()) {
-		// Nothing to do here
-		return;
-	}
-
-	AudioFramePtr audioFrame(new AudioFrame());
-	audioFrame->channels = OUT_NUM_CHANNELS;
-	audioFrame->rate = OUT_SAMPLE_RATE;
-
-	audioFrame->audioData.assign(m_audioBuffer.begin(), m_audioBuffer.end());
-
-	pushFrame(std::move(audioFrame));
-	m_audioBuffer.clear();
-}
-
-void AudioDecoder::handleDecodedFrame(AVFrame* frame) {
-	/* compute destination number of samples */
-	m_outNumSamples = static_cast<int>(av_rescale_rnd(getDelay(m_resampleCtx, frame->sample_rate)
-														  + frame->nb_samples, OUT_SAMPLE_RATE, frame->sample_rate,
-													  AV_ROUND_UP));
-
-	if (m_outNumSamples > m_maxOutNumSamples) {
-		av_freep(&m_outData[0]);
-		auto ret = av_samples_alloc(m_outData, &m_outLinesize, OUT_NUM_CHANNELS, m_outNumSamples,
-									OUT_SAMPLE_FORMAT, 1);
-		if (ret < 0) {
-			mprintf(("FFMPEG: Failed to allocate samples!!!"));
-			return;
-		}
-
-		m_maxOutNumSamples = m_outNumSamples;
-	}
-
-	/* convert to destination format */
-	auto ret = resample_convert(m_resampleCtx, m_outData, 0, m_outNumSamples,
-								(uint8_t**) frame->data, 0, frame->nb_samples);
-	if (ret < 0) {
-		mprintf(("FFMPEG: Error while converting audio!\n"));
-		return;
-	}
-
-	auto outBufsize = av_samples_get_buffer_size(&m_outLinesize, OUT_NUM_CHANNELS, ret, OUT_SAMPLE_FORMAT, 1);
-	if (outBufsize < 0) {
-		mprintf(("FFMPEG: Could not get sample buffer size!\n"));
-		return;
-	}
-
-	auto begin = reinterpret_cast<short*>(m_outData[0]);
-	auto end = reinterpret_cast<short*>(m_outData[0] + outBufsize);
-
-	auto size = std::distance(begin, end);
-	auto newSize = m_audioBuffer.size() + size;
-
-	if (newSize <= m_audioBuffer.capacity()) {
-		// We haven't filled the buffer yet
-		m_audioBuffer.insert(m_audioBuffer.end(), begin, end);
-	} else {
-		flushAudioBuffer();
-		m_audioBuffer.assign(begin, end);
-	}
-}
-
-void AudioDecoder::decodePacket(AVPacket* packet) {
-	TRACE_SCOPE(tracing::CutsceneFFmpegAudioDecoder);
-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
-	int send_result;
-	do {
-		send_result = avcodec_send_packet(m_status->audioCodecCtx, packet);
-
-		while (avcodec_receive_frame(m_status->audioCodecCtx, m_decodeFrame) == 0) {
-			handleDecodedFrame(m_decodeFrame);
-		}
-	} while (send_result == AVERROR(EAGAIN));
-#else
-	int finishedFrame = 0;
-	auto err = avcodec_decode_audio4(m_status->audioCodecCtx, m_decodeFrame, &finishedFrame, packet);
-
-	if (err >= 0 && finishedFrame) {
-		handleDecodedFrame(m_decodeFrame);
-	}
-#endif
-}
-
-void AudioDecoder::finishDecoding() {
-	TRACE_SCOPE(tracing::CutsceneFFmpegAudioDecoder);
-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
-	// Send flush packet
-	avcodec_send_packet(m_status->audioCodecCtx, nullptr);
-
-	// Handle those decoders that have a delay
-	while (true) {
-		auto ret = avcodec_receive_frame(m_status->audioCodecCtx, m_decodeFrame);
-
-		if (ret == 0) {
-			handleDecodedFrame(m_decodeFrame);
-		}
-		else {
-			// Everything consumed or error
-			break;
-		}
-	}
-#else
-    // Handle those decoders that have a delay
-	AVPacket nullPacket;
-	memset(&nullPacket, 0, sizeof(nullPacket));
-	nullPacket.data = nullptr;
-	nullPacket.size = 0;
-
-	while (true) {
-		int finishedFrame = 1;
-		auto err = avcodec_decode_audio4(m_status->audioCodecCtx, m_decodeFrame, &finishedFrame, &nullPacket);
-
-		if (err < 0 || !finishedFrame) {
-			break;
-		}
-
-		handleDecodedFrame(m_decodeFrame);
-	}
-#endif
-
-	// Push the last bits of audio data into the queue
-	flushAudioBuffer();
-}
-void AudioDecoder::flushBuffers() {
-	avcodec_flush_buffers(m_status->audioCodecCtx);
-}
-}
-}
@@ -1,37 +0,0 @@
-#pragma once
-
-#include "cutscene/ffmpeg/internal.h"
-#include "cutscene/ffmpeg/FFMPEGDecoder.h"
-
-namespace cutscene {
-namespace ffmpeg {
-
-class AudioDecoder: public FFMPEGStreamDecoder<AudioFrame> {
- private:
-	SwrContext* m_resampleCtx;
-
-	uint8_t** m_outData;
-	int m_outLinesize;
-
-	int m_maxOutNumSamples;
-	int m_outNumSamples;
-
-	SCP_vector<short> m_audioBuffer;
-
-	void handleDecodedFrame(AVFrame* frame);
-
-	void flushAudioBuffer();
-
- public:
-	explicit AudioDecoder(DecoderStatus* status);
-
-	~AudioDecoder() override;
-
-	void decodePacket(AVPacket* packet) override;
-
-	void finishDecoding() override;
-
-	void flushBuffers() override;
-};
-}
-}
Author	SHA1	Message	Date
SirKnightly	262de3f621	Automated build commit	2016-07-22 11:58:40 +02:00
asarium	13d081d6c6	Move build system to CMake	2016-07-21 22:35:17 +02:00