"Fix" coverity_scan by reverting to old config

i.e. specify the compiler explicitly; otherwise the travis/coverity
integration doesn't know how to compile

.editorconfig

@@ -2,3 +2,6 @@ root = true
 
 [*.{h,cpp}]
 indent_style = tab
+
+[*.sdr]
+indent_style = tab

.gitignore

@@ -268,8 +268,21 @@ xcuserdata
 
 *.xccheckout
 
+####
+# Visual Studio Code
+.vscode
+
 ####
 # Documentation
 #
 documentation/doxygen/*
 !documentation/doxygen/.gitkeep
+
+
+.idea/*
+projects/*
+/.vs
+CMakeSettings.json
+
+# Weird files created by Linux
+.fuse_hidden*

.gitmodules

@@ -0,0 +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

.travis.yml

@@ -1,34 +1,53 @@
-language: cpp
-sudo: true
+language: generic
+sudo: required
+dist: trusty
+cache:
+    directories:
+    - $HOME/cmake
 addons:
     apt:
         packages:
+            - ninja-build
             - libopenal-dev
-            - libogg-dev
-            - libvorbis-dev
-            - build-essential
-            - automake
-            - autoconf
-            - libtheora-dev
             - libreadline6-dev
             - libpng12-dev
             - libjpeg62-dev
             - liblua5.1-0-dev
             - libjansson-dev
-            - libtool
+            - libsdl2-dev
+            - valgrind
     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"
+        build_command:   "ci/travis/script.sh"
         # 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: bintray
+      user: sirknightly
+      key:
+          secure: "CZtvDW/zPf1Nxru21i8Wd+9hgiBRA8VowWBX0gmCOGgRq9WHISttKQQmBWGHuyVZ3rYvtE4Va2bR+2qRN+TFNkUUuOCOQkdBJTCal9nS3G/LprEmsOashG0Q5PTfMMBnlKzKxaxGJW6UhFj2GySmHEAjsFLVpuNWGJeeZgZQ3UE="
+      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
+     #   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="
 matrix:
     include:
@@ -38,20 +57,20 @@ matrix:
           env: CONFIGURATION="Debug"
         - os: linux
           compiler: clang
-          env: CONFIGURATION="Debug"
+          env: CONFIGURATION="Debug" CC=clang CXX=clang++
         - os: osx
           compiler: clang
-          env: CONFIGURATION="Debug" MACOSX_ARCH=x86_64
+          env: CONFIGURATION="Debug"
 
         - os: linux
           compiler: gcc
           env: CONFIGURATION="Release"
         - os: linux
           compiler: clang
-          env: CONFIGURATION="Release"
+          env: CONFIGURATION="Release" CC=clang CXX=clang++
         - os: osx
           compiler: clang
-          env: CONFIGURATION="Release" MACOSX_ARCH=x86_64
+          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
@@ -59,10 +78,14 @@ before_install:
     # 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
-    - ./ci/travis/before_install.sh
+    - source "./ci/travis/check_release.sh"
+    - "./ci/travis/before_install.sh"
 install:
-    - ./ci/travis/install.sh
+    - "./ci/travis/install.sh"
+    - export PATH=$HOME/cmake/bin:$PATH
 before_script:
-    - ./ci/travis/before_script.sh
+    - "./ci/travis/before_script.sh"
 script:
-    - ./ci/travis/script.sh
+    - if [ "$BUILD_DEPLOYMENT" = true ] ; then ./ci/travis/release.sh ; else ./ci/travis/script.sh ; fi
+before_deploy:
+    - "./ci/travis/before_deploy.sh"

CMakeLists.txt

@@ -0,0 +1,187 @@
+
+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
+set_policy(CMP0051 OLD)
+set_policy(CMP0053 NEW)
+set_policy(CMP0054 NEW)
+
+SET(FSO_PROJECT_DESCRIPTION "Open source project based on the original FreeSpace 2 source code.")
+
+SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Executable output path")
+SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Library output path")
+
+# CMAKE_INSTALL_PREFIX is defined but also overwritten by the PROJECT command so we need to set it later
+IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
+	SET(RESET_INSTALL_PREFIX TRUE)
+ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
+
+# Reset this variable
+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)
+
+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/CMake")
+
+IF(RESET_INSTALL_PREFIX)
+	IF(NOT $ENV{FS2PATH} STREQUAL "")
+		IF(NOT IS_DIRECTORY $ENV{FS2PATH})
+			MESSAGE(WARNING "The path '$ENV{FS2PATH}' of the environment variable FS2PATH does not point to a directory! Install prefix wasn't set.")
+		ELSE(NOT IS_DIRECTORY $ENV{FS2PATH})
+			SET(CMAKE_INSTALL_PREFIX "$ENV{FS2PATH}" CACHE FILEPATH "Install path" FORCE)
+			FILE(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX} CMAKE_INSTALL_PREFIX)
+		ENDIF(NOT IS_DIRECTORY $ENV{FS2PATH})
+	ELSE(NOT $ENV{FS2PATH} STREQUAL "")
+		MESSAGE(STATUS "NO FS2PATH environment variable found, you can define this to point to your freespace install but it is not required.")
+	ENDIF(NOT $ENV{FS2PATH} STREQUAL "")
+ENDIF(RESET_INSTALL_PREFIX)
+
+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)
+	set(APPIMAGE_ASSISTANT "" CACHE STRING "The root directory of an AppImage clone.")
+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_WXFRED2 "Build wxFRED2 binary" OFF)
+
+IF(WIN32 OR APPLE)
+	# On windows and mac the default should be to always build the included libraries
+	SET(FSO_BUILD_INCLUDED_LIBS_DEFAULT ON)
+ELSE()
+	SET(FSO_BUILD_INCLUDED_LIBS_DEFAULT OFF)
+ENDIF()
+
+OPTION(FSO_BUILD_INCLUDED_LIBS "Build and use the included libraries istead of using the system headers and libraries" ${FSO_BUILD_INCLUDED_LIBS_DEFAULT})
+
+OPTION(FSO_USE_LUAJIT "Use LuaJIT for Lua scripting, needs a working internet connection!" OFF)
+
+OPTION(FSO_USE_OPENALSOFT "Download and build OpenAL Soft instead of using the system libraries" OFF)
+
+OPTION(FSO_FATAL_WARNINGS "Determines if warnings in the build are considered fatal errors, primarily used for CI" OFF)
+
+SET(FSO_FREESPACE_PATH "${CMAKE_INSTALL_PREFIX}" CACHE FILEPATH "The path of the FreeSpace directory you want to use. Please note that you will have to change CMAKE_INSTALL_PREFIX if you change this at some point.")
+
+SET(FSO_RUN_ARGUMENTS "" CACHE STRING "Additional arguments passed to a generated executable when run with the generated build files.")
+
+option(FSO_INSTALL_DEBUG_FILES "Install some debug files (currently only PDB files on windows)" OFF)
+
+MARK_AS_ADVANCED(FORCE FSO_CMAKE_DEBUG)
+MARK_AS_ADVANCED(FORCE FSO_BUILD_INCLUDED_LIBS)
+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 FSO_INSTALL_DEBUG_FILES)
+
+# Include cotire file from https://github.com/sakra/cotire/
+include(cotire)
+
+INCLUDE(globals)
+INCLUDE(toolchain)
+INCLUDE(platforms)
+include(version)
+
+INCLUDE(headers)
+
+SET(GENERATED_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated_source)
+
+include(generateHeaders)
+
+if(FSO_BUILD_APPIMAGE)
+	include(appimage)
+endif()
+
+# This includes source code for some tools, either used in the build or also for something else
+ADD_SUBDIRECTORY(tools)
+
+ADD_SUBDIRECTORY(lib)
+
+ADD_SUBDIRECTORY(code)
+
+ADD_SUBDIRECTORY(freespace2)
+
+IF(FSO_BUILD_FRED2)
+	ADD_SUBDIRECTORY(fred2)
+ENDIF(FSO_BUILD_FRED2)
+
+IF(FSO_BUILD_WXFRED2)
+	ADD_SUBDIRECTORY(wxfred2)
+ENDIF(FSO_BUILD_WXFRED2)
+
+if(FSO_BUILD_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(MSVC_USE_RUNTIME_DLL)
+	SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "${BINARY_DESTINATION}")
+
+	IF(FSO_BUILD_FRED2)
+		SET(CMAKE_INSTALL_MFC_LIBRARIES ON)
+	ENDIF(FSO_BUILD_FRED2)
+
+	INCLUDE(InstallRequiredSystemLibraries)
+ENDIF(MSVC_USE_RUNTIME_DLL)
+
+include(package)
+
+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}")
+elseif(UNIX)
+	message(STATUS "Building AppImage: ${FSO_BUILD_APPIMAGE}")
+ENDIF()
+message(STATUS "Building FSO tools: ${FSO_BUILD_TOOLS}")
+message(STATUS "Building wxFRED: ${FSO_BUILD_WXFRED2}")
+message(STATUS "Fatal warnings: ${FSO_FATAL_WARNINGS}")

Makefile.am

@@ -1,64 +0,0 @@
-# Makefile.am for fs2_open (top level)
-#
-# This file uses GNU Automake to generate makefiles
-
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = mongoose code
-
-
-EXTRA_DIST =	\
-	FS2OpenSCPReadMe.doc	\
-	projects/Xcode/English.lproj/InfoPlist.strings	\
-	projects/Xcode/FS2_Open.icns	\
-	projects/Xcode/FS2_Open.xcodeproj/project.pbxproj	\
-	projects/Xcode/Frameworks.tgz	\
-	projects/Xcode/Info-debug.plist	\
-	projects/Xcode/Info.plist	\
-	projects/Xcode/README.Xcode	\
-	projects/Xcode/SDLMain.h	\
-	projects/Xcode/SDLMain.m
-
-
-# D_ variants are defaults and should always be used
-AM_CXXFLAGS = -I./code @D_CFLAGS@
-AM_LDFLAGS = @D_LDFLAGS@
-
-EXTRA_PROGRAMS = cfilearchiver cfileextractor
-
-###############################################################################
-##
-## Begin utilitites
-##
-
-CPPSOURCES=$(wildcard code/*/*.cpp code/*/*.h)
-
-# cfilearchiver -- to create VPs
-cfilearchiver_SOURCES =	\
-	code/cfilearchiver/cfilearchiver.cpp
-
-# cfileextractor -- to extract files from VPs
-cfileextractor_SOURCES = \
-	code/cfileextractor/cfileextractor.cpp
-
-# catch all to build utilitites
-tools: cfilearchiver cfileextractor
-
-# cleaning
-clean-tools:
-	-test -z "$(EXTRA_PROGRAMS)" || rm -f $(EXTRA_PROGRAMS)
-
-## cppcheck    : check for many code issues
-cppcheck: ${CPPSOURCES}
-	cppcheck ${CPPSOURCES} --enable=all --platform=unix64 \
-	--std=c99 --inline-suppr --quiet
-
-##
-## End utilitites
-##
-###############################################################################
-
-
-# make sure we get this stuff cleaned up
-clean-generic: clean-tools
-

README

@@ -1,11 +0,0 @@
-The "projects" directory contains ready projects for:
-Microsoft Visual C++ 6
-Microsoft Visual C++ 2005
-Microsoft Visual C++ 2008
-Micrsofot Visual C++ 2010
-Apple Xcode
-Code::Blocks
-
-
-See the ChangeLog to see what's new.
-See the INSTALL file for instructions on how to build fs2_open.

README.md

@@ -1,19 +0,0 @@
-[![Coverity](https://scan.coverity.com/projects/870/badge.svg)](https://scan.coverity.com/projects/870)
-[![Build Status](https://travis-ci.org/scp-fs2open/fs2open.github.com.svg?branch=master)](https://travis-ci.org/scp-fs2open/fs2open.github.com)
-
-Welcome to Freespace Open!
-
-In 2002 Volition released the source code for Freespace2. In the years since dedicated individuals have added countless new features to create a flexible and powerful space combat simulation engine. More info can be found on our [wiki](http://www.hard-light.net/wiki/index.php/Source_Code_Project)
-
-People interested in contributing are encouraged to read [this thread](http://www.hard-light.net/forums/index.php?topic=82688.0)
-
-The "projects" directory contains ready projects for:
-* Microsoft Visual C++ 6, 2005, 2008, 2010, 2011, 2013, 2015
-* Apple Xcode
-* Code::Blocks
-* Eclipse
-
-
-Review the commit logs to see what's new.
-
-See the INSTALL file for instructions on how to build fs2_open, or open the relevant MSVC project

Readme.md

@@ -0,0 +1,42 @@
+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>
+<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>
+
+### Available variables to control the build
+* `FSO_BUILD_WXFRED2`: Build the wxfred2 project, requires wxWidgets
+* `FSO_FREESPACE_PATH`: Sets the path of your FreeSpace install, can be used to automatically run the generated executables with the correct working directory, this is an optional variable. By default this will use the value of the `FS2PATH` environment variable.
+* `FSO_BUILD_TOOLS`: Build some tools related to FSO
+* `CMAKE_BUILD_TYPE`: Sets the binary build type between `Debug` and `Release` (default)
+
+#### Windows only variables
+* `FSO_BUILD_FRED2`: Build FRED2, requires a Visual Studio version that ships with MFC
+* `FSO_USE_SPEECH`: Build a binary with text-to-speech support
+* `FSO_USE_VOICEREC`: Build a binary with voice recognition support
+
+#### Advanced variables
+You should only use these variables if you know what you're doing
+* `FSO_CMAKE_DEBUG`: Print CMake debugging informations
+* `FSO_BUILD_INCLUDED_LIBS`: Build libraries from the included source
+* `FSO_USE_OPENALSOFT`: Use [OpenALSoft](http://kcat.strangesoft.net/openal.html) for OpenAL support
+* `FSO_USE_LUAJIT`: Use [luajit](http://luajit.org/) as a replacement for lua
+* `FSO_DEVELOPMENT_MODE`: Toggles some development behavior, only use if you really need it.
+* `FSO_RUN_ARGUMENTS`: If you run an executable from within the project, these arguments will also be passed to the executable
+* `FSO_BUILD_POSTFIX`: Sets a postfix to be added to the executable name, may be useful for release candidates.
+
+#### Visual Studio specific variables
+* `MSVC_USE_RUNTIME_DLL`: Use the DLL version of the runtime, experimental and not well tested.
+* `MSVC_SIMD_INSTRUCTIONS`: The instruction set the executables will be optimized for.
+
+### Generating an installation package
+CMake can automatically generate installation packages of the project. To do this you will just need to run the `package` target of the build system and the package will be placed inside your build directory. On Windows you will have to install [NSIS](http://nsis.sourceforge.net/Main_Page) to use this.

appveyor.yml

@@ -1,16 +1,39 @@
 version: 1.0.0.{build}
-shallow_clone: true
+configuration:
+  - Debug
+  - Release
+clone_depth: 10
 environment:
   matrix:
-  - VisualStudioVersion: 10.0
-    PlatformToolset: v100
-    ProjectPath: projects/MSVC_2010/Freespace2.vcxproj
-  - VisualStudioVersion: 12.0
-    PlatformToolset: v120
-    ProjectPath: projects/MSVC_2013/Freespace2.vcxproj
-  - VisualStudioVersion: 14.0
-    PlatformToolset: v140
-    ProjectPath: projects/MSVC_2015/Freespace2.vcxproj
+    - BuildID: 0
+      CMAKE_GENERATOR: Visual Studio 12 2013
+      PlatformToolset: v120_xp
+    - BuildID: 1
+      CMAKE_GENERATOR: Visual Studio 14 2015 Win64
+      PlatformToolset: v140_xp
+before_build:
+  - git submodule update --init --recursive
 build_script:
-- msbuild "%ProjectPath%" /p:Configuration="Debug SSE2" /m /p:PlatformToolset="%PlatformToolset%" /verbosity:minimal
-test: off
+  - 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
+      on:
+          ReleaseBuild: true        # deploy on release push only
+
+    - provider: BinTray
+      username: sirknightly
+      api_key:
+          secure: pYWqfiZhIWvFYdjVWPXNaHobmnkXIWa4+LwoiyMTEiu4Z0CiCAW0ZrMfTKVkORKz
+      subject: scp-fs2open
+      repo: FSO
+      package: nightly
+      version: $(VersionName)
+      publish: true
+      override: true
+      on:
+          NightlyBuild: true        # deploy on nightly push only

autogen.sh

@@ -1,139 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-PKG_NAME="fs2_open"
-
-# check the version of a package
-check_version() {
-  COMMAND=$1
-  MAJOR=$2
-  MINOR=$3
-  MICRO=$4
-
-  ($COMMAND --version) </dev/null >/dev/null 2>&1 || return 1
-
-  ver=`$COMMAND --version|head -n 1|sed 's/^.*) //'|sed 's/ (.*)//'`
-  major=`echo $ver | cut -d. -f1 | sed s/[a-zA-Z\-].*//g`
-  minor=`echo $ver | cut -d. -f2 | sed s/[a-zA-Z\-].*//g`
-  micro=`echo $ver | cut -d. -f3 | sed s/[a-zA-Z\-].*//g`
-  test -z "$major" && major=0
-  test -z "$minor" && minor=0
-  test -z "$micro" && micro=0
-
-  fail=0
-  if [ ! "$major" -gt "$MAJOR" ]; then
-    if [ "$major" -lt "$MAJOR" ]; then
-      fail=1
-    elif [ ! "$minor" -gt "$MINOR" ]; then
-      if [ "$minor" -lt "$MINOR" ]; then
-        fail=1
-      elif [ "$micro" -lt "$MICRO" ]; then
-        fail=1
-      fi
-    fi
-  fi
-
-  return "$fail"
-}
-
-AUTOMAKE=
-ACLOCAL=
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`autoconf' installed to."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-for AM in automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake; do
-  (check_version "$AM" 1 6 1) && {
-    AUTOMAKE="$AM"
-    break
-  }
-done
-
-if [ -z "$AUTOMAKE" ]; then
-  echo
-  echo "**Error**: You must have \`automake' version 1.6.1 or greater"
-  echo "installed to compile $PKG_NAME. Download the appropriate package"
-  echo "for your distribution, or get the source tarball at"
-  echo "ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-fi
-
-# if no automake, don't bother testing for aclocal
-test -z "$AUTOMAKE" || {
-  for ACL in aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal-1.8 aclocal-1.7 aclocal-1.6 aclocal; do
-    (check_version "$ACL" 1 6 1) && {
-      ACLOCAL="$ACL"
-      break
-    }
-  done
-
-  if [ -z "$ACLOCAL" ]; then
-    echo
-    echo "**Error**: Missing \`aclocal'. The version of \`automake'"
-    echo "installed seems to be outdated. Get a recent package from"
-    echo "ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  fi
-}
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -name configure.ac -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
-    ( cd $dr
-      aclocalinclude="$ACLOCAL_FLAGS"
-      for k in $macrodirs; do
-        if test -d $k; then
-          aclocalinclude="$aclocalinclude -I $k"
-  	##else 
-	##  echo "**Warning**: No such directory \`$k'.  Ignored."
-        fi
-      done
-      echo "Running autoreconf..."
-      autoreconf --install
-    )
-    # DIE if the subshell failed
-    if [ $? -ne 0 ]; then
-      exit 1
-    fi
-  fi
-done
-
-#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
-
-# to not run configure, call autogen.sh as,
-# NOCONFIGURE=1 ./autogen.sh
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile $PKG_NAME.
-else
-  echo Skipping configure process.
-fi

ci/appveyor/build.ps1

@@ -0,0 +1,122 @@
+
+class BuildConfig {
+	[string]$Generator
+	[string]$PackageType
+	[string]$Toolset
+	[string]$SimdType
+}
+
+$NightlyConfigurations = @(
+	[BuildConfig]@{ 
+		Generator="Visual Studio 14 2015 Win64";
+		PackageType="Win64";
+		Toolset="v140_xp";
+		SimdType="SSE2";
+	},
+	[BuildConfig]@{ 
+		Generator="Visual Studio 14 2015";
+		PackageType="Win32";
+		Toolset="v140_xp";
+		SimdType="SSE2";
+	}
+)
+$ReleaseConfigurations = @(
+	[BuildConfig]@{
+		Generator="Visual Studio 14 2015";
+		PackageType="Win32";
+		Toolset="v140_xp";
+		SimdType="SSE2";
+	}
+	[BuildConfig]@{
+		Generator="Visual Studio 14 2015";
+		PackageType="Win32-AVX";
+		Toolset="v140_xp";
+		SimdType="AVX";
+	}
+	[BuildConfig]@{
+		Generator="Visual Studio 14 2015 Win64";
+		PackageType="Win64";
+		Toolset="v140_xp";
+		SimdType="SSE2";
+	}
+	[BuildConfig]@{
+		Generator="Visual Studio 14 2015 Win64";
+		PackageType="Win64-AVX";
+		Toolset="v140_xp";
+		SimdType="AVX";
+	}
+)
+
+$BuildConfigurations = $null
+
+# Default values
+$ReleaseBuild = $false
+$NightlyBuild = $false
+$DeployBuild = $false
+
+if ([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 ([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
+}
+
+# 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
+}
+Write-Host "$buildID"
+
+if ($ReleaseBuild -Or $NightlyBuild) {
+    $DeployBuild = $true
+}
+
+Set-AppveyorBuildVariable 'ReleaseBuild' "$ReleaseBuild"
+Set-AppveyorBuildVariable 'NightlyBuild' "$NightlyBuild"
+
+New-Item build -type directory
+Set-Location -Path build
+
+if ($DeployBuild) {
+	# Release build
+	if ($buildID -ge $BuildConfigurations.Length) {
+		# Not needed
+        exit 0
+	}
+
+	$buildConfig = $BuildConfigurations[$buildID]
+	
+	cmake -DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/../install" -DFSO_USE_SPEECH="ON" `
+		-DFSO_USE_VOICEREC="ON" -DMSVC_SIMD_INSTRUCTIONS="$($buildConfig.SimdType)" `
+		-G "$($buildConfig.Generator)" -T "$($buildConfig.Toolset)" ..
+
+	$Configs = @("Release", "FastDebug")
+	foreach ($config in $Configs) {
+		cmake --build . --config "$config" --target INSTALL -- /verbosity:minimal
+		if (! ($?)) {
+			Add-AppveyorMessage "A release build failed!"
+			exit 1
+    	}
+	}
+
+    7z a "$($PackageName)-builds-$($buildConfig.PackageType).zip" "$env:APPVEYOR_BUILD_FOLDER/../install/*"
+    Push-AppveyorArtifact "$($PackageName)-builds-$($buildConfig.PackageType).zip"
+} else {
+	cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="ON" -DFSO_BUILD_TESTS="ON" -DMSVC_SIMD_INSTRUCTIONS=SSE2 `
+	-G "$Env:CMAKE_GENERATOR" -T "$Env:PlatformToolset" ..
+
+    cmake --build . --config "$Env:CONFIGURATION" -- /verbosity:minimal
+
+    if (! ($?)) {
+        exit 1
+    }
+}

ci/appveyor/test.ps1

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

ci/bintray.template.json

@@ -0,0 +1,19 @@
+{
+    "package": {
+        "subject": "scp-fs2open",
+        "repo": "FSO",
+        "name": "nightly"
+    },
+
+    "version": {
+        "name": "$VERSION_NAME"
+    },
+
+    "files": [
+        {
+            "includePattern": "/tmp/builds/(.*)",
+            "uploadPattern": "$1"
+        }
+    ],
+    "publish": true
+}

ci/travis/before_deploy.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+set -ex
+
+if [ "$NIGHTLY_BUILD" = true ]; then
+    echo "Generating bintray config..."
+    sed -e "s/\$VERSION_NAME/$VERSION_NAME/" ci/bintray.template.json > ci/bintray.json
+fi

ci/travis/before_install.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env sh
 
-set -e
+set -ex
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    sudo add-apt-repository --yes ppa:zoogie/sdl2-snapshots
-    sudo apt-get update -qq
+    # Nothing to do here
+    :
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
     # Nothing to do here
     :

ci/travis/before_script.sh

@@ -1,20 +1,38 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
-set -e
+set -ex
+
+mkdir -p build
+cd build
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    # Due to a bug in gcc the array bounds check isn't working correctly
-    # This can be removed when gcc is updated
-    AUTOGEN_CONFIG="--enable-fatal-warnings --enable-generic-architecture"
-	CXXFLAGS="-Wno-array-bounds -Wno-unknown-pragmas"
-    
-    if [ "$CONFIGURATION" = "Debug" ]; then
-        AUTOGEN_CONFIG="$AUTOGEN_CONFIG --enable-debug"
+    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"
+    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 -DAPPIMAGE_ASSISTANT="$HOME/AppImageAssistant" \
+                -DFSO_BUILD_INCLUDED_LIBS=ON -DFFMPEG_USE_PRECOMPILED=ON ../..
+            cd ..
+        done
+    else
+        eval $CMAKE -DCMAKE_BUILD_TYPE=$CONFIGURATION -DFSO_BUILD_TESTS=ON -DFSO_BUILD_INCLUDED_LIBS=ON ..
     fi
-    
-	export CXXFLAGS
-    ./autogen.sh $AUTOGEN_CONFIG
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    cd projects/Xcode
-    tar -xvzf Frameworks.tgz
+    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" ..
+    fi
 fi

ci/travis/check_release.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+
+RELEASE_BUILD=false
+NIGHTLY_BUILD=false
+BUILD_DEPLOYMENT=false
+BUILD_CONFIGS="Release FastDebug"
+VERSION_NAME=""
+PACKAGE_NAME=""
+
+RELEASE_PATTERN="^release_(.*)$"
+NIGHTLY_PATTERN="^nightly_(.*)$"
+
+# These are for testing
+NIGHTLY_TEST=false
+RELEASE_TEST=false
+
+if [ "$RELEASE_TEST" = true ] || [[ "$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
+    echo "This is a nightly tag!";
+    NIGHTLY_BUILD=true;
+    VERSION_NAME="${BASH_REMATCH[1]}";
+	PACKAGE_NAME="nightly_${BASH_REMATCH[1]}";
+fi
+
+if ([ "$RELEASE_BUILD" = true ] || [ "$NIGHTLY_BUILD" = true ]); then
+    BUILD_DEPLOYMENT=true;
+fi
+
+if [ "$BUILD_DEPLOYMENT" = true ]; then
+    if ([ "$TRAVIS_OS_NAME" = "linux" ] && (! [[ "$CC" =~ ^gcc.*$ ]])); then
+        echo "Skipping non-release compiler";
+        exit 0;
+    fi
+
+    if ([[ "$CONFIGURATION" == "Debug" ]]); then
+        echo "Skipping non-release configuration";
+        exit 0;
+    fi
+fi
+
+export RELEASE_BUILD
+export NIGHTLY_BUILD
+export BUILD_DEPLOYMENT
+export BUILD_CONFIGS
+export VERSION_NAME
+export PACKAGE_NAME

ci/travis/install.sh

@@ -1,9 +1,31 @@
 #!/usr/bin/env sh
 
-set -e
+set -ex
 
+FILENAME=
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    sudo apt-get install libsdl2-dev
+    if [ ! -d "$HOME/cmake/bin" ]; then
+        # If the cache does not currently contain CMake then download and install it
+        FILENAME=cmake-3.4.3-Linux-x86_64
+
+    	mkdir -p $HOME/cmake/
+
+    	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
+    
+    cd $HOME
+    
+    if [ "${BUILD_DEPLOYMENT}" = true ]; then
+        wget -c "https://github.com/probonopd/AppImageKit/releases/download/5/AppImageAssistant" # (64-bit)
+        chmod a+x ./AppImageAssistant
+    fi
 elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    gem install xcpretty thefox-pastebin
+    gem install xcpretty
+    
+    brew update
+    brew outdated cmake || brew upgrade cmake
 fi
+
+cmake --version

ci/travis/release.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+set -ex
+mkdir -p /tmp/builds
+
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+	cd build
+    for config in $BUILD_CONFIGS
+    do
+        cd "$config"
+        ninja appimage
+        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)
+elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    cd build
+    
+    for config in $BUILD_CONFIGS
+    do
+        cmake --build . --config "$config" --target install | tee build.log \
+            | xcpretty
+        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"
+            exit $XCODE_RET
+        fi
+    done
+
+    ls -al /tmp/release
+    
+    (cd /tmp/release && tar -cvzf /tmp/builds/$PACKAGE_NAME-builds-MacOSX.tar.gz *)
+fi

ci/travis/script.sh

@@ -2,15 +2,19 @@
 
 set -e
 
-if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-    make -j 4
-elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    cd projects/Xcode
+cd build
 
-    xcodebuild -project FS2_Open.xcodeproj -configuration "$CONFIGURATION" clean build | tee release.log | xcpretty
+if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+    ninja all
+
+    valgrind --leak-check=full --error-exitcode=1 --gen-suppressions=all \
+        --suppressions="$TRAVIS_BUILD_DIR/ci/travis/valgrind.supp" ./bin/unittests --gtest_shuffle
+elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    cmake --build . --config "$CONFIGURATION" | tee build.log | xcpretty
     XCODE_RET=${PIPESTATUS[0]}
     if [ "$XCODE_RET" -ne "0" ]; then
-        pastebin -e 1d -f release.log
+        tar -cvzf build.log.tar.gz build.log
+        curl --upload-file build.log.tar.gz "https://transfer.sh/build.log.tar.gz"
         exit $XCODE_RET
     fi
 fi

ci/travis/valgrind.supp

@@ -0,0 +1,28 @@
+{
+   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
+}

cmake/AppImage.desktop.in

@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=FreeSpace Open
+Exec=$<TARGET_FILE_NAME:Freespace2>
+Icon=app_icon.png

cmake/AppRun.in

@@ -0,0 +1,4 @@
+#!/bin/sh
+HERE=$(dirname $(readlink -f "${0}"))
+export LD_LIBRARY_PATH="${HERE}"/lib:$PATH
+"${HERE}"/bin/$<TARGET_FILE_NAME:Freespace2> $@

cmake/Cxx11.cmake

@@ -0,0 +1,14 @@
+
+include(WriteCompilerDetectionHeader)
+
+set(REQUIRED_CXX_FEATURES cxx_rvalue_references cxx_nullptr)
+
+get_property(CMAKE_CXX_KNOWN_FEATURES GLOBAL PROPERTY CMAKE_CXX_KNOWN_FEATURES)
+
+write_compiler_detection_header(
+  FILE "${GENERATED_SOURCE_DIR}/scp_compiler_detection.h"
+  PREFIX SCP
+  COMPILERS AppleClang Clang GNU MSVC
+  FEATURES ${CMAKE_CXX_KNOWN_FEATURES}
+  VERSION 3.2
+)

cmake/appimage.cmake

@@ -0,0 +1,23 @@
+
+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")
+
+
+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")
+
+install(FILES "${CMAKE_SOURCE_DIR}/freespace2/resources/app_icon.png" DESTINATION ".")
+
+add_custom_target(appimage
+COMMAND "${APPIMAGE_ASSISTANT}" "${CMAKE_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/fs2_open_${FSO_BINARY_SUFFIX}.AppImage")
+    
+add_dependencies(appimage install)

cmake/cpufeatures.cpp

@@ -0,0 +1,52 @@
+// Code snippet from http://stackoverflow.com/a/7495023
+#ifdef _WIN32
+#include <intrin.h>
+//  Windows
+#define cpuid    __cpuid
+
+#else
+
+//  GCC Inline Assembly
+void cpuid(int CPUInfo[4],int InfoType){
+    __asm__ __volatile__ (
+        "cpuid":
+        "=a" (CPUInfo[0]),
+        "=b" (CPUInfo[1]),
+        "=c" (CPUInfo[2]),
+        "=d" (CPUInfo[3]) :
+        "a" (InfoType)
+    );
+}
+
+#endif
+
+#include <iostream>
+
+int main( int argc, char* argv[] )
+{
+	int SSE     = false;
+	int SSE2    = false;
+	int AVX     = false;
+
+	int info[4];
+	cpuid(info, 0);
+	int nIds = info[0];
+
+	//  Detect Instruction Set
+	if (nIds >= 1){
+		cpuid(info,0x00000001);
+		SSE   = (info[3] & ((int)1 << 25)) != 0;
+		SSE2  = (info[3] & ((int)1 << 26)) != 0;
+
+		AVX   = (info[2] & ((int)1 << 28)) != 0;
+	}
+
+	if(AVX)
+		std::cout << "AVX";
+	else if(SSE2)
+		std::cout << "SSE2";
+	else if(SSE)
+		std::cout << "SSE";
+
+	return 0;
+}

cmake/cross_compile/mingw64.cmake

@@ -0,0 +1,26 @@
+
+# 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)

cmake/debug-vars.cmake

@@ -0,0 +1,154 @@
+# ------------------------- Begin Generic CMake Variable Logging ------------------
+
+# /*	C++ comment style not allowed	*/
+
+
+# if you are building in-source, this is the same as CMAKE_SOURCE_DIR, otherwise
+# this is the top level directory of your build tree
+MESSAGE( STATUS "CMAKE_BINARY_DIR:         " ${CMAKE_BINARY_DIR} )
+
+# if you are building in-source, this is the same as CMAKE_CURRENT_SOURCE_DIR, otherwise this
+# is the directory where the compiled or generated files from the current CMakeLists.txt will go to
+MESSAGE( STATUS "CMAKE_CURRENT_BINARY_DIR: " ${CMAKE_CURRENT_BINARY_DIR} )
+
+# this is the directory, from which cmake was started, i.e. the top level source directory
+MESSAGE( STATUS "CMAKE_SOURCE_DIR:         " ${CMAKE_SOURCE_DIR} )
+
+# this is the directory where the currently processed CMakeLists.txt is located in
+MESSAGE( STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR} )
+
+# contains the full path to the top level directory of your build tree
+MESSAGE( STATUS "PROJECT_BINARY_DIR: " ${PROJECT_BINARY_DIR} )
+
+MESSAGE( STATUS "CMAKE_CXX_COMPILER_ID: " ${CMAKE_CXX_COMPILER_ID} )
+
+# contains the full path to the root of your project source directory,
+# i.e. to the nearest directory where CMakeLists.txt contains the PROJECT() command
+MESSAGE( STATUS "PROJECT_SOURCE_DIR: " ${PROJECT_SOURCE_DIR} )
+
+# set this variable to specify a common place where CMake should put all executable files
+# (instead of CMAKE_CURRENT_BINARY_DIR)
+MESSAGE( STATUS "EXECUTABLE_OUTPUT_PATH: " ${EXECUTABLE_OUTPUT_PATH} )
+
+# set this variable to specify a common place where CMake should put all libraries
+# (instead of CMAKE_CURRENT_BINARY_DIR)
+MESSAGE( STATUS "LIBRARY_OUTPUT_PATH:     " ${LIBRARY_OUTPUT_PATH} )
+
+# tell CMake to search first in directories listed in CMAKE_MODULE_PATH
+# when you use FIND_PACKAGE() or INCLUDE()
+MESSAGE( STATUS "CMAKE_MODULE_PATH: " ${CMAKE_MODULE_PATH} )
+
+# this is the complete path of the cmake which runs currently (e.g. /usr/local/bin/cmake)
+MESSAGE( STATUS "CMAKE_COMMAND: " ${CMAKE_COMMAND} )
+
+# this is the CMake installation directory
+MESSAGE( STATUS "CMAKE_ROOT: " ${CMAKE_ROOT} )
+
+# this is the filename including the complete path of the file where this variable is used.
+MESSAGE( STATUS "CMAKE_CURRENT_LIST_FILE: " ${CMAKE_CURRENT_LIST_FILE} )
+
+# this is linenumber where the variable is used
+MESSAGE( STATUS "CMAKE_CURRENT_LIST_LINE: " ${CMAKE_CURRENT_LIST_LINE} )
+
+# this is used when searching for include files e.g. using the FIND_PATH() command.
+MESSAGE( STATUS "CMAKE_INCLUDE_PATH: " ${CMAKE_INCLUDE_PATH} )
+
+# this is used when searching for libraries e.g. using the FIND_LIBRARY() command.
+MESSAGE( STATUS "CMAKE_LIBRARY_PATH: " ${CMAKE_LIBRARY_PATH} )
+
+# the complete system name, e.g. "Linux-2.4.22", "FreeBSD-5.4-RELEASE" or "Windows 5.1"
+MESSAGE( STATUS "CMAKE_SYSTEM: " ${CMAKE_SYSTEM} )
+
+# the short system name, e.g. "Linux", "FreeBSD" or "Windows"
+MESSAGE( STATUS "CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME} )
+
+# only the version part of CMAKE_SYSTEM
+MESSAGE( STATUS "CMAKE_SYSTEM_VERSION: " ${CMAKE_SYSTEM_VERSION} )
+
+# the processor name (e.g. "Intel(R) Pentium(R) M processor 2.00GHz")
+MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR} )
+
+# is TRUE on all UNIX-like OS's, including Apple OS X and CygWin
+MESSAGE( STATUS "UNIX: " ${UNIX} )
+
+# is TRUE on Windows, including CygWin
+MESSAGE( STATUS "WIN32: " ${WIN32} )
+
+# is TRUE on Apple OS X
+MESSAGE( STATUS "APPLE: " ${APPLE} )
+
+# is TRUE when using the MinGW compiler in Windows
+MESSAGE( STATUS "MINGW: " ${MINGW} )
+
+# is TRUE on Windows when using the CygWin version of cmake
+MESSAGE( STATUS "CYGWIN: " ${CYGWIN} )
+
+# is TRUE on Windows when using a Borland compiler
+MESSAGE( STATUS "BORLAND: " ${BORLAND} )
+
+# Microsoft compiler
+MESSAGE( STATUS "MSVC: " ${MSVC} )
+MESSAGE( STATUS "MSVC_IDE: " ${MSVC_IDE} )
+MESSAGE( STATUS "MSVC60: " ${MSVC60} )
+MESSAGE( STATUS "MSVC70: " ${MSVC70} )
+MESSAGE( STATUS "MSVC71: " ${MSVC71} )
+MESSAGE( STATUS "MSVC80: " ${MSVC80} )
+MESSAGE( STATUS "CMAKE_COMPILER_2005: " ${CMAKE_COMPILER_2005} )
+
+
+# set this to true if you don't want to rebuild the object files if the rules have changed,
+# but not the actual source files or headers (e.g. if you changed the some compiler switches)
+MESSAGE( STATUS "CMAKE_SKIP_RULE_DEPENDENCY: " ${CMAKE_SKIP_RULE_DEPENDENCY} )
+
+# since CMake 2.1 the install rule depends on all, i.e. everything will be built before installing.
+# If you don't like this, set this one to true.
+MESSAGE( STATUS "CMAKE_SKIP_INSTALL_ALL_DEPENDENCY: " ${CMAKE_SKIP_INSTALL_ALL_DEPENDENCY} )
+
+# If set, runtime paths are not added when using shared libraries. Default it is set to OFF
+MESSAGE( STATUS "CMAKE_SKIP_RPATH: " ${CMAKE_SKIP_RPATH} )
+
+# set this to true if you are using makefiles and want to see the full compile and link
+# commands instead of only the shortened ones
+MESSAGE( STATUS "CMAKE_VERBOSE_MAKEFILE: " ${CMAKE_VERBOSE_MAKEFILE} )
+
+# this will cause CMake to not put in the rules that re-run CMake. This might be useful if
+# you want to use the generated build files on another machine.
+MESSAGE( STATUS "CMAKE_SUPPRESS_REGENERATION: " ${CMAKE_SUPPRESS_REGENERATION} )
+
+
+# A simple way to get switches to the compiler is to use ADD_DEFINITIONS().
+# But there are also two variables exactly for this purpose:
+
+# the compiler flags for compiling C sources
+MESSAGE( STATUS "CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS} )
+
+# the compiler flags for compiling C++ sources
+MESSAGE( STATUS "CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS} )
+
+
+# Choose the type of build.  Example: SET(CMAKE_BUILD_TYPE Debug)
+MESSAGE( STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE} )
+
+# if this is set to ON, then all libraries are built as shared libraries by default.
+MESSAGE( STATUS "BUILD_SHARED_LIBS: " ${BUILD_SHARED_LIBS} )
+
+# the compiler used for C files
+MESSAGE( STATUS "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER} )
+
+# the compiler used for C++ files
+MESSAGE( STATUS "CMAKE_CXX_COMPILER: " ${CMAKE_CXX_COMPILER} )
+
+# if the compiler is a variant of gcc, this should be set to 1
+MESSAGE( STATUS "CMAKE_COMPILER_IS_GNUCC: " ${CMAKE_COMPILER_IS_GNUCC} )
+
+# if the compiler is a variant of g++, this should be set to 1
+MESSAGE( STATUS "CMAKE_COMPILER_IS_GNUCXX : " ${CMAKE_COMPILER_IS_GNUCXX} )
+
+# the tools for creating libraries
+MESSAGE( STATUS "CMAKE_AR: " ${CMAKE_AR} )
+MESSAGE( STATUS "CMAKE_RANLIB: " ${CMAKE_RANLIB} )
+
+#
+#MESSAGE( STATUS ": " ${} )
+
+# ------------------------- End of Generic CMake Variable Logging ------------------

cmake/doxygen.cmake

@@ -0,0 +1,37 @@
+
+# add a target to generate API documentation with Doxygen
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+	SET(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/documentation/doxygen")
+	FILE(MAKE_DIRECTORY "${OUTPUT_DIR}")
+	
+	FILE(TO_NATIVE_PATH ${OUTPUT_DIR} OUTPUT_DIR)
+	SET(OUTPUT_DIR \"${OUTPUT_DIR}\")
+	
+	SET(INPUTS "${CMAKE_CURRENT_SOURCE_DIR}/code" "${CMAKE_CURRENT_SOURCE_DIR}/freespace2" "${CMAKE_CURRENT_SOURCE_DIR}/fred2" "${CMAKE_CURRENT_SOURCE_DIR}/wxfred2")
+	
+	SET(INPUT_DIRS)
+	FOREACH(DIR IN LISTS INPUTS)
+		FILE(TO_NATIVE_PATH ${DIR} native_dir)
+		
+		LIST(APPEND INPUT_DIRS \"${native_dir}\")
+	ENDFOREACH(DIR)
+	STRING(REPLACE ";" " " INPUT_DIRS "${INPUT_DIRS}")
+	
+	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/fs2open.Doxyfile.in
+					${CMAKE_CURRENT_BINARY_DIR}/fs2open.Doxyfile
+					@ONLY)
+	
+	add_custom_target(doxygen
+		${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/fs2open.Doxyfile
+		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+		COMMENT "Generating API documentation with Doxygen" VERBATIM
+	)
+	
+	set_target_properties(doxygen
+		PROPERTIES
+			FOLDER "Documentation"
+			EXCLUDE_FROM_ALL ON
+			EXCLUDE_FROM_DEFAULT_BUILD ON
+	)
+endif(DOXYGEN_FOUND)

cmake/finder/FindSpeech.cmake

@@ -0,0 +1,16 @@
+
+include(CheckIncludeFile)
+
+add_library(speech INTERFACE)
+
+if (WIN32)
+	CHECK_INCLUDE_FILE_CXX("sapi.h" HAVE_SAPI_H)
+	
+	if (NOT HAVE_SAPI_H)
+		message(SEND_ERROR "sapi.h could not be found on your platform. Please disable speech support.")
+	endif()
+else()
+	message(SEND_ERROR "Text to Speech is not supported on this platform!")
+endif()
+
+target_compile_definitions(speech INTERFACE -DFS2_SPEECH)

cmake/generateHeaders.cmake

@@ -0,0 +1,5 @@
+
+include(platformChecks)
+include(Cxx11)
+
+CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/project.h.in ${GENERATED_SOURCE_DIR}/project.h)

cmake/globals.cmake

@@ -0,0 +1,9 @@
+
+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()

cmake/headers.cmake

@@ -0,0 +1,8 @@
+
+SET(CODE_HEADERS ${CMAKE_SOURCE_DIR}/code)
+
+SET(FREESPACE_HEADERS ${CMAKE_SOURCE_DIR}/freespace2)
+
+SET(FRED_HEADERS ${CMAKE_SOURCE_DIR}/fred2)
+
+SET(WXFRED_HEADERS ${CMAKE_SOURCE_DIR}/wxfred2)

cmake/package.cmake

@@ -0,0 +1,14 @@
+
+SET(CPACK_PACKAGE_VERSION_MAJOR ${FSO_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${FSO_VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_PATCH ${FSO_VERSION_BUILD})
+
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${FSO_PROJECT_DESCRIPTION})
+
+IF(WIN32)
+	SET(CPACK_NSIS_MUI_ICON ${FSO_INSTALLER_ICON})
+	
+	set(CPACK_NSIS_MENU_LINKS "http://www.hard-light.net/" "FreeSpace Community")
+ENDIF(WIN32)
+
+include(CPack)

cmake/platform-darwin.cmake

@@ -0,0 +1,34 @@
+
+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)
+
+if (NOT COCOA_LIBRARY)
+    message(FATAL_ERROR "Couldn't find Cocoa!")
+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")

cmake/platform-freebsd.cmake

@@ -0,0 +1,10 @@
+
+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()

cmake/platform-solaris.cmake

@@ -0,0 +1,2 @@
+
+target_compile_definitions(platform INTERFACE SCP_SOLARIS)

cmake/platform-unix.cmake

@@ -0,0 +1,13 @@
+
+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)

cmake/platform-win32.cmake

@@ -0,0 +1,27 @@
+
+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_compile_definitions(platform INTERFACE WIN32 USE_OPENAL _WINDOWS)
+
+# Specify minimum Windows version for the headers (currently this is XP)
+target_compile_definitions(platform INTERFACE NTDDI_VERSION=0x05010000 _WIN32_WINNT=0x0501)
+
+SET(EXE_GUI_TYPE WIN32)
+set(PLATFORM_WINDOWS TRUE CACHE INTERNAL "" FORCE)

cmake/platformChecks.cmake

@@ -0,0 +1,32 @@
+
+include(CheckFunctionExists)
+include(CheckIncludeFiles)
+include(CheckIncludeFile)
+include(CheckIncludeFileCXX)
+include(CheckLibraryExists)
+include(CheckPrototypeDefinition)
+include(CheckStructHasMember)
+include(CheckSymbolExists)
+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)
+
+set(CMAKE_EXTRA_INCLUDE_FILES "cstddef")
+CHECK_TYPE_SIZE("std::max_align_t" STD_MAX_ALIGN_T LANGUAGE CXX)
+set(CMAKE_EXTRA_INCLUDE_FILES)
+
+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)
+
+set(PLATFORM_CHECK_HEADER "${GENERATED_SOURCE_DIR}/platformChecks.h")
+CONFIGURE_FILE(${CMAKE_CURRENT_LIST_DIR}/platformChecks.h.in "${PLATFORM_CHECK_HEADER}")

cmake/platformChecks.h.in

@@ -0,0 +1,22 @@
+
+#ifndef __PLATFORM_CHECKS_H__
+#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
+
+#cmakedefine01 IS_64BIT
+
+#cmakedefine01 HAVE_STRCASECMP
+#cmakedefine01 HAVE_STRNCASECMP
+#cmakedefine01 HAVE__STRICMP
+#cmakedefine01 HAVE__STRNICMP
+
+#cmakedefine01 HAVE_STRLWR
+
+#cmakedefine01 HAVE_STRINGS_H
+
+#endif // __PLATFORM_CHECKS_H__

cmake/platforms.cmake

@@ -0,0 +1,29 @@
+
+add_library(platform INTERFACE)
+
+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)
+	INCLUDE(platform-unix)
+
+	IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+		INCLUDE(platform-freebsd)
+	ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+		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()
+ELSE(WIN32)
+	MESSAGE(STATUS "This platform is not supported, good luck!")
+ENDIF(WIN32)

cmake/project.h.in

@@ -0,0 +1,17 @@
+
+
+#ifndef __PROJECT_H
+#define __PROJECT_H
+
+#define FS_VERSION_MAJOR @FSO_VERSION_MAJOR@
+#define FS_VERSION_MINOR @FSO_VERSION_MINOR@
+#define FS_VERSION_BUILD @FSO_VERSION_BUILD@
+#define FS_VERSION_REVIS @FSO_VERSION_REVISION@
+#define FS_VERSION_REVIS_STR "@FSO_VERSION_REVISION_STR@"
+
+#define FS_VERSION_HAS_REVIS @FSO_VERSION_HAS_REVISION@
+
+#define FS_VERSION_FULL "@FSO_FULL_VERSION_STRING@"
+#define FS_PRODUCT_VERSION "@FSO_PRODUCT_VERSION_STRING@"
+
+#endif // __PROJECT_H

cmake/toolchain-apple-clang.cmake

@@ -0,0 +1,20 @@
+
+MESSAGE(STATUS "Doing configuration specific to Apple Clang...")
+
+# TODO: Actually add Mac specific flags here...
+
+# Suppress specific warning
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -funroll-loops -fsigned-char -Wno-unknown-pragmas")
+
+# Omit "conversion from string literal to 'char *' is deprecated" warnings.
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-char-subscripts")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
+
+set(CMAKE_CXX_FLAGS_RELEASE "-Wno-unused-variable")
+
+set(CMAKE_CXX_FLAGS_DEBUG "-Wextra -Wshadow -Wno-unused-parameter")

cmake/toolchain-clang.cmake

@@ -0,0 +1,113 @@
+# Clang
+include(EnableExtraCompilerWarnings)
+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
+if(DEFINED ENV{CXXFLAGS})
+	set(CXX_BASE_FLAGS $ENV{CXXFLAGS})
+endif()
+if(DEFINED ENV{CFLAGS})
+	set(C_BASE_FLAGS $ENV{CFLAGS})
+endif()
+
+# Initialize with an empty string to make sure we always get a clean start
+set(COMPILER_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}")
+
+set(COMPILER_FLAGS "${COMPILER_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")
+endif()
+
+if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
+	# Force color diagnostics for Ninja generator
+	set(COMPILER_FLAGS "${COMPILER_FLAGS} -fdiagnostics-color")
+endif()
+
+# Start with an empty list
+set(SANITIZE_FLAGS)
+
+if(CLANG_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 (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(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-parameter")
+
+check_cxx_compiler_flag(-Wshift-negative-value SUPPORTS_SHIFT_NEGATIVE_VALUE)
+if(SUPPORTS_SHIFT_NEGATIVE_VALUE)
+	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-shift-negative-value")
+endif()
+
+set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable")
+
+set(COMPILER_FLAGS_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")
+
+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)

cmake/toolchain-gcc.cmake

@@ -0,0 +1,134 @@
+
+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()
+if(DEFINED ENV{CXXFLAGS})
+	set(CXX_BASE_FLAGS $ENV{CXXFLAGS})
+endif()
+
+# Initialize with an empty string to make sure we always get a clean start
+set(COMPILER_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}")
+
+set(COMPILER_FLAGS "${COMPILER_FLAGS} -funroll-loops -fsigned-char -Wno-unknown-pragmas")
+
+# 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")
+
+if ("${CMAKE_GENERATOR}" STREQUAL "Ninja")
+	# Force color diagnostics for Ninja generator
+	CHECK_C_COMPILER_FLAG(-fdiagnostics-color SUPPORTS_DIAGNOSTIC_COLOR)
+
+	if(SUPPORTS_DIAGNOSTIC_COLOR)
+		set(COMPILER_FLAGS "${COMPILER_FLAGS} -fdiagnostics-color")
+	endif()
+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")
+
+set(COMPILER_FLAGS "${COMPILER_FLAGS} -Wno-unused-parameter")
+
+set(COMPILER_FLAGS_RELEASE "-O2 -Wno-unused-variable -Wno-unused-but-set-variable -Wno-array-bounds -Wno-empty-body -Wno-clobbered")
+
+set(COMPILER_FLAGS_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")
+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)
+
+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)

cmake/toolchain-msvc.cmake

@@ -0,0 +1,142 @@
+
+include(EnableExtraCompilerWarnings)
+include(CheckCXXCompilerFlag)
+include(util)
+
+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
+	$<$<CONFIG:Release>:/wd4101> # In release mode there are unreferenced variables because debug needs them
+)
+
+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_EXE_LINKER_FLAGS "/MANIFEST /DYNAMICBASE:NO /SAFESEH:NO /ERRORREPORT:PROMPT /NOLOGO")
+set(CMAKE_STATIC_LINKER_FLAGS "")
+
+# Release
+set(CMAKE_C_FLAGS_RELEASE "/GL /W2 /Gy- /Ox /Ot /Ob2 /fp:precise /GF /Oy /Oi /Zi /W3")
+set(CMAKE_CXX_FLAGS_RELEASE "/GL /W2 /Gy- /Ox /Ot /Ob2 /fp:precise /GF /Oy /Oi /Zi /W3")
+set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/OPT:REF /LTCG /INCREMENTAL:NO")
+set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "/LTCG")
+
+globally_enable_extra_compiler_warnings()
+
+if (MSVC_RELEASE_DEBUGGING)
+	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")
+endif()
+
+IF(MSVC_USE_RUNTIME_DLL)
+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
+ELSE(MSVC_USE_RUNTIME_DLL)
+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+ENDIF(MSVC_USE_RUNTIME_DLL)
+
+# Debug
+set(CMAKE_C_FLAGS_DEBUG "/W4 /Gy /Zi /Od /RTC1 /Gd /Oy-")
+set(CMAKE_CXX_FLAGS_DEBUG "/W4 /Gy /Zi /Od /RTC1 /Gd /Oy-")
+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/DEBUG /INCREMENTAL:NO /MAPINFO:EXPORTS /NODEFAULTLIB:libcmt.lib")
+
+IF(MSVC_USE_RUNTIME_DLL)
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+ELSE(MSVC_USE_RUNTIME_DLL)
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+ENDIF(MSVC_USE_RUNTIME_DLL)
+
+INCLUDE(MSVCMultipleProcessCompile)
+
+# Visual Studio supports compiling for multiple vector instruction sets
+SET(POSSIBLE_INSTUCTION_SETS "" SSE SSE2 AVX)
+
+if (NOT DEFINED MSVC_SIMD_INSTRUCTIONS)
+	detect_simd_instructions(MSVC_DETECTED_SIMD_INSTRUCTIONS)
+
+	SET(MSVC_SIMD_INSTRUCTIONS "${MSVC_DETECTED_SIMD_INSTRUCTIONS}" CACHE FILEPATH "The SIMD instructions which will be used, possible values are ${POSSIBLE_INSTUCTION_SETS}")
+	MARK_AS_ADVANCED(FORCE MSVC_SIMD_INSTRUCTIONS)
+endif()
+set(FSO_INSTRUCTION_SET ${MSVC_SIMD_INSTRUCTIONS})
+
+LIST(FIND POSSIBLE_INSTUCTION_SETS "${MSVC_SIMD_INSTRUCTIONS}" SET_INDEX)
+
+if (SET_INDEX LESS 0)
+	MESSAGE(STATUS "An invalid instruction set was specified, defaulting to no special compiler options.")
+else()
+	IF (NOT SET_INDEX EQUAL 0)
+		SET(FOUND)
+
+		FOREACH(list_index RANGE ${SET_INDEX} 1)
+			list(GET POSSIBLE_INSTUCTION_SETS ${list_index} _simd_set)
+			CHECK_CXX_COMPILER_FLAG("/arch:${_simd_set}" COMPILER_SUPPORTS_ARCH_${_simd_set})
+
+			IF(COMPILER_SUPPORTS_ARCH_${_simd_set})
+				set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:${_simd_set}")
+				set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:${_simd_set}")
+
+				SET(FOUND TRUE)
+				BREAK()
+			ENDIF()
+		ENDFOREACH(list_index)
+
+		IF(NOT FOUND)
+			# Don't set anything, it will likely not work
+			MESSAGE(STATUS "Your compiler does not support any optimization flags, defaulting to none")
+		ENDIF(NOT FOUND)
+	ELSE()
+		CHECK_CXX_COMPILER_FLAG("/arch:IA32" COMPILER_SUPPORTS_ARCH_IA32)
+
+		IF(COMPILER_SUPPORTS_ARCH_IA32)
+			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:IA32")
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:IA32")
+		ENDIF(COMPILER_SUPPORTS_ARCH_IA32)
+	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>")
+	
+if (FSO_FATAL_WARNINGS)
+	# Make warnings fatal if the right variable is set
+	target_compile_options(compiler INTERFACE "/WX")
+endif()

cmake/toolchain.cmake

@@ -0,0 +1,33 @@
+
+# File to execute compiler specific commands
+
+add_library(compiler INTERFACE)
+
+target_compile_definitions(compiler INTERFACE "$<$<CONFIG:Release>:NDEBUG>;$<$<CONFIG:Debug>:_DEBUG>;$<$<CONFIG:FastDebug>:_DEBUG>")
+
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	include(toolchain-gcc)
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+	include(toolchain-msvc)
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	include(toolchain-clang)
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+	include(toolchain-apple-clang)
+ELSE("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+	MESSAGE(STATUS "No special handling for this compiler present, good luck!")
+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_RELEASE}")
+set(CMAKE_STATIC_LINKER_FLAGS_FASTDEBUG "${CMAKE_STATIC_LINKER_FLAGS_RELEASE}")
+
+if (MSVC)
+	# Adjust runtime library
+	string(REPLACE "/MD" "/MDd" CMAKE_C_FLAGS_FASTDEBUG "${CMAKE_C_FLAGS_FASTDEBUG}")
+	string(REPLACE "/MT" "/MTd" CMAKE_C_FLAGS_FASTDEBUG "${CMAKE_C_FLAGS_FASTDEBUG}")
+	
+	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()

cmake/util.cmake

@@ -0,0 +1,197 @@
+
+include(CheckCCompilerFlag)
+
+FUNCTION(MAKE_CACHE_INTERNAL VARIABLE)
+	SET(${VARIABLE} ${${VARIABLE}} CACHE INTERNAL "Internal cache variable")
+ENDFUNCTION(MAKE_CACHE_INTERNAL)
+
+FUNCTION(ADD_IMPORTED_LIB NAME INCLUDES LIBS)
+	ADD_LIBRARY(${NAME} INTERFACE)
+
+	target_link_libraries(${NAME} INTERFACE "${LIBS}")
+
+	target_include_directories(${NAME} INTERFACE "${INCLUDES}")
+ENDFUNCTION(ADD_IMPORTED_LIB)
+
+MACRO(PKG_CONFIG_LIB_RESOLVE NAME OUTVAR)
+	SET(${OUTVAR} "")
+	foreach(lib ${${NAME}_LIBRARIES})
+		find_library(${lib}_LIBRARY
+					NAMES ${lib}
+					HINTS ${${NAME}_LIBDIR} ${${NAME}_LIBRARY_DIRS}
+		)
+
+		if (NOT ${${lib}_LIBRARY} MATCHES ".*NOTFOUND.*")
+			SET(${OUTVAR} ${${OUTVAR}} ${${lib}_LIBRARY})
+		endif (NOT ${${lib}_LIBRARY} MATCHES ".*NOTFOUND.*")
+	endforeach(lib)
+ENDMACRO(PKG_CONFIG_LIB_RESOLVE)
+
+# Copy from http://cmake.3232098.n2.nabble.com/RFC-cmake-analog-to-AC-SEARCH-LIBS-td7585423.html
+INCLUDE (CheckFunctionExists)
+INCLUDE (CheckLibraryExists)
+
+MACRO (CMAKE_SEARCH_LIBS v_func v_lib func)
+    CHECK_FUNCTION_EXISTS (${func} ${v_func})
+    IF (NOT ${v_func})
+        FOREACH (lib ${ARGN})
+            CHECK_LIBRARY_EXISTS (${lib} ${func} "" "HAVE_${func}_IN_${lib}")
+            IF (${HAVE_${func}_IN_${lib}})
+                SET (${v_func} TRUE)
+                SET (${v_lib} "${lib}" CACHE INTERNAL "Library providing ${func}")
+                BREAK()
+            ENDIF (${HAVE_${func}_IN_${lib}})
+        ENDFOREACH (lib)
+    ENDIF (NOT ${v_func})
+ENDMACRO (CMAKE_SEARCH_LIBS)
+# End copy
+
+FUNCTION(EP_CHECK_FILE_EXISTS FILE OUTVAR TARGET NAME COMMAND WORKING_DIR)
+	string (REPLACE ";" " " COMMAND_STR "${COMMAND}")
+	IF(WIN32)
+		# Do something special for windows...
+		SET(COMMAND "cmd /C \"${COMMAND_STR}\"")
+	ELSE(WIN32)
+		SET(COMMAND "${COMMAND_STR}")
+	ENDIF(WIN32)
+
+	FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${NAME}" "
+IF(EXISTS \"${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${FILE}\")
+	MESSAGE(\"'${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${FILE}' already exists, nothing to be done.\")
+ELSE(EXISTS \"${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${FILE}\")
+	execute_process(COMMAND ${COMMAND} WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${TARGET}/${WORKING_DIR}\")
+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)
+		ADD_CUSTOM_COMMAND(
+			TARGET ${_target} POST_BUILD
+			COMMAND mkdir -p "$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/"
+			COMMENT "Creating '$<TARGET_FILE_DIR:${_target}>/${LIBRAY_DESTINATION}/'..."
+		)
+	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})
+	endif ()
+endmacro(set_policy)
+
+macro(set_if_not_defined VAR VALUE)
+    if (NOT DEFINED ${VAR})
+        set(${VAR} ${VALUE})
+    endif()
+endmacro(set_if_not_defined)
+
+macro(configure_cotire target)
+	# Disable unity build as it doesn't work well for us
+	set_target_properties(${target} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
+
+	cotire(${target})
+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()
+
+		SET(TARGET_COPY_FILES ${TARGET_COPY_FILES} ${file} CACHE INTERNAL "" FORCE)
+	endforeach()
+endmacro(add_target_copy_files)
+
+function(detect_simd_instructions _out_var)
+	if(CMAKE_CROSSCOMPILING)
+		set(${_out_var} "" PARENT_SCOPE)
+	else()
+		message(STATUS "Detecting SIMD features of current CPU...")
+		TRY_RUN(RUN_RESULT COMPILE_RESULT "${CMAKE_BINARY_DIR}/temp" "${CMAKE_SOURCE_DIR}/cmake/cpufeatures.cpp"
+			RUN_OUTPUT_VARIABLE FEATURE_OUTPUT)
+		
+		IF(COMPILE_RESULT)
+			MESSAGE(STATUS "Detected compatibility for the ${FEATURE_OUTPUT} feature set.")
+			SET(${_out_var} ${FEATURE_OUTPUT} PARENT_SCOPE)
+		ELSE(COMPILE_RESULT)
+			MESSAGE("Compilation of CPU feature detector failed, please set the instruction set manually.")
+			set(${_out_var} "" PARENT_SCOPE)
+		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)

cmake/version.cmake

@@ -0,0 +1,52 @@
+
+include(util)
+
+if (EXISTS "${PROJECT_SOURCE_DIR}/version_override.cmake")
+    # This allows to override the values by using a special file
+    include("${PROJECT_SOURCE_DIR}/version_override.cmake")
+endif()
+
+set_if_not_defined(FSO_VERSION_MAJOR 3)
+set_if_not_defined(FSO_VERSION_MINOR 7)
+set_if_not_defined(FSO_VERSION_BUILD 5)
+
+# A numeric revision e.g. the CI build number
+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}")
+    set(FSO_VERSION_HAS_REVISION 0)
+else()
+    set(FSO_VERSION_HAS_REVISION 1)
+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)
+    set(FSO_FULL_VERSION_STRING "${FSO_FULL_VERSION_STRING}.${FSO_VERSION_REVISION_STR}")
+endif()
+
+IF(NOT FSO_VERSION_HAS_REVISION)
+    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)
+	# This is a 64-bit builds
+    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_x64")
+ENDIF()
+
+IF (NOT "${FSO_INSTRUCTION_SET}" STREQUAL "")
+    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_${FSO_INSTRUCTION_SET}")
+ENDIF()
+
+IF (NOT "${FSO_BUILD_POSTFIX}" STREQUAL "")
+    SET(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}_${FSO_BUILD_POSTFIX}")
+ENDIF()
+
+set(CONFIG_POSTFIX "$<$<CONFIG:Release>:>$<$<CONFIG:Debug>:-DEBUG>$<$<CONFIG:FastDebug>:-FASTDBG>")
+set(FSO_BINARY_SUFFIX "${FSO_BINARY_SUFFIX}${CONFIG_POSTFIX}")

code/CMakeLists.txt

@@ -0,0 +1,67 @@
+
+INCLUDE(source_groups.cmake)
+
+INCLUDE(voice_rec.cmake)
+
+ADD_LIBRARY(code STATIC ${file_root} ${VOICE_REC_FILES})
+
+target_compile_features(code PUBLIC ${REQUIRED_CXX_FEATURES})
+
+INCLUDE(default_files.cmake)
+
+if (MSVC)
+	target_compile_definitions(code PUBLIC "PDB_DEBUGGING=1")
+endif(MSVC)
+
+TARGET_INCLUDE_DIRECTORIES(code PUBLIC ${CODE_HEADERS})
+TARGET_INCLUDE_DIRECTORIES(code PUBLIC ${FREESPACE_HEADERS})
+
+TARGET_INCLUDE_DIRECTORIES(code PUBLIC ${GENERATED_SOURCE_DIR})
+TARGET_INCLUDE_DIRECTORIES(code PUBLIC ${GENERATED_SOURCE_DIR}/code)
+
+target_link_libraries(code PUBLIC OpenGL)
+
+TARGET_LINK_LIBRARIES(code PUBLIC ${OPENAL_LIBS})
+TARGET_LINK_LIBRARIES(code PUBLIC ${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 ffmpeg)
+
+TARGET_LINK_LIBRARIES(code PUBLIC platform)
+TARGET_LINK_LIBRARIES(code PUBLIC compiler)
+
+target_link_libraries(code PUBLIC md5)
+
+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 ${MONGOOSE_LIBS})
+ENDIF(UNIX)
+
+IF(FSO_BUILD_TOOLS)
+	ADD_SUBDIRECTORY(cfilearchiver)
+
+	ADD_SUBDIRECTORY(cfileextractor)
+ENDIF(FSO_BUILD_TOOLS)
+
+set_target_properties(code PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "prefix_header.h")
+
+include(util)
+configure_cotire(code)
+
+include(../cmake/Cxx11.cmake)
+
+# Ensure that Xcode generates debug symbols on macOS for Debug builds
+set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS[variant=Debug] "YES")
+set_target_properties(code PROPERTIES XCODE_ATTRIBUTE_COPY_PHASE_STRIP[variant=Debug] "NO")
+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")

code/Makefile.am

@@ -1,915 +0,0 @@
-## code/Makefile.am for fs2_open
-##
-## $Id: Makefile.am,v 1.31.2.10 2007-11-22 04:52:12 taylor Exp $
-
-
-EXTRA_DIST =	\
-	freespace2/app_icon.ico	\
-	freespace2/freespace.rc	\
-	freespace2/freespaceresource.h	\
-	freespace2/goal_com.bmp	\
-	freespace2/goal_fail.bmp	\
-	freespace2/goal_inc.bmp	\
-	freespace2/goal_none.bmp	\
-	freespace2/goal_ord.bmp	\
-	fred2/addvariabledlg.cpp	\
-	fred2/addvariabledlg.h	\
-	fred2/adjustgriddlg.cpp	\
-	fred2/adjustgriddlg.h	\
-	fred2/asteroideditordlg.cpp	\
-	fred2/asteroideditordlg.h	\
-	fred2/bgbitmapdlg.cpp	\
-	fred2/bgbitmapdlg.h	\
-	fred2/briefingeditordlg.cpp	\
-	fred2/briefingeditordlg.h	\
-	fred2/campaigneditordlg.cpp	\
-	fred2/campaigneditordlg.h	\
-	fred2/campaignfilelistbox.cpp	\
-	fred2/campaignfilelistbox.h	\
-	fred2/campaigntreeview.cpp	\
-	fred2/campaigntreeview.h	\
-	fred2/campaigntreewnd.cpp	\
-	fred2/campaigntreewnd.h	\
-	fred2/cmdbrief.cpp	\
-	fred2/cmdbrief.h	\
-	fred2/createwingdlg.cpp	\
-	fred2/createwingdlg.h	\
-	fred2/customwingnames.cpp	\
-	fred2/customwingnames.h	\
-	fred2/debriefingeditordlg.cpp	\
-	fred2/debriefingeditordlg.h	\
-	fred2/dialog1.cpp	\
-	fred2/dialog1.h	\
-	fred2/dumpstats.cpp	\
-	fred2/dumpstats.h	\
-	fred2/editor.h	\
-	fred2/eventeditor.cpp	\
-	fred2/eventeditor.h	\
-	fred2/folderdlg.cpp	\
-	fred2/folderdlg.h	\
-	fred2/fred.cpp	\
-	fred2/fred.h	\
-	fred2/fred.rc	\
-	fred2/freddoc.cpp	\
-	fred2/freddoc.h	\
-	fred2/fredrender.cpp	\
-	fred2/fredrender.h	\
-	fred2/fredstubs.cpp	\
-	fred2/fredview.cpp	\
-	fred2/fredview.h	\
-	fred2/grid.cpp	\
-	fred2/grid.h	\
-	fred2/ignoreordersdlg.cpp	\
-	fred2/ignoreordersdlg.h	\
-	fred2/initialships.cpp	\
-	fred2/initialships.h	\
-	fred2/initialstatus.cpp	\
-	fred2/initialstatus.h	\
-	fred2/mainfrm.cpp	\
-	fred2/mainfrm.h	\
-	fred2/makehelp.bat	\
-	fred2/management.cpp	\
-	fred2/management.h	\
-	fred2/messageeditordlg.cpp	\
-	fred2/messageeditordlg.h	\
-	fred2/missiongoalsdlg.cpp	\
-	fred2/missiongoalsdlg.h	\
-	fred2/missionnotesdlg.cpp	\
-	fred2/missionnotesdlg.h	\
-	fred2/missionsave.cpp	\
-	fred2/missionsave.h	\
-	fred2/modifyvariabledlg.cpp	\
-	fred2/modifyvariabledlg.h	\
-	fred2/operatorargtypeselect.cpp	\
-	fred2/operatorargtypeselect.h	\
-	fred2/orienteditor.cpp	\
-	fred2/orienteditor.h	\
-	fred2/playerstarteditor.cpp	\
-	fred2/playerstarteditor.h	\
-	fred2/prefsdlg.cpp	\
-	fred2/prefsdlg.h	\
-	fred2/reinforcementeditordlg.cpp	\
-	fred2/reinforcementeditordlg.h	\
-	fred2/resource.h	\
-	fred2/resource.hm	\
-	fred2/setglobalshipflags.cpp	\
-	fred2/setglobalshipflags.h	\
-	fred2/sexp_tree.cpp	\
-	fred2/sexp_tree.h	\
-	fred2/shieldsysdlg.cpp	\
-	fred2/shieldsysdlg.h	\
-	fred2/ship_select.cpp	\
-	fred2/ship_select.h	\
-	fred2/shipchecklistbox.cpp	\
-	fred2/shipchecklistbox.h	\
-	fred2/shipclasseditordlg.cpp	\
-	fred2/shipclasseditordlg.h	\
-	fred2/shipeditordlg.cpp	\
-	fred2/shipeditordlg.h	\
-	fred2/shipflagsdlg.cpp	\
-	fred2/shipflagsdlg.h	\
-	fred2/shipgoalsdlg.cpp	\
-	fred2/shipgoalsdlg.h	\
-	fred2/shipspecialdamage.cpp	\
-	fred2/shipspecialdamage.h	\
-	fred2/shipspecialhitpoints.cpp	\
-	fred2/shipspecialhitpoints.h	\
-	fred2/shiptexturesdlg.cpp	\
-	fred2/shiptexturesdlg.h	\
-	fred2/starfieldeditor.cpp	\
-	fred2/starfieldeditor.h	\
-	fred2/stdafx.cpp	\
-	fred2/stdafx.h	\
-	fred2/textviewdlg.cpp	\
-	fred2/textviewdlg.h	\
-	fred2/voiceactingmanager.cpp	\
-	fred2/voiceactingmanager.h	\
-	fred2/waypointpathdlg.cpp	\
-	fred2/waypointpathdlg.h	\
-	fred2/weaponeditordlg.cpp	\
-	fred2/weaponeditordlg.h	\
-	fred2/wing.cpp	\
-	fred2/wing.h	\
-	fred2/wing_editor.cpp	\
-	fred2/wing_editor.h	\
-	fred2/hlp/afxcore.rtf	\
-	fred2/hlp/afxhelp.hm	\
-	fred2/hlp/afxprint.rtf	\
-	fred2/hlp/appexit.bmp	\
-	fred2/hlp/bullet.bmp	\
-	fred2/hlp/curarw2.bmp	\
-	fred2/hlp/curarw4.bmp	\
-	fred2/hlp/curhelp.bmp	\
-	fred2/hlp/editcopy.bmp	\
-	fred2/hlp/editcut.bmp	\
-	fred2/hlp/editpast.bmp	\
-	fred2/hlp/editundo.bmp	\
-	fred2/hlp/filenew.bmp	\
-	fred2/hlp/fileopen.bmp	\
-	fred2/hlp/fileprnt.bmp	\
-	fred2/hlp/filesave.bmp	\
-	fred2/hlp/fred.hm	\
-	fred2/hlp/fred.hpj	\
-	fred2/hlp/help.log	\
-	fred2/hlp/hlpsbar.bmp	\
-	fred2/hlp/hlptbar.bmp	\
-	fred2/hlp/recfirst.bmp	\
-	fred2/hlp/reclast.bmp	\
-	fred2/hlp/recnext.bmp	\
-	fred2/hlp/recprev.bmp	\
-	fred2/hlp/scmax.bmp	\
-	fred2/hlp/scmenu.bmp	\
-	fred2/hlp/scmin.bmp	\
-	fred2/res/bitmap1.bmp	\
-	fred2/res/black_do.bmp	\
-	fred2/res/bmp00001.bmp	\
-	fred2/res/chained.bmp	\
-	fred2/res/chained_directive.bmp	\
-	fred2/res/cursor1.cur	\
-	fred2/res/cursor2.cur	\
-	fred2/res/data.bmp	\
-	fred2/res/fred.ico	\
-	fred2/res/fred.rc2	\
-	fred2/res/freddoc.ico	\
-	fred2/res/green_do.bmp	\
-	fred2/res/root.bmp	\
-	fred2/res/root_directive.bmp	\
-	fred2/res/toolbar.bmp	\
-	fred2/res/toolbar1.bmp	\
-	fred2/res/variable.bmp	\
-	sound/phrases.xml	\
-	sound/gc.exe	\
-	wxfred2/res/fred.ico	\
-	wxfred2/wxfred.xrc
-
-
-# D_ variants are defaults and should always be used
-# FS2_ variants are for game building and wxFRED
-AM_CXXFLAGS = @D_CFLAGS@ @FS2_CXXFLAGS@ -I./$(VPATH)/../mongoose
-AM_LDFLAGS = @D_LDFLAGS@ @FS2_LDFLAGS@
-
-if BUILD_WXFRED
-LIBCODE=
-else
-LIBCODE=libcode.a
-endif
-noinst_LIBRARIES = $(LIBCODE)
-bin_PROGRAMS = @FS2_BINARY@
-
-EXTRA_PROGRAMS = fs2_open_@PACKAGE_VERSION@ \
-	fs2_open_@PACKAGE_VERSION@_DEBUG \
-	wxFRED2_@PACKAGE_VERSION@ \
-	wxFRED2_@PACKAGE_VERSION@_DEBUG
-
-###############################################################################
-##
-## Begin CORE library
-##
-
-FS2_SOURCES =	\
-	ai/ai.cpp	\
-	ai/ai.h	\
-	ai/aibig.cpp	\
-	ai/aibig.h	\
-	ai/aicode.cpp	\
-	ai/aigoals.cpp	\
-	ai/aigoals.h	\
-	ai/aiinternal.h	\
-	ai/aiturret.cpp	\
-	ai/ai_profiles.cpp	\
-	ai/ai_profiles.h	\
-	anim/animplay.cpp	\
-	anim/animplay.h	\
-	anim/packunpack.cpp	\
-	anim/packunpack.h	\
-	asteroid/asteroid.cpp	\
-	asteroid/asteroid.h	\
-	autopilot/autopilot.cpp	\
-	autopilot/autopilot.h	\
-	bmpman/bm_internal.h	\
-	bmpman/bmpman.cpp	\
-	bmpman/bmpman.h	\
-	camera/camera.cpp	\
-	camera/camera.h	\
-	cfile/cfile.cpp	\
-	cfile/cfile.h	\
-	cfile/cfilearchive.cpp	\
-	cfile/cfilearchive.h	\
-	cfile/cfilelist.cpp	\
-	cfile/cfilesystem.cpp	\
-	cfile/cfilesystem.h	\
-	cmdline/cmdline.cpp	\
-	cmdline/cmdline.h	\
-	cmeasure/cmeasure.cpp	\
-	cmeasure/cmeasure.h	\
-	controlconfig/controlsconfig.cpp	\
-	controlconfig/controlsconfig.h	\
-	controlconfig/controlsconfigcommon.cpp	\
-	cutscene/cutscenes.cpp	\
-	cutscene/cutscenes.h	\
-	cutscene/decoder16.cpp	\
-	cutscene/decoder8.cpp	\
-	cutscene/movie.cpp	\
-	cutscene/movie.h	\
-	cutscene/mve_audio.cpp	\
-	cutscene/mvelib.cpp	\
-	cutscene/mvelib.h	\
-	cutscene/mveplayer.cpp	\
-	cutscene/oggplayer.cpp	\
-	cutscene/oggplayer.h	\
-	ddsutils/ddsutils.cpp	\
-	ddsutils/ddsutils.h	\
-	debris/debris.cpp	\
-	debris/debris.h	\
-	debugconsole/console.cpp	\
-	debugconsole/console.h	\
-	debugconsole/consolecmds.cpp	\
-	debugconsole/consoleparse.cpp	\
-	debugconsole/consoleparse.h	\
-	exceptionhandler/exceptionhandler.cpp	\
-	exceptionhandler/exceptionhandler.h	\
-	external_dll/externalcode.h		\
-	external_dll/trackirglobal.cpp	\
-	external_dll/trackirglobal.h	\
-	fireball/fireballs.cpp	\
-	fireball/fireballs.h	\
-	fireball/warpineffect.cpp	\
-	fs2netd/fs2netd_client.cpp	\
-	fs2netd/fs2netd_client.h	\
-	fs2netd/tcp_client.cpp	\
-	fs2netd/tcp_client.h	\
-	fs2netd/tcp_socket.cpp	\
-	fs2netd/tcp_socket.h	\
-	fs2netd/protocol.h	\
-	gamehelp/contexthelp.cpp	\
-	gamehelp/contexthelp.h	\
-	gamehelp/gameplayhelp.cpp	\
-	gamehelp/gameplayhelp.h	\
-	gamesequence/gamesequence.cpp	\
-	gamesequence/gamesequence.h	\
-	gamesnd/eventmusic.cpp	\
-	gamesnd/eventmusic.h	\
-	gamesnd/gamesnd.cpp	\
-	gamesnd/gamesnd.h	\
-	globalincs/alphacolors.cpp	\
-	globalincs/alphacolors.h	\
-	globalincs/def_files.cpp	\
-	globalincs/def_files.h	\
-	globalincs/fsmemory.cpp	\
-	globalincs/fsmemory.h	\
-	globalincs/globals.h	\
-	globalincs/linklist.h	\
-	globalincs/profiling.cpp	\
-	globalincs/pstypes.h	\
-	globalincs/safe_strings.cpp	\
-	globalincs/safe_strings.h	\
-	globalincs/safe_strings_test.cpp	\
-	globalincs/systemvars.cpp	\
-	globalincs/systemvars.h	\
-	globalincs/version.cpp	\
-	globalincs/version.h	\
-	graphics/2d.cpp	\
-	graphics/2d.h	\
-	graphics/font.cpp	\
-	graphics/font.h	\
-	graphics/generic.cpp	\
-	graphics/generic.h	\
-	graphics/grbatch.cpp	\
-	graphics/grbatch.h	\
-	graphics/grinternal.h	\
-	graphics/gropengl.cpp	\
-	graphics/gropengl.h	\
-	graphics/gropenglbmpman.cpp	\
-	graphics/gropenglbmpman.h	\
-	graphics/gropengldraw.cpp	\
-	graphics/gropengldraw.h	\
-	graphics/gropenglextension.cpp	\
-	graphics/gropenglextension.h	\
-	graphics/gropengllight.cpp	\
-	graphics/gropengllight.h	\
-	graphics/gropenglpostprocessing.cpp	\
-	graphics/gropenglpostprocessing.h	\
-	graphics/gropenglshader.cpp	\
-	graphics/gropenglshader.h	\
-	graphics/gropenglstate.cpp	\
-	graphics/gropenglstate.h	\
-	graphics/gropengltexture.cpp	\
-	graphics/gropengltexture.h	\
-	graphics/gropengltnl.cpp	\
-	graphics/gropengltnl.h	\
-	graphics/grstub.cpp	\
-	graphics/grstub.h	\
-	graphics/line.h	\
-	graphics/shadows.cpp \
-	graphics/tmapper.h	\
-	hud/hud.cpp	\
-	hud/hud.h	\
-	hud/hudartillery.cpp	\
-	hud/hudartillery.h	\
-	hud/hudbrackets.cpp	\
-	hud/hudbrackets.h	\
-	hud/hudconfig.cpp	\
-	hud/hudconfig.h	\
-	hud/hudescort.cpp	\
-	hud/hudescort.h	\
-	hud/hudets.cpp	\
-	hud/hudets.h	\
-	hud/hudgauges.h	\
-	hud/hudlock.cpp	\
-	hud/hudlock.h	\
-	hud/hudmessage.cpp	\
-	hud/hudmessage.h	\
-	hud/hudnavigation.cpp	\
-	hud/hudnavigation.h	\
-	hud/hudobserver.cpp	\
-	hud/hudobserver.h	\
-	hud/hudparse.cpp	\
-	hud/hudparse.h	\
-	hud/hudreticle.cpp	\
-	hud/hudreticle.h	\
-	hud/hudshield.cpp	\
-	hud/hudshield.h	\
-	hud/hudsquadmsg.cpp	\
-	hud/hudsquadmsg.h	\
-	hud/hudtarget.cpp	\
-	hud/hudtarget.h	\
-	hud/hudtargetbox.cpp	\
-	hud/hudtargetbox.h	\
-	hud/hudwingmanstatus.cpp	\
-	hud/hudwingmanstatus.h	\
-	iff_defs/iff_defs.cpp	\
-	iff_defs/iff_defs.h	\
-	inetfile/cftp.cpp	\
-	inetfile/cftp.h	\
-	inetfile/chttpget.cpp	\
-	inetfile/chttpget.h	\
-	inetfile/inetgetfile.cpp	\
-	inetfile/inetgetfile.h	\
-	io/cursor.cpp	\
-	io/cursor.h	\
-	io/key.cpp	\
-	io/key.h	\
-	io/keycontrol.cpp	\
-	io/keycontrol.h	\
-	io/mouse.cpp	\
-	io/mouse.h	\
-	io/timer.cpp	\
-	io/timer.h	\
-	jpgutils/jpgutils.cpp	\
-	jpgutils/jpgutils.h	\
-	jumpnode/jumpnode.cpp	\
-	jumpnode/jumpnode.h	\
-	lab/lab.cpp	\
-	lab/lab.h	\
-	lab/wmcgui.cpp	\
-	lab/wmcgui.h	\
-	lighting/lighting.cpp	\
-	lighting/lighting.h	\
-	localization/fhash.cpp	\
-	localization/fhash.h	\
-	localization/localize.cpp	\
-	localization/localize.h	\
-	math/fix.cpp	\
-	math/fix.h	\
-	math/floating.cpp	\
-	math/floating.h	\
-	math/fvi.cpp	\
-	math/fvi.h	\
-	math/spline.cpp	\
-	math/spline.h	\
-	math/staticrand.cpp	\
-	math/staticrand.h	\
-	math/vecmat.cpp	\
-	math/vecmat.h	\
-	menuui/barracks.cpp	\
-	menuui/barracks.h	\
-	menuui/credits.cpp	\
-	menuui/credits.h	\
-	menuui/fishtank.cpp	\
-	menuui/fishtank.h	\
-	menuui/mainhallmenu.cpp	\
-	menuui/mainhallmenu.h	\
-	menuui/mainhalltemp.cpp	\
-	menuui/mainhalltemp.h	\
-	menuui/optionsmenu.cpp	\
-	menuui/optionsmenu.h	\
-	menuui/optionsmenumulti.cpp	\
-	menuui/optionsmenumulti.h	\
-	menuui/playermenu.cpp	\
-	menuui/playermenu.h	\
-	menuui/readyroom.cpp	\
-	menuui/readyroom.h	\
-	menuui/snazzyui.cpp	\
-	menuui/snazzyui.h	\
-	menuui/techmenu.cpp	\
-	menuui/techmenu.h	\
-	menuui/trainingmenu.cpp	\
-	menuui/trainingmenu.h	\
-	mission/missionbriefcommon.cpp	\
-	mission/missionbriefcommon.h	\
-	mission/missioncampaign.cpp	\
-	mission/missioncampaign.h	\
-	mission/missiongoals.cpp	\
-	mission/missiongoals.h	\
-	mission/missiongrid.cpp	\
-	mission/missiongrid.h	\
-	mission/missionhotkey.cpp	\
-	mission/missionhotkey.h	\
-	mission/missionload.cpp	\
-	mission/missionload.h	\
-	mission/missionlog.cpp	\
-	mission/missionlog.h	\
-	mission/missionmessage.cpp	\
-	mission/missionmessage.h	\
-	mission/missionparse.cpp	\
-	mission/missionparse.h	\
-	mission/missiontraining.cpp	\
-	mission/missiontraining.h	\
-	missionui/chatbox.cpp	\
-	missionui/chatbox.h	\
-	missionui/fictionviewer.cpp	\
-	missionui/fictionviewer.h	\
-	missionui/missionbrief.cpp	\
-	missionui/missionbrief.h	\
-	missionui/missioncmdbrief.cpp	\
-	missionui/missioncmdbrief.h	\
-	missionui/missiondebrief.cpp	\
-	missionui/missiondebrief.h	\
-	missionui/missionloopbrief.cpp	\
-	missionui/missionloopbrief.h	\
-	missionui/missionpause.cpp	\
-	missionui/missionpause.h	\
-	missionui/missionscreencommon.cpp	\
-	missionui/missionscreencommon.h	\
-	missionui/missionshipchoice.cpp	\
-	missionui/missionshipchoice.h	\
-	missionui/missionweaponchoice.cpp	\
-	missionui/missionweaponchoice.h	\
-	missionui/redalert.cpp	\
-	missionui/redalert.h	\
-	mod_table/mod_table.cpp \
-	mod_table/mod_table.h \
-	model/model.h	\
-	model/modelanim.cpp	\
-	model/modelanim.h	\
-	model/modelcollide.cpp	\
-	model/modelinterp.cpp	\
-	model/modelsinc.h	\
-	model/modeloctant.cpp	\
-	model/modelread.cpp	\
-	model/modelrender.cpp   \
-	nebula/neb.cpp	\
-	nebula/neb.h	\
-	nebula/neblightning.cpp	\
-	nebula/neblightning.h	\
-	network/chat_api.cpp	\
-	network/chat_api.h	\
-	network/multi.cpp	\
-	network/multi.h	\
-	network/multilag.cpp	\
-	network/multilag.h	\
-	network/multimsgs.cpp	\
-	network/multimsgs.h	\
-	network/multiteamselect.cpp	\
-	network/multiteamselect.h	\
-	network/multiui.cpp	\
-	network/multiui.h	\
-	network/multiutil.cpp	\
-	network/multiutil.h	\
-	network/multi_campaign.cpp	\
-	network/multi_campaign.h	\
-	network/multi_data.cpp	\
-	network/multi_data.h	\
-	network/multi_dogfight.cpp	\
-	network/multi_dogfight.h	\
-	network/multi_endgame.cpp	\
-	network/multi_endgame.h	\
-	network/multi_ingame.cpp	\
-	network/multi_ingame.h	\
-	network/multi_kick.cpp	\
-	network/multi_kick.h	\
-	network/multi_log.cpp	\
-	network/multi_log.h	\
-	network/multi_obj.cpp	\
-	network/multi_obj.h	\
-	network/multi_observer.cpp	\
-	network/multi_observer.h	\
-	network/multi_options.cpp	\
-	network/multi_options.h	\
-	network/multi_pause.cpp	\
-	network/multi_pause.h	\
-	network/multi_pinfo.cpp	\
-	network/multi_pinfo.h	\
-	network/multi_ping.cpp	\
-	network/multi_ping.h	\
-	network/multi_pmsg.cpp	\
-	network/multi_pmsg.h	\
-	network/multi_pxo.cpp	\
-	network/multi_pxo.h	\
-	network/multi_rate.cpp	\
-	network/multi_rate.h	\
-	network/multi_respawn.cpp	\
-	network/multi_respawn.h	\
-	network/multi_sexp.cpp	\
-	network/multi_sexp.h	\
-	network/multi_team.cpp	\
-	network/multi_team.h	\
-	network/multi_update.h	\
-	network/multi_voice.cpp	\
-	network/multi_voice.h	\
-	network/multi_xfer.cpp	\
-	network/multi_xfer.h	\
-	network/psnet2.cpp	\
-	network/psnet2.h	\
-	network/stand_gui.cpp	\
-	network/stand_gui-unix.cpp	\
-	network/stand_gui.h	\
-	object/collidedebrisship.cpp	\
-	object/collidedebrisweapon.cpp	\
-	object/collideshipship.cpp	\
-	object/collideshipweapon.cpp	\
-	object/collideweaponweapon.cpp	\
-	object/deadobjectdock.cpp	\
-	object/deadobjectdock.h	\
-	object/objcollide.cpp	\
-	object/objcollide.h	\
-	object/objectdock.cpp	\
-	object/objectdock.h	\
-	object/object.cpp	\
-	object/object.h	\
-	object/objectshield.cpp	\
-	object/objectshield.h	\
-	object/objectsnd.cpp	\
-	object/objectsnd.h	\
-	object/objectsort.cpp	\
-	object/parseobjectdock.cpp	\
-	object/parseobjectdock.h	\
-	object/waypoint.cpp	\
-	object/waypoint.h	\
-	observer/observer.cpp	\
-	observer/observer.h	\
-	osapi/dialogs.cpp	\
-	osapi/dialogs.h	\
-	osapi/osapi.cpp	\
-	osapi/osapi.h	\
-	osapi/osregistry.cpp	\
-	osapi/osregistry.h  \
-	osapi/outwnd.cpp	\
-	osapi/outwnd.h \
-	palman/palman.cpp	\
-	palman/palman.h	\
-	parse/encrypt.cpp	\
-	parse/encrypt.h	\
-	parse/generic_log.cpp	\
-	parse/generic_log.h	\
-	parse/lua.cpp	\
-	parse/lua.h	\
-	parse/parselo.cpp	\
-	parse/parselo.h	\
-	parse/scripting.cpp	\
-	parse/scripting.h	\
-	parse/sexp.cpp	\
-	parse/sexp.h	\
-	particle/particle.cpp	\
-	particle/particle.h	\
-	pcxutils/pcxutils.cpp	\
-	pcxutils/pcxutils.h	\
-	pilotfile/pilotfile.cpp	\
-	pilotfile/pilotfile.h	\
-	pilotfile/pilotfile_convert.cpp	\
-	pilotfile/pilotfile_convert.h	\
-	pilotfile/plr.cpp	\
-	pilotfile/csg.cpp	\
-	pilotfile/plr_convert.cpp	\
-	pilotfile/csg_convert.cpp	\
-	pngutils/pngutils.cpp	\
-	pngutils/pngutils.h	\
-	physics/physics.cpp	\
-	physics/physics.h	\
-	playerman/managepilot.cpp	\
-	playerman/managepilot.h	\
-	playerman/player.h	\
-	playerman/playercontrol.cpp	\
-	popup/popup.cpp	\
-	popup/popup.h	\
-	popup/popupdead.cpp	\
-	popup/popupdead.h	\
-	radar/radar.cpp	\
-	radar/radar.h	\
-	radar/radardradis.cpp	\
-	radar/radardradis.h	\
-	radar/radarorb.cpp	\
-	radar/radarorb.h	\
-	radar/radarsetup.cpp	\
-	radar/radarsetup.h	\
-	render/3d.h	\
-	render/3dclipper.cpp	\
-	render/3ddraw.cpp	\
-	render/3dinternal.h	\
-	render/3dlaser.cpp	\
-	render/3dmath.cpp	\
-	render/3dsetup.cpp	\
-	ship/afterburner.cpp	\
-	ship/afterburner.h	\
-	ship/awacs.cpp	\
-	ship/awacs.h	\
-	ship/shield.cpp	\
-	ship/ship.cpp	\
-	ship/ship.h	\
-	ship/shipcontrails.cpp	\
-	ship/shipcontrails.h	\
-	ship/shipfx.cpp	\
-	ship/shipfx.h	\
-	ship/shiphit.cpp	\
-	ship/shiphit.h	\
-	ship/subsysdamage.h	\
-	sound/audiostr.cpp	\
-	sound/audiostr.h	\
-	sound/acm.cpp	\
-	sound/acm.h	\
-	sound/ds.cpp	\
-	sound/ds.h	\
-	sound/ds3d.cpp	\
-	sound/ds3d.h	\
-	sound/dscap.cpp	\
-	sound/dscap.h	\
-	sound/fsspeech.cpp	\
-	sound/fsspeech.h	\
-	sound/openal.cpp	\
-	sound/openal.h	\
-	sound/rtvoice.cpp	\
-	sound/rtvoice.h	\
-	sound/sound.cpp	\
-	sound/sound.h	\
-	sound/speech.cpp	\
-	sound/speech.h	\
-	sound/voicerec.cpp	\
-	sound/voicerec.h	\
-	sound/ogg/ogg.cpp	\
-	sound/ogg/ogg.h	\
-	species_defs/species_defs.cpp	\
-	species_defs/species_defs.h	\
-	starfield/nebula.cpp	\
-	starfield/nebula.h	\
-	starfield/starfield.cpp	\
-	starfield/starfield.h	\
-	starfield/supernova.cpp	\
-	starfield/supernova.h	\
-	stats/medals.cpp	\
-	stats/medals.h	\
-	stats/scoring.cpp	\
-	stats/scoring.h	\
-	stats/stats.cpp	\
-	stats/stats.h	\
-	tgautils/tgautils.cpp	\
-	tgautils/tgautils.h	\
-	ui/button.cpp	\
-	ui/checkbox.cpp	\
-	ui/gadget.cpp	\
-	ui/icon.cpp	\
-	ui/inputbox.cpp	\
-	ui/keytrap.cpp	\
-	ui/listbox.cpp	\
-	ui/radio.cpp	\
-	ui/scroll.cpp	\
-	ui/slider.cpp	\
-	ui/slider2.cpp	\
-	ui/ui.h	\
-	ui/uidefs.h	\
-	ui/uidraw.cpp	\
-	ui/uimouse.cpp	\
-	ui/window.cpp	\
-	weapon/beam.cpp	\
-	weapon/beam.h	\
-	weapon/corkscrew.cpp	\
-	weapon/corkscrew.h	\
-	weapon/emp.cpp	\
-	weapon/emp.h	\
-	weapon/flak.cpp	\
-	weapon/flak.h	\
-	weapon/muzzleflash.cpp	\
-	weapon/muzzleflash.h	\
-	weapon/shockwave.cpp	\
-	weapon/shockwave.h	\
-	weapon/swarm.cpp	\
-	weapon/swarm.h	\
-	weapon/trails.cpp	\
-	weapon/trails.h	\
-	weapon/weapons.cpp	\
-	weapon/weapon.h
-
-## conditional includes follow:
-
-## joystic support sources
-if FS2_OS_WIN32
-JOY_SOURCES =	\
-	io/joy.cpp	\
-	io/joy.h	\
-	io/joy_ff.cpp	\
-	io/joy_ff.h	\
-	io/sw_error.hpp	\
-	io/sw_force.h	\
-	io/sw_guid.hpp	\
-	io/swff_lib.cpp
-endif
-
-if FS2_OS_UNIX
-JOY_SOURCES =	\
-	io/joy.h	\
-	io/joy_ff.h	\
-	io/joy_ff-sdl.cpp	\
-	io/joy-sdl.cpp
-endif
-
-## Win32-specific sources
-if FS2_OS_WIN32
-WIN32_SOURCES =	\
-	directx/vasync.h	\
-	directx/vd3dtypes.h	\
-	directx/vddraw.h	\
-	directx/vdinput.h	\
-	directx/vdplay.h	\
-	directx/vdplobby.h	\
-	directx/vdsetup.h	\
-	directx/vdvp.h	\
-	globalincs/windebug.cpp	\
-	graphics/gl/GLAUX.H	\
-	graphics/gl/GLU.H	\
-	graphics/gl/Gl.h	\
-	graphics/gl/Glext.h	\
-	graphics/gl/wglext.h	\
-	osapi/monopub.h
-endif
-
-## Unix-specific sources
-if FS2_OS_UNIX
-UNIX_SOURCES =	\
-	windows_stub/stubs.cpp	\
-	windows_stub/config.h
-endif
-
-
-## libcode.a
-libcode_a_SOURCES = ${FS2_SOURCES} ${JOY_SOURCES} ${WIN32_SOURCES}	\
-	${UNIX_SOURCES}
-
-##
-## End CODE library
-##
-###############################################################################
-
-###############################################################################
-##
-## Begin MAIN fs2 binary
-##
-
-FS2OPEN_SOURCES = \
-	freespace2/freespace.cpp	\
-	freespace2/freespace.h	\
-	freespace2/levelpaging.cpp	\
-	freespace2/levelpaging.h
-
-fs2_open_@PACKAGE_VERSION@_DEBUG_SOURCES =	\
-	${FS2OPEN_SOURCES}
-
-fs2_open_@PACKAGE_VERSION@_SOURCES =	\
-	${FS2OPEN_SOURCES}
-
-fs2_open_@PACKAGE_VERSION@_DEBUG_LDADD = libcode.a ../mongoose/libmongoose.a
-fs2_open_@PACKAGE_VERSION@_LDADD = libcode.a ../mongoose/libmongoose.a
-
-##
-## End MAIN binary
-##
-###############################################################################
-
-###############################################################################
-##
-## Begin wxFRED2 binary
-##
-
-wxFRED_SOURCES = \
-	wxfred2/res/select.png.h \
-	wxfred2/res/constz.png.h \
-	wxfred2/res/constx.png.h \
-	wxfred2/res/selectrot.png.h \
-	wxfred2/res/constyz.png.h \
-	wxfred2/res/constxy.png.h \
-	wxfred2/res/wingform.png.h \
-	wxfred2/res/zoomsel.png.h \
-	wxfred2/res/constxz.png.h \
-	wxfred2/res/consty.png.h \
-	wxfred2/res/wingdisband.png.h \
-	wxfred2/res/showdist.png.h \
-	wxfred2/res/orbitsel.png.h \
-	wxfred2/res/zoomext.png.h \
-	wxfred2/res/rotlocal.png.h \
-	wxfred2/res/selectmove.png.h \
-	wxfred2/res/selectlock.png.h \
-	wxfred2/res/selectlist.png.h \
-	wxfred2/base/wxfred_base.h \
-	wxfred2/base/wxfred_base.cpp \
-	wxfred2/editors/dlgobjecteditor.h \
-	wxfred2/editors/dlgobjecteditor.cpp \
-	wxfred2/editors/dlgvoiceactingmanager.h \
-	wxfred2/editors/frmdebriefingeditor.h \
-	wxfred2/editors/dlgbackgroundeditor.cpp \
-	wxfred2/editors/dlgmissionobjectiveseditor.cpp \
-	wxfred2/editors/frmbriefingeditor.cpp \
-	wxfred2/editors/frmteamloadouteditor.h \
-	wxfred2/editors/dlgmissionobjectiveseditor.h \
-	wxfred2/editors/dlgmissionspecseditor.h \
-	wxfred2/editors/frmdebriefingeditor.cpp \
-	wxfred2/editors/dlgfictionviewer.cpp \
-	wxfred2/editors/dlgvoiceactingmanager.cpp \
-	wxfred2/editors/dlgsoundenvironment.cpp \
-	wxfred2/editors/frmcommandbriefingeditor.cpp \
-	wxfred2/editors/frmbriefingeditor.h \
-	wxfred2/editors/dlgshieldsystemeditor.h \
-	wxfred2/editors/dlgreinforcementseditor.h \
-	wxfred2/editors/dlgeventseditor.h \
-	wxfred2/editors/frmteamloadouteditor.cpp \
-	wxfred2/editors/frmcommandbriefingeditor.h \
-	wxfred2/editors/frmwaypointeditor.h \
-	wxfred2/editors/dlgasteroidfieldeditor.h \
-	wxfred2/editors/dlgsetglobalshipflagseditor.cpp \
-	wxfred2/editors/dlgshieldsystemeditor.cpp \
-	wxfred2/editors/frmshipseditor.h \
-	wxfred2/editors/dlgfictionviewer.h \
-	wxfred2/editors/dlgreinforcementspicker.cpp \
-	wxfred2/editors/frmcampaigneditor.cpp \
-	wxfred2/editors/dlgasteroidfieldeditor.cpp \
-	wxfred2/editors/dlgreinforcementspicker.h \
-	wxfred2/editors/dlgreinforcementseditor.cpp \
-	wxfred2/editors/frmcampaigneditor.h \
-	wxfred2/editors/dlgbackgroundeditor.h \
-	wxfred2/editors/frmshipseditor.cpp \
-	wxfred2/editors/dlgeventseditor.cpp \
-	wxfred2/editors/dlgsetglobalshipflagseditor.h \
-	wxfred2/editors/frmwingeditor.h \
-	wxfred2/editors/frmwingeditor.cpp \
-	wxfred2/editors/frmwaypointeditor.cpp \
-	wxfred2/editors/dlgsoundenvironment.h \
-	wxfred2/editors/dlgmissionspecseditor.cpp \
-	wxfred2/glcviewport.h \
-	wxfred2/misc/dlgmissionstats.h \
-	wxfred2/misc/dlgmissionstats.cpp \
-	wxfred2/wxfred2.cpp \
-	wxfred2/wxfred2.h \
-	wxfred2/help/dlgsexphelp.h \
-	wxfred2/help/dlgsexphelp.cpp \
-	wxfred2/help/dlgaboutbox.h \
-	wxfred2/help/dlgaboutbox.cpp \
-	wxfred2/frmfred2.h \
-	wxfred2/frmfred2.cpp
-
-wxFRED2_@PACKAGE_VERSION@_DEBUG_SOURCES = \
-	${wxFRED_SOURCES}
-
-wxFRED2_@PACKAGE_VERSION@_SOURCES =	\
-	${wxFRED_SOURCES}
-
-##
-## End wxFRED2 binary
-##
-###############################################################################

code/ai/ai.h

@@ -18,8 +18,9 @@
 #include "globalincs/systemvars.h"
 #include "object/waypoint.h"
 #include "physics/physics.h"
+#include "ship/ship_flags.h"
 
-struct ship_weapon;
+class ship_weapon;
 class ship_subsys;
 class object;
 class ship_info;
@@ -27,48 +28,13 @@ class ship_info;
 #define	AI_DEFAULT_CLASS 3  // default AI class for new ships (Fred)
 
 typedef struct ai_flag_name {
-	int flag;
+	AI::AI_Flags 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.
@@ -100,19 +66,6 @@ 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
@@ -120,23 +73,13 @@ 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
-	int	flags;				// one of the AIGF_* values above
+	flagset<AI::Goal_Flags>	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
 
@@ -227,10 +170,8 @@ 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];
-	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;	
+	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
 
 	//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];		
@@ -327,7 +268,7 @@ extern pnode	*Ppfp;			//	Free pointer in path points.
 #define MAX_IGNORE_NEW_OBJECTS	7
 
 typedef struct ai_info {
-	int		ai_flags;				//	Special flags for AI behavior.
+	flagset<AI::AI_Flags> 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. 
@@ -460,8 +401,7 @@ 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;
-	int		ai_profile_flags;	//Holds AI_Profiles flags (possibly overriden by AI class) that actually apply to AI
-	int		ai_profile_flags2;	
+	flagset<AI::Profile_Flags> ai_profile_flags;	//Holds AI_Profiles flags (possibly overriden by AI class) that actually apply to AI
 
 
 	union {
@@ -545,7 +485,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)
 
-	int		ai_override_flags;			// flags for marking ai overrides from sexp or lua systems
+	flagset<AI::Maneuver_Override_Flags>	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;
@@ -619,7 +559,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);
+extern void ai_attack_object(object *attacker, object *attacked, ship_subsys *ssp, int ship_info_index = -1);
 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);
@@ -628,7 +568,7 @@ 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 *hitpos, int shield_quadrant, vec3d *hit_normal);
-extern void ai_ship_destroy(int shipnum, int method);
+extern void ai_ship_destroy(int shipnum, Ship::Exit_Flags method);
 extern void ai_turn_towards_vector(vec3d *dest, object *objp, float frametime, float turn_time, vec3d *slide_vec, vec3d *rel_pos, float bank_override, int flags, vec3d *rvec = NULL, int sexp_flags = 0);
 extern void init_ai_object(int objnum);
 extern void ai_init(void);				//	Call this one to parse ai.tbl.
@@ -689,7 +629,7 @@ 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);
+extern int find_enemy(int objnum, float range, int max_attackers, int ship_info_index = -1);
 
 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);
@@ -711,7 +651,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 get_nearest_objnum(int objnum, int enemy_team_mask, int enemy_wing, float range, int max_attackers, int ship_info_index);
 
 // moved to header file by Goober5000
 void ai_announce_ship_dying(object *dying_objp);

code/ai/ai_flags.h

@@ -0,0 +1,121 @@
+#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,
+        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_additive_weapon_velocity,
+        Use_newtonian_dampening,
+        Use_only_single_fov_for_turrets,
+
+		NUM_VALUES
+	};
+}
+
+#endif

code/ai/ai_profiles.cpp

@@ -7,8 +7,9 @@
 
 
 
+#include "globalincs/pstypes.h"
+#include "def_files/def_files.h"
 #include "ai/ai_profiles.h"
-#include "globalincs/def_files.h"
 #include "globalincs/pstypes.h"
 #include "localization/localize.h"
 #include "parse/parselo.h"
@@ -27,28 +28,17 @@ static char Default_profile_name[NAME_LENGTH];
 
 
 // utility
-void set_flag(ai_profile_t *profile, char *name, int flag, int type)
+void set_flag(ai_profile_t *profile, const char *name, AI::Profile_Flags flag)
 {
 	if (optional_string(name))
 	{
 		bool val;
 		stuff_boolean(&val);
-
-		if (type == AIP_FLAG) {
-			if (val)
-				profile->flags |= flag;
-			else
-				profile->flags &= ~flag;
-		} else {
-			if (val)
-				profile->flags2 |= flag;
-			else
-				profile->flags2 &= ~flag;
-		}
+        profile->flags.set(flag, val);
 	}
 }
 
-char *AI_path_types[] = {
+const char *AI_path_types[] = {
 	"normal",
 	"alt1",
 };
@@ -78,7 +68,7 @@ void parse_ai_profiles_tbl(const char *filename)
 	try
 	{
 		if (filename == NULL)
-			read_file_text_from_array(defaults_get_file("ai_profiles.tbl"));
+			read_file_text_from_default(defaults_get_file("ai_profiles.tbl"));
 		else
 			read_file_text(filename, CF_TYPE_TABLES);
 
@@ -151,12 +141,12 @@ void parse_ai_profiles_tbl(const char *filename)
 				// base profile, so zero it out
 				if (profile == &Ai_profiles[0])
 				{
-					memset(profile, 0, sizeof(ai_profile_t));
+                    profile->reset();
 				}
 				// brand new profile, so set it to the base defaults
 				else
 				{
-					memcpy(profile, &Ai_profiles[0], sizeof(ai_profile_t));
+                    *profile = Ai_profiles[0];
 				}
 			}
 
@@ -355,93 +345,93 @@ void parse_ai_profiles_tbl(const char *filename)
 				}
 
 				if (optional_string("$Detail Distance Multiplier:"))
-					parse_float_list(profile->detail_distance_mult, NUM_SKILL_LEVELS);
+					parse_float_list(profile->detail_distance_mult, MAX_DETAIL_LEVEL + 1);
 
-				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, "$big ships can attack beam turrets on untargeted ships:", AI::Profile_Flags::Big_ships_can_attack_beam_turrets_on_untargeted_ships);
 
-				set_flag(profile, "$smart primary weapon selection:", AIPF_SMART_PRIMARY_WEAPON_SELECTION, AIP_FLAG);
+				set_flag(profile, "$smart primary weapon selection:", AI::Profile_Flags::Smart_primary_weapon_selection);
 
-				set_flag(profile, "$smart secondary weapon selection:", AIPF_SMART_SECONDARY_WEAPON_SELECTION, AIP_FLAG);
+				set_flag(profile, "$smart secondary weapon selection:", AI::Profile_Flags::Smart_secondary_weapon_selection);
 
-				set_flag(profile, "$smart shield management:", AIPF_SMART_SHIELD_MANAGEMENT, AIP_FLAG);
+				set_flag(profile, "$smart shield management:", AI::Profile_Flags::Smart_shield_management);
 
-				set_flag(profile, "$smart afterburner management:", AIPF_SMART_AFTERBURNER_MANAGEMENT, AIP_FLAG);
+				set_flag(profile, "$smart afterburner management:", AI::Profile_Flags::Smart_afterburner_management);
 
-				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:", AIPF2_AI_GUARDS_SPECIFIC_SHIP_IN_WING, AIP_FLAG2);
+				set_flag(profile, "$ai guards specific ship in wing:", AI::Profile_Flags::Ai_guards_specific_ship_in_wing);
 
 				profile->ai_path_mode = AI_PATH_MODE_NORMAL;
 				if (optional_string("$ai path mode:"))
@@ -456,15 +446,17 @@ void parse_ai_profiles_tbl(const char *filename)
 					}
 				}
 
-				set_flag(profile, "$no warp camera:", AIPF2_NO_WARP_CAMERA, AIP_FLAG2);
+				set_flag(profile, "$no warp camera:", AI::Profile_Flags::No_warp_camera);
 
-				set_flag(profile, "$fix ai path order bug:", AIPF2_FIX_AI_PATH_ORDER_BUG, AIP_FLAG2);
+				set_flag(profile, "$fix ai path order bug:", AI::Profile_Flags::Fix_ai_path_order_bug);
 
-				set_flag(profile, "$strict turret-tagged-only targeting:", AIPF2_STRICT_TURRET_TAGGED_ONLY_TARGETING, AIP_FLAG2);
+				set_flag(profile, "$strict turret-tagged-only targeting:", AI::Profile_Flags::Strict_turred_tagged_only_targeting);
 
-				set_flag(profile, "$aspect bomb invulnerability fix:", AIPF2_ASPECT_INVULNERABILITY_FIX, AIP_FLAG2);
+				set_flag(profile, "$aspect bomb invulnerability fix:", AI::Profile_Flags::Aspect_invulnerability_fix);
 
-				set_flag(profile, "$glide decay requires thrust:", AIPF2_GLIDE_DECAY_REQUIRES_THRUST, 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);
 
 				profile->bay_arrive_speed_mult = 1.0f;
 				profile->bay_depart_speed_mult = 1.0f;
@@ -483,20 +475,14 @@ 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);
-					if (temp)
-						profile->flags2 |= AIPF2_PERFORM_FEWER_SCREAM_CHECKS;
-					else
-						profile->flags2 &= ~AIPF2_PERFORM_FEWER_SCREAM_CHECKS;
+                    profile->flags.set(AI::Profile_Flags::Perform_fewer_scream_checks, temp);
 				}
 				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);
-					if (temp)
-						profile->flags2 &= ~AIPF2_ALLOW_PRIMARY_LINK_AT_START;
-					else
-						profile->flags2 |= AIPF2_ALLOW_PRIMARY_LINK_AT_START;
+                    profile->flags.set(AI::Profile_Flags::Allow_primary_link_at_start, !temp);
 				}
 
 
@@ -567,3 +553,72 @@ 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;
+    }
+}

code/ai/ai_profiles.h

@@ -12,62 +12,7 @@
 #include "globalincs/globals.h"
 #include "globalincs/pstypes.h"
 #include "globalincs/systemvars.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)
+#include "ai/ai_flags.h"
 
 // AI Path types
 #define	AI_PATH_MODE_NORMAL 0
@@ -75,12 +20,11 @@
 	
 #define MAX_AI_PROFILES	5
 
-typedef struct ai_profile_t {
-
+class ai_profile_t {
+public:
 	char profile_name[NAME_LENGTH];
 
-	int flags;
-	int flags2;
+    flagset<AI::Profile_Flags> flags;
 
 	// difficulty-related values
 	int max_incoming_asteroids[NUM_SKILL_LEVELS];			// max number of asteroids thrown at friendlies
@@ -158,13 +102,15 @@ typedef struct ai_profile_t {
 	float bay_arrive_speed_mult;
 	float bay_depart_speed_mult;
 
-} ai_profile_t;
+    void reset();
+};
 
 
 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();
 

code/ai/aibig.cpp

@@ -11,7 +11,7 @@
 
 #include "ai/aibig.h"
 #include "ai/aigoals.h"
-#include "freespace2/freespace.h"
+#include "freespace.h"
 #include "globalincs/linklist.h"
 #include "iff_defs/iff_defs.h"
 #include "io/timer.h"
@@ -350,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 & AIF_ON_SUBSYS_PATH ) {
-		aip->ai_flags &= ~AIF_ON_SUBSYS_PATH;
+	if ( aip->ai_flags[AI::AI_Flags::On_subsys_path] ) {
+		aip->ai_flags.remove(AI::AI_Flags::On_subsys_path);
 		aip->path_goal_dist = -1;
 		aip->path_start = -1;
 		aip->path_cur = -1;
@@ -438,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 |= AIF_ON_SUBSYS_PATH;
+						aip->ai_flags.set(AI::AI_Flags::On_subsys_path);
 					}
 				}
 			}
@@ -510,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->flags & SIF_SMALL_SHIP ) {
+	if ( sip->is_small_ship() ) {
 		if ( timestamp_elapsed(aip->scan_for_enemy_timestamp) ) {
 			ship_obj	*so;
 			object	*test_objp;
@@ -525,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].flags & SIF_SMALL_SHIP ) {
+					if ( Ship_info[test_sp->ship_info_index].is_small_ship() ) {
 						dist_squared = vm_vec_dist_squared(&Pl_objp->pos, &test_objp->pos);
 						if ( dist_squared < ENTER_STRAFE_THREAT_DIST_SQUARED ) {
 							return 1;
@@ -593,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 & AIF_KAMIKAZE) && static_randf((Missiontime + static_rand(aip->shipnum)) >> 19) < aip->ai_glide_strafe_percent) {
+		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) {
 			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)
@@ -604,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 & AIF_KAMIKAZE)) {
+			if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
 				afterburners_stop(Pl_objp);
 			}
 			return;
@@ -641,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 & AIF_FREE_AFTERBURNER_USE) && !(shipp->flags2 & SF2_AFTERBURNER_LOCKED) && (dot_to_enemy > 0.75f)) {
+				if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (dot_to_enemy > 0.75f)) {
 					if (ai_maybe_fire_afterburner(Pl_objp, aip)) {
 						afterburners_start(Pl_objp);
 						aip->afterburner_stop_time = Missiontime + 3*F1_0;
 					}
-				} else if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags & AIF_KAMIKAZE)) {
+				} else if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::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 & AIF_KAMIKAZE)) {
+				if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
 					afterburners_stop(Pl_objp);
 				}
 			}
@@ -676,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 & AIF_KAMIKAZE)) {
+				if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
 					afterburners_stop(Pl_objp);
 				}
 			} else {
 				accelerate_ship(aip, accel);
 
 				ship	*shipp = &Ships[Pl_objp->instance];
-				if ((aip->ai_flags & AIF_FREE_AFTERBURNER_USE) && !(shipp->flags2 & SF2_AFTERBURNER_LOCKED) && (accel > 0.95f)) {
+				if ((aip->ai_flags[AI::AI_Flags::Free_afterburner_use]) && !(shipp->flags[Ship::Ship_Flags::Afterburner_locked]) && (accel > 0.95f)) {
 					if (ai_maybe_fire_afterburner(Pl_objp, aip)) {
 						afterburners_start(Pl_objp);
 						aip->afterburner_stop_time = Missiontime + 3*F1_0;
 					}
-				} else if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags & AIF_KAMIKAZE)) {
+				} else if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
 					afterburners_stop(Pl_objp);
 				}
 			}
@@ -748,16 +748,16 @@ void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vec3d *f
 			}
 
 			if (tswp->num_secondary_banks > 0) {
-				if (!(En_objp->flags & OF_PROTECTED) || (aip->goals[0].ai_mode & (AI_GOAL_DISABLE_SHIP | AI_GOAL_DISARM_SHIP))) {
+				if (!(En_objp->flags[Object::Object_Flags::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 & 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(!(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 ship is protected and very low on hits, don't fire missiles.
-							if (!(En_objp->flags & OF_PROTECTED) || (En_objp->hull_strength > 10*swip->damage)) {
-								if (aip->ai_flags & AIF_UNLOAD_SECONDARIES) {
+							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 (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));
 									}
@@ -765,13 +765,13 @@ void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vec3d *f
 
 								if (timestamp_elapsed(swp->next_secondary_fire_stamp[current_bank])) {
 									float firing_range;
-									if (swip->wi_flags2 & WIF2_LOCAL_SSM)
+									if (swip->wi_flags[Weapon::Info_Flags::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_FLAG_FULLNEB) && Nebula_sec_range) {
+									if ((The_mission.flags[Mission::Mission_Flags::Fullneb]) && Nebula_sec_range) {
 										firing_range *= 0.8f;
 									}
 
@@ -786,13 +786,13 @@ void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vec3d *f
 
 												int current_bank_adjusted = MAX_SHIP_PRIMARY_BANKS + current_bank;
 
-												if ((aip->ai_flags & AIF_UNLOAD_SECONDARIES) || (swip->burst_flags & WBF_FAST_FIRING)) {
+												if ((aip->ai_flags[AI::AI_Flags::Unload_secondaries]) || (swip->burst_flags[Weapon::Burst_Flags::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 & WBF_RANDOM_LENGTH)) {
+														if ((swip->burst_shots > 0) && (swip->burst_flags[Weapon::Burst_Flags::Random_length])) {
 															swp->burst_counter[current_bank_adjusted] = myrand() % swip->burst_shots;
 														} else {
 															swp->burst_counter[current_bank_adjusted] = 0;
@@ -804,7 +804,7 @@ void ai_big_maybe_fire_weapons(float dist_to_enemy, float dot_to_enemy, vec3d *f
 														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 & WBF_RANDOM_LENGTH)) {
+														if ((swip->burst_shots > 0) && (swip->burst_flags[Weapon::Burst_Flags::Random_length])) {
 															swp->burst_counter[current_bank_adjusted] = myrand() % swip->burst_shots;
 														} else {
 															swp->burst_counter[current_bank_adjusted] = 0;
@@ -881,7 +881,7 @@ 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 & AIF_TARGET_COLLISION) {
+	if (aip->ai_flags[AI::AI_Flags::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)
@@ -894,7 +894,7 @@ void ai_big_chase()
 		}
 	}
 
-	if (aip->ai_flags & AIF_KAMIKAZE) {
+	if (aip->ai_flags[AI::AI_Flags::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)) {
@@ -904,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 & AIF_SEEK_LOCK)) {
+	if ((dot_to_enemy < 0.25f) || (aip->target_time < 1.0f) || (aip->ai_flags[AI::AI_Flags::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);
@@ -914,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 & OF_PROTECTED) {	//	If protected and we're not attacking a subsystem, stop attacking!
+	} else if (En_objp->flags[Object::Object_Flags::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(Pl_objp-Objects, MAX_ENEMY_DISTANCE, The_mission.ai_profile->max_attackers[Game_skill_level]) == -1) {
+		if (find_enemy(OBJ_INDEX(Pl_objp), MAX_ENEMY_DISTANCE, The_mission.ai_profile->max_attackers[Game_skill_level]) == -1) {
 			ai_do_default_behavior(Pl_objp);
 			return;
 		}
@@ -931,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 & AIF_KAMIKAZE)) {
+				if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
 					afterburners_stop(Pl_objp);
 				}
 				return;
@@ -953,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 & AIF_KAMIKAZE)) {
+		if ((Pl_objp->phys_info.flags & PF_AFTERBURNER_ON) && !(aip->ai_flags[AI::AI_Flags::Kamikaze])) {
 			afterburners_stop(Pl_objp);
 		}
 	}
@@ -1174,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->flags & (SIF_BIG_SHIP | SIF_HUGE_SHIP)) ) {
+	if ( !(esip->is_big_or_huge()) ) {
 		ai_big_switch_to_chase_mode(aip);
 		return;
 	}
@@ -1198,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 & AIF_SEEK_LOCK)) {
+	if ((*dot_to_enemy < 0.25f) || (aip->target_time < 1.0f) || (aip->ai_flags[AI::AI_Flags::Seek_lock])) {
 		predicted_enemy_pos=*enemy_pos;
 	} else {
 		vec3d	gun_pos, pnt;
@@ -1206,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->flags2 & AIPF2_AI_AIMS_FROM_SHIP_CENTER)) {
+		if (po->n_guns > 0 && !(The_mission.ai_profile->flags[AI::Profile_Flags::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);
@@ -1254,10 +1254,10 @@ int ai_big_strafe_maybe_retreat(float dist, vec3d *target_pos)
 
 	// Inside 2 sec retreat, setting goal point to box point + 300m
 	// If collision, use std collision resolution.
-	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) {
+	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]) {
 			// use standard collision resolution
-			aip->ai_flags &= ~AIF_TARGET_COLLISION;
+			aip->ai_flags.remove(AI::AI_Flags::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
@@ -1301,7 +1301,7 @@ void ai_big_strafe_attack()
 	if ( ai_big_strafe_maybe_retreat(target_dist, &target_pos) )
 		return;
 
-	if (aip->ai_flags & AIF_KAMIKAZE) {
+	if (aip->ai_flags[AI::AI_Flags::Kamikaze]) {
 		if (target_dist < 1200.0f) {
 			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);
@@ -1313,7 +1313,7 @@ void ai_big_strafe_attack()
 		}
 	}
 
-	if (!(aip->ai_flags & AIF_SEEK_LOCK) || (aip->aspect_locked_time < 2.0f)) {
+	if (!(aip->ai_flags[AI::AI_Flags::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
@@ -1350,27 +1350,30 @@ void ai_big_strafe_attack()
 	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 ( 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 {
+	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 {
+		accel = 1.0f;
 	}
 
-	accel = 1.0f;
 	accelerate_ship(aip, accel);
 
 	// if haven't been hit in quite a while, leave strafe mode
@@ -1619,7 +1622,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 & AIF_KAMIKAZE) && (frand() < aip->ai_glide_strafe_percent)) {
+	if ((sip->can_glide == true) && !(aip->ai_flags[AI::AI_Flags::Kamikaze]) && (frand() < aip->ai_glide_strafe_percent)) {
 		aip->submode = AIS_STRAFE_GLIDE_ATTACK;
 		aip->submode_parm1 = 0;
 	} else {
@@ -1651,7 +1654,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].flags & (SIF_BIG_SHIP|SIF_HUGE_SHIP)) ) {
+	if ( !(Ship_info[Ships[En_objp->instance].ship_info_index].is_big_or_huge()) ) {
 		ai_big_switch_to_chase_mode(aip);
 		return;
 	}
@@ -1724,12 +1727,12 @@ int ai_big_maybe_enter_strafe_mode(object *pl_objp, int weapon_objnum, int consi
 
 	// 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->flags & (SIF_BIG_SHIP | SIF_HUGE_SHIP)) || (sip->flags & SIF_TRANSPORT) ) {
+	if ( !(sip->is_big_or_huge()) || (sip->flags[Ship::Info_Flags::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].flags & (SIF_FIGHTER | SIF_BOMBER)) ) {
+	if ( !(Ship_info[Ships[pl_objp->instance].ship_info_index].is_fighter_bomber()) ) {
 		return 0;
 	}
 
@@ -1751,7 +1754,7 @@ int ai_big_maybe_enter_strafe_mode(object *pl_objp, int weapon_objnum, int consi
 //JAS IMPOSSIBLE		} else {
 			// switch targets
 			sip = &Ship_info[Ships[parent_objp->instance].ship_info_index];
-			if ( !(sip->flags & (SIF_BIG_SHIP | SIF_HUGE_SHIP)) || (sip->flags & SIF_TRANSPORT) ) {
+			if ( !(sip->is_big_or_huge()) || (sip->flags[Ship::Info_Flags::Transport]) ) {
 				return 0;
 			}
 			set_target_objnum(aip, OBJ_INDEX(parent_objp));
@@ -1806,8 +1809,8 @@ void ai_big_strafe_maybe_attack_turret(object *ship_objp, object *weapon_objp)
 	// 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 & 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);
+	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);
 
 	// 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 )

code/ai/aigoals.cpp

@@ -59,6 +59,7 @@ 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 },
@@ -85,6 +86,7 @@ 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);
@@ -96,34 +98,34 @@ int Num_ai_goals = sizeof(Ai_goal_names) / sizeof(ai_goal_list);
 const char *Ai_goal_text(int goal)
 {
 	switch(goal)	{
-	case 1:
+	case AI_GOAL_CHASE:
+	case AI_GOAL_CHASE_WING:
+	case AI_GOAL_CHASE_SHIP_CLASS:
 		return XSTR( "attack ", 474);
-	case 2:
+	case AI_GOAL_DOCK:
 		return XSTR( "dock ", 475);
-	case 3:
+	case AI_GOAL_WAYPOINTS:
+	case AI_GOAL_WAYPOINTS_ONCE:
 		return XSTR( "waypoints", 476);
-	case 4:
-		return XSTR( "waypoints", 476);
-	case 6:
+	case AI_GOAL_DESTROY_SUBSYSTEM:
 		return XSTR( "destroy ", 477);
-	case 7:
+	case AI_GOAL_FORM_ON_WING:
 		return XSTR( "form on ", 478);
-	case 8:
+	case AI_GOAL_UNDOCK:
 		return XSTR( "undock ", 479);
-	case 9:
-		return XSTR( "attack ", 474);
-	case 10:
+	case AI_GOAL_GUARD:
+	case AI_GOAL_GUARD_WING:
 		return XSTR( "guard ", 480);
-	case 11:
+	case AI_GOAL_DISABLE_SHIP:
 		return XSTR( "disable ", 481);
-	case 12:
+	case AI_GOAL_DISARM_SHIP:
 		return XSTR( "disarm ", 482);
-	case 15:
-		return XSTR( "guard ", 480);
-	case 16:
+	case AI_GOAL_EVADE_SHIP:
 		return XSTR( "evade ", 483);
-	case 19:
+	case AI_GOAL_REARM_REPAIR:
 		return XSTR( "rearm ", 484);
+	case AI_GOAL_FLY_TO_SHIP:
+		return XSTR( "rendezvous with ", -1);
 	}
 
 	// Avoid compiler warning
@@ -238,7 +240,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 = 0;				// must reset the flags since not doing so will screw up goal sorting.
+	aip->goals[index].flags.reset(); // must reset the flags since not doing so will screw up goal sorting.
 
 	if ( index == aip->active_goal )
 		aip->active_goal = AI_GOAL_NONE;
@@ -287,7 +289,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 = 0;
+		wingp->ai_goals[i].flags.reset();
 	}
 
 
@@ -347,7 +349,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 = 0;
+			wingp->ai_goals[i].flags.reset();
 			break;
 		}
 	}
@@ -408,31 +410,41 @@ void ai_goal_purge_invalid_goals( ai_goal *aigp, ai_goal *goal_list, ai_info *ai
 		if ( purge_goal->target_name == NULL )
 			continue;
 
-		// 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 ) )
+		// 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) )
 				continue;
-		} else if ( purge_wing != wingnum )
-			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 );
+
+			// 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_DESTROY_SUBSYSTEM) )
-					purge_goal->flags |= AIGF_PURGE;
+				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);
 				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) ) {
+				if ( purge_ai_mode & (AI_GOAL_CHASE | AI_GOAL_CHASE_WING | AI_GOAL_CHASE_SHIP_CLASS) ) {
 					int ai_ship_type;
 
 					// for wings we grab the ship type of the wing leader
@@ -452,7 +464,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 |= AIGF_PURGE;
+							purge_goal->flags.set(AI::Goal_Flags::Purge);
 						}
 					}
 				}	
@@ -584,10 +596,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 & SIF_CARGO) {
+	if (Ship_info[Ships[shipnum].ship_info_index].flags[Ship::Info_Flags::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 & SIF_SUPPORT) {
+	} else if (Ship_info[Ships[aip->shipnum].ship_info_index].flags[Ship::Info_Flags::Support]) {
 		docker_index = ai_goal_find_dockpoint(aip->shipnum, DOCK_TYPE_REARM);
 		dockee_index = ai_goal_find_dockpoint(shipnum, DOCK_TYPE_REARM);
 	}
@@ -601,7 +613,8 @@ void ai_goal_fixup_dockpoints(ai_info *aip, ai_goal *aigp)
 		
 	aigp->docker.index = docker_index;
 	aigp->dockee.index = dockee_index;
-	aigp->flags |= AIGF_DOCK_INDEXES_VALID;
+	aigp->flags.set(AI::Goal_Flags::Dockee_index_valid);
+	aigp->flags.set(AI::Goal_Flags::Docker_index_valid);
 }
 
 // these functions deal with adding goals sent from the player.  They are slightly different
@@ -739,7 +752,8 @@ 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 &= ~AIGF_DOCK_INDEXES_VALID;
+		aigp->flags.remove(AI::Goal_Flags::Dockee_index_valid);
+		aigp->flags.remove(AI::Goal_Flags::Docker_index_valid);
 	}
 	ai_add_goal_sub_scripting(AIG_TYPE_PLAYER_SHIP, mode, submode, priority, shipname, aigp);
 
@@ -818,7 +832,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 = 0;
+	aigp->flags.reset();
 
 	op = get_operator_const( text );
 
@@ -851,7 +865,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 |= AIGF_SUBSYS_NEEDS_FIXUP;
+		aigp->flags.set(AI::Goal_Flags::Subsys_needs_fixup);
 		aigp->priority = atoi( CTEXT(CDR(CDR(CDR(node)))) );
 		break;
 
@@ -905,7 +919,8 @@ 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 &= ~AIGF_DOCK_INDEXES_VALID;
+		aigp->flags.remove(AI::Goal_Flags::Dockee_index_valid);
+		aigp->flags.remove(AI::Goal_Flags::Docker_index_valid);
 		aigp->priority = atoi( CTEXT(CDR(CDR(CDR(CDR(node))))) );
 
 		aigp->ai_mode = AI_GOAL_DOCK;
@@ -934,9 +949,10 @@ 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:
@@ -965,6 +981,8 @@ 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 ) {
@@ -986,13 +1004,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_DISABLE_SHIP || op == OP_AI_DISARM_SHIP ) {
+	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 ((CDDDR(node) != -1) && is_sexp_true(CDDDR(node)))
-			aigp->flags |= AIGF_TARGET_OWN_TEAM;
+			aigp->flags.set(AI::Goal_Flags::Target_own_team);
 	}
 	if ( op == OP_AI_DESTROY_SUBSYS ) {
 		if ((CDDDDR(node) != -1) && is_sexp_true(CDDDDR(node)))
-			aigp->flags |= AIGF_TARGET_OWN_TEAM;
+			aigp->flags.set(AI::Goal_Flags::Target_own_team);
 	}
 
 	// Goober5000 - since none of the goals act on the actor,
@@ -1004,7 +1022,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 = 0;
+		aigp->flags.reset();
 	}
 }
 
@@ -1032,7 +1050,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 importnat so that if active_goal == index you can set AI_GOAL_NONE
+ * This is important so that if active_goal == index you can set AI_GOAL_NONE
  */
 int ai_remove_goal_sexp_sub( int sexp, ai_goal* aigp )
 {
@@ -1134,6 +1152,10 @@ 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;
@@ -1166,7 +1188,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 = 0;				// must reset the flags since not doing so will screw up goal sorting.
+	aigp[goalindex].flags.reset();				// must reset the flags since not doing so will screw up goal sorting.
 
 	return goalindex;
 }
@@ -1264,7 +1286,8 @@ void ai_add_goal_ship_internal( ai_info *aip, int goal_type, char *name, int doc
 
 	aigp->time = Missiontime;
 	aigp->type = AIG_TYPE_DYNAMIC;
-	aigp->flags = AIGF_GOAL_OVERRIDE;
+	aigp->flags.reset();
+	aigp->flags.set(AI::Goal_Flags::Goal_override);
 
 	switch ( goal_type ) {
 
@@ -1302,7 +1325,7 @@ void ai_add_goal_ship_internal( ai_info *aip, int goal_type, char *name, int doc
 		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 &= ~AIGF_GOAL_OVERRIDE;				// don't override this goal.  rearm repair requests should happen in order
+		aigp->flags.remove(AI::Goal_Flags::Goal_override);	// don't override this goal.  rearm repair requests should happen in order
 		ai_goal_fixup_dockpoints( aip, aigp );
 		break;
 
@@ -1387,7 +1410,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 		ship *shipp = &Ships[objp->instance];
 
 		// always valid if has subspace drive
-		if (!(shipp->flags2 & SF2_NO_SUBSPACE_DRIVE))
+		if (!(shipp->flags[Ship::Ship_Flags::No_subspace_drive]))
 			return AI_GOAL_ACHIEVABLE;
 
 		// if no subspace drive, only valid if our mothership is present
@@ -1413,7 +1436,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 		if (sindex < 0)
 			return AI_GOAL_NOT_ACHIEVABLE;
 
-		aigp->flags |= AIGF_GOAL_OVERRIDE;
+		aigp->flags.set(AI::Goal_Flags::Goal_override);
 		return AI_GOAL_ACHIEVABLE;
 	}
 
@@ -1431,6 +1454,18 @@ 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;
 
@@ -1456,7 +1491,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 & AIGF_SUBSYS_NEEDS_FIXUP) ) {
+			if ( (sindex == -1) || (aigp->flags[AI::Goal_Flags::Subsys_needs_fixup]) ) {
 				status = 0;
 				break;
 			}
@@ -1573,7 +1608,7 @@ int ai_mission_goal_achievable( int objnum, ai_goal *aigp )
 
 		wing *wingp = &Wings[sindex];
 
-		if ( wingp->flags & WF_WING_GONE )
+		if ( wingp->flags[Ship::Wing_Flags::Gone] )
 			return AI_GOAL_NOT_ACHIEVABLE;
 		else if ( wingp->total_arrived_count == 0 )
 			return AI_GOAL_NOT_KNOWN;
@@ -1620,15 +1655,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 & AIGF_GOALS_PURGED))
+	if ((status == SHIP_STATUS_ARRIVED) && !(aigp->flags[AI::Goal_Flags::Goals_purged]))
 	{
 		if (aigp->ai_mode & PURGE_GOALS_ALL_SHIPS) {
 			ai_goal_purge_all_invalid_goals(aigp);
-			aigp->flags |= AIGF_GOALS_PURGED;
+			aigp->flags.set(AI::Goal_Flags::Goals_purged);
 		}
 		else if (aigp->ai_mode & PURGE_GOALS_ONE_SHIP) {
 			ai_goal_purge_invalid_goals(aigp, aip->goals, aip, -1);
-			aigp->flags |= AIGF_GOALS_PURGED;
+			aigp->flags.set(AI::Goal_Flags::Goals_purged);
 		}
 	}	
 
@@ -1636,21 +1671,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 & AIGF_DOCKER_INDEX_VALID)) {
+		if (!(aigp->flags[AI::Goal_Flags::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 |= AIGF_DOCKER_INDEX_VALID;
+			aigp->flags.set(AI::Goal_Flags::Docker_index_valid);
 		}
 
-		if (!(aigp->flags & AIGF_DOCKEE_INDEX_VALID)) {
+		if (!(aigp->flags[AI::Goal_Flags::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 |= AIGF_DOCKEE_INDEX_VALID;
+				aigp->flags.set(AI::Goal_Flags::Dockee_index_valid);
 			} else
 				aigp->dockee.index = -1;		// this will force code into if statement below making goal not achievable.
 		}
@@ -1661,7 +1696,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 & SF_DISABLED )
+		if ( Ships[objp->instance].flags[Ship::Ship_Flags::Disabled] )
 			return AI_GOAL_NOT_KNOWN;
 
 		// we must also determine if we're prevented from docking for any reason
@@ -1700,7 +1735,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 & AIGF_GOAL_ON_HOLD) )
+				if ( !(aigp->flags[AI::Goal_Flags::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.
@@ -1725,12 +1760,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 & AIGF_SUBSYS_NEEDS_FIXUP ) {
+		if ( aigp->flags[AI::Goal_Flags::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 &= ~AIGF_SUBSYS_NEEDS_FIXUP;
+				aigp->flags.remove(AI::Goal_Flags::Subsys_needs_fixup);
 			} else {
 				Int3();
 				return AI_GOAL_NOT_ACHIEVABLE;			// force this goal to be invalid
@@ -1802,20 +1837,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 & AIF_BEING_REPAIRED )
+			if ( Ai_info[Ships[sindex].ai_index].ai_flags[AI::AI_Flags::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].flags & (SF_DYING | SF_DEPARTING) )
+			if ( Ships[sindex].is_dying_or_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 & AIF_AWAITING_REPAIR) )
+			if ( !(Ai_info[Ships[sindex].ai_index].ai_flags[AI::AI_Flags::Awaiting_repair]) )
 				return AI_GOAL_NOT_ACHIEVABLE;
 
 			// not repairing anything means that he can do this goal!!!
-			if ( !(aip->ai_flags  & AIF_REPAIRING) )
+			if ( !(aip->ai_flags[AI::AI_Flags::Repairing]) )
 				return AI_GOAL_ACHIEVABLE;
 
 			// test code!!!
@@ -1852,17 +1887,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 & AIGF_GOAL_ON_HOLD) && !(gb->flags & AIGF_GOAL_ON_HOLD) )
+	if ( (ga->flags[AI::Goal_Flags::Goal_on_hold]) && !(gb->flags[AI::Goal_Flags::Goal_on_hold]) )
 		return 1;
-	else if ( !(ga->flags & AIGF_GOAL_ON_HOLD) && (gb->flags & AIGF_GOAL_ON_HOLD) )
+	else if ( !(ga->flags[AI::Goal_Flags::Goal_on_hold]) && (gb->flags[AI::Goal_Flags::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 & AIGF_GOAL_OVERRIDE) && !(gb->flags & AIGF_GOAL_OVERRIDE) )
+	else if ( (ga->flags[AI::Goal_Flags::Goal_override]) && !(gb->flags[AI::Goal_Flags::Goal_override]) )
 		return -1;
-	else if ( !(ga->flags & AIGF_GOAL_OVERRIDE) && (gb->flags & AIGF_GOAL_OVERRIDE) )
+	else if ( !(ga->flags[AI::Goal_Flags::Goal_override]) && (gb->flags[AI::Goal_Flags::Goal_override]) )
 		return 1;
 
 	// now normal priority processing
@@ -1917,7 +1952,7 @@ void validate_mission_goals(int objnum, ai_info *aip)
 			continue;
 
 		// purge any goals which should get purged
-		if ( aigp->flags & AIGF_PURGE ) {
+		if ( aigp->flags[AI::Goal_Flags::Purge] ) {
 			ai_remove_ship_goal( aip, i );
 			continue;
 		}
@@ -1931,19 +1966,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 & AIGF_GOAL_ON_HOLD) )
-			aigp->flags &= ~AIGF_GOAL_ON_HOLD;
+		if ( (state == AI_GOAL_ACHIEVABLE) && (aigp->flags[AI::Goal_Flags::Goal_on_hold]) )
+			aigp->flags.remove(AI::Goal_Flags::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 |= AIGF_GOAL_ON_HOLD;		// put this goal on hold until it becomes true
+		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 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 & AIGF_GOAL_ON_HOLD) )
+	if ( (aip->goals[0].ai_mode != AI_GOAL_NONE) && (aip->goals[0].flags[AI::Goal_Flags::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)
@@ -1952,7 +1987,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 |= AIGF_GOAL_ON_HOLD;
+			aip->goals[i].flags.set(AI::Goal_Flags::Goal_on_hold);
 		}
 	}
 }
@@ -2020,7 +2055,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 & AIGF_GOAL_ON_HOLD )
+	if ( aip->goals[0].flags[AI::Goal_Flags::Goal_on_hold] )
 		return;
 
 	//	Kind of a hack for now.  active_goal means the goal currently being pursued.
@@ -2038,11 +2073,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 &= ~AIF_FORMATION_OBJECT;
+	aip->ai_flags.remove(AI::AI_Flags::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 & OF_PLAYER_SHIP) && (current_goal->ai_mode != AI_GOAL_FORM_ON_WING) )
+	if ( !(Player_use_ai) && (objp->flags[Object::Object_Flags::Player_ship]) && (current_goal->ai_mode != AI_GOAL_FORM_ON_WING) )
 	{
 		return;
 	}	
@@ -2116,7 +2151,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 & AIGF_DOCK_INDEXES_VALID);
+		Assert (current_goal->flags[AI::Goal_Flags::Dockee_index_valid] && current_goal->flags[AI::Goal_Flags::Docker_index_valid]);
 		ai_dock_with_object( objp, current_goal->docker.index, other_obj, current_goal->dockee.index, AIDO_DOCK );
 		break;
 	}
@@ -2198,19 +2233,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].ai_bools & STI_AI_PROTECTED_ON_CRIPPLE)
-					Objects[aip->target_objnum].flags |= OF_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);
 			}
 		} else	//	Just in case this ship had been protected, unprotect it.
 			if (aip->target_objnum != -1)
-				Objects[aip->target_objnum].flags &= ~OF_PROTECTED;
+				Objects[aip->target_objnum].flags.remove(Object::Object_Flags::Protected);
 
 		break;
 	}
 
 	case AI_GOAL_CHASE_WING:
 		wingnum = wing_name_lookup( current_goal->target_name );
-		Assert( wingnum >= 0 );
+		Assertion( wingnum >= 0, "The target of AI_GOAL_CHASE_WING must refer to a valid wing!" );
 		ai_attack_wing(objp, wingnum);
 		break;
 
@@ -2218,6 +2253,13 @@ 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;
@@ -2347,15 +2389,22 @@ 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);
 			}
+		}
 	}
 }
 

code/ai/aigoals.h

@@ -26,6 +26,7 @@ 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
@@ -51,10 +52,12 @@ struct ai_goal;
 // resume regular goals
 #define AI_GOAL_STAY_STILL				(1<<20)	// 0x00100000
 #define AI_GOAL_PLAY_DEAD				(1<<21)	// 0x00200000
-#define AI_GOAL_CHASE_WEAPON			(1<<22)	// 0x00400000
 
+// 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
 

code/anim/animplay.cpp

@@ -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;
 
@@ -505,7 +505,10 @@ 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);
+			//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);
 		}
 									  
 		instance->last_bitmap = bitmap_id;
@@ -684,7 +687,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(char *real_filename, int cf_dir_type, int file_mapped)
+anim *anim_load(const char *real_filename, int cf_dir_type, int file_mapped)
 {
 	anim			*ptr;
 	CFILE			*fp;

code/anim/animplay.h

@@ -59,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(char *name, int cf_dir_type = CF_TYPE_ANY, int file_mapped = PAGE_FROM_MEM);
+anim			  *anim_load(const 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);

code/asteroid/asteroid.cpp

@@ -12,9 +12,8 @@
 #include "asteroid/asteroid.h"
 #include "debugconsole/console.h"
 #include "fireball/fireballs.h"
-#include "freespace2/freespace.h"
+#include "freespace.h"
 #include "gamesnd/gamesnd.h"
-#include "globalincs/compatibility.h"
 #include "globalincs/linklist.h"
 #include "globalincs/systemvars.h"
 #include "hud/hud.h"
@@ -33,7 +32,7 @@
 #include "object/objcollide.h"
 #include "object/object.h"
 #include "parse/parselo.h"
-#include "parse/scripting.h"
+#include "scripting/scripting.h"
 #include "particle/particle.h"
 #include "render/3d.h"
 #include "ship/ship.h"
@@ -107,7 +106,7 @@ int asteroid_obj_list_add(int objnum)
 	int index;
 
 	asteroid *cur_asteroid = &Asteroids[Objects[objnum].instance];
-	index = cur_asteroid - Asteroids;
+	index = (int)(cur_asteroid - Asteroids);
 
 	Assert(index >= 0 && index < MAX_ASTEROID_OBJS);
 	Assert(!(Asteroid_objs[index].flags & ASTEROID_OBJ_USED));
@@ -320,8 +319,12 @@ object *asteroid_create(asteroid_field *asfieldp, int asteroid_type, int asteroi
 	}
 
 	vm_angles_2_matrix(&orient, &angs);
-
-	objnum = obj_create( OBJ_ASTEROID, -1, n, &orient, &pos, radius, OF_RENDERS | OF_PHYSICS | OF_COLLIDES);
+    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);
 	
 	if ( (objnum == -1) || (objnum >= MAX_OBJECTS) ) {
 		mprintf(("Couldn't create asteroid -- out of object slots\n"));
@@ -804,7 +807,7 @@ 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 |= OF_SHOULD_BE_DEAD;
+					objp->flags.set(Object::Object_Flags::Should_be_dead);
 				} else {
 					Asteroids[objp->instance].target_objnum = so->objnum;
 
@@ -870,7 +873,7 @@ 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 |= OF_SHOULD_BE_DEAD;
+					objp->flags.set(Object::Object_Flags::Should_be_dead);
 				} else {
 					// check to ensure player won't see asteroid appear either
 					asteroid_wrap_pos(objp, asfieldp);
@@ -915,7 +918,7 @@ void asteroid_process_pre( object *objp )
 	}
 }
 
-int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos, collision_info_struct *asteroid_hit_info)
+int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos, collision_info_struct *asteroid_hit_info, vec3d* hitnormal)
 {
 	if (!Asteroids_enabled) {
 		return 0;
@@ -947,8 +950,18 @@ 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;
 	}
 
@@ -1167,7 +1180,7 @@ int asteroid_check_collision(object *pasteroid, object *other_obj, vec3d *hitpos
 	}
 }
 
-void asteroid_render(object * obj, draw_list *scene)
+void asteroid_render(object * obj, model_draw_list *scene)
 {
 	if (Asteroids_enabled) {
 		int			num;
@@ -1326,7 +1339,7 @@ void asteroid_do_area_effect(object *asteroid_objp)
 		ship_objp = &Objects[so->objnum];
 	
 		// don't blast navbuoys
-		if ( ship_get_SIF(ship_objp->instance) & SIF_NAVBUOY ) {
+		if ( ship_get_SIF(ship_objp->instance)[Ship::Info_Flags::Navbuoy] ) {
 			continue;
 		}
 
@@ -1353,7 +1366,7 @@ void asteroid_hit( object * pasteroid_obj, object * other_obj, vec3d * hitpos, f
 
 	asp = &Asteroids[pasteroid_obj->instance];
 
-	if (pasteroid_obj->flags & OF_SHOULD_BE_DEAD){
+	if (pasteroid_obj->flags[Object::Object_Flags::Should_be_dead]){
 		return;
 	}
 
@@ -1388,8 +1401,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_index < 0 ) {
-				particle_create( hitpos, &vmd_zero_vector, 0.0f, Asteroid_impact_explosion_radius, PARTICLE_BITMAP, Asteroid_impact_explosion_ani );
+			if ( wip->impact_weapon_expl_effect < 0 ) {
+				particle::create( hitpos, &vmd_zero_vector, 0.0f, Asteroid_impact_explosion_radius, particle::PARTICLE_BITMAP, Asteroid_impact_explosion_ani );
 			}
 		}
 	}
@@ -1409,7 +1422,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 |= OF_SHOULD_BE_DEAD;
+			Objects[Asteroids[i].objnum].flags.set(Object::Object_Flags::Should_be_dead);
 		}
 	}
 
@@ -1474,7 +1487,7 @@ 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 |= OF_SHOULD_BE_DEAD;
+			pasteroid_obj->flags.set(Object::Object_Flags::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
@@ -1531,8 +1544,8 @@ void asteroid_maybe_break_up(object *pasteroid_obj)
 
 					random_shuffle(roids_to_create.begin(), roids_to_create.end());
 
-					int total_roids = roids_to_create.size();
-					for (int i = 0; i < total_roids; i++) {
+					size_t total_roids = roids_to_create.size();
+					for (size_t i = 0; i < total_roids; i++) {
 						vec3d dir_vec,final_vec;
 						vec3d parent_vel,hit_rel_vec;
 
@@ -1659,11 +1672,11 @@ int asteroid_will_collide(object *pasteroid_obj, object *escort_objp)
  */
 int asteroid_valid_ship_to_warn_collide(ship *shipp)
 {
-	if ( !(Ship_info[shipp->ship_info_index].flags & (SIF_BIG_SHIP | SIF_HUGE_SHIP)) ) {
+	if ( !(Ship_info[shipp->ship_info_index].is_big_or_huge()) ) {
 		return 0;
 	}
 
-	if ( shipp->flags & (SF_DYING|SF_DEPART_WARP) ) {
+	if ( shipp->flags[Ship::Ship_Flags::Dying] || shipp->flags[Ship::Ship_Flags::Depart_warp] ) {
 		return 0;
 	}
 
@@ -1903,7 +1916,7 @@ void asteroid_parse_tbl()
 	char impact_ani_file[MAX_FILENAME_LEN];
 
 	// How did we get here without having any species defined?
-	Assertion(Species_info.size() > 0,
+	Assertion(!Species_info.empty(),
 		"Cannot parse asteroids/debris if there "
 		"are no species for them to belong to."
 		);
@@ -1915,8 +1928,8 @@ void asteroid_parse_tbl()
 
 		required_string("#Asteroid Types");
 
-		int tally = 0;
-		int max_asteroids =
+		size_t tally = 0;
+		size_t max_asteroids =
 			NUM_DEBRIS_SIZES + Species_info.size() * NUM_DEBRIS_SIZES;
 
 #ifndef NDEBUG
@@ -1930,7 +1943,7 @@ void asteroid_parse_tbl()
 
 			asteroid_parse_section(&new_asteroid);
 
-			int species = tally / NUM_DEBRIS_SIZES;
+			size_t species = tally / NUM_DEBRIS_SIZES;
 			if (tally >= max_asteroids)
 			{
 #ifdef NDEBUG
@@ -1967,7 +1980,7 @@ void asteroid_parse_tbl()
 				default:
 					Error(LOCATION, "Get a coder! Math has broken!\n"
 						"Important numbers:\n"
-						"\ttally: %d\n"
+						"\ttally: " SIZE_T_ARG "\n"
 						"\tNUM_DEBRIS_SIZES: %d\n",
 						tally, NUM_DEBRIS_SIZES
 						);
@@ -1992,9 +2005,9 @@ void asteroid_parse_tbl()
 			}
 #endif
 			Error(LOCATION,
-				"Found %d asteroids/debris when %d expected\n\n"
+				"Found " SIZE_T_ARG " asteroids/debris when " SIZE_T_ARG " expected\n\n"
 				"<Number expected> = <Number of species> * %d + %d generic asteroids\n"
-				"%d = " SIZE_T_ARG "*%d + %d\n\n"
+				SIZE_T_ARG " = " SIZE_T_ARG "*%d + %d\n\n"
 #ifdef NDEBUG
 				"Run a debug build to see a list of all parsed asteroids\n",
 #else
@@ -2085,7 +2098,7 @@ 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].flags & (SIF_HUGE_SHIP | SIF_BIG_SHIP)) {
+		if (Ship_info[Ships[ship_objp->instance].ship_info_index].is_big_or_huge()) {
 			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)

code/asteroid/asteroid.h

@@ -19,7 +19,7 @@
 class object;
 class polymodel;
 struct collision_info_struct;
-class draw_list;
+class model_draw_list;
 
 #define	MAX_ASTEROIDS			512
 
@@ -152,11 +152,11 @@ void	asteroid_init();
 void	asteroid_level_init();
 void	asteroid_level_close();
 void	asteroid_create_all();
-void	asteroid_render(object * obj, draw_list *scene);
+void	asteroid_render(object * obj, model_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 );
+int	asteroid_check_collision( object *asteroid_objp, object * other_obj, vec3d * hitpos, collision_info_struct *asteroid_hit_info=NULL, vec3d* hitnormal=NULL );
 void	asteroid_hit( object *pasteroid_objp, object *other_objp, vec3d *hitpos, float damage );
 int	asteroid_count();
 int	asteroid_collide_objnum(object *asteroid_objp);

code/autopilot/autopilot.cpp

@@ -11,9 +11,9 @@
 #include "autopilot/autopilot.h"
 #include "camera/camera.h"
 #include "cfile/cfile.h"
-#include "freespace2/freespace.h"
+#include "freespace.h"
 #include "gamesnd/eventmusic.h"
-#include "globalincs/def_files.h"
+#include "def_files/def_files.h"
 #include "globalincs/linklist.h"
 #include "iff_defs/iff_defs.h"
 #include "io/timer.h"
@@ -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 & SIF_CARGO)) // ignore cargo
+				&& !(Ship_info[Ships[other_objp->instance].ship_info_index].flags[Ship::Info_Flags::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 & OF_SHOULD_BE_DEAD))
+		if ((objp->type == OBJ_SHIP) && !(objp->flags[Object::Object_Flags::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 & SIF_SUPPORT) )
+			if ( !(sip->flags[Ship::Info_Flags::Support]) )
 				continue;
 
 			// don't deal with dying or departing support ships
-			if ( shipp->flags & (SF_DYING | SF_DEPARTING) )
+			if ( shipp->is_dying_or_departing() )
 				continue;
 
 			Assert(shipp->ai_index != -1);
@@ -286,7 +286,7 @@ bool StartAutopilot()
 		Autopilot_flight_leader = Player_obj;
 	}
 
-	if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
+	if (The_mission.flags[Mission::Mission_Flags::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_FLAG_USE_AP_CINEMATICS)
+	if (The_mission.flags[Mission::Mission_Flags::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].flags2 & SF2_NAVPOINT_CARRY || 
-					(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY)
+				(Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] || 
+					(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::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_FLAG_USE_AP_CINEMATICS)
+	if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
 		speed_cap = 0.90f * speed_cap;
 
 	if ( speed_cap < 1.0f ) {
@@ -367,28 +367,27 @@ bool StartAutopilot()
 	for (i = 0; i < MAX_SHIPS; i++)
 	{
 		if (Ships[i].objnum != -1 && 
-				(Ships[i].flags2 & SF2_NAVPOINT_CARRY || 
-					(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY)
+				(Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] || 
+					(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::Nav_carry])
 				)
 			)
 		{
 			// do we have capital ships in the area?
-			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))
+            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])
 			{
 				capshipPresent = true;
 
 				capIndexes.push_back(i);
 				// ok.. what size class
 
-				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))
-				{
+                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])
+                {
 					capship_counts[1]++;
 					if (capship_spreads[1] < Objects[Ships[i].objnum].radius)
 						capship_spreads[1] = Objects[Ships[i].objnum].radius;
@@ -416,15 +415,15 @@ bool StartAutopilot()
 				radius = Objects[Ships[i].objnum].radius;
 			}
 
-			if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
+			if (The_mission.flags[Mission::Mission_Flags::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_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
+			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
 				&& Autopilot_flight_leader != &Objects[Ships[i].objnum]) //only if not flight leader's object
 			{	
 				ai_info	*aip = &Ai_info[Ships[i].ai_index];
@@ -435,7 +434,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 & AIF_FORMATION_OBJECT);
+					get_absolute_wing_pos_autopilot(&goal_point, leader_objp, wing_index, aip->ai_flags[AI::AI_Flags::Formation_object]);
 				}
 				else
 				{
@@ -470,8 +469,10 @@ bool StartAutopilot()
 				}
 			}
 			// lock primary and secondary weapons
-			if ( LockWeaponsDuringAutopilot )
-				Ships[i].flags2 |= (SF2_PRIMARIES_LOCKED | SF2_SECONDARIES_LOCKED);
+            if (LockWeaponsDuringAutopilot) { 
+                Ships[i].flags.set(Ship::Ship_Flags::Primaries_locked);
+                Ships[i].flags.set(Ship::Ship_Flags::Secondaries_locked);
+            }
 
 			// clear the ship goals and cap the waypoint speed
 			ai_clear_ship_goals(&Ai_info[Ships[i].ai_index]);
@@ -479,7 +480,7 @@ bool StartAutopilot()
 
 			
 			// if they're not part of a wing set their goal
-			if (Ships[i].wingnum == -1 || The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
+			if (Ships[i].wingnum == -1 || The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
 			{ 
 				if (Navs[CurrentNav].flags & NP_WAYPOINT)
 				{
@@ -496,11 +497,11 @@ bool StartAutopilot()
 	}
 
 	// assign wing goals
-	if (!(The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS))
+	if (!(The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics]))
 	{
 		for (i = 0; i < MAX_WINGS; i++)
 		{
-			if (Wings[i].flags & WF_NAV_CARRY )
+			if (Wings[i].flags[Ship::Wing_Flags::Nav_carry] )
 			{	
 				//ai_add_ship_goal_player( int type, int mode, int submode, char *shipname, ai_info *aip );
 
@@ -538,8 +539,8 @@ bool StartAutopilot()
 	{
 		if (Ships[i].objnum != -1)
 		{
-			if (Ships[i].flags2 & SF2_NAVPOINT_CARRY || 
-				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY))
+			if (Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] || 
+				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::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 ||
@@ -557,7 +558,7 @@ bool StartAutopilot()
 	start_dist = DistanceTo(CurrentNav);
 
 	// ----------------------------- setup cinematic -----------------------------
-	if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
+	if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
 	{	
 		if (capshipPresent)
 		{
@@ -570,7 +571,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 & (SIF_CAPITAL | SIF_SUPERCAP))
+                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])
 				{
 					//0 - below - three lines of position
 
@@ -604,7 +605,7 @@ bool StartAutopilot()
 
 					capship_placed[0]++;
 				}
-				else if (Ship_info[Ships[*idx].ship_info_index].flags & SIF_CORVETTE)
+                else if (Ship_info[Ships[*idx].ship_info_index].flags[Ship::Info_Flags::Corvette])
 				{
 					//1 above - 3 lines of position
 					// front/back to zero
@@ -913,14 +914,16 @@ void EndAutoPilot()
 	{
 		if (Ships[i].objnum != -1 && 
 			(
-				Ships[i].flags2 & SF2_NAVPOINT_CARRY || 
-				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY )
+				Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] || 
+				(Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::Nav_carry] )
 			 )
 		   )
 		{
 			//unlock their weaponry
-			if ( LockWeaponsDuringAutopilot )
-				Ships[i].flags2 &= ~(SF2_PRIMARIES_LOCKED | SF2_SECONDARIES_LOCKED);
+            if (LockWeaponsDuringAutopilot) {
+                Ships[i].flags.remove(Ship::Ship_Flags::Primaries_locked);
+                Ships[i].flags.remove(Ship::Ship_Flags::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
 
@@ -947,7 +950,7 @@ void EndAutoPilot()
 						aigp->ai_mode = AI_GOAL_NONE;
 						aigp->signature = -1;
 						aigp->priority = -1;
-						aigp->flags = 0;
+						aigp->flags.reset();
 					}
 				}
 			}
@@ -955,11 +958,11 @@ void EndAutoPilot()
 	}
 
 	// un-assign wing goals
-	if ( !(The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS) )
+	if ( !(The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics]) )
 	{
 		for (i = 0; i < MAX_WINGS; i++)
 		{
-			if (Wings[i].flags & WF_NAV_CARRY )
+			if (Wings[i].flags[Ship::Wing_Flags::Nav_carry] )
 			{
 				for (j = 0; j < MAX_AI_GOALS; j++)
 				{
@@ -971,7 +974,7 @@ void EndAutoPilot()
 						aigp->ai_mode = AI_GOAL_NONE;
 						aigp->signature = -1;
 						aigp->priority = -1;
-						aigp->flags = 0;
+						aigp->flags.reset();
 					}
 				}
 			}
@@ -1041,8 +1044,8 @@ void nav_warp(bool prewarp=false)
 	for (int i = 0; i < MAX_SHIPS; i++)
 	{
 		if (Ships[i].objnum != -1
-			&& (Ships[i].flags2 & SF2_NAVPOINT_CARRY 
-				|| (Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags & WF_NAV_CARRY)))
+			&& (Ships[i].flags[Ship::Ship_Flags::Navpoint_carry] 
+				|| (Ships[i].wingnum != -1 && Wings[Ships[i].wingnum].flags[Ship::Wing_Flags::Nav_carry])))
 		{
 				vm_vec_add(&Objects[Ships[i].objnum].pos, &Objects[Ships[i].objnum].pos, &targetPos);
 				Objects[Ships[i].objnum].phys_info.vel = velocity;
@@ -1069,7 +1072,7 @@ void NavSystem_Do()
 	{
 		if (AutoPilotEngaged)
 		{
-			if (The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS)
+			if (The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics])
 			{
 				camera *cam = nav_get_set_camera();
 				if (CinematicStarted)
@@ -1148,7 +1151,7 @@ void NavSystem_Do()
 	}
 
 	// ramp time compression - only if not using cinematics
-	if (AutoPilotEngaged && !(The_mission.flags & MISSION_FLAG_USE_AP_CINEMATICS))
+	if (AutoPilotEngaged && !(The_mission.flags[Mission::Mission_Flags::Use_ap_cinematics]))
 	{
 		int dstfrm_start = start_dist - DistanceTo(CurrentNav);
 
@@ -1193,14 +1196,14 @@ void NavSystem_Do()
 	*/
 	for (int i = 0; i < MAX_SHIPS; i++)
 	{
-		if (Ships[i].objnum != -1 && Ships[i].flags2 & SF2_NAVPOINT_NEEDSLINK)
+		if (Ships[i].objnum != -1 && Ships[i].flags[Ship::Ship_Flags::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].flags2 &= ~SF2_NAVPOINT_NEEDSLINK;
-				Ships[i].flags2 |= SF2_NAVPOINT_CARRY;
+                Ships[i].flags.remove(Ship::Ship_Flags::Navpoint_needslink);
+                Ships[i].flags.set(Ship::Ship_Flags::Navpoint_carry);
 				
 				send_autopilot_msgID(NP_MSG_MISC_LINKED);
 			}
@@ -1269,14 +1272,14 @@ void NavSystem_Init()
 
 // ********************************************************************************************
 
-void parse_autopilot_table(char *filename)
+void parse_autopilot_table(const char *filename)
 {
 	SCP_vector<SCP_string> lines;
 
 	try
 	{
 		if (filename == NULL)
-			read_file_text_from_array(defaults_get_file("autopilot.tbl"));
+			read_file_text_from_default(defaults_get_file("autopilot.tbl"));
 		else
 			read_file_text(filename, CF_TYPE_TABLES);
 
@@ -1312,7 +1315,7 @@ void parse_autopilot_table(char *filename)
 			Cmdline_autopilot_interruptable = 0;
 
 		// No Nav selected message
-		char *msg_tags[] = { "$No Nav Selected:", "$Gliding:",
+		const 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++)

code/autopilot/autopilot.h

@@ -118,7 +118,7 @@ void NavSystem_Do();
 void NavSystem_Init();
 
 // parse autopilot.tbl
-void parse_autopilot_table(char *filename);
+void parse_autopilot_table(const char *filename);
 
 // Finds a Nav point by name
 int FindNav(char *Nav);

code/bmpman/bm_internal.h

@@ -84,7 +84,7 @@ 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
-	int   data_size;        // How much data this bitmap uses
+	size_t data_size;        // How much data this bitmap uses
 	int   used_count;       // How many times it was accessed
 #endif
 };

code/bmpman/bmpman.cpp

@@ -29,12 +29,13 @@
 #include "io/timer.h"
 #include "jpgutils/jpgutils.h"
 #include "network/multiutil.h"
-#include "palman/palman.h"
 #include "parse/parselo.h"
 #include "pcxutils/pcxutils.h"
 #include "pngutils/pngutils.h"
 #include "ship/ship.h"
 #include "tgautils/tgautils.h"
+#include "tracing/Monitor.h"
+#include "tracing/tracing.h"
 
 #include <ctype.h>
 #include <limits.h>
@@ -55,7 +56,6 @@ MONITOR(SizeBitmapPage)
 
 // --------------------------------------------------------------------------------------------------------------------
 // Definition of public variables (declared as extern in bmpman.h).
-int UNLITMAP = -1;
 int GLOWMAP = -1;
 int SPECMAP = -1;
 int SPECGLOSSMAP = -1;
@@ -65,7 +65,7 @@ int HEIGHTMAP = -1;
 int MISCMAP = -1;
 int AMBIENTMAP = -1;
 
-int bm_texture_ram = 0;
+size_t bm_texture_ram = 0;
 int Bm_paging = 0;
 
 // Extension type lists
@@ -158,8 +158,8 @@ float bitmap_lookup::get_channel_red(float u, float v)
 {
 	Assert( Bitmap_data != NULL );
 
-	CLAMP(u, 0.0, 1.0f);
-	CLAMP(v, 0.0, 1.0f);
+	CLAMP(u, 0.0f, 1.0f);
+	CLAMP(v, 0.0f, 1.0f);
 
 	int x = fl2i(map_texture_address(u) * (Width-1));
 	int y = fl2i(map_texture_address(v) * (Height-1));
@@ -419,7 +419,7 @@ DCF(bmpman, "Shows/changes bitmap caching parameters and usage") {
 	}
 
 	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
-		dc_printf("Total RAM usage: %d bytes\n", bm_texture_ram);
+		dc_printf("Total RAM usage: " SIZE_T_ARG " bytes\n", bm_texture_ram);
 
 		if (Bm_max_ram > 1024 * 1024) {
 			dc_printf("\tMax RAM allowed: %.1f MB\n", i2fl(Bm_max_ram) / (1024.0f*1024.0f));
@@ -435,14 +435,14 @@ DCF(bmpman, "Shows/changes bitmap caching parameters and usage") {
 
 
 	if (dc_optional_string("flush")) {
-		dc_printf("Total RAM usage before flush: %d bytes\n", bm_texture_ram);
+		dc_printf("Total RAM usage before flush: " SIZE_T_ARG " bytes\n", bm_texture_ram);
 		int i;
 		for (i = 0; i < MAX_BITMAPS; i++) {
 			if (bm_bitmaps[i].type != BM_TYPE_NONE) {
 				bm_free_data(i);
 			}
 		}
-		dc_printf("Total RAM after flush: %d bytes\n", bm_texture_ram);
+		dc_printf("Total RAM after flush: " SIZE_T_ARG " bytes\n", bm_texture_ram);
 	} else if (dc_optional_string("ram")) {
 		dc_stuff_int(&Bm_max_ram);
 
@@ -525,6 +525,7 @@ int bm_create(int bpp, int w, int h, void *data, int flags) {
 	bm_bitmaps[n].bm.h = (short)h;
 	bm_bitmaps[n].bm.rowsize = (short)w;
 	bm_bitmaps[n].bm.bpp = (ubyte)bpp;
+	bm_bitmaps[n].bm.true_bpp = (ubyte)bpp;
 	bm_bitmaps[n].bm.flags = (ubyte)flags;
 	bm_bitmaps[n].bm.data = 0;
 	bm_bitmaps[n].bm.palette = NULL;
@@ -1099,7 +1100,7 @@ int bm_is_valid(int handle) {
 //			c_type		= output for an updated BM_TYPE_*
 //			mm_lvl		= number of mipmap levels for the image
 //			size		= size of the data contained in the image
-static int bm_load_info(BM_TYPE type, int n, const char *filename, CFILE *img_cfp, int *w, int *h, int *bpp, BM_TYPE *c_type, int *mm_lvl, int *size)
+static int bm_load_info(BM_TYPE type, int n, const char *filename, CFILE *img_cfp, int *w, int *h, int *bpp, BM_TYPE *c_type, int *mm_lvl, size_t *size)
 {
 	int dds_ct;
 
@@ -1194,7 +1195,8 @@ int bm_load(const char *real_filename) {
 	int i, free_slot = -1;
 	int w, h, bpp = 8;
 	int rc = 0;
-	int bm_size = 0, mm_lvl = 0;
+	size_t bm_size = 0;
+	int mm_lvl = 0;
 	char filename[MAX_FILENAME_LEN];
 	BM_TYPE type = BM_TYPE_NONE;
 	BM_TYPE c_type = BM_TYPE_NONE;
@@ -1399,8 +1401,6 @@ static int bm_load_image_data(const char *filename, int handle, int bitmapnum, i
 	bitmap_entry *be = &bm_bitmaps[bitmapnum];
 	bitmap *bmp = &be->bm;
 
-	Assert(!Is_standalone);
-
 	if (bmp->true_bpp > bpp)
 		true_bpp = bmp->true_bpp;
 	else
@@ -1505,7 +1505,8 @@ int bm_load_animation(const char *real_filename, int *nframes, int *fps, int *ke
 	float anim_total_time = 0.0f;
 	int anim_width = 0, anim_height = 0;
 	BM_TYPE type = BM_TYPE_NONE, eff_type = BM_TYPE_NONE, c_type = BM_TYPE_NONE;
-	int bpp = 0, mm_lvl = 0, img_size = 0;
+	int bpp = 0, mm_lvl = 0;
+	size_t img_size = 0;
 	char clean_name[MAX_FILENAME_LEN];
 
 	if (!bm_inited)
@@ -1866,7 +1867,7 @@ int bm_load_sub_fast(const char *real_filename, int *handle, int dir_type, bool
 
 int bm_load_sub_slow(const char *real_filename, const int num_ext, const char **ext_list, CFILE **img_cfp, int dir_type) {
 	char full_path[MAX_PATH];
-	int size = 0, offset = 0;
+	size_t size = 0, offset = 0;
 	int rval = -1;
 
 	rval = cf_find_file_location_ext(real_filename, num_ext, ext_list, dir_type, sizeof(full_path) - 1, full_path, &size, &offset, 0);
@@ -2158,7 +2159,7 @@ void bm_lock_apng(int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int
 		cumulative_frame_delay += the_apng->frame.delay;
 		be->info.ani.apng.frame_delay = cumulative_frame_delay;
 
-		nprintf(("apng", "locking apng frame: %s (%i|%i|%i) (%f) %lu\n", be->filename, bpp, bmp->bpp, bm->true_bpp, be->info.ani.apng.frame_delay, be->mem_taken));
+		nprintf(("apng", "locking apng frame: %s (%i|%i|%i) (%f) " SIZE_T_ARG "\n", be->filename, bpp, bmp->bpp, bm->true_bpp, be->info.ani.apng.frame_delay, be->mem_taken));
 	}
 }
 
@@ -2279,7 +2280,7 @@ void bm_lock_pcx(int handle, int bitmapnum, bitmap_entry *be, bitmap *bmp, int b
 	data = (ubyte *)bm_malloc(bitmapnum, be->mem_taken);
 	bmp->bpp = bpp;
 	bmp->data = (ptr_u)data;
-	bmp->palette = (bpp == 8) ? gr_palette : NULL;
+	bmp->palette = NULL;
 	memset(data, 0, be->mem_taken);
 
 	Assert(&be->bm == bmp);
@@ -2522,10 +2523,10 @@ int bm_make_render_target(int width, int height, int flags) {
 	return bm_bitmaps[n].handle;
 }
 
-void *bm_malloc(int n, int size) {
+void *bm_malloc(int n, size_t size) {
 	Assert((n >= 0) && (n < MAX_BITMAPS));
 
-	if (size <= 0)
+	if (size == 0)
 		return NULL;
 
 #ifdef BMPMAN_NDEBUG
@@ -2577,6 +2578,8 @@ void bm_page_in_start() {
 }
 
 void bm_page_in_stop() {
+	TRACE_SCOPE(tracing::PageInStop);
+
 	int i;
 
 #ifndef NDEBUG
@@ -2593,6 +2596,7 @@ void bm_page_in_stop() {
 	for (i = 0; i < MAX_BITMAPS; i++) {
 		if ((bm_bitmaps[i].type != BM_TYPE_NONE) && (bm_bitmaps[i].type != BM_TYPE_RENDER_TARGET_DYNAMIC) && (bm_bitmaps[i].type != BM_TYPE_RENDER_TARGET_STATIC)) {
 			if (bm_bitmaps[i].preloaded) {
+				TRACE_SCOPE(tracing::PageInSingleBitmap);
 				if (bm_preloading) {
 					if (!gr_preload(bm_bitmaps[i].handle, (bm_bitmaps[i].preloaded == 2))) {
 						mprintf(("Out of VRAM.  Done preloading.\n"));
@@ -2994,6 +2998,8 @@ void bm_set_low_mem(int mode) {
 }
 
 bool bm_set_render_target(int handle, int face) {
+	GR_DEBUG_SCOPE("Set render target");
+
 	int n = handle % MAX_BITMAPS;
 
 	if (n >= 0) {
@@ -3077,6 +3083,10 @@ int bm_unload(int handle, int clear_render_targets, bool nodebug) {
 	bitmap_entry *be;
 	bitmap *bmp;
 
+	if (handle == -1) {
+		return -1;
+	}
+
 	int n = handle % MAX_BITMAPS;
 
 	Assert((n >= 0) && (n < MAX_BITMAPS));
@@ -3211,10 +3221,9 @@ void bm_unlock(int handle) {
 	Assert(be->ref_count >= 0);		// Trying to unlock data more times than lock was called!!!
 }
 
-void bm_update_memory_used(int n, int size)
+void bm_update_memory_used(int n, size_t size)
 {
 	Assert( (n >= 0) && (n < MAX_BITMAPS) );
-	Assert( size >= 0 );
 
 #ifdef BMPMAN_NDEBUG
 	Assert( bm_bitmaps[n].data_size == 0 );

code/bmpman/bmpman.h

@@ -112,7 +112,7 @@ struct bitmap
 	                     */
 };
 
-extern int bm_texture_ram;  //!< how many bytes of textures are used.
+extern size_t bm_texture_ram;  //!< how many bytes of textures are used.
 
 extern int Bm_paging;   //!< Bool type that indicates if BMPMAN is currently paging.
 
@@ -170,14 +170,14 @@ int bm_get_next_handle();
  * @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, int size);
+void *bm_malloc(int handle, size_t 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, int size);
+void bm_update_memory_used(int n, size_t size);
 
 class bitmap_lookup {
 	ubyte *Bitmap_data;

code/camera/camera.cpp

@@ -26,7 +26,7 @@ camid Main_camera;
 
 //*************************CLASS: camera*************************
 //This is where the camera class beings! :D
-camera::camera(char *in_name, int in_signature)
+camera::camera(const char *in_name, int in_signature)
 {
 	set_name(in_name);
 	sig = in_signature;
@@ -78,7 +78,7 @@ void camera::reset()
 	}
 }
 
-void camera::set_name(char *in_name)
+void camera::set_name(const char *in_name)
 {
 	if(in_name != NULL)
 		strncpy(name, in_name, NAME_LENGTH-1);
@@ -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 = gr_get_current_fontnum();
-			gr_set_font(text_fontnum);
+			old_fontnum = font::get_current_fontnum();
+			font::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)
 		{
-			gr_set_font(old_fontnum);
+			font::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 = gr_get_current_fontnum();
-		gr_set_font(text_fontnum);
+		old_fontnum = font::get_current_fontnum();
+		font::set_font(text_fontnum);
 	}
 	else
 	{
@@ -732,7 +732,7 @@ void subtitle::do_frame(float frametime)
 	// restore old font
 	if (old_fontnum >= 0)
 	{
-		gr_set_font(old_fontnum);
+		font::set_font(old_fontnum);
 	}
 
 	if(image_id >= 0)
@@ -824,7 +824,7 @@ camid::camid()
 	sig = -1;
 }
 
-camid::camid(int n_idx, int n_sig)
+camid::camid(size_t n_idx, int n_sig)
 {
 	idx = n_idx;
 	sig = n_sig;
@@ -838,7 +838,7 @@ camera* camid::getCamera()
 	return Cameras[idx];
 }
 
-uint camid::getIndex()
+size_t camid::getIndex()
 {
 	return idx;
 }
@@ -885,14 +885,14 @@ int cam_get_next_sig()
 	return next_sig++;
 }
 
-camid cam_create(char *n_name, vec3d *n_pos, vec3d *n_norm, object *n_object, int n_object_host_submodel)
+camid cam_create(const 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(char *n_name, vec3d *n_pos, matrix *n_ori, object *n_object, int 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)
 {
 	camera *cam = NULL;
 	camid cid;
@@ -954,7 +954,7 @@ camid cam_get_current()
 	return Current_camera;
 }
 
-uint cam_get_num()
+size_t cam_get_num()
 {
 	return Cameras.size();
 }

code/camera/camera.h

@@ -43,13 +43,13 @@ protected:
 	vec3d c_pos;
 	matrix c_ori;
 public:
-	camera(char *in_name=NULL, int in_signature=-1);
+	camera(const char *in_name=NULL, int in_signature=-1);
 	~camera();
 	void clear();
 	void reset();
 
 	//Set
-	void set_name(char *in_name);
+	void set_name(const 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);
@@ -158,15 +158,15 @@ extern float Sexp_fov;
 void cam_init();
 void cam_close();
 void cam_do_frame(float frametime);
-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);
+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);
 void cam_delete(camid cid);
 bool cam_set_camera(camid cid);
 void cam_reset_camera();
 camid cam_lookup(char *name);
 camid cam_get_camera(uint index);
 camid cam_get_current();
-uint cam_get_num();
+size_t cam_get_num();
 
 void get_turret_cam_pos(camera *cam, vec3d *pos);
 void get_turret_cam_orient(camera *cam, matrix *ori);

code/cfile/cfile.cpp

@@ -14,6 +14,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
+#include <sys/stat.h>
 
 #ifdef _WIN32
 #include <io.h>
@@ -23,7 +24,6 @@
 #endif
 
 #ifdef SCP_UNIX
-#include <sys/stat.h>
 #include <glob.h>
 #include <sys/mman.h>
 #endif
@@ -34,6 +34,7 @@
 #include "osapi/osapi.h"
 #include "parse/encrypt.h"
 
+#include <limits>
 
 char Cfile_root_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
 char Cfile_user_dir[CFILE_ROOT_DIRECTORY_LEN] = "";
@@ -68,7 +69,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",					CF_TYPE_DATA	},
+	{ CF_TYPE_MOVIES,				"data" DIR_SEPARATOR_STR "movies",											".mve .msb .ogg .mp4",				CF_TYPE_DATA	},
 	{ CF_TYPE_INTERFACE,			"data" DIR_SEPARATOR_STR "interface",										".pcx .ani .dds .tga .eff .png .jpg",	CF_TYPE_DATA	},
 	{ CF_TYPE_FONT,					"data" DIR_SEPARATOR_STR "fonts",											".vf .ttf",							CF_TYPE_DATA	},
 	{ CF_TYPE_EFFECTS,				"data" DIR_SEPARATOR_STR "effects",											".ani .eff .pcx .neb .tga .jpg .png .dds .sdr",	CF_TYPE_DATA	},
@@ -81,7 +82,7 @@ cf_pathtype Pathtypes[CF_MAX_PATH_TYPES]  = {
 	{ 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",								CF_TYPE_DATA	},
+	{ CF_TYPE_CONFIG,				"data" DIR_SEPARATOR_STR "config",											".cfg .tbl .tbm .xml .csv",			CF_TYPE_DATA	},
 	{ CF_TYPE_DEMOS,				"data" DIR_SEPARATOR_STR "demos",											".fsd",								CF_TYPE_DATA	},
 	{ CF_TYPE_CBANIMS,				"data" DIR_SEPARATOR_STR "cbanims",											".pcx .ani .eff .tga .jpg .png .dds",	CF_TYPE_DATA	},
 	{ CF_TYPE_INTEL_ANIMS,			"data" DIR_SEPARATOR_STR "intelanims",										".pcx .ani .eff .tga .jpg .png .dds",	CF_TYPE_DATA	},
@@ -107,7 +108,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, int offset, int size);
+static CFILE *cf_open_packed_cfblock(const char* source, int line, FILE *fp, int type, size_t offset, size_t size);
 
 #if defined _WIN32
 static CFILE *cf_open_mapped_fill_cfblock(const char* source, int line, HANDLE hFile, int type);
@@ -127,12 +128,14 @@ static void dump_opened_files()
 	}
 }
 
-static void cfile_close()
+void cfile_close()
 {
 	mprintf(("Still opened files:\n"));
 	dump_opened_files();
 
 	cf_free_secondary_filelist();
+
+	cfile_inited = 0;
 }
 
 #ifdef SCP_UNIX
@@ -183,9 +186,8 @@ static bool cfile_in_root_dir(const char *exe_path)
  */
 int cfile_init(const char *exe_dir, const char *cdrom_dir)
 {
-	int i;
-
-	encrypt_init();	  /* initialize encryption */
+	// initialize encryption
+	encrypt_init();	
 
 	if (cfile_inited) {
 		return 0;
@@ -195,7 +197,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';
-	i = strlen(buf);
+	size_t i = strlen(buf);
 
 	// are we in a root directory?		
 	if(cfile_in_root_dir(buf)){
@@ -239,8 +241,6 @@ 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;
 }
 
@@ -407,7 +407,7 @@ int cfile_flush_dir(int dir_type)
 	// proceed to delete the files
 	del_count = 0;
 #if defined _WIN32
-	int find_handle;
+	intptr_t find_handle;
 	_finddata_t find;
 	find_handle = _findfirst( "*", &find );
 	if (find_handle != -1) {
@@ -459,11 +459,10 @@ 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];
 
-	flen = strlen(filename);
-	elen = strlen(ext);
+	size_t flen = strlen(filename);
+	size_t elen = strlen(ext);
 	Assert(flen < MAX_PATH_LEN);
 	strcpy_s(path, filename);
 	if ((flen < 4) || stricmp(path + flen - elen, ext)) {
@@ -515,7 +514,7 @@ 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;
+	size_t offset = 1;
 
 	if ( (filename == NULL) || !strlen(filename) )
 		return 0;
@@ -609,7 +608,7 @@ static void mkdir_recursive(const char *path) {
     while ((pos = tmp.find_first_of(DIR_SEPARATOR_CHAR, pre)) != std::string::npos) {
         dir = tmp.substr(0, pos++);
         pre = pos;
-        if (dir.size() == 0) continue; // if leading / first time is 0 length
+        if (dir.empty()) continue; // if leading / first time is 0 length
         
         _mkdir(dir.c_str());
     }
@@ -622,6 +621,7 @@ 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." );
 
@@ -635,13 +635,14 @@ void cf_create_directory( int dir_type )
 
 	} 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], NULL );
-		mprintf(( "CFILE: Creating new directory '%s'\n", longname ));
-        mkdir_recursive(longname);
+		if (stat(longname, &statbuf) != 0) {
+			mprintf(( "CFILE: Creating new directory '%s'\n", longname ));
+			mkdir_recursive(longname);
+		}
 	}
 }
 
@@ -758,7 +759,7 @@ 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;
+	size_t offset, size;
 	char copy_file_path[MAX_PATH_LEN];  // FIX change in memory from cf_find_file_location
 	strcpy_s(copy_file_path, file_path);
 
@@ -819,7 +820,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 int size, const int offset, int dir_type)
+CFILE *_cfopen_special(const char* source, int line, const char *file_path, const char *mode, const size_t size, const size_t offset, int dir_type)
 {
 	if ( !cfile_inited) {
 		Int3();
@@ -828,7 +829,6 @@ 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') ) {
@@ -1019,7 +1019,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, int offset, int size)
+static CFILE *cf_open_packed_cfblock(const char* source, int line, FILE *fp, int type, size_t offset, size_t size)
 {
 	// Found it in a pack file
 	int cfile_block_index;
@@ -1388,7 +1388,7 @@ int cfwrite_string(const char *buf, CFILE *file)
 	if ( (!buf) || (buf && !buf[0]) ) {
 		return cfwrite_char(0, file);
 	} 
-	int len = strlen(buf);
+	int len = (int)strlen(buf);
 	if(!cfwrite(buf, len, 1, file)){
 		return 0;
 	}
@@ -1397,7 +1397,7 @@ int cfwrite_string(const char *buf, CFILE *file)
 
 int cfwrite_string_len(const char *buf, CFILE *file)
 {
-	int len = strlen(buf);
+	int len = (int)strlen(buf);
 
 	if(!cfwrite_int(len, file)){
 		return 0;
@@ -1423,7 +1423,11 @@ int cfilelength( CFILE * cfile )
 	Assert(cb->fp != NULL);
 
 	// cb->size gets set at cfopen
-	return cb->size;
+	
+	// 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;
 }
 
 // cfwrite() writes to the file
@@ -1468,7 +1472,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);
 }
 
 
@@ -1649,7 +1653,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, int size)
+uint cf_add_chksum_long(uint seed, ubyte *buffer, size_t size)
 {
 	uint crc;
 	ubyte *p;
@@ -1741,14 +1745,12 @@ 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 int safe_size = 2097152; // 2 Meg
+	const size_t 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];
-	int cf_len = 0;
-	int cf_total;
-	int read_size;
-	int max_size;
+	size_t read_size;
+	size_t max_size;
 
 	if (chk_long == NULL) {
 		Int3();
@@ -1766,7 +1768,7 @@ int cf_chksum_pack(const char *filename, uint *chk_long, bool full)
 
 	// get the max size
 	fseek(fp, 0, SEEK_END);
-	max_size = ftell(fp);
+	max_size = (size_t)ftell(fp);
 
 	// maybe do a chksum of the entire file
 	if (full) {
@@ -1774,17 +1776,19 @@ int cf_chksum_pack(const char *filename, uint *chk_long, bool full)
 	}
 	// othewise it's only a partial check
 	else {
-		CLAMP(max_size, 0, safe_size);
+		if (max_size > safe_size) {
+			max_size = safe_size;
+		}
 
 		Assertion(max_size > header_offset,
-			"max_size (%d) > header_offset in packfile %s", max_size, filename);
+			"max_size (" SIZE_T_ARG ") > header_offset in packfile %s", max_size, filename);
 		max_size -= header_offset;
 
-		fseek(fp, -(max_size), SEEK_END);
+		fseek(fp, -((long)max_size), SEEK_END);
 	}
 
-	cf_total = 0;
-
+	size_t cf_total = 0;
+	size_t cf_len = 0;
 	do {
 		// determine how much we want to read
 		if ( (max_size - cf_total) >= CF_CHKSUM_SAMPLE_SIZE )

code/cfile/cfile.h

@@ -116,6 +116,7 @@ extern char Cfile_user_dir_legacy[CFILE_ROOT_DIRECTORY_LEN];
 
 //================= 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 
@@ -138,7 +139,7 @@ CFILE *_cfopen(const char* source_file, int line, const char *filename, const ch
 // like cfopen(), but it accepts a fully qualified path only (ie, the result of a cf_find_file_location() call)
 // NOTE: only supports reading files!!
 CFILE *_cfopen_special(const char* source_file, int line, const char *file_path, const char *mode,
-	const int size, const int offset, int dir_type = CF_TYPE_ANY);
+	const size_t size, const size_t 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
@@ -238,7 +239,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, int size);
+uint cf_add_chksum_long(uint seed, ubyte *buffer, size_t size);
 
 // convenient for misc checksumming purposes ------------------------------------------
 
@@ -324,7 +325,7 @@ void cf_sort_filenames( SCP_vector<SCP_string> &list, int sort, SCP_vector<file_
 //         size        - File size
 //         offset      - Offset into pack file.  0 if not a packfile.
 // Returns: If not found returns 0.
-int cf_find_file_location( const char *filespec, int pathtype, int max_out, char *pack_filename, int *size, int *offset, bool localize = false);
+int cf_find_file_location( const char *filespec, int pathtype, int max_out, char *pack_filename, size_t *size, size_t *offset, bool localize = false);
 
 // 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.
@@ -338,7 +339,7 @@ int cf_find_file_location( const char *filespec, int pathtype, int max_out, char
 //         offset      - Offset into pack file.  0 if not a packfile.
 // Returns: If not found returns -1, else returns offset into ext_list.
 // (NOTE: This function is exponentially slow, so don't use it unless truely needed!!)
-int cf_find_file_location_ext(const char *filename, const int ext_num, const char **ext_list, int pathtype, int max_out = 0, char *pack_filename = NULL, int *size = NULL, int *offset = NULL, bool localize = false);
+int cf_find_file_location_ext(const char *filename, const int ext_num, const char **ext_list, int pathtype, int max_out = 0, char *pack_filename = NULL, size_t *size = NULL, size_t *offset = NULL, bool localize = false);
 
 // Functions to change directories
 int cfile_chdir(const char *dir);

code/cfile/cfilearchive.cpp

@@ -27,13 +27,14 @@
 #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, int lib_offset, int size, int pos )
+void cf_init_lowlevel_read_code( CFILE * cfile, size_t lib_offset, size_t size, size_t pos )
 {
 	Assert(cfile != NULL);
 
@@ -47,13 +48,12 @@ void cf_init_lowlevel_read_code( CFILE * cfile, int lib_offset, int size, int po
 
 	if ( cb->fp )	{
 		if ( cb->lib_offset )	{
-			fseek( cb->fp, cb->lib_offset, SEEK_SET );
+			fseek( cb->fp, (long)cb->lib_offset, SEEK_SET );
 		}
 
 		#if defined(CHECK_POSITION) && !defined(NDEBUG)
-			int raw_position;
-			raw_position = ftell(cb->fp) - cb->lib_offset;
-			Assert(raw_position == cb->raw_position);
+		auto raw_position = ftell(cb->fp) - cb->lib_offset;
+		Assert(raw_position == cb->raw_position);
 		#endif
 	}
 }
@@ -84,9 +84,8 @@ int cfeof(CFILE *cfile)
 	Assert(cb->fp != NULL);
 
 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-		int raw_position;
-		raw_position = ftell(cb->fp) - cb->lib_offset;
-		Assert(raw_position == cb->raw_position);
+	auto raw_position = ftell(cb->fp) - cb->lib_offset;
+	Assert(raw_position == cb->raw_position);
 	#endif
 		
 	if (cb->raw_position >= cb->size ) {
@@ -116,12 +115,14 @@ int cftell( CFILE * cfile )
 	Assert(cb->fp != NULL);
 
 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-		int raw_position;
-		raw_position = ftell(cb->fp) - cb->lib_offset;
-		Assert(raw_position == cb->raw_position);
+	auto raw_position = ftell(cb->fp) - cb->lib_offset;
+	Assert(raw_position == cb->raw_position);
 	#endif
 
-	return cb->raw_position;
+	// 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;
 }
 
 
@@ -143,7 +144,7 @@ int cfseek( CFILE *cfile, int offset, int where )
 	Assert( !cb->data );
 	Assert( cb->fp != NULL );
 	
-	int goal_position;
+	size_t goal_position;
 
 	switch( where )	{
 	case CF_SEEK_SET:
@@ -160,15 +161,19 @@ int cfseek( CFILE *cfile, int offset, int where )
 	default:
 		Int3();
 		return 1;
-	}	
+	}
 
-	int result = fseek(cb->fp, goal_position, SEEK_SET );
+	// Make sure we don't seek beyond the end of the file
+	CAP(goal_position, cb->lib_offset, cb->lib_offset + cb->size);
+
+	int result = fseek(cb->fp, (long)goal_position, SEEK_SET );
+	Assertion(goal_position >= cb->lib_offset, "Invalid offset values detected while seeking! Goal was " SIZE_T_ARG ", lib_offset is " SIZE_T_ARG ".", goal_position, cb->lib_offset);
 	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)
-		int tmp_offset;
-		tmp_offset = (int)ftell(cb->fp) - cb->lib_offset;
-		Assert(tmp_offset==cb->raw_position);
+	auto tmp_offset = ftell(cb->fp) - cb->lib_offset;
+	Assert(tmp_offset==cb->raw_position);
 	#endif
 
 	return result;	
@@ -185,7 +190,7 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 	if(!cf_is_valid(cfile))
 		return 0;
 
-	int size = elsize*nelem;
+	size_t size = elsize*nelem;
 
 	if(buf == NULL || size <= 0)
 		return 0;
@@ -200,6 +205,7 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 	}
 
 	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;
@@ -208,7 +214,7 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 	}
 
 	if (cb->max_read_len) {
-		if ( (size_t)(cb->raw_position+size) > cb->max_read_len ) {
+		if ( cb->raw_position+size > cb->max_read_len ) {
 			std::ostringstream s_buf;
 			s_buf << "Attempted to read " << size << "-byte(s) beyond length limit";
 
@@ -216,18 +222,18 @@ int cfread(void *buf, int elsize, int nelem, CFILE *cfile)
 		}
 	}
 
-	int bytes_read = fread( buf, 1, size, cb->fp );
+	size_t 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)
-		int tmp_offset;
-		tmp_offset = ftell(cb->fp) - cb->lib_offset;
-		Assert(tmp_offset==cb->raw_position);
+	auto tmp_offset = ftell(cb->fp) - cb->lib_offset;
+	Assert(tmp_offset==cb->raw_position);
 	#endif
 
-	return bytes_read / elsize;
+	return (int)(bytes_read / elsize);
 
 }
 
@@ -250,12 +256,12 @@ int cfread_lua_number(double *buf, CFILE *cfile)
 
 	long orig_pos = ftell(cb->fp);
 	int items_read = fscanf(cb->fp, LUA_NUMBER_SCAN, buf);
-	cb->raw_position += ftell(cb->fp)-orig_pos;		
+	cb->raw_position += ftell(cb->fp)-orig_pos;
+	Assertion(cb->raw_position <= cb->size, "Invalid raw_position value detected!");
 
 	#if defined(CHECK_POSITION) && !defined(NDEBUG)
-		int tmp_offset;
-		tmp_offset = ftell(cb->fp) - cb->lib_offset;
-		Assert(tmp_offset==cb->raw_position);
+	auto tmp_offset = ftell(cb->fp) - cb->lib_offset;
+	Assert(tmp_offset==cb->raw_position);
 	#endif
 
 	return items_read;

code/cfile/cfilearchive.h

@@ -34,9 +34,9 @@ typedef struct Cfile_block {
 //	int		fd;				// file descriptor
 	size_t	data_length;	// length of data for mmap
 #endif
-	int		lib_offset;
-	int		raw_position;
-	int		size;				// for packed files
+	size_t	lib_offset;
+	size_t	raw_position;
+	size_t	size;				// for packed files
 
 	size_t	max_read_len;	// max read offset, for special error handling
 	
@@ -48,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, int lib_offset, int size, int pos );
+void cf_init_lowlevel_read_code( CFILE * cfile, size_t lib_offset, size_t size, size_t pos );
 
 #endif

code/cfile/cfilelist.cpp

@@ -420,7 +420,7 @@ int cfread_compressed(void *buf, int elsize, int nelem, CFILE *cfile)
 		}
 	}
 
-	return (out - (char *)buf)/elsize;
+	return (int)((out - (char *)buf)/elsize);
 }
 
 int cfwrite_compressed(void *param_buf, int param_elsize, int param_nelem, CFILE *cfile)

code/cfile/cfilesystem.cpp

@@ -30,6 +30,7 @@
 #include <fnmatch.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <libgen.h>
 #endif
 
 #include "cfile/cfile.h"
@@ -38,12 +39,13 @@
 #include "globalincs/pstypes.h"
 #include "localization/localize.h"
 #include "osapi/osapi.h"
+#include "parse/parselo.h"
 
 #define CF_ROOTTYPE_PATH 0
 #define CF_ROOTTYPE_PACK 1
 
 // for a defined and specifically set location to get/send pilot/campaign files
-char *Pilot_file_path = NULL;
+SCP_string Pilot_file_path;
 
 //  Created by:
 //    specifying hard drive tree
@@ -77,12 +79,13 @@ static int Num_path_roots = 0;
 
 // Created by searching all roots in order.   This means Files is then sorted by precedence.
 typedef struct cf_file {
-	char		name_ext[CF_MAX_FILENAME_LENGTH];		// Filename and extension
-	int		root_index;										// Where in Roots this is located
-	int		pathtype_index;								// Where in Paths this is located
-	time_t	write_time;										// When it was last written
-	int		size;												// How big it is in bytes
-	int		pack_offset;									// For pack files, where it is at.   0 if not in a pack file.  This can be used to tell if in a pack file.
+	char	name_ext[CF_MAX_FILENAME_LENGTH];	// Filename and extension
+	int		root_index;							// Where in Roots this is located
+	int		pathtype_index;						// Where in Paths this is located
+	time_t	write_time;							// When it was last written
+	int		size;								// How big it is in bytes
+	int		pack_offset;						// For pack files, where it is at.   0 if not in a pack file.  This can be used to tell if in a pack file.
+	char*	real_name;							// For real files, the full path
 } cf_file;
 
 #define CF_NUM_FILES_PER_BLOCK   512
@@ -115,6 +118,7 @@ cf_file *cf_create_file()
 	if ( File_blocks[block] == NULL )	{
 		File_blocks[block] = (cf_file_block *)vm_malloc( sizeof(cf_file_block) );
 		Assert( File_blocks[block] != NULL);
+		memset(File_blocks[block], 0, sizeof(cf_file_block));
 	}
 
 	Num_files++;
@@ -178,7 +182,7 @@ int cf_get_packfile_count(cf_root *root)
 #if defined _WIN32
 		filespec += "*.vp";
 
-		int find_handle;
+		intptr_t find_handle;
 		_finddata_t find;
 		
 		find_handle = _findfirst( filespec.c_str( ), &find );
@@ -266,7 +270,7 @@ void cf_build_pack_list( cf_root *root )
 #if defined _WIN32
 		strcat_s( filespec, "*.vp" );
 
-		int find_handle;
+		intptr_t find_handle;
 		_finddata_t find;
 		
 		find_handle = _findfirst( filespec, &find );
@@ -359,6 +363,16 @@ void cf_build_pack_list( cf_root *root )
 	vm_free(temp_roots_sort);
 }
 
+static char normalize_directory_separator(char in)
+{
+	if (in == '/')
+	{
+		return DIR_SEPARATOR_CHAR;
+	}
+
+	return in;
+}
+
 static void cf_add_mod_roots(const char* rootDirectory)
 {
 	if (Cmdline_mod)
@@ -380,6 +394,9 @@ static void cf_add_mod_roots(const char* rootDirectory)
 				Error(LOCATION, "The length of mod directory path '%s' exceeds the maximum of %d!\n", rootPath.c_str(), CF_MAX_PATHNAME_LENGTH);
 			}
 
+			// normalize the path to the native path format
+			std::transform(rootPath.begin(), rootPath.end(), rootPath.begin(), normalize_directory_separator);
+
 			cf_root* root = cf_create_root();
 
 			strncpy(root->path, rootPath.c_str(),  CF_MAX_PATHNAME_LENGTH-1);
@@ -396,7 +413,6 @@ void cf_build_root_list(const char *cdrom_dir)
 	Num_path_roots = 0;
 
 	cf_root	*root = nullptr;
-	int path_len;
 
 	if (os_is_legacy_mode())
 	{
@@ -416,7 +432,7 @@ void cf_build_root_list(const char *cdrom_dir)
 		root->roottype = CF_ROOTTYPE_PATH;
 
 		// If it wasn't set before, set the pilot path
-		if (Pilot_file_path == NULL)
+		if (Pilot_file_path.empty())
 			Pilot_file_path = root->path;
 
 		// Next, check any VP files under the current directory.
@@ -443,7 +459,7 @@ void cf_build_root_list(const char *cdrom_dir)
 		root->roottype = CF_ROOTTYPE_PATH;
 
 		// set the default player location to here
-		if (Pilot_file_path == NULL)
+		if (Pilot_file_path.empty())
 			Pilot_file_path = root->path;
 
 		// Next, check any VP files under the current directory.
@@ -463,7 +479,7 @@ void cf_build_root_list(const char *cdrom_dir)
 	
 	strcpy_s(root->path, working_directory);
 
-	path_len = strlen(root->path);
+	size_t path_len = strlen(root->path);
 
 	// do we already have a slash? as in the case of a root directory install
 	if ( (path_len < (CF_MAX_PATHNAME_LENGTH-1)) && (root->path[path_len-1] != DIR_SEPARATOR_CHAR) ) {
@@ -473,7 +489,7 @@ void cf_build_root_list(const char *cdrom_dir)
 	root->roottype = CF_ROOTTYPE_PATH;
 
 	// If the path wasn't set before use the working directory
-	if ( Pilot_file_path == NULL )
+	if ( Pilot_file_path.empty() )
 		Pilot_file_path = root->path;
 
    //======================================================
@@ -522,6 +538,10 @@ void cf_search_root_path(int root_index)
 	mprintf(( "Searching root '%s' ... ", root->path ));
 
 	char search_path[CF_MAX_PATHNAME_LENGTH];
+#ifdef SCP_UNIX
+    // This map stores the mapping between a specific path type and the actual path that we use for it
+	SCP_unordered_map<int, SCP_string> pathTypeToRealPath;
+#endif
 
 	for (i=CF_TYPE_ROOT; i<CF_MAX_PATH_TYPES; i++ )	{
 
@@ -540,9 +560,10 @@ void cf_search_root_path(int root_index)
 		} 
 
 #if defined _WIN32
+		SCP_string search_directory = search_path;
 		strcat_s( search_path, "*.*" );
 
-		int find_handle;
+		intptr_t find_handle;
 		_finddata_t find;
 		
 		find_handle = _findfirst( search_path, &find );
@@ -564,6 +585,11 @@ void cf_search_root_path(int root_index)
 							file->size = find.size;
 							file->pack_offset = 0;			// Mark as a non-packed file
 
+							SCP_string file_name;
+							sprintf(file_name, "%s%s%s", search_directory.c_str(), DIR_SEPARATOR_STR, find.name);
+
+							file->real_name = vm_strdup(file_name.c_str());
+
 							num_files++;
 							//mprintf(( "Found file '%s'\n", file->name_ext ));
 						}
@@ -576,21 +602,80 @@ void cf_search_root_path(int root_index)
 			_findclose( find_handle );
 		}
 #elif defined SCP_UNIX
-		DIR *dirp;
-		struct dirent *dir;
+		DIR *dirp = nullptr;
+		SCP_string search_dir;
+		{
+			if (i == CF_TYPE_ROOT) {
+				// Don't search for the same name for the root case since we would be searching in other mod directories in that case
+				dirp = opendir (search_path);
+				search_dir.assign(search_path);
+			} else {
+				// On Unix we can have a different case for the search paths so we also need to account for that
+				// We do that by looking at the parent of search_path and enumerating all directories and the check if any of
+				// them are a case-insensitive match
+				SCP_string directory_name;
+
+				auto parentPathIter = pathTypeToRealPath.find(Pathtypes[i].parent_index);
+
+				if (parentPathIter == pathTypeToRealPath.end()) {
+					// No parent known yet, use the standard dirname
+					char dirname_copy[CF_MAX_PATHNAME_LENGTH];
+					memcpy(dirname_copy, search_path, sizeof(search_path));
+					// According to the documentation of directory_name and basename, the return value does not need to be freed
+					directory_name.assign(dirname(dirname_copy));
+				} else {
+					// we have a valid parent path -> use that
+					directory_name = parentPathIter->second;
+				}
+
+				char basename_copy[CF_MAX_PATHNAME_LENGTH];
+				memcpy(basename_copy, search_path, sizeof(search_path));
+				// According to the documentation of dirname and basename, the return value does not need to be freed
+				auto search_name = basename(basename_copy);
+
+				auto parentDirP = opendir(directory_name.c_str());
+
+				if (parentDirP) {
+					struct dirent *dir = nullptr;
+					while ((dir = readdir (parentDirP)) != nullptr) {
+
+						if (stricmp(search_name, dir->d_name)) {
+							continue;
+						}
+
+						SCP_string fn;
+						sprintf(fn, "%s/%s", directory_name.c_str(), dir->d_name);
+
+						struct stat buf;
+						if (stat(fn.c_str(), &buf) == -1) {
+							continue;
+						}
+
+						if (S_ISDIR(buf.st_mode)) {
+							// Found a case insensitive match
+							dirp = opendir(fn.c_str());
+							search_dir = fn;
+							// We also need to store this in our mapping since we may need it in the future
+							pathTypeToRealPath.insert(std::make_pair(i, fn));
+							break;
+						}
+					}
+					closedir(parentDirP);
+				}
+			}
+		}
 
-		dirp = opendir (search_path);
 		if ( dirp ) {
+			struct dirent *dir = nullptr;
 			while ((dir = readdir (dirp)) != NULL)
 			{
 				if (!fnmatch ("*.*", dir->d_name, 0))
 				{
-					char fn[MAX_PATH];
-					snprintf(fn, MAX_PATH-1, "%s%s", search_path, dir->d_name);
-					fn[MAX_PATH-1] = 0;
+					SCP_string fn;
+					sprintf(fn, "%s/%s", search_dir.c_str(), dir->d_name);
 
 					struct stat buf;
-					if (stat(fn, &buf) == -1) {
+					if (stat(fn.c_str(), &buf) == -1) {
 						continue;
 					}
 					
@@ -614,6 +699,8 @@ void cf_search_root_path(int root_index)
 
 							file->pack_offset = 0;			// Mark as a non-packed file
 
+							file->real_name = vm_strdup(fn.c_str());
+
 							num_files++;
 							//mprintf(( "Found file '%s'\n", file->name_ext ));
 						}
@@ -701,7 +788,7 @@ void cf_search_root_pack(int root_index)
 		find.filename[sizeof(find.filename)-1] = '\0';
 
 		if ( find.size == 0 )	{
-			int search_path_len = strlen(search_path);
+			size_t search_path_len = strlen(search_path);
 			if ( !stricmp( find.filename, ".." ))	{
 				char *p = &search_path[search_path_len-1];
 				while( (p > search_path) && (*p != DIR_SEPARATOR_CHAR) )	{
@@ -815,6 +902,14 @@ void cf_free_secondary_filelist()
 	// Init the file blocks	
 	for (i=0; i<CF_MAX_FILE_BLOCKS; i++ )	{
 		if ( File_blocks[i] )	{
+			// Free file paths
+			for (auto& f : File_blocks[i]->files) {
+				if (f.real_name) {
+					vm_free(f.real_name);
+					f.real_name = nullptr;
+				}
+			}
+
 			vm_free( File_blocks[i] );
 			File_blocks[i] = NULL;
 		}
@@ -837,18 +932,13 @@ void cf_free_secondary_filelist()
  *
  * @return If not found returns 0.
  */
-int cf_find_file_location( const char *filespec, int pathtype, int max_out, char *pack_filename, int *size, int *offset, bool localize )
+int cf_find_file_location( const char *filespec, int pathtype, int max_out, char *pack_filename, size_t *size, size_t *offset, bool localize )
 {
 	int i;
     uint ui;
 	int cfs_slow_search = 0;
 	char longname[MAX_PATH_LEN];
 
-#if defined WIN32
-	long findhandle;
-	_finddata_t findstruct;
-#endif
-
 	Assert( (filespec != NULL) && (strlen(filespec) > 0) ); //-V805
 	Assert( (pack_filename == NULL) || (max_out > 1) );
 
@@ -917,7 +1007,9 @@ int cf_find_file_location( const char *filespec, int pathtype, int max_out, char
 			cf_create_default_path_string( longname, sizeof(longname)-1, search_order[ui], filespec, localize );
 
 #if defined _WIN32
-			findhandle = _findfirst(longname, &findstruct);
+			_finddata_t findstruct;
+
+			intptr_t findhandle = _findfirst(longname, &findstruct);
 			if (findhandle != -1) {
 				if (size)
 					*size = findstruct.size;
@@ -973,20 +1065,17 @@ int cf_find_file_location( const char *filespec, int pathtype, int max_out, char
 						*size = f->size;
 
 					if (offset)
-						*offset = f->pack_offset;
+						*offset = (size_t)f->pack_offset;
 
 					if (pack_filename) {
-						cf_root *r = cf_get_root(f->root_index);
-
-						strncpy( pack_filename, r->path, max_out );
-
 						if (f->pack_offset < 1) {
-							strcat_s( pack_filename, max_out, Pathtypes[f->pathtype_index].path );
+							// This is a real file, return the actual file path
+							strncpy( pack_filename, f->real_name, max_out );
+						} else {
+							// File is in a pack file
+							cf_root *r = cf_get_root(f->root_index);
 
-							if ( pack_filename[strlen(pack_filename)-1] != DIR_SEPARATOR_CHAR )
-								strcat_s( pack_filename, max_out, DIR_SEPARATOR_STR );
-
-							strcat_s( pack_filename, max_out, f->name_ext );
+							strncpy( pack_filename, r->path, max_out );
 						}
 					}
 
@@ -1001,22 +1090,17 @@ int cf_find_file_location( const char *filespec, int pathtype, int max_out, char
 				*size = f->size;
 
 			if (offset)
-				*offset = f->pack_offset;
+				*offset = (size_t)f->pack_offset;
 
 			if (pack_filename) {
-				cf_root *r = cf_get_root(f->root_index);
-
-				strcpy( pack_filename, r->path );
-
 				if (f->pack_offset < 1) {
-					if ( strlen(Pathtypes[f->pathtype_index].path) ) {
-						strcat_s( pack_filename, max_out, Pathtypes[f->pathtype_index].path );
+					// This is a real file, return the actual file path
+					strncpy( pack_filename, f->real_name, max_out );
+				} else {
+					// File is in a pack file
+					cf_root *r = cf_get_root(f->root_index);
 
-						if ( pack_filename[strlen(pack_filename)-1] != DIR_SEPARATOR_CHAR )
-							strcat_s( pack_filename, max_out, DIR_SEPARATOR_STR );
-					}
-
-					strcat_s( pack_filename, max_out, f->name_ext );
+					strncpy( pack_filename, r->path, max_out );
 				}
 			}
 
@@ -1048,7 +1132,7 @@ extern char *stristr(char *str, const char *substr);
  *
  * @return If not found returns -1, else returns offset into ext_list.
  */
-int cf_find_file_location_ext( const char *filename, const int ext_num, const char **ext_list, int pathtype, int max_out, char *pack_filename, int *size, int *offset, bool localize )
+int cf_find_file_location_ext( const char *filename, const int ext_num, const char **ext_list, int pathtype, int max_out, char *pack_filename, size_t *size, size_t *offset, bool localize )
 {
 	int cur_ext, i;
     uint ui;
@@ -1056,12 +1140,7 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 	char longname[MAX_PATH_LEN];
 	char filespec[MAX_FILENAME_LEN];
 	char *p = NULL;
-
-#if defined WIN32
-	long findhandle;
-	_finddata_t findstruct;
-#endif
-
+	
 	Assert( (filename != NULL) && (strlen(filename) < MAX_FILENAME_LEN) );
 	Assert( (ext_list != NULL) && (ext_num > 1) );	// if we are searching for just one ext
 													// then this is the wrong function to use
@@ -1132,7 +1211,8 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 			cf_create_default_path_string( longname, sizeof(longname)-1, search_order[ui], filespec, localize );
 
 #if defined _WIN32
-			findhandle = _findfirst(longname, &findstruct);
+			_finddata_t findstruct;
+			intptr_t findhandle = _findfirst(longname, &findstruct);
 			if (findhandle != -1) {
 				if (size)
 					*size = findstruct.size;
@@ -1179,11 +1259,11 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 		(*p) = 0;
 
 	// go ahead and get our length, which is used to test with later
-	int filespec_len = strlen(filespec);
+	size_t filespec_len = strlen(filespec);
 
 	// get total legnth, with extension, which is iused to test with later
 	// (FIXME: this assumes that everything in ext_list[] is the same length!)
-	uint filespec_len_big = filespec_len + strlen(ext_list[0]);
+	size_t filespec_len_big = filespec_len + strlen(ext_list[0]);
 
 	SCP_vector< cf_file* > file_list_index;
 	int last_root_index = -1;
@@ -1255,17 +1335,14 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 							*offset = f->pack_offset;
 
 						if (pack_filename) {
-							cf_root *r = cf_get_root(f->root_index);
-
-							strncpy( pack_filename, r->path, max_out );
-
 							if (f->pack_offset < 1) {
-								strcat_s( pack_filename, max_out, Pathtypes[f->pathtype_index].path );
+								// This is a real file, return the actual file path
+								strncpy( pack_filename, f->real_name, max_out );
+							} else {
+								// File is in a pack file
+								cf_root *r = cf_get_root(f->root_index);
 
-								if ( pack_filename[strlen(pack_filename)-1] != DIR_SEPARATOR_CHAR )
-									strcat_s( pack_filename, max_out, DIR_SEPARATOR_STR );
-
-								strcat_s( pack_filename, max_out, f->name_ext );
+								strncpy( pack_filename, r->path, max_out );
 							}
 						}
 
@@ -1286,20 +1363,14 @@ int cf_find_file_location_ext( const char *filename, const int ext_num, const ch
 					*offset = f->pack_offset;
 
 				if (pack_filename) {
-					cf_root *r = cf_get_root(f->root_index);
-
-					strcpy( pack_filename, r->path );
-
 					if (f->pack_offset < 1) {
+						// This is a real file, return the actual file path
+						strncpy( pack_filename, f->real_name, max_out );
+					} else {
+						// File is in a pack file
+						cf_root *r = cf_get_root(f->root_index);
 
-						if ( strlen(Pathtypes[f->pathtype_index].path) ) {
-							strcat_s( pack_filename, max_out, Pathtypes[f->pathtype_index].path );
-
-							if ( pack_filename[strlen(pack_filename)-1] != DIR_SEPARATOR_CHAR )
-								strcat_s( pack_filename, max_out, DIR_SEPARATOR_STR );
-						}
-
-						strcat_s( pack_filename, max_out, f->name_ext );
+						strncpy( pack_filename, r->path, max_out );
 					}
 				}
 
@@ -1419,7 +1490,8 @@ int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *fi
 {
 	char *ptr;
 	uint i;
-	int l, own_flag = 0;
+	int own_flag = 0;
+	size_t l;
 	SCP_vector<file_list_info> my_info;
 	file_list_info tinfo;
 
@@ -1447,7 +1519,7 @@ int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *fi
 	strcat_s(filespec, filter);
 
 	_finddata_t find;
-	int find_handle;
+	intptr_t find_handle;
 
 	find_handle = _findfirst( filespec, &find );
 	if (find_handle != -1) {
@@ -1463,7 +1535,7 @@ int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *fi
 
 					ptr = strrchr(find.name, '.');
 					if (ptr)
-						l = ptr - find.name;
+						l = (size_t)(ptr - find.name);
 					else
 						l = strlen(find.name);
 
@@ -1514,7 +1586,7 @@ int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *fi
 
 				ptr = strrchr(dir->d_name, '.');
 				if (ptr)
-					l = ptr - dir->d_name;
+					l = (size_t)(ptr - dir->d_name);
 				else
 					l = strlen(dir->d_name);
 
@@ -1531,8 +1603,7 @@ int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *fi
 	}
 #endif
 
-	bool skip_packfiles = (Skip_packfile_search != 0);
-
+	bool skip_packfiles = false;
 	if ( (pathtype == CF_TYPE_PLAYERS) || (pathtype == CF_TYPE_SINGLE_PLAYERS) || (pathtype == CF_TYPE_MULTI_PLAYERS) ) {
 		skip_packfiles = true;
 	} else if (Get_file_list_child != NULL) {
@@ -1557,12 +1628,17 @@ int cf_get_file_list( SCP_vector<SCP_string> &list, int pathtype, const char *fi
 				continue;
 			}
 
+			if (Skip_packfile_search && f->pack_offset != 0) {
+				// If the packfile skip flag is set we skip files in VPs but still search in directories
+				continue;
+			}
+
 			if ( !Get_file_list_filter || (*Get_file_list_filter)(f->name_ext) ) {
 				//mprintf(( "Found '%s' in root %d path %d\n", f->name_ext, f->root_index, f->pathtype_index ));
 
 				ptr = strrchr(f->name_ext, '.');
 				if (ptr)
-					l = ptr - f->name_ext;
+					l = (size_t)(ptr - f->name_ext);
 				else
 					l = strlen(f->name_ext);
 
@@ -1620,7 +1696,8 @@ int cf_get_file_list( int max, char **list, int pathtype, const char *filter, in
 {
 	char *ptr;
 	uint i;
-	int l, num_files = 0, own_flag = 0;
+	int num_files = 0, own_flag = 0;
+	size_t l;
 
 	if (max < 1) {
 		Get_file_list_filter = NULL;
@@ -1641,7 +1718,7 @@ int cf_get_file_list( int max, char **list, int pathtype, const char *filter, in
 	cf_create_default_path_string( filespec, sizeof(filespec)-1, pathtype, filter );
 
 	_finddata_t find;
-	int find_handle;
+	intptr_t find_handle;
 
 	find_handle = _findfirst( filespec, &find );
 	if (find_handle != -1) {
@@ -1732,8 +1809,16 @@ int cf_get_file_list( int max, char **list, int pathtype, const char *filter, in
 	}
 #endif
 
+	bool skip_packfiles = false;
+	if ((pathtype == CF_TYPE_PLAYERS) || (pathtype == CF_TYPE_SINGLE_PLAYERS) || (pathtype == CF_TYPE_MULTI_PLAYERS)) {
+		skip_packfiles = true;
+	}
+	else if (Get_file_list_child != NULL) {
+		skip_packfiles = true;
+	}
+
 	// Search all the packfiles and CD.
-	if ( !Skip_packfile_search )	{
+	if ( !skip_packfiles)	{
 		for (i=0; i<Num_files; i++ )	{
 			cf_file * f = cf_get_file(i);
 
@@ -1753,6 +1838,11 @@ int cf_get_file_list( int max, char **list, int pathtype, const char *filter, in
 				continue;
 			}
 
+			if (Skip_packfile_search && f->pack_offset != 0) {
+				// If the packfile skip flag is set we skip files in VPs but still search in directories
+				continue;
+			}
+
 			if ( !Get_file_list_filter || (*Get_file_list_filter)(f->name_ext) ) {
 
 				//mprintf(( "Found '%s' in root %d path %d\n", f->name_ext, f->root_index, f->pathtype_index ));
@@ -1846,7 +1936,7 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 #if defined _WIN32
 	cf_create_default_path_string( filespec, sizeof(filespec)-1, pathtype, filter );
 
-	int find_handle;
+	intptr_t find_handle;
 	_finddata_t find;
 	
 	find_handle = _findfirst( filespec, &find );
@@ -1936,8 +2026,16 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 	}
 #endif
 
+	bool skip_packfiles = false;
+	if ((pathtype == CF_TYPE_PLAYERS) || (pathtype == CF_TYPE_SINGLE_PLAYERS) || (pathtype == CF_TYPE_MULTI_PLAYERS)) {
+		skip_packfiles = true;
+	}
+	else if (Get_file_list_child != NULL) {
+		skip_packfiles = true;
+	}
+
 	// Search all the packfiles and CD.
-	if ( !Skip_packfile_search )	{
+	if (!skip_packfiles) {
 		for (uint i=0; i<Num_files; i++ )	{
 			cf_file * f = cf_get_file(i);
 
@@ -1958,6 +2056,11 @@ int cf_get_file_list_preallocated( int max, char arr[][MAX_FILENAME_LEN], char *
 				continue;
 			}
 
+			if (Skip_packfile_search && f->pack_offset != 0) {
+				// If the packfile skip flag is set we skip files in VPs but still search in directories
+				continue;
+			}
+
 			if ( !Get_file_list_filter || (*Get_file_list_filter)(f->name_ext) ) {
 
 				//mprintf(( "Found '%s' in root %d path %d\n", f->name_ext, f->root_index, f->pathtype_index ));
@@ -2025,7 +2128,7 @@ int cf_create_default_path_string(char *path, uint path_max, int pathtype, const
 
 		// force a specific directory to search for player files
 		if ( (pathtype == CF_TYPE_PLAYERS) || (pathtype == CF_TYPE_SINGLE_PLAYERS) || (pathtype == CF_TYPE_MULTI_PLAYERS) ) {
-			strncpy(path, Pilot_file_path, path_max);
+			strncpy(path, Pilot_file_path.c_str(), path_max);
 		} else {
 			strncpy(path, root->path, path_max);
 		}

code/cfile/cfilesystem.h

@@ -20,10 +20,10 @@ 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
-	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.
+	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.
 } cf_pathtype;
 
 // During cfile_init, verify that Pathtypes[n].index == n for each item

code/cfilearchiver/CMakeLists.txt

@@ -0,0 +1,19 @@
+
+add_executable(cfilearchiver EXCLUDE_FROM_ALL cfilearchiver.cpp)
+
+ADD_DEFINITIONS(-DNO_SAFE_STRINGS)
+include_directories(${CODE_HEADERS})
+
+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
+		COMPILE_DEFINITIONS_DEBUG "_DEBUG;PDB_DEBUGGING=1"
+	)
+ENDIF(MSVC)

code/cfilearchiver/cfilearchiver.cpp

@@ -315,28 +315,16 @@ 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");
-	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" );
-
+	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");
 	exit(0);
 }
 
@@ -352,16 +340,7 @@ 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] );

code/cfileextractor/CMakeLists.txt

@@ -0,0 +1,19 @@
+
+add_executable(cfileextractor EXCLUDE_FROM_ALL cfileextractor.cpp)
+
+ADD_DEFINITIONS(-DNO_SAFE_STRINGS)
+include_directories(${CODE_HEADERS})
+
+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
+		COMPILE_DEFINITIONS_DEBUG "_DEBUG;PDB_DEBUGGING=1"
+	)
+ENDIF(MSVC)

code/cmdline/cmdline.cpp

@@ -17,7 +17,7 @@
 #include "globalincs/version.h"
 #include "hud/hudconfig.h"
 #include "network/multi.h"
-#include "parse/scripting.h"
+#include "scripting/scripting.h"
 #include "parse/sexp.h"
 #include "globalincs/version.h"
 #include "globalincs/pstypes.h"
@@ -150,6 +150,7 @@ Flag exe_params[] =
 	{ "-noscalevid",		"Disable scale-to-window for movies",		true,	0,					EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noscalevid", },
 	{ "-missile_lighting",	"Apply lighting to missiles"	,			true,	EASY_ALL_ON,		EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-missile_lighting", },
 	{ "-nonormal",			"Disable normal maps",						true,	EASY_DEFAULT_MEM,	EASY_MEM_ALL_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-normal" },
+	{ "-no_emissive_light",	"Disable emissive light from ships",		true,	0,					EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_emissive_light" },
 	{ "-noheight",			"Disable height/parallax maps",				true,	EASY_DEFAULT_MEM,	EASY_MEM_ALL_ON,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-height" },
 	{ "-3dshockwave",		"Enable 3D shockwaves",						true,	EASY_MEM_ALL_ON,	EASY_DEFAULT_MEM,	"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-3dshockwave" },
 	{ "-post_process",		"Enable post processing",					true,	EASY_ALL_ON,		EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-post_process" },
@@ -157,6 +158,7 @@ Flag exe_params[] =
 	{ "-fxaa",				"Enable FXAA anti-aliasing",				true,	EASY_MEM_ALL_ON,	EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fxaa" },
 	{ "-nolightshafts",		"Disable lightshafts",						true,	EASY_DEFAULT,		EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-flightshaftsoff"},
 	{ "-fb_explosions",		"Enable Framebuffer Shockwaves",			true,	EASY_ALL_ON,		EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fb_explosions", },
+    { "-fb_thrusters",      "Enable Framebuffer Thrusters",             true,   EASY_ALL_ON,        EASY_DEFAULT,       "Graphics",     "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-fb_thrusters", },
 	{ "-no_deferred",		"Disable Deferred Lighting",				true,	EASY_DEFAULT_MEM,	EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_deferred"},
 	{ "-enable_shadows",	"Enable Shadows",							true,	EASY_MEM_ALL_ON,	EASY_DEFAULT,		"Graphics",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_shadows"},
 	{ "-no_vsync",			"Disable vertical sync",					true,	0,					EASY_DEFAULT,		"Game Speed",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_vsync", },
@@ -180,6 +182,8 @@ Flag exe_params[] =
 	{ "-nomusic",			"Disable music",							false,	0,					EASY_DEFAULT,		"Audio",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nomusic", },
 	{ "-no_enhanced_sound",	"Disable enhanced sound",					false,	0,					EASY_DEFAULT,		"Audio",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_enhanced_sound", },
 
+	{ "-portable_mode",		"Store config in portable location",		false,	0,					EASY_DEFAULT,		"Launcher",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-portable_mode", },
+
 	{ "-standalone",		"Run as standalone server",					false,	0,					EASY_DEFAULT,		"Multiplayer",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-standalone", },
 	{ "-startgame",			"Skip mainhall and start hosting",			false,	0,					EASY_DEFAULT,		"Multiplayer",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-startgame", },
 	{ "-closed",			"Start hosted server as closed",			false,	0,					EASY_DEFAULT,		"Multiplayer",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-closed", },
@@ -192,11 +196,9 @@ Flag exe_params[] =
 	{ "-nomovies",			"Disable video playback",					true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nomovies", },
 	{ "-noparseerrors",		"Disable parsing errors",					true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noparseerrors", },
 	{ "-query_speech",		"Check if this build has speech",			true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-query_speech", },
-	{ "-novbo",				"Disable OpenGL VBO",						true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-novbo", },
 	{ "-loadallweps",		"Load all weapons, even those not used",	true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-loadallweps", },
 	{ "-disable_fbo",		"Disable OpenGL RenderTargets",				true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-disable_fbo", },
 	{ "-disable_pbo",		"Disable OpenGL Pixel Buffer Objects",		true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-disable_pbo", },
-	{ "-no_glsl",			"Disable GLSL (shader) support",			true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_glsl", },
 	{ "-ati_swap",			"Fix colour issues on some ATI cards",		true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-ati_swap", },
 	{ "-no_3d_sound",		"Use only 2D/stereo for sound effects",		true,	0,					EASY_DEFAULT,		"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_3d_sound", },
 	{ "-mipmap",			"Enable mipmapping",						true,	0,					EASY_DEFAULT_MEM,	"Troubleshoot",	"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-mipmap", },
@@ -206,6 +208,8 @@ Flag exe_params[] =
 	{ "-no_batching",		"Disable batched model rendering",			true,	0,					EASY_DEFAULT,		"Troubleshoot", "", },
 	{ "-no_geo_effects",	"Disable geometry shader for effects",		true,	0,					EASY_DEFAULT,		"Troubleshoot", "", },
 	{ "-set_cpu_affinity",	"Sets processor affinity to config value",	true,	0,					EASY_DEFAULT,		"Troubleshoot", "", },
+	{ "-nograb",			"Disables mouse grabbing",					true,	0,					EASY_DEFAULT,		"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-nograb", },
+	{ "-noshadercache",		"Disables the shader cache",				true,	0,					EASY_DEFAULT,		"Troubleshoot", "http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noshadercache", },
 #ifdef WIN32
 	{ "-fix_registry",	"Use a different registry path",			true,		0,					EASY_DEFAULT,		"Troubleshoot", "", },
 #endif
@@ -228,13 +232,16 @@ Flag exe_params[] =
 	{ "-output_sexps",		"Output SEXPs to sexps.html",				true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-output_sexps", },
 	{ "-output_scripting",	"Output scripting to scripting.html",		true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-output_scripting", },
 	{ "-save_render_target",	"Save render targets to file",			true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-save_render_target", },
-	{ "-debug_window",		"Display debug window",						true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-debug_window", },
 	{ "-verify_vps",		"Spew VP CRCs to vp_crcs.txt",				true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-verify_vps", },
 	{ "-reparse_mainhall",	"Reparse mainhall.tbl when loading halls",	false,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-reparse_mainhall", },
-	{ "-profile_frame_time","Profile engine subsystems",				true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-profile_frame_timings", },
 	{ "-profile_write_file", "Write profiling information to file",		true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-profile_write_file", },
 	{ "-no_unfocused_pause","Don't pause if the window isn't focused",	true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-no_unfocused_pause", },
 	{ "-benchmark_mode",	"Puts the game into benchmark mode",		true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-benchmark_mode", },
+	{ "-noninteractive",	"Disables interactive dialogs",				true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-noninteractive", },
+	{ "-json_pilot",		"Dump pilot files in JSON format",			true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-json_pilot", },
+	{ "-json_profiling",	"Generate JSON profiling output",			true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-json_profiling", },
+	{ "-profile_frame_time","Profile engine subsystems",				true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-profile_frame_timings", },
+	{ "-debug_window",		"Enable the debug window",					true,	0,					EASY_DEFAULT,		"Dev Tool",		"http://www.hard-light.net/wiki/index.php/Command-Line_Reference#-debug_window", },
 };
 
 // forward declaration
@@ -312,6 +319,7 @@ cmdline_parm bloom_intensity_arg("-bloom_intensity", "Set bloom intensity, requi
 cmdline_parm fxaa_arg("-fxaa", NULL, AT_NONE);
 cmdline_parm fxaa_preset_arg("-fxaa_preset", "FXAA quality (0-9), requires -post_process and -fxaa", AT_INT);
 cmdline_parm fb_explosions_arg("-fb_explosions", NULL, AT_NONE);
+cmdline_parm fb_thrusters_arg("-fb_thrusters", NULL, AT_NONE);
 cmdline_parm flightshaftsoff_arg("-nolightshafts", NULL, AT_NONE);
 cmdline_parm no_batching("-no_batching", NULL, AT_NONE);
 cmdline_parm shadow_quality_arg("-shadow_quality", NULL, AT_INT);
@@ -340,6 +348,7 @@ bool Cmdline_fxaa = false;
 int Cmdline_fxaa_preset = 6;
 extern int Fxaa_preset_last_frame;
 bool Cmdline_fb_explosions = 0;
+bool Cmdline_fb_thrusters = false;
 bool Cmdline_no_batching = false;
 extern bool ls_force_off;
 int Cmdline_shadow_quality = 0;
@@ -421,10 +430,8 @@ bool Cmdline_portable_mode = false;
 cmdline_parm loadallweapons_arg("-loadallweps", NULL, AT_NONE);	// Cmdline_load_all_weapons
 cmdline_parm nomovies_arg("-nomovies", NULL, AT_NONE);		// Cmdline_nomovies  -- Allows video streaming
 cmdline_parm no_set_gamma_arg("-no_set_gamma", NULL, AT_NONE);	// Cmdline_no_set_gamma
-cmdline_parm no_vbo_arg("-novbo", NULL, AT_NONE);			// Cmdline_novbo
 cmdline_parm no_fbo_arg("-disable_fbo", NULL, AT_NONE);		// Cmdline_no_fbo
 cmdline_parm no_pbo_arg("-disable_pbo", NULL, AT_NONE);		// Cmdline_no_pbo
-cmdline_parm noglsl_arg("-no_glsl", NULL, AT_NONE);			// Cmdline_noglsl  -- disable GLSL support in OpenGL
 cmdline_parm mipmap_arg("-mipmap", NULL, AT_NONE);			// Cmdline_mipmap
 cmdline_parm atiswap_arg("-ati_swap", NULL, AT_NONE);        // Cmdline_atiswap - Fix ATI color swap issue for screenshots.
 cmdline_parm no3dsound_arg("-no_3d_sound", NULL, AT_NONE);		// Cmdline_no_3d_sound - Disable use of full 3D sounds
@@ -434,6 +441,8 @@ cmdline_parm old_collision_system("-old_collision", NULL, AT_NONE); // Cmdline_o
 cmdline_parm gl_finish ("-gl_finish", NULL, AT_NONE);
 cmdline_parm no_geo_sdr_effects("-no_geo_effects", NULL, AT_NONE);
 cmdline_parm set_cpu_affinity("-set_cpu_affinity", NULL, AT_NONE);
+cmdline_parm nograb_arg("-nograb", NULL, AT_NONE);
+cmdline_parm noshadercache_arg("-noshadercache", NULL, AT_NONE);
 #ifdef WIN32
 cmdline_parm fix_registry("-fix_registry", NULL, AT_NONE);
 #endif
@@ -441,10 +450,8 @@ cmdline_parm fix_registry("-fix_registry", NULL, AT_NONE);
 int Cmdline_load_all_weapons = 0;
 int Cmdline_nomovies = 0;
 int Cmdline_no_set_gamma = 0;
-int Cmdline_novbo = 0; // turn off OGL VBO support, troubleshooting
 int Cmdline_no_fbo = 0;
 int Cmdline_no_pbo = 0;
-int Cmdline_noglsl = 0;
 int Cmdline_ati_color_swap = 0;
 int Cmdline_no_3d_sound = 0;
 int Cmdline_drawelements = 0;
@@ -452,6 +459,8 @@ char* Cmdline_keyboard_layout = NULL;
 bool Cmdline_gl_finish = false;
 bool Cmdline_no_geo_sdr_effects = false;
 bool Cmdline_set_cpu_affinity = false;
+bool Cmdline_nograb = false;
+bool Cmdline_noshadercache = false;
 #ifdef WIN32
 bool Cmdline_alternate_registry_path = false;
 #endif
@@ -461,12 +470,8 @@ cmdline_parm start_mission_arg("-start_mission", "Skip mainhall and run this mis
 cmdline_parm dis_collisions("-dis_collisions", NULL, AT_NONE);	// Cmdline_dis_collisions
 cmdline_parm dis_weapons("-dis_weapons", NULL, AT_NONE);		// Cmdline_dis_weapons
 cmdline_parm noparseerrors_arg("-noparseerrors", NULL, AT_NONE);	// Cmdline_noparseerrors  -- turns off parsing errors -C
-#ifdef Allow_NoWarn
-cmdline_parm nowarn_arg("-no_warn", "Disable warnings (not recommended)", AT_NONE);			// Cmdline_nowarn
-#endif
 cmdline_parm extra_warn_arg("-extra_warn", "Enable 'extra' warnings", AT_NONE);	// Cmdline_extra_warn
 cmdline_parm fps_arg("-fps", NULL, AT_NONE);					// Cmdline_show_fps
-cmdline_parm show_mem_usage_arg("-show_mem_usage", NULL, AT_NONE);	// Cmdline_show_mem_usage
 cmdline_parm pos_arg("-pos", NULL, AT_NONE);					// Cmdline_show_pos
 cmdline_parm stats_arg("-stats", NULL, AT_NONE);				// Cmdline_show_stats
 cmdline_parm save_render_targets_arg("-save_render_target", NULL, AT_NONE);	// Cmdline_save_render_targets
@@ -477,10 +482,15 @@ cmdline_parm center_res_arg("-center_res", "Resolution of center monitor, format
 cmdline_parm verify_vps_arg("-verify_vps", NULL, AT_NONE);	// Cmdline_verify_vps  -- spew VP crcs to vp_crcs.txt
 cmdline_parm parse_cmdline_only(PARSE_COMMAND_LINE_STRING, "Ignore any cmdline_fso.cfg files", AT_NONE);
 cmdline_parm reparse_mainhall_arg("-reparse_mainhall", NULL, AT_NONE); //Cmdline_reparse_mainhall
-cmdline_parm frame_profile_arg("-profile_frame_time", NULL, AT_NONE); //Cmdline_frame_profile
 cmdline_parm frame_profile_write_file("-profile_write_file", NULL, AT_NONE); // Cmdline_profile_write_file
 cmdline_parm no_unfocused_pause_arg("-no_unfocused_pause", NULL, AT_NONE); //Cmdline_no_unfocus_pause
 cmdline_parm benchmark_mode_arg("-benchmark_mode", NULL, AT_NONE); //Cmdline_benchmark_mode
+cmdline_parm noninteractive_arg("-noninteractive", NULL, AT_NONE); //Cmdline_noninteractive
+cmdline_parm json_pilot("-json_pilot", NULL, AT_NONE); //Cmdline_json_pilot
+cmdline_parm json_profiling("-json_profiling", NULL, AT_NONE); //Cmdline_json_profiling
+cmdline_parm show_video_info("-show_video_info", NULL, AT_NONE); //Cmdline_show_video_info
+cmdline_parm frame_profile_arg("-profile_frame_time", NULL, AT_NONE); //Cmdline_frame_profile
+cmdline_parm debug_window_arg("-debug_window", NULL, AT_NONE);	// Cmdline_debug_window
 
 
 char *Cmdline_start_mission = NULL;
@@ -492,7 +502,6 @@ int Cmdline_noparseerrors = 0;
 int Cmdline_nowarn = 0; // turn warnings off in FRED
 #endif
 int Cmdline_extra_warn = 0;
-int Cmdline_show_mem_usage = 0;
 int Cmdline_show_pos = 0;
 int Cmdline_show_stats = 0;
 int Cmdline_save_render_targets = 0;
@@ -502,10 +511,15 @@ char *Cmdline_res = 0;
 char *Cmdline_center_res = 0;
 int Cmdline_verify_vps = 0;
 int Cmdline_reparse_mainhall = 0;
-bool Cmdline_frame_profile = false;
 bool Cmdline_profile_write_file = false;
 bool Cmdline_no_unfocus_pause = false;
 bool Cmdline_benchmark_mode = false;
+bool Cmdline_noninteractive = false;
+bool Cmdline_json_pilot = false;
+bool Cmdline_json_profiling = false;
+bool Cmdline_frame_profile = false;
+bool Cmdline_show_video_info = false;
+bool Cmdline_debug_window = false;
 
 // Other
 cmdline_parm get_flags_arg("-get_flags", "Output the launcher flags file", AT_NONE);
@@ -608,17 +622,20 @@ int is_extra_space(char ch)
 // eliminates all leading and trailing extra chars from a string.  Returns pointer passed in.
 char *drop_extra_chars(char *str)
 {
-	int s, e;
+	size_t s;
+	size_t e;
 
 	s = 0;
 	while (str[s] && is_extra_space(str[s]))
 		s++;
 
-	e = strlen(str) - 1;	// we already account for NULL later on, so the -1 is here to make
-							// sure we do our math without taking it into consideration
+	e = strlen(str);
 
-	if (e < 0)
-		e = 0;
+	if (e > 0) {
+		// we already account for NULL later on, so the -1 is here to make
+		// sure we do our math without taking it into consideration
+		e -= 1;
+	}
 
 	while (e > s) {
 		if (!is_extra_space(str[e])){
@@ -673,8 +690,8 @@ bool parm_stuff_args(cmdline_parm *parm, int argc, char *argv[], int index)
 				parm->args = NULL;
 			}
 
-			int argsize = strlen(argv[index + 1]);
-			int buffersize = argsize;
+			size_t argsize = strlen(argv[index + 1]);
+			size_t buffersize = argsize;
 
 			if (saved_args != NULL)
 			{
@@ -772,12 +789,7 @@ void os_validate_parms(int argc, char *argv[])
 			if (parm_found == 0) {
 				// if we got a -help, --help, -h, or -? then show the help text, otherwise show unknown option
 				if (!stricmp(token, "-help") || !stricmp(token, "--help") || !stricmp(token, "-h") || !stricmp(token, "-?")) {
-					if (FS_VERSION_REVIS == 0) {
-						printf("FreeSpace 2 Open, version %i.%i.%i\n", FS_VERSION_MAJOR, FS_VERSION_MINOR, FS_VERSION_BUILD);
-					}
-					else {
-						printf("FreeSpace 2 Open, version %i.%i.%i.%i\n", FS_VERSION_MAJOR, FS_VERSION_MINOR, FS_VERSION_BUILD, FS_VERSION_REVIS);
-					}
+					printf("FreeSpace 2 Open, version %s\n", FS_VERSION_FULL);
 					printf("Website: http://scp.indiegames.us\n");
 					printf("Mantis (bug reporting): http://scp.indiegames.us/mantis/\n\n");
 					printf("Usage: fs2_open [options]\n");
@@ -785,16 +797,17 @@ void os_validate_parms(int argc, char *argv[])
 					// not the prettiest thing but the job gets done
 					static const int STR_SIZE = 25;  // max len of exe_params.name + 5 spaces
 					const int AT_SIZE = 8;  // max len of cmdline_arg_types[] + 2 spaces
-					int sp=0, atp=0;
+					size_t atp = 0;
+					size_t sp = 0;
 					for (parmp = GET_FIRST(&Parm_list); parmp !=END_OF_LIST(&Parm_list); parmp = GET_NEXT(parmp) ) {
 						// don't output deprecated flags
 						if (stricmp("deprecated", parmp->help)) {
 							sp = strlen(parmp->name);
 							if (parmp->arg_type != AT_NONE) {
 								atp = strlen(cmdline_arg_types[parmp->arg_type]);
-								printf("    [ %s ]%*s[ %s ]%*s- %s\n", parmp->name, (STR_SIZE - sp -1), NOX(" "), cmdline_arg_types[parmp->arg_type], AT_SIZE-atp, NOX(" "), parmp->help);
+								printf("    [ %s ]%*s[ %s ]%*s- %s\n", parmp->name, (int)(STR_SIZE - sp -1), NOX(" "), cmdline_arg_types[parmp->arg_type], (int)(AT_SIZE-atp), NOX(" "), parmp->help);
 							} else {
-								printf("    [ %s ]%*s- %s\n", parmp->name, (STR_SIZE - sp -1 +AT_SIZE+4), NOX(" "), parmp->help);
+								printf("    [ %s ]%*s- %s\n", parmp->name, (int)(STR_SIZE - sp -1 +AT_SIZE+4), NOX(" "), parmp->help);
 							}
 						}
 					}
@@ -815,14 +828,14 @@ void os_validate_parms(int argc, char *argv[])
 
 int parse_cmdline_string(char* cmdline, char** argv)
 {
-	int length = strlen(cmdline);
+	size_t length = strlen(cmdline);
 
 	bool start_found = false;
 	bool quoted = false;
 
-	int argc = 0;
+	size_t argc = 0;
 	char* current_argv = NULL;
-	for (int i = 0; i < length; i++)
+	for (size_t i = 0; i < length; i++)
 	{
 		if (!start_found && !isspace(cmdline[i]))
 		{
@@ -883,7 +896,7 @@ int parse_cmdline_string(char* cmdline, char** argv)
 		argc++;
 	}
 
-	return argc;
+	return (int)argc;
 }
 
 void os_process_cmdline(char* cmdline)
@@ -913,37 +926,50 @@ bool has_cmdline_only_flag(int argc, char *argv[])
 	return false;
 }
 
+// remove old parms - needed for tests
+static void reset_cmdline_parms()
+{
+	for (cmdline_parm *parmp = GET_FIRST(&Parm_list); parmp != END_OF_LIST(&Parm_list); parmp = GET_NEXT(parmp)) {
+		if (parmp->args != NULL) {
+			delete[] parmp->args;
+			parmp->args = NULL;
+		}
+		parmp->name_found = 0;
+	}
+}
+
 // Call once to initialize the command line system
 //
 // cmdline - command line string passed to the application
 void os_init_cmdline(int argc, char *argv[])
 {
+	// Tests call this multiple times, so reset the params here.
+	// Otherwise e.g. the modlist just grows and grows...
+	reset_cmdline_parms();
+
 	FILE *fp;
-	
+
 	if (!has_cmdline_only_flag(argc, argv)) {
 		// Only parse the config file in the current directory if we are in legacy config mode
 		if (os_is_legacy_mode()) {
 			// read the cmdline_fso.cfg file from the data folder, and pass the command line arguments to
 			// the the parse_parms and validate_parms line.  Read these first so anything actually on
 			// the command line will take precedence
-#ifdef _WIN32
-			fp = fopen("data\\cmdline_fso.cfg", "rt");
-#elif defined(APPLE_APP)
+#ifdef APPLE_APP
 			char resolved_path[MAX_PATH], data_path[MAX_PATH_LEN];
 
-			GetCurrentDirectory(MAX_PATH_LEN - 1, data_path);
+			getcwd(data_path, sizeof(data_path));
 			snprintf(resolved_path, MAX_PATH, "%s/data/cmdline_fso.cfg", data_path);
 
 			fp = fopen(resolved_path, "rt");
 #else
-			fp = fopen("data/cmdline_fso.cfg", "rt");
+			fp = fopen("data" DIR_SEPARATOR_STR "cmdline_fso.cfg", "rt");
 #endif
-
 			// if the file exists, get a single line, and deal with it
 			if (fp) {
 				char *buf, *p;
 
-				size_t len = filelength(fileno(fp)) + 2;
+				auto len = static_cast<int>(filelength(fileno(fp))) + 2;
 				buf = new char[len];
 
 				if (fgets(buf, len - 1, fp) != nullptr)
@@ -952,7 +978,6 @@ void os_init_cmdline(int argc, char *argv[])
 					if ((p = strrchr(buf, '\n')) != NULL) {
 						*p = '\0';
 					}
-
 #ifdef SCP_UNIX
 					// append a space for the os_parse_parms() check
 					strcat_s(buf, len, " ");
@@ -971,7 +996,7 @@ void os_init_cmdline(int argc, char *argv[])
 		if ( fp ) {
 			char *buf, *p;
 
-			size_t len = filelength( fileno(fp) ) + 2;
+			auto len = static_cast<int>(filelength( fileno(fp) )) + 2;
 			buf = new char [len];
 
 			if (fgets(buf, len-1, fp) != nullptr)
@@ -983,14 +1008,14 @@ void os_init_cmdline(int argc, char *argv[])
 
 				// append a space for the os_parse_parms() check
 				strcat_s(buf, len, " ");
-			
+
 				os_process_cmdline(buf);
 			}
 			delete [] buf;
 			fclose(fp);
 		}
 	} // If cmdline included PARSE_COMMAND_LINE_STRING
-    
+
 	// By parsing cmdline last, anything actually on the command line will take precedence.
 	os_parse_parms(argc, argv);
 	os_validate_parms(argc, argv);
@@ -1066,7 +1091,7 @@ int cmdline_parm::get_int()
 	Assertion(arg_type == AT_INT, "Coding error! Cmdline arg (%s) called cmdline_parm::get_int() with invalid arg_type (%s)", name, cmdline_arg_types[arg_type]);
 	check_if_args_is_valid();
 
-	int offset = 0;
+	size_t offset = 0;
 
 	if (stacks) {
 		// first off, DON'T STACK NON-STRINGS!!
@@ -1091,7 +1116,7 @@ float cmdline_parm::get_float()
 	Assertion(arg_type == AT_FLOAT, "Coding error! Cmdline arg (%s) called cmdline_parm::get_float() with invalid arg_type (%s)", name, cmdline_arg_types[arg_type]);
 	check_if_args_is_valid();
 
-	int offset = 0;
+	size_t offset = 0;
 
 	if (stacks) {
 		// first off, DON'T STACK NON-STRINGS!!
@@ -1178,14 +1203,15 @@ static SCP_vector<SCP_string> unix_get_dir_names(SCP_string parent, SCP_string d
 }
 
 // For case sensitive filesystems (e.g. Linux/BSD) perform case-insensitive dir matches.
-static void handle_unix_modlist(char **modlist, int *len)
+static void handle_unix_modlist(char **modlist, size_t *len)
 {
 	// search filesystem for given paths
 	SCP_vector<SCP_string> mod_paths;
 	for (char *cur_mod = strtok(*modlist, ","); cur_mod != NULL; cur_mod = strtok(NULL, ","))
 	{
 		SCP_vector<SCP_string> this_mod_paths = unix_get_dir_names(".", cur_mod);
-		if (this_mod_paths.empty()) {
+		// Ignore non-existing mods for unit tests
+		if (!running_unittests && this_mod_paths.empty()) {
 			ReleaseWarning(LOCATION, "Can't find mod '%s'. Ignoring.", cur_mod);
 		}
 		mod_paths.insert(mod_paths.end(), this_mod_paths.begin(), this_mod_paths.end());
@@ -1488,7 +1514,7 @@ bool SetCmdlineParams()
 		}
 
 		// Ok - mod stacking support
-		int len = strlen(Cmdline_mod);
+		size_t len = strlen(Cmdline_mod);
 		char *modlist = new char[len+2];
 		memset( modlist, 0, len + 2 );
 		strcpy_s(modlist, len+2, Cmdline_mod);
@@ -1499,7 +1525,7 @@ bool SetCmdlineParams()
 #endif
 
 		// null terminate each individual
-		for (int i = 0; i < len; i++)
+		for (size_t i = 0; i < len; i++)
 		{
 			if (modlist[i] == ',')
 				modlist[i] = '\0';
@@ -1604,11 +1630,7 @@ bool SetCmdlineParams()
 	if ( height_arg.found() ) {
 		Cmdline_height = 0;
 	}
-
-	if ( noglsl_arg.found() ) {
-		Cmdline_noglsl = 1;
-	}
-
+	
 	if (fxaa_arg.found() ) {
 		Cmdline_fxaa = true;
 
@@ -1631,9 +1653,6 @@ bool SetCmdlineParams()
 	if ( weapon_choice_3d_arg.found() )
 		Cmdline_weapon_choice_3d = 1;
 
-	if ( show_mem_usage_arg.found() )
-		Cmdline_show_mem_usage = 1;
-
 	if (ingamejoin_arg.found() )
 		Cmdline_ingamejoin = 1;
 
@@ -1651,11 +1670,6 @@ bool SetCmdlineParams()
 		output_sexps("sexps.html");
 	}
 
-	if ( no_vbo_arg.found() )
-	{
-		Cmdline_novbo = 1;
-	}
-
 	if ( no_pbo_arg.found() )
 	{
 		Cmdline_no_pbo = 1;
@@ -1686,6 +1700,16 @@ bool SetCmdlineParams()
 		Cmdline_set_cpu_affinity = true;
 	}
 
+	if (nograb_arg.found())
+	{
+		Cmdline_nograb = true;
+	}
+
+	if (noshadercache_arg.found())
+	{
+		Cmdline_noshadercache = true;
+	}
+
 	if (portable_mode.found())
 	{
 		Cmdline_portable_mode = true;
@@ -1772,6 +1796,11 @@ bool SetCmdlineParams()
 		Cmdline_fb_explosions = 1;
 	}
 
+    if (fb_thrusters_arg.found()) 
+    {
+        Cmdline_fb_thrusters = true;
+    }
+
 	if ( no_batching.found() ) 
 	{
 		Cmdline_no_batching = true;
@@ -1800,10 +1829,11 @@ bool SetCmdlineParams()
 	if( enable_shadows_arg.found() )
 	{
 		Cmdline_shadow_quality = 2;
-		if( shadow_quality_arg.found() )
-		{
-			Cmdline_shadow_quality = shadow_quality_arg.get_int();
-		}
+	}
+
+	if( shadow_quality_arg.found() )
+	{
+		Cmdline_shadow_quality = shadow_quality_arg.get_int();
 	}
 
 	if( no_deferred_lighting_arg.found() )
@@ -1811,14 +1841,8 @@ bool SetCmdlineParams()
 		Cmdline_no_deferred_lighting = 1;
 	}
 
-	if (frame_profile_arg.found() )
-	{
-		Cmdline_frame_profile = true;
-	}
-
 	if (frame_profile_write_file.found())
 	{
-		Cmdline_frame_profile = true;
 		Cmdline_profile_write_file = true;
 	}
 
@@ -1832,6 +1856,35 @@ bool SetCmdlineParams()
 		Cmdline_benchmark_mode = true;
 	}
 
+	if (noninteractive_arg.found())
+	{
+		Cmdline_noninteractive = true;
+	}
+
+	if (json_pilot.found())
+	{
+		Cmdline_json_pilot = true;
+	}
+
+	if (json_profiling.found())
+	{
+		Cmdline_json_profiling = true;
+	}
+
+	if (frame_profile_arg.found() )
+	{
+		Cmdline_frame_profile = true;
+	}
+
+	if (debug_window_arg.found()) {
+		Cmdline_debug_window = true;
+	}
+
+	if (show_video_info.found())
+	{
+		Cmdline_show_video_info = true;
+	}
+
 	//Deprecated flags - CommanderDJ
 	if( deprecated_spec_arg.found() )
 	{

code/cmdline/cmdline.h

@@ -76,9 +76,11 @@ 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;
 
 // Game Speed related
 extern int Cmdline_cache_bitmaps;
@@ -123,10 +125,8 @@ 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;
@@ -135,6 +135,8 @@ 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
@@ -145,19 +147,20 @@ extern int Cmdline_old_collision_sys;
 extern int Cmdline_dis_collisions;
 extern int Cmdline_dis_weapons;
 extern int Cmdline_noparseerrors;
-#ifdef Allow_NoWarn
-extern int Cmdline_nowarn;
-#endif
 extern int Cmdline_extra_warn;
-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_pilot;
+extern bool Cmdline_json_profiling;
+extern bool Cmdline_frame_profile;
+extern bool Cmdline_show_video_info;
+extern bool Cmdline_debug_window;
 
 #endif

code/cmeasure/cmeasure.cpp

@@ -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 & WIF_CMEASURE)
+		if(Weapon_info[new_index].wi_flags[Weapon::Info_Flags::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 & WIF_CMEASURE);
+	Assert(Weapon_info[Weapons[objp->instance].weapon_info_index].wi_flags[Weapon::Info_Flags::Cmeasure]);
 
 	if ( objp->parent == OBJ_INDEX(Player_obj) ) {
 		hud_start_text_flash(XSTR("Evaded", 1430), 800);
 		snd_play(&Snds[ship_get_sound(Player_obj, SND_MISSILE_EVADED_POPUP)]);
-	} else if ( Objects[objp->parent].flags & OF_PLAYER_SHIP ) {
+	} else if ( Objects[objp->parent].flags[Object::Object_Flags::Player_ship] ) {
 		send_countermeasure_success_packet( objp->parent );
 	}
 }

code/controlconfig/controlsconfig.cpp

@@ -12,7 +12,7 @@
 
 #include "controlconfig/controlsconfig.h"
 #include "debugconsole/console.h"
-#include "freespace2/freespace.h"
+#include "freespace.h"
 #include "gamehelp/contexthelp.h"
 #include "gamesequence/gamesequence.h"
 #include "gamesnd/gamesnd.h"
@@ -25,7 +25,7 @@
 #include "missionui/missionscreencommon.h"
 #include "network/multi_pmsg.h"
 #include "network/multiutil.h"
-#include "parse/scripting.h"
+#include "scripting/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
 
-char* Conflict_background_bitmap_fname[GR_NUM_RESOLUTIONS] = {
+const char* Conflict_background_bitmap_fname[GR_NUM_RESOLUTIONS] = {
 	"ControlConfig",		// GR_640
 	"2_ControlConfig"		// GR_1024
 };
 
-char* Conflict_background_bitmap_mask_fname[GR_NUM_RESOLUTIONS] = {
+const char* Conflict_background_bitmap_mask_fname[GR_NUM_RESOLUTIONS] = {
 	"ControlConfig-m",		// GR_640
 	"2_ControlConfig-m"		// GR_1024
 };
@@ -356,6 +356,65 @@ DCF_BOOL(show_controls_info, Show_controls_info);
 
 static int Axes_origin[JOY_NUM_AXES];
 
+static int joy_get_unscaled_reading(int raw, int axn)
+{
+	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);
@@ -833,8 +892,6 @@ int control_config_clear_all()
 	return 0;
 }
 
-extern Joy_info joystick;
-
 int control_config_axis_default(int axis)
 {
 	Assert(axis >= 0);
@@ -844,7 +901,8 @@ int control_config_axis_default(int axis)
 			return -1;
 		}
 
-		if (!joystick.axis_valid[Axis_map_to_defaults[axis]]) {
+		auto joystick = io::joystick::getCurrentJoystick();
+		if (joystick == nullptr || Axis_map_to_defaults[axis] >= joystick->numAxes()) {
 			return -1;
 		}
 	}
@@ -861,7 +919,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.size() >= 1) {
+	if (!Control_config_presets.empty()) {
 		cycling_presets = true;
 		
 		if (++Defaults_cycle_pos >= Control_config_presets.size())
@@ -1470,7 +1528,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]);
-						gr_force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+						font::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();
@@ -1538,7 +1596,7 @@ void control_config_do_frame(float frametime)
 					control_config_bind_key(z, k);
 
 					strcpy_s(bound_string, textify_scancode(k));
-					gr_force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+					font::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();
@@ -1552,7 +1610,7 @@ void control_config_do_frame(float frametime)
 						control_config_bind_joy(z, i);
 
 						strcpy_s(bound_string, Joy_button_text[i]);
-						gr_force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+						font::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();
@@ -1576,7 +1634,7 @@ void control_config_do_frame(float frametime)
 								control_config_bind_joy(z, i);
 
 								strcpy_s(bound_string, Joy_button_text[i]);
-								gr_force_fit_string(bound_string, 39, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+								font::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();
@@ -1847,7 +1905,7 @@ void control_config_do_frame(float frametime)
 		}
 
 		// set color and font
-		gr_set_font(FONT2);
+		font::set_font(font::FONT2);
 		if(Conflict_bright){
 			gr_set_color_fast(&Color_bright_red);
 		} else {
@@ -1862,7 +1920,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);
 
-		gr_set_font(FONT1);
+		font::set_font(font::FONT1);
 	} else {
 		// might as well always reset the conflict stamp
 		Conflict_stamp = -1;
@@ -1916,7 +1974,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, XSTR( "?", 208));
+			gr_printf_menu(x - w / 2, y - font_height / 2, "%s", XSTR( "?", 208));
 		}
 
 	} else if (!(z & JOY_AXIS) && ((Conflicts[z].key >= 0) || (Conflicts[z].joy >= 0))) {
@@ -1928,7 +1986,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, str);
+		gr_printf_menu(x - w / 2, y - font_height, "%s", str);
 
 		if (Control_config[i].hasXSTR) {
 			strcpy_s(buf, XSTR(Control_config[i].text, CONTROL_CONFIG_XSTR + i));
@@ -1936,14 +1994,14 @@ void control_config_do_frame(float frametime)
 			strcpy_s(buf, Control_config[i].text);
 		}
 
-		gr_force_fit_string(buf, 255, Conflict_wnd_coords[gr_screen.res][CONTROL_W_COORD]);
+		font::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, buf);
+		gr_printf_menu(x - w / 2, y, "%s", 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, bound_string);
+		gr_printf_menu(x - w / 2, y - font_height / 2, "%s", bound_string);
 		if (timestamp_elapsed(bound_timestamp)) {
 			*bound_string = 0;
 		}
@@ -1951,7 +2009,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], XSTR( "More...", 210));
+		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));
 	}
 
 	conflict = 0;
@@ -1976,8 +2034,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);
-			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);
+			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);
 		}
 
 		if (!(z & JOY_AXIS)) {
@@ -1988,7 +2046,7 @@ void control_config_do_frame(float frametime)
 
 			if ((k < 0) && (j < 0)) {
 				gr_set_color_fast(&Color_grey);
-				gr_printf_menu(x, y, XSTR( "None", 211));
+				gr_printf_menu(x, y, "%s", XSTR( "None", 211));
 
 			} else {
 				if (k >= 0) {
@@ -2008,7 +2066,7 @@ void control_config_do_frame(float frametime)
 						gr_set_color_fast(c);
 					}
 
-					gr_printf_menu(x, y, buf);
+					gr_printf_menu(x, y, "%s", buf);
 
 					Cc_lines[line].kx = x - Control_list_coords[gr_screen.res][CONTROL_X_COORD];
 					gr_get_string_size(&w, NULL, buf);
@@ -2017,7 +2075,7 @@ void control_config_do_frame(float frametime)
 
 					if (j >= 0) {
 						gr_set_color_fast(&Color_text_normal);
-						gr_printf_menu(x, y, XSTR( ", ", 212));
+						gr_printf_menu(x, y, "%s", XSTR( ", ", 212));
 						gr_get_string_size(&w, NULL, XSTR( ", ", 212));
 						x += w;
 					}
@@ -2040,8 +2098,8 @@ void control_config_do_frame(float frametime)
 						gr_set_color_fast(c);
 					}
 
-					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);
+					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);
 
 					Cc_lines[line].jx = x - Control_list_coords[gr_screen.res][CONTROL_X_COORD];
 					gr_get_string_size(&Cc_lines[line].jw, NULL, buf);
@@ -2057,7 +2115,7 @@ void control_config_do_frame(float frametime)
 
 			if (j < 0) {
 				gr_set_color_fast(&Color_grey);
-				gr_printf_menu(x, y, XSTR( "None", 211));
+				gr_printf_menu(x, y, "%s", XSTR( "None", 211));
 
 			} else {
 				if (Conflicts_axes[z & ~JOY_AXIS] >= 0) {
@@ -2306,17 +2364,17 @@ 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]], Axis_map_to[0]);
+		*h = joy_get_scaled_reading(axes_values[Axis_map_to[0]]);
 	}
 
 	*p = 0;
 	if (Axis_map_to[1] >= 0) {
-		*p = joy_get_scaled_reading(axes_values[Axis_map_to[1]], Axis_map_to[1]);
+		*p = joy_get_scaled_reading(axes_values[Axis_map_to[1]]);
 	}
 
 	*b = 0;
 	if (Axis_map_to[2] >= 0) {
-		*b = joy_get_scaled_reading(axes_values[Axis_map_to[2]], Axis_map_to[2]);
+		*b = joy_get_scaled_reading(axes_values[Axis_map_to[2]]);
 	}
 
 	*ta = 0;
@@ -2326,7 +2384,7 @@ void control_get_axes_readings(int *h, int *p, int *b, int *ta, int *tr)
 
 	*tr = 0;
 	if (Axis_map_to[4] >= 0) {
-		*tr = joy_get_scaled_reading(axes_values[Axis_map_to[4]], Axis_map_to[4]);
+		*tr = joy_get_scaled_reading(axes_values[Axis_map_to[4]]);
 	}
 
 	if (Invert_axis[0]) {

code/controlconfig/controlsconfig.h

@@ -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
-	char *text;				//!< describes the action in the config screen
+	const char *text;		//!< describes the action in the config screen
 	char type;				//!< manner control should be checked in
 	short key_id;			//!< actual key bound to action
 	short joy_id;			//!< joystick button bound to action
@@ -288,13 +288,16 @@ 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 char **Scan_code_text;
-extern char **Joy_button_text;
+extern const char **Scan_code_text;
+extern const 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
@@ -308,7 +311,26 @@ 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);
-char *textify_scancode(int code);
+
+/**
+ * @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);
+
 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);
@@ -318,4 +340,6 @@ void clear_key_binding(short key);
 void control_check_indicate();
 void control_config_clear_used_status();
 
+int joy_get_scaled_reading(int raw);
+
 #endif

code/controlconfig/controlsconfigcommon.cpp

@@ -12,7 +12,7 @@
 
 #include "cfile/cfile.h"
 #include "controlconfig/controlsconfig.h"
-#include "globalincs/def_files.h"
+#include "def_files/def_files.h"
 #include "globalincs/systemvars.h"
 #include "io/joy.h"
 #include "io/key.h"
@@ -30,6 +30,10 @@ 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;
@@ -195,7 +199,7 @@ config_item Control_config[CCFG_MAX + 1] = {
 	{                           -1,                 -1, -1,           false, "",                                       CC_TYPE_TRIGGER,    -1, -1, 0, false, false }
 };
 
-char *Scan_code_text_german[] = {
+const char *Scan_code_text_german[] = {
 	"",				"Esc",				"1",				"2",				"3",				"4",				"5",				"6",
 	"7",				"8",				"9",				"0",				"Akzent '",				"Eszett",				"R\x81""cktaste",		"Tab",
 	"Q",				"W",				"E",				"R",				"T",				"Z",				"U",				"I",
@@ -237,7 +241,7 @@ char *Scan_code_text_german[] = {
 	"",				"",				"",				"",				"",				"",				"",				"",
 };
 
-char *Joy_button_text_german[] = {
+const 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",
@@ -246,7 +250,7 @@ char *Joy_button_text_german[] = {
 	"Knopf 31",		"Knopf 32",		"Hut Hinten",	"Hut Vorne",	"Hut Links",	"Hut Rechts"
 };
 
-char *Scan_code_text_french[] = {
+const 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",
@@ -288,7 +292,7 @@ char *Scan_code_text_french[] = {
 	"",				"",				"",				"",				"",				"",				"",				"",
 };
 
-char *Joy_button_text_french[] = {
+const 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",
@@ -297,7 +301,7 @@ char *Joy_button_text_french[] = {
 	"Bouton 31",		"Bouton 32",		"Chapeau Arri\x8Are",		"Chapeau Avant",		"Chapeau Gauche",		"Chapeau Droite"
 };
 
-char *Scan_code_text_polish[] = {
+const 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",
@@ -339,7 +343,7 @@ char *Scan_code_text_polish[] = {
 	"",				"",				"",				"",				"",				"",				"",				"",
 };
 
-char *Joy_button_text_polish[] = {
+const 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",
@@ -349,7 +353,7 @@ char *Joy_button_text_polish[] = {
 };
 
 //!	This is the text that is displayed on the screen for the keys a player selects
-char *Scan_code_text_english[] = {
+const 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",
@@ -391,7 +395,7 @@ char *Scan_code_text_english[] = {
 	"",				"",				"",				"",				"",				"",				"",				"",
 };
 
-char *Joy_button_text_english[] = {
+const 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",
@@ -400,8 +404,8 @@ char *Joy_button_text_english[] = {
 	"Button 31",	"Button 32",	"Hat Back",		"Hat Forward",	"Hat Left",		"Hat Right"
 };
 
-char **Scan_code_text = Scan_code_text_english;
-char **Joy_button_text = Joy_button_text_english;
+const char **Scan_code_text = Scan_code_text_english;
+const char **Joy_button_text = Joy_button_text_english;
 
 SCP_vector<config_item*> Control_config_presets;
 SCP_vector<SCP_string> Control_config_preset_names;
@@ -506,8 +510,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;
-	char *key_text = NULL;
-	char *joy_text = NULL;
+	const char *key_text = NULL;
+	const char *joy_text = NULL;
 
 	static char text[40] = {"None"};
 
@@ -549,7 +553,7 @@ char *translate_key(char *key)
 	return text;
 }
 
-char *textify_scancode(int code)
+const char *textify_scancode(int code)
 {
 	static char text[40];
 
@@ -582,6 +586,28 @@ 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();
@@ -807,118 +833,125 @@ void control_config_common_load_overrides()
 {
 	LoadEnumsIntoMaps();
 
-	if (cf_exists_full("controlconfigdefaults.tbl", CF_TYPE_TABLES)) {
-		read_file_text("controlconfigdefaults.tbl", CF_TYPE_TABLES);
-	} else {
-		read_file_text_from_array(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);
+	try {
+		if (cf_exists_full("controlconfigdefaults.tbl", CF_TYPE_TABLES)) {
+			read_file_text("controlconfigdefaults.tbl", CF_TYPE_TABLES);
 		} else {
-			preset_name = "<unnamed preset>";
+			read_file_text_from_default(defaults_get_file("controlconfigdefaults.tbl"));
 		}
-		Control_config_preset_names.push_back(preset_name);
 
-		while (required_string_either("#End","$Bind Name:")) {
-			const int iBufferLength = 64;
-			char szTempBuffer[iBufferLength];
+		reset_parse();
 
-			required_string("$Bind Name:");
-			stuff_string(szTempBuffer, F_NAME, 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);
 
-			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];
+			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);
 
-				if (!strcmp(szTempBuffer, r_ccConfig.text)) {
-					/**
-					* short key_default;
-					* short joy_default;
-					* char tab;
-					* bool hasXSTR;
-					* char type;
-					*/
+			while (required_string_either("#End","$Bind Name:")) {
+				const int iBufferLength = 64;
+				char szTempBuffer[iBufferLength];
 
-					int iTemp;
+				required_string("$Bind Name:");
+				stuff_string(szTempBuffer, F_NAME, iBufferLength);
 
-					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];
+				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("$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 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 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("$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("$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("$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("$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")) {
+							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("$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");
+			required_string("#End");
+		}
 	}
-	
+	catch (const parse::ParseException& e)
+	{
+		mprintf(("TABLES: Unable to parse 'controlconfigdefaults.tbl'!  Error message = %s.\n", e.what()));
+		return;
+	}
+
 	// Overwrite the control config with the first preset that was found
-	if (Control_config_presets.size() > 0) {
+	if (!Control_config_presets.empty()) {
 		std::copy(Control_config_presets[0], Control_config_presets[0] + CCFG_MAX + 1, Control_config);
 	}
 }

code/cutscene/Decoder.cpp

@@ -0,0 +1,65 @@
+#include "cutscene/Decoder.h"
+
+#include <memory>
+
+namespace cutscene {
+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::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));
+}
+
+void Decoder::stopDecoder() {
+	m_decoding = false;
+
+	m_videoQueue->close();
+	m_audioQueue->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::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
+	}
+}
+}

code/cutscene/Decoder.h

@@ -0,0 +1,148 @@
+#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;
+};
+
+class VideoFrame {
+ protected:
+	VideoFrame() {}
+
+ public:
+	virtual ~VideoFrame() {}
+
+	double frameTime = -1.0;
+	int id = -1;
+
+	FrameSize ySize;
+	FrameSize uvSize;
+
+	struct DataPointers {
+		ubyte* y;
+		ubyte* u;
+		ubyte* v;
+	};
+
+	virtual DataPointers getDataPointers() = 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;
+
+struct MovieProperties {
+	FrameSize size;
+
+	float fps = -1.0f;
+};
+
+struct AudioFrame {
+	SCP_vector<short> audioData;
+
+	int channels = -1;
+
+	int rate = -1;
+};
+typedef std::unique_ptr<AudioFrame> AudioFramePtr;
+
+/**
+ * @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;
+
+	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) = 0;
+
+	/**
+	 * @brief Returns the properties of the video
+	 * @return The properties
+	 */
+	virtual MovieProperties getProperties() = 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() = 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 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 canPushVideoData();
+
+	void pushFrameData(VideoFramePtr&& frame);
+};
+}

code/cutscene/cutscenes.cpp

@@ -5,12 +5,12 @@
  * or otherwise commercially exploit the source or things you created based on the 
  * source.
  *
-*/ 
+*/
 
 
 
 #include "cutscene/cutscenes.h"
-#include "freespace2/freespace.h"
+#include "freespace.h"
 #include "gamesequence/gamesequence.h"
 #include "gamesnd/gamesnd.h"
 #include "globalincs/alphacolors.h"
@@ -26,13 +26,13 @@
 extern int Cmdline_nomovies;
 
 
-char *Cutscene_bitmap_name[GR_NUM_RESOLUTIONS] = {
-	"ViewFootage",
-	"2_ViewFootage"
+const char* Cutscene_bitmap_name[GR_NUM_RESOLUTIONS] = {
+		"ViewFootage",
+		"2_ViewFootage"
 };
-char *Cutscene_mask_name[GR_NUM_RESOLUTIONS] = {
-	"ViewFootage-m",
-	"2_ViewFootage-m"
+const char* Cutscene_mask_name[GR_NUM_RESOLUTIONS] = {
+		"ViewFootage-m",
+		"2_ViewFootage-m"
 };
 
 int Description_index;
@@ -40,8 +40,9 @@ 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;
 		}
@@ -81,19 +82,24 @@ void cutscene_init()
 			cutinfo.description = vm_strdup(buf);
 
 			if (optional_string("$cd:"))
-				stuff_int(&cutinfo.cd);
-			else
-				cutinfo.cd = 0;
+			{
+				// Option isn't needed anymore. Consume the token and ignore it
+
+				int junk;
+				stuff_int(&junk);
+			}
 
 			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);
 			}
 
@@ -109,44 +115,34 @@ 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(char *filename)
+void cutscene_mark_viewable(const 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;
 		}
@@ -156,17 +152,17 @@ void cutscene_mark_viewable(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
@@ -177,155 +173,102 @@ 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();
-	int rval = movie_play(name);
+	auto rval = movie::play(name);
 	main_hall_start_music();
 
-	if ( !rval ) {
+	if (!rval)
+	{
 		char str[256];
 
 		if (Cmdline_nomovies)
@@ -333,20 +276,21 @@ 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(SND_SCROLL);
 
 	} else
 		gamesnd_play_iface(SND_GENERAL_FAIL);
-	
+
 	if (Selected_line < Scroll_offset)
 		Scroll_offset = Selected_line;
 }
@@ -355,15 +299,17 @@ 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(SND_SCROLL);
 
 	} else
 		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++;
 	}
 }
@@ -372,17 +318,20 @@ 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(SND_SCROLL);
 
-	} else {
+	} else
+	{
 		gamesnd_play_iface(SND_GENERAL_FAIL);
 	}
 }
@@ -392,21 +341,25 @@ 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(SND_SCROLL);
-	} else {
+	} 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(SND_SWITCH_SCREENS);
 			gameseq_post_event(GS_EVENT_TECH_MENU);
@@ -447,12 +400,13 @@ 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);
@@ -463,15 +417,17 @@ 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
@@ -482,11 +438,13 @@ 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);
 		}
 	}
@@ -507,7 +465,8 @@ 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;
@@ -542,96 +501,117 @@ 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, Cutscenes[Cutscene_list[z]].name);
+		gr_printf_menu(Cutscene_list_coords[gr_screen.res][0], Cutscene_list_coords[gr_screen.res][1] + y,
+					   "%s", 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];
 
@@ -639,8 +619,9 @@ 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];
@@ -649,7 +630,8 @@ 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++;

code/cutscene/cutscenes.h

@@ -13,25 +13,33 @@
 #include "globalincs/globals.h"
 #include "globalincs/pstypes.h"
 
-typedef struct cutscene_info {
-	char	filename[MAX_FILENAME_LEN];
-	char	name[NAME_LENGTH];
-	char	*description;
-	int		cd;
-	bool	viewable;
+typedef struct cutscene_info
+{
+	char filename[MAX_FILENAME_LEN];
+	char name[NAME_LENGTH];
+	char* description;
+	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();
 
-int cutscenes_validate_cd(char *mve_name, int prompt_for_cd = 1);
-void cutscene_mark_viewable(char *filename);
+void cutscene_mark_viewable(const char* filename);
 
 #endif

code/cutscene/decoder16.cpp

@@ -1,570 +0,0 @@
-
-
-#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;
-}

code/cutscene/decoder8.cpp

@@ -1,533 +0,0 @@
-
-
-#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;
-	}
-}

code/cutscene/ffmpeg/AudioDecoder.cpp

@@ -0,0 +1,224 @@
+#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
+	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();
+}
+}
+}

code/cutscene/ffmpeg/AudioDecoder.h

@@ -0,0 +1,35 @@
+#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);
+
+	virtual ~AudioDecoder();
+
+	virtual void decodePacket(AVPacket* packet) SCP_OVERRIDE;
+
+	virtual void finishDecoding() SCP_OVERRIDE;
+};
+}
+}

code/cutscene/ffmpeg/FFMPEGDecoder.cpp

@@ -0,0 +1,363 @@
+#include <limits>
+
+#include "cutscene/ffmpeg/FFMPEGDecoder.h"
+
+#include "cfile/cfile.h"
+#include "libs/ffmpeg/FFmpegContext.h"
+
+#include "cutscene/ffmpeg/internal.h"
+
+#include "cutscene/ffmpeg/AudioDecoder.h"
+#include "cutscene/ffmpeg/VideoDecoder.h"
+
+using namespace libs::ffmpeg;
+
+namespace {
+using namespace cutscene;
+using namespace cutscene::ffmpeg;
+
+class AVPacketScope
+{
+	AVPacket* _packet;
+ public:
+	explicit AVPacketScope(AVPacket* av_packet)
+		: _packet(av_packet) {
+	}
+
+	~AVPacketScope() {
+		av_packet_unref(_packet);
+	}
+};
+
+const char* CHECKED_EXTENSIONS[] = {
+	"webm",
+	"mp4",
+	"ogg",
+	"mve"
+};
+
+double getFrameRate(AVStream* stream, AVCodecContext* codecCtx) {
+	auto fps = av_q2d(av_stream_get_r_frame_rate(stream));
+
+	if (fps < 0.000001)
+	{
+		fps = av_q2d(stream->avg_frame_rate);
+	}
+
+	if (fps < 0.000001)
+	{
+		fps = 1.0 / av_q2d(codecCtx->time_base);
+	}
+
+	return fps;
+}
+
+CodecContextParameters getCodecParameters(AVStream* stream) {
+	CodecContextParameters paras;
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+	paras.width = stream->codecpar->width;
+	paras.height = stream->codecpar->height;
+	paras.pixel_format = (AVPixelFormat)stream->codecpar->format;
+
+	paras.channel_layout = stream->codecpar->channel_layout;
+	paras.sample_rate = stream->codecpar->sample_rate;
+	paras.audio_format = (AVSampleFormat)stream->codecpar->format;
+#else
+    paras.width = stream->codec->width;
+	paras.height = stream->codec->height;
+	paras.pixel_format = stream->codec->pix_fmt;
+
+	paras.channel_layout = stream->codec->channel_layout;
+	paras.sample_rate = stream->codec->sample_rate;
+	paras.audio_format = stream->codec->sample_fmt;
+#endif
+    return paras;
+}
+}
+
+namespace cutscene {
+namespace ffmpeg {
+struct InputStream {
+	std::unique_ptr<FFmpegContext> m_ctx;
+};
+
+FFMPEGDecoder::FFMPEGDecoder() {
+}
+
+FFMPEGDecoder::~FFMPEGDecoder() {
+}
+
+namespace {
+std::unique_ptr<InputStream> openStream(const SCP_string& name) {
+	// Only check the root and movies folders
+	int dirType;
+	if (cf_exists_full(name.c_str(), CF_TYPE_ROOT)) {
+		dirType = CF_TYPE_ROOT;
+	} else if (cf_exists_full(name.c_str(), CF_TYPE_MOVIES)) {
+		dirType = CF_TYPE_MOVIES;
+	} else {
+		return nullptr;
+	}
+
+	std::unique_ptr<InputStream> input(new InputStream());
+
+	try {
+		// Create the FFmpeg context
+		input->m_ctx = FFmpegContext::createContext(name, dirType);
+
+		// This may fail, in that case return null
+		if (!input->m_ctx) {
+			return nullptr;
+		}
+	}
+	catch (const FFmpegException& e) {
+		mprintf(("Error opening %s: %s\n", name.c_str(), e.what()));
+		return nullptr;
+	}
+
+	return input;
+}
+
+std::unique_ptr<DecoderStatus> initializeStatus(std::unique_ptr<InputStream>& stream) {
+	std::unique_ptr<DecoderStatus> status(new DecoderStatus());
+
+	auto ctx = stream->m_ctx->ctx();
+
+	auto videoStream = av_find_best_stream(ctx, AVMEDIA_TYPE_VIDEO, -1, -1, &status->videoCodec, 0);
+	if (videoStream < 0) {
+		if (videoStream == AVERROR_STREAM_NOT_FOUND) {
+			mprintf(("FFmpeg: No video stream found in file!\n"));
+		} else if (videoStream == AVERROR_DECODER_NOT_FOUND) {
+			mprintf(("FFmpeg: Codec for video stream could not be found!\n"));
+		} else {
+			mprintf(("FFmpeg: Unknown error while finding video stream!\n"));
+		}
+
+		return nullptr;
+	}
+
+	auto audioStream = av_find_best_stream(ctx, AVMEDIA_TYPE_AUDIO, -1, videoStream, &status->audioCodec, 0);
+	if (audioStream < 0) {
+		if (audioStream == AVERROR_STREAM_NOT_FOUND) {
+			mprintf(("FFmpeg: No audio stream found in file!\n"));
+		} else if (videoStream == AVERROR_DECODER_NOT_FOUND) {
+			mprintf(("FFmpeg: Codec for audio stream could not be found!\n"));
+		} else {
+			mprintf(("FFmpeg: Unknown error while finding audio stream!\n"));
+		}
+	}
+
+	status->videoStreamIndex = videoStream;
+	status->videoStream = ctx->streams[videoStream];
+
+	if (audioStream >= 0) {
+		status->audioStreamIndex = audioStream;
+		status->audioStream = ctx->streams[audioStream];
+	}
+
+	status->videoCodecPars = getCodecParameters(status->videoStream);
+
+	int err;
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+	status->videoCodecCtx = avcodec_alloc_context3(status->videoCodec);
+
+	// Copy codec parameters from input stream to output codec context
+	err = avcodec_parameters_to_context(status->videoCodecCtx, status->videoStream->codecpar);
+	if (err < 0) {
+		char errorStr[512];
+		av_strerror(err, errorStr, sizeof(errorStr));
+		mprintf(("FFMPEG: Failed to copy context parameters! Error: %s\n", errorStr));
+		return nullptr;
+	}
+#else
+	status->videoCodecCtx = status->videoStream->codec;
+#endif
+
+	err = avcodec_open2(status->videoCodecCtx, status->videoCodec, nullptr);
+	if (err < 0) {
+		char errorStr[512];
+		av_strerror(err, errorStr, sizeof(errorStr));
+		mprintf(("FFMPEG: Failed to open video codec! Error: %s\n", errorStr));
+		return nullptr;
+	}
+
+	mprintf(("FFmpeg: Using video codec %s (%s).\n", status->videoCodec->long_name ? status->videoCodec->long_name : "<Unknown>",
+		status->videoCodec->name ? status->videoCodec->name : "<Unknown>"));
+
+	// Now initialize audio, if this fails it's not a fatal error
+	if (audioStream >= 0) {
+		status->audioCodecPars = getCodecParameters(status->audioStream);
+
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
+		status->audioCodecCtx = avcodec_alloc_context3(status->audioCodec);
+
+		err = avcodec_parameters_to_context(status->audioCodecCtx, status->audioStream->codecpar);
+		if (err < 0) {
+			char errorStr[512];
+			av_strerror(err, errorStr, sizeof(errorStr));
+			mprintf(("FFMPEG: Failed to copy context parameters! Error: %s\n", errorStr));
+			return nullptr;
+		}
+#else
+		status->audioCodecCtx = status->audioStream->codec;
+#endif
+
+		err = avcodec_open2(status->audioCodecCtx, status->audioCodec, nullptr);
+		if (err < 0) {
+			char errorStr[512];
+			av_strerror(err, errorStr, sizeof(errorStr));
+			mprintf(("FFMPEG: Failed to open audio codec! Error: %s\n", errorStr));
+		}
+
+		mprintf(("FFmpeg: Using audio codec %s (%s).\n", status->audioCodec->long_name ? status->audioCodec->long_name : "<Unknown>",
+			status->audioCodec->name ? status->audioCodec->name : "<Unknown>"));
+	}
+
+	return status;
+}
+
+std::unique_ptr<InputStream> openInputStream(const SCP_string& name) {
+	// Check a list of extensions we might use
+	// The actual format of the file may be whatever FFmpeg supports
+	for (auto ext : CHECKED_EXTENSIONS) {
+		auto fileName = name + "." + ext;
+
+		auto input = openStream(fileName);
+
+		if (input) {
+			return input;
+		}
+	}
+
+	return nullptr;
+}
+}
+
+bool FFMPEGDecoder::initialize(const SCP_string& fileName) {
+	SCP_string movieName = fileName;
+	// First make the file name lower case
+	std::transform(movieName.begin(), movieName.end(), movieName.begin(), ::tolower);
+
+	// Then remove the extension
+	size_t dotPos = movieName.find('.');
+	if (dotPos != SCP_string::npos) {
+		movieName.resize(dotPos);
+	}
+
+	// Try to open the input stream
+	auto input = openInputStream(movieName);
+	if (!input) {
+		return false;
+	}
+
+	// We now have a valid input stream, try to find the correct streams
+	auto status = initializeStatus(input);
+	if (!status) {
+		return false;
+	}
+
+	// Buffer ~ 2 seconds of video and audio
+	initializeQueues(static_cast<size_t>(ceil(getFrameRate(status->videoStream, status->videoCodecCtx))) * 2);
+
+	// We're done, now just put the pointer into this
+	std::swap(m_input, input);
+	std::swap(m_status, status);
+	return true;
+}
+
+MovieProperties FFMPEGDecoder::getProperties() {
+	MovieProperties props;
+	props.size.width = static_cast<size_t>(m_status->videoCodecPars.width);
+	props.size.height = static_cast<size_t>(m_status->videoCodecPars.height);
+
+	props.fps = static_cast<float>(getFrameRate(m_status->videoStream, m_status->videoCodecCtx));
+
+	return props;
+}
+
+void FFMPEGDecoder::startDecoding() {
+	std::unique_ptr<VideoDecoder> videoDecoder(new VideoDecoder(m_status.get()));
+
+	std::unique_ptr<AudioDecoder> audioDecoder;
+
+	if (hasAudio()) {
+		audioDecoder.reset(new AudioDecoder(m_status.get()));
+	}
+
+	auto ctx = m_input->m_ctx->ctx();
+	AVPacket packet;
+	while (isDecoding()) {
+		auto read_err = av_read_frame(ctx, &packet);
+		AVPacketScope scope(&packet);
+
+		if (avio_feof(ctx->pb) != 0) {
+			// EOF!!
+			break;
+		} else if (read_err < 0) {
+			if (read_err == AVERROR_EOF) {
+				// Finished reading -> break out of loop
+				break;
+			} else {
+				// Some kind of other error, try to continue reading
+				char errorStr[512];
+				av_strerror(read_err, errorStr, sizeof(errorStr));
+				mprintf(("FFMPEG: Failed to read frame! Error: %s\n", errorStr));
+
+				// Skip packet
+				continue;
+			}
+		}
+
+		if (packet.stream_index == m_status->videoStreamIndex) {
+			videoDecoder->decodePacket(&packet);
+
+			VideoFramePtr ptr;
+			while((ptr = videoDecoder->getFrame()) != nullptr) {
+				pushFrameData(std::move(ptr));
+			}
+		} else if (audioDecoder && packet.stream_index == m_status->audioStreamIndex) {
+			audioDecoder->decodePacket(&packet);
+
+			AudioFramePtr ptr;
+			while ((ptr = audioDecoder->getFrame()) != nullptr) {
+				pushAudioData(std::move(ptr));
+			}
+		}
+	}
+
+	if (isDecoding()) {
+		// If we are still alive then read the last frames from the decoders
+		videoDecoder->finishDecoding();
+		VideoFramePtr video_ptr;
+		while ((video_ptr = videoDecoder->getFrame()) != nullptr) {
+			pushFrameData(std::move(video_ptr));
+		}
+
+		if (audioDecoder) {
+			audioDecoder->finishDecoding();
+			AudioFramePtr audio_frame;
+			while ((audio_frame = audioDecoder->getFrame()) != nullptr) {
+				pushAudioData(std::move(audio_frame));
+			}
+		}
+	}
+
+	stopDecoder();
+}
+
+bool FFMPEGDecoder::hasAudio() {
+	return m_status->audioStreamIndex >= 0;
+}
+
+void FFMPEGDecoder::close() {
+	if (m_status) {
+		m_status = nullptr;
+	}
+
+	if (m_input) {
+		// This will delete the InputStream pointer and free all data
+		m_input = nullptr;
+	}
+}
+}
+}